summaryrefslogtreecommitdiff
path: root/java/openjdk7
diff options
context:
space:
mode:
Diffstat (limited to 'java/openjdk7')
-rw-r--r--java/openjdk7/Makefile5
-rw-r--r--java/openjdk7/files/patch-7u45-b3020623
-rw-r--r--java/openjdk7/files/patch-7u51-b3031693
-rw-r--r--java/openjdk7/files/patch-7u55-b3117206
-rw-r--r--java/openjdk7/files/patch-7u60-b3052678
-rw-r--r--java/openjdk7/files/patch-7u65-b3113021
-rw-r--r--java/openjdk7/files/patch-7u71-b147855
-rw-r--r--java/openjdk7/files/patch-7u76-b3142160
-rw-r--r--java/openjdk7/files/patch-bsd48109
-rw-r--r--java/openjdk7/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties11
-rw-r--r--java/openjdk7/files/patch-set136786
11 files changed, 233347 insertions, 136800 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 682d91df9902..923c1164bf16 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -3,7 +3,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
@@ -36,8 +35,8 @@ DEBUG_DESC= Enable extra debugging info
POLICY_DESC= Install the Unlimited Strength Policy Files
TZUPDATE_DESC= Update the time zone data
-PORT_MINOR_VERSION= 71
-PORT_BUILD_NUMBER= 14
+PORT_MINOR_VERSION= 76
+PORT_BUILD_NUMBER= 13
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 40
JDK_BUILD_NUMBER= 43
diff --git a/java/openjdk7/files/patch-7u45-b30 b/java/openjdk7/files/patch-7u45-b30
new file mode 100644
index 000000000000..f5bc5cf41366
--- /dev/null
+++ b/java/openjdk7/files/patch-7u45-b30
@@ -0,0 +1,20623 @@
+--- ./.hgtags Mon Aug 26 07:41:15 2013 -0700
++++ ./.hgtags Tue Oct 08 09:06:41 2013 -0700
+@@ -300,6 +300,22 @@
+ 84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09
+ aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10
+ 039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11
++210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16
++f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17
++9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18
++d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
++d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
++b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
++f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
++41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
++3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
++8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
++5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24
++f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
++4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26
++75167199239375d05b68668023c885c2776fd548 jdk7u40-b27
++ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
++dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
+ 2d02518960053d2b1dcb9aabacd709788e92c549 jdk7u25-b12
+ 37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13
+ 9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14
+@@ -327,7 +343,7 @@
+ ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
+ dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
+ 1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30
+-58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31
++e51f24701c608e57ba7ae69ba28bbc2daab02c4c jdk7u45-b01
+ da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
+ 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
+ a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
+@@ -339,3 +355,22 @@
+ c9157eb582a5deec5bbac671bf628bc45af447d0 jdk7u40-b40
+ 8773b39be6ac71c06793035b8c72f5c771eb534f jdk7u40-b41
+ 3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
++1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
++dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
++07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
++23c983c352a170d7a5fb7d703081daf1816d257a jdk7u45-b03
++1018a8ab686da6c1be22bec3ab9d01b2dc206333 jdk7u45-b04
++22e0ca1fa645d0518b514159afafe34335699c11 jdk7u45-b05
++61343f60f25a1d0deddc1468b2eb948df5275641 jdk7u45-b06
++24088aaf3f6834e46b486b706fbc6ce1f18814e5 jdk7u45-b07
++036425509e31070700a3956aaca7c33d583b7a5e jdk7u45-b08
++b6af2c522a633de1c7b66204fac7104b410ce23c jdk7u45-b09
++3fedb8c609a0f43bc8084edbecb0435e19dcb9a2 jdk7u45-b10
++142403d9f1167b8559b49627c7199c84623307da jdk7u45-b11
++a14018a5fa18092dcca5084656abb797bdb7b5ff jdk7u45-b12
++4d38e9adeb81df9c24550070df1f358aa9c17477 jdk7u45-b13
++bab0456ba0520f73ee20814ddf7ea0d596e49abd jdk7u45-b14
++b4b2584649027b622c188db7a6c3f9cff0e20130 jdk7u45-b15
++f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u45-b16
++6fd67e0287a9893ea1f0090fe127f18a7e235148 jdk7u45-b17
++f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
+--- ./Makefile Mon Aug 26 07:41:15 2013 -0700
++++ ./Makefile Tue Oct 08 09:06:41 2013 -0700
+@@ -264,7 +264,7 @@
+ DEBUG_NAME=$(DEBUG_NAME) \
+ GENERATE_DOCS=false \
+ $(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \
+- CREATE_DEBUGINFO_BUNDLES=false \
++ CREATE_DEBUGINFO_BUNDLES=true \
+ $(BOOT_CYCLE_DEBUG_SETTINGS) \
+ generic_build_repo_series
+
+--- ./corba/.hgtags Mon Aug 26 07:41:19 2013 -0700
++++ ./corba/.hgtags Tue Oct 08 09:06:43 2013 -0700
+@@ -302,6 +302,22 @@
+ 161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09
+ c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10
+ 109386df5b8e259d0af802217769a3c448404e49 jdk7u25-b11
++38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16
++8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17
++862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18
++bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
++bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
++a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
++54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
++fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
++e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
++d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
++d3ab3b19caa02ee85359cfe07b6e0b74eb7b3d74 jdk7u40-b24
++abfc54516d0b7f9aed34ef175f6bbb93fda4cbb3 jdk7u40-b25
++be9099c54a35c00d0dfe6beeed8ea5d4ab3cd3fe jdk7u40-b26
++f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27
++c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
++1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
+ ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12
+ eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
+ 577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
+@@ -341,3 +357,23 @@
+ a91b57bf60bd982814bc1616ea46a1069416f5e4 jdk7u40-b40
+ acb0571052b8dbef036fc50235ef95c0a46cff6b jdk7u40-b41
+ b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
++e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
++08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
++4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01
++1a1a1dedf437c50797a49c21a12161a79c761757 jdk7u45-b02
++3a2cca8c2f209b533af6c1201cc8aee43628e578 jdk7u45-b03
++4f4f7869bd6585042ad9596426dd1aa0829b8e98 jdk7u45-b04
++faee62d13040eae3d081f0383843a391ceef1edd jdk7u45-b05
++435dd0e1ab9ec9cbc83dc5ed260886f6becbef25 jdk7u45-b06
++2e19615f6045c3f39e39c56c485f7bc1df97e2ce jdk7u45-b07
++771c5c869d16d2da5668e412f505ad75f8f610c1 jdk7u45-b08
++a89d69bef3614f618843f5e9a495b12d13597851 jdk7u45-b09
++fd8a2041b75c4f712f2b08d627388d44a0cf2ee7 jdk7u45-b10
++55e0d3d9514343f380336b68aa8691a89b2e710b jdk7u45-b11
++336566c2905a49fc9a6f90f5ecd30517cfcaefff jdk7u45-b12
++6cadc3dd82a423f6c24460bb1997c0f39159dd93 jdk7u45-b13
++43e22471d0c29451f282b162864c2d3e494d5871 jdk7u45-b14
++3d7a52de59f03589d7a9334a6895063ff3331bfc jdk7u45-b15
++b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u45-b16
++8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
++80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
+--- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Mon Aug 26 07:41:19 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Tue Oct 08 09:06:43 2013 -0700
+@@ -905,28 +905,4 @@
+
+ return contents.toString();
+ }
+-
+- public static void main(String[] args) {
+-
+- Class remoteInterface = java.rmi.Remote.class;
+-
+- if( args.length > 0 ) {
+- String className = args[0];
+- try {
+- remoteInterface = Class.forName(className);
+- } catch(Exception e) {
+- e.printStackTrace();
+- System.exit(-1);
+- }
+- }
+-
+- System.out.println("Building name translation for " + remoteInterface);
+- try {
+- IDLNameTranslator nameTranslator =
+- IDLNameTranslatorImpl.get(remoteInterface);
+- System.out.println(nameTranslator);
+- } catch(IllegalStateException ise) {
+- ise.printStackTrace();
+- }
+- }
+ }
+--- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java Mon Aug 26 07:41:19 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java Tue Oct 08 09:06:43 2013 -0700
+@@ -43,6 +43,8 @@
+ import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ;
+ import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ;
+ import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl ;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+
+ public class InvocationHandlerFactoryImpl implements InvocationHandlerFactory
+ {
+@@ -114,24 +116,32 @@
+ // which extends org.omg.CORBA.Object. This handler delegates all
+ // calls directly to a DynamicStubImpl, which extends
+ // org.omg.CORBA.portable.ObjectImpl.
+- InvocationHandler dynamicStubHandler =
++ final InvocationHandler dynamicStubHandler =
+ DelegateInvocationHandlerImpl.create( stub ) ;
+
+ // Create an invocation handler that handles any remote interface
+ // methods.
+- InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
++ final InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
+ pm, classData, stub ) ;
+
+ // Create a composite handler that handles the DynamicStub interface
+ // as well as the remote interfaces.
+ final CompositeInvocationHandler handler =
+ new CustomCompositeInvocationHandlerImpl( stub ) ;
++
++ AccessController.doPrivileged(new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
+ handler.addInvocationHandler( DynamicStub.class,
+ dynamicStubHandler ) ;
+ handler.addInvocationHandler( org.omg.CORBA.Object.class,
+ dynamicStubHandler ) ;
+ handler.addInvocationHandler( Object.class,
+ dynamicStubHandler ) ;
++ return null;
++ }
++ });
++
+
+ // 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/transport/SelectorImpl.java Mon Aug 26 07:41:19 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java Tue Oct 08 09:06:43 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -55,7 +55,7 @@
+ /**
+ * @author Harold Carr
+ */
+-public class SelectorImpl
++class SelectorImpl
+ extends
+ Thread
+ implements
+--- ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java Mon Aug 26 07:41:19 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java Tue Oct 08 09:06:43 2013 -0700
+@@ -36,6 +36,7 @@
+
+ import com.sun.corba.se.spi.logging.CORBALogDomains ;
+ import com.sun.corba.se.impl.logging.ORBUtilSystemException ;
++import com.sun.corba.se.impl.presentation.rmi.DynamicAccessPermission;
+
+ public class CompositeInvocationHandlerImpl implements
+ CompositeInvocationHandler
+@@ -46,11 +47,13 @@
+ public void addInvocationHandler( Class interf,
+ InvocationHandler handler )
+ {
++ checkAccess();
+ classToInvocationHandler.put( interf, handler ) ;
+ }
+
+ public void setDefaultHandler( InvocationHandler handler )
+ {
++ checkAccess();
+ defaultHandler = handler ;
+ }
+
+@@ -78,4 +81,12 @@
+
+ return handler.invoke( proxy, method, args ) ;
+ }
++
++ private static final DynamicAccessPermission perm = new DynamicAccessPermission("access");
++ private void checkAccess() {
++ final SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ sm.checkPermission(perm);
+ }
++ }
++}
+--- ./corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java Mon Aug 26 07:41:19 2013 -0700
++++ ./corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java Tue Oct 08 09:06:43 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -34,6 +34,9 @@
+
+ import java.io.File;
+ import java.io.IOException;
++import java.io.SerializablePermission;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.Vector;
+ import java.util.Hashtable;
+ import java.util.Enumeration;
+@@ -49,6 +52,7 @@
+ import com.sun.corba.se.impl.util.PackagePrefixChecker;
+ import sun.rmi.rmic.Main;
+
++
+ /**
+ * An IIOP stub/tie generator for rmic.
+ *
+@@ -78,6 +82,7 @@
+ protected boolean castArray = false;
+ protected Hashtable transactionalObjects = new Hashtable() ;
+ protected boolean POATie = false ;
++ protected boolean emitPermissionCheck = false;
+
+ /**
+ * Default constructor for Main to use.
+@@ -193,6 +198,9 @@
+ } else if (argv[i].equals("-standardPackage")) {
+ standardPackage = true;
+ argv[i] = null;
++ } else if (argv[i].equals("-emitPermissionCheck")) {
++ emitPermissionCheck = true;
++ argv[i] = null;
+ } else if (arg.equals("-xstubbase")) {
+ argv[i] = null;
+ if (++i < argv.length && argv[i] != null && !argv[i].startsWith("-")) {
+@@ -390,9 +398,22 @@
+
+ writePackageAndImports(p);
+
++// generate
++// import java.security.AccessController;
++// import java.security.PrivilegedAction;
++// import java.io.SerializablePermission;
++ if (emitPermissionCheck) {
++ p.pln("import java.security.AccessController;");
++ p.pln("import java.security.PrivilegedAction;");
++ p.pln("import java.io.SerializablePermission;");
++ p.pln();
++ p.pln();
++ }
++
+ // Declare the stub class; implement all remote interfaces.
+
+ p.p("public class " + currentClass);
++
+ p.p(" extends " + getName(stubBaseClass));
+ p.p(" implements ");
+ if (remoteInterfaces.length > 0) {
+@@ -422,6 +443,56 @@
+ writeIds( p, theType, false );
+ p.pln();
+
++ if (emitPermissionCheck) {
++
++ // produce the following generated code
++ // private static Void checkPermission() {
++ // SecurityManager sm = System.getSecurityManager();
++ // if (sm != null) {
++ // sm.checkPermission(new SerializablePermission(
++ // "enableSubclassImplementation")); // testing
++ // }
++ // return null;
++ // }
++ //
++ // private _XXXXXX_Stub(Void ignore) {
++ // }
++ //
++ // public _XXXXXX_Stub() {
++ // this(checkPermission());
++ // }
++ // where XXXXXX is the name of the remote interface
++
++ p.pln();
++ p.plnI("private static Void checkPermission() {");
++ p.plnI("SecurityManager sm = System.getSecurityManager();");
++ p.pln("if (sm != null) {");
++ p.pI();
++ p.plnI("sm.checkPermission(new SerializablePermission(");
++ p.plnI("\"enableSubclassImplementation\"));");
++ p.pO();
++ p.pO();
++ p.pOln("}");
++ p.pln("return null;");
++ p.pO();
++ p.pOln("}");
++ p.pln();
++ p.pO();
++
++ p.pI();
++ p.pln("private " + currentClass + "(Void ignore) { }");
++ p.pln();
++
++ p.plnI("public " + currentClass + "() { ");
++ p.pln("this(checkPermission());");
++ p.pOln("}");
++ p.pln();
++ }
++
++ if (!emitPermissionCheck) {
++ p.pI();
++ }
++
+ // Write the _ids() method...
+
+ p.plnI("public String[] _ids() { ");
+@@ -815,7 +886,6 @@
+ CompoundType theType) throws IOException {
+
+ // Wtite the method declaration and opening brace...
+-
+ String methodName = method.getName();
+ String methodIDLName = method.getIDLName();
+
+@@ -1631,7 +1701,7 @@
+
+ // Write data members...
+ p.pln();
+- p.pln("private " + getName(theType) + " target = null;");
++ p.pln("volatile private " + getName(theType) + " target = null;");
+ p.pln();
+
+ // Write the ids...
+@@ -1695,6 +1765,10 @@
+
+ if (remoteMethods.length > 0) {
+ p.plnI("try {");
++ p.pln(getName(theType) + " target = this.target;");
++ p.plnI("if (target == null) {");
++ p.pln("throw new java.io.IOException();");
++ p.pOln("}");
+ p.plnI(idExtInputStream + " "+in+" = ");
+ p.pln("(" + idExtInputStream + ") "+_in+";");
+ p.pO();
+--- ./hotspot/.hgtags Mon Aug 26 11:56:33 2013 -0700
++++ ./hotspot/.hgtags Tue Oct 08 09:06:48 2013 -0700
+@@ -476,6 +476,24 @@
+ 8386245b59c3e82b7c728b7d3832ea342c62615d jdk7u21-b50
+ c5e4585a045fe165d067ec0e98af42eace20c5f8 jdk7u21-b12
+ 00dbf9fa12ec6b1ba15d9a9a12495f50e10837bf jdk7u21-b31
++bf2d84c5103d98db1697b50071a649ea23c4e33d jdk7u25-b01
++07119340f80f77dfcb03fa568641e80b43d4be74 jdk7u25-b02
++655bea6843fb7beabd8d9eeda59572c0c7055b85 jdk7u25-b03
++96a4e612195c0d753be24cf38fea0ee8ce30edcf jdk7u25-b04
++7151c26b838828a20cb28595ef1f70403d1868cf jdk7u25-b05
++fbb5f6083dd00ca7417e4a45311f33918bb2a5f0 jdk7u25-b06
++83abf4b2fc8a5bb7226177c5e4334bd0bfd7a8df jdk7u25-b07
++525252cd9fca4869c3fd81bc61299a85e73ff9c7 jdk7u25-b08
++706a255a8404b7e41579cea278df6bb87c314567 jdk7u25-b09
++402184622f60a2ba35479bdf124a8d4694835406 jdk7u25-b10
++cca49a35bf83664456af112482ffb3a7465d21fa jdk7u25-b11
++7ca68c0674df72fdd784de337c049404d2b5b0c3 jdk7u25-b12
++3e145a686fedd9eefdcb6b714241200ed236b41d jdk7u25-b13
++4fafaf293aa5666e8c9f5ca1d96c3f752305f586 jdk7u25-b14
++40acb370626fbc439e4cfed8854960a83a376fba jdk7u25-b15
++97a3ebd62052410e0709035f40032d3f2113ed86 jdk7u25-b30
++b80a290e6e3011097273525c4f352c70b9857464 jdk7u25-b16
++273e8afccd6ef9e10e9fe121f7b323755191f3cc jdk7u25-b32
+ e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14
+ 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34
+ 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15
+@@ -548,3 +566,23 @@
+ 4445f65c4793f8421c12423396776f36765433a8 jdk7u40-b41
+ 4e779305ed58e21b433626ac06b5eb884055183b jdk7u40-b42
+ b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56
++eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43
++af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
++5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
++f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02
++d6fd3f84a30ce82a37fc39b6e5e9d73bd8054ab2 jdk7u45-b03
++7f16aa9067386aeb3668336aa6cd63ef3dc4f44a jdk7u45-b04
++b4fe146b820b47d8b59bbb9dc9d43221436ed0ae jdk7u45-b05
++63efa616e54dd3545e16a5aa1917662548b18ee5 jdk7u45-b06
++f6748e6123b6745497d69addffdff38e224a77c5 jdk7u45-b07
++06bcab9ef18355dccc87401fc24dbd5f15615db0 jdk7u45-b08
++996b6863b3b2468cece20d7a6f571f9ec1b7830c jdk7u45-b09
++bcaf889eea9e64d30f8c3aefdcdc2c2ee29406f2 jdk7u45-b10
++7ca907428850dc2aa99ee4a906446e479dbeb392 jdk7u45-b11
++ed1505510ea0e94b17f968cdb3e8aba13c99d543 jdk7u45-b12
++89f99af7a7bbdadb5b8cf781c7d899c22df64b71 jdk7u45-b13
++718d1e9223dd0359d9ccef81fb82c32215702fe8 jdk7u45-b14
++9ad76a08e5edfe24e95eef84e15fef261bff1abf jdk7u45-b15
++429884602206fcf5314c8b953c06d54d337558ca jdk7u45-b16
++0c0dc384915cafd9bfaa2fe5792a629a22d1b990 jdk7u45-b17
++12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18
+--- ./hotspot/make/hotspot_version Mon Aug 26 11:56:33 2013 -0700
++++ ./hotspot/make/hotspot_version Tue Oct 08 09:06:48 2013 -0700
+@@ -34,8 +34,8 @@
+ HOTSPOT_VM_COPYRIGHT=Copyright 2013
+
+ HS_MAJOR_VER=24
+-HS_MINOR_VER=0
+-HS_BUILD_NUMBER=56
++HS_MINOR_VER=45
++HS_BUILD_NUMBER=08
+
+ JDK_MAJOR_VER=1
+ JDK_MINOR_VER=7
+--- ./hotspot/make/windows/makefiles/compile.make Mon Aug 26 11:56:33 2013 -0700
++++ ./hotspot/make/windows/makefiles/compile.make Tue Oct 08 09:06:48 2013 -0700
+@@ -172,6 +172,7 @@
+ PRODUCT_OPT_OPTION = /O2 /Oy-
+ FASTDEBUG_OPT_OPTION = /O2 /Oy-
+ DEBUG_OPT_OPTION = /Od
++SAFESEH_FLAG = /SAFESEH
+ !endif
+
+ !if "$(COMPILER_NAME)" == "VS2005"
+@@ -190,6 +191,7 @@
+ !if "x$(MT)" == "x"
+ MT=mt.exe
+ !endif
++SAFESEH_FLAG = /SAFESEH
+ !endif
+
+ !if "$(COMPILER_NAME)" == "VS2008"
+@@ -203,6 +205,7 @@
+ !if "x$(MT)" == "x"
+ MT=mt.exe
+ !endif
++SAFESEH_FLAG = /SAFESEH
+ !endif
+
+ !if "$(COMPILER_NAME)" == "VS2010"
+@@ -216,9 +219,11 @@
+ !if "x$(MT)" == "x"
+ MT=mt.exe
+ !endif
++SAFESEH_FLAG = /SAFESEH
++!endif
++
+ !if "$(BUILDARCH)" == "i486"
+-LD_FLAGS = /SAFESEH $(LD_FLAGS)
+-!endif
++LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
+ !endif
+
+ # If NO_OPTIMIZATIONS is defined in the environment, turn everything off
+--- ./hotspot/make/windows/makefiles/sa.make Mon Aug 26 11:56:33 2013 -0700
++++ ./hotspot/make/windows/makefiles/sa.make Tue Oct 08 09:06:48 2013 -0700
+@@ -107,6 +107,9 @@
+ !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
+ SA_LFLAGS = $(SA_LFLAGS) -map -debug
+ !endif
++!if "$(BUILDARCH)" == "i486"
++SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
++!endif
+
+ # 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/os/bsd/vm/os_bsd.cpp Mon Aug 26 11:56:33 2013 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Tue Oct 08 09:06:48 2013 -0700
+@@ -971,13 +971,14 @@
+ #endif
+
+ #ifdef __APPLE__
+-static uint64_t locate_unique_thread_id() {
++static uint64_t locate_unique_thread_id(mach_port_t mach_thread_port) {
+ // Additional thread_id used to correlate threads in SA
+ thread_identifier_info_data_t m_ident_info;
+ mach_msg_type_number_t count = THREAD_IDENTIFIER_INFO_COUNT;
+
+- thread_info(::mach_thread_self(), THREAD_IDENTIFIER_INFO,
++ thread_info(mach_thread_port, THREAD_IDENTIFIER_INFO,
+ (thread_info_t) &m_ident_info, &count);
++
+ return m_ident_info.thread_id;
+ }
+ #endif
+@@ -1009,9 +1010,14 @@
+
+ #ifdef _ALLBSD_SOURCE
+ #ifdef __APPLE__
+- // thread_id is mach thread on macos
+- osthread->set_thread_id(::mach_thread_self());
+- osthread->set_unique_thread_id(locate_unique_thread_id());
++ // thread_id is mach thread on macos, which pthreads graciously caches and provides for us
++ mach_port_t thread_id = ::pthread_mach_thread_np(::pthread_self());
++ guarantee(thread_id != 0, "thread id missing from pthreads");
++ osthread->set_thread_id(thread_id);
++
++ uint64_t unique_thread_id = locate_unique_thread_id(thread_id);
++ guarantee(unique_thread_id != 0, "unique thread id was not found");
++ osthread->set_unique_thread_id(unique_thread_id);
+ #else
+ // thread_id is pthread_id on BSD
+ osthread->set_thread_id(::pthread_self());
+@@ -1207,8 +1213,14 @@
+ // Store pthread info into the OSThread
+ #ifdef _ALLBSD_SOURCE
+ #ifdef __APPLE__
+- osthread->set_thread_id(::mach_thread_self());
+- osthread->set_unique_thread_id(locate_unique_thread_id());
++ // thread_id is mach thread on macos, which pthreads graciously caches and provides for us
++ mach_port_t thread_id = ::pthread_mach_thread_np(::pthread_self());
++ guarantee(thread_id != 0, "just checking");
++ osthread->set_thread_id(thread_id);
++
++ uint64_t unique_thread_id = locate_unique_thread_id(thread_id);
++ guarantee(unique_thread_id != 0, "just checking");
++ osthread->set_unique_thread_id(unique_thread_id);
+ #else
+ osthread->set_thread_id(::pthread_self());
+ #endif
+@@ -1830,7 +1842,7 @@
+
+ intx os::current_thread_id() {
+ #ifdef __APPLE__
+- return (intx)::mach_thread_self();
++ return (intx)::pthread_mach_thread_np(::pthread_self());
+ #else
+ return (intx)::pthread_self();
+ #endif
+--- ./hotspot/src/share/vm/classfile/classFileParser.cpp Mon Aug 26 11:56:33 2013 -0700
++++ ./hotspot/src/share/vm/classfile/classFileParser.cpp Tue Oct 08 09:06:48 2013 -0700
+@@ -2028,8 +2028,8 @@
+ }
+ if (lvt_cnt == max_lvt_cnt) {
+ max_lvt_cnt <<= 1;
+- REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
+- REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
++ localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
++ localvariable_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
+ }
+ localvariable_table_start[lvt_cnt] =
+ parse_localvariable_table(code_length,
+@@ -2058,8 +2058,8 @@
+ // Parse local variable type table
+ if (lvtt_cnt == max_lvtt_cnt) {
+ max_lvtt_cnt <<= 1;
+- REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
+- REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
++ localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
++ localvariable_type_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
+ }
+ localvariable_type_table_start[lvtt_cnt] =
+ parse_localvariable_table(code_length,
+@@ -4051,9 +4051,8 @@
+ for (int index = 0; index < num_methods; index++) {
+ methodOop m = (methodOop)methods->obj_at(index);
+
+- // skip private, static and <init> methods
+- if ((!m->is_private()) &&
+- (!m->is_static()) &&
++ // skip static and <init> methods
++ if ((!m->is_static()) &&
+ (m->name() != vmSymbols::object_initializer_name())) {
+
+ Symbol* name = m->name();
+--- ./hotspot/src/share/vm/runtime/mutexLocker.cpp Mon Aug 26 11:56:33 2013 -0700
++++ ./hotspot/src/share/vm/runtime/mutexLocker.cpp Tue Oct 08 09:06:48 2013 -0700
+@@ -133,13 +133,15 @@
+
+ Mutex* Management_lock = NULL;
+ Monitor* Service_lock = NULL;
+-Mutex* Stacktrace_lock = NULL;
++Monitor* PeriodicTask_lock = NULL;
+
+-Monitor* JfrQuery_lock = NULL;
++#ifdef INCLUDE_TRACE
++Mutex* JfrStacktrace_lock = NULL;
+ Monitor* JfrMsg_lock = NULL;
+ Mutex* JfrBuffer_lock = NULL;
+ Mutex* JfrStream_lock = NULL;
+-Monitor* PeriodicTask_lock = NULL;
++Mutex* JfrThreadGroups_lock = NULL;
++#endif
+
+ #define MAX_NUM_MUTEX 128
+ static Monitor * _mutex_array[MAX_NUM_MUTEX];
+@@ -215,7 +217,6 @@
+ def(Patching_lock , Mutex , special, true ); // used for safepointing and code patching.
+ def(ObjAllocPost_lock , Monitor, special, false);
+ def(Service_lock , Monitor, special, true ); // used for service thread operations
+- def(Stacktrace_lock , Mutex, special, true ); // used for JFR stacktrace database
+ def(JmethodIdCreation_lock , Mutex , leaf, true ); // used for creating jmethodIDs.
+
+ def(SystemDictionary_lock , Monitor, leaf, true ); // lookups done by VM thread
+@@ -278,12 +279,17 @@
+ def(MethodCompileQueue_lock , Monitor, nonleaf+4, true );
+ def(Debug2_lock , Mutex , nonleaf+4, true );
+ def(Debug3_lock , Mutex , nonleaf+4, true );
+- def(CompileThread_lock , Monitor, nonleaf+5, false );
++ def(CompileThread_lock , Monitor, nonleaf+5, false);
++ def(PeriodicTask_lock , Monitor, nonleaf+5, true);
+
++#ifdef INCLUDE_TRACE
+ def(JfrMsg_lock , Monitor, leaf, true);
+ def(JfrBuffer_lock , Mutex, nonleaf+1, true);
++ def(JfrThreadGroups_lock , Mutex, nonleaf+1, true);
+ def(JfrStream_lock , Mutex, nonleaf+2, true);
+- def(PeriodicTask_lock , Monitor, nonleaf+5, true);
++ def(JfrStacktrace_lock , Mutex, special, true );
++#endif
++
+ }
+
+ GCMutexLocker::GCMutexLocker(Monitor * mutex) {
+--- ./hotspot/src/share/vm/runtime/mutexLocker.hpp Mon Aug 26 11:56:33 2013 -0700
++++ ./hotspot/src/share/vm/runtime/mutexLocker.hpp Tue Oct 08 09:06:48 2013 -0700
+@@ -135,13 +135,15 @@
+
+ extern Mutex* Management_lock; // a lock used to serialize JVM management
+ extern Monitor* Service_lock; // a lock used for service thread operation
+-extern Mutex* Stacktrace_lock; // used to guard access to the stacktrace table
++extern Monitor* PeriodicTask_lock; // protects the periodic task structure
+
+-extern Monitor* JfrQuery_lock; // protects JFR use
++#ifdef INCLUDE_TRACE
++extern Mutex* JfrStacktrace_lock; // used to guard access to the JFR stacktrace table
+ extern Monitor* JfrMsg_lock; // protects JFR messaging
+ extern Mutex* JfrBuffer_lock; // protects JFR buffer operations
+ extern Mutex* JfrStream_lock; // protects JFR stream access
+-extern Monitor* PeriodicTask_lock; // protects the periodic task structure
++extern Mutex* JfrThreadGroups_lock; // protects JFR access to Thread Groups
++#endif
+
+ // 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
+--- ./jaxp/.hgtags Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/.hgtags Tue Oct 08 09:06:57 2013 -0700
+@@ -302,6 +302,22 @@
+ 5952538d55e624132f97400332a50b71880c874c jdk7u25-b09
+ aa00dd983dd0f5b07269d0648a0325e9b3e0d957 jdk7u25-b10
+ 0fb6d76bcd2e8d54d0a69e1c3d2a85d84b3e17a4 jdk7u25-b11
++7b47e1a26f7cbb8d8d22ea165f2d7fbbbd354c77 jdk7u14-b16
++77ac1ef42b2fd47cc87b9800f63efdd4cf2fa05d jdk7u14-b17
++d47975f80a24b55410fa2e2c5f50f3405d83fe73 jdk7u14-b18
++331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
++331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
++c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19
++5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20
++d1c8bb1cbc9183fc994b5fedf26886ceda0d59f9 jdk7u14-b21
++d1c6afebdfe28eb07eb2d03a6911a0f33b619165 jdk7u14-b22
++0e4c549d3635122145ac88bad7b98716976ca49e jdk7u40-b23
++d17acb2ee133811baa8eae3436a8c191fc433da1 jdk7u40-b24
++52bcce690998b4ad91abddae118847f4358c6110 jdk7u40-b25
++cd764ada36b50e2096ba35b4c27ca8f83b3db964 jdk7u40-b26
++7626b3fbc822fd4efd5ba3b5fc18f2fef5749597 jdk7u40-b27
++9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28
++740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29
+ 5e87aee78c91efa65bd5aeb37bcc1c1c637a7f0c jdk7u25-b12
+ 83b80c094befd08cbac4247d9b8f12c6a039f23f jdk7u25-b13
+ 68cc0d2a49f09b5c611b2775f2e66de1022bdedc jdk7u25-b14
+@@ -341,3 +357,23 @@
+ 6ea57bdf603007be4d25568f7759ca0381aa8382 jdk7u40-b40
+ 7255fb6c9060b0626aeedb1066e73c4bb46b1a7c jdk7u40-b41
+ 66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42
++c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43
++91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60
++1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01
++72b314bf2ee171bec2157f737ba3bf77fbdf1118 jdk7u45-b02
++399c58bf22ad35a3527a286123497615100746b2 jdk7u45-b03
++e66ea9257ba8a77fc64f6f2924584b183767d82b jdk7u45-b04
++3a6dce39c05c254aba9f3ae57c035bf3facfe8b9 jdk7u45-b05
++a7b1dcabdebbdbf40040a1c6f8411d2f8d25bb37 jdk7u45-b06
++abb39bc40bcc91c7f8ebc2867e98f302d9bc8417 jdk7u45-b07
++72295e1b27e61751cc323b5e4d6781bf7afae0a4 jdk7u45-b08
++255d92f5ed98915a025484360963d7d09bd77313 jdk7u45-b09
++28a18e725bb39d47e920ef910f435321fb891a88 jdk7u45-b10
++3d3b4da34d583e86a3b90b8f69927a37d40f5b57 jdk7u45-b11
++2ac5c9749223f205cd081ecd0028b2f3ea13f8f8 jdk7u45-b12
++18a009fdfba2bbc5036f96cbefffcdefe9580bb1 jdk7u45-b13
++d577bae705f208661733e09a4875d79255897b7b jdk7u45-b14
++daadec741c9bc5067897eb8803123d0af6c5ebc3 jdk7u45-b15
++0a8b95184728548be4b20876e05f76e0262e4195 jdk7u45-b16
++2586d303503b5bb6fd39dc0ce572d6e858caf41c jdk7u45-b17
++4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java Tue Oct 08 09:06:57 2013 -0700
+@@ -39,33 +39,138 @@
+ //
+ // Constants
+ //
++ //Xerces security manager
++ public static final String SECURITY_MANAGER =
++ "http://apache.org/xml/properties/security-manager";
++
++ //
++ // Implementation limits: API properties
++ //
++ /** Oracle JAXP property prefix ("http://www.oracle.com/xml/jaxp/properties/"). */
++ public static final String ORACLE_JAXP_PROPERTY_PREFIX =
++ "http://www.oracle.com/xml/jaxp/properties/";
++ /**
++ * JDK entity expansion limit; Note that the existing system property
++ * "entityExpansionLimit" with no prefix is still observed
++ */
++ public static final String JDK_ENTITY_EXPANSION_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "entityExpansionLimit";
++
++ /**
++ * JDK element attribute limit; Note that the existing system property
++ * "elementAttributeLimit" with no prefix is still observed
++ */
++ public static final String JDK_ELEMENT_ATTRIBUTE_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "elementAttributeLimit";
++
++ /**
++ * JDK maxOccur limit; Note that the existing system property
++ * "maxOccurLimit" with no prefix is still observed
++ */
++ public static final String JDK_MAX_OCCUR_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxOccurLimit";
++
++ /**
++ * JDK total entity size limit
++ */
++ public static final String JDK_TOTAL_ENTITY_SIZE_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "totalEntitySizeLimit";
++
++ /**
++ * JDK maximum general entity size limit
++ */
++ public static final String JDK_GENEAL_ENTITY_SIZE_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
++ /**
++ * JDK maximum parameter entity size limit
++ */
++ public static final String JDK_PARAMETER_ENTITY_SIZE_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxParameterEntitySizeLimit";
++ /**
++ * JDK maximum XML name limit
++ */
++ public static final String JDK_XML_NAME_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
++ /**
++ * JDK property indicating whether the parser shall print out entity
++ * count information
++ * Value: a string "yes" means print, "no" or any other string means not.
++ */
++ public static final String JDK_ENTITY_COUNT_INFO =
++ ORACLE_JAXP_PROPERTY_PREFIX + "getEntityCountInfo";
++
++ //
++ // Implementation limits: corresponding System Properties of the above
++ // API properties
++ //
++ /**
++ * JDK entity expansion limit; Note that the existing system property
++ * "entityExpansionLimit" with no prefix is still observed
++ */
++ public static final String SP_ENTITY_EXPANSION_LIMIT = "jdk.xml.entityExpansionLimit";
++
++ /**
++ * JDK element attribute limit; Note that the existing system property
++ * "elementAttributeLimit" with no prefix is still observed
++ */
++ public static final String SP_ELEMENT_ATTRIBUTE_LIMIT = "jdk.xml.elementAttributeLimit";
++
++ /**
++ * JDK maxOccur limit; Note that the existing system property
++ * "maxOccurLimit" with no prefix is still observed
++ */
++ public static final String SP_MAX_OCCUR_LIMIT = "jdk.xml.maxOccurLimit";
++
++ /**
++ * JDK total entity size limit
++ */
++ public static final String SP_TOTAL_ENTITY_SIZE_LIMIT = "jdk.xml.totalEntitySizeLimit";
++
++ /**
++ * JDK maximum general entity size limit
++ */
++ public static final String SP_GENEAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
++ /**
++ * JDK maximum parameter entity size limit
++ */
++ public static final String SP_PARAMETER_ENTITY_SIZE_LIMIT = "jdk.xml.maxParameterEntitySizeLimit";
++ /**
++ * JDK maximum XML name limit
++ */
++ public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
++
++ //legacy System Properties
++ public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
++ public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
++ public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
++
++ /**
++ * A string "yes" that can be used for properties such as getEntityCountInfo
++ */
++ public static final String JDK_YES = "yes";
++
+ // Oracle Feature:
+- /**
+- * <p>Use Service Mechanism</p>
+- *
+- * <ul>
+- * <li>
++ /**
++ * <p>Use Service Mechanism</p>
++ *
++ * <ul>
++ * <li>
+ * {@code true} instruct an object to use service mechanism to
+ * find a service implementation. This is the default behavior.
+ * </li>
+ * <li>
+ * {@code false} instruct an object to skip service mechanism and
+ * use the default implementation for that service.
+- * </li>
+- * </ul>
+- */
+-
++ * </li>
++ * </ul>
++ */
+ public static final String ORACLE_FEATURE_SERVICE_MECHANISM = "http://www.oracle.com/feature/use-service-mechanism";
+
+- /** Oracle JAXP property prefix ("http://www.oracle.com/xml/jaxp/properties/"). */
+- public static final String ORACLE_JAXP_PROPERTY_PREFIX =
+- "http://www.oracle.com/xml/jaxp/properties/";
+
+ //System Properties corresponding to ACCESS_EXTERNAL_* properties
+ public static final String SP_ACCESS_EXTERNAL_STYLESHEET = "javax.xml.accessExternalStylesheet";
+ public static final String SP_ACCESS_EXTERNAL_DTD = "javax.xml.accessExternalDTD";
+
+-
+ //all access keyword
+ public static final String ACCESS_EXTERNAL_ALL = "all";
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java Tue Oct 08 09:06:57 2013 -0700
+@@ -0,0 +1,449 @@
++/*
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
++ *
++ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
++ *
++ * The contents of this file are subject to the terms of either the GNU
++ * General Public License Version 2 only ("GPL") or the Common Development
++ * and Distribution License("CDDL") (collectively, the "License"). You
++ * may not use this file except in compliance with the License. You can
++ * obtain a copy of the License at
++ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
++ * or packager/legal/LICENSE.txt. See the License for the specific
++ * language governing permissions and limitations under the License.
++ *
++ * When distributing the software, include this License Header Notice in each
++ * file and include the License file at packager/legal/LICENSE.txt.
++ *
++ * GPL Classpath Exception:
++ * Oracle designates this particular file as subject to the "Classpath"
++ * exception as provided by Oracle in the GPL Version 2 section of the License
++ * file that accompanied this code.
++ *
++ * Modifications:
++ * If applicable, add the following below the License Header, with the fields
++ * enclosed by brackets [] replaced by your own identifying information:
++ * "Portions Copyright [year] [name of copyright owner]"
++ *
++ * Contributor(s):
++ * If you wish your version of this file to be governed by only the CDDL or
++ * only the GPL Version 2, indicate your decision by adding "[Contributor]
++ * elects to include this software in this distribution under the [CDDL or GPL
++ * Version 2] license." If you don't indicate a single choice of license, a
++ * recipient has the option to distribute your version of this file under
++ * either the CDDL, the GPL Version 2 or to extend the choice of license to
++ * its licensees as provided above. However, if you add GPL Version 2 code
++ * and therefore, elected the GPL Version 2 license, then the option applies
++ * only if the new code is made subject to such option by the copyright
++ * holder.
++ */
++package com.sun.org.apache.xalan.internal.utils;
++
++import com.sun.org.apache.xalan.internal.XalanConstants;
++
++
++/**
++ * This class is not the same as that in Xerces. It is used to manage the
++ * state of corresponding Xerces properties and pass the values over to
++ * the Xerces Security Manager.
++ *
++ * @author Joe Wang Oracle Corp.
++ *
++ */
++public final class XMLSecurityManager {
++
++ /**
++ * States of the settings of a property, in the order: default value, value
++ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
++ * properties, and jaxp api properties
++ */
++ public static enum State {
++ //this order reflects the overriding order
++
++ DEFAULT("default"), FSP("FEATURE_SECURE_PROCESSING"),
++ JAXPDOTPROPERTIES("jaxp.properties"), SYSTEMPROPERTY("system property"),
++ APIPROPERTY("property");
++
++ final String literal;
++ State(String literal) {
++ this.literal = literal;
++ }
++
++ String literal() {
++ return literal;
++ }
++ }
++
++ /**
++ * Limits managed by the security manager
++ */
++ public static enum Limit {
++
++ ENTITY_EXPANSION_LIMIT(XalanConstants.JDK_ENTITY_EXPANSION_LIMIT,
++ XalanConstants.SP_ENTITY_EXPANSION_LIMIT, 0, 64000),
++ MAX_OCCUR_NODE_LIMIT(XalanConstants.JDK_MAX_OCCUR_LIMIT,
++ XalanConstants.SP_MAX_OCCUR_LIMIT, 0, 5000),
++ ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.JDK_ELEMENT_ATTRIBUTE_LIMIT,
++ XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
++ TOTAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_TOTAL_ENTITY_SIZE_LIMIT,
++ XalanConstants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
++ GENEAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_GENEAL_ENTITY_SIZE_LIMIT,
++ XalanConstants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
++ PARAMETER_ENTITY_SIZE_LIMIT(XalanConstants.JDK_PARAMETER_ENTITY_SIZE_LIMIT,
++ XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000);
++
++ final String apiProperty;
++ final String systemProperty;
++ final int defaultValue;
++ final int secureValue;
++
++ Limit(String apiProperty, String systemProperty, int value, int secureValue) {
++ this.apiProperty = apiProperty;
++ this.systemProperty = systemProperty;
++ this.defaultValue = value;
++ this.secureValue = secureValue;
++ }
++
++ public boolean equalsAPIPropertyName(String propertyName) {
++ return (propertyName == null) ? false : apiProperty.equals(propertyName);
++ }
++
++ public boolean equalsSystemPropertyName(String propertyName) {
++ return (propertyName == null) ? false : systemProperty.equals(propertyName);
++ }
++
++ public String apiProperty() {
++ return apiProperty;
++ }
++
++ String systemProperty() {
++ return systemProperty;
++ }
++
++ int defaultValue() {
++ return defaultValue;
++ }
++
++ int secureValue() {
++ return secureValue;
++ }
++ }
++
++ /**
++ * Map old property names with the new ones
++ */
++ public static enum NameMap {
++
++ ENTITY_EXPANSION_LIMIT(XalanConstants.SP_ENTITY_EXPANSION_LIMIT,
++ XalanConstants.ENTITY_EXPANSION_LIMIT),
++ MAX_OCCUR_NODE_LIMIT(XalanConstants.SP_MAX_OCCUR_LIMIT,
++ XalanConstants.MAX_OCCUR_LIMIT),
++ ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT,
++ XalanConstants.ELEMENT_ATTRIBUTE_LIMIT);
++ final String newName;
++ final String oldName;
++
++ NameMap(String newName, String oldName) {
++ this.newName = newName;
++ this.oldName = oldName;
++ }
++
++ String getOldName(String newName) {
++ if (newName.equals(this.newName)) {
++ return oldName;
++ }
++ return null;
++ }
++ }
++ /**
++ * Values of the properties
++ */
++ private final int[] values;
++ /**
++ * States of the settings for each property
++ */
++ private State[] states;
++ /**
++ * States that determine if properties are set explicitly
++ */
++ private boolean[] isSet;
++
++
++ /**
++ * Index of the special entityCountInfo property
++ */
++ private int indexEntityCountInfo = 10000;
++ private String printEntityCountInfo = "";
++
++ /**
++ * Default constructor. Establishes default values for known security
++ * vulnerabilities.
++ */
++ public XMLSecurityManager() {
++ this(false);
++ }
++
++ /**
++ * Instantiate Security Manager in accordance with the status of
++ * secure processing
++ * @param secureProcessing
++ */
++ public XMLSecurityManager(boolean secureProcessing) {
++ values = new int[Limit.values().length];
++ states = new State[Limit.values().length];
++ isSet = new boolean[Limit.values().length];
++ for (Limit limit : Limit.values()) {
++ if (secureProcessing) {
++ values[limit.ordinal()] = limit.secureValue();
++ states[limit.ordinal()] = State.FSP;
++ } else {
++ values[limit.ordinal()] = limit.defaultValue();
++ states[limit.ordinal()] = State.DEFAULT;
++ }
++ }
++ //read system properties or jaxp.properties
++ readSystemProperties();
++ }
++
++ /**
++ * Setting FEATURE_SECURE_PROCESSING explicitly
++ */
++ public void setSecureProcessing(boolean secure) {
++ for (Limit limit : Limit.values()) {
++ if (secure) {
++ setLimit(limit.ordinal(), State.FSP, limit.secureValue());
++ } else {
++ setLimit(limit.ordinal(), State.FSP, limit.defaultValue());
++ }
++ }
++ }
++
++ /**
++ * Set limit by property name and state
++ * @param propertyName property name
++ * @param state the state of the property
++ * @param value the value of the property
++ * @return true if the property is managed by the security manager; false
++ * if otherwise.
++ */
++ public boolean setLimit(String propertyName, State state, Object value) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ setLimit(index, state, value);
++ return true;
++ }
++ return false;
++ }
++
++ /**
++ * Set the value for a specific limit.
++ *
++ * @param limit the limit
++ * @param state the state of the property
++ * @param value the value of the property
++ */
++ public void setLimit(Limit limit, State state, int value) {
++ setLimit(limit.ordinal(), state, value);
++ }
++
++ /**
++ * Set the value of a property by its index
++ *
++ * @param index the index of the property
++ * @param state the state of the property
++ * @param value the value of the property
++ */
++ public void setLimit(int index, State state, Object value) {
++ if (index == indexEntityCountInfo) {
++ //if it's explicitly set, it's treated as yes no matter the value
++ printEntityCountInfo = (String)value;
++ } else {
++ int temp = 0;
++ try {
++ temp = Integer.parseInt((String) value);
++ if (temp < 0) {
++ temp = 0;
++ }
++ } catch (NumberFormatException e) {}
++ setLimit(index, state, temp); }
++ }
++
++ /**
++ * Set the value of a property by its index
++ *
++ * @param index the index of the property
++ * @param state the state of the property
++ * @param value the value of the property
++ */
++ public void setLimit(int index, State state, int value) {
++ if (index == indexEntityCountInfo) {
++ //if it's explicitly set, it's treated as yes no matter the value
++ printEntityCountInfo = XalanConstants.JDK_YES;
++ } else {
++ //only update if it shall override
++ if (state.compareTo(states[index]) >= 0) {
++ values[index] = value;
++ states[index] = state;
++ isSet[index] = true;
++ }
++ }
++ }
++
++
++ /**
++ * Return the value of the specified property.
++ *
++ * @param propertyName the property name
++ * @return the value of the property as a string. If a property is managed
++ * by this manager, its value shall not be null.
++ */
++ public String getLimitAsString(String propertyName) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ return getLimitValueByIndex(index);
++ }
++
++ return null;
++ }
++
++ /**
++ * Return the value of a property by its ordinal
++ *
++ * @param limit the property
++ * @return value of a property
++ */
++ public String getLimitValueAsString(Limit limit) {
++ return Integer.toString(values[limit.ordinal()]);
++ }
++
++ /**
++ * Return the value of the specified property
++ *
++ * @param limit the property
++ * @return the value of the property
++ */
++ public int getLimit(Limit limit) {
++ return values[limit.ordinal()];
++ }
++
++ /**
++ * Return the value of a property by its ordinal
++ *
++ * @param index the index of a property
++ * @return value of a property
++ */
++ public int getLimitByIndex(int index) {
++ return values[index];
++ }
++ /**
++ * Return the value of a property by its index
++ *
++ * @param index the index of a property
++ * @return limit of a property as a string
++ */
++ public String getLimitValueByIndex(int index) {
++ if (index == indexEntityCountInfo) {
++ return printEntityCountInfo;
++ }
++
++ return Integer.toString(values[index]);
++ }
++ /**
++ * Return the state of the limit property
++ *
++ * @param limit the limit
++ * @return the state of the limit property
++ */
++ public State getState(Limit limit) {
++ return states[limit.ordinal()];
++ }
++
++ /**
++ * Return the state of the limit property
++ *
++ * @param limit the limit
++ * @return the state of the limit property
++ */
++ public String getStateLiteral(Limit limit) {
++ return states[limit.ordinal()].literal();
++ }
++
++ /**
++ * Get the index by property name
++ *
++ * @param propertyName property name
++ * @return the index of the property if found; return -1 if not
++ */
++ public int getIndex(String propertyName) {
++ for (Limit limit : Limit.values()) {
++ if (limit.equalsAPIPropertyName(propertyName)) {
++ //internally, ordinal is used as index
++ return limit.ordinal();
++ }
++ }
++ //special property to return entity count info
++ if (propertyName.equals(XalanConstants.JDK_ENTITY_COUNT_INFO)) {
++ return indexEntityCountInfo;
++ }
++ return -1;
++ }
++
++ /**
++ * Indicate if a property is set explicitly
++ * @param index
++ * @return
++ */
++ public boolean isSet(int index) {
++ return isSet[index];
++ }
++
++ public boolean printEntityCountInfo() {
++ return printEntityCountInfo.equals(XalanConstants.JDK_YES);
++ }
++ /**
++ * Read from system properties, or those in jaxp.properties
++ */
++ private void readSystemProperties() {
++
++ for (Limit limit : Limit.values()) {
++ if (!getSystemProperty(limit, limit.systemProperty())) {
++ //if system property is not found, try the older form if any
++ for (NameMap nameMap : NameMap.values()) {
++ String oldName = nameMap.getOldName(limit.systemProperty());
++ if (oldName != null) {
++ getSystemProperty(limit, oldName);
++ }
++ }
++ }
++ }
++
++ }
++
++ /**
++ * Read from system properties, or those in jaxp.properties
++ *
++ * @param property the type of the property
++ * @param sysPropertyName the name of system property
++ */
++ private boolean getSystemProperty(Limit limit, String sysPropertyName) {
++ try {
++ String value = SecuritySupport.getSystemProperty(sysPropertyName);
++ if (value != null && !value.equals("")) {
++ values[limit.ordinal()] = Integer.parseInt(value);
++ states[limit.ordinal()] = State.SYSTEMPROPERTY;
++ return true;
++ }
++
++ value = SecuritySupport.readJAXPProperty(sysPropertyName);
++ if (value != null && !value.equals("")) {
++ values[limit.ordinal()] = Integer.parseInt(value);
++ states[limit.ordinal()] = State.JAXPDOTPROPERTIES;
++ return true;
++ }
++ } catch (NumberFormatException e) {
++ //invalid setting
++ throw new NumberFormatException("Invalid setting for system property: " + limit.systemProperty());
++ }
++ return false;
++ }
++}
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java Tue Oct 08 09:06:57 2013 -0700
+@@ -94,6 +94,23 @@
+ }
+
+ /**
++ * Set limit by property name and state
++ * @param propertyName property name
++ * @param state the state of the property
++ * @param value the value of the property
++ * @return true if the property is managed by the security property manager;
++ * false if otherwise.
++ */
++ public boolean setValue(String propertyName, State state, Object value) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ setValue(index, state, (String)value);
++ return true;
++ }
++ return false;
++ }
++
++ /**
+ * Set the value for a specific property.
+ *
+ * @param property the property
+@@ -121,6 +138,22 @@
+ states[index] = state;
+ }
+ }
++
++ /**
++ * Return the value of the specified property
++ *
++ * @param propertyName the property name
++ * @return the value of the property as a string
++ */
++ public String getValue(String propertyName) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ return getValueByIndex(index);
++ }
++
++ return null;
++ }
++
+ /**
+ * Return the value of the specified property
+ *
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java Tue Oct 08 09:06:57 2013 -0700
+@@ -86,7 +86,7 @@
+ if (input == null) {
+ docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc);
+ String accessError = SecuritySupport.checkAccess(docToLoad,
+- xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
++ (String)xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
+ XalanConstants.ACCESS_EXTERNAL_ALL);
+
+ if (accessError != null) {
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java Tue Oct 08 09:06:57 2013 -0700
+@@ -87,7 +87,7 @@
+ if (input == null) {
+ docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc);
+ String accessError = SecuritySupport.checkAccess(docToLoad,
+- xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
++ (String)xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
+ XalanConstants.ACCESS_EXTERNAL_ALL);
+
+ if (accessError != null) {
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java Tue Oct 08 09:06:57 2013 -0700
+@@ -28,6 +28,7 @@
+ import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
+ import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
+ import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
++import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.MethodType;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type;
+@@ -487,6 +488,20 @@
+ }
+
+ final XMLReader reader = parser.getXMLReader();
++ try {
++ XMLSecurityManager securityManager =
++ (XMLSecurityManager)_xsltc.getProperty(XalanConstants.SECURITY_MANAGER);
++ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
++ reader.setProperty(limit.apiProperty(), securityManager.getLimitValueAsString(limit));
++ }
++ if (securityManager.printEntityCountInfo()) {
++ parser.setProperty(XalanConstants.JDK_ENTITY_COUNT_INFO, XalanConstants.JDK_YES);
++ }
++ } catch (SAXException se) {
++ System.err.println("Warning: " + reader.getClass().getName() + ": "
++ + se.getMessage());
++ }
++
+ return(parse(reader, input));
+ }
+ catch (ParserConfigurationException e) {
+@@ -565,7 +580,7 @@
+ }
+ path = SystemIDResolver.getAbsoluteURI(path);
+ String accessError = SecuritySupport.checkAccess(path,
+- _xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
++ (String)_xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
+ XalanConstants.ACCESS_EXTERNAL_ALL);
+ if (accessError != null) {
+ ErrorMsg msg = new ErrorMsg(ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Tue Oct 08 09:06:57 2013 -0700
+@@ -44,11 +44,11 @@
+ import com.sun.org.apache.bcel.internal.classfile.JavaClass;
+ import com.sun.org.apache.xalan.internal.XalanConstants;
+ import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
++import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Util;
+ import com.sun.org.apache.xml.internal.dtm.DTM;
+
+-import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
+ import org.xml.sax.InputSource;
+ import org.xml.sax.XMLReader;
+
+@@ -146,6 +146,7 @@
+ */
+ private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
+
++ private XMLSecurityManager _xmlSecurityManager;
+
+ /**
+ * XSLTC compiler constructor
+@@ -184,12 +185,14 @@
+ /**
+ * Return allowed protocols for accessing external stylesheet.
+ */
+- public String getProperty(String name) {
++ public Object getProperty(String name) {
+ if (name.equals(XMLConstants.ACCESS_EXTERNAL_STYLESHEET)) {
+ return _accessExternalStylesheet;
+ }
+ else if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
+ return _accessExternalDTD;
++ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
++ return _xmlSecurityManager;
+ }
+ return null;
+ }
+@@ -197,12 +200,14 @@
+ /**
+ * Set allowed protocols for accessing external stylesheet.
+ */
+- public void setProperty(String name, String value) {
++ public void setProperty(String name, Object value) {
+ if (name.equals(XMLConstants.ACCESS_EXTERNAL_STYLESHEET)) {
+ _accessExternalStylesheet = (String)value;
+ }
+ else if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
+ _accessExternalDTD = (String)value;
++ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
++ _xmlSecurityManager = (XMLSecurityManager)value;
+ }
+ }
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java Tue Oct 08 09:06:57 2013 -0700
+@@ -29,7 +29,7 @@
+ import javax.xml.transform.TransformerException;
+ import javax.xml.transform.URIResolver;
+ import javax.xml.transform.sax.TemplatesHandler;
+-
++import com.sun.org.apache.xalan.internal.XalanConstants;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.CompilerException;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.Parser;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.SourceLoader;
+@@ -103,6 +103,8 @@
+ (String)tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET));
+ xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD,
+ (String)tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_DTD));
++ xsltc.setProperty(XalanConstants.SECURITY_MANAGER,
++ tfactory.getAttribute(XalanConstants.SECURITY_MANAGER));
+
+
+ if ("true".equals(tfactory.getAttribute(TransformerFactoryImpl.ENABLE_INLINING)))
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Tue Oct 08 09:06:57 2013 -0700
+@@ -77,6 +77,7 @@
+ import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.Property;
+ import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.State;
++import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
+
+ import org.xml.sax.InputSource;
+ import org.xml.sax.XMLFilter;
+@@ -227,17 +228,17 @@
+ */
+ private boolean _useServicesMechanism;
+
+- /**
++ /**
+ * protocols allowed for external references set by the stylesheet processing instruction, Import and Include element.
+ */
+ private String _accessExternalStylesheet = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
+-
+ /**
+ * protocols allowed for external DTD references in source file and/or stylesheet.
+ */
+ private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
+
+ private XMLSecurityPropertyManager _xmlSecurityPropertyMgr;
++ private XMLSecurityManager _xmlSecurityManager;
+
+ /**
+ * javax.xml.transform.sax.TransformerFactory implementation.
+@@ -264,6 +265,9 @@
+ Property.ACCESS_EXTERNAL_DTD);
+ _accessExternalStylesheet = _xmlSecurityPropertyMgr.getValue(
+ Property.ACCESS_EXTERNAL_STYLESHEET);
++
++ //Parser's security manager
++ _xmlSecurityManager = new XMLSecurityManager(true);
+ }
+
+ /**
+@@ -322,11 +326,21 @@
+ return Boolean.TRUE;
+ else
+ return Boolean.FALSE;
++ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
++ return _xmlSecurityManager;
+ }
+
+- int index = _xmlSecurityPropertyMgr.getIndex(name);
+- if (index > -1) {
+- return _xmlSecurityPropertyMgr.getValueByIndex(index);
++ /** Check to see if the property is managed by the security manager **/
++ String propertyValue = (_xmlSecurityManager != null) ?
++ _xmlSecurityManager.getLimitAsString(name) : null;
++ if (propertyValue != null) {
++ return propertyValue;
++ } else {
++ propertyValue = (_xmlSecurityPropertyMgr != null) ?
++ _xmlSecurityPropertyMgr.getValue(name) : null;
++ if (propertyValue != null) {
++ return propertyValue;
++ }
+ }
+
+ // Throw an exception for all other attributes
+@@ -429,10 +443,13 @@
+ }
+ }
+
+- int index = _xmlSecurityPropertyMgr.getIndex(name);
+- if (index > -1) {
+- _xmlSecurityPropertyMgr.setValue(index,
+- State.APIPROPERTY, (String)value);
++ if (_xmlSecurityManager != null &&
++ _xmlSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
++ return;
++ }
++
++ if (_xmlSecurityPropertyMgr != null &&
++ _xmlSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
+ _accessExternalDTD = _xmlSecurityPropertyMgr.getValue(
+ Property.ACCESS_EXTERNAL_DTD);
+ _accessExternalStylesheet = _xmlSecurityPropertyMgr.getValue(
+@@ -482,6 +499,7 @@
+ throw new TransformerConfigurationException(err.toString());
+ }
+ _isNotSecureProcessing = !value;
++ _xmlSecurityManager.setSecureProcessing(value);
+
+ // set external access restriction when FSP is explicitly set
+ if (value && XalanConstants.IS_JDK8_OR_ABOVE) {
+@@ -851,6 +869,7 @@
+ if (!_isNotSecureProcessing) xsltc.setSecureProcessing(true);
+ xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, _accessExternalStylesheet);
+ xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, _accessExternalDTD);
++ xsltc.setProperty(XalanConstants.SECURITY_MANAGER, _xmlSecurityManager);
+ xsltc.init();
+
+ // Set a document loader (for xsl:include/import) if defined
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java Tue Oct 08 09:06:57 2013 -0700
+@@ -25,6 +25,7 @@
+
+ import com.sun.org.apache.xalan.internal.XalanConstants;
+ import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
++import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
+ import java.io.File;
+ import java.io.FileOutputStream;
+ import java.io.IOException;
+@@ -218,6 +219,7 @@
+ */
+ private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
+
++ private XMLSecurityManager _securityManager;
+ /**
+ * A hashtable to store parameters for the identity transform. These
+ * are not needed during the transformation, but we must keep track of
+@@ -272,8 +274,11 @@
+ _useServicesMechanism = _tfactory.useServicesMechnism();
+ _accessExternalStylesheet = (String)_tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET);
+ _accessExternalDTD = (String)_tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_DTD);
++ _securityManager = (XMLSecurityManager)_tfactory.getAttribute(XalanConstants.SECURITY_MANAGER);
+ _readerManager = XMLReaderManager.getInstance(_useServicesMechanism);
+ _readerManager.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, _accessExternalDTD);
++ _readerManager.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, _isSecureProcessing);
++ _readerManager.setProperty(XalanConstants.SECURITY_MANAGER, _securityManager);
+ //_isIncremental = tfactory._incremental;
+ }
+
+@@ -289,6 +294,7 @@
+ */
+ public void setSecureProcessing(boolean flag) {
+ _isSecureProcessing = flag;
++ _readerManager.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, _isSecureProcessing);
+ }
+ /**
+ * Return the state of the services mechanism feature.
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java Tue Oct 08 09:06:57 2013 -0700
+@@ -23,6 +23,7 @@
+
+ package com.sun.org.apache.xalan.internal.xsltc.trax;
+
++import com.sun.org.apache.xalan.internal.XalanConstants;
+ import java.io.InputStream;
+ import java.io.Reader;
+
+@@ -43,6 +44,7 @@
+ import javax.xml.transform.stream.StreamSource;
+
+ import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
++import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
+
+@@ -105,6 +107,13 @@
+ if (reader == null) {
+ try {
+ reader= XMLReaderFactory.createXMLReader();
++ try {
++ reader.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
++ xsltc.isSecureProcessing());
++ } catch (SAXNotRecognizedException e) {
++ System.err.println("Warning: " + reader.getClass().getName() + ": "
++ + e.getMessage());
++ }
+ } catch (Exception e ) {
+ try {
+
+@@ -144,6 +153,22 @@
+ + e.getMessage());
+ }
+
++ try {
++ XMLSecurityManager securityManager =
++ (XMLSecurityManager)xsltc.getProperty(XalanConstants.SECURITY_MANAGER);
++ if (securityManager != null) {
++ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
++ reader.setProperty(limit.apiProperty(),
++ securityManager.getLimitValueAsString(limit));
++ }
++ if (securityManager.printEntityCountInfo()) {
++ reader.setProperty(XalanConstants.JDK_ENTITY_COUNT_INFO, XalanConstants.JDK_YES);
++ }
++ }
++ } catch (SAXException se) {
++ System.err.println("Warning: " + reader.getClass().getName() + ": "
++ + se.getMessage());
++ }
+ xsltc.setXMLReader(reader);
+ }catch (SAXNotRecognizedException snre ) {
+ throw new TransformerConfigurationException
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java Tue Oct 08 09:06:57 2013 -0700
+@@ -33,6 +33,7 @@
+ import com.sun.org.apache.xerces.internal.util.PropertyState;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
+ import com.sun.org.apache.xerces.internal.utils.ObjectFactory;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.XMLDTDContentModelHandler;
+ import com.sun.org.apache.xerces.internal.xni.XMLDTDHandler;
+@@ -59,6 +60,7 @@
+ import org.w3c.dom.ls.LSResourceResolver;
+
+
++
+ /**
+ * Xerces implementation of DOMConfiguration that maintains a table of recognized parameters.
+ *
+@@ -156,6 +158,9 @@
+ protected static final String SCHEMA_DV_FACTORY =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.SCHEMA_DV_FACTORY_PROPERTY;
+
++ /** Property identifier: Security manager. */
++ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
++
+ /** Property identifier: Security property manager. */
+ private static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+@@ -279,6 +284,7 @@
+ JAXP_SCHEMA_LANGUAGE,
+ DTD_VALIDATOR_FACTORY_PROPERTY,
+ SCHEMA_DV_FACTORY,
++ SECURITY_MANAGER,
+ XML_SECURITY_PROPERTY_MANAGER
+ };
+ addRecognizedProperties(recognizedProperties);
+@@ -313,6 +319,8 @@
+ fValidationManager = createValidationManager();
+ setProperty(VALIDATION_MANAGER, fValidationManager);
+
++ setProperty(SECURITY_MANAGER, new XMLSecurityManager(true));
++
+ setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER,
+ new XMLSecurityPropertyManager());
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java Tue Oct 08 09:06:57 2013 -0700
+@@ -174,8 +174,6 @@
+ /** JAXP schemaSource language: when used internally may include DTD namespace (DOM) */
+ public static final String SCHEMA_LANGUAGE = "schemaLanguage";
+
+- public static final String SYSTEM_PROPERTY_ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
+-
+ /** JAXP Standard property prefix ("http://javax.xml.XMLConstants/property/"). */
+ public static final String JAXPAPI_PROPERTY_PREFIX =
+ "http://javax.xml.XMLConstants/property/";
+@@ -209,6 +207,107 @@
+ public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8);
+
+ //
++ // Implementation limits: corresponding System Properties of the above
++ // API properties
++ //
++ /**
++ * JDK entity expansion limit; Note that the existing system property
++ * "entityExpansionLimit" with no prefix is still observed
++ */
++ public static final String JDK_ENTITY_EXPANSION_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "entityExpansionLimit";
++
++ /**
++ * JDK element attribute limit; Note that the existing system property
++ * "elementAttributeLimit" with no prefix is still observed
++ */
++ public static final String JDK_ELEMENT_ATTRIBUTE_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "elementAttributeLimit";
++
++ /**
++ * JDK maxOccur limit; Note that the existing system property
++ * "maxOccurLimit" with no prefix is still observed
++ */
++ public static final String JDK_MAX_OCCUR_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxOccurLimit";
++
++ /**
++ * JDK total entity size limit
++ */
++ public static final String JDK_TOTAL_ENTITY_SIZE_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "totalEntitySizeLimit";
++
++ /**
++ * JDK maximum general entity size limit
++ */
++ public static final String JDK_GENEAL_ENTITY_SIZE_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
++ /**
++ * JDK maximum parameter entity size limit
++ */
++ public static final String JDK_PARAMETER_ENTITY_SIZE_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxParameterEntitySizeLimit";
++ /**
++ * JDK maximum XML name limit
++ */
++ public static final String JDK_XML_NAME_LIMIT =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
++ /**
++ * JDK property to allow printing out information from the limit analyzer
++ */
++ public static final String JDK_ENTITY_COUNT_INFO =
++ ORACLE_JAXP_PROPERTY_PREFIX + "getEntityCountInfo";
++
++ //
++ // Implementation limits: API properties
++ //
++ /**
++ * JDK entity expansion limit; Note that the existing system property
++ * "entityExpansionLimit" with no prefix is still observed
++ */
++ public static final String SP_ENTITY_EXPANSION_LIMIT = "jdk.xml.entityExpansionLimit";
++
++ /**
++ * JDK element attribute limit; Note that the existing system property
++ * "elementAttributeLimit" with no prefix is still observed
++ */
++ public static final String SP_ELEMENT_ATTRIBUTE_LIMIT = "jdk.xml.elementAttributeLimit";
++
++ /**
++ * JDK maxOccur limit; Note that the existing system property
++ * "maxOccurLimit" with no prefix is still observed
++ */
++ public static final String SP_MAX_OCCUR_LIMIT = "jdk.xml.maxOccurLimit";
++
++ /**
++ * JDK total entity size limit
++ */
++ public static final String SP_TOTAL_ENTITY_SIZE_LIMIT = "jdk.xml.totalEntitySizeLimit";
++
++ /**
++ * JDK maximum general entity size limit
++ */
++ public static final String SP_GENEAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
++ /**
++ * JDK maximum parameter entity size limit
++ */
++ public static final String SP_PARAMETER_ENTITY_SIZE_LIMIT = "jdk.xml.maxParameterEntitySizeLimit";
++ /**
++ * JDK maximum XML name limit
++ */
++ public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
++
++ //legacy System Properties
++ public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
++ public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
++ public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
++
++ /**
++ * A string "yes" that can be used for properties such as getEntityCountInfo
++ */
++ public static final String JDK_YES = "yes";
++
++ //
+ // DOM features
+ //
+
+@@ -443,7 +542,7 @@
+ public static final String LOCALE_PROPERTY = "locale";
+
+ /** property identifier: security manager. */
+- protected static final String SECURITY_MANAGER =
++ public static final String SECURITY_MANAGER =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
+
+
+@@ -511,9 +610,6 @@
+ */
+ public final static String ATTRIBUTE_DECLARED = "ATTRIBUTE_DECLARED";
+
+- public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
+-
+- public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
+
+ /**
+ * {@link org.w3c.dom.TypeInfo} associated with current element/attribute
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java Tue Oct 08 09:06:57 2013 -0700
+@@ -25,6 +25,7 @@
+
+ package com.sun.org.apache.xerces.internal.impl;
+
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.xml.internal.stream.StaxEntityResolverWrapper;
+ import java.util.HashMap;
+@@ -50,12 +51,16 @@
+
+ private static final String STRING_INTERNING = "http://xml.org/sax/features/string-interning";
+
++ /** Property identifier: Security manager. */
++ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
++
+ /** Property identifier: Security property manager. */
+ private static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
+ HashMap supportedProps = new HashMap();
+
++ private XMLSecurityManager fSecurityManager;
+ private XMLSecurityPropertyManager fSecurityPropertyMgr;
+
+ public static final int CONTEXT_READER = 1;
+@@ -82,6 +87,7 @@
+
+ HashMap properties = propertyManager.getProperties();
+ supportedProps.putAll(properties);
++ fSecurityManager = (XMLSecurityManager)getProperty(SECURITY_MANAGER);
+ fSecurityPropertyMgr = (XMLSecurityPropertyManager)getProperty(XML_SECURITY_PROPERTY_MANAGER);
+ }
+
+@@ -124,6 +130,8 @@
+ supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_DUPLICATE_ENTITYDEF_FEATURE, new Boolean(false));
+ supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_UNDECLARED_ELEMDEF_FEATURE, new Boolean(false));
+
++ fSecurityManager = new XMLSecurityManager(true);
++ supportedProps.put(SECURITY_MANAGER, fSecurityManager);
+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+ supportedProps.put(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
+ }
+@@ -142,6 +150,7 @@
+ */
+ public boolean containsProperty(String property){
+ return supportedProps.containsKey(property) ||
++ (fSecurityManager != null && fSecurityManager.getIndex(property) > -1) ||
+ (fSecurityPropertyMgr!=null && fSecurityPropertyMgr.getIndex(property) > -1) ;
+ }
+
+@@ -169,12 +178,34 @@
+ supportedProps.put( Constants.XERCES_PROPERTY_PREFIX + Constants.STAX_ENTITY_RESOLVER_PROPERTY , new StaxEntityResolverWrapper((XMLResolver)value)) ;
+ }
+
+- int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(property) : -1;
+- if (index > -1) {
+- fSecurityPropertyMgr.setValue(index,
+- XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
+- } else {
+- supportedProps.put(property, value);
++ /**
++ * It's possible for users to set a security manager through the interface.
++ * If it's the old SecurityManager, convert it to the new XMLSecurityManager
++ */
++ if (property.equals(Constants.SECURITY_MANAGER)) {
++ fSecurityManager = XMLSecurityManager.convert(value, fSecurityManager);
++ supportedProps.put(Constants.SECURITY_MANAGER, fSecurityManager);
++ return;
++ }
++ if (property.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
++ if (value == null) {
++ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
++ } else {
++ fSecurityPropertyMgr = (XMLSecurityPropertyManager)value;
++ }
++ supportedProps.put(Constants.XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
++ return;
++ }
++
++ //check if the property is managed by security manager
++ if (fSecurityManager == null ||
++ !fSecurityManager.setLimit(property, XMLSecurityManager.State.APIPROPERTY, value)) {
++ //check if the property is managed by security property manager
++ if (fSecurityPropertyMgr == null ||
++ !fSecurityPropertyMgr.setValue(property, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
++ //fall back to the existing property manager
++ supportedProps.put(property, value);
++ }
+ }
+
+ if(equivalentProperty != null){
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Tue Oct 08 09:06:57 2013 -0700
+@@ -108,6 +108,7 @@
+ * @author Elena Litani, IBM
+ * @author Michael Glavassevich, IBM
+ * @author Sunitha Reddy, Sun Microsystems
++ * @version $Id: XML11NSDocumentScannerImpl.java,v 1.6 2010-11-01 04:39:40 joehw Exp $
+ */
+ public class XML11NSDocumentScannerImpl extends XML11DocumentScannerImpl {
+
+@@ -236,7 +237,8 @@
+
+ // attributes
+ scanAttribute(fAttributes);
+- if (fSecurityManager != null && fAttributes.getLength() > fElementAttributeLimit){
++ if (fSecurityManager != null && (!fSecurityManager.isNoLimit(fElementAttributeLimit)) &&
++ fAttributes.getLength() > fElementAttributeLimit){
+ fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
+ "ElementAttributeLimit",
+ new Object[]{rawname, new Integer(fElementAttributeLimit) },
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Tue Oct 08 09:06:57 2013 -0700
+@@ -44,6 +44,8 @@
+ import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
+ import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
+ import com.sun.org.apache.xerces.internal.impl.Constants;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
++import com.sun.xml.internal.stream.Entity;
+
+ /**
+ * This class is responsible for scanning the declarations found
+@@ -66,7 +68,7 @@
+ * @author Glenn Marcy, IBM
+ * @author Eric Ye, IBM
+ *
+- * @version $Id: XMLDTDScannerImpl.java,v 1.7 2007/09/26 12:52:40 ndw Exp $
++ * @version $Id: XMLDTDScannerImpl.java,v 1.8 2010-11-01 04:39:41 joehw Exp $
+ */
+ public class XMLDTDScannerImpl
+ extends XMLScanner
+@@ -1545,7 +1547,7 @@
+
+ // internal entity
+ if (systemId == null) {
+- scanEntityValue(fLiteral, fLiteral2);
++ scanEntityValue(name, isPEDecl, fLiteral, fLiteral2);
+ // since we need it's value anyway, let's snag it so it doesn't get corrupted
+ // if a new load takes place before we store the entity values
+ fStringBuffer.clear();
+@@ -1610,7 +1612,7 @@
+ * the use of scanCharReferenceValue), and fStringBuffer2, anything in them
+ * at the time of calling is lost.
+ */
+- protected final void scanEntityValue(XMLString value,
++ protected final void scanEntityValue(String entityName, boolean isPEDecl, XMLString value,
+ XMLString nonNormalizedValue)
+ throws IOException, XNIException {
+ int quote = fEntityScanner.scanChar();
+@@ -1622,10 +1624,20 @@
+
+ XMLString literal = fString;
+ XMLString literal2 = fString;
++ int countChar = 0;
++ if (fLimitAnalyzer == null && fSecurityManager != null) {
++ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
++ fLimitAnalyzer.startEntity(entityName);
++ }
++
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
+ fStringBuffer.clear();
+ fStringBuffer2.clear();
+ do {
++ if (isPEDecl && fLimitAnalyzer != null) {
++ checkLimit("%" + entityName, fString.length + countChar);
++ }
++ countChar = 0;
+ fStringBuffer.append(fString);
+ fStringBuffer2.append(fString);
+ if (fEntityScanner.skipChar('&')) {
+@@ -1685,6 +1697,7 @@
+ }
+ }
+ else {
++ countChar++;
+ int c = fEntityScanner.peekChar();
+ if (XMLChar.isHighSurrogate(c)) {
+ scanSurrogates(fStringBuffer2);
+@@ -1708,9 +1721,17 @@
+ fStringBuffer2.append(fString);
+ literal = fStringBuffer;
+ literal2 = fStringBuffer2;
++ } else {
++ if (isPEDecl) {
++ checkLimit("%" + entityName, literal);
++ }
+ }
+ value.setValues(literal);
+ nonNormalizedValue.setValues(literal2);
++ if (fLimitAnalyzer != null) {
++ fLimitAnalyzer.endEntity(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT, entityName);
++ }
++
+ if (!fEntityScanner.skipChar(quote)) {
+ reportFatalError("CloseQuoteMissingInDecl", null);
+ }
+@@ -2126,6 +2147,43 @@
+ //new SymbolTable());
+ }
+
++ /**
++ * Add the count of the content buffer and check if the accumulated
++ * value exceeds the limit
++ * @param entityName entity name
++ * @param buffer content buffer
++ */
++ private void checkLimit(String entityName, XMLString buffer) {
++ checkLimit(entityName, buffer.length);
++ }
++
++ /**
++ * Add the count and check limit
++ * @param entityName entity name
++ * @param len length of the buffer
++ */
++ private void checkLimit(String entityName, int len) {
++ if (fLimitAnalyzer == null) {
++ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
++ }
++ fLimitAnalyzer.addValue(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT, entityName, len);
++ if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT)) {
++ fSecurityManager.debugPrint();
++ reportFatalError("MaxEntitySizeLimit", new Object[]{entityName,
++ fLimitAnalyzer.getValue(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT),
++ fSecurityManager.getLimit(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT),
++ fSecurityManager.getStateLiteral(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT)});
++ }
++ if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT)) {
++ fSecurityManager.debugPrint();
++ reportFatalError("TotalEntitySizeLimit",
++ new Object[]{fLimitAnalyzer.getTotalValue(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT),
++ fSecurityManager.getLimit(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT),
++ fSecurityManager.getStateLiteral(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT)});
++ }
++
++ }
++
+ public DTDGrammar getGrammar(){
+ return nvGrammarInfo;
+ }
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Tue Oct 08 09:06:57 2013 -0700
+@@ -50,12 +50,14 @@
+ import com.sun.org.apache.xerces.internal.xni.Augmentations;
+ import com.sun.org.apache.xerces.internal.impl.Constants;
+ import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+ import com.sun.org.apache.xerces.internal.util.NamespaceSupport;
+ import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
++import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager.Limit;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager.State;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
+-import com.sun.xml.internal.stream.Entity;
+ import javax.xml.XMLConstants;
+ import javax.xml.stream.XMLStreamConstants;
+ import javax.xml.stream.events.XMLEvent;
+@@ -165,7 +167,7 @@
+
+ /** Feature identifier: standard uri conformant */
+ protected static final String STANDARD_URI_CONFORMANT =
+- Constants.XERCES_FEATURE_PREFIX +Constants.STANDARD_URI_CONFORMANT_FEATURE;
++ Constants.XERCES_FEATURE_PREFIX + Constants.STANDARD_URI_CONFORMANT_FEATURE;
+
+ /** Property identifier: Security property manager. */
+ private static final String XML_SECURITY_PROPERTY_MANAGER =
+@@ -213,11 +215,8 @@
+ };
+
+ private static final char [] cdata = {'[','C','D','A','T','A','['};
++ static final char [] xmlDecl = {'<','?','x','m','l'};
+ private static final char [] endTag = {'<','/'};
+-
+- //this variable is also used by XMLDocumentScannerImpl in the same package
+- static final char [] xmlDecl = {'<','?','x','m','l'};
+-
+ // debugging
+
+ /** Debug scanner state. */
+@@ -316,6 +315,7 @@
+ protected String fDeclaredEncoding = null;
+ /** Xerces Feature: Disallow doctype declaration. */
+ protected boolean fDisallowDoctype = false;
++
+ /**
+ * comma-delimited list of protocols that are allowed for the purpose
+ * of accessing external dtd or entity references
+@@ -384,7 +384,6 @@
+
+ protected boolean foundBuiltInRefs = false;
+
+- protected SecurityManager fSecurityManager = null;
+
+ //skip element algorithm
+ static final short MAX_DEPTH_LIMIT = 5 ;
+@@ -571,8 +570,11 @@
+ // xerces features
+ fReportCdataEvent = componentManager.getFeature(Constants.STAX_REPORT_CDATA_EVENT, true);
+
+- fSecurityManager = (SecurityManager)componentManager.getProperty(Constants.SECURITY_MANAGER, null);
+- fElementAttributeLimit = (fSecurityManager != null)?fSecurityManager.getElementAttrLimit():0;
++ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(Constants.SECURITY_MANAGER, null);
++ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
++
++ fElementAttributeLimit = (fSecurityManager != null)?
++ fSecurityManager.getLimit(XMLSecurityManager.Limit.ELEMENT_ATTRIBUTE_LIMIT):0;
+
+ fNotifyBuiltInRefs = componentManager.getFeature(NOTIFY_BUILTIN_REFS, false);
+
+@@ -598,9 +600,6 @@
+ //xxx: external entities are supported in Xerces
+ // it would be good to define feature for this case
+ fSupportExternalEntities = true;
+- fSupportExternalEntities = true;
+- fSupportExternalEntities = true;
+- fSupportExternalEntities = true;
+ fReplaceEntityReferences = true;
+ fIsCoalesce = false;
+
+@@ -667,10 +666,13 @@
+
+ dtdGrammarUtil = null;
+
+- // JAXP 1.5 features and properties
++ // JAXP 1.5 features and properties
+ XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)
+ propertyManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
+ fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
++
++ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(Constants.SECURITY_MANAGER);
++ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+ } // reset(XMLComponentManager)
+
+ /**
+@@ -769,10 +771,10 @@
+
+ //JAXP 1.5 properties
+ if (propertyId.equals(XML_SECURITY_PROPERTY_MANAGER))
+- {
++ {
+ XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)value;
+ fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
+- }
++ }
+
+ } // setProperty(String,Object)
+
+@@ -1322,7 +1324,8 @@
+ fAddDefaultAttr = true;
+ do {
+ scanAttribute(fAttributes);
+- if (fSecurityManager != null && fAttributes.getLength() > fElementAttributeLimit){
++ if (fSecurityManager != null && !fSecurityManager.isNoLimit(fElementAttributeLimit) &&
++ fAttributes.getLength() > fElementAttributeLimit){
+ fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
+ "ElementAttributeLimit",
+ new Object[]{rawname, new Integer(fAttributes.getLength()) },
+@@ -2036,6 +2039,13 @@
+
+ } // getDriverName():String
+
++ /**
++ * Check the protocol used in the systemId against allowed protocols
++ *
++ * @param systemId the Id of the URI
++ * @param allowedProtocols a list of allowed protocols separated by comma
++ * @return the name of the protocol if rejected, null otherwise
++ */
+ String checkAccess(String systemId, String allowedProtocols) throws IOException {
+ String baseSystemId = fEntityScanner.getBaseSystemId();
+ String expandedSystemId = fEntityManager.expandSystemId(systemId, baseSystemId,fStrictURI);
+@@ -2833,6 +2843,8 @@
+ if(DEBUG){
+ System.out.println("NOT USING THE BUFFER, STRING = " + fTempString.toString());
+ }
++ //check limit before returning event
++ checkLimit(fContentBuffer);
+ if(dtdGrammarUtil!= null && dtdGrammarUtil.isIgnorableWhiteSpace(fContentBuffer)){
+ if(DEBUG)System.out.println("Return SPACE EVENT");
+ return XMLEvent.SPACE;
+@@ -2931,6 +2943,8 @@
+ fLastSectionWasCharacterData = true ;
+ continue;
+ }else{
++ //check limit before returning event
++ checkLimit(fContentBuffer);
+ if(dtdGrammarUtil!= null && dtdGrammarUtil.isIgnorableWhiteSpace(fContentBuffer)){
+ if(DEBUG)System.out.println("Return SPACE EVENT");
+ return XMLEvent.SPACE;
+@@ -3141,6 +3155,30 @@
+ } //while loop
+ }//next
+
++ /**
++ * Add the count of the content buffer and check if the accumulated
++ * value exceeds the limit
++ * @param buffer content buffer
++ */
++ protected void checkLimit(XMLStringBuffer buffer) {
++ if (fLimitAnalyzer.isTracking(fCurrentEntityName)) {
++ fLimitAnalyzer.addValue(Limit.GENEAL_ENTITY_SIZE_LIMIT, fCurrentEntityName, buffer.length);
++ if (fSecurityManager.isOverLimit(Limit.GENEAL_ENTITY_SIZE_LIMIT)) {
++ fSecurityManager.debugPrint();
++ reportFatalError("MaxEntitySizeLimit", new Object[]{fCurrentEntityName,
++ fLimitAnalyzer.getValue(Limit.GENEAL_ENTITY_SIZE_LIMIT),
++ fSecurityManager.getLimit(Limit.GENEAL_ENTITY_SIZE_LIMIT),
++ fSecurityManager.getStateLiteral(Limit.GENEAL_ENTITY_SIZE_LIMIT)});
++ }
++ if (fSecurityManager.isOverLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT)) {
++ fSecurityManager.debugPrint();
++ reportFatalError("TotalEntitySizeLimit",
++ new Object[]{fLimitAnalyzer.getTotalValue(Limit.TOTAL_ENTITY_SIZE_LIMIT),
++ fSecurityManager.getLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT),
++ fSecurityManager.getStateLiteral(Limit.TOTAL_ENTITY_SIZE_LIMIT)});
++ }
++ }
++ }
+
+ //
+ // Protected methods
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Tue Oct 08 09:06:57 2013 -0700
+@@ -18,19 +18,17 @@
+ * limitations under the License.
+ */
+
+-package com.sun.org.apache.xerces.internal.impl ;
+-
+-import com.sun.org.apache.xerces.internal.impl.Constants;
++package com.sun.org.apache.xerces.internal.impl;
++
+ import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader;
+ import com.sun.org.apache.xerces.internal.impl.io.UCSReader;
+ import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader;
+ import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
+-import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
+ import com.sun.org.apache.xerces.internal.impl.validation.ValidationManager;
+ import com.sun.org.apache.xerces.internal.util.*;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+-import com.sun.org.apache.xerces.internal.util.URI;
+ import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
++import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.Augmentations;
+ import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
+@@ -174,7 +172,6 @@
+ /** access external dtd: file protocol */
+ static final String EXTERNAL_ACCESS_DEFAULT = Constants.EXTERNAL_ACCESS_DEFAULT;
+
+-
+ // recognized features and properties
+
+ /** Recognized features. */
+@@ -307,6 +304,7 @@
+
+ /** used to restrict external access */
+ protected String fAccessExternalDTD = EXTERNAL_ACCESS_DEFAULT;
++
+ // settings
+
+ /**
+@@ -324,9 +322,12 @@
+ */
+ protected int fBufferSize = DEFAULT_BUFFER_SIZE;
+
+- // stores defaults for entity expansion limit if it has
+- // been set on the configuration.
+- protected SecurityManager fSecurityManager = null;
++ /** Security Manager */
++ protected XMLSecurityManager fSecurityManager = null;
++
++ protected XMLLimitAnalyzer fLimitAnalyzer = null;
++
++ protected int entityExpansionIndex;
+
+ /**
+ * True if the document entity is standalone. This should really
+@@ -352,10 +353,6 @@
+ /** XML 1.1 entity scanner. */
+ protected XMLEntityScanner fXML11EntityScanner;
+
+- /** entity expansion limit (contains useful data if and only if
+- fSecurityManager is non-null) */
+- protected int fEntityExpansionLimit = 0;
+-
+ /** count of entities expanded: */
+ protected int fEntityExpansionCount = 0;
+
+@@ -833,6 +830,9 @@
+ fCurrentEntity.setEncodingExternallySpecified(encodingExternallySpecified);
+ fEntityScanner.setCurrentEntity(fCurrentEntity);
+ fResourceIdentifier.setValues(publicId, literalSystemId, baseSystemId, expandedSystemId);
++ if (fLimitAnalyzer != null) {
++ fLimitAnalyzer.startEntity(name);
++ }
+ return encoding;
+ } //setupCurrentEntity(String, XMLInputSource, boolean, boolean): String
+
+@@ -1294,10 +1294,13 @@
+ //expansions exceeds the entity expansion limit, parser will throw fatal error.
+ // Note that this represents the nesting level of open entities.
+ fEntityExpansionCount++;
+- if( fSecurityManager != null && fEntityExpansionCount > fEntityExpansionLimit ){
+- fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
+- "EntityExpansionLimitExceeded",
+- new Object[]{new Integer(fEntityExpansionLimit) },
++ if(fLimitAnalyzer != null) {
++ fLimitAnalyzer.addValue(entityExpansionIndex, name, 1);
++ }
++ if( fSecurityManager != null && fSecurityManager.isOverLimit(entityExpansionIndex)){
++ fSecurityManager.debugPrint();
++ fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,"EntityExpansionLimitExceeded",
++ new Object[]{fSecurityManager.getLimitValueByIndex(entityExpansionIndex)},
+ XMLErrorReporter.SEVERITY_FATAL_ERROR );
+ // is there anything better to do than reset the counter?
+ // at least one can envision debugging applications where this might
+@@ -1361,6 +1364,12 @@
+ if(fCurrentEntity != null){
+ //close the reader
+ try{
++ if (fLimitAnalyzer != null) {
++ fLimitAnalyzer.endEntity(XMLSecurityManager.Limit.GENEAL_ENTITY_SIZE_LIMIT, fCurrentEntity.name);
++ if (fCurrentEntity.name.equals("[xml]")) {
++ fSecurityManager.debugPrint();
++ }
++ }
+ fCurrentEntity.close();
+ }catch(IOException ex){
+ throw new XNIException(ex);
+@@ -1426,6 +1435,9 @@
+ XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) propertyManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
+ fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
+
++ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(SECURITY_MANAGER);
++ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
++
+ // initialize state
+ //fStandalone = false;
+ fEntities.clear();
+@@ -1485,7 +1497,9 @@
+ fEntityResolver = (XMLEntityResolver)componentManager.getProperty(ENTITY_RESOLVER, null);
+ fStaxEntityResolver = (StaxEntityResolverWrapper)componentManager.getProperty(STAX_ENTITY_RESOLVER, null);
+ fValidationManager = (ValidationManager)componentManager.getProperty(VALIDATION_MANAGER, null);
+- fSecurityManager = (SecurityManager)componentManager.getProperty(SECURITY_MANAGER, null);
++ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER, null);
++ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
++ entityExpansionIndex = fSecurityManager.getIndex(Constants.JDK_ENTITY_EXPANSION_LIMIT);
+
+ // JAXP 1.5 feature
+ XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER, null);
+@@ -1506,7 +1520,6 @@
+ // a class acting as a component manager but not
+ // implementing that interface for whatever reason.
+ public void reset() {
+- fEntityExpansionLimit = (fSecurityManager != null)?fSecurityManager.getEntityExpansionLimit():0;
+
+ // initialize state
+ fStandalone = false;
+@@ -1642,19 +1655,18 @@
+ }
+ if (suffixLength == Constants.SECURITY_MANAGER_PROPERTY.length() &&
+ propertyId.endsWith(Constants.SECURITY_MANAGER_PROPERTY)) {
+- fSecurityManager = (SecurityManager)value;
+- fEntityExpansionLimit = (fSecurityManager != null)?fSecurityManager.getEntityExpansionLimit():0;
++ fSecurityManager = (XMLSecurityManager)value;
++ fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+ }
+ }
+
+ //JAXP 1.5 properties
+ if (propertyId.equals(XML_SECURITY_PROPERTY_MANAGER))
+- {
++ {
+ XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)value;
+ fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
++ }
+ }
+- }
+-
+ /**
+ * Returns a list of property identifiers that are recognized by
+ * this component. This method may return null if no properties
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Tue Oct 08 09:06:57 2013 -0700
+@@ -58,6 +58,7 @@
+ * @author Neeraj Bajaj, Sun Microsystems
+ * @author Venugopal Rao K, Sun Microsystems
+ * @author Elena Litani, IBM
++ * @version $Id: XMLNSDocumentScannerImpl.java,v 1.11 2010-11-01 04:39:41 joehw Exp $
+ */
+ public class XMLNSDocumentScannerImpl
+ extends XMLDocumentScannerImpl {
+@@ -251,7 +252,8 @@
+
+ do {
+ scanAttribute(fAttributes);
+- if (fSecurityManager != null && fAttributes.getLength() > fElementAttributeLimit){
++ if (fSecurityManager != null && (!fSecurityManager.isNoLimit(fElementAttributeLimit)) &&
++ fAttributes.getLength() > fElementAttributeLimit){
+ fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
+ "ElementAttributeLimit",
+ new Object[]{rawname, new Integer(fAttributes.getLength()) },
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Tue Oct 08 09:06:57 2013 -0700
+@@ -32,6 +32,8 @@
+ import com.sun.org.apache.xerces.internal.util.XMLChar;
+ import com.sun.org.apache.xerces.internal.util.XMLResourceIdentifierImpl;
+ import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
++import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.xni.Augmentations;
+ import com.sun.org.apache.xerces.internal.xni.XMLAttributes;
+ import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
+@@ -106,6 +108,9 @@
+ protected static final String ENTITY_MANAGER =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_MANAGER_PROPERTY;
+
++ /** Property identifier: Security manager. */
++ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
++
+ // debugging
+
+ /** Debug attribute normalization. */
+@@ -159,6 +164,12 @@
+ /** xxx this should be available from EntityManager Entity storage */
+ protected XMLEntityStorage fEntityStore = null ;
+
++ /** Security manager. */
++ protected XMLSecurityManager fSecurityManager = null;
++
++ /** Limit analyzer. */
++ protected XMLLimitAnalyzer fLimitAnalyzer = null;
++
+ // protected data
+
+ /** event type */
+@@ -256,6 +267,7 @@
+ fSymbolTable = (SymbolTable)componentManager.getProperty(SYMBOL_TABLE);
+ fErrorReporter = (XMLErrorReporter)componentManager.getProperty(ERROR_REPORTER);
+ fEntityManager = (XMLEntityManager)componentManager.getProperty(ENTITY_MANAGER);
++ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
+
+ //this step is extra because we have separated the storage of entity
+ fEntityStore = fEntityManager.getEntityStore() ;
+@@ -293,6 +305,10 @@
+ fEntityManager = (XMLEntityManager)value;
+ }
+ }
++
++ if (propertyId.equals(SECURITY_MANAGER)) {
++ fSecurityManager = (XMLSecurityManager)value;
++ }
+ /*else if(propertyId.equals(Constants.STAX_PROPERTIES)){
+ fStaxProperties = (HashMap)value;
+ //TODO::discuss with neeraj what are his thoughts on passing properties.
+@@ -352,6 +368,8 @@
+ fEntityManager = (XMLEntityManager)propertyManager.getProperty(ENTITY_MANAGER);
+ fEntityStore = fEntityManager.getEntityStore() ;
+ fEntityScanner = (XMLEntityScanner)fEntityManager.getEntityScanner() ;
++ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(SECURITY_MANAGER);
++
+ //fEntityManager.reset();
+ // DTD preparsing defaults:
+ fValidation = false;
+@@ -499,7 +517,7 @@
+ reportFatalError("SDDeclInvalid", new Object[] {standalone});
+ }
+ } else {
+- reportFatalError("EncodingDeclRequired", null);
++ reportFatalError("SDDeclNameInvalid", null);
+ }
+ break;
+ }
+@@ -510,8 +528,9 @@
+ sawSpace = fEntityScanner.skipSpaces();
+ }
+ // restore original literal value
+- if(currLiteral)
++ if(currLiteral) {
+ currEnt.literal = true;
++ }
+ // REVISIT: should we remove this error reporting?
+ if (scanningTextDecl && state != STATE_DONE) {
+ reportFatalError("MorePseudoAttributes", null);
+@@ -564,7 +583,7 @@
+ XMLString value)
+ throws IOException, XNIException {
+
+- String name = fEntityScanner.scanName();
++ String name = scanPseudoAttributeName();
+ // XMLEntityManager.print(fEntityManager.getCurrentEntity());
+
+ if (name == null) {
+@@ -617,6 +636,35 @@
+ } // scanPseudoAttribute(XMLString):String
+
+ /**
++ * Scans the name of a pseudo attribute. The only legal names
++ * in XML 1.0/1.1 documents are 'version', 'encoding' and 'standalone'.
++ *
++ * @return the name of the pseudo attribute or <code>null</code>
++ * if a legal pseudo attribute name could not be scanned.
++ */
++ private String scanPseudoAttributeName() throws IOException, XNIException {
++ final int ch = fEntityScanner.peekChar();
++ switch (ch) {
++ case 'v':
++ if (fEntityScanner.skipString(fVersionSymbol)) {
++ return fVersionSymbol;
++ }
++ break;
++ case 'e':
++ if (fEntityScanner.skipString(fEncodingSymbol)) {
++ return fEncodingSymbol;
++ }
++ break;
++ case 's':
++ if (fEntityScanner.skipString(fStandaloneSymbol)) {
++ return fStandaloneSymbol;
++ }
++ break;
++ }
++ return null;
++ } // scanPseudoAttributeName()
++
++ /**
+ * Scans a processing instruction.
+ * <p>
+ * <pre>
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -44,6 +44,7 @@
+
+ # 2.9 Standalone Document Declaration
+ SDDeclInvalid = The standalone document declaration value must be \"yes\" or \"no\", not \"{0}\".
++ SDDeclNameInvalid = The standalone name in XML declaration may be misspelled.
+ # 2.12 Language Identification
+ XMLLangInvalid = The xml:lang attribute value \"{0}\" is an invalid language identifier.
+ # 3. Logical Structures
+@@ -292,8 +293,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=The parser has encountered more than \"{0}\" entity expansions in this document; this is the limit imposed by the application.
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: The parser has encountered more than \"{0}\" entity expansions in this document; this is the limit imposed by the JDK.
++ ElementAttributeLimit=JAXP00010002: Element \"{0}\" has more than \"{1}\" attributes, \"{1}\" is the limit imposed by the JDK.
++ MaxEntitySizeLimit=JAXP00010003: The length of entity \"{0}\" is \"{1}\" that exceeds the \"{2}\" limit set by \"{3}\".
++ TotalEntitySizeLimit=JAXP00010004: The accumulated size \"{0}\" of entities exceeded the \"{1}\" limit set by \"{2}\".
++ MaxXMLNameLimit=JAXP00010005: The name \"{0}\" exceeded the \"{1}\" limit set by \"{2}\".
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,27 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +45,14 @@
+ InvalidCharInProlog = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Prolog des Dokuments gefunden.
+ InvalidCharInXMLDecl = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der XML-Deklaration gefunden.
+ # 2.4 Character Data and Markup
+- CDEndInContent = Zeichenfolge"\"]]>\" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
++ CDEndInContent = Zeichenfolge""]]>" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
+ # 2.7 CDATA Sections
+- CDSectUnterminated = CDATA-Abschnitt muss mit \"]]>\" enden.
++ CDSectUnterminated = CDATA-Abschnitt muss mit "]]>" enden.
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = XML-Deklaration darf nur ganz am Anfang des Dokuments enthalten sein.
+- EqRequiredInXMLDecl = Zeichen " = " muss auf \"{0}\" in der XML-Deklaration folgen.
+- QuoteRequiredInXMLDecl = Der Wert nach \"{0}\" in der XML-Deklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
+- XMLDeclUnterminated = XML-Deklaration muss mit \"?>\" enden.
++ EqRequiredInXMLDecl = Zeichen " = " muss auf "{0}" in der XML-Deklaration folgen.
++ QuoteRequiredInXMLDecl = Der Wert nach "{0}" in der XML-Deklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
++ XMLDeclUnterminated = XML-Deklaration muss mit "?>" enden.
+ VersionInfoRequired = Version ist in der XML-Deklaration erforderlich.
+ SpaceRequiredBeforeVersionInXMLDecl = Leerstelle vor dem Versionspseudoattribut in der XML-Deklaration erforderlich.
+ SpaceRequiredBeforeEncodingInXMLDecl = Leerstelle vor dem Codierungspseudoattribut in der XML-Deklaration erforderlich.
+@@ -71,70 +68,71 @@
+ ReferenceIllegalInTrailingMisc=Referenz ist nicht zul\u00E4ssig in angeh\u00E4ngtem Abschnitt.
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = Standalone-Dokumentdeklarationswert muss \"Ja\" oder \"Nein\" und nicht \"{0}\" sein.
++ SDDeclInvalid = Standalone-Dokumentdeklarationswert muss "Ja" oder "Nein" und nicht "{0}" sein.
++ SDDeclNameInvalid = Der Standalone-Name in der XML-Deklaration ist m\u00F6glicherweise falsch geschrieben.
+ # 2.12 Language Identification
+- XMLLangInvalid = xml:lang-Attributwert \"{0}\" ist eine ung\u00FCltige Sprach-ID.
++ XMLLangInvalid = xml:lang-Attributwert "{0}" ist eine ung\u00FCltige Sprach-ID.
+ # 3. Logical Structures
+- ETagRequired = Elementtyp \"{0}\" muss mit dem entsprechenden Endtag \"</{0}>\" beendet werden.
++ ETagRequired = Elementtyp "{0}" muss mit dem entsprechenden Endtag "</{0}>" beendet werden.
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = Auf Elementtyp \"{0}\" m\u00FCssen entweder Attributspezifikationen, \">\" oder \"/>\" folgen.
+- EqRequiredInAttribute = Mit Elementtyp \"{0}\" verkn\u00FCpfter Attributname \"{1}\" muss vom Zeichen " = " gefolgt werden.
+- OpenQuoteExpected = \u00D6ffnendes Anf\u00FChrungszeichen wird f\u00FCr Attribut \"{1}\" erwartet, das mit Elementtyp \"{0}\" verkn\u00FCpft ist.
+- CloseQuoteExpected = Schlie\u00DFendes Anf\u00FChrungszeichen wird f\u00FCr Attribut \"{1}\" erwartet, das mit Elementtyp \"{0}\" verkn\u00FCpft ist.
+- AttributeNotUnique = Attribut \"{1}\" wurde bereits f\u00FCr Element \"{0}\" angegeben.
+- AttributeNSNotUnique = An Namespace \"{2}\" gebundenes Attribut \"{1}\" wurde bereits f\u00FCr Element \"{0}\" angegeben.
+- ETagUnterminated = Endtag f\u00FCr Elementtyp \"{0}\" muss mit einem ">"-Begrenzungszeichen enden.
++ ElementUnterminated = Auf Elementtyp "{0}" m\u00FCssen entweder Attributspezifikationen, ">" oder "/>" folgen.
++ EqRequiredInAttribute = Mit Elementtyp "{0}" verkn\u00FCpfter Attributname "{1}" muss vom Zeichen " = " gefolgt werden.
++ OpenQuoteExpected = \u00D6ffnendes Anf\u00FChrungszeichen wird f\u00FCr Attribut "{1}" erwartet, das mit Elementtyp "{0}" verkn\u00FCpft ist.
++ CloseQuoteExpected = Schlie\u00DFendes Anf\u00FChrungszeichen wird f\u00FCr Attribut "{1}" erwartet, das mit Elementtyp "{0}" verkn\u00FCpft ist.
++ AttributeNotUnique = Attribut "{1}" wurde bereits f\u00FCr Element "{0}" angegeben.
++ AttributeNSNotUnique = An Namespace "{2}" gebundenes Attribut "{1}" wurde bereits f\u00FCr Element "{0}" angegeben.
++ ETagUnterminated = Endtag f\u00FCr Elementtyp "{0}" muss mit einem ">"-Begrenzungszeichen enden.
+ MarkupNotRecognizedInContent = Der Content von Elementen muss aus ordnungsgem\u00E4\u00DF formatierten Zeichendaten oder Markups bestehen.
+ DoctypeIllegalInContent = DOCTYPE ist nicht zul\u00E4ssig in Content.
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = Referenz muss mit einem ";"-Begrenzungszeichen beendet werden.
+ # 4.3.2 Well-Formed Parsed Entities
+ ReferenceNotInOneEntity = Referenz muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein.
+- ElementEntityMismatch = Element \"{0}\" muss innerhalb derselben Entit\u00E4t beginnen und enden.
++ ElementEntityMismatch = Element "{0}" muss innerhalb derselben Entit\u00E4t beginnen und enden.
+ MarkupEntityMismatch=XML-Dokumentstrukturen m\u00FCssen innerhalb derselben Entit\u00E4t beginnen und enden.
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{2}) wurde im Wert des Attributs \"{1}\" gefunden. Element ist \"{0}\".
++ InvalidCharInAttValue = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{2}) wurde im Wert des Attributs "{1}" gefunden. Element ist "{0}".
+ InvalidCharInComment = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Kommentar gefunden.
+ InvalidCharInPI = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der Verarbeitungsanweisung gefunden.
+ InvalidCharInInternalSubset = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der internen Teilmenge der DTD gefunden.
+ InvalidCharInTextDecl = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der Textdeklaration gefunden.
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = Wert des Attributs \"{1}\" muss mit einem einzelnen oder doppelten Anf\u00FChrungszeichen beginnen.
+- LessthanInAttValue = Wert des Attributs \"{1}\", das mit Elementtyp \"{0}\" verkn\u00FCpft ist, darf nicht das Zeichen "<" enthalten.
+- AttributeValueUnterminated = Wert f\u00FCr Attribut \"{1}\" muss mit dem entsprechenden Anf\u00FChrungszeichen enden.
++ QuoteRequiredInAttValue = Wert des Attributs "{1}" muss mit einem einzelnen oder doppelten Anf\u00FChrungszeichen beginnen.
++ LessthanInAttValue = Wert des Attributs "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, darf nicht das Zeichen "<" enthalten.
++ AttributeValueUnterminated = Wert f\u00FCr Attribut "{1}" muss mit dem entsprechenden Anf\u00FChrungszeichen enden.
+ # 2.5 Comments
+- InvalidCommentStart = Kommentar muss mit \"<!--\" beginnen.
+- DashDashInComment = Zeichenfolge \"--\" ist in Kommentaren nicht zul\u00E4ssig.
+- CommentUnterminated = Kommentar muss mit \"-->\" enden.
++ InvalidCommentStart = Kommentar muss mit "<!--" beginnen.
++ DashDashInComment = Zeichenfolge "--" ist in Kommentaren nicht zul\u00E4ssig.
++ CommentUnterminated = Kommentar muss mit "-->" enden.
+ COMMENT_NOT_IN_ONE_ENTITY = Kommentar ist nicht in derselben Entit\u00E4t enthalten.
+ # 2.6 Processing Instructions
+ PITargetRequired = Verarbeitungsanweisung muss mit dem Namen des Ziels beginnen.
+ SpaceRequiredInPI = Leerstelle ist zwischen dem Ziel der Verarbeitungsanweisung und den Daten erforderlich.
+- PIUnterminated = Verarbeitungsanweisung muss mit \"?>\" enden.
+- ReservedPITarget = Verarbeitungsanweisungsziel, das \"[xX][mM][lL]\" entspricht, ist nicht zul\u00E4ssig.
++ PIUnterminated = Verarbeitungsanweisung muss mit "?>" enden.
++ ReservedPITarget = Verarbeitungsanweisungsziel, das "[xX][mM][lL]" entspricht, ist nicht zul\u00E4ssig.
+ PI_NOT_IN_ONE_ENTITY = Verarbeitungsanweisung ist nicht in derselben Entit\u00E4t enthalten.
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = Ung\u00FCltige Version \"{0}\".
+- VersionNotSupported = XML-Version \"{0}\" wird nicht unterst\u00FCtzt. Nur XML 1.0 wird unterst\u00FCtzt.
+- VersionNotSupported11 = XML-Version \"{0}\" wird nicht unterst\u00FCtzt. Nur XML 1.0 und XML 1.1 werden unterst\u00FCtzt.
++ VersionInfoInvalid = Ung\u00FCltige Version "{0}".
++ VersionNotSupported = XML-Version "{0}" wird nicht unterst\u00FCtzt. Nur XML 1.0 wird unterst\u00FCtzt.
++ VersionNotSupported11 = XML-Version "{0}" wird nicht unterst\u00FCtzt. Nur XML 1.0 und XML 1.1 werden unterst\u00FCtzt.
+ VersionMismatch= Eine Entit\u00E4t kann keine andere Entit\u00E4t einer sp\u00E4teren Version enthalten.
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = Auf \"&#\" in einer Zeichenreferenz muss umgehend eine Dezimaldarstellung folgen.
+- HexdigitRequiredInCharRef = Auf \"&#x\" in einer Zeichenreferenz muss umgehend eine hexadezimale Darstellung folgen.
++ DigitRequiredInCharRef = Auf "&#" in einer Zeichenreferenz muss umgehend eine Dezimaldarstellung folgen.
++ HexdigitRequiredInCharRef = Auf "&#x" in einer Zeichenreferenz muss umgehend eine hexadezimale Darstellung folgen.
+ SemicolonRequiredInCharRef = Zeichenreferenz muss mit dem Begrenzungszeichen ";" enden.
+- InvalidCharRef = Zeichenreferenz \"&#{0}\" ist ein ung\u00FCltiges XML-Zeichen.
++ InvalidCharRef = Zeichenreferenz "&#{0}" ist ein ung\u00FCltiges XML-Zeichen.
+ NameRequiredInReference = Auf "&" in der Entit\u00E4tsreferenz muss umgehend der Entit\u00E4tsname folgen.
+- SemicolonRequiredInReference = Referenz zu Entit\u00E4t \"{0}\" muss mit dem Begrenzungszeichen ";" enden.
++ SemicolonRequiredInReference = Referenz zu Entit\u00E4t "{0}" muss mit dem Begrenzungszeichen ";" enden.
+ # 4.3.1 The Text Declaration
+ TextDeclMustBeFirst = Textdeklaration darf nur ganz am Anfang der externen geparsten Entit\u00E4t enthalten sein.
+- EqRequiredInTextDecl = Zeichen " = " muss auf \"{0}\" in der Textdeklaration folgen.
+- QuoteRequiredInTextDecl = Der Wert nach \"{0}\" in der Textdeklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
+- CloseQuoteMissingInTextDecl = Schlie\u00DFendes Anf\u00FChrungszeichen im Wert nach \"{0}\" in der Textdeklaration fehlt.
++ EqRequiredInTextDecl = Zeichen " = " muss auf "{0}" in der Textdeklaration folgen.
++ QuoteRequiredInTextDecl = Der Wert nach "{0}" in der Textdeklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
++ CloseQuoteMissingInTextDecl = Schlie\u00DFendes Anf\u00FChrungszeichen im Wert nach "{0}" in der Textdeklaration fehlt.
+ SpaceRequiredBeforeVersionInTextDecl = Leerstelle vor dem Versionspseudoattribut in der Textdeklaration erforderlich.
+ SpaceRequiredBeforeEncodingInTextDecl = Leerstelle vor dem Codierungspseudoattribut in der Textdeklaration erforderlich.
+- TextDeclUnterminated = Textdeklaration muss mit \"?>\" enden.
++ TextDeclUnterminated = Textdeklaration muss mit "?>" enden.
+ EncodingDeclRequired = Codierungsdeklaration ist in der Textdeklaration erforderlich.
+ NoMorePseudoAttributes = Es sind keine weiteren Pseudoattribute zul\u00E4ssig.
+ MorePseudoAttributes = Es werden weitere Pseudoattribute erwartet.
+@@ -143,13 +141,13 @@
+ CommentNotInOneEntity = Kommentar muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein.
+ PINotInOneEntity = Verarbeitungsanweisung muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein.
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = Ung\u00FCltiger Codierungsname \"{0}\".
+- EncodingByteOrderUnsupported = Angegebene Bytereihenfolge f\u00FCr die Codierung von \"{0}\" wird nicht unterst\u00FCtzt.
++ EncodingDeclInvalid = Ung\u00FCltiger Codierungsname "{0}".
++ EncodingByteOrderUnsupported = Angegebene Bytereihenfolge f\u00FCr die Codierung von "{0}" wird nicht unterst\u00FCtzt.
+ InvalidByte = Ung\u00FCltiges Byte {0} von {1}-Byte-UTF-8-Sequenz.
+ ExpectedByte = Byte {0} von {1}-Byte-UTF-8-Sequenz erwartet.
+ InvalidHighSurrogate = High-Surrogate-Bits in UTF-8-Sequenz d\u00FCrfen 0x10 nicht \u00FCberschreiten, gefunden wurde aber 0x{0}.
+- OperationNotSupported = Vorgang \"{0}\" nicht unterst\u00FCtzt von {1}-Reader.
+- InvalidASCII = Byte \"{0}\" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
++ OperationNotSupported = Vorgang "{0}" nicht unterst\u00FCtzt von {1}-Reader.
++ InvalidASCII = Byte "{0}" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
+ CharConversionFailure = Eine Entit\u00E4t, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung ung\u00FCltig sind.
+
+ # DTD Messages
+@@ -169,135 +167,135 @@
+ PubidCharIllegal = Zeichen (Unicode: 0x{0}) ist nicht zul\u00E4ssig in der \u00F6ffentlichen ID.
+ SpaceRequiredBetweenPublicAndSystem = Leerstellen erforderlich zwischen publicId und systemId.
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Leerstelle nach \"<!DOCTYPE\" in der Dokumenttypdeklaration erforderlich.
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = Root-Elementtyp muss nach \"<!DOCTYPE\" in der Dokumenttypdeklaration enthalten sein.
+- DoctypedeclUnterminated = Dokumenttypdeklaration f\u00FCr Root-Elementtyp \"{0}\" muss mit ">" enden.
+- PEReferenceWithinMarkup = Parameterentit\u00E4tsreferenz \"%{0};\" darf nicht in Markup in der internen Teilmenge der DTD vorkommen.
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Leerstelle nach "<!DOCTYPE" in der Dokumenttypdeklaration erforderlich.
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = Root-Elementtyp muss nach "<!DOCTYPE" in der Dokumenttypdeklaration enthalten sein.
++ DoctypedeclUnterminated = Dokumenttypdeklaration f\u00FCr Root-Elementtyp "{0}" muss mit ">" enden.
++ PEReferenceWithinMarkup = Parameterentit\u00E4tsreferenz "%{0};" darf nicht in Markup in der internen Teilmenge der DTD vorkommen.
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Die Markup-Deklarationen, die in der Dokumenttypdeklaration enthalten sind bzw. auf die von der Dokumenttypdeklaration verwiesen wird, m\u00FCssen ordnungsgem\u00E4\u00DF formatiert sein.
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklaration f\u00FCr \"xml:space\" muss als aufgez\u00E4hlter Typ angegeben werden, dessen einzigen m\u00F6glichen Werte \"default\" und \"preserve\" sind.
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklaration f\u00FCr "xml:space" muss als aufgez\u00E4hlter Typ angegeben werden, dessen einzigen m\u00F6glichen Werte "default" und "preserve" sind.
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Leerstelle nach \"<!ELEMENT\" in der Elementtypdeklaration erforderlich.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Leerstelle nach "<!ELEMENT" in der Elementtypdeklaration erforderlich.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Elementtyp ist in der Elementtypdeklaration erforderlich.
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Leerstelle nach Elementtyp \"{0}\" in der Elementtypdeklaration erforderlich.
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Constraint ist nach dem Elementtyp \"{0}\" in der Elementtypdeklaration erforderlich.
+- ElementDeclUnterminated = Deklaration f\u00FCr Elementtyp \"{0}\" muss mit ">" enden.
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Leerstelle nach Elementtyp "{0}" in der Elementtypdeklaration erforderlich.
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Constraint ist nach dem Elementtyp "{0}" in der Elementtypdeklaration erforderlich.
++ ElementDeclUnterminated = Deklaration f\u00FCr Elementtyp "{0}" muss mit ">" enden.
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Das Zeichen "(" oder ein Elementtyp ist in der Deklaration des Elementtyps \"{0}\" erforderlich.
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Das Zeichen ")" ist in der Deklaration des Elementtyps \"{0}\" erforderlich.
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Das Zeichen "(" oder ein Elementtyp ist in der Deklaration des Elementtyps "{0}" erforderlich.
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Das Zeichen ")" ist in der Deklaration des Elementtyps "{0}" erforderlich.
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Ein Elementtyp ist in der Deklaration des Elementtyps \"{0}\" erforderlich.
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Das Zeichen ")" ist in der Deklaration des Elementtyps \"{0}\" erforderlich.
+- MixedContentUnterminated = Das Mischcontentmodell \"{0}\" muss mit \")*\" enden, wenn die Typen der untergeordneten Elemente eingeschr\u00E4nkt sind.
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Ein Elementtyp ist in der Deklaration des Elementtyps "{0}" erforderlich.
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Das Zeichen ")" ist in der Deklaration des Elementtyps "{0}" erforderlich.
++ MixedContentUnterminated = Das Mischcontentmodell "{0}" muss mit ")*" enden, wenn die Typen der untergeordneten Elemente eingeschr\u00E4nkt sind.
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Leerstelle nach \"<!ATTLIST\" in der Attributlistendeklaration erforderlich.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Leerstelle nach "<!ATTLIST" in der Attributlistendeklaration erforderlich.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Elementtyp ist in der Attributlistendeklaration erforderlich.
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Leerstelle vor dem Attributnamen in der Attributlistendeklaration f\u00FCr Element \"{0}\" erforderlich.
+- AttNameRequiredInAttDef = Attributname muss in der Attributlistendeklaration f\u00FCr Element \"{0}\" angegeben werden.
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Leerstelle vor dem Attributtyp in der Deklaration des Attributs \"{1}\" f\u00FCr Element \"{0}\" erforderlich.
+- AttTypeRequiredInAttDef = Attributtyp ist in der Deklaration des Attributs \"{1}\" f\u00FCr Element \"{0}\" erforderlich.
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Leerstelle vor dem Attributstandard in der Deklaration des Attributs \"{1}\" f\u00FCr Element \"{0}\" erforderlich.
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mehrere Attributdefinitionen f\u00FCr dasselbe Attribut \"{1}\" eines Elements \"{0}\" angegeben.
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Leerstelle vor dem Attributnamen in der Attributlistendeklaration f\u00FCr Element "{0}" erforderlich.
++ AttNameRequiredInAttDef = Attributname muss in der Attributlistendeklaration f\u00FCr Element "{0}" angegeben werden.
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Leerstelle vor dem Attributtyp in der Deklaration des Attributs "{1}" f\u00FCr Element "{0}" erforderlich.
++ AttTypeRequiredInAttDef = Attributtyp ist in der Deklaration des Attributs "{1}" f\u00FCr Element "{0}" erforderlich.
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Leerstelle vor dem Attributstandard in der Deklaration des Attributs "{1}" f\u00FCr Element "{0}" erforderlich.
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mehrere Attributdefinitionen f\u00FCr dasselbe Attribut "{1}" eines Elements "{0}" angegeben.
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Leerstelle nach \"NOTATION\" in der \"{1}\"-Attributdeklaration erforderlich.
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Das Zeichen "(" muss auf \"NOTATION\" in der \"{1}\"-Attributdeklaration folgen.
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsname ist in der Notationstypliste f\u00FCr die \"{1}\"-Attributdeklaration erforderlich.
+- NotationTypeUnterminated = Notationstypliste muss mit ")" in der\"{1}\"-Attributdeklaration enden.
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namenstoken ist in der aufgez\u00E4hlten Typliste f\u00FCr die \"{1}\"-Attributdeklaration erforderlich.
+- EnumerationUnterminated = Aufgez\u00E4hlte Typliste muss mit ")" in der\"{1}\"-Attributdeklaration enden.
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = Enumerationswert \"{1}\" wurde mehrmals in der Deklaration des Attributs \"{2}\" f\u00FCr Element \"{0}\" angegeben. Die NMTOKENS in einer einzelnen "Enumeration"-Attributdeklaration m\u00FCssen alle eindeutig sein.
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = Enumerationswert \"{1}\" wurde mehrmals in der Deklaration des Attributs \"{2}\" f\u00FCr Element \"{0}\" angegeben. Die NOTATION-Namen in einer einzelnen NotationType-Attributdeklaration m\u00FCssen alle eindeutig sein.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Leerstelle nach "NOTATION" in der "{1}"-Attributdeklaration erforderlich.
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Das Zeichen "(" muss auf "NOTATION" in der "{1}"-Attributdeklaration folgen.
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsname ist in der Notationstypliste f\u00FCr die "{1}"-Attributdeklaration erforderlich.
++ NotationTypeUnterminated = Notationstypliste muss mit ")" in der"{1}"-Attributdeklaration enden.
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namenstoken ist in der aufgez\u00E4hlten Typliste f\u00FCr die "{1}"-Attributdeklaration erforderlich.
++ EnumerationUnterminated = Aufgez\u00E4hlte Typliste muss mit ")" in der"{1}"-Attributdeklaration enden.
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = Enumerationswert "{1}" wurde mehrmals in der Deklaration des Attributs "{2}" f\u00FCr Element "{0}" angegeben. Die NMTOKENS in einer einzelnen "Enumeration"-Attributdeklaration m\u00FCssen alle eindeutig sein.
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = Enumerationswert "{1}" wurde mehrmals in der Deklaration des Attributs "{2}" f\u00FCr Element "{0}" angegeben. Die NOTATION-Namen in einer einzelnen NotationType-Attributdeklaration m\u00FCssen alle eindeutig sein.
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Leerstelle nach \"FIXED\" in der \"{1}\"-Attributdeklaration erforderlich.
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Leerstelle nach "FIXED" in der "{1}"-Attributdeklaration erforderlich.
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = Der eingeschlossene Bedingungsabschnitt muss mit \"]]>\" enden.
+- IgnoreSectUnterminated = Der ausgeschlossene Bedingungsabschnitt muss mit \"]]>\" enden.
++ IncludeSectUnterminated = Der eingeschlossene Bedingungsabschnitt muss mit "]]>" enden.
++ IgnoreSectUnterminated = Der ausgeschlossene Bedingungsabschnitt muss mit "]]>" enden.
+ # 4.1 Character and Entity References
+ NameRequiredInPEReference = Auf "%" in der Parameterentit\u00E4tsreferenz muss umgehend der Entit\u00E4tsname folgen.
+- SemicolonRequiredInPEReference = Parameterentit\u00E4tsreferenz \"%{0};\" muss mit dem Begrenzungszeichen ";" enden.
++ SemicolonRequiredInPEReference = Parameterentit\u00E4tsreferenz "%{0};" muss mit dem Begrenzungszeichen ";" enden.
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Leerstelle nach \"<!ENTITY\" in der Entit\u00E4tsdeklaration erforderlich.
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Leerstelle zwischen \"<!ENTITY\" und dem Zeichen "%" in der Parameterentit\u00E4tsdeklaration erforderlich.
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Leerstelle nach "<!ENTITY" in der Entit\u00E4tsdeklaration erforderlich.
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Leerstelle zwischen "<!ENTITY" und dem Zeichen "%" in der Parameterentit\u00E4tsdeklaration erforderlich.
+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Leerstelle zwischen "%" und dem Entit\u00E4tsnamen in der Parameterentit\u00E4tsdeklaration erforderlich.
+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Name der Entit\u00E4t ist in der Entit\u00E4tsdeklaration erforderlich.
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Leerstelle zwischen dem Entit\u00E4tsnamen \"{0}\" und der Definition in der Entit\u00E4tsdeklaration erforderlich.
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Leerstelle zwischen \"NDATA\" und dem Notationsnamen in der Deklaration f\u00FCr die Entit\u00E4t \"{0}\ erforderlich.
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Leerstelle vor \"NDATA\" in der Deklaration f\u00FCr die Entit\u00E4t \"{0}\ erforderlich.
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsname ist nach \"NDATA\" in der Deklaration f\u00FCr die Entit\u00E4t \"{0}\ erforderlich.
+- EntityDeclUnterminated = Deklaration f\u00FCr Entit\u00E4t \"{0}\" muss mit ">" enden.
+- MSG_DUPLICATE_ENTITY_DEFINITION = Entit\u00E4t \"{0}\" wurde mehrmals deklariert.
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Leerstelle zwischen dem Entit\u00E4tsnamen "{0}" und der Definition in der Entit\u00E4tsdeklaration erforderlich.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Leerstelle zwischen "NDATA" und dem Notationsnamen in der Deklaration f\u00FCr die Entit\u00E4t "{0} erforderlich.
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Leerstelle vor "NDATA" in der Deklaration f\u00FCr die Entit\u00E4t "{0} erforderlich.
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsname ist nach "NDATA" in der Deklaration f\u00FCr die Entit\u00E4t "{0} erforderlich.
++ EntityDeclUnterminated = Deklaration f\u00FCr Entit\u00E4t "{0}" muss mit ">" enden.
++ MSG_DUPLICATE_ENTITY_DEFINITION = Entit\u00E4t "{0}" wurde mehrmals deklariert.
+ # 4.2.2 External Entities
+- ExternalIDRequired = Externe Entit\u00E4tsdeklaration muss mit \"SYSTEM\" oder \"PUBLIC\" beginnen.
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen \"PUBLIC\" und der \u00F6ffentlichen ID erforderlich.
++ ExternalIDRequired = Externe Entit\u00E4tsdeklaration muss mit "SYSTEM" oder "PUBLIC" beginnen.
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen "PUBLIC" und der \u00F6ffentlichen ID erforderlich.
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen der \u00F6ffentlichen ID und der System-ID erforderlich.
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Leerstelle zwischen \"SYSTEM\" und der System-ID erforderlich.
+- MSG_URI_FRAGMENT_IN_SYSTEMID = Fragment-ID darf nicht als Teil der System-ID \"{0}\" angegeben werden.
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Leerstelle zwischen "SYSTEM" und der System-ID erforderlich.
++ MSG_URI_FRAGMENT_IN_SYSTEMID = Fragment-ID darf nicht als Teil der System-ID "{0}" angegeben werden.
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach \"<!NOTATION\" in der Notationsdeklaration erforderlich.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach "<!NOTATION" in der Notationsdeklaration erforderlich.
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Name der Notation ist in der Notationsdeklaration erforderlich.
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach dem Notationsnamen \"{0}\" in der Notationsdeklaration erforderlich.
+- ExternalIDorPublicIDRequired = Deklaration f\u00FCr die Notation \"{0}\" muss eine System- oder eine \u00F6ffentliche ID enthalten.
+- NotationDeclUnterminated = Deklaration f\u00FCr die Notation \"{0}\" muss mit ">" enden.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach dem Notationsnamen "{0}" in der Notationsdeklaration erforderlich.
++ ExternalIDorPublicIDRequired = Deklaration f\u00FCr die Notation "{0}" muss eine System- oder eine \u00F6ffentliche ID enthalten.
++ NotationDeclUnterminated = Deklaration f\u00FCr die Notation "{0}" muss mit ">" enden.
+
+ # Validation messages
+- DuplicateTypeInMixedContent = Elementtyp \"{1}\" wurde bereits im Contentmodell der Elementdeklaration\"{0}\" angegeben.
+- ENTITIESInvalid = Attributwert \"{1}\" mit dem Typ ENTITIES muss aus den Namen von mindestens einer geparsten Entit\u00E4t bestehen.
+- ENTITYInvalid = Attributwert \"{1}\" mit dem Typ ENTITY muss aus dem Namen einer geparsten Entit\u00E4t bestehen.
+- IDDefaultTypeInvalid = ID-Attribut \"{0}\" muss den deklarierten Standardwert \"#IMPLIED\" oder \"#REQUIRED\" haben.
+- IDInvalid = Attributwert \"{0}\" mit dem Typ ID muss ein Name sein.
+- IDInvalidWithNamespaces = Attributwert \"{0}\" mit dem Typ ID muss ein NCName sein, wenn Namespaces aktiviert sind.
+- IDNotUnique = Attributwert \"{0}\" mit dem Typ ID muss eindeutig im Dokument sein.
+- IDREFInvalid = Attributwert \"{0}\" mit dem Typ IDREF muss ein Name sein.
+- IDREFInvalidWithNamespaces = Attributwert \"{0}\" mit dem Typ IDREF muss ein NCName sein, wenn Namespaces aktiviert sind.
+- IDREFSInvalid = Attributwert \"{0}\" mit dem Typ IDREFS muss mindestens ein Name sein.
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ersatztext der Parameterentit\u00E4t \"{0}\" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten, wenn die Entit\u00E4tsreferenz als vollst\u00E4ndige Deklaration verwendet wird.
+- ImproperDeclarationNesting = Ersatztext der Parameterentit\u00E4t \"{0}\" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten.
+- ImproperGroupNesting = Ersatztext der Parameterentit\u00E4t \"{0}\" muss ordnungsgem\u00E4\u00DF verschachtelte Klammernpaare enthalten.
+- INVALID_PE_IN_CONDITIONAL = Ersatztext der Parameterentit\u00E4t \"{0}\" muss den gesamten Bedingungsabschnitt oder nur INCLUDE oder IGNORE enthalten.
+- MSG_ATTRIBUTE_NOT_DECLARED = Attribut \"{1}\" muss f\u00FCr Elementtyp \"{0}\" deklariert werden.
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attribut \"{0}\" mit Wert \"{1}\" muss einen Wert aus der Liste \"{2}\" haben.
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Der Wert \"{1}\" des Attributs \"{0}\" darf nicht von der Normalisierung (zu \"{2}\") in einem Standalone-Dokument ge\u00E4ndert werden.
+- MSG_CONTENT_INCOMPLETE = Content des Elementtyps \"{0}\" ist unvollst\u00E4ndig. Muss \"{1}\" entsprechen.
+- MSG_CONTENT_INVALID = Content des Elementtyps \"{0}\" muss \"{1}\" entsprechen.
+- MSG_CONTENT_INVALID_SPECIFIED = Content des Elementtyps \"{0}\" muss \"{1}\" entsprechen. Untergeordnete Elemente mit dem Typ \"{2}\" sind nicht zul\u00E4ssig.
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attribut \"{1}\" f\u00FCr Elementtyp \"{0}\" hat einen Standardwert und muss in einem Standalone-Dokument angegeben werden.
+- MSG_DUPLICATE_ATTDEF = Attribut \"{1}\" ist bereits deklariert f\u00FCr Elementtyp \"{0}\".
+- MSG_ELEMENT_ALREADY_DECLARED = Elementtyp \"{0}\" darf nicht mehrmals deklariert werden.
+- MSG_ELEMENT_NOT_DECLARED = Elementtyp \"{0}\" muss deklariert werden.
++ DuplicateTypeInMixedContent = Elementtyp "{1}" wurde bereits im Contentmodell der Elementdeklaration"{0}" angegeben.
++ ENTITIESInvalid = Attributwert "{1}" mit dem Typ ENTITIES muss aus den Namen von mindestens einer geparsten Entit\u00E4t bestehen.
++ ENTITYInvalid = Attributwert "{1}" mit dem Typ ENTITY muss aus dem Namen einer geparsten Entit\u00E4t bestehen.
++ IDDefaultTypeInvalid = ID-Attribut "{0}" muss den deklarierten Standardwert "#IMPLIED" oder "#REQUIRED" haben.
++ IDInvalid = Attributwert "{0}" mit dem Typ ID muss ein Name sein.
++ IDInvalidWithNamespaces = Attributwert "{0}" mit dem Typ ID muss ein NCName sein, wenn Namespaces aktiviert sind.
++ IDNotUnique = Attributwert "{0}" mit dem Typ ID muss eindeutig im Dokument sein.
++ IDREFInvalid = Attributwert "{0}" mit dem Typ IDREF muss ein Name sein.
++ IDREFInvalidWithNamespaces = Attributwert "{0}" mit dem Typ IDREF muss ein NCName sein, wenn Namespaces aktiviert sind.
++ IDREFSInvalid = Attributwert "{0}" mit dem Typ IDREFS muss mindestens ein Name sein.
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ersatztext der Parameterentit\u00E4t "{0}" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten, wenn die Entit\u00E4tsreferenz als vollst\u00E4ndige Deklaration verwendet wird.
++ ImproperDeclarationNesting = Ersatztext der Parameterentit\u00E4t "{0}" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten.
++ ImproperGroupNesting = Ersatztext der Parameterentit\u00E4t "{0}" muss ordnungsgem\u00E4\u00DF verschachtelte Klammernpaare enthalten.
++ INVALID_PE_IN_CONDITIONAL = Ersatztext der Parameterentit\u00E4t "{0}" muss den gesamten Bedingungsabschnitt oder nur INCLUDE oder IGNORE enthalten.
++ MSG_ATTRIBUTE_NOT_DECLARED = Attribut "{1}" muss f\u00FCr Elementtyp "{0}" deklariert werden.
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attribut "{0}" mit Wert "{1}" muss einen Wert aus der Liste "{2}" haben.
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Der Wert "{1}" des Attributs "{0}" darf nicht von der Normalisierung (zu "{2}") in einem Standalone-Dokument ge\u00E4ndert werden.
++ MSG_CONTENT_INCOMPLETE = Content des Elementtyps "{0}" ist unvollst\u00E4ndig. Muss "{1}" entsprechen.
++ MSG_CONTENT_INVALID = Content des Elementtyps "{0}" muss "{1}" entsprechen.
++ MSG_CONTENT_INVALID_SPECIFIED = Content des Elementtyps "{0}" muss "{1}" entsprechen. Untergeordnete Elemente mit dem Typ "{2}" sind nicht zul\u00E4ssig.
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attribut "{1}" f\u00FCr Elementtyp "{0}" hat einen Standardwert und muss in einem Standalone-Dokument angegeben werden.
++ MSG_DUPLICATE_ATTDEF = Attribut "{1}" ist bereits deklariert f\u00FCr Elementtyp "{0}".
++ MSG_ELEMENT_ALREADY_DECLARED = Elementtyp "{0}" darf nicht mehrmals deklariert werden.
++ MSG_ELEMENT_NOT_DECLARED = Elementtyp "{0}" muss deklariert werden.
+ MSG_GRAMMAR_NOT_FOUND = Dokument ist ung\u00FCltig. Keine Grammatik gefunden.
+- MSG_ELEMENT_WITH_ID_REQUIRED = Element mit \"{0}\" ist im Dokument erforderlich.
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referenz zur externen Entit\u00E4t \"{0}\" ist in einem Standalone-Dokument nicht zul\u00E4ssig.
+- MSG_FIXED_ATTVALUE_INVALID = Attribut \"{1}\" mit Wert \"{2}\" muss den Wert\"{3}\" haben.
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp \"{0}\" hat bereits ein Attribut \"{1}\" mit dem Typ ID. Ein zweites Attribut \"{2}\" mit dem Typ ID ist nicht zul\u00E4ssig.
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp \"{0}\" hat bereits ein Attribut \"{1}\" mit dem Typ NOTATION. Ein zweites Attribut \"{2}\" mit dem Typ NOTATION ist nicht zul\u00E4ssig.
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notation \"{1}\" muss deklariert werden, wenn sie in der Notationstypliste f\u00FCr Attribut \"{0}\" referenziert wird.
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notation \"{1}\" muss deklariert werden, wenn sie in der Deklaration der nicht geparsten Entit\u00E4t f\u00FCr \"{0}\" referenziert wird.
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referenz zur Entit\u00E4t \"{0}\", die in einer externen geparsten Entit\u00E4t deklariert wird, ist in einem Standalone-Dokument nicht zul\u00E4ssig.
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attribut \"{1}\" ist erforderlich und muss f\u00FCr Elementtyp \"{0}\" angegeben werden.
++ MSG_ELEMENT_WITH_ID_REQUIRED = Element mit "{0}" ist im Dokument erforderlich.
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referenz zur externen Entit\u00E4t "{0}" ist in einem Standalone-Dokument nicht zul\u00E4ssig.
++ MSG_FIXED_ATTVALUE_INVALID = Attribut "{1}" mit Wert "{2}" muss den Wert"{3}" haben.
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp "{0}" hat bereits ein Attribut "{1}" mit dem Typ ID. Ein zweites Attribut "{2}" mit dem Typ ID ist nicht zul\u00E4ssig.
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp "{0}" hat bereits ein Attribut "{1}" mit dem Typ NOTATION. Ein zweites Attribut "{2}" mit dem Typ NOTATION ist nicht zul\u00E4ssig.
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notation "{1}" muss deklariert werden, wenn sie in der Notationstypliste f\u00FCr Attribut "{0}" referenziert wird.
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notation "{1}" muss deklariert werden, wenn sie in der Deklaration der nicht geparsten Entit\u00E4t f\u00FCr "{0}" referenziert wird.
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referenz zur Entit\u00E4t "{0}", die in einer externen geparsten Entit\u00E4t deklariert wird, ist in einem Standalone-Dokument nicht zul\u00E4ssig.
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attribut "{1}" ist erforderlich und muss f\u00FCr Elementtyp "{0}" angegeben werden.
+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Es d\u00FCrfen keine Leerstellen zwischen Elementen in einem Standalone-Dokument vorkommen, die in einer externen geparsten Entit\u00E4t mit Elementcontent deklariert sind.
+- NMTOKENInvalid = Attributwert \"{0}\" mit dem Typ NMTOKEN muss ein Namenstoken sein.
+- NMTOKENSInvalid = Attributwert \"{0}\" mit dem Typ NMTOKENS muss mindestens ein Namenstoken sein.
+- NoNotationOnEmptyElement = Elementtyp \"{0}\", der als EMPTY deklariert wurde, kann nicht das Attribut \"{1}\" mit dem Typ NOTATION deklarieren.
+- RootElementTypeMustMatchDoctypedecl = Dokument-Root-Element \"{1}\"muss mit DOCTYPE-Root \"{0}\" \u00FCbereinstimmen.
+- UndeclaredElementInContentSpec = Contentmodell des Elements \"{0}\" verweist auf das nicht deklarierte Element \"{1}\".
+- UniqueNotationName = Deklaration f\u00FCr die Notation \"{0}\" ist nicht eindeutig. Ein jeweiliger Name darf nicht in mehreren Notationsdeklarationen deklariert werden.
++ NMTOKENInvalid = Attributwert "{0}" mit dem Typ NMTOKEN muss ein Namenstoken sein.
++ NMTOKENSInvalid = Attributwert "{0}" mit dem Typ NMTOKENS muss mindestens ein Namenstoken sein.
++ NoNotationOnEmptyElement = Elementtyp "{0}", der als EMPTY deklariert wurde, kann nicht das Attribut "{1}" mit dem Typ NOTATION deklarieren.
++ RootElementTypeMustMatchDoctypedecl = Dokument-Root-Element "{1}"muss mit DOCTYPE-Root "{0}" \u00FCbereinstimmen.
++ UndeclaredElementInContentSpec = Contentmodell des Elements "{0}" verweist auf das nicht deklarierte Element "{1}".
++ UniqueNotationName = Deklaration f\u00FCr die Notation "{0}" ist nicht eindeutig. Ein jeweiliger Name darf nicht in mehreren Notationsdeklarationen deklariert werden.
+ ENTITYFailedInitializeGrammar = ENTITYDatatype-Validator: Nicht erfolgreich. Initialisierungsmethode muss mit einer g\u00FCltigen Grammatikreferenz aufgerufen werden. \t
+- ENTITYNotUnparsed = ENTITY \"{0}\" ist geparst.
+- ENTITYNotValid = ENTITY \"{0}\" ist nicht g\u00FCltig.
++ ENTITYNotUnparsed = ENTITY "{0}" ist geparst.
++ ENTITYNotValid = ENTITY "{0}" ist nicht g\u00FCltig.
+ EmptyList = Werte der Typen ENTITIES, IDREFS und NMTOKENS d\u00FCrfen keine leeren Listen sein.
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = Externe Entit\u00E4tsreferenz \"&{0};\" ist in einem Attributwert nicht zul\u00E4ssig.
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = Externe Entit\u00E4tsreferenz "&{0};" ist in einem Attributwert nicht zul\u00E4ssig.
++ AccessExternalDTD = Externe DTD: Lesen von externer DTD "{0}" nicht erfolgreich, da "{1}"-Zugriff wegen der von der Eigenschaft "accessExternalDTD" festgelegten Einschr\u00E4nkung nicht zul\u00E4ssig ist.
++ AccessExternalEntity = Externe Entit\u00E4t: Lesen des externen Dokuments "{0}" nicht erfolgreich, da "{1}"-Zugriff wegen der von der Eigenschaft "accessExternalDTD" festgelegten Einschr\u00E4nkung nicht zul\u00E4ssig ist.
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = Entit\u00E4t \"{0}\" wurde referenziert aber nicht deklariert.
+- ReferenceToUnparsedEntity = Nicht geparste Entit\u00E4tsreferenz \"&{0};\" ist nicht zul\u00E4ssig.
+- RecursiveReference = Rekursive Entit\u00E4tsreferenz \"{0}\". (Referenzpfad: {1}),
+- RecursiveGeneralReference = Rekursive allgemeine Entit\u00E4tsreferenz \"&{0};\". (Referenzpfad: {1}),
+- RecursivePEReference = Rekursive Parameterentit\u00E4tsreferenz \"%{0};\". (Referenzpfad: {1}),
++ EntityNotDeclared = Entit\u00E4t "{0}" wurde referenziert aber nicht deklariert.
++ ReferenceToUnparsedEntity = Nicht geparste Entit\u00E4tsreferenz "&{0};" ist nicht zul\u00E4ssig.
++ RecursiveReference = Rekursive Entit\u00E4tsreferenz "{0}". (Referenzpfad: {1}),
++ RecursiveGeneralReference = Rekursive allgemeine Entit\u00E4tsreferenz "&{0};". (Referenzpfad: {1}),
++ RecursivePEReference = Rekursive Parameterentit\u00E4tsreferenz "%{0};". (Referenzpfad: {1}),
+ # 4.3.3 Character Encoding in Entities
+ EncodingNotSupported = Codierung "{0}" wird nicht unterst\u00FCtzt.
+ EncodingRequired = Eine nicht in UTF-8 oder UTF-16 codierte geparste Entit\u00E4t muss eine Codierungsdeklaration enthalten.
+@@ -305,14 +303,14 @@
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = Element oder Attribut stimmt nicht mit QName-Production \u00FCberein: QName::=(NCName':')?NCName.
+- ElementXMLNSPrefix = Element \"{0}\" darf nicht \"xmlns\" als Pr\u00E4fix enthalten.
+- ElementPrefixUnbound = Pr\u00E4fix \"{0}\" f\u00FCr Element \"{1}\" ist nicht gebunden.
+- AttributePrefixUnbound = Pr\u00E4fix \"{2}\" f\u00FCr Attribut \"{1}\", das mit Elementtyp \"{0}\" verkn\u00FCpft ist, ist nicht gebunden.
+- EmptyPrefixedAttName = Wert des Attributs \"{0}\" ist ung\u00FCltig. Namespace Bindings mit Pr\u00E4fix d\u00FCrfen nicht leer sein.
+- PrefixDeclared = Namespace-Pr\u00E4fix \"{0}\" wurde nicht deklariert.
++ ElementXMLNSPrefix = Element "{0}" darf nicht "xmlns" als Pr\u00E4fix enthalten.
++ ElementPrefixUnbound = Pr\u00E4fix "{0}" f\u00FCr Element "{1}" ist nicht gebunden.
++ AttributePrefixUnbound = Pr\u00E4fix "{2}" f\u00FCr Attribut "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, ist nicht gebunden.
++ EmptyPrefixedAttName = Wert des Attributs "{0}" ist ung\u00FCltig. Namespace Bindings mit Pr\u00E4fix d\u00FCrfen nicht leer sein.
++ PrefixDeclared = Namespace-Pr\u00E4fix "{0}" wurde nicht deklariert.
+ CantBindXMLNS = Pr\u00E4fix "xmlns" kann nicht explizit an einen Namespace gebunden werden. Umgekehrt kann auch der Namespace f\u00FCr "xmlns" nicht explizit an ein Pr\u00E4fix gebunden werden.
+ CantBindXML = Pr\u00E4fix "xml" kann nicht an einen anderen Namespace als den gew\u00F6hnlichen gebunden werden. Umgekehrt kann auch der Namespace f\u00FCr "xml" nicht an ein anderes Pr\u00E4fix als "xml" gebunden werden.
+- MSG_ATT_DEFAULT_INVALID = defaultValue \"{1}\" von Attribut \"{0}\" ist aufgrund der lexikalischen Constraints dieses Attributtyps nicht g\u00FCltig.
++ MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" von Attribut "{0}" ist aufgrund der lexikalischen Constraints dieses Attributtyps nicht g\u00FCltig.
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +318,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=Parser hat mehr als \"{0}\" Entit\u00E4tserweiterungen in diesem Dokument gefunden. Dies ist der durch die Anwendung vorgeschriebene Grenzwert.
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: Der Parser hat mehr als {0} Entit\u00E4tserweiterungen in diesem Dokument gefunden. Dies ist der von JDK vorgeschriebene Grenzwert.
++ ElementAttributeLimit=JAXP00010002: Element "{0}" hat mehr als {1} Attribute. "{1}" ist der von JDK vorgeschriebene Grenzwert.
++ MaxEntitySizeLimit=JAXP00010003: Die L\u00E4nge von Entit\u00E4t "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
++ TotalEntitySizeLimit=JAXP00010004: Die akkumulierte Gr\u00F6\u00DFe "{0}" der Entit\u00E4ten \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
++ MaxXMLNameLimit=JAXP00010005: Der Name "{0}" \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,27 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +45,14 @@
+ InvalidCharInProlog = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el pr\u00F3logo del documento.
+ InvalidCharInXMLDecl = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la declaraci\u00F3n XML.
+ # 2.4 Character Data and Markup
+- CDEndInContent = La secuencia de caracteres \"]]>\" no debe aparecer en el contenido, a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
++ CDEndInContent = La secuencia de caracteres "]]>" no debe aparecer en el contenido, a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
+ # 2.7 CDATA Sections
+- CDSectUnterminated = La secci\u00F3n CDATA debe finalizar en \"]]>\".
++ CDSectUnterminated = La secci\u00F3n CDATA debe finalizar en "]]>".
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = La declaraci\u00F3n XML s\u00F3lo puede aparecer al principio del documento.
+- EqRequiredInXMLDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de \"{0}\" en la declaraci\u00F3n XML.
+- QuoteRequiredInXMLDecl = El valor despu\u00E9s de \"{0}\" en la declaraci\u00F3n XML debe ser una cadena con comillas.
+- XMLDeclUnterminated = La declaraci\u00F3n XML debe finalizar en \"?>\".
++ EqRequiredInXMLDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de "{0}" en la declaraci\u00F3n XML.
++ QuoteRequiredInXMLDecl = El valor despu\u00E9s de "{0}" en la declaraci\u00F3n XML debe ser una cadena con comillas.
++ XMLDeclUnterminated = La declaraci\u00F3n XML debe finalizar en "?>".
+ VersionInfoRequired = La versi\u00F3n es necesaria en la declaraci\u00F3n XML.
+ SpaceRequiredBeforeVersionInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaraci\u00F3n XML.
+ SpaceRequiredBeforeEncodingInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n XML.
+@@ -71,70 +68,71 @@
+ ReferenceIllegalInTrailingMisc=La referencia no est\u00E1 permitida en la secci\u00F3n final.
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = El valor de declaraci\u00F3n del documento aut\u00F3nomo debe ser \"yes\" o \"no\", pero nunca \"{0}\".
++ SDDeclInvalid = El valor de declaraci\u00F3n del documento aut\u00F3nomo debe ser "yes" o "no", pero nunca "{0}".
++ SDDeclNameInvalid = Puede que el nombre aut\u00F3nomo de la declaraci\u00F3n XML est\u00E9 mal escrito.
+ # 2.12 Language Identification
+- XMLLangInvalid = El valor del atributo xml:lang \"{0}\" es un identificador de idioma no v\u00E1lido.
++ XMLLangInvalid = El valor del atributo xml:lang "{0}" es un identificador de idioma no v\u00E1lido.
+ # 3. Logical Structures
+- ETagRequired = El tipo de elemento \"{0}\" debe finalizar por la etiqueta final coincidente \"</{0}>\".
++ ETagRequired = El tipo de elemento "{0}" debe finalizar por la etiqueta final coincidente "</{0}>".
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = El tipo de elemento \"{0}\" debe ir seguido de una de estas especificaciones de atributo: \">\" o \"/>\".
+- EqRequiredInAttribute = El nombre de atributo \"{1}\" asociado a un tipo de elemento \"{0}\" debe ir seguido del car\u00E1cter '' = ''.
+- OpenQuoteExpected = Las comillas de apertura se deben utilizar para el atributo \"{1}\" asociado a un tipo de elemento \"{0}\".
+- CloseQuoteExpected = Las comillas de cierre se deben utilizar para el atributo \"{1}\" asociado a un tipo de elemento \"{0}\".
+- AttributeNotUnique = El atributo \"{1}\" ya se ha especificado para el elemento \"{0}\".
+- AttributeNSNotUnique = El atributo \"{1}\" enlazado al espacio de nombres \"{2}\" ya se ha especificado para el elemento \"{0}\".
+- ETagUnterminated = La etiqueta final para el tipo de elemento \"{0}\" debe finalizar en un delimitador ''>''.
++ ElementUnterminated = El tipo de elemento "{0}" debe ir seguido de una de estas especificaciones de atributo: ">" o "/>".
++ EqRequiredInAttribute = El nombre de atributo "{1}" asociado a un tipo de elemento "{0}" debe ir seguido del car\u00E1cter '' = ''.
++ OpenQuoteExpected = Las comillas de apertura se deben utilizar para el atributo "{1}" asociado a un tipo de elemento "{0}".
++ CloseQuoteExpected = Las comillas de cierre se deben utilizar para el atributo "{1}" asociado a un tipo de elemento "{0}".
++ AttributeNotUnique = El atributo "{1}" ya se ha especificado para el elemento "{0}".
++ AttributeNSNotUnique = El atributo "{1}" enlazado al espacio de nombres "{2}" ya se ha especificado para el elemento "{0}".
++ ETagUnterminated = La etiqueta final para el tipo de elemento "{0}" debe finalizar en un delimitador ''>''.
+ MarkupNotRecognizedInContent = El contenido de los elementos debe constar de marcadores o datos de car\u00E1cter con un formato correcto.
+ DoctypeIllegalInContent = No se permite un DOCTYPE en el contenido.
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = La referencia debe finalizar con un delimitador ';'.
+ # 4.3.2 Well-Formed Parsed Entities
+ ReferenceNotInOneEntity = La referencia debe incluirse totalmente en la misma entidad analizada.
+- ElementEntityMismatch = El elemento \"{0}\" debe empezar y finalizar en la misma entidad.
++ ElementEntityMismatch = El elemento "{0}" debe empezar y finalizar en la misma entidad.
+ MarkupEntityMismatch=Las estructuras del documento XML deben empezar y finalizar en la misma entidad.
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{2}) no v\u00E1lido en el valor del atributo \"{1}\" y el elemento es \"{0}\".
++ InvalidCharInAttValue = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{2}) no v\u00E1lido en el valor del atributo "{1}" y el elemento es "{0}".
+ InvalidCharInComment = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el comentario.
+ InvalidCharInPI = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la instrucci\u00F3n de procesamiento.
+ InvalidCharInInternalSubset = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el subconjunto interno del DTD.
+ InvalidCharInTextDecl = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la declaraci\u00F3n de texto.
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = El valor del atributo \"{1}\" debe empezar por un car\u00E1cter de comillas dobles o simples.
+- LessthanInAttValue = El valor del atributo \"{1}\" asociado a un tipo de elemento \"{0}\" no debe contener el car\u00E1cter ''<''.
+- AttributeValueUnterminated = El valor para el atributo \"{1}\" debe finalizar en un car\u00E1cter de comillas coincidentes.
++ QuoteRequiredInAttValue = El valor del atributo "{1}" debe empezar por un car\u00E1cter de comillas dobles o simples.
++ LessthanInAttValue = El valor del atributo "{1}" asociado a un tipo de elemento "{0}" no debe contener el car\u00E1cter ''<''.
++ AttributeValueUnterminated = El valor para el atributo "{1}" debe finalizar en un car\u00E1cter de comillas coincidentes.
+ # 2.5 Comments
+- InvalidCommentStart = El comentario debe empezar por \"<!--\".
+- DashDashInComment = La cadena \"--\" no est\u00E1 permitida en los comentarios.
+- CommentUnterminated = El comentario debe finalizar en \"-->\".
++ InvalidCommentStart = El comentario debe empezar por "<!--".
++ DashDashInComment = La cadena "--" no est\u00E1 permitida en los comentarios.
++ CommentUnterminated = El comentario debe finalizar en "-->".
+ COMMENT_NOT_IN_ONE_ENTITY = El comentario no est\u00E1 incluido en la misma entidad.
+ # 2.6 Processing Instructions
+ PITargetRequired = La instrucci\u00F3n de procesamiento debe empezar por el nombre del destino.
+ SpaceRequiredInPI = Es necesario un espacio en blanco entre el destino de la instrucci\u00F3n de procesamiento y los datos.
+- PIUnterminated = La instrucci\u00F3n de procesamiento debe finalizar en \"?>\".
+- ReservedPITarget = El destino de la instrucci\u00F3n de procesamiento que coincide con \"[xX][mM][lL]\" no est\u00E1 permitido.
++ PIUnterminated = La instrucci\u00F3n de procesamiento debe finalizar en "?>".
++ ReservedPITarget = El destino de la instrucci\u00F3n de procesamiento que coincide con "[xX][mM][lL]" no est\u00E1 permitido.
+ PI_NOT_IN_ONE_ENTITY = La instrucci\u00F3n de procesamiento no est\u00E1 incluida en la misma entidad.
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = Versi\u00F3n no v\u00E1lida \"{0}\".
+- VersionNotSupported = La versi\u00F3n XML \"{0}\" no est\u00E1 soportada, s\u00F3lo la versi\u00F3n XML 1.0 est\u00E1 soportada.
+- VersionNotSupported11 = La versi\u00F3n XML \"{0}\" no est\u00E1 soportada, s\u00F3lo las versiones XML 1.0 y XML 1.1 est\u00E1n soportadas.
++ VersionInfoInvalid = Versi\u00F3n no v\u00E1lida "{0}".
++ VersionNotSupported = La versi\u00F3n XML "{0}" no est\u00E1 soportada, s\u00F3lo la versi\u00F3n XML 1.0 est\u00E1 soportada.
++ VersionNotSupported11 = La versi\u00F3n XML "{0}" no est\u00E1 soportada, s\u00F3lo las versiones XML 1.0 y XML 1.1 est\u00E1n soportadas.
+ VersionMismatch= Una entidad no puede incluir otra entidad de una versi\u00F3n posterior.
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = Una representaci\u00F3n decimal debe aparecer inmediatamente despu\u00E9s de \"&#\" en una referencia de caracteres.
+- HexdigitRequiredInCharRef = Una representaci\u00F3n hexadecimal debe aparecer inmediatamente despu\u00E9s de \"&#\" en una referencia de caracteres.
++ DigitRequiredInCharRef = Una representaci\u00F3n decimal debe aparecer inmediatamente despu\u00E9s de "&#" en una referencia de caracteres.
++ HexdigitRequiredInCharRef = Una representaci\u00F3n hexadecimal debe aparecer inmediatamente despu\u00E9s de "&#" en una referencia de caracteres.
+ SemicolonRequiredInCharRef = La referencia de caracteres debe finalizar en el delimitador ';'.
+- InvalidCharRef = La referencia de caracteres \"&#{0}\" es un car\u00E1cter XML no v\u00E1lido.
++ InvalidCharRef = La referencia de caracteres "&#{0}" es un car\u00E1cter XML no v\u00E1lido.
+ NameRequiredInReference = El nombre de la entidad debe aparecer inmediatamente despu\u00E9s de '&' en la referencia de entidades.
+- SemicolonRequiredInReference = La referencia a la entidad \"{0}\" debe finalizar en el delimitador '';''.
++ SemicolonRequiredInReference = La referencia a la entidad "{0}" debe finalizar en el delimitador '';''.
+ # 4.3.1 The Text Declaration
+ TextDeclMustBeFirst = La declaraci\u00F3n de texto s\u00F3lo puede aparecer al principio de la entidad analizada externa.
+- EqRequiredInTextDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de \"{0}\" en la declaraci\u00F3n de texto.
+- QuoteRequiredInTextDecl = El valor despu\u00E9s de \"{0}\" en la declaraci\u00F3n de texto debe ser una cadena con comillas.
+- CloseQuoteMissingInTextDecl = Faltan las comillas de cierre en el valor despu\u00E9s de \"{0}\" en la declaraci\u00F3n de texto.
++ EqRequiredInTextDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de "{0}" en la declaraci\u00F3n de texto.
++ QuoteRequiredInTextDecl = El valor despu\u00E9s de "{0}" en la declaraci\u00F3n de texto debe ser una cadena con comillas.
++ CloseQuoteMissingInTextDecl = Faltan las comillas de cierre en el valor despu\u00E9s de "{0}" en la declaraci\u00F3n de texto.
+ SpaceRequiredBeforeVersionInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaraci\u00F3n de texto.
+ SpaceRequiredBeforeEncodingInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n de texto.
+- TextDeclUnterminated = La declaraci\u00F3n de texto debe finalizar en \"?>\".
++ TextDeclUnterminated = La declaraci\u00F3n de texto debe finalizar en "?>".
+ EncodingDeclRequired = La declaraci\u00F3n de codificaci\u00F3n es necesaria en la declaraci\u00F3n de texto.
+ NoMorePseudoAttributes = No se permiten m\u00E1s pseudo atributos.
+ MorePseudoAttributes = Se esperan m\u00E1s pseudo atributos.
+@@ -143,13 +141,13 @@
+ CommentNotInOneEntity = El comentario debe incluirse totalmente en la misma entidad analizada.
+ PINotInOneEntity = La instrucci\u00F3n de procesamiento debe incluirse totalmente en la misma entidad analizada.
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = Nombre de codificaci\u00F3n no v\u00E1lido \"{0}\".
+- EncodingByteOrderUnsupported = El orden de bytes proporcionado para la codificaci\u00F3n \"{0}\" no est\u00E1 soportado.
++ EncodingDeclInvalid = Nombre de codificaci\u00F3n no v\u00E1lido "{0}".
++ EncodingByteOrderUnsupported = El orden de bytes proporcionado para la codificaci\u00F3n "{0}" no est\u00E1 soportado.
+ InvalidByte = Byte no v\u00E1lido {0} de la secuencia UTF-8 de {1} bytes
+ ExpectedByte = Byte esperado {0} de la secuencia UTF-8 de {1} bytes.
+ InvalidHighSurrogate = Los bits de sustituci\u00F3n superior en la secuencia UTF-8 no deben exceder 0x10 pero se han encontrado 0x{0}.
+- OperationNotSupported = La operaci\u00F3n \"{0}\" no est\u00E1 soportada por el lector {1}.
+- InvalidASCII = El byte \"{0}\"no es un miembro del juego de caracteres ASCII (7 bits).
++ OperationNotSupported = La operaci\u00F3n "{0}" no est\u00E1 soportada por el lector {1}.
++ InvalidASCII = El byte "{0}"no es un miembro del juego de caracteres ASCII (7 bits).
+ CharConversionFailure = Una entidad con una codificaci\u00F3n determinada no debe contener secuencias no permitidas en dicha codificaci\u00F3n.
+
+ # DTD Messages
+@@ -169,150 +167,150 @@
+ PubidCharIllegal = El car\u00E1cter (Unicode: 0x{0}) no est\u00E1 permitido en el identificador p\u00FAblico.
+ SpaceRequiredBetweenPublicAndSystem = Son necesarios espacios en blanco entre publicId y systemId.
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!DOCTYPE\" en la declaraci\u00F3n de tipo de documento.
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = El tipo de elemento ra\u00EDz debe aparecer despu\u00E9s de \"<!DOCTYPE\" en la declaraci\u00F3n de tipo de documento.
+- DoctypedeclUnterminated = La declaraci\u00F3n de tipo de documento para el tipo de elemento ra\u00EDz \"{0}\" debe finalizar en ''>''.
+- PEReferenceWithinMarkup = La referencia de entidad del par\u00E1metro \"%{0};\" no puede producirse en el marcador en el subconjunto interno del DTD.
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Es necesario un espacio en blanco despu\u00E9s de "<!DOCTYPE" en la declaraci\u00F3n de tipo de documento.
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = El tipo de elemento ra\u00EDz debe aparecer despu\u00E9s de "<!DOCTYPE" en la declaraci\u00F3n de tipo de documento.
++ DoctypedeclUnterminated = La declaraci\u00F3n de tipo de documento para el tipo de elemento ra\u00EDz "{0}" debe finalizar en ''>''.
++ PEReferenceWithinMarkup = La referencia de entidad del par\u00E1metro "%{0};" no puede producirse en el marcador en el subconjunto interno del DTD.
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Las declaraciones de marcador que se incluyen o a las que apunta la declaraci\u00F3n de tipo de documento deben tener el formato correcto.
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = La declaraci\u00F3n de atributo para \"xml:space\" debe ofrecerse como un tipo enumerado cuyos \u00FAnicos valores posibles son \"default\" y \"preserve\".
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = La declaraci\u00F3n de atributo para "xml:space" debe ofrecerse como un tipo enumerado cuyos \u00FAnicos valores posibles son "default" y "preserve".
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!ELEMENT\" en la declaraci\u00F3n de tipo de elemento.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s de "<!ELEMENT" en la declaraci\u00F3n de tipo de elemento.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = El tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento.
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s del tipo de elemento \"{0}\" en la declaraci\u00F3n de tipo de elemento.
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Es necesaria la restricci\u00F3n despu\u00E9s del tipo de elemento \"{0}\" en la declaraci\u00F3n de tipo de elemento.
+- ElementDeclUnterminated = La declaraci\u00F3n para el tipo de elemento \"{0}\" debe finalizar en ''>''.
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s del tipo de elemento "{0}" en la declaraci\u00F3n de tipo de elemento.
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Es necesaria la restricci\u00F3n despu\u00E9s del tipo de elemento "{0}" en la declaraci\u00F3n de tipo de elemento.
++ ElementDeclUnterminated = La declaraci\u00F3n para el tipo de elemento "{0}" debe finalizar en ''>''.
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un car\u00E1cter ''('' o un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento \"{0}\".
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un car\u00E1cter ''('' o un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento \"{0}\".
+- MixedContentUnterminated = El modelo de contenido mixto \"{0}\" debe finalizar en \")*\" cuando los tipos de elementos secundarios est\u00E1n restringidos.
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
++ MixedContentUnterminated = El modelo de contenido mixto "{0}" debe finalizar en ")*" cuando los tipos de elementos secundarios est\u00E1n restringidos.
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!ATTLIST\" en la declaraci\u00F3n de la lista de atributos.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Es necesario un espacio en blanco despu\u00E9s de "<!ATTLIST" en la declaraci\u00F3n de la lista de atributos.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = El tipo de elemento es necesario en la declaraci\u00F3n de la lista de atributos.
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Es necesario un espacio en blanco antes del nombre de atributo en la declaraci\u00F3n de la lista de atributos para el elemento \"{0}\".
+- AttNameRequiredInAttDef = Se debe especificar el nombre del atributo en la declaraci\u00F3n de la lista de atributos para el elemento \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Es necesario un espacio en blanco antes del tipo de atributo en la declaraci\u00F3n del atributo \"{1}\" para el elemento \"{0}\".
+- AttTypeRequiredInAttDef = Es necesario el tipo de atributo en la declaraci\u00F3n del atributo \"{1}\" para el elemento \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Es necesario un espacio en blanco antes del atributo por defecto en la declaraci\u00F3n del atributo \"{1}\" para el elemento \"{0}\".
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Se ha proporcionado m\u00E1s de una definici\u00F3n de atributo para el mismo atributo \"{1}\" de un elemento determinado \"{0}\".
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Es necesario un espacio en blanco antes del nombre de atributo en la declaraci\u00F3n de la lista de atributos para el elemento "{0}".
++ AttNameRequiredInAttDef = Se debe especificar el nombre del atributo en la declaraci\u00F3n de la lista de atributos para el elemento "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Es necesario un espacio en blanco antes del tipo de atributo en la declaraci\u00F3n del atributo "{1}" para el elemento "{0}".
++ AttTypeRequiredInAttDef = Es necesario el tipo de atributo en la declaraci\u00F3n del atributo "{1}" para el elemento "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Es necesario un espacio en blanco antes del atributo por defecto en la declaraci\u00F3n del atributo "{1}" para el elemento "{0}".
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Se ha proporcionado m\u00E1s de una definici\u00F3n de atributo para el mismo atributo "{1}" de un elemento determinado "{0}".
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Debe aparecer un espacio en blanco despu\u00E9s de \"NOTATION\" en la declaraci\u00F3n de atributo \"{1}\".
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = El car\u00E1cter ''('' debe aparecer despu\u00E9s de \"NOTATION\" en la declaraci\u00F3n de atributo \"{1}\".
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = El nombre de notaci\u00F3n es necesario en la lista de tipos de notaci\u00F3n para la declaraci\u00F3n de atributo \"{1}\".
+- NotationTypeUnterminated = La lista de tipos de notaciones debe finalizar en '')'' en la declaraci\u00F3n del atributo \"{1}\".
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = El elemento de nombre es necesario en la lista de tipos enumerados para la declaraci\u00F3n del atributo \"{1}\".
+- EnumerationUnterminated = La lista de tipos enumerados debe finalizar en '')'' en la declaraci\u00F3n del atributo \"{1}\".
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = El valor de enumeraci\u00F3n \"{1}\" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo \"{2}\" para el elemento \"{0}\". Todos los NMTOKENS en una declaraci\u00F3n del atributo Enumeration \u00FAnico deben ser distintos.
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = El valor de enumeraci\u00F3n \"{1}\" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo \"{2}\" para el elemento \"{0}\". Todos los nombres NOTATION en una declaraci\u00F3n del atributo NotationType \u00FAnico deben ser distintos.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Debe aparecer un espacio en blanco despu\u00E9s de "NOTATION" en la declaraci\u00F3n de atributo "{1}".
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = El car\u00E1cter ''('' debe aparecer despu\u00E9s de "NOTATION" en la declaraci\u00F3n de atributo "{1}".
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = El nombre de notaci\u00F3n es necesario en la lista de tipos de notaci\u00F3n para la declaraci\u00F3n de atributo "{1}".
++ NotationTypeUnterminated = La lista de tipos de notaciones debe finalizar en '')'' en la declaraci\u00F3n del atributo "{1}".
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = El token de nombre es necesario en la lista de tipos enumerados para la declaraci\u00F3n del atributo "{1}".
++ EnumerationUnterminated = La lista de tipos enumerados debe finalizar en '')'' en la declaraci\u00F3n del atributo "{1}".
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = El valor de enumeraci\u00F3n "{1}" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo "{2}" para el token "{0}". Todos los NMTOKENS en una declaraci\u00F3n del atributo Enumeration \u00FAnico deben ser distintos.
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = El valor de enumeraci\u00F3n "{1}" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo "{2}" para el elemento "{0}". Todos los nombres NOTATION en una declaraci\u00F3n del atributo NotationType \u00FAnico deben ser distintos.
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Debe aparecer un espacio en blanco despu\u00E9s de \"FIXED\" en la declaraci\u00F3n de atributo \"{1}\".
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Debe aparecer un espacio en blanco despu\u00E9s de "FIXED" en la declaraci\u00F3n de atributo "{1}".
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = La secci\u00F3n condicional incluida debe finalizar en \"]]>\".
+- IgnoreSectUnterminated = La secci\u00F3n condicional excluida debe finalizar en \"]]>\".
++ IncludeSectUnterminated = La secci\u00F3n condicional incluida debe finalizar en "]]>".
++ IgnoreSectUnterminated = La secci\u00F3n condicional excluida debe finalizar en "]]>".
+ # 4.1 Character and Entity References
+ NameRequiredInPEReference = El nombre de la entidad debe aparecer inmediatamente despu\u00E9s de '%' en la referencia de entidad de par\u00E1metro.
+- SemicolonRequiredInPEReference = La referencia de entidad de par\u00E1metro \"%{0};\" debe finalizar en el delimitador '';''.
++ SemicolonRequiredInPEReference = La referencia de entidad de par\u00E1metro "%{0};" debe finalizar en el delimitador '';''.
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!ENTITY\" en la declaraci\u00F3n de entidad.
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Es necesario un espacio en blanco entre \"<!ENTITY\" y el car\u00E1cter '%' en la declaraci\u00F3n de entidad de par\u00E1metro.
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco despu\u00E9s de "<!ENTITY" en la declaraci\u00F3n de entidad.
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Es necesario un espacio en blanco entre "<!ENTITY" y el car\u00E1cter '%' en la declaraci\u00F3n de entidad de par\u00E1metro.
+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Es necesario un espacio en blanco entre '%' y el nombre de entidad en la declaraci\u00F3n de entidad de par\u00E1metro.
+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = El nombre de la entidad es necesario en la declaraci\u00F3n de entidad.
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco entre el nombre de entidad \"{0}\" y la definici\u00F3n en la declaraci\u00F3n de entidad.
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco entre \"NDATA\" y el nombre de notaci\u00F3n en la declaraci\u00F3n para la entidad \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco antes de \"NDATA\" en la declaraci\u00F3n para la entidad \"{0}\".
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = El nombre de notaci\u00F3n es necesario despu\u00E9s de \"NDATA\" en la declaraci\u00F3n para la entidad \"{0}\".
+- EntityDeclUnterminated = La declaraci\u00F3n para la entidad \"{0}\" debe finalizar en ''>''.
+- MSG_DUPLICATE_ENTITY_DEFINITION = La entidad \"{0}\" se ha declarado m\u00E1s de una vez.
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco entre el nombre de entidad "{0}" y la definici\u00F3n en la declaraci\u00F3n de entidad.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco entre "NDATA" y el nombre de notaci\u00F3n en la declaraci\u00F3n para la entidad "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco antes de "NDATA" en la declaraci\u00F3n para la entidad "{0}".
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = El nombre de notaci\u00F3n es necesario despu\u00E9s de "NDATA" en la declaraci\u00F3n para la entidad "{0}".
++ EntityDeclUnterminated = La declaraci\u00F3n para la entidad "{0}" debe finalizar en ''>''.
++ MSG_DUPLICATE_ENTITY_DEFINITION = La entidad "{0}" se ha declarado m\u00E1s de una vez.
+ # 4.2.2 External Entities
+- ExternalIDRequired = La declaraci\u00F3n de entidad externa debe empezar por \"SYSTEM\" o \"PUBLIC\".
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre \"PUBLIC\" y el identificador p\u00FAblico.
++ ExternalIDRequired = La declaraci\u00F3n de entidad externa debe empezar por "SYSTEM" o "PUBLIC".
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre "PUBLIC" y el identificador p\u00FAblico.
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre el identificador p\u00FAblico y el identificador del sistema.
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre \"SYSTEM\" y el identificador del sistema.
+- MSG_URI_FRAGMENT_IN_SYSTEMID = No se debe especificar el identificador del fragmento como parte del identificador del sistema \"{0}\".
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre "SYSTEM" y el identificador del sistema.
++ MSG_URI_FRAGMENT_IN_SYSTEMID = No se debe especificar el identificador del fragmento como parte del identificador del sistema "{0}".
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!NOTATION\" en la declaraci\u00F3n de notaci\u00F3n.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s de "<!NOTATION" en la declaraci\u00F3n de notaci\u00F3n.
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = El nombre de la notaci\u00F3n es necesario en la declaraci\u00F3n de notaci\u00F3n.
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s del nombre de la notaci\u00F3n \"{0}\" en la declaraci\u00F3n de notaci\u00F3n.
+- ExternalIDorPublicIDRequired = La declaraci\u00F3n para la notaci\u00F3n \"{0}\" debe incluir un identificador p\u00FAblico o del sistema.
+- NotationDeclUnterminated = La declaraci\u00F3n para la notaci\u00F3n \"{0}\" debe finalizar en ''>''.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s del nombre de la notaci\u00F3n "{0}" en la declaraci\u00F3n de notaci\u00F3n.
++ ExternalIDorPublicIDRequired = La declaraci\u00F3n para la notaci\u00F3n "{0}" debe incluir un identificador p\u00FAblico o del sistema.
++ NotationDeclUnterminated = La declaraci\u00F3n para la notaci\u00F3n "{0}" debe finalizar en ''>''.
+
+ # Validation messages
+- DuplicateTypeInMixedContent = El tipo de elemento \"{1}\" ya se especific\u00F3 en el modelo de contenido de la declaraci\u00F3n de elementos \"{0}\".
+- ENTITIESInvalid = El valor de atributo \"{1}\" del tipo ENTITIES debe ser el nombre de una o m\u00E1s entidades no analizadas.
+- ENTITYInvalid = El valor de atributo \"{1}\" del tipo ENTITY debe ser el nombre de una entidad no analizada.
+- IDDefaultTypeInvalid = El atributo de identificador \"{0}\" debe tener un valor por defecto declarado de \"#IMPLIED\" o \"#REQUIRED\".
+- IDInvalid = El valor de atributo \"{0}\" del tipo ID debe ser un nombre.
+- IDInvalidWithNamespaces = El valor de atributo \"{0}\" del tipo ID debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
+- IDNotUnique = El valor de atributo \"{0}\" del tipo ID debe ser \u00FAnico en el documento.
+- IDREFInvalid = El valor de atributo \"{0}\" del tipo IDREF debe ser un nombre.
+- IDREFInvalidWithNamespaces = El valor de atributo \"{0}\" del tipo IDREF debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
+- IDREFSInvalid = El valor de atributo \"{0}\" del tipo IDREFS debe ser uno o m\u00E1s nombres.
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro \"{0}\" debe incluir declaraciones correctamente anidadas cuando la referencia de entidad se utiliza como una declaraci\u00F3n completa.
+- ImproperDeclarationNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro \"{0}\" debe incluir declaraciones correctamente anidadas.
+- ImproperGroupNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro \"{0}\" debe incluir pares de par\u00E9ntesis correctamente anidados.
+- INVALID_PE_IN_CONDITIONAL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro \"{0}\" debe incluir la secci\u00F3n condicional completa o s\u00F3lo INCLUDE o IGNORE.
+- MSG_ATTRIBUTE_NOT_DECLARED = El atributo \"{1}\" se debe haber declarado para el tipo de elemento \"{0}\".
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = El atributo \"{0}\" con el valor \"{1}\" debe tener un valor de la lista \"{2}\".
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = El valor \"{1}\" del atributo \"{0}\" no se debe cambiar mediante la normalizaci\u00F3n (a \"{2}\") en un documento aut\u00F3nomo.
+- MSG_CONTENT_INCOMPLETE = El contenido del tipo de elemento \"{0}\" es incompleto, debe coincidir con \"{1}\".
+- MSG_CONTENT_INVALID = El contenido del tipo de elemento \"{0}\" debe coincidir con \"{1}\".
+- MSG_CONTENT_INVALID_SPECIFIED = El contenido del tipo de elemento \"{0}\" debe coincidir con \"{1}\". Los secundarios del tipo \"{2}\" no est\u00E1n permitidos.
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = El atributo \"{1}\" para el tipo de elemento \"{0}\" tiene un valor por defecto y debe especificarse en un documento aut\u00F3nomo.
+- MSG_DUPLICATE_ATTDEF = El atributo \"{1}\" ya se ha declarado para el tipo de elemento \"{0}\".
+- MSG_ELEMENT_ALREADY_DECLARED = El tipo de elemento \"{0}\" no debe declararse m\u00E1s de una vez.
+- MSG_ELEMENT_NOT_DECLARED = El tipo de elemento \"{0}\" debe declararse.
++ DuplicateTypeInMixedContent = El tipo de elemento "{1}" ya se especific\u00F3 en el modelo de contenido de la declaraci\u00F3n de elementos "{0}".
++ ENTITIESInvalid = El valor de atributo "{1}" del tipo ENTITIES debe ser el nombre de una o m\u00E1s entidades no analizadas.
++ ENTITYInvalid = El valor de atributo "{1}" del tipo ENTITY debe ser el nombre de una entidad no analizada.
++ IDDefaultTypeInvalid = El atributo de identificador "{0}" debe tener un valor por defecto declarado de "#IMPLIED" o "#REQUIRED".
++ IDInvalid = El valor de atributo "{0}" del tipo ID debe ser un nombre.
++ IDInvalidWithNamespaces = El valor de atributo "{0}" del tipo ID debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
++ IDNotUnique = El valor de atributo "{0}" del tipo ID debe ser \u00FAnico en el documento.
++ IDREFInvalid = El valor de atributo "{0}" del tipo IDREF debe ser un nombre.
++ IDREFInvalidWithNamespaces = El valor de atributo "{0}" del tipo IDREF debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
++ IDREFSInvalid = El valor de atributo "{0}" del tipo IDREFS debe ser uno o m\u00E1s nombres.
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir declaraciones correctamente anidadas cuando la referencia de entidad se utiliza como una declaraci\u00F3n completa.
++ ImproperDeclarationNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir declaraciones correctamente anidadas.
++ ImproperGroupNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir pares de par\u00E9ntesis correctamente anidados.
++ INVALID_PE_IN_CONDITIONAL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir la secci\u00F3n condicional completa o s\u00F3lo INCLUDE o IGNORE.
++ MSG_ATTRIBUTE_NOT_DECLARED = El atributo "{1}" se debe haber declarado para el tipo de elemento "{0}".
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = El atributo "{0}" con el valor "{1}" debe tener un valor de la lista "{2}".
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = El valor "{1}" del atributo "{0}" no se debe cambiar mediante la normalizaci\u00F3n (a "{2}") en un documento aut\u00F3nomo.
++ MSG_CONTENT_INCOMPLETE = El contenido del tipo de elemento "{0}" es incompleto, debe coincidir con "{1}".
++ MSG_CONTENT_INVALID = El contenido del tipo de elemento "{0}" debe coincidir con "{1}".
++ MSG_CONTENT_INVALID_SPECIFIED = El contenido del tipo de elemento "{0}" debe coincidir con "{1}". Los secundarios del tipo "{2}" no est\u00E1n permitidos.
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = El atributo "{1}" para el tipo de elemento "{0}" tiene un valor por defecto y debe especificarse en un documento aut\u00F3nomo.
++ MSG_DUPLICATE_ATTDEF = El atributo "{1}" ya se ha declarado para el tipo de elemento "{0}".
++ MSG_ELEMENT_ALREADY_DECLARED = El tipo de elemento "{0}" no debe declararse m\u00E1s de una vez.
++ MSG_ELEMENT_NOT_DECLARED = El tipo de elemento "{0}" debe declararse.
+ MSG_GRAMMAR_NOT_FOUND = El documento no es v\u00E1lido: no se ha encontrado la gram\u00E1tica.
+- MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con el identificador \"{0}\" debe aparecer en el documento.
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La referencia a la entidad externa \"{0}\" no est\u00E1 permitida en un documento aut\u00F3nomo.
+- MSG_FIXED_ATTVALUE_INVALID = El atributo \"{1}\" con el valor \"{2}\" debe tener un valor de \"{3}\".
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = El tipo de elemento \"{0}\" ya tiene un atributo \"{1}\" del tipo ID, un segundo atributo \"{2}\" del tipo ID no est\u00E1 permitido.
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = El tipo de elemento \"{0}\" ya tiene un atributo \"{1}\" del tipo NOTATION, un segundo atributo \"{2}\" del tipo NOTATION no est\u00E1 permitido.
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notaci\u00F3n \"{1}\" debe declararse cuando se hace referencia a la misma en la lista de tipos de notaci\u00F3n para el atributo \"{0}\".
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notaci\u00F3n \"{1}\" debe declararse cuando se hace referencia a la misma en la declaraci\u00F3n de entidad no analizada para \"{0}\".
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La referencia a la entidad \"{0}\" declarada en una entidad analizada externa no est\u00E1 permitida en un documento aut\u00F3nomo.
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = El atributo \"{1}\" es necesario y debe especificarse para el tipo de elemento \"{0}\".
++ MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con el identificador "{0}" debe aparecer en el documento.
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La referencia a la entidad externa "{0}" no est\u00E1 permitida en un documento aut\u00F3nomo.
++ MSG_FIXED_ATTVALUE_INVALID = El atributo "{1}" con el valor "{2}" debe tener un valor de "{3}".
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = El tipo de elemento "{0}" ya tiene un atributo "{1}" del tipo ID, un segundo atributo "{2}" del tipo ID no est\u00E1 permitido.
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = El tipo de elemento "{0}" ya tiene un atributo "{1}" del tipo NOTATION, un segundo atributo "{2}" del tipo NOTATION no est\u00E1 permitido.
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notaci\u00F3n "{1}" debe declararse cuando se hace referencia a la misma en la lista de tipos de notaci\u00F3n para el atributo "{0}".
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notaci\u00F3n "{1}" debe declararse cuando se hace referencia a la misma en la declaraci\u00F3n de entidad no analizada para "{0}".
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La referencia a la entidad "{0}" declarada en una entidad analizada externa no est\u00E1 permitida en un documento aut\u00F3nomo.
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = El atributo "{1}" es necesario y debe especificarse para el tipo de elemento "{0}".
+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = No debe incluirse un espacio en blanco entre los elementos declarados en una entidad analizada externa con el contenido del elemento en un documento aut\u00F3nomo.
+- NMTOKENInvalid = El valor de atributo \"{0}\" del tipo NMTOKEN debe ser un elemento de nombre.
+- NMTOKENSInvalid = El valor de atributo \"{0}\" del tipo NMTOKENS debe ser uno o m\u00E1s elementos de nombre.
+- NoNotationOnEmptyElement = El tipo de elemento \"{0}\" que se declar\u00F3 como EMPTY no puede declarar el atributo \"{1}\" del tipo NOTATION.
+- RootElementTypeMustMatchDoctypedecl = El elemento ra\u00EDz del documento \"{1}\", debe coincidir con la ra\u00EDz DOCTYPE \"{0}\".
+- UndeclaredElementInContentSpec = El modelo de contenido del elemento \"{0}\" hace referencia al elemento no declarado \"{1}\".
+- UniqueNotationName = La declaraci\u00F3n de la notaci\u00F3n \"{0}\" no es \u00FAnica. Un nombre determinado no debe declararse en m\u00E1s de una declaraci\u00F3n de notaci\u00F3n.
++ NMTOKENInvalid = El valor de atributo "{0}" del tipo NMTOKEN debe ser un token de nombre.
++ NMTOKENSInvalid = El valor de atributo "{0}" del tipo NMTOKENS debe ser uno o m\u00E1s tokens de nombre.
++ NoNotationOnEmptyElement = El tipo de elemento "{0}" que se declar\u00F3 como EMPTY no puede declarar el atributo "{1}" del tipo NOTATION.
++ RootElementTypeMustMatchDoctypedecl = El elemento ra\u00EDz del documento "{1}", debe coincidir con la ra\u00EDz DOCTYPE "{0}".
++ UndeclaredElementInContentSpec = El modelo de contenido del elemento "{0}" hace referencia al elemento no declarado "{1}".
++ UniqueNotationName = La declaraci\u00F3n de la notaci\u00F3n "{0}" no es \u00FAnica. Un nombre determinado no debe declararse en m\u00E1s de una declaraci\u00F3n de notaci\u00F3n.
+ ENTITYFailedInitializeGrammar = Fallo del validador ENTITYDatatype. Es necesario llamar al m\u00E9todo de inicializaci\u00F3n con una referencia de gram\u00E1tica v\u00E1lida. \t
+- ENTITYNotUnparsed = ENTITY \"{0}\"no est\u00E1 sin analizar.
+- ENTITYNotValid = ENTITY \"{0}\" no es v\u00E1lida.
++ ENTITYNotUnparsed = ENTITY "{0}"no est\u00E1 sin analizar.
++ ENTITYNotValid = ENTITY "{0}" no es v\u00E1lida.
+ EmptyList = El valor de tipo ENTITIES, IDREFS y NMTOKENS no puede ser una lista vac\u00EDa.
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = La referencia de entidad externa \"&{0};\" no est\u00E1 permitida en un valor de atributo.
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = La referencia de entidad externa "&{0};" no est\u00E1 permitida en un valor de atributo.
++ AccessExternalDTD = DTD externa: fallo al leer DTD externa ''{0}'' porque el acceso a ''{1}'' no est\u00E1 permitido debido a una restricci\u00F3n que ha definido la propiedad accessExternalDTD.
++ AccessExternalEntity = Entidad externa: fallo al leer el documento externo ''{0}'' porque el acceso a ''{1}'' no est\u00E1 permitido debido a una restricci\u00F3n que ha definido la propiedad accessExternalDTD.
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = Se hizo referencia a la entidad \"{0}\", pero no se declar\u00F3.
+- ReferenceToUnparsedEntity = La referencia de entidad no analizada \"&{0};\" no est\u00E1 permitida.
+- RecursiveReference = Referencia de entidad recursiva \"{0}\". (Ruta de acceso de referencia: {1}),
+- RecursiveGeneralReference = Referencia de entidad general recursiva \"&{0};\". (Ruta de acceso de referencia: {1}),
+- RecursivePEReference = Referencia de entidad de par\u00E1metro recursiva \"%{0};\". (Ruta de acceso de referencia: {1}),
++ EntityNotDeclared = Se hizo referencia a la entidad "{0}", pero no se declar\u00F3.
++ ReferenceToUnparsedEntity = La referencia de entidad no analizada "&{0};" no est\u00E1 permitida.
++ RecursiveReference = Referencia de entidad recursiva "{0}". (Ruta de acceso de referencia: {1}),
++ RecursiveGeneralReference = Referencia de entidad general recursiva "&{0};". (Ruta de acceso de referencia: {1}),
++ RecursivePEReference = Referencia de entidad de par\u00E1metro recursiva "%{0};". (Ruta de acceso de referencia: {1}),
+ # 4.3.3 Character Encoding in Entities
+- EncodingNotSupported = La codificaci\u00F3n \"{0}\" no est\u00E1 soportada.
++ EncodingNotSupported = La codificaci\u00F3n "{0}" no est\u00E1 soportada.
+ EncodingRequired = Una entidad analizada no codificada en UTF-8 o UTF-16 debe contener una declaraci\u00F3n de codificaci\u00F3n.
+
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = El elemento o el atributo no coinciden con la producci\u00F3n del QName: QName::=(NCName':')?NCName.
+- ElementXMLNSPrefix = El elemento \"{0}\" no puede tener \"xmlns\" como prefijo.
+- ElementPrefixUnbound = El prefijo \"{0}\" para el elemento \"{1}\" no est\u00E1 enlazado.
+- AttributePrefixUnbound = El prefijo \"{2}\" para el atributo \"{1}\" asociado a un tipo de elemento \"{0}\" no est\u00E1 enlazado.
+- EmptyPrefixedAttName = El valor del atributo \"{0}\" no es v\u00E1lido. Los enlaces de espacio de nombres utilizados de prefijo no pueden estar vac\u00EDos.
+- PrefixDeclared = El prefijo de espacio de nombres \"{0}\" no se ha declarado.
++ ElementXMLNSPrefix = El elemento "{0}" no puede tener "xmlns" como prefijo.
++ ElementPrefixUnbound = El prefijo "{0}" para el elemento "{1}" no est\u00E1 enlazado.
++ AttributePrefixUnbound = El prefijo "{2}" para el atributo "{1}" asociado a un tipo de elemento "{0}" no est\u00E1 enlazado.
++ EmptyPrefixedAttName = El valor del atributo "{0}" no es v\u00E1lido. Los enlaces de espacio de nombres utilizados de prefijo no pueden estar vac\u00EDos.
++ PrefixDeclared = El prefijo de espacio de nombres "{0}" no se ha declarado.
+ CantBindXMLNS = El prefijo "xmlns" no puede enlazarse a ning\u00FAn espacio de nombres expl\u00EDcitamente; tampoco puede enlazarse el espacio de nombres para "xmlns" a cualquier prefijo expl\u00EDcitamente.
+ CantBindXML = El prefijo "xml" no puede enlazarse a ning\u00FAn espacio de nombres que no sea el habitual; tampoco puede enlazarse el espacio de nombres para "xml" a cualquier prefijo que no sea "xml".
+- MSG_ATT_DEFAULT_INVALID = El valor por defecto \"{1}\" del atributo \"{0}\" no es legal para las restricciones l\u00E9xicas de este tipo de atributo.
++ MSG_ATT_DEFAULT_INVALID = El valor por defecto "{1}" del atributo "{0}" no es legal para las restricciones l\u00E9xicas de este tipo de atributo.
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +318,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=El analizador ha encontrado m\u00E1s de \"{0}\"ampliaciones de entidad en este documento; \u00E9ste es el l\u00EDmite impuesto por la aplicaci\u00F3n.
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: el analizador ha encontrado m\u00E1s de "{0}"ampliaciones de entidad en este documento; \u00E9ste es el l\u00EDmite impuesto por el JDK.
++ ElementAttributeLimit=JAXP00010002: el elemento "{0}" tiene m\u00E1s de "{1}" atributos, "{1}" es el l\u00EDmite impuesto por el JDK.
++ MaxEntitySizeLimit=JAXP00010003: la longitud de la entidad "{0}" es "{1}", que excede el l\u00EDmite de "{2}" que ha definido "{3}".
++ TotalEntitySizeLimit=JAXP00010004: el tama\u00F1o acumulado "{0}" de las entidades ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
++ MaxXMLNameLimit=JAXP00010005: el nombre "{0}" ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,27 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +45,14 @@
+ InvalidCharInProlog = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le prologue du document.
+ InvalidCharInXMLDecl = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la d\u00E9claration XML.
+ # 2.4 Character Data and Markup
+- CDEndInContent = La s\u00E9quence de caract\u00E8res \"]]>\" ne doit pas figurer dans le contenu sauf si elle est utilis\u00E9e pour baliser la fin d'une section CDATA.
++ CDEndInContent = La s\u00E9quence de caract\u00E8res "]]>" ne doit pas figurer dans le contenu sauf si elle est utilis\u00E9e pour baliser la fin d'une section CDATA.
+ # 2.7 CDATA Sections
+- CDSectUnterminated = La section CDATA doit se terminer par \"]]>\".
++ CDSectUnterminated = La section CDATA doit se terminer par "]]>".
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = La d\u00E9claration XML ne peut figurer qu'au d\u00E9but du document.
+- EqRequiredInXMLDecl = Le caract\u00E8re ''='' doit suivre \"{0}\" dans la d\u00E9claration XML.
+- QuoteRequiredInXMLDecl = La valeur suivant \"{0}\" dans la d\u00E9claration XML doit \u00EAtre une cha\u00EEne entre guillemets.
+- XMLDeclUnterminated = La d\u00E9claration XML doit se terminer par \"?>\".
++ EqRequiredInXMLDecl = Le caract\u00E8re ''='' doit suivre "{0}" dans la d\u00E9claration XML.
++ QuoteRequiredInXMLDecl = La valeur suivant "{0}" dans la d\u00E9claration XML doit \u00EAtre une cha\u00EEne entre guillemets.
++ XMLDeclUnterminated = La d\u00E9claration XML doit se terminer par "?>".
+ VersionInfoRequired = La version est obligatoire dans la d\u00E9claration XML.
+ SpaceRequiredBeforeVersionInXMLDecl = Un espace est obligatoire devant le pseudo-attribut version dans la d\u00E9claration XML.
+ SpaceRequiredBeforeEncodingInXMLDecl = Un espace est obligatoire devant le pseudo-attribut encoding dans la d\u00E9claration XML.
+@@ -71,70 +68,71 @@
+ ReferenceIllegalInTrailingMisc=R\u00E9f\u00E9rence non autoris\u00E9e dans la section de fin.
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = La valeur de d\u00E9claration de document autonome doit \u00EAtre \"oui\" ou \"non\", mais pas \"{0}\".
++ SDDeclInvalid = La valeur de d\u00E9claration de document autonome doit \u00EAtre "oui" ou "non", mais pas "{0}".
++ SDDeclNameInvalid = Le nom de document autonome contenu dans la d\u00E9claration XML est peut-\u00EAtre mal orthographi\u00E9.
+ # 2.12 Language Identification
+- XMLLangInvalid = La valeur d''attribut xml:lang \"{0}\" est un identificateur de langue non valide.
++ XMLLangInvalid = La valeur d''attribut xml:lang "{0}" est un identificateur de langue non valide.
+ # 3. Logical Structures
+- ETagRequired = Le type d''\u00E9l\u00E9ment \"{0}\" doit se terminer par la balise de fin correspondante \"</{0}>\".
++ ETagRequired = Le type d''\u00E9l\u00E9ment "{0}" doit se terminer par la balise de fin correspondante "</{0}>".
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = Le type d''\u00E9l\u00E9ment \"{0}\" doit \u00EAtre suivi des sp\u00E9cifications d''attribut, \">\" ou \"/>\".
+- EqRequiredInAttribute = Le nom d''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\" doit \u00EAtre suivi du caract\u00E8re ''=''.
+- OpenQuoteExpected = Des guillemets ouvrants sont attendus pour l''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\".
+- CloseQuoteExpected = Des guillemets fermants sont attendus pour l''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\".
+- AttributeNotUnique = L''attribut \"{1}\" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment \"{0}\".
+- AttributeNSNotUnique = L''attribut \"{1}\" li\u00E9 \u00E0 l''espace de noms \"{2}\" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment \"{0}\".
+- ETagUnterminated = La balise de fin pour le type d''\u00E9l\u00E9ment \"{0}\" doit se terminer par un d\u00E9limiteur ''>''.
++ ElementUnterminated = Le type d''\u00E9l\u00E9ment "{0}" doit \u00EAtre suivi des sp\u00E9cifications d''attribut, ">" ou "/>".
++ EqRequiredInAttribute = Le nom d''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}" doit \u00EAtre suivi du caract\u00E8re ''=''.
++ OpenQuoteExpected = Des guillemets ouvrants sont attendus pour l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}".
++ CloseQuoteExpected = Des guillemets fermants sont attendus pour l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}".
++ AttributeNotUnique = L''attribut "{1}" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment "{0}".
++ AttributeNSNotUnique = L''attribut "{1}" li\u00E9 \u00E0 l''espace de noms "{2}" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment "{0}".
++ ETagUnterminated = La balise de fin pour le type d''\u00E9l\u00E9ment "{0}" doit se terminer par un d\u00E9limiteur ''>''.
+ MarkupNotRecognizedInContent = Le contenu des \u00E9l\u00E9ments doit inclure un balisage ou des caract\u00E8res au format correct.
+ DoctypeIllegalInContent = Un DOCTYPE n'est pas autoris\u00E9 dans le contenu.
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = La r\u00E9f\u00E9rence doit se terminer par un d\u00E9limiteur ';'.
+ # 4.3.2 Well-Formed Parsed Entities
+ ReferenceNotInOneEntity = La r\u00E9f\u00E9rence doit \u00EAtre enti\u00E8rement incluse dans la m\u00EAme entit\u00E9 analys\u00E9e.
+- ElementEntityMismatch = L''\u00E9l\u00E9ment \"{0}\" doit commencer et se terminer dans la m\u00EAme entit\u00E9.
++ ElementEntityMismatch = L''\u00E9l\u00E9ment "{0}" doit commencer et se terminer dans la m\u00EAme entit\u00E9.
+ MarkupEntityMismatch=Les structures de document XML doivent commencer et se terminer dans la m\u00EAme entit\u00E9.
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = Un caract\u00E8re XML non valide (Unicode : 0x{2}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la valeur de l''attribut \"{1}\" et l''\u00E9l\u00E9ment est \"{0}\".
++ InvalidCharInAttValue = Un caract\u00E8re XML non valide (Unicode : 0x{2}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la valeur de l''attribut "{1}" et l''\u00E9l\u00E9ment est "{0}".
+ InvalidCharInComment = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le commentaire.
+ InvalidCharInPI = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans l''instruction de traitement.
+ InvalidCharInInternalSubset = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le sous-ensemble interne de la DTD.
+ InvalidCharInTextDecl = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la d\u00E9claration textuelle.
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = La valeur de l''attribut \"{1}\" doit commencer par une apostrophe ou des guillemets.
+- LessthanInAttValue = La valeur de l''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\" ne doit pas contenir le caract\u00E8re ''<''.
+- AttributeValueUnterminated = La valeur de l''attribut \"{1}\" doit se terminer par les guillemets correspondants.
++ QuoteRequiredInAttValue = La valeur de l''attribut "{1}" doit commencer par une apostrophe ou des guillemets.
++ LessthanInAttValue = La valeur de l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}" ne doit pas contenir le caract\u00E8re ''<''.
++ AttributeValueUnterminated = La valeur de l''attribut "{1}" doit se terminer par les guillemets correspondants.
+ # 2.5 Comments
+- InvalidCommentStart = Le commentaire doit commencer par \"<!--\".
+- DashDashInComment = La cha\u00EEne \"--\" n'est pas autoris\u00E9e dans les commentaires.
+- CommentUnterminated = Le commentaire doit se terminer par \"-->\".
++ InvalidCommentStart = Le commentaire doit commencer par "<!--".
++ DashDashInComment = La cha\u00EEne "--" n'est pas autoris\u00E9e dans les commentaires.
++ CommentUnterminated = Le commentaire doit se terminer par "-->".
+ COMMENT_NOT_IN_ONE_ENTITY = Le commentaire n'est pas compris dans la m\u00EAme entit\u00E9.
+ # 2.6 Processing Instructions
+ PITargetRequired = L'instruction de traitement doit commencer par le nom de la cible.
+ SpaceRequiredInPI = Un espace est obligatoire entre les donn\u00E9es et la cible de l'instruction de traitement.
+- PIUnterminated = L'instruction de traitement doit se terminer par \"?>\".
+- ReservedPITarget = La cible de l'instruction de traitement correspondant \u00E0 \"[xX][mM][lL]\" n'est pas autoris\u00E9e.
++ PIUnterminated = L'instruction de traitement doit se terminer par "?>".
++ ReservedPITarget = La cible de l'instruction de traitement correspondant \u00E0 "[xX][mM][lL]" n'est pas autoris\u00E9e.
+ PI_NOT_IN_ONE_ENTITY = L'instruction de traitement n'est pas comprise dans la m\u00EAme entit\u00E9.
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = Version \"{0}\" non valide.
+- VersionNotSupported = La version XML \"{0}\" n''est pas prise en charge. Seule la version XML 1.0 est prise en charge.
+- VersionNotSupported11 = La version XML \"{0}\" n''est pas prise en charge. Seules les versions XML 1.0 et XML 1.1 sont prises en charge.
++ VersionInfoInvalid = Version "{0}" non valide.
++ VersionNotSupported = La version XML "{0}" n''est pas prise en charge. Seule la version XML 1.0 est prise en charge.
++ VersionNotSupported11 = La version XML "{0}" n''est pas prise en charge. Seules les versions XML 1.0 et XML 1.1 sont prises en charge.
+ VersionMismatch= Une entit\u00E9 ne peut pas inclure une autre entit\u00E9 d'une version ult\u00E9rieure.
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = Une repr\u00E9sentation d\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne \"&#\" dans une r\u00E9f\u00E9rence de caract\u00E8re.
+- HexdigitRequiredInCharRef = Une repr\u00E9sentation hexad\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne \"&#x\" dans une r\u00E9f\u00E9rence de caract\u00E8re.
++ DigitRequiredInCharRef = Une repr\u00E9sentation d\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne "&#" dans une r\u00E9f\u00E9rence de caract\u00E8re.
++ HexdigitRequiredInCharRef = Une repr\u00E9sentation hexad\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne "&#x" dans une r\u00E9f\u00E9rence de caract\u00E8re.
+ SemicolonRequiredInCharRef = La r\u00E9f\u00E9rence de caract\u00E8re doit se terminer par le d\u00E9limiteur ';'.
+- InvalidCharRef = La r\u00E9f\u00E9rence de caract\u00E8re \"&#{0}\" est un caract\u00E8re XML non valide.
++ InvalidCharRef = La r\u00E9f\u00E9rence de caract\u00E8re "&#{0}" est un caract\u00E8re XML non valide.
+ NameRequiredInReference = Le nom de l'identit\u00E9 doit imm\u00E9diatement suivre le caract\u00E8re "&" dans la r\u00E9f\u00E9rence d'entit\u00E9.
+- SemicolonRequiredInReference = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 \"{0}\" doit se terminer par le d\u00E9limiteur '';''.
++ SemicolonRequiredInReference = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 "{0}" doit se terminer par le d\u00E9limiteur '';''.
+ # 4.3.1 The Text Declaration
+ TextDeclMustBeFirst = La d\u00E9claration textuelle ne doit figurer qu'au d\u00E9but de l'entit\u00E9 analys\u00E9e externe.
+- EqRequiredInTextDecl = Le caract\u00E8re ''='' doit suivre \"{0}\" dans la d\u00E9claration textuelle.
+- QuoteRequiredInTextDecl = La valeur suivant \"{0}\" dans la d\u00E9claration textuelle doit \u00EAtre une cha\u00EEne entre guillemets.
+- CloseQuoteMissingInTextDecl = Dans la valeur suivant \"{0}\" dans la d\u00E9claration textuelle, il manque les guillemets fermants.
++ EqRequiredInTextDecl = Le caract\u00E8re ''='' doit suivre "{0}" dans la d\u00E9claration textuelle.
++ QuoteRequiredInTextDecl = La valeur suivant "{0}" dans la d\u00E9claration textuelle doit \u00EAtre une cha\u00EEne entre guillemets.
++ CloseQuoteMissingInTextDecl = Dans la valeur suivant "{0}" dans la d\u00E9claration textuelle, il manque les guillemets fermants.
+ SpaceRequiredBeforeVersionInTextDecl = Un espace est obligatoire devant le pseudo-attribut version dans la d\u00E9claration textuelle.
+ SpaceRequiredBeforeEncodingInTextDecl = Un espace est obligatoire devant le pseudo-attribut encoding dans la d\u00E9claration textuelle.
+- TextDeclUnterminated = La d\u00E9claration textuelle doit se terminer par \"?>\".
++ TextDeclUnterminated = La d\u00E9claration textuelle doit se terminer par "?>".
+ EncodingDeclRequired = La d\u00E9claration d'encodage est obligatoire dans la d\u00E9claration textuelle.
+ NoMorePseudoAttributes = Aucun autre pseudo-attribut n'est autoris\u00E9.
+ MorePseudoAttributes = D'autres pseudo-attributs sont attendus.
+@@ -143,13 +141,13 @@
+ CommentNotInOneEntity = Le commentaire doit \u00EAtre enti\u00E8rement inclus dans la m\u00EAme entit\u00E9 analys\u00E9e.
+ PINotInOneEntity = L'instruction de traitement doit \u00EAtre enti\u00E8rement incluse dans la m\u00EAme entit\u00E9 analys\u00E9e.
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = Nom d''encodage \"{0}\" non valide.
+- EncodingByteOrderUnsupported = L''ordre des octets donn\u00E9 pour encoder \"{0}\" n''est pas pris en charge.
++ EncodingDeclInvalid = Nom d''encodage "{0}" non valide.
++ EncodingByteOrderUnsupported = L''ordre des octets donn\u00E9 pour encoder "{0}" n''est pas pris en charge.
+ InvalidByte = Octet {0} de la s\u00E9quence UTF-8 \u00E0 {1} octets non valide.
+ ExpectedByte = Octet {0} de la s\u00E9quence UTF-8 \u00E0 {1} octets attendu.
+ InvalidHighSurrogate = Les bits de substitution sup\u00E9rieurs (High surrogate) dans la s\u00E9quence UTF-8 ne doivent pas d\u00E9passer 0x10 mais des bits 0x{0} ont \u00E9t\u00E9 d\u00E9tect\u00E9s.
+- OperationNotSupported = Op\u00E9ration \"{0}\" non prise en charge par le lecteur {1}.
+- InvalidASCII = L''octet \"{0}\" n''appartient pas au jeu de caract\u00E8res ASCII (7 bits).
++ OperationNotSupported = Op\u00E9ration "{0}" non prise en charge par le lecteur {1}.
++ InvalidASCII = L''octet "{0}" n''appartient pas au jeu de caract\u00E8res ASCII (7 bits).
+ CharConversionFailure = Une entit\u00E9 respectant un certain encodage ne doit pas contenir de s\u00E9quences non admises dans cet encodage.
+
+ # DTD Messages
+@@ -169,150 +167,150 @@
+ PubidCharIllegal = Ce caract\u00E8re (Unicode : 0x{0}) n''est pas autoris\u00E9 dans l''identificateur public.
+ SpaceRequiredBetweenPublicAndSystem = Des espaces sont obligatoires entre les ID publicId et systemId.
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Un espace est obligatoire apr\u00E8s \"<!DOCTYPE\" dans la d\u00E9claration de type de document.
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = Le type d'\u00E9l\u00E9ment racine doit figurer apr\u00E8s \"<!DOCTYPE\" dans la d\u00E9claration de type de document.
+- DoctypedeclUnterminated = La d\u00E9claration de type de document pour le type d''\u00E9l\u00E9ment racine \"{0}\" doit se terminer par ''>''.
+- PEReferenceWithinMarkup = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre \"%{0};\" ne peut pas survenir dans le balisage du sous-ensemble interne de la DTD.
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Un espace est obligatoire apr\u00E8s "<!DOCTYPE" dans la d\u00E9claration de type de document.
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = Le type d'\u00E9l\u00E9ment racine doit figurer apr\u00E8s "<!DOCTYPE" dans la d\u00E9claration de type de document.
++ DoctypedeclUnterminated = La d\u00E9claration de type de document pour le type d''\u00E9l\u00E9ment racine "{0}" doit se terminer par ''>''.
++ PEReferenceWithinMarkup = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre "%{0};" ne peut pas survenir dans le balisage du sous-ensemble interne de la DTD.
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Les d\u00E9clarations de balisage contenues dans la d\u00E9claration de type de document ou sur lesquelles pointe cette derni\u00E8re doivent avoir un format correct.
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = La d\u00E9claration d'attribut pour \"xml:space\" doit \u00EAtre pr\u00E9sent\u00E9e comme type \u00E9num\u00E9r\u00E9 dont les seules valeurs possibles sont \"default\" et \"preserve\".
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = La d\u00E9claration d'attribut pour "xml:space" doit \u00EAtre pr\u00E9sent\u00E9e comme type \u00E9num\u00E9r\u00E9 dont les seules valeurs possibles sont "default" et "preserve".
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s \"<!ELEMENT\" dans la d\u00E9claration de type d'\u00E9l\u00E9ment.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s "<!ELEMENT" dans la d\u00E9claration de type d'\u00E9l\u00E9ment.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Le type d'\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration de type d'\u00E9l\u00E9ment.
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment \"{0}\" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = La contrainte est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment \"{0}\" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
+- ElementDeclUnterminated = La d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\" doit se terminer par ''>''.
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment "{0}" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = La contrainte est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment "{0}" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
++ ElementDeclUnterminated = La d\u00E9claration du type d''\u00E9l\u00E9ment "{0}" doit se terminer par ''>''.
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un caract\u00E8re ''('' ou un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\".
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un caract\u00E8re ''('' ou un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\".
+- MixedContentUnterminated = Le mod\u00E8le de contenu mixte \"{0}\" doit se terminer par \")*\" lorsque les types d''\u00E9l\u00E9ment enfant sont contraints.
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
++ MixedContentUnterminated = Le mod\u00E8le de contenu mixte "{0}" doit se terminer par ")*" lorsque les types d''\u00E9l\u00E9ment enfant sont contraints.
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Un espace est obligatoire apr\u00E8s \"<!ATTLIST\" dans la d\u00E9claration de liste d'attributs.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Un espace est obligatoire apr\u00E8s "<!ATTLIST" dans la d\u00E9claration de liste d'attributs.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Le type d'\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration de liste d'attributs.
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Un espace est obligatoire avant le nom d''attribut dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment \"{0}\".
+- AttNameRequiredInAttDef = Le nom d''attribut doit \u00EAtre sp\u00E9cifi\u00E9 dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Un espace est obligatoire avant le type d''attribut dans la d\u00E9claration de l''attribut \"{1}\" de l''\u00E9l\u00E9ment \"{0}\".
+- AttTypeRequiredInAttDef = Le type d''attribut est obligatoire dans la d\u00E9claration de l''attribut \"{1}\" de l''\u00E9l\u00E9ment \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Un espace est obligatoire avant la valeur par d\u00E9faut de l''attribut dans la d\u00E9claration de l''attribut \"{1}\" de l''\u00E9l\u00E9ment \"{0}\".
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Plusieurs d\u00E9finitions d''attribut sont fournies pour le m\u00EAme attribut \"{1}\" d''un \u00E9l\u00E9ment donn\u00E9 \"{0}\".
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Un espace est obligatoire avant le nom d''attribut dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment "{0}".
++ AttNameRequiredInAttDef = Le nom d''attribut doit \u00EAtre sp\u00E9cifi\u00E9 dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Un espace est obligatoire avant le type d''attribut dans la d\u00E9claration de l''attribut "{1}" de l''\u00E9l\u00E9ment "{0}".
++ AttTypeRequiredInAttDef = Le type d''attribut est obligatoire dans la d\u00E9claration de l''attribut "{1}" de l''\u00E9l\u00E9ment "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Un espace est obligatoire avant la valeur par d\u00E9faut de l''attribut dans la d\u00E9claration de l''attribut "{1}" de l''\u00E9l\u00E9ment "{0}".
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Plusieurs d\u00E9finitions d''attribut sont fournies pour le m\u00EAme attribut "{1}" d''un \u00E9l\u00E9ment donn\u00E9 "{0}".
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Un espace doit figurer apr\u00E8s \"NOTATION\" dans la d\u00E9claration d''attribut \"{1}\".
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Le caract\u00E8re ''('' doit suivre \"NOTATION\" dans la d\u00E9claration d''attribut \"{1}\".
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Le nom de notation est obligatoire dans la liste des types de notation de la d\u00E9claration d''attribut \"{1}\".
+- NotationTypeUnterminated = La liste des types de notation doit se terminer par '')'' dans la d\u00E9claration d''attribut \"{1}\".
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Le jeton de nom est obligatoire dans la liste des types \u00E9num\u00E9r\u00E9s pour la d\u00E9claration d''attribut \"{1}\".
+- EnumerationUnterminated = La liste des types \u00E9num\u00E9r\u00E9s doit se terminer par '')'' dans la d\u00E9claration d''attribut \"{1}\".
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration \"{1}\" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut \"{2}\" pour l''\u00E9l\u00E9ment \"{0}\". Les valeurs NMTOKENS d''une d\u00E9claration d''attribut Enumeration unique doivent toutes \u00EAtre distinctes.
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration \"{1}\" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut \"{2}\" pour l''\u00E9l\u00E9ment \"{0}\". Les noms NOTATION d''une d\u00E9claration d''attribut NotationType unique doivent tous \u00EAtre distincts.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Un espace doit figurer apr\u00E8s "NOTATION" dans la d\u00E9claration d''attribut "{1}".
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Le caract\u00E8re ''('' doit suivre "NOTATION" dans la d\u00E9claration d''attribut "{1}".
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Le nom de notation est obligatoire dans la liste des types de notation de la d\u00E9claration d''attribut "{1}".
++ NotationTypeUnterminated = La liste des types de notation doit se terminer par '')'' dans la d\u00E9claration d''attribut "{1}".
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Le jeton de nom est obligatoire dans la liste des types \u00E9num\u00E9r\u00E9s pour la d\u00E9claration d''attribut "{1}".
++ EnumerationUnterminated = La liste des types \u00E9num\u00E9r\u00E9s doit se terminer par '')'' dans la d\u00E9claration d''attribut "{1}".
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration "{1}" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut "{2}" pour l''\u00E9l\u00E9ment "{0}". Les valeurs NMTOKENS d''une d\u00E9claration d''attribut Enumeration unique doivent toutes \u00EAtre distinctes.
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration "{1}" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut "{2}" pour l''\u00E9l\u00E9ment "{0}". Les noms NOTATION d''une d\u00E9claration d''attribut NotationType unique doivent tous \u00EAtre distincts.
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Un espace doit figurer apr\u00E8s \"FIXED\" dans la d\u00E9claration d''attribut \"{1}\".
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Un espace doit figurer apr\u00E8s "FIXED" dans la d\u00E9claration d''attribut "{1}".
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = La section conditionnelle incluse doit se terminer par \"]]>\".
+- IgnoreSectUnterminated = La section conditionnelle exclue doit se terminer par \"]]>\".
++ IncludeSectUnterminated = La section conditionnelle incluse doit se terminer par "]]>".
++ IgnoreSectUnterminated = La section conditionnelle exclue doit se terminer par "]]>".
+ # 4.1 Character and Entity References
+ NameRequiredInPEReference = Le nom de l'entit\u00E9 doit imm\u00E9diatement suivre le caract\u00E8re "%" dans la r\u00E9f\u00E9rence d'entit\u00E9 de param\u00E8tre.
+- SemicolonRequiredInPEReference = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre \"%{0};\" doit se terminer par le d\u00E9limiteur '';''.
++ SemicolonRequiredInPEReference = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre "%{0};" doit se terminer par le d\u00E9limiteur '';''.
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire apr\u00E8s \"<!ENTITY\" dans la d\u00E9claration d'entit\u00E9.
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Un espace est obligatoire entre \"<!ENTITY\" et le caract\u00E8re "%" dans la d\u00E9claration d'entit\u00E9 de param\u00E8tre.
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire apr\u00E8s "<!ENTITY" dans la d\u00E9claration d'entit\u00E9.
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Un espace est obligatoire entre "<!ENTITY" et le caract\u00E8re "%" dans la d\u00E9claration d'entit\u00E9 de param\u00E8tre.
+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Un espace est obligatoire entre "%" et le nom de l'entit\u00E9 dans la d\u00E9claration d'entit\u00E9 de param\u00E8tre.
+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Le nom de l'entit\u00E9 est obligatoire dans la d\u00E9claration d'entit\u00E9.
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire entre le nom de l''entit\u00E9 \"{0}\" et la d\u00E9finition dans la d\u00E9claration d''entit\u00E9.
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire entre \"NDATA\" et le nom de notation dans la d\u00E9claration de l''entit\u00E9 \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire avant \"NDATA\" dans la d\u00E9claration de l''entit\u00E9 \"{0}\".
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Le nom de notation est obligatoire apr\u00E8s \"NDATA\" dans la d\u00E9claration de l''entit\u00E9 \"{0}\".
+- EntityDeclUnterminated = La d\u00E9claration de l''entit\u00E9 \"{0}\" doit se terminer par ''>''.
+- MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E9 \"{0}\" est d\u00E9clar\u00E9e plusieurs fois.
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire entre le nom de l''entit\u00E9 "{0}" et la d\u00E9finition dans la d\u00E9claration d''entit\u00E9.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire entre "NDATA" et le nom de notation dans la d\u00E9claration de l''entit\u00E9 "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire avant "NDATA" dans la d\u00E9claration de l''entit\u00E9 "{0}".
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Le nom de notation est obligatoire apr\u00E8s "NDATA" dans la d\u00E9claration de l''entit\u00E9 "{0}".
++ EntityDeclUnterminated = La d\u00E9claration de l''entit\u00E9 "{0}" doit se terminer par ''>''.
++ MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E9 "{0}" est d\u00E9clar\u00E9e plusieurs fois.
+ # 4.2.2 External Entities
+- ExternalIDRequired = La d\u00E9claration d'entit\u00E9 externe doit commencer par \"SYSTEM\" ou \"PUBLIC\".
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Un espace est obligatoire entre \"PUBLIC\" et l'identificateur public.
++ ExternalIDRequired = La d\u00E9claration d'entit\u00E9 externe doit commencer par "SYSTEM" ou "PUBLIC".
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Un espace est obligatoire entre "PUBLIC" et l'identificateur public.
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Un espace est obligatoire entre l'identificateur public et l'identificateur syst\u00E8me.
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Un espace est obligatoire entre \"SYSTEM\" et l'identificateur syst\u00E8me.
+- MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificateur du fragment ne doit pas \u00EAtre sp\u00E9cifi\u00E9 comme faisant partie de l''identificateur syst\u00E8me \"{0}\".
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Un espace est obligatoire entre "SYSTEM" et l'identificateur syst\u00E8me.
++ MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificateur du fragment ne doit pas \u00EAtre sp\u00E9cifi\u00E9 comme faisant partie de l''identificateur syst\u00E8me "{0}".
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s \"<!NOTATION\" dans la d\u00E9claration de notation.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s "<!NOTATION" dans la d\u00E9claration de notation.
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Le nom de la notation est obligatoire dans la d\u00E9claration de notation.
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s le nom de notation \"{0}\" dans la d\u00E9claration de notation.
+- ExternalIDorPublicIDRequired = La d\u00E9claration de la notation \"{0}\" doit inclure un identificateur syst\u00E8me ou public.
+- NotationDeclUnterminated = La d\u00E9claration de la notation \"{0}\" doit se terminer par ''>''.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s le nom de notation "{0}" dans la d\u00E9claration de notation.
++ ExternalIDorPublicIDRequired = La d\u00E9claration de la notation "{0}" doit inclure un identificateur syst\u00E8me ou public.
++ NotationDeclUnterminated = La d\u00E9claration de la notation "{0}" doit se terminer par ''>''.
+
+ # Validation messages
+- DuplicateTypeInMixedContent = Le type d''\u00E9l\u00E9ment \"{1}\" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 dans le mod\u00E8le de contenu de la d\u00E9claration d''\u00E9l\u00E9ment \"{0}\".
+- ENTITIESInvalid = La valeur d''attribut \"{1}\" de type ENTITIES doit correspondre au nom d''au moins une entit\u00E9 non analys\u00E9e.
+- ENTITYInvalid = La valeur d''attribut \"{1}\" de type ENTITY doit correspondre au nom d''une entit\u00E9 non analys\u00E9e.
+- IDDefaultTypeInvalid = L''attribut d''ID \"{0}\" doit avoir une valeur par d\u00E9faut d\u00E9clar\u00E9e de \"#IMPLIED\" ou \"#REQUIRED\".
+- IDInvalid = La valeur d''attribut \"{0}\" de type ID doit \u00EAtre un nom.
+- IDInvalidWithNamespaces = La valeur d''attribut \"{0}\" de type ID doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
+- IDNotUnique = La valeur d''attribut \"{0}\" de type ID doit \u00EAtre unique dans le document.
+- IDREFInvalid = La valeur d''attribut \"{0}\" de type IDREF doit \u00EAtre un nom.
+- IDREFInvalidWithNamespaces = La valeur d''attribut \"{0}\" de type IDREF doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
+- IDREFSInvalid = Une valeur d''attribut \"{0}\" de type IDREFS doit correspondre \u00E0 au moins un nom.
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre \"{0}\" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es lorsque la r\u00E9f\u00E9rence d''entit\u00E9 est utilis\u00E9e comme d\u00E9claration compl\u00E8te.
+- ImproperDeclarationNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre \"{0}\" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es.
+- ImproperGroupNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre \"{0}\" doit inclure des paires de parenth\u00E8ses correctement imbriqu\u00E9es.
+- INVALID_PE_IN_CONDITIONAL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre \"{0}\" doit inclure la section conditionnelle compl\u00E8te ou seulement INCLUDE ou IGNORE.
+- MSG_ATTRIBUTE_NOT_DECLARED = L''attribut \"{1}\" doit \u00EAtre d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment \"{0}\".
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attribut \"{0}\" de valeur \"{1}\" doit avoir une valeur issue de la liste \"{2}\".
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = La valeur \"{1}\" de l''attribut \"{0}\" ne doit pas \u00EAtre modifi\u00E9e par normalisation (et devenir \"{2}\") dans un document autonome.
+- MSG_CONTENT_INCOMPLETE = Le contenu du type d''\u00E9l\u00E9ment \"{0}\" est incomplet. Il doit correspondre \u00E0 \"{1}\".
+- MSG_CONTENT_INVALID = Le contenu du type d''\u00E9l\u00E9ment \"{0}\" doit correspondre \u00E0 \"{1}\".
+- MSG_CONTENT_INVALID_SPECIFIED = Le contenu du type d''\u00E9l\u00E9ment \"{0}\" doit correspondre \u00E0 \"{1}\". Les enfants de type \"{2}\" ne sont pas autoris\u00E9s.
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attribut \"{1}\" du type d''\u00E9l\u00E9ment \"{0}\" a une valeur par d\u00E9faut et doit \u00EAtre sp\u00E9cifi\u00E9 dans un document autonome.
+- MSG_DUPLICATE_ATTDEF = L''attribut \"{1}\" est d\u00E9j\u00E0 d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment \"{0}\".
+- MSG_ELEMENT_ALREADY_DECLARED = Le type d''\u00E9l\u00E9ment \"{0}\" ne doit pas \u00EAtre d\u00E9clar\u00E9 plusieurs fois.
+- MSG_ELEMENT_NOT_DECLARED = Le type d''\u00E9l\u00E9ment \"{0}\" doit \u00EAtre d\u00E9clar\u00E9.
++ DuplicateTypeInMixedContent = Le type d''\u00E9l\u00E9ment "{1}" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 dans le mod\u00E8le de contenu de la d\u00E9claration d''\u00E9l\u00E9ment "{0}".
++ ENTITIESInvalid = La valeur d''attribut "{1}" de type ENTITIES doit correspondre au nom d''au moins une entit\u00E9 non analys\u00E9e.
++ ENTITYInvalid = La valeur d''attribut "{1}" de type ENTITY doit correspondre au nom d''une entit\u00E9 non analys\u00E9e.
++ IDDefaultTypeInvalid = L''attribut d''ID "{0}" doit avoir une valeur par d\u00E9faut d\u00E9clar\u00E9e de "#IMPLIED" ou "#REQUIRED".
++ IDInvalid = La valeur d''attribut "{0}" de type ID doit \u00EAtre un nom.
++ IDInvalidWithNamespaces = La valeur d''attribut "{0}" de type ID doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
++ IDNotUnique = La valeur d''attribut "{0}" de type ID doit \u00EAtre unique dans le document.
++ IDREFInvalid = La valeur d''attribut "{0}" de type IDREF doit \u00EAtre un nom.
++ IDREFInvalidWithNamespaces = La valeur d''attribut "{0}" de type IDREF doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
++ IDREFSInvalid = Une valeur d''attribut "{0}" de type IDREFS doit correspondre \u00E0 au moins un nom.
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es lorsque la r\u00E9f\u00E9rence d''entit\u00E9 est utilis\u00E9e comme d\u00E9claration compl\u00E8te.
++ ImproperDeclarationNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es.
++ ImproperGroupNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure des paires de parenth\u00E8ses correctement imbriqu\u00E9es.
++ INVALID_PE_IN_CONDITIONAL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure la section conditionnelle compl\u00E8te ou seulement INCLUDE ou IGNORE.
++ MSG_ATTRIBUTE_NOT_DECLARED = L''attribut "{1}" doit \u00EAtre d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment "{0}".
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attribut "{0}" de valeur "{1}" doit avoir une valeur issue de la liste "{2}".
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = La valeur "{1}" de l''attribut "{0}" ne doit pas \u00EAtre modifi\u00E9e par normalisation (et devenir "{2}") dans un document autonome.
++ MSG_CONTENT_INCOMPLETE = Le contenu du type d''\u00E9l\u00E9ment "{0}" est incomplet. Il doit correspondre \u00E0 "{1}".
++ MSG_CONTENT_INVALID = Le contenu du type d''\u00E9l\u00E9ment "{0}" doit correspondre \u00E0 "{1}".
++ MSG_CONTENT_INVALID_SPECIFIED = Le contenu du type d''\u00E9l\u00E9ment "{0}" doit correspondre \u00E0 "{1}". Les enfants de type "{2}" ne sont pas autoris\u00E9s.
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attribut "{1}" du type d''\u00E9l\u00E9ment "{0}" a une valeur par d\u00E9faut et doit \u00EAtre sp\u00E9cifi\u00E9 dans un document autonome.
++ MSG_DUPLICATE_ATTDEF = L''attribut "{1}" est d\u00E9j\u00E0 d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment "{0}".
++ MSG_ELEMENT_ALREADY_DECLARED = Le type d''\u00E9l\u00E9ment "{0}" ne doit pas \u00EAtre d\u00E9clar\u00E9 plusieurs fois.
++ MSG_ELEMENT_NOT_DECLARED = Le type d''\u00E9l\u00E9ment "{0}" doit \u00EAtre d\u00E9clar\u00E9.
+ MSG_GRAMMAR_NOT_FOUND = Le document n'est pas valide : aucune grammaire d\u00E9tect\u00E9e.
+- MSG_ELEMENT_WITH_ID_REQUIRED = Un \u00E9l\u00E9ment avec l''identificateur \"{0}\" doit figurer dans le document.
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 externe \"{0}\" n''est pas autoris\u00E9e dans le document autonome.
+- MSG_FIXED_ATTVALUE_INVALID = L''attribut \"{1}\" de valeur \"{2}\" doit avoir une valeur de \"{3}\".
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Le type d''\u00E9l\u00E9ment \"{0}\" a d\u00E9j\u00E0 l''attribut \"{1}\" de type ID. Un deuxi\u00E8me attribut \"{2}\" de type ID n''est pas autoris\u00E9.
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Le type d''\u00E9l\u00E9ment \"{0}\" a d\u00E9j\u00E0 l''attribut \"{1}\" de type NOTATION. Un deuxi\u00E8me attribut \"{2}\" de type NOTATION n''est pas autoris\u00E9.
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notation \"{1}\" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la liste des types de notation de l''attribut \"{0}\".
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notation \"{1}\" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la d\u00E9claration d''entit\u00E9 non analys\u00E9e pour \"{0}\".
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 \"{0}\" d\u00E9clar\u00E9e dans une entit\u00E9 analys\u00E9e externe n''est pas autoris\u00E9e dans un document autonome.
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attribut \"{1}\" est obligatoire et doit \u00EAtre sp\u00E9cifi\u00E9 pour le type d''\u00E9l\u00E9ment \"{0}\".
++ MSG_ELEMENT_WITH_ID_REQUIRED = Un \u00E9l\u00E9ment avec l''identificateur "{0}" doit figurer dans le document.
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 externe "{0}" n''est pas autoris\u00E9e dans le document autonome.
++ MSG_FIXED_ATTVALUE_INVALID = L''attribut "{1}" de valeur "{2}" doit avoir une valeur de "{3}".
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Le type d''\u00E9l\u00E9ment "{0}" a d\u00E9j\u00E0 l''attribut "{1}" de type ID. Un deuxi\u00E8me attribut "{2}" de type ID n''est pas autoris\u00E9.
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Le type d''\u00E9l\u00E9ment "{0}" a d\u00E9j\u00E0 l''attribut "{1}" de type NOTATION. Un deuxi\u00E8me attribut "{2}" de type NOTATION n''est pas autoris\u00E9.
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notation "{1}" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la liste des types de notation de l''attribut "{0}".
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notation "{1}" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la d\u00E9claration d''entit\u00E9 non analys\u00E9e pour "{0}".
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 "{0}" d\u00E9clar\u00E9e dans une entit\u00E9 analys\u00E9e externe n''est pas autoris\u00E9e dans un document autonome.
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attribut "{1}" est obligatoire et doit \u00EAtre sp\u00E9cifi\u00E9 pour le type d''\u00E9l\u00E9ment "{0}".
+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Aucun espace ne doit figurer entre les \u00E9l\u00E9ments d\u00E9clar\u00E9s dans une entit\u00E9 analys\u00E9e externe avec le contenu des \u00E9l\u00E9ments dans un document autonome.
+- NMTOKENInvalid = La valeur d''attribut \"{0}\" de type NMTOKEN doit correspondre \u00E0 un jeton de nom.
+- NMTOKENSInvalid = La valeur d''attribut \"{0}\" de type NMTOKENS doit correspondre \u00E0 au moins un jeton de nom.
+- NoNotationOnEmptyElement = Le type d''\u00E9l\u00E9ment \"{0}\" d\u00E9clar\u00E9 EMPTY ne peut pas d\u00E9clarer un attribut \"{1}\" de type NOTATION.
+- RootElementTypeMustMatchDoctypedecl = L''\u00E9l\u00E9ment racine de document \"{1}\" doit correspondre \u00E0 la racine DOCTYPE \"{0}\".
+- UndeclaredElementInContentSpec = Le mod\u00E8le de contenu de l''\u00E9l\u00E9ment \"{0}\" fait r\u00E9f\u00E9rence \u00E0 l''\u00E9l\u00E9ment non d\u00E9clar\u00E9 \"{1}\".
+- UniqueNotationName = La d\u00E9claration de la notation \"{0}\" n''est pas unique. Une valeur Name donn\u00E9e ne doit pas \u00EAtre d\u00E9clar\u00E9e dans plusieurs d\u00E9clarations de notation.
+- ENTITYFailedInitializeGrammar = Contr\u00F4le de validation ENTITYDatatype : \u00E9chec. Besoin d'appeler une m\u00E9thode d'initialisation avec une r\u00E9f\u00E9rence de grammaire valide. \t
+- ENTITYNotUnparsed = La valeur ENTITY \"{0}\" est analys\u00E9e.
+- ENTITYNotValid = La valeur ENTITY \"{0}\" n''est pas valide.
++ NMTOKENInvalid = La valeur d''attribut "{0}" de type NMTOKEN doit correspondre \u00E0 un jeton de nom.
++ NMTOKENSInvalid = La valeur d''attribut "{0}" de type NMTOKENS doit correspondre \u00E0 au moins un jeton de nom.
++ NoNotationOnEmptyElement = Le type d''\u00E9l\u00E9ment "{0}" d\u00E9clar\u00E9 EMPTY ne peut pas d\u00E9clarer un attribut "{1}" de type NOTATION.
++ RootElementTypeMustMatchDoctypedecl = L''\u00E9l\u00E9ment racine de document "{1}" doit correspondre \u00E0 la racine DOCTYPE "{0}".
++ UndeclaredElementInContentSpec = Le mod\u00E8le de contenu de l''\u00E9l\u00E9ment "{0}" fait r\u00E9f\u00E9rence \u00E0 l''\u00E9l\u00E9ment non d\u00E9clar\u00E9 "{1}".
++ UniqueNotationName = La d\u00E9claration de la notation "{0}" n''est pas unique. Une valeur Name donn\u00E9e ne doit pas \u00EAtre d\u00E9clar\u00E9e dans plusieurs d\u00E9clarations de notation.
++ ENTITYFailedInitializeGrammar = Valideur ENTITYDatatype : \u00E9chec. Besoin d'appeler une m\u00E9thode d'initialisation avec une r\u00E9f\u00E9rence de grammaire valide. \t
++ ENTITYNotUnparsed = La valeur ENTITY "{0}" est analys\u00E9e.
++ ENTITYNotValid = La valeur ENTITY "{0}" n''est pas valide.
+ EmptyList = Une valeur de type ENTITIES, IDREFS et NMTOKENS ne peut pas correspondre \u00E0 une liste vide.
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = La r\u00E9f\u00E9rence d''entit\u00E9 externe \"&{0};\" n''est pas autoris\u00E9e dans une valeur d''attribut.
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = La r\u00E9f\u00E9rence d''entit\u00E9 externe "&{0};" n''est pas autoris\u00E9e dans une valeur d''attribut.
++ AccessExternalDTD = DTD externe : \u00E9chec de la lecture de la DTD externe ''{0}'', car l''acc\u00E8s ''{1}'' n''est pas autoris\u00E9 en raison d''une restriction d\u00E9finie par la propri\u00E9t\u00E9 accessExternalDTD.
++ AccessExternalEntity = Entit\u00E9 externe : \u00E9chec de la lecture du document externe ''{0}'', car l''acc\u00E8s ''{1}'' n''est pas autoris\u00E9 en raison d''une restriction d\u00E9finie par la propri\u00E9t\u00E9 accessExternalDTD.
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = L''entit\u00E9 \"{0}\" \u00E9tait r\u00E9f\u00E9renc\u00E9e, mais pas d\u00E9clar\u00E9e.
+- ReferenceToUnparsedEntity = La r\u00E9f\u00E9rence d''entit\u00E9 non analys\u00E9e \"&{0};\" n''est pas autoris\u00E9e.
+- RecursiveReference = R\u00E9f\u00E9rence d''entit\u00E9 r\u00E9cursive \"{0}\". (Chemin de r\u00E9f\u00E9rence : {1}),
+- RecursiveGeneralReference = R\u00E9f\u00E9rence d''entit\u00E9 g\u00E9n\u00E9rale r\u00E9cursive \"&{0};\". (Chemin de r\u00E9f\u00E9rence : {1}),
+- RecursivePEReference = R\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre r\u00E9cursive \"%{0};\". (Chemin de r\u00E9f\u00E9rence : {1}),
++ EntityNotDeclared = L''entit\u00E9 "{0}" \u00E9tait r\u00E9f\u00E9renc\u00E9e, mais pas d\u00E9clar\u00E9e.
++ ReferenceToUnparsedEntity = La r\u00E9f\u00E9rence d''entit\u00E9 non analys\u00E9e "&{0};" n''est pas autoris\u00E9e.
++ RecursiveReference = R\u00E9f\u00E9rence d''entit\u00E9 r\u00E9cursive "{0}". (Chemin de r\u00E9f\u00E9rence : {1}),
++ RecursiveGeneralReference = R\u00E9f\u00E9rence d''entit\u00E9 g\u00E9n\u00E9rale r\u00E9cursive "&{0};". (Chemin de r\u00E9f\u00E9rence : {1}),
++ RecursivePEReference = R\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre r\u00E9cursive "%{0};". (Chemin de r\u00E9f\u00E9rence : {1}),
+ # 4.3.3 Character Encoding in Entities
+- EncodingNotSupported = L''encodage \"{0}\" n''est pas pris en charge.
++ EncodingNotSupported = L''encodage "{0}" n''est pas pris en charge.
+ EncodingRequired = Une entit\u00E9 analys\u00E9e sans encodage UTF-8 ou UTF-16 doit contenir une d\u00E9claration d'encodage.
+
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = L'\u00E9l\u00E9ment ou l'attribut ne correspond pas \u00E0 la production QName : QName::=(NCName':')?NCName.
+- ElementXMLNSPrefix = L''\u00E9l\u00E9ment \"{0}\" ne peut pas avoir \"xmlns\" comme pr\u00E9fixe.
+- ElementPrefixUnbound = Le pr\u00E9fixe \"{0}\" de l''\u00E9l\u00E9ment \"{1}\" n''est pas li\u00E9.
+- AttributePrefixUnbound = Le pr\u00E9fixe \"{2}\" de l''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\" n''est pas li\u00E9.
+- EmptyPrefixedAttName = La valeur de l''attribut \"{0}\" n''est pas valide. Les liaisons d''espaces de noms pr\u00E9fix\u00E9s ne peuvent pas \u00EAtre vides.
+- PrefixDeclared = Le pr\u00E9fixe d''espace de noms \"{0}\" n''\u00E9tait pas d\u00E9clar\u00E9.
++ ElementXMLNSPrefix = L''\u00E9l\u00E9ment "{0}" ne peut pas avoir "xmlns" comme pr\u00E9fixe.
++ ElementPrefixUnbound = Le pr\u00E9fixe "{0}" de l''\u00E9l\u00E9ment "{1}" n''est pas li\u00E9.
++ AttributePrefixUnbound = Le pr\u00E9fixe "{2}" de l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}" n''est pas li\u00E9.
++ EmptyPrefixedAttName = La valeur de l''attribut "{0}" n''est pas valide. Les liaisons d''espaces de noms pr\u00E9fix\u00E9s ne peuvent pas \u00EAtre vides.
++ PrefixDeclared = Le pr\u00E9fixe d''espace de noms "{0}" n''\u00E9tait pas d\u00E9clar\u00E9.
+ CantBindXMLNS = Le pr\u00E9fixe "xmlns" ne peut pas \u00EAtre li\u00E9 \u00E0 un espace de noms de fa\u00E7on explicite, pas plus que l'espace de noms de "xmlns" \u00E0 un pr\u00E9fixe quelconque.
+ CantBindXML = Le pr\u00E9fixe "xml" ne peut pas \u00EAtre li\u00E9 \u00E0 un autre espace de noms que son espace de noms habituel. L'espace de noms de "xml" ne peut pas non plus \u00EAtre li\u00E9 \u00E0 un autre pr\u00E9fixe que "xml".
+- MSG_ATT_DEFAULT_INVALID = La valeur par d\u00E9faut \"{1}\" de l''attribut \"{0}\" n''est pas admise conform\u00E9ment aux contraintes lexicales de ce type d''attribut.
++ MSG_ATT_DEFAULT_INVALID = La valeur par d\u00E9faut "{1}" de l''attribut "{0}" n''est pas admise conform\u00E9ment aux contraintes lexicales de ce type d''attribut.
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +318,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=L''analyseur a rencontr\u00E9 plus de \"{0}\" d\u00E9veloppements d''entit\u00E9 dans ce document. Il s''agit de la limite impos\u00E9e par l''application.
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001 : L''analyseur a rencontr\u00E9 plus de "{0}" d\u00E9veloppements d''entit\u00E9 dans ce document. Il s''agit de la limite impos\u00E9e par le JDK.
++ ElementAttributeLimit=JAXP00010002 : L''\u00E9l\u00E9ment "{0}" a plus de "{1}" attributs. "{1}" est la limite impos\u00E9e par le JDK.
++ MaxEntitySizeLimit=JAXP00010003 : La longueur de l''entit\u00E9 "{0}" est de "{1}". Cette valeur d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}".
++ TotalEntitySizeLimit=JAXP00010004 : La taille cumul\u00E9e des entit\u00E9s ("{0}") d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}".
++ MaxXMLNameLimit=JAXP00010005 : le nom "{0}" d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}".
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,27 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +45,14 @@
+ InvalidCharInProlog = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel prologo del documento.
+ InvalidCharInXMLDecl = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nella dichiarazione XML.
+ # 2.4 Character Data and Markup
+- CDEndInContent = La sequenza di caratteri \"]]>\" non deve essere presente nel contenuto a meno che non sia utilizzata per contrassegnare la fine di una sezione CDATA.
++ CDEndInContent = La sequenza di caratteri "]]>" non deve essere presente nel contenuto a meno che non sia utilizzata per contrassegnare la fine di una sezione CDATA.
+ # 2.7 CDATA Sections
+- CDSectUnterminated = La sezione CDATA deve terminare con \"]]>\".
++ CDSectUnterminated = La sezione CDATA deve terminare con "]]>".
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = La dichiarazione XML pu\u00F2 comparire solo all'inizio del documento.
+- EqRequiredInXMLDecl = Il carattere '' = '' deve seguire \"{0}\" nella dichiarazione XML.
+- QuoteRequiredInXMLDecl = Il valore che segue \"{0}\" nella dichiarazione XML deve essere una stringa compresa tra apici.
+- XMLDeclUnterminated = La dichiarazione XML deve terminare con \"?>\".
++ EqRequiredInXMLDecl = Il carattere '' = '' deve seguire "{0}" nella dichiarazione XML.
++ QuoteRequiredInXMLDecl = Il valore che segue "{0}" nella dichiarazione XML deve essere una stringa compresa tra apici.
++ XMLDeclUnterminated = La dichiarazione XML deve terminare con "?>".
+ VersionInfoRequired = La versione \u00E8 obbligatoria nella dichiarazione XML.
+ SpaceRequiredBeforeVersionInXMLDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo della versione nella dichiarazione XML.
+ SpaceRequiredBeforeEncodingInXMLDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione XML.
+@@ -71,70 +68,71 @@
+ ReferenceIllegalInTrailingMisc=Il riferimento non \u00E8 consentito nella sezione finale.
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = Il valore della dichiarazione del documento standalone deve essere \"yes\" o \"no\", non \"{0}\".
++ SDDeclInvalid = Il valore della dichiarazione del documento standalone deve essere "yes" o "no", non "{0}".
++ SDDeclNameInvalid = Il nome standalone nella dichiarazione XML potrebbe essere stato digitato in modo errato.
+ # 2.12 Language Identification
+- XMLLangInvalid = Il valore dell''attributo xml:lang \"{0}\" \u00E8 un identificativo di lingua non valido.
++ XMLLangInvalid = Il valore dell''attributo xml:lang "{0}" \u00E8 un identificativo di lingua non valido.
+ # 3. Logical Structures
+- ETagRequired = Il tipo di elemento \"{0}\" deve terminare con la corrispondente tag finale \"</{0}>\".
++ ETagRequired = Il tipo di elemento "{0}" deve terminare con la corrispondente tag finale "</{0}>".
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = Il tipo di elemento \"{0}\" deve essere seguito dalle specifiche di attributo \">\" o \"/>\".
+- EqRequiredInAttribute = Il nome attributo \"{1}\" associato a un tipo di elemento \"{0}\" deve essere seguito dal carattere '' = ''.
+- OpenQuoteExpected = \u00C8 previsto un apice di apertura per l''attributo \"{1}\" associato a un tipo di elemento \"{0}\".
+- CloseQuoteExpected = \u00C8 previsto un apice di chiusura per l''attributo \"{1}\" associato a un tipo di elemento \"{0}\".
+- AttributeNotUnique = L''attributo \"{1}\" \u00E8 gi\u00E0 stato specificato per l''elemento \"{0}\".
+- AttributeNSNotUnique = L''attributo \"{1}\" associato allo spazio di nomi \"{2}\" \u00E8 gi\u00E0 stato specificato per l''elemento \"{0}\".
+- ETagUnterminated = La tag finale per il tipo di elemento \"{0}\" deve terminare con un delimitatore ''>''.
++ ElementUnterminated = Il tipo di elemento "{0}" deve essere seguito dalle specifiche di attributo ">" o "/>".
++ EqRequiredInAttribute = Il nome attributo "{1}" associato a un tipo di elemento "{0}" deve essere seguito dal carattere '' = ''.
++ OpenQuoteExpected = \u00C8 previsto un apice di apertura per l''attributo "{1}" associato a un tipo di elemento "{0}".
++ CloseQuoteExpected = \u00C8 previsto un apice di chiusura per l''attributo "{1}" associato a un tipo di elemento "{0}".
++ AttributeNotUnique = L''attributo "{1}" \u00E8 gi\u00E0 stato specificato per l''elemento "{0}".
++ AttributeNSNotUnique = L''attributo "{1}" associato allo spazio di nomi "{2}" \u00E8 gi\u00E0 stato specificato per l''elemento "{0}".
++ ETagUnterminated = La tag finale per il tipo di elemento "{0}" deve terminare con un delimitatore ''>''.
+ MarkupNotRecognizedInContent = Il contenuto degli elementi deve essere composto da dati o markup di caratteri con formato corretto.
+ DoctypeIllegalInContent = DOCTYPE non \u00E8 consentito nel contenuto.
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = Il riferimento deve terminare con un delimitatore ';'.
+ # 4.3.2 Well-Formed Parsed Entities
+ ReferenceNotInOneEntity = Il riferimento deve essere compreso completamente all'interno della stessa entit\u00E0 analizzata.
+- ElementEntityMismatch = L''elemento \"{0}\" deve iniziare e finire con la stessa entit\u00E0.
++ ElementEntityMismatch = L''elemento "{0}" deve iniziare e finire con la stessa entit\u00E0.
+ MarkupEntityMismatch=Le strutture di documenti XML devono iniziare e finire con la stessa entit\u00E0.
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{2}) nel valore dell''attributo \"{1}\". L''elemento \u00E8 \"{0}\".
++ InvalidCharInAttValue = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{2}) nel valore dell''attributo "{1}". L''elemento \u00E8 "{0}".
+ InvalidCharInComment = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel commento.
+ InvalidCharInPI = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nell''istruzione di elaborazione.
+ InvalidCharInInternalSubset = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel set secondario interno del DTD.
+ InvalidCharInTextDecl = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nella dichiarazione testuale.
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = Il valore dell''attributo \"{1}\" deve iniziare con un apice o una virgoletta.
+- LessthanInAttValue = Il valore dell''attributo \"{1}\" associato a un tipo di elemento \"{0}\" non deve essere contenere il carattere ''<''.
+- AttributeValueUnterminated = Il valore dell''attributo \"{1}\" deve terminare con un apice corrispondente.
++ QuoteRequiredInAttValue = Il valore dell''attributo "{1}" deve iniziare con un apice o una virgoletta.
++ LessthanInAttValue = Il valore dell''attributo "{1}" associato a un tipo di elemento "{0}" non deve essere contenere il carattere ''<''.
++ AttributeValueUnterminated = Il valore dell''attributo "{1}" deve terminare con un apice corrispondente.
+ # 2.5 Comments
+- InvalidCommentStart = Il commento deve iniziare con \"<!--\".
+- DashDashInComment = La stringa \"--\" non \u00E8 consentita nei commenti.
+- CommentUnterminated = Il commento deve terminare con \"-->\".
++ InvalidCommentStart = Il commento deve iniziare con "<!--".
++ DashDashInComment = La stringa "--" non \u00E8 consentita nei commenti.
++ CommentUnterminated = Il commento deve terminare con "-->".
+ COMMENT_NOT_IN_ONE_ENTITY = Il commento non \u00E8 compreso all'interno della stessa entit\u00E0.
+ # 2.6 Processing Instructions
+ PITargetRequired = L'istruzione di elaborazione deve iniziare con il nome della destinazione.
+ SpaceRequiredInPI = \u00C8 richiesto uno spazio tra la destinazione delle istruzioni di elaborazione e i dati.
+- PIUnterminated = L'istruzione di elaborazione deve terminare con \"?>\".
+- ReservedPITarget = Non \u00E8 consentita una destinazione di istruzione di elaborazione corrispondente a \"[xX][mM][lL]\".
++ PIUnterminated = L'istruzione di elaborazione deve terminare con "?>".
++ ReservedPITarget = Non \u00E8 consentita una destinazione di istruzione di elaborazione corrispondente a "[xX][mM][lL]".
+ PI_NOT_IN_ONE_ENTITY = L'istruzione di elaborazione non \u00E8 compresa all'interno della stessa entit\u00E0.
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = Versione \"{0}\" non valida.
+- VersionNotSupported = La versione XML \"{0}\" non \u00E8 supportata. Solo la versione XML 1.0 \u00E8 supportata.
+- VersionNotSupported11 = La versione XML \"{0}\" non \u00E8 supportata. Solo le versioni XML 1.0 e XML 1.1 sono supportate.
++ VersionInfoInvalid = Versione "{0}" non valida.
++ VersionNotSupported = La versione XML "{0}" non \u00E8 supportata. Solo la versione XML 1.0 \u00E8 supportata.
++ VersionNotSupported11 = La versione XML "{0}" non \u00E8 supportata. Solo le versioni XML 1.0 e XML 1.1 sono supportate.
+ VersionMismatch= Un'entit\u00E0 non pu\u00F2 includerne un'altra con una versione successiva.
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = Una rappresentazione decimale deve seguire immediatamente \"&#\" in un riferimento di carattere.
+- HexdigitRequiredInCharRef = Una rappresentazione esadecimale deve seguire immediatamente \"&#\" in un riferimento di carattere.
++ DigitRequiredInCharRef = Una rappresentazione decimale deve seguire immediatamente "&#" in un riferimento di carattere.
++ HexdigitRequiredInCharRef = Una rappresentazione esadecimale deve seguire immediatamente "&#" in un riferimento di carattere.
+ SemicolonRequiredInCharRef = Il riferimento di carattere deve terminare con il delimitatore ';'.
+- InvalidCharRef = Il riferimento di carattere \"&#{0}\" \u00E8 un carattere XML non valido.
++ InvalidCharRef = Il riferimento di carattere "&#{0}" \u00E8 un carattere XML non valido.
+ NameRequiredInReference = Il nome entit\u00E0 deve seguire immediatamente '&' nel riferimento di entit\u00E0.
+- SemicolonRequiredInReference = Il riferimento di entit\u00E0 \"{0}\" deve terminare con il delimitatore '';''.
++ SemicolonRequiredInReference = Il riferimento di entit\u00E0 "{0}" deve terminare con il delimitatore '';''.
+ # 4.3.1 The Text Declaration
+ TextDeclMustBeFirst = La dichiarazione di testo pu\u00F2 comparire solo all'inizio dell'entit\u00E0 esterna analizzata.
+- EqRequiredInTextDecl = Il carattere '' = '' deve seguire \"{0}\" nella dichiarazione di testo.
+- QuoteRequiredInTextDecl = Il valore che segue \"{0}\" nella dichiarazione di testo deve essere una stringa compresa tra apici.
+- CloseQuoteMissingInTextDecl = manca l''apice di chiusura nel valore che segue \"{0}\" nella dichiarazione di testo.
++ EqRequiredInTextDecl = Il carattere '' = '' deve seguire "{0}" nella dichiarazione di testo.
++ QuoteRequiredInTextDecl = Il valore che segue "{0}" nella dichiarazione di testo deve essere una stringa compresa tra apici.
++ CloseQuoteMissingInTextDecl = manca l''apice di chiusura nel valore che segue "{0}" nella dichiarazione di testo.
+ SpaceRequiredBeforeVersionInTextDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo della versione nella dichiarazione del testo.
+ SpaceRequiredBeforeEncodingInTextDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione del testo.
+- TextDeclUnterminated = La dichiarazione di testo deve terminare con \"?>\".
++ TextDeclUnterminated = La dichiarazione di testo deve terminare con "?>".
+ EncodingDeclRequired = La dichiarazione di codifica \u00E8 obbligatoria nella dichiarazione di testo.
+ NoMorePseudoAttributes = Non sono consentiti altri attributi pseudo.
+ MorePseudoAttributes = Sono previsti altri attributi pseudo.
+@@ -143,13 +141,13 @@
+ CommentNotInOneEntity = Il commento deve essere compreso completamente all'interno della stessa entit\u00E0 analizzata.
+ PINotInOneEntity = L'istruzione di elaborazione deve essere compresa completamente all'interno della stessa entit\u00E0 analizzata.
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = Nome codifica \"{0}\" non valido.
+- EncodingByteOrderUnsupported = L''ordine di byte specificato per la codifica \"{0}\" non \u00E8 supportato.
++ EncodingDeclInvalid = Nome codifica "{0}" non valido.
++ EncodingByteOrderUnsupported = L''ordine di byte specificato per la codifica "{0}" non \u00E8 supportato.
+ InvalidByte = Byte non valido {0} della sequenza UTF-8 a {1} byte.
+ ExpectedByte = \u00C8 previsto il byte {0} della sequenza UTF-8 a {1} byte.
+ InvalidHighSurrogate = I bit per surrogato alto nella sequenza UTF-8 non devono superare 0x10, ma \u00E8 stato trovato 0x{0}.
+- OperationNotSupported = Operazione \"{0}\" non supportata dal processo di lettura {1}.
+- InvalidASCII = Il byte \"{0}\" non fa parte del set di caratteri ASCII (a 7 bit).
++ OperationNotSupported = Operazione "{0}" non supportata dal processo di lettura {1}.
++ InvalidASCII = Il byte "{0}" non fa parte del set di caratteri ASCII (a 7 bit).
+ CharConversionFailure = Un'entit\u00E0 che deve trovarsi in una determinata codifica non pu\u00F2 contenere sequenze non valide in quella codifica.
+
+ # DTD Messages
+@@ -169,150 +167,150 @@
+ PubidCharIllegal = Il carattere (Unicode: 0x{0}) non \u00E8 consentito nell''identificativo pubblico.
+ SpaceRequiredBetweenPublicAndSystem = Sono richiesti spazi tra publicId e systemId.
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u00C8 richiesto uno spazio dopo \"<!DOCTYPE\" nella dichiarazione del tipo di documento.
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = Il tipo di elemento radice deve comparire dopo \"<!DOCTYPE\" nella dichiarazione del tipo di documento.
+- DoctypedeclUnterminated = La dichiarazione del tipo di documento per il tipo di elemento radice \"{0}\" deve terminare con ''>''.
+- PEReferenceWithinMarkup = Il riferimento di entit\u00E0 di parametro \"%{0};\" non pu\u00F2 essere presente nel markup del set secondario interno del DTD.
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u00C8 richiesto uno spazio dopo "<!DOCTYPE" nella dichiarazione del tipo di documento.
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = Il tipo di elemento radice deve comparire dopo "<!DOCTYPE" nella dichiarazione del tipo di documento.
++ DoctypedeclUnterminated = La dichiarazione del tipo di documento per il tipo di elemento radice "{0}" deve terminare con ''>''.
++ PEReferenceWithinMarkup = Il riferimento di entit\u00E0 di parametro "%{0};" non pu\u00F2 essere presente nel markup del set secondario interno del DTD.
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Le dichiarazioni di markup contenute o indicate dalla dichiarazione del tipo di documento devono avere un formato corretto.
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = La dichiarazione di attributo \"xml:space\" deve essere specificata come tipo enumerato, i cui unici possibili valori sono \"default\" e \"preserve\".
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = La dichiarazione di attributo "xml:space" deve essere specificata come tipo enumerato, i cui unici possibili valori sono "default" e "preserve".
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo \"<!ELEMENT\" nella dichiarazione del tipo di elemento.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo "<!ELEMENT" nella dichiarazione del tipo di elemento.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Il tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento.
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo il tipo di elemento \"{0}\" nella dichiarazione del tipo di elemento.
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u00C8 richiesto uno vincolo dopo il tipo di elemento \"{0}\" nella dichiarazione del tipo di elemento.
+- ElementDeclUnterminated = La dichiarazione per il tipo di elemento \"{0}\" deve terminare con ''>''.
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo il tipo di elemento "{0}" nella dichiarazione del tipo di elemento.
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u00C8 richiesto uno vincolo dopo il tipo di elemento "{0}" nella dichiarazione del tipo di elemento.
++ ElementDeclUnterminated = La dichiarazione per il tipo di elemento "{0}" deve terminare con ''>''.
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un carattere ''('' o un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento \"{0}\".
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un carattere ''('' o un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento \"{0}\".
+- MixedContentUnterminated = Il modello di contenuto misto \"{0}\" deve terminare con \")*\" se i tipi di elementi figlio hanno vincoli.
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
++ MixedContentUnterminated = Il modello di contenuto misto "{0}" deve terminare con ")*" se i tipi di elementi figlio hanno vincoli.
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u00C8 richiesto uno spazio dopo \"<!ATTLIST\" nella dichiarazione della lista di attributi.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u00C8 richiesto uno spazio dopo "<!ATTLIST" nella dichiarazione della lista di attributi.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Il tipo di elemento \u00E8 obbligatorio nella dichiarazione della lista di attributi.
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C8 richiesto uno spazio prima del nome attributo nella dichiarazione della lista di attributi per l''elemento \"{0}\".
+- AttNameRequiredInAttDef = Specificare il nome attributo nella dichiarazione della lista di attributi per l''elemento \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C8 richiesto uno spazio prima del tipo di attributo nella dichiarazione dell''attributo \"{1}\" per l''elemento \"{0}\".
+- AttTypeRequiredInAttDef = Il tipo di attributo \u00E8 obbligatorio nella dichiarazione dell''attributo \"{1}\" per l''elemento \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C8 richiesto uno spazio prima del valore predefinito di attributo nella dichiarazione dell''attributo \"{1}\" per l''elemento \"{0}\".
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Sono state specificate pi\u00F9 definizioni di attributo per lo stesso attributo \"{1}\" dell''elemento \"{0}\" specificato.
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C8 richiesto uno spazio prima del nome attributo nella dichiarazione della lista di attributi per l''elemento "{0}".
++ AttNameRequiredInAttDef = Specificare il nome attributo nella dichiarazione della lista di attributi per l''elemento "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C8 richiesto uno spazio prima del tipo di attributo nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
++ AttTypeRequiredInAttDef = Il tipo di attributo \u00E8 obbligatorio nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C8 richiesto uno spazio prima del valore predefinito di attributo nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Sono state specificate pi\u00F9 definizioni di attributo per lo stesso attributo "{1}" dell''elemento "{0}" specificato.
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Deve essere presente uno spazio dopo \"NOTATION\" nella dichiarazione di attributo \"{1}\".
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Il carattere ''('' deve seguire \"NOTATION\" nella dichiarazione di attributo \"{1}\".
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Il nome notazione \u00E8 obbligatorio nella lista di tipi di notazione per la dichiarazione di attributo \"{1}\".
+- NotationTypeUnterminated = La lista di tipi di notazione deve terminare con '')'' nella dichiarazione di attributo \"{1}\".
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Il nome token \u00E8 obbligatorio nella lista di tipi enumerati per la dichiarazione di attributo \"{1}\".
+- EnumerationUnterminated = La lista di tipi enumerati deve terminare con '')'' nella dichiarazione di attributo \"{1}\".
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = Il valore di enumerazione \"{1}\" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo \"{2}\" per l''elemento \"{0}\". I valori di NMTOKENS in una dichiarazione singola di attributo Enumeration devono essere tutti diversi.
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = Il valore di enumerazione \"{1}\" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo \"{2}\" per l''elemento \"{0}\". I nomi NOTATION in una dichiarazione singola di attributo NotationType devono essere tutti diversi.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Deve essere presente uno spazio dopo "NOTATION" nella dichiarazione di attributo "{1}".
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Il carattere ''('' deve seguire "NOTATION" nella dichiarazione di attributo "{1}".
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Il nome notazione \u00E8 obbligatorio nella lista di tipi di notazione per la dichiarazione di attributo "{1}".
++ NotationTypeUnterminated = La lista di tipi di notazione deve terminare con '')'' nella dichiarazione di attributo "{1}".
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Il nome token \u00E8 obbligatorio nella lista di tipi enumerati per la dichiarazione di attributo "{1}".
++ EnumerationUnterminated = La lista di tipi enumerati deve terminare con '')'' nella dichiarazione di attributo "{1}".
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = Il valore di enumerazione "{1}" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo "{2}" per l''elemento "{0}". I valori di NMTOKENS in una dichiarazione singola di attributo Enumeration devono essere tutti diversi.
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = Il valore di enumerazione "{1}" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo "{2}" per l''elemento "{0}". I nomi NOTATION in una dichiarazione singola di attributo NotationType devono essere tutti diversi.
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Deve essere presente uno spazio dopo \"FIXED\" nella dichiarazione di attributo \"{1}\".
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Deve essere presente uno spazio dopo "FIXED" nella dichiarazione di attributo "{1}".
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = La sezione condizionale inclusa deve terminare con \"]]>\".
+- IgnoreSectUnterminated = La sezione condizionale esclusa deve terminare con \"]]>\".
++ IncludeSectUnterminated = La sezione condizionale inclusa deve terminare con "]]>".
++ IgnoreSectUnterminated = La sezione condizionale esclusa deve terminare con "]]>".
+ # 4.1 Character and Entity References
+ NameRequiredInPEReference = Il nome entit\u00E0 deve seguire immediatamente '%' nel riferimento di entit\u00E0 di parametro.
+- SemicolonRequiredInPEReference = Il riferimento di entit\u00E0 di parametro \"%{0};\" deve terminare con il delimitatore '';''.
++ SemicolonRequiredInPEReference = Il riferimento di entit\u00E0 di parametro "%{0};" deve terminare con il delimitatore '';''.
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio dopo \"<!ENTITY\" nella dichiarazione dell'entit\u00E0.
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u00C8 richiesto uno spazio tra \"<!ENTITY\" e il carattere '%' nella dichiarazione dell'entit\u00E0 di parametro.
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio dopo "<!ENTITY" nella dichiarazione dell'entit\u00E0.
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u00C8 richiesto uno spazio tra "<!ENTITY" e il carattere '%' nella dichiarazione dell'entit\u00E0 di parametro.
+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u00C8 richiesto uno spazio tra '%' e il nome entit\u00E0 nella dichiarazione dell'entit\u00E0 di parametro.
+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Il nome dell'entit\u00E0 \u00E8 obbligatorio nella dichiarazione di entit\u00E0.
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio tra il nome entit\u00E0 \"{0}\" e la definizione nella dichiarazione dell''entit\u00E0:
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio tra \"NDATA\" e il nome notazione nella dichiarazione dell''entit\u00E0 \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio prima di \"NDATA\" nella dichiarazione dell''entit\u00E0 \"{0}\".
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Il nome notazione \u00E8 obbligatorio dopo \"NDATA\" nella dichiarazione dell''entit\u00E0 \"{0}\".
+- EntityDeclUnterminated = La dichiarazione per l''entit\u00E0 \"{0}\" deve terminare con ''>''.
+- MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E0 \"{0}\" \u00E8 stata dichiarata pi\u00F9 volte.
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio tra il nome entit\u00E0 "{0}" e la definizione nella dichiarazione dell''entit\u00E0:
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio tra "NDATA" e il nome notazione nella dichiarazione dell''entit\u00E0 "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio prima di "NDATA" nella dichiarazione dell''entit\u00E0 "{0}".
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Il nome notazione \u00E8 obbligatorio dopo "NDATA" nella dichiarazione dell''entit\u00E0 "{0}".
++ EntityDeclUnterminated = La dichiarazione per l''entit\u00E0 "{0}" deve terminare con ''>''.
++ MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E0 "{0}" \u00E8 stata dichiarata pi\u00F9 volte.
+ # 4.2.2 External Entities
+- ExternalIDRequired = La dichiarazione di entit\u00E0 esterna deve iniziare con \"SYSTEM\" o \"PUBLIC\".
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra \"PUBLIC\" e l'identificativo pubblico.
++ ExternalIDRequired = La dichiarazione di entit\u00E0 esterna deve iniziare con "SYSTEM" o "PUBLIC".
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra "PUBLIC" e l'identificativo pubblico.
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra l'identificativo pubblico e quello di sistema.
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra \"SYSTEM\" e l'identificativo di sistema.
+- MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificativo di frammento non deve essere specificato nell''identificativo di sistema \"{0}\".
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra "SYSTEM" e l'identificativo di sistema.
++ MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificativo di frammento non deve essere specificato nell''identificativo di sistema "{0}".
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo \"<!NOTATION\" nella dichiarazione della notazione.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo "<!NOTATION" nella dichiarazione della notazione.
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Il nome della notazione \u00E8 obbligatorio nella dichiarazione di notazione.
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo il nome notazione \"{0}\" nella dichiarazione della notazione.
+- ExternalIDorPublicIDRequired = La dichiarazione per la notazione \"{0}\" deve includere un identificativo di sistema o pubblico.
+- NotationDeclUnterminated = La dichiarazione per la notazione \"{0}\" deve terminare con ''>''.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo il nome notazione "{0}" nella dichiarazione della notazione.
++ ExternalIDorPublicIDRequired = La dichiarazione per la notazione "{0}" deve includere un identificativo di sistema o pubblico.
++ NotationDeclUnterminated = La dichiarazione per la notazione "{0}" deve terminare con ''>''.
+
+ # Validation messages
+- DuplicateTypeInMixedContent = Il tipo di elemento \"{1}\" \u00E8 gi\u00E0 stato specificato nel modello di contenuto della dichiarazione di elemento \"{0}\".
+- ENTITIESInvalid = Il valore di attributo \"{1}\" di tipo ENTITIES deve corrispondere ai nomi di una o pi\u00F9 entit\u00E0 non analizzate.
+- ENTITYInvalid = Il valore di attributo \"{1}\" di tipo ENTITY deve corrispondere al nome di un''entit\u00E0 non analizzata.
+- IDDefaultTypeInvalid = Nell''attributo ID \"{0}\" deve essere dichiarato un valore predefinito \"#IMPLIED\" o \"#REQUIRED\".
+- IDInvalid = Il valore di attributo \"{0}\" di tipo ID deve essere un nome.
+- IDInvalidWithNamespaces = Il valore di attributo \"{0}\" di tipo ID deve essere un NCName se sono abilitati gli spazi di nomi.
+- IDNotUnique = Il valore di attributo \"{0}\" di tipo ID deve essere univoco all''interno del documento.
+- IDREFInvalid = Il valore di attributo \"{0}\" di tipo IDREF deve essere un nome.
+- IDREFInvalidWithNamespaces = Il valore di attributo \"{0}\" di tipo IDREF deve essere un NCName se sono abilitati gli spazi di nomi.
+- IDREFSInvalid = Il valore di attributo \"{0}\" di tipo IDREFS deve corrispondere a uno o pi\u00F9 nomi.
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Il testo di sostituzione dell''entit\u00E0 di parametro \"{0}\" deve includere dichiarazioni nidificate correttamente se il riferimento dell''entit\u00E0 \u00E8 utilizzato come dichiarazione completa.
+- ImproperDeclarationNesting = Il testo di sostituzione dell''entit\u00E0 di parametro \"{0}\" deve includere dichiarazioni nidificate correttamente.
+- ImproperGroupNesting = Il testo di sostituzione dell''entit\u00E0 di parametro \"{0}\" deve includere coppie di parentesi nidificate correttamente.
+- INVALID_PE_IN_CONDITIONAL = Il testo di sostituzione dell''entit\u00E0 di parametro \"{0}\" deve includere tutta la sezione condizionale oppure solo INCLUDE o IGNORE.
+- MSG_ATTRIBUTE_NOT_DECLARED = Dichiarare l''attributo \"{1}\" per il tipo di elemento \"{0}\".
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attributo \"{0}\" con valore \"{1}\" deve avere un valore della lista \"{2}\".
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Il valore \"{1}\" dell''attributo \"{0}\" non deve essere modificato dalla normalizzazione (in \"{2}\") in un documento standalone.
+- MSG_CONTENT_INCOMPLETE = Il contenuto del tipo di elemento \"{0}\" \u00E8 incompleto. Deve corrispondere a \"{1}\".
+- MSG_CONTENT_INVALID = Il contenuto del tipo di elemento \"{0}\" deve corrispondere a \"{1}\".
+- MSG_CONTENT_INVALID_SPECIFIED = Il contenuto del tipo di elemento \"{0}\" deve corrispondere a \"{1}\". Non sono consentiti elementi figlio di tipo \"{2}\".
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attributo \"{1}\" per il tipo di elemento \"{0}\" ha un valore predefinito e deve essere specificato in un documento standalone.
+- MSG_DUPLICATE_ATTDEF = L''attributo \"{1}\" \u00E8 gi\u00E0 stato dichiarato per il tipo di elemento \"{0}\".
+- MSG_ELEMENT_ALREADY_DECLARED = Il tipo di elemento \"{0}\" non deve essere dichiarato pi\u00F9 volte.
+- MSG_ELEMENT_NOT_DECLARED = Il tipo di elemento \"{0}\" deve essere dichiarato.
++ DuplicateTypeInMixedContent = Il tipo di elemento "{1}" \u00E8 gi\u00E0 stato specificato nel modello di contenuto della dichiarazione di elemento "{0}".
++ ENTITIESInvalid = Il valore di attributo "{1}" di tipo ENTITIES deve corrispondere ai nomi di una o pi\u00F9 entit\u00E0 non analizzate.
++ ENTITYInvalid = Il valore di attributo "{1}" di tipo ENTITY deve corrispondere al nome di un''entit\u00E0 non analizzata.
++ IDDefaultTypeInvalid = Nell''attributo ID "{0}" deve essere dichiarato un valore predefinito "#IMPLIED" o "#REQUIRED".
++ IDInvalid = Il valore di attributo "{0}" di tipo ID deve essere un nome.
++ IDInvalidWithNamespaces = Il valore di attributo "{0}" di tipo ID deve essere un NCName se sono abilitati gli spazi di nomi.
++ IDNotUnique = Il valore di attributo "{0}" di tipo ID deve essere univoco all''interno del documento.
++ IDREFInvalid = Il valore di attributo "{0}" di tipo IDREF deve essere un nome.
++ IDREFInvalidWithNamespaces = Il valore di attributo "{0}" di tipo IDREF deve essere un NCName se sono abilitati gli spazi di nomi.
++ IDREFSInvalid = Il valore di attributo "{0}" di tipo IDREFS deve corrispondere a uno o pi\u00F9 nomi.
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere dichiarazioni nidificate correttamente se il riferimento dell''entit\u00E0 \u00E8 utilizzato come dichiarazione completa.
++ ImproperDeclarationNesting = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere dichiarazioni nidificate correttamente.
++ ImproperGroupNesting = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere coppie di parentesi nidificate correttamente.
++ INVALID_PE_IN_CONDITIONAL = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere tutta la sezione condizionale oppure solo INCLUDE o IGNORE.
++ MSG_ATTRIBUTE_NOT_DECLARED = Dichiarare l''attributo "{1}" per il tipo di elemento "{0}".
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attributo "{0}" con valore "{1}" deve avere un valore della lista "{2}".
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Il valore "{1}" dell''attributo "{0}" non deve essere modificato dalla normalizzazione (in "{2}") in un documento standalone.
++ MSG_CONTENT_INCOMPLETE = Il contenuto del tipo di elemento "{0}" \u00E8 incompleto. Deve corrispondere a "{1}".
++ MSG_CONTENT_INVALID = Il contenuto del tipo di elemento "{0}" deve corrispondere a "{1}".
++ MSG_CONTENT_INVALID_SPECIFIED = Il contenuto del tipo di elemento "{0}" deve corrispondere a "{1}". Non sono consentiti elementi figlio di tipo "{2}".
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attributo "{1}" per il tipo di elemento "{0}" ha un valore predefinito e deve essere specificato in un documento standalone.
++ MSG_DUPLICATE_ATTDEF = L''attributo "{1}" \u00E8 gi\u00E0 stato dichiarato per il tipo di elemento "{0}".
++ MSG_ELEMENT_ALREADY_DECLARED = Il tipo di elemento "{0}" non deve essere dichiarato pi\u00F9 volte.
++ MSG_ELEMENT_NOT_DECLARED = Il tipo di elemento "{0}" deve essere dichiarato.
+ MSG_GRAMMAR_NOT_FOUND = Documento non valido: nessuna grammatica trovata.
+- MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con identificativo \"{0}\" deve esistere nel documento.
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Il riferimento all''entit\u00E0 esterna \"{0}\" non \u00E8 consentito in un documento standalone.
+- MSG_FIXED_ATTVALUE_INVALID = L''attributo \"{1}\" con valore \"{2}\" deve avere un valore \"{3}\".
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Il tipo di elemento \"{0}\" ha gi\u00E0 un attributo \"{1}\" di tipo ID. Non \u00E8 consentito un secondo attributo \"{2}\" di tipo ID.
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Il tipo di elemento \"{0}\" ha gi\u00E0 un attributo \"{1}\" di tipo NOTATION. Non \u00E8 consentito un secondo attributo \"{2}\" di tipo NOTATION.
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notazione \"{1}\" deve essere dichiarata se vi viene fatto riferimento nella lista dei tipi di notazione per l''attributo \"{0}\".
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notazione \"{1}\" deve essere dichiarata se vi viene fatto riferimento dichiarazione di entit\u00E0 non analizzata per \"{0}\".
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Il riferimento all''entit\u00E0 \"{0}\" dichiarata in un''entit\u00E0 esterna analizzata non \u00E8 consentito in un documento standalone.
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attributo \"{1}\" \u00E8 obbligatorio e deve essere specificato per il tipo di elemento \"{0}\".
++ MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con identificativo "{0}" deve esistere nel documento.
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Il riferimento all''entit\u00E0 esterna "{0}" non \u00E8 consentito in un documento standalone.
++ MSG_FIXED_ATTVALUE_INVALID = L''attributo "{1}" con valore "{2}" deve avere un valore "{3}".
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Il tipo di elemento "{0}" ha gi\u00E0 un attributo "{1}" di tipo ID. Non \u00E8 consentito un secondo attributo "{2}" di tipo ID.
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Il tipo di elemento "{0}" ha gi\u00E0 un attributo "{1}" di tipo NOTATION. Non \u00E8 consentito un secondo attributo "{2}" di tipo NOTATION.
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notazione "{1}" deve essere dichiarata se vi viene fatto riferimento nella lista dei tipi di notazione per l''attributo "{0}".
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notazione "{1}" deve essere dichiarata se vi viene fatto riferimento dichiarazione di entit\u00E0 non analizzata per "{0}".
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Il riferimento all''entit\u00E0 "{0}" dichiarata in un''entit\u00E0 esterna analizzata non \u00E8 consentito in un documento standalone.
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attributo "{1}" \u00E8 obbligatorio e deve essere specificato per il tipo di elemento "{0}".
+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Non deve esistere nessuno spazio tra gli elementi dichiarati in un'entit\u00E0 esterna analizzata con il contenuto dell'elemento in un documento standalone.
+- NMTOKENInvalid = Il valore di attributo \"{0}\" di tipo NMTOKEN deve essere un token di nome.
+- NMTOKENSInvalid = Il valore di attributo \"{0}\" di tipo NMTOKENS deve corrispondere a uno o pi\u00F9 token di nomi.
+- NoNotationOnEmptyElement = Il tipo di elemento \"{0}\" dichiarato come EMPTY non pu\u00F2 dichiarare l''attributo \"{1}\" di tipo NOTATION.
+- RootElementTypeMustMatchDoctypedecl = L''elemento radice \"{1}\" del documento deve corrispondere alla radice DOCTYPE \"{0}\".
+- UndeclaredElementInContentSpec = Il modello di contenuto dell''elemento \"{0}\" fa riferimento a un elemento \"{1}\" non dichiarato.
+- UniqueNotationName = La dichiarazione per la notazione \"{0}\" non \u00E8 univoca. Un nome non deve essere dichiarato pi\u00F9 volte nella dichiarazione di una notazione.
++ NMTOKENInvalid = Il valore di attributo "{0}" di tipo NMTOKEN deve essere un token di nome.
++ NMTOKENSInvalid = Il valore di attributo "{0}" di tipo NMTOKENS deve corrispondere a uno o pi\u00F9 token di nomi.
++ NoNotationOnEmptyElement = Il tipo di elemento "{0}" dichiarato come EMPTY non pu\u00F2 dichiarare l''attributo "{1}" di tipo NOTATION.
++ RootElementTypeMustMatchDoctypedecl = L''elemento radice "{1}" del documento deve corrispondere alla radice DOCTYPE "{0}".
++ UndeclaredElementInContentSpec = Il modello di contenuto dell''elemento "{0}" fa riferimento a un elemento "{1}" non dichiarato.
++ UniqueNotationName = La dichiarazione per la notazione "{0}" non \u00E8 univoca. Un nome non deve essere dichiarato pi\u00F9 volte nella dichiarazione di una notazione.
+ ENTITYFailedInitializeGrammar = ENTITYDatatype Validator: errore. \u00C8 necessario richiamare il metodo di inizializzazione con un riferimento di grammatica valido. \t
+- ENTITYNotUnparsed = ENTITY \"{0}\" non analizzata.
+- ENTITYNotValid = ENTITY \"{0}\" non valida.
++ ENTITYNotUnparsed = ENTITY "{0}" non analizzata.
++ ENTITYNotValid = ENTITY "{0}" non valida.
+ EmptyList = I valori di tipo ENTITIES, IDREFS e NMTOKENS non possono essere una lista vuota.
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = Il riferimento di entit\u00E0 esterna \"&{0};\" non \u00E8 consentito in un valore di attributo.
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = Il riferimento di entit\u00E0 esterna "&{0};" non \u00E8 consentito in un valore di attributo.
++ AccessExternalDTD = DTD esterna: lettura della DTD esterna ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla propriet\u00E0 accessExternalDTD.
++ AccessExternalEntity = Entit\u00E0 esterna: lettura del documento esterno ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla propriet\u00E0 accessExternalDTD.
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = L''entit\u00E0 \"{0}\" \u00E8 indicata da un riferimento, ma non \u00E8 dichiarata.
+- ReferenceToUnparsedEntity = Il riferimento di entit\u00E0 non analizzata \"&{0};\" non \u00E8 consentito.
+- RecursiveReference = Riferimento di entit\u00E0 ricorsivo \"{0}\" (percorso riferimento: {1}).
+- RecursiveGeneralReference = Riferimento di entit\u00E0 generale ricorsivo \"&{0};\" (percorso riferimento: {1}).
+- RecursivePEReference = Riferimento di entit\u00E0 parametro ricorsivo \"%{0};\" (percorso riferimento: {1}).
++ EntityNotDeclared = L''entit\u00E0 "{0}" \u00E8 indicata da un riferimento, ma non \u00E8 dichiarata.
++ ReferenceToUnparsedEntity = Il riferimento di entit\u00E0 non analizzata "&{0};" non \u00E8 consentito.
++ RecursiveReference = Riferimento di entit\u00E0 ricorsivo "{0}" (percorso riferimento: {1}).
++ RecursiveGeneralReference = Riferimento di entit\u00E0 generale ricorsivo "&{0};" (percorso riferimento: {1}).
++ RecursivePEReference = Riferimento di entit\u00E0 parametro ricorsivo "%{0};" (percorso riferimento: {1}).
+ # 4.3.3 Character Encoding in Entities
+- EncodingNotSupported = La codifica \"{0}\" non \u00E8 supportata.
++ EncodingNotSupported = La codifica "{0}" non \u00E8 supportata.
+ EncodingRequired = Un'entit\u00E0 analizzata non codificata in UTF-8 o UTF-16 deve contenere una dichiarazione di codifica.
+
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = L'elemento o l'attributo non corrisponde alla produzione del QName: QName::=(NCName':')?NCName.
+- ElementXMLNSPrefix = L''elemento \"{0}\" non pu\u00F2 avere \"xmlns\" come prefisso.
+- ElementPrefixUnbound = Il prefisso \"{0}\" per l''elemento \"{1}\" non \u00E8 associato.
+- AttributePrefixUnbound = Il prefisso \"{2}\" per l''attributo \"{1}\" associato a un tipo di elemento \"{0}\" non \u00E8 associato.
+- EmptyPrefixedAttName = Il valore dell''attributo \"{0}\" non \u00E8 valido. Le associazioni di spazi di nomi con prefisso non possono essere vuote.
+- PrefixDeclared = Il prefisso spazio di nomi \"{0}\" non \u00E8 stato dichiarato.
++ ElementXMLNSPrefix = L''elemento "{0}" non pu\u00F2 avere "xmlns" come prefisso.
++ ElementPrefixUnbound = Il prefisso "{0}" per l''elemento "{1}" non \u00E8 associato.
++ AttributePrefixUnbound = Il prefisso "{2}" per l''attributo "{1}" associato a un tipo di elemento "{0}" non \u00E8 associato.
++ EmptyPrefixedAttName = Il valore dell''attributo "{0}" non \u00E8 valido. Le associazioni di spazi di nomi con prefisso non possono essere vuote.
++ PrefixDeclared = Il prefisso spazio di nomi "{0}" non \u00E8 stato dichiarato.
+ CantBindXMLNS = Il prefisso "xmlns" non pu\u00F2 essere associato esplicitamente a uno spazio di nomi, n\u00E9 lo spazio di nomi per "xmlns" pu\u00F2 essere associato esplicitamente a un prefisso.
+ CantBindXML = Il prefisso "xml" non pu\u00F2 essere associato a uno spazio di nomi diverso da quello al quale appartiene, n\u00E9 lo spazio di nomi per "xml" pu\u00F2 essere associato a un prefisso diverso da "xml".
+- MSG_ATT_DEFAULT_INVALID = defaultValue \"{1}\" dell''attributo \"{0}\" non valido per i vincoli lessicali di questo tipo di attributo.
++ MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" dell''attributo "{0}" non valido per i vincoli lessicali di questo tipo di attributo.
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +318,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=Il parser ha rilevato pi\u00F9 \"{0}\" espansioni di entit\u00E0 nel documento. Questo \u00E8 il limite imposto dall''applicazione.
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: il parser ha rilevato pi\u00F9 "{0}" espansioni di entit\u00E0 nel documento. Questo \u00E8 il limite imposto dal kit JDK.
++ ElementAttributeLimit=JAXP00010002: l''elemento "{0}" contiene pi\u00F9 di "{1}" attributi. "{1}" \u00E8 il limite imposto dal kit JDK.
++ MaxEntitySizeLimit=JAXP00010003: la lunghezza dell''entit\u00E0 "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}".
++ TotalEntitySizeLimit=JAXP00010004: le dimensioni accumulate "{0}" delle entit\u00E0 supera il limite "{1}" definito da "{2}".
++ MaxXMLNameLimit=JAXP00010005: il nome "{0}" supera il limite "{1}" definito da "{2}".
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,26 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +44,14 @@
+ InvalidCharInProlog = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D7\u30ED\u30ED\u30FC\u30B0\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+ InvalidCharInXMLDecl = XML\u5BA3\u8A00\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+ # 2.4 Character Data and Markup
+- CDEndInContent = \u6587\u5B57\u30B7\u30FC\u30B1\u30F3\u30B9\"]]>\"\u306F\u3001CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u7D42\u308F\u308A\u3092\u793A\u3059\u76EE\u7684\u4EE5\u5916\u3067\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
++ CDEndInContent = \u6587\u5B57\u30B7\u30FC\u30B1\u30F3\u30B9"]]>"\u306F\u3001CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u7D42\u308F\u308A\u3092\u793A\u3059\u76EE\u7684\u4EE5\u5916\u3067\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+ # 2.7 CDATA Sections
+- CDSectUnterminated = CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306F\"]]>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ CDSectUnterminated = CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306F"]]>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = XML\u5BA3\u8A00\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u5148\u982D\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+- EqRequiredInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\"{0}\"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
+- QuoteRequiredInXMLDecl = XML\u5BA3\u8A00\u306E\"{0}\"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- XMLDeclUnterminated = XML\u5BA3\u8A00\u306F\"?>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ EqRequiredInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001"{0}"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
++ QuoteRequiredInXMLDecl = XML\u5BA3\u8A00\u306E"{0}"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ XMLDeclUnterminated = XML\u5BA3\u8A00\u306F"?>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ VersionInfoRequired = XML\u5BA3\u8A00\u306B\u306F\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002
+ SpaceRequiredBeforeVersionInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ SpaceRequiredBeforeEncodingInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+@@ -71,70 +67,71 @@
+ ReferenceIllegalInTrailingMisc=\u5F8C\u7D9A\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u306F\u53C2\u7167\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = \u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5BA3\u8A00\u306E\u5024\u306F\u3001\"{0}\"\u3067\u306F\u306A\u304F\u3001\"yes\"\u307E\u305F\u306F\"no\"\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ SDDeclInvalid = \u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5BA3\u8A00\u306E\u5024\u306F\u3001"{0}"\u3067\u306F\u306A\u304F\u3001"yes"\u307E\u305F\u306F"no"\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ SDDeclNameInvalid = XML\u5BA3\u8A00\u306E\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u540D\u304C\u9593\u9055\u3063\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
+ # 2.12 Language Identification
+- XMLLangInvalid = xml:lang\u5C5E\u6027\u306E\u5024\"{0}\"\u306F\u7121\u52B9\u306A\u8A00\u8A9E\u8B58\u5225\u5B50\u3067\u3059\u3002
++ XMLLangInvalid = xml:lang\u5C5E\u6027\u306E\u5024"{0}"\u306F\u7121\u52B9\u306A\u8A00\u8A9E\u8B58\u5225\u5B50\u3067\u3059\u3002
+ # 3. Logical Structures
+- ETagRequired = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u7D42\u4E86\u30BF\u30B0\"</{0}>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ ETagRequired = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u7D42\u4E86\u30BF\u30B0"</{0}>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5F8C\u306B\u306F\u3001\u5C5E\u6027\u6307\u5B9A\">\"\u307E\u305F\u306F\"/>\"\u304C\u5FC5\u8981\u3067\u3059\u3002
+- EqRequiredInAttribute = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\u540D\"{1}\"\u306E\u5F8C\u306B\u306F\u3001'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
+- OpenQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\"{1}\"\u306B\u306F\u3001\u958B\u59CB\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
+- CloseQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\"{1}\"\u306B\u306F\u3001\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
+- AttributeNotUnique = \u5C5E\u6027\"{1}\"\u306F\u8981\u7D20\"{0}\"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+- AttributeNSNotUnique = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\"{2}\"\u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u305F\u5C5E\u6027\"{1}\"\u306F\u8981\u7D20\"{0}\"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+- ETagUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u7D42\u4E86\u30BF\u30B0\u306F''>''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ ElementUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5F8C\u306B\u306F\u3001\u5C5E\u6027\u6307\u5B9A">"\u307E\u305F\u306F"/>"\u304C\u5FC5\u8981\u3067\u3059\u3002
++ EqRequiredInAttribute = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\u540D"{1}"\u306E\u5F8C\u306B\u306F\u3001'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
++ OpenQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306B\u306F\u3001\u958B\u59CB\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
++ CloseQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306B\u306F\u3001\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
++ AttributeNotUnique = \u5C5E\u6027"{1}"\u306F\u8981\u7D20"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
++ AttributeNSNotUnique = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9"{2}"\u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u305F\u5C5E\u6027"{1}"\u306F\u8981\u7D20"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
++ ETagUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u7D42\u4E86\u30BF\u30B0\u306F''>''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ MarkupNotRecognizedInContent = \u8981\u7D20\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u3001\u6574\u5F62\u5F0F\u306E\u6587\u5B57\u30C7\u30FC\u30BF\u307E\u305F\u306F\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u3067\u69CB\u6210\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ DoctypeIllegalInContent = \u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u306FDOCTYPE\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = \u53C2\u7167\u306F';'\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 4.3.2 Well-Formed Parsed Entities
+ ReferenceNotInOneEntity = \u53C2\u7167\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- ElementEntityMismatch = \u8981\u7D20\"{0}\"\u306F\u3001\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u3067\u958B\u59CB\u304A\u3088\u3073\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ ElementEntityMismatch = \u8981\u7D20"{0}"\u306F\u3001\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u3067\u958B\u59CB\u304A\u3088\u3073\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ MarkupEntityMismatch=XML\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u69CB\u9020\u306F\u3001\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u3067\u958B\u59CB\u304A\u3088\u3073\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = \u5C5E\u6027\"{1}\"\u306E\u5024\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{2})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u8981\u7D20\u306F\"{0}\"\u3067\u3059\u3002
++ InvalidCharInAttValue = \u5C5E\u6027"{1}"\u306E\u5024\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{2})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u8981\u7D20\u306F"{0}"\u3067\u3059\u3002
+ InvalidCharInComment = \u30B3\u30E1\u30F3\u30C8\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+ InvalidCharInPI = \u51E6\u7406\u547D\u4EE4\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+ InvalidCharInInternalSubset = DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+ InvalidCharInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = \u5C5E\u6027\"{1}\"\u306E\u5024\u306E\u5148\u982D\u306B\u306F\u3001\u4E00\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u307E\u305F\u306F\u4E8C\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
+- LessthanInAttValue = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\"{1}\"\u306E\u5024\u306B\u306F\u3001''<''\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+- AttributeValueUnterminated = \u5C5E\u6027\"{1}\"\u306E\u5024\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u5F15\u7528\u7B26\u6587\u5B57\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ QuoteRequiredInAttValue = \u5C5E\u6027"{1}"\u306E\u5024\u306E\u5148\u982D\u306B\u306F\u3001\u4E00\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u307E\u305F\u306F\u4E8C\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
++ LessthanInAttValue = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306E\u5024\u306B\u306F\u3001''<''\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
++ AttributeValueUnterminated = \u5C5E\u6027"{1}"\u306E\u5024\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u5F15\u7528\u7B26\u6587\u5B57\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 2.5 Comments
+- InvalidCommentStart = \u30B3\u30E1\u30F3\u30C8\u306E\u5148\u982D\u306B\u306F\"<!--\"\u304C\u5FC5\u8981\u3067\u3059\u3002
+- DashDashInComment = \u30B3\u30E1\u30F3\u30C8\u5185\u3067\u306F\u6587\u5B57\u5217\"--\"\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
+- CommentUnterminated = \u30B3\u30E1\u30F3\u30C8\u306F\"-->\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ InvalidCommentStart = \u30B3\u30E1\u30F3\u30C8\u306E\u5148\u982D\u306B\u306F"<!--"\u304C\u5FC5\u8981\u3067\u3059\u3002
++ DashDashInComment = \u30B3\u30E1\u30F3\u30C8\u5185\u3067\u306F\u6587\u5B57\u5217"--"\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
++ CommentUnterminated = \u30B3\u30E1\u30F3\u30C8\u306F"-->"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ COMMENT_NOT_IN_ONE_ENTITY = \u30B3\u30E1\u30F3\u30C8\u304C\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u56F2\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+ # 2.6 Processing Instructions
+ PITargetRequired = \u51E6\u7406\u547D\u4EE4\u306E\u5148\u982D\u306B\u306F\u30BF\u30FC\u30B2\u30C3\u30C8\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ SpaceRequiredInPI = \u51E6\u7406\u547D\u4EE4\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u30C7\u30FC\u30BF\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- PIUnterminated = \u51E6\u7406\u547D\u4EE4\u306F\"?>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- ReservedPITarget = \"[xX][mM][lL]\"\u3068\u4E00\u81F4\u3059\u308B\u51E6\u7406\u547D\u4EE4\u30BF\u30FC\u30B2\u30C3\u30C8\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ PIUnterminated = \u51E6\u7406\u547D\u4EE4\u306F"?>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ ReservedPITarget = "[xX][mM][lL]"\u3068\u4E00\u81F4\u3059\u308B\u51E6\u7406\u547D\u4EE4\u30BF\u30FC\u30B2\u30C3\u30C8\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+ PI_NOT_IN_ONE_ENTITY = \u51E6\u7406\u547D\u4EE4\u304C\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u56F2\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = \u30D0\u30FC\u30B8\u30E7\u30F3\"{0}\"\u306F\u7121\u52B9\u3067\u3059\u3002
+- VersionNotSupported = XML\u30D0\u30FC\u30B8\u30E7\u30F3\"{0}\"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u306E\u307F\u3067\u3059\u3002
+- VersionNotSupported11 = XML\u30D0\u30FC\u30B8\u30E7\u30F3\"{0}\"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u304A\u3088\u3073XML 1.1\u306E\u307F\u3067\u3059\u3002
++ VersionInfoInvalid = \u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u306F\u7121\u52B9\u3067\u3059\u3002
++ VersionNotSupported = XML\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u306E\u307F\u3067\u3059\u3002
++ VersionNotSupported11 = XML\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u304A\u3088\u3073XML 1.1\u306E\u307F\u3067\u3059\u3002
+ VersionMismatch= \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u5F8C\u7D9A\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u5225\u306E\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300110\u9032\u8868\u73FE\u306F\"&#\"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- HexdigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300116\u9032\u8868\u73FE\u306F\"&#x\"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ DigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300110\u9032\u8868\u73FE\u306F"&#"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ HexdigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300116\u9032\u8868\u73FE\u306F"&#x"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ SemicolonRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u306F';'\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- InvalidCharRef = \u6587\u5B57\u53C2\u7167\"&#{0}\"\u306F\u7121\u52B9\u306AXML\u6587\u5B57\u3067\u3059\u3002
++ InvalidCharRef = \u6587\u5B57\u53C2\u7167"&#{0}"\u306F\u7121\u52B9\u306AXML\u6587\u5B57\u3067\u3059\u3002
+ NameRequiredInReference = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\u306F'&'\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- SemicolonRequiredInReference = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u3078\u306E\u53C2\u7167\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ SemicolonRequiredInReference = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 4.3.1 The Text Declaration
+ TextDeclMustBeFirst = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306F\u3001\u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u5148\u982D\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+- EqRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\"{0}\"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
+- QuoteRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E\"{0}\"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- CloseQuoteMissingInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E\"{0}\"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306B\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u3042\u308A\u307E\u305B\u3093\u3002
++ EqRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001"{0}"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
++ QuoteRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E"{0}"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ CloseQuoteMissingInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E"{0}"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306B\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+ SpaceRequiredBeforeVersionInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ SpaceRequiredBeforeEncodingInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- TextDeclUnterminated = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306F\"?>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ TextDeclUnterminated = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306F"?>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ EncodingDeclRequired = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u5BA3\u8A00\u304C\u5FC5\u8981\u3067\u3059\u3002
+ NoMorePseudoAttributes = \u3053\u308C\u4EE5\u4E0A\u306E\u7591\u4F3C\u5C5E\u6027\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+ MorePseudoAttributes = \u7591\u4F3C\u5C5E\u6027\u304C\u3055\u3089\u306B\u5FC5\u8981\u3067\u3059\u3002
+@@ -143,13 +140,13 @@
+ CommentNotInOneEntity = \u30B3\u30E1\u30F3\u30C8\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ PINotInOneEntity = \u51E6\u7406\u547D\u4EE4\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D\"{0}\"\u304C\u7121\u52B9\u3067\u3059\u3002
+- EncodingByteOrderUnsupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\"{0}\"\u306B\u6307\u5B9A\u3055\u308C\u305F\u30D0\u30A4\u30C8\u9806\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ EncodingDeclInvalid = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D"{0}"\u304C\u7121\u52B9\u3067\u3059\u3002
++ EncodingByteOrderUnsupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0"{0}"\u306B\u6307\u5B9A\u3055\u308C\u305F\u30D0\u30A4\u30C8\u9806\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+ InvalidByte = {1}\u30D0\u30A4\u30C8\u306EUTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u30D0\u30A4\u30C8{0}\u304C\u7121\u52B9\u3067\u3059\u3002
+ ExpectedByte = {1}\u30D0\u30A4\u30C8\u306EUTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u30D0\u30A4\u30C8{0}\u304C\u5FC5\u8981\u3067\u3059\u3002
+ InvalidHighSurrogate = UTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u4E0A\u4F4D\u30B5\u30ED\u30B2\u30FC\u30C8\u30FB\u30D3\u30C3\u30C8\u306E\u4E0A\u9650\u306F0x10\u3067\u3059\u304C\u30010x{0}\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
+- OperationNotSupported = \u64CD\u4F5C\"{0}\"\u306F{1}\u30EA\u30FC\u30C0\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- InvalidASCII = \u30D0\u30A4\u30C8\"{0}\"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u30AD\u30E3\u30E9\u30AF\u30BF\u30FB\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
++ OperationNotSupported = \u64CD\u4F5C"{0}"\u306F{1}\u30EA\u30FC\u30C0\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ InvalidASCII = \u30D0\u30A4\u30C8"{0}"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u30AD\u30E3\u30E9\u30AF\u30BF\u30FB\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+ CharConversionFailure = \u7279\u5B9A\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3042\u308B\u3068\u78BA\u5B9A\u3055\u308C\u305F\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u305D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u4E0D\u6B63\u306A\u30B7\u30FC\u30B1\u30F3\u30B9\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+
+ # DTD Messages
+@@ -169,150 +166,150 @@
+ PubidCharIllegal = \u516C\u958B\u8B58\u5225\u5B50\u3067\u306F\u3001\u6587\u5B57(Unicode: 0x{0})\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
+ SpaceRequiredBetweenPublicAndSystem = \u516C\u958B\u8B58\u5225\u5B50\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\"<!DOCTYPE\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\"<!DOCTYPE\"\u306E\u5F8C\u306B\u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
+- DoctypedeclUnterminated = \u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- PEReferenceWithinMarkup = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"%{0};\"\u306F\u3001DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5185\u306B\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!DOCTYPE"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!DOCTYPE"\u306E\u5F8C\u306B\u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
++ DoctypedeclUnterminated = \u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ PEReferenceWithinMarkup = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u306F\u3001DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5185\u306B\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306B\u542B\u307E\u308C\u308B\u304B\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u304C\u6307\u3057\u3066\u3044\u308B\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5BA3\u8A00\u306F\u6574\u5F62\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = \"xml:space\"\u306E\u5C5E\u6027\u5BA3\u8A00\u306F\u3001\"default\"\u304A\u3088\u3073\"preserve\"\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u308B\u5217\u6319\u30BF\u30A4\u30D7\u3068\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space"\u306E\u5C5E\u6027\u5BA3\u8A00\u306F\u3001"default"\u304A\u3088\u3073"preserve"\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u308B\u5217\u6319\u30BF\u30A4\u30D7\u3068\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\"<!ELEMENT\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!ELEMENT"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5F8C\u306B\u5236\u7D04\u304C\u5FC5\u8981\u3067\u3059\u3002
+- ElementDeclUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5F8C\u306B\u5236\u7D04\u304C\u5FC5\u8981\u3067\u3059\u3002
++ ElementDeclUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F''(''\u6587\u5B57\u307E\u305F\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F''(''\u6587\u5B57\u307E\u305F\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MixedContentUnterminated = \u5B50\u8981\u7D20\u306E\u30BF\u30A4\u30D7\u304C\u5236\u7D04\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u6DF7\u5408\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\"{0}\"\u306F\")*\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MixedContentUnterminated = \u5B50\u8981\u7D20\u306E\u30BF\u30A4\u30D7\u304C\u5236\u7D04\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u6DF7\u5408\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB"{0}"\u306F")*"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\"<!ATTLIST\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001"<!ATTLIST"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = \u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u540D\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- AttNameRequiredInAttDef = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{1}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- AttTypeRequiredInAttDef = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{1}\"\u306E\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{1}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u7279\u5B9A\u306E\u8981\u7D20\"{0}\"\u306E\u540C\u4E00\u5C5E\u6027\"{1}\"\u306B\u8907\u6570\u306E\u5C5E\u6027\u5B9A\u7FA9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u8981\u7D20"{0}"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u540D\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ AttNameRequiredInAttDef = \u8981\u7D20"{0}"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{1}"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ AttTypeRequiredInAttDef = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{1}"\u306E\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{1}"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u7279\u5B9A\u306E\u8981\u7D20"{0}"\u306E\u540C\u4E00\u5C5E\u6027"{1}"\u306B\u8907\u6570\u306E\u5C5E\u6027\u5B9A\u7FA9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001\"NOTATION\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001\"NOTATION\"\u306E\u5F8C\u306B''(''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- NotationTypeUnterminated = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002
+- EnumerationUnterminated = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{2}\"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024\"{1}\"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306EEnumeration\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNMTOKENS\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{2}\"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024\"{1}\"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306ENotationType\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNOTATION\u306E\u540D\u524D\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001"NOTATION"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = "{1}"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001"NOTATION"\u306E\u5F8C\u306B''(''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ NotationTypeUnterminated = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002
++ EnumerationUnterminated = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{2}"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024"{1}"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306EEnumeration\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNMTOKENS\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{2}"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024"{1}"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306ENotationType\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNOTATION\u306E\u540D\u524D\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001\"FIXED\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001"FIXED"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = \u5305\u542B\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306F\"]]>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- IgnoreSectUnterminated = \u9664\u5916\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u6700\u5F8C\u306F\"]]>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ IncludeSectUnterminated = \u5305\u542B\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306F"]]>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ IgnoreSectUnterminated = \u9664\u5916\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u6700\u5F8C\u306F"]]>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 4.1 Character and Entity References
+ NameRequiredInPEReference = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\u306F'%'\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- SemicolonRequiredInPEReference = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"%{0};\"\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ SemicolonRequiredInPEReference = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001\"<!ENTITY\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001\"<!ENTITY\"\u3068'%'\u6587\u5B57\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001"<!ENTITY"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001"<!ENTITY"\u3068'%'\u6587\u5B57\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001'%'\u3068\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u306B\u306F\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\"{0}\"\u3068\u5B9A\u7FA9\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\"NDATA\"\u3068\u8868\u8A18\u540D\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\"NDATA\"\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\"NDATA\"\u306E\u5F8C\u306B\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- EntityDeclUnterminated = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_DUPLICATE_ENTITY_DEFINITION = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u304C\u8907\u6570\u56DE\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D"{0}"\u3068\u5B9A\u7FA9\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u3067\u306F\u3001"NDATA"\u3068\u8868\u8A18\u540D\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u3067\u306F\u3001"NDATA"\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u3067\u306F\u3001"NDATA"\u306E\u5F8C\u306B\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ EntityDeclUnterminated = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_DUPLICATE_ENTITY_DEFINITION = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u304C\u8907\u6570\u56DE\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+ # 4.2.2 External Entities
+- ExternalIDRequired = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u306E\u5148\u982D\u306B\u306F\"SYSTEM\"\u307E\u305F\u306F\"PUBLIC\"\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \"PUBLIC\"\u3068\u516C\u958B\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ ExternalIDRequired = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u306E\u5148\u982D\u306B\u306F"SYSTEM"\u307E\u305F\u306F"PUBLIC"\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC"\u3068\u516C\u958B\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u516C\u958B\u8B58\u5225\u5B50\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \"SYSTEM\"\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_URI_FRAGMENT_IN_SYSTEMID = \u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u8B58\u5225\u5B50\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\"{0}\"\u306E\u4E00\u90E8\u3068\u3057\u3066\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM"\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_URI_FRAGMENT_IN_SYSTEMID = \u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u8B58\u5225\u5B50\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50"{0}"\u306E\u4E00\u90E8\u3068\u3057\u3066\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001\"<!NOTATION\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001"<!NOTATION"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u306B\u306F\u8868\u8A18\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001\u8868\u8A18\u540D\"{0}\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
+- ExternalIDorPublicIDRequired = \u8868\u8A18\u6CD5\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u307E\u305F\u306F\u516C\u958B\u8B58\u5225\u5B50\u3092\u542B\u3081\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- NotationDeclUnterminated = \u8868\u8A18\u6CD5\"{0}\"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001\u8868\u8A18\u540D"{0}"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
++ ExternalIDorPublicIDRequired = \u8868\u8A18\u6CD5"{0}"\u306E\u5BA3\u8A00\u306B\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u307E\u305F\u306F\u516C\u958B\u8B58\u5225\u5B50\u3092\u542B\u3081\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ NotationDeclUnterminated = \u8868\u8A18\u6CD5"{0}"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+
+ # Validation messages
+- DuplicateTypeInMixedContent = \u8981\u7D20\u30BF\u30A4\u30D7\"{1}\"\u306F\u3001\u8981\u7D20\u5BA3\u8A00\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+- ENTITIESInvalid = \u30BF\u30A4\u30D7ENTITIES\u306E\u5C5E\u6027\u5024\"{1}\"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- ENTITYInvalid = \u30BF\u30A4\u30D7ENTITY\u306E\u5C5E\u6027\u5024\"{1}\"\u306F\u3001\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- IDDefaultTypeInvalid = ID\u5C5E\u6027\"{0}\"\u306B\u306F\u3001\"#IMPLIED\"\u307E\u305F\u306F\"#REQUIRED\"\u306E\u5BA3\u8A00\u6E08\u30C7\u30D5\u30A9\u30EB\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- IDInvalid = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- IDInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024\"{0}\"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- IDNotUnique = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u4E00\u610F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- IDREFInvalid = \u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- IDREFInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024\"{0}\"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- IDREFSInvalid = \u30BF\u30A4\u30D7IDREFS\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u304C\u5B8C\u5168\u306A\u5BA3\u8A00\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- ImproperDeclarationNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- ImproperGroupNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u4E38\u30AB\u30C3\u30B3\u306E\u30DA\u30A2\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- INVALID_PE_IN_CONDITIONAL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u5168\u4F53\u304B\u3001INCLUDE\u307E\u305F\u306FIGNORE\u306E\u307F\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_ATTRIBUTE_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u5BFE\u3057\u3066\u5C5E\u6027\"{1}\"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5024\"{1}\"\u3092\u6301\u3064\u5C5E\u6027\"{0}\"\u306B\u306F\u3001\u30EA\u30B9\u30C8\"{2}\"\u304B\u3089\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5C5E\u6027\"{0}\"\u306E\u5024\"{1}\"\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6B63\u898F\u5316\u306B\u3088\u3063\u3066(\"{2}\"\u306B)\u5909\u66F4\u3055\u308C\u306A\u3044\u3088\u3046\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_CONTENT_INCOMPLETE = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E0D\u5B8C\u5168\u3067\u3059\u3002\"{1}\"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_CONTENT_INVALID = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\"{1}\"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_CONTENT_INVALID_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\"{1}\"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7\"{2}\"\u306E\u5B50\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5C5E\u6027\"{1}\"\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u6301\u3061\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_DUPLICATE_ATTDEF = \u5C5E\u6027\"{1}\"\u306F\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+- MSG_ELEMENT_ALREADY_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306F\u8907\u6570\u56DE\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+- MSG_ELEMENT_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ DuplicateTypeInMixedContent = \u8981\u7D20\u30BF\u30A4\u30D7"{1}"\u306F\u3001\u8981\u7D20\u5BA3\u8A00"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
++ ENTITIESInvalid = \u30BF\u30A4\u30D7ENTITIES\u306E\u5C5E\u6027\u5024"{1}"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ ENTITYInvalid = \u30BF\u30A4\u30D7ENTITY\u306E\u5C5E\u6027\u5024"{1}"\u306F\u3001\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ IDDefaultTypeInvalid = ID\u5C5E\u6027"{0}"\u306B\u306F\u3001"#IMPLIED"\u307E\u305F\u306F"#REQUIRED"\u306E\u5BA3\u8A00\u6E08\u30C7\u30D5\u30A9\u30EB\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ IDInvalid = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ IDInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024"{0}"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ IDNotUnique = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u4E00\u610F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ IDREFInvalid = \u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ IDREFInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024"{0}"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ IDREFSInvalid = \u30BF\u30A4\u30D7IDREFS\u306E\u5C5E\u6027\u5024"{0}"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u304C\u5B8C\u5168\u306A\u5BA3\u8A00\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ ImproperDeclarationNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ ImproperGroupNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u4E38\u30AB\u30C3\u30B3\u306E\u30DA\u30A2\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ INVALID_PE_IN_CONDITIONAL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u5168\u4F53\u304B\u3001INCLUDE\u307E\u305F\u306FIGNORE\u306E\u307F\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_ATTRIBUTE_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u5C5E\u6027"{1}"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5024"{1}"\u3092\u6301\u3064\u5C5E\u6027"{0}"\u306B\u306F\u3001\u30EA\u30B9\u30C8"{2}"\u304B\u3089\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5C5E\u6027"{0}"\u306E\u5024"{1}"\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6B63\u898F\u5316\u306B\u3088\u3063\u3066("{2}"\u306B)\u5909\u66F4\u3055\u308C\u306A\u3044\u3088\u3046\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_CONTENT_INCOMPLETE = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E0D\u5B8C\u5168\u3067\u3059\u3002"{1}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_CONTENT_INVALID = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F"{1}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_CONTENT_INVALID_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F"{1}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7"{2}"\u306E\u5B50\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5C5E\u6027"{1}"\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u6301\u3061\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_DUPLICATE_ATTDEF = \u5C5E\u6027"{1}"\u306F\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
++ MSG_ELEMENT_ALREADY_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306F\u8907\u6570\u56DE\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
++ MSG_ELEMENT_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ MSG_GRAMMAR_NOT_FOUND = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u7121\u52B9\u3067\u3059\u3002\u69CB\u6587\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+- MSG_ELEMENT_WITH_ID_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u8B58\u5225\u5B50\"{0}\"\u3092\u6301\u3064\u8981\u7D20\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- MSG_FIXED_ATTVALUE_INVALID = \u5024\"{2}\"\u3092\u6301\u3064\u5C5E\u6027\"{1}\"\u306B\u306F\u3001\"{3}\"\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u306F\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\"{1}\"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\"{2}\"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027\"{1}\"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027\"{2}\"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5C5E\u6027\"{0}\"\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5\"{1}\"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \"{0}\"\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5\"{1}\"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5C5E\u6027\"{1}\"\u304C\u5FC5\u8981\u3067\u3059\u3002\u3053\u306E\u5C5E\u6027\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u5BFE\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_ELEMENT_WITH_ID_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u8B58\u5225\u5B50"{0}"\u3092\u6301\u3064\u8981\u7D20\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ MSG_FIXED_ATTVALUE_INVALID = \u5024"{2}"\u3092\u6301\u3064\u5C5E\u6027"{1}"\u306B\u306F\u3001"{3}"\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u306F\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027"{1}"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027"{2}"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027"{1}"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027"{2}"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5C5E\u6027"{0}"\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5"{1}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = "{0}"\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5"{1}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5C5E\u6027"{1}"\u304C\u5FC5\u8981\u3067\u3059\u3002\u3053\u306E\u5C5E\u6027\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u3001\u8981\u7D20\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u6301\u3064\u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u5BA3\u8A00\u3055\u308C\u308B\u8981\u7D20\u9593\u306B\u7A7A\u767D\u306F\u4E0D\u8981\u3067\u3059\u3002
+- NMTOKENInvalid = \u30BF\u30A4\u30D7NMTOKEN\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u3001\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- NMTOKENSInvalid = \u30BF\u30A4\u30D7NMTOKENS\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- NoNotationOnEmptyElement = EMPTY\u3068\u5BA3\u8A00\u3055\u308C\u305F\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u3067\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027\"{1}\"\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093\u3002
+- RootElementTypeMustMatchDoctypedecl = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30EB\u30FC\u30C8\u8981\u7D20\"{1}\"\u306FDOCTYPE\u30EB\u30FC\u30C8\"{0}\"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- UndeclaredElementInContentSpec = \u8981\u7D20\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u672A\u5BA3\u8A00\u306E\u8981\u7D20\"{1}\"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+- UniqueNotationName = \u8868\u8A18\u6CD5\"{0}\"\u306E\u5BA3\u8A00\u304C\u4E00\u610F\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u540C\u3058\u540D\u524D\u3092\u8907\u6570\u306E\u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
++ NMTOKENInvalid = \u30BF\u30A4\u30D7NMTOKEN\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ NMTOKENSInvalid = \u30BF\u30A4\u30D7NMTOKENS\u306E\u5C5E\u6027\u5024"{0}"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ NoNotationOnEmptyElement = EMPTY\u3068\u5BA3\u8A00\u3055\u308C\u305F\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u3067\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027"{1}"\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093\u3002
++ RootElementTypeMustMatchDoctypedecl = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30EB\u30FC\u30C8\u8981\u7D20"{1}"\u306FDOCTYPE\u30EB\u30FC\u30C8"{0}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++ UndeclaredElementInContentSpec = \u8981\u7D20"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u672A\u5BA3\u8A00\u306E\u8981\u7D20"{1}"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002
++ UniqueNotationName = \u8868\u8A18\u6CD5"{0}"\u306E\u5BA3\u8A00\u304C\u4E00\u610F\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u540C\u3058\u540D\u524D\u3092\u8907\u6570\u306E\u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+ ENTITYFailedInitializeGrammar = ENTITYDatatype\u30D0\u30EA\u30C7\u30FC\u30BF: \u6709\u52B9\u306A\u69CB\u6587\u53C2\u7167\u306B\u3088\u308B\u521D\u671F\u5316\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002 \t
+- ENTITYNotUnparsed = ENTITY \"{0}\"\u306F\u672A\u89E3\u6790\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+- ENTITYNotValid = ENTITY \"{0}\"\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
++ ENTITYNotUnparsed = ENTITY "{0}"\u306F\u672A\u89E3\u6790\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
++ ENTITYNotValid = ENTITY "{0}"\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+ EmptyList = \u30BF\u30A4\u30D7ENTITIES\u3001IDREFS\u304A\u3088\u3073NMTOKENS\u306E\u5024\u306F\u7A7A\u306E\u30EA\u30B9\u30C8\u306B\u3067\u304D\u307E\u305B\u3093\u3002
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"&{0};\"\u306F\u3001\u5C5E\u6027\u5024\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"&{0};"\u306F\u3001\u5C5E\u6027\u5024\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ AccessExternalDTD = \u5916\u90E8DTD: accessExternalDTD\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650\u306B\u3088\u308A''{1}''\u30A2\u30AF\u30BB\u30B9\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u5916\u90E8DTD ''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
++ AccessExternalEntity = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3: accessExternalDTD\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650\u306B\u3088\u308A''{1}''\u30A2\u30AF\u30BB\u30B9\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u5916\u90E8\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- ReferenceToUnparsedEntity = \u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"&{0};\"\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- RecursiveReference = \u518D\u5E30\u7684\u306A\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"{0}\"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
+- RecursiveGeneralReference = \u518D\u5E30\u7684\u306A\u4E00\u822C\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"&{0};\"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
+- RecursivePEReference = \u518D\u5E30\u7684\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"%{0};\"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
++ EntityNotDeclared = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ ReferenceToUnparsedEntity = \u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"&{0};"\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ RecursiveReference = \u518D\u5E30\u7684\u306A\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"{0}"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
++ RecursiveGeneralReference = \u518D\u5E30\u7684\u306A\u4E00\u822C\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"&{0};"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
++ RecursivePEReference = \u518D\u5E30\u7684\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
+ # 4.3.3 Character Encoding in Entities
+- EncodingNotSupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\"{0}\"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ EncodingNotSupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+ EncodingRequired = \u30A8\u30F3\u30B3\u30FC\u30C9\u304CUTF-8\u3068UTF-16\u306E\u3044\u305A\u308C\u3067\u3082\u306A\u3044\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = \u8981\u7D20\u307E\u305F\u306F\u5C5E\u6027\u304CQName\u751F\u6210\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: QName::=(NCName':')?NCName\u3002
+- ElementXMLNSPrefix = \u8981\u7D20\"{0}\"\u306E\u63A5\u982D\u8F9E\u3068\u3057\u3066\"xmlns\"\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
+- ElementPrefixUnbound = \u8981\u7D20\"{1}\"\u306E\u63A5\u982D\u8F9E\"{0}\"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- AttributePrefixUnbound = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\"{1}\"\u306E\u63A5\u982D\u8F9E\"{2}\"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- EmptyPrefixedAttName = \u5C5E\u6027\"{0}\"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059\u3002\u63A5\u982D\u8F9E\u306E\u4ED8\u3044\u305F\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u30FB\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002
+- PrefixDeclared = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u63A5\u982D\u8F9E\"{0}\"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ ElementXMLNSPrefix = \u8981\u7D20"{0}"\u306E\u63A5\u982D\u8F9E\u3068\u3057\u3066"xmlns"\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
++ ElementPrefixUnbound = \u8981\u7D20"{1}"\u306E\u63A5\u982D\u8F9E"{0}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ AttributePrefixUnbound = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306E\u63A5\u982D\u8F9E"{2}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
++ EmptyPrefixedAttName = \u5C5E\u6027"{0}"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059\u3002\u63A5\u982D\u8F9E\u306E\u4ED8\u3044\u305F\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u30FB\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002
++ PrefixDeclared = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u63A5\u982D\u8F9E"{0}"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+ CantBindXMLNS = \u63A5\u982D\u8F9E"xmlns"\u306F\u3001\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u660E\u793A\u7684\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002\u307E\u305F\u3001"xmlns"\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3082\u3001\u63A5\u982D\u8F9E\u306B\u660E\u793A\u7684\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002
+ CantBindXML = \u63A5\u982D\u8F9E"xml"\u306F\u3001\u901A\u5E38\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u4EE5\u5916\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002\u307E\u305F\u3001"xml"\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3082\u3001"xml"\u4EE5\u5916\u306E\u63A5\u982D\u8F9E\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002
+- MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027\"{0}\"\u306EdefaultValue \"{1}\"\u306F\u3001\u3053\u306E\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u5B57\u53E5\u5236\u7D04\u306B\u95A2\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
++ MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027"{0}"\u306EdefaultValue "{1}"\u306F\u3001\u3053\u306E\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u5B57\u53E5\u5236\u7D04\u306B\u95A2\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +317,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=\u30D1\u30FC\u30B5\u30FC\u306B\u3088\u3063\u3066\u3001\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\"{0}\"\u3092\u8D85\u3048\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u62E1\u5F35\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u308C\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: \u30D1\u30FC\u30B5\u30FC\u306B\u3088\u3063\u3066\u3001\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067"{0}"\u3092\u8D85\u3048\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u62E1\u5F35\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u308C\u306F\u3001JDK\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
++ ElementAttributeLimit=JAXP00010002: \u8981\u7D20"{0}"\u306B"{1}"\u3092\u8D85\u3048\u308B\u5C5E\u6027\u304C\u5B58\u5728\u3057\u307E\u3059\u3002"{1}"\u306F\u3001JDK\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
++ MaxEntitySizeLimit=JAXP00010003: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u9577\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
++ TotalEntitySizeLimit=JAXP00010004: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u7D2F\u7A4D\u30B5\u30A4\u30BA"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u307E\u3057\u305F\u3002
++ MaxXMLNameLimit=JAXP00010005: \u540D\u524D"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,27 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +45,14 @@
+ InvalidCharInProlog = \uBB38\uC11C\uC758 \uD504\uB864\uB85C\uADF8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ InvalidCharInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ # 2.4 Character Data and Markup
+- CDEndInContent = \uBB38\uC790 \uC2DC\uD000\uC2A4 \"]]>\"\uB294 CDATA \uC139\uC158 \uB05D\uC744 \uD45C\uC2DC\uD558\uB294 \uB370 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 \uCF58\uD150\uCE20\uC5D0 \uB098\uD0C0\uB098\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
++ CDEndInContent = \uBB38\uC790 \uC2DC\uD000\uC2A4 "]]>"\uB294 CDATA \uC139\uC158 \uB05D\uC744 \uD45C\uC2DC\uD558\uB294 \uB370 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 \uCF58\uD150\uCE20\uC5D0 \uB098\uD0C0\uB098\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+ # 2.7 CDATA Sections
+- CDSectUnterminated = CDATA \uC139\uC158\uC740 \"]]>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ CDSectUnterminated = CDATA \uC139\uC158\uC740 "]]>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = XML \uC120\uC5B8\uC740 \uBB38\uC11C \uB9E8 \uC55E\uC5D0\uB9CC \uB098\uD0C0\uB0A0 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
+- EqRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \"{0}\" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
+- QuoteRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C \"{0}\" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- XMLDeclUnterminated = XML \uC120\uC5B8\uC740 \"?>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ EqRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 "{0}" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
++ QuoteRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C "{0}" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ XMLDeclUnterminated = XML \uC120\uC5B8\uC740 "?>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ VersionInfoRequired = XML \uC120\uC5B8\uC5D0\uB294 \uBC84\uC804\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ SpaceRequiredBeforeVersionInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \uBC84\uC804 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ SpaceRequiredBeforeEncodingInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \uC778\uCF54\uB529 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+@@ -71,70 +68,71 @@
+ ReferenceIllegalInTrailingMisc=\uD6C4\uD589 \uC139\uC158\uC5D0\uC11C\uB294 \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = \uB3C5\uB9BD\uD615 \uBB38\uC11C \uC120\uC5B8 \uAC12\uC740 \"{0}\"\uC774(\uAC00) \uC544\uB2CC \"yes\" \uB610\uB294 \"no\"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
++ SDDeclInvalid = \uB3C5\uB9BD\uD615 \uBB38\uC11C \uC120\uC5B8 \uAC12\uC740 "{0}"\uC774(\uAC00) \uC544\uB2CC "yes" \uB610\uB294 "no"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
++ SDDeclNameInvalid = XML \uC120\uC5B8\uC758 \uB3C5\uB9BD\uD615 \uC774\uB984\uC758 \uCCA0\uC790\uAC00 \uC798\uBABB\uB418\uC5C8\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
+ # 2.12 Language Identification
+- XMLLangInvalid = xml:lang \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC5B8\uC5B4 \uC2DD\uBCC4\uC790\uC785\uB2C8\uB2E4.
++ XMLLangInvalid = xml:lang \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC5B8\uC5B4 \uC2DD\uBCC4\uC790\uC785\uB2C8\uB2E4.
+ # 3. Logical Structures
+- ETagRequired = \uC694\uC18C \uC720\uD615 \"{0}\"\uC740(\uB294) \uC9DD\uC774 \uB9DE\uB294 \uC885\uB8CC \uD0DC\uADF8 \"</{0}>\"(\uC73C)\uB85C \uC885\uB8CC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ ETagRequired = \uC694\uC18C \uC720\uD615 "{0}"\uC740(\uB294) \uC9DD\uC774 \uB9DE\uB294 \uC885\uB8CC \uD0DC\uADF8 "</{0}>"(\uC73C)\uB85C \uC885\uB8CC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = \uC694\uC18C \uC720\uD615 \"{0}\" \uB2E4\uC74C\uC5D0\uB294 \uC18D\uC131 \uC0AC\uC591 \">\" \uB610\uB294 \"/>\"\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
+- EqRequiredInAttribute = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \uC18D\uC131 \uC774\uB984 \"{1}\" \uB2E4\uC74C\uC5D0\uB294 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
+- OpenQuoteExpected = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \"{1}\" \uC18D\uC131\uC5D0\uB294 \uC5EC\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
+- CloseQuoteExpected = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \"{1}\" \uC18D\uC131\uC5D0\uB294 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
+- AttributeNotUnique = \"{1}\" \uC18D\uC131\uC774 \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+- AttributeNSNotUnique = \"{2}\" \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB41C \"{1}\" \uC18D\uC131\uC774 \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+- ETagUnterminated = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \uC885\uB8CC \uD0DC\uADF8\uB294 ''>'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ ElementUnterminated = \uC694\uC18C \uC720\uD615 "{0}" \uB2E4\uC74C\uC5D0\uB294 \uC18D\uC131 \uC0AC\uC591 ">" \uB610\uB294 "/>"\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
++ EqRequiredInAttribute = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C \uC18D\uC131 \uC774\uB984 "{1}" \uB2E4\uC74C\uC5D0\uB294 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
++ OpenQuoteExpected = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC5D0\uB294 \uC5EC\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
++ CloseQuoteExpected = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC5D0\uB294 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
++ AttributeNotUnique = "{1}" \uC18D\uC131\uC774 "{0}" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
++ AttributeNSNotUnique = "{2}" \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB41C "{1}" \uC18D\uC131\uC774 "{0}" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
++ ETagUnterminated = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uC885\uB8CC \uD0DC\uADF8\uB294 ''>'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ MarkupNotRecognizedInContent = \uC694\uC18C \uCF58\uD150\uCE20\uB294 \uC62C\uBC14\uB978 \uD615\uC2DD\uC758 \uBB38\uC790 \uB370\uC774\uD130 \uB610\uB294 \uB9C8\uD06C\uC5C5\uC73C\uB85C \uAD6C\uC131\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+ DoctypeIllegalInContent = \uCF58\uD150\uCE20\uC5D0\uC11C\uB294 DOCTYPE\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = \uCC38\uC870\uB294 ';' \uAD6C\uBD84\uC790\uB85C \uC885\uB8CC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+ # 4.3.2 Well-Formed Parsed Entities
+ ReferenceNotInOneEntity = \uCC38\uC870\uB294 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- ElementEntityMismatch = \"{0}\" \uC694\uC18C\uB294 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC2DC\uC791\uB418\uACE0 \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ ElementEntityMismatch = "{0}" \uC694\uC18C\uB294 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC2DC\uC791\uB418\uACE0 \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ MarkupEntityMismatch=XML \uBB38\uC11C \uAD6C\uC870\uB294 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC2DC\uC791\uB418\uACE0 \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = \"{1}\" \uC18D\uC131\uC758 \uAC12\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{2})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC73C\uBA70 \uC694\uC18C\uAC00 \"{0}\"\uC785\uB2C8\uB2E4.
++ InvalidCharInAttValue = "{1}" \uC18D\uC131\uC758 \uAC12\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{2})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC73C\uBA70 \uC694\uC18C\uAC00 "{0}"\uC785\uB2C8\uB2E4.
+ InvalidCharInComment = \uC8FC\uC11D\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ InvalidCharInPI = \uCC98\uB9AC \uBA85\uB839\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ InvalidCharInInternalSubset = DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ InvalidCharInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = \"{1}\" \uC18D\uC131\uC758 \uAC12\uC740 \uC791\uC740 \uB530\uC634\uD45C \uB610\uB294 \uD070 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
+- LessthanInAttValue = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \"{1}\" \uC18D\uC131\uC758 \uAC12\uC5D0\uB294 ''<'' \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+- AttributeValueUnterminated = \"{1}\" \uC18D\uC131\uC758 \uAC12\uC740 \uC9DD\uC774 \uB9DE\uB294 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ QuoteRequiredInAttValue = "{1}" \uC18D\uC131\uC758 \uAC12\uC740 \uC791\uC740 \uB530\uC634\uD45C \uB610\uB294 \uD070 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
++ LessthanInAttValue = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC758 \uAC12\uC5D0\uB294 ''<'' \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
++ AttributeValueUnterminated = "{1}" \uC18D\uC131\uC758 \uAC12\uC740 \uC9DD\uC774 \uB9DE\uB294 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ # 2.5 Comments
+- InvalidCommentStart = \uC8FC\uC11D\uC740 \"<!--\"\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
+- DashDashInComment = \uC8FC\uC11D\uC5D0\uC11C\uB294 \"--\" \uBB38\uC790\uC5F4\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+- CommentUnterminated = \uC8FC\uC11D\uC740 \"-->\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ InvalidCommentStart = \uC8FC\uC11D\uC740 "<!--"\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
++ DashDashInComment = \uC8FC\uC11D\uC5D0\uC11C\uB294 "--" \uBB38\uC790\uC5F4\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ CommentUnterminated = \uC8FC\uC11D\uC740 "-->"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ COMMENT_NOT_IN_ONE_ENTITY = \uC8FC\uC11D\uC774 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0 \uC548\uC5D0 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ # 2.6 Processing Instructions
+ PITargetRequired = \uCC98\uB9AC \uBA85\uB839\uC740 \uB300\uC0C1 \uC774\uB984\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
+ SpaceRequiredInPI = \uCC98\uB9AC \uBA85\uB839 \uB300\uC0C1\uACFC \uB370\uC774\uD130 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- PIUnterminated = \uCC98\uB9AC \uBA85\uB839\uC740 \"?>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+- ReservedPITarget = \"[xX][mM][lL]\"\uACFC \uC77C\uCE58\uD558\uB294 \uCC98\uB9AC \uBA85\uB839 \uB300\uC0C1\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ PIUnterminated = \uCC98\uB9AC \uBA85\uB839\uC740 "?>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ ReservedPITarget = "[xX][mM][lL]"\uACFC \uC77C\uCE58\uD558\uB294 \uCC98\uB9AC \uBA85\uB839 \uB300\uC0C1\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ PI_NOT_IN_ONE_ENTITY = \uCC98\uB9AC \uBA85\uB839\uC774 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0 \uC548\uC5D0 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = \"{0}\"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uBC84\uC804\uC785\uB2C8\uB2E4.
+- VersionNotSupported = XML \uBC84\uC804 \"{0}\"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
+- VersionNotSupported11 = XML \uBC84\uC804 \"{0}\"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0 \uBC0F XML 1.1\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
++ VersionInfoInvalid = "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uBC84\uC804\uC785\uB2C8\uB2E4.
++ VersionNotSupported = XML \uBC84\uC804 "{0}"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
++ VersionNotSupported11 = XML \uBC84\uC804 "{0}"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0 \uBC0F XML 1.1\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
+ VersionMismatch= \uD558\uB098\uC758 \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uC774\uD6C4 \uBC84\uC804\uC758 \uB2E4\uB978 \uC5D4\uD2F0\uD2F0\uAC00 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 \"&#\" \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC2ED\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
+- HexdigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 \"&#x\" \uBC14\uB85C \uB2E4\uC74C\uC5D0 16\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
++ DigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 "&#" \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC2ED\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
++ HexdigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 "&#x" \uBC14\uB85C \uB2E4\uC74C\uC5D0 16\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
+ SemicolonRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uB294 ';' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+- InvalidCharRef = \uBB38\uC790 \uCC38\uC870 \"&#{0}\"\uC740(\uB294) \uBD80\uC801\uD569\uD55C XML \uBB38\uC790\uC785\uB2C8\uB2E4.
++ InvalidCharRef = \uBB38\uC790 \uCC38\uC870 "&#{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C XML \uBB38\uC790\uC785\uB2C8\uB2E4.
+ NameRequiredInReference = \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC5D0\uC11C\uB294 '&' \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC5D4\uD2F0\uD2F0 \uC774\uB984\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
+- SemicolonRequiredInReference = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uB294 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ SemicolonRequiredInReference = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uB294 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ # 4.3.1 The Text Declaration
+ TextDeclMustBeFirst = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uB9E8 \uC55E\uC5D0\uB9CC \uB098\uD0C0\uB0A0 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
+- EqRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C\uB294 \"{0}\" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
+- QuoteRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C \"{0}\" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- CloseQuoteMissingInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C \"{0}\" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC758 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
++ EqRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C\uB294 "{0}" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
++ QuoteRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C "{0}" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ CloseQuoteMissingInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C "{0}" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC758 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ SpaceRequiredBeforeVersionInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \uBC84\uC804 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ SpaceRequiredBeforeEncodingInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \uC778\uCF54\uB529 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- TextDeclUnterminated = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \"?>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ TextDeclUnterminated = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 "?>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ EncodingDeclRequired = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uB294 \uC778\uCF54\uB529 \uC120\uC5B8\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ NoMorePseudoAttributes = \uC758\uC0AC \uC18D\uC131\uC740 \uB354 \uC774\uC0C1 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ MorePseudoAttributes = \uC758\uC0AC \uC18D\uC131\uC774 \uB354 \uD544\uC694\uD569\uB2C8\uB2E4.
+@@ -143,13 +141,13 @@
+ CommentNotInOneEntity = \uC8FC\uC11D\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+ PINotInOneEntity = \uCC98\uB9AC \uBA85\uB839\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = \"{0}\"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC778\uCF54\uB529 \uC774\uB984\uC785\uB2C8\uB2E4.
+- EncodingByteOrderUnsupported = \"{0}\" \uC778\uCF54\uB529\uC5D0 \uB300\uD574 \uC81C\uACF5\uB41C \uBC14\uC774\uD2B8 \uC21C\uC11C\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ EncodingDeclInvalid = "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC778\uCF54\uB529 \uC774\uB984\uC785\uB2C8\uB2E4.
++ EncodingByteOrderUnsupported = "{0}" \uC778\uCF54\uB529\uC5D0 \uB300\uD574 \uC81C\uACF5\uB41C \uBC14\uC774\uD2B8 \uC21C\uC11C\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ InvalidByte = {0}\uC740(\uB294) {1}\uBC14\uC774\uD2B8 UTF-8 \uC2DC\uD000\uC2A4\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uBC14\uC774\uD2B8\uC785\uB2C8\uB2E4.
+ ExpectedByte = {1}\uBC14\uC774\uD2B8 UTF-8 \uC2DC\uD000\uC2A4\uC5D0 \uD544\uC694\uD55C \uBC14\uC774\uD2B8\uB294 {0}\uC785\uB2C8\uB2E4.
+ InvalidHighSurrogate = UTF-8 \uC2DC\uD000\uC2A4\uC758 \uB192\uC740 \uB300\uB9AC \uBE44\uD2B8\uB294 0x10\uC744 \uCD08\uACFC\uD558\uC9C0 \uC54A\uC544\uC57C \uD558\uC9C0\uB9CC 0x{0}\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+- OperationNotSupported = {1} \uC77D\uAE30 \uD504\uB85C\uADF8\uB7A8\uC740 \"{0}\" \uC791\uC5C5\uC744 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+- InvalidASCII = \uBC14\uC774\uD2B8 \"{0}\"\uC740(\uB294) (7\uBE44\uD2B8) ASCII \uBB38\uC790 \uC9D1\uD569\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ OperationNotSupported = {1} \uC77D\uAE30 \uD504\uB85C\uADF8\uB7A8\uC740 "{0}" \uC791\uC5C5\uC744 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ InvalidASCII = \uBC14\uC774\uD2B8 "{0}"\uC740(\uB294) (7\uBE44\uD2B8) ASCII \uBB38\uC790 \uC9D1\uD569\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ CharConversionFailure = \uD2B9\uC815 \uC778\uCF54\uB529 \uD615\uC2DD\uC774\uC5B4\uC57C \uD558\uB294 \uAC83\uC73C\uB85C \uD655\uC778\uB41C \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uD574\uB2F9 \uC778\uCF54\uB529\uC5D0 \uBD80\uC801\uD569\uD55C \uC2DC\uD000\uC2A4\uAC00 \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+
+ # DTD Messages
+@@ -169,150 +167,150 @@
+ PubidCharIllegal = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uC5D0\uB294 \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ SpaceRequiredBetweenPublicAndSystem = publicId\uC640 systemId \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!DOCTYPE\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!DOCTYPE\" \uB2E4\uC74C\uC5D0 \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
+- DoctypedeclUnterminated = \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+- PEReferenceWithinMarkup = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 \"%{0};\"\uC740 DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0 \uC788\uB294 \uB9C8\uD06C\uC5C5 \uC548\uC5D0 \uD45C\uC2DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!DOCTYPE" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!DOCTYPE" \uB2E4\uC74C\uC5D0 \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
++ DoctypedeclUnterminated = \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ PEReferenceWithinMarkup = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "%{0};"\uC740 DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0 \uC788\uB294 \uB9C8\uD06C\uC5C5 \uC548\uC5D0 \uD45C\uC2DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC744 \uD3EC\uD568\uD558\uAC70\uB098 \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC774 \uAC00\uB9AC\uD0A4\uB294 \uB9C8\uD06C\uC5C5 \uC120\uC5B8\uC740 \uC62C\uBC14\uB978 \uD615\uC2DD\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = \"xml:space\"\uC5D0 \uB300\uD55C \uC18D\uC131 \uC120\uC5B8\uC740 \"default\" \uBC0F \"preserve\" \uAC12\uB9CC \uAC00\uB2A5\uD55C \uC5F4\uAC70 \uC720\uD615\uC73C\uB85C \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space"\uC5D0 \uB300\uD55C \uC18D\uC131 \uC120\uC5B8\uC740 "default" \uBC0F "preserve" \uAC12\uB9CC \uAC00\uB2A5\uD55C \uC5F4\uAC70 \uC720\uD615\uC73C\uB85C \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!ELEMENT\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ELEMENT" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 \"{0}\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 \"{0}\" \uB2E4\uC74C\uC5D0 \uC81C\uC57D \uC870\uAC74\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- ElementDeclUnterminated = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 "{0}" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 "{0}" \uB2E4\uC74C\uC5D0 \uC81C\uC57D \uC870\uAC74\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ ElementDeclUnterminated = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uC120\uC5B8\uC5D0\uB294 ''('' \uBB38\uC790 \uB610\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 ''('' \uBB38\uC790 \uB610\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MixedContentUnterminated = \uD558\uC704 \uC694\uC18C \uC720\uD615\uC774 \uC81C\uD55C\uB418\uB294 \uACBD\uC6B0 \uD63C\uD569 \uCF58\uD150\uCE20 \uBAA8\uB378 \"{0}\"\uC740(\uB294) \")*\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MixedContentUnterminated = \uD558\uC704 \uC694\uC18C \uC720\uD615\uC774 \uC81C\uD55C\uB418\uB294 \uACBD\uC6B0 \uD63C\uD569 \uCF58\uD150\uCE20 \uBAA8\uB378 "{0}"\uC740(\uB294) ")*"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!ATTLIST\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ATTLIST" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = attribute-list \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC774\uB984 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- AttNameRequiredInAttDef = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC720\uD615 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- AttTypeRequiredInAttDef = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uAE30\uBCF8\uAC12 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \uC81C\uACF5\uB41C \uC694\uC18C \"{0}\"\uC758 \uB3D9\uC77C\uD55C \uC18D\uC131 \"{1}\"\uC5D0 \uB300\uD574 \uC18D\uC131 \uC815\uC758\uAC00 \uB450 \uAC1C \uC774\uC0C1 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC774\uB984 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ AttNameRequiredInAttDef = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC720\uD615 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ AttTypeRequiredInAttDef = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uAE30\uBCF8\uAC12 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \uC81C\uACF5\uB41C \uC694\uC18C "{0}"\uC758 \uB3D9\uC77C\uD55C \uC18D\uC131 "{1}"\uC5D0 \uB300\uD574 \uC18D\uC131 \uC815\uC758\uAC00 \uB450 \uAC1C \uC774\uC0C1 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 \"NOTATION\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 \"NOTATION\" \uB2E4\uC74C\uC5D0 ''('' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- NotationTypeUnterminated = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uC774\uB984 \uD1A0\uD070\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- EnumerationUnterminated = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{2}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 \"{1}\"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C \uBAA9\uB85D \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NMTOKENS\uB294 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{2}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 \"{1}\"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C NotationType \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NOTATION \uC774\uB984\uC740 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 "NOTATION" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 "NOTATION" \uB2E4\uC74C\uC5D0 ''('' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ NotationTypeUnterminated = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uC774\uB984 \uD1A0\uD070\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ EnumerationUnterminated = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{2}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 "{1}"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C \uBAA9\uB85D \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NMTOKENS\uB294 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{2}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 "{1}"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C NotationType \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NOTATION \uC774\uB984\uC740 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 \"FIXED\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 "FIXED" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = \uD3EC\uD568\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 \"]]>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+- IgnoreSectUnterminated = \uC81C\uC678\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 \"]]>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ IncludeSectUnterminated = \uD3EC\uD568\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 "]]>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ IgnoreSectUnterminated = \uC81C\uC678\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 "]]>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ # 4.1 Character and Entity References
+ NameRequiredInPEReference = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC5D0\uC11C\uB294 '%' \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC5D4\uD2F0\uD2F0 \uC774\uB984\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
+- SemicolonRequiredInPEReference = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 \"%{0};\"\uC740 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ SemicolonRequiredInPEReference = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "%{0};"\uC740 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!ENTITY\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!ENTITY\"\uC640 '%' \uBB38\uC790 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ENTITY" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ENTITY"\uC640 '%' \uBB38\uC790 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 '%'\uC640 \uC5D4\uD2F0\uD2F0 \uC774\uB984 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uB294 \uC5D4\uD2F0\uD2F0 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC5D4\uD2F0\uD2F0 \uC774\uB984 \"{0}\"\uACFC(\uC640) \uC815\uC758 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 \"NDATA\"\uC640 \uD45C\uAE30\uBC95 \uC774\uB984 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 \"NDATA\" \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 \"NDATA\" \uB2E4\uC74C\uC5D0 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- EntityDeclUnterminated = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+- MSG_DUPLICATE_ENTITY_DEFINITION = \"{0}\" \uC5D4\uD2F0\uD2F0\uAC00 \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC5D4\uD2F0\uD2F0 \uC774\uB984 "{0}"\uACFC(\uC640) \uC815\uC758 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 "NDATA"\uC640 \uD45C\uAE30\uBC95 \uC774\uB984 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 "NDATA" \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 "NDATA" \uB2E4\uC74C\uC5D0 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ EntityDeclUnterminated = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ MSG_DUPLICATE_ENTITY_DEFINITION = "{0}" \uC5D4\uD2F0\uD2F0\uAC00 \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ # 4.2.2 External Entities
+- ExternalIDRequired = \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC740 \"SYSTEM\" \uB610\uB294 \"PUBLIC\"\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \"PUBLIC\"\uACFC \uACF5\uC6A9 \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ ExternalIDRequired = \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC740 "SYSTEM" \uB610\uB294 "PUBLIC"\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC"\uACFC \uACF5\uC6A9 \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uC640 \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \"SYSTEM\"\uACFC \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_URI_FRAGMENT_IN_SYSTEMID = \uBD80\uBD84 \uC2DD\uBCC4\uC790\uB294 \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \"{0}\"\uC758 \uC77C\uBD80\uB85C \uC9C0\uC815\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM"\uACFC \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_URI_FRAGMENT_IN_SYSTEMID = \uBD80\uBD84 \uC2DD\uBCC4\uC790\uB294 \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 "{0}"\uC758 \uC77C\uBD80\uB85C \uC9C0\uC815\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!NOTATION\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!NOTATION" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uB294 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 \uD45C\uAE30\uBC95 \uC774\uB984 \"{0}\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
+- ExternalIDorPublicIDRequired = \"{0}\" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uB294 \uC2DC\uC2A4\uD15C \uB610\uB294 \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uAC00 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- NotationDeclUnterminated = \"{0}\" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 \uD45C\uAE30\uBC95 \uC774\uB984 "{0}" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
++ ExternalIDorPublicIDRequired = "{0}" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uB294 \uC2DC\uC2A4\uD15C \uB610\uB294 \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uAC00 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ NotationDeclUnterminated = "{0}" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+
+ # Validation messages
+- DuplicateTypeInMixedContent = \uC694\uC18C \uC720\uD615 \"{1}\"\uC774(\uAC00) \uC694\uC18C \uC120\uC5B8 \"{0}\"\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC5D0 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+- ENTITIESInvalid = ENTITIES \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{1}\"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uD558\uB098 \uC774\uC0C1\uC758 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- ENTITYInvalid = ENTITY \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{1}\"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- IDDefaultTypeInvalid = ID \uC18D\uC131 \"{0}\"\uC758 \uC120\uC5B8\uB41C \uAE30\uBCF8\uAC12\uC740 \"#IMPLIED\" \uB610\uB294 \"#REQUIRED\"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
+- IDInvalid = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- IDInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- IDNotUnique = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uBB38\uC11C \uB0B4\uC5D0\uC11C \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
+- IDREFInvalid = IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- IDREFInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- IDREFSInvalid = IDREFS \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uAC00 \uC804\uCCB4 \uC120\uC5B8\uC73C\uB85C \uC0AC\uC6A9\uB41C \uACBD\uC6B0 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- ImproperDeclarationNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- ImproperGroupNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uAD04\uD638 \uC30D\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- INVALID_PE_IN_CONDITIONAL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC804\uCCB4 \uC870\uAC74\uBD80 \uC139\uC158\uC774 \uD3EC\uD568\uB418\uAC70\uB098 INCLUDE \uB610\uB294 IGNORE\uB9CC \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- MSG_ATTRIBUTE_NOT_DECLARED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC744 \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \uAC12\uC774 \"{1}\"\uC778 \"{0}\" \uC18D\uC131\uC5D0\uB294 \"{2}\" \uBAA9\uB85D\uC758 \uAC12\uC774 \uC0AC\uC6A9\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \"{0}\" \uC18D\uC131\uC758 \"{1}\" \uAC12\uC740 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C \uC815\uADDC\uD654\uC5D0 \uC758\uD574 \"{2}\"(\uC73C)\uB85C \uBCC0\uACBD\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+- MSG_CONTENT_INCOMPLETE = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uCF58\uD150\uCE20\uAC00 \uBD88\uC644\uC804\uD569\uB2C8\uB2E4. \uD574\uB2F9 \uCF58\uD150\uCE20\uB294 \"{1}\"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
+- MSG_CONTENT_INVALID = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uCF58\uD150\uCE20\uB294 \"{1}\"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
+- MSG_CONTENT_INVALID_SPECIFIED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uCF58\uD150\uCE20\uB294 \"{1}\"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4. \"{2}\" \uC720\uD615\uC758 \uD558\uC704 \uD56D\uBAA9\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC5D0 \uAE30\uBCF8\uAC12\uC774 \uC788\uC73C\uBA70 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- MSG_DUPLICATE_ATTDEF = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC774 \uC774\uBBF8 \uC120\uC5B8\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
+- MSG_ELEMENT_ALREADY_DECLARED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC740(\uB294) \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+- MSG_ELEMENT_NOT_DECLARED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC744(\uB97C) \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
++ DuplicateTypeInMixedContent = \uC694\uC18C \uC720\uD615 "{1}"\uC774(\uAC00) \uC694\uC18C \uC120\uC5B8 "{0}"\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC5D0 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
++ ENTITIESInvalid = ENTITIES \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{1}"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uD558\uB098 \uC774\uC0C1\uC758 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ ENTITYInvalid = ENTITY \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{1}"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ IDDefaultTypeInvalid = ID \uC18D\uC131 "{0}"\uC758 \uC120\uC5B8\uB41C \uAE30\uBCF8\uAC12\uC740 "#IMPLIED" \uB610\uB294 "#REQUIRED"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
++ IDInvalid = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ IDInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ IDNotUnique = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uBB38\uC11C \uB0B4\uC5D0\uC11C \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
++ IDREFInvalid = IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ IDREFInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ IDREFSInvalid = IDREFS \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uAC00 \uC804\uCCB4 \uC120\uC5B8\uC73C\uB85C \uC0AC\uC6A9\uB41C \uACBD\uC6B0 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ ImproperDeclarationNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ ImproperGroupNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uAD04\uD638 \uC30D\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ INVALID_PE_IN_CONDITIONAL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC804\uCCB4 \uC870\uAC74\uBD80 \uC139\uC158\uC774 \uD3EC\uD568\uB418\uAC70\uB098 INCLUDE \uB610\uB294 IGNORE\uB9CC \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ MSG_ATTRIBUTE_NOT_DECLARED = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC744 \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \uAC12\uC774 "{1}"\uC778 "{0}" \uC18D\uC131\uC5D0\uB294 "{2}" \uBAA9\uB85D\uC758 \uAC12\uC774 \uC0AC\uC6A9\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = "{0}" \uC18D\uC131\uC758 "{1}" \uAC12\uC740 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C \uC815\uADDC\uD654\uC5D0 \uC758\uD574 "{2}"(\uC73C)\uB85C \uBCC0\uACBD\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
++ MSG_CONTENT_INCOMPLETE = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uCF58\uD150\uCE20\uAC00 \uBD88\uC644\uC804\uD569\uB2C8\uB2E4. \uD574\uB2F9 \uCF58\uD150\uCE20\uB294 "{1}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
++ MSG_CONTENT_INVALID = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uCF58\uD150\uCE20\uB294 "{1}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
++ MSG_CONTENT_INVALID_SPECIFIED = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uCF58\uD150\uCE20\uB294 "{1}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4. "{2}" \uC720\uD615\uC758 \uD558\uC704 \uD56D\uBAA9\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC5D0 \uAE30\uBCF8\uAC12\uC774 \uC788\uC73C\uBA70 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ MSG_DUPLICATE_ATTDEF = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC774 \uC774\uBBF8 \uC120\uC5B8\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
++ MSG_ELEMENT_ALREADY_DECLARED = \uC694\uC18C \uC720\uD615 "{0}"\uC740(\uB294) \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
++ MSG_ELEMENT_NOT_DECLARED = \uC694\uC18C \uC720\uD615 "{0}"\uC744(\uB97C) \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
+ MSG_GRAMMAR_NOT_FOUND = \uBB38\uC11C\uAC00 \uBD80\uC801\uD569\uD568: \uBB38\uBC95\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+- MSG_ELEMENT_WITH_ID_REQUIRED = \uC2DD\uBCC4\uC790\uAC00 \"{0}\"\uC778 \uC694\uC18C\uAC00 \uBB38\uC11C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+- MSG_FIXED_ATTVALUE_INVALID = \uAC12\uC774 \"{2}\"\uC778 \"{1}\" \uC18D\uC131\uC758 \uAC12\uC740 \"{3}\"\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 ID \uC720\uD615\uC758 \"{1}\" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C ID \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 \"{2}\"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 NOTATION \uC720\uD615\uC758 \"{1}\" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C NOTATION \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 \"{2}\"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \"{1}\" \uD45C\uAE30\uBC95\uC740 \"{0}\" \uC18D\uC131\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \"{1}\" \uD45C\uAE30\uBC95\uC740 \"{0}\"\uC5D0 \uB300\uD574 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC120\uC5B8\uB41C \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \"{1}\" \uC18D\uC131\uC774 \uD544\uC694\uD558\uBA70 \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD574 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ MSG_ELEMENT_WITH_ID_REQUIRED = \uC2DD\uBCC4\uC790\uAC00 "{0}"\uC778 \uC694\uC18C\uAC00 \uBB38\uC11C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 "{0}"\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ MSG_FIXED_ATTVALUE_INVALID = \uAC12\uC774 "{2}"\uC778 "{1}" \uC18D\uC131\uC758 \uAC12\uC740 "{3}"\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 ID \uC720\uD615\uC758 "{1}" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C ID \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 "{2}"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 NOTATION \uC720\uD615\uC758 "{1}" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C NOTATION \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 "{2}"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = "{1}" \uD45C\uAE30\uBC95\uC740 "{0}" \uC18D\uC131\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = "{1}" \uD45C\uAE30\uBC95\uC740 "{0}"\uC5D0 \uB300\uD574 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC120\uC5B8\uB41C "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = "{1}" \uC18D\uC131\uC774 \uD544\uC694\uD558\uBA70 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD574 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uC694\uC18C \uCF58\uD150\uCE20\uB97C \uAC00\uC9C0\uBA70 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC120\uC5B8\uB41C \uC694\uC18C \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- NMTOKENInvalid = NMTOKEN \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- NMTOKENSInvalid = NMTOKENS \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+- NoNotationOnEmptyElement = EMPTY\uB85C \uC120\uC5B8\uB41C \uC694\uC18C \uC720\uD615 \"{0}\"\uC740(\uB294) NOTATION \uC720\uD615\uC758 \"{1}\" \uC18D\uC131\uC744 \uC120\uC5B8\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+- RootElementTypeMustMatchDoctypedecl = \uBB38\uC11C \uB8E8\uD2B8 \uC694\uC18C \"{1}\"\uC740(\uB294) DOCTYPE \uB8E8\uD2B8 \"{0}\"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
+- UndeclaredElementInContentSpec = \"{0}\" \uC694\uC18C\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC774 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC740 \uC694\uC18C \"{1}\"\uC744(\uB97C) \uCC38\uC870\uD569\uB2C8\uB2E4.
+- UniqueNotationName = \"{0}\" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC774 \uACE0\uC720\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC81C\uACF5\uB41C \uC774\uB984\uC740 \uB450 \uAC1C \uC774\uC0C1\uC758 \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
++ NMTOKENInvalid = NMTOKEN \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ NMTOKENSInvalid = NMTOKENS \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
++ NoNotationOnEmptyElement = EMPTY\uB85C \uC120\uC5B8\uB41C \uC694\uC18C \uC720\uD615 "{0}"\uC740(\uB294) NOTATION \uC720\uD615\uC758 "{1}" \uC18D\uC131\uC744 \uC120\uC5B8\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
++ RootElementTypeMustMatchDoctypedecl = \uBB38\uC11C \uB8E8\uD2B8 \uC694\uC18C "{1}"\uC740(\uB294) DOCTYPE \uB8E8\uD2B8 "{0}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
++ UndeclaredElementInContentSpec = "{0}" \uC694\uC18C\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC774 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC740 \uC694\uC18C "{1}"\uC744(\uB97C) \uCC38\uC870\uD569\uB2C8\uB2E4.
++ UniqueNotationName = "{0}" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC774 \uACE0\uC720\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC81C\uACF5\uB41C \uC774\uB984\uC740 \uB450 \uAC1C \uC774\uC0C1\uC758 \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
+ ENTITYFailedInitializeGrammar = ENTITYDatatype \uAC80\uC99D\uAE30: \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uC801\uD569\uD55C \uBB38\uBC95 \uCC38\uC870\uB85C \uCD08\uAE30\uD654 \uBA54\uC18C\uB4DC\uB97C \uD638\uCD9C\uD574\uC57C \uD569\uB2C8\uB2E4. \t
+- ENTITYNotUnparsed = ENTITY \"{0}\"\uC758 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
+- ENTITYNotValid = ENTITY \"{0}\"\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
++ ENTITYNotUnparsed = ENTITY "{0}"\uC758 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
++ ENTITYNotValid = ENTITY "{0}"\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+ EmptyList = ENTITIES, IDREFS \uBC0F NMTOKENS \uC720\uD615\uC758 \uAC12\uC740 \uBE48 \uBAA9\uB85D\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = \uC18D\uC131\uAC12\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 \"&{0};\"\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = \uC18D\uC131\uAC12\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "&{0};"\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ AccessExternalDTD = \uC678\uBD80 DTD: accessExternalDTD \uC18D\uC131\uC73C\uB85C \uC124\uC815\uB41C \uC81C\uD55C\uC73C\uB85C \uC778\uD574 ''{1}'' \uC561\uC138\uC2A4\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC73C\uBBC0\uB85C \uC678\uBD80 DTD ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
++ AccessExternalEntity = \uC678\uBD80 \uC5D4\uD2F0\uD2F0: accessExternalDTD \uC18D\uC131\uC73C\uB85C \uC124\uC815\uB41C \uC81C\uD55C\uC73C\uB85C \uC778\uD574 ''{1}'' \uC561\uC138\uC2A4\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC73C\uBBC0\uB85C \uC678\uBD80 \uBB38\uC11C ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = \"{0}\" \uC5D4\uD2F0\uD2F0\uAC00 \uCC38\uC870\uB418\uC5C8\uC9C0\uB9CC \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
+- ReferenceToUnparsedEntity = \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 \"&{0};\"\uC740(\uB294) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+- RecursiveReference = \"{0}\"\uC740(\uB294) \uC21C\uD658 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
+- RecursiveGeneralReference = \"&{0};\"\uC740 \uC21C\uD658 \uC77C\uBC18 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
+- RecursivePEReference = \"%{0};\"\uC740 \uC21C\uD658 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
++ EntityNotDeclared = "{0}" \uC5D4\uD2F0\uD2F0\uAC00 \uCC38\uC870\uB418\uC5C8\uC9C0\uB9CC \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
++ ReferenceToUnparsedEntity = \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "&{0};"\uC740(\uB294) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ RecursiveReference = "{0}"\uC740(\uB294) \uC21C\uD658 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
++ RecursiveGeneralReference = "&{0};"\uC740 \uC21C\uD658 \uC77C\uBC18 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
++ RecursivePEReference = "%{0};"\uC740 \uC21C\uD658 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
+ # 4.3.3 Character Encoding in Entities
+- EncodingNotSupported = \"{0}\" \uC778\uCF54\uB529\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++ EncodingNotSupported = "{0}" \uC778\uCF54\uB529\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ EncodingRequired = UTF-8 \uB610\uB294 UTF-16\uC73C\uB85C \uC778\uCF54\uB529\uB418\uC9C0 \uC54A\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uC778\uCF54\uB529 \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = \uC694\uC18C \uB610\uB294 \uC18D\uC131\uC774 QName \uC791\uC131\uACFC \uC77C\uCE58\uD558\uC9C0 \uC54A\uC74C: QName::=(NCName':')?NCName.
+- ElementXMLNSPrefix = \"{0}\" \uC694\uC18C\uC5D0\uB294 \"xmlns\"\uAC00 \uC811\uB450\uC5B4\uB85C \uC0AC\uC6A9\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+- ElementPrefixUnbound = \"{1}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{0}\" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
+- AttributePrefixUnbound = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \"{1}\" \uC18D\uC131\uC758 \"{2}\" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
+- EmptyPrefixedAttName = \"{0}\" \uC18D\uC131\uC758 \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC811\uB450\uC5B4\uAC00 \uC9C0\uC815\uB41C \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uBC14\uC778\uB529\uC740 \uBE44\uC6CC \uB458 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+- PrefixDeclared = \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC811\uB450\uC5B4 \"{0}\"\uC774(\uAC00) \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
++ ElementXMLNSPrefix = "{0}" \uC694\uC18C\uC5D0\uB294 "xmlns"\uAC00 \uC811\uB450\uC5B4\uB85C \uC0AC\uC6A9\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
++ ElementPrefixUnbound = "{1}" \uC694\uC18C\uC5D0 \uB300\uD55C "{0}" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
++ AttributePrefixUnbound = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC758 "{2}" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
++ EmptyPrefixedAttName = "{0}" \uC18D\uC131\uC758 \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC811\uB450\uC5B4\uAC00 \uC9C0\uC815\uB41C \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uBC14\uC778\uB529\uC740 \uBE44\uC6CC \uB458 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
++ PrefixDeclared = \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC811\uB450\uC5B4 "{0}"\uC774(\uAC00) \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
+ CantBindXMLNS = "xmlns" \uC811\uB450\uC5B4\uB294 \uBA85\uC2DC\uC801\uC73C\uB85C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "xmlns"\uC5D0 \uB300\uD55C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uB3C4 \uBA85\uC2DC\uC801\uC73C\uB85C \uC811\uB450\uC5B4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+ CantBindXML = "xml" \uC811\uB450\uC5B4\uB294 \uC77C\uBC18 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC544\uB2CC \uB2E4\uB978 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "xml"\uC5D0 \uB300\uD55C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uB3C4 "xml" \uC774\uC678\uC758 \uC811\uB450\uC5B4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+- MSG_ATT_DEFAULT_INVALID = \"{0}\" \uC18D\uC131\uC758 defaultValue \"{1}\"\uC740(\uB294) \uC774 \uC18D\uC131 \uC720\uD615\uC758 \uB809\uC2DC\uCE7C \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD55C \uAC12\uC73C\uB85C \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
++ MSG_ATT_DEFAULT_INVALID = "{0}" \uC18D\uC131\uC758 defaultValue "{1}"\uC740(\uB294) \uC774 \uC18D\uC131 \uC720\uD615\uC758 \uB809\uC2DC\uCE7C \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD55C \uAC12\uC73C\uB85C \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +318,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=\uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uC774 \uBB38\uC11C\uC5D0\uC11C \"{0}\"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC5D4\uD2F0\uD2F0 \uD655\uC7A5\uC744 \uBC1C\uACAC\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB294 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: \uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uC774 \uBB38\uC11C\uC5D0\uC11C "{0}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC5D4\uD2F0\uD2F0 \uD655\uC7A5\uC744 \uBC1C\uACAC\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB294 JDK\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
++ ElementAttributeLimit=JAXP00010002: "{0}" \uC694\uC18C\uC5D0 "{1}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4. "{1}"\uC740(\uB294) JDK\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
++ MaxEntitySizeLimit=JAXP00010003: "{0}" \uC5D4\uD2F0\uD2F0\uC758 \uAE38\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4.
++ TotalEntitySizeLimit=JAXP00010004: \uC5D4\uD2F0\uD2F0\uC758 \uB204\uC801 \uD06C\uAE30 "{0}"\uC774(\uAC00) "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
++ MaxXMLNameLimit=JAXP00010005: "{0}" \uC774\uB984\uC774 "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,27 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +45,14 @@
+ InvalidCharInProlog = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no pr\u00F3logo do documento.
+ InvalidCharInXMLDecl = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na declara\u00E7\u00E3o XML.
+ # 2.4 Character Data and Markup
+- CDEndInContent = A sequ\u00EAncia de caracteres \"]]>\" n\u00E3o deve aparecer no conte\u00FAdo, a menos que seja usada para marcar o fim de uma se\u00E7\u00E3o CDATA.
++ CDEndInContent = A sequ\u00EAncia de caracteres "]]>" n\u00E3o deve aparecer no conte\u00FAdo, a menos que seja usada para marcar o fim de uma se\u00E7\u00E3o CDATA.
+ # 2.7 CDATA Sections
+- CDSectUnterminated = A se\u00E7\u00E3o CDATA deve terminar com \"]]>\".
++ CDSectUnterminated = A se\u00E7\u00E3o CDATA deve terminar com "]]>".
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = A declara\u00E7\u00E3o XML pode aparecer somente bem no in\u00EDcio do documento.
+- EqRequiredInXMLDecl = O caractere '' = '' deve estar ap\u00F3s \"{0}\" na declara\u00E7\u00E3o XML.
+- QuoteRequiredInXMLDecl = O valor ap\u00F3s \"{0}\" na declara\u00E7\u00E3o XML deve ser uma string entre aspas.
+- XMLDeclUnterminated = A declara\u00E7\u00E3o XML deve terminar com \"?>\".
++ EqRequiredInXMLDecl = O caractere '' = '' deve estar ap\u00F3s "{0}" na declara\u00E7\u00E3o XML.
++ QuoteRequiredInXMLDecl = O valor ap\u00F3s "{0}" na declara\u00E7\u00E3o XML deve ser uma string entre aspas.
++ XMLDeclUnterminated = A declara\u00E7\u00E3o XML deve terminar com "?>".
+ VersionInfoRequired = A vers\u00E3o \u00E9 obrigat\u00F3ria na declara\u00E7\u00E3o XML.
+ SpaceRequiredBeforeVersionInXMLDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes do pseudo-atributo da vers\u00E3o na declara\u00E7\u00E3o XML.
+ SpaceRequiredBeforeEncodingInXMLDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de codificar o pseudo-atributo na declara\u00E7\u00E3o XML.
+@@ -71,85 +68,86 @@
+ ReferenceIllegalInTrailingMisc=A refer\u00EAncia n\u00E3o \u00E9 permitida na se\u00E7\u00E3o \u00E0 esquerda.
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = O valor da declara\u00E7\u00E3o do documento stand-alone deve ser \"sim\" ou \"n\u00E3o\", mas n\u00E3o deve ser \"{0}\".
++ SDDeclInvalid = O valor da declara\u00E7\u00E3o do documento stand-alone deve ser "sim" ou "n\u00E3o", mas n\u00E3o deve ser "{0}".
++ SDDeclNameInvalid = O nome standalone na declara\u00E7\u00E3o XML pode estar grafado incorretamente.
+ # 2.12 Language Identification
+- XMLLangInvalid = O valor do atributo xml:lang \"{0}\" \u00E9 um identificador de idioma inv\u00E1lido.
++ XMLLangInvalid = O valor do atributo xml:lang "{0}" \u00E9 um identificador de idioma inv\u00E1lido.
+ # 3. Logical Structures
+- ETagRequired = O tipo de elemento {0}\" deve ser encerrado pela tag final correspondente \"</{0}>\".
++ ETagRequired = O tipo de elemento {0}" deve ser encerrado pela tag final correspondente "</{0}>".
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = O tipo de elemento \"{0}\" deve ser seguido pelas especifica\u00E7\u00F5es do atributo, \">\" ou \"/>\".
+- EqRequiredInAttribute = O nome do atributo \"{1}\" associado a um tipo de elemento \"{0}\" deve ser seguido do caractere '' = ''.
+- OpenQuoteExpected = S\u00E3o esperadas aspas de abertura para o atributo \"{1}\" associado a um tipo de elemento \"{0}\".
+- CloseQuoteExpected = S\u00E3o esperadas aspas de fechamento para o atributo \"{1}\" associado a um tipo de elemento \"{0}\".
+- AttributeNotUnique = O atributo \"{1}\" j\u00E1 foi especificado para o elemento \"{0}\".
+- AttributeNSNotUnique = O atributo \"{1}\" vinculado ao namespace \"{2}\" j\u00E1 foi especificado para o elemento \"{0}\".
+- ETagUnterminated = A tag final do tipo de elemento \"{0}\" deve terminar com um delimitador ''>".
++ ElementUnterminated = O tipo de elemento "{0}" deve ser seguido pelas especifica\u00E7\u00F5es do atributo, ">" ou "/>".
++ EqRequiredInAttribute = O nome do atributo "{1}" associado a um tipo de elemento "{0}" deve ser seguido do caractere '' = ''.
++ OpenQuoteExpected = S\u00E3o esperadas aspas de abertura para o atributo "{1}" associado a um tipo de elemento "{0}".
++ CloseQuoteExpected = S\u00E3o esperadas aspas de fechamento para o atributo "{1}" associado a um tipo de elemento "{0}".
++ AttributeNotUnique = O atributo "{1}" j\u00E1 foi especificado para o elemento "{0}".
++ AttributeNSNotUnique = O atributo "{1}" vinculado ao namespace "{2}" j\u00E1 foi especificado para o elemento "{0}".
++ ETagUnterminated = A tag final do tipo de elemento "{0}" deve terminar com um delimitador ''>".
+ MarkupNotRecognizedInContent = O conte\u00FAdo dos elementos deve consistir em dados ou marca\u00E7\u00E3o do caractere correto.
+ DoctypeIllegalInContent = Um DOCTYPE n\u00E3o \u00E9 permitido no conte\u00FAdo.
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = A refer\u00EAncia deve ser encerrada por um delimitador ';'.
+ # 4.3.2 Well-Formed Parsed Entities
+- ReferenceNotInOneEntity = A refer\u00EAncia deve estar totalmente contida na mesma entidade submetida a parse.
+- ElementEntityMismatch = O elemento \"{0}\" deve come\u00E7ar e terminar com a mesma entidade.
++ ReferenceNotInOneEntity = A refer\u00EAncia deve estar totalmente contida na mesma entidade submetida a parsing.
++ ElementEntityMismatch = O elemento "{0}" deve come\u00E7ar e terminar com a mesma entidade.
+ MarkupEntityMismatch=As estruturas do documento XML devem come\u00E7ar e terminar com a mesma entidade.
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = Um caractere XML inv\u00E1lido (Unicode: 0x {2}) foi encontrado no valor do atributo \"{1}\" e o elemento \u00E9 \"{0}\".
++ InvalidCharInAttValue = Um caractere XML inv\u00E1lido (Unicode: 0x {2}) foi encontrado no valor do atributo "{1}" e o elemento \u00E9 "{0}".
+ InvalidCharInComment = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no coment\u00E1rio.
+ InvalidCharInPI = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na instru\u00E7\u00E3o de processamento.
+ InvalidCharInInternalSubset = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no subconjunto interno do DTD.
+ InvalidCharInTextDecl = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na declara\u00E7\u00E3o de texto.
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = O valor do atributo \"{1}\" deve come\u00E7ar com aspas simples ou duplas.
+- LessthanInAttValue = O valor do atributo \"{1}\" associado a um tipo de elemento \"{0}\" n\u00E3o deve conter o caractere ''<''.
+- AttributeValueUnterminated = O valor do atributo \"{1}\" deve terminar com as aspas correspondentes.
++ QuoteRequiredInAttValue = O valor do atributo "{1}" deve come\u00E7ar com aspas simples ou duplas.
++ LessthanInAttValue = O valor do atributo "{1}" associado a um tipo de elemento "{0}" n\u00E3o deve conter o caractere ''<''.
++ AttributeValueUnterminated = O valor do atributo "{1}" deve terminar com as aspas correspondentes.
+ # 2.5 Comments
+- InvalidCommentStart = O coment\u00E1rio deve come\u00E7ar com \"<!--\".
+- DashDashInComment = A string \"--\" n\u00E3o \u00E9 permitida nos coment\u00E1rios.
+- CommentUnterminated = O coment\u00E1rio deve terminar com \"-->\".
++ InvalidCommentStart = O coment\u00E1rio deve come\u00E7ar com "<!--".
++ DashDashInComment = A string "--" n\u00E3o \u00E9 permitida nos coment\u00E1rios.
++ CommentUnterminated = O coment\u00E1rio deve terminar com "-->".
+ COMMENT_NOT_IN_ONE_ENTITY = O coment\u00E1rio n\u00E3o est\u00E1 entre chaves na mesma entidade.
+ # 2.6 Processing Instructions
+ PITargetRequired = A instru\u00E7\u00E3o de processamento deve come\u00E7ar com o nome do destino.
+ SpaceRequiredInPI = O espa\u00E7o em branco \u00E9 obrigat\u00F3rio entre o destino da instru\u00E7\u00E3o de processamento e os dados.
+- PIUnterminated = A instru\u00E7\u00E3o de processamento deve terminar com \"?>\".
+- ReservedPITarget = O destino da instru\u00E7\u00E3o de processamento correspondente \"[xX][mM][lL]\" n\u00E3o \u00E9 permitido.
++ PIUnterminated = A instru\u00E7\u00E3o de processamento deve terminar com "?>".
++ ReservedPITarget = O destino da instru\u00E7\u00E3o de processamento correspondente "[xX][mM][lL]" n\u00E3o \u00E9 permitido.
+ PI_NOT_IN_ONE_ENTITY = A instru\u00E7\u00E3o de processamento n\u00E3o est\u00E1 entre chaves na mesma entidade.
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = Vers\u00E3o inv\u00E1lida \"{0}\".
+- VersionNotSupported = Vers\u00E3o XML \"{0}\" n\u00E3o suportada; somente XML 1.0 \u00E9 suportada.
+- VersionNotSupported11 = Vers\u00E3o XML \"{0}\" n\u00E3o suportada, somente XML 1.0 e XML 1.1 s\u00E3o suportadas.
++ VersionInfoInvalid = Vers\u00E3o inv\u00E1lida "{0}".
++ VersionNotSupported = Vers\u00E3o XML "{0}" n\u00E3o suportada; somente XML 1.0 \u00E9 suportada.
++ VersionNotSupported11 = Vers\u00E3o XML "{0}" n\u00E3o suportada, somente XML 1.0 e XML 1.1 s\u00E3o suportadas.
+ VersionMismatch= Uma entidade n\u00E3o pode incluir outra entidade de uma vers\u00E3o posterior.
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = Uma representa\u00E7\u00E3o decimal deve seguir imediatamente o \"&#\" em uma refer\u00EAncia de caractere.
+- HexdigitRequiredInCharRef = Uma representa\u00E7\u00E3o hexadecimal deve seguir imediatamente o \"&#\" em uma refer\u00EAncia de caractere.
++ DigitRequiredInCharRef = Uma representa\u00E7\u00E3o decimal deve seguir imediatamente o "&#" em uma refer\u00EAncia de caractere.
++ HexdigitRequiredInCharRef = Uma representa\u00E7\u00E3o hexadecimal deve seguir imediatamente o "&#" em uma refer\u00EAncia de caractere.
+ SemicolonRequiredInCharRef = A refer\u00EAncia de caractere deve terminar com o delimitador ';'.
+- InvalidCharRef = A refer\u00EAncia do caractere \"&#{0}\" \u00E9 um caractere XML inv\u00E1lido.
++ InvalidCharRef = A refer\u00EAncia do caractere "&#{0}" \u00E9 um caractere XML inv\u00E1lido.
+ NameRequiredInReference = O nome da entidade deve seguir imediatamente o '&' na refer\u00EAncia da entidade.
+- SemicolonRequiredInReference = A refer\u00EAncia \u00E0 entidade \"{0}\" deve terminar com o delimitador '';''.
++ SemicolonRequiredInReference = A refer\u00EAncia \u00E0 entidade "{0}" deve terminar com o delimitador '';''.
+ # 4.3.1 The Text Declaration
+- TextDeclMustBeFirst = A declara\u00E7\u00E3o de texto somente pode aparecer bem no in\u00EDcio da entidade externa submetida a parse.
+- EqRequiredInTextDecl = O caractere '' = '' deve estar ap\u00F3s \"{0}\" na declara\u00E7\u00E3o de texto.
+- QuoteRequiredInTextDecl = O valor ap\u00F3s \"{0}\" na declara\u00E7\u00E3o de texto deve ser uma string entre aspas.
+- CloseQuoteMissingInTextDecl = n\u00E3o foi encontrada a aspa de fechamento no valor ap\u00F3s "{0}\" na declara\u00E7\u00E3o de texto.
++ TextDeclMustBeFirst = A declara\u00E7\u00E3o de texto somente pode aparecer bem no in\u00EDcio da entidade externa submetida a parsing.
++ EqRequiredInTextDecl = O caractere '' = '' deve estar ap\u00F3s "{0}" na declara\u00E7\u00E3o de texto.
++ QuoteRequiredInTextDecl = O valor ap\u00F3s "{0}" na declara\u00E7\u00E3o de texto deve ser uma string entre aspas.
++ CloseQuoteMissingInTextDecl = n\u00E3o foi encontrada a aspa de fechamento no valor ap\u00F3s "{0}" na declara\u00E7\u00E3o de texto.
+ SpaceRequiredBeforeVersionInTextDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes do pseudo-atributo da vers\u00E3o na declara\u00E7\u00E3o de texto.
+ SpaceRequiredBeforeEncodingInTextDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de codificar o pseudo-atributo na declara\u00E7\u00E3o de texto.
+- TextDeclUnterminated = A declara\u00E7\u00E3o de texto deve terminar com \"?>\".
++ TextDeclUnterminated = A declara\u00E7\u00E3o de texto deve terminar com "?>".
+ EncodingDeclRequired = A declara\u00E7\u00E3o de codifica\u00E7\u00E3o \u00E9 necess\u00E1ria na declara\u00E7\u00E3o de texto.
+ NoMorePseudoAttributes = N\u00E3o s\u00E3o mais permitidos pseudo-atributos.
+ MorePseudoAttributes = S\u00E3o esperados mais pseudo-atributos.
+ PseudoAttrNameExpected = \u00C9 esperado um nome de um pseudo-atributo.
+ # 4.3.2 Well-Formed Parsed Entities
+- CommentNotInOneEntity = O coment\u00E1rio deve estar totalmente contido na mesma entidade submetida a parse.
+- PINotInOneEntity = A instru\u00E7\u00E3o de processamento deve estar totalmente contida na mesma entidade submetida a parse.
++ CommentNotInOneEntity = O coment\u00E1rio deve estar totalmente contido na mesma entidade submetida a parsing.
++ PINotInOneEntity = A instru\u00E7\u00E3o de processamento deve estar totalmente contida na mesma entidade submetida a parsing.
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = Nome da codifica\u00E7\u00E3o inv\u00E1lida \"{0}\".
+- EncodingByteOrderUnsupported = A ordem de bytes fornecida para codifica\u00E7\u00E3o \"{0}\" n\u00E3o \u00E9 suportada.
++ EncodingDeclInvalid = Nome da codifica\u00E7\u00E3o inv\u00E1lida "{0}".
++ EncodingByteOrderUnsupported = A ordem de bytes fornecida para codifica\u00E7\u00E3o "{0}" n\u00E3o \u00E9 suportada.
+ InvalidByte = Byte inv\u00E1lido {0} da sequ\u00EAncia UTF-8 do byte {1}.
+ ExpectedByte = Esperava {0} byte da sequ\u00EAncia UTF-8 do byte {1}.
+ InvalidHighSurrogate = Os bits substitutos altos na sequ\u00EAncia da UTF-8 n\u00E3o devem exceder 0x10 mas foi encontrado 0x{0}.
+- OperationNotSupported = A opera\u00E7\u00E3o \"{0}\" n\u00E3o \u00E9 suportada pelo leitor {1}.
+- InvalidASCII = O byte \"{0}\" n\u00E3o \u00E9 membro do conjunto de caracteres ASCII (7 bits).
++ OperationNotSupported = A opera\u00E7\u00E3o "{0}" n\u00E3o \u00E9 suportada pelo leitor {1}.
++ InvalidASCII = O byte "{0}" n\u00E3o \u00E9 membro do conjunto de caracteres ASCII (7 bits).
+ CharConversionFailure = Uma entidade destinada a estar em uma determinada codifica\u00E7\u00E3o n\u00E3o deve conter sequ\u00EAncias inv\u00E1lidas na referida codifica\u00E7\u00E3o.
+
+ # DTD Messages
+@@ -169,150 +167,150 @@
+ PubidCharIllegal = O caractere XML (Unicode: 0x{0}) n\u00E3o \u00E9 permitido no identificador p\u00FAblico.
+ SpaceRequiredBetweenPublicAndSystem = Espa\u00E7os em branco s\u00E3o necess\u00E1rios entre publicId e systemId.
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!DOCTYPE\" na declara\u00E7\u00E3o do tipo de documento.
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = O tipo de elemento-raiz deve aparecer ap\u00F3s \"<!DOCTYPE\" na declara\u00E7\u00E3o do tipo de documento.
+- DoctypedeclUnterminated = A declara\u00E7\u00E3o do tipo de documento do tipo de elemento \"{0}\" deve terminar com ''>''.
+- PEReferenceWithinMarkup = A refer\u00EAncia da entidade do par\u00E2metro \"%{0};\" n\u00E3o pode ocorrer na marca\u00E7\u00E3o no subconjunto interno do DTD.
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!DOCTYPE" na declara\u00E7\u00E3o do tipo de documento.
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = O tipo de elemento-raiz deve aparecer ap\u00F3s "<!DOCTYPE" na declara\u00E7\u00E3o do tipo de documento.
++ DoctypedeclUnterminated = A declara\u00E7\u00E3o do tipo de documento do tipo de elemento "{0}" deve terminar com ''>''.
++ PEReferenceWithinMarkup = A refer\u00EAncia da entidade do par\u00E2metro "%{0};" n\u00E3o pode ocorrer na marca\u00E7\u00E3o no subconjunto interno do DTD.
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = As declara\u00E7\u00F5es de marca\u00E7\u00E3o contidas ou apontadas pela declara\u00E7\u00E3o do tipo de documento devem estar corretas.
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para \"xml:space\" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o \"default\" e \"preserve\".
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para "xml:space" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o "default" e "preserve".
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!ELEMENT\" na declara\u00E7\u00E3o do tipo de elemento.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ELEMENT" na declara\u00E7\u00E3o do tipo de elemento.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = O tipo de elemento \u00E9 necess\u00E1rio na declara\u00E7\u00E3o do tipo de elemento.
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o tipo de elemento \"{0}\" na declara\u00E7\u00E3o do tipo de elemento.
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = A restri\u00E7\u00E3o \u00E9 necess\u00E1ria ap\u00F3s o tipo de elemento \"{0}\" na declara\u00E7\u00E3o do tipo de elemento.
+- ElementDeclUnterminated = A declara\u00E7\u00E3o do tipo de elemento \"{0}\" deve terminar com ''>''.
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o tipo de elemento "{0}" na declara\u00E7\u00E3o do tipo de elemento.
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = A restri\u00E7\u00E3o \u00E9 necess\u00E1ria ap\u00F3s o tipo de elemento "{0}" na declara\u00E7\u00E3o do tipo de elemento.
++ ElementDeclUnterminated = A declara\u00E7\u00E3o do tipo de elemento "{0}" deve terminar com ''>''.
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere ''('' ou um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento \"{0}\".
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere ''('' ou um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento "{0}".
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u00C9 necess\u00E1rio um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento \"{0}\".
+- MixedContentUnterminated = O modelo de conte\u00FAdo misto \"{0}\" deve terminar com \")*\" quando os tipos de elementos filhos forem restringidos.
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u00C9 necess\u00E1rio um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento "{0}".
++ MixedContentUnterminated = O modelo de conte\u00FAdo misto "{0}" deve terminar com ")*" quando os tipos de elementos filhos forem restringidos.
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!ATTLIST\" na declara\u00E7\u00E3o da lista de atributos.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ATTLIST" na declara\u00E7\u00E3o da lista de atributos.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = \u00C9 necess\u00E1rio o tipo de elemento na declara\u00E7\u00E3o da lista de atributos.
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do nome do atributo na declara\u00E7\u00E3o da lista de atributos do elemento \"{0}\".
+- AttNameRequiredInAttDef = O nome do atributo deve ser especificado na declara\u00E7\u00E3o da lista de atributos do elemento \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do tipo de atributo na declara\u00E7\u00E3o do atributo \"{1}\" do elemento \"{0}\".
+- AttTypeRequiredInAttDef = \u00C9 necess\u00E1rio o tipo de atributo na declara\u00E7\u00E3o do atributo \"{1}\" do elemento \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do default do atributo na declara\u00E7\u00E3o do atributo \"{1}\" do elemento \"{0}\".
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mais de uma defini\u00E7\u00E3o de atributo fornecida para o mesmo atributo \"{1}\" de um determinado elemento \"{0}\".
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do nome do atributo na declara\u00E7\u00E3o da lista de atributos do elemento "{0}".
++ AttNameRequiredInAttDef = O nome do atributo deve ser especificado na declara\u00E7\u00E3o da lista de atributos do elemento "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
++ AttTypeRequiredInAttDef = \u00C9 necess\u00E1rio o tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do default do atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mais de uma defini\u00E7\u00E3o de atributo fornecida para o mesmo atributo "{1}" de um determinado elemento "{0}".
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = O espa\u00E7o em branco deve aparecer ap\u00F3s \"NOTATION\" na declara\u00E7\u00E3o do atributo \"{1}\".
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = O caractere ''('' deve estar ap\u00F3s \"NOTATION\" na declara\u00E7\u00E3o do atributo \"{1}\".
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u00C9 necess\u00E1rio o nome da nota\u00E7\u00E3o na lista de tipos de nota\u00E7\u00E3o para a declara\u00E7\u00E3o do atributo \"{1}\".
+- NotationTypeUnterminated = A lista de tipos de nota\u00E7\u00E3o deve terminar com '')'' na declara\u00E7\u00E3o do atributo \"{1}\".
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = O token do nome \u00E9 obrigat\u00F3rio na lista de tipos enumerada para a declara\u00E7\u00E3o do atributo \"{1}\".
+- EnumerationUnterminated = A lista de tipos enumerada deve terminar com '')'' na declara\u00E7\u00E3o do atributo \"{1}\".
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o \"{1}\" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo \"{2}\" do elemento \"{0}\". Os NMTOKENS em uma declara\u00E7\u00E3o de atributo de Enumera\u00E7\u00E3o \u00FAnica devem ser todos distintos.
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o \"{1}\" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo \"{2}\" do elemento \"{0}\". Os nomes da NOTATION em uma declara\u00E7\u00E3o do atributo NotationType \u00FAnica devem ser todos distintos.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = O espa\u00E7o em branco deve aparecer ap\u00F3s "NOTATION" na declara\u00E7\u00E3o do atributo "{1}".
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = O caractere ''('' deve estar ap\u00F3s "NOTATION" na declara\u00E7\u00E3o do atributo "{1}".
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u00C9 necess\u00E1rio o nome da nota\u00E7\u00E3o na lista de tipos de nota\u00E7\u00E3o para a declara\u00E7\u00E3o do atributo "{1}".
++ NotationTypeUnterminated = A lista de tipos de nota\u00E7\u00E3o deve terminar com '')'' na declara\u00E7\u00E3o do atributo "{1}".
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = O token do nome \u00E9 obrigat\u00F3rio na lista de tipos enumerada para a declara\u00E7\u00E3o do atributo "{1}".
++ EnumerationUnterminated = A lista de tipos enumerada deve terminar com '')'' na declara\u00E7\u00E3o do atributo "{1}".
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o "{1}" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo "{2}" do elemento "{0}". Os NMTOKENS em uma declara\u00E7\u00E3o de atributo de Enumera\u00E7\u00E3o \u00FAnica devem ser todos distintos.
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o "{1}" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo "{2}" do elemento "{0}". Os nomes da NOTATION em uma declara\u00E7\u00E3o do atributo NotationType \u00FAnica devem ser todos distintos.
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = O espa\u00E7o em branco deve aparecer ap\u00F3s \"FIXED\" na declara\u00E7\u00E3o do atributo \"{1}\".
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = O espa\u00E7o em branco deve aparecer ap\u00F3s "FIXED" na declara\u00E7\u00E3o do atributo "{1}".
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = A se\u00E7\u00E3o condicional inclu\u00EDda deve terminar com \"]]>\".
+- IgnoreSectUnterminated = A se\u00E7\u00E3o condicional exclu\u00EDda deve terminar com \"]]>\".
++ IncludeSectUnterminated = A se\u00E7\u00E3o condicional inclu\u00EDda deve terminar com "]]>".
++ IgnoreSectUnterminated = A se\u00E7\u00E3o condicional exclu\u00EDda deve terminar com "]]>".
+ # 4.1 Character and Entity References
+ NameRequiredInPEReference = O nome da entidade deve seguir imediatamente o '%' na refer\u00EAncia da entidade do par\u00E2metro.
+- SemicolonRequiredInPEReference = A refer\u00EAncia da entidade do par\u00E2metro \"%{0};\" deve terminar com o delimitador '';".
++ SemicolonRequiredInPEReference = A refer\u00EAncia da entidade do par\u00E2metro "%{0};" deve terminar com o delimitador '';".
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!ENTITY\" na declara\u00E7\u00E3o da entidade.
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre \"<!ENTITY\" e o caractere '%' na declara\u00E7\u00E3o da entidade do par\u00E2metro.
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ENTITY" na declara\u00E7\u00E3o da entidade.
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre "<!ENTITY" e o caractere '%' na declara\u00E7\u00E3o da entidade do par\u00E2metro.
+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre '%' e o nome da entidade na declara\u00E7\u00E3o da entidade do par\u00E2metro.
+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = O nome da entidade \u00E9 necess\u00E1rio na declara\u00E7\u00E3o da entidade.
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre o nome da entidade \"{0}\" e a defini\u00E7\u00E3o da declara\u00E7\u00E3o da entidade.
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C9 necess\u00E1rio um espa\u00E7o em branco entre \"NDATA\" e o nome da nota\u00E7\u00E3o na declara\u00E7\u00E3o da entidade \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de \"NDATA\" na declara\u00E7\u00E3o da entidade \"{0}\".
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = O nome da nota\u00E7\u00E3o \u00E9 necess\u00E1rio ap\u00F3s \"NDATA\" na declara\u00E7\u00E3o da entidade \"{0}\".
+- EntityDeclUnterminated = A declara\u00E7\u00E3o da entidade \"{0}\" deve terminar com ''>''.
+- MSG_DUPLICATE_ENTITY_DEFINITION = A entidade \"{0}\" foi declarada mais de uma vez.
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre o nome da entidade "{0}" e a defini\u00E7\u00E3o da declara\u00E7\u00E3o da entidade.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C9 necess\u00E1rio um espa\u00E7o em branco entre "NDATA" e o nome da nota\u00E7\u00E3o na declara\u00E7\u00E3o da entidade "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de "NDATA" na declara\u00E7\u00E3o da entidade "{0}".
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = O nome da nota\u00E7\u00E3o \u00E9 necess\u00E1rio ap\u00F3s "NDATA" na declara\u00E7\u00E3o da entidade "{0}".
++ EntityDeclUnterminated = A declara\u00E7\u00E3o da entidade "{0}" deve terminar com ''>''.
++ MSG_DUPLICATE_ENTITY_DEFINITION = A entidade "{0}" foi declarada mais de uma vez.
+ # 4.2.2 External Entities
+- ExternalIDRequired = A declara\u00E7\u00E3o da entidade externa deve come\u00E7ar com \"SYSTEM\" ou \"PUBLIC\".
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre \"PUBLIC\" e o identificador p\u00FAblico.
++ ExternalIDRequired = A declara\u00E7\u00E3o da entidade externa deve come\u00E7ar com "SYSTEM" ou "PUBLIC".
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre "PUBLIC" e o identificador p\u00FAblico.
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre o identificador p\u00FAblico e o identificador do sistema.
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre \"SYSTEM\" e o identificador do sistema.
+- MSG_URI_FRAGMENT_IN_SYSTEMID = O identificador do fragmento n\u00E3o deve ser especificado como parte do identificador do sistema \"{0}\".
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre "SYSTEM" e o identificador do sistema.
++ MSG_URI_FRAGMENT_IN_SYSTEMID = O identificador do fragmento n\u00E3o deve ser especificado como parte do identificador do sistema "{0}".
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!NOTATION\" na declara\u00E7\u00E3o da nota\u00E7\u00E3o.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!NOTATION" na declara\u00E7\u00E3o da nota\u00E7\u00E3o.
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = O nome da nota\u00E7\u00E3o \u00E9 obrigat\u00F3rio na declara\u00E7\u00E3o de nota\u00E7\u00E3o.
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o nome da nota\u00E7\u00E3o \"{0}\" na declara\u00E7\u00E3o de nota\u00E7\u00E3o.
+- ExternalIDorPublicIDRequired = A declara\u00E7\u00E3o da nota\u00E7\u00E3o \"{0}\" deve incluir um identificador p\u00FAblico ou do sistema.
+- NotationDeclUnterminated = A declara\u00E7\u00E3o da nota\u00E7\u00E3o \"{0}\" deve terminar com ''>''.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o nome da nota\u00E7\u00E3o "{0}" na declara\u00E7\u00E3o de nota\u00E7\u00E3o.
++ ExternalIDorPublicIDRequired = A declara\u00E7\u00E3o da nota\u00E7\u00E3o "{0}" deve incluir um identificador p\u00FAblico ou do sistema.
++ NotationDeclUnterminated = A declara\u00E7\u00E3o da nota\u00E7\u00E3o "{0}" deve terminar com ''>''.
+
+ # Validation messages
+- DuplicateTypeInMixedContent = O tipo de elemento \"{1}\" j\u00E1 foi especificado no modelo de conte\u00FAdo da declara\u00E7\u00E3o do elemento \"{0}\".
+- ENTITIESInvalid = O valor do atributo \"{1}\" do tipo ENTITIES deve ser o nome de uma ou mais entidades n\u00E3o submetidas a parse.
+- ENTITYInvalid = O valor do atributo \"{1}\" do tipo ENTITY deve ser o nome de uma entidade n\u00E3o submetida a parse.
+- IDDefaultTypeInvalid = O atributo do ID \"{0}\" deve ter um default declarado \"#IMPLIED\" ou \"#REQUIRED\".
+- IDInvalid = O valor do atributo \"{0}\" do ID de tipo deve ser um nome.
+- IDInvalidWithNamespaces = O valor do atributo \"{0}\" do ID de tipo deve ser um NCName quando os namespaces estiverem ativados.
+- IDNotUnique = O valor do atributo \"{0}\" do ID de tipo deve ser exclusivo no documento.
+- IDREFInvalid = O valor do atributo \"{0}\" do IDREF de tipo deve ser um nome.
+- IDREFInvalidWithNamespaces = O valor do atributo \"{0}\" do IDREF de tipo deve ser um NCName quando os namespaces estiverem ativados.
+- IDREFSInvalid = O valor do atributo \"{0}\" de tipo IDREFS deve ter um ou mais nomes.
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro \"{0}\" deve incluir as declara\u00E7\u00F5es aninhadas corretamente quando a refer\u00EAncia da entidade for usada como uma declara\u00E7\u00E3o completa.
+- ImproperDeclarationNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro \"{0}\" deve incluir as declara\u00E7\u00F5es aninhadas corretamente.
+- ImproperGroupNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro \"{0}\" deve incluir pares de par\u00EAnteses aninhados corretamente.
+- INVALID_PE_IN_CONDITIONAL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro \"{0}\" deve incluir a se\u00E7\u00E3o condicional inteira ou apenas INCLUDE ou IGNORE.
+- MSG_ATTRIBUTE_NOT_DECLARED = O atributo \"{1}\" deve ser declarado para o tipo de elemento \"{0}\".
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = O atributo \"{0}\" com o valor \"{1}\" deve ter um valor da lista \"{2}\".
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = O valor \"{1}\" do atributo \"{0}\" n\u00E3o deve ser alterado por meio da normaliza\u00E7\u00E3o (para \"{2}\") em um documento stand-alone.
+- MSG_CONTENT_INCOMPLETE = O conte\u00FAdo do tipo de elemento \"{0}\" est\u00E1 incompleto; ele deve corresponder a \"{1}\".
+- MSG_CONTENT_INVALID = O conte\u00FAdo do tipo de elemento \"{0}\" deve corresponder a \"{1}\".
+- MSG_CONTENT_INVALID_SPECIFIED = O conte\u00FAdo do tipo de elemento \"{0}\" deve corresponder a \"{1}\". N\u00E3o s\u00E3o permitidos os filhos do tipo \"{2}\".
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo \"{1}\" do tipo de elemento \"{0}\" tem um valor default e deve ser especificado em um documento stand-alone.
+- MSG_DUPLICATE_ATTDEF = O atributo \"{1}\" j\u00E1 foi declarado para o tipo de elemento \"{0}\".
+- MSG_ELEMENT_ALREADY_DECLARED = O tipo de elemento \"{0}\" n\u00E3o deve ser declarado mais de uma vez.
+- MSG_ELEMENT_NOT_DECLARED = O tipo de elemento \"{0}\" deve ser declarado.
++ DuplicateTypeInMixedContent = O tipo de elemento "{1}" j\u00E1 foi especificado no modelo de conte\u00FAdo da declara\u00E7\u00E3o do elemento "{0}".
++ ENTITIESInvalid = O valor do atributo "{1}" do tipo ENTITIES deve ser o nome de uma ou mais entidades n\u00E3o submetidas a parsing.
++ ENTITYInvalid = O valor do atributo "{1}" do tipo ENTITY deve ser o nome de uma entidade n\u00E3o submetida a parsing.
++ IDDefaultTypeInvalid = O atributo do ID "{0}" deve ter um default declarado "#IMPLIED" ou "#REQUIRED".
++ IDInvalid = O valor do atributo "{0}" do ID de tipo deve ser um nome.
++ IDInvalidWithNamespaces = O valor do atributo "{0}" do ID de tipo deve ser um NCName quando os namespaces estiverem ativados.
++ IDNotUnique = O valor do atributo "{0}" do ID de tipo deve ser exclusivo no documento.
++ IDREFInvalid = O valor do atributo "{0}" do IDREF de tipo deve ser um nome.
++ IDREFInvalidWithNamespaces = O valor do atributo "{0}" do IDREF de tipo deve ser um NCName quando os namespaces estiverem ativados.
++ IDREFSInvalid = O valor do atributo "{0}" de tipo IDREFS deve ter um ou mais nomes.
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir as declara\u00E7\u00F5es aninhadas corretamente quando a refer\u00EAncia da entidade for usada como uma declara\u00E7\u00E3o completa.
++ ImproperDeclarationNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir as declara\u00E7\u00F5es aninhadas corretamente.
++ ImproperGroupNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir pares de par\u00EAnteses aninhados corretamente.
++ INVALID_PE_IN_CONDITIONAL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir a se\u00E7\u00E3o condicional inteira ou apenas INCLUDE ou IGNORE.
++ MSG_ATTRIBUTE_NOT_DECLARED = O atributo "{1}" deve ser declarado para o tipo de elemento "{0}".
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = O atributo "{0}" com o valor "{1}" deve ter um valor da lista "{2}".
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = O valor "{1}" do atributo "{0}" n\u00E3o deve ser alterado por meio da normaliza\u00E7\u00E3o (para "{2}") em um documento stand-alone.
++ MSG_CONTENT_INCOMPLETE = O conte\u00FAdo do tipo de elemento "{0}" est\u00E1 incompleto; ele deve corresponder a "{1}".
++ MSG_CONTENT_INVALID = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}".
++ MSG_CONTENT_INVALID_SPECIFIED = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}". N\u00E3o s\u00E3o permitidos os filhos do tipo "{2}".
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" do tipo de elemento "{0}" tem um valor default e deve ser especificado em um documento stand-alone.
++ MSG_DUPLICATE_ATTDEF = O atributo "{1}" j\u00E1 foi declarado para o tipo de elemento "{0}".
++ MSG_ELEMENT_ALREADY_DECLARED = O tipo de elemento "{0}" n\u00E3o deve ser declarado mais de uma vez.
++ MSG_ELEMENT_NOT_DECLARED = O tipo de elemento "{0}" deve ser declarado.
+ MSG_GRAMMAR_NOT_FOUND = O documento \u00E9 inv\u00E1lido: nenhuma gram\u00E1tica encontrada.
+- MSG_ELEMENT_WITH_ID_REQUIRED = Um elemento com o identificador \"{0}\" deve aparecer no documento.
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = A refer\u00EAncia \u00E0 entidade externa \"{0}\" n\u00E3o \u00E9 permitida em um documento stand-alone.
+- MSG_FIXED_ATTVALUE_INVALID = O atributo \"{1}\" com o valor \"{2}\" deve ter um valor \"{3}\".
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = O tipo de elemento \"{0}\" j\u00E1 tem o atributo \"{1}\" do ID do tipo; um segundo atributo \"{2}\" do ID de tipo n\u00E3o \u00E9 permitido.
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = O tipo de elemento \"{0}\" j\u00E1 tem o atributo \"{1}\" do tipo NOTATION; um segundo atributo \"{2}\" do tipo NOTATION n\u00E3o \u00E9 permitido.
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = A nota\u00E7\u00E3o \"{1}\" deve ser declarada quando referenciada na lista de tipos de nota\u00E7\u00E3o do atributo \"{0}\".
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = A nota\u00E7\u00E3o \"{1}\" deve ser declarada quando referenciada na declara\u00E7\u00E3o da entidade n\u00E3o submetida a parse para \"{0}\".
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = A refer\u00EAncia \u00E0 entidade \"{0}\" declarada em uma entidade externa submetida a parse n\u00E3o \u00E9 permitida em um documento stand-alone.
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = O atributo \"{1}\" \u00E9 necess\u00E1rio e deve ser especificado para o tipo de elemento \"{0}\".
+- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = N\u00E3o deve haver espa\u00E7o em branco entre os elementos declarados em uma entidade externa submetida a parse com o conte\u00FAdo do elemento em um documento stand-alone.
+- NMTOKENInvalid = O valor do atributo \"{0}\" do tipo NMTOKEN deve ser um token de nome.
+- NMTOKENSInvalid = O valor do atributo \"{0}\" do tipo NMTOKENS deve ter um ou mais tokens de nome.
+- NoNotationOnEmptyElement = O tipo de elemento \"{0}\" que foi declarado EMPTY n\u00E3o pode declarar o atributo \"{1}\" do tipo NOTATION.
+- RootElementTypeMustMatchDoctypedecl = O elemento-raiz do documento \"{1}\" deve corresponder \u00E0 raiz de DOCTYPE \"{0}\".
+- UndeclaredElementInContentSpec = O modelo do conte\u00FAdo do elemento \"{0}\" refere-se ao elemento n\u00E3o declarado \"{1}\".
+- UniqueNotationName = A declara\u00E7\u00E3o da nota\u00E7\u00E3o \"{0}\" n\u00E3o \u00E9 exclusiva. Um Nome fornecido n\u00E3o deve ser declarado em mais de uma declara\u00E7\u00E3o de nota\u00E7\u00E3o.
++ MSG_ELEMENT_WITH_ID_REQUIRED = Um elemento com o identificador "{0}" deve aparecer no documento.
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = A refer\u00EAncia \u00E0 entidade externa "{0}" n\u00E3o \u00E9 permitida em um documento stand-alone.
++ MSG_FIXED_ATTVALUE_INVALID = O atributo "{1}" com o valor "{2}" deve ter um valor "{3}".
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = O tipo de elemento "{0}" j\u00E1 tem o atributo "{1}" do ID do tipo; um segundo atributo "{2}" do ID de tipo n\u00E3o \u00E9 permitido.
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = O tipo de elemento "{0}" j\u00E1 tem o atributo "{1}" do tipo NOTATION; um segundo atributo "{2}" do tipo NOTATION n\u00E3o \u00E9 permitido.
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = A nota\u00E7\u00E3o "{1}" deve ser declarada quando referenciada na lista de tipos de nota\u00E7\u00E3o do atributo "{0}".
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = A nota\u00E7\u00E3o "{1}" deve ser declarada quando referenciada na declara\u00E7\u00E3o da entidade n\u00E3o submetida a parsing para "{0}".
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = A refer\u00EAncia \u00E0 entidade "{0}" declarada em uma entidade externa submetida a parsing n\u00E3o \u00E9 permitida em um documento stand-alone.
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" \u00E9 necess\u00E1rio e deve ser especificado para o tipo de elemento "{0}".
++ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = N\u00E3o deve haver espa\u00E7o em branco entre os elementos declarados em uma entidade externa submetida a parsing com o conte\u00FAdo do elemento em um documento stand-alone.
++ NMTOKENInvalid = O valor do atributo "{0}" do tipo NMTOKEN deve ser um token de nome.
++ NMTOKENSInvalid = O valor do atributo "{0}" do tipo NMTOKENS deve ter um ou mais tokens de nome.
++ NoNotationOnEmptyElement = O tipo de elemento "{0}" que foi declarado EMPTY n\u00E3o pode declarar o atributo "{1}" do tipo NOTATION.
++ RootElementTypeMustMatchDoctypedecl = O elemento-raiz do documento "{1}" deve corresponder \u00E0 raiz de DOCTYPE "{0}".
++ UndeclaredElementInContentSpec = O modelo do conte\u00FAdo do elemento "{0}" refere-se ao elemento n\u00E3o declarado "{1}".
++ UniqueNotationName = A declara\u00E7\u00E3o da nota\u00E7\u00E3o "{0}" n\u00E3o \u00E9 exclusiva. Um Nome fornecido n\u00E3o deve ser declarado em mais de uma declara\u00E7\u00E3o de nota\u00E7\u00E3o.
+ ENTITYFailedInitializeGrammar = Validador de ENTITYDatatype: Falha ao chamar o m\u00E9todo de inicializa\u00E7\u00E3o com uma refer\u00EAncia de Gram\u00E1tica v\u00E1lida. \t
+- ENTITYNotUnparsed = ENTITY \"{0}\" n\u00E3o \u00E9 submetida a parse.
+- ENTITYNotValid = ENTITY \"{0}\" n\u00E3o \u00E9 v\u00E1lida.
++ ENTITYNotUnparsed = ENTITY "{0}" n\u00E3o \u00E9 submetida a parsing.
++ ENTITYNotValid = ENTITY "{0}" n\u00E3o \u00E9 v\u00E1lida.
+ EmptyList = O valor dos tipos ENTITIES, IDREFS e NMTOKENS n\u00E3o pode estar na lista vazia.
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = A refer\u00EAncia da entidade externa \"&{0};\" n\u00E3o \u00E9 permitida em um valor do atributo.
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = A refer\u00EAncia da entidade externa "&{0};" n\u00E3o \u00E9 permitida em um valor do atributo.
++ AccessExternalDTD = DTD Externo: falha ao ler o DTD ''{0}'' externo porque o acesso a ''{1}'' n\u00E3o \u00E9 permitido em decorr\u00EAncia de uma restri\u00E7\u00E3o definida pela propriedade accessExternalDTD.
++ AccessExternalEntity = Entidade Externa: falha ao ler o documento ''{0}'' externo porque o acesso a ''{1}'' n\u00E3o \u00E9 permitido em decorr\u00EAncia de uma restri\u00E7\u00E3o definida pela propriedade accessExternalDTD.
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = A entidade \"{0}\" foi referenciada, mas n\u00E3o declarada.
+- ReferenceToUnparsedEntity = A refer\u00EAncia da entidade n\u00E3o submetida a parse \"&{0};\" n\u00E3o \u00E9 permitida.
+- RecursiveReference = Refer\u00EAncia da entidade recursiva \"{0}\". (Caminho de refer\u00EAncia: {1}),
+- RecursiveGeneralReference = Refer\u00EAncia geral da entidade recursiva \"&{0};\". (Caminho de refer\u00EAncia: {1}),
+- RecursivePEReference = Refer\u00EAncia da entidade do par\u00E2metro recursivo \"%{0};\". (Caminho de refer\u00EAncia: {1}),
++ EntityNotDeclared = A entidade "{0}" foi referenciada, mas n\u00E3o declarada.
++ ReferenceToUnparsedEntity = A refer\u00EAncia da entidade n\u00E3o submetida a parsing "&{0};" n\u00E3o \u00E9 permitida.
++ RecursiveReference = Refer\u00EAncia da entidade recursiva "{0}". (Caminho de refer\u00EAncia: {1}),
++ RecursiveGeneralReference = Refer\u00EAncia geral da entidade recursiva "&{0};". (Caminho de refer\u00EAncia: {1}),
++ RecursivePEReference = Refer\u00EAncia da entidade do par\u00E2metro recursivo "%{0};". (Caminho de refer\u00EAncia: {1}),
+ # 4.3.3 Character Encoding in Entities
+- EncodingNotSupported = A codifica\u00E7\u00E3o \"{0}\" n\u00E3o \u00E9 suportada.
+- EncodingRequired = Uma entidade submetida a parse n\u00E3o codificada em UTF-8 nem em UTF-16 deve conter uma declara\u00E7\u00E3o de codifica\u00E7\u00E3o.
++ EncodingNotSupported = A codifica\u00E7\u00E3o "{0}" n\u00E3o \u00E9 suportada.
++ EncodingRequired = Uma entidade submetida a parsing n\u00E3o codificada em UTF-8 nem em UTF-16 deve conter uma declara\u00E7\u00E3o de codifica\u00E7\u00E3o.
+
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = O elemento ou o atributo n\u00E3o correspondem \u00E0 produ\u00E7\u00E3o QName: QName::=(NCName':')?NCName.
+- ElementXMLNSPrefix = O elemento \"{0}\" n\u00E3o pode ter \"xmlns\" como seu prefixo.
+- ElementPrefixUnbound = O prefixo \"{0}\" do elemento \"{1}\" n\u00E3o est\u00E1 vinculado.
+- AttributePrefixUnbound = O prefixo \"{2}\" do atributo \"{1}\" associado a um tipo de elemento \"{0}\" n\u00E3o est\u00E1 vinculado.
+- EmptyPrefixedAttName = O valor do atributo \"{0}\" \u00E9 inv\u00E1lido. Associa\u00E7\u00F5es de namespace prefixadas n\u00E3o podem ficar vazias.
+- PrefixDeclared = O prefixo do namespace \"{0}\" n\u00E3o foi declarado.
++ ElementXMLNSPrefix = O elemento "{0}" n\u00E3o pode ter "xmlns" como seu prefixo.
++ ElementPrefixUnbound = O prefixo "{0}" do elemento "{1}" n\u00E3o est\u00E1 vinculado.
++ AttributePrefixUnbound = O prefixo "{2}" do atributo "{1}" associado a um tipo de elemento "{0}" n\u00E3o est\u00E1 vinculado.
++ EmptyPrefixedAttName = O valor do atributo "{0}" \u00E9 inv\u00E1lido. Associa\u00E7\u00F5es de namespace prefixadas n\u00E3o podem ficar vazias.
++ PrefixDeclared = O prefixo do namespace "{0}" n\u00E3o foi declarado.
+ CantBindXMLNS = O prefixo "xmlns" n\u00E3o pode ser vinculado a um namespace explicitamente, assim como o namespace de "xmlns" n\u00E3o pode ser vinculado a um prefixo explicitamente.
+ CantBindXML = O prefixo "xml" n\u00E3o pode ser vinculado a um namespace diferente do namespace comum, assim como o namespace de "xml" n\u00E3o pode ser vinculado a um prefixo diferente de "xml".
+- MSG_ATT_DEFAULT_INVALID = O defaultValue \"{1}\" do atributo \"{0}\" n\u00E3o \u00E9 v\u00E1lido para as restri\u00E7\u00F5es l\u00E9xicas deste tipo de atributo.
++ MSG_ATT_DEFAULT_INVALID = O defaultValue "{1}" do atributo "{0}" n\u00E3o \u00E9 v\u00E1lido para as restri\u00E7\u00F5es l\u00E9xicas deste tipo de atributo.
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +318,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=O parser detectou mais de \"{0}\" expans\u00F5es da entidade neste documento. Este \u00E9 o limite imposto pela aplica\u00E7\u00E3o.
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: O parser detectou mais de "{0}" expans\u00F5es da entidade neste documento. Este \u00E9 o limite imposto pelo JDK.
++ ElementAttributeLimit=JAXP00010002: o elemento "{0}" tem mais de "{1}" atributos. "{1}" \u00E9 o limite imposto pelo JDK.
++ MaxEntitySizeLimit=JAXP00010003: o tamanho da entidade "{0}" \u00E9 "{1}", o que excede o limite de "{2}" definido por "{3}".
++ TotalEntitySizeLimit=JAXP00010004: o tamanho acumulado "{0}" de entidades excedeu o limite de "{1}" definido por "{2}".
++ MaxXMLNameLimit=JAXP00010005: o nome "{0}" excedeu o limite de "{1}" definido por "{2}".
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,27 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +45,14 @@
+ InvalidCharInProlog = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets prolog.
+ InvalidCharInXMLDecl = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i XML-deklarationen.
+ # 2.4 Character Data and Markup
+- CDEndInContent = Teckensekvensen \"]]>\" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion.
++ CDEndInContent = Teckensekvensen "]]>" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion.
+ # 2.7 CDATA Sections
+- CDSectUnterminated = CDATA-sektionen m\u00E5ste sluta med \"]]>\".
++ CDSectUnterminated = CDATA-sektionen m\u00E5ste sluta med "]]>".
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = XML-deklarationen f\u00E5r endast f\u00F6rekomma allra \u00F6verst i dokumentet.
+- EqRequiredInXMLDecl = Tecknet '' = '' m\u00E5ste anges efter \"{0}\" i XML-deklarationen.
+- QuoteRequiredInXMLDecl = V\u00E4rdet som f\u00F6ljer \"{0}\" i XML-deklarationen m\u00E5ste omges av citattecken.
+- XMLDeclUnterminated = XML-deklarationen m\u00E5ste avslutas med \"?>\".
++ EqRequiredInXMLDecl = Tecknet '' = '' m\u00E5ste anges efter "{0}" i XML-deklarationen.
++ QuoteRequiredInXMLDecl = V\u00E4rdet som f\u00F6ljer "{0}" i XML-deklarationen m\u00E5ste omges av citattecken.
++ XMLDeclUnterminated = XML-deklarationen m\u00E5ste avslutas med "?>".
+ VersionInfoRequired = Versionen kr\u00E4vs i XML-deklarationen.
+ SpaceRequiredBeforeVersionInXMLDecl = Tomt utrymme kr\u00E4vs f\u00F6re versionens pseudoattribut i XML-deklarationen.
+ SpaceRequiredBeforeEncodingInXMLDecl = Tomt utrymme kr\u00E4vs f\u00F6re kodningens pseudoattribut i XML-deklarationen.
+@@ -71,70 +68,71 @@
+ ReferenceIllegalInTrailingMisc=Referensen \u00E4r inte till\u00E5ten i efterf\u00F6ljande avsnitt.
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = Deklarationsv\u00E4rdet f\u00F6r frist\u00E5ende dokument m\u00E5ste vara \"yes\" eller \"no\", inte \"{0}\".
++ SDDeclInvalid = Deklarationsv\u00E4rdet f\u00F6r frist\u00E5ende dokument m\u00E5ste vara "yes" eller "no", inte "{0}".
++ SDDeclNameInvalid = Det frist\u00E5ende namnet i XML-deklarationen kan vara felstavat.
+ # 2.12 Language Identification
+- XMLLangInvalid = Attributv\u00E4rdet \"{0}\" f\u00F6r xml:lang \u00E4r en ogiltig spr\u00E5kidentifierare.
++ XMLLangInvalid = Attributv\u00E4rdet "{0}" f\u00F6r xml:lang \u00E4r en ogiltig spr\u00E5kidentifierare.
+ # 3. Logical Structures
+- ETagRequired = Elementtyp \"{0}\" m\u00E5ste avslutas med matchande sluttagg \"</{0}>\".
++ ETagRequired = Elementtyp "{0}" m\u00E5ste avslutas med matchande sluttagg "</{0}>".
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = Elementtyp \"{0}\" m\u00E5ste f\u00F6ljas av n\u00E5gondera av attributspecifikationerna \">\" eller \"/>\".
+- EqRequiredInAttribute = Attributnamnet \"{1}\" som associeras med elementtyp \"{0}\" m\u00E5ste f\u00F6ljas av likhetstecknet ('' = '').
+- OpenQuoteExpected = \u00D6ppningscitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet \"{1}\" som associeras med elementtyp \"{0}\".
+- CloseQuoteExpected = Slutcitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet \"{1}\" som associeras med elementtyp \"{0}\".
+- AttributeNotUnique = Attributet \"{1}\" har redan angetts f\u00F6r elementet \"{0}\".
+- AttributeNSNotUnique = Attributet \"{1}\" bundet till namnrymden \"{2}\" har redan angetts f\u00F6r elementet \"{0}\".
+- ETagUnterminated = Sluttaggen f\u00F6r elementtyp \"{0}\" m\u00E5ste avslutas med en ''>''-avgr\u00E4nsare.
++ ElementUnterminated = Elementtyp "{0}" m\u00E5ste f\u00F6ljas av n\u00E5gondera av attributspecifikationerna ">" eller "/>".
++ EqRequiredInAttribute = Attributnamnet "{1}" som associeras med elementtyp "{0}" m\u00E5ste f\u00F6ljas av likhetstecknet ('' = '').
++ OpenQuoteExpected = \u00D6ppningscitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet "{1}" som associeras med elementtyp "{0}".
++ CloseQuoteExpected = Slutcitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet "{1}" som associeras med elementtyp "{0}".
++ AttributeNotUnique = Attributet "{1}" har redan angetts f\u00F6r elementet "{0}".
++ AttributeNSNotUnique = Attributet "{1}" bundet till namnrymden "{2}" har redan angetts f\u00F6r elementet "{0}".
++ ETagUnterminated = Sluttaggen f\u00F6r elementtyp "{0}" m\u00E5ste avslutas med en ''>''-avgr\u00E4nsare.
+ MarkupNotRecognizedInContent = Elementinneh\u00E5llet m\u00E5ste best\u00E5 av v\u00E4lformulerad(e) teckendata eller kodtext.
+ DoctypeIllegalInContent = DOCTYPE \u00E4r inte till\u00E5tet i inneh\u00E5llet.
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = Referensen m\u00E5ste avslutas med en ';'-avgr\u00E4nsare.
+ # 4.3.2 Well-Formed Parsed Entities
+ ReferenceNotInOneEntity = Referensen m\u00E5ste finnas med inom samma tolkade enhet.
+- ElementEntityMismatch = Elementet \"{0}\" m\u00E5ste b\u00F6rja och sluta inom samma enhet.
++ ElementEntityMismatch = Elementet "{0}" m\u00E5ste b\u00F6rja och sluta inom samma enhet.
+ MarkupEntityMismatch=XML-dokumentstrukturer m\u00E5ste b\u00F6rja och sluta inom samma enhet.
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = Ett ogiltigt XML-tecken (Unicode: 0x{2}) hittades i attributv\u00E4rdet \"{1}\" och elementet \u00E4r \"{0}\".
++ InvalidCharInAttValue = Ett ogiltigt XML-tecken (Unicode: 0x{2}) hittades i attributv\u00E4rdet "{1}" och elementet \u00E4r "{0}".
+ InvalidCharInComment = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i kommentaren.
+- InvalidCharInPI = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades bearbetningsinstruktionen.
++ InvalidCharInPI = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i bearbetningsinstruktionen.
+ InvalidCharInInternalSubset = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i den interna delm\u00E4ngden i DTD.
+ InvalidCharInTextDecl = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i textdeklarationen.
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = Attributv\u00E4rdet \"{1}\" m\u00E5ste b\u00F6rja med antingen enkelt eller dubbelt citattecken.
+- LessthanInAttValue = Attributv\u00E4rdet \"{1}\" som associeras med elementtyp \"{0}\" f\u00E5r inte inneh\u00E5lla n\u00E5got ''<''-tecken.
+- AttributeValueUnterminated = Attributv\u00E4rdet \"{1}\" m\u00E5ste avslutas med matchande citattecken.
++ QuoteRequiredInAttValue = Attributv\u00E4rdet "{1}" m\u00E5ste b\u00F6rja med antingen enkelt eller dubbelt citattecken.
++ LessthanInAttValue = Attributv\u00E4rdet "{1}" som associeras med elementtyp "{0}" f\u00E5r inte inneh\u00E5lla n\u00E5got ''<''-tecken.
++ AttributeValueUnterminated = Attributv\u00E4rdet "{1}" m\u00E5ste avslutas med matchande citattecken.
+ # 2.5 Comments
+- InvalidCommentStart = Kommentarer m\u00E5ste inledas med \"<!--\".
+- DashDashInComment = Str\u00E4ngen \"--\" \u00E4r inte till\u00E5ten inom kommentarer.
+- CommentUnterminated = Kommentaren m\u00E5ste avslutas med \"-->\".
++ InvalidCommentStart = Kommentarer m\u00E5ste inledas med "<!--".
++ DashDashInComment = Str\u00E4ngen "--" \u00E4r inte till\u00E5ten inom kommentarer.
++ CommentUnterminated = Kommentaren m\u00E5ste avslutas med "-->".
+ COMMENT_NOT_IN_ONE_ENTITY = Kommentaren innesluts inte i samma enhet.
+ # 2.6 Processing Instructions
+ PITargetRequired = Bearbetningsinstruktionen m\u00E5ste b\u00F6rja med m\u00E5lnamnet.
+ SpaceRequiredInPI = Tomt utrymme kr\u00E4vs mellan bearbetningsinstruktionens m\u00E5l och data.
+- PIUnterminated = Bearbetningsinstruktionen m\u00E5ste avslutas med \"?>\".
+- ReservedPITarget = Bearbetningsinstruktionens m\u00E5lmatchning \"[xX][mM][lL]\" \u00E4r inte till\u00E5ten.
++ PIUnterminated = Bearbetningsinstruktionen m\u00E5ste avslutas med "?>".
++ ReservedPITarget = Bearbetningsinstruktionens m\u00E5lmatchning "[xX][mM][lL]" \u00E4r inte till\u00E5ten.
+ PI_NOT_IN_ONE_ENTITY = Bearbetningsinstruktionen innesluts inte i samma enhet.
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = Ogiltig version \"{0}\".
+- VersionNotSupported = XML-versionen \"{0}\" st\u00F6ds inte, endast XML 1.0 st\u00F6ds.
+- VersionNotSupported11 = XML-versionen \"{0}\" st\u00F6ds inte, endast XML 1.0 och XML 1.1 st\u00F6ds.
++ VersionInfoInvalid = Ogiltig version "{0}".
++ VersionNotSupported = XML-versionen "{0}" st\u00F6ds inte, endast XML 1.0 st\u00F6ds.
++ VersionNotSupported11 = XML-versionen "{0}" st\u00F6ds inte, endast XML 1.0 och XML 1.1 st\u00F6ds.
+ VersionMismatch= En enhet kan inte inkludera n\u00E5gon annan enhet som har en senare version.
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = Ett decimalt uttryck m\u00E5ste anges direkt efter \"&#\" i en teckenreferens.
+- HexdigitRequiredInCharRef = Ett hexadecimalt uttryck m\u00E5ste anges direkt efter \"&#x\" i en teckenreferens.
++ DigitRequiredInCharRef = Ett decimalt uttryck m\u00E5ste anges direkt efter "&#" i en teckenreferens.
++ HexdigitRequiredInCharRef = Ett hexadecimalt uttryck m\u00E5ste anges direkt efter "&#x" i en teckenreferens.
+ SemicolonRequiredInCharRef = Teckenreferensen m\u00E5ste avslutas med ';'-avgr\u00E4nsare.
+- InvalidCharRef = Teckenreferensen \"&#{0}\" \u00E4r ett ogiltigt XML-tecken.
++ InvalidCharRef = Teckenreferensen "&#{0}" \u00E4r ett ogiltigt XML-tecken.
+ NameRequiredInReference = Enhetsnamnet m\u00E5ste omedelbart f\u00F6ljas av '&' i enhetsreferensen.
+- SemicolonRequiredInReference = Referensen till enhet \"{0}\" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
++ SemicolonRequiredInReference = Referensen till enhet "{0}" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
+ # 4.3.1 The Text Declaration
+ TextDeclMustBeFirst = Textdeklarationen m\u00E5ste anges direkt i b\u00F6rjan av externt tolkad enhet.
+- EqRequiredInTextDecl = Ett likhetstecken ('' = '') m\u00E5ste anges efter \"{0}\" i textdeklarationen.
+- QuoteRequiredInTextDecl = V\u00E4rdet som f\u00F6ljer \"{0}\" i textdeklarationen m\u00E5ste omges av citattecken.
+- CloseQuoteMissingInTextDecl = avslutande citattecken saknas f\u00F6r v\u00E4rdet efter \"{0}\" i textdeklarationen.
++ EqRequiredInTextDecl = Ett likhetstecken ('' = '') m\u00E5ste anges efter "{0}" i textdeklarationen.
++ QuoteRequiredInTextDecl = V\u00E4rdet som f\u00F6ljer "{0}" i textdeklarationen m\u00E5ste omges av citattecken.
++ CloseQuoteMissingInTextDecl = avslutande citattecken saknas f\u00F6r v\u00E4rdet efter "{0}" i textdeklarationen.
+ SpaceRequiredBeforeVersionInTextDecl = Tomt utrymme kr\u00E4vs f\u00F6re versionens pseudoattribut i textdeklarationen.
+ SpaceRequiredBeforeEncodingInTextDecl = Tomt utrymme kr\u00E4vs f\u00F6re kodningens pseudoattribut i textdeklarationen.
+- TextDeclUnterminated = Textdeklarationen m\u00E5ste avslutas med \"?>\".
++ TextDeclUnterminated = Textdeklarationen m\u00E5ste avslutas med "?>".
+ EncodingDeclRequired = Koddeklaration kr\u00E4vs i textdeklarationen.
+ NoMorePseudoAttributes = Inga fler pseudoattribut \u00E4r till\u00E5tna.
+ MorePseudoAttributes = Ytterligare pseudoattribut f\u00F6rv\u00E4ntas.
+@@ -143,13 +141,13 @@
+ CommentNotInOneEntity = Kommentaren m\u00E5ste finnas med inom samma tolkade enhet.
+ PINotInOneEntity = Bearbetningsinstruktionen m\u00E5ste finnas med inom samma tolkade enhet.
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = Ogiltigt kodnamn, \"{0}\".
+- EncodingByteOrderUnsupported = Angiven byteordningsf\u00F6ljd i kodning \"{0}\" st\u00F6ds inte.
++ EncodingDeclInvalid = Ogiltigt kodnamn, "{0}".
++ EncodingByteOrderUnsupported = Angiven byteordningsf\u00F6ljd i kodning "{0}" st\u00F6ds inte.
+ InvalidByte = Ogiltig byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte.
+ ExpectedByte = F\u00F6rv\u00E4ntad byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte.
+ InvalidHighSurrogate = H\u00F6ga surrogatbitar i UTF-8-sekvens f\u00E5r inte \u00F6verskrida 0x10, men 0x{0} hittades.
+- OperationNotSupported = Operation \"{0}\" st\u00F6ds inte i l\u00E4saren {1}.
+- InvalidASCII = Byte \"{0}\" ing\u00E5r inte i ASCII-teckenupps\u00E4ttningen (7 bitar).
++ OperationNotSupported = Operation "{0}" st\u00F6ds inte i l\u00E4saren {1}.
++ InvalidASCII = Byte "{0}" ing\u00E5r inte i ASCII-teckenupps\u00E4ttningen (7 bitar).
+ CharConversionFailure = En enhet som fastst\u00E4lls anv\u00E4nda ett visst kodformat f\u00E5r inte inneh\u00E5lla sekvenser som \u00E4r otill\u00E5tna i kodningen.
+
+ # DTD Messages
+@@ -169,150 +167,150 @@
+ PubidCharIllegal = Tecknet (Unicode: 0x{0}) \u00E4r inte till\u00E5tet i den allm\u00E4nna identifieraren.
+ SpaceRequiredBetweenPublicAndSystem = Tomma utrymmen kr\u00E4vs mellan publicId och systemId.
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Tomt utrymme kr\u00E4vs efter \"<!DOCTYPE\" i dokumenttypdeklarationen.
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = Rotelementtyp m\u00E5ste anges efter \"<!DOCTYPE\" i dokumenttypdeklarationen.
+- DoctypedeclUnterminated = Dokumenttypdeklarationen f\u00F6r rotelementtyp \"{0}\" m\u00E5ste avslutas med ''>''.
+- PEReferenceWithinMarkup = Parameterreferensen \"%{0};\" f\u00E5r inte f\u00F6rekomma i kodtexten i den interna delm\u00E4ngden i DTD.
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Tomt utrymme kr\u00E4vs efter "<!DOCTYPE" i dokumenttypdeklarationen.
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = Rotelementtyp m\u00E5ste anges efter "<!DOCTYPE" i dokumenttypdeklarationen.
++ DoctypedeclUnterminated = Dokumenttypdeklarationen f\u00F6r rotelementtyp "{0}" m\u00E5ste avslutas med ''>''.
++ PEReferenceWithinMarkup = Parameterreferensen "%{0};" f\u00E5r inte f\u00F6rekomma i kodtexten i den interna delm\u00E4ngden i DTD.
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Kodtextdeklarationerna som finns med eller pekas till fr\u00E5n dokumenttypdeklarationen m\u00E5ste vara v\u00E4lformulerade.
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklarationen f\u00F6r \"xml:space\" m\u00E5ste anges som uppr\u00E4kningstyp vars enda m\u00F6jliga v\u00E4rden \u00E4r \"default\" och \"preserve\".
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklarationen f\u00F6r "xml:space" m\u00E5ste anges som uppr\u00E4kningstyp vars enda m\u00F6jliga v\u00E4rden \u00E4r "default" och "preserve".
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter \"<!ELEMENT\" i elementtypdeklarationen.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter "<!ELEMENT" i elementtypdeklarationen.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Elementtyp m\u00E5ste anges i elementtypdeklarationen.
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter elementtyp \"{0}\" i elementtypdeklarationen.
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Begr\u00E4nsningen kr\u00E4vs efter elementtyp \"{0}\" i elementtypdeklarationen.
+- ElementDeclUnterminated = Deklarationen f\u00F6r elementtyp \"{0}\" m\u00E5ste avslutas med ''>''.
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter elementtyp "{0}" i elementtypdeklarationen.
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Begr\u00E4nsningen kr\u00E4vs efter elementtyp "{0}" i elementtypdeklarationen.
++ ElementDeclUnterminated = Deklarationen f\u00F6r elementtyp "{0}" m\u00E5ste avslutas med ''>''.
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Tecknet ''('' eller en elementtyp m\u00E5ste anges i deklarationen av elementtyp \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp \"{0}\".
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Tecknet ''('' eller en elementtyp m\u00E5ste anges i deklarationen av elementtyp "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp "{0}".
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = En elementtyp m\u00E5ste anges i deklarationen av elementtyp \"{0}\".
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp \"{0}\".
+- MixedContentUnterminated = Modellen med blandat inneh\u00E5ll \"{0}\" m\u00E5ste avslutas med \")*\" om typer av underordnade element \u00E4r begr\u00E4nsade.
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = En elementtyp m\u00E5ste anges i deklarationen av elementtyp "{0}".
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp "{0}".
++ MixedContentUnterminated = Modellen med blandat inneh\u00E5ll "{0}" m\u00E5ste avslutas med ")*" om typer av underordnade element \u00E4r begr\u00E4nsade.
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Tomt utrymme kr\u00E4vs efter \"<!ATTLIST\" i deklarationen f\u00F6r attributlista.
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Tomt utrymme kr\u00E4vs efter "<!ATTLIST" i deklarationen f\u00F6r attributlista.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Elementtyp m\u00E5ste anges i deklarationen f\u00F6r attributlista.
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributnamnet i deklarationen f\u00F6r attributlista f\u00F6r elementet \"{0}\".
+- AttNameRequiredInAttDef = Attributnamnet m\u00E5ste anges i deklarationen f\u00F6r attributlista f\u00F6r elementet \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributtyp i deklarationen f\u00F6r attributet \"{1}\" f\u00F6r elementet \"{0}\".
+- AttTypeRequiredInAttDef = Attributtyp m\u00E5ste anges i deklarationen f\u00F6r attributet \"{1}\" f\u00F6r elementet \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributstandardv\u00E4rde i deklarationen f\u00F6r attributet \"{1}\" f\u00F6r elementet \"{0}\".
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Det finns fler \u00E4n en attributdefinition f\u00F6r samma attribut \"{1}\" f\u00F6r angivet element \"{0}\".
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributnamnet i deklarationen f\u00F6r attributlista f\u00F6r elementet "{0}".
++ AttNameRequiredInAttDef = Attributnamnet m\u00E5ste anges i deklarationen f\u00F6r attributlista f\u00F6r elementet "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributtyp i deklarationen f\u00F6r attributet "{1}" f\u00F6r elementet "{0}".
++ AttTypeRequiredInAttDef = Attributtyp m\u00E5ste anges i deklarationen f\u00F6r attributet "{1}" f\u00F6r elementet "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributstandardv\u00E4rde i deklarationen f\u00F6r attributet "{1}" f\u00F6r elementet "{0}".
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Det finns fler \u00E4n en attributdefinition f\u00F6r samma attribut "{1}" f\u00F6r angivet element "{0}".
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Tomt utrymme m\u00E5ste anges efter \"NOTATION\" i attributdeklarationen \"{1}\".
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Tecknet ''('' m\u00E5ste anges efter \"NOTATION\" i attributdeklarationen \"{1}\".
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsnamn m\u00E5ste anges i notationstyplistan f\u00F6r attributdeklarationen \"{1}\".
+- NotationTypeUnterminated = Notationstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen \"{1}\".
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntecken m\u00E5ste anges i uppr\u00E4kningstyplistan f\u00F6r attributdeklarationen \"{1}\".
+- EnumerationUnterminated = Uppr\u00E4kningstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen \"{1}\".
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet \"{1}\" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen \"{2}\" f\u00F6r elementet \"{0}\". Alla NMTOKENS i en och samma attributdeklaration f\u00F6r Enumeration m\u00E5ste vara unika.
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet \"{1}\" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen \"{2}\" f\u00F6r elementet \"{0}\". Alla NOTATION-namn i en och samma attributdeklaration f\u00F6r NotationType m\u00E5ste vara unika.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Tomt utrymme m\u00E5ste anges efter "NOTATION" i attributdeklarationen "{1}".
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Tecknet ''('' m\u00E5ste anges efter "NOTATION" i attributdeklarationen "{1}".
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsnamn m\u00E5ste anges i notationstyplistan f\u00F6r attributdeklarationen "{1}".
++ NotationTypeUnterminated = Notationstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}".
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntecken m\u00E5ste anges i uppr\u00E4kningstyplistan f\u00F6r attributdeklarationen "{1}".
++ EnumerationUnterminated = Uppr\u00E4kningstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}".
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NMTOKENS i en och samma attributdeklaration f\u00F6r Enumeration m\u00E5ste vara unika.
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NOTATION-namn i en och samma attributdeklaration f\u00F6r NotationType m\u00E5ste vara unika.
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Tomt utrymme m\u00E5ste anges efter \"FIXED\" i attributdeklarationen \"{1}\".
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Tomt utrymme m\u00E5ste anges efter "FIXED" i attributdeklarationen "{1}".
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = Inkluderat villkorsavsnitt m\u00E5ste avslutas med \"]]>\".
+- IgnoreSectUnterminated = Exkluderat villkorsavsnitt m\u00E5ste avslutas med \"]]>\".
++ IncludeSectUnterminated = Inkluderat villkorsavsnitt m\u00E5ste avslutas med "]]>".
++ IgnoreSectUnterminated = Exkluderat villkorsavsnitt m\u00E5ste avslutas med "]]>".
+ # 4.1 Character and Entity References
+ NameRequiredInPEReference = Enhetsnamnet m\u00E5ste omedelbart f\u00F6ljas av '%' i parameterreferensen.
+- SemicolonRequiredInPEReference = Parameterreferensen \"%{0};\" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
++ SemicolonRequiredInPEReference = Parameterreferensen "%{0};" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs efter \"<!ENTITY\" i enhetsdeklarationen.
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Tomt utrymme kr\u00E4vs mellan \"<!ENTITY\" och '%'-tecknet i parameterdeklarationen.
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs efter "<!ENTITY" i enhetsdeklarationen.
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Tomt utrymme kr\u00E4vs mellan "<!ENTITY" och '%'-tecknet i parameterdeklarationen.
+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Tomt utrymme kr\u00E4vs mellan '%' och enhetsnamnet i parameterdeklarationen.
+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Namnet p\u00E5 enheten m\u00E5ste anges i enhetsdeklarationen.
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan enhetsnamnet \"{0}\" och definitionen i enhetsdeklarationen.
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan \"NDATA\" och notationsnamnet i deklarationen f\u00F6r enheten \"{0}\".
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs f\u00F6re \"NDATA\" i deklarationen f\u00F6r enheten \"{0}\".
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsnamnet m\u00E5ste anges efter \"NDATA\" i deklarationen f\u00F6r enheten \"{0}\".
+- EntityDeclUnterminated = Deklarationen f\u00F6r enheten \"{0}\" m\u00E5ste avslutas med ''>''.
+- MSG_DUPLICATE_ENTITY_DEFINITION = Enheten \"{0}\" har deklarerats mer \u00E4n en g\u00E5ng.
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan enhetsnamnet "{0}" och definitionen i enhetsdeklarationen.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan "NDATA" och notationsnamnet i deklarationen f\u00F6r enheten "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs f\u00F6re "NDATA" i deklarationen f\u00F6r enheten "{0}".
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsnamnet m\u00E5ste anges efter "NDATA" i deklarationen f\u00F6r enheten "{0}".
++ EntityDeclUnterminated = Deklarationen f\u00F6r enheten "{0}" m\u00E5ste avslutas med ''>''.
++ MSG_DUPLICATE_ENTITY_DEFINITION = Enheten "{0}" har deklarerats mer \u00E4n en g\u00E5ng.
+ # 4.2.2 External Entities
+- ExternalIDRequired = Den externa enhetsdeklarationen m\u00E5ste inledas med antingen \"SYSTEM\" eller \"PUBLIC\".
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan \"PUBLIC\" och den allm\u00E4nna identifieraren.
++ ExternalIDRequired = Den externa enhetsdeklarationen m\u00E5ste inledas med antingen "SYSTEM" eller "PUBLIC".
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan "PUBLIC" och den allm\u00E4nna identifieraren.
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan den allm\u00E4nna identifieraren och systemidentifieraren.
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan \"SYSTEM\" och systemidentifieraren.
+- MSG_URI_FRAGMENT_IN_SYSTEMID = Fragmentidentifieraren f\u00E5r inte anges som del av systemidentifieraren \"{0}\".
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan "SYSTEM" och systemidentifieraren.
++ MSG_URI_FRAGMENT_IN_SYSTEMID = Fragmentidentifieraren f\u00E5r inte anges som del av systemidentifieraren "{0}".
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter \"<!NOTATION\" i notationsdeklarationen.
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter "<!NOTATION" i notationsdeklarationen.
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Namnet p\u00E5 notationen m\u00E5ste anges i notationsdeklarationen.
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter notationsnamnet \"{0}\" i notationsdeklarationen.
+- ExternalIDorPublicIDRequired = Deklarationen f\u00F6r notationen \"{0}\" m\u00E5ste inkludera systemidentifierare eller allm\u00E4n identifierare.
+- NotationDeclUnterminated = Deklarationen f\u00F6r notationen \"{0}\" m\u00E5ste avslutas med ''>''.
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter notationsnamnet "{0}" i notationsdeklarationen.
++ ExternalIDorPublicIDRequired = Deklarationen f\u00F6r notationen "{0}" m\u00E5ste inkludera systemidentifierare eller allm\u00E4n identifierare.
++ NotationDeclUnterminated = Deklarationen f\u00F6r notationen "{0}" m\u00E5ste avslutas med ''>''.
+
+ # Validation messages
+- DuplicateTypeInMixedContent = Elementtyp \"{1}\" har redan angetts i modellen med inneh\u00E5ll f\u00F6r elementdeklarationen \"{0}\".
+- ENTITIESInvalid = Attributv\u00E4rdet \"{1}\" av typen ENTITIES m\u00E5ste motsvara namnen p\u00E5 en eller flera otolkade enheter.
+- ENTITYInvalid = Attributv\u00E4rdet \"{1}\" av typen ENTITY m\u00E5ste motsvara namnet p\u00E5 en otolkad enhet.
+- IDDefaultTypeInvalid = Id-attributet \"{0}\" m\u00E5ste inneh\u00E5lla deklarerat standardv\u00E4rde \"#IMPLIED\" eller \"#REQUIRED\".
+- IDInvalid = Attributv\u00E4rdet \"{0}\" av typen ID m\u00E5ste vara ett namn.
+- IDInvalidWithNamespaces = Attributv\u00E4rdet \"{0}\" av typen ID m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
+- IDNotUnique = Attributv\u00E4rdet \"{0}\" av typen ID m\u00E5ste vara unikt inom dokumentet.
+- IDREFInvalid = Attributv\u00E4rdet \"{0}\" av typen IDREF m\u00E5ste vara ett namn.
+- IDREFInvalidWithNamespaces = Attributv\u00E4rdet \"{0}\" av typen IDREF m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
+- IDREFSInvalid = Attributv\u00E4rdet \"{0}\" av typen IDREFS m\u00E5ste vara ett eller flera namn.
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ers\u00E4ttningstexten f\u00F6r parameterenheten \"{0}\" m\u00E5ste inkludera korrekt kapslade deklarationer om enhetsreferensen anv\u00E4nds som fullst\u00E4ndig deklaration.
+- ImproperDeclarationNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten \"{0}\" m\u00E5ste inkludera deklarationer som \u00E4r korrekt kapslade.
+- ImproperGroupNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten \"{0}\" m\u00E5ste inkludera parentespar som \u00E4r korrekt kapslade.
+- INVALID_PE_IN_CONDITIONAL = Ers\u00E4ttningstexten f\u00F6r parameterenheten \"{0}\" m\u00E5st inkludera hela villkorsavsnittet eller endast INCLUDE eller IGNORE.
+- MSG_ATTRIBUTE_NOT_DECLARED = Attributet \"{1}\" m\u00E5ste deklareras f\u00F6r elementtyp \"{0}\".
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attributet \"{0}\" med v\u00E4rdet \"{1}\" m\u00E5ste ha ett v\u00E4rde fr\u00E5n listan \"{2}\".
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = V\u00E4rdet \"{1}\" f\u00F6r attributet \"{0}\" f\u00E5r inte \u00E4ndras vid normalisering (till \"{2}\") i ett frist\u00E5ende dokument.
+- MSG_CONTENT_INCOMPLETE = Inneh\u00E5llet i elementtyp \"{0}\" \u00E4r ofullst\u00E4ndigt, det m\u00E5ste matcha \"{1}\".
+- MSG_CONTENT_INVALID = Inneh\u00E5llet i elementtyp \"{0}\" m\u00E5ste matcha \"{1}\".
+- MSG_CONTENT_INVALID_SPECIFIED = Inneh\u00E5llet i elementtyp \"{0}\" m\u00E5ste matcha \"{1}\". Underordnade till typ \"{2}\" \u00E4r inte till\u00E5tna.
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attributet \"{1}\" f\u00F6r elementtyp \"{0}\" har ett standardv\u00E4rde och m\u00E5ste anges i ett frist\u00E5ende dokument.
+- MSG_DUPLICATE_ATTDEF = Attributet \"{1}\" har redan deklarerats f\u00F6r elementtyp \"{0}\".
+- MSG_ELEMENT_ALREADY_DECLARED = Elementtyp \"{0}\" f\u00E5r deklareras endast en g\u00E5ng.
+- MSG_ELEMENT_NOT_DECLARED = Elementtyp \"{0}\" m\u00E5ste deklareras.
++ DuplicateTypeInMixedContent = Elementtyp "{1}" har redan angetts i modellen med inneh\u00E5ll f\u00F6r elementdeklarationen "{0}".
++ ENTITIESInvalid = Attributv\u00E4rdet "{1}" av typen ENTITIES m\u00E5ste motsvara namnen p\u00E5 en eller flera otolkade enheter.
++ ENTITYInvalid = Attributv\u00E4rdet "{1}" av typen ENTITY m\u00E5ste motsvara namnet p\u00E5 en otolkad enhet.
++ IDDefaultTypeInvalid = Id-attributet "{0}" m\u00E5ste inneh\u00E5lla deklarerat standardv\u00E4rde "#IMPLIED" eller "#REQUIRED".
++ IDInvalid = Attributv\u00E4rdet "{0}" av typen ID m\u00E5ste vara ett namn.
++ IDInvalidWithNamespaces = Attributv\u00E4rdet "{0}" av typen ID m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
++ IDNotUnique = Attributv\u00E4rdet "{0}" av typen ID m\u00E5ste vara unikt inom dokumentet.
++ IDREFInvalid = Attributv\u00E4rdet "{0}" av typen IDREF m\u00E5ste vara ett namn.
++ IDREFInvalidWithNamespaces = Attributv\u00E4rdet "{0}" av typen IDREF m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
++ IDREFSInvalid = Attributv\u00E4rdet "{0}" av typen IDREFS m\u00E5ste vara ett eller flera namn.
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5ste inkludera korrekt kapslade deklarationer om enhetsreferensen anv\u00E4nds som fullst\u00E4ndig deklaration.
++ ImproperDeclarationNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5ste inkludera deklarationer som \u00E4r korrekt kapslade.
++ ImproperGroupNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5ste inkludera parentespar som \u00E4r korrekt kapslade.
++ INVALID_PE_IN_CONDITIONAL = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5st inkludera hela villkorsavsnittet eller endast INCLUDE eller IGNORE.
++ MSG_ATTRIBUTE_NOT_DECLARED = Attributet "{1}" m\u00E5ste deklareras f\u00F6r elementtyp "{0}".
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attributet "{0}" med v\u00E4rdet "{1}" m\u00E5ste ha ett v\u00E4rde fr\u00E5n listan "{2}".
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = V\u00E4rdet "{1}" f\u00F6r attributet "{0}" f\u00E5r inte \u00E4ndras vid normalisering (till "{2}") i ett frist\u00E5ende dokument.
++ MSG_CONTENT_INCOMPLETE = Inneh\u00E5llet i elementtyp "{0}" \u00E4r ofullst\u00E4ndigt, det m\u00E5ste matcha "{1}".
++ MSG_CONTENT_INVALID = Inneh\u00E5llet i elementtyp "{0}" m\u00E5ste matcha "{1}".
++ MSG_CONTENT_INVALID_SPECIFIED = Inneh\u00E5llet i elementtyp "{0}" m\u00E5ste matcha "{1}". Underordnade till typ "{2}" \u00E4r inte till\u00E5tna.
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" f\u00F6r elementtyp "{0}" har ett standardv\u00E4rde och m\u00E5ste anges i ett frist\u00E5ende dokument.
++ MSG_DUPLICATE_ATTDEF = Attributet "{1}" har redan deklarerats f\u00F6r elementtyp "{0}".
++ MSG_ELEMENT_ALREADY_DECLARED = Elementtyp "{0}" f\u00E5r deklareras endast en g\u00E5ng.
++ MSG_ELEMENT_NOT_DECLARED = Elementtyp "{0}" m\u00E5ste deklareras.
+ MSG_GRAMMAR_NOT_FOUND = Dokumentet \u00E4r ogiltigt: hittade ingen grammatik.
+- MSG_ELEMENT_WITH_ID_REQUIRED = Ett element med identifieraren \"{0}\" m\u00E5ste finnas med i dokumentet.
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referens till den externa enheten \"{0}\" \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
+- MSG_FIXED_ATTVALUE_INVALID = Attributet \"{1}\" med v\u00E4rdet \"{2}\" m\u00E5ste ha v\u00E4rdet \"{3}\".
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp \"{0}\" har redan attributet \"{1}\" av id-typ, ett andra attribut \"{2}\" av samma typ \u00E4r inte till\u00E5tet.
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp \"{0}\" har redan attributet \"{1}\" av NOTATION-typ, ett andra attribut \"{2}\" av samma typ \u00E4r inte till\u00E5tet.
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notationen \"{1}\" m\u00E5ste deklareras vid referens i notationstyplistan f\u00F6r attributet \"{0}\".
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notationen \"{1}\" m\u00E5ste deklareras vid referens i otolkad enhetsdeklaration f\u00F6r \"{0}\".
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referensen till enheten \"{0}\" som har deklarerats i en externt tolkad enhet \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attributet \"{1}\" m\u00E5ste anges f\u00F6r elementtyp \"{0}\".
++ MSG_ELEMENT_WITH_ID_REQUIRED = Ett element med identifieraren "{0}" m\u00E5ste finnas med i dokumentet.
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referens till den externa enheten "{0}" \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
++ MSG_FIXED_ATTVALUE_INVALID = Attributet "{1}" med v\u00E4rdet "{2}" m\u00E5ste ha v\u00E4rdet "{3}".
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp "{0}" har redan attributet "{1}" av id-typ, ett andra attribut "{2}" av samma typ \u00E4r inte till\u00E5tet.
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp "{0}" har redan attributet "{1}" av NOTATION-typ, ett andra attribut "{2}" av samma typ \u00E4r inte till\u00E5tet.
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notationen "{1}" m\u00E5ste deklareras vid referens i notationstyplistan f\u00F6r attributet "{0}".
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notationen "{1}" m\u00E5ste deklareras vid referens i otolkad enhetsdeklaration f\u00F6r "{0}".
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referensen till enheten "{0}" som har deklarerats i en externt tolkad enhet \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" m\u00E5ste anges f\u00F6r elementtyp "{0}".
+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Tomt utrymme f\u00E5r inte f\u00F6rekomma mellan element som har deklarerats i en externt tolkad enhet med elementinneh\u00E5ll i frist\u00E5ende dokument.
+- NMTOKENInvalid = Attributv\u00E4rdet \"{0}\" av typen NMTOKEN m\u00E5ste vara ett namntecken.
+- NMTOKENSInvalid = Attributv\u00E4rdet \"{0}\" av typen NMTOKENS m\u00E5ste vara ett eller flera namntecken.
+- NoNotationOnEmptyElement = Elementtyp \"{0}\" med deklarationen EMPTY kan inte deklareras med attributet \"{1}\" av typen NOTATION.
+- RootElementTypeMustMatchDoctypedecl = Dokumentrotelementet \"{1}\" m\u00E5ste matcha DOCTYPE-roten \"{0}\".
+- UndeclaredElementInContentSpec = Modellen med inneh\u00E5ll f\u00F6r elementet \"{0}\" refererar till elementet \"{1}\" som inte har deklarerats.
+- UniqueNotationName = Deklarationen f\u00F6r notationen \"{0}\" \u00E4r inte unik. Ett namn f\u00E5r inte deklareras i fler \u00E4n en notationsdeklaration.
++ NMTOKENInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKEN m\u00E5ste vara ett namntecken.
++ NMTOKENSInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKENS m\u00E5ste vara ett eller flera namntecken.
++ NoNotationOnEmptyElement = Elementtyp "{0}" med deklarationen EMPTY kan inte deklareras med attributet "{1}" av typen NOTATION.
++ RootElementTypeMustMatchDoctypedecl = Dokumentrotelementet "{1}" m\u00E5ste matcha DOCTYPE-roten "{0}".
++ UndeclaredElementInContentSpec = Modellen med inneh\u00E5ll f\u00F6r elementet "{0}" refererar till elementet "{1}" som inte har deklarerats.
++ UniqueNotationName = Deklarationen f\u00F6r notationen "{0}" \u00E4r inte unik. Ett namn f\u00E5r inte deklareras i fler \u00E4n en notationsdeklaration.
+ ENTITYFailedInitializeGrammar = ENTITYDatatype-validerare: Behov att anropa initieringsmetod med giltig grammatikreferens utf\u00F6rdes inte. \t
+- ENTITYNotUnparsed = ENTITY \"{0}\" \u00E4r otolkat.
+- ENTITYNotValid = ENTITY \"{0}\" \u00E4r inte giltigt.
++ ENTITYNotUnparsed = ENTITY "{0}" \u00E4r otolkat.
++ ENTITYNotValid = ENTITY "{0}" \u00E4r inte giltigt.
+ EmptyList = V\u00E4rdet f\u00F6r typ ENTITIES, IDREFS och NMTOKENS f\u00E5r inte vara en tom lista.
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = Den externa enhetsreferensen \"&{0};\" till\u00E5ts inte i ett attributv\u00E4rde.
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = Den externa enhetsreferensen "&{0};" till\u00E5ts inte i ett attributv\u00E4rde.
++ AccessExternalDTD = Extern DTD: Kunde inte l\u00E4sa extern DTD ''{0}'', eftersom ''{1}'' \u00E5tkomst inte till\u00E5ts p\u00E5 grund av begr\u00E4nsning som anges av accessExternalDTD-egenskapen.
++ AccessExternalEntity = Extern enhet: Kunde inte l\u00E4sa externt dokument ''{0}'', eftersom ''{1}'' \u00E5tkomst inte till\u00E5ts p\u00E5 grund av begr\u00E4nsning som anges av accessExternalDTD-egenskapen.
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = Enheten \"{0}\" har refererats, men \u00E4r inte deklarerad.
+- ReferenceToUnparsedEntity = Den otolkade enhetsreferensen \"&{0};\" \u00E4r inte till\u00E5ten.
+- RecursiveReference = Rekursiv enhetsreferens \"{0}\". (Referenss\u00F6kv\u00E4g: {1}),
+- RecursiveGeneralReference = Rekursiv allm\u00E4n enhetsreferens \"&{0};\". (Referenss\u00F6kv\u00E4g: {1}),
+- RecursivePEReference = Rekursiv parameterreferens \"%{0};\". (Referenss\u00F6kv\u00E4g: {1}),
++ EntityNotDeclared = Enheten "{0}" har refererats, men \u00E4r inte deklarerad.
++ ReferenceToUnparsedEntity = Den otolkade enhetsreferensen "&{0};" \u00E4r inte till\u00E5ten.
++ RecursiveReference = Rekursiv enhetsreferens "{0}". (Referenss\u00F6kv\u00E4g: {1}),
++ RecursiveGeneralReference = Rekursiv allm\u00E4n enhetsreferens "&{0};". (Referenss\u00F6kv\u00E4g: {1}),
++ RecursivePEReference = Rekursiv parameterreferens "%{0};". (Referenss\u00F6kv\u00E4g: {1}),
+ # 4.3.3 Character Encoding in Entities
+- EncodingNotSupported = Kodningen \"{0}\" st\u00F6ds inte.
++ EncodingNotSupported = Kodningen "{0}" st\u00F6ds inte.
+ EncodingRequired = En tolkad enhet som inte \u00E4r kodad i varken UTF-8 eller UTF-16 m\u00E5ste ha en kodningsdeklaration.
+
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = Element eller attribut matchar inte QName-produktion: QName::=(NCName':')?NCName.
+- ElementXMLNSPrefix = Elementet \"{0}\" kan inte anv\u00E4ndas med \"xmlns\" som prefix.
+- ElementPrefixUnbound = Prefixet \"{0}\" f\u00F6r elementet \"{1}\" \u00E4r inte bundet.
+- AttributePrefixUnbound = Prefixet \"{2}\" f\u00F6r attributet \"{1}\" som associeras med elementtyp \"{0}\" \u00E4r inte bundet.
+- EmptyPrefixedAttName = Ogiltigt v\u00E4rde f\u00F6r attributet \"{0}\". Namnrymdsbindningar som prefix kanske inte \u00E4r tomma.
+- PrefixDeclared = Namnrymdsprefixet \"{0}\" har inte deklarerats.
++ ElementXMLNSPrefix = Elementet "{0}" kan inte anv\u00E4ndas med "xmlns" som prefix.
++ ElementPrefixUnbound = Prefixet "{0}" f\u00F6r elementet "{1}" \u00E4r inte bundet.
++ AttributePrefixUnbound = Prefixet "{2}" f\u00F6r attributet "{1}" som associeras med elementtyp "{0}" \u00E4r inte bundet.
++ EmptyPrefixedAttName = Ogiltigt v\u00E4rde f\u00F6r attributet "{0}". Namnrymdsbindningar som prefix kanske inte \u00E4r tomma.
++ PrefixDeclared = Namnrymdsprefixet "{0}" har inte deklarerats.
+ CantBindXMLNS = Prefixet "xmlns" kan inte bindas till en specifik namnrymd och namnrymden f\u00F6r "xmlns" kan inte heller bindas till ett specifikt prefix.
+ CantBindXML = Prefixet "xml" kan inte bindas till en namnrymd ut\u00F6ver den vanliga och namnrymden f\u00F6r "xml" kan inte heller bindas till n\u00E5got annat prefix \u00E4n "xml".
+- MSG_ATT_DEFAULT_INVALID = defaultValue \"{1}\" f\u00F6r attributet \"{0}\" \u00E4r inte till\u00E5tet vad g\u00E4ller de lexikala begr\u00E4nsningarna f\u00F6r denna attributtyp.
++ MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" f\u00F6r attributet "{0}" \u00E4r inte till\u00E5tet vad g\u00E4ller de lexikala begr\u00E4nsningarna f\u00F6r denna attributtyp.
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +318,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=Parsern har p\u00E5tr\u00E4ffat fler \u00E4n \"{0}\" enhetstill\u00E4gg i dokumentet - applikationens gr\u00E4nsv\u00E4rde har uppn\u00E5tts.
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: Parsern har p\u00E5tr\u00E4ffat fler \u00E4n "{0}" enhetstill\u00E4gg i dokumentet - gr\u00E4nsv\u00E4rdet f\u00F6r JDK har uppn\u00E5tts.
++ ElementAttributeLimit=JAXP00010002: Elementet "{0}" har fler \u00E4n "{1}" attribut, "{1}" \u00E4r gr\u00E4nsv\u00E4rdet f\u00F6r JDK.
++ MaxEntitySizeLimit=JAXP00010003: L\u00E4ngden p\u00E5 enheten "{0}" \u00E4r "{1}" som \u00F6verskriver gr\u00E4nsv\u00E4rdet p\u00E5 "{2}" som anges av "{3}".
++ TotalEntitySizeLimit=JAXP00010004: Den ackumulerade storleken "{0}" f\u00F6r enheter \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}".
++ MaxXMLNameLimit=JAXP00010005: Namnet "{0}" \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}".
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,26 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +44,14 @@
+ InvalidCharInProlog = \u5728\u6587\u6863\u524D\u8A00\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
+ InvalidCharInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
+ # 2.4 Character Data and Markup
+- CDEndInContent = \u9664\u975E\u4F7F\u7528\u5B57\u7B26\u5E8F\u5217 \"]]>\" \u6765\u6807\u8BB0 CDATA \u8282\u7684\u7ED3\u5C3E, \u5426\u5219\u8BE5\u5B57\u7B26\u5E8F\u5217\u4E0D\u80FD\u51FA\u73B0\u5728\u5185\u5BB9\u4E2D\u3002
++ CDEndInContent = \u9664\u975E\u4F7F\u7528\u5B57\u7B26\u5E8F\u5217 "]]>" \u6765\u6807\u8BB0 CDATA \u8282\u7684\u7ED3\u5C3E, \u5426\u5219\u8BE5\u5B57\u7B26\u5E8F\u5217\u4E0D\u80FD\u51FA\u73B0\u5728\u5185\u5BB9\u4E2D\u3002
+ # 2.7 CDATA Sections
+- CDSectUnterminated = CDATA \u8282\u5FC5\u987B\u4EE5 \"]]>\" \u7ED3\u5C3E\u3002
++ CDSectUnterminated = CDATA \u8282\u5FC5\u987B\u4EE5 "]]>" \u7ED3\u5C3E\u3002
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = XML \u58F0\u660E\u53EA\u80FD\u51FA\u73B0\u5728\u6587\u6863\u7684\u6700\u5F00\u5934\u5904\u3002
+- EqRequiredInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D, \"{0}\" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
+- QuoteRequiredInXMLDecl = XML \u58F0\u660E\u4E2D \"{0}\" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
+- XMLDeclUnterminated = XML \u58F0\u660E\u5FC5\u987B\u4EE5 \"?>\" \u7ED3\u5C3E\u3002
++ EqRequiredInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D, "{0}" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
++ QuoteRequiredInXMLDecl = XML \u58F0\u660E\u4E2D "{0}" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
++ XMLDeclUnterminated = XML \u58F0\u660E\u5FC5\u987B\u4EE5 "?>" \u7ED3\u5C3E\u3002
+ VersionInfoRequired = XML \u58F0\u660E\u4E2D\u9700\u8981\u6B64\u7248\u672C\u3002
+ SpaceRequiredBeforeVersionInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u7684\u7248\u672C\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
+ SpaceRequiredBeforeEncodingInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u7684\u7F16\u7801\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
+@@ -71,85 +67,86 @@
+ ReferenceIllegalInTrailingMisc=\u5C3E\u968F\u8282\u4E2D\u4E0D\u5141\u8BB8\u6709\u5F15\u7528\u3002
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = \u72EC\u7ACB\u6587\u6863\u58F0\u660E\u503C\u5FC5\u987B\u4E3A \"\u662F\" \u6216 \"\u5426\", \u4E0D\u80FD\u4E3A \"{0}\"\u3002
++ SDDeclInvalid = \u72EC\u7ACB\u6587\u6863\u58F0\u660E\u503C\u5FC5\u987B\u4E3A "\u662F" \u6216 "\u5426", \u4E0D\u80FD\u4E3A "{0}"\u3002
++ SDDeclNameInvalid = XML \u58F0\u660E\u4E2D\u7684\u72EC\u7ACB\u540D\u79F0\u53EF\u80FD\u62FC\u5199\u6709\u8BEF\u3002
+ # 2.12 Language Identification
+- XMLLangInvalid = xml:lang \u5C5E\u6027\u503C \"{0}\" \u662F\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BC6\u7B26\u3002
++ XMLLangInvalid = xml:lang \u5C5E\u6027\u503C "{0}" \u662F\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BC6\u7B26\u3002
+ # 3. Logical Structures
+- ETagRequired = \u5143\u7D20\u7C7B\u578B \"{0}\" \u5FC5\u987B\u7531\u5339\u914D\u7684\u7ED3\u675F\u6807\u8BB0 \"</{0}>\" \u7EC8\u6B62\u3002
++ ETagRequired = \u5143\u7D20\u7C7B\u578B "{0}" \u5FC5\u987B\u7531\u5339\u914D\u7684\u7ED3\u675F\u6807\u8BB0 "</{0}>" \u7EC8\u6B62\u3002
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = \u5143\u7D20\u7C7B\u578B \"{0}\" \u5FC5\u987B\u540E\u8DDF\u5C5E\u6027\u89C4\u8303 \">\" \u6216 \"/>\"\u3002
+- EqRequiredInAttribute = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684\u5C5E\u6027\u540D \"{1}\" \u5FC5\u987B\u540E\u8DDF '' = '' \u5B57\u7B26\u3002
+- OpenQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684\u5C5E\u6027 \"{1}\" \u5E94\u6709\u5DE6\u5F15\u53F7\u3002
+- CloseQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684\u5C5E\u6027 \"{1}\" \u5E94\u6709\u53F3\u5F15\u53F7\u3002
+- AttributeNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u5C5E\u6027 \"{1}\"\u3002
+- AttributeNSNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u7ED1\u5B9A\u5230\u540D\u79F0\u7A7A\u95F4 \"{2}\" \u7684\u5C5E\u6027 \"{1}\"\u3002
+- ETagUnterminated = \u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u7ED3\u675F\u6807\u8BB0\u5FC5\u987B\u4EE5 ''>'' \u5206\u9694\u7B26\u7ED3\u675F\u3002
++ ElementUnterminated = \u5143\u7D20\u7C7B\u578B "{0}" \u5FC5\u987B\u540E\u8DDF\u5C5E\u6027\u89C4\u8303 ">" \u6216 "/>"\u3002
++ EqRequiredInAttribute = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027\u540D "{1}" \u5FC5\u987B\u540E\u8DDF '' = '' \u5B57\u7B26\u3002
++ OpenQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u5E94\u6709\u5DE6\u5F15\u53F7\u3002
++ CloseQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u5E94\u6709\u53F3\u5F15\u53F7\u3002
++ AttributeNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u5C5E\u6027 "{1}"\u3002
++ AttributeNSNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u7ED1\u5B9A\u5230\u540D\u79F0\u7A7A\u95F4 "{2}" \u7684\u5C5E\u6027 "{1}"\u3002
++ ETagUnterminated = \u5143\u7D20\u7C7B\u578B "{0}" \u7684\u7ED3\u675F\u6807\u8BB0\u5FC5\u987B\u4EE5 ''>'' \u5206\u9694\u7B26\u7ED3\u675F\u3002
+ MarkupNotRecognizedInContent = \u5143\u7D20\u5185\u5BB9\u5FC5\u987B\u7531\u683C\u5F0F\u6B63\u786E\u7684\u5B57\u7B26\u6570\u636E\u6216\u6807\u8BB0\u7EC4\u6210\u3002
+ DoctypeIllegalInContent = \u5185\u5BB9\u4E2D\u4E0D\u5141\u8BB8\u6709 DOCTYPE\u3002
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = \u5F15\u7528\u5FC5\u987B\u4EE5 ';' \u5206\u9694\u7B26\u7EC8\u6B62\u3002
+ # 4.3.2 Well-Formed Parsed Entities
+- ReferenceNotInOneEntity = \u5F15\u7528\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u5185\u3002
+- ElementEntityMismatch = \u5143\u7D20 \"{0}\" \u5FC5\u987B\u4ECE\u5934\u81F3\u5C3E\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
++ ReferenceNotInOneEntity = \u5F15\u7528\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u89E3\u6790\u5B9E\u4F53\u5185\u3002
++ ElementEntityMismatch = \u5143\u7D20 "{0}" \u5FC5\u987B\u4ECE\u5934\u81F3\u5C3E\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
+ MarkupEntityMismatch=XML \u6587\u6863\u7ED3\u6784\u5FC5\u987B\u4ECE\u5934\u81F3\u5C3E\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = \u5728 \"{1}\" \u5C5E\u6027\u503C\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{2}), \u5E76\u4E14\u5143\u7D20\u4E3A \"{0}\"\u3002
++ InvalidCharInAttValue = \u5728 "{1}" \u5C5E\u6027\u503C\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{2}), \u5E76\u4E14\u5143\u7D20\u4E3A "{0}"\u3002
+ InvalidCharInComment = \u5728\u6CE8\u91CA\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
+ InvalidCharInPI = \u5728\u5904\u7406\u6307\u4EE4\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
+ InvalidCharInInternalSubset = \u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
+ InvalidCharInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = \"{1}\" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5355\u5F15\u53F7\u5B57\u7B26\u6216\u53CC\u5F15\u53F7\u5B57\u7B26\u5F00\u5934\u3002
+- LessthanInAttValue = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684 \"{1}\" \u5C5E\u6027\u503C\u4E0D\u80FD\u5305\u542B ''<'' \u5B57\u7B26\u3002
+- AttributeValueUnterminated = \"{1}\" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5339\u914D\u7684\u5F15\u53F7\u5B57\u7B26\u7ED3\u5C3E\u3002
++ QuoteRequiredInAttValue = "{1}" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5355\u5F15\u53F7\u5B57\u7B26\u6216\u53CC\u5F15\u53F7\u5B57\u7B26\u5F00\u5934\u3002
++ LessthanInAttValue = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684 "{1}" \u5C5E\u6027\u503C\u4E0D\u80FD\u5305\u542B ''<'' \u5B57\u7B26\u3002
++ AttributeValueUnterminated = "{1}" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5339\u914D\u7684\u5F15\u53F7\u5B57\u7B26\u7ED3\u5C3E\u3002
+ # 2.5 Comments
+- InvalidCommentStart = \u6CE8\u91CA\u5FC5\u987B\u4EE5 \"<!--\" \u5F00\u5934\u3002
+- DashDashInComment = \u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u51FA\u73B0\u5B57\u7B26\u4E32 \"--\"\u3002
+- CommentUnterminated = \u6CE8\u91CA\u5FC5\u987B\u4EE5 \"-->\" \u7ED3\u5C3E\u3002
++ InvalidCommentStart = \u6CE8\u91CA\u5FC5\u987B\u4EE5 "<!--" \u5F00\u5934\u3002
++ DashDashInComment = \u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u51FA\u73B0\u5B57\u7B26\u4E32 "--"\u3002
++ CommentUnterminated = \u6CE8\u91CA\u5FC5\u987B\u4EE5 "-->" \u7ED3\u5C3E\u3002
+ COMMENT_NOT_IN_ONE_ENTITY = \u6CE8\u91CA\u6CA1\u6709\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
+ # 2.6 Processing Instructions
+ PITargetRequired = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u4EE5\u76EE\u6807\u540D\u79F0\u5F00\u5934\u3002
+ SpaceRequiredInPI = \u5728\u5904\u7406\u6307\u4EE4\u76EE\u6807\u548C\u6570\u636E\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+- PIUnterminated = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u4EE5 \"?>\" \u7ED3\u5C3E\u3002
+- ReservedPITarget = \u4E0D\u5141\u8BB8\u6709\u5339\u914D \"[xX][mM][lL]\" \u7684\u5904\u7406\u6307\u4EE4\u76EE\u6807\u3002
++ PIUnterminated = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u4EE5 "?>" \u7ED3\u5C3E\u3002
++ ReservedPITarget = \u4E0D\u5141\u8BB8\u6709\u5339\u914D "[xX][mM][lL]" \u7684\u5904\u7406\u6307\u4EE4\u76EE\u6807\u3002
+ PI_NOT_IN_ONE_ENTITY = \u5904\u7406\u6307\u4EE4\u6CA1\u6709\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = \u7248\u672C \"{0}\" \u65E0\u6548\u3002
+- VersionNotSupported = \u4E0D\u652F\u6301 XML \u7248\u672C \"{0}\", \u53EA\u652F\u6301 XML 1.0\u3002
+- VersionNotSupported11 = \u4E0D\u652F\u6301 XML \u7248\u672C \"{0}\", \u53EA\u652F\u6301 XML 1.0 \u548C XML 1.1\u3002
++ VersionInfoInvalid = \u7248\u672C "{0}" \u65E0\u6548\u3002
++ VersionNotSupported = \u4E0D\u652F\u6301 XML \u7248\u672C "{0}", \u53EA\u652F\u6301 XML 1.0\u3002
++ VersionNotSupported11 = \u4E0D\u652F\u6301 XML \u7248\u672C "{0}", \u53EA\u652F\u6301 XML 1.0 \u548C XML 1.1\u3002
+ VersionMismatch= \u5B9E\u4F53\u4E0D\u80FD\u5305\u542B\u8F83\u9AD8\u7248\u672C\u7684\u53E6\u4E00\u4E2A\u5B9E\u4F53\u3002
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 \"&#\" \u540E\u9762\u3002
+- HexdigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u516D\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 \"&#x\" \u540E\u9762\u3002
++ DigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 "&#" \u540E\u9762\u3002
++ HexdigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u516D\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 "&#x" \u540E\u9762\u3002
+ SemicolonRequiredInCharRef = \u5B57\u7B26\u5F15\u7528\u5FC5\u987B\u4EE5 ';' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
+- InvalidCharRef = \u5B57\u7B26\u5F15\u7528 \"&#{0}\" \u662F\u65E0\u6548\u7684 XML \u5B57\u7B26\u3002
++ InvalidCharRef = \u5B57\u7B26\u5F15\u7528 "&#{0}" \u662F\u65E0\u6548\u7684 XML \u5B57\u7B26\u3002
+ NameRequiredInReference = \u5728\u5B9E\u4F53\u5F15\u7528\u4E2D, \u5B9E\u4F53\u540D\u79F0\u5FC5\u987B\u7D27\u8DDF\u5728 '&' \u540E\u9762\u3002
+- SemicolonRequiredInReference = \u5BF9\u5B9E\u4F53 \"{0}\" \u7684\u5F15\u7528\u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
++ SemicolonRequiredInReference = \u5BF9\u5B9E\u4F53 "{0}" \u7684\u5F15\u7528\u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
+ # 4.3.1 The Text Declaration
+- TextDeclMustBeFirst = \u6587\u672C\u58F0\u660E\u53EA\u80FD\u51FA\u73B0\u5728\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u7684\u6700\u5F00\u5934\u5904\u3002
+- EqRequiredInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D, \"{0}\" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
+- QuoteRequiredInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D \"{0}\" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
+- CloseQuoteMissingInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D \"{0}\" \u540E\u9762\u8DDF\u968F\u7684\u503C\u7F3A\u5C11\u53F3\u5F15\u53F7\u3002
++ TextDeclMustBeFirst = \u6587\u672C\u58F0\u660E\u53EA\u80FD\u51FA\u73B0\u5728\u5DF2\u89E3\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u7684\u6700\u5F00\u5934\u5904\u3002
++ EqRequiredInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D, "{0}" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
++ QuoteRequiredInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D "{0}" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
++ CloseQuoteMissingInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D "{0}" \u540E\u9762\u8DDF\u968F\u7684\u503C\u7F3A\u5C11\u53F3\u5F15\u53F7\u3002
+ SpaceRequiredBeforeVersionInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D\u7684\u7248\u672C\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
+ SpaceRequiredBeforeEncodingInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D\u7684\u7F16\u7801\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
+- TextDeclUnterminated = \u6587\u672C\u58F0\u660E\u5FC5\u987B\u4EE5 \"?>\" \u7ED3\u5C3E\u3002
++ TextDeclUnterminated = \u6587\u672C\u58F0\u660E\u5FC5\u987B\u4EE5 "?>" \u7ED3\u5C3E\u3002
+ EncodingDeclRequired = \u6587\u672C\u58F0\u660E\u4E2D\u9700\u8981\u7F16\u7801\u58F0\u660E\u3002
+ NoMorePseudoAttributes = \u4E0D\u5141\u8BB8\u4F7F\u7528\u66F4\u591A\u7684\u4F2A\u5C5E\u6027\u3002
+ MorePseudoAttributes = \u5E94\u8BE5\u6709\u66F4\u591A\u7684\u4F2A\u5C5E\u6027\u3002
+ PseudoAttrNameExpected = \u5E94\u8BE5\u6709\u4F2A\u5C5E\u6027\u540D\u3002
+ # 4.3.2 Well-Formed Parsed Entities
+- CommentNotInOneEntity = \u6CE8\u91CA\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u5185\u3002
+- PINotInOneEntity = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u5185\u3002
++ CommentNotInOneEntity = \u6CE8\u91CA\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u89E3\u6790\u5B9E\u4F53\u5185\u3002
++ PINotInOneEntity = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u89E3\u6790\u5B9E\u4F53\u5185\u3002
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = \u7F16\u7801\u540D\u79F0 \"{0}\" \u65E0\u6548\u3002
+- EncodingByteOrderUnsupported = \u4E0D\u652F\u6301\u7F16\u7801 \"{0}\" \u7684\u7ED9\u5B9A\u5B57\u8282\u987A\u5E8F\u3002
++ EncodingDeclInvalid = \u7F16\u7801\u540D\u79F0 "{0}" \u65E0\u6548\u3002
++ EncodingByteOrderUnsupported = \u4E0D\u652F\u6301\u7F16\u7801 "{0}" \u7684\u7ED9\u5B9A\u5B57\u8282\u987A\u5E8F\u3002
+ InvalidByte = {1} \u5B57\u8282\u7684 UTF-8 \u5E8F\u5217\u7684\u5B57\u8282 {0} \u65E0\u6548\u3002
+ ExpectedByte = \u5E94\u4E3A {1} \u5B57\u8282\u7684 UTF-8 \u5E8F\u5217\u7684\u5B57\u8282 {0}\u3002
+ InvalidHighSurrogate = UTF-8 \u5E8F\u5217\u4E2D\u7684\u9AD8\u4EE3\u7406\u4F4D\u4E0D\u80FD\u8D85\u8FC7 0x10, \u4F46\u627E\u5230 0x{0}\u3002
+- OperationNotSupported = {1}\u8BFB\u8FDB\u7A0B\u4E0D\u652F\u6301\u64CD\u4F5C \"{0}\"\u3002
+- InvalidASCII = \u5B57\u8282 \"{0}\" \u4E0D\u662F (7 \u4F4D) ASCII \u5B57\u7B26\u96C6\u7684\u6210\u5458\u3002
++ OperationNotSupported = {1}\u8BFB\u8FDB\u7A0B\u4E0D\u652F\u6301\u64CD\u4F5C "{0}"\u3002
++ InvalidASCII = \u5B57\u8282 "{0}" \u4E0D\u662F (7 \u4F4D) ASCII \u5B57\u7B26\u96C6\u7684\u6210\u5458\u3002
+ CharConversionFailure = \u786E\u5B9A\u5C5E\u4E8E\u67D0\u4E2A\u7F16\u7801\u7684\u5B9E\u4F53\u4E0D\u80FD\u5305\u542B\u5728\u8BE5\u7F16\u7801\u4E2D\u975E\u6CD5\u7684\u5E8F\u5217\u3002
+
+ # DTD Messages
+@@ -169,150 +166,150 @@
+ PubidCharIllegal = \u516C\u5171\u6807\u8BC6\u7B26\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u8BE5\u5B57\u7B26 (Unicode: 0x{0})\u3002
+ SpaceRequiredBetweenPublicAndSystem = \u5728 publicId \u548C systemId \u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 \"<!DOCTYPE\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D, \u6839\u5143\u7D20\u7C7B\u578B\u5FC5\u987B\u51FA\u73B0\u5728 \"<!DOCTYPE\" \u540E\u9762\u3002
+- DoctypedeclUnterminated = \u6839\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u6587\u6863\u7C7B\u578B\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
+- PEReferenceWithinMarkup = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 \"%{0};\" \u4E0D\u80FD\u51FA\u73B0\u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u7684\u6807\u8BB0\u5185\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 "<!DOCTYPE" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D, \u6839\u5143\u7D20\u7C7B\u578B\u5FC5\u987B\u51FA\u73B0\u5728 "<!DOCTYPE" \u540E\u9762\u3002
++ DoctypedeclUnterminated = \u6839\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u6587\u6863\u7C7B\u578B\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
++ PEReferenceWithinMarkup = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};" \u4E0D\u80FD\u51FA\u73B0\u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u7684\u6807\u8BB0\u5185\u3002
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u6863\u7C7B\u578B\u58F0\u660E\u5305\u542B\u6216\u6307\u5411\u7684\u6807\u8BB0\u58F0\u660E\u5FC5\u987B\u683C\u5F0F\u6B63\u786E\u3002
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = \"xml:space\" \u7684\u5C5E\u6027\u58F0\u660E\u5FC5\u987B\u6307\u5B9A\u4E3A\u679A\u4E3E\u7C7B\u578B, \u5B83\u7684\u53EF\u80FD\u503C\u53EA\u6709 \"default\" \u548C \"preserve\"\u3002
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space" \u7684\u5C5E\u6027\u58F0\u660E\u5FC5\u987B\u6307\u5B9A\u4E3A\u679A\u4E3E\u7C7B\u578B, \u5B83\u7684\u53EF\u80FD\u503C\u53EA\u6709 "default" \u548C "preserve"\u3002
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 \"<!ELEMENT\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 "<!ELEMENT" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B \"{0}\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B \"{0}\" \u540E\u9762\u9700\u8981\u6709\u7EA6\u675F\u6761\u4EF6\u3002
+- ElementDeclUnterminated = \u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B "{0}" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B "{0}" \u540E\u9762\u9700\u8981\u6709\u7EA6\u675F\u6761\u4EF6\u3002
++ ElementDeclUnterminated = \u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 ''('' \u5B57\u7B26\u6216\u5143\u7D20\u7C7B\u578B\u3002
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 ''('' \u5B57\u7B26\u6216\u5143\u7D20\u7C7B\u578B\u3002
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5728\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5728\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
+- MixedContentUnterminated = \u5F53\u5B50\u5143\u7D20\u7C7B\u578B\u53D7\u7EA6\u675F\u65F6, \u6DF7\u5408\u5185\u5BB9\u6A21\u578B \"{0}\" \u5FC5\u987B\u4EE5 \")*\" \u7ED3\u5C3E\u3002
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
++ MixedContentUnterminated = \u5F53\u5B50\u5143\u7D20\u7C7B\u578B\u53D7\u7EA6\u675F\u65F6, \u6DF7\u5408\u5185\u5BB9\u6A21\u578B "{0}" \u5FC5\u987B\u4EE5 ")*" \u7ED3\u5C3E\u3002
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684 \"<!ATTLIST\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684 "<!ATTLIST" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = \u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684\u5C5E\u6027\u540D\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+- AttNameRequiredInAttDef = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u5FC5\u987B\u6307\u5B9A\u5C5E\u6027\u540D\u3002
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{1}\" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u7C7B\u578B\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+- AttTypeRequiredInAttDef = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{1}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5C5E\u6027\u7C7B\u578B\u3002
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{1}\" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u9ED8\u8BA4\u503C\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u4E3A\u6307\u5B9A\u5143\u7D20 \"{0}\" \u7684\u540C\u4E00\u5C5E\u6027 \"{1}\" \u63D0\u4F9B\u4E86\u591A\u4E2A\u5C5E\u6027\u5B9A\u4E49\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684\u5C5E\u6027\u540D\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ AttNameRequiredInAttDef = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u5FC5\u987B\u6307\u5B9A\u5C5E\u6027\u540D\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{1}" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u7C7B\u578B\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ AttTypeRequiredInAttDef = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{1}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5C5E\u6027\u7C7B\u578B\u3002
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{1}" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u9ED8\u8BA4\u503C\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u4E3A\u6307\u5B9A\u5143\u7D20 "{0}" \u7684\u540C\u4E00\u5C5E\u6027 "{1}" \u63D0\u4F9B\u4E86\u591A\u4E2A\u5C5E\u6027\u5B9A\u4E49\u3002
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 \"NOTATION\" \u540E\u9762\u3002
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \"NOTATION\" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 ''('' \u5B57\u7B26\u3002
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
+- NotationTypeUnterminated = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u7684\u679A\u4E3E\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u540D\u79F0\u6807\u8BB0\u3002
+- EnumerationUnterminated = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \u679A\u4E3E\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{2}\" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C \"{1}\" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A\u679A\u4E3E\u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NMTOKENS \u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{2}\" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C \"{1}\" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A NotationType \u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NOTATION \u540D\u79F0\u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 "NOTATION" \u540E\u9762\u3002
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, "NOTATION" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 ''('' \u5B57\u7B26\u3002
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
++ NotationTypeUnterminated = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u7684\u679A\u4E3E\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u540D\u79F0\u6807\u8BB0\u3002
++ EnumerationUnterminated = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u679A\u4E3E\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{2}" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C "{1}" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A\u679A\u4E3E\u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NMTOKENS \u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{2}" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C "{1}" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A NotationType \u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NOTATION \u540D\u79F0\u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 \"FIXED\" \u540E\u9762\u3002
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 "FIXED" \u540E\u9762\u3002
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = \u5305\u542B\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 \"]]>\" \u7ED3\u5C3E\u3002
+- IgnoreSectUnterminated = \u6392\u9664\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 \"]]>\" \u7ED3\u5C3E\u3002
++ IncludeSectUnterminated = \u5305\u542B\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 "]]>" \u7ED3\u5C3E\u3002
++ IgnoreSectUnterminated = \u6392\u9664\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 "]]>" \u7ED3\u5C3E\u3002
+ # 4.1 Character and Entity References
+ NameRequiredInPEReference = \u5728\u53C2\u6570\u5B9E\u4F53\u5F15\u7528\u4E2D, \u5B9E\u4F53\u540D\u79F0\u5FC5\u987B\u7D27\u8DDF\u5728 '%' \u540E\u9762\u3002
+- SemicolonRequiredInPEReference = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 \"%{0};\" \u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
++ SemicolonRequiredInPEReference = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};" \u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 \"<!ENTITY\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C2\u6570\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 \"<!ENTITY\" \u548C '%' \u5B57\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 "<!ENTITY" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C2\u6570\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 "<!ENTITY" \u548C '%' \u5B57\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u5728\u53C2\u6570\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 '%' \u548C\u5B9E\u4F53\u540D\u79F0\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u5B9E\u4F53\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5B9E\u4F53\u540D\u79F0\u3002
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684\u5B9E\u4F53\u540D\u79F0 \"{0}\" \u548C\u5B9A\u4E49\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 \"{0}\" \u7684\u58F0\u660E\u4E2D\u7684 \"NDATA\" \u548C\u8BB0\u53F7\u540D\u79F0\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 \"{0}\" \u7684\u58F0\u660E\u4E2D\u7684 \"NDATA\" \u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 \"{0}\" \u7684\u58F0\u660E\u4E2D\u7684 \"NDATA\" \u540E\u9762\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
+- EntityDeclUnterminated = \u5B9E\u4F53 \"{0}\" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
+- MSG_DUPLICATE_ENTITY_DEFINITION = \u5B9E\u4F53 \"{0}\" \u58F0\u660E\u4E86\u591A\u6B21\u3002
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684\u5B9E\u4F53\u540D\u79F0 "{0}" \u548C\u5B9A\u4E49\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u4E2D\u7684 "NDATA" \u548C\u8BB0\u53F7\u540D\u79F0\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u4E2D\u7684 "NDATA" \u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u4E2D\u7684 "NDATA" \u540E\u9762\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
++ EntityDeclUnterminated = \u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
++ MSG_DUPLICATE_ENTITY_DEFINITION = \u5B9E\u4F53 "{0}" \u58F0\u660E\u4E86\u591A\u6B21\u3002
+ # 4.2.2 External Entities
+- ExternalIDRequired = \u5916\u90E8\u5B9E\u4F53\u58F0\u660E\u5FC5\u987B\u4EE5 \"SYSTEM\" \u6216 \"PUBLIC\" \u5F00\u5934\u3002
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u5728 \"PUBLIC\" \u548C\u516C\u5171\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
++ ExternalIDRequired = \u5916\u90E8\u5B9E\u4F53\u58F0\u660E\u5FC5\u987B\u4EE5 "SYSTEM" \u6216 "PUBLIC" \u5F00\u5934\u3002
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u5728 "PUBLIC" \u548C\u516C\u5171\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u5728\u516C\u5171\u6807\u8BC6\u7B26\u548C\u7CFB\u7EDF\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u5728 \"SYSTEM\" \u548C\u7CFB\u7EDF\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
+- MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5\u6807\u8BC6\u7B26\u4E0D\u80FD\u6307\u5B9A\u4E3A\u7CFB\u7EDF\u6807\u8BC6\u7B26 \"{0}\" \u7684\u4E00\u90E8\u5206\u3002
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u5728 "SYSTEM" \u548C\u7CFB\u7EDF\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5\u6807\u8BC6\u7B26\u4E0D\u80FD\u6307\u5B9A\u4E3A\u7CFB\u7EDF\u6807\u8BC6\u7B26 "{0}" \u7684\u4E00\u90E8\u5206\u3002
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684 \"<!NOTATION\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684 "<!NOTATION" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \u8BB0\u53F7\u58F0\u660E\u4E2D\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684\u8BB0\u53F7\u540D\u79F0 \"{0}\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
+- ExternalIDorPublicIDRequired = \u8BB0\u53F7 \"{0}\" \u7684\u58F0\u660E\u5FC5\u987B\u5305\u542B\u7CFB\u7EDF\u6807\u8BC6\u7B26\u6216\u516C\u5171\u6807\u8BC6\u7B26\u3002
+- NotationDeclUnterminated = \u8BB0\u53F7 \"{0}\" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684\u8BB0\u53F7\u540D\u79F0 "{0}" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
++ ExternalIDorPublicIDRequired = \u8BB0\u53F7 "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u5305\u542B\u7CFB\u7EDF\u6807\u8BC6\u7B26\u6216\u516C\u5171\u6807\u8BC6\u7B26\u3002
++ NotationDeclUnterminated = \u8BB0\u53F7 "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
+
+ # Validation messages
+- DuplicateTypeInMixedContent = \u5728\u5143\u7D20\u58F0\u660E \"{0}\" \u7684\u5185\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7ECF\u6307\u5B9A\u4E86\u5143\u7D20\u7C7B\u578B \"{1}\"\u3002
+- ENTITIESInvalid = \u7C7B\u578B\u4E3A ENTITIES \u7684\u5C5E\u6027\u503C \"{1}\" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u7684\u540D\u79F0\u3002
+- ENTITYInvalid = \u7C7B\u578B\u4E3A ENTITY \u7684\u5C5E\u6027\u503C \"{1}\" \u5FC5\u987B\u662F\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u7684\u540D\u79F0\u3002
+- IDDefaultTypeInvalid = ID \u5C5E\u6027 \"{0}\" \u5FC5\u987B\u5177\u6709\u5DF2\u58F0\u660E\u7684\u9ED8\u8BA4\u503C \"#IMPLIED\" \u6216 \"#REQUIRED\"\u3002
+- IDInvalid = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u540D\u79F0\u3002
+- IDInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F NCName\u3002
+- IDNotUnique = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C \"{0}\" \u5728\u6587\u6863\u5185\u5FC5\u987B\u662F\u552F\u4E00\u7684\u3002
+- IDREFInvalid = \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u540D\u79F0\u3002
+- IDREFInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F NCName\u3002
+- IDREFSInvalid = \u7C7B\u578B\u4E3A IDREFS \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u3002
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u5F53\u5B9E\u4F53\u5F15\u7528\u7528\u4F5C\u5B8C\u6574\u58F0\u660E\u65F6, \u53C2\u6570\u5B9E\u4F53 \"{0}\" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
+- ImproperDeclarationNesting = \u53C2\u6570\u5B9E\u4F53 \"{0}\" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
+- ImproperGroupNesting = \u53C2\u6570\u5B9E\u4F53 \"{0}\" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u62EC\u53F7\u5BF9\u3002
+- INVALID_PE_IN_CONDITIONAL = \u53C2\u6570\u5B9E\u4F53 \"{0}\" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6574\u4E2A\u6761\u4EF6\u8282, \u6216\u8005\u4EC5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
+- MSG_ATTRIBUTE_NOT_DECLARED = \u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B \"{0}\" \u58F0\u660E\u5C5E\u6027 \"{1}\"\u3002
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u503C\u4E3A \"{1}\" \u7684\u5C5E\u6027 \"{0}\" \u5FC5\u987B\u5177\u6709\u5217\u8868 \"{2}\" \u4E2D\u7684\u503C\u3002
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D, \u5C5E\u6027 \"{0}\" \u7684\u503C \"{1}\" \u4E0D\u80FD\u901A\u8FC7\u89C4\u8303\u5316\u8FDB\u884C\u66F4\u6539 (\u66F4\u6539\u4E3A \"{2}\")\u3002
+- MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u7C7B\u578B\u4E3A \"{0}\" \u7684\u5185\u5BB9\u4E0D\u5B8C\u6574, \u5B83\u5FC5\u987B\u5339\u914D \"{1}\"\u3002
+- MSG_CONTENT_INVALID = \u5143\u7D20\u7C7B\u578B\u4E3A \"{0}\" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D \"{1}\"\u3002
+- MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A \"{0}\" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D \"{1}\"\u3002\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A \"{2}\" \u7684\u5B50\u7EA7\u3002
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A \"{0}\" \u7684\u5C5E\u6027 \"{1}\" \u5177\u6709\u9ED8\u8BA4\u503C, \u5E76\u4E14\u5FC5\u987B\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u6307\u5B9A\u3002
+- MSG_DUPLICATE_ATTDEF = \u5DF2\u7ECF\u4E3A\u5143\u7D20\u7C7B\u578B \"{0}\" \u58F0\u660E\u5C5E\u6027 \"{1}\"\u3002
+- MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u7C7B\u578B \"{0}\" \u4E0D\u80FD\u58F0\u660E\u591A\u6B21\u3002
+- MSG_ELEMENT_NOT_DECLARED = \u5FC5\u987B\u58F0\u660E\u5143\u7D20\u7C7B\u578B \"{0}\"\u3002
++ DuplicateTypeInMixedContent = \u5728\u5143\u7D20\u58F0\u660E "{0}" \u7684\u5185\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7ECF\u6307\u5B9A\u4E86\u5143\u7D20\u7C7B\u578B "{1}"\u3002
++ ENTITIESInvalid = \u7C7B\u578B\u4E3A ENTITIES \u7684\u5C5E\u6027\u503C "{1}" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u672A\u89E3\u6790\u5B9E\u4F53\u7684\u540D\u79F0\u3002
++ ENTITYInvalid = \u7C7B\u578B\u4E3A ENTITY \u7684\u5C5E\u6027\u503C "{1}" \u5FC5\u987B\u662F\u672A\u89E3\u6790\u5B9E\u4F53\u7684\u540D\u79F0\u3002
++ IDDefaultTypeInvalid = ID \u5C5E\u6027 "{0}" \u5FC5\u987B\u5177\u6709\u5DF2\u58F0\u660E\u7684\u9ED8\u8BA4\u503C "#IMPLIED" \u6216 "#REQUIRED"\u3002
++ IDInvalid = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u540D\u79F0\u3002
++ IDInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F NCName\u3002
++ IDNotUnique = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C "{0}" \u5728\u6587\u6863\u5185\u5FC5\u987B\u662F\u552F\u4E00\u7684\u3002
++ IDREFInvalid = \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u540D\u79F0\u3002
++ IDREFInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F NCName\u3002
++ IDREFSInvalid = \u7C7B\u578B\u4E3A IDREFS \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u3002
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u5F53\u5B9E\u4F53\u5F15\u7528\u7528\u4F5C\u5B8C\u6574\u58F0\u660E\u65F6, \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
++ ImproperDeclarationNesting = \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
++ ImproperGroupNesting = \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u62EC\u53F7\u5BF9\u3002
++ INVALID_PE_IN_CONDITIONAL = \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6574\u4E2A\u6761\u4EF6\u8282, \u6216\u8005\u4EC5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
++ MSG_ATTRIBUTE_NOT_DECLARED = \u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B "{0}" \u58F0\u660E\u5C5E\u6027 "{1}"\u3002
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u503C\u4E3A "{1}" \u7684\u5C5E\u6027 "{0}" \u5FC5\u987B\u5177\u6709\u5217\u8868 "{2}" \u4E2D\u7684\u503C\u3002
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D, \u5C5E\u6027 "{0}" \u7684\u503C "{1}" \u4E0D\u80FD\u901A\u8FC7\u89C4\u8303\u5316\u8FDB\u884C\u66F4\u6539 (\u66F4\u6539\u4E3A "{2}")\u3002
++ MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5185\u5BB9\u4E0D\u5B8C\u6574, \u5B83\u5FC5\u987B\u5339\u914D "{1}"\u3002
++ MSG_CONTENT_INVALID = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D "{1}"\u3002
++ MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D "{1}"\u3002\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A "{2}" \u7684\u5B50\u7EA7\u3002
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5C5E\u6027 "{1}" \u5177\u6709\u9ED8\u8BA4\u503C, \u5E76\u4E14\u5FC5\u987B\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u6307\u5B9A\u3002
++ MSG_DUPLICATE_ATTDEF = \u5DF2\u7ECF\u4E3A\u5143\u7D20\u7C7B\u578B "{0}" \u58F0\u660E\u5C5E\u6027 "{1}"\u3002
++ MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u7C7B\u578B "{0}" \u4E0D\u80FD\u58F0\u660E\u591A\u6B21\u3002
++ MSG_ELEMENT_NOT_DECLARED = \u5FC5\u987B\u58F0\u660E\u5143\u7D20\u7C7B\u578B "{0}"\u3002
+ MSG_GRAMMAR_NOT_FOUND = \u6587\u6863\u65E0\u6548: \u627E\u4E0D\u5230\u8BED\u6CD5\u3002
+- MSG_ELEMENT_WITH_ID_REQUIRED = \u6587\u6863\u4E2D\u5FC5\u987B\u5305\u542B\u6807\u8BC6\u7B26\u4E3A \"{0}\" \u7684\u5143\u7D20\u3002
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5916\u90E8\u5B9E\u4F53 \"{0}\"\u3002
+- MSG_FIXED_ATTVALUE_INVALID = \u503C\u4E3A \"{2}\" \u7684\u5C5E\u6027 \"{1}\" \u5FC5\u987B\u5177\u6709 \"{3}\" \u7684\u503C\u3002
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B \"{0}\" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027 \"{1}\", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A ID \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 \"{2}\"\u3002
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B \"{0}\" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 \"{1}\", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A NOTATION \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 \"{2}\"\u3002
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5728\u5C5E\u6027 \"{0}\" \u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u5F15\u7528\u8BB0\u53F7 \"{1}\" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u5728 \"{0}\" \u7684\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u58F0\u660E\u4E2D\u5F15\u7528\u8BB0\u53F7 \"{1}\" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5B9E\u4F53 \"{0}\"\u3002
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u9700\u8981\u5C5E\u6027 \"{1}\", \u5E76\u4E14\u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B \"{0}\" \u6307\u5B9A\u8BE5\u5C5E\u6027\u3002
+- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5BF9\u4E8E\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u5177\u6709\u5143\u7D20\u5185\u5BB9\u7684\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5916\u90E8\u5B9E\u4F53, \u5728\u8BE5\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5143\u7D20\u4E4B\u95F4\u4E0D\u80FD\u51FA\u73B0\u7A7A\u683C\u3002
+- NMTOKENInvalid = \u7C7B\u578B\u4E3A NMTOKEN \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u540D\u79F0\u6807\u8BB0\u3002
+- NMTOKENSInvalid = \u7C7B\u578B\u4E3A NMTOKENS \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u6807\u8BB0\u3002
+- NoNotationOnEmptyElement = \u5DF2\u58F0\u660E\u4E3A EMPTY \u7684\u5143\u7D20\u7C7B\u578B \"{0}\" \u4E0D\u80FD\u58F0\u660E\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 \"{1}\"\u3002
+- RootElementTypeMustMatchDoctypedecl = \u6587\u6863\u6839\u5143\u7D20 \"{1}\" \u5FC5\u987B\u5339\u914D DOCTYPE \u6839 \"{0}\"\u3002
+- UndeclaredElementInContentSpec = \u5143\u7D20 \"{0}\" \u7684\u5185\u5BB9\u6A21\u578B\u5F15\u7528\u672A\u58F0\u660E\u7684\u5143\u7D20 \"{1}\"\u3002
+- UniqueNotationName = \u8BB0\u53F7 \"{0}\" \u7684\u58F0\u660E\u4E0D\u662F\u552F\u4E00\u7684\u3002\u4E0D\u80FD\u5728\u591A\u4E2A\u8BB0\u53F7\u58F0\u660E\u4E2D\u58F0\u660E\u6307\u5B9A\u7684\u540D\u79F0\u3002
++ MSG_ELEMENT_WITH_ID_REQUIRED = \u6587\u6863\u4E2D\u5FC5\u987B\u5305\u542B\u6807\u8BC6\u7B26\u4E3A "{0}" \u7684\u5143\u7D20\u3002
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5916\u90E8\u5B9E\u4F53 "{0}"\u3002
++ MSG_FIXED_ATTVALUE_INVALID = \u503C\u4E3A "{2}" \u7684\u5C5E\u6027 "{1}" \u5FC5\u987B\u5177\u6709 "{3}" \u7684\u503C\u3002
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B "{0}" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027 "{1}", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A ID \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 "{2}"\u3002
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B "{0}" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 "{1}", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A NOTATION \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 "{2}"\u3002
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5728\u5C5E\u6027 "{0}" \u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u5F15\u7528\u8BB0\u53F7 "{1}" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u5728 "{0}" \u7684\u672A\u89E3\u6790\u5B9E\u4F53\u58F0\u660E\u4E2D\u5F15\u7528\u8BB0\u53F7 "{1}" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5DF2\u89E3\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5B9E\u4F53 "{0}"\u3002
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u9700\u8981\u5C5E\u6027 "{1}", \u5E76\u4E14\u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B "{0}" \u6307\u5B9A\u8BE5\u5C5E\u6027\u3002
++ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5BF9\u4E8E\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u5177\u6709\u5143\u7D20\u5185\u5BB9\u7684\u5DF2\u89E3\u6790\u7684\u5916\u90E8\u5B9E\u4F53, \u5728\u8BE5\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5143\u7D20\u4E4B\u95F4\u4E0D\u80FD\u51FA\u73B0\u7A7A\u683C\u3002
++ NMTOKENInvalid = \u7C7B\u578B\u4E3A NMTOKEN \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u540D\u79F0\u6807\u8BB0\u3002
++ NMTOKENSInvalid = \u7C7B\u578B\u4E3A NMTOKENS \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u6807\u8BB0\u3002
++ NoNotationOnEmptyElement = \u5DF2\u58F0\u660E\u4E3A EMPTY \u7684\u5143\u7D20\u7C7B\u578B "{0}" \u4E0D\u80FD\u58F0\u660E\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 "{1}"\u3002
++ RootElementTypeMustMatchDoctypedecl = \u6587\u6863\u6839\u5143\u7D20 "{1}" \u5FC5\u987B\u5339\u914D DOCTYPE \u6839 "{0}"\u3002
++ UndeclaredElementInContentSpec = \u5143\u7D20 "{0}" \u7684\u5185\u5BB9\u6A21\u578B\u5F15\u7528\u672A\u58F0\u660E\u7684\u5143\u7D20 "{1}"\u3002
++ UniqueNotationName = \u8BB0\u53F7 "{0}" \u7684\u58F0\u660E\u4E0D\u662F\u552F\u4E00\u7684\u3002\u4E0D\u80FD\u5728\u591A\u4E2A\u8BB0\u53F7\u58F0\u660E\u4E2D\u58F0\u660E\u6307\u5B9A\u7684\u540D\u79F0\u3002
+ ENTITYFailedInitializeGrammar = ENTITYDatatype \u9A8C\u8BC1\u7A0B\u5E8F: \u672A\u80FD\u4F7F\u7528\u6709\u6548\u7684\u8BED\u6CD5\u5F15\u7528\u8C03\u7528\u521D\u59CB\u5316\u65B9\u6CD5\u3002\t
+- ENTITYNotUnparsed = ENTITY \"{0}\" \u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u3002
+- ENTITYNotValid = ENTITY \"{0}\" \u65E0\u6548\u3002
++ ENTITYNotUnparsed = ENTITY "{0}" \u4E0D\u662F\u672A\u89E3\u6790\u7684\u3002
++ ENTITYNotValid = ENTITY "{0}" \u65E0\u6548\u3002
+ EmptyList = \u7C7B\u578B\u4E3A ENTITIES, IDREFS \u548C NMTOKENS \u7684\u503C\u4E0D\u80FD\u662F\u7A7A\u5217\u8868\u3002
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = \u5C5E\u6027\u503C\u4E2D\u4E0D\u5141\u8BB8\u91C7\u7528\u5916\u90E8\u5B9E\u4F53\u5F15\u7528 \"&{0};\"\u3002
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = \u5C5E\u6027\u503C\u4E2D\u4E0D\u5141\u8BB8\u91C7\u7528\u5916\u90E8\u5B9E\u4F53\u5F15\u7528 "&{0};"\u3002
++ AccessExternalDTD = \u5916\u90E8 DTD: \u65E0\u6CD5\u8BFB\u53D6\u5916\u90E8 DTD ''{0}'', \u56E0\u4E3A accessExternalDTD \u5C5E\u6027\u8BBE\u7F6E\u7684\u9650\u5236\u5BFC\u81F4\u4E0D\u5141\u8BB8 ''{1}'' \u8BBF\u95EE\u3002
++ AccessExternalEntity = \u5916\u90E8\u5B9E\u4F53: \u65E0\u6CD5\u8BFB\u53D6\u5916\u90E8\u6587\u6863 ''{0}'', \u56E0\u4E3A accessExternalDTD \u5C5E\u6027\u8BBE\u7F6E\u7684\u9650\u5236\u5BFC\u81F4\u4E0D\u5141\u8BB8 ''{1}'' \u8BBF\u95EE\u3002
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = \u5F15\u7528\u4E86\u5B9E\u4F53 \"{0}\", \u4F46\u672A\u58F0\u660E\u5B83\u3002
+- ReferenceToUnparsedEntity = \u4E0D\u5141\u8BB8\u4F7F\u7528\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u5F15\u7528 \"&{0};\"\u3002
+- RecursiveReference = \u9012\u5F52\u5B9E\u4F53\u5F15\u7528 \"{0}\"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
+- RecursiveGeneralReference = \u9012\u5F52\u4E00\u822C\u5B9E\u4F53\u5F15\u7528 \"&{0};\"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
+- RecursivePEReference = \u9012\u5F52\u53C2\u6570\u5B9E\u4F53\u5F15\u7528 \"%{0};\"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
++ EntityNotDeclared = \u5F15\u7528\u4E86\u5B9E\u4F53 "{0}", \u4F46\u672A\u58F0\u660E\u5B83\u3002
++ ReferenceToUnparsedEntity = \u4E0D\u5141\u8BB8\u4F7F\u7528\u672A\u89E3\u6790\u7684\u5B9E\u4F53\u5F15\u7528 "&{0};"\u3002
++ RecursiveReference = \u9012\u5F52\u5B9E\u4F53\u5F15\u7528 "{0}"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
++ RecursiveGeneralReference = \u9012\u5F52\u4E00\u822C\u5B9E\u4F53\u5F15\u7528 "&{0};"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
++ RecursivePEReference = \u9012\u5F52\u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
+ # 4.3.3 Character Encoding in Entities
+- EncodingNotSupported = \u4E0D\u652F\u6301\u7F16\u7801 \"{0}\"\u3002
+- EncodingRequired = \u5982\u679C\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u8FDB\u884C\u7F16\u7801, \u5219\u8BE5\u5B9E\u4F53\u5FC5\u987B\u5305\u542B\u7F16\u7801\u58F0\u660E\u3002
++ EncodingNotSupported = \u4E0D\u652F\u6301\u7F16\u7801 "{0}"\u3002
++ EncodingRequired = \u5982\u679C\u5DF2\u89E3\u6790\u7684\u5B9E\u4F53\u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u8FDB\u884C\u7F16\u7801, \u5219\u8BE5\u5B9E\u4F53\u5FC5\u987B\u5305\u542B\u7F16\u7801\u58F0\u660E\u3002
+
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = \u5143\u7D20\u6216\u5C5E\u6027\u4E0D\u5339\u914D QName \u751F\u4EA7: QName::=(NCName':')?NCName\u3002
+- ElementXMLNSPrefix = \u5143\u7D20 \"{0}\" \u4E0D\u80FD\u4F7F\u7528 \"xmlns\" \u4F5C\u4E3A\u524D\u7F00\u3002
+- ElementPrefixUnbound = \u5143\u7D20 \"{1}\" \u7684\u524D\u7F00 \"{0}\" \u672A\u7ED1\u5B9A\u3002
+- AttributePrefixUnbound = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684\u5C5E\u6027 \"{1}\" \u7684\u524D\u7F00 \"{2}\" \u672A\u7ED1\u5B9A\u3002
+- EmptyPrefixedAttName = \u5C5E\u6027 \"{0}\" \u7684\u503C\u65E0\u6548\u3002\u5E26\u524D\u7F00\u7684\u540D\u79F0\u7A7A\u95F4\u7ED1\u5B9A\u4E0D\u80FD\u4E3A\u7A7A\u3002
+- PrefixDeclared = \u672A\u58F0\u660E\u540D\u79F0\u7A7A\u95F4\u524D\u7F00 \"{0}\"\u3002
++ ElementXMLNSPrefix = \u5143\u7D20 "{0}" \u4E0D\u80FD\u4F7F\u7528 "xmlns" \u4F5C\u4E3A\u524D\u7F00\u3002
++ ElementPrefixUnbound = \u5143\u7D20 "{1}" \u7684\u524D\u7F00 "{0}" \u672A\u7ED1\u5B9A\u3002
++ AttributePrefixUnbound = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u7684\u524D\u7F00 "{2}" \u672A\u7ED1\u5B9A\u3002
++ EmptyPrefixedAttName = \u5C5E\u6027 "{0}" \u7684\u503C\u65E0\u6548\u3002\u5E26\u524D\u7F00\u7684\u540D\u79F0\u7A7A\u95F4\u7ED1\u5B9A\u4E0D\u80FD\u4E3A\u7A7A\u3002
++ PrefixDeclared = \u672A\u58F0\u660E\u540D\u79F0\u7A7A\u95F4\u524D\u7F00 "{0}"\u3002
+ CantBindXMLNS = \u524D\u7F00 "xmlns" \u4E0D\u80FD\u663E\u5F0F\u7ED1\u5B9A\u5230\u4EFB\u4F55\u540D\u79F0\u7A7A\u95F4; "xmlns" \u7684\u540D\u79F0\u7A7A\u95F4\u4E5F\u4E0D\u80FD\u663E\u5F0F\u7ED1\u5B9A\u5230\u4EFB\u4F55\u524D\u7F00\u3002
+ CantBindXML = \u524D\u7F00 "xml" \u4E0D\u80FD\u7ED1\u5B9A\u5230\u9664\u5B83\u7684\u5E38\u7528\u540D\u79F0\u7A7A\u95F4\u5916\u7684\u4EFB\u4F55\u540D\u79F0\u7A7A\u95F4; "xml" \u7684\u540D\u79F0\u7A7A\u95F4\u4E5F\u4E0D\u80FD\u7ED1\u5B9A\u5230\u9664 "xml" \u5916\u7684\u4EFB\u4F55\u524D\u7F00\u3002
+- MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027 \"{0}\" \u7684 defaultValue \"{1}\" \u975E\u6CD5, \u56E0\u4E3A\u6B64\u5C5E\u6027\u7C7B\u578B\u5177\u6709\u8BCD\u6C47\u7EA6\u675F\u6761\u4EF6\u3002
++ MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027 "{0}" \u7684 defaultValue "{1}" \u975E\u6CD5, \u56E0\u4E3A\u6B64\u5C5E\u6027\u7C7B\u578B\u5177\u6709\u8BCD\u6C47\u7EA6\u675F\u6761\u4EF6\u3002
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +317,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=\u8BED\u6CD5\u5206\u6790\u5668\u5728\u6B64\u6587\u6863\u4E2D\u9047\u5230\u591A\u4E2A \"{0}\" \u5B9E\u4F53\u6269\u5C55; \u8FD9\u662F\u5E94\u7528\u7A0B\u5E8F\u65BD\u52A0\u7684\u9650\u5236\u3002
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: \u89E3\u6790\u5668\u5728\u6B64\u6587\u6863\u4E2D\u9047\u5230\u591A\u4E2A "{0}" \u5B9E\u4F53\u6269\u5C55; \u8FD9\u662F JDK \u65BD\u52A0\u7684\u9650\u5236\u3002
++ ElementAttributeLimit=JAXP00010002: \u5143\u7D20 "{0}" \u5177\u6709\u591A\u4E2A "{1}" \u5C5E\u6027, "{1}" \u662F JDK \u65BD\u52A0\u7684\u9650\u5236\u3002
++ MaxEntitySizeLimit=JAXP00010003: \u5B9E\u4F53 "{0}" \u7684\u957F\u5EA6\u4E3A "{1}", \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684 "{2}" \u9650\u5236\u3002
++ TotalEntitySizeLimit=JAXP00010004: \u5B9E\u4F53\u7684\u7D2F\u8BA1\u5927\u5C0F "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002
++ MaxXMLNameLimit=JAXP00010005: \u540D\u79F0 "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties Tue Oct 08 09:06:57 2013 -0700
+@@ -1,30 +1,27 @@
+-/*
+- * 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.
+- */
+-
+-/*
+- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+- */
++#
++# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
+
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+@@ -48,14 +45,14 @@
+ InvalidCharInProlog = \u5728\u6587\u4EF6\u5BA3\u544A\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+ InvalidCharInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+ # 2.4 Character Data and Markup
+- CDEndInContent = \u5B57\u5143\u9806\u5E8F \"]]>\" \u4E0D\u53EF\u51FA\u73FE\u5728\u5167\u5BB9\u4E2D\uFF0C\u9664\u975E\u7528\u65BC\u6A19\u793A CDATA \u6BB5\u843D\u7684\u7D50\u5C3E\u3002
++ CDEndInContent = \u5B57\u5143\u9806\u5E8F "]]>" \u4E0D\u53EF\u51FA\u73FE\u5728\u5167\u5BB9\u4E2D\uFF0C\u9664\u975E\u7528\u65BC\u6A19\u793A CDATA \u6BB5\u843D\u7684\u7D50\u5C3E\u3002
+ # 2.7 CDATA Sections
+- CDSectUnterminated = CDATA \u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F \"]]>\"\u3002
++ CDSectUnterminated = CDATA \u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F "]]>"\u3002
+ # 2.8 Prolog and Document Type Declaration
+ XMLDeclMustBeFirst = XML \u5BA3\u544A\u50C5\u80FD\u51FA\u73FE\u5728\u6587\u4EF6\u7684\u958B\u982D\u3002
+- EqRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 \"{0}\" \u4E4B\u5F8C\u3002
+- QuoteRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\"{0}\" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
+- XMLDeclUnterminated = XML \u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F \"?>\"\u3002
++ EqRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 "{0}" \u4E4B\u5F8C\u3002
++ QuoteRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C"{0}" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
++ XMLDeclUnterminated = XML \u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F "?>"\u3002
+ VersionInfoRequired = XML \u5BA3\u544A\u4E2D\u9700\u8981\u7248\u672C\u3002
+ SpaceRequiredBeforeVersionInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\u7248\u672C\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
+ SpaceRequiredBeforeEncodingInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\u7DE8\u78BC\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
+@@ -71,90 +68,91 @@
+ ReferenceIllegalInTrailingMisc=\u5C3E\u7AEF\u6BB5\u843D\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u3002
+
+ # 2.9 Standalone Document Declaration
+- SDDeclInvalid = \u7368\u7ACB\u6587\u4EF6\u5BA3\u544A\u503C\u5FC5\u9808\u662F \"yes\" \u6216 \"no\"\uFF0C\u800C\u975E \"{0}\"\u3002
++ SDDeclInvalid = \u7368\u7ACB\u6587\u4EF6\u5BA3\u544A\u503C\u5FC5\u9808\u662F "yes" \u6216 "no"\uFF0C\u800C\u975E "{0}"\u3002
++ SDDeclNameInvalid = XML \u5BA3\u544A\u4E2D\u7684\u7368\u7ACB\u540D\u7A31\u53EF\u80FD\u62FC\u932F\u4E86\u3002
+ # 2.12 Language Identification
+- XMLLangInvalid = xml:lang \u5C6C\u6027\u503C \"{0}\" \u70BA\u7121\u6548\u7684\u8A9E\u8A00 ID\u3002
++ XMLLangInvalid = xml:lang \u5C6C\u6027\u503C "{0}" \u70BA\u7121\u6548\u7684\u8A9E\u8A00 ID\u3002
+ # 3. Logical Structures
+- ETagRequired = \u5143\u7D20\u985E\u578B \"{0}\" \u5FC5\u9808\u7531\u914D\u5C0D\u7684\u7D50\u675F\u6A19\u8A18 \"</{0}>\" \u7D42\u6B62\u3002
++ ETagRequired = \u5143\u7D20\u985E\u578B "{0}" \u5FC5\u9808\u7531\u914D\u5C0D\u7684\u7D50\u675F\u6A19\u8A18 "</{0}>" \u7D42\u6B62\u3002
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ElementUnterminated = \u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5\u5C6C\u6027\u8A2D\u5B9A \">\" \u6216 \"/>\"\u3002
+- EqRequiredInAttribute = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5C6C\u6027\u540D\u7A31 \"{1}\" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5 '' = '' \u5B57\u5143\u3002
+- OpenQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5C6C\u6027 \"{1}\" \u9810\u671F\u6709\u958B\u982D\u5F15\u865F\u3002
+- CloseQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5C6C\u6027 \"{1}\" \u9810\u671F\u6709\u7D50\u675F\u5F15\u865F\u3002
+- AttributeNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 \"{0}\" \u6307\u5B9A\u5C6C\u6027 \"{1}\"\u3002
+- AttributeNSNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 \"{0}\" \u6307\u5B9A\u9023\u7D50\u547D\u540D\u7A7A\u9593 \"{2}\" \u7684\u5C6C\u6027 \"{1}\"\u3002
+- ETagUnterminated = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u7D50\u675F\u6A19\u8A18\u7D50\u5C3E\u5FC5\u9808\u662F ''>'' \u5206\u754C\u5B57\u5143\u3002
++ ElementUnterminated = \u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5\u5C6C\u6027\u8A2D\u5B9A ">" \u6216 "/>"\u3002
++ EqRequiredInAttribute = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027\u540D\u7A31 "{1}" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5 '' = '' \u5B57\u5143\u3002
++ OpenQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027 "{1}" \u9810\u671F\u6709\u958B\u982D\u5F15\u865F\u3002
++ CloseQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027 "{1}" \u9810\u671F\u6709\u7D50\u675F\u5F15\u865F\u3002
++ AttributeNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 "{0}" \u6307\u5B9A\u5C6C\u6027 "{1}"\u3002
++ AttributeNSNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 "{0}" \u6307\u5B9A\u9023\u7D50\u547D\u540D\u7A7A\u9593 "{2}" \u7684\u5C6C\u6027 "{1}"\u3002
++ ETagUnterminated = \u5143\u7D20\u985E\u578B "{0}" \u7684\u7D50\u675F\u6A19\u8A18\u7D50\u5C3E\u5FC5\u9808\u662F ''>'' \u5206\u754C\u5B57\u5143\u3002
+ MarkupNotRecognizedInContent = \u5143\u7D20\u7684\u5167\u5BB9\u5FC5\u9808\u7531\u683C\u5F0F\u6B63\u78BA\u7684\u4F4D\u63CF\u8FF0\u8CC7\u6599\u6216\u6A19\u8A18\u6240\u7D44\u6210\u3002
+ DoctypeIllegalInContent = \u5167\u5BB9\u4E0D\u5141\u8A31 DOCTYPE\u3002
+ # 4.1 Character and Entity References
+ ReferenceUnterminated = \u53C3\u7167\u5FC5\u9808\u7531 ';' \u5206\u754C\u5B57\u5143\u7D42\u6B62\u3002
+ # 4.3.2 Well-Formed Parsed Entities
+- ReferenceNotInOneEntity = \u53C3\u7167\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u500B\u9AD4\u5167\u3002
+- ElementEntityMismatch = \u5143\u7D20 \"{0}\" \u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u500B\u9AD4\u5167\u3002
+- MarkupEntityMismatch=XML \u6587\u4EF6\u7D50\u69CB\u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u500B\u9AD4\u5167\u3002
++ ReferenceNotInOneEntity = \u53C3\u7167\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u5BE6\u9AD4\u5167\u3002
++ ElementEntityMismatch = \u5143\u7D20 "{0}" \u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
++ MarkupEntityMismatch=XML \u6587\u4EF6\u7D50\u69CB\u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
+
+ # Messages common to Document and DTD
+ # 2.2 Characters
+- InvalidCharInAttValue = \u5728\u5C6C\u6027 \"{1}\" \u7684\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{2}) \u4E14\u5143\u7D20\u70BA \"{0}\"\u3002
++ InvalidCharInAttValue = \u5728\u5C6C\u6027 "{1}" \u7684\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{2}) \u4E14\u5143\u7D20\u70BA "{0}"\u3002
+ InvalidCharInComment = \u5728\u8A3B\u89E3\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+ InvalidCharInPI = \u5728\u8655\u7406\u6307\u793A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+ InvalidCharInInternalSubset = \u5728 DTD \u5167\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+ InvalidCharInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+ # 2.3 Common Syntactic Constructs
+- QuoteRequiredInAttValue = \u5C6C\u6027 \"{1}\" \u7684\u503C\u958B\u982D\u5FC5\u9808\u70BA\u55AE\u5F15\u865F\u6216\u96D9\u5F15\u865F\u5B57\u5143\u3002
+- LessthanInAttValue = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5C6C\u6027 \"{1}\" \u7684\u503C\u4E0D\u53EF\u5305\u542B ''<'' \u5B57\u5143\u3002
+- AttributeValueUnterminated = \u5C6C\u6027 \"{1}\" \u7684\u503C\u7D50\u5C3E\u5FC5\u9808\u662F\u914D\u5C0D\u7684\u5F15\u865F\u5B57\u5143\u3002
++ QuoteRequiredInAttValue = \u5C6C\u6027 "{1}" \u7684\u503C\u958B\u982D\u5FC5\u9808\u70BA\u55AE\u5F15\u865F\u6216\u96D9\u5F15\u865F\u5B57\u5143\u3002
++ LessthanInAttValue = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5C6C\u6027 "{1}" \u7684\u503C\u4E0D\u53EF\u5305\u542B ''<'' \u5B57\u5143\u3002
++ AttributeValueUnterminated = \u5C6C\u6027 "{1}" \u7684\u503C\u7D50\u5C3E\u5FC5\u9808\u662F\u914D\u5C0D\u7684\u5F15\u865F\u5B57\u5143\u3002
+ # 2.5 Comments
+- InvalidCommentStart = \u8A3B\u89E3\u958B\u982D\u5FC5\u9808\u70BA \"<!--\"\u3002
+- DashDashInComment = \u8A3B\u89E3\u4E0D\u5141\u8A31\u5B57\u4E32 \"--\"\u3002
+- CommentUnterminated = \u8A3B\u89E3\u7D50\u5C3E\u5FC5\u9808\u70BA \"-->\"\u3002
+- COMMENT_NOT_IN_ONE_ENTITY = \u8A3B\u89E3\u672A\u5305\u542B\u5728\u76F8\u540C\u500B\u9AD4\u5167\u3002
++ InvalidCommentStart = \u8A3B\u89E3\u958B\u982D\u5FC5\u9808\u70BA "<!--"\u3002
++ DashDashInComment = \u8A3B\u89E3\u4E0D\u5141\u8A31\u5B57\u4E32 "--"\u3002
++ CommentUnterminated = \u8A3B\u89E3\u7D50\u5C3E\u5FC5\u9808\u70BA "-->"\u3002
++ COMMENT_NOT_IN_ONE_ENTITY = \u8A3B\u89E3\u672A\u5305\u542B\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
+ # 2.6 Processing Instructions
+ PITargetRequired = \u8655\u7406\u6307\u793A\u7684\u958B\u982D\u5FC5\u9808\u662F\u76EE\u6A19\u7684\u540D\u7A31\u3002
+ SpaceRequiredInPI = \u8655\u7406\u6307\u793A\u76EE\u6A19\u8207\u8CC7\u6599\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+- PIUnterminated = \u8655\u7406\u6307\u793A\u7D50\u5C3E\u5FC5\u9808\u662F \"?>\"\u3002
+- ReservedPITarget = \u4E0D\u5141\u8A31\u7B26\u5408 \"[xX][mM][lL]\" \u7684\u8655\u7406\u6307\u793A\u76EE\u6A19\u3002
+- PI_NOT_IN_ONE_ENTITY = \u8655\u7406\u6307\u793A\u672A\u5305\u542B\u5728\u76F8\u540C\u500B\u9AD4\u5167\u3002
++ PIUnterminated = \u8655\u7406\u6307\u793A\u7D50\u5C3E\u5FC5\u9808\u662F "?>"\u3002
++ ReservedPITarget = \u4E0D\u5141\u8A31\u7B26\u5408 "[xX][mM][lL]" \u7684\u8655\u7406\u6307\u793A\u76EE\u6A19\u3002
++ PI_NOT_IN_ONE_ENTITY = \u8655\u7406\u6307\u793A\u672A\u5305\u542B\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
+ # 2.8 Prolog and Document Type Declaration
+- VersionInfoInvalid = \u7121\u6548\u7684\u7248\u672C \"{0}\"\u3002
+- VersionNotSupported = \u4E0D\u652F\u63F4 XML \u7248\u672C \"{0}\"\uFF0C\u50C5\u652F\u63F4 XML 1.0\u3002
+- VersionNotSupported11 = \u4E0D\u652F\u63F4 XML \u7248\u672C \"{0}\"\uFF0C\u50C5\u652F\u63F4 XML 1.0 \u8207 XML 1.1\u3002
+- VersionMismatch= \u500B\u9AD4\u4E0D\u53EF\u5305\u542B\u8F03\u65B0\u7248\u672C\u7684\u5176\u4ED6\u500B\u9AD4\u3002
++ VersionInfoInvalid = \u7121\u6548\u7684\u7248\u672C "{0}"\u3002
++ VersionNotSupported = \u4E0D\u652F\u63F4 XML \u7248\u672C "{0}"\uFF0C\u50C5\u652F\u63F4 XML 1.0\u3002
++ VersionNotSupported11 = \u4E0D\u652F\u63F4 XML \u7248\u672C "{0}"\uFF0C\u50C5\u652F\u63F4 XML 1.0 \u8207 XML 1.1\u3002
++ VersionMismatch= \u5BE6\u9AD4\u4E0D\u53EF\u5305\u542B\u8F03\u65B0\u7248\u672C\u7684\u5176\u4ED6\u5BE6\u9AD4\u3002
+ # 4.1 Character and Entity References
+- DigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 \"&#\" \u4E4B\u5F8C\u3002
+- HexdigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u516D\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 \"&#x\" \u4E4B\u5F8C\u3002
++ DigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 "&#" \u4E4B\u5F8C\u3002
++ HexdigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u516D\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 "&#x" \u4E4B\u5F8C\u3002
+ SemicolonRequiredInCharRef = \u5B57\u5143\u53C3\u7167\u7684\u7D50\u5C3E\u5FC5\u9808\u662F ';' \u5206\u754C\u5B57\u5143\u3002
+- InvalidCharRef = \u5B57\u5143\u53C3\u7167 \"&#{0}\" \u70BA\u7121\u6548\u7684 XML \u5B57\u5143\u3002
+- NameRequiredInReference = \u5728\u500B\u9AD4\u53C3\u7167\u4E2D\uFF0C\u500B\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '&' \u4E4B\u5F8C\u3002
+- SemicolonRequiredInReference = \u500B\u9AD4 \"{0}\" \u7684\u53C3\u7167\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
++ InvalidCharRef = \u5B57\u5143\u53C3\u7167 "&#{0}" \u70BA\u7121\u6548\u7684 XML \u5B57\u5143\u3002
++ NameRequiredInReference = \u5728\u5BE6\u9AD4\u53C3\u7167\u4E2D\uFF0C\u5BE6\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '&' \u4E4B\u5F8C\u3002
++ SemicolonRequiredInReference = \u5BE6\u9AD4 "{0}" \u7684\u53C3\u7167\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
+ # 4.3.1 The Text Declaration
+- TextDeclMustBeFirst = \u6587\u5B57\u5BA3\u544A\u50C5\u80FD\u51FA\u73FE\u5728\u5916\u90E8\u5256\u6790\u500B\u9AD4\u7684\u958B\u982D\u3002
+- EqRequiredInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 \"{0}\" \u4E4B\u5F8C\u3002
+- QuoteRequiredInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D \"{0}\" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
+- CloseQuoteMissingInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u907A\u6F0F \"{0}\" \u4E4B\u5F8C\u7684\u503C\u7684\u7D50\u675F\u5F15\u865F\u3002
++ TextDeclMustBeFirst = \u6587\u5B57\u5BA3\u544A\u50C5\u80FD\u51FA\u73FE\u5728\u5916\u90E8\u5256\u6790\u5BE6\u9AD4\u7684\u958B\u982D\u3002
++ EqRequiredInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 "{0}" \u4E4B\u5F8C\u3002
++ QuoteRequiredInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D "{0}" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
++ CloseQuoteMissingInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u907A\u6F0F "{0}" \u4E4B\u5F8C\u7684\u503C\u7684\u7D50\u675F\u5F15\u865F\u3002
+ SpaceRequiredBeforeVersionInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u7248\u672C\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
+ SpaceRequiredBeforeEncodingInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u7DE8\u78BC\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
+- TextDeclUnterminated = \u6587\u5B57\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F \"?>\"\u3002
++ TextDeclUnterminated = \u6587\u5B57\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F "?>"\u3002
+ EncodingDeclRequired = \u6587\u5B57\u5BA3\u544A\u4E2D\u9700\u8981\u7DE8\u78BC\u5BA3\u544A\u3002
+ NoMorePseudoAttributes = \u4E0D\u5141\u8A31\u66F4\u591A\u7684\u865B\u64EC\u5C6C\u6027\u3002
+ MorePseudoAttributes = \u9810\u671F\u66F4\u591A\u7684\u865B\u64EC\u5C6C\u6027\u3002
+ PseudoAttrNameExpected = \u9810\u671F\u4E00\u500B\u865B\u64EC\u5C6C\u6027\u540D\u7A31\u3002
+ # 4.3.2 Well-Formed Parsed Entities
+- CommentNotInOneEntity = \u8A3B\u89E3\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u500B\u9AD4\u5167\u3002
+- PINotInOneEntity = \u8655\u7406\u6307\u793A\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u500B\u9AD4\u5167\u3002
++ CommentNotInOneEntity = \u8A3B\u89E3\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u5BE6\u9AD4\u5167\u3002
++ PINotInOneEntity = \u8655\u7406\u6307\u793A\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u5BE6\u9AD4\u5167\u3002
+ # 4.3.3 Character Encoding in Entities
+- EncodingDeclInvalid = \u7121\u6548\u7684\u7DE8\u78BC\u540D\u7A31 \"{0}\"\u3002
+- EncodingByteOrderUnsupported = \u4E0D\u652F\u63F4\u7DE8\u78BC \"{0}\" \u7684\u6307\u5B9A\u4F4D\u5143\u7D44\u9806\u5E8F\u3002
++ EncodingDeclInvalid = \u7121\u6548\u7684\u7DE8\u78BC\u540D\u7A31 "{0}"\u3002
++ EncodingByteOrderUnsupported = \u4E0D\u652F\u63F4\u7DE8\u78BC "{0}" \u7684\u6307\u5B9A\u4F4D\u5143\u7D44\u9806\u5E8F\u3002
+ InvalidByte = {1}-byte UTF-8 \u5E8F\u5217\u7684\u7121\u6548\u4F4D\u5143\u7D44 {0}\u3002
+ ExpectedByte = {1}-byte UTF-8 \u5E8F\u5217\u9810\u671F\u7684\u4F4D\u5143\u7D44 {0}\u3002
+ InvalidHighSurrogate = UTF-8 \u5E8F\u5217\u4E2D\u9AD8\u66FF\u4EE3\u4F4D\u5143\u4E0D\u53EF\u8D85\u904E 0x10\uFF0C\u4F46\u627E\u5230 0x{0}\u3002
+- OperationNotSupported = {1} \u8B80\u53D6\u5668\u4E0D\u652F\u63F4\u4F5C\u696D \"{0}\"\u3002
+- InvalidASCII = \u7D44\u5143\u7D44 \"{0}\" \u4E0D\u662F (7 \u4F4D\u5143) ASCII \u5B57\u5143\u96C6\u7684\u6210\u54E1\u3002
+- CharConversionFailure = \u6C7A\u5B9A\u4F7F\u7528\u7279\u5B9A\u7DE8\u78BC\u7684\u500B\u9AD4\uFF0C\u5728\u8A72\u7DE8\u78BC\u4E2D\u4E0D\u53EF\u5305\u542B\u7121\u6548\u7684\u5E8F\u5217\u3002
++ OperationNotSupported = {1} \u8B80\u53D6\u5668\u4E0D\u652F\u63F4\u4F5C\u696D "{0}"\u3002
++ InvalidASCII = \u7D44\u5143\u7D44 "{0}" \u4E0D\u662F (7 \u4F4D\u5143) ASCII \u5B57\u5143\u96C6\u7684\u6210\u54E1\u3002
++ CharConversionFailure = \u6C7A\u5B9A\u4F7F\u7528\u7279\u5B9A\u7DE8\u78BC\u7684\u5BE6\u9AD4\uFF0C\u5728\u8A72\u7DE8\u78BC\u4E2D\u4E0D\u53EF\u5305\u542B\u7121\u6548\u7684\u5E8F\u5217\u3002
+
+ # DTD Messages
+ # 2.2 Characters
+- InvalidCharInEntityValue = \u5728\u6587\u5B57\u500B\u9AD4\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
++ InvalidCharInEntityValue = \u5728\u6587\u5B57\u5BE6\u9AD4\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+ InvalidCharInExternalSubset = \u5728 DTD \u5916\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+ InvalidCharInIgnoreSect = \u5728\u6392\u9664\u7684\u689D\u4EF6\u6027\u6BB5\u843D\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+ InvalidCharInPublicID = \u5728\u516C\u7528 ID \u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
+@@ -169,150 +167,150 @@
+ PubidCharIllegal = \u516C\u7528 ID \u4E2D\u4E0D\u5141\u8A31\u5B57\u5143 (Unicode: 0x{0})\u3002
+ SpaceRequiredBetweenPublicAndSystem = publicId \u8207 systemId \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+ # 2.8 Prolog and Document Type Declaration
+- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D \"<!DOCTYPE\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
+- MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D\uFF0C\u6839\u5143\u7D20\u985E\u578B\u5FC5\u9808\u51FA\u73FE\u5728 \"<!DOCTYPE\" \u4E4B\u5F8C\u3002
+- DoctypedeclUnterminated = \u6839\u5143\u7D20\u985E\u578B \"{0}\" \u7684\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
+- PEReferenceWithinMarkup = DTD \u5167\u90E8\u5B57\u96C6\u7684\u6A19\u8A18\u5167\u4E0D\u80FD\u51FA\u73FE\u53C3\u6578\u500B\u9AD4\u53C3\u7167 \"%{0};\"\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D "<!DOCTYPE" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
++ MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D\uFF0C\u6839\u5143\u7D20\u985E\u578B\u5FC5\u9808\u51FA\u73FE\u5728 "<!DOCTYPE" \u4E4B\u5F8C\u3002
++ DoctypedeclUnterminated = \u6839\u5143\u7D20\u985E\u578B "{0}" \u7684\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
++ PEReferenceWithinMarkup = DTD \u5167\u90E8\u5B57\u96C6\u7684\u6A19\u8A18\u5167\u4E0D\u80FD\u51FA\u73FE\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};"\u3002
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u4EF6\u985E\u578B\u5BA3\u544A\u5305\u542B\u6216\u6307\u5411\u7684\u6A19\u8A18\u5BA3\u544A\u5FC5\u9808\u683C\u5F0F\u6B63\u78BA\u3002
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = \"xml:space\" \u7684\u5C6C\u6027\u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u70BA\u5217\u8209\u985E\u578B\uFF0C\u5176\u53EF\u80FD\u7684\u503C\u70BA \"default\" \u8207 \"preserve\"\u3002
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space" \u7684\u5C6C\u6027\u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u70BA\u5217\u8209\u985E\u578B\uFF0C\u5176\u53EF\u80FD\u7684\u503C\u70BA "default" \u8207 "preserve"\u3002
+ # 3.2 Element Type Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D \"<!ELEMENT\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D "<!ELEMENT" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u9700\u8981\u5143\u7D20\u985E\u578B\u3002
+- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
+- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5F8C\u9700\u8981\u9650\u5236\u689D\u4EF6\u3002
+- ElementDeclUnterminated = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
++ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
++ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5F8C\u9700\u8981\u9650\u5236\u689D\u4EF6\u3002
++ ElementDeclUnterminated = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
+ # 3.2.1 Element Content
+- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B ''('' \u5B57\u5143\u6216\u5143\u7D20\u985E\u578B\u3002
+- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
++ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B ''('' \u5B57\u5143\u6216\u5143\u7D20\u985E\u578B\u3002
++ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
+ # 3.2.2 Mixed Content
+- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B\u5143\u7D20\u985E\u578B\u3002
+- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
+- MixedContentUnterminated = \u5B50\u9805\u5143\u7D20\u7684\u985E\u578B\u53D7\u5230\u9650\u5236\u6642\uFF0C\u6DF7\u5408\u5167\u5BB9\u6A21\u578B \"{0}\" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA \")*\"\u3002
++ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B\u5143\u7D20\u985E\u578B\u3002
++ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
++ MixedContentUnterminated = \u5B50\u9805\u5143\u7D20\u7684\u985E\u578B\u53D7\u5230\u9650\u5236\u6642\uFF0C\u6DF7\u5408\u5167\u5BB9\u6A21\u578B "{0}" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA ")*"\u3002
+ # 3.3 Attribute-List Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728 attribute-list \u5BA3\u544A\u4E2D \"<!ATTLIST\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728 attribute-list \u5BA3\u544A\u4E2D "<!ATTLIST" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = attribute-list \u5BA3\u544A\u4E2D\u9700\u8981\u5143\u7D20\u985E\u578B\u3002
+- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5143\u7D20 \"{0}\" \u7684 attribute-list \u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u540D\u7A31\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
+- AttNameRequiredInAttDef = \u5143\u7D20 \"{0}\" \u7684 attribute-list \u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u5C6C\u6027\u540D\u7A31\u3002
+- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5143\u7D20 \"{0}\" \u5C6C\u6027 \"{1}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u985E\u578B\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
+- AttTypeRequiredInAttDef = \u5143\u7D20 \"{0}\" \u5C6C\u6027 \"{1}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u5C6C\u6027\u985E\u578B\u3002
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5143\u7D20 \"{0}\" \u5C6C\u6027 \"{1}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u9810\u8A2D\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
+- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u70BA\u6307\u5B9A\u5143\u7D20 \"{0}\" \u7684\u76F8\u540C\u5C6C\u6027 \"{1}\" \u63D0\u4F9B\u4E86\u8D85\u904E\u4E00\u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\u5B9A\u7FA9\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5143\u7D20 "{0}" \u7684 attribute-list \u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u540D\u7A31\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
++ AttNameRequiredInAttDef = \u5143\u7D20 "{0}" \u7684 attribute-list \u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u5C6C\u6027\u540D\u7A31\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5143\u7D20 "{0}" \u5C6C\u6027 "{1}" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u985E\u578B\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
++ AttTypeRequiredInAttDef = \u5143\u7D20 "{0}" \u5C6C\u6027 "{1}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u5C6C\u6027\u985E\u578B\u3002
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5143\u7D20 "{0}" \u5C6C\u6027 "{1}" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u9810\u8A2D\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
++ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u70BA\u6307\u5B9A\u5143\u7D20 "{0}" \u7684\u76F8\u540C\u5C6C\u6027 "{1}" \u63D0\u4F9B\u4E86\u8D85\u904E\u4E00\u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\u5B9A\u7FA9\u3002
+ # 3.3.1 Attribute Types
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D \"NOTATION\" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
+- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C''('' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 \"NOTATION\" \u4E4B\u5F8C\u3002
+- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \"{1}\" \u5C6C\u6027\u5BA3\u544A\u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
+- NotationTypeUnterminated = \u5728 \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
+- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \"{1}\" \u5C6C\u6027\u5BA3\u544A\u7684\u5217\u8209\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u540D\u7A31\u8A18\u865F\u3002
+- EnumerationUnterminated = \u5728 \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u5217\u8209\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
+- MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5143\u7D20 \"{0}\" \u7684\u5C6C\u6027 \"{2}\" \u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C \"{1}\"\u3002\u55AE\u4E00 Enumeration \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NMTOKENS \u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
+- MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5143\u7D20 \"{0}\" \u5C6C\u6027 \"{2}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C \"{1}\"\u3002\u55AE\u4E00 NotationType \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NOTATION \u540D\u7A31\u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D "NOTATION" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
++ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C''('' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 "NOTATION" \u4E4B\u5F8C\u3002
++ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}" \u5C6C\u6027\u5BA3\u544A\u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
++ NotationTypeUnterminated = \u5728 "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
++ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}" \u5C6C\u6027\u5BA3\u544A\u7684\u5217\u8209\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u540D\u7A31\u8A18\u865F\u3002
++ EnumerationUnterminated = \u5728 "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u5217\u8209\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
++ MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5143\u7D20 "{0}" \u7684\u5C6C\u6027 "{2}" \u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C "{1}"\u3002\u55AE\u4E00 Enumeration \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NMTOKENS \u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
++ MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5143\u7D20 "{0}" \u5C6C\u6027 "{2}" \u7684\u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C "{1}"\u3002\u55AE\u4E00 NotationType \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NOTATION \u540D\u7A31\u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
+ # 3.3.2 Attribute Defaults
+- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D \"FIXED\" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D "FIXED" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
+ # 3.4 Conditional Sections
+- IncludeSectUnterminated = \u5305\u542B\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F \"]]>\"\u3002
+- IgnoreSectUnterminated = \u6392\u9664\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F \"]]>\"\u3002
++ IncludeSectUnterminated = \u5305\u542B\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F "]]>"\u3002
++ IgnoreSectUnterminated = \u6392\u9664\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F "]]>"\u3002
+ # 4.1 Character and Entity References
+- NameRequiredInPEReference = \u5728\u53C3\u6578\u500B\u9AD4\u53C3\u7167\u4E2D\uFF0C\u500B\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '%' \u4E4B\u5F8C\u3002
+- SemicolonRequiredInPEReference = \u53C3\u6578\u500B\u9AD4\u53C3\u7167 \"%{0};\" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
++ NameRequiredInPEReference = \u5728\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167\u4E2D\uFF0C\u5BE6\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '%' \u4E4B\u5F8C\u3002
++ SemicolonRequiredInPEReference = \u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
+ # 4.2 Entity Declarations
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u500B\u9AD4\u5BA3\u544A\u4E2D \"<!ENTITY\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
+- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C3\u6578\u500B\u9AD4\u5BA3\u544A\u4E2D\uFF0C\"<!ENTITY\" \u8207 '%' \u5B57\u5143\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u5728\u53C3\u6578\u500B\u9AD4\u5BA3\u544A\u4E2D\uFF0C'%' \u8207\u500B\u9AD4\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u500B\u9AD4\u5BA3\u544A\u4E2D\u9700\u8981\u500B\u9AD4\u7684\u540D\u7A31\u3002
+- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u500B\u9AD4\u5BA3\u544A\u4E2D\uFF0C\u500B\u9AD4\u540D\u7A31 \"{0}\" \u8207\u5B9A\u7FA9\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u500B\u9AD4 \"{0}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\"NDATA\" \u8207\u8868\u793A\u6CD5\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u500B\u9AD4 \"{0}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\"NDATA\" \u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
+- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u500B\u9AD4 \"{0}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\"NDATA\" \u4E4B\u5F8C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
+- EntityDeclUnterminated = \u500B\u9AD4 \"{0}\" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
+- MSG_DUPLICATE_ENTITY_DEFINITION = \u500B\u9AD4 \"{0}\" \u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5BE6\u9AD4\u5BA3\u544A\u4E2D "<!ENTITY" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C3\u6578\u5BE6\u9AD4\u5BA3\u544A\u4E2D\uFF0C"<!ENTITY" \u8207 '%' \u5B57\u5143\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u5728\u53C3\u6578\u5BE6\u9AD4\u5BA3\u544A\u4E2D\uFF0C'%' \u8207\u5BE6\u9AD4\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
++ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u5BE6\u9AD4\u5BA3\u544A\u4E2D\u9700\u8981\u5BE6\u9AD4\u7684\u540D\u7A31\u3002
++ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5BE6\u9AD4\u5BA3\u544A\u4E2D\uFF0C\u5BE6\u9AD4\u540D\u7A31 "{0}" \u8207\u5B9A\u7FA9\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u4E2D\uFF0C"NDATA" \u8207\u8868\u793A\u6CD5\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u4E2D\uFF0C"NDATA" \u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
++ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u4E2D\uFF0C"NDATA" \u4E4B\u5F8C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
++ EntityDeclUnterminated = \u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
++ MSG_DUPLICATE_ENTITY_DEFINITION = \u5BE6\u9AD4 "{0}" \u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
+ # 4.2.2 External Entities
+- ExternalIDRequired = \u5916\u90E8\u500B\u9AD4\u5BA3\u544A\u7684\u958B\u982D\u5FC5\u9808\u70BA \"SYSTEM\" \u6216 \"PUBLIC\"\u3002
+- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \"PUBLIC\" \u8207\u516C\u7528 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
++ ExternalIDRequired = \u5916\u90E8\u5BE6\u9AD4\u5BA3\u544A\u7684\u958B\u982D\u5FC5\u9808\u70BA "SYSTEM" \u6216 "PUBLIC"\u3002
++ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC" \u8207\u516C\u7528 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+ MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u516C\u7528 ID \u8207\u7CFB\u7D71 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \"SYSTEM\" \u8207\u7CFB\u7D71 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
+- MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5 ID \u4E0D\u61C9\u6307\u5B9A\u70BA\u7CFB\u7D71 ID \"{0}\" \u7684\u4E00\u90E8\u5206\u3002
++ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM" \u8207\u7CFB\u7D71 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
++ MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5 ID \u4E0D\u61C9\u6307\u5B9A\u70BA\u7CFB\u7D71 ID "{0}" \u7684\u4E00\u90E8\u5206\u3002
+ # 4.7 Notation Declarations
+- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D \"<!NOTATION\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
++ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D "<!NOTATION" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
+ MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u9700\u8981\u8868\u793A\u6CD5\u7684\u540D\u7A31\u3002
+- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u8868\u793A\u6CD5\u540D\u7A31 \"{0}\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
+- ExternalIDorPublicIDRequired = \u8868\u793A\u6CD5 \"{0}\" \u7684\u5BA3\u544A\u5FC5\u9808\u5305\u542B\u7CFB\u7D71\u6216\u516C\u7528 ID\u3002
+- NotationDeclUnterminated = \u8868\u793A\u6CD5 \"{0}\" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
++ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u8868\u793A\u6CD5\u540D\u7A31 "{0}" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
++ ExternalIDorPublicIDRequired = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u5FC5\u9808\u5305\u542B\u7CFB\u7D71\u6216\u516C\u7528 ID\u3002
++ NotationDeclUnterminated = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
+
+ # Validation messages
+- DuplicateTypeInMixedContent = \u5143\u7D20\u5BA3\u544A \"{0}\" \u7684\u5167\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7D93\u6307\u5B9A\u5143\u7D20\u985E\u578B \"{1}\"\u3002
+- ENTITIESInvalid = \u985E\u578B ENTITIES \u7684\u5C6C\u6027\u503C \"{1}\" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u672A\u5256\u6790\u500B\u9AD4\u7684\u540D\u7A31\u3002
+- ENTITYInvalid = \u985E\u578B ENTITY \u7684\u5C6C\u6027\u503C \"{1}\" \u5FC5\u9808\u662F\u4E00\u500B\u672A\u5256\u6790\u500B\u9AD4\u7684\u540D\u7A31\u3002
+- IDDefaultTypeInvalid = ID \u5C6C\u6027 \"{0}\" \u5FC5\u9808\u5177\u6709 \"#IMPLIED\" \u6216 \"#REQUIRED\" \u7684\u5BA3\u544A\u9810\u8A2D\u3002
+- IDInvalid = \u985E\u578B ID \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u540D\u7A31\u3002
+- IDInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B ID \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F NCName\u3002
+- IDNotUnique = \u985E\u578B ID \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u6587\u4EF6\u5167\u7684\u552F\u4E00\u503C\u3002
+- IDREFInvalid = \u985E\u578B IDREF \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u540D\u7A31\u3002
+- IDREFInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B IDREF \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F NCName\u3002
+- IDREFSInvalid = \u985E\u578B IDREFS \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u3002
+- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u7576\u500B\u9AD4\u53C3\u7167\u7576\u4F5C\u5B8C\u6574\u5BA3\u544A\u6642\uFF0C\u53C3\u6578\u500B\u9AD4 \"{0}\" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
+- ImproperDeclarationNesting = \u53C3\u6578\u500B\u9AD4 \"{0}\" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
+- ImproperGroupNesting = \u53C3\u6578\u500B\u9AD4 \"{0}\" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u6210\u5C0D\u62EC\u865F\u3002
+- INVALID_PE_IN_CONDITIONAL = \u53C3\u6578\u500B\u9AD4 \"{0}\" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6574\u500B\u689D\u4EF6\u6027\u6BB5\u843D\u6216\u50C5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
+- MSG_ATTRIBUTE_NOT_DECLARED = \u5143\u7D20\u985E\u578B \"{0}\" \u5FC5\u9808\u5BA3\u544A\u5C6C\u6027 \"{1}\"\u3002
+- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5177\u6709\u503C \"{1}\" \u7684\u5C6C\u6027 \"{0}\" \u5FC5\u9808\u5177\u6709\u4F86\u81EA\u6E05\u55AE \"{2}\" \u7684\u503C\u3002
+- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5C6C\u6027 \"{0}\" \u7684\u503C \"{1}\" \u4E0D\u53EF\u900F\u904E\u6B63\u898F\u5316\u9032\u884C\u8B8A\u66F4 (\u6210\u70BA \"{2}\")\u3002
+- MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5167\u5BB9\u4E0D\u5B8C\u6574\uFF0C\u5B83\u5FC5\u9808\u914D\u5C0D \"{1}\"\u3002
+- MSG_CONTENT_INVALID = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D \"{1}\"\u3002
+- MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D \"{1}\"\u3002\u4E0D\u5141\u8A31\u985E\u578B \"{2}\" \u7684\u5B50\u9805\u3002
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5C6C\u6027 \"{1}\" \u5177\u6709\u9810\u8A2D\u503C\uFF0C\u4E14\u5FC5\u9808\u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\u6307\u5B9A\u3002
+- MSG_DUPLICATE_ATTDEF = \u5143\u7D20\u985E\u578B \"{0}\" \u5DF2\u7D93\u5BA3\u544A\u5C6C\u6027 \"{1}\"\u3002
+- MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u985E\u578B \"{0}\" \u4E0D\u53EF\u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
+- MSG_ELEMENT_NOT_DECLARED = \u5FC5\u9808\u5BA3\u544A\u5143\u7D20\u985E\u578B \"{0}\"\u3002
++ DuplicateTypeInMixedContent = \u5143\u7D20\u5BA3\u544A "{0}" \u7684\u5167\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7D93\u6307\u5B9A\u5143\u7D20\u985E\u578B "{1}"\u3002
++ ENTITIESInvalid = \u985E\u578B ENTITIES \u7684\u5C6C\u6027\u503C "{1}" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u672A\u5256\u6790\u5BE6\u9AD4\u7684\u540D\u7A31\u3002
++ ENTITYInvalid = \u985E\u578B ENTITY \u7684\u5C6C\u6027\u503C "{1}" \u5FC5\u9808\u662F\u4E00\u500B\u672A\u5256\u6790\u5BE6\u9AD4\u7684\u540D\u7A31\u3002
++ IDDefaultTypeInvalid = ID \u5C6C\u6027 "{0}" \u5FC5\u9808\u5177\u6709 "#IMPLIED" \u6216 "#REQUIRED" \u7684\u5BA3\u544A\u9810\u8A2D\u3002
++ IDInvalid = \u985E\u578B ID \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u540D\u7A31\u3002
++ IDInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B ID \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F NCName\u3002
++ IDNotUnique = \u985E\u578B ID \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u6587\u4EF6\u5167\u7684\u552F\u4E00\u503C\u3002
++ IDREFInvalid = \u985E\u578B IDREF \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u540D\u7A31\u3002
++ IDREFInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B IDREF \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F NCName\u3002
++ IDREFSInvalid = \u985E\u578B IDREFS \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u3002
++ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u7576\u5BE6\u9AD4\u53C3\u7167\u7576\u4F5C\u5B8C\u6574\u5BA3\u544A\u6642\uFF0C\u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
++ ImproperDeclarationNesting = \u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
++ ImproperGroupNesting = \u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u6210\u5C0D\u62EC\u865F\u3002
++ INVALID_PE_IN_CONDITIONAL = \u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6574\u500B\u689D\u4EF6\u6027\u6BB5\u843D\u6216\u50C5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
++ MSG_ATTRIBUTE_NOT_DECLARED = \u5143\u7D20\u985E\u578B "{0}" \u5FC5\u9808\u5BA3\u544A\u5C6C\u6027 "{1}"\u3002
++ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5177\u6709\u503C "{1}" \u7684\u5C6C\u6027 "{0}" \u5FC5\u9808\u5177\u6709\u4F86\u81EA\u6E05\u55AE "{2}" \u7684\u503C\u3002
++ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5C6C\u6027 "{0}" \u7684\u503C "{1}" \u4E0D\u53EF\u900F\u904E\u6B63\u898F\u5316\u9032\u884C\u8B8A\u66F4 (\u6210\u70BA "{2}")\u3002
++ MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5167\u5BB9\u4E0D\u5B8C\u6574\uFF0C\u5B83\u5FC5\u9808\u914D\u5C0D "{1}"\u3002
++ MSG_CONTENT_INVALID = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D "{1}"\u3002
++ MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D "{1}"\u3002\u4E0D\u5141\u8A31\u985E\u578B "{2}" \u7684\u5B50\u9805\u3002
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027 "{1}" \u5177\u6709\u9810\u8A2D\u503C\uFF0C\u4E14\u5FC5\u9808\u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\u6307\u5B9A\u3002
++ MSG_DUPLICATE_ATTDEF = \u5143\u7D20\u985E\u578B "{0}" \u5DF2\u7D93\u5BA3\u544A\u5C6C\u6027 "{1}"\u3002
++ MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u985E\u578B "{0}" \u4E0D\u53EF\u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
++ MSG_ELEMENT_NOT_DECLARED = \u5FC5\u9808\u5BA3\u544A\u5143\u7D20\u985E\u578B "{0}"\u3002
+ MSG_GRAMMAR_NOT_FOUND = \u6587\u4EF6\u7121\u6548: \u627E\u4E0D\u5230\u6587\u6CD5\u3002
+- MSG_ELEMENT_WITH_ID_REQUIRED = ID \u70BA \"{0}\" \u7684\u5143\u7D20\u5FC5\u9808\u51FA\u73FE\u5728\u6587\u4EF6\u4E2D\u3002
+- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u7368\u7ACB\u6587\u4EF6\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u500B\u9AD4 \"{0}\"\u3002
+- MSG_FIXED_ATTVALUE_INVALID = \u5177\u6709\u503C \"{2}\" \u7684\u5C6C\u6027 \"{1}\" \u5FC5\u9808\u5177\u6709 \"{3}\" \u7684\u503C\u3002
+- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u985E\u578B \"{0}\" \u5DF2\u7D93\u5177\u6709\u985E\u578B ID \u7684\u5C6C\u6027 \"{1}\"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B ID \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 \"{2}\"\u3002
+- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u985E\u578B \"{0}\" \u5DF2\u7D93\u5177\u6709\u985E\u578B NOTATION \u7684\u5C6C\u6027 \"{1}\"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B NOTATION \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 \"{2}\"\u3002
+- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u82E5\u8981\u5728\u5C6C\u6027 \"{0}\" \u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 \"{1}\"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
+- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u82E5\u8981\u5728 \"{0}\" \u7684\u672A\u5256\u6790\u500B\u9AD4\u5BA3\u544A\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 \"{1}\"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
+- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5256\u6790\u500B\u9AD4\u4E2D\u5BA3\u544A\u7684\u500B\u9AD4 \"{0}\"\u3002
+- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B \"{0}\" \u9700\u8981\u5C6C\u6027 \"{1}\" \u4E14\u5FC5\u9808\u4E88\u4EE5\u6307\u5B9A\u3002
+- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5177\u6709\u5143\u7D20\u5167\u5BB9\u7684\u5916\u90E8\u5256\u6790\u500B\u9AD4\u4E2D\u5BA3\u544A\u7684\u5143\u7D20\u4E4B\u9593\uFF0C\u4E0D\u53EF\u6709\u7A7A\u683C\u3002
+- NMTOKENInvalid = \u985E\u578B NMTOKEN \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u540D\u7A31\u8A18\u865F\u3002
+- NMTOKENSInvalid = \u985E\u578B NMTOKENS \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u8A18\u865F\u3002
+- NoNotationOnEmptyElement = \u5BA3\u544A EMPTY \u7684\u5143\u7D20\u985E\u578B \"{0}\" \u4E0D\u53EF\u5BA3\u544A\u985E\u578B NOTATION \u7684\u5C6C\u6027 \"{1}\"\u3002
+- RootElementTypeMustMatchDoctypedecl = \u6587\u4EF6\u6839\u5143\u7D20 \"{1}\" \u5FC5\u9808\u914D\u5C0D DOCTYPE \u6839 \"{0}\"\u3002
+- UndeclaredElementInContentSpec = \u5143\u7D20 \"{0}\" \u7684\u5167\u5BB9\u6A21\u578B\u53C3\u7167\u672A\u5BA3\u544A\u7684\u5143\u7D20 \"{1}\"\u3002
+- UniqueNotationName = \u8868\u793A\u6CD5 \"{0}\" \u7684\u5BA3\u544A\u4E26\u975E\u552F\u4E00\u3002\u6307\u5B9A\u7684 Name \u4E0D\u80FD\u5728\u4E00\u500B\u4EE5\u4E0A\u7684\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u5BA3\u544A\u3002
++ MSG_ELEMENT_WITH_ID_REQUIRED = ID \u70BA "{0}" \u7684\u5143\u7D20\u5FC5\u9808\u51FA\u73FE\u5728\u6587\u4EF6\u4E2D\u3002
++ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u7368\u7ACB\u6587\u4EF6\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5BE6\u9AD4 "{0}"\u3002
++ MSG_FIXED_ATTVALUE_INVALID = \u5177\u6709\u503C "{2}" \u7684\u5C6C\u6027 "{1}" \u5FC5\u9808\u5177\u6709 "{3}" \u7684\u503C\u3002
++ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u985E\u578B "{0}" \u5DF2\u7D93\u5177\u6709\u985E\u578B ID \u7684\u5C6C\u6027 "{1}"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B ID \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 "{2}"\u3002
++ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u985E\u578B "{0}" \u5DF2\u7D93\u5177\u6709\u985E\u578B NOTATION \u7684\u5C6C\u6027 "{1}"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B NOTATION \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 "{2}"\u3002
++ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u82E5\u8981\u5728\u5C6C\u6027 "{0}" \u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 "{1}"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
++ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u82E5\u8981\u5728 "{0}" \u7684\u672A\u5256\u6790\u5BE6\u9AD4\u5BA3\u544A\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 "{1}"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
++ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5256\u6790\u5BE6\u9AD4\u4E2D\u5BA3\u544A\u7684\u5BE6\u9AD4 "{0}"\u3002
++ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B "{0}" \u9700\u8981\u5C6C\u6027 "{1}" \u4E14\u5FC5\u9808\u4E88\u4EE5\u6307\u5B9A\u3002
++ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5177\u6709\u5143\u7D20\u5167\u5BB9\u7684\u5916\u90E8\u5256\u6790\u5BE6\u9AD4\u4E2D\u5BA3\u544A\u7684\u5143\u7D20\u4E4B\u9593\uFF0C\u4E0D\u53EF\u6709\u7A7A\u683C\u3002
++ NMTOKENInvalid = \u985E\u578B NMTOKEN \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u540D\u7A31\u8A18\u865F\u3002
++ NMTOKENSInvalid = \u985E\u578B NMTOKENS \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u8A18\u865F\u3002
++ NoNotationOnEmptyElement = \u5BA3\u544A EMPTY \u7684\u5143\u7D20\u985E\u578B "{0}" \u4E0D\u53EF\u5BA3\u544A\u985E\u578B NOTATION \u7684\u5C6C\u6027 "{1}"\u3002
++ RootElementTypeMustMatchDoctypedecl = \u6587\u4EF6\u6839\u5143\u7D20 "{1}" \u5FC5\u9808\u914D\u5C0D DOCTYPE \u6839 "{0}"\u3002
++ UndeclaredElementInContentSpec = \u5143\u7D20 "{0}" \u7684\u5167\u5BB9\u6A21\u578B\u53C3\u7167\u672A\u5BA3\u544A\u7684\u5143\u7D20 "{1}"\u3002
++ UniqueNotationName = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u4E26\u975E\u552F\u4E00\u3002\u6307\u5B9A\u7684 Name \u4E0D\u80FD\u5728\u4E00\u500B\u4EE5\u4E0A\u7684\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u5BA3\u544A\u3002
+ ENTITYFailedInitializeGrammar = ENTITYDatatype \u9A57\u8B49\u7A0B\u5F0F: \u5931\u6557\u3002\u9700\u8981\u4F7F\u7528\u6709\u6548\u7684\u6587\u6CD5\u53C3\u7167\u4F86\u547C\u53EB\u8D77\u59CB\u65B9\u6CD5\u3002 \t
+- ENTITYNotUnparsed = ENTITY \"{0}\" \u4E26\u975E\u672A\u7D93\u5256\u6790\u3002
+- ENTITYNotValid = ENTITY \"{0}\" \u7121\u6548\u3002
++ ENTITYNotUnparsed = ENTITY "{0}" \u4E26\u975E\u672A\u7D93\u5256\u6790\u3002
++ ENTITYNotValid = ENTITY "{0}" \u7121\u6548\u3002
+ EmptyList = \u985E\u578B ENTITIES\u3001IDREFS \u8207 NMTOKENS \u7684\u503C\u4E0D\u53EF\u70BA\u7A7A\u767D\u6E05\u55AE\u3002
+
+ # Entity related messages
+ # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
+- ReferenceToExternalEntity = \u5C6C\u6027\u503C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u500B\u9AD4 \"&{0};\"\u3002
+- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
+- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
++ ReferenceToExternalEntity = \u5C6C\u6027\u503C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5BE6\u9AD4 "&{0};"\u3002
++ AccessExternalDTD = \u5916\u90E8 DTD: \u7121\u6CD5\u8B80\u53D6\u5916\u90E8 DTD ''{0}''\uFF0C\u56E0\u70BA accessExternalDTD \u5C6C\u6027\u8A2D\u5B9A\u7684\u9650\u5236\uFF0C\u6240\u4EE5\u4E0D\u5141\u8A31 ''{1}'' \u5B58\u53D6\u3002
++ AccessExternalEntity = \u5916\u90E8\u5BE6\u9AD4: \u7121\u6CD5\u8B80\u53D6\u5916\u90E8\u6587\u4EF6 ''{0}''\uFF0C\u56E0\u70BA accessExternalDTD \u5C6C\u6027\u8A2D\u5B9A\u7684\u9650\u5236\uFF0C\u6240\u4EE5\u4E0D\u5141\u8A31 ''{1}'' \u5B58\u53D6\u3002
+
+ # 4.1 Character and Entity References
+- EntityNotDeclared = \u53C3\u7167\u4E86\u500B\u9AD4 \"{0}\"\uFF0C\u4F46\u662F\u672A\u5BA3\u544A\u3002
+- ReferenceToUnparsedEntity = \u4E0D\u5141\u8A31\u672A\u5256\u6790\u7684\u500B\u9AD4\u53C3\u7167 \"&{0};\"\u3002
+- RecursiveReference = \u905E\u8FF4\u500B\u9AD4\u53C3\u7167 \"{0}\"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
+- RecursiveGeneralReference = \u905E\u8FF4\u4E00\u822C\u500B\u9AD4\u53C3\u7167 \"&{0};\"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
+- RecursivePEReference = \u905E\u8FF4\u53C3\u6578\u500B\u9AD4\u53C3\u7167 \"%{0};\"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
++ EntityNotDeclared = \u53C3\u7167\u4E86\u5BE6\u9AD4 "{0}"\uFF0C\u4F46\u662F\u672A\u5BA3\u544A\u3002
++ ReferenceToUnparsedEntity = \u4E0D\u5141\u8A31\u672A\u5256\u6790\u7684\u5BE6\u9AD4\u53C3\u7167 "&{0};"\u3002
++ RecursiveReference = \u905E\u8FF4\u5BE6\u9AD4\u53C3\u7167 "{0}"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
++ RecursiveGeneralReference = \u905E\u8FF4\u4E00\u822C\u5BE6\u9AD4\u53C3\u7167 "&{0};"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
++ RecursivePEReference = \u905E\u8FF4\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
+ # 4.3.3 Character Encoding in Entities
+- EncodingNotSupported = \u4E0D\u652F\u63F4\u7DE8\u78BC \"{0}\"\u3002
+- EncodingRequired = \u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u7DE8\u78BC\u7684\u5256\u6790\u500B\u9AD4\uFF0C\u5FC5\u9808\u5305\u542B\u7DE8\u78BC\u5BA3\u544A\u3002
++ EncodingNotSupported = \u4E0D\u652F\u63F4\u7DE8\u78BC "{0}"\u3002
++ EncodingRequired = \u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u7DE8\u78BC\u7684\u5256\u6790\u5BE6\u9AD4\uFF0C\u5FC5\u9808\u5305\u542B\u7DE8\u78BC\u5BA3\u544A\u3002
+
+ # Namespaces support
+ # 4. Using Qualified Names
+ IllegalQName = \u5143\u7D20\u6216\u5C6C\u6027\u4E0D\u7B26\u5408 QName \u7522\u751F: QName::=(NCName':')?NCName\u3002
+- ElementXMLNSPrefix = \u5143\u7D20 \"{0}\" \u4E0D\u80FD\u4F7F\u7528 \"xmlns\" \u4F5C\u70BA\u524D\u7F6E\u78BC\u3002
+- ElementPrefixUnbound = \u5143\u7D20 \"{1}\" \u7684\u524D\u7F6E\u78BC \"{0}\" \u672A\u9023\u7D50\u3002
+- AttributePrefixUnbound = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5C6C\u6027 \"{1}\" \u7684\u524D\u7F6E\u78BC \"{2}\" \u672A\u9023\u7D50\u3002
+- EmptyPrefixedAttName = \u5C6C\u6027 \"{0}\" \u7684\u503C\u7121\u6548\u3002\u524D\u7F6E\u7684\u547D\u540D\u7A7A\u9593\u9023\u7D50\u4E0D\u53EF\u70BA\u7A7A\u767D\u3002
+- PrefixDeclared = \u672A\u5BA3\u544A\u547D\u540D\u7A7A\u9593\u524D\u7F6E\u78BC \"{0}\"\u3002
++ ElementXMLNSPrefix = \u5143\u7D20 "{0}" \u4E0D\u80FD\u4F7F\u7528 "xmlns" \u4F5C\u70BA\u524D\u7F6E\u78BC\u3002
++ ElementPrefixUnbound = \u5143\u7D20 "{1}" \u7684\u524D\u7F6E\u78BC "{0}" \u672A\u9023\u7D50\u3002
++ AttributePrefixUnbound = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5C6C\u6027 "{1}" \u7684\u524D\u7F6E\u78BC "{2}" \u672A\u9023\u7D50\u3002
++ EmptyPrefixedAttName = \u5C6C\u6027 "{0}" \u7684\u503C\u7121\u6548\u3002\u524D\u7F6E\u7684\u547D\u540D\u7A7A\u9593\u9023\u7D50\u4E0D\u53EF\u70BA\u7A7A\u767D\u3002
++ PrefixDeclared = \u672A\u5BA3\u544A\u547D\u540D\u7A7A\u9593\u524D\u7F6E\u78BC "{0}"\u3002
+ CantBindXMLNS = \u524D\u7F6E\u78BC "xmlns" \u7121\u6CD5\u660E\u78BA\u9023\u7D50\u4EFB\u4F55\u547D\u540D\u7A7A\u9593; "xmlns" \u7684\u547D\u540D\u7A7A\u9593\u4E5F\u7121\u6CD5\u660E\u78BA\u9023\u7D50\u4EFB\u4F55\u524D\u7F6E\u78BC\u3002
+ CantBindXML = \u524D\u7F6E\u78BC "xml" \u7121\u6CD5\u9023\u7D50\u4E00\u822C\u547D\u540D\u7A7A\u9593\u4E4B\u5916\u7684\u4EFB\u4F55\u547D\u540D\u7A7A\u9593; "xml" \u7684\u547D\u540D\u7A7A\u9593\u4E5F\u7121\u6CD5\u9023\u7D50 "xml" \u4E4B\u5916\u7684\u4EFB\u4F55\u547D\u540D\u7A7A\u9593\u3002
+- MSG_ATT_DEFAULT_INVALID = \u7531\u65BC\u6B64\u5C6C\u6027\u985E\u578B\u7684\u8A9E\u5F59\u9650\u5236\u689D\u4EF6\uFF0C\u5C6C\u6027 \"{0}\" \u7684 defaultValue \"{1}\" \u7121\u6548\u3002
++ MSG_ATT_DEFAULT_INVALID = \u7531\u65BC\u6B64\u5C6C\u6027\u985E\u578B\u7684\u8A9E\u5F59\u9650\u5236\u689D\u4EF6\uFF0C\u5C6C\u6027 "{0}" \u7684 defaultValue "{1}" \u7121\u6548\u3002
+
+ # REVISIT: These need messages
+ MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
+@@ -320,8 +318,10 @@
+ InvalidCharInLiteral=InvalidCharInLiteral
+
+
+-#Application can set the limit of number of entities that should be expanded by the parser.
+-EntityExpansionLimitExceeded=\u5256\u6790\u5668\u5728\u6B64\u6587\u4EF6\u4E2D\u906D\u9047 \"{0}\" \u500B\u4EE5\u4E0A\u7684\u500B\u9AD4\u64F4\u5145; \u6B64\u70BA\u61C9\u7528\u7A0B\u5F0F\u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
++# Implementation limits
++ EntityExpansionLimitExceeded=JAXP00010001: \u5256\u6790\u5668\u5728\u6B64\u6587\u4EF6\u4E2D\u9047\u5230 "{0}" \u500B\u4EE5\u4E0A\u7684\u5BE6\u9AD4\u64F4\u5145; \u9019\u662F JDK \u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
++ ElementAttributeLimit=JAXP00010002: \u5143\u7D20 "{0}" \u5177\u6709\u8D85\u904E "{1}" \u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\uFF0C"{1}" \u662F JDK \u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
++ MaxEntitySizeLimit=JAXP00010003: \u5BE6\u9AD4 "{0}" \u7684\u9577\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u6240\u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002
++ TotalEntitySizeLimit=JAXP00010004: \u5BE6\u9AD4\u7684\u7D2F\u7A4D\u5927\u5C0F "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
++ MaxXMLNameLimit=JAXP00010005: \u540D\u7A31 "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
+
+-# 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 Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java Tue Oct 08 09:06:57 2013 -0700
+@@ -21,13 +21,13 @@
+
+ package com.sun.org.apache.xerces.internal.impl.xs.models;
+
++import com.sun.org.apache.xerces.internal.impl.Constants;
+ import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
++import com.sun.org.apache.xerces.internal.impl.dtd.models.CMNode;
++import com.sun.org.apache.xerces.internal.impl.xs.XSMessageFormatter;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager ;
+-import com.sun.org.apache.xerces.internal.impl.dtd.models.CMNode;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
+-import com.sun.org.apache.xerces.internal.impl.xs.XSMessageFormatter;
+-import com.sun.org.apache.xerces.internal.impl.Constants;
+
+ /**
+ *
+@@ -68,7 +68,7 @@
+
+ // stores defaults for different security holes (maxOccurLimit in current context) if it has
+ // been set on the configuration.
+- private SecurityManager fSecurityManager = null;
++ private XMLSecurityManager fSecurityManager = null;
+
+ /** default constructor */
+ public CMNodeFactory() {
+@@ -77,10 +77,10 @@
+ public void reset(XMLComponentManager componentManager){
+ fErrorReporter = (XMLErrorReporter)componentManager.getProperty(ERROR_REPORTER);
+ try {
+- fSecurityManager = (SecurityManager)componentManager.getProperty(SECURITY_MANAGER);
++ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
+ //we are setting the limit of number of nodes to 3times the maxOccur value..
+ if(fSecurityManager != null){
+- maxNodeLimit = fSecurityManager.getMaxOccurNodeLimit() * MULTIPLICITY ;
++ maxNodeLimit = fSecurityManager.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT) * MULTIPLICITY ;
+ }
+ }
+ catch (XMLConfigurationException e) {
+@@ -109,7 +109,8 @@
+ }
+
+ public void nodeCountCheck(){
+- if( fSecurityManager != null && nodeCount++ > maxNodeLimit){
++ if( fSecurityManager != null && !fSecurityManager.isNoLimit(maxNodeLimit) &&
++ nodeCount++ > maxNodeLimit){
+ if(DEBUG){
+ System.out.println("nodeCount = " + nodeCount ) ;
+ System.out.println("nodeLimit = " + maxNodeLimit ) ;
+@@ -150,8 +151,9 @@
+
+ if (suffixLength == Constants.SECURITY_MANAGER_PROPERTY.length() &&
+ propertyId.endsWith(Constants.SECURITY_MANAGER_PROPERTY)) {
+- fSecurityManager = (SecurityManager)value;
+- maxNodeLimit = (fSecurityManager != null) ? fSecurityManager.getMaxOccurNodeLimit() * MULTIPLICITY : 0 ;
++ fSecurityManager = (XMLSecurityManager)value;
++ maxNodeLimit = (fSecurityManager != null) ?
++ fSecurityManager.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT) * MULTIPLICITY : 0 ;
+ return;
+ }
+ if (suffixLength == Constants.ERROR_REPORTER_PROPERTY.length() &&
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java Tue Oct 08 09:06:57 2013 -0700
+@@ -40,6 +40,7 @@
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
+ import com.sun.org.apache.xerces.internal.util.XMLChar;
+ import com.sun.org.apache.xerces.internal.util.XMLSymbols;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.xni.QName;
+ import com.sun.org.apache.xerces.internal.xs.XSConstants;
+ import java.util.HashMap;
+@@ -1194,8 +1195,8 @@
+ if (!optimize) {
+ //Revisit :: IMO this is not right place to check
+ // maxOccurNodeLimit.
+- int maxOccurNodeLimit = fSchemaHandler.fSecureProcessing.getMaxOccurNodeLimit();
+- if (max > maxOccurNodeLimit) {
++ int maxOccurNodeLimit = fSchemaHandler.fSecureProcessing.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT);
++ if (max > maxOccurNodeLimit && !fSchemaHandler.fSecureProcessing.isNoLimit(maxOccurNodeLimit)) {
+ reportSchemaFatalError("maxOccurLimit", new Object[] {new Integer(maxOccurNodeLimit)}, element);
+
+ // reset max values in case processing continues on error
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java Tue Oct 08 09:06:57 2013 -0700
+@@ -70,7 +70,6 @@
+ import com.sun.org.apache.xerces.internal.util.DefaultErrorHandler;
+ import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
+ import com.sun.org.apache.xerces.internal.util.SAXInputSource;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+ import com.sun.org.apache.xerces.internal.util.StAXInputSource;
+ import com.sun.org.apache.xerces.internal.util.StAXLocationWrapper;
+ import com.sun.org.apache.xerces.internal.util.SymbolHash;
+@@ -78,6 +77,7 @@
+ import com.sun.org.apache.xerces.internal.util.XMLSymbols;
+ import com.sun.org.apache.xerces.internal.util.URI.MalformedURIException;
+ import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.QName;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+@@ -257,7 +257,7 @@
+ *
+ * <p>Protected to allow access by any traverser.</p>
+ */
+- protected SecurityManager fSecureProcessing = null;
++ protected XMLSecurityManager fSecureProcessing = null;
+
+ private String fAccessExternalSchema;
+ private String fAccessExternalDTD;
+@@ -2251,12 +2251,12 @@
+ }
+ catch (SAXException se) {}
+
+- try {
+- parser.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, fAccessExternalDTD);
+- } catch (SAXNotRecognizedException exc) {
+- System.err.println("Warning: " + parser.getClass().getName() + ": " +
+- exc.getMessage());
+- }
++ try {
++ parser.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, fAccessExternalDTD);
++ } catch (SAXNotRecognizedException exc) {
++ System.err.println("Warning: " + parser.getClass().getName() + ": " +
++ exc.getMessage());
++ }
+ }
+ // If XML names and Namespace URIs are already internalized we
+ // can avoid running them through the SymbolTable.
+@@ -3509,7 +3509,7 @@
+
+ fSecureProcessing = null;
+ if( componentManager!=null ) {
+- fSecureProcessing = (SecurityManager) componentManager.getProperty(SECURE_PROCESSING, null);
++ fSecureProcessing = (XMLSecurityManager) componentManager.getProperty(SECURE_PROCESSING, null);
+ }
+
+ //set entity resolver
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java Tue Oct 08 09:06:57 2013 -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;
+ import com.sun.org.apache.xerces.internal.parsers.DOMParser;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager.Property;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager.State;
+@@ -46,7 +46,6 @@
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLDocumentSource;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
+-import javax.xml.XMLConstants;
+ import org.w3c.dom.DOMImplementation;
+ import org.w3c.dom.Document;
+ import org.xml.sax.EntityResolver;
+@@ -110,7 +109,6 @@
+ /** Property identifier: access to external schema */
+ public static final String ACCESS_EXTERNAL_SCHEMA = XMLConstants.ACCESS_EXTERNAL_SCHEMA;
+
+-
+ private final DOMParser domParser;
+ private final Schema grammar;
+
+@@ -125,6 +123,7 @@
+ /** Initial EntityResolver */
+ private final EntityResolver fInitEntityResolver;
+
++ private XMLSecurityManager fSecurityManager;
+ private XMLSecurityPropertyManager fSecurityPropertyMgr;
+
+ DocumentBuilderImpl(DocumentBuilderFactoryImpl dbf, Hashtable dbfAttrs, Hashtable features)
+@@ -173,10 +172,10 @@
+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+ domParser.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
+
+- // If the secure processing feature is on set a security manager.
++ fSecurityManager = new XMLSecurityManager(secureProcessing);
++ domParser.setProperty(SECURITY_MANAGER, fSecurityManager);
++
+ if (secureProcessing) {
+- domParser.setProperty(SECURITY_MANAGER, new SecurityManager());
+-
+ /**
+ * If secure processing is explicitly set on the factory, the
+ * access properties will be set unless the corresponding
+@@ -250,9 +249,9 @@
+ String feature = (String) entry.getKey();
+ boolean value = ((Boolean) entry.getValue()).booleanValue();
+ domParser.setFeature(feature, value);
+- }
+ }
+ }
++ }
+
+ /**
+ * Set any DocumentBuilderFactory attributes of our underlying DOMParser
+@@ -289,30 +288,33 @@
+ // spec when schema validation is enabled
+ domParser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+ }
+- }
+- } else if(JAXP_SCHEMA_SOURCE.equals(name)){
+- if( isValidating() ) {
+- String value=(String)dbfAttrs.get(JAXP_SCHEMA_LANGUAGE);
+- if(value !=null && W3C_XML_SCHEMA.equals(value)){
+- domParser.setProperty(name, val);
+- }else{
++ }
++ } else if(JAXP_SCHEMA_SOURCE.equals(name)){
++ if( isValidating() ) {
++ String value=(String)dbfAttrs.get(JAXP_SCHEMA_LANGUAGE);
++ if(value !=null && W3C_XML_SCHEMA.equals(value)){
++ domParser.setProperty(name, val);
++ }else{
+ throw new IllegalArgumentException(
+ DOMMessageFormatter.formatMessage(DOMMessageFormatter.DOM_DOMAIN,
+ "jaxp-order-not-supported",
+ new Object[] {JAXP_SCHEMA_LANGUAGE, JAXP_SCHEMA_SOURCE}));
++ }
++ }
++ } else {
++ //check if the property is managed by security manager
++ if (fSecurityManager == null ||
++ !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, val)) {
++ //check if the property is managed by security property manager
++ if (fSecurityPropertyMgr == null ||
++ !fSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, val)) {
++ //fall back to the existing property manager
++ domParser.setProperty(name, val);
+ }
+- }
+- } else {
+- int index = fSecurityPropertyMgr.getIndex(name);
+- if (index > -1) {
+- fSecurityPropertyMgr.setValue(index,
+- XMLSecurityPropertyManager.State.APIPROPERTY, (String)val);
+- } else {
+- // Let Xerces code handle the property
+- domParser.setProperty(name, val);
+ }
+- }
+- }
++
++ }
++ }
+ }
+ }
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Tue Oct 08 09:06:57 2013 -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;
+ import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+ import com.sun.org.apache.xerces.internal.util.Status;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.XMLDocumentHandler;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLComponent;
+@@ -112,6 +112,7 @@
+ /** Initial EntityResolver */
+ private final EntityResolver fInitEntityResolver;
+
++ private final XMLSecurityManager fSecurityManager;
+ private final XMLSecurityPropertyManager fSecurityPropertyMgr;
+
+ /**
+@@ -130,10 +131,10 @@
+ SAXParserImpl(SAXParserFactoryImpl spf, Hashtable features, boolean secureProcessing)
+ throws SAXException
+ {
++ fSecurityManager = new XMLSecurityManager(secureProcessing);
+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+-
+ // Instantiate a SAXParser directly and not through SAX so that we use the right ClassLoader
+- xmlReader = new JAXPSAXParser(this, fSecurityPropertyMgr);
++ xmlReader = new JAXPSAXParser(this, fSecurityPropertyMgr, fSecurityManager);
+
+ // JAXP "namespaceAware" == SAX Namespaces feature
+ // Note: there is a compatibility problem here with default values:
+@@ -154,9 +155,9 @@
+
+ xmlReader.setProperty0(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
+
+- // If the secure processing feature is on set a security manager.
++ xmlReader.setProperty0(SECURITY_MANAGER, fSecurityManager);
++
+ if (secureProcessing) {
+- xmlReader.setProperty0(SECURITY_MANAGER, new SecurityManager());
+ /**
+ * By default, secure processing is set, no external access is allowed.
+ * However, we need to check if it is actively set on the factory since we
+@@ -164,6 +165,7 @@
+ * the default value
+ */
+ if (features != null) {
++
+ Object temp = features.get(XMLConstants.FEATURE_SECURE_PROCESSING);
+ if (temp != null) {
+ boolean value = ((Boolean) temp).booleanValue();
+@@ -172,7 +174,6 @@
+ XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
+ fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
+ XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
+-
+ }
+ }
+ }
+@@ -398,22 +399,34 @@
+ private final HashMap fInitFeatures = new HashMap();
+ private final HashMap fInitProperties = new HashMap();
+ private final SAXParserImpl fSAXParser;
++ private XMLSecurityManager fSecurityManager;
+ private XMLSecurityPropertyManager fSecurityPropertyMgr;
+
+
+ public JAXPSAXParser() {
+- this(null, null);
++ this(null, null, null);
+ }
+
+- JAXPSAXParser(SAXParserImpl saxParser, XMLSecurityPropertyManager spm) {
++ JAXPSAXParser(SAXParserImpl saxParser, XMLSecurityPropertyManager securityPropertyMgr,
++ XMLSecurityManager securityManager) {
+ super();
+ fSAXParser = saxParser;
+- fSecurityPropertyMgr = spm;
+-
++ fSecurityManager = securityManager;
++ fSecurityPropertyMgr = securityPropertyMgr;
+ /**
+ * This class may be used directly. So initialize the security manager if
+ * it is null.
+ */
++ if (fSecurityManager == null) {
++ fSecurityManager = new XMLSecurityManager(true);
++ try {
++ super.setProperty(SECURITY_MANAGER, fSecurityManager);
++ } catch (SAXException e) {
++ throw new UnsupportedOperationException(
++ SAXMessageFormatter.formatMessage(fConfiguration.getLocale(),
++ "property-not-recognized", new Object [] {SECURITY_MANAGER}), e);
++ }
++ }
+ if (fSecurityPropertyMgr == null) {
+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+ try {
+@@ -421,7 +434,7 @@
+ } catch (SAXException e) {
+ throw new UnsupportedOperationException(
+ SAXMessageFormatter.formatMessage(fConfiguration.getLocale(),
+- "property-not-recognized", new Object [] {SECURITY_MANAGER}), e);
++ "property-not-recognized", new Object [] {XML_SECURITY_PROPERTY_MANAGER}), e);
+ }
+ }
+ }
+@@ -439,7 +452,8 @@
+ }
+ if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
+ try {
+- setProperty(SECURITY_MANAGER, value ? new SecurityManager() : null);
++ fSecurityManager.setSecureProcessing(value);
++ setProperty(SECURITY_MANAGER, fSecurityManager);
+ }
+ catch (SAXNotRecognizedException exc) {
+ // If the property is not supported
+@@ -475,13 +489,7 @@
+ throw new NullPointerException();
+ }
+ if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
+- try {
+- return (super.getProperty(SECURITY_MANAGER) != null);
+- }
+- // If the property is not supported the value must be false.
+- catch (SAXException exc) {
+- return false;
+- }
++ return fSecurityManager.isSecureProcessing();
+ }
+ return super.getFeature(name);
+ }
+@@ -560,17 +568,21 @@
+ if (fSAXParser != null && fSAXParser.fSchemaValidator != null) {
+ setSchemaValidatorProperty(name, value);
+ }
+- /** Check to see if the property is managed by the property manager **/
+- int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1;
+- if (index > -1) {
+- fSecurityPropertyMgr.setValue(index,
+- XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
+- } else {
+- if (!fInitProperties.containsKey(name)) {
+- fInitProperties.put(name, super.getProperty(name));
++
++ //check if the property is managed by security manager
++ if (fSecurityManager == null ||
++ !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
++ //check if the property is managed by security property manager
++ if (fSecurityPropertyMgr == null ||
++ !fSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
++ //fall back to the existing property manager
++ if (!fInitProperties.containsKey(name)) {
++ fInitProperties.put(name, super.getProperty(name));
++ }
++ super.setProperty(name, value);
+ }
+- super.setProperty(name, value);
+ }
++
+ }
+
+ public synchronized Object getProperty(String name)
+@@ -583,9 +595,18 @@
+ // JAXP 1.2 support
+ return fSAXParser.schemaLanguage;
+ }
+- int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1;
+- if (index > -1) {
+- return fSecurityPropertyMgr.getValueByIndex(index);
++
++ /** Check to see if the property is managed by the security manager **/
++ String propertyValue = (fSecurityManager != null) ?
++ fSecurityManager.getLimitAsString(name) : null;
++ if (propertyValue != null) {
++ return propertyValue;
++ } else {
++ propertyValue = (fSecurityPropertyMgr != null) ?
++ fSecurityPropertyMgr.getValue(name) : null;
++ if (propertyValue != null) {
++ return propertyValue;
++ }
+ }
+
+ return super.getProperty(name);
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java Tue Oct 08 09:06:57 2013 -0700
+@@ -26,6 +26,7 @@
+ package com.sun.org.apache.xerces.internal.jaxp.validation;
+
+ import com.sun.org.apache.xerces.internal.impl.Constants;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import java.io.IOException;
+
+ import javax.xml.transform.Result;
+@@ -73,6 +74,19 @@
+ SAXTransformerFactory tf = fComponentManager.getFeature(Constants.ORACLE_FEATURE_SERVICE_MECHANISM) ?
+ (SAXTransformerFactory)SAXTransformerFactory.newInstance()
+ : (SAXTransformerFactory) TransformerFactory.newInstance(DEFAULT_TRANSFORMER_IMPL, StAXValidatorHelper.class.getClassLoader());
++ XMLSecurityManager securityManager = (XMLSecurityManager)fComponentManager.getProperty(Constants.SECURITY_MANAGER);
++ if (securityManager != null) {
++ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
++ if (securityManager.isSet(limit.ordinal())){
++ tf.setAttribute(limit.apiProperty(),
++ securityManager.getLimitValueAsString(limit));
++ }
++ }
++ if (securityManager.printEntityCountInfo()) {
++ tf.setAttribute(Constants.JDK_ENTITY_COUNT_INFO, "yes");
++ }
++ }
++
+ identityTransformer1 = tf.newTransformer();
+ identityTransformer2 = tf.newTransformerHandler();
+ } catch (TransformerConfigurationException e) {
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java Tue Oct 08 09:06:57 2013 -0700
+@@ -20,28 +20,27 @@
+
+ package com.sun.org.apache.xerces.internal.jaxp.validation;
+
+-import java.lang.ref.SoftReference;
+-import java.io.IOException;
+-
+-import javax.xml.transform.Result;
+-import javax.xml.transform.Source;
+-import javax.xml.transform.sax.SAXTransformerFactory;
+-import javax.xml.transform.sax.TransformerHandler;
+-import javax.xml.transform.stream.StreamSource;
+-import javax.xml.transform.stream.StreamResult;
+-import javax.xml.transform.TransformerConfigurationException;
+-import javax.xml.transform.TransformerFactory;
+-import javax.xml.transform.TransformerFactoryConfigurationError;
+-import javax.xml.XMLConstants;
+-
+ import com.sun.org.apache.xerces.internal.impl.Constants;
+ import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
+ import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
+ import com.sun.org.apache.xerces.internal.parsers.XML11Configuration;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLParseException;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
++import java.io.IOException;
++import java.lang.ref.SoftReference;
++import javax.xml.XMLConstants;
++import javax.xml.transform.Result;
++import javax.xml.transform.Source;
++import javax.xml.transform.TransformerConfigurationException;
++import javax.xml.transform.TransformerFactory;
++import javax.xml.transform.TransformerFactoryConfigurationError;
++import javax.xml.transform.sax.SAXTransformerFactory;
++import javax.xml.transform.sax.TransformerHandler;
++import javax.xml.transform.stream.StreamResult;
++import javax.xml.transform.stream.StreamSource;
+ import org.xml.sax.SAXException;
+
+ /**
+@@ -86,6 +85,11 @@
+ Constants.XERCES_PROPERTY_PREFIX + Constants.VALIDATION_MANAGER_PROPERTY;
+
+ private static final String DEFAULT_TRANSFORMER_IMPL = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
++
++ /** Property id: security manager. */
++ private static final String SECURITY_MANAGER =
++ Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
++
+ //
+ // Data
+ //
+@@ -165,6 +169,9 @@
+
+ private XMLParserConfiguration initialize() {
+ XML11Configuration config = new XML11Configuration();
++ if (fComponentManager.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING)) {
++ config.setProperty(SECURITY_MANAGER, new XMLSecurityManager());
++ }
+ config.setProperty(ENTITY_RESOLVER, fComponentManager.getProperty(ENTITY_RESOLVER));
+ config.setProperty(ERROR_HANDLER, fComponentManager.getProperty(ERROR_HANDLER));
+ XMLErrorReporter errorReporter = (XMLErrorReporter) fComponentManager.getProperty(ERROR_REPORTER);
+@@ -182,6 +189,8 @@
+ config.setDTDContentModelHandler(null);
+ config.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER,
+ fComponentManager.getProperty(Constants.XML_SECURITY_PROPERTY_MANAGER));
++ config.setProperty(Constants.SECURITY_MANAGER,
++ fComponentManager.getProperty(Constants.SECURITY_MANAGER));
+ fConfiguration = new SoftReference(config);
+ return config;
+ }
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java Tue Oct 08 09:06:57 2013 -0700
+@@ -49,10 +49,10 @@
+ import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
+ import com.sun.org.apache.xerces.internal.util.Status;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+ import com.sun.org.apache.xerces.internal.util.URI;
+ import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl;
+ import com.sun.org.apache.xerces.internal.util.XMLSymbols;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.Augmentations;
+ import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
+@@ -679,10 +679,12 @@
+ SAXParserFactory.newInstance() : new SAXParserFactoryImpl();
+ spf.setNamespaceAware(true);
+ try {
++ spf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
++ fComponentManager.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING));
+ reader = spf.newSAXParser().getXMLReader();
+ // If this is a Xerces SAX parser, set the security manager if there is one
+ if (reader instanceof com.sun.org.apache.xerces.internal.parsers.SAXParser) {
+- SecurityManager securityManager = (SecurityManager) fComponentManager.getProperty(SECURITY_MANAGER);
++ XMLSecurityManager securityManager = (XMLSecurityManager) fComponentManager.getProperty(SECURITY_MANAGER);
+ if (securityManager != null) {
+ try {
+ reader.setProperty(SECURITY_MANAGER, securityManager);
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Tue Oct 08 09:06:57 2013 -0700
+@@ -41,10 +41,10 @@
+ import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
+ import com.sun.org.apache.xerces.internal.util.SAXInputSource;
+ import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+ import com.sun.org.apache.xerces.internal.util.StAXInputSource;
+ import com.sun.org.apache.xerces.internal.util.Status;
+ import com.sun.org.apache.xerces.internal.util.XMLGrammarPoolImpl;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+ import com.sun.org.apache.xerces.internal.xni.grammars.Grammar;
+@@ -79,7 +79,7 @@
+ private static final String XMLGRAMMAR_POOL =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.XMLGRAMMAR_POOL_PROPERTY;
+
+- /** Property identifier: SecurityManager. */
++ /** Property identifier: XMLSecurityManager. */
+ private static final String SECURITY_MANAGER =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
+
+@@ -87,7 +87,6 @@
+ private static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
+-
+ //
+ // Data
+ //
+@@ -108,7 +107,7 @@
+ private ErrorHandlerWrapper fErrorHandlerWrapper;
+
+ /** The SecurityManager. */
+- private SecurityManager fSecurityManager;
++ private XMLSecurityManager fSecurityManager;
+
+ /** The Security property manager. */
+ private XMLSecurityPropertyManager fSecurityPropertyMgr;
+@@ -122,8 +121,6 @@
+ * Note the default value (false) is the safe option..
+ */
+ private final boolean fUseServicesMechanism;
+-
+-
+ public XMLSchemaFactory() {
+ this(true);
+ }
+@@ -141,7 +138,7 @@
+ fXMLSchemaLoader.setErrorHandler(fErrorHandlerWrapper);
+
+ // Enable secure processing feature by default
+- fSecurityManager = new SecurityManager();
++ fSecurityManager = new XMLSecurityManager(true);
+ fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
+
+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+@@ -301,7 +298,7 @@
+ "FeatureNameNull", null));
+ }
+ if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
+- return (fSecurityManager != null);
++ return (fSecurityManager !=null && fSecurityManager.isSecureProcessing());
+ }
+ try {
+ return fXMLSchemaLoader.getFeature(name);
+@@ -365,17 +362,15 @@
+ SAXMessageFormatter.formatMessage(null,
+ "jaxp-secureprocessing-feature", null));
+ }
++
++ fSecurityManager.setSecureProcessing(value);
+ if (value) {
+- fSecurityManager = new SecurityManager();
+-
+ if (Constants.IS_JDK8_OR_ABOVE) {
+ fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
+ XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
+ fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
+ XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
+ }
+- } else {
+- fSecurityManager = null;
+ }
+
+ fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
+@@ -410,9 +405,17 @@
+ "ProperyNameNull", null));
+ }
+ if (name.equals(SECURITY_MANAGER)) {
+- fSecurityManager = (SecurityManager) object;
++ fSecurityManager = XMLSecurityManager.convert(object, fSecurityManager);
+ fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
+ return;
++ } else if (name.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
++ if (object == null) {
++ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
++ } else {
++ fSecurityPropertyMgr = (XMLSecurityPropertyManager)object;
++ }
++ fXMLSchemaLoader.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
++ return;
+ }
+ else if (name.equals(XMLGRAMMAR_POOL)) {
+ throw new SAXNotSupportedException(
+@@ -420,12 +423,15 @@
+ "property-not-supported", new Object [] {name}));
+ }
+ try {
+- int index = fSecurityPropertyMgr.getIndex(name);
+- if (index > -1) {
+- fSecurityPropertyMgr.setValue(index,
+- XMLSecurityPropertyManager.State.APIPROPERTY, (String)object);
+- } else {
+- fXMLSchemaLoader.setProperty(name, object);
++ //check if the property is managed by security manager
++ if (fSecurityManager == null ||
++ !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, object)) {
++ //check if the property is managed by security property manager
++ if (fSecurityPropertyMgr == null ||
++ !fSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, object)) {
++ //fall back to the existing property manager
++ fXMLSchemaLoader.setProperty(name, object);
++ }
+ }
+ }
+ catch (XMLConfigurationException e) {
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java Tue Oct 08 09:06:57 2013 -0700
+@@ -39,9 +39,9 @@
+ import com.sun.org.apache.xerces.internal.util.NamespaceSupport;
+ import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
+ import com.sun.org.apache.xerces.internal.util.PropertyState;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+ import com.sun.org.apache.xerces.internal.util.Status;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+@@ -181,7 +181,7 @@
+ private final HashMap fInitProperties = new HashMap();
+
+ /** Stores the initial security manager. */
+- private final SecurityManager fInitSecurityManager;
++ private XMLSecurityManager fInitSecurityManager;
+
+ /** Stores the initial security property manager. */
+ private final XMLSecurityPropertyManager fSecurityPropertyMgr;
+@@ -221,12 +221,6 @@
+ fComponents.put(ENTITY_RESOLVER, null);
+ fComponents.put(ERROR_HANDLER, null);
+
+- if (System.getSecurityManager() != null) {
+- _isSecureMode = true;
+- setProperty(SECURITY_MANAGER, new SecurityManager());
+- } else {
+- fComponents.put(SECURITY_MANAGER, null);
+- }
+ fComponents.put(SYMBOL_TABLE, new SymbolTable());
+
+ // setup grammar pool
+@@ -241,15 +235,21 @@
+ addRecognizedParamsAndSetDefaults(fErrorReporter, grammarContainer);
+ addRecognizedParamsAndSetDefaults(fSchemaValidator, grammarContainer);
+
+- // if the secure processing feature is set to true, add a security manager to the configuration
+- Boolean secureProcessing = grammarContainer.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING);
+- if (Boolean.TRUE.equals(secureProcessing)) {
+- fInitSecurityManager = new SecurityManager();
++ boolean secureProcessing = grammarContainer.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING);
++ if (System.getSecurityManager() != null) {
++ _isSecureMode = true;
++ secureProcessing = true;
+ }
+- else {
+- fInitSecurityManager = null;
++
++ fInitSecurityManager = (XMLSecurityManager)
++ grammarContainer.getProperty(SECURITY_MANAGER);
++ if (fInitSecurityManager != null ) {
++ fInitSecurityManager.setSecureProcessing(secureProcessing);
++ } else {
++ fInitSecurityManager = new XMLSecurityManager(secureProcessing);
+ }
+- fComponents.put(SECURITY_MANAGER, fInitSecurityManager);
++
++ setProperty(SECURITY_MANAGER, fInitSecurityManager);
+
+ //pass on properties set on SchemaFactory
+ fSecurityPropertyMgr = (XMLSecurityPropertyManager)
+@@ -281,7 +281,7 @@
+ return FeatureState.is(fUseGrammarPoolOnly);
+ }
+ else if (XMLConstants.FEATURE_SECURE_PROCESSING.equals(featureId)) {
+- return FeatureState.is(getProperty(SECURITY_MANAGER) != null);
++ return FeatureState.is(fInitSecurityManager.isSecureProcessing());
+ }
+ else if (SCHEMA_ELEMENT_DEFAULT.equals(featureId)) {
+ return FeatureState.is(true); //pre-condition: VALIDATION and SCHEMA_VALIDATION are always true
+@@ -311,7 +311,8 @@
+ if (_isSecureMode && !value) {
+ throw new XMLConfigurationException(Status.NOT_ALLOWED, XMLConstants.FEATURE_SECURE_PROCESSING);
+ }
+- setProperty(SECURITY_MANAGER, value ? new SecurityManager() : null);
++ fInitSecurityManager.setSecureProcessing(value);
++ setProperty(SECURITY_MANAGER, fInitSecurityManager);
+
+ if (value && Constants.IS_JDK8_OR_ABOVE) {
+ fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
+@@ -390,10 +391,20 @@
+ fComponents.put(propertyId, value);
+ return;
+ }
+- if (!fInitProperties.containsKey(propertyId)) {
+- fInitProperties.put(propertyId, super.getProperty(propertyId));
++
++ //check if the property is managed by security manager
++ if (fInitSecurityManager == null ||
++ !fInitSecurityManager.setLimit(propertyId, XMLSecurityManager.State.APIPROPERTY, value)) {
++ //check if the property is managed by security property manager
++ if (fSecurityPropertyMgr == null ||
++ !fSecurityPropertyMgr.setValue(propertyId, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
++ //fall back to the existing property manager
++ if (!fInitProperties.containsKey(propertyId)) {
++ fInitProperties.put(propertyId, super.getProperty(propertyId));
++ }
++ super.setProperty(propertyId, value);
++ }
+ }
+- super.setProperty(propertyId, value);
+ }
+
+ /**
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java Tue Oct 08 09:06:57 2013 -0700
+@@ -20,18 +20,15 @@
+
+ package com.sun.org.apache.xerces.internal.parsers;
+
+-import java.io.IOException;
+-import java.util.Locale;
+-
+ import com.sun.org.apache.xerces.internal.impl.Constants;
+-import com.sun.org.apache.xerces.internal.util.Status;
+-import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
++import com.sun.org.apache.xerces.internal.util.EntityResolver2Wrapper;
+ import com.sun.org.apache.xerces.internal.util.EntityResolverWrapper;
+-import com.sun.org.apache.xerces.internal.util.EntityResolver2Wrapper;
+ import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
+ import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
++import com.sun.org.apache.xerces.internal.util.Status;
+ import com.sun.org.apache.xerces.internal.util.SymbolHash;
+ import com.sun.org.apache.xerces.internal.util.XMLSymbols;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.xni.Augmentations;
+ import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
+ import com.sun.org.apache.xerces.internal.xni.QName;
+@@ -48,15 +45,17 @@
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
+ import com.sun.org.apache.xerces.internal.xs.AttributePSVI;
+ import com.sun.org.apache.xerces.internal.xs.ElementPSVI;
++import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
++import java.io.IOException;
++import java.util.Locale;
++import javax.xml.XMLConstants;
+ import org.xml.sax.AttributeList;
+-import org.xml.sax.Attributes;
+ import org.xml.sax.ContentHandler;
+ import org.xml.sax.DTDHandler;
+ import org.xml.sax.DocumentHandler;
+ import org.xml.sax.EntityResolver;
+ import org.xml.sax.ErrorHandler;
+ import org.xml.sax.InputSource;
+-import org.xml.sax.Locator;
+ import org.xml.sax.Parser;
+ import org.xml.sax.SAXException;
+ import org.xml.sax.SAXNotRecognizedException;
+@@ -131,6 +130,10 @@
+ protected static final String DOM_NODE =
+ Constants.SAX_PROPERTY_PREFIX + Constants.DOM_NODE_PROPERTY;
+
++ /** Property id: security manager. */
++ private static final String SECURITY_MANAGER =
++ Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
++
+ /** Recognized properties. */
+ private static final String[] RECOGNIZED_PROPERTIES = {
+ LEXICAL_HANDLER,
+@@ -1645,19 +1648,13 @@
+ // Drop through and perform default processing
+ //
+ }
+-
+- //
+- // Xerces Features
+- //
+-
+- /*
+- else if (featureId.startsWith(XERCES_FEATURES_PREFIX)) {
+- String feature = featureId.substring(XERCES_FEATURES_PREFIX.length());
+- //
+- // Drop through and perform default processing
+- //
++ else if (featureId.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
++ if (state) {
++ if (fConfiguration.getProperty(SECURITY_MANAGER )==null) {
++ fConfiguration.setProperty(SECURITY_MANAGER, new XMLSecurityManager());
++ }
++ }
+ }
+- */
+
+ //
+ // Default handling
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java Tue Oct 08 09:06:57 2013 -0700
+@@ -29,6 +29,7 @@
+ import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
+ import com.sun.org.apache.xerces.internal.util.Status;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+ import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
+@@ -531,7 +532,54 @@
+ */
+ public void setProperty(String propertyId, Object value)
+ throws SAXNotRecognizedException, SAXNotSupportedException {
++ /**
++ * It's possible for users to set a security manager through the interface.
++ * If it's the old SecurityManager, convert it to the new XMLSecurityManager
++ */
++ if (propertyId.equals(Constants.SECURITY_MANAGER)) {
++ securityManager = XMLSecurityManager.convert(value, securityManager);
++ setProperty0(Constants.SECURITY_MANAGER, securityManager);
++ return;
++ }
++ if (propertyId.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
++ if (value == null) {
++ securityPropertyManager = new XMLSecurityPropertyManager();
++ } else {
++ securityPropertyManager = (XMLSecurityPropertyManager)value;
++ }
++ setProperty0(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
++ return;
++ }
+
++ if (securityManager == null) {
++ securityManager = new XMLSecurityManager(true);
++ setProperty0(Constants.SECURITY_MANAGER, securityManager);
++ }
++
++ if (securityPropertyManager == null) {
++ securityPropertyManager = new XMLSecurityPropertyManager();
++ setProperty0(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
++ }
++ int index = securityPropertyManager.getIndex(propertyId);
++
++ if (index > -1) {
++ /**
++ * this is a direct call to this parser, not a subclass since
++ * internally the support of this property is done through
++ * XMLSecurityPropertyManager
++ */
++ securityPropertyManager.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
++ } else {
++ //check if the property is managed by security manager
++ if (!securityManager.setLimit(propertyId, XMLSecurityManager.State.APIPROPERTY, value)) {
++ //fall back to the default configuration to handle the property
++ setProperty0(propertyId, value);
++ }
++ }
++ }
++
++ public void setProperty0(String propertyId, Object value)
++ throws SAXNotRecognizedException, SAXNotSupportedException {
+ try {
+ fConfiguration.setProperty(propertyId, value);
+ }
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java Tue Oct 08 09:06:57 2013 -0700
+@@ -38,7 +38,6 @@
+ import com.sun.org.apache.xerces.internal.util.PropertyState;
+ import com.sun.org.apache.xerces.internal.util.Status;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
+-import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.XMLLocator;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+ import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
+@@ -189,6 +188,9 @@
+ protected static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
++ /** Property identifier: Security manager. */
++ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
++
+ // debugging
+
+ /** Set to true and recompile to print exception stack trace. */
+@@ -334,6 +336,7 @@
+ JAXP_SCHEMA_SOURCE,
+ JAXP_SCHEMA_LANGUAGE,
+ LOCALE,
++ SECURITY_MANAGER,
+ XML_SECURITY_PROPERTY_MANAGER
+ };
+ addRecognizedProperties(recognizedProperties);
+@@ -411,8 +414,6 @@
+ // do nothing
+ // REVISIT: What is the right thing to do? -Ac
+ }
+-
+- setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
+ } // <init>(SymbolTable,XMLGrammarPool)
+
+ //
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java Tue Oct 08 09:06:57 2013 -0700
+@@ -36,7 +36,6 @@
+ import com.sun.org.apache.xerces.internal.util.PropertyState;
+ import com.sun.org.apache.xerces.internal.util.Status;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
+-import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.XMLLocator;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+ import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
+@@ -162,6 +161,9 @@
+ protected static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
++ /** Property identifier: Security manager. */
++ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
++
+ // debugging
+
+ /** Set to true and recompile to print exception stack trace. */
+@@ -316,6 +318,7 @@
+ DATATYPE_VALIDATOR_FACTORY,
+ VALIDATION_MANAGER,
+ LOCALE,
++ SECURITY_MANAGER,
+ XML_SECURITY_PROPERTY_MANAGER
+ };
+ addRecognizedProperties(recognizedProperties);
+@@ -372,8 +375,6 @@
+ // do nothing
+ // REVISIT: What is the right thing to do? -Ac
+ }
+-
+- setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
+ } // <init>(SymbolTable,XMLGrammarPool)
+
+ //
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java Tue Oct 08 09:06:57 2013 -0700
+@@ -22,6 +22,7 @@
+
+ import com.sun.org.apache.xerces.internal.impl.Constants;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
+@@ -76,7 +77,7 @@
+ XMLGRAMMAR_POOL,
+ };
+
+- XMLSecurityPropertyManager securityPropertyManager;
++
+ //
+ // Constructors
+ //
+@@ -130,11 +131,36 @@
+ */
+ public void setProperty(String name, Object value)
+ throws SAXNotRecognizedException, SAXNotSupportedException {
++ /**
++ * It's possible for users to set a security manager through the interface.
++ * If it's the old SecurityManager, convert it to the new XMLSecurityManager
++ */
++ if (name.equals(Constants.SECURITY_MANAGER)) {
++ securityManager = XMLSecurityManager.convert(value, securityManager);
++ super.setProperty(Constants.SECURITY_MANAGER, securityManager);
++ return;
++ }
++ if (name.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
++ if (value == null) {
++ securityPropertyManager = new XMLSecurityPropertyManager();
++ } else {
++ securityPropertyManager = (XMLSecurityPropertyManager)value;
++ }
++ super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
++ return;
++ }
++
++ if (securityManager == null) {
++ securityManager = new XMLSecurityManager(true);
++ super.setProperty(Constants.SECURITY_MANAGER, securityManager);
++ }
++
+ if (securityPropertyManager == null) {
+ securityPropertyManager = new XMLSecurityPropertyManager();
++ super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
+ }
++
+ int index = securityPropertyManager.getIndex(name);
+-
+ if (index > -1) {
+ /**
+ * this is a direct call to this parser, not a subclass since
+@@ -142,9 +168,12 @@
+ * XMLSecurityPropertyManager
+ */
+ securityPropertyManager.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
+- super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
+ } else {
+- super.setProperty(name, value);
++ //check if the property is managed by security manager
++ if (!securityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
++ //fall back to the default configuration to handle the property
++ super.setProperty(name, value);
++ }
+ }
+ }
+ } // class SAXParser
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java Tue Oct 08 09:06:57 2013 -0700
+@@ -23,8 +23,8 @@
+ import com.sun.org.apache.xerces.internal.impl.Constants;
+ import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+
+ /**
+ * This configuration allows Xerces to behave in a security-conscious manner; that is,
+@@ -44,6 +44,7 @@
+ *
+ * @author Neil Graham, IBM
+ *
++ * @version $Id: SecurityConfiguration.java,v 1.6 2010-11-01 04:40:09 joehw Exp $
+ */
+ public class SecurityConfiguration extends XIncludeAwareParserConfiguration
+ {
+@@ -107,7 +108,7 @@
+ super(symbolTable, grammarPool, parentSettings);
+
+ // create the SecurityManager property:
+- setProperty(SECURITY_MANAGER_PROPERTY, new SecurityManager());
++ setProperty(SECURITY_MANAGER_PROPERTY, new XMLSecurityManager(true));
+ } // <init>(SymbolTable,XMLGrammarPool)
+
+ } // class SecurityConfiguration
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java Tue Oct 08 09:06:57 2013 -0700
+@@ -52,6 +52,7 @@
+ import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
+ import com.sun.org.apache.xerces.internal.util.PropertyState;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.XMLDTDContentModelHandler;
+ import com.sun.org.apache.xerces.internal.xni.XMLDTDHandler;
+@@ -279,6 +280,8 @@
+ private static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
++ /** Property identifier: Security manager. */
++ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
+
+ // debugging
+
+@@ -289,33 +292,33 @@
+ // Data
+ //
+
+- protected SymbolTable fSymbolTable;
++ protected SymbolTable fSymbolTable;
+ protected XMLInputSource fInputSource;
+ protected ValidationManager fValidationManager;
+- protected XMLVersionDetector fVersionDetector;
++ protected XMLVersionDetector fVersionDetector;
+ protected XMLLocator fLocator;
+- protected Locale fLocale;
++ protected Locale fLocale;
+
+- /** XML 1.0 Components. */
+- protected ArrayList fComponents;
++ /** XML 1.0 Components. */
++ protected ArrayList fComponents;
+
+- /** XML 1.1. Components. */
+- protected ArrayList fXML11Components = null;
++ /** XML 1.1. Components. */
++ protected ArrayList fXML11Components = null;
+
+- /** Common components: XMLEntityManager, XMLErrorReporter, XMLSchemaValidator */
+- protected ArrayList fCommonComponents = null;
++ /** Common components: XMLEntityManager, XMLErrorReporter, XMLSchemaValidator */
++ protected ArrayList fCommonComponents = null;
+
+- /** The document handler. */
+- protected XMLDocumentHandler fDocumentHandler;
++ /** The document handler. */
++ protected XMLDocumentHandler fDocumentHandler;
+
+- /** The DTD handler. */
+- protected XMLDTDHandler fDTDHandler;
++ /** The DTD handler. */
++ protected XMLDTDHandler fDTDHandler;
+
+- /** The DTD content model handler. */
+- protected XMLDTDContentModelHandler fDTDContentModelHandler;
++ /** The DTD content model handler. */
++ protected XMLDTDContentModelHandler fDTDContentModelHandler;
+
+- /** Last component in the document pipeline */
+- protected XMLDocumentSource fLastComponent;
++ /** Last component in the document pipeline */
++ protected XMLDocumentSource fLastComponent;
+
+ /**
+ * True if a parse is in progress. This state is needed because
+@@ -495,31 +498,31 @@
+ fFeatures.put(SCHEMA_ELEMENT_DEFAULT, Boolean.TRUE);
+ fFeatures.put(NORMALIZE_DATA, Boolean.TRUE);
+ fFeatures.put(SCHEMA_AUGMENT_PSVI, Boolean.TRUE);
+- fFeatures.put(GENERATE_SYNTHETIC_ANNOTATIONS, Boolean.FALSE);
+- fFeatures.put(VALIDATE_ANNOTATIONS, Boolean.FALSE);
+- fFeatures.put(HONOUR_ALL_SCHEMALOCATIONS, Boolean.FALSE);
+- fFeatures.put(NAMESPACE_GROWTH, Boolean.FALSE);
+- fFeatures.put(TOLERATE_DUPLICATES, Boolean.FALSE);
+- fFeatures.put(USE_GRAMMAR_POOL_ONLY, Boolean.FALSE);
++ fFeatures.put(GENERATE_SYNTHETIC_ANNOTATIONS, Boolean.FALSE);
++ fFeatures.put(VALIDATE_ANNOTATIONS, Boolean.FALSE);
++ fFeatures.put(HONOUR_ALL_SCHEMALOCATIONS, Boolean.FALSE);
++ fFeatures.put(NAMESPACE_GROWTH, Boolean.FALSE);
++ fFeatures.put(TOLERATE_DUPLICATES, Boolean.FALSE);
++ fFeatures.put(USE_GRAMMAR_POOL_ONLY, Boolean.FALSE);
+ fFeatures.put(PARSER_SETTINGS, Boolean.TRUE);
+ fFeatures.put(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+
+ // add default recognized properties
+ final String[] recognizedProperties =
+ {
+- SYMBOL_TABLE,
+- ERROR_HANDLER,
+- ENTITY_RESOLVER,
++ SYMBOL_TABLE,
++ ERROR_HANDLER,
++ ENTITY_RESOLVER,
+ ERROR_REPORTER,
+ ENTITY_MANAGER,
+ DOCUMENT_SCANNER,
+ DTD_SCANNER,
+ DTD_PROCESSOR,
+ DTD_VALIDATOR,
+- DATATYPE_VALIDATOR_FACTORY,
+- VALIDATION_MANAGER,
+- SCHEMA_VALIDATOR,
+- XML_STRING,
++ DATATYPE_VALIDATOR_FACTORY,
++ VALIDATION_MANAGER,
++ SCHEMA_VALIDATOR,
++ XML_STRING,
+ XMLGRAMMAR_POOL,
+ JAXP_SCHEMA_SOURCE,
+ JAXP_SCHEMA_LANGUAGE,
+@@ -531,19 +534,20 @@
+ SCHEMA_NONS_LOCATION,
+ LOCALE,
+ SCHEMA_DV_FACTORY,
++ SECURITY_MANAGER,
+ XML_SECURITY_PROPERTY_MANAGER
+ };
+ addRecognizedProperties(recognizedProperties);
+
+- if (symbolTable == null) {
+- symbolTable = new SymbolTable();
+- }
+- fSymbolTable = symbolTable;
+- fProperties.put(SYMBOL_TABLE, fSymbolTable);
++ if (symbolTable == null) {
++ symbolTable = new SymbolTable();
++ }
++ fSymbolTable = symbolTable;
++ fProperties.put(SYMBOL_TABLE, fSymbolTable);
+
+ fGrammarPool = grammarPool;
+ if (fGrammarPool != null) {
+- fProperties.put(XMLGRAMMAR_POOL, fGrammarPool);
++ fProperties.put(XMLGRAMMAR_POOL, fGrammarPool);
+ }
+
+ fEntityManager = new XMLEntityManager();
+@@ -579,8 +583,6 @@
+
+ fVersionDetector = new XMLVersionDetector();
+
+- fProperties.put(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
+-
+ // add message formatters
+ if (fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN) == null) {
+ XMLMessageFormatter xmft = new XMLMessageFormatter();
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java Tue Oct 08 09:06:57 2013 -0700
+@@ -23,6 +23,8 @@
+ import java.io.IOException;
+
+ import com.sun.org.apache.xerces.internal.impl.Constants;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
+@@ -78,6 +80,13 @@
+ /** The parser configuration. */
+ protected XMLParserConfiguration fConfiguration;
+
++ /** The XML Security Manager. */
++ XMLSecurityManager securityManager;
++
++ /** The XML Security Property Manager. */
++ XMLSecurityPropertyManager securityPropertyManager;
++
++
+ //
+ // Constructors
+ //
+@@ -118,6 +127,15 @@
+ */
+ public void parse(XMLInputSource inputSource)
+ throws XNIException, IOException {
++ // null indicates that the parser is called directly, initialize them
++ if (securityManager == null) {
++ securityManager = new XMLSecurityManager(true);
++ fConfiguration.setProperty(Constants.SECURITY_MANAGER, securityManager);
++ }
++ if (securityPropertyManager == null) {
++ securityPropertyManager = new XMLSecurityPropertyManager();
++ fConfiguration.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
++ }
+
+ reset();
+ fConfiguration.parse(inputSource);
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java Tue Oct 08 09:06:57 2013 -0700
+@@ -61,8 +61,6 @@
+
+ package com.sun.org.apache.xerces.internal.util;
+ import com.sun.org.apache.xerces.internal.impl.Constants;
+-import java.security.AccessController;
+-import java.security.PrivilegedAction;
+ /**
+ * This class is a container for parser settings that relate to
+ * security, or more specifically, it is intended to be used to prevent denial-of-service
+@@ -79,7 +77,6 @@
+ *
+ * @author Neil Graham, IBM
+ *
+- * @version $Id: SecurityManager.java,v 1.5 2010-11-01 04:40:14 joehw Exp $
+ */
+ public final class SecurityManager {
+
+@@ -179,48 +176,40 @@
+
+ private void readSystemProperties(){
+
+- //TODO: also read SYSTEM_PROPERTY_ELEMENT_ATTRIBUTE_LIMIT
+- try {
+- String value = getSystemProperty(Constants.ENTITY_EXPANSION_LIMIT);
+- if(value != null && !value.equals("")){
+- entityExpansionLimit = Integer.parseInt(value);
+- if (entityExpansionLimit < 0)
+- entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
+- }
+- else
+- entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
+- }catch(Exception ex){}
++ try {
++ String value = System.getProperty(Constants.ENTITY_EXPANSION_LIMIT);
++ if(value != null && !value.equals("")){
++ entityExpansionLimit = Integer.parseInt(value);
++ if (entityExpansionLimit < 0)
++ entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
++ }
++ else
++ entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
++ }catch(Exception ex){}
+
+- try {
+- String value = getSystemProperty(Constants.MAX_OCCUR_LIMIT);
+- if(value != null && !value.equals("")){
+- maxOccurLimit = Integer.parseInt(value);
+- if (maxOccurLimit < 0)
+- maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
+- }
+- else
+- maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
+- }catch(Exception ex){}
++ try {
++ String value = System.getProperty(Constants.MAX_OCCUR_LIMIT);
++ if(value != null && !value.equals("")){
++ maxOccurLimit = Integer.parseInt(value);
++ if (maxOccurLimit < 0)
++ maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
++ }
++ else
++ maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
++ }catch(Exception ex){}
+
+- try {
+- String value = getSystemProperty(Constants.SYSTEM_PROPERTY_ELEMENT_ATTRIBUTE_LIMIT);
+- if(value != null && !value.equals("")){
+- fElementAttributeLimit = Integer.parseInt(value);
+- if ( fElementAttributeLimit < 0)
+- fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
+- }
+- else
+- fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
++ try {
++ String value = System.getProperty(Constants.ELEMENT_ATTRIBUTE_LIMIT);
++ if(value != null && !value.equals("")){
++ fElementAttributeLimit = Integer.parseInt(value);
++ if ( fElementAttributeLimit < 0)
++ fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
++ }
++ else
++ fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
+
+ }catch(Exception ex){}
+
+ }
+
+- private String getSystemProperty(final String propName) {
+- return AccessController.doPrivileged(new PrivilegedAction<String>() {
+- public String run() {
+- return System.getProperty(propName);
+- }
+- });
+- }
+ } // class SecurityManager
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java Tue Oct 08 09:06:57 2013 -0700
+@@ -173,7 +173,7 @@
+ for (int i = 0; i < length; i++) {
+ code = code * 37 + symbol.charAt(i);
+ }
+- return code & 0x7FFFFFF;
++ return code & 0x7FFFFFFF;
+
+ } // hash(String):int
+
+@@ -194,7 +194,7 @@
+ for (int i = 0; i < length; i++) {
+ code = code * 37 + buffer[offset + i];
+ }
+- return code & 0x7FFFFFF;
++ return code & 0x7FFFFFFF;
+
+ } // hash(char[],int,int):int
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java Tue Oct 08 09:06:57 2013 -0700
+@@ -0,0 +1,239 @@
++/*
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
++ *
++ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
++ *
++ * The contents of this file are subject to the terms of either the GNU
++ * General Public License Version 2 only ("GPL") or the Common Development
++ * and Distribution License("CDDL") (collectively, the "License"). You
++ * may not use this file except in compliance with the License. You can
++ * obtain a copy of the License at
++ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
++ * or packager/legal/LICENSE.txt. See the License for the specific
++ * language governing permissions and limitations under the License.
++ *
++ * When distributing the software, include this License Header Notice in each
++ * file and include the License file at packager/legal/LICENSE.txt.
++ *
++ * GPL Classpath Exception:
++ * Oracle designates this particular file as subject to the "Classpath"
++ * exception as provided by Oracle in the GPL Version 2 section of the License
++ * file that accompanied this code.
++ *
++ * Modifications:
++ * If applicable, add the following below the License Header, with the fields
++ * enclosed by brackets [] replaced by your own identifying information:
++ * "Portions Copyright [year] [name of copyright owner]"
++ *
++ * Contributor(s):
++ * If you wish your version of this file to be governed by only the CDDL or
++ * only the GPL Version 2, indicate your decision by adding "[Contributor]
++ * elects to include this software in this distribution under the [CDDL or GPL
++ * Version 2] license." If you don't indicate a single choice of license, a
++ * recipient has the option to distribute your version of this file under
++ * either the CDDL, the GPL Version 2 or to extend the choice of license to
++ * its licensees as provided above. However, if you add GPL Version 2 code
++ * and therefore, elected the GPL Version 2 license, then the option applies
++ * only if the new code is made subject to such option by the copyright
++ * holder.
++ */
++package com.sun.org.apache.xerces.internal.utils;
++
++import com.sun.org.apache.xerces.internal.impl.Constants;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager.Limit;
++import java.util.Formatter;
++import java.util.HashMap;
++import java.util.Map;
++
++/**
++ * A helper for analyzing entity expansion limits
++ *
++ * @author Joe Wang Oracle Corp.
++ *
++ */
++public final class XMLLimitAnalyzer {
++
++ /**
++ * Map old property names with the new ones
++ */
++ public static enum NameMap {
++ ENTITY_EXPANSION_LIMIT(Constants.SP_ENTITY_EXPANSION_LIMIT, Constants.ENTITY_EXPANSION_LIMIT),
++ MAX_OCCUR_NODE_LIMIT(Constants.SP_MAX_OCCUR_LIMIT, Constants.MAX_OCCUR_LIMIT),
++ ELEMENT_ATTRIBUTE_LIMIT(Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, Constants.ELEMENT_ATTRIBUTE_LIMIT);
++
++ final String newName;
++ final String oldName;
++
++ NameMap(String newName, String oldName) {
++ this.newName = newName;
++ this.oldName = oldName;
++ }
++
++ String getOldName(String newName) {
++ if (newName.equals(this.newName)) {
++ return oldName;
++ }
++ return null;
++ }
++ }
++
++ private XMLSecurityManager securityManager;
++ /**
++ * Max value accumulated for each property
++ */
++ private final int[] values;
++ /**
++ * Names of the entities corresponding to their max values
++ */
++ private final String[] names;
++ /**
++ * Total value of accumulated entities
++ */
++ private final int[] totalValue;
++
++ /**
++ * Maintain values of the top 10 elements in the process of parsing
++ */
++ private final Map[] caches;
++
++ private String entityStart, entityEnd;
++ /**
++ * Default constructor. Establishes default values for known security
++ * vulnerabilities.
++ */
++ public XMLLimitAnalyzer(XMLSecurityManager securityManager) {
++ this.securityManager = securityManager;
++ values = new int[Limit.values().length];
++ totalValue = new int[Limit.values().length];
++ names = new String[Limit.values().length];
++ caches = new Map[Limit.values().length];
++ }
++
++ /**
++ * Add the value to the current max count for the specified property
++ * To find the max value of all entities, set no limit
++ *
++ * @param limit the type of the property
++ * @param entityName the name of the entity
++ * @param value the value of the entity
++ */
++ public void addValue(Limit limit, String entityName, int value) {
++ addValue(limit.ordinal(), entityName, value);
++ }
++
++ /**
++ * Add the value to the current count by the index of the property
++ * @param index the index of the property
++ * @param entityName the name of the entity
++ * @param value the value of the entity
++ */
++ public void addValue(int index, String entityName, int value) {
++ if (index == Limit.ENTITY_EXPANSION_LIMIT.ordinal() ||
++ index == Limit.MAX_OCCUR_NODE_LIMIT.ordinal() ||
++ index == Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal()) {
++ totalValue[index] += value;
++ return;
++ }
++
++ Map<String, Integer> cache;
++ if (caches[index] == null) {
++ cache = new HashMap<String, Integer>(10);
++ caches[index] = cache;
++ } else {
++ cache = caches[index];
++ }
++
++ int accumulatedValue = value;
++ if (cache.containsKey(entityName)) {
++ accumulatedValue += cache.get(entityName).intValue();
++ cache.put(entityName, Integer.valueOf(accumulatedValue));
++ } else {
++ cache.put(entityName, Integer.valueOf(value));
++ }
++
++ if (accumulatedValue > values[index]) {
++ values[index] = accumulatedValue;
++ names[index] = entityName;
++ }
++
++
++ if (index == Limit.GENEAL_ENTITY_SIZE_LIMIT.ordinal() ||
++ index == Limit.PARAMETER_ENTITY_SIZE_LIMIT.ordinal()) {
++ totalValue[Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal()] += value;
++ }
++ }
++
++ /**
++ * Return the value of the current max count for the specified property
++ *
++ * @param limit the property
++ * @return the value of the property
++ */
++ public int getValue(Limit limit) {
++ return values[limit.ordinal()];
++ }
++
++ public int getValue(int index) {
++ return values[index];
++ }
++ /**
++ * Return the total value accumulated so far
++ *
++ * @param limit the property
++ * @return the accumulated value of the property
++ */
++ public int getTotalValue(Limit limit) {
++ return totalValue[limit.ordinal()];
++ }
++
++ public int getTotalValue(int index) {
++ return totalValue[index];
++ }
++ /**
++ * Return the current max value (count or length) by the index of a property
++ * @param index the index of a property
++ * @return count of a property
++ */
++ public int getValueByIndex(int index) {
++ return values[index];
++ }
++
++ public void startEntity(String name) {
++ entityStart = name;
++ }
++
++ public boolean isTracking(String name) {
++ if (entityStart == null) {
++ return false;
++ }
++ return entityStart.equals(name);
++ }
++ /**
++ * Stop tracking the entity
++ * @param limit the limit property
++ * @param name the name of an entity
++ */
++ public void endEntity(Limit limit, String name) {
++ entityStart = "";
++ Map<String, Integer> cache = caches[limit.ordinal()];
++ if (cache != null) {
++ cache.remove(name);
++ }
++ }
++
++ public void debugPrint() {
++ Formatter formatter = new Formatter();
++ System.out.println(formatter.format("%30s %15s %15s %15s %30s",
++ "Property","Limit","Total size","Size","Entity Name"));
++
++ for (Limit limit : Limit.values()) {
++ formatter = new Formatter();
++ System.out.println(formatter.format("%30s %15d %15d %15d %30s",
++ limit.name(),
++ securityManager.getLimit(limit),
++ totalValue[limit.ordinal()],
++ values[limit.ordinal()],
++ names[limit.ordinal()]));
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java Tue Oct 08 09:06:57 2013 -0700
+@@ -0,0 +1,555 @@
++/*
++ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.org.apache.xerces.internal.utils;
++
++import com.sun.org.apache.xerces.internal.impl.Constants;
++import com.sun.org.apache.xerces.internal.util.SecurityManager;
++
++/**
++ * This class manages standard and implementation-specific limitations.
++ *
++ */
++public final class XMLSecurityManager {
++
++ /**
++ * States of the settings of a property, in the order: default value, value
++ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
++ * properties, and jaxp api properties
++ */
++ public static enum State {
++ //this order reflects the overriding order
++
++ DEFAULT("default"), FSP("FEATURE_SECURE_PROCESSING"),
++ JAXPDOTPROPERTIES("jaxp.properties"), SYSTEMPROPERTY("system property"),
++ APIPROPERTY("property");
++
++ final String literal;
++ State(String literal) {
++ this.literal = literal;
++ }
++
++ String literal() {
++ return literal;
++ }
++ }
++
++ /**
++ * Limits managed by the security manager
++ */
++ public static enum Limit {
++
++ ENTITY_EXPANSION_LIMIT(Constants.JDK_ENTITY_EXPANSION_LIMIT, Constants.SP_ENTITY_EXPANSION_LIMIT, 0, 64000),
++ MAX_OCCUR_NODE_LIMIT(Constants.JDK_MAX_OCCUR_LIMIT, Constants.SP_MAX_OCCUR_LIMIT, 0, 5000),
++ ELEMENT_ATTRIBUTE_LIMIT(Constants.JDK_ELEMENT_ATTRIBUTE_LIMIT, Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
++ TOTAL_ENTITY_SIZE_LIMIT(Constants.JDK_TOTAL_ENTITY_SIZE_LIMIT, Constants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
++ GENEAL_ENTITY_SIZE_LIMIT(Constants.JDK_GENEAL_ENTITY_SIZE_LIMIT, Constants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
++ PARAMETER_ENTITY_SIZE_LIMIT(Constants.JDK_PARAMETER_ENTITY_SIZE_LIMIT, Constants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000);
++
++ final String apiProperty;
++ final String systemProperty;
++ final int defaultValue;
++ final int secureValue;
++
++ Limit(String apiProperty, String systemProperty, int value, int secureValue) {
++ this.apiProperty = apiProperty;
++ this.systemProperty = systemProperty;
++ this.defaultValue = value;
++ this.secureValue = secureValue;
++ }
++
++ public boolean equalsAPIPropertyName(String propertyName) {
++ return (propertyName == null) ? false : apiProperty.equals(propertyName);
++ }
++
++ public boolean equalsSystemPropertyName(String propertyName) {
++ return (propertyName == null) ? false : systemProperty.equals(propertyName);
++ }
++
++ public String apiProperty() {
++ return apiProperty;
++ }
++
++ String systemProperty() {
++ return systemProperty;
++ }
++
++ int defaultValue() {
++ return defaultValue;
++ }
++
++ int secureValue() {
++ return secureValue;
++ }
++ }
++
++ /**
++ * Map old property names with the new ones
++ */
++ public static enum NameMap {
++
++ ENTITY_EXPANSION_LIMIT(Constants.SP_ENTITY_EXPANSION_LIMIT, Constants.ENTITY_EXPANSION_LIMIT),
++ MAX_OCCUR_NODE_LIMIT(Constants.SP_MAX_OCCUR_LIMIT, Constants.MAX_OCCUR_LIMIT),
++ ELEMENT_ATTRIBUTE_LIMIT(Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, Constants.ELEMENT_ATTRIBUTE_LIMIT);
++ final String newName;
++ final String oldName;
++
++ NameMap(String newName, String oldName) {
++ this.newName = newName;
++ this.oldName = oldName;
++ }
++
++ String getOldName(String newName) {
++ if (newName.equals(this.newName)) {
++ return oldName;
++ }
++ return null;
++ }
++ }
++ private static final int NO_LIMIT = 0;
++ /**
++ * Values of the properties
++ */
++ private final int[] values;
++ /**
++ * States of the settings for each property
++ */
++ private State[] states;
++ /**
++ * Flag indicating if secure processing is set
++ */
++ boolean secureProcessing;
++
++ /**
++ * States that determine if properties are set explicitly
++ */
++ private boolean[] isSet;
++
++
++ private XMLLimitAnalyzer limitAnalyzer;
++ /**
++ * Index of the special entityCountInfo property
++ */
++ private int indexEntityCountInfo = 10000;
++ private String printEntityCountInfo = "";
++
++ /**
++ * Default constructor. Establishes default values for known security
++ * vulnerabilities.
++ */
++ public XMLSecurityManager() {
++ this(false);
++ }
++
++ /**
++ * Instantiate Security Manager in accordance with the status of
++ * secure processing
++ * @param secureProcessing
++ */
++ public XMLSecurityManager(boolean secureProcessing) {
++ limitAnalyzer = new XMLLimitAnalyzer(this);
++ values = new int[Limit.values().length];
++ states = new State[Limit.values().length];
++ isSet = new boolean[Limit.values().length];
++ this.secureProcessing = secureProcessing;
++ for (Limit limit : Limit.values()) {
++ if (secureProcessing) {
++ values[limit.ordinal()] = limit.secureValue;
++ states[limit.ordinal()] = State.FSP;
++ } else {
++ values[limit.ordinal()] = limit.defaultValue();
++ states[limit.ordinal()] = State.DEFAULT;
++ }
++ }
++ //read system properties or jaxp.properties
++ readSystemProperties();
++ }
++
++ /**
++ * Setting FEATURE_SECURE_PROCESSING explicitly
++ */
++ public void setSecureProcessing(boolean secure) {
++ secureProcessing = secure;
++ for (Limit limit : Limit.values()) {
++ if (secure) {
++ setLimit(limit.ordinal(), State.FSP, limit.secureValue());
++ } else {
++ setLimit(limit.ordinal(), State.FSP, limit.defaultValue());
++ }
++ }
++ }
++
++ /**
++ * Return the state of secure processing
++ * @return the state of secure processing
++ */
++ public boolean isSecureProcessing() {
++ return secureProcessing;
++ }
++
++
++ /**
++ * Set limit by property name and state
++ * @param propertyName property name
++ * @param state the state of the property
++ * @param value the value of the property
++ * @return true if the property is managed by the security manager; false
++ * if otherwise.
++ */
++ public boolean setLimit(String propertyName, State state, Object value) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ setLimit(index, state, value);
++ return true;
++ }
++ return false;
++ }
++
++ /**
++ * Set the value for a specific limit.
++ *
++ * @param limit the limit
++ * @param state the state of the property
++ * @param value the value of the property
++ */
++ public void setLimit(Limit limit, State state, int value) {
++ setLimit(limit.ordinal(), state, value);
++ }
++
++ /**
++ * Set the value of a property by its index
++ *
++ * @param index the index of the property
++ * @param state the state of the property
++ * @param value the value of the property
++ */
++ public void setLimit(int index, State state, Object value) {
++ if (index == indexEntityCountInfo) {
++ printEntityCountInfo = (String)value;
++ } else {
++ int temp = 0;
++ try {
++ temp = Integer.parseInt((String) value);
++ if (temp < 0) {
++ temp = 0;
++ }
++ } catch (NumberFormatException e) {}
++ setLimit(index, state, temp);
++ }
++ }
++
++ /**
++ * Set the value of a property by its index
++ *
++ * @param index the index of the property
++ * @param state the state of the property
++ * @param value the value of the property
++ */
++ public void setLimit(int index, State state, int value) {
++ if (index == indexEntityCountInfo) {
++ //if it's explicitly set, it's treated as yes no matter the value
++ printEntityCountInfo = Constants.JDK_YES;
++ } else {
++ //only update if it shall override
++ if (state.compareTo(states[index]) >= 0) {
++ values[index] = value;
++ states[index] = state;
++ isSet[index] = true;
++ }
++ }
++ }
++
++ /**
++ * Return the value of the specified property
++ *
++ * @param propertyName the property name
++ * @return the value of the property as a string. If a property is managed
++ * by this manager, its value shall not be null.
++ */
++ public String getLimitAsString(String propertyName) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ return getLimitValueByIndex(index);
++ }
++
++ return null;
++ }
++ /**
++ * Return the value of the specified property
++ *
++ * @param limit the property
++ * @return the value of the property
++ */
++ public int getLimit(Limit limit) {
++ return values[limit.ordinal()];
++ }
++
++ /**
++ * Return the value of a property by its ordinal
++ *
++ * @param limit the property
++ * @return value of a property
++ */
++ public String getLimitValueAsString(Limit limit) {
++ return Integer.toString(values[limit.ordinal()]);
++ }
++
++ /**
++ * Return the value of a property by its ordinal
++ *
++ * @param index the index of a property
++ * @return limit of a property as a string
++ */
++ public String getLimitValueByIndex(int index) {
++ if (index == indexEntityCountInfo) {
++ return printEntityCountInfo;
++ }
++
++ return Integer.toString(values[index]);
++ }
++
++ /**
++ * Return the state of the limit property
++ *
++ * @param limit the limit
++ * @return the state of the limit property
++ */
++ public State getState(Limit limit) {
++ return states[limit.ordinal()];
++ }
++
++ /**
++ * Return the state of the limit property
++ *
++ * @param limit the limit
++ * @return the state of the limit property
++ */
++ public String getStateLiteral(Limit limit) {
++ return states[limit.ordinal()].literal();
++ }
++
++ /**
++ * Get the index by property name
++ *
++ * @param propertyName property name
++ * @return the index of the property if found; return -1 if not
++ */
++ public int getIndex(String propertyName) {
++ for (Limit limit : Limit.values()) {
++ if (limit.equalsAPIPropertyName(propertyName)) {
++ //internally, ordinal is used as index
++ return limit.ordinal();
++ }
++ }
++ //special property to return entity count info
++ if (propertyName.equals(Constants.JDK_ENTITY_COUNT_INFO)) {
++ return indexEntityCountInfo;
++ }
++ return -1;
++ }
++
++ /**
++ * Check if there's no limit defined by the Security Manager
++ * @param limit
++ * @return
++ */
++ public boolean isNoLimit(int limit) {
++ return limit==NO_LIMIT;
++ }
++ /**
++ * Check if the size (length or count) of the specified limit property is
++ * over the limit
++ *
++ * @param limit the type of the limit property
++ * @param entityName the name of the entity
++ * @param size the size (count or length) of the entity
++ * @return true if the size is over the limit, false otherwise
++ */
++ public boolean isOverLimit(Limit limit, String entityName, int size) {
++ return isOverLimit(limit.ordinal(), entityName, size);
++ }
++
++ /**
++ * Check if the value (length or count) of the specified limit property is
++ * over the limit
++ *
++ * @param index the index of the limit property
++ * @param entityName the name of the entity
++ * @param size the size (count or length) of the entity
++ * @return true if the size is over the limit, false otherwise
++ */
++ public boolean isOverLimit(int index, String entityName, int size) {
++ if (values[index] == NO_LIMIT) {
++ return false;
++ }
++ if (size > values[index]) {
++ limitAnalyzer.addValue(index, entityName, size);
++ return true;
++ }
++ return false;
++ }
++
++ /**
++ * Check against cumulated value
++ *
++ * @param limit the type of the limit property
++ * @param size the size (count or length) of the entity
++ * @return true if the size is over the limit, false otherwise
++ */
++ public boolean isOverLimit(Limit limit) {
++ return isOverLimit(limit.ordinal());
++ }
++
++ public boolean isOverLimit(int index) {
++ if (values[index] == NO_LIMIT) {
++ return false;
++ }
++
++ if (index==Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal() ||
++ index==Limit.ENTITY_EXPANSION_LIMIT.ordinal() ||
++ index==Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal()) {
++ return (limitAnalyzer.getTotalValue(index) > values[index]);
++ } else {
++ return (limitAnalyzer.getValue(index) > values[index]);
++ }
++ }
++
++ public void debugPrint() {
++ if (printEntityCountInfo.equals(Constants.JDK_YES)) {
++ limitAnalyzer.debugPrint();
++ }
++ }
++
++ /**
++ * Return the limit analyzer
++ *
++ * @return the limit analyzer
++ */
++ public XMLLimitAnalyzer getLimitAnalyzer() {
++ return limitAnalyzer;
++ }
++
++ /**
++ * Set limit analyzer
++ *
++ * @param analyzer a limit analyzer
++ */
++ public void setLimitAnalyzer(XMLLimitAnalyzer analyzer) {
++ limitAnalyzer = analyzer;
++ }
++
++ /**
++ * Indicate if a property is set explicitly
++ * @param index
++ * @return
++ */
++ public boolean isSet(int index) {
++ return isSet[index];
++ }
++
++ public boolean printEntityCountInfo() {
++ return printEntityCountInfo.equals(Constants.JDK_YES);
++ }
++
++ /**
++ * Read from system properties, or those in jaxp.properties
++ */
++ private void readSystemProperties() {
++
++ for (Limit limit : Limit.values()) {
++ if (!getSystemProperty(limit, limit.systemProperty())) {
++ //if system property is not found, try the older form if any
++ for (NameMap nameMap : NameMap.values()) {
++ String oldName = nameMap.getOldName(limit.systemProperty());
++ if (oldName != null) {
++ getSystemProperty(limit, oldName);
++ }
++ }
++ }
++ }
++
++ }
++
++ /**
++ * Read from system properties, or those in jaxp.properties
++ *
++ * @param property the type of the property
++ * @param sysPropertyName the name of system property
++ */
++ private boolean getSystemProperty(Limit limit, String sysPropertyName) {
++ try {
++ String value = SecuritySupport.getSystemProperty(sysPropertyName);
++ if (value != null && !value.equals("")) {
++ values[limit.ordinal()] = Integer.parseInt(value);
++ states[limit.ordinal()] = State.SYSTEMPROPERTY;
++ return true;
++ }
++
++ value = SecuritySupport.readJAXPProperty(sysPropertyName);
++ if (value != null && !value.equals("")) {
++ values[limit.ordinal()] = Integer.parseInt(value);
++ states[limit.ordinal()] = State.JAXPDOTPROPERTIES;
++ return true;
++ }
++ } catch (NumberFormatException e) {
++ //invalid setting
++ throw new NumberFormatException("Invalid setting for system property: " + limit.systemProperty());
++ }
++ return false;
++ }
++
++
++ /**
++ * Convert a value set through setProperty to XMLSecurityManager.
++ * If the value is an instance of XMLSecurityManager, use it to override the default;
++ * If the value is an old SecurityManager, convert to the new XMLSecurityManager.
++ *
++ * @param value user specified security manager
++ * @param securityManager an instance of XMLSecurityManager
++ * @return an instance of the new security manager XMLSecurityManager
++ */
++ static public XMLSecurityManager convert(Object value, XMLSecurityManager securityManager) {
++ if (value == null) {
++ if (securityManager == null) {
++ securityManager = new XMLSecurityManager(true);
++ }
++ return securityManager;
++ }
++ if (XMLSecurityManager.class.isAssignableFrom(value.getClass())) {
++ return (XMLSecurityManager)value;
++ } else {
++ if (securityManager == null) {
++ securityManager = new XMLSecurityManager(true);
++ }
++ if (SecurityManager.class.isAssignableFrom(value.getClass())) {
++ SecurityManager origSM = (SecurityManager)value;
++ securityManager.setLimit(Limit.MAX_OCCUR_NODE_LIMIT, State.APIPROPERTY, origSM.getMaxOccurNodeLimit());
++ securityManager.setLimit(Limit.ENTITY_EXPANSION_LIMIT, State.APIPROPERTY, origSM.getEntityExpansionLimit());
++ securityManager.setLimit(Limit.ELEMENT_ATTRIBUTE_LIMIT, State.APIPROPERTY, origSM.getElementAttrLimit());
++ }
++ return securityManager;
++ }
++ }
++}
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java Tue Oct 08 09:06:57 2013 -0700
+@@ -91,6 +91,24 @@
+ readSystemProperties();
+ }
+
++
++ /**
++ * Set limit by property name and state
++ * @param propertyName property name
++ * @param state the state of the property
++ * @param value the value of the property
++ * @return true if the property is managed by the security property manager;
++ * false if otherwise.
++ */
++ public boolean setValue(String propertyName, State state, Object value) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ setValue(index, state, (String)value);
++ return true;
++ }
++ return false;
++ }
++
+ /**
+ * Set the value for a specific property.
+ *
+@@ -119,6 +137,23 @@
+ states[index] = state;
+ }
+ }
++
++
++ /**
++ * Return the value of the specified property
++ *
++ * @param propertyName the property name
++ * @return the value of the property as a string
++ */
++ public String getValue(String propertyName) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ return getValueByIndex(index);
++ }
++
++ return null;
++ }
++
+ /**
+ * Return the value of the specified property
+ *
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java Tue Oct 08 09:06:57 2013 -0700
+@@ -37,7 +37,6 @@
+ import com.sun.org.apache.xerces.internal.util.HTTPInputSource;
+ import com.sun.org.apache.xerces.internal.util.IntStack;
+ import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
+-import com.sun.org.apache.xerces.internal.util.SecurityManager;
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
+ import com.sun.org.apache.xerces.internal.util.URI;
+ import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl;
+@@ -45,6 +44,7 @@
+ import com.sun.org.apache.xerces.internal.util.XMLChar;
+ import com.sun.org.apache.xerces.internal.util.XMLSymbols;
+ import com.sun.org.apache.xerces.internal.util.URI.MalformedURIException;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.xni.Augmentations;
+ import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
+ import com.sun.org.apache.xerces.internal.xni.QName;
+@@ -289,7 +289,7 @@
+ protected SymbolTable fSymbolTable;
+ protected XMLErrorReporter fErrorReporter;
+ protected XMLEntityResolver fEntityResolver;
+- protected SecurityManager fSecurityManager;
++ protected XMLSecurityManager fSecurityManager;
+ protected XMLSecurityPropertyManager fSecurityPropertyMgr;
+
+ // these are needed for text include processing
+@@ -517,8 +517,8 @@
+
+ // Get security manager.
+ try {
+- SecurityManager value =
+- (SecurityManager)componentManager.getProperty(
++ XMLSecurityManager value =
++ (XMLSecurityManager)componentManager.getProperty(
+ SECURITY_MANAGER);
+
+ if (value != null) {
+@@ -674,7 +674,7 @@
+ return;
+ }
+ if (propertyId.equals(SECURITY_MANAGER)) {
+- fSecurityManager = (SecurityManager)value;
++ fSecurityManager = (XMLSecurityManager)value;
+ if (fChildConfig != null) {
+ fChildConfig.setProperty(propertyId, value);
+ }
+--- ./jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java Tue Oct 08 09:06:57 2013 -0700
+@@ -25,12 +25,15 @@
+ import com.sun.org.apache.xalan.internal.XalanConstants;
+ import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
+ import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
++import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
+ import java.util.HashMap;
++
+ import javax.xml.XMLConstants;
+ import javax.xml.parsers.FactoryConfigurationError;
+ import javax.xml.parsers.ParserConfigurationException;
+ import javax.xml.parsers.SAXParserFactory;
+ import org.xml.sax.SAXException;
++import org.xml.sax.SAXNotRecognizedException;
+ import org.xml.sax.XMLReader;
+ import org.xml.sax.helpers.XMLReaderFactory;
+
+@@ -63,11 +66,15 @@
+ private HashMap m_inUse;
+
+ private boolean m_useServicesMechanism = true;
++
++ private boolean _secureProcessing;
+ /**
+ * protocols allowed for external DTD references in source file and/or stylesheet.
+ */
+ private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
+
++ private XMLSecurityManager _xmlSecurityManager;
++
+ /**
+ * Hidden constructor
+ */
+@@ -118,7 +125,12 @@
+ // TransformerFactory creates a reader via the
+ // XMLReaderFactory if setXMLReader is not used
+ reader = XMLReaderFactory.createXMLReader();
+-
++ try {
++ reader.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, _secureProcessing);
++ } catch (SAXNotRecognizedException e) {
++ System.err.println("Warning: " + reader.getClass().getName() + ": "
++ + e.getMessage());
++ }
+ } catch (Exception e) {
+ try {
+ // If unable to create an instance, let's try to use
+@@ -164,6 +176,21 @@
+ + se.getMessage());
+ }
+
++ try {
++ if (_xmlSecurityManager != null) {
++ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
++ reader.setProperty(limit.apiProperty(),
++ _xmlSecurityManager.getLimitValueAsString(limit));
++ }
++ if (_xmlSecurityManager.printEntityCountInfo()) {
++ reader.setProperty(XalanConstants.JDK_ENTITY_COUNT_INFO, XalanConstants.JDK_YES);
++ }
++ }
++ } catch (SAXException se) {
++ System.err.println("Warning: " + reader.getClass().getName() + ": "
++ + se.getMessage());
++ }
++
+ return reader;
+ }
+
+@@ -195,11 +222,22 @@
+ }
+
+ /**
++ * Set feature
++ */
++ public void setFeature(String name, boolean value) {
++ if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
++ _secureProcessing = value;
++ }
++ }
++
++ /**
+ * Get property value
+ */
+- public String getProperty(String name) {
++ public Object getProperty(String name) {
+ if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
+ return _accessExternalDTD;
++ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
++ return _xmlSecurityManager;
+ }
+ return null;
+ }
+@@ -207,9 +245,11 @@
+ /**
+ * Set property.
+ */
+- public void setProperty(String name, String value) {
++ public void setProperty(String name, Object value) {
+ if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
+ _accessExternalDTD = (String)value;
++ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
++ _xmlSecurityManager = (XMLSecurityManager)value;
+ }
+ }
+ }
+--- ./jaxp/src/javax/xml/stream/FactoryFinder.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/javax/xml/stream/FactoryFinder.java Tue Oct 08 09:06:57 2013 -0700
+@@ -204,13 +204,15 @@
+ * a property name
+ * @param fallbackClassName Implementation class name, if nothing else
+ * is found. Use null to mean no fallback.
++ * @param standardId Indicate whether the factoryId is standard
++ * or user specified.
+ *
+ * Package private so this code can be shared.
+ */
+- static Object find(String factoryId, String fallbackClassName)
++ static Object find(String factoryId, String fallbackClassName, boolean standardId)
+ throws ConfigurationError
+ {
+- return find(factoryId, null, fallbackClassName);
++ return find(factoryId, null, fallbackClassName, standardId);
+ }
+
+ /**
+@@ -227,23 +229,34 @@
+ * @param fallbackClassName Implementation class name, if nothing else
+ * is found. Use null to mean no fallback.
+ *
++ * @param standardId Indicate whether the factoryId is standard
++ * or user specified.
++ *
+ * Package private so this code can be shared.
+ */
+- static Object find(String factoryId, ClassLoader cl, String fallbackClassName)
++ static Object find(String factoryId, ClassLoader cl, String fallbackClassName,
++ boolean standardId)
+ throws ConfigurationError
+ {
+ dPrint("find factoryId =" + factoryId);
+
+ // Use the system property first
+ try {
+- String systemProp = ss.getSystemProperty(factoryId);
++ String systemProp;
++ if (standardId) {
++ systemProp = ss.getSystemProperty(factoryId);
++ } else {
++ systemProp = System.getProperty(factoryId);
++ }
++
+ if (systemProp != null) {
+ dPrint("found system property, value=" + systemProp);
+ return newInstance(systemProp, null, true);
+ }
+ }
+ catch (SecurityException se) {
+- if (debug) se.printStackTrace();
++ throw new ConfigurationError(
++ "Failed to read factoryId '" + factoryId + "'", se);
+ }
+
+ // Try read $java.home/lib/stax.properties followed by
+--- ./jaxp/src/javax/xml/stream/XMLEventFactory.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/javax/xml/stream/XMLEventFactory.java Tue Oct 08 09:06:57 2013 -0700
+@@ -60,9 +60,7 @@
+ public static XMLEventFactory newInstance()
+ throws FactoryConfigurationError
+ {
+- return (XMLEventFactory) FactoryFinder.find(
+- JAXPFACTORYID,
+- DEFAULIMPL);
++ return (XMLEventFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
+ }
+
+ /**
+@@ -93,9 +91,7 @@
+ public static XMLEventFactory newFactory()
+ throws FactoryConfigurationError
+ {
+- return (XMLEventFactory) FactoryFinder.find(
+- JAXPFACTORYID,
+- DEFAULIMPL);
++ return (XMLEventFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
+ }
+
+ /**
+@@ -118,7 +114,8 @@
+ throws FactoryConfigurationError {
+ try {
+ //do not fallback if given classloader can't find the class, throw exception
+- return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader, null);
++ return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader,
++ null, factoryId.equals(JAXPFACTORYID) ? true : false);
+ } catch (FactoryFinder.ConfigurationError e) {
+ throw new FactoryConfigurationError(e.getException(),
+ e.getMessage());
+@@ -145,7 +142,8 @@
+ throws FactoryConfigurationError {
+ try {
+ //do not fallback if given classloader can't find the class, throw exception
+- return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader, null);
++ return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader,
++ null, factoryId.equals(JAXPFACTORYID) ? true : false);
+ } catch (FactoryFinder.ConfigurationError e) {
+ throw new FactoryConfigurationError(e.getException(),
+ e.getMessage());
+--- ./jaxp/src/javax/xml/stream/XMLInputFactory.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/javax/xml/stream/XMLInputFactory.java Tue Oct 08 09:06:57 2013 -0700
+@@ -139,6 +139,7 @@
+ public static final String ALLOCATOR=
+ "javax.xml.stream.allocator";
+
++ static final String JAXPFACTORYID = "javax.xml.stream.XMLInputFactory";
+ static final String DEFAULIMPL = "com.sun.xml.internal.stream.XMLInputFactoryImpl";
+
+ protected XMLInputFactory(){}
+@@ -150,9 +151,7 @@
+ public static XMLInputFactory newInstance()
+ throws FactoryConfigurationError
+ {
+- return (XMLInputFactory) FactoryFinder.find(
+- "javax.xml.stream.XMLInputFactory",
+- DEFAULIMPL);
++ return (XMLInputFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
+ }
+
+ /**
+@@ -183,9 +182,7 @@
+ public static XMLInputFactory newFactory()
+ throws FactoryConfigurationError
+ {
+- return (XMLInputFactory) FactoryFinder.find(
+- "javax.xml.stream.XMLInputFactory",
+- DEFAULIMPL);
++ return (XMLInputFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
+ }
+
+ /**
+@@ -208,7 +205,8 @@
+ throws FactoryConfigurationError {
+ try {
+ //do not fallback if given classloader can't find the class, throw exception
+- return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader, null);
++ return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader,
++ null, factoryId.equals(JAXPFACTORYID) ? true : false);
+ } catch (FactoryFinder.ConfigurationError e) {
+ throw new FactoryConfigurationError(e.getException(),
+ e.getMessage());
+@@ -235,7 +233,8 @@
+ throws FactoryConfigurationError {
+ try {
+ //do not fallback if given classloader can't find the class, throw exception
+- return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader, null);
++ return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader,
++ null, factoryId.equals(JAXPFACTORYID) ? true : false);
+ } catch (FactoryFinder.ConfigurationError e) {
+ throw new FactoryConfigurationError(e.getException(),
+ e.getMessage());
+--- ./jaxp/src/javax/xml/stream/XMLOutputFactory.java Mon Aug 26 07:41:38 2013 -0700
++++ ./jaxp/src/javax/xml/stream/XMLOutputFactory.java Tue Oct 08 09:06:57 2013 -0700
+@@ -115,6 +115,7 @@
+ public static final String IS_REPAIRING_NAMESPACES=
+ "javax.xml.stream.isRepairingNamespaces";
+
++ static final String JAXPFACTORYID = "javax.xml.stream.XMLOutputFactory";
+ static final String DEFAULIMPL = "com.sun.xml.internal.stream.XMLOutputFactoryImpl";
+
+ protected XMLOutputFactory(){}
+@@ -126,8 +127,7 @@
+ public static XMLOutputFactory newInstance()
+ throws FactoryConfigurationError
+ {
+- return (XMLOutputFactory) FactoryFinder.find("javax.xml.stream.XMLOutputFactory",
+- DEFAULIMPL);
++ return (XMLOutputFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
+ }
+
+ /**
+@@ -158,8 +158,7 @@
+ public static XMLOutputFactory newFactory()
+ throws FactoryConfigurationError
+ {
+- return (XMLOutputFactory) FactoryFinder.find("javax.xml.stream.XMLOutputFactory",
+- DEFAULIMPL);
++ return (XMLOutputFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
+ }
+
+ /**
+@@ -181,7 +180,8 @@
+ throws FactoryConfigurationError {
+ try {
+ //do not fallback if given classloader can't find the class, throw exception
+- return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader, null);
++ return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader,
++ null, factoryId.equals(JAXPFACTORYID) ? true : false);
+ } catch (FactoryFinder.ConfigurationError e) {
+ throw new FactoryConfigurationError(e.getException(),
+ e.getMessage());
+@@ -210,7 +210,8 @@
+ throws FactoryConfigurationError {
+ try {
+ //do not fallback if given classloader can't find the class, throw exception
+- return (XMLOutputFactory) FactoryFinder.find(factoryId, classLoader, null);
++ return (XMLOutputFactory) FactoryFinder.find(factoryId, classLoader,
++ null, factoryId.equals(JAXPFACTORYID) ? true : false);
+ } catch (FactoryFinder.ConfigurationError e) {
+ throw new FactoryConfigurationError(e.getException(),
+ e.getMessage());
+--- ./jaxws/.hgtags Mon Aug 26 07:41:41 2013 -0700
++++ ./jaxws/.hgtags Tue Oct 08 09:06:59 2013 -0700
+@@ -302,6 +302,22 @@
+ 0cd0d4e7331f7fc9f9ee77f2275113571bcf67cf jdk7u25-b09
+ 105cdfd4f40837917d0065e3e58052d2854df7da jdk7u25-b10
+ 6de7fec036abf91ce962c74f11a6266491df3fd8 jdk7u25-b11
++a367ebf0c21512867f4ab5cdd206dd8c7817c004 jdk7u14-b16
++74c34f35912d8d7145b3ff34fefea2d2f189f2b4 jdk7u14-b17
++c93a35b3638f45de91013d65543217a002577684 jdk7u14-b18
++82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19
++82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19
++d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19
++dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20
++97bbac299eb801709a924fe777b3ee9c96829d8b jdk7u14-b21
++6e74b3e1773cfbac99998431a5a54c70baaf1dc5 jdk7u14-b22
++e9bbdf789d2b512550e0ca80629980e96f02146d jdk7u40-b23
++adaf9cf486fab1b14c5af9fc6525565760bb9c11 jdk7u40-b24
++aafab1efbd4ced5e05695aa1887813f9f5de9d5c jdk7u40-b25
++6581f9739031120bb7515d3b09fa3501653d11af jdk7u40-b26
++46ebac943288218b14d7ce3df23aa42a70fa4cf9 jdk7u40-b27
++016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28
++15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29
+ 4c5d242efa0d6e0cdb688e41e722bff671dfbfec jdk7u25-b12
+ 6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13
+ 03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14
+@@ -341,3 +357,23 @@
+ cd6971747e7a56fef9a3d8b10e39590b349e41c4 jdk7u40-b40
+ adc234666397f6bdacd295c87be34c6a1a4d7bf2 jdk7u40-b41
+ 89f6c9663d75d9e4b672aed16f885b84232e9c93 jdk7u40-b42
++3ee85b3793de16855e20272336a3565af8477b6b jdk7u40-b43
++cbeef786ce489096c39ec5effee4f8f9e770b4af jdk7u40-b60
++000becfcb945d8592cfdef6ef1704b532af56762 jdk7u45-b01
++817632baca26f7566e36c7708455494c15113d88 jdk7u45-b02
++f65baba9400aec6cb29bc06b3139623bb4663225 jdk7u45-b03
++80ff2468f520ed1940915815ceb85e05bd2bc568 jdk7u45-b04
++1128d3934b643660a219532aa1ca554877d89375 jdk7u45-b05
++8da3d41d946925a07a9f1001795959bfdb4c02c6 jdk7u45-b06
++38f5b376c38035f13ede456f158ee26d0cf8d99c jdk7u45-b07
++86f3efd1edae3c0f47ad14bef992e7566eaa94d4 jdk7u45-b08
++ab835f7247e40dd7fb457830eaa31c550b434413 jdk7u45-b09
++bbd594e6cf45ebfc37c71e217772b7f37a9c5750 jdk7u45-b10
++c01eab96821e3c0315c4637e61a8015cbfe63b6a jdk7u45-b11
++05f1274a8aa019584b4ceb05c73fc89bf7b7f4de jdk7u45-b12
++3271849829b7c8ac32f6bb17b763d8a85a1a0a32 jdk7u45-b13
++842dd63be9c633b8448e1837a5bb7b803dfdaad9 jdk7u45-b14
++93a3fb090be58a5a45464f866a7093f24205dae2 jdk7u45-b15
++5524cced32d3959d95ed414add230273bc10c38d jdk7u45-b16
++a8baf22b5972e269a97f7b3b7eec2ad63a8c5aed jdk7u45-b17
++65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java Mon Aug 26 07:41:41 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java Tue Oct 08 09:06:59 2013 -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
+@@ -232,7 +232,7 @@
+ public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException {
+ T t = resolve(p);
+ try {
+- return m.invoke(t, args );
++ return MethodUtil.invoke(t, m, args );
+ } finally {
+ postInvoke(p,t);
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java Tue Oct 08 09:06:59 2013 -0700
+@@ -0,0 +1,94 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.ws.api.server;
++
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
++ * to java.lang,reflect.Method.invoke()
++ *
++ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
++ */
++class MethodUtil {
++
++ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
++ private static final Method INVOKE_METHOD;
++
++ static {
++ Method method;
++ try {
++ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
++ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
++ }
++ } catch (Throwable t) {
++ method = null;
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
++ }
++ }
++ INVOKE_METHOD = method;
++ }
++
++ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
++ if (INVOKE_METHOD != null) {
++ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
++ }
++ try {
++ return INVOKE_METHOD.invoke(null, method, target, args);
++ } catch (InvocationTargetException ite) {
++ // unwrap invocation exception added by reflection code ...
++ throw unwrapException(ite);
++ }
++ } else {
++ // other then Oracle JDK ...
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
++ }
++ return method.invoke(target, args);
++ }
++ }
++
++ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
++ Throwable targetException = ite.getTargetException();
++ if (targetException != null && targetException instanceof InvocationTargetException) {
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
++ }
++ return (InvocationTargetException) targetException;
++ } else {
++ return ite;
++ }
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java Tue Oct 08 09:06:59 2013 -0700
+@@ -0,0 +1,94 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.ws.client.sei;
++
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
++ * to java.lang,reflect.Method.invoke()
++ * <p/>
++ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
++ */
++class MethodUtil {
++
++ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
++ private static final Method INVOKE_METHOD;
++
++ static {
++ Method method;
++ try {
++ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
++ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
++ }
++ } catch (Throwable t) {
++ method = null;
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
++ }
++ }
++ INVOKE_METHOD = method;
++ }
++
++ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
++ if (INVOKE_METHOD != null) {
++ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
++ }
++ try {
++ return INVOKE_METHOD.invoke(null, method, target, args);
++ } catch (InvocationTargetException ite) {
++ // unwrap invocation exception added by reflection code ...
++ throw unwrapException(ite);
++ }
++ } else {
++ // other then Oracle JDK ...
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
++ }
++ return method.invoke(target, args);
++ }
++ }
++
++ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
++ Throwable targetException = ite.getTargetException();
++ if (targetException != null && targetException instanceof InvocationTargetException) {
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
++ }
++ return (InvocationTargetException) targetException;
++ } else {
++ return ite;
++ }
++ }
++
++}
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java Mon Aug 26 07:41:41 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java Tue Oct 08 09:06:59 2013 -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
+@@ -28,17 +28,20 @@
+ import com.sun.istack.internal.NotNull;
+ import com.sun.istack.internal.Nullable;
+ import com.sun.xml.internal.ws.api.SOAPVersion;
++import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+ import com.sun.xml.internal.ws.api.client.WSPortInfo;
+-import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+ import com.sun.xml.internal.ws.api.message.Header;
+ import com.sun.xml.internal.ws.api.message.Headers;
+ import com.sun.xml.internal.ws.api.message.Packet;
+ import com.sun.xml.internal.ws.api.model.MEP;
+ import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
++import com.sun.xml.internal.ws.api.pipe.Fiber;
+ import com.sun.xml.internal.ws.api.pipe.Tube;
+-import com.sun.xml.internal.ws.api.pipe.Fiber;
+ import com.sun.xml.internal.ws.binding.BindingImpl;
+-import com.sun.xml.internal.ws.client.*;
++import com.sun.xml.internal.ws.client.RequestContext;
++import com.sun.xml.internal.ws.client.ResponseContextReceiver;
++import com.sun.xml.internal.ws.client.Stub;
++import com.sun.xml.internal.ws.client.WSServiceDelegate;
+ import com.sun.xml.internal.ws.model.JavaMethodImpl;
+ import com.sun.xml.internal.ws.model.SOAPSEIModel;
+ import com.sun.xml.internal.ws.wsdl.OperationDispatcher;
+@@ -47,6 +50,8 @@
+ import java.lang.reflect.InvocationHandler;
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
++import java.lang.reflect.Modifier;
++import java.lang.reflect.Proxy;
+ import java.util.HashMap;
+ import java.util.Map;
+
+@@ -124,13 +129,14 @@
+ private final Map<Method, MethodHandler> methodHandlers = new HashMap<Method, MethodHandler>();
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
++ validateInputs(proxy, method);
+ MethodHandler handler = methodHandlers.get(method);
+ if (handler != null) {
+ return handler.invoke(proxy, args);
+ } else {
+ // we handle the other method invocations by ourselves
+ try {
+- return method.invoke(this, args);
++ return MethodUtil.invoke(this, method, args);
+ } catch (IllegalAccessException e) {
+ // impossible
+ throw new AssertionError(e);
+@@ -142,6 +148,17 @@
+ }
+ }
+
++ private void validateInputs(Object proxy, Method method) {
++ if (proxy == null || !Proxy.isProxyClass(proxy.getClass())) {
++ throw new IllegalStateException("Passed object is not proxy!");
++ }
++ Class<?> declaringClass = method.getDeclaringClass();
++ if (method == null || declaringClass == null
++ || Modifier.isStatic(method.getModifiers())) {
++ throw new IllegalStateException("Invoking static method is not allowed!");
++ }
++ }
++
+ public final Packet doProcess(Packet request, RequestContext rc, ResponseContextReceiver receiver) {
+ return super.process(request, rc, receiver);
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java Tue Oct 08 09:06:59 2013 -0700
+@@ -0,0 +1,92 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.ws.policy.privateutil;
++
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
++ * to java.lang,reflect.Method.invoke()
++ */
++class MethodUtil {
++
++ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
++ private static final Method INVOKE_METHOD;
++
++ static {
++ Method method;
++ try {
++ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
++ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
++ }
++ } catch (Throwable t) {
++ method = null;
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
++ }
++ }
++ INVOKE_METHOD = method;
++ }
++
++ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
++ if (INVOKE_METHOD != null) {
++ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
++ }
++ try {
++ return INVOKE_METHOD.invoke(null, method, target, args);
++ } catch (InvocationTargetException ite) {
++ // unwrap invocation exception added by reflection code ...
++ throw unwrapException(ite);
++ }
++ } else {
++ // other then Oracle JDK ...
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
++ }
++ return method.invoke(target, args);
++ }
++ }
++
++ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
++ Throwable targetException = ite.getTargetException();
++ if (targetException != null && targetException instanceof InvocationTargetException) {
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
++ }
++ return (InvocationTargetException) targetException;
++ } else {
++ return ite;
++ }
++ }
++
++}
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java Mon Aug 26 07:41:41 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java Tue Oct 08 09:06:59 2013 -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
+@@ -282,13 +282,13 @@
+ /**
+ * Reflection utilities wrapper
+ */
+- public static class Reflection {
++ static class Reflection {
+ private static final PolicyLogger LOGGER = PolicyLogger.getLogger(PolicyUtils.Reflection.class);
+
+ /**
+ * Reflectively invokes specified method on the specified target
+ */
+- public static <T> T invoke(final Object target, final String methodName,
++ static <T> T invoke(final Object target, final String methodName,
+ final Class<T> resultClass, final Object... parameters) throws RuntimePolicyUtilsException {
+ Class[] parameterTypes;
+ if (parameters != null && parameters.length > 0) {
+@@ -311,7 +311,7 @@
+ final Object[] parameters, final Class[] parameterTypes) throws RuntimePolicyUtilsException {
+ try {
+ final Method method = target.getClass().getMethod(methodName, parameterTypes);
+- final Object result = method.invoke(target, parameters);
++ final Object result = MethodUtil.invoke(target, method,parameters);
+
+ return resultClass.cast(result);
+ } catch (IllegalArgumentException e) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java Mon Aug 26 07:41:41 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java Tue Oct 08 09:06:59 2013 -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
+@@ -157,7 +157,7 @@
+ if (!method.isAccessible()) {
+ method.setAccessible(true);
+ }
+- method.invoke(instance,args);
++ MethodUtil.invoke(instance,method,args);
+ } catch (IllegalAccessException e) {
+ throw new ServerRtException("server.rt.err",e);
+ } catch (InvocationTargetException e) {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java Tue Oct 08 09:06:59 2013 -0700
+@@ -0,0 +1,94 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.xml.internal.ws.server;
++
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
++ * to java.lang,reflect.Method.invoke()
++ *
++ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
++ */
++class MethodUtil {
++
++ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
++ private static final Method INVOKE_METHOD;
++
++ static {
++ Method method;
++ try {
++ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
++ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
++ }
++ } catch (Throwable t) {
++ method = null;
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
++ }
++ }
++ INVOKE_METHOD = method;
++ }
++
++ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
++ if (INVOKE_METHOD != null) {
++ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
++ }
++ try {
++ return INVOKE_METHOD.invoke(null, method, target, args);
++ } catch (InvocationTargetException ite) {
++ // unwrap invocation exception added by reflection code ...
++ throw unwrapException(ite);
++ }
++ } else {
++ // other then Oracle JDK ...
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
++ }
++ return method.invoke(target, args);
++ }
++ }
++
++ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
++ Throwable targetException = ite.getTargetException();
++ if (targetException != null && targetException instanceof InvocationTargetException) {
++ if (LOGGER.isLoggable(Level.FINE)) {
++ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
++ }
++ return (InvocationTargetException) targetException;
++ } else {
++ return ite;
++ }
++ }
++
++}
+--- ./jdk/.hgtags Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/.hgtags Tue Oct 08 09:07:05 2013 -0700
+@@ -340,3 +340,24 @@
+ 42b57fb81c3958fc98e7c5cd81826565f4cedb91 jdk7u40-b40
+ ae85cfff71e95c3a1882177779c5f681d2621410 jdk7u40-b41
+ b479996d5c924128c3490165b592bf66a3034932 jdk7u40-b42
++fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43
++ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60
++55f01444cf58c8004df9a9634c1bd7ff87caa370 jdk7u25-b32
++b06abd965701459a868e88af9a3e564c0301971c jdk7u45-b01
++d23a877da2d5dad6520a268c83f183295a9e7299 jdk7u45-b02
++a56eb4f801232c409d34cd1190df4eec5fefe8a9 jdk7u45-b03
++702c8d83dd8c5b6c76fe53a694244a36d23fa860 jdk7u45-b04
++a70540e8a5e96773b83c7dc0accdb323d946c045 jdk7u45-b05
++f39399baf36761571719f6ff5dc69c514d97842d jdk7u45-b06
++a35d4a4ebcfa895202544c2f6b2d09e0b29bddfc jdk7u45-b07
++2f01847eb9530ed5ec08b1b663f3a02cac57b048 jdk7u45-b08
++6e2313d45f0c50d824531b32d3f577aa0b357551 jdk7u45-b09
++d4506b816f63330489e00ba0b9e3c6583a8a9efa jdk7u45-b10
++ee87452ba9e2b4b7d847bd2a7910a8aaeacfea7b jdk7u45-b11
++d5e393a55e6adc2f1b9aaa752a5004fa07561480 jdk7u45-b12
++34997920efe962b2e4422e2c2de8ae91cd1d563d jdk7u45-b13
++59a78e4ca635a469a763ee408b11f8e1033f2584 jdk7u45-b14
++96782fe0c38c41cc4806e27ee64b20dc647ea808 jdk7u45-b15
++3c9a6d9eafd31be44b0ade0354e60f5078b417a4 jdk7u45-b16
++3a65c1b0c6d15fb24298bcd133d7ab4baa741ae2 jdk7u45-b17
++c5ca4daec23b5e7f99ac8d684f5016ff8bfebbb0 jdk7u45-b18
+--- ./jdk/make/bridge/Jabswitch/Makefile Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/bridge/Jabswitch/Makefile Tue Oct 08 09:07:05 2013 -0700
+@@ -53,7 +53,7 @@
+ buildexe :
+ $(CD) $(TEMPDIR)
+ $(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE)
+- $(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE)
++ $(CC) $(CPPFLAGS) $(JAB_SRC) $(VERSIONRES) /link $(LDDFLAGS) -out:$(JAB_EXE)
+ $(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE)
+
+ copyfilejab :
+--- ./jdk/make/com/sun/jmx/Makefile Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/com/sun/jmx/Makefile Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2003, 2012, 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
+@@ -115,6 +115,8 @@
+
+ ifeq ($(CROSS_COMPILE_ARCH),)
+ RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
++else
++RMIC = $(BOOT_JAVA_CMD) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+ endif
+
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+@@ -130,11 +132,13 @@
+ $(RMIC) -classpath "$(CLASSDESTDIR)" \
+ -d $(CLASSDESTDIR) \
+ -iiop -v1.2 \
++ -emitPermissionCheck \
+ $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
+ $(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)" \
+ -d $(CLASSDESTDIR) \
+ -iiop -v1.2 \
+ -standardPackage \
++ -emitPermissionCheck \
+ $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
+ @$(java-vm-cleanup)
+
+--- ./jdk/make/common/Program.gmk Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/common/Program.gmk Tue Oct 08 09:07:05 2013 -0700
+@@ -101,17 +101,14 @@
+ ifeq ($(PLATFORM), solaris)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
+- LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
+ else # ! ARCH_DATA_MODEL 64-bit
+ LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
+- LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
+ endif # ARCH_DATA_MODEL
+ endif # PLATFORM SOLARIS
+ ifeq ($(PLATFORM), linux)
+ LDFLAGS += $(LDFLAG_Z_ORIGIN)
+ LDFLAGS += -Wl,--allow-shlib-undefined
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
+- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
+ endif # PLATFORM LINUX
+ endif # PLATFORM linux solaris
+
+--- ./jdk/make/common/Release.gmk Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/common/Release.gmk Tue Oct 08 09:07:05 2013 -0700
+@@ -982,6 +982,11 @@
+ endif
+ $(RM) -rf $(JDK_IMAGE_DIR)/jre/man
+ $(CHMOD) a+rx `$(FIND) $(JDK_IMAGE_DIR) -type d`
++ ifneq (,$(findstring $(PLATFORM), linux solaris)) # If linux or solaris
++ ($(CD) $(LIBDIR)/.. && $(TAR) cf - \
++ `$(FIND) lib -name $(LIB_PREFIX)jli.$(LIB_SUFFIX) -print `) | \
++ ($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -)
++ endif # PLATFORM
+
+ initial-image-jdk64-bindemos:
+ for dir in bin demo ; do \
+@@ -1030,7 +1035,7 @@
+ initial-image-jdk-db \
+ $(JDK_DOCFILES) \
+ $(JDK_DEMOS_AND_SAMPLES_DOCFILES)
+- $(MKDIR) $(JDK_IMAGE_DIR)/lib
++ $(MKDIR) -p $(JDK_IMAGE_DIR)/lib
+ @#
+ @# Copy in the jars in lib that only belong in the JDK
+ @#
+--- ./jdk/make/common/shared/Defs.gmk Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/common/shared/Defs.gmk Tue Oct 08 09:07:05 2013 -0700
+@@ -296,10 +296,8 @@
+ RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
+ endif
+
+-# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
+-ifdef BUILD_NUMBER
+- FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
+-else
++# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
++ifndef BUILD_NUMBER
+ BUILD_NUMBER = b00
+ ifndef USER_RELEASE_SUFFIX
+ BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
+@@ -307,6 +305,12 @@
+ USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
+ endif
+ export USER_RELEASE_SUFFIX
++endif
++
++# FULL_VERSION is RELEASE and BUILD_NUMBER if USER_RELEASE_SUFFIX is not set
++ifndef USER_RELEASE_SUFFIX
++ FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
++else
+ FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
+ endif
+
+--- ./jdk/make/java/management/mapfile-vers Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/java/management/mapfile-vers Tue Oct 08 09:07:05 2013 -0700
+@@ -53,7 +53,7 @@
+ Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
+ Java_sun_management_GcInfoBuilder_getLastGcInfo0;
+ Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
+- Java_sun_management_HotSpotDiagnostic_dumpHeap;
++ Java_sun_management_HotSpotDiagnostic_dumpHeap0;
+ Java_sun_management_HotspotThread_getInternalThreadCount;
+ Java_sun_management_HotspotThread_getInternalThreadTimes0;
+ Java_sun_management_MemoryImpl_getMemoryManagers0;
+--- ./jdk/make/sun/awt/FILES_c_macosx.gmk Mon Aug 26 07:41:45 2013 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,28 +0,0 @@
+-#
+-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# 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.
+-#
+-
+-FILES_AWT_objc = \
+- $(TARGDIR)MacOSXResourceBundle.m
+-
+--- ./jdk/make/sun/awt/FILES_export_macosx.gmk Mon Aug 26 07:41:45 2013 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,29 +0,0 @@
+-#
+-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# 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.
+-#
+-
+-# FILES_export definitions for Mac OS X
+-
+-FILES_export += \
+- com/apple/resources/MacOSXResourceBundle.java
+--- ./jdk/make/sun/awt/Makefile Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/sun/awt/Makefile Tue Oct 08 09:07:05 2013 -0700
+@@ -145,8 +145,6 @@
+ #
+ # Files
+ #
+-include FILES_c_macosx.gmk
+-include FILES_export_macosx.gmk
+
+ FILES_objc = $(FILES_AWT_objc)
+ OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \
+--- ./jdk/make/sun/font/Makefile Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/sun/font/Makefile Tue Oct 08 09:07:05 2013 -0700
+@@ -36,7 +36,11 @@
+ CPLUSPLUSLIBRARY=true
+
+ # Use higher optimization level
+-OPTIMIZATION_LEVEL = HIGHER
++ifeq ($(PLATFORM), windows)
++ OPTIMIZATION_LEVEL = HIGHEST
++else
++ OPTIMIZATION_LEVEL = HIGHER
++endif
+
+ include $(BUILDDIR)/common/Defs.gmk
+
+--- ./jdk/make/sun/nio/cs/FILES_java.gmk Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/sun/nio/cs/FILES_java.gmk Tue Oct 08 09:07:05 2013 -0700
+@@ -329,6 +329,7 @@
+ sun/nio/cs/ext/IBM280.java \
+ sun/nio/cs/ext/IBM284.java \
+ sun/nio/cs/ext/IBM285.java \
++ sun/nio/cs/ext/IBM290.java \
+ sun/nio/cs/ext/IBM297.java \
+ sun/nio/cs/ext/IBM420.java \
+ sun/nio/cs/ext/IBM424.java \
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/make/tools/CharsetMapping/IBM290.c2b Tue Oct 08 09:07:05 2013 -0700
+@@ -0,0 +1,100 @@
++#
++# Diff of
++# b2c: cdctables.zip/Package2.zip/IBM-290.zip/012234B0.TPMAP100
++# c2b: cdctables.zip/Package2.zip/IBM-290.zip/012234B0.UPMAP100
++#
++# fullwidth form
++0x4B U+FF0E
++0x4C U+FF1C
++0x4D U+FF08
++0x4E U+FF0B
++0x4F U+FF5C
++0x50 U+FF06
++0x5A U+FF01
++0x5C U+FF0A
++0x5D U+FF09
++0x5E U+FF1B
++0x60 U+FF0D
++0x61 U+FF0F
++0x62 U+FF41
++0x63 U+FF42
++0x64 U+FF43
++0x65 U+FF44
++0x66 U+FF45
++0x67 U+FF46
++0x68 U+FF47
++0x69 U+FF48
++0x6B U+FF0C
++0x6C U+FF05
++0x6D U+FF3F
++0x6E U+FF1E
++0x6F U+FF1F
++0x70 U+FF3B
++0x71 U+FF49
++0x72 U+FF4A
++0x73 U+FF4B
++0x74 U+FF4C
++0x75 U+FF4D
++0x76 U+FF4E
++0x77 U+FF4F
++0x78 U+FF50
++0x79 U+FF40
++0x7A U+FF1A
++0x7B U+FF03
++0x7C U+FF20
++0x7D U+FF07
++0x7E U+FF1D
++0x7F U+FF02
++0x80 U+FF3D
++0x8B U+FF51
++0x9B U+FF52
++0xA0 U+FF5E
++0xAB U+FF53
++0xB0 U+FF3E
++0xB2 U+FF3C
++0xB3 U+FF54
++0xB4 U+FF55
++0xB5 U+FF56
++0xB6 U+FF57
++0xB7 U+FF58
++0xB8 U+FF59
++0xB9 U+FF5A
++0xC0 U+FF5B
++0xC1 U+FF21
++0xC2 U+FF22
++0xC3 U+FF23
++0xC4 U+FF24
++0xC5 U+FF25
++0xC6 U+FF26
++0xC7 U+FF27
++0xC8 U+FF28
++0xC9 U+FF29
++0xD0 U+FF5D
++0xD1 U+FF2A
++0xD2 U+FF2B
++0xD3 U+FF2C
++0xD4 U+FF2D
++0xD5 U+FF2E
++0xD6 U+FF2F
++0xD7 U+FF30
++0xD8 U+FF31
++0xD9 U+FF32
++0xE0 U+FF04
++0xE2 U+FF33
++0xE3 U+FF34
++0xE4 U+FF35
++0xE5 U+FF36
++0xE6 U+FF37
++0xE7 U+FF38
++0xE8 U+FF39
++0xE9 U+FF3A
++0xF0 U+FF10
++0xF1 U+FF11
++0xF2 U+FF12
++0xF3 U+FF13
++0xF4 U+FF14
++0xF5 U+FF15
++0xF6 U+FF16
++0xF7 U+FF17
++0xF8 U+FF18
++0xF9 U+FF19
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/make/tools/CharsetMapping/IBM290.map Tue Oct 08 09:07:05 2013 -0700
+@@ -0,0 +1,232 @@
++#
++# b2c mapping for IBM290, generated from
++# cdctables.zip/Package2.zip/IBM-290.zip/012234B0.TPMAP100
++#
++0x00 U+0000
++0x01 U+0001
++0x02 U+0002
++0x03 U+0003
++0x04 U+009C
++0x05 U+0009
++0x06 U+0086
++0x07 U+007F
++0x08 U+0097
++0x09 U+008D
++0x0A U+008E
++0x0B U+000B
++0x0C U+000C
++0x0D U+000D
++0x0E U+000E
++0x0F U+000F
++0x10 U+0010
++0x11 U+0011
++0x12 U+0012
++0x13 U+0013
++0x14 U+009D
++0x15 U+0085
++0x16 U+0008
++0x17 U+0087
++0x18 U+0018
++0x19 U+0019
++0x1A U+0092
++0x1B U+008F
++0x1C U+001C
++0x1D U+001D
++0x1E U+001E
++0x1F U+001F
++0x20 U+0080
++0x21 U+0081
++0x22 U+0082
++0x23 U+0083
++0x24 U+0084
++0x25 U+000A
++0x26 U+0017
++0x27 U+001B
++0x28 U+0088
++0x29 U+0089
++0x2A U+008A
++0x2B U+008B
++0x2C U+008C
++0x2D U+0005
++0x2E U+0006
++0x2F U+0007
++0x30 U+0090
++0x31 U+0091
++0x32 U+0016
++0x33 U+0093
++0x34 U+0094
++0x35 U+0095
++0x36 U+0096
++0x37 U+0004
++0x38 U+0098
++0x39 U+0099
++0x3A U+009A
++0x3B U+009B
++0x3C U+0014
++0x3D U+0015
++0x3E U+009E
++0x3F U+001A
++0x40 U+0020
++0x41 U+FF61
++0x42 U+FF62
++0x43 U+FF63
++0x44 U+FF64
++0x45 U+FF65
++0x46 U+FF66
++0x47 U+FF67
++0x48 U+FF68
++0x49 U+FF69
++0x4A U+00A3
++0x4B U+002E
++0x4C U+003C
++0x4D U+0028
++0x4E U+002B
++0x4F U+007C
++0x50 U+0026
++0x51 U+FF6A
++0x52 U+FF6B
++0x53 U+FF6C
++0x54 U+FF6D
++0x55 U+FF6E
++0x56 U+FF6F
++0x58 U+FF70
++0x5A U+0021
++0x5B U+00A5
++0x5C U+002A
++0x5D U+0029
++0x5E U+003B
++0x5F U+00AC
++0x60 U+002D
++0x61 U+002F
++0x62 U+0061
++0x63 U+0062
++0x64 U+0063
++0x65 U+0064
++0x66 U+0065
++0x67 U+0066
++0x68 U+0067
++0x69 U+0068
++0x6B U+002C
++0x6C U+0025
++0x6D U+005F
++0x6E U+003E
++0x6F U+003F
++0x70 U+005B
++0x71 U+0069
++0x72 U+006A
++0x73 U+006B
++0x74 U+006C
++0x75 U+006D
++0x76 U+006E
++0x77 U+006F
++0x78 U+0070
++0x79 U+0060
++0x7A U+003A
++0x7B U+0023
++0x7C U+0040
++0x7D U+0027
++0x7E U+003D
++0x7F U+0022
++0x80 U+005D
++0x81 U+FF71
++0x82 U+FF72
++0x83 U+FF73
++0x84 U+FF74
++0x85 U+FF75
++0x86 U+FF76
++0x87 U+FF77
++0x88 U+FF78
++0x89 U+FF79
++0x8A U+FF7A
++0x8B U+0071
++0x8C U+FF7B
++0x8D U+FF7C
++0x8E U+FF7D
++0x8F U+FF7E
++0x90 U+FF7F
++0x91 U+FF80
++0x92 U+FF81
++0x93 U+FF82
++0x94 U+FF83
++0x95 U+FF84
++0x96 U+FF85
++0x97 U+FF86
++0x98 U+FF87
++0x99 U+FF88
++0x9A U+FF89
++0x9B U+0072
++0x9D U+FF8A
++0x9E U+FF8B
++0x9F U+FF8C
++0xA0 U+007E
++0xA1 U+203E
++0xA2 U+FF8D
++0xA3 U+FF8E
++0xA4 U+FF8F
++0xA5 U+FF90
++0xA6 U+FF91
++0xA7 U+FF92
++0xA8 U+FF93
++0xA9 U+FF94
++0xAA U+FF95
++0xAB U+0073
++0xAC U+FF96
++0xAD U+FF97
++0xAE U+FF98
++0xAF U+FF99
++0xB0 U+005E
++0xB1 U+00A2
++0xB2 U+005C
++0xB3 U+0074
++0xB4 U+0075
++0xB5 U+0076
++0xB6 U+0077
++0xB7 U+0078
++0xB8 U+0079
++0xB9 U+007A
++0xBA U+FF9A
++0xBB U+FF9B
++0xBC U+FF9C
++0xBD U+FF9D
++0xBE U+FF9E
++0xBF U+FF9F
++0xC0 U+007B
++0xC1 U+0041
++0xC2 U+0042
++0xC3 U+0043
++0xC4 U+0044
++0xC5 U+0045
++0xC6 U+0046
++0xC7 U+0047
++0xC8 U+0048
++0xC9 U+0049
++0xD0 U+007D
++0xD1 U+004A
++0xD2 U+004B
++0xD3 U+004C
++0xD4 U+004D
++0xD5 U+004E
++0xD6 U+004F
++0xD7 U+0050
++0xD8 U+0051
++0xD9 U+0052
++0xE0 U+0024
++0xE2 U+0053
++0xE3 U+0054
++0xE4 U+0055
++0xE5 U+0056
++0xE6 U+0057
++0xE7 U+0058
++0xE8 U+0059
++0xE9 U+005A
++0xF0 U+0030
++0xF1 U+0031
++0xF2 U+0032
++0xF3 U+0033
++0xF4 U+0034
++0xF5 U+0035
++0xF6 U+0036
++0xF7 U+0037
++0xF8 U+0038
++0xF9 U+0039
++0xFF U+009F
+--- ./jdk/make/tools/CharsetMapping/extsbcs Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/make/tools/CharsetMapping/extsbcs Tue Oct 08 09:07:05 2013 -0700
+@@ -28,6 +28,7 @@
+ IBM280 IBM280 Cp280 false sun.nio.cs.ext
+ IBM284 IBM284 Cp284 false sun.nio.cs.ext
+ IBM285 IBM285 Cp285 false sun.nio.cs.ext
++IBM290 IBM290 Cp290 false sun.nio.cs.ext
+ IBM297 IBM297 Cp297 false sun.nio.cs.ext
+ IBM420 IBM420 Cp420 false sun.nio.cs.ext
+ IBM424 IBM424 Cp424 false sun.nio.cs.ext
+--- ./jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java Tue Oct 08 09:07:05 2013 -0700
+@@ -37,8 +37,6 @@
+ import sun.swing.*;
+ import apple.laf.*;
+
+-import com.apple.resources.MacOSXResourceBundle;
+-
+ public class AquaLookAndFeel extends BasicLookAndFeel {
+ static final String sOldPropertyPrefix = "com.apple.macos."; // old prefix for things like 'useScreenMenuBar'
+ static final String sPropertyPrefix = "apple.laf."; // new prefix for things like 'useScreenMenuBar'
+@@ -246,7 +244,7 @@
+ table.setDefaultLocale(Locale.getDefault());
+ table.addResourceBundle(PKG_PREFIX + "resources.aqua");
+ try {
+- final ResourceBundle aquaProperties = MacOSXResourceBundle.getMacResourceBundle(PKG_PREFIX + "resources.aqua");
++ final ResourceBundle aquaProperties = ResourceBundle.getBundle(PKG_PREFIX + "resources.aqua");
+ final Enumeration<String> propertyKeys = aquaProperties.getKeys();
+
+ while (propertyKeys.hasMoreElements()) {
+--- ./jdk/src/macosx/classes/com/apple/laf/AquaUtils.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/macosx/classes/com/apple/laf/AquaUtils.java Tue Oct 08 09:07:05 2013 -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
+@@ -29,6 +29,7 @@
+ import java.awt.image.*;
+ import java.lang.ref.SoftReference;
+ import java.lang.reflect.Method;
++import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ import java.util.*;
+
+@@ -41,56 +42,68 @@
+ import sun.lwawt.macosx.CImage;
+ import sun.lwawt.macosx.CImage.Creator;
+ import sun.lwawt.macosx.CPlatformWindow;
++import sun.misc.Launcher;
++import sun.reflect.misc.ReflectUtil;
++import sun.security.action.GetPropertyAction;
+ import sun.swing.SwingUtilities2;
+
+ import com.apple.laf.AquaImageFactory.SlicedImageControl;
+
+-public class AquaUtils {
+- final static String ANIMATIONS_SYSTEM_PROPERTY = "swing.enableAnimations";
++final class AquaUtils {
+
+- /*
++ private static final String ANIMATIONS_PROPERTY = "swing.enableAnimations";
++
++ /**
++ * Suppresses default constructor, ensuring non-instantiability.
++ */
++ private AquaUtils() {
++ }
++
++ /**
+ * Convenience function for determining ComponentOrientation. Helps us
+ * avoid having Munge directives throughout the code.
+ */
+- public static boolean isLeftToRight(final Component c) {
++ static boolean isLeftToRight(final Component c) {
+ return c.getComponentOrientation().isLeftToRight();
+ }
+
+- public static void enforceComponentOrientation(Component c, ComponentOrientation orientation) {
++ static void enforceComponentOrientation(final Component c, final ComponentOrientation orientation) {
+ c.setComponentOrientation(orientation);
+ if (c instanceof Container) {
+- for (Component child : ((Container)c).getComponents()) {
++ for (final Component child : ((Container)c).getComponents()) {
+ enforceComponentOrientation(child, orientation);
+ }
+ }
+ }
+
+- private static CImage.Creator getCImageCreatorInternal() {
+- return java.security.AccessController.doPrivileged(new PrivilegedAction<CImage.Creator>() {
++ private static Creator getCImageCreatorInternal() {
++ return AccessController.doPrivileged(new PrivilegedAction<Creator>() {
++ @Override
+ public Creator run() {
+ try {
+ final Method getCreatorMethod = CImage.class.getDeclaredMethod("getCreator", new Class[] {});
+ getCreatorMethod.setAccessible(true);
+- return (CImage.Creator)getCreatorMethod.invoke(null, new Object[] {});
+- } catch (final Exception e) {
++ return (Creator)getCreatorMethod.invoke(null, new Object[] {});
++ } catch (final Exception ignored) {
+ return null;
+ }
+ }
+ });
+ }
+
+- private static final RecyclableSingleton<CImage.Creator> cImageCreator = new RecyclableSingleton<CImage.Creator>() {
++ private static final RecyclableSingleton<Creator> cImageCreator = new RecyclableSingleton<Creator>() {
+ @Override
+ protected Creator getInstance() {
+ return getCImageCreatorInternal();
+ }
+ };
+- static CImage.Creator getCImageCreator() {
++ static Creator getCImageCreator() {
+ return cImageCreator.get();
+ }
+
+- protected static Image generateSelectedDarkImage(final Image image) {
++ static Image generateSelectedDarkImage(final Image image) {
+ final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
++ @Override
+ int getGreyFor(final int gray) {
+ return gray * 75 / 100;
+ }
+@@ -98,8 +111,9 @@
+ return Toolkit.getDefaultToolkit().createImage(prod);
+ }
+
+- protected static Image generateDisabledImage(final Image image) {
++ static Image generateDisabledImage(final Image image) {
+ final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
++ @Override
+ int getGreyFor(final int gray) {
+ return 255 - ((255 - gray) * 65 / 100);
+ }
+@@ -107,19 +121,20 @@
+ return Toolkit.getDefaultToolkit().createImage(prod);
+ }
+
+- protected static Image generateLightenedImage(final Image image, final int percent) {
++ static Image generateLightenedImage(final Image image, final int percent) {
+ final GrayFilter filter = new GrayFilter(true, percent);
+ final ImageProducer prod = new FilteredImageSource(image.getSource(), filter);
+ return Toolkit.getDefaultToolkit().createImage(prod);
+ }
+
+- static abstract class IconImageFilter extends RGBImageFilter {
+- public IconImageFilter() {
++ private abstract static class IconImageFilter extends RGBImageFilter {
++ IconImageFilter() {
+ super();
+ canFilterIndexColorModel = true;
+ }
+
+- public int filterRGB(final int x, final int y, final int rgb) {
++ @Override
++ public final int filterRGB(final int x, final int y, final int rgb) {
+ final int red = (rgb >> 16) & 0xff;
+ final int green = (rgb >> 8) & 0xff;
+ final int blue = rgb & 0xff;
+@@ -135,14 +150,14 @@
+ return result;
+ }
+
+- abstract int getGreyFor(final int gray);
++ abstract int getGreyFor(int gray);
+ }
+
+- public abstract static class RecyclableObject<T> {
+- protected SoftReference<T> objectRef = null;
++ abstract static class RecyclableObject<T> {
++ private SoftReference<T> objectRef;
+
+- public T get() {
+- T referent = null;
++ T get() {
++ T referent;
+ if (objectRef != null && (referent = objectRef.get()) != null) return referent;
+ referent = create();
+ objectRef = new SoftReference<T>(referent);
+@@ -152,8 +167,8 @@
+ protected abstract T create();
+ }
+
+- public abstract static class RecyclableSingleton<T> {
+- public T get() {
++ abstract static class RecyclableSingleton<T> {
++ final T get() {
+ final AppContext appContext = AppContext.getAppContext();
+ SoftReference<T> ref = (SoftReference<T>) appContext.get(this);
+ if (ref != null) {
+@@ -166,38 +181,36 @@
+ return object;
+ }
+
+- public void reset() {
+- AppContext appContext = AppContext.getAppContext();
+- appContext.remove(this);
++ void reset() {
++ AppContext.getAppContext().remove(this);
+ }
+
+- protected abstract T getInstance();
++ abstract T getInstance();
+ }
+
+- public static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
+- protected final Class<T> clazz;
++ static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
++ private final Class<T> clazz;
+
+- public RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
++ RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
+ this.clazz = clazz;
+ }
+
+- protected T getInstance() {
++ @Override
++ T getInstance() {
+ try {
++ ReflectUtil.checkPackageAccess(clazz);
+ return clazz.newInstance();
+- } catch (final InstantiationException e) {
+- e.printStackTrace();
+- } catch (final IllegalAccessException e) {
+- e.printStackTrace();
++ } catch (InstantiationException | IllegalAccessException ignored) {
+ }
+ return null;
+ }
+ }
+
+- public abstract static class LazyKeyedSingleton<K, V> {
+- protected Map<K, V> refs;
++ abstract static class LazyKeyedSingleton<K, V> {
++ private Map<K, V> refs;
+
+- public V get(final K key) {
+- if (refs == null) refs = new HashMap<K, V>();
++ V get(final K key) {
++ if (refs == null) refs = new HashMap<>();
+
+ final V cachedValue = refs.get(key);
+ if (cachedValue != null) return cachedValue;
+@@ -207,44 +220,45 @@
+ return value;
+ }
+
+- protected abstract V getInstance(final K key);
++ protected abstract V getInstance(K key);
+ }
+
+- static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
++ private static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
+ @Override
+ protected Boolean getInstance() {
+- final String sizeProperty = (String)java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.GetPropertyAction(ANIMATIONS_SYSTEM_PROPERTY));
+- return new Boolean(!"false".equals(sizeProperty)); // should be true by default
++ final String sizeProperty = (String) AccessController.doPrivileged((PrivilegedAction<?>)new GetPropertyAction(
++ ANIMATIONS_PROPERTY));
++ return !"false".equals(sizeProperty); // should be true by default
+ }
+ };
+- static boolean animationsEnabled() {
++ private static boolean animationsEnabled() {
+ return enableAnimations.get();
+ }
+
+- static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
+- protected static void blinkMenu(final Selectable selectable) {
++ private static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
++ static void blinkMenu(final Selectable selectable) {
+ if (!animationsEnabled()) return;
+ try {
+ selectable.paintSelected(false);
+ Thread.sleep(MENU_BLINK_DELAY);
+ selectable.paintSelected(true);
+ Thread.sleep(MENU_BLINK_DELAY);
+- } catch (final InterruptedException e) { }
++ } catch (final InterruptedException ignored) { }
+ }
+
+ interface Selectable {
+- void paintSelected(final boolean selected);
++ void paintSelected(boolean selected);
+ }
+
+ interface JComponentPainter {
+- public void paint(JComponent c, Graphics g, int x, int y, int w, int h);
++ void paint(JComponent c, Graphics g, int x, int y, int w, int h);
+ }
+
+ interface Painter {
+- public void paint(final Graphics g, int x, int y, int w, int h);
++ void paint(Graphics g, int x, int y, int w, int h);
+ }
+
+- public static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
++ static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
+ g.setFont(font);
+ g.setColor(shadowColor);
+ SwingUtilities2.drawString(c, g, text, x + offsetX, y + offsetY + metrics.getAscent());
+@@ -252,22 +266,22 @@
+ SwingUtilities2.drawString(c, g, text, x, y + metrics.getAscent());
+ }
+
+- public static class ShadowBorder implements Border {
+- final Painter prePainter;
+- final Painter postPainter;
++ static class ShadowBorder implements Border {
++ private final Painter prePainter;
++ private final Painter postPainter;
+
+- final int offsetX;
+- final int offsetY;
+- final float distance;
+- final int blur;
+- final Insets insets;
+- final ConvolveOp blurOp;
++ private final int offsetX;
++ private final int offsetY;
++ private final float distance;
++ private final int blur;
++ private final Insets insets;
++ private final ConvolveOp blurOp;
+
+- public ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
++ ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
+ this.prePainter = prePainter; this.postPainter = postPainter;
+ this.offsetX = offsetX; this.offsetY = offsetY; this.distance = distance; this.blur = blur;
+ final int halfBlur = blur / 2;
+- this.insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);
++ insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);
+
+ final float blurry = intensity / (blur * blur);
+ final float[] blurKernel = new float[blur * blur];
+@@ -275,14 +289,17 @@
+ blurOp = new ConvolveOp(new Kernel(blur, blur, blurKernel));
+ }
+
+- public boolean isBorderOpaque() {
++ @Override
++ public final boolean isBorderOpaque() {
+ return false;
+ }
+
+- public Insets getBorderInsets(final Component c) {
++ @Override
++ public final Insets getBorderInsets(final Component c) {
+ return insets;
+ }
+
++ @Override
+ public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) {
+ final BufferedImage img = new BufferedImage(width + blur * 2, height + blur * 2, BufferedImage.TYPE_INT_ARGB_PRE);
+ paintToImage(img, x, y, width, height);
+@@ -290,7 +307,7 @@
+ g.drawImage(img, -blur, -blur, null);
+ }
+
+- protected void paintToImage(final BufferedImage img, final int x, final int y, final int width, final int height) {
++ private void paintToImage(final BufferedImage img, final int x, final int y, final int width, final int height) {
+ // clear the prior image
+ Graphics2D imgG = (Graphics2D)img.getGraphics();
+ imgG.setComposite(AlphaComposite.Clear);
+@@ -319,10 +336,10 @@
+ }
+ }
+
+- public static class SlicedShadowBorder extends ShadowBorder {
+- final SlicedImageControl slices;
++ static class SlicedShadowBorder extends ShadowBorder {
++ private final SlicedImageControl slices;
+
+- public SlicedShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur, final int templateWidth, final int templateHeight, final int leftCut, final int topCut, final int rightCut, final int bottomCut) {
++ SlicedShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur, final int templateWidth, final int templateHeight, final int leftCut, final int topCut, final int rightCut, final int bottomCut) {
+ super(prePainter, postPainter, offsetX, offsetY, distance, intensity, blur);
+
+ final BufferedImage i = new BufferedImage(templateWidth, templateHeight, BufferedImage.TYPE_INT_ARGB_PRE);
+@@ -331,15 +348,12 @@
+ slices = new SlicedImageControl(i, leftCut, topCut, rightCut, bottomCut, false);
+ }
+
++ @Override
+ public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) {
+ slices.paint(g, x, y, width, height);
+ }
+ }
+
+- public interface NineSliceMetricsProvider {
+-
+- }
+-
+ // static void debugFrame(String name, Image image) {
+ // JFrame f = new JFrame(name);
+ // f.setContentPane(new JLabel(new ImageIcon(image)));
+@@ -350,28 +364,30 @@
+ // special casing naughty applications, like InstallAnywhere
+ // <rdar://problem/4851533> REGR: JButton: Myst IV: the buttons of 1.0.3 updater have redraw issue
+ static boolean shouldUseOpaqueButtons() {
+- final ClassLoader launcherClassLoader = sun.misc.Launcher.getLauncher().getClassLoader();
++ final ClassLoader launcherClassLoader = Launcher.getLauncher().getClassLoader();
+ if (classExists(launcherClassLoader, "com.installshield.wizard.platform.macosx.MacOSXUtils")) return true;
+ return false;
+ }
+
+- static boolean classExists(final ClassLoader classLoader, final String clazzName) {
++ private static boolean classExists(final ClassLoader classLoader, final String clazzName) {
+ try {
+ return Class.forName(clazzName, false, classLoader) != null;
+- } catch (final Throwable e) { }
++ } catch (final Throwable ignored) { }
+ return false;
+ }
+
+- private static RecyclableSingleton<Method> getJComponentGetFlagMethod = new RecyclableSingleton<Method>() {
++ private static final RecyclableSingleton<Method> getJComponentGetFlagMethod = new RecyclableSingleton<Method>() {
++ @Override
+ protected Method getInstance() {
+- return java.security.AccessController.doPrivileged(
++ return AccessController.doPrivileged(
+ new PrivilegedAction<Method>() {
++ @Override
+ public Method run() {
+ try {
+ final Method method = JComponent.class.getDeclaredMethod("getFlag", new Class[] { int.class });
+ method.setAccessible(true);
+ return method;
+- } catch (final Throwable e) {
++ } catch (final Throwable ignored) {
+ return null;
+ }
+ }
+@@ -380,18 +396,18 @@
+ }
+ };
+
+- private static final Integer OPAQUE_SET_FLAG = new Integer(24); // private int JComponent.OPAQUE_SET
+- protected static boolean hasOpaqueBeenExplicitlySet(final JComponent c) {
++ private static final Integer OPAQUE_SET_FLAG = 24; // private int JComponent.OPAQUE_SET
++ static boolean hasOpaqueBeenExplicitlySet(final JComponent c) {
+ final Method method = getJComponentGetFlagMethod.get();
+ if (method == null) return false;
+ try {
+ return Boolean.TRUE.equals(method.invoke(c, OPAQUE_SET_FLAG));
+- } catch (final Throwable e) {
++ } catch (final Throwable ignored) {
+ return false;
+ }
+ }
+
+- protected static boolean isWindowTextured(final Component c) {
++ private static boolean isWindowTextured(final Component c) {
+ if (!(c instanceof JComponent)) {
+ return false;
+ }
+@@ -412,13 +428,12 @@
+ return new Color(color.getRed(), color.getGreen(), color.getBlue(), 0);
+ }
+
+- protected static void fillRect(final Graphics g, final Component c) {
++ static void fillRect(final Graphics g, final Component c) {
+ fillRect(g, c, c.getBackground(), 0, 0, c.getWidth(), c.getHeight());
+ }
+
+- protected static void fillRect(final Graphics g, final Component c,
+- final Color color, final int x, final int y,
+- final int w, final int h) {
++ static void fillRect(final Graphics g, final Component c, final Color color,
++ final int x, final int y, final int w, final int h) {
+ if (!(g instanceof Graphics2D)) {
+ return;
+ }
+--- ./jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java Tue Oct 08 09:07:05 2013 -0700
+@@ -37,26 +37,31 @@
+ import sun.lwawt.LWToolkit;
+ import sun.lwawt.macosx.*;
+
+-class ScreenMenu extends Menu implements ContainerListener, ComponentListener, ScreenMenuPropertyHandler {
++final class ScreenMenu extends Menu
++ implements ContainerListener, ComponentListener,
++ ScreenMenuPropertyHandler {
++
+ static {
+ java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("awt"));
+ }
+
+ // screen menu stuff
+- public static native long addMenuListeners(ScreenMenu listener, long nativeMenu);
+- public static native void removeMenuListeners(long modelPtr);
++ private static native long addMenuListeners(ScreenMenu listener, long nativeMenu);
++ private static native void removeMenuListeners(long modelPtr);
+
+- long fModelPtr = 0;
++ private transient long fModelPtr;
+
+- Hashtable<Component, MenuItem> fItems;
+- JMenu fInvoker;
++ private final Hashtable<Component, MenuItem> fItems;
++ private final JMenu fInvoker;
+
+- Component fLastMouseEventTarget;
+- Rectangle fLastTargetRect;
++ private Component fLastMouseEventTarget;
++ private Rectangle fLastTargetRect;
+ private volatile Rectangle[] fItemBounds;
+
++ private ScreenMenuPropertyListener fPropertyListener;
++
+ // Array of child hashes used to see if we need to recreate the Menu.
+- int childHashArray[];
++ private int childHashArray[];
+
+ ScreenMenu(final JMenu invoker) {
+ super(invoker.getText());
+@@ -69,25 +74,12 @@
+ updateItems();
+ }
+
+- // I'm always 'visible', but never on screen
+- static class ScreenMenuComponent extends Container {
+- public boolean isVisible() { return true; }
+- public boolean isShowing() { return true; }
+- public void setVisible(final boolean b) {}
+- public void show() {}
+- }
+-
+- ScreenMenuComponent makeScreenMenuComponent() {
+- return new ScreenMenuComponent();
+- }
+-
+-
+ /**
+ * Determine if we need to tear down the Menu and re-create it, since the contents may have changed in the Menu opened listener and
+ * we do not get notified of it, because EDT is busy in our code. We only need to update if the menu contents have changed in some
+ * way, such as the number of menu items, the text of the menuitems, icon, shortcut etc.
+ */
+- static boolean needsUpdate(final Component items[], final int childHashArray[]) {
++ private static boolean needsUpdate(final Component items[], final int childHashArray[]) {
+ if (items == null || childHashArray == null) {
+ return true;
+ }
+@@ -107,7 +99,7 @@
+ * Used to recreate the AWT based Menu structure that implements the Screen Menu.
+ * Also computes hashcode and stores them so that we can compare them later in needsUpdate.
+ */
+- void updateItems() {
++ private void updateItems() {
+ final int count = fInvoker.getMenuComponentCount();
+ final Component[] items = fInvoker.getMenuComponents();
+ if (needsUpdate(items, childHashArray)) {
+@@ -158,16 +150,14 @@
+ LWCToolkit.invokeAndWait(new Runnable() {
+ public void run() {
+ invoker.setSelected(false);
+-
+- // Null out the tracking rectangles and the array.
++ // Null out the tracking rectangles and the array.
+ if (fItemBounds != null) {
+- for (int i = 0; i < fItemBounds.length; i++) {
+- fItemBounds[i] = null;
+- }
++ for (int i = 0; i < fItemBounds.length; i++) {
++ fItemBounds[i] = null;
++ }
+ }
+-
+- fItemBounds = null;
+- }
++ fItemBounds = null;
++ }
+ }, invoker);
+ } catch (final Exception e) {
+ e.printStackTrace();
+@@ -232,49 +222,56 @@
+ });
+ }
+
+- ScreenMenuPropertyListener fPropertyListener;
++ @Override
+ public void addNotify() {
+- super.addNotify();
+- if (fModelPtr == 0) {
+- fInvoker.addContainerListener(this);
+- fInvoker.addComponentListener(this);
+- fPropertyListener = new ScreenMenuPropertyListener(this);
+- fInvoker.addPropertyChangeListener(fPropertyListener);
++ synchronized (getTreeLock()) {
++ super.addNotify();
++ if (fModelPtr == 0) {
++ fInvoker.addContainerListener(this);
++ fInvoker.addComponentListener(this);
++ fPropertyListener = new ScreenMenuPropertyListener(this);
++ fInvoker.addPropertyChangeListener(fPropertyListener);
+
+- final Icon icon = fInvoker.getIcon();
+- if (icon != null) {
+- this.setIcon(icon);
+- }
++ final Icon icon = fInvoker.getIcon();
++ if (icon != null) {
++ setIcon(icon);
++ }
+
+- final String tooltipText = fInvoker.getToolTipText();
+- if (tooltipText != null) {
+- this.setToolTipText(tooltipText);
+- }
+- final MenuComponentPeer peer = getPeer();
+- if (peer instanceof CMenu) {
+- final CMenu menu = (CMenu)peer;
+- final long nativeMenu = menu.getNativeMenu();
+- fModelPtr = addMenuListeners(this, nativeMenu);
++ final String tooltipText = fInvoker.getToolTipText();
++ if (tooltipText != null) {
++ setToolTipText(tooltipText);
++ }
++ final MenuComponentPeer peer = getPeer();
++ if (peer instanceof CMenu) {
++ final CMenu menu = (CMenu) peer;
++ final long nativeMenu = menu.getNativeMenu();
++ fModelPtr = addMenuListeners(this, nativeMenu);
++ }
+ }
+ }
+ }
+
++ @Override
+ public void removeNotify() {
+- // Call super so that the NSMenu has been removed, before we release the delegate in removeMenuListeners
+- super.removeNotify();
+- fItems.clear();
+- if (fModelPtr != 0) {
+- removeMenuListeners(fModelPtr);
+- fModelPtr = 0;
+- fInvoker.removeContainerListener(this);
+- fInvoker.removeComponentListener(this);
+- fInvoker.removePropertyChangeListener(fPropertyListener);
++ synchronized (getTreeLock()) {
++ // Call super so that the NSMenu has been removed, before we release
++ // the delegate in removeMenuListeners
++ super.removeNotify();
++ fItems.clear();
++ if (fModelPtr != 0) {
++ removeMenuListeners(fModelPtr);
++ fModelPtr = 0;
++ fInvoker.removeContainerListener(this);
++ fInvoker.removeComponentListener(this);
++ fInvoker.removePropertyChangeListener(fPropertyListener);
++ }
+ }
+ }
+
+ /**
+ * Invoked when a component has been added to the container.
+ */
++ @Override
+ public void componentAdded(final ContainerEvent e) {
+ addItem(e.getChild());
+ }
+@@ -282,23 +279,26 @@
+ /**
+ * Invoked when a component has been removed from the container.
+ */
++ @Override
+ public void componentRemoved(final ContainerEvent e) {
+ final Component child = e.getChild();
+ final MenuItem sm = fItems.get(child);
+ if (sm == null) return;
+
+- remove(sm);
+- fItems.remove(sm);
+- }
++ remove(sm);
++ fItems.remove(sm);
++ }
+
+ /**
+ * Invoked when the component's size changes.
+ */
++ @Override
+ public void componentResized(final ComponentEvent e) {}
+
+ /**
+ * Invoked when the component's position changes.
+ */
++ @Override
+ public void componentMoved(final ComponentEvent e) {}
+
+ /**
+@@ -306,6 +306,7 @@
+ * See componentHidden - we should still have a MenuItem
+ * it just isn't inserted
+ */
++ @Override
+ public void componentShown(final ComponentEvent e) {
+ setVisible(true);
+ }
+@@ -316,11 +317,12 @@
+ * so we remove the ScreenMenuItem from the ScreenMenu
+ * but leave it in fItems
+ */
++ @Override
+ public void componentHidden(final ComponentEvent e) {
+ setVisible(false);
+ }
+
+- public void setVisible(final boolean b) {
++ private void setVisible(final boolean b) {
+ // Tell our parent to add/remove us
+ final MenuContainer parent = getParent();
+
+@@ -328,20 +330,24 @@
+ if (parent instanceof ScreenMenu) {
+ final ScreenMenu sm = (ScreenMenu)parent;
+ sm.setChildVisible(fInvoker, b);
+- }
++ }
+ }
+ }
+
++ @Override
+ public void setChildVisible(final JMenuItem child, final boolean b) {
+ fItems.remove(child);
+ updateItems();
+ }
+
++ @Override
+ public void setAccelerator(final KeyStroke ks) {}
+
+ // only check and radio items can be indeterminate
++ @Override
+ public void setIndeterminate(boolean indeterminate) { }
+
++ @Override
+ public void setToolTipText(final String text) {
+ final MenuComponentPeer peer = getPeer();
+ if (!(peer instanceof CMenuItem)) return;
+@@ -350,6 +356,7 @@
+ cmi.setToolTipText(text);
+ }
+
++ @Override
+ public void setIcon(final Icon i) {
+ final MenuComponentPeer peer = getPeer();
+ if (!(peer instanceof CMenuItem)) return;
+@@ -369,9 +376,8 @@
+ /**
+ * Gets a hashCode for a JMenu or JMenuItem or subclass so that we can compare for
+ * changes in the Menu.
+- *
+ */
+- static int getHashCode(final Component m) {
++ private static int getHashCode(final Component m) {
+ int hashCode = m.hashCode();
+
+ if (m instanceof JMenuItem) {
+@@ -403,7 +409,7 @@
+ return hashCode;
+ }
+
+- void addItem(final Component m) {
++ private void addItem(final Component m) {
+ if (!m.isVisible()) return;
+ MenuItem sm = fItems.get(m);
+
+--- ./jdk/src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java Mon Aug 26 07:41:45 2013 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,110 +0,0 @@
+-/*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. 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.apple.resources;
+-
+-import java.security.*;
+-import java.util.PropertyResourceBundle;
+-import java.util.ResourceBundle;
+-import java.io.*;
+-
+-public class MacOSXResourceBundle extends PropertyResourceBundle {
+- MacOSXResourceBundle(InputStream stream) throws IOException {
+- super(stream);
+- }
+-
+- void setItsParent(ResourceBundle rb) {
+- setParent(rb);
+- }
+-
+- public static ResourceBundle getMacResourceBundle(String baseJavaBundle) throws Exception {
+- return getMacResourceBundle(baseJavaBundle, null);
+- }
+-
+- public static ResourceBundle getMacResourceBundle(String baseJavaBundle, String filename) throws Exception {
+- LoadNativeBundleAction lnba = new LoadNativeBundleAction(baseJavaBundle, filename);
+- return (ResourceBundle)java.security.AccessController.doPrivileged(lnba);
+- }
+-}
+-
+-class LoadNativeBundleAction implements PrivilegedExceptionAction {
+- String mBaseJavaBundle;
+- String mFilenameOverride;
+-
+- LoadNativeBundleAction(String baseJavaBundle, String filenameOverride) {
+- mBaseJavaBundle = baseJavaBundle;
+- mFilenameOverride = filenameOverride;
+- }
+-
+- public Object run() {
+- java.util.ResourceBundle returnValue = null;
+- MacOSXResourceBundle macOSrb = null;
+-
+- // Load the Mac OS X resources.
+- // Use a base filename if we were given one. Otherwise, we will look for the last piece of the bundle path
+- // with '.properties' appended. Either way, the native method will take care of the extension.
+- String filename = mFilenameOverride;
+-
+- if (filename == null) {
+- filename = mBaseJavaBundle.substring(mBaseJavaBundle.lastIndexOf('.') + 1);
+- }
+-
+- File propsFile = null;
+- String propertyFileName = getPathToBundleFile(filename);
+- InputStream stream = null;
+-
+- try {
+- propsFile = new File(propertyFileName);
+- stream = new FileInputStream(propsFile);
+- stream = new java.io.BufferedInputStream(stream);
+- macOSrb = new MacOSXResourceBundle(stream);
+- } catch (Exception e) {
+- //e.printStackTrace();
+- //System.out.println("Failed to create resources from application bundle. Using Java-based resources.");
+- } finally {
+- try {
+- if (stream != null) stream.close();
+- stream = null;
+- } catch (Exception e) {
+- e.printStackTrace();
+- }
+- }
+-
+- returnValue = ResourceBundle.getBundle(mBaseJavaBundle);
+-
+- // If we have a platform-specific bundle, make it the parent of the generic bundle, so failures propagate up to the parent.
+- if (returnValue != null) {
+- if (macOSrb != null) {
+- macOSrb.setItsParent(returnValue);
+- returnValue = macOSrb;
+- }
+- }
+-
+- return returnValue;
+- }
+-
+- private static native String getPathToBundleFile(String filename);
+-}
+-
+--- ./jdk/src/macosx/native/com/apple/resources/MacOSXResourceBundle.m Mon Aug 26 07:41:45 2013 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,110 +0,0 @@
+-/*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. 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.
+- */
+-
+-#import <dlfcn.h>
+-#import <Cocoa/Cocoa.h>
+-#import <JavaNativeFoundation/JavaNativeFoundation.h>
+-
+-#ifndef MAXPATHLEN
+-#define MAXPATHLEN PATH_MAX
+-#endif
+-
+-static jboolean
+-GetPathFromCurrentBinary(char *buf, jint bufsize)
+-{
+- Dl_info dlinfo;
+- dladdr((void *)GetPathFromCurrentBinary, &dlinfo);
+- if (realpath(dlinfo.dli_fname, buf) == NULL) {
+-// fprintf(stderr, "Error: realpath(`%s') failed.\n", dlinfo.dli_fname);
+- return JNI_FALSE;
+- }
+-
+- const char *libawt = "lib/libawt.dylib";
+- int strLen, libawtLen;
+-
+- strLen = strlen(buf);
+- libawtLen = strlen(libawt);
+-
+- if (strLen < libawtLen ||
+- strcmp(buf + strLen - libawtLen, libawt) != 0) {
+- return JNI_FALSE;
+- }
+-
+- buf[strLen - libawtLen] = '\0';
+-
+- return JNI_TRUE;
+-}
+-
+-#define JAVA_DLL "libjava.dylib"
+-
+-static jboolean
+-GetJREPath(char *buf, jint bufsize)
+-{
+- /* try to get the path from the current binary, if not, bail to the framework */
+- if (GetPathFromCurrentBinary(buf, bufsize) == JNI_TRUE) {
+- /* does the rest of the JRE exist? */
+- char libjava[MAXPATHLEN];
+- snprintf(libjava, MAXPATHLEN, "%s/lib/" JAVA_DLL, buf);
+- if (access(libjava, F_OK) == 0) {
+- return JNI_TRUE;
+- }
+- }
+-
+- return JNI_FALSE;
+-}
+-
+-static NSString *getRunningJavaBundle()
+-{
+- char path[MAXPATHLEN];
+- GetJREPath(path, MAXPATHLEN);
+- return [[NSString alloc] initWithFormat:@"%@/bundle", [NSString stringWithUTF8String:path]];
+-}
+-
+-/*
+- * Class: com_apple_resources_LoadNativeBundleAction
+- * Method: getPathToBundleFile
+- * Signature: (Ljava/lang/String)Ljava/lang/String;
+- */
+-JNIEXPORT jstring JNICALL
+-Java_com_apple_resources_LoadNativeBundleAction_getPathToBundleFile
+- (JNIEnv *env, jclass klass, jstring filename)
+-{
+- jstring returnVal = NULL;
+- if (filename == NULL) {
+- return NULL;
+- }
+-
+-JNF_COCOA_ENTER(env);
+- NSBundle *javaBundle = [NSBundle bundleWithPath:getRunningJavaBundle()];
+- NSString *baseFilename = JNFJavaToNSString(env, filename);
+- NSString *propertyFilePath = [javaBundle pathForResource:baseFilename ofType:@"properties"];
+-
+- if (propertyFilePath != nil) {
+- returnVal = JNFNSToJavaString(env, propertyFilePath);
+- }
+-JNF_COCOA_EXIT(env);
+-
+- return returnVal;
+-}
+--- ./jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java Tue Oct 08 09:07:05 2013 -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
+@@ -280,22 +280,6 @@
+ return new DHParameterSpec(this.p, this.g);
+ }
+
+- public String toString() {
+- String LINE_SEP = System.getProperty("line.separator");
+-
+- StringBuffer strbuf
+- = new StringBuffer("SunJCE Diffie-Hellman Private Key:"
+- + LINE_SEP + "x:" + LINE_SEP
+- + Debug.toHexString(this.x)
+- + LINE_SEP + "p:" + LINE_SEP
+- + Debug.toHexString(this.p)
+- + LINE_SEP + "g:" + LINE_SEP
+- + Debug.toHexString(this.g));
+- if (this.l != 0)
+- strbuf.append(LINE_SEP + "l:" + LINE_SEP + " " + this.l);
+- return strbuf.toString();
+- }
+-
+ private void parseKeyBits() throws InvalidKeyException {
+ try {
+ DerInputStream in = new DerInputStream(this.key);
+--- ./jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java Tue Oct 08 09:07:05 2013 -0700
+@@ -53,7 +53,10 @@
+
+ public static void ObjectInit(Object obj)
+ {
+- if ( engaged != 0 ) {
++ if ( engaged != 0) {
++ if (obj == null) {
++ throw new IllegalArgumentException("Null object.");
++ }
+ nativeObjectInit(Thread.currentThread(), obj);
+ }
+ }
+@@ -66,7 +69,10 @@
+
+ public static void NewArray(Object obj)
+ {
+- if ( engaged != 0 ) {
++ if ( engaged != 0) {
++ if (obj == null) {
++ throw new IllegalArgumentException("Null object.");
++ }
+ nativeNewArray(Thread.currentThread(), obj);
+ }
+ }
+@@ -82,6 +88,14 @@
+ public static void CallSite(int cnum, int mnum)
+ {
+ if ( engaged != 0 ) {
++ if (cnum < 0) {
++ throw new IllegalArgumentException("Negative class index");
++ }
++
++ if (mnum < 0) {
++ throw new IllegalArgumentException("Negative method index");
++ }
++
+ nativeCallSite(Thread.currentThread(), cnum, mnum);
+ }
+ }
+@@ -95,6 +109,14 @@
+ public static void ReturnSite(int cnum, int mnum)
+ {
+ if ( engaged != 0 ) {
++ if (cnum < 0) {
++ throw new IllegalArgumentException("Negative class index");
++ }
++
++ if (mnum < 0) {
++ throw new IllegalArgumentException("Negative method index");
++ }
++
+ nativeReturnSite(Thread.currentThread(), cnum, mnum);
+ }
+ }
+--- ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1160,6 +1160,11 @@
+ target = imRas;
+ }
+ int [] bandSizes = target.getSampleModel().getSampleSize();
++ for (int i = 0; i < bandSizes.length; i++) {
++ if (bandSizes[i] <= 0 || bandSizes[i] > 8) {
++ throw new IIOException("Illegal band size: should be 0 < size <= 8");
++ }
++ }
+
+ /*
+ * If the process is sequential, and we have restart markers,
+--- ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java Tue Oct 08 09:07:05 2013 -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
+ // per sample.
+- if (bandSizes[i] > 8) {
+- throw new IIOException("Sample size must be <= 8");
++ if (bandSizes[i] <= 0 || bandSizes[i] > 8) {
++ throw new IIOException("Illegal band size: should be 0 < size <= 8");
+ }
+ // 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/jmx/remote/protocol/iiop/IIOPProxyImpl.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2009,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,13 +36,34 @@
+ import java.rmi.NoSuchObjectException;
+
+ import com.sun.jmx.remote.internal.IIOPProxy;
++import java.io.SerializablePermission;
++import java.security.AccessControlContext;
++import java.security.AccessController;
++import java.security.Permissions;
++import java.security.PrivilegedActionException;
++import java.security.PrivilegedExceptionAction;
++import java.security.ProtectionDomain;
+
+ /**
+- * An implementatin of IIOPProxy that simply delegates to the appropriate
++ * An implementation of IIOPProxy that simply delegates to the appropriate
+ * RMI-IIOP and CORBA APIs.
+ */
+
+ public class IIOPProxyImpl implements IIOPProxy {
++ // special ACC used to initialize the IIOP stub
++ // the only allowed privilege is SerializablePermission("enableSubclassImplementation")
++ private static final AccessControlContext STUB_ACC;
++
++ static {
++ Permissions p = new Permissions();
++ p.add(new SerializablePermission("enableSubclassImplementation"));
++ STUB_ACC = new AccessControlContext(
++ new ProtectionDomain[]{
++ new ProtectionDomain(null, p)
++ }
++ );
++ }
++
+ public IIOPProxyImpl() { }
+
+ @Override
+@@ -113,7 +134,24 @@
+ }
+
+ @Override
+- public Remote toStub(Remote obj) throws NoSuchObjectException {
+- return PortableRemoteObject.toStub(obj);
++ public Remote toStub(final Remote obj) throws NoSuchObjectException {
++ if (System.getSecurityManager() == null) {
++ return PortableRemoteObject.toStub(obj);
++ } else {
++ try {
++ return AccessController.doPrivileged(new PrivilegedExceptionAction<Remote>() {
++
++ @Override
++ public Remote run() throws Exception {
++ return PortableRemoteObject.toStub(obj);
++ }
++ }, STUB_ACC);
++ } catch (PrivilegedActionException e) {
++ if (e.getException() instanceof NoSuchObjectException) {
++ throw (NoSuchObjectException)e.getException();
++ }
++ throw new RuntimeException("Unexpected exception type", e.getException());
++ }
++ }
+ }
+ }
+--- ./jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java Tue Oct 08 09:07:05 2013 -0700
+@@ -25,11 +25,12 @@
+
+ package com.sun.jndi.ldap;
+
+-import java.net.URL;
+ import java.net.URLClassLoader;
+ import java.net.MalformedURLException;
++import java.security.AccessControlContext;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
++import sun.misc.SharedSecrets;
+
+ final class VersionHelper12 extends VersionHelper {
+
+@@ -82,12 +83,16 @@
+ }
+
+ Thread createThread(final Runnable r) {
+- return (Thread) AccessController.doPrivileged(
+- new PrivilegedAction() {
+- public Object run() {
+- return new Thread(r);
++ final AccessControlContext acc = AccessController.getContext();
++ // 4290486: doPrivileged is needed to create a thread in
++ // an environment that restricts "modifyThreadGroup".
++ return AccessController.doPrivileged(
++ new PrivilegedAction<Thread>() {
++ public Thread run() {
++ return SharedSecrets.getJavaLangAccess()
++ .newThreadWithAcc(r, acc);
++ }
+ }
+- }
+ );
+ }
+ }
+--- ./jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Tue Oct 08 09:07:05 2013 -0700
+@@ -66,6 +66,11 @@
+ * cannot be created, opened, or written to.
+ * @throws UnsupportedOperationException if this operation is not supported.
+ * @throws NullPointerException if <tt>outputFile</tt> is <tt>null</tt>.
++ * @throws SecurityException
++ * If a security manager exists and its {@link
++ * java.lang.SecurityManager#checkWrite(java.lang.String)}
++ * method denies write access to the named file
++ * or the caller does not have ManagmentPermission("control").
+ */
+ public void dumpHeap(String outputFile, boolean live) throws java.io.IOException;
+
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java Tue Oct 08 09:07:05 2013 -0700
+@@ -44,6 +44,9 @@
+ }
+
+ public void write(byte[] arg0) {
++ if ((Integer.MAX_VALUE - pos) < arg0.length) {
++ throw new OutOfMemoryError();
++ }
+ int newPos = pos + arg0.length;
+ if (newPos > size) {
+ expandSize(newPos);
+@@ -53,6 +56,9 @@
+ }
+
+ public void write(byte[] arg0, int arg1, int arg2) {
++ if ((Integer.MAX_VALUE - pos) < arg2) {
++ throw new OutOfMemoryError();
++ }
+ int newPos = pos + arg2;
+ if (newPos > size) {
+ expandSize(newPos);
+@@ -62,6 +68,9 @@
+ }
+
+ public void write(int arg0) {
++ if ((Integer.MAX_VALUE - pos) == 0) {
++ throw new OutOfMemoryError();
++ }
+ int newPos = pos + 1;
+ if (newPos > size) {
+ expandSize(newPos);
+@@ -82,7 +91,11 @@
+ private void expandSize(int newPos) {
+ int newSize = size;
+ while (newPos > newSize) {
+- newSize = newSize<<2;
++ newSize = newSize << 1;
++ // Deal with overflow
++ if (newSize < 0) {
++ newSize = Integer.MAX_VALUE;
++ }
+ }
+ byte newBuf[] = new byte[newSize];
+ System.arraycopy(buf, 0, newBuf, 0, pos);
+--- ./jdk/src/share/classes/com/sun/script/util/InterfaceImplementor.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/script/util/InterfaceImplementor.java Tue Oct 08 09:07:05 2013 -0700
+@@ -28,6 +28,7 @@
+ import javax.script.*;
+ import java.lang.reflect.*;
+ import java.security.*;
++import sun.reflect.misc.ReflectUtil;
+
+ /*
+ * java.lang.reflect.Proxy based interface implementor. This is meant
+@@ -85,8 +86,18 @@
+ if (! isImplemented(thiz, iface)) {
+ return null;
+ }
++
++ if (System.getSecurityManager() != null &&
++ !Modifier.isPublic(iface.getModifiers())) {
++ throw new SecurityException("attempt to implement non-public interface");
++ }
++
++ // make sure restricted package interfaces are not attempted.
++ ReflectUtil.checkPackageAccess(iface.getName());
++
+ AccessControlContext accCtxt = AccessController.getContext();
+- return iface.cast(Proxy.newProxyInstance(iface.getClassLoader(),
++ return iface.cast(Proxy.newProxyInstance(
++ getLoaderForProxy(iface),
+ new Class[]{iface},
+ new InterfaceImplementorInvocationHandler(thiz, accCtxt)));
+ }
+@@ -108,4 +119,20 @@
+ // default is identity conversion
+ return args;
+ }
++
++ // get appropriate ClassLoader for generated Proxy class
++ private static ClassLoader getLoaderForProxy(Class<?> iface) {
++ ClassLoader loader = iface.getClassLoader();
++
++ // if bootstrap class, try TCCL
++ if (loader == null) {
++ loader = Thread.currentThread().getContextClassLoader();
++ }
++
++ // if TCCL is also null, try System class loader
++ if (loader == null) {
++ loader = ClassLoader.getSystemClassLoader();
++ }
++ return loader;
++ }
+ }
+--- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java Tue Oct 08 09:07:05 2013 -0700
+@@ -84,7 +84,7 @@
+ lastPackage = pkg;
+ printClass(clazz);
+ if (clazz.getId() != -1) {
+- out.print(" [" + clazz.getIdString() + "]");
++ print(" [" + clazz.getIdString() + "]");
+ }
+ out.println("<br>");
+ }
+--- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java Tue Oct 08 09:07:05 2013 -0700
+@@ -112,12 +112,12 @@
+ out.println("<h2>Instances</h2>");
+
+ printAnchorStart();
+- out.print("instances/" + encodeForURL(clazz));
++ print("instances/" + encodeForURL(clazz));
+ out.print("\">");
+ out.println("Exclude subclasses</a><br>");
+
+ printAnchorStart();
+- out.print("allInstances/" + encodeForURL(clazz));
++ print("allInstances/" + encodeForURL(clazz));
+ out.print("\">");
+ out.println("Include subclasses</a><br>");
+
+@@ -126,19 +126,19 @@
+ out.println("<h2>New Instances</h2>");
+
+ printAnchorStart();
+- out.print("newInstances/" + encodeForURL(clazz));
++ print("newInstances/" + encodeForURL(clazz));
+ out.print("\">");
+ out.println("Exclude subclasses</a><br>");
+
+ printAnchorStart();
+- out.print("allNewInstances/" + encodeForURL(clazz));
++ print("allNewInstances/" + encodeForURL(clazz));
+ out.print("\">");
+ out.println("Include subclasses</a><br>");
+ }
+
+ out.println("<h2>References summary by Type</h2>");
+ printAnchorStart();
+- out.print("refsByType/" + encodeForURL(clazz));
++ print("refsByType/" + encodeForURL(clazz));
+ out.print("\">");
+ out.println("References summary by type</a>");
+
+--- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java Tue Oct 08 09:07:05 2013 -0700
+@@ -41,21 +41,17 @@
+
+
+ import java.net.Socket;
+-import java.net.ServerSocket;
+-import java.net.InetAddress;
+
+ import java.io.InputStream;
+ import java.io.BufferedInputStream;
+ import java.io.IOException;
+-import java.io.Writer;
+ import java.io.BufferedWriter;
+ import java.io.PrintWriter;
+-import java.io.OutputStream;
+ import java.io.OutputStreamWriter;
+-import java.io.BufferedOutputStream;
+
+ import com.sun.tools.hat.internal.model.Snapshot;
+ import com.sun.tools.hat.internal.oql.OQLEngine;
++import com.sun.tools.hat.internal.util.Misc;
+
+ public class HttpReader implements Runnable {
+
+@@ -87,7 +83,7 @@
+ outputError("Protocol error");
+ }
+ int data;
+- StringBuffer queryBuf = new StringBuffer();
++ StringBuilder queryBuf = new StringBuilder();
+ while ((data = in.read()) != -1 && data != ' ') {
+ char ch = (char) data;
+ queryBuf.append(ch);
+@@ -217,7 +213,7 @@
+ private void outputError(String msg) {
+ out.println();
+ out.println("<html><body bgcolor=\"#ffffff\">");
+- out.println(msg);
++ out.println(Misc.encodeHtml(msg));
+ out.println("</body></html>");
+ }
+
+--- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java Tue Oct 08 09:07:05 2013 -0700
+@@ -102,7 +102,7 @@
+ int count = clazz.getInstancesCount(false);
+ print("" + count);
+ printAnchorStart();
+- out.print("instances/" + encodeForURL(classes[i]));
++ print("instances/" + encodeForURL(classes[i]));
+ out.print("\"> ");
+ if (count == 1) {
+ print("instance");
+@@ -121,7 +121,7 @@
+ }
+ print("(");
+ printAnchorStart();
+- out.print("newInstances/" + encodeForURL(classes[i]));
++ print("newInstances/" + encodeForURL(classes[i]));
+ out.print("\">");
+ print("" + newInst + " new");
+ out.print("</a>) ");
+--- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java Tue Oct 08 09:07:05 2013 -0700
+@@ -54,10 +54,7 @@
+ out.print((char)ch);
+ }
+ } catch (Exception exp) {
+- out.println(exp.getMessage());
+- out.println("<pre>");
+- exp.printStackTrace(out);
+- out.println("</pre>");
++ printException(exp);
+ }
+ }
+ }
+--- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java Tue Oct 08 09:07:05 2013 -0700
+@@ -32,10 +32,7 @@
+
+ package com.sun.tools.hat.internal.server;
+
+-import com.sun.tools.hat.internal.model.*;
+ import com.sun.tools.hat.internal.oql.*;
+-import com.sun.tools.hat.internal.util.ArraySorter;
+-import com.sun.tools.hat.internal.util.Comparer;
+
+ /**
+ * This handles Object Query Language (OQL) queries.
+@@ -68,7 +65,7 @@
+ out.println("<p align='center'>");
+ out.println("<textarea name='query' cols=80 rows=10>");
+ if (oql != null) {
+- out.println(oql);
++ println(oql);
+ }
+ out.println("</textarea>");
+ out.println("</p>");
+@@ -91,10 +88,7 @@
+ try {
+ out.println(engine.toHtml(o));
+ } catch (Exception e) {
+- out.println(e.getMessage());
+- out.println("<pre>");
+- e.printStackTrace(out);
+- out.println("</pre>");
++ printException(e);
+ }
+ out.println("</td></tr>");
+ return false;
+@@ -102,10 +96,7 @@
+ });
+ out.println("</table>");
+ } catch (OQLException exp) {
+- out.println(exp.getMessage());
+- out.println("<pre>");
+- exp.printStackTrace(out);
+- out.println("</pre>");
++ printException(exp);
+ }
+ }
+
+--- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java Tue Oct 08 09:07:05 2013 -0700
+@@ -36,6 +36,7 @@
+
+ import com.sun.tools.hat.internal.model.*;
+ import com.sun.tools.hat.internal.util.Misc;
++import java.io.StringWriter;
+
+ import java.net.URLEncoder;
+ import java.io.UnsupportedEncodingException;
+@@ -96,7 +97,7 @@
+ }
+
+ protected void error(String msg) {
+- out.println(msg);
++ println(msg);
+ }
+
+ protected void printAnchorStart() {
+@@ -160,7 +161,6 @@
+ out.println("null");
+ return;
+ }
+- String name = clazz.getName();
+ printAnchorStart();
+ out.print("class/");
+ print(encodeForURL(clazz));
+@@ -208,6 +208,15 @@
+ }
+ }
+
++ protected void printException(Throwable t) {
++ println(t.getMessage());
++ out.println("<pre>");
++ StringWriter sw = new StringWriter();
++ t.printStackTrace(new PrintWriter(sw));
++ print(sw.toString());
++ out.println("</pre>");
++ }
++
+ protected void printHex(long addr) {
+ if (snapshot.getIdentifierSize() == 4) {
+ out.print(Misc.toHex((int)addr));
+@@ -223,4 +232,8 @@
+ protected void print(String str) {
+ out.print(Misc.encodeHtml(str));
+ }
++
++ protected void println(String str) {
++ out.println(Misc.encodeHtml(str));
++ }
+ }
+--- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java Tue Oct 08 09:07:05 2013 -0700
+@@ -89,7 +89,7 @@
+ out.println("<p align='center'>");
+ printClass(clazz);
+ if (clazz.getId() != -1) {
+- out.println("[" + clazz.getIdString() + "]");
++ println("[" + clazz.getIdString() + "]");
+ }
+ out.println("</p>");
+
+@@ -125,9 +125,9 @@
+ JavaClass clazz = classes[i];
+ out.println("<tr><td>");
+ out.print("<a href='/refsByType/");
+- out.print(clazz.getIdString());
++ print(clazz.getIdString());
+ out.print("'>");
+- out.print(clazz.getName());
++ print(clazz.getName());
+ out.println("</a>");
+ out.println("</td><td>");
+ out.println(map.get(clazz));
+--- ./jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java Tue Oct 08 09:07:05 2013 -0700
+@@ -25,12 +25,14 @@
+
+ package java.awt.datatransfer;
+
+-import java.awt.Toolkit;
+ import java.io.*;
+ import java.nio.*;
+ import java.util.*;
+
+ import sun.awt.datatransfer.DataTransferer;
++import sun.reflect.misc.ReflectUtil;
++
++import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION;
+
+ /**
+ * A {@code DataFlavor} provides meta information about data. {@code DataFlavor}
+@@ -117,27 +119,33 @@
+ ClassLoader fallback)
+ throws ClassNotFoundException
+ {
+- ClassLoader systemClassLoader = (ClassLoader)
+- java.security.AccessController.doPrivileged(
+- new java.security.PrivilegedAction() {
+- public Object run() {
+- ClassLoader cl = Thread.currentThread().
+- getContextClassLoader();
+- return (cl != null)
+- ? cl
+- : ClassLoader.getSystemClassLoader();
++ ReflectUtil.checkPackageAccess(className);
++ try {
++ SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ sm.checkPermission(GET_CLASSLOADER_PERMISSION);
++ }
++ ClassLoader loader = ClassLoader.getSystemClassLoader();
++ try {
++ // bootstrap class loader and system class loader if present
++ return Class.forName(className, true, loader);
++ }
++ catch (ClassNotFoundException exception) {
++ // thread context class loader if and only if present
++ loader = Thread.currentThread().getContextClassLoader();
++ if (loader != null) {
++ try {
++ return Class.forName(className, true, loader);
+ }
+- });
+-
+- try {
+- return Class.forName(className, true, systemClassLoader);
+- } catch (ClassNotFoundException e2) {
+- if (fallback != null) {
+- return Class.forName(className, true, fallback);
+- } else {
+- throw new ClassNotFoundException(className);
++ catch (ClassNotFoundException e) {
++ // fallback to user's class loader
++ }
++ }
+ }
++ } catch (SecurityException exception) {
++ // ignore secured class loaders
+ }
++ return Class.forName(className, true, fallback);
+ }
+
+ /*
+--- ./jdk/src/share/classes/java/beans/Beans.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/beans/Beans.java Tue Oct 08 09:07:05 2013 -0700
+@@ -42,6 +42,8 @@
+ import java.io.ObjectStreamClass;
+ import java.io.StreamCorruptedException;
+
++import java.lang.reflect.Modifier;
++
+ import java.net.URL;
+
+ import java.security.AccessController;
+@@ -222,6 +224,10 @@
+ throw ex;
+ }
+
++ if (!Modifier.isPublic(cl.getModifiers())) {
++ throw new ClassNotFoundException("" + cl + " : no public access");
++ }
++
+ /*
+ * Try to instantiate the class.
+ */
+--- ./jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java Tue Oct 08 09:07:05 2013 -0700
+@@ -220,6 +220,9 @@
+ // Write out the properties of this instance.
+ private void initBean(Class type, Object oldInstance, Object newInstance, Encoder out) {
+ for (Field field : type.getFields()) {
++ if (!ReflectUtil.isPackageAccessible(field.getDeclaringClass())) {
++ continue;
++ }
+ int mod = field.getModifiers();
+ if (Modifier.isFinal(mod) || Modifier.isStatic(mod) || Modifier.isTransient(mod)) {
+ continue;
+--- ./jdk/src/share/classes/java/beans/MetaData.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/beans/MetaData.java Tue Oct 08 09:07:05 2013 -0700
+@@ -42,6 +42,7 @@
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.Field;
+ import java.lang.reflect.Method;
++import java.lang.reflect.Modifier;
+ import java.lang.reflect.InvocationTargetException;
+
+ import java.security.AccessController;
+@@ -56,7 +57,7 @@
+
+ import sun.swing.PrintColorUIResource;
+
+-import java.util.Objects;
++import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
+
+ /*
+ * Like the <code>Intropector</code>, the <code>MetaData</code> class
+@@ -850,13 +851,15 @@
+
+ static class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
+ protected void installFields(Encoder out, Class<?> cls) {
+- Field fields[] = cls.getFields();
+- for(int i = 0; i < fields.length; i++) {
+- Field field = fields[i];
+- // Don't install primitives, their identity will not be preserved
+- // by wrapping.
+- if (Object.class.isAssignableFrom(field.getType())) {
+- out.writeExpression(new Expression(field, "get", new Object[]{null}));
++ if (Modifier.isPublic(cls.getModifiers()) && isPackageAccessible(cls)) {
++ Field fields[] = cls.getFields();
++ for(int i = 0; i < fields.length; i++) {
++ Field field = fields[i];
++ // Don't install primitives, their identity will not be preserved
++ // by wrapping.
++ if (Object.class.isAssignableFrom(field.getType())) {
++ out.writeExpression(new Expression(field, "get", new Object[]{null}));
++ }
+ }
+ }
+ }
+--- ./jdk/src/share/classes/java/io/File.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/io/File.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1885,10 +1885,18 @@
+ } else {
+ n = Math.abs(n);
+ }
++
++ // Use only the file name from the supplied prefix
++ prefix = (new File(prefix)).getName();
++
+ String name = prefix + Long.toString(n) + suffix;
+ File f = new File(dir, name);
+- if (!name.equals(f.getName()))
+- throw new IOException("Unable to create temporary file");
++ if (!name.equals(f.getName())) {
++ if (System.getSecurityManager() != null)
++ throw new IOException("Unable to create temporary file");
++ else
++ throw new IOException("Unable to create temporary file, " + f);
++ }
+ return f;
+ }
+ }
+--- ./jdk/src/share/classes/java/io/ObjectInputStream.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/io/ObjectInputStream.java Tue Oct 08 09:07:05 2013 -0700
+@@ -490,11 +490,12 @@
+ public void defaultReadObject()
+ throws IOException, ClassNotFoundException
+ {
+- if (curContext == null) {
++ SerialCallbackContext ctx = curContext;
++ if (ctx == null) {
+ throw new NotActiveException("not in call to readObject");
+ }
+- Object curObj = curContext.getObj();
+- ObjectStreamClass curDesc = curContext.getDesc();
++ Object curObj = ctx.getObj();
++ ObjectStreamClass curDesc = ctx.getDesc();
+ bin.setBlockDataMode(false);
+ defaultReadFields(curObj, curDesc);
+ bin.setBlockDataMode(true);
+@@ -528,11 +529,12 @@
+ public ObjectInputStream.GetField readFields()
+ throws IOException, ClassNotFoundException
+ {
+- if (curContext == null) {
++ SerialCallbackContext ctx = curContext;
++ if (ctx == null) {
+ throw new NotActiveException("not in call to readObject");
+ }
+- Object curObj = curContext.getObj();
+- ObjectStreamClass curDesc = curContext.getDesc();
++ Object curObj = ctx.getObj();
++ ObjectStreamClass curDesc = ctx.getDesc();
+ bin.setBlockDataMode(false);
+ GetFieldImpl getField = new GetFieldImpl(curDesc);
+ getField.readFields();
+@@ -1965,7 +1967,6 @@
+ private void defaultReadFields(Object obj, ObjectStreamClass desc)
+ throws IOException
+ {
+- // REMIND: is isInstance check necessary?
+ Class cl = desc.forClass();
+ if (cl != null && obj != null && !cl.isInstance(obj)) {
+ throw new ClassCastException();
+--- ./jdk/src/share/classes/java/io/ObjectOutputStream.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/io/ObjectOutputStream.java Tue Oct 08 09:07:05 2013 -0700
+@@ -430,11 +430,12 @@
+ * <code>OutputStream</code>
+ */
+ public void defaultWriteObject() throws IOException {
+- if ( curContext == null ) {
++ SerialCallbackContext ctx = curContext;
++ if (ctx == null) {
+ throw new NotActiveException("not in call to writeObject");
+ }
+- Object curObj = curContext.getObj();
+- ObjectStreamClass curDesc = curContext.getDesc();
++ Object curObj = ctx.getObj();
++ ObjectStreamClass curDesc = ctx.getDesc();
+ bout.setBlockDataMode(false);
+ defaultWriteFields(curObj, curDesc);
+ bout.setBlockDataMode(true);
+@@ -452,11 +453,12 @@
+ */
+ public ObjectOutputStream.PutField putFields() throws IOException {
+ if (curPut == null) {
+- if (curContext == null) {
++ SerialCallbackContext ctx = curContext;
++ if (ctx == null) {
+ throw new NotActiveException("not in call to writeObject");
+ }
+- Object curObj = curContext.getObj();
+- ObjectStreamClass curDesc = curContext.getDesc();
++ Object curObj = ctx.getObj();
++ ObjectStreamClass curDesc = ctx.getDesc();
+ curPut = new PutFieldImpl(curDesc);
+ }
+ return curPut;
+@@ -1516,7 +1518,11 @@
+ private void defaultWriteFields(Object obj, ObjectStreamClass desc)
+ throws IOException
+ {
+- // REMIND: perform conservative isInstance check here?
++ Class<?> cl = desc.forClass();
++ if (cl != null && obj != null && !cl.isInstance(obj)) {
++ throw new ClassCastException();
++ }
++
+ desc.checkDefaultSerialize();
+
+ int primDataSize = desc.getPrimDataSize();
+--- ./jdk/src/share/classes/java/lang/Class.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/lang/Class.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1096,7 +1096,17 @@
+ * @return the declaring class for this class
+ * @since JDK1.1
+ */
+- public native Class<?> getDeclaringClass();
++ @CallerSensitive
++ public Class<?> getDeclaringClass() {
++ final Class<?> candidate = getDeclaringClass0();
++
++ if (candidate != null)
++ candidate.checkPackageAccess(
++ ClassLoader.getClassLoader(Reflection.getCallerClass()), true);
++ return candidate;
++ }
++
++ private native Class<?> getDeclaringClass0();
+
+
+ /**
+--- ./jdk/src/share/classes/java/lang/ClassLoader.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/lang/ClassLoader.java Tue Oct 08 09:07:05 2013 -0700
+@@ -58,6 +58,7 @@
+ import sun.misc.VM;
+ import sun.reflect.CallerSensitive;
+ import sun.reflect.Reflection;
++import sun.reflect.misc.ReflectUtil;
+ import sun.security.util.SecurityConstants;
+
+ /**
+@@ -487,6 +488,13 @@
+ private void checkPackageAccess(Class cls, ProtectionDomain pd) {
+ final SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
++ if (ReflectUtil.isNonPublicProxyClass(cls)) {
++ for (Class intf: cls.getInterfaces()) {
++ checkPackageAccess(intf, pd);
++ }
++ return;
++ }
++
+ final String name = cls.getName();
+ final int i = name.lastIndexOf('.');
+ if (i != -1) {
+--- ./jdk/src/share/classes/java/lang/System.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/lang/System.java Tue Oct 08 09:07:05 2013 -0700
+@@ -25,6 +25,7 @@
+ package java.lang;
+
+ import java.io.*;
++import java.security.AccessControlContext;
+ import java.util.Properties;
+ import java.util.PropertyPermission;
+ import java.util.StringTokenizer;
+@@ -1202,6 +1203,9 @@
+ public int getStringHash32(String string) {
+ return string.hash32();
+ }
++ public Thread newThreadWithAcc(Runnable target, AccessControlContext acc) {
++ return new Thread(target, acc);
++ }
+ });
+ }
+ }
+--- ./jdk/src/share/classes/java/lang/Thread.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/lang/Thread.java Tue Oct 08 09:07:05 2013 -0700
+@@ -341,6 +341,15 @@
+ }
+
+ /**
++ * Initializes a Thread with the current AccessControlContext.
++ * @see #init(ThreadGroup,Runnable,String,long,AccessControlContext)
++ */
++ private void init(ThreadGroup g, Runnable target, String name,
++ long stackSize) {
++ init(g, target, name, stackSize, null);
++ }
++
++ /**
+ * Initializes a Thread.
+ *
+ * @param g the Thread group
+@@ -348,9 +357,11 @@
+ * @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.
++ * @param acc the AccessControlContext to inherit, or
++ * AccessController.getContext() if null
+ */
+ private void init(ThreadGroup g, Runnable target, String name,
+- long stackSize) {
++ long stackSize, AccessControlContext acc) {
+ if (name == null) {
+ throw new NullPointerException("name cannot be null");
+ }
+@@ -396,7 +407,8 @@
+ this.contextClassLoader = parent.getContextClassLoader();
+ else
+ this.contextClassLoader = parent.contextClassLoader;
+- this.inheritedAccessControlContext = AccessController.getContext();
++ this.inheritedAccessControlContext =
++ acc != null ? acc : AccessController.getContext();
+ this.target = target;
+ setPriority(priority);
+ if (parent.inheritableThreadLocals != null)
+@@ -449,6 +461,14 @@
+ }
+
+ /**
++ * Creates a new Thread that inherits the given AccessControlContext.
++ * This is not a public constructor.
++ */
++ Thread(Runnable target, AccessControlContext acc) {
++ init(null, target, "Thread-" + nextThreadNum(), 0, acc);
++ }
++
++ /**
+ * 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/MethodHandleNatives.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java Tue Oct 08 09:07:05 2013 -0700
+@@ -456,6 +456,7 @@
+ case "getDeclaredField":
+ case "getDeclaredMethod":
+ case "getDeclaredConstructor":
++ case "getDeclaringClass":
+ case "getEnclosingClass":
+ case "getEnclosingMethod":
+ case "getEnclosingConstructor":
+@@ -491,6 +492,7 @@
+ return defc == java.lang.ClassLoader.class;
+ case "registerAsParallelCapable":
+ return defc == java.lang.ClassLoader.class;
++ case "getInvocationHandler":
+ case "getProxyClass":
+ case "newProxyInstance":
+ return defc == java.lang.reflect.Proxy.class;
+--- ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java Tue Oct 08 09:07:05 2013 -0700
+@@ -426,7 +426,7 @@
+
+ Lookup(Class<?> lookupClass) {
+ this(lookupClass, ALL_MODES);
+- checkUnprivilegedlookupClass(lookupClass);
++ checkUnprivilegedlookupClass(lookupClass, ALL_MODES);
+ }
+
+ private Lookup(Class<?> lookupClass, int allowedModes) {
+@@ -480,7 +480,7 @@
+ // No permissions.
+ newModes = 0;
+ }
+- checkUnprivilegedlookupClass(requestedLookupClass);
++ checkUnprivilegedlookupClass(requestedLookupClass, newModes);
+ return new Lookup(requestedLookupClass, newModes);
+ }
+
+@@ -496,10 +496,19 @@
+ /** Package-private version of lookup which is trusted. */
+ static final Lookup IMPL_LOOKUP = new Lookup(Object.class, TRUSTED);
+
+- private static void checkUnprivilegedlookupClass(Class<?> lookupClass) {
++ private static void checkUnprivilegedlookupClass(Class<?> lookupClass, int allowedModes) {
+ String name = lookupClass.getName();
+ if (name.startsWith("java.lang.invoke."))
+ throw newIllegalArgumentException("illegal lookupClass: "+lookupClass);
++
++ // For caller-sensitive MethodHandles.lookup()
++ // disallow lookup more restricted packages
++ if (allowedModes == ALL_MODES && lookupClass.getClassLoader() == null) {
++ if (name.startsWith("java.") ||
++ (name.startsWith("sun.") && !name.startsWith("sun.invoke."))) {
++ throw newIllegalArgumentException("illegal lookupClass: " + lookupClass);
++ }
++ }
+ }
+
+ /**
+@@ -1316,6 +1325,10 @@
+ : resolveOrFail(refKind, defc, name, (Class<?>) type);
+ return getDirectField(refKind, defc, field);
+ } else if (MethodHandleNatives.refKindIsMethod(refKind)) {
++ if (defc == MethodHandle.class && refKind == REF_invokeVirtual) {
++ MethodHandle mh = findVirtualForMH(name, (MethodType) type);
++ if (mh != null) return mh;
++ }
+ MemberName method = (resolved != null) ? resolved
+ : resolveOrFail(refKind, defc, name, (MethodType) type);
+ return getDirectMethod(refKind, defc, method, lookupClass);
+--- ./jdk/src/share/classes/java/lang/reflect/Proxy.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/lang/reflect/Proxy.java Tue Oct 08 09:07:05 2013 -0700
+@@ -788,6 +788,7 @@
+ * @throws IllegalArgumentException if the argument is not a
+ * proxy instance
+ */
++ @CallerSensitive
+ public static InvocationHandler getInvocationHandler(Object proxy)
+ throws IllegalArgumentException
+ {
+@@ -798,8 +799,19 @@
+ throw new IllegalArgumentException("not a proxy instance");
+ }
+
+- Proxy p = (Proxy) proxy;
+- return p.h;
++ final Proxy p = (Proxy) proxy;
++ final InvocationHandler ih = p.h;
++ if (System.getSecurityManager() != null) {
++ Class<?> ihClass = ih.getClass();
++ Class<?> caller = Reflection.getCallerClass();
++ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(),
++ ihClass.getClassLoader()))
++ {
++ ReflectUtil.checkPackageAccess(ihClass);
++ }
++ }
++
++ return ih;
+ }
+
+ private static native Class defineClass0(ClassLoader loader, String name,
+--- ./jdk/src/share/classes/java/net/Inet6Address.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/net/Inet6Address.java Tue Oct 08 09:07:05 2013 -0700
+@@ -26,6 +26,8 @@
+ package java.net;
+
+ import java.io.ObjectInputStream;
++import java.io.ObjectOutputStream;
++import java.io.ObjectStreamField;
+ import java.io.IOException;
+ import java.io.InvalidObjectException;
+ import java.util.Enumeration;
+@@ -171,36 +173,196 @@
+ */
+ private transient int cached_scope_id = 0;
+
+- /**
+- * Holds a 128-bit (16 bytes) IPv6 address.
+- *
+- * @serial
+- */
+- byte[] ipaddress;
++ private class Inet6AddressHolder {
+
+- /**
+- * scope_id. The scope specified when the object is created. If the object is created
+- * with an interface name, then the scope_id is not determined until the time it is needed.
+- */
+- private int scope_id = 0;
++ private Inet6AddressHolder() {
++ ipaddress = new byte[INADDRSZ];
++ }
+
+- /**
+- * This will be set to true when the scope_id field contains a valid
+- * integer scope_id.
+- */
+- private boolean scope_id_set = false;
++ private Inet6AddressHolder(
++ byte[] ipaddress, int scope_id, boolean scope_id_set,
++ NetworkInterface ifname, boolean scope_ifname_set)
++ {
++ this.ipaddress = ipaddress;
++ this.scope_id = scope_id;
++ this.scope_id_set = scope_id_set;
++ this.scope_ifname_set = scope_ifname_set;
++ this.scope_ifname = ifname;
++ }
+
+- /**
+- * scoped interface. scope_id is derived from this as the scope_id of the first
+- * address whose scope is the same as this address for the named interface.
+- */
+- private transient NetworkInterface scope_ifname = null;
++ /**
++ * Holds a 128-bit (16 bytes) IPv6 address.
++ */
++ byte[] ipaddress;
+
+- /**
+- * set if the object is constructed with a scoped interface instead of a
+- * numeric scope id.
+- */
+- private boolean scope_ifname_set = false;
++ /**
++ * scope_id. The scope specified when the object is created. If the object is created
++ * with an interface name, then the scope_id is not determined until the time it is needed.
++ */
++ int scope_id = 0;
++
++ /**
++ * This will be set to true when the scope_id field contains a valid
++ * integer scope_id.
++ */
++ boolean scope_id_set = false;
++
++ /**
++ * scoped interface. scope_id is derived from this as the scope_id of the first
++ * address whose scope is the same as this address for the named interface.
++ */
++ NetworkInterface scope_ifname = null;
++
++ /**
++ * set if the object is constructed with a scoped interface instead of a
++ * numeric scope id.
++ */
++ boolean scope_ifname_set = false;
++
++ void setAddr(byte addr[]) {
++ if (addr.length == INADDRSZ) { // normal IPv6 address
++ System.arraycopy(addr, 0, ipaddress, 0, INADDRSZ);
++ }
++ }
++
++ void init(byte addr[], int scope_id) {
++ setAddr(addr);
++
++ if (scope_id >= 0) {
++ this.scope_id = scope_id;
++ this.scope_id_set = true;
++ }
++ }
++
++ void init(byte addr[], NetworkInterface nif)
++ throws UnknownHostException
++ {
++ setAddr(addr);
++
++ if (nif != null) {
++ this.scope_id = deriveNumericScope(ipaddress, nif);
++ this.scope_id_set = true;
++ this.scope_ifname = nif;
++ this.scope_ifname_set = true;
++ }
++ }
++
++ String getHostAddress() {
++ String s = numericToTextFormat(ipaddress);
++ if (scope_ifname_set) { /* must check this first */
++ s = s + "%" + scope_ifname.getName();
++ } else if (scope_id_set) {
++ s = s + "%" + scope_id;
++ }
++ return s;
++ }
++
++ public boolean equals(Object o) {
++ if (! (o instanceof Inet6AddressHolder)) {
++ return false;
++ }
++ Inet6AddressHolder that = (Inet6AddressHolder)o;
++
++ for (int i = 0; i < INADDRSZ; i++) {
++ if (this.ipaddress[i] != that.ipaddress[i])
++ return false;
++ }
++
++ return true;
++ }
++
++ public int hashCode() {
++ if (ipaddress != null) {
++
++ int hash = 0;
++ int i=0;
++ while (i<INADDRSZ) {
++ int j=0;
++ int component=0;
++ while (j<4 && i<INADDRSZ) {
++ component = (component << 8) + ipaddress[i];
++ j++;
++ i++;
++ }
++ hash += component;
++ }
++ return hash;
++
++ } else {
++ return 0;
++ }
++ }
++
++ boolean isIPv4CompatibleAddress() {
++ if ((ipaddress[0] == 0x00) && (ipaddress[1] == 0x00) &&
++ (ipaddress[2] == 0x00) && (ipaddress[3] == 0x00) &&
++ (ipaddress[4] == 0x00) && (ipaddress[5] == 0x00) &&
++ (ipaddress[6] == 0x00) && (ipaddress[7] == 0x00) &&
++ (ipaddress[8] == 0x00) && (ipaddress[9] == 0x00) &&
++ (ipaddress[10] == 0x00) && (ipaddress[11] == 0x00)) {
++ return true;
++ }
++ return false;
++ }
++
++ boolean isMulticastAddress() {
++ return ((ipaddress[0] & 0xff) == 0xff);
++ }
++
++ boolean isAnyLocalAddress() {
++ byte test = 0x00;
++ for (int i = 0; i < INADDRSZ; i++) {
++ test |= ipaddress[i];
++ }
++ return (test == 0x00);
++ }
++
++ boolean isLoopbackAddress() {
++ byte test = 0x00;
++ for (int i = 0; i < 15; i++) {
++ test |= ipaddress[i];
++ }
++ return (test == 0x00) && (ipaddress[15] == 0x01);
++ }
++
++ boolean isLinkLocalAddress() {
++ return ((ipaddress[0] & 0xff) == 0xfe
++ && (ipaddress[1] & 0xc0) == 0x80);
++ }
++
++
++ boolean isSiteLocalAddress() {
++ return ((ipaddress[0] & 0xff) == 0xfe
++ && (ipaddress[1] & 0xc0) == 0xc0);
++ }
++
++ boolean isMCGlobal() {
++ return ((ipaddress[0] & 0xff) == 0xff
++ && (ipaddress[1] & 0x0f) == 0x0e);
++ }
++
++ boolean isMCNodeLocal() {
++ return ((ipaddress[0] & 0xff) == 0xff
++ && (ipaddress[1] & 0x0f) == 0x01);
++ }
++
++ boolean isMCLinkLocal() {
++ return ((ipaddress[0] & 0xff) == 0xff
++ && (ipaddress[1] & 0x0f) == 0x02);
++ }
++
++ boolean isMCSiteLocal() {
++ return ((ipaddress[0] & 0xff) == 0xff
++ && (ipaddress[1] & 0x0f) == 0x05);
++ }
++
++ boolean isMCOrgLocal() {
++ return ((ipaddress[0] & 0xff) == 0xff
++ && (ipaddress[1] & 0x0f) == 0x08);
++ }
++ }
++
++ private final transient Inet6AddressHolder holder6;
+
+ private static final long serialVersionUID = 6880410070516793377L;
+
+@@ -213,37 +375,33 @@
+
+ Inet6Address() {
+ super();
+- holder().hostName = null;
+- ipaddress = new byte[INADDRSZ];
+- holder().family = IPv6;
++ holder.init(null, IPv6);
++ holder6 = new Inet6AddressHolder();
+ }
+
+ /* checking of value for scope_id should be done by caller
+ * scope_id must be >= 0, or -1 to indicate not being set
+ */
+ Inet6Address(String hostName, byte addr[], int scope_id) {
+- holder().hostName = hostName;
+- if (addr.length == INADDRSZ) { // normal IPv6 address
+- holder().family = IPv6;
+- ipaddress = addr.clone();
+- }
+- if (scope_id >= 0) {
+- this.scope_id = scope_id;
+- scope_id_set = true;
+- }
++ holder.init(hostName, IPv6);
++ holder6 = new Inet6AddressHolder();
++ holder6.init(addr, scope_id);
+ }
+
+ Inet6Address(String hostName, byte addr[]) {
++ holder6 = new Inet6AddressHolder();
+ try {
+ initif (hostName, addr, null);
+ } catch (UnknownHostException e) {} /* cant happen if ifname is null */
+ }
+
+ Inet6Address (String hostName, byte addr[], NetworkInterface nif) throws UnknownHostException {
++ holder6 = new Inet6AddressHolder();
+ initif (hostName, addr, nif);
+ }
+
+ Inet6Address (String hostName, byte addr[], String ifname) throws UnknownHostException {
++ holder6 = new Inet6AddressHolder();
+ initstr (hostName, addr, ifname);
+ }
+
+@@ -325,17 +483,13 @@
+ }
+
+ private void initif(String hostName, byte addr[],NetworkInterface nif) throws UnknownHostException {
+- holder().hostName = hostName;
++ int family = -1;
++ holder6.init(addr, nif);
++
+ if (addr.length == INADDRSZ) { // normal IPv6 address
+- holder().family = IPv6;
+- ipaddress = addr.clone();
++ family = IPv6;
+ }
+- if (nif != null) {
+- this.scope_ifname = nif;
+- scope_ifname_set = true;
+- scope_id = deriveNumericScope (nif);
+- scope_id_set = true;
+- }
++ holder.init(hostName, family);
+ }
+
+ /* check the two Ipv6 addresses and return false if they are both
+@@ -343,18 +497,21 @@
+ * (ie. one is sitelocal and the other linklocal)
+ * return true otherwise.
+ */
+- private boolean differentLocalAddressTypes(Inet6Address other) {
++ private static boolean differentLocalAddressTypes(
++ byte[] thisAddr, byte[] otherAddr) {
+
+- if (isLinkLocalAddress() && !other.isLinkLocalAddress()) {
++ if (Inet6Address.isLinkLocalAddress(thisAddr) &&
++ !Inet6Address.isLinkLocalAddress(otherAddr)) {
+ return false;
+ }
+- if (isSiteLocalAddress() && !other.isSiteLocalAddress()) {
++ if (Inet6Address.isSiteLocalAddress(thisAddr) &&
++ !Inet6Address.isSiteLocalAddress(otherAddr)) {
+ return false;
+ }
+ return true;
+ }
+
+- private int deriveNumericScope (NetworkInterface ifc) throws UnknownHostException {
++ private static int deriveNumericScope (byte[] thisAddr, NetworkInterface ifc) throws UnknownHostException {
+ Enumeration<InetAddress> addresses = ifc.getInetAddresses();
+ while (addresses.hasMoreElements()) {
+ InetAddress addr = addresses.nextElement();
+@@ -363,12 +520,12 @@
+ }
+ Inet6Address ia6_addr = (Inet6Address)addr;
+ /* check if site or link local prefixes match */
+- if (!differentLocalAddressTypes(ia6_addr)){
++ if (!differentLocalAddressTypes(thisAddr, ia6_addr.getAddress())){
+ /* type not the same, so carry on searching */
+ continue;
+ }
+ /* found a matching address - return its scope_id */
+- return ia6_addr.scope_id;
++ return ia6_addr.getScopeId();
+ }
+ throw new UnknownHostException ("no scope_id found");
+ }
+@@ -383,41 +540,61 @@
+ while (en.hasMoreElements()) {
+ NetworkInterface ifc = en.nextElement();
+ if (ifc.getName().equals (ifname)) {
+- Enumeration addresses = ifc.getInetAddresses();
+- while (addresses.hasMoreElements()) {
+- InetAddress addr = (InetAddress)addresses.nextElement();
+- if (!(addr instanceof Inet6Address)) {
+- continue;
+- }
+- Inet6Address ia6_addr = (Inet6Address)addr;
+- /* check if site or link local prefixes match */
+- if (!differentLocalAddressTypes(ia6_addr)){
+- /* type not the same, so carry on searching */
+- continue;
+- }
+- /* found a matching address - return its scope_id */
+- return ia6_addr.scope_id;
+- }
++ return deriveNumericScope(holder6.ipaddress, ifc);
+ }
+ }
+ throw new UnknownHostException ("No matching address found for interface : " +ifname);
+ }
+
+ /**
++ * @serialField ipaddress byte[]
++ * @serialField scope_id int
++ * @serialField scope_id_set boolean
++ * @serialField scope_ifname_set boolean
++ * @serialField ifname String
++ */
++
++ private static final ObjectStreamField[] serialPersistentFields = {
++ new ObjectStreamField("ipaddress", byte[].class),
++ new ObjectStreamField("scope_id", int.class),
++ new ObjectStreamField("scope_id_set", boolean.class),
++ new ObjectStreamField("scope_ifname_set", boolean.class),
++ new ObjectStreamField("ifname", String.class)
++ };
++
++ private static final long FIELDS_OFFSET;
++ private static final sun.misc.Unsafe UNSAFE;
++
++ static {
++ try {
++ sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
++ FIELDS_OFFSET = unsafe.objectFieldOffset(
++ Inet6Address.class.getDeclaredField("holder6"));
++ UNSAFE = unsafe;
++ } catch (ReflectiveOperationException e) {
++ throw new Error(e);
++ }
++ }
++
++ /**
+ * restore the state of this object from stream
+ * including the scope information, only if the
+ * scoped interface name is valid on this system
+ */
+ private void readObject(ObjectInputStream s)
+ throws IOException, ClassNotFoundException {
+- scope_ifname = null;
+- scope_ifname_set = false;
++ NetworkInterface scope_ifname = null;
+
+ if (getClass().getClassLoader() != null) {
+ throw new SecurityException ("invalid address type");
+ }
+
+- s.defaultReadObject();
++ ObjectInputStream.GetField gf = s.readFields();
++ byte[] ipaddress = (byte[])gf.get("ipaddress", null);
++ int scope_id = (int)gf.get("scope_id", -1);
++ boolean scope_id_set = (boolean)gf.get("scope_id_set", false);
++ boolean scope_ifname_set = (boolean)gf.get("scope_ifname_set", false);
++ String ifname = (String)gf.get("ifname", null);
+
+ if (ifname != null && !"".equals (ifname)) {
+ try {
+@@ -430,7 +607,7 @@
+ scope_id = 0;
+ } else {
+ try {
+- scope_id = deriveNumericScope (scope_ifname);
++ scope_id = deriveNumericScope (ipaddress, scope_ifname);
+ } catch (UnknownHostException e) {
+ // typically should not happen, but it may be that
+ // the machine being used for deserialization has
+@@ -438,8 +615,8 @@
+ }
+ }
+ } catch (SocketException e) {}
++ }
+
+- }
+ /* if ifname was not supplied, then the numeric info is used */
+
+ ipaddress = ipaddress.clone();
+@@ -450,9 +627,37 @@
+ ipaddress.length);
+ }
+
+- if (holder().getFamily() != IPv6) {
++ if (holder.getFamily() != IPv6) {
+ throw new InvalidObjectException("invalid address family type");
+ }
++
++ Inet6AddressHolder h = new Inet6AddressHolder(
++ ipaddress, scope_id, scope_id_set, scope_ifname, scope_ifname_set
++ );
++
++ UNSAFE.putObject(this, FIELDS_OFFSET, h);
++ }
++
++ /**
++ * default behavior is overridden in order to write the
++ * scope_ifname field as a String, rather than a NetworkInterface
++ * which is not serializable
++ */
++ private synchronized void writeObject(ObjectOutputStream s)
++ throws IOException
++ {
++ String ifname = null;
++
++ if (holder6.scope_ifname_set) {
++ ifname = holder6.scope_ifname.getName();
++ }
++ ObjectOutputStream.PutField pfields = s.putFields();
++ pfields.put("ipaddress", holder6.ipaddress);
++ pfields.put("scope_id", holder6.scope_id);
++ pfields.put("scope_id_set", holder6.scope_id_set);
++ pfields.put("scope_ifname_set", holder6.scope_ifname_set);
++ pfields.put("ifname", ifname);
++ s.writeFields();
+ }
+
+ /**
+@@ -466,7 +671,7 @@
+ */
+ @Override
+ public boolean isMulticastAddress() {
+- return ((ipaddress[0] & 0xff) == 0xff);
++ return holder6.isMulticastAddress();
+ }
+
+ /**
+@@ -477,11 +682,7 @@
+ */
+ @Override
+ public boolean isAnyLocalAddress() {
+- byte test = 0x00;
+- for (int i = 0; i < INADDRSZ; i++) {
+- test |= ipaddress[i];
+- }
+- return (test == 0x00);
++ return holder6.isAnyLocalAddress();
+ }
+
+ /**
+@@ -493,11 +694,7 @@
+ */
+ @Override
+ public boolean isLoopbackAddress() {
+- byte test = 0x00;
+- for (int i = 0; i < 15; i++) {
+- test |= ipaddress[i];
+- }
+- return (test == 0x00) && (ipaddress[15] == 0x01);
++ return holder6.isLoopbackAddress();
+ }
+
+ /**
+@@ -509,6 +706,11 @@
+ */
+ @Override
+ public boolean isLinkLocalAddress() {
++ return holder6.isLinkLocalAddress();
++ }
++
++ /* static version of above */
++ static boolean isLinkLocalAddress(byte[] ipaddress) {
+ return ((ipaddress[0] & 0xff) == 0xfe
+ && (ipaddress[1] & 0xc0) == 0x80);
+ }
+@@ -522,6 +724,11 @@
+ */
+ @Override
+ public boolean isSiteLocalAddress() {
++ return holder6.isSiteLocalAddress();
++ }
++
++ /* static version of above */
++ static boolean isSiteLocalAddress(byte[] ipaddress) {
+ return ((ipaddress[0] & 0xff) == 0xfe
+ && (ipaddress[1] & 0xc0) == 0xc0);
+ }
+@@ -536,8 +743,7 @@
+ */
+ @Override
+ public boolean isMCGlobal() {
+- return ((ipaddress[0] & 0xff) == 0xff
+- && (ipaddress[1] & 0x0f) == 0x0e);
++ return holder6.isMCGlobal();
+ }
+
+ /**
+@@ -550,8 +756,7 @@
+ */
+ @Override
+ public boolean isMCNodeLocal() {
+- return ((ipaddress[0] & 0xff) == 0xff
+- && (ipaddress[1] & 0x0f) == 0x01);
++ return holder6.isMCNodeLocal();
+ }
+
+ /**
+@@ -564,8 +769,7 @@
+ */
+ @Override
+ public boolean isMCLinkLocal() {
+- return ((ipaddress[0] & 0xff) == 0xff
+- && (ipaddress[1] & 0x0f) == 0x02);
++ return holder6.isMCLinkLocal();
+ }
+
+ /**
+@@ -578,8 +782,7 @@
+ */
+ @Override
+ public boolean isMCSiteLocal() {
+- return ((ipaddress[0] & 0xff) == 0xff
+- && (ipaddress[1] & 0x0f) == 0x05);
++ return holder6.isMCSiteLocal();
+ }
+
+ /**
+@@ -593,10 +796,8 @@
+ */
+ @Override
+ public boolean isMCOrgLocal() {
+- return ((ipaddress[0] & 0xff) == 0xff
+- && (ipaddress[1] & 0x0f) == 0x08);
++ return holder6.isMCOrgLocal();
+ }
+-
+ /**
+ * Returns the raw IP address of this <code>InetAddress</code>
+ * object. The result is in network byte order: the highest order
+@@ -606,7 +807,7 @@
+ */
+ @Override
+ public byte[] getAddress() {
+- return ipaddress.clone();
++ return holder6.ipaddress.clone();
+ }
+
+ /**
+@@ -617,7 +818,7 @@
+ * @since 1.5
+ */
+ public int getScopeId () {
+- return scope_id;
++ return holder6.scope_id;
+ }
+
+ /**
+@@ -628,7 +829,7 @@
+ * @since 1.5
+ */
+ public NetworkInterface getScopedInterface () {
+- return scope_ifname;
++ return holder6.scope_ifname;
+ }
+
+ /**
+@@ -641,13 +842,7 @@
+ */
+ @Override
+ public String getHostAddress() {
+- String s = numericToTextFormat(ipaddress);
+- if (scope_ifname_set) { /* must check this first */
+- s = s + "%" + scope_ifname.getName();
+- } else if (scope_id_set) {
+- s = s + "%" + scope_id;
+- }
+- return s;
++ return holder6.getHostAddress();
+ }
+
+ /**
+@@ -657,25 +852,7 @@
+ */
+ @Override
+ public int hashCode() {
+- if (ipaddress != null) {
+-
+- int hash = 0;
+- int i=0;
+- while (i<INADDRSZ) {
+- int j=0;
+- int component=0;
+- while (j<4 && i<INADDRSZ) {
+- component = (component << 8) + ipaddress[i];
+- j++;
+- i++;
+- }
+- hash += component;
+- }
+- return hash;
+-
+- } else {
+- return 0;
+- }
++ return holder6.hashCode();
+ }
+
+ /**
+@@ -702,12 +879,7 @@
+
+ Inet6Address inetAddr = (Inet6Address)obj;
+
+- for (int i = 0; i < INADDRSZ; i++) {
+- if (ipaddress[i] != inetAddr.ipaddress[i])
+- return false;
+- }
+-
+- return true;
++ return holder6.equals(inetAddr.holder6);
+ }
+
+ /**
+@@ -719,15 +891,7 @@
+ * @since 1.4
+ */
+ public boolean isIPv4CompatibleAddress() {
+- if ((ipaddress[0] == 0x00) && (ipaddress[1] == 0x00) &&
+- (ipaddress[2] == 0x00) && (ipaddress[3] == 0x00) &&
+- (ipaddress[4] == 0x00) && (ipaddress[5] == 0x00) &&
+- (ipaddress[6] == 0x00) && (ipaddress[7] == 0x00) &&
+- (ipaddress[8] == 0x00) && (ipaddress[9] == 0x00) &&
+- (ipaddress[10] == 0x00) && (ipaddress[11] == 0x00)) {
+- return true;
+- }
+- return false;
++ return holder6.isIPv4CompatibleAddress();
+ }
+
+ // Utilities
+@@ -757,23 +921,4 @@
+ * Perform class load-time initializations.
+ */
+ private static native void init();
+-
+- /**
+- * Following field is only used during (de)/serialization
+- */
+- private String ifname;
+-
+- /**
+- * default behavior is overridden in order to write the
+- * scope_ifname field as a String, rather than a NetworkInterface
+- * which is not serializable
+- */
+- private synchronized void writeObject(java.io.ObjectOutputStream s)
+- throws IOException
+- {
+- if (scope_ifname_set) {
+- ifname = scope_ifname.getName();
+- }
+- s.defaultWriteObject();
+- }
+ }
+--- ./jdk/src/share/classes/java/net/InetAddress.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/net/InetAddress.java Tue Oct 08 09:07:05 2013 -0700
+@@ -213,6 +213,13 @@
+ this.family = family;
+ }
+
++ void init(String hostName, int family) {
++ this.hostName = hostName;
++ if (family != -1) {
++ this.family = family;
++ }
++ }
++
+ String hostName;
+
+ String getHostName() {
+@@ -1594,7 +1601,6 @@
+ pf.put("address", holder().address);
+ pf.put("family", holder().family);
+ s.writeFields();
+- s.flush();
+ }
+ }
+
+--- ./jdk/src/share/classes/java/util/TimeZone.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/java/util/TimeZone.java Tue Oct 08 09:07:05 2013 -0700
+@@ -165,6 +165,11 @@
+ // Proclaim serialization compatibility with JDK 1.1
+ static final long serialVersionUID = 3581463369166924961L;
+
++ // TimeZone.setDefault maintains the compatible behavior of the AppContext-based
++ // default setting for untrusted code if allowSetDefault is true.
++ private static final boolean allowSetDefault = AccessController.doPrivileged(
++ new sun.security.action.GetPropertyAction("jdk.util.TimeZone.allowSetDefault")) != null;
++
+ /**
+ * Gets the time zone offset, for current date, modified in case of
+ * daylight savings. This is the offset to add to UTC to get local time.
+@@ -689,6 +694,9 @@
+ sm.checkPermission(new PropertyPermission
+ ("user.timezone", "write"));
+ } catch (SecurityException e) {
++ if (!allowSetDefault) {
++ throw e;
++ }
+ hasPermission = false;
+ }
+ }
+@@ -719,6 +727,7 @@
+ * Returns the default TimeZone in an AppContext if any AppContext
+ * has ever used. null is returned if any AppContext hasn't been
+ * used or if the AppContext doesn't have the default TimeZone.
++ * null is also returned if allowSetDefault is false.
+ *
+ * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
+ * been loaded. If so, it implies that AWTSecurityManager is not our
+@@ -726,18 +735,20 @@
+ * This works around a build time issue.
+ */
+ private static TimeZone getDefaultInAppContext() {
+- // JavaAWTAccess provides access implementation-private methods without using reflection.
+- JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
+- if (javaAWTAccess == null) {
+- return mainAppContextDefault;
+- } else {
+- if (!javaAWTAccess.isDisposed()) {
+- TimeZone tz = (TimeZone)
+- javaAWTAccess.get(TimeZone.class);
+- if (tz == null && javaAWTAccess.isMainAppContext()) {
+- return mainAppContextDefault;
+- } else {
+- return tz;
++ if (allowSetDefault) {
++ // JavaAWTAccess provides access implementation-private methods without using reflection.
++ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
++ if (javaAWTAccess == null) {
++ return mainAppContextDefault;
++ } else {
++ if (!javaAWTAccess.isDisposed()) {
++ TimeZone tz = (TimeZone)
++ javaAWTAccess.get(TimeZone.class);
++ if (tz == null && javaAWTAccess.isMainAppContext()) {
++ return mainAppContextDefault;
++ } else {
++ return tz;
++ }
+ }
+ }
+ }
+@@ -745,9 +756,9 @@
+ }
+
+ /**
+- * Sets the default TimeZone in the AppContext to the given
+- * tz. null is handled special: do nothing if any AppContext
+- * hasn't been used, remove the default TimeZone in the
++ * Sets the default TimeZone in the AppContext to the given tz if
++ * allowSetDefault is true. null is handled special: do nothing if any
++ * AppContext hasn't been used, remove the default TimeZone in the
+ * AppContext otherwise.
+ *
+ * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
+@@ -756,15 +767,17 @@
+ * This works around a build time issue.
+ */
+ private static void setDefaultInAppContext(TimeZone tz) {
+- // JavaAWTAccess provides access implementation-private methods without using reflection.
+- JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
+- if (javaAWTAccess == null) {
+- mainAppContextDefault = tz;
+- } else {
+- if (!javaAWTAccess.isDisposed()) {
+- javaAWTAccess.put(TimeZone.class, tz);
+- if (javaAWTAccess.isMainAppContext()) {
+- mainAppContextDefault = null;
++ if (allowSetDefault) {
++ // JavaAWTAccess provides access implementation-private methods without using reflection.
++ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
++ if (javaAWTAccess == null) {
++ mainAppContextDefault = tz;
++ } else {
++ if (!javaAWTAccess.isDisposed()) {
++ javaAWTAccess.put(TimeZone.class, tz);
++ if (javaAWTAccess.isMainAppContext()) {
++ mainAppContextDefault = null;
++ }
+ }
+ }
+ }
+--- ./jdk/src/share/classes/javax/management/BadAttributeValueExpException.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/management/BadAttributeValueExpException.java Tue Oct 08 09:07:05 2013 -0700
+@@ -25,6 +25,9 @@
+
+ package javax.management;
+
++import java.io.IOException;
++import java.io.ObjectInputStream;
++
+
+ /**
+ * Thrown when an invalid MBean attribute is passed to a query
+@@ -51,7 +54,7 @@
+ * @param val the inappropriate value.
+ */
+ public BadAttributeValueExpException (Object val) {
+- this.val = val;
++ this.val = val == null ? null : val.toString();
+ }
+
+
+@@ -62,4 +65,25 @@
+ return "BadAttributeValueException: " + val;
+ }
+
++ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
++ ObjectInputStream.GetField gf = ois.readFields();
++ Object valObj = gf.get("val", null);
++
++ if (valObj == null) {
++ val = null;
++ } else if (valObj instanceof String) {
++ val= valObj;
++ } else if (System.getSecurityManager() == null
++ || valObj instanceof Long
++ || valObj instanceof Integer
++ || valObj instanceof Float
++ || valObj instanceof Double
++ || valObj instanceof Byte
++ || valObj instanceof Short
++ || valObj instanceof Boolean) {
++ val = valObj.toString();
++ } else { // the serialized object is from a version without JDK-8019292 fix
++ val = System.identityHashCode(valObj) + "@" + valObj.getClass().getName();
++ }
++ }
+ }
+--- ./jdk/src/share/classes/javax/management/MBeanNotificationInfo.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/management/MBeanNotificationInfo.java Tue Oct 08 09:07:05 2013 -0700
+@@ -25,6 +25,9 @@
+
+ package javax.management;
+
++import java.io.IOException;
++import java.io.InvalidObjectException;
++import java.io.ObjectInputStream;
+ import java.util.Arrays;
+
+ /**
+@@ -67,7 +70,7 @@
+ /**
+ * @serial The different types of the notification.
+ */
+- private final String[] types;
++ private String[] types;
+
+ /** @see MBeanInfo#arrayGettersSafe */
+ private final transient boolean arrayGettersSafe;
+@@ -114,9 +117,8 @@
+ notifType, though it doesn't explicitly allow it
+ either. */
+
+- if (notifTypes == null)
+- notifTypes = NO_TYPES;
+- this.types = notifTypes;
++ this.types = (notifTypes != null && notifTypes.length > 0) ?
++ notifTypes.clone() : NO_TYPES;
+ this.arrayGettersSafe =
+ MBeanInfo.arrayGettersSafe(this.getClass(),
+ MBeanNotificationInfo.class);
+@@ -203,4 +205,11 @@
+ hash ^= types[i].hashCode();
+ return hash;
+ }
++
++ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
++ ObjectInputStream.GetField gf = ois.readFields();
++ String[] t = (String[])gf.get("types", null);
++
++ types = (t != null && t.length != 0) ? t.clone() : NO_TYPES;
++ }
+ }
+--- ./jdk/src/share/classes/javax/management/MBeanTrustPermission.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/management/MBeanTrustPermission.java Tue Oct 08 09:07:05 2013 -0700
+@@ -26,6 +26,9 @@
+ package javax.management;
+
+ import java.security.BasicPermission;
++import java.io.IOException;
++import java.io.InvalidObjectException;
++import java.io.ObjectInputStream;
+
+ /**
+ * This permission represents "trust" in a signer or codebase.
+@@ -75,15 +78,31 @@
+ */
+ public MBeanTrustPermission(String name, String actions) {
+ super(name, actions);
++ validate(name,actions);
++ }
++
++ private static void validate(String name, String actions) {
+ /* Check that actions is a null empty string */
+- if (actions != null && actions.length() > 0)
+- throw new IllegalArgumentException("MBeanTrustPermission " +
+- "actions must be null: " +
++ if (actions != null && actions.length() > 0) {
++ throw new IllegalArgumentException("MBeanTrustPermission actions must be null: " +
+ actions);
++ }
+
+- if (!name.equals("register") && !name.equals("*"))
+- throw new IllegalArgumentException("MBeanTrustPermission: " +
+- "Unknown target name " +
++ if (!name.equals("register") && !name.equals("*")) {
++ throw new IllegalArgumentException("MBeanTrustPermission: Unknown target name " +
+ "[" + name + "]");
++ }
++ }
++
++ private void readObject(ObjectInputStream in)
++ throws IOException, ClassNotFoundException {
++
++ // Reading private fields of base class
++ in.defaultReadObject();
++ try {
++ validate(super.getName(),super.getActions());
++ } catch (IllegalArgumentException e) {
++ throw new InvalidObjectException(e.getMessage());
++ }
+ }
+ }
+--- ./jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 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
+@@ -298,11 +298,15 @@
+ RequiredModelMBean.class.getName(),
+ "setModelMBeanInfo(ModelMBeanInfo)",
+ "Setting ModelMBeanInfo to " + printModelMBeanInfo(mbi));
++ int noOfNotifications = 0;
++ if (mbi.getNotifications() != null) {
++ noOfNotifications = mbi.getNotifications().length;
++ }
+ MODELMBEAN_LOGGER.logp(Level.FINER,
+ RequiredModelMBean.class.getName(),
+ "setModelMBeanInfo(ModelMBeanInfo)",
+ "ModelMBeanInfo notifications has " +
+- (mbi.getNotifications()).length + " elements");
++ noOfNotifications + " elements");
+ }
+
+ modelMBeanInfo = (ModelMBeanInfo)mbi.clone();
+@@ -2997,4 +3001,4 @@
+ Void.class.getName()
+ };
+ }
+-}
+\ No newline at end of file
++}
+--- ./jdk/src/share/classes/javax/management/remote/JMXPrincipal.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/management/remote/JMXPrincipal.java Tue Oct 08 09:07:05 2013 -0700
+@@ -26,6 +26,9 @@
+
+ package javax.management.remote;
+
++import java.io.IOException;
++import java.io.InvalidObjectException;
++import java.io.ObjectInputStream;
+ import java.io.Serializable;
+ import java.security.Principal;
+
+@@ -64,9 +67,7 @@
+ * <code>null</code>.
+ */
+ public JMXPrincipal(String name) {
+- if (name == null)
+- throw new NullPointerException("illegal null input");
+-
++ validate(name);
+ this.name = name;
+ }
+
+@@ -130,4 +131,20 @@
+ public int hashCode() {
+ return name.hashCode();
+ }
++
++ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
++ ObjectInputStream.GetField gf = ois.readFields();
++ String principalName = (String)gf.get("name", null);
++ try {
++ validate(principalName);
++ this.name = principalName;
++ } catch (NullPointerException e) {
++ throw new InvalidObjectException(e.getMessage());
++ }
++ }
++
++ private static void validate(String name) throws NullPointerException {
++ if (name == null)
++ throw new NullPointerException("illegal null input");
++ }
+ }
+--- ./jdk/src/share/classes/javax/management/remote/JMXServiceURL.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/management/remote/JMXServiceURL.java Tue Oct 08 09:07:05 2013 -0700
+@@ -29,6 +29,9 @@
+
+ import com.sun.jmx.remote.util.ClassLogger;
+ import com.sun.jmx.remote.util.EnvHelp;
++import java.io.IOException;
++import java.io.InvalidObjectException;
++import java.io.ObjectInputStream;
+
+ import java.io.Serializable;
+ import java.net.InetAddress;
+@@ -297,7 +300,7 @@
+ If we're given an explicit host name that is illegal we
+ have to reject it. (Bug 5057532.) */
+ try {
+- validateHost(host);
++ validateHost(host, port);
+ } catch (MalformedURLException e) {
+ if (logger.fineOn()) {
+ logger.fine("JMXServiceURL",
+@@ -336,36 +339,82 @@
+ validate();
+ }
+
+- private void validate() throws MalformedURLException {
++ private static final String INVALID_INSTANCE_MSG =
++ "Trying to deserialize an invalid instance of JMXServiceURL";
++ private void readObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
++ ObjectInputStream.GetField gf = inputStream.readFields();
++ String h = (String)gf.get("host", null);
++ int p = (int)gf.get("port", -1);
++ String proto = (String)gf.get("protocol", null);
++ String url = (String)gf.get("urlPath", null);
+
++ if (proto == null || url == null || h == null) {
++ StringBuilder sb = new StringBuilder(INVALID_INSTANCE_MSG).append('[');
++ boolean empty = true;
++ if (proto == null) {
++ sb.append("protocol=null");
++ empty = false;
++ }
++ if (h == null) {
++ sb.append(empty ? "" : ",").append("host=null");
++ empty = false;
++ }
++ if (url == null) {
++ sb.append(empty ? "" : ",").append("urlPath=null");
++ }
++ sb.append(']');
++ throw new InvalidObjectException(sb.toString());
++ }
++
++ if (h.contains("[") || h.contains("]")) {
++ throw new InvalidObjectException("Invalid host name: " + h);
++ }
++
++ try {
++ validate(proto, h, p, url);
++ this.protocol = proto;
++ this.host = h;
++ this.port = p;
++ this.urlPath = url;
++ } catch (MalformedURLException e) {
++ throw new InvalidObjectException(INVALID_INSTANCE_MSG + ": " +
++ e.getMessage());
++ }
++
++ }
++
++ private void validate(String proto, String h, int p, String url)
++ throws MalformedURLException {
+ // Check protocol
+-
+- final int protoEnd = indexOfFirstNotInSet(protocol, protocolBitSet, 0);
+- if (protoEnd == 0 || protoEnd < protocol.length()
+- || !alphaBitSet.get(protocol.charAt(0))) {
++ final int protoEnd = indexOfFirstNotInSet(proto, protocolBitSet, 0);
++ if (protoEnd == 0 || protoEnd < proto.length()
++ || !alphaBitSet.get(proto.charAt(0))) {
+ throw new MalformedURLException("Missing or invalid protocol " +
+- "name: \"" + protocol + "\"");
++ "name: \"" + proto + "\"");
+ }
+
+ // Check host
+-
+- validateHost();
++ validateHost(h, p);
+
+ // Check port
+-
+- if (port < 0)
+- throw new MalformedURLException("Bad port: " + port);
++ if (p < 0)
++ throw new MalformedURLException("Bad port: " + p);
+
+ // Check URL path
+-
+- if (urlPath.length() > 0) {
+- if (!urlPath.startsWith("/") && !urlPath.startsWith(";"))
+- throw new MalformedURLException("Bad URL path: " + urlPath);
++ if (url.length() > 0) {
++ if (!url.startsWith("/") && !url.startsWith(";"))
++ throw new MalformedURLException("Bad URL path: " + url);
+ }
+ }
+
+- private void validateHost() throws MalformedURLException {
+- if (host.length() == 0) {
++ private void validate() throws MalformedURLException {
++ validate(this.protocol, this.host, this.port, this.urlPath);
++ }
++
++ private static void validateHost(String h, int port)
++ throws MalformedURLException {
++
++ if (h.length() == 0) {
+ if (port != 0) {
+ throw new MalformedURLException("Cannot give port number " +
+ "without host name");
+@@ -373,12 +422,6 @@
+ return;
+ }
+
+- validateHost(host);
+- }
+-
+- private static void validateHost(String h)
+- throws MalformedURLException {
+-
+ if (isNumericIPv6Address(h)) {
+ /* We assume J2SE >= 1.4 here. Otherwise you can't
+ use the address anyway. We can't call
+@@ -663,22 +706,22 @@
+ /**
+ * The value returned by {@link #getProtocol()}.
+ */
+- private final String protocol;
++ private String protocol;
+
+ /**
+ * The value returned by {@link #getHost()}.
+ */
+- private final String host;
++ private String host;
+
+ /**
+ * The value returned by {@link #getPort()}.
+ */
+- private final int port;
++ private int port;
+
+ /**
+ * The value returned by {@link #getURLPath()}.
+ */
+- private final String urlPath;
++ private String urlPath;
+
+ /**
+ * Cached result of {@link #toString()}.
+--- ./jdk/src/share/classes/javax/management/remote/NotificationResult.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/management/remote/NotificationResult.java Tue Oct 08 09:07:05 2013 -0700
+@@ -25,6 +25,9 @@
+
+ package javax.management.remote;
+
++import java.io.IOException;
++import java.io.InvalidObjectException;
++import java.io.ObjectInputStream;
+ import java.io.Serializable;
+
+ /**
+@@ -76,17 +79,7 @@
+ public NotificationResult(long earliestSequenceNumber,
+ long nextSequenceNumber,
+ TargetedNotification[] targetedNotifications) {
+- if (targetedNotifications == null) {
+- final String msg = "Notifications null";
+- throw new IllegalArgumentException(msg);
+- }
+-
+- if (earliestSequenceNumber < 0 || nextSequenceNumber < 0)
+- throw new IllegalArgumentException("Bad sequence numbers");
+- /* We used to check nextSequenceNumber >= earliestSequenceNumber
+- here. But in fact the opposite can legitimately be true if
+- notifications have been lost. */
+-
++ validate(targetedNotifications, earliestSequenceNumber, nextSequenceNumber);
+ this.earliestSequenceNumber = earliestSequenceNumber;
+ this.nextSequenceNumber = nextSequenceNumber;
+ this.targetedNotifications = (targetedNotifications.length == 0 ? targetedNotifications : targetedNotifications.clone());
+@@ -138,7 +131,40 @@
+ getTargetedNotifications().length;
+ }
+
+- private final long earliestSequenceNumber;
+- private final long nextSequenceNumber;
+- private final TargetedNotification[] targetedNotifications;
++ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
++ ois.defaultReadObject();
++ try {
++ validate(
++ this.targetedNotifications,
++ this.earliestSequenceNumber,
++ this.nextSequenceNumber
++ );
++
++ this.targetedNotifications = this.targetedNotifications.length == 0 ?
++ this.targetedNotifications :
++ this.targetedNotifications.clone();
++ } catch (IllegalArgumentException e) {
++ throw new InvalidObjectException(e.getMessage());
++ }
++ }
++
++ private long earliestSequenceNumber;
++ private long nextSequenceNumber;
++ private TargetedNotification[] targetedNotifications;
++
++ private static void validate(TargetedNotification[] targetedNotifications,
++ long earliestSequenceNumber,
++ long nextSequenceNumber)
++ throws IllegalArgumentException {
++ if (targetedNotifications == null) {
++ final String msg = "Notifications null";
++ throw new IllegalArgumentException(msg);
++ }
++
++ if (earliestSequenceNumber < 0 || nextSequenceNumber < 0)
++ throw new IllegalArgumentException("Bad sequence numbers");
++ /* We used to check nextSequenceNumber >= earliestSequenceNumber
++ here. But in fact the opposite can legitimately be true if
++ notifications have been lost. */
++ }
+ }
+--- ./jdk/src/share/classes/javax/management/remote/TargetedNotification.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/management/remote/TargetedNotification.java Tue Oct 08 09:07:05 2013 -0700
+@@ -26,6 +26,9 @@
+
+ package javax.management.remote;
+
++import java.io.IOException;
++import java.io.InvalidObjectException;
++import java.io.ObjectInputStream;
+ import java.io.Serializable;
+ import javax.management.Notification;
+
+@@ -73,12 +76,9 @@
+ */
+ public TargetedNotification(Notification notification,
+ Integer listenerID) {
++ validate(notification, listenerID);
+ // If we replace integer with int...
+ // this(notification,intValue(listenerID));
+- if (notification == null) throw new
+- IllegalArgumentException("Invalid notification: null");
+- if (listenerID == null) throw new
+- IllegalArgumentException("Invalid listener ID: null");
+ this.notif = notification;
+ this.id = listenerID;
+ }
+@@ -115,13 +115,13 @@
+ * @serial A notification to transmit to the other side.
+ * @see #getNotification()
+ **/
+- private final Notification notif;
++ private Notification notif;
+ /**
+ * @serial The ID of the listener to which the notification is
+ * targeted.
+ * @see #getListenerID()
+ **/
+- private final Integer id;
++ private Integer id;
+ //private final int id;
+
+ // Needed if we use int instead of Integer...
+@@ -130,4 +130,22 @@
+ // IllegalArgumentException("Invalid listener ID: null");
+ // return id.intValue();
+ // }
++
++ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
++ ois.defaultReadObject();
++ try {
++ validate(this.notif, this.id);
++ } catch (IllegalArgumentException e) {
++ throw new InvalidObjectException(e.getMessage());
++ }
++ }
++
++ private static void validate(Notification notif, Integer id) throws IllegalArgumentException {
++ if (notif == null) {
++ throw new IllegalArgumentException("Invalid notification: null");
++ }
++ if (id == null) {
++ throw new IllegalArgumentException("Invalid listener ID: null");
++ }
++ }
+ }
+--- ./jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 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
+@@ -61,6 +61,7 @@
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ import java.security.PrivilegedExceptionAction;
++import java.security.PrivilegedActionException;
+ import java.security.ProtectionDomain;
+ import java.util.Arrays;
+ import java.util.Collections;
+@@ -128,7 +129,6 @@
+ Map<String, ?> environment) {
+ if (rmiServer == null && address == null) throw new
+ IllegalArgumentException("rmiServer and jmxServiceURL both null");
+-
+ initTransients();
+
+ this.rmiServer = rmiServer;
+@@ -239,10 +239,21 @@
+ //--------------------------------------------------------------------
+ // implements JMXConnector interface
+ //--------------------------------------------------------------------
++
++ /**
++ * @throws IOException if the connection could not be made because of a
++ * communication problem, or in the case of the {@code iiop} protocol,
++ * that RMI/IIOP is not supported
++ */
+ public void connect() throws IOException {
+ connect(null);
+ }
+
++ /**
++ * @throws IOException if the connection could not be made because of a
++ * communication problem, or in the case of the {@code iiop} protocol,
++ * that RMI/IIOP is not supported
++ */
+ public synchronized void connect(Map<String,?> environment)
+ throws IOException {
+ final boolean tracing = logger.traceOn();
+@@ -2359,13 +2370,21 @@
+ }
+ }
+
+- private static RMIConnection shadowIiopStub(Object stub)
++ private static RMIConnection shadowIiopStub(Object stub)
+ throws InstantiationException, IllegalAccessException {
+- Object proxyStub = proxyStubClass.newInstance();
++ Object proxyStub = null;
++ try {
++ proxyStub = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
++ public Object run() throws Exception {
++ return proxyStubClass.newInstance();
++ }
++ });
++ } catch (PrivilegedActionException e) {
++ throw new InternalError();
++ }
+ IIOPHelper.setDelegate(proxyStub, IIOPHelper.getDelegate(stub));
+ return (RMIConnection) proxyStub;
+ }
+-
+ private static RMIConnection getConnection(RMIServer server,
+ Object credentials,
+ boolean checkStub)
+--- ./jdk/src/share/classes/javax/security/auth/Subject.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/security/auth/Subject.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1296,8 +1296,14 @@
+ {
+ ObjectInputStream.GetField fields = ois.readFields();
+ subject = (Subject) fields.get("this$0", null);
+- elements = (LinkedList<E>) fields.get("elements", null);
+ which = fields.get("which", 0);
++
++ LinkedList<E> tmp = (LinkedList<E>) fields.get("elements", null);
++ if (tmp.getClass() != LinkedList.class) {
++ elements = new LinkedList<E>(tmp);
++ } else {
++ elements = tmp;
++ }
+ }
+ }
+
+--- ./jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java Tue Oct 08 09:07:05 2013 -0700
+@@ -26,6 +26,7 @@
+ package javax.security.auth.kerberos;
+
+ import java.io.File;
++import java.security.AccessControlException;
+ import java.util.Objects;
+ import sun.misc.SharedSecrets;
+ import sun.security.krb5.EncryptionKey;
+@@ -114,7 +115,19 @@
+
+ //Takes a snapshot of the keytab content
+ private sun.security.krb5.internal.ktab.KeyTab takeSnapshot() {
+- return sun.security.krb5.internal.ktab.KeyTab.getInstance(file);
++ try {
++ return sun.security.krb5.internal.ktab.KeyTab.getInstance(file);
++ } catch (AccessControlException ace) {
++ if (file != null) {
++ // It's OK to show the name if caller specified it
++ throw ace;
++ } else {
++ AccessControlException ace2 = new AccessControlException(
++ "Access to default keytab denied (modified exception)");
++ ace2.setStackTrace(ace.getStackTrace());
++ throw ace2;
++ }
++ }
+ }
+
+ /**
+--- ./jdk/src/share/classes/javax/swing/JTable.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/swing/JTable.java Tue Oct 08 09:07:05 2013 -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
+@@ -52,6 +52,7 @@
+
+ import javax.print.attribute.*;
+ import javax.print.PrintService;
++import sun.reflect.misc.ReflectUtil;
+
+ import sun.swing.SwingUtilities2;
+ import sun.swing.SwingUtilities2.Section;
+@@ -5460,14 +5461,16 @@
+ // they have the option to replace the value with
+ // null or use escape to restore the original.
+ // For Strings, return "" for backward compatibility.
+- if ("".equals(s)) {
+- if (constructor.getDeclaringClass() == String.class) {
+- value = s;
+- }
+- return super.stopCellEditing();
+- }
+
+ try {
++ if ("".equals(s)) {
++ if (constructor.getDeclaringClass() == String.class) {
++ value = s;
++ }
++ return super.stopCellEditing();
++ }
++
++ SwingUtilities2.checkAccess(constructor.getModifiers());
+ value = constructor.newInstance(new Object[]{s});
+ }
+ catch (Exception e) {
+@@ -5491,6 +5494,8 @@
+ if (type == Object.class) {
+ type = String.class;
+ }
++ ReflectUtil.checkPackageAccess(type);
++ SwingUtilities2.checkAccess(type.getModifiers());
+ constructor = type.getConstructor(argTypes);
+ }
+ catch (Exception e) {
+--- ./jdk/src/share/classes/javax/swing/UIDefaults.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/swing/UIDefaults.java Tue Oct 08 09:07:05 2013 -0700
+@@ -53,6 +53,7 @@
+
+ import sun.reflect.misc.MethodUtil;
+ import sun.reflect.misc.ReflectUtil;
++import sun.swing.SwingUtilities2;
+ import sun.util.CoreResourceBundleControl;
+
+ /**
+@@ -1101,7 +1102,7 @@
+ }
+ ReflectUtil.checkPackageAccess(className);
+ c = Class.forName(className, true, (ClassLoader)cl);
+- checkAccess(c.getModifiers());
++ SwingUtilities2.checkAccess(c.getModifiers());
+ if (methodName != null) {
+ Class[] types = getClassArray(args);
+ Method m = c.getMethod(methodName, types);
+@@ -1109,7 +1110,7 @@
+ } else {
+ Class[] types = getClassArray(args);
+ Constructor constructor = c.getConstructor(types);
+- checkAccess(constructor.getModifiers());
++ SwingUtilities2.checkAccess(constructor.getModifiers());
+ return constructor.newInstance(args);
+ }
+ } catch(Exception e) {
+@@ -1124,13 +1125,6 @@
+ }, acc);
+ }
+
+- private void checkAccess(int modifiers) {
+- if(System.getSecurityManager() != null &&
+- !Modifier.isPublic(modifiers)) {
+- throw new SecurityException("Resource is not accessible");
+- }
+- }
+-
+ /*
+ * 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/text/DefaultFormatter.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/swing/text/DefaultFormatter.java Tue Oct 08 09:07:05 2013 -0700
+@@ -24,7 +24,8 @@
+ */
+ package javax.swing.text;
+
+-import sun.reflect.misc.ConstructorUtil;
++import sun.reflect.misc.ReflectUtil;
++import sun.swing.SwingUtilities2;
+
+ import java.io.Serializable;
+ import java.lang.reflect.*;
+@@ -247,7 +248,9 @@
+ Constructor cons;
+
+ try {
+- cons = ConstructorUtil.getConstructor(vc, new Class[]{String.class});
++ ReflectUtil.checkPackageAccess(vc);
++ SwingUtilities2.checkAccess(vc.getModifiers());
++ cons = vc.getConstructor(new Class[]{String.class});
+
+ } catch (NoSuchMethodException nsme) {
+ cons = null;
+@@ -255,6 +258,7 @@
+
+ if (cons != null) {
+ try {
++ SwingUtilities2.checkAccess(cons.getModifiers());
+ return cons.newInstance(new Object[] { string });
+ } catch (Throwable ex) {
+ throw new ParseException("Error creating instance", 0);
+--- ./jdk/src/share/classes/javax/swing/text/NumberFormatter.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/swing/text/NumberFormatter.java Tue Oct 08 09:07:05 2013 -0700
+@@ -27,6 +27,8 @@
+ import java.lang.reflect.*;
+ import java.text.*;
+ import java.util.*;
++import sun.reflect.misc.ReflectUtil;
++import sun.swing.SwingUtilities2;
+
+ /**
+ * <code>NumberFormatter</code> subclasses <code>InternationalFormatter</code>
+@@ -427,10 +429,12 @@
+ valueClass = value.getClass();
+ }
+ try {
++ ReflectUtil.checkPackageAccess(valueClass);
++ SwingUtilities2.checkAccess(valueClass.getModifiers());
+ Constructor cons = valueClass.getConstructor(
+ new Class[] { String.class });
+-
+ if (cons != null) {
++ SwingUtilities2.checkAccess(cons.getModifiers());
+ return cons.newInstance(new Object[]{string});
+ }
+ } catch (Throwable ex) { }
+--- ./jdk/src/share/classes/javax/swing/text/html/ObjectView.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/javax/swing/text/html/ObjectView.java Tue Oct 08 09:07:05 2013 -0700
+@@ -31,6 +31,9 @@
+ import java.beans.*;
+ import java.lang.reflect.*;
+
++import sun.reflect.misc.MethodUtil;
++import sun.reflect.misc.ReflectUtil;
++
+ /**
+ * Component decorator that implements the view interface
+ * for &lt;object&gt; elements.
+@@ -87,6 +90,7 @@
+ AttributeSet attr = getElement().getAttributes();
+ String classname = (String) attr.getAttribute(HTML.Attribute.CLASSID);
+ try {
++ ReflectUtil.checkPackageAccess(classname);
+ Class c = Class.forName(classname, true,Thread.currentThread().
+ getContextClassLoader());
+ Object o = c.newInstance();
+@@ -116,28 +120,6 @@
+ }
+
+ /**
+- * Get a Class object to use for loading the
+- * classid. If possible, the Classloader
+- * used to load the associated Document is used.
+- * This would typically be the same as the ClassLoader
+- * used to load the EditorKit. If the documents
+- * ClassLoader is null,
+- * <code>Class.forName</code> is used.
+- */
+- private Class getClass(String classname) throws ClassNotFoundException {
+- Class klass;
+-
+- Class docClass = getDocument().getClass();
+- ClassLoader loader = docClass.getClassLoader();
+- if (loader != null) {
+- klass = loader.loadClass(classname);
+- } else {
+- klass = Class.forName(classname);
+- }
+- return klass;
+- }
+-
+- /**
+ * Initialize this component according the KEY/VALUEs passed in
+ * via the &lt;param&gt; elements in the corresponding
+ * &lt;object&gt; element.
+@@ -170,7 +152,7 @@
+ }
+ Object [] args = { value };
+ try {
+- writer.invoke(comp, args);
++ MethodUtil.invoke(writer, comp, args);
+ } catch (Exception ex) {
+ System.err.println("Invocation failed");
+ // invocation code
+--- ./jdk/src/share/classes/sun/font/FileFont.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/font/FileFont.java Tue Oct 08 09:07:05 2013 -0700
+@@ -170,7 +170,9 @@
+ }
+ }
+ }
+- scaler.dispose();
++ if (scaler != null) {
++ scaler.dispose();
++ }
+ scaler = FontScaler.getNullScaler();
+ }
+
+--- ./jdk/src/share/classes/sun/font/GlyphLayout.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/font/GlyphLayout.java Tue Oct 08 09:07:05 2013 -0700
+@@ -468,9 +468,10 @@
+ _gvdata.grow();
+ }
+ }
+- if (_gvdata._count < 0) {
+- break;
+- }
++ }
++ // Break out of the outer for loop if layout fails.
++ if (_gvdata._count < 0) {
++ break;
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/font/StandardGlyphVector.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/font/StandardGlyphVector.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1740,8 +1740,9 @@
+ tx,
+ sgv.font.getStyle(),
+ aa, fm);
+-
+- FontStrike strike = sgv.font2D.getStrike(desc); // !!! getStrike(desc, false)
++ // Get the strike via the handle. Shouldn't matter
++ // if we've invalidated the font but its an extra precaution.
++ FontStrike strike = sgv.font2D.handle.font2D.getStrike(desc); // !!! getStrike(desc, false)
+
+ return new GlyphStrike(sgv, strike, dx, dy);
+ }
+--- ./jdk/src/share/classes/sun/font/TrueTypeFont.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/font/TrueTypeFont.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1037,6 +1037,9 @@
+ if (head_Table != null && head_Table.capacity() >= 18) {
+ ShortBuffer sb = head_Table.asShortBuffer();
+ upem = sb.get(9) & 0xffff;
++ if (upem < 16 || upem > 16384) {
++ upem = 2048;
++ }
+ }
+
+ ByteBuffer os2_Table = getTableBuffer(os_2Tag);
+--- ./jdk/src/share/classes/sun/java2d/Disposer.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/java2d/Disposer.java Tue Oct 08 09:07:05 2013 -0700
+@@ -150,8 +150,7 @@
+ rec = null;
+ clearDeferredRecords();
+ } catch (Exception e) {
+- System.out.println("Exception while removing reference: " + e);
+- e.printStackTrace();
++ System.out.println("Exception while removing reference.");
+ }
+ }
+ }
+@@ -177,7 +176,6 @@
+ rec.dispose();
+ } catch (Exception e) {
+ System.out.println("Exception while disposing deferred rec.");
+- e.printStackTrace();
+ }
+ }
+ deferredRecords.clear();
+@@ -228,8 +226,7 @@
+ }
+ }
+ } catch (Exception e) {
+- System.out.println("Exception while removing reference: " + e);
+- e.printStackTrace();
++ System.out.println("Exception while removing reference.");
+ } finally {
+ pollingQueue = false;
+ }
+--- ./jdk/src/share/classes/sun/management/HotSpotDiagnostic.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/management/HotSpotDiagnostic.java Tue Oct 08 09:07:05 2013 -0700
+@@ -40,7 +40,17 @@
+ public HotSpotDiagnostic() {
+ }
+
+- public native void dumpHeap(String outputFile, boolean live) throws IOException;
++ public void dumpHeap(String outputFile, boolean live) throws IOException {
++ SecurityManager security = System.getSecurityManager();
++ if (security != null) {
++ security.checkWrite(outputFile);
++ Util.checkControlAccess();
++ }
++
++ dumpHeap0(outputFile, live);
++ }
++
++ private native void dumpHeap0(String outputFile, boolean live) throws IOException;
+
+ public List<VMOption> getDiagnosticOptions() {
+ List<Flag> allFlags = Flag.getAllFlags();
+--- ./jdk/src/share/classes/sun/misc/JavaLangAccess.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/misc/JavaLangAccess.java Tue Oct 08 09:07:05 2013 -0700
+@@ -25,6 +25,7 @@
+
+ package sun.misc;
+
++import java.security.AccessControlContext;
+ import sun.reflect.ConstantPool;
+ import sun.reflect.annotation.AnnotationType;
+ import sun.nio.ch.Interruptible;
+@@ -88,4 +89,10 @@
+ * Returns the murmur hash value for the specified String.
+ */
+ int getStringHash32(String string);
++
++ /**
++ * Returns a new Thread with the given Runnable and an
++ * inherited AccessControlContext.
++ */
++ Thread newThreadWithAcc(Runnable target, AccessControlContext acc);
+ }
+--- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1031,6 +1031,24 @@
+ "ebcdic-s-871+euro"
+ });
+
++ charset("IBM290", "IBM290",
++ new String[] {
++ "cp290",
++ "ibm290",
++ "ibm-290",
++ "csIBM290",
++ "EBCDIC-JP-kana",
++ "290"
++ });
++
++ charset("x-IBM300", "IBM300",
++ new String[] {
++ "cp300",
++ "ibm300",
++ "ibm-300",
++ "300"
++ });
++
+ // Macintosh MacOS/Apple char encodingd
+
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/sun/nio/cs/ext/IBM300.java Tue Oct 08 09:07:05 2013 -0700
+@@ -0,0 +1,1875 @@
++/*
++ * 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.
++ */
++
++// -- This file was mechanically generated: Do not edit! -- //
++
++package sun.nio.cs.ext;
++
++import java.nio.charset.Charset;
++import java.nio.charset.CharsetDecoder;
++import java.nio.charset.CharsetEncoder;
++import java.util.Arrays;
++import sun.nio.cs.HistoricallyNamedCharset;
++import sun.nio.cs.ext.DoubleByte;
++
++public class IBM300 extends Charset
++ implements HistoricallyNamedCharset
++{
++ public IBM300() {
++ super("x-IBM300", ExtendedCharsets.aliasesFor("x-IBM300"));
++ }
++
++ public String historicalName() { return "Cp300"; }
++
++ public boolean contains(Charset cs) {
++ return (cs instanceof IBM300);
++ }
++
++ public CharsetDecoder newDecoder() {
++ initb2c();
++ return new DoubleByte.Decoder_EBCDIC_DBCSONLY(this, b2c, 0x40, 0xfe);
++ }
++
++ public CharsetEncoder newEncoder() {
++ initc2b();
++ return new DoubleByte.Encoder_EBCDIC_DBCSONLY(
++ this, new byte[]{ (byte)0x42, (byte)0x6f }, c2b, c2bIndex);
++ }
++ static final String b2cSBStr =
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ;
++
++ static final String[] b2cStr = {
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ "\u3000\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
++ "\uFFFD\u03B1\u03B2\u03B3\u03B4\u03B5\u03B6\u03B7" +
++ "\u03B8\u03B9\u03BA\u03BB\u03BC\u03BD\u03BE\u03BF" +
++ "\u03C0\u03C1\u03C3\u03C4\u03C5\u03C6\u03C7\u03C8" +
++ "\u03C9\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\u0391\u0392\u0393\u0394\u0395\u0396\u0397" +
++ "\u0398\u0399\u039A\u039B\u039C\u039D\u039E\u039F" +
++ "\u03A0\u03A1\u03A3\u03A4\u03A5\u03A6\u03A7\u03A8" +
++ "\u03A9\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\u0430\u0431\u0432\u0433\u0434\u0435\u0451\u0436" +
++ "\u0437\u0438\u0439\u043A\u043B\u043C\u043D\u043E" +
++ "\u043F\u0440\u0441\u0442\u0443\u0444\u0445\u0446" +
++ "\u0447\u0448\u0449\u044A\u044B\u044C\u044D\u044E" +
++ "\u044F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\u2170\u2171\u2172\u2173\u2174\u2175\u2176" +
++ "\u2177\u2178\u2179\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\u0410\u0411\u0412\u0413\u0414\u0415\u0401\u0416" +
++ "\u0417\u0418\u0419\u041A\u041B\u041C\u041D\u041E" +
++ "\u041F\u0420\u0421\u0422\u0423\u0424\u0425\u0426" +
++ "\u0427\u0428\u0429\u042A\u042B\u042C\u042D\u042E" +
++ "\u042F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\u2160\u2161\u2162\u2163\u2164\u2165\u2166" +
++ "\u2167\u2168\u2169\uFFFD\uFFFD\uFFFD\uFFFD" ,
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFE1\uFF0E\uFF1C\uFF08\uFF0B\uFF5C" +
++ "\uFF06\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFF01\uFFE5\uFF0A\uFF09\uFF1B\uFFE2" +
++ "\uFF0D\uFF0F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFE4\uFF0C\uFF05\uFF3F\uFF1E\uFF1F" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFF40\uFF1A\uFF03\uFF20\uFF07\uFF1D\uFF02" +
++ "\uFFFD\uFF41\uFF42\uFF43\uFF44\uFF45\uFF46\uFF47" +
++ "\uFF48\uFF49\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFF4A\uFF4B\uFF4C\uFF4D\uFF4E\uFF4F\uFF50" +
++ "\uFF51\uFF52\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFE3\uFF53\uFF54\uFF55\uFF56\uFF57\uFF58" +
++ "\uFF59\uFF5A\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFF5B\uFF21\uFF22\uFF23\uFF24\uFF25\uFF26\uFF27" +
++ "\uFF28\uFF29\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFF5D\uFF2A\uFF2B\uFF2C\uFF2D\uFF2E\uFF2F\uFF30" +
++ "\uFF31\uFF32\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFF04\uFFFD\uFF33\uFF34\uFF35\uFF36\uFF37\uFF38" +
++ "\uFF39\uFF3A\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFF10\uFF11\uFF12\uFF13\uFF14\uFF15\uFF16\uFF17" +
++ "\uFF18\uFF19\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
++ "\uFFFD\u3002\u300C\u300D\u3001\u30FB\u30F2\u30A1" +
++ "\u30A3\u30A5\uFFE0\u2220\u22A5\u2312\u2202\u2207" +
++ "\uFFFD\u30A7\u30A9\u30E3\u30E5\u30E7\u30C3\u30EE" +
++ "\u30FC\u30F5\u30F6\u2261\u2252\u226A\u226B\u221A" +
++ "\u223D\u221D\u222B\u222C\u2208\u220B\u2286\u2287" +
++ "\u2282\u2283\u222A\u2229\u2227\u2228\u21D2\u21D4" +
++ "\u2200\u2203\u212B\u2030\u266F\u266D\u266A\u2020" +
++ "\u2021\u00B6\u25EF\uFFFD\u2500\u2502\u250C\u2510" +
++ "\uFFFD\u30A2\u30A4\u30A6\u30A8\u30AA\u30AB\u30AD" +
++ "\u30AF\u30B1\u30B3\uFFFD\u30B5\u30B7\u30B9\u30BB" +
++ "\u30BD\u30BF\u30C1\u30C4\u30C6\u30C8\u30CA\u30CB" +
++ "\u30CC\u30CD\u30CE\uFFFD\uFFFD\u30CF\u30D2\u30D5" +
++ "\uFFFD\uFF5E\u30D8\u30DB\u30DE\u30DF\u30E0\u30E1" +
++ "\u30E2\u30E4\u30E6\uFFFD\u30E8\u30E9\u30EA\u30EB" +
++ "\u2518\u2514\u251C\u252C\u2524\u2534\u253C\u2501" +
++ "\u2503\u250F\u30EC\u30ED\u30EF\u30F3\u309B\u309C" +
++ "\u30AC\u30AE\u30B0\u30B2\u30B4\u30B6\u30B8\u30BA" +
++ "\u30BC\u30BE\u30C0\u30C2\u30C5\u30C7\u30C9\u30D0" +
++ "\u30D3\u30D6\u30D9\u30DC\u30F4\u30D1\u30D4\u30D7" +
++ "\u30DA\u30DD\u30F0\u30F1\u30FD\u30FE\uFFFD\uFFFD" +
++ "\uFF3C\u2513\u251B\u2517\u2523\u2533\u252B\u253B" +
++ "\u254B\u2520\u252F\u2528\u2537\u253F\u251D\u2530" +
++ "\u2525\u2538\u2542\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
++ "\uFFFD\uFFFD\u300E\u300F\uFF3B\uFF3D\u3092\u3041" +
++ "\u3043\u3045\u2015\u00B1\u2260\u221E\u2103\uFFFD" +
++ "\u00B4\u3047\u3049\u3083\u3085\u3087\u3063\u308E" +
++ "\uFFFD\uFFFD\u2010\u3003\u4EDD\u3005\u3006\u3007" +
++ "\u00A8\u2018\u201C\u3014\u3008\u300A\u3010\u2266" +
++ "\u2234\u2642\u00A7\u203B\u3012\u3231\u2116\u2121" +
++ "\uFF3E\u2019\u201D\u3015\u3009\u300B\u3011\u2267" +
++ "\u2235\u2640\u00D7\u00F7\u2225\u3013\u2025\u2026" +
++ "\uFFFD\u3042\u3044\u3046\u3048\u304A\u304B\u304D" +
++ "\u304F\u3051\u3053\uFFFD\u3055\u3057\u3059\u305B" +
++ "\u305D\u305F\u3061\u3064\u3066\u3068\u306A\u306B" +
++ "\u306C\u306D\u306E\uFFFD\uFFFD\u306F\u3072\u3075" +
++ "\uFFFD\uFFFD\u3078\u307B\u307E\u307F\u3080\u3081" +
++ "\u3082\u3084\u3086\uFFFD\u3088\u3089\u308A\u308B" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\u308C\u308D\u308F\u3093\uFFFD\uFFFD" +
++ "\u304C\u304E\u3050\u3052\u3054\u3056\u3058\u305A" +
++ "\u305C\u305E\u3060\u3062\u3065\u3067\u3069\u3070" +
++ "\u3073\u3076\u3079\u307C\uFFFD\u3071\u3074\u3077" +
++ "\u307A\u307D\u3090\u3091\u309D\u309E\uFFFD\uFFFD" +
++ "\u25CB\u25CF\u25B3\u25B2\u25CE\u2606\u2605\u25C7" +
++ "\u25C6\u25A1\u25A0\u25BD\u25BC\u00B0\u2032\u2033" +
++ "\u2192\u2190\u2191\u2193\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
++ "\uFFFD\u4E00\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03" +
++ "\u516B\u4E5D\u5341\u767E\u5343\u4E07\u5104\u90FD" +
++ "\u9053\u5E9C\u770C\u5E02\u533A\u753A\u6751\u6771" +
++ "\u897F\u5357\u5317\u5927\u4E2D\u5C0F\u4E0A\u4E0B" +
++ "\u5E74\u6708\u65E5\u7530\u5B50\u5C71\u672C\u5DDD" +
++ "\u85E4\u91CE\u5DE5\u696D\u6728\u4E95\u90CE\u5CF6" +
++ "\u96C4\u9AD8\u5CA1\u592B\u539F\u4EAC\u4F50\u6B63" +
++ "\u677E\u6A5F\u548C\u88FD\u7537\u7F8E\u5409\u5D0E" +
++ "\u77F3\u8C37\u96FB\u9577\u6CBB\u6CA2\u91D1\u65B0" +
++ "\u53E3\u6A4B\u4E45\u798F\u6240\u5E73\u5185\u56FD" +
++ "\u5316\u962A\u5BAE\u4EBA\u4F5C\u90E8\u6E05\u6B21" +
++ "\u7FA9\u751F\u4EE3\u51FA\u6C34\u68EE\u5149\u52A0" +
++ "\u5408\u795E\u6797\u91CD\u884C\u4FE1\u660E\u6D77" +
++ "\u5B89\u5E78\u4FDD\u592A\u5BCC\u6C5F\u9234\u524D" +
++ "\u77E5\u6B66\u4F0A\u662D\u5206\u52DD\u7528\u5E83" +
++ "\u9020\u6C17\u6210\u898B\u5229\u4F1A\u5B66\u5CA9" +
++ "\u7523\u9593\u5730\u81EA\u826F\u95A2\u611B\u653F" +
++ "\u5C3E\u8A08\u6587\u624B\u7236\u65B9\u4E8B\u6238" +
++ "\u54C1\u559C\u6E21\u5F18\u53E4\u8FBA\u5009\u9244" +
++ "\u4E4B\u5834\u6D0B\u57CE\u6D25\u7ACB\u5EA6\u5348" +
++ "\u4ECA\u5F66\u8A2D\u901A\u52D5\u5F8C\u5948\u5B9A" +
++ "\u6C60\u5C4B\u6D5C\u7406\u5742\u5B9F\u82F1\u7684" +
++ "\u53F8\u79C0\u6A2A\u540D\u5B5D\u7AF9\u535A\u529B" +
++ "\u5EAB\u8449\u6804\u6C38\u5668\u7389\u591A" ,
++ "\uFFFD\u8CC0\u771F\u6075\u9759\u5186\u8302\u654F" +
++ "\u8C4A\u5175\u6CD5\u767A\u9752\u5897\u6599\u5FE0" +
++ "\u8CC7\u6642\u7269\u8ECA\u5FB3\u8981\u5BFE\u585A" +
++ "\u79CB\u767D\u6CB3\u702C\u6CB9\u9686\u8535\u5F53" +
++ "\u4FCA\u5FD7\u6625\u793E\u99AC\u5165\u5EFA\u6839" +
++ "\u6749\u9032\u8208\u6D66\u7CBE\u540C\u6027\u7C73" +
++ "\u8005\u52A9\u679D\u8FD1\u76F4\u76EE\u6765\u753B" +
++ "\u76F8\u9ED2\u4E38\u8239\u7531\u58EB\u7B2C\u718A" +
++ "\u7D19\u5065\u68B0\u82B3\u571F\u6709\u5BB6\u7DDA" +
++ "\u7D4C\u8ABF\u5929\u671F\u7F6E\u6D45\u6589\u5F0F" +
++ "\u5F62\u9762\u7A2E\u8F38\u5916\u5143\u4F53\u9E7F" +
++ "\u5FA1\u5973\u5EB7\u4E16\u52C7\u5800\u597D\u5150" +
++ "\u5BFA\u92FC\u7279\u57FC\u9054\u5411\u53D6\u7B49" +
++ "\u667A\u56DE\u9580\u904B\u5099\u601D\u963F\u4E0D" +
++ "\u9808\u5168\u5BFF\u5584\u677F\u98EF\u8C9E\u73FE" +
++ "\u98DF\u7D44\u985E\u516C\u6750\u9999\u5546\u7D50" +
++ "\u8868\u77E2\u6F5F\u79C1\u5236\u90A6\u6CBC\u7CF8" +
++ "\u5B8F\u7B56\u6CE2\u54E1\u6570\u958B\u6E96\u6A39" +
++ "\u8CBB\u660C\u5F37\u7814\u53CB\u5B87\u82E5\u83CA" +
++ "\u6301\u82B1\u5F15\u7D00\u8352\u5225\u4FEE\u8D8A" +
++ "\u4F4F\u85AC\u6BDB\u9060\u554F\u5965\u578B\u5FC3" +
++ "\u767B\u65E9\u67F3\u6D69\u8CEA\u52D9\u6CC9\u5E38" +
++ "\u5B88\u57FA\u7BA1\u6CF0\u4F38\u6700\u4EE5\u6B4C" +
++ "\u88D5\u8D64\u8DB3\u898F\u6D41\u8AA0\u6607" ,
++ "\uFFFD\u5DDE\u7167\u5869\u9001\u96C5\u672B\u54F2" +
++ "\u5CB8\u4E5F\u5C90\u521D\u8328\u5247\u6BD4\u80FD" +
++ "\u8A71\u6295\u8EE2\u83C5\u9023\u4ED6\u6C11\u7D66" +
++ "\u9152\u7E41\u4FA1\u6E80\u671D\u4ED8\u6761\u7121" +
++ "\u8003\u697D\u4E3B\u610F\u6226\u5207\u5264\u7247" +
++ "\u7D30\u6E08\u7A32\u5E03\u91CC\u5C5E\u7AE0\u5909" +
++ "\u4F55\u685C\u5F7C\u67FB\u76CA\u58F2\u4EC1\u6DF1" +
++ "\u53F0\u9CE5\u9DB4\u652F\u6574\u89D2\u5609\u5473" +
++ "\u885B\u8B70\u5727\u7387\u8DEF\u706B\u961C\u8F1D" +
++ "\u70B9\u4E0E\u6E1B\u7551\u9280\u7A7A\u4EA4\u7FBD" +
++ "\u534A\u53CE\u592E\u7DCF\u8A18\u6674\u69CB\u969B" +
++ "\u6885\u5370\u8A00\u6817\u8EAB\u66F8\u514B\u7D20" +
++ "\u96C6\u7BC0\u5148\u6EDD\u6C7A\u6559\u7D14\u67F4" +
++ "\u63A5\u661F\u7740\u7559\u6620\u5DF1\u754C\u5177" +
++ "\u656C\u7FA4\u9806\u5171\u6D3B\u91CF\u6307\u89E3" +
++ "\u5BA4\u679C\u5404\u671B\u9632\u7D04\u61B2\u967D" +
++ "\u4E80\u56F3\u4E88\u8272\u7A0E\u690D\u53EF\u6052" +
++ "\u4F4D\u5178\u5FC5\u7D9A\u6025\u5728\u57A3\u541B" +
++ "\u5EF6\u5D8B\u4F01\u6803\u670D\u71B1\u5272\u5354" +
++ "\u6B69\u53F2\u512A\u658E\u623F\u5B97\u683C\u8FB0" +
++ "\u7B20\u5712\u8AF8\u8107\u5553\u8CE2\u5F25\u98A8" +
++ "\u5F97\u6613\u6253\u982D\u65ED\u6BB5\u52E2\u7136" +
++ "\u56E3\u984D\u843D\u914D\u7A0B\u8FBB\u543E\u611F" +
++ "\u5BDB\u53CD\u7A14\u9700\u6E90\u6C96\u984C" ,
++ "\uFFFD\u8FBC\u8349\u7B97\u76DB\u8FB2\u90A3\u7701" +
++ "\u69D8\u6BBF\u5C11\u4ECB\u53D7\u97F3\u7DE8\u59D4" +
++ "\u5E84\u4FC2\u72B6\u793A\u5E97\u5A9B\u682A\u6ECB" +
++ "\u68A8\u7E04\u53F3\u5DE6\u53CA\u9078\u5C45\u60C5" +
++ "\u7DF4\u70AD\u9928\u9271\u6A21\u6B8A\u7E3E\u4E9C" +
++ "\u7E4A\u4EF2\u5857\u6D88\u8853\u691C\u6717\u5B85" +
++ "\u529F\u5C1A\u8CBF\u60A6\u8102\u7BE0\u4F73\u7D21" +
++ "\u51A8\u6851\u78BA\u7267\u4E26\u5024\u89B3\u8CB4" +
++ "\u7DAD\u7D71\u5BBF\u4E21\u7CD6\u89AA\u9332\u6F84" +
++ "\u65BD\u5BB9\u98DB\u5C40\u7950\u904E\u6C0F\u6539" +
++ "\u76E4\u7A4D\u6E0B\u5DFB\u6DF3\u5FDC\u4E89\u8ECD" +
++ "\u88C5\u9178\u7E54\u67D3\u5E1D\u7DBF\u7C89\u822A" +
++ "\u7532\u5468\u4ED9\u5F85\u4F4E\u7DD1\u8EFD\u9EBB" +
++ "\u6176\u52B4\u78EF\u4E39\u80B2\u9650\u5C0E\u653E" +
++ "\u6643\u5EA7\u4EF6\u60F3\u9A13\u4ED5\u4F7F\u8F2A" +
++ "\u9854\u756A\u5F35\u805E\u4F9B\u6E6F\u6EB6\u6821" +
++ "\u9285\u92F3\u878D\u9756\u5199\u5B8C\u6E2F\u935B" +
++ "\u591C\u5145\u9F8D\u7DB1\u83F1\u901F\u52C9\u5237" +
++ "\u8D77\u6469\u53C2\u55B6\u7A42\u63A8\u8FD4\u8077" +
++ "\u6B62\u4F1D\u5E79\u7403\u6A29\u5C55\u5E61\u845B" +
++ "\u5EAD\u975E\u53F7\u5358\u6B73\u62E1\u51E6\u8A9E" +
++ "\u6628\u57DF\u6DF5\u518D\u50CD\u79D1\u9B5A\u7AEF" +
++ "\u9014\u6848\u5B57\u8AD6\u517C\u53C8\u632F\u6280" +
++ "\u5FB9\u672D\u7CFB\u5F93\u51B7\u614B\u5CF0" ,
++ "\uFFFD\u5931\u539A\u5074\u6CE8\u6E2C\u9803\u4E57" +
++ "\u8A66\u576A\u8429\u515A\u6C7D\u5B9D\u606D\u6A0B" +
++ "\u6E29\u6577\u8AAC\u82B8\u544A\u6B74\u822C\u98FE" +
++ "\u793C\u5C06\u96E3\u7802\u5224\u5F79\u5F71\u66FD" +
++ "\u5E2F\u9678\u938C\u8AC7\u5F70\u60AA\u6A19\u7533" +
++ "\u5BB3\u6BCD\u88DC\u5E4C\u58F0\u9664\u7B39\u5A66" +
++ "\u4E7E\u7AF6\u829D\u725B\u8CB7\u79FB\u785D\u8336" +
++ "\u52B9\u990A\u52F2\u80A5\u8B19\u7089\u590F\u5802" +
++ "\u67CF\u6255\u5E30\u713C\u786B\u8001\u7A76\u5BE9" +
++ "\u91DD\u65AD\u5C04\u5DEE\u5D50\u6298\u8010\u5BA3" +
++ "\u59CB\u5F8B\u6B8B\u666F\u8C61\u90F7\u5353\u96E2" +
++ "\u85AB\u6B7B\u8015\u64CD\u4EAE\u4E91\u90E1\u52E4" +
++ "\u6C42\u8CAB\u5B98\u59BB\u88CF\u773C\u4F2F\u7AAF" +
++ "\u7BC9\u968E\u63DB\u6842\u99C5\u68B6\u5747\u8CA1" +
++ "\u547D\u738B\u84B2\u90C1\u78E8\u7B11\u66F2\u6975" +
++ "\u5831\u63D0\u8A3C\u96EA\u9055\u88C1\u9996\u75C5" +
++ "\u6850\u4F59\u74E6\u4EE4\u5439\u732A\u672A\u525B" +
++ "\u8CA0\u4F34\u5100\u542B\u9069\u8FC4\u5C3B\u5DCC" +
++ "\u7B54\u8FFD\u8A0E\u4E08\u925B\u71C3\u8AB2\u70BA" +
++ "\u9662\u679A\u76AE\u8B77\u7DBE\u96E8\u6211\u5BC4" +
++ "\u837B\u62BC\u7D0D\u76E3\u7E2B\u964D\u572D\u7ADC" +
++ "\u7BC4\u6BBA\u8C9D\u698E\u9047\u6F14\u5360\u8FEB" +
++ "\u5287\u624D\u6566\u7D1A\u7D42\u6BCE\u7D79\u7E2E" +
++ "\u666E\u7965\u500B\u5C02\u99D2\u8A55\u7560" ,
++ "\uFFFD\u5B58\u8089\u50BE\u5E2B\u6DB2\u4F8B\u81E3" +
++ "\u81F3\u56E0\u7D99\u5DF2\u899A\u6E9D\u6D17\u8AAD" +
++ "\u8996\u731B\u5DE8\u7DB2\u888B\u4EFB\u5BC6\u8896" +
++ "\u6CC1\u8457\u8F03\u6BC5\u97FF\u8CA9\u5E45\u82E6" +
++ "\u63AA\u5F81\u78C1\u821E\u52AA\u7AAA\u5999\u6297" +
++ "\u8F14\u7FD2\u4FC3\u54C9\u967A\u66F4\u8B1B\u5E72" +
++ "\u5FA9\u8A2A\u6D3E\u7763\u6483\u8B58\u614E\u5A5A" +
++ "\u8D85\u71D0\u983C\u72E9\u583A\u5DFE\u8A8D\u67C4" +
++ "\u7DE0\u4F11\u77ED\u4F0F\u5BC5\u629C\u5C3C\u533B" +
++ "\u6DC0\u81FC\u96D1\u904A\u6D6E\u93E1\u5C64\u98FC" +
++ "\u524A\u6DFB\u8584\u968A\u56FA\u5883\u7766\u9805" +
++ "\u4E73\u8C46\u8A31\u7DD2\u8FF0\u6D6A\u4F9D\u6B6F" +
++ "\u6B27\u62C5\u511F\u9769\u5374\u9AA8\u6775\u887F" +
++ "\u5305\u7570\u8D70\u864E\u5CEF\u8CDE\u5FF5\u725F" +
++ "\u7686\u609F\u80CC\u59EB\u8131\u5E0C\u8A17\u9676" +
++ "\u82D7\u74B0\u84B8\u50D5\u96F2\u7248\u7834\u6DD1" +
++ "\u6E09\u67FF\u6F54\u5915\u500D\u72AC\u9EC4\u7B46" +
++ "\u9B3C\u6563\u53BB\u8A98\u91DC\u9818\u6FC3\u65C5" +
++ "\u501F\u7F8A\u6F64\u9031\u5F3E\u63F4\u9038\u8B66" +
++ "\u7BE4\u7206\u6843\u72EC\u65CF\u82A6\u5BA2\u6960" +
++ "\u9EA6\u52DF\u6790\u639B\u7D75\u9855\u5DF3\u5805" +
++ "\u8ACB\u95A3\u8863\u8CA8\u5B63\u5E8A\u5449\u786C" +
++ "\u7D2B\u8CA2\u5352\u7D76\u8CB8\u7070\u547C\u6545" +
++ "\u6676\u73B2\u56F2\u7BB1\u58A8\u7A81\u66AE" ,
++ "\uFFFD\u8087\u59FF\u8840\u56F0\u7B51\u6DF7\u5F01" +
++ "\u934B\u9000\u4FE3\u675F\u4FBF\u8CC3\u526F\u63A1" +
++ "\u5442\u8907\u698A\u5E2D\u5A18\u7518\u514D\u5E7E" +
++ "\u50B5\u5BDD\u68D2\u745E\u69FB\u5FAE\u55E3\u8A70" +
++ "\u5BF8\u5824\u8358\u5F13\u5E95\u706F\u751A\u7D05" +
++ "\u60E3\u7E70\u5012\u5238\u83EF\u5373\u5F31\u6A2B" +
++ "\u9CF4\u53CC\u6D32\u4EAB\u4E92\u842C\u8A8C\u65E2" +
++ "\u6F01\u80A9\u9DF9\u8B72\u7B52\u9589\u6D74\u63A2" +
++ "\u6590\u5BD2\u6319\u8AB0\u76DF\u99A8\u7A74\u8236" +
++ "\u8846\u8061\u6557\u5922\u9644\u88AB\u9326\u7B4B" +
++ "\u62B5\u5371\u5E81\u5BDF\u4F75\u58C1\u7058\u7DCA" +
++ "\u5438\u73E0\u52D8\u5208\u78D0\u6B23\u6838\u4E43" +
++ "\u690E\u8377\u6ED1\u98F2\u8170\u8857\u8EF8\u798E" +
++ "\u83DC\u8FCE\u7E01\u5510\u4EA8\u8A33\u9162\u5EFB" +
++ "\u606F\u4E86\u664B\u6368\u5217\u8056\u51FD\u7642" +
++ "\u821F\u9685\u50CF\u662F\u4F3C\u4E59\u6A3D\u4E71" +
++ "\u523A\u8ACF\u6A58\u66FF\u670B\u653B\u9732\u5EC3" +
++ "\u8A13\u5782\u604B\u866B\u95D8\u60A9\u4E01\u63CF" +
++ "\u6FC0\u659C\u8CAC\u8305\u7CA7\u6050\u96F7\u5FCD" +
++ "\u640D\u5B54\u900F\u62D3\u59B9\u7159\u51AC\u79F0" +
++ "\u552F\u5275\u6697\u80F8\u4E98\u4ECF\u51CD\u9D5C" +
++ "\u5144\u7A93\u67F1\u5841\u7C21\u8861\u5C31\u68DA" +
++ "\u91E7\u9DF2\u63EE\u6575\u84EE\u523B\u6B32\u7C98" +
++ "\u5982\u969C\u8987\u7C9F\u9006\u62DB\u66DC" ,
++ "\uFFFD\u6355\u6982\u50AC\u623B\u5FD8\u63DA\u75DB" +
++ "\u627F\u616E\u8266\u7C95\u716E\u96C7\u7F6A\u5426" +
++ "\u5200\u83D3\u5211\u594F\u9D28\u574A\u66C7\u9858" +
++ "\u820E\u6614\u733F\u50B7\u6551\u5EB8\u5B6B\u55AC" +
++ "\u5FEB\u6388\u8CAF\u676F\u5951\u5A01\u71E5\u5DE3" +
++ "\u8C6A\u6271\u81F4\u5C3A\u5F92\u9045\u7384\u7149" +
++ "\u79D8\u796D\u9003\u83CC\u5FB4\u5B8D\u6279\u64AE" +
++ "\u7D18\u723E\u5BEE\u65E7\u8D08\u9E78\u52E7\u5D07" +
++ "\u9F62\u6069\u536F\u6681\u9663\u5E3D\u62B1\u722A" +
++ "\u6E4A\u93AE\u79E6\u53E5\u809D\u88FE\u53B3\u6C88" +
++ "\u6E7F\u5141\u9091\u6F6E\u84C4\u85EA\u8129\u6BD2" +
++ "\u663C\u7F72\u73C2\u5F1F\u790E\u60B2\u72ED\u58EE" +
++ "\u8179\u8E8D\u5C65\u5DE7\u6C37\u6DE1\u862D\u72AF" +
++ "\u8E0A\u7C92\u8218\u8033\u63A7\u9291\u5019\u8155" +
++ "\u8A69\u8EDF\u66B4\u8133\u7591\u6B20\u6669\u90F5" +
++ "\u4E32\u73EA\u693F\u7687\u707D\u7D3A\u6148\u8607" +
++ "\u99FF\u59C9\u7832\u7815\u907F\u80A1\u5C3F\u66A2" +
++ "\u9418\u6D44\u5E55\u5854\u7B95\u8DE1\u4EA1\u8C5A" +
++ "\u81E8\u89E6\u9670\u5263\u74F6\u9A5A\u6012\u520A" +
++ "\u7434\u9801\u907A\u5504\u7956\u5230\u54B2\u8A34" +
++ "\u96A3\u4FF3\u9283\u91E3\u7D39\u9688\u4F51\u7D61" +
++ "\u5DBA\u9BAE\u5F80\u795D\u8597\u8DA3\u7C60\u5C0A" +
++ "\u7565\u85A9\u63D6\u9E97\u7D22\u5375\u9AEA\u9042" +
++ "\u6B3D\u7D0B\u6392\u80AA\u7DE9\u9F3B\u99C6" ,
++ "\uFFFD\u6D78\u6731\u5531\u6398\u7825\u5CB3\u5DE1" +
++ "\u92AD\u98FD\u9810\u6CE3\u6B64\u5321\u6B53\u5E8F" +
++ "\u7AE5\u502B\u6E56\u62BD\u8276\u6A9C\u4E18\u57F7" +
++ "\u752B\u7C97\u82EB\u9802\u811A\u73CD\u8F9B\u5C0B" +
++ "\u63E1\u7372\u8150\u80E1\u5B99\u76D7\u6291\u65EC" +
++ "\u8A3A\u5947\u65E8\u6E7E\u6696\u55AB\u8F09\u92ED" +
++ "\u9396\u4EEE\u755C\u6F38\u8F9E\u7981\u5C01\u62E0" +
++ "\u9BE8\u91C8\u6276\u65CB\u8E0F\u8B21\u699B\u6216" +
++ "\u5A92\u90B8\u50DA\u79DF\u6C41\u5270\u9175\u8B39" +
++ "\u685D\u5875\u819C\u5B9C\u8A89\u8A72\u9D8F\u6377" +
++ "\u5974\u8AA4\u52B1\u6962\u5C48\u9CE9\u673A\u75B2" +
++ "\u6D1E\u4F0D\u7E6D\u7B48\u7FCC\u65E6\u59A5\u79E9" +
++ "\u6212\u6EDE\u770B\u8CA7\u65BC\u885D\u6ADB\u5C4A" +
++ "\u8074\u9084\u8ECC\u65D7\u57F9\u708E\u6F06\u5E7C" +
++ "\u77AC\u4FF5\u5949\u81ED\u9B45\u7FFC\u8178\u69FD" +
++ "\u6CCA\u69C7\u79D2\u8B1D\u9ED9\u81D3\u7A3C\u7968" +
++ "\u6F5C\u63B2\u8DDD\u6383\u6E9C\u5E33\u61F8\u76BF" +
++ "\u642C\u7DB4\u6247\u6458\u6816\u5F69\u9022\u7A1A" +
++ "\u82B9\u70C8\u9A12\u6163\u6FEF\u53EB\u9D3B\u62FE" +
++ "\u60A0\u9591\u6D99\u6162\u9298\u635C\u9707\u8972" +
++ "\u683D\u51E1\u9B54\u608C\u5B22\u99C4\u7126\u8A73" +
++ "\u971C\u7396\u67D4\u60A3\u4E11\u4EF0\u8CDB\u8CB0" +
++ "\u7912\u9774\u8986\u5146\u57DC\u99D0\u80C3\u8338" +
++ "\u78A7\u86CD\u7F85\u5049\u8247\u690B\u7C4D" ,
++ "\uFFFD\u53EA\u5F26\u6E25\u6881\u9375\u5DFD\u5347" +
++ "\u9727\u643A\u75C7\u6FA4\u73A9\u77E9\u9451\u8B5C" +
++ "\u808C\u674E\u4EAD\u582F\u7573\u8ED2\u6CE5\u9320" +
++ "\u8FF7\u7D33\u72C2\u8217\u7422\u82C5\u9A30\u773A" +
++ "\u5F84\u9673\u64AD\u920D\u74DC\u60C7\u86ED\u4FFA" +
++ "\u52A3\u6A3A\u7720\u5320\u61B6\u5674\u8776\u6CBF" +
++ "\u505C\u602A\u8466\u6B96\u6DBC\u97D3\u968F\u6876" +
++ "\u60D1\u5378\u64A4\u51A0\u9154\u5DF4\u629E\u5E63" +
++ "\u929A\u7693\u6C5A\u6597\u50E7\u7C82\u5F6B\u6CE1" +
++ "\u5F6C\u5AC1\u6F2C\u852D\u6442\u5750\u58C7\u8CFC" +
++ "\u8A5E\u7A7F\u689D\u7E26\u7A40\u7344\u8AEB\u4FD7" +
++ "\u7A63\u8036\u7DEF\u80C6\u8AED\u731F\u8FEA\u4F0E" +
++ "\u758B\u518A\u6734\u5FD9\u61C7\u65AF\u9CF3\u5ECA" +
++ "\u9262\u68DF\u6CB8\u80F4\u57CB\u6C99\u96A0\u5B64" +
++ "\u58F1\u68C4\u5410\u982C\u8A87\u4E5E\u6167\u9BAB" +
++ "\u90AA\u55B0\u82BD\u596A\u66F3\u8299\u5893\u719F" +
++ "\u6284\u67D1\u9063\u5ACC\u6C57\u7CE7\u5851\u64B2" +
++ "\u58CA\u830E\u5968\u5302\u5A46\u8702\u6065\u72D9" +
++ "\u89A7\u6689\u66F9\u5D6F\u5BB0\u96BC\u636E\u60DC" +
++ "\u7948\u51DD\u8606\u5EC9\u7554\u596E\u6B04\u4F43" +
++ "\u7B94\u67DA\u62DD\u628A\u971E\u62ED\u6EC5\u508D" +
++ "\u67B6\u80E4\u9EBF\u5EB5\u638C\u85CD\u9867\u52C5" +
++ "\u6016\u68CB\u61D0\u5751\u8F29\u5FAA\u81A8\u7D62" +
++ "\u71C8\u54C0\u69CC\u6B3E\u65AC\u63C3\u4F46" ,
++ "\uFFFD\u7B1B\u6B86\u88F8\u5203\u732E\u6687\u7D17" +
++ "\u57F4\u570F\u618E\u970A\u7C3F\u8B00\u7881\u8CE0" +
++ "\u548B\u7B87\u745B\u7C11\u8870\u5398\u5448\u6CF3" +
++ "\u6F22\u53F6\u88B4\u5301\u7A6B\u8695\u586B\u5D29" +
++ "\u88C2\u62D2\u4E1E\u5036\u96C0\u7363\u8A3B\u5176" +
++ "\u7199\u7FE0\u8888\u7E1E\u4E4F\u84CB\u6F2B\u5859" +
++ "\u936C\u53E9\u865A\u9149\u86EF\u5E06\u5507\u902E" +
++ "\u6795\u846C\u5BA5\u82A5\u8431\u6D8C\u63FA\u4EA5" +
++ "\u51C6\u6328\u7F70\u5B5F\u5DBD\u99C8\u53EC\u7985" +
++ "\u8A54\u7962\u88DF\u5B09\u4FB5\u4F91\u9B8E\u5192" +
++ "\u96F0\u6DAF\u622F\u8490\u8CDC\u5075\u5CE0\u4E14" +
++ "\u4F83\u7C54\u84D1\u77B3\u8AEE\u5CE8\u62F6\u663B" +
++ "\u8A93\u8526\u8A95\u65FA\u6714\u53D4\u62AB\u8CE6" +
++ "\u88F3\u5BE7\u868A\u668E\u582A\u6170\u696F\u9F13" +
++ "\u7A92\u7893\u6A7F\u9017\u9266\u7D10\u7BC7\u6EF4" +
++ "\u821C\u5C3D\u62CD\u85C1\u6F02\u6E67\u6691\u85A6" +
++ "\u637A\u821B\u4F8D\u5091\u8A02\u62EC\u9BC9\u7A3D" +
++ "\u7C9B\u50C5\u9019\u708A\u7C8B\u64EC\u665F\u6562" +
++ "\u732B\u5339\u67A0\u55A7\u6D2A\u7A3F\u64E6\u79A7" +
++ "\u67D8\u7B26\u96BB\u6311\u72A0\u5C6F\u7026\u97EE" +
++ "\u60DF\u8AFE\u8B04\u8494\u9BD6\u82AF\u932C\u6606" +
++ "\u9640\u5BC2\u86C7\u7949\u8017\u6919\u7092\u963B" +
++ "\u7C7E\u59D3\u5B5C\u7D1B\u91D8\u6A80\u85E9\u6905" +
++ "\u6C93\u502D\u4EA6\u7FC1\u61A4\u8CCA\u9665" ,
++ "\uFFFD\u93D1\u53F1\u598A\u8EAC\u62D8\u6867\u71D5" +
++ "\u7B67\u504F\u67D0\u82D1\u978D\u748B\u80BA\u7336" +
++ "\u514E\u8105\u90CA\u584A\u67FE\u6FF1\u5FFD\u76C6" +
++ "\u9A0E\u507D\u9694\u5EF7\u7BB8\u904D\u6C4E\u85FB" +
++ "\u819D\u67AF\u564C\u5606\u8C8C\u56DA\u73ED\u8CC4" +
++ "\u8FC5\u96F6\u6C50\u8944\u8F3F\u7D5E\u60E8\u72FC" +
++ "\u7D9C\u8463\u5CFB\u5446\u5D16\u6CA1\u81B3\u58FA" +
++ "\u5BB4\u8108\u541F\u8CBC\u6182\u78A9\u6FE1\u91A4" +
++ "\u76F2\u6020\u76FE\u84C9\u7F36\u4EC7\u755D\u7A17" +
++ "\u84EC\u75F4\u4F3A\u676D\u7460\u62F3\u6F20\u79E4" +
++ "\u87F9\u6094\u6234\u66AB\u820C\u8499\u723A\u5FCC" +
++ "\u6109\u70CF\u7261\u7A50\u5098\u9AED\u5D69\u601C" +
++ "\u6667\u99B4\u5E7B\u643E\u5830\u53C9\u7A9F\u990C" +
++ "\u9B42\u8F5F\u7AAE\u5B9B\u68A2\u6249\u7984\u9DFA" +
++ "\u5451\u932F\u8AC4\u5F90\u8DF3\u5A2F\u80DE\u6D29" +
++ "\u7A4F\u84BC\u9D2B\u9010\u6D38\u916A\u6FC1\u9905" +
++ "\u6BBB\u5EB6\u91B8\u5076\u6F0F\u4E19\u540F\u9675" +
++ "\u6C72\u51B4\u5631\u9F20\u66A6\u5F0A\u75AB\u51F8" +
++ "\u674F\u8DF5\u6C70\u8A6B\u757F\u5CAC\u6841\u8CD3" +
++ "\u9BDB\u8475\u6893\u840C\u72DB\u7577\u8568\u783A" +
++ "\u847A\u5F10\u831C\u6813\u6E1A\u9DAF\u51F9\u7980" +
++ "\u4E99\u5EE3\u908A\u80AF\u59A8\u77DB\u8D74\u8A1F" +
++ "\u673D\u533F\u8A0A\u5618\u6756\u53D9\u4F10\u7409" +
++ "\u5A41\u4FF8\u79B0\u9838\u8E2A\u9D60\u8F44" ,
++ "\uFFFD\u65A5\u75BE\u906D\u867B\u60BC\u51B6\u5937" +
++ "\u7D2F\u916C\u69AE\u7CE0\u792A\u5D14\u64C1\u58EC" +
++ "\u589C\u8D66\u66D9\u61F2\u912D\u6E58\u9435\u965B" +
++ "\u7272\u5F6A\u5E9A\u8F1B\u5B95\u5C39\u9013\u834F" +
++ "\u7CCE\u620A\u90ED\u691B\u6E15\u65DB\u66FE\u4E9F" +
++ "\u55AA\u7A83\u83E9\u8B83\u846D\u83F0\u7F50\u918D" +
++ "\u9190\u758E\u95A5\u81E7\u75E2\u61A9\u8A50\u95B2" +
++ "\u53A8\u59F6\u9813\u7891\u7C17\u6B3A\u57E0\u620E" +
++ "\u83D6\u8AD2\u75D4\u927E\u59DC\u5289\u9087\u6FFE" +
++ "\u7473\u5C09\u9D6C\u84FC\u7CDF\u7BAD\u8A6E\u594E" +
++ "\u56A2\u819A\u7947\u6636\u53E1\u7887\u58CC\u9397" +
++ "\u6E13\u5256\u828B\u9E9F\u9583\u658C\u9E93\u7345" +
++ "\u6E26\u9D07\u5983\u7DAC\u96C1\u61BE\u6762\u9ECE" +
++ "\u90A8\u9187\u9F0E\u7C38\u51F1\u8599\u524C\u540E" +
++ "\u7901\u655E\u6668\u5CE1\u7566\u76C8\u8679\u531D" +
++ "\u5506\u7926\u8912\u77EF\u7CC0\u570B\u515C\u7E8A" +
++ "\u535C\u8A60\u65A7\u8766\u5766\u6AE8\u87FB\u5E16" +
++ "\u7AEA\u8D73\u771E\u737A\u66E0\u9410\u816B\u7B08" +
++ "\u91FC\u5737\u6FE4\u856A\u7E55\u9957\u87BA\u694A" +
++ "\u818F\u5EFF\u891C\u72D0\u9846\u9EDB\u8D99\u5DD6" +
++ "\u62B9\u64AB\u4F76\u613F\u68AF\u5F14\u800C\u92F8" +
++ "\u7BC1\u52FE\u664F\u9177\u51F6\u97A0\u839E\u647A" +
++ "\u9C3A\u67F5\u7C4F\u685F\u9B6F\u9F4B\u7FFB\u9348" +
++ "\u4FF6\u9E92\u9197\u96DB\u5BE6\u6CCC\u7CFE" ,
++ "\uFFFD\u9453\u6822\u66B9\u5BD4\u98F4\u8AE6\u8154" +
++ "\u7827\u74BD\u6ED3\u9288\u5A20\u5B8B\u86F8\u760D" +
++ "\u865C\u6641\u91C9\u5589\u7A4E\u59E5\u6042\u932B" +
++ "\u5B5A\u849C\u5C91\u96CD\u62D9\u675C\u6787\u5E7D" +
++ "\u8650\u9EB9\u5CB1\u80CE\u7A00\u8ABC\u5700\u8096" +
++ "\u7D72\u9211\u8098\u907C\u7761\u8737\u9075\u817A" +
++ "\u7C3E\u6EA2\u965E\u7E90\u72D7\u58FD\u60B3\u9786" +
++ "\u7E88\u587E\u6E20\u84DC\u6961\u77AD\u5197\u652A" +
++ "\u6777\u5DCD\u6101\u932E\u5954\u6367\u798D\u7AFF" +
++ "\u80D6\u58B3\u6168\u6AC3\u7483\u9B92\u660A\u642D" +
++ "\u5118\u6763\u809B\u9C10\u4FC9\u6953\u7A1C\u52FF" +
++ "\u6055\u768E\u817F\u5642\u5F6D\u7194\u70BB\u7436" +
++ "\u8000\u874B\u55DA\u7435\u7690\u96EB\u66DD\u751C" +
++ "\u633D\u6EC9\u7C64\u7CA5\u6D35\u935C\u7027\u5E25" +
++ "\u701D\u54BD\u611A\u6973\u6C6A\u559A\u6D19\u96CC" +
++ "\u5BE1\u59FB\u697C\u914C\u7709\u8500\u7A46\u7872" +
++ "\u92E4\u8CED\u7CFA\u9D1B\u814E\u9AC4\u68A0\u6DCB" +
++ "\u5918\u83B1\u5629\u9B41\u6897\u70B3\u9771\u9419" +
++ "\u67A2\u6802\u7895\u68A7\u50D6\u80B1\u5EF8\u82D4" +
++ "\u797A\u67CA\u7E4D\u69CD\u51C4\u723D\u6829\u99B3" +
++ "\u5F3C\u8F61\u682B\u6155\u6591\u8FB1\u7E1B\u9798" +
++ "\u9952\u8877\u5B2C\u6631\u4FA0\u6939\u6AFB\u5BB5" +
++ "\u7AC8\u5026\u5944\u9059\u7B25\u7B4F\u8E74\u8543" +
++ "\u5858\u8B0E\u5039\u8654\u97F6\u7569\u72F8" ,
++ "\uFFFD\u4EF7\u9D89\u5016\u51CC\u62CC\u91C6\u8755" +
++ "\u649A\u88F4\u91E6\u6854\u695A\u6C40\u7B6C\u6741" +
++ "\u77D7\u8823\u5384\u8EAF\u7280\u8C6B\u788D\u7165" +
++ "\u8207\u68B1\u8D04\u9077\u701E\u8FE6\u810A\u81BF" +
++ "\u89DC\u68B3\u6ADF\u92EA\u95C7\u7957\u7A20\u53A9" +
++ "\u8E5F\u786F\u79B9\u5F27\u5ED6\u6853\u93AC\u919C" +
++ "\u691A\u5806\u64B0\u7E4B\u7D8F\u68F2\u6EA5\u82DB" +
++ "\u9192\u5243\u8EB0\u9081\u721B\u7DCB\u7656\u59AC" +
++ "\u6FE0\u8B28\u80A2\u5544\u6070\u5F4A\u68C8\u633A" +
++ "\u9438\u9B4F\u81E5\u6A17\u70DD\u69A7\u614C\u920E" +
++ "\u9310\u9BAD\u52D7\u925E\u92F9\u5993\u7696\u66FB" +
++ "\u5769\u73CA\u7678\u6A1F\u7E9C\u9811\u8CD1\u5840" +
++ "\u6349\u871C\u62D0\u60B4\u6B89\u86EE\u5764\u581D" +
++ "\u8549\u7235\u7652\u983B\u8237\u5351\u5C24\u59BE" +
++ "\u5815\u901D\u69B4\u834A\u9EA9\u976B\u8086\u53AD" +
++ "\u6068\u4FAE\u76C3\u6A05\u689B\u937E\u99D5\u91C7" +
++ "\u5C16\u585E\u61A7\u9699\u4FDF\u8278\u9C52\u5F45" +
++ "\u6108\u7C8D\u806F\u5DF7\u8D6B\u57B0\u98E2\u5703" +
++ "\u79BF\u5996\u7941\u540A\u83DF\u9C39\u52D2\u6BD8" +
++ "\u86CB\u4EC0\u9A28\u5366\u8006\u7337\u6492\u8FED" +
++ "\u5AC9\u5420\u537F\u4FAF\u807E\u543B\u7515\u7B18" +
++ "\u8749\u54B3\u704C\u8997\u6CAB\u85FA\u7114\u696E" +
++ "\u9328\u745A\u59D1\u6E5B\u617E\u53E2\u8317\u76E7" +
++ "\u848B\u85AF\u6925\u5C60\u7259\u75D5\u8B90" ,
++ "\uFFFD\u6E07\u82AD\u5C4F\u7BED\u9784\u6F70\u764C" +
++ "\u88B7\u92D2\u4F36\u5EFE\u9061\u88E1\u8471\u711A" +
++ "\u6D1B\u80B4\u74E2\u7433\u5A7F\u905C\u980C\u5319" +
++ "\u906E\u6BB4\u85AA\u7897\u7AFA\u6AAE\u8910\u958F" +
++ "\u620C\u4F3D\u4F7C\u79BE\u9D0E\u4ED4\u57A2\u51A5" +
++ "\u6900\u6089\u707C\u7AE3\u8956\u93A7\u9C2D\u5112" +
++ "\u52FA\u7CCA\u60F9\u7078\u81C6\u559D\u6991\u96C9" +
++ "\u553E\u805A\u8304\u8332\u54FA\u565B\u8FBF\u5634" +
++ "\u6760\u5265\u840E\u5E5F\u7B65\u9035\u8387\u6B4E" +
++ "\u58BE\u6309\u727D\u97AD\u69D0\u546A\u984E\u632B" +
++ "\u714E\u8557\u7CDE\u6372\u68F9\u7511\u8602\u6EBA" +
++ "\u5A3C\u7A84\u851A\u95A4\u59D0\u60DA\u51EA\u5A29" +
++ "\u7169\u6F15\u696B\u63BB\u75E9\u4E4E\u7DBB\u6934" +
++ "\u8521\u8FFA\u9354\u9C3B\u5F17\u5ED3\u8258\u895F" +
++ "\u82E7\u52C3\u5C51\u83AB\u7826\u79E1\u7FF0\u626E" +
++ "\u60F0\u5CA8\u6F97\u71A8\u9909\u5132\u5E37\u5F04" +
++ "\u637B\u6753\u68D7\u6652\u9CF6\u88B0\u52AB\u4FC4" +
++ "\u4E3C\u67B3\u7BAA\u7F4D\u8A23\u63B4\u71E6\u65A4" +
++ "\u6F09\u853D\u5072\u7DBA\u5516\u7B04\u72FD\u6CD3" +
++ "\u8422\u621F\u50AD\u8235\u8718\u5919\u6028\u677C" +
++ "\u6F23\u75B9\u695C\u520E\u8018\u8B01\u71ED\u5713" +
++ "\u660F\u83EB\u7164\u7D9B\u5617\u7D7D\u8F4D\u9318" +
++ "\u8569\u5D17\u678C\u67DE\u87C7\u79AE\u5835\u8404" +
++ "\u9041\u7FD4\u6E8C\u8A63\u9D08\u670F\u939A" ,
++ "\uFFFD\u63AC\u602F\u64E2\u608D\u96B7\u6357\u8461" +
++ "\u914B\u75D8\u60E7\u9913\u9C57\u5984\u6DEB\u5E96" +
++ "\u6D9C\u9BF0\u58BB\u7977\u60B6\u633F\u5BF5\u9812" +
++ "\u558B\u82D3\u5147\u6190\u7953\u79BD\u6C5D\u9EBA" +
++ "\u9C48\u8DA8\u5EE0\u7D43\u5EFC\u854E\u8CE4\u5AE1" +
++ "\u54E8\u5023\u52BE\u7DEC\u8511\u6666\u6C3E\u724C" +
++ "\u8ADC\u9C0D\u77A5\u8B02\u8D05\u6F11\u9834\u97FB" +
++ "\u50FB\u7F75\u5A03\u8513\u4FB6\u634C\u9D61\u808B" +
++ "\u5294\u65A1\u567A\u5957\u8D0B\u6A35\u6AD3\u70F9" +
++ "\u865E\u6FB1\u51E7\u7FEB\u59EA\u5E87\u6B6A\u754F" +
++ "\u717D\u914E\u7D2C\u8C79\u6062\u621A\u7FA8\u5F1B" +
++ "\u6C8C\u86FE\u7562\u7B86\u9AB8\u6627\u7ABA\u844E" +
++ "\u6F81\u8B2C\u86A4\u6FEB\u7B8B\u7F77\u8F2F\u8E44" +
++ "\u7E23\u4E4D\u79A6\u8AFA\u903C\u50D1\u9ECD\u5EDF" +
++ "\u758F\u631F\u53DB\u9910\u826E\u62F7\u68FA\u725D" +
++ "\u803D\u58D5\u5C4D\u86D9\u540B\u8805\u92F2\u9237" +
++ "\u5C61\u985B\u86E4\u966A\u7262\u6955\u6CD7\u6994" +
++ "\u9C2F\u77E7\u68C9\u8DE8\u6D6C\u67C1\u9BAA\u619A" +
++ "\u63A9\u7015\u9306\u934D\u6A61\u6258\u5283\u7525" +
++ "\u5687\u6C83\u6834\u649E\u4E9B\u7252\u59E6\u8FC2" +
++ "\u5FBD\u6DD8\u85F7\u8A51\u9817\u99C1\u63A0\u7C81" +
++ "\u5B30\u8139\u5403\u7E82\u8106\u532A\u6A8E\u7F6B" +
++ "\u54E9\u5678\u8AB9\u6715\u5BD3\u6478\u64FE\u6B1D" +
++ "\u8CC2\u51CB\u7E8F\uFFFD\uFFFD\uFFFD\uFFFD" ,
++ "\uFFFD\u5F0C\u4E10\u4E15\u4E28\u4E2A\u4E31\u4E36" +
++ "\u4E3F\u4E42\u4E56\u4E58\u4E62\u4E82\u4E85\u4E8A" +
++ "\u4E8E\u5F0D\u4E9E\u4EA0\u4EA2\u4EB0\u4EB3\u4EB6" +
++ "\u4ECE\u4ECD\u4EC4\u4EC6\u4EC2\u4EE1\u4ED7\u4EDE" +
++ "\u4EED\u4EDF\u4EFC\u4F09\u4F1C\u4F00\u4F03\u4F5A" +
++ "\u4F30\u4F5D\u4F39\u4F57\u4F47\u4F5E\u4F56\u4F5B" +
++ "\u4F92\u4F8A\u4F88\u4F8F\u4F9A\u4FAD\u4F98\u4F7B" +
++ "\u4FAB\u4F69\u4F70\u4F94\u4F6F\u4F86\u4F96\u4FD4" +
++ "\u4FCE\u4FD8\u4FDB\u4FD1\u4FDA\u4FD0\u4FCD\u4FE4" +
++ "\u4FE5\u501A\u5040\u5028\u5014\u502A\u5025\u5005" +
++ "\u5021\u5022\u5029\u502C\u4FFF\u4FFE\u4FEF\u5011" +
++ "\u501E\u5006\u5043\u5047\u5055\u5050\u5048\u505A" +
++ "\u5056\u500F\u5046\u5070\u5042\u506C\u5078\u5080" +
++ "\u5094\u509A\u5085\u50B4\u6703\u50B2\u50C9\u50CA" +
++ "\u50B3\u50C2\u50F4\u50DE\u50E5\u50D8\u50ED\u50E3" +
++ "\u50EE\u50F9\u50F5\u5109\u5101\u5102\u511A\u5115" +
++ "\u5114\u5116\u5121\u513A\u5137\u513C\u513B\u513F" +
++ "\u5140\u514A\u514C\u5152\u5154\u5162\u5164\u5169" +
++ "\u516A\u516E\u5180\u5182\u56D8\u518C\u5189\u518F" +
++ "\u5191\u5193\u5195\u5196\u519D\u51A4\u51A6\u51A2" +
++ "\u51A9\u51AA\u51AB\u51B3\u51B1\u51B2\u51B0\u51B5" +
++ "\u51BE\u51BD\u51C5\u51C9\u51DB\u51E0\u51E9\u51EC" +
++ "\u51ED\u51F0\u51F5\u51FE\u5204\u520B\u5214\u5215" +
++ "\u5227\u522A\u522E\u5233\u5239\u5244\u524B" ,
++ "\uFFFD\u524F\u525E\u5254\u5271\u526A\u5273\u5274" +
++ "\u5269\u527F\u527D\u528D\u5288\u5292\u5291\u529C" +
++ "\u52A6\u52AC\u52AD\u52BC\u52B5\u52C1\u52C0\u52CD" +
++ "\u52DB\u52DE\u52E3\u52E6\u52E0\u52F3\u52F5\u52F8" +
++ "\u52F9\u5300\u5306\u5307\u5308\u7538\u530D\u5310" +
++ "\u530F\u5315\u531A\u5324\u5323\u532F\u5331\u5333" +
++ "\u5338\u5340\u5345\u5346\u5349\u4E17\u534D\u51D6" +
++ "\u8209\u535E\u5369\u536E\u5372\u5377\u537B\u5382" +
++ "\u5393\u5396\u53A0\u53A6\u53A5\u53AE\u53B0\u53B2" +
++ "\u53B6\u53C3\u7C12\u53DD\u53DF\u66FC\uFA0E\u71EE" +
++ "\u53EE\u53E8\u53ED\u53FA\u5401\u543D\u5440\u542C" +
++ "\u542D\u543C\u542E\u5436\u5429\u541D\u544E\u548F" +
++ "\u5475\u548E\u545F\u5471\u5477\u5470\u5492\u547B" +
++ "\u5480\u549C\u5476\u5484\u5490\u5486\u548A\u54C7" +
++ "\u54BC\u54AF\u54A2\u54B8\u54A5\u54AC\u54C4\u54D8" +
++ "\u54C8\u54A8\u54AB\u54C2\u54A4\u54A9\u54BE\u54E5" +
++ "\u54FF\u54E6\u550F\u5514\u54FD\u54EE\u54ED\u54E2" +
++ "\u5539\u5540\u5563\u554C\u552E\u555C\u5545\u5556" +
++ "\u5557\u5538\u5533\u555D\u5599\u5580\u558A\u559F" +
++ "\u557B\u557E\u5598\u559E\u55AE\u557C\u5586\u5583" +
++ "\u55A9\u5587\u55A8\u55C5\u55DF\u55C4\u55DC\u55E4" +
++ "\u55D4\u55F9\u5614\u55F7\u5616\u55FE\u55FD\u561B" +
++ "\u564E\u5650\u5636\u5632\u5638\u566B\u5664\u5686" +
++ "\u562F\u566C\u566A\u71DF\u5694\u568F\u5680" ,
++ "\uFFFD\u568A\u56A0\u56A5\u56AE\u56B6\u56B4\u56C8" +
++ "\u56C2\u56BC\u56C1\u56C3\u56C0\u56CE\u56D3\u56D1" +
++ "\u56D7\u56EE\u56F9\u56FF\u5704\u5709\u5708\u570D" +
++ "\u55C7\u5718\u5716\u571C\u5726\u5738\u574E\u573B" +
++ "\u5759\u5740\u574F\u5765\u5788\u5761\u577F\u5789" +
++ "\u5793\u57A0\u57A4\u57B3\u57AC\u57AA\u57C3\u57C6" +
++ "\u57C8\u57C0\u57D4\u57C7\u57D2\u57D3\u57D6\uFA0F" +
++ "\u580A\u57E3\u580B\u5819\u5821\u584B\u5862\u6BC0" +
++ "\u583D\u5852\uFA10\u5870\u5879\u5885\u5872\u589F" +
++ "\u58AB\u58B8\u589E\u58AE\u58B2\u58B9\u58BA\u58C5" +
++ "\u58D3\u58D1\u58D7\u58D9\u58D8\u58DE\u58DC\u58DF" +
++ "\u58E4\u58E5\u58EF\u58F7\u58F9\u58FB\u58FC\u5902" +
++ "\u590A\u590B\u5910\u591B\u68A6\u5925\u592C\u592D" +
++ "\u5932\u5938\u593E\u5955\u5950\u5953\u595A\u5958" +
++ "\u595B\u595D\u5963\u5962\u5960\u5967\u596C\u5969" +
++ "\u5978\u5981\u598D\u599B\u599D\u59A3\u59A4\u59B2" +
++ "\u59BA\u59C6\u59E8\u59D9\u59DA\u5A25\u5A1F\u5A11" +
++ "\u5A1C\u5A1A\u5A09\u5A40\u5A6C\u5A49\u5A35\u5A36" +
++ "\u5A62\u5A6A\u5A9A\u5ABC\u5ABE\u5AD0\u5ACB\u5AC2" +
++ "\u5ABD\u5AE3\u5AD7\u5AE6\u5AE9\u5AD6\u5AFA\u5AFB" +
++ "\u5B0C\u5B0B\u5B16\u5B32\u5B2A\u5B36\u5B3E\u5B43" +
++ "\u5B45\u5B40\u5B51\u5B55\u5B56\u6588\u5B5B\u5B65" +
++ "\u5B69\u5B70\u5B73\u5B75\u5B78\u5B7A\u5B80\u5B83" +
++ "\u5BA6\u5BB8\u5BC3\u5BC7\u5BC0\u5BC9\u752F" ,
++ "\uFFFD\u5BD0\u5BD8\u5BDE\u5BEC\u5BE4\u5BE2\u5BE5" +
++ "\u5BEB\u5BF0\u5BF3\u5BF6\u5C05\u5C07\u5C08\u5C0D" +
++ "\u5C13\u5C1E\u5C20\u5C22\u5C28\u5C38\u5C41\u5C46" +
++ "\u5C4E\u5C53\u5C50\u5B71\u5C6C\u5C6E\u5C76\u5C79" +
++ "\u5C8C\u5C94\u5CBE\u5CAB\u5CBB\u5CB6\u5CB7\u5CA6" +
++ "\u5CBA\u5CC5\u5CBC\u5CC7\u5CD9\u5CE9\u5CFD\u5CFA" +
++ "\u5CF5\u5CED\u5CEA\u5D0B\u5D15\u5D1F\u5D1B\u5D11" +
++ "\u5D27\u5D22\u5D1A\u5D19\u5D18\u5D4C\u5D52\u5D53" +
++ "\uFA11\u5D5C\u5D4E\u5D4B\u5D42\u5D6C\u5D73\u5D6D" +
++ "\u5D76\u5D87\u5D84\u5D82\u5D8C\u5DA2\u5D9D\u5D90" +
++ "\u5DAC\u5DAE\u5DB7\u5DB8\u5DBC\u5DB9\u5DC9\u5DD0" +
++ "\u5DD3\u5DD2\u5DDB\u5DEB\u5DF5\u5E0B\u5E1A\u5E19" +
++ "\u5E11\u5E1B\u5E36\u5E44\u5E43\u5E40\u5E47\u5E4E" +
++ "\u5E57\u5E54\u5E62\u5E64\u5E75\u5E76\u5E7A\u5E7F" +
++ "\u5EA0\u5EC1\u5EC2\u5EC8\u5ED0\u5ECF\u5EDD\u5EDA" +
++ "\u5EDB\u5EE2\u5EE1\u5EE8\u5EE9\u5EEC\u5EF0\u5EF1" +
++ "\u5EF3\u5EF4\u5F03\u5F09\u5F0B\u5F11\u5F16\u5F21" +
++ "\u5F29\u5F2D\u5F2F\u5F34\u5F38\u5F41\u5F48\u5F4C" +
++ "\u5F4E\u5F51\u5F56\u5F57\u5F59\u5F5C\u5F5D\u5F61" +
++ "\u5F67\u5F73\u5F77\u5F83\u5F82\u5F7F\u5F8A\u5F88" +
++ "\u5F87\u5F91\u5F99\u5F9E\u5F98\u5FA0\u5FA8\u5FAD" +
++ "\u5FB7\u5FBC\u5FD6\u5FFB\u5FE4\u5FF8\u5FF1\u5FF0" +
++ "\u5FDD\u5FDE\u5FFF\u6021\u6019\u6010\u6029\u600E" +
++ "\u6031\u601B\u6015\u602B\u6026\u600F\u603A" ,
++ "\uFFFD\u605A\u6041\u6060\u605D\u606A\u6077\u605F" +
++ "\u604A\u6046\u604D\u6063\u6043\u6064\u606C\u606B" +
++ "\u6059\u6085\u6081\u6083\u609A\u6084\u609B\u608A" +
++ "\u6096\u6097\u6092\u60A7\u608B\u60E1\u60B8\u60DE" +
++ "\u60E0\u60D3\u60BD\u60C6\u60B5\u60D5\u60D8\u6120" +
++ "\u60F2\u6115\u6106\u60F6\u60F7\u6100\u60F4\u60FA" +
++ "\u6103\u6121\u60FB\u60F1\u610D\u610E\u6111\u6147" +
++ "\u614D\u6137\u6128\u6127\u613E\u614A\u6130\u613C" +
++ "\u612C\u6134\u6165\u615D\u613D\u6142\u6144\u6173" +
++ "\u6187\u6177\u6158\u6159\u615A\u616B\u6174\u616F" +
++ "\u6171\u615F\u6153\u6175\u6198\u6199\u6196\u61AC" +
++ "\u6194\u618A\u6191\u61AB\u61AE\u61CC\u61CA\u61C9" +
++ "\u61C8\u61C3\u61C6\u61BA\u61CB\u7F79\u61CD\u61E6" +
++ "\u61E3\u61F4\u61F7\u61F6\u61FD\u61FA\u61FF\u61FC" +
++ "\u61FE\u6200\u6208\u6209\u620D\u6213\u6214\u621B" +
++ "\u621E\u6221\u622A\u622E\u6230\u6232\u6233\u6241" +
++ "\u624E\u625E\u6263\u625B\u6260\u6268\u627C\u6282" +
++ "\u6289\u6292\u627E\u6293\u6296\u6283\u6294\u62D7" +
++ "\u62D1\u62BB\u62CF\u62AC\u62C6\u62C8\u62DC\u62D4" +
++ "\u62CA\u62C2\u62A6\u62C7\u629B\u62C9\u630C\u62EE" +
++ "\u62F1\u6327\u6302\u6308\u62EF\u62F5\u62FF\u6350" +
++ "\u634D\u633E\u634F\u6396\u638E\u6380\u63AB\u6376" +
++ "\u63A3\u638F\u6389\u639F\u636B\u6369\u63B5\u63BE" +
++ "\u63E9\u63C0\u63C6\u63F5\u63E3\u63C9\u63D2" ,
++ "\uFFFD\u63F6\u63C4\u6434\u6406\u6413\u6426\u6436" +
++ "\u641C\u6417\u6428\u640F\u6416\u644E\u6467\u646F" +
++ "\u6460\u6476\u64B9\u649D\u64CE\u6495\u64BB\u6493" +
++ "\u64A5\u64A9\u6488\u64BC\u64DA\u64D2\u64C5\u64C7" +
++ "\u64D4\u64D8\u64C2\u64F1\u64E7\u64E0\u64E1\u64E3" +
++ "\u64EF\u64F4\u64F6\u64F2\u64FA\u6500\u64FD\u6518" +
++ "\u651C\u651D\u6505\u6524\u6523\u652B\u652C\u6534" +
++ "\u6535\u6537\u6536\u6538\u754B\u6548\u654E\u6556" +
++ "\u654D\u6558\u6555\u655D\u6572\u6578\u6582\u6583" +
++ "\u8B8A\u659B\u659F\u65AB\u65B7\u65C3\u65C6\u65C1" +
++ "\u65C4\u65CC\u65D2\u65D9\u65E1\u65E0\u65F1\u6600" +
++ "\u6615\u6602\u6772\u6603\u65FB\u6609\u663F\u6635" +
++ "\u662E\u661E\u6634\u661C\u6624\u6644\u6649\u6665" +
++ "\u6657\u665E\u6664\u6659\u6662\u665D\uFA12\u6673" +
++ "\u6670\u6683\u6688\u6684\u6699\u6698\u66A0\u669D" +
++ "\u66B2\u66C4\u66C1\u66BF\u66C9\u66BE\u66BC\u66B8" +
++ "\u66D6\u66DA\u66E6\u66E9\u66F0\u66F5\u66F7\u66FA" +
++ "\u670E\uF929\u6716\u671E\u7E22\u6726\u6727\u9738" +
++ "\u672E\u673F\u6736\u6737\u6738\u6746\u675E\u6759" +
++ "\u6766\u6764\u6789\u6785\u6770\u67A9\u676A\u678B" +
++ "\u6773\u67A6\u67A1\u67BB\u67B7\u67EF\u67B4\u67EC" +
++ "\u67E9\u67B8\u67E7\u67E4\u6852\u67DD\u67E2\u67EE" +
++ "\u67C0\u67CE\u67B9\u6801\u67C6\u681E\u6846\u684D" +
++ "\u6840\u6844\u6832\u684E\u6863\u6859\u688D" ,
++ "\uFFFD\u6877\u687F\u689F\u687E\u688F\u68AD\u6894" +
++ "\u6883\u68BC\u68B9\u6874\u68B5\u68BA\u690F\u6901" +
++ "\u68CA\u6908\u68D8\u6926\u68E1\u690C\u68CD\u68D4" +
++ "\u68E7\u68D5\u6912\u68EF\u6904\u68E3\u68E0\u68CF" +
++ "\u68C6\u6922\u692A\u6921\u6923\u6928\uFA13\u6979" +
++ "\u6977\u6936\u6978\u6954\u696A\u6974\u6968\u693D" +
++ "\u6959\u6930\u695E\u695D\u697E\u6981\u69B2\u69BF" +
++ "\uFA14\u6998\u69C1\u69D3\u69BE\u69CE\u5BE8\u69CA" +
++ "\u69B1\u69DD\u69BB\u69C3\u69A0\u699C\u6995\u69DE" +
++ "\u6A2E\u69E8\u6A02\u6A1B\u69FF\u69F9\u69F2\u69E7" +
++ "\u69E2\u6A1E\u69ED\u6A14\u69EB\u6A0A\u6A22\u6A12" +
++ "\u6A23\u6A13\u6A30\u6A6B\u6A44\u6A0C\u6AA0\u6A36" +
++ "\u6A78\u6A47\u6A62\u6A59\u6A66\u6A48\u6A46\u6A38" +
++ "\u6A72\u6A73\u6A90\u6A8D\u6A84\u6AA2\u6AA3\u6A7E" +
++ "\u6A97\u6AAC\u6AAA\u6ABB\u6AC2\u6AB8\u6AB3\u6AC1" +
++ "\u6ADE\u6AE2\u6AD1\u6ADA\u6AE4\u8616\u8617\u6AEA" +
++ "\u6B05\u6B0A\u6AFA\u6B12\u6B16\u6B1F\u6B38\u6B37" +
++ "\u6B39\u76DC\u98EE\u6B47\u6B43\u6B49\u6B50\u6B59" +
++ "\u6B54\u6B5B\u6B5F\u6B61\u6B78\u6B79\u6B7F\u6B80" +
++ "\u6B84\u6B83\u6B8D\u6B98\u6B95\u6B9E\u6BA4\u6BAA" +
++ "\u6BAB\u6BAF\u6BB1\u6BB2\u6BB3\u6BB7\u6BBC\u6BC6" +
++ "\u6BCB\u6BD3\u6BD6\u6BDF\u6BEC\u6BEB\u6BF3\u6BEF" +
++ "\u6C08\u6C13\u6C14\u6C1B\u6C24\u6C23\u6C3F\u6C5E" +
++ "\u6C55\u6C5C\u6C62\u6C82\u6C8D\u6C86\u6C6F" ,
++ "\uFFFD\u6C9A\u6C81\u6C9B\u6C7E\u6C68\u6C73\u6C92" +
++ "\u6C90\u6CC4\u6CF1\u6CBD\u6CC5\u6CAE\u6CDA\u6CDD" +
++ "\u6CB1\u6CBE\u6CBA\u6CDB\u6CEF\u6CD9\u6CEA\u6D1F" +
++ "\u6D04\u6D36\u6D2B\u6D3D\u6D33\u6D12\u6D0C\u6D63" +
++ "\u6D87\u6D93\u6D6F\u6D64\u6D5A\u6D79\u6D59\u6D8E" +
++ "\u6D95\u6D9B\u6D85\u6D96\u6DF9\u6E0A\u6E2E\u6DB5" +
++ "\u6DE6\u6DC7\u6DAC\u6DB8\u6DCF\u6DC6\u6DEC\u6DDE" +
++ "\u6DCC\u6DE8\u6DF8\u6DD2\u6DC5\u6DFA\u6DD9\u6DF2" +
++ "\u6DFC\u6DE4\u6DD5\u6DEA\u6DEE\u6E2D\u6E6E\u6E19" +
++ "\u6E72\u6E5F\u6E39\u6E3E\u6E23\u6E6B\u6E5C\u6E2B" +
++ "\u6E76\u6E4D\u6E1F\u6E27\u6E43\u6E3C\u6E3A\u6E4E" +
++ "\u6E24\u6E1D\u6E38\u6E82\u6EAA\u6E98\u6EB7\u6EBD" +
++ "\u6EAF\u6EC4\u6EB2\u6ED4\u6ED5\u6E8F\u6EBF\u6EC2" +
++ "\u6E9F\u6F41\u6F45\u6EEC\u6EF8\u6EFE\u6F3F\u6EF2" +
++ "\u6F31\u6EEF\u6F32\u6ECC\u6EFF\u6F3E\u6F13\u6EF7" +
++ "\u6F86\u6F7A\u6F78\u6F80\u6F6F\u6F5B\u6F6D\u6F74" +
++ "\u6F82\u6F88\u6F7C\u6F58\u6FC6\u6F8E\u6F91\u6F66" +
++ "\u6FB3\u6FA3\u6FB5\u6FA1\u6FB9\u6FDB\u6FAA\u6FC2" +
++ "\u6FDF\u6FD5\u6FEC\u6FD8\u6FD4\u6FF5\u6FEE\u7005" +
++ "\u7007\u7009\u700B\u6FFA\u7011\u7001\u700F\u701B" +
++ "\u701A\u701F\u6FF3\u7028\u7018\u7030\u703E\u7032" +
++ "\u7051\u7063\u7085\u7099\u70AF\u70AB\u70AC\u70B8" +
++ "\u70AE\u70DF\u70CB\u70D9\u7109\u710F\u7104\u70F1" +
++ "\u70FD\u711C\u7119\u715C\u7146\u7147\u7166" ,
++ "\uFFFD\u7162\u714C\u7156\u716C\u7188\u718F\u7184" +
++ "\u7195\uFA15\u71AC\u71C1\u71B9\u71BE\u71D2\u71E7" +
++ "\u71C9\u71D4\u71D7\u71CE\u71F5\u71E0\u71EC\u71FB" +
++ "\u71FC\u71F9\u71FE\u71FF\u720D\u7210\u7228\u722D" +
++ "\u722C\u7230\u7232\u723B\u723C\u723F\u7240\u7246" +
++ "\u724B\u7258\u7274\u727E\u7281\u7287\u7282\u7292" +
++ "\u7296\u72A2\u72A7\u72B1\u72B2\u72BE\u72C3\u72C6" +
++ "\u72C4\u72B9\u72CE\u72D2\u72E2\u72E0\u72E1\u72F9" +
++ "\u72F7\u7317\u730A\u731C\u7316\u731D\u7324\u7334" +
++ "\u7329\u732F\uFA16\u7325\u733E\u734F\u734E\u7357" +
++ "\u9ED8\u736A\u7368\u7370\u7377\u7378\u7375\u737B" +
++ "\u73C8\u73BD\u73B3\u73CE\u73BB\u73C0\u73C9\u73D6" +
++ "\u73E5\u73E3\u73D2\u73EE\u73F1\u73DE\u73F8\u7407" +
++ "\u73F5\u7405\u7426\u742A\u7425\u7429\u742E\u7432" +
++ "\u743A\u7455\u743F\u745F\u7459\u7441\u745C\u7469" +
++ "\u7470\u7463\u746A\u7464\u7462\u7489\u746F\u747E" +
++ "\u749F\u749E\u74A2\u74A7\u74CA\u74CF\u74D4\u74E0" +
++ "\u74E3\u74E7\u74E9\u74EE\u74F0\u74F2\u74F1\u74F7" +
++ "\u74F8\u7501\u7504\u7503\u7505\u750D\u750C\u750E" +
++ "\u7513\u751E\u7526\u752C\u753C\u7544\u754D\u754A" +
++ "\u7549\u7546\u755B\u755A\u7564\u7567\u756B\u756F" +
++ "\u7574\u756D\u7578\u7576\u7582\u7586\u7587\u758A" +
++ "\u7589\u7594\u759A\u759D\u75A5\u75A3\u75C2\u75B3" +
++ "\u75C3\u75B5\u75BD\u75B8\u75BC\u75B1\u75CD" ,
++ "\uFFFD\u75CA\u75D2\u75D9\u75E3\u75DE\u75FE\u75FF" +
++ "\u75FC\u7601\u75F0\u75FA\u75F2\u75F3\u760B\u7609" +
++ "\u761F\u7627\u7620\u7621\u7622\u7624\u7634\u7630" +
++ "\u763B\u7647\u7648\u7658\u7646\u765C\u7661\u7662" +
++ "\u7668\u7669\u7667\u766A\u766C\u7670\u7672\u7676" +
++ "\u767C\u7682\u7680\u7683\u7688\u768B\u7699\u769A" +
++ "\u769C\u769E\u769B\u76A6\u76B0\u76B4\u76B8\u76B9" +
++ "\u76BA\u76C2\uFA17\u76CD\u76D6\u76D2\u76DE\u76E1" +
++ "\u76E5\u76EA\u862F\u76FB\u7708\u7707\u7704\u7724" +
++ "\u7729\u7725\u7726\u771B\u7737\u7738\u7746\u7747" +
++ "\u775A\u7768\u776B\u775B\u7765\u777F\u777E\u7779" +
++ "\u778E\u778B\u7791\u77A0\u779E\u77B0\u77B6\u77B9" +
++ "\u77BF\u77BC\u77BD\u77BB\u77C7\u77CD\u77DA\u77DC" +
++ "\u77E3\u77EE\u52AF\u77FC\u780C\u7812\u7821\u783F" +
++ "\u7820\u7845\u784E\u7864\u7874\u788E\u787A\u7886" +
++ "\u789A\u787C\u788C\u78A3\u78B5\u78AA\u78AF\u78D1" +
++ "\u78C6\u78CB\u78D4\u78BE\u78BC\u78C5\u78CA\u78EC" +
++ "\u78E7\u78DA\u78FD\u78F4\u7907\u7911\u7919\u792C" +
++ "\u792B\u7930\uFA18\u7940\u7960\uFA19\u795F\u795A" +
++ "\u7955\uFA1A\u797F\u798A\u7994\uFA1B\u799D\u799B" +
++ "\u79AA\u79B3\u79BA\u79C9\u79D5\u79E7\u79EC\u79E3" +
++ "\u7A08\u7A0D\u7A18\u7A19\u7A1F\u7A31\u7A3E\u7A37" +
++ "\u7A3B\u7A43\u7A57\u7A49\u7A62\u7A61\u7A69\u9F9D" +
++ "\u7A70\u7A79\u7A7D\u7A88\u7A95\u7A98\u7A96" ,
++ "\uFFFD\u7A97\u7AA9\u7AB0\u7AB6\u9083\u7AC3\u7ABF" +
++ "\u7AC5\u7AC4\u7AC7\u7ACA\u7ACD\u7ACF\u7AD2\u7AD1" +
++ "\u7AD5\u7AD3\u7AD9\u7ADA\u7ADD\u7AE1\u7AE2\u7AE6" +
++ "\u7AE7\uFA1C\u7AEB\u7AED\u7AF0\u7AF8\u7B02\u7B0F" +
++ "\u7B0B\u7B0A\u7B06\u7B33\u7B36\u7B19\u7B1E\u7B35" +
++ "\u7B28\u7B50\u7B4D\u7B4C\u7B45\u7B5D\u7B75\u7B7A" +
++ "\u7B74\u7B70\u7B71\u7B6E\u7B9D\u7B98\u7B9F\u7B8D" +
++ "\u7B9C\u7B9A\u7B92\u7B8F\u7B99\u7BCF\u7BCB\u7BCC" +
++ "\u7BB4\u7BC6\u7B9E\u7BDD\u7BE9\u7BE6\u7BF7\u7BE5" +
++ "\u7C14\u7C00\u7C13\u7C07\u7BF3\u7C0D\u7BF6\u7C23" +
++ "\u7C27\u7C2A\u7C1F\u7C37\u7C2B\u7C3D\u7C40\u7C4C" +
++ "\u7C43\u7C56\u7C50\u7C58\u7C5F\u7C65\u7C6C\u7C75" +
++ "\u7C83\u7C90\u7CA4\u7CA2\u7CAB\u7CA1\u7CAD\u7CA8" +
++ "\u7CB3\u7CB2\u7CB1\u7CAE\u7CB9\uFA1D\u7CBD\u7CC5" +
++ "\u7CC2\u7CD2\u7CE2\u7CD8\u7CDC\u7CEF\u7CF2\u7CF4" +
++ "\u7CF6\u7D06\u7D02\u7D1C\u7D15\u7D0A\u7D45\u7D4B" +
++ "\u7D2E\u7D32\u7D3F\u7D35\u7D48\u7D46\u7D5C\u7D73" +
++ "\u7D56\u7D4E\u7D68\u7D6E\u7D4F\u7D63\u7D93\u7D89" +
++ "\u7D5B\u7DAE\u7DA3\u7DB5\u7DB7\u7DC7\u7DBD\u7DAB" +
++ "\u7DA2\u7DAF\u7DA0\u7DB8\u7D9F\u7DB0\u7DD5\u7DD8" +
++ "\u7DDD\u7DD6\u7DE4\u7DDE\u7DFB\u7E0B\u7DF2\u7DE1" +
++ "\u7DDC\u7E05\u7E0A\u7E21\u7E12\u7E1F\u7E09\u7E3A" +
++ "\u7E46\u7E66\u7E31\u7E3D\u7E35\u7E3B\u7E39\u7E43" +
++ "\u7E37\u7E32\u7E5D\u7E56\u7E5E\u7E52\u7E59" ,
++ "\uFFFD\u7E5A\u7E67\u7E79\u7E6A\u7E69\u7E7C\u7E7B" +
++ "\u7E7D\u8FAE\u7E7F\u7E83\u7E89\u7E8E\u7E8C\u7E92" +
++ "\u7E93\u7E94\u7E96\u7E9B\u7F38\u7F3A\u7F45\u7F47" +
++ "\u7F4C\u7F4E\u7F51\u7F55\u7F54\u7F58\u7F5F\u7F60" +
++ "\u7F68\u7F67\u7F69\u7F78\u7F82\u7F86\u7F83\u7F87" +
++ "\u7F88\u7F8C\u7F94\u7F9E\u7F9D\u7F9A\u7FA1\u7FA3" +
++ "\u7FAF\u7FAE\u7FB2\u7FB9\u7FB6\u7FB8\u8B71\uFA1E" +
++ "\u7FC5\u7FC6\u7FCA\u7FD5\u7FE1\u7FE6\u7FE9\u7FF3" +
++ "\u7FF9\u8004\u800B\u8012\u8019\u801C\u8021\u8028" +
++ "\u803F\u803B\u804A\u8046\u8052\u8058\u805F\u8062" +
++ "\u8068\u8073\u8072\u8070\u8076\u8079\u807D\u807F" +
++ "\u8084\u8085\u8093\u809A\u80AD\u5190\u80AC\u80DB" +
++ "\u80E5\u80D9\u80DD\u80C4\u80DA\u8109\u80EF\u80F1" +
++ "\u811B\u8123\u812F\u814B\u8146\u813E\u8153\u8151" +
++ "\u80FC\u8171\u816E\u8165\u815F\u8166\u8174\u8183" +
++ "\u8188\u818A\u8180\u8182\u81A0\u8195\u81A3\u8193" +
++ "\u81B5\u81A4\u81A9\u81B8\u81B0\u81C8\u81BE\u81BD" +
++ "\u81C0\u81C2\u81BA\u81C9\u81CD\u81D1\u81D8\u81D9" +
++ "\u81DA\u81DF\u81E0\u81FA\u81FB\u81FE\u8201\u8202" +
++ "\u8205\u820D\u8210\u8212\u8216\u8229\u822B\u822E" +
++ "\u8238\u8233\u8240\u8259\u825A\u825D\u825F\u8264" +
++ "\u8262\u8268\u826A\u826B\u8271\u8277\u827E\u828D" +
++ "\u8292\u82AB\u829F\u82BB\u82AC\u82E1\u82E3\u82DF" +
++ "\u8301\u82D2\u82F4\u82F3\u8303\u82FB\u82F9" ,
++ "\uFFFD\u82DE\u8306\u82DC\u82FA\u8309\u82D9\u8335" +
++ "\u8362\u8334\u8316\u8331\u8340\u8339\u8350\u8345" +
++ "\u832F\u832B\u8318\u839A\u83AA\u839F\u83A2\u8396" +
++ "\u8323\u838E\u8375\u837F\u838A\u837C\u83B5\u8373" +
++ "\u8393\u83A0\u8385\u8389\u83A8\u83F4\u8413\u83C7" +
++ "\u83CE\u83F7\u83FD\u8403\u83D8\u840B\u83C1\u8407" +
++ "\u83E0\u83F2\u840D\u8420\u83F6\u83BD\u83FB\u842A" +
++ "\u8462\u843C\u8484\u8477\u846B\u8479\u8448\u846E" +
++ "\u8482\u8469\u8446\u846F\u8438\u8435\u84CA\u84B9" +
++ "\u84BF\u849F\u84B4\u84CD\u84BB\u84DA\u84D0\u84C1" +
++ "\u84AD\u84C6\u84D6\u84A1\u84D9\u84FF\u84F4\u8517" +
++ "\u8518\u852C\u851F\u8515\u8514\u8506\u8553\u855A" +
++ "\u8540\u8559\u8563\u8558\u8548\u8541\u854A\u854B" +
++ "\u856B\u8555\u8580\u85A4\u8588\u8591\u858A\u85A8" +
++ "\u856D\u8594\u859B\u85AE\u8587\u859C\u8577\u857E" +
++ "\u8590\uFA1F\u820A\u85B0\u85C9\u85BA\u85CF\u85B9" +
++ "\u85D0\u85D5\u85DD\u85E5\u85DC\u85F9\u860A\u8613" +
++ "\u860B\u85FE\u8622\u861A\u8630\u863F\uFA20\u864D" +
++ "\u4E55\u8655\u865F\u8667\u8671\u8693\u86A3\u86A9" +
++ "\u868B\u86AA\u868C\u86B6\u86AF\u86C4\u86C6\u86B0" +
++ "\u86C9\u86CE\uFA21\u86AB\u86D4\u86DE\u86E9\u86EC" +
++ "\u86DF\u86DB\u8712\u8706\u8708\u8700\u8703\u86FB" +
++ "\u8711\u8709\u870D\u86F9\u870A\u8734\u873F\u873B" +
++ "\u8725\u8729\u871A\u875F\u8778\u874C\u874E" ,
++ "\uFFFD\u8774\u8757\u8768\u8782\u876A\u8760\u876E" +
++ "\u8759\u8753\u8763\u877F\u87A2\u87C6\u879F\u87AF" +
++ "\u87CB\u87BD\u87C0\u87D0\u96D6\u87AB\u87C4\u87B3" +
++ "\u87D2\u87BB\u87EF\u87F2\u87E0\u880E\u8807\u880F" +
++ "\u8816\u880D\u87FE\u87F6\u87F7\u8811\u8815\u8822" +
++ "\u8821\u8827\u8831\u8836\u8839\u883B\u8842\u8844" +
++ "\u884D\u8852\u8859\u885E\u8862\u886B\u8881\u887E" +
++ "\u8875\u887D\u8872\u8882\u889E\u8897\u8892\u88AE" +
++ "\u8899\u88A2\u888D\u88A4\u88BF\u88B5\u88B1\u88C3" +
++ "\u88C4\u88D4\u88D8\u88D9\u88DD\u88F9\u8902\u88FC" +
++ "\u88F5\u88E8\u88F2\u8904\u890C\u892A\u891D\u890A" +
++ "\u8913\u891E\u8925\u892B\u8941\u893B\u8936\u8943" +
++ "\u8938\u894D\u894C\u8960\u895E\u8966\u896A\u8964" +
++ "\u896D\u896F\u8974\u8977\u897E\u8983\u8988\u898A" +
++ "\u8993\u8998\u89A1\u89A9\u89A6\u89AC\u89AF\u89B2" +
++ "\u89BA\u89BF\u89BD\u89C0\u89DA\u89DD\u89E7\u89F4" +
++ "\u89F8\u8A03\u8A16\u8A10\u8A0C\u8A12\u8A1B\u8A1D" +
++ "\u8A25\u8A36\u8A41\u8A37\u8A5B\u8A52\u8A46\u8A48" +
++ "\u8A7C\u8A6D\u8A6C\u8A62\u8A79\u8A85\u8A82\u8A84" +
++ "\u8AA8\u8AA1\u8A91\u8AA5\u8AA6\u8A9A\u8AA3\u8AA7" +
++ "\u8ACC\u8ABE\u8ACD\u8AC2\u8ADA\u8AF3\u8AE7\u8AE4" +
++ "\u8AF1\u8B14\u8AE0\u8AE2\u8AE1\u8ADF\uFA22\u8AF6" +
++ "\u8AF7\u8ADE\u8ADB\u8B0C\u8B07\u8B1A\u8B16\u8B10" +
++ "\u8B17\u8B20\u8B33\u8B41\u97AB\u8B26\u8B2B" ,
++ "\uFFFD\u8B3E\u8B4C\u8B4F\u8B4E\u8B53\u8B49\u8B56" +
++ "\u8B5B\u8B5A\u8B74\u8B6B\u8B5F\u8B6C\u8B6F\u8B7D" +
++ "\u8B7F\u8B80\u8B8C\u8B8E\u8B99\u8B92\u8B93\u8B96" +
++ "\u8B9A\u8C3A\u8C41\u8C3F\u8C48\u8C4C\u8C4E\u8C50" +
++ "\u8C55\u8C62\u8C6C\u8C78\u8C7A\u8C7C\u8C82\u8C89" +
++ "\u8C85\u8C8A\u8C8D\u8C8E\u8C98\u8C94\u621D\u8CAD" +
++ "\u8CAA\u8CAE\u8CBD\u8CB2\u8CB3\u8CC1\u8CB6\u8CC8" +
++ "\u8CCE\u8CCD\u8CE3\u8CDA\u8CF0\u8CF4\u8CFD\u8CFA" +
++ "\u8CFB\u8D07\u8D0A\u8D0F\u8D0D\u8D12\u8D10\u8D13" +
++ "\u8D14\u8D16\u8D67\u8D6D\u8D71\u8D76\uFA23\u8D81" +
++ "\u8DC2\u8DBE\u8DBA\u8DCF\u8DDA\u8DD6\u8DCC\u8DDB" +
++ "\u8DCB\u8DEA\u8DEB\u8DDF\u8DE3\u8DFC\u8E08\u8DFF" +
++ "\u8E09\u8E1D\u8E1E\u8E10\u8E1F\u8E42\u8E35\u8E30" +
++ "\u8E34\u8E4A\u8E47\u8E49\u8E4C\u8E50\u8E48\u8E59" +
++ "\u8E64\u8E60\u8E55\u8E63\u8E76\u8E72\u8E87\u8E7C" +
++ "\u8E81\u8E85\u8E84\u8E8B\u8E8A\u8E93\u8E91\u8E94" +
++ "\u8E99\u8EA1\u8EAA\u8EB1\u8EBE\u8EC6\u8EC5\u8EC8" +
++ "\u8ECB\u8ECF\u8EDB\u8EE3\u8EFC\u8EFB\u8EEB\u8EFE" +
++ "\u8F0A\u8F0C\u8F05\u8F15\u8F12\u8F13\u8F1C\u8F19" +
++ "\u8F1F\u8F26\u8F33\u8F3B\u8F39\u8F45\u8F42\u8F3E" +
++ "\u8F49\u8F46\u8F4C\u8F4E\u8F57\u8F5C\u8F62\u8F63" +
++ "\u8F64\u8F9C\u8F9F\u8FA3\u8FA8\u8FA7\u8FAD\u8FAF" +
++ "\u8FB7\uFA24\u8FDA\u8FE5\u8FE2\u8FEF\u8FE9\u8FF4" +
++ "\u9005\u8FF9\u8FF8\u9011\u9015\u900E\u9021" ,
++ "\uFFFD\u900D\u901E\u9016\u900B\u9027\u9036\u9039" +
++ "\u904F\uFA25\u9050\u9051\u9052\u9049\u903E\u9056" +
++ "\u9058\u905E\u9068\u9067\u906F\u9076\u96A8\u9072" +
++ "\u9082\u907D\u9089\u9080\u908F\u6248\u90AF\u90B1" +
++ "\u90B5\u90E2\u90E4\u90DB\u90DE\u9102\uFA26\u9115" +
++ "\u9112\u9119\u9132\u9127\u9130\u914A\u9156\u9158" +
++ "\u9163\u9165\u9169\u9173\u9172\u918B\u9189\u9182" +
++ "\u91A2\u91AB\u91AF\u91AA\u91B5\u91B4\u91BA\u91C0" +
++ "\u91C1\u91CB\u91D0\u91DA\u91DB\u91D7\u91DE\u91D6" +
++ "\u91DF\u91E1\u91ED\u91F5\u91EE\u91E4\u91F6\u91E5" +
++ "\u9206\u921E\u91FF\u9210\u9214\u920A\u922C\u9215" +
++ "\u9229\u9257\u9245\u923A\u9249\u9264\u9240\u923C" +
++ "\u9248\u924E\u9250\u9259\u923F\u9251\u9239\u924B" +
++ "\u9267\u925A\u929C\u92A7\u9277\u9278\u9296\u9293" +
++ "\u929B\u9295\u92E9\u92CF\u92E7\u92D7\u92D9\u92D0" +
++ "\uFA27\u92D5\u92B9\u92B7\u92E0\u92D3\u933A\u9335" +
++ "\u930F\u9325\u92FA\u9321\u9344\u92FB\uFA28\u9319" +
++ "\u931E\u92FF\u9322\u931A\u931D\u9323\u9302\u933B" +
++ "\u9370\u9360\u937C\u936E\u9356\u9357\u93B9\u93B0" +
++ "\u93A4\u93AD\u9394\u93C8\u93D6\u93C6\u93D7\u93E8" +
++ "\u93E5\u93D8\u93C3\u93DD\u93DE\u93D0\u93E4\u941A" +
++ "\u93F8\u9414\u9413\u9421\u9403\u9407\u9436\u942B" +
++ "\u9431\u943A\u9441\u9452\u9445\u9444\u9448\u945B" +
++ "\u945A\u9460\u9462\u945E\u946A\u9475\u9470" ,
++ "\uFFFD\u9477\u947F\u947D\u947C\u947E\u9481\u9582" +
++ "\u9587\u958A\u9592\u9594\u9596\u9598\u9599\u95A0" +
++ "\u95A8\u95A7\u95AD\u95BC\u95BB\u95B9\u95BE\u95CA" +
++ "\u6FF6\u95C3\u95CD\u95CC\u95D5\u95D4\u95D6\u95DC" +
++ "\u95E1\u95E5\u95E2\u9621\u9628\u962E\u962F\u9642" +
++ "\u964F\u964C\u964B\u965C\u965D\u965F\u9666\u9677" +
++ "\u9672\u966C\u968D\u968B\uF9DC\u9698\u9695\u9697" +
++ "\uFA29\u969D\u96A7\u96AA\u96B1\u96B2\u96B0\u96AF" +
++ "\u96B4\u96B6\u96B8\u96B9\u96CE\u96CB\u96D5\u96DC" +
++ "\u96D9\u96F9\u9704\u9706\u9708\u9719\u970D\u9713" +
++ "\u970E\u9711\u970F\u9716\u9724\u972A\u9730\u9733" +
++ "\u9739\u973B\u973D\u973E\u9746\u9744\u9743\u9748" +
++ "\u9742\u9749\u974D\u974F\u9751\u9755\u975C\u9760" +
++ "\u9764\u9766\u9768\u976D\u9779\u9785\u977C\u9781" +
++ "\u977A\u978B\u978F\u9790\u979C\u97A8\u97A6\u97A3" +
++ "\u97B3\u97B4\u97C3\u97C6\u97C8\u97CB\u97DC\u97ED" +
++ "\u97F2\u7ADF\u97F5\u980F\u981A\u9824\u9821\u9837" +
++ "\u983D\u984F\u984B\u9857\u9865\u986B\u986F\u9870" +
++ "\u9871\u9874\u9873\u98AA\u98AF\u98B1\u98B6\u98C4" +
++ "\u98C3\u98C6\u98DC\u98ED\u98E9\uFA2A\u98EB\uFA2B" +
++ "\u9903\u991D\u9912\u9914\u9918\u9927\uFA2C\u9921" +
++ "\u991E\u9924\u9920\u992C\u992E\u993D\u993E\u9942" +
++ "\u9949\u9945\u9950\u994B\u9951\u994C\u9955\u9997" +
++ "\u9998\u999E\u99A5\u99AD\u99AE\u99BC\u99DF" ,
++ "\uFFFD\u99DB\u99DD\u99D8\u99D1\u99ED\u99EE\u99E2" +
++ "\u99F1\u99F2\u99FB\u99F8\u9A01\u9A0F\u9A05\u9A19" +
++ "\u9A2B\u9A37\u9A40\u9A45\u9A42\u9A43\u9A3E\u9A55" +
++ "\u9A4D\u9A4E\u9A5B\u9A57\u9A5F\u9A62\u9A69\u9A65" +
++ "\u9A64\u9A6A\u9A6B\u9AAD\u9AB0\u9ABC\u9AC0\u9ACF" +
++ "\u9AD3\u9AD4\u9AD1\u9AD9\u9ADC\u9ADE\u9ADF\u9AE2" +
++ "\u9AE3\u9AE6\u9AEF\u9AEB\u9AEE\u9AF4\u9AF1\u9AF7" +
++ "\u9AFB\u9B06\u9B18\u9B1A\u9B1F\u9B22\u9B23\u9B25" +
++ "\u9B27\u9B28\u9B29\u9B2A\u9B2E\u9B2F\u9B31\u9B32" +
++ "\u9B3B\u9B44\u9B43\u9B4D\u9B4E\u9B51\u9B58\u9B75" +
++ "\u9B74\u9B72\u9B93\u9B8F\u9B83\u9B91\u9B96\u9B97" +
++ "\u9B9F\u9BA0\u9BA8\u9BB1\u9BB4\u9BC0\u9BCA\u9BBB" +
++ "\u9BB9\u9BC6\u9BCF\u9BD1\u9BD2\u9BE3\u9BE2\u9BE4" +
++ "\u9BD4\u9BE1\u9BF5\u9BF1\u9BF2\u9C04\u9C1B\u9C15" +
++ "\u9C14\u9C00\u9C09\u9C13\u9C0C\u9C06\u9C08\u9C12" +
++ "\u9C0A\u9C2E\u9C25\u9C24\u9C21\u9C30\u9C47\u9C32" +
++ "\u9C46\u9C3E\u9C5A\u9C60\u9C67\u9C76\u9C78\u9CEB" +
++ "\u9CE7\u9CEC\u9CF0\u9D09\u9D03\u9D06\u9D2A\u9D26" +
++ "\u9D2C\u9D23\u9D1F\u9D15\u9D12\u9D41\u9D3F\u9D44" +
++ "\u9D3E\u9D46\u9D48\u9D5D\u9D5E\u9D59\u9D51\u9D50" +
++ "\u9D64\u9D72\u9D70\u9D87\u9D6B\u9D6F\u9D7A\u9D9A" +
++ "\u9DA4\u9DA9\u9DAB\u9DB2\u9DC4\u9DC1\u9DBB\u9DB8" +
++ "\u9DBA\u9DC6\u9DCF\u9DC2\uFA2D\u9DD9\u9DD3\u9DF8" +
++ "\u9DE6\u9DED\u9DEF\u9DFD\u9E1A\u9E1B\u9E19" ,
++ "\uFFFD\u9E1E\u9E75\u9E79\u9E7D\u9E81\u9E88\u9E8B" +
++ "\u9E8C\u9E95\u9E91\u9E9D\u9EA5\u9EB8\u9EAA\u9EAD" +
++ "\u9EBC\u9EBE\u9761\u9ECC\u9ECF\u9ED0\u9ED1\u9ED4" +
++ "\u9EDC\u9EDE\u9EDD\u9EE0\u9EE5\u9EE8\u9EEF\u9EF4" +
++ "\u9EF6\u9EF7\u9EF9\u9EFB\u9EFC\u9EFD\u9F07\u9F08" +
++ "\u76B7\u9F15\u9F21\u9F2C\u9F3E\u9F4A\u9F4E\u9F4F" +
++ "\u9F52\u9F54\u9F63\u9F5F\u9F60\u9F61\u9F66\u9F67" +
++ "\u9F6C\u9F6A\u9F77\u9F72\u9F76\u9F95\u9F9C\u9FA0" +
++ "\u5C2D\u69D9\u9065\u7476\u51DC\u7155\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
++ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
++ "\uFFFD\uE000\uE001\uE002\uE003\uE004\uE005\uE006" +
++ "\uE007\uE008\uE009\uE00A\uE00B\uE00C\uE00D\uE00E" +
++ "\uE00F\uE010\uE011\uE012\uE013\uE014\uE015\uE016" +
++ "\uE017\uE018\uE019\uE01A\uE01B\uE01C\uE01D\uE01E" +
++ "\uE01F\uE020\uE021\uE022\uE023\uE024\uE025\uE026" +
++ "\uE027\uE028\uE029\uE02A\uE02B\uE02C\uE02D\uE02E" +
++ "\uE02F\uE030\uE031\uE032\uE033\uE034\uE035\uE036" +
++ "\uE037\uE038\uE039\uE03A\uE03B\uE03C\uE03D\uE03E" +
++ "\uE03F\uE040\uE041\uE042\uE043\uE044\uE045\uE046" +
++ "\uE047\uE048\uE049\uE04A\uE04B\uE04C\uE04D\uE04E" +
++ "\uE04F\uE050\uE051\uE052\uE053\uE054\uE055\uE056" +
++ "\uE057\uE058\uE059\uE05A\uE05B\uE05C\uE05D\uE05E" +
++ "\uE05F\uE060\uE061\uE062\uE063\uE064\uE065\uE066" +
++ "\uE067\uE068\uE069\uE06A\uE06B\uE06C\uE06D\uE06E" +
++ "\uE06F\uE070\uE071\uE072\uE073\uE074\uE075\uE076" +
++ "\uE077\uE078\uE079\uE07A\uE07B\uE07C\uE07D\uE07E" +
++ "\uE07F\uE080\uE081\uE082\uE083\uE084\uE085\uE086" +
++ "\uE087\uE088\uE089\uE08A\uE08B\uE08C\uE08D\uE08E" +
++ "\uE08F\uE090\uE091\uE092\uE093\uE094\uE095\uE096" +
++ "\uE097\uE098\uE099\uE09A\uE09B\uE09C\uE09D\uE09E" +
++ "\uE09F\uE0A0\uE0A1\uE0A2\uE0A3\uE0A4\uE0A5\uE0A6" +
++ "\uE0A7\uE0A8\uE0A9\uE0AA\uE0AB\uE0AC\uE0AD\uE0AE" +
++ "\uE0AF\uE0B0\uE0B1\uE0B2\uE0B3\uE0B4\uE0B5\uE0B6" +
++ "\uE0B7\uE0B8\uE0B9\uE0BA\uE0BB\uE0BC\uE0BD" ,
++ "\uFFFD\uE0BE\uE0BF\uE0C0\uE0C1\uE0C2\uE0C3\uE0C4" +
++ "\uE0C5\uE0C6\uE0C7\uE0C8\uE0C9\uE0CA\uE0CB\uE0CC" +
++ "\uE0CD\uE0CE\uE0CF\uE0D0\uE0D1\uE0D2\uE0D3\uE0D4" +
++ "\uE0D5\uE0D6\uE0D7\uE0D8\uE0D9\uE0DA\uE0DB\uE0DC" +
++ "\uE0DD\uE0DE\uE0DF\uE0E0\uE0E1\uE0E2\uE0E3\uE0E4" +
++ "\uE0E5\uE0E6\uE0E7\uE0E8\uE0E9\uE0EA\uE0EB\uE0EC" +
++ "\uE0ED\uE0EE\uE0EF\uE0F0\uE0F1\uE0F2\uE0F3\uE0F4" +
++ "\uE0F5\uE0F6\uE0F7\uE0F8\uE0F9\uE0FA\uE0FB\uE0FC" +
++ "\uE0FD\uE0FE\uE0FF\uE100\uE101\uE102\uE103\uE104" +
++ "\uE105\uE106\uE107\uE108\uE109\uE10A\uE10B\uE10C" +
++ "\uE10D\uE10E\uE10F\uE110\uE111\uE112\uE113\uE114" +
++ "\uE115\uE116\uE117\uE118\uE119\uE11A\uE11B\uE11C" +
++ "\uE11D\uE11E\uE11F\uE120\uE121\uE122\uE123\uE124" +
++ "\uE125\uE126\uE127\uE128\uE129\uE12A\uE12B\uE12C" +
++ "\uE12D\uE12E\uE12F\uE130\uE131\uE132\uE133\uE134" +
++ "\uE135\uE136\uE137\uE138\uE139\uE13A\uE13B\uE13C" +
++ "\uE13D\uE13E\uE13F\uE140\uE141\uE142\uE143\uE144" +
++ "\uE145\uE146\uE147\uE148\uE149\uE14A\uE14B\uE14C" +
++ "\uE14D\uE14E\uE14F\uE150\uE151\uE152\uE153\uE154" +
++ "\uE155\uE156\uE157\uE158\uE159\uE15A\uE15B\uE15C" +
++ "\uE15D\uE15E\uE15F\uE160\uE161\uE162\uE163\uE164" +
++ "\uE165\uE166\uE167\uE168\uE169\uE16A\uE16B\uE16C" +
++ "\uE16D\uE16E\uE16F\uE170\uE171\uE172\uE173\uE174" +
++ "\uE175\uE176\uE177\uE178\uE179\uE17A\uE17B" ,
++ "\uFFFD\uE17C\uE17D\uE17E\uE17F\uE180\uE181\uE182" +
++ "\uE183\uE184\uE185\uE186\uE187\uE188\uE189\uE18A" +
++ "\uE18B\uE18C\uE18D\uE18E\uE18F\uE190\uE191\uE192" +
++ "\uE193\uE194\uE195\uE196\uE197\uE198\uE199\uE19A" +
++ "\uE19B\uE19C\uE19D\uE19E\uE19F\uE1A0\uE1A1\uE1A2" +
++ "\uE1A3\uE1A4\uE1A5\uE1A6\uE1A7\uE1A8\uE1A9\uE1AA" +
++ "\uE1AB\uE1AC\uE1AD\uE1AE\uE1AF\uE1B0\uE1B1\uE1B2" +
++ "\uE1B3\uE1B4\uE1B5\uE1B6\uE1B7\uE1B8\uE1B9\uE1BA" +
++ "\uE1BB\uE1BC\uE1BD\uE1BE\uE1BF\uE1C0\uE1C1\uE1C2" +
++ "\uE1C3\uE1C4\uE1C5\uE1C6\uE1C7\uE1C8\uE1C9\uE1CA" +
++ "\uE1CB\uE1CC\uE1CD\uE1CE\uE1CF\uE1D0\uE1D1\uE1D2" +
++ "\uE1D3\uE1D4\uE1D5\uE1D6\uE1D7\uE1D8\uE1D9\uE1DA" +
++ "\uE1DB\uE1DC\uE1DD\uE1DE\uE1DF\uE1E0\uE1E1\uE1E2" +
++ "\uE1E3\uE1E4\uE1E5\uE1E6\uE1E7\uE1E8\uE1E9\uE1EA" +
++ "\uE1EB\uE1EC\uE1ED\uE1EE\uE1EF\uE1F0\uE1F1\uE1F2" +
++ "\uE1F3\uE1F4\uE1F5\uE1F6\uE1F7\uE1F8\uE1F9\uE1FA" +
++ "\uE1FB\uE1FC\uE1FD\uE1FE\uE1FF\uE200\uE201\uE202" +
++ "\uE203\uE204\uE205\uE206\uE207\uE208\uE209\uE20A" +
++ "\uE20B\uE20C\uE20D\uE20E\uE20F\uE210\uE211\uE212" +
++ "\uE213\uE214\uE215\uE216\uE217\uE218\uE219\uE21A" +
++ "\uE21B\uE21C\uE21D\uE21E\uE21F\uE220\uE221\uE222" +
++ "\uE223\uE224\uE225\uE226\uE227\uE228\uE229\uE22A" +
++ "\uE22B\uE22C\uE22D\uE22E\uE22F\uE230\uE231\uE232" +
++ "\uE233\uE234\uE235\uE236\uE237\uE238\uE239" ,
++ "\uFFFD\uE23A\uE23B\uE23C\uE23D\uE23E\uE23F\uE240" +
++ "\uE241\uE242\uE243\uE244\uE245\uE246\uE247\uE248" +
++ "\uE249\uE24A\uE24B\uE24C\uE24D\uE24E\uE24F\uE250" +
++ "\uE251\uE252\uE253\uE254\uE255\uE256\uE257\uE258" +
++ "\uE259\uE25A\uE25B\uE25C\uE25D\uE25E\uE25F\uE260" +
++ "\uE261\uE262\uE263\uE264\uE265\uE266\uE267\uE268" +
++ "\uE269\uE26A\uE26B\uE26C\uE26D\uE26E\uE26F\uE270" +
++ "\uE271\uE272\uE273\uE274\uE275\uE276\uE277\uE278" +
++ "\uE279\uE27A\uE27B\uE27C\uE27D\uE27E\uE27F\uE280" +
++ "\uE281\uE282\uE283\uE284\uE285\uE286\uE287\uE288" +
++ "\uE289\uE28A\uE28B\uE28C\uE28D\uE28E\uE28F\uE290" +
++ "\uE291\uE292\uE293\uE294\uE295\uE296\uE297\uE298" +
++ "\uE299\uE29A\uE29B\uE29C\uE29D\uE29E\uE29F\uE2A0" +
++ "\uE2A1\uE2A2\uE2A3\uE2A4\uE2A5\uE2A6\uE2A7\uE2A8" +
++ "\uE2A9\uE2AA\uE2AB\uE2AC\uE2AD\uE2AE\uE2AF\uE2B0" +
++ "\uE2B1\uE2B2\uE2B3\uE2B4\uE2B5\uE2B6\uE2B7\uE2B8" +
++ "\uE2B9\uE2BA\uE2BB\uE2BC\uE2BD\uE2BE\uE2BF\uE2C0" +
++ "\uE2C1\uE2C2\uE2C3\uE2C4\uE2C5\uE2C6\uE2C7\uE2C8" +
++ "\uE2C9\uE2CA\uE2CB\uE2CC\uE2CD\uE2CE\uE2CF\uE2D0" +
++ "\uE2D1\uE2D2\uE2D3\uE2D4\uE2D5\uE2D6\uE2D7\uE2D8" +
++ "\uE2D9\uE2DA\uE2DB\uE2DC\uE2DD\uE2DE\uE2DF\uE2E0" +
++ "\uE2E1\uE2E2\uE2E3\uE2E4\uE2E5\uE2E6\uE2E7\uE2E8" +
++ "\uE2E9\uE2EA\uE2EB\uE2EC\uE2ED\uE2EE\uE2EF\uE2F0" +
++ "\uE2F1\uE2F2\uE2F3\uE2F4\uE2F5\uE2F6\uE2F7" ,
++ "\uFFFD\uE2F8\uE2F9\uE2FA\uE2FB\uE2FC\uE2FD\uE2FE" +
++ "\uE2FF\uE300\uE301\uE302\uE303\uE304\uE305\uE306" +
++ "\uE307\uE308\uE309\uE30A\uE30B\uE30C\uE30D\uE30E" +
++ "\uE30F\uE310\uE311\uE312\uE313\uE314\uE315\uE316" +
++ "\uE317\uE318\uE319\uE31A\uE31B\uE31C\uE31D\uE31E" +
++ "\uE31F\uE320\uE321\uE322\uE323\uE324\uE325\uE326" +
++ "\uE327\uE328\uE329\uE32A\uE32B\uE32C\uE32D\uE32E" +
++ "\uE32F\uE330\uE331\uE332\uE333\uE334\uE335\uE336" +
++ "\uE337\uE338\uE339\uE33A\uE33B\uE33C\uE33D\uE33E" +
++ "\uE33F\uE340\uE341\uE342\uE343\uE344\uE345\uE346" +
++ "\uE347\uE348\uE349\uE34A\uE34B\uE34C\uE34D\uE34E" +
++ "\uE34F\uE350\uE351\uE352\uE353\uE354\uE355\uE356" +
++ "\uE357\uE358\uE359\uE35A\uE35B\uE35C\uE35D\uE35E" +
++ "\uE35F\uE360\uE361\uE362\uE363\uE364\uE365\uE366" +
++ "\uE367\uE368\uE369\uE36A\uE36B\uE36C\uE36D\uE36E" +
++ "\uE36F\uE370\uE371\uE372\uE373\uE374\uE375\uE376" +
++ "\uE377\uE378\uE379\uE37A\uE37B\uE37C\uE37D\uE37E" +
++ "\uE37F\uE380\uE381\uE382\uE383\uE384\uE385\uE386" +
++ "\uE387\uE388\uE389\uE38A\uE38B\uE38C\uE38D\uE38E" +
++ "\uE38F\uE390\uE391\uE392\uE393\uE394\uE395\uE396" +
++ "\uE397\uE398\uE399\uE39A\uE39B\uE39C\uE39D\uE39E" +
++ "\uE39F\uE3A0\uE3A1\uE3A2\uE3A3\uE3A4\uE3A5\uE3A6" +
++ "\uE3A7\uE3A8\uE3A9\uE3AA\uE3AB\uE3AC\uE3AD\uE3AE" +
++ "\uE3AF\uE3B0\uE3B1\uE3B2\uE3B3\uE3B4\uE3B5" ,
++ "\uFFFD\uE3B6\uE3B7\uE3B8\uE3B9\uE3BA\uE3BB\uE3BC" +
++ "\uE3BD\uE3BE\uE3BF\uE3C0\uE3C1\uE3C2\uE3C3\uE3C4" +
++ "\uE3C5\uE3C6\uE3C7\uE3C8\uE3C9\uE3CA\uE3CB\uE3CC" +
++ "\uE3CD\uE3CE\uE3CF\uE3D0\uE3D1\uE3D2\uE3D3\uE3D4" +
++ "\uE3D5\uE3D6\uE3D7\uE3D8\uE3D9\uE3DA\uE3DB\uE3DC" +
++ "\uE3DD\uE3DE\uE3DF\uE3E0\uE3E1\uE3E2\uE3E3\uE3E4" +
++ "\uE3E5\uE3E6\uE3E7\uE3E8\uE3E9\uE3EA\uE3EB\uE3EC" +
++ "\uE3ED\uE3EE\uE3EF\uE3F0\uE3F1\uE3F2\uE3F3\uE3F4" +
++ "\uE3F5\uE3F6\uE3F7\uE3F8\uE3F9\uE3FA\uE3FB\uE3FC" +
++ "\uE3FD\uE3FE\uE3FF\uE400\uE401\uE402\uE403\uE404" +
++ "\uE405\uE406\uE407\uE408\uE409\uE40A\uE40B\uE40C" +
++ "\uE40D\uE40E\uE40F\uE410\uE411\uE412\uE413\uE414" +
++ "\uE415\uE416\uE417\uE418\uE419\uE41A\uE41B\uE41C" +
++ "\uE41D\uE41E\uE41F\uE420\uE421\uE422\uE423\uE424" +
++ "\uE425\uE426\uE427\uE428\uE429\uE42A\uE42B\uE42C" +
++ "\uE42D\uE42E\uE42F\uE430\uE431\uE432\uE433\uE434" +
++ "\uE435\uE436\uE437\uE438\uE439\uE43A\uE43B\uE43C" +
++ "\uE43D\uE43E\uE43F\uE440\uE441\uE442\uE443\uE444" +
++ "\uE445\uE446\uE447\uE448\uE449\uE44A\uE44B\uE44C" +
++ "\uE44D\uE44E\uE44F\uE450\uE451\uE452\uE453\uE454" +
++ "\uE455\uE456\uE457\uE458\uE459\uE45A\uE45B\uE45C" +
++ "\uE45D\uE45E\uE45F\uE460\uE461\uE462\uE463\uE464" +
++ "\uE465\uE466\uE467\uE468\uE469\uE46A\uE46B\uE46C" +
++ "\uE46D\uE46E\uE46F\uE470\uE471\uE472\uE473" ,
++ "\uFFFD\uE474\uE475\uE476\uE477\uE478\uE479\uE47A" +
++ "\uE47B\uE47C\uE47D\uE47E\uE47F\uE480\uE481\uE482" +
++ "\uE483\uE484\uE485\uE486\uE487\uE488\uE489\uE48A" +
++ "\uE48B\uE48C\uE48D\uE48E\uE48F\uE490\uE491\uE492" +
++ "\uE493\uE494\uE495\uE496\uE497\uE498\uE499\uE49A" +
++ "\uE49B\uE49C\uE49D\uE49E\uE49F\uE4A0\uE4A1\uE4A2" +
++ "\uE4A3\uE4A4\uE4A5\uE4A6\uE4A7\uE4A8\uE4A9\uE4AA" +
++ "\uE4AB\uE4AC\uE4AD\uE4AE\uE4AF\uE4B0\uE4B1\uE4B2" +
++ "\uE4B3\uE4B4\uE4B5\uE4B6\uE4B7\uE4B8\uE4B9\uE4BA" +
++ "\uE4BB\uE4BC\uE4BD\uE4BE\uE4BF\uE4C0\uE4C1\uE4C2" +
++ "\uE4C3\uE4C4\uE4C5\uE4C6\uE4C7\uE4C8\uE4C9\uE4CA" +
++ "\uE4CB\uE4CC\uE4CD\uE4CE\uE4CF\uE4D0\uE4D1\uE4D2" +
++ "\uE4D3\uE4D4\uE4D5\uE4D6\uE4D7\uE4D8\uE4D9\uE4DA" +
++ "\uE4DB\uE4DC\uE4DD\uE4DE\uE4DF\uE4E0\uE4E1\uE4E2" +
++ "\uE4E3\uE4E4\uE4E5\uE4E6\uE4E7\uE4E8\uE4E9\uE4EA" +
++ "\uE4EB\uE4EC\uE4ED\uE4EE\uE4EF\uE4F0\uE4F1\uE4F2" +
++ "\uE4F3\uE4F4\uE4F5\uE4F6\uE4F7\uE4F8\uE4F9\uE4FA" +
++ "\uE4FB\uE4FC\uE4FD\uE4FE\uE4FF\uE500\uE501\uE502" +
++ "\uE503\uE504\uE505\uE506\uE507\uE508\uE509\uE50A" +
++ "\uE50B\uE50C\uE50D\uE50E\uE50F\uE510\uE511\uE512" +
++ "\uE513\uE514\uE515\uE516\uE517\uE518\uE519\uE51A" +
++ "\uE51B\uE51C\uE51D\uE51E\uE51F\uE520\uE521\uE522" +
++ "\uE523\uE524\uE525\uE526\uE527\uE528\uE529\uE52A" +
++ "\uE52B\uE52C\uE52D\uE52E\uE52F\uE530\uE531" ,
++ "\uFFFD\uE532\uE533\uE534\uE535\uE536\uE537\uE538" +
++ "\uE539\uE53A\uE53B\uE53C\uE53D\uE53E\uE53F\uE540" +
++ "\uE541\uE542\uE543\uE544\uE545\uE546\uE547\uE548" +
++ "\uE549\uE54A\uE54B\uE54C\uE54D\uE54E\uE54F\uE550" +
++ "\uE551\uE552\uE553\uE554\uE555\uE556\uE557\uE558" +
++ "\uE559\uE55A\uE55B\uE55C\uE55D\uE55E\uE55F\uE560" +
++ "\uE561\uE562\uE563\uE564\uE565\uE566\uE567\uE568" +
++ "\uE569\uE56A\uE56B\uE56C\uE56D\uE56E\uE56F\uE570" +
++ "\uE571\uE572\uE573\uE574\uE575\uE576\uE577\uE578" +
++ "\uE579\uE57A\uE57B\uE57C\uE57D\uE57E\uE57F\uE580" +
++ "\uE581\uE582\uE583\uE584\uE585\uE586\uE587\uE588" +
++ "\uE589\uE58A\uE58B\uE58C\uE58D\uE58E\uE58F\uE590" +
++ "\uE591\uE592\uE593\uE594\uE595\uE596\uE597\uE598" +
++ "\uE599\uE59A\uE59B\uE59C\uE59D\uE59E\uE59F\uE5A0" +
++ "\uE5A1\uE5A2\uE5A3\uE5A4\uE5A5\uE5A6\uE5A7\uE5A8" +
++ "\uE5A9\uE5AA\uE5AB\uE5AC\uE5AD\uE5AE\uE5AF\uE5B0" +
++ "\uE5B1\uE5B2\uE5B3\uE5B4\uE5B5\uE5B6\uE5B7\uE5B8" +
++ "\uE5B9\uE5BA\uE5BB\uE5BC\uE5BD\uE5BE\uE5BF\uE5C0" +
++ "\uE5C1\uE5C2\uE5C3\uE5C4\uE5C5\uE5C6\uE5C7\uE5C8" +
++ "\uE5C9\uE5CA\uE5CB\uE5CC\uE5CD\uE5CE\uE5CF\uE5D0" +
++ "\uE5D1\uE5D2\uE5D3\uE5D4\uE5D5\uE5D6\uE5D7\uE5D8" +
++ "\uE5D9\uE5DA\uE5DB\uE5DC\uE5DD\uE5DE\uE5DF\uE5E0" +
++ "\uE5E1\uE5E2\uE5E3\uE5E4\uE5E5\uE5E6\uE5E7\uE5E8" +
++ "\uE5E9\uE5EA\uE5EB\uE5EC\uE5ED\uE5EE\uE5EF" ,
++ "\uFFFD\uE5F0\uE5F1\uE5F2\uE5F3\uE5F4\uE5F5\uE5F6" +
++ "\uE5F7\uE5F8\uE5F9\uE5FA\uE5FB\uE5FC\uE5FD\uE5FE" +
++ "\uE5FF\uE600\uE601\uE602\uE603\uE604\uE605\uE606" +
++ "\uE607\uE608\uE609\uE60A\uE60B\uE60C\uE60D\uE60E" +
++ "\uE60F\uE610\uE611\uE612\uE613\uE614\uE615\uE616" +
++ "\uE617\uE618\uE619\uE61A\uE61B\uE61C\uE61D\uE61E" +
++ "\uE61F\uE620\uE621\uE622\uE623\uE624\uE625\uE626" +
++ "\uE627\uE628\uE629\uE62A\uE62B\uE62C\uE62D\uE62E" +
++ "\uE62F\uE630\uE631\uE632\uE633\uE634\uE635\uE636" +
++ "\uE637\uE638\uE639\uE63A\uE63B\uE63C\uE63D\uE63E" +
++ "\uE63F\uE640\uE641\uE642\uE643\uE644\uE645\uE646" +
++ "\uE647\uE648\uE649\uE64A\uE64B\uE64C\uE64D\uE64E" +
++ "\uE64F\uE650\uE651\uE652\uE653\uE654\uE655\uE656" +
++ "\uE657\uE658\uE659\uE65A\uE65B\uE65C\uE65D\uE65E" +
++ "\uE65F\uE660\uE661\uE662\uE663\uE664\uE665\uE666" +
++ "\uE667\uE668\uE669\uE66A\uE66B\uE66C\uE66D\uE66E" +
++ "\uE66F\uE670\uE671\uE672\uE673\uE674\uE675\uE676" +
++ "\uE677\uE678\uE679\uE67A\uE67B\uE67C\uE67D\uE67E" +
++ "\uE67F\uE680\uE681\uE682\uE683\uE684\uE685\uE686" +
++ "\uE687\uE688\uE689\uE68A\uE68B\uE68C\uE68D\uE68E" +
++ "\uE68F\uE690\uE691\uE692\uE693\uE694\uE695\uE696" +
++ "\uE697\uE698\uE699\uE69A\uE69B\uE69C\uE69D\uE69E" +
++ "\uE69F\uE6A0\uE6A1\uE6A2\uE6A3\uE6A4\uE6A5\uE6A6" +
++ "\uE6A7\uE6A8\uE6A9\uE6AA\uE6AB\uE6AC\uE6AD" ,
++ "\uFFFD\uE6AE\uE6AF\uE6B0\uE6B1\uE6B2\uE6B3\uE6B4" +
++ "\uE6B5\uE6B6\uE6B7\uE6B8\uE6B9\uE6BA\uE6BB\uE6BC" +
++ "\uE6BD\uE6BE\uE6BF\uE6C0\uE6C1\uE6C2\uE6C3\uE6C4" +
++ "\uE6C5\uE6C6\uE6C7\uE6C8\uE6C9\uE6CA\uE6CB\uE6CC" +
++ "\uE6CD\uE6CE\uE6CF\uE6D0\uE6D1\uE6D2\uE6D3\uE6D4" +
++ "\uE6D5\uE6D6\uE6D7\uE6D8\uE6D9\uE6DA\uE6DB\uE6DC" +
++ "\uE6DD\uE6DE\uE6DF\uE6E0\uE6E1\uE6E2\uE6E3\uE6E4" +
++ "\uE6E5\uE6E6\uE6E7\uE6E8\uE6E9\uE6EA\uE6EB\uE6EC" +
++ "\uE6ED\uE6EE\uE6EF\uE6F0\uE6F1\uE6F2\uE6F3\uE6F4" +
++ "\uE6F5\uE6F6\uE6F7\uE6F8\uE6F9\uE6FA\uE6FB\uE6FC" +
++ "\uE6FD\uE6FE\uE6FF\uE700\uE701\uE702\uE703\uE704" +
++ "\uE705\uE706\uE707\uE708\uE709\uE70A\uE70B\uE70C" +
++ "\uE70D\uE70E\uE70F\uE710\uE711\uE712\uE713\uE714" +
++ "\uE715\uE716\uE717\uE718\uE719\uE71A\uE71B\uE71C" +
++ "\uE71D\uE71E\uE71F\uE720\uE721\uE722\uE723\uE724" +
++ "\uE725\uE726\uE727\uE728\uE729\uE72A\uE72B\uE72C" +
++ "\uE72D\uE72E\uE72F\uE730\uE731\uE732\uE733\uE734" +
++ "\uE735\uE736\uE737\uE738\uE739\uE73A\uE73B\uE73C" +
++ "\uE73D\uE73E\uE73F\uE740\uE741\uE742\uE743\uE744" +
++ "\uE745\uE746\uE747\uE748\uE749\uE74A\uE74B\uE74C" +
++ "\uE74D\uE74E\uE74F\uE750\uE751\uE752\uE753\uE754" +
++ "\uE755\uE756\uE757\uE758\uE759\uE75A\uE75B\uE75C" +
++ "\uE75D\uE75E\uE75F\uE760\uE761\uE762\uE763\uE764" +
++ "\uE765\uE766\uE767\uE768\uE769\uE76A\uE76B" ,
++ "\uFFFD\uE76C\uE76D\uE76E\uE76F\uE770\uE771\uE772" +
++ "\uE773\uE774\uE775\uE776\uE777\uE778\uE779\uE77A" +
++ "\uE77B\uE77C\uE77D\uE77E\uE77F\uE780\uE781\uE782" +
++ "\uE783\uE784\uE785\uE786\uE787\uE788\uE789\uE78A" +
++ "\uE78B\uE78C\uE78D\uE78E\uE78F\uE790\uE791\uE792" +
++ "\uE793\uE794\uE795\uE796\uE797\uE798\uE799\uE79A" +
++ "\uE79B\uE79C\uE79D\uE79E\uE79F\uE7A0\uE7A1\uE7A2" +
++ "\uE7A3\uE7A4\uE7A5\uE7A6\uE7A7\uE7A8\uE7A9\uE7AA" +
++ "\uE7AB\uE7AC\uE7AD\uE7AE\uE7AF\uE7B0\uE7B1\uE7B2" +
++ "\uE7B3\uE7B4\uE7B5\uE7B6\uE7B7\uE7B8\uE7B9\uE7BA" +
++ "\uE7BB\uE7BC\uE7BD\uE7BE\uE7BF\uE7C0\uE7C1\uE7C2" +
++ "\uE7C3\uE7C4\uE7C5\uE7C6\uE7C7\uE7C8\uE7C9\uE7CA" +
++ "\uE7CB\uE7CC\uE7CD\uE7CE\uE7CF\uE7D0\uE7D1\uE7D2" +
++ "\uE7D3\uE7D4\uE7D5\uE7D6\uE7D7\uE7D8\uE7D9\uE7DA" +
++ "\uE7DB\uE7DC\uE7DD\uE7DE\uE7DF\uE7E0\uE7E1\uE7E2" +
++ "\uE7E3\uE7E4\uE7E5\uE7E6\uE7E7\uE7E8\uE7E9\uE7EA" +
++ "\uE7EB\uE7EC\uE7ED\uE7EE\uE7EF\uE7F0\uE7F1\uE7F2" +
++ "\uE7F3\uE7F4\uE7F5\uE7F6\uE7F7\uE7F8\uE7F9\uE7FA" +
++ "\uE7FB\uE7FC\uE7FD\uE7FE\uE7FF\uE800\uE801\uE802" +
++ "\uE803\uE804\uE805\uE806\uE807\uE808\uE809\uE80A" +
++ "\uE80B\uE80C\uE80D\uE80E\uE80F\uE810\uE811\uE812" +
++ "\uE813\uE814\uE815\uE816\uE817\uE818\uE819\uE81A" +
++ "\uE81B\uE81C\uE81D\uE81E\uE81F\uE820\uE821\uE822" +
++ "\uE823\uE824\uE825\uE826\uE827\uE828\uE829" ,
++ "\uFFFD\uE82A\uE82B\uE82C\uE82D\uE82E\uE82F\uE830" +
++ "\uE831\uE832\uE833\uE834\uE835\uE836\uE837\uE838" +
++ "\uE839\uE83A\uE83B\uE83C\uE83D\uE83E\uE83F\uE840" +
++ "\uE841\uE842\uE843\uE844\uE845\uE846\uE847\uE848" +
++ "\uE849\uE84A\uE84B\uE84C\uE84D\uE84E\uE84F\uE850" +
++ "\uE851\uE852\uE853\uE854\uE855\uE856\uE857\uE858" +
++ "\uE859\uE85A\uE85B\uE85C\uE85D\uE85E\uE85F\uE860" +
++ "\uE861\uE862\uE863\uE864\uE865\uE866\uE867\uE868" +
++ "\uE869\uE86A\uE86B\uE86C\uE86D\uE86E\uE86F\uE870" +
++ "\uE871\uE872\uE873\uE874\uE875\uE876\uE877\uE878" +
++ "\uE879\uE87A\uE87B\uE87C\uE87D\uE87E\uE87F\uE880" +
++ "\uE881\uE882\uE883\uE884\uE885\uE886\uE887\uE888" +
++ "\uE889\uE88A\uE88B\uE88C\uE88D\uE88E\uE88F\uE890" +
++ "\uE891\uE892\uE893\uE894\uE895\uE896\uE897\uE898" +
++ "\uE899\uE89A\uE89B\uE89C\uE89D\uE89E\uE89F\uE8A0" +
++ "\uE8A1\uE8A2\uE8A3\uE8A4\uE8A5\uE8A6\uE8A7\uE8A8" +
++ "\uE8A9\uE8AA\uE8AB\uE8AC\uE8AD\uE8AE\uE8AF\uE8B0" +
++ "\uE8B1\uE8B2\uE8B3\uE8B4\uE8B5\uE8B6\uE8B7\uE8B8" +
++ "\uE8B9\uE8BA\uE8BB\uE8BC\uE8BD\uE8BE\uE8BF\uE8C0" +
++ "\uE8C1\uE8C2\uE8C3\uE8C4\uE8C5\uE8C6\uE8C7\uE8C8" +
++ "\uE8C9\uE8CA\uE8CB\uE8CC\uE8CD\uE8CE\uE8CF\uE8D0" +
++ "\uE8D1\uE8D2\uE8D3\uE8D4\uE8D5\uE8D6\uE8D7\uE8D8" +
++ "\uE8D9\uE8DA\uE8DB\uE8DC\uE8DD\uE8DE\uE8DF\uE8E0" +
++ "\uE8E1\uE8E2\uE8E3\uE8E4\uE8E5\uE8E6\uE8E7" ,
++ "\uFFFD\uE8E8\uE8E9\uE8EA\uE8EB\uE8EC\uE8ED\uE8EE" +
++ "\uE8EF\uE8F0\uE8F1\uE8F2\uE8F3\uE8F4\uE8F5\uE8F6" +
++ "\uE8F7\uE8F8\uE8F9\uE8FA\uE8FB\uE8FC\uE8FD\uE8FE" +
++ "\uE8FF\uE900\uE901\uE902\uE903\uE904\uE905\uE906" +
++ "\uE907\uE908\uE909\uE90A\uE90B\uE90C\uE90D\uE90E" +
++ "\uE90F\uE910\uE911\uE912\uE913\uE914\uE915\uE916" +
++ "\uE917\uE918\uE919\uE91A\uE91B\uE91C\uE91D\uE91E" +
++ "\uE91F\uE920\uE921\uE922\uE923\uE924\uE925\uE926" +
++ "\uE927\uE928\uE929\uE92A\uE92B\uE92C\uE92D\uE92E" +
++ "\uE92F\uE930\uE931\uE932\uE933\uE934\uE935\uE936" +
++ "\uE937\uE938\uE939\uE93A\uE93B\uE93C\uE93D\uE93E" +
++ "\uE93F\uE940\uE941\uE942\uE943\uE944\uE945\uE946" +
++ "\uE947\uE948\uE949\uE94A\uE94B\uE94C\uE94D\uE94E" +
++ "\uE94F\uE950\uE951\uE952\uE953\uE954\uE955\uE956" +
++ "\uE957\uE958\uE959\uE95A\uE95B\uE95C\uE95D\uE95E" +
++ "\uE95F\uE960\uE961\uE962\uE963\uE964\uE965\uE966" +
++ "\uE967\uE968\uE969\uE96A\uE96B\uE96C\uE96D\uE96E" +
++ "\uE96F\uE970\uE971\uE972\uE973\uE974\uE975\uE976" +
++ "\uE977\uE978\uE979\uE97A\uE97B\uE97C\uE97D\uE97E" +
++ "\uE97F\uE980\uE981\uE982\uE983\uE984\uE985\uE986" +
++ "\uE987\uE988\uE989\uE98A\uE98B\uE98C\uE98D\uE98E" +
++ "\uE98F\uE990\uE991\uE992\uE993\uE994\uE995\uE996" +
++ "\uE997\uE998\uE999\uE99A\uE99B\uE99C\uE99D\uE99E" +
++ "\uE99F\uE9A0\uE9A1\uE9A2\uE9A3\uE9A4\uE9A5" ,
++ "\uFFFD\uE9A6\uE9A7\uE9A8\uE9A9\uE9AA\uE9AB\uE9AC" +
++ "\uE9AD\uE9AE\uE9AF\uE9B0\uE9B1\uE9B2\uE9B3\uE9B4" +
++ "\uE9B5\uE9B6\uE9B7\uE9B8\uE9B9\uE9BA\uE9BB\uE9BC" +
++ "\uE9BD\uE9BE\uE9BF\uE9C0\uE9C1\uE9C2\uE9C3\uE9C4" +
++ "\uE9C5\uE9C6\uE9C7\uE9C8\uE9C9\uE9CA\uE9CB\uE9CC" +
++ "\uE9CD\uE9CE\uE9CF\uE9D0\uE9D1\uE9D2\uE9D3\uE9D4" +
++ "\uE9D5\uE9D6\uE9D7\uE9D8\uE9D9\uE9DA\uE9DB\uE9DC" +
++ "\uE9DD\uE9DE\uE9DF\uE9E0\uE9E1\uE9E2\uE9E3\uE9E4" +
++ "\uE9E5\uE9E6\uE9E7\uE9E8\uE9E9\uE9EA\uE9EB\uE9EC" +
++ "\uE9ED\uE9EE\uE9EF\uE9F0\uE9F1\uE9F2\uE9F3\uE9F4" +
++ "\uE9F5\uE9F6\uE9F7\uE9F8\uE9F9\uE9FA\uE9FB\uE9FC" +
++ "\uE9FD\uE9FE\uE9FF\uEA00\uEA01\uEA02\uEA03\uEA04" +
++ "\uEA05\uEA06\uEA07\uEA08\uEA09\uEA0A\uEA0B\uEA0C" +
++ "\uEA0D\uEA0E\uEA0F\uEA10\uEA11\uEA12\uEA13\uEA14" +
++ "\uEA15\uEA16\uEA17\uEA18\uEA19\uEA1A\uEA1B\uEA1C" +
++ "\uEA1D\uEA1E\uEA1F\uEA20\uEA21\uEA22\uEA23\uEA24" +
++ "\uEA25\uEA26\uEA27\uEA28\uEA29\uEA2A\uEA2B\uEA2C" +
++ "\uEA2D\uEA2E\uEA2F\uEA30\uEA31\uEA32\uEA33\uEA34" +
++ "\uEA35\uEA36\uEA37\uEA38\uEA39\uEA3A\uEA3B\uEA3C" +
++ "\uEA3D\uEA3E\uEA3F\uEA40\uEA41\uEA42\uEA43\uEA44" +
++ "\uEA45\uEA46\uEA47\uEA48\uEA49\uEA4A\uEA4B\uEA4C" +
++ "\uEA4D\uEA4E\uEA4F\uEA50\uEA51\uEA52\uEA53\uEA54" +
++ "\uEA55\uEA56\uEA57\uEA58\uEA59\uEA5A\uEA5B\uEA5C" +
++ "\uEA5D\uEA5E\uEA5F\uEA60\uEA61\uEA62\uEA63" ,
++ "\uFFFD\uEA64\uEA65\uEA66\uEA67\uEA68\uEA69\uEA6A" +
++ "\uEA6B\uEA6C\uEA6D\uEA6E\uEA6F\uEA70\uEA71\uEA72" +
++ "\uEA73\uEA74\uEA75\uEA76\uEA77\uEA78\uEA79\uEA7A" +
++ "\uEA7B\uEA7C\uEA7D\uEA7E\uEA7F\uEA80\uEA81\uEA82" +
++ "\uEA83\uEA84\uEA85\uEA86\uEA87\uEA88\uEA89\uEA8A" +
++ "\uEA8B\uEA8C\uEA8D\uEA8E\uEA8F\uEA90\uEA91\uEA92" +
++ "\uEA93\uEA94\uEA95\uEA96\uEA97\uEA98\uEA99\uEA9A" +
++ "\uEA9B\uEA9C\uEA9D\uEA9E\uEA9F\uEAA0\uEAA1\uEAA2" +
++ "\uEAA3\uEAA4\uEAA5\uEAA6\uEAA7\uEAA8\uEAA9\uEAAA" +
++ "\uEAAB\uEAAC\uEAAD\uEAAE\uEAAF\uEAB0\uEAB1\uEAB2" +
++ "\uEAB3\uEAB4\uEAB5\uEAB6\uEAB7\uEAB8\uEAB9\uEABA" +
++ "\uEABB\uEABC\uEABD\uEABE\uEABF\uEAC0\uEAC1\uEAC2" +
++ "\uEAC3\uEAC4\uEAC5\uEAC6\uEAC7\uEAC8\uEAC9\uEACA" +
++ "\uEACB\uEACC\uEACD\uEACE\uEACF\uEAD0\uEAD1\uEAD2" +
++ "\uEAD3\uEAD4\uEAD5\uEAD6\uEAD7\uEAD8\uEAD9\uEADA" +
++ "\uEADB\uEADC\uEADD\uEADE\uEADF\uEAE0\uEAE1\uEAE2" +
++ "\uEAE3\uEAE4\uEAE5\uEAE6\uEAE7\uEAE8\uEAE9\uEAEA" +
++ "\uEAEB\uEAEC\uEAED\uEAEE\uEAEF\uEAF0\uEAF1\uEAF2" +
++ "\uEAF3\uEAF4\uEAF5\uEAF6\uEAF7\uEAF8\uEAF9\uEAFA" +
++ "\uEAFB\uEAFC\uEAFD\uEAFE\uEAFF\uEB00\uEB01\uEB02" +
++ "\uEB03\uEB04\uEB05\uEB06\uEB07\uEB08\uEB09\uEB0A" +
++ "\uEB0B\uEB0C\uEB0D\uEB0E\uEB0F\uEB10\uEB11\uEB12" +
++ "\uEB13\uEB14\uEB15\uEB16\uEB17\uEB18\uEB19\uEB1A" +
++ "\uEB1B\uEB1C\uEB1D\uEB1E\uEB1F\uEB20\uEB21" ,
++ "\uFFFD\uEB22\uEB23\uEB24\uEB25\uEB26\uEB27\uEB28" +
++ "\uEB29\uEB2A\uEB2B\uEB2C\uEB2D\uEB2E\uEB2F\uEB30" +
++ "\uEB31\uEB32\uEB33\uEB34\uEB35\uEB36\uEB37\uEB38" +
++ "\uEB39\uEB3A\uEB3B\uEB3C\uEB3D\uEB3E\uEB3F\uEB40" +
++ "\uEB41\uEB42\uEB43\uEB44\uEB45\uEB46\uEB47\uEB48" +
++ "\uEB49\uEB4A\uEB4B\uEB4C\uEB4D\uEB4E\uEB4F\uEB50" +
++ "\uEB51\uEB52\uEB53\uEB54\uEB55\uEB56\uEB57\uEB58" +
++ "\uEB59\uEB5A\uEB5B\uEB5C\uEB5D\uEB5E\uEB5F\uEB60" +
++ "\uEB61\uEB62\uEB63\uEB64\uEB65\uEB66\uEB67\uEB68" +
++ "\uEB69\uEB6A\uEB6B\uEB6C\uEB6D\uEB6E\uEB6F\uEB70" +
++ "\uEB71\uEB72\uEB73\uEB74\uEB75\uEB76\uEB77\uEB78" +
++ "\uEB79\uEB7A\uEB7B\uEB7C\uEB7D\uEB7E\uEB7F\uEB80" +
++ "\uEB81\uEB82\uEB83\uEB84\uEB85\uEB86\uEB87\uEB88" +
++ "\uEB89\uEB8A\uEB8B\uEB8C\uEB8D\uEB8E\uEB8F\uEB90" +
++ "\uEB91\uEB92\uEB93\uEB94\uEB95\uEB96\uEB97\uEB98" +
++ "\uEB99\uEB9A\uEB9B\uEB9C\uEB9D\uEB9E\uEB9F\uEBA0" +
++ "\uEBA1\uEBA2\uEBA3\uEBA4\uEBA5\uEBA6\uEBA7\uEBA8" +
++ "\uEBA9\uEBAA\uEBAB\uEBAC\uEBAD\uEBAE\uEBAF\uEBB0" +
++ "\uEBB1\uEBB2\uEBB3\uEBB4\uEBB5\uEBB6\uEBB7\uEBB8" +
++ "\uEBB9\uEBBA\uEBBB\uEBBC\uEBBD\uEBBE\uEBBF\uEBC0" +
++ "\uEBC1\uEBC2\uEBC3\uEBC4\uEBC5\uEBC6\uEBC7\uEBC8" +
++ "\uEBC9\uEBCA\uEBCB\uEBCC\uEBCD\uEBCE\uEBCF\uEBD0" +
++ "\uEBD1\uEBD2\uEBD3\uEBD4\uEBD5\uEBD6\uEBD7\uEBD8" +
++ "\uEBD9\uEBDA\uEBDB\uEBDC\uEBDD\uEBDE\uEBDF" ,
++ "\uFFFD\uEBE0\uEBE1\uEBE2\uEBE3\uEBE4\uEBE5\uEBE6" +
++ "\uEBE7\uEBE8\uEBE9\uEBEA\uEBEB\uEBEC\uEBED\uEBEE" +
++ "\uEBEF\uEBF0\uEBF1\uEBF2\uEBF3\uEBF4\uEBF5\uEBF6" +
++ "\uEBF7\uEBF8\uEBF9\uEBFA\uEBFB\uEBFC\uEBFD\uEBFE" +
++ "\uEBFF\uEC00\uEC01\uEC02\uEC03\uEC04\uEC05\uEC06" +
++ "\uEC07\uEC08\uEC09\uEC0A\uEC0B\uEC0C\uEC0D\uEC0E" +
++ "\uEC0F\uEC10\uEC11\uEC12\uEC13\uEC14\uEC15\uEC16" +
++ "\uEC17\uEC18\uEC19\uEC1A\uEC1B\uEC1C\uEC1D\uEC1E" +
++ "\uEC1F\uEC20\uEC21\uEC22\uEC23\uEC24\uEC25\uEC26" +
++ "\uEC27\uEC28\uEC29\uEC2A\uEC2B\uEC2C\uEC2D\uEC2E" +
++ "\uEC2F\uEC30\uEC31\uEC32\uEC33\uEC34\uEC35\uEC36" +
++ "\uEC37\uEC38\uEC39\uEC3A\uEC3B\uEC3C\uEC3D\uEC3E" +
++ "\uEC3F\uEC40\uEC41\uEC42\uEC43\uEC44\uEC45\uEC46" +
++ "\uEC47\uEC48\uEC49\uEC4A\uEC4B\uEC4C\uEC4D\uEC4E" +
++ "\uEC4F\uEC50\uEC51\uEC52\uEC53\uEC54\uEC55\uEC56" +
++ "\uEC57\uEC58\uEC59\uEC5A\uEC5B\uEC5C\uEC5D\uEC5E" +
++ "\uEC5F\uEC60\uEC61\uEC62\uEC63\uEC64\uEC65\uEC66" +
++ "\uEC67\uEC68\uEC69\uEC6A\uEC6B\uEC6C\uEC6D\uEC6E" +
++ "\uEC6F\uEC70\uEC71\uEC72\uEC73\uEC74\uEC75\uEC76" +
++ "\uEC77\uEC78\uEC79\uEC7A\uEC7B\uEC7C\uEC7D\uEC7E" +
++ "\uEC7F\uEC80\uEC81\uEC82\uEC83\uEC84\uEC85\uEC86" +
++ "\uEC87\uEC88\uEC89\uEC8A\uEC8B\uEC8C\uEC8D\uEC8E" +
++ "\uEC8F\uEC90\uEC91\uEC92\uEC93\uEC94\uEC95\uEC96" +
++ "\uEC97\uEC98\uEC99\uEC9A\uEC9B\uEC9C\uEC9D" ,
++ "\uFFFD\uEC9E\uEC9F\uECA0\uECA1\uECA2\uECA3\uECA4" +
++ "\uECA5\uECA6\uECA7\uECA8\uECA9\uECAA\uECAB\uECAC" +
++ "\uECAD\uECAE\uECAF\uECB0\uECB1\uECB2\uECB3\uECB4" +
++ "\uECB5\uECB6\uECB7\uECB8\uECB9\uECBA\uECBB\uECBC" +
++ "\uECBD\uECBE\uECBF\uECC0\uECC1\uECC2\uECC3\uECC4" +
++ "\uECC5\uECC6\uECC7\uECC8\uECC9\uECCA\uECCB\uECCC" +
++ "\uECCD\uECCE\uECCF\uECD0\uECD1\uECD2\uECD3\uECD4" +
++ "\uECD5\uECD6\uECD7\uECD8\uECD9\uECDA\uECDB\uECDC" +
++ "\uECDD\uECDE\uECDF\uECE0\uECE1\uECE2\uECE3\uECE4" +
++ "\uECE5\uECE6\uECE7\uECE8\uECE9\uECEA\uECEB\uECEC" +
++ "\uECED\uECEE\uECEF\uECF0\uECF1\uECF2\uECF3\uECF4" +
++ "\uECF5\uECF6\uECF7\uECF8\uECF9\uECFA\uECFB\uECFC" +
++ "\uECFD\uECFE\uECFF\uED00\uED01\uED02\uED03\uED04" +
++ "\uED05\uED06\uED07\uED08\uED09\uED0A\uED0B\uED0C" +
++ "\uED0D\uED0E\uED0F\uED10\uED11\uED12\uED13\uED14" +
++ "\uED15\uED16\uED17\uED18\uED19\uED1A\uED1B\uED1C" +
++ "\uED1D\uED1E\uED1F\uED20\uED21\uED22\uED23\uED24" +
++ "\uED25\uED26\uED27\uED28\uED29\uED2A\uED2B\uED2C" +
++ "\uED2D\uED2E\uED2F\uED30\uED31\uED32\uED33\uED34" +
++ "\uED35\uED36\uED37\uED38\uED39\uED3A\uED3B\uED3C" +
++ "\uED3D\uED3E\uED3F\uED40\uED41\uED42\uED43\uED44" +
++ "\uED45\uED46\uED47\uED48\uED49\uED4A\uED4B\uED4C" +
++ "\uED4D\uED4E\uED4F\uED50\uED51\uED52\uED53\uED54" +
++ "\uED55\uED56\uED57\uED58\uED59\uED5A\uED5B" ,
++ "\uFFFD\uED5C\uED5D\uED5E\uED5F\uED60\uED61\uED62" +
++ "\uED63\uED64\uED65\uED66\uED67\uED68\uED69\uED6A" +
++ "\uED6B\uED6C\uED6D\uED6E\uED6F\uED70\uED71\uED72" +
++ "\uED73\uED74\uED75\uED76\uED77\uED78\uED79\uED7A" +
++ "\uED7B\uED7C\uED7D\uED7E\uED7F\uED80\uED81\uED82" +
++ "\uED83\uED84\uED85\uED86\uED87\uED88\uED89\uED8A" +
++ "\uED8B\uED8C\uED8D\uED8E\uED8F\uED90\uED91\uED92" +
++ "\uED93\uED94\uED95\uED96\uED97\uED98\uED99\uED9A" +
++ "\uED9B\uED9C\uED9D\uED9E\uED9F\uEDA0\uEDA1\uEDA2" +
++ "\uEDA3\uEDA4\uEDA5\uEDA6\uEDA7\uEDA8\uEDA9\uEDAA" +
++ "\uEDAB\uEDAC\uEDAD\uEDAE\uEDAF\uEDB0\uEDB1\uEDB2" +
++ "\uEDB3\uEDB4\uEDB5\uEDB6\uEDB7\uEDB8\uEDB9\uEDBA" +
++ "\uEDBB\uEDBC\uEDBD\uEDBE\uEDBF\uEDC0\uEDC1\uEDC2" +
++ "\uEDC3\uEDC4\uEDC5\uEDC6\uEDC7\uEDC8\uEDC9\uEDCA" +
++ "\uEDCB\uEDCC\uEDCD\uEDCE\uEDCF\uEDD0\uEDD1\uEDD2" +
++ "\uEDD3\uEDD4\uEDD5\uEDD6\uEDD7\uEDD8\uEDD9\uEDDA" +
++ "\uEDDB\uEDDC\uEDDD\uEDDE\uEDDF\uEDE0\uEDE1\uEDE2" +
++ "\uEDE3\uEDE4\uEDE5\uEDE6\uEDE7\uEDE8\uEDE9\uEDEA" +
++ "\uEDEB\uEDEC\uEDED\uEDEE\uEDEF\uEDF0\uEDF1\uEDF2" +
++ "\uEDF3\uEDF4\uEDF5\uEDF6\uEDF7\uEDF8\uEDF9\uEDFA" +
++ "\uEDFB\uEDFC\uEDFD\uEDFE\uEDFF\uEE00\uEE01\uEE02" +
++ "\uEE03\uEE04\uEE05\uEE06\uEE07\uEE08\uEE09\uEE0A" +
++ "\uEE0B\uEE0C\uEE0D\uEE0E\uEE0F\uEE10\uEE11\uEE12" +
++ "\uEE13\uEE14\uEE15\uEE16\uEE17\uEE18\uEE19" ,
++ "\uFFFD\uEE1A\uEE1B\uEE1C\uEE1D\uEE1E\uEE1F\uEE20" +
++ "\uEE21\uEE22\uEE23\uEE24\uEE25\uEE26\uEE27\uEE28" +
++ "\uEE29\uEE2A\uEE2B\uEE2C\uEE2D\uEE2E\uEE2F\uEE30" +
++ "\uEE31\uEE32\uEE33\uEE34\uEE35\uEE36\uEE37\uEE38" +
++ "\uEE39\uEE3A\uEE3B\uEE3C\uEE3D\uEE3E\uEE3F\uEE40" +
++ "\uEE41\uEE42\uEE43\uEE44\uEE45\uEE46\uEE47\uEE48" +
++ "\uEE49\uEE4A\uEE4B\uEE4C\uEE4D\uEE4E\uEE4F\uEE50" +
++ "\uEE51\uEE52\uEE53\uEE54\uEE55\uEE56\uEE57\uEE58" +
++ "\uEE59\uEE5A\uEE5B\uEE5C\uEE5D\uEE5E\uEE5F\uEE60" +
++ "\uEE61\uEE62\uEE63\uEE64\uEE65\uEE66\uEE67\uEE68" +
++ "\uEE69\uEE6A\uEE6B\uEE6C\uEE6D\uEE6E\uEE6F\uEE70" +
++ "\uEE71\uEE72\uEE73\uEE74\uEE75\uEE76\uEE77\uEE78" +
++ "\uEE79\uEE7A\uEE7B\uEE7C\uEE7D\uEE7E\uEE7F\uEE80" +
++ "\uEE81\uEE82\uEE83\uEE84\uEE85\uEE86\uEE87\uEE88" +
++ "\uEE89\uEE8A\uEE8B\uEE8C\uEE8D\uEE8E\uEE8F\uEE90" +
++ "\uEE91\uEE92\uEE93\uEE94\uEE95\uEE96\uEE97\uEE98" +
++ "\uEE99\uEE9A\uEE9B\uEE9C\uEE9D\uEE9E\uEE9F\uEEA0" +
++ "\uEEA1\uEEA2\uEEA3\uEEA4\uEEA5\uEEA6\uEEA7\uEEA8" +
++ "\uEEA9\uEEAA\uEEAB\uEEAC\uEEAD\uEEAE\uEEAF\uEEB0" +
++ "\uEEB1\uEEB2\uEEB3\uEEB4\uEEB5\uEEB6\uEEB7\uEEB8" +
++ "\uEEB9\uEEBA\uEEBB\uEEBC\uEEBD\uEEBE\uEEBF\uEEC0" +
++ "\uEEC1\uEEC2\uEEC3\uEEC4\uEEC5\uEEC6\uEEC7\uEEC8" +
++ "\uEEC9\uEECA\uEECB\uEECC\uEECD\uEECE\uEECF\uEED0" +
++ "\uEED1\uEED2\uEED3\uEED4\uEED5\uEED6\uEED7" ,
++ "\uFFFD\uEED8\uEED9\uEEDA\uEEDB\uEEDC\uEEDD\uEEDE" +
++ "\uEEDF\uEEE0\uEEE1\uEEE2\uEEE3\uEEE4\uEEE5\uEEE6" +
++ "\uEEE7\uEEE8\uEEE9\uEEEA\uEEEB\uEEEC\uEEED\uEEEE" +
++ "\uEEEF\uEEF0\uEEF1\uEEF2\uEEF3\uEEF4\uEEF5\uEEF6" +
++ "\uEEF7\uEEF8\uEEF9\uEEFA\uEEFB\uEEFC\uEEFD\uEEFE" +
++ "\uEEFF\uEF00\uEF01\uEF02\uEF03\uEF04\uEF05\uEF06" +
++ "\uEF07\uEF08\uEF09\uEF0A\uEF0B\uEF0C\uEF0D\uEF0E" +
++ "\uEF0F\uEF10\uEF11\uEF12\uEF13\uEF14\uEF15\uEF16" +
++ "\uEF17\uEF18\uEF19\uEF1A\uEF1B\uEF1C\uEF1D\uEF1E" +
++ "\uEF1F\uEF20\uEF21\uEF22\uEF23\uEF24\uEF25\uEF26" +
++ "\uEF27\uEF28\uEF29\uEF2A\uEF2B\uEF2C\uEF2D\uEF2E" +
++ "\uEF2F\uEF30\uEF31\uEF32\uEF33\uEF34\uEF35\uEF36" +
++ "\uEF37\uEF38\uEF39\uEF3A\uEF3B\uEF3C\uEF3D\uEF3E" +
++ "\uEF3F\uEF40\uEF41\uEF42\uEF43\uEF44\uEF45\uEF46" +
++ "\uEF47\uEF48\uEF49\uEF4A\uEF4B\uEF4C\uEF4D\uEF4E" +
++ "\uEF4F\uEF50\uEF51\uEF52\uEF53\uEF54\uEF55\uEF56" +
++ "\uEF57\uEF58\uEF59\uEF5A\uEF5B\uEF5C\uEF5D\uEF5E" +
++ "\uEF5F\uEF60\uEF61\uEF62\uEF63\uEF64\uEF65\uEF66" +
++ "\uEF67\uEF68\uEF69\uEF6A\uEF6B\uEF6C\uEF6D\uEF6E" +
++ "\uEF6F\uEF70\uEF71\uEF72\uEF73\uEF74\uEF75\uEF76" +
++ "\uEF77\uEF78\uEF79\uEF7A\uEF7B\uEF7C\uEF7D\uEF7E" +
++ "\uEF7F\uEF80\uEF81\uEF82\uEF83\uEF84\uEF85\uEF86" +
++ "\uEF87\uEF88\uEF89\uEF8A\uEF8B\uEF8C\uEF8D\uEF8E" +
++ "\uEF8F\uEF90\uEF91\uEF92\uEF93\uEF94\uEF95" ,
++ "\uFFFD\uEF96\uEF97\uEF98\uEF99\uEF9A\uEF9B\uEF9C" +
++ "\uEF9D\uEF9E\uEF9F\uEFA0\uEFA1\uEFA2\uEFA3\uEFA4" +
++ "\uEFA5\uEFA6\uEFA7\uEFA8\uEFA9\uEFAA\uEFAB\uEFAC" +
++ "\uEFAD\uEFAE\uEFAF\uEFB0\uEFB1\uEFB2\uEFB3\uEFB4" +
++ "\uEFB5\uEFB6\uEFB7\uEFB8\uEFB9\uEFBA\uEFBB\uEFBC" +
++ "\uEFBD\uEFBE\uEFBF\uEFC0\uEFC1\uEFC2\uEFC3\uEFC4" +
++ "\uEFC5\uEFC6\uEFC7\uEFC8\uEFC9\uEFCA\uEFCB\uEFCC" +
++ "\uEFCD\uEFCE\uEFCF\uEFD0\uEFD1\uEFD2\uEFD3\uEFD4" +
++ "\uEFD5\uEFD6\uEFD7\uEFD8\uEFD9\uEFDA\uEFDB\uEFDC" +
++ "\uEFDD\uEFDE\uEFDF\uEFE0\uEFE1\uEFE2\uEFE3\uEFE4" +
++ "\uEFE5\uEFE6\uEFE7\uEFE8\uEFE9\uEFEA\uEFEB\uEFEC" +
++ "\uEFED\uEFEE\uEFEF\uEFF0\uEFF1\uEFF2\uEFF3\uEFF4" +
++ "\uEFF5\uEFF6\uEFF7\uEFF8\uEFF9\uEFFA\uEFFB\uEFFC" +
++ "\uEFFD\uEFFE\uEFFF\uF000\uF001\uF002\uF003\uF004" +
++ "\uF005\uF006\uF007\uF008\uF009\uF00A\uF00B\uF00C" +
++ "\uF00D\uF00E\uF00F\uF010\uF011\uF012\uF013\uF014" +
++ "\uF015\uF016\uF017\uF018\uF019\uF01A\uF01B\uF01C" +
++ "\uF01D\uF01E\uF01F\uF020\uF021\uF022\uF023\uF024" +
++ "\uF025\uF026\uF027\uF028\uF029\uF02A\uF02B\uF02C" +
++ "\uF02D\uF02E\uF02F\uF030\uF031\uF032\uF033\uF034" +
++ "\uF035\uF036\uF037\uF038\uF039\uF03A\uF03B\uF03C" +
++ "\uF03D\uF03E\uF03F\uF040\uF041\uF042\uF043\uF044" +
++ "\uF045\uF046\uF047\uF048\uF049\uF04A\uF04B\uF04C" +
++ "\uF04D\uF04E\uF04F\uF050\uF051\uF052\uF053" ,
++ "\uFFFD\uF054\uF055\uF056\uF057\uF058\uF059\uF05A" +
++ "\uF05B\uF05C\uF05D\uF05E\uF05F\uF060\uF061\uF062" +
++ "\uF063\uF064\uF065\uF066\uF067\uF068\uF069\uF06A" +
++ "\uF06B\uF06C\uF06D\uF06E\uF06F\uF070\uF071\uF072" +
++ "\uF073\uF074\uF075\uF076\uF077\uF078\uF079\uF07A" +
++ "\uF07B\uF07C\uF07D\uF07E\uF07F\uF080\uF081\uF082" +
++ "\uF083\uF084\uF085\uF086\uF087\uF088\uF089\uF08A" +
++ "\uF08B\uF08C\uF08D\uF08E\uF08F\uF090\uF091\uF092" +
++ "\uF093\uF094\uF095\uF096\uF097\uF098\uF099\uF09A" +
++ "\uF09B\uF09C\uF09D\uF09E\uF09F\uF0A0\uF0A1\uF0A2" +
++ "\uF0A3\uF0A4\uF0A5\uF0A6\uF0A7\uF0A8\uF0A9\uF0AA" +
++ "\uF0AB\uF0AC\uF0AD\uF0AE\uF0AF\uF0B0\uF0B1\uF0B2" +
++ "\uF0B3\uF0B4\uF0B5\uF0B6\uF0B7\uF0B8\uF0B9\uF0BA" +
++ "\uF0BB\uF0BC\uF0BD\uF0BE\uF0BF\uF0C0\uF0C1\uF0C2" +
++ "\uF0C3\uF0C4\uF0C5\uF0C6\uF0C7\uF0C8\uF0C9\uF0CA" +
++ "\uF0CB\uF0CC\uF0CD\uF0CE\uF0CF\uF0D0\uF0D1\uF0D2" +
++ "\uF0D3\uF0D4\uF0D5\uF0D6\uF0D7\uF0D8\uF0D9\uF0DA" +
++ "\uF0DB\uF0DC\uF0DD\uF0DE\uF0DF\uF0E0\uF0E1\uF0E2" +
++ "\uF0E3\uF0E4\uF0E5\uF0E6\uF0E7\uF0E8\uF0E9\uF0EA" +
++ "\uF0EB\uF0EC\uF0ED\uF0EE\uF0EF\uF0F0\uF0F1\uF0F2" +
++ "\uF0F3\uF0F4\uF0F5\uF0F6\uF0F7\uF0F8\uF0F9\uF0FA" +
++ "\uF0FB\uF0FC\uF0FD\uF0FE\uF0FF\uF100\uF101\uF102" +
++ "\uF103\uF104\uF105\uF106\uF107\uF108\uF109\uF10A" +
++ "\uF10B\uF10C\uF10D\uF10E\uF10F\uF110\uF111" ,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ null,
++ };
++
++ static char[][] b2c = new char[b2cStr.length][];
++ private static volatile boolean b2cInitialized = false;
++
++ static void initb2c() {
++ if (b2cInitialized)
++ return;
++ synchronized (b2c) {
++ if (b2cInitialized)
++ return;
++ for (int i = 0; i < b2cStr.length; i++) {
++ if (b2cStr[i] == null)
++ b2c[i] = DoubleByte.B2C_UNMAPPABLE;
++ else
++ b2c[i] = b2cStr[i].toCharArray();
++ }
++ b2cInitialized = true;
++ }
++ }
++
++ static char[] c2b = new char[0x7400];
++ static char[] c2bIndex = new char[0x100];
++ private static volatile boolean c2bInitialized = false;
++
++ static void initc2b() {
++ if (c2bInitialized)
++ return;
++ synchronized (c2b) {
++ if (c2bInitialized)
++ return;
++ String b2cNR = null;
++ String c2bNR =
++ "\u4260\u2212\u426A\u00A6\u43A1\u301C\u444A\u2014" +
++ "\u446E\uF86F\u447C\u2016\u4C7D\u9E7C\u4EB3\u9830" +
++ "\u4F5E\u5861\u507F\u91AC\u5190\u56CA\u51F1\u6805" +
++ "\u51FA\u91B1\u5261\u9EB4\u52A1\u881F\u52C9\u840A" +
++ "\u52DA\u7E61\u52EC\u4FE0\u5353\u8EC0\u5373\u7E6B" +
++ "\u53B3\u8346\u53DA\u9A52\u53E8\u87EC\u53EE\u7130" +
++ "\u53F8\u8523\u5443\u5C5B\u5464\u9DD7\u547D\u5699" +
++ "\u5481\u525D\u54A3\u6414\u54A4\u7626\u54CA\u7C1E" +
++ "\u54CD\u6451\u54D4\u555E\u54FA\u6F51\u5550\u7006" +
++ "\u5553\u79B1\u555F\u9EB5\u55C0\u5C62\u55C1\u985A" +
++ "\u5B72\u6522\u5BFE\u688E\u60F1\u7E48\u61B0\u8141" +
++ "\u66C8\u9839" ;
++
++ DoubleByte.Encoder.initC2B(b2cStr, b2cSBStr, b2cNR, c2bNR,
++ 0x40, 0xfe,
++ c2b, c2bIndex);
++ c2bInitialized = true;
++ }
++ }
++}
+--- ./jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java Tue Oct 08 09:07:05 2013 -0700
+@@ -26,8 +26,10 @@
+
+ package sun.reflect.misc;
+
++import java.lang.reflect.Method;
+ import java.lang.reflect.Modifier;
+ import java.lang.reflect.Proxy;
++import java.util.Arrays;
+ import sun.reflect.Reflection;
+
+ public final class ReflectUtil {
+@@ -249,4 +251,50 @@
+ String pkg = (i != -1) ? name.substring(0, i) : "";
+ return Proxy.isProxyClass(cls) && !pkg.equals(PROXY_PACKAGE);
+ }
++
++ /**
++ * Check if the given method is a method declared in the proxy interface
++ * implemented by the given proxy instance.
++ *
++ * @param proxy a proxy instance
++ * @param method an interface method dispatched to a InvocationHandler
++ *
++ * @throws IllegalArgumentException if the given proxy or method is invalid.
++ */
++ public static void checkProxyMethod(Object proxy, Method method) {
++ // check if it is a valid proxy instance
++ if (proxy == null || !Proxy.isProxyClass(proxy.getClass())) {
++ throw new IllegalArgumentException("Not a Proxy instance");
+ }
++ if (Modifier.isStatic(method.getModifiers())) {
++ throw new IllegalArgumentException("Can't handle static method");
++ }
++
++ Class<?> c = method.getDeclaringClass();
++ if (c == Object.class) {
++ String name = method.getName();
++ if (name.equals("hashCode") || name.equals("equals") || name.equals("toString")) {
++ return;
++ }
++ }
++
++ if (isSuperInterface(proxy.getClass(), c)) {
++ return;
++ }
++
++ // disallow any method not declared in one of the proxy intefaces
++ throw new IllegalArgumentException("Can't handle: " + method);
++ }
++
++ private static boolean isSuperInterface(Class<?> c, Class<?> intf) {
++ for (Class<?> i : c.getInterfaces()) {
++ if (i == intf) {
++ return true;
++ }
++ if (isSuperInterface(i, intf)) {
++ return true;
++ }
++ }
++ return false;
++ }
++}
+--- ./jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -153,12 +153,4 @@
+ throw new InvalidKeyException("Invalid EC private key", e);
+ }
+ }
+-
+- // return a string representation of this key for debugging
+- public String toString() {
+- return "Sun EC private key, " + params.getCurve().getField().getFieldSize()
+- + " bits\n private value: "
+- + s + "\n parameters: " + params;
+- }
+-
+ }
+--- ./jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 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
+@@ -630,7 +630,7 @@
+ buffer.append(element.isAcceptorCredential() ?
+ " Accept" : "");
+ buffer.append(" [");
+- buffer.append(element.toString());
++ buffer.append(element.getClass());
+ buffer.append(']');
+ } catch (GSSException e) {
+ // skip to next element
+--- ./jdk/src/share/classes/sun/security/krb5/KdcComm.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/security/krb5/KdcComm.java Tue Oct 08 09:07:05 2013 -0700
+@@ -239,11 +239,15 @@
+ savedException = e;
+ }
+ }
+- if (ibuf == null && savedException != null) {
+- if (savedException instanceof IOException) {
+- throw (IOException) savedException;
++ if (ibuf == null) {
++ if (savedException != null) {
++ if (savedException instanceof IOException) {
++ throw (IOException) savedException;
++ } else {
++ throw (KrbException) savedException;
++ }
+ } else {
+- throw (KrbException) savedException;
++ throw new IOException("Cannot get a KDC reply");
+ }
+ }
+ return ibuf;
+--- ./jdk/src/share/classes/sun/security/krb5/internal/NetClient.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/security/krb5/internal/NetClient.java Tue Oct 08 09:07:05 2013 -0700
+@@ -31,6 +31,8 @@
+
+ package sun.security.krb5.internal;
+
++import sun.misc.IOUtils;
++
+ import java.io.*;
+ import java.net.*;
+
+@@ -102,17 +104,15 @@
+ return null;
+ }
+
+- byte data[] = new byte[len];
+- count = readFully(data, len);
+- if (count != len) {
++ try {
++ return IOUtils.readFully(in, len, true);
++ } catch (IOException ioe) {
+ if (Krb5.DEBUG) {
+ System.out.println(
+ ">>>DEBUG: TCPClient could not read complete packet (" +
+ len + "/" + count + ")");
+ }
+ return null;
+- } else {
+- return data;
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 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
+@@ -304,17 +304,6 @@
+ return encodedKey.clone();
+ }
+
+- /*
+- * Returns a printable representation of the key
+- */
+- public String toString ()
+- {
+- HexDumpEncoder encoder = new HexDumpEncoder ();
+-
+- return "algorithm = " + algid.toString ()
+- + ", unparsed keybits = \n" + encoder.encodeBuffer (key);
+- }
+-
+ /**
+ * 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 Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs11/P11Key.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -542,27 +542,6 @@
+ fetchValues();
+ return coeff;
+ }
+- public String toString() {
+- fetchValues();
+- StringBuilder sb = new StringBuilder(super.toString());
+- sb.append("\n modulus: ");
+- sb.append(n);
+- sb.append("\n public exponent: ");
+- sb.append(e);
+- sb.append("\n private exponent: ");
+- sb.append(d);
+- sb.append("\n prime p: ");
+- sb.append(p);
+- sb.append("\n prime q: ");
+- sb.append(q);
+- sb.append("\n prime exponent p: ");
+- sb.append(pe);
+- sb.append("\n prime exponent q: ");
+- sb.append(qe);
+- sb.append("\n crt coefficient: ");
+- sb.append(coeff);
+- return sb.toString();
+- }
+ }
+
+ // RSA non-CRT private key
+@@ -616,15 +595,6 @@
+ fetchValues();
+ return d;
+ }
+- public String toString() {
+- fetchValues();
+- StringBuilder sb = new StringBuilder(super.toString());
+- sb.append("\n modulus: ");
+- sb.append(n);
+- sb.append("\n private exponent: ");
+- sb.append(d);
+- return sb.toString();
+- }
+ }
+
+ private static final class P11RSAPublicKey extends P11Key
+@@ -794,11 +764,6 @@
+ fetchValues();
+ return params;
+ }
+- public String toString() {
+- fetchValues();
+- return super.toString() + "\n x: " + x + "\n p: " + params.getP()
+- + "\n q: " + params.getQ() + "\n g: " + params.getG();
+- }
+ }
+
+ private static final class P11DHPrivateKey extends P11Key
+@@ -856,11 +821,6 @@
+ fetchValues();
+ return params;
+ }
+- public String toString() {
+- fetchValues();
+- return super.toString() + "\n x: " + x + "\n p: " + params.getP()
+- + "\n g: " + params.getG();
+- }
+ }
+
+ private static final class P11DHPublicKey extends P11Key
+@@ -977,12 +937,6 @@
+ fetchValues();
+ return params;
+ }
+- public String toString() {
+- fetchValues();
+- return super.toString()
+- + "\n private value: " + s
+- + "\n parameters: " + params;
+- }
+ }
+
+ private static final class P11ECPublicKey extends P11Key
+--- ./jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 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
+@@ -142,11 +142,6 @@
+ }
+ }
+
+- public String toString() {
+- return "Sun DSA Private Key \nparameters:" + algid + "\nx: " +
+- Debug.toHexString(x) + "\n";
+- }
+-
+ protected void parseKeyBits() throws InvalidKeyException {
+ try {
+ DerInputStream in = new DerInputStream(key);
+--- ./jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -225,29 +225,4 @@
+ }
+ return b;
+ }
+-
+- // return a string representation of this key for debugging
+- public String toString() {
+- StringBuffer sb = new StringBuffer();
+- sb.append("Sun RSA private CRT key, ");
+- sb.append(n.bitLength());
+- sb.append(" bits\n modulus: ");
+- sb.append(n);
+- sb.append("\n public exponent: ");
+- sb.append(e);
+- sb.append("\n private exponent: ");
+- sb.append(d);
+- sb.append("\n prime p: ");
+- sb.append(p);
+- sb.append("\n prime q: ");
+- sb.append(q);
+- sb.append("\n prime exponent p: ");
+- sb.append(pe);
+- sb.append("\n prime exponent q: ");
+- sb.append(qe);
+- sb.append("\n crt coefficient: ");
+- sb.append(coeff);
+- return sb.toString();
+- }
+-
+ }
+--- ./jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -98,11 +98,4 @@
+ public BigInteger getPrivateExponent() {
+ return d;
+ }
+-
+- // return a string representation of this key for debugging
+- public String toString() {
+- return "Sun RSA private key, " + n.bitLength() + " bits\n modulus: "
+- + n + "\n private exponent: " + d;
+- }
+-
+ }
+--- ./jdk/src/share/classes/sun/swing/SwingLazyValue.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/swing/SwingLazyValue.java Tue Oct 08 09:07:05 2013 -0700
+@@ -30,6 +30,7 @@
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ import javax.swing.UIDefaults;
++import sun.reflect.misc.ReflectUtil;
+
+ /**
+ * SwingLazyValue is a copy of ProxyLazyValue that does not snapshot the
+@@ -63,7 +64,7 @@
+
+ public Object createValue(final UIDefaults table) {
+ try {
+- Object cl;
++ ReflectUtil.checkPackageAccess(className);
+ Class<?> c = Class.forName(className, true, null);
+ if (methodName != null) {
+ Class[] types = getClassArray(args);
+--- ./jdk/src/share/classes/sun/swing/SwingUtilities2.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/classes/sun/swing/SwingUtilities2.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1301,6 +1301,19 @@
+ }
+
+ /**
++ * Utility method that throws SecurityException if SecurityManager is set
++ * and modifiers are not public
++ *
++ * @param modifiers a set of modifiers
++ */
++ public static void checkAccess(int modifiers) {
++ if (System.getSecurityManager() != null
++ && !Modifier.isPublic(modifiers)) {
++ throw new SecurityException("Resource is not accessible");
++ }
++ }
++
++ /**
+ * Returns true if EventQueue.getCurrentEvent() has the permissions to
+ * access the system clipboard and if it is allowed gesture (if
+ * checkGesture true)
+--- ./jdk/src/share/demo/jvmti/hprof/hprof_class.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/demo/jvmti/hprof/hprof_class.c Tue Oct 08 09:07:05 2013 -0700
+@@ -527,7 +527,12 @@
+ jmethodID method;
+
+ info = get_info(index);
+- HPROF_ASSERT(mnum < info->method_count);
++ if (mnum >= info->method_count) {
++ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
++ (*env)->ThrowNew(env, newExcCls, "Illegal mnum");
++
++ return NULL;
++ }
+ method = info->method[mnum].method_id;
+ if ( method == NULL ) {
+ char * name;
+@@ -535,7 +540,12 @@
+ jclass clazz;
+
+ name = (char *)string_get(info->method[mnum].name_index);
+- HPROF_ASSERT(name!=NULL);
++ if (name==NULL) {
++ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
++ (*env)->ThrowNew(env, newExcCls, "Name not found");
++
++ return NULL;
++ }
+ sig = (char *)string_get(info->method[mnum].sig_index);
+ HPROF_ASSERT(sig!=NULL);
+ clazz = class_get_class(env, index);
+--- ./jdk/src/share/demo/jvmti/hprof/hprof_event.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/demo/jvmti/hprof/hprof_event.c Tue Oct 08 09:07:05 2013 -0700
+@@ -195,7 +195,12 @@
+
+ HPROF_ASSERT(env!=NULL);
+ HPROF_ASSERT(thread!=NULL);
+- HPROF_ASSERT(cnum!=0 && cnum!=gdata->tracker_cnum);
++ if (cnum == 0 || cnum == gdata->tracker_cnum) {
++ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
++ (*env)->ThrowNew(env, newExcCls, "Illegal cnum.");
++
++ return;
++ }
+
+ /* Prevent recursion into any BCI function for this thread (pstatus). */
+ if ( tls_get_tracker_status(env, thread, JNI_FALSE,
+@@ -204,8 +209,10 @@
+
+ (*pstatus) = 1;
+ method = class_get_methodID(env, cnum, mnum);
+- HPROF_ASSERT(method!=NULL);
+- tls_push_method(tls_index, method);
++ if (method != NULL) {
++ tls_push_method(tls_index, method);
++ }
++
+ (*pstatus) = 0;
+ }
+ }
+@@ -248,7 +255,13 @@
+
+ HPROF_ASSERT(env!=NULL);
+ HPROF_ASSERT(thread!=NULL);
+- HPROF_ASSERT(cnum!=0 && cnum!=gdata->tracker_cnum);
++
++ if (cnum == 0 || cnum == gdata->tracker_cnum) {
++ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
++ (*env)->ThrowNew(env, newExcCls, "Illegal cnum.");
++
++ return;
++ }
+
+ /* Prevent recursion into any BCI function for this thread (pstatus). */
+ if ( tls_get_tracker_status(env, thread, JNI_FALSE,
+@@ -257,8 +270,10 @@
+
+ (*pstatus) = 1;
+ method = class_get_methodID(env, cnum, mnum);
+- HPROF_ASSERT(method!=NULL);
+- tls_pop_method(tls_index, thread, method);
++ if (method != NULL) {
++ tls_pop_method(tls_index, thread, method);
++ }
++
+ (*pstatus) = 0;
+ }
+ }
+--- ./jdk/src/share/lib/security/java.security-linux Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/lib/security/java.security-linux Tue Oct 08 09:07:05 2013 -0700
+@@ -129,6 +129,7 @@
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
+ com.sun.proxy.,\
++ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+ com.sun.org.apache.xerces.internal.,\
+@@ -166,6 +167,7 @@
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
+ com.sun.proxy.,\
++ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+ com.sun.org.apache.xerces.internal.,\
+--- ./jdk/src/share/lib/security/java.security-macosx Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/lib/security/java.security-macosx Tue Oct 08 09:07:05 2013 -0700
+@@ -130,6 +130,7 @@
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
+ com.sun.proxy.,\
++ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+ com.sun.org.apache.xerces.internal.,\
+@@ -169,6 +170,7 @@
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
+ com.sun.proxy.,\
++ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+ com.sun.org.apache.xerces.internal.,\
+--- ./jdk/src/share/lib/security/java.security-solaris Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/lib/security/java.security-solaris Tue Oct 08 09:07:05 2013 -0700
+@@ -131,6 +131,7 @@
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
+ com.sun.proxy.,\
++ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+ com.sun.org.apache.xerces.internal.,\
+@@ -169,6 +170,7 @@
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
+ com.sun.proxy.,\
++ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+ com.sun.org.apache.xerces.internal.,\
+--- ./jdk/src/share/lib/security/java.security-windows Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/lib/security/java.security-windows Tue Oct 08 09:07:05 2013 -0700
+@@ -130,6 +130,7 @@
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
+ com.sun.proxy.,\
++ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+ com.sun.org.apache.xerces.internal.,\
+@@ -169,6 +170,7 @@
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
+ com.sun.proxy.,\
++ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+ com.sun.org.apache.xerces.internal.,\
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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
+@@ -340,6 +340,10 @@
+ struct tm sbuf;
+ (void)memset((void*)&sbuf,0, sizeof(sbuf));
+ struct tm* s = gmtime_r(&t, &sbuf);
++ if (s == NULL) {
++ fprintf(u->errstrm, "Error: gmtime failure, invalid input archive\n");
++ exit(2);
++ }
+ modtime_cache = modtime;
+ dostime_cache = dostime(s->tm_year + 1900, s->tm_mon + 1, s->tm_mday,
+ s->tm_hour, s->tm_min, s->tm_sec);
+@@ -384,7 +388,7 @@
+ }
+
+ deflated.empty();
+- zs.next_out = (uchar*) deflated.grow(len + (len/2));
++ zs.next_out = (uchar*) deflated.grow(add_size(len, (len/2)));
+ zs.avail_out = (int)deflated.size();
+
+ zs.next_in = (uchar*)head.ptr;
+--- ./jdk/src/share/native/java/lang/Class.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/java/lang/Class.c Tue Oct 08 09:07:05 2013 -0700
+@@ -70,7 +70,7 @@
+ {"getProtectionDomain0", "()" PD, (void *)&JVM_GetProtectionDomain},
+ {"setProtectionDomain0", "(" PD ")V", (void *)&JVM_SetProtectionDomain},
+ {"getDeclaredClasses0", "()[" CLS, (void *)&JVM_GetDeclaredClasses},
+- {"getDeclaringClass", "()" CLS, (void *)&JVM_GetDeclaringClass},
++ {"getDeclaringClass0", "()" CLS, (void *)&JVM_GetDeclaringClass},
+ {"getGenericSignature", "()" STR, (void *)&JVM_GetClassSignature},
+ {"getRawAnnotations", "()" BA, (void *)&JVM_GetClassAnnotations},
+ {"getConstantPool", "()" CPL, (void *)&JVM_GetClassConstantPool},
+--- ./jdk/src/share/native/java/net/Inet6Address.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/java/net/Inet6Address.c Tue Oct 08 09:07:05 2013 -0700
+@@ -33,6 +33,8 @@
+ */
+
+ jclass ia6_class;
++jfieldID ia6_holder6ID;
++
+ jfieldID ia6_ipaddressID;
+ jfieldID ia6_scopeidID;
+ jfieldID ia6_cachedscopeidID;
+@@ -48,21 +50,26 @@
+ */
+ JNIEXPORT void JNICALL
+ Java_java_net_Inet6Address_init(JNIEnv *env, jclass cls) {
++ jclass ia6h_class;
+ jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
+ CHECK_NULL(c);
+ ia6_class = (*env)->NewGlobalRef(env, c);
+ CHECK_NULL(ia6_class);
+- ia6_ipaddressID = (*env)->GetFieldID(env, ia6_class, "ipaddress", "[B");
++ ia6h_class = (*env)->FindClass(env, "java/net/Inet6Address$Inet6AddressHolder");
++ CHECK_NULL(ia6h_class);
++ ia6_holder6ID = (*env)->GetFieldID(env, ia6_class, "holder6", "Ljava/net/Inet6Address$Inet6AddressHolder;");
++ CHECK_NULL(ia6_holder6ID);
++ ia6_ipaddressID = (*env)->GetFieldID(env, ia6h_class, "ipaddress", "[B");
+ CHECK_NULL(ia6_ipaddressID);
+- ia6_scopeidID = (*env)->GetFieldID(env, ia6_class, "scope_id", "I");
++ ia6_scopeidID = (*env)->GetFieldID(env, ia6h_class, "scope_id", "I");
+ CHECK_NULL(ia6_scopeidID);
+ ia6_cachedscopeidID = (*env)->GetFieldID(env, ia6_class, "cached_scope_id", "I");
+ CHECK_NULL(ia6_cachedscopeidID);
+- ia6_scopeidsetID = (*env)->GetFieldID(env, ia6_class, "scope_id_set", "Z");
++ ia6_scopeidsetID = (*env)->GetFieldID(env, ia6h_class, "scope_id_set", "Z");
+ CHECK_NULL(ia6_scopeidID);
+- ia6_scopeifnameID = (*env)->GetFieldID(env, ia6_class, "scope_ifname", "Ljava/net/NetworkInterface;");
++ ia6_scopeifnameID = (*env)->GetFieldID(env, ia6h_class, "scope_ifname", "Ljava/net/NetworkInterface;");
+ CHECK_NULL(ia6_scopeifnameID);
+- ia6_scopeifnamesetID = (*env)->GetFieldID(env, ia6_class, "scope_ifname_set", "Z");
++ ia6_scopeifnamesetID = (*env)->GetFieldID(env, ia6h_class, "scope_ifname_set", "Z");
+ CHECK_NULL(ia6_scopeifnamesetID);
+ ia6_ctrID = (*env)->GetMethodID(env, ia6_class, "<init>", "()V");
+ CHECK_NULL(ia6_ctrID);
+--- ./jdk/src/share/native/java/net/net_util.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/java/net/net_util.c Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -94,6 +94,111 @@
+ extern jfieldID iac_addressID;
+ extern jfieldID iac_familyID;
+
++/**
++ * set_ methods return JNI_TRUE on success JNI_FALSE on error
++ * get_ methods that return +ve int return -1 on error
++ * get_ methods that return objects return NULL on error.
++ */
++jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) {
++ jobject holder;
++
++ initInetAddrs(env);
++ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
++ CHECK_NULL_RETURN(holder, NULL);
++ return (*env)->GetObjectField(env, holder, ia6_scopeifnameID);
++}
++
++int setInet6Address_scopeifname(JNIEnv *env, jobject iaObj, jobject scopeifname) {
++ jobject holder;
++
++ initInetAddrs(env);
++ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
++ CHECK_NULL_RETURN(holder, JNI_FALSE);
++ (*env)->SetObjectField(env, holder, ia6_scopeifnameID, scopeifname);
++ return JNI_TRUE;
++}
++
++int getInet6Address_scopeifname_set(JNIEnv *env, jobject iaObj) {
++ jobject holder;
++
++ initInetAddrs(env);
++ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
++ CHECK_NULL_RETURN(holder, -1);
++ return (*env)->GetBooleanField(env, holder, ia6_scopeifnamesetID);
++}
++
++int setInet6Address_scopeifname_set(JNIEnv *env, jobject iaObj, int scopeifname_set) {
++ jobject holder;
++
++ initInetAddrs(env);
++ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
++ CHECK_NULL_RETURN(holder, JNI_FALSE);
++ (*env)->SetBooleanField(env, holder, ia6_scopeifnamesetID, scopeifname_set);
++ return JNI_TRUE;
++}
++
++int getInet6Address_scopeid_set(JNIEnv *env, jobject iaObj) {
++ jobject holder;
++
++ initInetAddrs(env);
++ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
++ CHECK_NULL_RETURN(holder, -1);
++ return (*env)->GetBooleanField(env, holder, ia6_scopeidsetID);
++}
++
++int getInet6Address_scopeid(JNIEnv *env, jobject iaObj) {
++ jobject holder;
++
++ initInetAddrs(env);
++ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
++ CHECK_NULL_RETURN(holder, -1);
++ return (*env)->GetIntField(env, holder, ia6_scopeidID);
++}
++
++int setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
++ jobject holder;
++
++ initInetAddrs(env);
++ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
++ CHECK_NULL_RETURN(holder, JNI_FALSE);
++ (*env)->SetIntField(env, holder, ia6_scopeidID, scopeid);
++ if (scopeid > 0) {
++ (*env)->SetBooleanField(env, holder, ia6_scopeidsetID, JNI_TRUE);
++ }
++ return JNI_TRUE;
++}
++
++
++int getInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *dest) {
++ jobject holder, addr;
++ jbyteArray barr;
++
++ initInetAddrs(env);
++ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
++ CHECK_NULL_RETURN(holder, JNI_FALSE);
++ addr = (*env)->GetObjectField(env, holder, ia6_ipaddressID);
++ CHECK_NULL_RETURN(addr, JNI_FALSE);
++ (*env)->GetByteArrayRegion(env, addr, 0, 16, (jbyte *)dest);
++ return JNI_TRUE;
++}
++
++int setInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *address) {
++ jobject holder;
++ jbyteArray addr;
++
++ initInetAddrs(env);
++ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
++ CHECK_NULL_RETURN(holder, JNI_FALSE);
++ addr = (jbyteArray)(*env)->GetObjectField(env, holder, ia6_ipaddressID);
++ if (addr == NULL) {
++ addr = (*env)->NewByteArray(env, 16);
++ CHECK_NULL_RETURN(addr, JNI_FALSE);
++ (*env)->SetObjectField(env, holder, ia6_ipaddressID, addr);
++ }
++ (*env)->SetByteArrayRegion(env, addr, 0, 16, (jbyte *)address);
++ return JNI_TRUE;
++}
++
+ void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address) {
+ jobject holder;
+ initInetAddrs(env);
+@@ -168,6 +273,7 @@
+ } else {
+ static jclass inet6Cls = 0;
+ jint scope;
++ int ret;
+ if (inet6Cls == 0) {
+ jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
+ CHECK_NULL_RETURN(c, NULL);
+@@ -177,18 +283,11 @@
+ }
+ iaObj = (*env)->NewObject(env, inet6Cls, ia6_ctrID);
+ CHECK_NULL_RETURN(iaObj, NULL);
+- ipaddress = (*env)->NewByteArray(env, 16);
+- CHECK_NULL_RETURN(ipaddress, NULL);
+- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
+- (jbyte *)&(him6->sin6_addr));
+-
+- (*env)->SetObjectField(env, iaObj, ia6_ipaddressID, ipaddress);
+-
++ ret = setInet6Address_ipaddress(env, iaObj, (char *)&(him6->sin6_addr));
++ CHECK_NULL_RETURN(ret, NULL);
+ setInetAddress_family(env, iaObj, IPv6);
+ scope = getScopeID(him);
+- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
+- if (scope > 0)
+- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
++ setInet6Address_scopeid(env, iaObj, scope);
+ }
+ *port = ntohs(him6->sin6_port);
+ } else
+@@ -248,9 +347,8 @@
+ if (family == AF_INET) {
+ return JNI_FALSE;
+ }
+- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
+- scope = (*env)->GetIntField(env, iaObj, ia6_scopeidID);
+- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddrCur);
++ scope = getInet6Address_scopeid(env, iaObj);
++ getInet6Address_ipaddress(env, iaObj, (char *)caddrCur);
+ if (NET_IsEqual(caddrNew, caddrCur) && cmpScopeID(scope, him)) {
+ return JNI_TRUE;
+ } else {
+--- ./jdk/src/share/native/java/net/net_util.h Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/java/net/net_util.h Tue Oct 08 09:07:05 2013 -0700
+@@ -58,6 +58,22 @@
+ extern jfieldID iac_hostNameID;
+ extern jfieldID ia_preferIPv6AddressID;
+
++/** (Inet6Address accessors)
++ * set_ methods return JNI_TRUE on success JNI_FALSE on error
++ * get_ methods that return int/boolean, return -1 on error
++ * get_ methods that return objects return NULL on error.
++ */
++extern jobject getInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj);
++extern int setInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj, jobject scopeifname);
++extern int getInet6Address_scopeifname_set(JNIEnv *env, jobject ia6Obj);
++extern int setInet6Address_scopeifname_set(JNIEnv *env, jobject ia6Obj,
++ int scopeifname_set);
++extern int getInet6Address_scopeid_set(JNIEnv *env, jobject ia6Obj);
++extern int getInet6Address_scopeid(JNIEnv *env, jobject ia6Obj);
++extern int setInet6Address_scopeid(JNIEnv *env, jobject ia6Obj, int scopeid);
++extern int getInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *dest);
++extern int setInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *address);
++
+ extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address);
+ extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family);
+ extern void setInetAddress_hostName(JNIEnv *env, jobject iaObj, jobject h);
+@@ -93,6 +109,7 @@
+
+ /* Inet6Address fields */
+ extern jclass ia6_class;
++extern jfieldID ia6_holder6ID;
+ extern jfieldID ia6_ipaddressID;
+ extern jfieldID ia6_scopeidID;
+ extern jfieldID ia6_cachedscopeidID;
+--- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Tue Oct 08 09:07:05 2013 -0700
+@@ -808,363 +808,204 @@
+ return 1;
+ }
+
+-/*
+- * This routine will fill in a buffer of data for either 1 band or all
+- * bands (if band == -1).
+- */
+ #define MAX_TO_GRAB (10240)
+
+-int awt_getPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
+- unsigned char *bufferP) {
+- int w = rasterP->width;
+- int h = rasterP->height;
+- int numBands = rasterP->numBands;
++typedef union {
++ void *pv;
++ unsigned char *pb;
++ unsigned short *ps;
++} PixelData_t;
++
++
++int awt_getPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP) {
++ const int w = rasterP->width;
++ const int h = rasterP->height;
++ const int numBands = rasterP->numBands;
+ int y;
+ int i;
+- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
++ int maxLines;
+ jobject jsm;
+- int off;
++ int off = 0;
+ jarray jdata = NULL;
+ jobject jdatabuffer;
+ int *dataP;
+- int maxBytes = w;
++ int maxSamples;
++ PixelData_t p;
++
++ if (bufferP == NULL) {
++ return -1;
++ }
++
++ if (rasterP->dataType != BYTE_DATA_TYPE &&
++ rasterP->dataType != SHORT_DATA_TYPE)
++ {
++ return -1;
++ }
++
++ p.pv = bufferP;
++
++ if (!SAFE_TO_MULT(w, numBands)) {
++ return -1;
++ }
++ maxSamples = w * numBands;
++
++ maxLines = maxSamples > MAX_TO_GRAB ? 1 : (MAX_TO_GRAB / maxSamples);
++ if (maxLines > h) {
++ maxLines = h;
++ }
++
++ if (!SAFE_TO_MULT(maxSamples, maxLines)) {
++ return -1;
++ }
++
++ maxSamples *= maxLines;
+
+ jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
+ jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
+ g_RasterDataBufferID);
+- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
++
++ jdata = (*env)->NewIntArray(env, maxSamples);
+ if (JNU_IsNull(env, jdata)) {
+ JNU_ThrowOutOfMemoryError(env, "Out of Memory");
+ return -1;
+ }
+
+- /* Here is the generic code */
+- if (band >= 0) {
+- int dOff;
+- if (band >= numBands) {
++ for (y = 0; y < h; y += maxLines) {
++ if (y + maxLines > h) {
++ maxLines = h - y;
++ maxSamples = w * numBands * maxLines;
++ }
++
++ (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
++ 0, y, w,
++ maxLines, jdata, jdatabuffer);
++
++ if ((*env)->ExceptionOccurred(env)) {
+ (*env)->DeleteLocalRef(env, jdata);
+- JNU_ThrowInternalError(env, "Band out of range.");
+ return -1;
+ }
+- off = 0;
+- for (y=0; y < h; ) {
+- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
+- 0, y, w,
+- maxLines, jdata, jdatabuffer);
+- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+- NULL);
+- if (dataP == NULL) {
+- (*env)->DeleteLocalRef(env, jdata);
+- return -1;
+- }
+- dOff = band;
+- for (i=0; i < maxBytes; i++, dOff += numBands) {
+- bufferP[off++] = (unsigned char) dataP[dOff];
+- }
+
+- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+- JNI_ABORT);
+-
+- if (y+maxLines < h) {
+- y += maxLines;
+- }
+- else {
+- y++;
+- maxBytes = w;
+- }
+- }
+- }
+- else {
+- off = 0;
+- maxBytes *= numBands;
+- for (y=0; y < h; ) {
+- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
+- 0, y, w,
+- maxLines, jdata, jdatabuffer);
+- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+- NULL);
+- if (dataP == NULL) {
+- (*env)->DeleteLocalRef(env, jdata);
+- return -1;
+- }
+- for (i=0; i < maxBytes; i++) {
+- bufferP[off++] = (unsigned char) dataP[i];
+- }
+-
+- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+- JNI_ABORT);
+-
+- if (y+maxLines < h) {
+- y += maxLines;
+- }
+- else {
+- y++;
+- maxBytes = w*numBands;
+- }
++ dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
++ NULL);
++ if (dataP == NULL) {
++ (*env)->DeleteLocalRef(env, jdata);
++ return -1;
+ }
+
++ switch (rasterP->dataType) {
++ case BYTE_DATA_TYPE:
++ for (i = 0; i < maxSamples; i ++) {
++ p.pb[off++] = (unsigned char) dataP[i];
++ }
++ break;
++ case SHORT_DATA_TYPE:
++ for (i = 0; i < maxSamples; i ++) {
++ p.ps[off++] = (unsigned short) dataP[i];
++ }
++ break;
++ }
++
++ (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
++ JNI_ABORT);
+ }
+ (*env)->DeleteLocalRef(env, jdata);
+
+- return 0;
++ return 1;
+ }
+-int awt_setPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
+- unsigned char *bufferP) {
+- int w = rasterP->width;
+- int h = rasterP->height;
+- int numBands = rasterP->numBands;
++
++int awt_setPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP) {
++ const int w = rasterP->width;
++ const int h = rasterP->height;
++ const int numBands = rasterP->numBands;
++
+ int y;
+ int i;
+- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
++ int maxLines;
+ jobject jsm;
+- int off;
++ int off = 0;
+ jarray jdata = NULL;
+ jobject jdatabuffer;
+ int *dataP;
+- int maxBytes = w;
++ int maxSamples;
++ PixelData_t p;
++
++ if (bufferP == NULL) {
++ return -1;
++ }
++
++ if (rasterP->dataType != BYTE_DATA_TYPE &&
++ rasterP->dataType != SHORT_DATA_TYPE)
++ {
++ return -1;
++ }
++
++ p.pv = bufferP;
++
++ if (!SAFE_TO_MULT(w, numBands)) {
++ return -1;
++ }
++ maxSamples = w * numBands;
++
++ maxLines = maxSamples > MAX_TO_GRAB ? 1 : (MAX_TO_GRAB / maxSamples);
++ if (maxLines > h) {
++ maxLines = h;
++ }
++
++ if (!SAFE_TO_MULT(maxSamples, maxLines)) {
++ return -1;
++ }
++
++ maxSamples *= maxLines;
+
+ jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
+ jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
+ g_RasterDataBufferID);
+- /* Here is the generic code */
+- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
++
++ jdata = (*env)->NewIntArray(env, maxSamples);
+ if (JNU_IsNull(env, jdata)) {
+ JNU_ThrowOutOfMemoryError(env, "Out of Memory");
+ return -1;
+ }
+- if (band >= 0) {
+- int dOff;
+- if (band >= numBands) {
++
++ for (y = 0; y < h; y += maxLines) {
++ if (y + maxLines > h) {
++ maxLines = h - y;
++ maxSamples = w * numBands * maxLines;
++ }
++ dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
++ NULL);
++ if (dataP == NULL) {
+ (*env)->DeleteLocalRef(env, jdata);
+- JNU_ThrowInternalError(env, "Band out of range.");
+ return -1;
+ }
+- off = 0;
+- for (y=0; y < h; y+=maxLines) {
+- if (y+maxLines > h) {
+- maxBytes = w*numBands;
+- maxLines = h - y;
++
++ switch (rasterP->dataType) {
++ case BYTE_DATA_TYPE:
++ for (i = 0; i < maxSamples; i ++) {
++ dataP[i] = p.pb[off++];
+ }
+- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+- NULL);
+- if (dataP == NULL) {
+- (*env)->DeleteLocalRef(env, jdata);
+- return -1;
++ break;
++ case SHORT_DATA_TYPE:
++ for (i = 0; i < maxSamples; i ++) {
++ dataP[i] = p.ps[off++];
+ }
+- dOff = band;
+- for (i=0; i < maxBytes; i++, dOff += numBands) {
+- dataP[dOff] = bufferP[off++];
+- }
+-
+- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+- JNI_ABORT);
+-
+- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
+- 0, y, w,
+- maxLines, jdata, jdatabuffer);
+- }
+- }
+- else {
+- off = 0;
+- maxBytes *= numBands;
+- for (y=0; y < h; y+=maxLines) {
+- if (y+maxLines > h) {
+- maxBytes = w*numBands;
+- maxLines = h - y;
+- }
+- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+- NULL);
+- if (dataP == NULL) {
+- (*env)->DeleteLocalRef(env, jdata);
+- return -1;
+- }
+- for (i=0; i < maxBytes; i++) {
+- dataP[i] = bufferP[off++];
+- }
+-
+- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+- JNI_ABORT);
+-
+- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
+- 0, y, w,
+- maxLines, jdata, jdatabuffer);
++ break;
+ }
+
++ (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
++ JNI_ABORT);
++
++ (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
++ 0, y, w,
++ maxLines, jdata, jdatabuffer);
++
++ if ((*env)->ExceptionOccurred(env)) {
++ (*env)->DeleteLocalRef(env, jdata);
++ return -1;
++ }
+ }
+
+ (*env)->DeleteLocalRef(env, jdata);
+
+- return 0;
++ return 1;
+ }
+-int awt_getPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
+- unsigned short *bufferP) {
+- int w = rasterP->width;
+- int h = rasterP->height;
+- int numBands = rasterP->numBands;
+- int y;
+- int i;
+- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
+- jobject jsm;
+- int off;
+- jarray jdata = NULL;
+- jobject jdatabuffer;
+- int *dataP;
+- int maxBytes = w*maxLines;
+-
+- jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
+- jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
+- g_RasterDataBufferID);
+- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
+- if (JNU_IsNull(env, jdata)) {
+- JNU_ThrowOutOfMemoryError(env, "Out of Memory");
+- return -1;
+- }
+- /* Here is the generic code */
+- if (band >= 0) {
+- int dOff;
+- if (band >= numBands) {
+- (*env)->DeleteLocalRef(env, jdata);
+- JNU_ThrowInternalError(env, "Band out of range.");
+- return -1;
+- }
+- off = 0;
+- for (y=0; y < h; y += maxLines) {
+- if (y+maxLines > h) {
+- maxBytes = w*numBands;
+- maxLines = h - y;
+- }
+- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
+- 0, y, w,
+- maxLines, jdata, jdatabuffer);
+- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+- NULL);
+- if (dataP == NULL) {
+- (*env)->DeleteLocalRef(env, jdata);
+- return -1;
+- }
+-
+- dOff = band;
+- for (i=0; i < maxBytes; i++, dOff += numBands) {
+- bufferP[off++] = (unsigned short) dataP[dOff];
+- }
+-
+- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+- JNI_ABORT);
+- }
+- }
+- else {
+- off = 0;
+- maxBytes *= numBands;
+- for (y=0; y < h; y+=maxLines) {
+- if (y+maxLines > h) {
+- maxBytes = w*numBands;
+- maxLines = h - y;
+- }
+- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
+- 0, y, w,
+- maxLines, jdata, jdatabuffer);
+- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+- NULL);
+- if (dataP == NULL) {
+- (*env)->DeleteLocalRef(env, jdata);
+- return -1;
+- }
+- for (i=0; i < maxBytes; i++) {
+- bufferP[off++] = (unsigned short) dataP[i];
+- }
+-
+- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+- JNI_ABORT);
+- }
+-
+- }
+-
+- (*env)->DeleteLocalRef(env, jdata);
+- return 0;
+-}
+-int awt_setPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
+- unsigned short *bufferP) {
+- int w = rasterP->width;
+- int h = rasterP->height;
+- int numBands = rasterP->numBands;
+- int y;
+- int i;
+- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
+- jobject jsm;
+- int off;
+- jarray jdata = NULL;
+- jobject jdatabuffer;
+- int *dataP;
+- int maxBytes = w;
+-
+- jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
+- jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
+- g_RasterDataBufferID);
+- if (band >= numBands) {
+- JNU_ThrowInternalError(env, "Band out of range.");
+- return -1;
+- }
+- /* Here is the generic code */
+- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
+- if (JNU_IsNull(env, jdata)) {
+- JNU_ThrowOutOfMemoryError(env, "Out of Memory");
+- return -1;
+- }
+- if (band >= 0) {
+- int dOff;
+- off = 0;
+- for (y=0; y < h; y+=maxLines) {
+- if (y+maxLines > h) {
+- maxBytes = w*numBands;
+- maxLines = h - y;
+- }
+- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+- NULL);
+- if (dataP == NULL) {
+- (*env)->DeleteLocalRef(env, jdata);
+- return -1;
+- }
+- dOff = band;
+- for (i=0; i < maxBytes; i++, dOff += numBands) {
+- dataP[dOff] = bufferP[off++];
+- }
+-
+- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+- JNI_ABORT);
+-
+- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
+- 0, y, w,
+- maxLines, jdata, jdatabuffer);
+- }
+- }
+- else {
+- off = 0;
+- maxBytes *= numBands;
+- for (y=0; y < h; y+=maxLines) {
+- if (y+maxLines > h) {
+- maxBytes = w*numBands;
+- maxLines = h - y;
+- }
+- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
+- NULL);
+- if (dataP == NULL) {
+- (*env)->DeleteLocalRef(env, jdata);
+- return -1;
+- }
+- for (i=0; i < maxBytes; i++) {
+- dataP[i] = bufferP[off++];
+- }
+-
+- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
+- JNI_ABORT);
+-
+- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
+- 0, y, w,
+- maxLines, jdata, jdatabuffer);
+- }
+-
+- }
+-
+- (*env)->DeleteLocalRef(env, jdata);
+- return 0;
+-}
+--- ./jdk/src/share/native/sun/awt/image/awt_parseImage.h Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.h Tue Oct 08 09:07:05 2013 -0700
+@@ -188,13 +188,8 @@
+
+ void awt_freeParsedImage(BufImageS_t *imageP, int freeImageP);
+
+-int awt_getPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
+- unsigned char *bufferP);
+-int awt_setPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
+- unsigned char *bufferP);
+-int awt_getPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
+- unsigned short *bufferP);
+-int awt_setPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
+- unsigned short *bufferP);
++int awt_getPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP);
++
++int awt_setPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP);
+
+ #endif /* AWT_PARSE_IMAGE_H */
+--- ./jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c Tue Oct 08 09:07:05 2013 -0700
+@@ -930,9 +930,10 @@
+ * Now fill a complete buffer, or as much of one as the stream
+ * will give us if we are near the end.
+ */
++ RELEASE_ARRAYS(env, data, src->next_input_byte);
++
+ GET_IO_REF(input);
+
+- RELEASE_ARRAYS(env, data, src->next_input_byte);
+ ret = (*env)->CallIntMethod(env,
+ input,
+ JPEGImageReader_readInputDataID,
+@@ -1017,9 +1018,11 @@
+ memcpy(sb->buf, src->next_input_byte, offset);
+ }
+
++
++ RELEASE_ARRAYS(env, data, src->next_input_byte);
++
+ GET_IO_REF(input);
+
+- RELEASE_ARRAYS(env, data, src->next_input_byte);
+ buflen = sb->bufferLength - offset;
+ if (buflen <= 0) {
+ if (!GET_ARRAYS(env, data, &(src->next_input_byte))) {
+@@ -1121,9 +1124,10 @@
+ return;
+ }
+
++ RELEASE_ARRAYS(env, data, src->next_input_byte);
++
+ GET_IO_REF(input);
+
+- RELEASE_ARRAYS(env, data, src->next_input_byte);
+ ret = (*env)->CallLongMethod(env,
+ input,
+ JPEGImageReader_skipInputBytesID,
+@@ -2306,10 +2310,10 @@
+ JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+ jobject output = NULL;
+
++ RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
++
+ GET_IO_REF(output);
+
+- RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
+-
+ (*env)->CallVoidMethod(env,
+ output,
+ JPEGImageWriter_writeOutputDataID,
+@@ -2348,10 +2352,10 @@
+ if (datacount != 0) {
+ jobject output = NULL;
+
++ RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
++
+ GET_IO_REF(output);
+
+- RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
+-
+ (*env)->CallVoidMethod(env,
+ output,
+ JPEGImageWriter_writeOutputDataID,
+@@ -2702,6 +2706,15 @@
+ bandSize = (*env)->GetIntArrayElements(env, bandSizes, NULL);
+
+ for (i = 0; i < numBands; i++) {
++ if (bandSize[i] <= 0 || bandSize[i] > JPEG_BAND_SIZE) {
++ (*env)->ReleaseIntArrayElements(env, bandSizes,
++ bandSize, JNI_ABORT);
++ JNU_ThrowByName(env, "javax/imageio/IIOException", "Invalid Image");
++ return JNI_FALSE;;
++ }
++ }
++
++ for (i = 0; i < numBands; i++) {
+ if (bandSize[i] != JPEG_BAND_SIZE) {
+ if (scale == NULL) {
+ scale = (UINT8**) calloc(numBands, sizeof(UINT8*));
+--- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Tue Oct 08 09:07:05 2013 -0700
+@@ -700,22 +700,7 @@
+
+ /* Means that we couldn't write directly into the destination buffer */
+ if (ddata == NULL) {
+- unsigned char *bdataP;
+- unsigned short *sdataP;
+-
+- /* Punt for now */
+- switch (dstRasterP->dataType) {
+- case BYTE_DATA_TYPE:
+- bdataP = (unsigned char *) mlib_ImageGetData(dst);
+- retStatus = (awt_setPixelByte(env, -1, dstRasterP, bdataP) >= 0) ;
+- break;
+- case SHORT_DATA_TYPE:
+- sdataP = (unsigned short *) mlib_ImageGetData(dst);
+- retStatus = (awt_setPixelShort(env, -1, dstRasterP, sdataP) >= 0) ;
+- break;
+- default:
+- retStatus = 0;
+- }
++ retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
+ }
+
+ /* Release the pinned memory */
+@@ -1119,24 +1104,9 @@
+
+ /* Means that we couldn't write directly into the destination buffer */
+ if (ddata == NULL) {
+- unsigned char *bdataP;
+- unsigned short *sdataP;
+-
+ /* Need to store it back into the array */
+ if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
+- /* Punt for now */
+- switch (dst->type) {
+- case MLIB_BYTE:
+- bdataP = (unsigned char *) mlib_ImageGetData(dst);
+- retStatus = (awt_setPixelByte(env, -1, dstRasterP, bdataP) >= 0) ;
+- break;
+- case MLIB_SHORT:
+- sdataP = (unsigned short *) mlib_ImageGetData(dst);
+- retStatus = (awt_setPixelShort(env, -1, dstRasterP, sdataP) >= 0) ;
+- break;
+- default:
+- retStatus = 0;
+- }
++ retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
+ }
+ }
+
+@@ -1704,21 +1674,7 @@
+ * the destination buffer
+ */
+ if (ddata == NULL) {
+- unsigned char* bdataP;
+- unsigned short* sdataP;
+-
+- switch (dstRasterP->dataType) {
+- case BYTE_DATA_TYPE:
+- bdataP = (unsigned char *) mlib_ImageGetData(dst);
+- retStatus = (awt_setPixelByte(env, -1, dstRasterP, bdataP) >= 0) ;
+- break;
+- case SHORT_DATA_TYPE:
+- sdataP = (unsigned short *) mlib_ImageGetData(dst);
+- retStatus = (awt_setPixelShort(env, -1, dstRasterP, sdataP) >= 0) ;
+- break;
+- default:
+- retStatus = 0;
+- }
++ retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
+ }
+
+ /* Release the LUT */
+@@ -2029,21 +1985,25 @@
+ return 0;
+ }
+
++#define NUM_LINES 10
++
+ static int
+ cvtCustomToDefault(JNIEnv *env, BufImageS_t *imageP, int component,
+ unsigned char *dataP) {
+- ColorModelS_t *cmP = &imageP->cmodel;
+- RasterS_t *rasterP = &imageP->raster;
++ const RasterS_t *rasterP = &imageP->raster;
++ const int w = rasterP->width;
++ const int h = rasterP->height;
++
+ int y;
+- jobject jpixels = NULL;
++ jintArray jpixels = NULL;
+ jint *pixels;
+ unsigned char *dP = dataP;
+-#define NUM_LINES 10
+- int numLines = NUM_LINES;
++ int numLines = h > NUM_LINES ? NUM_LINES : h;
++
+ /* it is safe to calculate the scan length, because width has been verified
+ * on creation of the mlib image
+ */
+- int scanLength = rasterP->width * 4;
++ const int scanLength = w * 4;
+
+ int nbytes = 0;
+ if (!SAFE_TO_MULT(numLines, scanLength)) {
+@@ -2052,71 +2012,99 @@
+
+ nbytes = numLines * scanLength;
+
+- for (y=0; y < rasterP->height; y+=numLines) {
+- /* getData, one scanline at a time */
+- if (y+numLines > rasterP->height) {
+- numLines = rasterP->height - y;
+- nbytes = numLines * scanLength;
+- }
+- jpixels = (*env)->CallObjectMethod(env, imageP->jimage,
+- g_BImgGetRGBMID, 0, y,
+- rasterP->width, numLines,
+- jpixels,0, rasterP->width);
+- if (jpixels == NULL) {
+- JNU_ThrowInternalError(env, "Can't retrieve pixels.");
+- return -1;
+- }
+-
+- pixels = (*env)->GetPrimitiveArrayCritical(env, jpixels, NULL);
+- memcpy(dP, pixels, nbytes);
+- dP += nbytes;
+- (*env)->ReleasePrimitiveArrayCritical(env, jpixels, pixels,
+- JNI_ABORT);
+- }
+- return 0;
+-}
+-
+-static int
+-cvtDefaultToCustom(JNIEnv *env, BufImageS_t *imageP, int component,
+- unsigned char *dataP) {
+- ColorModelS_t *cmP = &imageP->cmodel;
+- RasterS_t *rasterP = &imageP->raster;
+- int y;
+- jint *pixels;
+- unsigned char *dP = dataP;
+-#define NUM_LINES 10
+- int numLines = NUM_LINES;
+- int nbytes = rasterP->width*4*NUM_LINES;
+- jintArray jpixels;
+-
+ jpixels = (*env)->NewIntArray(env, nbytes);
+ if (JNU_IsNull(env, jpixels)) {
+ JNU_ThrowOutOfMemoryError(env, "Out of Memory");
+ return -1;
+ }
+
+- for (y=0; y < rasterP->height; y+=NUM_LINES) {
+- if (y+numLines > rasterP->height) {
+- numLines = rasterP->height - y;
+- nbytes = rasterP->width*4*numLines;
++ for (y = 0; y < h; y += numLines) {
++ if (y + numLines > h) {
++ numLines = h - y;
++ nbytes = numLines * scanLength;
+ }
++
++ (*env)->CallObjectMethod(env, imageP->jimage,
++ g_BImgGetRGBMID, 0, y,
++ w, numLines,
++ jpixels, 0, w);
++ if ((*env)->ExceptionOccurred(env)) {
++ (*env)->DeleteLocalRef(env, jpixels);
++ return -1;
++ }
++
+ pixels = (*env)->GetPrimitiveArrayCritical(env, jpixels, NULL);
+ if (pixels == NULL) {
+- /* JNI error */
++ (*env)->DeleteLocalRef(env, jpixels);
+ return -1;
+ }
+
++ memcpy(dP, pixels, nbytes);
++ dP += nbytes;
++
++ (*env)->ReleasePrimitiveArrayCritical(env, jpixels, pixels,
++ JNI_ABORT);
++ }
++
++ /* Need to release the array */
++ (*env)->DeleteLocalRef(env, jpixels);
++
++ return 0;
++}
++
++static int
++cvtDefaultToCustom(JNIEnv *env, BufImageS_t *imageP, int component,
++ unsigned char *dataP) {
++ const RasterS_t *rasterP = &imageP->raster;
++ const int w = rasterP->width;
++ const int h = rasterP->height;
++
++ int y;
++ jintArray jpixels = NULL;
++ jint *pixels;
++ unsigned char *dP = dataP;
++ int numLines = h > NUM_LINES ? NUM_LINES : h;
++
++ /* it is safe to calculate the scan length, because width has been verified
++ * on creation of the mlib image
++ */
++ const int scanLength = w * 4;
++
++ int nbytes = 0;
++ if (!SAFE_TO_MULT(numLines, scanLength)) {
++ return -1;
++ }
++
++ nbytes = numLines * scanLength;
++
++ jpixels = (*env)->NewIntArray(env, nbytes);
++ if (JNU_IsNull(env, jpixels)) {
++ JNU_ThrowOutOfMemoryError(env, "Out of Memory");
++ return -1;
++ }
++
++ for (y = 0; y < h; y += numLines) {
++ if (y + numLines > h) {
++ numLines = h - y;
++ nbytes = numLines * scanLength;
++ }
++
++ pixels = (*env)->GetPrimitiveArrayCritical(env, jpixels, NULL);
++ if (pixels == NULL) {
++ (*env)->DeleteLocalRef(env, jpixels);
++ return -1;
++ }
++
+ memcpy(pixels, dP, nbytes);
+ dP += nbytes;
+
+ (*env)->ReleasePrimitiveArrayCritical(env, jpixels, pixels, 0);
+
+- /* setData, one scanline at a time */
+- /* Fix 4223648, 4184283 */
+ (*env)->CallVoidMethod(env, imageP->jimage, g_BImgSetRGBMID, 0, y,
+- rasterP->width, numLines, jpixels, 0,
+- rasterP->width);
++ w, numLines, jpixels,
++ 0, w);
+ if ((*env)->ExceptionOccurred(env)) {
++ (*env)->DeleteLocalRef(env, jpixels);
+ return -1;
+ }
+ }
+@@ -2298,7 +2286,6 @@
+ mlib_image **mlibImagePP, void **dataPP, int isSrc) {
+ void *dataP;
+ unsigned char *cDataP;
+- unsigned short *sdataP;
+ int dataType = BYTE_DATA_TYPE;
+ int width;
+ int height;
+@@ -2484,8 +2471,7 @@
+ return -1;
+ }
+ if (isSrc) {
+- cDataP = (unsigned char *) mlib_ImageGetData(*mlibImagePP);
+- if (awt_getPixelByte(env, -1, rasterP, cDataP) < 0) {
++ if (awt_getPixels(env, rasterP, mlib_ImageGetData(*mlibImagePP)) < 0) {
+ (*sMlibSysFns.deleteImageFP)(*mlibImagePP);
+ return -1;
+ }
+@@ -2499,8 +2485,7 @@
+ return -1;
+ }
+ if (isSrc) {
+- sdataP = (unsigned short *) mlib_ImageGetData(*mlibImagePP);
+- if (awt_getPixelShort(env, -1, rasterP, sdataP) < 0) {
++ if (awt_getPixels(env, rasterP, mlib_ImageGetData(*mlibImagePP)) < 0) {
+ (*sMlibSysFns.deleteImageFP)(*mlibImagePP);
+ return -1;
+ }
+@@ -2550,60 +2535,6 @@
+ }
+ }
+
+-static int
+-storeDstArray(JNIEnv *env, BufImageS_t *srcP, BufImageS_t *dstP,
+- mlibHintS_t *hintP, mlib_image *mlibImP, void *ddata) {
+- RasterS_t *rasterP = &dstP->raster;
+-
+- /* Nothing to do since it is the same image type */
+- if (srcP->imageType == dstP->imageType
+- && srcP->imageType != java_awt_image_BufferedImage_TYPE_CUSTOM
+- && srcP->imageType != java_awt_image_BufferedImage_TYPE_BYTE_INDEXED
+- && srcP->imageType != java_awt_image_BufferedImage_TYPE_BYTE_BINARY) {
+- /* REMIND: Should check the ICM LUTS to see if it is the same */
+- return 0;
+- }
+-
+- /* These types are compatible with TYPE_INT_RGB */
+- if (srcP->imageType == java_awt_image_BufferedImage_TYPE_INT_RGB
+- && (dstP->imageType == java_awt_image_BufferedImage_TYPE_INT_ARGB ||
+- dstP->imageType == java_awt_image_BufferedImage_TYPE_INT_ARGB_PRE)){
+- return 0;
+- }
+-
+- if (hintP->cvtSrcToDefault &&
+- (srcP->cmodel.isAlphaPre == dstP->cmodel.isAlphaPre)) {
+- if (srcP->cmodel.isAlphaPre) {
+- if (dstP->imageType ==
+- java_awt_image_BufferedImage_TYPE_INT_ARGB_PRE)
+- {
+- return 0;
+- }
+- if (!srcP->cmodel.supportsAlpha &&
+- dstP->imageType == java_awt_image_BufferedImage_TYPE_INT_RGB){
+- return 0;
+- }
+- }
+- else {
+- /* REMIND: */
+- }
+- }
+-
+- if (dstP->cmodel.cmType == DIRECT_CM_TYPE) {
+- /* Just need to move bits */
+- if (mlibImP->type == MLIB_BYTE) {
+- return awt_setPixelByte(env, -1, &dstP->raster,
+- (unsigned char *) mlibImP->data);
+- }
+- else if (mlibImP->type == MLIB_SHORT) {
+- return awt_setPixelByte(env, -1, &dstP->raster,
+- (unsigned char *) mlibImP->data);
+- }
+- }
+-
+- return 0;
+-}
+-
+ #define ERR_BAD_IMAGE_LAYOUT (-2)
+
+ #define CHECK_DST_ARRAY(start_offset, elements_per_scan, elements_per_pixel) \
+@@ -2709,8 +2640,7 @@
+ }
+ }
+ else if (mlibImP->type == MLIB_SHORT) {
+- return awt_setPixelShort(env, -1, rasterP,
+- (unsigned short *) mlibImP->data);
++ return awt_setPixels(env, rasterP, mlibImP->data);
+ }
+ }
+ else {
+--- ./jdk/src/share/native/sun/font/layout/GlyphIterator.cpp Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/GlyphIterator.cpp Tue Oct 08 09:07:05 2013 -0700
+@@ -66,6 +66,7 @@
+ nextLimit = -1;
+ prevLimit = glyphCount;
+ }
++ filterResetCache();
+ }
+
+ GlyphIterator::GlyphIterator(GlyphIterator &that)
+@@ -84,6 +85,7 @@
+ glyphGroup = that.glyphGroup;
+ glyphClassDefinitionTable = that.glyphClassDefinitionTable;
+ markAttachClassDefinitionTable = that.markAttachClassDefinitionTable;
++ filterResetCache();
+ }
+
+ GlyphIterator::GlyphIterator(GlyphIterator &that, FeatureMask newFeatureMask)
+@@ -102,6 +104,7 @@
+ glyphGroup = 0;
+ glyphClassDefinitionTable = that.glyphClassDefinitionTable;
+ markAttachClassDefinitionTable = that.markAttachClassDefinitionTable;
++ filterResetCache();
+ }
+
+ GlyphIterator::GlyphIterator(GlyphIterator &that, le_uint16 newLookupFlags)
+@@ -120,6 +123,7 @@
+ glyphGroup = that.glyphGroup;
+ glyphClassDefinitionTable = that.glyphClassDefinitionTable;
+ markAttachClassDefinitionTable = that.markAttachClassDefinitionTable;
++ filterResetCache();
+ }
+
+ GlyphIterator::~GlyphIterator()
+@@ -133,6 +137,7 @@
+ featureMask = newFeatureMask;
+ glyphGroup = 0;
+ lookupFlags = newLookupFlags;
++ filterResetCache();
+ }
+
+ LEGlyphID *GlyphIterator::insertGlyphs(le_int32 count, LEErrorCode& success)
+@@ -381,53 +386,68 @@
+ glyphPositionAdjustments->setCursiveGlyph(position, baselineIsLogicalEnd());
+ }
+
+-le_bool GlyphIterator::filterGlyph(le_uint32 index) const
+-{
+- LEErrorCode success = LE_NO_ERROR;
+- LEGlyphID glyphID = glyphStorage[index];
+- le_int32 glyphClass = gcdNoGlyphClass;
+-
+- if (LE_GET_GLYPH(glyphID) >= 0xFFFE) {
+- return TRUE;
++void GlyphIterator::filterResetCache(void) {
++ filterCacheValid = FALSE;
+ }
+
++le_bool GlyphIterator::filterGlyph(le_uint32 index)
++{
++ LEGlyphID glyphID = glyphStorage[index];
++
++ if (!filterCacheValid || filterCache.id != glyphID) {
++ filterCache.id = glyphID;
++
++ le_bool &filterResult = filterCache.result; // NB: Making this a reference to accept the updated value, in case
++ // we want more fancy cacheing in the future.
++ if (LE_GET_GLYPH(glyphID) >= 0xFFFE) {
++ filterResult = TRUE;
++ } else {
++ LEErrorCode success = LE_NO_ERROR;
++ le_int32 glyphClass = gcdNoGlyphClass;
+ if (glyphClassDefinitionTable.isValid()) {
+ glyphClass = glyphClassDefinitionTable->getGlyphClass(glyphClassDefinitionTable, glyphID, success);
+ }
+-
+- switch (glyphClass)
+- {
++ switch (glyphClass) {
+ case gcdNoGlyphClass:
+- return FALSE;
++ filterResult = FALSE;
++ break;
+
+ case gcdSimpleGlyph:
+- return (lookupFlags & lfIgnoreBaseGlyphs) != 0;
++ filterResult = (lookupFlags & lfIgnoreBaseGlyphs) != 0;
++ break;
+
+ case gcdLigatureGlyph:
+- return (lookupFlags & lfIgnoreLigatures) != 0;
++ filterResult = (lookupFlags & lfIgnoreLigatures) != 0;
++ break;
+
+ case gcdMarkGlyph:
+- {
+ if ((lookupFlags & lfIgnoreMarks) != 0) {
+- return TRUE;
+- }
+-
++ filterResult = TRUE;
++ } else {
+ le_uint16 markAttachType = (lookupFlags & lfMarkAttachTypeMask) >> lfMarkAttachTypeShift;
+
+ if ((markAttachType != 0) && (markAttachClassDefinitionTable.isValid())) {
+- return markAttachClassDefinitionTable
+- -> getGlyphClass(markAttachClassDefinitionTable, glyphID, success) != markAttachType;
++ filterResult = (markAttachClassDefinitionTable
++ -> getGlyphClass(markAttachClassDefinitionTable, glyphID, success) != markAttachType);
++ } else {
++ filterResult = FALSE;
++ }
++ }
++ break;
++
++ case gcdComponentGlyph:
++ filterResult = ((lookupFlags & lfIgnoreBaseGlyphs) != 0);
++ break;
++
++ default:
++ filterResult = FALSE;
++ break;
++ }
++ }
++ filterCacheValid = TRUE;
+ }
+
+- return FALSE;
+- }
+-
+- case gcdComponentGlyph:
+- return (lookupFlags & lfIgnoreBaseGlyphs) != 0;
+-
+- default:
+- return FALSE;
+- }
++ return filterCache.result;
+ }
+
+ le_bool GlyphIterator::hasFeatureTag(le_bool matchGroup) const
+--- ./jdk/src/share/native/sun/font/layout/GlyphIterator.h Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/GlyphIterator.h Tue Oct 08 09:07:05 2013 -0700
+@@ -98,7 +98,7 @@
+ le_int32 applyInsertions();
+
+ private:
+- le_bool filterGlyph(le_uint32 index) const;
++ le_bool filterGlyph(le_uint32 index);
+ le_bool hasFeatureTag(le_bool matchGroup) const;
+ le_bool nextInternal(le_uint32 delta = 1);
+ le_bool prevInternal(le_uint32 delta = 1);
+@@ -121,6 +121,14 @@
+ LEReferenceTo<MarkAttachClassDefinitionTable> markAttachClassDefinitionTable;
+
+ GlyphIterator &operator=(const GlyphIterator &other); // forbid copying of this class
++
++ struct {
++ LEGlyphID id;
++ le_bool result;
++ } filterCache;
++ le_bool filterCacheValid;
++
++ void filterResetCache(void);
+ };
+
+ U_NAMESPACE_END
+--- ./jdk/src/share/native/sun/font/layout/LETableReference.h Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LETableReference.h Tue Oct 08 09:07:05 2013 -0700
+@@ -377,7 +377,7 @@
+ * @param success error status
+ * @param atPtr location of reference - if NULL, will be at offset zero (i.e. downcast of parent). Otherwise must be a pointer within parent's bounds.
+ */
+- LEReferenceTo(const LETableReference &parent, LEErrorCode &success, const void* atPtr)
++ inline LEReferenceTo(const LETableReference &parent, LEErrorCode &success, const void* atPtr)
+ : LETableReference(parent, parent.ptrToOffset(atPtr, success), LE_UINTPTR_MAX, success) {
+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
+ if(LE_FAILURE(success)) clear();
+@@ -385,31 +385,31 @@
+ /**
+ * ptr plus offset
+ */
+- LEReferenceTo(const LETableReference &parent, LEErrorCode &success, const void* atPtr, size_t offset)
++ inline LEReferenceTo(const LETableReference &parent, LEErrorCode &success, const void* atPtr, size_t offset)
+ : LETableReference(parent, parent.ptrToOffset(atPtr, success)+offset, LE_UINTPTR_MAX, success) {
+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
+ if(LE_FAILURE(success)) clear();
+ }
+- LEReferenceTo(const LETableReference &parent, LEErrorCode &success, size_t offset)
++ inline LEReferenceTo(const LETableReference &parent, LEErrorCode &success, size_t offset)
+ : LETableReference(parent, offset, LE_UINTPTR_MAX, success) {
+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
+ if(LE_FAILURE(success)) clear();
+ }
+- LEReferenceTo(const LETableReference &parent, LEErrorCode &success)
++ inline LEReferenceTo(const LETableReference &parent, LEErrorCode &success)
+ : LETableReference(parent, 0, LE_UINTPTR_MAX, success) {
+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
+ if(LE_FAILURE(success)) clear();
+ }
+- LEReferenceTo(const LEFontInstance *font, LETag tableTag, LEErrorCode &success)
++ inline LEReferenceTo(const LEFontInstance *font, LETag tableTag, LEErrorCode &success)
+ : LETableReference(font, tableTag, success) {
+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
+ if(LE_FAILURE(success)) clear();
+ }
+- LEReferenceTo(const le_uint8 *data, size_t length = LE_UINTPTR_MAX) : LETableReference(data, length) {}
+- LEReferenceTo(const T *data, size_t length = LE_UINTPTR_MAX) : LETableReference((const le_uint8*)data, length) {}
+- LEReferenceTo() : LETableReference(NULL) {}
++ inline LEReferenceTo(const le_uint8 *data, size_t length = LE_UINTPTR_MAX) : LETableReference(data, length) {}
++ inline LEReferenceTo(const T *data, size_t length = LE_UINTPTR_MAX) : LETableReference((const le_uint8*)data, length) {}
++ inline LEReferenceTo() : LETableReference(NULL) {}
+
+- LEReferenceTo<T>& operator=(const T* other) {
++ inline LEReferenceTo<T>& operator=(const T* other) {
+ setRaw(other);
+ return *this;
+ }
+--- ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp Tue Oct 08 09:07:05 2013 -0700
+@@ -79,6 +79,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;
+
+ le_uint32 recordCount = records.getCount();
+@@ -89,17 +90,17 @@
+ le_int32 index = 0;
+
+ {
+- const ATag &aTag = records.getAlias(extra,success)->tag;
++ const ATag &aTag = (r0+extra)->tag;
+ if (SWAPT(aTag) <= tag) {
+ index = extra;
+ }
+ }
+
+- while (probe > (1 << 0) && LE_SUCCESS(success)) {
++ while (probe > (1 << 0)) {
+ probe >>= 1;
+
+ {
+- const ATag &aTag = records.getAlias(index+probe,success)->tag;
++ const ATag &aTag = (r0+index+probe)->tag;
+ if (SWAPT(aTag) <= tag) {
+ index += probe;
+ }
+@@ -107,9 +108,9 @@
+ }
+
+ {
+- const ATag &aTag = records.getAlias(index,success)->tag;
++ const ATag &aTag = (r0+index)->tag;
+ if (SWAPT(aTag) == tag) {
+- return SWAPW(records.getAlias(index,success)->offset);
++ return SWAPW((r0+index)->offset);
+ }
+ }
+
+--- ./jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp Tue Oct 08 09:07:05 2013 -0700
+@@ -104,6 +104,10 @@
+
+ int putGV(JNIEnv* env, jint gmask, jint baseIndex, jobject gvdata, const LayoutEngine* engine, int glyphCount) {
+ int count = env->GetIntField(gvdata, gvdCountFID);
++ if (count < 0) {
++ JNU_ThrowInternalError(env, "count negative");
++ return 0;
++ }
+
+ jarray glyphArray = (jarray)env->GetObjectField(gvdata, gvdGlyphsFID);
+ if (IS_NULL(glyphArray)) {
+--- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c Tue Oct 08 09:07:05 2013 -0700
+@@ -1074,6 +1074,27 @@
+ }
+
+
++static
++cmsBool SanityCheck(_cmsICCPROFILE* profile)
++{
++ cmsIOHANDLER* io = profile->IOhandler;
++ if (!io) {
++ return FALSE;
++ }
++
++ if (!io->Seek ||
++ !(io->Seek==NULLSeek || io->Seek==MemorySeek || io->Seek==FileSeek))
++ {
++ return FALSE;
++ }
++ if (!io->Read ||
++ !(io->Read==NULLRead || io->Read==MemoryRead || io->Read==FileRead))
++ {
++ return FALSE;
++ }
++
++ return TRUE;
++}
+
+ // Dump tag contents. If the profile is being modified, untouched tags are copied from FileOrig
+ static
+@@ -1087,6 +1108,7 @@
+ cmsTagTypeSignature TypeBase;
+ cmsTagTypeHandler* TypeHandler;
+
++ if (!SanityCheck(FileOrig)) return FALSE;
+
+ for (i=0; i < Icc -> TagCount; i++) {
+
+@@ -1292,8 +1314,8 @@
+ // Should we just calculate the needed space?
+ if (MemPtr == NULL) {
+
+- *BytesNeeded = cmsSaveProfileToIOhandler(hProfile, NULL);
+- return TRUE;
++ *BytesNeeded = cmsSaveProfileToIOhandler(hProfile, NULL);
++ return (*BytesNeeded == 0 ? FALSE : TRUE);
+ }
+
+ // That is a real write operation
+--- ./jdk/src/share/native/sun/management/HotSpotDiagnostic.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/share/native/sun/management/HotSpotDiagnostic.c Tue Oct 08 09:07:05 2013 -0700
+@@ -29,7 +29,7 @@
+ #include "sun_management_HotSpotDiagnostic.h"
+
+ JNIEXPORT void JNICALL
+-Java_sun_management_HotSpotDiagnostic_dumpHeap
++Java_sun_management_HotSpotDiagnostic_dumpHeap0
+ (JNIEnv *env, jobject dummy, jstring outputfile, jboolean live)
+ {
+ jmm_interface->DumpHeap0(env, outputfile, live);
+--- ./jdk/src/solaris/bin/java_md_solinux.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/solaris/bin/java_md_solinux.c Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -956,9 +956,27 @@
+
+ void* SplashProcAddress(const char* name) {
+ if (!hSplashLib) {
+- const char * splashLibPath;
+- splashLibPath = SPLASHSCREEN_SO;
+- hSplashLib = dlopen(splashLibPath, RTLD_LAZY | RTLD_GLOBAL);
++ int ret;
++ char jrePath[MAXPATHLEN];
++ char splashPath[MAXPATHLEN];
++
++ if (!GetJREPath(jrePath, sizeof(jrePath), GetArch(), JNI_FALSE)) {
++ JLI_ReportErrorMessage(JRE_ERROR1);
++ return NULL;
++ }
++ ret = JLI_Snprintf(splashPath, sizeof(splashPath), "%s/lib/%s/%s",
++ jrePath, GetArch(), SPLASHSCREEN_SO);
++
++ if (ret >= (int) sizeof(splashPath)) {
++ JLI_ReportErrorMessage(JRE_ERROR11);
++ return NULL;
++ }
++ if (ret < 0) {
++ JLI_ReportErrorMessage(JRE_ERROR13);
++ return NULL;
++ }
++ hSplashLib = dlopen(splashPath, RTLD_LAZY | RTLD_GLOBAL);
++ JLI_TraceLauncher("Info: loaded %s\n", splashPath);
+ }
+ if (hSplashLib) {
+ void* sym = dlsym(hSplashLib, name);
+--- ./jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java Tue Oct 08 09:07:05 2013 -0700
+@@ -26,9 +26,11 @@
+ package sun.nio.ch;
+
+ import java.io.IOException;
++import java.security.AccessController;
+ import java.util.BitSet;
+ import java.util.Map;
+ import java.util.HashMap;
++import sun.security.action.GetIntegerAction;
+
+
+ /**
+@@ -78,10 +80,11 @@
+ static final int NUM_POLLFDS = Math.min(OPEN_MAX-1, 8192);
+
+ // Initial size of arrays for fd registration changes
+- private final int INITIAL_PENDING_UPDATE_SIZE = 64;
++ private static final int INITIAL_PENDING_UPDATE_SIZE = 64;
+
+ // maximum size of updatesLow
+- private final int MAX_UPDATE_ARRAY_SIZE = Math.min(OPEN_MAX, 64*1024);
++ private static final int MAX_UPDATE_ARRAY_SIZE = AccessController.doPrivileged(
++ new GetIntegerAction("sun.nio.ch.maxUpdateArraySize", Math.min(OPEN_MAX, 64*1024)));
+
+ // The pollfd array for results from devpoll driver
+ private final AllocatedNativeObject pollArray;
+--- ./jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java Tue Oct 08 09:07:05 2013 -0700
+@@ -26,9 +26,11 @@
+ package sun.nio.ch;
+
+ import java.io.IOException;
++import java.security.AccessController;
+ import java.util.BitSet;
+ import java.util.HashMap;
+ import java.util.Map;
++import sun.security.action.GetIntegerAction;
+
+ /**
+ * Manipulates a native array of epoll_event structs on Linux:
+@@ -78,8 +80,8 @@
+ private static final int INITIAL_PENDING_UPDATE_SIZE = 64;
+
+ // maximum size of updatesLow
+- private static final int MAX_UPDATE_ARRAY_SIZE = Math.min(OPEN_MAX, 64*1024);
+-
++ private static final int MAX_UPDATE_ARRAY_SIZE = AccessController.doPrivileged(
++ new GetIntegerAction("sun.nio.ch.maxUpdateArraySize", Math.min(OPEN_MAX, 64*1024)));
+
+ // The fd of the epoll driver
+ private final int epfd;
+@@ -164,6 +166,16 @@
+ }
+
+ /**
++ * Returns {@code true} if updates for the given key (file
++ * descriptor) are killed.
++ */
++ private boolean isEventsHighKilled(Integer key) {
++ assert key >= MAX_UPDATE_ARRAY_SIZE;
++ Byte value = eventsHigh.get(key);
++ return (value != null && value == KILLED);
++ }
++
++ /**
+ * Sets the pending update events for the given file descriptor. This
+ * method has no effect if the update events is already set to KILLED,
+ * unless {@code force} is {@code true}.
+@@ -175,7 +187,7 @@
+ }
+ } else {
+ Integer key = Integer.valueOf(fd);
+- if ((eventsHigh.get(key) != KILLED) || force) {
++ if (!isEventsHighKilled(key) || force) {
+ eventsHigh.put(key, Byte.valueOf(events));
+ }
+ }
+--- ./jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java Tue Oct 08 09:07:05 2013 -0700
+@@ -25,9 +25,14 @@
+
+ package sun.nio.ch;
+
++import java.io.IOException;
++import java.security.AccessController;
++import java.util.BitSet;
++import java.util.HashMap;
++import java.util.Map;
++
+ import sun.misc.Unsafe;
+-import java.io.IOException;
+-import java.util.*;
++import sun.security.action.GetIntegerAction;
+ import static sun.nio.ch.SolarisEventPort.*;
+
+ /**
+@@ -49,7 +54,8 @@
+ private final int INITIAL_PENDING_UPDATE_SIZE = 256;
+
+ // maximum size of updateArray
+- private final int MAX_UPDATE_ARRAY_SIZE = Math.min(OPEN_MAX, 64*1024);
++ private static final int MAX_UPDATE_ARRAY_SIZE = AccessController.doPrivileged(
++ new GetIntegerAction("sun.nio.ch.maxUpdateArraySize", Math.min(OPEN_MAX, 64*1024)));
+
+ // special update status to indicate that it should be ignored
+ private static final byte IGNORE = -1;
+--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Tue Oct 08 09:07:05 2013 -0700
+@@ -122,7 +122,6 @@
+ static jclass ni_ia6cls;
+ static jmethodID ni_ia4ctrID;
+ static jmethodID ni_ia6ctrID;
+-static jfieldID ni_ia6ipaddressID;
+ static int initialized = 0;
+
+ /*
+@@ -158,7 +157,6 @@
+ ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
+ ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
+ ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
+- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
+ initialized = 1;
+ }
+
+@@ -306,6 +304,7 @@
+ }
+
+ while (iterator != NULL) {
++ int ret1;
+ if (iterator->ai_family == AF_INET) {
+ jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID);
+ if (IS_NULL(iaObj)) {
+@@ -318,20 +317,17 @@
+ inetIndex++;
+ } else if (iterator->ai_family == AF_INET6) {
+ jint scope = 0;
+- jbyteArray ipaddress;
+
+ jobject iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
+ if (IS_NULL(iaObj)) {
+ ret = NULL;
+ goto cleanupAndReturn;
+ }
+- ipaddress = (*env)->NewByteArray(env, 16);
+- if (IS_NULL(ipaddress)) {
+- ret = NULL;
+- goto cleanupAndReturn;
++ ret1 = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
++ if (!ret1) {
++ ret = NULL;
++ goto cleanupAndReturn;
+ }
+- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
+- (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
+ #ifdef __linux__
+ if (!kernelIsV22()) {
+ scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
+@@ -340,10 +336,8 @@
+ scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
+ #endif
+ if (scope != 0) { /* zero is default value, no need to set */
+- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
+- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
++ setInet6Address_scopeid(env, iaObj, scope);
+ }
+- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
+ setInetAddress_hostName(env, iaObj, host);
+ (*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj);
+ inet6Index++;
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Tue Oct 08 09:07:05 2013 -0700
+@@ -118,7 +118,6 @@
+ static jmethodID ni_ia4ctrID;
+ static jmethodID ni_ia6ctrID;
+ static jmethodID ni_ibctrID;
+-static jfieldID ni_ia6ipaddressID;
+ static jfieldID ni_ibaddressID;
+ static jfieldID ni_ib4broadcastID;
+ static jfieldID ni_ib4maskID;
+@@ -193,7 +192,6 @@
+ ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
+ ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
+ ni_ibctrID = (*env)->GetMethodID(env, ni_ibcls, "<init>", "()V");
+- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
+ ni_ibaddressID = (*env)->GetFieldID(env, ni_ibcls, "address", "Ljava/net/InetAddress;");
+ ni_ib4broadcastID = (*env)->GetFieldID(env, ni_ibcls, "broadcast", "Ljava/net/Inet4Address;");
+ ni_ib4maskID = (*env)->GetFieldID(env, ni_ibcls, "maskLength", "S");
+@@ -332,11 +330,9 @@
+ #ifdef AF_INET6
+ if (family == AF_INET6) {
+ jbyte *bytes = (jbyte *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr);
+- jbyteArray ipaddress = (*env)->GetObjectField(env, iaObj, ni_ia6ipaddressID);
+ jbyte caddr[16];
+ int i;
+-
+- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
++ getInet6Address_ipaddress(env, iaObj, (char *)caddr);
+ i = 0;
+ while (i < 16) {
+ if (caddr[i] != bytes[i]) {
+@@ -670,21 +666,17 @@
+ int scope=0;
+ iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
+ if (iaObj) {
+- jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
+- if (ipaddress == NULL) {
++ int ret = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr));
++ if (ret == JNI_FALSE) {
+ return NULL;
+ }
+- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
+- (jbyte *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr));
+
+ scope = ((struct sockaddr_in6*)addrP->addr)->sin6_scope_id;
+
+ if (scope != 0) { /* zero is default value, no need to set */
+- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
+- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
+- (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
++ setInet6Address_scopeid(env, iaObj, scope);
++ setInet6Address_scopeifname(env, iaObj, netifObj);
+ }
+- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
+ }
+ ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
+ if (ibObj) {
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Oct 08 09:07:05 2013 -0700
+@@ -2359,8 +2359,7 @@
+ caddr[14] = ((address >> 8) & 0xff);
+ caddr[15] = (address & 0xff);
+ } else {
+- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
+- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
++ getInet6Address_ipaddress(env, iaObj, caddr);
+ }
+
+ memcpy((void *)&(mname6.ipv6mr_multiaddr), caddr, sizeof(struct in6_addr));
+--- ./jdk/src/solaris/native/java/net/net_util_md.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.c Tue Oct 08 09:07:05 2013 -0700
+@@ -823,7 +823,6 @@
+ /* needs work. 1. family 2. clean up him6 etc deallocate memory */
+ if (ipv6_available() && !(family == IPv4 && v4MappedAddress == JNI_FALSE)) {
+ struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
+- jbyteArray ipaddress;
+ jbyte caddr[16];
+ jint address;
+
+@@ -844,8 +843,7 @@
+ caddr[15] = (address & 0xff);
+ }
+ } else {
+- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
+- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
++ getInet6Address_ipaddress(env, iaObj, (char *)caddr);
+ }
+ memset((char *)him6, 0, sizeof(struct sockaddr_in6));
+ him6->sin6_port = htons(port);
+@@ -882,7 +880,7 @@
+ */
+ if (!cached_scope_id) {
+ if (ia6_scopeidID) {
+- scope_id = (int)(*env)->GetIntField(env,iaObj,ia6_scopeidID);
++ scope_id = getInet6Address_scopeid(env, iaObj);
+ }
+ if (scope_id != 0) {
+ /* check user-specified value for loopback case
+@@ -928,7 +926,7 @@
+
+ if (family != IPv4) {
+ if (ia6_scopeidID) {
+- him6->sin6_scope_id = (int)(*env)->GetIntField(env, iaObj, ia6_scopeidID);
++ him6->sin6_scope_id = getInet6Address_scopeid(env, iaObj);
+ }
+ }
+ #endif
+--- ./jdk/src/windows/native/java/net/Inet6AddressImpl.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/windows/native/java/net/Inet6AddressImpl.c Tue Oct 08 09:07:05 2013 -0700
+@@ -77,7 +77,6 @@
+ static jclass ni_ia6cls;
+ static jmethodID ni_ia4ctrID;
+ static jmethodID ni_ia6ctrID;
+-static jfieldID ni_ia6ipaddressID;
+ static int initialized = 0;
+
+ JNIEXPORT jobjectArray JNICALL
+@@ -101,7 +100,6 @@
+ ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
+ ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
+ ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
+- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
+ initialized = 1;
+ }
+ if (IS_NULL(host)) {
+@@ -242,26 +240,22 @@
+ (*env)->SetObjectArrayElement(env, ret, inetIndex, iaObj);
+ inetIndex ++;
+ } else if (iterator->ai_family == AF_INET6) {
+- jint scope = 0;
+- jbyteArray ipaddress;
++ jint scope = 0, ret1;
+ jobject iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
+ if (IS_NULL(iaObj)) {
+ ret = NULL;
+ goto cleanupAndReturn;
+ }
+- ipaddress = (*env)->NewByteArray(env, 16);
+- if (IS_NULL(ipaddress)) {
++ ret1 = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
++
++ if (ret1 == JNI_FALSE) {
+ ret = NULL;
+ goto cleanupAndReturn;
+ }
+- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
+- (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
+ scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
+ if (scope != 0) { /* zero is default value, no need to set */
+- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
+- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
++ setInet6Address_scopeid(env, iaObj, scope);
+ }
+- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
+ setInetAddress_hostName(env, iaObj, host);
+ (*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj);
+ inet6Index ++;
+--- ./jdk/src/windows/native/java/net/NetworkInterface.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/windows/native/java/net/NetworkInterface.c Tue Oct 08 09:07:05 2013 -0700
+@@ -72,8 +72,6 @@
+
+ jclass ni_ia6cls; /* Inet6Address */
+ jmethodID ni_ia6ctrID; /* Inet6Address() */
+-jfieldID ni_ia6ipaddressID;
+-jfieldID ni_ia6ipaddressID;
+
+ jclass ni_ibcls; /* InterfaceAddress */
+ jmethodID ni_ibctrID; /* InterfaceAddress() */
+@@ -482,7 +480,6 @@
+ ni_ia6cls = (*env)->FindClass(env, "java/net/Inet6Address");
+ ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
+ ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
+- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
+
+ ni_ibcls = (*env)->FindClass(env, "java/net/InterfaceAddress");
+ ni_ibcls = (*env)->NewGlobalRef(env, ni_ibcls);
+@@ -583,19 +580,16 @@
+ int scope;
+ iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
+ if (iaObj) {
+- jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
+- if (ipaddress == NULL) {
++ int ret = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
++ if (ret == JNI_FALSE) {
+ return NULL;
+ }
+- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
+- (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
++
+ scope = addrs->addr.him6.sin6_scope_id;
+ if (scope != 0) { /* zero is default value, no need to set */
+- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
+- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
+- (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
++ setInet6Address_scopeid(env, iaObj, scope);
++ setInet6Address_scopeifname(env, iaObj, netifObj);
+ }
+- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
+ ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
+ if (ibObj == NULL) {
+ free_netaddr(netaddrP);
+--- ./jdk/src/windows/native/java/net/NetworkInterface_winXP.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/windows/native/java/net/NetworkInterface_winXP.c Tue Oct 08 09:07:05 2013 -0700
+@@ -499,19 +499,15 @@
+ int scope;
+ iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
+ if (iaObj) {
+- jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
+- if (ipaddress == NULL) {
++ int ret = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
++ if (ret == JNI_FALSE) {
+ return NULL;
+ }
+- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
+- (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
+ scope = addrs->addr.him6.sin6_scope_id;
+ if (scope != 0) { /* zero is default value, no need to set */
+- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
+- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
+- (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
++ setInet6Address_scopeid(env, iaObj, scope);
++ setInet6Address_scopeifname(env, iaObj, netifObj);
+ }
+- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
+ ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
+ if (ibObj == NULL) {
+ free_netaddr(netaddrP);
+--- ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c Tue Oct 08 09:07:05 2013 -0700
+@@ -728,7 +728,6 @@
+ setInetAddress_family(env, socketAddressObj, IPv4);
+ (*env)->SetObjectField(env, socket, psi_addressID, socketAddressObj);
+ } else {
+- jbyteArray addr;
+ /* AF_INET6 -> Inet6Address */
+ if (inet6Cls == 0) {
+ jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
+@@ -751,10 +750,10 @@
+ NET_SocketClose(fd);
+ return;
+ }
+- addr = (*env)->GetObjectField (env, socketAddressObj, ia6_ipaddressID);
+- (*env)->SetByteArrayRegion (env, addr, 0, 16, (const char *)&him.him6.sin6_addr);
++ setInet6Address_ipaddress(env, socketAddressObj, (const char *)&him.him6.sin6_addr);
++
+ setInetAddress_family(env, socketAddressObj, IPv6);
+- (*env)->SetIntField(env, socketAddressObj, ia6_scopeidID, him.him6.sin6_scope_id);
++ setInet6Address_scopeid(env, socketAddressObj, him.him6.sin6_scope_id);
+ }
+ /* fields common to AF_INET and AF_INET6 */
+
+--- ./jdk/src/windows/native/java/net/net_util_md.c Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/src/windows/native/java/net/net_util_md.c Tue Oct 08 09:07:05 2013 -0700
+@@ -851,7 +851,6 @@
+ family = (iafam == IPv4)? AF_INET : AF_INET6;
+ if (ipv6_available() && !(family == AF_INET && v4MappedAddress == JNI_FALSE)) {
+ struct SOCKADDR_IN6 *him6 = (struct SOCKADDR_IN6 *)him;
+- jbyteArray ipaddress;
+ jbyte caddr[16];
+ jint address, scopeid = 0;
+ jint cached_scope_id = 0;
+@@ -872,10 +871,9 @@
+ caddr[15] = (address & 0xff);
+ }
+ } else {
+- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
+- scopeid = (jint)(*env)->GetIntField(env, iaObj, ia6_scopeidID);
++ getInet6Address_ipaddress(env, iaObj, (char *)caddr);
++ scopeid = getInet6Address_scopeid(env, iaObj);
+ cached_scope_id = (jint)(*env)->GetIntField(env, iaObj, ia6_cachedscopeidID);
+- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
+ }
+
+ memset((char *)him6, 0, sizeof(struct SOCKADDR_IN6));
+--- ./jdk/test/java/io/File/createTempFile/SpecialTempFile.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/test/java/io/File/createTempFile/SpecialTempFile.java Tue Oct 08 09:07:05 2013 -0700
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 8013827 8011950
++ * @bug 8013827 8011950 8025128
+ * @summary Check whether File.createTempFile can handle special parameters
+ * on Windows platforms
+ * @author Dan Xu
+@@ -34,7 +34,9 @@
+
+ public class SpecialTempFile {
+
+- private static void test(String name, String[] prefix, String[] suffix) {
++ private static void test(String name, String[] prefix, String[] suffix,
++ boolean expectedException) throws IOException
++ {
+ if (prefix == null || suffix == null
+ || prefix.length != suffix.length)
+ {
+@@ -42,39 +44,59 @@
+ }
+
+ final String exceptionMsg = "Unable to create temporary file";
+- final String errMsg = "IOException is expected";
+
+ for (int i = 0; i < prefix.length; i++) {
+ boolean exceptionThrown = false;
+ File f = null;
+- System.out.println("In test " + name
+- + ", creating temp file with prefix, "
+- + prefix[i] + ", suffix, " + suffix[i]);
+- try {
+- f = File.createTempFile(prefix[i], suffix[i]);
+- } catch (IOException e) {
+- if (exceptionMsg.equals(e.getMessage()))
+- exceptionThrown = true;
+- else
+- System.out.println("Wrong error message:" + e.getMessage());
++
++ String[] dirs = { null, "." };
++
++ for (String dir : dirs ) {
++ System.out.println("In test " + name +
++ ", creating temp file with prefix, " +
++ prefix[i] + ", suffix, " + suffix[i] +
++ ", in dir, " + dir);
++
++ try {
++ if (dir == null || dir.isEmpty())
++ f = File.createTempFile(prefix[i], suffix[i]);
++ else
++ f = File.createTempFile(prefix[i], suffix[i], new File(dir));
++ } catch (IOException e) {
++ if (expectedException) {
++ if (e.getMessage().startsWith(exceptionMsg))
++ exceptionThrown = true;
++ else
++ System.out.println("Wrong error message:" +
++ e.getMessage());
++ } else {
++ throw e;
++ }
++ }
++
++ if (expectedException && (!exceptionThrown || f != null))
++ throw new RuntimeException("IOException is expected");
+ }
+- if (!exceptionThrown || f != null)
+- throw new RuntimeException(errMsg);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
++ // Test JDK-8025128
++ String[] goodPre = { "///..///", "/foo" };
++ String[] goodSuf = { ".temp", ".tmp" };
++ test("goodName", goodPre, goodSuf, false);
++
++ // Test JDK-8011950
++ String[] slashPre = { "temp", "///..///", "/foo" };
++ String[] slashSuf = { "///..///..", "///..///..", "///..///.." };
++ test("SlashedName", slashPre, slashSuf, true);
++
+ if (!System.getProperty("os.name").startsWith("Windows"))
+ return;
+
+ // Test JDK-8013827
+ String[] resvPre = { "LPT1.package.zip", "com7.4.package.zip" };
+ String[] resvSuf = { ".temp", ".temp" };
+- test("ReservedName", resvPre, resvSuf);
+-
+- // Test JDK-8011950
+- String[] slashPre = { "///..///", "temp", "///..///" };
+- String[] slashSuf = { ".temp", "///..///..", "///..///.." };
+- test("SlashedName", slashPre, slashSuf);
++ test("ReservedName", resvPre, resvSuf, true);
+ }
+ }
+--- ./jdk/test/java/io/IOException/LastErrorString.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/test/java/io/IOException/LastErrorString.java Tue Oct 08 09:07:05 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -22,7 +22,8 @@
+ */
+
+ /* @test
+- @bug 4167937
++ @bug 4167937 8023964
++ @ignore Test truncates system files when run as root, see 7042603
+ @summary Test code paths that use the JVM_LastErrorString procedure
+ */
+
+--- ./jdk/test/java/lang/SecurityManager/CheckPackageAccess.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/test/java/lang/SecurityManager/CheckPackageAccess.java Tue Oct 08 09:07:05 2013 -0700
+@@ -74,6 +74,7 @@
+ "com.sun.org.apache.xml.internal.serializer.utils.",
+ "com.sun.org.apache.xml.internal.utils.",
+ "com.sun.org.glassfish.",
++ "com.sun.script.",
+ "oracle.jrockit.jfr.",
+ "org.jcp.xml.dsig.internal.",
+ };
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/invoke/MethodHandleConstants.java Tue Oct 08 09:07:05 2013 -0700
+@@ -0,0 +1,188 @@
++/*
++ * 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
++ * 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 8022066
++ * @summary smoke test for method handle constants
++ * @build indify.Indify
++ * @compile MethodHandleConstants.java
++ * @run main/othervm
++ * indify.Indify
++ * --verify-specifier-count=0
++ * --expand-properties --classpath ${test.classes}
++ * --java test.java.lang.invoke.MethodHandleConstants --check-output
++ * @run main/othervm
++ * indify.Indify
++ * --expand-properties --classpath ${test.classes}
++ * --java test.java.lang.invoke.MethodHandleConstants --security-manager
++ */
++
++package test.java.lang.invoke;
++
++import java.util.*;
++import java.io.*;
++import java.lang.invoke.*;
++import java.security.*;
++
++import static java.lang.invoke.MethodHandles.*;
++import static java.lang.invoke.MethodType.*;
++
++public class MethodHandleConstants {
++ public static void main(String... av) throws Throwable {
++ if (av.length > 0 && av[0].equals("--check-output")) openBuf();
++ if (av.length > 0 && av[0].equals("--security-manager")) setSM();
++ System.out.println("Obtaining method handle constants:");
++ testCase(MH_String_replace_C2(), String.class, "replace", String.class, String.class, char.class, char.class);
++ testCase(MH_MethodHandle_invokeExact_SC2(), MethodHandle.class, "invokeExact", String.class, MethodHandle.class, String.class, char.class, char.class);
++ testCase(MH_MethodHandle_invoke_SC2(), MethodHandle.class, "invoke", String.class, MethodHandle.class, String.class, char.class, char.class);
++ testCase(MH_Class_forName_S(), Class.class, "forName", Class.class, String.class);
++ testCase(MH_Class_forName_SbCL(), Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class);
++ System.out.println("Done.");
++ closeBuf();
++ }
++
++ private static void testCase(MethodHandle mh, Class<?> defc, String name, Class<?> rtype, Class<?>... ptypes) throws Throwable {
++ System.out.println(mh);
++ // we include defc, because we assume it is a non-static MH:
++ MethodType mt = methodType(rtype, ptypes);
++ assertEquals(mh.type(), mt);
++ // FIXME: Use revealDirect to find out more
++ }
++ private static void assertEquals(Object exp, Object act) {
++ if (exp == act || (exp != null && exp.equals(act))) return;
++ throw new AssertionError("not equal: "+exp+", "+act);
++ }
++
++ private static void setSM() {
++ Policy.setPolicy(new TestPolicy());
++ System.setSecurityManager(new SecurityManager());
++ }
++
++ private static PrintStream oldOut;
++ private static ByteArrayOutputStream buf;
++ private static void openBuf() {
++ oldOut = System.out;
++ buf = new ByteArrayOutputStream();
++ System.setOut(new PrintStream(buf));
++ }
++ private static void closeBuf() {
++ if (buf == null) return;
++ System.out.flush();
++ System.setOut(oldOut);
++ String[] haveLines = new String(buf.toByteArray()).split("[\n\r]+");
++ for (String line : haveLines) System.out.println(line);
++ Iterator<String> iter = Arrays.asList(haveLines).iterator();
++ for (String want : EXPECT_OUTPUT) {
++ String have = iter.hasNext() ? iter.next() : "[EOF]";
++ if (want.equals(have)) continue;
++ System.err.println("want line: "+want);
++ System.err.println("have line: "+have);
++ throw new AssertionError("unexpected output: "+have);
++ }
++ if (iter.hasNext())
++ throw new AssertionError("unexpected output: "+iter.next());
++ }
++ private static final String[] EXPECT_OUTPUT = {
++ "Obtaining method handle constants:",
++ "MethodHandle(String,char,char)String",
++ "MethodHandle(MethodHandle,String,char,char)String",
++ "MethodHandle(MethodHandle,String,char,char)String",
++ "MethodHandle(String)Class",
++ "MethodHandle(String,boolean,ClassLoader)Class",
++ "Done."
++ };
++
++ // String.replace(String, char, char)
++ private static MethodType MT_String_replace_C2() {
++ shouldNotCallThis();
++ return methodType(String.class, char.class, char.class);
++ }
++ private static MethodHandle MH_String_replace_C2() throws ReflectiveOperationException {
++ shouldNotCallThis();
++ return lookup().findVirtual(String.class, "replace", MT_String_replace_C2());
++ }
++
++ // MethodHandle.invokeExact(...)
++ private static MethodType MT_MethodHandle_invokeExact_SC2() {
++ shouldNotCallThis();
++ return methodType(String.class, String.class, char.class, char.class);
++ }
++ private static MethodHandle MH_MethodHandle_invokeExact_SC2() throws ReflectiveOperationException {
++ shouldNotCallThis();
++ return lookup().findVirtual(MethodHandle.class, "invokeExact", MT_MethodHandle_invokeExact_SC2());
++ }
++
++ // MethodHandle.invoke(...)
++ private static MethodType MT_MethodHandle_invoke_SC2() {
++ shouldNotCallThis();
++ return methodType(String.class, String.class, char.class, char.class);
++ }
++ private static MethodHandle MH_MethodHandle_invoke_SC2() throws ReflectiveOperationException {
++ shouldNotCallThis();
++ return lookup().findVirtual(MethodHandle.class, "invoke", MT_MethodHandle_invoke_SC2());
++ }
++
++ // Class.forName(String)
++ private static MethodType MT_Class_forName_S() {
++ shouldNotCallThis();
++ return methodType(Class.class, String.class);
++ }
++ private static MethodHandle MH_Class_forName_S() throws ReflectiveOperationException {
++ shouldNotCallThis();
++ return lookup().findStatic(Class.class, "forName", MT_Class_forName_S());
++ }
++
++ // Class.forName(String, boolean, ClassLoader)
++ private static MethodType MT_Class_forName_SbCL() {
++ shouldNotCallThis();
++ return methodType(Class.class, String.class, boolean.class, ClassLoader.class);
++ }
++ private static MethodHandle MH_Class_forName_SbCL() throws ReflectiveOperationException {
++ shouldNotCallThis();
++ return lookup().findStatic(Class.class, "forName", MT_Class_forName_SbCL());
++ }
++
++ private static void shouldNotCallThis() {
++ // if this gets called, the transformation has not taken place
++ if (System.getProperty("MethodHandleConstants.allow-untransformed") != null) return;
++ throw new AssertionError("this code should be statically transformed away by Indify");
++ }
++
++ static class TestPolicy extends Policy {
++ final PermissionCollection permissions = new Permissions();
++ TestPolicy() {
++ permissions.add(new java.io.FilePermission("<<ALL FILES>>", "read"));
++ }
++ public PermissionCollection getPermissions(ProtectionDomain domain) {
++ return permissions;
++ }
++
++ public PermissionCollection getPermissions(CodeSource codesource) {
++ return permissions;
++ }
++
++ public boolean implies(ProtectionDomain domain, Permission perm) {
++ return permissions.implies(perm);
++ }
++ }
++}
+--- ./jdk/test/java/net/Inet6Address/serialize/Serialize.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/test/java/net/Inet6Address/serialize/Serialize.java Tue Oct 08 09:07:05 2013 -0700
+@@ -94,7 +94,26 @@
+ } finally {
+ ois.close();
+ }
+- System.out.println(nobj);
++
++ nobj = (Inet6Address)InetAddress.getByAddress("foo.com", new byte[] {
++ (byte)0xfe,(byte)0x80,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,
++ (byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)1
++ });
++ if (!test1(nobj, addr1)) {
++ throw new RuntimeException("failed with " + nobj.toString());
++ }
++ nobj = (Inet6Address)InetAddress.getByAddress("x.bar.com", new byte[] {
++ (byte)0xfe,(byte)0xC0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,
++ (byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)1
++ });
++ if (!test1(nobj, addr2)) {
++ throw new RuntimeException("failed with " + nobj.toString());
++ }
++ nobj = (Inet6Address)InetAddress.getByName("::1");
++ if (!test1(nobj, addr3)) {
++ throw new RuntimeException("failed with " + nobj.toString());
++ }
++
+ System.out.println("All tests passed");
+ }
+
+@@ -113,4 +132,162 @@
+ return false;
+ }
+ }
+- }
++
++ static boolean test1 (Inet6Address obj, byte[] buf) throws Exception {
++ ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(buf));
++ Inet6Address nobj = (Inet6Address) ois.readObject();
++ ois.close();
++
++ if (nobj.equals(obj)) {
++ return true;
++ } else {
++ return false;
++ }
++ }
++
++ // Inet6Address instances serialized with JDK 6
++
++ static byte[] addr1 = {
++ (byte)0xac,(byte)0xed,(byte)0x00,(byte)0x05,(byte)0x73,(byte)0x72,
++ (byte)0x00,(byte)0x15,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
++ (byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x2e,(byte)0x49,
++ (byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x36,(byte)0x41,(byte)0x64,
++ (byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,(byte)0x5f,
++ (byte)0x7c,(byte)0x20,(byte)0x81,(byte)0x52,(byte)0x2c,(byte)0x80,
++ (byte)0x21,(byte)0x03,(byte)0x00,(byte)0x05,(byte)0x49,(byte)0x00,
++ (byte)0x08,(byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,
++ (byte)0x5f,(byte)0x69,(byte)0x64,(byte)0x5a,(byte)0x00,(byte)0x0c,
++ (byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,(byte)0x5f,
++ (byte)0x69,(byte)0x64,(byte)0x5f,(byte)0x73,(byte)0x65,(byte)0x74,
++ (byte)0x5a,(byte)0x00,(byte)0x10,(byte)0x73,(byte)0x63,(byte)0x6f,
++ (byte)0x70,(byte)0x65,(byte)0x5f,(byte)0x69,(byte)0x66,(byte)0x6e,
++ (byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x5f,(byte)0x73,(byte)0x65,
++ (byte)0x74,(byte)0x4c,(byte)0x00,(byte)0x06,(byte)0x69,(byte)0x66,
++ (byte)0x6e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x74,(byte)0x00,
++ (byte)0x12,(byte)0x4c,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
++ (byte)0x2f,(byte)0x6c,(byte)0x61,(byte)0x6e,(byte)0x67,(byte)0x2f,
++ (byte)0x53,(byte)0x74,(byte)0x72,(byte)0x69,(byte)0x6e,(byte)0x67,
++ (byte)0x3b,(byte)0x5b,(byte)0x00,(byte)0x09,(byte)0x69,(byte)0x70,
++ (byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,
++ (byte)0x73,(byte)0x74,(byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,
++ (byte)0x78,(byte)0x72,(byte)0x00,(byte)0x14,(byte)0x6a,(byte)0x61,
++ (byte)0x76,(byte)0x61,(byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,
++ (byte)0x2e,(byte)0x49,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x41,
++ (byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,
++ (byte)0x2d,(byte)0x9b,(byte)0x57,(byte)0xaf,(byte)0x9f,(byte)0xe3,
++ (byte)0xeb,(byte)0xdb,(byte)0x02,(byte)0x00,(byte)0x03,(byte)0x49,
++ (byte)0x00,(byte)0x07,(byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,
++ (byte)0x65,(byte)0x73,(byte)0x73,(byte)0x49,(byte)0x00,(byte)0x06,
++ (byte)0x66,(byte)0x61,(byte)0x6d,(byte)0x69,(byte)0x6c,(byte)0x79,
++ (byte)0x4c,(byte)0x00,(byte)0x08,(byte)0x68,(byte)0x6f,(byte)0x73,
++ (byte)0x74,(byte)0x4e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x71,
++ (byte)0x00,(byte)0x7e,(byte)0x00,(byte)0x01,(byte)0x78,(byte)0x70,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x02,(byte)0x74,(byte)0x00,(byte)0x07,(byte)0x66,
++ (byte)0x6f,(byte)0x6f,(byte)0x2e,(byte)0x63,(byte)0x6f,(byte)0x6d,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x70,(byte)0x75,(byte)0x72,(byte)0x00,(byte)0x02,(byte)0x5b,
++ (byte)0x42,(byte)0xac,(byte)0xf3,(byte)0x17,(byte)0xf8,(byte)0x06,
++ (byte)0x08,(byte)0x54,(byte)0xe0,(byte)0x02,(byte)0x00,(byte)0x00,
++ (byte)0x78,(byte)0x70,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x10,
++ (byte)0xfe,(byte)0x80,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,(byte)0x78
++ };
++
++ static byte[] addr2 = {
++ (byte)0xac,(byte)0xed,(byte)0x00,(byte)0x05,(byte)0x73,(byte)0x72,
++ (byte)0x00,(byte)0x15,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
++ (byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x2e,(byte)0x49,
++ (byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x36,(byte)0x41,(byte)0x64,
++ (byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,(byte)0x5f,
++ (byte)0x7c,(byte)0x20,(byte)0x81,(byte)0x52,(byte)0x2c,(byte)0x80,
++ (byte)0x21,(byte)0x03,(byte)0x00,(byte)0x05,(byte)0x49,(byte)0x00,
++ (byte)0x08,(byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,
++ (byte)0x5f,(byte)0x69,(byte)0x64,(byte)0x5a,(byte)0x00,(byte)0x0c,
++ (byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,(byte)0x5f,
++ (byte)0x69,(byte)0x64,(byte)0x5f,(byte)0x73,(byte)0x65,(byte)0x74,
++ (byte)0x5a,(byte)0x00,(byte)0x10,(byte)0x73,(byte)0x63,(byte)0x6f,
++ (byte)0x70,(byte)0x65,(byte)0x5f,(byte)0x69,(byte)0x66,(byte)0x6e,
++ (byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x5f,(byte)0x73,(byte)0x65,
++ (byte)0x74,(byte)0x4c,(byte)0x00,(byte)0x06,(byte)0x69,(byte)0x66,
++ (byte)0x6e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x74,(byte)0x00,
++ (byte)0x12,(byte)0x4c,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
++ (byte)0x2f,(byte)0x6c,(byte)0x61,(byte)0x6e,(byte)0x67,(byte)0x2f,
++ (byte)0x53,(byte)0x74,(byte)0x72,(byte)0x69,(byte)0x6e,(byte)0x67,
++ (byte)0x3b,(byte)0x5b,(byte)0x00,(byte)0x09,(byte)0x69,(byte)0x70,
++ (byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,
++ (byte)0x73,(byte)0x74,(byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,
++ (byte)0x78,(byte)0x72,(byte)0x00,(byte)0x14,(byte)0x6a,(byte)0x61,
++ (byte)0x76,(byte)0x61,(byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,
++ (byte)0x2e,(byte)0x49,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x41,
++ (byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,
++ (byte)0x2d,(byte)0x9b,(byte)0x57,(byte)0xaf,(byte)0x9f,(byte)0xe3,
++ (byte)0xeb,(byte)0xdb,(byte)0x02,(byte)0x00,(byte)0x03,(byte)0x49,
++ (byte)0x00,(byte)0x07,(byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,
++ (byte)0x65,(byte)0x73,(byte)0x73,(byte)0x49,(byte)0x00,(byte)0x06,
++ (byte)0x66,(byte)0x61,(byte)0x6d,(byte)0x69,(byte)0x6c,(byte)0x79,
++ (byte)0x4c,(byte)0x00,(byte)0x08,(byte)0x68,(byte)0x6f,(byte)0x73,
++ (byte)0x74,(byte)0x4e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x71,
++ (byte)0x00,(byte)0x7e,(byte)0x00,(byte)0x01,(byte)0x78,(byte)0x70,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x02,(byte)0x74,(byte)0x00,(byte)0x09,(byte)0x78,
++ (byte)0x2e,(byte)0x62,(byte)0x61,(byte)0x72,(byte)0x2e,(byte)0x63,
++ (byte)0x6f,(byte)0x6d,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x00,(byte)0x70,(byte)0x75,(byte)0x72,(byte)0x00,
++ (byte)0x02,(byte)0x5b,(byte)0x42,(byte)0xac,(byte)0xf3,(byte)0x17,
++ (byte)0xf8,(byte)0x06,(byte)0x08,(byte)0x54,(byte)0xe0,(byte)0x02,
++ (byte)0x00,(byte)0x00,(byte)0x78,(byte)0x70,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x10,(byte)0xfe,(byte)0xc0,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,
++ (byte)0x78
++ };
++
++ static byte[] addr3 = {
++ (byte)0xac,(byte)0xed,(byte)0x00,(byte)0x05,(byte)0x73,(byte)0x72,
++ (byte)0x00,(byte)0x15,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
++ (byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x2e,(byte)0x49,
++ (byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x36,(byte)0x41,(byte)0x64,
++ (byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,(byte)0x5f,
++ (byte)0x7c,(byte)0x20,(byte)0x81,(byte)0x52,(byte)0x2c,(byte)0x80,
++ (byte)0x21,(byte)0x03,(byte)0x00,(byte)0x05,(byte)0x49,(byte)0x00,
++ (byte)0x08,(byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,
++ (byte)0x5f,(byte)0x69,(byte)0x64,(byte)0x5a,(byte)0x00,(byte)0x0c,
++ (byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,(byte)0x5f,
++ (byte)0x69,(byte)0x64,(byte)0x5f,(byte)0x73,(byte)0x65,(byte)0x74,
++ (byte)0x5a,(byte)0x00,(byte)0x10,(byte)0x73,(byte)0x63,(byte)0x6f,
++ (byte)0x70,(byte)0x65,(byte)0x5f,(byte)0x69,(byte)0x66,(byte)0x6e,
++ (byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x5f,(byte)0x73,(byte)0x65,
++ (byte)0x74,(byte)0x4c,(byte)0x00,(byte)0x06,(byte)0x69,(byte)0x66,
++ (byte)0x6e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x74,(byte)0x00,
++ (byte)0x12,(byte)0x4c,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
++ (byte)0x2f,(byte)0x6c,(byte)0x61,(byte)0x6e,(byte)0x67,(byte)0x2f,
++ (byte)0x53,(byte)0x74,(byte)0x72,(byte)0x69,(byte)0x6e,(byte)0x67,
++ (byte)0x3b,(byte)0x5b,(byte)0x00,(byte)0x09,(byte)0x69,(byte)0x70,
++ (byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,
++ (byte)0x73,(byte)0x74,(byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,
++ (byte)0x78,(byte)0x72,(byte)0x00,(byte)0x14,(byte)0x6a,(byte)0x61,
++ (byte)0x76,(byte)0x61,(byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,
++ (byte)0x2e,(byte)0x49,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x41,
++ (byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,
++ (byte)0x2d,(byte)0x9b,(byte)0x57,(byte)0xaf,(byte)0x9f,(byte)0xe3,
++ (byte)0xeb,(byte)0xdb,(byte)0x02,(byte)0x00,(byte)0x03,(byte)0x49,
++ (byte)0x00,(byte)0x07,(byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,
++ (byte)0x65,(byte)0x73,(byte)0x73,(byte)0x49,(byte)0x00,(byte)0x06,
++ (byte)0x66,(byte)0x61,(byte)0x6d,(byte)0x69,(byte)0x6c,(byte)0x79,
++ (byte)0x4c,(byte)0x00,(byte)0x08,(byte)0x68,(byte)0x6f,(byte)0x73,
++ (byte)0x74,(byte)0x4e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x71,
++ (byte)0x00,(byte)0x7e,(byte)0x00,(byte)0x01,(byte)0x78,(byte)0x70,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x02,(byte)0x70,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x70,(byte)0x75,(byte)0x72,
++ (byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,(byte)0xac,(byte)0xf3,
++ (byte)0x17,(byte)0xf8,(byte)0x06,(byte)0x08,(byte)0x54,(byte)0xe0,
++ (byte)0x02,(byte)0x00,(byte)0x00,(byte)0x78,(byte)0x70,(byte)0x00,
++ (byte)0x00,(byte)0x00,(byte)0x10,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
++ (byte)0x01,(byte)0x78
++ };
++}
+--- ./jdk/test/java/nio/channels/Selector/LotsOfChannels.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/test/java/nio/channels/Selector/LotsOfChannels.java Tue Oct 08 09:07:05 2013 -0700
+@@ -22,9 +22,10 @@
+ */
+
+ /* @test
+- * @bug 4503092
++ * @bug 4503092 8024883
+ * @summary Tests that Windows Selector can use more than 63 channels
+- * @run main/timeout=300 LotsOfChannels
++ * @run main LotsOfChannels
++ * @run main/othervm -Dsun.nio.ch.maxUpdateArraySize=64 LotsOfChannels
+ * @author kladko
+ */
+
+--- ./jdk/test/java/nio/channels/Selector/SelectorLimit.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/test/java/nio/channels/Selector/SelectorLimit.java Tue Oct 08 09:07:05 2013 -0700
+@@ -22,12 +22,13 @@
+ */
+
+ /* @test
+- * @bug 4777504
++ * @bug 4777504 8024883
+ * @summary Ensure that a Selector can return at least 100 selected keys
+ * @author Mark Reinhold
+ * @library ..
+ * @build SelectorLimit
+ * @run main/othervm SelectorLimit
++ * @run main/othervm -Dsun.nio.ch.maxUpdateArraySize=128 SelectorLimit
+ */
+
+ import java.io.*;
+--- ./jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java Tue Oct 08 09:07:05 2013 -0700
+@@ -23,7 +23,7 @@
+
+ /**
+ * @test
+- * @bug 8020983
++ * @bug 8020983 8024697
+ * @summary Test verifies that jpeg writer instances are collected
+ * even if destroy() or reset() methods is not invoked.
+ *
+--- ./jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java Mon Aug 26 07:41:45 2013 -0700
++++ ./jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java Tue Oct 08 09:07:05 2013 -0700
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 4915825 4921009 4934965 4977469
++ * @bug 4915825 4921009 4934965 4977469 8019584
+ * @summary Tests behavior when client or server gets object of unknown class
+ * @author Eamonn McManus
+ * @run clean MissingClassTest SingleClassLoader
+--- ./langtools/.hgtags Mon Aug 26 07:41:55 2013 -0700
++++ ./langtools/.hgtags Tue Oct 08 09:07:15 2013 -0700
+@@ -301,6 +301,22 @@
+ 17ee569d0c0130824ba27bc1b090114e6075c5f2 jdk7u25-b09
+ 41c1b02cd6a8fa7746752cc911da3dd4d380098d jdk7u25-b10
+ 0da9ef0d9fc5b017f960d65ae0cd07860a259621 jdk7u25-b11
++cf80c545434cfe44034e667079673ce42cc9cdbf jdk7u14-b16
++aecd58f25d7f21827ae1b020ae8cfb44857c439f jdk7u14-b17
++577f9625ec558c18e9de6e3428fd0f9cca823033 jdk7u14-b18
++5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
++5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
++e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19
++86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20
++c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21
++eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22
++e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23
++d2b78e3b352dfb9b0cbd808669f9332e898147ed jdk7u40-b24
++e5635f70fe67192142cb5166bee08cc915a18bc4 jdk7u40-b25
++5bd6f156bc01b6a4e901fc5607663dfc249e9105 jdk7u40-b26
++12506bba2b67cd4b229550da67ff85b984549a28 jdk7u40-b27
++9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
++bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
+ 28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12
+ 5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13
+ c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14
+@@ -341,3 +357,23 @@
+ 0e83f513af688a0b9fd6c9d9389c247ef6fb1afb jdk7u40-b40
+ 95cefc18bea41615c6c9b85ccbdf62af899174cb jdk7u40-b41
+ 765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42
++988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43
++a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60
++9bbfba4981e1db5016bbfbc23025763966021c26 jdk7u45-b01
++61d5b73ae0ac46268490e2f0dfa1f69a5acda73f jdk7u45-b02
++2fe27ae865e723473225756f1920d9d76d47b903 jdk7u45-b03
++bede296dc848533abae859e61584a517df2773ae jdk7u45-b04
++e989f2f2b5cb639a23a5e67da0d52766acf549a2 jdk7u45-b05
++6f492dc935adc6e2878bb6045aee001a829428a7 jdk7u45-b06
++4c51f98e1eb5b8d94dfca08f3b3160ff382b7c3a jdk7u45-b07
++6cf97c9859e731fba6bcff67c46f57dead8d7284 jdk7u45-b08
++a9c31d3f8188b344ed165ec0730ebc2fd11dfa5d jdk7u45-b09
++2c09352066ec34c8608ccff0f933f566a52033af jdk7u45-b10
++53d5c06766b05689cdccfc300b32075878e8aa1d jdk7u45-b11
++0b6aa6e95eb9da58a686edacf5b102116614d3ea jdk7u45-b12
++68862f365075a11dfa291033d05a062590db9337 jdk7u45-b13
++8c799b9f0cd8af3b1cfd151ba075a4f1630967df jdk7u45-b14
++36ae3f206b53f751a0ebf933e5dbf364097b48a5 jdk7u45-b15
++18d1864abca976ca68cb71612e9b20c908455d3d jdk7u45-b16
++b9aeec6b9d5aac0746f8d1764a7740f8b83334ab jdk7u45-b17
++ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Mon Aug 26 07:41:55 2013 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Tue Oct 08 09:07:15 2013 -0700
+@@ -292,7 +292,7 @@
+ script.addAttr(HtmlAttr.TYPE, "text/javascript");
+ String scriptCode = "<!--" + DocletConstants.NL +
+ " if (location.href.indexOf('is-external=true') == -1) {" + DocletConstants.NL +
+- " parent.document.title=\"" + winTitle + "\";" + DocletConstants.NL +
++ " parent.document.title=\"" + escapeJavaScriptChars(winTitle) + "\";" + DocletConstants.NL +
+ " }" + DocletConstants.NL +
+ "//-->" + DocletConstants.NL;
+ RawHtml scriptContent = new RawHtml(scriptCode);
+@@ -302,6 +302,53 @@
+ }
+
+ /**
++ * Returns a String with escaped special JavaScript characters.
++ *
++ * @param s String that needs to be escaped
++ * @return a valid escaped JavaScript string
++ */
++ private static String escapeJavaScriptChars(String s) {
++ StringBuilder sb = new StringBuilder();
++ for (int i = 0; i < s.length(); i++) {
++ char ch = s.charAt(i);
++ switch (ch) {
++ case '\b':
++ sb.append("\\b");
++ break;
++ case '\t':
++ sb.append("\\t");
++ break;
++ case '\n':
++ sb.append("\\n");
++ break;
++ case '\f':
++ sb.append("\\f");
++ break;
++ case '\r':
++ sb.append("\\r");
++ break;
++ case '"':
++ sb.append("\\\"");
++ break;
++ case '\'':
++ sb.append("\\\'");
++ break;
++ case '\\':
++ sb.append("\\\\");
++ break;
++ default:
++ if (ch < 32 || ch >= 127) {
++ sb.append(String.format("\\u%04X", (int)ch));
++ } else {
++ sb.append(ch);
++ }
++ break;
++ }
++ }
++ return sb.toString();
++ }
++
++ /**
+ * Returns a content tree for the SCRIPT tag for the main page(index.html).
+ *
+ * @return a content for the SCRIPT tag
+--- ./langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java Mon Aug 26 07:41:55 2013 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java Tue Oct 08 09:07:15 2013 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 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
+@@ -501,11 +501,10 @@
+ private void scanIdent() {
+ boolean isJavaIdentifierPart;
+ char high;
++ if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
++ // optimization, was: putChar(ch);
++ scanChar();
+ do {
+- if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
+- // optimization, was: putChar(ch);
+-
+- scanChar();
+ switch (ch) {
+ case 'A': case 'B': case 'C': case 'D': case 'E':
+ case 'F': case 'G': case 'H': case 'I': case 'J':
+@@ -522,6 +521,7 @@
+ case '$': case '_':
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
++ break;
+ case '\u0000': case '\u0001': case '\u0002': case '\u0003':
+ case '\u0004': case '\u0005': case '\u0006': case '\u0007':
+ case '\u0008': case '\u000E': case '\u000F': case '\u0010':
+@@ -529,30 +529,37 @@
+ case '\u0015': case '\u0016': case '\u0017':
+ case '\u0018': case '\u0019': case '\u001B':
+ case '\u007F':
+- break;
++ scanChar();
++ continue;
+ case '\u001A': // EOI is also a legal identifier part
+ if (bp >= buflen) {
+ name = names.fromChars(sbuf, 0, sp);
+ token = keywords.key(name);
+ return;
+ }
+- break;
++ scanChar();
++ continue;
+ default:
+ if (ch < '\u0080') {
+ // all ASCII range chars already handled, above
+ isJavaIdentifierPart = false;
+ } else {
+- high = scanSurrogates();
+- if (high != 0) {
+- if (sp == sbuf.length) {
+- putChar(high);
++ if (Character.isIdentifierIgnorable(ch)) {
++ scanChar();
++ continue;
++ } else {
++ high = scanSurrogates();
++ if (high != 0) {
++ if (sp == sbuf.length) {
++ putChar(high);
++ } else {
++ sbuf[sp++] = high;
++ }
++ isJavaIdentifierPart = Character.isJavaIdentifierPart(
++ Character.toCodePoint(high, ch));
+ } else {
+- sbuf[sp++] = high;
++ isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
+ }
+- isJavaIdentifierPart = Character.isJavaIdentifierPart(
+- Character.toCodePoint(high, ch));
+- } else {
+- isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
+ }
+ }
+ if (!isJavaIdentifierPart) {
+@@ -561,6 +568,9 @@
+ return;
+ }
+ }
++ if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
++ // optimization, was: putChar(ch);
++ scanChar();
+ } while (true);
+ }
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Tue Oct 08 09:07:15 2013 -0700
+@@ -0,0 +1,82 @@
++/*
++ * 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 8016675
++ * @summary Test for window title.
++ * @author Bhavesh Patel
++ * @library ../lib/
++ * @build JavadocTester TestWindowTitle
++ * @run main TestWindowTitle
++ */
++
++public class TestWindowTitle extends JavadocTester {
++
++ private static final String BUG_ID = "8016675";
++ private static final String WIN_TITLE =
++ "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",
++ "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",
++ "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[] ARGS = new String[]{
++ "-d", BUG_ID, "-windowtitle", WIN_TITLE, "-sourcepath", SRC_DIR, "p1", "p2"
++ };
++
++ /**
++ * The entry point of the test.
++ * @param args the array of command line arguments.
++ */
++ public static void main(String[] args) {
++ TestWindowTitle tester = new TestWindowTitle();
++ run(tester, ARGS, TEST, NEG_TEST);
++ tester.printSummary();
++ }
++
++ /**
++ * {@inheritDoc}
++ */
++ public String getBugId() {
++ return BUG_ID;
++ }
++
++ /**
++ * {@inheritDoc}
++ */
++ public String getBugName() {
++ return getClass().getName();
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java Tue Oct 08 09:07:15 2013 -0700
+@@ -0,0 +1,27 @@
++/*
++ * 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.
++ */
++
++package p1;
++
++public class C1 {
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java Tue Oct 08 09:07:15 2013 -0700
+@@ -0,0 +1,27 @@
++/*
++ * 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.
++ */
++
++package p2;
++
++public class C2 {
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java Tue Oct 08 09:07:15 2013 -0700
+@@ -0,0 +1,92 @@
++
++/*
++ * @test /nodynamiccopyright/
++ * @bug 7144981
++ * @summary javac should ignore ignorable characters in input
++ * @run main IgnoreIgnorableCharactersInInput
++ */
++
++import com.sun.source.util.JavacTask;
++import java.io.File;
++import java.net.URI;
++import java.util.Arrays;
++import java.util.Set;
++import java.util.TreeSet;
++import javax.tools.JavaCompiler;
++import javax.tools.JavaFileObject;
++import javax.tools.SimpleJavaFileObject;
++import javax.tools.ToolProvider;
++
++public class IgnoreIgnorableCharactersInInput {
++
++ public static void main(String... args) throws Exception {
++ new IgnoreIgnorableCharactersInInput().run();
++ }
++
++ void run() throws Exception {
++ JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
++ File classesDir = new File(System.getProperty("user.dir"), "classes");
++ classesDir.mkdirs();
++ JavaSource[] sources = new JavaSource[]{
++ new JavaSource("TestOneIgnorableChar", "AA\\u0000BB"),
++ new JavaSource("TestMultipleIgnorableChar", "AA\\u0000\\u0000\\u0000BB")};
++ JavacTask ct = (JavacTask)comp.getTask(null, null, null,
++ Arrays.asList("-d", classesDir.getPath()),
++ null, Arrays.asList(sources));
++ try {
++ if (!ct.call()) {
++ throw new AssertionError("Error thrown when compiling test cases");
++ }
++ } catch (Throwable ex) {
++ throw new AssertionError("Error thrown when compiling test cases");
++ }
++ check(classesDir,
++ "TestOneIgnorableChar.class",
++ "TestOneIgnorableChar$AABB.class",
++ "TestMultipleIgnorableChar.class",
++ "TestMultipleIgnorableChar$AABB.class");
++ if (errors > 0)
++ throw new AssertionError("There are some errors in the test check the error output");
++ }
++
++ /**
++ * Check that a directory contains the expected files.
++ */
++ void check(File dir, String... paths) {
++ Set<String> found = new TreeSet<String>(Arrays.asList(dir.list()));
++ Set<String> expect = new TreeSet<String>(Arrays.asList(paths));
++ if (found.equals(expect))
++ return;
++ for (String f: found) {
++ if (!expect.contains(f))
++ error("Unexpected file found: " + f);
++ }
++ for (String e: expect) {
++ if (!found.contains(e))
++ error("Expected file not found: " + e);
++ }
++ }
++
++ int errors;
++
++ void error(String msg) {
++ System.err.println(msg);
++ errors++;
++ }
++
++ class JavaSource extends SimpleJavaFileObject {
++
++ String internalSource =
++ "public class #O {public class #I {} }";
++ public JavaSource(String outerClassName, String innerClassName) {
++ super(URI.create(outerClassName + ".java"), JavaFileObject.Kind.SOURCE);
++ internalSource =
++ internalSource.replace("#O", outerClassName).replace("#I", innerClassName);
++ }
++
++ @Override
++ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
++ return internalSource;
++ }
++ }
++}
diff --git a/java/openjdk7/files/patch-7u51-b30 b/java/openjdk7/files/patch-7u51-b30
new file mode 100644
index 000000000000..976298c71863
--- /dev/null
+++ b/java/openjdk7/files/patch-7u51-b30
@@ -0,0 +1,31693 @@
+--- ./.hgtags Tue Oct 08 09:06:41 2013 -0700
++++ ./.hgtags Thu Dec 19 09:00:36 2013 -0800
+@@ -357,6 +357,8 @@
+ 3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
+ 1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
+ dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
++6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61
++a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62
+ 07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
+ 23c983c352a170d7a5fb7d703081daf1816d257a jdk7u45-b03
+ 1018a8ab686da6c1be22bec3ab9d01b2dc206333 jdk7u45-b04
+@@ -374,3 +376,19 @@
+ f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u45-b16
+ 6fd67e0287a9893ea1f0090fe127f18a7e235148 jdk7u45-b17
+ f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
++82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30
++f4373de4b75ba8d7f7a5d9c1f77e7884d9064b7e jdk7u45-b31
++f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u51-b00
++c5822e1d1baa9625ee4e54b8e83a9bf529c883fc jdk7u51-b01
++f750621fb31b8f6462b803b47bbf84f05cd5174a jdk7u51-b02
++dafd6c301c979ece6493dfb52e09e46bc81b7285 jdk7u51-b03
++8bc2f477bba4ccecaf46a52877e429342ab9c5bc jdk7u51-b04
++1604b330bf9629da5cac02af8582717dd431032e jdk7u51-b05
++15c531ebb19c21a5b565ce887c790d3855b461ef jdk7u51-b06
++75f0610e93bf6f51b3674fbbbe16f648ceb34d29 jdk7u51-b07
++467fc49c32dd8e3dd940ad0e5934a65fc7fb60ec jdk7u51-b08
++73ebe4e4f20e1d5db72c5cd673c65ffa09259982 jdk7u51-b09
++9868efbea4290f4359a6a54d722f2cb79ef634a9 jdk7u51-b10
++573c4cfca7dda548463bb84330bddfd07fe1183f jdk7u51-b11
++df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u51-b12
++6c778574d87336a2e55156544af92ce2de799696 jdk7u51-b13
+--- ./corba/.hgtags Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/.hgtags Thu Dec 19 09:00:44 2013 -0800
+@@ -359,6 +359,8 @@
+ b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
+ e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
+ 08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
++504acad3372298a79c231696d805f00f3beb2362 jdk7u40-b61
++c9c225fb19c3aa6e1242c051833ecc69d00b7aa1 jdk7u40-b62
+ 4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01
+ 1a1a1dedf437c50797a49c21a12161a79c761757 jdk7u45-b02
+ 3a2cca8c2f209b533af6c1201cc8aee43628e578 jdk7u45-b03
+@@ -377,3 +379,19 @@
+ b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u45-b16
+ 8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
+ 80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
++a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
++b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31
++b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u51-b00
++8d884cf2e8cce92d532950de2c7283d9804f9e58 jdk7u51-b01
++327035fbb0433927c1b1af2bc0bcb84e7827f1b9 jdk7u51-b02
++3c186a6d2b86ec4c6cfb093969d5f4e4a6ef6a98 jdk7u51-b03
++6969598640b2a4731634669eb1402a6af5772b44 jdk7u51-b04
++b18c17608d944028724858e1f768fb0a59dc8220 jdk7u51-b05
++863d69d3dee00e7958ed1014e7600cc08f2655e7 jdk7u51-b06
++3f6dfcad33acb0251c60facb6b5e8dbff41a4114 jdk7u51-b07
++00c7d4007a2f22deb05753bbd2d36f0ce43ac786 jdk7u51-b08
++bb45667f58f57f96c00551db26ab281bd101e892 jdk7u51-b09
++eecfc296009b81934a329e7ce42a53484093f611 jdk7u51-b10
++a26d0e8ab1027e70ae1ded8ede0086a0a4a10256 jdk7u51-b11
++55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u51-b12
++e2f0036f712aa636cfd55334ac21ea7ca2587a7b jdk7u51-b13
+--- ./corba/make/Makefile Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/make/Makefile Thu Dec 19 09:00:44 2013 -0800
+@@ -160,7 +160,7 @@
+ #
+ # CORBA
+ #
+-SUBDIRS = tools javax org sun com
++SUBDIRS = tools sun/rmi javax org sun com
+
+ build:
+ $(SUBDIRS-loop)
+--- ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Thu Dec 19 09:00:44 2013 -0800
+@@ -82,11 +82,18 @@
+ super((ORB)orb);
+ }
+
+- public org.omg.CORBA.portable.InputStream create_input_stream()
+- {
+- return new AnyInputStream(
+- (com.sun.corba.se.impl.encoding.EncapsInputStream)
+- super.create_input_stream());
++ public org.omg.CORBA.portable.InputStream create_input_stream() {
++ final org.omg.CORBA.portable.InputStream is = super
++ .create_input_stream();
++ AnyInputStream aIS = AccessController
++ .doPrivileged(new PrivilegedAction<AnyInputStream>() {
++ @Override
++ public AnyInputStream run() {
++ return new AnyInputStream(
++ (com.sun.corba.se.impl.encoding.EncapsInputStream) is);
++ }
++ });
++ return aIS;
+ }
+ }
+
+--- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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,11 +36,10 @@
+ import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
+
+ import com.sun.corba.se.spi.orb.ORB;
+-
+ import com.sun.corba.se.spi.logging.CORBALogDomains;
+-
+ import com.sun.corba.se.impl.logging.ORBUtilSystemException;
+
++import sun.corba.EncapsInputStreamFactory;
+ /**
+ * Encapsulations are supposed to explicitly define their
+ * code sets and GIOP version. The original resolution to issue 2784
+@@ -148,7 +147,7 @@
+ }
+
+ public CDRInputStream dup() {
+- return new EncapsInputStream(this);
++ return EncapsInputStreamFactory.newEncapsInputStream(this);
+ }
+
+ protected CodeSetConversion.BTCConverter createCharBTCConverter() {
+--- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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,8 @@
+ import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
+ import com.sun.corba.se.impl.orbutil.ORBConstants;
+
++import sun.corba.EncapsInputStreamFactory;
++
+ /**
+ * Encapsulations are supposed to explicitly define their
+ * code sets and GIOP version. The original resolution to issue 2784
+@@ -107,11 +109,11 @@
+ public org.omg.CORBA.portable.InputStream create_input_stream() {
+ freeInternalCaches();
+
+- return new EncapsInputStream(orb(),
+- getByteBuffer(),
+- getSize(),
+- isLittleEndian(),
+- getGIOPVersion());
++ return EncapsInputStreamFactory.newEncapsInputStream(orb(),
++ getByteBuffer(),
++ getSize(),
++ isLittleEndian(),
++ getGIOPVersion());
+ }
+
+ protected CodeSetConversion.CTBConverter createCharCTBConverter() {
+--- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 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
+@@ -64,6 +64,8 @@
+ import com.sun.corba.se.impl.encoding.CDROutputStream;
+ import com.sun.corba.se.impl.encoding.MarshalInputStream;
+
++import sun.corba.EncapsInputStreamFactory;
++
+ public class TypeCodeInputStream extends EncapsInputStream implements TypeCodeReader
+ {
+ private Map typeMap = null;
+@@ -157,11 +159,13 @@
+
+ // create an encapsulation using the marshal buffer
+ if (is instanceof CDRInputStream) {
+- encap = new TypeCodeInputStream((ORB)_orb, encapBuffer, encapBuffer.length,
+- ((CDRInputStream)is).isLittleEndian(),
+- ((CDRInputStream)is).getGIOPVersion());
++ encap = EncapsInputStreamFactory.newTypeCodeInputStream((ORB) _orb,
++ encapBuffer, encapBuffer.length,
++ ((CDRInputStream) is).isLittleEndian(),
++ ((CDRInputStream) is).getGIOPVersion());
+ } else {
+- encap = new TypeCodeInputStream((ORB)_orb, encapBuffer, encapBuffer.length);
++ encap = EncapsInputStreamFactory.newTypeCodeInputStream((ORB) _orb,
++ encapBuffer, encapBuffer.length);
+ }
+ encap.setEnclosingInputStream(is);
+ encap.makeEncapsulation();
+--- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java Thu Dec 19 09:00:44 2013 -0800
+@@ -61,6 +61,8 @@
+ import java.math.BigInteger;
+ import java.nio.ByteBuffer;
+
++import sun.corba.EncapsInputStreamFactory;
++
+ public final class TypeCodeOutputStream extends EncapsOutputStream
+ {
+ private OutputStream enclosure = null;
+@@ -77,9 +79,9 @@
+
+ public org.omg.CORBA.portable.InputStream create_input_stream()
+ {
+- //return new TypeCodeInputStream((ORB)orb(), getByteBuffer(), getIndex(), isLittleEndian());
+- TypeCodeInputStream tcis
+- = new TypeCodeInputStream((ORB)orb(), getByteBuffer(), getIndex(), isLittleEndian(), getGIOPVersion());
++ TypeCodeInputStream tcis = EncapsInputStreamFactory
++ .newTypeCodeInputStream((ORB) orb(), getByteBuffer(),
++ getIndex(), isLittleEndian(), getGIOPVersion());
+ //if (TypeCodeImpl.debug) {
+ //System.out.println("Created TypeCodeInputStream " + tcis + " with no parent");
+ //tcis.printBuffer();
+--- ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java Thu Dec 19 09:00:44 2013 -0800
+@@ -33,6 +33,8 @@
+ import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
+ import com.sun.corba.se.spi.logging.CORBALogDomains;
+
++import sun.corba.EncapsInputStreamFactory;
++
+ import com.sun.corba.se.impl.corba.AnyImpl;
+ import com.sun.corba.se.impl.encoding.EncapsInputStream;
+ import com.sun.corba.se.impl.encoding.EncapsOutputStream;
+@@ -193,8 +195,9 @@
+ // it is turned into a FormatMismatch exception.
+
+ try {
+- EncapsInputStream cdrIn = new EncapsInputStream( orb, data,
+- data.length, giopVersion );
++ EncapsInputStream cdrIn = EncapsInputStreamFactory.newEncapsInputStream( orb, data,
++ data.length, giopVersion );
++
+
+ cdrIn.consumeEndian();
+
+--- ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -370,7 +370,7 @@
+ * @exception IOException Any of the usual Input/Output related exceptions.
+ * @since JDK1.1
+ */
+- public final Object readObjectDelegate() throws IOException
++ public final synchronized Object readObjectDelegate() throws IOException
+ {
+ try {
+
+@@ -389,7 +389,7 @@
+ }
+ }
+
+- final Object simpleReadObject(Class clz,
++ final synchronized Object simpleReadObject(Class clz,
+ String repositoryID,
+ com.sun.org.omg.SendingContext.CodeBase sender,
+ int offset)
+@@ -461,7 +461,7 @@
+ return obj;
+ }
+
+- public final void simpleSkipObject(String repositoryID,
++ public final synchronized void simpleSkipObject(String repositoryID,
+ com.sun.org.omg.SendingContext.CodeBase sender)
+ /* throws OptionalDataException, ClassNotFoundException, IOException */
+ {
+@@ -559,7 +559,7 @@
+ * objects.
+ * @since JDK1.1
+ */
+- public final void defaultReadObjectDelegate()
++ final synchronized void defaultReadObjectDelegate()
+ /* throws IOException, ClassNotFoundException, NotActiveException */
+ {
+ try {
+@@ -988,7 +988,7 @@
+ }
+ }
+
+- private Object inputObject(Class clz,
++ private synchronized Object inputObject(Class clz,
+ String repositoryID,
+ com.sun.org.omg.SendingContext.CodeBase sender,
+ int offset)
+@@ -1317,7 +1317,7 @@
+ * a form of custom marshaling.
+ *
+ */
+- private Object inputObjectUsingFVD(Class clz,
++ private synchronized Object inputObjectUsingFVD(Class clz,
+ String repositoryID,
+ com.sun.org.omg.SendingContext.CodeBase sender,
+ int offset)
+--- ./corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java Thu Dec 19 09:00:44 2013 -0800
+@@ -201,7 +201,7 @@
+ readObjectState.endDefaultReadObject(this);
+ }
+
+- public abstract void defaultReadObjectDelegate();
++ abstract void defaultReadObjectDelegate();
+
+ abstract void readFields(java.util.Map fieldToValueMap)
+ throws java.io.InvalidClassException, java.io.StreamCorruptedException,
+--- ./corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 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
+@@ -47,6 +47,8 @@
+ import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
+ import com.sun.corba.se.impl.encoding.EncapsInputStream ;
+
++import sun.corba.EncapsInputStreamFactory;
++
+ /**
+ * This static utility class contains various utility methods for reading and
+ * writing CDR encapsulations.
+@@ -108,8 +110,8 @@
+ static public InputStream getEncapsulationStream( InputStream is )
+ {
+ byte[] data = readOctets( is ) ;
+- EncapsInputStream result = new EncapsInputStream( is.orb(), data,
+- data.length ) ;
++ EncapsInputStream result = EncapsInputStreamFactory.newEncapsInputStream( is.orb(), data,
++ data.length ) ;
+ result.consumeEndian() ;
+ return result ;
+ }
+--- ./corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 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
+@@ -49,6 +49,8 @@
+ import com.sun.corba.se.impl.logging.IORSystemException ;
+
+ import com.sun.corba.se.impl.encoding.EncapsInputStream ;
++import sun.corba.EncapsInputStreamFactory;
++
+
+ /** Based on the magic and scid, return the appropriate
+ * ObjectKeyTemplate. Expects to be called with a valid
+@@ -217,7 +219,7 @@
+ public ObjectKey create( byte[] key )
+ {
+ OctetSeqHolder osh = new OctetSeqHolder() ;
+- EncapsInputStream is = new EncapsInputStream( orb, key, key.length ) ;
++ EncapsInputStream is = EncapsInputStreamFactory.newEncapsInputStream( orb, key, key.length );
+
+ ObjectKeyTemplate oktemp = create( is, fullKey, osh ) ;
+ if (oktemp == null)
+--- ./corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Thu Dec 19 09:00:44 2013 -0800
+@@ -70,6 +70,8 @@
+ import com.sun.corba.se.impl.encoding.EncapsInputStream ;
+ import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
+
++import sun.corba.EncapsInputStreamFactory;
++
+ import com.sun.corba.se.impl.util.JDKBridge;
+
+ import com.sun.corba.se.impl.logging.IORSystemException;
+@@ -170,8 +172,8 @@
+ throw wrapper.invalidTaggedProfile() ;
+ }
+
+- EncapsInputStream istr = new EncapsInputStream((ORB)orb, profile.profile_data,
+- profile.profile_data.length);
++ EncapsInputStream istr = EncapsInputStreamFactory.newEncapsInputStream((ORB)orb, profile.profile_data,
++ profile.profile_data.length);
+ istr.consumeEndian();
+ init( istr ) ;
+ }
+--- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -25,6 +25,7 @@
+
+ package com.sun.corba.se.impl.presentation.rmi ;
+
++import java.io.SerializablePermission;
+ import java.lang.reflect.InvocationHandler ;
+ import java.lang.reflect.Proxy ;
+
+@@ -38,11 +39,18 @@
+ {
+ protected final ClassLoader loader ;
+
+- public StubFactoryDynamicBase( PresentationManager.ClassData classData,
+- ClassLoader loader )
+- {
+- super( classData ) ;
++ private static Void checkPermission() {
++ SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ sm.checkPermission(new SerializablePermission(
++ "enableSubclassImplementation"));
++ }
++ return null;
++ }
+
++ private StubFactoryDynamicBase(Void unused,
++ PresentationManager.ClassData classData, ClassLoader loader) {
++ super(classData);
+ // this.loader must not be null, or the newProxyInstance call
+ // will fail.
+ if (loader == null) {
+@@ -55,5 +63,11 @@
+ }
+ }
+
++ public StubFactoryDynamicBase( PresentationManager.ClassData classData,
++ ClassLoader loader )
++ {
++ this (checkPermission(), classData, loader);
++ }
++
+ public abstract org.omg.CORBA.Object makeStub() ;
+ }
+--- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -25,14 +25,23 @@
+
+ package com.sun.corba.se.impl.presentation.rmi;
+
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++
+ import com.sun.corba.se.spi.presentation.rmi.PresentationManager ;
+
+ public class StubFactoryFactoryProxyImpl extends StubFactoryFactoryDynamicBase
+ {
+ public PresentationManager.StubFactory makeDynamicStubFactory(
+- PresentationManager pm, PresentationManager.ClassData classData,
+- ClassLoader classLoader )
++ PresentationManager pm, final PresentationManager.ClassData classData,
++ final ClassLoader classLoader )
+ {
+- return new StubFactoryProxyImpl( classData, classLoader ) ;
++ return AccessController
++ .doPrivileged(new PrivilegedAction<StubFactoryProxyImpl>() {
++ @Override
++ public StubFactoryProxyImpl run() {
++ return new StubFactoryProxyImpl(classData, classLoader);
++ }
++ });
+ }
+ }
+--- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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
+@@ -115,6 +115,7 @@
+
+ import java.util.concurrent.ConcurrentMap;
+ import java.util.concurrent.ConcurrentHashMap;
++import sun.corba.EncapsInputStreamFactory;
+
+ /**
+ * ClientDelegate is the RMI client-side subcontract or representation
+@@ -847,8 +848,8 @@
+ }
+ byte[] data = ((UnknownServiceContext)sc).getData();
+ EncapsInputStream in =
+- new EncapsInputStream((ORB)messageMediator.getBroker(),
+- data, data.length);
++ EncapsInputStreamFactory.newEncapsInputStream((ORB)messageMediator.getBroker(),
++ data, data.length);
+ in.consumeEndian();
+
+ String msg =
+--- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2004, 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
+@@ -36,7 +36,8 @@
+ import java.util.Iterator;
+ import java.rmi.RemoteException;
+ import java.nio.ByteBuffer;
+-
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import javax.rmi.CORBA.Util;
+ import javax.rmi.CORBA.Tie;
+
+@@ -111,6 +112,7 @@
+ import com.sun.corba.se.impl.protocol.giopmsgheaders.ProfileAddr;
+ import com.sun.corba.se.impl.protocol.giopmsgheaders.ReferenceAddr;
+ import com.sun.corba.se.impl.transport.CorbaContactInfoListIteratorImpl;
++import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
+ import com.sun.corba.se.impl.util.JDKBridge;
+
+ /**
+@@ -156,10 +158,17 @@
+
+ ByteBufferWithInfo bbwi = cdrOutputObject.getByteBufferWithInfo();
+ cdrOutputObject.getMessageHeader().setSize(bbwi.byteBuffer, bbwi.getSize());
+-
+- CDRInputObject cdrInputObject =
+- new CDRInputObject(orb, null, bbwi.byteBuffer,
+- cdrOutputObject.getMessageHeader());
++ final ORB inOrb = orb;
++ final ByteBuffer inBuffer = bbwi.byteBuffer;
++ final Message inMsg = cdrOutputObject.getMessageHeader();
++ CDRInputObject cdrInputObject = AccessController
++ .doPrivileged(new PrivilegedAction<CDRInputObject>() {
++ @Override
++ public CDRInputObject run() {
++ return new CDRInputObject(inOrb, null, inBuffer,
++ inMsg);
++ }
++ });
+ messageMediator.setInputObject(cdrInputObject);
+ cdrInputObject.setMessageMediator(messageMediator);
+
+@@ -192,9 +201,17 @@
+ cdrOutputObject = (CDROutputObject) messageMediator.getOutputObject();
+ bbwi = cdrOutputObject.getByteBufferWithInfo();
+ cdrOutputObject.getMessageHeader().setSize(bbwi.byteBuffer, bbwi.getSize());
+- cdrInputObject =
+- new CDRInputObject(orb, null, bbwi.byteBuffer,
+- cdrOutputObject.getMessageHeader());
++ final ORB inOrb2 = orb;
++ final ByteBuffer inBuffer2 = bbwi.byteBuffer;
++ final Message inMsg2 = cdrOutputObject.getMessageHeader();
++ cdrInputObject = AccessController
++ .doPrivileged(new PrivilegedAction<CDRInputObject>() {
++ @Override
++ public CDRInputObject run() {
++ return new CDRInputObject(inOrb2, null, inBuffer2,
++ inMsg2);
++ }
++ });
+ messageMediator.setInputObject(cdrInputObject);
+ cdrInputObject.setMessageMediator(messageMediator);
+
+--- ./corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -36,6 +36,8 @@
+ import org.omg.CosNaming.NamingContextExt ;
+ import org.omg.CosNaming.NamingContextExtHelper ;
+
++import sun.corba.EncapsInputStreamFactory;
++
+ import com.sun.corba.se.spi.ior.IOR;
+ import com.sun.corba.se.spi.ior.IORTemplate;
+ import com.sun.corba.se.spi.ior.ObjectKey;
+@@ -114,8 +116,8 @@
+ buf[j] = (byte)((ORBUtility.hexOf(str.charAt(i)) << UN_SHIFT) & 0xF0);
+ buf[j] |= (byte)(ORBUtility.hexOf(str.charAt(i+1)) & 0x0F);
+ }
+- EncapsInputStream s = new EncapsInputStream(orb, buf, buf.length,
+- orb.getORBData().getGIOPVersion());
++ EncapsInputStream s = EncapsInputStreamFactory.newEncapsInputStream(orb, buf, buf.length,
++ orb.getORBData().getGIOPVersion());
+ s.consumeEndian();
+ return s.read_Object() ;
+ }
+--- ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java Thu Dec 19 09:00:44 2013 -0800
+@@ -89,4 +89,6 @@
+ sm.checkPermission(perm);
+ }
+ }
++
++ private static final long serialVersionUID = 4571178305984833743L;
+ }
+--- ./corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 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
+@@ -58,6 +58,9 @@
+ import com.sun.corba.se.impl.util.Utility ;
+ import com.sun.corba.se.impl.logging.ORBUtilSystemException ;
+
++import sun.corba.EncapsInputStreamFactory;
++
++
+ public class ServiceContexts {
+ private static boolean isDebugging( OutputStream os )
+ {
+@@ -198,11 +201,11 @@
+ // Note: As of Jan 2001, no standard OMG or Sun service contexts
+ // ship wchar data or are defined as using anything but GIOP 1.0 CDR.
+ EncapsInputStream eis
+- = new EncapsInputStream(orb,
+- data,
+- data.length,
+- giopVersion,
+- codeBase);
++ = EncapsInputStreamFactory.newEncapsInputStream(orb,
++ data,
++ data.length,
++ giopVersion,
++ codeBase);
+ eis.consumeEndian();
+
+ // Now the input stream passed to a ServiceContext
+--- ./corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Thu Dec 19 09:00:44 2013 -0800
+@@ -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
+ ParseException.badRepIDForm=%0 (\u884C%1): \u30EA\u30DD\u30B8\u30C8\u30EAID '%2'\u306E\u5F62\u5F0F\u306F'<format>:<string>'\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n%3\n%4
+-ParseException.badRepIDPrefix=%0 (\u884C%1): \u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9%2\u306B\u306F\u3001'%4'\u3067\u306F\u306A\u304F\u30EA\u30DD\u30B8\u30C8\u30EAID\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9`%3'\u304C\u5FC5\u8981\u3067\u3059\u3002\n%5\n%6
++ParseException.badRepIDPrefix=%0 (\u884C%1): \u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9%2\u306B\u306F\u3001'%4'\u3067\u306F\u306A\u304F\u30EA\u30DD\u30B8\u30C8\u30EAID\u63A5\u982D\u8F9E`%3'\u304C\u5FC5\u8981\u3067\u3059\u3002\n%5\n%6
+ ParseException.badState=%0 (\u884C%1): %2\u306F\u30B9\u30C6\u30FC\u30C8\u30D5\u30EB\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u3067\u304D\u307E\u305B\u3093\u3002\u8907\u6570\u306E\u30B9\u30C6\u30FC\u30C8\u30D5\u30EB\u89AA\u304C\u3042\u308A\u307E\u3059\u3002\n%3\n%4
+ 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 Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/javax/rmi/CORBA/Stub.java Thu Dec 19 09:00:44 2013 -0800
+@@ -61,13 +61,11 @@
+ private transient StubDelegate stubDelegate = null;
+ private static Class stubDelegateClass = null;
+ private static final String StubClassKey = "javax.rmi.CORBA.StubClass";
+- private static final String defaultStubImplName = "com.sun.corba.se.impl.javax.rmi.CORBA.StubDelegateImpl";
+
+ static {
+- Object stubDelegateInstance = (Object) createDelegateIfSpecified(StubClassKey, defaultStubImplName);
++ Object stubDelegateInstance = createDelegate(StubClassKey);
+ if (stubDelegateInstance != null)
+ stubDelegateClass = stubDelegateInstance.getClass();
+-
+ }
+
+
+@@ -207,7 +205,7 @@
+ // are in different packages and the visibility needs to be package for
+ // security reasons. If you know a better solution how to share this code
+ // then remove it from PortableRemoteObject. Also in Util.java
+- private static Object createDelegateIfSpecified(String classKey, String defaultClassName) {
++ private static Object createDelegate(String classKey) {
+ String className = (String)
+ AccessController.doPrivileged(new GetPropertyAction(classKey));
+ if (className == null) {
+@@ -218,7 +216,7 @@
+ }
+
+ if (className == null) {
+- className = defaultClassName;
++ return new com.sun.corba.se.impl.javax.rmi.CORBA.StubDelegateImpl();
+ }
+
+ try {
+--- ./corba/src/share/classes/javax/rmi/CORBA/Util.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/javax/rmi/CORBA/Util.java Thu Dec 19 09:00:44 2013 -0800
+@@ -60,14 +60,11 @@
+ public class Util {
+
+ // This can only be set at static initialization time (no sync necessary).
+- private static javax.rmi.CORBA.UtilDelegate utilDelegate = null;
++ private static final javax.rmi.CORBA.UtilDelegate utilDelegate;
+ private static final String UtilClassKey = "javax.rmi.CORBA.UtilClass";
+- private static final String defaultUtilImplName =
+-"com.sun.corba.se.impl.javax.rmi.CORBA.Util";
+
+ static {
+- utilDelegate = (javax.rmi.CORBA.UtilDelegate)
+- createDelegateIfSpecified(UtilClassKey, defaultUtilImplName);
++ utilDelegate = (javax.rmi.CORBA.UtilDelegate)createDelegate(UtilClassKey);
+ }
+
+ private Util(){}
+@@ -338,9 +335,7 @@
+ // are in different packages and the visibility needs to be package for
+ // security reasons. If you know a better solution how to share this code
+ // then remove it from PortableRemoteObject. Also in Stub.java
+- private static Object createDelegateIfSpecified(String classKey,
+- String defaultClassName)
+- {
++ private static Object createDelegate(String classKey) {
+ String className = (String)
+ AccessController.doPrivileged(new GetPropertyAction(classKey));
+ if (className == null) {
+@@ -351,7 +346,7 @@
+ }
+
+ if (className == null) {
+- className = defaultClassName;
++ return new com.sun.corba.se.impl.javax.rmi.CORBA.Util();
+ }
+
+ try {
+--- ./corba/src/share/classes/javax/rmi/PortableRemoteObject.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/javax/rmi/PortableRemoteObject.java Thu Dec 19 09:00:44 2013 -0800
+@@ -65,17 +65,14 @@
+ */
+ public class PortableRemoteObject {
+
+- private static javax.rmi.CORBA.PortableRemoteObjectDelegate proDelegate = null;
++ private static final javax.rmi.CORBA.PortableRemoteObjectDelegate proDelegate;
+
+ private static final String PortableRemoteObjectClassKey =
+ "javax.rmi.CORBA.PortableRemoteObjectClass";
+
+- private static final String defaultPortableRemoteObjectImplName =
+- "com.sun.corba.se.impl.javax.rmi.PortableRemoteObject";
+-
+ static {
+ proDelegate = (javax.rmi.CORBA.PortableRemoteObjectDelegate)
+- createDelegateIfSpecified(PortableRemoteObjectClassKey);
++ createDelegate(PortableRemoteObjectClassKey);
+ }
+
+ /**
+@@ -181,7 +178,7 @@
+ // are in different packages and the visibility needs to be package for
+ // security reasons. If you know a better solution how to share this code
+ // then remove it from here.
+- private static Object createDelegateIfSpecified(String classKey) {
++ private static Object createDelegate(String classKey) {
+ String className = (String)
+ AccessController.doPrivileged(new GetPropertyAction(classKey));
+ if (className == null) {
+@@ -191,7 +188,7 @@
+ }
+ }
+ if (className == null) {
+- className = defaultPortableRemoteObjectImplName;
++ return new com.sun.corba.se.impl.javax.rmi.PortableRemoteObject();
+ }
+
+ try {
+--- ./corba/src/share/classes/org/omg/CORBA/ORB.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/org/omg/CORBA/ORB.java Thu Dec 19 09:00:44 2013 -0800
+@@ -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.
+ * 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 @@
+ private static final String ORBSingletonClassKey = "org.omg.CORBA.ORBSingletonClass";
+
+ //
+- // The last resort fallback ORB implementation classes in case
+- // no ORB implementation class is dynamically configured through
+- // properties or applet parameters. Change these values to
+- // vendor-specific class names.
+- //
+- private static final String defaultORB = "com.sun.corba.se.impl.orb.ORBImpl";
+- private static final String defaultORBSingleton = "com.sun.corba.se.impl.orb.ORBSingleton";
+-
+- //
+ // 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 @@
+ String className = getSystemProperty(ORBSingletonClassKey);
+ if (className == null)
+ className = getPropertyFromFile(ORBSingletonClassKey);
+- if (className == null)
+- className = defaultORBSingleton;
+-
+- singleton = create_impl(className);
++ if ((className == null) ||
++ (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
++ singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
++ } else {
++ singleton = create_impl(className);
++ }
+ }
+ return singleton;
+ }
+@@ -347,10 +340,13 @@
+ className = getSystemProperty(ORBClassKey);
+ if (className == null)
+ className = getPropertyFromFile(ORBClassKey);
+- if (className == null)
+- className = defaultORB;
++ 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 @@
+ className = getSystemProperty(ORBClassKey);
+ if (className == null)
+ className = getPropertyFromFile(ORBClassKey);
+- if (className == null)
+- className = defaultORB;
++ 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;
+ }
+--- ./corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java Tue Oct 08 09:06:43 2013 -0700
++++ ./corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java Thu Dec 19 09:00:44 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -31,6 +31,10 @@
+
+ package org.omg.CORBA_2_3.portable;
+
++import java.io.SerializablePermission;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++
+ /**
+ * InputStream provides for the reading of all of the mapped IDL types
+ * from the stream. It extends org.omg.CORBA.portable.InputStream. This
+@@ -43,6 +47,43 @@
+
+ public abstract class InputStream extends org.omg.CORBA.portable.InputStream {
+
++
++ private static final String ALLOW_SUBCLASS_PROP = "jdk.corba.allowInputStreamSubclass";
++
++ private static final boolean allowSubclass = AccessController.doPrivileged(
++ new PrivilegedAction<Boolean>() {
++ @Override
++ public Boolean run() {
++ String prop = System.getProperty(ALLOW_SUBCLASS_PROP);
++ return prop == null ? false :
++ (prop.equalsIgnoreCase("false") ? false : true);
++ }
++ });
++
++ private static Void checkPermission() {
++ SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ if (!allowSubclass)
++ sm.checkPermission(new
++ SerializablePermission("enableSubclassImplementation"));
++ }
++ return null;
++ }
++
++ private InputStream(Void ignore) { }
++
++ /**
++ * Create a new instance of this class.
++ *
++ * throw SecurityException if SecurityManager is installed and
++ * enableSubclassImplementation SerializablePermission
++ * is not granted or jdk.corba.allowOutputStreamSubclass system
++ * property is either not set or is set to 'false'
++ */
++ public InputStream() {
++ this(checkPermission());
++ }
++
+ /**
+ * Unmarshalls a value type from the input stream.
+ * @return the value type unmarshalled from the input stream
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java Thu Dec 19 09:00:44 2013 -0800
+@@ -0,0 +1,153 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package sun.corba;
++
++import java.nio.ByteBuffer;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++
++
++import com.sun.corba.se.impl.encoding.EncapsInputStream;
++import com.sun.corba.se.impl.encoding.TypeCodeInputStream;
++import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
++import com.sun.corba.se.pept.protocol.MessageMediator;
++import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
++import com.sun.corba.se.spi.orb.ORB;
++import com.sun.org.omg.SendingContext.CodeBase;
++
++public class EncapsInputStreamFactory {
++
++ public static EncapsInputStream newEncapsInputStream(
++ final org.omg.CORBA.ORB orb, final byte[] buf, final int size,
++ final boolean littleEndian, final GIOPVersion version) {
++ return AccessController
++ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
++ @Override
++ public EncapsInputStream run() {
++ return new EncapsInputStream(orb, buf, size,
++ littleEndian, version);
++ }
++ });
++ }
++
++ public static EncapsInputStream newEncapsInputStream(
++ final org.omg.CORBA.ORB orb, final ByteBuffer byteBuffer,
++ final int size, final boolean littleEndian,
++ final GIOPVersion version) {
++ return AccessController
++ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
++ @Override
++ public EncapsInputStream run() {
++ return new EncapsInputStream(orb, byteBuffer, size,
++ littleEndian, version);
++ }
++ });
++ }
++
++ public static EncapsInputStream newEncapsInputStream(
++ final org.omg.CORBA.ORB orb, final byte[] data, final int size) {
++ return AccessController
++ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
++ @Override
++ public EncapsInputStream run() {
++ return new EncapsInputStream(orb, data, size);
++ }
++ });
++ }
++
++ public static EncapsInputStream newEncapsInputStream(
++ final EncapsInputStream eis) {
++ return AccessController
++ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
++ @Override
++ public EncapsInputStream run() {
++ return new EncapsInputStream(eis);
++ }
++ });
++ }
++
++ public static EncapsInputStream newEncapsInputStream(
++ final org.omg.CORBA.ORB orb, final byte[] data, final int size,
++ final GIOPVersion version) {
++ return AccessController
++ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
++ @Override
++ public EncapsInputStream run() {
++ return new EncapsInputStream(orb, data, size, version);
++ }
++ });
++ }
++
++ public static EncapsInputStream newEncapsInputStream(
++ final org.omg.CORBA.ORB orb, final byte[] data, final int size,
++ final GIOPVersion version, final CodeBase codeBase) {
++ return AccessController
++ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
++ @Override
++ public EncapsInputStream run() {
++ return new EncapsInputStream(orb, data, size, version,
++ codeBase);
++ }
++ });
++ }
++
++ public static TypeCodeInputStream newTypeCodeInputStream(
++ final org.omg.CORBA.ORB orb, final byte[] buf, final int size,
++ final boolean littleEndian, final GIOPVersion version) {
++ return AccessController
++ .doPrivileged(new PrivilegedAction<TypeCodeInputStream>() {
++ @Override
++ public TypeCodeInputStream run() {
++ return new TypeCodeInputStream(orb, buf, size,
++ littleEndian, version);
++ }
++ });
++ }
++
++ public static TypeCodeInputStream newTypeCodeInputStream(
++ final org.omg.CORBA.ORB orb, final ByteBuffer byteBuffer,
++ final int size, final boolean littleEndian,
++ final GIOPVersion version) {
++ return AccessController
++ .doPrivileged(new PrivilegedAction<TypeCodeInputStream>() {
++ @Override
++ public TypeCodeInputStream run() {
++ return new TypeCodeInputStream(orb, byteBuffer, size,
++ littleEndian, version);
++ }
++ });
++ }
++
++ public static TypeCodeInputStream newTypeCodeInputStream(
++ final org.omg.CORBA.ORB orb, final byte[] data, final int size) {
++ return AccessController
++ .doPrivileged(new PrivilegedAction<TypeCodeInputStream>() {
++ @Override
++ public TypeCodeInputStream run() {
++ return new TypeCodeInputStream(orb, data, size);
++ }
++ });
++ }
++}
+--- ./hotspot/.hgtags Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/.hgtags Thu Dec 19 09:00:51 2013 -0800
+@@ -568,6 +568,8 @@
+ b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56
+ eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43
+ af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
++efaa26fb6de2ecb8506fb8b785a429d040e96768 jdk7u40-b61
++df6f37a7311d35072a07c1425a7aadee469a09b6 jdk7u40-b62
+ 5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
+ f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02
+ d6fd3f84a30ce82a37fc39b6e5e9d73bd8054ab2 jdk7u45-b03
+@@ -586,3 +588,19 @@
+ 429884602206fcf5314c8b953c06d54d337558ca jdk7u45-b16
+ 0c0dc384915cafd9bfaa2fe5792a629a22d1b990 jdk7u45-b17
+ 12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18
++3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30
++520b7b3d9153c1407791325946b07c5c222cf0d6 jdk7u45-b31
++429884602206fcf5314c8b953c06d54d337558ca jdk7u51-b00
++68f03ff066f2341b89b52a6d6e21ae09de008351 jdk7u51-b01
++67910a581eca113847c5320c49436a9816c5d5c6 jdk7u51-b02
++4138fb11955a528e5ee5448d9c6c8e88e0e268b2 jdk7u51-b03
++683458c333ced92d515daa1b9bcdb5be679e535a jdk7u51-b04
++ed2db7a82229e7adbfe8a8166bf98f3ef4a09be5 jdk7u51-b05
++fec027762cf37d033d82d5b3725020f40c771690 jdk7u51-b06
++f673c581ebf91073b5bbdbdc5e4d4407910fa006 jdk7u51-b07
++b0a355aae00427e74cc0b89697c7c7f6fb520176 jdk7u51-b08
++4f56f2e206fd878809f70ca06f4bc21563a7c530 jdk7u51-b09
++1b7aaef3df78970c9a5ef5cc353ca927241555ee jdk7u51-b10
++1f11dff734af98f5bf11d4fceeda221ab1416971 jdk7u51-b11
++dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u51-b12
++6c6a2299029ad02fa2820b8ff8c61c2bbcae799c jdk7u51-b13
+--- ./hotspot/make/hotspot_version Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/make/hotspot_version Thu Dec 19 09:00:51 2013 -0800
+@@ -34,8 +34,8 @@
+ HOTSPOT_VM_COPYRIGHT=Copyright 2013
+
+ HS_MAJOR_VER=24
+-HS_MINOR_VER=45
+-HS_BUILD_NUMBER=08
++HS_MINOR_VER=51
++HS_BUILD_NUMBER=03
+
+ JDK_MAJOR_VER=1
+ JDK_MINOR_VER=7
+--- ./hotspot/src/os/linux/vm/os_linux.cpp Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/src/os/linux/vm/os_linux.cpp Thu Dec 19 09:00:51 2013 -0800
+@@ -2696,6 +2696,14 @@
+ alignment_hint, exec, strerror(err), err);
+ }
+
++static void warn_fail_commit_memory(char* addr, size_t size,
++ size_t alignment_hint, bool exec,
++ int err, const char* msg) {
++ warning("INFO: os::commit_memory(" PTR_FORMAT ", " SIZE_FORMAT
++ ", " SIZE_FORMAT ", %d) failed; error='%s' (errno=%d); %s", addr, size,
++ alignment_hint, exec, strerror(err), err, msg);
++}
++
+ // NOTE: Linux kernel does not really reserve the pages for us.
+ // All it does is to check if there are enough free pages
+ // left at the time of mmap(). This could be a potential
+@@ -2746,6 +2754,8 @@
+ #define MADV_HUGEPAGE 14
+ #endif
+
++volatile jint os::Linux::num_largepage_commit_fails = 0;
++
+ int os::Linux::commit_memory_impl(char* addr, size_t size,
+ size_t alignment_hint, bool exec) {
+ int err;
+@@ -2770,7 +2780,9 @@
+ // from the loss. For now, we just issue a warning and we don't
+ // call vm_exit_out_of_memory(). This issue is being tracked by
+ // JBS-8007074.
+- warn_fail_commit_memory(addr, size, alignment_hint, exec, err);
++ Atomic::inc(&os::Linux::num_largepage_commit_fails);
++ warn_fail_commit_memory(addr, size, alignment_hint, exec, err,
++ "Cannot allocate large pages, falling back to regular pages");
+ // vm_exit_out_of_memory(size, "committing reserved memory.");
+ }
+ // Fall through and try to use small pages
+--- ./hotspot/src/os/linux/vm/os_linux.hpp Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/src/os/linux/vm/os_linux.hpp Thu Dec 19 09:00:51 2013 -0800
+@@ -100,6 +100,7 @@
+
+ public:
+ static bool _stack_is_executable;
++ static volatile jint num_largepage_commit_fails;
+ static void *dlopen_helper(const char *name, char *ebuf, int ebuflen);
+ static void *dll_load_in_vmthread(const char *name, char *ebuf, int ebuflen);
+
+--- ./hotspot/src/share/vm/prims/methodHandles.cpp Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/src/share/vm/prims/methodHandles.cpp Thu Dec 19 09:00:51 2013 -0800
+@@ -175,30 +175,32 @@
+ }
+
+ oop MethodHandles::init_method_MemberName(oop mname_oop, methodOop m, bool do_dispatch,
+- klassOop receiver_limit) {
++ klassOop resolved_klass) {
+ AccessFlags mods = m->access_flags();
+ int flags = (jushort)( mods.as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS );
+ int vmindex = methodOopDesc::nonvirtual_vtable_index; // implies never any dispatch
+- klassOop mklass = m->method_holder();
+- if (receiver_limit == NULL)
+- receiver_limit = mklass;
++ bool is_itable_call = false;
++ klassOop m_klass = m->method_holder();
++ // resolved_klass is a copy of CallInfo::resolved_klass, if available
++ if (resolved_klass == NULL)
++ resolved_klass = m_klass;
+ if (m->is_initializer()) {
+ flags |= IS_CONSTRUCTOR | (JVM_REF_invokeSpecial << REFERENCE_KIND_SHIFT);
+ } else if (mods.is_static()) {
+ flags |= IS_METHOD | (JVM_REF_invokeStatic << REFERENCE_KIND_SHIFT);
+- } else if (receiver_limit != mklass &&
+- !Klass::cast(receiver_limit)->is_subtype_of(mklass)) {
++ } else if (resolved_klass != m_klass &&
++ !Klass::cast(resolved_klass)->is_subtype_of(m_klass)) {
+ return NULL; // bad receiver limit
+- } else if (Klass::cast(receiver_limit)->is_interface() &&
+- Klass::cast(mklass)->is_interface()) {
++ } else if (Klass::cast(resolved_klass)->is_interface() &&
++ Klass::cast(m_klass)->is_interface()) {
+ flags |= IS_METHOD | (JVM_REF_invokeInterface << REFERENCE_KIND_SHIFT);
+- receiver_limit = mklass; // ignore passed-in limit; interfaces are interconvertible
+ vmindex = klassItable::compute_itable_index(m);
+- } else if (mklass != receiver_limit && Klass::cast(mklass)->is_interface()) {
++ is_itable_call = true;
++ } else if (m_klass != resolved_klass && Klass::cast(m_klass)->is_interface()) {
+ flags |= IS_METHOD | (JVM_REF_invokeVirtual << REFERENCE_KIND_SHIFT);
+ // it is a miranda method, so m->vtable_index is not what we want
+ ResourceMark rm;
+- klassVtable* vt = instanceKlass::cast(receiver_limit)->vtable();
++ klassVtable* vt = instanceKlass::cast(resolved_klass)->vtable();
+ vmindex = vt->index_of_miranda(m->name(), m->signature());
+ } else if (!do_dispatch || m->can_be_statically_bound()) {
+ flags |= IS_METHOD | (JVM_REF_invokeSpecial << REFERENCE_KIND_SHIFT);
+@@ -207,10 +209,36 @@
+ vmindex = m->vtable_index();
+ }
+
++ if (vmindex >= 0 && !is_itable_call) {
++ if (Klass::cast(m_klass)->is_interface()) {
++ // This is a vtable call to an interface method (abstract "miranda method").
++ // The vtable index is meaningless without a class (not interface) receiver type, so get one.
++ // (LinkResolver should help us figure this out.)
++ KlassHandle m_klass_non_interface = resolved_klass;
++ if (m_klass_non_interface->is_interface()) {
++ m_klass_non_interface = SystemDictionary::Object_klass();
++#ifdef ASSERT
++ { ResourceMark rm;
++ methodOop m2 = m_klass_non_interface->vtable()->method_at(vmindex);
++ assert(m->name() == m2->name() && m->signature() == m2->signature(),
++ err_msg("at %d, %s != %s", vmindex,
++ m->name_and_sig_as_C_string(), m2->name_and_sig_as_C_string()));
++ }
++#endif //ASSERT
++ }
++ if (!m->is_public()) {
++ assert(m->is_public(), "virtual call must be to public interface method");
++ return NULL; // elicit an error later in product build
++ }
++ assert(Klass::cast(resolved_klass)->is_subtype_of(m_klass_non_interface()), "virtual call must be type-safe");
++ m_klass = m_klass_non_interface();
++ }
++ }
++
+ java_lang_invoke_MemberName::set_flags(mname_oop, flags);
+ java_lang_invoke_MemberName::set_vmtarget(mname_oop, m);
+ java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex); // vtable/itable index
+- java_lang_invoke_MemberName::set_clazz(mname_oop, Klass::cast(receiver_limit)->java_mirror());
++ java_lang_invoke_MemberName::set_clazz(mname_oop, Klass::cast(m_klass)->java_mirror());
+ // Note: name and type can be lazily computed by resolve_MemberName,
+ // if Java code needs them as resolved String and MethodType objects.
+ // The clazz must be eagerly stored, because it provides a GC
+@@ -571,7 +599,7 @@
+ // An unresolved member name is a mere symbolic reference.
+ // Resolving it plants a vmtarget/vmindex in it,
+ // which refers dirctly to JVM internals.
+-Handle MethodHandles::resolve_MemberName(Handle mname, TRAPS) {
++Handle MethodHandles::resolve_MemberName(Handle mname, KlassHandle caller, TRAPS) {
+ Handle empty;
+ assert(java_lang_invoke_MemberName::is_instance(mname()), "");
+
+@@ -650,21 +678,49 @@
+ if (ref_kind == JVM_REF_invokeStatic) {
+ //do_dispatch = false; // no need, since statics are never dispatched
+ LinkResolver::resolve_static_call(result,
+- defc, name, type, KlassHandle(), false, false, THREAD);
++ defc, name, type, caller, caller.not_null(), false, THREAD);
+ } else if (ref_kind == JVM_REF_invokeInterface) {
+ LinkResolver::resolve_interface_call(result, Handle(), defc,
+- defc, name, type, KlassHandle(), false, false, THREAD);
++ defc, name, type, caller, caller.not_null(), false, THREAD);
+ } else if (mh_invoke_id != vmIntrinsics::_none) {
+ assert(!is_signature_polymorphic_static(mh_invoke_id), "");
+ LinkResolver::resolve_handle_call(result,
+- defc, name, type, KlassHandle(), THREAD);
++ defc, name, type, caller, THREAD);
+ } else if (ref_kind == JVM_REF_invokeSpecial) {
+ do_dispatch = false; // force non-virtual linkage
+ LinkResolver::resolve_special_call(result,
+- defc, name, type, KlassHandle(), false, THREAD);
++ defc, name, type, caller, caller.not_null(), THREAD);
++ // CR 8029533:
++ // As a corner case, invokespecial can return a method *below* its resolved_klass.
++ // Since method search *starts* at the resolved_klass, the eventual
++ // method is almost always in a supertype *above* the resolved_klass.
++ // This pattern breaks when an invokespecial "over-reaches" beyond an
++ // immediate super to a method overridden by a super class.
++ // In that case, the selected method will be below the resolved_klass.
++ // (This is the behavior enabled by the famous ACC_SUPER classfile flag.)
++ //
++ // Downstream of this code, we make assumptions about resolved_klass being below m.
++ // (See init_method_MemberName, the comment "bad receiver limit".)
++ // We basically want to patch result._resolved_klass to be m.method_holder().
++ // The simplest way to get this happier outcome is to re-resolve.
++ if (!HAS_PENDING_EXCEPTION &&
++ caller.not_null() &&
++ result.resolved_method().not_null()) {
++ // this is the m_klass value that will be checked later:
++ klassOop m_klass = result.resolved_method()->method_holder();
++ if (m_klass != result.resolved_klass()() &&
++ Klass::cast(m_klass)->is_subtype_of(result.resolved_klass()())) {
++ KlassHandle adjusted_defc(THREAD, m_klass);
++ LinkResolver::resolve_special_call(result,
++ adjusted_defc, name, type, caller, caller.not_null(), THREAD);
++ assert(HAS_PENDING_EXCEPTION // if there is something like an OOM, pass it up to caller
++ || result.resolved_method()->method_holder() == adjusted_defc(),
++ "same method, different resolved_klass");
++ }
++ }
+ } else if (ref_kind == JVM_REF_invokeVirtual) {
+ LinkResolver::resolve_virtual_call(result, Handle(), defc,
+- defc, name, type, KlassHandle(), false, false, THREAD);
++ defc, name, type, caller, caller.not_null(), false, THREAD);
+ } else {
+ assert(false, err_msg("ref_kind=%d", ref_kind));
+ }
+@@ -681,7 +737,7 @@
+ assert(!HAS_PENDING_EXCEPTION, "");
+ if (name == vmSymbols::object_initializer_name()) {
+ LinkResolver::resolve_special_call(result,
+- defc, name, type, KlassHandle(), false, THREAD);
++ defc, name, type, caller, caller.not_null(), THREAD);
+ } else {
+ break; // will throw after end of switch
+ }
+@@ -1025,7 +1081,12 @@
+ if (VerifyMethodHandles && caller_jh != NULL &&
+ java_lang_invoke_MemberName::clazz(mname()) != NULL) {
+ klassOop reference_klass = java_lang_Class::as_klassOop(java_lang_invoke_MemberName::clazz(mname()));
+- if (reference_klass != NULL) {
++ if (reference_klass != NULL && Klass::cast(reference_klass)->oop_is_objArray()) {
++ reference_klass = objArrayKlass::cast(reference_klass)->bottom_klass();
++ }
++
++ // Reflection::verify_class_access can only handle instance classes.
++ if (reference_klass != NULL && Klass::cast(reference_klass)->oop_is_instance()) {
+ // Emulate LinkResolver::check_klass_accessability.
+ klassOop caller = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(caller_jh));
+ if (!Reflection::verify_class_access(caller,
+@@ -1036,7 +1097,11 @@
+ }
+ }
+
+- Handle resolved = MethodHandles::resolve_MemberName(mname, CHECK_NULL);
++ KlassHandle caller(THREAD,
++ caller_jh == NULL ? (klassOop) NULL :
++ java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(caller_jh)));
++ Handle resolved = MethodHandles::resolve_MemberName(mname, caller, CHECK_NULL);
++
+ if (resolved.is_null()) {
+ 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 Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/src/share/vm/prims/methodHandles.hpp Thu Dec 19 09:00:51 2013 -0800
+@@ -51,12 +51,12 @@
+
+ public:
+ // working with member names
+- static Handle resolve_MemberName(Handle mname, TRAPS); // compute vmtarget/vmindex from name/type
++ static Handle resolve_MemberName(Handle mname, KlassHandle caller, TRAPS); // compute vmtarget/vmindex from name/type
+ static void expand_MemberName(Handle mname, int suppress, TRAPS); // expand defc/name/type if missing
+ static Handle new_MemberName(TRAPS); // must be followed by init_MemberName
+ static oop init_MemberName(oop mname_oop, oop target_oop); // compute vmtarget/vmindex from target
+ static oop init_method_MemberName(oop mname_oop, methodOop m, bool do_dispatch,
+- klassOop receiver_limit);
++ klassOop resolved_klass);
+ static oop init_field_MemberName(oop mname_oop, klassOop field_holder,
+ AccessFlags mods, oop type, oop name,
+ intptr_t offset, bool is_setter = false);
+--- ./hotspot/src/share/vm/runtime/os.cpp Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/src/share/vm/runtime/os.cpp Thu Dec 19 09:00:51 2013 -0800
+@@ -1139,9 +1139,6 @@
+ "%/lib/jce.jar:"
+ "%/lib/charsets.jar:"
+ "%/lib/jfr.jar:"
+-#ifdef __APPLE__
+- "%/lib/JObjC.jar:"
+-#endif
+ "%/classes";
+ char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
+ if (sysclasspath == NULL) return false;
+--- ./hotspot/src/share/vm/runtime/reflection.cpp Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/src/share/vm/runtime/reflection.cpp Thu Dec 19 09:00:51 2013 -0800
+@@ -460,7 +460,7 @@
+ // doesn't have a classloader.
+ if ((current_class == NULL) ||
+ (current_class == new_class) ||
+- (instanceKlass::cast(new_class)->is_public()) ||
++ (Klass::cast(new_class)->is_public()) ||
+ is_same_class_package(current_class, new_class)) {
+ return true;
+ }
+--- ./hotspot/src/share/vm/services/gcNotifier.cpp Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/src/share/vm/services/gcNotifier.cpp Thu Dec 19 09:00:51 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, 2012, 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
+@@ -209,11 +209,11 @@
+ GCNotificationRequest *request = getRequest();
+ if (request != NULL) {
+ NotificationMark nm(request);
+- Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, THREAD);
++ Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, CHECK);
+
+- Handle objName = java_lang_String::create_from_platform_dependent_str(request->gcManager->name(), CHECK);
+- Handle objAction = java_lang_String::create_from_platform_dependent_str(request->gcAction, CHECK);
+- Handle objCause = java_lang_String::create_from_platform_dependent_str(request->gcCause, CHECK);
++ Handle objName = java_lang_String::create_from_str(request->gcManager->name(), CHECK);
++ Handle objAction = java_lang_String::create_from_str(request->gcAction, CHECK);
++ Handle objCause = java_lang_String::create_from_str(request->gcCause, CHECK);
+
+ klassOop k = Management::sun_management_GarbageCollectorImpl_klass(CHECK);
+ instanceKlassHandle gc_mbean_klass(THREAD, k);
+--- ./hotspot/src/share/vm/utilities/vmError.cpp Tue Oct 08 09:06:48 2013 -0700
++++ ./hotspot/src/share/vm/utilities/vmError.cpp Thu Dec 19 09:00:51 2013 -0800
+@@ -698,6 +698,18 @@
+ st->cr();
+ }
+
++#ifdef LINUX
++ STEP(193, "(printing large pages allocation errors)")
++
++ if (_verbose) {
++ jint largepage_failures = os::Linux::num_largepage_commit_fails;
++ if (largepage_failures > 0) {
++ st->print_cr("Large page allocation failures have occurred " INT32_FORMAT " times", largepage_failures);
++ st->cr();
++ }
++ }
++#endif
++
+ STEP(195, "(printing code cache information)" )
+
+ if (_verbose && Universe::is_fully_initialized()) {
+--- ./jaxp/.hgtags Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/.hgtags Thu Dec 19 09:01:08 2013 -0800
+@@ -359,6 +359,8 @@
+ 66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42
+ c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43
+ 91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60
++c500d4ec41ff2117eabfa33e640b6df2f21deb3d jdk7u40-b61
++9e3f8ab9d17be6b1a4a097fcc5bc5412013d3e86 jdk7u40-b62
+ 1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01
+ 72b314bf2ee171bec2157f737ba3bf77fbdf1118 jdk7u45-b02
+ 399c58bf22ad35a3527a286123497615100746b2 jdk7u45-b03
+@@ -377,3 +379,19 @@
+ 0a8b95184728548be4b20876e05f76e0262e4195 jdk7u45-b16
+ 2586d303503b5bb6fd39dc0ce572d6e858caf41c jdk7u45-b17
+ 4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18
++a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30
++3c34f244296e98d8ebb94973c752f3395612391a jdk7u45-b31
++0a8b95184728548be4b20876e05f76e0262e4195 jdk7u51-b00
++2450ace952f45202e5a3fd4f6a8356a196fe029e jdk7u51-b01
++68def851cc6b17944756f1986734b323d8569571 jdk7u51-b02
++0df316a3b3111427500a86f3282293dd566ae936 jdk7u51-b03
++42be8e6266ab1733a890b21cf6cd6c2e1a48972d jdk7u51-b04
++0655a95d16094971df14171e1c5f841c3a6bd081 jdk7u51-b05
++13a15fc9b6bf7ac065958e038648fbe9952fd9fa jdk7u51-b06
++8e4523e579bf86e514b9c82843b440cb79606b41 jdk7u51-b07
++783ceae9b7369168216d5344475d92de910351e8 jdk7u51-b08
++7875c882a7516366147bffcaaea550c4089f2fc7 jdk7u51-b09
++65798d05674dc9453c5935c018d012b11c8697f8 jdk7u51-b10
++70b5691c44d2830efd4301856e6223fa43894462 jdk7u51-b11
++807946db29f42477e8d8390be01c7e27280bc85c jdk7u51-b12
++114654a331e2f97a048d7ed43d06d7512e20e2c1 jdk7u51-b13
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java Thu Dec 19 09:01:08 2013 -0800
+@@ -52,6 +52,8 @@
+ */
+ public class ExsltStrings extends ExsltBase
+ {
++ static final String JDK_DEFAULT_DOM = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
++
+ /**
+ * The str:align function aligns a string within another string.
+ * <p>
+@@ -225,7 +227,7 @@
+ token = str.substring(fromIndex);
+ }
+
+- Document doc = DocumentHolder.m_doc;
++ Document doc = getDocument();
+ synchronized (doc)
+ {
+ Element element = doc.createElement("token");
+@@ -289,7 +291,7 @@
+ {
+ StringTokenizer lTokenizer = new StringTokenizer(toTokenize, delims);
+
+- Document doc = DocumentHolder.m_doc;
++ Document doc = getDocument();
+ synchronized (doc)
+ {
+ while (lTokenizer.hasMoreTokens())
+@@ -305,7 +307,7 @@
+ else
+ {
+
+- Document doc = DocumentHolder.m_doc;
++ Document doc = getDocument();
+ synchronized (doc)
+ {
+ for (int i = 0; i < toTokenize.length(); i++)
+@@ -327,31 +329,23 @@
+ {
+ return tokenize(toTokenize, " \t\n\r");
+ }
++
+ /**
+- * This class is not loaded until first referenced (see Java Language
+- * Specification by Gosling/Joy/Steele, section 12.4.1)
+- *
+- * The static members are created when this class is first referenced, as a
+- * lazy initialization not needing checking against null or any
+- * synchronization.
+- *
++ * @return an instance of DOM Document
+ */
+- private static class DocumentHolder
+- {
+- // Reuse the Document object to reduce memory usage.
+- private static final Document m_doc;
+- static {
+- try
+- {
+- m_doc =DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
++ private static Document getDocument()
++ {
++ try
++ {
++ if (System.getSecurityManager() == null) {
++ return DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
++ } else {
++ return DocumentBuilderFactory.newInstance(JDK_DEFAULT_DOM, null).newDocumentBuilder().newDocument();
+ }
+-
+- catch(ParserConfigurationException pce)
+- {
+- throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
+- }
+-
++ }
++ catch(ParserConfigurationException pce)
++ {
++ throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
+ }
+ }
+-
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java Thu Dec 19 09:01:08 2013 -0800
+@@ -56,6 +56,7 @@
+ */
+ public class Extensions
+ {
++ static final String JDK_DEFAULT_DOM = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
+ /**
+ * Constructor Extensions
+ *
+@@ -114,23 +115,14 @@
+
+ // This no longer will work right since the DTM.
+ // Document myDoc = myProcessor.getContextNode().getOwnerDocument();
+- try
+- {
+- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+- DocumentBuilder db = dbf.newDocumentBuilder();
+- Document myDoc = db.newDocument();
++ Document myDoc = getDocument();
+
+- Text textNode = myDoc.createTextNode(textNodeValue);
+- DocumentFragment docFrag = myDoc.createDocumentFragment();
++ Text textNode = myDoc.createTextNode(textNodeValue);
++ DocumentFragment docFrag = myDoc.createDocumentFragment();
+
+- docFrag.appendChild(textNode);
++ docFrag.appendChild(textNode);
+
+- return new NodeSet(docFrag);
+- }
+- catch(ParserConfigurationException pce)
+- {
+- throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
+- }
++ return new NodeSet(docFrag);
+ }
+ }
+
+@@ -249,8 +241,7 @@
+ public static NodeList tokenize(String toTokenize, String delims)
+ {
+
+- Document doc = DocumentHolder.m_doc;
+-
++ Document doc = getDocument();
+
+ StringTokenizer lTokenizer = new StringTokenizer(toTokenize, delims);
+ NodeSet resultSet = new NodeSet();
+@@ -308,17 +299,7 @@
+ public static Node checkEnvironment(ExpressionContext myContext)
+ {
+
+- Document factoryDocument;
+- try
+- {
+- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+- DocumentBuilder db = dbf.newDocumentBuilder();
+- factoryDocument = db.newDocument();
+- }
+- catch(ParserConfigurationException pce)
+- {
+- throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
+- }
++ Document factoryDocument = getDocument();
+
+ Node resultNode = null;
+ try
+@@ -391,30 +372,21 @@
+ }
+
+ /**
+- * This class is not loaded until first referenced (see Java Language
+- * Specification by Gosling/Joy/Steele, section 12.4.1)
+- *
+- * The static members are created when this class is first referenced, as a
+- * lazy initialization not needing checking against null or any
+- * synchronization.
+- *
++ * @return an instance of DOM Document
+ */
+- private static class DocumentHolder
+- {
+- // Reuse the Document object to reduce memory usage.
+- private static final Document m_doc;
+- static
++ private static Document getDocument()
++ {
++ try
+ {
+- try
+- {
+- m_doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
++ if (System.getSecurityManager() == null) {
++ return DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
++ } else {
++ return DocumentBuilderFactory.newInstance(JDK_DEFAULT_DOM, null).newDocumentBuilder().newDocument();
+ }
+-
+- catch(ParserConfigurationException pce)
+- {
+- throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
+- }
+-
++ }
++ catch(ParserConfigurationException pce)
++ {
++ throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
+ }
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Thu Dec 19 09:01:08 2013 -0800
+@@ -44,6 +44,7 @@
+ import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
+ import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
+ import com.sun.org.apache.xerces.internal.impl.Constants;
++import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.xml.internal.stream.Entity;
+
+@@ -262,6 +263,11 @@
+ fEntityManager.startDTDEntity(inputSource);
+ } // setInputSource(XMLInputSource)
+
++
++ public void setLimitAnalyzer(XMLLimitAnalyzer limitAnalyzer) {
++ fLimitAnalyzer = limitAnalyzer;
++ }
++
+ /**
+ * Scans the external subset of the document.
+ *
+@@ -1625,10 +1631,10 @@
+ XMLString literal = fString;
+ XMLString literal2 = fString;
+ int countChar = 0;
+- if (fLimitAnalyzer == null && fSecurityManager != null) {
+- fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
++ if (fLimitAnalyzer == null ) {
++ fLimitAnalyzer = new XMLLimitAnalyzer();
++ }
+ fLimitAnalyzer.startEntity(entityName);
+- }
+
+ if (fEntityScanner.scanLiteral(quote, fString) != quote) {
+ fStringBuffer.clear();
+@@ -2145,6 +2151,8 @@
+ // set starting state
+ setScannerState(SCANNER_STATE_TEXT_DECL);
+ //new SymbolTable());
++
++ fLimitAnalyzer = new XMLLimitAnalyzer();
+ }
+
+ /**
+@@ -2164,18 +2172,18 @@
+ */
+ private void checkLimit(String entityName, int len) {
+ if (fLimitAnalyzer == null) {
+- fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
++ fLimitAnalyzer = new XMLLimitAnalyzer();
+ }
+ fLimitAnalyzer.addValue(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT, entityName, len);
+- if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT)) {
+- fSecurityManager.debugPrint();
++ if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT, fLimitAnalyzer)) {
++ fSecurityManager.debugPrint(fLimitAnalyzer);
+ reportFatalError("MaxEntitySizeLimit", new Object[]{entityName,
+ fLimitAnalyzer.getValue(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getLimit(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getStateLiteral(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT)});
+ }
+- if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT)) {
+- fSecurityManager.debugPrint();
++ if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT, fLimitAnalyzer)) {
++ fSecurityManager.debugPrint(fLimitAnalyzer);
+ reportFatalError("TotalEntitySizeLimit",
+ new Object[]{fLimitAnalyzer.getTotalValue(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getLimit(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT),
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Thu Dec 19 09:01:08 2013 -0800
+@@ -569,32 +569,13 @@
+
+ // xerces features
+ fReportCdataEvent = componentManager.getFeature(Constants.STAX_REPORT_CDATA_EVENT, true);
+-
+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(Constants.SECURITY_MANAGER, null);
+- fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+-
+- fElementAttributeLimit = (fSecurityManager != null)?
+- fSecurityManager.getLimit(XMLSecurityManager.Limit.ELEMENT_ATTRIBUTE_LIMIT):0;
+-
+ fNotifyBuiltInRefs = componentManager.getFeature(NOTIFY_BUILTIN_REFS, false);
+
+ Object resolver = componentManager.getProperty(ENTITY_RESOLVER, null);
+ fExternalSubsetResolver = (resolver instanceof ExternalSubsetResolver) ?
+ (ExternalSubsetResolver) resolver : null;
+
+- // initialize vars
+- fMarkupDepth = 0;
+- fCurrentElement = null;
+- fElementStack.clear();
+- fHasExternalDTD = false;
+- fStandaloneSet = false;
+- fStandalone = false;
+- fInScanContent = false;
+- //skipping algorithm
+- fShouldSkip = false;
+- fAdd = false;
+- fSkip = false;
+-
+ //attribute
+ fReadingAttributes = false;
+ //xxx: external entities are supported in Xerces
+@@ -606,9 +587,6 @@
+ // setup Driver
+ setScannerState(SCANNER_STATE_CONTENT);
+ setDriver(fContentDriver);
+- fEntityStore = fEntityManager.getEntityStore();
+-
+- dtdGrammarUtil = null;
+
+ // JAXP 1.5 features and properties
+ XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)
+@@ -617,6 +595,7 @@
+
+ fStrictURI = componentManager.getFeature(STANDARD_URI_CONFORMANT, false);
+
++ resetCommon();
+ //fEntityManager.test();
+ } // reset(XMLComponentManager)
+
+@@ -630,17 +609,7 @@
+ fNamespaces = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE)).booleanValue();
+ fNotifyBuiltInRefs = false ;
+
+- // initialize vars
+- fMarkupDepth = 0;
+- fCurrentElement = null;
+- fShouldSkip = false;
+- fAdd = false;
+- fSkip = false;
+- fElementStack.clear();
+ //fElementStack2.clear();
+- fHasExternalDTD = false;
+- fStandaloneSet = false;
+- fStandalone = false;
+ //fReplaceEntityReferences = true;
+ //fSupportExternalEntities = true;
+ Boolean bo = (Boolean)propertyManager.getProperty(XMLInputFactoryImpl.IS_REPLACING_ENTITY_REFERENCES);
+@@ -661,20 +630,43 @@
+ //we dont need to do this -- nb.
+ //setScannerState(SCANNER_STATE_CONTENT);
+ //setDriver(fContentDriver);
+- fEntityStore = fEntityManager.getEntityStore();
+ //fEntityManager.test();
+
+- dtdGrammarUtil = null;
+-
+ // JAXP 1.5 features and properties
+ XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)
+ propertyManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
+ fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
+
+ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(Constants.SECURITY_MANAGER);
+- fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
++ resetCommon();
+ } // reset(XMLComponentManager)
+
++ void resetCommon() {
++ // initialize vars
++ fMarkupDepth = 0;
++ fCurrentElement = null;
++ fElementStack.clear();
++ fHasExternalDTD = false;
++ fStandaloneSet = false;
++ fStandalone = false;
++ fInScanContent = false;
++ //skipping algorithm
++ fShouldSkip = false;
++ fAdd = false;
++ fSkip = false;
++
++ fEntityStore = fEntityManager.getEntityStore();
++ dtdGrammarUtil = null;
++
++ if (fSecurityManager != null) {
++ fElementAttributeLimit = fSecurityManager.getLimit(XMLSecurityManager.Limit.ELEMENT_ATTRIBUTE_LIMIT);
++ } else {
++ fElementAttributeLimit = 0;
++ }
++ fLimitAnalyzer = new XMLLimitAnalyzer();
++ fEntityManager.setLimitAnalyzer(fLimitAnalyzer);
++ }
++
+ /**
+ * Returns a list of feature identifiers that are recognized by
+ * this component. This method may return null if no features
+@@ -1328,7 +1320,7 @@
+ fAttributes.getLength() > fElementAttributeLimit){
+ fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
+ "ElementAttributeLimit",
+- new Object[]{rawname, new Integer(fAttributes.getLength()) },
++ new Object[]{rawname, fElementAttributeLimit },
+ XMLErrorReporter.SEVERITY_FATAL_ERROR );
+ }
+
+@@ -3163,15 +3155,15 @@
+ protected void checkLimit(XMLStringBuffer buffer) {
+ if (fLimitAnalyzer.isTracking(fCurrentEntityName)) {
+ fLimitAnalyzer.addValue(Limit.GENEAL_ENTITY_SIZE_LIMIT, fCurrentEntityName, buffer.length);
+- if (fSecurityManager.isOverLimit(Limit.GENEAL_ENTITY_SIZE_LIMIT)) {
+- fSecurityManager.debugPrint();
++ if (fSecurityManager.isOverLimit(Limit.GENEAL_ENTITY_SIZE_LIMIT, fLimitAnalyzer)) {
++ fSecurityManager.debugPrint(fLimitAnalyzer);
+ reportFatalError("MaxEntitySizeLimit", new Object[]{fCurrentEntityName,
+ fLimitAnalyzer.getValue(Limit.GENEAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getLimit(Limit.GENEAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getStateLiteral(Limit.GENEAL_ENTITY_SIZE_LIMIT)});
+ }
+- if (fSecurityManager.isOverLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT)) {
+- fSecurityManager.debugPrint();
++ if (fSecurityManager.isOverLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fLimitAnalyzer)) {
++ fSecurityManager.debugPrint(fLimitAnalyzer);
+ reportFatalError("TotalEntitySizeLimit",
+ new Object[]{fLimitAnalyzer.getTotalValue(Limit.TOTAL_ENTITY_SIZE_LIMIT),
+ fSecurityManager.getLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT),
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java Thu Dec 19 09:01:08 2013 -0800
+@@ -1090,6 +1090,8 @@
+
+ ((XMLDTDScannerImpl)fDTDScanner).reset(fPropertyManager);
+ }
++
++ fDTDScanner.setLimitAnalyzer(fLimitAnalyzer);
+ do {
+ again = false;
+ switch (fScannerState) {
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Thu Dec 19 09:01:08 2013 -0800
+@@ -1297,8 +1297,8 @@
+ if(fLimitAnalyzer != null) {
+ fLimitAnalyzer.addValue(entityExpansionIndex, name, 1);
+ }
+- if( fSecurityManager != null && fSecurityManager.isOverLimit(entityExpansionIndex)){
+- fSecurityManager.debugPrint();
++ if( fSecurityManager != null && fSecurityManager.isOverLimit(entityExpansionIndex, fLimitAnalyzer)){
++ fSecurityManager.debugPrint(fLimitAnalyzer);
+ fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,"EntityExpansionLimitExceeded",
+ new Object[]{fSecurityManager.getLimitValueByIndex(entityExpansionIndex)},
+ XMLErrorReporter.SEVERITY_FATAL_ERROR );
+@@ -1367,7 +1367,7 @@
+ if (fLimitAnalyzer != null) {
+ fLimitAnalyzer.endEntity(XMLSecurityManager.Limit.GENEAL_ENTITY_SIZE_LIMIT, fCurrentEntity.name);
+ if (fCurrentEntity.name.equals("[xml]")) {
+- fSecurityManager.debugPrint();
++ fSecurityManager.debugPrint(fLimitAnalyzer);
+ }
+ }
+ fCurrentEntity.close();
+@@ -1436,7 +1436,6 @@
+ fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
+
+ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(SECURITY_MANAGER);
+- fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+
+ // initialize state
+ //fStandalone = false;
+@@ -1498,7 +1497,6 @@
+ fStaxEntityResolver = (StaxEntityResolverWrapper)componentManager.getProperty(STAX_ENTITY_RESOLVER, null);
+ fValidationManager = (ValidationManager)componentManager.getProperty(VALIDATION_MANAGER, null);
+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER, null);
+- fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+ entityExpansionIndex = fSecurityManager.getIndex(Constants.JDK_ENTITY_EXPANSION_LIMIT);
+
+ // JAXP 1.5 feature
+@@ -1656,7 +1654,6 @@
+ if (suffixLength == Constants.SECURITY_MANAGER_PROPERTY.length() &&
+ propertyId.endsWith(Constants.SECURITY_MANAGER_PROPERTY)) {
+ fSecurityManager = (XMLSecurityManager)value;
+- fLimitAnalyzer = fSecurityManager.getLimitAnalyzer();
+ }
+ }
+
+@@ -1667,6 +1664,11 @@
+ fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
+ }
+ }
++
++ public void setLimitAnalyzer(XMLLimitAnalyzer fLimitAnalyzer) {
++ this.fLimitAnalyzer = fLimitAnalyzer;
++ }
++
+ /**
+ * Returns a list of property identifiers that are recognized by
+ * this component. This method may return null if no properties
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Thu Dec 19 09:01:08 2013 -0800
+@@ -256,7 +256,7 @@
+ fAttributes.getLength() > fElementAttributeLimit){
+ fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
+ "ElementAttributeLimit",
+- new Object[]{rawname, new Integer(fAttributes.getLength()) },
++ new Object[]{rawname, fElementAttributeLimit },
+ XMLErrorReporter.SEVERITY_FATAL_ERROR );
+ }
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties Thu Dec 19 09:01:08 2013 -0800
+@@ -261,7 +261,7 @@
+ MSG_DUPLICATE_ATTDEF = \u5C5E\u6027"{1}"\u306F\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+ MSG_ELEMENT_ALREADY_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306F\u8907\u6570\u56DE\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
+ MSG_ELEMENT_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+- MSG_GRAMMAR_NOT_FOUND = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u7121\u52B9\u3067\u3059\u3002\u69CB\u6587\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
++ MSG_GRAMMAR_NOT_FOUND = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u7121\u52B9\u3067\u3059: \u69CB\u6587\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+ MSG_ELEMENT_WITH_ID_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u8B58\u5225\u5B50"{0}"\u3092\u6301\u3064\u8981\u7D20\u304C\u5FC5\u8981\u3067\u3059\u3002
+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+ MSG_FIXED_ATTVALUE_INVALID = \u5024"{2}"\u3092\u6301\u3064\u5C5E\u6027"{1}"\u306B\u306F\u3001"{3}"\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java Thu Dec 19 09:01:08 2013 -0800
+@@ -77,7 +77,6 @@
+ }
+ }
+
+- private XMLSecurityManager securityManager;
+ /**
+ * Max value accumulated for each property
+ */
+@@ -101,8 +100,7 @@
+ * Default constructor. Establishes default values for known security
+ * vulnerabilities.
+ */
+- public XMLLimitAnalyzer(XMLSecurityManager securityManager) {
+- this.securityManager = securityManager;
++ public XMLLimitAnalyzer() {
+ values = new int[Limit.values().length];
+ totalValue = new int[Limit.values().length];
+ names = new String[Limit.values().length];
+@@ -221,7 +219,7 @@
+ }
+ }
+
+- public void debugPrint() {
++ public void debugPrint(XMLSecurityManager securityManager) {
+ Formatter formatter = new Formatter();
+ System.out.println(formatter.format("%30s %15s %15s %15s %30s",
+ "Property","Limit","Total size","Size","Entity Name"));
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java Thu Dec 19 09:01:08 2013 -0800
+@@ -148,7 +148,6 @@
+ private boolean[] isSet;
+
+
+- private XMLLimitAnalyzer limitAnalyzer;
+ /**
+ * Index of the special entityCountInfo property
+ */
+@@ -169,7 +168,6 @@
+ * @param secureProcessing
+ */
+ public XMLSecurityManager(boolean secureProcessing) {
+- limitAnalyzer = new XMLLimitAnalyzer(this);
+ values = new int[Limit.values().length];
+ states = new State[Limit.values().length];
+ isSet = new boolean[Limit.values().length];
+@@ -249,13 +247,15 @@
+ if (index == indexEntityCountInfo) {
+ printEntityCountInfo = (String)value;
+ } else {
+- int temp = 0;
+- try {
++ int temp;
++ if (Integer.class.isAssignableFrom(value.getClass())) {
++ temp = ((Integer)value).intValue();
++ } else {
+ temp = Integer.parseInt((String) value);
+ if (temp < 0) {
+ temp = 0;
+ }
+- } catch (NumberFormatException e) {}
++ }
+ setLimit(index, state, temp);
+ }
+ }
+@@ -387,8 +387,9 @@
+ * @param size the size (count or length) of the entity
+ * @return true if the size is over the limit, false otherwise
+ */
+- public boolean isOverLimit(Limit limit, String entityName, int size) {
+- return isOverLimit(limit.ordinal(), entityName, size);
++ public boolean isOverLimit(Limit limit, String entityName, int size,
++ XMLLimitAnalyzer limitAnalyzer) {
++ return isOverLimit(limit.ordinal(), entityName, size, limitAnalyzer);
+ }
+
+ /**
+@@ -400,7 +401,8 @@
+ * @param size the size (count or length) of the entity
+ * @return true if the size is over the limit, false otherwise
+ */
+- public boolean isOverLimit(int index, String entityName, int size) {
++ public boolean isOverLimit(int index, String entityName, int size,
++ XMLLimitAnalyzer limitAnalyzer) {
+ if (values[index] == NO_LIMIT) {
+ return false;
+ }
+@@ -418,11 +420,11 @@
+ * @param size the size (count or length) of the entity
+ * @return true if the size is over the limit, false otherwise
+ */
+- public boolean isOverLimit(Limit limit) {
+- return isOverLimit(limit.ordinal());
++ public boolean isOverLimit(Limit limit, XMLLimitAnalyzer limitAnalyzer) {
++ return isOverLimit(limit.ordinal(), limitAnalyzer);
+ }
+
+- public boolean isOverLimit(int index) {
++ public boolean isOverLimit(int index, XMLLimitAnalyzer limitAnalyzer) {
+ if (values[index] == NO_LIMIT) {
+ return false;
+ }
+@@ -436,29 +438,12 @@
+ }
+ }
+
+- public void debugPrint() {
++ public void debugPrint(XMLLimitAnalyzer limitAnalyzer) {
+ if (printEntityCountInfo.equals(Constants.JDK_YES)) {
+- limitAnalyzer.debugPrint();
++ limitAnalyzer.debugPrint(this);
+ }
+ }
+
+- /**
+- * Return the limit analyzer
+- *
+- * @return the limit analyzer
+- */
+- public XMLLimitAnalyzer getLimitAnalyzer() {
+- return limitAnalyzer;
+- }
+-
+- /**
+- * Set limit analyzer
+- *
+- * @param analyzer a limit analyzer
+- */
+- public void setLimitAnalyzer(XMLLimitAnalyzer analyzer) {
+- limitAnalyzer = analyzer;
+- }
+
+ /**
+ * Indicate if a property is set explicitly
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java Thu Dec 19 09:01:08 2013 -0800
+@@ -20,6 +20,7 @@
+
+ package com.sun.org.apache.xerces.internal.xni.parser;
+
++import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
+ import java.io.IOException;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+
+@@ -95,4 +96,5 @@
+ public boolean scanDTDExternalSubset(boolean complete)
+ throws IOException, XNIException;
+
++ public void setLimitAnalyzer(XMLLimitAnalyzer limitAnalyzer);
+ } // interface XMLDTDScanner
+--- ./jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java Thu Dec 19 09:01:08 2013 -0800
+@@ -24,20 +24,17 @@
+ package com.sun.org.apache.xml.internal.resolver;
+
+ import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
++import com.sun.org.apache.xml.internal.resolver.helpers.BootstrapResolver;
++import com.sun.org.apache.xml.internal.resolver.helpers.Debug;
+ import java.io.InputStream;
+-
++import java.net.MalformedURLException;
+ import java.net.URL;
+-import java.net.MalformedURLException;
+-
+ import java.util.MissingResourceException;
+ import java.util.PropertyResourceBundle;
+ import java.util.ResourceBundle;
+ import java.util.StringTokenizer;
+ import java.util.Vector;
+-
+-import com.sun.org.apache.xml.internal.resolver.helpers.Debug;
+-import com.sun.org.apache.xml.internal.resolver.helpers.BootstrapResolver;
+-import com.sun.org.apache.xml.internal.resolver.Catalog;
++import sun.reflect.misc.ReflectUtil;
+
+ /**
+ * CatalogManager provides an interface to the catalog properties.
+@@ -687,7 +684,7 @@
+ catalog = new Catalog();
+ } else {
+ try {
+- catalog = (Catalog) Class.forName(catalogClassName).newInstance();
++ catalog = (Catalog) ReflectUtil.forName(catalogClassName).newInstance();
+ } catch (ClassNotFoundException cnfe) {
+ debug.message(1,"Catalog class named '"
+ + catalogClassName
+--- ./jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java Thu Dec 19 09:01:08 2013 -0800
+@@ -23,24 +23,21 @@
+
+ package com.sun.org.apache.xml.internal.resolver.readers;
+
+-import java.util.Hashtable;
++import com.sun.org.apache.xml.internal.resolver.Catalog;
++import com.sun.org.apache.xml.internal.resolver.CatalogException;
++import com.sun.org.apache.xml.internal.resolver.helpers.Namespaces;
+ import java.io.IOException;
+ import java.io.InputStream;
++import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.net.URLConnection;
+-import java.net.MalformedURLException;
+-
++import java.util.Hashtable;
++import javax.xml.parsers.DocumentBuilder;
+ import javax.xml.parsers.DocumentBuilderFactory;
+-import javax.xml.parsers.DocumentBuilder;
+ import javax.xml.parsers.ParserConfigurationException;
+-
+-import com.sun.org.apache.xml.internal.resolver.Catalog;
+-import com.sun.org.apache.xml.internal.resolver.CatalogException;
+-import com.sun.org.apache.xml.internal.resolver.readers.CatalogReader;
+-import com.sun.org.apache.xml.internal.resolver.helpers.Namespaces;
+-
++import org.w3c.dom.*;
+ import org.xml.sax.SAXException;
+-import org.w3c.dom.*;
++import sun.reflect.misc.ReflectUtil;
+
+ /**
+ * A DOM-based CatalogReader.
+@@ -199,7 +196,7 @@
+ DOMCatalogParser domParser = null;
+
+ try {
+- domParser = (DOMCatalogParser) Class.forName(domParserClass).newInstance();
++ domParser = (DOMCatalogParser) ReflectUtil.forName(domParserClass).newInstance();
+ } catch (ClassNotFoundException cnfe) {
+ 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 Tue Oct 08 09:06:57 2013 -0700
++++ ./jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java Thu Dec 19 09:01:08 2013 -0800
+@@ -23,19 +23,21 @@
+
+ package com.sun.org.apache.xml.internal.resolver.readers;
+
+-import java.util.Hashtable;
++import com.sun.org.apache.xml.internal.resolver.Catalog;
++import com.sun.org.apache.xml.internal.resolver.CatalogException;
++import com.sun.org.apache.xml.internal.resolver.CatalogManager;
++import com.sun.org.apache.xml.internal.resolver.helpers.Debug;
++import java.io.FileNotFoundException;
+ import java.io.IOException;
+-import java.io.FileNotFoundException;
+ import java.io.InputStream;
++import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.net.URLConnection;
+-import java.net.MalformedURLException;
+ import java.net.UnknownHostException;
+-
++import java.util.Hashtable;
+ import javax.xml.parsers.ParserConfigurationException;
++import javax.xml.parsers.SAXParser;
+ import javax.xml.parsers.SAXParserFactory;
+-import javax.xml.parsers.SAXParser;
+-
+ import org.xml.sax.AttributeList;
+ import org.xml.sax.Attributes;
+ import org.xml.sax.ContentHandler;
+@@ -45,12 +47,7 @@
+ import org.xml.sax.Locator;
+ import org.xml.sax.Parser;
+ import org.xml.sax.SAXException;
+-
+-import com.sun.org.apache.xml.internal.resolver.Catalog;
+-import com.sun.org.apache.xml.internal.resolver.CatalogManager;
+-import com.sun.org.apache.xml.internal.resolver.CatalogException;
+-import com.sun.org.apache.xml.internal.resolver.readers.CatalogReader;
+-import com.sun.org.apache.xml.internal.resolver.helpers.Debug;
++import sun.reflect.misc.ReflectUtil;
+
+ /**
+ * A SAX-based CatalogReader.
+@@ -246,7 +243,7 @@
+ }
+ parser.parse(new InputSource(is), spHandler);
+ } else {
+- Parser parser = (Parser) Class.forName(parserClass).newInstance();
++ Parser parser = (Parser) ReflectUtil.forName(parserClass).newInstance();
+ parser.setDocumentHandler(this);
+ if (bResolver != null) {
+ parser.setEntityResolver(bResolver);
+@@ -352,7 +349,7 @@
+
+ try {
+ saxParser = (SAXCatalogParser)
+- Class.forName(saxParserClass).newInstance();
++ ReflectUtil.forName(saxParserClass).newInstance();
+
+ saxParser.setCatalog(catalog);
+ saxParser.startDocument();
+@@ -413,7 +410,7 @@
+
+ try {
+ saxParser = (SAXCatalogParser)
+- Class.forName(saxParserClass).newInstance();
++ ReflectUtil.forName(saxParserClass).newInstance();
+
+ saxParser.setCatalog(catalog);
+ saxParser.startDocument();
+--- ./jaxws/.hgtags Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/.hgtags Thu Dec 19 09:01:10 2013 -0800
+@@ -359,6 +359,8 @@
+ 89f6c9663d75d9e4b672aed16f885b84232e9c93 jdk7u40-b42
+ 3ee85b3793de16855e20272336a3565af8477b6b jdk7u40-b43
+ cbeef786ce489096c39ec5effee4f8f9e770b4af jdk7u40-b60
++4ee34d2cf2d84d0e1f5f20381ade525665ae424c jdk7u40-b61
++b42a4cb742cf76f6c02d105349a7e8111ab8d68b jdk7u40-b62
+ 000becfcb945d8592cfdef6ef1704b532af56762 jdk7u45-b01
+ 817632baca26f7566e36c7708455494c15113d88 jdk7u45-b02
+ f65baba9400aec6cb29bc06b3139623bb4663225 jdk7u45-b03
+@@ -377,3 +379,19 @@
+ 5524cced32d3959d95ed414add230273bc10c38d jdk7u45-b16
+ a8baf22b5972e269a97f7b3b7eec2ad63a8c5aed jdk7u45-b17
+ 65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18
++c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30
++6802a1c098c48b2c8336e06f1565254759025bab jdk7u45-b31
++5524cced32d3959d95ed414add230273bc10c38d jdk7u51-b00
++db9e3328f393313e52cbf3fee5236aa2429028d0 jdk7u51-b01
++92a4787cb3617005a329fb49247c550e8d7eb47a jdk7u51-b02
++2240523feb968d7921e22f6730c299246a4125d0 jdk7u51-b03
++c4f7cc35e47a4db7f380d62127dd2b49713f5552 jdk7u51-b04
++f8f0617c0310b638855add08df58c5b9cd7e2dcb jdk7u51-b05
++49fc29e8890c52e771beb3fd9bf3cbb9ecbf5f5e jdk7u51-b06
++da128632f015df99d0f6a53547484dbe44f722fb jdk7u51-b07
++71a314d55844bd6fe18aed56ce065b8df5c5cb82 jdk7u51-b08
++3b53d5ea0aec473b637cd0e49f227304bac848a7 jdk7u51-b09
++53a566a724e59f31bbd25a6a21f0f36adb36e82b jdk7u51-b10
++708507f4795cad1f0cf7e19ff2dc16fe9d441754 jdk7u51-b11
++7c7c2ea4b6808d0abf7fd48d11440d75b0c08d3a jdk7u51-b12
++81a1b110f70c37d2c2f0de7c0ef3bd2d04aba475 jdk7u51-b13
+--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -71,8 +71,7 @@
+ *
+ * @author Kohsuke Kawaguchi (kk@kohsuke.org)
+ */
+-public class APTNavigator implements Navigator<TypeMirror,TypeDeclaration,FieldDeclaration,MethodDeclaration> {
+-
++public final class APTNavigator implements Navigator<TypeMirror,TypeDeclaration,FieldDeclaration,MethodDeclaration> {
+ private final AnnotationProcessorEnvironment env;
+
+ private final PrimitiveType primitiveByte;
+@@ -277,8 +276,9 @@
+ return clazz.getPackage().getQualifiedName();
+ }
+
+- public TypeDeclaration findClass(String className, TypeDeclaration referencePoint) {
+- return env.getTypeDeclaration(className);
++ @Override
++ public TypeDeclaration loadObjectFactory(TypeDeclaration referencePoint, String packageName) {
++ return env.getTypeDeclaration(packageName + ".ObjectFactory");
+ }
+
+ public boolean isBridgeMethod(MethodDeclaration method) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -30,7 +30,6 @@
+ import com.sun.codemodel.internal.JType;
+ import com.sun.tools.internal.xjc.outline.Aspect;
+ import com.sun.tools.internal.xjc.outline.Outline;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+
+ /**
+ * @author Kohsuke Kawaguchi
+@@ -69,6 +68,6 @@
+ }
+
+ public String fullName() {
+- return Navigator.REFLECTION.getTypeName(t);
++ return Utils.REFLECTION_NAVIGATOR.getTypeName(t);
+ }
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -56,7 +56,7 @@
+ EagerNType ent = (EagerNType) nt;
+ if (base instanceof EagerNClass) {
+ EagerNClass enc = (EagerNClass) base;
+- return create(REFLECTION.getBaseClass(ent.t, enc.c));
++ return create(Utils.REFLECTION_NAVIGATOR.getBaseClass(ent.t, enc.c));
+ }
+ // lazy class can never be a base type of an eager type
+ return null;
+@@ -176,7 +176,7 @@
+ public NType getTypeArgument(NType nt, int i) {
+ if (nt instanceof EagerNType) {
+ EagerNType ent = (EagerNType) nt;
+- return create(REFLECTION.getTypeArgument(ent.t,i));
++ return create(Utils.REFLECTION_NAVIGATOR.getTypeArgument(ent.t,i));
+ }
+ if (nt instanceof NClassByJClass) {
+ NClassByJClass nnt = (NClassByJClass) nt;
+@@ -189,7 +189,7 @@
+ public boolean isParameterizedType(NType nt) {
+ if (nt instanceof EagerNType) {
+ EagerNType ent = (EagerNType) nt;
+- return REFLECTION.isParameterizedType(ent.t);
++ return Utils.REFLECTION_NAVIGATOR.isParameterizedType(ent.t);
+ }
+ if (nt instanceof NClassByJClass) {
+ NClassByJClass nnt = (NClassByJClass) nt;
+@@ -303,8 +303,8 @@
+ throw new UnsupportedOperationException();
+ }
+
+- public NClass findClass(String className, NClass referencePoint) {
+- // TODO: implement this method later
++ @Override
++ public NClass loadObjectFactory(NClass referencePoint, String pkg) {
+ throw new UnsupportedOperationException();
+ }
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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. 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.model.nav;
++
++import com.sun.xml.internal.bind.v2.model.nav.Navigator;
++
++import java.lang.reflect.Field;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.lang.reflect.Type;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utils class.
++ *
++ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
++ *
++ * Has *package private* access to avoid inappropriate usage.
++ */
++/* package */ final class Utils {
++
++ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
++
++ /**
++ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
++ */
++ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++
++ static { // we statically initializing REFLECTION_NAVIGATOR property
++ Class refNav = null;
++ try {
++ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ //noinspection unchecked
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ //noinspection unchecked
++ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
++ } catch (ClassNotFoundException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("Can't find ReflectionNavigator class");
++ } catch (InvocationTargetException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
++ } catch (NoSuchMethodException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ } catch (IllegalAccessException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
++ } catch (SecurityException e) {
++ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
++ throw e;
++ }
++ }
++
++ /**
++ * private constructor to avoid util class instantiating
++ */
++ private Utils() {
++ }
++}
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -45,7 +45,6 @@
+ import com.sun.xml.internal.bind.api.impl.NameConverter;
+ import com.sun.xml.internal.bind.v2.ContextFactory;
+ import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeInfoSet;
+
+ /**
+@@ -404,7 +403,7 @@
+ * @since 2.0 FCS
+ */
+ public static @Nullable Type getBaseType(@NotNull Type type, @NotNull Class baseType) {
+- return Navigator.REFLECTION.getBaseClass(type,baseType);
++ return Utils.REFLECTION_NAVIGATOR.getBaseClass(type, baseType);
+ }
+
+
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -31,8 +31,6 @@
+
+ import javax.xml.namespace.QName;
+
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+-
+ /**
+ * A reference to a JAXB-bound type.
+ *
+@@ -104,11 +102,10 @@
+ // if we are to reinstitute this check, check JAXB annotations only
+ // assert annotations.length==0; // not designed to work with adapters.
+
+- Type base = Navigator.REFLECTION.getBaseClass(type, Collection.class);
++ Type base = Utils.REFLECTION_NAVIGATOR.getBaseClass(type, Collection.class);
+ if(base==null)
+ return this; // not a collection
+
+- return new TypeReference(tagName,
+- Navigator.REFLECTION.getTypeArgument(base,0));
++ return new TypeReference(tagName, Utils.REFLECTION_NAVIGATOR.getTypeArgument(base,0));
+ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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. 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.api;
++
++import com.sun.xml.internal.bind.v2.model.nav.Navigator;
++
++import java.lang.reflect.Field;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.lang.reflect.Type;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utils class.
++ *
++ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
++ *
++ * Has *package private* access to avoid inappropriate usage.
++ */
++/* package */ final class Utils {
++
++ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
++
++ /**
++ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
++ */
++ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++
++ static { // we statically initializing REFLECTION_NAVIGATOR property
++ Class refNav = null;
++ try {
++ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ //noinspection unchecked
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ //noinspection unchecked
++ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
++ } catch (ClassNotFoundException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("Can't find ReflectionNavigator class");
++ } catch (InvocationTargetException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
++ } catch (NoSuchMethodException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ } catch (IllegalAccessException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
++ } catch (SecurityException e) {
++ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
++ throw e;
++ }
++ }
++
++ /**
++ * private constructor to avoid util class instantiating
++ */
++ private Utils() {
++ }
++}
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Thu Dec 19 09:01:10 2013 -0800
+@@ -235,7 +235,7 @@
+ String pkg = nav.getPackageName(ci.getClazz());
+ if(!registries.containsKey(pkg)) {
+ // insert the package's object factory
+- C c = loadObjectFactory(ci, pkg);
++ C c = nav.loadObjectFactory(clazz, pkg);
+ if(c!=null)
+ addRegistry(c,(Locatable)p);
+ }
+@@ -264,15 +264,6 @@
+ return r;
+ }
+
+- private C loadObjectFactory(ClassInfoImpl<T, C, F, M> ci, String pkg) {
+- try {
+- return nav.findClass(pkg + ".ObjectFactory", ci.getClazz());
+- } catch (SecurityException ignored) {
+- // treat SecurityException in same way as ClassNotFoundException in this case
+- return null;
+- }
+- }
+-
+ /**
+ * Checks the uniqueness of the type name.
+ */
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -27,7 +27,6 @@
+
+ import java.lang.reflect.Type;
+
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
+ import com.sun.xml.internal.bind.v2.runtime.Transducer;
+
+@@ -36,7 +35,7 @@
+ */
+ final class RuntimeAnyTypeImpl extends AnyTypeImpl<Type,Class> implements RuntimeNonElement {
+ private RuntimeAnyTypeImpl() {
+- super(Navigator.REFLECTION);
++ super(Utils.REFLECTION_NAVIGATOR);
+ }
+
+ public <V> Transducer<V> getTransducer() {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -42,7 +42,6 @@
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeRef;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+ import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
+ import com.sun.xml.internal.bind.v2.runtime.Transducer;
+ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
+@@ -122,7 +121,7 @@
+ }
+
+ public Class<? extends JAXBElement> getType() {
+- return Navigator.REFLECTION.erasure(super.getType());
++ return (Class<? extends JAXBElement>) Utils.REFLECTION_NAVIGATOR.erasure(super.getType());
+ }
+
+ public RuntimeClassInfo getScope() {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -37,8 +37,6 @@
+ import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
+ import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
+ import com.sun.xml.internal.bind.v2.model.core.ID;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+-import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElementRef;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
+@@ -75,7 +73,7 @@
+ public final @Nullable JAXBContextImpl context;
+
+ public RuntimeModelBuilder(JAXBContextImpl context, RuntimeAnnotationReader annotationReader, Map<Class, Class> subclassReplacements, String defaultNamespaceRemap) {
+- super(annotationReader, Navigator.REFLECTION, subclassReplacements, defaultNamespaceRemap);
++ super(annotationReader, Utils.REFLECTION_NAVIGATOR, subclassReplacements, defaultNamespaceRemap);
+ this.context = context;
+ }
+
+@@ -109,10 +107,6 @@
+ return new RuntimeArrayInfoImpl(this, upstream, (Class)arrayType);
+ }
+
+- public ReflectionNavigator getNavigator() {
+- return (ReflectionNavigator)nav;
+- }
+-
+ @Override
+ protected RuntimeTypeInfoSetImpl createTypeInfoSet() {
+ return new RuntimeTypeInfoSetImpl(reader);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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.bind.v2.model.annotation.AnnotationReader;
+ import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
+-import com.sun.xml.internal.bind.v2.model.core.NonElement;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+-import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeInfoSet;
+
+@@ -47,7 +44,7 @@
+ */
+ final class RuntimeTypeInfoSetImpl extends TypeInfoSetImpl<Type,Class,Field,Method> implements RuntimeTypeInfoSet {
+ public RuntimeTypeInfoSetImpl(AnnotationReader<Type,Class,Field,Method> reader) {
+- super(Navigator.REFLECTION,reader,RuntimeBuiltinLeafInfoImpl.LEAVES);
++ super(Utils.REFLECTION_NAVIGATOR,reader,RuntimeBuiltinLeafInfoImpl.LEAVES);
+ }
+
+ @Override
+@@ -55,10 +52,6 @@
+ return RuntimeAnyTypeImpl.theInstance;
+ }
+
+- public ReflectionNavigator getNavigator() {
+- return (ReflectionNavigator)super.getNavigator();
+- }
+-
+ public RuntimeNonElement getTypeInfo( Type type ) {
+ return (RuntimeNonElement)super.getTypeInfo(type);
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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. 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.v2.model.impl;
++
++import com.sun.xml.internal.bind.v2.model.nav.Navigator;
++
++import java.lang.reflect.Field;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.lang.reflect.Type;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utils class.
++ *
++ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
++ *
++ * Has *package private* access to avoid inappropriate usage.
++ */
++/* package */ final class Utils {
++
++ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
++
++ /**
++ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
++ */
++ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++
++ static { // we statically initializing REFLECTION_NAVIGATOR property
++ Class refNav = null;
++ try {
++ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ //noinspection unchecked
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ //noinspection unchecked
++ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
++ } catch (ClassNotFoundException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("Can't find ReflectionNavigator class");
++ } catch (InvocationTargetException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
++ } catch (NoSuchMethodException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ } catch (IllegalAccessException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
++ } catch (SecurityException e) {
++ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
++ throw e;
++ }
++ }
++
++ /**
++ * private constructor to avoid util class instantiating
++ */
++ private Utils() {
++ }
++}
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -240,10 +240,6 @@
+ */
+ T getComponentType(T t);
+
+-
+- /** The singleton instance. */
+- public static final ReflectionNavigator REFLECTION = new ReflectionNavigator();
+-
+ /**
+ * Gets the i-th type argument from a parameterized type.
+ *
+@@ -357,14 +353,14 @@
+ String getPackageName(C clazz);
+
+ /**
+- * Finds the class/interface/enum/annotation of the given name.
++ * Finds ObjectFactory for the given referencePoint.
+ *
+ * @param referencePoint
+ * The class that refers to the specified class.
+ * @return
+ * null if not found.
+ */
+- C findClass(String className, C referencePoint);
++ C loadObjectFactory(C referencePoint, String packageName);
+
+ /**
+ * 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 Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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
+@@ -44,16 +44,19 @@
+ * {@link Navigator} implementation for {@code java.lang.reflect}.
+ *
+ */
+-public final class ReflectionNavigator implements Navigator<Type, Class, Field, Method> {
++/*package*/final class ReflectionNavigator implements Navigator<Type, Class, Field, Method> {
+
+- /**
+- * Singleton.
+- *
+- * Use {@link Navigator#REFLECTION}
+- */
+- ReflectionNavigator() {
++// ---------- Singleton -----------------
++ private static final ReflectionNavigator INSTANCE = new ReflectionNavigator();
++
++ /*package*/static ReflectionNavigator getInstance() { // accessible through reflection from Utils classes
++ return INSTANCE;
+ }
+
++ private ReflectionNavigator() {
++ }
++// ---------------------------------------
++
+ public Class getSuperClass(Class clazz) {
+ if (clazz == Object.class) {
+ return null;
+@@ -64,6 +67,7 @@
+ }
+ return sc;
+ }
++
+ private static final TypeVisitor<Type, Class> baseClassFinder = new TypeVisitor<Type, Class>() {
+
+ public Type onClass(Class c, Class sup) {
+@@ -496,7 +500,7 @@
+ c.getDeclaredConstructor();
+ return true;
+ } catch (NoSuchMethodException e) {
+- return false;
++ return false; // todo: do this WITHOUT exception throw
+ }
+ }
+
+@@ -544,13 +548,15 @@
+ }
+ }
+
+- public Class findClass(String className, Class referencePoint) {
++ @Override
++ public Class loadObjectFactory(Class referencePoint, String pkg) {
++ String clName = pkg + ".ObjectFactory";
++ ClassLoader cl = referencePoint.getClassLoader();
++ if (cl == null)
++ cl = ClassLoader.getSystemClassLoader();
++
+ try {
+- ClassLoader cl = referencePoint.getClassLoader();
+- if (cl == null) {
+- cl = ClassLoader.getSystemClassLoader();
+- }
+- return cl.loadClass(className);
++ return cl.loadClass(clName);
+ } catch (ClassNotFoundException e) {
+ return null;
+ }
+@@ -569,7 +575,7 @@
+ // class Base<T> {
+ // T getX() { ... }
+ // }
+- // to be overrided. Handling this correctly needs a careful implementation
++ // to be overriden. Handling this correctly needs a careful implementation
+
+ String name = method.getName();
+ Class[] params = method.getParameterTypes();
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -33,8 +33,6 @@
+ import javax.xml.namespace.QName;
+
+ import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
+-import com.sun.xml.internal.bind.v2.model.core.NonElement;
+-import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
+
+ /**
+ * {@link TypeInfoSet} refined for runtime.
+@@ -52,5 +50,4 @@
+ RuntimeElementInfo getElementInfo( Class scope, QName name );
+ Map<QName,? extends RuntimeElementInfo> getElementMappings( Class scope );
+ Iterable<? extends RuntimeElementInfo> getAllElements();
+- ReflectionNavigator getNavigator();
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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,7 +36,6 @@
+
+ import com.sun.xml.internal.bind.api.AccessorException;
+ import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeElementInfo;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
+ import com.sun.xml.internal.bind.v2.runtime.property.Property;
+@@ -81,10 +80,10 @@
+ this.property = PropertyFactory.create(grammar,rei.getProperty());
+
+ tagName = rei.getElementName();
+- expectedType = Navigator.REFLECTION.erasure(rei.getContentInMemoryType());
++ expectedType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(rei.getContentInMemoryType());
+ scope = rei.getScope()==null ? JAXBElement.GlobalScope.class : rei.getScope().getClazz();
+
+- Class type = Navigator.REFLECTION.erasure(rei.getType());
++ Class type = (Class) Utils.REFLECTION_NAVIGATOR.erasure(rei.getType());
+ if(type==JAXBElement.class)
+ constructor = null;
+ else {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -90,7 +90,6 @@
+ import com.sun.xml.internal.bind.v2.model.impl.RuntimeBuiltinLeafInfoImpl;
+ import com.sun.xml.internal.bind.v2.model.impl.RuntimeModelBuilder;
+ import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+-import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeArrayInfo;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeBuiltinLeafInfo;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeClassInfo;
+@@ -358,7 +357,7 @@
+ beanInfoMap.put( e.getKey(), beanInfoMap.get(e.getValue()) );
+
+ // build bridges
+- ReflectionNavigator nav = typeSet.getNavigator();
++ Navigator<Type, Class, Field, Method> nav = typeSet.getNavigator();
+
+ for (TypeReference tr : typeRefs) {
+ XmlJavaTypeAdapter xjta = tr.get(XmlJavaTypeAdapter.class);
+@@ -366,7 +365,7 @@
+ XmlList xl = tr.get(XmlList.class);
+
+ // eventually compute the in-memory type
+- Class erasedType = nav.erasure(tr.type);
++ Class erasedType = (Class) nav.erasure(tr.type);
+
+ if(xjta!=null) {
+ a = new Adapter<Type,Class>(xjta.value(),nav);
+@@ -377,7 +376,7 @@
+ }
+
+ if(a!=null) {
+- erasedType = nav.erasure(a.defaultType);
++ erasedType = (Class) nav.erasure(a.defaultType);
+ }
+
+ Name name = nameBuilder.createElementName(tr.tagName);
+@@ -873,7 +872,7 @@
+ // this is a special class we introduced for JAX-WS that we *don't* want in the schema
+ } else {
+ NonElement<Type,Class> typeInfo = getXmlType(tis,tr);
+- xsdgen.add(tr.tagName, !Navigator.REFLECTION.isPrimitive(tr.type),typeInfo);
++ xsdgen.add(tr.tagName, !tis.getNavigator().isPrimitive(tr.type),typeInfo);
+ }
+ }
+ return xsdgen;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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. 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.v2.runtime;
++
++import com.sun.xml.internal.bind.v2.model.nav.Navigator;
++
++import java.lang.reflect.Field;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.lang.reflect.Type;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utils class.
++ *
++ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
++ *
++ * Has *package private* access to avoid inappropriate usage.
++ */
++/* package */ final class Utils {
++
++ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
++
++ /**
++ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
++ */
++ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++
++ static { // we statically initializing REFLECTION_NAVIGATOR property
++ Class refNav = null;
++ try {
++ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ //noinspection unchecked
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ //noinspection unchecked
++ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
++ } catch (ClassNotFoundException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("Can't find ReflectionNavigator class");
++ } catch (InvocationTargetException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
++ } catch (NoSuchMethodException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ } catch (IllegalAccessException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
++ } catch (SecurityException e) {
++ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
++ throw e;
++ }
++ }
++
++ /**
++ * private constructor to avoid util class instantiating
++ */
++ private Utils() {
++ }
++}
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -27,7 +27,6 @@
+
+
+ import com.sun.xml.internal.bind.api.AccessorException;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
+ import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
+ import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
+@@ -49,7 +48,7 @@
+
+ assert prop.isCollection();
+ lister = Lister.create(
+- Navigator.REFLECTION.erasure(prop.getRawType()),prop.id(),prop.getAdapter());
++ Utils.REFLECTION_NAVIGATOR.erasure(prop.getRawType()),prop.id(),prop.getAdapter());
+ assert lister!=null;
+ acc = prop.getAccessor().optimize(context);
+ assert acc!=null;
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -42,7 +42,6 @@
+ import com.sun.xml.internal.bind.v2.ClassFactory;
+ import com.sun.xml.internal.bind.v2.util.QNameMap;
+ import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
+-import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeMapPropertyInfo;
+ import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
+ import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo;
+@@ -98,7 +97,8 @@
+ this.valueBeanInfo = context.getOrCreate(prop.getValueType());
+
+ // infer the implementation class
+- Class<ValueT> sig = ReflectionNavigator.REFLECTION.erasure(prop.getRawType());
++ //noinspection unchecked
++ Class<ValueT> sig = (Class<ValueT>) Utils.REFLECTION_NAVIGATOR.erasure(prop.getRawType());
+ mapImplClass = ClassFactory.inferImplClass(sig,knownImplClasses);
+ // TODO: error check for mapImplClass==null
+ // what is the error reporting path for this part of the code?
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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. 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.v2.runtime.property;
++
++import com.sun.xml.internal.bind.v2.model.nav.Navigator;
++
++import java.lang.reflect.Field;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.lang.reflect.Type;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utils class.
++ *
++ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
++ *
++ * Has *package private* access to avoid inappropriate usage.
++ */
++/* package */ final class Utils {
++
++ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
++
++ /**
++ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
++ */
++ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++
++ static { // we statically initializing REFLECTION_NAVIGATOR property
++ Class refNav = null;
++ try {
++ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ //noinspection unchecked
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ //noinspection unchecked
++ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
++ } catch (ClassNotFoundException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("Can't find ReflectionNavigator class");
++ } catch (InvocationTargetException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
++ } catch (NoSuchMethodException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ } catch (IllegalAccessException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
++ } catch (SecurityException e) {
++ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
++ throw e;
++ }
++ }
++
++ /**
++ * private constructor to avoid util class instantiating
++ */
++ private Utils() {
++ }
++}
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -48,7 +48,6 @@
+ import com.sun.xml.internal.bind.api.JAXBRIContext;
+ import com.sun.xml.internal.bind.v2.model.core.Adapter;
+ import com.sun.xml.internal.bind.v2.model.impl.RuntimeModelBuilder;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+ import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
+ import com.sun.xml.internal.bind.v2.runtime.reflect.opt.OptimizedAccessorFactory;
+ import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
+@@ -193,7 +192,7 @@
+
+ public final <T> Accessor<BeanT, T> adapt(Adapter<Type, Class> adapter) {
+ return new AdaptedAccessor<BeanT, ValueT, T>(
+- (Class<T>) Navigator.REFLECTION.erasure(adapter.defaultType),
++ (Class<T>) Utils.REFLECTION_NAVIGATOR.erasure(adapter.defaultType),
+ this,
+ adapter.adapterType);
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -51,7 +51,6 @@
+ import com.sun.xml.internal.bind.v2.TODO;
+ import com.sun.xml.internal.bind.v2.model.core.Adapter;
+ import com.sun.xml.internal.bind.v2.model.core.ID;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+ import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
+ import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Patcher;
+ import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
+@@ -116,7 +115,7 @@
+ public static <BeanT,PropT,ItemT,PackT>
+ Lister<BeanT,PropT,ItemT,PackT> create(Type fieldType,ID idness, Adapter<Type,Class> adapter) {
+
+- Class rawType = Navigator.REFLECTION.erasure(fieldType);
++ Class rawType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(fieldType);
+ Class itemType;
+
+ Lister l;
+@@ -125,9 +124,9 @@
+ l = getArrayLister(itemType);
+ } else
+ if( Collection.class.isAssignableFrom(rawType) ) {
+- Type bt = Navigator.REFLECTION.getBaseClass(fieldType,Collection.class);
++ Type bt = Utils.REFLECTION_NAVIGATOR.getBaseClass(fieldType,Collection.class);
+ if(bt instanceof ParameterizedType)
+- itemType = Navigator.REFLECTION.erasure(((ParameterizedType)bt).getActualTypeArguments()[0]);
++ itemType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)bt).getActualTypeArguments()[0]);
+ else
+ itemType = Object.class;
+ l = new CollectionLister(getImplClass(rawType));
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -39,7 +39,6 @@
+ import com.sun.xml.internal.bind.api.AccessorException;
+ import com.sun.xml.internal.bind.v2.model.core.ID;
+ import com.sun.xml.internal.bind.v2.model.impl.RuntimeModelBuilder;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElementRef;
+ import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
+ import com.sun.xml.internal.bind.v2.runtime.Name;
+@@ -144,8 +143,7 @@
+
+ if(prop.isCollection()) {
+ return new ListTransducedAccessorImpl(xducer,prop.getAccessor(),
+- Lister.create(Navigator.REFLECTION.erasure(prop.getRawType()),prop.id(),
+- prop.getAdapter()));
++ Lister.create(Utils.REFLECTION_NAVIGATOR.erasure(prop.getRawType()), prop.id(), prop.getAdapter()));
+ }
+
+ if(prop.id()==ID.IDREF)
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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. 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.v2.runtime.reflect;
++
++import com.sun.xml.internal.bind.v2.model.nav.Navigator;
++
++import java.lang.reflect.Field;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.lang.reflect.Type;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utils class.
++ *
++ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
++ *
++ * Has *package private* access to avoid inappropriate usage.
++ */
++/* package */ final class Utils {
++
++ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
++
++ /**
++ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
++ */
++ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++
++ static { // we statically initializing REFLECTION_NAVIGATOR property
++ Class refNav = null;
++ try {
++ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ //noinspection unchecked
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ //noinspection unchecked
++ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
++ } catch (ClassNotFoundException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("Can't find ReflectionNavigator class");
++ } catch (InvocationTargetException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
++ } catch (NoSuchMethodException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ } catch (IllegalAccessException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
++ } catch (SecurityException e) {
++ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
++ throw e;
++ }
++ }
++
++ /**
++ * private constructor to avoid util class instantiating
++ */
++ private Utils() {
++ }
++}
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java Thu Dec 19 09:01:10 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -59,6 +59,12 @@
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.Field;
+ import java.lang.reflect.Method;
++import java.lang.reflect.ReflectPermission;
++import java.security.AccessControlContext;
++import java.security.AccessController;
++import java.security.Permissions;
++import java.security.PrivilegedAction;
++import java.security.ProtectionDomain;
+ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.logging.Level;
+@@ -546,10 +552,40 @@
+ // ignore
+ }
+
+- try {
+- JAXB_CONTEXT = (JAXBRIContext)JAXBContext.newInstance(SOAP11Fault.class, SOAP12Fault.class);
+- } catch (JAXBException e) {
+- throw new Error(e); // this must be a bug in our code
++ JAXB_CONTEXT = createJAXBContext();
++ }
++
++ private static JAXBRIContext createJAXBContext() {
++
++ // in jdk runtime doPrivileged is necessary since JAX-WS internal classes are in restricted packages
++ if (isJDKRuntime()) {
++ Permissions permissions = new Permissions();
++ permissions.add(new RuntimePermission("accessClassInPackage.com.sun." + "xml.internal.ws.fault"));
++ permissions.add(new ReflectPermission("suppressAccessChecks"));
++ return AccessController.doPrivileged(
++ new PrivilegedAction<JAXBRIContext>() {
++ @Override
++ public JAXBRIContext run() {
++ try {
++ return (JAXBRIContext) JAXBContext.newInstance(SOAP11Fault.class, SOAP12Fault.class);
++ } catch (JAXBException e) {
++ throw new Error(e);
++ }
++ }
++ },
++ new AccessControlContext(new ProtectionDomain[]{new ProtectionDomain(null, permissions)})
++ );
++
++ } else {
++ try {
++ return (JAXBRIContext) JAXBContext.newInstance(SOAP11Fault.class, SOAP12Fault.class);
++ } catch (JAXBException e) {
++ throw new Error(e);
++ }
+ }
+ }
++
++ private static boolean isJDKRuntime() {
++ return SOAPFaultBuilder.class.getName().contains("internal");
++ }
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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
+@@ -28,7 +28,6 @@
+ import com.sun.istack.internal.NotNull;
+ import com.sun.xml.internal.bind.api.CompositeStructure;
+ import com.sun.xml.internal.bind.api.TypeReference;
+-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+ import com.sun.xml.internal.ws.api.BindingID;
+ import com.sun.xml.internal.ws.api.SOAPVersion;
+ import com.sun.xml.internal.ws.api.model.ExceptionType;
+@@ -735,7 +734,7 @@
+ //set the actual type argument of Holder in the TypeReference
+ if (isHolder) {
+ if(clazzType==Holder.class){
+- clazzType = Navigator.REFLECTION.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
++ clazzType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
+ }
+ }
+ Mode paramMode = isHolder ? Mode.INOUT : Mode.IN;
+@@ -932,7 +931,7 @@
+ //set the actual type argument of Holder in the TypeReference
+ if (isHolder) {
+ if (clazzType==Holder.class)
+- clazzType = Navigator.REFLECTION.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
++ clazzType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
+ }
+ Mode paramMode = isHolder ? Mode.INOUT : Mode.IN;
+ for (Annotation annotation : pannotations[pos]) {
+@@ -1172,7 +1171,7 @@
+ //set the actual type argument of Holder in the TypeReference
+ if (isHolder) {
+ if (clazzType==Holder.class)
+- clazzType = Navigator.REFLECTION.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
++ clazzType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
+ }
+
+ Mode paramMode = isHolder ? Mode.INOUT : Mode.IN;
+@@ -1258,14 +1257,14 @@
+ private Class getAsyncReturnType(Method method, Class returnType) {
+ if(Response.class.isAssignableFrom(returnType)){
+ Type ret = method.getGenericReturnType();
+- return Navigator.REFLECTION.erasure(((ParameterizedType)ret).getActualTypeArguments()[0]);
++ return (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)ret).getActualTypeArguments()[0]);
+ }else{
+ Type[] types = method.getGenericParameterTypes();
+ Class[] params = method.getParameterTypes();
+ int i = 0;
+ for(Class cls : params){
+ if(AsyncHandler.class.isAssignableFrom(cls)){
+- return Navigator.REFLECTION.erasure(((ParameterizedType)types[i]).getActualTypeArguments()[0]);
++ return (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)types[i]).getActualTypeArguments()[0]);
+ }
+ i++;
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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. 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.model;
++
++import com.sun.xml.internal.bind.v2.model.nav.Navigator;
++
++import java.lang.reflect.Field;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.lang.reflect.Type;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
++/**
++ * Utils class.
++ *
++ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
++ *
++ * Has *package private* access to avoid inappropriate usage.
++ */
++/* package */ final class Utils {
++
++ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
++
++ /**
++ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
++ */
++ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++
++ static { // we statically initializing REFLECTION_NAVIGATOR property
++ Class refNav = null;
++ try {
++ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ //noinspection unchecked
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ //noinspection unchecked
++ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
++ } catch (ClassNotFoundException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("Can't find ReflectionNavigator class");
++ } catch (InvocationTargetException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
++ } catch (NoSuchMethodException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ } catch (IllegalAccessException e) {
++ e.printStackTrace();
++ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
++ } catch (SecurityException e) {
++ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
++ throw e;
++ }
++ }
++
++ /**
++ * private constructor to avoid util class instantiating
++ */
++ private Utils() {
++ }
++}
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java Tue Oct 08 09:06:59 2013 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java Thu Dec 19 09:01:10 2013 -0800
+@@ -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
+@@ -61,7 +61,7 @@
+
+ private static final AbstractWrapperBeanGenerator RUNTIME_GENERATOR =
+ new RuntimeWrapperBeanGenerator(new RuntimeInlineAnnotationReader(),
+- Navigator.REFLECTION, FIELD_FACTORY);
++ Utils.REFLECTION_NAVIGATOR, FIELD_FACTORY);
+
+ private static final class RuntimeWrapperBeanGenerator extends AbstractWrapperBeanGenerator<java.lang.reflect.Type, Class, java.lang.reflect.Method, Field> {
+
+--- ./jdk/.hgtags Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/.hgtags Thu Dec 19 09:01:16 2013 -0800
+@@ -342,6 +342,8 @@
+ b479996d5c924128c3490165b592bf66a3034932 jdk7u40-b42
+ fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43
+ ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60
++e045f6a3ad1d9f7b8982418addb3803ab63458f2 jdk7u40-b61
++26cc60a250a0d333b1d5d7a9acb233ad62b2fb0b jdk7u40-b62
+ 55f01444cf58c8004df9a9634c1bd7ff87caa370 jdk7u25-b32
+ b06abd965701459a868e88af9a3e564c0301971c jdk7u45-b01
+ d23a877da2d5dad6520a268c83f183295a9e7299 jdk7u45-b02
+@@ -361,3 +363,19 @@
+ 3c9a6d9eafd31be44b0ade0354e60f5078b417a4 jdk7u45-b16
+ 3a65c1b0c6d15fb24298bcd133d7ab4baa741ae2 jdk7u45-b17
+ c5ca4daec23b5e7f99ac8d684f5016ff8bfebbb0 jdk7u45-b18
++4797f984f6c93c433aa797e9b2d8f904cf083f96 jdk7u45-b30
++8c343a783777b8728cb819938f387db0acf7f3ac jdk7u45-b31
++3c9a6d9eafd31be44b0ade0354e60f5078b417a4 jdk7u51-b00
++d76613074ff357d0664b97b4aaf99fbb65dcec47 jdk7u51-b01
++fb057871f094ebe4906ad6856326768b01a62c45 jdk7u51-b02
++6b3c195c73b051ee3c4a0ac44f050011414ab08b jdk7u51-b03
++96431826ae3a927008c56aeefa1397a33bda3e70 jdk7u51-b04
++8ee582bb96a6b79311d55a7170f42844af77a269 jdk7u51-b05
++594ae80153afaeced6acedff5d37f889a9821690 jdk7u51-b06
++7b84e6514c297861d85ed9457b2260805311d9e8 jdk7u51-b07
++40fca6b57cd81114d4aace3d0469e20274f015c3 jdk7u51-b08
++33ae35eeb5a4c04a4d05351ff68d4021e4cad752 jdk7u51-b09
++4a6e31d94b29c7115235824a6e317289819bb00f jdk7u51-b10
++f0425ecbbb0ca9d8c87c250c19e8f9524b38833d jdk7u51-b11
++f5eee4f1d5b4a1e19febc9c26c863ae853ed6d2e jdk7u51-b12
++d19a89fdfb9b959b8638441d9d396685d6c7ab7b jdk7u51-b13
+--- ./jdk/make/common/Release.gmk Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/common/Release.gmk Thu Dec 19 09:01:16 2013 -0800
+@@ -852,10 +852,6 @@
+ $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
+ -o meta-index *.jar
+ @$(CD) $(JRE_IMAGE_DIR)/lib/ext && $(java-vm-cleanup)
+-ifeq ($(PLATFORM), macosx)
+- @#install jobjc, apple mac only
+- $(CP) $(OUTPUTDIR)/JObjC.build/JObjC.jar $(JRE_IMAGE_DIR)/lib/JObjC.jar
+-endif # macosx
+ ifeq ($(PLATFORM), windows)
+ @# Remove certain *.lib files
+ $(CD) $(JRE_IMAGE_DIR)/lib && \
+--- ./jdk/make/java/Makefile Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/java/Makefile Thu Dec 19 09:01:16 2013 -0800
+@@ -57,10 +57,6 @@
+ SUBDIRS += jexec
+ endif # PLATFORM
+
+-ifeq ($(PLATFORM), macosx)
+- SUBDIRS += jobjc
+-endif # PLATFORM
+-
+ include $(BUILDDIR)/common/Subdirs.gmk
+
+ all build clean clobber::
+--- ./jdk/make/java/net/FILES_c.gmk Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/java/net/FILES_c.gmk Thu Dec 19 09:01:16 2013 -0800
+@@ -24,20 +24,21 @@
+ #
+
+ FILES_c = \
+- DatagramPacket.c \
+- InetAddress.c \
+- Inet4Address.c \
+- Inet6Address.c \
+- NetworkInterface.c \
+- InetAddressImplFactory.c \
+- Inet4AddressImpl.c \
+- Inet6AddressImpl.c \
+- SocketInputStream.c \
+- SocketOutputStream.c \
+- net_util.c \
+- net_util_md.c \
+- ResolverConfigurationImpl.c \
+- DefaultProxySelector.c
++ DatagramPacket.c \
++ InetAddress.c \
++ Inet4Address.c \
++ Inet6Address.c \
++ NetworkInterface.c \
++ InetAddressImplFactory.c \
++ Inet4AddressImpl.c \
++ Inet6AddressImpl.c \
++ SocketInputStream.c \
++ SocketOutputStream.c \
++ net_util.c \
++ net_util_md.c \
++ portconfig.c \
++ ResolverConfigurationImpl.c \
++ DefaultProxySelector.c
+
+ ifeq ($(PLATFORM), linux)
+ FILES_c += linux_close.c
+--- ./jdk/make/java/net/Makefile Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/java/net/Makefile Thu Dec 19 09:01:16 2013 -0800
+@@ -83,7 +83,8 @@
+ # Find platform specific native code
+ #
+ vpath %.c $(PLATFORM_SRC)/native/sun/net/dns $(PLATFORM_SRC)/native/sun/net/www/protocol/http/ntlm \
+- $(PLATFORM_SRC)/native/sun/net/sdp $(PLATFORM_SRC)/native/sun/net/spi
++ $(PLATFORM_SRC)/native/sun/net/sdp $(PLATFORM_SRC)/native/sun/net/spi \
++ $(PLATFORM_SRC)/native/sun/net
+
+ #
+ # Include rules
+--- ./jdk/make/java/net/mapfile-vers Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/java/net/mapfile-vers Thu Dec 19 09:01:16 2013 -0800
+@@ -26,84 +26,86 @@
+ # Define public interface.
+
+ SUNWprivate_1.1 {
+- global:
+- JNI_OnLoad;
+- Java_java_net_PlainSocketImpl_socketListen;
+- Java_java_net_PlainDatagramSocketImpl_getTTL;
+- Java_java_net_PlainDatagramSocketImpl_init;
+- Java_java_net_SocketOutputStream_socketWrite0;
+- Java_java_net_PlainSocketImpl_socketCreate;
+- Java_java_net_PlainSocketImpl_socketAvailable;
+- Java_java_net_PlainDatagramSocketImpl_join;
+- Java_java_net_PlainDatagramSocketImpl_socketGetOption;
+- Java_java_net_InetAddress_init;
+- Java_java_net_Inet4Address_init;
+- Java_java_net_Inet6Address_init;
+- Java_java_net_PlainDatagramSocketImpl_setTTL;
+- Java_java_net_PlainDatagramSocketImpl_socketSetOption;
+- Java_java_net_PlainDatagramSocketImpl_bind0;
+- Java_java_net_PlainSocketImpl_socketAccept;
+- Java_java_net_DatagramPacket_init;
+- Java_java_net_PlainDatagramSocketImpl_leave;
+- Java_java_net_SocketInputStream_socketRead0;
+- Java_java_net_InetAddressImplFactory_isIPv6Supported;
+- Java_java_net_Inet4AddressImpl_getLocalHostName;
+- Java_java_net_Inet4AddressImpl_lookupAllHostAddr;
+- Java_java_net_Inet4AddressImpl_getHostByAddr;
+- Java_java_net_Inet4AddressImpl_isReachable0;
+- Java_java_net_Inet6AddressImpl_getLocalHostName;
+- Java_java_net_Inet6AddressImpl_lookupAllHostAddr;
+- Java_java_net_Inet6AddressImpl_getHostByAddr;
+- Java_java_net_Inet6AddressImpl_isReachable0;
+- Java_java_net_NetworkInterface_init;
+- Java_java_net_NetworkInterface_getByName0;
+- Java_java_net_NetworkInterface_getByIndex0;
+- Java_java_net_NetworkInterface_getByInetAddress0;
+- Java_java_net_NetworkInterface_getAll;
+- Java_java_net_NetworkInterface_isUp0;
+- Java_java_net_NetworkInterface_isLoopback0;
+- Java_java_net_NetworkInterface_isP2P0;
+- Java_java_net_NetworkInterface_supportsMulticast0;
+- Java_java_net_NetworkInterface_getMacAddr0;
+- Java_java_net_NetworkInterface_getMTU0;
+- Java_java_net_PlainDatagramSocketImpl_send;
+- Java_java_net_PlainSocketImpl_socketClose0;
+- Java_java_net_SocketOutputStream_init;
+- Java_java_net_PlainDatagramSocketImpl_peek;
+- Java_java_net_PlainDatagramSocketImpl_peekData;
+- Java_java_net_PlainSocketImpl_socketSetOption;
+- Java_java_net_PlainSocketImpl_socketSendUrgentData;
+- Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate;
+- Java_java_net_PlainSocketImpl_socketGetOption;
+- Java_java_net_PlainDatagramSocketImpl_receive0;
+- Java_java_net_PlainDatagramSocketImpl_connect0;
+- Java_java_net_PlainDatagramSocketImpl_disconnect0;
+- Java_java_net_PlainDatagramSocketImpl_datagramSocketClose;
+- Java_java_net_PlainSocketImpl_initProto;
+- Java_java_net_PlainSocketImpl_socketBind;
+- Java_java_net_PlainSocketImpl_socketShutdown;
+- Java_java_net_SocketInputStream_init;
+- Java_java_net_PlainSocketImpl_socketConnect;
+- Java_java_net_PlainDatagramSocketImpl_getTimeToLive;
+- Java_java_net_PlainDatagramSocketImpl_setTimeToLive;
+- Java_sun_net_dns_ResolverConfigurationImpl_localDomain0;
+- Java_sun_net_dns_ResolverConfigurationImpl_fallbackDomain0;
+- Java_sun_net_sdp_SdpSupport_convert0;
+- Java_sun_net_sdp_SdpSupport_create0;
+- Java_sun_net_spi_DefaultProxySelector_init;
+- Java_sun_net_spi_DefaultProxySelector_getSystemProxy;
+- NET_AllocSockaddr;
+- NET_SockaddrToInetAddress;
++ global:
++ JNI_OnLoad;
++ Java_java_net_PlainSocketImpl_socketListen;
++ Java_java_net_PlainDatagramSocketImpl_getTTL;
++ Java_java_net_PlainDatagramSocketImpl_init;
++ Java_java_net_SocketOutputStream_socketWrite0;
++ Java_java_net_PlainSocketImpl_socketCreate;
++ Java_java_net_PlainSocketImpl_socketAvailable;
++ Java_java_net_PlainDatagramSocketImpl_join;
++ Java_java_net_PlainDatagramSocketImpl_socketGetOption;
++ Java_java_net_InetAddress_init;
++ Java_java_net_Inet4Address_init;
++ Java_java_net_Inet6Address_init;
++ Java_java_net_PlainDatagramSocketImpl_setTTL;
++ Java_java_net_PlainDatagramSocketImpl_socketSetOption;
++ Java_java_net_PlainDatagramSocketImpl_bind0;
++ Java_java_net_PlainSocketImpl_socketAccept;
++ Java_java_net_DatagramPacket_init;
++ Java_java_net_PlainDatagramSocketImpl_leave;
++ Java_java_net_SocketInputStream_socketRead0;
++ Java_java_net_InetAddressImplFactory_isIPv6Supported;
++ Java_java_net_Inet4AddressImpl_getLocalHostName;
++ Java_java_net_Inet4AddressImpl_lookupAllHostAddr;
++ Java_java_net_Inet4AddressImpl_getHostByAddr;
++ Java_java_net_Inet4AddressImpl_isReachable0;
++ Java_java_net_Inet6AddressImpl_getLocalHostName;
++ Java_java_net_Inet6AddressImpl_lookupAllHostAddr;
++ Java_java_net_Inet6AddressImpl_getHostByAddr;
++ Java_java_net_Inet6AddressImpl_isReachable0;
++ Java_java_net_NetworkInterface_init;
++ Java_java_net_NetworkInterface_getByName0;
++ Java_java_net_NetworkInterface_getByIndex0;
++ Java_java_net_NetworkInterface_getByInetAddress0;
++ Java_java_net_NetworkInterface_getAll;
++ Java_java_net_NetworkInterface_isUp0;
++ Java_java_net_NetworkInterface_isLoopback0;
++ Java_java_net_NetworkInterface_isP2P0;
++ Java_java_net_NetworkInterface_supportsMulticast0;
++ Java_java_net_NetworkInterface_getMacAddr0;
++ Java_java_net_NetworkInterface_getMTU0;
++ Java_java_net_PlainDatagramSocketImpl_send;
++ Java_java_net_PlainSocketImpl_socketClose0;
++ Java_java_net_SocketOutputStream_init;
++ Java_java_net_PlainDatagramSocketImpl_peek;
++ Java_java_net_PlainDatagramSocketImpl_peekData;
++ Java_java_net_PlainSocketImpl_socketSetOption;
++ Java_java_net_PlainSocketImpl_socketSendUrgentData;
++ Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate;
++ Java_java_net_PlainSocketImpl_socketGetOption;
++ Java_java_net_PlainDatagramSocketImpl_receive0;
++ Java_java_net_PlainDatagramSocketImpl_connect0;
++ Java_java_net_PlainDatagramSocketImpl_disconnect0;
++ Java_java_net_PlainDatagramSocketImpl_datagramSocketClose;
++ Java_java_net_PlainSocketImpl_initProto;
++ Java_java_net_PlainSocketImpl_socketBind;
++ Java_java_net_PlainSocketImpl_socketShutdown;
++ Java_java_net_SocketInputStream_init;
++ Java_java_net_PlainSocketImpl_socketConnect;
++ Java_java_net_PlainDatagramSocketImpl_getTimeToLive;
++ Java_java_net_PlainDatagramSocketImpl_setTimeToLive;
++ Java_sun_net_PortConfig_getLower0;
++ Java_sun_net_PortConfig_getUpper0;
++ Java_sun_net_dns_ResolverConfigurationImpl_localDomain0;
++ Java_sun_net_dns_ResolverConfigurationImpl_fallbackDomain0;
++ Java_sun_net_sdp_SdpSupport_convert0;
++ Java_sun_net_sdp_SdpSupport_create0;
++ Java_sun_net_spi_DefaultProxySelector_init;
++ Java_sun_net_spi_DefaultProxySelector_getSystemProxy;
++ NET_AllocSockaddr;
++ NET_SockaddrToInetAddress;
+ NET_SockaddrEqualsInetAddress;
+- NET_InetAddressToSockaddr;
+- NET_GetPortFromSockaddr;
+- NET_SetSockOpt;
+- NET_GetSockOpt;
+- NET_Bind;
+- NET_MapSocketOption;
+- NET_Wait;
++ NET_InetAddressToSockaddr;
++ NET_GetPortFromSockaddr;
++ NET_SetSockOpt;
++ NET_GetSockOpt;
++ NET_Bind;
++ NET_MapSocketOption;
++ NET_Wait;
+ ipv6_available;
+
+- local:
+- *;
++ local:
++ *;
+ };
+--- ./jdk/make/sun/javazic/tzdata/VERSION Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/VERSION Thu Dec 19 09:01:16 2013 -0800
+@@ -21,4 +21,4 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-tzdata2013d
++tzdata2013h
+--- ./jdk/make/sun/javazic/tzdata/africa Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/africa Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+@@ -474,6 +474,14 @@
+ # (either two days before them or five days after them, so as to fall on
+ # lastFri instead of lastSun).
+
++# From Even Scharning (2013-10-25):
++# The scheduled end of DST in Libya on Friday, October 25, 2013 was
++# cancelled yesterday....
++# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
++#
++# From Paul Eggert (2013-10-25):
++# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
++
+ # 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 @@
+ 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 -
+-Rule Libya 2013 max - Mar lastFri 1:00 1:00 S
+-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.
+ 2:00 - EET 1996 Sep 30
+ 1:00 Libya CE%sT 1997 Oct 4
+ 2:00 - EET 2012 Nov 10 2:00
+- 1:00 Libya CE%sT
++ 1:00 Libya CE%sT 2013 Oct 25 2:00
++ 2:00 - EET
+
+ # Madagascar
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -707,15 +717,6 @@
+ # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
+ # </a>
+
+-# From Alex Krivenyshev (2008-05-09):
+-# Is Western Sahara (part which administrated by Morocco) going to follow
+-# Morocco DST changes? Any information? What about other part of
+-# Western Sahara - under administration of POLISARIO Front (also named
+-# SADR Saharawi Arab Democratic Republic)?
+-
+-# From Arthur David Olson (2008-05-09):
+-# XXX--guess that it is only Morocco for now; guess only 2008 for now.
+-
+ # 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 @@
+ # 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
+
+-# From Paul Eggert (2013-07-03):
++# From Steffen Thorsen (2013-09-28):
++# Morocco extends DST by one month, on very short notice, just 1 day
++# before it was going to end. There is a new decree (2.13.781) for
++# this, where DST from now on goes from last Sunday of March at 02:00
++# to last Sunday of October at 03:00, similar to EU rules. Official
++# source (French):
++# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
++# Another source (specifying the time for start and end in the decree):
++# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
++
++# From Paul Eggert (2013-10-03):
+ # To estimate what the Moroccan government will do in future years,
+-# transition dates for 2014 through 2021 were determined by running
++# transition dates for 2014 through 2038 were determined by running
+ # the following program under GNU Emacs 24.3:
+ #
+ # (let ((islamic-year 1435))
+-# (while (< islamic-year 1444)
++# (while (< islamic-year 1461)
+ # (let ((a
+ # (calendar-gregorian-from-absolute
+ # (calendar-islamic-to-absolute (list 9 1 islamic-year))))
+@@ -902,13 +913,18 @@
+ # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+ # (setq islamic-year (+ 1 islamic-year))))
+ #
+-# with the results hand-edited for 2020-2022, when the normal spring-forward
+-# date falls during the estimated Ramadan.
+-#
+-# From 2023 through 2038 Ramadan is not predicted to overlap with
+-# daylight saving time. Starting in 2039 there will be overlap again,
+-# but 32-bit time_t values roll around in 2038 so for now do not worry
+-# about dates after 2038.
++# with spring-forward transitions removed for 2023-2025, when the
++# normal spring-forward date falls during the estimated Ramadan; with
++# all transitions removed for 2026-2035, where the estimated Ramadan
++# falls entirely outside daylight-saving time; and with fall-back
++# transitions removed for 2036-2037, where the normal fall-back
++# date falls during the estimated Ramadan. Normally, the table would
++# stop after 2037 because 32-bit time_t values roll around early in 2038,
++# but that would imply a prediction of perpetual DST after March 2038
++# due to the year-2037 glitches. So, this table instead stops after
++# 2038, the first non-glitchy year after the 32-bit rollover.
++# An advantage of stopping after 2038 is that it lets zic guess
++# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
+
+ # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+
+@@ -935,12 +951,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 -
+-Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S
+-Rule Morocco 2012 max - Sep lastSun 3:00 0 -
++Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S
++Rule Morocco 2012 only - Sep 30 3:00 0 -
+ Rule Morocco 2012 only - Jul 20 3:00 0 -
+ Rule Morocco 2012 only - Aug 20 2:00 1:00 S
+ Rule Morocco 2013 only - Jul 7 3:00 0 -
+ Rule Morocco 2013 only - Aug 10 2:00 1:00 S
++Rule Morocco 2013 2035 - Oct lastSun 3:00 0 -
++Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
+ 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 @@
+ 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
++Rule Morocco 2020 only - Apr 24 3:00 0 -
+ Rule Morocco 2020 only - May 24 2:00 1:00 S
++Rule Morocco 2021 only - Apr 13 3:00 0 -
+ Rule Morocco 2021 only - May 13 2:00 1:00 S
++Rule Morocco 2022 only - Apr 3 3:00 0 -
+ Rule Morocco 2022 only - May 3 2:00 1:00 S
+-Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S
++Rule Morocco 2023 only - Apr 22 2:00 1:00 S
++Rule Morocco 2024 only - Apr 10 2:00 1:00 S
++Rule Morocco 2025 only - Mar 31 2:00 1:00 S
++Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
++Rule Morocco 2036 only - Oct 21 3:00 0 -
++Rule Morocco 2037 only - Oct 11 3:00 0 -
++Rule Morocco 2038 only - Sep 30 3:00 0 -
++Rule Morocco 2038 only - Oct 30 2:00 1:00 S
++Rule Morocco 2038 max - Oct lastSun 3:00 0 -
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
+ 0:00 Morocco WE%sT 1984 Mar 16
+ 1:00 - CET 1986
+ 0:00 Morocco WE%sT
++
+ # Western Sahara
++#
++# From Gwillim Law (2013-10-22):
++# A correspondent who is usually well informed about time zone matters
++# ... says that Western Sahara observes daylight saving time, just as
++# Morocco does.
++#
++# From Paul Eggert (2013-10-23):
++# Assume that this has been true since Western Sahara switched to GMT,
++# since most of it was then controlled by Morocco.
++
+ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
+ -1:00 - WAT 1976 Apr 14
+- 0:00 - WET
++ 0:00 Morocco WE%sT
+
+ # Mozambique
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -1123,9 +1163,7 @@
+ 3:00 - EAT
+
+ # South Sudan
+-Zone Africa/Juba 2:06:24 - LMT 1931
+- 2:00 Sudan CA%sT 2000 Jan 15 12:00
+- 3:00 - EAT
++Link Africa/Khartoum Africa/Juba
+
+ # Swaziland
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+--- ./jdk/make/sun/javazic/tzdata/antarctica Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/antarctica Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+@@ -39,9 +39,9 @@
+ #
+ # Except for the French entries,
+ # I made up all time zone abbreviations mentioned here; corrections welcome!
+-# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited.
++# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
+
+-# These rules are stolen from the `southamerica' file.
++# These rules are stolen from the 'southamerica' file.
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule ArgAQ 1964 1966 - Mar 1 0:00 0 -
+ Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S
+@@ -251,9 +251,10 @@
+ # Scott Island (never inhabited)
+ #
+ # year-round base
+-# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo.
++# Scott Base, Ross Island, since 1957-01.
++# See Pacific/Auckland.
+ #
+-# These rules for New Zealand are stolen from the `australasia' file.
++# These rules for New Zealand are stolen from the 'australasia' file.
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
+ Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
+@@ -291,11 +292,11 @@
+ # From Lee Hotz (2001-03-08):
+ # I queried the folks at Columbia who spent the summer at Vostok and this is
+ # what they had to say about time there:
+-# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo)
++# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
+ # time, which is 12 hours ahead of GMT. The Russian Station Vostok was
+ # 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
+ # of GMT). This is a time zone I think two hours east of Moscow. The
+-# natural time zone is in between the two: 8 hours ahead of GMT.''
++# natural time zone is in between the two: 8 hours ahead of GMT."
+ #
+ # From Paul Eggert (2001-05-04):
+ # This seems to be hopelessly confusing, so I asked Lee Hotz about it
+@@ -360,16 +361,8 @@
+ -4:00 ChileAQ CL%sT
+ #
+ #
+-# McMurdo, Ross Island, since 1955-12
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Antarctica/McMurdo 0 - zzz 1956
+- 12:00 NZAQ NZ%sT
+-#
+-# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20
+-#
+-# From Paul Eggert (1996-09-03):
+-# Normally it wouldn't have a separate entry, since it's like the
+-# larger Antarctica/McMurdo since 1970, but it's too famous to omit.
++# McMurdo Station, Ross Island, since 1955-12
++# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
+ #
+ # From Chris Carrier (1996-06-27):
+ # Siple, the first commander of the South Pole station,
+@@ -391,4 +384,4 @@
+ # we have to go around and set them back 5 minutes or so.
+ # Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
+ #
+-Link Antarctica/McMurdo Antarctica/South_Pole
++# See 'australasia' for Antarctica/McMurdo.
+--- ./jdk/make/sun/javazic/tzdata/asia Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/asia Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+@@ -29,7 +29,7 @@
+ # go ahead and edit the file (and please send any changes to
+ # tz@iana.org for general use in the future).
+
+-# From Paul Eggert (2013-02-21):
++# From Paul Eggert (2013-08-11):
+ #
+ # A good source for time zone historical data outside the U.S. is
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+@@ -67,11 +67,11 @@
+ # 4:00 GST Gulf*
+ # 5:30 IST India
+ # 7:00 ICT Indochina*
+-# 7:00 WIT west Indonesia
+-# 8:00 CIT central Indonesia
++# 7:00 WIB west Indonesia (Waktu Indonesia Barat)
++# 8:00 WITA central Indonesia (Waktu Indonesia Tengah)
+ # 8:00 CST China
+ # 9:00 CJT Central Japanese Time (1896/1937)*
+-# 9:00 EIT east Indonesia
++# 9:00 WIT east Indonesia (Waktu Indonesia Timur)
+ # 9:00 JST JDT Japan
+ # 9:00 KST KDT Korea
+ # 9:30 CST (Australian) Central Standard Time
+@@ -779,7 +779,7 @@
+ 8:00 - TLT 1942 Feb 21 23:00 # E Timor Time
+ 9:00 - JST 1945 Sep 23
+ 9:00 - TLT 1976 May 3
+- 8:00 - CIT 2000 Sep 17 00:00
++ 8:00 - WITA 2000 Sep 17 00:00
+ 9:00 - TLT
+
+ # India
+@@ -816,36 +816,53 @@
+ # (Hollandia). For now, assume all Indonesian locations other than Jayapura
+ # switched on 1945-09-23.
+ #
++# From Paul Eggert (2013-08-11):
++# Normally the tz database uses English-language abbreviations, but in
++# Indonesia it's typical to use Indonesian-language abbreviations even
++# when writing in English. For example, see the English-language
++# summary published by the Time and Frequency Laboratory of the
++# Research Center for Calibration, Instrumentation and Metrology,
++# Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
++# The abbreviations are:
++#
++# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
++# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
++# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
++#
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
++# Java, Sumatra
+ Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10
+ # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
+ # but this must be a typo.
+- 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta
++ 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia
+ 7:20 - JAVT 1932 Nov # Java Time
+- 7:30 - WIT 1942 Mar 23
++ 7:30 - WIB 1942 Mar 23
+ 9:00 - JST 1945 Sep 23
+- 7:30 - WIT 1948 May
+- 8:00 - WIT 1950 May
+- 7:30 - WIT 1964
+- 7:00 - WIT
++ 7:30 - WIB 1948 May
++ 8:00 - WIB 1950 May
++ 7:30 - WIB 1964
++ 7:00 - WIB
++# west and central Borneo
+ Zone Asia/Pontianak 7:17:20 - LMT 1908 May
+ 7:17:20 - PMT 1932 Nov # Pontianak MT
+- 7:30 - WIT 1942 Jan 29
++ 7:30 - WIB 1942 Jan 29
+ 9:00 - JST 1945 Sep 23
+- 7:30 - WIT 1948 May
+- 8:00 - WIT 1950 May
+- 7:30 - WIT 1964
+- 8:00 - CIT 1988 Jan 1
+- 7:00 - WIT
++ 7:30 - WIB 1948 May
++ 8:00 - WIB 1950 May
++ 7:30 - WIB 1964
++ 8:00 - WITA 1988 Jan 1
++ 7:00 - WIB
++# Sulawesi, Lesser Sundas, east and south Borneo
+ Zone Asia/Makassar 7:57:36 - LMT 1920
+ 7:57:36 - MMT 1932 Nov # Macassar MT
+- 8:00 - CIT 1942 Feb 9
++ 8:00 - WITA 1942 Feb 9
+ 9:00 - JST 1945 Sep 23
+- 8:00 - CIT
++ 8:00 - WITA
++# Maluku Islands, West Papua, Papua
+ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
+- 9:00 - EIT 1944 Sep 1
++ 9:00 - WIT 1944 Sep 1
+ 9:30 - CST 1964
+- 9:00 - EIT
++ 9:00 - WIT
+
+ # Iran
+
+@@ -1387,9 +1404,11 @@
+ # 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.
+
+ # 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 @@
+ 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
+-Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S
++Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S
+ 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 2013 max - Oct lastFri 0:00s 0 -
++Rule Jordan 2006 2012 - 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 @@
+ # 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
+
+-# From Paul Eggert (2013-04-15):
++# From Steffen Thorsen (2013-09-24):
++# The Gaza and West Bank are ending DST Thursday at midnight
++# (2013-09-27 00:00:00) (one hour earlier than last year...).
++# This source in English, says "that winter time will go into effect
++# at midnight on Thursday in the West Bank and Gaza Strip":
++# http://english.wafa.ps/index.php?action=detail&id=23246
++# official source...:
++# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
++
++# From Paul Eggert (2013-09-24):
+ # For future dates, guess the last Thursday in March at 24:00 through
+-# the first Friday on or after September 21 at 01:00. This is consistent with
++# the first Friday on or after September 21 at 00:00. This is consistent with
+ # 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 @@
+ 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
+-Rule Palestine 2012 max - Sep Fri>=21 1:00 0 -
++Rule Palestine 2012 only - Sep 21 1:00 0 -
++Rule Palestine 2013 max - Sep Fri>=21 0:00 0 -
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
+--- ./jdk/make/sun/javazic/tzdata/australasia Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/australasia Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+@@ -375,16 +375,25 @@
+ # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
+ # October 2012 and end at 3 am on Sunday 20th January 2013.
+ # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
++
++# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
++# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
++# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
+ #
+-# From Paul Eggert (2012-08-31):
+-# For now, guess a pattern of the penultimate Sundays in October and January.
++# From Paul Eggert (2013-09-09):
++# For now, guess that Fiji springs forward the Sunday before the fourth
++# Monday in October. This matches both recent practice and
++# timeanddate.com's current spring-forward prediction.
++# For the January 2014 transition we guessed right while timeanddate.com
++# guessed wrong, so leave the fall-back prediction alone.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
+ Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
+ Rule Fiji 2009 only - Nov 29 2:00 1:00 S
+ Rule Fiji 2010 only - Mar lastSun 3:00 0 -
+-Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S
++Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S
+ Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
+ Rule Fiji 2012 max - Jan Sun>=18 3:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -510,6 +519,7 @@
+ Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1
+ 12:45 Chatham CHA%sT
+
++Link Pacific/Auckland Antarctica/McMurdo
+
+ # Auckland Is
+ # uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers,
+@@ -759,7 +769,7 @@
+ # 1886-1891; Baker was similar but exact dates are not known.
+ # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
+ # uninhabited thereafter.
+-# Howland observed Hawaii Standard Time (UTC-10:30) in 1937;
++# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
+ # see page 206 of Elgen M. Long and Marie K. Long,
+ # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
+ # So most likely Howland and Baker observed Hawaii Time from 1935
+@@ -772,8 +782,17 @@
+ # no information; was probably like Pacific/Kiritimati
+
+ # Johnston
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Johnston -10:00 - HST
++#
++# From Paul Eggert (2013-09-03):
++# In his memoirs of June 6th to October 4, 1945
++# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
++# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
++# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and
++# confirms that Johnston kept the same time as Honolulu in summer 1945.
++# We have no better information, so for now, assume this has been true
++# indefinitely into the past.
++#
++# See 'northamerica' for Pacific/Johnston.
+
+ # Kingman
+ # uninhabited
+--- ./jdk/make/sun/javazic/tzdata/backward Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/backward Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+@@ -45,15 +45,17 @@
+ Link America/Argentina/Mendoza America/Mendoza
+ Link America/Rio_Branco America/Porto_Acre
+ Link America/Argentina/Cordoba America/Rosario
+-Link America/St_Thomas America/Virgin
++Link America/Denver America/Shiprock
++Link America/Port_of_Spain America/Virgin
++Link Pacific/Auckland Antarctica/South_Pole
+ Link Asia/Ashgabat Asia/Ashkhabad
++Link Asia/Kolkata Asia/Calcutta
+ Link Asia/Chongqing Asia/Chungking
+ Link Asia/Dhaka Asia/Dacca
+ Link Asia/Kathmandu Asia/Katmandu
+-Link Asia/Kolkata Asia/Calcutta
+ Link Asia/Macau Asia/Macao
++Link Asia/Ho_Chi_Minh Asia/Saigon
+ Link Asia/Jerusalem Asia/Tel_Aviv
+-Link Asia/Ho_Chi_Minh Asia/Saigon
+ Link Asia/Thimphu Asia/Thimbu
+ Link Asia/Makassar Asia/Ujung_Pandang
+ Link Asia/Ulaanbaatar Asia/Ulan_Bator
+@@ -111,10 +113,10 @@
+ Link Pacific/Chatham NZ-CHAT
+ Link America/Denver Navajo
+ Link Asia/Shanghai PRC
++Link Pacific/Pohnpei Pacific/Ponape
+ Link Pacific/Pago_Pago Pacific/Samoa
++Link Pacific/Chuuk Pacific/Truk
+ Link Pacific/Chuuk Pacific/Yap
+-Link Pacific/Chuuk Pacific/Truk
+-Link Pacific/Pohnpei Pacific/Ponape
+ Link Europe/Warsaw Poland
+ Link Europe/Lisbon Portugal
+ Link Asia/Taipei ROC
+--- ./jdk/make/sun/javazic/tzdata/etcetera Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/etcetera Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+@@ -54,9 +54,9 @@
+ # even though this is the opposite of what many people expect.
+ # POSIX has positive signs west of Greenwich, but many people expect
+ # positive signs east of Greenwich. For example, TZ='Etc/GMT+4' uses
+-# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC
++# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
+ # (i.e. west of Greenwich) even though many people would expect it to
+-# mean 4 hours ahead of UTC (i.e. east of Greenwich).
++# mean 4 hours ahead of UT (i.e. east of Greenwich).
+ #
+ # 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/europe Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+@@ -65,7 +65,7 @@
+ # </a> (1998-09-21, in Portuguese)
+
+ #
+-# I invented the abbreviations marked `*' in the following table;
++# I invented the abbreviations marked '*' in the following table;
+ # the rest are from earlier versions of this file, or from other sources.
+ # Corrections are welcome!
+ # std dst 2dst
+@@ -119,7 +119,7 @@
+ # and a sketch map showing some of the sightlines involved. One paragraph
+ # of the text said:
+ #
+-# `An old stone obelisk marking a forgotten terrestrial meridian stands
++# 'An old stone obelisk marking a forgotten terrestrial meridian stands
+ # beside the river at Kew. In the 18th century, before time and longitude
+ # was standardised by the Royal Observatory in Greenwich, scholars observed
+ # this stone and the movement of stars from Kew Observatory nearby. They
+@@ -163,7 +163,7 @@
+ # From Paul Eggert (2003-09-27):
+ # Summer Time was first seriously proposed by William Willett (1857-1915),
+ # a London builder and member of the Royal Astronomical Society
+-# who circulated a pamphlet ``The Waste of Daylight'' (1907)
++# who circulated a pamphlet "The Waste of Daylight" (1907)
+ # that proposed advancing clocks 20 minutes on each of four Sundays in April,
+ # and retarding them by the same amount on four Sundays in September.
+ # A bill was drafted in 1909 and introduced in Parliament several times,
+@@ -188,10 +188,10 @@
+ # </a>
+
+ # From Paul Eggert (1996-09-03):
+-# The OED Supplement says that the English originally said ``Daylight Saving''
++# The OED Supplement says that the English originally said "Daylight Saving"
+ # when they were debating the adoption of DST in 1908; but by 1916 this
+ # term appears only in quotes taken from DST's opponents, whereas the
+-# proponents (who eventually won the argument) are quoted as using ``Summer''.
++# proponents (who eventually won the argument) are quoted as using "Summer".
+
+ # From Arthur David Olson (1989-01-19):
+ #
+@@ -231,9 +231,9 @@
+ # which could not be said to run counter to any official description.
+
+ # From Paul Eggert (2000-10-02):
+-# Howse writes (p 157) `DBST' too, but `BDST' seems to have been common
++# Howse writes (p 157) 'DBST' too, but 'BDST' seems to have been common
+ # and follows the more usual convention of putting the location name first,
+-# so we use `BDST'.
++# so we use 'BDST'.
+
+ # Peter Ilieve (1998-04-19) described at length
+ # the history of summer time legislation in the United Kingdom.
+@@ -454,6 +454,8 @@
+ Rule GB-Eire 1990 1995 - Oct Sun>=22 1:00u 0 GMT
+ # Summer Time Order 1997 (S.I. 1997/2982)
+ # See EU for rules starting in 1996.
++#
++# Use Europe/London for Jersey, Guernsey, and the Isle of Man.
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s
+@@ -820,7 +822,7 @@
+ 1:00 EU CE%sT
+
+ # Bosnia and Herzegovina
+-# see Serbia
++# See Europe/Belgrade.
+
+ # Bulgaria
+ #
+@@ -848,10 +850,10 @@
+ 2:00 EU EE%sT
+
+ # Croatia
+-# see Serbia
++# See Europe/Belgrade.
+
+ # Cyprus
+-# Please see the `asia' file for Asia/Nicosia.
++# Please see the 'asia' file for Asia/Nicosia.
+
+ # Czech Republic
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+@@ -868,6 +870,7 @@
+ 1:00 C-Eur CE%sT 1944 Sep 17 2:00s
+ 1:00 Czech CE%sT 1979
+ 1:00 EU CE%sT
++# Use Europe/Prague also for Slovakia.
+
+ # Denmark, Faroe Islands, and Greenland
+
+@@ -1031,12 +1034,12 @@
+ # From Peter Ilieve (1996-10-28):
+ # [IATA SSIM (1992/1996) claims that the Baltic republics switch at 01:00s,
+ # but a relative confirms that Estonia still switches at 02:00s, writing:]
+-# ``I do not [know] exactly but there are some little different
++# "I do not [know] exactly but there are some little different
+ # (confusing) rules for International Air and Railway Transport Schedules
+ # conversion in Sunday connected with end of summer time in Estonia....
+ # A discussion is running about the summer time efficiency and effect on
+ # human physiology. It seems that Estonia maybe will not change to
+-# summer time next spring.''
++# summer time next spring."
+
+ # From Peter Ilieve (1998-11-04), heavily edited:
+ # <a href="http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390">
+@@ -1091,7 +1094,7 @@
+ # Well, here in Helsinki we're just changing from summer time to regular one,
+ # and it's supposed to change at 4am...
+
+-# From Janne Snabb (2010-0715):
++# From Janne Snabb (2010-07-15):
+ #
+ # I noticed that the Finland data is not accurate for years 1981 and 1982.
+ # During these two first trial years the DST adjustment was made one hour
+@@ -1148,7 +1151,7 @@
+
+
+ #
+-# Shank & Pottenger seem to use `24:00' ambiguously; resolve it with Whitman.
++# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule France 1916 only - Jun 14 23:00s 1:00 S
+ Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
+@@ -1438,7 +1441,7 @@
+ # <a href="http://toi.iriti.cnr.it/uk/ienitlt.html">
+ # Day-light Saving Time in Italy (2006-02-03)
+ # </a>
+-# (`FP' below), taken from an Italian National Electrotechnical Institute
++# ('FP' below), taken from an Italian National Electrotechnical Institute
+ # publication. When the three sources disagree, guess who's right, as follows:
+ #
+ # year FP Shanks&P. (S) Whitman (W) Go with:
+@@ -1584,10 +1587,22 @@
+ 2:00 EU EE%sT
+
+ # Liechtenstein
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Europe/Vaduz 0:38:04 - LMT 1894 Jun
+- 1:00 - CET 1981
+- 1:00 EU CE%sT
++
++# From Paul Eggert (2013-09-09):
++# Shanks & Pottenger say Vaduz is like Zurich.
++
++# From Alois Treindl (2013-09-18):
++# http://www.eliechtensteinensia.li/LIJ/1978/1938-1978/1941.pdf
++# ... confirms on p. 6 that Liechtenstein followed Switzerland in 1941 and 1942.
++# I ... translate only the last two paragraphs:
++# ... during second world war, in the years 1941 and 1942, Liechtenstein
++# introduced daylight saving time, adapting to Switzerland. From 1943 on
++# central European time was in force throughout the year.
++# From a report of the duke's government to the high council,
++# regarding the introduction of a time law, of 31 May 1977.
++
++Link Europe/Zurich Europe/Vaduz
++
+
+ # Lithuania
+
+@@ -1675,7 +1690,7 @@
+ 1:00 EU CE%sT
+
+ # Macedonia
+-# see Serbia
++# See Europe/Belgrade.
+
+ # Malta
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+@@ -1768,7 +1783,7 @@
+ 1:00 EU CE%sT
+
+ # Montenegro
+-# see Serbia
++# See Europe/Belgrade.
+
+ # Netherlands
+
+@@ -1883,7 +1898,7 @@
+ # before 1895, and therefore probably changed the local time somewhere
+ # between 1895 and 1925 (inclusive).
+
+-# From Paul Eggert (2001-05-01):
++# From Paul Eggert (2013-09-04):
+ #
+ # Actually, Jan Mayen was never occupied by Germany during World War II,
+ # so it must have diverged from Oslo time during the war, as Oslo was
+@@ -1894,7 +1909,7 @@
+ # 1941 with a small Norwegian garrison and continued operations despite
+ # frequent air ttacks from Germans. In 1943 the Americans established a
+ # radiolocating station on the island, called "Atlantic City". Possibly
+-# the UTC offset changed during the war, but I think it unlikely that
++# the UT offset changed during the war, but I think it unlikely that
+ # Jan Mayen used German daylight-saving rules.
+ #
+ # Svalbard is more complicated, as it was raided in August 1941 by an
+@@ -1907,9 +1922,8 @@
+ # the German armed forces at the Svalbard weather station code-named
+ # Haudegen did not surrender to the Allies until September 1945.
+ #
+-# All these events predate our cutoff date of 1970. Unless we can
+-# come up with more definitive info about the timekeeping during the
+-# war years it's probably best just do...the following for now:
++# All these events predate our cutoff date of 1970, so use Europe/Oslo
++# for these regions.
+ Link Europe/Oslo Arctic/Longyearbyen
+
+ # Poland
+@@ -2167,7 +2181,7 @@
+ # so we (Novosibirsk) simply did not switch.
+ #
+ # From Andrey A. Chernov (1996-10-04):
+-# `MSK' and `MSD' were born and used initially on Moscow computers with
++# 'MSK' and 'MSD' were born and used initially on Moscow computers with
+ # UNIX-like OSes by several developer groups (e.g. Demos group, Kiae group)....
+ # The next step was the UUCP network, the Relcom predecessor
+ # (used mainly for mail), and MSK/MSD was actively used there.
+@@ -2466,6 +2480,9 @@
+ 11:00 Russia ANA%sT 2011 Mar 27 2:00s
+ 12:00 - ANAT
+
++# San Marino
++# See Europe/Rome.
++
+ # Serbia
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Belgrade 1:22:00 - LMT 1884
+@@ -2488,7 +2505,7 @@
+ Link Europe/Prague Europe/Bratislava
+
+ # Slovenia
+-# see Serbia
++# See Europe/Belgrade.
+
+ # Spain
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+@@ -2622,7 +2639,7 @@
+ # and their performance improved enormously. Communities began to keep
+ # mean time in preference to apparent time -- Geneva from 1780 ....
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-# From Whitman (who writes ``Midnight?''):
++# From Whitman (who writes "Midnight?"):
+ # Rule Swiss 1940 only - Nov 2 0:00 1:00 S
+ # Rule Swiss 1940 only - Dec 31 0:00 0 -
+ # From Shanks & Pottenger:
+@@ -2667,23 +2684,53 @@
+ # The 1940 rules must be deleted.
+ #
+ # One further detail for Switzerland, which is probably out of scope for
+-# most users of tzdata:
+-# The zone file
+-# Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12
+-# 0:29:44 - BMT 1894 Jun #Bern Mean Time
+-# 1:00 Swiss CE%sT 1981
+-# 1:00 EU CE%sT
++# most users of tzdata: The [Europe/Zurich zone] ...
+ # describes all of Switzerland correctly, with the exception of
+ # the Cantone Geneve (Geneva, Genf). Between 1848 and 1894 Geneve did not
+ # follow Bern Mean Time but kept its own local mean time.
+ # To represent this, an extra zone would be needed.
++#
++# From Alois Treindl (2013-09-11):
++# The Federal regulations say
++# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html
++# ... the meridian for Bern mean time ... is 7 degrees 26'22.50".
++# Expressed in time, it is 0h29m45.5s.
++
++# From Pierre-Yves Berger (2013-09-11):
++# the "Circulaire du conseil federal" (December 11 1893)
++# <http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353> ...
++# clearly states that the [1894-06-01] change should be done at midnight
++# but if no one is present after 11 at night, could be postponed until one
++# hour before the beginning of service.
++
++# From Paul Eggert (2013-09-11):
++# Round BMT to the nearest even second, 0:29:46.
++#
++# We can find no reliable source for Shanks's assertion that all of Switzerland
++# except Geneva switched to Bern Mean Time at 00:00 on 1848-09-12. This book:
++#
++# Jakob Messerli. Gleichmassig, punktlich, schnell: Zeiteinteilung und
++# Zeitgebrauch in der Schweiz im 19. Jahrhundert. Chronos, Zurich 1995,
++# ISBN 3-905311-68-2, OCLC 717570797.
++#
++# suggests that the transition was more gradual, and that the Swiss did not
++# agree about civil time during the transition. The timekeeping it gives the
++# most detail for is postal and telegraph time: here, federal legislation (the
++# "Bundesgesetz uber die Erstellung von elektrischen Telegraphen") passed on
++# 1851-11-23, and an official implementation notice was published 1853-07-16
++# (Bundesblatt 1853, Bd. II, S. 859). On p 72 Messerli writes that in
++# practice since July 1853 Bernese time was used in "all postal and telegraph
++# offices in Switzerland from Geneva to St. Gallen and Basel to Chiasso"
++# (Google translation). For now, model this transition as occurring on
++# 1853-07-16, though it probably occurred at some other date in Zurich, and
++# legal civil time probably changed at still some other transition date.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
+ Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12
+- 0:29:44 - BMT 1894 Jun # Bern Mean Time
++Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
++ 0:29:46 - BMT 1894 Jun # Bern Mean Time
+ 1:00 Swiss CE%sT 1981
+ 1:00 EU CE%sT
+
+@@ -2907,7 +2954,7 @@
+ # From Paul Eggert (2006-03-22):
+ # The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
+ # from Kiev to Moscow time sometime after the January 1994 elections.
+-# Shanks (1999) says ``date of change uncertain'', but implies that it happened
++# Shanks (1999) says "date of change uncertain", but implies that it happened
+ # sometime between the 1994 DST switches. Shanks & Pottenger simply say
+ # 1994-09-25 03:00, but that can't be right. For now, guess it
+ # changed in May.
+@@ -2921,6 +2968,9 @@
+ 3:00 - MSK 1997 Mar lastSun 1:00u
+ 2:00 EU EE%sT
+
++# Vatican City
++# See Europe/Rome.
++
+ ###############################################################################
+
+ # One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from
+--- ./jdk/make/sun/javazic/tzdata/factory Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/factory Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+--- ./jdk/make/sun/javazic/tzdata/iso3166.tab Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/iso3166.tab Thu Dec 19 09:01:16 2013 -0800
+@@ -1,30 +1,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
+ # 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.
+ #
+-# <pre>
++# ISO 3166 alpha-2 country codes
++#
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+-# ISO 3166 alpha-2 country codes
+ #
+ # From Paul Eggert (2013-05-27):
+ #
+@@ -32,7 +32,7 @@
+ # 1. ISO 3166-1 alpha-2 country code, current as of
+ # ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166
+ # http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
+-# 2. The usual English name for the country,
++# 2. The usual English name for the coded region,
+ # chosen so that alphabetic sorting of subsets produces helpful lists.
+ # This is not the same as the English name in the ISO 3166 tables.
+ #
+@@ -46,7 +46,7 @@
+ # to take or endorse any position on legal or territorial claims.
+ #
+ #country-
+-#code country name
++#code name of country, territory, area, or subdivision
+ AD Andorra
+ AE United Arab Emirates
+ AF Afghanistan
+@@ -76,7 +76,7 @@
+ BM Bermuda
+ BN Brunei
+ BO Bolivia
+-BQ Bonaire, St Eustatius & Saba
++BQ Caribbean Netherlands
+ BR Brazil
+ BS Bahamas
+ BT Bhutan
+--- ./jdk/make/sun/javazic/tzdata/leapseconds Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/leapseconds Thu Dec 19 09:01:16 2013 -0800
+@@ -1,37 +1,43 @@
+ #
+ # 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.
+-#
+-# <pre>
+-# This file is in the public domain, so clarified as of
+-# 2009-05-17 by Arthur David Olson.
+
+ # Allowance for leapseconds added to each timezone file.
+
++# This file is in the public domain.
++
++# This file is generated automatically from the data in the public-domain
++# leap-seconds.list file available from most NIST time servers.
++# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
++# you should be able to pick up leap-seconds.list from a secondary NIST server.
++# For more about leap-seconds.list, please see
++# The NTP Timescale and Leap Seconds
++# <http://www.eecis.udel.edu/~mills/leap.html>.
++
+ # The International Earth Rotation Service periodically uses leap seconds
+ # to keep UTC to within 0.9 s of UT1
+ # (which measures the true angular orientation of the earth in space); see
+ # Terry J Quinn, The BIPM and the accurate measure of time,
+-# Proc IEEE 79, 7 (July 1991), 894-905.
++# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
+ # There were no leap seconds before 1972, because the official mechanism
+ # accounting for the discrepancy between atomic time and the earth's rotation
+ # did not exist until the early 1970s.
+@@ -42,8 +48,8 @@
+ # or
+ # Leap YEAR MON DAY 23:59:59 - R/S
+
+-# If the leapsecond is Rolling (R) the given time is local time
+-# If the leapsecond is Stationary (S) the given time is UTC
++# If the leapsecond is Rolling (R) the given time is local time.
++# If the leapsecond is Stationary (S) the given time is UTC.
+
+ # Leap YEAR MONTH DAY HH:MM:SS CORR R/S
+ Leap 1972 Jun 30 23:59:60 + S
+@@ -71,53 +77,3 @@
+ Leap 2005 Dec 31 23:59:60 + S
+ Leap 2008 Dec 31 23:59:60 + S
+ Leap 2012 Jun 30 23:59:60 + S
+-
+-# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
+-#
+-# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
+-#
+-#
+-# SERVICE DE LA ROTATION TERRESTRE
+-# OBSERVATOIRE DE PARIS
+-# 61, Av. de l'Observatoire 75014 PARIS (France)
+-# Tel. : 33 (0) 1 40 51 22 26
+-# FAX : 33 (0) 1 40 51 22 91
+-# e-mail : (E-Mail Removed)
+-# http://hpiers.obspm.fr/eop-pc
+-#
+-# Paris, 5 January 2012
+-#
+-#
+-# Bulletin C 43
+-#
+-# To authorities responsible
+-# for the measurement and
+-# distribution of time
+-#
+-#
+-# UTC TIME STEP
+-# on the 1st of July 2012
+-#
+-#
+-# A positive leap second will be introduced at the end of June 2012.
+-# The sequence of dates of the UTC second markers will be:
+-#
+-# 2012 June 30, 23h 59m 59s
+-# 2012 June 30, 23h 59m 60s
+-# 2012 July 1, 0h 0m 0s
+-#
+-# The difference between UTC and the International Atomic Time TAI is:
+-#
+-# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s
+-# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s
+-#
+-# Leap seconds can be introduced in UTC at the end of the months of December
+-# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
+-# six months, either to announce a time step in UTC or to confirm that there
+-# will be no time step at the next possible date.
+-#
+-#
+-# Daniel GAMBIS
+-# Head
+-# Earth Orientation Center of IERS
+-# Observatoire de Paris, France
+--- ./jdk/make/sun/javazic/tzdata/northamerica Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/northamerica Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+@@ -43,7 +43,7 @@
+ # Howse writes (pp 121-125) that time zones were invented by
+ # Professor Charles Ferdinand Dowd (1825-1904),
+ # Principal of Temple Grove Ladies' Seminary (Saratoga Springs, NY).
+-# His pamphlet ``A System of National Time for Railroads'' (1870)
++# His pamphlet "A System of National Time for Railroads" (1870)
+ # was the result of his proposals at the Convention of Railroad Trunk Lines
+ # in New York City (1869-10). His 1870 proposal was based on Washington, DC,
+ # but in 1872-05 he moved the proposed origin to Greenwich.
+@@ -63,8 +63,8 @@
+
+ # From Paul Eggert (2001-03-06):
+ # Daylight Saving Time was first suggested as a joke by Benjamin Franklin
+-# in his whimsical essay ``An Economical Project for Diminishing the Cost
+-# of Light'' published in the Journal de Paris (1784-04-26).
++# in his whimsical essay "An Economical Project for Diminishing the Cost
++# of Light" published in the Journal de Paris (1784-04-26).
+ # Not everyone is happy with the results:
+ #
+ # I don't really care how time is reckoned so long as there is some
+@@ -190,8 +190,8 @@
+ # of the Aleutian islands. No DST.
+
+ # From Paul Eggert (1995-12-19):
+-# The tables below use `NST', not `NT', for Nome Standard Time.
+-# I invented `CAWT' for Central Alaska War Time.
++# The tables below use 'NST', not 'NT', for Nome Standard Time.
++# I invented 'CAWT' for Central Alaska War Time.
+
+ # From U. S. Naval Observatory (1989-01-19):
+ # USA EASTERN 5 H BEHIND UTC NEW YORK, WASHINGTON
+@@ -260,9 +260,9 @@
+ # H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS.
+ # (a) Amendment- Section 3(a) of the Uniform Time Act of 1966 (15
+ # U.S.C. 260a(a)) is amended--
+-# (1) by striking `first Sunday of April' and inserting `second
++# (1) by striking 'first Sunday of April' and inserting 'second
+ # Sunday of March'; and
+-# (2) by striking `last Sunday of October' and inserting `first
++# (2) by striking 'last Sunday of October' and inserting 'first
+ # Sunday of November'.
+ # (b) Effective Date- Subsection (a) shall take effect 1 year after the
+ # date of enactment of this Act or March 1, 2007, whichever is later.
+@@ -623,6 +623,8 @@
+ -10:30 - HST 1947 Jun 8 2:00 #Schmitt&Cox+2
+ -10:00 - HST
+
++Link Pacific/Honolulu Pacific/Johnston
++
+ # Now we turn to US areas that have diverged from the consensus since 1970.
+
+ # Arizona mostly uses MST.
+@@ -659,8 +661,9 @@
+ # Navajo Nation participates in the Daylight Saving Time policy, due to its
+ # large size and location in three states." (The "only" means that other
+ # tribal nations don't use DST.)
+-
+-Link America/Denver America/Shiprock
++#
++# From Paul Eggert (2013-08-26):
++# See America/Denver for a zone appropriate for the Navajo Nation.
+
+ # Southern Idaho (Ada, Adams, Bannock, Bear Lake, Bingham, Blaine,
+ # Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark,
+@@ -700,13 +703,13 @@
+ # and Switzerland counties have their own time zone histories as noted below.
+ #
+ # Shanks partitioned Indiana into 345 regions, each with its own time history,
+-# and wrote ``Even newspaper reports present contradictory information.''
++# and wrote "Even newspaper reports present contradictory information."
+ # Those Hoosiers! Such a flighty and changeable people!
+ # Fortunately, most of the complexity occurred before our cutoff date of 1970.
+ #
+ # Other than Indianapolis, the Indiana place names are so nondescript
+-# that they would be ambiguous if we left them at the `America' level.
+-# So we reluctantly put them all in a subdirectory `America/Indiana'.
++# that they would be ambiguous if we left them at the 'America' level.
++# So we reluctantly put them all in a subdirectory 'America/Indiana'.
+
+ # From Paul Eggert (2005-08-16):
+ # http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
+@@ -970,8 +973,8 @@
+ # This story is too entertaining to be false, so go with Howse over Shanks.
+ #
+ # From Paul Eggert (2001-03-06):
+-# Garland (1927) writes ``Cleveland and Detroit advanced their clocks
+-# one hour in 1914.'' This change is not in Shanks. We have no more
++# Garland (1927) writes "Cleveland and Detroit advanced their clocks
++# one hour in 1914." This change is not in Shanks. We have no more
+ # info, so omit this for now.
+ #
+ # Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
+@@ -1011,7 +1014,7 @@
+ # occupied 1857/1900 by the Navassa Phosphate Co
+ # US lighthouse 1917/1996-09
+ # currently uninhabited
+-# see Mark Fineman, ``An Isle Rich in Guano and Discord'',
++# see Mark Fineman, "An Isle Rich in Guano and Discord",
+ # _Los Angeles Times_ (1998-11-10), A1, A10; it cites
+ # Jimmy Skaggs, _The Great Guano Rush_ (1994).
+
+@@ -1045,7 +1048,7 @@
+ # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+ # <http://www.jstor.org/stable/1774359>.
+ #
+-# See the `europe' file for Greenland.
++# See the 'europe' file for Greenland.
+
+ # Canada
+
+@@ -1246,7 +1249,7 @@
+
+ # most of east Labrador
+
+-# The name `Happy Valley-Goose Bay' is too long; use `Goose Bay'.
++# The name 'Happy Valley-Goose Bay' is too long; use 'Goose Bay'.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Goose_Bay -4:01:40 - LMT 1884 # Happy Valley-Goose Bay
+ -3:30:52 - NST 1918
+@@ -1363,25 +1366,27 @@
+
+ # Quebec
+
+-# From Paul Eggert (2006-07-09):
+-# Shanks & Pottenger write that since 1970 most of Quebec has been
+-# like Montreal.
++# From Paul Eggert (2013-08-30):
++# Since 1970 most of Quebec has been like Toronto.
++# However, because earlier versions of the tz database mistakenly relied on data
++# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970,
++# a separate entry was created for most of Quebec. We're loath to lose
++# its pre-1970 info, even though the tz database is normally limited to
++# zones that differ after 1970, so keep this otherwise out-of-scope entry.
+
+-# From Paul Eggert (2006-06-27):
+ # Matthews and Vincent (1998) also write that Quebec east of the -63
+ # meridian is supposed to observe AST, but residents as far east as
+ # Natashquan use EST/EDT, and residents east of Natashquan use AST.
+-# In "Official time in Quebec" the Quebec department of justice writes in
+-# http://www.justice.gouv.qc.ca/english/publications/generale/temps-regl-1-a.htm
+-# that "The residents of the Municipality of the
+-# Cote-Nord-du-Golfe-Saint-Laurent and the municipalities of Saint-Augustin,
+-# Bonne-Esperance and Blanc-Sablon apply the Official Time Act as it is
+-# written and use Atlantic standard time all year round. The same applies to
+-# the residents of the Native facilities along the lower North Shore."
+-# <http://www.assnat.qc.ca/eng/37legislature2/Projets-loi/Publics/06-a002.htm>
++# The Quebec department of justice writes in
++# "The situation in Minganie and Basse-Cote-Nord"
++# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
++# that the coastal strip from just east of Natashquan to Blanc-Sablon
++# observes Atlantic standard time all year round.
++# http://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
+ # says this common practice was codified into law as of 2007.
+ # For lack of better info, guess this practice began around 1970, contra to
+ # Shanks & Pottenger who have this region observing AST/ADT.
++# for post-1970 data America/Puerto_Rico.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Mont 1917 only - Mar 25 2:00 1:00 D
+@@ -1425,7 +1430,6 @@
+ -5:00 Mont E%sT 1974
+ -5:00 Canada E%sT
+
+-
+ # Ontario
+
+ # From Paul Eggert (2006-07-09):
+@@ -1644,7 +1648,7 @@
+ -6:00 - CST 1910
+ -5:00 - EST 1942
+ -5:00 Canada E%sT 1970
+- -5:00 Mont E%sT 1973
++ -5:00 Toronto E%sT 1973
+ -5:00 - EST 1974
+ -5:00 Canada E%sT
+ Zone America/Nipigon -5:53:04 - LMT 1895
+@@ -2231,7 +2235,7 @@
+ # From Paul Eggert (1996-06-12):
+ # For an English translation of the decree, see
+ # <a href="http://mexico-travel.com/extra/timezone_eng.html">
+-# ``Diario Oficial: Time Zone Changeover'' (1996-01-04).
++# "Diario Oficial: Time Zone Changeover" (1996-01-04).
+ # </a>
+
+ # From Rives McDow (1998-10-08):
+@@ -2568,9 +2572,7 @@
+ ###############################################################################
+
+ # Anguilla
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2
+- -4:00 - AST
++# See 'southamerica'.
+
+ # Antigua and Barbuda
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -2639,13 +2641,13 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
+ -4:00 - AST 1974 Apr 28 2:00
+- -4:00 Bahamas A%sT 1976
++ -4:00 Canada A%sT 1976
+ -4:00 US A%sT
+
+ # Cayman Is
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
+- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
++ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
+ -5:00 - EST
+
+ # Costa Rica
+@@ -2660,7 +2662,7 @@
+ # go with Shanks & Pottenger.
+ Rule CR 1991 only - Jul 1 0:00 0 S
+ Rule CR 1992 only - Mar 15 0:00 0 S
+-# There are too many San Joses elsewhere, so we'll use `Costa Rica'.
++# There are too many San Joses elsewhere, so we'll use 'Costa Rica'.
+ # 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 @@
+ -5:00 Cuba C%sT
+
+ # Dominica
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Dominica -4:05:36 - LMT 1911 Jul 1 0:01 # Roseau
+- -4:00 - AST
++# See 'southamerica'.
+
+ # Dominican Republic
+
+@@ -2943,18 +2943,10 @@
+ -6:00 Salv C%sT
+
+ # Grenada
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's
+- -4:00 - AST
+-
+ # Guadeloupe
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre
+- -4:00 - AST
+ # St Barthelemy
+-Link America/Guadeloupe America/St_Barthelemy
+ # St Martin (French part)
+-Link America/Guadeloupe America/Marigot
++# See 'southamerica'.
+
+ # Guatemala
+ #
+@@ -3097,17 +3089,12 @@
+ # Great Swan I ceded by US to Honduras in 1972
+
+ # Jamaica
+-
+-# From Bob Devine (1988-01-28):
+-# Follows US rules.
+-
+-# From U. S. Naval Observatory (1989-01-19):
+-# JAMAICA 5 H BEHIND UTC
+-
+-# From Shanks & Pottenger:
++# Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
++# unspecified official document, and says "This time is used throughout the
++# island". Go with Milne. Round to the nearest second as required by zic.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Jamaica -5:07:12 - LMT 1890 # Kingston
+- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
++Zone America/Jamaica -5:07:11 - LMT 1890 # Kingston
++ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
+ -5:00 - EST 1974 Apr 28 2:00
+ -5:00 US E%sT 1984
+ -5:00 - EST
+@@ -3121,12 +3108,7 @@
+ -4:00 - AST
+
+ # Montserrat
+-# From Paul Eggert (2006-03-22):
+-# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
+-# world.gazetteer.com says Cork Hill is the most populous location now.
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Cork Hill
+- -4:00 - AST
++# See 'southamerica'.
+
+ # Nicaragua
+ #
+@@ -3200,7 +3182,7 @@
+ -5:00 - EST
+
+ # Puerto Rico
+-# There are too many San Juans elsewhere, so we'll use `Puerto_Rico'.
++# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
+ # 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 @@
+ -4:00 - AST
+
+ # St Kitts-Nevis
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/St_Kitts -4:10:52 - LMT 1912 Mar 2 # Basseterre
+- -4:00 - AST
+-
+ # St Lucia
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/St_Lucia -4:04:00 - LMT 1890 # Castries
+- -4:04:00 - CMT 1912 # Castries Mean Time
+- -4:00 - AST
++# See 'southamerica'.
+
+ # St Pierre and Miquelon
+-# There are too many St Pierres elsewhere, so we'll use `Miquelon'.
++# There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
+ # 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 @@
+ -3:00 Canada PM%sT
+
+ # St Vincent and the Grenadines
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/St_Vincent -4:04:56 - LMT 1890 # Kingstown
+- -4:04:56 - KMT 1912 # Kingstown Mean Time
+- -4:00 - AST
++# See 'southamerica'.
+
+ # Turks and Caicos
+ #
+@@ -3260,15 +3232,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
+- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
++ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
+ -5:00 TC E%sT
+
+ # British Virgin Is
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town
+- -4:00 - AST
+-
+ # Virgin Is
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/St_Thomas -4:19:44 - LMT 1911 Jul # Charlotte Amalie
+- -4:00 - AST
++# See 'southamerica'.
+--- ./jdk/make/sun/javazic/tzdata/pacificnew Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/pacificnew Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+--- ./jdk/make/sun/javazic/tzdata/solar87 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/solar87 Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+--- ./jdk/make/sun/javazic/tzdata/solar88 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/solar88 Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+--- ./jdk/make/sun/javazic/tzdata/solar89 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/solar89 Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+--- ./jdk/make/sun/javazic/tzdata/southamerica Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/southamerica Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+@@ -474,6 +474,17 @@
+ # rules...San Luis is still using "Western ARgentina Time" and it got
+ # stuck on Summer daylight savings time even though the summer is over.
+
++# From Paul Eggert (2013-09-05):
++# Perhaps San Luis operates on the legal fiction that it is at UTC-4
++# with perpetual summer time, but ordinary usage typically seems to
++# just say it's at UTC-3; see, for example,
++# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
++# We've documented similar situations as being plain changes to
++# standard time, so let's do that here too. This does not change UTC
++# offsets, only tm_isdst and the time zone abbreviations. One minor
++# plus is that this silences a zic complaint that there's no POSIX TZ
++# setting for time stamps past 2038.
++
+ # From Paul Eggert (2013-02-21):
+ # Milne says Cordoba time was -4:16:48.2. Round to the nearest second.
+
+@@ -611,7 +622,7 @@
+ # San Luis (SL)
+
+ Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 -
+-Rule SanLuis 2007 2009 - Oct Sun>=8 0:00 1:00 S
++Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 S
+
+ Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+@@ -627,7 +638,8 @@
+ -3:00 - ART 2004 May 31
+ -4:00 - WART 2004 Jul 25
+ -3:00 Arg AR%sT 2008 Jan 21
+- -4:00 SanLuis WAR%sT
++ -4:00 SanLuis WAR%sT 2009 Oct 11
++ -3:00 - ART
+ #
+ # Santa Cruz (SC)
+ Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
+@@ -654,10 +666,7 @@
+ -3:00 - ART
+
+ # Aruba
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad
+- -4:30 - ANT 1965 # Netherlands Antilles Time
+- -4:00 - AST
++Link America/Curacao America/Aruba
+
+ # Bolivia
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -859,6 +868,21 @@
+ # Tocantins state will have DST.
+ # http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
+
++# From Steffen Thorsen (2013-09-20):
++# Tocantins in Brazil is very likely not to observe DST from October....
++# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
++# We will keep this article updated when this is confirmed:
++# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
++
++# From Steffen Thorsen (2013-10-17):
++# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
++# Senator Jorge Viana announced that Acre will change time zone on November 10.
++# He did not specify the time of the change, nor if western parts of Amazonas
++# will change as well.
++#
++# From Paul Eggert (2013-10-17):
++# For now, assume western Amazonas will change as well.
++
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
+ # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
+@@ -1078,7 +1102,8 @@
+ -3:00 - BRT 1995 Sep 14
+ -3:00 Brazil BR%sT 2003 Sep 24
+ -3:00 - BRT 2012 Oct 21
+- -3:00 Brazil BR%sT
++ -3:00 Brazil BR%sT 2013 Sep
++ -3:00 - BRT
+ #
+ # Alagoas (AL), Sergipe (SE)
+ Zone America/Maceio -2:22:52 - LMT 1914
+@@ -1146,13 +1171,15 @@
+ -5:00 - ACT 1993 Sep 28
+ -5:00 Brazil AC%sT 1994 Sep 22
+ -5:00 - ACT 2008 Jun 24 00:00
+- -4:00 - AMT
++ -4:00 - AMT 2013 Nov 10
++ -5:00 - ACT
+ #
+ # Acre (AC)
+ Zone America/Rio_Branco -4:31:12 - LMT 1914
+ -5:00 Brazil AC%sT 1988 Sep 12
+ -5:00 - ACT 2008 Jun 24 00:00
+- -4:00 - AMT
++ -4:00 - AMT 2013 Nov 10
++ -5:00 - ACT
+
+ # Chile
+
+@@ -1373,12 +1400,12 @@
+ -4:00 - AST
+
+ # From Arthur David Olson (2011-06-15):
+-# At least for now, use links for places with new iso3166 codes.
++# use links for places with new iso3166 codes.
+ # The name "Lower Prince's Quarter" is both longer than fourteen charaters
+ # and contains an apostrophe; use "Lower_Princes" below.
+
+-Link America/Curacao America/Lower_Princes # Sint Maarten
+-Link America/Curacao America/Kralendijk # Bonaire, Sint Estatius and Saba
++Link America/Curacao America/Lower_Princes # Sint Maarten
++Link America/Curacao America/Kralendijk # Caribbean Netherlands
+
+ # Ecuador
+ #
+@@ -1519,10 +1546,16 @@
+ -4:00 - GYT
+
+ # Paraguay
++#
+ # From Paul Eggert (2006-03-22):
+ # Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
+ # and autumn transitions are from 00:00 -> 23:00. Go with pre-1999
+ # editions of Shanks, and with the IATA, who say transitions occur at 00:00.
++#
++# From Waldemar Villamayor-Venialbo (2013-09-20):
++# No time of the day is established for the adjustment, so people normally
++# adjust their clocks at 0 hour of the given dates.
++#
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Para 1975 1988 - Oct 1 0:00 1:00 S
+ Rule Para 1975 1978 - Mar 1 0:00 0 -
+@@ -1656,6 +1689,19 @@
+ Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
+ -4:00 - AST
+
++Link America/Port_of_Spain America/Anguilla
++Link America/Port_of_Spain America/Dominica
++Link America/Port_of_Spain America/Grenada
++Link America/Port_of_Spain America/Guadeloupe
++Link America/Port_of_Spain America/Marigot
++Link America/Port_of_Spain America/Montserrat
++Link America/Port_of_Spain America/St_Barthelemy
++Link America/Port_of_Spain America/St_Kitts
++Link America/Port_of_Spain America/St_Lucia
++Link America/Port_of_Spain America/St_Thomas
++Link America/Port_of_Spain America/St_Vincent
++Link America/Port_of_Spain America/Tortola
++
+ # Uruguay
+ # From Paul Eggert (1993-11-18):
+ # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
+@@ -1673,7 +1719,7 @@
+ # Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
+ Rule Uruguay 1937 1940 - Oct lastSun 0:00 0:30 HS
+ # Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
+-# and 1943 Apr 13 ``to present time''; go with Shanks & Pottenger.
++# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
+ Rule Uruguay 1941 only - Aug 1 0:00 0:30 HS
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/systemv Thu Dec 19 09:01:16 2013 -0800
+@@ -1,22 +1,22 @@
+ #
+ # 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.
+--- ./jdk/make/sun/javazic/tzdata/zone.tab Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/javazic/tzdata/zone.tab Thu Dec 19 09:01:16 2013 -0800
+@@ -1,53 +1,55 @@
+ #
+ # 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.
+ #
+-# <pre>
++# TZ zone descriptions
++#
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ #
+-# TZ zone descriptions
++# From Paul Eggert (2013-08-14):
+ #
+-# From Paul Eggert (2013-05-27):
++# This file contains a table where each row stands for an area that is
++# the intersection of a region identified by a country code and of a
++# zone where civil clocks have agreed since 1970. The columns of the
++# table are as follows:
+ #
+-# This file contains a table with the following columns:
+-# 1. ISO 3166 2-character country code. See the file `iso3166.tab'.
+-# This identifies a country that overlaps the zone. The country may
+-# overlap other zones and the zone may overlap other countries.
+-# 2. Latitude and longitude of the zone's principal location
++# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'.
++# 2. Latitude and longitude of the area's principal location
+ # in ISO 6709 sign-degrees-minutes-seconds format,
+ # either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
+ # first latitude (+ is north), then longitude (+ is east).
+-# This location need not lie within the column-1 country.
+ # 3. Zone name used in value of TZ environment variable.
+ # Please see the 'Theory' file for how zone names are chosen.
++# If multiple zones overlap a country, each has a row in the
++# table, with column 1 being duplicated.
+ # 4. Comments; present if and only if the country has multiple rows.
+ #
+ # Columns are separated by a single tab.
+ # The table is sorted first by country, then an order within the country that
+ # (1) makes some geographical sense, and
+-# (2) puts the most populous zones first, where that does not contradict (1).
++# (2) puts the most populous areas first, where that does not contradict (1).
+ #
+-# Lines beginning with `#' are comments.
++# Lines beginning with '#' are comments.
+ #
+ # This table is intended as an aid for users, to help them select time
+ # zone data appropriate for their practical needs. It is not intended
+@@ -63,8 +65,7 @@
+ AL +4120+01950 Europe/Tirane
+ AM +4011+04430 Asia/Yerevan
+ AO -0848+01314 Africa/Luanda
+-AQ -7750+16636 Antarctica/McMurdo McMurdo Station, Ross Island
+-AQ -9000+00000 Antarctica/South_Pole Amundsen-Scott Station, South Pole
++AQ -7750+16636 Antarctica/McMurdo McMurdo, South Pole, Scott (New Zealand time)
+ AQ -6734-06808 Antarctica/Rothera Rothera Station, Adelaide Island
+ AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island
+ AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay
+@@ -144,8 +145,7 @@
+ CA +4606-06447 America/Moncton Atlantic Time - New Brunswick
+ CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador - most locations
+ CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec - Lower North Shore
+-CA +4531-07334 America/Montreal Eastern Time - Quebec - most locations
+-CA +4339-07923 America/Toronto Eastern Time - Ontario - most locations
++CA +4339-07923 America/Toronto Eastern Time - Ontario & Quebec - most locations
+ CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+ CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario
+ CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations
+@@ -256,7 +256,7 @@
+ IS +6409-02151 Atlantic/Reykjavik
+ IT +4154+01229 Europe/Rome
+ JE +4912-00207 Europe/Jersey
+-JM +1800-07648 America/Jamaica
++JM +175805-0764736 America/Jamaica
+ JO +3157+03556 Asia/Amman
+ JP +353916+1394441 Asia/Tokyo
+ KE -0117+03649 Africa/Nairobi
+@@ -445,8 +445,7 @@
+ US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County
+ US +394421-1045903 America/Denver Mountain Time
+ US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
+-US +364708-1084111 America/Shiprock Mountain Time - Navajo
+-US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona
++US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
+ US +340308-1181434 America/Los_Angeles Pacific Time
+ US +611305-1495401 America/Anchorage Alaska Time
+ US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
+--- ./jdk/make/sun/net/FILES_java.gmk Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/make/sun/net/FILES_java.gmk Thu Dec 19 09:01:16 2013 -0800
+@@ -24,122 +24,123 @@
+ #
+
+ FILES_java = \
+- sun/net/InetAddressCachePolicy.java \
+- sun/net/URLCanonicalizer.java \
+- sun/net/NetworkClient.java \
+- sun/net/NetworkServer.java \
+- sun/net/ProgressMonitor.java \
+- sun/net/ProgressSource.java \
+- sun/net/ProgressEvent.java \
+- sun/net/ProgressListener.java \
+- sun/net/ProgressMeteringPolicy.java \
+- sun/net/SocksProxy.java \
+- sun/net/ResourceManager.java \
+- sun/net/TelnetInputStream.java \
+- sun/net/TelnetOutputStream.java \
+- sun/net/TelnetProtocolException.java \
+- sun/net/TransferProtocolClient.java \
+- sun/net/ConnectionResetException.java \
+- sun/net/NetProperties.java \
+- sun/net/NetHooks.java \
+- sun/net/util/IPAddressUtil.java \
+- sun/net/util/URLUtil.java \
+- sun/net/dns/ResolverConfiguration.java \
+- sun/net/dns/ResolverConfigurationImpl.java \
+- sun/net/ftp/FtpClient.java \
+- sun/net/ftp/FtpClientProvider.java \
+- sun/net/ftp/FtpDirEntry.java \
+- sun/net/ftp/FtpReplyCode.java \
+- sun/net/ftp/FtpDirParser.java \
+- sun/net/ftp/FtpLoginException.java \
+- sun/net/ftp/FtpProtocolException.java \
+- sun/net/ftp/impl/FtpClient.java \
+- sun/net/ftp/impl/DefaultFtpClientProvider.java \
+- sun/net/sdp/SdpSupport.java \
+- sun/net/spi/DefaultProxySelector.java \
+- sun/net/spi/nameservice/NameServiceDescriptor.java \
+- sun/net/spi/nameservice/NameService.java \
+- sun/net/smtp/SmtpClient.java \
+- sun/net/smtp/SmtpProtocolException.java \
+- sun/net/www/content/text/Generic.java \
+- sun/net/www/content/text/plain.java \
+- sun/net/www/content/text/PlainTextInputStream.java \
+- sun/net/www/MessageHeader.java \
+- sun/net/www/HeaderParser.java \
+- sun/net/www/MeteredStream.java \
+- sun/net/www/MimeEntry.java \
+- sun/net/www/MimeLauncher.java \
+- sun/net/www/ApplicationLaunchException.java \
+- sun/net/www/MimeTable.java \
+- sun/net/www/URLConnection.java \
+- sun/net/www/ParseUtil.java \
+- sun/net/www/protocol/file/Handler.java \
+- sun/net/www/protocol/file/FileURLConnection.java \
+- sun/net/www/http/HttpClient.java \
+- sun/net/www/http/HttpCapture.java \
+- sun/net/www/http/HttpCaptureInputStream.java \
+- sun/net/www/http/HttpCaptureOutputStream.java \
+- sun/net/www/http/PosterOutputStream.java \
+- sun/net/www/http/ChunkedInputStream.java \
+- sun/net/www/http/ChunkedOutputStream.java \
+- sun/net/www/http/KeepAliveCache.java \
+- sun/net/www/http/KeepAliveStream.java \
+- sun/net/www/http/KeepAliveStreamCleaner.java \
+- sun/net/www/http/Hurryable.java \
+- sun/net/www/protocol/http/Handler.java \
+- sun/net/www/protocol/http/HttpURLConnection.java \
+- sun/net/www/protocol/http/HttpAuthenticator.java \
+- sun/net/www/protocol/http/AuthenticationHeader.java \
+- sun/net/www/protocol/http/AuthenticationInfo.java \
+- sun/net/www/protocol/http/AuthCache.java \
+- sun/net/www/protocol/http/AuthCacheImpl.java \
+- sun/net/www/protocol/http/AuthCacheValue.java \
+- sun/net/www/protocol/http/AuthScheme.java \
+- sun/net/www/protocol/http/BasicAuthentication.java \
+- sun/net/www/protocol/http/DigestAuthentication.java \
+- sun/net/www/protocol/http/NTLMAuthenticationProxy.java \
+- sun/net/www/protocol/http/NegotiateAuthentication.java \
+- sun/net/www/protocol/http/Negotiator.java \
+- sun/net/www/protocol/http/ntlm/NTLMAuthentication.java \
+- sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java \
+- sun/net/www/protocol/http/spnego/NegotiatorImpl.java \
+- sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java \
+- sun/net/www/protocol/http/logging/HttpLogFormatter.java \
+- sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java \
+- sun/net/www/protocol/https/HttpsClient.java \
+- sun/net/www/protocol/https/DefaultHostnameVerifier.java \
+- sun/net/www/protocol/https/HttpsURLConnectionImpl.java \
+- sun/net/www/protocol/https/DelegateHttpsURLConnection.java \
+- sun/net/www/protocol/https/Handler.java \
+- sun/net/www/protocol/jar/Handler.java \
+- sun/net/www/protocol/jar/URLJarFile.java \
+- sun/net/www/protocol/jar/JarFileFactory.java \
+- sun/net/www/protocol/jar/JarURLConnection.java \
+- sun/net/www/protocol/netdoc/Handler.java \
+- sun/net/www/content/image/gif.java \
+- sun/net/www/content/image/jpeg.java \
+- sun/net/www/content/image/x_xbitmap.java \
+- sun/net/www/content/image/x_xpixmap.java \
+- sun/net/www/content/image/png.java \
+- sun/net/www/content/audio/aiff.java \
+- sun/net/www/content/audio/basic.java \
+- sun/net/www/content/audio/wav.java \
+- sun/net/www/content/audio/x_aiff.java \
+- sun/net/www/content/audio/x_wav.java \
+- sun/net/www/protocol/ftp/Handler.java \
+- sun/net/www/protocol/ftp/FtpURLConnection.java \
+- sun/net/www/protocol/gopher/GopherClient.java \
+- sun/net/www/protocol/gopher/Handler.java \
+- sun/net/www/protocol/mailto/Handler.java \
+- sun/net/www/protocol/mailto/MailToURLConnection.java \
+- sun/net/idn/Punycode.java \
+- sun/net/idn/UCharacterEnums.java \
+- sun/net/idn/UCharacterDirection.java \
+- sun/net/idn/StringPrepDataReader.java \
+- sun/net/idn/StringPrep.java
++ sun/net/InetAddressCachePolicy.java \
++ sun/net/URLCanonicalizer.java \
++ sun/net/NetworkClient.java \
++ sun/net/NetworkServer.java \
++ sun/net/PortConfig.java \
++ sun/net/ProgressMonitor.java \
++ sun/net/ProgressSource.java \
++ sun/net/ProgressEvent.java \
++ sun/net/ProgressListener.java \
++ sun/net/ProgressMeteringPolicy.java \
++ sun/net/SocksProxy.java \
++ sun/net/ResourceManager.java \
++ sun/net/TelnetInputStream.java \
++ sun/net/TelnetOutputStream.java \
++ sun/net/TelnetProtocolException.java \
++ sun/net/TransferProtocolClient.java \
++ sun/net/ConnectionResetException.java \
++ sun/net/NetProperties.java \
++ sun/net/NetHooks.java \
++ sun/net/util/IPAddressUtil.java \
++ sun/net/util/URLUtil.java \
++ sun/net/dns/ResolverConfiguration.java \
++ sun/net/dns/ResolverConfigurationImpl.java \
++ sun/net/ftp/FtpClient.java \
++ sun/net/ftp/FtpClientProvider.java \
++ sun/net/ftp/FtpDirEntry.java \
++ sun/net/ftp/FtpReplyCode.java \
++ sun/net/ftp/FtpDirParser.java \
++ sun/net/ftp/FtpLoginException.java \
++ sun/net/ftp/FtpProtocolException.java \
++ sun/net/ftp/impl/FtpClient.java \
++ sun/net/ftp/impl/DefaultFtpClientProvider.java \
++ sun/net/sdp/SdpSupport.java \
++ sun/net/spi/DefaultProxySelector.java \
++ sun/net/spi/nameservice/NameServiceDescriptor.java \
++ sun/net/spi/nameservice/NameService.java \
++ sun/net/smtp/SmtpClient.java \
++ sun/net/smtp/SmtpProtocolException.java \
++ sun/net/www/content/text/Generic.java \
++ sun/net/www/content/text/plain.java \
++ sun/net/www/content/text/PlainTextInputStream.java \
++ sun/net/www/MessageHeader.java \
++ sun/net/www/HeaderParser.java \
++ sun/net/www/MeteredStream.java \
++ sun/net/www/MimeEntry.java \
++ sun/net/www/MimeLauncher.java \
++ sun/net/www/ApplicationLaunchException.java \
++ sun/net/www/MimeTable.java \
++ sun/net/www/URLConnection.java \
++ sun/net/www/ParseUtil.java \
++ sun/net/www/protocol/file/Handler.java \
++ sun/net/www/protocol/file/FileURLConnection.java \
++ sun/net/www/http/HttpClient.java \
++ sun/net/www/http/HttpCapture.java \
++ sun/net/www/http/HttpCaptureInputStream.java \
++ sun/net/www/http/HttpCaptureOutputStream.java \
++ sun/net/www/http/PosterOutputStream.java \
++ sun/net/www/http/ChunkedInputStream.java \
++ sun/net/www/http/ChunkedOutputStream.java \
++ sun/net/www/http/KeepAliveCache.java \
++ sun/net/www/http/KeepAliveStream.java \
++ sun/net/www/http/KeepAliveStreamCleaner.java \
++ sun/net/www/http/Hurryable.java \
++ sun/net/www/protocol/http/Handler.java \
++ sun/net/www/protocol/http/HttpURLConnection.java \
++ sun/net/www/protocol/http/HttpAuthenticator.java \
++ sun/net/www/protocol/http/AuthenticationHeader.java \
++ sun/net/www/protocol/http/AuthenticationInfo.java \
++ sun/net/www/protocol/http/AuthCache.java \
++ sun/net/www/protocol/http/AuthCacheImpl.java \
++ sun/net/www/protocol/http/AuthCacheValue.java \
++ sun/net/www/protocol/http/AuthScheme.java \
++ sun/net/www/protocol/http/BasicAuthentication.java \
++ sun/net/www/protocol/http/DigestAuthentication.java \
++ sun/net/www/protocol/http/NTLMAuthenticationProxy.java \
++ sun/net/www/protocol/http/NegotiateAuthentication.java \
++ sun/net/www/protocol/http/Negotiator.java \
++ sun/net/www/protocol/http/ntlm/NTLMAuthentication.java \
++ sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java \
++ sun/net/www/protocol/http/spnego/NegotiatorImpl.java \
++ sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java \
++ sun/net/www/protocol/http/logging/HttpLogFormatter.java \
++ sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java \
++ sun/net/www/protocol/https/HttpsClient.java \
++ sun/net/www/protocol/https/DefaultHostnameVerifier.java \
++ sun/net/www/protocol/https/HttpsURLConnectionImpl.java \
++ sun/net/www/protocol/https/DelegateHttpsURLConnection.java \
++ sun/net/www/protocol/https/Handler.java \
++ sun/net/www/protocol/jar/Handler.java \
++ sun/net/www/protocol/jar/URLJarFile.java \
++ sun/net/www/protocol/jar/JarFileFactory.java \
++ sun/net/www/protocol/jar/JarURLConnection.java \
++ sun/net/www/protocol/netdoc/Handler.java \
++ sun/net/www/content/image/gif.java \
++ sun/net/www/content/image/jpeg.java \
++ sun/net/www/content/image/x_xbitmap.java \
++ sun/net/www/content/image/x_xpixmap.java \
++ sun/net/www/content/image/png.java \
++ sun/net/www/content/audio/aiff.java \
++ sun/net/www/content/audio/basic.java \
++ sun/net/www/content/audio/wav.java \
++ sun/net/www/content/audio/x_aiff.java \
++ sun/net/www/content/audio/x_wav.java \
++ sun/net/www/protocol/ftp/Handler.java \
++ sun/net/www/protocol/ftp/FtpURLConnection.java \
++ sun/net/www/protocol/gopher/GopherClient.java \
++ sun/net/www/protocol/gopher/Handler.java \
++ sun/net/www/protocol/mailto/Handler.java \
++ sun/net/www/protocol/mailto/MailToURLConnection.java \
++ sun/net/idn/Punycode.java \
++ sun/net/idn/UCharacterEnums.java \
++ sun/net/idn/UCharacterDirection.java \
++ sun/net/idn/StringPrepDataReader.java \
++ sun/net/idn/StringPrep.java
+
+ ifeq ($(PLATFORM), windows)
+- FILES_java += sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
++ FILES_java += sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
+ else
+ FILES_java += sun/net/sdp/SdpProvider.java
+ endif
+--- ./jdk/src/bsd/doc/man/jarsigner.1 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/bsd/doc/man/jarsigner.1 Thu Dec 19 09:01:16 2013 -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"
++'\" 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 *
++.\" -----------------------------------------------------------------
+
+-.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
++.SH NAME
++jarsigner \- Signs and verifies Java Archive (JAR) files\&.
++.SH SYNOPSIS
++.sp
++.nf
+
+-.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
++\fBjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
++.fi
++.nf
+
+-.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
++\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\&.
+
+-.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
++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\&.
+
+-.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
++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
+
+-.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
++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
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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.
++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
+-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.
++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
+-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.
++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
+-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).
++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
+-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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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
+
+-.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.
++.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
+-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).
++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
+-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.
++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
+-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.
++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
+-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.
++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
+-.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
++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
+
+-.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
++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
+
+-.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
++.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
+
+-.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
++.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
+
+-.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
++.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
+
+-.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
++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
+
+-.LP
+-.LP
+-If the verification is successful,
+-.LP
+-.nf
+-\f3
+-.fl
+- jar verified.
+-.fl
+-\fP
+-.fi
++.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
+
+-.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
++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
+
+-.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
+-
++.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/linux/doc/man/ja/jarsigner.1 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/linux/doc/man/ja/jarsigner.1 Thu Dec 19 09:01:16 2013 -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
++\fIjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
+ .fi
+-
+-.LP
+-.LP
+-jarsigner¤Î\-verify¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë0¸Ä°Ê¾å¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢jarsigner¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ½ð̾ÉÕ¤­¥¨¥ó¥Æ¥£¥Æ¥£¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¡¢¤¤¤º¤ì¤«¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤Ë°ìÃפ¹¤ë¤³¤È¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ÊÌ̾¤Ï¡¢\-keystore¤Ç»ØÄꤵ¤ì¤¿¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢Æâ¤ËÄêµÁ¤µ¤ì¤Þ¤¹¡£
+-.LP
++.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¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÈÀ°¹çÀ­¤ò¸¡¾Ú¤¹¤ëÌÜŪ
++.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
+-
+-.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
+-½ð̾ÉÕ¤­¤Î¥Ç¡¼¥¿¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿¾ì¹ç¤Ï¡¢¤½¤Î½ð̾¤Ë¤è¤Ã¤Æ¥Ç¡¼¥¿¤¬ËÜʪ¤Ç¤Ï¤Ê¤¤¤³¤È¤¬¸¡¾Ú¤µ¤ì¤Þ¤¹¡£
++.sp
++.RS 4
++.ie n \{\
++\h'-04'\(bu\h'+03'\c
++.\}
++.el \{\
++.sp -1
++.IP \(bu 2.3
++.\}
++½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÈÀ°¹çÀ­¤ò¸¡¾Ú¤¹¤ëÌÜŪ¡£
+ .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
++.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
+-\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
++jarsigner \-keystore /working/mystore \-storepass <keystore password>
++ \-keypass <private key password> MyJARFile\&.jar duke
+ .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 @
++.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
+-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
++.if n \{\
++.RE
++.\}
++.PP
++¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ï¡¢\fIjks\fR
++(Oracle¤¬Ä󶡤¹¤ëÆȼ«¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ)¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¼¡¤Î¹Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
++.sp
++.if n \{\
++.RS 4
++.\}
+ .nf
+-\f3
+-.fl
+- KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+-.fl
+-\fP
++keystore\&.type=jks
+ .fi
+-
+-.LP
+-.LP
+-¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ïjks(Sun¤¬Ä󶡤¹¤ëÆȼ«¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ)¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¼¡¤Î¹Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
+-.LP
++.if n \{\
++.RE
++.\}
++.PP
++¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î»ØÄê¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\fIJKS\fR¤Ï\fIjks\fR¤ÈƱ¤¸¤Ë¤Ê¤ê¤Þ¤¹¡£
++.PP
++¥Ä¡¼¥ë¤Ç¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¤½¤Î¹Ô¤òÊѹ¹¤·¤ÆÊ̤Υ­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\fIpkcs12\fR¤È¸Æ¤Ð¤ì¤ë¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¾ì¹ç¡¢¹Ô¤ò¼¡¤Î¤è¤¦¤ËÊѹ¹¤·¤Þ¤¹¡£
++.sp
++.if n \{\
++.RS 4
++.\}
+ .nf
+-\f3
+-.fl
+- keystore.type=jks
+-.fl
+-\fP
++keystore\&.type=pkcs12
+ .fi
+-
+-.LP
+-.LP
+-Ãí°Õ: ¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î»ØÄê¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢JKS¤Èjks¤ÏƱ¤¸¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
+-.LP
+-.LP
+-³Æ¥Ä¡¼¥ë¤Ç¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤òÊѹ¹¤·¤ÆÊ̤Υ­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢pkcs12¤È¸Æ¤Ð¤ì¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤ò¼¡¤Î¤è¤¦¤ËÊѹ¹¤·¤Þ¤¹¡£
+-.LP
++.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
+-\f3
+-.fl
+- keystore.type=pkcs12
+-.fl
+-\fP
++\-tsa \fIurl\fR
++\-tsacert \fIalias\fR
++\-altsigner \fIclass\fR
++\-altsignerpath \fIclasspathlist\fR
++\-tsapolicyid \fIpolicyid\fR
+ .fi
+-
+-.LP
+-.LP
+-PKCS#11¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Î¾ÜºÙ¤Ï¡¢Java PKCS#11¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Ë¤¢¤ë
+-.na
+-\f2KeyTool¤ÈJarSigner\fP @
++.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
++.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
+-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(Âʱ߶ÊÀþ)°Å¹æÊý¼°¥¢¥ë¥´¥ê¥º¥à
++.if n \{\
+ .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¤ò³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë
++.\}
++.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
+-
+-.LP
+-.LP
+-¤³¤ì¤é2¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢\f2\-sigFile\fP¥ª¥×¥·¥ç¥ó¤ÎÃͤ«¤éºîÀ®¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¤È¤·¤Þ¤¹¡£
+-.LP
++.\}
++.PP
++\fBÃí°Õ: \fRJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢JDK 1\&.1¤Î\fIjavakey\fR¥³¥Þ¥ó¥É¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿½ð̾¤È¡¢\fIjarsigner\fR¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿½ð̾¤òº®ºß¤µ¤»¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢\fIjavakey\fR¥³¥Þ¥ó¥É¤Ç¤¹¤Ç¤Ë½ð̾¤µ¤ì¤Æ¤¤¤ëJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤Ç¤­¤Þ¤¹¡£
++.SH "¥ª¥×¥·¥ç¥ó"
++.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
+-\-sigFile MKSIGN
+-.fl
+-\fP
++\-keystore \fIfilePathAndName\fR
+ .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¥À¥¤¥¸¥§¥¹¥È¤ÎÃÍ
++.if n \{\
+ .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
++.\}
++.sp
++.if n \{\
++.RS 4
++.\}
++.nf
++\-keystore file:\fIfilePathAndName\fR
++.fi
++.if n \{\
+ .RE
+-
+-.LP
+-.LP
+-¤³¤ì¤é¤Î³Æ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï¡¢¥ª¥×¥·¥ç¥ó¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+-.LP
+-.SS
+-JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú
+-.LP
+-.LP
+-JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤¬À®¸ù¤¹¤ë¤Î¤Ï¡¢½ð̾¤¬Í­¸ú¤Ç¤¢¤ê¡¢¤«¤Ä½ð̾¤ÎÀ¸À®°Ê¸å¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Î¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ï¡¢¼¡¤Î¼ê½ç¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
+-.LP
+-.RS 3
+-.TP 3
+-1.
+-.SF¥Õ¥¡¥¤¥ë¼«ÂΤνð̾¤ò¸¡¾Ú¤·¤Þ¤¹¡£
++.\}
++(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¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ë½ð̾¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
++.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¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥È¥ê¤ò¥À¥¤¥¸¥§¥¹¥È¤¹¤ëºÝ¤Ë»ÈÍѤ¹¤ë¥á¥Ã¥»¡¼¥¸¡¦¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
++.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
++.fi
++.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
++.fi
++.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
++\-altsignerpath /home/user/lib/authsigner\&.jar
++.fi
++.if n \{\
++.RE
++.\}
++¼¡¤ÎÎã¤Ç¤Ï¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÊýË¡¤ò¼¨¤·¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë̾¤ò¾Êά¤·¤Þ¤¹¡£
++.sp
++.if n \{\
++.RS 4
++.\}
++.nf
++\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/
++.fi
++.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
+-¤³¤Î¼ê½ç¤Ç¤Ï¡¢³Æ½ð̾¥Ö¥í¥Ã¥¯(.DSA)¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë½ð̾¤¬¡¢¼ÂºÝ¤Ë¡¢¸ø³«¸°¤ËÂбþ¤¹¤ëÈëÌ©¸°¤ò»ÈÍѤ·¤ÆÀ¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¤³¤È¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£.DSA¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¸ø³«¸°¤Î¾ÚÌÀ½ñ(¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó)¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢¤³¤Î¼ê½ç¤Ç¤Ï¡¢ÌÜŪ¤Î½ð̾¤¬¡¢Âбþ¤¹¤ë½ð̾(.SF)¥Õ¥¡¥¤¥ëÆâ¤ÎÍ­¸ú¤Ê½ð̾¤Ç¤¢¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¡¢.SF¥Õ¥¡¥¤¥ë¤¬²þÊѤµ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤â³Îǧ¤µ¤ì¤Þ¤¹¡£
+-.TP 3
+-2.
+-.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥¨¥ó¥È¥ê¤Î¥À¥¤¥¸¥§¥¹¥È¤ò¥Þ¥Ë¥Õ¥§¥¹¥ÈÆâ¤ÎÂбþ¤¹¤ë³Æ¥»¥¯¥·¥ç¥ó¤ÈÆͤ­¤¢¤ï¤»¤Æ¸¡¾Ú¤·¤Þ¤¹¡£
++.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
+-.SF¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤¬¥Ç¥Õ¥©¥ë¥È¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¡¢¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¼ÂºÝ¤Ë¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò¸¡¾Ú¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Ï¥Ã¥·¥å¤¬°ìÃפ¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¼ê½ç¤Ë¸¡¾Ú¤¬¿Ê¤ß¤Þ¤¹¡£
++.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
++.SH "Îã"
++.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
++ m = entry is listed in manifest
++ k = at least one certificate was found in keystore
++
++ 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
++ m = entry is listed in manifest
++ k = at least one certificate was found in keystore
++
++ 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
++ m = entry is listed in manifest
++ k = at least one certificate was found in keystore
++ i = at least one certificate was found in identity scope
++
++ jar verified\&.
++.fi
++.if n \{\
++.RE
++.\}
++.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
+-¥Ï¥Ã¥·¥å¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢¸úΨŪ¤Ë¤ÏÎô¤ëÊýË¡¤ò»ÈÍѤ·¤¿¸¡¾Ú¤¬É¬Íפˤʤê¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤¬³Îǧ¤µ¤ì¤Þ¤¹(½ð̾(.SF)¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£
++.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
+-.SF¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼¤Ë³ÊǼ¤µ¤ì¤¿¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È¡¢¼ÂºÝ¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢½ð̾(¤Ä¤Þ¤ê.SF¥Õ¥¡¥¤¥ë)¤ÎÀ¸À®¸å¤Ë¡¢JAR¥Õ¥¡¥¤¥ë¤Ë1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤¬(\f2jar\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ)Äɲ䵤줿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\f2jar\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¥Õ¥¡¥¤¥ë¤òÄɲä·¤¿¾ì¹ç¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤¹(¿·¤·¤¤¥Õ¥¡¥¤¥ëÍѤΥ»¥¯¥·¥ç¥ó¤¬Äɲ䵤ì¤Þ¤¹)¤¬¡¢.SF¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¡£¤³¤Î¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼°Ê³°¤Î¥»¥¯¥·¥ç¥ó¤Ë³ÊǼ¤µ¤ì¤¿¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤È¤­¤Ï¡¢½ð̾¤ÎÀ¸À®»þ¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Ë¸ºß¤·¤Æ¤¤¤¿¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤Ë¤Ê¤ê¡¢¸¡¾Ú¤ÏÀ®¸ù¤·¤¿¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
+-.TP 3
+-3.
+-JAR¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Ë¥¨¥ó¥È¥ê¤ò»ý¤Ä³Æ¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£Æɹþ¤ßÃæ¤Ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ò·×»»¤·¡¢·ë²Ì¤ò¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥»¥¯¥·¥ç¥óÆâ¤Î³ºÅö¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÈÈæ³Ó¤·¤Þ¤¹¡£2¤Ä¤Î¥À¥¤¥¸¥§¥¹¥È¤ÏƱ¤¸¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¡¢¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¸¡¾Ú¤¬¼ºÇÔ¤·¤Þ¤¹¡£
++.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
+-
+-.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
+-.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¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¾ì¹ç¤Î¤ß¤Ç¤¹¡£
++.sp
++.RS 4
++.ie n \{\
++\h'-04' 2.\h'+01'\c
++.\}
++.el \{\
++.sp -1
++.IP " 2." 4.2
++.\}
++¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë/¥­¡¼¥¹¥È¥¢¤ÎÁȹ礻¤Ï¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹¡£
+ .RE
+-
+-.LP
+-.RS 3
+-.TP 3
+-\-keystore url
+-¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¼¨¤¹URL¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¥Õ¥¡¥¤¥ë\f2.keystore\fP¤Ç¤¹¡£¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢user.home¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ë¤è¤Ã¤Æ·è¤Þ¤ê¤Þ¤¹¡£
++.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
+-.br
+-½ð̾¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤¬É¬ÍפǤ¹¡£¤³¤Î¤¿¤á¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç(¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç)¤Ï¡¢¥­¡¼¥¹¥È¥¢¤òÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+-.br
+-.br
+-¸¡¾Ú¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤Ï\f2ɬÍפ¢¤ê¤Þ¤»¤ó\fP¡£¤¿¤À¤·¡¢¥­¡¼¥¹¥È¥¢¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Æ¤¤¤Æ¡¢¤µ¤é¤Ë\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤â»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¤½¤Î¥­¡¼¥¹¥È¥¢¤Ë1¤Ä¤Ç¤â´Þ¤Þ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë´Ø¤¹¤ëÄɲþðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£
+-.br
+-.br
+-Ãí°Õ: \f2\-keystore\fP¤Î°ú¿ô¤Ë¤Ï¡¢URL¤Î¤«¤ï¤ê¤Ë¥Õ¥¡¥¤¥ë̾(¤È¥Ñ¥¹)¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥Õ¥¡¥¤¥ë̾(¤È¥Ñ¥¹)¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¡Öfile:¡×URL¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
+-.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
+-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
+-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
+- \-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
+- \-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¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
+-.nf
+-\f3
+-.fl
+-\-altsignerpath /home/user/lib/authsigner.jar
+-.fl
+-\fP
+-.fi
+-JAR¥Õ¥¡¥¤¥ë̾¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+-.br
+-.br
+-¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
+-.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¤Ä¤Î¥¨¥ó¥È¥ê(¤ª¤è¤Ó¤½¤ì°Ê¾å)¡×¤È¤·¤ÆÍ×Ì󤵤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢Îã¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+-.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
+- 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
+- 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
+- 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 @
+-.fi
+-http://docs.oracle.com/javase/tutorial/security/index.html¤ò»²¾È
+-.RE
+-
+-.LP
+-
++'pl 8.5i
++'bp
+--- ./jdk/src/linux/doc/man/jarsigner.1 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/linux/doc/man/jarsigner.1 Thu Dec 19 09:01:16 2013 -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"
++'\" 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 *
++.\" -----------------------------------------------------------------
+
+-.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
++.SH NAME
++jarsigner \- Signs and verifies Java Archive (JAR) files\&.
++.SH SYNOPSIS
++.sp
++.nf
+
+-.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
++\fBjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
++.fi
++.nf
+
+-.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
++\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\&.
+
+-.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
++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\&.
+
+-.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
++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
+
+-.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
++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
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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.
++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
+-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.
++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
+-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.
++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
+-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).
++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
+-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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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
+
+-.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.
++.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
+-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).
++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
+-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.
++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
+-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.
++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
+-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.
++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
+-.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
++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
+
+-.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
++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
+
+-.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
++.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
+
+-.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
++.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
+
+-.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
++.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
+
+-.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
++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
+
+-.LP
+-.LP
+-If the verification is successful,
+-.LP
+-.nf
+-\f3
+-.fl
+- jar verified.
+-.fl
+-\fP
+-.fi
++.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
+
+-.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
++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
+
+-.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
+-
++.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/resources/aqua_ko.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -46,7 +46,7 @@
+ FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30
+ FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+ FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+-FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0
++FileChooser.updateButton.textAndMnemonic=\uC5C5\uB370\uC774\uD2B8
+ FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0
+ FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30
+
+--- ./jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m Thu Dec 19 09:01:16 2013 -0800
+@@ -290,8 +290,8 @@
+ SplashUnlock(splash);
+ rc = poll(pfd, 1, timeout);
+ SplashLock(splash);
+- if (splash->isVisible>0 && SplashTime() >= splash->time +
+- splash->frames[splash->currentFrame].delay) {
++ if (splash->isVisible > 0 && splash->currentFrame >= 0 &&
++ SplashTime() >= splash->time + splash->frames[splash->currentFrame].delay) {
+ SplashNextFrame(splash);
+ SplashRedrawWindow(splash);
+ }
+--- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -102,7 +102,7 @@
+ #
+ # accessible actions
+ #
+-toggleexpand=ein-/ausblenden
++toggleexpand=einblenden umschalten
+
+ # new relations, roles and states for J2SE 1.5.0
+
+--- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -102,7 +102,7 @@
+ #
+ # accessible actions
+ #
+-toggleexpand=activar/desactivar ampliaci\u00F3n
++toggleexpand=conmutar ampliaci\u00F3n
+
+ # new relations, roles and states for J2SE 1.5.0
+
+--- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -102,7 +102,7 @@
+ #
+ # accessible actions
+ #
+-toggleexpand=basculer le d\u00E9veloppement
++toggleexpand=activer/d\u00E9sactiver d\u00E9veloppement
+
+ # new relations, roles and states for J2SE 1.5.0
+
+--- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -102,7 +102,7 @@
+ #
+ # accessible actions
+ #
+-toggleexpand=abilita/disabilita espansione
++toggleexpand=attiva/disattiva espansione
+
+ # new relations, roles and states for J2SE 1.5.0
+
+--- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -102,7 +102,7 @@
+ #
+ # accessible actions
+ #
+-toggleexpand=alternar expans\u00E3o
++toggleexpand=alternar expandir
+
+ # new relations, roles and states for J2SE 1.5.0
+
+--- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -102,7 +102,7 @@
+ #
+ # accessible actions
+ #
+-toggleexpand=v\u00E4xla ut\u00F6ka
++toggleexpand=v\u00E4xla expandering
+
+ # new relations, roles and states for J2SE 1.5.0
+
+--- ./jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java Thu Dec 19 09:01:16 2013 -0800
+@@ -29,6 +29,7 @@
+ import java.beans.ExceptionListener;
+
+ import java.io.IOException;
++import java.io.StringReader;
+
+ import java.lang.ref.Reference;
+ import java.lang.ref.WeakReference;
+@@ -246,6 +247,14 @@
+ }
+
+ /**
++ * Disables any external entities.
++ */
++ @Override
++ public InputSource resolveEntity(String publicId, String systemId) {
++ return new InputSource(new StringReader(""));
++ }
++
++ /**
+ * Prepares this handler to read objects from XML document.
+ */
+ @Override
+--- ./jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2012, 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
+@@ -404,8 +404,9 @@
+ }
+ return skey;
+ } else if (algorithm.equals("TlsPremasterSecret")) {
+- // return entire secret
+- return new SecretKeySpec(secret, "TlsPremasterSecret");
++ // remove leading zero bytes per RFC 5246 Section 8.1.2
++ return new SecretKeySpec(
++ KeyUtil.trimZeroes(secret), "TlsPremasterSecret");
+ } else {
+ throw new NoSuchAlgorithmException("Unsupported secret key "
+ + "algorithm: "+ algorithm);
+--- ./jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java Thu Dec 19 09:01:16 2013 -0800
+@@ -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
+@@ -72,13 +72,17 @@
+ throw new IllegalStateException(
+ "TlsRsaPremasterSecretGenerator must be initialized");
+ }
+- if (random == null) {
+- random = new SecureRandom();
++ byte[] b = spec.getEncodedSecret();
++ if (b == null) {
++ if (random == null) {
++ random = new SecureRandom();
++ }
++ b = new byte[48];
++ random.nextBytes(b);
++ b[0] = (byte)spec.getMajorVersion();
++ b[1] = (byte)spec.getMinorVersion();
+ }
+- byte[] b = new byte[48];
+- random.nextBytes(b);
+- b[0] = (byte)spec.getMajorVersion();
+- b[1] = (byte)spec.getMinorVersion();
++
+ return new SecretKeySpec(b, "TlsRsaPremasterSecret");
+ }
+
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -41,7 +41,7 @@
+ FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+ FileChooser.pathLabel.textAndMnemonic=Aus&wahl:
+ FileChooser.filterLabel.textAndMnemonic=Filter:
+-FileChooser.foldersLabel.textAndMnemonic=Or&dner
++FileChooser.foldersLabel.textAndMnemonic=O&rdner
+ FileChooser.filesLabel.textAndMnemonic=&Dateien
+
+ FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -24,7 +24,7 @@
+ FileChooser.openButton.textAndMnemonic=\uD655\uC778
+ FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+ FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+-FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0
++FileChooser.updateButton.textAndMnemonic=\uC5C5\uB370\uC774\uD2B8
+ FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0
+ FileChooser.pathLabel.textAndMnemonic=\uACBD\uB85C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uC785\uB825(&P):
+ FileChooser.filterLabel.textAndMnemonic=\uD544\uD130(&R)
+@@ -36,5 +36,5 @@
+ FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
+ FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
+ FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
+-FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D\uC744 \uAC31\uC2E0\uD569\uB2C8\uB2E4.
++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/snmp/agent/SnmpMibEntry.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java Thu Dec 19 09:01:16 2013 -0800
+@@ -27,17 +27,9 @@
+
+ // java imports
+ //
++import com.sun.jmx.snmp.SnmpDefinitions;
+ import java.io.Serializable;
+-import java.util.Hashtable;
+-import java.util.Enumeration;
+-
+-// jmx imports
+-//
+-import com.sun.jmx.snmp.SnmpValue;
+-import com.sun.jmx.snmp.SnmpVarBind;
+ import com.sun.jmx.snmp.SnmpStatusException;
+-import com.sun.jmx.snmp.agent.SnmpMibOid;
+-import com.sun.jmx.snmp.agent.SnmpMibNode;
+
+ /**
+ * Represents a node in an SNMP MIB which corresponds to a table entry
+@@ -99,7 +91,7 @@
+ */
+ public void validateVarId(long arc, Object userData)
+ throws SnmpStatusException {
+- if (isVariable(arc) == false) throw noSuchNameException;
++ if (isVariable(arc) == false) throw new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName);
+ }
+
+ /**
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java Thu Dec 19 09:01:16 2013 -0800
+@@ -116,7 +116,7 @@
+ public void validateVarId(long arc, Object userData)
+ throws SnmpStatusException {
+ if (isVariable(arc) == false)
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ }
+
+
+@@ -365,16 +365,16 @@
+
+ // The trailing .0 is missing in the OID
+ if (depth+2 > length)
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+
+ // There are too many arcs left in the OID (there should remain
+ // a single trailing .0)
+ if (depth+2 < length)
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+
+ // The last trailing arc is not .0
+ if (oid[depth+1] != 0L)
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+
+ // It's one of our variable, register this node.
+ handlers.add(this,depth,varbind);
+@@ -397,7 +397,7 @@
+ // abort the whole request, so we're going to throw
+ // a noSuchObject...
+ //
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ final Object data = handlers.getUserData();
+ final int pduVersion = handlers.getRequestPduVersion();
+@@ -433,7 +433,7 @@
+ depth+1,handlers,
+ checker);
+ }catch(SnmpStatusException ex) {
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ } finally {
+ checker.remove(depth);
+ }
+@@ -458,7 +458,7 @@
+ try {
+ checker.checkCurrentOid();
+ } catch(SnmpStatusException e) {
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ } finally {
+ checker.remove(depth,2);
+ }
+@@ -503,7 +503,7 @@
+ // The oid is not valid, we will throw an exception in order
+ // to try with the next valid identifier...
+ //
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ } 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java Thu Dec 19 09:01:16 2013 -0800
+@@ -155,7 +155,7 @@
+ long[] oid, int depth,
+ SnmpRequestTree handlers)
+ throws SnmpStatusException {
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ }
+
+ /**
+@@ -183,7 +183,7 @@
+ long[] oid, int pos, int depth,
+ SnmpRequestTree handlers, AcmChecker checker)
+ throws SnmpStatusException {
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ }
+
+ /**
+@@ -347,7 +347,7 @@
+ final int val= (int) value;
+
+ if (a == null)
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ int low= 0;
+ int max= a.length;
+@@ -357,10 +357,10 @@
+ // Basic check
+ //
+ if (max < 1)
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ if (a[max-1] <= val)
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ while (low <= max) {
+ elmt= a[curr];
+@@ -400,15 +400,4 @@
+ * Contains the list of variable identifiers.
+ */
+ protected int[] varList;
+-
+- /**
+- * Contains a predefined exception that is often fired when an
+- * object is not found in the MIB.
+- */
+- static final protected SnmpStatusException noSuchInstanceException =
+- new SnmpStatusException(SnmpStatusException.noSuchInstance);
+- static final protected SnmpStatusException noSuchObjectException =
+- new SnmpStatusException(SnmpStatusException.noSuchObject);
+- static final protected SnmpStatusException noSuchNameException =
+- new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName);
+ }
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java Thu Dec 19 09:01:16 2013 -0800
+@@ -157,11 +157,11 @@
+
+ if (depth > length) {
+ // Nothing is left... the oid is not valid
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ } else if (depth == length) {
+ // The oid is not complete...
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+
+ } else {
+ // Some children variable or subobject is being querried
+@@ -206,7 +206,7 @@
+ // abort the whole request, so we're going to throw
+ // a noSuchObject...
+ //
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ final Object data = handlers.getUserData();
+ final int pduVersion = handlers.getRequestPduVersion();
+@@ -231,7 +231,7 @@
+ // SnmpOid result = null;
+ if (child == null) {
+ // shouldn't happen
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ // validateVarId(index);
+ // handlers.add(this,varbind,depth);
+ // result = new SnmpOid(0);
+@@ -442,10 +442,10 @@
+ //
+ final int pos= getInsertAt(id);
+ if (pos >= nbChildren)
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ if (varList[pos] != (int) id)
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ // Access the node
+ //
+@@ -453,10 +453,10 @@
+ try {
+ child = children.elementAtNonSync(pos);
+ } catch(ArrayIndexOutOfBoundsException e) {
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ }
+ if (child == null)
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+ return child;
+ }
+
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java Thu Dec 19 09:01:16 2013 -0800
+@@ -279,7 +279,7 @@
+ SnmpVarBind var = null;
+ for (Enumeration e= r.getElements(); e.hasMoreElements();) {
+ var = (SnmpVarBind) e.nextElement();
+- r.registerGetException(var,noSuchInstanceException);
++ r.registerGetException(var,new SnmpStatusException(SnmpStatusException.noSuchInstance));
+ }
+ }
+
+@@ -1607,7 +1607,7 @@
+ throws SnmpStatusException {
+
+ if (size == 0)
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+
+ final SnmpOid resOid = oid;
+
+@@ -1618,7 +1618,7 @@
+ if (last.equals(resOid)) {
+ // Last element of the table ...
+ //
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+ }
+
+ // First find the oid. This will allow to speed up retrieval process
+@@ -1640,12 +1640,12 @@
+ // XX last = (SnmpOid) oids.elementAt(newPos);
+ last = tableoids[newPos];
+ } catch(ArrayIndexOutOfBoundsException e) {
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+ }
+ } else {
+ // We are dealing with the last element of the table ..
+ //
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+ }
+
+
+@@ -1668,7 +1668,7 @@
+ protected SnmpOid getNextOid(Object userData)
+ throws SnmpStatusException {
+ if (size == 0)
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+ // XX return (SnmpOid) oids.firstElement();
+ return tableoids[0];
+ }
+@@ -1875,7 +1875,7 @@
+ if (!hasEntry) {
+ if (!handlers.isCreationAllowed())
+ // we're not doing a set
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+ else if (!isCreationEnabled())
+ // we're doing a set but creation is disabled.
+ throw new
+@@ -1921,7 +1921,7 @@
+ // abort the whole request, so we're going to throw
+ // a noSuchObject...
+ //
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ final Object data = handlers.getUserData();
+ final int pduVersion = handlers.getRequestPduVersion();
+@@ -1955,7 +1955,7 @@
+ // so we won't find the next element in this table... (any
+ // element in this table will have a smaller OID)
+ //
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ } else if (oid[pos] < nodeId) {
+ // we must return the first leaf under the first columnar
+ // object, so we are back to our first case where pos was
+@@ -2046,7 +2046,7 @@
+ // must have the same holes)
+ //
+ if (skipEntryVariable(entryoid,var,data,pduVersion))
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ } catch(SnmpStatusException se) {
+ entryoid = getNextOid(data);
+ var = getNextVarEntryId(entryoid,var,data,pduVersion);
+@@ -2079,7 +2079,7 @@
+ // So we throw the exception.
+ // => will skip to next node in the MIB tree.
+ //
+- if (entryoid == null || var == -1 ) throw noSuchObjectException;
++ if (entryoid == null || var == -1 ) throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+
+ // So here we know both the row (entryoid) and the column (var)
+@@ -2092,7 +2092,7 @@
+ // other entry => skip to next column.
+ //
+ if (!isReadableEntryId(entryoid,var,data))
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ // Prepare the result and the ACM checker.
+ //
+@@ -2156,7 +2156,7 @@
+ // => will skip to next node in the MIB tree.
+ //
+ if (entryoid == null || var == -1 )
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+ }
+ }
+
+@@ -2177,12 +2177,12 @@
+ // Control the length of the oid
+ //
+ if (pos +2 >= length)
+- throw noSuchInstanceException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
+
+ // Check that the entry identifier is specified
+ //
+ if (oid[pos] != nodeId)
+- throw noSuchObjectException;
++ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
+
+ }
+
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1146,7 +1146,4 @@
+
+ static final private String InterruptSysCallMsg =
+ "Interrupted system call";
+-
+- static final private SnmpStatusException noSuchNameException =
+- new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName) ;
+ }
+--- ./jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 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
+@@ -29,10 +29,10 @@
+ import javax.naming.NamingException;
+
+ /**
+- * The FactoryEnumeration is used for returning factory instances.
+- *
+- * @author Rosanna Lee
+- * @author Scott Seligman
++ * The FactoryEnumeration is used for returning factory instances.
++ *
++ * @author Rosanna Lee
++ * @author Scott Seligman
+ */
+
+ // no need to implement Enumeration since this is only for internal use
+@@ -55,9 +55,12 @@
+ * references so as not to prevent GC of the class loader. Each
+ * weak reference is tagged with the factory's class name so the
+ * class can be reloaded if the reference is cleared.
+-
++ *
+ * @param factories A non-null list
+ * @param loader The class loader of the list's contents
++ *
++ * This internal method is used with Thread Context Class Loader (TCCL),
++ * please don't expose this method as public.
+ */
+ FactoryEnumeration(List factories, ClassLoader loader) {
+ this.factories = factories;
+@@ -77,7 +80,8 @@
+
+ try {
+ if (answer == null) { // reload class if weak ref cleared
+- answer = Class.forName(className, true, loader);
++ Class<?> cls = Class.forName(className, true, loader);
++ answer = cls;
+ }
+ // Instantiate Class to get factory
+ answer = ((Class) answer).newInstance();
+--- ./jdk/src/share/classes/com/sun/naming/internal/VersionHelper12.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/naming/internal/VersionHelper12.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 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
+@@ -35,7 +35,6 @@
+ import java.security.PrivilegedActionException;
+ import java.security.PrivilegedExceptionAction;
+ import java.util.Enumeration;
+-import java.util.Hashtable;
+ import java.util.NoSuchElementException;
+ import java.util.Properties;
+
+@@ -54,21 +53,24 @@
+
+ final class VersionHelper12 extends VersionHelper {
+
+- private boolean getSystemPropsFailed = false;
+-
+- VersionHelper12() {} // Disallow external from creating one of these.
++ // Disallow external from creating one of these.
++ VersionHelper12() {
++ }
+
+ public Class loadClass(String className) throws ClassNotFoundException {
+- ClassLoader cl = getContextClassLoader();
+- return Class.forName(className, true, cl);
++ return loadClass(className, getContextClassLoader());
+ }
+
+ /**
+- * Package private.
+- */
++ * Package private.
++ *
++ * This internal method is used with Thread Context Class Loader (TCCL),
++ * please don't expose this method as public.
++ */
+ Class loadClass(String className, ClassLoader cl)
+ throws ClassNotFoundException {
+- return Class.forName(className, true, cl);
++ Class<?> cls = Class.forName(className, true, cl);
++ return cls;
+ }
+
+ /**
+@@ -77,12 +79,12 @@
+ */
+ public Class loadClass(String className, String codebase)
+ throws ClassNotFoundException, MalformedURLException {
+- ClassLoader cl;
+
+ ClassLoader parent = getContextClassLoader();
+- cl = URLClassLoader.newInstance(getUrlArray(codebase), parent);
++ ClassLoader cl =
++ URLClassLoader.newInstance(getUrlArray(codebase), parent);
+
+- return Class.forName(className, true, cl);
++ return loadClass(className, cl);
+ }
+
+ String getJndiProperty(final int i) {
+@@ -100,16 +102,12 @@
+ }
+
+ String[] getJndiProperties() {
+- if (getSystemPropsFailed) {
+- return null; // after one failure, don't bother trying again
+- }
+ Properties sysProps = (Properties) AccessController.doPrivileged(
+ new PrivilegedAction() {
+ public Object run() {
+ try {
+ return System.getProperties();
+ } catch (SecurityException e) {
+- getSystemPropsFailed = true;
+ return null;
+ }
+ }
+@@ -175,17 +173,31 @@
+ return new InputStreamEnumeration(urls);
+ }
+
++ /**
++ * Package private.
++ *
++ * This internal method returns Thread Context Class Loader (TCCL),
++ * if null, returns the system Class Loader.
++ *
++ * Please don't expose this method as public.
++ */
+ ClassLoader getContextClassLoader() {
+ return (ClassLoader) AccessController.doPrivileged(
+ new PrivilegedAction() {
+ public Object run() {
+- return Thread.currentThread().getContextClassLoader();
++ ClassLoader loader =
++ Thread.currentThread().getContextClassLoader();
++ if (loader == null) {
++ // Don't use bootstrap class loader directly!
++ loader = ClassLoader.getSystemClassLoader();
++ }
++
++ return loader;
+ }
+ }
+ );
+ }
+
+-
+ /**
+ * 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java Thu Dec 19 09:01:16 2013 -0800
+@@ -358,7 +358,8 @@
+ } else if (!isVisible(xmlns)) {
+ // There is a defn but the xmlns is not selected by the xpath.
+ // then xmlns=""
+- n = ns.addMappingAndRender(XMLNS, "", nullNode);
++ n = ns.addMappingAndRender(XMLNS, "",
++ getNullNode(xmlns.getOwnerDocument()));
+ }
+ // output the xmlns def if needed.
+ if (n != null) {
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java Thu Dec 19 09:01:16 2013 -0800
+@@ -302,7 +302,8 @@
+ } else if ( !isVisible(xmlns)) {
+ //There is a definition but the xmlns is not selected by the xpath.
+ //then xmlns=""
+- n=ns.addMappingAndRender(XMLNS,"",nullNode);
++ n=ns.addMappingAndRender(XMLNS, "",
++ getNullNode(xmlns.getOwnerDocument()));
+ }
+ //output the xmlns def if needed.
+ if (n!=null) {
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java Thu Dec 19 09:01:16 2013 -0800
+@@ -300,7 +300,7 @@
+ if ((xmlns!=null) && (!isVisible(xmlns))) {
+ //There is a definition but the xmlns is not selected by the xpath.
+ //then xmlns=""
+- ns.addMapping(XMLNS,"",nullNode);
++ ns.addMapping(XMLNS, "", getNullNode(xmlns.getOwnerDocument()));
+ }
+
+ if (E.getNamespaceURI() != null) {
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java Thu Dec 19 09:01:16 2013 -0800
+@@ -34,7 +34,6 @@
+ import java.util.Map;
+ import java.util.Set;
+
+-import javax.xml.parsers.DocumentBuilderFactory;
+ import javax.xml.parsers.ParserConfigurationException;
+
+ import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
+@@ -48,6 +47,7 @@
+ import org.w3c.dom.Attr;
+ import org.w3c.dom.Comment;
+ import org.w3c.dom.Element;
++import org.w3c.dom.Document;
+ import org.w3c.dom.NamedNodeMap;
+ import org.w3c.dom.Node;
+ import org.w3c.dom.ProcessingInstruction;
+@@ -63,6 +63,9 @@
+ public abstract class CanonicalizerBase extends CanonicalizerSpi {
+ //Constants to be outputed, In char array form, so
+ //less garbage is generate when outputed.
++ //
++ // Make sure you clone the following mutable arrays before passing to
++ // potentially untrusted objects such as OutputStreams.
+ private static final byte[] _END_PI = {'?','>'};
+ private static final byte[] _BEGIN_PI = {'<','?'};
+ private static final byte[] _END_COMM = {'-','-','>'};
+@@ -75,29 +78,18 @@
+ private static final byte[] _LT_ = {'&','l','t',';'};
+ private static final byte[] _END_TAG = {'<','/'};
+ private static final byte[] _AMP_ = {'&','a','m','p',';'};
++ private static final byte[] _EQUALS_STR = {'=','\"'};
++
+ final static AttrCompare COMPARE=new AttrCompare();
+ final static String XML="xml";
+ final static String XMLNS="xmlns";
+- final static byte[] equalsStr= {'=','\"'};
+ static final int NODE_BEFORE_DOCUMENT_ELEMENT = -1;
+ static final int NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT = 0;
+ static final int NODE_AFTER_DOCUMENT_ELEMENT = 1;
+- //The null xmlns definiton.
+- protected static final Attr nullNode;
+- static {
+- try {
+- nullNode=DocumentBuilderFactory.newInstance().
+- newDocumentBuilder().newDocument().createAttributeNS(Constants.NamespaceSpecNS,XMLNS);
+- nullNode.setValue("");
+- } catch (Exception e) {
+- throw new RuntimeException("Unable to create nullNode"/*,*/+e);
+- }
+- }
+-
+ List nodeFilter;
+-
+ boolean _includeComments;
+ Set _xpathNodeSet = null;
++
+ /**
+ * The node to be skiped/excluded from the DOM tree
+ * in subtree canonicalizations.
+@@ -106,6 +98,11 @@
+ OutputStream _writer = new UnsyncByteArrayOutputStream();//null;
+
+ /**
++ * The null xmlns definition.
++ */
++ private Attr nullNode;
++
++ /**
+ * Constructor CanonicalizerBase
+ *
+ * @param includeComments
+@@ -309,7 +306,7 @@
+ writer.write('>');
+ sibling= currentNode.getFirstChild();
+ if (sibling==null) {
+- writer.write(_END_TAG);
++ writer.write(_END_TAG.clone());
+ UtfHelpper.writeStringToUtf8(name,writer);
+ writer.write('>');
+ //We fineshed with this level, pop to the previous definitions.
+@@ -323,7 +320,7 @@
+ break;
+ }
+ while (sibling==null && parentNode!=null) {
+- writer.write(_END_TAG);
++ writer.write(_END_TAG.clone());
+ UtfHelpper.writeByte(((Element)parentNode).getTagName(),writer,cache);
+ writer.write('>');
+ //We fineshed with this level, pop to the previous definitions.
+@@ -479,7 +476,7 @@
+
+ if (sibling==null) {
+ if (currentNodeIsVisible) {
+- writer.write(_END_TAG);
++ writer.write(_END_TAG.clone());
+ UtfHelpper.writeByte(name,writer,cache);
+ writer.write('>');
+ //We fineshed with this level, pop to the previous definitions.
+@@ -497,7 +494,7 @@
+ }
+ while (sibling==null && parentNode!=null) {
+ if (isVisible(parentNode)) {
+- writer.write(_END_TAG);
++ writer.write(_END_TAG.clone());
+ UtfHelpper.writeByte(((Element)parentNode).getTagName(),writer,cache);
+ writer.write('>');
+ //We fineshed with this level, pop to the previous definitions.
+@@ -609,7 +606,8 @@
+ Attr nsprefix;
+ if (((nsprefix=ns.getMappingWithoutRendered("xmlns"))!=null)
+ && "".equals(nsprefix.getValue())) {
+- ns.addMappingAndRender("xmlns","",nullNode);
++ ns.addMappingAndRender("xmlns", "",
++ getNullNode(nsprefix.getOwnerDocument()));
+ }
+ }
+ /**
+@@ -659,7 +657,7 @@
+ final Map cache) throws IOException {
+ writer.write(' ');
+ UtfHelpper.writeByte(name,writer,cache);
+- writer.write(equalsStr);
++ writer.write(_EQUALS_STR.clone());
+ byte []toWrite;
+ final int length = value.length();
+ int i=0;
+@@ -669,27 +667,27 @@
+ switch (c) {
+
+ case '&' :
+- toWrite=_AMP_;
++ toWrite=_AMP_.clone();
+ break;
+
+ case '<' :
+- toWrite=_LT_;
++ toWrite=_LT_.clone();
+ break;
+
+ case '"' :
+- toWrite=_QUOT_;
++ toWrite=_QUOT_.clone();
+ break;
+
+ case 0x09 : // '\t'
+- toWrite=__X9_;
++ toWrite=__X9_.clone();
+ break;
+
+ case 0x0A : // '\n'
+- toWrite=__XA_;
++ toWrite=__XA_.clone();
+ break;
+
+ case 0x0D : // '\r'
+- toWrite=__XD_;
++ toWrite=__XD_.clone();
+ break;
+
+ default :
+@@ -718,7 +716,7 @@
+ if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
+ writer.write('\n');
+ }
+- writer.write(_BEGIN_PI);
++ writer.write(_BEGIN_PI.clone());
+
+ final String target = currentPI.getTarget();
+ int length = target.length();
+@@ -726,7 +724,7 @@
+ for (int i = 0; i < length; i++) {
+ char c=target.charAt(i);
+ if (c==0x0D) {
+- writer.write(__XD_);
++ writer.write(__XD_.clone());
+ } else {
+ if (c < 0x80) {
+ writer.write(c);
+@@ -746,14 +744,14 @@
+ for (int i = 0; i < length; i++) {
+ char c=data.charAt(i);
+ if (c==0x0D) {
+- writer.write(__XD_);
++ writer.write(__XD_.clone());
+ } else {
+ UtfHelpper.writeCharToUtf8(c,writer);
+ }
+ }
+ }
+
+- writer.write(_END_PI);
++ writer.write(_END_PI.clone());
+ if (position == NODE_BEFORE_DOCUMENT_ELEMENT) {
+ writer.write('\n');
+ }
+@@ -770,7 +768,7 @@
+ if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
+ writer.write('\n');
+ }
+- writer.write(_BEGIN_COMM);
++ writer.write(_BEGIN_COMM.clone());
+
+ final String data = currentComment.getData();
+ final int length = data.length();
+@@ -778,7 +776,7 @@
+ for (int i = 0; i < length; i++) {
+ char c=data.charAt(i);
+ if (c==0x0D) {
+- writer.write(__XD_);
++ writer.write(__XD_.clone());
+ } else {
+ if (c < 0x80) {
+ writer.write(c);
+@@ -788,7 +786,7 @@
+ }
+ }
+
+- writer.write(_END_COMM);
++ writer.write(_END_COMM.clone());
+ if (position == NODE_BEFORE_DOCUMENT_ELEMENT) {
+ writer.write('\n');
+ }
+@@ -810,19 +808,19 @@
+ switch (c) {
+
+ case '&' :
+- toWrite=_AMP_;
++ toWrite=_AMP_.clone();
+ break;
+
+ case '<' :
+- toWrite=_LT_;
++ toWrite=_LT_.clone();
+ break;
+
+ case '>' :
+- toWrite=_GT_;
++ toWrite=_GT_.clone();
+ break;
+
+ case 0xD :
+- toWrite=__XD_;
++ toWrite=__XD_.clone();
+ break;
+
+ default :
+@@ -837,4 +835,18 @@
+ }
+ }
+
++ // The null xmlns definition.
++ protected Attr getNullNode(Document ownerDocument) {
++ if (nullNode == null) {
++ try {
++ nullNode = ownerDocument.createAttributeNS(
++ Constants.NamespaceSpecNS, XMLNS);
++ nullNode.setValue("");
++ } catch (Exception e) {
++ throw new RuntimeException("Unable to create nullNode: " + e);
++ }
++ }
++ return nullNode;
++ }
++
+ }
+--- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -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.
+ cachedrowsetimpl.timefail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getTime\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uBCC0\uD658\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+-cachedrowsetimpl.posupdate = \uC704\uCE58\uAC00 \uC9C0\uC815\uB41C \uAC31\uC2E0\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
++cachedrowsetimpl.posupdate = \uC704\uCE58\uAC00 \uC9C0\uC815\uB41C \uC5C5\uB370\uC774\uD2B8\uAC00 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ cachedrowsetimpl.unableins = \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC74C: {0}
+ cachedrowsetimpl.beforefirst = beforeFirst: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+ cachedrowsetimpl.first = \uCC98\uC74C: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+@@ -110,7 +110,7 @@
+ jdbcrowsetimpl.unsetmatch = \uC124\uC815\uC744 \uD574\uC81C\uD558\uB824\uB294 \uC5F4\uC774 \uC124\uC815\uB41C \uC5F4\uACFC \uB2E4\uB985\uB2C8\uB2E4.
+ jdbcrowsetimpl.usecolname = \uC5F4 \uC774\uB984\uC744 unsetMatchColumn\uC758 \uC778\uC218\uB85C \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
+ jdbcrowsetimpl.usecolid = \uC5F4 ID\uB97C unsetMatchColumn\uC758 \uC778\uC218\uB85C \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
+-jdbcrowsetimpl.resnotupd = ResultSet\uB97C \uAC31\uC2E0\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
++jdbcrowsetimpl.resnotupd = ResultSet\uB97C \uC5C5\uB370\uC774\uD2B8\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+ jdbcrowsetimpl.opnotysupp = \uC791\uC5C5\uC774 \uC544\uC9C1 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+ jdbcrowsetimpl.featnotsupp = \uAE30\uB2A5\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
+
+@@ -157,7 +157,7 @@
+ xmlrch.errinsert = insert \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
+ xmlrch.errinsdel = insdel \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
+ xmlrch.errupdate = update \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
+-xmlrch.errupdrow = \uD589\uC744 \uAC31\uC2E0\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
++xmlrch.errupdrow = \uD589\uC744 \uC5C5\uB370\uC774\uD2B8\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
+ 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/XmlReaderContentHandler.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java Thu Dec 19 09:01:16 2013 -0800
+@@ -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
+@@ -659,7 +659,7 @@
+ //Added the handling for Class tags to take care of maps
+ //Makes an entry into the map upon end of class tag
+ try{
+- typeMap.put(Key_map,Class.forName(Value_map));
++ typeMap.put(Key_map,sun.reflect.misc.ReflectUtil.forName(Value_map));
+
+ }catch(ClassNotFoundException ex) {
+ throw new SAXException(MessageFormat.format(resBundle.handleGetObject("xmlrch.errmap").toString(), ex.getMessage()));
+--- ./jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -46,7 +46,7 @@
+ FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30(&O)
+ FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+ FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+-FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0(&U)
++FileChooser.updateButton.textAndMnemonic=\uC5C5\uB370\uC774\uD2B8(&U)
+ FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0(&H)
+ FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30(&O)
+
+@@ -66,7 +66,7 @@
+ FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790 \uC911\uB2E8
+ FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC800\uC7A5
+ FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30
+-FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uAC31\uC2E0
++FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uC5C5\uB370\uC774\uD2B8
+ FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -20,8 +20,8 @@
+
+ FileChooser.lookInLabel.textAndMnemonic=Leta &i:
+ FileChooser.saveInLabel.textAndMnemonic=Spara i:
+-FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
+-FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
++FileChooser.fileNameLabel.textAndMnemonic=&Fil:
++FileChooser.folderNameLabel.textAndMnemonic=&Mapp:
+ FileChooser.filesOfTypeLabel.textAndMnemonic=Mapp&namn:
+ FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+ FileChooser.upFolderAccessibleName=Upp
+--- ./jdk/src/share/classes/java/beans/ThreadGroupContext.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/java/beans/ThreadGroupContext.java Thu Dec 19 09:01:16 2013 -0800
+@@ -41,24 +41,20 @@
+ */
+ final class ThreadGroupContext {
+
+- private static final WeakIdentityMap<ThreadGroupContext> contexts = new WeakIdentityMap<>();
++ private static final WeakIdentityMap<ThreadGroupContext> contexts = new WeakIdentityMap<ThreadGroupContext>() {
++ protected ThreadGroupContext create(Object key) {
++ return new ThreadGroupContext();
++ }
++ };
+
+ /**
+- * Returns the appropriate {@code AppContext} for the caller,
++ * Returns the appropriate {@code ThreadGroupContext} for the caller,
+ * as determined by its {@code ThreadGroup}.
+ *
+ * @return the application-dependent context
+ */
+ static ThreadGroupContext getContext() {
+- ThreadGroup group = Thread.currentThread().getThreadGroup();
+- synchronized (contexts) {
+- ThreadGroupContext context = contexts.get(group);
+- if (context == null) {
+- context = new ThreadGroupContext();
+- contexts.put(group, context);
+- }
+- return context;
+- }
++ return contexts.get(Thread.currentThread().getThreadGroup());
+ }
+
+ private volatile boolean isDesignTime;
+--- ./jdk/src/share/classes/java/beans/WeakIdentityMap.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/java/beans/WeakIdentityMap.java Thu Dec 19 09:01:16 2013 -0800
+@@ -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
+ * in ordinary use. Both null values and the null key are supported.
++ * This class does not require additional synchronization.
++ * A thread-safety is provided by a fragile combination
++ * of synchronized blocks and volatile fields.
++ * Be very careful during editing!
+ *
+ * @see java.util.IdentityHashMap
+ * @see java.util.WeakHashMap
+ */
+-final class WeakIdentityMap<T> {
++abstract class WeakIdentityMap<T> {
+
+ private static final int MAXIMUM_CAPACITY = 1 << 30; // it MUST be a power of two
+ private static final Object NULL = new Object(); // special object for null key
+
+ private final ReferenceQueue<Object> queue = new ReferenceQueue<Object>();
+
+- private Entry<T>[] table = newTable(1<<3); // table's length MUST be a power of two
++ private volatile Entry<T>[] table = newTable(1<<3); // table's length MUST be a power of two
+ private int threshold = 6; // the next size value at which to resize
+ private int size = 0; // the number of key-value mappings
+
+@@ -54,78 +58,83 @@
+ key = NULL;
+ }
+ int hash = key.hashCode();
+- int index = getIndex(this.table, hash);
+- for (Entry<T> entry = this.table[index]; entry != null; entry = entry.next) {
++ Entry<T>[] table = this.table;
++ // unsynchronized search improves performance
++ // the null value does not mean that there are no needed entry
++ int index = getIndex(table, hash);
++ for (Entry<T> entry = table[index]; entry != null; entry = entry.next) {
+ if (entry.isMatched(key, hash)) {
+ return entry.value;
+ }
+ }
+- return null;
++ synchronized (NULL) {
++ // synchronized search improves stability
++ // we must create and add new value if there are no needed entry
++ index = getIndex(this.table, hash);
++ for (Entry<T> entry = this.table[index]; entry != null; entry = entry.next) {
++ if (entry.isMatched(key, hash)) {
++ return entry.value;
++ }
++ }
++ T value = create(key);
++ this.table[index] = new Entry<T>(key, hash, value, this.queue, this.table[index]);
++ if (++this.size >= this.threshold) {
++ if (this.table.length == MAXIMUM_CAPACITY) {
++ this.threshold = Integer.MAX_VALUE;
++ }
++ else {
++ removeStaleEntries();
++ table = newTable(this.table.length * 2);
++ transfer(this.table, table);
++ // If ignoring null elements and processing ref queue caused massive
++ // shrinkage, then restore old table. This should be rare, but avoids
++ // unbounded expansion of garbage-filled tables.
++ if (this.size >= this.threshold / 2) {
++ this.table = table;
++ this.threshold *= 2;
++ }
++ else {
++ transfer(table, this.table);
++ }
++ }
++ }
++ return value;
++ }
+ }
+
+- public T put(Object key, T value) {
+- removeStaleEntries();
+- if (key == null) {
+- key = NULL;
+- }
+- int hash = key.hashCode();
+- int index = getIndex(this.table, hash);
+- for (Entry<T> entry = this.table[index]; entry != null; entry = entry.next) {
+- if (entry.isMatched(key, hash)) {
+- T oldValue = entry.value;
+- entry.value = value;
+- return oldValue;
+- }
+- }
+- this.table[index] = new Entry<T>(key, hash, value, this.queue, this.table[index]);
+- if (++this.size >= this.threshold) {
+- if (this.table.length == MAXIMUM_CAPACITY) {
+- this.threshold = Integer.MAX_VALUE;
+- }
+- else {
+- removeStaleEntries();
+- Entry<T>[] table = newTable(this.table.length * 2);
+- transfer(this.table, table);
+-
+- // If ignoring null elements and processing ref queue caused massive
+- // shrinkage, then restore old table. This should be rare, but avoids
+- // unbounded expansion of garbage-filled tables.
+- if (this.size >= this.threshold / 2) {
+- this.table = table;
+- this.threshold *= 2;
+- }
+- else {
+- transfer(table, this.table);
+- }
+- }
+- }
+- return null;
+- }
++ protected abstract T create(Object key);
+
+ private void removeStaleEntries() {
+- for (Object ref = this.queue.poll(); ref != null; ref = this.queue.poll()) {
+- @SuppressWarnings("unchecked")
+- Entry<T> entry = (Entry<T>) ref;
+- int index = getIndex(this.table, entry.hash);
++ Object ref = this.queue.poll();
++ if (ref != null) {
++ synchronized (NULL) {
++ do {
++ @SuppressWarnings("unchecked")
++ Entry<T> entry = (Entry<T>) ref;
++ int index = getIndex(this.table, entry.hash);
+
+- Entry<T> prev = this.table[index];
+- Entry<T> current = prev;
+- while (current != null) {
+- Entry<T> next = current.next;
+- if (current == entry) {
+- if (prev == entry) {
+- this.table[index] = next;
++ Entry<T> prev = this.table[index];
++ Entry<T> current = prev;
++ while (current != null) {
++ Entry<T> next = current.next;
++ if (current == entry) {
++ if (prev == entry) {
++ this.table[index] = next;
++ }
++ else {
++ prev.next = next;
++ }
++ entry.value = null; // Help GC
++ entry.next = null; // Help GC
++ this.size--;
++ break;
++ }
++ prev = current;
++ current = next;
+ }
+- else {
+- prev.next = next;
+- }
+- entry.value = null; // Help GC
+- entry.next = null; // Help GC
+- this.size--;
+- break;
++ ref = this.queue.poll();
+ }
+- prev = current;
+- current = next;
++ while (ref != null);
+ }
+ }
+ }
+@@ -164,8 +173,8 @@
+
+ private static class Entry<T> extends WeakReference<Object> {
+ private final int hash;
+- private T value;
+- private Entry<T> next;
++ private volatile T value;
++ private volatile Entry<T> next;
+
+ Entry(Object key, int hash, T value, ReferenceQueue<Object> queue, Entry<T> next) {
+ super(key, queue);
+--- ./jdk/src/share/classes/java/lang/SecurityManager.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/java/lang/SecurityManager.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1131,12 +1131,8 @@
+ * @see #checkPermission(java.security.Permission) checkPermission
+ */
+ public void checkListen(int port) {
+- if (port == 0) {
+- checkPermission(SecurityConstants.LOCAL_LISTEN_PERMISSION);
+- } else {
+- checkPermission(new SocketPermission("localhost:"+port,
+- SecurityConstants.SOCKET_LISTEN_ACTION));
+- }
++ checkPermission(new SocketPermission("localhost:"+port,
++ SecurityConstants.SOCKET_LISTEN_ACTION));
+ }
+
+ /**
+--- ./jdk/src/share/classes/java/net/Socket.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/java/net/Socket.java Thu Dec 19 09:01:16 2013 -0800
+@@ -624,6 +624,10 @@
+ InetAddress addr = epoint.getAddress();
+ int port = epoint.getPort();
+ checkAddress (addr, "bind");
++ SecurityManager security = System.getSecurityManager();
++ if (security != null) {
++ security.checkListen(port);
++ }
+ getImpl().bind (addr, port);
+ bound = true;
+ }
+--- ./jdk/src/share/classes/java/net/SocketPermission.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/java/net/SocketPermission.java Thu Dec 19 09:01:16 2013 -0800
+@@ -34,6 +34,9 @@
+ import java.net.InetAddress;
+ import java.security.Permission;
+ import java.security.PermissionCollection;
++import java.security.PrivilegedAction;
++import java.security.AccessController;
++import java.security.Security;
+ import java.io.Serializable;
+ import java.io.ObjectStreamField;
+ import java.io.ObjectOutputStream;
+@@ -41,6 +44,7 @@
+ import java.io.IOException;
+ import sun.net.util.IPAddressUtil;
+ import sun.net.RegisteredDomain;
++import sun.net.PortConfig;
+ import sun.security.util.SecurityConstants;
+ import sun.security.util.Debug;
+
+@@ -176,6 +180,7 @@
+ private static final int PORT_MIN = 0;
+ private static final int PORT_MAX = 65535;
+ private static final int PRIV_PORT_MAX = 1023;
++ private static final int DEF_EPH_LOW = 49152;
+
+ // the actions mask
+ private transient int mask;
+@@ -226,6 +231,14 @@
+ private static Debug debug = null;
+ private static boolean debugInit = false;
+
++ // ephemeral port range for this system
++ private static final int ephemeralLow = initEphemeralPorts(
++ "low", DEF_EPH_LOW
++ );
++ private static final int ephemeralHigh = initEphemeralPorts(
++ "high", PORT_MAX
++ );
++
+ static {
+ Boolean tmp = java.security.AccessController.doPrivileged(
+ new sun.security.action.GetBooleanAction("sun.net.trustNameService"));
+@@ -362,6 +375,14 @@
+ }
+
+ /**
++ * Returns true if the permission has specified zero
++ * as its value (or lower bound) signifying the ephemeral range
++ */
++ private boolean includesEphemerals() {
++ return portrange[0] == 0;
++ }
++
++ /**
+ * Initialize the SocketPermission object. We don't do any DNS lookups
+ * as this point, instead we hold off until the implies method is
+ * called.
+@@ -853,10 +874,21 @@
+ int i,j;
+
+ if ((that.mask & RESOLVE) != that.mask) {
+- // check port range
++
++ // check simple port range
+ if ((that.portrange[0] < this.portrange[0]) ||
+ (that.portrange[1] > this.portrange[1])) {
++
++ // if either includes the ephemeral range, do full check
++ if (this.includesEphemerals() || that.includesEphemerals()) {
++ if (!inRange(this.portrange[0], this.portrange[1],
++ that.portrange[0], that.portrange[1]))
++ {
++ return false;
++ }
++ } else {
+ return false;
++ }
+ }
+ }
+
+@@ -1165,6 +1197,78 @@
+ init(getName(),getMask(actions));
+ }
+
++ /**
++ * Check the system/security property for the ephemeral port range
++ * for this system. The suffix is either "high" or "low"
++ */
++ private static int initEphemeralPorts(
++ final String suffix, final int defval
++ )
++ {
++ return AccessController.doPrivileged(
++ new PrivilegedAction<Integer>(){
++ public Integer run() {
++ int val = Integer.getInteger(
++ "jdk.net.ephemeralPortRange."+suffix, -1
++ );
++ if (val != -1) {
++ return val;
++ } else {
++ return suffix.equals("low") ?
++ PortConfig.getLower() : PortConfig.getUpper();
++ }
++ }
++ }
++ );
++ }
++
++ /**
++ * Check if the target range is within the policy range
++ * together with the ephemeral range for this platform
++ * (if policy includes ephemeral range)
++ */
++ private static boolean inRange(
++ int policyLow, int policyHigh, int targetLow, int targetHigh
++ )
++ {
++ if (targetLow == 0) {
++ // check policy includes ephemeral range
++ if (!inRange(policyLow, policyHigh, ephemeralLow, ephemeralHigh)) {
++ return false;
++ }
++ if (targetHigh == 0) {
++ // nothing left to do
++ return true;
++ }
++ // continue check with first real port number
++ targetLow = 1;
++ }
++
++ if (policyLow == 0 && policyHigh == 0) {
++ // ephemeral range only
++ return targetLow >= ephemeralLow && targetHigh <= ephemeralHigh;
++ }
++
++ if (policyLow != 0) {
++ // simple check of policy only
++ return targetLow >= policyLow && targetHigh <= policyHigh;
++ }
++
++ // policyLow == 0 which means possibly two ranges to check
++
++ // first check if policy and ephem range overlap/contiguous
++
++ if (policyHigh >= ephemeralLow - 1) {
++ return targetHigh <= ephemeralHigh;
++ }
++
++ // policy and ephem range do not overlap
++
++ // target range must lie entirely inside policy range or eph range
++
++ return (targetLow <= policyHigh && targetHigh <= policyHigh) ||
++ (targetLow >= ephemeralLow && targetHigh <= ephemeralHigh);
++ }
+ /*
+ public String toString()
+ {
+--- ./jdk/src/share/classes/java/util/jar/JarVerifier.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/java/util/jar/JarVerifier.java Thu Dec 19 09:01:16 2013 -0800
+@@ -169,7 +169,9 @@
+ name = name.substring(1);
+
+ // only set the jev object for entries that have a signature
+- if (sigFileSigners.get(name) != null) {
++ // (either verified or not)
++ if (sigFileSigners.get(name) != null ||
++ verifiedSigners.get(name) != null) {
+ mev.setEntry(name, je);
+ return;
+ }
+--- ./jdk/src/share/classes/java/util/logging/LogManager.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/java/util/logging/LogManager.java Thu Dec 19 09:01:16 2013 -0800
+@@ -257,6 +257,11 @@
+ * retrieved by calling Logmanager.getLogManager.
+ */
+ protected LogManager() {
++ this(checkSubclassPermissions());
++ }
++
++ private LogManager(Void checked) {
++
+ // Add a shutdown hook to close the global handlers.
+ try {
+ Runtime.getRuntime().addShutdownHook(new Cleaner());
+@@ -266,6 +271,19 @@
+ }
+ }
+
++ private static Void checkSubclassPermissions() {
++ final SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ // These permission will be checked in the LogManager constructor,
++ // in order to register the Cleaner() thread as a shutdown hook.
++ // Check them here to avoid the penalty of constructing the object
++ // etc...
++ sm.checkPermission(new RuntimePermission("shutdownHooks"));
++ sm.checkPermission(new RuntimePermission("setContextClassLoader"));
++ }
++ return null;
++ }
++
+ /**
+ * Return the global LogManager object.
+ */
+--- ./jdk/src/share/classes/javax/print/SimpleDoc.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/javax/print/SimpleDoc.java Thu Dec 19 09:01:16 2013 -0800
+@@ -91,7 +91,10 @@
+
+ Class repClass = null;
+ try {
+- repClass = Class.forName(flavor.getRepresentationClassName());
++ String className = flavor.getRepresentationClassName();
++ sun.reflect.misc.ReflectUtil.checkPackageAccess(className);
++ repClass = Class.forName(className, false,
++ Thread.currentThread().getContextClassLoader());
+ } catch (Throwable e) {
+ throw new IllegalArgumentException("unknown representation class");
+ }
+--- ./jdk/src/share/classes/javax/security/auth/Policy.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/javax/security/auth/Policy.java Thu Dec 19 09:01:16 2013 -0800
+@@ -26,6 +26,10 @@
+ package javax.security.auth;
+
+ import java.security.Security;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
++import java.security.PrivilegedExceptionAction;
++import java.util.Objects;
+ import sun.security.util.Debug;
+
+ /**
+@@ -160,21 +164,14 @@
+ public abstract class Policy {
+
+ private static Policy policy;
+- private static ClassLoader contextClassLoader;
++
++ private final java.security.AccessControlContext acc =
++ java.security.AccessController.getContext();
+
+ // true if a custom (not com.sun.security.auth.PolicyFile) system-wide
+ // policy object is set
+ private static boolean isCustomPolicy;
+
+- static {
+- contextClassLoader = java.security.AccessController.doPrivileged
+- (new java.security.PrivilegedAction<ClassLoader>() {
+- public ClassLoader run() {
+- return Thread.currentThread().getContextClassLoader();
+- }
+- });
+- };
+-
+ /**
+ * Sole constructor. (For invocation by subclass constructors, typically
+ * implicit.)
+@@ -217,8 +214,8 @@
+
+ if (policy == null) {
+ String policy_class = null;
+- policy_class = java.security.AccessController.doPrivileged
+- (new java.security.PrivilegedAction<String>() {
++ policy_class = AccessController.doPrivileged
++ (new PrivilegedAction<String>() {
+ public String run() {
+ return java.security.Security.getProperty
+ ("auth.policy.provider");
+@@ -230,19 +227,28 @@
+
+ try {
+ final String finalClass = policy_class;
+- policy = java.security.AccessController.doPrivileged
+- (new java.security.PrivilegedExceptionAction<Policy>() {
+- public Policy run() throws ClassNotFoundException,
+- InstantiationException,
+- IllegalAccessException {
+- return (Policy) Class.forName
+- (finalClass,
+- true,
+- contextClassLoader).newInstance();
+- }
+- });
+- isCustomPolicy =
+- !finalClass.equals("com.sun.security.auth.PolicyFile");
++ final Policy untrustedImpl = AccessController.doPrivileged(
++ new PrivilegedExceptionAction<Policy>() {
++ public Policy run() throws ClassNotFoundException,
++ InstantiationException,
++ IllegalAccessException {
++ Class<? extends Policy> implClass = Class.forName(
++ finalClass, false,
++ Thread.currentThread().getContextClassLoader()
++ ).asSubclass(Policy.class);
++ return implClass.newInstance();
++ }
++ });
++ AccessController.doPrivileged(
++ new PrivilegedExceptionAction<Void>() {
++ public Void run() {
++ setPolicy(untrustedImpl);
++ isCustomPolicy =
++ !finalClass.equals("com.sun.security.auth.PolicyFile");
++ return null;
++ }
++ }, Objects.requireNonNull(untrustedImpl.acc)
++ );
+ } catch (Exception e) {
+ throw new SecurityException
+ (sun.security.util.ResourcesMgr.getString
+--- ./jdk/src/share/classes/javax/security/auth/Subject.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/javax/security/auth/Subject.java Thu Dec 19 09:01:16 2013 -0800
+@@ -946,6 +946,10 @@
+
+ s.defaultReadObject();
+
++ // Rewrap the principals into a SecureSet
++ principals = Collections.synchronizedSet(new SecureSet<Principal>
++ (this, PRINCIPAL_SET, principals));
++
+ // 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
+--- ./jdk/src/share/classes/javax/security/auth/login/Configuration.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/javax/security/auth/login/Configuration.java Thu Dec 19 09:01:16 2013 -0800
+@@ -27,9 +27,6 @@
+
+ import javax.security.auth.AuthPermission;
+
+-import java.io.*;
+-import java.util.*;
+-import java.net.URI;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ import java.security.PrivilegedExceptionAction;
+@@ -38,7 +35,7 @@
+ import java.security.NoSuchProviderException;
+ import java.security.Provider;
+ import java.security.Security;
+-import java.security.SecurityPermission;
++import java.util.Objects;
+
+ import sun.security.jca.GetInstance;
+
+@@ -194,16 +191,9 @@
+ public abstract class Configuration {
+
+ private static Configuration configuration;
+- private static ClassLoader contextClassLoader;
+
+- static {
+- contextClassLoader = AccessController.doPrivileged
+- (new PrivilegedAction<ClassLoader>() {
+- public ClassLoader run() {
+- return Thread.currentThread().getContextClassLoader();
+- }
+- });
+- };
++ private final java.security.AccessControlContext acc =
++ java.security.AccessController.getContext();
+
+ private static void checkPermission(String type) {
+ SecurityManager sm = System.getSecurityManager();
+@@ -256,17 +246,26 @@
+
+ try {
+ final String finalClass = config_class;
+- configuration = AccessController.doPrivileged
+- (new PrivilegedExceptionAction<Configuration>() {
+- public Configuration run() throws ClassNotFoundException,
+- InstantiationException,
+- IllegalAccessException {
+- return (Configuration)Class.forName
+- (finalClass,
+- true,
+- contextClassLoader).newInstance();
+- }
+- });
++ final Configuration untrustedImpl = AccessController.doPrivileged(
++ new PrivilegedExceptionAction<Configuration>() {
++ public Configuration run() throws ClassNotFoundException,
++ InstantiationException,
++ IllegalAccessException {
++ Class<? extends Configuration> implClass = Class.forName(
++ finalClass, false,
++ Thread.currentThread().getContextClassLoader()
++ ).asSubclass(Configuration.class);
++ return implClass.newInstance();
++ }
++ });
++ AccessController.doPrivileged(
++ new PrivilegedExceptionAction<Void>() {
++ public Void run() {
++ setConfiguration(untrustedImpl);
++ return null;
++ }
++ }, Objects.requireNonNull(untrustedImpl.acc)
++ );
+ } catch (PrivilegedActionException e) {
+ Exception ee = e.getException();
+ if (ee instanceof InstantiationException) {
+--- ./jdk/src/share/classes/javax/security/auth/login/LoginContext.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/javax/security/auth/login/LoginContext.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -217,8 +217,7 @@
+ private Map state = new HashMap();
+
+ private Configuration config;
+- private boolean configProvided = false;
+- private AccessControlContext creatorAcc = null;
++ private AccessControlContext creatorAcc = null; // customized config only
+ private ModuleInfo[] moduleStack;
+ private ClassLoader contextClassLoader = null;
+ private static final Class[] PARAMS = { };
+@@ -237,7 +236,7 @@
+ private void init(String name) throws LoginException {
+
+ SecurityManager sm = System.getSecurityManager();
+- if (sm != null && !configProvided) {
++ if (sm != null && creatorAcc == null) {
+ sm.checkPermission(new AuthPermission
+ ("createLoginContext." + name));
+ }
+@@ -260,7 +259,7 @@
+ AppConfigurationEntry[] entries = config.getAppConfigurationEntry(name);
+ if (entries == null) {
+
+- if (sm != null && !configProvided) {
++ if (sm != null && creatorAcc == null) {
+ sm.checkPermission(new AuthPermission
+ ("createLoginContext." + OTHER));
+ }
+@@ -287,7 +286,15 @@
+ contextClassLoader = java.security.AccessController.doPrivileged
+ (new java.security.PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
+- return Thread.currentThread().getContextClassLoader();
++ ClassLoader loader =
++ Thread.currentThread().getContextClassLoader();
++ if (loader == null) {
++ // Don't use bootstrap class loader directly to ensure
++ // proper package access control!
++ loader = ClassLoader.getSystemClassLoader();
++ }
++
++ return loader;
+ }
+ });
+ }
+@@ -306,10 +313,10 @@
+ (DEFAULT_HANDLER);
+ if (defaultHandler == null || defaultHandler.length() == 0)
+ return null;
+- Class c = Class.forName(defaultHandler,
+- true,
+- finalLoader);
+- return (CallbackHandler)c.newInstance();
++ Class<? extends CallbackHandler> c = Class.forName(
++ defaultHandler, true,
++ finalLoader).asSubclass(CallbackHandler.class);
++ return c.newInstance();
+ }
+ });
+ } catch (java.security.PrivilegedActionException pae) {
+@@ -317,7 +324,7 @@
+ }
+
+ // secure it with the caller's ACC
+- if (this.callbackHandler != null && !configProvided) {
++ if (this.callbackHandler != null && creatorAcc == null) {
+ this.callbackHandler = new SecureCallbackHandler
+ (java.security.AccessController.getContext(),
+ this.callbackHandler);
+@@ -506,8 +513,7 @@
+ CallbackHandler callbackHandler,
+ Configuration config) throws LoginException {
+ this.config = config;
+- configProvided = (config != null) ? true : false;
+- if (configProvided) {
++ if (config != null) {
+ creatorAcc = java.security.AccessController.getContext();
+ }
+
+@@ -518,7 +524,7 @@
+ }
+ if (callbackHandler == null) {
+ loadDefaultCallbackHandler();
+- } else if (!configProvided) {
++ } else if (creatorAcc == null) {
+ this.callbackHandler = new SecureCallbackHandler
+ (java.security.AccessController.getContext(),
+ callbackHandler);
+@@ -585,23 +591,13 @@
+ }
+
+ try {
+- if (configProvided) {
+- // module invoked in doPrivileged with creatorAcc
+- invokeCreatorPriv(LOGIN_METHOD);
+- invokeCreatorPriv(COMMIT_METHOD);
+- } else {
+- // module invoked in doPrivileged
+- invokePriv(LOGIN_METHOD);
+- invokePriv(COMMIT_METHOD);
+- }
++ // module invoked in doPrivileged
++ invokePriv(LOGIN_METHOD);
++ invokePriv(COMMIT_METHOD);
+ loginSucceeded = true;
+ } catch (LoginException le) {
+ try {
+- if (configProvided) {
+- invokeCreatorPriv(ABORT_METHOD);
+- } else {
+- invokePriv(ABORT_METHOD);
+- }
++ invokePriv(ABORT_METHOD);
+ } catch (LoginException le2) {
+ throw le;
+ }
+@@ -636,13 +632,8 @@
+ ("null.subject.logout.called.before.login"));
+ }
+
+- if (configProvided) {
+- // module invoked in doPrivileged with creatorAcc
+- invokeCreatorPriv(LOGOUT_METHOD);
+- } else {
+- // module invoked in doPrivileged
+- invokePriv(LOGOUT_METHOD);
+- }
++ // module invoked in doPrivileged
++ invokePriv(LOGOUT_METHOD);
+ }
+
+ /**
+@@ -685,7 +676,8 @@
+
+ /**
+ * Invokes the login, commit, and logout methods
+- * from a LoginModule inside a doPrivileged block.
++ * from a LoginModule inside a doPrivileged block restricted
++ * by creatorAcc (may be null).
+ *
+ * This version is called if the caller did not instantiate
+ * the LoginContext with a Configuration object.
+@@ -698,29 +690,6 @@
+ invoke(methodName);
+ return null;
+ }
+- });
+- } catch (java.security.PrivilegedActionException pae) {
+- throw (LoginException)pae.getException();
+- }
+- }
+-
+- /**
+- * Invokes the login, commit, and logout methods
+- * from a LoginModule inside a doPrivileged block restricted
+- * by creatorAcc
+- *
+- * This version is called if the caller instantiated
+- * the LoginContext with a Configuration object.
+- */
+- private void invokeCreatorPriv(final String methodName)
+- throws LoginException {
+- try {
+- java.security.AccessController.doPrivileged
+- (new java.security.PrivilegedExceptionAction<Void>() {
+- public Void run() throws LoginException {
+- invoke(methodName);
+- return null;
+- }
+ }, creatorAcc);
+ } catch (java.security.PrivilegedActionException pae) {
+ throw (LoginException)pae.getException();
+@@ -743,24 +712,24 @@
+ } else {
+
+ // instantiate the LoginModule
+- Class c = Class.forName
+- (moduleStack[i].entry.getLoginModuleName(),
++ //
++ // Allow any object to be a LoginModule as long as it
++ // conforms to the interface.
++ Class<?> c = Class.forName(
++ moduleStack[i].entry.getLoginModuleName(),
+ true,
+ contextClassLoader);
+
+ Constructor constructor = c.getConstructor(PARAMS);
+ Object[] args = { };
+-
+- // allow any object to be a LoginModule
+- // as long as it conforms to the interface
+ moduleStack[i].module = constructor.newInstance(args);
+
++ // call the LoginModule's initialize method
+ methods = moduleStack[i].module.getClass().getMethods();
+-
+- // call the LoginModule's initialize method
+ for (mIndex = 0; mIndex < methods.length; mIndex++) {
+- if (methods[mIndex].getName().equals(INIT_METHOD))
++ if (methods[mIndex].getName().equals(INIT_METHOD)) {
+ break;
++ }
+ }
+
+ Object[] initArgs = {subject,
+@@ -768,19 +737,28 @@
+ state,
+ moduleStack[i].entry.getOptions() };
+ // invoke the LoginModule initialize method
++ //
++ // Throws ArrayIndexOutOfBoundsException if no such
++ // method defined. May improve to use LoginException in
++ // the future.
+ methods[mIndex].invoke(moduleStack[i].module, initArgs);
+ }
+
+ // find the requested method in the LoginModule
+ for (mIndex = 0; mIndex < methods.length; mIndex++) {
+- if (methods[mIndex].getName().equals(methodName))
++ if (methods[mIndex].getName().equals(methodName)) {
+ break;
++ }
+ }
+
+ // set up the arguments to be passed to the LoginModule method
+ Object[] args = { };
+
+ // invoke the LoginModule method
++ //
++ // Throws ArrayIndexOutOfBoundsException if no such
++ // method defined. May improve to use LoginException in
++ // the future.
+ boolean status = ((Boolean)methods[mIndex].invoke
+ (moduleStack[i].module, args)).booleanValue();
+
+--- ./jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java Thu Dec 19 09:01:16 2013 -0800
+@@ -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
+@@ -35,6 +35,8 @@
+ import java.io.InputStream;
+ import java.io.IOException;
+ import java.io.FileNotFoundException;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+
+ import javax.naming.*;
+
+@@ -362,7 +364,16 @@
+ /*
+ * Dependent on application
+ */
+- String strRowsetProperties = System.getProperty("rowset.properties");
++ String strRowsetProperties;
++ try {
++ strRowsetProperties = AccessController.doPrivileged(new PrivilegedAction<String>() {
++ public String run() {
++ return System.getProperty("rowset.properties");
++ }
++ });
++ } catch (Exception ex) {
++ strRowsetProperties = null;
++ }
+ if (strRowsetProperties != null) {
+ // Load user's implementation of SyncProvider
+ // here. -Drowset.properties=/abc/def/pqr.txt
+@@ -407,7 +418,16 @@
+ * load additional properties from -D command line
+ */
+ properties.clear();
+- String providerImpls = System.getProperty(ROWSET_SYNC_PROVIDER);
++ String providerImpls;
++ try {
++ providerImpls = AccessController.doPrivileged(new PrivilegedAction<String>() {
++ public String run() {
++ return System.getProperty(ROWSET_SYNC_PROVIDER);
++ }
++ });
++ } catch (Exception ex) {
++ providerImpls = null;
++ }
+
+ if (providerImpls != null) {
+ int i = 0;
+--- ./jdk/src/share/classes/javax/swing/SwingUtilities.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/javax/swing/SwingUtilities.java Thu Dec 19 09:01:16 2013 -0800
+@@ -24,6 +24,7 @@
+ */
+ package javax.swing;
+
++import sun.reflect.misc.ReflectUtil;
+ import sun.swing.SwingUtilities2;
+ import sun.swing.UIAction;
+
+@@ -33,9 +34,6 @@
+ import java.awt.event.*;
+ import java.awt.dnd.DropTarget;
+
+-import java.util.Vector;
+-import java.util.Hashtable;
+-
+ import java.lang.reflect.*;
+
+ import javax.accessibility.*;
+@@ -1871,6 +1869,7 @@
+
+
+ static Class<?> loadSystemClass(String className) throws ClassNotFoundException {
++ ReflectUtil.checkPackageAccess(className);
+ return Class.forName(className, true, Thread.currentThread().
+ getContextClassLoader());
+ }
+--- ./jdk/src/share/classes/javax/swing/event/EventListenerList.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/javax/swing/event/EventListenerList.java Thu Dec 19 09:01:16 2013 -0800
+@@ -27,6 +27,7 @@
+ import java.io.*;
+ import java.util.*;
+ import java.lang.reflect.Array;
++import sun.reflect.misc.ReflectUtil;
+
+ /**
+ * A class that holds a list of EventListeners. A single instance
+@@ -270,7 +271,9 @@
+ while (null != (listenerTypeOrNull = s.readObject())) {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ EventListener l = (EventListener)s.readObject();
+- add((Class<EventListener>)Class.forName((String)listenerTypeOrNull, true, cl), l);
++ String name = (String) listenerTypeOrNull;
++ ReflectUtil.checkPackageAccess(name);
++ add((Class<EventListener>)Class.forName(name, true, cl), l);
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -34,7 +34,7 @@
+ java.launcher.ergo.message2 =\ car vous ex\u00E9cutez une machine de classe de serveur.\n
+
+ # Translators please note do not translate the options themselves
+-java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n -classpath <class search path of directories and zip/jar files>\n Liste de r\u00E9pertoires, d''archives JAR et\n d''archives ZIP s\u00E9par\u00E9s par des {0}, dans laquelle rechercher les fichiers de classe.\n -D<name>=<value>\n d\u00E9finition d''une propri\u00E9t\u00E9 syst\u00E8me\n -verbose[:class|gc|jni]\n activation de la sortie en mode verbose\n -version impression de la version du produit et fin de l''op\u00E9ration\n -version:<value>\n ex\u00E9cution de la version sp\u00E9cifi\u00E9e obligatoire\n -showversion impression de la version du produit et poursuite de l''op\u00E9ration\n -jre-restrict-search | -no-jre-restrict-search\n inclusion/exclusion des environnements JRE priv\u00E9s de l''utilisateur dans la recherche de version\n -? -help impression du message d''aide\n -X impression de l''aide sur les options non standard\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n activation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n d\u00E9sactivation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n -esa | -enablesystemassertions\n activation des assertions syst\u00E8me\n -dsa | -disablesystemassertions\n d\u00E9sactivation des assertions syst\u00E8me\n -agentlib:<libname>[=<options>]\n chargement de la biblioth\u00E8que d''agent natif <libname>, par exemple -agentlib:hprof\n voir \u00E9galement, -agentlib:jdwp=help et -agentlib:hprof=help\n -agentpath:<pathname>[=<options>]\n chargement de la biblioth\u00E8que d''agent natif via le chemin d''acc\u00E8s complet\n -javaagent:<jarpath>[=<options>]\n chargement de l''agent du langage de programmation Java, voir java.lang.instrument\n -splash:<imagepath>\n affichage de l''\u00E9cran d''accueil avec l''image sp\u00E9cifi\u00E9e\nVoir http://www.oracle.com/technetwork/java/javase/documentation/index.html pour plus de d\u00E9tails.
++java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n -classpath <class search path of directories and zip/jar files>\n Liste de r\u00E9pertoires, d''archives JAR et\n d''archives ZIP s\u00E9par\u00E9s par des {0}, dans laquelle rechercher les fichiers de classe.\n -D<name>=<value>\n d\u00E9finition d''une propri\u00E9t\u00E9 syst\u00E8me\n -verbose:[class|gc|jni]\n activation de la sortie en mode verbose\n -version impression de la version du produit et fin de l''op\u00E9ration\n -version:<value>\n ex\u00E9cution de la version sp\u00E9cifi\u00E9e obligatoire\n -showversion impression de la version du produit et poursuite de l''op\u00E9ration\n -jre-restrict-search | -no-jre-restrict-search\n inclusion/exclusion des environnements JRE priv\u00E9s de l''utilisateur dans la recherche de version\n -? -help impression du message d''aide\n -X impression de l''aide sur les options non standard\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n activation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n d\u00E9sactivation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n -esa | -enablesystemassertions\n activation des assertions syst\u00E8me\n -dsa | -disablesystemassertions\n d\u00E9sactivation des assertions syst\u00E8me\n -agentlib:<libname>[=<options>]\n chargement de la biblioth\u00E8que d''agent natif <libname>, par exemple -agentlib:hprof\n voir \u00E9galement, -agentlib:jdwp=help et -agentlib:hprof=help\n -agentpath:<pathname>[=<options>]\n chargement de la biblioth\u00E8que d''agent natif via le chemin d''acc\u00E8s complet\n -javaagent:<jarpath>[=<options>]\n chargement de l''agent du langage de programmation Java, voir java.lang.instrument\n -splash:<imagepath>\n affichage de l''\u00E9cran d''accueil avec l''image sp\u00E9cifi\u00E9e\nVoir http://www.oracle.com/technetwork/java/javase/documentation/index.html pour plus de d\u00E9tails.
+
+ # 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -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
+
+ # Translators please note do not translate the options themselves
+-java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n -classpath <class search path of directories and zip/jar files>\n \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001\n JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u304A\u3088\u3073ZIP\u30A2\u30FC\u30AB\u30A4\u30D6\u306E{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30EA\u30B9\u30C8\u3067\u3059\u3002\n -D<name>=<value>\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n -verbose:[class|gc|jni]\n \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046\n -version \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n -version:<value>\n \u6307\u5B9A\u3057\u305F\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5B9F\u884C\u306B\u5FC5\u9808\u306B\u3059\u308B\n -showversion \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3059\u308B\n -jre-restrict-search | -no-jre-restrict-search\n \u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8JRE\u3092\u30D0\u30FC\u30B8\u30E7\u30F3\u691C\u7D22\u306B\u542B\u3081\u308B/\u9664\u5916\u3059\u308B\n -? -help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n -X \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u95A2\u3059\u308B\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3059\u308B\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -esa | -enablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -dsa | -disablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -agentlib:<libname>[=<options>]\n \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002\u4F8B: -agentlib:hprof\n -agentlib:jdwp=help\u3068-agentlib:hprof=help\u3082\u53C2\u7167\n -agentpath:<pathname>[=<options>]\n \u30D5\u30EB\u30D1\u30B9\u540D\u3067\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3059\u308B\n -javaagent:<jarpath>[=<options>]\n Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002java.lang.instrument\u3092\u53C2\u7167\n -splash:<imagepath>\n \u6307\u5B9A\u3057\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3059\u308B\n\u8A73\u7D30\u306Fhttp://www.oracle.com/technetwork/java/javase/documentation/index.html\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
++java.launcher.opt.footer =\ -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001\n JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u304A\u3088\u3073ZIP\u30A2\u30FC\u30AB\u30A4\u30D6\u306E{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30EA\u30B9\u30C8\u3067\u3059\u3002\n -D<name>=<value>\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n -verbose:[class|gc|jni]\n \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046\n -version \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n -version:<value>\n \u6307\u5B9A\u3057\u305F\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5B9F\u884C\u306B\u5FC5\u9808\u306B\u3059\u308B\n -showversion \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3059\u308B\n -jre-restrict-search | -no-jre-restrict-search\n \u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8JRE\u3092\u30D0\u30FC\u30B8\u30E7\u30F3\u691C\u7D22\u306B\u542B\u3081\u308B/\u9664\u5916\u3059\u308B\n -? -help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n -X \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u95A2\u3059\u308B\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3059\u308B\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -esa | -enablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -dsa | -disablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -agentlib:<libname>[=<options>]\n \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002\u4F8B: -agentlib:hprof\n -agentlib:jdwp=help\u3068-agentlib:hprof=help\u3082\u53C2\u7167\n -agentpath:<pathname>[=<options>]\n \u30D5\u30EB\u30D1\u30B9\u540D\u3067\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3059\u308B\n -javaagent:<jarpath>[=<options>]\n Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002java.lang.instrument\u3092\u53C2\u7167\n -splash:<imagepath>\n \u6307\u5B9A\u3057\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3059\u308B\n\u8A73\u7D30\u306Fhttp://www.oracle.com/technetwork/java/javase/documentation/index.html\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+
+ # Translators please note do not translate the options themselves
+-java.launcher.X.usage=\ -Xmixed \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xint \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n -Xbootclasspath:<directories and zip/jar files separated by {0}>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u306E\u30AF\u30E9\u30B9\u3068\u30EA\u30BD\u30FC\u30B9\u306E\u691C\u7D22\u30D1\u30B9\u3092\u8A2D\u5B9A\u3059\u308B\n -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3059\u308B\n -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u524D\u306B\u4ED8\u52A0\u3059\u308B\n -Xdiag \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\n -Xnoclassgc \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xincgc \u5897\u5206\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -Xloggc:<file> \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3059\u308B\n -Xbatch \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xms<size> Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xmx<size> Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xss<size> Java\u306E\u30B9\u30EC\u30C3\u30C9\u30FB\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xprof CPU\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u30FB\u30C7\u30FC\u30BF\u3092\u51FA\u529B\u3059\u308B\n -Xfuture \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3059\u308B\n -Xrs Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3059\u308B(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n -Xcheck:jni JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3059\u308B\n -Xshare:off \u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u306A\u3044\n -Xshare:auto \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xshare:on \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3059\u308B\u3002\n -XshowSettings \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:all\n \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:vm \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:properties\n \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:locale\n \
+-\u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\n-X\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u6A19\u6E96\u306A\u306E\u3067\u3001\u4E88\u544A\u306A\u304F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n
++java.launcher.X.usage=\ -Xmixed \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xint \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n -Xbootclasspath:<{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u306E\u30AF\u30E9\u30B9\u3068\u30EA\u30BD\u30FC\u30B9\u306E\u691C\u7D22\u30D1\u30B9\u3092\u8A2D\u5B9A\u3059\u308B\n -Xbootclasspath/a:<{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3059\u308B\n -Xbootclasspath/p:<{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u524D\u306B\u4ED8\u52A0\u3059\u308B\n -Xdiag \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\n -Xnoclassgc \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xincgc \u5897\u5206\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -Xloggc:<file> \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3059\u308B\n -Xbatch \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xms<size> Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xmx<size> Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xss<size> Java\u306E\u30B9\u30EC\u30C3\u30C9\u30FB\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xprof CPU\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u30FB\u30C7\u30FC\u30BF\u3092\u51FA\u529B\u3059\u308B\n -Xfuture \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3059\u308B\n -Xrs Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3059\u308B(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n -Xcheck:jni JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3059\u308B\n -Xshare:off \u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u306A\u3044\n -Xshare:auto \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xshare:on \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3059\u308B\u3002\n -XshowSettings \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:all\n \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:vm \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:properties\n \
++\u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:locale\n \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\n-X\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u6A19\u6E96\u306A\u306E\u3067\u3001\u4E88\u544A\u306A\u304F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n
+
+ # 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -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
+
+ # Translators please note do not translate the options themselves
+-java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\\n -classpath <class search path of directories and zip/jar files>\\n \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD560 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC,\\n JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\\n -D<name>=<value>\\n \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\\n -verbose:[class|gc|jni]\\n \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -version \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uC885\uB8CC\uD569\uB2C8\uB2E4.\\n -version:<value>\\n \uC2E4\uD589\uD560 \uBC84\uC804\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.\\n -showversion \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\\n -jre-restrict-search | -no-jre-restrict-search\\n \uBC84\uC804 \uAC80\uC0C9\uC5D0\uC11C \uC0AC\uC6A9\uC790 \uC804\uC6A9 JRE\uB97C \uD3EC\uD568/\uC81C\uC678\uD569\uB2C8\uB2E4.\\n -? -help \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\\n -X \uBE44\uD45C\uC900 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\\n -ea[:<packagename>...|:<classname>]\\n -enableassertions[:<packagename>...|:<classname>]\\n \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -da[:<packagename>...|:<classname>]\\n -disableassertions[:<packagename>...|:<classname>]\\n \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -esa | -enablesystemassertions\\n \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -dsa | -disablesystemassertions\\n \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -agentlib:<libname>[=<options>]\\n <libname> \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:hprof).\\n -agentlib:jdwp=help \uBC0F -agentlib:hprof=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\\n -agentpath:<pathname>[=<options>]\\n \uC804\uCCB4 \uACBD\uB85C\uBA85\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\\n -javaagent:<jarpath>[=<options>]\\n Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\\n -splash:<imagepath>\\n \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\\n\uC790\uC138\uD55C \uB0B4\uC6A9\uC740 http://www.oracle.com/technetwork/java/javase/documentation/index.html\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
++java.launcher.opt.footer =\ -cp <\uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C\uC758 \uD074\uB798\uC2A4 \uAC80\uC0C9 \uACBD\uB85C>\n -classpath <\uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C\uC758 \uD074\uB798\uC2A4 \uAC80\uC0C9 \uACBD\uB85C>\n \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD560 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC,\n JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\n -D<name>=<value>\n \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\n -verbose:[class|gc|jni]\n \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -version \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n -version:<value>\n \uC2E4\uD589\uD560 \uBC84\uC804\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.\n -showversion \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -jre-restrict-search | -no-jre-restrict-search\n \uBC84\uC804 \uAC80\uC0C9\uC5D0\uC11C \uC0AC\uC6A9\uC790 \uC804\uC6A9 JRE\uB97C \uD3EC\uD568/\uC81C\uC678\uD569\uB2C8\uB2E4.\n -? -help \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\n -X \uBE44\uD45C\uC900 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -esa | -enablesystemassertions\n \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -dsa | -disablesystemassertions\n \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -agentlib:<libname>[=<options>]\n <libname> \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:hprof).\n -agentlib:jdwp=help \uBC0F -agentlib:hprof=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n -agentpath:<pathname>[=<options>]\n \uC804\uCCB4 \uACBD\uB85C\uBA85\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\n -javaagent:<jarpath>[=<options>]\n Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n -splash:<imagepath>\n \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\uC790\uC138\uD55C \uB0B4\uC6A9\uC740 http://www.oracle.com/technetwork/java/javase/documentation/index.html\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
+
+ # Translators please note do not translate the options themselves
+-java.launcher.X.usage=\ -Xmixed \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xint \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n -Xbootclasspath:<directories and zip/jar files separated by {0}>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uBC0F \uB9AC\uC18C\uC2A4\uC5D0 \uB300\uD55C \uAC80\uC0C9 \uACBD\uB85C\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uC55E\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n -Xdiag \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n -Xnoclassgc \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xincgc \uC99D\uBD84\uC801\uC778 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xloggc:<file> \uC2DC\uAC04 \uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n -Xbatch \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xms<size> \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xmx<size> \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xss<size> Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xprof CPU \uD504\uB85C\uD30C\uC77C \uC791\uC131 \uB370\uC774\uD130\uB97C \uCD9C\uB825\uD569\uB2C8\uB2E4.\n -Xfuture \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xrs Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n -Xcheck:jni JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n -Xshare:off \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -Xshare:auto \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xshare:on \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n -XshowSettings \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:all\n \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:properties\n \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:locale\n \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\n-X \uC635\uC158\uC740 \uBE44\uD45C\uC900 \uC635\uC158\uC774\uBBC0\uB85C \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
++java.launcher.X.usage=\ -Xmixed \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xint \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n -Xbootclasspath:<{0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uBC0F \uB9AC\uC18C\uC2A4\uC5D0 \uB300\uD55C \uAC80\uC0C9 \uACBD\uB85C\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xbootclasspath/a:<{0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n -Xbootclasspath/p:<{0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uC55E\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n -Xdiag \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n -Xnoclassgc \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xincgc \uC99D\uBD84\uC801\uC778 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xloggc:<file> \uC2DC\uAC04 \uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n -Xbatch \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xms<size> \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xmx<size> \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xss<size> Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xprof CPU \uD504\uB85C\uD30C\uC77C \uC791\uC131 \uB370\uC774\uD130\uB97C \uCD9C\uB825\uD569\uB2C8\uB2E4.\n -Xfuture \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xrs Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n -Xcheck:jni JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n -Xshare:off \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -Xshare:auto \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xshare:on \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n -XshowSettings \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:all\n \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:properties\n \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:locale\n \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\n-X \uC635\uC158\uC740 \uBE44\uD45C\uC900 \uC635\uC158\uC774\uBBC0\uB85C \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \
++\uC788\uC2B5\uB2C8\uB2E4.\n
+
+ # 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -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
+
+ # Translators please note do not translate the options themselves
+-java.launcher.opt.footer =\ -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n Uma lista separada por {0} de diret\u00F3rios, archives JAR\n e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n -D<nome>=<valor>\n define uma propriedade do sistema\n -verbose[:classe|gc|jni]\n ativa a sa\u00EDda detalhada\n -version imprime a vers\u00E3o do produto e sai do programa\n -version:<valor>\n requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n -showversion imprime a vers\u00E3o do produto e continua\n -jre-restrict-search | -no-jre-restrict-search\n inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n -? -help imprime esta mensagem de ajuda\n -X imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n -ea[:<nome do pacote>...|:<nome da classe>]\n -enableassertions[:<nome do pacote>...|:<nome da classe>]\n ativa asser\u00E7\u00F5es com granularidade especificada\n -da[:<nome do pacote>...|:<nome da classe>]\n -disableassertions[:<nome do pacote>...|:<nome da classe>]\n desativa asser\u00E7\u00F5es com granularidade especificada\n -esa | -enablesystemassertions\n ativa asser\u00E7\u00F5es do sistema\n -dsa | -disablesystemassertions\n desativa asser\u00E7\u00F5es do sistema\n -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa <nome da biblioteca>, por exemplo: -agentlib:hprof\n consulte tamb\u00E9m: -agentlib:jdwp=help e -agentlib:hprof=help\n -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa com base no nome do caminho completo\n -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n -splash:<caminho da imagem>\n mostra a tela de abertura com a imagem especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para obter mais detalhes.
++java.launcher.opt.footer =\ -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n Uma lista separada por {0} de diret\u00F3rios, archives JAR\n e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n -D<nome>=<valor>\n define uma propriedade do sistema\n -verbose:[class|gc|jni]\n ativa a sa\u00EDda detalhada\n -version imprime a vers\u00E3o do produto e sai do programa\n -version:<valor>\n requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n -showversion imprime a vers\u00E3o do produto e continua\n -jre-restrict-search | -no-jre-restrict-search\n inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n -? -help imprime esta mensagem de ajuda\n -X imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n -ea[:<nome do pacote>...|:<nome da classe>]\n -enableassertions[:<nome do pacote>...|:<nome da classe>]\n ativa asser\u00E7\u00F5es com granularidade especificada\n -da[:<nome do pacote>...|:<nome da classe>]\n -disableassertions[:<nome do pacote>...|:<nome da classe>]\n desativa asser\u00E7\u00F5es com granularidade especificada\n -esa | -enablesystemassertions\n ativa asser\u00E7\u00F5es do sistema\n -dsa | -disablesystemassertions\n desativa asser\u00E7\u00F5es do sistema\n -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa <nome da biblioteca>, por exemplo: -agentlib:hprof\n consulte tamb\u00E9m: -agentlib:jdwp=help e -agentlib:hprof=help\n -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa com base no nome do caminho completo\n -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n -splash:<caminho da imagem>\n mostra a tela de abertura com a imagem especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para obter mais detalhes.
+
+ # 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/nio/ch/AsynchronousSocketChannelImpl.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java Thu Dec 19 09:01:16 2013 -0800
+@@ -428,6 +428,10 @@
+ throw new AlreadyBoundException();
+ InetSocketAddress isa = (local == null) ?
+ new InetSocketAddress(0) : Net.checkAddress(local);
++ SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ sm.checkListen(isa.getPort());
++ }
+ 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/SocketChannelImpl.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java Thu Dec 19 09:01:16 2013 -0800
+@@ -599,6 +599,10 @@
+ throw new AlreadyBoundException();
+ InetSocketAddress isa = (local == null) ?
+ new InetSocketAddress(0) : Net.checkAddress(local);
++ SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ sm.checkListen(isa.getPort());
++ }
+ NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
+ Net.bind(fd, isa.getAddress(), isa.getPort());
+ localAddress = Net.localAddress(fd);
+--- ./jdk/src/share/classes/sun/print/resources/serviceui_es.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/print/resources/serviceui_es.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -36,29 +36,29 @@
+ label.pstype=Tipo:
+ label.rangeto=A
+ label.size=Tama&\u00F1o:
+-label.source=Ori&gen:
++label.source=Orig&en:
+ label.status=Estado:
+ label.username=&Usuario:
+ label.millimetres=(mm)
+ label.inches=(pulg.)
+-label.topmargin=&superior
++label.topmargin=s&uperior
+ label.bottommargin=in&ferior
+ label.leftmargin=iz&quierdo
+ label.rightmargin=d&erecho
+ #
+ radiobutton.color=&Color
+-radiobutton.draftq=Bo&rrador
++radiobutton.draftq=B&orrador
+ radiobutton.duplex=&D\u00FAplex
+-radiobutton.highq=&Alta
++radiobutton.highq=Al&ta
+ radiobutton.landscape=Hori&zontal
+ radiobutton.monochrome=&Monocromo
+ radiobutton.normalq=&Normal
+ radiobutton.oneside=Una Ca&ra
+ radiobutton.portrait=&Vertical
+ radiobutton.rangeall=&Todo
+-radiobutton.rangepages=P\u00E1&ginas
++radiobutton.rangepages=P\u00E1gina&s
+ radiobutton.revlandscape=&Horizontal Inverso
+-radiobutton.revportrait=Vertical Inver&so
++radiobutton.revportrait=Vertical I&nverso
+ radiobutton.tumble=Cam&bio de Cara
+ # The vkMnemonics correspond with the constants defined in KeyEvent, eg
+ # 65 = KeyEvent.VK_A
+--- ./jdk/src/share/classes/sun/print/resources/serviceui_fr.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/print/resources/serviceui_fr.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -29,7 +29,7 @@
+ dialog.writeerror=Impossible d'\u00E9crire dans le fichier :
+ #
+ label.info=Infos :
+-label.jobname=Nom du &travail :
++label.jobname=Nom du tra&vail :
+ label.numcopies=Nombre de c&opies :
+ label.priority=P&riorit\u00E9 :
+ label.psname=&Nom :
+@@ -38,22 +38,22 @@
+ label.size=Tai&lle :
+ label.source=Sour&ce :
+ label.status=Statut :
+-label.username=Nom &utilisateur :
++label.username=Nom ut&ilisateur :
+ label.millimetres=(mm)
+ label.inches=(po)
+ label.topmargin=&haut
+ label.bottommargin=&bas
+-label.leftmargin=&gauche
++label.leftmargin=gauc&he
+ label.rightmargin=&droite
+ #
+-radiobutton.color=Coule&ur
++radiobutton.color=Coul&eur
+ radiobutton.draftq=Broui&llon
+ radiobutton.duplex=&Duplex
+ radiobutton.highq=Ma&x.
+-radiobutton.landscape=Pay&sage
+-radiobutton.monochrome=&Monochrome
++radiobutton.landscape=Pa&ysage
++radiobutton.monochrome=Monoc&hrome
+ radiobutton.normalq=&Normal
+-radiobutton.oneside=&Un c\u00F4t\u00E9
++radiobutton.oneside=Un &c\u00F4t\u00E9
+ radiobutton.portrait=&Portrait
+ radiobutton.rangeall=&Tout
+ radiobutton.rangepages=Pag&es
+@@ -64,7 +64,7 @@
+ # 65 = KeyEvent.VK_A
+ tab.appearance=&Apparence
+ tab.general=&G\u00E9n\u00E9ral
+-tab.pagesetup=Mi&se en page
++tab.pagesetup=&Mise en page
+ #
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/print/resources/serviceui_it.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -47,8 +47,8 @@
+ label.rightmargin=&destro
+ #
+ radiobutton.color=&Colore
+-radiobutton.draftq=&Bozza
+-radiobutton.duplex=F&ronte retro
++radiobutton.draftq=Bo&zza
++radiobutton.duplex=&Fronte retro
+ radiobutton.highq=A&lta
+ radiobutton.landscape=Orizzonta&le
+ radiobutton.monochrome=Monocrom&atico
+@@ -62,7 +62,7 @@
+ radiobutton.tumble=La&to corto
+ # The vkMnemonics correspond with the constants defined in KeyEvent, eg
+ # 65 = KeyEvent.VK_A
+-tab.appearance=&Aspetto
++tab.appearance=As&petto
+ tab.general=&Generale
+ tab.pagesetup=Impo&sta pagina
+ #
+--- ./jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -31,7 +31,7 @@
+ label.info=Informa\u00E7\u00F5es:
+ label.jobname=Nome do &Job:
+ label.numcopies=N\u00FAmer&o de c\u00F3pias:
+-label.priority=P&rioridade:
++label.priority=Pri&oridade:
+ label.psname=&Nome:
+ label.pstype=Tipo:
+ label.rangeto=At\u00E9
+@@ -44,27 +44,27 @@
+ label.topmargin=&superior
+ label.bottommargin=&inferior
+ label.leftmargin=es&querda:
+-label.rightmargin=di&reita
++label.rightmargin=&direita
+ #
+-radiobutton.color=C&or
+-radiobutton.draftq=&Rascunho
+-radiobutton.duplex=&Duplex
+-radiobutton.highq=&Alta
++radiobutton.color=&Cor
++radiobutton.draftq=Rascun&ho
++radiobutton.duplex=Duple&x
++radiobutton.highq=A&lta
+ radiobutton.landscape=&Paisagem
+ radiobutton.monochrome=&Monocrom\u00E1tico
+ radiobutton.normalq=&Normal
+-radiobutton.oneside=Um Lad&o
+-radiobutton.portrait=&Retrato
++radiobutton.oneside=Um La&do
++radiobutton.portrait=Re&trato
+ radiobutton.rangeall=T&udo
+ radiobutton.rangepages=&P\u00E1ginas
+ radiobutton.revlandscape=Paisagem I&nvertida
+-radiobutton.revportrait=Retrato &Invertido
++radiobutton.revportrait=Retrato In&vertido
+ radiobutton.tumble=&Virar
+ # The vkMnemonics correspond with the constants defined in KeyEvent, eg
+ # 65 = KeyEvent.VK_A
+-tab.appearance=&Apar\u00EAncia
++tab.appearance=Apa&r\u00EAncia
+ tab.general=&Geral
+-tab.pagesetup=Configura\u00E7\u00E3o de &P\u00E1gina
++tab.pagesetup=Con&figura\u00E7\u00E3o da P\u00E1gina
+ #
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/print/resources/serviceui_sv.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -17,7 +17,7 @@
+ button.properties=&Egenskaper...
+ #
+ checkbox.collate=&Sortera
+-checkbox.jobsheets=&F\u00F6rs\u00E4ttsblad
++checkbox.jobsheets=F&\u00F6rs\u00E4ttsblad
+ checkbox.printtofile=Skriv ut till &fil
+ #
+ dialog.printtitle=Skriv ut
+@@ -30,13 +30,13 @@
+ #
+ label.info=Information:
+ label.jobname=&Utskrift:
+-label.numcopies=Antal &exemplar:
++label.numcopies=Antal e&xemplar:
+ label.priority=P&rioritet:
+ label.psname=&Namn:
+ label.pstype=Typ:
+ label.rangeto=Till
+ label.size=Stor&lek:
+-label.source=K\u00E4l&la:
++label.source=&K\u00E4lla:
+ label.status=Status:
+ label.username=A&nv\u00E4ndarnamn:
+ label.millimetres=(mm)
+@@ -50,7 +50,7 @@
+ radiobutton.draftq=Utka&st
+ radiobutton.duplex=&Dubbelsidig
+ radiobutton.highq=&H\u00F6g
+-radiobutton.landscape=&Liggande
++radiobutton.landscape=Liggan&de
+ radiobutton.monochrome=&Monokrom
+ radiobutton.normalq=&Normal
+ radiobutton.oneside=&Ensidig
+@@ -62,9 +62,9 @@
+ radiobutton.tumble=&V\u00E4nd
+ # The vkMnemonics correspond with the constants defined in KeyEvent, eg
+ # 65 = KeyEvent.VK_A
+-tab.appearance=&Format
++tab.appearance=Fo&rmat
+ tab.general=&Allm\u00E4nt
+-tab.pagesetup=Utskrifts&format
++tab.pagesetup=&Utskriftsformat
+ #
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java Thu Dec 19 09:01:16 2013 -0800
+@@ -25,13 +25,17 @@
+
+ package sun.reflect.generics.reflectiveObjects;
+
++import java.lang.reflect.Constructor;
+ import java.lang.reflect.GenericDeclaration;
++import java.lang.reflect.Member;
++import java.lang.reflect.Method;
+ import java.lang.reflect.Type;
+ import java.lang.reflect.TypeVariable;
+
+ import sun.reflect.generics.factory.GenericsFactory;
+ import sun.reflect.generics.tree.FieldTypeSignature;
+ import sun.reflect.generics.visitor.Reifier;
++import sun.reflect.misc.ReflectUtil;
+
+ /**
+ * Implementation of <tt>java.lang.reflect.TypeVariable</tt> interface
+@@ -87,6 +91,13 @@
+ TypeVariableImpl<T> make(T decl, String name,
+ FieldTypeSignature[] bs,
+ GenericsFactory f) {
++
++ if (!((decl instanceof Class) ||
++ (decl instanceof Method) ||
++ (decl instanceof Constructor))) {
++ throw new AssertionError("Unexpected kind of GenericDeclaration" +
++ decl.getClass().toString());
++ }
+ return new TypeVariableImpl<T>(decl, name, bs, f);
+ }
+
+@@ -141,6 +152,13 @@
+ * @since 1.5
+ */
+ public D getGenericDeclaration(){
++ if (genericDeclaration instanceof Class)
++ ReflectUtil.checkPackageAccess((Class)genericDeclaration);
++ else if ((genericDeclaration instanceof Method) ||
++ (genericDeclaration instanceof Constructor))
++ ReflectUtil.conservativeCheckMemberAccess((Member)genericDeclaration);
++ else
++ throw new AssertionError("Unexpected kind of GenericDeclaration");
+ return genericDeclaration;
+ }
+
+@@ -156,7 +174,8 @@
+
+ @Override
+ public boolean equals(Object o) {
+- if (o instanceof TypeVariable) {
++ if (o instanceof TypeVariable &&
++ o.getClass() == TypeVariableImpl.class) {
+ TypeVariable that = (TypeVariable) o;
+
+ GenericDeclaration thatDecl = that.getGenericDeclaration();
+--- ./jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java Thu Dec 19 09:01:16 2013 -0800
+@@ -26,11 +26,13 @@
+
+ package sun.reflect.misc;
+
++import java.lang.reflect.Member;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Modifier;
+ import java.lang.reflect.Proxy;
+ import java.util.Arrays;
+ import sun.reflect.Reflection;
++import sun.security.util.SecurityConstants;
+
+ public final class ReflectUtil {
+
+@@ -117,6 +119,39 @@
+ return false;
+ }
+
++ /**
++ * Does a conservative approximation of member access check. Use this if
++ * you don't have an actual 'userland' caller Class/ClassLoader available.
++ * This might be more restrictive than a precise member access check where
++ * you have a caller, but should never allow a member access that is
++ * forbidden.
++ *
++ * @param m the {@code Member} about to be accessed
++ */
++ public static void conservativeCheckMemberAccess(Member m) throws SecurityException{
++ final SecurityManager sm = System.getSecurityManager();
++ if (sm == null)
++ return;
++
++ // Check for package access on the declaring class.
++ //
++ // In addition, unless the member and the declaring class are both
++ // public check for access declared member permissions.
++ //
++ // This is done regardless of ClassLoader relations between the {@code
++ // Member m} and any potential caller.
++
++ final Class<?> declaringClass = m.getDeclaringClass();
++
++ checkPackageAccess(declaringClass);
++
++ if (Modifier.isPublic(m.getModifiers()) &&
++ Modifier.isPublic(declaringClass.getModifiers()))
++ return;
++
++ // Check for declared member access.
++ sm.checkPermission(SecurityConstants.CHECK_MEMBER_ACCESS_PERMISSION);
++ }
+
+ /**
+ * Checks package access on the given class.
+--- ./jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Thu Dec 19 09:01:16 2013 -0800
+@@ -352,7 +352,7 @@
+ public RegistryImpl run() throws RemoteException {
+ return new RegistryImpl(regPort);
+ }
+- }, getAccessControlContext());
++ }, getAccessControlContext(regPort));
+ } catch (PrivilegedActionException ex) {
+ throw (RemoteException) ex.getException();
+ }
+@@ -382,7 +382,7 @@
+ * The approach used here is taken from the similar method
+ * getAccessControlContext() in the sun.applet.AppletPanel class.
+ */
+- private static AccessControlContext getAccessControlContext() {
++ private static AccessControlContext getAccessControlContext(int port) {
+ // begin with permissions granted to all code in current policy
+ PermissionCollection perms = AccessController.doPrivileged(
+ new java.security.PrivilegedAction<PermissionCollection>() {
+@@ -404,6 +404,7 @@
+ * related classes themselves are more tightly limited by RMI.
+ */
+ perms.add(new SocketPermission("*", "connect,accept"));
++ perms.add(new SocketPermission("localhost:"+port, "listen,accept"));
+
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -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:
+
+ # "rmid" should not be translated
+-rmid.log.update.warning=\nrmid: (\uACBD\uACE0) \uB85C\uADF8 \uAC31\uC2E0\uC73C\uB85C \uC778\uD574 \uBC1C\uC0DD\uD55C \uC624\uB958:
++rmid.log.update.warning=\nrmid: (\uACBD\uACE0) \uB85C\uADF8 \uC5C5\uB370\uC774\uD2B8\uB85C \uC778\uD574 \uBC1C\uC0DD\uD55C \uC624\uB958:
+
+ # "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/internal/spec/TlsRsaPremasterSecretParameterSpec.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java Thu Dec 19 09:01:16 2013 -0800
+@@ -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
+@@ -45,11 +45,12 @@
+
+ private final int majorVersion;
+ private final int minorVersion;
++ private final byte[] encodedSecret;
+
+ /**
+ * Constructs a new TlsRsaPremasterSecretParameterSpec.
+- *
+- * <p>The version numbers will be placed inside the premaster secret to
++ * <P>
++ * The version numbers will be placed inside the premaster secret to
+ * detect version rollbacks attacks as described in the TLS specification.
+ * Note that they do not indicate the protocol version negotiated for
+ * the handshake.
+@@ -65,7 +66,42 @@
+ this.majorVersion =
+ TlsMasterSecretParameterSpec.checkVersion(majorVersion);
+ this.minorVersion =
+- TlsMasterSecretParameterSpec.checkVersion(minorVersion); }
++ TlsMasterSecretParameterSpec.checkVersion(minorVersion);
++ this.encodedSecret = null;
++ }
++
++ /**
++ * Constructs a new TlsRsaPremasterSecretParameterSpec.
++ * <P>
++ * The version numbers will be placed inside the premaster secret to
++ * detect version rollbacks attacks as described in the TLS specification.
++ * Note that they do not indicate the protocol version negotiated for
++ * the handshake.
++ * <P>
++ * Usually, the encoded secret key is a random number that acts as
++ * dummy pre_master_secret to avoid vulnerabilities described by
++ * section 7.4.7.1, RFC 5246.
++ *
++ * @param majorVersion the major number of the protocol version
++ * @param minorVersion the minor number of the protocol version
++ * @param encodedSecret the encoded secret key
++ *
++ * @throws IllegalArgumentException if minorVersion or majorVersion are
++ * negative or larger than 255, or encodedSecret is not exactly 48 bytes.
++ */
++ public TlsRsaPremasterSecretParameterSpec(int majorVersion,
++ int minorVersion, byte[] encodedSecret) {
++ this.majorVersion =
++ TlsMasterSecretParameterSpec.checkVersion(majorVersion);
++ this.minorVersion =
++ TlsMasterSecretParameterSpec.checkVersion(minorVersion);
++
++ if (encodedSecret == null || encodedSecret.length != 48) {
++ throw new IllegalArgumentException(
++ "Encoded secret is not exactly 48 bytes");
++ }
++ this.encodedSecret = encodedSecret.clone();
++ }
+
+ /**
+ * Returns the major version.
+@@ -84,4 +120,13 @@
+ public int getMinorVersion() {
+ return minorVersion;
+ }
++
++ /**
++ * Returns the encoded secret.
++ *
++ * @return the encoded secret, may be null if no encoded secret.
++ */
++ public byte[] getEncodedSecret() {
++ return encodedSecret == null ? null : encodedSecret.clone();
++ }
+ }
+--- ./jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -330,7 +330,7 @@
+ // as here we always retrieve the CKA_VALUE even for tokens
+ // that do not have that bug.
+ byte[] keyBytes = key.getEncoded();
+- byte[] newBytes = P11Util.trimZeroes(keyBytes);
++ byte[] newBytes = KeyUtil.trimZeroes(keyBytes);
+ if (keyBytes != newBytes) {
+ key = new SecretKeySpec(newBytes, algorithm);
+ }
+--- ./jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -451,30 +451,7 @@
+ // see JCE spec
+ protected Key engineUnwrap(byte[] wrappedKey, String algorithm,
+ int type) throws InvalidKeyException, NoSuchAlgorithmException {
+- if (algorithm.equals("TlsRsaPremasterSecret")) {
+- // the instance variable "session" has been initialized for
+- // decrypt mode, so use a local variable instead.
+- Session s = null;
+- try {
+- s = token.getObjSession();
+- long keyType = CKK_GENERIC_SECRET;
+- CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] {
+- new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY),
+- new CK_ATTRIBUTE(CKA_KEY_TYPE, keyType),
+- };
+- attributes = token.getAttributes
+- (O_IMPORT, CKO_SECRET_KEY, keyType, attributes);
+- long keyID = token.p11.C_UnwrapKey(s.id(),
+- new CK_MECHANISM(mechanism), p11Key.keyID, wrappedKey,
+- attributes);
+- return P11Key.secretKey(s, keyID, algorithm, 48 << 3,
+- attributes);
+- } catch (PKCS11Exception e) {
+- throw new InvalidKeyException("unwrap() failed", e);
+- } finally {
+- token.releaseSession(s);
+- }
+- }
++
+ // XXX implement unwrap using C_Unwrap() for all keys
+ implInit(Cipher.DECRYPT_MODE, p11Key);
+ if (wrappedKey.length > maxInputSize) {
+--- ./jdk/src/share/classes/sun/security/pkcs11/P11Signature.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs11/P11Signature.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -41,6 +41,7 @@
+
+ import sun.security.pkcs11.wrapper.*;
+ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
++import sun.security.util.KeyUtil;
+
+ /**
+ * Signature implementation class. This class currently supports the
+@@ -687,8 +688,8 @@
+ BigInteger r = values[0].getPositiveBigInteger();
+ BigInteger s = values[1].getPositiveBigInteger();
+ // trim leading zeroes
+- byte[] br = P11Util.trimZeroes(r.toByteArray());
+- byte[] bs = P11Util.trimZeroes(s.toByteArray());
++ byte[] br = KeyUtil.trimZeroes(r.toByteArray());
++ byte[] bs = KeyUtil.trimZeroes(s.toByteArray());
+ int k = Math.max(br.length, bs.length);
+ // r and s each occupy half the array
+ byte[] res = new byte[k << 1];
+--- ./jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2007, 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
+@@ -88,23 +88,33 @@
+ throw new IllegalStateException
+ ("TlsRsaPremasterSecretGenerator must be initialized");
+ }
+- CK_VERSION version =
+- new CK_VERSION(spec.getMajorVersion(), spec.getMinorVersion());
+- Session session = null;
+- try {
+- session = token.getObjSession();
+- CK_ATTRIBUTE[] attributes = token.getAttributes
+- (O_GENERATE, CKO_SECRET_KEY, CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
+- long keyID = token.p11.C_GenerateKey
+- (session.id(), new CK_MECHANISM(mechanism, version), attributes);
+- SecretKey key = P11Key.secretKey
+- (session, keyID, "TlsRsaPremasterSecret", 48 << 3, attributes);
+- return key;
+- } catch (PKCS11Exception e) {
+- throw new ProviderException("Could not generate premaster secret", e);
+- } finally {
+- token.releaseSession(session);
++
++ byte[] b = spec.getEncodedSecret();
++ if (b == null) {
++ CK_VERSION version = new CK_VERSION(
++ spec.getMajorVersion(), spec.getMinorVersion());
++ Session session = null;
++ try {
++ session = token.getObjSession();
++ CK_ATTRIBUTE[] attributes = token.getAttributes(
++ O_GENERATE, CKO_SECRET_KEY,
++ CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
++ long keyID = token.p11.C_GenerateKey(session.id(),
++ new CK_MECHANISM(mechanism, version), attributes);
++ SecretKey key = P11Key.secretKey(session,
++ keyID, "TlsRsaPremasterSecret", 48 << 3, attributes);
++ return key;
++ } catch (PKCS11Exception e) {
++ throw new ProviderException(
++ "Could not generate premaster secret", e);
++ } finally {
++ token.releaseSession(session);
++ }
+ }
++
++ // Won't worry, the TlsRsaPremasterSecret will be soon converted to
++ // TlsMasterSecret.
++ return new SecretKeySpec(b, "TlsRsaPremasterSecret");
+ }
+
+ }
+--- ./jdk/src/share/classes/sun/security/pkcs11/P11Util.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs11/P11Util.java Thu Dec 19 09:01:16 2013 -0800
+@@ -131,20 +131,6 @@
+ return b;
+ }
+
+- // trim leading (most significant) zeroes from the result
+- static byte[] trimZeroes(byte[] b) {
+- int i = 0;
+- while ((i < b.length - 1) && (b[i] == 0)) {
+- i++;
+- }
+- if (i == 0) {
+- return b;
+- }
+- byte[] t = new byte[b.length - i];
+- System.arraycopy(b, i, t, 0, t.length);
+- return t;
+- }
+-
+ public static byte[] getMagnitude(BigInteger bi) {
+ byte[] b = bi.toByteArray();
+ if ((b.length > 1) && (b[0] == 0)) {
+--- ./jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -43,10 +43,8 @@
+ * These are the only platforms we currently support, but other optimized
+ * variants could be added as needed.
+ *
+- * NOTE that because this code performs unchecked direct memory access, it
+- * MUST be restricted to trusted code. It is imperative that the caller protects
+- * against out of bounds memory access by performing the necessary bounds
+- * checks before calling methods in this class.
++ * NOTE that ArrayIndexOutOfBoundsException will be thrown if the bounds checks
++ * failed.
+ *
+ * This class may also be helpful in improving the performance of the
+ * crypto code in the SunJCE provider. However, for now it is only accessible by
+@@ -103,6 +101,10 @@
+ * byte[] to int[] conversion, little endian byte order.
+ */
+ static void b2iLittle(byte[] in, int inOfs, int[] out, int outOfs, int len) {
++ if ((inOfs < 0) || ((in.length - inOfs) < len) ||
++ (outOfs < 0) || ((out.length - outOfs) < len/4)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ inOfs += byteArrayOfs;
+ len += inOfs;
+@@ -131,6 +133,10 @@
+
+ // Special optimization of b2iLittle(in, inOfs, out, 0, 64)
+ static void b2iLittle64(byte[] in, int inOfs, int[] out) {
++ if ((inOfs < 0) || ((in.length - inOfs) < 64) ||
++ (out.length < 16)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ inOfs += byteArrayOfs;
+ out[ 0] = unsafe.getInt(in, (long)(inOfs ));
+@@ -176,6 +182,10 @@
+ * int[] to byte[] conversion, little endian byte order.
+ */
+ static void i2bLittle(int[] in, int inOfs, byte[] out, int outOfs, int len) {
++ if ((inOfs < 0) || ((in.length - inOfs) < len/4) ||
++ (outOfs < 0) || ((out.length - outOfs) < len)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ outOfs += byteArrayOfs;
+ len += outOfs;
+@@ -204,6 +214,9 @@
+
+ // Store one 32-bit value into out[outOfs..outOfs+3] in little endian order.
+ static void i2bLittle4(int val, byte[] out, int outOfs) {
++ if ((outOfs < 0) || ((out.length - outOfs) < 4)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ unsafe.putInt(out, (long)(byteArrayOfs + outOfs), val);
+ } else if (bigEndian && ((outOfs & 3) == 0)) {
+@@ -220,6 +233,10 @@
+ * byte[] to int[] conversion, big endian byte order.
+ */
+ static void b2iBig(byte[] in, int inOfs, int[] out, int outOfs, int len) {
++ if ((inOfs < 0) || ((in.length - inOfs) < len) ||
++ (outOfs < 0) || ((out.length - outOfs) < len/4)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ inOfs += byteArrayOfs;
+ len += inOfs;
+@@ -248,6 +265,10 @@
+
+ // Special optimization of b2iBig(in, inOfs, out, 0, 64)
+ static void b2iBig64(byte[] in, int inOfs, int[] out) {
++ if ((inOfs < 0) || ((in.length - inOfs) < 64) ||
++ (out.length < 16)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ inOfs += byteArrayOfs;
+ out[ 0] = reverseBytes(unsafe.getInt(in, (long)(inOfs )));
+@@ -293,6 +314,10 @@
+ * int[] to byte[] conversion, big endian byte order.
+ */
+ static void i2bBig(int[] in, int inOfs, byte[] out, int outOfs, int len) {
++ if ((inOfs < 0) || ((in.length - inOfs) < len/4) ||
++ (outOfs < 0) || ((out.length - outOfs) < len)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ outOfs += byteArrayOfs;
+ len += outOfs;
+@@ -321,6 +346,9 @@
+
+ // Store one 32-bit value into out[outOfs..outOfs+3] in big endian order.
+ static void i2bBig4(int val, byte[] out, int outOfs) {
++ if ((outOfs < 0) || ((out.length - outOfs) < 4)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ unsafe.putInt(out, (long)(byteArrayOfs + outOfs), reverseBytes(val));
+ } else if (bigEndian && ((outOfs & 3) == 0)) {
+@@ -337,6 +365,10 @@
+ * byte[] to long[] conversion, big endian byte order.
+ */
+ static void b2lBig(byte[] in, int inOfs, long[] out, int outOfs, int len) {
++ if ((inOfs < 0) || ((in.length - inOfs) < len) ||
++ (outOfs < 0) || ((out.length - outOfs) < len/8)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ inOfs += byteArrayOfs;
+ len += inOfs;
+@@ -378,6 +410,10 @@
+
+ // Special optimization of b2lBig(in, inOfs, out, 0, 128)
+ static void b2lBig128(byte[] in, int inOfs, long[] out) {
++ if ((inOfs < 0) || ((in.length - inOfs) < 128) ||
++ (out.length < 16)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ if (littleEndianUnaligned) {
+ inOfs += byteArrayOfs;
+ out[ 0] = reverseBytes(unsafe.getLong(in, (long)(inOfs )));
+@@ -406,6 +442,10 @@
+ * long[] to byte[] conversion, big endian byte order.
+ */
+ static void l2bBig(long[] in, int inOfs, byte[] out, int outOfs, int len) {
++ if ((inOfs < 0) || ((in.length - inOfs) < len/8) ||
++ (outOfs < 0) || ((out.length - outOfs) < len)) {
++ throw new ArrayIndexOutOfBoundsException();
++ }
+ len += outOfs;
+ while (outOfs < len) {
+ long i = in[inOfs++];
+@@ -419,5 +459,4 @@
+ out[outOfs++] = (byte)(i );
+ }
+ }
+-
+ }
+--- ./jdk/src/share/classes/sun/security/rsa/RSAPadding.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/rsa/RSAPadding.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 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
+@@ -318,33 +318,53 @@
+
+ /**
+ * PKCS#1 v1.5 unpadding (blocktype 1 and 2).
++ *
++ * Note that we want to make it a constant-time operation
+ */
+ private byte[] unpadV15(byte[] padded) throws BadPaddingException {
+ int k = 0;
++ BadPaddingException bpe = null;
++
+ if (padded[k++] != 0) {
+- throw new BadPaddingException("Data must start with zero");
++ bpe = new BadPaddingException("Data must start with zero");
+ }
+- if (padded[k++] != type) {
+- throw new BadPaddingException("Blocktype mismatch: " + padded[1]);
++ if (padded[k++] != type && bpe == null) {
++ bpe = new BadPaddingException("Blocktype mismatch: " + padded[1]);
+ }
+- while (true) {
++ int p = 0;
++ while (k < padded.length) {
+ int b = padded[k++] & 0xff;
+- if (b == 0) {
+- break;
++ 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 ((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);
+ }
+ }
+- 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");
+ }
++
++ // 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);
++ System.arraycopy(padded, p, data, 0, n);
++
++ if (bpe == null) {
++ bpe = new BadPaddingException("Unused exception");
++ } else {
++ throw bpe;
++ }
++
+ return data;
+ }
+
+--- ./jdk/src/share/classes/sun/security/ssl/Handshaker.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/Handshaker.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 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
+@@ -1047,94 +1047,22 @@
+ clnt_random.random_bytes, svr_random.random_bytes,
+ prfHashAlg, prfHashLength, prfBlockSize);
+
+- SecretKey masterSecret;
+ try {
+ KeyGenerator kg = JsseJce.getKeyGenerator(masterAlg);
+ kg.init(spec);
+- masterSecret = kg.generateKey();
+- } catch (GeneralSecurityException e) {
++ return kg.generateKey();
++ } catch (InvalidAlgorithmParameterException |
++ NoSuchAlgorithmException iae) {
++ // unlikely to happen, otherwise, must be a provider exception
++ //
+ // For RSA premaster secrets, do not signal a protocol error
+ // due to the Bleichenbacher attack. See comments further down.
+- if (!preMasterSecret.getAlgorithm().equals(
+- "TlsRsaPremasterSecret")) {
+- throw new ProviderException(e);
+- }
+-
+ if (debug != null && Debug.isOn("handshake")) {
+ System.out.println("RSA master secret generation error:");
+- e.printStackTrace(System.out);
++ iae.printStackTrace(System.out);
+ }
+-
+- if (requestedVersion != null) {
+- preMasterSecret =
+- RSAClientKeyExchange.generateDummySecret(requestedVersion);
+- } else {
+- preMasterSecret =
+- RSAClientKeyExchange.generateDummySecret(protocolVersion);
+- }
+-
+- // recursive call with new premaster secret
+- return calculateMasterSecret(preMasterSecret, null);
++ throw new ProviderException(iae);
+ }
+-
+- // if no version check requested (client side handshake), or version
+- // information is not available (not an RSA premaster secret),
+- // return master secret immediately.
+- if ((requestedVersion == null) ||
+- !(masterSecret instanceof TlsMasterSecret)) {
+- return masterSecret;
+- }
+-
+- // we have checked the ClientKeyExchange message when reading TLS
+- // record, the following check is necessary to ensure that
+- // JCE provider does not ignore the checking, or the previous
+- // checking process bypassed the premaster secret version checking.
+- TlsMasterSecret tlsKey = (TlsMasterSecret)masterSecret;
+- int major = tlsKey.getMajorVersion();
+- int minor = tlsKey.getMinorVersion();
+- if ((major < 0) || (minor < 0)) {
+- return masterSecret;
+- }
+-
+- // check if the premaster secret version is ok
+- // the specification says that it must be the maximum version supported
+- // by the client from its ClientHello message. However, many
+- // implementations send the negotiated version, so accept both
+- // for SSL v3.0 and TLS v1.0.
+- // NOTE that we may be comparing two unsupported version numbers, which
+- // is why we cannot use object reference equality in this special case.
+- ProtocolVersion premasterVersion =
+- ProtocolVersion.valueOf(major, minor);
+- boolean versionMismatch = (premasterVersion.v != requestedVersion.v);
+-
+- /*
+- * we never checked the client_version in server side
+- * for TLS v1.0 and SSL v3.0. For compatibility, we
+- * maintain this behavior.
+- */
+- if (versionMismatch && requestedVersion.v <= ProtocolVersion.TLS10.v) {
+- versionMismatch = (premasterVersion.v != protocolVersion.v);
+- }
+-
+- if (versionMismatch == false) {
+- // check passed, return key
+- return masterSecret;
+- }
+-
+- // Due to the Bleichenbacher attack, do not signal a protocol error.
+- // Generate a random premaster secret and continue with the handshake,
+- // which will fail when verifying the finished messages.
+- // For more information, see comments in PreMasterSecret.
+- if (debug != null && Debug.isOn("handshake")) {
+- System.out.println("RSA PreMasterSecret version error: expected"
+- + protocolVersion + " or " + requestedVersion + ", decrypted: "
+- + premasterVersion);
+- }
+- preMasterSecret =
+- RSAClientKeyExchange.generateDummySecret(requestedVersion);
+-
+- // recursive call with new premaster secret
+- return calculateMasterSecret(preMasterSecret, null);
+ }
+
+ /*
+--- ./jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 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
+@@ -135,26 +135,37 @@
+ } else {
+ encrypted = new byte [messageSize];
+ if (input.read(encrypted) != messageSize) {
+- throw new SSLProtocolException
+- ("SSL: read PreMasterSecret: short read");
++ throw new SSLProtocolException(
++ "SSL: read PreMasterSecret: short read");
+ }
+ }
+
++ Exception failover = null;
++ byte[] encoded = null;
+ try {
+ Cipher cipher = JsseJce.getCipher(JsseJce.CIPHER_RSA_PKCS1);
+- cipher.init(Cipher.UNWRAP_MODE, privateKey);
+- preMaster = (SecretKey)cipher.unwrap(encrypted,
+- "TlsRsaPremasterSecret", Cipher.SECRET_KEY);
++ // Cannot generate key here, please don't use Cipher.UNWRAP_MODE!
++ cipher.init(Cipher.DECRYPT_MODE, privateKey);
++ encoded = cipher.doFinal(encrypted);
++ } catch (BadPaddingException bpe) {
++ failover = bpe;
++ encoded = null;
++ } catch (IllegalBlockSizeException ibse) {
++ // the message it too big to process with RSA
++ throw new SSLProtocolException(
++ "Unable to process PreMasterSecret, may be too big");
++ } catch (Exception e) {
++ // unlikely to happen, otherwise, must be a provider exception
++ if (debug != null && Debug.isOn("handshake")) {
++ System.out.println("RSA premaster secret decryption error:");
++ e.printStackTrace(System.out);
++ }
++ throw new RuntimeException("Could not generate dummy secret", e);
++ }
+
+- // polish the premaster secret
+- preMaster = polishPreMasterSecretKey(currentVersion, maxVersion,
+- generator, preMaster, null);
+- } catch (Exception e) {
+- // polish the premaster secret
+- preMaster =
+- polishPreMasterSecretKey(currentVersion, maxVersion,
+- generator, null, e);
+- }
++ // polish the premaster secret
++ preMaster = polishPreMasterSecretKey(
++ currentVersion, maxVersion, generator, encoded, failover);
+ }
+
+ /**
+@@ -165,85 +176,74 @@
+ *
+ * RFC 5246 describes the approach as :
+ *
+- * 1. Generate a string R of 46 random bytes
++ * 1. Generate a string R of 48 random bytes
+ *
+ * 2. Decrypt the message to recover the plaintext M
+ *
+ * 3. If the PKCS#1 padding is not correct, or the length of message
+ * M is not exactly 48 bytes:
+- * pre_master_secret = ClientHello.client_version || R
++ * pre_master_secret = R
+ * else If ClientHello.client_version <= TLS 1.0, and version
+ * number check is explicitly disabled:
+- * pre_master_secret = M
++ * premaster secret = M
++ * else If M[0..1] != ClientHello.client_version:
++ * premaster secret = R
+ * else:
+- * pre_master_secret = ClientHello.client_version || M[2..47]
++ * premaster secret = M
++ *
++ * Note that #2 has completed before the call of this method.
+ */
+ private SecretKey polishPreMasterSecretKey(ProtocolVersion currentVersion,
+ ProtocolVersion clientHelloVersion, SecureRandom generator,
+- SecretKey secretKey, Exception failoverException) {
++ byte[] encoded, Exception failoverException) {
+
+ this.protocolVersion = clientHelloVersion;
++ if (generator == null) {
++ generator = new SecureRandom();
++ }
++ byte[] random = new byte[48];
++ generator.nextBytes(random);
+
+- if (failoverException == null && secretKey != null) {
++ if (failoverException == null && encoded != null) {
+ // check the length
+- byte[] encoded = secretKey.getEncoded();
+- if (encoded == null) { // unable to get the encoded key
++ if (encoded.length != 48) {
+ if (debug != null && Debug.isOn("handshake")) {
+ System.out.println(
+- "unable to get the plaintext of the premaster secret");
++ "incorrect length of premaster secret: " +
++ encoded.length);
+ }
+
+- int keySize = KeyUtil.getKeySize(secretKey);
+- if (keySize > 0 && keySize != 384) { // 384 = 48 * 8
+- if (debug != null && Debug.isOn("handshake")) {
+- System.out.println(
+- "incorrect length of premaster secret: " +
+- (keySize/8));
+- }
++ return generatePreMasterSecret(
++ clientHelloVersion, random, generator);
++ }
+
+- return generateDummySecret(clientHelloVersion);
+- }
++ if (clientHelloVersion.major != encoded[0] ||
++ clientHelloVersion.minor != encoded[1]) {
+
+- // The key size is exactly 48 bytes or not accessible.
+- //
+- // Conservatively, pass the checking to master secret
+- // calculation.
+- return secretKey;
+- } else if (encoded.length == 48) {
+- // check the version
+- if (clientHelloVersion.major == encoded[0] &&
+- clientHelloVersion.minor == encoded[1]) {
+-
+- return secretKey;
+- } else if (clientHelloVersion.v <= ProtocolVersion.TLS10.v &&
+- currentVersion.major == encoded[0] &&
+- currentVersion.minor == encoded[1]) {
++ if (clientHelloVersion.v <= ProtocolVersion.TLS10.v &&
++ currentVersion.major == encoded[0] &&
++ currentVersion.minor == encoded[1]) {
+ /*
+ * For compatibility, we maintain the behavior that the
+ * version in pre_master_secret can be the negotiated
+ * version for TLS v1.0 and SSL v3.0.
+ */
+ this.protocolVersion = currentVersion;
+- return secretKey;
++ } else {
++ if (debug != null && Debug.isOn("handshake")) {
++ System.out.println("Mismatching Protocol Versions, " +
++ "ClientHello.client_version is " +
++ clientHelloVersion +
++ ", while PreMasterSecret.client_version is " +
++ ProtocolVersion.valueOf(encoded[0], encoded[1]));
++ }
++
++ encoded = random;
+ }
++ }
+
+- if (debug != null && Debug.isOn("handshake")) {
+- System.out.println("Mismatching Protocol Versions, " +
+- "ClientHello.client_version is " + clientHelloVersion +
+- ", while PreMasterSecret.client_version is " +
+- ProtocolVersion.valueOf(encoded[0], encoded[1]));
+- }
+-
+- return generateDummySecret(clientHelloVersion);
+- } else {
+- if (debug != null && Debug.isOn("handshake")) {
+- System.out.println(
+- "incorrect length of premaster secret: " +
+- encoded.length);
+- }
+-
+- return generateDummySecret(clientHelloVersion);
+- }
++ return generatePreMasterSecret(
++ clientHelloVersion, encoded, generator);
+ }
+
+ if (debug != null && Debug.isOn("handshake") &&
+@@ -252,11 +252,14 @@
+ failoverException.printStackTrace(System.out);
+ }
+
+- return generateDummySecret(clientHelloVersion);
++ return generatePreMasterSecret(clientHelloVersion, random, generator);
+ }
+
+ // generate a premaster secret with the specified version number
+- static SecretKey generateDummySecret(ProtocolVersion version) {
++ private static SecretKey generatePreMasterSecret(
++ ProtocolVersion version, byte[] encodedSecret,
++ SecureRandom generator) {
++
+ if (debug != null && Debug.isOn("handshake")) {
+ System.out.println("Generating a random fake premaster secret");
+ }
+@@ -265,11 +268,17 @@
+ String s = ((version.v >= ProtocolVersion.TLS12.v) ?
+ "SunTls12RsaPremasterSecret" : "SunTlsRsaPremasterSecret");
+ KeyGenerator kg = JsseJce.getKeyGenerator(s);
+- kg.init(new TlsRsaPremasterSecretParameterSpec
+- (version.major, version.minor));
++ kg.init(new TlsRsaPremasterSecretParameterSpec(
++ version.major, version.minor, encodedSecret), generator);
+ return kg.generateKey();
+- } catch (GeneralSecurityException e) {
+- throw new RuntimeException("Could not generate dummy secret", e);
++ } catch (InvalidAlgorithmParameterException |
++ NoSuchAlgorithmException iae) {
++ // unlikely to happen, otherwise, must be a provider exception
++ if (debug != null && Debug.isOn("handshake")) {
++ System.out.println("RSA premaster secret generation error:");
++ iae.printStackTrace(System.out);
++ }
++ throw new RuntimeException("Could not generate dummy secret", iae);
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/security/tools/JarSigner.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/tools/JarSigner.java Thu Dec 19 09:01:16 2013 -0800
+@@ -155,8 +155,13 @@
+ private String altSignerClasspath = null;
+ private ZipFile zipFile = null;
+
++ // Informational warnings
++ private boolean hasExpiringCert = false;
++ private boolean noTimestamp = false;
++ private Date expireDate = new Date(0L); // used in noTimestamp warning
++
++ // Severe warnings
+ private boolean hasExpiredCert = false;
+- private boolean hasExpiringCert = false;
+ private boolean notYetValidCert = false;
+ private boolean chainNotValidated = false;
+ private boolean notSignedByAlias = false;
+@@ -255,9 +260,6 @@
+
+ if (strict) {
+ int exitCode = 0;
+- if (hasExpiringCert) {
+- exitCode |= 2;
+- }
+ if (chainNotValidated || hasExpiredCert || notYetValidCert) {
+ exitCode |= 4;
+ }
+@@ -746,14 +748,25 @@
+ System.out.println(rb.getString(
+ "jar.is.unsigned.signatures.missing.or.not.parsable."));
+ } else {
+- System.out.println(rb.getString("jar.verified."));
+- if (hasUnsignedEntry || hasExpiredCert || hasExpiringCert ||
+- badKeyUsage || badExtendedKeyUsage || badNetscapeCertType ||
+- notYetValidCert || chainNotValidated ||
+- aliasNotInStore || notSignedByAlias) {
++ boolean warningAppeared = false;
++ boolean errorAppeared = false;
++ if (badKeyUsage || badExtendedKeyUsage || badNetscapeCertType ||
++ notYetValidCert || chainNotValidated || hasExpiredCert ||
++ hasUnsignedEntry ||
++ aliasNotInStore || notSignedByAlias) {
+
+- System.out.println();
+- System.out.println(rb.getString("Warning."));
++ if (strict) {
++ System.out.println(rb.getString("jar.verified.with.signer.errors."));
++ System.out.println();
++ System.out.println(rb.getString("Error."));
++ errorAppeared = true;
++ } else {
++ System.out.println(rb.getString("jar.verified."));
++ System.out.println();
++ System.out.println(rb.getString("Warning."));
++ warningAppeared = true;
++ }
++
+ 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 @@
+ System.out.println(rb.getString(
+ "This.jar.contains.entries.whose.signer.certificate.has.expired."));
+ }
+- if (hasExpiringCert) {
+- System.out.println(rb.getString(
+- "This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months."));
+- }
+ if (notYetValidCert) {
+ System.out.println(rb.getString(
+ "This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid."));
+@@ -799,10 +808,29 @@
+ if (aliasNotInStore) {
+ System.out.println(rb.getString("This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore."));
+ }
++ } else {
++ System.out.println(rb.getString("jar.verified."));
++ }
++ if (hasExpiringCert || noTimestamp) {
++ if (!warningAppeared) {
++ System.out.println();
++ System.out.println(rb.getString("Warning."));
++ warningAppeared = true;
++ }
++ if (hasExpiringCert) {
++ System.out.println(rb.getString(
++ "This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months."));
++ }
++ if (noTimestamp) {
++ System.out.println(
++ String.format(rb.getString("no.timestamp.verifying"), expireDate));
++ }
++ }
++ if (warningAppeared || errorAppeared) {
+ if (! (verbose != null && showcerts)) {
+ System.out.println();
+ System.out.println(rb.getString(
+- "Re.run.with.the.verbose.and.certs.options.for.more.details."));
++ "Re.run.with.the.verbose.and.certs.options.for.more.details."));
+ }
+ }
+ }
+@@ -862,6 +890,9 @@
+ try {
+ boolean printValidity = true;
+ if (timestamp == null) {
++ if (expireDate.getTime() == 0 || expireDate.after(notAfter)) {
++ expireDate = notAfter;
++ }
+ x509Cert.checkValidity();
+ // test if cert will expire within six months
+ if (notAfter.getTime() < System.currentTimeMillis() + SIX_MONTHS) {
+@@ -1227,6 +1258,10 @@
+ tsaCert = getTsaCert(tsaAlias);
+ }
+
++ if (tsaUrl == null && tsaCert == null) {
++ noTimestamp = true;
++ }
++
+ SignatureFile.Block block = null;
+
+ try {
+@@ -1375,12 +1410,20 @@
+ }
+ }
+
+- if (hasExpiredCert || hasExpiringCert || notYetValidCert
+- || badKeyUsage || badExtendedKeyUsage
+- || badNetscapeCertType || chainNotValidated) {
+- System.out.println();
++ boolean warningAppeared = false;
++ if (badKeyUsage || badExtendedKeyUsage || badNetscapeCertType ||
++ notYetValidCert || chainNotValidated || hasExpiredCert) {
++ if (strict) {
++ System.out.println(rb.getString("jar.signed.with.signer.errors."));
++ System.out.println();
++ System.out.println(rb.getString("Error."));
++ } else {
++ System.out.println(rb.getString("jar.signed."));
++ System.out.println();
++ System.out.println(rb.getString("Warning."));
++ warningAppeared = true;
++ }
+
+- System.out.println(rb.getString("Warning."));
+ if (badKeyUsage) {
+ System.out.println(
+ rb.getString("The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing."));
+@@ -1399,9 +1442,6 @@
+ if (hasExpiredCert) {
+ System.out.println(
+ rb.getString("The.signer.certificate.has.expired."));
+- } else if (hasExpiringCert) {
+- System.out.println(
+- rb.getString("The.signer.certificate.will.expire.within.six.months."));
+ } else if (notYetValidCert) {
+ System.out.println(
+ rb.getString("The.signer.certificate.is.not.yet.valid."));
+@@ -1411,6 +1451,24 @@
+ System.out.println(
+ rb.getString("The.signer.s.certificate.chain.is.not.validated."));
+ }
++ } else {
++ System.out.println(rb.getString("jar.signed."));
++ }
++ if (hasExpiringCert || noTimestamp) {
++ if (!warningAppeared) {
++ System.out.println();
++ System.out.println(rb.getString("Warning."));
++ }
++
++ if (hasExpiringCert) {
++ System.out.println(
++ rb.getString("The.signer.certificate.will.expire.within.six.months."));
++ }
++
++ if (noTimestamp) {
++ System.out.println(
++ String.format(rb.getString("no.timestamp.signing"), expireDate));
++ }
+ }
+
+ // no IOException thrown in the above try clause, so disable
+@@ -1496,6 +1554,7 @@
+ timestamp = ts.getTimestamp();
+ } else {
+ timestamp = null;
++ noTimestamp = true;
+ }
+ // 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources.java Thu Dec 19 09:01:16 2013 -0800
+@@ -110,9 +110,9 @@
+ {"Please.specify.alias.name", "Please specify alias name"},
+ {"Only.one.alias.can.be.specified", "Only one alias can be specified"},
+ {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
+- "This jar contains signed entries which is not signed by the specified alias(es)."},
++ "This jar contains signed entries which are not signed by the specified alias(es)."},
+ {"This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.",
+- "This jar contains signed entries that's not signed by alias in this keystore."},
++ "This jar contains signed entries that are not signed by alias in this keystore."},
+ {"s", "s"},
+ {"m", "m"},
+ {"k", "k"},
+@@ -133,7 +133,10 @@
+ {".Unsigned.entries.", "(Unsigned entries)"},
+ {"jar.is.unsigned.signatures.missing.or.not.parsable.",
+ "jar is unsigned. (signatures missing or not parsable)"},
++ {"jar.signed.", "jar signed."},
++ {"jar.signed.with.signer.errors.", "jar signed, with signer errors."},
+ {"jar.verified.", "jar verified."},
++ {"jar.verified.with.signer.errors.", "jar verified, with signer errors."},
+ {"jarsigner.", "jarsigner: "},
+ {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
+ "signature filename must consist of the following characters: A-Z, 0-9, _ or -"},
+@@ -191,6 +194,7 @@
+ "using an alternative signing mechanism"},
+ {"entry.was.signed.on", "entry was signed on {0}"},
+ {"Warning.", "Warning: "},
++ {"Error.", "Error: "},
+ {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
+ "This jar contains unsigned entries which have not been integrity-checked. "},
+ {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
+@@ -227,6 +231,10 @@
+ "The signer's certificate chain is not validated."},
+ {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
+ "This jar contains entries whose certificate chain is not validated."},
++ {"no.timestamp.signing",
++ "No -tsa or -tsacert is provided and this jar is not timestamped. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td) or after any future revocation date."},
++ {"no.timestamp.verifying",
++ "This jar contains signatures that does not include a timestamp. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td) or after any future revocation date."},
+ };
+
+ /**
+--- ./jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java Thu Dec 19 09:01:16 2013 -0800
+@@ -79,7 +79,7 @@
+ {".verbose.suboptions.verbose.output.when.signing.verifying.",
+ "[-verbose[:suboptions]] \u7F72\u540D/\u691C\u8A3C\u6642\u306E\u8A73\u7D30\u51FA\u529B\u3002"},
+ {".suboptions.can.be.all.grouped.or.summary",
+- " \u30B5\u30D6\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u3057\u3066\u3001\u3059\u3079\u3066\u3001\u30B0\u30EB\u30FC\u30D7\u307E\u305F\u306F\u30B5\u30DE\u30EA\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059"},
++ " \u30B5\u30D6\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u3057\u3066\u3001all\u3001grouped\u307E\u305F\u306Fsummary\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059"},
+ {".certs.display.certificates.when.verbose.and.verifying",
+ "[-certs] \u8A73\u7D30\u51FA\u529B\u304A\u3088\u3073\u691C\u8A3C\u6642\u306B\u8A3C\u660E\u66F8\u3092\u8868\u793A"},
+ {".tsa.url.location.of.the.Timestamping.Authority",
+@@ -133,7 +133,10 @@
+ {".Unsigned.entries.", "(\u672A\u7F72\u540D\u306E\u30A8\u30F3\u30C8\u30EA)"},
+ {"jar.is.unsigned.signatures.missing.or.not.parsable.",
+ "jar\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002(\u7F72\u540D\u304C\u898B\u3064\u304B\u3089\u306A\u3044\u304B\u3001\u69CB\u6587\u89E3\u6790\u3067\u304D\u307E\u305B\u3093)"},
+- {"jar.verified.", "jar\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F\u3002"},
++ {"jar.signed.", "jar\u306F\u7F72\u540D\u3055\u308C\u307E\u3057\u305F\u3002"},
++ {"jar.signed.with.signer.errors.", "jar\u306F\u7F72\u540D\u3055\u308C\u307E\u3057\u305F - \u7F72\u540D\u8005\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\u3002"},
++ {"jar.verified.", "jar\u306F\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F\u3002"},
++ {"jar.verified.with.signer.errors.", "jar\u306F\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F - \u7F72\u540D\u8005\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\u3002"},
+ {"jarsigner.", "jarsigner: "},
+ {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
+ "\u7F72\u540D\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u306F\u6B21\u306E\u6587\u5B57\u3067\u69CB\u6210\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: A-Z 0-9 _ -"},
+@@ -189,6 +192,7 @@
+ "\u4EE3\u66FF\u7F72\u540D\u30E1\u30AB\u30CB\u30BA\u30E0\u306E\u4F7F\u7528"},
+ {"entry.was.signed.on", "\u30A8\u30F3\u30C8\u30EA\u306F{0}\u306B\u7F72\u540D\u3055\u308C\u307E\u3057\u305F"},
+ {"Warning.", "\u8B66\u544A: "},
++ {"Error.", "\u30A8\u30E9\u30FC: "},
+ {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
+ "\u3053\u306Ejar\u306B\u306F\u3001\u6574\u5408\u6027\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u3044\u306A\u3044\u672A\u7F72\u540D\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "},
+ {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
+@@ -225,6 +229,10 @@
+ "\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u307E\u3060\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
+ {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
+ "\u3053\u306Ejar\u306B\u306F\u3001\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u307E\u3060\u691C\u8A3C\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002"},
++ {"no.timestamp.signing",
++ "-tsa\u307E\u305F\u306F-tsacert\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u3053\u306Ejar\u306B\u306F\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u3068\u3001\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u671F\u9650(%1$tY-%1$tm-%1$td)\u5F8C\u307E\u305F\u306F\u5C06\u6765\u306E\u5931\u52B9\u65E5\u5F8C\u306B\u3001\u30E6\u30FC\u30B6\u30FC\u306F\u3053\u306Ejar\u3092\u691C\u8A3C\u3067\u304D\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"},
++ {"no.timestamp.verifying",
++ "\u3053\u306Ejar\u306B\u306F\u3001\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u7F72\u540D\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u3068\u3001\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u671F\u9650(%1$tY-%1$tm-%1$td)\u5F8C\u307E\u305F\u306F\u5C06\u6765\u306E\u5931\u52B9\u65E5\u5F8C\u306B\u3001\u30E6\u30FC\u30B6\u30FC\u306F\u3053\u306Ejar\u3092\u691C\u8A3C\u3067\u304D\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"},
+ };
+
+ /**
+--- ./jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Thu Dec 19 09:01:16 2013 -0800
+@@ -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"},
+ {"Usage.jarsigner.options.jar.file.alias",
+- "\u7528\u6CD5: jarsigner [\u9009\u9879] jar \u6587\u4EF6\u522B\u540D"},
++ "\u7528\u6CD5: jarsigner [\u9009\u9879] jar-file \u522B\u540D"},
+ {".jarsigner.verify.options.jar.file.alias.",
+ " jarsigner -verify [options] jar-file [alias...]"},
+ {".keystore.url.keystore.location",
+@@ -132,8 +132,11 @@
+ {".Signature.related.entries.","(\u4E0E\u7B7E\u540D\u76F8\u5173\u7684\u6761\u76EE)"},
+ {".Unsigned.entries.", "(\u672A\u7B7E\u540D\u6761\u76EE)"},
+ {"jar.is.unsigned.signatures.missing.or.not.parsable.",
+- "jar \u672A\u7B7E\u540D\u3002(\u7F3A\u5C11\u7B7E\u540D\u6216\u65E0\u6CD5\u5BF9\u7B7E\u540D\u8FDB\u884C\u8BED\u6CD5\u5206\u6790)"},
++ "jar \u672A\u7B7E\u540D\u3002(\u7F3A\u5C11\u7B7E\u540D\u6216\u65E0\u6CD5\u89E3\u6790\u7B7E\u540D)"},
++ {"jar.signed.", "jar \u5DF2\u7B7E\u540D\u3002"},
++ {"jar.signed.with.signer.errors.", "jar \u5DF2\u7B7E\u540D, \u4F46\u51FA\u73B0\u7B7E\u540D\u8005\u9519\u8BEF\u3002"},
+ {"jar.verified.", "jar \u5DF2\u9A8C\u8BC1\u3002"},
++ {"jar.verified.with.signer.errors.", "jar \u5DF2\u9A8C\u8BC1, \u4F46\u51FA\u73B0\u7B7E\u540D\u8005\u9519\u8BEF\u3002"},
+ {"jarsigner.", "jarsigner: "},
+ {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
+ "\u7B7E\u540D\u6587\u4EF6\u540D\u5FC5\u987B\u5305\u542B\u4EE5\u4E0B\u5B57\u7B26: A-Z, 0-9, _ \u6216 -"},
+@@ -189,6 +192,7 @@
+ "\u6B63\u5728\u4F7F\u7528\u66FF\u4EE3\u7684\u7B7E\u540D\u673A\u5236"},
+ {"entry.was.signed.on", "\u6761\u76EE\u7684\u7B7E\u540D\u65E5\u671F\u4E3A {0}"},
+ {"Warning.", "\u8B66\u544A: "},
++ {"Error.", "\u9519\u8BEF: "},
+ {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
+ "\u6B64 jar \u5305\u542B\u5C1A\u672A\u8FDB\u884C\u5B8C\u6574\u6027\u68C0\u67E5\u7684\u672A\u7B7E\u540D\u6761\u76EE\u3002 "},
+ {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
+@@ -225,6 +229,10 @@
+ "\u7B7E\u540D\u8005\u7684\u8BC1\u4E66\u94FE\u672A\u9A8C\u8BC1\u3002"},
+ {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
+ "\u6B64 jar \u5305\u542B\u8BC1\u4E66\u94FE\u672A\u9A8C\u8BC1\u7684\u6761\u76EE\u3002"},
++ {"no.timestamp.signing",
++ "\u672A\u63D0\u4F9B -tsa \u6216 -tsacert, \u6B64 jar \u6CA1\u6709\u65F6\u95F4\u6233\u3002\u5982\u679C\u6CA1\u6709\u65F6\u95F4\u6233, \u5219\u5728\u7B7E\u540D\u8005\u8BC1\u4E66\u7684\u5230\u671F\u65E5\u671F (%1$tY-%1$tm-%1$td) \u6216\u4EE5\u540E\u7684\u4EFB\u4F55\u64A4\u9500\u65E5\u671F\u4E4B\u540E, \u7528\u6237\u53EF\u80FD\u65E0\u6CD5\u9A8C\u8BC1\u6B64 jar\u3002"},
++ {"no.timestamp.verifying",
++ "\u6B64 jar \u5305\u542B\u7684\u7B7E\u540D\u6CA1\u6709\u65F6\u95F4\u6233\u3002\u5982\u679C\u6CA1\u6709\u65F6\u95F4\u6233, \u5219\u5728\u7B7E\u540D\u8005\u8BC1\u4E66\u7684\u5230\u671F\u65E5\u671F (%1$tY-%1$tm-%1$td) \u6216\u4EE5\u540E\u7684\u4EFB\u4F55\u64A4\u9500\u65E5\u671F\u4E4B\u540E, \u7528\u6237\u53EF\u80FD\u65E0\u6CD5\u9A8C\u8BC1\u6B64 jar\u3002"},
+ };
+
+ /**
+--- ./jdk/src/share/classes/sun/security/util/KeyUtil.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/util/KeyUtil.java Thu Dec 19 09:01:16 2013 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+@@ -200,5 +200,24 @@
+
+ // Don't bother to check against the y^q mod p if safe primes are used.
+ }
++
++ /**
++ * Trim leading (most significant) zeroes from the result.
++ *
++ * @throws NullPointerException if {@code b} is null
++ */
++ public static byte[] trimZeroes(byte[] b) {
++ int i = 0;
++ while ((i < b.length - 1) && (b[i] == 0)) {
++ i++;
++ }
++ if (i == 0) {
++ return b;
++ }
++ byte[] t = new byte[b.length - i];
++ System.arraycopy(b, i, t, 0, t.length);
++ return t;
++ }
++
+ }
+
+--- ./jdk/src/share/classes/sun/security/util/Resources_de.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/util/Resources_de.java Thu Dec 19 09:01:16 2013 -0800
+@@ -444,7 +444,7 @@
+ {"Retain", "Beibehalten"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+- "Warnung: M\u00F6glicherweise enth\u00E4lt der Dateiname Escape-Zeichen mit Backslash. Es ist nicht notwendig, Backslash-Zeichen zu escapen (das Tool f\u00FChrt dies automatisch beim Schreiben des Policy-Contents in den persistenten Speicher aus).\n\nKlicken Sie auf \"Beibehalten\", um den eingegebenen Namen beizubehalten oder auf \"Bearbeiten\", um den Namen zu bearbeiten."},
++ "Warnung: M\u00F6glicherweise enth\u00E4lt der Dateiname Escapezeichen mit Backslash. Es ist nicht notwendig, Backslash-Zeichen zu escapen (das Tool f\u00FChrt dies automatisch beim Schreiben des Policy-Contents in den persistenten Speicher aus).\n\nKlicken Sie auf \"Beibehalten\", um den eingegebenen Namen beizubehalten oder auf \"Bearbeiten\", um den Namen zu bearbeiten."},
+
+ {"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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/util/Resources_fr.java Thu Dec 19 09:01:16 2013 -0800
+@@ -557,12 +557,12 @@
+ {"invalid.null.Class.provided", "classe NULL fournie non valide"},
+ {"Subject.", "Objet :\n"},
+ {".Principal.", "\tPrincipal : "},
+- {".Public.Credential.", "\tInformations d'identification et de connexion publiques : "},
++ {".Public.Credential.", "\tInformations d'identification publiques : "},
+ {".Private.Credentials.inaccessible.",
+- "\tInformations d'identification et de connexion priv\u00E9es inaccessibles\n"},
+- {".Private.Credential.", "\tInformations d'identification et de connexion priv\u00E9es : "},
++ "\tInformations d'identification priv\u00E9es inaccessibles\n"},
++ {".Private.Credential.", "\tInformations d'identification priv\u00E9es : "},
+ {".Private.Credential.inaccessible.",
+- "\tInformations d'identification et de connexion priv\u00E9es inaccessibles\n"},
++ "\tInformations d'identification priv\u00E9es inaccessibles\n"},
+ {"Subject.is.read.only", "Sujet en lecture seule"},
+ {"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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/util/Resources_zh_CN.java Thu Dec 19 09:01:16 2013 -0800
+@@ -310,7 +310,7 @@
+ "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
+ {"Your.keystore.contains.keyStore.size.entries",
+ "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
+- {"Failed.to.parse.input", "\u65E0\u6CD5\u5BF9\u8F93\u5165\u8FDB\u884C\u8BED\u6CD5\u5206\u6790"},
++ {"Failed.to.parse.input", "\u65E0\u6CD5\u89E3\u6790\u8F93\u5165"},
+ {"Empty.input", "\u7A7A\u8F93\u5165"},
+ {"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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/util/Resources_zh_TW.java Thu Dec 19 09:01:16 2013 -0800
+@@ -388,7 +388,7 @@
+ {"Certificate.chain.in.reply.does.not.verify.",
+ "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u672A\u9A57\u8B49: "},
+ {"Top.level.certificate.in.reply.",
+- "\u56DE\u8986\u6642\u7684\u6700\u9AD8\u7D1A\u6191\u8B49:\\n"},
++ "\u56DE\u8986\u6642\u7684\u6700\u9AD8\u7D1A\u6191\u8B49:\n"},
+ {".is.not.trusted.", "... \u662F\u4E0D\u88AB\u4FE1\u4EFB\u7684\u3002"},
+ {"Install.reply.anyway.no.", "\u9084\u662F\u8981\u5B89\u88DD\u56DE\u8986\uFF1F [\u5426]: "},
+ {"NO", "\u5426"},
+--- ./jdk/src/share/classes/sun/security/util/SecurityConstants.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/security/util/SecurityConstants.java Thu Dec 19 09:01:16 2013 -0800
+@@ -257,5 +257,5 @@
+
+ // java.lang.SecurityManager
+ public static final SocketPermission LOCAL_LISTEN_PERMISSION =
+- new SocketPermission("localhost:1024-", SOCKET_LISTEN_ACTION);
++ new SocketPermission("localhost:0", SOCKET_LISTEN_ACTION);
+ }
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -41,7 +41,7 @@
+ out.stored=(0 % gespeichert)
+ out.create=\ erstellt: {0}
+ out.extracted=extrahiert: {0}
+-out.inflated=\ \\vergr\u00F6\u00DFert: {0}
++out.inflated=\ vergr\u00F6\u00DFert: {0}
+ out.size=(ein = {0}) (aus = {1})
+
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -41,7 +41,7 @@
+ out.stored=(almacenado 0%)
+ out.create=\ creado: {0}
+ out.extracted=extra\u00EDdo: {0}
+-out.inflated=\ \\inflado: {0}
++out.inflated=\ inflado: {0}
+ out.size=(entrada = {0}) (salida = {1})
+
+-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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -41,7 +41,7 @@
+ out.stored=(stockage : 0 %)
+ out.create=\ cr\u00E9\u00E9 : {0}
+ out.extracted=extrait : {0}
+-out.inflated=\ \\d\u00E9compress\u00E9 : {0}
++out.inflated=\ d\u00E9compress\u00E9 : {0}
+ out.size=(entr\u00E9e = {0}) (sortie = {1})
+
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -41,7 +41,7 @@
+ out.stored=(memorizzato 0%)
+ out.create=\ creato: {0}
+ out.extracted=estratto: {0}
+-out.inflated=\ \\decompresso: {0}
++out.inflated=\ decompresso: {0}
+ out.size=(in = {0}) (out = {1})
+
+-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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -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
+ out.extracted={0}\u304C\u62BD\u51FA\u3055\u308C\u307E\u3057\u305F
+-out.inflated=\ \\{0}\u304C\u5C55\u958B\u3055\u308C\u307E\u3057\u305F
++out.inflated=\ {0}\u304C\u5C55\u958B\u3055\u308C\u307E\u3057\u305F
+ out.size=(\u5165={0})(\u51FA={1})
+
+-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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -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}
+ out.added.manifest=Manifest\uB97C \uCD94\uAC00\uD568
+-out.update.manifest=Manifest\uB97C \uAC31\uC2E0\uD568
++out.update.manifest=Manifest\uB97C \uC5C5\uB370\uC774\uD2B8\uD568
+ out.ignore.entry={0} \uD56D\uBAA9\uC744 \uBB34\uC2DC\uD558\uB294 \uC911
+ out.adding=\uCD94\uAC00\uD558\uB294 \uC911: {0}
+ out.deflated=({0}%\uB97C \uAC10\uC18C\uD568)
+ out.stored=(0%\uB97C \uC800\uC7A5\uD568)
+ out.create=\ \uC0DD\uC131\uB428: {0}
+ out.extracted=\uCD94\uCD9C\uB428: {0}
+-out.inflated=\ \\\uC99D\uAC00\uB428: {0}
++out.inflated=\ \uC99D\uAC00\uB428: {0}
+ out.size=(\uC785\uB825 = {0}) (\uCD9C\uB825 = {1})
+
+-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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -37,11 +37,11 @@
+ out.update.manifest=manifesto atualizado
+ out.ignore.entry=ignorando entrada {0}
+ out.adding=adicionando: {0}
+-out.deflated=(vazio {0}%)
++out.deflated=(compactado {0}%)
+ out.stored=(armazenado 0%)
+ out.create=\ criado: {0}
+ out.extracted=extra\u00EDdo: {0}
+-out.inflated=\ \\cheio: {0}
+-out.size=(dentro = {0}) (fora= {1})
++out.inflated=\ inflado: {0}
++out.size=(entrada = {0}) (sa\u00EDda= {1})
+
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -44,4 +44,4 @@
+ out.inflated=\ uppackat: {0}
+ out.size=(in = {0}) (ut = {1})
+
+-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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -44,4 +44,4 @@
+ out.inflated=\ \u5DF2\u89E3\u538B: {0}
+ out.size=(\u8F93\u5165 = {0}) (\u8F93\u51FA = {1})
+
+-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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties Thu Dec 19 09:01:16 2013 -0800
+@@ -41,7 +41,7 @@
+ out.stored=(\u5132\u5B58 0%)
+ out.create=\ \u5EFA\u7ACB: {0}
+ out.extracted=\u64F7\u53D6: {0}
+-out.inflated=\ \\\u64F4\u5C55: {0}
++out.inflated=\ \u64F4\u5C55: {0}
+ out.size=\ (\u8B80={0})(\u5BEB={1})
+
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Thu Dec 19 09:01:16 2013 -0800
+@@ -79,7 +79,7 @@
+ "Chamorro Daylight Time", "ChDT"};
+ String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+ "Chuuk Summer Time", "CHUST"};
+- String CIT[] = new String[] {"Central Indonesia Time", "CIT",
++ String CIT[] = new String[] {"Central Indonesia Time", "WITA",
+ "Central Indonesia Summer Time", "CIST"};
+ String CLT[] = new String[] {"Chile Time", "CLT",
+ "Chile Summer Time", "CLST"};
+@@ -193,7 +193,7 @@
+ "Western African Summer Time", "WAST"};
+ String WET[] = new String[] {"Western European Time", "WET",
+ "Western European Summer Time", "WEST"};
+- String WIT[] = new String[] {"West Indonesia Time", "WIT",
++ String WIT[] = new String[] {"West Indonesia Time", "WIB",
+ "West Indonesia Summer Time", "WIST"};
+ String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST",
+ "Western Summer Time (Australia)", "WST"};
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -426,7 +426,7 @@
+ "Suriname Summer Time", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"East Indonesia Time", "EIT",
++ {"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT",
+ "East Indonesia Summer Time", "EIST"}},
+ {"Asia/Kabul", new String[] {"Afghanistan Time", "AFT",
+ "Afghanistan Summer Time", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
++ "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT",
+ "Krasnoyarsk Summer Time", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
++ "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"Middle Europe Time", "MET",
+ "Middle Europe Summer Time", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Thu Dec 19 09:01:16 2013 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre Normalzeit", "ACT",
+ "Acre Sommerzeit", "ACST"};
+- String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien)", "CST",
+- "Zentrale Sommerzeit (S\u00fcdaustralien)", "CST"};
++ String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST",
++ "Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"};
+ String AGT[] = new String[] {"Argentinische Zeit", "ART",
+ "Argentinische Sommerzeit", "ARST"};
+ String AKST[] = new String[] {"Alaska Normalzeit", "AKST",
+@@ -61,10 +61,10 @@
+ "Atlantik Sommerzeit", "ADT"};
+ String BDT[] = new String[] {"Bangladesch Zeit", "BDT",
+ "Bangladesch Sommerzeit", "BDST"};
+- String BRISBANE[] = new String[] {"\u00d6stliche Normalzeit (Queensland)", "EST",
+- "\u00d6stliche Sommerzeit (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien/New South Wales)", "CST",
+- "Zentrale Sommerzeit (S\u00fcdaustralien/New South Wales)", "CST"};
++ String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "EST",
++ "\u00D6stliche Sommerzeit (Queensland)", "EST"};
++ String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "CST",
++ "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "CST"};
+ String BRT[] = new String[] {"Brasilianische Zeit", "BRT",
+ "Brasilianische Sommerzeit", "BRST"};
+ String BTT[] = new String[] {"Bhutanische Zeit", "BTT",
+@@ -77,9 +77,9 @@
+ "Chatham Sommerzeit", "CHADT"};
+ String ChST[] = new String[] {"Chamorro Normalzeit", "ChST",
+ "Chamorro Sommerzeit", "ChDT"};
+- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+- "Chuuk Summer Time", "CHUST"};
+- String CIT[] = new String[] {"Zentralindonesische Zeit", "CIT",
++ String CHUT[] = new String[] {"Chuuk Zeit", "CHUT",
++ "Chuuk Sommerzeit", "CHUST"};
++ String CIT[] = new String[] {"Zentralindonesische Zeit", "WITA",
+ "Zentralindonesische Sommerzeit", "CIST"};
+ String CLT[] = new String[] {"Chilenische Zeit", "CLT",
+ "Chilenische Sommerzeit", "CLST"};
+@@ -89,7 +89,7 @@
+ "Chinesische Sommerzeit", "CDT"};
+ String CUBA[] = new String[] {"Kubanische Normalzeit", "CST",
+ "Kubanische Sommerzeit", "CDT"};
+- String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST",
++ String DARWIN[] = new String[] {"Central Normalzeit (Northern Territory)", "CST",
+ "Zentrale Sommerzeit (Northern Territory)", "CST"};
+ String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT",
+ "Irische Sommerzeit", "IST"};
+@@ -103,10 +103,10 @@
+ "Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST"};
+ String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST",
+ "\u00d6stliche Sommerzeit", "EDT"};
+- String EST_NSW[] = new String[] {"\u00d6stliche Normalzeit (New South Wales)", "EST",
+- "\u00d6stliche Sommerzeit (New South Wales)", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ String EST_NSW[] = new String[] {"Eastern Normalzeit (Neus\u00FCdwales)", "EST",
++ "\u00D6stliche Sommerzeit (New South Wales)", "EST"};
++ String FET[] = new String[] {"Kaliningrader Zeit", "FET",
++ "Kaliningrader Sommerzeit", "FEST"};
+ String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT",
+ "Ghanaische Sommerzeit", "GHST"};
+ String GAMBIER[] = new String[] {"Gambier Zeit", "GAMT",
+@@ -159,8 +159,8 @@
+ "Pitcairn Sommerzeit", "PDT"};
+ String PKT[] = new String[] {"Pakistanische Zeit", "PKT",
+ "Pakistanische Sommerzeit", "PKST"};
+- String PONT[] = new String[] {"Pohnpei Time", "PONT",
+- "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"Pohnpei Zeit", "PONT",
++ "Pohnpei Sommerzeit", "PONST"};
+ String PST[] = new String[] {"Pazifische Normalzeit", "PST",
+ "Pazifische Sommerzeit", "PDT"};
+ String SAMOA[] = new String[] {"Samoa Normalzeit", "SST",
+@@ -173,8 +173,8 @@
+ "Singapur Sommerzeit", "SGST"};
+ String SLST[] = new String[] {"Greenwich Normalzeit", "GMT",
+ "Sierra Leone Sommerzeit", "SLST"};
+- String TASMANIA[] = new String[] {"\u00d6stliche Normalzeit (Tasmanien)", "EST",
+- "\u00d6stliche Sommerzeit (Tasmanien)", "EST"};
++ String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "EST",
++ "\u00D6stliche Sommerzeit (Tasmanien)", "EST"};
+ String TMT[] = new String[] {"Turkmenische Zeit", "TMT",
+ "Turkmenische Sommerzeit", "TMST"};
+ String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT",
+@@ -183,8 +183,8 @@
+ "Koordinierte Universalzeit", "UTC"};
+ String UZT[] = new String[] {"Usbekistan Zeit", "UZT",
+ "Usbekistan Sommerzeit", "UZST"};
+- String VICTORIA[] = new String[] {"\u00d6stliche Normalzeit (Victoria)", "EST",
+- "\u00d6stliche Sommerzeit (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "EST",
++ "\u00D6stliche Sommerzeit (Victoria)", "EST"};
+ String VLAT[] = new String[] {"Wladiwostok Zeit", "VLAT",
+ "Wladiwostok Sommerzeit", "VLAST"};
+ String WART[] = new String[] {"Westargentinische Zeit", "WART",
+@@ -193,7 +193,7 @@
+ "Westafrikanische Sommerzeit", "WAST"};
+ String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ",
+ "Westeurop\u00e4ische Sommerzeit", "WESZ"};
+- String WIT[] = new String[] {"Westindonesische Zeit", "WIT",
++ String WIT[] = new String[] {"Westindonesische Zeit", "WIB",
+ "Westindonesische Sommerzeit", "WIST"};
+ String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST",
+ "Westliche Sommerzeit (Australien)", "WST"};
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -401,8 +401,8 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", new String[] {"Metlakatla Normalzeit", "MeST",
++ "Metlakatla Sommerzeit", "MeDT"}},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST",
+ "Pierre & Miquelon Sommerzeit", "PMDT"}},
+@@ -426,7 +426,7 @@
+ "Suriname Sommerzeit", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"America/Rosario", AGT},
+ {"America/Santa_Isabel", PST},
+ {"America/Santarem", BRT},
+@@ -466,8 +466,8 @@
+ "Davis Sommerzeit", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Zeit", "DDUT",
+ "Dumont-d'Urville Sommerzeit", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"Macquarieinsel Zeit", "MIST",
++ "Macquarieinsel Sommerzeit", "MIST"}},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "EIT",
++ {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "WIT",
+ "Ostindonesische Sommerzeit", "EIST"}},
+ {"Asia/Kabul", new String[] {"Afghanistanische Zeit", "AFT",
+ "Afghanistanische Sommerzeit", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT",
++ "Chandyga Sommerzeit", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT",
+ "Krasnojarsker Sommerzeit", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT",
++ "Ust-Nera Sommerzeit", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"Zentraleurop\u00e4ische Zeit", "MET",
+ "Zentraleurop\u00e4ische Sommerzeit", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Thu Dec 19 09:01:16 2013 -0800
+@@ -45,7 +45,7 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Hora de Acre", "ACT",
+ "Hora de verano de Acre", "ACST"};
+- String ADELAIDE[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia)", "CST",
++ String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST",
+ "Hora de verano Central (Sur de Australia)", "CST"};
+ String AGT[] = new String[] {"Hora de Argentina", "ART",
+ "Hora de verano de Argentina", "ARST"};
+@@ -61,9 +61,9 @@
+ "Hora de verano Atl\u00e1ntico", "ADT"};
+ String BDT[] = new String[] {"Hora de Bangladesh", "BDT",
+ "Hora de verano de Bangladesh", "BDST"};
+- String BRISBANE[] = new String[] {"Hora est\u00e1ndar del Este (Queensland)", "EST",
+- "Hora de verano del Este (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
++ String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "EST",
++ "Hora est\u00E1ndar de verano del Este (Queensland)", "EST"};
++ String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
+ "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST"};
+ String BRT[] = new String[] {"Hora de Brasil", "BRT",
+ "Hora de verano de Brasil", "BRST"};
+@@ -79,7 +79,7 @@
+ "Hora de verano de Chamorro", "ChDT"};
+ String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+ "Chuuk Summer Time", "CHUST"};
+- String CIT[] = new String[] {"Hora de Indonesia Central", "CIT",
++ String CIT[] = new String[] {"Hora de Indonesia Central", "WITA",
+ "Hora de verano de Indonesia Central", "CIST"};
+ String CLT[] = new String[] {"Hora de Chile", "CLT",
+ "Hora de verano de Chile", "CLST"};
+@@ -89,7 +89,7 @@
+ "Hora de verano de China", "CDT"};
+ String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST",
+ "Hora de verano de Cuba", "CDT"};
+- String DARWIN[] = new String[] {"Hora est\u00e1ndar Central (territorio del Norte)", "CST",
++ String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "CST",
+ "Hora de verano Central (territorio del Norte)", "CST"};
+ String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
+ "Hora de verano de Irlanda", "IST"};
+@@ -103,10 +103,10 @@
+ "Hora de verano de Groenlandia Oriental", "EGST"};
+ String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST",
+ "Hora de verano Oriental", "EDT"};
+- String EST_NSW[] = new String[] {"Hora est\u00e1ndar Oriental (Nueva Gales del Sur)", "EST",
++ String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "EST",
+ "Hora de verano Oriental (Nueva Gales del Sur)", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET",
++ "Hora de verano de Europa m\u00E1s Oriental", "FEST"};
+ String GHMT[] = new String[] {"Hora central de Ghana", "GMT",
+ "Hora de verano de Ghana", "GHST"};
+ String GAMBIER[] = new String[] {"Hora de Gambier", "GAMT",
+@@ -173,7 +173,7 @@
+ "Hora de verano de Singapur", "SGST"};
+ String SLST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
+ "Hora de verano de Sierra Leona", "SLST"};
+- String TASMANIA[] = new String[] {"Hora est\u00e1ndar del Este (Tasmania)", "EST",
++ String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "EST",
+ "Hora de verano del Este (Tasmania)", "EST"};
+ String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT",
+ "Hora de verano de Turkmenist\u00e1n", "TMST"};
+@@ -183,7 +183,7 @@
+ "Hora Universal Coordinada", "UTC"};
+ String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT",
+ "Hora de verano de Uzbekist\u00e1n", "UZST"};
+- String VICTORIA[] = new String[] {"Hora est\u00e1ndar del Este (Victoria)", "EST",
++ String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "EST",
+ "Hora de verano del Este (Victoria)", "EST"};
+ String VLAT[] = new String[] {"Hora de Vladivostok", "VLAT",
+ "Hora de verano de Vladivostok", "VLAST"};
+@@ -193,9 +193,9 @@
+ "Hora de verano de \u00c1frica Occidental", "WAST"};
+ String WET[] = new String[] {"Hora de Europa Occidental", "WET",
+ "Hora de verano de Europa Occidental", "WEST"};
+- String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIT",
++ String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIB",
+ "Indonesia Hora de verano de Indonesia Occidental", "WIST"};
+- String WST_AUS[] = new String[] {"Hora est\u00e1ndar Occidental (Australia)", "WST",
++ String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "WST",
+ "Hora de verano Occidental (Australia)", "WST"};
+ String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST",
+ "Hora de verano de Samoa Occidental", "WSDT"};
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -426,7 +426,7 @@
+ "Hora de verano de Surinam", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "EIT",
++ {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "WIT",
+ "Hora de verano de Indonesia Oriental", "EIST"}},
+ {"Asia/Kabul", new String[] {"Hora de Afganist\u00e1n", "AFT",
+ "Hora de verano de Afganist\u00e1n", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT",
++ "Hora de verano de Khandyga", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT",
+ "Hora de verano de Krasnoyarsk", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT",
++ "Hora de verano de Ust-Nera", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -616,8 +618,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Hora est\u00e1ndar de Australia Central y Occidental", "CWST",
+- "Hora de verano de Australia Central y Occidental", "CWST"}},
++ {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "CWST",
++ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"Hora de Europa Central", "MET",
+ "Hora de verano de Europa Central", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Thu Dec 19 09:01:16 2013 -0800
+@@ -46,7 +46,7 @@
+ String ACT[] = new String[] {"Heure de l'Acre", "ACT",
+ "Heure d'\u00e9t\u00e9 de l'Acre", "ACST"};
+ String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST",
+- "Heure d'\u00e9t\u00e9 d'Australie centrale (Australie du sud)", "CST"};
++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST"};
+ String AGT[] = new String[] {"Heure D'Argentine", "ART",
+ "Heure d'\u00e9t\u00e9 D'Argentine", "ARST"};
+ String AKST[] = new String[] {"Heure normale d'Alaska", "AKST",
+@@ -62,9 +62,9 @@
+ String BDT[] = new String[] {"Heure du Bangladesh", "BDT",
+ "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"};
+ String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "EST",
+- "Heure d'\u00e9t\u00e9 d'Australie orientale (Queensland)", "EST"};
++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "EST"};
+ String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST",
+- "Heure d'\u00e9t\u00e9 d'Australie centrale(Australie du sud/Nouvelle-Galles du sud)", "CST"};
++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST"};
+ String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT",
+ "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST"};
+ String BTT[] = new String[] {"Heure du Bhoutan", "BTT",
+@@ -77,9 +77,9 @@
+ "Heure avanc\u00e9e de Chatham", "CHADT"};
+ String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST",
+ "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"};
+- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+- "Chuuk Summer Time", "CHUST"};
+- String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "CIT",
++ String CHUT[] = new String[] {"Heure de Chuuk", "CHUT",
++ "Heure d'\u00E9t\u00E9 de Chuuk", "CHUST"};
++ String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "WITA",
+ "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie centrale", "CIST"};
+ String CLT[] = new String[] {"Heure du Chili", "CLT",
+ "Heure d'\u00e9t\u00e9 du Chili", "CLST"};
+@@ -90,7 +90,7 @@
+ String CUBA[] = new String[] {"Heure standard de Cuba", "CST",
+ "Heure d'\u00e9t\u00e9 de Cuba", "CDT"};
+ String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST",
+- "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"};
++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "CST"};
+ String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
+ "Heure d'\u00e9t\u00e9 irlandaise", "IST"};
+ String EAT[] = new String[] {"Heure d'Afrique de l'Est", "EAT",
+@@ -104,9 +104,9 @@
+ String EST[] = new String[] {"Heure normale de l'Est", "EST",
+ "Heure avanc\u00e9e de l'Est", "EDT"};
+ String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST",
+- "Heure d'\u00e9t\u00e9 de l'Est (Nouvelle-Galles du Sud)", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "EST"};
++ String FET[] = new String[] {"Heure d'Europe de l'Est UTC+3", "FET",
++ "Heure d'\u00E9t\u00E9 d'Europe de l'Est UTC+3", "FEST"};
+ String GHMT[] = new String[] {"Heure du Ghana", "GMT",
+ "Heure d'\u00e9t\u00e9 du Ghana", "GHST"};
+ String GAMBIER[] = new String[] {"Heure de Gambi", "GAMT",
+@@ -159,8 +159,8 @@
+ "heure avanc\u00e9e des Pitcairn", "PDT"};
+ String PKT[] = new String[] {"Heure du Pakistan", "PKT",
+ "Heure d'\u00e9t\u00e9 du Pakistan", "PKST"};
+- String PONT[] = new String[] {"Pohnpei Time", "PONT",
+- "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"Heure de Pohnpei", "PONT",
++ "Heure d'\u00E9t\u00E9 de Pohnpei", "PONST"};
+ String PST[] = new String[] {"Heure normale du Pacifique", "PST",
+ "Heure avanc\u00e9e du Pacifique", "PDT"};
+ String SAMOA[] = new String[] {"Heure standard de Samoa", "SST",
+@@ -174,7 +174,7 @@
+ String SLST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
+ "Heure d'\u00e9t\u00e9 de Sierra Leone", "SLST"};
+ String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "EST",
+- "Heure d'\u00e9t\u00e9 d'Australie orientale (Tasmanie)", "EST"};
++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "EST"};
+ String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT",
+ "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"};
+ String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT",
+@@ -184,7 +184,7 @@
+ String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT",
+ "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"};
+ String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST",
+- "Heure d'\u00e9t\u00e9 d'Australie orientale (Victoria)", "EST"};
++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "EST"};
+ String VLAT[] = new String[] {"Heure de Vladivostok", "VLAT",
+ "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"};
+ String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART",
+@@ -193,10 +193,10 @@
+ "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"};
+ String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET",
+ "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"};
+- String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIT",
++ String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB",
+ "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"};
+ String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST",
+- "Heure d'\u00e9t\u00e9 de l'Ouest (Australie)", "WST"};
++ "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "WST"};
+ String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST",
+ "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"};
+ String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT",
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -401,8 +401,8 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", new String[] {"Heure normale de Metlakatla", "MeST",
++ "Heure avanc\u00E9e de Metlakatla", "MeDT"}},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST",
+ "Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT"}},
+@@ -426,7 +426,7 @@
+ "Heure d'\u00e9t\u00e9 du Surinam", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"America/Rosario", AGT},
+ {"America/Santa_Isabel", PST},
+ {"America/Santarem", BRT},
+@@ -466,8 +466,8 @@
+ "Heure d'\u00e9t\u00e9 de Davis", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Heure de Dumont-d'Urville", "DDUT",
+ "Heure d'\u00e9t\u00e9 de Dumont-d'Urville", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"Heure de l'Ile Macquarie", "MIST",
++ "Heure d'\u00E9t\u00E9 de l'Ile Macquarie", "MIST"}},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "EIT",
++ {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "WIT",
+ "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie orientale", "EIST"}},
+ {"Asia/Kabul", new String[] {"Heure d'Afghanistan", "AFT",
+ "Heure d'\u00e9t\u00e9 d'Afghanistan", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT",
++ "Heure d'\u00E9t\u00E9 de Khandyga", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT",
+ "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT",
++ "Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -617,7 +619,7 @@
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+ {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST",
+- "Heure d'\u00e9t\u00e9 de l'Australie occidentale (centre)", "CWST"}},
++ "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "CWST"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"Heure de l'Europe centrale", "MET",
+ "Heure d'\u00e9t\u00e9 de l'Europe centrale", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Thu Dec 19 09:01:16 2013 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Ora di Acre", "ACT",
+ "Ora estiva di Acre", "ACST"};
+- String ADELAIDE[] = new String[] {"Ora centrale standard (Australia del Sud)", "CST",
+- "Ora estiva standard (Australia del Sud)", "CST"};
++ String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "CST",
++ "Ora estiva centrale (Australia del Sud)", "CST"};
+ String AGT[] = new String[] {"Ora dell'Argentina", "ART",
+ "Ora estiva dell'Argentina", "ARST"};
+ String AKST[] = new String[] {"Ora solare dell'Alaska", "AKST",
+@@ -61,9 +61,9 @@
+ "Ora legale dell'Atlantico occidentale", "ADT"};
+ String BDT[] = new String[] {"Ora del Bangladesh", "BDT",
+ "Ora estiva del Bangladesh", "BDST"};
+- String BRISBANE[] = new String[] {"Ora orientale standard (Queensland)", "EST",
++ String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "EST",
+ "Ora estiva orientale (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Ora centrale standard (Australia del Sud/Nuovo Galles del Sud)", "CST",
++ String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "CST",
+ "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "CST"};
+ String BRT[] = new String[] {"Ora del Brasile", "BRT",
+ "Ora estiva del Brasile", "BRST"};
+@@ -75,11 +75,11 @@
+ "Ora estiva dell'Europa centrale", "CEST"};
+ String CHAST[] = new String[] {"Ora di Chatham standard", "CHAST",
+ "Ora legale di Chatham", "CHADT"};
+- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+- "Chuuk Summer Time", "CHUST"};
++ String CHUT[] = new String[] {"Ora di Chuuk", "CHUT",
++ "Ora estiva di Chuuk", "CHUST"};
+ String ChST[] = new String[] {"Ora standard di Chamorro", "ChST",
+ "Ora legale di Chamorro", "ChDT"};
+- String CIT[] = new String[] {"Ora dell'Indonesia centrale", "CIT",
++ String CIT[] = new String[] {"Ora dell'Indonesia centrale", "WITA",
+ "Ora estiva dell'Indonesia centrale", "CIST"};
+ String CLT[] = new String[] {"Ora del Cile", "CLT",
+ "Ora estiva del Cile", "CLST"};
+@@ -89,7 +89,7 @@
+ "Ora legale della Cina", "CDT"};
+ String CUBA[] = new String[] {"Ora solare Cuba", "CST",
+ "Ora legale Cuba", "CDT"};
+- String DARWIN[] = new String[] {"Ora centrale standard (Territori del Nord)", "CST",
++ String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "CST",
+ "Ora estiva centrale (Territori del Nord)", "CST"};
+ String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT",
+ "Ora estiva irlandese", "IST"};
+@@ -103,10 +103,10 @@
+ "Ora estiva della Groenlandia orientale", "EGST"};
+ String EST[] = new String[] {"Ora solare USA orientale", "EST",
+ "Ora legale USA orientale", "EDT"};
+- String EST_NSW[] = new String[] {"Ora solare dell'Australia orientale (Nuovo Galles del Sud)", "EST",
++ String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "EST",
+ "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET",
++ "Ora estiva dei paesi europei pi\u00F9 orientali", "FEST"};
+ String GHMT[] = new String[] {"Ora media del Ghana", "GMT",
+ "Ora legale del Ghana", "GHST"};
+ String GAMBIER[] = new String[] {"Ora di Gambier", "GAMT",
+@@ -159,8 +159,8 @@
+ "Ora legale di Pitcairn", "PDT"};
+ String PKT[] = new String[] {"Ora del Pakistan", "PKT",
+ "Ora estiva del Pakistan", "PKST"};
+- String PONT[] = new String[] {"Pohnpei Time", "PONT",
+- "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"Ora di Pohnpei", "PONT",
++ "Ora estiva di Pohnpei", "PONST"};
+ String PST[] = new String[] {"Ora solare della costa occidentale USA", "PST",
+ "Ora legale della costa occidentale USA", "PDT"};
+ String SAMOA[] = new String[] {"Ora standard di Samoa", "SST",
+@@ -173,7 +173,7 @@
+ "Ora estiva di Singapore", "SGST"};
+ String SLST[] = new String[] {"Ora media di Greenwich", "GMT",
+ "Ora legale della Sierra Leone", "SLST"};
+- String TASMANIA[] = new String[] {"Ora orientale standard (Tasmania)", "EST",
++ String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "EST",
+ "Ora estiva orientale (Tasmania)", "EST"};
+ String TMT[] = new String[] {"Ora del Turkmenistan", "TMT",
+ "Ora estiva del Turkmenistan", "TMST"};
+@@ -183,7 +183,7 @@
+ "Tempo universale coordinato", "UTC"};
+ String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT",
+ "Ora estiva dell'Uzbekistan", "UZST"};
+- String VICTORIA[] = new String[] {"Ora orientale standard (Victoria)", "EST",
++ String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "EST",
+ "Ora estiva orientale (Victoria)", "EST"};
+ String VLAT[] = new String[] {"Ora di Vladivostok", "VLAT",
+ "Ora estiva di Vladivostok", "VLAST"};
+@@ -193,9 +193,9 @@
+ "Ora estiva dell'Africa occidentale", "WAST"};
+ String WET[] = new String[] {"Ora dell'Europa occidentale", "WET",
+ "Ora estiva dell'Europa occidentale", "WEST"};
+- String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIT",
++ String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIB",
+ "Ora estiva dell'Indonesia occidentale", "WIST"};
+- String WST_AUS[] = new String[] {"Ora solare dell'Australia occidentale", "WST",
++ String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "WST",
+ "Ora estiva dell'Australia occidentale", "WST"};
+ String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST",
+ "Ora estiva di Samoa", "WSDT"};
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -401,8 +401,8 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", new String[] {"Ora standard di Metlakatla", "MeST",
++ "Ora legale di Metlakatla", "MeDT"}},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST",
+ "Ora legale di Saint-Pierre e Miquelon", "PMDT"}},
+@@ -426,7 +426,7 @@
+ "Ora estiva di Suriname", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"America/Rosario", AGT},
+ {"America/Santa_Isabel", PST},
+ {"America/Santarem", BRT},
+@@ -466,8 +466,8 @@
+ "Ora estiva di Davis", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Ora di Dumont-d'Urville", "DDUT",
+ "Ora estiva di Dumont-d'Urville", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"Ora dell'Isola Macquarie", "MIST",
++ "Ora estiva dell'Isola Macquarie", "MIST"}},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "EIT",
++ {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "WIT",
+ "Ora estiva dell'Indonesia orientale", "EIST"}},
+ {"Asia/Kabul", new String[] {"Ora dell'Afghanistan", "AFT",
+ "Ora estiva dell'Afghanistan", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT",
++ "Ora estiva di Khandyga", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT",
+ "Ora estiva di Krasnojarsk", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT",
++ "Ora estiva di Ust-Nera", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -616,8 +618,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Ora solare Australia centrorientale", "CWST",
+- "Ora estiva Australia centrorientale", "CWST"}},
++ {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "CWST",
++ "Ora estiva Australia centro-occidentale", "CWST"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"Ora dell'Europa centrale", "MET",
+ "Ora estiva dell'Europa centrale", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Thu Dec 19 09:01:16 2013 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT",
+ "\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST"};
+- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST",
+- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST"};
++ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST",
++ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST"};
+ String AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART",
+ "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "ARST"};
+ String AKST[] = new String[] {"\u30a2\u30e9\u30b9\u30ab\u6a19\u6e96\u6642", "AKST",
+@@ -61,10 +61,10 @@
+ "\u5927\u897f\u6d0b\u590f\u6642\u9593", "ADT"};
+ String BDT[] = new String[] {"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u6642\u9593", "BDT",
+ "\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u590f\u6642\u9593", "BDST"};
+- String BRISBANE[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30af\u30a4\u30fc\u30f3\u30ba\u30e9\u30f3\u30c9)", "EST",
+- "\u6771\u90e8\u590f\u6642\u9593 (\u30af\u30a4\u30fc\u30f3\u30ba\u30e9\u30f3\u30c9)", "EST"};
+- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST",
+- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST"};
++ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST"};
++ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST",
++ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST"};
+ String BRT[] = new String[] {"\u30d6\u30e9\u30b8\u30eb\u6642\u9593", "BRT",
+ "\u30d6\u30e9\u30b8\u30eb\u590f\u6642\u9593", "BRST"};
+ String BTT[] = new String[] {"\u30d6\u30fc\u30bf\u30f3\u6642\u9593", "BTT",
+@@ -77,9 +77,9 @@
+ "\u30c1\u30e3\u30bf\u30e0\u590f\u6642\u9593", "CHADT"};
+ String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST",
+ "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"};
+- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+- "Chuuk Summer Time", "CHUST"};
+- String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "CIT",
++ String CHUT[] = new String[] {"\u30C1\u30E5\u30FC\u30AF\u6642\u9593", "CHUT",
++ "Chuuk Time", "CHUST"};
++ String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WITA",
+ "\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "CIST"};
+ String CLT[] = new String[] {"\u30c1\u30ea\u6642\u9593", "CLT",
+ "\u30c1\u30ea\u590f\u6642\u9593", "CLST"};
+@@ -89,8 +89,8 @@
+ "\u4e2d\u56fd\u590f\u6642\u9593", "CDT"};
+ String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST",
+ "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT"};
+- String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST",
+- "\u4e2d\u90e8\u590f\u6642\u9593 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST"};
++ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST",
++ "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST"};
+ String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
+ "\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u590f\u6642\u9593", "IST"};
+ String EAT[] = new String[] {"\u6771\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "EAT",
+@@ -103,10 +103,10 @@
+ "\u6771\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "EGST"};
+ String EST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST",
+ "\u6771\u90e8\u590f\u6642\u9593", "EDT"};
+- String EST_NSW[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST",
+- "\u6771\u90e8\u590f\u6642\u9593 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST"};
++ String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET",
++ "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST"};
+ String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT",
+ "\u30ac\u30fc\u30ca\u590f\u6642\u9593", "GHST"};
+ String GAMBIER[] = new String[] {"\u30ac\u30f3\u30d3\u30a2\u6642\u9593", "GAMT",
+@@ -159,8 +159,8 @@
+ "\u30d4\u30c8\u30b1\u30eb\u30f3\u5cf6\u590f\u6642\u9593", "PDT"};
+ String PKT[] = new String[] {"\u30d1\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "PKT",
+ "\u30d1\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "PKST"};
+- String PONT[] = new String[] {"Pohnpei Time", "PONT",
+- "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"\u30DD\u30F3\u30DA\u30A4\u6642\u9593", "PONT",
++ "\u30DD\u30F3\u30DA\u30A4\u590F\u6642\u9593", "PONST"};
+ String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "PST",
+ "\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT"};
+ String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST",
+@@ -173,8 +173,8 @@
+ "\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u590f\u6642\u9593", "SGST"};
+ String SLST[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
+ "\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd\u590f\u6642\u9593", "SLST"};
+- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST",
+- "\u6771\u90e8\u590f\u6642\u9593 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST"};
++ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST"};
+ String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT",
+ "\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST"};
+ String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT",
+@@ -183,8 +183,8 @@
+ "\u5354\u5b9a\u4e16\u754c\u6642", "UTC"};
+ String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT",
+ "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST"};
+- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST",
+- "\u6771\u90e8\u590f\u6642\u9593 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST"};
++ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST"};
+ String VLAT[] = new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT",
+ "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"};
+ String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART",
+@@ -193,10 +193,10 @@
+ "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"};
+ String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET",
+ "\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "WEST"};
+- String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT",
++ String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIB",
+ "\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST"};
+- String WST_AUS[] = new String[] {"\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST",
+- "\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST"};
++ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST",
++ "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST"};
+ String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST",
+ "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"};
+ String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT",
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -401,8 +401,8 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", new String[] {"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u6A19\u6E96\u6642\u9593", "MeST",
++ "\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u590F\u6642\u9593", "MeDT"}},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST",
+ "\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT"}},
+@@ -426,7 +426,7 @@
+ "\u30b9\u30ea\u30ca\u30e0\u590f\u6642\u9593", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"America/Rosario", AGT},
+ {"America/Santa_Isabel", PST},
+ {"America/Santarem", BRT},
+@@ -466,8 +466,8 @@
+ "\u30c7\u30a4\u30d3\u30b9\u590f\u6642\u9593", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u6642\u9593", "DDUT",
+ "\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u590f\u6642\u9593", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u6642\u9593", "MIST",
++ "\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u590F\u6642\u9593", "MIST"}},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "EIT",
++ {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT",
+ "\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "EIST" }},
+ {"Asia/Kabul", new String[] {"\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "AFT",
+ "\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT",
++ "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
+ "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT",
++ "\u30A6\u30B9\u30C1\u30CD\u30E9\u590F\u6642\u9593", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -616,8 +618,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST",
+- "\u4e2d\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST",
++ "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "MET",
+ "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Thu Dec 19 09:01:16 2013 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT",
+ "\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST"};
+- String ADELAIDE[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST",
+- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST"};
++ String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST",
++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST"};
+ String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART",
+ "\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ARST"};
+ String AKST[] = new String[] {"\uc54c\ub798\uc2a4\uce74 \ud45c\uc900\uc2dc", "AKST",
+@@ -61,10 +61,10 @@
+ "\ub300\uc11c\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ADT"};
+ String BDT[] = new String[] {"\ubc29\uae00\ub77c\ub370\uc2dc \uc2dc\uac04", "BDT",
+ "\ubc29\uae00\ub77c\ub370\uc2dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BDST"};
+- String BRISBANE[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ud038\uc990\ub79c\ub4dc)", "EST",
+- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud038\uc990\ub79c\ub4dc)", "EST"};
+- String BROKEN_HILL[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST",
+- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST"};
++ String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "EST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "EST"};
++ String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST",
++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST"};
+ String BRT[] = new String[] {"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc2dc\uac04", "BRT",
+ "\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BRST"};
+ String BTT[] = new String[] {"\ubd80\ud0c4 \uc2dc\uac04", "BTT",
+@@ -77,9 +77,9 @@
+ "Chatham \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHADT"};
+ String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST",
+ "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"};
+- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+- "Chuuk Summer Time", "CHUST"};
+- String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "CIT",
++ String CHUT[] = new String[] {"\uCD94\uD06C \uD45C\uC900\uC2DC", "CHUT",
++ "\uCD94\uD06C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "CHUST"};
++ String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WITA",
+ "\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CIST"};
+ String CLT[] = new String[] {"\uce60\ub808 \uc2dc\uac04", "CLT",
+ "\uce60\ub808 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CLST"};
+@@ -89,8 +89,8 @@
+ "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
+ String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST",
+ "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
+- String DARWIN[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\ub178\ub358 \uc9c0\uc5ed)", "CST",
+- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub178\ub358 \uc9c0\uc5ed)", "CST"};
++ String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "CST",
++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "CST"};
+ String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
+ "\uc544\uc77c\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IST"};
+ String EAT[] = new String[] {"\ub3d9\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "EAT",
+@@ -103,10 +103,10 @@
+ "\ub3d9\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EGST"};
+ String EST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST",
+ "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT"};
+- String EST_NSW[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST",
+- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST"};
++ String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET",
++ "\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST"};
+ String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT",
+ "\uac00\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GHST"};
+ String GAMBIER[] = new String[] {"\uac10\ube44\uc544 \uc2dc\uac04", "GAMT",
+@@ -159,8 +159,8 @@
+ "Pitcairn \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"};
+ String PKT[] = new String[] {"\ud30c\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "PKT",
+ "\ud30c\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PKST"};
+- String PONT[] = new String[] {"Pohnpei Time", "PONT",
+- "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"\uD3F0\uD398\uC774 \uD45C\uC900\uC2DC", "PONT",
++ "\uD3F0\uD398\uC774 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "PONST"};
+ String PST[] = new String[] {"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc", "PST",
+ "\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"};
+ String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST",
+@@ -173,8 +173,8 @@
+ "\uc2f1\uac00\ud3ec\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SGST"};
+ String SLST[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
+ "\uc2dc\uc5d0\ub77c\ub9ac\uc628 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SLST"};
+- String TASMANIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST",
+- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST"};
++ String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST"};
+ String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT",
+ "\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST"};
+ String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT",
+@@ -183,8 +183,8 @@
+ "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC"};
+ String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT",
+ "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST"};
+- String VICTORIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ube45\ud1a0\ub9ac\uc544)", "EST",
+- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ube45\ud1a0\ub9ac\uc544)", "EST"};
++ String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "EST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "EST"};
+ String VLAT[] = new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT",
+ "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"};
+ String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART",
+@@ -193,10 +193,10 @@
+ "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"};
+ String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET",
+ "\uc11c\uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WEST"};
+- String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT",
++ String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIB",
+ "\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST"};
+- String WST_AUS[] = new String[] {"\uc11c\ubd80 \ud45c\uc900\uc2dc(\ud638\uc8fc)", "WST",
+- "\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud638\uc8fc)", "WST"};
++ String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST",
++ "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST"};
+ String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST",
+ "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"};
+ String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT",
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -401,8 +401,8 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", new String[] {"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uD45C\uC900\uC2DC", "MeST",
++ "\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MeDT"}},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST",
+ "\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT"}},
+@@ -426,7 +426,7 @@
+ "\uc218\ub9ac\ub0a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"America/Rosario", AGT},
+ {"America/Santa_Isabel", PST},
+ {"America/Santarem", BRT},
+@@ -466,8 +466,8 @@
+ "Davis \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc2dc\uac04", "DDUT",
+ "\ub4a4\ubabd \ub4a4\ub974\ube4c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"\uB9E4\uCF70\uB9AC \uC12C \uD45C\uC900\uC2DC", "MIST",
++ "\uB9E4\uCF70\uB9AC \uC12C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MIST"}},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "EIT",
++ {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT",
+ "\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EIST"}},
+ {"Asia/Kabul", new String[] {"\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "AFT",
+ "\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT",
++ "\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
+ "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT",
++ "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -616,8 +618,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"\uc911\uc11c\ubd80 \ud45c\uc900\uc2dc(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST",
+- "\uc911\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST",
++ "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"\uc911\ubd80 \uc720\ub7fd \uc2dc\uac04", "MET",
+ "\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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Thu Dec 19 09:01:16 2013 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"};
+- String ADELAIDE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul)", "CST",
+- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul)", "CST"};
++ String ADELAIDE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul)", "CST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "CST"};
+ String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART",
+ "Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST"};
+ String AKST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Alaska", "AKST",
+@@ -61,10 +61,10 @@
+ "Hor\u00e1rio de luz natural do Atl\u00e2ntico", "ADT"};
+ String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST"};
+- String BRISBANE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Queensland)", "EST",
+- "Fuso hor\u00e1rio de ver\u00e3o oriental (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST",
+- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST"};
++ String BRISBANE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Queensland)", "EST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Queensland)", "EST"};
++ String BROKEN_HILL[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST"};
+ String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST"};
+ String BTT[] = new String[] {"Fuso hor\u00e1rio de But\u00e3o", "BTT",
+@@ -77,7 +77,7 @@
+ "Hor\u00e1rio de luz natural de Chatham", "CHADT"};
+ String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST",
+ "Hor\u00e1rio de luz natural de Chamorro", "ChDT"};
+- String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "CIT",
++ String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "WITA",
+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Central", "CIST"};
+ String CLT[] = new String[] {"Fuso hor\u00e1rio do Chile", "CLT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Chile", "CLST"};
+@@ -87,8 +87,8 @@
+ "Hor\u00e1rio de luz natural da China", "CDT"};
+ String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST",
+ "Hor\u00e1rio de luz natural de Cuba", "CDT"};
+- String DARWIN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Territ\u00f3rio do Norte)", "CST",
+- "Fuso hor\u00e1rio de ver\u00e3o central (Territ\u00f3rio do Norte)", "CST"};
++ String DARWIN[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Territ\u00F3rio do Norte)", "CST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Territ\u00F3rio do Norte)", "CST"};
+ String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
+ "Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST"};
+ String EAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Oriental", "EAT",
+@@ -101,10 +101,10 @@
+ "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Oriental", "EGST"};
+ String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST",
+ "Hor\u00e1rio de luz natural oriental", "EDT"};
+- String EST_NSW[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Nova Gales do Sul)", "EST",
+- "Fuso hor\u00e1rio de ver\u00e3o oriental (Nova Gales do Sul)", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ String EST_NSW[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Oriental (Nova Gales do Sul)", "EST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Nova Gales do Sul)", "EST"};
++ String FET[] = new String[] {"Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET",
++ "Fuso Hor\u00E1rio de Ver\u00E3o do Extremo Leste Europeu", "FEST"};
+ String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST"};
+ String GAMBIER[] = new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT",
+@@ -157,8 +157,8 @@
+ "Hor\u00e1rio de luz natural de Pitcairn", "PDT"};
+ String PKT[] = new String[] {"Fuso hor\u00e1rio do Paquist\u00e3o", "PKT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Paquist\u00e3o", "PKST"};
+- String PONT[] = new String[] {"Fuso hor\u00e1rio de Pohnpei", "PONT",
+- "Fuso hor\u00e1rio de ver\u00e3o de Pohnpei", "PONST"};
++ String PONT[] = new String[] {"Fuso Hor\u00E1rio de Pohnpei", "PONT",
++ "Fuso Hor\u00E1rio de Ver\u00E3o de Pohnpei", "PONST"};
+ String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST",
+ "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"};
+ String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST",
+@@ -171,20 +171,20 @@
+ "Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST"};
+ String SLST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Serra Leoa", "SLST"};
+- String TASMANIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Tasm\u00e2nia)", "EST",
+- "Fuso hor\u00e1rio de ver\u00e3o oriental (Tasm\u00e2nia)", "EST"};
++ String TASMANIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Tasm\u00E2nia)", "EST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Tasm\u00E2nia)", "EST"};
+ String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST"};
+- String TRUT[] = new String[] {"Fuso hor\u00e1rio de Chuuk", "CHUT",
+- "Fuso hor\u00e1rio de ver\u00e3o de Chuuk", "CHUST"};
++ String TRUT[] = new String[] {"Fuso Hor\u00E1rio de Chuuk", "CHUT",
++ "Fuso Hor\u00E1rio de Ver\u00E3o de Chuuk", "CHUST"};
+ String ULAT[]= new String[] {"Fuso hor\u00e1rio de Ulan Bator", "ULAT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Ulan Bator", "ULAST"};
+ String UTC[] = new String[] {"Tempo universal coordenado", "UTC",
+ "Tempo universal coordenado", "UTC"};
+ String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST"};
+- String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST",
+- "Fuso hor\u00e1rio de ver\u00e3o oriental (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Victoria)", "EST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Victoria)", "EST"};
+ String VLAT[] = new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"};
+ String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART",
+@@ -193,10 +193,10 @@
+ "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST"};
+ String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET",
+ "Fuso hor\u00e1rio de ver\u00e3o da Europa Ocidental", "WEST"};
+- String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIT",
++ String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIB",
+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST"};
+- String WST_AUS[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o ocidental (Austr\u00e1lia)", "WST",
+- "Fuso hor\u00e1rio de ver\u00e3o ocidental (Austr\u00e1lia)", "WST"};
++ String WST_AUS[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Ocidental (Austr\u00E1lia)", "WST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental (Austr\u00E1lia)", "WST"};
+ String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST",
+ "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT"};
+ String YAKT[] = new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT",
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -401,8 +401,8 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", new String[] {"Hor\u00E1rio Padr\u00E3o de Metlakatla", "MeST",
++ "Hor\u00E1rio de Luz Natural de Metlakatla", "MeDT"}},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST",
+ "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT"}},
+@@ -426,7 +426,7 @@
+ "Fuso hor\u00e1rio de ver\u00e3o do Suriname", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"America/Rosario", AGT},
+ {"America/Santa_Isabel", PST},
+ {"America/Santarem", BRT},
+@@ -466,8 +466,8 @@
+ "Fuso hor\u00e1rio de ver\u00e3o de Davis", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Fuso hor\u00e1rio de Dumont-d'Urville", "DDUT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Dumont-d'Urville", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"Fuso Hor\u00E1rio da Ilha de Macquarie", "MIST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o da Ilha de Macquarie", "MIST"}},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "EIT",
++ {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "WIT",
+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Oriental", "EIST"}},
+ {"Asia/Kabul", new String[] {"Fuso hor\u00e1rio do Afeganist\u00e3o", "AFT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Afeganist\u00e3o", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"Hor\u00E1rio de Khandyga", "YAKT",
++ "Hor\u00E1rio de Ver\u00E3o de Khandyga", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"Hor\u00E1rio de Ust-Nera", "VLAT",
++ "Hor\u00E1rio de Ver\u00E3o de Ust-Nera", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -616,8 +618,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Fuso hor\u00e1rio ocidental central (Austr\u00e1lia)", "CWST",
+- "Fuso hor\u00e1rio de ver\u00e3o ocidental central (Austr\u00e1lia)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Fuso Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "CWST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental Central (Austr\u00E1lia)", "CWST"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET",
+ "Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Thu Dec 19 09:01:16 2013 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre, normaltid", "ACT",
+ "Acre, sommartid", "ACST"};
+- String ADELAIDE[] = new String[] {"Central normaltid (S\u00f6dra Australien)", "CST",
+- "Central sommartid (S\u00f6dra Australien)", "CST"};
++ String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST",
++ "Central sommartid (South Australia)", "CST"};
+ String AGT[] = new String[] {"Argentina, normaltid", "ART",
+ "Argentina, sommartid", "ARST"};
+ String AKST[] = new String[] {"Alaska, normaltid", "AKST",
+@@ -61,10 +61,10 @@
+ "Atlantisk sommartid", "ADT"};
+ String BDT[] = new String[] {"Bangladesh, normaltid", "BDT",
+ "Bangladesh, sommartid", "BDST"};
+- String BRISBANE[] = new String[] {"\u00d6stlig normaltid (Queensland)", "EST",
+- "\u00d6stlig sommartid (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Central normaltid (S\u00f6dra Australien/Nya Sydwales)", "CST",
+- "Central sommartid (S\u00f6dra Australien/Nya Sydwales)", "CST"};
++ String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "EST",
++ "\u00D6stlig sommartid (Queensland)", "EST"};
++ String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien)/New South Wales)", "CST",
++ "Central sommartid (South Australia/New South Wales)", "CST"};
+ String BRT[] = new String[] {"Brasilien, normaltid", "BRT",
+ "Brasilien, sommartid", "BRST"};
+ String BTT[] = new String[] {"Bhutan, normaltid", "BTT",
+@@ -77,9 +77,9 @@
+ "Chatham, sommartid", "CHADT"};
+ String ChST[] = new String[] {"Chamorro, normaltid", "ChST",
+ "Chamorro, sommartid", "ChDT"};
+- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+- "Chuuk Summer Time", "CHUST"};
+- String CIT[] = new String[] {"Centralindonesisk tid", "CIT",
++ String CHUT[] = new String[] {"Chuuk, normaltid", "CHUT",
++ "Chuuk, sommartid", "CHUST"};
++ String CIT[] = new String[] {"Centralindonesisk tid", "WITA",
+ "Centralindonesisk sommartid", "CIST"};
+ String CLT[] = new String[] {"Chile, normaltid", "CLT",
+ "Chile, sommartid", "CLST"};
+@@ -89,7 +89,7 @@
+ "Kina, sommartid", "CDT"};
+ String CUBA[] = new String[] {"Kuba, normaltid", "CST",
+ "Kuba, sommartid", "CDT"};
+- String DARWIN[] = new String[] {"Central normaltid (Nordterritoriet)", "CST",
++ String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "CST",
+ "Central sommartid (Nordterritoriet)", "CST"};
+ String DUBLIN[] = new String[] {"Greenwichtid", "GMT",
+ "Irland, sommartid", "IST"};
+@@ -103,10 +103,10 @@
+ "\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST"};
+ String EST[] = new String[] {"Eastern, normaltid", "EST",
+ "Eastern, sommartid", "EDT"};
+- String EST_NSW[] = new String[] {"Eastern, normaltid (Nya Sydwales)", "EST",
+- "Eastern, sommartid (Nya Sydwales)", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "EST",
++ "\u00D6stlig sommartid (New South Wales)", "EST"};
++ String FET[] = new String[] {"Kaliningradtid", "FET",
++ "\u00D6steuropeisk sommartid", "FEST"};
+ String GHMT[] = new String[] {"Ghana, normaltid", "GMT",
+ "Ghana, sommartid", "GHST"};
+ String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT",
+@@ -159,8 +159,8 @@
+ "Pitcairn, sommartid", "PDT"};
+ String PKT[] = new String[] {"Pakistan, normaltid", "PKT",
+ "Pakistan, sommartid", "PKST"};
+- String PONT[] = new String[] {"Pohnpei Time", "PONT",
+- "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"Pohnpei, normaltid", "PONT",
++ "Pohnpei, sommartid", "PONST"};
+ String PST[] = new String[] {"Stilla havet, normaltid", "PST",
+ "Stilla havet, sommartid", "PDT"};
+ String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
+@@ -173,8 +173,8 @@
+ "Singapore, sommartid", "SGST"};
+ String SLST[] = new String[] {"Greenwichtid", "GMT",
+ "Sierra Leone, sommartid", "SLST"};
+- String TASMANIA[] = new String[] {"Eastern, normaltid (Tasmanien)", "EST",
+- "Eastern, sommartid (Tasmanien)", "EST"};
++ String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "EST",
++ "\u00D6stlig sommartid (Tasmanien)", "EST"};
+ String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT",
+ "Turkmenistan, sommartid", "TMST"};
+ String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT",
+@@ -183,8 +183,8 @@
+ "Koordinerad universell tid", "UTC"};
+ String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT",
+ "Uzbekistan, sommartid", "UZST"};
+- String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST",
+- "\u00d6stlig sommartid (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "EST",
++ "\u00D6stlig sommartid (Victoria)", "EST"};
+ String VLAT[] = new String[] {"Vladivostok, normaltid", "VLAT",
+ "Vladivostok, sommartid", "VLAST"};
+ String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART",
+@@ -193,10 +193,10 @@
+ "V\u00e4stafrikansk sommartid", "WAST"};
+ String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET",
+ "V\u00e4steuropeisk sommartid", "WEST"};
+- String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIT",
++ String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIB",
+ "V\u00e4stindonesisk sommartid", "WIST"};
+- String WST_AUS[] = new String[] {"V\u00e4stlig normaltid (Australien)", "WST",
+- "V\u00e4stlig sommartid (Australien)", "WST"};
++ String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST",
++ "V\u00E4stlig sommartid (Australien)", "WST"};
+ String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST",
+ "V\u00e4stsamoansk sommartid", "WSDT"};
+ String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT",
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -401,8 +401,8 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", new String[] {"Metlakatla, normaltid", "MeST",
++ "Metlakatla, sommartid", "MeDT"}},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST",
+ "Saint-Pierre-et-Miquelon, sommartid", "PMDT"}},
+@@ -426,7 +426,7 @@
+ "Surinam, sommartid", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"America/Rosario", AGT},
+ {"America/Santa_Isabel", PST},
+ {"America/Santarem", BRT},
+@@ -466,8 +466,8 @@
+ "Davis, sommartid", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville, normaltid", "DDUT",
+ "Dumont-d'Urville, sommartid", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"Macquarie\u00F6n, normaltid", "MIST",
++ "Macquarie\u00F6n, sommartid", "MIST"}},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "EIT",
++ {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "WIT",
+ "\u00d6stindonesisk sommartid", "EIST"}},
+ {"Asia/Kabul", new String[] {"Afghanistan, normaltid", "AFT",
+ "Afghanistan, sommartid", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT",
++ "Khandyga, sommartid", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT",
+ "Krasnojarsk, sommartid", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT",
++ "Ust-Nera, sommartid", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -616,8 +618,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Central v\u00e4stlig normaltid (Australien)", "CWST",
+- "Central v\u00e4stlig sommartid (Australien)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "CWST",
++ "Central v\u00E4stlig sommartid (Australien)", "CWST"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"Mellaneuropeisk tid", "MET",
+ "Mellaneuropeisk sommartid", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Thu Dec 19 09:01:16 2013 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre \u65f6\u95f4", "ACT",
+ "Acre \u590f\u4ee4\u65f6", "ACST"};
+- String ADELAIDE[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST",
+- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST"};
++ String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST",
++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST"};
+ String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART",
+ "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "ARST"};
+ String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6807\u51c6\u65f6\u95f4", "AKST",
+@@ -61,10 +61,10 @@
+ "\u5927\u897f\u6d0b\u590f\u4ee4\u65f6", "ADT"};
+ String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u65f6\u95f4", "BDT",
+ "\u5b5f\u52a0\u62c9\u590f\u4ee4\u65f6", "BDST"};
+- String BRISBANE[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6606\u58eb\u5170\uff09", "EST",
+- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u6606\u58eb\u5170\uff09", "EST"};
+- String BROKEN_HILL[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST",
+- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST"};
++ String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "EST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "EST"};
++ String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST",
++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST"};
+ String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9a\u65f6\u95f4", "BRT",
+ "\u5df4\u897f\u5229\u4e9a\u590f\u4ee4\u65f6", "BRST"};
+ String BTT[] = new String[] {"\u4e0d\u4e39\u65f6\u95f4", "BTT",
+@@ -77,9 +77,9 @@
+ "\u67e5\u8428\u59c6\u590f\u4ee4\u65f6", "CHADT"};
+ String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST",
+ "Chamorro \u590f\u4ee4\u65f6", "ChDT"};
+- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+- "Chuuk Summer Time", "CHUST"};
+- String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "CIT",
++ String CHUT[] = new String[] {"\u4E18\u514B\u65F6\u95F4", "CHUT",
++ "\u4E18\u514B\u590F\u4EE4\u65F6", "CHUST"};
++ String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WITA",
+ "\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "CIST"};
+ String CLT[] = new String[] {"\u667a\u5229\u65f6\u95f4", "CLT",
+ "\u667a\u5229\u590f\u4ee4\u65f6", "CLST"};
+@@ -89,8 +89,8 @@
+ "\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT"};
+ String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST",
+ "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT"};
+- String DARWIN[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5317\u9886\u5730\uff09", "CST",
+- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5317\u9886\u5730\uff09", "CST"};
++ String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "CST",
++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "CST"};
+ String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
+ "\u7231\u5c14\u5170\u590f\u4ee4\u65f6", "IST"};
+ String EAT[] = new String[] {"\u4e1c\u975e\u65f6\u95f4", "EAT",
+@@ -103,10 +103,10 @@
+ "\u4e1c\u683c\u6797\u5c9b\u590f\u4ee4\u65f6", "EGST"};
+ String EST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST",
+ "\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT"};
+- String EST_NSW[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST",
+- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST"};
++ String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET",
++ "\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST"};
+ String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT",
+ "\u52a0\u7eb3\u590f\u4ee4\u65f6", "GHST"};
+ String GAMBIER[] = new String[] {"\u5188\u6bd4\u4e9a\u65f6\u95f4", "GAMT",
+@@ -159,8 +159,8 @@
+ "\u76ae\u7279\u5eb7\u5c9b\u590f\u4ee4\u65f6", "PDT"};
+ String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u65f6\u95f4", "PKT",
+ "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u65f6", "PKST"};
+- String PONT[] = new String[] {"Pohnpei Time", "PONT",
+- "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"\u6CE2\u7EB3\u4F69\u65F6\u95F4", "PONT",
++ "\u6CE2\u7EB3\u4F69\u590F\u4EE4\u65F6", "PONST"};
+ String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "PST",
+ "\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT"};
+ String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST",
+@@ -173,8 +173,8 @@
+ "\u65b0\u52a0\u5761\u590f\u4ee4\u65f6", "SGST"};
+ String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
+ "\u585e\u62c9\u5229\u6602\u590f\u4ee4\u65f6", "SLST"};
+- String TASMANIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST",
+- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST"};
++ String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST"};
+ String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT",
+ "\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST"};
+ String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT",
+@@ -183,8 +183,8 @@
+ "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC"};
+ String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT",
+ "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST"};
+- String VICTORIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST",
+- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST"};
++ String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "EST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "EST"};
+ String VLAT[] = new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT",
+ "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"};
+ String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART",
+@@ -193,10 +193,10 @@
+ "\u897f\u975e\u590f\u4ee4\u65f6", "WAST"};
+ String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET",
+ "\u897f\u6b27\u590f\u4ee4\u65f6", "WEST"};
+- String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT",
++ String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIB",
+ "\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST"};
+- String WST_AUS[] = new String[] {"\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST",
+- "\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST"};
++ String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "WST",
++ "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "WST"};
+ String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST",
+ "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"};
+ String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT",
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -401,8 +401,8 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6807\u51C6\u65F6\u95F4", "MeST",
++ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u590F\u4EE4\u65F6", "MeDT"}},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST",
+ "\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT"}},
+@@ -426,7 +426,7 @@
+ "\u82cf\u5229\u5357\u590f\u4ee4\u65f6", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"America/Rosario", AGT},
+ {"America/Santa_Isabel", PST},
+ {"America/Santarem", BRT},
+@@ -466,8 +466,8 @@
+ "\u6234\u7ef4\u65af\u590f\u4ee4\u65f6", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u65f6\u95f4", "DDUT",
+ "Dumont-d'Urville \u590f\u4ee4\u65f6", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"\u9EA6\u5938\u91CC\u5C9B\u65F6\u95F4", "MIST",
++ "\u9EA6\u5938\u91CC\u5C9B\u590F\u4EE4\u65F6", "MIST"}},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "EIT",
++ {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT",
+ "\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "EIST"}},
+ {"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u65f6\u95f4", "AFT",
+ "\u963f\u5bcc\u6c57\u590f\u4ee4\u65f6", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT",
++ "\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
+ "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}},
+@@ -586,7 +587,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT",
++ "\u4E4C\u65AF\u5B63\u6D85\u62C9\u590F\u4EE4\u65F6", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -616,8 +618,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST",
+- "\u4e2d\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST"}},
++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "CWST",
++ "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "CWST"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -635,7 +637,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -753,7 +755,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"\u4e2d\u6b27\u65f6\u95f4", "MET",
+ "\u4e2d\u6b27\u590f\u4ee4\u65f6", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Thu Dec 19 09:01:16 2013 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre \u6642\u9593", "ACT",
+ "Acre \u590f\u4ee4\u6642\u9593", "ACST"};
+- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST",
+- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST"};
++ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "CST",
++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "CST"};
+ String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART",
+ "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "ARST"};
+ String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6a19\u6e96\u6642\u9593", "AKST",
+@@ -61,10 +61,10 @@
+ "\u5927\u897f\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ADT"};
+ String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u6642\u9593", "BDT",
+ "\u5b5f\u52a0\u62c9\u590f\u4ee4\u6642\u9593", "BDST"};
+- String BRISBANE[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u6606\u58eb\u862d)", "EST",
+- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u6606\u58eb\u862d)", "EST"};
+- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST",
+- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST"};
++ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "EST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "EST"};
++ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST",
++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST"};
+ String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9e\u6642\u9593", "BRT",
+ "\u5df4\u897f\u5229\u4e9e\u590f\u4ee4\u6642\u9593", "BRST"};
+ String BTT[] = new String[] {"\u4e0d\u4e39\u6642\u9593", "BTT",
+@@ -77,9 +77,9 @@
+ "\u67e5\u5766\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CHADT"};
+ String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST",
+ "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"};
+- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+- "Chuuk Summer Time", "CHUST"};
+- String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "CIT",
++ String CHUT[] = new String[] {"\u695A\u514B\u6642\u9593", "CHUT",
++ "\u695A\u514B\u590F\u4EE4\u6642\u9593", "CHUST"};
++ String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WITA",
+ "\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u4ee4\u6642\u9593", "CIST"};
+ String CLT[] = new String[] {"\u667a\u5229\u6642\u9593", "CLT",
+ "\u667a\u5229\u590f\u4ee4\u6642\u9593", "CLST"};
+@@ -89,8 +89,8 @@
+ "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
+ String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST",
+ "\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
+- String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST",
+- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST"};
++ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST",
++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST"};
+ String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
+ "\u611b\u723e\u862d\u590f\u4ee4\u6642\u9593", "IST"};
+ String EAT[] = new String[] {"\u6771\u975e\u6642\u9593", "EAT",
+@@ -103,10 +103,10 @@
+ "\u6771\u683c\u6797\u5cf6\u590f\u4ee4\u6642\u9593", "EGST"};
+ String EST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST",
+ "\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT"};
+- String EST_NSW[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST",
+- "\u6771\u65b9\u590f\u4ee4\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST"};
+- String FET[] = new String[] {"Further-eastern European Time", "FET",
+- "Further-eastern European Summer Time", "FEST"};
++ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST"};
++ String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET",
++ "\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST"};
+ String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT",
+ "\u8fe6\u7d0d\u590f\u4ee4\u6642\u9593", "GHST"};
+ String GAMBIER[] = new String[] {"\u7518\u6bd4\u723e\u6642\u9593", "GAMT",
+@@ -159,8 +159,8 @@
+ "\u76ae\u7279\u5eb7\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"};
+ String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u6642\u9593", "PKT",
+ "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u6642\u9593", "PKST"};
+- String PONT[] = new String[] {"Pohnpei Time", "PONT",
+- "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"\u6CE2\u7D0D\u4F69\u6642\u9593", "PONT",
++ "\u6CE2\u7D0D\u4F69\u590F\u4EE4\u6642\u9593", "PONST"};
+ String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593", "PST",
+ "\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"};
+ String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST",
+@@ -173,8 +173,8 @@
+ "\u65b0\u52a0\u5761\u590f\u4ee4\u6642\u9593", "SGST"};
+ String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
+ "\u7345\u5b50\u5c71\u590f\u4ee4\u6642\u9593", "SLST"};
+- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST",
+- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST"};
++ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST"};
+ String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT",
+ "\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST"};
+ String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT",
+@@ -183,8 +183,8 @@
+ "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC"};
+ String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT",
+ "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST"};
+- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST",
+- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST"};
++ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST"};
+ String VLAT[] = new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT",
+ "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"};
+ String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART",
+@@ -193,10 +193,10 @@
+ "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"};
+ String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET",
+ "\u897f\u6b50\u590f\u4ee4\u6642\u9593", "WEST"};
+- String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIT",
++ String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIB",
+ "\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST"};
+- String WST_AUS[] = new String[] {"\u897f\u65b9\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST",
+- "\u897f\u65b9\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST"};
++ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST",
++ "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST"};
+ String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST",
+ "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"};
+ String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT",
+@@ -291,7 +291,7 @@
+ {"Africa/Porto-Novo", WAT},
+ {"Africa/Sao_Tome", GMT},
+ {"Africa/Timbuktu", GMT},
+- {"Africa/Tripoli", CET},
++ {"Africa/Tripoli", EET},
+ {"Africa/Tunis", CET},
+ {"Africa/Windhoek", WAT},
+ {"America/Adak", HAST},
+@@ -308,7 +308,7 @@
+ {"America/Argentina/Rio_Gallegos", AGT},
+ {"America/Argentina/Salta", AGT},
+ {"America/Argentina/San_Juan", AGT},
+- {"America/Argentina/San_Luis", WART},
++ {"America/Argentina/San_Luis", AGT},
+ {"America/Argentina/Tucuman", AGT},
+ {"America/Argentina/Ushuaia", AGT},
+ {"America/Aruba", AST},
+@@ -349,7 +349,7 @@
+ {"America/Detroit", EST},
+ {"America/Dominica", AST},
+ {"America/Edmonton", MST},
+- {"America/Eirunepe", AMT},
++ {"America/Eirunepe", ACT},
+ {"America/El_Salvador", CST},
+ {"America/Ensenada", PST},
+ {"America/Fort_Wayne", EST},
+@@ -401,8 +401,8 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6A19\u6E96\u6642\u9593", "MeST",
++ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u65E5\u5149\u7BC0\u7D04\u6642\u9593", "MeDT"}},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST",
+ "\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT"}},
+@@ -426,7 +426,7 @@
+ "\u8607\u5229\u5357\u590f\u4ee4\u6642\u9593", "SRST"}},
+ {"America/Port-au-Prince", EST},
+ {"America/Port_of_Spain", AST},
+- {"America/Porto_Acre", AMT},
++ {"America/Porto_Acre", ACT},
+ {"America/Porto_Velho", AMT},
+ {"America/Puerto_Rico", AST},
+ {"America/Rainy_River", CST},
+@@ -434,7 +434,7 @@
+ {"America/Recife", BRT},
+ {"America/Regina", CST},
+ {"America/Resolute", CST},
+- {"America/Rio_Branco", AMT},
++ {"America/Rio_Branco", ACT},
+ {"America/Rosario", AGT},
+ {"America/Santa_Isabel", PST},
+ {"America/Santarem", BRT},
+@@ -466,8 +466,8 @@
+ "\u81fa\u7dad\u65af\u590f\u4ee4\u6642\u9593", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u6642\u9593", "DDUT",
+ "Dumont-d'Urville \u590f\u4ee4\u6642\u9593", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"\u9EA5\u5938\u5229\u5CF6\u6642\u9593", "MIST",
++ "\u9EA5\u5938\u5229\u5CF6\u590F\u4EE4\u6642\u9593", "MIST"}},
+ {"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},
+ {"Asia/Jakarta", WIT},
+- {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "EIT",
++ {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WIT",
+ "\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u65e5\u6642\u9593", "EIST"}},
+ {"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u6642\u9593", "AFT",
+ "\u963f\u5bcc\u6c57\u590f\u4ee4\u6642\u9593", "AFST"}},
+@@ -537,7 +537,8 @@
+ {"Asia/Kashgar", CTT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+- {"Asia/Khandyga", YAKT},
++ {"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT",
++ "\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST"}},
+ {"Asia/Kolkata", IST},
+ {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
+ "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}},
+@@ -587,7 +588,8 @@
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+ {"Asia/Urumqi", CTT},
+- {"Asia/Ust-Nera", VLAT},
++ {"Asia/Ust-Nera", new String[] {"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT",
++ "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u590F\u4EE4\u6642\u9593", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+ {"Asia/Vladivostok", VLAT},
+ {"Asia/Yakutsk", YAKT},
+@@ -617,8 +619,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST",
+- "\u4e2d\u897f\u90e8\u65e5\u5149\u7bc0\u7d04\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST",
++ "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -636,7 +638,7 @@
+ {"Australia/Yancowinna", BROKEN_HILL},
+ {"BET", BRT},
+ {"BST", BDT},
+- {"Brazil/Acre", AMT},
++ {"Brazil/Acre", ACT},
+ {"Brazil/DeNoronha", NORONHA},
+ {"Brazil/East", BRT},
+ {"Brazil/West", AMT},
+@@ -754,7 +756,7 @@
+ {"Jamaica", EST},
+ {"Japan", JST},
+ {"Kwajalein", MHT},
+- {"Libya", CET},
++ {"Libya", EET},
+ {"MET", new String[] {"\u4e2d\u6b50\u6642\u9593", "MET",
+ "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "MEST"}},
+ {"Mexico/BajaNorte", PST},
+--- ./jdk/src/share/lib/security/java.policy Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/lib/security/java.policy Thu Dec 19 09:01:16 2013 -0800
+@@ -2,48 +2,51 @@
+ // Standard extensions get all permissions by default
+
+ grant codeBase "file:${{java.ext.dirs}}/*" {
+- permission java.security.AllPermission;
++ permission java.security.AllPermission;
+ };
+
+ // default permissions granted to all domains
+
+-grant {
+- // Allows any thread to stop itself using the java.lang.Thread.stop()
+- // method that takes no argument.
+- // Note that this permission is granted by default only to remain
+- // backwards compatible.
+- // It is strongly recommended that you either remove this permission
+- // from this policy file or further restrict it to code sources
+- // that you specify, because Thread.stop() is potentially unsafe.
+- // See the API specification of java.lang.Thread.stop() for more
++grant {
++ // Allows any thread to stop itself using the java.lang.Thread.stop()
++ // method that takes no argument.
++ // Note that this permission is granted by default only to remain
++ // backwards compatible.
++ // It is strongly recommended that you either remove this permission
++ // from this policy file or further restrict it to code sources
++ // that you specify, because Thread.stop() is potentially unsafe.
++ // See the API specification of java.lang.Thread.stop() for more
+ // information.
+- permission java.lang.RuntimePermission "stopThread";
++ permission java.lang.RuntimePermission "stopThread";
+
+- // allows anyone to listen on un-privileged ports
+- permission java.net.SocketPermission "localhost:1024-", "listen";
++ // allows anyone to listen on dynamic ports
++ permission java.net.SocketPermission "localhost:0", "listen";
+
+- // "standard" properies that can be read by anyone
++ // permission for standard RMI registry port
++ permission java.net.SocketPermission "localhost:1099", "listen";
+
+- permission java.util.PropertyPermission "java.version", "read";
+- permission java.util.PropertyPermission "java.vendor", "read";
+- permission java.util.PropertyPermission "java.vendor.url", "read";
+- permission java.util.PropertyPermission "java.class.version", "read";
+- permission java.util.PropertyPermission "os.name", "read";
+- permission java.util.PropertyPermission "os.version", "read";
+- permission java.util.PropertyPermission "os.arch", "read";
+- permission java.util.PropertyPermission "file.separator", "read";
+- permission java.util.PropertyPermission "path.separator", "read";
+- permission java.util.PropertyPermission "line.separator", "read";
++ // "standard" properies that can be read by anyone
+
+- permission java.util.PropertyPermission "java.specification.version", "read";
+- permission java.util.PropertyPermission "java.specification.vendor", "read";
+- permission java.util.PropertyPermission "java.specification.name", "read";
++ permission java.util.PropertyPermission "java.version", "read";
++ permission java.util.PropertyPermission "java.vendor", "read";
++ permission java.util.PropertyPermission "java.vendor.url", "read";
++ permission java.util.PropertyPermission "java.class.version", "read";
++ permission java.util.PropertyPermission "os.name", "read";
++ permission java.util.PropertyPermission "os.version", "read";
++ permission java.util.PropertyPermission "os.arch", "read";
++ permission java.util.PropertyPermission "file.separator", "read";
++ permission java.util.PropertyPermission "path.separator", "read";
++ permission java.util.PropertyPermission "line.separator", "read";
+
+- permission java.util.PropertyPermission "java.vm.specification.version", "read";
+- permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
+- permission java.util.PropertyPermission "java.vm.specification.name", "read";
+- permission java.util.PropertyPermission "java.vm.version", "read";
+- permission java.util.PropertyPermission "java.vm.vendor", "read";
+- permission java.util.PropertyPermission "java.vm.name", "read";
++ permission java.util.PropertyPermission "java.specification.version", "read";
++ permission java.util.PropertyPermission "java.specification.vendor", "read";
++ permission java.util.PropertyPermission "java.specification.name", "read";
++
++ permission java.util.PropertyPermission "java.vm.specification.version", "read";
++ permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
++ permission java.util.PropertyPermission "java.vm.specification.name", "read";
++ permission java.util.PropertyPermission "java.vm.version", "read";
++ permission java.util.PropertyPermission "java.vm.vendor", "read";
++ permission java.util.PropertyPermission "java.vm.name", "read";
+ };
+
+--- ./jdk/src/share/lib/security/java.security-linux Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/lib/security/java.security-linux Thu Dec 19 09:01:16 2013 -0800
+@@ -128,7 +128,9 @@
+ com.sun.imageio.,\
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
++ com.sun.naming.internal.,\
+ com.sun.proxy.,\
++ com.sun.corba.se.,\
+ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+@@ -166,7 +168,9 @@
+ com.sun.imageio.,\
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
++ com.sun.naming.internal.,\
+ com.sun.proxy.,\
++ com.sun.corba.se.,\
+ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+@@ -425,4 +429,3 @@
+ #
+ # Example:
+ # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
+-
+--- ./jdk/src/share/lib/security/java.security-macosx Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/lib/security/java.security-macosx Thu Dec 19 09:01:16 2013 -0800
+@@ -129,7 +129,9 @@
+ com.sun.imageio.,\
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
++ com.sun.naming.internal.,\
+ com.sun.proxy.,\
++ com.sun.corba.se.,\
+ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+@@ -169,7 +171,9 @@
+ com.sun.imageio.,\
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
++ com.sun.naming.internal.,\
+ com.sun.proxy.,\
++ com.sun.corba.se.,\
+ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+@@ -430,4 +434,3 @@
+ #
+ # Example:
+ # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
+-
+--- ./jdk/src/share/lib/security/java.security-solaris Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/lib/security/java.security-solaris Thu Dec 19 09:01:16 2013 -0800
+@@ -130,7 +130,9 @@
+ com.sun.imageio.,\
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
++ com.sun.naming.internal.,\
+ com.sun.proxy.,\
++ com.sun.corba.se.,\
+ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+@@ -169,7 +171,9 @@
+ com.sun.imageio.,\
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
++ com.sun.naming.internal.,\
+ com.sun.proxy.,\
++ com.sun.corba.se.,\
+ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+@@ -429,4 +433,3 @@
+ #
+ # Example:
+ # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
+-i
+--- ./jdk/src/share/lib/security/java.security-windows Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/lib/security/java.security-windows Thu Dec 19 09:01:16 2013 -0800
+@@ -129,7 +129,9 @@
+ com.sun.imageio.,\
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
++ com.sun.naming.internal.,\
+ com.sun.proxy.,\
++ com.sun.corba.se.,\
+ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+@@ -169,7 +171,9 @@
+ com.sun.imageio.,\
+ com.sun.istack.internal.,\
+ com.sun.jmx.,\
++ com.sun.naming.internal.,\
+ com.sun.proxy.,\
++ com.sun.corba.se.,\
+ com.sun.script.,\
+ com.sun.org.apache.bcel.internal.,\
+ com.sun.org.apache.regexp.internal.,\
+@@ -430,4 +434,3 @@
+ #
+ # Example:
+ # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
+-
+--- ./jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c Thu Dec 19 09:01:16 2013 -0800
+@@ -111,8 +111,9 @@
+ int
+ SplashIsStillLooping(Splash * splash)
+ {
+- if (splash->currentFrame < 0)
++ if (splash->currentFrame < 0) {
+ return 0;
++ }
+ return splash->loopCount != 1 ||
+ splash->currentFrame + 1 < splash->frameCount;
+ }
+@@ -121,17 +122,22 @@
+ SplashUpdateScreenData(Splash * splash)
+ {
+ ImageRect srcRect, dstRect;
++ if (splash->currentFrame < 0) {
++ return;
++ }
+
+ initRect(&srcRect, 0, 0, splash->width, splash->height, 1,
+ splash->width * sizeof(rgbquad_t),
+ splash->frames[splash->currentFrame].bitmapBits, &splash->imageFormat);
+- if (splash->screenData)
++ if (splash->screenData) {
+ free(splash->screenData);
++ }
+ splash->screenStride = splash->width * splash->screenFormat.depthBytes;
+- if (splash->byteAlignment > 1)
++ if (splash->byteAlignment > 1) {
+ splash->screenStride =
+ (splash->screenStride + splash->byteAlignment - 1) &
+ ~(splash->byteAlignment - 1);
++ }
+ splash->screenData = malloc(splash->height * splash->screenStride);
+ initRect(&dstRect, 0, 0, splash->width, splash->height, 1,
+ splash->screenStride, splash->screenData, &splash->screenFormat);
+@@ -146,16 +152,19 @@
+ void
+ SplashNextFrame(Splash * splash)
+ {
+- if (splash->currentFrame < 0)
++ if (splash->currentFrame < 0) {
+ return;
++ }
+ do {
+- if (!SplashIsStillLooping(splash))
++ if (!SplashIsStillLooping(splash)) {
+ return;
++ }
+ splash->time += splash->frames[splash->currentFrame].delay;
+ if (++splash->currentFrame >= splash->frameCount) {
+ splash->currentFrame = 0;
+- if (splash->loopCount > 0)
++ if (splash->loopCount > 0) {
+ splash->loopCount--;
++ }
+ }
+ } while (splash->time + splash->frames[splash->currentFrame].delay -
+ SplashTime() <= 0);
+@@ -183,8 +192,9 @@
+ pSrc += pSrcRect->depthBytes;
+ ++i;
+ }
+- if (i >= pSrcRect->numSamples)
++ if (i >= pSrcRect->numSamples) {
+ break;
++ }
+ i0 = i;
+ while (i < pSrcRect->numSamples &&
+ getRGBA(pSrc, pSrcRect->format) >= ALPHA_THRESHOLD) {
+--- ./jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -55,7 +55,7 @@
+ (const AlternateSetTable *) ((char *) this + alternateSetTableOffset));
+ TTGlyphID alternate = SWAPW(alternateSetTable->alternateArray[0]);
+
+- if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, alternate))) {
++ if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, alternate), success)) {
+ glyphIterator->setCurrGlyphID(SWAPW(alternateSetTable->alternateArray[0]));
+ }
+
+--- ./jdk/src/share/native/sun/font/layout/AnchorTables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/AnchorTables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -37,55 +37,54 @@
+
+ U_NAMESPACE_BEGIN
+
+-void AnchorTable::getAnchor(LEGlyphID glyphID, const LEFontInstance *fontInstance,
+- LEPoint &anchor) const
++void AnchorTable::getAnchor(const LETableReference &base, LEGlyphID glyphID, const LEFontInstance *fontInstance,
++ LEPoint &anchor, LEErrorCode &success) const
+ {
+ switch(SWAPW(anchorFormat)) {
+ case 1:
+ {
+- const Format1AnchorTable *f1 = (const Format1AnchorTable *) this;
+-
+- f1->getAnchor(fontInstance, anchor);
++ LEReferenceTo<Format1AnchorTable> f1(base, success);
++ f1->getAnchor(f1, fontInstance, anchor, success);
+ break;
+ }
+
+ case 2:
+ {
+- const Format2AnchorTable *f2 = (const Format2AnchorTable *) this;
+-
+- f2->getAnchor(glyphID, fontInstance, anchor);
++ LEReferenceTo<Format2AnchorTable> f2(base, success);
++ f2->getAnchor(f2, glyphID, fontInstance, anchor, success);
+ break;
+ }
+
+ case 3:
+ {
+- const Format3AnchorTable *f3 = (const Format3AnchorTable *) this;
+-
+- f3->getAnchor(fontInstance, anchor);
++ LEReferenceTo<Format3AnchorTable> f3(base, success);
++ f3->getAnchor(f3, fontInstance, anchor, success);
+ break;
+ }
+
+ default:
++ {
+ // unknown format: just use x, y coordinate, like format 1...
+- const Format1AnchorTable *f1 = (const Format1AnchorTable *) this;
+-
+- f1->getAnchor(fontInstance, anchor);
++ LEReferenceTo<Format1AnchorTable> f1(base, success);
++ f1->getAnchor(f1, fontInstance, anchor, success);
+ break;
+ }
+ }
++}
+
+-void Format1AnchorTable::getAnchor(const LEFontInstance *fontInstance, LEPoint &anchor) const
++void Format1AnchorTable::getAnchor(const LEReferenceTo<Format1AnchorTable>& base, const LEFontInstance *fontInstance, LEPoint &anchor, LEErrorCode &success) const
+ {
+ le_int16 x = SWAPW(xCoordinate);
+ le_int16 y = SWAPW(yCoordinate);
+ LEPoint pixels;
+
+ fontInstance->transformFunits(x, y, pixels);
+-
+ fontInstance->pixelsToUnits(pixels, anchor);
+ }
+
+-void Format2AnchorTable::getAnchor(LEGlyphID glyphID, const LEFontInstance *fontInstance, LEPoint &anchor) const
++void Format2AnchorTable::getAnchor(const LEReferenceTo<Format2AnchorTable>& base,
++ LEGlyphID glyphID, const LEFontInstance *fontInstance, LEPoint &anchor
++ , LEErrorCode &success) const
+ {
+ LEPoint point;
+
+@@ -100,7 +99,8 @@
+ fontInstance->pixelsToUnits(point, anchor);
+ }
+
+-void Format3AnchorTable::getAnchor(const LEFontInstance *fontInstance, LEPoint &anchor) const
++void Format3AnchorTable::getAnchor(const LEReferenceTo<Format3AnchorTable> &base, const LEFontInstance *fontInstance,
++ LEPoint &anchor, LEErrorCode &success) const
+ {
+ le_int16 x = SWAPW(xCoordinate);
+ le_int16 y = SWAPW(yCoordinate);
+@@ -111,15 +111,15 @@
+ fontInstance->transformFunits(x, y, pixels);
+
+ if (dtxOffset != 0) {
+- const DeviceTable *dtx = (const DeviceTable *) ((char *) this + dtxOffset);
+- le_int16 adjx = dtx->getAdjustment((le_int16) fontInstance->getXPixelsPerEm());
++ LEReferenceTo<DeviceTable> dt(base, success, dtxOffset);
++ le_int16 adjx = dt->getAdjustment(dt, (le_int16) fontInstance->getXPixelsPerEm(), success);
+
+ pixels.fX += adjx;
+ }
+
+ if (dtyOffset != 0) {
+- const DeviceTable *dty = (const DeviceTable *) ((char *) this + dtyOffset);
+- le_int16 adjy = dty->getAdjustment((le_int16) fontInstance->getYPixelsPerEm());
++ LEReferenceTo<DeviceTable> dt(base, success, dtyOffset);
++ le_int16 adjy = dt->getAdjustment(dt, (le_int16) fontInstance->getYPixelsPerEm(), success);
+
+ pixels.fY += adjy;
+ }
+--- ./jdk/src/share/native/sun/font/layout/AnchorTables.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/AnchorTables.h Thu Dec 19 09:01:16 2013 -0800
+@@ -49,20 +49,23 @@
+ le_int16 xCoordinate;
+ le_int16 yCoordinate;
+
+- void getAnchor(LEGlyphID glyphID, const LEFontInstance *fontInstance,
+- LEPoint &anchor) const;
++ void getAnchor(const LETableReference &base, LEGlyphID glyphID, const LEFontInstance *fontInstance,
++ LEPoint &anchor, LEErrorCode &success) const;
+ };
+
+ struct Format1AnchorTable : AnchorTable
+ {
+- void getAnchor(const LEFontInstance *fontInstance, LEPoint &anchor) const;
++ void getAnchor(const LEReferenceTo<Format1AnchorTable>& base,
++ const LEFontInstance *fontInstance, LEPoint &anchor, LEErrorCode &success) const;
+ };
+
+ struct Format2AnchorTable : AnchorTable
+ {
+ le_uint16 anchorPoint;
+
+- void getAnchor(LEGlyphID glyphID, const LEFontInstance *fontInstance, LEPoint &anchor) const;
++ void getAnchor(const LEReferenceTo<Format2AnchorTable>& base,
++ LEGlyphID glyphID, const LEFontInstance *fontInstance,
++ LEPoint &anchor, LEErrorCode &success) const;
+ };
+
+ struct Format3AnchorTable : AnchorTable
+@@ -70,7 +73,9 @@
+ Offset xDeviceTableOffset;
+ Offset yDeviceTableOffset;
+
+- void getAnchor(const LEFontInstance *fontInstance, LEPoint &anchor) const;
++ void getAnchor(const LEReferenceTo<Format3AnchorTable>& base,
++ const LEFontInstance *fontInstance, LEPoint &anchor,
++ LEErrorCode &success) const;
+ };
+
+ U_NAMESPACE_END
+--- ./jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -51,7 +51,7 @@
+
+ U_NAMESPACE_BEGIN
+
+-le_bool CharSubstitutionFilter::accept(LEGlyphID glyph) const
++le_bool CharSubstitutionFilter::accept(LEGlyphID glyph, LEErrorCode &/*success*/) const
+ {
+ return fFontInstance->canDisplay((LEUnicode) glyph);
+ }
+@@ -147,7 +147,9 @@
+ GDEFMarkFilter filter(fGDEFTable, success);
+ adjustMarkGlyphs(glyphStorage, &filter, success);
+ } else {
+- LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(CanonShaping::glyphDefinitionTable, CanonShaping::glyphDefinitionTableLen);
++ LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(LETableReference::kStaticData,
++ CanonShaping::glyphDefinitionTable,
++ CanonShaping::glyphDefinitionTableLen);
+ GDEFMarkFilter filter(gdefTable, success);
+
+ adjustMarkGlyphs(&chars[offset], count, reverse, glyphStorage, &filter, success);
+@@ -157,8 +159,8 @@
+ UnicodeArabicOpenTypeLayoutEngine::UnicodeArabicOpenTypeLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, le_int32 typoFlags, LEErrorCode &success)
+ : ArabicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags | LE_CHAR_FILTER_FEATURE_FLAG, success)
+ {
+- fGSUBTable = (const GlyphSubstitutionTableHeader *) CanonShaping::glyphSubstitutionTable;
+- fGDEFTable = (const GlyphDefinitionTableHeader *) CanonShaping::glyphDefinitionTable;
++ fGSUBTable.setTo(LETableReference::kStaticData, (const GlyphSubstitutionTableHeader *) CanonShaping::glyphSubstitutionTable, CanonShaping::glyphSubstitutionTableLen);
++ fGDEFTable.setTo(LETableReference::kStaticData, (const GlyphDefinitionTableHeader *) CanonShaping::glyphDefinitionTable, CanonShaping::glyphDefinitionTableLen);
+ /* OpenTypeLayoutEngine will allocate a substitution filter */
+ }
+
+--- ./jdk/src/share/native/sun/font/layout/ArabicShaping.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ArabicShaping.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -59,7 +59,8 @@
+ ArabicShaping::ShapeType ArabicShaping::getShapeType(LEUnicode c)
+ {
+ LEErrorCode success = LE_NO_ERROR;
+- const LEReferenceTo<ClassDefinitionTable> joiningTypes((const ClassDefinitionTable *) ArabicShaping::shapingTypeTable,
++ const LEReferenceTo<ClassDefinitionTable> joiningTypes(LETableReference::kStaticData,
++ (const ClassDefinitionTable *) ArabicShaping::shapingTypeTable,
+ ArabicShaping::shapingTypeTableLen);
+ le_int32 joiningType = joiningTypes->getGlyphClass(joiningTypes, c, success);
+
+--- ./jdk/src/share/native/sun/font/layout/CanonShaping.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/CanonShaping.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -60,7 +60,7 @@
+ LEUnicode *outChars, LEGlyphStorage &glyphStorage)
+ {
+ LEErrorCode success = LE_NO_ERROR;
+- LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(CanonShaping::glyphDefinitionTable, CanonShaping::glyphDefinitionTableLen);
++ LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(LETableReference::kStaticData, CanonShaping::glyphDefinitionTable, CanonShaping::glyphDefinitionTableLen);
+ LEReferenceTo<ClassDefinitionTable> classTable = gdefTable->getMarkAttachClassDefinitionTable(gdefTable, success);
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/CharSubstitutionFilter.h Thu Dec 19 09:01:16 2013 -0800
+@@ -43,6 +43,8 @@
+ * This filter is used by character-based GSUB processors. It
+ * accepts only those characters which the given font can display.
+ *
++ * Note: Implementation is in ArabicLayoutEngine.cpp
++ *
+ * @internal
+ */
+ class CharSubstitutionFilter : public UMemory, public LEGlyphFilter
+@@ -97,7 +99,7 @@
+ *
+ * @internal
+ */
+- le_bool accept(LEGlyphID glyph) const;
++ le_bool accept(LEGlyphID glyph, LEErrorCode &success) const;
+ };
+
+ U_NAMESPACE_END
+--- ./jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h Thu Dec 19 09:01:16 2013 -0800
+@@ -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;
+
++#if LE_ENABLE_RAW
+ le_int32 getGlyphClass(LEGlyphID glyphID) const {
+ LETableReference base((const le_uint8*)this);
+ LEErrorCode ignored = LE_NO_ERROR;
+@@ -60,6 +61,7 @@
+ LEErrorCode ignored = LE_NO_ERROR;
+ return hasGlyphClass(base,glyphClass,ignored);
+ }
++#endif
+ };
+
+ struct ClassDefFormat1Table : ClassDefinitionTable
+--- ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -48,7 +48,7 @@
+ */
+ void ContextualSubstitutionBase::applySubstitutionLookups(
+ const LookupProcessor *lookupProcessor,
+- const SubstitutionLookupRecord *substLookupRecordArray,
++ const LEReferenceToArrayOf<SubstitutionLookupRecord>& substLookupRecordArray,
+ le_uint16 substCount,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+@@ -60,10 +60,11 @@
+ }
+
+ GlyphIterator tempIterator(*glyphIterator);
++ const SubstitutionLookupRecord *substLookupRecordArrayPtr = substLookupRecordArray.getAlias(); // OK to dereference, range checked against substCount below.
+
+ for (le_int16 subst = 0; subst < substCount && LE_SUCCESS(success); subst += 1) {
+- le_uint16 sequenceIndex = SWAPW(substLookupRecordArray[subst].sequenceIndex);
+- le_uint16 lookupListIndex = SWAPW(substLookupRecordArray[subst].lookupListIndex);
++ le_uint16 sequenceIndex = SWAPW(substLookupRecordArrayPtr[subst].sequenceIndex);
++ le_uint16 lookupListIndex = SWAPW(substLookupRecordArrayPtr[subst].lookupListIndex);
+
+ tempIterator.setCurrStreamPosition(position);
+ tempIterator.next(sequenceIndex);
+@@ -72,7 +73,7 @@
+ }
+ }
+
+-le_bool ContextualSubstitutionBase::matchGlyphIDs(const TTGlyphID *glyphArray, le_uint16 glyphCount,
++le_bool ContextualSubstitutionBase::matchGlyphIDs(const LEReferenceToArrayOf<TTGlyphID>& glyphArray, le_uint16 glyphCount,
+ GlyphIterator *glyphIterator, le_bool backtrack)
+ {
+ le_int32 direction = 1;
+@@ -101,9 +102,12 @@
+ return TRUE;
+ }
+
+-le_bool ContextualSubstitutionBase::matchGlyphClasses(const le_uint16 *classArray, le_uint16 glyphCount,
++le_bool ContextualSubstitutionBase::matchGlyphClasses(
++ const LEReferenceToArrayOf<le_uint16> &classArray,
++ le_uint16 glyphCount,
+ GlyphIterator *glyphIterator,
+- const ClassDefinitionTable *classDefinitionTable,
++ const LEReferenceTo<ClassDefinitionTable> &classDefinitionTable,
++ LEErrorCode &success,
+ le_bool backtrack)
+ {
+ le_int32 direction = 1;
+@@ -120,7 +124,7 @@
+ }
+
+ LEGlyphID glyph = glyphIterator->getCurrGlyphID();
+- le_int32 glyphClass = classDefinitionTable->getGlyphClass(glyph);
++ le_int32 glyphClass = classDefinitionTable->getGlyphClass(classDefinitionTable, glyph, success);
+ le_int32 matchClass = SWAPW(classArray[match]);
+
+ if (glyphClass != matchClass) {
+@@ -128,7 +132,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.
+- if (classDefinitionTable->hasGlyphClass(matchClass)) {
++ if (classDefinitionTable->hasGlyphClass(classDefinitionTable, matchClass, success)) {
+ return FALSE;
+ }
+ }
+@@ -140,8 +144,8 @@
+ return TRUE;
+ }
+
+-le_bool ContextualSubstitutionBase::matchGlyphCoverages(const Offset *coverageTableOffsetArray, le_uint16 glyphCount,
+- GlyphIterator *glyphIterator, const char *offsetBase, le_bool backtrack)
++le_bool ContextualSubstitutionBase::matchGlyphCoverages(const LEReferenceToArrayOf<Offset> &coverageTableOffsetArray, le_uint16 glyphCount,
++GlyphIterator *glyphIterator, const LETableReference &offsetBase, LEErrorCode &success, le_bool backtrack)
+ {
+ le_int32 direction = 1;
+ le_int32 glyph = 0;
+@@ -153,13 +157,15 @@
+
+ while (glyphCount > 0) {
+ Offset coverageTableOffset = SWAPW(coverageTableOffsetArray[glyph]);
+- const CoverageTable *coverageTable = (const CoverageTable *) (offsetBase + coverageTableOffset);
++ LEReferenceTo<CoverageTable> coverageTable(offsetBase, success, coverageTableOffset);
+
+- if (! glyphIterator->next()) {
++ if (LE_FAILURE(success) || ! glyphIterator->next()) {
+ return FALSE;
+ }
+
+- if (coverageTable->getGlyphCoverage((LEGlyphID) glyphIterator->getCurrGlyphID()) < 0) {
++ if (coverageTable->getGlyphCoverage(coverageTable,
++ (LEGlyphID) glyphIterator->getCurrGlyphID(),
++ success) < 0) {
+ return FALSE;
+ }
+
+@@ -170,7 +176,7 @@
+ return TRUE;
+ }
+
+-le_uint32 ContextualSubstitutionSubtable::process(const LookupProcessor *lookupProcessor,
++le_uint32 ContextualSubstitutionSubtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+ LEErrorCode& success) const
+@@ -186,20 +192,29 @@
+
+ case 1:
+ {
+- const ContextualSubstitutionFormat1Subtable *subtable = (const ContextualSubstitutionFormat1Subtable *) this;
+- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
++ LEReferenceTo<ContextualSubstitutionFormat1Subtable> subtable(base, success, (const ContextualSubstitutionFormat1Subtable *) this);
++ if( LE_FAILURE(success) ) {
++ return 0;
++ }
++ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
+ }
+
+ case 2:
+ {
+- const ContextualSubstitutionFormat2Subtable *subtable = (const ContextualSubstitutionFormat2Subtable *) this;
+- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
++ LEReferenceTo<ContextualSubstitutionFormat2Subtable> subtable(base, success, (const ContextualSubstitutionFormat2Subtable *) this);
++ if( LE_FAILURE(success) ) {
++ return 0;
++ }
++ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
+ }
+
+ case 3:
+ {
+- const ContextualSubstitutionFormat3Subtable *subtable = (const ContextualSubstitutionFormat3Subtable *) this;
+- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
++ LEReferenceTo<ContextualSubstitutionFormat3Subtable> subtable(base, success, (const ContextualSubstitutionFormat3Subtable *) this);
++ if( LE_FAILURE(success) ) {
++ return 0;
++ }
++ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
+ }
+
+ default:
+@@ -207,7 +222,7 @@
+ }
+ }
+
+-le_uint32 ContextualSubstitutionFormat1Subtable::process(const LookupProcessor *lookupProcessor,
++le_uint32 ContextualSubstitutionFormat1Subtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+ LEErrorCode& success) const
+@@ -227,22 +242,22 @@
+
+ if (coverageIndex < srSetCount) {
+ Offset subRuleSetTableOffset = SWAPW(subRuleSetTableOffsetArray[coverageIndex]);
+- const SubRuleSetTable *subRuleSetTable =
+- (const SubRuleSetTable *) ((char *) this + subRuleSetTableOffset);
++ LEReferenceTo<SubRuleSetTable>
++ subRuleSetTable(base, success, (const SubRuleSetTable *) ((char *) this + subRuleSetTableOffset));
+ le_uint16 subRuleCount = SWAPW(subRuleSetTable->subRuleCount);
+ le_int32 position = glyphIterator->getCurrStreamPosition();
+
+ for (le_uint16 subRule = 0; subRule < subRuleCount; subRule += 1) {
+ Offset subRuleTableOffset =
+ SWAPW(subRuleSetTable->subRuleTableOffsetArray[subRule]);
+- const SubRuleTable *subRuleTable =
+- (const SubRuleTable *) ((char *) subRuleSetTable + subRuleTableOffset);
++ LEReferenceTo<SubRuleTable>
++ subRuleTable(subRuleSetTable, success, subRuleTableOffset);
+ le_uint16 matchCount = SWAPW(subRuleTable->glyphCount) - 1;
+ le_uint16 substCount = SWAPW(subRuleTable->substCount);
+-
+- if (matchGlyphIDs(subRuleTable->inputGlyphArray, matchCount, glyphIterator)) {
+- const SubstitutionLookupRecord *substLookupRecordArray =
+- (const SubstitutionLookupRecord *) &subRuleTable->inputGlyphArray[matchCount];
++ LEReferenceToArrayOf<TTGlyphID> inputGlyphArray(base, success, subRuleTable->inputGlyphArray, matchCount+2);
++ 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 @@
+ return 0;
+ }
+
+-le_uint32 ContextualSubstitutionFormat2Subtable::process(const LookupProcessor *lookupProcessor,
++le_uint32 ContextualSubstitutionFormat2Subtable::process(const LETableReference &base,
++ const LookupProcessor *lookupProcessor,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+ LEErrorCode& success) const
+@@ -275,29 +291,33 @@
+ }
+
+ if (coverageIndex >= 0) {
+- const ClassDefinitionTable *classDefinitionTable =
+- (const ClassDefinitionTable *) ((char *) this + SWAPW(classDefTableOffset));
++ LEReferenceTo<ClassDefinitionTable> classDefinitionTable(base, success,
++ (const ClassDefinitionTable *) ((char *) this + SWAPW(classDefTableOffset)));
+ le_uint16 scSetCount = SWAPW(subClassSetCount);
+- le_int32 setClass = classDefinitionTable->getGlyphClass(glyphIterator->getCurrGlyphID());
++ le_int32 setClass = classDefinitionTable->getGlyphClass(classDefinitionTable,
++ glyphIterator->getCurrGlyphID(),
++ success);
+
+ if (setClass < scSetCount && subClassSetTableOffsetArray[setClass] != 0) {
+ Offset subClassSetTableOffset = SWAPW(subClassSetTableOffsetArray[setClass]);
+- const SubClassSetTable *subClassSetTable =
+- (const SubClassSetTable *) ((char *) this + subClassSetTableOffset);
++ LEReferenceTo<SubClassSetTable>
++ subClassSetTable(base, success, (const SubClassSetTable *) ((char *) this + subClassSetTableOffset));
+ le_uint16 subClassRuleCount = SWAPW(subClassSetTable->subClassRuleCount);
+ le_int32 position = glyphIterator->getCurrStreamPosition();
+
+ for (le_uint16 scRule = 0; scRule < subClassRuleCount; scRule += 1) {
+ Offset subClassRuleTableOffset =
+ SWAPW(subClassSetTable->subClassRuleTableOffsetArray[scRule]);
+- const SubClassRuleTable *subClassRuleTable =
+- (const SubClassRuleTable *) ((char *) subClassSetTable + subClassRuleTableOffset);
++ LEReferenceTo<SubClassRuleTable>
++ subClassRuleTable(subClassSetTable, success, subClassRuleTableOffset);
+ le_uint16 matchCount = SWAPW(subClassRuleTable->glyphCount) - 1;
+ le_uint16 substCount = SWAPW(subClassRuleTable->substCount);
+
+- if (matchGlyphClasses(subClassRuleTable->classArray, matchCount, glyphIterator, classDefinitionTable)) {
+- const SubstitutionLookupRecord *substLookupRecordArray =
+- (const SubstitutionLookupRecord *) &subClassRuleTable->classArray[matchCount];
++ LEReferenceToArrayOf<le_uint16> classArray(base, success, subClassRuleTable->classArray, matchCount+1);
++
++ 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 @@
+ return 0;
+ }
+
+-le_uint32 ContextualSubstitutionFormat3Subtable::process(const LookupProcessor *lookupProcessor,
++le_uint32 ContextualSubstitutionFormat3Subtable::process(const LETableReference &base,
++ const LookupProcessor *lookupProcessor,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+ LEErrorCode& success)const
+@@ -333,9 +354,13 @@
+ // that matched when we're done.
+ glyphIterator->prev();
+
+- if (ContextualSubstitutionBase::matchGlyphCoverages(coverageTableOffsetArray, gCount, glyphIterator, (const char *) this)) {
+- const SubstitutionLookupRecord *substLookupRecordArray =
+- (const SubstitutionLookupRecord *) &coverageTableOffsetArray[gCount];
++ LEReferenceToArrayOf<Offset> covTableOffsetArray(base, success, coverageTableOffsetArray, gCount);
++
++ if( LE_FAILURE(success) ) { return 0; }
++
++ if (ContextualSubstitutionBase::matchGlyphCoverages(covTableOffsetArray, gCount, glyphIterator, base, success)) {
++ LEReferenceToArrayOf<SubstitutionLookupRecord>
++ substLookupRecordArray(base, success, (const SubstitutionLookupRecord *) &coverageTableOffsetArray[gCount], subCount);
+
+ ContextualSubstitutionBase::applySubstitutionLookups(lookupProcessor, substLookupRecordArray, subCount, glyphIterator, fontInstance, position, success);
+
+@@ -347,7 +372,8 @@
+ return 0;
+ }
+
+-le_uint32 ChainingContextualSubstitutionSubtable::process(const LookupProcessor *lookupProcessor,
++le_uint32 ChainingContextualSubstitutionSubtable::process(const LEReferenceTo<ChainingContextualSubstitutionSubtable> &base,
++ const LookupProcessor *lookupProcessor,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+ LEErrorCode& success) const
+@@ -363,20 +389,23 @@
+
+ case 1:
+ {
+- const ChainingContextualSubstitutionFormat1Subtable *subtable = (const ChainingContextualSubstitutionFormat1Subtable *) this;
+- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
++ LEReferenceTo<ChainingContextualSubstitutionFormat1Subtable> subtable(base, success, (ChainingContextualSubstitutionFormat1Subtable *) this);
++ if(LE_FAILURE(success)) return 0;
++ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
+ }
+
+ case 2:
+ {
+- const ChainingContextualSubstitutionFormat2Subtable *subtable = (const ChainingContextualSubstitutionFormat2Subtable *) this;
+- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
++ LEReferenceTo<ChainingContextualSubstitutionFormat2Subtable> subtable(base, success, (const ChainingContextualSubstitutionFormat2Subtable *) this);
++ if( LE_FAILURE(success) ) { return 0; }
++ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
+ }
+
+ case 3:
+ {
+- const ChainingContextualSubstitutionFormat3Subtable *subtable = (const ChainingContextualSubstitutionFormat3Subtable *) this;
+- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
++ LEReferenceTo<ChainingContextualSubstitutionFormat3Subtable> subtable(base, success, (const ChainingContextualSubstitutionFormat3Subtable *) this);
++ if( LE_FAILURE(success) ) { return 0; }
++ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
+ }
+
+ default:
+@@ -390,7 +419,7 @@
+ // emptyFeatureList matches an le_uint32 or an le_uint16...
+ static const FeatureMask emptyFeatureList = 0x00000000UL;
+
+-le_uint32 ChainingContextualSubstitutionFormat1Subtable::process(const LookupProcessor *lookupProcessor,
++le_uint32 ChainingContextualSubstitutionFormat1Subtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+ LEErrorCode& success) const
+@@ -410,8 +439,8 @@
+
+ if (coverageIndex < srSetCount) {
+ Offset chainSubRuleSetTableOffset = SWAPW(chainSubRuleSetTableOffsetArray[coverageIndex]);
+- const ChainSubRuleSetTable *chainSubRuleSetTable =
+- (const ChainSubRuleSetTable *) ((char *) this + chainSubRuleSetTableOffset);
++ LEReferenceTo<ChainSubRuleSetTable>
++ chainSubRuleSetTable(base, success, (const ChainSubRuleSetTable *) ((char *) this + chainSubRuleSetTableOffset));
+ le_uint16 chainSubRuleCount = SWAPW(chainSubRuleSetTable->chainSubRuleCount);
+ le_int32 position = glyphIterator->getCurrStreamPosition();
+ GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
+@@ -419,13 +448,19 @@
+ for (le_uint16 subRule = 0; subRule < chainSubRuleCount; subRule += 1) {
+ Offset chainSubRuleTableOffset =
+ SWAPW(chainSubRuleSetTable->chainSubRuleTableOffsetArray[subRule]);
+- const ChainSubRuleTable *chainSubRuleTable =
+- (const ChainSubRuleTable *) ((char *) chainSubRuleSetTable + chainSubRuleTableOffset);
++ LEReferenceTo<ChainSubRuleTable>
++ chainSubRuleTable = LEReferenceTo<ChainSubRuleTable>(chainSubRuleSetTable, success, chainSubRuleTableOffset);
++ if( LE_FAILURE(success) ) { return 0; }
+ le_uint16 backtrackGlyphCount = SWAPW(chainSubRuleTable->backtrackGlyphCount);
++ LEReferenceToArrayOf<TTGlyphID> backtrackGlyphArray(base, success, chainSubRuleTable->backtrackGlyphArray, backtrackGlyphCount);
++ if( LE_FAILURE(success) ) { return 0; }
+ le_uint16 inputGlyphCount = (le_uint16) SWAPW(chainSubRuleTable->backtrackGlyphArray[backtrackGlyphCount]) - 1;
+- const TTGlyphID *inputGlyphArray = &chainSubRuleTable->backtrackGlyphArray[backtrackGlyphCount + 1];
++ LEReferenceToArrayOf<TTGlyphID> inputGlyphArray(base, success, &chainSubRuleTable->backtrackGlyphArray[backtrackGlyphCount + 1], inputGlyphCount+2);
++
++ if( LE_FAILURE(success) ) { return 0; }
+ le_uint16 lookaheadGlyphCount = (le_uint16) SWAPW(inputGlyphArray[inputGlyphCount]);
+- const TTGlyphID *lookaheadGlyphArray = &inputGlyphArray[inputGlyphCount + 1];
++ LEReferenceToArrayOf<TTGlyphID> lookaheadGlyphArray(base, success, inputGlyphArray.getAlias(inputGlyphCount + 1,success), lookaheadGlyphCount+2);
++ if( LE_FAILURE(success) ) { return 0; }
+ le_uint16 substCount = (le_uint16) SWAPW(lookaheadGlyphArray[lookaheadGlyphCount]);
+
+ tempIterator.setCurrStreamPosition(position);
+@@ -435,7 +470,8 @@
+ }
+
+ tempIterator.prev();
+- if (! matchGlyphIDs(chainSubRuleTable->backtrackGlyphArray, backtrackGlyphCount, &tempIterator, TRUE)) {
++
++ if (! matchGlyphIDs(backtrackGlyphArray, backtrackGlyphCount, &tempIterator, TRUE)) {
+ continue;
+ }
+
+@@ -446,8 +482,8 @@
+ }
+
+ if (matchGlyphIDs(inputGlyphArray, inputGlyphCount, glyphIterator)) {
+- const SubstitutionLookupRecord *substLookupRecordArray =
+- (const SubstitutionLookupRecord *) &lookaheadGlyphArray[lookaheadGlyphCount + 1];
++ LEReferenceToArrayOf<SubstitutionLookupRecord>
++ substLookupRecordArray(base, success, (const SubstitutionLookupRecord *) lookaheadGlyphArray.getAlias(lookaheadGlyphCount + 1,success), substCount);
+
+ applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success);
+
+@@ -464,7 +500,7 @@
+ return 0;
+ }
+
+-le_uint32 ChainingContextualSubstitutionFormat2Subtable::process(const LookupProcessor *lookupProcessor,
++le_uint32 ChainingContextualSubstitutionFormat2Subtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+ LEErrorCode& success) const
+@@ -480,19 +516,21 @@
+ }
+
+ if (coverageIndex >= 0) {
+- const ClassDefinitionTable *backtrackClassDefinitionTable =
+- (const ClassDefinitionTable *) ((char *) this + SWAPW(backtrackClassDefTableOffset));
+- const ClassDefinitionTable *inputClassDefinitionTable =
+- (const ClassDefinitionTable *) ((char *) this + SWAPW(inputClassDefTableOffset));
+- const ClassDefinitionTable *lookaheadClassDefinitionTable =
+- (const ClassDefinitionTable *) ((char *) this + SWAPW(lookaheadClassDefTableOffset));
++ LEReferenceTo<ClassDefinitionTable>
++ backtrackClassDefinitionTable(base, success, (const ClassDefinitionTable *) ((char *) this + SWAPW(backtrackClassDefTableOffset)));
++ LEReferenceTo<ClassDefinitionTable>
++ inputClassDefinitionTable(base, success, (const ClassDefinitionTable *) ((char *) this + SWAPW(inputClassDefTableOffset)));
++ LEReferenceTo<ClassDefinitionTable>
++ lookaheadClassDefinitionTable(base, success, (const ClassDefinitionTable *) ((char *) this + SWAPW(lookaheadClassDefTableOffset)));
+ le_uint16 scSetCount = SWAPW(chainSubClassSetCount);
+- le_int32 setClass = inputClassDefinitionTable->getGlyphClass(glyphIterator->getCurrGlyphID());
++ le_int32 setClass = inputClassDefinitionTable->getGlyphClass(inputClassDefinitionTable,
++ glyphIterator->getCurrGlyphID(),
++ success);
+
+ if (setClass < scSetCount && chainSubClassSetTableOffsetArray[setClass] != 0) {
+ Offset chainSubClassSetTableOffset = SWAPW(chainSubClassSetTableOffsetArray[setClass]);
+- const ChainSubClassSetTable *chainSubClassSetTable =
+- (const ChainSubClassSetTable *) ((char *) this + chainSubClassSetTableOffset);
++ LEReferenceTo<ChainSubClassSetTable>
++ chainSubClassSetTable(base, success, (const ChainSubClassSetTable *) ((char *) this + chainSubClassSetTableOffset));
+ le_uint16 chainSubClassRuleCount = SWAPW(chainSubClassSetTable->chainSubClassRuleCount);
+ le_int32 position = glyphIterator->getCurrStreamPosition();
+ GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
+@@ -500,13 +538,15 @@
+ for (le_uint16 scRule = 0; scRule < chainSubClassRuleCount; scRule += 1) {
+ Offset chainSubClassRuleTableOffset =
+ SWAPW(chainSubClassSetTable->chainSubClassRuleTableOffsetArray[scRule]);
+- const ChainSubClassRuleTable *chainSubClassRuleTable =
+- (const ChainSubClassRuleTable *) ((char *) chainSubClassSetTable + chainSubClassRuleTableOffset);
++ LEReferenceTo<ChainSubClassRuleTable>
++ chainSubClassRuleTable(chainSubClassSetTable, success, chainSubClassRuleTableOffset);
+ le_uint16 backtrackGlyphCount = SWAPW(chainSubClassRuleTable->backtrackGlyphCount);
+ le_uint16 inputGlyphCount = SWAPW(chainSubClassRuleTable->backtrackClassArray[backtrackGlyphCount]) - 1;
+- const le_uint16 *inputClassArray = &chainSubClassRuleTable->backtrackClassArray[backtrackGlyphCount + 1];
+- le_uint16 lookaheadGlyphCount = SWAPW(inputClassArray[inputGlyphCount]);
+- const le_uint16 *lookaheadClassArray = &inputClassArray[inputGlyphCount + 1];
++ LEReferenceToArrayOf<le_uint16> inputClassArray(base, success, &chainSubClassRuleTable->backtrackClassArray[backtrackGlyphCount + 1],inputGlyphCount+2); // +2 for the lookaheadGlyphCount count
++ le_uint16 lookaheadGlyphCount = SWAPW(inputClassArray.getObject(inputGlyphCount, success));
++ LEReferenceToArrayOf<le_uint16> lookaheadClassArray(base, success, inputClassArray.getAlias(inputGlyphCount + 1,success), lookaheadGlyphCount+2); // +2 for the substCount
++
++ if( LE_FAILURE(success) ) { return 0; }
+ le_uint16 substCount = SWAPW(lookaheadClassArray[lookaheadGlyphCount]);
+
+
+@@ -517,20 +557,22 @@
+ }
+
+ tempIterator.prev();
+- if (! matchGlyphClasses(chainSubClassRuleTable->backtrackClassArray, backtrackGlyphCount,
+- &tempIterator, backtrackClassDefinitionTable, TRUE)) {
++ LEReferenceToArrayOf<le_uint16> backtrackClassArray(base, success, chainSubClassRuleTable->backtrackClassArray, backtrackGlyphCount);
++ if( LE_FAILURE(success) ) { return 0; }
++ if (! matchGlyphClasses(backtrackClassArray, backtrackGlyphCount,
++ &tempIterator, backtrackClassDefinitionTable, success, TRUE)) {
+ continue;
+ }
+
+ tempIterator.setCurrStreamPosition(position);
+ tempIterator.next(inputGlyphCount);
+- if (! matchGlyphClasses(lookaheadClassArray, lookaheadGlyphCount, &tempIterator, lookaheadClassDefinitionTable)) {
++ if (! matchGlyphClasses(lookaheadClassArray, lookaheadGlyphCount, &tempIterator, lookaheadClassDefinitionTable, success)) {
+ continue;
+ }
+
+- 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);
+
+ applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success);
+
+@@ -547,7 +589,7 @@
+ return 0;
+ }
+
+-le_uint32 ChainingContextualSubstitutionFormat3Subtable::process(const LookupProcessor *lookupProcessor,
++le_uint32 ChainingContextualSubstitutionFormat3Subtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+ LEErrorCode & success) const
+@@ -558,9 +600,13 @@
+
+ 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
+ const le_uint16 lookaheadGlyphCount = (le_uint16) SWAPW(inputCoverageTableOffsetArray[inputGlyphCount]);
+- const Offset *lookaheadCoverageTableOffsetArray = &inputCoverageTableOffsetArray[inputGlyphCount + 1];
++
++ if( LE_FAILURE(success) ) { return 0; }
++ LEReferenceToArrayOf<Offset> lookaheadCoverageTableOffsetArray(base, success, inputCoverageTableOffsetArray.getAlias(inputGlyphCount + 1, success), lookaheadGlyphCount+2);
++
++ if( LE_FAILURE(success) ) { return 0; }
+ le_uint16 substCount = (le_uint16) SWAPW(lookaheadCoverageTableOffsetArray[lookaheadGlyphCount]);
+ le_int32 position = glyphIterator->getCurrStreamPosition();
+ GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
+@@ -571,14 +617,14 @@
+
+ tempIterator.prev();
+ if (! ContextualSubstitutionBase::matchGlyphCoverages(backtrackCoverageTableOffsetArray,
+- backtrkGlyphCount, &tempIterator, (const char *) this, TRUE)) {
++ backtrkGlyphCount, &tempIterator, base, success, TRUE)) {
+ return 0;
+ }
+
+ tempIterator.setCurrStreamPosition(position);
+ tempIterator.next(inputGlyphCount - 1);
+ if (! ContextualSubstitutionBase::matchGlyphCoverages(lookaheadCoverageTableOffsetArray,
+- lookaheadGlyphCount, &tempIterator, (const char *) this)) {
++ lookaheadGlyphCount, &tempIterator, base, success)) {
+ return 0;
+ }
+
+@@ -589,9 +635,10 @@
+ glyphIterator->prev();
+
+ if (ContextualSubstitutionBase::matchGlyphCoverages(inputCoverageTableOffsetArray,
+- inputGlyphCount, glyphIterator, (const char *) this)) {
+- const SubstitutionLookupRecord *substLookupRecordArray =
+- (const SubstitutionLookupRecord *) &lookaheadCoverageTableOffsetArray[lookaheadGlyphCount + 1];
++ inputGlyphCount, glyphIterator, base, success)) {
++ LEReferenceToArrayOf<SubstitutionLookupRecord>
++ substLookupRecordArray(base, success,
++ (const SubstitutionLookupRecord *) lookaheadCoverageTableOffsetArray.getAlias(lookaheadGlyphCount + 1,success), substCount);
+
+ ContextualSubstitutionBase::applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success);
+
+--- ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h Thu Dec 19 09:01:16 2013 -0800
+@@ -56,20 +56,32 @@
+ struct ContextualSubstitutionBase : GlyphSubstitutionSubtable
+ {
+ static le_bool matchGlyphIDs(
+- const TTGlyphID *glyphArray, le_uint16 glyphCount, GlyphIterator *glyphIterator,
++ const LEReferenceToArrayOf<TTGlyphID> &glyphArray, le_uint16 glyphCount, GlyphIterator *glyphIterator,
+ le_bool backtrack = FALSE);
+
+ static le_bool matchGlyphClasses(
+- const le_uint16 *classArray, le_uint16 glyphCount, GlyphIterator *glyphIterator,
+- const ClassDefinitionTable *classDefinitionTable, le_bool backtrack = FALSE);
++ const LEReferenceToArrayOf<le_uint16> &classArray, le_uint16 glyphCount, GlyphIterator *glyphIterator,
++ const LEReferenceTo<ClassDefinitionTable> &classDefinitionTable, LEErrorCode &success, le_bool backtrack = FALSE);
+
+ static le_bool matchGlyphCoverages(
++ const LEReferenceToArrayOf<Offset> &coverageTableOffsetArray, le_uint16 glyphCount,
++ GlyphIterator *glyphIterator, const LETableReference& offsetBase, LEErrorCode &success, le_bool backtrack = FALSE);
++
++ /**
++ * little shim to wrap the Offset array in range checking
++ * @private
++ */
++ static le_bool matchGlyphCoverages(
+ const Offset *coverageTableOffsetArray, le_uint16 glyphCount,
+- GlyphIterator *glyphIterator, const char *offsetBase, le_bool backtrack = FALSE);
++ GlyphIterator *glyphIterator, const LETableReference& offsetBase, LEErrorCode &success, le_bool backtrack = FALSE) {
++ LEReferenceToArrayOf<Offset> ref(offsetBase, success, coverageTableOffsetArray, glyphCount);
++ if( LE_FAILURE(success) ) { return FALSE; }
++ return matchGlyphCoverages(ref, glyphCount, glyphIterator, offsetBase, success, backtrack);
++ }
+
+ static void applySubstitutionLookups(
+ const LookupProcessor *lookupProcessor,
+- const SubstitutionLookupRecord *substLookupRecordArray,
++ const LEReferenceToArrayOf<SubstitutionLookupRecord>& substLookupRecordArray,
+ le_uint16 substCount,
+ GlyphIterator *glyphIterator,
+ const LEFontInstance *fontInstance,
+@@ -79,7 +91,8 @@
+
+ struct ContextualSubstitutionSubtable : ContextualSubstitutionBase
+ {
+- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
++ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor,
++ GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
+ };
+
+ struct ContextualSubstitutionFormat1Subtable : ContextualSubstitutionSubtable
+@@ -87,7 +100,8 @@
+ le_uint16 subRuleSetCount;
+ Offset subRuleSetTableOffsetArray[ANY_NUMBER];
+
+- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
++ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
++ const LEFontInstance *fontInstance, LEErrorCode& success) const;
+ };
+ LE_VAR_ARRAY(ContextualSubstitutionFormat1Subtable, subRuleSetTableOffsetArray)
+
+@@ -116,7 +130,7 @@
+ le_uint16 subClassSetCount;
+ Offset subClassSetTableOffsetArray[ANY_NUMBER];
+
+- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
++ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
+ };
+ LE_VAR_ARRAY(ContextualSubstitutionFormat2Subtable, subClassSetTableOffsetArray)
+
+@@ -152,13 +166,15 @@
+ Offset coverageTableOffsetArray[ANY_NUMBER];
+ //SubstitutionLookupRecord substLookupRecord[ANY_NUMBER];
+
+- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
++ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
++ const LEFontInstance *fontInstance, LEErrorCode& success) const;
+ };
+ LE_VAR_ARRAY(ContextualSubstitutionFormat3Subtable, coverageTableOffsetArray)
+
+ struct ChainingContextualSubstitutionSubtable : ContextualSubstitutionBase
+ {
+- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
++ le_uint32 process(const LEReferenceTo<ChainingContextualSubstitutionSubtable> &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
++ const LEFontInstance *fontInstance, LEErrorCode& success) const;
+ };
+
+ struct ChainingContextualSubstitutionFormat1Subtable : ChainingContextualSubstitutionSubtable
+@@ -166,7 +182,8 @@
+ le_uint16 chainSubRuleSetCount;
+ Offset chainSubRuleSetTableOffsetArray[ANY_NUMBER];
+
+- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
++ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
++ const LEFontInstance *fontInstance, LEErrorCode& success) const;
+ };
+ LE_VAR_ARRAY(ChainingContextualSubstitutionFormat1Subtable, chainSubRuleSetTableOffsetArray)
+
+@@ -201,7 +218,8 @@
+ le_uint16 chainSubClassSetCount;
+ Offset chainSubClassSetTableOffsetArray[ANY_NUMBER];
+
+- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
++ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
++ const LEFontInstance *fontInstance, LEErrorCode& success) const;
+ };
+ LE_VAR_ARRAY(ChainingContextualSubstitutionFormat2Subtable, chainSubClassSetTableOffsetArray)
+
+@@ -243,7 +261,8 @@
+ //le_uint16 substCount;
+ //SubstitutionLookupRecord substLookupRecord[ANY_NUMBER];
+
+- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
++ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor,
++ GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
+ };
+ LE_VAR_ARRAY(ChainingContextualSubstitutionFormat3Subtable, backtrackCoverageTableOffsetArray)
+
+--- ./jdk/src/share/native/sun/font/layout/CoverageTables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/CoverageTables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -37,8 +37,10 @@
+
+ U_NAMESPACE_BEGIN
+
+-le_int32 CoverageTable::getGlyphCoverage(LEGlyphID glyphID) const
++le_int32 CoverageTable::getGlyphCoverage(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const
+ {
++ if(LE_FAILURE(success)) return -1;
++
+ switch(SWAPW(coverageFormat))
+ {
+ case 0:
+@@ -46,16 +48,16 @@
+
+ case 1:
+ {
+- const CoverageFormat1Table *f1Table = (const CoverageFormat1Table *) this;
++ LEReferenceTo<CoverageFormat1Table> f1Table(base, success);
+
+- return f1Table->getGlyphCoverage(glyphID);
++ return f1Table->getGlyphCoverage(f1Table, glyphID, success);
+ }
+
+ case 2:
+ {
+- const CoverageFormat2Table *f2Table = (const CoverageFormat2Table *) this;
++ LEReferenceTo<CoverageFormat2Table> f2Table(base, success);
+
+- return f2Table->getGlyphCoverage(glyphID);
++ return f2Table->getGlyphCoverage(f2Table, glyphID, success);
+ }
+
+ default:
+@@ -63,8 +65,10 @@
+ }
+ }
+
+-le_int32 CoverageFormat1Table::getGlyphCoverage(LEGlyphID glyphID) const
++le_int32 CoverageFormat1Table::getGlyphCoverage(LEReferenceTo<CoverageFormat1Table> &base, LEGlyphID glyphID, LEErrorCode &success) const
+ {
++ if(LE_FAILURE(success)) return -1;
++
+ TTGlyphID ttGlyphID = (TTGlyphID) LE_GET_GLYPH(glyphID);
+ le_uint16 count = SWAPW(glyphCount);
+ le_uint8 bit = OpenTypeUtilities::highBit(count);
+@@ -77,6 +81,10 @@
+ return -1;
+ }
+
++ LEReferenceToArrayOf<TTGlyphID>(base, success, glyphArray, count);
++ if(LE_FAILURE(success)) return -1; // range checks array
++
++
+ if (SWAPW(glyphArray[extra]) <= ttGlyphID) {
+ index = extra;
+ }
+@@ -96,14 +104,18 @@
+ return -1;
+ }
+
+-le_int32 CoverageFormat2Table::getGlyphCoverage(LEGlyphID glyphID) const
++le_int32 CoverageFormat2Table::getGlyphCoverage(LEReferenceTo<CoverageFormat2Table> &base, LEGlyphID glyphID, LEErrorCode &success) const
+ {
++ if(LE_FAILURE(success)) return -1;
++
+ TTGlyphID ttGlyphID = (TTGlyphID) LE_GET_GLYPH(glyphID);
+ le_uint16 count = SWAPW(rangeCount);
++
++ LEReferenceToArrayOf<GlyphRangeRecord> rangeRecordArrayRef(base, success, rangeRecordArray, count);
+ le_int32 rangeIndex =
+- OpenTypeUtilities::getGlyphRangeIndex(ttGlyphID, rangeRecordArray, count);
++ OpenTypeUtilities::getGlyphRangeIndex(ttGlyphID, rangeRecordArrayRef, success);
+
+- if (rangeIndex < 0) {
++ if (rangeIndex < 0 || LE_FAILURE(success)) { // could fail if array out of bounds
+ return -1;
+ }
+
+--- ./jdk/src/share/native/sun/font/layout/CoverageTables.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/CoverageTables.h Thu Dec 19 09:01:16 2013 -0800
+@@ -46,7 +46,7 @@
+ {
+ le_uint16 coverageFormat;
+
+- le_int32 getGlyphCoverage(LEGlyphID glyphID) const;
++ le_int32 getGlyphCoverage(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const;
+ };
+
+ struct CoverageFormat1Table : CoverageTable
+@@ -54,7 +54,7 @@
+ le_uint16 glyphCount;
+ TTGlyphID glyphArray[ANY_NUMBER];
+
+- le_int32 getGlyphCoverage(LEGlyphID glyphID) const;
++ le_int32 getGlyphCoverage(LEReferenceTo<CoverageFormat1Table> &base, LEGlyphID glyphID, LEErrorCode &success) const;
+ };
+ LE_VAR_ARRAY(CoverageFormat1Table, glyphArray)
+
+@@ -64,7 +64,7 @@
+ le_uint16 rangeCount;
+ GlyphRangeRecord rangeRecordArray[ANY_NUMBER];
+
+- le_int32 getGlyphCoverage(LEGlyphID glyphID) const;
++ le_int32 getGlyphCoverage(LEReferenceTo<CoverageFormat2Table> &base, LEGlyphID glyphID, LEErrorCode &success) const;
+ };
+ LE_VAR_ARRAY(CoverageFormat2Table, rangeRecordArray)
+
+--- ./jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -51,23 +51,27 @@
+ }
+
+ LEPoint entryAnchor, exitAnchor;
+- Offset entryOffset = SWAPW(entryExitRecords[coverageIndex].entryAnchor); // TODO
++ Offset entryOffset = SWAPW(entryExitRecords[coverageIndex].entryAnchor);
+ Offset exitOffset = SWAPW(entryExitRecords[coverageIndex].exitAnchor);
+
+ if (entryOffset != 0) {
+- const AnchorTable *entryAnchorTable = (const AnchorTable *) ((char *) this + entryOffset);
++ LEReferenceTo<AnchorTable> entryAnchorTable(base, success, entryOffset);
+
+- entryAnchorTable->getAnchor(glyphID, fontInstance, entryAnchor);
++ if( LE_SUCCESS(success) ) {
++ entryAnchorTable->getAnchor(entryAnchorTable, glyphID, fontInstance, entryAnchor, success);
+ glyphIterator->setCursiveEntryPoint(entryAnchor);
++ }
+ } else {
+ //glyphIterator->clearCursiveEntryPoint();
+ }
+
+ if (exitOffset != 0) {
+- const AnchorTable *exitAnchorTable = (const AnchorTable *) ((char *) this + exitOffset);
++ LEReferenceTo<AnchorTable> exitAnchorTable(base, success, exitOffset);
+
+- exitAnchorTable->getAnchor(glyphID, fontInstance, exitAnchor);
++ if( LE_SUCCESS(success) ) {
++ exitAnchorTable->getAnchor(exitAnchorTable, glyphID, fontInstance, exitAnchor, success);
+ glyphIterator->setCursiveExitPoint(exitAnchor);
++ }
+ } else {
+ //glyphIterator->clearCursiveExitPoint();
+ }
+--- ./jdk/src/share/native/sun/font/layout/DeviceTables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/DeviceTables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -43,7 +43,7 @@
+
+ #define FORMAT_COUNT LE_ARRAY_SIZE(fieldBits)
+
+-le_int16 DeviceTable::getAdjustment(le_uint16 ppem) const
++le_int16 DeviceTable::getAdjustment(const LEReferenceTo<DeviceTable>&base, le_uint16 ppem, LEErrorCode &success) const
+ {
+ le_uint16 start = SWAPW(startSize);
+ le_uint16 format = SWAPW(deltaFormat) - 1;
+@@ -53,6 +53,13 @@
+ le_uint16 sizeIndex = ppem - start;
+ le_uint16 bits = fieldBits[format];
+ le_uint16 count = 16 / bits;
++
++ LEReferenceToArrayOf<le_uint16> deltaValuesRef(base, success, deltaValues, (sizeIndex / count));
++
++ if(LE_FAILURE(success)) {
++ return result;
++ }
++
+ le_uint16 word = SWAPW(deltaValues[sizeIndex / count]);
+ le_uint16 fieldIndex = sizeIndex % count;
+ le_uint16 shift = 16 - (bits * (fieldIndex + 1));
+--- ./jdk/src/share/native/sun/font/layout/DeviceTables.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/DeviceTables.h Thu Dec 19 09:01:16 2013 -0800
+@@ -50,7 +50,7 @@
+ le_uint16 deltaFormat;
+ le_uint16 deltaValues[ANY_NUMBER];
+
+- le_int16 getAdjustment(le_uint16 ppem) const;
++ le_int16 getAdjustment(const LEReferenceTo<DeviceTable> &base, le_uint16 ppem, LEErrorCode &success) const;
+
+ private:
+ static const le_uint16 fieldMasks[];
+--- ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -48,7 +48,6 @@
+ const LookupProcessor *lookupProcessor, le_uint16 lookupType,
+ GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const
+ {
+-
+ if (LE_FAILURE(success)) {
+ return 0;
+ }
+--- ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.h Thu Dec 19 09:01:16 2013 -0800
+@@ -52,8 +52,7 @@
+ le_uint16 extensionLookupType;
+ le_uint32 extensionOffset;
+
+- le_uint32 process(const LEReferenceTo<ExtensionSubtable> &extRef,
+- const LookupProcessor *lookupProcessor, le_uint16 lookupType,
++ le_uint32 process(const LEReferenceTo<ExtensionSubtable> &base, const LookupProcessor *lookupProcessor, le_uint16 lookupType,
+ GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
+ };
+
+--- ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -49,9 +49,9 @@
+ // nothing to do?
+ }
+
+-le_bool GDEFMarkFilter::accept(LEGlyphID glyph) const
++le_bool GDEFMarkFilter::accept(LEGlyphID glyph, LEErrorCode &success) const
+ {
+- le_int32 glyphClass = classDefTable->getGlyphClass(glyph);
++ le_int32 glyphClass = classDefTable->getGlyphClass(classDefTable, glyph, success);
+
+ return glyphClass == gcdMarkGlyph;
+ }
+--- ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h Thu Dec 19 09:01:16 2013 -0800
+@@ -55,7 +55,7 @@
+ GDEFMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success);
+ virtual ~GDEFMarkFilter();
+
+- virtual le_bool accept(LEGlyphID glyph) const;
++ virtual le_bool accept(LEGlyphID glyph, LEErrorCode &success) const;
+ };
+
+ U_NAMESPACE_END
+--- ./jdk/src/share/native/sun/font/layout/GlyphIterator.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/GlyphIterator.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -41,14 +41,13 @@
+ U_NAMESPACE_BEGIN
+
+ GlyphIterator::GlyphIterator(LEGlyphStorage &theGlyphStorage, GlyphPositionAdjustments *theGlyphPositionAdjustments, le_bool rightToLeft, le_uint16 theLookupFlags,
+- FeatureMask theFeatureMask, const LEReferenceTo<GlyphDefinitionTableHeader> &theGlyphDefinitionTableHeader)
++ FeatureMask theFeatureMask, const LEReferenceTo<GlyphDefinitionTableHeader> &theGlyphDefinitionTableHeader, LEErrorCode &success)
+ : direction(1), position(-1), nextLimit(-1), prevLimit(-1),
+ glyphStorage(theGlyphStorage), glyphPositionAdjustments(theGlyphPositionAdjustments),
+ srcIndex(-1), destIndex(-1), lookupFlags(theLookupFlags), featureMask(theFeatureMask), glyphGroup(0),
+ glyphClassDefinitionTable(), markAttachClassDefinitionTable()
+
+ {
+- LEErrorCode success = LE_NO_ERROR; // TODO
+ le_int32 glyphCount = glyphStorage.getGlyphCount();
+
+ if (theGlyphDefinitionTableHeader.isValid()) {
+--- ./jdk/src/share/native/sun/font/layout/GlyphIterator.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/GlyphIterator.h Thu Dec 19 09:01:16 2013 -0800
+@@ -49,7 +49,7 @@
+ class GlyphIterator : public UMemory {
+ public:
+ GlyphIterator(LEGlyphStorage &theGlyphStorage, GlyphPositionAdjustments *theGlyphPositionAdjustments, le_bool rightToLeft, le_uint16 theLookupFlags,
+- FeatureMask theFeatureMask, const LEReferenceTo<GlyphDefinitionTableHeader> &theGlyphDefinitionTableHeader);
++ FeatureMask theFeatureMask, const LEReferenceTo<GlyphDefinitionTableHeader> &theGlyphDefinitionTableHeader, LEErrorCode &success);
+
+ GlyphIterator(GlyphIterator &that);
+
+--- ./jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -95,6 +95,8 @@
+
+ le_uint32 delta = 0;
+
++ //_LETRACE("attempting lookupType #%d", lookupType);
++
+ switch(lookupType)
+ {
+ case 0:
+@@ -152,21 +154,21 @@
+ {
+ LEReferenceTo<ContextualPositioningSubtable> subtable(lookupSubtable, success);
+
+- delta = subtable->process(this, glyphIterator, fontInstance, success);
++ delta = subtable->process(subtable, this , glyphIterator, fontInstance, success);
+ break;
+ }
+
+ case gpstChainedContext:
+ {
+- LEReferenceTo<ChainingContextualPositioningSubtable> subtable(lookupSubtable, success);
++ const LEReferenceTo<ChainingContextualPositioningSubtable> subtable(lookupSubtable, success);
+
+- delta = subtable->process(this, glyphIterator, fontInstance, success);
++ delta = subtable->process(subtable, this, glyphIterator, fontInstance, success);
+ break;
+ }
+
+ case gpstExtension:
+ {
+- LEReferenceTo<ExtensionSubtable> subtable(lookupSubtable, success);
++ const LEReferenceTo<ExtensionSubtable> subtable(lookupSubtable, success);
+
+ delta = subtable->process(subtable, this, lookupType, glyphIterator, fontInstance, success);
+ break;
+@@ -176,6 +178,12 @@
+ break;
+ }
+
++#if LE_TRACE
++ if(delta != 0) {
++ _LETRACE("GlyphPositioningLookupProcessor applied #%d -> delta %d @ %d", lookupType, delta, glyphIterator->getCurrStreamPosition());
++ }
++#endif
++
+ return delta;
+ }
+
+--- ./jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -123,7 +123,7 @@
+ {
+ const LEReferenceTo<ContextualSubstitutionSubtable> subtable(lookupSubtable, success);
+
+- delta = subtable->process(this, glyphIterator, fontInstance, success);
++ delta = subtable->process(subtable, this, glyphIterator, fontInstance, success);
+ break;
+ }
+
+@@ -131,7 +131,7 @@
+ {
+ const LEReferenceTo<ChainingContextualSubstitutionSubtable> subtable(lookupSubtable, success);
+
+- delta = subtable->process(this, glyphIterator, fontInstance, success);
++ delta = subtable->process(subtable, this, glyphIterator, fontInstance, success);
+ break;
+ }
+
+--- ./jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -44,7 +44,7 @@
+ #include "LEGlyphStorage.h"
+
+ #include "IndicReordering.h"
+-#include <stdio.h>
++
+ U_NAMESPACE_BEGIN
+
+ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(IndicOpenTypeLayoutEngine)
+@@ -90,6 +90,7 @@
+ return 0;
+ }
+
++ _LETRACE("IOTLE::gp, calling parent");
+ le_int32 retCount = OpenTypeLayoutEngine::glyphProcessing(chars, offset, count, max, rightToLeft, glyphStorage, success);
+
+ if (LE_FAILURE(success)) {
+@@ -97,10 +98,14 @@
+ }
+
+ if (fVersion2) {
++ _LETRACE("IOTLE::gp, v2 final,");
+ IndicReordering::finalReordering(glyphStorage,retCount);
++ _LETRACE("IOTLE::gp, v2 pres");
+ IndicReordering::applyPresentationForms(glyphStorage,retCount);
++ _LETRACE("IOTLE::gp, parent gsub");
+ OpenTypeLayoutEngine::glyphSubstitution(count,max, rightToLeft, glyphStorage, success);
+ } else {
++ _LETRACE("IOTLE::gp, adjust mpres");
+ IndicReordering::adjustMPres(fMPreFixups, glyphStorage, success);
+ }
+ return retCount;
+@@ -116,6 +121,8 @@
+ return 0;
+ }
+
++ _LETRACE("IOTLE: charProc");
++
+ if (chars == NULL || offset < 0 || count < 0 || max < 0 || offset >= max || offset + count > max) {
+ success = LE_ILLEGAL_ARGUMENT_ERROR;
+ return 0;
+@@ -143,8 +150,10 @@
+
+ le_int32 outCharCount;
+ if (fVersion2) {
++ _LETRACE("v2process");
+ outCharCount = IndicReordering::v2process(&chars[offset], count, fScriptCode, outChars, glyphStorage);
+ } else {
++ _LETRACE("reorder");
+ outCharCount = IndicReordering::reorder(&chars[offset], count, fScriptCode, outChars, glyphStorage, &fMPreFixups, success);
+ }
+
+--- ./jdk/src/share/native/sun/font/layout/KernTable.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/KernTable.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -39,7 +39,7 @@
+
+ #include <stdio.h>
+
+-#define DEBUG 0
++#define DEBUG_KERN_TABLE 0
+
+ U_NAMESPACE_BEGIN
+
+@@ -99,14 +99,14 @@
+ : pairsSwapped(NULL), fTable(base)
+ {
+ if(LE_FAILURE(success) || (fTable.isEmpty())) {
+-#if DEBUG
++#if DEBUG_KERN_TABLE
+ fprintf(stderr, "no kern data\n");
+ #endif
+ return;
+ }
+ LEReferenceTo<KernTableHeader> header(fTable, success);
+
+-#if DEBUG
++#if DEBUG_KERN_TABLE
+ // dump first 32 bytes of header
+ for (int i = 0; i < 64; ++i) {
+ fprintf(stderr, "%0.2x ", ((const char*)header.getAlias())[i]&0xff);
+@@ -171,13 +171,13 @@
+ fprintf(stderr, " searchRange: %d entrySelector: %d rangeShift: %d\n", searchRange, entrySelector, rangeShift);
+ fprintf(stderr, "[[ ignored font table entries: range %d selector %d shift %d ]]\n", SWAPW(table->searchRange), SWAPW(table->entrySelector), SWAPW(table->rangeShift));
+ #endif
+-#if DEBUG
++#if DEBUG_KERN_TABLE
+ fprintf(stderr, "coverage: %0.4x nPairs: %d pairs 0x%x\n", coverage, nPairs, pairsSwapped);
+ fprintf(stderr,
+ " searchRange(pairs): %d entrySelector: %d rangeShift(pairs): %d\n",
+ searchRange, entrySelector, rangeShift);
+
+- {
++ if (LE_SUCCESS(success)) {
+ // dump part of the pair list
+ char ids[256];
+ for (int i = 256; --i >= 0;) {
+@@ -242,7 +242,7 @@
+ p = tp;
+ }
+
+-#if DEBUG
++#if DEBUG_KERN_TABLE
+ fprintf(stderr, "binary search for %0.8x\n", key);
+ #endif
+
+@@ -251,13 +251,13 @@
+ probe >>= 1;
+ tp = (const PairInfo*)(p + (probe/KERN_PAIRINFO_SIZE));
+ le_uint32 tkey = tp->key;
+-#if DEBUG
++#if DEBUG_KERN_TABLE
+ fprintf(stdout, " %.3d (%0.8x)\n", (tp - pairsSwapped), tkey);
+ #endif
+ if (tkey <= key) {
+ if (tkey == key) {
+ le_int16 value = SWAPW(tp->value);
+-#if DEBUG
++#if DEBUG_KERN_TABLE
+ fprintf(stdout, "binary found kerning pair %x:%x at %d, value: 0x%x (%g)\n",
+ storage[i-1], storage[i], i, value & 0xffff, font->xUnitsToPoints(value));
+ fflush(stdout);
+--- ./jdk/src/share/native/sun/font/layout/LEFontInstance.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LEFontInstance.h Thu Dec 19 09:01:16 2013 -0800
+@@ -181,6 +181,10 @@
+ *
+ * Subclasses which represent composite fonts should always return <code>NULL</code>.
+ *
++ * Note that implementing this function does not allow for range checking.
++ * Subclasses that desire the safety of range checking must implement the
++ * variation which has a length parameter.
++ *
+ * @param tableTag - the four byte table tag. (e.g. 'cmap')
+ *
+ * @return the address of the table in memory, or <code>NULL</code>
+@@ -200,6 +204,8 @@
+ * Subclasses which represent composite fonts should always return <code>NULL</code>.
+ *
+ * This version sets a length, for range checking.
++ * Note that range checking can only be accomplished if this function is
++ * implemented in subclasses.
+ *
+ * @param tableTag - the four byte table tag. (e.g. 'cmap')
+ * @param length - ignored on entry, on exit will be the length of the table if known, or -1 if unknown.
+@@ -572,5 +578,3 @@
+
+ U_NAMESPACE_END
+ #endif
+-
+-
+--- ./jdk/src/share/native/sun/font/layout/LEGlyphFilter.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LEGlyphFilter.h Thu Dec 19 09:01:16 2013 -0800
+@@ -62,7 +62,7 @@
+ *
+ * @internal
+ */
+- virtual le_bool accept(LEGlyphID glyph) const = 0;
++ virtual le_bool accept(LEGlyphID glyph, LEErrorCode &success) const = 0;
+ };
+ #endif /* U_HIDE_INTERNAL_API */
+
+--- ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -458,7 +458,7 @@
+ success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
+ return;
+ }
+-
++ _LETRACE("set%-4d\t(%.2f, %.2f)", glyphIndex, x, y);
+ fPositions[glyphIndex * 2] = x;
+ fPositions[glyphIndex * 2 + 1] = y;
+ }
+@@ -694,4 +694,3 @@
+ }
+
+ U_NAMESPACE_END
+-
+--- ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.h Thu Dec 19 09:01:16 2013 -0800
+@@ -568,4 +568,3 @@
+
+ U_NAMESPACE_END
+ #endif
+-
+--- ./jdk/src/share/native/sun/font/layout/LEScripts.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LEScripts.h Thu Dec 19 09:01:16 2013 -0800
+@@ -30,7 +30,7 @@
+ * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
+ * YOU REALLY KNOW WHAT YOU'RE DOING.
+ *
+- * Generated on: 10/26/2010 02:53:33 PM PDT
++ * Generated on: 11/01/2011 04:08:09 PM PDT
+ */
+
+ #ifndef __LESCRIPTS_H
+@@ -262,7 +262,16 @@
+ khojScriptCode = 157,
+ tirhScriptCode = 158,
+
+- scriptCodeCount = 159
++/**
++ * @stable ICU 52
++ */
++ aghbScriptCode = 159,
++ mahjScriptCode = 160,
++
++/**
++ * @stable ICU 2.2
++ */
++ scriptCodeCount
+ };
+
+ U_NAMESPACE_END
+--- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Thu Dec 19 09:01:16 2013 -0800
+@@ -132,6 +132,9 @@
+ #define uprv_memcpy memcpy
+ #define uprv_realloc realloc
+
++#define U_EXPORT2
++#define U_CAPI extern "C"
++
+ #if !defined(U_IS_BIG_ENDIAN)
+ #ifdef _LITTLE_ENDIAN
+ #define U_IS_BIG_ENDIAN 0
+--- ./jdk/src/share/native/sun/font/layout/LETableReference.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LETableReference.h Thu Dec 19 09:01:16 2013 -0800
+@@ -38,34 +38,47 @@
+ #include "LETypes.h"
+ #include "LEFontInstance.h"
+
++/**
++ * \def LE_ENABLE_RAW
++ * If this is 1, enables old non-safe raw access
++ */
++#ifndef LE_ENABLE_RAW
++#define LE_ENABLE_RAW 0
++#endif
+
+-#define kQuestionmarkTableTag 0x3F3F3F3FUL
+-#define kTildeTableTag 0x7e7e7e7eUL
++#define kQuestionmarkTableTag 0x3F3F3F3FUL /* ???? */
++#define kStaticTableTag 0x30303030UL /* 0000 */
++#define kTildeTableTag 0x7e7e7e7eUL /* ~~~~ */
+ #ifdef __cplusplus
+
+ // internal - interface for range checking
+ U_NAMESPACE_BEGIN
+
+ #if LE_ASSERT_BAD_FONT
++
++#ifndef LE_TRACE_TR
++#define LE_TRACE_TR 0
++#endif
++
+ class LETableReference; // fwd
+ /**
+ * defined in OpenTypeUtilities.cpp
+ * @internal
+ */
+-extern void _debug_LETableReference(const char *f, int l, const char *msg, const LETableReference *what, const void *ptr, size_t len);
++U_CAPI void U_EXPORT2 _debug_LETableReference(const char *f, int l, const char *msg, const LETableReference *what, const void *ptr, size_t len);
+
+ #define LE_DEBUG_TR(x) _debug_LETableReference(__FILE__, __LINE__, x, this, NULL, 0);
+ #define LE_DEBUG_TR3(x,y,z) _debug_LETableReference(__FILE__, __LINE__, x, this, (const void*)y, (size_t)z);
+-#if 0
+-#define LE_TRACE_TR(x) _debug_LETableReference(__FILE__, __LINE__, x, this, NULL, 0);
++#if LE_TRACE_TR
++#define _TRTRACE(x) _debug_LETableReference(__FILE__, __LINE__, x, this, NULL, 0);
+ #else
+-#define LE_TRACE_TR(x)
++#define _TRTRACE(x)
+ #endif
+
+ #else
+ #define LE_DEBUG_TR(x)
+ #define LE_DEBUG_TR3(x,y,z)
+-#define LE_TRACE_TR(x)
++#define _TRTRACE(x)
+ #endif
+
+ /**
+@@ -73,6 +86,13 @@
+ */
+ class LETableReference {
+ public:
++
++ /**
++ * Dummy enum asserting that a value is actually static data
++ * and does not need to be range checked
++ */
++ enum EStaticData { kStaticData = 0 };
++
+ /**
+ * @internal
+ * Construct from a specific tag
+@@ -80,28 +100,42 @@
+ LETableReference(const LEFontInstance* font, LETag tableTag, LEErrorCode &success) :
+ fFont(font), fTag(tableTag), fParent(NULL), fStart(NULL),fLength(LE_UINTPTR_MAX) {
+ loadTable(success);
+- LE_TRACE_TR("INFO: new table load")
++ _TRTRACE("INFO: new table load")
+ }
+
+ LETableReference(const LETableReference &parent, LEErrorCode &success) : fFont(parent.fFont), fTag(parent.fTag), fParent(&parent), fStart(parent.fStart), fLength(parent.fLength) {
+ if(LE_FAILURE(success)) {
+ clear();
+ }
+- LE_TRACE_TR("INFO: new clone")
++ _TRTRACE("INFO: new clone")
+ }
+
++#if LE_ENABLE_RAW
++ /**
++ * Construct without a parent LETR.
++ */
+ LETableReference(const le_uint8* data, size_t length = LE_UINTPTR_MAX) :
+ fFont(NULL), fTag(kQuestionmarkTableTag), fParent(NULL), fStart(data), fLength(length) {
+- LE_TRACE_TR("INFO: new raw")
++ _TRTRACE("INFO: new raw")
+ }
++#endif
++
++ /**
++ * Construct without a parent LETR.
++ */
++ LETableReference(EStaticData /* NOTUSED */, const le_uint8* data, size_t length) :
++ fFont(NULL), fTag(kQuestionmarkTableTag), fParent(NULL), fStart(data), fLength(length) {
++ _TRTRACE("INFO: new EStaticData")
++ }
++
+ LETableReference() :
+ fFont(NULL), fTag(kQuestionmarkTableTag), fParent(NULL), fStart(NULL), fLength(0) {
+- LE_TRACE_TR("INFO: new empty")
++ _TRTRACE("INFO: new empty")
+ }
+
+ ~LETableReference() {
+- fTag=kTildeTableTag;
+- LE_TRACE_TR("INFO: new dtor")
++ fTag= (LETag)kTildeTableTag;
++ _TRTRACE("INFO: new dtor")
+ }
+
+ /**
+@@ -127,7 +161,7 @@
+ fLength = (fParent->fLength) - offset; // decrement length as base address is incremented
+ }
+ if(fLength != LE_UINTPTR_MAX) { // if we have bounds:
+- if(offset+fLength > fParent->fLength) {
++ if((offset+fLength < offset) || (offset+fLength > fParent->fLength)) {
+ LE_DEBUG_TR3("offset+fLength out of range: (%p) +%d", NULL, offset+fLength);
+ err = LE_INDEX_OUT_OF_BOUNDS_ERROR; // exceeded
+ clear();
+@@ -137,11 +171,13 @@
+ } else {
+ clear();
+ }
+- LE_TRACE_TR("INFO: new subset")
++ _TRTRACE("INFO: new subset")
+ }
+
+ const void* getAlias() const { return (const void*)fStart; }
+- const void* getAliasTODO() const { LE_DEBUG_TR("getAliasTODO()"); return (const void*)fStart; }
++#ifndef LE_ENABLE_RAW
++ const void* getAliasRAW() const { LE_DEBUG_TR("getAliasRAW()"); return (const void*)fStart; }
++#endif
+ le_bool isEmpty() const { return fStart==NULL || fLength==0; }
+ le_bool isValid() const { return !isEmpty(); }
+ le_bool hasBounds() const { return fLength!=LE_UINTPTR_MAX; }
+@@ -234,7 +270,18 @@
+
+ void setRaw(const void *data, size_t length = LE_UINTPTR_MAX) {
+ fFont = NULL;
+- fTag = kQuestionmarkTableTag;
++ fTag = (LETag)kQuestionmarkTableTag;
++ fParent = NULL;
++ fStart = (const le_uint8*)data;
++ fLength = length;
++ }
++
++ /**
++ * set this object pointing to static data
++ */
++ void setTo(EStaticData /*notused*/, const void *data, size_t length) {
++ fFont = NULL;
++ fTag = (LETag)kStaticTableTag;
+ fParent = NULL;
+ fStart = (const le_uint8*)data;
+ fLength = length;
+@@ -277,97 +324,6 @@
+ * Open a new entry based on an existing table
+ */
+
+-/**
+- * \def LE_UNBOUNDED_ARRAY
+- * define an array with no *known* bound. Will trim to available size.
+- * @internal
+- */
+-#define LE_UNBOUNDED_ARRAY LE_UINT32_MAX
+-
+-template<class T>
+-class LEReferenceToArrayOf : public LETableReference {
+-public:
+- LEReferenceToArrayOf(const LETableReference &parent, LEErrorCode &success, size_t offset, le_uint32 count)
+- : LETableReference(parent, offset, LE_UINTPTR_MAX, success), fCount(count) {
+- LE_TRACE_TR("INFO: new RTAO by offset")
+- if(LE_SUCCESS(success)) {
+- if(count == LE_UNBOUNDED_ARRAY) { // not a known length
+- count = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
+- }
+- LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*count, success);
+- }
+- if(LE_FAILURE(success)) {
+- fCount=0;
+- clear();
+- }
+- }
+-
+- LEReferenceToArrayOf(const LETableReference &parent, LEErrorCode &success, const T* array, le_uint32 count)
+- : LETableReference(parent, parent.ptrToOffset(array, success), LE_UINTPTR_MAX, success), fCount(count) {
+-LE_TRACE_TR("INFO: new RTAO")
+- if(LE_SUCCESS(success)) {
+- if(count == LE_UNBOUNDED_ARRAY) { // not a known length
+- count = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
+- }
+- LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*count, success);
+- }
+- if(LE_FAILURE(success)) clear();
+- }
+- LEReferenceToArrayOf(const LETableReference &parent, LEErrorCode &success, const T* array, size_t offset, le_uint32 count)
+- : LETableReference(parent, parent.ptrToOffset(array, success)+offset, LE_UINTPTR_MAX, success), fCount(count) {
+-LE_TRACE_TR("INFO: new RTAO")
+- if(LE_SUCCESS(success)) {
+- if(count == LE_UNBOUNDED_ARRAY) { // not a known length
+- count = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
+- }
+- LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*count, success);
+- }
+- if(LE_FAILURE(success)) clear();
+- }
+-
+- LEReferenceToArrayOf() :LETableReference(), fCount(0) {}
+-
+- le_uint32 getCount() const { return fCount; }
+-
+- using LETableReference::getAlias;
+-
+- const T *getAlias(le_uint32 i, LEErrorCode &success) const {
+- return ((const T*)(((const char*)getAlias())+getOffsetFor(i, success)));
+- }
+-
+- const T *getAliasTODO() const { LE_DEBUG_TR("getAliasTODO<>"); return (const T*)fStart; }
+-
+- const T& getObject(le_uint32 i, LEErrorCode &success) const {
+- return *getAlias(i,success);
+- }
+-
+- const T& operator()(le_uint32 i, LEErrorCode &success) const {
+- return *getAlias(i,success);
+- }
+-
+- size_t getOffsetFor(le_uint32 i, LEErrorCode &success) const {
+- if(LE_SUCCESS(success)&&i<getCount()) {
+- return LETableVarSizer<T>::getSize()*i;
+- } else {
+- success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
+- }
+- return 0;
+- }
+-
+- LEReferenceToArrayOf<T> &reparent(const LETableReference &base) {
+- fParent = &base;
+- return *this;
+- }
+-
+- LEReferenceToArrayOf(const LETableReference& parent, LEErrorCode & success) : LETableReference(parent,0, LE_UINTPTR_MAX, success), fCount(0) {
+- LE_TRACE_TR("INFO: null RTAO")
+- }
+-
+-private:
+- le_uint32 fCount;
+-};
+-
+-
+ template<class T>
+ class LEReferenceTo : public LETableReference {
+ public:
+@@ -405,14 +361,26 @@
+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
+ if(LE_FAILURE(success)) clear();
+ }
++#if LE_ENABLE_RAW
+ inline LEReferenceTo(const le_uint8 *data, size_t length = LE_UINTPTR_MAX) : LETableReference(data, length) {}
+ inline LEReferenceTo(const T *data, size_t length = LE_UINTPTR_MAX) : LETableReference((const le_uint8*)data, length) {}
+- inline LEReferenceTo() : LETableReference(NULL) {}
++#endif
++ inline LEReferenceTo(EStaticData staticData, const le_uint8 *data, size_t length) : LETableReference(staticData, data, length) {}
++ inline LEReferenceTo(EStaticData staticData, const T *data, size_t length) : LETableReference(staticData, (const le_uint8*)data, length) {}
+
++ inline LEReferenceTo() : LETableReference() {}
++
++#if LE_ENABLE_RAW
+ inline LEReferenceTo<T>& operator=(const T* other) {
+ setRaw(other);
+ return *this;
+ }
++#endif
++
++ LEReferenceTo<T>& setTo(LETableReference::EStaticData staticData, const T* other, size_t length) {
++ LETableReference::setTo(staticData, other, length);
++ return *this;
++ }
+
+ LEReferenceTo<T> &reparent(const LETableReference &base) {
+ fParent = &base;
+@@ -431,11 +399,135 @@
+ }
+
+ const T *operator->() const { return getAlias(); }
++ const T *operator*() const { return getAlias(); }
+ const T *getAlias() const { return (const T*)fStart; }
+- const T *getAliasTODO() const { LE_DEBUG_TR("getAliasTODO<>"); return (const T*)fStart; }
++#if LE_ENABLE_RAW
++ const T *getAliasRAW() const { LE_DEBUG_TR("getAliasRAW<>"); return (const T*)fStart; }
++#endif
++
+ };
+
+
++/**
++ * \def LE_UNBOUNDED_ARRAY
++ * define an array with no *known* bound. Will trim to available size.
++ * @internal
++ */
++#define LE_UNBOUNDED_ARRAY LE_UINT32_MAX
++
++template<class T>
++class LEReferenceToArrayOf : public LETableReference {
++public:
++ LEReferenceToArrayOf(const LETableReference &parent, LEErrorCode &success, size_t offset, le_uint32 count)
++ : LETableReference(parent, offset, LE_UINTPTR_MAX, success), fCount(count) {
++ _TRTRACE("INFO: new RTAO by offset")
++ if(LE_SUCCESS(success)) {
++ if(fCount == LE_UNBOUNDED_ARRAY) { // not a known length
++ fCount = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
++ }
++ LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*fCount, success);
++ }
++ if(LE_FAILURE(success)) {
++ fCount=0;
++ clear();
++ }
++ }
++
++ LEReferenceToArrayOf(const LETableReference &parent, LEErrorCode &success, const T* array, le_uint32 count)
++ : LETableReference(parent, parent.ptrToOffset(array, success), LE_UINTPTR_MAX, success), fCount(count) {
++_TRTRACE("INFO: new RTAO")
++ if(LE_SUCCESS(success)) {
++ if(fCount == LE_UNBOUNDED_ARRAY) { // not a known length
++ fCount = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
++ }
++ LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*fCount, success);
++ }
++ if(LE_FAILURE(success)) clear();
++ }
++ LEReferenceToArrayOf(const LETableReference &parent, LEErrorCode &success, const T* array, size_t offset, le_uint32 count)
++ : LETableReference(parent, parent.ptrToOffset(array, success)+offset, LE_UINTPTR_MAX, success), fCount(count) {
++_TRTRACE("INFO: new RTAO")
++ if(LE_SUCCESS(success)) {
++ if(fCount == LE_UNBOUNDED_ARRAY) { // not a known length
++ fCount = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
++ }
++ LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*fCount, success);
++ }
++ if(LE_FAILURE(success)) clear();
++ }
++
++ LEReferenceToArrayOf() :LETableReference(), fCount(0) {}
++
++ le_uint32 getCount() const { return fCount; }
++
++ const T *getAlias() const { return (const T*)fStart; }
++
++ const T *getAlias(le_uint32 i, LEErrorCode &success) const {
++ return ((const T*)(((const char*)getAlias())+getOffsetFor(i, success)));
++ }
++
++#ifndef LE_ENABLE_RAW
++ const T *getAliasRAW() const { LE_DEBUG_TR("getAliasRAW<>"); return (const T*)fStart; }
++#endif
++
++ const T& getObject(le_uint32 i, LEErrorCode &success) const {
++ return *getAlias(i,success);
++ }
++
++ /**
++ * by-value array accessor for integral types.
++ */
++ const T operator[](le_uint32 i) const {
++ LEErrorCode success = LE_NO_ERROR;
++ const T *ret = getAlias(i, success);
++ if(LE_FAILURE(success) || ret==NULL) {
++#if LE_ASSERT_BAD_FONT
++ LE_DEBUG_TR3("Range error, out of bounds? (%p) #%d", NULL, i);
++#endif
++ return T(0); // will not work for all types.
++ }
++ return *ret;
++ }
++
++ const LEReferenceTo<T> getReference(le_uint32 i, LEErrorCode &success) const {
++ if(LE_FAILURE(success)) return LEReferenceTo<T>();
++ return LEReferenceTo<T>(*this, success, getAlias(i,success));
++ }
++
++ const T& operator()(le_uint32 i, LEErrorCode &success) const {
++ return *getAlias(i,success);
++ }
++
++ size_t getOffsetFor(le_uint32 i, LEErrorCode &success) const {
++ if(LE_SUCCESS(success)&&i<getCount()) {
++ return LETableVarSizer<T>::getSize()*i;
++ } else {
++ LE_DEBUG_TR3("getOffsetFor failed (%p) index=%d",NULL, i);
++ success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
++ }
++ return 0;
++ }
++
++ LEReferenceToArrayOf<T> &reparent(const LETableReference &base) {
++ fParent = &base;
++ return *this;
++ }
++
++ LEReferenceToArrayOf(const LETableReference& parent, LEErrorCode & success) : LETableReference(parent,0, LE_UINTPTR_MAX, success), fCount(0) {
++ _TRTRACE("INFO: null RTAO")
++ }
++
++private:
++ le_uint32 fCount;
++};
++
++
++
++
++#ifdef _TRTRACE
++#undef _TRTRACE
++#endif
++
+ U_NAMESPACE_END
+
+ #endif
+--- ./jdk/src/share/native/sun/font/layout/LETypes.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LETypes.h Thu Dec 19 09:01:16 2013 -0800
+@@ -337,6 +337,20 @@
+ typedef struct LEPoint LEPoint;
+ #endif
+
++/**
++ * \def LE_TRACE
++ * @internal
++ */
++#ifndef LE_TRACE
++# define LE_TRACE 0
++#endif
++
++#if LE_TRACE
++# include <stdio.h>
++# define _LETRACE printf("\n%s:%d: LE: ", __FILE__, __LINE__),printf
++#else
++# define _LETRACE 0&&
++#endif
+
+ #ifndef U_HIDE_INTERNAL_API
+
+@@ -701,6 +715,12 @@
+ LE_FEATURE_ENUM_MAX = LE_CHAR_FILTER_FEATURE_ENUM
+ };
+
++
++/**
++ * Flags for typographic features.
++ * @internal
++ * @{
++ */
+ #define LE_Kerning_FEATURE_FLAG (1 << LE_Kerning_FEATURE_ENUM)
+ #define LE_Ligatures_FEATURE_FLAG (1 << LE_Ligatures_FEATURE_ENUM)
+ #define LE_NoCanon_FEATURE_FLAG (1 << LE_NoCanon_FEATURE_ENUM)
+@@ -727,6 +747,9 @@
+ #define LE_SS07_FEATURE_FLAG (1 << LE_SS07_FEATURE_ENUM)
+
+ #define LE_CHAR_FILTER_FEATURE_FLAG (1 << LE_CHAR_FILTER_FEATURE_ENUM)
++/**
++ * @}
++ */
+
+ #define LE_DEFAULT_FEATURE_FLAG (LE_Kerning_FEATURE_FLAG | LE_Ligatures_FEATURE_FLAG) /**< default features */
+
+@@ -768,7 +791,7 @@
+ *
+ * @stable ICU 2.4
+ */
+-#ifndef LE_FAILURE
++#ifndef LE_SUCCESS
+ #define LE_SUCCESS(code) (U_SUCCESS((UErrorCode)code))
+ #endif
+
+@@ -781,4 +804,4 @@
+ #define LE_FAILURE(code) (U_FAILURE((UErrorCode)code))
+ #endif
+
+-#endif /* __LETYPES_H */
++#endif
+--- ./jdk/src/share/native/sun/font/layout/LayoutEngine.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LayoutEngine.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -156,7 +156,7 @@
+ CanonMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success);
+ virtual ~CanonMarkFilter();
+
+- virtual le_bool accept(LEGlyphID glyph) const;
++ virtual le_bool accept(LEGlyphID glyph, LEErrorCode &success) const;
+ };
+
+ CanonMarkFilter::CanonMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success)
+@@ -169,9 +169,8 @@
+ // nothing to do?
+ }
+
+-le_bool CanonMarkFilter::accept(LEGlyphID glyph) const
++le_bool CanonMarkFilter::accept(LEGlyphID glyph, LEErrorCode &success) const
+ {
+- LEErrorCode success = LE_NO_ERROR;
+ le_int32 glyphClass = classDefTable->getGlyphClass(classDefTable, glyph, success);
+ if(LE_FAILURE(success)) return false;
+ return glyphClass != 0;
+@@ -263,7 +262,9 @@
+ return count;
+ }
+
+- LEReferenceTo<GlyphSubstitutionTableHeader> canonGSUBTable((GlyphSubstitutionTableHeader *) CanonShaping::glyphSubstitutionTable);
++ LEReferenceTo<GlyphSubstitutionTableHeader> canonGSUBTable(LETableReference::kStaticData,
++ (GlyphSubstitutionTableHeader *) CanonShaping::glyphSubstitutionTable,
++ CanonShaping::glyphSubstitutionTableLen);
+ LETag scriptTag = OpenTypeLayoutEngine::getScriptTag(fScriptCode);
+ LETag langSysTag = OpenTypeLayoutEngine::getLangSysTag(fLanguageCode);
+ le_int32 i, dir = 1, out = 0, outCharCount = count;
+@@ -323,7 +324,8 @@
+ LE_DELETE_ARRAY(reordered);
+ }
+
+- outCharCount = canonGSUBTable->process(canonGSUBTable, fakeGlyphStorage, rightToLeft, scriptTag, langSysTag, (const GlyphDefinitionTableHeader*)NULL, substitutionFilter, canonFeatureMap, canonFeatureMapCount, FALSE, success);
++ const LEReferenceTo<GlyphDefinitionTableHeader> noGDEF; // empty gdef header
++ outCharCount = canonGSUBTable->process(canonGSUBTable, fakeGlyphStorage, rightToLeft, scriptTag, langSysTag, noGDEF, substitutionFilter, canonFeatureMap, canonFeatureMapCount, FALSE, success);
+
+ if (LE_FAILURE(success)) {
+ delete substitutionFilter;
+@@ -403,10 +405,13 @@
+ LEPoint advance;
+
+ glyphStorage.setPosition(i, x, y, success);
++ _LETRACE("g#%-4d (%.2f, %.2f)", i, x, y);
+
+ fFontInstance->getGlyphAdvance(glyphStorage[i], advance);
+ x += advance.fX;
+ y += advance.fY;
++
++
+ }
+
+ glyphStorage.setPosition(glyphCount, x, y, success);
+@@ -424,7 +429,7 @@
+ return;
+ }
+
+- LEReferenceTo<GlyphDefinitionTableHeader> gdefTable((GlyphDefinitionTableHeader *) CanonShaping::glyphDefinitionTable,
++ LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(LETableReference::kStaticData, (GlyphDefinitionTableHeader *) CanonShaping::glyphDefinitionTable,
+ CanonShaping::glyphDefinitionTableLen);
+ CanonMarkFilter filter(gdefTable, success);
+
+@@ -464,9 +469,10 @@
+ glyphStorage.getGlyphPosition(p + 1, next, ignore, success);
+
+ xAdvance = next - prev;
++ _LETRACE("p#%d (%.2f,%.2f)", p, xAdvance, 0);
+ glyphStorage.adjustPosition(p, xAdjust, 0, success);
+
+- if (markFilter->accept(glyphStorage[p])) {
++ if (markFilter->accept(glyphStorage[p], success)) {
+ xAdjust -= xAdvance;
+ }
+
+@@ -506,9 +512,13 @@
+ glyphStorage.getGlyphPosition(p + 1, next, ignore, success);
+
+ xAdvance = next - prev;
++
++ _LETRACE("p#%d (%.2f,%.2f)", p, xAdvance, 0);
++
++
+ glyphStorage.adjustPosition(p, xAdjust, 0, success);
+
+- if (markFilter->accept(chars[c])) {
++ if (markFilter->accept(chars[c], success)) {
+ xAdjust -= xAdvance;
+ }
+
+@@ -662,8 +672,10 @@
+ break;
+ }
+ } else {
+- MorphTableHeader2 *morxTable = (MorphTableHeader2 *)fontInstance->getFontTable(morxTableTag);
+- if (morxTable != NULL && SWAPL(morxTable->version)==0x00020000) {
++ LEReferenceTo<MorphTableHeader2> morxTable(fontInstance, morxTableTag, success);
++ if (LE_SUCCESS(success) &&
++ morxTable.isValid() &&
++ SWAPL(morxTable->version)==0x00020000) {
+ result = new GXLayoutEngine2(fontInstance, scriptCode, languageCode, morxTable, typoFlags, success);
+ } else {
+ LEReferenceTo<MorphTableHeader> mortTable(fontInstance, mortTableTag, success);
+@@ -687,7 +699,6 @@
+ }
+
+ case arabScriptCode:
+- //case hebrScriptCode:
+ result = new UnicodeArabicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
+ break;
+
+--- ./jdk/src/share/native/sun/font/layout/LayoutEngine.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LayoutEngine.h Thu Dec 19 09:01:16 2013 -0800
+@@ -156,8 +156,8 @@
+ * @param fontInstance - the font for the text
+ * @param scriptCode - the script for the text
+ * @param languageCode - the language for the text
+- * @param typoFlags - the typographic control flags for the text. Set bit 1 if kerning
+- * is desired, set bit 2 if ligature formation is desired. Others are reserved.
++ * @param typoFlags - the typographic control flags for the text (a bitfield). Use kTypoFlagKern
++ * if kerning is desired, kTypoFlagLiga if ligature formation is desired. Others are reserved.
+ * @param success - set to an error code if the operation fails
+ *
+ * @see LEFontInstance
+--- ./jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -49,14 +49,20 @@
+ return 0;
+ }
+
+- if (coverageIndex >= 0) {
++ LEReferenceToArrayOf<Offset> ligSetTableOffsetArrayRef(base, success, ligSetTableOffsetArray, SWAPW(ligSetCount));
++
++ if (coverageIndex >= 0 && LE_SUCCESS(success) && (le_uint32)coverageIndex < ligSetTableOffsetArrayRef.getCount()) {
+ Offset ligSetTableOffset = SWAPW(ligSetTableOffsetArray[coverageIndex]);
+- const LigatureSetTable *ligSetTable = (const LigatureSetTable *) ((char *) this + ligSetTableOffset);
++ LEReferenceTo<LigatureSetTable> ligSetTable(base, success, ligSetTableOffset);
++
++ if( LE_FAILURE(success) ) { return 0; }
+ le_uint16 ligCount = SWAPW(ligSetTable->ligatureCount);
+
+- for (le_uint16 lig = 0; lig < ligCount; lig += 1) {
++ LEReferenceTo<Offset> ligatureTableOffsetArray(base, success, ligSetTable->ligatureTableOffsetArray, ligCount);
++ for (le_uint16 lig = 0; LE_SUCCESS(success) && lig < ligCount; lig += 1) {
+ Offset ligTableOffset = SWAPW(ligSetTable->ligatureTableOffsetArray[lig]);
+- const LigatureTable *ligTable = (const LigatureTable *) ((char *)ligSetTable + ligTableOffset);
++ LEReferenceTo<LigatureTable> ligTable(ligSetTable, success, ligTableOffset);
++ if(LE_FAILURE(success)) { return 0; }
+ le_uint16 compCount = SWAPW(ligTable->compCount) - 1;
+ le_int32 startPosition = glyphIterator->getCurrStreamPosition();
+ TTGlyphID ligGlyph = SWAPW(ligTable->ligGlyph);
+@@ -72,7 +78,7 @@
+ }
+ }
+
+- if (comp == compCount && (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, ligGlyph)))) {
++ if (comp == compCount && (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, ligGlyph), success))) {
+ GlyphIterator tempIterator(*glyphIterator);
+ TTGlyphID deletedGlyph = tempIterator.ignoresMarks()? 0xFFFE : 0xFFFF;
+
+--- ./jdk/src/share/native/sun/font/layout/LookupProcessor.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/LookupProcessor.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -60,8 +60,10 @@
+ LEReferenceTo<LookupSubtable> lookupSubtable = lookupTable->getLookupSubtable(lookupTable, subtable, success);
+
+ delta = applySubtable(lookupSubtable, lookupType, glyphIterator, fontInstance, success);
+-
+- if (delta > 0 || LE_FAILURE(success)) {
++ if (delta > 0 && LE_FAILURE(success)) {
++#if LE_TRACE
++ _LETRACE("Posn #%d, type %X, applied subtable #%d/%d - %s\n", startPosition, lookupType, subtable, subtableCount, u_errorName((UErrorCode)success));
++#endif
+ return 1;
+ }
+
+@@ -86,7 +88,7 @@
+ }
+
+ GlyphIterator glyphIterator(glyphStorage, glyphPositionAdjustments,
+- rightToLeft, 0, 0, glyphDefinitionTableHeader);
++ rightToLeft, 0, 0, glyphDefinitionTableHeader, success);
+ le_int32 newGlyphCount = glyphCount;
+
+ for (le_uint16 order = 0; order < lookupOrderCount && LE_SUCCESS(success); order += 1) {
+@@ -94,6 +96,7 @@
+ FeatureMask selectMask = lookupSelectArray[lookup];
+
+ if (selectMask != 0) {
++ _LETRACE("Processing order#%d/%d", order, lookupOrderCount);
+ const LEReferenceTo<LookupTable> lookupTable = lookupListTable->getLookupTable(lookupListTable, lookup, success);
+ if (!lookupTable.isValid() ||LE_FAILURE(success) ) {
+ continue;
+@@ -103,8 +106,11 @@
+ glyphIterator.reset(lookupFlags, selectMask);
+
+ while (glyphIterator.findFeatureTag()) {
+- applyLookupTable(lookupTable, &glyphIterator, fontInstance, success); // TODO
++ applyLookupTable(lookupTable, &glyphIterator, fontInstance, success);
+ if (LE_FAILURE(success)) {
++#if LE_TRACE
++ _LETRACE("Failure for lookup 0x%x - %s\n", lookup, u_errorName((UErrorCode)success));
++#endif
+ return 0;
+ }
+ }
+@@ -138,7 +144,7 @@
+ le_int32 LookupProcessor::selectLookups(const LEReferenceTo<FeatureTable> &featureTable, FeatureMask featureMask, le_int32 order, LEErrorCode &success)
+ {
+ le_uint16 lookupCount = featureTable.isValid()? SWAPW(featureTable->lookupCount) : 0;
+- le_int32 store = order;
++ le_uint32 store = (le_uint32)order;
+
+ LEReferenceToArrayOf<le_uint16> lookupListIndexArray(featureTable, success, featureTable->lookupListIndexArray, lookupCount);
+
+@@ -147,6 +153,9 @@
+ if (lookupListIndex >= lookupSelectCount) {
+ continue;
+ }
++ if (store >= lookupOrderCount) {
++ continue;
++ }
+
+ lookupSelectArray[lookupListIndex] |= featureMask;
+ lookupOrderArray[store++] = lookupListIndex;
+@@ -246,7 +255,7 @@
+
+ if (requiredFeatureIndex != 0xFFFF) {
+ requiredFeatureTable = featureListTable->getFeatureTable(featureListTable, requiredFeatureIndex, &requiredFeatureTag, success);
+- featureReferences += SWAPW(featureTable->lookupCount);
++ featureReferences += SWAPW(requiredFeatureTable->lookupCount);
+ }
+
+ lookupOrderArray = LE_NEW_ARRAY(le_uint16, featureReferences);
+@@ -254,6 +263,7 @@
+ success = LE_MEMORY_ALLOCATION_ERROR;
+ return;
+ }
++ lookupOrderCount = featureReferences;
+
+ for (le_int32 f = 0; f < featureMapCount; f += 1) {
+ FeatureMap fm = featureMap[f];
+--- ./jdk/src/share/native/sun/font/layout/Lookups.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/Lookups.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -65,7 +65,7 @@
+
+ if(LE_FAILURE(success)) return 0;
+
+- return coverageTable->getGlyphCoverage(glyphID);
++ return coverageTable->getGlyphCoverage(coverageTable, glyphID, success);
+ }
+
+ U_NAMESPACE_END
+--- ./jdk/src/share/native/sun/font/layout/MarkArrays.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/MarkArrays.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -38,20 +38,28 @@
+
+ U_NAMESPACE_BEGIN
+
+-le_int32 MarkArray::getMarkClass(LEGlyphID glyphID, le_int32 coverageIndex, const LEFontInstance *fontInstance,
+- LEPoint &anchor) const
++le_int32 MarkArray::getMarkClass(const LETableReference &base, LEGlyphID glyphID,
++ le_int32 coverageIndex, const LEFontInstance *fontInstance,
++ LEPoint &anchor, LEErrorCode &success) const
+ {
+ le_int32 markClass = -1;
+
+- if (coverageIndex >= 0) {
++ if ( coverageIndex >= 0 && LE_SUCCESS(success) ) {
+ le_uint16 mCount = SWAPW(markCount);
+-
+ if (coverageIndex < mCount) {
++ LEReferenceToArrayOf<MarkRecord> markRecordArrayRef(base, success, markRecordArray, mCount);
++ if(LE_FAILURE(success)) {
++ return markClass;
++ }
+ const MarkRecord *markRecord = &markRecordArray[coverageIndex];
+ Offset anchorTableOffset = SWAPW(markRecord->markAnchorTableOffset);
+- const AnchorTable *anchorTable = (AnchorTable *) ((char *) this + anchorTableOffset);
++ LEReferenceTo<AnchorTable> anchorTable(base, success, anchorTableOffset);
+
+- anchorTable->getAnchor(glyphID, fontInstance, anchor);
++ if(LE_FAILURE(success)) {
++ return markClass;
++ }
++
++ anchorTable->getAnchor(anchorTable, glyphID, fontInstance, anchor, success);
+ markClass = SWAPW(markRecord->markClass);
+ }
+
+--- ./jdk/src/share/native/sun/font/layout/MarkArrays.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/MarkArrays.h Thu Dec 19 09:01:16 2013 -0800
+@@ -54,8 +54,9 @@
+ le_uint16 markCount;
+ MarkRecord markRecordArray[ANY_NUMBER];
+
+- le_int32 getMarkClass(LEGlyphID glyphID, le_int32 coverageIndex, const LEFontInstance *fontInstance,
+- LEPoint &anchor) const;
++ le_int32 getMarkClass(const LETableReference &base, LEGlyphID glyphID,
++ le_int32 coverageIndex, const LEFontInstance *fontInstance,
++ LEPoint &anchor, LEErrorCode &success) const;
+ };
+ LE_VAR_ARRAY(MarkArray, markRecordArray)
+
+--- ./jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -66,11 +66,11 @@
+ }
+
+ 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)));
++ le_int32 markClass = markArray->getMarkClass(markArray, markGlyph, markCoverage, fontInstance, markAnchor, success);
+ le_uint16 mcCount = SWAPW(classCount);
+
+- if (markClass < 0 || markClass >= mcCount) {
++ if (markClass < 0 || markClass >= mcCount || LE_FAILURE(success)) {
+ // 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 @@
+ GlyphIterator baseIterator(*glyphIterator, (le_uint16) (lfIgnoreMarks /*| lfIgnoreLigatures*/));
+ LEGlyphID baseGlyph = findBaseGlyph(&baseIterator);
+ le_int32 baseCoverage = getBaseCoverage(base, (LEGlyphID) baseGlyph, success);
+- const BaseArray *baseArray = (const BaseArray *) ((char *) this + SWAPW(baseArrayOffset));
++ LEReferenceTo<BaseArray> baseArray(base, success, (const BaseArray *) ((char *) this + SWAPW(baseArrayOffset)));
++ if(LE_FAILURE(success)) return 0;
+ le_uint16 baseCount = SWAPW(baseArray->baseRecordCount);
+
+ if (baseCoverage < 0 || baseCoverage >= baseCount) {
+@@ -89,19 +90,23 @@
+ // table is mal-formed...
+ return 0;
+ }
++ LEReferenceTo<BaseRecord> baseRecord(base, success, &baseArray->baseRecordArray[baseCoverage * mcCount]);
++ if( LE_FAILURE(success) ) { return 0; }
++ LEReferenceToArrayOf<Offset> baseAnchorTableOffsetArray(base, success, &(baseRecord->baseAnchorTableOffsetArray[0]), markClass+1);
+
+- const BaseRecord *baseRecord = &baseArray->baseRecordArray[baseCoverage * mcCount];
++ if( LE_FAILURE(success) ) { return 0; }
+ Offset anchorTableOffset = SWAPW(baseRecord->baseAnchorTableOffsetArray[markClass]);
+- const AnchorTable *anchorTable = (const AnchorTable *) ((char *) baseArray + anchorTableOffset);
+- LEPoint baseAnchor, markAdvance, pixels;
+-
+- if (anchorTableOffset == 0) {
++ if (anchorTableOffset <= 0) {
+ // this means the table is mal-formed...
+ glyphIterator->setCurrGlyphBaseOffset(baseIterator.getCurrStreamPosition());
+ return 0;
+ }
+
+- anchorTable->getAnchor(baseGlyph, fontInstance, baseAnchor);
++ LEReferenceTo<AnchorTable> anchorTable(baseArray, success, anchorTableOffset);
++ LEPoint baseAnchor, markAdvance, pixels;
++
++
++ anchorTable->getAnchor(anchorTable, baseGlyph, fontInstance, baseAnchor, success);
+
+ fontInstance->getGlyphAdvance(markGlyph, pixels);
+ fontInstance->pixelsToUnits(pixels, markAdvance);
+@@ -109,6 +114,8 @@
+ float anchorDiffX = baseAnchor.fX - markAnchor.fX;
+ float anchorDiffY = baseAnchor.fY - markAnchor.fY;
+
++ _LETRACE("Offset: (%.2f, %.2f) glyph 0x%X", anchorDiffX, anchorDiffY, markGlyph);
++
+ glyphIterator->setCurrGlyphBaseOffset(baseIterator.getCurrStreamPosition());
+
+ if (glyphIterator->isRightToLeft()) {
+@@ -132,7 +139,6 @@
+ gi.next();
+ }
+ // end of JK patch
+-
+ fontInstance->pixelsToUnits(pixels, baseAdvance);
+
+ glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX - baseAdvance.fX, anchorDiffY - baseAdvance.fY, -markAdvance.fX, -markAdvance.fY);
+--- ./jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -65,8 +65,11 @@
+ }
+
+ 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, SWAPW(markArrayOffset));
++ if( LE_FAILURE(success) ) {
++ return 0;
++ }
++ le_int32 markClass = markArray->getMarkClass(markArray, markGlyph, markCoverage, fontInstance, markAnchor, success);
+ le_uint16 mcCount = SWAPW(classCount);
+
+ if (markClass < 0 || markClass >= mcCount) {
+@@ -79,7 +82,7 @@
+ GlyphIterator ligatureIterator(*glyphIterator, (le_uint16) (lfIgnoreMarks /*| lfIgnoreBaseGlyphs*/));
+ LEGlyphID ligatureGlyph = findLigatureGlyph(&ligatureIterator);
+ le_int32 ligatureCoverage = getBaseCoverage(base, (LEGlyphID) ligatureGlyph, success);
+- const LigatureArray *ligatureArray = (const LigatureArray *) ((char *) this + SWAPW(baseArrayOffset));
++ LEReferenceTo<LigatureArray> ligatureArray(base, success, SWAPW(baseArrayOffset));
+ le_uint16 ligatureCount = SWAPW(ligatureArray->ligatureCount);
+
+ if (ligatureCoverage < 0 || ligatureCoverage >= ligatureCount) {
+@@ -91,7 +94,7 @@
+
+ le_int32 markPosition = glyphIterator->getCurrStreamPosition();
+ Offset ligatureAttachOffset = SWAPW(ligatureArray->ligatureAttachTableOffsetArray[ligatureCoverage]);
+- const LigatureAttachTable *ligatureAttachTable = (const LigatureAttachTable *) ((char *) ligatureArray + ligatureAttachOffset);
++ LEReferenceTo<LigatureAttachTable> ligatureAttachTable(ligatureArray, success, ligatureAttachOffset);
+ le_int32 componentCount = SWAPW(ligatureAttachTable->componentCount);
+ le_int32 component = ligatureIterator.getMarkComponent(markPosition);
+
+@@ -100,12 +103,14 @@
+ component = componentCount - 1;
+ }
+
+- const ComponentRecord *componentRecord = &ligatureAttachTable->componentRecordArray[component * mcCount];
++ LEReferenceTo<ComponentRecord> componentRecord(base, success, &ligatureAttachTable->componentRecordArray[component * mcCount]);
++ LEReferenceToArrayOf<Offset> ligatureAnchorTableOffsetArray(base, success, &(componentRecord->ligatureAnchorTableOffsetArray[0]), markClass+1);
++ if( LE_FAILURE(success) ) { return 0; }
+ Offset anchorTableOffset = SWAPW(componentRecord->ligatureAnchorTableOffsetArray[markClass]);
+- const AnchorTable *anchorTable = (const AnchorTable *) ((char *) ligatureAttachTable + anchorTableOffset);
++ LEReferenceTo<AnchorTable> anchorTable(ligatureAttachTable, success, anchorTableOffset);
+ LEPoint ligatureAnchor, markAdvance, pixels;
+
+- anchorTable->getAnchor(ligatureGlyph, fontInstance, ligatureAnchor);
++ anchorTable->getAnchor(anchorTable, ligatureGlyph, fontInstance, ligatureAnchor, success);
+
+ fontInstance->getGlyphAdvance(markGlyph, pixels);
+ fontInstance->pixelsToUnits(pixels, markAdvance);
+--- ./jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -66,8 +66,11 @@
+ }
+
+ 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, SWAPW(markArrayOffset));
++ if(LE_FAILURE(success)) {
++ return 0;
++ }
++ le_int32 markClass = markArray->getMarkClass(markArray, markGlyph, markCoverage, fontInstance, markAnchor, success);
+ le_uint16 mcCount = SWAPW(classCount);
+
+ if (markClass < 0 || markClass >= mcCount) {
+@@ -79,7 +82,8 @@
+ GlyphIterator mark2Iterator(*glyphIterator);
+ LEGlyphID mark2Glyph = findMark2Glyph(&mark2Iterator);
+ le_int32 mark2Coverage = getBaseCoverage(base, (LEGlyphID) mark2Glyph, success);
+- const Mark2Array *mark2Array = (const Mark2Array *) ((char *) this + SWAPW(baseArrayOffset));
++ LEReferenceTo<Mark2Array> mark2Array(base, success, (const Mark2Array *) ((char *) this + SWAPW(baseArrayOffset)));
++ if(LE_FAILURE(success)) return 0;
+ le_uint16 mark2Count = SWAPW(mark2Array->mark2RecordCount);
+
+ if (mark2Coverage < 0 || mark2Coverage >= mark2Count) {
+@@ -89,9 +93,11 @@
+ return 0;
+ }
+
+- const Mark2Record *mark2Record = &mark2Array->mark2RecordArray[mark2Coverage * mcCount];
++ LEReferenceTo<Mark2Record> mark2Record(base, success, &mark2Array->mark2RecordArray[mark2Coverage * mcCount]);
++ if(LE_FAILURE(success)) return 0;
+ Offset anchorTableOffset = SWAPW(mark2Record->mark2AnchorTableOffsetArray[markClass]);
+- const AnchorTable *anchorTable = (const AnchorTable *) ((char *) mark2Array + anchorTableOffset);
++ LEReferenceTo<AnchorTable> anchorTable(mark2Array, success, anchorTableOffset);
++ if(LE_FAILURE(success)) return 0;
+ LEPoint mark2Anchor, markAdvance, pixels;
+
+ if (anchorTableOffset == 0) {
+@@ -99,7 +105,7 @@
+ return 0;
+ }
+
+- anchorTable->getAnchor(mark2Glyph, fontInstance, mark2Anchor);
++ anchorTable->getAnchor(anchorTable, mark2Glyph, fontInstance, mark2Anchor, success);
+
+ fontInstance->getGlyphAdvance(markGlyph, pixels);
+ fontInstance->pixelsToUnits(pixels, markAdvance);
+@@ -107,6 +113,8 @@
+ float anchorDiffX = mark2Anchor.fX - markAnchor.fX;
+ float anchorDiffY = mark2Anchor.fY - markAnchor.fY;
+
++ _LETRACE("Offset: (%.2f, %.2f) glyph 0x%X mark2 0x%X", anchorDiffX, anchorDiffY, markGlyph, mark2Glyph);
++
+ glyphIterator->setCurrGlyphBaseOffset(mark2Iterator.getCurrStreamPosition());
+
+ if (glyphIterator->isRightToLeft()) {
+--- ./jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -54,9 +54,10 @@
+ // FIXME: is this always the right thing to do?
+ // FIXME: should this only be done for a non-zero
+ // glyphCount?
+- if (filter != NULL && filter->accept(glyph)) {
++ if (filter != NULL && filter->accept(glyph, success)) {
+ return 0;
+ }
++ if(LE_FAILURE(success)) return 0;
+
+ le_int32 coverageIndex = getGlyphCoverage(base, glyph, success);
+ le_uint16 seqCount = SWAPW(sequenceCount);
+@@ -67,7 +68,7 @@
+
+ if (coverageIndex >= 0 && coverageIndex < seqCount) {
+ Offset sequenceTableOffset = SWAPW(sequenceTableOffsetArray[coverageIndex]);
+- const SequenceTable *sequenceTable = (const SequenceTable *) ((char *) this + sequenceTableOffset);
++ LEReferenceTo<SequenceTable> sequenceTable(base, success, sequenceTableOffset);
+ le_uint16 glyphCount = SWAPW(sequenceTable->glyphCount);
+
+ if (glyphCount == 0) {
+@@ -76,7 +77,7 @@
+ } else if (glyphCount == 1) {
+ TTGlyphID substitute = SWAPW(sequenceTable->substituteArray[0]);
+
+- if (filter != NULL && ! filter->accept(LE_SET_GLYPH(glyph, substitute))) {
++ if (filter != NULL && ! filter->accept(LE_SET_GLYPH(glyph, substitute), success)) {
+ return 0;
+ }
+
+@@ -89,7 +90,7 @@
+ for (le_int32 i = 0; i < glyphCount; i += 1) {
+ TTGlyphID substitute = SWAPW(sequenceTable->substituteArray[i]);
+
+- if (! filter->accept(substitute)) {
++ if (! filter->accept(substitute, success)) {
+ return 0;
+ }
+ }
+--- ./jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -470,6 +470,7 @@
+ void OpenTypeLayoutEngine::adjustGlyphPositions(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse,
+ LEGlyphStorage &glyphStorage, LEErrorCode &success)
+ {
++ _LETRACE("OTLE::adjustGPOS");
+ if (LE_FAILURE(success)) {
+ return;
+ }
+@@ -510,14 +511,17 @@
+ if (!fGPOSTable.isEmpty()) {
+ if (fScriptTagV2 != nullScriptTag &&
+ fGPOSTable->coversScriptAndLanguage(fGPOSTable, fScriptTagV2,fLangSysTag,success)) {
++ _LETRACE("OTLE::process [0]");
+ fGPOSTable->process(fGPOSTable, glyphStorage, adjustments, reverse, fScriptTagV2, fLangSysTag,
+ fGDEFTable, success, fFontInstance, fFeatureMap, fFeatureMapCount, fFeatureOrder);
+
+ } else {
++ _LETRACE("OTLE::process [1]");
+ fGPOSTable->process(fGPOSTable, glyphStorage, adjustments, reverse, fScriptTag, fLangSysTag,
+ fGDEFTable, success, fFontInstance, fFeatureMap, fFeatureMapCount, fFeatureOrder);
+ }
+ } else if (fTypoFlags & LE_Kerning_FEATURE_FLAG) { /* kerning enabled */
++ _LETRACE("OTLE::kerning");
+ LETableReference kernTable(fFontInstance, LE_KERN_TABLE_TAG, success);
+ KernTable kt(kernTable, success);
+ kt.process(glyphStorage, success);
+@@ -546,6 +550,7 @@
+
+ xPlacement = fFontInstance->xUnitsToPoints(xPlacement);
+ yPlacement = fFontInstance->yUnitsToPoints(yPlacement);
++ _LETRACE("OTLE GPOS: #%d, (%.2f,%.2f)", i, xPlacement, yPlacement);
+ glyphStorage.adjustPosition(i, xAdjust + xPlacement, -(yAdjust + yPlacement), success);
+
+ xAdjust += fFontInstance->xUnitsToPoints(xAdvance);
+--- ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h Thu Dec 19 09:01:16 2013 -0800
+@@ -46,15 +46,14 @@
+ public:
+ static le_int8 highBit(le_int32 value);
+ static Offset getTagOffset(LETag tag, const LEReferenceToArrayOf<TagAndOffsetRecord> &records, LEErrorCode &success);
+- /**
+- * @deprecated TODO remove
+- */
++#if LE_ENABLE_RAW
+ static le_int32 getGlyphRangeIndex(TTGlyphID glyphID, const GlyphRangeRecord *records, le_int32 recordCount) {
+ LEErrorCode success = LE_NO_ERROR;
+ LETableReference recordRef0((const le_uint8*)records);
+ LEReferenceToArrayOf<GlyphRangeRecord> recordRef(recordRef0, success, (size_t)0, recordCount);
+ return getGlyphRangeIndex(glyphID, recordRef, success);
+ }
++#endif
+ static le_int32 getGlyphRangeIndex(TTGlyphID glyphID, const LEReferenceToArrayOf<GlyphRangeRecord> &records, LEErrorCode &success);
+ 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 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -76,19 +76,17 @@
+ {
+ LEGlyphID firstGlyph = glyphIterator->getCurrGlyphID();
+ le_int32 coverageIndex = getGlyphCoverage(base, firstGlyph, success);
+-
+- if (LE_FAILURE(success)) {
+- return 0;
+- }
+ GlyphIterator tempIterator(*glyphIterator);
+
+- if (coverageIndex >= 0 && glyphIterator->next()) {
++ LEReferenceToArrayOf<Offset> pairSetTableOffsetArrayRef(base, success, pairSetTableOffsetArray, SWAPW(pairSetCount));
++
++ if (LE_SUCCESS(success) && coverageIndex >= 0 && glyphIterator->next() && (le_uint32)coverageIndex < pairSetTableOffsetArrayRef.getCount()) {
+ Offset pairSetTableOffset = SWAPW(pairSetTableOffsetArray[coverageIndex]);
+- LEReferenceTo<PairSetTable> pairSetTable(base, success, ((char *) this + pairSetTableOffset));
+- if (LE_FAILURE(success)) {
+- return 0;
+- }
++ LEReferenceTo<PairSetTable> pairSetTable(base, success, pairSetTableOffset);
++ if( LE_FAILURE(success) ) return 0;
+ le_uint16 pairValueCount = SWAPW(pairSetTable->pairValueCount);
++ LEReferenceTo<PairValueRecord> pairValueRecordArray(pairSetTable, success, pairSetTable->pairValueRecordArray);
++ if( LE_FAILURE(success) ) return 0;
+ le_int16 valueRecord1Size = ValueRecord::getSize(SWAPW(valueFormat1));
+ le_int16 valueRecord2Size = ValueRecord::getSize(SWAPW(valueFormat2));
+ le_int16 recordSize = sizeof(PairValueRecord) - sizeof(ValueRecord) + valueRecord1Size + valueRecord2Size;
+@@ -96,21 +94,22 @@
+ LEReferenceTo<PairValueRecord> pairValueRecord;
+
+ if (pairValueCount != 0) {
+- pairValueRecord = findPairValueRecord(base, (TTGlyphID) LE_GET_GLYPH(secondGlyph), pairSetTable->pairValueRecordArray, pairValueCount, recordSize, success);
++ pairValueRecord = findPairValueRecord((TTGlyphID) LE_GET_GLYPH(secondGlyph), pairValueRecordArray, pairValueCount, recordSize, success);
+ }
+
+- if (pairValueRecord.isEmpty()) {
++ if (pairValueRecord.isEmpty() || LE_FAILURE(success)) {
+ return 0;
+ }
+
+ if (valueFormat1 != 0) {
+- pairValueRecord->valueRecord1.adjustPosition(SWAPW(valueFormat1), (char *) this, tempIterator, fontInstance);
++ pairValueRecord->valueRecord1.adjustPosition(SWAPW(valueFormat1), base, tempIterator, fontInstance, success);
+ }
+
+ if (valueFormat2 != 0) {
+- const ValueRecord *valueRecord2 = (const ValueRecord *) ((char *) &pairValueRecord->valueRecord1 + valueRecord1Size);
+-
+- valueRecord2->adjustPosition(SWAPW(valueFormat2), (char *) this, *glyphIterator, fontInstance);
++ LEReferenceTo<ValueRecord> valueRecord2(base, success, ((char *) &pairValueRecord->valueRecord1 + valueRecord1Size));
++ if(LE_SUCCESS(success)) {
++ valueRecord2->adjustPosition(SWAPW(valueFormat2), base, *glyphIterator, fontInstance, success);
++ }
+ }
+
+ // back up glyphIterator so second glyph can be
+@@ -135,26 +134,28 @@
+
+ if (coverageIndex >= 0 && glyphIterator->next()) {
+ LEGlyphID secondGlyph = glyphIterator->getCurrGlyphID();
+- const ClassDefinitionTable *classDef1 = (const ClassDefinitionTable *) ((char *) this + SWAPW(classDef1Offset));
+- const ClassDefinitionTable *classDef2 = (const ClassDefinitionTable *) ((char *) this + SWAPW(classDef2Offset));
+- le_int32 class1 = classDef1->getGlyphClass(firstGlyph);
+- le_int32 class2 = classDef2->getGlyphClass(secondGlyph);
++ const LEReferenceTo<ClassDefinitionTable> classDef1(base, success, SWAPW(classDef1Offset));
++ const LEReferenceTo<ClassDefinitionTable> classDef2(base, success, SWAPW(classDef2Offset));
++ le_int32 class1 = classDef1->getGlyphClass(classDef1, firstGlyph, success);
++ le_int32 class2 = classDef2->getGlyphClass(classDef2, secondGlyph, success);
+ le_int16 valueRecord1Size = ValueRecord::getSize(SWAPW(valueFormat1));
+ le_int16 valueRecord2Size = ValueRecord::getSize(SWAPW(valueFormat2));
+ le_int16 class2RecordSize = valueRecord1Size + valueRecord2Size;
+ le_int16 class1RecordSize = class2RecordSize * SWAPW(class2Count);
+- const Class1Record *class1Record = (const Class1Record *) ((char *) class1RecordArray + (class1RecordSize * class1));
+- const Class2Record *class2Record = (const Class2Record *) ((char *) class1Record->class2RecordArray + (class2RecordSize * class2));
++ const LEReferenceTo<Class1Record> class1Record(base, success, (const Class1Record *) ((char *) class1RecordArray + (class1RecordSize * class1)));
++ const LEReferenceTo<Class2Record> class2Record(base, success, (const Class2Record *) ((char *) class1Record->class2RecordArray + (class2RecordSize * class2)));
+
+-
++ if( LE_SUCCESS(success) ) {
+ if (valueFormat1 != 0) {
+- class2Record->valueRecord1.adjustPosition(SWAPW(valueFormat1), (char *) this, tempIterator, fontInstance);
++ class2Record->valueRecord1.adjustPosition(SWAPW(valueFormat1), base, tempIterator, fontInstance, success);
+ }
+-
+ if (valueFormat2 != 0) {
+- const ValueRecord *valueRecord2 = (const ValueRecord *) ((char *) &class2Record->valueRecord1 + valueRecord1Size);
+-
+- valueRecord2->adjustPosition(SWAPW(valueFormat2), (const char *) this, *glyphIterator, fontInstance);
++ const LEReferenceTo<ValueRecord> valueRecord2(base, success, ((char *) &class2Record->valueRecord1) + valueRecord1Size);
++ LEReferenceTo<PairPositioningFormat2Subtable> thisRef(base, success, this);
++ if(LE_SUCCESS(success)) {
++ valueRecord2->adjustPosition(SWAPW(valueFormat2), thisRef, *glyphIterator, fontInstance, success);
++ }
++ }
+ }
+
+ // back up glyphIterator so second glyph can be
+@@ -166,23 +167,24 @@
+ return 0;
+ }
+
+-LEReferenceTo<PairValueRecord> PairPositioningFormat1Subtable::findPairValueRecord(const LETableReference &base, TTGlyphID glyphID, const PairValueRecord *records, le_uint16 recordCount, le_uint16 recordSize, LEErrorCode &success) const
++LEReferenceTo<PairValueRecord>
++PairPositioningFormat1Subtable::findPairValueRecord(TTGlyphID glyphID, LEReferenceTo<PairValueRecord>& records,
++ le_uint16 recordCount,
++ le_uint16 recordSize, LEErrorCode &success) const
+ {
+ #if 1
+ // The OpenType spec. says that the ValueRecord table is
+ // sorted by secondGlyph. Unfortunately, there are fonts
+ // around that have an unsorted ValueRecord table.
+- LEReferenceTo<PairValueRecord> record(base, success, records);
+- record.verifyLength(0, recordSize, success);
++ LEReferenceTo<PairValueRecord> record(records);
+
+ for(le_int32 r = 0; r < recordCount; r += 1) {
+- if (LE_FAILURE(success)) return (const PairValueRecord*)NULL;
++ if(LE_FAILURE(success)) return LEReferenceTo<PairValueRecord>();
+ if (SWAPW(record->secondGlyph) == glyphID) {
+ return record;
+ }
+
+- record = LEReferenceTo<PairValueRecord>(base, success, ((const char*)record.getAlias())+ recordSize);
+- record.verifyLength(0, recordSize, success);
++ record.addOffset(recordSize, success);
+ }
+ #else
+ #error dead code - not updated.
+@@ -211,7 +213,7 @@
+ }
+ #endif
+
+- return (const PairValueRecord*)NULL;
++ return LEReferenceTo<PairValueRecord>();
+ }
+
+ U_NAMESPACE_END
+--- ./jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h Thu Dec 19 09:01:16 2013 -0800
+@@ -77,9 +77,8 @@
+ le_uint32 process(const LEReferenceTo<PairPositioningFormat1Subtable> &base, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode &success) const;
+
+ private:
+- LEReferenceTo<PairValueRecord> findPairValueRecord(const LETableReference &base, TTGlyphID glyphID, const PairValueRecord *records,
++ LEReferenceTo<PairValueRecord> findPairValueRecord(TTGlyphID glyphID, LEReferenceTo<PairValueRecord> &records,
+ le_uint16 recordCount, le_uint16 recordSize, LEErrorCode &success) const;
+-
+ };
+ LE_VAR_ARRAY(PairPositioningFormat1Subtable, pairSetTableOffsetArray)
+
+--- ./jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -106,7 +106,8 @@
+ }
+ } else {
+ LEReferenceToArrayOf<ScriptRecord> scriptRecordArrayRef(base, success, &scriptRecordArray[0], count);
+- scriptTableOffset = OpenTypeUtilities::getTagOffset(scriptTag, scriptRecordArrayRef, success); // TODO
++
++ scriptTableOffset = OpenTypeUtilities::getTagOffset(scriptTag, scriptRecordArrayRef, success);
+ }
+
+ if (scriptTableOffset != 0) {
+--- ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -126,13 +126,13 @@
+ linaScriptTag, /* 'lina' (LINA) */
+ mandScriptTag, /* 'mand' (MANDAIC) */
+ mayaScriptTag, /* 'maya' (MAYA) */
+- meroScriptTag, /* 'mero' (MERO) */
++ meroScriptTag, /* 'mero' (MEROITIC_HIEROGLYPHS) */
+ nkooScriptTag, /* 'nko ' (NKO) */
+ orkhScriptTag, /* 'orkh' (OLD_TURKIC) */
+ permScriptTag, /* 'perm' (PERM) */
+ phagScriptTag, /* 'phag' (PHAGS_PA) */
+ phnxScriptTag, /* 'phnx' (PHOENICIAN) */
+- plrdScriptTag, /* 'plrd' (PLRD) */
++ plrdScriptTag, /* 'plrd' (MIAO/POLLARD) */
+ roroScriptTag, /* 'roro' (RORO) */
+ saraScriptTag, /* 'sara' (SARA) */
+ syreScriptTag, /* 'syre' (SYRE) */
+@@ -158,7 +158,7 @@
+ mteiScriptTag, /* 'mtei' (MEETEI_MAYEK) */
+ armiScriptTag, /* 'armi' (IMPERIAL_ARAMAIC) */
+ avstScriptTag, /* 'avst' (AVESTAN) */
+- cakmScriptTag, /* 'cakm' (CAKM) */
++ cakmScriptTag, /* 'cakm' (CHAKMA) */
+ koreScriptTag, /* 'kore' (KORE) */
+ kthiScriptTag, /* 'kthi' (KAITHI) */
+ maniScriptTag, /* 'mani' (MANI) */
+@@ -181,7 +181,7 @@
+ kpelScriptTag, /* 'kpel' (KPEL) */
+ lomaScriptTag, /* 'loma' (LOMA) */
+ mendScriptTag, /* 'mend' (MEND) */
+- mercScriptTag, /* 'merc' (MERC) */
++ mercScriptTag, /* 'merc' (MEROITIC_CURSIVE) */
+ narbScriptTag, /* 'narb' (NARB) */
+ nbatScriptTag, /* 'nbat' (NBAT) */
+ palmScriptTag, /* 'palm' (PALM) */
+--- ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h Thu Dec 19 09:01:16 2013 -0800
+@@ -140,13 +140,13 @@
+ const LETag linaScriptTag = 0x6C696E61; /* 'lina' (LINA) */
+ const LETag mandScriptTag = 0x6D616E64; /* 'mand' (MANDAIC) */
+ const LETag mayaScriptTag = 0x6D617961; /* 'maya' (MAYA) */
+-const LETag meroScriptTag = 0x6D65726F; /* 'mero' (MERO) */
++const LETag meroScriptTag = 0x6D65726F; /* 'mero' (MEROITIC_HIEROGLYPHS) */
+ const LETag nkooScriptTag = 0x6E6B6F20; /* 'nko ' (NKO) */
+ const LETag orkhScriptTag = 0x6F726B68; /* 'orkh' (OLD_TURKIC) */
+ const LETag permScriptTag = 0x7065726D; /* 'perm' (PERM) */
+ const LETag phagScriptTag = 0x70686167; /* 'phag' (PHAGS_PA) */
+ const LETag phnxScriptTag = 0x70686E78; /* 'phnx' (PHOENICIAN) */
+-const LETag plrdScriptTag = 0x706C7264; /* 'plrd' (PLRD) */
++const LETag plrdScriptTag = 0x706C7264; /* 'plrd' (MIAO) */
+ const LETag roroScriptTag = 0x726F726F; /* 'roro' (RORO) */
+ const LETag saraScriptTag = 0x73617261; /* 'sara' (SARA) */
+ const LETag syreScriptTag = 0x73797265; /* 'syre' (SYRE) */
+@@ -172,7 +172,7 @@
+ const LETag mteiScriptTag = 0x6D746569; /* 'mtei' (MEETEI_MAYEK) */
+ const LETag armiScriptTag = 0x61726D69; /* 'armi' (IMPERIAL_ARAMAIC) */
+ const LETag avstScriptTag = 0x61767374; /* 'avst' (AVESTAN) */
+-const LETag cakmScriptTag = 0x63616B6D; /* 'cakm' (CAKM) */
++const LETag cakmScriptTag = 0x63616B6D; /* 'cakm' (CHAKMA) */
+ const LETag koreScriptTag = 0x6B6F7265; /* 'kore' (KORE) */
+ const LETag kthiScriptTag = 0x6B746869; /* 'kthi' (KAITHI) */
+ const LETag maniScriptTag = 0x6D616E69; /* 'mani' (MANI) */
+@@ -195,7 +195,7 @@
+ const LETag kpelScriptTag = 0x6B70656C; /* 'kpel' (KPEL) */
+ const LETag lomaScriptTag = 0x6C6F6D61; /* 'loma' (LOMA) */
+ const LETag mendScriptTag = 0x6D656E64; /* 'mend' (MEND) */
+-const LETag mercScriptTag = 0x6D657263; /* 'merc' (MERC) */
++const LETag mercScriptTag = 0x6D657263; /* 'merc' (MEROITIC_CURSIVE) */
+ 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/SegmentArrayProcessor2.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -65,16 +65,17 @@
+
+ for (glyph = 0; glyph < glyphCount; glyph += 1) {
+ LEGlyphID thisGlyph = glyphStorage[glyph];
++ // lookupSegment already range checked by lookupSegment() function.
+ const LookupSegment *lookupSegment = segmentArrayLookupTable->lookupSegment(segmentArrayLookupTable, segments, thisGlyph, success);
+
+- if (lookupSegment != NULL) {
++ if (lookupSegment != NULL&& LE_SUCCESS(success)) {
+ TTGlyphID firstGlyph = SWAPW(lookupSegment->firstGlyph);
++ TTGlyphID lastGlyph = SWAPW(lookupSegment->lastGlyph);
+ le_int16 offset = SWAPW(lookupSegment->value);
+-
+- if (offset != 0) {
+- TTGlyphID *glyphArray = (TTGlyphID *) ((char *) subtableHeader.getAliasTODO() + offset);
+- TTGlyphID newGlyph = SWAPW(glyphArray[LE_GET_GLYPH(thisGlyph) - firstGlyph]);
+-
++ TTGlyphID thisGlyphId= LE_GET_GLYPH(thisGlyph);
++ LEReferenceToArrayOf<TTGlyphID> glyphArray(subtableHeader, success, offset, lastGlyph - firstGlyph + 1);
++ if (offset != 0 && thisGlyphId <= lastGlyph && thisGlyphId >= firstGlyph && LE_SUCCESS(success) ) {
++ TTGlyphID newGlyph = SWAPW(glyphArray[thisGlyphId]);
+ glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);
+ }
+ }
+--- ./jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -75,7 +75,7 @@
+ }
+
+ if (coverageIndex >= 0) {
+- valueRecord.adjustPosition(SWAPW(valueFormat), (const char *) this, *glyphIterator, fontInstance);
++ valueRecord.adjustPosition(SWAPW(valueFormat), base, *glyphIterator, fontInstance, success);
+
+ return 1;
+ }
+@@ -92,7 +92,7 @@
+ }
+
+ if (coverageIndex >= 0) {
+- valueRecordArray[0].adjustPosition(coverageIndex, SWAPW(valueFormat), (const char *) this, *glyphIterator, fontInstance);
++ valueRecordArray[0].adjustPosition(coverageIndex, SWAPW(valueFormat), base, *glyphIterator, fontInstance, success);
+
+ return 1;
+ }
+--- ./jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -76,7 +76,7 @@
+ if (coverageIndex >= 0) {
+ TTGlyphID substitute = ((TTGlyphID) LE_GET_GLYPH(glyph)) + SWAPW(deltaGlyphID);
+
+- if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, substitute))) {
++ if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, substitute), success)) {
+ glyphIterator->setCurrGlyphID(substitute);
+ }
+
+@@ -97,7 +97,7 @@
+ if (coverageIndex >= 0) {
+ TTGlyphID substitute = SWAPW(substituteArray[coverageIndex]);
+
+- if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, substitute))) {
++ if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, substitute), success)) {
+ glyphIterator->setCurrGlyphID(substitute);
+ }
+
+--- ./jdk/src/share/native/sun/font/layout/TibetanReordering.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/TibetanReordering.h Thu Dec 19 09:01:16 2013 -0800
+@@ -39,7 +39,7 @@
+ */
+
+ #ifndef __TIBETANREORDERING_H
+-#define __TIBETANORDERING_H
++#define __TIBETANREORDERING_H
+
+ /**
+ * \file
+--- ./jdk/src/share/native/sun/font/layout/ValueRecords.cpp Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ValueRecords.cpp Thu Dec 19 09:01:16 2013 -0800
+@@ -59,8 +59,8 @@
+ return SWAPW(value);
+ }
+
+-void ValueRecord::adjustPosition(ValueFormat valueFormat, const char *base, GlyphIterator &glyphIterator,
+- const LEFontInstance *fontInstance) const
++void ValueRecord::adjustPosition(ValueFormat valueFormat, const LETableReference& base, GlyphIterator &glyphIterator,
++ const LEFontInstance *fontInstance, LEErrorCode &success) const
+ {
+ float xPlacementAdjustment = 0;
+ float yPlacementAdjustment = 0;
+@@ -118,8 +118,8 @@
+ Offset dtOffset = getFieldValue(valueFormat, vrfXPlaDevice);
+
+ if (dtOffset != 0) {
+- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
+- le_int16 xAdj = dt->getAdjustment(xppem);
++ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
++ le_int16 xAdj = dt->getAdjustment(dt, xppem, success);
+
+ xPlacementAdjustment += fontInstance->xPixelsToUnits(xAdj);
+ }
+@@ -129,8 +129,8 @@
+ Offset dtOffset = getFieldValue(valueFormat, vrfYPlaDevice);
+
+ if (dtOffset != 0) {
+- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
+- le_int16 yAdj = dt->getAdjustment(yppem);
++ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
++ le_int16 yAdj = dt->getAdjustment(dt, yppem, success);
+
+ yPlacementAdjustment += fontInstance->yPixelsToUnits(yAdj);
+ }
+@@ -140,8 +140,8 @@
+ Offset dtOffset = getFieldValue(valueFormat, vrfXAdvDevice);
+
+ if (dtOffset != 0) {
+- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
+- le_int16 xAdj = dt->getAdjustment(xppem);
++ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
++ le_int16 xAdj = dt->getAdjustment(dt, xppem, success);
+
+ xAdvanceAdjustment += fontInstance->xPixelsToUnits(xAdj);
+ }
+@@ -151,8 +151,8 @@
+ Offset dtOffset = getFieldValue(valueFormat, vrfYAdvDevice);
+
+ if (dtOffset != 0) {
+- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
+- le_int16 yAdj = dt->getAdjustment(yppem);
++ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
++ le_int16 yAdj = dt->getAdjustment(dt, yppem, success);
+
+ yAdvanceAdjustment += fontInstance->yPixelsToUnits(yAdj);
+ }
+@@ -163,8 +163,8 @@
+ xPlacementAdjustment, yPlacementAdjustment, xAdvanceAdjustment, yAdvanceAdjustment);
+ }
+
+-void ValueRecord::adjustPosition(le_int16 index, ValueFormat valueFormat, const char *base, GlyphIterator &glyphIterator,
+- const LEFontInstance *fontInstance) const
++void ValueRecord::adjustPosition(le_int16 index, ValueFormat valueFormat, const LETableReference& base, GlyphIterator &glyphIterator,
++ const LEFontInstance *fontInstance, LEErrorCode &success) const
+ {
+ float xPlacementAdjustment = 0;
+ float yPlacementAdjustment = 0;
+@@ -222,8 +222,8 @@
+ Offset dtOffset = getFieldValue(index, valueFormat, vrfXPlaDevice);
+
+ if (dtOffset != 0) {
+- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
+- le_int16 xAdj = dt->getAdjustment(xppem);
++ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
++ le_int16 xAdj = dt->getAdjustment(dt, xppem, success);
+
+ xPlacementAdjustment += fontInstance->xPixelsToUnits(xAdj);
+ }
+@@ -233,8 +233,8 @@
+ Offset dtOffset = getFieldValue(index, valueFormat, vrfYPlaDevice);
+
+ if (dtOffset != 0) {
+- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
+- le_int16 yAdj = dt->getAdjustment(yppem);
++ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
++ le_int16 yAdj = dt->getAdjustment(dt, yppem, success);
+
+ yPlacementAdjustment += fontInstance->yPixelsToUnits(yAdj);
+ }
+@@ -244,8 +244,8 @@
+ Offset dtOffset = getFieldValue(index, valueFormat, vrfXAdvDevice);
+
+ if (dtOffset != 0) {
+- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
+- le_int16 xAdj = dt->getAdjustment(xppem);
++ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
++ le_int16 xAdj = dt->getAdjustment(dt, xppem, success);
+
+ xAdvanceAdjustment += fontInstance->xPixelsToUnits(xAdj);
+ }
+@@ -255,8 +255,8 @@
+ Offset dtOffset = getFieldValue(index, valueFormat, vrfYAdvDevice);
+
+ if (dtOffset != 0) {
+- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
+- le_int16 yAdj = dt->getAdjustment(yppem);
++ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
++ le_int16 yAdj = dt->getAdjustment(dt, yppem, success);
+
+ yAdvanceAdjustment += fontInstance->yPixelsToUnits(yAdj);
+ }
+--- ./jdk/src/share/native/sun/font/layout/ValueRecords.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/font/layout/ValueRecords.h Thu Dec 19 09:01:16 2013 -0800
+@@ -53,10 +53,10 @@
+
+ le_int16 getFieldValue(ValueFormat valueFormat, ValueRecordField field) const;
+ le_int16 getFieldValue(le_int16 index, ValueFormat valueFormat, ValueRecordField field) const;
+- void adjustPosition(ValueFormat valueFormat, const char *base, GlyphIterator &glyphIterator,
+- const LEFontInstance *fontInstance) const;
+- void adjustPosition(le_int16 index, ValueFormat valueFormat, const char *base, GlyphIterator &glyphIterator,
+- const LEFontInstance *fontInstance) const;
++ void adjustPosition(ValueFormat valueFormat, const LETableReference &base, GlyphIterator &glyphIterator,
++ const LEFontInstance *fontInstance, LEErrorCode &success) const;
++ void adjustPosition(le_int16 index, ValueFormat valueFormat, const LETableReference &base, GlyphIterator &glyphIterator,
++ const LEFontInstance *fontInstance, LEErrorCode &success) const;
+
+ static le_int16 getSize(ValueFormat valueFormat);
+
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c Thu Dec 19 09:01:16 2013 -0800
+@@ -661,7 +661,12 @@
+ (sy2-sy1) != (jint)(dy2-dy1) ||
+ oglc->extraAlpha != 1.0f;
+ break;
+-
++#ifdef MACOSX
++ case OGLC_VENDOR_ATI:
++ // see 8024461
++ viaTexture = JNI_TRUE;
++ break;
++#endif
+ default:
+ // just use the glDrawPixels() codepath
+ viaTexture = JNI_FALSE;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Thu Dec 19 09:01:16 2013 -0800
+@@ -0,0 +1,89 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package sun.net;
++
++import java.security.AccessController;
++
++/**
++ * Determines the ephemeral port range in use on this system.
++ * If this cannot be determined, then the default settings
++ * of the OS are returned.
++ */
++
++public final class PortConfig {
++
++ private static int defaultUpper, defaultLower;
++ private final static int upper, lower;
++
++ private PortConfig() {}
++
++ static {
++ AccessController.doPrivileged(
++ new java.security.PrivilegedAction<Void>() {
++ public Void run() {
++ System.loadLibrary("net");
++ String os = System.getProperty("os.name");
++ if (os.startsWith("Linux")) {
++ defaultLower = 32768;
++ defaultUpper = 61000;
++ } else if (os.startsWith("SunOS")) {
++ defaultLower = 32768;
++ defaultUpper = 65535;
++ } else if (os.contains("OS X")) {
++ defaultLower = 49152;
++ defaultUpper = 65535;
++ } else {
++ throw new InternalError(
++ "sun.net.PortConfig: unknown OS");
++ }
++ return null;
++ }
++ });
++
++ int v = getLower0();
++ if (v == -1) {
++ v = defaultLower;
++ }
++ lower = v;
++
++ v = getUpper0();
++ if (v == -1) {
++ v = defaultUpper;
++ }
++ upper = v;
++ }
++
++ static native int getLower0();
++ static native int getUpper0();
++
++ public static int getLower() {
++ return lower;
++ }
++
++ public static int getUpper() {
++ return upper;
++ }
++}
+--- ./jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java Thu Dec 19 09:01:16 2013 -0800
+@@ -180,6 +180,10 @@
+ SctpNet.throwAlreadyBoundException();
+ InetSocketAddress isa = (local == null) ?
+ new InetSocketAddress(0) : Net.checkAddress(local);
++ SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ sm.checkListen(isa.getPort());
++ }
+ Net.bind(fd, isa.getAddress(), isa.getPort());
+ InetSocketAddress boundIsa = Net.localAddress(fd);
+ port = boundIsa.getPort();
+--- ./jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/solaris/doc/sun/man/man1/ja/jarsigner.1 Thu Dec 19 09:01:16 2013 -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
++\fIjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
+ .fi
+-
+-.LP
+-.LP
+-jarsigner¤Î\-verify¥³¥Þ¥ó¥É¤Ç¤Ï¡¢JAR¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë0¸Ä°Ê¾å¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢ÊÌ̾¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢jarsigner¤Ï¡¢JAR¥Õ¥¡¥¤¥ëÆâ¤Î³Æ½ð̾ÉÕ¤­¥¨¥ó¥Æ¥£¥Æ¥£¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¡¢¤¤¤º¤ì¤«¤Î¥­¡¼¥¹¥È¥¢ÊÌ̾¤Ë°ìÃפ¹¤ë¤³¤È¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ÊÌ̾¤Ï¡¢\-keystore¤Ç»ØÄꤵ¤ì¤¿¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢Æâ¤ËÄêµÁ¤µ¤ì¤Þ¤¹¡£
+-.LP
++.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¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÈÀ°¹çÀ­¤ò¸¡¾Ú¤¹¤ëÌÜŪ
++.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
+-
+-.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
+-½ð̾ÉÕ¤­¤Î¥Ç¡¼¥¿¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿¾ì¹ç¤Ï¡¢¤½¤Î½ð̾¤Ë¤è¤Ã¤Æ¥Ç¡¼¥¿¤¬ËÜʪ¤Ç¤Ï¤Ê¤¤¤³¤È¤¬¸¡¾Ú¤µ¤ì¤Þ¤¹¡£
++.sp
++.RS 4
++.ie n \{\
++\h'-04'\(bu\h'+03'\c
++.\}
++.el \{\
++.sp -1
++.IP \(bu 2.3
++.\}
++½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÈÀ°¹çÀ­¤ò¸¡¾Ú¤¹¤ëÌÜŪ¡£
+ .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
++.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
+-\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
++jarsigner \-keystore /working/mystore \-storepass <keystore password>
++ \-keypass <private key password> MyJARFile\&.jar duke
+ .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 @
++.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
+-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
++.if n \{\
++.RE
++.\}
++.PP
++¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ï¡¢\fIjks\fR
++(Oracle¤¬Ä󶡤¹¤ëÆȼ«¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ)¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¼¡¤Î¹Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
++.sp
++.if n \{\
++.RS 4
++.\}
+ .nf
+-\f3
+-.fl
+- KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+-.fl
+-\fP
++keystore\&.type=jks
+ .fi
+-
+-.LP
+-.LP
+-¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ïjks(Sun¤¬Ä󶡤¹¤ëÆȼ«¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ)¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¼¡¤Î¹Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
+-.LP
++.if n \{\
++.RE
++.\}
++.PP
++¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î»ØÄê¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\fIJKS\fR¤Ï\fIjks\fR¤ÈƱ¤¸¤Ë¤Ê¤ê¤Þ¤¹¡£
++.PP
++¥Ä¡¼¥ë¤Ç¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¤½¤Î¹Ô¤òÊѹ¹¤·¤ÆÊ̤Υ­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\fIpkcs12\fR¤È¸Æ¤Ð¤ì¤ë¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤¹¤ë¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¾ì¹ç¡¢¹Ô¤ò¼¡¤Î¤è¤¦¤ËÊѹ¹¤·¤Þ¤¹¡£
++.sp
++.if n \{\
++.RS 4
++.\}
+ .nf
+-\f3
+-.fl
+- keystore.type=jks
+-.fl
+-\fP
++keystore\&.type=pkcs12
+ .fi
+-
+-.LP
+-.LP
+-Ãí°Õ: ¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î»ØÄê¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢JKS¤Èjks¤ÏƱ¤¸¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
+-.LP
+-.LP
+-³Æ¥Ä¡¼¥ë¤Ç¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤òÊѹ¹¤·¤ÆÊ̤Υ­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢pkcs12¤È¸Æ¤Ð¤ì¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤ò¼¡¤Î¤è¤¦¤ËÊѹ¹¤·¤Þ¤¹¡£
+-.LP
++.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
+-\f3
+-.fl
+- keystore.type=pkcs12
+-.fl
+-\fP
++\-tsa \fIurl\fR
++\-tsacert \fIalias\fR
++\-altsigner \fIclass\fR
++\-altsignerpath \fIclasspathlist\fR
++\-tsapolicyid \fIpolicyid\fR
+ .fi
+-
+-.LP
+-.LP
+-PKCS#11¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Î¾ÜºÙ¤Ï¡¢Java PKCS#11¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É¤Ë¤¢¤ë
+-.na
+-\f2KeyTool¤ÈJarSigner\fP @
++.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
++.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
+-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(Âʱ߶ÊÀþ)°Å¹æÊý¼°¥¢¥ë¥´¥ê¥º¥à
++.if n \{\
+ .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¤ò³ÈÄ¥»Ò¤ÎÉÕ¤¤¤¿½ð̾¥Ö¥í¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë
++.\}
++.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
+-
+-.LP
+-.LP
+-¤³¤ì¤é2¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ï¡¢\f2\-sigFile\fP¥ª¥×¥·¥ç¥ó¤ÎÃͤ«¤éºîÀ®¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¤È¤·¤Þ¤¹¡£
+-.LP
++.\}
++.PP
++\fBÃí°Õ: \fRJAR¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢JDK 1\&.1¤Î\fIjavakey\fR¥³¥Þ¥ó¥É¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿½ð̾¤È¡¢\fIjarsigner\fR¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿½ð̾¤òº®ºß¤µ¤»¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£\fIjarsigner\fR¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢\fIjavakey\fR¥³¥Þ¥ó¥É¤Ç¤¹¤Ç¤Ë½ð̾¤µ¤ì¤Æ¤¤¤ëJAR¥Õ¥¡¥¤¥ë¤Ë½ð̾¤Ç¤­¤Þ¤¹¡£
++.SH "¥ª¥×¥·¥ç¥ó"
++.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
+-\-sigFile MKSIGN
+-.fl
+-\fP
++\-keystore \fIfilePathAndName\fR
+ .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¥À¥¤¥¸¥§¥¹¥È¤ÎÃÍ
++.if n \{\
+ .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
++.\}
++.sp
++.if n \{\
++.RS 4
++.\}
++.nf
++\-keystore file:\fIfilePathAndName\fR
++.fi
++.if n \{\
+ .RE
+-
+-.LP
+-.LP
+-¤³¤ì¤é¤Î³Æ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï¡¢¥ª¥×¥·¥ç¥ó¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+-.LP
+-.SS
+-JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú
+-.LP
+-.LP
+-JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤¬À®¸ù¤¹¤ë¤Î¤Ï¡¢½ð̾¤¬Í­¸ú¤Ç¤¢¤ê¡¢¤«¤Ä½ð̾¤ÎÀ¸À®°Ê¸å¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Î¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ï¡¢¼¡¤Î¼ê½ç¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
+-.LP
+-.RS 3
+-.TP 3
+-1.
+-.SF¥Õ¥¡¥¤¥ë¼«ÂΤνð̾¤ò¸¡¾Ú¤·¤Þ¤¹¡£
++.\}
++(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¥Õ¥¡¥¤¥ë¤Î½ð̾¤Ë»ÈÍѤ¹¤ë½ð̾¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
++.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¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥È¥ê¤ò¥À¥¤¥¸¥§¥¹¥È¤¹¤ëºÝ¤Ë»ÈÍѤ¹¤ë¥á¥Ã¥»¡¼¥¸¡¦¥À¥¤¥¸¥§¥¹¥È¡¦¥¢¥ë¥´¥ê¥º¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
++.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
++.fi
++.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
++.fi
++.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
++\-altsignerpath /home/user/lib/authsigner\&.jar
++.fi
++.if n \{\
++.RE
++.\}
++¼¡¤ÎÎã¤Ç¤Ï¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÊýË¡¤ò¼¨¤·¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë̾¤ò¾Êά¤·¤Þ¤¹¡£
++.sp
++.if n \{\
++.RS 4
++.\}
++.nf
++\-altsignerpath /home/user/classes/com/sun/tools/jarsigner/
++.fi
++.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
+-¤³¤Î¼ê½ç¤Ç¤Ï¡¢³Æ½ð̾¥Ö¥í¥Ã¥¯(.DSA)¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë½ð̾¤¬¡¢¼ÂºÝ¤Ë¡¢¸ø³«¸°¤ËÂбþ¤¹¤ëÈëÌ©¸°¤ò»ÈÍѤ·¤ÆÀ¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¤³¤È¤¬³Îǧ¤µ¤ì¤Þ¤¹¡£.DSA¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¸ø³«¸°¤Î¾ÚÌÀ½ñ(¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó)¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢¤³¤Î¼ê½ç¤Ç¤Ï¡¢ÌÜŪ¤Î½ð̾¤¬¡¢Âбþ¤¹¤ë½ð̾(.SF)¥Õ¥¡¥¤¥ëÆâ¤ÎÍ­¸ú¤Ê½ð̾¤Ç¤¢¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¡¢.SF¥Õ¥¡¥¤¥ë¤¬²þÊѤµ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤â³Îǧ¤µ¤ì¤Þ¤¹¡£
+-.TP 3
+-2.
+-.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥¨¥ó¥È¥ê¤Î¥À¥¤¥¸¥§¥¹¥È¤ò¥Þ¥Ë¥Õ¥§¥¹¥ÈÆâ¤ÎÂбþ¤¹¤ë³Æ¥»¥¯¥·¥ç¥ó¤ÈÆͤ­¤¢¤ï¤»¤Æ¸¡¾Ú¤·¤Þ¤¹¡£
++.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
+-.SF¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÁ´ÂΤΥϥ工夬³ÊǼ¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤¬¥Ç¥Õ¥©¥ë¥È¤Ç´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥Ø¥Ã¥À¡¼¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¡¢¥Ø¥Ã¥À¡¼Æâ¤Î¥Ï¥Ã¥·¥å¤¬¼ÂºÝ¤Ë¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò¸¡¾Ú¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Ï¥Ã¥·¥å¤¬°ìÃפ¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¼ê½ç¤Ë¸¡¾Ú¤¬¿Ê¤ß¤Þ¤¹¡£
++.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
++.SH "Îã"
++.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
++ m = entry is listed in manifest
++ k = at least one certificate was found in keystore
++
++ 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
++ m = entry is listed in manifest
++ k = at least one certificate was found in keystore
++
++ 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
++ m = entry is listed in manifest
++ k = at least one certificate was found in keystore
++ i = at least one certificate was found in identity scope
++
++ jar verified\&.
++.fi
++.if n \{\
++.RE
++.\}
++.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
+-¥Ï¥Ã¥·¥å¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢¸úΨŪ¤Ë¤ÏÎô¤ëÊýË¡¤ò»ÈÍѤ·¤¿¸¡¾Ú¤¬É¬Íפˤʤê¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Î³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊ󥻥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤¬³Îǧ¤µ¤ì¤Þ¤¹(½ð̾(.SF)¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£
++.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
+-.SF¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼¤Ë³ÊǼ¤µ¤ì¤¿¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È¡¢¼ÂºÝ¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤È¤¬°ìÃפ·¤Ê¤¤¾ì¹ç¤Ï¡¢½ð̾(¤Ä¤Þ¤ê.SF¥Õ¥¡¥¤¥ë)¤ÎÀ¸À®¸å¤Ë¡¢JAR¥Õ¥¡¥¤¥ë¤Ë1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤¬(\f2jar\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ)Äɲ䵤줿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\f2jar\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¥Õ¥¡¥¤¥ë¤òÄɲä·¤¿¾ì¹ç¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤¹(¿·¤·¤¤¥Õ¥¡¥¤¥ëÍѤΥ»¥¯¥·¥ç¥ó¤¬Äɲ䵤ì¤Þ¤¹)¤¬¡¢.SF¥Õ¥¡¥¤¥ë¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¡£¤³¤Î¾ì¹ç¡¢.SF¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¡¼°Ê³°¤Î¥»¥¯¥·¥ç¥ó¤Ë³ÊǼ¤µ¤ì¤¿¥Ï¥Ã¥·¥å¤¬¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î¥Ï¥Ã¥·¥å¤È°ìÃפ¹¤ë¤È¤­¤Ï¡¢½ð̾¤ÎÀ¸À®»þ¤ËJAR¥Õ¥¡¥¤¥ëÆâ¤Ë¸ºß¤·¤Æ¤¤¤¿¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢¤É¤Î¥Õ¥¡¥¤¥ë¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤Ë¤Ê¤ê¡¢¸¡¾Ú¤ÏÀ®¸ù¤·¤¿¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
+-.TP 3
+-3.
+-JAR¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢.SF¥Õ¥¡¥¤¥ëÆâ¤Ë¥¨¥ó¥È¥ê¤ò»ý¤Ä³Æ¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£Æɹþ¤ßÃæ¤Ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ò·×»»¤·¡¢·ë²Ì¤ò¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥»¥¯¥·¥ç¥óÆâ¤Î³ºÅö¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥À¥¤¥¸¥§¥¹¥È¤ÈÈæ³Ó¤·¤Þ¤¹¡£2¤Ä¤Î¥À¥¤¥¸¥§¥¹¥È¤ÏƱ¤¸¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¡¢¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¸¡¾Ú¤¬¼ºÇÔ¤·¤Þ¤¹¡£
++.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
+-
+-.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
+-.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¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤ë¾ì¹ç¤Î¤ß¤Ç¤¹¡£
++.sp
++.RS 4
++.ie n \{\
++\h'-04' 2.\h'+01'\c
++.\}
++.el \{\
++.sp -1
++.IP " 2." 4.2
++.\}
++¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë/¥­¡¼¥¹¥È¥¢¤ÎÁȹ礻¤Ï¡¢¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡¦¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¿®Íê¤Ç¤­¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹¡£
+ .RE
+-
+-.LP
+-.RS 3
+-.TP 3
+-\-keystore url
+-¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¼¨¤¹URL¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¥Õ¥¡¥¤¥ë\f2.keystore\fP¤Ç¤¹¡£¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢user.home¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ë¤è¤Ã¤Æ·è¤Þ¤ê¤Þ¤¹¡£
++.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
+-.br
+-½ð̾¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤¬É¬ÍפǤ¹¡£¤³¤Î¤¿¤á¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç(¤Þ¤¿¤Ï¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç)¤Ï¡¢¥­¡¼¥¹¥È¥¢¤òÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+-.br
+-.br
+-¸¡¾Ú¤¹¤ë¤È¤­¤Ï¥­¡¼¥¹¥È¥¢¤Ï\f2ɬÍפ¢¤ê¤Þ¤»¤ó\fP¡£¤¿¤À¤·¡¢¥­¡¼¥¹¥È¥¢¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¤¬Â¸ºß¤·¤Æ¤¤¤Æ¡¢¤µ¤é¤Ë\f2\-verbose\fP¥ª¥×¥·¥ç¥ó¤â»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢JAR¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤¬¤½¤Î¥­¡¼¥¹¥È¥¢¤Ë1¤Ä¤Ç¤â´Þ¤Þ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë´Ø¤¹¤ëÄɲþðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£
+-.br
+-.br
+-Ãí°Õ: \f2\-keystore\fP¤Î°ú¿ô¤Ë¤Ï¡¢URL¤Î¤«¤ï¤ê¤Ë¥Õ¥¡¥¤¥ë̾(¤È¥Ñ¥¹)¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥Õ¥¡¥¤¥ë̾(¤È¥Ñ¥¹)¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¡Öfile:¡×URL¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
+-.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
+-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
+-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
+- \-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
+- \-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¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
+-.nf
+-\f3
+-.fl
+-\-altsignerpath /home/user/lib/authsigner.jar
+-.fl
+-\fP
+-.fi
+-JAR¥Õ¥¡¥¤¥ë̾¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+-.br
+-.br
+-¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
+-.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¤Ä¤Î¥¨¥ó¥È¥ê(¤ª¤è¤Ó¤½¤ì°Ê¾å)¡×¤È¤·¤ÆÍ×Ì󤵤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢Îã¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+-.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
+- 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
+- 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
+- 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 @
+-.fi
+-http://docs.oracle.com/javase/tutorial/security/index.html¤ò»²¾È
+-.RE
+-
+-.LP
+-
++'pl 8.5i
++'bp
+--- ./jdk/src/solaris/doc/sun/man/man1/jarsigner.1 Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/solaris/doc/sun/man/man1/jarsigner.1 Thu Dec 19 09:01:16 2013 -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"
++'\" 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 *
++.\" -----------------------------------------------------------------
+
+-.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
++.SH NAME
++jarsigner \- Signs and verifies Java Archive (JAR) files\&.
++.SH SYNOPSIS
++.sp
++.nf
+
+-.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
++\fBjarsigner\fR [ \fIoptions\fR ] \fIjar\-file\fR \fIalias\fR
++.fi
++.nf
+
+-.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
++\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\&.
+
+-.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
++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\&.
+
+-.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
++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
+
+-.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
++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
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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.
++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
+-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.
++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
+-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.
++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
+-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).
++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
+-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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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\&.
+
+-.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
++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
+
+-.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.
++.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
+-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).
++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
+-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.
++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
+-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.
++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
+-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.
++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
+-.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
++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
+
+-.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
++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
+
+-.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
++.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
+
+-.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
++.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
+
+-.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
++.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
+
+-.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
++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
+
+-.LP
+-.LP
+-If the verification is successful,
+-.LP
+-.nf
+-\f3
+-.fl
+- jar verified.
+-.fl
+-\fP
+-.fi
++.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
+
+-.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
++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
+
+-.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
+-
++.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/native/java/net/net_util_md.c Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.c Thu Dec 19 09:01:16 2013 -0800
+@@ -138,8 +138,7 @@
+ * of the parameter is assumed to be an 'int'. If the parameter
+ * cannot be obtained return -1
+ */
+-static int
+-getParam(char *driver, char *param)
++int net_getParam(char *driver, char *param)
+ {
+ struct strioctl stri;
+ char buf [64];
+@@ -166,7 +165,7 @@
+
+ /*
+ * Iterative way to find the max value that SO_SNDBUF or SO_RCVBUF
+- * for Solaris versions that do not support the ioctl() in getParam().
++ * for Solaris versions that do not support the ioctl() in net_getParam().
+ * Ugly, but only called once (for each sotype).
+ *
+ * As an optimisation, we make a guess using the default values for Solaris
+@@ -1407,7 +1406,7 @@
+ * If that fails, we use the search algorithm in findMaxBuf()
+ */
+ if (!init_tcp_max_buf && sotype == SOCK_STREAM) {
+- tcp_max_buf = getParam("/dev/tcp", "tcp_max_buf");
++ tcp_max_buf = net_getParam("/dev/tcp", "tcp_max_buf");
+ if (tcp_max_buf == -1) {
+ tcp_max_buf = findMaxBuf(fd, opt, SOCK_STREAM);
+ if (tcp_max_buf == -1) {
+@@ -1416,7 +1415,7 @@
+ }
+ init_tcp_max_buf = 1;
+ } else if (!init_udp_max_buf && sotype == SOCK_DGRAM) {
+- udp_max_buf = getParam("/dev/udp", "udp_max_buf");
++ udp_max_buf = net_getParam("/dev/udp", "udp_max_buf");
+ if (udp_max_buf == -1) {
+ udp_max_buf = findMaxBuf(fd, opt, SOCK_DGRAM);
+ if (udp_max_buf == -1) {
+--- ./jdk/src/solaris/native/java/net/net_util_md.h Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.h Thu Dec 19 09:01:16 2013 -0800
+@@ -81,6 +81,9 @@
+ int getDefaultIPv6Interface(struct in6_addr *target_addr);
+ #endif
+
++#ifdef __solaris__
++extern int net_getParam(char *driver, char *param);
++#endif
+
+ /* needed from libsocket on Solaris 8 */
+
+--- ./jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c Thu Dec 19 09:01:16 2013 -0800
+@@ -577,8 +577,8 @@
+ SplashUnlock(splash);
+ rc = poll(pfd, 2, timeout);
+ SplashLock(splash);
+- if (splash->isVisible>0 && SplashTime() >= splash->time +
+- splash->frames[splash->currentFrame].delay) {
++ if (splash->isVisible > 0 && splash->currentFrame >= 0 &&
++ SplashTime() >= splash->time + splash->frames[splash->currentFrame].delay) {
+ SplashNextFrame(splash);
+ SplashUpdateShape(splash);
+ SplashRedrawWindow(splash);
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/solaris/native/sun/net/portconfig.c Thu Dec 19 09:01:16 2013 -0800
+@@ -0,0 +1,122 @@
++/*
++ * 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 <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <errno.h>
++
++#if defined(_ALLBSD_SOURCE)
++#include <sys/sysctl.h>
++#endif
++
++#include "jni.h"
++#include "net_util.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++struct portrange {
++ int lower;
++ int higher;
++};
++
++static int getPortRange(struct portrange *range)
++{
++#ifdef __linux__
++ {
++ int ret;
++ FILE *f;
++
++ f = fopen("/proc/sys/net/ipv4/ip_local_port_range", "r");
++ if (f != NULL) {
++ ret = fscanf(f, "%d %d", &range->lower, &range->higher);
++ fclose(f);
++ return ret == 2 ? 0 : -1;
++ }
++ return -1;
++ }
++
++#elif defined(__solaris__)
++ {
++ range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port");
++ range->higher = net_getParam("/dev/tcp", "tcp_largest_anon_port");
++ return 0;
++ }
++#elif defined(_ALLBSD_SOURCE)
++ {
++ int ret;
++ size_t size = sizeof(range->lower);
++ ret = sysctlbyname(
++ "net.inet.ip.portrange.first", &range->lower, &size, 0, 0
++ );
++ if (ret == -1) {
++ return -1;
++ }
++ size = sizeof(range->higher);
++ ret = sysctlbyname(
++ "net.inet.ip.portrange.last", &range->higher, &size, 0, 0
++ );
++ return ret;
++ }
++#else
++ return -1;
++#endif
++}
++
++/*
++ * Class: sun_net_PortConfig
++ * Method: getLower0
++ * Signature: ()I
++ */
++JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getLower0
++ (JNIEnv *env, jclass clazz)
++{
++ struct portrange range;
++ if (getPortRange(&range) < 0) {
++ return -1;
++ }
++ return range.lower;
++}
++
++/*
++ * Class: sun_net_PortConfig
++ * Method: getUpper
++ * Signature: ()I
++ */
++JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getUpper0
++ (JNIEnv *env, jclass clazz)
++{
++ struct portrange range;
++ if (getPortRange(&range) < 0) {
++ return -1;
++ }
++ return range.higher;
++}
++
++#ifdef __cplusplus
++}
++#endif
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/windows/classes/sun/net/PortConfig.java Thu Dec 19 09:01:16 2013 -0800
+@@ -0,0 +1,65 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package sun.net;
++
++import java.security.AccessController;
++
++/**
++ * Determines the ephemeral port range in use on this system.
++ * If this cannot be determined, then the default settings
++ * of the OS are returned.
++ */
++
++public final class PortConfig {
++
++ private final static int upper, lower;
++
++ private PortConfig() {}
++
++ static {
++ AccessController.doPrivileged(
++ new java.security.PrivilegedAction<Void>() {
++ public Void run() {
++ System.loadLibrary("net");
++ return null;
++ }
++ });
++
++ lower = getLower0();
++ upper = getUpper0();
++ }
++
++ static native int getLower0();
++ static native int getUpper0();
++
++ public static int getLower() {
++ return lower;
++ }
++
++ public static int getUpper() {
++ return upper;
++ }
++}
+--- ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java Thu Dec 19 09:01:16 2013 -0800
+@@ -31,6 +31,9 @@
+ import java.net.*;
+ import java.util.concurrent.*;
+ import java.io.IOException;
++import java.security.AccessController;
++import java.security.PrivilegedActionException;
++import java.security.PrivilegedExceptionAction;
+ import sun.misc.Unsafe;
+
+ /**
+@@ -300,6 +303,19 @@
+ }
+ }
+
++ private void doPrivilegedBind(final SocketAddress sa) throws IOException {
++ try {
++ AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
++ public Void run() throws IOException {
++ bind(sa);
++ return null;
++ }
++ });
++ } catch (PrivilegedActionException e) {
++ throw (IOException) e.getException();
++ }
++ }
++
+ @Override
+ <A> Future<Void> implConnect(SocketAddress remote,
+ A attachment,
+@@ -330,7 +346,12 @@
+ throw new ConnectionPendingException();
+ if (localAddress == null) {
+ try {
+- bind(new InetSocketAddress(0));
++ SocketAddress any = new InetSocketAddress(0);
++ if (sm == null) {
++ bind(any);
++ } else {
++ doPrivilegedBind(any);
++ }
+ } catch (IOException x) {
+ bindException = x;
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/windows/native/sun/net/portconfig.c Thu Dec 19 09:01:16 2013 -0800
+@@ -0,0 +1,106 @@
++/*
++ * 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 <windows.h>
++#include "jni.h"
++#include "net_util.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++struct portrange {
++ int lower;
++ int higher;
++};
++
++static int getPortRange(struct portrange *range)
++{
++ OSVERSIONINFO ver;
++ ver.dwOSVersionInfoSize = sizeof(ver);
++ GetVersionEx(&ver);
++
++ /* Check for major version 5 or less = Windows XP/2003 or older */
++ if (ver.dwMajorVersion <= 5) {
++ LONG ret;
++ HKEY hKey;
++ range->lower = 1024;
++ range->higher = 4999;
++
++ /* check registry to see if upper limit was raised */
++ ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
++ "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters",
++ 0, KEY_READ, (PHKEY)&hKey
++ );
++ if (ret == ERROR_SUCCESS) {
++ DWORD maxuserport;
++ ULONG ulType;
++ DWORD dwLen = sizeof(maxuserport);
++ ret = RegQueryValueEx(hKey, "MaxUserPort", NULL, &ulType,
++ (LPBYTE)&maxuserport, &dwLen);
++ RegCloseKey(hKey);
++ if (ret == ERROR_SUCCESS) {
++ range->higher = maxuserport;
++ }
++ }
++ } else {
++ /* There doesn't seem to be an API to access this. "MaxUserPort"
++ * is affected, but is not sufficient to determine.
++ * so we just use the defaults, which are less likely to change
++ */
++ range->lower = 49152;
++ range->higher = 65535;
++ }
++ return 0;
++}
++
++/*
++ * Class: sun_net_PortConfig
++ * Method: getLower0
++ * Signature: ()I
++ */
++JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getLower0
++ (JNIEnv *env, jclass clazz)
++{
++ struct portrange range;
++ getPortRange(&range);
++ return range.lower;
++}
++
++/*
++ * Class: sun_net_PortConfig
++ * Method: getUpper0
++ * Signature: ()I
++ */
++JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getUpper0
++ (JNIEnv *env, jclass clazz)
++{
++ struct portrange range;
++ getPortRange(&range);
++ return range.higher;
++}
++#ifdef __cplusplus
++}
++#endif
+--- ./jdk/test/ProblemList.txt Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/ProblemList.txt Thu Dec 19 09:01:16 2013 -0800
+@@ -456,6 +456,9 @@
+ # 7041639, Solaris DSA keypair generation bug
+ java/util/TimeZone/TimeZoneDatePermissionCheck.sh solaris-all
+
++# 8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing
++sun/util/resources/TimeZone/Bug6317929.java generic-all
++
+ ############################################################################
+
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java Thu Dec 19 09:01:16 2013 -0800
+@@ -0,0 +1,61 @@
++/*
++ * 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 8028215
++ * @summary SetDefaultORBTest setting ORB impl via properties test
++ * @run main/othervm SetDefaultORBTest
++ *
++ */
++
++import java.util.Properties;
++
++import org.omg.CORBA.ORB;
++
++
++public class SetDefaultORBTest {
++
++ public static void main(String[] args) {
++ Properties systemProperties = System.getProperties();
++ systemProperties.setProperty("org.omg.CORBA.ORBSingletonClass",
++ "com.sun.corba.se.impl.orb.ORBSingleton");
++ System.setSecurityManager(new SecurityManager());
++ Properties props = new Properties();
++ props.put("org.omg.CORBA.ORBClass", "com.sun.corba.se.impl.orb.ORBImpl");
++ ORB orb = ORB.init(args, props);
++ Class<?> orbClass = orb.getClass();
++ if (orbClass.getName().equals("com.sun.corba.se.impl.orb.ORBImpl")) {
++ System.out.println("orbClass is com.sun.corba.se.impl.orb.ORBimpl as expected");
++ } else {
++ throw new RuntimeException("com.sun.corba.se.impl.orb.ORBimpl class expected for ORBImpl");
++ }
++ ORB singletonORB = ORB.init();
++ Class<?> singletoneOrbClass = singletonORB.getClass();
++ if (singletoneOrbClass.getName().equals("com.sun.corba.se.impl.orb.ORBSingleton")) {
++ System.out.println("singeletonOrbClass is com.sun.corba.se.impl.orb.ORBSingleton as expected");
++ } else {
++ throw new RuntimeException("com.sun.corba.se.impl.orb.ORBSingleton class expected for ORBSingleton");
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java Thu Dec 19 09:01:16 2013 -0800
+@@ -0,0 +1,420 @@
++/*
++ * 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 8014618
++ * @summary Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
++ * @author Pasi Eronen
++ */
++
++import java.io.*;
++import java.security.*;
++import java.security.spec.*;
++import java.security.interfaces.*;
++import javax.crypto.*;
++import javax.crypto.spec.*;
++import javax.crypto.interfaces.*;
++import com.sun.crypto.provider.SunJCE;
++
++/**
++ * Test that leading zeroes are stripped in TlsPremasterSecret case,
++ * but are left as-is in other cases.
++ *
++ * We use pre-generated keypairs, since with randomly generated keypairs,
++ * a leading zero happens only (roughly) 1 out of 256 cases.
++ */
++
++public class TestLeadingZeroes {
++
++ private static final String SUNJCE = "SunJCE";
++
++ private TestLeadingZeroes() {}
++
++ public static void main(String argv[]) throws Exception {
++ // Add JCE to the list of providers
++ SunJCE jce = new SunJCE();
++ Security.addProvider(jce);
++
++ TestLeadingZeroes keyAgree = new TestLeadingZeroes();
++ keyAgree.run();
++ System.out.println("Test Passed");
++ }
++
++ private void run() throws Exception {
++
++ // decode pre-generated keypairs
++ KeyFactory kfac = KeyFactory.getInstance("DH");
++ PublicKey alicePubKey =
++ kfac.generatePublic(new X509EncodedKeySpec(alicePubKeyEnc));
++ PublicKey bobPubKey =
++ kfac.generatePublic(new X509EncodedKeySpec(bobPubKeyEnc));
++ PrivateKey alicePrivKey =
++ kfac.generatePrivate(new PKCS8EncodedKeySpec(alicePrivKeyEnc));
++ PrivateKey bobPrivKey =
++ kfac.generatePrivate(new PKCS8EncodedKeySpec(bobPrivKeyEnc));
++
++ // generate normal shared secret
++ KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", SUNJCE);
++ aliceKeyAgree.init(alicePrivKey);
++ aliceKeyAgree.doPhase(bobPubKey, true);
++ byte[] sharedSecret = aliceKeyAgree.generateSecret();
++ System.out.println("shared secret:\n" + toHexString(sharedSecret));
++
++ // verify that leading zero is present
++ if (sharedSecret.length != 128) {
++ throw new Exception("Unexpected shared secret length");
++ }
++ if (sharedSecret[0] != 0) {
++ throw new Exception("First byte is not zero as expected");
++ }
++
++ // now, test TLS premaster secret
++ aliceKeyAgree.init(alicePrivKey);
++ aliceKeyAgree.doPhase(bobPubKey, true);
++ byte[] tlsPremasterSecret =
++ aliceKeyAgree.generateSecret("TlsPremasterSecret").getEncoded();
++ System.out.println(
++ "tls premaster secret:\n" + toHexString(tlsPremasterSecret));
++
++ // check that leading zero has been stripped
++ if (tlsPremasterSecret.length != 127) {
++ throw new Exception("Unexpected TLS premaster secret length");
++ }
++ if (tlsPremasterSecret[0] == 0) {
++ throw new Exception("First byte is zero");
++ }
++ for (int i = 0; i < tlsPremasterSecret.length; i++) {
++ if (tlsPremasterSecret[i] != sharedSecret[i+1]) {
++ throw new Exception("Shared secrets differ");
++ }
++ }
++
++ }
++
++ /*
++ * Converts a byte to hex digit and writes to the supplied buffer
++ */
++ private void byte2hex(byte b, StringBuffer buf) {
++ char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
++ '9', 'A', 'B', 'C', 'D', 'E', 'F' };
++ int high = ((b & 0xf0) >> 4);
++ int low = (b & 0x0f);
++ buf.append(hexChars[high]);
++ buf.append(hexChars[low]);
++ }
++
++ /*
++ * Converts a byte array to hex string
++ */
++ private String toHexString(byte[] block) {
++ StringBuffer buf = new StringBuffer();
++
++ int len = block.length;
++
++ for (int i = 0; i < len; i++) {
++ byte2hex(block[i], buf);
++ if (i < len-1) {
++ buf.append(":");
++ }
++ }
++ return buf.toString();
++ }
++
++ private static final byte alicePubKeyEnc[] = {
++ (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x24,
++ (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
++ (byte)0x09, (byte)0x2A, (byte)0x86, (byte)0x48,
++ (byte)0x86, (byte)0xF7, (byte)0x0D, (byte)0x01,
++ (byte)0x03, (byte)0x01, (byte)0x30, (byte)0x81,
++ (byte)0x8B, (byte)0x02, (byte)0x81, (byte)0x81,
++ (byte)0x00, (byte)0xF4, (byte)0x88, (byte)0xFD,
++ (byte)0x58, (byte)0x4E, (byte)0x49, (byte)0xDB,
++ (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D,
++ (byte)0xE4, (byte)0x91, (byte)0x07, (byte)0x36,
++ (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38,
++ (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
++ (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C,
++ (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E,
++ (byte)0xF6, (byte)0xF3, (byte)0xC9, (byte)0x23,
++ (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5,
++ (byte)0x5B, (byte)0x18, (byte)0x8D, (byte)0x8E,
++ (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8,
++ (byte)0x5D, (byte)0x38, (byte)0xD3, (byte)0x34,
++ (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57,
++ (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
++ (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21,
++ (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF,
++ (byte)0x3C, (byte)0xE1, (byte)0xB1, (byte)0x29,
++ (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D,
++ (byte)0x7C, (byte)0x84, (byte)0xA7, (byte)0x0A,
++ (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4,
++ (byte)0x03, (byte)0x19, (byte)0xC8, (byte)0x07,
++ (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95,
++ (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
++ (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50,
++ (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3,
++ (byte)0x08, (byte)0x3D, (byte)0x66, (byte)0xA4,
++ (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C,
++ (byte)0x7C, (byte)0xBD, (byte)0x89, (byte)0x4B,
++ (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA,
++ (byte)0xAB, (byte)0xA2, (byte)0x5E, (byte)0xC3,
++ (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78,
++ (byte)0xC7, (byte)0x02, (byte)0x01, (byte)0x02,
++ (byte)0x02, (byte)0x02, (byte)0x02, (byte)0x00,
++ (byte)0x03, (byte)0x81, (byte)0x85, (byte)0x00,
++ (byte)0x02, (byte)0x81, (byte)0x81, (byte)0x00,
++ (byte)0xEE, (byte)0xD6, (byte)0xB1, (byte)0xA3,
++ (byte)0xB4, (byte)0x78, (byte)0x2B, (byte)0x35,
++ (byte)0xEF, (byte)0xCD, (byte)0x17, (byte)0x86,
++ (byte)0x63, (byte)0x2B, (byte)0x97, (byte)0x0E,
++ (byte)0x7A, (byte)0xD1, (byte)0xFF, (byte)0x7A,
++ (byte)0xEB, (byte)0x57, (byte)0x61, (byte)0xA1,
++ (byte)0xF7, (byte)0x90, (byte)0x11, (byte)0xA7,
++ (byte)0x79, (byte)0x28, (byte)0x69, (byte)0xBA,
++ (byte)0xA7, (byte)0xB2, (byte)0x37, (byte)0x17,
++ (byte)0xAE, (byte)0x3C, (byte)0x92, (byte)0x89,
++ (byte)0x88, (byte)0xE5, (byte)0x7E, (byte)0x8E,
++ (byte)0xF0, (byte)0x24, (byte)0xD0, (byte)0xE1,
++ (byte)0xC4, (byte)0xB0, (byte)0x26, (byte)0x5A,
++ (byte)0x1E, (byte)0xBD, (byte)0xA0, (byte)0xCF,
++ (byte)0x3E, (byte)0x97, (byte)0x2A, (byte)0x13,
++ (byte)0x92, (byte)0x3B, (byte)0x39, (byte)0xD0,
++ (byte)0x1D, (byte)0xA3, (byte)0x6B, (byte)0x3E,
++ (byte)0xC2, (byte)0xBB, (byte)0x14, (byte)0xB6,
++ (byte)0xE2, (byte)0x4C, (byte)0x0E, (byte)0x5B,
++ (byte)0x4B, (byte)0xA4, (byte)0x9D, (byte)0xA6,
++ (byte)0x21, (byte)0xB0, (byte)0xF9, (byte)0xDE,
++ (byte)0x55, (byte)0xAE, (byte)0x5C, (byte)0x29,
++ (byte)0x0E, (byte)0xC1, (byte)0xFC, (byte)0xBA,
++ (byte)0x51, (byte)0xD3, (byte)0xB6, (byte)0x6D,
++ (byte)0x75, (byte)0x72, (byte)0xDF, (byte)0x43,
++ (byte)0xAB, (byte)0x94, (byte)0x21, (byte)0x6E,
++ (byte)0x0C, (byte)0xD1, (byte)0x93, (byte)0x54,
++ (byte)0x56, (byte)0x7D, (byte)0x4B, (byte)0x90,
++ (byte)0xF1, (byte)0x94, (byte)0x45, (byte)0xD4,
++ (byte)0x2A, (byte)0x71, (byte)0xA1, (byte)0xB8,
++ (byte)0xDD, (byte)0xAA, (byte)0x05, (byte)0xF0,
++ (byte)0x27, (byte)0x37, (byte)0xBD, (byte)0x44
++ };
++
++ private static final byte alicePrivKeyEnc[] = {
++ (byte)0x30, (byte)0x81, (byte)0xE3, (byte)0x02,
++ (byte)0x01, (byte)0x00, (byte)0x30, (byte)0x81,
++ (byte)0x99, (byte)0x06, (byte)0x09, (byte)0x2A,
++ (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xF7,
++ (byte)0x0D, (byte)0x01, (byte)0x03, (byte)0x01,
++ (byte)0x30, (byte)0x81, (byte)0x8B, (byte)0x02,
++ (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xF4,
++ (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
++ (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20,
++ (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91,
++ (byte)0x07, (byte)0x36, (byte)0x6B, (byte)0x33,
++ (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45,
++ (byte)0x1D, (byte)0x0F, (byte)0x7C, (byte)0x88,
++ (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B,
++ (byte)0x2D, (byte)0x8E, (byte)0xF6, (byte)0xF3,
++ (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43,
++ (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
++ (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55,
++ (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38,
++ (byte)0xD3, (byte)0x34, (byte)0xFD, (byte)0x7C,
++ (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3,
++ (byte)0x1D, (byte)0x18, (byte)0x6C, (byte)0xDE,
++ (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5,
++ (byte)0x2A, (byte)0xFF, (byte)0x3C, (byte)0xE1,
++ (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18,
++ (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
++ (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6,
++ (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19,
++ (byte)0xC8, (byte)0x07, (byte)0x29, (byte)0x7A,
++ (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9,
++ (byte)0x96, (byte)0x9F, (byte)0xAB, (byte)0xD0,
++ (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02,
++ (byte)0x46, (byte)0xD3, (byte)0x08, (byte)0x3D,
++ (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41,
++ (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
++ (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19,
++ (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2,
++ (byte)0x5E, (byte)0xC3, (byte)0x55, (byte)0xE9,
++ (byte)0x2F, (byte)0x78, (byte)0xC7, (byte)0x02,
++ (byte)0x01, (byte)0x02, (byte)0x02, (byte)0x02,
++ (byte)0x02, (byte)0x00, (byte)0x04, (byte)0x42,
++ (byte)0x02, (byte)0x40, (byte)0x36, (byte)0x4D,
++ (byte)0xD0, (byte)0x58, (byte)0x64, (byte)0x91,
++ (byte)0x78, (byte)0xA2, (byte)0x4B, (byte)0x79,
++ (byte)0x46, (byte)0xFE, (byte)0xC9, (byte)0xD9,
++ (byte)0xCA, (byte)0x5C, (byte)0xF9, (byte)0xFD,
++ (byte)0x6C, (byte)0x5D, (byte)0x76, (byte)0x3A,
++ (byte)0x41, (byte)0x6D, (byte)0x44, (byte)0x62,
++ (byte)0x75, (byte)0x93, (byte)0x81, (byte)0x93,
++ (byte)0x00, (byte)0x4C, (byte)0xB1, (byte)0xD8,
++ (byte)0x7D, (byte)0x9D, (byte)0xF3, (byte)0x16,
++ (byte)0x2C, (byte)0x6C, (byte)0x9F, (byte)0x7A,
++ (byte)0x84, (byte)0xA3, (byte)0x7A, (byte)0xC1,
++ (byte)0x4F, (byte)0x60, (byte)0xE3, (byte)0xB5,
++ (byte)0x86, (byte)0x28, (byte)0x08, (byte)0x4D,
++ (byte)0x94, (byte)0xB6, (byte)0x04, (byte)0x0D,
++ (byte)0xAC, (byte)0xBD, (byte)0x1F, (byte)0x42,
++ (byte)0x8F, (byte)0x1B
++ };
++
++ private static final byte bobPubKeyEnc[] = {
++ (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x23,
++ (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
++ (byte)0x09, (byte)0x2A, (byte)0x86, (byte)0x48,
++ (byte)0x86, (byte)0xF7, (byte)0x0D, (byte)0x01,
++ (byte)0x03, (byte)0x01, (byte)0x30, (byte)0x81,
++ (byte)0x8B, (byte)0x02, (byte)0x81, (byte)0x81,
++ (byte)0x00, (byte)0xF4, (byte)0x88, (byte)0xFD,
++ (byte)0x58, (byte)0x4E, (byte)0x49, (byte)0xDB,
++ (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D,
++ (byte)0xE4, (byte)0x91, (byte)0x07, (byte)0x36,
++ (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38,
++ (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
++ (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C,
++ (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E,
++ (byte)0xF6, (byte)0xF3, (byte)0xC9, (byte)0x23,
++ (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5,
++ (byte)0x5B, (byte)0x18, (byte)0x8D, (byte)0x8E,
++ (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8,
++ (byte)0x5D, (byte)0x38, (byte)0xD3, (byte)0x34,
++ (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57,
++ (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
++ (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21,
++ (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF,
++ (byte)0x3C, (byte)0xE1, (byte)0xB1, (byte)0x29,
++ (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D,
++ (byte)0x7C, (byte)0x84, (byte)0xA7, (byte)0x0A,
++ (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4,
++ (byte)0x03, (byte)0x19, (byte)0xC8, (byte)0x07,
++ (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95,
++ (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
++ (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50,
++ (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3,
++ (byte)0x08, (byte)0x3D, (byte)0x66, (byte)0xA4,
++ (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C,
++ (byte)0x7C, (byte)0xBD, (byte)0x89, (byte)0x4B,
++ (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA,
++ (byte)0xAB, (byte)0xA2, (byte)0x5E, (byte)0xC3,
++ (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78,
++ (byte)0xC7, (byte)0x02, (byte)0x01, (byte)0x02,
++ (byte)0x02, (byte)0x02, (byte)0x02, (byte)0x00,
++ (byte)0x03, (byte)0x81, (byte)0x84, (byte)0x00,
++ (byte)0x02, (byte)0x81, (byte)0x80, (byte)0x2C,
++ (byte)0x40, (byte)0xFA, (byte)0xF6, (byte)0xA6,
++ (byte)0xF8, (byte)0xAC, (byte)0xC2, (byte)0x4F,
++ (byte)0xCD, (byte)0xC7, (byte)0x37, (byte)0x93,
++ (byte)0xE5, (byte)0xE4, (byte)0x5E, (byte)0x18,
++ (byte)0x14, (byte)0xE6, (byte)0x50, (byte)0xDA,
++ (byte)0x55, (byte)0x38, (byte)0x5D, (byte)0x24,
++ (byte)0xF5, (byte)0x42, (byte)0x68, (byte)0x5F,
++ (byte)0xF5, (byte)0x15, (byte)0xC8, (byte)0x9B,
++ (byte)0x5D, (byte)0x06, (byte)0x3D, (byte)0xE1,
++ (byte)0x52, (byte)0x2F, (byte)0x98, (byte)0xFF,
++ (byte)0x37, (byte)0xBB, (byte)0x75, (byte)0x48,
++ (byte)0x48, (byte)0xE9, (byte)0x65, (byte)0x84,
++ (byte)0x37, (byte)0xBB, (byte)0xB3, (byte)0xE9,
++ (byte)0x36, (byte)0x01, (byte)0xB4, (byte)0x6A,
++ (byte)0x1C, (byte)0xB2, (byte)0x11, (byte)0x82,
++ (byte)0xCE, (byte)0x3D, (byte)0x65, (byte)0xE5,
++ (byte)0x3C, (byte)0x89, (byte)0xE9, (byte)0x52,
++ (byte)0x19, (byte)0xBD, (byte)0x58, (byte)0xF6,
++ (byte)0xA2, (byte)0x03, (byte)0xA8, (byte)0xB2,
++ (byte)0xA5, (byte)0xDB, (byte)0xEB, (byte)0xF5,
++ (byte)0x94, (byte)0xF9, (byte)0x46, (byte)0xBE,
++ (byte)0x45, (byte)0x4C, (byte)0x65, (byte)0xD2,
++ (byte)0xD1, (byte)0xCF, (byte)0xFF, (byte)0xFF,
++ (byte)0xFA, (byte)0x38, (byte)0xF1, (byte)0x72,
++ (byte)0xAB, (byte)0xB9, (byte)0x14, (byte)0x4E,
++ (byte)0xF5, (byte)0xF0, (byte)0x7A, (byte)0x8E,
++ (byte)0x45, (byte)0xFD, (byte)0x5B, (byte)0xF9,
++ (byte)0xA2, (byte)0x97, (byte)0x1B, (byte)0xAE,
++ (byte)0x2C, (byte)0x7B, (byte)0x6B, (byte)0x7C,
++ (byte)0x98, (byte)0xFE, (byte)0x58, (byte)0xDD,
++ (byte)0xBE, (byte)0xF6, (byte)0x1C, (byte)0x8E,
++ (byte)0xD0, (byte)0xA1, (byte)0x72
++ };
++
++ private static final byte bobPrivKeyEnc[] = {
++ (byte)0x30, (byte)0x81, (byte)0xE4, (byte)0x02,
++ (byte)0x01, (byte)0x00, (byte)0x30, (byte)0x81,
++ (byte)0x99, (byte)0x06, (byte)0x09, (byte)0x2A,
++ (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xF7,
++ (byte)0x0D, (byte)0x01, (byte)0x03, (byte)0x01,
++ (byte)0x30, (byte)0x81, (byte)0x8B, (byte)0x02,
++ (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xF4,
++ (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
++ (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20,
++ (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91,
++ (byte)0x07, (byte)0x36, (byte)0x6B, (byte)0x33,
++ (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45,
++ (byte)0x1D, (byte)0x0F, (byte)0x7C, (byte)0x88,
++ (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B,
++ (byte)0x2D, (byte)0x8E, (byte)0xF6, (byte)0xF3,
++ (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43,
++ (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
++ (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55,
++ (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38,
++ (byte)0xD3, (byte)0x34, (byte)0xFD, (byte)0x7C,
++ (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3,
++ (byte)0x1D, (byte)0x18, (byte)0x6C, (byte)0xDE,
++ (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5,
++ (byte)0x2A, (byte)0xFF, (byte)0x3C, (byte)0xE1,
++ (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18,
++ (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
++ (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6,
++ (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19,
++ (byte)0xC8, (byte)0x07, (byte)0x29, (byte)0x7A,
++ (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9,
++ (byte)0x96, (byte)0x9F, (byte)0xAB, (byte)0xD0,
++ (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02,
++ (byte)0x46, (byte)0xD3, (byte)0x08, (byte)0x3D,
++ (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41,
++ (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
++ (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19,
++ (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2,
++ (byte)0x5E, (byte)0xC3, (byte)0x55, (byte)0xE9,
++ (byte)0x2F, (byte)0x78, (byte)0xC7, (byte)0x02,
++ (byte)0x01, (byte)0x02, (byte)0x02, (byte)0x02,
++ (byte)0x02, (byte)0x00, (byte)0x04, (byte)0x43,
++ (byte)0x02, (byte)0x41, (byte)0x00, (byte)0xE0,
++ (byte)0x31, (byte)0xE7, (byte)0x77, (byte)0xB8,
++ (byte)0xD0, (byte)0x7E, (byte)0x0A, (byte)0x9B,
++ (byte)0x94, (byte)0xD5, (byte)0x3D, (byte)0x33,
++ (byte)0x62, (byte)0x32, (byte)0x51, (byte)0xCE,
++ (byte)0x74, (byte)0x5C, (byte)0xA5, (byte)0x72,
++ (byte)0xD9, (byte)0x36, (byte)0xF3, (byte)0x8A,
++ (byte)0x3F, (byte)0x8B, (byte)0xC6, (byte)0xFE,
++ (byte)0xEF, (byte)0x94, (byte)0x8B, (byte)0x50,
++ (byte)0x41, (byte)0x9B, (byte)0x14, (byte)0xC8,
++ (byte)0xE9, (byte)0x1F, (byte)0x24, (byte)0x1F,
++ (byte)0x65, (byte)0x8E, (byte)0xD3, (byte)0x85,
++ (byte)0xD0, (byte)0x68, (byte)0x6C, (byte)0xF1,
++ (byte)0x79, (byte)0x45, (byte)0xD0, (byte)0x06,
++ (byte)0xA4, (byte)0xB8, (byte)0xE0, (byte)0x64,
++ (byte)0xF5, (byte)0x38, (byte)0x72, (byte)0x97,
++ (byte)0x00, (byte)0x23, (byte)0x5F
++ };
++}
++
+--- ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html Thu Dec 19 09:01:16 2013 -0800
+@@ -1,6 +1,5 @@
+ <html>
+-<!--
+-
++<!--
+ @test
+ @bug 8005932
+ @summary Java 7 on mac os x only provides text clipboard formats
+@@ -9,10 +8,9 @@
+ @library ../../regtesthelpers/process
+ @build Util
+ @build ProcessResults ProcessCommunicator
++ @run applet/othervm MissedHtmlAndRtfBug.html
++-->
+
+-
+- @run applet/othervm MissedHtmlAndRtfBug.html
+-*/>
+ <head>
+ <title>Java 7 on mac os x only provides text clipboard formats</title>
+ </head>
+--- ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java Thu Dec 19 09:01:16 2013 -0800
+@@ -22,17 +22,10 @@
+ */
+
+ /*
+- @test
+- @bug 8005932
+- @summary Java 7 on mac os x only provides text clipboard formats
+- @author mikhail.cherkasov@oracle.com
+- @library ../../regtesthelpers
+- @library ../../regtesthelpers/process
+- @build Util
+- @build ProcessResults ProcessCommunicator
+-
+-
+- @run applet/othervm MissedHtmlAndRtfBug.html
++ This is a part of MissedHtmlAndRtfBug.html test. Do not add any JTREG tags here
++ bug 8005932
++ summary Java 7 on mac os x only provides text clipboard formats
++ author mikhail.cherkasov@oracle.com
+ */
+ import java.awt.*;
+ import java.awt.datatransfer.DataFlavor;
+--- ./jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java Thu Dec 19 09:01:16 2013 -0800
+@@ -39,13 +39,10 @@
+ import java.util.Hashtable;
+
+ /*
+-@test
+-@bug 8010009
+-@summary [macosx] Unable type into online word games on MacOSX
+-@author petr.pchelko : area=awt.keyboard
+-@run clean *
+-@run build TestApplet
+-@run applet/manual=yesno KeyReleasedInAppletTest.html
++ This is a part of test KeyReleasedInAppletTest.html. Do not add any JTREG tags here
++ bug 8010009
++ summary [macosx] Unable type into online word games on MacOSX
++ author petr.pchelko : area=awt.keyboard
+ */
+
+ public class KeyReleasedInAppletTest extends JApplet {
+--- ./jdk/test/java/lang/SecurityManager/CheckPackageAccess.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/java/lang/SecurityManager/CheckPackageAccess.java Thu Dec 19 09:01:16 2013 -0800
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 6741606 7146431 8000450
++ * @bug 6741606 7146431 8000450 8022945
+ * @summary Make sure all restricted packages listed in the package.access
+ * property in the java.security file are blocked
+ * @run main/othervm CheckPackageAccess
+@@ -54,7 +54,9 @@
+ "com.sun.imageio.",
+ "com.sun.istack.internal.",
+ "com.sun.jmx.",
++ "com.sun.naming.internal.",
+ "com.sun.proxy.",
++ "com.sun.corba.se.",
+ "com.sun.org.apache.bcel.internal.",
+ "com.sun.org.apache.regexp.internal.",
+ "com.sun.org.apache.xerces.internal.",
+--- ./jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java Thu Dec 19 09:01:16 2013 -0800
+@@ -88,6 +88,17 @@
+ TestLibrary.RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT);
+ rmid.addOptions(new String[]{
+ "-Djava.nio.channels.spi.SelectorProvider=RmidViaInheritedChannel$RmidSelectorProvider"});
++ if (System.getProperty("os.name").startsWith("Windows") &&
++ System.getProperty("os.version").startsWith("5."))
++ {
++ /* Windows XP/2003 or older
++ * Need to expand ephemeral range to include RMI test ports
++ */
++ rmid.addOptions(new String[]{
++ "-Djdk.net.ephemeralPortRange.low=1024",
++ "-Djdk.net.ephemeralPortRange.high=64000"
++ });
++ }
+ rmid.start();
+
+ /*
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Thu Dec 19 09:01:16 2013 -0800
+@@ -29,6 +29,10 @@
+ # @run shell readTest.sh
+
+ OS=`uname -s`
++VER=`uname -r`
++ARGS=""
++REGARGS=""
++
+ case "$OS" in
+ SunOS | Linux | Darwin )
+ PS=":"
+@@ -39,11 +43,19 @@
+ PS=";"
+ FS="\\"
+ FILEURL="file:/"
++ if [ "$VER" -eq "5" ]; then
++ ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
++ REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000"
++ fi
+ ;;
+ CYGWIN* )
+ PS=";"
+ FS="/"
+ FILEURL="file:/"
++ if [ "${VER}" -eq "5" ]; then
++ ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
++ REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000"
++ fi
+ ;;
+ * )
+ echo "Unrecognized system!"
+@@ -61,8 +73,8 @@
+ #start rmiregistry without any local classes on classpath
+ cd rmi_tmp
+ # NOTE: This RMI Registry port must match TestLibrary.READTEST_REGISTRY_PORT
+-${TESTJAVA}${FS}bin${FS}rmiregistry -J-Djava.rmi.server.useCodebaseOnly=false \
+- ${TESTTOOLVMOPTS} 64005 > ..${FS}${RMIREG_OUT} 2>&1 &
++${TESTJAVA}${FS}bin${FS}rmiregistry ${REGARGS} -J-Djava.rmi.server.useCodebaseOnly=false \
++ ${TESTTOOLVMOPTS} 60005 > ..${FS}${RMIREG_OUT} 2>&1 &
+ RMIREG_PID=$!
+ # allow some time to start
+ sleep 3
+@@ -74,10 +86,10 @@
+ ;;
+ * )
+ CODEBASE=`pwd`
+- ;;
++ ;;
+ esac
+ # trailing / after code base is important for rmi codebase property.
+-${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
++${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH ${ARGS} -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
+ TEST_PID=$!
+ #bulk of testcase - let it run for a while
+ sleep 5
+@@ -100,7 +112,7 @@
+ result2=$?
+
+ if [ $result1 -eq 0 -a $result2 -eq 0 ]
+-then
++then
+ echo "Passed"
+ exitCode=0;
+ else
+@@ -108,6 +120,6 @@
+ exitCode=1
+ fi
+ rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp
+-exit ${exitCode}
++exit ${exitCode}
+
+
+--- ./jdk/test/java/rmi/testlibrary/TestLibrary.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/java/rmi/testlibrary/TestLibrary.java Thu Dec 19 09:01:16 2013 -0800
+@@ -86,13 +86,13 @@
+ * FIXED_PORT_MIN or above FIXED_PORT_MAX, then adjust
+ * FIXED_PORT_MIN/MAX appropriately.
+ */
+- public final static int FIXED_PORT_MIN = 64001;
+- public final static int FIXED_PORT_MAX = 64010;
+- public final static int RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT = 64001;
+- public final static int RMIDVIAINHERITEDCHANNEL_REGISTRY_PORT = 64002;
+- public final static int INHERITEDCHANNELNOTSERVERSOCKET_ACTIVATION_PORT = 64003;
+- public final static int INHERITEDCHANNELNOTSERVERSOCKET_REGISTRY_PORT = 64004;
+- public final static int READTEST_REGISTRY_PORT = 64005;
++ public final static int FIXED_PORT_MIN = 60001;
++ public final static int FIXED_PORT_MAX = 60010;
++ public final static int RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT = 60001;
++ public final static int RMIDVIAINHERITEDCHANNEL_REGISTRY_PORT = 60002;
++ public final static int INHERITEDCHANNELNOTSERVERSOCKET_ACTIVATION_PORT = 60003;
++ public final static int INHERITEDCHANNELNOTSERVERSOCKET_REGISTRY_PORT = 60004;
++ public final static int READTEST_REGISTRY_PORT = 60005;
+ private final static int MAX_SERVER_SOCKET_TRIES = 2*(FIXED_PORT_MAX-FIXED_PORT_MIN+1);
+
+ static void mesg(Object mesg) {
+--- ./jdk/test/javax/script/GetInterfaceTest.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/javax/script/GetInterfaceTest.java Thu Dec 19 09:01:16 2013 -0800
+@@ -67,11 +67,11 @@
+ foo2.bar2();
+ }
+
+- interface Foo {
++ public interface Foo {
+ public void bar();
+ }
+
+- interface Foo2 extends Foo {
++ public interface Foo2 extends Foo {
+ public void bar2();
+ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java Thu Dec 19 09:01:16 2013 -0800
+@@ -0,0 +1,410 @@
++/*
++ * 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 8014618
++ * @summary Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
++ * @library ..
++ * @author Pasi Eronen
++ */
++
++import java.io.*;
++import java.security.*;
++import java.security.spec.*;
++import java.security.interfaces.*;
++import javax.crypto.*;
++import javax.crypto.spec.*;
++import javax.crypto.interfaces.*;
++
++/**
++ * Test that leading zeroes are stripped in TlsPremasterSecret case,
++ * but are left as-is in other cases.
++ *
++ * We use pre-generated keypairs, since with randomly generated keypairs,
++ * a leading zero happens only (roughly) 1 out of 256 cases.
++ */
++
++public class TestLeadingZeroesP11 extends PKCS11Test {
++
++ public static void main(String[] args) throws Exception {
++ main(new TestLeadingZeroesP11());
++ }
++
++ public void main(Provider p) throws Exception {
++
++ // decode pre-generated keypairs
++ KeyFactory kfac = KeyFactory.getInstance("DH", p);
++ PublicKey alicePubKey =
++ kfac.generatePublic(new X509EncodedKeySpec(alicePubKeyEnc));
++ PublicKey bobPubKey =
++ kfac.generatePublic(new X509EncodedKeySpec(bobPubKeyEnc));
++ PrivateKey alicePrivKey =
++ kfac.generatePrivate(new PKCS8EncodedKeySpec(alicePrivKeyEnc));
++ PrivateKey bobPrivKey =
++ kfac.generatePrivate(new PKCS8EncodedKeySpec(bobPrivKeyEnc));
++
++ // generate normal shared secret
++ KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", p);
++ aliceKeyAgree.init(alicePrivKey);
++ aliceKeyAgree.doPhase(bobPubKey, true);
++ byte[] sharedSecret = aliceKeyAgree.generateSecret();
++ System.out.println("shared secret:\n" + toHexString(sharedSecret));
++
++ // verify that leading zero is present
++ if (sharedSecret.length != 128) {
++ throw new Exception("Unexpected shared secret length");
++ }
++ if (sharedSecret[0] != 0) {
++ throw new Exception("First byte is not zero as expected");
++ }
++
++ // now, test TLS premaster secret
++ aliceKeyAgree.init(alicePrivKey);
++ aliceKeyAgree.doPhase(bobPubKey, true);
++ byte[] tlsPremasterSecret =
++ aliceKeyAgree.generateSecret("TlsPremasterSecret").getEncoded();
++ System.out.println(
++ "tls premaster secret:\n" + toHexString(tlsPremasterSecret));
++
++ // check that leading zero has been stripped
++ if (tlsPremasterSecret.length != 127) {
++ throw new Exception("Unexpected TLS premaster secret length");
++ }
++ if (tlsPremasterSecret[0] == 0) {
++ throw new Exception("First byte is zero");
++ }
++ for (int i = 0; i < tlsPremasterSecret.length; i++) {
++ if (tlsPremasterSecret[i] != sharedSecret[i+1]) {
++ throw new Exception("Shared secrets differ");
++ }
++ }
++
++ }
++
++ /*
++ * Converts a byte to hex digit and writes to the supplied buffer
++ */
++ private void byte2hex(byte b, StringBuffer buf) {
++ char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
++ '9', 'A', 'B', 'C', 'D', 'E', 'F' };
++ int high = ((b & 0xf0) >> 4);
++ int low = (b & 0x0f);
++ buf.append(hexChars[high]);
++ buf.append(hexChars[low]);
++ }
++
++ /*
++ * Converts a byte array to hex string
++ */
++ private String toHexString(byte[] block) {
++ StringBuffer buf = new StringBuffer();
++
++ int len = block.length;
++
++ for (int i = 0; i < len; i++) {
++ byte2hex(block[i], buf);
++ if (i < len-1) {
++ buf.append(":");
++ }
++ }
++ return buf.toString();
++ }
++
++ private static final byte alicePubKeyEnc[] = {
++ (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x24,
++ (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
++ (byte)0x09, (byte)0x2A, (byte)0x86, (byte)0x48,
++ (byte)0x86, (byte)0xF7, (byte)0x0D, (byte)0x01,
++ (byte)0x03, (byte)0x01, (byte)0x30, (byte)0x81,
++ (byte)0x8B, (byte)0x02, (byte)0x81, (byte)0x81,
++ (byte)0x00, (byte)0xF4, (byte)0x88, (byte)0xFD,
++ (byte)0x58, (byte)0x4E, (byte)0x49, (byte)0xDB,
++ (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D,
++ (byte)0xE4, (byte)0x91, (byte)0x07, (byte)0x36,
++ (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38,
++ (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
++ (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C,
++ (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E,
++ (byte)0xF6, (byte)0xF3, (byte)0xC9, (byte)0x23,
++ (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5,
++ (byte)0x5B, (byte)0x18, (byte)0x8D, (byte)0x8E,
++ (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8,
++ (byte)0x5D, (byte)0x38, (byte)0xD3, (byte)0x34,
++ (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57,
++ (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
++ (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21,
++ (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF,
++ (byte)0x3C, (byte)0xE1, (byte)0xB1, (byte)0x29,
++ (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D,
++ (byte)0x7C, (byte)0x84, (byte)0xA7, (byte)0x0A,
++ (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4,
++ (byte)0x03, (byte)0x19, (byte)0xC8, (byte)0x07,
++ (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95,
++ (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
++ (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50,
++ (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3,
++ (byte)0x08, (byte)0x3D, (byte)0x66, (byte)0xA4,
++ (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C,
++ (byte)0x7C, (byte)0xBD, (byte)0x89, (byte)0x4B,
++ (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA,
++ (byte)0xAB, (byte)0xA2, (byte)0x5E, (byte)0xC3,
++ (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78,
++ (byte)0xC7, (byte)0x02, (byte)0x01, (byte)0x02,
++ (byte)0x02, (byte)0x02, (byte)0x02, (byte)0x00,
++ (byte)0x03, (byte)0x81, (byte)0x85, (byte)0x00,
++ (byte)0x02, (byte)0x81, (byte)0x81, (byte)0x00,
++ (byte)0xEE, (byte)0xD6, (byte)0xB1, (byte)0xA3,
++ (byte)0xB4, (byte)0x78, (byte)0x2B, (byte)0x35,
++ (byte)0xEF, (byte)0xCD, (byte)0x17, (byte)0x86,
++ (byte)0x63, (byte)0x2B, (byte)0x97, (byte)0x0E,
++ (byte)0x7A, (byte)0xD1, (byte)0xFF, (byte)0x7A,
++ (byte)0xEB, (byte)0x57, (byte)0x61, (byte)0xA1,
++ (byte)0xF7, (byte)0x90, (byte)0x11, (byte)0xA7,
++ (byte)0x79, (byte)0x28, (byte)0x69, (byte)0xBA,
++ (byte)0xA7, (byte)0xB2, (byte)0x37, (byte)0x17,
++ (byte)0xAE, (byte)0x3C, (byte)0x92, (byte)0x89,
++ (byte)0x88, (byte)0xE5, (byte)0x7E, (byte)0x8E,
++ (byte)0xF0, (byte)0x24, (byte)0xD0, (byte)0xE1,
++ (byte)0xC4, (byte)0xB0, (byte)0x26, (byte)0x5A,
++ (byte)0x1E, (byte)0xBD, (byte)0xA0, (byte)0xCF,
++ (byte)0x3E, (byte)0x97, (byte)0x2A, (byte)0x13,
++ (byte)0x92, (byte)0x3B, (byte)0x39, (byte)0xD0,
++ (byte)0x1D, (byte)0xA3, (byte)0x6B, (byte)0x3E,
++ (byte)0xC2, (byte)0xBB, (byte)0x14, (byte)0xB6,
++ (byte)0xE2, (byte)0x4C, (byte)0x0E, (byte)0x5B,
++ (byte)0x4B, (byte)0xA4, (byte)0x9D, (byte)0xA6,
++ (byte)0x21, (byte)0xB0, (byte)0xF9, (byte)0xDE,
++ (byte)0x55, (byte)0xAE, (byte)0x5C, (byte)0x29,
++ (byte)0x0E, (byte)0xC1, (byte)0xFC, (byte)0xBA,
++ (byte)0x51, (byte)0xD3, (byte)0xB6, (byte)0x6D,
++ (byte)0x75, (byte)0x72, (byte)0xDF, (byte)0x43,
++ (byte)0xAB, (byte)0x94, (byte)0x21, (byte)0x6E,
++ (byte)0x0C, (byte)0xD1, (byte)0x93, (byte)0x54,
++ (byte)0x56, (byte)0x7D, (byte)0x4B, (byte)0x90,
++ (byte)0xF1, (byte)0x94, (byte)0x45, (byte)0xD4,
++ (byte)0x2A, (byte)0x71, (byte)0xA1, (byte)0xB8,
++ (byte)0xDD, (byte)0xAA, (byte)0x05, (byte)0xF0,
++ (byte)0x27, (byte)0x37, (byte)0xBD, (byte)0x44
++ };
++
++ private static final byte alicePrivKeyEnc[] = {
++ (byte)0x30, (byte)0x81, (byte)0xE3, (byte)0x02,
++ (byte)0x01, (byte)0x00, (byte)0x30, (byte)0x81,
++ (byte)0x99, (byte)0x06, (byte)0x09, (byte)0x2A,
++ (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xF7,
++ (byte)0x0D, (byte)0x01, (byte)0x03, (byte)0x01,
++ (byte)0x30, (byte)0x81, (byte)0x8B, (byte)0x02,
++ (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xF4,
++ (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
++ (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20,
++ (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91,
++ (byte)0x07, (byte)0x36, (byte)0x6B, (byte)0x33,
++ (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45,
++ (byte)0x1D, (byte)0x0F, (byte)0x7C, (byte)0x88,
++ (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B,
++ (byte)0x2D, (byte)0x8E, (byte)0xF6, (byte)0xF3,
++ (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43,
++ (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
++ (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55,
++ (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38,
++ (byte)0xD3, (byte)0x34, (byte)0xFD, (byte)0x7C,
++ (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3,
++ (byte)0x1D, (byte)0x18, (byte)0x6C, (byte)0xDE,
++ (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5,
++ (byte)0x2A, (byte)0xFF, (byte)0x3C, (byte)0xE1,
++ (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18,
++ (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
++ (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6,
++ (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19,
++ (byte)0xC8, (byte)0x07, (byte)0x29, (byte)0x7A,
++ (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9,
++ (byte)0x96, (byte)0x9F, (byte)0xAB, (byte)0xD0,
++ (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02,
++ (byte)0x46, (byte)0xD3, (byte)0x08, (byte)0x3D,
++ (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41,
++ (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
++ (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19,
++ (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2,
++ (byte)0x5E, (byte)0xC3, (byte)0x55, (byte)0xE9,
++ (byte)0x2F, (byte)0x78, (byte)0xC7, (byte)0x02,
++ (byte)0x01, (byte)0x02, (byte)0x02, (byte)0x02,
++ (byte)0x02, (byte)0x00, (byte)0x04, (byte)0x42,
++ (byte)0x02, (byte)0x40, (byte)0x36, (byte)0x4D,
++ (byte)0xD0, (byte)0x58, (byte)0x64, (byte)0x91,
++ (byte)0x78, (byte)0xA2, (byte)0x4B, (byte)0x79,
++ (byte)0x46, (byte)0xFE, (byte)0xC9, (byte)0xD9,
++ (byte)0xCA, (byte)0x5C, (byte)0xF9, (byte)0xFD,
++ (byte)0x6C, (byte)0x5D, (byte)0x76, (byte)0x3A,
++ (byte)0x41, (byte)0x6D, (byte)0x44, (byte)0x62,
++ (byte)0x75, (byte)0x93, (byte)0x81, (byte)0x93,
++ (byte)0x00, (byte)0x4C, (byte)0xB1, (byte)0xD8,
++ (byte)0x7D, (byte)0x9D, (byte)0xF3, (byte)0x16,
++ (byte)0x2C, (byte)0x6C, (byte)0x9F, (byte)0x7A,
++ (byte)0x84, (byte)0xA3, (byte)0x7A, (byte)0xC1,
++ (byte)0x4F, (byte)0x60, (byte)0xE3, (byte)0xB5,
++ (byte)0x86, (byte)0x28, (byte)0x08, (byte)0x4D,
++ (byte)0x94, (byte)0xB6, (byte)0x04, (byte)0x0D,
++ (byte)0xAC, (byte)0xBD, (byte)0x1F, (byte)0x42,
++ (byte)0x8F, (byte)0x1B
++ };
++
++ private static final byte bobPubKeyEnc[] = {
++ (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x23,
++ (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
++ (byte)0x09, (byte)0x2A, (byte)0x86, (byte)0x48,
++ (byte)0x86, (byte)0xF7, (byte)0x0D, (byte)0x01,
++ (byte)0x03, (byte)0x01, (byte)0x30, (byte)0x81,
++ (byte)0x8B, (byte)0x02, (byte)0x81, (byte)0x81,
++ (byte)0x00, (byte)0xF4, (byte)0x88, (byte)0xFD,
++ (byte)0x58, (byte)0x4E, (byte)0x49, (byte)0xDB,
++ (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D,
++ (byte)0xE4, (byte)0x91, (byte)0x07, (byte)0x36,
++ (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38,
++ (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
++ (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C,
++ (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E,
++ (byte)0xF6, (byte)0xF3, (byte)0xC9, (byte)0x23,
++ (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5,
++ (byte)0x5B, (byte)0x18, (byte)0x8D, (byte)0x8E,
++ (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8,
++ (byte)0x5D, (byte)0x38, (byte)0xD3, (byte)0x34,
++ (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57,
++ (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
++ (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21,
++ (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF,
++ (byte)0x3C, (byte)0xE1, (byte)0xB1, (byte)0x29,
++ (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D,
++ (byte)0x7C, (byte)0x84, (byte)0xA7, (byte)0x0A,
++ (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4,
++ (byte)0x03, (byte)0x19, (byte)0xC8, (byte)0x07,
++ (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95,
++ (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
++ (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50,
++ (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3,
++ (byte)0x08, (byte)0x3D, (byte)0x66, (byte)0xA4,
++ (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C,
++ (byte)0x7C, (byte)0xBD, (byte)0x89, (byte)0x4B,
++ (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA,
++ (byte)0xAB, (byte)0xA2, (byte)0x5E, (byte)0xC3,
++ (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78,
++ (byte)0xC7, (byte)0x02, (byte)0x01, (byte)0x02,
++ (byte)0x02, (byte)0x02, (byte)0x02, (byte)0x00,
++ (byte)0x03, (byte)0x81, (byte)0x84, (byte)0x00,
++ (byte)0x02, (byte)0x81, (byte)0x80, (byte)0x2C,
++ (byte)0x40, (byte)0xFA, (byte)0xF6, (byte)0xA6,
++ (byte)0xF8, (byte)0xAC, (byte)0xC2, (byte)0x4F,
++ (byte)0xCD, (byte)0xC7, (byte)0x37, (byte)0x93,
++ (byte)0xE5, (byte)0xE4, (byte)0x5E, (byte)0x18,
++ (byte)0x14, (byte)0xE6, (byte)0x50, (byte)0xDA,
++ (byte)0x55, (byte)0x38, (byte)0x5D, (byte)0x24,
++ (byte)0xF5, (byte)0x42, (byte)0x68, (byte)0x5F,
++ (byte)0xF5, (byte)0x15, (byte)0xC8, (byte)0x9B,
++ (byte)0x5D, (byte)0x06, (byte)0x3D, (byte)0xE1,
++ (byte)0x52, (byte)0x2F, (byte)0x98, (byte)0xFF,
++ (byte)0x37, (byte)0xBB, (byte)0x75, (byte)0x48,
++ (byte)0x48, (byte)0xE9, (byte)0x65, (byte)0x84,
++ (byte)0x37, (byte)0xBB, (byte)0xB3, (byte)0xE9,
++ (byte)0x36, (byte)0x01, (byte)0xB4, (byte)0x6A,
++ (byte)0x1C, (byte)0xB2, (byte)0x11, (byte)0x82,
++ (byte)0xCE, (byte)0x3D, (byte)0x65, (byte)0xE5,
++ (byte)0x3C, (byte)0x89, (byte)0xE9, (byte)0x52,
++ (byte)0x19, (byte)0xBD, (byte)0x58, (byte)0xF6,
++ (byte)0xA2, (byte)0x03, (byte)0xA8, (byte)0xB2,
++ (byte)0xA5, (byte)0xDB, (byte)0xEB, (byte)0xF5,
++ (byte)0x94, (byte)0xF9, (byte)0x46, (byte)0xBE,
++ (byte)0x45, (byte)0x4C, (byte)0x65, (byte)0xD2,
++ (byte)0xD1, (byte)0xCF, (byte)0xFF, (byte)0xFF,
++ (byte)0xFA, (byte)0x38, (byte)0xF1, (byte)0x72,
++ (byte)0xAB, (byte)0xB9, (byte)0x14, (byte)0x4E,
++ (byte)0xF5, (byte)0xF0, (byte)0x7A, (byte)0x8E,
++ (byte)0x45, (byte)0xFD, (byte)0x5B, (byte)0xF9,
++ (byte)0xA2, (byte)0x97, (byte)0x1B, (byte)0xAE,
++ (byte)0x2C, (byte)0x7B, (byte)0x6B, (byte)0x7C,
++ (byte)0x98, (byte)0xFE, (byte)0x58, (byte)0xDD,
++ (byte)0xBE, (byte)0xF6, (byte)0x1C, (byte)0x8E,
++ (byte)0xD0, (byte)0xA1, (byte)0x72
++ };
++
++ private static final byte bobPrivKeyEnc[] = {
++ (byte)0x30, (byte)0x81, (byte)0xE4, (byte)0x02,
++ (byte)0x01, (byte)0x00, (byte)0x30, (byte)0x81,
++ (byte)0x99, (byte)0x06, (byte)0x09, (byte)0x2A,
++ (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xF7,
++ (byte)0x0D, (byte)0x01, (byte)0x03, (byte)0x01,
++ (byte)0x30, (byte)0x81, (byte)0x8B, (byte)0x02,
++ (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xF4,
++ (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
++ (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20,
++ (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91,
++ (byte)0x07, (byte)0x36, (byte)0x6B, (byte)0x33,
++ (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45,
++ (byte)0x1D, (byte)0x0F, (byte)0x7C, (byte)0x88,
++ (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B,
++ (byte)0x2D, (byte)0x8E, (byte)0xF6, (byte)0xF3,
++ (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43,
++ (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
++ (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55,
++ (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38,
++ (byte)0xD3, (byte)0x34, (byte)0xFD, (byte)0x7C,
++ (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3,
++ (byte)0x1D, (byte)0x18, (byte)0x6C, (byte)0xDE,
++ (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5,
++ (byte)0x2A, (byte)0xFF, (byte)0x3C, (byte)0xE1,
++ (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18,
++ (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
++ (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6,
++ (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19,
++ (byte)0xC8, (byte)0x07, (byte)0x29, (byte)0x7A,
++ (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9,
++ (byte)0x96, (byte)0x9F, (byte)0xAB, (byte)0xD0,
++ (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02,
++ (byte)0x46, (byte)0xD3, (byte)0x08, (byte)0x3D,
++ (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41,
++ (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
++ (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19,
++ (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2,
++ (byte)0x5E, (byte)0xC3, (byte)0x55, (byte)0xE9,
++ (byte)0x2F, (byte)0x78, (byte)0xC7, (byte)0x02,
++ (byte)0x01, (byte)0x02, (byte)0x02, (byte)0x02,
++ (byte)0x02, (byte)0x00, (byte)0x04, (byte)0x43,
++ (byte)0x02, (byte)0x41, (byte)0x00, (byte)0xE0,
++ (byte)0x31, (byte)0xE7, (byte)0x77, (byte)0xB8,
++ (byte)0xD0, (byte)0x7E, (byte)0x0A, (byte)0x9B,
++ (byte)0x94, (byte)0xD5, (byte)0x3D, (byte)0x33,
++ (byte)0x62, (byte)0x32, (byte)0x51, (byte)0xCE,
++ (byte)0x74, (byte)0x5C, (byte)0xA5, (byte)0x72,
++ (byte)0xD9, (byte)0x36, (byte)0xF3, (byte)0x8A,
++ (byte)0x3F, (byte)0x8B, (byte)0xC6, (byte)0xFE,
++ (byte)0xEF, (byte)0x94, (byte)0x8B, (byte)0x50,
++ (byte)0x41, (byte)0x9B, (byte)0x14, (byte)0xC8,
++ (byte)0xE9, (byte)0x1F, (byte)0x24, (byte)0x1F,
++ (byte)0x65, (byte)0x8E, (byte)0xD3, (byte)0x85,
++ (byte)0xD0, (byte)0x68, (byte)0x6C, (byte)0xF1,
++ (byte)0x79, (byte)0x45, (byte)0xD0, (byte)0x06,
++ (byte)0xA4, (byte)0xB8, (byte)0xE0, (byte)0x64,
++ (byte)0xF5, (byte)0x38, (byte)0x72, (byte)0x97,
++ (byte)0x00, (byte)0x23, (byte)0x5F
++ };
++}
++
+--- ./jdk/test/sun/security/tools/jarsigner/TimestampCheck.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/TimestampCheck.java Thu Dec 19 09:01:16 2013 -0800
+@@ -242,13 +242,13 @@
+ " -J-Djava.security.egd=file:/dev/./urandom" +
+ " -debug -keystore " + TSKS + " -storepass changeit" +
+ " -tsa http://localhost:" + port + "/%d" +
+- " -signedjar new.jar " + JAR + " old";
++ " -signedjar new_%d.jar " + JAR + " old";
+ } else {
+ cmd = System.getProperty("java.home") + "/bin/jarsigner" +
+ " -J-Djava.security.egd=file:/dev/./urandom" +
+ " -debug -keystore " + TSKS + " -storepass changeit" +
+ " -tsa http://localhost:" + port + "/%d" +
+- " -signedjar new.jar " + JAR + " old";
++ " -signedjar new_%d.jar " + JAR + " old";
+ }
+
+ try {
+@@ -281,7 +281,7 @@
+ static void jarsigner(String cmd, int path, boolean expected)
+ throws Exception {
+ System.err.println("Test " + path);
+- Process p = Runtime.getRuntime().exec(String.format(cmd, path));
++ Process p = Runtime.getRuntime().exec(String.format(cmd, path, path));
+ BufferedReader reader = new BufferedReader(
+ new InputStreamReader(p.getErrorStream()));
+ while (true) {
+@@ -289,9 +289,25 @@
+ if (s == null) break;
+ System.err.println(s);
+ }
++
++ // Will not see noTimestamp warning
++ boolean seeWarning = false;
++ reader = new BufferedReader(
++ new InputStreamReader(p.getInputStream()));
++ while (true) {
++ String s = reader.readLine();
++ if (s == null) break;
++ System.err.println(s);
++ if (s.indexOf("Warning:") >= 0) {
++ seeWarning = true;
++ }
++ }
+ int result = p.waitFor();
+ if (expected && result != 0 || !expected && result == 0) {
+ throw new Exception("Failed");
+ }
++ if (seeWarning) {
++ throw new Exception("See warning");
++ }
+ }
+ }
+--- ./jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh Thu Dec 19 09:01:16 2013 -0800
+@@ -136,7 +136,6 @@
+ # 16 and 32 already covered in the first part
+ # ==========================================================
+
+-$KT -genkeypair -alias expiring -dname CN=expiring -startdate -1m
+ $KT -genkeypair -alias expired -dname CN=expired -startdate -10m
+ $KT -genkeypair -alias notyetvalid -dname CN=notyetvalid -startdate +1m
+ $KT -genkeypair -alias badku -dname CN=badku -ext KU=cRLSign -validity 365
+@@ -151,9 +150,6 @@
+ $KT -importcert -alias badchain
+ $KT -delete -alias ca
+
+-$JARSIGNER -strict -keystore js.jks -storepass changeit a.jar expiring
+-[ $? = 2 ] || exit $LINENO
+-
+ $JARSIGNER -strict -keystore js.jks -storepass changeit a.jar expired
+ [ $? = 4 ] || exit $LINENO
+
+--- ./jdk/test/sun/security/tools/jarsigner/ts.sh Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/ts.sh Thu Dec 19 09:01:16 2013 -0800
+@@ -22,7 +22,7 @@
+ #
+
+ # @test
+-# @bug 6543842 6543440 6939248
++# @bug 6543842 6543440 6939248 8024302
+ # @summary checking response of timestamp
+ #
+ # @run shell/timeout=600 ts.sh
+@@ -53,7 +53,7 @@
+ JAR="${TESTJAVA}${FS}bin${FS}jar"
+ JAVA="${TESTJAVA}${FS}bin${FS}java"
+ JAVAC="${TESTJAVA}${FS}bin${FS}javac"
+-KT="${TESTJAVA}${FS}bin${FS}keytool -keystore tsks -storepass changeit -keypass changeit"
++KT="${TESTJAVA}${FS}bin${FS}keytool -keystore tsks -storepass changeit -keypass changeit -validity 200"
+
+ rm tsks
+ echo Nothing > A
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/tools/jarsigner/warnings.sh Thu Dec 19 09:01:16 2013 -0800
+@@ -0,0 +1,119 @@
++#
++# 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 8024302
++# @bug 8026037
++# @summary Clarify jar verifications
++#
++
++if [ "${TESTJAVA}" = "" ] ; then
++ JAVAC_CMD=`which javac`
++ TESTJAVA=`dirname $JAVAC_CMD`/..
++fi
++
++# set platform-dependent variables
++OS=`uname -s`
++case "$OS" in
++ Windows_* )
++ FS="\\"
++ ;;
++ * )
++ FS="/"
++ ;;
++esac
++
++KS=warnings.jks
++JFILE=warnings.jar
++
++KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit \
++ -keystore $KS"
++JAR=$TESTJAVA${FS}bin${FS}jar
++JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner -keystore $KS -storepass changeit"
++
++rm $KS 2> /dev/null
++
++LANG=C
++export LANG
++
++echo 12345 > file
++
++ERR=""
++
++# Normal signer expiring on 2100-01-01
++$KT -alias s1 -dname CN=s1 -genkey -startdate 2000/01/01 -validity 36525 || ERR="$ERR keytool s1,"
++# Cert expiring soon, informational warning
++$KT -alias s2 -dname CN=s2 -genkey -validity 100 || ERR="$ERR keytool s2,"
++# Cert expired, severe warning
++$KT -alias s3 -dname CN=s3 -genkey -startdate -200d -validity 100 || ERR="$ERR keytool s3,"
++
++# noTimestamp is informatiional warning and includes a date
++$JAR cvf $JFILE file
++$JARSIGNER $JFILE s1 > output1 || ERR="$ERR jarsigner s1,"
++$JARSIGNER -strict $JFILE s1 >> output1 || ERR="$ERR jarsigner s1 strict,"
++$JARSIGNER -verify $JFILE s1 >> output1 || ERR="$ERR jarsigner s1,"
++$JARSIGNER -verify -strict $JFILE s1 >> output1 || ERR="$ERR jarsigner s1 strict,"
++
++cat output1 | grep Warning || ERR="$ERR s1 warning,"
++cat output1 | grep Error && ERR="$ERR s1 error,"
++cat output1 | grep timestamp | grep 2100-01-01 || ERR="$ERR s1 timestamp,"
++cat output1 | grep "with signer errors" && ERR="$ERR s1 err,"
++
++# hasExpiringCert is informatiional warning
++$JAR cvf $JFILE file
++$JARSIGNER $JFILE s2 > output2 || ERR="$ERR jarsigner s2,"
++$JARSIGNER -strict $JFILE s2 >> output2 || ERR="$ERR jarsigner s2 strict,"
++$JARSIGNER -verify $JFILE s2 >> output2 || ERR="$ERR jarsigner s2,"
++$JARSIGNER -verify -strict $JFILE s2 >> output2 || ERR="$ERR jarsigner s2 strict,"
++
++cat output2 | grep Warning || ERR="$ERR s2 warning,"
++cat output2 | grep Error && ERR="$ERR s2 error,"
++cat output2 | grep timestamp || ERR="$ERR s2 timestamp,"
++cat output2 | grep "will expire" || ERR="$ERR s2 expiring,"
++cat output2 | grep "with signer errors" && ERR="$ERR s2 err,"
++
++# hasExpiredCert is severe warning
++$JAR cvf $JFILE file
++$JARSIGNER $JFILE s3 > output3 || ERR="$ERR jarsigner s3,"
++$JARSIGNER -strict $JFILE s3 > output3s && ERR="$ERR jarsigner s3 strict,"
++$JARSIGNER -verify $JFILE s3 >> output3 || ERR="$ERR jarsigner s3,"
++$JARSIGNER -verify -strict $JFILE s3 >> output3s && ERR="$ERR jarsigner s3 strict,"
++
++# warning without -strict
++cat output3 | grep Warning || ERR="$ERR s3 warning,"
++cat output3 | grep Error && ERR="$ERR s3 error,"
++cat output3 | grep "with signer errors" && ERR="$ERR s3 err,"
++
++# error with -strict
++cat output3s | grep Warning || ERR="$ERR s3s warning,"
++cat output3s | grep Error || ERR="$ERR s3s error,"
++cat output3s | grep "with signer errors" || ERR="$ERR s3 err,"
++
++if [ "$ERR" = "" ]; then
++ exit 0
++else
++ echo "ERR is $ERR"
++ exit 1
++fi
++
++
+--- ./jdk/test/sun/util/resources/TimeZone/Bug6317929.java Tue Oct 08 09:07:05 2013 -0700
++++ ./jdk/test/sun/util/resources/TimeZone/Bug6317929.java Thu Dec 19 09:01:16 2013 -0800
+@@ -130,12 +130,12 @@
+ "(New South Wales)\"");
+ tzLocale = locales2Test[1];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+- ("\u00d6stliche Normalzeit (New South Wales)"))
++ ("Eastern Normalzeit (Neus\u00fcdwales)"))
+ throw new RuntimeException("\n" + tzLocale + ": LONG, " +
+ "non-daylight saving name for " +
+ "Australia/Currie should be " +
+- "\"\u00d6stliche Normalzeit " +
+- "(New South Wales)\"");
++ "\"Eastern Normalzeit " +
++ "(Neus\u00fcdwales)\"");
+ tzLocale = locales2Test[2];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+ ("Hora est\u00e1ndar Oriental (Nueva Gales del Sur)"))
+@@ -154,53 +154,53 @@
+ "(Nouvelle-Galles du Sud)\"");
+ tzLocale = locales2Test[4];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+- ("Ora solare dell'Australia orientale (Nuovo Galles del Sud)"))
++ ("Ora standard dell'Australia orientale (Nuovo Galles del Sud)"))
+ throw new RuntimeException("\n" + tzLocale + ": LONG, " +
+ "non-daylight saving name for " +
+ "Australia/Currie should be " +
+- "\"Ora solare dell'Australia orientale " +
++ "\"Ora standard dell'Australia orientale " +
+ "(Nuovo Galles del Sud)\"");
+ tzLocale = locales2Test[5];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+- ("\u6771\u90e8\u6a19\u6e96\u6642 " +
+- "(\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)"))
++ ("\u6771\u90E8\u6A19\u6E96\u6642" +
++ "(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)"))
+ throw new RuntimeException("\n" + tzLocale + ": LONG, " +
+ "non-daylight saving name for " +
+ "Australia/Currie should be " +
+- "\"\u6771\u90e8\u6a19\u6e96\u6642 " +
+- "(\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9" +
+- "\u30a6\u30a7\u30fc\u30eb\u30ba)\"");
++ "\"\u6771\u90E8\u6A19\u6E96\u6642" +
++ "(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9" +
++ "\u30A6\u30A7\u30FC\u30EB\u30BA)\"");
+ tzLocale = locales2Test[6];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+- ("\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)"))
++ ("\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)"))
+ throw new RuntimeException("\n" + tzLocale + ": LONG, " +
+ "non-daylight saving name for " +
+ "Australia/Currie should be " +
+- "\"\ub3d9\ubd80 \ud45c\uc900\uc2dc" +
+- "(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)\"");
++ "\"\uB3D9\uBD80 \uD45C\uC900\uC2DC" +
++ "(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)\"");
+ tzLocale = locales2Test[7];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+- ("Eastern, normaltid (Nya Sydwales)"))
++ ("\u00D6stlig standardtid (New South Wales)"))
+ throw new RuntimeException("\n" + tzLocale + ": LONG, " +
+ "non-daylight saving name for " +
+ "Australia/Currie should be " +
+- "\"Eastern, normaltid " +
+- "(Nya Sydwales)\"");
++ "\"\u00D6stlig standardtid " +
++ "(New South Wales)\"");
+ tzLocale = locales2Test[8];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+- ("\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09"))
++ ("\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)"))
+ throw new RuntimeException("\n" + tzLocale + ": LONG, " +
+ "non-daylight saving name for " +
+ "Australia/Currie should be " +
+- "\"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4 " +
+- "\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09\"");
++ "\"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 " +
++ "(\u65B0\u5357\u5A01\u5C14\u65AF)\"");
+ tzLocale = locales2Test[9];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+- ("\u6771\u65b9\u6a19\u6e96\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)"))
++ ("\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)"))
+ throw new RuntimeException("\n" + tzLocale + ": LONG, " +
+ "non-daylight saving name for " +
+ "Australia/Currie should be " +
+- "\"\u6771\u65b9\u6a19\u6e96\u6642\u9593 " +
+- "(\u65b0\u5357\u5a01\u723e\u65af)\"");
++ "\"\u6771\u90E8\u6A19\u6E96\u6642\u9593 " +
++ "(\u65B0\u5357\u5A01\u723E\u65AF)\"");
+ }
+ }
+--- ./langtools/.hgtags Tue Oct 08 09:07:15 2013 -0700
++++ ./langtools/.hgtags Thu Dec 19 09:01:27 2013 -0800
+@@ -359,6 +359,8 @@
+ 765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42
+ 988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43
+ a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60
++b2e29b79e54e58349c1dbcf5449f67fc5d5a235a jdk7u40-b61
++94ea3d062a3c28c64a837fa8f999c6b6956ff7c4 jdk7u40-b62
+ 9bbfba4981e1db5016bbfbc23025763966021c26 jdk7u45-b01
+ 61d5b73ae0ac46268490e2f0dfa1f69a5acda73f jdk7u45-b02
+ 2fe27ae865e723473225756f1920d9d76d47b903 jdk7u45-b03
+@@ -377,3 +379,19 @@
+ 18d1864abca976ca68cb71612e9b20c908455d3d jdk7u45-b16
+ b9aeec6b9d5aac0746f8d1764a7740f8b83334ab jdk7u45-b17
+ ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
++164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
++7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31
++18d1864abca976ca68cb71612e9b20c908455d3d jdk7u51-b00
++14d1cf2630aea549cfba9d052200c7ebcabd875c jdk7u51-b01
++f0168ccf171ed6080267fe0a7f7aed0b46bd5713 jdk7u51-b02
++33f986894a3e42686a3a9713efc075a6876dbeb7 jdk7u51-b03
++9a4b7362a592b157cd2b1c2ce15f1bb97d2792f6 jdk7u51-b04
++c8d1379f16ebe38d03581eaa6a8b1ecddfd5fc88 jdk7u51-b05
++1e8c8518497b6c4de56782224da4d27a9367e7ac jdk7u51-b06
++009a4086b2a66e263c006e237505a832fcf99ac8 jdk7u51-b07
++cccd0d52003d26f8652ef1778b3f1857c7d92ea9 jdk7u51-b08
++d8a69a841acd1d6c20e8a064d0c2bd139c50e485 jdk7u51-b09
++7e33fc6adc82176a459e6702ae03a34f789b88ec jdk7u51-b10
++c9d8d8793d9330d592190c334260ccf26c986df6 jdk7u51-b11
++5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u51-b12
++4d0807934c302f2e35e6a5acc6cdc720c82b5671 jdk7u51-b13
+--- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Tue Oct 08 09:07:15 2013 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Thu Dec 19 09:01:27 2013 -0800
+@@ -180,6 +180,6 @@
+ doclet.0_and_1={0}\u3068{1}
+
+ #Documentation for Enums
+-doclet.enum_values_doc=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n<pre>\nfor({0} c: {0}.values())\n&nbsp; System.out.println(c);\n</pre>\n@return\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u542B\u3080\u914D\u5217
++doclet.enum_values_doc=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n<pre>\nfor({0} c: {0}.values())\n&nbsp; System.out.println(c);\n</pre>\n@return \u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u542B\u3080\u914D\u5217
+
+-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 Tue Oct 08 09:07:15 2013 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Thu Dec 19 09:01:27 2013 -0800
+@@ -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
+
+-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/resources/compiler_ja.properties Tue Oct 08 09:07:15 2013 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Thu Dec 19 09:01:27 2013 -0800
+@@ -555,19 +555,19 @@
+ # 0: name
+ compiler.err.undef.label=\u30E9\u30D9\u30EB{0}\u306F\u672A\u5B9A\u7FA9\u3067\u3059
+
+-compiler.err.undetermined.type={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093
++compiler.err.undetermined.type={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093
+
+ # 0: type, 1: message segment
+-compiler.err.undetermined.type.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
++compiler.err.undetermined.type.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
+
+ # 0: list of type, 1: message segment
+-compiler.err.invalid.inferred.types={0}\u306E\u63A8\u5B9A\u578B\u304C\u7121\u52B9\u3067\u3059\u3002{1}
++compiler.err.invalid.inferred.types={0}\u306E\u63A8\u8AD6\u578B\u304C\u7121\u52B9\u3067\u3059\u3002{1}
+
+ # 0: message segment, 1: unused
+ compiler.err.cant.apply.diamond={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093
+
+ # 0: message segment, 1: message segment
+-compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
++compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
+
+ compiler.err.unreachable.stmt=\u3053\u306E\u6587\u306B\u5236\u5FA1\u304C\u79FB\u308B\u3053\u3068\u306F\u3042\u308A\u307E\u305B\u3093
+
+@@ -1165,7 +1165,7 @@
+ compiler.misc.infer.arg.length.mismatch=\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308B\u305F\u3081\u3001\u5F15\u6570\u304B\u3089\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
+
+ # 0: type, 1: list of type
+-compiler.misc.inferred.do.not.conform.to.bounds=\u63A8\u5B9A\u578B\u306F\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u5B9A: {0}\n\u5883\u754C: {1}
++compiler.misc.inferred.do.not.conform.to.bounds=\u63A8\u8AD6\u578B\u306F\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u5883\u754C: {1}
+
+ # 0: symbol
+ compiler.misc.diamond={0}<>
+--- ./langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Tue Oct 08 09:07:15 2013 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Thu Dec 19 09:01:27 2013 -0800
+@@ -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
+ err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0}
+-err.ioerror=\u5165\u51FA\u529B\u30A8\u30E9\u30FC: {0}
++err.ioerror=IO\u30A8\u30E9\u30FC: {0}
+ err.missing.arg={0}\u306E\u5024\u304C\u3042\u308A\u307E\u305B\u3093
+ 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}
diff --git a/java/openjdk7/files/patch-7u55-b31 b/java/openjdk7/files/patch-7u55-b31
new file mode 100644
index 000000000000..3ad355a0eb09
--- /dev/null
+++ b/java/openjdk7/files/patch-7u55-b31
@@ -0,0 +1,17206 @@
+--- ./.hgtags Thu Dec 19 09:00:36 2013 -0800
++++ ./.hgtags Tue Mar 18 12:29:21 2014 -0700
+@@ -378,6 +378,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
+@@ -392,3 +395,22 @@
+ 573c4cfca7dda548463bb84330bddfd07fe1183f jdk7u51-b11
+ df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u51-b12
+ 6c778574d87336a2e55156544af92ce2de799696 jdk7u51-b13
++d2eeac0235eda77d0a6c72c7235a6e96bc9ad4fb jdk7u51-b30
++626e76f127a44ba0118a545d37410f80000db8fb jdk7u51-b31
++472d67871307433bf3e2687c48237c48ffbf068e jdk7u51-b33
++503f1d094a1bbbd94386f5c3342130dc5f4ba6ee jdk7u51-b34
++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
+--- ./corba/.hgtags Thu Dec 19 09:00:44 2013 -0800
++++ ./corba/.hgtags Tue Mar 18 12:29:47 2014 -0700
+@@ -381,6 +381,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
+@@ -395,3 +398,22 @@
+ a26d0e8ab1027e70ae1ded8ede0086a0a4a10256 jdk7u51-b11
+ 55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u51-b12
+ e2f0036f712aa636cfd55334ac21ea7ca2587a7b jdk7u51-b13
++6563d12c48c92af39a27ca46b4515fad8e994667 jdk7u51-b30
++0ad990211737fe1b1e2737a3498ab266146d2c53 jdk7u51-b31
++ee7d9f5d18fb67564e88a10f1bd682660db60aa2 jdk7u51-b33
++65ef96a075a43e9201866d1c9b8ee3138ebcc424 jdk7u51-b34
++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
+--- ./corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Thu Dec 19 09:00:44 2013 -0800
++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Tue Mar 18 12:29:47 2014 -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/orbutil/ObjectStreamClassUtil_1_3.java Thu Dec 19 09:00:44 2013 -0800
++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java Tue Mar 18 12:29:47 2014 -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 Thu Dec 19 09:00:44 2013 -0800
++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java Tue Mar 18 12:29:47 2014 -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/spi/orb/ORB.java Thu Dec 19 09:00:44 2013 -0800
++++ ./corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java Tue Mar 18 12:29:47 2014 -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/org/omg/CORBA/ORB.java Thu Dec 19 09:00:44 2013 -0800
++++ ./corba/src/share/classes/org/omg/CORBA/ORB.java Tue Mar 18 12:29:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -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
+@@ -289,20 +291,38 @@
+ (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;
+ }
+
++ 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);
+@@ -346,7 +366,6 @@
+ } else {
+ orb = create_impl(className);
+ }
+-
+ orb.set_parameters(args, props);
+ return orb;
+ }
+@@ -377,7 +396,6 @@
+ } else {
+ orb = create_impl(className);
+ }
+-
+ orb.set_parameters(app, props);
+ return orb;
+ }
+@@ -573,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 )
+@@ -583,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);
+
+--- ./hotspot/.hgtags Thu Dec 19 09:00:51 2013 -0800
++++ ./hotspot/.hgtags Tue Mar 18 12:31:20 2014 -0700
+@@ -590,6 +590,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
+@@ -604,3 +607,22 @@
+ 1f11dff734af98f5bf11d4fceeda221ab1416971 jdk7u51-b11
+ dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u51-b12
+ 6c6a2299029ad02fa2820b8ff8c61c2bbcae799c jdk7u51-b13
++a398ddc79d2310ad37b131cc3794b3cf574f088e jdk7u51-b30
++cf4110c35afb10456d8264c47b7cde1c20150cab jdk7u51-b31
++208419914859dd77abdb5ec755b32c237ee6e4eb jdk7u51-b33
++f8457a75bdb5052f1d8c547027a926f9b755b808 jdk7u51-b34
++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
+--- ./hotspot/make/bsd/makefiles/arm.make Thu Dec 19 09:00:51 2013 -0800
++++ ./hotspot/make/bsd/makefiles/arm.make Tue Mar 18 12:31:20 2014 -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/hotspot_version Thu Dec 19 09:00:51 2013 -0800
++++ ./hotspot/make/hotspot_version Tue Mar 18 12:31:20 2014 -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,10 +31,10 @@
+ #
+
+ # Don't put quotes (fail windows build).
+-HOTSPOT_VM_COPYRIGHT=Copyright 2013
++HOTSPOT_VM_COPYRIGHT=Copyright 2014
+
+ HS_MAJOR_VER=24
+-HS_MINOR_VER=51
++HS_MINOR_VER=55
+ HS_BUILD_NUMBER=03
+
+ JDK_MAJOR_VER=1
+--- ./hotspot/make/linux/makefiles/arm.make Thu Dec 19 09:00:51 2013 -0800
++++ ./hotspot/make/linux/makefiles/arm.make Tue Mar 18 12:31:20 2014 -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/src/os/windows/vm/os_windows.cpp Thu Dec 19 09:00:51 2013 -0800
++++ ./hotspot/src/os/windows/vm/os_windows.cpp Tue Mar 18 12:31:20 2014 -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:
+- case 6000:
+- 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 &&
++ si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) {
++ st->print(" Windows XP x64 Edition");
+ } else {
+- os::Kernel32Dll::GetNativeSystemInfo(&si);
+- }
+- 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");
++ st->print(" Windows Server 2003 family");
+ }
+ break;
+- }
+- default: // future windows, print out its major and minor versions
++
++ case 6000:
++ if (osvi.wProductType == VER_NT_WORKSTATION) {
++ st->print(" Windows Vista");
++ } else {
++ st->print(" Windows Server 2008");
++ }
++ break;
++
++ case 6001:
++ if (osvi.wProductType == VER_NT_WORKSTATION) {
++ st->print(" Windows 7");
++ } else {
++ st->print(" Windows Server 2008 R2");
++ }
++ break;
++
++ case 6002:
++ if (osvi.wProductType == VER_NT_WORKSTATION) {
++ st->print(" Windows 8");
++ } else {
++ st->print(" Windows Server 2012");
++ }
++ break;
++
++ 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/share/vm/classfile/classFileParser.cpp Thu Dec 19 09:00:51 2013 -0800
++++ ./hotspot/src/share/vm/classfile/classFileParser.cpp Tue Mar 18 12:31:20 2014 -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
+@@ -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}}
+--- ./hotspot/src/share/vm/oops/objArrayKlass.cpp Thu Dec 19 09:00:51 2013 -0800
++++ ./hotspot/src/share/vm/oops/objArrayKlass.cpp Tue Mar 18 12:31:20 2014 -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 Thu Dec 19 09:00:51 2013 -0800
++++ ./hotspot/src/share/vm/opto/matcher.cpp Tue Mar 18 12:31:20 2014 -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 Thu Dec 19 09:00:51 2013 -0800
++++ ./hotspot/src/share/vm/opto/output.cpp Tue Mar 18 12:31:20 2014 -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;
+
+--- ./jaxp/.hgtags Thu Dec 19 09:01:08 2013 -0800
++++ ./jaxp/.hgtags Tue Mar 18 12:34:22 2014 -0700
+@@ -381,6 +381,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
+@@ -395,3 +398,22 @@
+ 70b5691c44d2830efd4301856e6223fa43894462 jdk7u51-b11
+ 807946db29f42477e8d8390be01c7e27280bc85c jdk7u51-b12
+ 114654a331e2f97a048d7ed43d06d7512e20e2c1 jdk7u51-b13
++3161567adae93d12c64b79592bda3046f0c0a22d jdk7u51-b30
++e85ee81daec2ea2fa21bf804d03431b0664c6dff jdk7u51-b31
++1a6c3258ad218bf286c47d65e4cd80eb6763f8df jdk7u51-b33
++9cdc04d76eb19a871c739625acd801ed1b24bed9 jdk7u51-b34
++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
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Thu Dec 19 09:01:08 2013 -0800
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Tue Mar 18 12:34:22 2014 -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 Thu Dec 19 09:01:08 2013 -0800
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java Tue Mar 18 12:34:22 2014 -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/xerces/internal/utils/ObjectFactory.java Thu Dec 19 09:01:08 2013 -0800
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java Tue Mar 18 12:34:22 2014 -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/xml/internal/serializer/CharInfo.java Thu Dec 19 09:01:08 2013 -0800
++++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java Tue Mar 18 12:34:22 2014 -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;
+-// }
+
++ /**
++ * 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;
++ }
+
+- 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);}
+- });
++ 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:
+ *
+- * Resource files must be encoded in UTF-8 and have a format like:
++ * 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
++ *
++ * 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 Thu Dec 19 09:01:08 2013 -0800
++++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java Tue Mar 18 12:34:22 2014 -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 Thu Dec 19 09:01:08 2013 -0800
++++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java Tue Mar 18 12:34:22 2014 -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.
+--- ./jaxws/.hgtags Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/.hgtags Tue Mar 18 12:34:51 2014 -0700
+@@ -381,6 +381,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
+@@ -395,3 +398,22 @@
+ 708507f4795cad1f0cf7e19ff2dc16fe9d441754 jdk7u51-b11
+ 7c7c2ea4b6808d0abf7fd48d11440d75b0c08d3a jdk7u51-b12
+ 81a1b110f70c37d2c2f0de7c0ef3bd2d04aba475 jdk7u51-b13
++5dbeb9983f104be717da35c9b14923d71dd248d7 jdk7u51-b30
++eb79f394916efba85f4f6c7ef562966699f2c1e8 jdk7u51-b31
++b2e40219fdcb579d9e10bf01bbd1f05ddcc936fb jdk7u51-b33
++f782f513bb1c74640fe0f4711fec6a417845e9e9 jdk7u51-b34
++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
+--- ./jaxws/src/share/jaf_classes/javax/activation/CommandMap.java Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaf_classes/javax/activation/CommandMap.java Tue Mar 18 12:34:51 2014 -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();
++ public static synchronized CommandMap getDefaultCommandMap() {
++ if (defaultCommandMap != null)
++ return defaultCommandMap;
+
+- 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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaf_classes/javax/activation/DataHandler.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaf_classes/javax/activation/FileTypeMap.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java Tue Mar 18 12:34:51 2014 -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);
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java Tue Mar 18 12:34:51 2014 -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);
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java Tue Mar 18 12:34:51 2014 -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 {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.java Tue Mar 18 12:34:51 2014 -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 );
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.properties Tue Mar 18 12:34:51 2014 -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/v2/model/impl/Messages.java Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties Tue Mar 18 12:34:51 2014 -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/RuntimeBuiltinLeafInfoImpl.java Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Tue Mar 18 12:34:51 2014 -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/runtime/output/XMLStreamWriterOutput.java Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java Tue Mar 18 12:34:51 2014 -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/unmarshaller/StAXStreamConnector.java Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Tue Mar 18 12:34:51 2014 -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
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java Tue Mar 18 12:34:51 2014 -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);
+ }
+ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java Tue Mar 18 12:34:51 2014 -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) {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java Tue Mar 18 12:34:51 2014 -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();
++
++ LOGGER.fine("XMLStreamReaderFactory instance is = "+f);
++ return f;
+ }
+-
+- if(f==null)
+- f = new Default();
+-
+- theInstance = f;
+- LOGGER.fine("XMLStreamReaderFactory instance is = "+theInstance);
+- }
++ };
+
+ 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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java Tue Mar 18 12:34:51 2014 -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>() {
+
++ @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();
++ }
+
+- 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
++ 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);
++
++ LOGGER.fine("XMLStreamWriterFactory instance is = "+ f);
++ return f;
+ }
+- if (xof == null) {
+- xof = XMLOutputFactory.newInstance();
+- }
+-
+- 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);
+-
+- theInstance = f;
+- LOGGER.fine("XMLStreamWriterFactory instance is = "+theInstance);
+- }
++ };
+
+ /**
+ * 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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java Tue Mar 18 12:34:51 2014 -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;
++ }
++
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java Tue Mar 18 12:34:51 2014 -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;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java Tue Mar 18 12:34:51 2014 -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);
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java Tue Mar 18 12:34:51 2014 -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);
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java Tue Mar 18 12:34:51 2014 -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 ContextClassloaderLocal<TransformerFactory> transformerFactory = new ContextClassloaderLocal<TransformerFactory>() {
++ @Override
++ protected TransformerFactory initialValue() throws Exception {
++ return TransformerFactory.newInstance();
++ }
++ };
+
+- static final SAXParserFactory saxParserFactory = SAXParserFactory.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));
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java Tue Mar 18 12:34:51 2014 -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;
++ }
++ });
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:10 2013 -0800
++++ ./jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java Tue Mar 18 12:34:51 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/.hgtags Tue Mar 18 12:35:25 2014 -0700
+@@ -365,6 +365,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
+@@ -379,3 +382,22 @@
+ f0425ecbbb0ca9d8c87c250c19e8f9524b38833d jdk7u51-b11
+ f5eee4f1d5b4a1e19febc9c26c863ae853ed6d2e jdk7u51-b12
+ d19a89fdfb9b959b8638441d9d396685d6c7ab7b jdk7u51-b13
++ef58b2b9a9a1e1a42b0139b57816a160c4681371 jdk7u51-b30
++5bca0d0969b13b1d9b8caba3cce8293a98d68318 jdk7u51-b31
++e9143dc3dc2a8f4b896e74f70d6c503d73c40533 jdk7u51-b33
++c1eaf405fb8d7beddd75c6f81671970f6baa70d8 jdk7u51-b34
++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
+--- ./jdk/make/common/Defs-embedded.gmk Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/make/common/Defs-embedded.gmk Tue Mar 18 12:35:25 2014 -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/java/java/Exportedfiles.gmk Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/make/java/java/Exportedfiles.gmk Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/make/java/java/Makefile Tue Mar 18 12:35:25 2014 -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 \
+@@ -451,3 +452,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/mapfile-vers Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/make/java/java/mapfile-vers Tue Mar 18 12:35:25 2014 -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/sun/javazic/tzdata/VERSION Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/make/sun/javazic/tzdata/VERSION Tue Mar 18 12:35:25 2014 -0700
+@@ -21,4 +21,4 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-tzdata2013h
++tzdata2013i
+--- ./jdk/make/sun/javazic/tzdata/africa Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/make/sun/javazic/tzdata/africa Tue Mar 18 12:35:25 2014 -0700
+@@ -500,14 +500,13 @@
+ Rule Libya 1997 only - Oct 4 0: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.
+ 2:00 - EET 1996 Sep 30
+ 1:00 Libya CE%sT 1997 Oct 4
+ 2:00 - EET 2012 Nov 10 2:00
+--- ./jdk/make/sun/javazic/tzdata/asia Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/make/sun/javazic/tzdata/asia Tue Mar 18 12:35:25 2014 -0700
+@@ -1403,12 +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 (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
+@@ -1438,11 +1448,13 @@
+ 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 2012 - Oct lastFri 0:00s 0 -
++Rule Jordan 2006 2011 - 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 2012 Oct 26 0:00s
+- 3:00 - AST
++ 2:00 Jordan EE%sT
+
+
+ # Kazakhstan
+--- ./jdk/make/sun/javazic/tzdata/northamerica Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/make/sun/javazic/tzdata/northamerica Tue Mar 18 12:35:25 2014 -0700
+@@ -2688,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):
+@@ -2877,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
+--- ./jdk/src/macosx/classes/sun/font/CFontManager.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/classes/sun/font/CFontManager.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/classes/sun/font/CStrike.java Tue Mar 18 12:35:25 2014 -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));
++ @Override
++ float getGlyphAdvance(final int glyphCode) {
++ return 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);
++ @Override
++ float getCodePointAdvance(final int cp) {
++ return getGlyphAdvance(nativeFont.getMapper().charToGlyph(cp));
+ }
+
+- // 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);
++ @Override
++ Point2D.Float getCharMetrics(final char ch) {
++ return getGlyphMetrics(nativeFont.getMapper().charToGlyph(ch));
+ }
+
+- Point2D.Float getCharMetrics(char ch) {
+- return getScaledPointForAdvance(getCachedNativeGlyphAdvance(nativeFont.getMapper().charToGlyph(ch)));
+- }
+-
+- Point2D.Float getGlyphMetrics(int glyphCode) {
+- return getScaledPointForAdvance(getCachedNativeGlyphAdvance(glyphCode));
+- }
+-
+- // 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;
+- }
+-
+- 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/classes/sun/lwawt/LWToolkit.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java Tue Mar 18 12:35:25 2014 -0700
+@@ -97,6 +97,6 @@
+ setVisible(true);
+ }
+ }, this);
+- } catch (InterruptedException | InvocationTargetException ex) {}
++ } catch (InvocationTargetException ex) {}
+ }
+ }
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Tue Mar 18 12:35:25 2014 -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/sun/awt/LWCToolkit.m Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/native/sun/awt/LWCToolkit.m Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/native/sun/awt/awt.m Tue Mar 18 12:35:25 2014 -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/font/AWTStrike.h Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/native/sun/font/AWTStrike.h Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/native/sun/font/AWTStrike.m Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/native/sun/font/CGGlyphImages.m Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m Tue Mar 18 12:35:25 2014 -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/jmx/remote/security/SubjectDelegator.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java Tue Mar 18 12:35:25 2014 -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/jndi/dns/DnsClient.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java Tue Mar 18 12:35:25 2014 -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);
++ do {
++ // Generate a random transaction ID
++ xid = random.nextInt(TRANSACTION_ID_BOUND);
++ pkt = makeQueryPacket(fqdn, xid, qclass, qtype, recursion);
+
+- Packet 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);
++ if (!hdr.query && hdr.numQuestions == 1) {
+
+- checkResponseCode(hdr);
+- // remove the response for the xid if received by some other thread.
+- synchronized (queuesLock) {
+- resps.remove(xid);
+- reqs.remove(xid);
++ 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java Tue Mar 18 12:35:25 2014 -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/media/sound/JDK13Services.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/com/sun/media/sound/JDK13Services.java Tue Mar 18 12:35:25 2014 -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.
++ /**
++ * 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 void setCachingPeriod(int seconds) {
+- cachingPeriod = seconds * 1000L;
++ 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 Collections.unmodifiableList(providers);
+ }
+
+-
+- /** 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();
+- }
+- return cache.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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java Tue Mar 18 12:35:25 2014 -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/ResourceManager.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java Tue Mar 18 12:35:25 2014 -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/rowset/CachedRowSetImpl.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java Tue Mar 18 12:35:25 2014 -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/internal/CachedRowSetWriter.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java Tue Mar 18 12:35:25 2014 -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/java/awt/EventQueue.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/awt/EventQueue.java Tue Mar 18 12:35:25 2014 -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/SystemFlavorMap.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java Tue Mar 18 12:35:25 2014 -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();
++ AppContext context = AppContext.getAppContext();
++ FlavorMap fm = (FlavorMap) context.get(FLAVOR_MAP_KEY);
++ if (fm == null) {
++ fm = new SystemFlavorMap();
++ context.put(FLAVOR_MAP_KEY, fm);
+ }
+-
+- FlavorMap fm;
+-
+- synchronized(flavorMaps) {
+- fm = (FlavorMap)flavorMaps.get(contextClassLoader);
+- if (fm == null) {
+- fm = new SystemFlavorMap();
+- flavorMaps.put(contextClassLoader, 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/awt/event/InvocationEvent.java Tue Mar 18 12:35:25 2014 -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/lang/Thread.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/lang/Thread.java Tue Mar 18 12:35:25 2014 -0700
+@@ -366,6 +366,8 @@
+ throw new NullPointerException("name cannot be null");
+ }
+
++ this.name = name.toCharArray();
++
+ Thread parent = currentThread();
+ SecurityManager security = System.getSecurityManager();
+ if (g == null) {
+@@ -402,7 +404,6 @@
+ 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
+--- ./jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Tue Mar 18 12:35:25 2014 -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/MethodHandles.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java Tue Mar 18 12:35:25 2014 -0700
+@@ -1616,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);
+ }
+@@ -1810,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/util/ServiceLoader.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/util/ServiceLoader.java Tue Mar 18 12:35:25 2014 -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/jar/JarVerifier.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/util/jar/JarVerifier.java Tue Mar 18 12:35:25 2014 -0700
+@@ -677,6 +677,8 @@
+ } else {
+ matchUnsigned = true;
+ }
++ } else {
++ matchUnsigned = true;
+ }
+ }
+
+@@ -779,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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/util/logging/LogManager.java Tue Mar 18 12:35:25 2014 -0700
+@@ -363,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() {
+@@ -371,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;
+ }
+
+@@ -424,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
+@@ -471,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;
+@@ -760,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
+@@ -1425,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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/java/util/logging/Logger.java Tue Mar 18 12:35:25 2014 -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/script/ScriptEngineManager.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/javax/script/ScriptEngineManager.java Tue Mar 18 12:35:25 2014 -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/Subject.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/javax/security/auth/Subject.java Tue Mar 18 12:35:25 2014 -0700
+@@ -941,14 +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 {
+
+- 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
+- principals = Collections.synchronizedSet(new SecureSet<Principal>
+- (this, PRINCIPAL_SET, principals));
++ 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.
+--- ./jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java Tue Mar 18 12:35:25 2014 -0700
+@@ -37,8 +37,11 @@
+ 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;
+
+ /**
+ * The Service Provider Interface (SPI) mechanism that generates <code>SyncProvider</code>
+@@ -343,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();
+@@ -372,6 +375,7 @@
+ }
+ });
+ } catch (Exception ex) {
++ System.out.println("errorget rowset.properties: " + ex);
+ strRowsetProperties = null;
+ }
+ if (strRowsetProperties != null) {
+@@ -391,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);
+@@ -560,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 {
+@@ -568,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/sun/awt/AWTAccessor.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/awt/AWTAccessor.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/awt/AWTAutoShutdown.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/awt/AppContext.java Tue Mar 18 12:35:25 2014 -0700
+@@ -837,21 +837,68 @@
+ public boolean isMainAppContext() {
+ return (numAppContexts.get() == 1 && mainAppContext != null);
+ }
+- public Object getContext() {
+- return getAppContext();
++
++ private boolean hasRootThreadGroup(final AppContext ecx) {
++ return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
++ @Override
++ public Boolean run() {
++ return ecx.threadGroup.getParent() == null;
++ }
++ });
+ }
+- public Object getExecutionContext() {
+- return getExecutionAppContext();
++
++ /**
++ * 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;
+ }
+- 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);
+- }
+- public void remove(Object context, Object key) {
+- ((AppContext)context).remove(key);
+- }
++
+ });
+ }
+ }
+--- ./jdk/src/share/classes/sun/awt/SunToolkit.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/awt/SunToolkit.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/font/CreatedFontTracker.java Tue Mar 18 12:35:25 2014 -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/SunFontManager.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java Tue Mar 18 12:35:25 2014 -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;
+
+@@ -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/java2d/Disposer.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/java2d/Disposer.java Tue Mar 18 12:35:25 2014 -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;
++ }
+ }
+- }
+ );
+ }
+
+--- ./jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java Tue Mar 18 12:35:25 2014 -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());
+ }
+ });
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/sun/misc/InnocuousThread.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/misc/JavaAWTAccess.java Tue Mar 18 12:35:25 2014 -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/Service.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/misc/Service.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/misc/SharedSecrets.java Tue Mar 18 12:35:25 2014 -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;
+ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/sun/misc/ThreadGroupUtils.java Tue Mar 18 12:35:25 2014 -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/Invoker.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/nio/ch/Invoker.java Tue Mar 18 12:35:25 2014 -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/ThreadPool.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/nio/ch/ThreadPool.java Tue Mar 18 12:35:25 2014 -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/security/provider/SeedGenerator.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/security/provider/SeedGenerator.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/security/rsa/RSAPadding.java Tue Mar 18 12:35:25 2014 -0700
+@@ -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 @@
+ }
+
+ /**
+- * 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,55 +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) {
+- bpe = new BadPaddingException("Data must start with zero");
++ bp = true;
+ }
+- if (padded[k++] != type && bpe == null) {
+- bpe = new BadPaddingException("Blocktype mismatch: " + padded[1]);
++ if (padded[k++] != type) {
++ bp = true;
+ }
+ int p = 0;
+ while (k < padded.length) {
+ int b = padded[k++] & 0xff;
+- if (b == 0 && p == 0) {
++ if ((b == 0) && (p == 0)) {
+ p = k;
+ }
+- 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) &&
+- p == 0 && bpe == null) {
+- bpe = new BadPaddingException("Padding byte not 0xff: " + b);
++ (p == 0)) {
++ bp = true;
+ }
+ }
+ int n = padded.length - p;
+- if (n > maxDataSize && bpe == null) {
+- bpe = new BadPaddingException("Padding string too short");
++ if (n > maxDataSize) {
++ 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, p, data, 0, n);
+
+- if (bpe == null) {
+- bpe = new BadPaddingException("Unused exception");
++ BadPaddingException bpe = new BadPaddingException("Decryption error");
++
++ if (bp) {
++ throw bpe;
+ } else {
+- throw bpe;
++ return data;
+ }
+-
+- return data;
+ }
+
+ /**
+@@ -424,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;
+@@ -442,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");
++
++ if (bp) {
++ throw bpe;
++ } else {
++ return m;
++ }
+ }
+
+ /**
+@@ -478,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);
+@@ -499,5 +537,4 @@
+ }
+ }
+ }
+-
+ }
+--- ./jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/security/tools/JarSigner.java Tue Mar 18 12:35:25 2014 -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";
+@@ -1516,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<>();
+--- ./jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Tue Mar 18 12:35:25 2014 -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/util/resources/TimeZoneNames.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Tue Mar 18 12:35:25 2014 -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
+@@ -483,7 +483,7 @@
+ {"Asia/Aden", ARAST},
+ {"Asia/Almaty", new String[] {"Alma-Ata Time", "ALMT",
+ "Alma-Ata Summer Time", "ALMST"}},
+- {"Asia/Amman", ARAST},
++ {"Asia/Amman", EET},
+ {"Asia/Anadyr", new String[] {"Anadyr Time", "ANAT",
+ "Anadyr Summer Time", "ANAST"}},
+ {"Asia/Aqtau", new String[] {"Aqtau Time", "AQTT",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Tue Mar 18 12:35:25 2014 -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
+@@ -483,7 +483,7 @@
+ {"Asia/Aden", ARAST},
+ {"Asia/Almaty", new String[] {"Alma Ata Zeit", "ALMT",
+ "Alma-Ata Sommerzeit", "ALMST"}},
+- {"Asia/Amman", ARAST},
++ {"Asia/Amman", EET},
+ {"Asia/Anadyr", new String[] {"Anadyr Zeit", "ANAT",
+ "Anadyr Sommerzeit", "ANAST"}},
+ {"Asia/Aqtau", new String[] {"Aqtau Zeit", "AQTT",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Tue Mar 18 12:35:25 2014 -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
+@@ -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", ARAST},
++ {"Asia/Amman", EET},
+ {"Asia/Anadyr", new String[] {"Hora de Anadyr", "ANAT",
+ "Hora de verano de Anadyr", "ANAST"}},
+ {"Asia/Aqtau", new String[] {"Hora de Aqtau", "AQTT",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Tue Mar 18 12:35:25 2014 -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
+@@ -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", ARAST},
++ {"Asia/Amman", EET},
+ {"Asia/Anadyr", new String[] {"Heure d'Anadyr", "ANAT",
+ "Heure d'\u00e9t\u00e9 d'Anadyr", "ANAST"}},
+ {"Asia/Aqtau", new String[] {"Heure d'Aqtau", "AQTT",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Tue Mar 18 12:35:25 2014 -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
+@@ -483,7 +483,7 @@
+ {"Asia/Aden", ARAST},
+ {"Asia/Almaty", new String[] {"Ora di Alma-Ata", "ALMT",
+ "Ora estiva di Alma-Ata", "ALMST"}},
+- {"Asia/Amman", ARAST},
++ {"Asia/Amman", EET},
+ {"Asia/Anadyr", new String[] {"Ora di Anadyr", "ANAT",
+ "Ora estiva di Anadyr", "ANAST"}},
+ {"Asia/Aqtau", new String[] {"Ora di Aqtau", "AQTT",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Tue Mar 18 12:35:25 2014 -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
+@@ -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", ARAST},
++ {"Asia/Amman", EET},
+ {"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",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Tue Mar 18 12:35:25 2014 -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
+@@ -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", ARAST},
++ {"Asia/Amman", EET},
+ {"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",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Tue Mar 18 12:35:25 2014 -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
+@@ -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", ARAST},
++ {"Asia/Amman", EET},
+ {"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",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Tue Mar 18 12:35:25 2014 -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
+@@ -483,7 +483,7 @@
+ {"Asia/Aden", ARAST},
+ {"Asia/Almaty", new String[] {"Alma-Ata, normaltid", "ALMT",
+ "Alma-Ata, sommartid", "ALMST"}},
+- {"Asia/Amman", ARAST},
++ {"Asia/Amman", EET},
+ {"Asia/Anadyr", new String[] {"Anadyr, normaltid", "ANAT",
+ "Anadyr, sommartid", "ANAST"}},
+ {"Asia/Aqtau", new String[] {"Aqtau, normaltid", "AQTT",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Tue Mar 18 12:35:25 2014 -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
+@@ -483,7 +483,7 @@
+ {"Asia/Aden", ARAST},
+ {"Asia/Almaty", new String[] {"Alma-Ata \u65f6\u95f4", "ALMT",
+ "Alma-Ata \u590f\u4ee4\u65f6", "ALMST"}},
+- {"Asia/Amman", ARAST},
++ {"Asia/Amman", EET},
+ {"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",
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Tue Mar 18 12:35:25 2014 -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
+@@ -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", ARAST},
++ {"Asia/Amman", EET},
+ {"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",
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp Tue Mar 18 12:35:25 2014 -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/sun/awt/giflib/dgif_lib.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/awt/giflib/dgif_lib.c Tue Mar 18 12:35:25 2014 -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/gif/gifdecoder.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/awt/image/gif/gifdecoder.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c Tue Mar 18 12:35:25 2014 -0700
+@@ -939,6 +939,9 @@
+ JPEGImageReader_readInputDataID,
+ 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);
+@@ -1035,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);
+--- ./jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/awt/libpng/pngrtran.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/awt/libpng/pngset.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Tue Mar 18 12:35:25 2014 -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,7 +743,9 @@
+
+ /* Means that we couldn't write directly into the destination buffer */
+ if (ddata == NULL) {
+- retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
++ if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
++ retStatus = setPixelsFormMlibImage(env, dstRasterP, dst);
++ }
+ }
+
+ /* Release the pinned memory */
+@@ -1106,7 +1151,7 @@
+ if (ddata == NULL) {
+ /* Need to store it back into the array */
+ if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
+- retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
++ retStatus = setPixelsFormMlibImage(env, dstRasterP, dst);
+ }
+ }
+
+@@ -1432,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
+@@ -1445,13 +1498,6 @@
+ }
+ }
+
+- /* 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);
+@@ -1669,18 +1715,20 @@
+ 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) {
+- retStatus = awt_setPixels(env, dstRasterP, mlib_ImageGetData(dst));
+- }
+-
+- /* Release the LUT */
+- for (i=0; i < lut_nbands; i++) {
+- (*env)->ReleasePrimitiveArrayCritical(env, jtable[i].jArray,
+- (jbyte *) jtable[i].table, JNI_ABORT);
++ if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
++ retStatus = setPixelsFormMlibImage(env, dstRasterP, dst);
++ }
+ }
+
+ /* Release the pinned memory */
+@@ -2640,7 +2688,7 @@
+ }
+ }
+ else if (mlibImP->type == MLIB_SHORT) {
+- return awt_setPixels(env, rasterP, mlibImP->data);
++ return setPixelsFormMlibImage(env, rasterP, mlibImP);
+ }
+ }
+ else {
+--- ./jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp Tue Mar 18 12:35:25 2014 -0700
+@@ -110,6 +110,8 @@
+ LEErrorCode &success,
+ le_bool backtrack)
+ {
++ if (LE_FAILURE(success)) { return FALSE; }
++
+ le_int32 direction = 1;
+ le_int32 match = 0;
+
+@@ -255,6 +257,7 @@
+ le_uint16 matchCount = SWAPW(subRuleTable->glyphCount) - 1;
+ le_uint16 substCount = SWAPW(subRuleTable->substCount);
+ 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);
+@@ -315,6 +318,7 @@
+
+ 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);
+@@ -573,7 +577,7 @@
+ 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);
+
+ return inputGlyphCount + 1;
+@@ -601,6 +605,7 @@
+ le_uint16 backtrkGlyphCount = SWAPW(backtrackGlyphCount);
+ le_uint16 inputGlyphCount = (le_uint16) SWAPW(backtrackCoverageTableOffsetArray[backtrkGlyphCount]);
+ 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]);
+
+ if( LE_FAILURE(success) ) { return 0; }
+--- ./jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp Tue Mar 18 12:35:25 2014 -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/LookupProcessor.cpp Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/font/layout/LookupProcessor.cpp Tue Mar 18 12:35:25 2014 -0700
+@@ -282,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/MarkToBasePosnSubtables.cpp Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp Tue Mar 18 12:35:25 2014 -0700
+@@ -67,6 +67,7 @@
+
+ LEPoint 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);
+
+--- ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp Tue Mar 18 12:35:25 2014 -0700
+@@ -79,8 +79,8 @@
+
+ Offset OpenTypeUtilities::getTagOffset(LETag tag, const LEReferenceToArrayOf<TagAndOffsetRecord> &records, LEErrorCode &success)
+ {
++ if(LE_FAILURE(success)) return 0;
+ const TagAndOffsetRecord *r0 = (const TagAndOffsetRecord*)records.getAlias();
+- if(LE_FAILURE(success)) return 0;
+
+ le_uint32 recordCount = records.getCount();
+ le_uint8 bit = highBit(recordCount);
+--- ./jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp Tue Mar 18 12:35:25 2014 -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/StateTableProcessor.cpp Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp Tue Mar 18 12:35:25 2014 -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/java2d/cmm/lcms/cmscam02.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c Tue Mar 18 12:35:25 2014 -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 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));
+- cmsPipelineInsertStage(Result, cmsAT_END, _cmsStageAllocXYZ2Lab(Result ->ContextID));
+- 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;
+
+- default:
+- return FALSE; // Colorspace mismatch
+- }
+- break;
++ default:
++ return FALSE; // Colorspace mismatch
++ }
++ break;
+
++ case cmsSigLabData: // Input profile operates in Lab
+
+- case cmsSigLabData: // Input profile operates in Lab
++ switch (OutPCS) {
+
+- switch (OutPCS) {
++ case cmsSigXYZData: // Lab -> XYZ
+
+- case cmsSigXYZData: // Lab -> XYZ
++ 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;
+
+- 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 cmsSigLabData: // Lab -> Lab
+
+- case cmsSigLabData: // Lab -> Lab
+-
+- 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;
+-
+- 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;
+
++ default:
++ return FALSE; // Mismatch
++ }
++ break;
+
+- // On colorspaces other than PCS, check for same space
+- default:
+- if (InPCS != OutPCS) return FALSE;
+- 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c Tue Mar 18 12:35:25 2014 -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,11 +1109,16 @@
+ 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;
+ }
+@@ -1106,13 +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++) {
+
+-
+ if (Icc ->TagNames[i] == 0) continue;
+
+ // Linked tags are not written
+@@ -1126,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];
+@@ -1164,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]);
+@@ -1175,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];
+
+@@ -1314,8 +1365,8 @@
+ // Should we just calculate the needed space?
+ if (MemPtr == NULL) {
+
+- *BytesNeeded = cmsSaveProfileToIOhandler(hProfile, NULL);
+- return (*BytesNeeded == 0 ? FALSE : TRUE);
++ *BytesNeeded = cmsSaveProfileToIOhandler(hProfile, NULL);
++ return (*BytesNeeded == 0 ? FALSE : TRUE);
+ }
+
+ // That is a real write operation
+@@ -1353,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]);
+@@ -1400,6 +1452,7 @@
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+ cmsIOHANDLER* io = Icc ->IOhandler;
+ cmsTagTypeHandler* TypeHandler;
++ cmsTagTypeHandler LocalTypeHandler;
+ cmsTagDescriptor* TagDescriptor;
+ cmsTagTypeSignature BaseType;
+ cmsUInt32Number Offset, TagSize;
+@@ -1423,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);
+@@ -1440,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)
+@@ -1468,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);
+ }
+
+
+@@ -1500,6 +1554,7 @@
+ {
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+ cmsTagTypeHandler* TypeHandler = NULL;
++ cmsTagTypeHandler LocalTypeHandler;
+ cmsTagDescriptor* TagDescriptor = NULL;
+ cmsTagTypeSignature Type;
+ int i;
+@@ -1530,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]);
+ }
+ }
+ }
+@@ -1571,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);
+ }
+@@ -1609,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) {
+
+@@ -1638,6 +1695,7 @@
+ int i;
+ cmsIOHANDLER* MemIO;
+ cmsTagTypeHandler* TypeHandler = NULL;
++ cmsTagTypeHandler LocalTypeHandler;
+ cmsTagDescriptor* TagDescriptor = NULL;
+ cmsUInt32Number rc;
+ cmsUInt32Number Offset, TagSize;
+@@ -1653,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];
+@@ -1675,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];
+@@ -1693,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;
+
+@@ -1701,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;
+ }
+@@ -1752,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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c Tue Mar 18 12:35:25 2014 -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,21 +451,27 @@
+
+ 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));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_END, cmsStageAllocToneCurves(ContextID, 1, &RevGrayTRC)))
++ goto Error;
++
+ cmsFreeToneCurve(RevGrayTRC);
++ return Lut;
+
+- return Lut;
++Error:
++ cmsFreeToneCurve(RevGrayTRC);
++ cmsPipelineFree(Lut);
++ return NULL;
+ }
+
+
+-
+-
+ static
+ cmsPipeline* BuildRGBOutputMatrixShaper(cmsHPROFILE hProfile)
+ {
+@@ -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;
+
+- cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocNamedColor(nc, FALSE));
++ if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocNamedColor(nc, FALSE)))
++ goto Error;
++
+ 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c Tue Mar 18 12:35:25 2014 -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);
+- else
++ if (mpe ->DupElemPtr) {
++
++ NewMPE ->Data = mpe ->DupElemPtr(mpe);
++
++ if (NewMPE->Data == NULL) {
++
++ cmsStageFree(NewMPE);
++ return NULL;
++ }
++
++ } 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c Tue Mar 18 12:35:25 2014 -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
+-
+ 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 = TRUE;
++ cmsFloat64Number yRamp[256];
++ cmsFloat64Number x[256], y[256];
++ cmsFloat64Number lo, hi;
++ int n, l;
++ cmsProfileClassSignature devClass;
+
+- cmsFloat64Number MinL, MaxL;
+- cmsBool NearlyStraightMidRange = FALSE;
+- cmsFloat64Number L;
+- cmsFloat64Number x[101], y[101];
+- cmsFloat64Number lo, hi, NonMonoMin;
+- int n, l, i, NonMonoIndx;
+-
++ // 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;
++ // Compute ramps
+
+- // Calculate Max L*
+- Lab = InitialLab;
+- Lab.L = 100;
+- cmsDoTransform(hRoundTrip, &Lab, &destLab, 1);
+- MaxL = destLab.L;
++ for (l=0; l < 256; l++) {
+
+- // Step 3
+- // ======
++ Lab.L = (cmsFloat64Number) (l * 100.0) / 255.0;
++ Lab.a = cmsmin(50, cmsmax(-50, InitialLab.a));
++ Lab.b = cmsmin(50, cmsmax(-50, InitialLab.b));
+
+- // check if quadratic estimation needs to be done.
++ 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]);
++ }
++
++ // Check
++ if (! (outRamp[0] < outRamp[255])) {
++
++ cmsDeleteTransform(hRoundTrip);
++ BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
++ return FALSE;
++ }
++
++
++ // Test for mid range straight (only on relative colorimetric)
++
++ NearlyStraightMidrange = TRUE;
++ MinL = outRamp[0]; MaxL = outRamp[255];
+ if (Intent == INTENT_RELATIVE_COLORIMETRIC) {
+
+- // 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;
++ for (l=0; l < 256; l++) {
+
+- for (l=0; l <= 100; l++) {
++ if (! ((inRamp[l] <= MinL + 0.2 * (MaxL - MinL) ) ||
++ (fabs(inRamp[l] - outRamp[l]) < 4.0 )))
++ NearlyStraightMidrange = FALSE;
++ }
+
+- Lab.L = l;
+- Lab.a = InitialLab.a;
+- Lab.b = InitialLab.b;
++ // 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.
+
+- cmsDoTransform(hRoundTrip, &Lab, &destLab, 1);
++ if (NearlyStraightMidrange) {
+
+- L = destLab.L;
+-
+- // Check the mid range in 20% after MinL
+- if (L > (MinL + 0.2 * (MaxL - MinL))) {
+-
+- // Is close enough?
+- if (fabs(L - l) > 4.0) {
+-
+- // Too far away, profile is buggy!
+- NearlyStraightMidRange = FALSE;
+- break;
+- }
+- }
++ cmsLab2XYZ(NULL, BlackPoint, &InitialLab);
++ cmsDeleteTransform(hRoundTrip);
++ return TRUE;
+ }
+ }
+- else {
+- // Check is always performed for perceptual and saturation intents
+- NearlyStraightMidRange = FALSE;
+- }
+
+
+- // If no furter checking is needed, we are done
+- if (NearlyStraightMidRange) {
+-
+- 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++) {
++ for (l=0; l < 256; l++) {
+
+- cmsFloat64Number ff;
+-
+- Lab.L = (cmsFloat64Number) l;
+- Lab.a = InitialLab.a;
+- Lab.b = InitialLab.b;
+-
+- 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) {
+- 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];
+- }
+ }
+
+- Lab.L = x[NonMonoIndx];
++
++ // No suitable points
++ if (n < 3 ) {
++ cmsDeleteTransform(hRoundTrip);
++ BlackPoint -> X = BlackPoint ->Y = BlackPoint -> Z = 0.0;
++ return FALSE;
++ }
++
+
+ // 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c Tue Mar 18 12:35:25 2014 -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.
+-
+- NewGamma = cmsBuildTabulatedToneCurve16(self ->ContextID, 2, Linear);
+- if (!NewGamma) return NULL;
+- *nItems = 1;
+- return NewGamma;
++ {
++ cmsFloat64Number SingleGamma = 1.0;
++
++ 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;
++ // Usual case of identity curves
++ if ((Tables ->TheCurves[i]->nEntries == 2) &&
++ (Tables->TheCurves[i]->Table16[0] == 0) &&
++ (Tables->TheCurves[i]->Table16[1] == 65535)) {
++
++ for (j=0; j < 256; j++) {
++ if (!_cmsWriteUInt8Number(io, (cmsUInt8Number) j)) return FALSE;
++ }
+ }
+-
+- }
+-
+- 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 (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;
++ }
+ }
+ }
+ 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c Tue Mar 18 12:35:25 2014 -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)
++ 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;
++ 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;
+
+- bchsw.Brightness = Bright;
+- bchsw.Contrast = Contrast;
+- bchsw.Hue = Hue;
+- bchsw.Saturation = Saturation;
++ cmsWhitePointFromTemp(&WhitePnt, TempSrc );
++ cmsxyY2XYZ(&bchsw.WPsrc, &WhitePnt);
+
+- cmsWhitePointFromTemp(&WhitePnt, TempSrc );
+- cmsxyY2XYZ(&bchsw.WPsrc, &WhitePnt);
++ cmsWhitePointFromTemp(&WhitePnt, TempDest);
++ cmsxyY2XYZ(&bchsw.WPdest, &WhitePnt);
+
+- cmsWhitePointFromTemp(&WhitePnt, TempDest);
+- cmsxyY2XYZ(&bchsw.WPdest, &WhitePnt);
++ hICC = cmsCreateProfilePlaceholder(ContextID);
++ if (!hICC) // can't allocate
++ return NULL;
+
+- hICC = cmsCreateProfilePlaceholder(ContextID);
+- if (!hICC) // can't allocate
+- return NULL;
+
++ cmsSetDeviceClass(hICC, cmsSigAbstractClass);
++ cmsSetColorSpace(hICC, cmsSigLabData);
++ cmsSetPCS(hICC, cmsSigLabData);
+
+- cmsSetDeviceClass(hICC, cmsSigAbstractClass);
+- cmsSetColorSpace(hICC, cmsSigLabData);
+- cmsSetPCS(hICC, cmsSigLabData);
++ cmsSetHeaderRenderingIntent(hICC, INTENT_PERCEPTUAL);
+
+- cmsSetHeaderRenderingIntent(hICC, INTENT_PERCEPTUAL);
++ // 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;
+
+- // 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 (!cmsStageSampleCLut16bit(CLUT, bchswSampler, (void*) &bchsw, 0)) {
++ if (!cmsPipelineInsertStage(Pipeline, cmsAT_END, CLUT)) {
++ goto Error;
++ }
+
+- // Shouldn't reach here
+- cmsPipelineFree(Pipeline);
+- cmsCloseProfile(hICC);
+- return NULL;
+- }
++ // Create tags
++ if (!SetTextTags(hICC, L"BCHS built-in")) return NULL;
+
+- cmsPipelineInsertStage(Pipeline, cmsAT_END, CLUT);
++ cmsWriteTag(hICC, cmsSigMediaWhitePointTag, (void*) cmsD50_XYZ());
+
+- // Create tags
++ cmsWriteTag(hICC, cmsSigAToB0Tag, (void*) Pipeline);
+
+- if (!SetTextTags(hICC, L"BCHS built-in")) return NULL;
++ // Pipeline is already on virtual profile
++ cmsPipelineFree(Pipeline);
+
+- cmsWriteTag(hICC, cmsSigMediaWhitePointTag, (void*) cmsD50_XYZ());
++ // Ok, done
++ return hICC;
+
+- cmsWriteTag(hICC, cmsSigAToB0Tag, (void*) Pipeline);
+-
+- // Pipeline is already on virtual profile
+- cmsPipelineFree(Pipeline);
+-
+- // 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c Tue Mar 18 12:35:25 2014 -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);
++ _cmsAssert(WhitePoint != NULL);
+
+- T = TempK;
+- T2 = T*T; // Square
+- T3 = T2*T; // Cube
++ T = TempK;
++ T2 = T*T; // Square
++ T3 = T2*T; // Cube
+
+- // For correlated color temperature (T) between 4000K and 7000K:
++ // 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 >= 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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h Tue Mar 18 12:35:25 2014 -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/management/Flag.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/management/Flag.c Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/share/native/sun/management/GcInfoBuilder.c Tue Mar 18 12:35:25 2014 -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;
++ }
++
+ 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/solaris/classes/java/lang/UNIXProcess.java.bsd Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/classes/sun/awt/X11/XClipboard.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Tue Mar 18 12:35:25 2014 -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/X11GraphicsDevice.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java Tue Mar 18 12:35:25 2014 -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/demo/jni/Poller/Poller.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/demo/jni/Poller/Poller.c Tue Mar 18 12:35:25 2014 -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/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c Tue Mar 18 12:35:25 2014 -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/lang/ProcessEnvironment_md.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c Tue Mar 18 12:35:25 2014 -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;
+--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c Tue Mar 18 12:35:25 2014 -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,81 +90,21 @@
+ * http://sources.redhat.com/bugzilla/show_bug.cgi?id=10311
+ * but the glibc maintainers closed it as WONTFIX.
+ *
++ * - 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.
++ *
+ * 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.
++ * Linux, posix_spawn() on Mac and fork() on Solaris, but the code to
++ * use clone() and fork() 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
+- *
+- * "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;
+-
+
+ static void
+ setSIGCHLDHandler(JNIEnv *env)
+@@ -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;
++ size_t pathvsize = sizeof(const char *) * (count+1);
++ size_t pathsize = strlen(path) + 1;
++ const char **pathv = (const char **) xmalloc(env, pathvsize + pathsize);
+
+- pathv = NEW(char*, count+1);
++ 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;
++ }
+ 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';
+- }
+- }
+- return (const char * const *) pathv;
++ 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,180 +333,6 @@
+ }
+ #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
+-}
+-
+-/**
+- * '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.
+- */
+-static void
+-JDK_execvpe(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(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;
+- }
+-}
+-
+-/*
+- * 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.
+- */
+-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 void
+ copyPipe(int from[2], int to[2])
+ {
+@@ -696,97 +340,67 @@
+ 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".
++/* arg is an array of pointers to 0 terminated strings. array is terminated
++ * by a null element.
++ *
++ * *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 int
+-childProcess(void *arg)
++static void arraysize(const char * const *arg, int *nelems, int *nbytes)
+ {
+- const ChildStuff* p = (const ChildStuff*) arg;
++ int i, bytes, count;
++ const char * const *a = arg;
++ char *p;
++ int *q;
++ if (arg == 0) {
++ *nelems = 0;
++ *nbytes = 0;
++ return;
++ }
++ /* 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;
++}
+
+- /* 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;
++/* copy the strings from arg[] into buf, starting at given offset
++ * return new offset to next free byte
++ */
++static int copystrings(char *buf, int offset, const char * const *arg) {
++ char *p;
++ const char * const *a;
++ int count=0;
+
+- /* 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 (arg == 0) {
++ return offset;
+ }
+-
+- 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;
++ for (p=buf+offset, a=arg; *a != 0; a++) {
++ int len = strlen(*a) +1;
++ memcpy(p, *a, len);
++ p += len;
++ count += len;
+ }
+-
+- /* 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" */
++ 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;
+ }
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/solaris/native/java/lang/childproc.c Tue Mar 18 12:35:25 2014 -0700
+@@ -0,0 +1,376 @@
++/*
++ * 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';
++}
++
++#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;
++}
++
++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" */
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/solaris/native/java/lang/childproc.h Tue Mar 18 12:35:25 2014 -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
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/solaris/native/java/lang/jspawnhelper.c Tue Mar 18 12:35:25 2014 -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/sun/awt/awt_LoadLibrary.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c Tue Mar 18 12:35:25 2014 -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/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/windows/classes/sun/awt/windows/WClipboard.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java Tue Mar 18 12:35:25 2014 -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/native/java/lang/java_props_md.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/windows/native/java/lang/java_props_md.c Tue Mar 18 12:35:25 2014 -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/sun/font/fontpath.c Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/windows/native/sun/font/fontpath.c Tue Mar 18 12:35:25 2014 -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/windows/awt_Toolkit.cpp Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/src/windows/resource/java.manifest Tue Mar 18 12:35:25 2014 -0700
+@@ -44,9 +44,15 @@
+ <!-- Indicate this JDK version is Windows 7 compatible -->
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
++ <!-- Windows Vista -->
++ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
++ <!-- Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
++ <!-- Windows 8 -->
++ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
++ <!-- Windows 8.1 -->
++ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ </application>
+- </compatibility>
++ </compatibility>
+
+ </assembly>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedString.java Tue Mar 18 12:35:25 2014 -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;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java Tue Mar 18 12:35:25 2014 -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();
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java Tue Mar 18 12:35:25 2014 -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
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/font/TextLayout/TestAATMorxFont.java Tue Mar 18 12:35:25 2014 -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 Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/test/java/beans/Introspector/TestTypeResolver.java Tue Mar 18 12:35:25 2014 -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/lang/ProcessBuilder/Basic.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/test/java/lang/ProcessBuilder/Basic.java Tue Mar 18 12:35:25 2014 -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
+ */
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/ProcessBuilder/BasicLauncher.java Tue Mar 18 12:35:25 2014 -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/util/logging/TestAppletLoggerContext.java Thu Dec 19 09:01:16 2013 -0800
++++ ./jdk/test/java/util/logging/TestAppletLoggerContext.java Tue Mar 18 12:35:25 2014 -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();
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/logging/TestLoggingWithMainAppContext.java Tue Mar 18 12:35:25 2014 -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.");
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/logging/TestMainAppContext.java Tue Mar 18 12:35:25 2014 -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);
++ }
++
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java Tue Mar 18 12:35:25 2014 -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;
++ }
++}
+Binary file test/javax/imageio/plugins/jpeg/truncated.jpg has changed
+--- ./langtools/.hgtags Thu Dec 19 09:01:27 2013 -0800
++++ ./langtools/.hgtags Tue Mar 18 12:45:26 2014 -0700
+@@ -381,6 +381,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
+@@ -395,3 +398,21 @@
+ c9d8d8793d9330d592190c334260ccf26c986df6 jdk7u51-b11
+ 5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u51-b12
+ 4d0807934c302f2e35e6a5acc6cdc720c82b5671 jdk7u51-b13
++ada23e55d76a378cb2fc2cd7ffae8c147aaf0055 jdk7u51-b30
++e3d4896d52ab4ad0fc0b7a45d60340dbdcb8826d jdk7u51-b31
++fb3ff30ecd8ea1637551461bfaf09fc8204b536c jdk7u51-b33
++4adc6c094545774b324d2e5511723ada2b32e6c4 jdk7u51-b34
++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
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Thu Dec 19 09:01:27 2013 -0800
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Tue Mar 18 12:45:26 2014 -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/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Thu Dec 19 09:01:27 2013 -0800
++++ ./langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Tue Mar 18 12:45:26 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 8016675
++ * @bug 8016675 8026736
+ * @summary Test for window title.
+ * @author Bhavesh Patel
+ * @library ../lib/
+@@ -34,26 +34,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[] ARGS = new String[]{
+- "-d", BUG_ID, "-windowtitle", WIN_TITLE, "-sourcepath", SRC_DIR, "p1", "p2"
++ 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[][] 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)\";"
++ },
+ };
+
+ /**
+@@ -62,7 +189,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();
+ }
+
diff --git a/java/openjdk7/files/patch-7u60-b30 b/java/openjdk7/files/patch-7u60-b30
new file mode 100644
index 000000000000..2431e158feba
--- /dev/null
+++ b/java/openjdk7/files/patch-7u60-b30
@@ -0,0 +1,52678 @@
+--- ./.hgtags Tue Mar 18 12:29:21 2014 -0700
++++ ./.hgtags Wed May 07 19:25:50 2014 -0700
+@@ -357,6 +357,7 @@
+ 3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
+ 1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
+ dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
++11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00
+ 6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61
+ a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62
+ 07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
+@@ -414,3 +415,26 @@
+ f4ace62029de00d2497058c3c0e1d26e019cde30 jdk7u55-b11
+ de268da51b54a4f36bcc1a9af60faea285e94330 jdk7u55-b12
+ d972a2d9e4f3f864d26c33ccfdacd8269e0f29a8 jdk7u55-b13
++0820b4707cfa75f8211b88b0daa67bba8475f498 jdk7u55-b30
++997ab3897d6ede80b0decdda94b569e57dd7dd90 jdk7u55-b14
++1f52edec29fd44c8bacce11ba7440287b37d04d1 jdk7u55-b31
++11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00
++88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01
++6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02
++87f2193da40d3a2eedca95108ae78403c7bdcd49 jdk7u60-b03
++d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u60-b04
++ea798405286d97f643ef809abcb1e13024b4f951 jdk7u60-b05
++b0940b205cab942512b5bca1338ab96a45a67832 jdk7u60-b06
++cae7bacaa13bb8c42a42fa35b156a7660874e907 jdk7u60-b07
++1af0560611469ad2a068a03774ecd0d7790db7b7 jdk7u60-b08
++662dc3b6467488b8c175a4423ba7a4991ad87d94 jdk7u60-b09
++023f8eb40d371d5cb761f7e60ba7b396b3fdf886 jdk7u60-b10
++798468b91bcbb81684aea8620dbb31eaceb24c6c jdk7u60-b11
++e40360c10b2ce5b24b1eea63160b78e112aa5d3f jdk7u60-b12
++5e540a4d55916519f5604a422bfbb7a0967d0594 jdk7u60-b13
++1ca6a368aec38ee91a41dc03899d7dc1037de44d jdk7u60-b14
++a95b821a2627295b90fb4ae8f3b8bc2ff9c64acc jdk7u60-b15
++19a3f6f48c541a8cf144eedffa0e52e108052e82 jdk7u60-b16
++472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b18
++472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b17
++2a7a5e774023944f291ee27ca5b3ad89e0e62aaf jdk7u60-b19
+--- ./make/scripts/webrev.ksh Tue Mar 18 12:29:21 2014 -0700
++++ ./make/scripts/webrev.ksh Wed May 07 19:25:50 2014 -0700
+@@ -2695,11 +2695,11 @@
+ rm -f $WDIR/$DIR/$F.html
+
+ its_a_jar=
+- if expr $F : '.*\.jar' >/dev/null; then
++ if expr $F : '.*\.jar' \| $F : '.*\.zip' >/dev/null; then
+ its_a_jar=1
+- # It's a JAR file, let's do it differntly
++ # It's a JAR or ZIP file, let's do it differently
+ if [[ -z $JAR ]]; then
+- print "No access to jar, so can't produce diffs for jar files"
++ print "No access to jar, so can't produce diffs for jar or zip files"
+ else
+ if [ -f $ofile ]; then
+ $JAR -tvf $ofile >"$ofile".lst
+--- ./corba/.hgtags Tue Mar 18 12:29:47 2014 -0700
++++ ./corba/.hgtags Wed May 07 19:25:52 2014 -0700
+@@ -417,3 +417,26 @@
+ cbd5b4b07e0c8a5f61eff396b7622e7b04d2a164 jdk7u55-b11
+ 3cce2a49d18d93dfca2634db32368486ebbb1590 jdk7u55-b12
+ 8efa6e66c13a5329c312d1a521ffab75d9a330e3 jdk7u55-b13
++e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30
++a0bfd0e80ae0ae6e3a29bf527b5911c83163b3f5 jdk7u55-b14
++55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31
++c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00
++a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01
++d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02
++d7e98ed925a3885380226f8375fe109a9a25397f jdk7u60-b03
++1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u60-b04
++753698a910167cc29c01490648a2adbcea1314cc jdk7u60-b05
++9852efe6d6b992b73fdbf59e36fb3547a9535051 jdk7u60-b06
++84a18429f247774fc7f1bc81de271da20b40845b jdk7u60-b07
++8469bc00ddca4de366b20b32d42548c882656cd8 jdk7u60-b08
++7abca119f9543489280d560dc11256d439004f0f jdk7u60-b09
++1861f1f599728c4f15a85a5980edef916552747b jdk7u60-b10
++a429ff635395688ded6c52cd21c0b4ce75e62168 jdk7u60-b11
++d581875525aaf618afe901da31d679195ee35f4b jdk7u60-b12
++2c8ba5f9487b0ac085874afd38f4c10a4127f62c jdk7u60-b13
++02bdeb33754315f589bd650dde656d2c9947976d jdk7u60-b14
++e5946b2cf82bdea3a4b85917e903168e65a543a7 jdk7u60-b15
++e424fb8452851b56db202488a4e9a283934c4887 jdk7u60-b16
++b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18
++b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17
++5d1b39fe68944cff6380db56fbe2fbaa28091bf6 jdk7u60-b19
+--- ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaInputStream.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,528 +0,0 @@
+-/*
+- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. Oracle designates this
+- * particular file as subject to the "Classpath" exception as provided
+- * by Oracle in the LICENSE file that accompanied this code.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- */
+-package com.sun.corba.se.impl.encoding;
+-
+-import java.io.IOException;
+-import java.io.Serializable;
+-import java.math.BigDecimal;
+-import java.nio.ByteBuffer;
+-
+-import org.omg.CORBA.TypeCode;
+-import org.omg.CORBA.Principal;
+-import org.omg.CORBA.Any;
+-
+-import com.sun.org.omg.SendingContext.CodeBase;
+-
+-import com.sun.corba.se.pept.protocol.MessageMediator;
+-
+-import com.sun.corba.se.spi.logging.CORBALogDomains;
+-import com.sun.corba.se.spi.orb.ORB;
+-import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
+-import com.sun.corba.se.spi.protocol.CorbaMessageMediator;
+-
+-import com.sun.corba.se.impl.logging.ORBUtilSystemException;
+-import com.sun.corba.se.impl.encoding.CodeSetConversion;
+-import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry;
+-
+-/**
+- * This is delegates to the real implementation.
+- *
+- * NOTE:
+- *
+- * Before using the stream for valuetype unmarshaling, one must call
+- * performORBVersionSpecificInit().
+- */
+-public abstract class CDRInputStream
+- extends org.omg.CORBA_2_3.portable.InputStream
+- implements com.sun.corba.se.impl.encoding.MarshalInputStream,
+- org.omg.CORBA.DataInputStream, org.omg.CORBA.portable.ValueInputStream
+-{
+- protected CorbaMessageMediator messageMediator;
+- private CDRInputStreamBase impl;
+-
+- // We can move this out somewhere later. For now, it serves its purpose
+- // to create a concrete CDR delegate based on the GIOP version.
+- private static class InputStreamFactory {
+-
+- public static CDRInputStreamBase newInputStream(ORB orb, GIOPVersion version)
+- {
+- switch(version.intValue()) {
+- case GIOPVersion.VERSION_1_0:
+- return new CDRInputStream_1_0();
+- case GIOPVersion.VERSION_1_1:
+- return new CDRInputStream_1_1();
+- case GIOPVersion.VERSION_1_2:
+- return new CDRInputStream_1_2();
+- default:
+- ORBUtilSystemException wrapper = ORBUtilSystemException.get( orb,
+- CORBALogDomains.RPC_ENCODING ) ;
+- throw wrapper.unsupportedGiopVersion( version ) ;
+- }
+- }
+- }
+-
+- // Required for the case when a ClientResponseImpl is
+- // created with a SystemException due to a dead server/closed
+- // connection with no warning. Note that the stream will
+- // not be initialized in this case.
+- //
+- // Probably also required by ServerRequestImpl.
+- //
+- // REVISIT.
+- public CDRInputStream() {
+- }
+-
+- public CDRInputStream(CDRInputStream is) {
+- impl = is.impl.dup();
+- impl.setParent(this);
+- }
+-
+- public CDRInputStream(org.omg.CORBA.ORB orb,
+- ByteBuffer byteBuffer,
+- int size,
+- boolean littleEndian,
+- GIOPVersion version,
+- BufferManagerRead bufMgr)
+- {
+- impl = InputStreamFactory.newInputStream( (ORB)orb, version);
+-
+- impl.init(orb, byteBuffer, size, littleEndian, bufMgr);
+-
+- impl.setParent(this);
+- }
+-
+- // org.omg.CORBA.portable.InputStream
+- public final boolean read_boolean() {
+- return impl.read_boolean();
+- }
+-
+- public final char read_char() {
+- return impl.read_char();
+- }
+-
+- public final char read_wchar() {
+- return impl.read_wchar();
+- }
+-
+- public final byte read_octet() {
+- return impl.read_octet();
+- }
+-
+- public final short read_short() {
+- return impl.read_short();
+- }
+-
+- public final short read_ushort() {
+- return impl.read_ushort();
+- }
+-
+- public final int read_long() {
+- return impl.read_long();
+- }
+-
+- public final int read_ulong() {
+- return impl.read_ulong();
+- }
+-
+- public final long read_longlong() {
+- return impl.read_longlong();
+- }
+-
+- public final long read_ulonglong() {
+- return impl.read_ulonglong();
+- }
+-
+- public final float read_float() {
+- return impl.read_float();
+- }
+-
+- public final double read_double() {
+- return impl.read_double();
+- }
+-
+- public final String read_string() {
+- return impl.read_string();
+- }
+-
+- public final String read_wstring() {
+- return impl.read_wstring();
+- }
+-
+- public final void read_boolean_array(boolean[] value, int offset, int length) {
+- impl.read_boolean_array(value, offset, length);
+- }
+-
+- public final void read_char_array(char[] value, int offset, int length) {
+- impl.read_char_array(value, offset, length);
+- }
+-
+- public final void read_wchar_array(char[] value, int offset, int length) {
+- impl.read_wchar_array(value, offset, length);
+- }
+-
+- public final void read_octet_array(byte[] value, int offset, int length) {
+- impl.read_octet_array(value, offset, length);
+- }
+-
+- public final void read_short_array(short[] value, int offset, int length) {
+- impl.read_short_array(value, offset, length);
+- }
+-
+- public final void read_ushort_array(short[] value, int offset, int length) {
+- impl.read_ushort_array(value, offset, length);
+- }
+-
+- public final void read_long_array(int[] value, int offset, int length) {
+- impl.read_long_array(value, offset, length);
+- }
+-
+- public final void read_ulong_array(int[] value, int offset, int length) {
+- impl.read_ulong_array(value, offset, length);
+- }
+-
+- public final void read_longlong_array(long[] value, int offset, int length) {
+- impl.read_longlong_array(value, offset, length);
+- }
+-
+- public final void read_ulonglong_array(long[] value, int offset, int length) {
+- impl.read_ulonglong_array(value, offset, length);
+- }
+-
+- public final void read_float_array(float[] value, int offset, int length) {
+- impl.read_float_array(value, offset, length);
+- }
+-
+- public final void read_double_array(double[] value, int offset, int length) {
+- impl.read_double_array(value, offset, length);
+- }
+-
+- public final org.omg.CORBA.Object read_Object() {
+- return impl.read_Object();
+- }
+-
+- public final TypeCode read_TypeCode() {
+- return impl.read_TypeCode();
+- }
+- public final Any read_any() {
+- return impl.read_any();
+- }
+-
+- public final Principal read_Principal() {
+- return impl.read_Principal();
+- }
+-
+- public final int read() throws java.io.IOException {
+- return impl.read();
+- }
+-
+- public final java.math.BigDecimal read_fixed() {
+- return impl.read_fixed();
+- }
+-
+- public final org.omg.CORBA.Context read_Context() {
+- return impl.read_Context();
+- }
+-
+- public final org.omg.CORBA.Object read_Object(java.lang.Class clz) {
+- return impl.read_Object(clz);
+- }
+-
+- public final org.omg.CORBA.ORB orb() {
+- return impl.orb();
+- }
+-
+- // org.omg.CORBA_2_3.portable.InputStream
+- public final java.io.Serializable read_value() {
+- return impl.read_value();
+- }
+-
+- public final java.io.Serializable read_value(java.lang.Class clz) {
+- return impl.read_value(clz);
+- }
+-
+- public final java.io.Serializable read_value(org.omg.CORBA.portable.BoxedValueHelper factory) {
+- return impl.read_value(factory);
+- }
+-
+- public final java.io.Serializable read_value(java.lang.String rep_id) {
+- return impl.read_value(rep_id);
+- }
+-
+- public final java.io.Serializable read_value(java.io.Serializable value) {
+- return impl.read_value(value);
+- }
+-
+- public final java.lang.Object read_abstract_interface() {
+- return impl.read_abstract_interface();
+- }
+-
+- public final java.lang.Object read_abstract_interface(java.lang.Class clz) {
+- return impl.read_abstract_interface(clz);
+- }
+- // com.sun.corba.se.impl.encoding.MarshalInputStream
+-
+- public final void consumeEndian() {
+- impl.consumeEndian();
+- }
+-
+- public final int getPosition() {
+- return impl.getPosition();
+- }
+-
+- // org.omg.CORBA.DataInputStream
+-
+- public final java.lang.Object read_Abstract () {
+- return impl.read_Abstract();
+- }
+-
+- public final java.io.Serializable read_Value () {
+- return impl.read_Value();
+- }
+-
+- public final void read_any_array (org.omg.CORBA.AnySeqHolder seq, int offset, int length) {
+- impl.read_any_array(seq, offset, length);
+- }
+-
+- public final void read_boolean_array (org.omg.CORBA.BooleanSeqHolder seq, int offset, int length) {
+- impl.read_boolean_array(seq, offset, length);
+- }
+-
+- public final void read_char_array (org.omg.CORBA.CharSeqHolder seq, int offset, int length) {
+- impl.read_char_array(seq, offset, length);
+- }
+-
+- public final void read_wchar_array (org.omg.CORBA.WCharSeqHolder seq, int offset, int length) {
+- impl.read_wchar_array(seq, offset, length);
+- }
+-
+- public final void read_octet_array (org.omg.CORBA.OctetSeqHolder seq, int offset, int length) {
+- impl.read_octet_array(seq, offset, length);
+- }
+-
+- public final void read_short_array (org.omg.CORBA.ShortSeqHolder seq, int offset, int length) {
+- impl.read_short_array(seq, offset, length);
+- }
+-
+- public final void read_ushort_array (org.omg.CORBA.UShortSeqHolder seq, int offset, int length) {
+- impl.read_ushort_array(seq, offset, length);
+- }
+-
+- public final void read_long_array (org.omg.CORBA.LongSeqHolder seq, int offset, int length) {
+- impl.read_long_array(seq, offset, length);
+- }
+-
+- public final void read_ulong_array (org.omg.CORBA.ULongSeqHolder seq, int offset, int length) {
+- impl.read_ulong_array(seq, offset, length);
+- }
+-
+- public final void read_ulonglong_array (org.omg.CORBA.ULongLongSeqHolder seq, int offset, int length) {
+- impl.read_ulonglong_array(seq, offset, length);
+- }
+-
+- public final void read_longlong_array (org.omg.CORBA.LongLongSeqHolder seq, int offset, int length) {
+- impl.read_longlong_array(seq, offset, length);
+- }
+-
+- public final void read_float_array (org.omg.CORBA.FloatSeqHolder seq, int offset, int length) {
+- impl.read_float_array(seq, offset, length);
+- }
+-
+- public final void read_double_array (org.omg.CORBA.DoubleSeqHolder seq, int offset, int length) {
+- impl.read_double_array(seq, offset, length);
+- }
+-
+- // org.omg.CORBA.portable.ValueBase
+- public final String[] _truncatable_ids() {
+- return impl._truncatable_ids();
+- }
+-
+- // java.io.InputStream
+- public final int read(byte b[]) throws IOException {
+- return impl.read(b);
+- }
+-
+- public final int read(byte b[], int off, int len) throws IOException {
+- return impl.read(b, off, len);
+- }
+-
+- public final long skip(long n) throws IOException {
+- return impl.skip(n);
+- }
+-
+- public final int available() throws IOException {
+- return impl.available();
+- }
+-
+- public final void close() throws IOException {
+- impl.close();
+- }
+-
+- public final void mark(int readlimit) {
+- impl.mark(readlimit);
+- }
+-
+- public final void reset() {
+- impl.reset();
+- }
+-
+- public final boolean markSupported() {
+- return impl.markSupported();
+- }
+-
+- public abstract CDRInputStream dup();
+-
+- // Needed by TCUtility
+- public final java.math.BigDecimal read_fixed(short digits, short scale) {
+- return impl.read_fixed(digits, scale);
+- }
+-
+- public final boolean isLittleEndian() {
+- return impl.isLittleEndian();
+- }
+-
+- protected final ByteBuffer getByteBuffer() {
+- return impl.getByteBuffer();
+- }
+-
+- protected final void setByteBuffer(ByteBuffer byteBuffer) {
+- impl.setByteBuffer(byteBuffer);
+- }
+-
+- protected final void setByteBufferWithInfo(ByteBufferWithInfo bbwi) {
+- impl.setByteBufferWithInfo(bbwi);
+- }
+-
+- public final int getBufferLength() {
+- return impl.getBufferLength();
+- }
+-
+- protected final void setBufferLength(int value) {
+- impl.setBufferLength(value);
+- }
+-
+- protected final int getIndex() {
+- return impl.getIndex();
+- }
+-
+- protected final void setIndex(int value) {
+- impl.setIndex(value);
+- }
+-
+- public final void orb(org.omg.CORBA.ORB orb) {
+- impl.orb(orb);
+- }
+-
+- public final GIOPVersion getGIOPVersion() {
+- return impl.getGIOPVersion();
+- }
+-
+- public final BufferManagerRead getBufferManager() {
+- return impl.getBufferManager();
+- }
+-
+- // This should be overridden by any stream (ex: IIOPInputStream)
+- // which wants to read values. Thus, TypeCodeInputStream doesn't
+- // have to do this.
+- public CodeBase getCodeBase() {
+- return null;
+- }
+-
+- // Use Latin-1 for GIOP 1.0 or when code set negotiation was not
+- // performed.
+- protected CodeSetConversion.BTCConverter createCharBTCConverter() {
+- return CodeSetConversion.impl().getBTCConverter(OSFCodeSetRegistry.ISO_8859_1,
+- impl.isLittleEndian());
+- }
+-
+- // Subclasses must decide what to do here. It's inconvenient to
+- // make the class and this method abstract because of dup().
+- protected abstract CodeSetConversion.BTCConverter createWCharBTCConverter();
+-
+- // Prints the current buffer in a human readable form
+- void printBuffer() {
+- impl.printBuffer();
+- }
+-
+- /**
+- * Aligns the current position on the given octet boundary
+- * if there are enough bytes available to do so. Otherwise,
+- * it just returns. This is used for some (but not all)
+- * GIOP 1.2 message headers.
+- */
+- public void alignOnBoundary(int octetBoundary) {
+- impl.alignOnBoundary(octetBoundary);
+- }
+-
+- // Needed by request and reply messages for GIOP versions >= 1.2 only.
+- public void setHeaderPadding(boolean headerPadding) {
+- impl.setHeaderPadding(headerPadding);
+- }
+-
+- /**
+- * This must be called after determining the proper ORB version,
+- * and setting it on the stream's ORB instance. It can be called
+- * after reading the service contexts, since that is the only place
+- * we can get the ORB version info.
+- *
+- * Trying to unmarshal things requiring repository IDs before calling
+- * this will result in NullPtrExceptions.
+- */
+- public void performORBVersionSpecificInit() {
+- // In the case of SystemExceptions, a stream is created
+- // with its default constructor (and thus no impl is set).
+- if (impl != null)
+- impl.performORBVersionSpecificInit();
+- }
+-
+- /**
+- * Resets any internal references to code set converters.
+- * This is useful for forcing the CDR stream to reacquire
+- * converters (probably from its subclasses) when state
+- * has changed.
+- */
+- public void resetCodeSetConverters() {
+- impl.resetCodeSetConverters();
+- }
+-
+- public void setMessageMediator(MessageMediator messageMediator)
+- {
+- this.messageMediator = (CorbaMessageMediator) messageMediator;
+- }
+-
+- public MessageMediator getMessageMediator()
+- {
+- return messageMediator;
+- }
+-
+- // ValueInputStream -----------------------------
+-
+- public void start_value() {
+- impl.start_value();
+- }
+-
+- public void end_value() {
+- impl.end_value();
+- }
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaOutputStream.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,435 +0,0 @@
+-/*
+- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. Oracle designates this
+- * particular file as subject to the "Classpath" exception as provided
+- * by Oracle in the LICENSE file that accompanied this code.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- */
+-package com.sun.corba.se.impl.encoding;
+-
+-import java.io.IOException;
+-import java.io.Serializable;
+-import java.math.BigDecimal;
+-import java.nio.ByteBuffer;
+-
+-import org.omg.CORBA.TypeCode;
+-import org.omg.CORBA.Principal;
+-import org.omg.CORBA.Any;
+-
+-import com.sun.corba.se.pept.protocol.MessageMediator;
+-
+-import com.sun.corba.se.spi.orb.ORB;
+-import com.sun.corba.se.spi.logging.CORBALogDomains;
+-import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
+-import com.sun.corba.se.spi.protocol.CorbaMessageMediator;
+-
+-import com.sun.corba.se.impl.encoding.CodeSetConversion;
+-import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry;
+-import com.sun.corba.se.impl.orbutil.ORBConstants;
+-import com.sun.corba.se.impl.logging.ORBUtilSystemException;
+-
+-/**
+- * This is delegates to the real implementation.
+- */
+-public abstract class CDROutputStream
+- extends org.omg.CORBA_2_3.portable.OutputStream
+- implements com.sun.corba.se.impl.encoding.MarshalOutputStream,
+- org.omg.CORBA.DataOutputStream, org.omg.CORBA.portable.ValueOutputStream
+-{
+-/*
+- private CDROutputStreamBase impl;
+- protected ORB orb ;
+- protected ORBUtilSystemException wrapper ;
+- protected CorbaMessageMediator corbaMessageMediator;
+-
+-
+- // We can move this out somewhere later. For now, it serves its purpose
+- // to create a concrete CDR delegate based on the GIOP version.
+- private static class OutputStreamFactory {
+-
+- public static CDROutputStreamBase newOutputStream(ORB orb, GIOPVersion version)
+- {
+- switch(version.intValue()) {
+- case GIOPVersion.VERSION_1_0:
+- return new CDROutputStream_1_0();
+- case GIOPVersion.VERSION_1_1:
+- return new CDROutputStream_1_1();
+- case GIOPVersion.VERSION_1_2:
+- return new CDROutputStream_1_2();
+- default:
+- ORBUtilSystemException wrapper = ORBUtilSystemException.get( orb,
+- CORBALogDomains.RPC_ENCODING ) ;
+- // REVISIT - what is appropriate? INTERNAL exceptions
+- // are really hard to track later.
+- throw wrapper.unsupportedGiopVersion( version ) ;
+- }
+- }
+- }
+-
+- // REVISIT - These two constructors should be re-factored to better hide
+- // the fact that someone extending this class 'can' construct a CDROutputStream
+- // that does not use pooled ByteBuffers. Right now, only EncapsOutputStream
+- // does _not_ use pooled ByteBuffers, see EncapsOutputStream.
+-
+- // NOTE: When a stream is constructed for non-channel-backed sockets
+- // it notifies the constructor not to use pooled (i.e, direct)
+- // ByteBuffers.
+-
+- public CDROutputStream(ORB orb,
+- GIOPVersion version,
+- boolean littleEndian,
+- BufferManagerWrite bufferManager,
+- byte streamFormatVersion,
+- boolean usePooledByteBuffers)
+- {
+- impl = OutputStreamFactory.newOutputStream(orb, version);
+- impl.init(orb, littleEndian, bufferManager, streamFormatVersion, usePooledByteBuffers);
+-
+- impl.setParent(this);
+- this.orb = orb ;
+- this.wrapper = ORBUtilSystemException.get( orb,
+- CORBALogDomains.RPC_ENCODING ) ;
+- }
+-
+- public CDROutputStream(ORB orb,
+- GIOPVersion version,
+- boolean littleEndian,
+- BufferManagerWrite bufferManager,
+- byte streamFormatVersion)
+- {
+- this(orb, version, littleEndian, bufferManager, streamFormatVersion, true);
+- }
+-*/
+-
+- private ByteArrayOutputStream bos ;
+- private ObjectOutputStream oos ;
+-
+- public JavaOutputStream()
+- {
+- bos = new ByteArrayOutputStream() ;
+- oos = new ObjectOutputStream( bos ) ;
+- }
+-
+- // Provided by IIOPOutputStream and EncapsOutputStream
+- public org.omg.CORBA.portable.InputStream create_input_stream()
+- {
+- ObjectInputStream ois = new ByteArrayInputStream( bos.toByteArray() ) ;
+-
+- return new JavaInputStream( ois ) ;
+- }
+-
+- public final void write_boolean(boolean value) {
+- impl.write_boolean(value);
+- }
+- public final void write_char(char value) {
+- impl.write_char(value);
+- }
+- public final void write_wchar(char value) {
+- impl.write_wchar(value);
+- }
+- public final void write_octet(byte value) {
+- impl.write_octet(value);
+- }
+- public final void write_short(short value) {
+- impl.write_short(value);
+- }
+- public final void write_ushort(short value) {
+- impl.write_ushort(value);
+- }
+- public final void write_long(int value) {
+- impl.write_long(value);
+- }
+- public final void write_ulong(int value) {
+- impl.write_ulong(value);
+- }
+- public final void write_longlong(long value) {
+- impl.write_longlong(value);
+- }
+- public final void write_ulonglong(long value) {
+- impl.write_ulonglong(value);
+- }
+- public final void write_float(float value) {
+- impl.write_float(value);
+- }
+- public final void write_double(double value) {
+- impl.write_double(value);
+- }
+- public final void write_string(String value) {
+- impl.write_string(value);
+- }
+- public final void write_wstring(String value) {
+- impl.write_wstring(value);
+- }
+-
+- public final void write_boolean_array(boolean[] value, int offset, int length) {
+- impl.write_boolean_array(value, offset, length);
+- }
+- public final void write_char_array(char[] value, int offset, int length) {
+- impl.write_char_array(value, offset, length);
+- }
+- public final void write_wchar_array(char[] value, int offset, int length) {
+- impl.write_wchar_array(value, offset, length);
+- }
+- public final void write_octet_array(byte[] value, int offset, int length) {
+- impl.write_octet_array(value, offset, length);
+- }
+- public final void write_short_array(short[] value, int offset, int length) {
+- impl.write_short_array(value, offset, length);
+- }
+- public final void write_ushort_array(short[] value, int offset, int length){
+- impl.write_ushort_array(value, offset, length);
+- }
+- public final void write_long_array(int[] value, int offset, int length) {
+- impl.write_long_array(value, offset, length);
+- }
+- public final void write_ulong_array(int[] value, int offset, int length) {
+- impl.write_ulong_array(value, offset, length);
+- }
+- public final void write_longlong_array(long[] value, int offset, int length) {
+- impl.write_longlong_array(value, offset, length);
+- }
+- public final void write_ulonglong_array(long[] value, int offset,int length) {
+- impl.write_ulonglong_array(value, offset, length);
+- }
+- public final void write_float_array(float[] value, int offset, int length) {
+- impl.write_float_array(value, offset, length);
+- }
+- public final void write_double_array(double[] value, int offset, int length) {
+- impl.write_double_array(value, offset, length);
+- }
+- public final void write_Object(org.omg.CORBA.Object value) {
+- impl.write_Object(value);
+- }
+- public final void write_TypeCode(TypeCode value) {
+- impl.write_TypeCode(value);
+- }
+- public final void write_any(Any value) {
+- impl.write_any(value);
+- }
+-
+- public final void write_Principal(Principal value) {
+- impl.write_Principal(value);
+- }
+-
+- public final void write(int b) throws java.io.IOException {
+- impl.write(b);
+- }
+-
+- public final void write_fixed(java.math.BigDecimal value) {
+- impl.write_fixed(value);
+- }
+-
+- public final void write_Context(org.omg.CORBA.Context ctx,
+- org.omg.CORBA.ContextList contexts) {
+- impl.write_Context(ctx, contexts);
+- }
+-
+- public final org.omg.CORBA.ORB orb() {
+- return impl.orb();
+- }
+-
+- // org.omg.CORBA_2_3.portable.OutputStream
+- public final void write_value(java.io.Serializable value) {
+- impl.write_value(value);
+- }
+-
+- public final void write_value(java.io.Serializable value, java.lang.Class clz) {
+- impl.write_value(value, clz);
+- }
+-
+- public final void write_value(java.io.Serializable value, String repository_id) {
+- impl.write_value(value, repository_id);
+- }
+-
+- public final void write_value(java.io.Serializable value,
+- org.omg.CORBA.portable.BoxedValueHelper factory) {
+- impl.write_value(value, factory);
+- }
+-
+- public final void write_abstract_interface(java.lang.Object obj) {
+- impl.write_abstract_interface(obj);
+- }
+-
+- // java.io.OutputStream
+- public final void write(byte b[]) throws IOException {
+- impl.write(b);
+- }
+-
+- public final void write(byte b[], int off, int len) throws IOException {
+- impl.write(b, off, len);
+- }
+-
+- public final void flush() throws IOException {
+- impl.flush();
+- }
+-
+- public final void close() throws IOException {
+- impl.close();
+- }
+-
+- // com.sun.corba.se.impl.encoding.MarshalOutputStream
+- public final void start_block() {
+- impl.start_block();
+- }
+-
+- public final void end_block() {
+- impl.end_block();
+- }
+-
+- public final void putEndian() {
+- impl.putEndian();
+- }
+-
+- public void writeTo(java.io.OutputStream s)
+- throws IOException
+- {
+- impl.writeTo(s);
+- }
+-
+- public final byte[] toByteArray() {
+- return impl.toByteArray();
+- }
+-
+- // org.omg.CORBA.DataOutputStream
+- public final void write_Abstract (java.lang.Object value) {
+- impl.write_Abstract(value);
+- }
+-
+- public final void write_Value (java.io.Serializable value) {
+- impl.write_Value(value);
+- }
+-
+- public final void write_any_array(org.omg.CORBA.Any[] seq, int offset, int length) {
+- impl.write_any_array(seq, offset, length);
+- }
+-
+- public void setMessageMediator(MessageMediator messageMediator)
+- {
+- this.corbaMessageMediator = (CorbaMessageMediator) messageMediator;
+- }
+-
+- public MessageMediator getMessageMediator()
+- {
+- return corbaMessageMediator;
+- }
+-
+- // org.omg.CORBA.portable.ValueBase
+- public final String[] _truncatable_ids() {
+- return impl._truncatable_ids();
+- }
+-
+- // Other
+- protected final int getSize() {
+- return impl.getSize();
+- }
+-
+- protected final int getIndex() {
+- return impl.getIndex();
+- }
+-
+- protected int getRealIndex(int index) {
+- // Used in indirections. Overridden by TypeCodeOutputStream.
+- return index;
+- }
+-
+- protected final void setIndex(int value) {
+- impl.setIndex(value);
+- }
+-
+- protected final ByteBuffer getByteBuffer() {
+- return impl.getByteBuffer();
+- }
+-
+- protected final void setByteBuffer(ByteBuffer byteBuffer) {
+- impl.setByteBuffer(byteBuffer);
+- }
+-
+- public final boolean isLittleEndian() {
+- return impl.isLittleEndian();
+- }
+-
+- // XREVISIT - return to final if possible
+- // REVISIT - was protected - need access from msgtypes test.
+- public ByteBufferWithInfo getByteBufferWithInfo() {
+- return impl.getByteBufferWithInfo();
+- }
+-
+- protected void setByteBufferWithInfo(ByteBufferWithInfo bbwi) {
+- impl.setByteBufferWithInfo(bbwi);
+- }
+-
+- // REVISIT: was protected - but need to access from xgiop.
+- public final BufferManagerWrite getBufferManager() {
+- return impl.getBufferManager();
+- }
+-
+- public final void write_fixed(java.math.BigDecimal bigDecimal, short digits, short scale) {
+- impl.write_fixed(bigDecimal, digits, scale);
+- }
+-
+- public final void writeOctetSequenceTo(org.omg.CORBA.portable.OutputStream s) {
+- impl.writeOctetSequenceTo(s);
+- }
+-
+- public final GIOPVersion getGIOPVersion() {
+- return impl.getGIOPVersion();
+- }
+-
+- public final void writeIndirection(int tag, int posIndirectedTo) {
+- impl.writeIndirection(tag, posIndirectedTo);
+- }
+-
+- // Use Latin-1 for GIOP 1.0 or when code set negotiation was not
+- // performed.
+- protected CodeSetConversion.CTBConverter createCharCTBConverter() {
+- return CodeSetConversion.impl().getCTBConverter(OSFCodeSetRegistry.ISO_8859_1);
+- }
+-
+- // Subclasses must decide what to do here. It's inconvenient to
+- // make the class and this method abstract because of dup().
+- protected abstract CodeSetConversion.CTBConverter createWCharCTBConverter();
+-
+- protected final void freeInternalCaches() {
+- impl.freeInternalCaches();
+- }
+-
+- void printBuffer() {
+- impl.printBuffer();
+- }
+-
+- public void alignOnBoundary(int octetBoundary) {
+- impl.alignOnBoundary(octetBoundary);
+- }
+-
+- // Needed by request and reply messages for GIOP versions >= 1.2 only.
+- public void setHeaderPadding(boolean headerPadding) {
+- impl.setHeaderPadding(headerPadding);
+- }
+-
+- // ValueOutputStream -----------------------------
+-
+- public void start_value(String rep_id) {
+- impl.start_value(rep_id);
+- }
+-
+- public void end_value() {
+- impl.end_value();
+- }
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/ThreadCurrentStack.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,164 +0,0 @@
+-/*
+- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+- * 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.corba.se.impl.interceptors;
+-
+-import com.sun.corba.se.impl.corba.AnyImpl;
+-import org.omg.PortableInterceptor.Current;
+-import org.omg.PortableInterceptor.InvalidSlot;
+-
+-import com.sun.corba.se.impl.util.MinorCodes;
+-import com.sun.corba.se.impl.core.ORB;
+-
+-/**
+- * ThreadCurrentStack is the container of PICurrent instances for each thread
+- */
+-public class ThreadCurrentStack
+-{
+- // PICurrentPool is the container for reusable PICurrents
+- private class PICurrentPool {
+-
+- // Contains a list of reusable PICurrents
+- private java.util.ArrayList pool;
+-
+- // High water mark for the pool
+- // If the pool size reaches this limit then putPICurrent will
+- // not put PICurrent to the pool.
+- private static final int HIGH_WATER_MARK = 5;
+-
+- // currentIndex points to the last PICurrent in the list
+- private int currentIndex;
+-
+- PICurrentPool( ) {
+- pool = new java.util.ArrayList( HIGH_WATER_MARK );
+- currentIndex = 0;
+- }
+-
+- /**
+- * Puts PICurrent to the re-usable pool.
+- */
+- void putPICurrent( PICurrent current ) {
+- // If there are enough PICurrents in the pool, then don't add
+- // this current to the pool.
+- if( currentIndex >= HIGH_WATER_MARK ) {
+- return;
+- }
+- pool.add(currentIndex , current);
+- currentIndex++;
+- }
+-
+- /**
+- * Gets PICurrent from the re-usable pool.
+- */
+- PICurrent getPICurrent( ) {
+- // If there are no entries in the pool then return null
+- if( currentIndex == 0 ) {
+- return null;
+- }
+- // Works like a stack, Gets the last one added first
+- currentIndex--;
+- return (PICurrent) pool.get(currentIndex);
+- }
+- }
+-
+- // Contains all the active PICurrents for each thread.
+- // The ArrayList is made to behave like a stack.
+- private java.util.ArrayList currentContainer;
+-
+- // Keeps track of number of PICurrents in the stack.
+- private int currentIndex;
+-
+- // For Every Thread there will be a pool of re-usable ThreadCurrent's
+- // stored in PICurrentPool
+- private PICurrentPool currentPool;
+-
+- // The orb associated with this ThreadCurrentStack
+- private ORB piOrb;
+-
+- /**
+- * Constructs the stack and and PICurrentPool
+- */
+- ThreadCurrentStack( ORB piOrb, PICurrent current ) {
+- this.piOrb = piOrb;
+- currentIndex = 0;
+- currentContainer = new java.util.ArrayList( );
+- currentPool = new PICurrentPool( );
+- currentContainer.add( currentIndex, current );
+- currentIndex++;
+- }
+-
+-
+- /**
+- * pushPICurrent goes through the following steps
+- * 1: Checks to see if there is any PICurrent in PICurrentPool
+- * If present then use that instance to push into the ThreadCurrentStack
+- *
+- * 2:If there is no PICurrent in the pool, then creates a new one and pushes
+- * that into the ThreadCurrentStack
+- */
+- void pushPICurrent( ) {
+- PICurrent current = currentPool.getPICurrent( );
+- if( current == null ) {
+- // get an existing PICurrent to get the slotSize
+- PICurrent currentTemp = peekPICurrent();
+- current = new PICurrent( piOrb, currentTemp.getSlotSize( ));
+- }
+- currentContainer.add( currentIndex, current );
+- currentIndex++;
+- }
+-
+- /**
+- * popPICurrent does the following
+- * 1: pops the top PICurrent in the ThreadCurrentStack
+- *
+- * 2: resets the slots in the PICurrent which resets the slotvalues to
+- * null if there are any previous sets.
+- *
+- * 3: pushes the reset PICurrent into the PICurrentPool to reuse
+- */
+- void popPICurrent( ) {
+- // Do not pop the PICurrent, If there is only one.
+- // This should not happen, But an extra check for safety.
+- if( currentIndex <= 1 ) {
+- throw new org.omg.CORBA.INTERNAL(
+- "Cannot pop the only PICurrent in the stack",
+- MinorCodes.CANT_POP_ONLY_CURRENT_2,
+- CompletionStatus.COMPLETED_NO );
+- }
+- currentIndex--;
+- PICurrent current = (PICurrent)currentContainer.get( currentIndex );
+- current.resetSlots( );
+- currentPool.putPICurrent( current );
+- }
+-
+- /**
+- * peekPICurrent gets the top PICurrent in the ThreadCurrentStack without
+- * popping.
+- */
+- PICurrent peekPICurrent( ) {
+- return (PICurrent) currentContainer.get( currentIndex - 1);
+- }
+-
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/DefineWrapper.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,120 +0,0 @@
+-package com.sun.corba.se.impl.orbutil ;
+-
+-import java.lang.reflect.Method;
+-import java.lang.reflect.Modifier;
+-
+-/** This class provides just a main method. Its purpose is to allow -D arguments to
+-* set up the system properties when starting programs with tools like OptimizeIt that
+-* make this difficult or impossible.
+-*
+-* Invocation: {java launcher of some kind} DefineClass -Dxxx=yyy -Dxxx=yyy ... {class name} arg0, arg1, ...
+-* Result: updates system properties with -D args, then uses reflection to invoke {class name}.main with the args
+-*/
+-
+-class DefineWrapper {
+- public static void main( String[] args )
+- {
+- int numberDefines = args.length ;
+- String className = null ;
+-
+- for (int ctr=0; ctr<args.length; ctr++ ) {
+- String arg = args[ctr] ;
+-
+- if ((arg.charAt(0) == '-') && (arg.charAt(1) == 'D')) {
+- int eqIndex = arg.indexOf( '=' ) ;
+- if (eqIndex < 0)
+- throw new Exception( arg + " is not a valid property assignment" ) ;
+-
+- final String key = arg.subString( 2, eqIndex ) ;
+- final String value = arg.subStrung( eqIndex + 1 ) ;
+-
+- AccessController.doPrivileged( new PrivilegedAction() {
+- public Object run() {
+- System.setProperty( key, value ) ;
+- return null ;
+- }
+- } ) ;
+- } else {
+- numberDefines = ctr ;
+- className = arg ;
+- break ;
+- }
+- }
+-
+- if (numberDefines < args.length) {
+- Class cls = getMainClass( className ) ;
+- Method mainMethod = getMainMethod( cls ) ;
+-
+- String[] newArgs = new String[ args.length - numberDefines ] ;
+- for (int ctr = numberDefines+1; ctr<args.length; ctr++ ) {
+- newArgs[ ctr-numberDefines-1 ] = args[ ctr ] ;
+- }
+-
+- // build args to the main and call it
+- Object params [] = new Object [1];
+- params[0] = newArgs;
+- mainMethod.invoke(null, params);
+- } else {
+- throw new Exception( "No class name given" ) ;
+- }
+- }
+-
+- private static Class getMainClass( String name )
+- {
+- // determine the class loader to be used for loading the class
+- // since ServerMain is going to be in JDK and we need to have this
+- // class to load application classes, this is required here.
+- ClassLoader cl = Thread.currentThread().getContextClassLoader();
+-
+- if (cl == null)
+- cl = ClassLoader.getSystemClassLoader();
+-
+- try {
+- // determine the main class, try loading with current class loader
+- cls = Class.forName( className ) ;
+- } catch (ClassNotFoundException ex) {
+- // eat the exception and try to load using SystemClassLoader
+- cls = Class.forName( className, true, cl);
+- }
+- }
+-
+- private static Method getMainMethod( Class serverClass )
+- {
+- Class argTypes[] = new Class[] { String[].class } ;
+- Method method = null ;
+-
+- try {
+- method = serverClass.getDeclaredMethod( "main", argTypes ) ;
+- } catch (Exception exc) {
+- throw new Exception( "Could not get main() method: " + exc ) ;
+- }
+-
+- if (!isPublicStaticVoid( method ))
+- throw new Exception( "Main method is not public static void" ) ;
+-
+- return method ;
+- }
+-
+- private static boolean isPublicStaticVoid( Method method )
+- {
+- // check modifiers: public static
+- int modifiers = method.getModifiers ();
+- if (!Modifier.isPublic (modifiers) || !Modifier.isStatic (modifiers)) {
+- logError( method.getName() + " is not public static" ) ;
+- return false ;
+- }
+-
+- // check return type and exceptions
+- if (method.getExceptionTypes ().length != 0) {
+- logError( method.getName() + " declares exceptions" ) ;
+- return false ;
+- }
+-
+- if (!method.getReturnType().equals (Void.TYPE)) {
+- logError( method.getName() + " does not have a void return type" ) ;
+- return false ;
+- }
+-
+- return true ;
+- }
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties Tue Mar 18 12:29:47 2014 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties Wed May 07 19:25:52 2014 -0700
+@@ -23,7 +23,7 @@
+ # questions.
+ #
+
+-orbd.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -port porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, default 1049 (opcional)\n -defaultdb diret\u00F3rio dos arquivos ORBD, default "./orb.db" (opcional)\n -serverid id do servidor para ORBD, default 1 (opcional)\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
++orbd.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -port porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, padr\u00E3o 1049 (opcional)\n -defaultdb diret\u00F3rio dos arquivos ORBD, padr\u00E3o "./orb.db" (opcional)\n -serverid id do servidor para ORBD, padr\u00E3o 1 (opcional)\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
+
+ servertool.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
+ servertool.banner=\n\nBem-vindo \u00E0 Ferramenta de Servidor IDL Java \ninsira os comandos no prompt \n
+--- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl_save.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,909 +0,0 @@
+-/*
+- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. Oracle designates this
+- * particular file as subject to the "Classpath" exception as provided
+- * by Oracle in the LICENSE file that accompanied this code.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- */
+-
+-package com.sun.corba.se.impl.presentation.rmi ;
+-
+-import java.lang.reflect.Method;
+-
+-import java.math.BigInteger;
+-
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.HashMap;
+-import java.util.StringTokenizer;
+-
+-import com.sun.corba.se.spi.presentation.rmi.IDLNameTranslator ;
+-
+-import com.sun.corba.se.impl.presentation.rmi.IDLType ;
+-import com.sun.corba.se.impl.presentation.rmi.IDLTypeException ;
+-import com.sun.corba.se.impl.presentation.rmi.IDLTypesUtil ;
+-import com.sun.corba.se.impl.orbutil.ObjectUtility ;
+-
+-/**
+- * Bidirectional translator between RMI-IIOP interface methods and
+- * and IDL Names.
+- */
+-public class IDLNameTranslatorImpl implements IDLNameTranslator {
+-
+- // From CORBA Spec, Table 6 Keywords.
+- // Note that since all IDL identifiers are case
+- // insensitive, java identifier comparisons to these
+- // will be case insensitive also.
+- private static String[] IDL_KEYWORDS = {
+-
+- "abstract", "any", "attribute", "boolean", "case", "char",
+- "const", "context", "custom", "default", "double", "enum",
+- "exception", "factory", "FALSE", "fixed", "float", "in", "inout",
+- "interface", "long", "module", "native", "Object", "octet",
+- "oneway", "out", "private", "public", "raises", "readonly", "sequence",
+- "short", "string", "struct", "supports", "switch", "TRUE", "truncatable",
+- "typedef", "unsigned", "union", "ValueBase", "valuetype", "void",
+- "wchar", "wstring"
+-
+- };
+-
+- private static char[] HEX_DIGITS = {
+- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+- 'A', 'B', 'C', 'D', 'E', 'F'
+- };
+-
+- private static final String UNDERSCORE = "_";
+-
+- // used to mangle java inner class names
+- private static final String INNER_CLASS_SEPARATOR =
+- UNDERSCORE + UNDERSCORE;
+-
+- // used to form IDL array type names
+- private static final String[] BASE_IDL_ARRAY_MODULE_TYPE=
+- new String[] { "org", "omg", "boxedRMI" } ;
+-
+- private static final String BASE_IDL_ARRAY_ELEMENT_TYPE = "seq";
+-
+- // used to mangling java identifiers that have a leading underscore
+- private static final String LEADING_UNDERSCORE_CHAR = "J";
+- private static final String ID_CONTAINER_CLASH_CHAR = UNDERSCORE;
+-
+- // separator used between types in a mangled overloaded method name
+- private static final String OVERLOADED_TYPE_SEPARATOR =
+- UNDERSCORE + UNDERSCORE;
+-
+- // string appended to attribute if it clashes with a method name
+- private static final String ATTRIBUTE_METHOD_CLASH_MANGLE_CHARS =
+- UNDERSCORE + UNDERSCORE;
+-
+- private static Set idlKeywords_;
+-
+- static {
+-
+- idlKeywords_ = new HashSet();
+- for(int i = 0; i < IDL_KEYWORDS.length; i++) {
+- String next = (String) IDL_KEYWORDS[i];
+- // Convert keyword to all caps to ease equality
+- // check.
+- String keywordAllCaps = next.toUpperCase();
+- idlKeywords_.add(keywordAllCaps);
+- }
+-
+- }
+-
+- //
+- // Instance state
+- //
+-
+- // Remote interface for name translation.
+- private Class[] interf_;
+-
+- // Maps used to hold name translations. These do not need to be
+- // synchronized since the translation is never modified after
+- // initialization.
+- private Map methodToIDLNameMap_;
+- private Map IDLNameToMethodMap_;
+- private Method[] methods_;
+-
+- /**
+- * Return an IDLNameTranslator for the given interface.
+- *
+- * @throws IllegalStateException if given class is not a valid
+- * RMI/IIOP Remote Interface
+- */
+- public static IDLNameTranslator get( Class interf )
+- {
+-
+- return new IDLNameTranslatorImpl(new Class[] { interf } );
+-
+- }
+-
+- /**
+- * Return an IDLNameTranslator for the given interfacex.
+- *
+- * @throws IllegalStateException if given classes are not valid
+- * RMI/IIOP Remote Interfaces
+- */
+- public static IDLNameTranslator get( Class[] interfaces )
+- {
+-
+- return new IDLNameTranslatorImpl(interfaces );
+-
+- }
+-
+- public static String getExceptionId( Class cls )
+- {
+- // Requirements for this method:
+- // 1. cls must be an exception but not a RemoteException.
+- // 2. If cls has an IDL keyword name, an underscore is prepended (1.3.2.2).
+- // 3. If cls jas a leading underscore, J is prepended (1.3.2.3).
+- // 4. If cls has an illegal IDL ident char, it is mapped to UXXXX where
+- // XXXX is the unicode value in hex of the char (1.3.2.4).
+- // 5. double underscore for inner class (1.3.2.5).
+- // 6. The ID is "IDL:" + name with / separators + ":1.0".
+- IDLType itype = classToIDLType( cls ) ;
+- return itype.getExceptionName() ;
+- }
+-
+- public Class[] getInterfaces()
+- {
+- return interf_;
+- }
+-
+- public Method[] getMethods()
+- {
+- return methods_ ;
+- }
+-
+- public Method getMethod( String idlName )
+- {
+- return (Method) IDLNameToMethodMap_.get(idlName);
+- }
+-
+- public String getIDLName( Method method )
+- {
+- return (String) methodToIDLNameMap_.get(method);
+- }
+-
+- /**
+- * Initialize an IDLNameTranslator for the given interface.
+- *
+- * @throws IllegalStateException if given class is not a valid
+- * RMI/IIOP Remote Interface
+- */
+- private IDLNameTranslatorImpl(Class[] interfaces)
+- {
+-
+- try {
+- IDLTypesUtil idlTypesUtil = new IDLTypesUtil();
+- for (int ctr=0; ctr<interfaces.length; ctr++)
+- idlTypesUtil.validateRemoteInterface(interfaces[ctr]);
+- interf_ = interfaces;
+- buildNameTranslation();
+- } catch( IDLTypeException ite) {
+- String msg = ite.getMessage();
+- IllegalStateException ise = new IllegalStateException(msg);
+- ise.initCause(ite);
+- throw ise;
+- }
+- }
+-
+- private void buildNameTranslation()
+- {
+- // holds method info, keyed by method
+- Map allMethodInfo = new HashMap() ;
+-
+- for (int ctr=0; ctr<interf_.length; ctr++) {
+- Class interf = interf_[ctr] ;
+-
+- IDLTypesUtil idlTypesUtil = new IDLTypesUtil();
+- Method[] methods = interf.getMethods();
+-
+- // Take an initial pass through all the methods and create some
+- // information that will be used to track the IDL name
+- // transformation.
+- for(int i = 0; i < methods.length; i++) {
+-
+- Method nextMethod = methods[i];
+-
+- IDLMethodInfo methodInfo = new IDLMethodInfo();
+-
+- methodInfo.method = nextMethod;
+-
+- methodInfo.propertyType =
+- idlTypesUtil.propertyAccessorMethodType(
+- nextMethod, interf ) ;
+-
+- if (methodInfo.propertyType != null) {
+- String attributeName = idlTypesUtil.
+- getAttributeNameForProperty(nextMethod.getName());
+- methodInfo.originalName = attributeName;
+- methodInfo.mangledName = attributeName;
+- } else {
+- methodInfo.originalName = nextMethod.getName();
+- methodInfo.mangledName = nextMethod.getName();
+- }
+-
+- allMethodInfo.put(nextMethod, methodInfo);
+- }
+- }
+-
+- // Check for having both is<NAME> and get<NAME> methods.
+-
+-
+- //
+- // Perform case sensitivity test first. This applies to all
+- // method names AND attributes. Compare each method name and
+- // attribute to all other method names and attributes. If names
+- // differ only in case, apply mangling as defined in section 1.3.2.7
+- // of Java2IDL spec. Note that we compare using the original names.
+- //
+- for(Iterator outerIter=allMethodInfo.values().iterator();
+- outerIter.hasNext();) {
+- IDLMethodInfo outer = (IDLMethodInfo) outerIter.next();
+- for(Iterator innerIter = allMethodInfo.values().iterator();
+- innerIter.hasNext();) {
+- IDLMethodInfo inner = (IDLMethodInfo) innerIter.next();
+-
+- if( (outer != inner) &&
+- (!outer.originalName.equals(inner.originalName)) &&
+- outer.originalName.equalsIgnoreCase(inner.originalName) ) {
+- outer.mangledName =
+- mangleCaseSensitiveCollision(outer.originalName);
+- break;
+- }
+-
+- }
+- }
+-
+- for(Iterator iter = allMethodInfo.values().iterator();
+- iter.hasNext();) {
+- IDLMethodInfo next = (IDLMethodcurrentInfo) iter.next();
+- next.mangledName =
+- mangleIdentifier(next.mangledName,
+- next.propertyType != null);
+- }
+-
+- //
+- // Now check for overloaded method names and apply 1.3.2.6.
+- //
+- for(Iterator outerIter=allMethodInfo.values().iterator();
+- outerIter.hasNext();) {
+- IDLMethodInfo outer = (IDLMethodInfo) outerIter.next();
+- if (outer.propertyType != null) {
+- continue;
+- }
+- for(Iterator innerIter = allMethodInfo.values().iterator();
+- innerIter.hasNext();) {
+- IDLMethodInfo inner = (IDLMethodInfo) innerIter.next();
+-
+- if( (outer != inner) &&
+- (inner.propertyType == null) &&
+- outer.originalName.equals(inner.originalName) ) {
+- outer.mangledName = mangleOverloadedMethod
+- (outer.mangledName, outer.method);
+- break;
+- }
+- }
+- }
+-
+- //
+- // Now mangle any properties that clash with method names.
+- //
+- for(Iterator outerIter=allMethodInfo.values().iterator();
+- outerIter.hasNext();) {
+- IDLMethodInfo outer = (IDLMethodInfo) outerIter.next();
+- if(outer.propertyType == null) {
+- continue;
+- }
+- for(Iterator innerIter = allMethodInfo.values().iterator();
+- innerIter.hasNext();) {
+- IDLMethodInfo inner = (IDLMethodInfo) innerIter.next();
+- if( (outer != inner) &&
+- (inner.propertyType == null) &&
+- outer.mangledName.equals(inner.mangledName) ) {
+- outer.mangledName = outer.mangledName +
+- ATTRIBUTE_METHOD_CLASH_MANGLE_CHARS;
+- break;
+- }
+- }
+- }
+-
+- //
+- // Ensure that no mapped method names clash with mapped name
+- // of container(1.3.2.9). This is a case insensitive comparison.
+- //
+- for (int ctr=0; ctr<interf_.length; ctr++ ) {
+- Class interf = interf_[ctr] ;
+- String mappedContainerName = getMappedContainerName(interf);
+- for(Iterator iter = allMethodInfo.values().iterator();
+- iter.hasNext();) {
+- IDLMethodInfo next = (IDLMethodInfo) iter.next();
+- if( (next.propertyType == null) &&
+- identifierClashesWithContainer(mappedContainerName,
+- next.mangledName)) {
+- next.mangledName = mangleContainerClash(next.mangledName);
+- }
+- }
+- }
+-
+- //
+- // Populate name translation maps.
+- //
+- methodToIDLNameMap_ = new HashMap();
+- IDLNameToMethodMap_ = new HashMap();
+- methods_ = (Method[])allMethodInfo.keySet().toArray(
+- new Method[0] ) ;
+-
+- for(Iterator iter = allMethodInfo.values().iterator();
+- iter.hasNext();) {
+- IDLMethodInfo next = (IDLMethodInfo) iter.next();
+- String idlName = next.mangledName;
+- if (next.propertyType != null) {
+- idlName = javaPropertyPrefixToIDL( next.propertyType ) +
+- next.mangledName ;
+- }
+-
+- methodToIDLNameMap_.put(next.method, idlName);
+-
+- // Final check to see if there are any clashes after all the
+- // manglings have been applied. If so, this is treated as an
+- // invalid interface. Currently, we do a CASE-SENSITIVE
+- // comparison since that matches the rmic behavior.
+- // @@@ Shouldn't this be a case-insensitive check?
+- // If there is a collision between is<TYPE> and get<TYPE>,
+- // map only is<TYPE> to an attribute, and leave the
+- // get<TYPE> method alone.
+- if( IDLNameToMethodMap_.containsKey(idlName) ) {
+- // @@@ I18N
+- Method clash = (Method) IDLNameToMethodMap_.get(idlName);
+- MethodInfo clashMethodInfo =
+- (MethodInfo)allMethodInfo.get( clash ) ;
+- if (clashMethodInfo.isBooleanProperty() &&
+- next.isReadProperty()) {
+- // fix idlName
+- } else if (clashMethodInfo.isReadProperty() &&
+- next.isBooleanProperty()) {
+- // Remove entry under idlName
+- // put entry into table under correct name
+- } else {
+- throw new IllegalStateException("Error : methods " +
+- clash + " and " + next.method +
+- " both result in IDL name '" + idlName + "'");
+- }
+- }
+-
+- IDLNameToMethodMap_.put(idlName, next.method);
+- }
+-
+- return;
+-
+- }
+-
+-
+- /**
+- * Perform all necessary stand-alone identifier mangling operations
+- * on a java identifier that is being transformed into an IDL name.
+- * That is, mangling operations that don't require looking at anything
+- * else but the identifier itself. This covers sections 1.3.2.2, 1.3.2.3,
+- * and 1.3.2.4 of the Java2IDL spec. Method overloading and
+- * case-sensitivity checks are handled elsewhere.
+- */
+-
+- private static String mangleIdentifier(String identifier) {
+- return mangleIdentifier(identifier, false);
+- }
+-
+- private static String mangleIdentifier(String identifier, boolean attribute) {
+-
+- String mangledName = identifier;
+-
+- //
+- // Apply leading underscore test (1.3.2.3)
+- // This should be done before IDL Keyword clash test, since clashing
+- // IDL keywords are mangled by adding a leading underscore.
+- //
+- if( hasLeadingUnderscore(mangledName) ) {
+- mangledName = mangleLeadingUnderscore(mangledName);
+- }
+-
+- //
+- // Apply IDL keyword clash test (1.3.2.2).
+- // This is not needed for attributes since when the full property
+- // name is composed it cannot clash with an IDL keyword.
+- // (Also, rmic doesn't do it.)
+- //
+-
+- if( !attribute && isIDLKeyword(mangledName) ) {
+- mangledName = mangleIDLKeywordClash(mangledName);
+- }
+-
+- //
+- // Replace illegal IDL identifier characters (1.3.2.4)
+- // for all method names and attributes.
+- //
+- if( !isIDLIdentifier(mangledName) ) {
+- mangledName = mangleUnicodeChars(mangledName);
+- }
+-
+- return mangledName;
+- }
+-
+- /**
+- * Checks whether a java identifier clashes with an
+- * IDL keyword. Note that this is a case-insensitive
+- * comparison.
+- *
+- * Used to implement section 1.3.2.2 of Java2IDL spec.
+- */
+- private static boolean isIDLKeyword(String identifier) {
+-
+- String identifierAllCaps = identifier.toUpperCase();
+-
+- return idlKeywords_.contains(identifierAllCaps);
+- }
+-
+- private static String mangleIDLKeywordClash(String identifier) {
+- return UNDERSCORE + identifier;
+- }
+-
+- private static String mangleLeadingUnderscore(String identifier) {
+- return LEADING_UNDERSCORE_CHAR + identifier;
+- }
+-
+- /**
+- * Checks whether a java identifier starts with an underscore.
+- * Used to implement section 1.3.2.3 of Java2IDL spec.
+- */
+- private static boolean hasLeadingUnderscore(String identifier) {
+- return identifier.startsWith(UNDERSCORE);
+- }
+-
+- /**
+- * Implements Section 1.3.2.4 of Java2IDL Mapping.
+- * All non-IDL identifier characters must be replaced
+- * with their Unicode representation.
+- */
+- static String mangleUnicodeChars(String identifier) {
+- StringBuffer mangledIdentifier = new StringBuffer();
+-
+- for(int i = 0; i < identifier.length(); i++) {
+- char nextChar = identifier.charAt(i);
+- if( isIDLIdentifierChar(nextChar) ) {
+- mangledIdentifier.append(nextChar);
+- } else {
+- String unicode = charToUnicodeRepresentation(nextChar);
+- mangledIdentifier.append(unicode);
+- }
+- }
+-
+- return mangledIdentifier.toString();
+- }
+-
+- /**
+- * Implements mangling portion of Section 1.3.2.7 of Java2IDL spec.
+- * This method only deals with the actual mangling. Decision about
+- * whether case-sensitive collision mangling is required is made
+- * elsewhere.
+- *
+- *
+- * "...a mangled name is generated consisting of the original name
+- * followed by an underscore separated list of decimal indices
+- * into the string, where the indices identify all the upper case
+- * characters in the original string. Indices are zero based."
+- *
+- */
+- String mangleCaseSensitiveCollision(String identifier) {
+-
+- StringBuffer mangledIdentifier = new StringBuffer(identifier);
+-
+- // There is always at least one trailing underscore, whether or
+- // not the identifier has uppercase letters.
+- mangledIdentifier.append(UNDERSCORE);
+-
+- boolean needUnderscore = false;
+- for(int i = 0; i < identifier.length(); i++) {
+- char next = identifier.charAt(i);
+- if( Character.isUpperCase(next) ) {
+- // This bit of logic is needed to ensure that we have
+- // an underscore separated list of indices but no
+- // trailing underscores. Basically, after we have at least
+- // one uppercase letter, we always put an undercore before
+- // printing the next one.
+- if( needUnderscore ) {
+- mangledIdentifier.append(UNDERSCORE);
+- }
+- mangledIdentifier.append(i);
+- needUnderscore = true;
+- }
+- }
+-
+- return mangledIdentifier.toString();
+- }
+-
+- private static String mangleContainerClash(String identifier) {
+- return identifier + ID_CONTAINER_CLASH_CHAR;
+- }
+-
+- /**
+- * Implements Section 1.3.2.9 of Java2IDL Mapping. Container in this
+- * context means the name of the java Class(excluding package) in which
+- * the identifier is defined. Comparison is case-insensitive.
+- */
+- private static boolean identifierClashesWithContainer
+- (String mappedContainerName, String identifier) {
+-
+- return identifier.equalsIgnoreCase(mappedContainerName);
+- }
+-
+- /**
+- * Returns Unicode mangling as defined in Section 1.3.2.4 of
+- * Java2IDL spec.
+- *
+- * "For Java identifiers that contain illegal OMG IDL identifier
+- * characters such as '$' or Unicode characters outside of ISO Latin 1,
+- * any such illegal characters are replaced by "U" followed by the
+- * 4 hexadecimal characters(in upper case) representing the Unicode
+- * value. So, the Java name a$b is mapped to aU0024b and
+- * x\u03bCy is mapped to xU03BCy."
+- */
+- public static String charToUnicodeRepresentation(char c) {
+-
+- int orig = (int) c;
+- StringBuffer hexString = new StringBuffer();
+-
+- int value = orig;
+-
+- while( value > 0 ) {
+- int div = value / 16;
+- int mod = value % 16;
+- hexString.insert(0, HEX_DIGITS[mod]);
+- value = div;
+- }
+-
+- int numZerosToAdd = 4 - hexString.length();
+- for(int i = 0; i < numZerosToAdd; i++) {
+- hexString.insert(0, "0");
+- }
+-
+- hexString.insert(0, "U");
+- return hexString.toString();
+- }
+-
+- private static boolean isIDLIdentifier(String identifier) {
+-
+- boolean isIdentifier = true;
+-
+- for(int i = 0; i < identifier.length(); i++) {
+- char nextChar = identifier.charAt(i);
+- // 1st char must be alphbetic.
+- isIdentifier = (i == 0) ?
+- isIDLAlphabeticChar(nextChar) :
+- isIDLIdentifierChar(nextChar);
+- if( !isIdentifier ) {
+- break;
+- }
+- }
+-
+- return isIdentifier;
+-
+- }
+-
+- private static boolean isIDLIdentifierChar(char c) {
+- return (isIDLAlphabeticChar(c) ||
+- isIDLDecimalDigit(c) ||
+- isUnderscore(c));
+- }
+-
+- /**
+- * True if character is one of 114 Alphabetic characters as
+- * specified in Table 2 of Chapter 3 in CORBA spec.
+- */
+- private static boolean isIDLAlphabeticChar(char c) {
+-
+- // NOTE that we can't use the java.lang.Character
+- // isUpperCase, isLowerCase, etc. methods since they
+- // include many characters other than the Alphabetic list in
+- // the CORBA spec. Instead, we test for inclusion in the
+- // Unicode value ranges for the corresponding legal characters.
+-
+- boolean alphaChar =
+- (
+- // A - Z
+- ((c >= 0x0041) && (c <= 0x005A))
+-
+- ||
+-
+- // a - z
+- ((c >= 0x0061) && (c <= 0x007A))
+-
+- ||
+-
+- // other letter uppercase, other letter lowercase, which is
+- // the entire upper half of C1 Controls except X and /
+- ((c >= 0x00C0) && (c <= 0x00FF)
+- && (c != 0x00D7) && (c != 0x00F7)));
+-
+- return alphaChar;
+- }
+-
+- /**
+- * True if character is one of 10 Decimal Digits
+- * specified in Table 3 of Chapter 3 in CORBA spec.
+- */
+- private static boolean isIDLDecimalDigit(char c) {
+- return ( (c >= 0x0030) && (c <= 0x0039) );
+- }
+-
+- private static boolean isUnderscore(char c) {
+- return ( c == 0x005F );
+- }
+-
+- /**
+- * Mangle an overloaded method name as defined in Section 1.3.2.6 of
+- * Java2IDL spec. Current value of method name is passed in as argument.
+- * We can't start from original method name since the name might have
+- * been partially mangled as a result of the other rules.
+- */
+- private static String mangleOverloadedMethod(String mangledName, Method m) {
+-
+- IDLTypesUtil idlTypesUtil = new IDLTypesUtil();
+-
+- // Start by appending the separator string
+- String newMangledName = mangledName + OVERLOADED_TYPE_SEPARATOR;
+-
+- Class[] parameterTypes = m.getParameterTypes();
+-
+- for(int i = 0; i < parameterTypes.length; i++) {
+- Class nextParamType = parameterTypes[i];
+-
+- if( i > 0 ) {
+- newMangledName = newMangledName + OVERLOADED_TYPE_SEPARATOR;
+- }
+- IDLType idlType = classToIDLType(nextParamType);
+-
+- String moduleName = idlType.getModuleName();
+- String memberName = idlType.getMemberName();
+-
+- String typeName = (moduleName.length() > 0) ?
+- moduleName + UNDERSCORE + memberName : memberName;
+-
+- if( !idlTypesUtil.isPrimitive(nextParamType) &&
+- (idlTypesUtil.getSpecialCaseIDLTypeMapping(nextParamType)
+- == null) &&
+- isIDLKeyword(typeName) ) {
+- typeName = mangleIDLKeywordClash(typeName);
+- }
+-
+- typeName = mangleUnicodeChars(typeName);
+-
+- newMangledName = newMangledName + typeName;
+- }
+-
+- return newMangledName;
+- }
+-
+-
+- private static IDLType classToIDLType(Class c) {
+-
+- IDLType idlType = null;
+- IDLTypesUtil idlTypesUtil = new IDLTypesUtil();
+-
+- if( idlTypesUtil.isPrimitive(c) ) {
+-
+- idlType = idlTypesUtil.getPrimitiveIDLTypeMapping(c);
+-
+- } else if( c.isArray() ) {
+-
+- // Calculate array depth, as well as base element type.
+- Class componentType = c.getComponentType();
+- int numArrayDimensions = 1;
+- while(componentType.isArray()) {
+- componentType = componentType.getComponentType();
+- numArrayDimensions++;
+- }
+- IDLType componentIdlType = classToIDLType(componentType);
+-
+- String[] modules = BASE_IDL_ARRAY_MODULE_TYPE;
+- if( componentIdlType.hasModule() ) {
+- modules = (String[])ObjectUtility.concatenateArrays( modules,
+- componentIdlType.getModules() ) ;
+- }
+-
+- String memberName = BASE_IDL_ARRAY_ELEMENT_TYPE +
+- numArrayDimensions + UNDERSCORE +
+- componentIdlType.getMemberName();
+-
+- idlType = new IDLType(c, modules, memberName);
+-
+- } else {
+- idlType = idlTypesUtil.getSpecialCaseIDLTypeMapping(c);
+-
+- if (idlType == null) {
+- // Section 1.3.2.5 of Java2IDL spec defines mangling rules for
+- // inner classes.
+- String memberName = getUnmappedContainerName(c);
+-
+- // replace inner class separator with double underscore
+- memberName = memberName.replaceAll("\\$",
+- INNER_CLASS_SEPARATOR);
+-
+- if( hasLeadingUnderscore(memberName) ) {
+- memberName = mangleLeadingUnderscore(memberName);
+- }
+-
+- // Get raw package name. If there is a package, it
+- // will still have the "." separators and none of the
+- // mangling rules will have been applied.
+- String packageName = getPackageName(c);
+-
+- if (packageName == null) {
+- idlType = new IDLType( c, memberName ) ;
+- } else {
+- // If this is a generated IDL Entity Type we need to
+- // prepend org_omg_boxedIDL per sections 1.3.5 and 1.3.9
+- if (idlTypesUtil.isEntity(c)) {
+- packageName = "org.omg.boxedIDL." + packageName ;
+- }
+-
+- // Section 1.3.2.1 and 1.3.2.6 of Java2IDL spec defines
+- // rules for mapping java packages to IDL modules and for
+- // mangling module name portion of type name. NOTE that
+- // of the individual identifier mangling rules,
+- // only the leading underscore test is done here.
+- // The other two(IDL Keyword, Illegal Unicode chars) are
+- // done in mangleOverloadedMethodName.
+- StringTokenizer tokenizer =
+- new StringTokenizer(packageName, ".");
+-
+- String[] modules = new String[ tokenizer.countTokens() ] ;
+- int index = 0 ;
+- while (tokenizer.hasMoreElements()) {
+- String next = tokenizer.nextToken();
+- String nextMangled = hasLeadingUnderscore(next) ?
+- mangleLeadingUnderscore(next) : next;
+-
+- modules[index++] = nextMangled ;
+- }
+-
+- idlType = new IDLType(c, modules, memberName);
+- }
+- }
+- }
+-
+- return idlType;
+- }
+-
+- /**
+- * Return Class' package name or null if there is no package.
+- */
+- private static String getPackageName(Class c) {
+- Package thePackage = c.getPackage();
+- String packageName = null;
+-
+- // Try to get package name by introspection. Some classloaders might
+- // not provide this information, so check for null.
+- if( thePackage != null ) {
+- packageName = thePackage.getName();
+- } else {
+- // brute force method
+- String fullyQualifiedClassName = c.getName();
+- int lastDot = fullyQualifiedClassName.indexOf('.');
+- packageName = (lastDot == -1) ? null :
+- fullyQualifiedClassName.substring(0, lastDot);
+- }
+- return packageName;
+- }
+-
+- private static String getMappedContainerName(Class c) {
+- String unmappedName = getUnmappedContainerName(c);
+-
+- return mangleIdentifier(unmappedName);
+- }
+-
+- /**
+- * Return portion of class name excluding package name.
+- */
+- private static String getUnmappedContainerName(Class c) {
+-
+- String memberName = null;
+- String packageName = getPackageName(c);
+-
+- String fullyQualifiedClassName = c.getName();
+-
+- if( packageName != null ) {
+- int packageLength = packageName.length();
+- memberName = fullyQualifiedClassName.substring(packageLength + 1);
+- } else {
+- memberName = fullyQualifiedClassName;
+-
+- }
+-
+- return memberName;
+- }
+-
+- /**
+- * Internal helper class for tracking information related to each
+- * interface method while we're building the name translation table.
+- */
+- private static class IDLMethodInfo
+- {
+- public Method method;
+- public String propertyType;
+-
+- // If this is a property, originalName holds the original
+- // attribute name. Otherwise, it holds the original method name.
+- public String originalName;
+-
+- // If this is a property, mangledName holds the mangled attribute
+- // name. Otherwise, it holds the mangled method name.
+- public String mangledName;
+-
+- }
+-
+- public String toString() {
+-
+- StringBuffer contents = new StringBuffer();
+- contents.append("IDLNameTranslator[" );
+- for( int ctr=0; ctr<interf_.length; ctr++) {
+- if (ctr != 0)
+- contents.append( " " ) ;
+- contents.append( interf_[ctr].getName() ) ;
+- }
+- contents.append("]\n");
+- for(Iterator iter = methodToIDLNameMap_.keySet().iterator();
+- iter.hasNext();) {
+-
+- Method method = (Method) iter.next();
+- String idlName = (String) methodToIDLNameMap_.get(method);
+-
+- contents.append(idlName + ":" + method + "\n");
+-
+- }
+-
+- return contents.toString();
+- }
+-
+- public static void main(String[] args) {
+-
+- Class remoteInterface = java.rmi.Remote.class;
+-
+- if( args.length > 0 ) {
+- String className = args[0];
+- try {
+- remoteInterface = Class.forName(className);
+- } catch(Exception e) {
+- e.printStackTrace();
+- System.exit(-1);
+- }
+- }
+-
+- System.out.println("Building name translation for " + remoteInterface);
+- try {
+- IDLNameTranslator nameTranslator =
+- IDLNameTranslatorImpl.get(remoteInterface);
+- System.out.println(nameTranslator);
+- } catch(IllegalStateException ise) {
+- ise.printStackTrace();
+- }
+- }
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,520 +0,0 @@
+-
+-package com.sun.corba.se.impl.presentation.rmi ;
+-
+-import java.lang.reflect.Method;
+-import java.lang.reflect.Field;
+-import java.util.Set;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-
+-/**
+- * Utility class for testing RMI/IDL Types as defined in
+- * Section 1.2 of The Java Language to IDL Mapping. Note that
+- * these are static checks only. Runtime checks, such as those
+- * described in Section 1.2.3, #3, are not covered.
+- */
+-public class IDLTypesUtil {
+-
+- public static final String JAVA_GET_PROPERTY_PREFIX = "get";
+- public static final String JAVA_SET_PROPERTY_PREFIX = "set";
+- public static final String JAVA_IS_PROPERTY_PREFIX = "is";
+-
+- public static final int VALID_TYPE = 0;
+- public static final int INVALID_TYPE = 1;
+-
+- /**
+- * Validate a class to ensure it conforms to the rules for a
+- * Java RMI/IIOP interface.
+- *
+- * @throws IDLTypeException if not a valid RMI/IIOP interface.
+- */
+- public void validateRemoteInterface(Class c) throws IDLTypeException
+- {
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- if( !c.isInterface() ) {
+- String msg = "Class " + c + " must be a java interface.";
+- throw new IDLTypeException(msg);
+- }
+-
+- if( !java.rmi.Remote.class.isAssignableFrom(c) ) {
+- String msg = "Class " + c + " must extend java.rmi.Remote, " +
+- "either directly or indirectly.";
+- throw new IDLTypeException(msg);
+- }
+-
+- // Get all methods, including super-interface methods.
+- Method[] methods = c.getMethods();
+-
+- for(int i = 0; i < methods.length; i++) {
+- Method next = methods[i];
+- validateExceptions(next);
+- }
+-
+- // Removed because of bug 4989053
+- // validateDirectInterfaces(c);
+- validateConstants(c);
+-
+- return;
+- }
+-
+- public boolean isRemoteInterface(Class c)
+- {
+- boolean remoteInterface = true;
+- try {
+- validateRemoteInterface(c);
+- } catch(IDLTypeException ite) {
+- remoteInterface = false;
+- }
+-
+- return remoteInterface;
+- }
+-
+- /**
+- * Section 1.2.2 Primitive Types
+- */
+- public boolean isPrimitive(Class c)
+- {
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- return c.isPrimitive();
+- }
+-
+- /**
+- * Section 1.2.4
+- */
+- public boolean isValue(Class c)
+- {
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- return
+- (!c.isInterface() &&
+- java.io.Serializable.class.isAssignableFrom(c) &&
+- !java.rmi.Remote.class.isAssignableFrom(c));
+- }
+-
+- /**
+- * Section 1.2.5
+- */
+- public boolean isArray(Class c)
+- {
+- boolean arrayType = false;
+-
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- if( c.isArray() ) {
+- Class componentType = c.getComponentType();
+- arrayType =
+- (isPrimitive(componentType) || isRemoteInterface(componentType) ||
+- isEntity(componentType) || isException(componentType) ||
+- isValue(componentType) || isObjectReference(componentType) );
+- }
+-
+- return arrayType;
+- }
+-
+- /**
+- * Section 1.2.6
+- */
+- public boolean isException(Class c)
+- {
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- // Must be a checked exception, not including RemoteException or
+- // its subclasses.
+- return isCheckedException(c) && !isRemoteException(c) && isValue(c);
+- }
+-
+- public boolean isRemoteException(Class c)
+- {
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- return java.rmi.RemoteException.class.isAssignableFrom(c) ;
+- }
+-
+- public boolean isCheckedException(Class c)
+- {
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- return Throwable.class.isAssignableFrom(c) &&
+- !RuntimeException.class.isAssignableFrom(c) &&
+- !Error.class.isAssignableFrom(c) ;
+- }
+-
+- /**
+- * Section 1.2.7
+- */
+- public boolean isObjectReference(Class c)
+- {
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- return (c.isInterface() &&
+- org.omg.CORBA.Object.class.isAssignableFrom(c));
+- }
+-
+- /**
+- * Section 1.2.8
+- */
+- public boolean isEntity(Class c)
+- {
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- Class superClass = c.getSuperclass();
+- return (!c.isInterface() &&
+- (superClass != null) &&
+- (org.omg.CORBA.portable.IDLEntity.class.isAssignableFrom(c)));
+- }
+-
+- public String javaPropertyPrefixToIDL( String javaPrefix )
+- {
+- return "_" + javaPrefix + "_" ;
+- }
+-
+- /**
+- * Return the property type if given method is legal property accessor as defined in
+- * Section 1.3.4.3 of Java2IDL spec. Result is one of: JAVA_GET_PROPERTY_PREFIX,
+- * JAVA_SET_PROPERTY_PREFIX, JAVA_IS_PROPERTY_PREFIX.
+- */
+- public String propertyAccessorMethodType(Method m, Class c) {
+-
+- String methodName = m.getName();
+- Class returnType = m.getReturnType();
+- Class[] parameters = m.getParameterTypes();
+- Class[] exceptionTypes = m.getExceptionTypes();
+- String propertyType = null;
+-
+- if( methodName.startsWith(JAVA_GET_PROPERTY_PREFIX) ) {
+-
+- if((parameters.length == 0) && (returnType != Void.TYPE) &&
+- !hasCorrespondingReadProperty(m, c, JAVA_IS_PROPERTY_PREFIX) {
+- propertyType = JAVA_GET_PROPERTY_PREFIX;
+- }
+-
+- } else if( methodName.startsWith(JAVA_SET_PROPERTY_PREFIX) ) {
+-
+- if((returnType == Void.TYPE) && (parameters.length == 1)) {
+- if (hasCorrespondingReadProperty(m, c, JAVA_GET_PROPERTY_PREFIX) ||
+- hasCorrespondingReadProperty(m, c, JAVA_IS_PROPERTY_PREFIX)) {
+- propertyType = JAVA_SET_PROPERTY_PREFIX;
+- }
+- }
+-
+- } else if( methodName.startsWith(JAVA_IS_PROPERTY_PREFIX) ) {
+- if((parameters.length == 0) && (returnType == Boolean.TYPE)) {
+- propertyType = JAVA_IS_PROPERTY_PREFIX;
+- }
+- }
+-
+- // Some final checks that apply to all properties.
+- if( propertyType != null ) {
+- if(!validPropertyExceptions(m) ||
+- (methodName.length() <= propertyType.length())) {
+- propertyType = null;
+- }
+- }
+-
+- return propertyType ;
+- }
+-
+- private boolean hasCorrespondingReadProperty
+- (Method writeProperty, Class c, String readPropertyPrefix) {
+-
+- String writePropertyMethodName = writeProperty.getName();
+- Class[] writePropertyParameters = writeProperty.getParameterTypes();
+- boolean foundReadProperty = false;
+-
+- try {
+- // Look for a valid corresponding Read property
+- String readPropertyMethodName =
+- writePropertyMethodName.replaceFirst
+- (JAVA_SET_PROPERTY_PREFIX, readPropertyPrefix);
+- Method readPropertyMethod = c.getMethod(readPropertyMethodName,
+- new Class[] {});
+- foundReadProperty =
+- ((propertyAccessorMethodType(readPropertyMethod, c) != null) &&
+- (readPropertyMethod.getReturnType() ==
+- writePropertyParameters[0]));
+- } catch(Exception e) {
+- // ignore. this means we didn't find a corresponding get property.
+- }
+-
+- return foundReadProperty;
+- }
+-
+- public String getAttributeNameForProperty(String propertyName) {
+- String attributeName = null;
+- String prefix = null;
+-
+- if( propertyName.startsWith(JAVA_GET_PROPERTY_PREFIX) ) {
+- prefix = JAVA_GET_PROPERTY_PREFIX;
+- } else if( propertyName.startsWith(JAVA_SET_PROPERTY_PREFIX) ) {
+- prefix = JAVA_SET_PROPERTY_PREFIX;
+- } else if( propertyName.startsWith(JAVA_IS_PROPERTY_PREFIX) ) {
+- prefix = JAVA_IS_PROPERTY_PREFIX;
+- }
+-
+- if( (prefix != null) && (prefix.length() < propertyName.length()) ) {
+- String remainder = propertyName.substring(prefix.length());
+- if( (remainder.length() >= 2) &&
+- Character.isUpperCase(remainder.charAt(0)) &&
+- Character.isUpperCase(remainder.charAt(1)) ) {
+- // don't set the first letter to lower-case if the
+- // first two are upper-case
+- attributeName = remainder;
+- } else {
+- attributeName = Character.toLowerCase(remainder.charAt(0)) +
+- remainder.substring(1);
+- }
+- }
+-
+- return attributeName;
+- }
+-
+- /**
+- * Return IDL Type name for primitive types as defined in
+- * Section 1.3.3 of Java2IDL spec or null if not a primitive type.
+- */
+- public IDLType getPrimitiveIDLTypeMapping(Class c) {
+-
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- if( c.isPrimitive() ) {
+- if( c == Void.TYPE ) {
+- return new IDLType( c, "void" ) ;
+- } else if( c == Boolean.TYPE ) {
+- return new IDLType( c, "boolean" ) ;
+- } else if( c == Character.TYPE ) {
+- return new IDLType( c, "wchar" ) ;
+- } else if( c == Byte.TYPE ) {
+- return new IDLType( c, "octet" ) ;
+- } else if( c == Short.TYPE ) {
+- return new IDLType( c, "short" ) ;
+- } else if( c == Integer.TYPE ) {
+- return new IDLType( c, "long" ) ;
+- } else if( c == Long.TYPE ) {
+- return new IDLType( c, "long_long" ) ;
+- } else if( c == Float.TYPE ) {
+- return new IDLType( c, "float" ) ;
+- } else if( c == Double.TYPE ) {
+- return new IDLType( c, "double" ) ;
+- }
+- }
+-
+- return null;
+- }
+-
+- /**
+- * Return IDL Type name for special case type mappings as defined in
+- * Table 1-1 of Java2IDL spec or null if given class is not a special
+- * type.
+- */
+- public IDLType getSpecialCaseIDLTypeMapping(Class c) {
+-
+- if( c == null ) {
+- throw new IllegalArgumentException();
+- }
+-
+- if( c == java.lang.Object.class ) {
+- return new IDLType( c, new String[] { "java", "lang" },
+- "Object" ) ;
+- } else if( c == java.lang.String.class ) {
+- return new IDLType( c, new String[] { "CORBA" },
+- "WStringValue" ) ;
+- } else if( c == java.lang.Class.class ) {
+- return new IDLType( c, new String[] { "javax", "rmi", "CORBA" },
+- "ClassDesc" ) ;
+- } else if( c == java.io.Serializable.class ) {
+- return new IDLType( c, new String[] { "java", "io" },
+- "Serializable" ) ;
+- } else if( c == java.io.Externalizable.class ) {
+- return new IDLType( c, new String[] { "java", "io" },
+- "Externalizable" ) ;
+- } else if( c == java.rmi.Remote.class ) {
+- return new IDLType( c, new String[] { "java", "rmi" },
+- "Remote" ) ;
+- } else if( c == org.omg.CORBA.Object.class ) {
+- return new IDLType( c, "Object" ) ;
+- } else {
+- return null;
+- }
+- }
+-
+- /**
+- * Implements 1.2.3 #2 and #4
+- */
+- private void validateExceptions(Method method) throws IDLTypeException {
+-
+- Class[] exceptions = method.getExceptionTypes();
+-
+- boolean declaresRemoteExceptionOrSuperClass = false;
+-
+- // Section 1.2.3, #2
+- for(int eIndex = 0; eIndex < exceptions.length; eIndex++) {
+- Class exception = exceptions[eIndex];
+- if( isRemoteExceptionOrSuperClass(exception) ) {
+- declaresRemoteExceptionOrSuperClass = true;
+- break;
+- }
+- }
+-
+- if( !declaresRemoteExceptionOrSuperClass ) {
+- String msg = "Method '" + method + "' must throw at least one " +
+- "exception of type java.rmi.RemoteException or one of its " +
+- "super-classes";
+- throw new IDLTypeException(msg);
+- }
+-
+- // Section 1.2.3, #4
+- // See also bug 4972402
+- // For all exceptions E in exceptions,
+- // (isCheckedException(E) => (isValue(E) || RemoteException.isAssignableFrom( E ) )
+- for(int eIndex = 0; eIndex < exceptions.length; eIndex++) {
+- Class exception = exceptions[eIndex];
+-
+- if (isCheckedException(exception) && !isValue(exception) &&
+- !isRemoteException(exception))
+- {
+- String msg = "Exception '" + exception + "' on method '" +
+- method + "' is not a allowed RMI/IIOP exception type";
+- throw new IDLTypeException(msg);
+- }
+- }
+-
+- return;
+- }
+-
+- /**
+- * Returns true if the method's throw clause conforms to the exception
+- * restrictions for properties as defined in Section 1.3.4.3 of
+- * Java2IDL spec. This means that for all exceptions E declared on the
+- * method, E isChecked => RemoteException.isAssignableFrom( E ).
+- */
+- private boolean validPropertyExceptions(Method method)
+- {
+- Class[] exceptions = method.getExceptionTypes();
+-
+- for(int eIndex = 0; eIndex < exceptions.length; eIndex++) {
+- Class exception = exceptions[eIndex];
+-
+- if (isCheckedException(exception) && !isRemoteException(exception))
+- return false ;
+- }
+-
+- return true;
+- }
+-
+- /**
+- * Implements Section 1.2.3, #2.
+- */
+- private boolean isRemoteExceptionOrSuperClass(Class c) {
+- return
+- ((c == java.rmi.RemoteException.class) ||
+- (c == java.io.IOException.class) ||
+- (c == java.lang.Exception.class) ||
+- (c == java.lang.Throwable.class));
+- }
+-
+- /**
+- * Implements Section 1.2.3, #5.
+- */
+- private void validateDirectInterfaces(Class c) throws IDLTypeException {
+-
+- Class[] directInterfaces = c.getInterfaces();
+-
+- if( directInterfaces.length < 2 ) {
+- return;
+- }
+-
+- Set allMethodNames = new HashSet();
+- Set currentMethodNames = new HashSet();
+-
+- for(int i = 0; i < directInterfaces.length; i++) {
+- Class next = directInterfaces[i];
+- Method[] methods = next.getMethods();
+-
+- // Comparison is based on method names only. First collect
+- // all methods from current interface, eliminating duplicate
+- // names.
+- currentMethodNames.clear();
+- for(int m = 0; m < methods.length; m++) {
+- currentMethodNames.add(methods[m].getName());
+- }
+-
+- // Now check each method against list of all unique method
+- // names processed so far.
+- for(Iterator iter=currentMethodNames.iterator(); iter.hasNext();) {
+- String methodName = (String) iter.next();
+- if( allMethodNames.contains(methodName) ) {
+- String msg = "Class " + c + " inherits method " +
+- methodName + " from multiple direct interfaces.";
+- throw new IDLTypeException(msg);
+- } else {
+- allMethodNames.add(methodName);
+- }
+- }
+- }
+-
+- return;
+- }
+-
+- /**
+- * Implements 1.2.3 #6
+- */
+- private void validateConstants(final Class c)
+- throws IDLTypeException {
+-
+- Field[] fields = null;
+-
+- try {
+- fields = (Field[])
+- java.security.AccessController.doPrivileged
+- (new java.security.PrivilegedExceptionAction() {
+- public java.lang.Object run() throws Exception {
+- return c.getFields();
+- }
+- });
+- } catch(java.security.PrivilegedActionException pae) {
+- IDLTypeException ite = new IDLTypeException();
+- ite.initCause(pae);
+- throw ite;
+- }
+-
+- for(int i = 0; i < fields.length; i++) {
+- Field next = fields[i];
+- Class fieldType = next.getType();
+- if( (fieldType != java.lang.String.class) &&
+- !isPrimitive(fieldType) ) {
+- String msg = "Constant field '" + next.getName() +
+- "' in class '" + next.getDeclaringClass().getName() +
+- "' has invalid type' " + next.getType() + "'. Constants" +
+- " in RMI/IIOP interfaces can only have primitive" +
+- " types and java.lang.String types.";
+- throw new IDLTypeException(msg);
+- }
+- }
+-
+-
+- return;
+- }
+-
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalClientRequestImpl.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,138 +0,0 @@
+-/*
+- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. 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.corba.se.impl.iiop;
+-
+-import com.sun.corba.se.impl.protocol.Request;
+-import com.sun.corba.se.impl.core.ClientRequest;
+-import com.sun.corba.se.impl.core.ServiceContext;
+-import com.sun.corba.se.impl.core.ServiceContexts;
+-import com.sun.corba.se.impl.core.ClientResponse;
+-import com.sun.corba.se.impl.core.ServerRequest;
+-import com.sun.corba.se.impl.core.ServerResponse;
+-import com.sun.corba.se.impl.corba.IOR;
+-import com.sun.corba.se.impl.corba.GIOPVersion;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.MessageBase;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage;
+-import com.sun.corba.se.impl.orbutil.ORBConstants;
+-import com.sun.corba.se.impl.core.ORBVersion;
+-import com.sun.corba.se.impl.core.ORB;
+-import com.sun.corba.se.impl.orbutil.ORBUtility;
+-import com.sun.corba.se.impl.ior.ObjectKeyFactory ;
+-import com.sun.corba.se.impl.ior.ObjectKey ;
+-import com.sun.corba.se.impl.ior.ObjectKeyTemplate ;
+-import com.sun.corba.se.impl.ior.IIOPProfile;
+-
+-public class LocalClientRequestImpl extends IIOPOutputStream
+- implements ClientRequest
+-{
+- public LocalClientRequestImpl( GIOPVersion gv,
+- ORB orb, IOR ior, short addrDisposition,
+- String operationName, boolean oneway, ServiceContexts svc,
+- int requestId, byte streamFormatVersion)
+- {
+- super(gv,
+- orb,
+- null,
+- BufferManagerFactory.newBufferManagerWrite(BufferManagerFactory.GROW),
+- streamFormatVersion);
+-
+- this.isOneway = oneway;
+- boolean responseExpected = !isOneway;
+-
+- IIOPProfile iop = ior.getProfile();
+- ObjectKey okey = iop.getObjectKey();
+- ObjectKeyTemplate oktemp = okey.getTemplate() ;
+- ORBVersion version = oktemp.getORBVersion() ;
+- orb.setORBVersion( version ) ;
+-
+- this.request = MessageBase.createRequest(orb, gv, requestId,
+- responseExpected, ior, addrDisposition, operationName, svc, null);
+- setMessage(request);
+- request.write(this);
+-
+- // mark beginning of msg body for possible later use
+- bodyBegin = getSize();
+- }
+-
+- public int getRequestId() {
+- return request.getRequestId();
+- }
+-
+- public boolean isOneWay() {
+- return isOneway;
+- }
+-
+- public ServiceContexts getServiceContexts() {
+- return request.getServiceContexts();
+- }
+-
+- public String getOperationName() {
+- return request.getOperation();
+- }
+-
+- public ObjectKey getObjectKey() {
+- return request.getObjectKey();
+- }
+-
+- public ServerRequest getServerRequest()
+- {
+- // Set the size of the marshalled data in the message header.
+- getMessage().setSize( getByteBuffer(), getSize() ) ;
+-
+- // Construct a new ServerRequest out of the buffer in this ClientRequest
+- LocalServerRequestImpl serverRequest = new LocalServerRequestImpl(
+- (ORB)orb(), toByteArray(), request ) ;
+-
+- // Skip over all of the GIOP header information. This positions
+- // the offset in the buffer so that the skeleton can correctly read
+- // the marshalled arguments.
+- serverRequest.setIndex( bodyBegin ) ;
+-
+- return serverRequest ;
+- }
+-
+- public ClientResponse invoke()
+- {
+- ORB myORB = (ORB)orb() ;
+-
+- ServerResponse serverResponse = myORB.process( getServerRequest() ) ;
+-
+- LocalServerResponseImpl lsr = (LocalServerResponseImpl)serverResponse ;
+-
+- return lsr.getClientResponse() ;
+- }
+-
+- /**
+- * Check to see if the request is local.
+- */
+- public boolean isLocal(){
+- return true;
+- }
+-
+- private RequestMessage request;
+- private int bodyBegin;
+- private boolean isOneway;
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalClientResponseImpl.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,162 +0,0 @@
+-/*
+- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. 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.corba.se.impl.iiop;
+-
+-import java.io.IOException;
+-
+-import org.omg.CORBA.SystemException;
+-import org.omg.CORBA.CompletionStatus;
+-
+-import com.sun.corba.se.impl.core.Response;
+-import com.sun.corba.se.impl.core.ClientResponse;
+-import com.sun.corba.se.impl.corba.IOR;
+-import com.sun.corba.se.impl.core.ORB;
+-import com.sun.corba.se.impl.core.ServiceContext;
+-import com.sun.corba.se.impl.core.ServiceContexts;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.ReplyMessage;
+-import com.sun.corba.se.impl.orbutil.MinorCodes;
+-
+-class LocalClientResponseImpl extends IIOPInputStream implements ClientResponse
+-{
+- LocalClientResponseImpl(ORB orb, byte[] buf, ReplyMessage header)
+- {
+- super(orb, buf, header.getSize(), header.isLittleEndian(), header, null);
+-
+- this.reply = header;
+-
+- // NOTE (Ram J) (06/02/2000) if we set result.setIndex(bodyBegin)
+- // in LocalServerResponse.getClientResponse(), then we do not need
+- // to read the headers (done below) anymore.
+- // This will be an optimisation which is can be done to speed up the
+- // local invocation by avoiding reading the headers in the local cases.
+-
+- // BUGFIX(Ram Jeyaraman) This has been moved from
+- // LocalServerResponse.getClientResponse()
+- // Skip over all of the GIOP header information. This positions
+- // the offset in the buffer so that the skeleton can correctly read
+- // the marshalled arguments.
+- this.setIndex(Message.GIOPMessageHeaderLength);
+-
+- // BUGFIX(Ram Jeyaraman) For local invocations, the reply mesg fields
+- // needs to be set, by reading the response buffer contents
+- // to correctly set the exception type and other info.
+- this.reply.read(this);
+- }
+-
+- LocalClientResponseImpl(SystemException ex)
+- {
+- this.systemException = ex;
+- }
+-
+- public boolean isSystemException() {
+- if ( reply != null )
+- return reply.getReplyStatus() == ReplyMessage.SYSTEM_EXCEPTION;
+- else
+- return (systemException != null);
+- }
+-
+- public boolean isUserException() {
+- if ( reply != null )
+- return reply.getReplyStatus() == ReplyMessage.USER_EXCEPTION;
+- else
+- return false;
+- }
+-
+- public boolean isLocationForward() {
+- if ( reply != null ) {
+- return ( (reply.getReplyStatus() == ReplyMessage.LOCATION_FORWARD) ||
+- (reply.getReplyStatus() == ReplyMessage.LOCATION_FORWARD_PERM) );
+- //return reply.getReplyStatus() == ReplyMessage.LOCATION_FORWARD;
+- } else {
+- return false;
+- }
+- }
+-
+- public boolean isDifferentAddrDispositionRequested() {
+- if (reply != null) {
+- return reply.getReplyStatus() == ReplyMessage.NEEDS_ADDRESSING_MODE;
+- }
+-
+- return false;
+- }
+-
+- public short getAddrDisposition() {
+- if (reply != null) {
+- return reply.getAddrDisposition();
+- }
+-
+- throw new org.omg.CORBA.INTERNAL(
+- "Null reply in getAddrDisposition",
+- MinorCodes.NULL_REPLY_IN_GET_ADDR_DISPOSITION,
+- CompletionStatus.COMPLETED_MAYBE);
+- }
+-
+- public IOR getForwardedIOR() {
+- if ( reply != null )
+- return reply.getIOR();
+- else
+- return null;
+- }
+-
+- public int getRequestId() {
+- if ( reply != null )
+- return reply.getRequestId();
+- else
+- throw new org.omg.CORBA.INTERNAL("Error in getRequestId");
+- }
+-
+- public ServiceContexts getServiceContexts() {
+- if ( reply != null )
+- return reply.getServiceContexts();
+- else
+- return null;
+- }
+-
+- public SystemException getSystemException() {
+- if ( reply != null )
+- return reply.getSystemException();
+- else
+- return systemException;
+- }
+-
+- public java.lang.String peekUserExceptionId() {
+- mark(Integer.MAX_VALUE);
+- String result = read_string();
+- reset();
+- return result;
+- }
+-
+- /**
+- * Check to see if the response is local.
+- */
+- public boolean isLocal(){
+- return true;
+- }
+-
+- private ReplyMessage reply;
+- private SystemException systemException;
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalServerRequestImpl.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,208 +0,0 @@
+-/*
+- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. 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.corba.se.impl.iiop;
+-
+-import org.omg.CORBA.SystemException;
+-
+-import com.sun.corba.se.impl.core.ServerRequest;
+-import com.sun.corba.se.impl.core.ServiceContext;
+-import com.sun.corba.se.impl.core.DuplicateServiceContext;
+-import com.sun.corba.se.impl.core.UEInfoServiceContext;
+-import com.sun.corba.se.impl.core.ServiceContexts;
+-import com.sun.corba.se.impl.core.ServerResponse;
+-import com.sun.corba.se.impl.corba.IOR;
+-import com.sun.corba.se.impl.core.ORB;
+-import com.sun.corba.se.impl.orbutil.ORBUtility; //d11638
+-import org.omg.CORBA.portable.UnknownException;
+-import org.omg.CORBA.UNKNOWN;
+-import org.omg.CORBA.CompletionStatus;
+-import com.sun.corba.se.impl.ior.ObjectKey;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.MessageBase;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.ReplyMessage;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage;
+-
+-class LocalServerRequestImpl extends IIOPInputStream implements ServerRequest {
+- org.omg.CORBA.portable.OutputStream replyStream;
+- org.omg.CORBA.portable.OutputStream exceptionReplyStream;
+-
+- LocalServerRequestImpl(ORB orb, byte[] buf, RequestMessage header)
+- {
+- super(orb, buf, header.getSize(), header.isLittleEndian(), header, null );
+-
+- this.request = header;
+- }
+-
+- public int getRequestId() {
+- return request.getRequestId();
+- }
+-
+- public boolean isOneWay() {
+- return !request.isResponseExpected();
+- }
+-
+- public ServiceContexts getServiceContexts() {
+- return request.getServiceContexts();
+- }
+-
+- public String getOperationName() {
+- return request.getOperation();
+- }
+-
+- public ObjectKey getObjectKey() {
+- return request.getObjectKey();
+- }
+-
+- public ServerResponse createResponse(ServiceContexts svc)
+- {
+- return new LocalServerResponseImpl(this, svc);
+- }
+-
+- public org.omg.CORBA.portable.OutputStream createReply() {
+- if (replyStream == null) {
+- replyStream = (org.omg.CORBA.portable.OutputStream)
+- createResponse(null);
+- }
+- return replyStream;
+- }
+-
+- public org.omg.CORBA.portable.OutputStream createExceptionReply() {
+- if (exceptionReplyStream == null) {
+- exceptionReplyStream = (org.omg.CORBA.portable.OutputStream)
+- createUserExceptionResponse(null);
+- }
+- return exceptionReplyStream;
+- }
+-
+- public ServerResponse createUserExceptionResponse(
+- ServiceContexts svc)
+- {
+- return new LocalServerResponseImpl(this, svc, true);
+- }
+-
+- public ServerResponse createUnknownExceptionResponse(
+- UnknownException ex) {
+- ServiceContexts contexts = null;
+- SystemException sys = new UNKNOWN( 0,
+- CompletionStatus.COMPLETED_MAYBE);
+-
+- try {
+- contexts = new ServiceContexts( (ORB)orb() );
+- UEInfoServiceContext uei = new UEInfoServiceContext(sys);
+- contexts.put(uei) ;
+- } catch (DuplicateServiceContext d) {
+- // can't happen
+- }
+-
+- return createSystemExceptionResponse(sys,contexts);
+- }
+-
+- public ServerResponse createSystemExceptionResponse(
+- SystemException ex, ServiceContexts svc) {
+-
+- // Only do this if interceptors have been initialized on this request
+- // and have not completed their lifecycle (otherwise the info stack
+- // may be empty or have a different request's entry on top).
+- if (executePIInResponseConstructor()) {
+- // Inform Portable Interceptors of the SystemException. This is
+- // required to be done here because the ending interception point
+- // is called in the ServerResponseImpl constructor called below
+- // but we do not currently write the SystemException into the
+- // response until after the ending point is called.
+- ORB orb = (ORB)orb();
+- orb.getPIHandler().setServerPIInfo( ex );
+- }
+-
+- if (orb() != null && ((ORB)orb()).subcontractDebugFlag && ex != null)
+- ORBUtility.dprint(this, "Sending SystemException:", ex);
+-
+- LocalServerResponseImpl response =
+- new LocalServerResponseImpl(this, svc, false);
+- ORBUtility.writeSystemException(ex, response);
+- return response;
+- }
+-
+- public ServerResponse createLocationForward(
+- IOR ior, ServiceContexts svc) {
+- ReplyMessage reply = MessageBase.createReply( (ORB)orb(),
+- request.getGIOPVersion(), request.getRequestId(),
+- ReplyMessage.LOCATION_FORWARD, svc, ior);
+- LocalServerResponseImpl response =
+- new LocalServerResponseImpl(this, reply, ior);
+-
+- return response;
+- }
+-
+- private RequestMessage request;
+-
+- /**
+- * Check to see if the request is local.
+- */
+- public boolean isLocal(){
+- return true;
+- }
+-
+- private boolean _executeReturnServantInResponseConstructor = false;
+-
+- public boolean executeReturnServantInResponseConstructor()
+- {
+- return _executeReturnServantInResponseConstructor;
+- }
+-
+- public void setExecuteReturnServantInResponseConstructor(boolean b)
+- {
+- _executeReturnServantInResponseConstructor = b;
+- }
+-
+-
+- private boolean _executeRemoveThreadInfoInResponseConstructor = false;
+-
+- public boolean executeRemoveThreadInfoInResponseConstructor()
+- {
+- return _executeRemoveThreadInfoInResponseConstructor;
+- }
+-
+- public void setExecuteRemoveThreadInfoInResponseConstructor(boolean b)
+- {
+- _executeRemoveThreadInfoInResponseConstructor = b;
+- }
+-
+-
+- private boolean _executePIInResponseConstructor = false;
+-
+- public boolean executePIInResponseConstructor() {
+- return _executePIInResponseConstructor;
+- }
+-
+- public void setExecutePIInResponseConstructor( boolean b ) {
+- _executePIInResponseConstructor = b;
+- }
+-
+- // We know that we're talking to the same ValueHandler, so
+- // use the maximum version it supports.
+- public byte getStreamFormatVersionForReply() {
+- return ORBUtility.getMaxStreamFormatVersion();
+- }
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalServerResponseImpl.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,192 +0,0 @@
+-/*
+- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. 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.corba.se.impl.iiop;
+-
+-import org.omg.CORBA.SystemException;
+-
+-import com.sun.corba.se.impl.core.ServerResponse;
+-import com.sun.corba.se.impl.core.ORB;
+-import com.sun.corba.se.impl.corba.IOR;
+-import com.sun.corba.se.impl.core.ServiceContext;
+-import com.sun.corba.se.impl.core.ServiceContexts;
+-import com.sun.corba.se.impl.core.ClientResponse;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.MessageBase;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.ReplyMessage;
+-
+-class LocalServerResponseImpl
+- extends IIOPOutputStream
+- implements ServerResponse
+-{
+- LocalServerResponseImpl(LocalServerRequestImpl request, ServiceContexts svc)
+- {
+- this(request,
+- MessageBase.createReply(
+- (ORB)request.orb(),
+- request.getGIOPVersion(),
+- request.getRequestId(), ReplyMessage.NO_EXCEPTION,
+- svc, null),
+- null);
+- }
+-
+- LocalServerResponseImpl(LocalServerRequestImpl request, ServiceContexts svc,
+- boolean user)
+- {
+- this(request,
+- MessageBase.createReply(
+- (ORB)request.orb(),
+- request.getGIOPVersion(), request.getRequestId(),
+- user ? ReplyMessage.USER_EXCEPTION :
+- ReplyMessage.SYSTEM_EXCEPTION,
+- svc, null),
+- null);
+- }
+-
+- LocalServerResponseImpl( LocalServerRequestImpl request, ReplyMessage reply,
+- IOR ior)
+- {
+- super(request.getGIOPVersion(),
+- (ORB)request.orb(),
+- null,
+- BufferManagerFactory.newBufferManagerWrite(BufferManagerFactory.GROW),
+- request.getStreamFormatVersionForReply());
+-
+- setMessage(reply);
+-
+- ORB orb = (ORB)request.orb();
+-
+- ServerResponseImpl.runServantPostInvoke(orb, request);
+-
+- if( request.executePIInResponseConstructor() ) {
+- // Invoke server request ending interception points (send_*):
+- // Note: this may end up with a SystemException or an internal
+- // Runtime ForwardRequest.
+- orb.getPIHandler().invokeServerPIEndingPoint( reply );
+-
+- // Note this will be executed even if a ForwardRequest or
+- // SystemException is thrown by a Portable Interceptors ending
+- // point since we end up in this constructor again anyway.
+- orb.getPIHandler().cleanupServerPIRequest();
+-
+- // See (Local)ServerRequestImpl.createSystemExceptionResponse
+- // for why this is necesary.
+- request.setExecutePIInResponseConstructor(false);
+- }
+-
+- // Once you get here then the final reply is available (i.e.,
+- // postinvoke and interceptors have completed.
+- if (request.executeRemoveThreadInfoInResponseConstructor()) {
+- ServerResponseImpl.removeThreadInfo(orb, request);
+- }
+-
+- reply.write(this);
+- if (reply.getIOR() != null)
+- reply.getIOR().write(this);
+-
+- this.reply = reply;
+- this.ior = reply.getIOR();
+- }
+-
+- public boolean isSystemException() {
+- if (reply != null)
+- return reply.getReplyStatus() == ReplyMessage.SYSTEM_EXCEPTION;
+- return false;
+- }
+-
+- public boolean isUserException() {
+- if (reply != null)
+- return reply.getReplyStatus() == ReplyMessage.USER_EXCEPTION;
+- return false;
+- }
+-
+- public boolean isLocationForward() {
+- if (ior != null)
+- return true;
+- return false;
+- }
+-
+- public IOR getForwardedIOR() {
+- return ior;
+- }
+-
+- public int getRequestId() {
+- if (reply != null)
+- return reply.getRequestId();
+- return -1;
+- }
+-
+- public ServiceContexts getServiceContexts() {
+- if (reply != null)
+- return reply.getServiceContexts();
+- return null;
+- }
+-
+- public SystemException getSystemException() {
+- if (reply != null)
+- return reply.getSystemException();
+- return null;
+- }
+-
+- public ReplyMessage getReply()
+- {
+- return reply ;
+- }
+-
+- public ClientResponse getClientResponse()
+- {
+- // set the size of the marshalled data in the message header
+- getMessage().setSize(getByteBuffer(), getSize());
+-
+- // Construct a new ClientResponse out of the buffer in this ClientRequest
+- LocalClientResponseImpl result =
+- new LocalClientResponseImpl( (ORB)orb(), toByteArray(), reply);
+-
+- // NOTE (Ram J) (06/02/2000) if we set result.setIndex(bodyBegin) here
+- // then the LocalClientResponse does not need to read the headers anymore.
+- // This will be an optimisation which is can be done to speed up the
+- // local invocation by avoiding reading the headers in the local cases.
+-
+- // BUGFIX(Ram Jeyaraman) result.setOffset is now done in
+- // LocalClientResponseImpl constructor.
+- /*
+- // Skip over all of the GIOP header information. This positions
+- // the offset in the buffer so that the skeleton can correctly read
+- // the marshalled arguments.
+- result.setOffset( bodyBegin ) ;
+- */
+-
+- return result ;
+- }
+-
+- /**
+- * Check to see if the response is local.
+- */
+- public boolean isLocal(){
+- return true;
+- }
+-
+- private ReplyMessage reply;
+- private IOR ior; // forwarded IOR
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/transport/BufferConnectionImpl.sjava Tue Mar 18 12:29:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,710 +0,0 @@
+-/*
+- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. Oracle designates this
+- * particular file as subject to the "Classpath" exception as provided
+- * by Oracle in the LICENSE file that accompanied this code.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- */
+-
+-package com.sun.corba.se.impl.transport;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.net.Socket;
+-import java.nio.ByteBuffer;
+-import java.nio.channels.SelectableChannel;
+-import java.nio.channels.SelectionKey;
+-import java.nio.channels.SocketChannel;
+-import java.security.AccessController;
+-import java.security.PrivilegedAction;
+-import java.util.Collections;
+-import java.util.Hashtable;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-import org.omg.CORBA.COMM_FAILURE;
+-import org.omg.CORBA.CompletionStatus;
+-import org.omg.CORBA.DATA_CONVERSION;
+-import org.omg.CORBA.INTERNAL;
+-import org.omg.CORBA.MARSHAL;
+-import org.omg.CORBA.OBJECT_NOT_EXIST;
+-import org.omg.CORBA.SystemException;
+-
+-import com.sun.org.omg.SendingContext.CodeBase;
+-
+-import com.sun.corba.se.pept.broker.Broker;
+-import com.sun.corba.se.pept.encoding.InputObject;
+-import com.sun.corba.se.pept.encoding.OutputObject;
+-import com.sun.corba.se.pept.protocol.MessageMediator;
+-import com.sun.corba.se.pept.transport.Acceptor;
+-import com.sun.corba.se.pept.transport.Connection;
+-import com.sun.corba.se.pept.transport.ConnectionCache;
+-import com.sun.corba.se.pept.transport.ContactInfo;
+-import com.sun.corba.se.pept.transport.EventHandler;
+-import com.sun.corba.se.pept.transport.InboundConnectionCache;
+-import com.sun.corba.se.pept.transport.OutboundConnectionCache;
+-import com.sun.corba.se.pept.transport.ResponseWaitingRoom;
+-import com.sun.corba.se.pept.transport.Selector;
+-
+-import com.sun.corba.se.spi.ior.IOR;
+-import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
+-import com.sun.corba.se.spi.logging.CORBALogDomains;
+-import com.sun.corba.se.spi.orb.ORB ;
+-import com.sun.corba.se.spi.orbutil.threadpool.Work;
+-import com.sun.corba.se.spi.protocol.CorbaMessageMediator;
+-import com.sun.corba.se.spi.transport.CorbaContactInfo;
+-import com.sun.corba.se.spi.transport.CorbaConnection;
+-import com.sun.corba.se.spi.transport.CorbaResponseWaitingRoom;
+-
+-import com.sun.corba.se.impl.encoding.CachedCodeBase;
+-import com.sun.corba.se.impl.encoding.CDRInputStream_1_0;
+-import com.sun.corba.se.impl.encoding.CDROutputObject;
+-import com.sun.corba.se.impl.encoding.CDROutputStream_1_0;
+-import com.sun.corba.se.impl.encoding.CodeSetComponentInfo;
+-import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry;
+-import com.sun.corba.se.impl.logging.ORBUtilSystemException;
+-import com.sun.corba.se.impl.orbutil.ORBConstants;
+-import com.sun.corba.se.impl.orbutil.ORBUtility;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
+-import com.sun.corba.se.impl.protocol.giopmsgheaders.MessageBase;
+-import com.sun.corba.se.impl.transport.CorbaResponseWaitingRoomImpl;
+-
+-/**
+- * @author Ken Cavanaugh
+- */
+-public class BufferConnectionImpl
+- extends
+- EventHandlerBase
+- implements
+- CorbaConnection,
+- Work
+-{
+- //
+- // New transport.
+- //
+-
+- protected long enqueueTime;
+-
+- public SocketChannel getSocketChannel()
+- {
+- return null;
+- }
+-
+- // REVISIT:
+- // protected for test: genericRPCMSGFramework.IIOPConnection constructor.
+-
+- //
+- // From iiop.Connection.java
+- //
+-
+- protected long timeStamp = 0;
+- protected boolean isServer = false;
+-
+- // Start at some value other than zero since this is a magic
+- // value in some protocols.
+- protected int requestId = 5;
+- protected CorbaResponseWaitingRoom responseWaitingRoom;
+- protected int state;
+- protected java.lang.Object stateEvent = new java.lang.Object();
+- protected java.lang.Object writeEvent = new java.lang.Object();
+- protected boolean writeLocked;
+- protected int serverRequestCount = 0;
+-
+- // Server request map: used on the server side of Connection
+- // Maps request ID to IIOPInputStream.
+- Map serverRequestMap = new HashMap() ;
+-
+- // This is a flag associated per connection telling us if the
+- // initial set of sending contexts were sent to the receiver
+- // already...
+- protected boolean postInitialContexts = false;
+-
+- // Remote reference to CodeBase server (supplies
+- // FullValueDescription, among other things)
+- protected IOR codeBaseServerIOR;
+-
+- // CodeBase cache for this connection. This will cache remote operations,
+- // handle connecting, and ensure we don't do any remote operations until
+- // necessary.
+- protected CachedCodeBase cachedCodeBase = new CachedCodeBase(this);
+-
+- protected ORBUtilSystemException wrapper ;
+-
+- List buffers ;
+-
+- public BufferConnectionImpl(ORB orb, byte[][] data )
+- {
+- this.orb = orb;
+- wrapper = ORBUtilSystemException.get( orb,
+- CORBALogDomains.RPC_TRANSPORT ) ;
+- buffers = new ArrayList() ;
+- }
+-
+- ////////////////////////////////////////////////////
+- //
+- // framework.transport.Connection
+- //
+-
+- public boolean shouldRegisterReadEvent()
+- {
+- return false;
+- }
+-
+- public boolean shouldRegisterServerReadEvent()
+- {
+- return false;
+- }
+-
+- public boolean read()
+- {
+- return true ;
+- }
+-
+- protected CorbaMessageMediator readBits()
+- {
+- return null ;
+- }
+-
+- protected boolean dispatch(CorbaMessageMediator messageMediator)
+- {
+- }
+-
+- public boolean shouldUseDirectByteBuffers()
+- {
+- return false ;
+- }
+-
+- // Only called from readGIOPMessage with (12, 0, 12) as arguments
+- // size is size of buffer to create
+- // offset is offset from start of message in buffer
+- // length is length to read
+- public ByteBuffer read(int size, int offset, int length)
+- throws IOException
+- {
+- byte[] buf = new byte[size];
+- readFully( buf, offset, length);
+- ByteBuffer byteBuffer = ByteBuffer.wrap(buf);
+- byteBuffer.limit(size);
+- return byteBuffer;
+- }
+-
+- // Only called as read( buf, 12, msgsize-12 ) in readGIOPMessage
+- // We can ignore the byteBuffer parameter
+- // offset is the starting position to place data in the result
+- // length is the length of the data to read
+- public ByteBuffer read(ByteBuffer byteBuffer, int offset, int length)
+- throws IOException
+- {
+- int size = offset + length;
+- byte[] buf = new byte[size];
+- readFully(buf, offset, length);
+- return ByteBuffer.wrap(buf);
+- }
+-
+- // Read size bytes from buffer list and place the data
+- // starting at offset in buf.
+- public void readFully(byte[] buf, int offset, int size)
+- throws IOException
+- {
+- int remaining = size ;
+- int position = offset ;
+- while (remaining > 0) {
+- ByteBuffer buff = (ByteBuffer)buffers.get(0) ;
+- int dataSize = buff.remaining() ;
+- int xferSize = dataSize ;
+- if (dataSize >= remaining) :
+- xferSize = remaining ;
+- buffers.remove(0) ;
+- }
+-
+- buff.get( buf, offset, xferSize ) ;
+-
+- offset += xferSize ;
+- remaining -= xferSize ;
+- }
+- }
+-
+- public void write(ByteBuffer byteBuffer)
+- throws IOException
+- {
+- buffers.add( byteBuffer ) ;
+- }
+-
+- /**
+- * Note:it is possible for this to be called more than once
+- */
+- public synchronized void close()
+- {
+- }
+-
+- public Acceptor getAcceptor()
+- {
+- return null;
+- }
+-
+- public ContactInfo getContactInfo()
+- {
+- return null;
+- }
+-
+- public EventHandler getEventHandler()
+- {
+- return this;
+- }
+-
+- public OutputObject createOutputObject(MessageMediator messageMediator)
+- {
+- // REVISIT - remove this method from Connection and all it subclasses.
+- throw new RuntimeException("*****SocketOrChannelConnectionImpl.createOutputObject - should not be called.");
+- }
+-
+- // This is used by the GIOPOutputObject in order to
+- // throw the correct error when handling code sets.
+- // Can we determine if we are on the server side by
+- // other means? XREVISIT
+- public boolean isServer()
+- {
+- return isServer;
+- }
+-
+- public boolean isBusy()
+- {
+- return false ;
+- }
+-
+- public long getTimeStamp()
+- {
+- return timeStamp;
+- }
+-
+- public void setTimeStamp(long time)
+- {
+- timeStamp = time;
+- }
+-
+- public void setState(String stateString)
+- {
+- synchronized (stateEvent) {
+- if (stateString.equals("ESTABLISHED")) {
+- state = ESTABLISHED;
+- stateEvent.notifyAll();
+- } else {
+- // REVISIT: ASSERT
+- }
+- }
+- }
+-
+- public void writeLock()
+- {
+- }
+-
+- public void writeUnlock()
+- {
+- }
+-
+- public void sendWithoutLock(OutputObject outputObject)
+- {
+- }
+-
+- public void registerWaiter(MessageMediator messageMediator)
+- {
+- }
+-
+- public void unregisterWaiter(MessageMediator messageMediator)
+- {
+- }
+-
+- public InputObject waitForResponse(MessageMediator messageMediator)
+- {
+- return null ;
+- }
+-
+- public void setConnectionCache(ConnectionCache connectionCache)
+- {
+- }
+-
+- public ConnectionCache getConnectionCache()
+- {
+- return null;
+- }
+-
+- ////////////////////////////////////////////////////
+- //
+- // EventHandler methods
+- //
+-
+- public SelectableChannel getChannel()
+- {
+- return null;
+- }
+-
+- public int getInterestOps()
+- {
+- return null;
+- }
+-
+- // public Acceptor getAcceptor() - already defined above.
+-
+- public Connection getConnection()
+- {
+- return this;
+- }
+-
+- ////////////////////////////////////////////////////
+- //
+- // Work methods.
+- //
+-
+- public String getName()
+- {
+- return this.toString();
+- }
+-
+- public void doWork()
+- {
+- }
+-
+- public void setEnqueueTime(long timeInMillis)
+- {
+- enqueueTime = timeInMillis;
+- }
+-
+- public long getEnqueueTime()
+- {
+- return enqueueTime;
+- }
+-
+- ////////////////////////////////////////////////////
+- //
+- // spi.transport.CorbaConnection.
+- //
+-
+- public ResponseWaitingRoom getResponseWaitingRoom()
+- {
+- return null ;
+- }
+-
+- // REVISIT - inteface defines isServer but already defined in
+- // higher interface.
+-
+-
+- public void serverRequestMapPut(int requestId,
+- CorbaMessageMediator messageMediator)
+- {
+- serverRequestMap.put(new Integer(requestId), messageMediator);
+- }
+-
+- public CorbaMessageMediator serverRequestMapGet(int requestId)
+- {
+- return (CorbaMessageMediator)
+- serverRequestMap.get(new Integer(requestId));
+- }
+-
+- public void serverRequestMapRemove(int requestId)
+- {
+- serverRequestMap.remove(new Integer(requestId));
+- }
+-
+-
+- // REVISIT: this is also defined in:
+- // com.sun.corba.se.spi.legacy.connection.Connection
+- public java.net.Socket getSocket()
+- {
+- return null;
+- }
+-
+- /** It is possible for a Close Connection to have been
+- ** sent here, but we will not check for this. A "lazy"
+- ** Exception will be thrown in the Worker thread after the
+- ** incoming request has been processed even though the connection
+- ** is closed before the request is processed. This is o.k because
+- ** it is a boundary condition. To prevent it we would have to add
+- ** more locks which would reduce performance in the normal case.
+- **/
+- public synchronized void serverRequestProcessingBegins()
+- {
+- serverRequestCount++;
+- }
+-
+- public synchronized void serverRequestProcessingEnds()
+- {
+- serverRequestCount--;
+- }
+-
+- //
+- //
+- //
+-
+- public synchronized int getNextRequestId()
+- {
+- return requestId++;
+- }
+-
+- // Negotiated code sets for char and wchar data
+- protected CodeSetComponentInfo.CodeSetContext codeSetContext = null;
+-
+- public ORB getBroker()
+- {
+- return orb;
+- }
+-
+- public CodeSetComponentInfo.CodeSetContext getCodeSetContext()
+- {
+- // Needs to be synchronized for the following case when the client
+- // doesn't send the code set context twice, and we have two threads
+- // in ServerRequestDispatcher processCodeSetContext.
+- //
+- // Thread A checks to see if there is a context, there is none, so
+- // it calls setCodeSetContext, getting the synch lock.
+- // Thread B checks to see if there is a context. If we didn't synch,
+- // it might decide to outlaw wchar/wstring.
+- if (codeSetContext == null) {
+- synchronized(this) {
+- return codeSetContext;
+- }
+- }
+-
+- return codeSetContext;
+- }
+-
+- public synchronized void setCodeSetContext(CodeSetComponentInfo.CodeSetContext csc) {
+- // Double check whether or not we need to do this
+- if (codeSetContext == null) {
+-
+- if (OSFCodeSetRegistry.lookupEntry(csc.getCharCodeSet()) == null ||
+- OSFCodeSetRegistry.lookupEntry(csc.getWCharCodeSet()) == null) {
+- // If the client says it's negotiated a code set that
+- // isn't a fallback and we never said we support, then
+- // it has a bug.
+- throw wrapper.badCodesetsFromClient() ;
+- }
+-
+- codeSetContext = csc;
+- }
+- }
+-
+- //
+- // from iiop.IIOPConnection.java
+- //
+-
+- // Map request ID to an InputObject.
+- // This is so the client thread can start unmarshaling
+- // the reply and remove it from the out_calls map while the
+- // ReaderThread can still obtain the input stream to give
+- // new fragments. Only the ReaderThread touches the clientReplyMap,
+- // so it doesn't incur synchronization overhead.
+-
+- public MessageMediator clientRequestMapGet(int requestId)
+- {
+- return null ;
+- }
+-
+- protected MessageMediator clientReply_1_1;
+-
+- public void clientReply_1_1_Put(MessageMediator x)
+- {
+- clientReply_1_1 = x;
+- }
+-
+- public MessageMediator clientReply_1_1_Get()
+- {
+- return clientReply_1_1;
+- }
+-
+- public void clientReply_1_1_Remove()
+- {
+- clientReply_1_1 = null;
+- }
+-
+- protected MessageMediator serverRequest_1_1;
+-
+- public void serverRequest_1_1_Put(MessageMediator x)
+- {
+- serverRequest_1_1 = x;
+- }
+-
+- public MessageMediator serverRequest_1_1_Get()
+- {
+- return serverRequest_1_1;
+- }
+-
+- public void serverRequest_1_1_Remove()
+- {
+- serverRequest_1_1 = null;
+- }
+-
+- protected String getStateString( int state )
+- {
+- synchronized ( stateEvent ){
+- switch (state) {
+- case OPENING : return "OPENING" ;
+- case ESTABLISHED : return "ESTABLISHED" ;
+- case CLOSE_SENT : return "CLOSE_SENT" ;
+- case CLOSE_RECVD : return "CLOSE_RECVD" ;
+- case ABORT : return "ABORT" ;
+- default : return "???" ;
+- }
+- }
+- }
+-
+- public synchronized boolean isPostInitialContexts() {
+- return postInitialContexts;
+- }
+-
+- // Can never be unset...
+- public synchronized void setPostInitialContexts(){
+- postInitialContexts = true;
+- }
+-
+- /**
+- * Wake up the outstanding requests on the connection, and hand them
+- * COMM_FAILURE exception with a given minor code.
+- *
+- * Also, delete connection from connection table and
+- * stop the reader thread.
+-
+- * Note that this should only ever be called by the Reader thread for
+- * this connection.
+- *
+- * @param minor_code The minor code for the COMM_FAILURE major code.
+- * @param die Kill the reader thread (this thread) before exiting.
+- */
+- public void purgeCalls(SystemException systemException,
+- boolean die, boolean lockHeld)
+- {
+- }
+-
+- /*************************************************************************
+- * The following methods are for dealing with Connection cleaning for
+- * better scalability of servers in high network load conditions.
+- **************************************************************************/
+-
+- public void sendCloseConnection(GIOPVersion giopVersion)
+- throws IOException
+- {
+- Message msg = MessageBase.createCloseConnection(giopVersion);
+- sendHelper(giopVersion, msg);
+- }
+-
+- public void sendMessageError(GIOPVersion giopVersion)
+- throws IOException
+- {
+- Message msg = MessageBase.createMessageError(giopVersion);
+- sendHelper(giopVersion, msg);
+- }
+-
+- /**
+- * Send a CancelRequest message. This does not lock the connection, so the
+- * caller needs to ensure this method is called appropriately.
+- * @exception IOException - could be due to abortive connection closure.
+- */
+- public void sendCancelRequest(GIOPVersion giopVersion, int requestId)
+- throws IOException
+- {
+-
+- Message msg = MessageBase.createCancelRequest(giopVersion, requestId);
+- sendHelper(giopVersion, msg);
+- }
+-
+- protected void sendHelper(GIOPVersion giopVersion, Message msg)
+- throws IOException
+- {
+- // REVISIT: See comments in CDROutputObject constructor.
+- CDROutputObject outputObject =
+- new CDROutputObject((ORB)orb, null, giopVersion, this, msg,
+- ORBConstants.STREAM_FORMAT_VERSION_1);
+- msg.write(outputObject);
+-
+- outputObject.writeTo(this);
+- }
+-
+- public void sendCancelRequestWithLock(GIOPVersion giopVersion,
+- int requestId)
+- throws IOException
+- {
+- writeLock();
+- try {
+- sendCancelRequest(giopVersion, requestId);
+- } finally {
+- writeUnlock();
+- }
+- }
+-
+- // Begin Code Base methods ---------------------------------------
+- //
+- // Set this connection's code base IOR. The IOR comes from the
+- // SendingContext. This is an optional service context, but all
+- // JavaSoft ORBs send it.
+- //
+- // The set and get methods don't need to be synchronized since the
+- // first possible get would occur during reading a valuetype, and
+- // that would be after the set.
+-
+- // Sets this connection's code base IOR. This is done after
+- // getting the IOR out of the SendingContext service context.
+- // Our ORBs always send this, but it's optional in CORBA.
+-
+- public final void setCodeBaseIOR(IOR ior) {
+- codeBaseServerIOR = ior;
+- }
+-
+- public final IOR getCodeBaseIOR() {
+- return codeBaseServerIOR;
+- }
+-
+- // Get a CodeBase stub to use in unmarshaling. The CachedCodeBase
+- // won't connect to the remote codebase unless it's necessary.
+- public final CodeBase getCodeBase() {
+- return cachedCodeBase;
+- }
+-
+- // End Code Base methods -----------------------------------------
+-
+- // Can be overridden in subclass for different options.
+- protected void setSocketOptions(Socket socket)
+- {
+- }
+-
+- public String toString()
+- {
+- synchronized ( stateEvent ){
+- return
+- "BufferConnectionImpl[" + " "
+- + getStateString( state ) + " "
+- + shouldUseSelectThreadToWait() + " "
+- + shouldUseWorkerThreadForEvent()
+- + "]" ;
+- }
+- }
+-
+- // Must be public - used in encoding.
+- public void dprint(String msg)
+- {
+- ORBUtility.dprint("SocketOrChannelConnectionImpl", msg);
+- }
+-
+- protected void dprint(String msg, Throwable t)
+- {
+- dprint(msg);
+- t.printStackTrace(System.out);
+- }
+-}
+-
+-// End of file.
+--- ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java Tue Mar 18 12:29:47 2014 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java Wed May 07 19:25:52 2014 -0700
+@@ -32,6 +32,7 @@
+ import java.net.ServerSocket;
+ import java.nio.channels.SocketChannel;
+ import java.nio.channels.ServerSocketChannel;
++import java.security.PrivilegedAction;
+
+ import com.sun.corba.se.pept.transport.Acceptor;
+
+@@ -44,6 +45,22 @@
+ implements ORBSocketFactory
+ {
+ private ORB orb;
++ private static final boolean keepAlive;
++
++ static {
++ keepAlive = java.security.AccessController.doPrivileged(
++ new PrivilegedAction<Boolean>() {
++ @Override
++ public Boolean run () {
++ String value =
++ System.getProperty("com.sun.CORBA.transport.enableTcpKeepAlive");
++ if (value != null)
++ return new Boolean(!"false".equalsIgnoreCase(value));
++
++ return Boolean.FALSE;
++ }
++ });
++ }
+
+ public void setORB(ORB orb)
+ {
+@@ -85,6 +102,9 @@
+ // Disable Nagle's algorithm (i.e., always send immediately).
+ socket.setTcpNoDelay(true);
+
++ if (keepAlive)
++ socket.setKeepAlive(true);
++
+ return socket;
+ }
+
+@@ -95,6 +115,8 @@
+ {
+ // Disable Nagle's algorithm (i.e., always send immediately).
+ socket.setTcpNoDelay(true);
++ if (keepAlive)
++ socket.setKeepAlive(true);
+ }
+ }
+
+--- ./hotspot/.hgtags Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/.hgtags Wed May 07 19:26:16 2014 -0700
+@@ -626,3 +626,35 @@
+ 49cada8e39b9215b9fd8b9183743f92625587cfc jdk7u55-b11
+ aadc864abd1ced3049bf59ce32786a07997ba190 jdk7u55-b12
+ b021fd817a0177b31d1e3d65127a27458e85801e jdk7u55-b13
++d27b468d5f3be3329ff1ff342f3347e6b2e0303b jdk7u55-b30
++dff9147a781672f20bb0577a94233264ea4a95d1 jdk7u55-b14
++8175599864880938d68d0a515fa561043d7d5fd0 jdk7u55-b31
++ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00
++af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
++cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01
++b7d44793cd267b22352c688b0185466741bb7a89 hs24.60-b02
++90cfd4ad3c9263886d876792d72cb24ac0e03a85 hs24.60-b03
++8fd0e931efa57d1579fb1bc8a68ba3924244b99e jdk7u60-b01
++99e96aaac8afc14ce6f9f3d92ef7004cf505b35d hs24.60-b04
++0025a2a965c8f21376278245c2493d8861386fba jdk7u60-b02
++fa59add77d1a8f601a695f137248462fdc68cc2f hs24.60-b05
++a59134ccb1b704b2cd05e157970d425af43e5437 hs24.60-b06
++2c971ed884cec0a9293ccff3def696da81823225 jdk7u60-b03
++1afbeb8cb558429156d432f35e7582716053a9cb hs24.60-b07
++05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u60-b04
++f52b5452d424545e3b101d808e6d7da763d6f0f3 hs24.60-b08
++462db155547e9bdd7ba26bead42808deb0b10d44 jdk7u60-b05
++0cc4550bd9c57ba3be343bfbfcaf46b9060d5e7d jdk7u60-b06
++2d053c4fd767155b2ac5e3e0a60b08a1bcc73cab jdk7u60-b07
++a198787e7b9bc7b831ad210b67732cdb2be9e46e jdk7u60-b08
++22cae361773d14b467328e8f90cf893550d1d610 jdk7u60-b09
++6f74afd8577eb4b6a0e6f7b25cfef7d6f7d92e5f jdk7u60-b10
++a2ac67a2c1cc867a8d6b525ab1df17204186e636 jdk7u60-b11
++cae50351dcece6e5bf215eabf958c5d669ffff1f jdk7u60-b12
++5853131ba4b448c5d89a3f0aa501fdf07f3b473c jdk7u60-b13
++b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14
++2871f345b7e5585e20dc7aa91035967fe774cfba jdk7u60-b15
++ec76bacbb5b90efc7988dee5345c656126b97561 jdk7u60-b16
++617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b18
++617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b17
++361493c7cdb5f75b28efc63389d6cebaaaa43a2c jdk7u60-b19
+--- ./hotspot/agent/src/os/linux/ps_core.c Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/agent/src/os/linux/ps_core.c Wed May 07 19:26:16 2014 -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
+@@ -700,29 +700,61 @@
+
+ // read segments of a shared object
+ static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* lib_ehdr, uintptr_t lib_base) {
+- int i = 0;
+- ELF_PHDR* phbuf;
+- ELF_PHDR* lib_php = NULL;
++ int i = 0;
++ ELF_PHDR* phbuf;
++ ELF_PHDR* lib_php = NULL;
+
+- if ((phbuf = read_program_header_table(lib_fd, lib_ehdr)) == NULL)
+- return false;
++ int page_size = sysconf(_SC_PAGE_SIZE);
+
+- // we want to process only PT_LOAD segments that are not writable.
+- // i.e., text segments. The read/write/exec (data) segments would
+- // have been already added from core file segments.
+- for (lib_php = phbuf, i = 0; i < lib_ehdr->e_phnum; i++) {
+- if ((lib_php->p_type == PT_LOAD) && !(lib_php->p_flags & PF_W) && (lib_php->p_filesz != 0)) {
+- if (add_map_info(ph, lib_fd, lib_php->p_offset, lib_php->p_vaddr + lib_base, lib_php->p_filesz) == NULL)
+- goto err;
++ if ((phbuf = read_program_header_table(lib_fd, lib_ehdr)) == NULL) {
++ return false;
++ }
++
++ // we want to process only PT_LOAD segments that are not writable.
++ // i.e., text segments. The read/write/exec (data) segments would
++ // have been already added from core file segments.
++ for (lib_php = phbuf, i = 0; i < lib_ehdr->e_phnum; i++) {
++ if ((lib_php->p_type == PT_LOAD) && !(lib_php->p_flags & PF_W) && (lib_php->p_filesz != 0)) {
++
++ uintptr_t target_vaddr = lib_php->p_vaddr + lib_base;
++ map_info *existing_map = core_lookup(ph, target_vaddr);
++
++ if (existing_map == NULL){
++ if (add_map_info(ph, lib_fd, lib_php->p_offset,
++ target_vaddr, lib_php->p_memsz) == NULL) {
++ goto err;
++ }
++ } else {
++ // Coredump stores value of p_memsz elf field
++ // rounded up to page boundary.
++
++ if ((existing_map->memsz != page_size) &&
++ (existing_map->fd != lib_fd) &&
++ (ROUNDUP(existing_map->memsz, page_size) != ROUNDUP(lib_php->p_memsz, page_size))) {
++
++ print_debug("address conflict @ 0x%lx (existing map size = %ld, size = %ld, flags = %d)\n",
++ target_vaddr, existing_map->memsz, lib_php->p_memsz, lib_php->p_flags);
++ goto err;
++ }
++
++ /* replace PT_LOAD segment with library segment */
++ print_debug("overwrote with new address mapping (memsz %ld -> %ld)\n",
++ existing_map->memsz, ROUNDUP(lib_php->p_memsz, page_size));
++
++ existing_map->fd = lib_fd;
++ existing_map->offset = lib_php->p_offset;
++ existing_map->memsz = ROUNDUP(lib_php->p_memsz, page_size);
+ }
+- lib_php++;
+- }
++ }
+
+- free(phbuf);
+- return true;
++ lib_php++;
++ }
++
++ free(phbuf);
++ return true;
+ err:
+- free(phbuf);
+- return false;
++ free(phbuf);
++ return false;
+ }
+
+ // process segments from interpreter (ld.so or ld-linux.so)
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2010, 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
+@@ -272,9 +272,10 @@
+ public static final int _fast_aldc = 229;
+ public static final int _fast_aldc_w = 230;
+ public static final int _return_register_finalizer = 231;
+- public static final int _shouldnotreachhere = 232; // For debugging
++ public static final int _invokehandle = 232;
++ public static final int _shouldnotreachhere = 233; // For debugging
+
+- public static final int number_of_codes = 233;
++ public static final int number_of_codes = 234;
+
+ // Flag bits derived from format strings, can_trap, can_rewrite, etc.:
+ // semantic flags:
+@@ -798,6 +799,9 @@
+
+ def(_return_register_finalizer, "return_register_finalizer", "b" , null , BasicType.getTVoid() , 0, true, _return );
+
++ def(_invokehandle , "invokehandle" , "bJJ" , null , BasicType.getTIllegal(), -1, true, _invokevirtual );
++
++
+ def(_fast_aldc , "fast_aldc" , "bj" , null , BasicType.getTObject(), 1, true, _ldc );
+ def(_fast_aldc_w , "fast_aldc_w" , "bJJ" , null , BasicType.getTObject(), 1, true, _ldc_w );
+
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -29,11 +29,10 @@
+ public static final int JVMTI_THREAD_STATE_ALIVE = 0x0001;
+ public static final int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
+ public static final int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
+- public static final int JVMTI_THREAD_STATE_WAITING = 0x0008;
++ public static final int JVMTI_THREAD_STATE_WAITING = 0x0080;
+ public static final int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
+ public static final int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
+ public static final int JVMTI_THREAD_STATE_SLEEPING = 0x0040;
+- public static final int JVMTI_THREAD_STATE_WAITING_FOR_NOTIFICATION = 0x0080;
+ public static final int JVMTI_THREAD_STATE_IN_OBJECT_WAIT = 0x0100;
+ public static final int JVMTI_THREAD_STATE_PARKED = 0x0200;
+ public static final int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java Wed May 07 19:26:16 2014 -0700
+@@ -32,7 +32,7 @@
+ // to the sys_thread_t structure of the classic JVM implementation.
+ public class OSThread extends VMObject {
+ private static JIntField interruptedField;
+- private static JIntField threadIdField;
++ private static Field threadIdField;
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+@@ -44,7 +44,7 @@
+ private static synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("OSThread");
+ interruptedField = type.getJIntField("_interrupted");
+- threadIdField = type.getJIntField("_thread_id");
++ threadIdField = type.getField("_thread_id");
+ }
+
+ public OSThread(Address addr) {
+@@ -56,7 +56,7 @@
+ }
+
+ public int threadId() {
+- return (int)threadIdField.getValue(addr);
++ return threadIdField.getJInt(addr);
+ }
+
+ }
+--- ./hotspot/make/bsd/makefiles/buildtree.make Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/make/bsd/makefiles/buildtree.make Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,6 @@
+ #
+ # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2013 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -59,7 +60,7 @@
+ # needs to be set here since this Makefile doesn't include defs.make
+ OS_VENDOR:=$(shell uname -s)
+
+--include $(SPEC)
++include $(GAMMADIR)/make/defs.make
+ include $(GAMMADIR)/make/scm.make
+ include $(GAMMADIR)/make/altsrc.make
+
+@@ -215,6 +216,7 @@
+ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
+ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+ echo "OPENJDK = $(OPENJDK)"; \
++ echo "ZERO_BUILD = $(ZERO_BUILD)"; \
+ echo; \
+ echo "# Used for platform dispatching"; \
+ echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
+--- ./hotspot/make/bsd/makefiles/gcc.make Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/make/bsd/makefiles/gcc.make Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,6 @@
+ #
+ # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2013 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -105,10 +106,10 @@
+ VM_PICFLAG/AOUT =
+ VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
+
+-ifeq ($(JVM_VARIANT_ZERO), true)
++ifeq ($(TYPE),ZERO)
+ CFLAGS += $(LIBFFI_CFLAGS)
+ endif
+-ifeq ($(JVM_VARIANT_ZEROSHARK), true)
++ifeq ($(TYPE),SHARK)
+ CFLAGS += $(LIBFFI_CFLAGS)
+ CFLAGS += $(LLVM_CFLAGS)
+ endif
+--- ./hotspot/make/bsd/makefiles/vm.make Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/make/bsd/makefiles/vm.make Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,6 @@
+ #
+ # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2013 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -42,7 +43,9 @@
+ -include $(DEP_DIR)/*.d
+
+ # read machine-specific adjustments (%%% should do this via buildtree.make?)
+-ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
++ifeq ($(TYPE),ZERO)
++ include $(MAKEFILES_DIR)/zeroshark.make
++else ifeq ($(TYPE),SHARK)
+ include $(MAKEFILES_DIR)/zeroshark.make
+ else
+ include $(MAKEFILES_DIR)/$(BUILDARCH).make
+@@ -271,10 +274,10 @@
+
+ LIBS_VM += $(LIBS)
+ endif
+-ifeq ($(JVM_VARIANT_ZERO), true)
++ifeq ($(TYPE),ZERO)
+ LIBS_VM += $(LIBFFI_LIBS)
+ endif
+-ifeq ($(JVM_VARIANT_ZEROSHARK), true)
++ifeq ($(TYPE),SHARK)
+ LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS)
+ LFLAGS_VM += $(LLVM_LDFLAGS)
+ endif
+--- ./hotspot/make/hotspot_version Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/make/hotspot_version Wed May 07 19:26:16 2014 -0700
+@@ -34,8 +34,8 @@
+ HOTSPOT_VM_COPYRIGHT=Copyright 2014
+
+ HS_MAJOR_VER=24
+-HS_MINOR_VER=55
+-HS_BUILD_NUMBER=03
++HS_MINOR_VER=60
++HS_BUILD_NUMBER=09
+
+ JDK_MAJOR_VER=1
+ JDK_MINOR_VER=7
+--- ./hotspot/make/linux/makefiles/buildtree.make Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/make/linux/makefiles/buildtree.make Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,6 @@
+ #
+ # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2013 Red Hat, Inc.
+ # 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,7 +57,7 @@
+ # The makefiles are split this way so that "make foo" will run faster by not
+ # having to read the dependency files for the vm.
+
+--include $(SPEC)
++include $(GAMMADIR)/make/defs.make
+ include $(GAMMADIR)/make/scm.make
+ include $(GAMMADIR)/make/altsrc.make
+
+@@ -208,6 +209,7 @@
+ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
+ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+ echo "OPENJDK = $(OPENJDK)"; \
++ echo "ZERO_BUILD = $(ZERO_BUILD)"; \
+ echo; \
+ echo "# Used for platform dispatching"; \
+ echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
+--- ./hotspot/make/linux/makefiles/gcc.make Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/make/linux/makefiles/gcc.make Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,6 @@
+ #
+ # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2013 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -72,10 +73,10 @@
+ VM_PICFLAG/AOUT =
+ VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
+
+-ifeq ($(JVM_VARIANT_ZERO), true)
++ifeq ($(TYPE),ZERO)
+ CFLAGS += $(LIBFFI_CFLAGS)
+ endif
+-ifeq ($(JVM_VARIANT_ZEROSHARK), true)
++ifeq ($(TYPE),SHARK)
+ CFLAGS += $(LIBFFI_CFLAGS)
+ CFLAGS += $(LLVM_CFLAGS)
+ endif
+--- ./hotspot/make/linux/makefiles/vm.make Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/make/linux/makefiles/vm.make Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,6 @@
+ #
+ # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2013 Red Hat, Inc.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -42,7 +43,9 @@
+ -include $(DEP_DIR)/*.d
+
+ # read machine-specific adjustments (%%% should do this via buildtree.make?)
+-ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
++ifeq ($(TYPE),ZERO)
++ include $(MAKEFILES_DIR)/zeroshark.make
++else ifeq ($(TYPE),SHARK)
+ include $(MAKEFILES_DIR)/zeroshark.make
+ else
+ include $(MAKEFILES_DIR)/$(BUILDARCH).make
+@@ -244,7 +247,7 @@
+ vm.def: $(Res_Files) $(Obj_Files)
+ sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
+
+-ifeq ($(JVM_VARIANT_ZEROSHARK), true)
++ifeq ($(TYPE),SHARK)
+ STATIC_CXX = false
+ else
+ ifeq ($(ZERO_LIBARCH), ppc64)
+@@ -276,10 +279,10 @@
+
+ LIBS_VM += $(LIBS)
+ endif
+-ifeq ($(JVM_VARIANT_ZERO), true)
++ifeq ($(TYPE),ZERO)
+ LIBS_VM += $(LIBFFI_LIBS)
+ endif
+-ifeq ($(JVM_VARIANT_ZEROSHARK), true)
++ifeq ($(TYPE),SHARK)
+ LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS)
+ LFLAGS_VM += $(LLVM_LDFLAGS)
+ endif
+--- ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp Wed May 07 19:26:16 2014 -0700
+@@ -4512,7 +4512,7 @@
+ #define __ masm.
+ address start = __ pc();
+
+- Label not_already_dirty, restart, refill;
++ Label not_already_dirty, restart, refill, young_card;
+
+ #ifdef _LP64
+ __ srlx(O0, CardTableModRefBS::card_shift, O0);
+@@ -4523,9 +4523,15 @@
+ __ set(addrlit, O1); // O1 := <card table base>
+ __ ldub(O0, O1, O2); // O2 := [O0 + O1]
+
++ __ cmp_and_br_short(O2, G1SATBCardTableModRefBS::g1_young_card_val(), Assembler::equal, Assembler::pt, young_card);
++
++ __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
++ __ ldub(O0, O1, O2); // O2 := [O0 + O1]
++
+ assert(CardTableModRefBS::dirty_card_val() == 0, "otherwise check this code");
+ __ cmp_and_br_short(O2, G0, Assembler::notEqual, Assembler::pt, not_already_dirty);
+
++ __ bind(young_card);
+ // We didn't take the branch, so we're already dirty: return.
+ // Use return-from-leaf
+ __ retl();
+--- ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Wed May 07 19:26:16 2014 -0700
+@@ -36,6 +36,9 @@
+ #include "runtime/signature.hpp"
+ #include "runtime/vframeArray.hpp"
+ #include "vmreg_sparc.inline.hpp"
++#ifndef SERIALGC
++#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
++#endif
+
+ // Implementation of StubAssembler
+
+@@ -898,7 +901,7 @@
+ Register tmp2 = G3_scratch;
+ jbyte* byte_map_base = ((CardTableModRefBS*)bs)->byte_map_base;
+
+- Label not_already_dirty, restart, refill;
++ Label not_already_dirty, restart, refill, young_card;
+
+ #ifdef _LP64
+ __ srlx(addr, CardTableModRefBS::card_shift, addr);
+@@ -910,9 +913,15 @@
+ __ set(rs, cardtable); // cardtable := <card table base>
+ __ ldub(addr, cardtable, tmp); // tmp := [addr + cardtable]
+
++ __ cmp_and_br_short(tmp, G1SATBCardTableModRefBS::g1_young_card_val(), Assembler::equal, Assembler::pt, young_card);
++
++ __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
++ __ ldub(addr, cardtable, tmp); // tmp := [addr + cardtable]
++
+ assert(CardTableModRefBS::dirty_card_val() == 0, "otherwise check this code");
+ __ cmp_and_br_short(tmp, G0, Assembler::notEqual, Assembler::pt, not_already_dirty);
+
++ __ bind(young_card);
+ // We didn't take the branch, so we're already dirty: return.
+ // Use return-from-leaf
+ __ retl();
+--- ./hotspot/src/cpu/sparc/vm/sparc.ad Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/sparc.ad Wed May 07 19:26:16 2014 -0700
+@@ -3399,8 +3399,8 @@
+ interface(CONST_INTER);
+ %}
+
+-// Unsigned (positive) Integer Immediate: 13-bit
+-operand immU13() %{
++// Unsigned Integer Immediate: 12-bit (non-negative that fits in simm13)
++operand immU12() %{
+ predicate((0 <= n->get_int()) && Assembler::is_simm13(n->get_int()));
+ match(ConI);
+ op_cost(0);
+@@ -3436,6 +3436,17 @@
+ interface(CONST_INTER);
+ %}
+
++// Int Immediate non-negative
++operand immU31()
++%{
++ predicate(n->get_int() >= 0);
++ match(ConI);
++
++ op_cost(0);
++ format %{ %}
++ interface(CONST_INTER);
++%}
++
+ // Integer Immediate: 0-bit
+ operand immI0() %{
+ predicate(n->get_int() == 0);
+@@ -5732,7 +5743,6 @@
+ effect(TEMP dst, TEMP tmp);
+ ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST);
+
+- size((3+1)*4); // set may use two instructions.
+ format %{ "LDUH $mem,$dst\t! ushort/char & 16-bit mask -> long\n\t"
+ "SET $mask,$tmp\n\t"
+ "AND $dst,$tmp,$dst" %}
+@@ -5854,13 +5864,13 @@
+ ins_pipe(iload_mem);
+ %}
+
+-// Load Integer with a 13-bit mask into a Long Register
+-instruct loadI2L_immI13(iRegL dst, memory mem, immI13 mask) %{
++// Load Integer with a 12-bit mask into a Long Register
++instruct loadI2L_immU12(iRegL dst, memory mem, immU12 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ ins_cost(MEMORY_REF_COST + DEFAULT_COST);
+
+ size(2*4);
+- format %{ "LDUW $mem,$dst\t! int & 13-bit mask -> long\n\t"
++ format %{ "LDUW $mem,$dst\t! int & 12-bit mask -> long\n\t"
+ "AND $dst,$mask,$dst" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+@@ -5870,14 +5880,13 @@
+ ins_pipe(iload_mem);
+ %}
+
+-// Load Integer with a 32-bit mask into a Long Register
+-instruct loadI2L_immI(iRegL dst, memory mem, immI mask, iRegL tmp) %{
++// Load Integer with a 31-bit mask into a Long Register
++instruct loadI2L_immU31(iRegL dst, memory mem, immU31 mask, iRegL tmp) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ effect(TEMP dst, TEMP tmp);
+ ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST);
+
+- size((3+1)*4); // set may use two instructions.
+- format %{ "LDUW $mem,$dst\t! int & 32-bit mask -> long\n\t"
++ format %{ "LDUW $mem,$dst\t! int & 31-bit mask -> long\n\t"
+ "SET $mask,$tmp\n\t"
+ "AND $dst,$tmp,$dst" %}
+ ins_encode %{
+@@ -8919,7 +8928,7 @@
+ ins_pipe(ialu_cconly_reg_reg);
+ %}
+
+-instruct compU_iReg_imm13(flagsRegU icc, iRegI op1, immU13 op2 ) %{
++instruct compU_iReg_imm13(flagsRegU icc, iRegI op1, immU12 op2 ) %{
+ match(Set icc (CmpU op1 op2));
+
+ size(4);
+--- ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Wed May 07 19:26:16 2014 -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
+@@ -1873,6 +1873,25 @@
+ if (ProfileInterpreter) {
+ __ set_method_data_pointer_for_bcp();
+ }
++
++ if (EnableInvokeDynamic) {
++ Label L_done;
++
++ __ ldub(Address(Lbcp, 0), G1_scratch); // Load current bytecode
++ __ cmp_and_br_short(G1_scratch, Bytecodes::_invokestatic, Assembler::notEqual, Assembler::pn, L_done);
++
++ // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call.
++ // Detect such a case in the InterpreterRuntime function and return the member name argument, or NULL.
++
++ __ call_VM(G1_scratch, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null), I0, Lmethod, Lbcp);
++
++ __ br_null(G1_scratch, false, Assembler::pn, L_done);
++ __ delayed()->nop();
++
++ __ st_ptr(G1_scratch, Lesp, wordSize);
++ __ bind(L_done);
++ }
++
+ // Resume bytecode interpretation at the current bcp
+ __ dispatch_next(vtos);
+ // end of JVMTI PopFrame support
+--- ./hotspot/src/cpu/x86/vm/assembler_x86.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/assembler_x86.cpp Wed May 07 19:26:16 2014 -0700
+@@ -8754,13 +8754,18 @@
+ const Register card_addr = tmp;
+ lea(card_addr, as_Address(ArrayAddress(cardtable, index)));
+ #endif
+- cmpb(Address(card_addr, 0), 0);
++ cmpb(Address(card_addr, 0), (int)G1SATBCardTableModRefBS::g1_young_card_val());
+ jcc(Assembler::equal, done);
+
++ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
++ cmpb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
++ jcc(Assembler::equal, done);
++
++
+ // storing a region crossing, non-NULL oop, card is clean.
+ // dirty card and log.
+
+- movb(Address(card_addr, 0), 0);
++ movb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
+
+ cmpl(queue_index, 0);
+ jcc(Assembler::equal, runtime);
+--- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1686,14 +1686,6 @@
+ }
+
+ assert_different_registers(obj, k_RInfo, klass_RInfo);
+- if (!k->is_loaded()) {
+- jobject2reg_with_patching(k_RInfo, op->info_for_patch());
+- } else {
+-#ifdef _LP64
+- __ movoop(k_RInfo, k->constant_encoding());
+-#endif // _LP64
+- }
+- assert(obj != k_RInfo, "must be different");
+
+ __ cmpptr(obj, (int32_t)NULL_WORD);
+ if (op->should_profile()) {
+@@ -1710,6 +1702,14 @@
+ } else {
+ __ jcc(Assembler::equal, *obj_is_null);
+ }
++
++ if (!k->is_loaded()) {
++ jobject2reg_with_patching(k_RInfo, op->info_for_patch());
++ } else {
++#ifdef _LP64
++ __ movoop(k_RInfo, k->constant_encoding());
++#endif // _LP64
++ }
+ __ verify_oop(obj);
+
+ if (op->fast_check()) {
+--- ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1395,19 +1395,18 @@
+ addr = new LIR_Address(src.result(), offset, type);
+ }
+
+- if (data != dst) {
+- __ move(data, dst);
+- data = dst;
+- }
++ // Because we want a 2-arg form of xchg and xadd
++ __ move(data, dst);
++
+ if (x->is_add()) {
+- __ xadd(LIR_OprFact::address(addr), data, dst, LIR_OprFact::illegalOpr);
++ __ xadd(LIR_OprFact::address(addr), dst, dst, LIR_OprFact::illegalOpr);
+ } else {
+ if (is_obj) {
+ // Do the pre-write barrier, if any.
+ pre_barrier(LIR_OprFact::address(addr), LIR_OprFact::illegalOpr /* pre_val */,
+ true /* do_load */, false /* patch */, NULL);
+ }
+- __ xchg(LIR_OprFact::address(addr), data, dst, LIR_OprFact::illegalOpr);
++ __ xchg(LIR_OprFact::address(addr), dst, dst, LIR_OprFact::illegalOpr);
+ if (is_obj) {
+ // Seems to be a precise address
+ post_barrier(LIR_OprFact::address(addr), data);
+--- ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp Wed May 07 19:26:16 2014 -0700
+@@ -37,6 +37,9 @@
+ #include "runtime/signature.hpp"
+ #include "runtime/vframeArray.hpp"
+ #include "vmreg_x86.inline.hpp"
++#ifndef SERIALGC
++#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
++#endif
+
+
+ // Implementation of StubAssembler
+@@ -1743,13 +1746,17 @@
+ __ leal(card_addr, __ as_Address(ArrayAddress(cardtable, index)));
+ #endif
+
+- __ cmpb(Address(card_addr, 0), 0);
++ __ cmpb(Address(card_addr, 0), (int)G1SATBCardTableModRefBS::g1_young_card_val());
++ __ jcc(Assembler::equal, done);
++
++ __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
++ __ cmpb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
+ __ jcc(Assembler::equal, done);
+
+ // storing region crossing non-NULL, card is clean.
+ // dirty card and log.
+
+- __ movb(Address(card_addr, 0), 0);
++ __ movb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
+
+ __ cmpl(queue_index, 0);
+ __ jcc(Assembler::equal, runtime);
+--- ./hotspot/src/cpu/x86/vm/frame_x86.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/frame_x86.cpp Wed May 07 19:26:16 2014 -0700
+@@ -94,12 +94,6 @@
+ // other generic buffer blobs are more problematic so we just assume they are
+ // ok. adapter blobs never have a frame complete and are never ok.
+
+- // check for a valid frame_size, otherwise we are unlikely to get a valid sender_pc
+-
+- if (!Interpreter::contains(_pc) && _cb->frame_size() <= 0) {
+- return false;
+- }
+-
+ if (!_cb->is_frame_complete_at(_pc)) {
+ if (_cb->is_nmethod() || _cb->is_adapter_blob() || _cb->is_runtime_stub()) {
+ return false;
+@@ -139,6 +133,11 @@
+ // must be some sort of compiled/runtime frame
+ // fp does not have to be safe (although it could be check for c1?)
+
++ // check for a valid frame_size, otherwise we are unlikely to get a valid sender_pc
++ if (_cb->frame_size() <= 0) {
++ return false;
++ }
++
+ sender_sp = _unextended_sp + _cb->frame_size();
+ // On Intel the return_address is always the word on the stack
+ sender_pc = (address) *(sender_sp-1);
+--- ./hotspot/src/cpu/x86/vm/globals_x86.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp Wed May 07 19:26:16 2014 -0700
+@@ -62,7 +62,7 @@
+ // due to lack of optimization caused by C++ compiler bugs
+ define_pd_global(intx, StackShadowPages, NOT_WIN64(20) WIN64_ONLY(6) DEBUG_ONLY(+2));
+ #else
+-define_pd_global(intx, StackShadowPages, 4 DEBUG_ONLY(+5));
++define_pd_global(intx, StackShadowPages, 6 DEBUG_ONLY(+5));
+ #endif // AMD64
+
+ define_pd_global(intx, PreInflateSpin, 10);
+--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Wed May 07 19:26:16 2014 -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
+@@ -1789,6 +1789,27 @@
+ __ get_thread(thread);
+ __ movl(Address(thread, JavaThread::popframe_condition_offset()), JavaThread::popframe_inactive);
+
++ if (EnableInvokeDynamic) {
++ Label L_done;
++ const Register local0 = rdi;
++
++ __ cmpb(Address(rsi, 0), Bytecodes::_invokestatic);
++ __ jcc(Assembler::notEqual, L_done);
++
++ // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call.
++ // Detect such a case in the InterpreterRuntime function and return the member name argument, or NULL.
++
++ __ get_method(rdx);
++ __ movptr(rax, Address(local0, 0));
++ __ call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null), rax, rdx, rsi);
++
++ __ testptr(rax, rax);
++ __ jcc(Assembler::zero, L_done);
++
++ __ movptr(Address(rbx, 0), rax);
++ __ bind(L_done);
++ }
++
+ __ dispatch_next(vtos);
+ // end of PopFrame support
+
+--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -1815,6 +1815,27 @@
+ __ movl(Address(r15_thread, JavaThread::popframe_condition_offset()),
+ JavaThread::popframe_inactive);
+
++ if (EnableInvokeDynamic) {
++ Label L_done;
++ const Register local0 = r14;
++
++ __ cmpb(Address(r13, 0), Bytecodes::_invokestatic);
++ __ jcc(Assembler::notEqual, L_done);
++
++ // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call.
++ // Detect such a case in the InterpreterRuntime function and return the member name argument, or NULL.
++
++ __ get_method(rdx);
++ __ movptr(rax, Address(local0, 0));
++ __ call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null), rax, rdx, r13);
++
++ __ testptr(rax, rax);
++ __ jcc(Assembler::zero, L_done);
++
++ __ movptr(Address(rbx, 0), rax);
++ __ bind(L_done);
++ }
++
+ __ dispatch_next(vtos);
+ // end of PopFrame support
+
+--- ./hotspot/src/cpu/x86/vm/x86_32.ad Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/x86_32.ad Wed May 07 19:26:16 2014 -0700
+@@ -3919,6 +3919,17 @@
+ interface(CONST_INTER);
+ %}
+
++// Int Immediate non-negative
++operand immU31()
++%{
++ predicate(n->get_int() >= 0);
++ match(ConI);
++
++ op_cost(0);
++ format %{ %}
++ interface(CONST_INTER);
++%}
++
+ // Constant for long shifts
+ operand immI_32() %{
+ predicate( n->get_int() == 32 );
+@@ -6135,12 +6146,12 @@
+ ins_pipe(ialu_reg_mem);
+ %}
+
+-// Load Integer with 32-bit mask into Long Register
+-instruct loadI2L_immI(eRegL dst, memory mem, immI mask, eFlagsReg cr) %{
++// Load Integer with 31-bit mask into Long Register
++instruct loadI2L_immU31(eRegL dst, memory mem, immU31 mask, eFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ effect(KILL cr);
+
+- format %{ "MOV $dst.lo,$mem\t# int & 32-bit mask -> long\n\t"
++ format %{ "MOV $dst.lo,$mem\t# int & 31-bit mask -> long\n\t"
+ "XOR $dst.hi,$dst.hi\n\t"
+ "AND $dst.lo,$mask" %}
+ ins_encode %{
+--- ./hotspot/src/cpu/x86/vm/x86_64.ad Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/x86/vm/x86_64.ad Wed May 07 19:26:16 2014 -0700
+@@ -3142,6 +3142,17 @@
+ interface(CONST_INTER);
+ %}
+
++// Int Immediate non-negative
++operand immU31()
++%{
++ predicate(n->get_int() >= 0);
++ match(ConI);
++
++ op_cost(0);
++ format %{ %}
++ interface(CONST_INTER);
++%}
++
+ // Constant for long shifts
+ operand immI_32()
+ %{
+@@ -5083,12 +5094,12 @@
+ ins_pipe(ialu_reg_mem);
+ %}
+
+-// Load Integer with a 32-bit mask into Long Register
+-instruct loadI2L_immI(rRegL dst, memory mem, immI mask, rFlagsReg cr) %{
++// Load Integer with a 31-bit mask into Long Register
++instruct loadI2L_immU31(rRegL dst, memory mem, immU31 mask, rFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ effect(KILL cr);
+
+- format %{ "movl $dst, $mem\t# int & 32-bit mask -> long\n\t"
++ format %{ "movl $dst, $mem\t# int & 31-bit mask -> long\n\t"
+ "andl $dst, $mask" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+--- ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2008, 2010 Red Hat, Inc.
++ * Copyright (c) 2013 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -58,8 +58,8 @@
+ JavaCallWrapper* call_wrapper,
+ TRAPS);
+ public:
+- JavaCallWrapper *call_wrapper() const {
+- return (JavaCallWrapper *) value_of_word(call_wrapper_off);
++ JavaCallWrapper **call_wrapper() const {
++ return (JavaCallWrapper **) addr_of_word(call_wrapper_off);
+ }
+
+ public:
+--- ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2007, 2013, Red Hat, Inc.
++ * Copyright (c) 2013 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -132,7 +132,7 @@
+ return fp();
+ }
+
+-inline JavaCallWrapper* frame::entry_frame_call_wrapper() const {
++inline JavaCallWrapper** frame::entry_frame_call_wrapper_addr() const {
+ return zero_entryframe()->call_wrapper();
+ }
+
+--- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp Wed May 07 19:26:16 2014 -0700
+@@ -460,14 +460,14 @@
+
+ void AttachListener::vm_start() {
+ char fn[UNIX_PATH_MAX];
+- struct stat64 st;
++ struct stat st;
+ int ret;
+
+ int n = snprintf(fn, UNIX_PATH_MAX, "%s/.java_pid%d",
+ os::get_temp_directory(), os::current_process_id());
+ assert(n < (int)UNIX_PATH_MAX, "java_pid file name buffer overflow");
+
+- RESTARTABLE(::stat64(fn, &st), ret);
++ RESTARTABLE(::stat(fn, &st), ret);
+ if (ret == 0) {
+ ret = ::unlink(fn);
+ if (ret == -1) {
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1582,10 +1582,10 @@
+ return (1000 * 1000);
+ }
+
+-// XXX: For now, code this as if BSD does not support vtime.
+-bool os::supports_vtime() { return false; }
++bool os::supports_vtime() { return true; }
+ bool os::enable_vtime() { return false; }
+ bool os::vtime_enabled() { return false; }
++
+ double os::elapsedVTime() {
+ // better than nothing, but not much
+ return elapsedTime();
+@@ -3434,7 +3434,9 @@
+ #endif
+ #endif
+
+-char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
++char* os::reserve_memory_special(size_t bytes, size_t alignment, char* req_addr, bool exec) {
++ fatal("This code is not used or maintained.");
++
+ // "exec" is passed in but not used. Creating the shared image for
+ // the code cache doesn't have an SHM_X executable permission to check.
+ assert(UseLargePages && UseSHM, "only for SHM large pages");
+@@ -6105,3 +6107,9 @@
+ return n;
+ }
+
++#ifndef PRODUCT
++void TestReserveMemorySpecial_test() {
++ // No tests available for this platform
++}
++#endif
++
+--- ./hotspot/src/os/linux/vm/globals_linux.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os/linux/vm/globals_linux.hpp Wed May 07 19:26:16 2014 -0700
+@@ -40,6 +40,9 @@
+ product(bool, UseHugeTLBFS, false, \
+ "Use MAP_HUGETLB for large pages") \
+ \
++ product(bool, UseTransparentHugePages, false, \
++ "Use MADV_HUGEPAGE for large pages") \
++ \
+ product(bool, LoadExecStackDllInVMThread, true, \
+ "Load DLLs with executable-stack attribute in the VM Thread") \
+ \
+@@ -50,7 +53,7 @@
+ // Defines Linux-specific default values. The flags are available on all
+ // platforms, but they may have different default values on other platforms.
+ //
+-define_pd_global(bool, UseLargePages, true);
++define_pd_global(bool, UseLargePages, false);
+ define_pd_global(bool, UseLargePagesIndividualAllocation, false);
+ define_pd_global(bool, UseOSErrorReporting, false);
+ define_pd_global(bool, UseThreadPriorities, true) ;
+--- ./hotspot/src/os/linux/vm/jsig.c Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os/linux/vm/jsig.c Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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
+@@ -107,7 +107,7 @@
+
+ signal_lock();
+
+- sigused = (MASK(sig) & jvmsigs) != 0;
++ sigused = (sig < MAXSIGNUM) && ((MASK(sig) & jvmsigs) != 0);
+ if (jvm_signal_installed && sigused) {
+ /* jvm has installed its signal handler for this signal. */
+ /* Save the handler. Don't really install it. */
+@@ -116,7 +116,7 @@
+
+ signal_unlock();
+ return oldhandler;
+- } else if (jvm_signal_installing) {
++ } else if (sig < MAXSIGNUM && jvm_signal_installing) {
+ /* jvm is installing its signal handlers. Install the new
+ * handlers and save the old ones. jvm uses sigaction().
+ * Leave the piece here just in case. */
+@@ -165,7 +165,7 @@
+
+ signal_lock();
+
+- sigused = (MASK(sig) & jvmsigs) != 0;
++ sigused = (sig < MAXSIGNUM) && ((MASK(sig) & jvmsigs) != 0);
+ if (jvm_signal_installed && sigused) {
+ /* jvm has installed its signal handler for this signal. */
+ /* Save the handler. Don't really install it. */
+@@ -178,7 +178,7 @@
+
+ signal_unlock();
+ return 0;
+- } else if (jvm_signal_installing) {
++ } else if (sig < MAXSIGNUM && jvm_signal_installing) {
+ /* jvm is installing its signal handlers. Install the new
+ * handlers and save the old ones. */
+ res = call_os_sigaction(sig, act, &oldAct);
+--- ./hotspot/src/os/linux/vm/os_linux.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os/linux/vm/os_linux.cpp Wed May 07 19:26:16 2014 -0700
+@@ -120,8 +120,16 @@
+ # include <inttypes.h>
+ # include <sys/ioctl.h>
+
++// if RUSAGE_THREAD for getrusage() has not been defined, do it here. The code calling
++// getrusage() is prepared to handle the associated failure.
++#ifndef RUSAGE_THREAD
++#define RUSAGE_THREAD (1) /* only the calling thread */
++#endif
++
+ #define MAX_PATH (2 * K)
+
++#define MAX_SECS 100000000
++
+ // for timer info max values which include all bits
+ #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
+
+@@ -144,6 +152,7 @@
+ bool os::Linux::_supports_fast_thread_cpu_time = false;
+ const char * os::Linux::_glibc_version = NULL;
+ const char * os::Linux::_libpthread_version = NULL;
++pthread_condattr_t os::Linux::_condattr[1];
+
+ static jlong initial_time_count=0;
+
+@@ -1377,15 +1386,19 @@
+ return (1000 * 1000);
+ }
+
+-// For now, we say that linux does not support vtime. I have no idea
+-// whether it can actually be made to (DLD, 9/13/05).
+-
+-bool os::supports_vtime() { return false; }
++bool os::supports_vtime() { return true; }
+ bool os::enable_vtime() { return false; }
+ bool os::vtime_enabled() { return false; }
++
+ double os::elapsedVTime() {
+- // better than nothing, but not much
+- return elapsedTime();
++ struct rusage usage;
++ int retval = getrusage(RUSAGE_THREAD, &usage);
++ if (retval == 0) {
++ return (double) (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) + (double) (usage.ru_utime.tv_usec + usage.ru_stime.tv_usec) / (1000 * 1000);
++ } else {
++ // better than nothing, but not much
++ return elapsedTime();
++ }
+ }
+
+ jlong os::javaTimeMillis() {
+@@ -1427,12 +1440,15 @@
+ clock_gettime_func(CLOCK_MONOTONIC, &tp) == 0) {
+ // yes, monotonic clock is supported
+ _clock_gettime = clock_gettime_func;
++ return;
+ } else {
+ // close librt if there is no monotonic clock
+ dlclose(handle);
+ }
+ }
+ }
++ warning("No monotonic clock was available - timed services may " \
++ "be adversely affected if the time-of-day clock changes");
+ }
+
+ #ifndef SYS_clock_getres
+@@ -2468,7 +2484,6 @@
+ sem_t _semaphore;
+ };
+
+-
+ Semaphore::Semaphore() {
+ sem_init(&_semaphore, 0, 0);
+ }
+@@ -2490,8 +2505,22 @@
+ }
+
+ bool Semaphore::timedwait(unsigned int sec, int nsec) {
++
+ struct timespec ts;
+- unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec);
++ // Semaphore's are always associated with CLOCK_REALTIME
++ os::Linux::clock_gettime(CLOCK_REALTIME, &ts);
++ // see unpackTime for discussion on overflow checking
++ if (sec >= MAX_SECS) {
++ ts.tv_sec += MAX_SECS;
++ ts.tv_nsec = 0;
++ } else {
++ ts.tv_sec += sec;
++ ts.tv_nsec += nsec;
++ if (ts.tv_nsec >= NANOSECS_PER_SEC) {
++ ts.tv_nsec -= NANOSECS_PER_SEC;
++ ++ts.tv_sec; // note: this must be <= max_secs
++ }
++ }
+
+ while (1) {
+ int result = sem_timedwait(&_semaphore, &ts);
+@@ -2696,14 +2725,6 @@
+ alignment_hint, exec, strerror(err), err);
+ }
+
+-static void warn_fail_commit_memory(char* addr, size_t size,
+- size_t alignment_hint, bool exec,
+- int err, const char* msg) {
+- warning("INFO: os::commit_memory(" PTR_FORMAT ", " SIZE_FORMAT
+- ", " SIZE_FORMAT ", %d) failed; error='%s' (errno=%d); %s", addr, size,
+- alignment_hint, exec, strerror(err), err, msg);
+-}
+-
+ // NOTE: Linux kernel does not really reserve the pages for us.
+ // All it does is to check if there are enough free pages
+ // left at the time of mmap(). This could be a potential
+@@ -2754,41 +2775,9 @@
+ #define MADV_HUGEPAGE 14
+ #endif
+
+-volatile jint os::Linux::num_largepage_commit_fails = 0;
+-
+ int os::Linux::commit_memory_impl(char* addr, size_t size,
+ size_t alignment_hint, bool exec) {
+- int err;
+- if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
+- int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
+- uintptr_t res =
+- (uintptr_t) ::mmap(addr, size, prot,
+- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB,
+- -1, 0);
+- if (res != (uintptr_t) MAP_FAILED) {
+- if (UseNUMAInterleaving) {
+- numa_make_global(addr, size);
+- }
+- return 0;
+- }
+-
+- err = errno; // save errno from mmap() call above
+-
+- if (!recoverable_mmap_error(err)) {
+- // However, it is not clear that this loss of our reserved mapping
+- // happens with large pages on Linux or that we cannot recover
+- // from the loss. For now, we just issue a warning and we don't
+- // call vm_exit_out_of_memory(). This issue is being tracked by
+- // JBS-8007074.
+- Atomic::inc(&os::Linux::num_largepage_commit_fails);
+- warn_fail_commit_memory(addr, size, alignment_hint, exec, err,
+- "Cannot allocate large pages, falling back to regular pages");
+-// vm_exit_out_of_memory(size, "committing reserved memory.");
+- }
+- // Fall through and try to use small pages
+- }
+-
+- err = os::Linux::commit_memory_impl(addr, size, exec);
++ int err = os::Linux::commit_memory_impl(addr, size, exec);
+ if (err == 0) {
+ realign_memory(addr, size, alignment_hint);
+ }
+@@ -2813,7 +2802,7 @@
+ }
+
+ void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
+- if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
++ if (UseTransparentHugePages && alignment_hint > (size_t)vm_page_size()) {
+ // We don't check the return value: madvise(MADV_HUGEPAGE) may not
+ // be supported or the memory may already be backed by huge pages.
+ ::madvise(addr, bytes, MADV_HUGEPAGE);
+@@ -2826,7 +2815,7 @@
+ // uncommitted at all. We don't do anything in this case to avoid creating a segment with
+ // small pages on top of the SHM segment. This method always works for small pages, so we
+ // allow that in any case.
+- if (alignment_hint <= (size_t)os::vm_page_size() || !UseSHM) {
++ if (alignment_hint <= (size_t)os::vm_page_size() || can_commit_large_page_memory()) {
+ commit_memory(addr, bytes, alignment_hint, !ExecMem);
+ }
+ }
+@@ -3195,11 +3184,31 @@
+ return linux_mprotect(addr, size, PROT_READ|PROT_WRITE);
+ }
+
++bool os::Linux::transparent_huge_pages_sanity_check(bool warn, size_t page_size) {
++ bool result = false;
++ void *p = mmap(NULL, page_size * 2, PROT_READ|PROT_WRITE,
++ MAP_ANONYMOUS|MAP_PRIVATE,
++ -1, 0);
++ if (p != MAP_FAILED) {
++ void *aligned_p = align_ptr_up(p, page_size);
++
++ result = madvise(aligned_p, page_size, MADV_HUGEPAGE) == 0;
++
++ munmap(p, page_size * 2);
++ }
++
++ if (warn && !result) {
++ warning("TransparentHugePages is not supported by the operating system.");
++ }
++
++ return result;
++}
++
+ bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) {
+ bool result = false;
+- void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE,
+- MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB,
+- -1, 0);
++ void *p = mmap(NULL, page_size, PROT_READ|PROT_WRITE,
++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB,
++ -1, 0);
+
+ if (p != MAP_FAILED) {
+ // We don't know if this really is a huge page or not.
+@@ -3220,12 +3229,10 @@
+ }
+ fclose(fp);
+ }
+- munmap (p, page_size);
+- if (result)
+- return true;
+- }
+-
+- if (warn) {
++ munmap(p, page_size);
++ }
++
++ if (warn && !result) {
+ warning("HugeTLBFS is not supported by the operating system.");
+ }
+
+@@ -3273,82 +3280,126 @@
+
+ static size_t _large_page_size = 0;
+
+-void os::large_page_init() {
+- if (!UseLargePages) {
+- UseHugeTLBFS = false;
+- UseSHM = false;
+- return;
+- }
+-
+- if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) {
+- // If UseLargePages is specified on the command line try both methods,
+- // if it's default, then try only HugeTLBFS.
+- if (FLAG_IS_DEFAULT(UseLargePages)) {
+- UseHugeTLBFS = true;
+- } else {
+- UseHugeTLBFS = UseSHM = true;
+- }
+- }
+-
+- if (LargePageSizeInBytes) {
+- _large_page_size = LargePageSizeInBytes;
+- } else {
+- // large_page_size on Linux is used to round up heap size. x86 uses either
+- // 2M or 4M page, depending on whether PAE (Physical Address Extensions)
+- // mode is enabled. AMD64/EM64T uses 2M page in 64bit mode. IA64 can use
+- // page as large as 256M.
+- //
+- // Here we try to figure out page size by parsing /proc/meminfo and looking
+- // for a line with the following format:
+- // Hugepagesize: 2048 kB
+- //
+- // If we can't determine the value (e.g. /proc is not mounted, or the text
+- // format has been changed), we'll use the largest page size supported by
+- // the processor.
++size_t os::Linux::find_large_page_size() {
++ size_t large_page_size = 0;
++
++ // large_page_size on Linux is used to round up heap size. x86 uses either
++ // 2M or 4M page, depending on whether PAE (Physical Address Extensions)
++ // mode is enabled. AMD64/EM64T uses 2M page in 64bit mode. IA64 can use
++ // page as large as 256M.
++ //
++ // Here we try to figure out page size by parsing /proc/meminfo and looking
++ // for a line with the following format:
++ // Hugepagesize: 2048 kB
++ //
++ // If we can't determine the value (e.g. /proc is not mounted, or the text
++ // format has been changed), we'll use the largest page size supported by
++ // the processor.
+
+ #ifndef ZERO
+- _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M)
+- ARM_ONLY(2 * M) PPC_ONLY(4 * M);
++ large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M)
++ ARM_ONLY(2 * M) PPC_ONLY(4 * M);
+ #endif // ZERO
+
+- FILE *fp = fopen("/proc/meminfo", "r");
+- if (fp) {
+- while (!feof(fp)) {
+- int x = 0;
+- char buf[16];
+- if (fscanf(fp, "Hugepagesize: %d", &x) == 1) {
+- if (x && fgets(buf, sizeof(buf), fp) && strcmp(buf, " kB\n") == 0) {
+- _large_page_size = x * K;
+- break;
+- }
+- } else {
+- // skip to next line
+- for (;;) {
+- int ch = fgetc(fp);
+- if (ch == EOF || ch == (int)'\n') break;
+- }
++ FILE *fp = fopen("/proc/meminfo", "r");
++ if (fp) {
++ while (!feof(fp)) {
++ int x = 0;
++ char buf[16];
++ if (fscanf(fp, "Hugepagesize: %d", &x) == 1) {
++ if (x && fgets(buf, sizeof(buf), fp) && strcmp(buf, " kB\n") == 0) {
++ large_page_size = x * K;
++ break;
++ }
++ } else {
++ // skip to next line
++ for (;;) {
++ int ch = fgetc(fp);
++ if (ch == EOF || ch == (int)'\n') break;
+ }
+ }
+- fclose(fp);
+ }
+- }
+-
+- // print a warning if any large page related flag is specified on command line
+- bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS);
+-
++ fclose(fp);
++ }
++
++ if (!FLAG_IS_DEFAULT(LargePageSizeInBytes) && LargePageSizeInBytes != large_page_size) {
++ warning("Setting LargePageSizeInBytes has no effect on this OS. Large page size is "
++ SIZE_FORMAT "%s.", byte_size_in_proper_unit(large_page_size),
++ proper_unit_for_byte_size(large_page_size));
++ }
++
++ return large_page_size;
++}
++
++size_t os::Linux::setup_large_page_size() {
++ _large_page_size = Linux::find_large_page_size();
+ const size_t default_page_size = (size_t)Linux::page_size();
+ if (_large_page_size > default_page_size) {
+ _page_sizes[0] = _large_page_size;
+ _page_sizes[1] = default_page_size;
+ _page_sizes[2] = 0;
+ }
+- UseHugeTLBFS = UseHugeTLBFS &&
+- Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size);
+-
+- if (UseHugeTLBFS)
++
++ return _large_page_size;
++}
++
++bool os::Linux::setup_large_page_type(size_t page_size) {
++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) &&
++ FLAG_IS_DEFAULT(UseSHM) &&
++ FLAG_IS_DEFAULT(UseTransparentHugePages)) {
++
++ // The type of large pages has not been specified by the user.
++
++ // Try UseHugeTLBFS and then UseSHM.
++ UseHugeTLBFS = UseSHM = true;
++
++ // Don't try UseTransparentHugePages since there are known
++ // performance issues with it turned on. This might change in the future.
++ UseTransparentHugePages = false;
++ }
++
++ if (UseTransparentHugePages) {
++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseTransparentHugePages);
++ if (transparent_huge_pages_sanity_check(warn_on_failure, page_size)) {
++ UseHugeTLBFS = false;
++ UseSHM = false;
++ return true;
++ }
++ UseTransparentHugePages = false;
++ }
++
++ if (UseHugeTLBFS) {
++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS);
++ if (hugetlbfs_sanity_check(warn_on_failure, page_size)) {
++ UseSHM = false;
++ return true;
++ }
++ UseHugeTLBFS = false;
++ }
++
++ return UseSHM;
++}
++
++void os::large_page_init() {
++ if (!UseLargePages &&
++ !UseTransparentHugePages &&
++ !UseHugeTLBFS &&
++ !UseSHM) {
++ // Not using large pages.
++ return;
++ }
++
++ if (!FLAG_IS_DEFAULT(UseLargePages) && !UseLargePages) {
++ // The user explicitly turned off large pages.
++ // Ignore the rest of the large pages flags.
++ UseTransparentHugePages = false;
++ UseHugeTLBFS = false;
+ UseSHM = false;
+-
+- UseLargePages = UseHugeTLBFS || UseSHM;
++ return;
++ }
++
++ size_t large_page_size = Linux::setup_large_page_size();
++ UseLargePages = Linux::setup_large_page_type(large_page_size);
+
+ set_coredump_filter();
+ }
+@@ -3357,16 +3408,22 @@
+ #define SHM_HUGETLB 04000
+ #endif
+
+-char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
++char* os::Linux::reserve_memory_special_shm(size_t bytes, size_t alignment, char* req_addr, bool exec) {
+ // "exec" is passed in but not used. Creating the shared image for
+ // the code cache doesn't have an SHM_X executable permission to check.
+ assert(UseLargePages && UseSHM, "only for SHM large pages");
++ assert(is_ptr_aligned(req_addr, os::large_page_size()), "Unaligned address");
++
++ if (!is_size_aligned(bytes, os::large_page_size()) || alignment > os::large_page_size()) {
++ return NULL; // Fallback to small pages.
++ }
+
+ key_t key = IPC_PRIVATE;
+ char *addr;
+
+ bool warn_on_failure = UseLargePages &&
+ (!FLAG_IS_DEFAULT(UseLargePages) ||
++ !FLAG_IS_DEFAULT(UseSHM) ||
+ !FLAG_IS_DEFAULT(LargePageSizeInBytes)
+ );
+ char msg[128];
+@@ -3414,42 +3471,220 @@
+ return NULL;
+ }
+
+- if ((addr != NULL) && UseNUMAInterleaving) {
+- numa_make_global(addr, bytes);
+- }
+-
+- // The memory is committed
+- MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC);
+-
+ return addr;
+ }
+
++static void warn_on_large_pages_failure(char* req_addr, size_t bytes, int error) {
++ assert(error == ENOMEM, "Only expect to fail if no memory is available");
++
++ bool warn_on_failure = UseLargePages &&
++ (!FLAG_IS_DEFAULT(UseLargePages) ||
++ !FLAG_IS_DEFAULT(UseHugeTLBFS) ||
++ !FLAG_IS_DEFAULT(LargePageSizeInBytes));
++
++ if (warn_on_failure) {
++ char msg[128];
++ jio_snprintf(msg, sizeof(msg), "Failed to reserve large pages memory req_addr: "
++ PTR_FORMAT " bytes: " SIZE_FORMAT " (errno = %d).", req_addr, bytes, error);
++ warning(msg);
++ }
++}
++
++char* os::Linux::reserve_memory_special_huge_tlbfs_only(size_t bytes, char* req_addr, bool exec) {
++ assert(UseLargePages && UseHugeTLBFS, "only for Huge TLBFS large pages");
++ assert(is_size_aligned(bytes, os::large_page_size()), "Unaligned size");
++ assert(is_ptr_aligned(req_addr, os::large_page_size()), "Unaligned address");
++
++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
++ char* addr = (char*)::mmap(req_addr, bytes, prot,
++ MAP_PRIVATE|MAP_ANONYMOUS|MAP_HUGETLB,
++ -1, 0);
++
++ if (addr == MAP_FAILED) {
++ warn_on_large_pages_failure(req_addr, bytes, errno);
++ return NULL;
++ }
++
++ assert(is_ptr_aligned(addr, os::large_page_size()), "Must be");
++
++ return addr;
++}
++
++char* os::Linux::reserve_memory_special_huge_tlbfs_mixed(size_t bytes, size_t alignment, char* req_addr, bool exec) {
++ size_t large_page_size = os::large_page_size();
++
++ assert(bytes >= large_page_size, "Shouldn't allocate large pages for small sizes");
++
++ // Allocate small pages.
++
++ char* start;
++ if (req_addr != NULL) {
++ assert(is_ptr_aligned(req_addr, alignment), "Must be");
++ assert(is_size_aligned(bytes, alignment), "Must be");
++ start = os::reserve_memory(bytes, req_addr);
++ assert(start == NULL || start == req_addr, "Must be");
++ } else {
++ start = os::reserve_memory_aligned(bytes, alignment);
++ }
++
++ if (start == NULL) {
++ return NULL;
++ }
++
++ assert(is_ptr_aligned(start, alignment), "Must be");
++
++ // os::reserve_memory_special will record this memory area.
++ // Need to release it here to prevent overlapping reservations.
++ MemTracker::record_virtual_memory_release((address)start, bytes);
++
++ char* end = start + bytes;
++
++ // Find the regions of the allocated chunk that can be promoted to large pages.
++ char* lp_start = (char*)align_ptr_up(start, large_page_size);
++ char* lp_end = (char*)align_ptr_down(end, large_page_size);
++
++ size_t lp_bytes = lp_end - lp_start;
++
++ assert(is_size_aligned(lp_bytes, large_page_size), "Must be");
++
++ if (lp_bytes == 0) {
++ // The mapped region doesn't even span the start and the end of a large page.
++ // Fall back to allocate a non-special area.
++ ::munmap(start, end - start);
++ return NULL;
++ }
++
++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
++
++
++ void* result;
++
++ if (start != lp_start) {
++ result = ::mmap(start, lp_start - start, prot,
++ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED,
++ -1, 0);
++ if (result == MAP_FAILED) {
++ ::munmap(lp_start, end - lp_start);
++ return NULL;
++ }
++ }
++
++ result = ::mmap(lp_start, lp_bytes, prot,
++ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_HUGETLB,
++ -1, 0);
++ if (result == MAP_FAILED) {
++ warn_on_large_pages_failure(req_addr, bytes, errno);
++ // If the mmap above fails, the large pages region will be unmapped and we
++ // have regions before and after with small pages. Release these regions.
++ //
++ // | mapped | unmapped | mapped |
++ // ^ ^ ^ ^
++ // start lp_start lp_end end
++ //
++ ::munmap(start, lp_start - start);
++ ::munmap(lp_end, end - lp_end);
++ return NULL;
++ }
++
++ if (lp_end != end) {
++ result = ::mmap(lp_end, end - lp_end, prot,
++ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED,
++ -1, 0);
++ if (result == MAP_FAILED) {
++ ::munmap(start, lp_end - start);
++ return NULL;
++ }
++ }
++
++ return start;
++}
++
++char* os::Linux::reserve_memory_special_huge_tlbfs(size_t bytes, size_t alignment, char* req_addr, bool exec) {
++ assert(UseLargePages && UseHugeTLBFS, "only for Huge TLBFS large pages");
++ assert(is_ptr_aligned(req_addr, alignment), "Must be");
++ assert(is_power_of_2(alignment), "Must be");
++ assert(is_power_of_2(os::large_page_size()), "Must be");
++ assert(bytes >= os::large_page_size(), "Shouldn't allocate large pages for small sizes");
++
++ if (is_size_aligned(bytes, os::large_page_size()) && alignment <= os::large_page_size()) {
++ return reserve_memory_special_huge_tlbfs_only(bytes, req_addr, exec);
++ } else {
++ return reserve_memory_special_huge_tlbfs_mixed(bytes, alignment, req_addr, exec);
++ }
++}
++
++char* os::reserve_memory_special(size_t bytes, size_t alignment, char* req_addr, bool exec) {
++ assert(UseLargePages, "only for large pages");
++
++ char* addr;
++ if (UseSHM) {
++ addr = os::Linux::reserve_memory_special_shm(bytes, alignment, req_addr, exec);
++ } else {
++ assert(UseHugeTLBFS, "must be");
++ addr = os::Linux::reserve_memory_special_huge_tlbfs(bytes, alignment, req_addr, exec);
++ }
++
++ if (addr != NULL) {
++ if (UseNUMAInterleaving) {
++ numa_make_global(addr, bytes);
++ }
++
++ // The memory is committed
++ MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC);
++ }
++
++ return addr;
++}
++
++bool os::Linux::release_memory_special_shm(char* base, size_t bytes) {
++ // detaching the SHM segment will also delete it, see reserve_memory_special_shm()
++ return shmdt(base) == 0;
++}
++
++bool os::Linux::release_memory_special_huge_tlbfs(char* base, size_t bytes) {
++ return pd_release_memory(base, bytes);
++}
++
+ bool os::release_memory_special(char* base, size_t bytes) {
++ assert(UseLargePages, "only for large pages");
++
+ MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
+- // detaching the SHM segment will also delete it, see reserve_memory_special()
+- int rslt = shmdt(base);
+- if (rslt == 0) {
++
++ bool res;
++ if (UseSHM) {
++ res = os::Linux::release_memory_special_shm(base, bytes);
++ } else {
++ assert(UseHugeTLBFS, "must be");
++ res = os::Linux::release_memory_special_huge_tlbfs(base, bytes);
++ }
++
++ if (res) {
+ tkr.record((address)base, bytes);
+- return true;
+ } else {
+ tkr.discard();
+- return false;
+- }
+-}
++ }
++
++ return res;
++}
++
+
+ size_t os::large_page_size() {
+ return _large_page_size;
+ }
+
+-// HugeTLBFS allows application to commit large page memory on demand;
+-// with SysV SHM the entire memory region must be allocated as shared
++// With SysV SHM the entire memory region must be allocated as shared
+ // memory.
++// HugeTLBFS allows application to commit large page memory on demand.
++// However, when committing memory with HugeTLBFS fails, the region
++// that was supposed to be committed will lose the old reservation
++// and allow other threads to steal that memory region. Because of this
++// behavior we can't commit HugeTLBFS memory.
+ bool os::can_commit_large_page_memory() {
+- return UseHugeTLBFS;
++ return UseTransparentHugePages;
+ }
+
+ bool os::can_execute_large_page_memory() {
+- return UseHugeTLBFS;
++ return UseTransparentHugePages || UseHugeTLBFS;
+ }
+
+ // Reserve memory at an arbitrary address, only if that area is
+@@ -4505,6 +4740,26 @@
+
+ Linux::clock_init();
+ initial_time_count = os::elapsed_counter();
++
++ // pthread_condattr initialization for monotonic clock
++ int status;
++ pthread_condattr_t* _condattr = os::Linux::condAttr();
++ if ((status = pthread_condattr_init(_condattr)) != 0) {
++ fatal(err_msg("pthread_condattr_init: %s", strerror(status)));
++ }
++ // Only set the clock if CLOCK_MONOTONIC is available
++ if (Linux::supports_monotonic_clock()) {
++ if ((status = pthread_condattr_setclock(_condattr, CLOCK_MONOTONIC)) != 0) {
++ if (status == EINVAL) {
++ warning("Unable to use monotonic clock with relative timed-waits" \
++ " - changes to the time-of-day clock may have adverse affects");
++ } else {
++ fatal(err_msg("pthread_condattr_setclock: %s", strerror(status)));
++ }
++ }
++ }
++ // else it defaults to CLOCK_REALTIME
++
+ pthread_mutex_init(&dl_mutex, NULL);
+
+ // If the pagesize of the VM is greater than 8K determine the appropriate
+@@ -4587,6 +4842,10 @@
+
+ Linux::capture_initial_stack(JavaThread::stack_size_at_create());
+
++#if defined(IA32)
++ workaround_expand_exec_shield_cs_limit();
++#endif
++
+ Linux::libpthread_init();
+ if (PrintMiscellaneous && (Verbose || WizardMode)) {
+ tty->print_cr("[HotSpot is running with %s, %s(%s)]\n",
+@@ -4603,21 +4862,23 @@
+ UseNUMA = false;
+ }
+ }
+- // With SHM large pages we cannot uncommit a page, so there's not way
++ // With SHM and HugeTLBFS large pages we cannot uncommit a page, so there's no way
+ // we can make the adaptive lgrp chunk resizing work. If the user specified
+- // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and
++ // both UseNUMA and UseLargePages (or UseSHM/UseHugeTLBFS) on the command line - warn and
+ // disable adaptive resizing.
+- if (UseNUMA && UseLargePages && UseSHM) {
+- if (!FLAG_IS_DEFAULT(UseNUMA)) {
+- if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) {
++ if (UseNUMA && UseLargePages && !can_commit_large_page_memory()) {
++ if (FLAG_IS_DEFAULT(UseNUMA)) {
++ UseNUMA = false;
++ } else {
++ if (FLAG_IS_DEFAULT(UseLargePages) &&
++ FLAG_IS_DEFAULT(UseSHM) &&
++ FLAG_IS_DEFAULT(UseHugeTLBFS)) {
+ UseLargePages = false;
+ } else {
+- warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing");
++ warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, disabling adaptive resizing");
+ UseAdaptiveSizePolicy = false;
+ UseAdaptiveNUMAChunkSizing = false;
+ }
+- } else {
+- UseNUMA = false;
+ }
+ }
+ if (!UseNUMA && ForceNUMA) {
+@@ -5351,21 +5612,36 @@
+
+ static struct timespec* compute_abstime(timespec* abstime, jlong millis) {
+ if (millis < 0) millis = 0;
+- struct timeval now;
+- int status = gettimeofday(&now, NULL);
+- assert(status == 0, "gettimeofday");
++
+ jlong seconds = millis / 1000;
+ millis %= 1000;
+ if (seconds > 50000000) { // see man cond_timedwait(3T)
+ seconds = 50000000;
+ }
+- abstime->tv_sec = now.tv_sec + seconds;
+- long usec = now.tv_usec + millis * 1000;
+- if (usec >= 1000000) {
+- abstime->tv_sec += 1;
+- usec -= 1000000;
+- }
+- abstime->tv_nsec = usec * 1000;
++
++ if (os::Linux::supports_monotonic_clock()) {
++ struct timespec now;
++ int status = os::Linux::clock_gettime(CLOCK_MONOTONIC, &now);
++ assert_status(status == 0, status, "clock_gettime");
++ abstime->tv_sec = now.tv_sec + seconds;
++ long nanos = now.tv_nsec + millis * NANOSECS_PER_MILLISEC;
++ if (nanos >= NANOSECS_PER_SEC) {
++ abstime->tv_sec += 1;
++ nanos -= NANOSECS_PER_SEC;
++ }
++ abstime->tv_nsec = nanos;
++ } else {
++ struct timeval now;
++ int status = gettimeofday(&now, NULL);
++ assert(status == 0, "gettimeofday");
++ abstime->tv_sec = now.tv_sec + seconds;
++ long usec = now.tv_usec + millis * 1000;
++ if (usec >= 1000000) {
++ abstime->tv_sec += 1;
++ usec -= 1000000;
++ }
++ abstime->tv_nsec = usec * 1000;
++ }
+ return abstime;
+ }
+
+@@ -5457,7 +5733,7 @@
+ status = os::Linux::safe_cond_timedwait(_cond, _mutex, &abst);
+ if (status != 0 && WorkAroundNPTLTimedWaitHang) {
+ pthread_cond_destroy (_cond);
+- pthread_cond_init (_cond, NULL) ;
++ pthread_cond_init (_cond, os::Linux::condAttr()) ;
+ }
+ assert_status(status == 0 || status == EINTR ||
+ status == ETIME || status == ETIMEDOUT,
+@@ -5536,7 +5812,6 @@
+ * is no need to track notifications.
+ */
+
+-#define MAX_SECS 100000000
+ /*
+ * This code is common to linux and solaris and will be moved to a
+ * common place in dolphin.
+@@ -5558,32 +5833,50 @@
+
+ static void unpackTime(timespec* absTime, bool isAbsolute, jlong time) {
+ assert (time > 0, "convertTime");
+-
+- struct timeval now;
+- int status = gettimeofday(&now, NULL);
+- assert(status == 0, "gettimeofday");
+-
+- time_t max_secs = now.tv_sec + MAX_SECS;
+-
+- if (isAbsolute) {
+- jlong secs = time / 1000;
+- if (secs > max_secs) {
+- absTime->tv_sec = max_secs;
++ time_t max_secs = 0;
++
++ if (!os::Linux::supports_monotonic_clock() || isAbsolute) {
++ struct timeval now;
++ int status = gettimeofday(&now, NULL);
++ assert(status == 0, "gettimeofday");
++
++ max_secs = now.tv_sec + MAX_SECS;
++
++ if (isAbsolute) {
++ jlong secs = time / 1000;
++ if (secs > max_secs) {
++ absTime->tv_sec = max_secs;
++ } else {
++ absTime->tv_sec = secs;
++ }
++ absTime->tv_nsec = (time % 1000) * NANOSECS_PER_MILLISEC;
++ } else {
++ jlong secs = time / NANOSECS_PER_SEC;
++ if (secs >= MAX_SECS) {
++ absTime->tv_sec = max_secs;
++ absTime->tv_nsec = 0;
++ } else {
++ absTime->tv_sec = now.tv_sec + secs;
++ absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_usec*1000;
++ if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
++ absTime->tv_nsec -= NANOSECS_PER_SEC;
++ ++absTime->tv_sec; // note: this must be <= max_secs
++ }
++ }
+ }
+- else {
+- absTime->tv_sec = secs;
+- }
+- absTime->tv_nsec = (time % 1000) * NANOSECS_PER_MILLISEC;
+- }
+- else {
++ } else {
++ // must be relative using monotonic clock
++ struct timespec now;
++ int status = os::Linux::clock_gettime(CLOCK_MONOTONIC, &now);
++ assert_status(status == 0, status, "clock_gettime");
++ max_secs = now.tv_sec + MAX_SECS;
+ jlong secs = time / NANOSECS_PER_SEC;
+ if (secs >= MAX_SECS) {
+ absTime->tv_sec = max_secs;
+ absTime->tv_nsec = 0;
+- }
+- else {
++ } else {
+ absTime->tv_sec = now.tv_sec + secs;
+- absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_usec*1000;
++ absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_nsec;
+ if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
+ absTime->tv_nsec -= NANOSECS_PER_SEC;
+ ++absTime->tv_sec; // note: this must be <= max_secs
+@@ -5662,16 +5955,20 @@
+ OSThreadWaitState osts(thread->osthread(), false /* not Object.wait() */);
+ jt->set_suspend_equivalent();
+ // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
+-
++ assert(_cur_index == -1, "invariant");
+ if (time == 0) {
+- status = pthread_cond_wait (_cond, _mutex) ;
++ _cur_index = REL_INDEX; // arbitrary choice when not timed
++ status = pthread_cond_wait (&_cond[_cur_index], _mutex) ;
+ } else {
+- status = os::Linux::safe_cond_timedwait (_cond, _mutex, &absTime) ;
++ _cur_index = isAbsolute ? ABS_INDEX : REL_INDEX;
++ status = os::Linux::safe_cond_timedwait (&_cond[_cur_index], _mutex, &absTime) ;
+ if (status != 0 && WorkAroundNPTLTimedWaitHang) {
+- pthread_cond_destroy (_cond) ;
+- pthread_cond_init (_cond, NULL);
++ pthread_cond_destroy (&_cond[_cur_index]) ;
++ pthread_cond_init (&_cond[_cur_index], isAbsolute ? NULL : os::Linux::condAttr());
+ }
+ }
++ _cur_index = -1;
++
+ assert_status(status == 0 || status == EINTR ||
+ status == ETIME || status == ETIMEDOUT,
+ status, "cond_timedwait");
+@@ -5700,17 +5997,24 @@
+ s = _counter;
+ _counter = 1;
+ if (s < 1) {
+- if (WorkAroundNPTLTimedWaitHang) {
+- status = pthread_cond_signal (_cond) ;
+- assert (status == 0, "invariant") ;
++ // thread might be parked
++ if (_cur_index != -1) {
++ // thread is definitely parked
++ if (WorkAroundNPTLTimedWaitHang) {
++ status = pthread_cond_signal (&_cond[_cur_index]);
++ assert (status == 0, "invariant");
+ status = pthread_mutex_unlock(_mutex);
+- assert (status == 0, "invariant") ;
+- } else {
++ assert (status == 0, "invariant");
++ } else {
+ status = pthread_mutex_unlock(_mutex);
+- assert (status == 0, "invariant") ;
+- status = pthread_cond_signal (_cond) ;
+- assert (status == 0, "invariant") ;
+- }
++ assert (status == 0, "invariant");
++ status = pthread_cond_signal (&_cond[_cur_index]);
++ assert (status == 0, "invariant");
++ }
++ } else {
++ pthread_mutex_unlock(_mutex);
++ assert (status == 0, "invariant") ;
++ }
+ } else {
+ pthread_mutex_unlock(_mutex);
+ assert (status == 0, "invariant") ;
+@@ -5926,3 +6230,149 @@
+ }
+
+ #endif // JAVASE_EMBEDDED
++
++
++/////////////// Unit tests ///////////////
++
++#ifndef PRODUCT
++
++#define test_log(...) \
++ do {\
++ if (VerboseInternalVMTests) { \
++ tty->print_cr(__VA_ARGS__); \
++ tty->flush(); \
++ }\
++ } while (false)
++
++class TestReserveMemorySpecial : AllStatic {
++ public:
++ static void small_page_write(void* addr, size_t size) {
++ size_t page_size = os::vm_page_size();
++
++ char* end = (char*)addr + size;
++ for (char* p = (char*)addr; p < end; p += page_size) {
++ *p = 1;
++ }
++ }
++
++ static void test_reserve_memory_special_huge_tlbfs_only(size_t size) {
++ if (!UseHugeTLBFS) {
++ return;
++ }
++
++ test_log("test_reserve_memory_special_huge_tlbfs_only(" SIZE_FORMAT ")", size);
++
++ char* addr = os::Linux::reserve_memory_special_huge_tlbfs_only(size, NULL, false);
++
++ if (addr != NULL) {
++ small_page_write(addr, size);
++
++ os::Linux::release_memory_special_huge_tlbfs(addr, size);
++ }
++ }
++
++ static void test_reserve_memory_special_huge_tlbfs_only() {
++ if (!UseHugeTLBFS) {
++ return;
++ }
++
++ size_t lp = os::large_page_size();
++
++ for (size_t size = lp; size <= lp * 10; size += lp) {
++ test_reserve_memory_special_huge_tlbfs_only(size);
++ }
++ }
++
++ static void test_reserve_memory_special_huge_tlbfs_mixed(size_t size, size_t alignment) {
++ if (!UseHugeTLBFS) {
++ return;
++ }
++
++ test_log("test_reserve_memory_special_huge_tlbfs_mixed(" SIZE_FORMAT ", " SIZE_FORMAT ")",
++ size, alignment);
++
++ assert(size >= os::large_page_size(), "Incorrect input to test");
++
++ char* addr = os::Linux::reserve_memory_special_huge_tlbfs_mixed(size, alignment, NULL, false);
++
++ if (addr != NULL) {
++ small_page_write(addr, size);
++
++ os::Linux::release_memory_special_huge_tlbfs(addr, size);
++ }
++ }
++
++ static void test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(size_t size) {
++ size_t lp = os::large_page_size();
++ size_t ag = os::vm_allocation_granularity();
++
++ for (size_t alignment = ag; is_size_aligned(size, alignment); alignment *= 2) {
++ test_reserve_memory_special_huge_tlbfs_mixed(size, alignment);
++ }
++ }
++
++ static void test_reserve_memory_special_huge_tlbfs_mixed() {
++ size_t lp = os::large_page_size();
++ size_t ag = os::vm_allocation_granularity();
++
++ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp);
++ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp + ag);
++ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp + lp / 2);
++ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2);
++ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2 + ag);
++ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2 - ag);
++ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2 + lp / 2);
++ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 10);
++ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 10 + lp / 2);
++ }
++
++ static void test_reserve_memory_special_huge_tlbfs() {
++ if (!UseHugeTLBFS) {
++ return;
++ }
++
++ test_reserve_memory_special_huge_tlbfs_only();
++ test_reserve_memory_special_huge_tlbfs_mixed();
++ }
++
++ static void test_reserve_memory_special_shm(size_t size, size_t alignment) {
++ if (!UseSHM) {
++ return;
++ }
++
++ test_log("test_reserve_memory_special_shm(" SIZE_FORMAT ", " SIZE_FORMAT ")", size, alignment);
++
++ char* addr = os::Linux::reserve_memory_special_shm(size, alignment, NULL, false);
++
++ if (addr != NULL) {
++ assert(is_ptr_aligned(addr, alignment), "Check");
++ assert(is_ptr_aligned(addr, os::large_page_size()), "Check");
++
++ small_page_write(addr, size);
++
++ os::Linux::release_memory_special_shm(addr, size);
++ }
++ }
++
++ static void test_reserve_memory_special_shm() {
++ size_t lp = os::large_page_size();
++ size_t ag = os::vm_allocation_granularity();
++
++ for (size_t size = ag; size < lp * 3; size += ag) {
++ for (size_t alignment = ag; is_size_aligned(size, alignment); alignment *= 2) {
++ test_reserve_memory_special_shm(size, alignment);
++ }
++ }
++ }
++
++ static void test() {
++ test_reserve_memory_special_huge_tlbfs();
++ test_reserve_memory_special_shm();
++ }
++};
++
++void TestReserveMemorySpecial_test() {
++ TestReserveMemorySpecial::test();
++}
++
++#endif
+--- ./hotspot/src/os/linux/vm/os_linux.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os/linux/vm/os_linux.hpp Wed May 07 19:26:16 2014 -0700
+@@ -32,6 +32,7 @@
+
+ class Linux {
+ friend class os;
++ friend class TestReserveMemorySpecial;
+
+ // For signal-chaining
+ #define MAXSIGNUM 32
+@@ -92,15 +93,27 @@
+ static void rebuild_cpu_to_node_map();
+ static GrowableArray<int>* cpu_to_node() { return _cpu_to_node; }
+
++ static size_t find_large_page_size();
++ static size_t setup_large_page_size();
++
++ static bool setup_large_page_type(size_t page_size);
++ static bool transparent_huge_pages_sanity_check(bool warn, size_t pages_size);
+ static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
+
++ static char* reserve_memory_special_shm(size_t bytes, size_t alignment, char* req_addr, bool exec);
++ static char* reserve_memory_special_huge_tlbfs(size_t bytes, size_t alignment, char* req_addr, bool exec);
++ static char* reserve_memory_special_huge_tlbfs_only(size_t bytes, char* req_addr, bool exec);
++ static char* reserve_memory_special_huge_tlbfs_mixed(size_t bytes, size_t alignment, char* req_addr, bool exec);
++
++ static bool release_memory_special_shm(char* base, size_t bytes);
++ static bool release_memory_special_huge_tlbfs(char* base, size_t bytes);
++
+ static void print_full_memory_info(outputStream* st);
+ static void print_distro_info(outputStream* st);
+ static void print_libversion_info(outputStream* st);
+
+ public:
+ static bool _stack_is_executable;
+- static volatile jint num_largepage_commit_fails;
+ static void *dlopen_helper(const char *name, char *ebuf, int ebuflen);
+ static void *dll_load_in_vmthread(const char *name, char *ebuf, int ebuflen);
+
+@@ -208,6 +221,13 @@
+
+ static jlong fast_thread_cpu_time(clockid_t clockid);
+
++ // pthread_cond clock suppport
++ private:
++ static pthread_condattr_t _condattr[1];
++
++ public:
++ static pthread_condattr_t* condAttr() { return _condattr; }
++
+ // Stack repair handling
+
+ // none present
+@@ -274,7 +294,7 @@
+ public:
+ PlatformEvent() {
+ int status;
+- status = pthread_cond_init (_cond, NULL);
++ status = pthread_cond_init (_cond, os::Linux::condAttr());
+ assert_status(status == 0, status, "cond_init");
+ status = pthread_mutex_init (_mutex, NULL);
+ assert_status(status == 0, status, "mutex_init");
+@@ -289,14 +309,19 @@
+ void park () ;
+ void unpark () ;
+ int TryPark () ;
+- int park (jlong millis) ;
++ int park (jlong millis) ; // relative timed-wait only
+ void SetAssociation (Thread * a) { _Assoc = a ; }
+ } ;
+
+ class PlatformParker : public CHeapObj<mtInternal> {
+ protected:
++ enum {
++ REL_INDEX = 0,
++ ABS_INDEX = 1
++ };
++ int _cur_index; // which cond is in use: -1, 0, 1
+ pthread_mutex_t _mutex [1] ;
+- pthread_cond_t _cond [1] ;
++ pthread_cond_t _cond [2] ; // one for relative times and one for abs.
+
+ public: // TODO-FIXME: make dtor private
+ ~PlatformParker() { guarantee (0, "invariant") ; }
+@@ -304,10 +329,13 @@
+ public:
+ PlatformParker() {
+ int status;
+- status = pthread_cond_init (_cond, NULL);
+- assert_status(status == 0, status, "cond_init");
++ status = pthread_cond_init (&_cond[REL_INDEX], os::Linux::condAttr());
++ assert_status(status == 0, status, "cond_init rel");
++ status = pthread_cond_init (&_cond[ABS_INDEX], NULL);
++ assert_status(status == 0, status, "cond_init abs");
+ status = pthread_mutex_init (_mutex, NULL);
+ assert_status(status == 0, status, "mutex_init");
++ _cur_index = -1; // mark as unused
+ }
+ };
+
+--- ./hotspot/src/os/posix/vm/os_posix.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os/posix/vm/os_posix.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+-* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
++* Copyright (c) 1999, 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,8 @@
+ #include <unistd.h>
+ #include <sys/resource.h>
+ #include <sys/utsname.h>
++#include <pthread.h>
++#include <signal.h>
+
+
+ // Check core dump limit and report possible place where core can be found
+@@ -203,11 +205,17 @@
+ * The callback is supposed to provide the method that should be protected.
+ */
+ bool os::WatcherThreadCrashProtection::call(os::CrashProtectionCallback& cb) {
++ sigset_t saved_sig_mask;
++
+ assert(Thread::current()->is_Watcher_thread(), "Only for WatcherThread");
+ assert(!WatcherThread::watcher_thread()->has_crash_protection(),
+ "crash_protection already set?");
+
+- if (sigsetjmp(_jmpbuf, 1) == 0) {
++ // we cannot rely on sigsetjmp/siglongjmp to save/restore the signal mask
++ // since on at least some systems (OS X) siglongjmp will restore the mask
++ // for the process, not the thread
++ pthread_sigmask(0, NULL, &saved_sig_mask);
++ if (sigsetjmp(_jmpbuf, 0) == 0) {
+ // make sure we can see in the signal handler that we have crash protection
+ // installed
+ WatcherThread::watcher_thread()->set_crash_protection(this);
+@@ -217,6 +225,7 @@
+ return true;
+ }
+ // this happens when we siglongjmp() back
++ pthread_sigmask(SIG_SETMASK, &saved_sig_mask, NULL);
+ WatcherThread::watcher_thread()->set_crash_protection(NULL);
+ return false;
+ }
+--- ./hotspot/src/os/solaris/vm/os_solaris.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Wed May 07 19:26:16 2014 -0700
+@@ -3530,11 +3530,15 @@
+ return true;
+ }
+
+-char* os::reserve_memory_special(size_t size, char* addr, bool exec) {
++char* os::reserve_memory_special(size_t size, size_t alignment, char* addr, bool exec) {
+ // "exec" is passed in but not used. Creating the shared image for
+ // the code cache doesn't have an SHM_X executable permission to check.
+ assert(UseLargePages && UseISM, "only for ISM large pages");
+
++ if (!is_size_aligned(size, os::large_page_size()) || alignment > os::large_page_size()) {
++ return NULL; // Fallback to small pages.
++ }
++
+ char* retAddr = NULL;
+ int shmid;
+ key_t ismKey;
+@@ -6862,3 +6866,9 @@
+
+ return strlen(buffer);
+ }
++
++#ifndef PRODUCT
++void TestReserveMemorySpecial_test() {
++ // No tests available for this platform
++}
++#endif
+--- ./hotspot/src/os/windows/vm/os_windows.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os/windows/vm/os_windows.cpp Wed May 07 19:26:16 2014 -0700
+@@ -800,15 +800,21 @@
+ return result;
+ }
+
+-// For now, we say that Windows does not support vtime. I have no idea
+-// whether it can actually be made to (DLD, 9/13/05).
+-
+-bool os::supports_vtime() { return false; }
++bool os::supports_vtime() { return true; }
+ bool os::enable_vtime() { return false; }
+ bool os::vtime_enabled() { return false; }
++
+ double os::elapsedVTime() {
+- // better than nothing, but not much
+- return elapsedTime();
++ FILETIME created;
++ FILETIME exited;
++ FILETIME kernel;
++ FILETIME user;
++ if (GetThreadTimes(GetCurrentThread(), &created, &exited, &kernel, &user) != 0) {
++ // the resolution of windows_to_java_time() should be sufficient (ms)
++ return (double) (windows_to_java_time(kernel) + windows_to_java_time(user)) / MILLIUNITS;
++ } else {
++ return elapsedTime();
++ }
+ }
+
+ jlong os::javaTimeMillis() {
+@@ -3088,7 +3094,12 @@
+ return true;
+ }
+
+-char* os::reserve_memory_special(size_t bytes, char* addr, bool exec) {
++char* os::reserve_memory_special(size_t bytes, size_t alignment, char* addr, bool exec) {
++ assert(UseLargePages, "only for large pages");
++
++ if (!is_size_aligned(bytes, os::large_page_size()) || alignment > os::large_page_size()) {
++ return NULL; // Fallback to small pages.
++ }
+
+ const DWORD prot = exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
+ const DWORD flags = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
+@@ -5593,3 +5604,9 @@
+ }
+
+ #endif
++
++#ifndef PRODUCT
++void TestReserveMemorySpecial_test() {
++ // No tests available for this platform
++}
++#endif
+--- ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Wed May 07 19:26:16 2014 -0700
+@@ -873,3 +873,46 @@
+ #endif
+ }
+ #endif
++
++
++/*
++ * IA32 only: execute code at a high address in case buggy NX emulation is present. I.e. avoid CS limit
++ * updates (JDK-8023956).
++ */
++void os::workaround_expand_exec_shield_cs_limit() {
++#if defined(IA32)
++ size_t page_size = os::vm_page_size();
++ /*
++ * Take the highest VA the OS will give us and exec
++ *
++ * Although using -(pagesz) as mmap hint works on newer kernel as you would
++ * think, older variants affected by this work-around don't (search forward only).
++ *
++ * On the affected distributions, we understand the memory layout to be:
++ *
++ * TASK_LIMIT= 3G, main stack base close to TASK_LIMT.
++ *
++ * A few pages south main stack will do it.
++ *
++ * If we are embedded in an app other than launcher (initial != main stack),
++ * we don't have much control or understanding of the address space, just let it slide.
++ */
++ char* hint = (char*) (Linux::initial_thread_stack_bottom() -
++ ((StackYellowPages + StackRedPages + 1) * page_size));
++ char* codebuf = os::reserve_memory(page_size, hint);
++ if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
++ return; // No matter, we tried, best effort.
++ }
++ if (PrintMiscellaneous && (Verbose || WizardMode)) {
++ tty->print_cr("[CS limit NX emulation work-around, exec code at: %p]", codebuf);
++ }
++
++ // Some code to exec: the 'ret' instruction
++ codebuf[0] = 0xC3;
++
++ // Call the code in the codebuf
++ __asm__ volatile("call *%0" : : "r"(codebuf));
++
++ // keep the page mapped so CS limit isn't reduced.
++#endif
++}
+--- ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.hpp Wed May 07 19:26:16 2014 -0700
+@@ -36,4 +36,17 @@
+ // Note: Currently only used in 64 bit Windows implementations
+ static bool register_code_area(char *low, char *high) { return true; }
+
++ /*
++ * Work-around for broken NX emulation using CS limit, Red Hat patch "Exec-Shield"
++ * (IA32 only).
++ *
++ * Map and execute at a high VA to prevent CS lazy updates race with SMP MM
++ * invalidation.Further code generation by the JVM will no longer cause CS limit
++ * updates.
++ *
++ * Affects IA32: RHEL 5 & 6, Ubuntu 10.04 (LTS), 10.10, 11.04, 11.10, 12.04.
++ * @see JDK-8023956
++ */
++ static void workaround_expand_exec_shield_cs_limit();
++
+ #endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP
+--- ./hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Wed May 07 19:26:16 2014 -0700
+@@ -4178,7 +4178,9 @@
+ }
+ }
+
+- if (!PrintInlining) return;
++ if (!PrintInlining && !compilation()->method()->has_option("PrintInlining")) {
++ return;
++ }
+ CompileTask::print_inlining(callee, scope()->level(), bci(), msg);
+ if (success && CIPrintMethodCodes) {
+ callee->print_codes();
+--- ./hotspot/src/share/vm/c1/c1_LIR.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/c1/c1_LIR.hpp Wed May 07 19:26:16 2014 -0700
+@@ -2221,7 +2221,7 @@
+ typedef enum { inputMode, firstMode = inputMode, tempMode, outputMode, numModes, invalidMode = -1 } OprMode;
+
+ enum {
+- maxNumberOfOperands = 16,
++ maxNumberOfOperands = 20,
+ maxNumberOfInfos = 4
+ };
+
+--- ./hotspot/src/share/vm/c1/c1_LinearScan.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/c1/c1_LinearScan.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1138,8 +1138,10 @@
+ }
+ }
+ }
+-
+- } else if (opr_type != T_LONG) {
++ // We want to sometimes use logical operations on pointers, in particular in GC barriers.
++ // Since 64bit logical operations do not current support operands on stack, we have to make sure
++ // T_OBJECT doesn't get spilled along with T_LONG.
++ } else if (opr_type != T_LONG LP64_ONLY(&& opr_type != T_OBJECT)) {
+ // integer instruction (note: long operands must always be in register)
+ switch (op->code()) {
+ case lir_cmp:
+--- ./hotspot/src/share/vm/c1/c1_Runtime1.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/c1/c1_Runtime1.cpp Wed May 07 19:26:16 2014 -0700
+@@ -911,16 +911,6 @@
+ // Return to the now deoptimized frame.
+ }
+
+- // If we are patching in a non-perm oop, make sure the nmethod
+- // is on the right list.
+- if (ScavengeRootsInCode && load_klass.not_null() && load_klass->is_scavengable()) {
+- MutexLockerEx ml_code (CodeCache_lock, Mutex::_no_safepoint_check_flag);
+- nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
+- guarantee(nm != NULL, "only nmethods can contain non-perm oops");
+- if (!nm->on_scavenge_root_list())
+- CodeCache::add_scavenge_root_nmethod(nm);
+- }
+-
+ // Now copy code back
+
+ {
+@@ -1096,6 +1086,22 @@
+ }
+ }
+ }
++
++
++ // If we are patching in a non-perm oop, make sure the nmethod
++ // is on the right list.
++ if (ScavengeRootsInCode && load_klass.not_null() && load_klass->is_scavengable()) {
++ MutexLockerEx ml_code (CodeCache_lock, Mutex::_no_safepoint_check_flag);
++ nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
++ guarantee(nm != NULL, "only nmethods can contain non-perm oops");
++ if (!nm->on_scavenge_root_list()) {
++ CodeCache::add_scavenge_root_nmethod(nm);
++ }
++
++ // Since we've patched some oops in the nmethod,
++ // (re)register it with the heap.
++ Universe::heap()->register_nmethod(nm);
++ }
+ JRT_END
+
+ //
+--- ./hotspot/src/share/vm/classfile/classFileParser.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/classfile/classFileParser.cpp Wed May 07 19:26:16 2014 -0700
+@@ -4056,8 +4056,8 @@
+ for (int index = 0; index < num_methods; index++) {
+ methodOop m = (methodOop)methods->obj_at(index);
+
+- // skip static and <init> methods
+- if ((!m->is_static()) &&
++ // skip private, static, and <init> methods
++ if ((!m->is_private() && !m->is_static()) &&
+ (m->name() != vmSymbols::object_initializer_name())) {
+
+ Symbol* name = m->name();
+--- ./hotspot/src/share/vm/classfile/javaClasses.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp Wed May 07 19:26:16 2014 -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
+@@ -2388,6 +2388,26 @@
+ *offset = value;
+ }
+
++// Support for java_lang_invoke_DirectMethodHandle
++
++int java_lang_invoke_DirectMethodHandle::_member_offset;
++
++oop java_lang_invoke_DirectMethodHandle::member(oop dmh) {
++ oop member_name = NULL;
++ bool is_dmh = dmh->is_oop() && java_lang_invoke_DirectMethodHandle::is_instance(dmh);
++ assert(is_dmh, "a DirectMethodHandle oop is expected");
++ if (is_dmh) {
++ member_name = dmh->obj_field(member_offset_in_bytes());
++ }
++ return member_name;
++}
++
++void java_lang_invoke_DirectMethodHandle::compute_offsets() {
++ klassOop klass_oop = SystemDictionary::DirectMethodHandle_klass();
++ if (klass_oop != NULL && EnableInvokeDynamic) {
++ compute_offset(_member_offset, klass_oop, vmSymbols::member_name(), vmSymbols::java_lang_invoke_MemberName_signature());
++ }
++}
+
+ // Support for java_lang_invoke_MethodHandle
+
+@@ -2497,6 +2517,13 @@
+ return mname->obj_field(_vmtarget_offset);
+ }
+
++// Can be executed on VM thread only
++void java_lang_invoke_MemberName::adjust_vmtarget(oop mname, oop ref) {
++ assert((is_instance(mname) && (flags(mname) & (MN_IS_METHOD | MN_IS_CONSTRUCTOR)) > 0), "wrong type");
++ assert(Thread::current()->is_VM_thread(), "not VM thread");
++ mname->address_field_put(_vmtarget_offset, (address)ref);
++}
++
+ void java_lang_invoke_MemberName::set_vmtarget(oop mname, oop ref) {
+ assert(is_instance(mname), "wrong type");
+ #ifdef ASSERT
+@@ -3000,6 +3027,7 @@
+ java_lang_ThreadGroup::compute_offsets();
+ if (EnableInvokeDynamic) {
+ java_lang_invoke_MethodHandle::compute_offsets();
++ java_lang_invoke_DirectMethodHandle::compute_offsets();
+ java_lang_invoke_MemberName::compute_offsets();
+ java_lang_invoke_LambdaForm::compute_offsets();
+ java_lang_invoke_MethodType::compute_offsets();
+--- ./hotspot/src/share/vm/classfile/javaClasses.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/classfile/javaClasses.hpp Wed May 07 19:26:16 2014 -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
+@@ -915,6 +915,32 @@
+ static int form_offset_in_bytes() { return _form_offset; }
+ };
+
++// Interface to java.lang.invoke.DirectMethodHandle objects
++
++class java_lang_invoke_DirectMethodHandle: AllStatic {
++ friend class JavaClasses;
++
++ private:
++ static int _member_offset; // the MemberName of this DMH
++
++ static void compute_offsets();
++
++ public:
++ // Accessors
++ static oop member(oop mh);
++
++ // Testers
++ static bool is_subclass(klassOop klass) {
++ return Klass::cast(klass)->is_subclass_of(SystemDictionary::DirectMethodHandle_klass());
++ }
++ static bool is_instance(oop obj) {
++ return obj != NULL && is_subclass(obj->klass());
++ }
++
++ // Accessors for code generation:
++ static int member_offset_in_bytes() { return _member_offset; }
++};
++
+ // Interface to java.lang.invoke.LambdaForm objects
+ // (These are a private interface for managing adapter code generation.)
+
+@@ -988,6 +1014,7 @@
+
+ static oop vmtarget(oop mname);
+ static void set_vmtarget(oop mname, oop target);
++ static void adjust_vmtarget(oop mname, oop target);
+
+ static intptr_t vmindex(oop mname);
+ static void set_vmindex(oop mname, intptr_t index);
+--- ./hotspot/src/share/vm/classfile/symbolTable.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/classfile/symbolTable.cpp Wed May 07 19:26:16 2014 -0700
+@@ -39,6 +39,9 @@
+
+ // --------------------------------------------------------------------------
+
++// the number of buckets a thread claims
++const int ClaimChunkSize = 32;
++
+ SymbolTable* SymbolTable::_the_table = NULL;
+ // Static arena for symbols that are not deallocated
+ Arena* SymbolTable::_arena = NULL;
+@@ -81,16 +84,12 @@
+ }
+ }
+
+-int SymbolTable::symbols_removed = 0;
+-int SymbolTable::symbols_counted = 0;
++int SymbolTable::_symbols_removed = 0;
++int SymbolTable::_symbols_counted = 0;
++volatile int SymbolTable::_parallel_claimed_idx = 0;
+
+-// Remove unreferenced symbols from the symbol table
+-// This is done late during GC.
+-void SymbolTable::unlink() {
+- int removed = 0;
+- int total = 0;
+- size_t memory_total = 0;
+- for (int i = 0; i < the_table()->table_size(); ++i) {
++void SymbolTable::buckets_unlink(int start_idx, int end_idx, int* processed, int* removed, size_t* memory_total) {
++ for (int i = start_idx; i < end_idx; ++i) {
+ HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i);
+ HashtableEntry<Symbol*, mtSymbol>* entry = the_table()->bucket(i);
+ while (entry != NULL) {
+@@ -102,14 +101,14 @@
+ break;
+ }
+ Symbol* s = entry->literal();
+- memory_total += s->object_size();
+- total++;
++ (*memory_total) += s->object_size();
++ (*processed)++;
+ assert(s != NULL, "just checking");
+ // If reference count is zero, remove.
+ if (s->refcount() == 0) {
+ assert(!entry->is_shared(), "shared entries should be kept live");
+ delete s;
+- removed++;
++ (*removed)++;
+ *p = entry->next();
+ the_table()->free_entry(entry);
+ } else {
+@@ -119,12 +118,45 @@
+ entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p);
+ }
+ }
+- symbols_removed += removed;
+- symbols_counted += total;
++}
++
++// Remove unreferenced symbols from the symbol table
++// This is done late during GC.
++void SymbolTable::unlink(int* processed, int* removed) {
++ size_t memory_total = 0;
++ buckets_unlink(0, the_table()->table_size(), processed, removed, &memory_total);
++ _symbols_removed += *removed;
++ _symbols_counted += *processed;
+ // Exclude printing for normal PrintGCDetails because people parse
+ // this output.
+ if (PrintGCDetails && Verbose && WizardMode) {
+- gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", total,
++ gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", *processed,
++ (memory_total*HeapWordSize)/1024);
++ }
++}
++
++void SymbolTable::possibly_parallel_unlink(int* processed, int* removed) {
++ const int limit = the_table()->table_size();
++
++ size_t memory_total = 0;
++
++ for (;;) {
++ // Grab next set of buckets to scan
++ int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize;
++ if (start_idx >= limit) {
++ // End of table
++ break;
++ }
++
++ int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
++ buckets_unlink(start_idx, end_idx, processed, removed, &memory_total);
++ }
++ Atomic::add(*processed, &_symbols_counted);
++ Atomic::add(*removed, &_symbols_removed);
++ // Exclude printing for normal PrintGCDetails because people parse
++ // this output.
++ if (PrintGCDetails && Verbose && WizardMode) {
++ gclog_or_tty->print(" [Symbols: scanned=%d removed=%d size=" SIZE_FORMAT "K] ", *processed, *removed,
+ (memory_total*HeapWordSize)/1024);
+ }
+ }
+@@ -503,21 +535,21 @@
+ }
+ }
+ tty->print_cr("Symbol Table:");
+- tty->print_cr("Total number of symbols %5d", count);
+- tty->print_cr("Total size in memory %5dK",
++ tty->print_cr("Total number of symbols "INT32_FORMAT, count);
++ tty->print_cr("Total size in memory "INT32_FORMAT"K",
+ (memory_total*HeapWordSize)/1024);
+- tty->print_cr("Total counted %5d", symbols_counted);
+- tty->print_cr("Total removed %5d", symbols_removed);
+- if (symbols_counted > 0) {
++ tty->print_cr("Total counted "INT32_FORMAT, _symbols_counted);
++ tty->print_cr("Total removed "INT32_FORMAT, _symbols_removed);
++ if (_symbols_counted > 0) {
+ tty->print_cr("Percent removed %3.2f",
+- ((float)symbols_removed/(float)symbols_counted)* 100);
++ ((float)_symbols_removed/(float)_symbols_counted)* 100);
+ }
+- tty->print_cr("Reference counts %5d", Symbol::_total_count);
+- tty->print_cr("Symbol arena size %5d used %5d",
++ tty->print_cr("Reference counts "INT32_FORMAT, Symbol::_total_count);
++ tty->print_cr("Symbol arena size "SIZE_FORMAT" used "SIZE_FORMAT,
+ arena()->size_in_bytes(), arena()->used());
+ tty->print_cr("Histogram of symbol length:");
+- tty->print_cr("%8s %5d", "Total ", total);
+- tty->print_cr("%8s %5d", "Maximum", max_symbols);
++ tty->print_cr("%8s "INT32_FORMAT, "Total ", total);
++ tty->print_cr("%8s "INT32_FORMAT, "Maximum", max_symbols);
+ tty->print_cr("%8s %3.2f", "Average",
+ ((float) total / (float) the_table()->table_size()));
+ tty->print_cr("%s", "Histogram:");
+@@ -746,11 +778,41 @@
+ return result;
+ }
+
+-void StringTable::unlink(BoolObjectClosure* is_alive) {
++void StringTable::unlink(BoolObjectClosure* is_alive, int* processed, int* removed) {
++ buckets_unlink(is_alive, 0, the_table()->table_size(), processed, removed);
++}
++
++void StringTable::possibly_parallel_unlink(BoolObjectClosure* is_alive, int* processed, int* removed) {
+ // Readers of the table are unlocked, so we should only be removing
+ // entries at a safepoint.
+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
+- for (int i = 0; i < the_table()->table_size(); ++i) {
++ const int limit = the_table()->table_size();
++
++ for (;;) {
++ // Grab next set of buckets to scan
++ int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize;
++ if (start_idx >= limit) {
++ // End of table
++ break;
++ }
++
++ int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
++ buckets_unlink(is_alive, start_idx, end_idx, processed, removed);
++ }
++}
++
++void StringTable::buckets_unlink(BoolObjectClosure* is_alive, int start_idx, int end_idx, int* processed, int* removed) {
++ const int limit = the_table()->table_size();
++
++ assert(0 <= start_idx && start_idx <= limit,
++ err_msg("start_idx (" INT32_FORMAT ") is out of bounds", start_idx));
++ assert(0 <= end_idx && end_idx <= limit,
++ err_msg("end_idx (" INT32_FORMAT ") is out of bounds", end_idx));
++ assert(start_idx <= end_idx,
++ err_msg("Index ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT,
++ start_idx, end_idx));
++
++ for (int i = start_idx; i < end_idx; ++i) {
+ HashtableEntry<oop, mtSymbol>** p = the_table()->bucket_addr(i);
+ HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i);
+ while (entry != NULL) {
+@@ -767,24 +829,26 @@
+ } else {
+ *p = entry->next();
+ the_table()->free_entry(entry);
++ (*removed)++;
+ }
++ (*processed)++;
+ entry = (HashtableEntry<oop, mtSymbol>*)HashtableEntry<oop, mtSymbol>::make_ptr(*p);
+ }
+ }
+ }
+
+-void StringTable::buckets_do(OopClosure* f, int start_idx, int end_idx) {
++void StringTable::buckets_oops_do(OopClosure* f, int start_idx, int end_idx) {
+ const int limit = the_table()->table_size();
+
+ assert(0 <= start_idx && start_idx <= limit,
+- err_msg("start_idx (" INT32_FORMAT ") oob?", start_idx));
++ err_msg("start_idx (" INT32_FORMAT ") is out of bounds", start_idx));
+ assert(0 <= end_idx && end_idx <= limit,
+- err_msg("end_idx (" INT32_FORMAT ") oob?", end_idx));
++ err_msg("end_idx (" INT32_FORMAT ") is out of bounds", end_idx));
+ assert(start_idx <= end_idx,
+- err_msg("Ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT,
++ err_msg("Index ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT,
+ start_idx, end_idx));
+
+- for (int i = start_idx; i < end_idx; i += 1) {
++ for (int i = start_idx; i < end_idx; i++) {
+ HashtableEntry<oop, mtSymbol>** p = the_table()->bucket_addr(i);
+ HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i);
+ while (entry != NULL) {
+@@ -804,11 +868,10 @@
+ }
+
+ void StringTable::oops_do(OopClosure* f) {
+- buckets_do(f, 0, the_table()->table_size());
++ buckets_oops_do(f, 0, the_table()->table_size());
+ }
+
+ void StringTable::possibly_parallel_oops_do(OopClosure* f) {
+- const int ClaimChunkSize = 32;
+ const int limit = the_table()->table_size();
+
+ for (;;) {
+@@ -820,7 +883,7 @@
+ }
+
+ int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
+- buckets_do(f, start_idx, end_idx);
++ buckets_oops_do(f, start_idx, end_idx);
+ }
+ }
+
+--- ./hotspot/src/share/vm/classfile/symbolTable.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/classfile/symbolTable.hpp Wed May 07 19:26:16 2014 -0700
+@@ -86,8 +86,8 @@
+ static bool _needs_rehashing;
+
+ // For statistics
+- static int symbols_removed;
+- static int symbols_counted;
++ static int _symbols_removed;
++ static int _symbols_counted;
+
+ Symbol* allocate_symbol(const u1* name, int len, bool c_heap, TRAPS); // Assumes no characters larger than 0x7F
+
+@@ -126,6 +126,11 @@
+ static Arena* arena() { return _arena; } // called for statistics
+
+ static void initialize_symbols(int arena_alloc_size = 0);
++
++ static volatile int _parallel_claimed_idx;
++
++ // Release any dead symbols
++ static void buckets_unlink(int start_idx, int end_idx, int* processed, int* removed, size_t* memory_total);
+ public:
+ enum {
+ symbol_alloc_batch_size = 8,
+@@ -175,7 +180,19 @@
+ unsigned int* hashValues, TRAPS);
+
+ // Release any dead symbols
+- static void unlink();
++ static void unlink() {
++ int processed = 0;
++ int removed = 0;
++ unlink(&processed, &removed);
++ }
++ static void unlink(int* processed, int* removed);
++ // Release any dead symbols, possibly parallel version
++ static void possibly_parallel_unlink() {
++ int processed = 0;
++ int removed = 0;
++ possibly_parallel_unlink(&processed, &removed);
++ }
++ static void possibly_parallel_unlink(int* processed, int* removed);
+
+ // iterate over symbols
+ static void symbols_do(SymbolClosure *cl);
+@@ -233,6 +250,9 @@
+ // Rehash the symbol table if it gets out of balance
+ static void rehash_table();
+ static bool needs_rehashing() { return _needs_rehashing; }
++ // Parallel chunked scanning
++ static void clear_parallel_claimed_index() { _parallel_claimed_idx = 0; }
++ static int parallel_claimed_index() { return _parallel_claimed_idx; }
+ };
+
+ class StringTable : public Hashtable<oop, mtSymbol> {
+@@ -256,7 +276,9 @@
+
+ // Apply the give oop closure to the entries to the buckets
+ // in the range [start_idx, end_idx).
+- static void buckets_do(OopClosure* f, int start_idx, int end_idx);
++ static void buckets_oops_do(OopClosure* f, int start_idx, int end_idx);
++ // Unlink the entries to the buckets in the range [start_idx, end_idx).
++ static void buckets_unlink(BoolObjectClosure* is_alive, int start_idx, int end_idx, int* processed, int* removed);
+
+ StringTable() : Hashtable<oop, mtSymbol>((int)StringTableSize,
+ sizeof (HashtableEntry<oop, mtSymbol>)) {}
+@@ -283,7 +305,13 @@
+
+ // GC support
+ // Delete pointers to otherwise-unreachable objects.
+- static void unlink(BoolObjectClosure* cl);
++ static void unlink(BoolObjectClosure* cl) {
++ int processed = 0;
++ int removed = 0;
++ unlink(cl, &processed, &removed);
++ }
++
++ static void unlink(BoolObjectClosure* cl, int* processed, int* removed);
+
+ // Serially invoke "f->do_oop" on the locations of all oops in the table.
+ static void oops_do(OopClosure* f);
+@@ -291,6 +319,8 @@
+ // Possibly parallel version of the above
+ static void possibly_parallel_oops_do(OopClosure* f);
+
++ static void possibly_parallel_unlink(BoolObjectClosure* cl, int* processed, int* removed);
++
+ // Hashing algorithm, used as the hash value used by the
+ // StringTable for bucket selection and comparison (stored in the
+ // HashtableEntry structures). This is used in the String.intern() method.
+@@ -328,5 +358,6 @@
+
+ // Parallel chunked scanning
+ static void clear_parallel_claimed_index() { _parallel_claimed_idx = 0; }
++ static int parallel_claimed_index() { return _parallel_claimed_idx; }
+ };
+ #endif // SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP
+--- ./hotspot/src/share/vm/classfile/systemDictionary.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/classfile/systemDictionary.cpp Wed May 07 19:26:16 2014 -0700
+@@ -585,7 +585,7 @@
+ assert(name != NULL && !FieldType::is_array(name) &&
+ !FieldType::is_obj(name), "invalid class name");
+
+- TracingTime class_load_start_time = Tracing::time();
++ const Ticks class_load_start_time = Ticks::now();
+
+ // UseNewReflection
+ // Fix for 4474172; see evaluation for more details
+@@ -946,7 +946,7 @@
+ TRAPS) {
+ TempNewSymbol parsed_name = NULL;
+
+- TracingTime class_load_start_time = Tracing::time();
++ const Ticks class_load_start_time = Ticks::now();
+
+ // Parse the stream. Note that we do this even though this klass might
+ // already be present in the SystemDictionary, otherwise we would not
+@@ -1572,9 +1572,10 @@
+ // Used for assertions and verification only
+ klassOop SystemDictionary::find_class(Symbol* class_name, Handle class_loader) {
+ #ifndef ASSERT
+- guarantee(VerifyBeforeGC ||
+- VerifyDuringGC ||
+- VerifyBeforeExit ||
++ guarantee(VerifyBeforeGC ||
++ VerifyDuringGC ||
++ VerifyBeforeExit ||
++ VerifyDuringStartup ||
+ VerifyAfterGC, "too expensive");
+ #endif
+ assert_locked_or_safepoint(SystemDictionary_lock);
+@@ -2314,6 +2315,11 @@
+ objArrayHandle appendix_box = oopFactory::new_objArray(SystemDictionary::Object_klass(), 1, CHECK_(empty));
+ assert(appendix_box->obj_at(0) == NULL, "");
+
++ // This should not happen. JDK code should take care of that.
++ if (accessing_klass.is_null() || method_type.is_null()) {
++ THROW_MSG_(vmSymbols::java_lang_InternalError(), "bad invokehandle", empty);
++ }
++
+ // call java.lang.invoke.MethodHandleNatives::linkMethod(... String, MethodType) -> MemberName
+ JavaCallArguments args;
+ args.push_oop(accessing_klass()->java_mirror());
+@@ -2439,6 +2445,9 @@
+ Handle type;
+ if (signature->utf8_length() > 0 && signature->byte_at(0) == '(') {
+ type = find_method_handle_type(signature, caller, CHECK_(empty));
++ } else if (caller.is_null()) {
++ // This should not happen. JDK code should take care of that.
++ THROW_MSG_(vmSymbols::java_lang_InternalError(), "bad MH constant", empty);
+ } else {
+ ResourceMark rm(THREAD);
+ SignatureStream ss(signature, false);
+@@ -2502,6 +2511,11 @@
+ Handle method_name = java_lang_String::create_from_symbol(name, CHECK_(empty));
+ Handle method_type = find_method_handle_type(type, caller, CHECK_(empty));
+
++ // This should not happen. JDK code should take care of that.
++ if (caller.is_null() || method_type.is_null()) {
++ THROW_MSG_(vmSymbols::java_lang_InternalError(), "bad invokedynamic", empty);
++ }
++
+ objArrayHandle appendix_box = oopFactory::new_objArray(SystemDictionary::Object_klass(), 1, CHECK_(empty));
+ assert(appendix_box->obj_at(0) == NULL, "");
+
+@@ -2607,13 +2621,12 @@
+ }
+
+ // utility function for posting class load event
+-void SystemDictionary::post_class_load_event(TracingTime start_time,
++void SystemDictionary::post_class_load_event(const Ticks& start_time,
+ instanceKlassHandle k,
+ Handle initiating_loader) {
+ #if INCLUDE_TRACE
+ EventClassLoad event(UNTIMED);
+ if (event.should_commit()) {
+- event.set_endtime(Tracing::time());
+ event.set_starttime(start_time);
+ event.set_loadedClass(k());
+ oop defining_class_loader = k->class_loader();
+@@ -2632,7 +2645,7 @@
+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
+ if (Tracing::enabled()) {
+ _should_write_unload_events = Tracing::is_event_enabled(TraceClassUnloadEvent);
+- _class_unload_time = Tracing::time();
++ _class_unload_time = Ticks::now();
+ _is_alive = is_alive;
+ classes_do(&class_unload_event);
+
+@@ -2648,7 +2661,7 @@
+
+ #if INCLUDE_TRACE
+
+-TracingTime SystemDictionary::_class_unload_time;
++Ticks SystemDictionary::_class_unload_time;
+ BoolObjectClosure* SystemDictionary::_is_alive = NULL;
+ int SystemDictionary::_no_of_classes_unloading = 0;
+ bool SystemDictionary::_should_write_unload_events = false;
+--- ./hotspot/src/share/vm/classfile/systemDictionary.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/classfile/systemDictionary.hpp Wed May 07 19:26:16 2014 -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
+@@ -33,7 +33,7 @@
+ #include "runtime/reflectionUtils.hpp"
+ #include "utilities/hashtable.hpp"
+ #include "utilities/hashtable.inline.hpp"
+-#include "trace/traceTime.hpp"
++#include "utilities/ticks.hpp"
+
+ // The system dictionary stores all loaded classes and maps:
+ //
+@@ -151,6 +151,7 @@
+ do_klass(MemberName_klass, java_lang_invoke_MemberName, Pre_JSR292 ) \
+ do_klass(MethodHandleNatives_klass, java_lang_invoke_MethodHandleNatives, Pre_JSR292 ) \
+ do_klass(LambdaForm_klass, java_lang_invoke_LambdaForm, Opt ) \
++ do_klass(DirectMethodHandle_klass, java_lang_invoke_DirectMethodHandle, Opt ) \
+ do_klass(MethodType_klass, java_lang_invoke_MethodType, Pre_JSR292 ) \
+ do_klass(BootstrapMethodError_klass, java_lang_BootstrapMethodError, Pre_JSR292 ) \
+ do_klass(CallSite_klass, java_lang_invoke_CallSite, Pre_JSR292 ) \
+@@ -616,7 +617,7 @@
+ static void add_to_hierarchy(instanceKlassHandle k, TRAPS);
+
+ // event based tracing
+- static void post_class_load_event(TracingTime start_time, instanceKlassHandle k,
++ static void post_class_load_event(const Ticks& start_time, instanceKlassHandle k,
+ Handle initiating_loader);
+ static void post_class_unload_events(BoolObjectClosure* is_alive);
+
+@@ -678,7 +679,7 @@
+ static bool _has_checkPackageAccess;
+
+ #if INCLUDE_TRACE
+- static TracingTime _class_unload_time;
++ static Ticks _class_unload_time;
+ static BoolObjectClosure* _is_alive;
+ static int _no_of_classes_unloading;
+ static bool _should_write_unload_events;
+--- ./hotspot/src/share/vm/classfile/vmSymbols.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/classfile/vmSymbols.hpp Wed May 07 19:26:16 2014 -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
+@@ -243,6 +243,7 @@
+ /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \
+ template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \
+ template(java_lang_invoke_ConstantCallSite, "java/lang/invoke/ConstantCallSite") \
++ template(java_lang_invoke_DirectMethodHandle, "java/lang/invoke/DirectMethodHandle") \
+ template(java_lang_invoke_MutableCallSite, "java/lang/invoke/MutableCallSite") \
+ template(java_lang_invoke_VolatileCallSite, "java/lang/invoke/VolatileCallSite") \
+ template(java_lang_invoke_MethodHandle, "java/lang/invoke/MethodHandle") \
+@@ -338,6 +339,7 @@
+ template(thread_id_name, "tid") \
+ template(newInstance0_name, "newInstance0") \
+ template(limit_name, "limit") \
++ template(member_name, "member") \
+ template(forName_name, "forName") \
+ template(forName0_name, "forName0") \
+ template(isJavaIdentifierStart_name, "isJavaIdentifierStart") \
+--- ./hotspot/src/share/vm/code/nmethod.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/code/nmethod.cpp Wed May 07 19:26:16 2014 -0700
+@@ -676,6 +676,7 @@
+ code_buffer->copy_oops_to(this);
+ if (ScavengeRootsInCode && detect_scavenge_root_oops()) {
+ CodeCache::add_scavenge_root_nmethod(this);
++ Universe::heap()->register_nmethod(this);
+ }
+ debug_only(verify_scavenge_root_oops());
+ CodeCache::commit(this);
+@@ -869,6 +870,7 @@
+ dependencies->copy_to(this);
+ if (ScavengeRootsInCode && detect_scavenge_root_oops()) {
+ CodeCache::add_scavenge_root_nmethod(this);
++ Universe::heap()->register_nmethod(this);
+ }
+ debug_only(verify_scavenge_root_oops());
+
+@@ -1282,6 +1284,13 @@
+ methodHandle the_method(method());
+ No_Safepoint_Verifier nsv;
+
++ // during patching, depending on the nmethod state we must notify the GC that
++ // code has been unloaded, unregistering it. We cannot do this right while
++ // holding the Patching_lock because we need to use the CodeCache_lock. This
++ // would be prone to deadlocks.
++ // This flag is used to remember whether we need to later lock and unregister.
++ bool nmethod_needs_unregister = false;
++
+ {
+ // invalidate osr nmethod before acquiring the patching lock since
+ // they both acquire leaf locks and we don't want a deadlock.
+@@ -1314,6 +1323,13 @@
+ inc_decompile_count();
+ }
+
++ // If the state is becoming a zombie, signal to unregister the nmethod with
++ // the heap.
++ // This nmethod may have already been unloaded during a full GC.
++ if ((state == zombie) && !is_unloaded()) {
++ nmethod_needs_unregister = true;
++ }
++
+ // Change state
+ _state = state;
+
+@@ -1349,6 +1365,9 @@
+ // safepoint can sneak in, otherwise the oops used by the
+ // dependency logic could have become stale.
+ MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
++ if (nmethod_needs_unregister) {
++ Universe::heap()->unregister_nmethod(this);
++ }
+ flush_dependencies(NULL);
+ }
+
+@@ -1696,20 +1715,10 @@
+ #endif // !PRODUCT
+ }
+
+-// This method is called twice during GC -- once while
+-// tracing the "active" nmethods on thread stacks during
+-// the (strong) marking phase, and then again when walking
+-// the code cache contents during the weak roots processing
+-// phase. The two uses are distinguished by means of the
+-// 'do_strong_roots_only' flag, which is true in the first
+-// case. We want to walk the weak roots in the nmethod
+-// only in the second case. The weak roots in the nmethod
+-// are the oops in the ExceptionCache and the InlineCache
+-// oops.
+-void nmethod::oops_do(OopClosure* f, bool do_strong_roots_only) {
+- // make sure the oops ready to receive visitors
+- assert(!is_zombie() && !is_unloaded(),
+- "should not call follow on zombie or unloaded nmethod");
++void nmethod::oops_do(OopClosure* f, bool do_strong_roots_only, bool allow_zombie) {
++ // make sure the oops ready to receive visitors
++ assert(allow_zombie || !is_zombie(), "should not call follow on zombie nmethod");
++ assert(!is_unloaded(), "should not call follow on unloaded nmethod");
+
+ // If the method is not entrant or zombie then a JMP is plastered over the
+ // first few bytes. If an oop in the old code was there, that oop
+--- ./hotspot/src/share/vm/code/nmethod.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/code/nmethod.hpp Wed May 07 19:26:16 2014 -0700
+@@ -548,8 +548,8 @@
+
+ void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map,
+ OopClosure* f);
+- void oops_do(OopClosure* f) { oops_do(f, false); }
+- void oops_do(OopClosure* f, bool do_strong_roots_only);
++ void oops_do(OopClosure* f) { oops_do(f, false, false); }
++ void oops_do(OopClosure* f, bool do_strong_roots_only, bool allow_zombie);
+ bool detect_scavenge_root_oops();
+ void verify_scavenge_root_oops() PRODUCT_RETURN;
+
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp Wed May 07 19:26:16 2014 -0700
+@@ -58,8 +58,22 @@
+ MarkRefsIntoClosure(MemRegion span, CMSBitMap* bitMap);
+ virtual void do_oop(oop* p);
+ virtual void do_oop(narrowOop* p);
+- inline void do_oop_nv(oop* p) { MarkRefsIntoClosure::do_oop_work(p); }
+- inline void do_oop_nv(narrowOop* p) { MarkRefsIntoClosure::do_oop_work(p); }
++
++ Prefetch::style prefetch_style() {
++ return Prefetch::do_read;
++ }
++};
++
++class Par_MarkRefsIntoClosure: public OopsInGenClosure {
++ private:
++ const MemRegion _span;
++ CMSBitMap* _bitMap;
++ protected:
++ DO_OOP_WORK_DEFN
++ public:
++ Par_MarkRefsIntoClosure(MemRegion span, CMSBitMap* bitMap);
++ virtual void do_oop(oop* p);
++ virtual void do_oop(narrowOop* p);
+ bool do_header() { return true; }
+ Prefetch::style prefetch_style() {
+ return Prefetch::do_read;
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Wed May 07 19:26:16 2014 -0700
+@@ -575,6 +575,7 @@
+ _restart_addr(NULL),
+ _overflow_list(NULL),
+ _stats(cmsGen),
++ _eden_chunk_lock(new Mutex(Mutex::leaf + 1, "CMS_eden_chunk_lock", true)),
+ _eden_chunk_array(NULL), // may be set in ctor body
+ _eden_chunk_capacity(0), // -- ditto --
+ _eden_chunk_index(0), // -- ditto --
+@@ -754,7 +755,7 @@
+ assert(_eden_chunk_array != NULL || _eden_chunk_capacity == 0, "Error");
+
+ // Support for parallelizing survivor space rescan
+- if (CMSParallelRemarkEnabled && CMSParallelSurvivorRemarkEnabled) {
++ if ((CMSParallelRemarkEnabled && CMSParallelSurvivorRemarkEnabled) || CMSParallelInitialMarkEnabled) {
+ const size_t max_plab_samples =
+ ((DefNewGeneration*)_young_gen)->max_survivor_size()/MinTLABSize;
+
+@@ -1997,7 +1998,7 @@
+ GenCollectedHeap* gch = GenCollectedHeap::heap();
+
+ STWGCTimer* gc_timer = GenMarkSweep::gc_timer();
+- gc_timer->register_gc_start(os::elapsed_counter());
++ gc_timer->register_gc_start();
+
+ SerialOldTracer* gc_tracer = GenMarkSweep::gc_tracer();
+ gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
+@@ -2094,7 +2095,7 @@
+ size_policy()->msc_collection_end(gch->gc_cause());
+ }
+
+- gc_timer->register_gc_end(os::elapsed_counter());
++ gc_timer->register_gc_end();
+
+ gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
+
+@@ -2136,6 +2137,39 @@
+ }
+
+
++void CMSCollector::print_eden_and_survivor_chunk_arrays() {
++ DefNewGeneration* dng = _young_gen->as_DefNewGeneration();
++ EdenSpace* eden_space = dng->eden();
++ ContiguousSpace* from_space = dng->from();
++ ContiguousSpace* to_space = dng->to();
++ // Eden
++ if (_eden_chunk_array != NULL) {
++ gclog_or_tty->print_cr("eden " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")",
++ eden_space->bottom(), eden_space->top(),
++ eden_space->end(), eden_space->capacity());
++ gclog_or_tty->print_cr("_eden_chunk_index=" SIZE_FORMAT ", "
++ "_eden_chunk_capacity=" SIZE_FORMAT,
++ _eden_chunk_index, _eden_chunk_capacity);
++ for (size_t i = 0; i < _eden_chunk_index; i++) {
++ gclog_or_tty->print_cr("_eden_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT,
++ i, _eden_chunk_array[i]);
++ }
++ }
++ // Survivor
++ if (_survivor_chunk_array != NULL) {
++ gclog_or_tty->print_cr("survivor " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")",
++ from_space->bottom(), from_space->top(),
++ from_space->end(), from_space->capacity());
++ gclog_or_tty->print_cr("_survivor_chunk_index=" SIZE_FORMAT ", "
++ "_survivor_chunk_capacity=" SIZE_FORMAT,
++ _survivor_chunk_index, _survivor_chunk_capacity);
++ for (size_t i = 0; i < _survivor_chunk_index; i++) {
++ gclog_or_tty->print_cr("_survivor_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT,
++ i, _survivor_chunk_array[i]);
++ }
++ }
++}
++
+ void CMSCollector::getFreelistLocks() const {
+ // Get locks for all free lists in all generations that this
+ // collector is responsible for
+@@ -2443,7 +2477,7 @@
+
+ void CMSCollector::register_gc_start(GCCause::Cause cause) {
+ _cms_start_registered = true;
+- _gc_timer_cm->register_gc_start(os::elapsed_counter());
++ _gc_timer_cm->register_gc_start();
+ _gc_tracer_cm->report_gc_start(cause, _gc_timer_cm->gc_start());
+ }
+
+@@ -2451,7 +2485,7 @@
+ if (_cms_start_registered) {
+ report_heap_summary(GCWhen::AfterGC);
+
+- _gc_timer_cm->register_gc_end(os::elapsed_counter());
++ _gc_timer_cm->register_gc_end();
+ _gc_tracer_cm->report_gc_end(_gc_timer_cm->gc_end(), _gc_timer_cm->time_partitions());
+ _cms_start_registered = false;
+ }
+@@ -2510,8 +2544,7 @@
+ // initial marking in checkpointRootsInitialWork has been completed
+ if (VerifyDuringGC &&
+ GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
+- gclog_or_tty->print("Verify before initial mark: ");
+- Universe::verify();
++ Universe::verify("Verify before initial mark: ");
+ }
+ {
+ bool res = markFromRoots(false);
+@@ -2522,8 +2555,7 @@
+ case FinalMarking:
+ if (VerifyDuringGC &&
+ GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
+- gclog_or_tty->print("Verify before re-mark: ");
+- Universe::verify();
++ Universe::verify("Verify before re-mark: ");
+ }
+ checkpointRootsFinal(false, clear_all_soft_refs,
+ init_mark_was_synchronous);
+@@ -2534,8 +2566,7 @@
+ // final marking in checkpointRootsFinal has been completed
+ if (VerifyDuringGC &&
+ GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
+- gclog_or_tty->print("Verify before sweep: ");
+- Universe::verify();
++ Universe::verify("Verify before sweep: ");
+ }
+ sweep(false);
+ assert(_collectorState == Resizing, "Incorrect state");
+@@ -2550,8 +2581,7 @@
+ // The heap has been resized.
+ if (VerifyDuringGC &&
+ GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
+- gclog_or_tty->print("Verify before reset: ");
+- Universe::verify();
++ Universe::verify("Verify before reset: ");
+ }
+ save_heap_summary();
+ reset(false);
+@@ -2890,8 +2920,8 @@
+ bool failed() { return _failed; }
+ };
+
+-bool CMSCollector::verify_after_remark() {
+- gclog_or_tty->print(" [Verifying CMS Marking... ");
++bool CMSCollector::verify_after_remark(bool silent) {
++ if (!silent) gclog_or_tty->print(" [Verifying CMS Marking... ");
+ MutexLockerEx ml(verification_mark_bm()->lock(), Mutex::_no_safepoint_check_flag);
+ static bool init = false;
+
+@@ -2952,7 +2982,7 @@
+ warning("Unrecognized value %d for CMSRemarkVerifyVariant",
+ CMSRemarkVerifyVariant);
+ }
+- gclog_or_tty->print(" done] ");
++ if (!silent) gclog_or_tty->print(" done] ");
+ return true;
+ }
+
+@@ -3530,6 +3560,31 @@
+
+ // CMS work
+
++// The common parts of CMSParInitialMarkTask and CMSParRemarkTask.
++class CMSParMarkTask : public AbstractGangTask {
++ protected:
++ CMSCollector* _collector;
++ int _n_workers;
++ CMSParMarkTask(const char* name, CMSCollector* collector, int n_workers) :
++ AbstractGangTask(name),
++ _collector(collector),
++ _n_workers(n_workers) {}
++ // Work method in support of parallel rescan ... of young gen spaces
++ void do_young_space_rescan(uint worker_id, OopsInGenClosure* cl,
++ ContiguousSpace* space,
++ HeapWord** chunk_array, size_t chunk_top);
++ void work_on_young_gen_roots(uint worker_id, OopsInGenClosure* cl);
++};
++
++// Parallel initial mark task
++class CMSParInitialMarkTask: public CMSParMarkTask {
++ public:
++ CMSParInitialMarkTask(CMSCollector* collector, int n_workers) :
++ CMSParMarkTask("Scan roots and young gen for initial mark in parallel",
++ collector, n_workers) {}
++ void work(uint worker_id);
++};
++
+ // Checkpoint the roots into this generation from outside
+ // this generation. [Note this initial checkpoint need only
+ // be approximate -- we'll do a catch up phase subsequently.]
+@@ -3619,20 +3674,42 @@
+ // weak reference processing has not started yet.
+ ref_processor()->set_enqueuing_is_done(false);
+
++ if (CMSPrintEdenSurvivorChunks) {
++ print_eden_and_survivor_chunk_arrays();
++ }
++
+ {
+ // This is not needed. DEBUG_ONLY(RememberKlassesChecker imx(true);)
+ COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
+- gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
+- gch->gen_process_strong_roots(_cmsGen->level(),
+- true, // younger gens are roots
+- true, // activate StrongRootsScope
+- true, // collecting perm gen
+- SharedHeap::ScanningOption(roots_scanning_options()),
+- &notOlder,
+- true, // walk all of code cache if (so & SO_CodeCache)
+- NULL);
+- }
+-
++ if (CMSParallelInitialMarkEnabled && CollectedHeap::use_parallel_gc_threads()) {
++ // The parallel version.
++ FlexibleWorkGang* workers = gch->workers();
++ assert(workers != NULL, "Need parallel worker threads.");
++ int n_workers = workers->active_workers();
++ CMSParInitialMarkTask tsk(this, n_workers);
++ gch->set_par_threads(n_workers);
++ initialize_sequential_subtasks_for_young_gen_rescan(n_workers);
++ if (n_workers > 1) {
++ GenCollectedHeap::StrongRootsScope srs(gch);
++ workers->run_task(&tsk);
++ } else {
++ GenCollectedHeap::StrongRootsScope srs(gch);
++ tsk.work(0);
++ }
++ gch->set_par_threads(0);
++ } else {
++ // The serial version.
++ gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
++ gch->gen_process_strong_roots(_cmsGen->level(),
++ true, // younger gens are roots
++ true, // activate StrongRootsScope
++ true, // collecting perm gen
++ SharedHeap::ScanningOption(roots_scanning_options()),
++ &notOlder,
++ true, // walk all of code cache if (so & SO_CodeCache)
++ NULL);
++ }
++ }
+ // Clear mod-union table; it will be dirtied in the prologue of
+ // CMS generation per each younger generation collection.
+
+@@ -4414,7 +4491,9 @@
+ verify_overflow_empty();
+ _abort_preclean = false;
+ if (CMSPrecleaningEnabled) {
+- _eden_chunk_index = 0;
++ if (!CMSEdenChunksRecordAlways) {
++ _eden_chunk_index = 0;
++ }
+ size_t used = get_eden_used();
+ size_t capacity = get_eden_capacity();
+ // Don't start sampling unless we will get sufficiently
+@@ -4523,7 +4602,9 @@
+ if (!_start_sampling) {
+ return;
+ }
+- if (_eden_chunk_array) {
++ // When CMSEdenChunksRecordAlways is true, the eden chunk array
++ // is populated by the young generation.
++ if (_eden_chunk_array != NULL && !CMSEdenChunksRecordAlways) {
+ if (_eden_chunk_index < _eden_chunk_capacity) {
+ _eden_chunk_array[_eden_chunk_index] = *_top_addr; // take sample
+ assert(_eden_chunk_array[_eden_chunk_index] <= *_end_addr,
+@@ -5000,6 +5081,10 @@
+ // Update the saved marks which may affect the root scans.
+ gch->save_marks();
+
++ if (CMSPrintEdenSurvivorChunks) {
++ print_eden_and_survivor_chunk_arrays();
++ }
++
+ {
+ COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
+
+@@ -5107,10 +5192,51 @@
+ }
+ }
+
++void CMSParInitialMarkTask::work(uint worker_id) {
++ elapsedTimer _timer;
++ ResourceMark rm;
++ HandleMark hm;
++
++ // ---------- scan from roots --------------
++ _timer.start();
++ GenCollectedHeap* gch = GenCollectedHeap::heap();
++ Par_MarkRefsIntoClosure par_mri_cl(_collector->_span, &(_collector->_markBitMap));
++
++ // ---------- young gen roots --------------
++ {
++ work_on_young_gen_roots(worker_id, &par_mri_cl);
++ _timer.stop();
++ if (PrintCMSStatistics != 0) {
++ gclog_or_tty->print_cr(
++ "Finished young gen initial mark scan work in %dth thread: %3.3f sec",
++ worker_id, _timer.seconds());
++ }
++ }
++
++ // ---------- remaining roots --------------
++ _timer.reset();
++ _timer.start();
++ gch->gen_process_strong_roots(_collector->_cmsGen->level(),
++ false, // yg was scanned above
++ false, // this is parallel code
++ true, // collecting perm gen
++ SharedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
++ &par_mri_cl,
++ true, // walk all of code cache if (so & SO_CodeCache)
++ NULL);
++ assert(_collector->should_unload_classes()
++ || (_collector->CMSCollector::roots_scanning_options() & SharedHeap::SO_CodeCache),
++ "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
++ _timer.stop();
++ if (PrintCMSStatistics != 0) {
++ gclog_or_tty->print_cr(
++ "Finished remaining root initial mark scan work in %dth thread: %3.3f sec",
++ worker_id, _timer.seconds());
++ }
++}
++
+ // Parallel remark task
+-class CMSParRemarkTask: public AbstractGangTask {
+- CMSCollector* _collector;
+- int _n_workers;
++class CMSParRemarkTask: public CMSParMarkTask {
+ CompactibleFreeListSpace* _cms_space;
+ CompactibleFreeListSpace* _perm_space;
+
+@@ -5126,10 +5252,9 @@
+ CompactibleFreeListSpace* perm_space,
+ int n_workers, FlexibleWorkGang* workers,
+ OopTaskQueueSet* task_queues):
+- AbstractGangTask("Rescan roots and grey objects in parallel"),
+- _collector(collector),
++ CMSParMarkTask("Rescan roots and grey objects in parallel",
++ collector, n_workers),
+ _cms_space(cms_space), _perm_space(perm_space),
+- _n_workers(n_workers),
+ _task_queues(task_queues),
+ _term(n_workers, task_queues) { }
+
+@@ -5143,11 +5268,6 @@
+ void work(uint worker_id);
+
+ private:
+- // Work method in support of parallel rescan ... of young gen spaces
+- void do_young_space_rescan(int i, Par_MarkRefsIntoAndScanClosure* cl,
+- ContiguousSpace* space,
+- HeapWord** chunk_array, size_t chunk_top);
+-
+ // ... of dirty cards in old space
+ void do_dirty_card_rescan_tasks(CompactibleFreeListSpace* sp, int i,
+ Par_MarkRefsIntoAndScanClosure* cl);
+@@ -5156,6 +5276,25 @@
+ void do_work_steal(int i, Par_MarkRefsIntoAndScanClosure* cl, int* seed);
+ };
+
++void CMSParMarkTask::work_on_young_gen_roots(uint worker_id, OopsInGenClosure* cl) {
++ DefNewGeneration* dng = _collector->_young_gen->as_DefNewGeneration();
++ EdenSpace* eden_space = dng->eden();
++ ContiguousSpace* from_space = dng->from();
++ ContiguousSpace* to_space = dng->to();
++
++ HeapWord** eca = _collector->_eden_chunk_array;
++ size_t ect = _collector->_eden_chunk_index;
++ HeapWord** sca = _collector->_survivor_chunk_array;
++ size_t sct = _collector->_survivor_chunk_index;
++
++ assert(ect <= _collector->_eden_chunk_capacity, "out of bounds");
++ assert(sct <= _collector->_survivor_chunk_capacity, "out of bounds");
++
++ do_young_space_rescan(worker_id, cl, to_space, NULL, 0);
++ do_young_space_rescan(worker_id, cl, from_space, sca, sct);
++ do_young_space_rescan(worker_id, cl, eden_space, eca, ect);
++}
++
+ // work_queue(i) is passed to the closure
+ // Par_MarkRefsIntoAndScanClosure. The "i" parameter
+ // also is passed to do_dirty_card_rescan_tasks() and to
+@@ -5180,23 +5319,7 @@
+ // work first.
+ // ---------- young gen roots --------------
+ {
+- DefNewGeneration* dng = _collector->_young_gen->as_DefNewGeneration();
+- EdenSpace* eden_space = dng->eden();
+- ContiguousSpace* from_space = dng->from();
+- ContiguousSpace* to_space = dng->to();
+-
+- HeapWord** eca = _collector->_eden_chunk_array;
+- size_t ect = _collector->_eden_chunk_index;
+- HeapWord** sca = _collector->_survivor_chunk_array;
+- size_t sct = _collector->_survivor_chunk_index;
+-
+- assert(ect <= _collector->_eden_chunk_capacity, "out of bounds");
+- assert(sct <= _collector->_survivor_chunk_capacity, "out of bounds");
+-
+- do_young_space_rescan(worker_id, &par_mrias_cl, to_space, NULL, 0);
+- do_young_space_rescan(worker_id, &par_mrias_cl, from_space, sca, sct);
+- do_young_space_rescan(worker_id, &par_mrias_cl, eden_space, eca, ect);
+-
++ work_on_young_gen_roots(worker_id, &par_mrias_cl);
+ _timer.stop();
+ if (PrintCMSStatistics != 0) {
+ gclog_or_tty->print_cr(
+@@ -5257,8 +5380,8 @@
+
+ // Note that parameter "i" is not used.
+ void
+-CMSParRemarkTask::do_young_space_rescan(int i,
+- Par_MarkRefsIntoAndScanClosure* cl, ContiguousSpace* space,
++CMSParMarkTask::do_young_space_rescan(uint worker_id,
++ OopsInGenClosure* cl, ContiguousSpace* space,
+ HeapWord** chunk_array, size_t chunk_top) {
+ // Until all tasks completed:
+ // . claim an unclaimed task
+@@ -5454,6 +5577,32 @@
+ "Else our work is not yet done");
+ }
+
++// Record object boundaries in _eden_chunk_array by sampling the eden
++// top in the slow-path eden object allocation code path and record
++// the boundaries, if CMSEdenChunksRecordAlways is true. If
++// CMSEdenChunksRecordAlways is false, we use the other asynchronous
++// sampling in sample_eden() that activates during the part of the
++// preclean phase.
++void CMSCollector::sample_eden_chunk() {
++ if (CMSEdenChunksRecordAlways && _eden_chunk_array != NULL) {
++ if (_eden_chunk_lock->try_lock()) {
++ // Record a sample. This is the critical section. The contents
++ // of the _eden_chunk_array have to be non-decreasing in the
++ // address order.
++ _eden_chunk_array[_eden_chunk_index] = *_top_addr;
++ assert(_eden_chunk_array[_eden_chunk_index] <= *_end_addr,
++ "Unexpected state of Eden");
++ if (_eden_chunk_index == 0 ||
++ ((_eden_chunk_array[_eden_chunk_index] > _eden_chunk_array[_eden_chunk_index-1]) &&
++ (pointer_delta(_eden_chunk_array[_eden_chunk_index],
++ _eden_chunk_array[_eden_chunk_index-1]) >= CMSSamplingGrain))) {
++ _eden_chunk_index++; // commit sample
++ }
++ _eden_chunk_lock->unlock();
++ }
++ }
++}
++
+ // Return a thread-local PLAB recording array, as appropriate.
+ void* CMSCollector::get_data_recorder(int thr_num) {
+ if (_survivor_plab_array != NULL &&
+@@ -5477,12 +5626,13 @@
+
+ // Merge the per-thread plab arrays into the global survivor chunk
+ // array which will provide the partitioning of the survivor space
+-// for CMS rescan.
++// for CMS initial scan and rescan.
+ void CMSCollector::merge_survivor_plab_arrays(ContiguousSpace* surv,
+ int no_of_gc_threads) {
+ assert(_survivor_plab_array != NULL, "Error");
+ assert(_survivor_chunk_array != NULL, "Error");
+- assert(_collectorState == FinalMarking, "Error");
++ assert(_collectorState == FinalMarking ||
++ (CMSParallelInitialMarkEnabled && _collectorState == InitialMarking), "Error");
+ for (int j = 0; j < no_of_gc_threads; j++) {
+ _cursor[j] = 0;
+ }
+@@ -5545,7 +5695,7 @@
+ }
+
+ // Set up the space's par_seq_tasks structure for work claiming
+-// for parallel rescan of young gen.
++// for parallel initial scan and rescan of young gen.
+ // See ParRescanTask where this is currently used.
+ void
+ CMSCollector::
+@@ -6695,6 +6845,28 @@
+ void MarkRefsIntoClosure::do_oop(oop* p) { MarkRefsIntoClosure::do_oop_work(p); }
+ void MarkRefsIntoClosure::do_oop(narrowOop* p) { MarkRefsIntoClosure::do_oop_work(p); }
+
++Par_MarkRefsIntoClosure::Par_MarkRefsIntoClosure(
++ MemRegion span, CMSBitMap* bitMap):
++ _span(span),
++ _bitMap(bitMap)
++{
++ assert(_ref_processor == NULL, "deliberately left NULL");
++ assert(_bitMap->covers(_span), "_bitMap/_span mismatch");
++}
++
++void Par_MarkRefsIntoClosure::do_oop(oop obj) {
++ // if p points into _span, then mark corresponding bit in _markBitMap
++ assert(obj->is_oop(), "expected an oop");
++ HeapWord* addr = (HeapWord*)obj;
++ if (_span.contains(addr)) {
++ // this should be made more efficient
++ _bitMap->par_mark(addr);
++ }
++}
++
++void Par_MarkRefsIntoClosure::do_oop(oop* p) { Par_MarkRefsIntoClosure::do_oop_work(p); }
++void Par_MarkRefsIntoClosure::do_oop(narrowOop* p) { Par_MarkRefsIntoClosure::do_oop_work(p); }
++
+ // A variant of the above, used for CMS marking verification.
+ MarkRefsIntoVerifyClosure::MarkRefsIntoVerifyClosure(
+ MemRegion span, CMSBitMap* verification_bm, CMSBitMap* cms_bm):
+@@ -9360,7 +9532,6 @@
+ return;
+ }
+ }
+-
+ // Transfer some number of overflown objects to usual marking
+ // stack. Return true if some objects were transferred.
+ bool MarkRefsIntoAndScanClosure::take_from_overflow_list() {
+@@ -9432,4 +9603,3 @@
+ ShouldNotReachHere();
+ }
+ }
+-
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp Wed May 07 19:26:16 2014 -0700
+@@ -516,6 +516,8 @@
+ friend class ConcurrentMarkSweepThread;
+ friend class ConcurrentMarkSweepGeneration;
+ friend class CompactibleFreeListSpace;
++ friend class CMSParMarkTask;
++ friend class CMSParInitialMarkTask;
+ friend class CMSParRemarkTask;
+ friend class CMSConcMarkingTask;
+ friend class CMSRefProcTaskProxy;
+@@ -752,6 +754,7 @@
+ Generation* _young_gen; // the younger gen
+ HeapWord** _top_addr; // ... Top of Eden
+ HeapWord** _end_addr; // ... End of Eden
++ Mutex* _eden_chunk_lock;
+ HeapWord** _eden_chunk_array; // ... Eden partitioning array
+ size_t _eden_chunk_index; // ... top (exclusive) of array
+ size_t _eden_chunk_capacity; // ... max entries in array
+@@ -953,6 +956,7 @@
+
+ // Support for parallel remark of survivor space
+ void* get_data_recorder(int thr_num);
++ void sample_eden_chunk();
+
+ CMSBitMap* markBitMap() { return &_markBitMap; }
+ void directAllocated(HeapWord* start, size_t size);
+@@ -1013,7 +1017,7 @@
+
+ // debugging
+ void verify();
+- bool verify_after_remark();
++ bool verify_after_remark(bool silent = VerifySilently);
+ void verify_ok_to_terminate() const PRODUCT_RETURN;
+ void verify_work_stacks_empty() const PRODUCT_RETURN;
+ void verify_overflow_empty() const PRODUCT_RETURN;
+@@ -1031,6 +1035,8 @@
+
+ // Initialization errors
+ bool completed_initialization() { return _completed_initialization; }
++
++ void print_eden_and_survivor_chunk_arrays();
+ };
+
+ class CMSExpansionCause : public AllStatic {
+@@ -1317,6 +1323,10 @@
+ //Delegate to collector
+ return collector()->get_data_recorder(thr_num);
+ }
++ void sample_eden_chunk() {
++ //Delegate to collector
++ return collector()->sample_eden_chunk();
++ }
+
+ // Printing
+ const char* name() const;
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2011, 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
+@@ -145,7 +145,7 @@
+ );
+ #endif /* USDT2 */
+
+- _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark", os::elapsed_counter());
++ _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark");
+
+ GenCollectedHeap* gch = GenCollectedHeap::heap();
+ GCCauseSetter gccs(gch, GCCause::_cms_initial_mark);
+@@ -157,7 +157,7 @@
+
+ VM_CMS_Operation::verify_after_gc();
+
+- _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
++ _collector->_gc_timer_cm->register_gc_pause_end();
+
+ #ifndef USDT2
+ HS_DTRACE_PROBE(hs_private, cms__initmark__end);
+@@ -182,7 +182,7 @@
+ );
+ #endif /* USDT2 */
+
+- _collector->_gc_timer_cm->register_gc_pause_start("Final Mark", os::elapsed_counter());
++ _collector->_gc_timer_cm->register_gc_pause_start("Final Mark");
+
+ GenCollectedHeap* gch = GenCollectedHeap::heap();
+ GCCauseSetter gccs(gch, GCCause::_cms_final_remark);
+@@ -195,7 +195,7 @@
+ VM_CMS_Operation::verify_after_gc();
+
+ _collector->save_heap_summary();
+- _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
++ _collector->_gc_timer_cm->register_gc_pause_end();
+
+ #ifndef USDT2
+ HS_DTRACE_PROBE(hs_private, cms__remark__end);
+--- ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp Wed May 07 19:26:16 2014 -0700
+@@ -114,6 +114,14 @@
+ }
+ }
+
++void ConcurrentG1Refine::worker_threads_do(ThreadClosure * tc) {
++ if (_threads != NULL) {
++ for (int i = 0; i < worker_thread_num(); i++) {
++ tc->do_thread(_threads[i]);
++ }
++ }
++}
++
+ int ConcurrentG1Refine::thread_num() {
+ int n_threads = (G1ConcRefinementThreads > 0) ? G1ConcRefinementThreads
+ : ParallelGCThreads;
+@@ -126,3 +134,7 @@
+ st->cr();
+ }
+ }
++
++ConcurrentG1RefineThread * ConcurrentG1Refine::sampling_thread() const {
++ return _threads[worker_thread_num()];
++}
+--- ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp Wed May 07 19:26:16 2014 -0700
+@@ -35,6 +35,7 @@
+ class G1CollectedHeap;
+ class G1HotCardCache;
+ class G1RemSet;
++class DirtyCardQueue;
+
+ class ConcurrentG1Refine: public CHeapObj<mtGC> {
+ ConcurrentG1RefineThread** _threads;
+@@ -78,9 +79,15 @@
+
+ void reinitialize_threads();
+
+- // Iterate over the conc refine threads
++ // Iterate over all concurrent refinement threads
+ void threads_do(ThreadClosure *tc);
+
++ // Iterate over all worker refinement threads
++ void worker_threads_do(ThreadClosure * tc);
++
++ // The RS sampling thread
++ ConcurrentG1RefineThread * sampling_thread() const;
++
+ static int thread_num();
+
+ void print_worker_threads_on(outputStream* st) const;
+--- ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1154,10 +1154,9 @@
+
+ if (VerifyDuringGC) {
+ HandleMark hm; // handle scope
+- gclog_or_tty->print(" VerifyDuringGC:(before)");
+ Universe::heap()->prepare_for_verify();
+- Universe::verify(/* silent */ false,
+- /* option */ VerifyOption_G1UsePrevMarking);
++ Universe::verify(VerifyOption_G1UsePrevMarking,
++ " VerifyDuringGC:(before)");
+ }
+
+ G1CollectorPolicy* g1p = g1h->g1_policy();
+@@ -1181,10 +1180,9 @@
+ // Verify the heap w.r.t. the previous marking bitmap.
+ if (VerifyDuringGC) {
+ HandleMark hm; // handle scope
+- gclog_or_tty->print(" VerifyDuringGC:(overflow)");
+ Universe::heap()->prepare_for_verify();
+- Universe::verify(/* silent */ false,
+- /* option */ VerifyOption_G1UsePrevMarking);
++ Universe::verify(VerifyOption_G1UsePrevMarking,
++ " VerifyDuringGC:(overflow)");
+ }
+
+ // Clear the marking state because we will be restarting
+@@ -1204,10 +1202,9 @@
+
+ if (VerifyDuringGC) {
+ HandleMark hm; // handle scope
+- gclog_or_tty->print(" VerifyDuringGC:(after)");
+ Universe::heap()->prepare_for_verify();
+- Universe::verify(/* silent */ false,
+- /* option */ VerifyOption_G1UseNextMarking);
++ Universe::verify(VerifyOption_G1UseNextMarking,
++ " VerifyDuringGC:(after)");
+ }
+ assert(!restart_for_overflow(), "sanity");
+ // Completely reset the marking state since marking completed
+@@ -1498,7 +1495,6 @@
+ }
+ };
+
+-
+ class G1ParVerifyFinalCountTask: public AbstractGangTask {
+ protected:
+ G1CollectedHeap* _g1h;
+@@ -1856,10 +1852,9 @@
+
+ if (VerifyDuringGC) {
+ HandleMark hm; // handle scope
+- gclog_or_tty->print(" VerifyDuringGC:(before)");
+ Universe::heap()->prepare_for_verify();
+- Universe::verify(/* silent */ false,
+- /* option */ VerifyOption_G1UsePrevMarking);
++ Universe::verify(VerifyOption_G1UsePrevMarking,
++ " VerifyDuringGC:(before)");
+ }
+
+ G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
+@@ -2011,10 +2006,9 @@
+
+ if (VerifyDuringGC) {
+ HandleMark hm; // handle scope
+- gclog_or_tty->print(" VerifyDuringGC:(after)");
+ Universe::heap()->prepare_for_verify();
+- Universe::verify(/* silent */ false,
+- /* option */ VerifyOption_G1UsePrevMarking);
++ Universe::verify(VerifyOption_G1UsePrevMarking,
++ " VerifyDuringGC:(after)");
+ }
+
+ g1h->verify_region_sets_optional();
+@@ -2412,10 +2406,9 @@
+ assert(!rp->discovery_enabled(), "Post condition");
+ }
+
+- // Now clean up stale oops in StringTable
+- StringTable::unlink(&g1_is_alive);
+- // Clean up unreferenced symbols in symbol table.
+- SymbolTable::unlink();
++ g1h->unlink_string_and_symbol_table(&g1_is_alive,
++ /* process_strings */ false, // currently strings are always roots
++ /* process_symbols */ true);
+ }
+
+ void ConcurrentMark::swapMarkBitMaps() {
+@@ -4396,7 +4389,8 @@
+ _total_used_bytes(0), _total_capacity_bytes(0),
+ _total_prev_live_bytes(0), _total_next_live_bytes(0),
+ _hum_used_bytes(0), _hum_capacity_bytes(0),
+- _hum_prev_live_bytes(0), _hum_next_live_bytes(0) {
++ _hum_prev_live_bytes(0), _hum_next_live_bytes(0),
++ _total_remset_bytes(0), _total_strong_code_roots_bytes(0) {
+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
+ MemRegion g1_committed = g1h->g1_committed();
+ MemRegion g1_reserved = g1h->g1_reserved();
+@@ -4414,23 +4408,29 @@
+ HeapRegion::GrainBytes);
+ _out->print_cr(G1PPRL_LINE_PREFIX);
+ _out->print_cr(G1PPRL_LINE_PREFIX
+- G1PPRL_TYPE_H_FORMAT
+- G1PPRL_ADDR_BASE_H_FORMAT
+- G1PPRL_BYTE_H_FORMAT
+- G1PPRL_BYTE_H_FORMAT
+- G1PPRL_BYTE_H_FORMAT
+- G1PPRL_DOUBLE_H_FORMAT,
+- "type", "address-range",
+- "used", "prev-live", "next-live", "gc-eff");
++ G1PPRL_TYPE_H_FORMAT
++ G1PPRL_ADDR_BASE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT
++ G1PPRL_DOUBLE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT,
++ "type", "address-range",
++ "used", "prev-live", "next-live", "gc-eff",
++ "remset", "code-roots");
+ _out->print_cr(G1PPRL_LINE_PREFIX
+- G1PPRL_TYPE_H_FORMAT
+- G1PPRL_ADDR_BASE_H_FORMAT
+- G1PPRL_BYTE_H_FORMAT
+- G1PPRL_BYTE_H_FORMAT
+- G1PPRL_BYTE_H_FORMAT
+- G1PPRL_DOUBLE_H_FORMAT,
+- "", "",
+- "(bytes)", "(bytes)", "(bytes)", "(bytes/ms)");
++ G1PPRL_TYPE_H_FORMAT
++ G1PPRL_ADDR_BASE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT
++ G1PPRL_DOUBLE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT
++ G1PPRL_BYTE_H_FORMAT,
++ "", "",
++ "(bytes)", "(bytes)", "(bytes)", "(bytes/ms)",
++ "(bytes)", "(bytes)");
+ }
+
+ // It takes as a parameter a reference to one of the _hum_* fields, it
+@@ -4472,6 +4472,9 @@
+ size_t prev_live_bytes = r->live_bytes();
+ size_t next_live_bytes = r->next_live_bytes();
+ double gc_eff = r->gc_efficiency();
++ size_t remset_bytes = r->rem_set()->mem_size();
++ size_t strong_code_roots_bytes = r->rem_set()->strong_code_roots_mem_size();
++
+ if (r->used() == 0) {
+ type = "FREE";
+ } else if (r->is_survivor()) {
+@@ -4505,6 +4508,8 @@
+ _total_capacity_bytes += capacity_bytes;
+ _total_prev_live_bytes += prev_live_bytes;
+ _total_next_live_bytes += next_live_bytes;
++ _total_remset_bytes += remset_bytes;
++ _total_strong_code_roots_bytes += strong_code_roots_bytes;
+
+ // Print a line for this particular region.
+ _out->print_cr(G1PPRL_LINE_PREFIX
+@@ -4513,14 +4518,19 @@
+ G1PPRL_BYTE_FORMAT
+ G1PPRL_BYTE_FORMAT
+ G1PPRL_BYTE_FORMAT
+- G1PPRL_DOUBLE_FORMAT,
++ G1PPRL_DOUBLE_FORMAT
++ G1PPRL_BYTE_FORMAT
++ G1PPRL_BYTE_FORMAT,
+ type, bottom, end,
+- used_bytes, prev_live_bytes, next_live_bytes, gc_eff);
++ used_bytes, prev_live_bytes, next_live_bytes, gc_eff,
++ remset_bytes, strong_code_roots_bytes);
+
+ return false;
+ }
+
+ G1PrintRegionLivenessInfoClosure::~G1PrintRegionLivenessInfoClosure() {
++ // add static memory usages to remembered set sizes
++ _total_remset_bytes += HeapRegionRemSet::fl_mem_size() + HeapRegionRemSet::static_mem_size();
+ // Print the footer of the output.
+ _out->print_cr(G1PPRL_LINE_PREFIX);
+ _out->print_cr(G1PPRL_LINE_PREFIX
+@@ -4528,13 +4538,17 @@
+ G1PPRL_SUM_MB_FORMAT("capacity")
+ G1PPRL_SUM_MB_PERC_FORMAT("used")
+ G1PPRL_SUM_MB_PERC_FORMAT("prev-live")
+- G1PPRL_SUM_MB_PERC_FORMAT("next-live"),
++ G1PPRL_SUM_MB_PERC_FORMAT("next-live")
++ G1PPRL_SUM_MB_FORMAT("remset")
++ G1PPRL_SUM_MB_FORMAT("code-roots"),
+ bytes_to_mb(_total_capacity_bytes),
+ bytes_to_mb(_total_used_bytes),
+ perc(_total_used_bytes, _total_capacity_bytes),
+ bytes_to_mb(_total_prev_live_bytes),
+ perc(_total_prev_live_bytes, _total_capacity_bytes),
+ bytes_to_mb(_total_next_live_bytes),
+- perc(_total_next_live_bytes, _total_capacity_bytes));
++ perc(_total_next_live_bytes, _total_capacity_bytes),
++ bytes_to_mb(_total_remset_bytes),
++ bytes_to_mb(_total_strong_code_roots_bytes));
+ _out->cr();
+ }
+--- ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1224,6 +1224,12 @@
+ size_t _hum_prev_live_bytes;
+ size_t _hum_next_live_bytes;
+
++ // Accumulator for the remembered set size
++ size_t _total_remset_bytes;
++
++ // Accumulator for strong code roots memory size
++ size_t _total_strong_code_roots_bytes;
++
+ static double perc(size_t val, size_t total) {
+ if (total == 0) {
+ return 0.0;
+--- ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Wed May 07 19:26:16 2014 -0700
+@@ -81,7 +81,7 @@
+ size_t* marked_bytes_array,
+ BitMap* task_card_bm) {
+ G1CollectedHeap* g1h = _g1h;
+- CardTableModRefBS* ct_bs = (CardTableModRefBS*) (g1h->barrier_set());
++ CardTableModRefBS* ct_bs = g1h->g1_barrier_set();
+
+ HeapWord* start = mr.start();
+ HeapWord* end = mr.end();
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp Wed May 07 19:26:16 2014 -0700
+@@ -65,9 +65,7 @@
+ // threshold limit is no more than this.
+ guarantee(G1ConcRSHotCardLimit <= max_jubyte, "sanity");
+
+- ModRefBarrierSet* bs = _g1h->mr_bs();
+- guarantee(bs->is_a(BarrierSet::CardTableModRef), "Precondition");
+- _ct_bs = (CardTableModRefBS*)bs;
++ _ct_bs = _g1h->g1_barrier_set();
+ _ct_bot = _ct_bs->byte_for_const(_g1h->reserved_region().start());
+
+ // Allocate/Reserve the counts table
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Wed May 07 19:26:16 2014 -0700
+@@ -23,6 +23,7 @@
+ */
+
+ #include "precompiled.hpp"
++#include "code/codeCache.hpp"
+ #include "code/icBuffer.hpp"
+ #include "gc_implementation/g1/bufferingOopClosure.hpp"
+ #include "gc_implementation/g1/concurrentG1Refine.hpp"
+@@ -56,6 +57,7 @@
+ #include "oops/oop.pcgc.inline.hpp"
+ #include "runtime/aprofiler.hpp"
+ #include "runtime/vmThread.hpp"
++#include "utilities/ticks.hpp"
+
+ size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0;
+
+@@ -125,10 +127,8 @@
+ int _histo[256];
+ public:
+ ClearLoggedCardTableEntryClosure() :
+- _calls(0)
++ _calls(0), _g1h(G1CollectedHeap::heap()), _ctbs(_g1h->g1_barrier_set())
+ {
+- _g1h = G1CollectedHeap::heap();
+- _ctbs = (CardTableModRefBS*)_g1h->barrier_set();
+ for (int i = 0; i < 256; i++) _histo[i] = 0;
+ }
+ bool do_card_ptr(jbyte* card_ptr, int worker_i) {
+@@ -158,11 +158,8 @@
+ CardTableModRefBS* _ctbs;
+ public:
+ RedirtyLoggedCardTableEntryClosure() :
+- _calls(0)
+- {
+- _g1h = G1CollectedHeap::heap();
+- _ctbs = (CardTableModRefBS*)_g1h->barrier_set();
+- }
++ _calls(0), _g1h(G1CollectedHeap::heap()), _ctbs(_g1h->g1_barrier_set()) {}
++
+ bool do_card_ptr(jbyte* card_ptr, int worker_i) {
+ if (_g1h->is_in_reserved(_ctbs->addr_for(card_ptr))) {
+ _calls++;
+@@ -477,7 +474,7 @@
+
+ void G1CollectedHeap::check_ct_logs_at_safepoint() {
+ DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+- CardTableModRefBS* ct_bs = (CardTableModRefBS*)barrier_set();
++ CardTableModRefBS* ct_bs = g1_barrier_set();
+
+ // Count the dirty cards at the start.
+ CountNonCleanMemRegionClosure count1(this);
+@@ -1158,26 +1155,33 @@
+ ModRefBarrierSet* _mr_bs;
+ public:
+ PostMCRemSetClearClosure(G1CollectedHeap* g1h, ModRefBarrierSet* mr_bs) :
+- _g1h(g1h), _mr_bs(mr_bs) { }
++ _g1h(g1h), _mr_bs(mr_bs) {}
++
+ bool doHeapRegion(HeapRegion* r) {
++ HeapRegionRemSet* hrrs = r->rem_set();
++
+ if (r->continuesHumongous()) {
++ // We'll assert that the strong code root list and RSet is empty
++ assert(hrrs->strong_code_roots_list_length() == 0, "sanity");
++ assert(hrrs->occupied() == 0, "RSet should be empty");
+ return false;
+ }
++
+ _g1h->reset_gc_time_stamps(r);
+- HeapRegionRemSet* hrrs = r->rem_set();
+- if (hrrs != NULL) hrrs->clear();
++ hrrs->clear();
+ // You might think here that we could clear just the cards
+ // corresponding to the used region. But no: if we leave a dirty card
+ // in a region we might allocate into, then it would prevent that card
+ // from being enqueued, and cause it to be missed.
+ // Re: the performance cost: we shouldn't be doing full GC anyway!
+ _mr_bs->clear(MemRegion(r->bottom(), r->end()));
++
+ return false;
+ }
+ };
+
+ void G1CollectedHeap::clear_rsets_post_compaction() {
+- PostMCRemSetClearClosure rs_clear(this, mr_bs());
++ PostMCRemSetClearClosure rs_clear(this, g1_barrier_set());
+ heap_region_iterate(&rs_clear);
+ }
+
+@@ -1251,31 +1255,6 @@
+ heap_region_iterate(&cl);
+ }
+
+-double G1CollectedHeap::verify(bool guard, const char* msg) {
+- double verify_time_ms = 0.0;
+-
+- if (guard && total_collections() >= VerifyGCStartAt) {
+- double verify_start = os::elapsedTime();
+- HandleMark hm; // Discard invalid handles created during verification
+- gclog_or_tty->print(msg);
+- prepare_for_verify();
+- Universe::verify(false /* silent */, VerifyOption_G1UsePrevMarking);
+- verify_time_ms = (os::elapsedTime() - verify_start) * 1000;
+- }
+-
+- return verify_time_ms;
+-}
+-
+-void G1CollectedHeap::verify_before_gc() {
+- double verify_time_ms = verify(VerifyBeforeGC, " VerifyBeforeGC:");
+- g1_policy()->phase_times()->record_verify_before_time_ms(verify_time_ms);
+-}
+-
+-void G1CollectedHeap::verify_after_gc() {
+- double verify_time_ms = verify(VerifyAfterGC, " VerifyAfterGC:");
+- g1_policy()->phase_times()->record_verify_after_time_ms(verify_time_ms);
+-}
+-
+ bool G1CollectedHeap::do_collection(bool explicit_gc,
+ bool clear_all_soft_refs,
+ size_t word_size) {
+@@ -1286,7 +1265,7 @@
+ }
+
+ STWGCTimer* gc_timer = G1MarkSweep::gc_timer();
+- gc_timer->register_gc_start(os::elapsed_counter());
++ gc_timer->register_gc_start();
+
+ SerialOldTracer* gc_tracer = G1MarkSweep::gc_tracer();
+ gc_tracer->report_gc_start(gc_cause(), gc_timer->gc_start());
+@@ -1408,8 +1387,6 @@
+
+ MemoryService::track_memory_usage();
+
+- verify_after_gc();
+-
+ assert(!ref_processor_stw()->discovery_enabled(), "Postcondition");
+ ref_processor_stw()->verify_no_references_recorded();
+
+@@ -1482,6 +1459,9 @@
+ heap_region_iterate(&rebuild_rs);
+ }
+
++ // Rebuild the strong code root lists for each region
++ rebuild_strong_code_roots();
++
+ if (true) { // FIXME
+ // Ask the permanent generation to adjust size for full collections
+ perm()->compute_new_size();
+@@ -1509,6 +1489,8 @@
+ _hrs.verify_optional();
+ verify_region_sets_optional();
+
++ verify_after_gc();
++
+ // Start a new incremental collection set for the next pause
+ assert(g1_policy()->collection_set() == NULL, "must be");
+ g1_policy()->start_incremental_cset_building();
+@@ -1546,8 +1528,7 @@
+ post_full_gc_dump(gc_timer);
+ }
+
+- gc_timer->register_gc_end(os::elapsed_counter());
+-
++ gc_timer->register_gc_end();
+ gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
+
+ return true;
+@@ -1568,8 +1549,6 @@
+ void
+ G1CollectedHeap::
+ resize_if_necessary_after_full_collection(size_t word_size) {
+- assert(MinHeapFreeRatio <= MaxHeapFreeRatio, "sanity check");
+-
+ // Include the current allocation, if any, and bytes that will be
+ // pre-allocated to support collections, as "used".
+ const size_t used_after_gc = used();
+@@ -2002,10 +1981,12 @@
+
+ size_t init_byte_size = collector_policy()->initial_heap_byte_size();
+ size_t max_byte_size = collector_policy()->max_heap_byte_size();
++ size_t heap_alignment = collector_policy()->max_alignment();
+
+ // Ensure that the sizes are properly aligned.
+ Universe::check_alignment(init_byte_size, HeapRegion::GrainBytes, "g1 heap");
+ Universe::check_alignment(max_byte_size, HeapRegion::GrainBytes, "g1 heap");
++ Universe::check_alignment(max_byte_size, heap_alignment, "g1 heap");
+
+ _cg1r = new ConcurrentG1Refine(this);
+
+@@ -2029,14 +2010,14 @@
+ size_t total_reserved = 0;
+
+ total_reserved = add_and_check_overflow(total_reserved, max_byte_size);
+- size_t pg_max_size = (size_t) align_size_up(pgs->max_size(), HeapRegion::GrainBytes);
++ size_t pg_max_size = (size_t) align_size_up(pgs->max_size(), heap_alignment);
+ total_reserved = add_and_check_overflow(total_reserved, pg_max_size);
+
+ Universe::check_alignment(total_reserved, HeapRegion::GrainBytes, "g1 heap and perm");
+
+- char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
+-
+- ReservedHeapSpace heap_rs(total_reserved, HeapRegion::GrainBytes,
++ char* addr = Universe::preferred_heap_base(total_reserved, heap_alignment, Universe::UnscaledNarrowOop);
++
++ ReservedHeapSpace heap_rs(total_reserved, heap_alignment,
+ UseLargePages, addr);
+
+ if (UseCompressedOops) {
+@@ -2044,17 +2025,17 @@
+ // Failed to reserve at specified address - the requested memory
+ // region is taken already, for example, by 'java' launcher.
+ // Try again to reserver heap higher.
+- addr = Universe::preferred_heap_base(total_reserved, Universe::ZeroBasedNarrowOop);
+-
+- ReservedHeapSpace heap_rs0(total_reserved, HeapRegion::GrainBytes,
++ addr = Universe::preferred_heap_base(total_reserved, heap_alignment, Universe::ZeroBasedNarrowOop);
++
++ ReservedHeapSpace heap_rs0(total_reserved, heap_alignment,
+ UseLargePages, addr);
+
+ if (addr != NULL && !heap_rs0.is_reserved()) {
+ // Failed to reserve at specified address again - give up.
+- addr = Universe::preferred_heap_base(total_reserved, Universe::HeapBasedNarrowOop);
++ addr = Universe::preferred_heap_base(total_reserved, heap_alignment, Universe::HeapBasedNarrowOop);
+ assert(addr == NULL, "");
+
+- ReservedHeapSpace heap_rs1(total_reserved, HeapRegion::GrainBytes,
++ ReservedHeapSpace heap_rs1(total_reserved, heap_alignment,
+ UseLargePages, addr);
+ heap_rs = heap_rs1;
+ } else {
+@@ -2080,20 +2061,13 @@
+ // Create the gen rem set (and barrier set) for the entire reserved region.
+ _rem_set = collector_policy()->create_rem_set(_reserved, 2);
+ set_barrier_set(rem_set()->bs());
+- if (barrier_set()->is_a(BarrierSet::ModRef)) {
+- _mr_bs = (ModRefBarrierSet*)_barrier_set;
+- } else {
+- vm_exit_during_initialization("G1 requires a mod ref bs.");
++ if (!barrier_set()->is_a(BarrierSet::G1SATBCTLogging)) {
++ vm_exit_during_initialization("G1 requires a G1SATBLoggingCardTableModRefBS");
+ return JNI_ENOMEM;
+ }
+
+ // Also create a G1 rem set.
+- if (mr_bs()->is_a(BarrierSet::CardTableModRef)) {
+- _g1_rem_set = new G1RemSet(this, (CardTableModRefBS*)mr_bs());
+- } else {
+- vm_exit_during_initialization("G1 requires a cardtable mod ref bs.");
+- return JNI_ENOMEM;
+- }
++ _g1_rem_set = new G1RemSet(this, g1_barrier_set());
+
+ // Carve out the G1 part of the heap.
+
+@@ -2517,7 +2491,7 @@
+ FullGCCount_lock->notify_all();
+ }
+
+-void G1CollectedHeap::register_concurrent_cycle_start(jlong start_time) {
++void G1CollectedHeap::register_concurrent_cycle_start(const Ticks& start_time) {
+ _concurrent_cycle_started = true;
+ _gc_timer_cm->register_gc_start(start_time);
+
+@@ -2527,7 +2501,7 @@
+
+ void G1CollectedHeap::register_concurrent_cycle_end() {
+ if (_concurrent_cycle_started) {
+- _gc_timer_cm->register_gc_end(os::elapsed_counter());
++ _gc_timer_cm->register_gc_end();
+
+ if (_cm->has_aborted()) {
+ _gc_tracer_cm->report_concurrent_mode_failure();
+@@ -3161,6 +3135,119 @@
+ return NULL; // keep some compilers happy
+ }
+
++// TODO: VerifyRootsClosure extends OopsInGenClosure so that we can
++// pass it as the perm_blk to SharedHeap::process_strong_roots.
++// When process_strong_roots stop calling perm_blk->younger_refs_iterate
++// we can change this closure to extend the simpler OopClosure.
++class VerifyRootsClosure: public OopsInGenClosure {
++private:
++ G1CollectedHeap* _g1h;
++ VerifyOption _vo;
++ bool _failures;
++public:
++ // _vo == UsePrevMarking -> use "prev" marking information,
++ // _vo == UseNextMarking -> use "next" marking information,
++ // _vo == UseMarkWord -> use mark word from object header.
++ VerifyRootsClosure(VerifyOption vo) :
++ _g1h(G1CollectedHeap::heap()),
++ _vo(vo),
++ _failures(false) { }
++
++ bool failures() { return _failures; }
++
++ template <class T> void do_oop_nv(T* p) {
++ T heap_oop = oopDesc::load_heap_oop(p);
++ if (!oopDesc::is_null(heap_oop)) {
++ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
++ if (_g1h->is_obj_dead_cond(obj, _vo)) {
++ gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
++ "points to dead obj "PTR_FORMAT, p, (void*) obj);
++ if (_vo == VerifyOption_G1UseMarkWord) {
++ gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark()));
++ }
++ obj->print_on(gclog_or_tty);
++ _failures = true;
++ }
++ }
++ }
++
++ void do_oop(oop* p) { do_oop_nv(p); }
++ void do_oop(narrowOop* p) { do_oop_nv(p); }
++};
++
++class G1VerifyCodeRootOopClosure: public OopsInGenClosure {
++ G1CollectedHeap* _g1h;
++ OopClosure* _root_cl;
++ nmethod* _nm;
++ VerifyOption _vo;
++ bool _failures;
++
++ template <class T> void do_oop_work(T* p) {
++ // First verify that this root is live
++ _root_cl->do_oop(p);
++
++ if (!G1VerifyHeapRegionCodeRoots) {
++ // We're not verifying the code roots attached to heap region.
++ return;
++ }
++
++ // Don't check the code roots during marking verification in a full GC
++ if (_vo == VerifyOption_G1UseMarkWord) {
++ return;
++ }
++
++ // Now verify that the current nmethod (which contains p) is
++ // in the code root list of the heap region containing the
++ // object referenced by p.
++
++ T heap_oop = oopDesc::load_heap_oop(p);
++ if (!oopDesc::is_null(heap_oop)) {
++ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
++
++ if (_g1h->is_in_g1_reserved(obj)) {
++ // Now fetch the region containing the object
++ HeapRegion* hr = _g1h->heap_region_containing(obj);
++ HeapRegionRemSet* hrrs = hr->rem_set();
++ // Verify that the strong code root list for this region
++ // contains the nmethod
++ if (!hrrs->strong_code_roots_list_contains(_nm)) {
++ gclog_or_tty->print_cr("Code root location "PTR_FORMAT" "
++ "from nmethod "PTR_FORMAT" not in strong "
++ "code roots for region ["PTR_FORMAT","PTR_FORMAT")",
++ p, _nm, hr->bottom(), hr->end());
++ _failures = true;
++ }
++ }
++ }
++ }
++
++public:
++ G1VerifyCodeRootOopClosure(G1CollectedHeap* g1h, OopClosure* root_cl, VerifyOption vo):
++ _g1h(g1h), _root_cl(root_cl), _vo(vo), _nm(NULL), _failures(false) {}
++
++ void do_oop(oop* p) { do_oop_work(p); }
++ void do_oop(narrowOop* p) { do_oop_work(p); }
++
++ void set_nmethod(nmethod* nm) { _nm = nm; }
++ bool failures() { return _failures; }
++};
++
++class G1VerifyCodeRootBlobClosure: public CodeBlobClosure {
++ G1VerifyCodeRootOopClosure* _oop_cl;
++
++public:
++ G1VerifyCodeRootBlobClosure(G1VerifyCodeRootOopClosure* oop_cl):
++ _oop_cl(oop_cl) {}
++
++ void do_code_blob(CodeBlob* cb) {
++ nmethod* nm = cb->as_nmethod_or_null();
++ if (nm != NULL) {
++ _oop_cl->set_nmethod(nm);
++ nm->oops_do(_oop_cl);
++ }
++ }
++};
++
+ class VerifyLivenessOopClosure: public OopClosure {
+ G1CollectedHeap* _g1h;
+ VerifyOption _vo;
+@@ -3294,42 +3381,6 @@
+ }
+ };
+
+-class VerifyRootsClosure: public OopsInGenClosure {
+-private:
+- G1CollectedHeap* _g1h;
+- VerifyOption _vo;
+- bool _failures;
+-public:
+- // _vo == UsePrevMarking -> use "prev" marking information,
+- // _vo == UseNextMarking -> use "next" marking information,
+- // _vo == UseMarkWord -> use mark word from object header.
+- VerifyRootsClosure(VerifyOption vo) :
+- _g1h(G1CollectedHeap::heap()),
+- _vo(vo),
+- _failures(false) { }
+-
+- bool failures() { return _failures; }
+-
+- template <class T> void do_oop_nv(T* p) {
+- T heap_oop = oopDesc::load_heap_oop(p);
+- if (!oopDesc::is_null(heap_oop)) {
+- oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+- if (_g1h->is_obj_dead_cond(obj, _vo)) {
+- gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
+- "points to dead obj "PTR_FORMAT, p, (void*) obj);
+- if (_vo == VerifyOption_G1UseMarkWord) {
+- gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark()));
+- }
+- obj->print_on(gclog_or_tty);
+- _failures = true;
+- }
+- }
+- }
+-
+- void do_oop(oop* p) { do_oop_nv(p); }
+- void do_oop(narrowOop* p) { do_oop_nv(p); }
+-};
+-
+ // This is the task used for parallel heap verification.
+
+ class G1ParVerifyTask: public AbstractGangTask {
+@@ -3364,21 +3415,16 @@
+ }
+ };
+
+-void G1CollectedHeap::verify(bool silent) {
+- verify(silent, VerifyOption_G1UsePrevMarking);
+-}
+-
+-void G1CollectedHeap::verify(bool silent,
+- VerifyOption vo) {
++void G1CollectedHeap::verify(bool silent, VerifyOption vo) {
+ if (SafepointSynchronize::is_at_safepoint()) {
++ assert(Thread::current()->is_VM_thread(),
++ "Expected to be executed serially by the VM thread at this point");
++
+ if (!silent) { gclog_or_tty->print("Roots (excluding permgen) "); }
+ VerifyRootsClosure rootsCl(vo);
+
+- assert(Thread::current()->is_VM_thread(),
+- "Expected to be executed serially by the VM thread at this point");
+-
+- CodeBlobToOopClosure blobsCl(&rootsCl, /*do_marking=*/ false);
+-
++ G1VerifyCodeRootOopClosure codeRootsCl(this, &rootsCl, vo);
++ G1VerifyCodeRootBlobClosure blobsCl(&codeRootsCl);
+ // We apply the relevant closures to all the oops in the
+ // system dictionary, the string table and the code cache.
+ const int so = SO_AllClasses | SO_Strings | SO_CodeCache;
+@@ -3473,6 +3519,34 @@
+ }
+ }
+
++void G1CollectedHeap::verify(bool silent) {
++ verify(silent, VerifyOption_G1UsePrevMarking);
++}
++
++double G1CollectedHeap::verify(bool guard, const char* msg) {
++ double verify_time_ms = 0.0;
++
++ if (guard && total_collections() >= VerifyGCStartAt) {
++ double verify_start = os::elapsedTime();
++ HandleMark hm; // Discard invalid handles created during verification
++ prepare_for_verify();
++ Universe::verify(VerifyOption_G1UsePrevMarking, msg);
++ verify_time_ms = (os::elapsedTime() - verify_start) * 1000;
++ }
++
++ return verify_time_ms;
++}
++
++void G1CollectedHeap::verify_before_gc() {
++ double verify_time_ms = verify(VerifyBeforeGC, " VerifyBeforeGC:");
++ g1_policy()->phase_times()->record_verify_before_time_ms(verify_time_ms);
++}
++
++void G1CollectedHeap::verify_after_gc() {
++ double verify_time_ms = verify(VerifyAfterGC, " VerifyAfterGC:");
++ g1_policy()->phase_times()->record_verify_after_time_ms(verify_time_ms);
++}
++
+ class PrintRegionClosure: public HeapRegionClosure {
+ outputStream* _st;
+ public:
+@@ -3616,9 +3690,22 @@
+ AllocationProfiler::iterate_since_last_gc();
+ // Fill TLAB's and such
+ ensure_parsability(true);
++
++ if (G1SummarizeRSetStats && (G1SummarizeRSetStatsPeriod > 0) &&
++ (total_collections() % G1SummarizeRSetStatsPeriod == 0)) {
++ g1_rem_set()->print_periodic_summary_info("Before GC RS summary");
++ }
+ }
+
+ void G1CollectedHeap::gc_epilogue(bool full /* Ignored */) {
++
++ if (G1SummarizeRSetStats &&
++ (G1SummarizeRSetStatsPeriod > 0) &&
++ // we are at the end of the GC. Total collections has already been increased.
++ ((total_collections() - 1) % G1SummarizeRSetStatsPeriod == 0)) {
++ g1_rem_set()->print_periodic_summary_info("After GC RS summary");
++ }
++
+ // FIXME: what is this about?
+ // I'm ignoring the "fill_newgen()" call if "alloc_event_enabled"
+ // is set.
+@@ -3815,7 +3902,7 @@
+ return false;
+ }
+
+- _gc_timer_stw->register_gc_start(os::elapsed_counter());
++ _gc_timer_stw->register_gc_start();
+
+ _gc_tracer_stw->report_gc_start(gc_cause(), _gc_timer_stw->gc_start());
+
+@@ -3880,8 +3967,9 @@
+ append_secondary_free_list_if_not_empty_with_lock();
+ }
+
+- assert(check_young_list_well_formed(),
+- "young list should be well formed");
++ assert(check_young_list_well_formed(), "young list should be well formed");
++ assert(check_heap_region_claim_values(HeapRegion::InitialClaimValue),
++ "sanity check");
+
+ // Don't dynamically change the number of GC threads this early. A value of
+ // 0 is used to indicate serial work. When parallel work is done,
+@@ -4193,15 +4281,10 @@
+
+ _gc_tracer_stw->report_evacuation_info(&evacuation_info);
+ _gc_tracer_stw->report_tenuring_threshold(_g1_policy->tenuring_threshold());
+- _gc_timer_stw->register_gc_end(os::elapsed_counter());
++ _gc_timer_stw->register_gc_end();
+ _gc_tracer_stw->report_gc_end(_gc_timer_stw->gc_end(), _gc_timer_stw->time_partitions());
+ }
+
+- if (G1SummarizeRSetStats &&
+- (G1SummarizeRSetStatsPeriod > 0) &&
+- (total_collections() % G1SummarizeRSetStatsPeriod == 0)) {
+- g1_rem_set()->print_summary_info();
+- }
+ // It should now be safe to tell the concurrent mark thread to start
+ // without its logging output interfering with the logging output
+ // that came from the pause.
+@@ -4482,7 +4565,7 @@
+ : _g1h(g1h),
+ _refs(g1h->task_queue(queue_num)),
+ _dcq(&g1h->dirty_card_queue_set()),
+- _ct_bs((CardTableModRefBS*)_g1h->barrier_set()),
++ _ct_bs(g1h->g1_barrier_set()),
+ _g1_rem(g1h->g1_rem_set()),
+ _hash_seed(17), _queue_num(queue_num),
+ _term_attempts(0),
+@@ -4975,7 +5058,8 @@
+ scan_root_cl,
+ &push_heap_rs_cl,
+ scan_perm_cl,
+- worker_id);
++ worker_id,
++ /* manages_code_roots */ true);
+ pss.end_strong_roots();
+
+ {
+@@ -5009,67 +5093,6 @@
+
+ // *** Common G1 Evacuation Stuff
+
+-// Closures that support the filtering of CodeBlobs scanned during
+-// external root scanning.
+-
+-// Closure applied to reference fields in code blobs (specifically nmethods)
+-// to determine whether an nmethod contains references that point into
+-// the collection set. Used as a predicate when walking code roots so
+-// that only nmethods that point into the collection set are added to the
+-// 'marked' list.
+-
+-class G1FilteredCodeBlobToOopClosure : public CodeBlobToOopClosure {
+-
+- class G1PointsIntoCSOopClosure : public OopClosure {
+- G1CollectedHeap* _g1;
+- bool _points_into_cs;
+- public:
+- G1PointsIntoCSOopClosure(G1CollectedHeap* g1) :
+- _g1(g1), _points_into_cs(false) { }
+-
+- bool points_into_cs() const { return _points_into_cs; }
+-
+- template <class T>
+- void do_oop_nv(T* p) {
+- if (!_points_into_cs) {
+- T heap_oop = oopDesc::load_heap_oop(p);
+- if (!oopDesc::is_null(heap_oop) &&
+- _g1->in_cset_fast_test(oopDesc::decode_heap_oop_not_null(heap_oop))) {
+- _points_into_cs = true;
+- }
+- }
+- }
+-
+- virtual void do_oop(oop* p) { do_oop_nv(p); }
+- virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
+- };
+-
+- G1CollectedHeap* _g1;
+-
+-public:
+- G1FilteredCodeBlobToOopClosure(G1CollectedHeap* g1, OopClosure* cl) :
+- CodeBlobToOopClosure(cl, true), _g1(g1) { }
+-
+- virtual void do_code_blob(CodeBlob* cb) {
+- nmethod* nm = cb->as_nmethod_or_null();
+- if (nm != NULL && !(nm->test_oops_do_mark())) {
+- G1PointsIntoCSOopClosure predicate_cl(_g1);
+- nm->oops_do(&predicate_cl);
+-
+- if (predicate_cl.points_into_cs()) {
+- // At least one of the reference fields or the oop relocations
+- // in the nmethod points into the collection set. We have to
+- // 'mark' this nmethod.
+- // Note: Revisit the following if CodeBlobToOopClosure::do_code_blob()
+- // or MarkingCodeBlobClosure::do_code_blob() change.
+- if (!nm->test_set_oops_do_mark()) {
+- do_newly_marked_nmethod(nm);
+- }
+- }
+- }
+- }
+-};
+-
+ // This method is run in a GC worker.
+
+ void
+@@ -5079,7 +5102,8 @@
+ OopClosure* scan_non_heap_roots,
+ OopsInHeapRegionClosure* scan_rs,
+ OopsInGenClosure* scan_perm,
+- int worker_i) {
++ int worker_i,
++ bool manages_code_roots) {
+
+ // First scan the strong roots, including the perm gen.
+ double ext_roots_start = os::elapsedTime();
+@@ -5089,15 +5113,17 @@
+ BufferingOopsInGenClosure buf_scan_perm(scan_perm);
+ buf_scan_perm.set_generation(perm_gen());
+
+- // Walk the code cache w/o buffering, because StarTask cannot handle
+- // unaligned oop locations.
+- G1FilteredCodeBlobToOopClosure eager_scan_code_roots(this, scan_non_heap_roots);
++ assert(so & SO_CodeCache || scan_rs != NULL, "must scan code roots somehow");
++ // Walk the code cache/strong code roots w/o buffering, because StarTask
++ // cannot handle unaligned oop locations.
++ CodeBlobToOopClosure eager_scan_code_roots(scan_non_heap_roots, true /* do_marking */);
+
+ process_strong_roots(false, // no scoping; this is parallel code
+ collecting_perm_gen, so,
+ &buf_scan_non_heap_roots,
+ &eager_scan_code_roots,
+- &buf_scan_perm);
++ &buf_scan_perm,
++ manages_code_roots);
+
+ // Now the CM ref_processor roots.
+ if (!_process_strong_tasks->is_task_claimed(G1H_PS_refProcessor_oops_do)) {
+@@ -5136,9 +5162,22 @@
+ }
+ g1_policy()->phase_times()->record_satb_filtering_time(worker_i, satb_filtering_ms);
+
++ // If this is an initial mark pause, and we're not scanning
++ // the entire code cache, we need to mark the oops in the
++ // strong code root lists for the regions that are not in
++ // the collection set.
++ // Note all threads participate in this set of root tasks.
++ double mark_strong_code_roots_ms = 0.0;
++ if (g1_policy()->during_initial_mark_pause() && !(so & SO_CodeCache)) {
++ double mark_strong_roots_start = os::elapsedTime();
++ mark_strong_code_roots(worker_i);
++ mark_strong_code_roots_ms = (os::elapsedTime() - mark_strong_roots_start) * 1000.0;
++ }
++ g1_policy()->phase_times()->record_strong_code_root_mark_time(worker_i, mark_strong_code_roots_ms);
++
+ // Now scan the complement of the collection set.
+ if (scan_rs != NULL) {
+- g1_rem_set()->oops_into_collection_set_do(scan_rs, worker_i);
++ g1_rem_set()->oops_into_collection_set_do(scan_rs, &eager_scan_code_roots, worker_i);
+ }
+
+ _process_strong_tasks->all_tasks_completed();
+@@ -5151,6 +5190,102 @@
+ SharedHeap::process_weak_roots(root_closure, &roots_in_blobs, non_root_closure);
+ }
+
++class G1StringSymbolTableUnlinkTask : public AbstractGangTask {
++private:
++ BoolObjectClosure* _is_alive;
++ int _initial_string_table_size;
++ int _initial_symbol_table_size;
++
++ bool _process_strings;
++ int _strings_processed;
++ int _strings_removed;
++
++ bool _process_symbols;
++ int _symbols_processed;
++ int _symbols_removed;
++
++ bool _do_in_parallel;
++public:
++ G1StringSymbolTableUnlinkTask(BoolObjectClosure* is_alive, bool process_strings, bool process_symbols) :
++ AbstractGangTask("Par String/Symbol table unlink"), _is_alive(is_alive),
++ _do_in_parallel(G1CollectedHeap::use_parallel_gc_threads()),
++ _process_strings(process_strings), _strings_processed(0), _strings_removed(0),
++ _process_symbols(process_symbols), _symbols_processed(0), _symbols_removed(0) {
++
++ _initial_string_table_size = StringTable::the_table()->table_size();
++ _initial_symbol_table_size = SymbolTable::the_table()->table_size();
++ if (process_strings) {
++ StringTable::clear_parallel_claimed_index();
++ }
++ if (process_symbols) {
++ SymbolTable::clear_parallel_claimed_index();
++ }
++ }
++
++ ~G1StringSymbolTableUnlinkTask() {
++ guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size,
++ err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT,
++ StringTable::parallel_claimed_index(), _initial_string_table_size));
++ guarantee(!_process_symbols || !_do_in_parallel || SymbolTable::parallel_claimed_index() >= _initial_symbol_table_size,
++ err_msg("claim value "INT32_FORMAT" after unlink less than initial symbol table size "INT32_FORMAT,
++ SymbolTable::parallel_claimed_index(), _initial_symbol_table_size));
++ }
++
++ void work(uint worker_id) {
++ if (_do_in_parallel) {
++ int strings_processed = 0;
++ int strings_removed = 0;
++ int symbols_processed = 0;
++ int symbols_removed = 0;
++ if (_process_strings) {
++ StringTable::possibly_parallel_unlink(_is_alive, &strings_processed, &strings_removed);
++ Atomic::add(strings_processed, &_strings_processed);
++ Atomic::add(strings_removed, &_strings_removed);
++ }
++ if (_process_symbols) {
++ SymbolTable::possibly_parallel_unlink(&symbols_processed, &symbols_removed);
++ Atomic::add(symbols_processed, &_symbols_processed);
++ Atomic::add(symbols_removed, &_symbols_removed);
++ }
++ } else {
++ if (_process_strings) {
++ StringTable::unlink(_is_alive, &_strings_processed, &_strings_removed);
++ }
++ if (_process_symbols) {
++ SymbolTable::unlink(&_symbols_processed, &_symbols_removed);
++ }
++ }
++ }
++
++ size_t strings_processed() const { return (size_t)_strings_processed; }
++ size_t strings_removed() const { return (size_t)_strings_removed; }
++
++ size_t symbols_processed() const { return (size_t)_symbols_processed; }
++ size_t symbols_removed() const { return (size_t)_symbols_removed; }
++};
++
++void G1CollectedHeap::unlink_string_and_symbol_table(BoolObjectClosure* is_alive,
++ bool process_strings, bool process_symbols) {
++ uint n_workers = (G1CollectedHeap::use_parallel_gc_threads() ?
++ _g1h->workers()->active_workers() : 1);
++
++ G1StringSymbolTableUnlinkTask g1_unlink_task(is_alive, process_strings, process_symbols);
++ if (G1CollectedHeap::use_parallel_gc_threads()) {
++ set_par_threads(n_workers);
++ workers()->run_task(&g1_unlink_task);
++ set_par_threads(0);
++ } else {
++ g1_unlink_task.work(0);
++ }
++ if (G1TraceStringSymbolTableScrubbing) {
++ gclog_or_tty->print_cr("Cleaned string and symbol table, "
++ "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, "
++ "symbols: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed",
++ g1_unlink_task.strings_processed(), g1_unlink_task.strings_removed(),
++ g1_unlink_task.symbols_processed(), g1_unlink_task.symbols_removed());
++ }
++}
++
+ // Weak Reference Processing support
+
+ // An always "is_alive" closure that is used to preserve referents.
+@@ -5761,9 +5896,6 @@
+ process_discovered_references(n_workers);
+
+ // Weak root processing.
+- // Note: when JSR 292 is enabled and code blobs can contain
+- // non-perm oops then we will need to process the code blobs
+- // here too.
+ {
+ G1STWIsAliveClosure is_alive(this);
+ G1KeepAliveClosure keep_alive(this);
+@@ -5779,6 +5911,17 @@
+ hot_card_cache->reset_hot_cache();
+ hot_card_cache->set_use_cache(true);
+
++ // Migrate the strong code roots attached to each region in
++ // the collection set. Ideally we would like to do this
++ // after we have finished the scanning/evacuation of the
++ // strong code roots for a particular heap region.
++ migrate_strong_code_roots();
++
++ if (g1_policy()->during_initial_mark_pause()) {
++ // Reset the claim values set during marking the strong code roots
++ reset_heap_region_claim_values();
++ }
++
+ finalize_for_evac_failure();
+
+ if (evacuation_failed()) {
+@@ -5912,11 +6055,11 @@
+ }
+
+ class G1ParCleanupCTTask : public AbstractGangTask {
+- CardTableModRefBS* _ct_bs;
++ G1SATBCardTableModRefBS* _ct_bs;
+ G1CollectedHeap* _g1h;
+ HeapRegion* volatile _su_head;
+ public:
+- G1ParCleanupCTTask(CardTableModRefBS* ct_bs,
++ G1ParCleanupCTTask(G1SATBCardTableModRefBS* ct_bs,
+ G1CollectedHeap* g1h) :
+ AbstractGangTask("G1 Par Cleanup CT Task"),
+ _ct_bs(ct_bs), _g1h(g1h) { }
+@@ -5939,9 +6082,9 @@
+ #ifndef PRODUCT
+ class G1VerifyCardTableCleanup: public HeapRegionClosure {
+ G1CollectedHeap* _g1h;
+- CardTableModRefBS* _ct_bs;
++ G1SATBCardTableModRefBS* _ct_bs;
+ public:
+- G1VerifyCardTableCleanup(G1CollectedHeap* g1h, CardTableModRefBS* ct_bs)
++ G1VerifyCardTableCleanup(G1CollectedHeap* g1h, G1SATBCardTableModRefBS* ct_bs)
+ : _g1h(g1h), _ct_bs(ct_bs) { }
+ virtual bool doHeapRegion(HeapRegion* r) {
+ if (r->is_survivor()) {
+@@ -5955,7 +6098,7 @@
+
+ void G1CollectedHeap::verify_not_dirty_region(HeapRegion* hr) {
+ // All of the region should be clean.
+- CardTableModRefBS* ct_bs = (CardTableModRefBS*)barrier_set();
++ G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
+ MemRegion mr(hr->bottom(), hr->end());
+ ct_bs->verify_not_dirty_region(mr);
+ }
+@@ -5968,13 +6111,17 @@
+ // not dirty that area (one less thing to have to do while holding
+ // a lock). So we can only verify that [bottom(),pre_dummy_top()]
+ // is dirty.
+- CardTableModRefBS* ct_bs = (CardTableModRefBS*) barrier_set();
++ G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
+ MemRegion mr(hr->bottom(), hr->pre_dummy_top());
+- ct_bs->verify_dirty_region(mr);
++ if (hr->is_young()) {
++ ct_bs->verify_g1_young_region(mr);
++ } else {
++ ct_bs->verify_dirty_region(mr);
++ }
+ }
+
+ void G1CollectedHeap::verify_dirty_young_list(HeapRegion* head) {
+- CardTableModRefBS* ct_bs = (CardTableModRefBS*) barrier_set();
++ G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
+ for (HeapRegion* hr = head; hr != NULL; hr = hr->get_next_young_region()) {
+ verify_dirty_region(hr);
+ }
+@@ -5986,7 +6133,7 @@
+ #endif
+
+ void G1CollectedHeap::cleanUpCardTable() {
+- CardTableModRefBS* ct_bs = (CardTableModRefBS*) (barrier_set());
++ G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
+ double start = os::elapsedTime();
+
+ {
+@@ -6575,3 +6722,234 @@
+ _humongous_set.verify_end();
+ _free_list.verify_end();
+ }
++
++// Optimized nmethod scanning
++
++class RegisterNMethodOopClosure: public OopClosure {
++ G1CollectedHeap* _g1h;
++ nmethod* _nm;
++
++ template <class T> void do_oop_work(T* p) {
++ T heap_oop = oopDesc::load_heap_oop(p);
++ if (!oopDesc::is_null(heap_oop)) {
++ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
++ HeapRegion* hr = _g1h->heap_region_containing(obj);
++ if (hr == NULL) {
++ // reference into perm gen - ignore.
++ assert(_g1h->is_in_permanent(obj), "must be a reference into perm gen");
++ return;
++ }
++ assert(!hr->continuesHumongous(),
++ err_msg("trying to add code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT
++ " starting at "HR_FORMAT,
++ _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
++
++ // HeapRegion::add_strong_code_root() avoids adding duplicate
++ // entries but having duplicates is OK since we "mark" nmethods
++ // as visited when we scan the strong code root lists during the GC.
++ hr->add_strong_code_root(_nm);
++ assert(hr->rem_set()->strong_code_roots_list_contains(_nm),
++ err_msg("failed to add code root "PTR_FORMAT" to remembered set of region "HR_FORMAT,
++ _nm, HR_FORMAT_PARAMS(hr)));
++ }
++ }
++
++public:
++ RegisterNMethodOopClosure(G1CollectedHeap* g1h, nmethod* nm) :
++ _g1h(g1h), _nm(nm) {}
++
++ void do_oop(oop* p) { do_oop_work(p); }
++ void do_oop(narrowOop* p) { do_oop_work(p); }
++};
++
++class UnregisterNMethodOopClosure: public OopClosure {
++ G1CollectedHeap* _g1h;
++ nmethod* _nm;
++
++ template <class T> void do_oop_work(T* p) {
++ T heap_oop = oopDesc::load_heap_oop(p);
++ if (!oopDesc::is_null(heap_oop)) {
++ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
++ HeapRegion* hr = _g1h->heap_region_containing(obj);
++ if (hr == NULL) {
++ // reference into perm gen - ignore.
++ assert(_g1h->is_in_permanent(obj), "must be a reference into perm gen");
++ return;
++ }
++ assert(!hr->continuesHumongous(),
++ err_msg("trying to remove code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT
++ " starting at "HR_FORMAT,
++ _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
++
++ hr->remove_strong_code_root(_nm);
++ assert(!hr->rem_set()->strong_code_roots_list_contains(_nm),
++ err_msg("failed to remove code root "PTR_FORMAT" of region "HR_FORMAT,
++ _nm, HR_FORMAT_PARAMS(hr))); }
++ }
++
++public:
++ UnregisterNMethodOopClosure(G1CollectedHeap* g1h, nmethod* nm) :
++ _g1h(g1h), _nm(nm) {}
++
++ void do_oop(oop* p) { do_oop_work(p); }
++ void do_oop(narrowOop* p) { do_oop_work(p); }
++};
++
++void G1CollectedHeap::register_nmethod(nmethod* nm) {
++ CollectedHeap::register_nmethod(nm);
++
++ guarantee(nm != NULL, "sanity");
++ RegisterNMethodOopClosure reg_cl(this, nm);
++ nm->oops_do(&reg_cl);
++}
++
++void G1CollectedHeap::unregister_nmethod(nmethod* nm) {
++ CollectedHeap::unregister_nmethod(nm);
++
++ guarantee(nm != NULL, "sanity");
++ UnregisterNMethodOopClosure reg_cl(this, nm);
++ nm->oops_do(&reg_cl, false, true);
++}
++
++class MigrateCodeRootsHeapRegionClosure: public HeapRegionClosure {
++public:
++ bool doHeapRegion(HeapRegion *hr) {
++ assert(!hr->isHumongous(),
++ err_msg("humongous region "HR_FORMAT" should not have been added to collection set",
++ HR_FORMAT_PARAMS(hr)));
++ hr->migrate_strong_code_roots();
++ return false;
++ }
++};
++
++void G1CollectedHeap::migrate_strong_code_roots() {
++ MigrateCodeRootsHeapRegionClosure cl;
++ double migrate_start = os::elapsedTime();
++ collection_set_iterate(&cl);
++ double migration_time_ms = (os::elapsedTime() - migrate_start) * 1000.0;
++ g1_policy()->phase_times()->record_strong_code_root_migration_time(migration_time_ms);
++}
++
++// Mark all the code roots that point into regions *not* in the
++// collection set.
++//
++// Note we do not want to use a "marking" CodeBlobToOopClosure while
++// walking the the code roots lists of regions not in the collection
++// set. Suppose we have an nmethod (M) that points to objects in two
++// separate regions - one in the collection set (R1) and one not (R2).
++// Using a "marking" CodeBlobToOopClosure here would result in "marking"
++// nmethod M when walking the code roots for R1. When we come to scan
++// the code roots for R2, we would see that M is already marked and it
++// would be skipped and the objects in R2 that are referenced from M
++// would not be evacuated.
++
++class MarkStrongCodeRootCodeBlobClosure: public CodeBlobClosure {
++
++ class MarkStrongCodeRootOopClosure: public OopClosure {
++ ConcurrentMark* _cm;
++ HeapRegion* _hr;
++ uint _worker_id;
++
++ template <class T> void do_oop_work(T* p) {
++ T heap_oop = oopDesc::load_heap_oop(p);
++ if (!oopDesc::is_null(heap_oop)) {
++ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
++ // Only mark objects in the region (which is assumed
++ // to be not in the collection set).
++ if (_hr->is_in(obj)) {
++ _cm->grayRoot(obj, (size_t) obj->size(), _worker_id);
++ }
++ }
++ }
++
++ public:
++ MarkStrongCodeRootOopClosure(ConcurrentMark* cm, HeapRegion* hr, uint worker_id) :
++ _cm(cm), _hr(hr), _worker_id(worker_id) {
++ assert(!_hr->in_collection_set(), "sanity");
++ }
++
++ void do_oop(narrowOop* p) { do_oop_work(p); }
++ void do_oop(oop* p) { do_oop_work(p); }
++ };
++
++ MarkStrongCodeRootOopClosure _oop_cl;
++
++public:
++ MarkStrongCodeRootCodeBlobClosure(ConcurrentMark* cm, HeapRegion* hr, uint worker_id):
++ _oop_cl(cm, hr, worker_id) {}
++
++ void do_code_blob(CodeBlob* cb) {
++ nmethod* nm = (cb == NULL) ? NULL : cb->as_nmethod_or_null();
++ if (nm != NULL) {
++ nm->oops_do(&_oop_cl);
++ }
++ }
++};
++
++class MarkStrongCodeRootsHRClosure: public HeapRegionClosure {
++ G1CollectedHeap* _g1h;
++ uint _worker_id;
++
++public:
++ MarkStrongCodeRootsHRClosure(G1CollectedHeap* g1h, uint worker_id) :
++ _g1h(g1h), _worker_id(worker_id) {}
++
++ bool doHeapRegion(HeapRegion *hr) {
++ HeapRegionRemSet* hrrs = hr->rem_set();
++ if (hr->continuesHumongous()) {
++ // Code roots should never be attached to a continuation of a humongous region
++ assert(hrrs->strong_code_roots_list_length() == 0,
++ err_msg("code roots should never be attached to continuations of humongous region "HR_FORMAT
++ " starting at "HR_FORMAT", but has "INT32_FORMAT,
++ HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()),
++ hrrs->strong_code_roots_list_length()));
++ return false;
++ }
++
++ if (hr->in_collection_set()) {
++ // Don't mark code roots into regions in the collection set here.
++ // They will be marked when we scan them.
++ return false;
++ }
++
++ MarkStrongCodeRootCodeBlobClosure cb_cl(_g1h->concurrent_mark(), hr, _worker_id);
++ hr->strong_code_roots_do(&cb_cl);
++ return false;
++ }
++};
++
++void G1CollectedHeap::mark_strong_code_roots(uint worker_id) {
++ MarkStrongCodeRootsHRClosure cl(this, worker_id);
++ if (G1CollectedHeap::use_parallel_gc_threads()) {
++ heap_region_par_iterate_chunked(&cl,
++ worker_id,
++ workers()->active_workers(),
++ HeapRegion::ParMarkRootClaimValue);
++ } else {
++ heap_region_iterate(&cl);
++ }
++}
++
++class RebuildStrongCodeRootClosure: public CodeBlobClosure {
++ G1CollectedHeap* _g1h;
++
++public:
++ RebuildStrongCodeRootClosure(G1CollectedHeap* g1h) :
++ _g1h(g1h) {}
++
++ void do_code_blob(CodeBlob* cb) {
++ nmethod* nm = (cb != NULL) ? cb->as_nmethod_or_null() : NULL;
++ if (nm == NULL) {
++ return;
++ }
++
++ if (ScavengeRootsInCode && nm->detect_scavenge_root_oops()) {
++ _g1h->register_nmethod(nm);
++ }
++ }
++};
++
++void G1CollectedHeap::rebuild_strong_code_roots() {
++ RebuildStrongCodeRootClosure blob_cl(this);
++ CodeCache::blobs_do(&blob_cl);
++}
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Wed May 07 19:26:16 2014 -0700
+@@ -31,6 +31,7 @@
+ #include "gc_implementation/g1/g1HRPrinter.hpp"
+ #include "gc_implementation/g1/g1MonitoringSupport.hpp"
+ #include "gc_implementation/g1/g1RemSet.hpp"
++#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+ #include "gc_implementation/g1/g1YCTypes.hpp"
+ #include "gc_implementation/g1/heapRegionSeq.hpp"
+ #include "gc_implementation/g1/heapRegionSets.hpp"
+@@ -46,6 +47,7 @@
+ // may combine concurrent marking with parallel, incremental compaction of
+ // heap subsets that will yield large amounts of garbage.
+
++// Forward declarations
+ class HeapRegion;
+ class HRRSCleanupTask;
+ class PermanentGenerationSpec;
+@@ -69,6 +71,8 @@
+ class G1NewTracer;
+ class G1OldTracer;
+ class EvacuationFailedInfo;
++class nmethod;
++class Ticks;
+
+ typedef OverflowTaskQueue<StarTask, mtGC> RefToScanQueue;
+ typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet;
+@@ -163,19 +167,6 @@
+ : G1AllocRegion("Mutator Alloc Region", false /* bot_updates */) { }
+ };
+
+-// The G1 STW is alive closure.
+-// An instance is embedded into the G1CH and used as the
+-// (optional) _is_alive_non_header closure in the STW
+-// reference processor. It is also extensively used during
+-// reference processing during STW evacuation pauses.
+-class G1STWIsAliveClosure: public BoolObjectClosure {
+- G1CollectedHeap* _g1;
+-public:
+- G1STWIsAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
+- void do_object(oop p) { assert(false, "Do not call."); }
+- bool do_object_b(oop p);
+-};
+-
+ class SurvivorGCAllocRegion : public G1AllocRegion {
+ protected:
+ virtual HeapRegion* allocate_new_region(size_t word_size, bool force);
+@@ -194,6 +185,19 @@
+ : G1AllocRegion("Old GC Alloc Region", true /* bot_updates */) { }
+ };
+
++// The G1 STW is alive closure.
++// An instance is embedded into the G1CH and used as the
++// (optional) _is_alive_non_header closure in the STW
++// reference processor. It is also extensively used during
++// reference processing during STW evacuation pauses.
++class G1STWIsAliveClosure: public BoolObjectClosure {
++ G1CollectedHeap* _g1;
++public:
++ G1STWIsAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
++ void do_object(oop p) { assert(false, "Do not call."); }
++ bool do_object_b(oop p);
++};
++
+ class RefineCardTableEntryClosure;
+
+ class G1CollectedHeap : public SharedHeap {
+@@ -747,7 +751,7 @@
+ return _old_marking_cycles_completed;
+ }
+
+- void register_concurrent_cycle_start(jlong start_time);
++ void register_concurrent_cycle_start(const Ticks& start_time);
+ void register_concurrent_cycle_end();
+ void trace_heap_after_concurrent_cycle();
+
+@@ -792,8 +796,6 @@
+
+ // The g1 remembered set of the heap.
+ G1RemSet* _g1_rem_set;
+- // And it's mod ref barrier set, used to track updates for the above.
+- ModRefBarrierSet* _mr_bs;
+
+ // A set of cards that cover the objects for which the Rsets should be updated
+ // concurrently after the collection.
+@@ -835,7 +837,8 @@
+ OopClosure* scan_non_heap_roots,
+ OopsInHeapRegionClosure* scan_rs,
+ OopsInGenClosure* scan_perm,
+- int worker_i);
++ int worker_i,
++ bool manages_code_roots = false);
+
+ // Apply "blk" to all the weak roots of the system. These include
+ // JNI weak roots, the code cache, system dictionary, symbol table,
+@@ -1127,7 +1130,6 @@
+
+ // The rem set and barrier set.
+ G1RemSet* g1_rem_set() const { return _g1_rem_set; }
+- ModRefBarrierSet* mr_bs() const { return _mr_bs; }
+
+ // The rem set iterator.
+ HeapRegionRemSetIterator* rem_set_iterator(int i) {
+@@ -1361,6 +1363,10 @@
+
+ virtual bool is_in_closed_subset(const void* p) const;
+
++ G1SATBCardTableModRefBS* g1_barrier_set() {
++ return (G1SATBCardTableModRefBS*) barrier_set();
++ }
++
+ // This resets the card table to all zeros. It is used after
+ // a collection pause which used the card table to claim cards.
+ void cleanUpCardTable();
+@@ -1592,41 +1598,6 @@
+
+ virtual jlong millis_since_last_gc();
+
+- // Perform any cleanup actions necessary before allowing a verification.
+- virtual void prepare_for_verify();
+-
+- // Perform verification.
+-
+- // vo == UsePrevMarking -> use "prev" marking information,
+- // vo == UseNextMarking -> use "next" marking information
+- // vo == UseMarkWord -> use the mark word in the object header
+- //
+- // NOTE: Only the "prev" marking information is guaranteed to be
+- // consistent most of the time, so most calls to this should use
+- // vo == UsePrevMarking.
+- // Currently, there is only one case where this is called with
+- // vo == UseNextMarking, which is to verify the "next" marking
+- // information at the end of remark.
+- // Currently there is only one place where this is called with
+- // vo == UseMarkWord, which is to verify the marking during a
+- // full GC.
+- void verify(bool silent, VerifyOption vo);
+-
+- // Override; it uses the "prev" marking information
+- virtual void verify(bool silent);
+-
+- virtual void print_on(outputStream* st) const;
+- virtual void print_extended_on(outputStream* st) const;
+-
+- virtual void print_gc_threads_on(outputStream* st) const;
+- virtual void gc_threads_do(ThreadClosure* tc) const;
+-
+- // Override
+- void print_tracing_info() const;
+-
+- // The following two methods are helpful for debugging RSet issues.
+- void print_cset_rsets() PRODUCT_RETURN;
+- void print_all_rsets() PRODUCT_RETURN;
+
+ // Convenience function to be used in situations where the heap type can be
+ // asserted to be this type.
+@@ -1684,7 +1655,6 @@
+ // then call the region version of the same function.
+
+ // Added if it is in permanent gen it isn't dead.
+- // Added if it is NULL it isn't dead.
+
+ bool is_obj_dead(const oop obj) const {
+ const HeapRegion* hr = heap_region_containing(obj);
+@@ -1708,13 +1678,90 @@
+ else return is_obj_ill(obj, hr);
+ }
+
++ bool allocated_since_marking(oop obj, HeapRegion* hr, VerifyOption vo);
++ HeapWord* top_at_mark_start(HeapRegion* hr, VerifyOption vo);
++ bool is_marked(oop obj, VerifyOption vo);
++ const char* top_at_mark_start_str(VerifyOption vo);
++
++ ConcurrentMark* concurrent_mark() const { return _cm; }
++
++ // Refinement
++
++ ConcurrentG1Refine* concurrent_g1_refine() const { return _cg1r; }
++
++ // The dirty cards region list is used to record a subset of regions
++ // whose cards need clearing. The list if populated during the
++ // remembered set scanning and drained during the card table
++ // cleanup. Although the methods are reentrant, population/draining
++ // phases must not overlap. For synchronization purposes the last
++ // element on the list points to itself.
++ HeapRegion* _dirty_cards_region_list;
++ void push_dirty_cards_region(HeapRegion* hr);
++ HeapRegion* pop_dirty_cards_region();
++
++ // Optimized nmethod scanning support routines
++
++ // Register the given nmethod with the G1 heap
++ virtual void register_nmethod(nmethod* nm);
++
++ // Unregister the given nmethod from the G1 heap
++ virtual void unregister_nmethod(nmethod* nm);
++
++ // Migrate the nmethods in the code root lists of the regions
++ // in the collection set to regions in to-space. In the event
++ // of an evacuation failure, nmethods that reference objects
++ // that were not successfullly evacuated are not migrated.
++ void migrate_strong_code_roots();
++
++ // During an initial mark pause, mark all the code roots that
++ // point into regions *not* in the collection set.
++ void mark_strong_code_roots(uint worker_id);
++
++ // Rebuild the stong code root lists for each region
++ // after a full GC
++ void rebuild_strong_code_roots();
++
++ // Delete entries for dead interned string and clean up unreferenced symbols
++ // in symbol table, possibly in parallel.
++ void unlink_string_and_symbol_table(BoolObjectClosure* is_alive, bool unlink_strings = true, bool unlink_symbols = true);
++
++ // Verification
++
++ // The following is just to alert the verification code
++ // that a full collection has occurred and that the
++ // remembered sets are no longer up to date.
++ bool _full_collection;
++ void set_full_collection() { _full_collection = true;}
++ void clear_full_collection() {_full_collection = false;}
++ bool full_collection() {return _full_collection;}
++
++ // Perform any cleanup actions necessary before allowing a verification.
++ virtual void prepare_for_verify();
++
++ // Perform verification.
++
++ // vo == UsePrevMarking -> use "prev" marking information,
++ // vo == UseNextMarking -> use "next" marking information
++ // vo == UseMarkWord -> use the mark word in the object header
++ //
++ // NOTE: Only the "prev" marking information is guaranteed to be
++ // consistent most of the time, so most calls to this should use
++ // vo == UsePrevMarking.
++ // Currently, there is only one case where this is called with
++ // vo == UseNextMarking, which is to verify the "next" marking
++ // information at the end of remark.
++ // Currently there is only one place where this is called with
++ // vo == UseMarkWord, which is to verify the marking during a
++ // full GC.
++ void verify(bool silent, VerifyOption vo);
++
++ // Override; it uses the "prev" marking information
++ virtual void verify(bool silent);
++
+ // The methods below are here for convenience and dispatch the
+ // appropriate method depending on value of the given VerifyOption
+- // parameter. The options for that parameter are:
+- //
+- // vo == UsePrevMarking -> use "prev" marking information,
+- // vo == UseNextMarking -> use "next" marking information,
+- // vo == UseMarkWord -> use mark word from object header
++ // parameter. The values for that parameter, and their meanings,
++ // are the same as those above.
+
+ bool is_obj_dead_cond(const oop obj,
+ const HeapRegion* hr,
+@@ -1739,31 +1786,20 @@
+ return false; // keep some compilers happy
+ }
+
+- bool allocated_since_marking(oop obj, HeapRegion* hr, VerifyOption vo);
+- HeapWord* top_at_mark_start(HeapRegion* hr, VerifyOption vo);
+- bool is_marked(oop obj, VerifyOption vo);
+- const char* top_at_mark_start_str(VerifyOption vo);
++ // Printing
+
+- // The following is just to alert the verification code
+- // that a full collection has occurred and that the
+- // remembered sets are no longer up to date.
+- bool _full_collection;
+- void set_full_collection() { _full_collection = true;}
+- void clear_full_collection() {_full_collection = false;}
+- bool full_collection() {return _full_collection;}
++ virtual void print_on(outputStream* st) const;
++ virtual void print_extended_on(outputStream* st) const;
+
+- ConcurrentMark* concurrent_mark() const { return _cm; }
+- ConcurrentG1Refine* concurrent_g1_refine() const { return _cg1r; }
++ virtual void print_gc_threads_on(outputStream* st) const;
++ virtual void gc_threads_do(ThreadClosure* tc) const;
+
+- // The dirty cards region list is used to record a subset of regions
+- // whose cards need clearing. The list if populated during the
+- // remembered set scanning and drained during the card table
+- // cleanup. Although the methods are reentrant, population/draining
+- // phases must not overlap. For synchronization purposes the last
+- // element on the list points to itself.
+- HeapRegion* _dirty_cards_region_list;
+- void push_dirty_cards_region(HeapRegion* hr);
+- HeapRegion* pop_dirty_cards_region();
++ // Override
++ void print_tracing_info() const;
++
++ // The following two methods are helpful for debugging RSet issues.
++ void print_cset_rsets() PRODUCT_RETURN;
++ void print_all_rsets() PRODUCT_RETURN;
+
+ public:
+ void stop_conc_gc_threads();
+@@ -1800,7 +1836,7 @@
+ G1CollectedHeap* _g1h;
+ RefToScanQueue* _refs;
+ DirtyCardQueue _dcq;
+- CardTableModRefBS* _ct_bs;
++ G1SATBCardTableModRefBS* _ct_bs;
+ G1RemSet* _g1_rem;
+
+ G1ParGCAllocBuffer _surviving_alloc_buffer;
+@@ -1839,7 +1875,7 @@
+ void add_to_undo_waste(size_t waste) { _undo_waste += waste; }
+
+ DirtyCardQueue& dirty_card_queue() { return _dcq; }
+- CardTableModRefBS* ctbs() { return _ct_bs; }
++ G1SATBCardTableModRefBS* ctbs() { return _ct_bs; }
+
+ template <class T> void immediate_rs_update(HeapRegion* from, T* p, int tid) {
+ if (!from->is_survivor()) {
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp Wed May 07 19:26:16 2014 -0700
+@@ -29,6 +29,7 @@
+ #include "gc_implementation/g1/g1CollectedHeap.hpp"
+ #include "gc_implementation/g1/g1AllocRegion.inline.hpp"
+ #include "gc_implementation/g1/g1CollectorPolicy.hpp"
++#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+ #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
+ #include "utilities/taskqueue.hpp"
+
+@@ -131,7 +132,7 @@
+ assert(containing_hr->is_in(end - 1), "it should also contain end - 1");
+
+ MemRegion mr(start, end);
+- ((CardTableModRefBS*)_g1h->barrier_set())->dirty(mr);
++ g1_barrier_set()->g1_mark_as_young(mr);
+ }
+
+ inline RefToScanQueue* G1CollectedHeap::task_queue(int i) const {
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Wed May 07 19:26:16 2014 -0700
+@@ -310,7 +310,8 @@
+ void G1CollectorPolicy::initialize_flags() {
+ set_min_alignment(HeapRegion::GrainBytes);
+ size_t card_table_alignment = GenRemSet::max_alignment_constraint(rem_set_name());
+- set_max_alignment(MAX2(card_table_alignment, min_alignment()));
++ size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
++ set_max_alignment(MAX3(card_table_alignment, min_alignment(), page_size));
+ if (SurvivorRatio < 1) {
+ vm_exit_during_initialization("Invalid survivor ratio specified");
+ }
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp Wed May 07 19:26:16 2014 -0700
+@@ -41,11 +41,11 @@
+ private:
+ G1CollectedHeap* _g1;
+ DirtyCardQueue *_dcq;
+- CardTableModRefBS* _ct_bs;
++ G1SATBCardTableModRefBS* _ct_bs;
+
+ public:
+ UpdateRSetDeferred(G1CollectedHeap* g1, DirtyCardQueue* dcq) :
+- _g1(g1), _ct_bs((CardTableModRefBS*)_g1->barrier_set()), _dcq(dcq) {}
++ _g1(g1), _ct_bs(_g1->g1_barrier_set()), _dcq(dcq) {}
+
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Wed May 07 19:26:16 2014 -0700
+@@ -161,6 +161,8 @@
+ _last_update_rs_times_ms(_max_gc_threads, "%.1lf"),
+ _last_update_rs_processed_buffers(_max_gc_threads, "%d"),
+ _last_scan_rs_times_ms(_max_gc_threads, "%.1lf"),
++ _last_strong_code_root_scan_times_ms(_max_gc_threads, "%.1lf"),
++ _last_strong_code_root_mark_times_ms(_max_gc_threads, "%.1lf"),
+ _last_obj_copy_times_ms(_max_gc_threads, "%.1lf"),
+ _last_termination_times_ms(_max_gc_threads, "%.1lf"),
+ _last_termination_attempts(_max_gc_threads, SIZE_FORMAT),
+@@ -182,6 +184,8 @@
+ _last_update_rs_times_ms.reset();
+ _last_update_rs_processed_buffers.reset();
+ _last_scan_rs_times_ms.reset();
++ _last_strong_code_root_scan_times_ms.reset();
++ _last_strong_code_root_mark_times_ms.reset();
+ _last_obj_copy_times_ms.reset();
+ _last_termination_times_ms.reset();
+ _last_termination_attempts.reset();
+@@ -197,6 +201,8 @@
+ _last_update_rs_times_ms.verify();
+ _last_update_rs_processed_buffers.verify();
+ _last_scan_rs_times_ms.verify();
++ _last_strong_code_root_scan_times_ms.verify();
++ _last_strong_code_root_mark_times_ms.verify();
+ _last_obj_copy_times_ms.verify();
+ _last_termination_times_ms.verify();
+ _last_termination_attempts.verify();
+@@ -210,6 +216,8 @@
+ _last_satb_filtering_times_ms.get(i) +
+ _last_update_rs_times_ms.get(i) +
+ _last_scan_rs_times_ms.get(i) +
++ _last_strong_code_root_scan_times_ms.get(i) +
++ _last_strong_code_root_mark_times_ms.get(i) +
+ _last_obj_copy_times_ms.get(i) +
+ _last_termination_times_ms.get(i);
+
+@@ -239,6 +247,9 @@
+ // Now subtract the time taken to fix up roots in generated code
+ misc_time_ms += _cur_collection_code_root_fixup_time_ms;
+
++ // Strong code root migration time
++ misc_time_ms += _cur_strong_code_root_migration_time_ms;
++
+ // Subtract the time taken to clean the card table from the
+ // current value of "other time"
+ misc_time_ms += _cur_clear_ct_time_ms;
+@@ -257,9 +268,13 @@
+ if (_last_satb_filtering_times_ms.sum() > 0.0) {
+ _last_satb_filtering_times_ms.print(2, "SATB Filtering (ms)");
+ }
++ if (_last_strong_code_root_mark_times_ms.sum() > 0.0) {
++ _last_strong_code_root_mark_times_ms.print(2, "Code Root Marking (ms)");
++ }
+ _last_update_rs_times_ms.print(2, "Update RS (ms)");
+ _last_update_rs_processed_buffers.print(3, "Processed Buffers");
+ _last_scan_rs_times_ms.print(2, "Scan RS (ms)");
++ _last_strong_code_root_scan_times_ms.print(2, "Code Root Scanning (ms)");
+ _last_obj_copy_times_ms.print(2, "Object Copy (ms)");
+ _last_termination_times_ms.print(2, "Termination (ms)");
+ if (G1Log::finest()) {
+@@ -273,12 +288,17 @@
+ if (_last_satb_filtering_times_ms.sum() > 0.0) {
+ _last_satb_filtering_times_ms.print(1, "SATB Filtering (ms)");
+ }
++ if (_last_strong_code_root_mark_times_ms.sum() > 0.0) {
++ _last_strong_code_root_mark_times_ms.print(1, "Code Root Marking (ms)");
++ }
+ _last_update_rs_times_ms.print(1, "Update RS (ms)");
+ _last_update_rs_processed_buffers.print(2, "Processed Buffers");
+ _last_scan_rs_times_ms.print(1, "Scan RS (ms)");
++ _last_strong_code_root_scan_times_ms.print(1, "Code Root Scanning (ms)");
+ _last_obj_copy_times_ms.print(1, "Object Copy (ms)");
+ }
+ print_stats(1, "Code Root Fixup", _cur_collection_code_root_fixup_time_ms);
++ print_stats(1, "Code Root Migration", _cur_strong_code_root_migration_time_ms);
+ print_stats(1, "Clear CT", _cur_clear_ct_time_ms);
+ double misc_time_ms = pause_time_sec * MILLIUNITS - accounted_time_ms();
+ print_stats(1, "Other", misc_time_ms);
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp Wed May 07 19:26:16 2014 -0700
+@@ -119,6 +119,8 @@
+ WorkerDataArray<double> _last_update_rs_times_ms;
+ WorkerDataArray<int> _last_update_rs_processed_buffers;
+ WorkerDataArray<double> _last_scan_rs_times_ms;
++ WorkerDataArray<double> _last_strong_code_root_scan_times_ms;
++ WorkerDataArray<double> _last_strong_code_root_mark_times_ms;
+ WorkerDataArray<double> _last_obj_copy_times_ms;
+ WorkerDataArray<double> _last_termination_times_ms;
+ WorkerDataArray<size_t> _last_termination_attempts;
+@@ -128,6 +130,7 @@
+
+ double _cur_collection_par_time_ms;
+ double _cur_collection_code_root_fixup_time_ms;
++ double _cur_strong_code_root_migration_time_ms;
+
+ double _cur_clear_ct_time_ms;
+ double _cur_ref_proc_time_ms;
+@@ -179,6 +182,14 @@
+ _last_scan_rs_times_ms.set(worker_i, ms);
+ }
+
++ void record_strong_code_root_scan_time(uint worker_i, double ms) {
++ _last_strong_code_root_scan_times_ms.set(worker_i, ms);
++ }
++
++ void record_strong_code_root_mark_time(uint worker_i, double ms) {
++ _last_strong_code_root_mark_times_ms.set(worker_i, ms);
++ }
++
+ void record_obj_copy_time(uint worker_i, double ms) {
+ _last_obj_copy_times_ms.set(worker_i, ms);
+ }
+@@ -208,6 +219,10 @@
+ _cur_collection_code_root_fixup_time_ms = ms;
+ }
+
++ void record_strong_code_root_migration_time(double ms) {
++ _cur_strong_code_root_migration_time_ms = ms;
++ }
++
+ void record_ref_proc_time(double ms) {
+ _cur_ref_proc_time_ms = ms;
+ }
+@@ -294,6 +309,14 @@
+ return _last_scan_rs_times_ms.average();
+ }
+
++ double average_last_strong_code_root_scan_time(){
++ return _last_strong_code_root_scan_times_ms.average();
++ }
++
++ double average_last_strong_code_root_mark_time(){
++ return _last_strong_code_root_mark_times_ms.average();
++ }
++
+ double average_last_obj_copy_time() {
+ return _last_obj_copy_times_ms.average();
+ }
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Wed May 07 19:26:16 2014 -0700
+@@ -177,10 +177,8 @@
+ GenMarkSweep::follow_mdo_weak_refs();
+ assert(GenMarkSweep::_marking_stack.is_empty(), "just drained");
+
+- // Visit interned string tables and delete unmarked oops
+- StringTable::unlink(&GenMarkSweep::is_alive);
+- // Clean up unreferenced symbols in symbol table.
+- SymbolTable::unlink();
++ // Delete entries for dead interned string and clean up unreferenced symbols in symbol table.
++ G1CollectedHeap::heap()->unlink_string_and_symbol_table(&GenMarkSweep::is_alive);
+
+ assert(GenMarkSweep::_marking_stack.is_empty(),
+ "stack should be empty by now");
+@@ -188,7 +186,6 @@
+ if (VerifyDuringGC) {
+ HandleMark hm; // handle scope
+ COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact);
+- gclog_or_tty->print(" VerifyDuringGC:(full)[Verifying ");
+ Universe::heap()->prepare_for_verify();
+ // Note: we can verify only the heap here. When an object is
+ // marked, the previous value of the mark word (including
+@@ -200,11 +197,13 @@
+ // fail. At the end of the GC, the orginal mark word values
+ // (including hash values) are restored to the appropriate
+ // objects.
+- Universe::heap()->verify(/* silent */ false,
+- /* option */ VerifyOption_G1UseMarkWord);
+-
+- G1CollectedHeap* g1h = G1CollectedHeap::heap();
+- gclog_or_tty->print_cr("]");
++ if (!VerifySilently) {
++ gclog_or_tty->print(" VerifyDuringGC:(full)[Verifying ");
++ }
++ Universe::heap()->verify(VerifySilently, VerifyOption_G1UseMarkWord);
++ if (!VerifySilently) {
++ gclog_or_tty->print_cr("]");
++ }
+ }
+
+ gc_tracer()->report_object_count_after_gc(&GenMarkSweep::is_alive);
+@@ -235,7 +234,7 @@
+ public:
+ G1PrepareCompactClosure(CompactibleSpace* cs)
+ : _g1h(G1CollectedHeap::heap()),
+- _mrbs(G1CollectedHeap::heap()->mr_bs()),
++ _mrbs(_g1h->g1_barrier_set()),
+ _cp(NULL, cs, cs->initialize_threshold()),
+ _humongous_proxy_set("G1MarkSweep Humongous Proxy Set") { }
+
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Wed May 07 19:26:16 2014 -0700
+@@ -34,6 +34,7 @@
+ #include "gc_implementation/g1/g1OopClosures.inline.hpp"
+ #include "gc_implementation/g1/g1RemSet.inline.hpp"
+ #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
++#include "gc_implementation/g1/heapRegionRemSet.hpp"
+ #include "memory/iterator.hpp"
+ #include "oops/oop.inline.hpp"
+ #include "utilities/intHisto.hpp"
+@@ -73,7 +74,8 @@
+ _ct_bs(ct_bs), _g1p(_g1->g1_policy()),
+ _cg1r(g1->concurrent_g1_refine()),
+ _cset_rs_update_cl(NULL),
+- _cards_scanned(NULL), _total_cards_scanned(0)
++ _cards_scanned(NULL), _total_cards_scanned(0),
++ _prev_period_summary()
+ {
+ _seq_task = new SubTasksDone(NumSeqTasks);
+ guarantee(n_workers() > 0, "There should be some workers");
+@@ -81,6 +83,9 @@
+ for (uint i = 0; i < n_workers(); i++) {
+ _cset_rs_update_cl[i] = NULL;
+ }
++ if (G1SummarizeRSetStats) {
++ _prev_period_summary.initialize(this);
++ }
+ }
+
+ G1RemSet::~G1RemSet() {
+@@ -101,15 +106,25 @@
+ class ScanRSClosure : public HeapRegionClosure {
+ size_t _cards_done, _cards;
+ G1CollectedHeap* _g1h;
++
+ OopsInHeapRegionClosure* _oc;
++ CodeBlobToOopClosure* _code_root_cl;
++
+ G1BlockOffsetSharedArray* _bot_shared;
+- CardTableModRefBS *_ct_bs;
+- int _worker_i;
+- int _block_size;
+- bool _try_claimed;
++ G1SATBCardTableModRefBS *_ct_bs;
++
++ double _strong_code_root_scan_time_sec;
++ int _worker_i;
++ int _block_size;
++ bool _try_claimed;
++
+ public:
+- ScanRSClosure(OopsInHeapRegionClosure* oc, int worker_i) :
++ ScanRSClosure(OopsInHeapRegionClosure* oc,
++ CodeBlobToOopClosure* code_root_cl,
++ int worker_i) :
+ _oc(oc),
++ _code_root_cl(code_root_cl),
++ _strong_code_root_scan_time_sec(0.0),
+ _cards(0),
+ _cards_done(0),
+ _worker_i(worker_i),
+@@ -117,7 +132,7 @@
+ {
+ _g1h = G1CollectedHeap::heap();
+ _bot_shared = _g1h->bot_shared();
+- _ct_bs = (CardTableModRefBS*) (_g1h->barrier_set());
++ _ct_bs = _g1h->g1_barrier_set();
+ _block_size = MAX2<int>(G1RSetScanBlockSize, 1);
+ }
+
+@@ -157,6 +172,12 @@
+ card_start, card_start + G1BlockOffsetSharedArray::N_words);
+ }
+
++ void scan_strong_code_roots(HeapRegion* r) {
++ double scan_start = os::elapsedTime();
++ r->strong_code_roots_do(_code_root_cl);
++ _strong_code_root_scan_time_sec += (os::elapsedTime() - scan_start);
++ }
++
+ bool doHeapRegion(HeapRegion* r) {
+ assert(r->in_collection_set(), "should only be called on elements of CS.");
+ HeapRegionRemSet* hrrs = r->rem_set();
+@@ -170,6 +191,7 @@
+ // _try_claimed || r->claim_iter()
+ // is true: either we're supposed to work on claimed-but-not-complete
+ // regions, or we successfully claimed the region.
++
+ HeapRegionRemSetIterator* iter = _g1h->rem_set_iterator(_worker_i);
+ hrrs->init_iterator(iter);
+ size_t card_index;
+@@ -203,30 +225,43 @@
+ }
+ }
+ if (!_try_claimed) {
++ // Scan the strong code root list attached to the current region
++ scan_strong_code_roots(r);
++
+ hrrs->set_iter_complete();
+ }
+ return false;
+ }
++
++ double strong_code_root_scan_time_sec() {
++ return _strong_code_root_scan_time_sec;
++ }
++
+ size_t cards_done() { return _cards_done;}
+ size_t cards_looked_up() { return _cards;}
+ };
+
+-void G1RemSet::scanRS(OopsInHeapRegionClosure* oc, int worker_i) {
++void G1RemSet::scanRS(OopsInHeapRegionClosure* oc,
++ CodeBlobToOopClosure* code_root_cl,
++ int worker_i) {
+ double rs_time_start = os::elapsedTime();
+ HeapRegion *startRegion = _g1->start_cset_region_for_worker(worker_i);
+
+- ScanRSClosure scanRScl(oc, worker_i);
++ ScanRSClosure scanRScl(oc, code_root_cl, worker_i);
+
+ _g1->collection_set_iterate_from(startRegion, &scanRScl);
+ scanRScl.set_try_claimed();
+ _g1->collection_set_iterate_from(startRegion, &scanRScl);
+
+- double scan_rs_time_sec = os::elapsedTime() - rs_time_start;
++ double scan_rs_time_sec = (os::elapsedTime() - rs_time_start)
++ - scanRScl.strong_code_root_scan_time_sec();
+
+- assert( _cards_scanned != NULL, "invariant" );
++ assert(_cards_scanned != NULL, "invariant");
+ _cards_scanned[worker_i] = scanRScl.cards_done();
+
+ _g1p->phase_times()->record_scan_rs_time(worker_i, scan_rs_time_sec * 1000.0);
++ _g1p->phase_times()->record_strong_code_root_scan_time(worker_i,
++ scanRScl.strong_code_root_scan_time_sec() * 1000.0);
+ }
+
+ // Closure used for updating RSets and recording references that
+@@ -286,7 +321,8 @@
+ }
+
+ void G1RemSet::oops_into_collection_set_do(OopsInHeapRegionClosure* oc,
+- int worker_i) {
++ CodeBlobToOopClosure* code_root_cl,
++ int worker_i) {
+ #if CARD_REPEAT_HISTO
+ ct_freq_update_histo_and_reset();
+ #endif
+@@ -326,7 +362,7 @@
+ _g1p->phase_times()->record_update_rs_time(worker_i, 0.0);
+ }
+ if (G1UseParallelRSetScanning || (worker_i == 0)) {
+- scanRS(oc, worker_i);
++ scanRS(oc, code_root_cl, worker_i);
+ } else {
+ _g1p->phase_times()->record_scan_rs_time(worker_i, 0.0);
+ }
+@@ -472,12 +508,7 @@
+ ScrubRSClosure(BitMap* region_bm, BitMap* card_bm) :
+ _g1h(G1CollectedHeap::heap()),
+ _region_bm(region_bm), _card_bm(card_bm),
+- _ctbs(NULL)
+- {
+- ModRefBarrierSet* bs = _g1h->mr_bs();
+- guarantee(bs->is_a(BarrierSet::CardTableModRef), "Precondition");
+- _ctbs = (CardTableModRefBS*)bs;
+- }
++ _ctbs(_g1h->g1_barrier_set()) {}
+
+ bool doHeapRegion(HeapRegion* r) {
+ if (!r->continuesHumongous()) {
+@@ -700,47 +731,29 @@
+ return has_refs_into_cset;
+ }
+
+-class HRRSStatsIter: public HeapRegionClosure {
+- size_t _occupied;
+- size_t _total_mem_sz;
+- size_t _max_mem_sz;
+- HeapRegion* _max_mem_sz_region;
+-public:
+- HRRSStatsIter() :
+- _occupied(0),
+- _total_mem_sz(0),
+- _max_mem_sz(0),
+- _max_mem_sz_region(NULL)
+- {}
++void G1RemSet::print_periodic_summary_info(const char* header) {
++ G1RemSetSummary current;
++ current.initialize(this);
+
+- bool doHeapRegion(HeapRegion* r) {
+- if (r->continuesHumongous()) return false;
+- size_t mem_sz = r->rem_set()->mem_size();
+- if (mem_sz > _max_mem_sz) {
+- _max_mem_sz = mem_sz;
+- _max_mem_sz_region = r;
+- }
+- _total_mem_sz += mem_sz;
+- size_t occ = r->rem_set()->occupied();
+- _occupied += occ;
+- return false;
+- }
+- size_t total_mem_sz() { return _total_mem_sz; }
+- size_t max_mem_sz() { return _max_mem_sz; }
+- size_t occupied() { return _occupied; }
+- HeapRegion* max_mem_sz_region() { return _max_mem_sz_region; }
+-};
++ _prev_period_summary.subtract_from(&current);
++ print_summary_info(&_prev_period_summary, header);
+
+-class PrintRSThreadVTimeClosure : public ThreadClosure {
+-public:
+- virtual void do_thread(Thread *t) {
+- ConcurrentG1RefineThread* crt = (ConcurrentG1RefineThread*) t;
+- gclog_or_tty->print(" %5.2f", crt->vtime_accum());
+- }
+-};
++ _prev_period_summary.set(&current);
++}
+
+ void G1RemSet::print_summary_info() {
+- G1CollectedHeap* g1 = G1CollectedHeap::heap();
++ G1RemSetSummary current;
++ current.initialize(this);
++
++ print_summary_info(&current, " Cumulative RS summary");
++}
++
++void G1RemSet::print_summary_info(G1RemSetSummary * summary, const char * header) {
++ assert(summary != NULL, "just checking");
++
++ if (header != NULL) {
++ gclog_or_tty->print_cr("%s", header);
++ }
+
+ #if CARD_REPEAT_HISTO
+ gclog_or_tty->print_cr("\nG1 card_repeat count histogram: ");
+@@ -748,52 +761,13 @@
+ card_repeat_count.print_on(gclog_or_tty);
+ #endif
+
+- gclog_or_tty->print_cr("\n Concurrent RS processed %d cards",
+- _conc_refine_cards);
+- DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+- jint tot_processed_buffers =
+- dcqs.processed_buffers_mut() + dcqs.processed_buffers_rs_thread();
+- gclog_or_tty->print_cr(" Of %d completed buffers:", tot_processed_buffers);
+- gclog_or_tty->print_cr(" %8d (%5.1f%%) by conc RS threads.",
+- dcqs.processed_buffers_rs_thread(),
+- 100.0*(float)dcqs.processed_buffers_rs_thread()/
+- (float)tot_processed_buffers);
+- gclog_or_tty->print_cr(" %8d (%5.1f%%) by mutator threads.",
+- dcqs.processed_buffers_mut(),
+- 100.0*(float)dcqs.processed_buffers_mut()/
+- (float)tot_processed_buffers);
+- gclog_or_tty->print_cr(" Conc RS threads times(s)");
+- PrintRSThreadVTimeClosure p;
+- gclog_or_tty->print(" ");
+- g1->concurrent_g1_refine()->threads_do(&p);
+- gclog_or_tty->print_cr("");
+-
+- HRRSStatsIter blk;
+- g1->heap_region_iterate(&blk);
+- gclog_or_tty->print_cr(" Total heap region rem set sizes = "SIZE_FORMAT"K."
+- " Max = "SIZE_FORMAT"K.",
+- blk.total_mem_sz()/K, blk.max_mem_sz()/K);
+- gclog_or_tty->print_cr(" Static structures = "SIZE_FORMAT"K,"
+- " free_lists = "SIZE_FORMAT"K.",
+- HeapRegionRemSet::static_mem_size() / K,
+- HeapRegionRemSet::fl_mem_size() / K);
+- gclog_or_tty->print_cr(" "SIZE_FORMAT" occupied cards represented.",
+- blk.occupied());
+- HeapRegion* max_mem_sz_region = blk.max_mem_sz_region();
+- HeapRegionRemSet* rem_set = max_mem_sz_region->rem_set();
+- gclog_or_tty->print_cr(" Max size region = "HR_FORMAT", "
+- "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
+- HR_FORMAT_PARAMS(max_mem_sz_region),
+- (rem_set->mem_size() + K - 1)/K,
+- (rem_set->occupied() + K - 1)/K);
+- gclog_or_tty->print_cr(" Did %d coarsenings.",
+- HeapRegionRemSet::n_coarsenings());
++ summary->print_on(gclog_or_tty);
+ }
+
+ void G1RemSet::prepare_for_verify() {
+ if (G1HRRSFlushLogBuffersOnVerify &&
+ (VerifyBeforeGC || VerifyAfterGC)
+- && !_g1->full_collection()) {
++ && (!_g1->full_collection() || G1VerifyRSetsDuringFullGC)) {
+ cleanupHRRS();
+ _g1->set_refine_cte_cl_concurrency(false);
+ if (SafepointSynchronize::is_at_safepoint()) {
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp Wed May 07 19:26:16 2014 -0700
+@@ -25,6 +25,8 @@
+ #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP
+ #define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP
+
++#include "gc_implementation/g1/g1RemSetSummary.hpp"
++
+ // A G1RemSet provides ways of iterating over pointers into a selected
+ // collection set.
+
+@@ -37,9 +39,11 @@
+ // so that they can be used to update the individual region remsets.
+
+ class G1RemSet: public CHeapObj<mtGC> {
++private:
++ G1RemSetSummary _prev_period_summary;
+ protected:
+ G1CollectedHeap* _g1;
+- unsigned _conc_refine_cards;
++ size_t _conc_refine_cards;
+ uint n_workers();
+
+ protected:
+@@ -66,6 +70,8 @@
+ // references into the collection set.
+ OopsInHeapRegionClosure** _cset_rs_update_cl;
+
++ // Print the given summary info
++ virtual void print_summary_info(G1RemSetSummary * summary, const char * header = NULL);
+ public:
+ // This is called to reset dual hash tables after the gc pause
+ // is finished and the initial hash table is no longer being
+@@ -75,14 +81,23 @@
+ G1RemSet(G1CollectedHeap* g1, CardTableModRefBS* ct_bs);
+ ~G1RemSet();
+
+- // Invoke "blk->do_oop" on all pointers into the CS in objects in regions
+- // outside the CS (having invoked "blk->set_region" to set the "from"
+- // region correctly beforehand.) The "worker_i" param is for the
+- // parallel case where the number of the worker thread calling this
+- // function can be helpful in partitioning the work to be done. It
+- // should be the same as the "i" passed to the calling thread's
+- // work(i) function. In the sequential case this param will be ingored.
+- void oops_into_collection_set_do(OopsInHeapRegionClosure* blk, int worker_i);
++ // Invoke "blk->do_oop" on all pointers into the collection set
++ // from objects in regions outside the collection set (having
++ // invoked "blk->set_region" to set the "from" region correctly
++ // beforehand.)
++ //
++ // Invoke code_root_cl->do_code_blob on the unmarked nmethods
++ // on the strong code roots list for each region in the
++ // collection set.
++ //
++ // The "worker_i" param is for the parallel case where the id
++ // of the worker thread calling this function can be helpful in
++ // partitioning the work to be done. It should be the same as
++ // the "i" passed to the calling thread's work(i) function.
++ // In the sequential case this param will be ignored.
++ void oops_into_collection_set_do(OopsInHeapRegionClosure* blk,
++ CodeBlobToOopClosure* code_root_cl,
++ int worker_i);
+
+ // Prepare for and cleanup after an oops_into_collection_set_do
+ // call. Must call each of these once before and after (in sequential
+@@ -92,7 +107,10 @@
+ void prepare_for_oops_into_collection_set_do();
+ void cleanup_after_oops_into_collection_set_do();
+
+- void scanRS(OopsInHeapRegionClosure* oc, int worker_i);
++ void scanRS(OopsInHeapRegionClosure* oc,
++ CodeBlobToOopClosure* code_root_cl,
++ int worker_i);
++
+ void updateRS(DirtyCardQueue* into_cset_dcq, int worker_i);
+
+ CardTableModRefBS* ct_bs() { return _ct_bs; }
+@@ -123,11 +141,18 @@
+ int worker_i,
+ bool check_for_refs_into_cset);
+
+- // Print any relevant summary info.
++ // Print accumulated summary info from the start of the VM.
+ virtual void print_summary_info();
+
++ // Print accumulated summary info from the last time called.
++ virtual void print_periodic_summary_info(const char* header);
++
+ // Prepare remembered set for verification.
+ virtual void prepare_for_verify();
++
++ size_t conc_refine_cards() const {
++ return _conc_refine_cards;
++ }
+ };
+
+ class CountNonCleanMemRegionClosure: public MemRegionClosure {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,354 @@
++/*
++ * 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.
++ *
++ */
++
++#include "precompiled.hpp"
++#include "gc_implementation/g1/concurrentG1Refine.hpp"
++#include "gc_implementation/g1/concurrentG1RefineThread.hpp"
++#include "gc_implementation/g1/heapRegion.hpp"
++#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
++#include "gc_implementation/g1/g1RemSet.inline.hpp"
++#include "gc_implementation/g1/g1RemSetSummary.hpp"
++#include "gc_implementation/g1/heapRegionRemSet.hpp"
++#include "runtime/thread.hpp"
++
++class GetRSThreadVTimeClosure : public ThreadClosure {
++private:
++ G1RemSetSummary* _summary;
++ uint _counter;
++
++public:
++ GetRSThreadVTimeClosure(G1RemSetSummary * summary) : ThreadClosure(), _summary(summary), _counter(0) {
++ assert(_summary != NULL, "just checking");
++ }
++
++ virtual void do_thread(Thread* t) {
++ ConcurrentG1RefineThread* crt = (ConcurrentG1RefineThread*) t;
++ _summary->set_rs_thread_vtime(_counter, crt->vtime_accum());
++ _counter++;
++ }
++};
++
++void G1RemSetSummary::update() {
++ _num_refined_cards = remset()->conc_refine_cards();
++ DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
++ _num_processed_buf_mutator = dcqs.processed_buffers_mut();
++ _num_processed_buf_rs_threads = dcqs.processed_buffers_rs_thread();
++
++ _num_coarsenings = HeapRegionRemSet::n_coarsenings();
++
++ ConcurrentG1Refine * cg1r = G1CollectedHeap::heap()->concurrent_g1_refine();
++ if (_rs_threads_vtimes != NULL) {
++ GetRSThreadVTimeClosure p(this);
++ cg1r->worker_threads_do(&p);
++ }
++ set_sampling_thread_vtime(cg1r->sampling_thread()->vtime_accum());
++}
++
++void G1RemSetSummary::set_rs_thread_vtime(uint thread, double value) {
++ assert(_rs_threads_vtimes != NULL, "just checking");
++ assert(thread < _num_vtimes, "just checking");
++ _rs_threads_vtimes[thread] = value;
++}
++
++double G1RemSetSummary::rs_thread_vtime(uint thread) const {
++ assert(_rs_threads_vtimes != NULL, "just checking");
++ assert(thread < _num_vtimes, "just checking");
++ return _rs_threads_vtimes[thread];
++}
++
++void G1RemSetSummary::initialize(G1RemSet* remset) {
++ assert(_rs_threads_vtimes == NULL, "just checking");
++ assert(remset != NULL, "just checking");
++
++ _remset = remset;
++ _num_vtimes = ConcurrentG1Refine::thread_num();
++ _rs_threads_vtimes = NEW_C_HEAP_ARRAY(double, _num_vtimes, mtGC);
++ memset(_rs_threads_vtimes, 0, sizeof(double) * _num_vtimes);
++
++ update();
++}
++
++void G1RemSetSummary::set(G1RemSetSummary* other) {
++ assert(other != NULL, "just checking");
++ assert(remset() == other->remset(), "just checking");
++ assert(_num_vtimes == other->_num_vtimes, "just checking");
++
++ _num_refined_cards = other->num_concurrent_refined_cards();
++
++ _num_processed_buf_mutator = other->num_processed_buf_mutator();
++ _num_processed_buf_rs_threads = other->num_processed_buf_rs_threads();
++
++ _num_coarsenings = other->_num_coarsenings;
++
++ memcpy(_rs_threads_vtimes, other->_rs_threads_vtimes, sizeof(double) * _num_vtimes);
++
++ set_sampling_thread_vtime(other->sampling_thread_vtime());
++}
++
++void G1RemSetSummary::subtract_from(G1RemSetSummary* other) {
++ assert(other != NULL, "just checking");
++ assert(remset() == other->remset(), "just checking");
++ assert(_num_vtimes == other->_num_vtimes, "just checking");
++
++ _num_refined_cards = other->num_concurrent_refined_cards() - _num_refined_cards;
++
++ _num_processed_buf_mutator = other->num_processed_buf_mutator() - _num_processed_buf_mutator;
++ _num_processed_buf_rs_threads = other->num_processed_buf_rs_threads() - _num_processed_buf_rs_threads;
++
++ _num_coarsenings = other->num_coarsenings() - _num_coarsenings;
++
++ for (uint i = 0; i < _num_vtimes; i++) {
++ set_rs_thread_vtime(i, other->rs_thread_vtime(i) - rs_thread_vtime(i));
++ }
++
++ _sampling_thread_vtime = other->sampling_thread_vtime() - _sampling_thread_vtime;
++}
++
++static double percent_of(size_t numerator, size_t denominator) {
++ if (denominator != 0) {
++ return (double)numerator / denominator * 100.0f;
++ } else {
++ return 0.0f;
++ }
++}
++
++static size_t round_to_K(size_t value) {
++ return value / K;
++}
++
++class RegionTypeCounter VALUE_OBJ_CLASS_SPEC {
++private:
++ const char* _name;
++
++ size_t _rs_mem_size;
++ size_t _cards_occupied;
++ size_t _amount;
++
++ size_t _code_root_mem_size;
++ size_t _code_root_elems;
++
++ double rs_mem_size_percent_of(size_t total) {
++ return percent_of(_rs_mem_size, total);
++ }
++
++ double cards_occupied_percent_of(size_t total) {
++ return percent_of(_cards_occupied, total);
++ }
++
++ double code_root_mem_size_percent_of(size_t total) {
++ return percent_of(_code_root_mem_size, total);
++ }
++
++ double code_root_elems_percent_of(size_t total) {
++ return percent_of(_code_root_elems, total);
++ }
++
++ size_t amount() const { return _amount; }
++
++public:
++
++ RegionTypeCounter(const char* name) : _name(name), _rs_mem_size(0), _cards_occupied(0),
++ _amount(0), _code_root_mem_size(0), _code_root_elems(0) { }
++
++ void add(size_t rs_mem_size, size_t cards_occupied, size_t code_root_mem_size,
++ size_t code_root_elems) {
++ _rs_mem_size += rs_mem_size;
++ _cards_occupied += cards_occupied;
++ _code_root_mem_size += code_root_mem_size;
++ _code_root_elems += code_root_elems;
++ _amount++;
++ }
++
++ size_t rs_mem_size() const { return _rs_mem_size; }
++ size_t cards_occupied() const { return _cards_occupied; }
++
++ size_t code_root_mem_size() const { return _code_root_mem_size; }
++ size_t code_root_elems() const { return _code_root_elems; }
++
++ void print_rs_mem_info_on(outputStream * out, size_t total) {
++ out->print_cr(" "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
++ round_to_K(rs_mem_size()), rs_mem_size_percent_of(total), amount(), _name);
++ }
++
++ void print_cards_occupied_info_on(outputStream * out, size_t total) {
++ out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) entries by "SIZE_FORMAT" %s regions",
++ cards_occupied(), cards_occupied_percent_of(total), amount(), _name);
++ }
++
++ void print_code_root_mem_info_on(outputStream * out, size_t total) {
++ out->print_cr(" "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
++ round_to_K(code_root_mem_size()), code_root_mem_size_percent_of(total), amount(), _name);
++ }
++
++ void print_code_root_elems_info_on(outputStream * out, size_t total) {
++ out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) elements by "SIZE_FORMAT" %s regions",
++ code_root_elems(), code_root_elems_percent_of(total), amount(), _name);
++ }
++};
++
++
++class HRRSStatsIter: public HeapRegionClosure {
++private:
++ RegionTypeCounter _young;
++ RegionTypeCounter _humonguous;
++ RegionTypeCounter _free;
++ RegionTypeCounter _old;
++ RegionTypeCounter _all;
++
++ size_t _max_rs_mem_sz;
++ HeapRegion* _max_rs_mem_sz_region;
++
++ size_t total_rs_mem_sz() const { return _all.rs_mem_size(); }
++ size_t total_cards_occupied() const { return _all.cards_occupied(); }
++
++ size_t max_rs_mem_sz() const { return _max_rs_mem_sz; }
++ HeapRegion* max_rs_mem_sz_region() const { return _max_rs_mem_sz_region; }
++
++ size_t _max_code_root_mem_sz;
++ HeapRegion* _max_code_root_mem_sz_region;
++
++ size_t total_code_root_mem_sz() const { return _all.code_root_mem_size(); }
++ size_t total_code_root_elems() const { return _all.code_root_elems(); }
++
++ size_t max_code_root_mem_sz() const { return _max_code_root_mem_sz; }
++ HeapRegion* max_code_root_mem_sz_region() const { return _max_code_root_mem_sz_region; }
++
++public:
++ HRRSStatsIter() : _all("All"), _young("Young"), _humonguous("Humonguous"),
++ _free("Free"), _old("Old"), _max_code_root_mem_sz_region(NULL), _max_rs_mem_sz_region(NULL),
++ _max_rs_mem_sz(0), _max_code_root_mem_sz(0)
++ {}
++
++ bool doHeapRegion(HeapRegion* r) {
++ HeapRegionRemSet* hrrs = r->rem_set();
++
++ // HeapRegionRemSet::mem_size() includes the
++ // size of the strong code roots
++ size_t rs_mem_sz = hrrs->mem_size();
++ if (rs_mem_sz > _max_rs_mem_sz) {
++ _max_rs_mem_sz = rs_mem_sz;
++ _max_rs_mem_sz_region = r;
++ }
++ size_t occupied_cards = hrrs->occupied();
++ size_t code_root_mem_sz = hrrs->strong_code_roots_mem_size();
++ if (code_root_mem_sz > max_code_root_mem_sz()) {
++ _max_code_root_mem_sz_region = r;
++ }
++ size_t code_root_elems = hrrs->strong_code_roots_list_length();
++
++ RegionTypeCounter* current = NULL;
++ if (r->is_young()) {
++ current = &_young;
++ } else if (r->isHumongous()) {
++ current = &_humonguous;
++ } else if (r->is_empty()) {
++ current = &_free;
++ } else {
++ current = &_old;
++ }
++ current->add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems);
++ _all.add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems);
++
++ return false;
++ }
++
++ void print_summary_on(outputStream* out) {
++ RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL };
++
++ out->print_cr("\n Current rem set statistics");
++ out->print_cr(" Total per region rem sets sizes = "SIZE_FORMAT"K."
++ " Max = "SIZE_FORMAT"K.",
++ round_to_K(total_rs_mem_sz()), round_to_K(max_rs_mem_sz()));
++ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
++ (*current)->print_rs_mem_info_on(out, total_rs_mem_sz());
++ }
++
++ out->print_cr(" Static structures = "SIZE_FORMAT"K,"
++ " free_lists = "SIZE_FORMAT"K.",
++ round_to_K(HeapRegionRemSet::static_mem_size()),
++ round_to_K(HeapRegionRemSet::fl_mem_size()));
++
++ out->print_cr(" "SIZE_FORMAT" occupied cards represented.",
++ total_cards_occupied());
++ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
++ (*current)->print_cards_occupied_info_on(out, total_cards_occupied());
++ }
++
++ // Largest sized rem set region statistics
++ HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set();
++ out->print_cr(" Region with largest rem set = "HR_FORMAT", "
++ "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
++ HR_FORMAT_PARAMS(max_rs_mem_sz_region()),
++ round_to_K(rem_set->mem_size()),
++ round_to_K(rem_set->occupied()));
++
++ // Strong code root statistics
++ HeapRegionRemSet* max_code_root_rem_set = max_code_root_mem_sz_region()->rem_set();
++ out->print_cr(" Total heap region code root sets sizes = "SIZE_FORMAT"K."
++ " Max = "SIZE_FORMAT"K.",
++ round_to_K(total_code_root_mem_sz()),
++ round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()));
++ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
++ (*current)->print_code_root_mem_info_on(out, total_code_root_mem_sz());
++ }
++
++ out->print_cr(" "SIZE_FORMAT" code roots represented.",
++ total_code_root_elems());
++ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
++ (*current)->print_code_root_elems_info_on(out, total_code_root_elems());
++ }
++
++ out->print_cr(" Region with largest amount of code roots = "HR_FORMAT", "
++ "size = "SIZE_FORMAT "K, num_elems = "SIZE_FORMAT".",
++ HR_FORMAT_PARAMS(max_code_root_mem_sz_region()),
++ round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()),
++ round_to_K(max_code_root_rem_set->strong_code_roots_list_length()));
++ }
++};
++
++void G1RemSetSummary::print_on(outputStream* out) {
++ out->print_cr("\n Recent concurrent refinement statistics");
++ out->print_cr(" Processed "SIZE_FORMAT" cards",
++ num_concurrent_refined_cards());
++ out->print_cr(" Of "SIZE_FORMAT" completed buffers:", num_processed_buf_total());
++ out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by concurrent RS threads.",
++ num_processed_buf_total(),
++ percent_of(num_processed_buf_rs_threads(), num_processed_buf_total()));
++ out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by mutator threads.",
++ num_processed_buf_mutator(),
++ percent_of(num_processed_buf_mutator(), num_processed_buf_total()));
++ out->print_cr(" Did "SIZE_FORMAT" coarsenings.", num_coarsenings());
++ out->print_cr(" Concurrent RS threads times (s)");
++ out->print(" ");
++ for (uint i = 0; i < _num_vtimes; i++) {
++ out->print(" %5.2f", rs_thread_vtime(i));
++ }
++ out->cr();
++ out->print_cr(" Concurrent sampling threads times (s)");
++ out->print_cr(" %5.2f", sampling_thread_vtime());
++
++ HRRSStatsIter blk;
++ G1CollectedHeap::heap()->heap_region_iterate(&blk);
++ blk.print_summary_on(out);
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,118 @@
++/*
++ * 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.
++ *
++ */
++
++#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP
++#define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP
++
++#include "utilities/ostream.hpp"
++
++class G1RemSet;
++
++// A G1RemSetSummary manages statistical information about the G1RemSet
++
++class G1RemSetSummary VALUE_OBJ_CLASS_SPEC {
++private:
++ friend class GetRSThreadVTimeClosure;
++
++ G1RemSet* _remset;
++
++ G1RemSet* remset() const {
++ return _remset;
++ }
++
++ size_t _num_refined_cards;
++ size_t _num_processed_buf_mutator;
++ size_t _num_processed_buf_rs_threads;
++
++ size_t _num_coarsenings;
++
++ double* _rs_threads_vtimes;
++ size_t _num_vtimes;
++
++ double _sampling_thread_vtime;
++
++ void set_rs_thread_vtime(uint thread, double value);
++ void set_sampling_thread_vtime(double value) {
++ _sampling_thread_vtime = value;
++ }
++
++ void free_and_null() {
++ if (_rs_threads_vtimes) {
++ FREE_C_HEAP_ARRAY(double, _rs_threads_vtimes, mtGC);
++ _rs_threads_vtimes = NULL;
++ _num_vtimes = 0;
++ }
++ }
++
++ // update this summary with current data from various places
++ void update();
++
++public:
++ G1RemSetSummary() : _remset(NULL), _num_refined_cards(0),
++ _num_processed_buf_mutator(0), _num_processed_buf_rs_threads(0), _num_coarsenings(0),
++ _rs_threads_vtimes(NULL), _num_vtimes(0), _sampling_thread_vtime(0.0f) {
++ }
++
++ ~G1RemSetSummary() {
++ free_and_null();
++ }
++
++ // set the counters in this summary to the values of the others
++ void set(G1RemSetSummary* other);
++ // subtract all counters from the other summary, and set them in the current
++ void subtract_from(G1RemSetSummary* other);
++
++ // initialize and get the first sampling
++ void initialize(G1RemSet* remset);
++
++ void print_on(outputStream* out);
++
++ double rs_thread_vtime(uint thread) const;
++
++ double sampling_thread_vtime() const {
++ return _sampling_thread_vtime;
++ }
++
++ size_t num_concurrent_refined_cards() const {
++ return _num_refined_cards;
++ }
++
++ size_t num_processed_buf_mutator() const {
++ return _num_processed_buf_mutator;
++ }
++
++ size_t num_processed_buf_rs_threads() const {
++ return _num_processed_buf_rs_threads;
++ }
++
++ size_t num_processed_buf_total() const {
++ return num_processed_buf_mutator() + num_processed_buf_rs_threads();
++ }
++
++ size_t num_coarsenings() const {
++ return _num_coarsenings;
++ }
++};
++
++#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Wed May 07 19:26:16 2014 -0700
+@@ -76,6 +76,46 @@
+ }
+ }
+
++bool G1SATBCardTableModRefBS::mark_card_deferred(size_t card_index) {
++ jbyte val = _byte_map[card_index];
++ // It's already processed
++ if ((val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val()) {
++ return false;
++ }
++
++ if (val == g1_young_gen) {
++ // the card is for a young gen region. We don't need to keep track of all pointers into young
++ return false;
++ }
++
++ // Cached bit can be installed either on a clean card or on a claimed card.
++ jbyte new_val = val;
++ if (val == clean_card_val()) {
++ new_val = (jbyte)deferred_card_val();
++ } else {
++ if (val & claimed_card_val()) {
++ new_val = val | (jbyte)deferred_card_val();
++ }
++ }
++ if (new_val != val) {
++ Atomic::cmpxchg(new_val, &_byte_map[card_index], val);
++ }
++ return true;
++}
++
++void G1SATBCardTableModRefBS::g1_mark_as_young(const MemRegion& mr) {
++ jbyte *const first = byte_for(mr.start());
++ jbyte *const last = byte_after(mr.last());
++
++ memset(first, g1_young_gen, last - first);
++}
++
++#ifndef PRODUCT
++void G1SATBCardTableModRefBS::verify_g1_young_region(MemRegion mr) {
++ verify_region(mr, g1_young_gen, true);
++}
++#endif
++
+ G1SATBCardTableLoggingModRefBS::
+ G1SATBCardTableLoggingModRefBS(MemRegion whole_heap,
+ int max_covered_regions) :
+@@ -88,7 +128,11 @@
+ void
+ G1SATBCardTableLoggingModRefBS::write_ref_field_work(void* field,
+ oop new_val) {
+- jbyte* byte = byte_for(field);
++ volatile jbyte* byte = byte_for(field);
++ if (*byte == g1_young_gen) {
++ return;
++ }
++ OrderAccess::storeload();
+ if (*byte != dirty_card) {
+ *byte = dirty_card;
+ Thread* thr = Thread::current();
+@@ -120,7 +164,7 @@
+
+ void
+ G1SATBCardTableLoggingModRefBS::invalidate(MemRegion mr, bool whole_heap) {
+- jbyte* byte = byte_for(mr.start());
++ volatile jbyte* byte = byte_for(mr.start());
+ jbyte* last_byte = byte_for(mr.last());
+ Thread* thr = Thread::current();
+ if (whole_heap) {
+@@ -129,25 +173,35 @@
+ byte++;
+ }
+ } else {
+- // Enqueue if necessary.
+- if (thr->is_Java_thread()) {
+- JavaThread* jt = (JavaThread*)thr;
+- while (byte <= last_byte) {
+- if (*byte != dirty_card) {
+- *byte = dirty_card;
+- jt->dirty_card_queue().enqueue(byte);
++ // skip all consecutive young cards
++ for (; byte <= last_byte && *byte == g1_young_gen; byte++);
++
++ if (byte <= last_byte) {
++ OrderAccess::storeload();
++ // Enqueue if necessary.
++ if (thr->is_Java_thread()) {
++ JavaThread* jt = (JavaThread*)thr;
++ for (; byte <= last_byte; byte++) {
++ if (*byte == g1_young_gen) {
++ continue;
++ }
++ if (*byte != dirty_card) {
++ *byte = dirty_card;
++ jt->dirty_card_queue().enqueue(byte);
++ }
+ }
+- byte++;
+- }
+- } else {
+- MutexLockerEx x(Shared_DirtyCardQ_lock,
+- Mutex::_no_safepoint_check_flag);
+- while (byte <= last_byte) {
+- if (*byte != dirty_card) {
+- *byte = dirty_card;
+- _dcqs.shared_dirty_card_queue()->enqueue(byte);
++ } else {
++ MutexLockerEx x(Shared_DirtyCardQ_lock,
++ Mutex::_no_safepoint_check_flag);
++ for (; byte <= last_byte; byte++) {
++ if (*byte == g1_young_gen) {
++ continue;
++ }
++ if (*byte != dirty_card) {
++ *byte = dirty_card;
++ _dcqs.shared_dirty_card_queue()->enqueue(byte);
++ }
+ }
+- byte++;
+ }
+ }
+ }
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Wed May 07 19:26:16 2014 -0700
+@@ -37,7 +37,14 @@
+ // snapshot-at-the-beginning marking.
+
+ class G1SATBCardTableModRefBS: public CardTableModRefBSForCTRS {
++protected:
++ enum G1CardValues {
++ g1_young_gen = CT_MR_BS_last_reserved << 1
++ };
++
+ public:
++ static int g1_young_card_val() { return g1_young_gen; }
++
+ // Add "pre_val" to a set of objects that may have been disconnected from the
+ // pre-marking object graph.
+ static void enqueue(oop pre_val);
+@@ -88,6 +95,45 @@
+ write_ref_array_pre_work(dst, count);
+ }
+ }
++
++/*
++ Claimed and deferred bits are used together in G1 during the evacuation
++ pause. These bits can have the following state transitions:
++ 1. The claimed bit can be put over any other card state. Except that
++ the "dirty -> dirty and claimed" transition is checked for in
++ G1 code and is not used.
++ 2. Deferred bit can be set only if the previous state of the card
++ was either clean or claimed. mark_card_deferred() is wait-free.
++ We do not care if the operation is be successful because if
++ it does not it will only result in duplicate entry in the update
++ buffer because of the "cache-miss". So it's not worth spinning.
++ */
++
++ bool is_card_claimed(size_t card_index) {
++ jbyte val = _byte_map[card_index];
++ return (val & (clean_card_mask_val() | claimed_card_val())) == claimed_card_val();
++ }
++
++ void set_card_claimed(size_t card_index) {
++ jbyte val = _byte_map[card_index];
++ if (val == clean_card_val()) {
++ val = (jbyte)claimed_card_val();
++ } else {
++ val |= (jbyte)claimed_card_val();
++ }
++ _byte_map[card_index] = val;
++ }
++
++ void verify_g1_young_region(MemRegion mr) PRODUCT_RETURN;
++ void g1_mark_as_young(const MemRegion& mr);
++
++ bool mark_card_deferred(size_t card_index);
++
++ bool is_card_deferred(size_t card_index) {
++ jbyte val = _byte_map[card_index];
++ return (val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val();
++ }
++
+ };
+
+ // Adds card-table logging to the post-barrier.
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Wed May 07 19:26:16 2014 -0700
+@@ -71,6 +71,9 @@
+ diagnostic(bool, G1TraceConcRefinement, false, \
+ "Trace G1 concurrent refinement") \
+ \
++ experimental(bool, G1TraceStringSymbolTableScrubbing, false, \
++ "Trace information string and symbol table scrubbing.") \
++ \
+ product(double, G1ConcMarkStepDurationMillis, 10.0, \
+ "Target duration of individual concurrent marking steps " \
+ "in milliseconds.") \
+@@ -332,7 +335,14 @@
+ \
+ develop(bool, G1EvacuationFailureALotDuringMixedGC, true, \
+ "Force use of evacuation failure handling during mixed " \
+- "evacuation pauses")
++ "evacuation pauses") \
++ \
++ diagnostic(bool, G1VerifyRSetsDuringFullGC, false, \
++ "If true, perform verification of each heap region's " \
++ "remembered set when verifying the heap during a full GC.") \
++ \
++ diagnostic(bool, G1VerifyHeapRegionCodeRoots, false, \
++ "Verify the code root lists attached to each heap region.")
+
+ G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG)
+
+--- ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Wed May 07 19:26:16 2014 -0700
+@@ -23,6 +23,7 @@
+ */
+
+ #include "precompiled.hpp"
++#include "code/nmethod.hpp"
+ #include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
+ #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
+ #include "gc_implementation/g1/g1OopClosures.inline.hpp"
+@@ -50,144 +51,6 @@
+ OopClosure* oc) :
+ _r_bottom(r->bottom()), _r_end(r->end()), _oc(oc) { }
+
+-class VerifyLiveClosure: public OopClosure {
+-private:
+- G1CollectedHeap* _g1h;
+- CardTableModRefBS* _bs;
+- oop _containing_obj;
+- bool _failures;
+- int _n_failures;
+- VerifyOption _vo;
+-public:
+- // _vo == UsePrevMarking -> use "prev" marking information,
+- // _vo == UseNextMarking -> use "next" marking information,
+- // _vo == UseMarkWord -> use mark word from object header.
+- VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) :
+- _g1h(g1h), _bs(NULL), _containing_obj(NULL),
+- _failures(false), _n_failures(0), _vo(vo)
+- {
+- BarrierSet* bs = _g1h->barrier_set();
+- if (bs->is_a(BarrierSet::CardTableModRef))
+- _bs = (CardTableModRefBS*)bs;
+- }
+-
+- void set_containing_obj(oop obj) {
+- _containing_obj = obj;
+- }
+-
+- bool failures() { return _failures; }
+- int n_failures() { return _n_failures; }
+-
+- virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+- virtual void do_oop( oop* p) { do_oop_work(p); }
+-
+- void print_object(outputStream* out, oop obj) {
+-#ifdef PRODUCT
+- klassOop k = obj->klass();
+- const char* class_name = instanceKlass::cast(k)->external_name();
+- out->print_cr("class name %s", class_name);
+-#else // PRODUCT
+- obj->print_on(out);
+-#endif // PRODUCT
+- }
+-
+- template <class T>
+- void do_oop_work(T* p) {
+- assert(_containing_obj != NULL, "Precondition");
+- assert(!_g1h->is_obj_dead_cond(_containing_obj, _vo),
+- "Precondition");
+- T heap_oop = oopDesc::load_heap_oop(p);
+- if (!oopDesc::is_null(heap_oop)) {
+- oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+- bool failed = false;
+- if (!_g1h->is_in_closed_subset(obj) || _g1h->is_obj_dead_cond(obj, _vo)) {
+- MutexLockerEx x(ParGCRareEvent_lock,
+- Mutex::_no_safepoint_check_flag);
+-
+- if (!_failures) {
+- gclog_or_tty->print_cr("");
+- gclog_or_tty->print_cr("----------");
+- }
+- if (!_g1h->is_in_closed_subset(obj)) {
+- HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
+- gclog_or_tty->print_cr("Field "PTR_FORMAT
+- " of live obj "PTR_FORMAT" in region "
+- "["PTR_FORMAT", "PTR_FORMAT")",
+- p, (void*) _containing_obj,
+- from->bottom(), from->end());
+- print_object(gclog_or_tty, _containing_obj);
+- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
+- (void*) obj);
+- } else {
+- HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
+- HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
+- gclog_or_tty->print_cr("Field "PTR_FORMAT
+- " of live obj "PTR_FORMAT" in region "
+- "["PTR_FORMAT", "PTR_FORMAT")",
+- p, (void*) _containing_obj,
+- from->bottom(), from->end());
+- print_object(gclog_or_tty, _containing_obj);
+- gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
+- "["PTR_FORMAT", "PTR_FORMAT")",
+- (void*) obj, to->bottom(), to->end());
+- print_object(gclog_or_tty, obj);
+- }
+- gclog_or_tty->print_cr("----------");
+- gclog_or_tty->flush();
+- _failures = true;
+- failed = true;
+- _n_failures++;
+- }
+-
+- if (!_g1h->full_collection()) {
+- HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
+- HeapRegion* to = _g1h->heap_region_containing(obj);
+- if (from != NULL && to != NULL &&
+- from != to &&
+- !to->isHumongous()) {
+- jbyte cv_obj = *_bs->byte_for_const(_containing_obj);
+- jbyte cv_field = *_bs->byte_for_const(p);
+- const jbyte dirty = CardTableModRefBS::dirty_card_val();
+-
+- bool is_bad = !(from->is_young()
+- || to->rem_set()->contains_reference(p)
+- || !G1HRRSFlushLogBuffersOnVerify && // buffers were not flushed
+- (_containing_obj->is_objArray() ?
+- cv_field == dirty
+- : cv_obj == dirty || cv_field == dirty));
+- if (is_bad) {
+- MutexLockerEx x(ParGCRareEvent_lock,
+- Mutex::_no_safepoint_check_flag);
+-
+- if (!_failures) {
+- gclog_or_tty->print_cr("");
+- gclog_or_tty->print_cr("----------");
+- }
+- gclog_or_tty->print_cr("Missing rem set entry:");
+- gclog_or_tty->print_cr("Field "PTR_FORMAT" "
+- "of obj "PTR_FORMAT", "
+- "in region "HR_FORMAT,
+- p, (void*) _containing_obj,
+- HR_FORMAT_PARAMS(from));
+- _containing_obj->print_on(gclog_or_tty);
+- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
+- "in region "HR_FORMAT,
+- (void*) obj,
+- HR_FORMAT_PARAMS(to));
+- obj->print_on(gclog_or_tty);
+- gclog_or_tty->print_cr("Obj head CTE = %d, field CTE = %d.",
+- cv_obj, cv_field);
+- gclog_or_tty->print_cr("----------");
+- gclog_or_tty->flush();
+- _failures = true;
+- if (!failed) _n_failures++;
+- }
+- }
+- }
+- }
+- }
+-};
+-
+ template<class ClosureType>
+ HeapWord* walk_mem_region_loop(ClosureType* cl, G1CollectedHeap* g1h,
+ HeapRegion* hr,
+@@ -314,6 +177,11 @@
+ region_size = MAX_REGION_SIZE;
+ }
+
++ if (region_size != G1HeapRegionSize) {
++ // Update the flag to make sure that PrintFlagsFinal logs the correct value
++ FLAG_SET_ERGO(uintx, G1HeapRegionSize, region_size);
++ }
++
+ // And recalculate the log.
+ region_size_log = log2_long((jlong) region_size);
+
+@@ -363,7 +231,7 @@
+ if (!par) {
+ // If this is parallel, this will be done later.
+ HeapRegionRemSet* hrrs = rem_set();
+- if (hrrs != NULL) hrrs->clear();
++ hrrs->clear();
+ _claimed = InitialClaimValue;
+ }
+ zero_marked_bytes();
+@@ -504,6 +372,7 @@
+ _rem_set(NULL), _recorded_rs_length(0), _predicted_elapsed_time_ms(0),
+ _predicted_bytes_to_copy(0)
+ {
++ _rem_set = new HeapRegionRemSet(sharedOffsetArray, this);
+ _orig_end = mr.end();
+ // Note that initialize() will set the start of the unmarked area of the
+ // region.
+@@ -511,8 +380,6 @@
+ set_top(bottom());
+ set_saved_mark();
+
+- _rem_set = new HeapRegionRemSet(sharedOffsetArray, this);
+-
+ assert(HeapRegionRemSet::num_par_rem_sets() > 0, "Invariant.");
+ }
+
+@@ -732,6 +599,161 @@
+ return NULL;
+ }
+
++// Code roots support
++
++void HeapRegion::add_strong_code_root(nmethod* nm) {
++ HeapRegionRemSet* hrrs = rem_set();
++ hrrs->add_strong_code_root(nm);
++}
++
++void HeapRegion::remove_strong_code_root(nmethod* nm) {
++ HeapRegionRemSet* hrrs = rem_set();
++ hrrs->remove_strong_code_root(nm);
++}
++
++void HeapRegion::migrate_strong_code_roots() {
++ assert(in_collection_set(), "only collection set regions");
++ assert(!isHumongous(),
++ err_msg("humongous region "HR_FORMAT" should not have been added to collection set",
++ HR_FORMAT_PARAMS(this)));
++
++ HeapRegionRemSet* hrrs = rem_set();
++ hrrs->migrate_strong_code_roots();
++}
++
++void HeapRegion::strong_code_roots_do(CodeBlobClosure* blk) const {
++ HeapRegionRemSet* hrrs = rem_set();
++ hrrs->strong_code_roots_do(blk);
++}
++
++class VerifyStrongCodeRootOopClosure: public OopClosure {
++ const HeapRegion* _hr;
++ nmethod* _nm;
++ bool _failures;
++ bool _has_oops_in_region;
++
++ template <class T> void do_oop_work(T* p) {
++ T heap_oop = oopDesc::load_heap_oop(p);
++ if (!oopDesc::is_null(heap_oop)) {
++ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
++
++ // Note: not all the oops embedded in the nmethod are in the
++ // current region. We only look at those which are.
++ if (_hr->is_in(obj)) {
++ // Object is in the region. Check that its less than top
++ if (_hr->top() <= (HeapWord*)obj) {
++ // Object is above top
++ gclog_or_tty->print_cr("Object "PTR_FORMAT" in region "
++ "["PTR_FORMAT", "PTR_FORMAT") is above "
++ "top "PTR_FORMAT,
++ obj, _hr->bottom(), _hr->end(), _hr->top());
++ _failures = true;
++ return;
++ }
++ // Nmethod has at least one oop in the current region
++ _has_oops_in_region = true;
++ }
++ }
++ }
++
++public:
++ VerifyStrongCodeRootOopClosure(const HeapRegion* hr, nmethod* nm):
++ _hr(hr), _failures(false), _has_oops_in_region(false) {}
++
++ void do_oop(narrowOop* p) { do_oop_work(p); }
++ void do_oop(oop* p) { do_oop_work(p); }
++
++ bool failures() { return _failures; }
++ bool has_oops_in_region() { return _has_oops_in_region; }
++};
++
++class VerifyStrongCodeRootCodeBlobClosure: public CodeBlobClosure {
++ const HeapRegion* _hr;
++ bool _failures;
++public:
++ VerifyStrongCodeRootCodeBlobClosure(const HeapRegion* hr) :
++ _hr(hr), _failures(false) {}
++
++ void do_code_blob(CodeBlob* cb) {
++ nmethod* nm = (cb == NULL) ? NULL : cb->as_nmethod_or_null();
++ if (nm != NULL) {
++ // Verify that the nemthod is live
++ if (!nm->is_alive()) {
++ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod "
++ PTR_FORMAT" in its strong code roots",
++ _hr->bottom(), _hr->end(), nm);
++ _failures = true;
++ } else {
++ VerifyStrongCodeRootOopClosure oop_cl(_hr, nm);
++ nm->oops_do(&oop_cl);
++ if (!oop_cl.has_oops_in_region()) {
++ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod "
++ PTR_FORMAT" in its strong code roots "
++ "with no pointers into region",
++ _hr->bottom(), _hr->end(), nm);
++ _failures = true;
++ } else if (oop_cl.failures()) {
++ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other "
++ "failures for nmethod "PTR_FORMAT,
++ _hr->bottom(), _hr->end(), nm);
++ _failures = true;
++ }
++ }
++ }
++ }
++
++ bool failures() { return _failures; }
++};
++
++void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const {
++ if (!G1VerifyHeapRegionCodeRoots) {
++ // We're not verifying code roots.
++ return;
++ }
++ if (vo == VerifyOption_G1UseMarkWord) {
++ // Marking verification during a full GC is performed after class
++ // unloading, code cache unloading, etc so the strong code roots
++ // attached to each heap region are in an inconsistent state. They won't
++ // be consistent until the strong code roots are rebuilt after the
++ // actual GC. Skip verifying the strong code roots in this particular
++ // time.
++ assert(VerifyDuringGC, "only way to get here");
++ return;
++ }
++
++ HeapRegionRemSet* hrrs = rem_set();
++ int strong_code_roots_length = hrrs->strong_code_roots_list_length();
++
++ // if this region is empty then there should be no entries
++ // on its strong code root list
++ if (is_empty()) {
++ if (strong_code_roots_length > 0) {
++ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty "
++ "but has "INT32_FORMAT" code root entries",
++ bottom(), end(), strong_code_roots_length);
++ *failures = true;
++ }
++ return;
++ }
++
++ if (continuesHumongous()) {
++ if (strong_code_roots_length > 0) {
++ gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous "
++ "region but has "INT32_FORMAT" code root entries",
++ HR_FORMAT_PARAMS(this), strong_code_roots_length);
++ *failures = true;
++ }
++ return;
++ }
++
++ VerifyStrongCodeRootCodeBlobClosure cb_cl(this);
++ strong_code_roots_do(&cb_cl);
++
++ if (cb_cl.failures()) {
++ *failures = true;
++ }
++}
++
+ void HeapRegion::print() const { print_on(gclog_or_tty); }
+ void HeapRegion::print_on(outputStream* st) const {
+ if (isHumongous()) {
+@@ -760,10 +782,143 @@
+ G1OffsetTableContigSpace::print_on(st);
+ }
+
+-void HeapRegion::verify() const {
+- bool dummy = false;
+- verify(VerifyOption_G1UsePrevMarking, /* failures */ &dummy);
+-}
++class VerifyLiveClosure: public OopClosure {
++private:
++ G1CollectedHeap* _g1h;
++ CardTableModRefBS* _bs;
++ oop _containing_obj;
++ bool _failures;
++ int _n_failures;
++ VerifyOption _vo;
++public:
++ // _vo == UsePrevMarking -> use "prev" marking information,
++ // _vo == UseNextMarking -> use "next" marking information,
++ // _vo == UseMarkWord -> use mark word from object header.
++ VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) :
++ _g1h(g1h), _bs(NULL), _containing_obj(NULL),
++ _failures(false), _n_failures(0), _vo(vo)
++ {
++ BarrierSet* bs = _g1h->barrier_set();
++ if (bs->is_a(BarrierSet::CardTableModRef))
++ _bs = (CardTableModRefBS*)bs;
++ }
++
++ void set_containing_obj(oop obj) {
++ _containing_obj = obj;
++ }
++
++ bool failures() { return _failures; }
++ int n_failures() { return _n_failures; }
++
++ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
++ virtual void do_oop( oop* p) { do_oop_work(p); }
++
++ void print_object(outputStream* out, oop obj) {
++#ifdef PRODUCT
++ klassOop k = obj->klass();
++ const char* class_name = instanceKlass::cast(k)->external_name();
++ out->print_cr("class name %s", class_name);
++#else // PRODUCT
++ obj->print_on(out);
++#endif // PRODUCT
++ }
++
++ template <class T>
++ void do_oop_work(T* p) {
++ assert(_containing_obj != NULL, "Precondition");
++ assert(!_g1h->is_obj_dead_cond(_containing_obj, _vo),
++ "Precondition");
++ T heap_oop = oopDesc::load_heap_oop(p);
++ if (!oopDesc::is_null(heap_oop)) {
++ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
++ bool failed = false;
++ if (!_g1h->is_in_closed_subset(obj) || _g1h->is_obj_dead_cond(obj, _vo)) {
++ MutexLockerEx x(ParGCRareEvent_lock,
++ Mutex::_no_safepoint_check_flag);
++
++ if (!_failures) {
++ gclog_or_tty->print_cr("");
++ gclog_or_tty->print_cr("----------");
++ }
++ if (!_g1h->is_in_closed_subset(obj)) {
++ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
++ gclog_or_tty->print_cr("Field "PTR_FORMAT
++ " of live obj "PTR_FORMAT" in region "
++ "["PTR_FORMAT", "PTR_FORMAT")",
++ p, (void*) _containing_obj,
++ from->bottom(), from->end());
++ print_object(gclog_or_tty, _containing_obj);
++ gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
++ (void*) obj);
++ } else {
++ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
++ HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
++ gclog_or_tty->print_cr("Field "PTR_FORMAT
++ " of live obj "PTR_FORMAT" in region "
++ "["PTR_FORMAT", "PTR_FORMAT")",
++ p, (void*) _containing_obj,
++ from->bottom(), from->end());
++ print_object(gclog_or_tty, _containing_obj);
++ gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
++ "["PTR_FORMAT", "PTR_FORMAT")",
++ (void*) obj, to->bottom(), to->end());
++ print_object(gclog_or_tty, obj);
++ }
++ gclog_or_tty->print_cr("----------");
++ gclog_or_tty->flush();
++ _failures = true;
++ failed = true;
++ _n_failures++;
++ }
++
++ if (!_g1h->full_collection() || G1VerifyRSetsDuringFullGC) {
++ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
++ HeapRegion* to = _g1h->heap_region_containing(obj);
++ if (from != NULL && to != NULL &&
++ from != to &&
++ !to->isHumongous()) {
++ jbyte cv_obj = *_bs->byte_for_const(_containing_obj);
++ jbyte cv_field = *_bs->byte_for_const(p);
++ const jbyte dirty = CardTableModRefBS::dirty_card_val();
++
++ bool is_bad = !(from->is_young()
++ || to->rem_set()->contains_reference(p)
++ || !G1HRRSFlushLogBuffersOnVerify && // buffers were not flushed
++ (_containing_obj->is_objArray() ?
++ cv_field == dirty
++ : cv_obj == dirty || cv_field == dirty));
++ if (is_bad) {
++ MutexLockerEx x(ParGCRareEvent_lock,
++ Mutex::_no_safepoint_check_flag);
++
++ if (!_failures) {
++ gclog_or_tty->print_cr("");
++ gclog_or_tty->print_cr("----------");
++ }
++ gclog_or_tty->print_cr("Missing rem set entry:");
++ gclog_or_tty->print_cr("Field "PTR_FORMAT" "
++ "of obj "PTR_FORMAT", "
++ "in region "HR_FORMAT,
++ p, (void*) _containing_obj,
++ HR_FORMAT_PARAMS(from));
++ _containing_obj->print_on(gclog_or_tty);
++ gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
++ "in region "HR_FORMAT,
++ (void*) obj,
++ HR_FORMAT_PARAMS(to));
++ obj->print_on(gclog_or_tty);
++ gclog_or_tty->print_cr("Obj head CTE = %d, field CTE = %d.",
++ cv_obj, cv_field);
++ gclog_or_tty->print_cr("----------");
++ gclog_or_tty->flush();
++ _failures = true;
++ if (!failed) _n_failures++;
++ }
++ }
++ }
++ }
++ }
++};
+
+ // This really ought to be commoned up into OffsetTableContigSpace somehow.
+ // We would need a mechanism to make that code skip dead objects.
+@@ -903,6 +1058,13 @@
+ *failures = true;
+ return;
+ }
++
++ verify_strong_code_roots(vo, failures);
++}
++
++void HeapRegion::verify() const {
++ bool dummy = false;
++ verify(VerifyOption_G1UsePrevMarking, /* failures */ &dummy);
+ }
+
+ // G1OffsetTableContigSpace code; copied from space.cpp. Hope this can go
+--- ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp Wed May 07 19:26:16 2014 -0700
+@@ -51,6 +51,7 @@
+ class HeapRegionRemSetIterator;
+ class HeapRegion;
+ class HeapRegionSetBase;
++class nmethod;
+
+ #define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
+ #define HR_FORMAT_PARAMS(_hr_) \
+@@ -374,7 +375,8 @@
+ RebuildRSClaimValue = 5,
+ ParEvacFailureClaimValue = 6,
+ AggregateCountClaimValue = 7,
+- VerifyCountClaimValue = 8
++ VerifyCountClaimValue = 8,
++ ParMarkRootClaimValue = 9
+ };
+
+ inline HeapWord* par_allocate_no_bot_updates(size_t word_size) {
+@@ -801,6 +803,25 @@
+
+ virtual void reset_after_compaction();
+
++ // Routines for managing a list of code roots (attached to the
++ // this region's RSet) that point into this heap region.
++ void add_strong_code_root(nmethod* nm);
++ void remove_strong_code_root(nmethod* nm);
++
++ // During a collection, migrate the successfully evacuated
++ // strong code roots that referenced into this region to the
++ // new regions that they now point into. Unsuccessfully
++ // evacuated code roots are not migrated.
++ void migrate_strong_code_roots();
++
++ // Applies blk->do_code_blob() to each of the entries in
++ // the strong code roots list for this region
++ void strong_code_roots_do(CodeBlobClosure* blk) const;
++
++ // Verify that the entries on the strong code root list for this
++ // region are live and include at least one pointer into this region.
++ void verify_strong_code_roots(VerifyOption vo, bool* failures) const;
++
+ void print() const;
+ void print_on(outputStream* st) const;
+
+--- ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Wed May 07 19:26:16 2014 -0700
+@@ -33,6 +33,7 @@
+ #include "oops/oop.inline.hpp"
+ #include "utilities/bitMap.inline.hpp"
+ #include "utilities/globalDefinitions.hpp"
++#include "utilities/growableArray.hpp"
+
+ class PerRegionTable: public CHeapObj<mtGC> {
+ friend class OtherRegionsTable;
+@@ -706,10 +707,11 @@
+ // Cast away const in this case.
+ MutexLockerEx x((Mutex*)&_m, Mutex::_no_safepoint_check_flag);
+ size_t sum = 0;
+- PerRegionTable * cur = _first_all_fine_prts;
+- while (cur != NULL) {
+- sum += cur->mem_size();
+- cur = cur->next();
++ // all PRTs are of the same size so it is sufficient to query only one of them.
++ if (_first_all_fine_prts != NULL) {
++ assert(_last_all_fine_prts != NULL &&
++ _first_all_fine_prts->mem_size() == _last_all_fine_prts->mem_size(), "check that mem_size() is constant");
++ sum += _first_all_fine_prts->mem_size() * _n_fine_entries;
+ }
+ sum += (sizeof(PerRegionTable*) * _max_fine_entries);
+ sum += (_coarse_map.size_in_words() * HeapWordSize);
+@@ -845,7 +847,7 @@
+
+ HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
+ HeapRegion* hr)
+- : _bosa(bosa), _other_regions(hr) {
++ : _bosa(bosa), _strong_code_roots_list(NULL), _other_regions(hr) {
+ reset_for_par_iteration();
+ }
+
+@@ -909,6 +911,12 @@
+ }
+
+ void HeapRegionRemSet::clear() {
++ if (_strong_code_roots_list != NULL) {
++ delete _strong_code_roots_list;
++ }
++ _strong_code_roots_list = new (ResourceObj::C_HEAP, mtGC)
++ GrowableArray<nmethod*>(10, 0, NULL, true);
++
+ _other_regions.clear();
+ assert(occupied() == 0, "Should be clear.");
+ reset_for_par_iteration();
+@@ -926,6 +934,126 @@
+ _other_regions.scrub(ctbs, region_bm, card_bm);
+ }
+
++
++// Code roots support
++
++void HeapRegionRemSet::add_strong_code_root(nmethod* nm) {
++ assert(nm != NULL, "sanity");
++ // Search for the code blob from the RHS to avoid
++ // duplicate entries as much as possible
++ if (_strong_code_roots_list->find_from_end(nm) < 0) {
++ // Code blob isn't already in the list
++ _strong_code_roots_list->push(nm);
++ }
++}
++
++void HeapRegionRemSet::remove_strong_code_root(nmethod* nm) {
++ assert(nm != NULL, "sanity");
++ int idx = _strong_code_roots_list->find(nm);
++ if (idx >= 0) {
++ _strong_code_roots_list->remove_at(idx);
++ }
++ // Check that there were no duplicates
++ guarantee(_strong_code_roots_list->find(nm) < 0, "duplicate entry found");
++}
++
++class NMethodMigrationOopClosure : public OopClosure {
++ G1CollectedHeap* _g1h;
++ HeapRegion* _from;
++ nmethod* _nm;
++
++ uint _num_self_forwarded;
++
++ template <class T> void do_oop_work(T* p) {
++ T heap_oop = oopDesc::load_heap_oop(p);
++ if (!oopDesc::is_null(heap_oop)) {
++ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
++ if (obj->is_perm()) {
++ // reference into perm gen - ignore.
++ return;
++ } else if (_from->is_in(obj)) {
++ // Reference still points into the source region.
++ // Since roots are immediately evacuated this means that
++ // we must have self forwarded the object
++ assert(obj->is_forwarded(),
++ err_msg("code roots should be immediately evacuated. "
++ "Ref: "PTR_FORMAT", "
++ "Obj: "PTR_FORMAT", "
++ "Region: "HR_FORMAT,
++ p, (void*) obj, HR_FORMAT_PARAMS(_from)));
++ assert(obj->forwardee() == obj,
++ err_msg("not self forwarded? obj = "PTR_FORMAT, (void*)obj));
++
++ // The object has been self forwarded.
++ // Note, if we're during an initial mark pause, there is
++ // no need to explicitly mark object. It will be marked
++ // during the regular evacuation failure handling code.
++ _num_self_forwarded++;
++ } else {
++ // The reference points into a promotion or to-space region
++ HeapRegion* to = _g1h->heap_region_containing(obj);
++ to->rem_set()->add_strong_code_root(_nm);
++ }
++ }
++ }
++
++public:
++ NMethodMigrationOopClosure(G1CollectedHeap* g1h, HeapRegion* from, nmethod* nm):
++ _g1h(g1h), _from(from), _nm(nm), _num_self_forwarded(0) {}
++
++ void do_oop(narrowOop* p) { do_oop_work(p); }
++ void do_oop(oop* p) { do_oop_work(p); }
++
++ uint retain() { return _num_self_forwarded > 0; }
++};
++
++void HeapRegionRemSet::migrate_strong_code_roots() {
++ assert(hr()->in_collection_set(), "only collection set regions");
++ assert(!hr()->isHumongous(),
++ err_msg("humongous region "HR_FORMAT" should not have been added to the collection set",
++ HR_FORMAT_PARAMS(hr())));
++
++ ResourceMark rm;
++
++ // List of code blobs to retain for this region
++ GrowableArray<nmethod*> to_be_retained(10);
++ G1CollectedHeap* g1h = G1CollectedHeap::heap();
++
++ while (_strong_code_roots_list->is_nonempty()) {
++ nmethod *nm = _strong_code_roots_list->pop();
++ if (nm != NULL) {
++ NMethodMigrationOopClosure oop_cl(g1h, hr(), nm);
++ nm->oops_do(&oop_cl);
++ if (oop_cl.retain()) {
++ to_be_retained.push(nm);
++ }
++ }
++ }
++
++ // Now push any code roots we need to retain
++ assert(to_be_retained.is_empty() || hr()->evacuation_failed(),
++ "Retained nmethod list must be empty or "
++ "evacuation of this region failed");
++
++ while (to_be_retained.is_nonempty()) {
++ nmethod* nm = to_be_retained.pop();
++ assert(nm != NULL, "sanity");
++ add_strong_code_root(nm);
++ }
++}
++
++void HeapRegionRemSet::strong_code_roots_do(CodeBlobClosure* blk) const {
++ for (int i = 0; i < _strong_code_roots_list->length(); i += 1) {
++ nmethod* nm = _strong_code_roots_list->at(i);
++ blk->do_code_blob(nm);
++ }
++}
++
++size_t HeapRegionRemSet::strong_code_roots_mem_size() {
++ return sizeof(GrowableArray<nmethod*>) +
++ _strong_code_roots_list->max_length() * sizeof(nmethod*);
++}
++
+ //-------------------- Iteration --------------------
+
+ HeapRegionRemSetIterator::
+--- ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp Wed May 07 19:26:16 2014 -0700
+@@ -37,6 +37,7 @@
+ class HeapRegionRemSetIterator;
+ class PerRegionTable;
+ class SparsePRT;
++class nmethod;
+
+ // Essentially a wrapper around SparsePRTCleanupTask. See
+ // sparsePRT.hpp for more details.
+@@ -191,6 +192,10 @@
+ G1BlockOffsetSharedArray* _bosa;
+ G1BlockOffsetSharedArray* bosa() const { return _bosa; }
+
++ // A list of code blobs (nmethods) whose code contains pointers into
++ // the region that owns this RSet.
++ GrowableArray<nmethod*>* _strong_code_roots_list;
++
+ OtherRegionsTable _other_regions;
+
+ enum ParIterState { Unclaimed, Claimed, Complete };
+@@ -285,11 +290,13 @@
+ void init_iterator(HeapRegionRemSetIterator* iter) const;
+
+ // The actual # of bytes this hr_remset takes up.
++ // Note also includes the strong code root set.
+ size_t mem_size() {
+ return _other_regions.mem_size()
+ // This correction is necessary because the above includes the second
+ // part.
+- + sizeof(this) - sizeof(OtherRegionsTable);
++ + (sizeof(this) - sizeof(OtherRegionsTable))
++ + strong_code_roots_mem_size();
+ }
+
+ // Returns the memory occupancy of all static data structures associated
+@@ -307,6 +314,37 @@
+ bool contains_reference(OopOrNarrowOopStar from) const {
+ return _other_regions.contains_reference(from);
+ }
++
++ // Routines for managing the list of code roots that point into
++ // the heap region that owns this RSet.
++ void add_strong_code_root(nmethod* nm);
++ void remove_strong_code_root(nmethod* nm);
++
++ // During a collection, migrate the successfully evacuated strong
++ // code roots that referenced into the region that owns this RSet
++ // to the RSets of the new regions that they now point into.
++ // Unsuccessfully evacuated code roots are not migrated.
++ void migrate_strong_code_roots();
++
++ // Applies blk->do_code_blob() to each of the entries in
++ // the strong code roots list
++ void strong_code_roots_do(CodeBlobClosure* blk) const;
++
++ // Returns the number of elements in the strong code roots list
++ int strong_code_roots_list_length() {
++ return _strong_code_roots_list->length();
++ }
++
++ // Returns true if the strong code roots contains the given
++ // nmethod.
++ bool strong_code_roots_list_contains(nmethod* nm) {
++ return _strong_code_roots_list->contains(nm);
++ }
++
++ // Returns the amount of memory, in bytes, currently
++ // consumed by the strong code roots.
++ size_t strong_code_roots_mem_size();
++
+ void print() const;
+
+ // Called during a stop-world phase to perform any deferred cleanups.
+--- ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp Wed May 07 19:26:16 2014 -0700
+@@ -79,6 +79,10 @@
+
+ void reset() { if (_buf != NULL) _index = _sz; }
+
++ void enqueue(volatile void* ptr) {
++ enqueue((void*)(ptr));
++ }
++
+ // Enqueues the given "obj".
+ void enqueue(void* ptr) {
+ if (!_active) return;
+--- ./hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp Wed May 07 19:26:16 2014 -0700
+@@ -923,7 +923,7 @@
+
+ GenCollectedHeap* gch = GenCollectedHeap::heap();
+
+- _gc_timer->register_gc_start(os::elapsed_counter());
++ _gc_timer->register_gc_start();
+
+ assert(gch->kind() == CollectedHeap::GenCollectedHeap,
+ "not a CMS generational heap");
+@@ -1100,7 +1100,7 @@
+ gch->trace_heap_after_gc(&gc_tracer);
+ gc_tracer.report_tenuring_threshold(tenuring_threshold());
+
+- _gc_timer->register_gc_end(os::elapsed_counter());
++ _gc_timer->register_gc_end();
+
+ gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
+ }
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp Wed May 07 19:26:16 2014 -0700
+@@ -90,14 +90,16 @@
+ og_min_size, og_max_size,
+ yg_min_size, yg_max_size);
+
+- // The ReservedSpace ctor used below requires that the page size for the perm
+- // gen is <= the page size for the rest of the heap (young + old gens).
+ const size_t og_page_sz = os::page_size_for_region(yg_min_size + og_min_size,
+ yg_max_size + og_max_size,
+ 8);
+- const size_t pg_page_sz = MIN2(os::page_size_for_region(pg_min_size,
+- pg_max_size, 16),
+- og_page_sz);
++
++ // Use the same page size for both perm gen and old gen,
++ // to allow large pages to be allocated when the heap is reserved
++ // for the implementations that can't 'commit' large pages.
++ // NEEDS_CLEANUP. ReservedHeapSpace/ReservedSpace that takes both
++ // a prefix and a suffix alignment can now be removed.
++ const size_t pg_page_sz = og_page_sz;
+
+ const size_t pg_align = set_alignment(_perm_gen_alignment, pg_page_sz);
+ const size_t og_align = set_alignment(_old_gen_alignment, og_page_sz);
+@@ -138,12 +140,9 @@
+ total_reserved = add_and_check_overflow(total_reserved, og_max_size);
+ total_reserved = add_and_check_overflow(total_reserved, yg_max_size);
+
+- char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
++ assert(is_size_aligned(total_reserved, og_align), "Must be");
+
+- // The main part of the heap (old gen + young gen) can often use a larger page
+- // size than is needed or wanted for the perm gen. Use the "compound
+- // alignment" ReservedSpace ctor to avoid having to use the same page size for
+- // all gens.
++ char* addr = Universe::preferred_heap_base(total_reserved, og_align, Universe::UnscaledNarrowOop);
+
+ ReservedHeapSpace heap_rs(pg_max_size, pg_align, og_max_size + yg_max_size,
+ og_align, addr);
+@@ -153,12 +152,12 @@
+ // Failed to reserve at specified address - the requested memory
+ // region is taken already, for example, by 'java' launcher.
+ // Try again to reserver heap higher.
+- addr = Universe::preferred_heap_base(total_reserved, Universe::ZeroBasedNarrowOop);
++ addr = Universe::preferred_heap_base(total_reserved, og_align, Universe::ZeroBasedNarrowOop);
+ ReservedHeapSpace heap_rs0(pg_max_size, pg_align, og_max_size + yg_max_size,
+ og_align, addr);
+ if (addr != NULL && !heap_rs0.is_reserved()) {
+ // Failed to reserve at specified address again - give up.
+- addr = Universe::preferred_heap_base(total_reserved, Universe::HeapBasedNarrowOop);
++ addr = Universe::preferred_heap_base(total_reserved, og_align, Universe::HeapBasedNarrowOop);
+ assert(addr == NULL, "");
+ ReservedHeapSpace heap_rs1(pg_max_size, pg_align, og_max_size + yg_max_size,
+ og_align, addr);
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp Wed May 07 19:26:16 2014 -0700
+@@ -24,6 +24,7 @@
+
+ #include "precompiled.hpp"
+ #include "gc_implementation/parallelScavenge/generationSizer.hpp"
++#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+ #include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
+ #include "gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp"
+ #include "gc_implementation/parallelScavenge/psScavenge.hpp"
+@@ -78,6 +79,38 @@
+ _old_gen_policy_is_ready = false;
+ }
+
++size_t PSAdaptiveSizePolicy::calculate_free_based_on_live(size_t live, uintx ratio_as_percentage) {
++ // We want to calculate how much free memory there can be based on the
++ // amount of live data currently in the old gen. Using the formula:
++ // ratio * (free + live) = free
++ // Some equation solving later we get:
++ // free = (live * ratio) / (1 - ratio)
++
++ const double ratio = ratio_as_percentage / 100.0;
++ const double ratio_inverse = 1.0 - ratio;
++ const double tmp = live * ratio;
++ size_t free = (size_t)(tmp / ratio_inverse);
++
++ return free;
++}
++
++size_t PSAdaptiveSizePolicy::calculated_old_free_size_in_bytes() const {
++ size_t free_size = (size_t)(_promo_size + avg_promoted()->padded_average());
++ size_t live = ParallelScavengeHeap::heap()->old_gen()->used_in_bytes();
++
++ if (MinHeapFreeRatio != 0) {
++ size_t min_free = calculate_free_based_on_live(live, MinHeapFreeRatio);
++ free_size = MAX2(free_size, min_free);
++ }
++
++ if (MaxHeapFreeRatio != 100) {
++ size_t max_free = calculate_free_based_on_live(live, MaxHeapFreeRatio);
++ free_size = MIN2(max_free, free_size);
++ }
++
++ return free_size;
++}
++
+ void PSAdaptiveSizePolicy::major_collection_begin() {
+ // Update the interval time
+ _major_timer.stop();
+@@ -1107,3 +1140,18 @@
+ st,
+ PSScavenge::tenuring_threshold());
+ }
++
++#ifndef PRODUCT
++
++void TestOldFreeSpaceCalculation_test() {
++ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(100, 20) == 25, "Calculation of free memory failed");
++ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(100, 50) == 100, "Calculation of free memory failed");
++ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(100, 60) == 150, "Calculation of free memory failed");
++ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(100, 75) == 300, "Calculation of free memory failed");
++ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(400, 20) == 100, "Calculation of free memory failed");
++ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(400, 50) == 400, "Calculation of free memory failed");
++ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(400, 60) == 600, "Calculation of free memory failed");
++ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(400, 75) == 1200, "Calculation of free memory failed");
++}
++
++#endif /* !PRODUCT */
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp Wed May 07 19:26:16 2014 -0700
+@@ -238,7 +238,6 @@
+ void major_collection_begin();
+ void major_collection_end(size_t amount_live, GCCause::Cause gc_cause);
+
+- //
+ void tenured_allocation(size_t size) {
+ _avg_pretenured->sample(size);
+ }
+@@ -246,9 +245,9 @@
+ // Accessors
+ // NEEDS_CLEANUP should use sizes.hpp
+
+- size_t calculated_old_free_size_in_bytes() const {
+- return (size_t)(_promo_size + avg_promoted()->padded_average());
+- }
++ static size_t calculate_free_based_on_live(size_t live, uintx ratio_as_percentage);
++
++ size_t calculated_old_free_size_in_bytes() const;
+
+ size_t average_old_live_in_bytes() const {
+ return (size_t) avg_old_live()->average();
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Wed May 07 19:26:16 2014 -0700
+@@ -116,7 +116,7 @@
+ assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
+ GCCause::Cause gc_cause = heap->gc_cause();
+
+- _gc_timer->register_gc_start(os::elapsed_counter());
++ _gc_timer->register_gc_start();
+ _gc_tracer->report_gc_start(gc_cause, _gc_timer->gc_start());
+
+ PSAdaptiveSizePolicy* size_policy = heap->size_policy();
+@@ -149,8 +149,7 @@
+
+ if (VerifyBeforeGC && heap->total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+- gclog_or_tty->print(" VerifyBeforeGC:");
+- Universe::verify();
++ Universe::verify(" VerifyBeforeGC:");
+ }
+
+ // Verify object start arrays
+@@ -359,8 +358,7 @@
+
+ if (VerifyAfterGC && heap->total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+- gclog_or_tty->print(" VerifyAfterGC:");
+- Universe::verify();
++ Universe::verify(" VerifyAfterGC:");
+ }
+
+ // Re-verify object start arrays
+@@ -386,7 +384,7 @@
+ ParallelTaskTerminator::print_termination_counts();
+ #endif
+
+- _gc_timer->register_gc_end(os::elapsed_counter());
++ _gc_timer->register_gc_end();
+
+ _gc_tracer->report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
+
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2012, 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
+@@ -1034,8 +1034,7 @@
+
+ if (VerifyBeforeGC && heap->total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+- gclog_or_tty->print(" VerifyBeforeGC:");
+- Universe::verify();
++ Universe::verify(" VerifyBeforeGC:");
+ }
+
+ // Verify object start arrays
+@@ -2041,7 +2040,7 @@
+
+ ParallelScavengeHeap* heap = gc_heap();
+
+- _gc_timer.register_gc_start(os::elapsed_counter());
++ _gc_timer.register_gc_start();
+ _gc_tracer.report_gc_start(heap->gc_cause(), _gc_timer.gc_start());
+
+ TimeStamp marking_start;
+@@ -2248,8 +2247,7 @@
+
+ if (VerifyAfterGC && heap->total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+- gclog_or_tty->print(" VerifyAfterGC:");
+- Universe::verify();
++ Universe::verify(" VerifyAfterGC:");
+ }
+
+ // Re-verify object start arrays
+@@ -2285,7 +2283,7 @@
+ ParallelTaskTerminator::print_termination_counts();
+ #endif
+
+- _gc_timer.register_gc_end(os::elapsed_counter());
++ _gc_timer.register_gc_end();
+
+ _gc_tracer.report_dense_prefix(dense_prefix(old_space_id));
+ _gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions());
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Wed May 07 19:26:16 2014 -0700
+@@ -266,7 +266,7 @@
+ assert(_preserved_mark_stack.is_empty(), "should be empty");
+ assert(_preserved_oop_stack.is_empty(), "should be empty");
+
+- _gc_timer.register_gc_start(os::elapsed_counter());
++ _gc_timer.register_gc_start();
+
+ TimeStamp scavenge_entry;
+ TimeStamp scavenge_midpoint;
+@@ -325,8 +325,7 @@
+
+ if (VerifyBeforeGC && heap->total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+- gclog_or_tty->print(" VerifyBeforeGC:");
+- Universe::verify();
++ Universe::verify(" VerifyBeforeGC:");
+ }
+
+ {
+@@ -536,8 +535,19 @@
+ counters->update_survivor_overflowed(_survivor_overflow);
+ }
+
++ size_t max_young_size = young_gen->max_size();
++
++ // Deciding a free ratio in the young generation is tricky, so if
++ // MinHeapFreeRatio or MaxHeapFreeRatio are in use (implicating
++ // that the old generation size may have been limited because of them) we
++ // should then limit our young generation size using NewRatio to have it
++ // follow the old generation size.
++ if (MinHeapFreeRatio != 0 || MaxHeapFreeRatio != 100) {
++ max_young_size = MIN2(old_gen->capacity_in_bytes() / NewRatio, young_gen->max_size());
++ }
++
+ size_t survivor_limit =
+- size_policy->max_survivor_size(young_gen->max_size());
++ size_policy->max_survivor_size(max_young_size);
+ _tenuring_threshold =
+ size_policy->compute_survivor_space_size_and_threshold(
+ _survivor_overflow,
+@@ -560,8 +570,7 @@
+ // Do call at minor collections?
+ // Don't check if the size_policy is ready at this
+ // level. Let the size_policy check that internally.
+- if (UseAdaptiveSizePolicy &&
+- UseAdaptiveGenerationSizePolicyAtMinorCollection &&
++ if (UseAdaptiveGenerationSizePolicyAtMinorCollection &&
+ ((gc_cause != GCCause::_java_lang_system_gc) ||
+ UseAdaptiveSizePolicyWithSystemGC)) {
+
+@@ -570,7 +579,7 @@
+ young_gen->from_space()->capacity_in_bytes() +
+ young_gen->to_space()->capacity_in_bytes(),
+ "Sizes of space in young gen are out-of-bounds");
+- size_t max_eden_size = young_gen->max_size() -
++ size_t max_eden_size = max_young_size -
+ young_gen->from_space()->capacity_in_bytes() -
+ young_gen->to_space()->capacity_in_bytes();
+ size_policy->compute_generation_free_space(young_gen->used_in_bytes(),
+@@ -661,8 +670,7 @@
+
+ if (VerifyAfterGC && heap->total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+- gclog_or_tty->print(" VerifyAfterGC:");
+- Universe::verify();
++ Universe::verify(" VerifyAfterGC:");
+ }
+
+ heap->print_heap_after_gc();
+@@ -689,7 +697,7 @@
+ #endif
+
+
+- _gc_timer.register_gc_end(os::elapsed_counter());
++ _gc_timer.register_gc_end();
+
+ _gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions());
+
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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,52 +25,55 @@
+ #include "precompiled.hpp"
+ #include "gc_implementation/shared/gcTimer.hpp"
+ #include "utilities/growableArray.hpp"
++#include "utilities/ticks.inline.hpp"
+
+-void GCTimer::register_gc_start(jlong time) {
++// the "time" parameter for most functions
++// has a default value set by Ticks::now()
++
++void GCTimer::register_gc_start(const Ticks& time) {
+ _time_partitions.clear();
+ _gc_start = time;
+ }
+
+-void GCTimer::register_gc_end(jlong time) {
++void GCTimer::register_gc_end(const Ticks& time) {
+ assert(!_time_partitions.has_active_phases(),
+ "We should have ended all started phases, before ending the GC");
+
+ _gc_end = time;
+ }
+
+-void GCTimer::register_gc_pause_start(const char* name, jlong time) {
++void GCTimer::register_gc_pause_start(const char* name, const Ticks& time) {
+ _time_partitions.report_gc_phase_start(name, time);
+ }
+
+-void GCTimer::register_gc_pause_end(jlong time) {
++void GCTimer::register_gc_pause_end(const Ticks& time) {
+ _time_partitions.report_gc_phase_end(time);
+ }
+
+-void GCTimer::register_gc_phase_start(const char* name, jlong time) {
++void GCTimer::register_gc_phase_start(const char* name, const Ticks& time) {
+ _time_partitions.report_gc_phase_start(name, time);
+ }
+
+-void GCTimer::register_gc_phase_end(jlong time) {
++void GCTimer::register_gc_phase_end(const Ticks& time) {
+ _time_partitions.report_gc_phase_end(time);
+ }
+
+-
+-void STWGCTimer::register_gc_start(jlong time) {
++void STWGCTimer::register_gc_start(const Ticks& time) {
+ GCTimer::register_gc_start(time);
+ register_gc_pause_start("GC Pause", time);
+ }
+
+-void STWGCTimer::register_gc_end(jlong time) {
++void STWGCTimer::register_gc_end(const Ticks& time) {
+ register_gc_pause_end(time);
+ GCTimer::register_gc_end(time);
+ }
+
+-void ConcurrentGCTimer::register_gc_pause_start(const char* name, jlong time) {
+- GCTimer::register_gc_pause_start(name, time);
++void ConcurrentGCTimer::register_gc_pause_start(const char* name) {
++ GCTimer::register_gc_pause_start(name);
+ }
+
+-void ConcurrentGCTimer::register_gc_pause_end(jlong time) {
+- GCTimer::register_gc_pause_end(time);
++void ConcurrentGCTimer::register_gc_pause_end() {
++ GCTimer::register_gc_pause_end();
+ }
+
+ void PhasesStack::clear() {
+@@ -111,11 +114,11 @@
+ void TimePartitions::clear() {
+ _phases->clear();
+ _active_phases.clear();
+- _sum_of_pauses = 0;
+- _longest_pause = 0;
++ _sum_of_pauses = Tickspan();
++ _longest_pause = Tickspan();
+ }
+
+-void TimePartitions::report_gc_phase_start(const char* name, jlong time) {
++void TimePartitions::report_gc_phase_start(const char* name, const Ticks& time) {
+ assert(_phases->length() <= 1000, "Too many recored phases?");
+
+ int level = _active_phases.count();
+@@ -133,13 +136,13 @@
+ void TimePartitions::update_statistics(GCPhase* phase) {
+ // FIXME: This should only be done for pause phases
+ if (phase->level() == 0) {
+- jlong pause = phase->end() - phase->start();
++ const Tickspan pause = phase->end() - phase->start();
+ _sum_of_pauses += pause;
+ _longest_pause = MAX2(pause, _longest_pause);
+ }
+ }
+
+-void TimePartitions::report_gc_phase_end(jlong time) {
++void TimePartitions::report_gc_phase_end(const Ticks& time) {
+ int phase_index = _active_phases.pop();
+ GCPhase* phase = _phases->adr_at(phase_index);
+ phase->set_end(time);
+@@ -157,14 +160,6 @@
+ return _phases->adr_at(index);
+ }
+
+-jlong TimePartitions::sum_of_pauses() {
+- return _sum_of_pauses;
+-}
+-
+-jlong TimePartitions::longest_pause() {
+- return _longest_pause;
+-}
+-
+ bool TimePartitions::has_active_phases() {
+ return _active_phases.count() > 0;
+ }
+@@ -194,7 +189,7 @@
+ max_nested_pause_phases();
+ }
+
+- static void validate_pause_phase(GCPhase* phase, int level, const char* name, jlong start, jlong end) {
++ static void validate_pause_phase(GCPhase* phase, int level, const char* name, const Ticks& start, const Ticks& end) {
+ assert(phase->level() == level, "Incorrect level");
+ assert(strcmp(phase->name(), name) == 0, "Incorrect name");
+ assert(phase->start() == start, "Incorrect start");
+@@ -209,8 +204,8 @@
+ TimePartitionPhasesIterator iter(&time_partitions);
+
+ validate_pause_phase(iter.next(), 0, "PausePhase", 2, 8);
+- assert(time_partitions.sum_of_pauses() == 8-2, "Incorrect");
+- assert(time_partitions.longest_pause() == 8-2, "Incorrect");
++ assert(time_partitions.sum_of_pauses() == Ticks(8) - Ticks(2), "Incorrect");
++ assert(time_partitions.longest_pause() == Ticks(8) - Ticks(2), "Incorrect");
+
+ assert(!iter.has_next(), "Too many elements");
+ }
+@@ -227,8 +222,8 @@
+ validate_pause_phase(iter.next(), 0, "PausePhase1", 2, 3);
+ validate_pause_phase(iter.next(), 0, "PausePhase2", 4, 6);
+
+- assert(time_partitions.sum_of_pauses() == 3, "Incorrect");
+- assert(time_partitions.longest_pause() == 2, "Incorrect");
++ assert(time_partitions.sum_of_pauses() == Ticks(3) - Ticks(0), "Incorrect");
++ assert(time_partitions.longest_pause() == Ticks(2) - Ticks(0), "Incorrect");
+
+ assert(!iter.has_next(), "Too many elements");
+ }
+@@ -245,8 +240,8 @@
+ validate_pause_phase(iter.next(), 0, "PausePhase", 2, 5);
+ validate_pause_phase(iter.next(), 1, "SubPhase", 3, 4);
+
+- assert(time_partitions.sum_of_pauses() == 3, "Incorrect");
+- assert(time_partitions.longest_pause() == 3, "Incorrect");
++ assert(time_partitions.sum_of_pauses() == Ticks(3) - Ticks(0), "Incorrect");
++ assert(time_partitions.longest_pause() == Ticks(3) - Ticks(0), "Incorrect");
+
+ assert(!iter.has_next(), "Too many elements");
+ }
+@@ -269,8 +264,8 @@
+ validate_pause_phase(iter.next(), 2, "SubPhase2", 4, 7);
+ validate_pause_phase(iter.next(), 3, "SubPhase3", 5, 6);
+
+- assert(time_partitions.sum_of_pauses() == 7, "Incorrect");
+- assert(time_partitions.longest_pause() == 7, "Incorrect");
++ assert(time_partitions.sum_of_pauses() == Ticks(7) - Ticks(0), "Incorrect");
++ assert(time_partitions.longest_pause() == Ticks(7) - Ticks(0), "Incorrect");
+
+ assert(!iter.has_next(), "Too many elements");
+ }
+@@ -298,8 +293,8 @@
+ validate_pause_phase(iter.next(), 1, "SubPhase3", 7, 8);
+ validate_pause_phase(iter.next(), 1, "SubPhase4", 9, 10);
+
+- assert(time_partitions.sum_of_pauses() == 9, "Incorrect");
+- assert(time_partitions.longest_pause() == 9, "Incorrect");
++ assert(time_partitions.sum_of_pauses() == Ticks(9) - Ticks(0), "Incorrect");
++ assert(time_partitions.longest_pause() == Ticks(9) - Ticks(0), "Incorrect");
+
+ assert(!iter.has_next(), "Too many elements");
+ }
+@@ -336,8 +331,8 @@
+ validate_pause_phase(iter.next(), 2, "SubPhase22", 12, 13);
+ validate_pause_phase(iter.next(), 1, "SubPhase3", 15, 16);
+
+- assert(time_partitions.sum_of_pauses() == 15, "Incorrect");
+- assert(time_partitions.longest_pause() == 15, "Incorrect");
++ assert(time_partitions.sum_of_pauses() == Ticks(15) - Ticks(0), "Incorrect");
++ assert(time_partitions.longest_pause() == Ticks(15) - Ticks(0), "Incorrect");
+
+ assert(!iter.has_next(), "Too many elements");
+ }
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp Wed May 07 19:26:16 2014 -0700
+@@ -28,6 +28,7 @@
+ #include "memory/allocation.hpp"
+ #include "prims/jni_md.h"
+ #include "utilities/macros.hpp"
++#include "utilities/ticks.hpp"
+
+ class ConcurrentPhase;
+ class GCPhase;
+@@ -45,21 +46,21 @@
+ class GCPhase {
+ const char* _name;
+ int _level;
+- jlong _start;
+- jlong _end;
++ Ticks _start;
++ Ticks _end;
+
+ public:
+ void set_name(const char* name) { _name = name; }
+- const char* name() { return _name; }
++ const char* name() const { return _name; }
+
+- int level() { return _level; }
++ int level() const { return _level; }
+ void set_level(int level) { _level = level; }
+
+- jlong start() { return _start; }
+- void set_start(jlong time) { _start = time; }
++ const Ticks start() const { return _start; }
++ void set_start(const Ticks& time) { _start = time; }
+
+- jlong end() { return _end; }
+- void set_end(jlong time) { _end = time; }
++ const Ticks end() const { return _end; }
++ void set_end(const Ticks& time) { _end = time; }
+
+ virtual void accept(PhaseVisitor* visitor) = 0;
+ };
+@@ -102,22 +103,22 @@
+ GrowableArray<PausePhase>* _phases;
+ PhasesStack _active_phases;
+
+- jlong _sum_of_pauses;
+- jlong _longest_pause;
++ Tickspan _sum_of_pauses;
++ Tickspan _longest_pause;
+
+ public:
+ TimePartitions();
+ ~TimePartitions();
+ void clear();
+
+- void report_gc_phase_start(const char* name, jlong time);
+- void report_gc_phase_end(jlong time);
++ void report_gc_phase_start(const char* name, const Ticks& time);
++ void report_gc_phase_end(const Ticks& time);
+
+ int num_phases() const;
+ GCPhase* phase_at(int index) const;
+
+- jlong sum_of_pauses();
+- jlong longest_pause();
++ const Tickspan sum_of_pauses() const { return _sum_of_pauses; }
++ const Tickspan longest_pause() const { return _longest_pause; }
+
+ bool has_active_phases();
+ private:
+@@ -133,40 +134,37 @@
+ class GCTimer : public ResourceObj {
+ NOT_PRODUCT(friend class GCTimerTest;)
+ protected:
+- jlong _gc_start;
+- jlong _gc_end;
++ Ticks _gc_start;
++ Ticks _gc_end;
+ TimePartitions _time_partitions;
+
+ public:
+- virtual void register_gc_start(jlong time);
+- virtual void register_gc_end(jlong time);
++ virtual void register_gc_start(const Ticks& time = Ticks::now());
++ virtual void register_gc_end(const Ticks& time = Ticks::now());
+
+- void register_gc_phase_start(const char* name, jlong time);
+- void register_gc_phase_end(jlong time);
++ void register_gc_phase_start(const char* name, const Ticks& time);
++ void register_gc_phase_end(const Ticks& time);
+
+- jlong gc_start() { return _gc_start; }
+- jlong gc_end() { return _gc_end; }
++ const Ticks gc_start() const { return _gc_start; }
++ const Ticks gc_end() const { return _gc_end; }
+
+ TimePartitions* time_partitions() { return &_time_partitions; }
+
+- long longest_pause();
+- long sum_of_pauses();
+-
+ protected:
+- void register_gc_pause_start(const char* name, jlong time);
+- void register_gc_pause_end(jlong time);
++ void register_gc_pause_start(const char* name, const Ticks& time = Ticks::now());
++ void register_gc_pause_end(const Ticks& time = Ticks::now());
+ };
+
+ class STWGCTimer : public GCTimer {
+ public:
+- virtual void register_gc_start(jlong time);
+- virtual void register_gc_end(jlong time);
++ virtual void register_gc_start(const Ticks& time = Ticks::now());
++ virtual void register_gc_end(const Ticks& time = Ticks::now());
+ };
+
+ class ConcurrentGCTimer : public GCTimer {
+ public:
+- void register_gc_pause_start(const char* name, jlong time);
+- void register_gc_pause_end(jlong time);
++ void register_gc_pause_start(const char* name);
++ void register_gc_pause_end();
+ };
+
+ class TimePartitionPhasesIterator {
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp Wed May 07 19:26:16 2014 -0700
+@@ -33,6 +33,7 @@
+ #include "memory/referenceProcessorStats.hpp"
+ #include "runtime/os.hpp"
+ #include "utilities/globalDefinitions.hpp"
++#include "utilities/ticks.inline.hpp"
+
+ #ifndef SERIALGC
+ #include "gc_implementation/g1/evacuationInfo.hpp"
+@@ -46,7 +47,7 @@
+ return GCTracer_next_gc_id++;
+ }
+
+-void GCTracer::report_gc_start_impl(GCCause::Cause cause, jlong timestamp) {
++void GCTracer::report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp) {
+ assert_unset_gc_id();
+
+ GCId gc_id = create_new_gc_id();
+@@ -55,7 +56,7 @@
+ _shared_gc_info.set_start_timestamp(timestamp);
+ }
+
+-void GCTracer::report_gc_start(GCCause::Cause cause, jlong timestamp) {
++void GCTracer::report_gc_start(GCCause::Cause cause, const Ticks& timestamp) {
+ assert_unset_gc_id();
+
+ report_gc_start_impl(cause, timestamp);
+@@ -65,7 +66,7 @@
+ return _shared_gc_info.id() != SharedGCInfo::UNSET_GCID;
+ }
+
+-void GCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
++void GCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
+ assert_set_gc_id();
+
+ _shared_gc_info.set_sum_of_pauses(time_partitions->sum_of_pauses());
+@@ -76,7 +77,7 @@
+ send_garbage_collection_event();
+ }
+
+-void GCTracer::report_gc_end(jlong timestamp, TimePartitions* time_partitions) {
++void GCTracer::report_gc_end(const Ticks& timestamp, TimePartitions* time_partitions) {
+ assert_set_gc_id();
+
+ report_gc_end_impl(timestamp, time_partitions);
+@@ -97,10 +98,10 @@
+ const GCId _gc_id;
+ const double _size_threshold_percentage;
+ const size_t _total_size_in_words;
+- const jlong _timestamp;
++ const Ticks _timestamp;
+
+ public:
+- ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words, jlong timestamp) :
++ ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words, const Ticks& timestamp) :
+ _gc_id(gc_id),
+ _size_threshold_percentage(ObjectCountCutOffPercent / 100),
+ _total_size_in_words(total_size_in_words),
+@@ -154,8 +155,7 @@
+ ObjectCountFilter object_filter(is_alive_cl);
+ HeapInspection::populate_table(&cit, false, &object_filter);
+
+- jlong timestamp = os::elapsed_counter();
+- ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words(), timestamp);
++ ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words(), Ticks::now());
+ cit.iterate(&event_sender);
+ }
+ }
+@@ -168,7 +168,7 @@
+ send_perm_gen_summary_event(when, perm_gen_summary);
+ }
+
+-void YoungGCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
++void YoungGCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
+ assert_set_gc_id();
+ assert(_tenuring_threshold != UNSET_TENURING_THRESHOLD, "Tenuring threshold has not been reported");
+
+@@ -188,14 +188,14 @@
+ _tenuring_threshold = tenuring_threshold;
+ }
+
+-void OldGCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
++void OldGCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
+ assert_set_gc_id();
+
+ GCTracer::report_gc_end_impl(timestamp, time_partitions);
+ send_old_gc_event();
+ }
+
+-void ParallelOldTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
++void ParallelOldTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
+ assert_set_gc_id();
+
+ OldGCTracer::report_gc_end_impl(timestamp, time_partitions);
+@@ -221,7 +221,7 @@
+ _g1_young_gc_info.set_type(type);
+ }
+
+-void G1NewTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
++void G1NewTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
+ assert_set_gc_id();
+
+ YoungGCTracer::report_gc_end_impl(timestamp, time_partitions);
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp Wed May 07 19:26:16 2014 -0700
+@@ -34,6 +34,7 @@
+ #ifndef SERIALGC
+ #include "gc_implementation/g1/g1YCTypes.hpp"
+ #endif
++#include "utilities/ticks.hpp"
+
+ typedef uint GCId;
+
+@@ -46,8 +47,6 @@
+ class BoolObjectClosure;
+
+ class SharedGCInfo VALUE_OBJ_CLASS_SPEC {
+- static const jlong UNSET_TIMESTAMP = -1;
+-
+ public:
+ static const GCId UNSET_GCID = (GCId)-1;
+
+@@ -55,23 +54,30 @@
+ GCId _id;
+ GCName _name;
+ GCCause::Cause _cause;
+- jlong _start_timestamp;
+- jlong _end_timestamp;
+- jlong _sum_of_pauses;
+- jlong _longest_pause;
++ Ticks _start_timestamp;
++ Ticks _end_timestamp;
++ Tickspan _sum_of_pauses;
++ Tickspan _longest_pause;
+
+ public:
+- SharedGCInfo(GCName name) : _id(UNSET_GCID), _name(name), _cause(GCCause::_last_gc_cause),
+- _start_timestamp(UNSET_TIMESTAMP), _end_timestamp(UNSET_TIMESTAMP), _sum_of_pauses(0), _longest_pause(0) {}
++ SharedGCInfo(GCName name) :
++ _id(UNSET_GCID),
++ _name(name),
++ _cause(GCCause::_last_gc_cause),
++ _start_timestamp(),
++ _end_timestamp(),
++ _sum_of_pauses(),
++ _longest_pause() {
++ }
+
+ void set_id(GCId id) { _id = id; }
+ GCId id() const { return _id; }
+
+- void set_start_timestamp(jlong timestamp) { _start_timestamp = timestamp; }
+- jlong start_timestamp() const { return _start_timestamp; }
++ void set_start_timestamp(const Ticks& timestamp) { _start_timestamp = timestamp; }
++ const Ticks start_timestamp() const { return _start_timestamp; }
+
+- void set_end_timestamp(jlong timestamp) { _end_timestamp = timestamp; }
+- jlong end_timestamp() const { return _end_timestamp; }
++ void set_end_timestamp(const Ticks& timestamp) { _end_timestamp = timestamp; }
++ const Ticks end_timestamp() const { return _end_timestamp; }
+
+ void set_name(GCName name) { _name = name; }
+ GCName name() const { return _name; }
+@@ -79,11 +85,11 @@
+ void set_cause(GCCause::Cause cause) { _cause = cause; }
+ GCCause::Cause cause() const { return _cause; }
+
+- void set_sum_of_pauses(jlong duration) { _sum_of_pauses = duration; }
+- jlong sum_of_pauses() const { return _sum_of_pauses; }
++ void set_sum_of_pauses(const Tickspan& duration) { _sum_of_pauses = duration; }
++ const Tickspan sum_of_pauses() const { return _sum_of_pauses; }
+
+- void set_longest_pause(jlong duration) { _longest_pause = duration; }
+- jlong longest_pause() const { return _longest_pause; }
++ void set_longest_pause(const Tickspan& duration) { _longest_pause = duration; }
++ const Tickspan longest_pause() const { return _longest_pause; }
+ };
+
+ class ParallelOldGCInfo VALUE_OBJ_CLASS_SPEC {
+@@ -115,8 +121,8 @@
+ SharedGCInfo _shared_gc_info;
+
+ public:
+- void report_gc_start(GCCause::Cause cause, jlong timestamp);
+- void report_gc_end(jlong timestamp, TimePartitions* time_partitions);
++ void report_gc_start(GCCause::Cause cause, const Ticks& timestamp);
++ void report_gc_end(const Ticks& timestamp, TimePartitions* time_partitions);
+ void report_gc_heap_summary(GCWhen::Type when, const GCHeapSummary& heap_summary, const PermGenSummary& perm_gen_summary) const;
+ void report_gc_reference_stats(const ReferenceProcessorStats& rp) const;
+ void report_object_count_after_gc(BoolObjectClosure* object_filter);
+@@ -125,8 +131,8 @@
+
+ protected:
+ GCTracer(GCName name) : _shared_gc_info(name) {}
+- virtual void report_gc_start_impl(GCCause::Cause cause, jlong timestamp);
+- virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
++ virtual void report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp);
++ virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
+
+ private:
+ void send_garbage_collection_event() const;
+@@ -143,7 +149,7 @@
+
+ protected:
+ YoungGCTracer(GCName name) : GCTracer(name), _tenuring_threshold(UNSET_TENURING_THRESHOLD) {}
+- virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
++ virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
+
+ public:
+ void report_promotion_failed(const PromotionFailedInfo& pf_info);
+@@ -157,7 +163,7 @@
+ class OldGCTracer : public GCTracer {
+ protected:
+ OldGCTracer(GCName name) : GCTracer(name) {}
+- virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
++ virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
+
+ public:
+ void report_concurrent_mode_failure();
+@@ -175,7 +181,7 @@
+ void report_dense_prefix(void* dense_prefix);
+
+ protected:
+- void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
++ void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
+
+ private:
+ void send_parallel_old_event() const;
+@@ -209,7 +215,7 @@
+ G1NewTracer() : YoungGCTracer(G1New) {}
+
+ void report_yc_type(G1YCType type);
+- void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
++ void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
+ void report_evacuation_info(EvacuationInfo* info);
+ void report_evacuation_failed(EvacuationFailedInfo& ef_info);
+
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Wed May 07 19:26:16 2014 -0700
+@@ -28,8 +28,10 @@
+ #include "gc_implementation/shared/gcTrace.hpp"
+ #include "gc_implementation/shared/gcWhen.hpp"
+ #include "gc_implementation/shared/copyFailedInfo.hpp"
++#include "runtime/os.hpp"
+ #include "trace/traceBackend.hpp"
+ #include "trace/tracing.hpp"
++
+ #ifndef SERIALGC
+ #include "gc_implementation/g1/evacuationInfo.hpp"
+ #include "gc_implementation/g1/g1YCTypes.hpp"
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+@@ -43,11 +43,13 @@
+ # include "thread_bsd.inline.hpp"
+ #endif
+
++#include "utilities/ticks.inline.hpp"
++
+
+ GCTraceTime::GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer) :
+- _title(title), _doit(doit), _print_cr(print_cr), _timer(timer) {
++ _title(title), _doit(doit), _print_cr(print_cr), _timer(timer), _start_counter() {
+ if (_doit || _timer != NULL) {
+- _start_counter = os::elapsed_counter();
++ _start_counter.stamp();
+ }
+
+ if (_timer != NULL) {
+@@ -66,10 +68,10 @@
+ }
+
+ GCTraceTime::~GCTraceTime() {
+- jlong stop_counter = 0;
++ Ticks stop_counter;
+
+ if (_doit || _timer != NULL) {
+- stop_counter = os::elapsed_counter();
++ stop_counter.stamp();
+ }
+
+ if (_timer != NULL) {
+@@ -77,11 +79,12 @@
+ }
+
+ if (_doit) {
+- double seconds = TimeHelper::counter_to_seconds(stop_counter - _start_counter);
++ const Tickspan duration = stop_counter - _start_counter;
++ double duration_in_seconds = TicksToTimeHelper::seconds(duration);
+ if (_print_cr) {
+- gclog_or_tty->print_cr(", %3.7f secs]", seconds);
++ gclog_or_tty->print_cr(", %3.7f secs]", duration_in_seconds);
+ } else {
+- gclog_or_tty->print(", %3.7f secs]", seconds);
++ gclog_or_tty->print(", %3.7f secs]", duration_in_seconds);
+ }
+ gclog_or_tty->flush();
+ }
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp Wed May 07 19:26:16 2014 -0700
+@@ -26,6 +26,7 @@
+ #define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACETIME_HPP
+
+ #include "prims/jni_md.h"
++#include "utilities/ticks.hpp"
+
+ class GCTimer;
+
+@@ -34,7 +35,7 @@
+ bool _doit;
+ bool _print_cr;
+ GCTimer* _timer;
+- jlong _start_counter;
++ Ticks _start_counter;
+
+ public:
+ GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer);
+--- ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp Wed May 07 19:26:16 2014 -0700
+@@ -28,8 +28,10 @@
+ #include "memory/heapInspection.hpp"
+ #include "trace/tracing.hpp"
+ #include "utilities/globalDefinitions.hpp"
++#include "utilities/ticks.hpp"
+
+-void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp) {
++void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, const Ticks& timestamp) {
++#if INCLUDE_TRACE
+ assert(Tracing::is_event_enabled(EventObjectCountAfterGC::eventId),
+ "Only call this method if the event is enabled");
+
+@@ -40,6 +42,8 @@
+ event.set_totalSize(entry->words() * BytesPerWord);
+ event.set_endtime(timestamp);
+ event.commit();
++
++#endif
+ }
+
+ bool ObjectCountEventSender::should_send_event() {
+--- ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp Wed May 07 19:26:16 2014 -0700
+@@ -29,10 +29,11 @@
+ #include "memory/allocation.hpp"
+
+ class KlassInfoEntry;
++class Ticks;
+
+ class ObjectCountEventSender : public AllStatic {
+ public:
+- static void send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp);
++ static void send(const KlassInfoEntry* entry, GCId gc_id, const Ticks& timestamp);
+ static bool should_send_event();
+ };
+
+--- ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp Wed May 07 19:26:16 2014 -0700
+@@ -121,6 +121,14 @@
+ }
+ }
+
++void CollectedHeap::register_nmethod(nmethod* nm) {
++ assert_locked_or_safepoint(CodeCache_lock);
++}
++
++void CollectedHeap::unregister_nmethod(nmethod* nm) {
++ assert_locked_or_safepoint(CodeCache_lock);
++}
++
+ void CollectedHeap::trace_heap(GCWhen::Type when, GCTracer* gc_tracer) {
+ const GCHeapSummary& heap_summary = create_heap_summary();
+ const PermGenSummary& perm_summary = create_perm_gen_summary();
+--- ./hotspot/src/share/vm/gc_interface/collectedHeap.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/gc_interface/collectedHeap.hpp Wed May 07 19:26:16 2014 -0700
+@@ -49,6 +49,7 @@
+ class Thread;
+ class ThreadClosure;
+ class VirtualSpaceSummary;
++class nmethod;
+
+ class GCMessage : public FormatBuffer<1024> {
+ public:
+@@ -667,6 +668,11 @@
+ void print_heap_before_gc();
+ void print_heap_after_gc();
+
++ // Registering and unregistering an nmethod (compiled code) with the heap.
++ // Override with specific mechanism for each specialized heap type.
++ virtual void register_nmethod(nmethod* nm);
++ virtual void unregister_nmethod(nmethod* nm);
++
+ void trace_heap_before_gc(GCTracer* gc_tracer);
+ void trace_heap_after_gc(GCTracer* gc_tracer);
+
+--- ./hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Wed May 07 19:26:16 2014 -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
+@@ -1222,3 +1222,24 @@
+ size_of_arguments * Interpreter::stackElementSize);
+ IRT_END
+ #endif
++
++// This is a support of the JVMTI PopFrame interface.
++// Make sure it is an invokestatic of a polymorphic intrinsic that has a member_name argument
++// and return it as a vm_result so that it can be reloaded in the list of invokestatic parameters.
++// The dmh argument is a reference to a DirectMethoHandle that has a member name field.
++IRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* thread, address dmh,
++ methodOopDesc* method, address bcp))
++ Bytecodes::Code code = Bytecodes::code_at(method, bcp);
++ if (code != Bytecodes::_invokestatic) {
++ return;
++ }
++ constantPoolOopDesc* cpool = method->constants();
++ int cp_index = Bytes::get_native_u2(bcp + 1) + constantPoolOopDesc::CPCACHE_INDEX_TAG;
++ Symbol* cname = cpool->klass_name_at(cpool->klass_ref_index_at(cp_index));
++ Symbol* mname = cpool->name_ref_at(cp_index);
++
++ if (MethodHandles::has_member_arg(cname, mname)) {
++ oop member_name = java_lang_invoke_DirectMethodHandle::member((oop)dmh);
++ thread->set_vm_result(member_name);
++ }
++IRT_END
+--- ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp Wed May 07 19:26:16 2014 -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
+@@ -106,6 +106,7 @@
+ static void create_exception(JavaThread* thread, char* name, char* message);
+ static void create_klass_exception(JavaThread* thread, char* name, oopDesc* obj);
+ static address exception_handler_for_exception(JavaThread* thread, oopDesc* exception);
++ static void member_name_arg_or_null(JavaThread* thread, address dmh, methodOopDesc* m, address bcp);
+ static void throw_pending_exception(JavaThread* thread);
+
+ // Statics & fields
+--- ./hotspot/src/share/vm/memory/cardTableModRefBS.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/cardTableModRefBS.cpp Wed May 07 19:26:16 2014 -0700
+@@ -400,60 +400,6 @@
+ inline_write_ref_field(field, newVal);
+ }
+
+-/*
+- Claimed and deferred bits are used together in G1 during the evacuation
+- pause. These bits can have the following state transitions:
+- 1. The claimed bit can be put over any other card state. Except that
+- the "dirty -> dirty and claimed" transition is checked for in
+- G1 code and is not used.
+- 2. Deferred bit can be set only if the previous state of the card
+- was either clean or claimed. mark_card_deferred() is wait-free.
+- We do not care if the operation is be successful because if
+- it does not it will only result in duplicate entry in the update
+- buffer because of the "cache-miss". So it's not worth spinning.
+- */
+-
+-
+-bool CardTableModRefBS::claim_card(size_t card_index) {
+- jbyte val = _byte_map[card_index];
+- assert(val != dirty_card_val(), "Shouldn't claim a dirty card");
+- while (val == clean_card_val() ||
+- (val & (clean_card_mask_val() | claimed_card_val())) != claimed_card_val()) {
+- jbyte new_val = val;
+- if (val == clean_card_val()) {
+- new_val = (jbyte)claimed_card_val();
+- } else {
+- new_val = val | (jbyte)claimed_card_val();
+- }
+- jbyte res = Atomic::cmpxchg(new_val, &_byte_map[card_index], val);
+- if (res == val) {
+- return true;
+- }
+- val = res;
+- }
+- return false;
+-}
+-
+-bool CardTableModRefBS::mark_card_deferred(size_t card_index) {
+- jbyte val = _byte_map[card_index];
+- // It's already processed
+- if ((val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val()) {
+- return false;
+- }
+- // Cached bit can be installed either on a clean card or on a claimed card.
+- jbyte new_val = val;
+- if (val == clean_card_val()) {
+- new_val = (jbyte)deferred_card_val();
+- } else {
+- if (val & claimed_card_val()) {
+- new_val = val | (jbyte)deferred_card_val();
+- }
+- }
+- if (new_val != val) {
+- Atomic::cmpxchg(new_val, &_byte_map[card_index], val);
+- }
+- return true;
+-}
+
+ void CardTableModRefBS::non_clean_card_iterate_possibly_parallel(Space* sp,
+ MemRegion mr,
+--- ./hotspot/src/share/vm/memory/cardTableModRefBS.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/cardTableModRefBS.hpp Wed May 07 19:26:16 2014 -0700
+@@ -344,34 +344,10 @@
+ _byte_map[card_index] = dirty_card_val();
+ }
+
+- bool is_card_claimed(size_t card_index) {
+- jbyte val = _byte_map[card_index];
+- return (val & (clean_card_mask_val() | claimed_card_val())) == claimed_card_val();
+- }
+-
+- void set_card_claimed(size_t card_index) {
+- jbyte val = _byte_map[card_index];
+- if (val == clean_card_val()) {
+- val = (jbyte)claimed_card_val();
+- } else {
+- val |= (jbyte)claimed_card_val();
+- }
+- _byte_map[card_index] = val;
+- }
+-
+- bool claim_card(size_t card_index);
+-
+ bool is_card_clean(size_t card_index) {
+ return _byte_map[card_index] == clean_card_val();
+ }
+
+- bool is_card_deferred(size_t card_index) {
+- jbyte val = _byte_map[card_index];
+- return (val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val();
+- }
+-
+- bool mark_card_deferred(size_t card_index);
+-
+ // Card marking array base (adjusted for heap low boundary)
+ // This would be the 0th element of _byte_map, if the heap started at 0x0.
+ // But since the heap starts at some higher address, this points to somewhere
+--- ./hotspot/src/share/vm/memory/collectorPolicy.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/collectorPolicy.cpp Wed May 07 19:26:16 2014 -0700
+@@ -230,6 +230,8 @@
+ alignment = lcm(os::large_page_size(), alignment);
+ }
+
++ assert(alignment >= min_alignment(), "Must be");
++
+ return alignment;
+ }
+
+--- ./hotspot/src/share/vm/memory/defNewGeneration.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/defNewGeneration.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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
+@@ -538,7 +538,7 @@
+
+ GenCollectedHeap* gch = GenCollectedHeap::heap();
+
+- _gc_timer->register_gc_start(os::elapsed_counter());
++ _gc_timer->register_gc_start();
+ DefNewTracer gc_tracer;
+ gc_tracer.report_gc_start(gch->gc_cause(), _gc_timer->gc_start());
+
+@@ -682,7 +682,7 @@
+ gch->trace_heap_after_gc(&gc_tracer);
+ gc_tracer.report_tenuring_threshold(tenuring_threshold());
+
+- _gc_timer->register_gc_end(os::elapsed_counter());
++ _gc_timer->register_gc_end();
+
+ gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
+ }
+@@ -1004,6 +1004,9 @@
+ // have to use it here, as well.
+ HeapWord* result = eden()->par_allocate(word_size);
+ if (result != NULL) {
++ if (CMSEdenChunksRecordAlways && _next_gen != NULL) {
++ _next_gen->sample_eden_chunk();
++ }
+ return result;
+ }
+ do {
+@@ -1034,13 +1037,19 @@
+ // circular dependency at compile time.
+ if (result == NULL) {
+ result = allocate_from_space(word_size);
++ } else if (CMSEdenChunksRecordAlways && _next_gen != NULL) {
++ _next_gen->sample_eden_chunk();
+ }
+ return result;
+ }
+
+ HeapWord* DefNewGeneration::par_allocate(size_t word_size,
+ bool is_tlab) {
+- return eden()->par_allocate(word_size);
++ HeapWord* res = eden()->par_allocate(word_size);
++ if (CMSEdenChunksRecordAlways && _next_gen != NULL) {
++ _next_gen->sample_eden_chunk();
++ }
++ return res;
+ }
+
+ void DefNewGeneration::gc_prologue(bool full) {
+--- ./hotspot/src/share/vm/memory/genCollectedHeap.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/genCollectedHeap.cpp Wed May 07 19:26:16 2014 -0700
+@@ -99,17 +99,19 @@
+ guarantee(HeapWordSize == wordSize, "HeapWordSize must equal wordSize");
+
+ // The heap must be at least as aligned as generations.
+- size_t alignment = Generation::GenGrain;
++ size_t gen_alignment = Generation::GenGrain;
+
+ _gen_specs = gen_policy()->generations();
+ PermanentGenerationSpec *perm_gen_spec =
+ collector_policy()->permanent_generation();
+
++ size_t heap_alignment = collector_policy()->max_alignment();
++
+ // Make sure the sizes are all aligned.
+ for (i = 0; i < _n_gens; i++) {
+- _gen_specs[i]->align(alignment);
++ _gen_specs[i]->align(gen_alignment);
+ }
+- perm_gen_spec->align(alignment);
++ perm_gen_spec->align(heap_alignment);
+
+ // If we are dumping the heap, then allocate a wasted block of address
+ // space in order to push the heap to a lower address. This extra
+@@ -130,9 +132,9 @@
+ char* heap_address;
+ size_t total_reserved = 0;
+ int n_covered_regions = 0;
+- ReservedSpace heap_rs(0);
++ ReservedSpace heap_rs;
+
+- heap_address = allocate(alignment, perm_gen_spec, &total_reserved,
++ heap_address = allocate(heap_alignment, perm_gen_spec, &total_reserved,
+ &n_covered_regions, &heap_rs);
+
+ if (UseSharedSpaces) {
+@@ -142,7 +144,7 @@
+ }
+ FileMapInfo* mapinfo = FileMapInfo::current_info();
+ mapinfo->fail_continue("Unable to reserve shared region.");
+- allocate(alignment, perm_gen_spec, &total_reserved, &n_covered_regions,
++ allocate(heap_alignment, perm_gen_spec, &total_reserved, &n_covered_regions,
+ &heap_rs);
+ }
+ }
+@@ -207,19 +209,21 @@
+ const size_t pageSize = UseLargePages ?
+ os::large_page_size() : os::vm_page_size();
+
++ assert(alignment % pageSize == 0, "Must be");
++
+ for (int i = 0; i < _n_gens; i++) {
+ total_reserved = add_and_check_overflow(total_reserved, _gen_specs[i]->max_size());
+ n_covered_regions += _gen_specs[i]->n_covered_regions();
+ }
+
+- assert(total_reserved % pageSize == 0,
+- err_msg("Gen size; total_reserved=" SIZE_FORMAT ", pageSize="
+- SIZE_FORMAT, total_reserved, pageSize));
++ assert(total_reserved % alignment == 0,
++ err_msg("Gen size; total_reserved=" SIZE_FORMAT ", alignment="
++ SIZE_FORMAT, total_reserved, alignment));
+ total_reserved = add_and_check_overflow(total_reserved, perm_gen_spec->max_size());
+- assert(total_reserved % pageSize == 0,
+- err_msg("Perm size; total_reserved=" SIZE_FORMAT ", pageSize="
++ assert(total_reserved % alignment == 0,
++ err_msg("Perm size; total_reserved=" SIZE_FORMAT ", alignment="
+ SIZE_FORMAT ", perm gen max=" SIZE_FORMAT, total_reserved,
+- pageSize, perm_gen_spec->max_size()));
++ alignment, perm_gen_spec->max_size()));
+
+ n_covered_regions += perm_gen_spec->n_covered_regions();
+
+@@ -229,7 +233,9 @@
+ total_reserved = add_and_check_overflow(total_reserved, misc);
+
+ if (UseLargePages) {
++ assert(misc == 0, "CDS does not support Large Pages");
+ assert(total_reserved != 0, "total_reserved cannot be 0");
++ assert(is_size_aligned(total_reserved, os::large_page_size()), "Must be");
+ total_reserved = round_up_and_check_overflow(total_reserved, os::large_page_size());
+ }
+
+@@ -250,7 +256,7 @@
+ } else {
+ heap_address = NULL; // any address will do.
+ if (UseCompressedOops) {
+- heap_address = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
++ heap_address = Universe::preferred_heap_base(total_reserved, alignment, Universe::UnscaledNarrowOop);
+ *_total_reserved = total_reserved;
+ *_n_covered_regions = n_covered_regions;
+ *heap_rs = ReservedHeapSpace(total_reserved, alignment,
+@@ -260,13 +266,13 @@
+ // Failed to reserve at specified address - the requested memory
+ // region is taken already, for example, by 'java' launcher.
+ // Try again to reserver heap higher.
+- heap_address = Universe::preferred_heap_base(total_reserved, Universe::ZeroBasedNarrowOop);
++ heap_address = Universe::preferred_heap_base(total_reserved, alignment, Universe::ZeroBasedNarrowOop);
+ *heap_rs = ReservedHeapSpace(total_reserved, alignment,
+ UseLargePages, heap_address);
+
+ if (heap_address != NULL && !heap_rs->is_reserved()) {
+ // Failed to reserve at specified address again - give up.
+- heap_address = Universe::preferred_heap_base(total_reserved, Universe::HeapBasedNarrowOop);
++ heap_address = Universe::preferred_heap_base(total_reserved, alignment, Universe::HeapBasedNarrowOop);
+ assert(heap_address == NULL, "");
+ *heap_rs = ReservedHeapSpace(total_reserved, alignment,
+ UseLargePages, heap_address);
+@@ -538,8 +544,7 @@
+ prepare_for_verify();
+ prepared_for_verification = true;
+ }
+- gclog_or_tty->print(" VerifyBeforeGC:");
+- Universe::verify();
++ Universe::verify(" VerifyBeforeGC:");
+ }
+ COMPILER2_PRESENT(DerivedPointerTable::clear());
+
+@@ -610,8 +615,7 @@
+ if (VerifyAfterGC && i >= VerifyGCLevel &&
+ total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+- gclog_or_tty->print(" VerifyAfterGC:");
+- Universe::verify();
++ Universe::verify(" VerifyAfterGC:");
+ }
+
+ if (PrintGCDetails) {
+@@ -932,12 +936,13 @@
+ // Returns "TRUE" iff "p" points into the committed areas of the heap.
+ bool GenCollectedHeap::is_in(const void* p) const {
+ #ifndef ASSERT
+- guarantee(VerifyBeforeGC ||
+- VerifyDuringGC ||
+- VerifyBeforeExit ||
+- PrintAssembly ||
+- tty->count() != 0 || // already printing
+- VerifyAfterGC ||
++ guarantee(VerifyBeforeGC ||
++ VerifyDuringGC ||
++ VerifyBeforeExit ||
++ VerifyDuringStartup ||
++ PrintAssembly ||
++ tty->count() != 0 || // already printing
++ VerifyAfterGC ||
+ VMError::fatal_error_in_progress(), "too expensive");
+
+ #endif
+--- ./hotspot/src/share/vm/memory/generation.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/generation.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2012, 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
+@@ -476,16 +476,16 @@
+ x(ref_processor(), gch->reserved_region());
+
+ STWGCTimer* gc_timer = GenMarkSweep::gc_timer();
+- gc_timer->register_gc_start(os::elapsed_counter());
++ gc_timer->register_gc_start();
+
+ SerialOldTracer* gc_tracer = GenMarkSweep::gc_tracer();
+ gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
+
+ GenMarkSweep::invoke_at_safepoint(_level, ref_processor(), clear_all_soft_refs);
+
+- gc_timer->register_gc_end(os::elapsed_counter());
++ gc_timer->register_gc_end();
+
+- gc_tracer->report_gc_end(os::elapsed_counter(), gc_timer->time_partitions());
++ gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
+
+ SpecializationStats::print();
+ }
+--- ./hotspot/src/share/vm/memory/generation.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/generation.hpp Wed May 07 19:26:16 2014 -0700
+@@ -457,6 +457,7 @@
+ // expected to be GC worker thread-local, with the worker index
+ // indicated by "thr_num".
+ virtual void* get_data_recorder(int thr_num) { return NULL; }
++ virtual void sample_eden_chunk() {}
+
+ // Some generations may require some cleanup actions before allowing
+ // a verification.
+--- ./hotspot/src/share/vm/memory/iterator.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/iterator.cpp Wed May 07 19:26:16 2014 -0700
+@@ -70,7 +70,7 @@
+ }
+
+ void CodeBlobToOopClosure::do_newly_marked_nmethod(nmethod* nm) {
+- nm->oops_do(_cl, /*do_strong_roots_only=*/ true);
++ nm->oops_do(_cl, /*do_strong_roots_only=*/ true, /*allow_zombie=*/ false);
+ }
+
+ void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) {
+--- ./hotspot/src/share/vm/memory/sharedHeap.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/sharedHeap.cpp Wed May 07 19:26:16 2014 -0700
+@@ -64,7 +64,8 @@
+ }
+ _sh = this; // ch is static, should be set only once.
+ if ((UseParNewGC ||
+- (UseConcMarkSweepGC && CMSParallelRemarkEnabled) ||
++ (UseConcMarkSweepGC && (CMSParallelInitialMarkEnabled ||
++ CMSParallelRemarkEnabled)) ||
+ UseG1GC) &&
+ ParallelGCThreads > 0) {
+ _workers = new FlexibleWorkGang("Parallel GC Threads", ParallelGCThreads,
+@@ -148,7 +149,8 @@
+ ScanningOption so,
+ OopClosure* roots,
+ CodeBlobClosure* code_roots,
+- OopsInGenClosure* perm_blk) {
++ OopsInGenClosure* perm_blk,
++ bool manages_code_roots) {
+ StrongRootsScope srs(this, activate_scope);
+ // General strong roots.
+ assert(_strong_roots_parity != 0, "must have called prologue code");
+@@ -216,7 +218,7 @@
+ CodeCache::blobs_do(code_roots);
+ }
+ } else if (so & (SO_SystemClasses|SO_AllClasses)) {
+- if (!collecting_perm_gen) {
++ if (!manages_code_roots && !collecting_perm_gen) {
+ // If we are collecting from class statics, but we are not going to
+ // visit all of the CodeCache, collect from the non-perm roots if any.
+ // This makes the code cache function temporarily as a source of strong
+--- ./hotspot/src/share/vm/memory/sharedHeap.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/sharedHeap.hpp Wed May 07 19:26:16 2014 -0700
+@@ -267,7 +267,8 @@
+ ScanningOption so,
+ OopClosure* roots,
+ CodeBlobClosure* code_roots,
+- OopsInGenClosure* perm_blk);
++ OopsInGenClosure* perm_blk,
++ bool manages_code_roots = false);
+
+ // Apply "blk" to all the weak roots of the system. These include
+ // JNI weak roots, the code cache, system dictionary, symbol table,
+--- ./hotspot/src/share/vm/memory/universe.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/universe.cpp Wed May 07 19:26:16 2014 -0700
+@@ -826,17 +826,23 @@
+ // 32Gb
+ // OopEncodingHeapMax == NarrowOopHeapMax << LogMinObjAlignmentInBytes;
+
+-char* Universe::preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode) {
++char* Universe::preferred_heap_base(size_t heap_size, size_t alignment, NARROW_OOP_MODE mode) {
++ assert(is_size_aligned((size_t)OopEncodingHeapMax, alignment), "Must be");
++ assert(is_size_aligned((size_t)NarrowOopHeapMax, alignment), "Must be");
++ assert(is_size_aligned(heap_size, alignment), "Must be");
++
++ uintx heap_base_min_address_aligned = align_size_up(HeapBaseMinAddress, alignment);
++
+ size_t base = 0;
+ #ifdef _LP64
+ if (UseCompressedOops) {
+ assert(mode == UnscaledNarrowOop ||
+ mode == ZeroBasedNarrowOop ||
+ mode == HeapBasedNarrowOop, "mode is invalid");
+- const size_t total_size = heap_size + HeapBaseMinAddress;
++ const size_t total_size = heap_size + heap_base_min_address_aligned;
+ // Return specified base for the first request.
+ if (!FLAG_IS_DEFAULT(HeapBaseMinAddress) && (mode == UnscaledNarrowOop)) {
+- base = HeapBaseMinAddress;
++ base = heap_base_min_address_aligned;
+ } else if (total_size <= OopEncodingHeapMax && (mode != HeapBasedNarrowOop)) {
+ if (total_size <= NarrowOopHeapMax && (mode == UnscaledNarrowOop) &&
+ (Universe::narrow_oop_shift() == 0)) {
+@@ -882,6 +888,8 @@
+ }
+ }
+ #endif
++
++ assert(is_ptr_aligned((char*)base, alignment), "Must be");
+ return (char*)base; // also return NULL (don't care) for 32-bit VM
+ }
+
+@@ -1366,7 +1374,7 @@
+ st->print_cr("}");
+ }
+
+-void Universe::verify(bool silent, VerifyOption option) {
++void Universe::verify(VerifyOption option, const char* prefix, bool silent) {
+ if (SharedSkipVerify) {
+ return;
+ }
+@@ -1387,11 +1395,12 @@
+ HandleMark hm; // Handles created during verification can be zapped
+ _verify_count++;
+
++ if (!silent) gclog_or_tty->print(prefix);
+ if (!silent) gclog_or_tty->print("[Verifying ");
+ if (!silent) gclog_or_tty->print("threads ");
+ Threads::verify();
++ if (!silent) gclog_or_tty->print("heap ");
+ heap()->verify(silent, option);
+-
+ if (!silent) gclog_or_tty->print("syms ");
+ SymbolTable::verify();
+ if (!silent) gclog_or_tty->print("strs ");
+--- ./hotspot/src/share/vm/memory/universe.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/memory/universe.hpp Wed May 07 19:26:16 2014 -0700
+@@ -380,7 +380,7 @@
+
+ static NARROW_OOP_MODE narrow_oop_mode();
+
+- static char* preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode);
++ static char* preferred_heap_base(size_t heap_size, size_t alignment, NARROW_OOP_MODE mode);
+
+ // Historic gc information
+ static size_t get_heap_capacity_at_last_gc() { return _heap_capacity_at_last_gc; }
+@@ -419,12 +419,12 @@
+
+ // Debugging
+ static bool verify_in_progress() { return _verify_in_progress; }
+- static void verify(bool silent, VerifyOption option);
+- static void verify(bool silent) {
+- verify(silent, VerifyOption_Default /* option */);
++ static void verify(VerifyOption option, const char* prefix, bool silent = VerifySilently);
++ static void verify(const char* prefix, bool silent = VerifySilently) {
++ verify(VerifyOption_Default, prefix, silent);
+ }
+- static void verify() {
+- verify(false /* silent */);
++ static void verify(bool silent = VerifySilently) {
++ verify("", silent);
+ }
+
+ static int verify_count() { return _verify_count; }
+--- ./hotspot/src/share/vm/oops/constantPoolOop.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/oops/constantPoolOop.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2012, 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
+@@ -1026,24 +1026,13 @@
+
+ case JVM_CONSTANT_InvokeDynamic:
+ {
+- int k1 = invoke_dynamic_bootstrap_method_ref_index_at(index1);
+- int k2 = cp2->invoke_dynamic_bootstrap_method_ref_index_at(index2);
+- bool match = compare_entry_to(k1, cp2, k2, CHECK_false);
+- if (!match) return false;
+- k1 = invoke_dynamic_name_and_type_ref_index_at(index1);
+- k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2);
+- match = compare_entry_to(k1, cp2, k2, CHECK_false);
+- if (!match) return false;
+- int argc = invoke_dynamic_argument_count_at(index1);
+- if (argc == cp2->invoke_dynamic_argument_count_at(index2)) {
+- for (int j = 0; j < argc; j++) {
+- k1 = invoke_dynamic_argument_index_at(index1, j);
+- k2 = cp2->invoke_dynamic_argument_index_at(index2, j);
+- match = compare_entry_to(k1, cp2, k2, CHECK_false);
+- if (!match) return false;
+- }
+- return true; // got through loop; all elements equal
+- }
++ int k1 = invoke_dynamic_name_and_type_ref_index_at(index1);
++ int k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2);
++ int i1 = invoke_dynamic_bootstrap_specifier_index(index1);
++ int i2 = cp2->invoke_dynamic_bootstrap_specifier_index(index2);
++ bool match = compare_entry_to(k1, cp2, k2, CHECK_false) &&
++ compare_operand_to(i1, cp2, i2, CHECK_false);
++ return match;
+ } break;
+
+ case JVM_CONSTANT_UnresolvedString:
+@@ -1078,12 +1067,135 @@
+ } // end compare_entry_to()
+
+
++// Resize the operands array with delta_len and delta_size.
++// Used in RedefineClasses for CP merge.
++void constantPoolOopDesc::resize_operands(int delta_len, int delta_size, TRAPS) {
++ int old_len = operand_array_length(operands());
++ int new_len = old_len + delta_len;
++ int min_len = (delta_len > 0) ? old_len : new_len;
++
++ int old_size = operands()->length();
++ int new_size = old_size + delta_size;
++ int min_size = (delta_size > 0) ? old_size : new_size;
++
++ typeArrayHandle new_ops = oopFactory::new_permanent_intArray(new_size, CHECK);
++
++ // Set index in the resized array for existing elements only
++ for (int idx = 0; idx < min_len; idx++) {
++ int offset = operand_offset_at(idx); // offset in original array
++ operand_offset_at_put(new_ops(), idx, offset + 2*delta_len); // offset in resized array
++ }
++ // Copy the bootstrap specifiers only
++ Copy::conjoint_memory_atomic(operands()->short_at_addr(2*old_len),
++ new_ops->short_at_addr(2*new_len),
++ (min_size - 2*min_len) * sizeof(u2));
++ // Explicit deallocation of old operands array is not needed for 7u
++ set_operands(new_ops());
++} // end resize_operands()
++
++
++// Extend the operands array with the length and size of the ext_cp operands.
++// Used in RedefineClasses for CP merge.
++void constantPoolOopDesc::extend_operands(constantPoolHandle ext_cp, TRAPS) {
++ int delta_len = operand_array_length(ext_cp->operands());
++ if (delta_len == 0) {
++ return; // nothing to do
++ }
++ int delta_size = ext_cp->operands()->length();
++
++ assert(delta_len > 0 && delta_size > 0, "extended operands array must be bigger");
++
++ if (operand_array_length(operands()) == 0) {
++ typeArrayHandle new_ops = oopFactory::new_permanent_intArray(delta_size, CHECK);
++ // The first element index defines the offset of second part
++ operand_offset_at_put(new_ops(), 0, 2*delta_len); // offset in new array
++ set_operands(new_ops());
++ } else {
++ resize_operands(delta_len, delta_size, CHECK);
++ }
++
++} // end extend_operands()
++
++
++// Shrink the operands array to a smaller array with new_len length.
++// Used in RedefineClasses for CP merge.
++void constantPoolOopDesc::shrink_operands(int new_len, TRAPS) {
++ int old_len = operand_array_length(operands());
++ if (new_len == old_len) {
++ return; // nothing to do
++ }
++ assert(new_len < old_len, "shrunken operands array must be smaller");
++
++ int free_base = operand_next_offset_at(new_len - 1);
++ int delta_len = new_len - old_len;
++ int delta_size = 2*delta_len + free_base - operands()->length();
++
++ resize_operands(delta_len, delta_size, CHECK);
++
++} // end shrink_operands()
++
++
++void constantPoolOopDesc::copy_operands(constantPoolHandle from_cp,
++ constantPoolHandle to_cp,
++ TRAPS) {
++
++ int from_oplen = operand_array_length(from_cp->operands());
++ int old_oplen = operand_array_length(to_cp->operands());
++ if (from_oplen != 0) {
++ // append my operands to the target's operands array
++ if (old_oplen == 0) {
++ to_cp->set_operands(from_cp->operands()); // reuse; do not merge
++ } else {
++ int old_len = to_cp->operands()->length();
++ int from_len = from_cp->operands()->length();
++ int old_off = old_oplen * sizeof(u2);
++ int from_off = from_oplen * sizeof(u2);
++ typeArrayHandle new_operands = oopFactory::new_permanent_intArray(old_len + from_len, CHECK);
++ int fillp = 0, len = 0;
++ // first part of dest
++ Copy::conjoint_memory_atomic(to_cp->operands()->short_at_addr(0),
++ new_operands->short_at_addr(fillp),
++ (len = old_off) * sizeof(u2));
++ fillp += len;
++ // first part of src
++ Copy::conjoint_memory_atomic(from_cp->operands()->short_at_addr(0),
++ new_operands->short_at_addr(fillp),
++ (len = from_off) * sizeof(u2));
++ fillp += len;
++ // second part of dest
++ Copy::conjoint_memory_atomic(to_cp->operands()->short_at_addr(old_off),
++ new_operands->short_at_addr(fillp),
++ (len = old_len - old_off) * sizeof(u2));
++ fillp += len;
++ // second part of src
++ Copy::conjoint_memory_atomic(from_cp->operands()->short_at_addr(from_off),
++ new_operands->short_at_addr(fillp),
++ (len = from_len - from_off) * sizeof(u2));
++ fillp += len;
++ assert(fillp == new_operands->length(), "");
++
++ // Adjust indexes in the first part of the copied operands array.
++ for (int j = 0; j < from_oplen; j++) {
++ int offset = operand_offset_at(new_operands(), old_oplen + j);
++ assert(offset == operand_offset_at(from_cp->operands(), j), "correct copy");
++ offset += old_len; // every new tuple is preceded by old_len extra u2's
++ operand_offset_at_put(new_operands(), old_oplen + j, offset);
++ }
++
++ // replace target operands array with combined array
++ to_cp->set_operands(new_operands());
++ }
++ }
++} // end copy_operands()
++
++
+ // Copy this constant pool's entries at start_i to end_i (inclusive)
+ // to the constant pool to_cp's entries starting at to_i. A total of
+ // (end_i - start_i) + 1 entries are copied.
+ void constantPoolOopDesc::copy_cp_to_impl(constantPoolHandle from_cp, int start_i, int end_i,
+ constantPoolHandle to_cp, int to_i, TRAPS) {
+
++
+ int dest_i = to_i; // leave original alone for debug purposes
+
+ for (int src_i = start_i; src_i <= end_i; /* see loop bottom */ ) {
+@@ -1104,56 +1216,9 @@
+ break;
+ }
+ }
++ copy_operands(from_cp, to_cp, CHECK);
+
+- int from_oplen = operand_array_length(from_cp->operands());
+- int old_oplen = operand_array_length(to_cp->operands());
+- if (from_oplen != 0) {
+- // append my operands to the target's operands array
+- if (old_oplen == 0) {
+- to_cp->set_operands(from_cp->operands()); // reuse; do not merge
+- } else {
+- int old_len = to_cp->operands()->length();
+- int from_len = from_cp->operands()->length();
+- int old_off = old_oplen * sizeof(u2);
+- int from_off = from_oplen * sizeof(u2);
+- typeArrayHandle new_operands = oopFactory::new_permanent_shortArray(old_len + from_len, CHECK);
+- int fillp = 0, len = 0;
+- // first part of dest
+- Copy::conjoint_memory_atomic(to_cp->operands()->short_at_addr(0),
+- new_operands->short_at_addr(fillp),
+- (len = old_off) * sizeof(u2));
+- fillp += len;
+- // first part of src
+- Copy::conjoint_memory_atomic(to_cp->operands()->short_at_addr(0),
+- new_operands->short_at_addr(fillp),
+- (len = from_off) * sizeof(u2));
+- fillp += len;
+- // second part of dest
+- Copy::conjoint_memory_atomic(to_cp->operands()->short_at_addr(old_off),
+- new_operands->short_at_addr(fillp),
+- (len = old_len - old_off) * sizeof(u2));
+- fillp += len;
+- // second part of src
+- Copy::conjoint_memory_atomic(to_cp->operands()->short_at_addr(from_off),
+- new_operands->short_at_addr(fillp),
+- (len = from_len - from_off) * sizeof(u2));
+- fillp += len;
+- assert(fillp == new_operands->length(), "");
+-
+- // Adjust indexes in the first part of the copied operands array.
+- for (int j = 0; j < from_oplen; j++) {
+- int offset = operand_offset_at(new_operands(), old_oplen + j);
+- assert(offset == operand_offset_at(from_cp->operands(), j), "correct copy");
+- offset += old_len; // every new tuple is preceded by old_len extra u2's
+- operand_offset_at_put(new_operands(), old_oplen + j, offset);
+- }
+-
+- // replace target operands array with combined array
+- to_cp->set_operands(new_operands());
+- }
+- }
+-
+-} // end copy_cp_to()
++} // end copy_cp_to_impl()
+
+
+ // Copy this constant pool's entry at from_i to the constant pool
+@@ -1337,6 +1402,46 @@
+ } // end find_matching_entry()
+
+
++// Compare this constant pool's bootstrap specifier at idx1 to the constant pool
++// cp2's bootstrap specifier at idx2.
++bool constantPoolOopDesc::compare_operand_to(int idx1, constantPoolHandle cp2, int idx2, TRAPS) {
++ int k1 = operand_bootstrap_method_ref_index_at(idx1);
++ int k2 = cp2->operand_bootstrap_method_ref_index_at(idx2);
++ bool match = compare_entry_to(k1, cp2, k2, CHECK_false);
++
++ if (!match) {
++ return false;
++ }
++ int argc = operand_argument_count_at(idx1);
++ if (argc == cp2->operand_argument_count_at(idx2)) {
++ for (int j = 0; j < argc; j++) {
++ k1 = operand_argument_index_at(idx1, j);
++ k2 = cp2->operand_argument_index_at(idx2, j);
++ match = compare_entry_to(k1, cp2, k2, CHECK_false);
++ if (!match) {
++ return false;
++ }
++ }
++ return true; // got through loop; all elements equal
++ }
++ return false;
++} // end compare_operand_to()
++
++// Search constant pool search_cp for a bootstrap specifier that matches
++// this constant pool's bootstrap specifier at pattern_i index.
++// Return the index of a matching bootstrap specifier or (-1) if there is no match.
++int constantPoolOopDesc::find_matching_operand(int pattern_i,
++ constantPoolHandle search_cp, int search_len, TRAPS) {
++ for (int i = 0; i < search_len; i++) {
++ bool found = compare_operand_to(pattern_i, search_cp, i, CHECK_(-1));
++ if (found) {
++ return i;
++ }
++ }
++ return -1; // bootstrap specifier not found; return unused index (-1)
++} // end find_matching_operand()
++
++
+ #ifndef PRODUCT
+
+ const char* constantPoolOopDesc::printable_name_at(int which) {
+--- ./hotspot/src/share/vm/oops/constantPoolOop.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/oops/constantPoolOop.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -565,6 +565,47 @@
+ _indy_argc_offset = 1, // u2 argc
+ _indy_argv_offset = 2 // u2 argv[argc]
+ };
++
++ // These functions are used in RedefineClasses for CP merge
++
++ int operand_offset_at(int bootstrap_specifier_index) {
++ assert(0 <= bootstrap_specifier_index &&
++ bootstrap_specifier_index < operand_array_length(operands()),
++ "Corrupted CP operands");
++ return operand_offset_at(operands(), bootstrap_specifier_index);
++ }
++ int operand_bootstrap_method_ref_index_at(int bootstrap_specifier_index) {
++ int offset = operand_offset_at(bootstrap_specifier_index);
++ return operands()->short_at(offset + _indy_bsm_offset);
++ }
++ int operand_argument_count_at(int bootstrap_specifier_index) {
++ int offset = operand_offset_at(bootstrap_specifier_index);
++ int argc = operands()->short_at(offset + _indy_argc_offset);
++ return argc;
++ }
++ int operand_argument_index_at(int bootstrap_specifier_index, int j) {
++ int offset = operand_offset_at(bootstrap_specifier_index);
++ return operands()->short_at(offset + _indy_argv_offset + j);
++ }
++ int operand_next_offset_at(int bootstrap_specifier_index) {
++ int offset = operand_offset_at(bootstrap_specifier_index) + _indy_argv_offset
++ + operand_argument_count_at(bootstrap_specifier_index);
++ return offset;
++ }
++ // Compare a bootsrap specifier in the operands arrays
++ bool compare_operand_to(int bootstrap_specifier_index1, constantPoolHandle cp2,
++ int bootstrap_specifier_index2, TRAPS);
++ // Find a bootsrap specifier in the operands array
++ int find_matching_operand(int bootstrap_specifier_index, constantPoolHandle search_cp,
++ int operands_cur_len, TRAPS);
++ // Resize the operands array with delta_len and delta_size
++ void resize_operands(int delta_len, int delta_size, TRAPS);
++ // Extend the operands array with the length and size of the ext_cp operands
++ void extend_operands(constantPoolHandle ext_cp, TRAPS);
++ // Shrink the operands array to a smaller array with new_len length
++ void shrink_operands(int new_len, TRAPS);
++
++
+ int invoke_dynamic_bootstrap_method_ref_index_at(int which) {
+ assert(tag_at(which).is_invoke_dynamic(), "Corrupted constant pool");
+ int op_base = invoke_dynamic_operand_base(which);
+@@ -755,6 +796,7 @@
+ copy_cp_to_impl(h_this, start_i, end_i, to_cp, to_i, THREAD);
+ }
+ static void copy_cp_to_impl(constantPoolHandle from_cp, int start_i, int end_i, constantPoolHandle to_cp, int to_i, TRAPS);
++ static void copy_operands(constantPoolHandle from_cp, constantPoolHandle to_cp, TRAPS);
+ static void copy_entry_to(constantPoolHandle from_cp, int from_i, constantPoolHandle to_cp, int to_i, TRAPS);
+ int find_matching_entry(int pattern_i, constantPoolHandle search_cp, TRAPS);
+ int orig_length() const { return _orig_length; }
+--- ./hotspot/src/share/vm/oops/instanceKlass.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/oops/instanceKlass.cpp Wed May 07 19:26:16 2014 -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
+@@ -1901,6 +1901,17 @@
+ FreeHeap(jmeths);
+ }
+
++ // Deallocate MemberNameTable
++ {
++ Mutex* lock_or_null = SafepointSynchronize::is_at_safepoint() ? NULL : MemberNameTable_lock;
++ MutexLockerEx ml(lock_or_null, Mutex::_no_safepoint_check_flag);
++ MemberNameTable* mnt = member_names();
++ if (mnt != NULL) {
++ delete mnt;
++ set_member_names(NULL);
++ }
++ }
++
+ int* indices = methods_cached_itable_indices_acquire();
+ if (indices != (int*)NULL) {
+ release_set_methods_cached_itable_indices(NULL);
+@@ -2333,6 +2344,30 @@
+ return NULL;
+ }
+
++void instanceKlass::add_member_name(int index, Handle mem_name) {
++ jweak mem_name_wref = JNIHandles::make_weak_global(mem_name);
++ MutexLocker ml(MemberNameTable_lock);
++ assert(0 <= index && index < idnum_allocated_count(), "index is out of bounds");
++ DEBUG_ONLY(No_Safepoint_Verifier nsv);
++
++ if (_member_names == NULL) {
++ _member_names = new (ResourceObj::C_HEAP, mtClass) MemberNameTable(idnum_allocated_count());
++ }
++ _member_names->add_member_name(index, mem_name_wref);
++}
++
++oop instanceKlass::get_member_name(int index) {
++ MutexLocker ml(MemberNameTable_lock);
++ assert(0 <= index && index < idnum_allocated_count(), "index is out of bounds");
++ DEBUG_ONLY(No_Safepoint_Verifier nsv);
++
++ if (_member_names == NULL) {
++ return NULL;
++ }
++ oop mem_name =_member_names->get_member_name(index);
++ return mem_name;
++}
++
+ // -----------------------------------------------------------------------------------------------------
+ #ifndef PRODUCT
+
+--- ./hotspot/src/share/vm/oops/instanceKlass.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/oops/instanceKlass.hpp Wed May 07 19:26:16 2014 -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
+@@ -94,6 +94,7 @@
+ class nmethodBucket;
+ class PreviousVersionNode;
+ class JvmtiCachedClassFieldMap;
++class MemberNameTable;
+
+ // This is used in iterators below.
+ class FieldClosure: public StackObj {
+@@ -265,6 +266,7 @@
+ int _vtable_len; // length of Java vtable (in words)
+ int _itable_len; // length of Java itable (in words)
+ OopMapCache* volatile _oop_map_cache; // OopMapCache for all methods in the klass (allocated lazily)
++ MemberNameTable* _member_names; // Member names
+ JNIid* _jni_ids; // First JNI identifier for static fields in this class
+ jmethodID* _methods_jmethod_ids; // jmethodIDs corresponding to method_idnum, or NULL if none
+ int* _methods_cached_itable_indices; // itable_index cache for JNI invoke corresponding to methods idnum, or NULL
+@@ -972,6 +974,12 @@
+ // jvm support
+ jint compute_modifier_flags(TRAPS) const;
+
++ // JSR-292 support
++ MemberNameTable* member_names() { return _member_names; }
++ void set_member_names(MemberNameTable* member_names) { _member_names = member_names; }
++ void add_member_name(int index, Handle member_name);
++ oop get_member_name(int index);
++
+ public:
+ // JVMTI support
+ jint jvmti_class_status() const;
+--- ./hotspot/src/share/vm/opto/bytecodeInfo.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/bytecodeInfo.cpp Wed May 07 19:26:16 2014 -0700
+@@ -103,7 +103,7 @@
+ // Allows targeted inlining
+ if(callee_method->should_inline()) {
+ *wci_result = *(WarmCallInfo::always_hot());
+- if (PrintInlining && Verbose) {
++ if (C->print_inlining() && Verbose) {
+ CompileTask::print_inline_indent(inline_level());
+ tty->print_cr("Inlined method is hot: ");
+ }
+@@ -117,7 +117,7 @@
+ if(callee_method->interpreter_throwout_count() > InlineThrowCount &&
+ size < InlineThrowMaxSize ) {
+ wci_result->set_profit(wci_result->profit() * 100);
+- if (PrintInlining && Verbose) {
++ if (C->print_inlining() && Verbose) {
+ CompileTask::print_inline_indent(inline_level());
+ tty->print_cr("Inlined method with many throws (throws=%d):", callee_method->interpreter_throwout_count());
+ }
+@@ -468,7 +468,7 @@
+ C->log()->inline_fail(inline_msg);
+ }
+ }
+- if (PrintInlining) {
++ if (C->print_inlining()) {
+ C->print_inlining(callee_method, inline_level(), caller_bci, inline_msg);
+ if (callee_method == NULL) tty->print(" callee not monotonic or profiled");
+ if (Verbose && callee_method) {
+@@ -517,7 +517,7 @@
+
+ #ifndef PRODUCT
+ if (UseOldInlining && InlineWarmCalls
+- && (PrintOpto || PrintOptoInlining || PrintInlining)) {
++ && (PrintOpto || C->print_inlining())) {
+ bool cold = wci.is_cold();
+ bool hot = !cold && wci.is_hot();
+ bool old_cold = !success;
+@@ -594,7 +594,7 @@
+ callee_method->is_compiled_lambda_form()) {
+ max_inline_level_adjust += 1; // don't count method handle calls from java.lang.invoke implem
+ }
+- if (max_inline_level_adjust != 0 && PrintInlining && (Verbose || WizardMode)) {
++ if (max_inline_level_adjust != 0 && C->print_inlining() && (Verbose || WizardMode)) {
+ CompileTask::print_inline_indent(inline_level());
+ tty->print_cr(" \\-> discounting inline depth");
+ }
+--- ./hotspot/src/share/vm/opto/c2_globals.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/c2_globals.hpp Wed May 07 19:26:16 2014 -0700
+@@ -173,6 +173,9 @@
+ product_pd(intx, LoopUnrollLimit, \
+ "Unroll loop bodies with node count less than this") \
+ \
++ product(intx, LoopMaxUnroll, 16, \
++ "Maximum number of unrolls for main loop") \
++ \
+ product(intx, LoopUnrollMin, 4, \
+ "Minimum number of unroll loop bodies before checking progress" \
+ "of rounds of unroll,optimize,..") \
+--- ./hotspot/src/share/vm/opto/callGenerator.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/callGenerator.hpp Wed May 07 19:26:16 2014 -0700
+@@ -158,8 +158,9 @@
+ virtual void print_inlining_late(const char* msg) { ShouldNotReachHere(); }
+
+ static void print_inlining(Compile* C, ciMethod* callee, int inline_level, int bci, const char* msg) {
+- if (PrintInlining)
++ if (C->print_inlining()) {
+ C->print_inlining(callee, inline_level, bci, msg);
++ }
+ }
+ };
+
+--- ./hotspot/src/share/vm/opto/coalesce.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/coalesce.cpp Wed May 07 19:26:16 2014 -0700
+@@ -135,20 +135,26 @@
+ // After cloning some rematerialized instruction, clone any MachProj's that
+ // follow it. Example: Intel zero is XOR, kills flags. Sparc FP constants
+ // use G3 as an address temp.
+-int PhaseChaitin::clone_projs( Block *b, uint idx, Node *con, Node *copy, uint &maxlrg ) {
+- Block *bcon = _cfg._bbs[con->_idx];
+- uint cindex = bcon->find_node(con);
+- Node *con_next = bcon->_nodes[cindex+1];
+- if( con_next->in(0) != con || !con_next->is_MachProj() )
+- return false; // No MachProj's follow
+-
+- // Copy kills after the cloned constant
+- Node *kills = con_next->clone();
+- kills->set_req( 0, copy );
+- b->_nodes.insert( idx, kills );
+- _cfg._bbs.map( kills->_idx, b );
+- new_lrg( kills, maxlrg++ );
+- return true;
++int PhaseChaitin::clone_projs(Block* b, uint idx, Node* orig, Node* copy, uint& max_lrg_id) {
++ assert(b->find_node(copy) == (idx - 1), "incorrect insert index for copy kill projections");
++ DEBUG_ONLY( Block* borig = _cfg._bbs[orig->_idx]; )
++ int found_projs = 0;
++ uint cnt = orig->outcnt();
++ for (uint i = 0; i < cnt; i++) {
++ Node* proj = orig->raw_out(i);
++ if (proj->is_MachProj()) {
++ assert(proj->outcnt() == 0, "only kill projections are expected here");
++ assert(_cfg._bbs[proj->_idx] == borig, "incorrect block for kill projections");
++ found_projs++;
++ // Copy kill projections after the cloned node
++ Node* kills = proj->clone();
++ kills->set_req(0, copy);
++ b->_nodes.insert(idx++, kills);
++ _cfg._bbs.map(kills->_idx, b);
++ new_lrg(kills, max_lrg_id++);
++ }
++ }
++ return found_projs;
+ }
+
+ //------------------------------compact----------------------------------------
+@@ -464,8 +470,7 @@
+ copy = m->clone();
+ // Insert the copy in the basic block, just before us
+ b->_nodes.insert( l++, copy );
+- if( _phc.clone_projs( b, l, m, copy, _phc._maxlrg ) )
+- l++;
++ l += _phc.clone_projs(b, l, m, copy, _phc._maxlrg);
+ } else {
+ const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
+ copy = new (C) MachSpillCopyNode( m, *rm, *rm );
+--- ./hotspot/src/share/vm/opto/compile.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/compile.cpp Wed May 07 19:26:16 2014 -0700
+@@ -642,7 +642,7 @@
+ _inlining_progress(false),
+ _inlining_incrementally(false),
+ _print_inlining_list(NULL),
+- _print_inlining(0) {
++ _print_inlining_idx(0) {
+ C = this;
+
+ CompileWrapper cw(this);
+@@ -667,6 +667,8 @@
+ set_print_assembly(print_opto_assembly);
+ set_parsed_irreducible_loop(false);
+ #endif
++ set_print_inlining(PrintInlining || method()->has_option("PrintInlining") NOT_PRODUCT( || PrintOptoInlining));
++ set_print_intrinsics(PrintIntrinsics || method()->has_option("PrintIntrinsics"));
+
+ if (ProfileTraps) {
+ // Make sure the method being compiled gets its own MDO,
+@@ -698,7 +700,7 @@
+ PhaseGVN gvn(node_arena(), estimated_size);
+ set_initial_gvn(&gvn);
+
+- if (PrintInlining || PrintIntrinsics NOT_PRODUCT( || PrintOptoInlining)) {
++ if (print_inlining() || print_intrinsics()) {
+ _print_inlining_list = new (comp_arena())GrowableArray<PrintInliningBuffer>(comp_arena(), 1, 1, PrintInliningBuffer());
+ }
+ { // Scope for timing the parser
+@@ -832,6 +834,7 @@
+ }
+ #endif
+
++ NOT_PRODUCT( verify_barriers(); )
+ // Now that we know the size of all the monitors we can add a fixed slot
+ // for the original deopt pc.
+
+@@ -924,7 +927,7 @@
+ _inlining_progress(false),
+ _inlining_incrementally(false),
+ _print_inlining_list(NULL),
+- _print_inlining(0) {
++ _print_inlining_idx(0) {
+ C = this;
+
+ #ifndef PRODUCT
+@@ -3237,6 +3240,72 @@
+ }
+ }
+ }
++
++// Verify GC barriers consistency
++// Currently supported:
++// - G1 pre-barriers (see GraphKit::g1_write_barrier_pre())
++void Compile::verify_barriers() {
++ if (UseG1GC) {
++ // Verify G1 pre-barriers
++ const int marking_offset = in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_active());
++
++ ResourceArea *area = Thread::current()->resource_area();
++ Unique_Node_List visited(area);
++ Node_List worklist(area);
++ // We're going to walk control flow backwards starting from the Root
++ worklist.push(_root);
++ while (worklist.size() > 0) {
++ Node* x = worklist.pop();
++ if (x == NULL || x == top()) continue;
++ if (visited.member(x)) {
++ continue;
++ } else {
++ visited.push(x);
++ }
++
++ if (x->is_Region()) {
++ for (uint i = 1; i < x->req(); i++) {
++ worklist.push(x->in(i));
++ }
++ } else {
++ worklist.push(x->in(0));
++ // We are looking for the pattern:
++ // /->ThreadLocal
++ // If->Bool->CmpI->LoadB->AddP->ConL(marking_offset)
++ // \->ConI(0)
++ // We want to verify that the If and the LoadB have the same control
++ // See GraphKit::g1_write_barrier_pre()
++ if (x->is_If()) {
++ IfNode *iff = x->as_If();
++ if (iff->in(1)->is_Bool() && iff->in(1)->in(1)->is_Cmp()) {
++ CmpNode *cmp = iff->in(1)->in(1)->as_Cmp();
++ if (cmp->Opcode() == Op_CmpI && cmp->in(2)->is_Con() && cmp->in(2)->bottom_type()->is_int()->get_con() == 0
++ && cmp->in(1)->is_Load()) {
++ LoadNode* load = cmp->in(1)->as_Load();
++ if (load->Opcode() == Op_LoadB && load->in(2)->is_AddP() && load->in(2)->in(2)->Opcode() == Op_ThreadLocal
++ && load->in(2)->in(3)->is_Con()
++ && load->in(2)->in(3)->bottom_type()->is_intptr_t()->get_con() == marking_offset) {
++
++ Node* if_ctrl = iff->in(0);
++ Node* load_ctrl = load->in(0);
++
++ if (if_ctrl != load_ctrl) {
++ // Skip possible CProj->NeverBranch in infinite loops
++ if ((if_ctrl->is_Proj() && if_ctrl->Opcode() == Op_CProj)
++ && (if_ctrl->in(0)->is_MultiBranch() && if_ctrl->in(0)->Opcode() == Op_NeverBranch)) {
++ if_ctrl = if_ctrl->in(0)->in(0);
++ }
++ }
++ assert(load_ctrl != NULL && if_ctrl == load_ctrl, "controls must match");
++ }
++ }
++ }
++ }
++ }
++ }
++ }
++}
++
+ #endif
+
+ // The Compile object keeps track of failure reasons separately from the ciEnv.
+@@ -3510,7 +3579,7 @@
+ }
+
+ void Compile::dump_inlining() {
+- if (PrintInlining || PrintIntrinsics NOT_PRODUCT( || PrintOptoInlining)) {
++ if (print_inlining() || print_intrinsics()) {
+ // Print inlining message for candidates that we couldn't inline
+ // for lack of space or non constant receiver
+ for (int i = 0; i < _late_inlines.length(); i++) {
+@@ -3534,7 +3603,7 @@
+ }
+ }
+ for (int i = 0; i < _print_inlining_list->length(); i++) {
+- tty->print(_print_inlining_list->at(i).ss()->as_string());
++ tty->print(_print_inlining_list->adr_at(i)->ss()->as_string());
+ }
+ }
+ }
+--- ./hotspot/src/share/vm/opto/compile.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/compile.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -42,6 +42,7 @@
+ #include "runtime/deoptimization.hpp"
+ #include "runtime/vmThread.hpp"
+ #include "trace/tracing.hpp"
++#include "utilities/ticks.hpp"
+
+ class Block;
+ class Bundle;
+@@ -284,6 +285,8 @@
+ bool _do_method_data_update; // True if we generate code to update methodDataOops
+ int _AliasLevel; // Locally-adjusted version of AliasLevel flag.
+ bool _print_assembly; // True if we should dump assembly code for this compilation
++ bool _print_inlining; // True if we should print inlining for this compilation
++ bool _print_intrinsics; // True if we should print intrinsics for this compilation
+ #ifndef PRODUCT
+ bool _trace_opto_output;
+ bool _parsed_irreducible_loop; // True if ciTypeFlow detected irreducible loops during parsing
+@@ -384,7 +387,7 @@
+ };
+
+ GrowableArray<PrintInliningBuffer>* _print_inlining_list;
+- int _print_inlining;
++ int _print_inlining_idx;
+
+ // Only keep nodes in the expensive node list that need to be optimized
+ void cleanup_expensive_nodes(PhaseIterGVN &igvn);
+@@ -396,24 +399,24 @@
+ public:
+
+ outputStream* print_inlining_stream() const {
+- return _print_inlining_list->at(_print_inlining).ss();
++ return _print_inlining_list->adr_at(_print_inlining_idx)->ss();
+ }
+
+ void print_inlining_skip(CallGenerator* cg) {
+- if (PrintInlining) {
+- _print_inlining_list->at(_print_inlining).set_cg(cg);
+- _print_inlining++;
+- _print_inlining_list->insert_before(_print_inlining, PrintInliningBuffer());
++ if (_print_inlining) {
++ _print_inlining_list->adr_at(_print_inlining_idx)->set_cg(cg);
++ _print_inlining_idx++;
++ _print_inlining_list->insert_before(_print_inlining_idx, PrintInliningBuffer());
+ }
+ }
+
+ void print_inlining_insert(CallGenerator* cg) {
+- if (PrintInlining) {
++ if (_print_inlining) {
+ for (int i = 0; i < _print_inlining_list->length(); i++) {
+- if (_print_inlining_list->at(i).cg() == cg) {
++ if (_print_inlining_list->adr_at(i)->cg() == cg) {
+ _print_inlining_list->insert_before(i+1, PrintInliningBuffer());
+- _print_inlining = i+1;
+- _print_inlining_list->at(i).set_cg(NULL);
++ _print_inlining_idx = i+1;
++ _print_inlining_list->adr_at(i)->set_cg(NULL);
+ return;
+ }
+ }
+@@ -536,6 +539,10 @@
+ int AliasLevel() const { return _AliasLevel; }
+ bool print_assembly() const { return _print_assembly; }
+ void set_print_assembly(bool z) { _print_assembly = z; }
++ bool print_inlining() const { return _print_inlining; }
++ void set_print_inlining(bool z) { _print_inlining = z; }
++ bool print_intrinsics() const { return _print_intrinsics; }
++ void set_print_intrinsics(bool z) { _print_intrinsics = z; }
+ // check the CompilerOracle for special behaviours for this compile
+ bool method_has_option(const char * option) {
+ return method() != NULL && method()->has_option(option);
+@@ -550,20 +557,19 @@
+ bool has_method_handle_invokes() const { return _has_method_handle_invokes; }
+ void set_has_method_handle_invokes(bool z) { _has_method_handle_invokes = z; }
+
+- jlong _latest_stage_start_counter;
++ Ticks _latest_stage_start_counter;
+
+ void begin_method() {
+ #ifndef PRODUCT
+ if (_printer) _printer->begin_method(this);
+ #endif
+- C->_latest_stage_start_counter = os::elapsed_counter();
++ C->_latest_stage_start_counter.stamp();
+ }
+
+ void print_method(CompilerPhaseType cpt, int level = 1) {
+- EventCompilerPhase event(UNTIMED);
++ EventCompilerPhase event;
+ if (event.should_commit()) {
+ event.set_starttime(C->_latest_stage_start_counter);
+- event.set_endtime(os::elapsed_counter());
+ event.set_phase((u1) cpt);
+ event.set_compileID(C->_compile_id);
+ event.set_phaseLevel(level);
+@@ -574,14 +580,13 @@
+ #ifndef PRODUCT
+ if (_printer) _printer->print_method(this, CompilerPhaseTypeHelper::to_string(cpt), level);
+ #endif
+- C->_latest_stage_start_counter = os::elapsed_counter();
++ C->_latest_stage_start_counter.stamp();
+ }
+
+ void end_method(int level = 1) {
+- EventCompilerPhase event(UNTIMED);
++ EventCompilerPhase event;
+ if (event.should_commit()) {
+ event.set_starttime(C->_latest_stage_start_counter);
+- event.set_endtime(os::elapsed_counter());
+ event.set_phase((u1) PHASE_END);
+ event.set_compileID(C->_compile_id);
+ event.set_phaseLevel(level);
+@@ -1091,6 +1096,9 @@
+ // Print bytecodes, including the scope inlining tree
+ void print_codes();
+
++ // Verify GC barrier patterns
++ void verify_barriers() PRODUCT_RETURN;
++
+ // End-of-run dumps.
+ static void print_statistics() PRODUCT_RETURN;
+
+--- ./hotspot/src/share/vm/opto/doCall.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/doCall.cpp Wed May 07 19:26:16 2014 -0700
+@@ -42,9 +42,9 @@
+ #include "runtime/sharedRuntime.hpp"
+
+ void trace_type_profile(Compile* C, ciMethod *method, int depth, int bci, ciMethod *prof_method, ciKlass *prof_klass, int site_count, int receiver_count) {
+- if (TraceTypeProfile || PrintInlining NOT_PRODUCT(|| PrintOptoInlining)) {
++ if (TraceTypeProfile || C->print_inlining()) {
+ outputStream* out = tty;
+- if (!PrintInlining) {
++ if (!C->print_inlining()) {
+ if (NOT_PRODUCT(!PrintOpto &&) !PrintCompilation) {
+ method->print_short_name();
+ tty->cr();
+--- ./hotspot/src/share/vm/opto/graphKit.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/graphKit.cpp Wed May 07 19:26:16 2014 -0700
+@@ -3596,7 +3596,7 @@
+ Node* marking = __ load(__ ctrl(), marking_adr, TypeInt::INT, active_type, Compile::AliasIdxRaw);
+
+ // if (!marking)
+- __ if_then(marking, BoolTest::ne, zero); {
++ __ if_then(marking, BoolTest::ne, zero, unlikely); {
+ BasicType index_bt = TypeX_X->basic_type();
+ assert(sizeof(size_t) == type2aelembytes(index_bt), "Loading G1 PtrQueue::_index with wrong size.");
+ Node* index = __ load(__ ctrl(), index_adr, TypeX_X, index_bt, Compile::AliasIdxRaw);
+@@ -3604,7 +3604,7 @@
+ if (do_load) {
+ // load original value
+ // alias_idx correct??
+- pre_val = __ load(no_ctrl, adr, val_type, bt, alias_idx);
++ pre_val = __ load(__ ctrl(), adr, val_type, bt, alias_idx);
+ }
+
+ // if (pre_val != NULL)
+@@ -3701,7 +3701,8 @@
+ Node* no_base = __ top();
+ float likely = PROB_LIKELY(0.999);
+ float unlikely = PROB_UNLIKELY(0.999);
+- Node* zero = __ ConI(0);
++ Node* young_card = __ ConI((jint)G1SATBCardTableModRefBS::g1_young_card_val());
++ Node* dirty_card = __ ConI((jint)CardTableModRefBS::dirty_card_val());
+ Node* zeroX = __ ConX(0);
+
+ // Get the alias_index for raw card-mark memory
+@@ -3757,8 +3758,16 @@
+ // load the original value of the card
+ Node* card_val = __ load(__ ctrl(), card_adr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw);
+
+- __ if_then(card_val, BoolTest::ne, zero); {
+- g1_mark_card(ideal, card_adr, oop_store, alias_idx, index, index_adr, buffer, tf);
++ __ if_then(card_val, BoolTest::ne, young_card); {
++ sync_kit(ideal);
++ // Use Op_MemBarVolatile to achieve the effect of a StoreLoad barrier.
++ insert_mem_bar(Op_MemBarVolatile, oop_store);
++ __ sync_kit(this);
++
++ Node* card_val_reload = __ load(__ ctrl(), card_adr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw);
++ __ if_then(card_val_reload, BoolTest::ne, dirty_card); {
++ g1_mark_card(ideal, card_adr, oop_store, alias_idx, index, index_adr, buffer, tf);
++ } __ end_if();
+ } __ end_if();
+ } __ end_if();
+ } __ end_if();
+--- ./hotspot/src/share/vm/opto/library_call.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/library_call.cpp Wed May 07 19:26:16 2014 -0700
+@@ -525,7 +525,7 @@
+ Compile* C = kit.C;
+ int nodes = C->unique();
+ #ifndef PRODUCT
+- if ((PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) && Verbose) {
++ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
+ char buf[1000];
+ const char* str = vmIntrinsics::short_name_as_C_string(intrinsic_id(), buf, sizeof(buf));
+ tty->print_cr("Intrinsic %s", str);
+@@ -536,7 +536,7 @@
+
+ // Try to inline the intrinsic.
+ if (kit.try_to_inline()) {
+- if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
++ if (C->print_intrinsics() || C->print_inlining()) {
+ C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)");
+ }
+ C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
+@@ -552,7 +552,7 @@
+ }
+
+ // The intrinsic bailed out
+- if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
++ if (C->print_intrinsics() || C->print_inlining()) {
+ if (jvms->has_method()) {
+ // Not a root compile.
+ const char* msg = is_virtual() ? "failed to inline (intrinsic, virtual)" : "failed to inline (intrinsic)";
+@@ -574,7 +574,7 @@
+ int nodes = C->unique();
+ #ifndef PRODUCT
+ assert(is_predicted(), "sanity");
+- if ((PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) && Verbose) {
++ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
+ char buf[1000];
+ const char* str = vmIntrinsics::short_name_as_C_string(intrinsic_id(), buf, sizeof(buf));
+ tty->print_cr("Predicate for intrinsic %s", str);
+@@ -585,7 +585,7 @@
+
+ Node* slow_ctl = kit.try_to_predicate();
+ if (!kit.failing()) {
+- if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
++ if (C->print_intrinsics() || C->print_inlining()) {
+ C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)");
+ }
+ C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
+@@ -599,7 +599,7 @@
+ }
+
+ // The intrinsic bailed out
+- if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
++ if (C->print_intrinsics() || C->print_inlining()) {
+ if (jvms->has_method()) {
+ // Not a root compile.
+ const char* msg = "failed to generate predicate for intrinsic";
+@@ -2262,7 +2262,7 @@
+ const TypeOopPtr* tjp = TypeOopPtr::make_from_klass(sharpened_klass);
+
+ #ifndef PRODUCT
+- if (PrintIntrinsics || PrintInlining || PrintOptoInlining) {
++ if (C->print_intrinsics() || C->print_inlining()) {
+ tty->print(" from base type: "); adr_type->dump();
+ tty->print(" sharpened value: "); tjp->dump();
+ }
+@@ -3158,7 +3158,7 @@
+ if (mirror_con == NULL) return false; // cannot happen?
+
+ #ifndef PRODUCT
+- if (PrintIntrinsics || PrintInlining || PrintOptoInlining) {
++ if (C->print_intrinsics() || C->print_inlining()) {
+ ciType* k = mirror_con->java_mirror_type();
+ if (k) {
+ tty->print("Inlining %s on constant Class ", vmIntrinsics::name_at(intrinsic_id()));
+@@ -3846,7 +3846,7 @@
+ // Method.invoke() and auxiliary frames.
+ bool LibraryCallKit::inline_native_Reflection_getCallerClass() {
+ #ifndef PRODUCT
+- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
++ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
+ tty->print_cr("Attempting to inline sun.reflect.Reflection.getCallerClass");
+ }
+ #endif
+@@ -3858,7 +3858,7 @@
+ const TypeInt* caller_depth_type = _gvn.type(caller_depth_node)->isa_int();
+ if (caller_depth_type == NULL || !caller_depth_type->is_con()) {
+ #ifndef PRODUCT
+- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
++ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
+ tty->print_cr(" Bailing out because caller depth was not a constant");
+ }
+ #endif
+@@ -3873,7 +3873,7 @@
+ int caller_depth = caller_depth_type->get_con() - 1;
+ if (caller_depth < 0) {
+ #ifndef PRODUCT
+- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
++ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
+ tty->print_cr(" Bailing out because caller depth was %d", caller_depth);
+ }
+ #endif
+@@ -3882,7 +3882,7 @@
+
+ if (!jvms()->has_method()) {
+ #ifndef PRODUCT
+- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
++ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
+ tty->print_cr(" Bailing out because intrinsic was inlined at top level");
+ }
+ #endif
+@@ -3919,7 +3919,7 @@
+
+ if (inlining_depth == 0) {
+ #ifndef PRODUCT
+- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
++ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
+ tty->print_cr(" Bailing out because caller depth (%d) exceeded inlining depth (%d)", caller_depth_type->get_con(), _depth);
+ tty->print_cr(" JVM state at this point:");
+ for (int i = _depth; i >= 1; i--) {
+@@ -3939,7 +3939,7 @@
+ set_result(makecon(TypeInstPtr::make(caller_mirror)));
+
+ #ifndef PRODUCT
+- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
++ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
+ tty->print_cr(" Succeeded: caller = %s.%s, caller depth = %d, depth = %d", caller_klass->name()->as_utf8(), caller_jvms->method()->name()->as_utf8(), caller_depth_type->get_con(), _depth);
+ tty->print_cr(" JVM state at this point:");
+ for (int i = _depth; i >= 1; i--) {
+--- ./hotspot/src/share/vm/opto/loopTransform.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/loopTransform.cpp Wed May 07 19:26:16 2014 -0700
+@@ -623,8 +623,6 @@
+ }
+
+
+-#define MAX_UNROLL 16 // maximum number of unrolls for main loop
+-
+ //------------------------------policy_unroll----------------------------------
+ // Return TRUE or FALSE if the loop should be unrolled or not. Unroll if
+ // the loop is a CountedLoop and the body is small enough.
+@@ -641,7 +639,7 @@
+ if (cl->trip_count() <= (uint)(cl->is_normal_loop() ? 2 : 1)) return false;
+
+ int future_unroll_ct = cl->unrolled_count() * 2;
+- if (future_unroll_ct > MAX_UNROLL) return false;
++ if (future_unroll_ct > LoopMaxUnroll) return false;
+
+ // Check for initial stride being a small enough constant
+ if (abs(cl->stride_con()) > (1<<2)*future_unroll_ct) return false;
+@@ -1956,7 +1954,7 @@
+ // Find loads off the surviving projection; remove their control edge
+ for (DUIterator_Fast imax, i = dp->fast_outs(imax); i < imax; i++) {
+ Node* cd = dp->fast_out(i); // Control-dependent node
+- if( cd->is_Load() ) { // Loads can now float around in the loop
++ if (cd->is_Load() && cd->depends_only_on_test()) { // Loads can now float around in the loop
+ // Allow the load to float around in the loop, or before it
+ // but NOT before the pre-loop.
+ _igvn.replace_input_of(cd, 0, ctrl); // ctrl, not NULL
+--- ./hotspot/src/share/vm/opto/memnode.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/memnode.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1957,6 +1957,11 @@
+ if (t != NULL) {
+ // constant oop => constant klass
+ if (offset == java_lang_Class::array_klass_offset_in_bytes()) {
++ if (t->is_void()) {
++ // We cannot create a void array. Since void is a primitive type return null
++ // klass. Users of this result need to do a null check on the returned klass.
++ return TypePtr::NULL_PTR;
++ }
+ return TypeKlassPtr::make(ciArrayKlass::make(t));
+ }
+ if (!t->is_klass()) {
+--- ./hotspot/src/share/vm/opto/memnode.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/memnode.hpp Wed May 07 19:26:16 2014 -0700
+@@ -204,6 +204,17 @@
+ protected:
+ const Type* load_array_final_field(const TypeKlassPtr *tkls,
+ ciKlass* klass) const;
++ // depends_only_on_test is almost always true, and needs to be almost always
++ // true to enable key hoisting & commoning optimizations. However, for the
++ // special case of RawPtr loads from TLS top & end, and other loads performed by
++ // GC barriers, the control edge carries the dependence preventing hoisting past
++ // a Safepoint instead of the memory edge. (An unfortunate consequence of having
++ // Safepoints not set Raw Memory; itself an unfortunate consequence of having Nodes
++ // which produce results (new raw memory state) inside of loops preventing all
++ // manner of other optimizations). Basically, it's ugly but so is the alternative.
++ // See comment in macro.cpp, around line 125 expand_allocate_common().
++ virtual bool depends_only_on_test() const { return adr_type() != TypeRawPtr::BOTTOM; }
++
+ };
+
+ //------------------------------LoadBNode--------------------------------------
+@@ -370,16 +381,6 @@
+ virtual uint ideal_reg() const { return Op_RegP; }
+ virtual int store_Opcode() const { return Op_StoreP; }
+ virtual BasicType memory_type() const { return T_ADDRESS; }
+- // depends_only_on_test is almost always true, and needs to be almost always
+- // true to enable key hoisting & commoning optimizations. However, for the
+- // special case of RawPtr loads from TLS top & end, the control edge carries
+- // the dependence preventing hoisting past a Safepoint instead of the memory
+- // edge. (An unfortunate consequence of having Safepoints not set Raw
+- // Memory; itself an unfortunate consequence of having Nodes which produce
+- // results (new raw memory state) inside of loops preventing all manner of
+- // other optimizations). Basically, it's ugly but so is the alternative.
+- // See comment in macro.cpp, around line 125 expand_allocate_common().
+- virtual bool depends_only_on_test() const { return adr_type() != TypeRawPtr::BOTTOM; }
+ };
+
+
+@@ -393,16 +394,6 @@
+ virtual uint ideal_reg() const { return Op_RegN; }
+ virtual int store_Opcode() const { return Op_StoreN; }
+ virtual BasicType memory_type() const { return T_NARROWOOP; }
+- // depends_only_on_test is almost always true, and needs to be almost always
+- // true to enable key hoisting & commoning optimizations. However, for the
+- // special case of RawPtr loads from TLS top & end, the control edge carries
+- // the dependence preventing hoisting past a Safepoint instead of the memory
+- // edge. (An unfortunate consequence of having Safepoints not set Raw
+- // Memory; itself an unfortunate consequence of having Nodes which produce
+- // results (new raw memory state) inside of loops preventing all manner of
+- // other optimizations). Basically, it's ugly but so is the alternative.
+- // See comment in macro.cpp, around line 125 expand_allocate_common().
+- virtual bool depends_only_on_test() const { return adr_type() != TypeRawPtr::BOTTOM; }
+ };
+
+ //------------------------------LoadKlassNode----------------------------------
+--- ./hotspot/src/share/vm/opto/reg_split.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/opto/reg_split.cpp Wed May 07 19:26:16 2014 -0700
+@@ -391,10 +391,15 @@
+ #endif
+ // See if the cloned def kills any flags, and copy those kills as well
+ uint i = insidx+1;
+- if( clone_projs( b, i, def, spill, maxlrg ) ) {
++ int found_projs = clone_projs(b, i, def, spill, maxlrg);
++ if (found_projs > 0) {
+ // Adjust the point where we go hi-pressure
+- if( i <= b->_ihrp_index ) b->_ihrp_index++;
+- if( i <= b->_fhrp_index ) b->_fhrp_index++;
++ if (i <= b->_ihrp_index) {
++ b->_ihrp_index += found_projs;
++ }
++ if (i <= b->_fhrp_index) {
++ b->_fhrp_index += found_projs;
++ }
+ }
+
+ return spill;
+--- ./hotspot/src/share/vm/prims/jni.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/prims/jni.cpp Wed May 07 19:26:16 2014 -0700
+@@ -5042,14 +5042,22 @@
+ tty->print_cr("Running test: " #unit_test_function_call); \
+ unit_test_function_call
+
++// Forward declaration
++void TestReservedSpace_test();
++void TestReserveMemorySpecial_test();
++void TestOldFreeSpaceCalculation_test();
++
+ void execute_internal_vm_tests() {
+ if (ExecuteInternalVMTests) {
+ tty->print_cr("Running internal VM tests");
++ run_unit_test(TestReservedSpace_test());
++ run_unit_test(TestReserveMemorySpecial_test());
+ run_unit_test(GCTimerAllTest::all());
+ run_unit_test(arrayOopDesc::test_max_array_length());
+ run_unit_test(CollectedHeap::test_is_in());
+ run_unit_test(QuickSort::test_quick_sort());
+ run_unit_test(AltHashing::test_alt_hash());
++ run_unit_test(TestOldFreeSpaceCalculation_test());
+ tty->print_cr("All internal VM tests passed");
+ }
+ }
+--- ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Wed May 07 19:26:16 2014 -0700
+@@ -204,7 +204,7 @@
+
+ write_attribute_name_index("Code");
+ write_u4(size);
+- write_u2(method->max_stack());
++ write_u2(method->verifier_max_stack());
+ write_u2(method->max_locals());
+ write_u4(code_size);
+ copy_bytecodes(method, (unsigned char*)writeable_address(code_size));
+--- ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2013, 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
+@@ -35,6 +35,7 @@
+ #include "prims/jvmtiImpl.hpp"
+ #include "prims/jvmtiRedefineClasses.hpp"
+ #include "prims/methodComparator.hpp"
++#include "prims/methodHandles.hpp"
+ #include "runtime/deoptimization.hpp"
+ #include "runtime/relocator.hpp"
+ #include "utilities/bitMap.inline.hpp"
+@@ -262,76 +263,23 @@
+ case JVM_CONSTANT_NameAndType:
+ {
+ int name_ref_i = scratch_cp->name_ref_index_at(scratch_i);
+- int new_name_ref_i = 0;
+- bool match = (name_ref_i < *merge_cp_length_p) &&
+- scratch_cp->compare_entry_to(name_ref_i, *merge_cp_p, name_ref_i,
+- THREAD);
+- if (!match) {
+- // forward reference in *merge_cp_p or not a direct match
+-
+- int found_i = scratch_cp->find_matching_entry(name_ref_i, *merge_cp_p,
+- THREAD);
+- if (found_i != 0) {
+- guarantee(found_i != name_ref_i,
+- "compare_entry_to() and find_matching_entry() do not agree");
+-
+- // Found a matching entry somewhere else in *merge_cp_p so
+- // just need a mapping entry.
+- new_name_ref_i = found_i;
+- map_index(scratch_cp, name_ref_i, found_i);
+- } else {
+- // no match found so we have to append this entry to *merge_cp_p
+- append_entry(scratch_cp, name_ref_i, merge_cp_p, merge_cp_length_p,
+- THREAD);
+- // The above call to append_entry() can only append one entry
+- // so the post call query of *merge_cp_length_p is only for
+- // the sake of consistency.
+- new_name_ref_i = *merge_cp_length_p - 1;
+- }
+- }
++ int new_name_ref_i = find_or_append_indirect_entry(scratch_cp, name_ref_i, merge_cp_p,
++ merge_cp_length_p, THREAD);
+
+ int signature_ref_i = scratch_cp->signature_ref_index_at(scratch_i);
+- int new_signature_ref_i = 0;
+- match = (signature_ref_i < *merge_cp_length_p) &&
+- scratch_cp->compare_entry_to(signature_ref_i, *merge_cp_p,
+- signature_ref_i, THREAD);
+- if (!match) {
+- // forward reference in *merge_cp_p or not a direct match
+-
+- int found_i = scratch_cp->find_matching_entry(signature_ref_i,
+- *merge_cp_p, THREAD);
+- if (found_i != 0) {
+- guarantee(found_i != signature_ref_i,
+- "compare_entry_to() and find_matching_entry() do not agree");
+-
+- // Found a matching entry somewhere else in *merge_cp_p so
+- // just need a mapping entry.
+- new_signature_ref_i = found_i;
+- map_index(scratch_cp, signature_ref_i, found_i);
+- } else {
+- // no match found so we have to append this entry to *merge_cp_p
+- append_entry(scratch_cp, signature_ref_i, merge_cp_p,
+- merge_cp_length_p, THREAD);
+- // The above call to append_entry() can only append one entry
+- // so the post call query of *merge_cp_length_p is only for
+- // the sake of consistency.
+- new_signature_ref_i = *merge_cp_length_p - 1;
+- }
+- }
++ int new_signature_ref_i = find_or_append_indirect_entry(scratch_cp, signature_ref_i,
++ merge_cp_p, merge_cp_length_p,
++ THREAD);
+
+ // If the referenced entries already exist in *merge_cp_p, then
+ // both new_name_ref_i and new_signature_ref_i will both be 0.
+ // In that case, all we are appending is the current entry.
+- if (new_name_ref_i == 0) {
+- new_name_ref_i = name_ref_i;
+- } else {
++ if (new_name_ref_i != name_ref_i) {
+ RC_TRACE(0x00080000,
+ ("NameAndType entry@%d name_ref_index change: %d to %d",
+ *merge_cp_length_p, name_ref_i, new_name_ref_i));
+ }
+- if (new_signature_ref_i == 0) {
+- new_signature_ref_i = signature_ref_i;
+- } else {
++ if (new_signature_ref_i != signature_ref_i) {
+ RC_TRACE(0x00080000,
+ ("NameAndType entry@%d signature_ref_index change: %d to %d",
+ *merge_cp_length_p, signature_ref_i, new_signature_ref_i));
+@@ -353,76 +301,11 @@
+ case JVM_CONSTANT_Methodref:
+ {
+ int klass_ref_i = scratch_cp->uncached_klass_ref_index_at(scratch_i);
+- int new_klass_ref_i = 0;
+- bool match = (klass_ref_i < *merge_cp_length_p) &&
+- scratch_cp->compare_entry_to(klass_ref_i, *merge_cp_p, klass_ref_i,
+- THREAD);
+- if (!match) {
+- // forward reference in *merge_cp_p or not a direct match
+-
+- int found_i = scratch_cp->find_matching_entry(klass_ref_i, *merge_cp_p,
+- THREAD);
+- if (found_i != 0) {
+- guarantee(found_i != klass_ref_i,
+- "compare_entry_to() and find_matching_entry() do not agree");
+-
+- // Found a matching entry somewhere else in *merge_cp_p so
+- // just need a mapping entry.
+- new_klass_ref_i = found_i;
+- map_index(scratch_cp, klass_ref_i, found_i);
+- } else {
+- // no match found so we have to append this entry to *merge_cp_p
+- append_entry(scratch_cp, klass_ref_i, merge_cp_p, merge_cp_length_p,
+- THREAD);
+- // The above call to append_entry() can only append one entry
+- // so the post call query of *merge_cp_length_p is only for
+- // the sake of consistency. Without the optimization where we
+- // use JVM_CONSTANT_UnresolvedClass, then up to two entries
+- // could be appended.
+- new_klass_ref_i = *merge_cp_length_p - 1;
+- }
+- }
+-
+- int name_and_type_ref_i =
+- scratch_cp->uncached_name_and_type_ref_index_at(scratch_i);
+- int new_name_and_type_ref_i = 0;
+- match = (name_and_type_ref_i < *merge_cp_length_p) &&
+- scratch_cp->compare_entry_to(name_and_type_ref_i, *merge_cp_p,
+- name_and_type_ref_i, THREAD);
+- if (!match) {
+- // forward reference in *merge_cp_p or not a direct match
+-
+- int found_i = scratch_cp->find_matching_entry(name_and_type_ref_i,
+- *merge_cp_p, THREAD);
+- if (found_i != 0) {
+- guarantee(found_i != name_and_type_ref_i,
+- "compare_entry_to() and find_matching_entry() do not agree");
+-
+- // Found a matching entry somewhere else in *merge_cp_p so
+- // just need a mapping entry.
+- new_name_and_type_ref_i = found_i;
+- map_index(scratch_cp, name_and_type_ref_i, found_i);
+- } else {
+- // no match found so we have to append this entry to *merge_cp_p
+- append_entry(scratch_cp, name_and_type_ref_i, merge_cp_p,
+- merge_cp_length_p, THREAD);
+- // The above call to append_entry() can append more than
+- // one entry so the post call query of *merge_cp_length_p
+- // is required in order to get the right index for the
+- // JVM_CONSTANT_NameAndType entry.
+- new_name_and_type_ref_i = *merge_cp_length_p - 1;
+- }
+- }
+-
+- // If the referenced entries already exist in *merge_cp_p, then
+- // both new_klass_ref_i and new_name_and_type_ref_i will both be
+- // 0. In that case, all we are appending is the current entry.
+- if (new_klass_ref_i == 0) {
+- new_klass_ref_i = klass_ref_i;
+- }
+- if (new_name_and_type_ref_i == 0) {
+- new_name_and_type_ref_i = name_and_type_ref_i;
+- }
++ int new_klass_ref_i = find_or_append_indirect_entry(scratch_cp, klass_ref_i,
++ merge_cp_p, merge_cp_length_p, THREAD);
++ int name_and_type_ref_i = scratch_cp->uncached_name_and_type_ref_index_at(scratch_i);
++ int new_name_and_type_ref_i = find_or_append_indirect_entry(scratch_cp, name_and_type_ref_i,
++ merge_cp_p, merge_cp_length_p, THREAD);
+
+ const char *entry_name;
+ switch (scratch_cp->tag_at(scratch_i).value()) {
+@@ -465,7 +348,79 @@
+ (*merge_cp_length_p)++;
+ } break;
+
+- // At this stage, Class or UnresolvedClass could be here, but not
++ // this is an indirect CP entry so it needs special handling
++ case JVM_CONSTANT_MethodType:
++ {
++ int ref_i = scratch_cp->method_type_index_at(scratch_i);
++ int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
++ merge_cp_length_p, THREAD);
++ if (new_ref_i != ref_i) {
++ RC_TRACE(0x00080000,
++ ("MethodType entry@%d ref_index change: %d to %d",
++ *merge_cp_length_p, ref_i, new_ref_i));
++ }
++ (*merge_cp_p)->method_type_index_at_put(*merge_cp_length_p, new_ref_i);
++ if (scratch_i != *merge_cp_length_p) {
++ // The new entry in *merge_cp_p is at a different index than
++ // the new entry in scratch_cp so we need to map the index values.
++ map_index(scratch_cp, scratch_i, *merge_cp_length_p);
++ }
++ (*merge_cp_length_p)++;
++ } break;
++
++ // this is an indirect CP entry so it needs special handling
++ case JVM_CONSTANT_MethodHandle:
++ {
++ int ref_kind = scratch_cp->method_handle_ref_kind_at(scratch_i);
++ int ref_i = scratch_cp->method_handle_index_at(scratch_i);
++ int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
++ merge_cp_length_p, THREAD);
++ if (new_ref_i != ref_i) {
++ RC_TRACE(0x00080000,
++ ("MethodHandle entry@%d ref_index change: %d to %d",
++ *merge_cp_length_p, ref_i, new_ref_i));
++ }
++ (*merge_cp_p)->method_handle_index_at_put(*merge_cp_length_p, ref_kind, new_ref_i);
++ if (scratch_i != *merge_cp_length_p) {
++ // The new entry in *merge_cp_p is at a different index than
++ // the new entry in scratch_cp so we need to map the index values.
++ map_index(scratch_cp, scratch_i, *merge_cp_length_p);
++ }
++ (*merge_cp_length_p)++;
++ } break;
++
++ // this is an indirect CP entry so it needs special handling
++ case JVM_CONSTANT_InvokeDynamic:
++ {
++ // Index of the bootstrap specifier in the operands array
++ int old_bs_i = scratch_cp->invoke_dynamic_bootstrap_specifier_index(scratch_i);
++ int new_bs_i = find_or_append_operand(scratch_cp, old_bs_i, merge_cp_p,
++ merge_cp_length_p, THREAD);
++ // The bootstrap method NameAndType_info index
++ int old_ref_i = scratch_cp->invoke_dynamic_name_and_type_ref_index_at(scratch_i);
++ int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p,
++ merge_cp_length_p, THREAD);
++ if (new_bs_i != old_bs_i) {
++ RC_TRACE(0x00080000,
++ ("InvokeDynamic entry@%d bootstrap_method_attr_index change: %d to %d",
++ *merge_cp_length_p, old_bs_i, new_bs_i));
++ }
++ if (new_ref_i != old_ref_i) {
++ RC_TRACE(0x00080000,
++ ("InvokeDynamic entry@%d name_and_type_index change: %d to %d",
++ *merge_cp_length_p, old_ref_i, new_ref_i));
++ }
++
++ (*merge_cp_p)->invoke_dynamic_at_put(*merge_cp_length_p, new_bs_i, new_ref_i);
++ if (scratch_i != *merge_cp_length_p) {
++ // The new entry in *merge_cp_p is at a different index than
++ // the new entry in scratch_cp so we need to map the index values.
++ map_index(scratch_cp, scratch_i, *merge_cp_length_p);
++ }
++ (*merge_cp_length_p)++;
++ } break;
++
++ // At this stage, Class or UnresolvedClass could be here, but not
+ // ClassIndex
+ case JVM_CONSTANT_ClassIndex: // fall through
+
+@@ -492,6 +447,134 @@
+ } // end append_entry()
+
+
++int VM_RedefineClasses::find_or_append_indirect_entry(constantPoolHandle scratch_cp,
++ int ref_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
++
++ int new_ref_i = ref_i;
++ bool match = (ref_i < *merge_cp_length_p) &&
++ scratch_cp->compare_entry_to(ref_i, *merge_cp_p, ref_i, THREAD);
++
++ if (!match) {
++ // forward reference in *merge_cp_p or not a direct match
++ int found_i = scratch_cp->find_matching_entry(ref_i, *merge_cp_p, THREAD);
++ if (found_i != 0) {
++ guarantee(found_i != ref_i, "compare_entry_to() and find_matching_entry() do not agree");
++ // Found a matching entry somewhere else in *merge_cp_p so just need a mapping entry.
++ new_ref_i = found_i;
++ map_index(scratch_cp, ref_i, found_i);
++ } else {
++ // no match found so we have to append this entry to *merge_cp_p
++ append_entry(scratch_cp, ref_i, merge_cp_p, merge_cp_length_p, THREAD);
++ // The above call to append_entry() can only append one entry
++ // so the post call query of *merge_cp_length_p is only for
++ // the sake of consistency.
++ new_ref_i = *merge_cp_length_p - 1;
++ }
++ }
++
++ return new_ref_i;
++} // end find_or_append_indirect_entry()
++
++
++// Append a bootstrap specifier into the merge_cp operands that is semantically equal
++// to the scratch_cp operands bootstrap specifier passed by the old_bs_i index.
++// Recursively append new merge_cp entries referenced by the new bootstrap specifier.
++void VM_RedefineClasses::append_operand(constantPoolHandle scratch_cp, int old_bs_i,
++ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
++
++ int old_ref_i = scratch_cp->operand_bootstrap_method_ref_index_at(old_bs_i);
++ int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p,
++ merge_cp_length_p, THREAD);
++ if (new_ref_i != old_ref_i) {
++ RC_TRACE(0x00080000,
++ ("operands entry@%d bootstrap method ref_index change: %d to %d",
++ _operands_cur_length, old_ref_i, new_ref_i));
++ }
++
++ typeArrayOop merge_ops = (*merge_cp_p)->operands();
++ int new_bs_i = _operands_cur_length;
++ // We have _operands_cur_length == 0 when the merge_cp operands is empty yet.
++ // However, the operand_offset_at(0) was set in the extend_operands() call.
++ int new_base = (new_bs_i == 0) ? (*merge_cp_p)->operand_offset_at(0)
++ : (*merge_cp_p)->operand_next_offset_at(new_bs_i - 1);
++ int argc = scratch_cp->operand_argument_count_at(old_bs_i);
++
++ constantPoolOopDesc::operand_offset_at_put(merge_ops, _operands_cur_length, new_base);
++ merge_ops->short_at_put(new_base++, new_ref_i);
++ merge_ops->short_at_put(new_base++, argc);
++
++ for (int i = 0; i < argc; i++) {
++ int old_arg_ref_i = scratch_cp->operand_argument_index_at(old_bs_i, i);
++ int new_arg_ref_i = find_or_append_indirect_entry(scratch_cp, old_arg_ref_i, merge_cp_p,
++ merge_cp_length_p, THREAD);
++ merge_ops->short_at_put(new_base++, new_arg_ref_i);
++ if (new_arg_ref_i != old_arg_ref_i) {
++ RC_TRACE(0x00080000,
++ ("operands entry@%d bootstrap method argument ref_index change: %d to %d",
++ _operands_cur_length, old_arg_ref_i, new_arg_ref_i));
++ }
++ }
++ if (old_bs_i != _operands_cur_length) {
++ // The bootstrap specifier in *merge_cp_p is at a different index than
++ // that in scratch_cp so we need to map the index values.
++ map_operand_index(old_bs_i, new_bs_i);
++ }
++ _operands_cur_length++;
++} // end append_operand()
++
++
++int VM_RedefineClasses::find_or_append_operand(constantPoolHandle scratch_cp,
++ int old_bs_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
++
++ int new_bs_i = old_bs_i; // bootstrap specifier index
++ bool match = (old_bs_i < _operands_cur_length) &&
++ scratch_cp->compare_operand_to(old_bs_i, *merge_cp_p, old_bs_i, THREAD);
++
++ if (!match) {
++ // forward reference in *merge_cp_p or not a direct match
++ int found_i = scratch_cp->find_matching_operand(old_bs_i, *merge_cp_p,
++ _operands_cur_length, THREAD);
++ if (found_i != -1) {
++ guarantee(found_i != old_bs_i, "compare_operand_to() and find_matching_operand() disagree");
++ // found a matching operand somewhere else in *merge_cp_p so just need a mapping
++ new_bs_i = found_i;
++ map_operand_index(old_bs_i, found_i);
++ } else {
++ // no match found so we have to append this bootstrap specifier to *merge_cp_p
++ append_operand(scratch_cp, old_bs_i, merge_cp_p, merge_cp_length_p, THREAD);
++ new_bs_i = _operands_cur_length - 1;
++ }
++ }
++ return new_bs_i;
++} // end find_or_append_operand()
++
++
++void VM_RedefineClasses::finalize_operands_merge(constantPoolHandle merge_cp, TRAPS) {
++ if (merge_cp->operands() == NULL) {
++ return;
++ }
++ // Shrink the merge_cp operands
++ merge_cp->shrink_operands(_operands_cur_length, CHECK);
++
++ if (RC_TRACE_ENABLED(0x00040000)) {
++ // don't want to loop unless we are tracing
++ int count = 0;
++ for (int i = 1; i < _operands_index_map_p->length(); i++) {
++ int value = _operands_index_map_p->at(i);
++ if (value != -1) {
++ RC_TRACE_WITH_THREAD(0x00040000, THREAD,
++ ("operands_index_map[%d]: old=%d new=%d", count, i, value));
++ count++;
++ }
++ }
++ }
++ // Clean-up
++ _operands_index_map_p = NULL;
++ _operands_cur_length = 0;
++ _operands_index_map_count = 0;
++} // end finalize_operands_merge()
++
++
+ void VM_RedefineClasses::swap_all_method_annotations(int i, int j, instanceKlassHandle scratch_class) {
+ typeArrayOop save;
+
+@@ -777,6 +860,27 @@
+ } // end find_new_index()
+
+
++// Find new bootstrap specifier index value for old bootstrap specifier index
++// value by seaching the index map. Returns zero (-1) if there is no mapped
++// value for the old bootstrap specifier index.
++int VM_RedefineClasses::find_new_operand_index(int old_index) {
++ if (_operands_index_map_count == 0) {
++ // map is empty so nothing can be found
++ return -1;
++ }
++
++ if (old_index == -1 || old_index >= _operands_index_map_p->length()) {
++ // The old_index is out of range so it is not mapped.
++ // This should not happen in regular constant pool merging use.
++ return -1;
++ }
++
++ int value = _operands_index_map_p->at(old_index);
++
++ return value;
++} // end find_new_operand_index()
++
++
+ // Returns true if the current mismatch is due to a resolved/unresolved
+ // class pair. Otherwise, returns false.
+ bool VM_RedefineClasses::is_unresolved_class_mismatch(constantPoolHandle cp1,
+@@ -1042,6 +1146,25 @@
+ } // end map_index()
+
+
++// Map old_index to new_index as needed.
++void VM_RedefineClasses::map_operand_index(int old_index, int new_index) {
++ if (find_new_operand_index(old_index) != -1) {
++ // old_index is already mapped
++ return;
++ }
++
++ if (old_index == new_index) {
++ // no mapping is needed
++ return;
++ }
++
++ _operands_index_map_p->at_put(old_index, new_index);
++ _operands_index_map_count++;
++
++ RC_TRACE(0x00040000, ("mapped bootstrap specifier at index %d to %d", old_index, new_index));
++} // end map_index()
++
++
+ // Merge old_cp and scratch_cp and return the results of the merge via
+ // merge_cp_p. The number of entries in *merge_cp_p is returned via
+ // merge_cp_length_p. The entries in old_cp occupy the same locations
+@@ -1113,6 +1236,9 @@
+ }
+ } // end for each old_cp entry
+
++ constantPoolOopDesc::copy_operands(old_cp, *merge_cp_p, CHECK_0);
++ (*merge_cp_p)->extend_operands(scratch_cp, CHECK_0);
++
+ // We don't need to sanity check that *merge_cp_length_p is within
+ // *merge_cp_p bounds since we have the minimum on-entry check above.
+ (*merge_cp_length_p) = old_i;
+@@ -1235,6 +1361,7 @@
+ ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
+ *merge_cp_length_p, scratch_i, _index_map_count));
+ }
++ finalize_operands_merge(*merge_cp_p, THREAD);
+
+ return true;
+ } // end merge_constant_pools()
+@@ -1282,8 +1409,17 @@
+ _index_map_count = 0;
+ _index_map_p = new intArray(scratch_cp->length(), -1);
+
++ _operands_cur_length = constantPoolOopDesc::operand_array_length(old_cp->operands());
++ _operands_index_map_count = 0;
++ _operands_index_map_p = new intArray(
++ constantPoolOopDesc::operand_array_length(scratch_cp->operands()), -1);
++
++ // reference to the cp holder is needed for copy_operands()
++ merge_cp->set_pool_holder(scratch_class());
+ bool result = merge_constant_pools(old_cp, scratch_cp, &merge_cp,
+ &merge_cp_length, THREAD);
++ merge_cp->set_pool_holder(NULL);
++
+ if (!result) {
+ // The merge can fail due to memory allocation failure or due
+ // to robustness checks.
+@@ -1326,7 +1462,7 @@
+ // Replace the new constant pool with a shrunken copy of the
+ // merged constant pool; the previous new constant pool will
+ // get GCed.
+- set_new_constant_pool(scratch_class, merge_cp, merge_cp_length, true,
++ set_new_constant_pool(scratch_class, merge_cp, merge_cp_length,
+ THREAD);
+ // drop local ref to the merged constant pool
+ merge_cp()->set_is_conc_safe(true);
+@@ -1357,7 +1493,7 @@
+ // merged constant pool so now the rewritten bytecodes have
+ // valid references; the previous new constant pool will get
+ // GCed.
+- set_new_constant_pool(scratch_class, merge_cp, merge_cp_length, true,
++ set_new_constant_pool(scratch_class, merge_cp, merge_cp_length,
+ THREAD);
+ merge_cp()->set_is_conc_safe(true);
+ }
+@@ -1540,6 +1676,7 @@
+ case Bytecodes::_getfield : // fall through
+ case Bytecodes::_getstatic : // fall through
+ case Bytecodes::_instanceof : // fall through
++ case Bytecodes::_invokedynamic : // fall through
+ case Bytecodes::_invokeinterface: // fall through
+ case Bytecodes::_invokespecial : // fall through
+ case Bytecodes::_invokestatic : // fall through
+@@ -2343,30 +2480,30 @@
+ // smaller constant pool is associated with scratch_class.
+ void VM_RedefineClasses::set_new_constant_pool(
+ instanceKlassHandle scratch_class, constantPoolHandle scratch_cp,
+- int scratch_cp_length, bool shrink, TRAPS) {
+- assert(!shrink || scratch_cp->length() >= scratch_cp_length, "sanity check");
+-
+- if (shrink) {
+- // scratch_cp is a merged constant pool and has enough space for a
+- // worst case merge situation. We want to associate the minimum
+- // sized constant pool with the klass to save space.
+- constantPoolHandle smaller_cp(THREAD,
+- oopFactory::new_constantPool(scratch_cp_length,
+- oopDesc::IsUnsafeConc,
+- THREAD));
+- // preserve orig_length() value in the smaller copy
+- int orig_length = scratch_cp->orig_length();
+- assert(orig_length != 0, "sanity check");
+- smaller_cp->set_orig_length(orig_length);
+- scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
+- scratch_cp = smaller_cp;
+- smaller_cp()->set_is_conc_safe(true);
+- }
++ int scratch_cp_length, TRAPS) {
++ assert(scratch_cp->length() >= scratch_cp_length, "sanity check");
++
++ // scratch_cp is a merged constant pool and has enough space for a
++ // worst case merge situation. We want to associate the minimum
++ // sized constant pool with the klass to save space.
++ constantPoolHandle smaller_cp(THREAD,
++ oopFactory::new_constantPool(scratch_cp_length,
++ oopDesc::IsUnsafeConc,
++ THREAD));
++ // preserve orig_length() value in the smaller copy
++ int orig_length = scratch_cp->orig_length();
++ assert(orig_length != 0, "sanity check");
++ smaller_cp->set_orig_length(orig_length);
++
++ // attach klass to new constant pool
++ // reference to the cp holder is needed for copy_operands()
++ smaller_cp->set_pool_holder(scratch_class());
++
++ scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
++ scratch_cp = smaller_cp;
++ smaller_cp()->set_is_conc_safe(true);
+
+ // attach new constant pool to klass
+- scratch_cp->set_pool_holder(scratch_class());
+-
+- // attach klass to new constant pool
+ scratch_class->set_constants(scratch_cp());
+
+ int i; // for portability
+@@ -3310,6 +3447,16 @@
+ // that reference methods of the evolved class.
+ SystemDictionary::classes_do(adjust_cpool_cache_and_vtable, THREAD);
+
++ // JSR-292 support
++ MemberNameTable* mnt = the_class->member_names();
++ if (mnt != NULL) {
++ bool trace_name_printed = false;
++ mnt->adjust_method_entries(_matching_old_methods,
++ _matching_new_methods,
++ _matching_methods_length,
++ &trace_name_printed);
++ }
++
+ if (the_class->oop_map_cache() != NULL) {
+ // Flush references to any obsolete methods from the oop map cache
+ // so that obsolete methods are not pinned.
+--- ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp Wed May 07 19:26:16 2014 -0700
+@@ -370,6 +370,13 @@
+ // _index_map_p contains any entries.
+ int _index_map_count;
+ intArray * _index_map_p;
++
++ // _operands_index_map_count is just an optimization for knowing if
++ // _operands_index_map_p contains any entries.
++ int _operands_cur_length;
++ int _operands_index_map_count;
++ intArray * _operands_index_map_p;
++
+ // ptr to _class_count scratch_classes
+ instanceKlassHandle * _scratch_classes;
+ jvmtiError _res;
+@@ -431,16 +438,24 @@
+ // and in all direct and indirect subclasses.
+ void increment_class_counter(instanceKlass *ik, TRAPS);
+
+- // Support for constant pool merging (these routines are in alpha
+- // order):
++ // Support for constant pool merging (these routines are in alpha order):
+ void append_entry(constantPoolHandle scratch_cp, int scratch_i,
+ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
++ void append_operand(constantPoolHandle scratch_cp, int scratch_bootstrap_spec_index,
++ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
++ void finalize_operands_merge(constantPoolHandle merge_cp, TRAPS);
++ int find_or_append_indirect_entry(constantPoolHandle scratch_cp, int scratch_i,
++ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
++ int find_or_append_operand(constantPoolHandle scratch_cp, int scratch_bootstrap_spec_index,
++ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
+ int find_new_index(int old_index);
++ int find_new_operand_index(int old_bootstrap_spec_index);
+ bool is_unresolved_class_mismatch(constantPoolHandle cp1, int index1,
+ constantPoolHandle cp2, int index2);
+ bool is_unresolved_string_mismatch(constantPoolHandle cp1, int index1,
+ constantPoolHandle cp2, int index2);
+ void map_index(constantPoolHandle scratch_cp, int old_index, int new_index);
++ void map_operand_index(int old_bootstrap_spec_index, int new_bootstrap_spec_index);
+ bool merge_constant_pools(constantPoolHandle old_cp,
+ constantPoolHandle scratch_cp, constantPoolHandle *merge_cp_p,
+ int *merge_cp_length_p, TRAPS);
+@@ -474,7 +489,7 @@
+ address& stackmap_addr_ref, address stackmap_end, u2 frame_i,
+ u1 frame_size, TRAPS);
+ void set_new_constant_pool(instanceKlassHandle scratch_class,
+- constantPoolHandle scratch_cp, int scratch_cp_length, bool shrink, TRAPS);
++ constantPoolHandle scratch_cp, int scratch_cp_length, TRAPS);
+
+ void flush_dependent_code(instanceKlassHandle k_h, TRAPS);
+
+--- ./hotspot/src/share/vm/prims/methodHandles.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/prims/methodHandles.cpp Wed May 07 19:26:16 2014 -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
+@@ -29,6 +29,7 @@
+ #include "interpreter/oopMapCache.hpp"
+ #include "memory/allocation.inline.hpp"
+ #include "memory/oopFactory.hpp"
++#include "prims/jvmtiRedefineClassesTrace.hpp"
+ #include "prims/methodHandles.hpp"
+ #include "runtime/compilationPolicy.hpp"
+ #include "runtime/javaCalls.hpp"
+@@ -123,7 +124,9 @@
+ return Handle(THREAD, k->allocate_instance(THREAD));
+ }
+
+-oop MethodHandles::init_MemberName(oop mname_oop, oop target_oop) {
++oop MethodHandles::init_MemberName(Handle mname, Handle target) {
++ Thread* thread = Thread::current();
++ oop target_oop = target();
+ klassOop target_klass = target_oop->klass();
+ if (target_klass == SystemDictionary::reflect_Field_klass()) {
+ oop clazz = java_lang_reflect_Field::clazz(target_oop); // fd.field_holder()
+@@ -131,24 +134,24 @@
+ int mods = java_lang_reflect_Field::modifiers(target_oop);
+ oop type = java_lang_reflect_Field::type(target_oop);
+ oop name = java_lang_reflect_Field::name(target_oop);
+- klassOop k = java_lang_Class::as_klassOop(clazz);
+- intptr_t offset = instanceKlass::cast(k)->field_offset(slot);
+- return init_field_MemberName(mname_oop, k, accessFlags_from(mods), type, name, offset);
++ KlassHandle k(thread, java_lang_Class::as_klassOop(clazz));
++ intptr_t offset = instanceKlass::cast(k())->field_offset(slot);
++ return init_field_MemberName(mname, k, accessFlags_from(mods), type, name, offset);
+ } else if (target_klass == SystemDictionary::reflect_Method_klass()) {
+ oop clazz = java_lang_reflect_Method::clazz(target_oop);
+ int slot = java_lang_reflect_Method::slot(target_oop);
+- klassOop k = java_lang_Class::as_klassOop(clazz);
+- if (k != NULL && Klass::cast(k)->oop_is_instance()) {
+- methodOop m = instanceKlass::cast(k)->method_with_idnum(slot);
+- return init_method_MemberName(mname_oop, m, true, k);
++ KlassHandle k(thread, java_lang_Class::as_klassOop(clazz));
++ if (!k.is_null() && k->oop_is_instance()) {
++ methodOop m = instanceKlass::cast(k())->method_with_idnum(slot);
++ return init_method_MemberName(mname, m, true, k);
+ }
+ } else if (target_klass == SystemDictionary::reflect_Constructor_klass()) {
+ oop clazz = java_lang_reflect_Constructor::clazz(target_oop);
+ int slot = java_lang_reflect_Constructor::slot(target_oop);
+- klassOop k = java_lang_Class::as_klassOop(clazz);
+- if (k != NULL && Klass::cast(k)->oop_is_instance()) {
+- methodOop m = instanceKlass::cast(k)->method_with_idnum(slot);
+- return init_method_MemberName(mname_oop, m, false, k);
++ KlassHandle k(thread, java_lang_Class::as_klassOop(clazz));
++ if (!k.is_null() && k->oop_is_instance()) {
++ methodOop m = instanceKlass::cast(k())->method_with_idnum(slot);
++ return init_method_MemberName(mname, m, false, k);
+ }
+ } else if (target_klass == SystemDictionary::MemberName_klass()) {
+ // Note: This only works if the MemberName has already been resolved.
+@@ -156,17 +159,18 @@
+ int flags = java_lang_invoke_MemberName::flags(target_oop);
+ oop vmtarget = java_lang_invoke_MemberName::vmtarget(target_oop);
+ intptr_t vmindex = java_lang_invoke_MemberName::vmindex(target_oop);
+- klassOop k = java_lang_Class::as_klassOop(clazz);
++ KlassHandle k(thread, java_lang_Class::as_klassOop(clazz));
+ int ref_kind = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
+ if (vmtarget == NULL) return NULL; // not resolved
+ if ((flags & IS_FIELD) != 0) {
+ assert(vmtarget->is_klass(), "field vmtarget is klassOop");
+ int basic_mods = (ref_kind_is_static(ref_kind) ? JVM_ACC_STATIC : 0);
+ // FIXME: how does k (receiver_limit) contribute?
+- return init_field_MemberName(mname_oop, klassOop(vmtarget), accessFlags_from(basic_mods), NULL, NULL, vmindex);
++ KlassHandle k_vmtarget(thread, klassOop(vmtarget));
++ return init_field_MemberName(mname, k_vmtarget, accessFlags_from(basic_mods), NULL, NULL, vmindex);
+ } else if ((flags & (IS_METHOD | IS_CONSTRUCTOR)) != 0) {
+ assert(vmtarget->is_method(), "method or constructor vmtarget is methodOop");
+- return init_method_MemberName(mname_oop, methodOop(vmtarget), ref_kind_does_dispatch(ref_kind), k);
++ return init_method_MemberName(mname, methodOop(vmtarget), ref_kind_does_dispatch(ref_kind), k);
+ } else {
+ return NULL;
+ }
+@@ -174,8 +178,9 @@
+ return NULL;
+ }
+
+-oop MethodHandles::init_method_MemberName(oop mname_oop, methodOop m, bool do_dispatch,
+- klassOop resolved_klass) {
++oop MethodHandles::init_method_MemberName(Handle mname, methodOop m, bool do_dispatch,
++ KlassHandle resolved_klass_h) {
++ klassOop resolved_klass = resolved_klass_h();
+ AccessFlags mods = m->access_flags();
+ int flags = (jushort)( mods.as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS );
+ int vmindex = methodOopDesc::nonvirtual_vtable_index; // implies never any dispatch
+@@ -235,6 +240,7 @@
+ }
+ }
+
++ oop mname_oop = mname();
+ java_lang_invoke_MemberName::set_flags(mname_oop, flags);
+ java_lang_invoke_MemberName::set_vmtarget(mname_oop, m);
+ java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex); // vtable/itable index
+@@ -246,11 +252,12 @@
+ // If relevant, the vtable or itable value is stored as vmindex.
+ // This is done eagerly, since it is readily available without
+ // constructing any new objects.
+- // TO DO: maybe intern mname_oop
+- return mname_oop;
++ instanceKlass::cast(m->method_holder())->add_member_name(m->method_idnum(), mname);
++
++ return mname();
+ }
+
+-Handle MethodHandles::init_method_MemberName(oop mname_oop, CallInfo& info, TRAPS) {
++Handle MethodHandles::init_method_MemberName(Handle mname, CallInfo& info, TRAPS) {
+ Handle empty;
+ if (info.resolved_appendix().not_null()) {
+ // The resolved MemberName must not be accompanied by an appendix argument,
+@@ -270,23 +277,24 @@
+ } else {
+ vmindex = info.vtable_index();
+ }
+- oop res = init_method_MemberName(mname_oop, m(), (vmindex >= 0), defc());
++ oop res = init_method_MemberName(mname, m(), (vmindex >= 0), defc());
+ assert(res == NULL || (java_lang_invoke_MemberName::vmindex(res) == vmindex), "");
+ return Handle(THREAD, res);
+ }
+
+-oop MethodHandles::init_field_MemberName(oop mname_oop, klassOop field_holder,
++oop MethodHandles::init_field_MemberName(Handle mname, KlassHandle field_holder,
+ AccessFlags mods, oop type, oop name,
+ intptr_t offset, bool is_setter) {
+ int flags = (jushort)( mods.as_short() & JVM_RECOGNIZED_FIELD_MODIFIERS );
+ flags |= IS_FIELD | ((mods.is_static() ? JVM_REF_getStatic : JVM_REF_getField) << REFERENCE_KIND_SHIFT);
+ if (is_setter) flags += ((JVM_REF_putField - JVM_REF_getField) << REFERENCE_KIND_SHIFT);
+- oop vmtarget = field_holder;
++ oop vmtarget = field_holder();
+ int vmindex = offset; // determines the field uniquely when combined with static bit
++ oop mname_oop = mname();
+ java_lang_invoke_MemberName::set_flags(mname_oop, flags);
+ java_lang_invoke_MemberName::set_vmtarget(mname_oop, vmtarget);
+ java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex);
+- java_lang_invoke_MemberName::set_clazz(mname_oop, Klass::cast(field_holder)->java_mirror());
++ java_lang_invoke_MemberName::set_clazz(mname_oop, field_holder()->java_mirror());
+ if (name != NULL)
+ java_lang_invoke_MemberName::set_name(mname_oop, name);
+ if (type != NULL)
+@@ -298,11 +306,10 @@
+ // because they unambiguously identify the field.
+ // Although the fieldDescriptor::_index would also identify the field,
+ // we do not use it, because it is harder to decode.
+- // TO DO: maybe intern mname_oop
+- return mname_oop;
++ return mname();
+ }
+
+-Handle MethodHandles::init_field_MemberName(oop mname_oop, FieldAccessInfo& info, TRAPS) {
++Handle MethodHandles::init_field_MemberName(Handle mname, FieldAccessInfo& info, TRAPS) {
+ return Handle();
+ #if 0
+ KlassHandle field_holder = info.klass();
+@@ -728,7 +735,7 @@
+ return empty;
+ }
+ }
+- return init_method_MemberName(mname(), result, THREAD);
++ return init_method_MemberName(mname, result, THREAD);
+ }
+ case IS_CONSTRUCTOR:
+ {
+@@ -746,7 +753,7 @@
+ }
+ }
+ assert(result.is_statically_bound(), "");
+- return init_method_MemberName(mname(), result, THREAD);
++ return init_method_MemberName(mname, result, THREAD);
+ }
+ case IS_FIELD:
+ {
+@@ -759,7 +766,7 @@
+ oop name = field_name_or_null(fd.name());
+ bool is_setter = (ref_kind_is_valid(ref_kind) && ref_kind_is_setter(ref_kind));
+ mname = Handle(THREAD,
+- init_field_MemberName(mname(), sel_klass->as_klassOop(),
++ init_field_MemberName(mname, sel_klass,
+ fd.access_flags(), type, name, fd.offset(), is_setter));
+ return mname;
+ }
+@@ -851,16 +858,16 @@
+ THROW_MSG(vmSymbols::java_lang_InternalError(), "unrecognized MemberName format");
+ }
+
+-int MethodHandles::find_MemberNames(klassOop k,
++int MethodHandles::find_MemberNames(KlassHandle k,
+ Symbol* name, Symbol* sig,
+- int mflags, klassOop caller,
+- int skip, objArrayOop results) {
+- DEBUG_ONLY(No_Safepoint_Verifier nsv);
+- // this code contains no safepoints!
++ int mflags, KlassHandle caller,
++ int skip, objArrayHandle results) {
+
+ // %%% take caller into account!
+
+- if (k == NULL || !Klass::cast(k)->oop_is_instance()) return -1;
++ Thread* thread = Thread::current();
++
++ if (k.is_null() || !k->oop_is_instance()) return -1;
+
+ int rfill = 0, rlimit = results->length(), rskip = skip;
+ // overflow measurement:
+@@ -888,7 +895,7 @@
+ }
+
+ if ((match_flags & IS_FIELD) != 0) {
+- for (FieldStream st(k, local_only, !search_intfc); !st.eos(); st.next()) {
++ for (FieldStream st(k(), local_only, !search_intfc); !st.eos(); st.next()) {
+ if (name != NULL && st.name() != name)
+ continue;
+ if (sig != NULL && st.signature() != sig)
+@@ -897,15 +904,15 @@
+ if (rskip > 0) {
+ --rskip;
+ } else if (rfill < rlimit) {
+- oop result = results->obj_at(rfill++);
+- if (!java_lang_invoke_MemberName::is_instance(result))
++ Handle result(thread, results->obj_at(rfill++));
++ if (!java_lang_invoke_MemberName::is_instance(result()))
+ return -99; // caller bug!
+ oop type = field_signature_type_or_null(st.signature());
+ oop name = field_name_or_null(st.name());
+- oop saved = MethodHandles::init_field_MemberName(result, st.klass()->as_klassOop(),
++ oop saved = MethodHandles::init_field_MemberName(result, st.klass(),
+ st.access_flags(), type, name,
+ st.offset());
+- if (saved != result)
++ if (saved != result())
+ results->obj_at_put(rfill-1, saved); // show saved instance to user
+ } else if (++overflow >= overflow_limit) {
+ match_flags = 0; break; // got tired of looking at overflow
+@@ -938,7 +945,7 @@
+ } else {
+ // caller will accept either sort; no need to adjust name
+ }
+- for (MethodStream st(k, local_only, !search_intfc); !st.eos(); st.next()) {
++ for (MethodStream st(k(), local_only, !search_intfc); !st.eos(); st.next()) {
+ methodOop m = st.method();
+ Symbol* m_name = m->name();
+ if (m_name == clinit_name)
+@@ -951,11 +958,11 @@
+ if (rskip > 0) {
+ --rskip;
+ } else if (rfill < rlimit) {
+- oop result = results->obj_at(rfill++);
+- if (!java_lang_invoke_MemberName::is_instance(result))
++ Handle result(thread, results->obj_at(rfill++));
++ if (!java_lang_invoke_MemberName::is_instance(result()))
+ return -99; // caller bug!
+- oop saved = MethodHandles::init_method_MemberName(result, m, true, NULL);
+- if (saved != result)
++ oop saved = MethodHandles::init_method_MemberName(result, m, true, KlassHandle());
++ if (saved != result())
+ results->obj_at_put(rfill-1, saved); // show saved instance to user
+ } else if (++overflow >= overflow_limit) {
+ match_flags = 0; break; // got tired of looking at overflow
+@@ -967,6 +974,85 @@
+ return rfill + overflow;
+ }
+
++//------------------------------------------------------------------------------
++// MemberNameTable
++//
++
++MemberNameTable::MemberNameTable(int methods_cnt)
++ : GrowableArray<jweak>(methods_cnt, true) {
++ assert_locked_or_safepoint(MemberNameTable_lock);
++}
++
++MemberNameTable::~MemberNameTable() {
++ assert_locked_or_safepoint(MemberNameTable_lock);
++ int len = this->length();
++
++ for (int idx = 0; idx < len; idx++) {
++ jweak ref = this->at(idx);
++ JNIHandles::destroy_weak_global(ref);
++ }
++}
++
++void MemberNameTable::add_member_name(int index, jweak mem_name_wref) {
++ assert_locked_or_safepoint(MemberNameTable_lock);
++ this->at_put_grow(index, mem_name_wref);
++}
++
++// Return a member name oop or NULL.
++oop MemberNameTable::get_member_name(int index) {
++ assert_locked_or_safepoint(MemberNameTable_lock);
++ jweak ref = this->at(index);
++ oop mem_name = JNIHandles::resolve(ref);
++ return mem_name;
++}
++
++oop MemberNameTable::find_member_name_by_method(methodOop old_method) {
++ assert_locked_or_safepoint(MemberNameTable_lock);
++ oop found = NULL;
++ int len = this->length();
++
++ for (int idx = 0; idx < len; idx++) {
++ oop mem_name = JNIHandles::resolve(this->at(idx));
++ if (mem_name == NULL) {
++ continue;
++ }
++ methodOop method = (methodOop)java_lang_invoke_MemberName::vmtarget(mem_name);
++ if (method == old_method) {
++ found = mem_name;
++ break;
++ }
++ }
++ return found;
++}
++
++// It is called at safepoint only
++void MemberNameTable::adjust_method_entries(methodOop* old_methods, methodOop* new_methods,
++ int methods_length, bool *trace_name_printed) {
++ assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
++ // search the MemberNameTable for uses of either obsolete or EMCP methods
++ for (int j = 0; j < methods_length; j++) {
++ methodOop old_method = old_methods[j];
++ methodOop new_method = new_methods[j];
++ oop mem_name = find_member_name_by_method(old_method);
++ if (mem_name != NULL) {
++ java_lang_invoke_MemberName::adjust_vmtarget(mem_name, new_method);
++
++ if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) {
++ if (!(*trace_name_printed)) {
++ // RC_TRACE_MESG macro has an embedded ResourceMark
++ RC_TRACE_MESG(("adjust: name=%s",
++ Klass::cast(old_method->method_holder())->external_name()));
++ *trace_name_printed = true;
++ }
++ // RC_TRACE macro has an embedded ResourceMark
++ RC_TRACE(0x00400000, ("MemberName method update: %s(%s)",
++ new_method->name()->as_C_string(),
++ new_method->signature()->as_C_string()));
++ }
++ }
++ }
++}
++
+ //
+ // Here are the native methods in java.lang.invoke.MethodHandleNatives
+ // They are the private interface between this JVM and the HotSpot-specific
+@@ -1058,8 +1144,8 @@
+ if (mname_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "mname is null"); }
+ if (target_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "target is null"); }
+ Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh));
+- oop target_oop = JNIHandles::resolve_non_null(target_jh);
+- MethodHandles::init_MemberName(mname(), target_oop);
++ Handle target(THREAD, JNIHandles::resolve_non_null(target_jh));
++ MethodHandles::init_MemberName(mname, target);
+ }
+ JVM_END
+
+@@ -1174,11 +1260,12 @@
+ } else if (vmtarget->is_klass()) {
+ x = Klass::cast((klassOop) vmtarget())->java_mirror();
+ } else {
+- Handle mname2 = MethodHandles::new_MemberName(CHECK_NULL);
+- if (vmtarget->is_method())
+- x = MethodHandles::init_method_MemberName(mname2(), methodOop(vmtarget()), false, NULL);
+- else
++ if (vmtarget->is_method()) {
++ x = mname();
++ } else {
++ Handle mname2 = MethodHandles::new_MemberName(CHECK_NULL);
+ x = MethodHandles::init_MemberName(mname2(), vmtarget());
++ }
+ }
+ result->obj_at_put(1, x);
+ return JNIHandles::make_local(env, result());
+@@ -1221,8 +1308,8 @@
+ // %%% TO DO
+ }
+
+- int res = MethodHandles::find_MemberNames(k(), name, sig, mflags,
+- caller(), skip, results());
++ int res = MethodHandles::find_MemberNames(k, name, sig, mflags,
++ caller, skip, results);
+ // TO DO: expand at least some of the MemberNames, to avoid massive callbacks
+ return res;
+ }
+--- ./hotspot/src/share/vm/prims/methodHandles.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/prims/methodHandles.hpp Wed May 07 19:26:16 2014 -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
+@@ -39,7 +39,6 @@
+ // in java.lang.invoke and sun.invoke.
+ // See also javaClasses for layouts java_lang_invoke_Method{Handle,Type,Type::Form}.
+ public:
+- public:
+ static bool enabled() { return _enabled; }
+ static void set_enabled(bool z);
+
+@@ -54,18 +53,18 @@
+ static Handle resolve_MemberName(Handle mname, KlassHandle caller, TRAPS); // compute vmtarget/vmindex from name/type
+ static void expand_MemberName(Handle mname, int suppress, TRAPS); // expand defc/name/type if missing
+ static Handle new_MemberName(TRAPS); // must be followed by init_MemberName
+- static oop init_MemberName(oop mname_oop, oop target_oop); // compute vmtarget/vmindex from target
+- static oop init_method_MemberName(oop mname_oop, methodOop m, bool do_dispatch,
+- klassOop resolved_klass);
+- static oop init_field_MemberName(oop mname_oop, klassOop field_holder,
++ static oop init_MemberName(Handle mname_h, Handle target_h); // compute vmtarget/vmindex from target
++ static oop init_method_MemberName(Handle mname_h, methodOop m, bool do_dispatch,
++ KlassHandle resolved_klass_h);
++ static oop init_field_MemberName(Handle mname_h, KlassHandle field_holder_h,
+ AccessFlags mods, oop type, oop name,
+ intptr_t offset, bool is_setter = false);
+- static Handle init_method_MemberName(oop mname_oop, CallInfo& info, TRAPS);
+- static Handle init_field_MemberName(oop mname_oop, FieldAccessInfo& info, TRAPS);
++ static Handle init_method_MemberName(Handle mname_h, CallInfo& info, TRAPS);
++ static Handle init_field_MemberName(Handle mname_h, FieldAccessInfo& info, TRAPS);
+ static int method_ref_kind(methodOop m, bool do_dispatch_if_possible = true);
+- static int find_MemberNames(klassOop k, Symbol* name, Symbol* sig,
+- int mflags, klassOop caller,
+- int skip, objArrayOop results);
++ static int find_MemberNames(KlassHandle k, Symbol* name, Symbol* sig,
++ int mflags, KlassHandle caller,
++ int skip, objArrayHandle results);
+ // bit values for suppress argument to expand_MemberName:
+ enum { _suppress_defc = 1, _suppress_name = 2, _suppress_type = 4 };
+
+@@ -230,4 +229,26 @@
+ void generate();
+ };
+
++//------------------------------------------------------------------------------
++// MemberNameTable
++//
++
++class MemberNameTable : public GrowableArray<jweak> {
++ public:
++ MemberNameTable(int methods_cnt);
++ ~MemberNameTable();
++
++ void add_member_name(int index, jweak mem_name_ref);
++ oop get_member_name(int index);
++
++ public:
++ // RedefineClasses() API support:
++ // If a MemberName refers to old_method then update it
++ // to refer to new_method.
++ void adjust_method_entries(methodOop* old_methods, methodOop* new_methods,
++ int methods_length, bool *trace_name_printed);
++ private:
++ oop find_member_name_by_method(methodOop old_method);
++};
++
+ #endif // SHARE_VM_PRIMS_METHODHANDLES_HPP
+--- ./hotspot/src/share/vm/prims/whitebox.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/prims/whitebox.cpp Wed May 07 19:26:16 2014 -0700
+@@ -27,6 +27,8 @@
+ #include "memory/universe.hpp"
+ #include "oops/oop.inline.hpp"
+
++#include "code/codeCache.hpp"
++
+ #include "classfile/symbolTable.hpp"
+
+ #include "prims/whitebox.hpp"
+@@ -131,6 +133,13 @@
+ return MemTracker::wbtest_wait_for_data_merge();
+ WB_END
+
++WB_ENTRY(void, WB_DeoptimizeAll(JNIEnv* env, jobject o))
++ MutexLockerEx mu(Compile_lock);
++ CodeCache::mark_all_nmethods_for_deoptimization();
++ VM_Deoptimize op;
++ VMThread::execute(&op);
++WB_END
++
+ //Some convenience methods to deal with objects from java
+ int WhiteBox::offset_for_field(const char* field_name, oop object,
+ Symbol* signature_symbol) {
+@@ -204,6 +213,7 @@
+ {CC"NMTUncommitMemory", CC"(JJ)V", (void*)&WB_NMTUncommitMemory },
+ {CC"NMTReleaseMemory", CC"(JJ)V", (void*)&WB_NMTReleaseMemory },
+ {CC"NMTWaitForDataMerge", CC"()Z", (void*)&WB_NMTWaitForDataMerge},
++ {CC"deoptimizeAll", CC"()V", (void*)&WB_DeoptimizeAll },
+ };
+
+ #undef CC
+--- ./hotspot/src/share/vm/runtime/arguments.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/arguments.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1447,6 +1447,17 @@
+ }
+ FLAG_SET_DEFAULT(UseParallelGC, true);
+
++ if (UseAdaptiveSizePolicy) {
++ // We don't want to limit adaptive heap sizing's freedom to adjust the heap
++ // unless the user actually sets these flags.
++ if (FLAG_IS_DEFAULT(MinHeapFreeRatio)) {
++ FLAG_SET_DEFAULT(MinHeapFreeRatio, 0);
++ }
++ if (FLAG_IS_DEFAULT(MaxHeapFreeRatio)) {
++ FLAG_SET_DEFAULT(MaxHeapFreeRatio, 100);
++ }
++ }
++
+ // If no heap maximum was requested explicitly, use some reasonable fraction
+ // of the physical memory, up to a maximum of 1GB.
+ if (UseParallelGC) {
+@@ -1719,7 +1730,7 @@
+ }
+
+ bool Arguments::verify_percentage(uintx value, const char* name) {
+- if (value <= 100) {
++ if (is_percentage(value)) {
+ return true;
+ }
+ jio_fprintf(defaultStream::error_stream(),
+@@ -1768,6 +1779,34 @@
+ }
+ }
+
++bool Arguments::verify_MinHeapFreeRatio(FormatBuffer<80>& err_msg, uintx min_heap_free_ratio) {
++ if (!is_percentage(min_heap_free_ratio)) {
++ err_msg.print("MinHeapFreeRatio must have a value between 0 and 100");
++ return false;
++ }
++ if (min_heap_free_ratio > MaxHeapFreeRatio) {
++ err_msg.print("MinHeapFreeRatio (" UINTX_FORMAT ") must be less than or "
++ "equal to MaxHeapFreeRatio (" UINTX_FORMAT ")", min_heap_free_ratio,
++ MaxHeapFreeRatio);
++ return false;
++ }
++ return true;
++}
++
++bool Arguments::verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio) {
++ if (!is_percentage(max_heap_free_ratio)) {
++ err_msg.print("MaxHeapFreeRatio must have a value between 0 and 100");
++ return false;
++ }
++ if (max_heap_free_ratio < MinHeapFreeRatio) {
++ err_msg.print("MaxHeapFreeRatio (" UINTX_FORMAT ") must be greater than or "
++ "equal to MinHeapFreeRatio (" UINTX_FORMAT ")", max_heap_free_ratio,
++ MinHeapFreeRatio);
++ return false;
++ }
++ return true;
++}
++
+ // Check consistency of GC selection
+ bool Arguments::check_gc_consistency() {
+ check_gclog_consistency();
+@@ -1852,15 +1891,19 @@
+ "AdaptiveSizePolicyWeight");
+ status = status && verify_percentage(AdaptivePermSizeWeight, "AdaptivePermSizeWeight");
+ status = status && verify_percentage(ThresholdTolerance, "ThresholdTolerance");
+- status = status && verify_percentage(MinHeapFreeRatio, "MinHeapFreeRatio");
+- status = status && verify_percentage(MaxHeapFreeRatio, "MaxHeapFreeRatio");
+-
+- if (MinHeapFreeRatio > MaxHeapFreeRatio) {
+- jio_fprintf(defaultStream::error_stream(),
+- "MinHeapFreeRatio (" UINTX_FORMAT ") must be less than or "
+- "equal to MaxHeapFreeRatio (" UINTX_FORMAT ")\n",
+- MinHeapFreeRatio, MaxHeapFreeRatio);
+- status = false;
++
++ {
++ // Using "else if" below to avoid printing two error messages if min > max.
++ // This will also prevent us from reporting both min>100 and max>100 at the
++ // same time, but that is less annoying than printing two identical errors IMHO.
++ FormatBuffer<80> err_msg("");
++ if (!verify_MinHeapFreeRatio(err_msg, MinHeapFreeRatio)) {
++ jio_fprintf(defaultStream::error_stream(), "%s\n", err_msg.buffer());
++ status = false;
++ } else if (!verify_MaxHeapFreeRatio(err_msg, MaxHeapFreeRatio)) {
++ jio_fprintf(defaultStream::error_stream(), "%s\n", err_msg.buffer());
++ status = false;
++ }
+ }
+ // Keeping the heap 100% free is hard ;-) so limit it to 99%.
+ MinHeapFreeRatio = MIN2(MinHeapFreeRatio, (uintx) 99);
+@@ -1943,11 +1986,12 @@
+ // than just disable the lock verification. This will be fixed under
+ // bug 4788986.
+ if (UseConcMarkSweepGC && FLSVerifyAllHeapReferences) {
+- if (VerifyGCStartAt == 0) {
++ if (VerifyDuringStartup) {
+ warning("Heap verification at start-up disabled "
+ "(due to current incompatibility with FLSVerifyAllHeapReferences)");
+- VerifyGCStartAt = 1; // Disable verification at start-up
++ VerifyDuringStartup = false; // Disable verification at start-up
+ }
++
+ if (VerifyBeforeExit) {
+ warning("Heap verification at shutdown disabled "
+ "(due to current incompatibility with FLSVerifyAllHeapReferences)");
+@@ -2549,7 +2593,9 @@
+ FLAG_SET_CMDLINE(uintx, MaxNewSize, NewSize);
+ }
+
++#ifndef _ALLBSD_SOURCE // UseLargePages is not yet supported on BSD.
+ FLAG_SET_DEFAULT(UseLargePages, true);
++#endif
+
+ // Increase some data structure sizes for efficiency
+ FLAG_SET_CMDLINE(uintx, BaseFootPrintEstimate, MaxHeapSize);
+@@ -3111,6 +3157,10 @@
+ UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
+ #endif
+
++#ifdef _ALLBSD_SOURCE // UseLargePages is not yet supported on BSD.
++ UNSUPPORTED_OPTION(UseLargePages, "-XX:+UseLargePages");
++#endif
++
+ #ifndef PRODUCT
+ if (TraceBytecodesAt != 0) {
+ TraceBytecodes = true;
+--- ./hotspot/src/share/vm/runtime/arguments.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/arguments.hpp Wed May 07 19:26:16 2014 -0700
+@@ -27,6 +27,7 @@
+
+ #include "runtime/java.hpp"
+ #include "runtime/perfData.hpp"
++#include "utilities/debug.hpp"
+ #include "utilities/top.hpp"
+
+ // Arguments parses the command line and recognizes options
+@@ -350,6 +351,9 @@
+ static bool is_bad_option(const JavaVMOption* option, jboolean ignore) {
+ return is_bad_option(option, ignore, NULL);
+ }
++ static bool is_percentage(uintx val) {
++ return val <= 100;
++ }
+ static bool verify_interval(uintx val, uintx min,
+ uintx max, const char* name);
+ static bool verify_min_value(intx val, intx min, const char* name);
+@@ -411,6 +415,12 @@
+ public:
+ // Parses the arguments
+ static jint parse(const JavaVMInitArgs* args);
++ // Verifies that the given value will fit as a MinHeapFreeRatio. If not, an error
++ // message is returned in the provided buffer.
++ static bool verify_MinHeapFreeRatio(FormatBuffer<80>& err_msg, uintx min_heap_free_ratio);
++ // Verifies that the given value will fit as a MaxHeapFreeRatio. If not, an error
++ // message is returned in the provided buffer.
++ static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio);
+ // Check for consistency in the selection of the garbage collector.
+ static bool check_gc_consistency();
+ // Check consistecy or otherwise of VM argument settings
+--- ./hotspot/src/share/vm/runtime/frame.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/frame.cpp Wed May 07 19:26:16 2014 -0700
+@@ -23,6 +23,7 @@
+ */
+
+ #include "precompiled.hpp"
++#include "compiler/abstractCompiler.hpp"
+ #include "gc_interface/collectedHeap.inline.hpp"
+ #include "interpreter/interpreter.hpp"
+ #include "interpreter/oopMapCache.hpp"
+@@ -559,7 +560,7 @@
+
+ st->print("%s frame (sp=" INTPTR_FORMAT " unextended sp=" INTPTR_FORMAT, print_name(), sp(), unextended_sp());
+ if (sp() != NULL)
+- st->print(", fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT, fp(), pc());
++ st->print(", fp=" INTPTR_FORMAT ", real_fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT, fp(), real_fp(), pc());
+
+ if (StubRoutines::contains(pc())) {
+ st->print_cr(")");
+@@ -720,10 +721,14 @@
+ } else if (_cb->is_buffer_blob()) {
+ st->print("v ~BufferBlob::%s", ((BufferBlob *)_cb)->name());
+ } else if (_cb->is_nmethod()) {
+- methodOop m = ((nmethod *)_cb)->method();
++ nmethod* nm = (nmethod*)_cb;
++ methodOop m = nm->method();
+ if (m != NULL) {
+ m->name_and_sig_as_C_string(buf, buflen);
+- st->print("J %s", buf);
++ st->print("J %d%s %s %s (%d bytes) @ " PTR_FORMAT " [" PTR_FORMAT "+0x%x]",
++ nm->compile_id(), (nm->is_osr_method() ? "%" : ""),
++ ((nm->compiler() != NULL) ? nm->compiler()->name() : ""),
++ buf, m->code_size(), _pc, _cb->code_begin(), _pc - _cb->code_begin());
+ } else {
+ st->print("J " PTR_FORMAT, pc());
+ }
+--- ./hotspot/src/share/vm/runtime/globals.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/globals.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1697,6 +1697,9 @@
+ product(bool, CMSAbortSemantics, false, \
+ "Whether abort-on-overflow semantics is implemented") \
+ \
++ product(bool, CMSParallelInitialMarkEnabled, false, \
++ "Use the parallel initial mark.") \
++ \
+ product(bool, CMSParallelRemarkEnabled, true, \
+ "Whether parallel remark enabled (only if ParNewGC)") \
+ \
+@@ -1708,6 +1711,14 @@
+ "Whether to always record survivor space PLAB bdries" \
+ " (effective only if CMSParallelSurvivorRemarkEnabled)") \
+ \
++ product(bool, CMSEdenChunksRecordAlways, false, \
++ "Whether to always record eden chunks used for " \
++ "the parallel initial mark or remark of eden" ) \
++ \
++ product(bool, CMSPrintEdenSurvivorChunks, false, \
++ "Print the eden and the survivor chunks used for the parallel " \
++ "initial mark or remark of the eden/survivor spaces") \
++ \
+ product(bool, CMSConcurrentMTEnabled, true, \
+ "Whether multi-threaded concurrent work enabled (if ParNewGC)") \
+ \
+@@ -1917,6 +1928,9 @@
+ notproduct(bool, ExecuteInternalVMTests, false, \
+ "Enable execution of internal VM tests.") \
+ \
++ notproduct(bool, VerboseInternalVMTests, false, \
++ "Turn on logging for internal VM tests.") \
++ \
+ product_pd(bool, UseTLAB, "Use thread-local object allocation") \
+ \
+ product_pd(bool, ResizeTLAB, \
+@@ -2126,6 +2140,13 @@
+ product(intx, PrefetchFieldsAhead, -1, \
+ "How many fields ahead to prefetch in oop scan (<= 0 means off)") \
+ \
++ diagnostic(bool, VerifySilently, false, \
++ "Don't print print the verification progress") \
++ \
++ diagnostic(bool, VerifyDuringStartup, false, \
++ "Verify memory system before executing any Java code " \
++ "during VM initialization") \
++ \
+ diagnostic(bool, VerifyBeforeExit, trueInDebug, \
+ "Verify system before exiting") \
+ \
+@@ -3010,10 +3031,10 @@
+ product_pd(uintx, MaxPermSize, \
+ "Maximum size of permanent generation (in bytes)") \
+ \
+- product(uintx, MinHeapFreeRatio, 40, \
++ manageable(uintx, MinHeapFreeRatio, 40, \
+ "Min percentage of heap free after GC to avoid expansion") \
+ \
+- product(uintx, MaxHeapFreeRatio, 70, \
++ manageable(uintx, MaxHeapFreeRatio, 70, \
+ "Max percentage of heap free after GC to avoid shrinking") \
+ \
+ product(intx, SoftRefLRUPolicyMSPerMB, 1000, \
+--- ./hotspot/src/share/vm/runtime/mutexLocker.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/mutexLocker.cpp Wed May 07 19:26:16 2014 -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
+@@ -57,6 +57,7 @@
+ Mutex* JNIGlobalHandle_lock = NULL;
+ Mutex* JNIHandleBlockFreeList_lock = NULL;
+ Mutex* JNICachedItableIndex_lock = NULL;
++Mutex* MemberNameTable_lock = NULL;
+ Mutex* JmethodIdCreation_lock = NULL;
+ Mutex* JfieldIdCreation_lock = NULL;
+ Monitor* JNICritical_lock = NULL;
+@@ -263,6 +264,7 @@
+ def(Heap_lock , Monitor, nonleaf+1, false);
+ def(JfieldIdCreation_lock , Mutex , nonleaf+1, true ); // jfieldID, Used in VM_Operation
+ def(JNICachedItableIndex_lock , Mutex , nonleaf+1, false); // Used to cache an itable index during JNI invoke
++ def(MemberNameTable_lock , Mutex , nonleaf+1, false); // Used to protect MemberNameTable
+
+ def(CompiledIC_lock , Mutex , nonleaf+2, false); // locks VtableStubs_lock, InlineCacheBuffer_lock
+ def(CompileTaskAlloc_lock , Mutex , nonleaf+2, true );
+--- ./hotspot/src/share/vm/runtime/mutexLocker.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/mutexLocker.hpp Wed May 07 19:26:16 2014 -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
+@@ -51,6 +51,7 @@
+ extern Mutex* JNIGlobalHandle_lock; // a lock on creating JNI global handles
+ extern Mutex* JNIHandleBlockFreeList_lock; // a lock on the JNI handle block free list
+ extern Mutex* JNICachedItableIndex_lock; // a lock on caching an itable index during JNI invoke
++extern Mutex* MemberNameTable_lock; // a lock on the MemberNameTable updates
+ extern Mutex* JmethodIdCreation_lock; // a lock on creating JNI method identifiers
+ extern Mutex* JfieldIdCreation_lock; // a lock on creating JNI static field identifiers
+ extern Monitor* JNICritical_lock; // a lock used while entering and exiting JNI critical regions, allows GC to sometimes get in
+--- ./hotspot/src/share/vm/runtime/os.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/os.hpp Wed May 07 19:26:16 2014 -0700
+@@ -330,8 +330,8 @@
+
+ static char* non_memory_address_word();
+ // reserve, commit and pin the entire memory region
+- static char* reserve_memory_special(size_t size, char* addr = NULL,
+- bool executable = false);
++ static char* reserve_memory_special(size_t size, size_t alignment,
++ char* addr, bool executable);
+ static bool release_memory_special(char* addr, size_t bytes);
+ static void large_page_init();
+ static size_t large_page_size();
+--- ./hotspot/src/share/vm/runtime/sweeper.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/sweeper.cpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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,7 @@
+ #include "runtime/vm_operations.hpp"
+ #include "trace/tracing.hpp"
+ #include "utilities/events.hpp"
++#include "utilities/ticks.inline.hpp"
+ #include "utilities/xmlstream.hpp"
+
+ #ifdef ASSERT
+@@ -148,12 +149,12 @@
+
+ int NMethodSweeper::_number_of_flushes = 0; // Total of full traversals caused by full cache
+ int NMethodSweeper::_total_nof_methods_reclaimed = 0;
+-jlong NMethodSweeper::_total_time_sweeping = 0;
+-jlong NMethodSweeper::_total_time_this_sweep = 0;
+-jlong NMethodSweeper::_peak_sweep_time = 0;
+-jlong NMethodSweeper::_peak_sweep_fraction_time = 0;
+-jlong NMethodSweeper::_total_disconnect_time = 0;
+-jlong NMethodSweeper::_peak_disconnect_time = 0;
++Tickspan NMethodSweeper::_total_time_sweeping;
++Tickspan NMethodSweeper::_total_time_this_sweep;
++Tickspan NMethodSweeper::_peak_sweep_time;
++Tickspan NMethodSweeper::_peak_sweep_fraction_time;
++Tickspan NMethodSweeper::_total_disconnect_time;
++Tickspan NMethodSweeper::_peak_disconnect_time;
+
+ class MarkActivationClosure: public CodeBlobClosure {
+ public:
+@@ -192,7 +193,7 @@
+ _invocations = NmethodSweepFraction;
+ _current = CodeCache::first_nmethod();
+ _traversals += 1;
+- _total_time_this_sweep = 0;
++ _total_time_this_sweep = Tickspan();
+
+ if (PrintMethodFlushing) {
+ tty->print_cr("### Sweep: stack traversal %d", _traversals);
+@@ -256,8 +257,7 @@
+ }
+
+ void NMethodSweeper::sweep_code_cache() {
+-
+- jlong sweep_start_counter = os::elapsed_counter();
++ Ticks sweep_start_counter = Ticks::now();
+
+ _flushed_count = 0;
+ _zombified_count = 0;
+@@ -322,8 +322,8 @@
+ }
+ }
+
+- jlong sweep_end_counter = os::elapsed_counter();
+- jlong sweep_time = sweep_end_counter - sweep_start_counter;
++ const Ticks sweep_end_counter = Ticks::now();
++ const Tickspan sweep_time = sweep_end_counter - sweep_start_counter;
+ _total_time_sweeping += sweep_time;
+ _total_time_this_sweep += sweep_time;
+ _peak_sweep_fraction_time = MAX2(sweep_time, _peak_sweep_fraction_time);
+@@ -344,7 +344,7 @@
+
+ #ifdef ASSERT
+ if(PrintMethodFlushing) {
+- tty->print_cr("### sweeper: sweep time(%d): " INT64_FORMAT, _invocations, (jlong)sweep_time);
++ tty->print_cr("### sweeper: sweep time(%d): " INT64_FORMAT, _invocations, (jlong)sweep_time.value());
+ }
+ #endif
+
+@@ -529,7 +529,7 @@
+ }
+ }
+
+- jlong disconnect_start_counter = os::elapsed_counter();
++ Ticks disconnect_start_counter = Ticks::now();
+
+ // Traverse the code cache trying to dump the oldest nmethods
+ uint curr_max_comp_id = CompileBroker::get_compilation_id();
+@@ -577,8 +577,8 @@
+ CompileBroker::set_should_compile_new_jobs(CompileBroker::stop_compilation);
+ }
+
+- jlong disconnect_end_counter = os::elapsed_counter();
+- jlong disconnect_time = disconnect_end_counter - disconnect_start_counter;
++ const Ticks disconnect_end_counter = Ticks::now();
++ const Tickspan disconnect_time = disconnect_end_counter - disconnect_start_counter;
+ _total_disconnect_time += disconnect_time;
+ _peak_disconnect_time = MAX2(disconnect_time, _peak_disconnect_time);
+
+@@ -597,7 +597,7 @@
+ #ifdef ASSERT
+
+ if(PrintMethodFlushing && Verbose) {
+- tty->print_cr("### sweeper: unload time: " INT64_FORMAT, (jlong)disconnect_time);
++ tty->print_cr("### sweeper: unload time: " INT64_FORMAT, (jlong)disconnect_time.value());
+ }
+ #endif
+ }
+--- ./hotspot/src/share/vm/runtime/sweeper.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/sweeper.hpp Wed May 07 19:26:16 2014 -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
+@@ -25,6 +25,7 @@
+ #ifndef SHARE_VM_RUNTIME_SWEEPER_HPP
+ #define SHARE_VM_RUNTIME_SWEEPER_HPP
+
++#include "utilities/ticks.hpp"
+ // An NmethodSweeper is an incremental cleaner for:
+ // - cleanup inline caches
+ // - reclamation of unreferences zombie nmethods
+@@ -56,12 +57,12 @@
+ // Stat counters
+ static int _number_of_flushes; // Total of full traversals caused by full cache
+ static int _total_nof_methods_reclaimed; // Accumulated nof methods flushed
+- static jlong _total_time_sweeping; // Accumulated time sweeping
+- static jlong _total_time_this_sweep; // Total time this sweep
+- static jlong _peak_sweep_time; // Peak time for a full sweep
+- static jlong _peak_sweep_fraction_time; // Peak time sweeping one fraction
+- static jlong _total_disconnect_time; // Total time cleaning code mem
+- static jlong _peak_disconnect_time; // Peak time cleaning code mem
++ static Tickspan _total_time_sweeping; // Accumulated time sweeping
++ static Tickspan _total_time_this_sweep; // Total time this sweep
++ static Tickspan _peak_sweep_time; // Peak time for a full sweep
++ static Tickspan _peak_sweep_fraction_time; // Peak time sweeping one fraction
++ static Tickspan _total_disconnect_time; // Total time cleaning code mem
++ static Tickspan _peak_disconnect_time; // Peak time cleaning code mem
+
+ static void process_nmethod(nmethod *nm);
+
+@@ -71,13 +72,14 @@
+ static long traversal_count() { return _traversals; }
+ static int number_of_flushes() { return _number_of_flushes; }
+ static int total_nof_methods_reclaimed() { return _total_nof_methods_reclaimed; }
+- static jlong total_time_sweeping() { return _total_time_sweeping; }
+- static jlong peak_sweep_time() { return _peak_sweep_time; }
+- static jlong peak_sweep_fraction_time() { return _peak_sweep_fraction_time; }
+- static jlong total_disconnect_time() { return _total_disconnect_time; }
+- static jlong peak_disconnect_time() { return _peak_disconnect_time; }
++ static const Tickspan total_time_sweeping() { return _total_time_sweeping; }
++ static const Tickspan peak_sweep_time() { return _peak_sweep_time; }
++ static const Tickspan peak_sweep_fraction_time() { return _peak_sweep_fraction_time; }
++ static const Tickspan total_disconnect_time() { return _total_disconnect_time; }
++ static const Tickspan peak_disconnect_time() { return _peak_disconnect_time; }
+
+ #ifdef ASSERT
++ static bool is_sweeping(nmethod* which) { return _current == which; }
+ // Keep track of sweeper activity in the ring buffer
+ static void record_sweep(nmethod* nm, int line);
+ static void report_events(int id, address entry);
+--- ./hotspot/src/share/vm/runtime/thread.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/thread.cpp Wed May 07 19:26:16 2014 -0700
+@@ -3416,9 +3416,10 @@
+ }
+
+ assert (Universe::is_fully_initialized(), "not initialized");
+- if (VerifyBeforeGC && VerifyGCStartAt == 0) {
+- Universe::heap()->prepare_for_verify();
+- Universe::verify(); // make sure we're starting with a clean slate
++ if (VerifyDuringStartup) {
++ // Make sure we're starting with a clean slate.
++ VM_Verify verify_op;
++ VMThread::execute(&verify_op);
+ }
+
+ EXCEPTION_MARK;
+@@ -3504,11 +3505,12 @@
+ java_lang_Thread::set_thread_status(thread_object,
+ java_lang_Thread::RUNNABLE);
+
+- // The VM preresolve methods to these classes. Make sure that get initialized
++ // The VM creates & returns objects of this class. Make sure it's initialized.
++ initialize_class(vmSymbols::java_lang_Class(), CHECK_0);
++
++ // The VM preresolves methods to these classes. Make sure that they get initialized
+ initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0);
+- // The VM creates & returns objects of this class. Make sure it's initialized.
+- initialize_class(vmSymbols::java_lang_Class(), CHECK_0);
+ call_initializeSystemClass(CHECK_0);
+
+ // get the Java runtime name after java.lang.System is initialized
+--- ./hotspot/src/share/vm/runtime/virtualspace.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/virtualspace.cpp Wed May 07 19:26:16 2014 -0700
+@@ -42,8 +42,19 @@
+
+
+ // ReservedSpace
++
++// Dummy constructor
++ReservedSpace::ReservedSpace() : _base(NULL), _size(0), _noaccess_prefix(0),
++ _alignment(0), _special(false), _executable(false) {
++}
++
+ ReservedSpace::ReservedSpace(size_t size) {
+- initialize(size, 0, false, NULL, 0, false);
++ size_t page_size = os::page_size_for_region(size, size, 1);
++ bool large_pages = page_size != (size_t)os::vm_page_size();
++ // Don't force the alignment to be large page aligned,
++ // since that will waste memory.
++ size_t alignment = os::vm_allocation_granularity();
++ initialize(size, alignment, large_pages, NULL, 0, false);
+ }
+
+ ReservedSpace::ReservedSpace(size_t size, size_t alignment,
+@@ -323,16 +334,18 @@
+
+ if (special) {
+
+- base = os::reserve_memory_special(size, requested_address, executable);
++ base = os::reserve_memory_special(size, alignment, requested_address, executable);
+
+ if (base != NULL) {
+ if (failed_to_reserve_as_requested(base, requested_address, size, true)) {
+ // OS ignored requested address. Try different address.
+ return;
+ }
+- // Check alignment constraints
++ // Check alignment constraints.
+ assert((uintptr_t) base % alignment == 0,
+- "Large pages returned a non-aligned address");
++ err_msg("Large pages returned a non-aligned address, base: "
++ PTR_FORMAT " alignment: " PTR_FORMAT,
++ base, (void*)(uintptr_t)alignment));
+ _special = true;
+ } else {
+ // failed; try to reserve regular memory below
+@@ -928,4 +941,188 @@
+ tty->print_cr(" - [low_b, high_b]: [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", low_boundary(), high_boundary());
+ }
+
++
++/////////////// Unit tests ///////////////
++
++#ifndef PRODUCT
++
++#define test_log(...) \
++ do {\
++ if (VerboseInternalVMTests) { \
++ tty->print_cr(__VA_ARGS__); \
++ tty->flush(); \
++ }\
++ } while (false)
++
++class TestReservedSpace : AllStatic {
++ public:
++ static void small_page_write(void* addr, size_t size) {
++ size_t page_size = os::vm_page_size();
++
++ char* end = (char*)addr + size;
++ for (char* p = (char*)addr; p < end; p += page_size) {
++ *p = 1;
++ }
++ }
++
++ static void release_memory_for_test(ReservedSpace rs) {
++ if (rs.special()) {
++ guarantee(os::release_memory_special(rs.base(), rs.size()), "Shouldn't fail");
++ } else {
++ guarantee(os::release_memory(rs.base(), rs.size()), "Shouldn't fail");
++ }
++ }
++
++ static void test_reserved_space1(size_t size, size_t alignment) {
++ test_log("test_reserved_space1(%p)", (void*) (uintptr_t) size);
++
++ assert(is_size_aligned(size, alignment), "Incorrect input parameters");
++
++ ReservedSpace rs(size, // size
++ alignment, // alignment
++ UseLargePages, // large
++ NULL, // requested_address
++ 0); // noacces_prefix
++
++ test_log(" rs.special() == %d", rs.special());
++
++ assert(rs.base() != NULL, "Must be");
++ assert(rs.size() == size, "Must be");
++
++ assert(is_ptr_aligned(rs.base(), alignment), "aligned sizes should always give aligned addresses");
++ assert(is_size_aligned(rs.size(), alignment), "aligned sizes should always give aligned addresses");
++
++ if (rs.special()) {
++ small_page_write(rs.base(), size);
++ }
++
++ release_memory_for_test(rs);
++ }
++
++ static void test_reserved_space2(size_t size) {
++ test_log("test_reserved_space2(%p)", (void*)(uintptr_t)size);
++
++ assert(is_size_aligned(size, os::vm_allocation_granularity()), "Must be at least AG aligned");
++
++ ReservedSpace rs(size);
++
++ test_log(" rs.special() == %d", rs.special());
++
++ assert(rs.base() != NULL, "Must be");
++ assert(rs.size() == size, "Must be");
++
++ if (rs.special()) {
++ small_page_write(rs.base(), size);
++ }
++
++ release_memory_for_test(rs);
++ }
++
++ static void test_reserved_space3(size_t size, size_t alignment, bool maybe_large) {
++ test_log("test_reserved_space3(%p, %p, %d)",
++ (void*)(uintptr_t)size, (void*)(uintptr_t)alignment, maybe_large);
++
++ assert(is_size_aligned(size, os::vm_allocation_granularity()), "Must be at least AG aligned");
++ assert(is_size_aligned(size, alignment), "Must be at least aligned against alignment");
++
++ bool large = maybe_large && UseLargePages && size >= os::large_page_size();
++
++ ReservedSpace rs(size, alignment, large, false);
++
++ test_log(" rs.special() == %d", rs.special());
++
++ assert(rs.base() != NULL, "Must be");
++ assert(rs.size() == size, "Must be");
++
++ if (rs.special()) {
++ small_page_write(rs.base(), size);
++ }
++
++ release_memory_for_test(rs);
++ }
++
++
++ static void test_reserved_space1() {
++ size_t size = 2 * 1024 * 1024;
++ size_t ag = os::vm_allocation_granularity();
++
++ test_reserved_space1(size, ag);
++ test_reserved_space1(size * 2, ag);
++ test_reserved_space1(size * 10, ag);
++ }
++
++ static void test_reserved_space2() {
++ size_t size = 2 * 1024 * 1024;
++ size_t ag = os::vm_allocation_granularity();
++
++ test_reserved_space2(size * 1);
++ test_reserved_space2(size * 2);
++ test_reserved_space2(size * 10);
++ test_reserved_space2(ag);
++ test_reserved_space2(size - ag);
++ test_reserved_space2(size);
++ test_reserved_space2(size + ag);
++ test_reserved_space2(size * 2);
++ test_reserved_space2(size * 2 - ag);
++ test_reserved_space2(size * 2 + ag);
++ test_reserved_space2(size * 3);
++ test_reserved_space2(size * 3 - ag);
++ test_reserved_space2(size * 3 + ag);
++ test_reserved_space2(size * 10);
++ test_reserved_space2(size * 10 + size / 2);
++ }
++
++ static void test_reserved_space3() {
++ size_t ag = os::vm_allocation_granularity();
++
++ test_reserved_space3(ag, ag , false);
++ test_reserved_space3(ag * 2, ag , false);
++ test_reserved_space3(ag * 3, ag , false);
++ test_reserved_space3(ag * 2, ag * 2, false);
++ test_reserved_space3(ag * 4, ag * 2, false);
++ test_reserved_space3(ag * 8, ag * 2, false);
++ test_reserved_space3(ag * 4, ag * 4, false);
++ test_reserved_space3(ag * 8, ag * 4, false);
++ test_reserved_space3(ag * 16, ag * 4, false);
++
++ if (UseLargePages) {
++ size_t lp = os::large_page_size();
++
++ // Without large pages
++ test_reserved_space3(lp, ag * 4, false);
++ test_reserved_space3(lp * 2, ag * 4, false);
++ test_reserved_space3(lp * 4, ag * 4, false);
++ test_reserved_space3(lp, lp , false);
++ test_reserved_space3(lp * 2, lp , false);
++ test_reserved_space3(lp * 3, lp , false);
++ test_reserved_space3(lp * 2, lp * 2, false);
++ test_reserved_space3(lp * 4, lp * 2, false);
++ test_reserved_space3(lp * 8, lp * 2, false);
++
++ // With large pages
++ test_reserved_space3(lp, ag * 4 , true);
++ test_reserved_space3(lp * 2, ag * 4, true);
++ test_reserved_space3(lp * 4, ag * 4, true);
++ test_reserved_space3(lp, lp , true);
++ test_reserved_space3(lp * 2, lp , true);
++ test_reserved_space3(lp * 3, lp , true);
++ test_reserved_space3(lp * 2, lp * 2, true);
++ test_reserved_space3(lp * 4, lp * 2, true);
++ test_reserved_space3(lp * 8, lp * 2, true);
++ }
++ }
++
++ static void test_reserved_space() {
++ test_reserved_space1();
++ test_reserved_space2();
++ test_reserved_space3();
++ }
++};
++
++void TestReservedSpace_test() {
++ TestReservedSpace::test_reserved_space();
++}
++
++#endif // PRODUCT
++
+ #endif
+--- ./hotspot/src/share/vm/runtime/virtualspace.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/virtualspace.hpp Wed May 07 19:26:16 2014 -0700
+@@ -90,6 +90,7 @@
+
+ public:
+ // Constructor
++ ReservedSpace();
+ ReservedSpace(size_t size);
+ ReservedSpace(size_t size, size_t alignment, bool large,
+ char* requested_address = NULL,
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp Wed May 07 19:26:16 2014 -0700
+@@ -305,7 +305,7 @@
+ os::check_heap();
+ // Silent verification so as not to pollute normal output,
+ // unless we really asked for it.
+- Universe::verify(!(PrintGCDetails || Verbose));
++ Universe::verify(!(PrintGCDetails || Verbose) || VerifySilently);
+ }
+
+ CompileBroker::set_should_block();
+--- ./hotspot/src/share/vm/runtime/vm_operations.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/vm_operations.cpp Wed May 07 19:26:16 2014 -0700
+@@ -189,7 +189,8 @@
+ }
+
+ void VM_Verify::doit() {
+- Universe::verify();
++ Universe::heap()->prepare_for_verify();
++ Universe::verify(_silent);
+ }
+
+ bool VM_PrintThreads::doit_prologue() {
+--- ./hotspot/src/share/vm/runtime/vm_operations.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/runtime/vm_operations.hpp Wed May 07 19:26:16 2014 -0700
+@@ -303,9 +303,9 @@
+
+ class VM_Verify: public VM_Operation {
+ private:
+- KlassHandle _dependee;
++ bool _silent;
+ public:
+- VM_Verify() {}
++ VM_Verify(bool silent = VerifySilently) : _silent(silent) {}
+ VMOp_Type type() const { return VMOp_Verify; }
+ void doit();
+ };
+--- ./hotspot/src/share/vm/services/attachListener.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/services/attachListener.cpp Wed May 07 19:26:16 2014 -0700
+@@ -282,6 +282,20 @@
+ return JNI_ERR;
+ }
+ }
++
++ if (strncmp(name, "MaxHeapFreeRatio", 17) == 0) {
++ FormatBuffer<80> err_msg("");
++ if (!Arguments::verify_MaxHeapFreeRatio(err_msg, value)) {
++ out->print_cr(err_msg.buffer());
++ return JNI_ERR;
++ }
++ } else if (strncmp(name, "MinHeapFreeRatio", 17) == 0) {
++ FormatBuffer<80> err_msg("");
++ if (!Arguments::verify_MinHeapFreeRatio(err_msg, value)) {
++ out->print_cr(err_msg.buffer());
++ return JNI_ERR;
++ }
++ }
+ bool res = CommandLineFlags::uintxAtPut((char*)name, &value, ATTACH_ON_DEMAND);
+ if (! res) {
+ out->print_cr("setting flag %s failed", name);
+@@ -470,7 +484,17 @@
+ vmSymbols::threadgroup_string_void_signature(),
+ thread_group,
+ string,
+- CHECK);
++ THREAD);
++
++ if (HAS_PENDING_EXCEPTION) {
++ tty->print_cr("Exception in VM (AttachListener::init) : ");
++ java_lang_Throwable::print(PENDING_EXCEPTION, tty);
++ tty->cr();
++
++ CLEAR_PENDING_EXCEPTION;
++
++ return;
++ }
+
+ KlassHandle group(THREAD, SystemDictionary::ThreadGroup_klass());
+ JavaCalls::call_special(&result,
+@@ -479,7 +503,17 @@
+ vmSymbols::add_method_name(),
+ vmSymbols::thread_void_signature(),
+ thread_oop, // ARG 1
+- CHECK);
++ THREAD);
++
++ if (HAS_PENDING_EXCEPTION) {
++ tty->print_cr("Exception in VM (AttachListener::init) : ");
++ java_lang_Throwable::print(PENDING_EXCEPTION, tty);
++ tty->cr();
++
++ CLEAR_PENDING_EXCEPTION;
++
++ return;
++ }
+
+ { MutexLocker mu(Threads_lock);
+ JavaThread* listener_thread = new JavaThread(&attach_listener_thread_entry);
+--- ./hotspot/src/share/vm/services/management.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/services/management.cpp Wed May 07 19:26:16 2014 -0700
+@@ -851,8 +851,6 @@
+ total_used += u.used();
+ total_committed += u.committed();
+
+- // if any one of the memory pool has undefined init_size or max_size,
+- // set it to -1
+ if (u.init_size() == (size_t)-1) {
+ has_undefined_init_size = true;
+ }
+@@ -869,6 +867,15 @@
+ }
+ }
+
++ // if any one of the memory pool has undefined init_size or max_size,
++ // set it to -1
++ if (has_undefined_init_size) {
++ total_init = (size_t)-1;
++ }
++ if (has_undefined_max_size) {
++ total_max = (size_t)-1;
++ }
++
+ // In our current implementation, we make sure that all non-heap
+ // pools have defined init and max sizes. Heap pools do not matter,
+ // as we never use total_init and total_max for them.
+@@ -1793,6 +1800,18 @@
+ succeed = CommandLineFlags::intxAtPut(name, &ivalue, MANAGEMENT);
+ } else if (flag->is_uintx()) {
+ uintx uvalue = (uintx)new_value.j;
++
++ if (strncmp(name, "MaxHeapFreeRatio", 17) == 0) {
++ FormatBuffer<80> err_msg("");
++ if (!Arguments::verify_MaxHeapFreeRatio(err_msg, uvalue)) {
++ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), err_msg.buffer());
++ }
++ } else if (strncmp(name, "MinHeapFreeRatio", 17) == 0) {
++ FormatBuffer<80> err_msg("");
++ if (!Arguments::verify_MinHeapFreeRatio(err_msg, uvalue)) {
++ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), err_msg.buffer());
++ }
++ }
+ succeed = CommandLineFlags::uintxAtPut(name, &uvalue, MANAGEMENT);
+ } else if (flag->is_uint64_t()) {
+ uint64_t uvalue = (uint64_t)new_value.j;
+--- ./hotspot/src/share/vm/services/memTracker.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/services/memTracker.hpp Wed May 07 19:26:16 2014 -0700
+@@ -302,6 +302,13 @@
+ }
+ }
+
++ static inline void record_virtual_memory_release(address addr, size_t size,
++ Thread* thread = NULL) {
++ if (is_on()) {
++ Tracker tkr(Tracker::Release, thread);
++ tkr.record(addr, size);
++ }
++ }
+
+ // record memory type on virtual memory base address
+ static inline void record_virtual_memory_type(address base, MEMFLAGS flags,
+--- ./hotspot/src/share/vm/trace/noTraceBackend.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/noTraceBackend.hpp Wed May 07 19:26:16 2014 -0700
+@@ -25,9 +25,7 @@
+ #define SHARE_VM_TRACE_NOTRACEBACKEND_HPP
+
+ #include "prims/jni.h"
+-
+-typedef jlong TracingTime;
+-typedef jlong RelativeTracingTime;
++#include "trace/traceTime.hpp"
+
+ class NoTraceBackend {
+ public:
+@@ -44,5 +42,3 @@
+ typedef NoTraceBackend Tracing;
+
+ #endif
+-
+-
+--- ./hotspot/src/share/vm/trace/trace.xml Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/trace.xml Wed May 07 19:26:16 2014 -0700
+@@ -169,8 +169,8 @@
+ <value type="UINT" field="gcId" label="GC ID" relation="GC_ID" />
+ <value type="GCNAME" field="name" label="Name" description="The name of the Garbage Collector" />
+ <value type="GCCAUSE" field="cause" label="Cause" description="The reason for triggering this Garbage Collection" />
+- <value type="RELATIVE_TICKS" field="sumOfPauses" label="Sum of Pauses" description="Sum of all the times in which Java execution was paused during the garbage collection" />
+- <value type="RELATIVE_TICKS" field="longestPause" label="Longest Pause" description="Longest individual pause during the garbage collection" />
++ <value type="TICKSPAN" field="sumOfPauses" label="Sum of Pauses" description="Sum of all the times in which Java execution was paused during the garbage collection" />
++ <value type="TICKSPAN" field="longestPause" label="Longest Pause" description="Longest individual pause during the garbage collection" />
+ </event>
+
+ <event id="GCParallelOld" path="vm/gc/collector/parold_garbage_collection" label="Parallel Old Garbage Collection"
+--- ./hotspot/src/share/vm/trace/traceBackend.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/traceBackend.hpp Wed May 07 19:26:16 2014 -0700
+@@ -26,10 +26,11 @@
+
+ #if INCLUDE_TRACE
+
++#include "runtime/globals.hpp"
++#include "runtime/os.hpp"
+ #include "trace/traceTime.hpp"
+ #include "tracefiles/traceEventIds.hpp"
+-#include "runtime/globals.hpp"
+-#include "runtime/os.hpp"
++
+
+ class TraceBackend {
+ public:
+@@ -44,10 +45,6 @@
+ return os::elapsed_counter();
+ }
+
+- static TracingTime time_adjustment(jlong time) {
+- return time;
+- }
+-
+ static void on_unloading_classes(BoolObjectClosure* is_alive, int no_of_classes_unloading) {
+ }
+ };
+--- ./hotspot/src/share/vm/trace/traceEvent.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/traceEvent.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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,13 +36,10 @@
+ #include "trace/tracing.hpp"
+ #include "tracefiles/traceEventIds.hpp"
+ #include "tracefiles/traceTypes.hpp"
++#include "utilities/ticks.hpp"
+
+ template<typename T>
+ class TraceEvent : public StackObj {
+- protected:
+- jlong _startTime;
+- jlong _endTime;
+-
+ private:
+ bool _started;
+ #ifdef ASSERT
+@@ -52,6 +49,18 @@
+ bool _ignore_check;
+ #endif
+
++ protected:
++ jlong _startTime;
++ jlong _endTime;
++
++ void set_starttime(const TracingTime& time) {
++ _startTime = time;
++ }
++
++ void set_endtime(const TracingTime& time) {
++ _endTime = time;
++ }
++
+ public:
+ TraceEvent(EventStartTime timing=TIMED) :
+ _startTime(0),
+@@ -90,7 +99,7 @@
+ return;
+ }
+ if (_endTime == 0) {
+- static_cast<T *>(this)->set_endtime(Tracing::time());
++ static_cast<T*>(this)->set_endtime(Tracing::time());
+ }
+ if (static_cast<T*>(this)->should_write()) {
+ static_cast<T*>(this)->writeEvent();
+@@ -98,12 +107,12 @@
+ set_commited();
+ }
+
+- void set_starttime(jlong time) {
+- _startTime = time;
++ void set_starttime(const Ticks& time) {
++ _startTime = time.value();
+ }
+
+- void set_endtime(jlong time) {
+- _endTime = time;
++ void set_endtime(const Ticks& time) {
++ _endTime = time.value();
+ }
+
+ TraceEventId id() const {
+--- ./hotspot/src/share/vm/trace/traceEventClasses.xsl Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/traceEventClasses.xsl Wed May 07 19:26:16 2014 -0700
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!--
+- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ Copyright (c) 2012, 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
+@@ -23,8 +23,8 @@
+ -->
+
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:import href="xsl_util.xsl"/>
+ <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+-<xsl:import href="xsl_util.xsl"/>
+
+ <xsl:template match="/">
+ <xsl:call-template name="file-header"/>
+@@ -40,6 +40,7 @@
+ #include "runtime/handles.inline.hpp"
+ #include "tracefiles/traceTypes.hpp"
+ #include "trace/traceEvent.hpp"
++#include "utilities/ticks.hpp"
+
+ #if INCLUDE_TRACE
+
+@@ -54,8 +55,8 @@
+ class TraceEvent {
+ public:
+ TraceEvent() {}
+- void set_starttime(jlong time) const {}
+- void set_endtime(jlong time) const {}
++ void set_starttime(const Ticks&amp; time) {}
++ void set_endtime(const Ticks&amp; time) {}
+ bool should_commit() const { return false; }
+ void commit() const {}
+ };
+@@ -174,20 +175,21 @@
+
+ <xsl:template match="value[@type='TICKS']" mode="write-setters">
+ #if INCLUDE_TRACE
+- <xsl:value-of select="concat('void set_', @field, '(jlong time) { _', @field, ' = time; }')"/>
++<xsl:value-of select="concat(' void set_', @field, '(const Ticks&amp; time) { _', @field, ' = time; }')"/>
+ #else
+- <xsl:value-of select="concat('void set_', @field, '(jlong ignore) {}')"/>
++<xsl:value-of select="concat(' void set_', @field, '(const Ticks&amp; ignore) {}')"/>
+ #endif
+ </xsl:template>
+
+-<xsl:template match="value[@type='RELATIVE_TICKS']" mode="write-setters">
++<xsl:template match="value[@type='TICKSPAN']" mode="write-setters">
+ #if INCLUDE_TRACE
+- <xsl:value-of select="concat('void set_', @field, '(jlong time) { _', @field, ' = time; }')"/>
++ <xsl:value-of select="concat(' void set_', @field, '(const Tickspan&amp; time) { _', @field, ' = time; }')"/>
+ #else
+- <xsl:value-of select="concat('void set_', @field, '(jlong ignore) {}')"/>
++ <xsl:value-of select="concat(' void set_', @field, '(const Tickspan&amp; ignore) {}')"/>
+ #endif
+ </xsl:template>
+
++
+ <xsl:template match="value" mode="write-fields">
+ <xsl:variable name="type" select="@type"/>
+ <xsl:variable name="wt" select="//primary_type[@symbol=$type]/@type"/>
+@@ -227,7 +229,17 @@
+ <xsl:template match="value" mode="write-data">
+ <xsl:variable name="type" select="@type"/>
+ <xsl:variable name="wt" select="//primary_type[@symbol=$type]/@writetype"/>
+- <xsl:value-of select="concat(' ts.print_val(&quot;', @label, '&quot;, _', @field, ');')"/>
++ <xsl:choose>
++ <xsl:when test="@type='TICKSPAN'">
++ <xsl:value-of select="concat(' ts.print_val(&quot;', @label, '&quot;, _', @field, '.value());')"/>
++ </xsl:when>
++ <xsl:when test="@type='TICKS'">
++ <xsl:value-of select="concat(' ts.print_val(&quot;', @label, '&quot;, _', @field, '.value());')"/>
++ </xsl:when>
++ <xsl:otherwise>
++ <xsl:value-of select="concat(' ts.print_val(&quot;', @label, '&quot;, _', @field, ');')"/>
++ </xsl:otherwise>
++ </xsl:choose>
+ <xsl:if test="position() != last()">
+ <xsl:text>
+ ts.print(", ");
+--- ./hotspot/src/share/vm/trace/traceEventIds.xsl Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/traceEventIds.xsl Wed May 07 19:26:16 2014 -0700
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!--
+- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ Copyright (c) 2012, 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
+@@ -23,8 +23,8 @@
+ -->
+
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:import href="xsl_util.xsl"/>
+ <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+-<xsl:import href="xsl_util.xsl"/>
+
+ <xsl:template match="/">
+ <xsl:call-template name="file-header"/>
+--- ./hotspot/src/share/vm/trace/traceMacros.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/traceMacros.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+--- ./hotspot/src/share/vm/trace/traceTime.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/traceTime.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+@@ -28,6 +28,5 @@
+ #include "prims/jni.h"
+
+ typedef jlong TracingTime;
+-typedef jlong RelativeTracingTime;
+
+-#endif
++#endif // SHARE_VM_TRACE_TRACETIME_HPP
+--- ./hotspot/src/share/vm/trace/traceTypes.xsl Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/traceTypes.xsl Wed May 07 19:26:16 2014 -0700
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!--
+- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ Copyright (c) 2012, 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
+@@ -23,8 +23,8 @@
+ -->
+
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:import href="xsl_util.xsl"/>
+ <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
+-<xsl:import href="xsl_util.xsl"/>
+
+ <xsl:template match="/">
+ <xsl:call-template name="file-header"/>
+@@ -32,11 +32,13 @@
+ #ifndef TRACEFILES_JFRTYPES_HPP
+ #define TRACEFILES_JFRTYPES_HPP
+
++
++#include "oops/klassOop.hpp"
++#include "oops/methodOop.hpp"
++#include "oops/symbol.hpp"
+ #include "trace/traceDataTypes.hpp"
+ #include "utilities/globalDefinitions.hpp"
+-#include "oops/symbol.hpp"
+-#include "oops/klassOop.hpp"
+-#include "oops/methodOop.hpp"
++#include "utilities/ticks.hpp"
+
+ enum JVMContentType {
+ _not_a_content_type = (JVM_CONTENT_TYPES_START - 1),
+--- ./hotspot/src/share/vm/trace/tracetypes.xml Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/tracetypes.xml Wed May 07 19:26:16 2014 -0700
+@@ -249,13 +249,13 @@
+ <primary_type symbol="NANOS" datatype="LONG" contenttype="NANOS"
+ type="s8" sizeop="sizeof(s8)"/>
+
+- <!-- 64-bit signed integer, SEMANTIC value ABSOLUTE TICKS -->
++ <!-- 64-bit signed integer, SEMANTIC value TICKS -->
+ <primary_type symbol="TICKS" datatype="LONG" contenttype="TICKS"
+- type="s8" sizeop="sizeof(s8)"/>
++ type="Ticks" sizeop="sizeof(s8)"/>
+
+- <!-- 64-bit signed integer, SEMANTIC value RELATIVE TICKS -->
+- <primary_type symbol="RELATIVE_TICKS" datatype="LONG" contenttype="TICKS"
+- type="s8" sizeop="sizeof(s8)"/>
++ <!-- 64-bit signed integer, SEMANTIC value TICKS duration -->
++ <primary_type symbol="TICKSPAN" datatype="LONG" contenttype="TICKS"
++ type="Tickspan" sizeop="sizeof(s8)"/>
+
+ <!-- 64-bit unsigned integer, SEMANTIC value ADDRESS (mem loc) -->
+ <primary_type symbol="ADDRESS" datatype="U8" contenttype="ADDRESS"
+--- ./hotspot/src/share/vm/trace/tracing.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/trace/tracing.hpp Wed May 07 19:26:16 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+--- ./hotspot/src/share/vm/utilities/globalDefinitions.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed May 07 19:26:16 2014 -0700
+@@ -373,6 +373,14 @@
+
+ #define align_size_up_(size, alignment) (((size) + ((alignment) - 1)) & ~((alignment) - 1))
+
++inline bool is_size_aligned(size_t size, size_t alignment) {
++ return align_size_up_(size, alignment) == size;
++}
++
++inline bool is_ptr_aligned(void* ptr, size_t alignment) {
++ return align_size_up_((intptr_t)ptr, (intptr_t)alignment) == (intptr_t)ptr;
++}
++
+ inline intptr_t align_size_up(intptr_t size, intptr_t alignment) {
+ return align_size_up_(size, alignment);
+ }
+@@ -383,6 +391,14 @@
+ return align_size_down_(size, alignment);
+ }
+
++inline void* align_ptr_up(void* ptr, size_t alignment) {
++ return (void*)align_size_up((intptr_t)ptr, (intptr_t)alignment);
++}
++
++inline void* align_ptr_down(void* ptr, size_t alignment) {
++ return (void*)align_size_down((intptr_t)ptr, (intptr_t)alignment);
++}
++
+ // Align objects by rounding up their size, in HeapWord units.
+
+ #define align_object_size_(size) align_size_up_(size, MinObjAlignment)
+--- ./hotspot/src/share/vm/utilities/growableArray.hpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/utilities/growableArray.hpp Wed May 07 19:26:16 2014 -0700
+@@ -194,6 +194,7 @@
+
+ void clear() { _len = 0; }
+ int length() const { return _len; }
++ int max_length() const { return _max; }
+ void trunc_to(int l) { assert(l <= _len,"cannot increase length"); _len = l; }
+ bool is_empty() const { return _len == 0; }
+ bool is_nonempty() const { return _len != 0; }
+@@ -281,6 +282,13 @@
+ return -1;
+ }
+
++ int find_from_end(const E& elem) const {
++ for (int i = _len-1; i >= 0; i--) {
++ if (_data[i] == elem) return i;
++ }
++ return -1;
++ }
++
+ int find(void* token, bool f(void*, E)) const {
+ for (int i = 0; i < _len; i++) {
+ if (f(token, _data[i])) return i;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/src/share/vm/utilities/ticks.cpp Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,68 @@
++/*
++ * 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.
++ *
++ */
++
++#include "precompiled.hpp"
++#include "runtime/os.hpp"
++#include "utilities/ticks.inline.hpp"
++
++#ifdef ASSERT
++ const jlong Ticks::invalid_time_stamp = -2; // 0xFFFF FFFF`FFFF FFFE
++#endif
++
++void Ticks::stamp() {
++ _stamp_ticks = os::elapsed_counter();
++}
++
++const Ticks Ticks::now() {
++ Ticks t;
++ t.stamp();
++ return t;
++}
++
++Tickspan::Tickspan(const Ticks& end, const Ticks& start) {
++ assert(end.value() != Ticks::invalid_time_stamp, "end is unstamped!");
++ assert(start.value() != Ticks::invalid_time_stamp, "start is unstamped!");
++
++ assert(end >= start, "negative time!");
++
++ _span_ticks = end.value() - start.value();
++}
++
++template <typename ReturnType>
++static ReturnType time_conversion(const Tickspan& span, TicksToTimeHelper::Unit unit) {
++ assert(TicksToTimeHelper::SECONDS == unit ||
++ TicksToTimeHelper::MILLISECONDS == unit, "invalid unit!");
++
++ ReturnType frequency_per_unit = (ReturnType)os::elapsed_frequency() / (ReturnType)unit;
++
++ return (ReturnType) ((ReturnType)span.value() / frequency_per_unit);
++}
++
++double TicksToTimeHelper::seconds(const Tickspan& span) {
++ return time_conversion<double>(span, SECONDS);
++}
++
++jlong TicksToTimeHelper::milliseconds(const Tickspan& span) {
++ return time_conversion<jlong>(span, MILLISECONDS);
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/src/share/vm/utilities/ticks.hpp Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,111 @@
++/*
++ * 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.
++ *
++ */
++
++#ifndef SHARE_VM_UTILITIES_TICKS_HPP
++#define SHARE_VM_UTILITIES_TICKS_HPP
++
++#include "memory/allocation.hpp"
++#include "utilities/globalDefinitions.hpp"
++
++class Ticks;
++
++class Tickspan VALUE_OBJ_CLASS_SPEC {
++ friend class Ticks;
++ friend Tickspan operator-(const Ticks& end, const Ticks& start);
++
++ private:
++ jlong _span_ticks;
++
++ Tickspan(const Ticks& end, const Ticks& start);
++
++ public:
++ Tickspan() : _span_ticks(0) {}
++
++ Tickspan& operator+=(const Tickspan& rhs) {
++ _span_ticks += rhs._span_ticks;
++ return *this;
++ }
++
++ jlong value() const {
++ return _span_ticks;
++ }
++
++};
++
++class Ticks VALUE_OBJ_CLASS_SPEC {
++ private:
++ jlong _stamp_ticks;
++
++ public:
++ Ticks() : _stamp_ticks(0) {
++ assert((_stamp_ticks = invalid_time_stamp) == invalid_time_stamp,
++ "initial unstamped time value assignment");
++ }
++
++ Ticks& operator+=(const Tickspan& span) {
++ _stamp_ticks += span.value();
++ return *this;
++ }
++
++ Ticks& operator-=(const Tickspan& span) {
++ _stamp_ticks -= span.value();
++ return *this;
++ }
++
++ void stamp();
++
++ jlong value() const {
++ return _stamp_ticks;
++ }
++
++ static const Ticks now();
++
++#ifdef ASSERT
++ static const jlong invalid_time_stamp;
++#endif
++
++#ifndef PRODUCT
++ // only for internal use by GC VM tests
++ friend class TimePartitionPhasesIteratorTest;
++ friend class GCTimerTest;
++
++ private:
++ // implicit type conversion
++ Ticks(int ticks) : _stamp_ticks(ticks) {}
++
++#endif // !PRODUCT
++
++};
++
++class TicksToTimeHelper : public AllStatic {
++ public:
++ enum Unit {
++ SECONDS = 1,
++ MILLISECONDS = 1000
++ };
++ static double seconds(const Tickspan& span);
++ static jlong milliseconds(const Tickspan& span);
++};
++
++#endif // SHARE_VM_UTILITIES_TICKS_HPP
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/src/share/vm/utilities/ticks.inline.hpp Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,97 @@
++/*
++ * 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.
++ *
++ */
++
++#ifndef SHARE_VM_UTILITIES_TICKS_INLINE_HPP
++#define SHARE_VM_UTILITIES_TICKS_INLINE_HPP
++
++#include "utilities/ticks.hpp"
++
++inline Tickspan operator+(Tickspan lhs, const Tickspan& rhs) {
++ lhs += rhs;
++ return lhs;
++}
++
++inline bool operator==(const Tickspan& lhs, const Tickspan& rhs) {
++ return lhs.value() == rhs.value();
++}
++
++inline bool operator!=(const Tickspan& lhs, const Tickspan& rhs) {
++ return !operator==(lhs,rhs);
++}
++
++inline bool operator<(const Tickspan& lhs, const Tickspan& rhs) {
++ return lhs.value() < rhs.value();
++}
++
++inline bool operator>(const Tickspan& lhs, const Tickspan& rhs) {
++ return operator<(rhs,lhs);
++}
++
++inline bool operator<=(const Tickspan& lhs, const Tickspan& rhs) {
++ return !operator>(lhs,rhs);
++}
++
++inline bool operator>=(const Tickspan& lhs, const Tickspan& rhs) {
++ return !operator<(lhs,rhs);
++}
++
++inline Ticks operator+(Ticks lhs, const Tickspan& span) {
++ lhs += span;
++ return lhs;
++}
++
++inline Ticks operator-(Ticks lhs, const Tickspan& span) {
++ lhs -= span;
++ return lhs;
++}
++
++inline Tickspan operator-(const Ticks& end, const Ticks& start) {
++ return Tickspan(end, start);
++}
++
++inline bool operator==(const Ticks& lhs, const Ticks& rhs) {
++ return lhs.value() == rhs.value();
++}
++
++inline bool operator!=(const Ticks& lhs, const Ticks& rhs) {
++ return !operator==(lhs,rhs);
++}
++
++inline bool operator<(const Ticks& lhs, const Ticks& rhs) {
++ return lhs.value() < rhs.value();
++}
++
++inline bool operator>(const Ticks& lhs, const Ticks& rhs) {
++ return operator<(rhs,lhs);
++}
++
++inline bool operator<=(const Ticks& lhs, const Ticks& rhs) {
++ return !operator>(lhs,rhs);
++}
++
++inline bool operator>=(const Ticks& lhs, const Ticks& rhs) {
++ return !operator<(lhs,rhs);
++}
++
++#endif // SHARE_VM_UTILITIES_TICKS_INLINE_HPP
+--- ./hotspot/src/share/vm/utilities/vmError.cpp Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/src/share/vm/utilities/vmError.cpp Wed May 07 19:26:16 2014 -0700
+@@ -583,6 +583,13 @@
+ while (count++ < StackPrintLimit) {
+ fr.print_on_error(st, buf, sizeof(buf));
+ st->cr();
++ // Compiled code may use EBP register on x86 so it looks like
++ // non-walkable C frame. Use frame.sender() for java frames.
++ if (_thread && _thread->is_Java_thread() && fr.is_java_frame()) {
++ RegisterMap map((JavaThread*)_thread, false); // No update
++ fr = fr.sender(&map);
++ continue;
++ }
+ if (os::is_first_C_frame(&fr)) break;
+ fr = os::get_sender_for_C_frame(&fr);
+ }
+@@ -698,18 +705,6 @@
+ st->cr();
+ }
+
+-#ifdef LINUX
+- STEP(193, "(printing large pages allocation errors)")
+-
+- if (_verbose) {
+- jint largepage_failures = os::Linux::num_largepage_commit_fails;
+- if (largepage_failures > 0) {
+- st->print_cr("Large page allocation failures have occurred " INT32_FORMAT " times", largepage_failures);
+- st->cr();
+- }
+- }
+-#endif
+-
+ STEP(195, "(printing code cache information)" )
+
+ if (_verbose && Universe::is_fully_initialized()) {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/8004051/Test8004051.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,56 @@
++/*
++ * 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 8004051
++ * @bug 8005722
++ * @summary assert(_oprs_len[mode] < maxNumberOfOperands) failed: array overflow
++ *
++ * @run main/othervm -Xcomp -client Test8004051
++ */
++
++public class Test8004051 {
++ public static void main(String[] argv) {
++ Object o = new Object();
++ fillPrimRect(1.1f, 1.2f, 1.3f, 1.4f,
++ o, o,
++ 1.5f, 1.6f, 1.7f, 1.8f,
++ 2.0f, 2.1f, 2.2f, 2.3f,
++ 2.4f, 2.5f, 2.6f, 2.7f,
++ 100, 101);
++ System.out.println("Test passed, test did not assert");
++ }
++
++ static boolean fillPrimRect(float x, float y, float w, float h,
++ Object rectTex, Object wrapTex,
++ float bx, float by, float bw, float bh,
++ float f1, float f2, float f3, float f4,
++ float f5, float f6, float f7, float f8,
++ int i1, int i2 ) {
++ System.out.println(x + " " + y + " " + w + " " + h + " " +
++ bx + " " + by + " " + bw + " " + bh);
++ return true;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/codegen/LoadWithMask.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,44 @@
++/*
++ * 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 8032207
++ * @summary Invalid node sizing for loadUS2L_immI16 and loadI2L_immI
++ * @run main/othervm -server -Xbatch -XX:-TieredCompilation -XX:CompileCommand=compileonly,LoadWithMask.foo LoadWithMask
++ *
++ */
++public class LoadWithMask {
++ static int x[] = new int[1];
++ static long foo() {
++ return x[0] & 0xfff0ffff;
++ }
++
++ public static void main(String[] args) {
++ x[0] = -1;
++ long l = 0;
++ for (int i = 0; i < 100000; ++i) {
++ l = foo();
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/codegen/LoadWithMask2.java Wed May 07 19:26:16 2014 -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.
++ *
++ * 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 8031743
++ * @summary loadI2L_immI broken for negative memory values
++ * @run main/othervm -server -Xbatch -XX:-TieredCompilation -XX:CompileCommand=compileonly,*.foo* LoadWithMask2
++ *
++ */
++public class LoadWithMask2 {
++ static int x;
++ static long foo1() {
++ return x & 0xfffffffe;
++ }
++ static long foo2() {
++ return x & 0xff000000;
++ }
++ static long foo3() {
++ return x & 0x8abcdef1;
++ }
++
++ public static void main(String[] args) {
++ x = -1;
++ long l = 0;
++ for (int i = 0; i < 100000; ++i) {
++ l = foo1() & foo2() & foo3();
++ }
++ if (l > 0) {
++ System.out.println("FAILED");
++ System.exit(97);
++ }
++ System.out.println("PASSED");
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/gcbarriers/G1CrashTest.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,84 @@
++/*
++ * 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 8023472
++ * @summary C2 optimization breaks with G1
++ *
++ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -Dcount=100000 G1CrashTest
++ *
++ * @author pbiswal@palantir.com
++ */
++
++public class G1CrashTest {
++ static Object[] set = new Object[11];
++
++ public static void main(String[] args) throws InterruptedException {
++ for (int j = 0; j < Integer.getInteger("count"); j++) {
++ Object key = new Object();
++ insertKey(key);
++ if (j > set.length / 2) {
++ Object[] oldKeys = set;
++ set = new Object[2 * set.length - 1];
++ for (Object o : oldKeys) {
++ if (o != null)
++ insertKey(o);
++ }
++ }
++ }
++ }
++
++ static void insertKey(Object key) {
++ int hash = key.hashCode() & 0x7fffffff;
++ int index = hash % set.length;
++ Object cur = set[index];
++ if (cur == null)
++ set[index] = key;
++ else
++ insertKeyRehash(key, index, hash, cur);
++ }
++
++ static void insertKeyRehash(Object key, int index, int hash, Object cur) {
++ int loopIndex = index;
++ int firstRemoved = -1;
++ do {
++ if (cur == "dead")
++ firstRemoved = 1;
++ index--;
++ if (index < 0)
++ index += set.length;
++ cur = set[index];
++ if (cur == null) {
++ if (firstRemoved != -1)
++ set[firstRemoved] = "dead";
++ else
++ set[index] = key;
++ return;
++ }
++ } while (index != loopIndex);
++ if (firstRemoved != -1)
++ set[firstRemoved] = null;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/print/PrintInlining.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,36 @@
++/*
++ * 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 8022585
++ * @summary VM crashes when ran with -XX:+PrintInlining
++ * @run main/othervm -Xcomp -XX:+PrintInlining PrintInlining
++ *
++ */
++
++public class PrintInlining {
++ public static void main(String[] args) {
++ System.out.println("Passed");
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/reflection/ArrayNewInstanceOfVoid.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,44 @@
++/*
++ * 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 8029366
++ * @summary ShouldNotReachHere error when creating an array with component type of void
++ */
++
++public class ArrayNewInstanceOfVoid {
++ public static void main(String[] args) {
++ for (int i = 0; i < 100_000; i++) {
++ test();
++ }
++ }
++
++ private static void test() {
++ try {
++ java.lang.reflect.Array.newInstance(void.class, 2);
++ } catch (IllegalArgumentException e) {
++ // expected
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,45 @@
++/*
++ * 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 8027751
++ * @summary C1 crashes generating G1 post-barrier in Unsafe.getAndSetObject() intrinsic because of the new value spill
++ * @run main/othervm -XX:+UseG1GC C1ObjectSpillInLogicOp
++ *
++ * G1 barriers use logical operators (xor) on T_OBJECT mixed with T_LONG or T_INT.
++ * The current implementation of logical operations on x86 in C1 doesn't allow for long operands to be on stack.
++ * There is a special code in the register allocator that forces long arguments in registers on x86. However T_OBJECT
++ * can be spilled just fine, and in that case the xor emission will fail.
++ */
++
++import java.util.concurrent.atomic.*;
++public class C1ObjectSpillInLogicOp {
++ static public void main(String[] args) {
++ AtomicReferenceArray<Integer> x = new AtomicReferenceArray(128);
++ Integer y = new Integer(0);
++ for (int i = 0; i < 50000; i++) {
++ x.getAndSet(i % x.length(), y);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/8000311/Test8000311.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,42 @@
++/*
++ * 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 Test8000311
++ * @key gc
++ * @bug 8000311
++ * @summary G1: ParallelGCThreads==0 broken
++ * @run main/othervm -XX:+UseG1GC -XX:ParallelGCThreads=0 -XX:+ResizePLAB -XX:+ExplicitGCInvokesConcurrent Test8000311
++ * @author filipp.zhinkin@oracle.com
++ */
++
++import java.util.*;
++
++public class Test8000311 {
++ public static void main(String args[]) {
++ for(int i = 0; i<100; i++) {
++ byte[] garbage = new byte[1000];
++ System.gc();
++ }
++ }
++}
+--- ./hotspot/test/gc/TestVerifyBeforeGCDuringStartup.java Tue Mar 18 12:31:20 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,45 +0,0 @@
+-/*
+- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation.
+- *
+- * 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 TestVerifyBeforeGCDuringStartup.java
+- * @key gc
+- * @bug 8010463
+- * @summary Simple test run with -XX:+VerifyBeforeGC -XX:-UseTLAB to verify 8010463
+- * @library /testlibrary
+- */
+-
+-import com.oracle.java.testlibrary.OutputAnalyzer;
+-import com.oracle.java.testlibrary.ProcessTools;
+-
+-public class TestVerifyBeforeGCDuringStartup {
+- public static void main(String args[]) throws Exception {
+- ProcessBuilder pb =
+- ProcessTools.createJavaProcessBuilder(System.getProperty("test.vm.opts"),
+- "-XX:-UseTLAB",
+- "-XX:+UnlockDiagnosticVMOptions",
+- "-XX:+VerifyBeforeGC", "-version");
+- OutputAnalyzer output = new OutputAnalyzer(pb.start());
+- output.shouldContain("[Verifying");
+- output.shouldHaveExitValue(0);
+- }
+-}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/TestVerifyDuringStartup.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,45 @@
++/*
++ * 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 TestVerifyDuringStartup.java
++ * @key gc
++ * @bug 8010463
++ * @summary Simple test run with -XX:+VerifyDuringStartup -XX:-UseTLAB to verify 8010463
++ * @library /testlibrary
++ */
++
++import com.oracle.java.testlibrary.OutputAnalyzer;
++import com.oracle.java.testlibrary.ProcessTools;
++
++public class TestVerifyDuringStartup {
++ public static void main(String args[]) throws Exception {
++ ProcessBuilder pb =
++ ProcessTools.createJavaProcessBuilder(System.getProperty("test.vm.opts"),
++ "-XX:-UseTLAB",
++ "-XX:+UnlockDiagnosticVMOptions",
++ "-XX:+VerifyDuringStartup", "-version");
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++ output.shouldContain("[Verifying");
++ output.shouldHaveExitValue(0);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/TestVerifySilently.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,84 @@
++/*
++ * 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 TestVerifySilently.java
++ * @key gc
++ * @bug 8032771
++ * @summary Test silent verification.
++ * @library /testlibrary
++ */
++
++import com.oracle.java.testlibrary.OutputAnalyzer;
++import com.oracle.java.testlibrary.ProcessTools;
++import java.util.ArrayList;
++import java.util.Collections;
++
++class RunSystemGC {
++ public static void main(String args[]) throws Exception {
++ System.gc();
++ }
++}
++
++
++public class TestVerifySilently {
++ private static String[] getTestJavaOpts() {
++ String testVmOptsStr = System.getProperty("test.java.opts");
++ if (!testVmOptsStr.isEmpty()) {
++ return testVmOptsStr.split(" ");
++ } else {
++ return new String[] {};
++ }
++ }
++
++ private static OutputAnalyzer runTest(boolean verifySilently) throws Exception {
++ ArrayList<String> vmOpts = new ArrayList();
++
++ Collections.addAll(vmOpts, getTestJavaOpts());
++ Collections.addAll(vmOpts, new String[] {"-XX:+UnlockDiagnosticVMOptions",
++ "-XX:+VerifyDuringStartup",
++ "-XX:+VerifyBeforeGC",
++ "-XX:+VerifyAfterGC",
++ "-XX:" + (verifySilently ? "+":"-") + "VerifySilently",
++ RunSystemGC.class.getName()});
++ ProcessBuilder pb =
++ ProcessTools.createJavaProcessBuilder(vmOpts.toArray(new String[vmOpts.size()]));
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++
++ System.out.println("Output:\n" + output.getOutput());
++ return output;
++ }
++
++
++ public static void main(String args[]) throws Exception {
++
++ OutputAnalyzer output;
++
++ output = runTest(false);
++ output.shouldContain("[Verifying");
++ output.shouldHaveExitValue(0);
++
++ output = runTest(true);
++ output.shouldNotContain("[Verifying");
++ output.shouldHaveExitValue(0);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,64 @@
++/*
++ * 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 TestDynMaxHeapFreeRatio
++ * @bug 8028391
++ * @summary Verify that MaxHeapFreeRatio flag is manageable
++ * @library /testlibrary
++ * @run main TestDynMaxHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=0 -XX:MaxHeapFreeRatio=100 TestDynMaxHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 -XX:-UseAdaptiveSizePolicy TestDynMaxHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 TestDynMaxHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=51 -XX:MaxHeapFreeRatio=52 TestDynMaxHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=75 -XX:MaxHeapFreeRatio=100 TestDynMaxHeapFreeRatio
++ */
++import com.oracle.java.testlibrary.TestDynamicVMOption;
++import com.oracle.java.testlibrary.DynamicVMOptionChecker;
++
++public class TestDynMaxHeapFreeRatio extends TestDynamicVMOption {
++
++ public static final String MinFreeRatioFlagName = "MinHeapFreeRatio";
++ public static final String MaxFreeRatioFlagName = "MaxHeapFreeRatio";
++
++ public TestDynMaxHeapFreeRatio() {
++ super(MaxFreeRatioFlagName);
++ }
++
++ public void test() {
++
++ int minHeapFreeValue = DynamicVMOptionChecker.getIntValue(MinFreeRatioFlagName);
++ System.out.println(MinFreeRatioFlagName + " = " + minHeapFreeValue);
++
++ testPercentageValues();
++
++ checkInvalidValue(Integer.toString(minHeapFreeValue - 1));
++ checkValidValue(Integer.toString(minHeapFreeValue));
++ checkValidValue("100");
++ }
++
++ public static void main(String args[]) throws Exception {
++ new TestDynMaxHeapFreeRatio().test();
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,62 @@
++/*
++ * 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 TestDynMinHeapFreeRatio
++ * @bug 8028391
++ * @summary Verify that MinHeapFreeRatio flag is manageable
++ * @library /testlibrary
++ * @run main TestDynMinHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=0 -XX:MaxHeapFreeRatio=100 TestDynMinHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 -XX:-UseAdaptiveSizePolicy TestDynMinHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 TestDynMinHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=51 -XX:MaxHeapFreeRatio=52 TestDynMinHeapFreeRatio
++ * @run main/othervm -XX:MinHeapFreeRatio=75 -XX:MaxHeapFreeRatio=100 TestDynMinHeapFreeRatio
++ */
++import com.oracle.java.testlibrary.TestDynamicVMOption;
++import com.oracle.java.testlibrary.DynamicVMOptionChecker;
++
++public class TestDynMinHeapFreeRatio extends TestDynamicVMOption {
++
++ public static final String MinFreeRatioFlagName = "MinHeapFreeRatio";
++ public static final String MaxFreeRatioFlagName = "MaxHeapFreeRatio";
++
++ public TestDynMinHeapFreeRatio() {
++ super(MinFreeRatioFlagName);
++ }
++
++ public void test() {
++ int maxHeapFreeValue = DynamicVMOptionChecker.getIntValue(MaxFreeRatioFlagName);
++ System.out.println(MaxFreeRatioFlagName + " = " + maxHeapFreeValue);
++
++ testPercentageValues();
++
++ checkInvalidValue(Integer.toString(maxHeapFreeValue + 1));
++ checkValidValue(Integer.toString(maxHeapFreeValue));
++ checkValidValue("0");
++ }
++
++ public static void main(String args[]) throws Exception {
++ new TestDynMinHeapFreeRatio().test();
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,143 @@
++/*
++ * 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
++ * @key regression
++ * @key gc
++ * @bug 8027756
++ * @library /testlibrary /testlibrary/whitebox
++ * @build TestHumongousCodeCacheRoots
++ * @run main ClassFileInstaller sun.hotspot.WhiteBox
++ * @summary Humongous objects may have references from the code cache
++ * @run main TestHumongousCodeCacheRoots
++*/
++
++import com.oracle.java.testlibrary.*;
++import sun.hotspot.WhiteBox;
++
++import java.util.ArrayList;
++import java.util.Arrays;
++
++class TestHumongousCodeCacheRootsHelper {
++
++ static final int n = 1000000;
++ static final int[] AA = new int[n];
++ static final int[] BB = new int[n];
++
++ public static void main(String args[]) throws Exception {
++ // do some work so that the compiler compiles this method, inlining the
++ // reference to the integer array (which is a humonguous object) into
++ // the code cache.
++ for(int i = 0; i < n; i++) {
++ AA[i] = 0;
++ BB[i] = 0;
++ }
++ // trigger a GC that checks that the verification code allows humongous
++ // objects with code cache roots; objects should be all live here.
++ System.gc();
++
++ // deoptimize everyhing: this should make all compiled code zombies.
++ WhiteBox wb = WhiteBox.getWhiteBox();
++ wb.deoptimizeAll();
++
++ // trigger a GC that checks that the verification code allows humongous
++ // objects with code cache roots; objects should be all live here.
++ System.gc();
++
++ // wait a little for the code cache sweeper to try to clean up zombie nmethods
++ // and unregister the code roots.
++ try { Thread.sleep(5000); } catch (InterruptedException ex) { }
++
++ // do some work on the arrays to make sure that they need to be live after the GCs
++ for(int i = 0; i < n; i++) {
++ AA[i] = 1;
++ BB[i] = 10;
++ }
++
++ System.out.println();
++ }
++}
++
++public class TestHumongousCodeCacheRoots {
++
++ /**
++ * Executes a class in a new VM process with the given parameters.
++ * @param vmargs Arguments to the VM to run
++ * @param classname Name of the class to run
++ * @param arguments Arguments to the class
++ * @param useTestDotJavaDotOpts Use test.java.opts as part of the VM argument string
++ * @return The OutputAnalyzer with the results for the invocation.
++ */
++ public static OutputAnalyzer runWhiteBoxTest(String[] vmargs, String classname, String[] arguments, boolean useTestDotJavaDotOpts) throws Exception {
++ ArrayList<String> finalargs = new ArrayList<String>();
++
++ String[] whiteboxOpts = new String[] {
++ "-Xbootclasspath/a:.",
++ "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI",
++ "-cp", System.getProperty("java.class.path"),
++ };
++
++ if (useTestDotJavaDotOpts) {
++ // System.getProperty("test.java.opts") is '' if no options is set,
++ // we need to skip such a result
++ String[] externalVMOpts = new String[0];
++ if (System.getProperty("test.java.opts") != null && System.getProperty("test.java.opts").length() != 0) {
++ externalVMOpts = System.getProperty("test.java.opts").split(" ");
++ }
++ finalargs.addAll(Arrays.asList(externalVMOpts));
++ }
++
++ finalargs.addAll(Arrays.asList(vmargs));
++ finalargs.addAll(Arrays.asList(whiteboxOpts));
++ finalargs.add(classname);
++ finalargs.addAll(Arrays.asList(arguments));
++
++ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(finalargs.toArray(new String[0]));
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++ output.shouldHaveExitValue(0);
++
++ return output;
++ }
++
++ public static void runTest(String compiler, String[] other) throws Exception {
++ ArrayList<String> joined = new ArrayList<String>();
++ joined.add(compiler);
++ joined.addAll(Arrays.asList(other));
++ runWhiteBoxTest(joined.toArray(new String[0]), TestHumongousCodeCacheRootsHelper.class.getName(),
++ new String[] {}, false);
++ }
++
++ public static void main(String[] args) throws Exception {
++ final String[] baseArguments = new String[] {
++ "-XX:+UseG1GC", "-XX:G1HeapRegionSize=1M", "-Xmx100M", // make sure we get a humongous region
++ "-XX:+UnlockDiagnosticVMOptions",
++ "-XX:InitiatingHeapOccupancyPercent=1", // strong code root marking
++ "-XX:+G1VerifyHeapRegionCodeRoots", "-XX:+VerifyAfterGC", // make sure that verification is run
++ "-XX:NmethodSweepFraction=1", "-XX:NmethodSweepCheckInterval=1", // make the code cache sweep more predictable
++ };
++ runTest("-client", baseArguments);
++ runTest("-server", baseArguments);
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,92 @@
++/*
++ * 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 TestPrintRegionRememberedSetInfo
++ * @key gc
++ * @bug 8014240
++ * @summary Test output of G1PrintRegionRememberedSetInfo
++ * @library /testlibrary
++ * @run main TestPrintRegionRememberedSetInfo
++ * @author thomas.schatzl@oracle.com
++ */
++
++import com.oracle.java.testlibrary.*;
++import java.lang.Thread;
++import java.util.ArrayList;
++import java.util.Arrays;
++
++class RunAndWaitForMarking {
++ public static void main(String[] args) {
++ System.gc();
++ try {
++ Thread.sleep(200);
++ } catch (InterruptedException e) {
++ }
++ }
++}
++
++public class TestPrintRegionRememberedSetInfo {
++
++ public static String runTest(String arg) throws Exception {
++ ArrayList<String> finalargs = new ArrayList<String>();
++ String[] defaultArgs = new String[] {
++ "-XX:+UseG1GC",
++ "-Xmx10m",
++ "-XX:+ExplicitGCInvokesConcurrent",
++ "-XX:+UnlockDiagnosticVMOptions",
++ "-XX:+G1PrintRegionLivenessInfo",
++ "-XX:G1HeapRegionSize=1M",
++ "-XX:InitiatingHeapOccupancyPercent=0",
++ };
++
++ finalargs.addAll(Arrays.asList(defaultArgs));
++ finalargs.add(arg);
++
++ finalargs.add(RunAndWaitForMarking.class.getName());
++
++ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
++ finalargs.toArray(new String[0]));
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++ output.shouldHaveExitValue(0);
++
++ String result = output.getStdout();
++ return result;
++ }
++
++ public static void main(String[] args) throws Exception {
++ String result;
++
++ result = runTest("-XX:+G1PrintRegionLivenessInfo");
++ // check that we got region statistics output
++ if (result.indexOf("PHASE") == -1) {
++ throw new RuntimeException("Unexpected output from -XX:+PrintRegionLivenessInfo found.");
++ }
++
++ result = runTest("-XX:-G1PrintRegionLivenessInfo");
++ if (result.indexOf("remset") != -1) {
++ throw new RuntimeException("Should find remembered set information in output.");
++ }
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/g1/TestSummarizeRSetStats.java Wed May 07 19:26:16 2014 -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.
++ */
++
++/*
++ * @test TestSummarizeRSetStats.java
++ * @bug 8013895
++ * @library /testlibrary
++ * @build TestSummarizeRSetStatsTools TestSummarizeRSetStats
++ * @summary Verify output of -XX:+G1SummarizeRSetStats
++ * @run main TestSummarizeRSetStats
++ *
++ * Test the output of G1SummarizeRSetStats in conjunction with G1SummarizeRSetStatsPeriod.
++ */
++
++public class TestSummarizeRSetStats {
++
++ public static void main(String[] args) throws Exception {
++ String result;
++
++ if (!TestSummarizeRSetStatsTools.testingG1GC()) {
++ return;
++ }
++
++ // no remembered set summary output
++ result = TestSummarizeRSetStatsTools.runTest(null, 0);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 0, 0);
++
++ // no remembered set summary output
++ result = TestSummarizeRSetStatsTools.runTest(null, 2);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 0, 0);
++
++ // no remembered set summary output
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:G1SummarizeRSetStatsPeriod=1" }, 3);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 0, 0);
++
++ // single remembered set summary output at the end
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats" }, 0);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 0);
++
++ // single remembered set summary output at the end
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats" }, 2);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 0);
++
++ // single remembered set summary output
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1" }, 0);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 0);
++
++ // two times remembered set summary output
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1" }, 1);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 2);
++
++ // four times remembered set summary output
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1" }, 3);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 6);
++
++ // three times remembered set summary output
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=2" }, 3);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 4);
++
++ // single remembered set summary output
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=100" }, 3);
++ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 2);
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsPerRegion.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,55 @@
++/*
++ * 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 TestSummarizeRSetStatsPerRegion.java
++ * @bug 8014078
++ * @library /testlibrary
++ * @build TestSummarizeRSetStatsTools TestSummarizeRSetStatsPerRegion
++ * @summary Verify output of -XX:+G1SummarizeRSetStats in regards to per-region type output
++ * @run main TestSummarizeRSetStatsPerRegion
++ */
++
++import com.oracle.java.testlibrary.*;
++import java.lang.Thread;
++import java.util.ArrayList;
++import java.util.Arrays;
++
++public class TestSummarizeRSetStatsPerRegion {
++
++ public static void main(String[] args) throws Exception {
++ String result;
++
++ if (!TestSummarizeRSetStatsTools.testingG1GC()) {
++ return;
++ }
++
++ // single remembered set summary output at the end
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats" }, 0);
++ TestSummarizeRSetStatsTools.expectPerRegionRSetSummaries(result, 1, 0);
++
++ // two times remembered set summary output
++ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1" }, 1);
++ TestSummarizeRSetStatsTools.expectPerRegionRSetSummaries(result, 1, 2);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsThreads.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,83 @@
++/*
++ * 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 TestSummarizeRSetStatsThreads
++ * @bug 8025441
++ * @summary Ensure that various values of worker threads/concurrent
++ * refinement threads do not crash the VM.
++ * @key gc
++ * @library /testlibrary
++ */
++
++import java.util.regex.Matcher;
++import java.util.regex.Pattern;
++
++import com.oracle.java.testlibrary.ProcessTools;
++import com.oracle.java.testlibrary.OutputAnalyzer;
++
++public class TestSummarizeRSetStatsThreads {
++
++ private static void runTest(int refinementThreads, int workerThreads) throws Exception {
++ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
++ "-XX:+UnlockDiagnosticVMOptions",
++ "-XX:+G1SummarizeRSetStats",
++ "-XX:G1ConcRefinementThreads=" + refinementThreads,
++ "-XX:ParallelGCThreads=" + workerThreads,
++ "-version");
++
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++
++ // check output to contain the string "Concurrent RS threads times (s)" followed by
++ // the correct number of values in the next line.
++
++ // a zero in refinement thread numbers indicates that the value in ParallelGCThreads should be used.
++ // Additionally use at least one thread.
++ int expectedNumRefinementThreads = refinementThreads == 0 ? workerThreads : refinementThreads;
++ expectedNumRefinementThreads = Math.max(1, expectedNumRefinementThreads);
++ // create the pattern made up of n copies of a floating point number pattern
++ String numberPattern = String.format("%0" + expectedNumRefinementThreads + "d", 0)
++ .replace("0", "\\s+\\d+\\.\\d+");
++ String pattern = "Concurrent RS threads times \\(s\\)$" + numberPattern + "$";
++ Matcher m = Pattern.compile(pattern, Pattern.MULTILINE).matcher(output.getStdout());
++
++ if (!m.find()) {
++ throw new Exception("Could not find correct output for concurrent RS threads times in stdout," +
++ " should match the pattern \"" + pattern + "\", but stdout is \n" + output.getStdout());
++ }
++ output.shouldHaveExitValue(0);
++ }
++
++ public static void main(String[] args) throws Exception {
++ if (!TestSummarizeRSetStatsTools.testingG1GC()) {
++ return;
++ }
++ // different valid combinations of number of refinement and gc worker threads
++ runTest(0, 0);
++ runTest(0, 5);
++ runTest(5, 0);
++ runTest(10, 10);
++ runTest(1, 2);
++ runTest(4, 3);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsTools.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,154 @@
++/*
++ * 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.
++ */
++
++/*
++ * Common helpers for TestSummarizeRSetStats* tests
++ */
++
++import sun.management.ManagementFactoryHelper;
++import com.sun.management.HotSpotDiagnosticMXBean;
++import com.sun.management.VMOption;
++
++import com.oracle.java.testlibrary.*;
++import java.util.regex.Matcher;
++import java.util.regex.Pattern;
++import java.lang.Thread;
++import java.util.ArrayList;
++import java.util.Arrays;
++
++class VerifySummaryOutput {
++ // 4M size, both are directly allocated into the old gen
++ static Object[] largeObject1 = new Object[1024 * 1024];
++ static Object[] largeObject2 = new Object[1024 * 1024];
++
++ static int[] temp;
++
++ public static void main(String[] args) {
++ // create some cross-references between these objects
++ for (int i = 0; i < largeObject1.length; i++) {
++ largeObject1[i] = largeObject2;
++ }
++
++ for (int i = 0; i < largeObject2.length; i++) {
++ largeObject2[i] = largeObject1;
++ }
++
++ int numGCs = Integer.parseInt(args[0]);
++
++ if (numGCs > 0) {
++ // try to force a minor collection: the young gen is 4M, the
++ // amount of data allocated below is roughly that (4*1024*1024 +
++ // some header data)
++ for (int i = 0; i < 1024 ; i++) {
++ temp = new int[1024];
++ }
++ }
++
++ for (int i = 0; i < numGCs - 1; i++) {
++ System.gc();
++ }
++ }
++}
++
++public class TestSummarizeRSetStatsTools {
++
++ // the VM is currently run using G1GC, i.e. trying to test G1 functionality.
++ public static boolean testingG1GC() {
++ HotSpotDiagnosticMXBean diagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
++
++ VMOption option = diagnostic.getVMOption("UseG1GC");
++ if (option.getValue().equals("false")) {
++ System.out.println("Skipping this test. It is only a G1 test.");
++ return false;
++ }
++ return true;
++ }
++
++ public static String runTest(String[] additionalArgs, int numGCs) throws Exception {
++ ArrayList<String> finalargs = new ArrayList<String>();
++ String[] defaultArgs = new String[] {
++ "-XX:+UseG1GC",
++ "-XX:+UseCompressedOops",
++ "-Xmn4m",
++ "-Xmx20m",
++ "-XX:InitiatingHeapOccupancyPercent=100", // we don't want the additional GCs due to initial marking
++ "-XX:+PrintGC",
++ "-XX:+UnlockDiagnosticVMOptions",
++ "-XX:G1HeapRegionSize=1M",
++ };
++
++ finalargs.addAll(Arrays.asList(defaultArgs));
++
++ if (additionalArgs != null) {
++ finalargs.addAll(Arrays.asList(additionalArgs));
++ }
++
++ finalargs.add(VerifySummaryOutput.class.getName());
++ finalargs.add(String.valueOf(numGCs));
++
++ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
++ finalargs.toArray(new String[0]));
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++
++ output.shouldHaveExitValue(0);
++
++ String result = output.getStdout();
++ return result;
++ }
++
++ private static void checkCounts(int expected, int actual, String which) throws Exception {
++ if (expected != actual) {
++ throw new Exception("RSet summaries mention " + which + " regions an incorrect number of times. Expected " + expected + ", got " + actual);
++ }
++ }
++
++ public static void expectPerRegionRSetSummaries(String result, int expectedCumulative, int expectedPeriodic) throws Exception {
++ expectRSetSummaries(result, expectedCumulative, expectedPeriodic);
++ int actualYoung = result.split("Young regions").length - 1;
++ int actualHumonguous = result.split("Humonguous regions").length - 1;
++ int actualFree = result.split("Free regions").length - 1;
++ int actualOther = result.split("Old regions").length - 1;
++
++ // the strings we check for above are printed four times per summary
++ int expectedPerRegionTypeInfo = (expectedCumulative + expectedPeriodic) * 4;
++
++ checkCounts(expectedPerRegionTypeInfo, actualYoung, "Young");
++ checkCounts(expectedPerRegionTypeInfo, actualHumonguous, "Humonguous");
++ checkCounts(expectedPerRegionTypeInfo, actualFree, "Free");
++ checkCounts(expectedPerRegionTypeInfo, actualOther, "Old");
++ }
++
++ public static void expectRSetSummaries(String result, int expectedCumulative, int expectedPeriodic) throws Exception {
++ int actualTotal = result.split("concurrent refinement").length - 1;
++ int actualCumulative = result.split("Cumulative RS summary").length - 1;
++
++ if (expectedCumulative != actualCumulative) {
++ throw new Exception("Incorrect amount of RSet summaries at the end. Expected " + expectedCumulative + ", got " + actualCumulative);
++ }
++
++ if (expectedPeriodic != (actualTotal - actualCumulative)) {
++ throw new Exception("Incorrect amount of per-period RSet summaries at the end. Expected " + expectedPeriodic + ", got " + (actualTotal - actualCumulative));
++ }
++ }
++}
++
+--- ./hotspot/test/runtime/6929067/Test6929067.sh Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/test/runtime/6929067/Test6929067.sh Wed May 07 19:26:16 2014 -0700
+@@ -3,6 +3,7 @@
+ ##
+ ## @test Test6929067.sh
+ ## @bug 6929067
++## @bug 8021296
+ ## @summary Stack guard pages should be removed when thread is detached
+ ## @compile T.java
+ ## @run shell Test6929067.sh
+@@ -21,6 +22,11 @@
+ OS=`uname -s`
+ case "$OS" in
+ Linux)
++ gcc_cmd=`which gcc`
++ if [ "x$gcc_cmd" == "x" ]; then
++ echo "WARNING: gcc not found. Cannot execute test." 2>&1
++ exit 0;
++ fi
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+@@ -119,10 +125,10 @@
+ # Check to ensure you have a /usr/lib/libpthread.so if you don't please look
+ # for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
+
+-gcc -DLINUX ${COMP_FLAG} -o invoke \
+- -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
+- -L${COMPILEJAVA}/jre/lib/${ARCH}/${VMTYPE} \
+- -ljvm -lpthread invoke.c
++$gcc_cmd -DLINUX ${COMP_FLAG} -o invoke \
++ -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
++ -L${COMPILEJAVA}/jre/lib/${ARCH}/${VMTYPE} \
++ -ljvm -lpthread invoke.c
+
+ ./invoke
+ exit $?
+--- ./hotspot/test/runtime/7107135/Test7107135.sh Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/test/runtime/7107135/Test7107135.sh Wed May 07 19:26:16 2014 -0700
+@@ -27,6 +27,7 @@
+ ##
+ ## @test Test7107135.sh
+ ## @bug 7107135
++## @bug 8021296
+ ## @summary Stack guard pages lost after loading library with executable stack.
+ ## @run shell Test7107135.sh
+ ##
+@@ -45,6 +46,11 @@
+ case "$OS" in
+ Linux)
+ echo "Testing on Linux"
++ gcc_cmd=`which gcc`
++ if [ "x$gcc_cmd" == "x" ]; then
++ echo "WARNING: gcc not found. Cannot execute test." 2>&1
++ exit 0;
++ fi
+ ;;
+ *)
+ NULL=NUL
+@@ -62,7 +68,10 @@
+ cp ${TESTSRC}${FS}*.java ${THIS_DIR}
+ ${TESTJAVA}${FS}bin${FS}javac *.java
+
+-gcc -fPIC -shared -c -o test.o -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux ${TESTSRC}${FS}test.c
++$gcc_cmd -fPIC -shared -c -o test.o \
++ -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
++ ${TESTSRC}${FS}test.c
++
+ ld -shared -z execstack -o libtest-rwx.so test.o
+ ld -shared -z noexecstack -o libtest-rw.so test.o
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/runtime/jsig/Test8017498.sh Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,94 @@
++#!/bin/sh
++
++#
++# 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 Test8017498.sh
++## @bug 8017498
++## @bug 8020791
++## @bug 8021296
++## @summary sigaction(sig) results in process hang/timed-out if sig is much greater than SIGRTMAX
++## @run shell/timeout=30 Test8017498.sh
++##
++
++if [ "${TESTSRC}" = "" ]
++then
++ TESTSRC=${PWD}
++ echo "TESTSRC not set. Using "${TESTSRC}" as default"
++fi
++echo "TESTSRC=${TESTSRC}"
++## Adding common setup Variables for running shell tests.
++. ${TESTSRC}/../../test_env.sh
++
++# set platform-dependent variables
++OS=`uname -s`
++case "$OS" in
++ Linux)
++ echo "Testing on Linux"
++ gcc_cmd=`which gcc`
++ if [ "x$gcc_cmd" == "x" ]; then
++ echo "WARNING: gcc not found. Cannot execute test." 2>&1
++ exit 0;
++ fi
++ if [ "$VM_BITS" = "64" ]
++ then
++ MY_LD_PRELOAD=${TESTJAVA}${FS}jre${FS}lib${FS}amd64${FS}libjsig.so
++ else
++ MY_LD_PRELOAD=${TESTJAVA}${FS}jre${FS}lib${FS}i386${FS}libjsig.so
++ fi
++ echo MY_LD_PRELOAD = ${MY_LD_PRELOAD}
++ ;;
++ *)
++ echo "Test passed; only valid for Linux"
++ exit 0;
++ ;;
++esac
++
++THIS_DIR=.
++
++cp ${TESTSRC}${FS}*.java ${THIS_DIR}
++${TESTJAVA}${FS}bin${FS}javac *.java
++
++$gcc_cmd -DLINUX -fPIC -shared \
++ -o ${TESTSRC}${FS}libTestJNI.so \
++ -I${TESTJAVA}${FS}include \
++ -I${TESTJAVA}${FS}include${FS}linux \
++ ${TESTSRC}${FS}TestJNI.c
++
++# run the java test in the background
++cmd="LD_PRELOAD=$MY_LD_PRELOAD \
++ ${TESTJAVA}${FS}bin${FS}java \
++ -Djava.library.path=${TESTSRC}${FS} -server TestJNI 100"
++echo "$cmd > test.out 2>&1"
++eval $cmd > test.out 2>&1
++
++grep "old handler" test.out > ${NULL}
++if [ $? = 0 ]
++then
++ echo "Test Passed"
++ exit 0
++fi
++
++echo "Test Failed"
++exit 1
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/runtime/jsig/TestJNI.c Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,55 @@
++/*
++ * 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.
++ */
++
++#include <stdio.h>
++#include <jni.h>
++#include <signal.h>
++#include <sys/ucontext.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++void sig_handler(int sig, siginfo_t *info, ucontext_t *context) {
++
++ printf( " HANDLER (1) " );
++}
++
++JNIEXPORT void JNICALL Java_TestJNI_doSomething(JNIEnv *env, jclass klass, jint val) {
++ struct sigaction act;
++ struct sigaction oact;
++
++ act.sa_flags = SA_ONSTACK|SA_RESTART|SA_SIGINFO;
++ sigfillset(&act.sa_mask);
++ act.sa_handler = SIG_DFL;
++ act.sa_sigaction = (void (*)())sig_handler;
++ sigaction(0x20+val, &act, &oact);
++
++ printf( " doSomething(%d) " , val);
++ printf( " old handler = %p " , oact.sa_handler);
++}
++
++#ifdef __cplusplus
++}
++#endif
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/runtime/jsig/TestJNI.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,42 @@
++/*
++ * 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.
++ */
++
++public class TestJNI {
++ static {
++ System.loadLibrary("TestJNI");
++ }
++ public static native void doSomething(int val);
++ public static void main(String[] args) {
++ int intArg = 43;
++ if (args.length > 0) {
++ try {
++ intArg = Integer.parseInt(args[0]);
++ } catch (NumberFormatException e) {
++ System.err.println("arg " + args[0] + " must be an integer");
++ System.exit(1);
++ }
++ }
++ TestJNI.doSomething(intArg);
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,389 @@
++/*
++ * 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 TestLargePagesFlags
++ * @summary Tests how large pages are choosen depending on the given large pages flag combinations.
++ * @library /testlibrary
++ * @run main TestLargePagesFlags
++ */
++
++import com.oracle.java.testlibrary.OutputAnalyzer;
++import com.oracle.java.testlibrary.Platform;
++import com.oracle.java.testlibrary.ProcessTools;
++import java.util.ArrayList;
++
++public class TestLargePagesFlags {
++
++ public static void main(String [] args) throws Exception {
++ if (!Platform.isLinux()) {
++ System.out.println("Skipping. TestLargePagesFlags has only been implemented for Linux.");
++ return;
++ }
++
++ testUseTransparentHugePages();
++ testUseHugeTLBFS();
++ testUseSHM();
++ testCombinations();
++ }
++
++ public static void testUseTransparentHugePages() throws Exception {
++ if (!canUse(UseTransparentHugePages(true))) {
++ System.out.println("Skipping testUseTransparentHugePages");
++ return;
++ }
++
++ // -XX:-UseLargePages overrides all other flags.
++ new FlagTester()
++ .use(UseLargePages(false),
++ UseTransparentHugePages(true))
++ .expect(
++ UseLargePages(false),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++ // Explicitly turn on UseTransparentHugePages.
++ new FlagTester()
++ .use(UseTransparentHugePages(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(true),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseTransparentHugePages(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(true),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++ // Setting a specific large pages flag will turn
++ // off heuristics to choose large pages type.
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseTransparentHugePages(false))
++ .expect(
++ UseLargePages(false),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++ // Don't turn on UseTransparentHugePages
++ // unless the user explicitly asks for them.
++ new FlagTester()
++ .use(UseLargePages(true))
++ .expect(
++ UseTransparentHugePages(false));
++ }
++
++ public static void testUseHugeTLBFS() throws Exception {
++ if (!canUse(UseHugeTLBFS(true))) {
++ System.out.println("Skipping testUseHugeTLBFS");
++ return;
++ }
++
++ // -XX:-UseLargePages overrides all other flags.
++ new FlagTester()
++ .use(UseLargePages(false),
++ UseHugeTLBFS(true))
++ .expect(
++ UseLargePages(false),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++ // Explicitly turn on UseHugeTLBFS.
++ new FlagTester()
++ .use(UseHugeTLBFS(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(true),
++ UseSHM(false));
++
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseHugeTLBFS(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(true),
++ UseSHM(false));
++
++ // Setting a specific large pages flag will turn
++ // off heuristics to choose large pages type.
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseHugeTLBFS(false))
++ .expect(
++ UseLargePages(false),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++ // Using UseLargePages will default to UseHugeTLBFS large pages.
++ new FlagTester()
++ .use(UseLargePages(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(true),
++ UseSHM(false));
++ }
++
++ public static void testUseSHM() throws Exception {
++ if (!canUse(UseSHM(true))) {
++ System.out.println("Skipping testUseSHM");
++ return;
++ }
++
++ // -XX:-UseLargePages overrides all other flags.
++ new FlagTester()
++ .use(UseLargePages(false),
++ UseSHM(true))
++ .expect(
++ UseLargePages(false),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++ // Explicitly turn on UseSHM.
++ new FlagTester()
++ .use(UseSHM(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(true)) ;
++
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseSHM(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(true)) ;
++
++ // Setting a specific large pages flag will turn
++ // off heuristics to choose large pages type.
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseSHM(false))
++ .expect(
++ UseLargePages(false),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++ // Setting UseLargePages can allow the system to choose
++ // UseHugeTLBFS instead of UseSHM, but never UseTransparentHugePages.
++ new FlagTester()
++ .use(UseLargePages(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(false));
++ }
++
++ public static void testCombinations() throws Exception {
++ if (!canUse(UseSHM(true)) || !canUse(UseHugeTLBFS(true))) {
++ System.out.println("Skipping testUseHugeTLBFSAndUseSHMCombination");
++ return;
++ }
++
++ // UseHugeTLBFS takes precedence over SHM.
++
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseHugeTLBFS(true),
++ UseSHM(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(true),
++ UseSHM(false));
++
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseHugeTLBFS(false),
++ UseSHM(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(true));
++
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseHugeTLBFS(true),
++ UseSHM(false))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(true),
++ UseSHM(false));
++
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseHugeTLBFS(false),
++ UseSHM(false))
++ .expect(
++ UseLargePages(false),
++ UseTransparentHugePages(false),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++
++ if (!canUse(UseTransparentHugePages(true))) {
++ return;
++ }
++
++ // UseTransparentHugePages takes precedence.
++
++ new FlagTester()
++ .use(UseLargePages(true),
++ UseTransparentHugePages(true),
++ UseHugeTLBFS(true),
++ UseSHM(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(true),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++
++ new FlagTester()
++ .use(UseTransparentHugePages(true),
++ UseHugeTLBFS(true),
++ UseSHM(true))
++ .expect(
++ UseLargePages(true),
++ UseTransparentHugePages(true),
++ UseHugeTLBFS(false),
++ UseSHM(false));
++ }
++
++ private static class FlagTester {
++ private Flag [] useFlags;
++
++ public FlagTester use(Flag... useFlags) {
++ this.useFlags = useFlags;
++ return this;
++ }
++
++ public void expect(Flag... expectedFlags) throws Exception {
++ if (useFlags == null) {
++ throw new IllegalStateException("Must run use() before expect()");
++ }
++
++ OutputAnalyzer output = executeNewJVM(useFlags);
++
++ for (Flag flag : expectedFlags) {
++ System.out.println("Looking for: " + flag.flagString());
++ String strValue = output.firstMatch(".* " + flag.name() + " .* :?= (\\S+).*", 1);
++
++ if (strValue == null) {
++ throw new RuntimeException("Flag " + flag.name() + " couldn't be found");
++ }
++
++ if (!flag.value().equals(strValue)) {
++ throw new RuntimeException("Wrong value for: " + flag.name()
++ + " expected: " + flag.value()
++ + " got: " + strValue);
++ }
++ }
++
++ output.shouldHaveExitValue(0);
++ }
++ }
++
++ private static OutputAnalyzer executeNewJVM(Flag... flags) throws Exception {
++ ArrayList<String> args = new ArrayList<>();
++ for (Flag flag : flags) {
++ args.add(flag.flagString());
++ }
++ args.add("-XX:+PrintFlagsFinal");
++ args.add("-version");
++
++ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args.toArray(new String[args.size()]));
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++
++ return output;
++ }
++
++ private static boolean canUse(Flag flag) {
++ try {
++ new FlagTester().use(flag).expect(flag);
++ } catch (Exception e) {
++ return false;
++ }
++
++ return true;
++ }
++
++ private static Flag UseLargePages(boolean value) {
++ return new BooleanFlag("UseLargePages", value);
++ }
++
++ private static Flag UseTransparentHugePages(boolean value) {
++ return new BooleanFlag("UseTransparentHugePages", value);
++ }
++
++ private static Flag UseHugeTLBFS(boolean value) {
++ return new BooleanFlag("UseHugeTLBFS", value);
++ }
++
++ private static Flag UseSHM(boolean value) {
++ return new BooleanFlag("UseSHM", value);
++ }
++
++ private static class BooleanFlag implements Flag {
++ private String name;
++ private boolean value;
++
++ BooleanFlag(String name, boolean value) {
++ this.name = name;
++ this.value = value;
++ }
++
++ public String flagString() {
++ return "-XX:" + (value ? "+" : "-") + name;
++ }
++
++ public String name() {
++ return name;
++ }
++
++ public String value() {
++ return Boolean.toString(value);
++ }
++ }
++
++ private static interface Flag {
++ public String flagString();
++ public String name();
++ public String value();
++ }
++}
+--- ./hotspot/test/testlibrary/OutputAnalyzerTest.java Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/test/testlibrary/OutputAnalyzerTest.java Wed May 07 19:26:16 2014 -0700
+@@ -172,5 +172,22 @@
+ } catch (RuntimeException e) {
+ // expected
+ }
++
++ {
++ String aaaa = "aaaa";
++ String result = output.firstMatch(aaaa);
++ if (!aaaa.equals(result)) {
++ throw new Exception("firstMatch(String) faild to match. Expected: " + aaaa + " got: " + result);
++ }
++ }
++
++ {
++ String aa = "aa";
++ String aa_grouped_aa = aa + "(" + aa + ")";
++ String result = output.firstMatch(aa_grouped_aa, 1);
++ if (!aa.equals(result)) {
++ throw new Exception("firstMatch(String, int) failed to match. Expected: " + aa + " got: " + result);
++ }
++ }
+ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/DynamicVMOptionChecker.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,111 @@
++/*
++ * 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.
++ */
++package com.oracle.java.testlibrary;
++
++import com.sun.management.HotSpotDiagnosticMXBean;
++import com.sun.management.VMOption;
++import java.lang.management.ManagementFactory;
++
++/**
++ * Simple class to check writeability, invalid and valid values for VMOption
++ */
++public class DynamicVMOptionChecker {
++
++ /**
++ * Reads VM option from PlatformMXBean and parse it to integer value
++ *
++ * @param name of option
++ * @return parsed value
++ */
++ public static int getIntValue(String name) {
++
++ VMOption option = ManagementFactory.
++ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
++ getVMOption(name);
++
++ return Integer.parseInt(option.getValue());
++ }
++
++ /**
++ * Checks that VM option is dynamically writable
++ *
++ * @param name
++ * @throws RuntimeException if option if not writable
++ * @return always true
++ */
++ public static boolean checkIsWritable(String name) {
++ VMOption option = ManagementFactory.
++ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
++ getVMOption(name);
++
++ if (!option.isWriteable()) {
++ throw new RuntimeException(name + " is not writable");
++ }
++
++ return true;
++ }
++
++ /**
++ * Checks that value cannot be set
++ *
++ * @param name of flag
++ * @param value string representation of value to set
++ * @throws RuntimeException on error - when expected exception hasn't been thrown
++ */
++ public static void checkInvalidValue(String name, String value) {
++ // should throw
++ try {
++ ManagementFactory.
++ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
++ setVMOption(name, value);
++
++ } catch (IllegalArgumentException e) {
++ return;
++ }
++
++ throw new RuntimeException("Expected IllegalArgumentException was not thrown, " + name + "= " + value);
++ }
++
++ /**
++ * Checks that value can be set
++ *
++ * @param name of flag to set
++ * @param value string representation of value to set
++ * @throws RuntimeException on error - when value in VM is not equal to origin
++ */
++ public static void checkValidValue(String name, String value) {
++ ManagementFactory.
++ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
++ setVMOption(name, value);
++
++ VMOption option = ManagementFactory.
++ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
++ getVMOption(name);
++
++ if (!option.getValue().equals(value)) {
++ throw new RuntimeException("Actual value of " + name + " \"" + option.getValue()
++ + "\" not equal origin \"" + value + "\"");
++ }
++ }
++
++}
+--- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java Wed May 07 19:26:16 2014 -0700
+@@ -241,7 +241,38 @@
+ }
+
+ /**
+- * Verifiy the exit value of the process
++ * Get the captured group of the first string matching the pattern.
++ * stderr is searched before stdout.
++ *
++ * @param pattern The multi-line pattern to match
++ * @param group The group to capture
++ * @return The matched string or null if no match was found
++ */
++ public String firstMatch(String pattern, int group) {
++ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
++ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
++ if (stderrMatcher.find()) {
++ return stderrMatcher.group(group);
++ }
++ if (stdoutMatcher.find()) {
++ return stdoutMatcher.group(group);
++ }
++ return null;
++ }
++
++ /**
++ * Get the first string matching the pattern.
++ * stderr is searched before stdout.
++ *
++ * @param pattern The multi-line pattern to match
++ * @return The matched string or null if no match was found
++ */
++ public String firstMatch(String pattern) {
++ return firstMatch(pattern, 0);
++ }
++
++ /**
++ * Verify the exit value of the process
+ *
+ * @param expectedExitValue Expected exit value from process
+ * @throws RuntimeException If the exit value from the process did not match the expected value
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/TestDynamicVMOption.java Wed May 07 19:26:16 2014 -0700
+@@ -0,0 +1,95 @@
++/*
++ * 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.
++ */
++package com.oracle.java.testlibrary;
++
++/**
++ * Simple class to check writeability, invalid and valid values for concrete VMOption
++ */
++public class TestDynamicVMOption {
++
++ private final String name;
++ private final int value;
++
++ /**
++ * Constructor
++ *
++ * @param name of VM option to test
++ */
++ public TestDynamicVMOption(String name) {
++ this.name = name;
++ this.value = DynamicVMOptionChecker.getIntValue(name);
++ System.out.println(this.name + " = " + this.value);
++ }
++
++ /**
++ * Checks that this value can accept valid percentage values and cannot accept invalid percentage values
++ *
++ * @throws RuntimeException
++ */
++ public void testPercentageValues() {
++ checkInvalidValue(Integer.toString(Integer.MIN_VALUE));
++ checkInvalidValue(Integer.toString(Integer.MAX_VALUE));
++ checkInvalidValue("-10");
++ checkInvalidValue("190");
++ }
++
++ /**
++ * Reads VM option from PlatformMXBean and parse it to integer value
++ *
++ * @return value
++ */
++ public int getIntValue() {
++ return DynamicVMOptionChecker.getIntValue(this.name);
++ }
++
++ /**
++ * Checks that this VM option is dynamically writable
++ *
++ * @throws RuntimeException if option if not writable
++ * @return true
++ */
++ public boolean checkIsWritable() throws RuntimeException {
++ return DynamicVMOptionChecker.checkIsWritable(this.name);
++ }
++
++ /**
++ * Checks that value for this VM option cannot be set
++ *
++ * @param value to check
++ * @throws RuntimeException on error - when expected exception hasn't been thrown
++ */
++ public void checkInvalidValue(String value) {
++ DynamicVMOptionChecker.checkInvalidValue(this.name, value);
++ }
++
++ /**
++ * Checks that value for this VM option can be set
++ *
++ * @param value to check
++ * @throws RuntimeException on error - when value in VM is not equal to origin
++ */
++ public void checkValidValue(String value) {
++ DynamicVMOptionChecker.checkValidValue(this.name, value);
++ }
++
++}
+--- ./hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Tue Mar 18 12:31:20 2014 -0700
++++ ./hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Wed May 07 19:26:16 2014 -0700
+@@ -78,4 +78,7 @@
+ public native void NMTUncommitMemory(long addr, long size);
+ public native void NMTReleaseMemory(long addr, long size);
+ public native boolean NMTWaitForDataMerge();
++
++ // Compiler
++ public native void deoptimizeAll();
+ }
+--- ./jaxp/.hgtags Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/.hgtags Wed May 07 19:26:26 2014 -0700
+@@ -359,6 +359,7 @@
+ 66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42
+ c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43
+ 91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60
++d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
+ c500d4ec41ff2117eabfa33e640b6df2f21deb3d jdk7u40-b61
+ 9e3f8ab9d17be6b1a4a097fcc5bc5412013d3e86 jdk7u40-b62
+ 1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01
+@@ -417,3 +418,26 @@
+ f3f02e67d867ae25cd4f3b9bc39a4fd17f593126 jdk7u55-b11
+ 708a1872f5bb8ba58ecc9fcbf4e12e6fa4783998 jdk7u55-b12
+ 14719f73596f5c90e3f46c0f4312f32e5b105edd jdk7u55-b13
++01f26830f88cf4f10897416fe1f4f372efcdecf5 jdk7u55-b30
++26187a65c765b3177f1b7ff0638259bf66f9ec47 jdk7u55-b14
++5be97f6c25d9eb3ef0a05fc860964cb3d27134b0 jdk7u55-b31
++d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
++ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01
++050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02
++359b79d99538d17eeb90927a1e4883fcec31661f jdk7u60-b03
++7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u60-b04
++673ea3822e59de18ae5771de7a280c6ae435ef86 jdk7u60-b05
++fd1cb0040a1d05086ca3bf32f10e1efd43f05116 jdk7u60-b06
++cd7c8fa7a057e62e094cdde78dd632de54cedb8c jdk7u60-b07
++b19c0f18b5a508be894aead53617688342690b01 jdk7u60-b08
++4bfece8a5148947d268611cc1b4485e92960064e jdk7u60-b09
++28a6c0b3b22580101bf750383c2e48d34dea2124 jdk7u60-b10
++e57490e0b99917ea8e1da1bb4d0c57fd5b7705f9 jdk7u60-b11
++a9574b35f0af409fa1665aadd9b2997a0f9878dc jdk7u60-b12
++92cf0b5c1c3e9b61d36671d8fb5070716e0f016b jdk7u60-b13
++2814f43a6c73414dcb2b799e1a52d5b44688590d jdk7u60-b14
++10eed57b66336660f71f7524f2283478bdf373dc jdk7u60-b15
++fefd2d5c524b0be78876d9b98d926abda2828e79 jdk7u60-b16
++ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b18
++ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17
++581752d32aebea959fec84e8ae692e1f63d2c4a8 jdk7u60-b19
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java Wed May 07 19:26:26 2014 -0700
+@@ -188,6 +188,19 @@
+ ORACLE_JAXP_PROPERTY_PREFIX + "xmlSecurityPropertyManager";
+
+ /**
++ * Feature enableExtensionFunctions
++ */
++ public static final String ORACLE_ENABLE_EXTENSION_FUNCTION =
++ ORACLE_JAXP_PROPERTY_PREFIX + "enableExtensionFunctions";
++ public static final String SP_ORACLE_ENABLE_EXTENSION_FUNCTION = "javax.xml.enableExtensionFunctions";
++
++ /**
++ * Values for a feature
++ */
++ public static final String FEATURE_TRUE = "true";
++ public static final String FEATURE_FALSE = "false";
++
++ /**
+ * Check if we're in jdk8 or above
+ */
+ public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8);
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java Wed May 07 19:26:26 2014 -0700
+@@ -472,7 +472,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1413,13 +1419,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java Wed May 07 19:26:26 2014 -0700
+@@ -471,7 +471,13 @@
+
+ // Error messages...
+
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /** Error message ID that has a null message, but takes in a single object. */
+ {"ER0000" , "{0}" },
+@@ -1412,13 +1418,6 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The int to message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ // ================= INFRASTRUCTURE ======================
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java Wed May 07 19:26:26 2014 -0700
+@@ -0,0 +1,124 @@
++/*
++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.org.apache.xalan.internal.utils;
++
++
++import com.sun.org.apache.xalan.internal.XalanConstants;
++
++/**
++ * This class manages security related properties
++ *
++ */
++public final class FeatureManager extends FeaturePropertyBase {
++
++ /**
++ * States of the settings of a property, in the order: default value, value
++ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
++ * properties, and jaxp api properties
++ */
++ public static enum State {
++ //this order reflects the overriding order
++ DEFAULT, FSP, JAXPDOTPROPERTIES, SYSTEMPROPERTY, APIPROPERTY
++ }
++
++ /**
++ * Xalan Features
++ */
++ public static enum Feature {
++ ORACLE_ENABLE_EXTENSION_FUNCTION(XalanConstants.ORACLE_ENABLE_EXTENSION_FUNCTION,
++ "true");
++
++ final String name;
++ final String defaultValue;
++
++ Feature(String name, String value) {
++ this.name = name;
++ this.defaultValue = value;
++ }
++
++ public boolean equalsName(String propertyName) {
++ return (propertyName == null) ? false : name.equals(propertyName);
++ }
++
++ String defaultValue() {
++ return defaultValue;
++ }
++ }
++
++ /**
++ * Default constructor. Establishes default values
++ */
++ public FeatureManager() {
++ values = new String[Feature.values().length];
++ for (Feature feature : Feature.values()) {
++ values[feature.ordinal()] = feature.defaultValue();
++ }
++ //read system properties or jaxp.properties
++ readSystemProperties();
++ }
++
++
++ /**
++ * Check if the feature is enabled
++ * @param feature name of the feature
++ * @return true if enabled, false otherwise
++ */
++ public boolean isFeatureEnabled(Feature feature) {
++ return Boolean.parseBoolean(values[feature.ordinal()]);
++ }
++
++ /**
++ * Check if the feature is enabled
++ * @param propertyName name of the feature
++ * @return true if enabled, false otherwise
++ */
++ public boolean isFeatureEnabled(String propertyName) {
++ return Boolean.parseBoolean(values[getIndex(propertyName)]);
++ }
++
++ /**
++ * Get the index by property name
++ * @param propertyName property name
++ * @return the index of the property if found; return -1 if not
++ */
++ public int getIndex(String propertyName){
++ for (Feature feature : Feature.values()) {
++ if (feature.equalsName(propertyName)) {
++ return feature.ordinal();
++ }
++ }
++ return -1;
++ }
++
++ /**
++ * Read from system properties, or those in jaxp.properties
++ */
++ private void readSystemProperties() {
++ getSystemProperty(Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
++ XalanConstants.SP_ORACLE_ENABLE_EXTENSION_FUNCTION);
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java Wed May 07 19:26:26 2014 -0700
+@@ -0,0 +1,215 @@
++/*
++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.org.apache.xalan.internal.utils;
++
++import com.sun.org.apache.xalan.internal.XalanConstants;
++
++/**
++ * This is the base class for features and properties
++ *
++ */
++public abstract class FeaturePropertyBase {
++
++ /**
++ * States of the settings of a property, in the order: default value, value
++ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
++ * properties, and jaxp api properties
++ */
++ public static enum State {
++ //this order reflects the overriding order
++ DEFAULT, FSP, JAXPDOTPROPERTIES, SYSTEMPROPERTY, APIPROPERTY
++ }
++
++
++ /**
++ * Values of the properties as defined in enum Properties
++ */
++ String[] values = null;
++ /**
++ * States of the settings for each property in Properties above
++ */
++ State[] states = {State.DEFAULT, State.DEFAULT};
++
++
++ /**
++ * Set the value for a specific property.
++ *
++ * @param property the property
++ * @param state the state of the property
++ * @param value the value of the property
++ */
++ public void setValue(Enum property, State state, String value) {
++ //only update if it shall override
++ if (state.compareTo(states[property.ordinal()]) >= 0) {
++ values[property.ordinal()] = value;
++ states[property.ordinal()] = state;
++ }
++ }
++
++ /**
++ * Set the value of a property by its index
++ * @param index the index of the property
++ * @param state the state of the property
++ * @param value the value of the property
++ */
++ public void setValue(int index, State state, String value) {
++ //only update if it shall override
++ if (state.compareTo(states[index]) >= 0) {
++ values[index] = value;
++ states[index] = state;
++ }
++ }
++
++ /**
++ * Set value by property name and state
++ * @param propertyName property name
++ * @param state the state of the property
++ * @param value the value of the property
++ * @return true if the property is managed by the security property manager;
++ * false if otherwise.
++ */
++ public boolean setValue(String propertyName, State state, Object value) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ setValue(index, state, (String)value);
++ return true;
++ }
++ return false;
++ }
++
++ /**
++ * Set value by property name and state
++ * @param propertyName property name
++ * @param state the state of the property
++ * @param value the value of the property
++ * @return true if the property is managed by the security property manager;
++ * false if otherwise.
++ */
++ public boolean setValue(String propertyName, State state, boolean value) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ if (value) {
++ setValue(index, state, XalanConstants.FEATURE_TRUE);
++ } else {
++ setValue(index, state, XalanConstants.FEATURE_FALSE);
++ }
++ return true;
++ }
++ return false;
++ }
++
++ /**
++ * Return the value of the specified property
++ *
++ * @param property the property
++ * @return the value of the property
++ */
++ public String getValue(Enum property) {
++ return values[property.ordinal()];
++ }
++
++ /**
++ * Return the value of the specified property
++ *
++ * @param property the property
++ * @return the value of the property
++ */
++ public String getValue(String property) {
++ int index = getIndex(property);
++ if (index > -1) {
++ return getValueByIndex(index);
++ }
++ return null;
++ }
++
++ /**
++ * Return the value of the specified property.
++ *
++ * @param propertyName the property name
++ * @return the value of the property as a string. If a property is managed
++ * by this manager, its value shall not be null.
++ */
++ public String getValueAsString(String propertyName) {
++ int index = getIndex(propertyName);
++ if (index > -1) {
++ return getValueByIndex(index);
++ }
++
++ return null;
++ }
++
++ /**
++ * Return the value of a property by its ordinal
++ * @param index the index of a property
++ * @return value of a property
++ */
++ public String getValueByIndex(int index) {
++ return values[index];
++ }
++
++ /**
++ * Get the index by property name
++ * @param propertyName property name
++ * @return the index of the property if found; return -1 if not
++ */
++ public abstract int getIndex(String propertyName);
++
++ public <E extends Enum<E>> int getIndex(Class<E> property, String propertyName) {
++ for (Enum<E> enumItem : property.getEnumConstants()) {
++ if (enumItem.toString().equals(propertyName)) {
++ //internally, ordinal is used as index
++ return enumItem.ordinal();
++ }
++ }
++ return -1;
++ };
++
++
++ /**
++ * Read from system properties, or those in jaxp.properties
++ *
++ * @param property the property
++ * @param systemProperty the name of the system property
++ */
++ void getSystemProperty(Enum property, String systemProperty) {
++ try {
++ String value = SecuritySupport.getSystemProperty(systemProperty);
++ if (value != null) {
++ values[property.ordinal()] = value;
++ states[property.ordinal()] = State.SYSTEMPROPERTY;
++ return;
++ }
++
++ value = SecuritySupport.readJAXPProperty(systemProperty);
++ if (value != null) {
++ values[property.ordinal()] = value;
++ states[property.ordinal()] = State.JAXPDOTPROPERTIES;
++ }
++ } catch (NumberFormatException e) {
++ //invalid setting ignored
++ }
++ }
++}
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java Wed May 07 19:26:26 2014 -0700
+@@ -1,42 +1,28 @@
+ /*
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
++ * 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.
+ *
+- * The contents of this file are subject to the terms of either the GNU
+- * General Public License Version 2 only ("GPL") or the Common Development
+- * and Distribution License("CDDL") (collectively, the "License"). You
+- * may not use this file except in compliance with the License. You can
+- * obtain a copy of the License at
+- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+- * or packager/legal/LICENSE.txt. See the License for the specific
+- * language governing permissions and limitations under the License.
++ * 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).
+ *
+- * When distributing the software, include this License Header Notice in each
+- * file and include the License file at packager/legal/LICENSE.txt.
++ * 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.
+ *
+- * GPL Classpath Exception:
+- * Oracle designates this particular file as subject to the "Classpath"
+- * exception as provided by Oracle in the GPL Version 2 section of the License
+- * file that accompanied this code.
+- *
+- * Modifications:
+- * If applicable, add the following below the License Header, with the fields
+- * enclosed by brackets [] replaced by your own identifying information:
+- * "Portions Copyright [year] [name of copyright owner]"
+- *
+- * Contributor(s):
+- * If you wish your version of this file to be governed by only the CDDL or
+- * only the GPL Version 2, indicate your decision by adding "[Contributor]
+- * elects to include this software in this distribution under the [CDDL or GPL
+- * Version 2] license." If you don't indicate a single choice of license, a
+- * recipient has the option to distribute your version of this file under
+- * either the CDDL, the GPL Version 2 or to extend the choice of license to
+- * its licensees as provided above. However, if you add GPL Version 2 code
+- * and therefore, elected the GPL Version 2 license, then the option applies
+- * only if the new code is made subject to such option by the copyright
+- * holder.
++ * 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.org.apache.xalan.internal.utils;
+
+ import com.sun.org.apache.xalan.internal.XalanConstants;
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java Wed May 07 19:26:26 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -33,20 +33,10 @@
+ * This class manages security related properties
+ *
+ */
+-public final class XMLSecurityPropertyManager {
++public final class XMLSecurityPropertyManager extends FeaturePropertyBase {
+
+ /**
+- * States of the settings of a property, in the order: default value, value
+- * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
+- * properties, and jaxp api properties
+- */
+- public static enum State {
+- //this order reflects the overriding order
+- DEFAULT, FSP, JAXPDOTPROPERTIES, SYSTEMPROPERTY, APIPROPERTY
+- }
+-
+- /**
+- * Limits managed by the security manager
++ * Properties managed by the security property manager
+ */
+ public static enum Property {
+ ACCESS_EXTERNAL_DTD(XMLConstants.ACCESS_EXTERNAL_DTD,
+@@ -73,15 +63,6 @@
+
+
+ /**
+- * Values of the properties as defined in enum Properties
+- */
+- private final String[] values;
+- /**
+- * States of the settings for each property in Properties above
+- */
+- private State[] states = {State.DEFAULT, State.DEFAULT};
+-
+- /**
+ * Default constructor. Establishes default values
+ */
+ public XMLSecurityPropertyManager() {
+@@ -94,86 +75,6 @@
+ }
+
+ /**
+- * Set limit by property name and state
+- * @param propertyName property name
+- * @param state the state of the property
+- * @param value the value of the property
+- * @return true if the property is managed by the security property manager;
+- * false if otherwise.
+- */
+- public boolean setValue(String propertyName, State state, Object value) {
+- int index = getIndex(propertyName);
+- if (index > -1) {
+- setValue(index, state, (String)value);
+- return true;
+- }
+- return false;
+- }
+-
+- /**
+- * Set the value for a specific property.
+- *
+- * @param property the property
+- * @param state the state of the property
+- * @param value the value of the property
+- */
+- public void setValue(Property property, State state, String value) {
+- //only update if it shall override
+- if (state.compareTo(states[property.ordinal()]) >= 0) {
+- values[property.ordinal()] = value;
+- states[property.ordinal()] = state;
+- }
+- }
+-
+- /**
+- * Set the value of a property by its index
+- * @param index the index of the property
+- * @param state the state of the property
+- * @param value the value of the property
+- */
+- public void setValue(int index, State state, String value) {
+- //only update if it shall override
+- if (state.compareTo(states[index]) >= 0) {
+- values[index] = value;
+- states[index] = state;
+- }
+- }
+-
+- /**
+- * Return the value of the specified property
+- *
+- * @param propertyName the property name
+- * @return the value of the property as a string
+- */
+- public String getValue(String propertyName) {
+- int index = getIndex(propertyName);
+- if (index > -1) {
+- return getValueByIndex(index);
+- }
+-
+- return null;
+- }
+-
+- /**
+- * Return the value of the specified property
+- *
+- * @param property the property
+- * @return the value of the property
+- */
+- public String getValue(Property property) {
+- return values[property.ordinal()];
+- }
+-
+- /**
+- * Return the value of a property by its ordinal
+- * @param index the index of a property
+- * @return value of a property
+- */
+- public String getValueByIndex(int index) {
+- return values[index];
+- }
+-
+- /**
+ * Get the index by property name
+ * @param propertyName property name
+ * @return the index of the property if found; return -1 if not
+@@ -198,28 +99,4 @@
+ XalanConstants.SP_ACCESS_EXTERNAL_STYLESHEET);
+ }
+
+- /**
+- * Read from system properties, or those in jaxp.properties
+- *
+- * @param property the property
+- * @param systemProperty the name of the system property
+- */
+- private void getSystemProperty(Property property, String systemProperty) {
+- try {
+- String value = SecuritySupport.getSystemProperty(systemProperty);
+- if (value != null) {
+- values[property.ordinal()] = value;
+- states[property.ordinal()] = State.SYSTEMPROPERTY;
+- return;
+- }
+-
+- value = SecuritySupport.readJAXPProperty(systemProperty);
+- if (value != null) {
+- values[property.ordinal()] = value;
+- states[property.ordinal()] = State.JAXPDOTPROPERTIES;
+- }
+- } catch (NumberFormatException e) {
+- //invalid setting ignored
+- }
+- }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java Wed May 07 19:26:26 2014 -0700
+@@ -23,6 +23,7 @@
+
+ package com.sun.org.apache.xalan.internal.xsltc.cmdline;
+
++import com.sun.org.apache.xalan.internal.utils.FeatureManager;
+ import java.io.File;
+ import java.net.URL;
+ import java.util.Vector;
+@@ -77,7 +78,7 @@
+ final GetOpt getopt = new GetOpt(args, "o:d:j:p:uxhsinv");
+ if (args.length < 1) printUsage();
+
+- final XSLTC xsltc = new XSLTC(true);
++ final XSLTC xsltc = new XSLTC(true, new FeatureManager());
+ xsltc.init();
+
+ int c;
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Wed May 07 19:26:26 2014 -0700
+@@ -42,6 +42,7 @@
+ import com.sun.org.apache.bcel.internal.generic.LocalVariableGen;
+ import com.sun.org.apache.bcel.internal.generic.NEW;
+ import com.sun.org.apache.bcel.internal.generic.PUSH;
++import com.sun.org.apache.xalan.internal.utils.FeatureManager;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.BooleanType;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ClassGenerator;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
+@@ -717,6 +718,8 @@
+ final ConstantPoolGen cpg = classGen.getConstantPool();
+ final InstructionList il = methodGen.getInstructionList();
+ final boolean isSecureProcessing = classGen.getParser().getXSLTC().isSecureProcessing();
++ final boolean isExtensionFunctionEnabled = classGen.getParser().getXSLTC()
++ .getFeature(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION);
+ int index;
+
+ // Translate calls to methods in the BasisLibrary
+@@ -760,7 +763,7 @@
+ il.append(new INVOKESTATIC(index));
+ }
+ else if (_isExtConstructor) {
+- if (isSecureProcessing)
++ if (isSecureProcessing && !isExtensionFunctionEnabled)
+ translateUnallowedExtension(cpg, il);
+
+ final String clazz =
+@@ -822,7 +825,7 @@
+ }
+ // Invoke function calls that are handled in separate classes
+ else {
+- if (isSecureProcessing)
++ if (isSecureProcessing && !isExtensionFunctionEnabled)
+ translateUnallowedExtension(cpg, il);
+
+ final String clazz = _chosenMethod.getDeclaringClass().getName();
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Wed May 07 19:26:26 2014 -0700
+@@ -43,6 +43,8 @@
+
+ import com.sun.org.apache.bcel.internal.classfile.JavaClass;
+ import com.sun.org.apache.xalan.internal.XalanConstants;
++import com.sun.org.apache.xalan.internal.utils.FeatureManager;
++import com.sun.org.apache.xalan.internal.utils.FeatureManager.Feature;
+ import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
+ import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
+@@ -148,11 +150,14 @@
+
+ private XMLSecurityManager _xmlSecurityManager;
+
++ private final FeatureManager _featureManager;
++
+ /**
+ * XSLTC compiler constructor
+ */
+- public XSLTC(boolean useServicesMechanism) {
++ public XSLTC(boolean useServicesMechanism, FeatureManager featureManager) {
+ _parser = new Parser(this, useServicesMechanism);
++ _featureManager = featureManager;
+ }
+
+ /**
+@@ -182,6 +187,15 @@
+ _useServicesMechanism = flag;
+ }
+
++ /**
++ * Return the value of the specified feature
++ * @param name name of the feature
++ * @return true if the feature is enabled, false otherwise
++ */
++ public boolean getFeature(Feature name) {
++ return _featureManager.isFeatureEnabled(name);
++ }
++
+ /**
+ * Return allowed protocols for accessing external stylesheet.
+ */
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "More than one stylesheet defined in the same file."},
+
+@@ -1012,12 +1018,5 @@
+
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "S'ha definit m\u00e9s d'un full d'estils en el mateix fitxer."},
+
+@@ -853,12 +859,5 @@
+ "FEATURE_SECURE_PROCESSING: Cannot set the feature to false when security manager is present."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "V\u00edce ne\u017e jedna p\u0159edloha stylu je definov\u00e1na ve stejn\u00e9m souboru."},
+
+@@ -853,12 +859,5 @@
+ "FEATURE_SECURE_PROCESSING: Cannot set the feature to false when security manager is present."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "Mehrere Stylesheets in derselben Datei definiert."},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING: Feature kann nicht auf \"false\" gesetzt werden, wenn Security Manager vorhanden ist."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "Se ha definido m\u00E1s de una hoja de estilo en el mismo archivo."},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING: no se puede definir la funci\u00F3n en false cuando est\u00E1 presente el gestor de seguridad."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "Plusieurs feuilles de style d\u00E9finies dans le m\u00EAme fichier."},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING : impossible de d\u00E9finir la fonctionnalit\u00E9 sur False en pr\u00E9sence du gestionnaire de s\u00E9curit\u00E9."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "Sono stati definiti pi\u00F9 fogli di stile nello stesso file."},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING: impossibile impostare la funzione su false se \u00E8 presente Security Manager."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u306B\u8907\u6570\u306E\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059\u3002"},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING: \u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u304C\u5B58\u5728\u3059\u308B\u3068\u304D\u3001\u6A5F\u80FD\u3092false\u306B\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002"}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "\uB3D9\uC77C\uD55C \uD30C\uC77C\uC5D0 \uC2A4\uD0C0\uC77C\uC2DC\uD2B8\uAC00 \uB450 \uAC1C \uC774\uC0C1 \uC815\uC758\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING: \uBCF4\uC548 \uAD00\uB9AC\uC790\uAC00 \uC788\uC744 \uACBD\uC6B0 \uAE30\uB2A5\uC744 false\uB85C \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "Mais de uma folha de estilos definida no mesmo arquivo."},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING: N\u00E3o \u00E9 poss\u00EDvel definir o recurso como falso quando o gerenciador de seguran\u00E7a est\u00E1 presente."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "Viac ne\u017e jeden \u0161t\u00fdl dokumentu bol definovan\u00fd v rovnakom s\u00fabore."},
+
+@@ -853,12 +859,5 @@
+ "FEATURE_SECURE_PROCESSING: Cannot set the feature to false when security manager is present."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "Fler \u00E4n en formatmall har definierats i samma fil."},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING: Funktionen kan inte anges till false om s\u00E4kerhetshanteraren anv\u00E4nds."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "\u540C\u4E00\u6587\u4EF6\u4E2D\u5B9A\u4E49\u4E86\u591A\u4E2A\u6837\u5F0F\u8868\u3002"},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING: \u5B58\u5728 Security Manager \u65F6, \u65E0\u6CD5\u5C06\u6B64\u529F\u80FD\u8BBE\u7F6E\u4E3A\u201C\u5047\u201D\u3002"}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Wed May 07 19:26:26 2014 -0700
+@@ -90,7 +90,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+ {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
+ "\u76F8\u540C\u6A94\u6848\u4E2D\u5B9A\u7FA9\u4E86\u8D85\u904E\u4E00\u500B\u6A23\u5F0F\u8868\u3002"},
+
+@@ -913,12 +919,5 @@
+ "FEATURE_SECURE_PROCESSING: \u5B89\u5168\u7BA1\u7406\u7A0B\u5F0F\u5B58\u5728\u6642\uFF0C\u7121\u6CD5\u5C07\u529F\u80FD\u8A2D\u70BA\u507D\u3002"}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Wed May 07 19:26:26 2014 -0700
+@@ -955,6 +955,9 @@
+ if (Double.isNaN(d) || Double.isInfinite(d))
+ return(Double.toString(d));
+
++ //Convert -0.0 to +0.0 other values remains the same
++ d = d + 0.0;
++
+ // Use the XPath formatter to ignore locales
+ StringBuffer result = threadLocalStringBuffer.get();
+ result.setLength(0);
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "Use of the extension element ''{0}'' is not allowed when the secure processing feature is set to true."},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java Wed May 07 19:26:26 2014 -0700
+@@ -79,7 +79,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -223,13 +229,6 @@
+ "No s''ha pogut resoldre la refer\u00e8ncia d''URI ''{0}''."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java Wed May 07 19:26:26 2014 -0700
+@@ -79,7 +79,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -223,13 +229,6 @@
+ "Nelze p\u0159elo\u017eit odkazy URI ''{0}''."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "Verwendung des Erweiterungselements \"{0}\" ist nicht zul\u00E4ssig, wenn das Feature f\u00FCr die sichere Verarbeitung auf \"true\" gesetzt ist."},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "El uso del elemento de extensi\u00F3n ''{0}'' no est\u00E1 permitido cuando la funci\u00F3n de procesamiento seguro se ha definido en true."},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "L''utilisation de l''\u00E9l\u00E9ment d''extension ''{0}'' n''est pas autoris\u00E9e lorsque la fonctionnalit\u00E9 de traitement s\u00E9curis\u00E9 est d\u00E9finie sur True."},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "Non \u00E8 consentito utilizzare l''elemento di estensione ''{0}'' se la funzione di elaborazione sicura \u00E8 impostata su true."},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "\u30BB\u30AD\u30E5\u30A2\u51E6\u7406\u6A5F\u80FD\u304Ctrue\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u3068\u304D\u3001\u62E1\u5F35\u8981\u7D20''{0}''\u306E\u4F7F\u7528\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\u3002"},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "\uBCF4\uC548 \uCC98\uB9AC \uAE30\uB2A5\uC774 true\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 \uD655\uC7A5 \uC694\uC18C ''{0}''\uC744(\uB97C) \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "O uso do elemento da extens\u00E3o ''{0}'' n\u00E3o ser\u00E1 permitido quando o recurso de processamento seguro for definido como verdadeiro."},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java Wed May 07 19:26:26 2014 -0700
+@@ -79,7 +79,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -223,13 +229,6 @@
+ "Nebolo mo\u017en\u00e9 rozl\u00ed\u0161i\u0165 referenciu URI ''{0}''."}
+ };
+
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "Anv\u00E4ndning av till\u00E4ggselementet ''{0}'' \u00E4r inte till\u00E5tet n\u00E4r s\u00E4ker bearbetning till\u00E4mpas."},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "\u5F53\u5B89\u5168\u5904\u7406\u529F\u80FD\u8BBE\u7F6E\u4E3A\u201C\u771F\u201D\u65F6, \u4E0D\u5141\u8BB8\u4F7F\u7528\u6269\u5C55\u5143\u7D20 ''{0}''\u3002"},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java Wed May 07 19:26:26 2014 -0700
+@@ -81,7 +81,13 @@
+ */
+
+ // These message should be read from a locale-specific resource bundle
+- private static final Object[][] _contents = new Object[][] {
++ /** Get the lookup table for error messages.
++ *
++ * @return The message lookup table.
++ */
++ public Object[][] getContents()
++ {
++ return new Object[][] {
+
+ /*
+ * Note to translators: the substitution text in the following message
+@@ -276,13 +282,6 @@
+ {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
+ "\u7576\u5B89\u5168\u8655\u7406\u529F\u80FD\u8A2D\u70BA\u771F\u6642\uFF0C\u4E0D\u5141\u8A31\u4F7F\u7528\u64F4\u5145\u5957\u4EF6\u5143\u7D20 ''{0}''\u3002"},
+ };
+- /** Get the lookup table for error messages.
+- *
+- * @return The message lookup table.
+- */
+- public Object[][] getContents()
+- {
+- return _contents;
+ }
+
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java Wed May 07 19:26:26 2014 -0700
+@@ -95,7 +95,7 @@
+ _tfactory = tfactory;
+
+ // Instantiate XSLTC and get reference to parser object
+- XSLTC xsltc = new XSLTC(tfactory.useServicesMechnism());
++ XSLTC xsltc = new XSLTC(tfactory.useServicesMechnism(), tfactory.getFeatureManager());
+ if (tfactory.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING))
+ xsltc.setSecureProcessing(true);
+
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Wed May 07 19:26:26 2014 -0700
+@@ -23,6 +23,23 @@
+
+ package com.sun.org.apache.xalan.internal.xsltc.trax;
+
++import com.sun.org.apache.xalan.internal.XalanConstants;
++import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
++import com.sun.org.apache.xalan.internal.utils.FeatureManager;
++import com.sun.org.apache.xalan.internal.utils.FeaturePropertyBase;
++import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
++import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
++import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
++import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager;
++import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.Property;
++import com.sun.org.apache.xalan.internal.utils.FeaturePropertyBase.State;
++import com.sun.org.apache.xalan.internal.xsltc.compiler.Constants;
++import com.sun.org.apache.xalan.internal.xsltc.compiler.SourceLoader;
++import com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC;
++import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
++import com.sun.org.apache.xalan.internal.xsltc.dom.XSLTCDTMManager;
++import com.sun.org.apache.xml.internal.utils.StopParseException;
++import com.sun.org.apache.xml.internal.utils.StylesheetPIHandler;
+ import java.io.File;
+ import java.io.FileInputStream;
+ import java.io.FileNotFoundException;
+@@ -37,11 +54,9 @@
+ import java.util.Vector;
+ import java.util.zip.ZipEntry;
+ import java.util.zip.ZipFile;
+-
+ import javax.xml.XMLConstants;
++import javax.xml.parsers.SAXParser;
+ import javax.xml.parsers.SAXParserFactory;
+-import javax.xml.parsers.SAXParser;
+-import javax.xml.parsers.ParserConfigurationException;
+
+ import javax.xml.transform.ErrorListener;
+ import javax.xml.transform.Source;
+@@ -58,27 +73,9 @@
+ import javax.xml.transform.sax.SAXTransformerFactory;
+ import javax.xml.transform.sax.TemplatesHandler;
+ import javax.xml.transform.sax.TransformerHandler;
++import javax.xml.transform.stax.*;
+ import javax.xml.transform.stream.StreamResult;
+ import javax.xml.transform.stream.StreamSource;
+-import javax.xml.transform.stax.*;
+-
+-import com.sun.org.apache.xml.internal.utils.StylesheetPIHandler;
+-import com.sun.org.apache.xml.internal.utils.StopParseException;
+-
+-import com.sun.org.apache.xalan.internal.XalanConstants;
+-import com.sun.org.apache.xalan.internal.xsltc.compiler.Constants;
+-import com.sun.org.apache.xalan.internal.xsltc.compiler.SourceLoader;
+-import com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC;
+-import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
+-import com.sun.org.apache.xalan.internal.xsltc.dom.XSLTCDTMManager;
+-import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
+-import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
+-import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
+-import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager;
+-import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.Property;
+-import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.State;
+-import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
+-
+ import org.xml.sax.InputSource;
+ import org.xml.sax.XMLFilter;
+ import org.xml.sax.XMLReader;
+@@ -240,6 +237,8 @@
+ private XMLSecurityPropertyManager _xmlSecurityPropertyMgr;
+ private XMLSecurityManager _xmlSecurityManager;
+
++ private final FeatureManager _featureManager;
++
+ /**
+ * javax.xml.transform.sax.TransformerFactory implementation.
+ */
+@@ -254,10 +253,13 @@
+ private TransformerFactoryImpl(boolean useServicesMechanism) {
+ this.m_DTMManagerClass = XSLTCDTMManager.getDTMManagerClass(useServicesMechanism);
+ this._useServicesMechanism = useServicesMechanism;
++ _featureManager = new FeatureManager();
+
+ if (System.getSecurityManager() != null) {
+ _isSecureMode = true;
+ _isNotSecureProcessing = false;
++ _featureManager.setValue(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
++ FeaturePropertyBase.State.FSP, XalanConstants.FEATURE_FALSE);
+ }
+
+ _xmlSecurityPropertyMgr = new XMLSecurityPropertyManager();
+@@ -513,6 +515,10 @@
+ Property.ACCESS_EXTERNAL_STYLESHEET);
+ }
+
++ if (value && _featureManager != null) {
++ _featureManager.setValue(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
++ FeaturePropertyBase.State.FSP, XalanConstants.FEATURE_FALSE);
++ }
+ return;
+ }
+ else if (name.equals(XalanConstants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
+@@ -521,6 +527,11 @@
+ _useServicesMechanism = value;
+ }
+ else {
++ if (_featureManager != null &&
++ _featureManager.setValue(name, State.APIPROPERTY, value)) {
++ return;
++ }
++
+ // unknown feature
+ ErrorMsg err = new ErrorMsg(ErrorMsg.JAXP_UNSUPPORTED_FEATURE, name);
+ throw new TransformerConfigurationException(err.toString());
+@@ -569,6 +580,13 @@
+ return !_isNotSecureProcessing;
+ }
+
++ /** Check to see if the property is managed by the security manager **/
++ String propertyValue = (_featureManager != null) ?
++ _featureManager.getValueAsString(name) : null;
++ if (propertyValue != null) {
++ return Boolean.parseBoolean(propertyValue);
++ }
++
+ // Feature not supported
+ return false;
+ }
+@@ -579,6 +597,13 @@
+ return _useServicesMechanism;
+ }
+
++ /**
++ * @return the feature manager
++ */
++ public FeatureManager getFeatureManager() {
++ return _featureManager;
++ }
++
+ /**
+ * javax.xml.transform.sax.TransformerFactory implementation.
+ * Get the object that is used by default during the transformation to
+@@ -859,7 +884,7 @@
+ }
+
+ // Create and initialize a stylesheet compiler
+- final XSLTC xsltc = new XSLTC(_useServicesMechanism);
++ final XSLTC xsltc = new XSLTC(_useServicesMechanism, _featureManager);
+ if (_debug) xsltc.setDebug(true);
+ if (_enableInlining)
+ xsltc.setTemplateInlining(true);
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java Wed May 07 19:26:26 2014 -0700
+@@ -1422,7 +1422,7 @@
+ }
+ ch = data.charAt(currentOffset);
+ } while (ch == ' ' || ch == 0x0A || ch == 0x09 || ch == 0x0D);
+- if (currentOffset == endOffset || ch == '|') {
++ if (currentOffset == endOffset || ch == '|' || ch == '/') {
+ addToken(tokens, XPath.Tokens.EXPRTOKEN_PERIOD);
+ starIsMultiplyOperator = true;
+ break;
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java Wed May 07 19:26:26 2014 -0700
+@@ -20,6 +20,8 @@
+
+ package com.sun.org.apache.xerces.internal.jaxp;
+
++import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
++import java.util.Locale;
+ import org.xml.sax.SAXException;
+ import org.xml.sax.SAXParseException;
+ import org.xml.sax.helpers.DefaultHandler;
+@@ -30,6 +32,11 @@
+ class DefaultValidationErrorHandler extends DefaultHandler {
+ static private int ERROR_COUNT_LIMIT = 10;
+ private int errorCount = 0;
++ private Locale locale = Locale.getDefault();
++
++ public DefaultValidationErrorHandler(Locale locale) {
++ this.locale = locale;
++ }
+
+ // XXX Fix message i18n
+ public void error(SAXParseException e) throws SAXException {
+@@ -38,11 +45,8 @@
+ return;
+ } else if (errorCount == 0) {
+ // Print a warning before the first error
+- System.err.println("Warning: validation was turned on but an org.xml.sax.ErrorHandler was not");
+- System.err.println("set, which is probably not what is desired. Parser will use a default");
+- System.err.println("ErrorHandler to print the first " +
+- ERROR_COUNT_LIMIT + " errors. Please call");
+- System.err.println("the 'setErrorHandler' method to fix this.");
++ System.err.println(SAXMessageFormatter.formatMessage(locale,
++ "errorHandlerNotSet", new Object [] {errorCount}));
+ }
+
+ String systemId = e.getSystemId();
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java Wed May 07 19:26:26 2014 -0700
+@@ -140,7 +140,7 @@
+ // validation errors with a warning telling the user to set an
+ // ErrorHandler
+ if (dbf.isValidating()) {
+- fInitErrorHandler = new DefaultValidationErrorHandler();
++ fInitErrorHandler = new DefaultValidationErrorHandler(domParser.getXMLParserConfiguration().getLocale());
+ setErrorHandler(fInitErrorHandler);
+ }
+ else {
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Wed May 07 19:26:26 2014 -0700
+@@ -20,15 +20,6 @@
+
+ package com.sun.org.apache.xerces.internal.jaxp;
+
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.Hashtable;
+-import java.util.Iterator;
+-import java.util.Map;
+-
+-import javax.xml.XMLConstants;
+-import javax.xml.validation.Schema;
+-
+ import com.sun.org.apache.xerces.internal.impl.Constants;
+ import com.sun.org.apache.xerces.internal.impl.validation.ValidationManager;
+ import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator;
+@@ -46,6 +37,14 @@
+ import com.sun.org.apache.xerces.internal.xs.AttributePSVI;
+ import com.sun.org.apache.xerces.internal.xs.ElementPSVI;
+ import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
++import java.io.IOException;
++import java.util.HashMap;
++import java.util.Hashtable;
++import java.util.Iterator;
++import java.util.Locale;
++import java.util.Map;
++import javax.xml.XMLConstants;
++import javax.xml.validation.Schema;
+ import org.xml.sax.EntityResolver;
+ import org.xml.sax.ErrorHandler;
+ import org.xml.sax.HandlerBase;
+@@ -186,7 +185,7 @@
+ // validation errors with a warning telling the user to set an
+ // ErrorHandler.
+ if (spf.isValidating()) {
+- fInitErrorHandler = new DefaultValidationErrorHandler();
++ fInitErrorHandler = new DefaultValidationErrorHandler(xmlReader.getLocale());
+ xmlReader.setErrorHandler(fInitErrorHandler);
+ }
+ else {
+@@ -685,6 +684,10 @@
+ return super.getProperty(name);
+ }
+
++ Locale getLocale() {
++ return fConfiguration.getLocale();
++ }
++
+ private void setSchemaValidatorFeature(String name, boolean value)
+ throws SAXNotRecognizedException, SAXNotSupportedException {
+ try {
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java Wed May 07 19:26:26 2014 -0700
+@@ -689,9 +689,13 @@
+ if (!initializeAuthority(uriSpec.substring(startPos, index))) {
+ index = startPos - 2;
+ }
+- }
+- else {
++ } else if (index < uriSpecLen) {
++ //Same as java.net.URI:
++ // DEVIATION: Allow empty authority prior to non-empty
++ // path, query component or fragment identifier
+ m_host = "";
++ } else {
++ throw new MalformedURIException("Expected authority.");
+ }
+ }
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java Wed May 07 19:26:26 2014 -0700
+@@ -211,7 +211,7 @@
+ if (i > 0) {
+ return uri.substring(i+1, uri.length());
+ }
+- return "";
++ return uri;
+ }
+
+ /**
+--- ./jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java Wed May 07 19:26:26 2014 -0700
+@@ -105,15 +105,15 @@
+ */
+ public Node item(int index) {
+ if (m_iter != null) {
+- int node;
++ int node = 0;
+ int count = m_cachedNodes.size();
+
+ if (count > index) {
+ node = m_cachedNodes.elementAt(index);
+ return m_dtm.getNode(node);
+ } else if (m_last == -1) {
+- while (((node = m_iter.next()) != DTMAxisIterator.END)
+- && count <= index) {
++ while (count <= index
++ && ((node = m_iter.next()) != DTMAxisIterator.END)) {
+ m_cachedNodes.addElement(node);
+ count++;
+ }
+--- ./jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java Wed May 07 19:26:26 2014 -0700
+@@ -103,8 +103,7 @@
+ * the DTMManager, it really is a proxy for this object, which
+ * is the real DTMManager.
+ */
+- protected DTMManager m_dtmManager = DTMManager.newInstance(
+- com.sun.org.apache.xpath.internal.objects.XMLStringFactoryImpl.getFactory());
++ protected DTMManager m_dtmManager = null;
+
+ /**
+ * Return the DTMManager object. Though XPathContext context extends
+--- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java Wed May 07 19:26:26 2014 -0700
+@@ -33,6 +33,7 @@
+ import com.sun.org.apache.xpath.internal.objects.XNodeSet;
+ import com.sun.org.apache.xpath.internal.res.XPATHErrorResources;
+ import com.sun.org.apache.xalan.internal.res.XSLMessages;
++import com.sun.org.apache.xalan.internal.utils.FeatureManager;
+
+ import com.sun.org.apache.xpath.internal.functions.FuncExtFunction;
+ import java.util.Vector;
+@@ -54,9 +55,12 @@
+ }
+
+ public JAXPExtensionsProvider(XPathFunctionResolver resolver,
+- boolean featureSecureProcessing ) {
++ boolean featureSecureProcessing, FeatureManager featureManager ) {
+ this.resolver = resolver;
+- this.extensionInvocationDisabled = featureSecureProcessing;
++ if (featureSecureProcessing &&
++ !featureManager.isFeatureEnabled(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION)) {
++ this.extensionInvocationDisabled = true;
++ }
+ }
+
+ /**
+--- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java Wed May 07 19:26:26 2014 -0700
+@@ -30,6 +30,7 @@
+ import com.sun.org.apache.xpath.internal.res.XPATHErrorResources;
+ import com.sun.org.apache.xalan.internal.res.XSLMessages;
+ import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
++import com.sun.org.apache.xalan.internal.utils.FeatureManager;
+
+ import javax.xml.namespace.NamespaceContext;
+ import javax.xml.namespace.QName;
+@@ -67,33 +68,36 @@
+ private boolean featureSecureProcessing = false;
+
+ private boolean useServicesMechanism = true;
++
++ private final FeatureManager featureManager;
++
+ /** Protected constructor to prevent direct instantiation; use compile()
+ * from the context.
+ */
+- protected XPathExpressionImpl() { };
++ protected XPathExpressionImpl() {
++ this(null, null, null, null,
++ false, true, new FeatureManager());
++ };
+
+ protected XPathExpressionImpl(com.sun.org.apache.xpath.internal.XPath xpath,
+ JAXPPrefixResolver prefixResolver,
+ XPathFunctionResolver functionResolver,
+ XPathVariableResolver variableResolver ) {
+- this.xpath = xpath;
+- this.prefixResolver = prefixResolver;
+- this.functionResolver = functionResolver;
+- this.variableResolver = variableResolver;
+- this.featureSecureProcessing = false;
++ this(xpath, prefixResolver, functionResolver, variableResolver,
++ false, true, new FeatureManager());
+ };
+
+ protected XPathExpressionImpl(com.sun.org.apache.xpath.internal.XPath xpath,
+- JAXPPrefixResolver prefixResolver,
+- XPathFunctionResolver functionResolver,
+- XPathVariableResolver variableResolver,
+- boolean featureSecureProcessing, boolean useServicesMechanism ) {
++ JAXPPrefixResolver prefixResolver,XPathFunctionResolver functionResolver,
++ XPathVariableResolver variableResolver, boolean featureSecureProcessing,
++ boolean useServicesMechanism, FeatureManager featureManager ) {
+ this.xpath = xpath;
+ this.prefixResolver = prefixResolver;
+ this.functionResolver = functionResolver;
+ this.variableResolver = variableResolver;
+ this.featureSecureProcessing = featureSecureProcessing;
+ this.useServicesMechanism = useServicesMechanism;
++ this.featureManager = featureManager;
+ };
+
+ public void setXPath (com.sun.org.apache.xpath.internal.XPath xpath ) {
+@@ -111,7 +115,7 @@
+ com.sun.org.apache.xpath.internal.XPathContext xpathSupport = null;
+ if ( functionResolver != null ) {
+ JAXPExtensionsProvider jep = new JAXPExtensionsProvider(
+- functionResolver, featureSecureProcessing );
++ functionResolver, featureSecureProcessing, featureManager );
+ xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext( jep );
+ } else {
+ xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext();
+--- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java Wed May 07 19:26:26 2014 -0700
+@@ -24,6 +24,8 @@
+ import com.sun.org.apache.xalan.internal.XalanConstants;
+ import com.sun.org.apache.xpath.internal.res.XPATHErrorResources;
+ import com.sun.org.apache.xalan.internal.res.XSLMessages;
++import com.sun.org.apache.xalan.internal.utils.FeatureManager;
++import com.sun.org.apache.xalan.internal.utils.FeaturePropertyBase;
+
+ import javax.xml.XMLConstants;
+ import javax.xml.xpath.XPathFactory;
+@@ -68,6 +70,8 @@
+
+ private boolean _useServicesMechanism = true;
+
++ private final FeatureManager _featureManager;
++
+ public XPathFactoryImpl() {
+ this(true);
+ }
+@@ -77,9 +81,12 @@
+ }
+
+ public XPathFactoryImpl(boolean useServicesMechanism) {
++ _featureManager = new FeatureManager();
+ if (System.getSecurityManager() != null) {
+ _isSecureMode = true;
+ _isNotSecureProcessing = false;
++ _featureManager.setValue(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
++ FeaturePropertyBase.State.FSP, XalanConstants.FEATURE_FALSE);
+ }
+ this._useServicesMechanism = useServicesMechanism;
+ }
+@@ -131,7 +138,8 @@
+ public javax.xml.xpath.XPath newXPath() {
+ return new com.sun.org.apache.xpath.internal.jaxp.XPathImpl(
+ xPathVariableResolver, xPathFunctionResolver,
+- !_isNotSecureProcessing, _useServicesMechanism );
++ !_isNotSecureProcessing, _useServicesMechanism,
++ _featureManager );
+ }
+
+ /**
+@@ -181,6 +189,10 @@
+ }
+
+ _isNotSecureProcessing = !value;
++ if (value && _featureManager != null) {
++ _featureManager.setValue(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
++ FeaturePropertyBase.State.FSP, XalanConstants.FEATURE_FALSE);
++ }
+
+ // all done processing feature
+ return;
+@@ -192,6 +204,11 @@
+ return;
+ }
+
++ if (_featureManager != null &&
++ _featureManager.setValue(name, FeaturePropertyBase.State.APIPROPERTY, value)) {
++ return;
++ }
++
+ // unknown feature
+ String fmsg = XSLMessages.createXPATHMessage(
+ XPATHErrorResources.ER_FEATURE_UNKNOWN,
+@@ -240,6 +257,14 @@
+ if (name.equals(XalanConstants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
+ return _useServicesMechanism;
+ }
++
++ /** Check to see if the property is managed by the security manager **/
++ String propertyValue = (_featureManager != null) ?
++ _featureManager.getValueAsString(name) : null;
++ if (propertyValue != null) {
++ return _featureManager.isFeatureEnabled(name);
++ }
++
+ // unknown feature
+ String fmsg = XSLMessages.createXPATHMessage(
+ XPATHErrorResources.ER_GETTING_UNKNOWN_FEATURE,
+--- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java Wed May 07 19:26:26 2014 -0700
+@@ -35,6 +35,7 @@
+ import com.sun.org.apache.xpath.internal.res.XPATHErrorResources;
+ import com.sun.org.apache.xalan.internal.res.XSLMessages;
+ import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
++import com.sun.org.apache.xalan.internal.utils.FeatureManager;
+
+ import org.w3c.dom.Node;
+ import org.w3c.dom.Document;
+@@ -70,18 +71,20 @@
+ // extensions function need to throw XPathFunctionException
+ private boolean featureSecureProcessing = false;
+ private boolean useServiceMechanism = true;
++ private final FeatureManager featureManager;
+
+ XPathImpl( XPathVariableResolver vr, XPathFunctionResolver fr ) {
+- this.origVariableResolver = this.variableResolver = vr;
+- this.origFunctionResolver = this.functionResolver = fr;
++ this(vr, fr, false, true, new FeatureManager());
+ }
+
+ XPathImpl( XPathVariableResolver vr, XPathFunctionResolver fr,
+- boolean featureSecureProcessing, boolean useServiceMechanism ) {
++ boolean featureSecureProcessing, boolean useServiceMechanism,
++ FeatureManager featureManager) {
+ this.origVariableResolver = this.variableResolver = vr;
+ this.origFunctionResolver = this.functionResolver = fr;
+ this.featureSecureProcessing = featureSecureProcessing;
+ this.useServiceMechanism = useServiceMechanism;
++ this.featureManager = featureManager;
+ }
+
+ /**
+@@ -190,7 +193,7 @@
+ com.sun.org.apache.xpath.internal.XPathContext xpathSupport = null;
+ if ( functionResolver != null ) {
+ JAXPExtensionsProvider jep = new JAXPExtensionsProvider(
+- functionResolver, featureSecureProcessing );
++ functionResolver, featureSecureProcessing, featureManager );
+ xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext( jep );
+ } else {
+ xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext();
+@@ -391,7 +394,7 @@
+ // Can have errorListener
+ XPathExpressionImpl ximpl = new XPathExpressionImpl (xpath,
+ prefixResolver, functionResolver, variableResolver,
+- featureSecureProcessing, useServiceMechanism );
++ featureSecureProcessing, useServiceMechanism, featureManager );
+ return ximpl;
+ } catch ( javax.xml.transform.TransformerException te ) {
+ throw new XPathExpressionException ( te ) ;
+--- ./jaxp/src/javax/xml/xpath/XPathException.java Tue Mar 18 12:34:22 2014 -0700
++++ ./jaxp/src/javax/xml/xpath/XPathException.java Wed May 07 19:26:26 2014 -0700
+@@ -26,6 +26,11 @@
+ package javax.xml.xpath;
+
+ import java.io.PrintWriter;
++import java.io.IOException;
++import java.io.ObjectInputStream;
++import java.io.ObjectOutputStream;
++import java.io.ObjectStreamField;
++import java.io.InvalidClassException;
+
+ /**
+ * <code>XPathException</code> represents a generic XPath exception.</p>
+@@ -36,7 +41,9 @@
+ */
+ public class XPathException extends Exception {
+
+- private final Throwable cause;
++ private static final ObjectStreamField[] serialPersistentFields = {
++ new ObjectStreamField( "cause", Throwable.class )
++ };
+
+ /**
+ * <p>Stream Unique Identifier.</p>
+@@ -62,7 +69,6 @@
+ if ( message == null ) {
+ throw new NullPointerException ( "message can't be null");
+ }
+- this.cause = null;
+ }
+
+ /**
+@@ -77,8 +83,7 @@
+ * @throws NullPointerException if <code>cause</code> is <code>null</code>.
+ */
+ public XPathException(Throwable cause) {
+- super();
+- this.cause = cause;
++ super(cause);
+ if ( cause == null ) {
+ throw new NullPointerException ( "cause can't be null");
+ }
+@@ -90,7 +95,47 @@
+ * @return Cause of this XPathException.
+ */
+ public Throwable getCause() {
+- return cause;
++ return super.getCause();
++ }
++
++ /**
++ * Writes "cause" field to the stream.
++ * The cause is got from the parent class.
++ *
++ * @param out stream used for serialization.
++ * @throws IOException thrown by <code>ObjectOutputStream</code>
++ *
++ */
++ private void writeObject(ObjectOutputStream out)
++ throws IOException
++ {
++ ObjectOutputStream.PutField fields = out.putFields();
++ fields.put("cause", (Throwable) super.getCause());
++ out.writeFields();
++ }
++
++ /**
++ * Reads the "cause" field from the stream.
++ * And initializes the "cause" if it wasn't
++ * done before.
++ *
++ * @param in stream used for deserialization
++ * @throws IOException thrown by <code>ObjectInputStream</code>
++ * @throws ClassNotFoundException thrown by <code>ObjectInputStream</code>
++ */
++ private void readObject(ObjectInputStream in)
++ throws IOException, ClassNotFoundException
++ {
++ ObjectInputStream.GetField fields = in.readFields();
++ Throwable scause = (Throwable) fields.get("cause", null);
++
++ if (super.getCause() == null && scause != null) {
++ try {
++ super.initCause(scause);
++ } catch(IllegalStateException e) {
++ throw new InvalidClassException("Inconsistent state: two causes");
++ }
++ }
+ }
+
+ /**
+--- ./jaxws/.hgtags Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/.hgtags Wed May 07 19:26:28 2014 -0700
+@@ -417,3 +417,26 @@
+ 0db5b891d1ba10211da0a8158551b35f00da7684 jdk7u55-b11
+ 3834eb921dfd8d29d917a0c57bb9fdd9aa58c209 jdk7u55-b12
+ 3b0da73591b1ea23c48aa7babc34ed776fc183f0 jdk7u55-b13
++5d726bf8fedc1f10d250e980653315919b7602f2 jdk7u55-b30
++81d0f297557c4a876727cabeb2bfcdf066a1fc9d jdk7u55-b14
++2d103c97c9bd0b3357e6d5e2b5b9ffb64c271288 jdk7u55-b31
++cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
++f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01
++8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02
++d4ba4e1ed3ecdef1ef7c3b7aaf62ff69fc105cb2 jdk7u60-b03
++bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u60-b04
++30afd3e2e7044b2aa87ce00ab4301990e6d94d27 jdk7u60-b05
++dc6017fb9cde43bce92d403abc2821b741cf977c jdk7u60-b06
++0380cb9d4dc27ed8e2c4fc3502e3d94b0ae0c02d jdk7u60-b07
++d3896e59b04dc4022c3e0d04e8750b281249bbd2 jdk7u60-b08
++c85645aa77cedabeeb6e01373cdd81afd56c602e jdk7u60-b09
++79501d4561e4cfa96fd77e2e92eb6a1b6ad61005 jdk7u60-b10
++5d848774565b5e188d7ba915ce1cb09d8f3fdb87 jdk7u60-b11
++9d34f726e35b321072ce5bd0aad2e513b9fc972f jdk7u60-b12
++d941a701cf5ca11b2777fd1d0238e05e3c963e89 jdk7u60-b13
++43b5a7cf08e7ee018b1fa42a89510b4c381dc4c5 jdk7u60-b14
++d00389bf5439e5c42599604d2ebc909d26df8dcf jdk7u60-b15
++2fc16d3a321212abc0cc93462b22c4be7f693ab9 jdk7u60-b16
++b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b18
++b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17
++1d21eb9011a060c7761c9a8a53e69d58bbea4893 jdk7u60-b19
+--- ./jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Wed May 07 19:26:28 2014 -0700
+@@ -26,6 +26,7 @@
+
+
+ package com.sun.org.glassfish.external.statistics.impl;
++
+ import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic;
+ import java.util.Map;
+ import java.lang.reflect.*;
+--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java Wed May 07 19:26:28 2014 -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
+@@ -204,24 +204,24 @@
+ }
+ portName = ClassNameInfo.getName(
+ d.getSimpleName().replace(
+- SIGC_INNERCLASS,
+- SIGC_UNDERSCORE));;
+- packageName = d.getPackage().getQualifiedName();
+- portName = webService != null && webService.name() != null && webService.name().length() >0 ?
+- webService.name() : portName;
+- serviceName = ClassNameInfo.getName(d.getQualifiedName())+SERVICE;
+- serviceName = webService != null && webService.serviceName() != null &&
+- webService.serviceName().length() > 0 ?
+- webService.serviceName() : serviceName;
+- wsdlNamespace = seiContext.getNamespaceURI();
+- typeNamespace = wsdlNamespace;
++ SIGC_INNERCLASS,
++ SIGC_UNDERSCORE));;
++ packageName = d.getPackage().getQualifiedName();
++ portName = webService != null && webService.name() != null && webService.name().length() >0 ?
++ webService.name() : portName;
++ serviceName = ClassNameInfo.getName(d.getQualifiedName())+SERVICE;
++ serviceName = webService != null && webService.serviceName() != null &&
++ webService.serviceName().length() > 0 ?
++ webService.serviceName() : serviceName;
++ wsdlNamespace = seiContext.getNamespaceURI();
++ typeNamespace = wsdlNamespace;
+
+- SOAPBinding soapBinding = d.getAnnotation(SOAPBinding.class);
+- if (soapBinding != null) {
+- pushedSOAPBinding = pushSOAPBinding(soapBinding, d, d);
+- } else if (d.equals(typeDecl)) {
+- pushedSOAPBinding = pushSOAPBinding(new MySOAPBinding(), d, d);
+- }
++ SOAPBinding soapBinding = d.getAnnotation(SOAPBinding.class);
++ if (soapBinding != null) {
++ pushedSOAPBinding = pushSOAPBinding(soapBinding, d, d);
++ } else if (d.equals(typeDecl)) {
++ pushedSOAPBinding = pushSOAPBinding(new MySOAPBinding(), d, d);
++ }
+ }
+
+ public static boolean sameStyle(SOAPBinding.Style style, SOAPStyle soapStyle) {
+@@ -235,7 +235,7 @@
+ }
+
+ protected boolean pushSOAPBinding(SOAPBinding soapBinding, Declaration bindingDecl,
+- TypeDeclaration classDecl) {
++ TypeDeclaration classDecl) {
+ boolean changed = false;
+ if (!sameStyle(soapBinding.style(), soapStyle)) {
+ changed = true;
+@@ -293,7 +293,7 @@
+
+ // abstract protected boolean shouldProcessWebService(WebService webService, InterfaceDeclaration intf);
+
+-// abstract protected boolean shouldProcessWebService(WebService webService, ClassDeclaration decl);
++ // abstract protected boolean shouldProcessWebService(WebService webService, ClassDeclaration decl);
+ protected boolean shouldProcessWebService(WebService webService, InterfaceDeclaration intf) {
+ hasWebMethods = false;
+ if (webService == null)
+@@ -315,9 +315,9 @@
+ return false;
+ hasWebMethods = hasWebMethods(classDecl);
+ SOAPBinding soapBinding = classDecl.getAnnotation(SOAPBinding.class);
+- if(soapBinding != null && soapBinding.style() == SOAPBinding.Style.RPC && soapBinding.parameterStyle() == SOAPBinding.ParameterStyle.BARE) {
+- builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(soapBinding, classDecl));
+- return false;
++ if(soapBinding != null && soapBinding.style() == SOAPBinding.Style.RPC && soapBinding.parameterStyle() == SOAPBinding.ParameterStyle.BARE) {
++ builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(soapBinding, classDecl));
++ return false;
+ }
+ return isLegalImplementation(webService, classDecl);
+ }
+@@ -345,8 +345,8 @@
+ if (webMethod.exclude()) {
+ if (webMethod.operationName().length() > 0)
+ builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE("operationName", d.getQualifiedName(), method.toString()));
+- if (webMethod.action().length() > 0)
+- builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE("action", d.getQualifiedName(), method.toString()));
++ if (webMethod.action().length() > 0)
++ builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE("action", d.getQualifiedName(), method.toString()));
+ } else {
+ return true;
+ }
+@@ -382,7 +382,7 @@
+ }
+
+ private InterfaceDeclaration getEndpointInterfaceDecl(String endpointInterfaceName,
+- ClassDeclaration d) {
++ ClassDeclaration d) {
+ InterfaceDeclaration intTypeDecl = null;
+ for (InterfaceType interfaceType : d.getSuperinterfaces()) {
+ if (endpointInterfaceName.equals(interfaceType.toString())) {
+@@ -488,7 +488,7 @@
+ Collection<Modifier> modifiers = classDecl.getModifiers();
+ if (!modifiers.contains(Modifier.PUBLIC)){
+ builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(classDecl.getQualifiedName()));
+- return false;
++ return false;
+ }
+ if (modifiers.contains(Modifier.FINAL) && !isStateful) {
+ builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(classDecl.getQualifiedName()));
+@@ -538,7 +538,7 @@
+ }
+
+ protected boolean classImplementsSEI(ClassDeclaration classDecl,
+- InterfaceDeclaration intfDecl) {
++ InterfaceDeclaration intfDecl) {
+ for (InterfaceType interfaceType : classDecl.getSuperinterfaces()) {
+ if (interfaceType.getDeclaration().equals(intfDecl))
+ return true;
+@@ -637,8 +637,8 @@
+ */
+ if (!isLegalType(method.getReturnType())) {
+ builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(typeDecl.getQualifiedName(),
+- method.getSimpleName(),
+- method.getReturnType()));
++ method.getSimpleName(),
++ method.getReturnType()));
+ }
+ boolean isOneway = method.getAnnotation(Oneway.class) != null;
+ if (isOneway && !isValidOnewayMethod(method, typeDecl))
+@@ -684,14 +684,14 @@
+ }
+
+ protected boolean isLegalParameter(ParameterDeclaration param,
+- MethodDeclaration method,
+- TypeDeclaration typeDecl,
+- int paramIndex) {
++ MethodDeclaration method,
++ TypeDeclaration typeDecl,
++ int paramIndex) {
+ if (!isLegalType(param.getType())) {
+ builder.onError(param.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(typeDecl.getQualifiedName(),
+- method.getSimpleName(),
+- param.getSimpleName(),
+- param.getType().toString()));
++ method.getSimpleName(),
++ param.getSimpleName(),
++ param.getType().toString()));
+ return false;
+ }
+ TypeMirror holderType;
+--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java Wed May 07 19:26:28 2014 -0700
+@@ -334,7 +334,7 @@
+ if(options.verbose) {
+ listener.message(WscompileMessages.WSIMPORT_ARCHIVE_ARTIFACT(f, options.clientjar));
+ }
+- String entry = f.getCanonicalPath().substring(base.length()+1);
++ String entry = f.getCanonicalPath().substring(base.length()+1).replace(File.separatorChar, '/');
+ BufferedInputStream bis = new BufferedInputStream(
+ new FileInputStream(f));
+ JarEntry jarEntry = new JarEntry(entry);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Wed May 07 19:26:28 2014 -0700
+@@ -160,8 +160,8 @@
+ res = Messages.INCOMPATIBLE_API_VERSION;
+
+ throw new LinkageError( res.format(
+- Which.which(XmlSchema.class),
+- Which.which(ModelBuilder.class)
++ Which.which(XmlSchema.class),
++ Which.which(ModelBuilder.class)
+ ));
+ }
+ }
+@@ -176,8 +176,8 @@
+ } catch (NoSuchMethodError e) {
+ // we seem to be getting 1.0 runtime
+ throw new LinkageError( Messages.RUNNING_WITH_1_0_RUNTIME.format(
+- Which.which(WhiteSpaceProcessor.class),
+- Which.which(ModelBuilder.class)
++ Which.which(WhiteSpaceProcessor.class),
++ Which.which(ModelBuilder.class)
+ ));
+ }
+ }
+@@ -293,7 +293,7 @@
+
+ if(nav.isArray(t)) { // no need for checking byte[], because above typeInfoset.getTypeInfo() would return non-null
+ ArrayInfoImpl<T,C,F,M> ai =
+- createArrayInfo(upstream, t);
++ createArrayInfo(upstream, t);
+ addTypeName(ai);
+ typeInfoSet.add(ai);
+ return ai;
+@@ -329,7 +329,7 @@
+ }
+
+ protected ElementInfoImpl<T,C,F,M> createElementInfo(
+- RegistryInfoImpl<T,C,F,M> registryInfo, M m) throws IllegalAnnotationException {
++ RegistryInfoImpl<T,C,F,M> registryInfo, M m) throws IllegalAnnotationException {
+ return new ElementInfoImpl<T,C,F,M>(this,registryInfo,m);
+ }
+
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java Wed May 07 19:26:28 2014 -0700
+@@ -22,6 +22,7 @@
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
++
+ package com.sun.xml.internal.ws.client;
+
+ import com.sun.istack.internal.NotNull;
+@@ -140,8 +141,8 @@
+ /**
+ * Information about SEI, keyed by their interface type.
+ */
+- // private final Map<Class,SEIPortInfo> seiContext = new HashMap<Class,SEIPortInfo>();
+- private final Map<QName,SEIPortInfo> seiContext = new HashMap<QName,SEIPortInfo>();
++ // private final Map<Class,SEIPortInfo> seiContext = new HashMap<Class,SEIPortInfo>();
++ private final Map<QName,SEIPortInfo> seiContext = new HashMap<QName,SEIPortInfo>();
+
+ // This executor is used for all the async invocations for all proxies
+ // created from this service. But once the proxy is created, then changing
+@@ -166,8 +167,8 @@
+
+ public WSServiceDelegate(URL wsdlDocumentLocation, QName serviceName, Class<? extends Service> serviceClass) {
+ this(
+- wsdlDocumentLocation==null ? null : new StreamSource(wsdlDocumentLocation.toExternalForm()),
+- serviceName,serviceClass);
++ wsdlDocumentLocation==null ? null : new StreamSource(wsdlDocumentLocation.toExternalForm()),
++ serviceName,serviceClass);
+ }
+
+ /**
+@@ -204,10 +205,10 @@
+ if(wsdl == null){
+ if(serviceClass != Service.class){
+ WebServiceClient wsClient = AccessController.doPrivileged(new PrivilegedAction<WebServiceClient>() {
+- public WebServiceClient run() {
+- return serviceClass.getAnnotation(WebServiceClient.class);
+- }
+- });
++ public WebServiceClient run() {
++ return serviceClass.getAnnotation(WebServiceClient.class);
++ }
++ });
+ String wsdlLocation = wsClient.wsdlLocation();
+ wsdlLocation = JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(wsdlLocation));
+ wsdl = new StreamSource(wsdlLocation);
+@@ -221,8 +222,8 @@
+ service = model.getService(this.serviceName);
+ if (service == null)
+ throw new WebServiceException(
+- ClientMessages.INVALID_SERVICE_NAME(this.serviceName,
+- buildNameList(model.getServices().keySet())));
++ ClientMessages.INVALID_SERVICE_NAME(this.serviceName,
++ buildNameList(model.getServices().keySet())));
+ // fill in statically known ports
+ for (WSDLPortImpl port : service.getPorts())
+ ports.put(port.getName(), new PortInfo(this, port));
+@@ -255,7 +256,7 @@
+ private WSDLModelImpl parseWSDL(URL wsdlDocumentLocation, Source wsdlSource) {
+ try {
+ return RuntimeWSDLParser.parse(wsdlDocumentLocation, wsdlSource, createDefaultCatalogResolver(),
+- true, getContainer(), ServiceFinder.find(WSDLParserExtension.class).toArray());
++ true, getContainer(), ServiceFinder.find(WSDLParserExtension.class).toArray());
+ } catch (IOException e) {
+ throw new WebServiceException(e);
+ } catch (XMLStreamException e) {
+@@ -345,7 +346,7 @@
+ //get the first port corresponding to the SEI
+ WSDLPortImpl port = wsdlService.getMatchingPort(portTypeName);
+ if (port == null)
+- throw new WebServiceException(ClientMessages.UNDEFINED_PORT_TYPE(portTypeName));
++ throw new WebServiceException(ClientMessages.UNDEFINED_PORT_TYPE(portTypeName));
+ QName portName = port.getName();
+ return getPort(portName, portInterface,features);
+ }
+@@ -431,8 +432,8 @@
+ binding.setMode(mode);
+ Dispatch<Object> dispatch = Stubs.createJAXBDispatch(
+ port, binding, jaxbContext, mode,wsepr);
+- serviceInterceptor.postCreateDispatch((WSBindingProvider)dispatch);
+- return dispatch;
++ serviceInterceptor.postCreateDispatch((WSBindingProvider)dispatch);
++ return dispatch;
+ }
+
+ @Override
+@@ -583,7 +584,7 @@
+
+ if (wsdlService.get(portName)==null) {
+ throw new WebServiceException(
+- ClientMessages.INVALID_PORT_NAME(portName,buildWsdlPortNames()));
++ ClientMessages.INVALID_PORT_NAME(portName,buildWsdlPortNames()));
+ }
+
+ BindingImpl binding = eif.createBinding(webServiceFeatures,portInterface);
+@@ -681,7 +682,7 @@
+ return wsdlService;
+ }
+
+- class DaemonThreadFactory implements ThreadFactory {
++ class DaemonThreadFactory implements ThreadFactory {
+ public Thread newThread(Runnable r) {
+ Thread daemonThread = new Thread(r);
+ daemonThread.setDaemon(Boolean.TRUE);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java Wed May 07 19:26:28 2014 -0700
+@@ -40,11 +40,12 @@
+ */
+ private static Object newInstance(String className,
+ ClassLoader classLoader)
+- throws SOAPException
++ throws SOAPException
+ {
+ try {
+ Class spiClass = safeLoadClass(className, classLoader);
+ return spiClass.newInstance();
++
+ } catch (ClassNotFoundException x) {
+ throw new SOAPException("Provider " + className + " not found", x);
+ } catch (Exception x) {
+@@ -66,7 +67,7 @@
+ * @exception SOAPException if there is a SOAP error
+ */
+ static Object find(String factoryId)
+- throws SOAPException
++ throws SOAPException
+ {
+ return find(factoryId, null, false);
+ }
+@@ -92,7 +93,7 @@
+ * @exception SOAPException if there is a SOAP error
+ */
+ static Object find(String factoryId, String fallbackClassName)
+- throws SOAPException
++ throws SOAPException
+ {
+ return find(factoryId, fallbackClassName, true);
+ }
+@@ -122,7 +123,7 @@
+ * @exception SOAPException if there is a SOAP error
+ */
+ static Object find(String factoryId, String defaultClassName,
+- boolean tryFallback) throws SOAPException {
++ boolean tryFallback) throws SOAPException {
+ ClassLoader classLoader;
+ try {
+ classLoader = Thread.currentThread().getContextClassLoader();
+@@ -133,7 +134,7 @@
+ // Use the system property first
+ try {
+ String systemProp =
+- System.getProperty( factoryId );
++ System.getProperty( factoryId );
+ if( systemProp!=null) {
+ return newInstance(systemProp, classLoader);
+ }
+@@ -144,7 +145,7 @@
+ try {
+ String javah=System.getProperty( "java.home" );
+ String configFile = javah + File.separator +
+- "lib" + File.separator + "jaxm.properties";
++ "lib" + File.separator + "jaxm.properties";
+ File f=new File( configFile );
+ if( f.exists()) {
+ Properties props=new Properties();
+@@ -167,13 +168,13 @@
+
+ if( is!=null ) {
+ BufferedReader rd =
+- new BufferedReader(new InputStreamReader(is, "UTF-8"));
++ new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+ String factoryClassName = rd.readLine();
+ rd.close();
+
+ if (factoryClassName != null &&
+- ! "".equals(factoryClassName)) {
++ ! "".equals(factoryClassName)) {
+ return newInstance(factoryClassName, classLoader);
+ }
+ }
+@@ -188,7 +189,7 @@
+ // (built in) factory if specified.
+ if (defaultClassName == null) {
+ throw new SOAPException(
+- "Provider for " + factoryId + " cannot be found", null);
++ "Provider for " + factoryId + " cannot be found", null);
+ }
+ return newInstance(defaultClassName, classLoader);
+ }
+@@ -200,7 +201,7 @@
+ * Class.forName() on it so it will be loaded by the bootstrap class loader.
+ */
+ private static Class safeLoadClass(String className,
+- ClassLoader classLoader)
++ ClassLoader classLoader)
+ throws ClassNotFoundException {
+ try {
+ // make sure that the current thread has an access to the package of the given name.
+@@ -218,7 +219,7 @@
+ return classLoader.loadClass(className);
+ } catch (SecurityException se) {
+ // (only) default implementation can be loaded
+- // using bootstrap class loader ...
++ // using bootstrap class loader:
+ if (isDefaultImplementation(className))
+ return Class.forName(className);
+
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java Wed May 07 19:26:28 2014 -0700
+@@ -96,8 +96,9 @@
+ * @see SAAJMetaFactory
+ */
+
+- public static MessageFactory newInstance()
+- throws SOAPException {
++ public static MessageFactory newInstance() throws SOAPException {
++
++
+ try {
+ MessageFactory factory = (MessageFactory) FactoryFinder.find(
+ MESSAGE_FACTORY_PROPERTY,
+@@ -107,8 +108,8 @@
+ if (factory != null) {
+ return factory;
+ }
++ return newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
+
+- return newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
+ } catch (Exception ex) {
+ throw new SOAPException(
+ "Unable to create message factory for SOAP: "
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java Wed May 07 19:26:28 2014 -0700
+@@ -261,7 +261,8 @@
+ throws SOAPException
+ {
+ try {
+- SOAPFactory factory = (SOAPFactory) FactoryFinder.find(SOAP_FACTORY_PROPERTY, DEFAULT_SOAP_FACTORY, false);
++ SOAPFactory factory = (SOAPFactory) FactoryFinder.find(
++ SOAP_FACTORY_PROPERTY, DEFAULT_SOAP_FACTORY, false);
+ if (factory != null)
+ return factory;
+ return newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java Tue Mar 18 12:34:51 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java Wed May 07 19:26:28 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+--- ./jdk/.hgtags Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/.hgtags Wed May 07 19:26:47 2014 -0700
+@@ -401,3 +401,26 @@
+ 2d80b7cd7aae76f0909a210414317dcf846ad651 jdk7u55-b11
+ 07be5d5508733ed37c11fcd21a13ae3c8288313b jdk7u55-b12
+ 92fd166252c2701092a510002f4cf9285a20473d jdk7u55-b13
++4a5651c84b1e6cf26dc9b19f00747e5004efba68 jdk7u55-b30
++ffd99c5975217a14609851602c5f5dc005234aba jdk7u55-b14
++88f1bf248cc520e0bf7ef17bc862f87aab958373 jdk7u55-b31
++db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
++def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01
++ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02
++b1bcc999a8f1b4b4452b59c6636153bb0154cf5a jdk7u60-b03
++efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u60-b04
++4fb749a3110727d5334c69793578a3254a053bf5 jdk7u60-b05
++46ca1ce7550f1463d60c3eacaf7b8cdc44b0c66e jdk7u60-b06
++d5a2f60006e3c4243abeee0f623e5c3f79372fd8 jdk7u60-b07
++0dd27693876d66d176457749d0f2161b219eba2d jdk7u60-b08
++7b571638b0f51bcbe04c088dfff569b4cba6bbdf jdk7u60-b09
++fb4981489b09594d2449527e2d511834cf8ad370 jdk7u60-b10
++c2bb87dae8a08eab6f4f336ce5a59865aa0214d6 jdk7u60-b11
++1a90de8005e3de2475fd9355dcdb6f5e60bf89cc jdk7u60-b12
++b06d4ed71ae0bc6e13f5a8437cb6388f17c66e84 jdk7u60-b13
++b7fbd9b4febf8961091fdf451d3da477602a8f1d jdk7u60-b14
++04882f9a073e8de153ec7ad32486569fd9a087ec jdk7u60-b15
++41547583c3a035c3924ffedfa8704e58d69e5c50 jdk7u60-b16
++e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b18
++e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17
++7190843ddaf4f3ad158c3071be0f4ca42a5802dc jdk7u60-b19
+--- ./jdk/make/bridge/AccessBridgeJava/Makefile Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/bridge/AccessBridgeJava/Makefile Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++# 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
+@@ -51,7 +51,7 @@
+ #
+ # Java files to compile.
+ #
+-FILES_java = com/sun/java/accessibility/AccessBridge.java
++FILES_java = com/sun/java/accessibility/AccessBridgeLoader.java com/sun/java/accessibility/AccessBridge.java
+
+ #
+ # Location for the newly built classfiles.
+@@ -68,7 +68,7 @@
+ build: prebuild
+
+ prebuild:
+- $(CP) $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility/$(ABPLATFORM)/AccessBridge.java \
++ $(CP) $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility/$(ABPLATFORM)/AccessBridgeLoader.java \
+ $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility
+
+ all : build $(JARFILE)
+--- ./jdk/make/com/oracle/Makefile Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/com/oracle/Makefile Wed May 07 19:26:47 2014 -0700
+@@ -30,22 +30,8 @@
+ #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
+ include $(BUILDDIR)/common/Defs.gmk
+
+-JFR_SRCDIRS_EXIST := $(shell \
+- if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \
+- echo true; \
+- else \
+- echo false; \
+- fi)
+-
+-JFR =
+-ifndef OPENJDK
+- ifndef JAVASE_EMBEDDED
+- ifeq ($(JFR_SRCDIRS_EXIST), true)
+- ifneq (${ARCH},arm)
+- JFR = jfr
+- endif
+- endif
+- endif
++ifeq ($(BUILD_JFR), true)
++ JFR = jfr
+ endif
+
+ # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
+--- ./jdk/make/common/Defs-macosx.gmk Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/common/Defs-macosx.gmk Wed May 07 19:26:47 2014 -0700
+@@ -397,11 +397,14 @@
+ INCLUDE_SA = true
+ endif
+
+-ifdef CROSS_COMPILE_ARCH
+- # X11 headers are not under /usr/include
+- OTHER_CFLAGS += -I$(OPENWIN_HOME)/include
+- OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
+- OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
+-endif
++# X11 headers are not under /usr/include
++OTHER_CFLAGS += -I$(OPENWIN_HOME)/include
++OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
++OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
++
++# Use unlimited select
++OTHER_CFLAGS += -D_DARWIN_UNLIMITED_SELECT
++OTHER_CXXFLAGS += -D_DARWIN_UNLIMITED_SELECT
++OTHER_CPPFLAGS += -D_DARWIN_UNLIMITED_SELECT
+
+ LIB_LOCATION ?= $(LIBDIR)
+--- ./jdk/make/common/Release-macosx.gmk Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/common/Release-macosx.gmk Wed May 07 19:26:47 2014 -0700
+@@ -58,6 +58,9 @@
+ jdk-bundle-setup:
+ $(RM) -r $(JDK_BUNDLE_DIR)
+
++jdk-server-bundle-setup:
++ $(RM) -r $(JDK_SERVER_BUNDLE_DIR)
++
+ jre-bundle-files:
+ $(MKDIR) -p $(JRE_BUNDLE_DIR)/MacOS
+ ln -s ../Home/lib/jli/libjli.dylib $(JRE_BUNDLE_DIR)/MacOS/
+@@ -79,6 +82,6 @@
+ $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" -e "s/@@NAME@@/$(BUNDE_NAME_JDK)/g" -e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" < $(MACOSX_SRC)/bundle/JDK-Info.plist > $(JDK_SERVER_BUNDLE_DIR)/Info.plist
+ /usr/bin/SetFile -a B $(JDK_SERVER_BUNDLE_DIR)/../
+
+-EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jre-bundle-files jdk-bundle-files jdk-server-bundle-files
++EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jdk-server-bundle-setup jre-bundle-files jdk-bundle-files jdk-server-bundle-files
+
+ .PHONY: $(EXTRA_JRE_TARGETS) $(EXTRA_IMAGE_TARGETS)
+--- ./jdk/make/common/Release.gmk Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/common/Release.gmk Wed May 07 19:26:47 2014 -0700
+@@ -402,25 +402,9 @@
+ sun/tools/jinfo \
+ sun/tools/jmap
+
+-JFR_SRCDIRS_EXIST := $(shell \
+- if [ -d $(CLOSED_SHARE_SRC)/classes/com/oracle/jrockit/jfr ] ; then \
+- echo true; \
+- else \
+- echo false; \
+- fi)
+-
+-BUILD_JFR=
+-ifndef OPENJDK
+-ifndef JAVASE_EMBEDDED
+-ifeq ($(JFR_SRCDIRS_EXIST), true)
+-BUILD_JFR=true
+-endif
+-endif
+-endif
+-
+ # classes that go into jfr.jar
+ JFR_CLASSES_DIRS=
+-ifdef BUILD_JFR
++ifeq ($(BUILD_JFR), true)
+ JFR_CLASSES_DIRS= \
+ com/oracle/jrockit/jfr \
+ oracle/jrockit/jfr \
+@@ -629,7 +613,7 @@
+ $(ECHO) "sun/tools/jstack/" >> $@
+ $(ECHO) "sun/tools/jinfo/" >> $@
+ $(ECHO) "sun/tools/jmap/" >> $@
+-ifdef BUILD_JFR
++ifeq ($(BUILD_JFR), true)
+ $(ECHO) "com/oracle/jrockit/jfr/" >> $@
+ $(ECHO) "com/oracle/jrockit/jfr/client/" >> $@
+ $(ECHO) "com/oracle/jrockit/jfr/management/" >> $@
+@@ -668,7 +652,7 @@
+
+ # Create jfr.jar
+ JFR_JAR=
+-ifdef BUILD_JFR
++ifeq ($(BUILD_JFR), true)
+ JFR_JAR=$(ABS_TEMPDIR)/jfr-orig.jar
+ $(JFR_JAR): $(OTHER_JAR_MANIFEST_FILE)
+ $(prep-target)
+--- ./jdk/make/java/java/FILES_c.gmk Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/java/java/FILES_c.gmk Wed May 07 19:26:47 2014 -0700
+@@ -37,7 +37,6 @@
+ FileInputStream.c \
+ FileInputStream_md.c \
+ FileOutputStream_md.c \
+- Finalizer.c \
+ Float.c \
+ Object.c \
+ ObjectOutputStream.c \
+--- ./jdk/make/java/java/Makefile Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/java/java/Makefile Wed May 07 19:26:47 2014 -0700
+@@ -102,6 +102,7 @@
+ java/util/prefs/MacOSXPreferencesFactory.java
+
+ CFLAGS_$(VARIANT)/java_props_md.o = -Os -x objective-c
++CFLAGS_$(VARIANT)/java_props_macosx.o = -Os -x objective-c
+ endif
+
+ #
+@@ -222,6 +223,7 @@
+ ifeq ($(PLATFORM), macosx)
+ OTHER_LDLIBS += \
+ -framework CoreFoundation \
++ -framework Foundation \
+ -framework Security \
+ -framework SystemConfiguration
+ endif
+--- ./jdk/make/java/java/mapfile-vers Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/java/java/mapfile-vers Wed May 07 19:26:47 2014 -0700
+@@ -121,6 +121,7 @@
+ Java_java_io_UnixFileSystem_setReadOnly;
+ Java_java_io_UnixFileSystem_setPermission;
+ Java_java_lang_Class_forName0;
++ Java_java_lang_Class_getCheckMemberAccessMethod;
+ Java_java_lang_Class_getPrimitiveClass;
+ Java_java_lang_Class_isAssignableFrom;
+ Java_java_lang_Class_isInstance;
+@@ -140,7 +141,6 @@
+ Java_java_lang_Double_doubleToRawLongBits;
+ Java_java_lang_reflect_Proxy_defineClass0;
+ Java_java_lang_Shutdown_runAllFinalizers;
+- Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
+ Java_java_lang_Float_intBitsToFloat;
+ Java_java_lang_Float_floatToRawIntBits;
+ Java_java_lang_StrictMath_IEEEremainder;
+--- ./jdk/make/java/java/reorder-i586 Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/java/java/reorder-i586 Wed May 07 19:26:47 2014 -0700
+@@ -77,7 +77,6 @@
+ text: .text%JNU_GetEnv;
+ text: .text%Java_java_io_UnixFileSystem_checkAccess;
+ text: .text%Java_sun_reflect_NativeMethodAccessorImpl_invoke0;
+-text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
+ text: .text%Java_java_io_FileInputStream_available;
+ text: .text%Java_java_lang_reflect_Array_newArray;
+ text: .text%Java_java_lang_Throwable_getStackTraceDepth;
+--- ./jdk/make/java/java/reorder-sparc Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/java/java/reorder-sparc Wed May 07 19:26:47 2014 -0700
+@@ -87,7 +87,6 @@
+ text: .text%throwFileNotFoundException;
+ text: .text%JNU_NotifyAll;
+ # Test LoadFrame
+-text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
+ text: .text%JNU_CallMethodByName;
+ text: .text%JNU_CallMethodByNameV;
+ text: .text%Java_java_io_UnixFileSystem_createDirectory;
+--- ./jdk/make/java/java/reorder-sparcv9 Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/java/java/reorder-sparcv9 Wed May 07 19:26:47 2014 -0700
+@@ -77,7 +77,6 @@
+ text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
+ text: .text%JNU_GetEnv;
+ text: .text%Java_java_io_UnixFileSystem_checkAccess;
+-text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
+ text: .text%Java_java_lang_reflect_Array_newArray;
+ text: .text%Java_java_lang_Throwable_getStackTraceDepth;
+ text: .text%Java_java_lang_Throwable_getStackTraceElement;
+--- ./jdk/make/sun/awt/Makefile Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/awt/Makefile Wed May 07 19:26:47 2014 -0700
+@@ -191,6 +191,10 @@
+ sun/awt/windows/awtLocalization.properties
+ endif
+
++ifeq ($(PLATFORM), macosx)
++ NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES += \
++ sun/awt/resources/awtosx.properties
++endif
+ #
+ # Rules
+ #
+--- ./jdk/make/sun/javazic/tzdata/VERSION Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/VERSION Wed May 07 19:26:47 2014 -0700
+@@ -21,4 +21,4 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-tzdata2013i
++tzdata2014b
+--- ./jdk/make/sun/javazic/tzdata/africa Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/africa Wed May 07 19:26:47 2014 -0700
+@@ -891,7 +891,10 @@
+ # Another source (specifying the time for start and end in the decree):
+ # http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
+
+-# From Paul Eggert (2013-10-03):
++# From Sebastien Willemijns (2014-03-18):
++# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
++
++# From Paul Eggert (2014-03-19):
+ # To estimate what the Moroccan government will do in future years,
+ # transition dates for 2014 through 2038 were determined by running
+ # the following program under GNU Emacs 24.3:
+--- ./jdk/make/sun/javazic/tzdata/antarctica Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/antarctica Wed May 07 19:26:47 2014 -0700
+@@ -253,24 +253,41 @@
+ # year-round base
+ # Scott Base, Ross Island, since 1957-01.
+ # See Pacific/Auckland.
+-#
+-# These rules for New Zealand are stolen from the 'australasia' file.
+-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
+-Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
+-Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D
+-Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D
+-Rule NZAQ 1975 only - Feb 23 2:00s 0 S
+-Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S
+-Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S
+-Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D
+-Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S
+
+ # Norway - territories
+ # Bouvet (never inhabited)
+ #
+ # claims
+ # Peter I Island (never inhabited)
++#
++# year-round base
++# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12
++#
++# From Paul-Inge Flakstad (2014-03-10):
++# I recently had a long dialog about this with the developer of timegenie.com.
++# In the absence of specific dates, he decided to choose some likely ones:
++# GMT +1 - From March 1 to the last Sunday in March
++# GMT +2 - From the last Sunday in March until the last Sunday in October
++# GMT +1 - From the last Sunday in October until November 7
++# GMT +0 - From November 7 until March 1
++# The dates for switching to and from UTC+0 will probably not be absolutely
++# correct, but they should be quite close to the actual dates.
++#
++# From Paul Eggert (2014-03-21):
++# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
++# suggested by Bengt-Inge Larsson comment them out for now, and approximate
++# with only UTC and CEST. Uncomment them when 2014b is more prevalent.
++#
++# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
++#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET
++Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST
++#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET
++#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC
++# Remove the following line when uncommenting the above '#Rule' lines.
++Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC
++# Zone NAME GMTOFF RULES FORMAT [UNTIL]
++Zone Antarctica/Troll 0 - zzz 2005 Feb 12
++ 0:00 Troll %s
+
+ # Poland - year-round base
+ # Arctowski, King George Island, -620945-0582745, since 1977
+--- ./jdk/make/sun/javazic/tzdata/asia Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/asia Wed May 07 19:26:47 2014 -0700
+@@ -1113,8 +1113,13 @@
+ Rule Zion 1986 only - Sep 7 0:00 0 S
+ Rule Zion 1987 only - Apr 15 0:00 1:00 D
+ Rule Zion 1987 only - Sep 13 0:00 0 S
+-Rule Zion 1988 only - Apr 9 0:00 1:00 D
+-Rule Zion 1988 only - Sep 3 0:00 0 S
++
++# From Avigdor Finkelstein (2014-03-05):
++# I check the Parliament (Knesset) records and there it's stated that the
++# [1988] transition should take place on Saturday night, when the Sabbath
++# ends and changes to Sunday.
++Rule Zion 1988 only - Apr 10 0:00 1:00 D
++Rule Zion 1988 only - Sep 4 0:00 0 S
+
+ # From Ephraim Silverberg
+ # (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, 2004-12-22,
+--- ./jdk/make/sun/javazic/tzdata/australasia Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/australasia Wed May 07 19:26:47 2014 -0700
+@@ -377,16 +377,18 @@
+ # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
+
+ # From the Fijian Government Media Center (2013-08-30) via David Wheeler:
+-# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
+-# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am
++# Fiji will start daylight savings on Sunday 27th October, 2013 ...
++# move clocks forward by one hour from 2am
+ # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
+-#
+-# From Paul Eggert (2013-09-09):
++
++# From Steffen Thorsen (2013-01-10):
++# Fiji will end DST on 2014-01-19 02:00:
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
++
++# From Paul Eggert (2014-01-10):
+ # For now, guess that Fiji springs forward the Sunday before the fourth
+-# Monday in October. This matches both recent practice and
+-# timeanddate.com's current spring-forward prediction.
+-# For the January 2014 transition we guessed right while timeanddate.com
+-# guessed wrong, so leave the fall-back prediction alone.
++# Monday in October, and springs back the penultimate Sunday in January.
++# This is ad hoc, but matches recent practice.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
+@@ -395,7 +397,8 @@
+ Rule Fiji 2010 only - Mar lastSun 3:00 0 -
+ Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S
+ Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
+-Rule Fiji 2012 max - Jan Sun>=18 3:00 0 -
++Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
++Rule Fiji 2014 max - Jan Sun>=18 2:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
+ 12:00 Fiji FJ%sT # Fiji Time
+@@ -783,14 +786,29 @@
+
+ # Johnston
+ #
+-# From Paul Eggert (2013-09-03):
++# From Paul Eggert (2014-03-11):
++# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind.
++# Details are uncertain. We have no data for Johnston after 1970, so
++# treat it like Hawaii for now.
++#
+ # In his memoirs of June 6th to October 4, 1945
+ # <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
+ # "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
+ # Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and
+ # confirms that Johnston kept the same time as Honolulu in summer 1945.
+-# We have no better information, so for now, assume this has been true
+-# indefinitely into the past.
++#
++# From Lyle McElhaney (2014-03-11):
++# [W]hen JI was being used for that [atomic bomb] testing, the time being used
++# was not Hawaiian time but rather the same time being used on the ships,
++# which had a GMT offset of -11 hours. This apparently applied to at least the
++# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
++# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
++# "The United States High-Altitude Test Experience: A Review Emphasizing the
++# Impact on the Environment", Los Alamos LA-6405, Oct 1976
++# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
++# See the table on page 4 where he lists GMT and local times for the tests; a
++# footnote for the JI tests reads that local time is "JI time = Hawaii Time
++# Minus One Hour".
+ #
+ # See 'northamerica' for Pacific/Johnston.
+
+--- ./jdk/make/sun/javazic/tzdata/europe Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/europe Wed May 07 19:26:47 2014 -0700
+@@ -2768,14 +2768,18 @@
+ # According to the articles linked below, Turkey will change into summer
+ # time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27.
+ # This change is due to a nationwide exam on 27th.
+-#
+-# <a href="http://www.worldbulletin.net/?aType=haber&ArticleID=70872">
+ # http://www.worldbulletin.net/?aType=haber&ArticleID=70872
+-# </a>
+ # Turkish:
+-# <a href="http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373">
+ # http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373
+-# </a>
++
++# From Faruk Pasin (2014-02-14):
++# The DST for Turkey has been changed for this year because of the
++# Turkish Local election....
++# http://www.sabah.com.tr/Ekonomi/2014/02/12/yaz-saatinde-onemli-degisiklik
++# ... so Turkey will move clocks forward one hour on March 31 at 3:00 a.m.
++# From Paul Eggert (2014-02-17):
++# Here is an English-language source:
++# http://www.worldbulletin.net/turkey/129016/turkey-switches-to-daylight-saving-time-march-31
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Turkey 1916 only - May 1 0:00 1:00 S
+@@ -2844,6 +2848,8 @@
+ 2:00 Turkey EE%sT 2007
+ 2:00 EU EE%sT 2011 Mar 27 1:00u
+ 2:00 - EET 2011 Mar 28 1:00u
++ 2:00 EU EE%sT 2014 Mar 30 1:00u
++ 2:00 - EET 2014 Mar 31 1:00u
+ 2:00 EU EE%sT
+ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
+
+@@ -2865,19 +2871,13 @@
+ # approval from 266 deputies.
+ #
+ # Ukraine abolishes transter back to the winter time (in Russian)
+-# <a href="http://news.mail.ru/politics/6861560/">
+ # http://news.mail.ru/politics/6861560/
+-# </a>
+ #
+ # The Ukrainians will no longer change the clock (in Russian)
+-# <a href="http://www.segodnya.ua/news/14290482.html">
+ # http://www.segodnya.ua/news/14290482.html
+-# </a>
+ #
+ # Deputies cancelled the winter time (in Russian)
+-# <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
+ # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
+-# </a>
+ #
+ # From Philip Pizzey (2011-10-18):
+ # Today my Ukrainian colleagues have informed me that the
+@@ -2888,18 +2888,39 @@
+ # As far as I understand, the recent change to the Ukrainian time zone
+ # (Europe/Kiev) to introduce permanent daylight saving time (similar
+ # to Russia) was reverted today:
+-#
+-# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">
+ # http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
+-# </a>
+ #
+ # Also reported by Alexander Bokovoy (2011-10-18) who also noted:
+ # The law documents themselves are at
++# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
++
++# From Vladimir in Moscow via Alois Treindl re Kiev time 1991/2 (2014-02-28):
++# First in Ukraine they changed Time zone from UTC+3 to UTC+2 with DST:
++# 03 25 1990 02:00 -03.00 1 Time Zone 3 with DST
++# 07 01 1990 02:00 -02.00 1 Time Zone 2 with DST
++# * Ukrainian Government's Resolution of 18.06.1990, No. 134.
++# http://search.ligazakon.ua/l_doc2.nsf/link1/T001500.html
+ #
+-# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">
+-# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
+-# </a>
+-
++# They did not end DST in September, 1990 (according to the law,
++# "summer time" was still in action):
++# 09 30 1990 03:00 -02.00 1 Time Zone 2 with DST
++# * Ukrainian Government's Resolution of 21.09.1990, No. 272.
++# http://search.ligazakon.ua/l_doc2.nsf/link1/KP900272.html
++#
++# Again no change in March, 1991 ("summer time" in action):
++# 03 31 1991 02:00 -02.00 1 Time Zone 2 with DST
++#
++# DST ended in September 1991 ("summer time" ended):
++# 09 29 1991 03:00 -02.00 0 Time Zone 2, no DST
++# * Ukrainian Government's Resolution of 25.09.1991, No. 225.
++# http://www.uazakon.com/documents/date_21/pg_iwgdoc.htm
++# This is an answer.
++#
++# Since 1992 they had normal DST procedure:
++# 03 29 1992 02:00 -02.00 1 DST started
++# 09 27 1992 03:00 -02.00 0 DST ended
++# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
++# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ # Most of Ukraine since 1970 has been like Kiev.
+@@ -2910,9 +2931,8 @@
+ 2:00 - EET 1930 Jun 21
+ 3:00 - MSK 1941 Sep 20
+ 1:00 C-Eur CE%sT 1943 Nov 6
+- 3:00 Russia MSK/MSD 1990
+- 3:00 - MSK 1990 Jul 1 2:00
+- 2:00 - EET 1992
++ 3:00 Russia MSK/MSD 1990 Jul 1 2:00
++ 2:00 1:00 EEST 1991 Sep 29 3:00
+ 2:00 E-Eur EE%sT 1995
+ 2:00 EU EE%sT
+ # Ruthenia used CET 1990/1991.
+@@ -2966,7 +2986,11 @@
+ # Assume it happened in March by not changing the clocks.
+ 3:00 Russia MSK/MSD 1997
+ 3:00 - MSK 1997 Mar lastSun 1:00u
+- 2:00 EU EE%sT
++# From Alexander Krivenyshev (2014-03-17):
++# time change at 2:00 (2am) on March 30, 2014
++# http://vz.ru/news/2014/3/17/677464.html
++ 2:00 EU EE%sT 2014 Mar 30 2:00
++ 4:00 - MSK
+
+ # Vatican City
+ # See Europe/Rome.
+--- ./jdk/make/sun/javazic/tzdata/leapseconds Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/leapseconds Wed May 07 19:26:47 2014 -0700
+@@ -20,7 +20,7 @@
+ # 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.
+-
++#
+ # Allowance for leapseconds added to each timezone file.
+
+ # This file is in the public domain.
+--- ./jdk/make/sun/javazic/tzdata/northamerica Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/northamerica Wed May 07 19:26:47 2014 -0700
+@@ -414,9 +414,10 @@
+ # US Pacific time, represented by Los Angeles
+ #
+ # California, northern Idaho (Benewah, Bonner, Boundary, Clearwater,
+-# Idaho, Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties,
+-# and the northern three-quarters of Idaho county),
+-# most of Nevada, most of Oregon, and Washington
++# Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties, Idaho county
++# north of the Salmon River, and the towns of Burgdorf and Warren),
++# Nevada (except West Wendover), Oregon (except the northern 3/4 of
++# Malheur county), and Washington
+ #
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
+ Rule CA 1948 only - Mar 14 2:00 1:00 D
+--- ./jdk/make/sun/javazic/tzdata/southamerica Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/southamerica Wed May 07 19:26:47 2014 -0700
+@@ -1298,6 +1298,13 @@
+ # start date is 2013-09-08 00:00....
+ # http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm
+
++# From Jose Miguel Garrido (2014-02-19):
++# Today appeared in the Diario Oficial a decree amending the time change
++# dates to 2014.
++# DST End: last Saturday of April 2014 (Sun 27 Apr 2014 03:00 UTC)
++# DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
++# http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
++
+ # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
+ # 'antarctica' file.
+
+@@ -1631,6 +1638,9 @@
+ # From Carlos Raul Perasso (2013-03-15):
+ # The change in Paraguay is now final. Decree number 10780
+ # http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf
++# From Carlos Raul Perasso (2014-02-28):
++# Decree 1264 can be found at:
++# http://www.presidencia.gov.py/archivos/documentos/DECRETO1264_ey9r8zai.pdf
+ Rule Para 2013 max - Mar Sun>=22 0:00 0 -
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -1689,18 +1699,19 @@
+ Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
+ -4:00 - AST
+
++# These all agree with Trinidad and Tobago since 1970.
+ Link America/Port_of_Spain America/Anguilla
+ Link America/Port_of_Spain America/Dominica
+ Link America/Port_of_Spain America/Grenada
+ Link America/Port_of_Spain America/Guadeloupe
+-Link America/Port_of_Spain America/Marigot
++Link America/Port_of_Spain America/Marigot # St Martin (French part)
+ Link America/Port_of_Spain America/Montserrat
+ Link America/Port_of_Spain America/St_Barthelemy
+-Link America/Port_of_Spain America/St_Kitts
++Link America/Port_of_Spain America/St_Kitts # St Kitts & Nevis
+ Link America/Port_of_Spain America/St_Lucia
+-Link America/Port_of_Spain America/St_Thomas
++Link America/Port_of_Spain America/St_Thomas # Virgin Islands (US)
+ Link America/Port_of_Spain America/St_Vincent
+-Link America/Port_of_Spain America/Tortola
++Link America/Port_of_Spain America/Tortola # Virgin Islands (UK)
+
+ # Uruguay
+ # From Paul Eggert (1993-11-18):
+--- ./jdk/make/sun/javazic/tzdata/zone.tab Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/zone.tab Wed May 07 19:26:47 2014 -0700
+@@ -74,6 +74,7 @@
+ AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
+ AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
+ AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
++AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land
+ AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
+ AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+ AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN)
+@@ -366,6 +367,7 @@
+ RU +5545+03735 Europe/Moscow Moscow+00 - west Russia
+ RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
+ RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia
++RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea
+ RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
+ RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
+ RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
+@@ -421,7 +423,6 @@
+ UA +5026+03031 Europe/Kiev most locations
+ UA +4837+02218 Europe/Uzhgorod Ruthenia
+ UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
+-UA +4457+03406 Europe/Simferopol central Crimea
+ UG +0019+03225 Africa/Kampala
+ UM +1645-16931 Pacific/Johnston Johnston Atoll
+ UM +2813-17722 Pacific/Midway Midway Islands
+--- ./jdk/make/sun/nio/cs/Makefile Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/make/sun/nio/cs/Makefile Wed May 07 19:26:47 2014 -0700
+@@ -85,9 +85,6 @@
+ #
+ # Extra rules to build character converters.
+
+-SERVICE_DESCRIPTION = java.nio.charset.spi.CharsetProvider
+-SERVICE_DESCRIPTION_PATH = META-INF/services/$(SERVICE_DESCRIPTION)
+-
+ GENCSDATASRC = $(BUILDDIR)/tools/CharsetMapping
+ GENCSSRCDIR = $(BUILDDIR)/tools/src/build/tools/charsetmapping
+ GENCSEXT = $(GENSRCDIR)/sun/nio/cs/ext
+@@ -116,10 +113,6 @@
+ $(GENCSSRCDIR)/HKSCS.java
+ $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) dbcs
+
+-$(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH): \
+- $(SHARE_SRC)/classes/sun/nio/cs/ext/$(SERVICE_DESCRIPTION_PATH)
+- $(install-file)
+-
+ # no compression unless requested
+ ifndef COMPRESS_JARS
+ CREATE_JAR_OPTS_NOMANIFEST = cf0
+@@ -127,10 +120,9 @@
+ CREATE_JAR_OPTS_NOMANIFEST = cf
+ endif
+
+-$(CHARSETS_JAR): $(FILES_class) $(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH) $(FILES_DAT)
++$(CHARSETS_JAR): $(FILES_class) $(FILES_DAT)
+ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(CHARSETS_JAR) \
+ -C $(CLASSDESTDIR) sun \
+- -C $(CLASSDESTDIR) $(SERVICE_DESCRIPTION_PATH) \
+ $(BOOT_JAR_JFLAGS)
+ @$(java-vm-cleanup)
+
+--- ./jdk/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java Wed May 07 19:26:47 2014 -0700
+@@ -31,6 +31,7 @@
+ import javax.swing.*;
+ import javax.swing.plaf.MenuBarUI;
+
++import com.apple.laf.ScreenMenuBar;
+ import sun.lwawt.macosx.CMenuBar;
+
+ import com.apple.laf.AquaMenuBarUI;
+@@ -72,12 +73,15 @@
+ // scan the current frames, and see if any are foreground
+ final Frame[] frames = Frame.getFrames();
+ for (final Frame frame : frames) {
+- if (frame.isVisible() && !isFrameMinimized(frame)) return;
++ if (frame.isVisible() && !isFrameMinimized(frame)) {
++ return;
++ }
+ }
+
+ // if we have no foreground frames, then we have to "kick" the menubar
+ final JFrame pingFrame = new JFrame();
+ pingFrame.getRootPane().putClientProperty("Window.alpha", new Float(0.0f));
++ pingFrame.setUndecorated(true);
+ pingFrame.setVisible(true);
+ pingFrame.toFront();
+ pingFrame.setVisible(false);
+@@ -101,7 +105,6 @@
+ // Aqua was not installed
+ throw new IllegalStateException("Application.setDefaultMenuBar() only works with the Aqua Look and Feel");
+ }
+-/* TODO: disabled until ScreenMenuBar is working
+
+ final AquaMenuBarUI aquaUI = (AquaMenuBarUI)ui;
+ final ScreenMenuBar screenMenuBar = aquaUI.getScreenMenuBar();
+@@ -118,8 +121,7 @@
+ }
+
+ // grab the pointer to the CMenuBar, and retain it in native
+- nativeSetDefaultMenuBar(((CMenuBar)peer).getNativeMenuBarPeer());
+-*/
++ nativeSetDefaultMenuBar(((CMenuBar)peer).getModel());
+ }
+
+ void setAboutMenuItemVisible(final boolean present) {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/macosx/classes/sun/awt/resources/awtosx.properties Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,71 @@
++#
++# OS X specific AWT properties
++#
++
++# Modifier names
++AWT.shift=\u21e7
++AWT.control=\u2303
++AWT.alt=\u2325
++AWT.meta=\u2318
++AWT.altGraph=\u2325
++
++# Key names
++AWT.enter=\u23ce
++AWT.backSpace=\u232b
++AWT.tab=\u21e5
++AWT.cancel=\u238b
++AWT.clear=\u2327
++AWT.capsLock=\u21ea
++AWT.escape=\u238b
++AWT.space=\u2423
++AWT.pgup=\u21de
++AWT.pgdn=\u21df
++AWT.end=\u2198
++AWT.home=\u2196
++AWT.left=\u2190
++AWT.up=\u2191
++AWT.right=\u2192
++AWT.down=\u2193
++AWT.comma=,
++AWT.period=.
++AWT.slash=/
++AWT.semicolon=;
++AWT.equals=\u003d
++AWT.openBracket=[
++AWT.backSlash=\\
++AWT.closeBracket=]
++AWT.multiply=\u2328 *
++AWT.add=\u2328 +
++AWT.separator=\u2328 ,
++AWT.separater=\u2328 ,
++AWT.subtract=\u2328 -
++AWT.decimal=\u2328 .
++AWT.divide=\u2328 /
++AWT.delete=\u2326
++AWT.printScreen=\u2399
++AWT.backQuote=`
++AWT.quote='
++AWT.ampersand=&
++AWT.asterisk=*
++AWT.quoteDbl="
++AWT.Less=<
++AWT.greater=>
++AWT.braceLeft=[
++AWT.braceRight=]
++AWT.at=@
++AWT.colon=:
++AWT.circumflex=^
++AWT.dollar=$
++AWT.euro=\u20ac
++AWT.exclamationMark=!
++AWT.invertedExclamationMark=\u00a1
++AWT.leftParenthesis=(
++AWT.numberSign=#
++AWT.plus=+
++AWT.minus=-
++AWT.rightParenthesis=)
++AWT.underscore=_
++
++# Numeric Keypad
++AWT.numpad=\u2328
++
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java Wed May 07 19:26:47 2014 -0700
+@@ -26,6 +26,7 @@
+ package sun.lwawt.macosx;
+
+ import java.awt.*;
++import java.awt.dnd.DropTarget;
+
+ import sun.awt.dnd.SunDropTargetContextPeer;
+ import sun.awt.dnd.SunDropTargetEvent;
+@@ -38,7 +39,7 @@
+ private long fNativeDropTransfer = 0;
+ private long fNativeDataAvailable = 0;
+ private Object fNativeData = null;
+- private boolean insideTarget = true;
++ private DropTarget insideTarget = null;
+
+ Object awtLockAccess = new Object();
+
+@@ -88,26 +89,19 @@
+ return fNativeData;
+ }
+
+- // We need to take care of dragExit message because for some reason it is not being
+- // generated for lightweight components
++ // We need to take care of dragEnter and dragExit messages because
++ // native system generates them only for heavyweights
+ @Override
+ protected void processMotionMessage(SunDropTargetEvent event, boolean operationChanged) {
+- Component eventSource = (Component)event.getComponent();
+- Point screenPoint = event.getPoint();
+- SwingUtilities.convertPointToScreen(screenPoint, eventSource);
+- Rectangle screenBounds = new Rectangle(eventSource.getLocationOnScreen().x,
+- eventSource.getLocationOnScreen().y,
+- eventSource.getWidth(), eventSource.getHeight());
+- if(insideTarget) {
+- if(!screenBounds.contains(screenPoint)) {
++ boolean eventInsideTarget = isEventInsideTarget(event);
++ if (event.getComponent().getDropTarget() == insideTarget) {
++ if (!eventInsideTarget) {
+ processExitMessage(event);
+- insideTarget = false;
+ return;
+ }
+ } else {
+- if(screenBounds.contains(screenPoint)) {
++ if (eventInsideTarget) {
+ processEnterMessage(event);
+- insideTarget = true;
+ } else {
+ return;
+ }
+@@ -115,17 +109,52 @@
+ super.processMotionMessage(event, operationChanged);
+ }
+
++ /**
++ * Could be called when DnD enters a heavyweight or synthesized in processMotionMessage
++ */
++ @Override
++ protected void processEnterMessage(SunDropTargetEvent event) {
++ Component c = event.getComponent();
++ DropTarget dt = event.getComponent().getDropTarget();
++ if (isEventInsideTarget(event)
++ && dt != insideTarget
++ && c.isShowing()
++ && dt != null
++ && dt.isActive()) {
++ insideTarget = dt;
++ super.processEnterMessage(event);
++ }
++ }
++
++ /**
++ * Could be called when DnD exits a heavyweight or synthesized in processMotionMessage
++ */
++ @Override
++ protected void processExitMessage(SunDropTargetEvent event) {
++ if (event.getComponent().getDropTarget() == insideTarget) {
++ insideTarget = null;
++ super.processExitMessage(event);
++ }
++ }
++
+ @Override
+ protected void processDropMessage(SunDropTargetEvent event) {
+- Component eventSource = (Component)event.getComponent();
++ if (isEventInsideTarget(event)) {
++ super.processDropMessage(event);
++ insideTarget = null;
++ }
++ }
++
++ private boolean isEventInsideTarget(SunDropTargetEvent event) {
++ Component eventSource = event.getComponent();
+ Point screenPoint = event.getPoint();
+ SwingUtilities.convertPointToScreen(screenPoint, eventSource);
+- Rectangle screenBounds = new Rectangle(eventSource.getLocationOnScreen().x,
+- eventSource.getLocationOnScreen().y,
+- eventSource.getWidth(), eventSource.getHeight());
+- if(screenBounds.contains(screenPoint)) {
+- super.processDropMessage(event);
+- }
++ Point locationOnScreen = eventSource.getLocationOnScreen();
++ Rectangle screenBounds = new Rectangle(locationOnScreen.x,
++ locationOnScreen.y,
++ eventSource.getWidth(),
++ eventSource.getHeight());
++ return screenBounds.contains(screenPoint);
+ }
+
+ @Override
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CMenuComponent.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CMenuComponent.java Wed May 07 19:26:47 2014 -0700
+@@ -43,7 +43,7 @@
+ return target;
+ }
+
+- long getModel() {
++ public long getModel() {
+ return modelPtr;
+ }
+
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Wed May 07 19:26:47 2014 -0700
+@@ -44,6 +44,8 @@
+ import sun.lwawt.LWWindowPeer.PeerType;
+ import sun.security.action.GetBooleanAction;
+
++import sun.util.CoreResourceBundleControl;
++
+
+ class NamedCursor extends Cursor {
+ NamedCursor(String name) {
+@@ -68,13 +70,26 @@
+
+ static {
+ System.err.flush();
+- java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Object>() {
+- public Object run() {
++ ResourceBundle platformResources = java.security.AccessController.doPrivileged(
++ new java.security.PrivilegedAction<ResourceBundle>() {
++ public ResourceBundle run() {
++ ResourceBundle platformResources = null;
++ try {
++ platformResources =
++ ResourceBundle.getBundle("sun.awt.resources.awtosx",
++ CoreResourceBundleControl.getRBControlInstance());
++ } catch (MissingResourceException e) {
++ // No resource file; defaults will be used.
++ }
++
+ System.loadLibrary("awt");
+ System.loadLibrary("fontmanager");
+- return null;
++ return platformResources;
+ }
+ });
++
++ AWTAccessor.getToolkitAccessor().setPlatformResources(platformResources);
++
+ if (!GraphicsEnvironment.isHeadless()) {
+ initIDs();
+ }
+--- ./jdk/src/macosx/lib/flavormap.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/lib/flavormap.properties Wed May 07 19:26:47 2014 -0700
+@@ -76,5 +76,6 @@
+ text/uri-list=application/x-java-file-list;class=java.util.List
+ PNG=image/x-java-image;class=java.awt.Image
+ JFIF=image/x-java-image;class=java.awt.Image
++TIFF=image/x-java-image;class=java.awt.Image
+ RICH_TEXT=text/rtf
+ HTML=text/html;charset=utf-8;eoln="\r\n";terminators=1
+--- ./jdk/src/macosx/native/java/util/SCDynamicStoreConfig.m Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/native/java/util/SCDynamicStoreConfig.m Wed May 07 19:26:47 2014 -0700
+@@ -103,7 +103,6 @@
+ CFTypeRef realmInfo = SCDynamicStoreCopyValue(store, (CFStringRef) [NSString stringWithFormat:@"Kerberos:%@", realm]);
+
+ if (CFGetTypeID(realmInfo) != CFDictionaryGetTypeID()) {
+- NSLog(@"Unexpected CFType for realm Info: %lu", CFGetTypeID(realmInfo));
+ return nil;
+ }
+
+@@ -140,7 +139,6 @@
+
+ SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("java"), _SCDynamicStoreCallBack, NULL);
+ if (store == NULL) {
+- NSLog(@"Unable to load SCDynamicStore to install NotificationCallback");
+ return;
+ }
+
+@@ -171,19 +169,11 @@
+
+ SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("java-kerberos"), NULL, NULL);
+ if (store == NULL) {
+- NSLog(@"Unable to load SCDynamicStore");
+- return NULL;
+- }
+-
+- // Create the store if it is NULL and set it.
+- if (store == NULL) {
+- NSLog(@"Invalid value for SCDynamicStore");
+ return NULL;
+ }
+
+ CFTypeRef realms = SCDynamicStoreCopyValue(store, (CFStringRef) KERBEROS_DEFAULT_REALMS);
+ if (realms == NULL || CFGetTypeID(realms) != CFArrayGetTypeID()) {
+- NSLog(@"Unable to load realm info from SCDynamicStore");
+ if (realms) CFRelease(realms);
+ CFRelease(store);
+ return NULL;
+@@ -192,7 +182,6 @@
+ CFTypeRef realmMappings = SCDynamicStoreCopyValue(store, (CFStringRef) KERBEROS_DEFAULT_REALM_MAPPINGS);
+
+ if (realmMappings == NULL || CFGetTypeID(realmMappings) != CFArrayGetTypeID()) {
+- NSLog(@"Unable to load realm mapping info from SCDynamicStore");
+ if (realmMappings) CFRelease(realmMappings);
+ CFRelease(realms);
+ CFRelease(store);
+--- ./jdk/src/macosx/native/sun/awt/AWTEvent.m Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/AWTEvent.m Wed May 07 19:26:47 2014 -0700
+@@ -382,7 +382,7 @@
+ {
+ TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
+ CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
+- if (uchr == nil) { return; }
++ if (uchr == nil) { return 0; }
+ const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr);
+ // Carbon modifiers should be used instead of NSEvent modifiers
+ UInt32 modifierKeyState = (GetCurrentEventKeyModifiers() >> 8) & 0xFF;
+--- ./jdk/src/macosx/native/sun/awt/AWTWindow.m Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/AWTWindow.m Wed May 07 19:26:47 2014 -0700
+@@ -30,6 +30,7 @@
+ #import "sun_lwawt_macosx_CPlatformWindow.h"
+ #import "com_apple_eawt_event_GestureHandler.h"
+ #import "com_apple_eawt_FullScreenHandler.h"
++#import "ApplicationDelegate.h"
+
+ #import "AWTWindow.h"
+ #import "AWTView.h"
+@@ -585,17 +586,26 @@
+ AWT_ASSERT_APPKIT_THREAD;
+ [AWTToolkit eventCountPlusPlus];
+ AWTWindow *opposite = [AWTWindow lastKeyWindow];
+-
++
+ // Finds appropriate menubar in our hierarchy,
+ AWTWindow *awtWindow = self;
+ while (awtWindow.ownerWindow != nil) {
+ awtWindow = awtWindow.ownerWindow;
+ }
++
+ CMenuBar *menuBar = nil;
++ BOOL isDisabled = NO;
+ if ([awtWindow.nsWindow isVisible]){
+ menuBar = awtWindow.javaMenuBar;
++ isDisabled = !awtWindow.isEnabled;
+ }
+- [CMenuBar activate:menuBar modallyDisabled:!awtWindow.isEnabled];
++
++ if (menuBar == nil) {
++ menuBar = [[ApplicationDelegate sharedDelegate] defaultMenuBar];
++ isDisabled = NO;
++ }
++
++ [CMenuBar activate:menuBar modallyDisabled:isDisabled];
+
+ [AWTWindow setLastKeyWindow:nil];
+
+@@ -608,6 +618,14 @@
+ [AWTToolkit eventCountPlusPlus];
+ [self.javaMenuBar deactivate];
+
++ // In theory, this might cause flickering if the window gaining focus
++ // has its own menu. However, I couldn't reproduce it on practice, so
++ // perhaps this is a non issue.
++ CMenuBar* defaultMenu = [[ApplicationDelegate sharedDelegate] defaultMenuBar];
++ if (defaultMenu != nil) {
++ [CMenuBar activate:defaultMenu modallyDisabled:NO];
++ }
++
+ // the new key window
+ NSWindow *keyWindow = [NSApp keyWindow];
+ AWTWindow *opposite = nil;
+@@ -875,11 +893,19 @@
+
+ AWTWindow *window = (AWTWindow*)[nsWindow delegate];
+
+- if ([nsWindow isKeyWindow]) [window.javaMenuBar deactivate];
++ if ([nsWindow isKeyWindow]) {
++ [window.javaMenuBar deactivate];
++ }
++
+ window.javaMenuBar = menuBar;
+
++ CMenuBar* actualMenuBar = menuBar;
++ if (actualMenuBar == nil) {
++ actualMenuBar = [[ApplicationDelegate sharedDelegate] defaultMenuBar];
++ }
++
+ if ([nsWindow isKeyWindow]) {
+- [CMenuBar activate:window.javaMenuBar modallyDisabled:NO];
++ [CMenuBar activate:actualMenuBar modallyDisabled:NO];
+ }
+ }];
+
+--- ./jdk/src/macosx/native/sun/awt/CDropTarget.m Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/CDropTarget.m Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ sDraggingExited = FALSE;
+ sDraggingLocation = [sender draggingLocation];
+ NSPoint javaLocation = [fView convertPoint:sDraggingLocation fromView:nil];
++ javaLocation.y = fView.window.frame.size.height - javaLocation.y;
++
+ DLog5(@"+ dragEnter: loc native %f, %f, java %f, %f\n", sDraggingLocation.x, sDraggingLocation.y, javaLocation.x, javaLocation.y);
+
+ ////////// BEGIN Calculate the current drag actions //////////
+@@ -570,8 +572,7 @@
+ // Should we notify Java things have changed?
+ if (sDraggingError == FALSE && notifyJava) {
+ NSPoint javaLocation = [fView convertPoint:sDraggingLocation fromView:nil];
+- // For some reason even after the convertPoint drag events come with the y coordinate reverted
+- javaLocation.y = fView.window.frame.size.height - javaLocation.y;
++ javaLocation.y = fView.window.frame.size.height - javaLocation.y;
+ //DLog5(@" : dragMoved: loc native %f, %f, java %f, %f\n", sDraggingLocation.x, sDraggingLocation.y, javaLocation.x, javaLocation.y);
+
+ jlongArray formats = sDraggingFormats;
+--- ./jdk/src/macosx/native/sun/awt/CMenuItem.m Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/CMenuItem.m Wed May 07 19:26:47 2014 -0700
+@@ -70,9 +70,15 @@
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ JNF_COCOA_ENTER(env);
+
+- // If we are called as a result of user pressing a shorcut, do nothing,
+- // because AWTView has already sent corresponding key event to the Java
+- // layer from performKeyEquivalent
++ // If we are called as a result of user pressing a shortcut, do nothing,
++ // because AVTView has already sent corresponding key event to the Java
++ // layer from performKeyEquivalent.
++ // There is an exception from the rule above, though: if a window with
++ // a menu gets minimized by user and there are no other windows to take
++ // focus, the window's menu won't be removed from the global menu bar.
++ // However, the Java layer won't handle invocation by a shortcut coming
++ // from this "frameless" menu, because there are no active windows. This
++ // means we have to handle it here.
+ NSEvent *currEvent = [[NSApplication sharedApplication] currentEvent];
+ if ([currEvent type] == NSKeyDown) {
+ NSString *menuKey = [sender keyEquivalent];
+@@ -91,7 +97,8 @@
+ eventKey = [NSString stringWithCharacters: &newChar length: 1];
+ }
+
+- if ([menuKey isEqualToString:eventKey]) {
++ NSWindow *keyWindow = [NSApp keyWindow];
++ if ([menuKey isEqualToString:eventKey] && keyWindow != nil) {
+ return;
+ }
+ }
+@@ -289,7 +296,7 @@
+
+ case java_awt_event_KeyEvent_VK_HELP : macKey = NSHelpFunctionKey; break;
+ case java_awt_event_KeyEvent_VK_TAB : macKey = NSTabCharacter; break;
+- case java_awt_event_KeyEvent_VK_ENTER : macKey = NSCarriageReturnCharacter; break;
++ case java_awt_event_KeyEvent_VK_ENTER : macKey = NSNewlineCharacter; break;
+ case java_awt_event_KeyEvent_VK_BACK_SPACE : macKey = NSBackspaceCharacter; break;
+ case java_awt_event_KeyEvent_VK_DELETE : macKey = NSDeleteCharacter; break;
+ case java_awt_event_KeyEvent_VK_CLEAR : macKey = NSClearDisplayFunctionKey; break;
+--- ./jdk/src/share/back/SDE.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/back/SDE.c Wed May 07 19:26:47 2014 -0700
+@@ -28,6 +28,12 @@
+ #include "util.h"
+ #include "SDE.h"
+
++#ifdef __APPLE__
++/* use setjmp/longjmp versions that do not save/restore the signal mask */
++#define setjmp _setjmp
++#define longjmp _longjmp
++#endif
++
+ /**
+ * This SourceDebugExtension code does not
+ * allow concurrent translation - due to caching method.
+--- ./jdk/src/share/back/export/sys.h Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/back/export/sys.h Wed May 07 19:26:47 2014 -0700
+@@ -37,7 +37,7 @@
+
+ /* Implemented in linker_md.c */
+
+-void dbgsysBuildLibName(char *, int, char *, char *);
++void dbgsysBuildLibName(char *, int, const char *, const char *);
+ void * dbgsysLoadLibrary(const char *, char *err_buf, int err_buflen);
+ void dbgsysUnloadLibrary(void *);
+ void * dbgsysFindLibraryEntry(void *, const char *);
+--- ./jdk/src/share/back/transport.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/back/transport.c Wed May 07 19:26:47 2014 -0700
+@@ -97,12 +97,12 @@
+
+ /* Load transport library (directory=="" means do system search) */
+ static void *
+-loadTransportLibrary(char *libdir, char *name)
++loadTransportLibrary(const char *libdir, const char *name)
+ {
+ void *handle;
+ char libname[MAXPATHLEN+2];
+ char buf[MAXPATHLEN*2+100];
+- char *plibdir;
++ const char *plibdir;
+
+ /* Convert libdir from UTF-8 to platform encoding */
+ plibdir = NULL;
+@@ -117,6 +117,9 @@
+
+ /* Construct library name (simple name or full path) */
+ dbgsysBuildLibName(libname, sizeof(libname), plibdir, name);
++ if (strlen(libname) == 0) {
++ return NULL;
++ }
+
+ /* dlopen (unix) / LoadLibrary (windows) the transport library */
+ handle = dbgsysLoadLibrary(libname, buf, sizeof(buf));
+@@ -128,12 +131,12 @@
+ * JDK 1.2 javai.c v1.61
+ */
+ static jdwpError
+-loadTransport(char *name, jdwpTransportEnv **transportPtr)
++loadTransport(const char *name, jdwpTransportEnv **transportPtr)
+ {
+ JNIEnv *env;
+ jdwpTransport_OnLoad_t onLoad;
+ void *handle;
+- char *libdir;
++ const char *libdir;
+
+ /* Make sure library name is not empty */
+ if (name == NULL) {
+--- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties Wed May 07 19:26:47 2014 -0700
+@@ -17,7 +17,7 @@
+ awtcomponent=AWT-Komponente
+ checkbox=Kontrollk\u00E4stchen
+ colorchooser=Farbauswahl
+-columnheader=Spalten-Header
++columnheader=Spaltenheader
+ combobox=Kombinationsfeld
+ canvas=Leinwand
+ desktopicon=Desktopsymbol
+@@ -46,7 +46,7 @@
+ pushbutton=Schaltfl\u00E4che
+ radiobutton=Optionsfeld
+ rootpane=Root-Bereich
+-rowheader=Zeilen-Header
++rowheader=Zeilenheader
+ scrollbar=Bildlaufleiste
+ scrollpane=Bildlaufbereich
+ separator=Trennzeichen
+--- ./jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 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
+@@ -110,6 +110,20 @@
+ }
+
+ /**
++ * Tests whether the value of this element can be used
++ * as an argument of the element that contained in this one.
++ *
++ * @return {@code true} if the value of this element can be used
++ * as an argument of the element that contained in this one,
++ * {@code false} otherwise
++ */
++ @Override
++ protected boolean isArgument() {
++ return true; // hack for compatibility
++ }
++
++
++ /**
+ * Creates an instance of the array.
+ *
+ * @param type the base class
+--- ./jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java Wed May 07 19:26:47 2014 -0700
+@@ -24,11 +24,12 @@
+ */
+ package com.sun.beans.finder;
+
+-import com.sun.beans.WeakCache;
++import com.sun.beans.util.Cache;
+
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.Modifier;
+
++import static com.sun.beans.util.Cache.Kind.SOFT;
+ import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
+
+ /**
+@@ -41,7 +42,18 @@
+ * @author Sergey A. Malenkov
+ */
+ public final class ConstructorFinder extends AbstractFinder<Constructor<?>> {
+- private static final WeakCache<Signature, Constructor<?>> CACHE = new WeakCache<Signature, Constructor<?>>();
++ private static final Cache<Signature, Constructor<?>> CACHE = new Cache<Signature, Constructor<?>>(SOFT, SOFT) {
++ @Override
++ public Constructor create(Signature signature) {
++ try {
++ ConstructorFinder finder = new ConstructorFinder(signature.getArgs());
++ return finder.find(signature.getType().getConstructors());
++ }
++ catch (Exception exception) {
++ throw new SignatureException(exception);
++ }
++ }
++ };
+
+ /**
+ * Finds public constructor
+@@ -69,13 +81,12 @@
+ PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);
+ Signature signature = new Signature(type, args);
+
+- Constructor<?> constructor = CACHE.get(signature);
+- if (constructor != null) {
+- return constructor;
++ try {
++ return CACHE.get(signature);
+ }
+- constructor = new ConstructorFinder(args).find(type.getConstructors());
+- CACHE.put(signature, constructor);
+- return constructor;
++ catch (SignatureException exception) {
++ throw exception.toNoSuchMethodException("Constructor is not found");
++ }
+ }
+
+ /**
+--- ./jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java Wed May 07 19:26:47 2014 -0700
+@@ -25,7 +25,7 @@
+ package com.sun.beans.finder;
+
+ import com.sun.beans.TypeResolver;
+-import com.sun.beans.WeakCache;
++import com.sun.beans.util.Cache;
+
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Modifier;
+@@ -33,6 +33,7 @@
+ import java.lang.reflect.Type;
+ import java.util.Arrays;
+
++import static com.sun.beans.util.Cache.Kind.SOFT;
+ import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
+
+ /**
+@@ -45,7 +46,18 @@
+ * @author Sergey A. Malenkov
+ */
+ public final class MethodFinder extends AbstractFinder<Method> {
+- private static final WeakCache<Signature, Method> CACHE = new WeakCache<Signature, Method>();
++ private static final Cache<Signature, Method> CACHE = new Cache<Signature, Method>(SOFT, SOFT) {
++ @Override
++ public Method create(Signature signature) {
++ try {
++ MethodFinder finder = new MethodFinder(signature.getName(), signature.getArgs());
++ return findAccessibleMethod(finder.find(signature.getType().getMethods()));
++ }
++ catch (Exception exception) {
++ throw new SignatureException(exception);
++ }
++ }
++ };
+
+ /**
+ * Finds public method (static or non-static)
+@@ -65,16 +77,13 @@
+ PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);
+ Signature signature = new Signature(type, name, args);
+
+- Method method = CACHE.get(signature);
+- boolean cached = method != null;
+- if (cached && isPackageAccessible(method.getDeclaringClass())) {
+- return method;
++ try {
++ Method method = CACHE.get(signature);
++ return (method == null) || isPackageAccessible(method.getDeclaringClass()) ? method : CACHE.create(signature);
+ }
+- method = findAccessibleMethod(new MethodFinder(name, args).find(type.getMethods()));
+- if (!cached) {
+- CACHE.put(signature, method);
++ catch (SignatureException exception) {
++ throw exception.toNoSuchMethodException("Method '" + name + "' is not found");
+ }
+- return method;
+ }
+
+ /**
+--- ./jdk/src/share/classes/com/sun/beans/finder/Signature.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/beans/finder/Signature.java Wed May 07 19:26:47 2014 -0700
+@@ -62,6 +62,18 @@
+ this.args = args;
+ }
+
++ Class<?> getType() {
++ return this.type;
++ }
++
++ String getName() {
++ return this.name;
++ }
++
++ Class<?>[] getArgs() {
++ return this.args;
++ }
++
+ /**
+ * Indicates whether some other object is "equal to" this one.
+ *
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/com/sun/beans/finder/SignatureException.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,41 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package com.sun.beans.finder;
++
++final class SignatureException extends RuntimeException {
++ SignatureException(Throwable cause) {
++ super(cause);
++ }
++
++ NoSuchMethodException toNoSuchMethodException(String message) {
++ Throwable throwable = getCause();
++ if (throwable instanceof NoSuchMethodException) {
++ return (NoSuchMethodException) throwable;
++ }
++ NoSuchMethodException exception = new NoSuchMethodException(message);
++ exception.initCause(throwable);
++ return exception;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/com/sun/beans/util/Cache.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,613 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package com.sun.beans.util;
++
++import java.lang.ref.ReferenceQueue;
++import java.lang.ref.SoftReference;
++import java.lang.ref.WeakReference;
++import java.util.Objects;
++
++/**
++ * Hash table based implementation of the cache,
++ * which allows to use weak or soft references for keys and values.
++ * An entry in a {@code Cache} will automatically be removed
++ * when its key or value is no longer in ordinary use.
++ *
++ * @author Sergey Malenkov
++ * @since 1.8
++ */
++public abstract class Cache<K,V> {
++ private static final int MAXIMUM_CAPACITY = 1 << 30; // maximum capacity MUST be a power of two <= 1<<30
++
++ private final boolean identity; // defines whether the identity comparison is used
++ private final Kind keyKind; // a reference kind for the cache keys
++ private final Kind valueKind; // a reference kind for the cache values
++
++ private final ReferenceQueue<Object> queue = new ReferenceQueue<>(); // queue for references to remove
++
++ private volatile CacheEntry<K,V>[] table = newTable(1 << 3); // table's length MUST be a power of two
++ private int threshold = 6; // the next size value at which to resize
++ private int size; // the number of key-value mappings contained in this map
++
++ /**
++ * Creates a corresponding value for the specified key.
++ *
++ * @param key a key that can be used to create a value
++ * @return a corresponding value for the specified key
++ */
++ public abstract V create(K key);
++
++ /**
++ * Constructs an empty {@code Cache}.
++ * The default initial capacity is 8.
++ * The default load factor is 0.75.
++ *
++ * @param keyKind a reference kind for keys
++ * @param valueKind a reference kind for values
++ *
++ * @throws NullPointerException if {@code keyKind} or {@code valueKind} are {@code null}
++ */
++ public Cache(Kind keyKind, Kind valueKind) {
++ this(keyKind, valueKind, false);
++ }
++
++ /**
++ * Constructs an empty {@code Cache}
++ * with the specified comparison method.
++ * The default initial capacity is 8.
++ * The default load factor is 0.75.
++ *
++ * @param keyKind a reference kind for keys
++ * @param valueKind a reference kind for values
++ * @param identity defines whether reference-equality
++ * is used in place of object-equality
++ *
++ * @throws NullPointerException if {@code keyKind} or {@code valueKind} are {@code null}
++ */
++ public Cache(Kind keyKind, Kind valueKind, boolean identity) {
++ Objects.requireNonNull(keyKind, "keyKind");
++ Objects.requireNonNull(valueKind, "valueKind");
++ this.keyKind = keyKind;
++ this.valueKind = valueKind;
++ this.identity = identity;
++ }
++
++ /**
++ * Returns the value to which the specified key is mapped,
++ * or {@code null} if there is no mapping for the key.
++ *
++ * @param key the key whose cached value is to be returned
++ * @return a value to which the specified key is mapped,
++ * or {@code null} if there is no mapping for {@code key}
++ *
++ * @throws NullPointerException if {@code key} is {@code null}
++ * or corresponding value is {@code null}
++ */
++ public final V get(K key) {
++ Objects.requireNonNull(key, "key");
++ removeStaleEntries();
++ int hash = hash(key);
++ // unsynchronized search improves performance
++ // the null value does not mean that there are no needed entry
++ CacheEntry<K,V>[] table = this.table; // unsynchronized access
++ V current = getEntryValue(key, hash, table[index(hash, table)]);
++ if (current != null) {
++ return current;
++ }
++ synchronized (this.queue) {
++ // synchronized search improves stability
++ // we must create and add new value if there are no needed entry
++ int index = index(hash, this.table);
++ current = getEntryValue(key, hash, this.table[index]);
++ if (current != null) {
++ return current;
++ }
++ V value = create(key);
++ Objects.requireNonNull(value, "value");
++ this.table[index] = new CacheEntry<>(hash, key, value, this.table[index]);
++ if (++this.size >= this.threshold) {
++ if (this.table.length == MAXIMUM_CAPACITY) {
++ this.threshold = Integer.MAX_VALUE;
++ } else {
++ removeStaleEntries();
++ table = newTable(this.table.length << 1);
++ transfer(this.table, table);
++ // If ignoring null elements and processing ref queue caused massive
++ // shrinkage, then restore old table. This should be rare, but avoids
++ // unbounded expansion of garbage-filled tables.
++ if (this.size >= this.threshold / 2) {
++ this.table = table;
++ this.threshold <<= 1;
++ } else {
++ transfer(table, this.table);
++ }
++ removeStaleEntries();
++ }
++ }
++ return value;
++ }
++ }
++
++ /**
++ * Removes the cached value that corresponds to the specified key.
++ *
++ * @param key the key whose mapping is to be removed from this cache
++ */
++ public final void remove(K key) {
++ if (key != null) {
++ synchronized (this.queue) {
++ removeStaleEntries();
++ int hash = hash(key);
++ int index = index(hash, this.table);
++ CacheEntry<K,V> prev = this.table[index];
++ CacheEntry<K,V> entry = prev;
++ while (entry != null) {
++ CacheEntry<K,V> next = entry.next;
++ if (entry.matches(hash, key)) {
++ if (entry == prev) {
++ this.table[index] = next;
++ } else {
++ prev.next = next;
++ }
++ entry.unlink();
++ break;
++ }
++ prev = entry;
++ entry = next;
++ }
++ }
++ }
++ }
++
++ /**
++ * Removes all of the mappings from this cache.
++ * It will be empty after this call returns.
++ */
++ public final void clear() {
++ synchronized (this.queue) {
++ int index = this.table.length;
++ while (0 < index--) {
++ CacheEntry<K,V> entry = this.table[index];
++ while (entry != null) {
++ CacheEntry<K,V> next = entry.next;
++ entry.unlink();
++ entry = next;
++ }
++ this.table[index] = null;
++ }
++ while (null != this.queue.poll()) {
++ // Clear out the reference queue.
++ }
++ }
++ }
++
++ /**
++ * Retrieves object hash code and applies a supplemental hash function
++ * to the result hash, which defends against poor quality hash functions.
++ * This is critical because {@code Cache} uses power-of-two length hash tables,
++ * that otherwise encounter collisions for hashCodes that do not differ
++ * in lower bits.
++ *
++ * @param key the object which hash code is to be calculated
++ * @return a hash code value for the specified object
++ */
++ private int hash(Object key) {
++ if (this.identity) {
++ int hash = System.identityHashCode(key);
++ return (hash << 1) - (hash << 8);
++ }
++ int hash = key.hashCode();
++ // This function ensures that hashCodes that differ only by
++ // constant multiples at each bit position have a bounded
++ // number of collisions (approximately 8 at default load factor).
++ hash ^= (hash >>> 20) ^ (hash >>> 12);
++ return hash ^ (hash >>> 7) ^ (hash >>> 4);
++ }
++
++ /**
++ * Returns index of the specified hash code in the given table.
++ * Note that the table size must be a power of two.
++ *
++ * @param hash the hash code
++ * @param table the table
++ * @return an index of the specified hash code in the given table
++ */
++ private static int index(int hash, Object[] table) {
++ return hash & (table.length - 1);
++ }
++
++ /**
++ * Creates a new array for the cache entries.
++ *
++ * @param size requested capacity MUST be a power of two
++ * @return a new array for the cache entries
++ */
++ @SuppressWarnings("unchecked")
++ private CacheEntry<K,V>[] newTable(int size) {
++ return (CacheEntry<K,V>[]) new CacheEntry[size];
++ }
++
++ private V getEntryValue(K key, int hash, CacheEntry<K,V> entry) {
++ while (entry != null) {
++ if (entry.matches(hash, key)) {
++ return entry.value.getReferent();
++ }
++ entry = entry.next;
++ }
++ return null;
++ }
++
++ private void removeStaleEntries() {
++ Object reference = this.queue.poll();
++ if (reference != null) {
++ synchronized (this.queue) {
++ do {
++ if (reference instanceof Ref) {
++ Ref ref = (Ref) reference;
++ @SuppressWarnings("unchecked")
++ CacheEntry<K,V> owner = (CacheEntry<K,V>) ref.getOwner();
++ if (owner != null) {
++ int index = index(owner.hash, this.table);
++ CacheEntry<K,V> prev = this.table[index];
++ CacheEntry<K,V> entry = prev;
++ while (entry != null) {
++ CacheEntry<K,V> next = entry.next;
++ if (entry == owner) {
++ if (entry == prev) {
++ this.table[index] = next;
++ } else {
++ prev.next = next;
++ }
++ entry.unlink();
++ break;
++ }
++ prev = entry;
++ entry = next;
++ }
++ }
++ }
++ reference = this.queue.poll();
++ }
++ while (reference != null);
++ }
++ }
++ }
++
++ private void transfer(CacheEntry<K,V>[] oldTable, CacheEntry<K,V>[] newTable) {
++ int oldIndex = oldTable.length;
++ while (0 < oldIndex--) {
++ CacheEntry<K,V> entry = oldTable[oldIndex];
++ oldTable[oldIndex] = null;
++ while (entry != null) {
++ CacheEntry<K,V> next = entry.next;
++ if (entry.key.isStale() || entry.value.isStale()) {
++ entry.unlink();
++ } else {
++ int newIndex = index(entry.hash, newTable);
++ entry.next = newTable[newIndex];
++ newTable[newIndex] = entry;
++ }
++ entry = next;
++ }
++ }
++ }
++
++ /**
++ * Represents a cache entry (key-value pair).
++ */
++ private final class CacheEntry<K,V> {
++ private final int hash;
++ private final Ref<K> key;
++ private final Ref<V> value;
++ private volatile CacheEntry<K,V> next;
++
++ /**
++ * Constructs an entry for the cache.
++ *
++ * @param hash the hash code calculated for the entry key
++ * @param key the entry key
++ * @param value the initial value of the entry
++ * @param next the next entry in a chain
++ */
++ private CacheEntry(int hash, K key, V value, CacheEntry<K,V> next) {
++ this.hash = hash;
++ this.key = Cache.this.keyKind.create(this, key, Cache.this.queue);
++ this.value = Cache.this.valueKind.create(this, value, Cache.this.queue);
++ this.next = next;
++ }
++
++ /**
++ * Determines whether the entry has the given key with the given hash code.
++ *
++ * @param hash an expected hash code
++ * @param object an object to be compared with the entry key
++ * @return {@code true} if the entry has the given key with the given hash code;
++ * {@code false} otherwise
++ */
++ private boolean matches(int hash, Object object) {
++ if (this.hash != hash) {
++ return false;
++ }
++ Object key = this.key.getReferent();
++ return (key == object) || !Cache.this.identity && (key != null) && key.equals(object);
++ }
++
++ /**
++ * Marks the entry as actually removed from the cache.
++ */
++ private void unlink() {
++ this.next = null;
++ this.key.removeOwner();
++ this.value.removeOwner();
++ Cache.this.size--;
++ }
++ }
++
++ /**
++ * Basic interface for references.
++ * It defines the operations common for the all kind of references.
++ *
++ * @param <T> the type of object to refer
++ */
++ private static interface Ref<T> {
++ /**
++ * Returns the object that possesses information about the reference.
++ *
++ * @return the owner of the reference or {@code null} if the owner is unknown
++ */
++ Object getOwner();
++
++ /**
++ * Returns the object to refer.
++ *
++ * @return the referred object or {@code null} if it was collected
++ */
++ T getReferent();
++
++ /**
++ * Determines whether the referred object was taken by the garbage collector or not.
++ *
++ * @return {@code true} if the referred object was collected
++ */
++ boolean isStale();
++
++ /**
++ * Marks this reference as removed from the cache.
++ */
++ void removeOwner();
++ }
++
++ /**
++ * Represents a reference kind.
++ */
++ public static enum Kind {
++ STRONG {
++ <T> Ref<T> create(Object owner, T value, ReferenceQueue<? super T> queue) {
++ return new Strong<>(owner, value);
++ }
++ },
++ SOFT {
++ <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
++ return (referent == null)
++ ? new Strong<>(owner, referent)
++ : new Soft<>(owner, referent, queue);
++ }
++ },
++ WEAK {
++ <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
++ return (referent == null)
++ ? new Strong<>(owner, referent)
++ : new Weak<>(owner, referent, queue);
++ }
++ };
++
++ /**
++ * Creates a reference to the specified object.
++ *
++ * @param <T> the type of object to refer
++ * @param owner the owner of the reference, if needed
++ * @param referent the object to refer
++ * @param queue the queue to register the reference with,
++ * or {@code null} if registration is not required
++ * @return the reference to the specified object
++ */
++ abstract <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue);
++
++ /**
++ * This is an implementation of the {@link Cache.Ref} interface
++ * that uses the strong references that prevent their referents
++ * from being made finalizable, finalized, and then reclaimed.
++ *
++ * @param <T> the type of object to refer
++ */
++ private static final class Strong<T> implements Ref<T> {
++ private Object owner;
++ private final T referent;
++
++ /**
++ * Creates a strong reference to the specified object.
++ *
++ * @param owner the owner of the reference, if needed
++ * @param referent the non-null object to refer
++ */
++ private Strong(Object owner, T referent) {
++ this.owner = owner;
++ this.referent = referent;
++ }
++
++ /**
++ * Returns the object that possesses information about the reference.
++ *
++ * @return the owner of the reference or {@code null} if the owner is unknown
++ */
++ public Object getOwner() {
++ return this.owner;
++ }
++
++ /**
++ * Returns the object to refer.
++ *
++ * @return the referred object
++ */
++ public T getReferent() {
++ return this.referent;
++ }
++
++ /**
++ * Determines whether the referred object was taken by the garbage collector or not.
++ *
++ * @return {@code true} if the referred object was collected
++ */
++ public boolean isStale() {
++ return false;
++ }
++
++ /**
++ * Marks this reference as removed from the cache.
++ */
++ public void removeOwner() {
++ this.owner = null;
++ }
++ }
++
++ /**
++ * This is an implementation of the {@link Cache.Ref} interface
++ * that uses the soft references that are cleared at the discretion
++ * of the garbage collector in response to a memory request.
++ *
++ * @param <T> the type of object to refer
++ * @see java.lang.ref.SoftReference
++ */
++ private static final class Soft<T> extends SoftReference<T> implements Ref<T> {
++ private Object owner;
++
++ /**
++ * Creates a soft reference to the specified object.
++ *
++ * @param owner the owner of the reference, if needed
++ * @param referent the non-null object to refer
++ * @param queue the queue to register the reference with,
++ * or {@code null} if registration is not required
++ */
++ private Soft(Object owner, T referent, ReferenceQueue<? super T> queue) {
++ super(referent, queue);
++ this.owner = owner;
++ }
++
++ /**
++ * Returns the object that possesses information about the reference.
++ *
++ * @return the owner of the reference or {@code null} if the owner is unknown
++ */
++ public Object getOwner() {
++ return this.owner;
++ }
++
++ /**
++ * Returns the object to refer.
++ *
++ * @return the referred object or {@code null} if it was collected
++ */
++ public T getReferent() {
++ return get();
++ }
++
++ /**
++ * Determines whether the referred object was taken by the garbage collector or not.
++ *
++ * @return {@code true} if the referred object was collected
++ */
++ public boolean isStale() {
++ return null == get();
++ }
++
++ /**
++ * Marks this reference as removed from the cache.
++ */
++ public void removeOwner() {
++ this.owner = null;
++ }
++ }
++
++ /**
++ * This is an implementation of the {@link Cache.Ref} interface
++ * that uses the weak references that do not prevent their referents
++ * from being made finalizable, finalized, and then reclaimed.
++ *
++ * @param <T> the type of object to refer
++ * @see java.lang.ref.WeakReference
++ */
++ private static final class Weak<T> extends WeakReference<T> implements Ref<T> {
++ private Object owner;
++
++ /**
++ * Creates a weak reference to the specified object.
++ *
++ * @param owner the owner of the reference, if needed
++ * @param referent the non-null object to refer
++ * @param queue the queue to register the reference with,
++ * or {@code null} if registration is not required
++ */
++ private Weak(Object owner, T referent, ReferenceQueue<? super T> queue) {
++ super(referent, queue);
++ this.owner = owner;
++ }
++
++ /**
++ * Returns the object that possesses information about the reference.
++ *
++ * @return the owner of the reference or {@code null} if the owner is unknown
++ */
++ public Object getOwner() {
++ return this.owner;
++ }
++
++ /**
++ * Returns the object to refer.
++ *
++ * @return the referred object or {@code null} if it was collected
++ */
++ public T getReferent() {
++ return get();
++ }
++
++ /**
++ * Determines whether the referred object was taken by the garbage collector or not.
++ *
++ * @return {@code true} if the referred object was collected
++ */
++ public boolean isStale() {
++ return null == get();
++ }
++
++ /**
++ * Marks this reference as removed from the cache.
++ */
++ public void removeOwner() {
++ this.owner = null;
++ }
++ }
++ }
++}
+--- ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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
+@@ -278,10 +278,11 @@
+ (JFIFMarkerSegment) findMarkerSegment
+ (JFIFMarkerSegment.class, true);
+ if (jfif == null) {
+- throw new IIOException
+- ("ICC APP2 encountered without prior JFIF!");
++ newGuy = new MarkerSegment(buffer);
++ newGuy.loadData(buffer);
++ } else {
++ jfif.addICC(buffer);
+ }
+- jfif.addICC(buffer);
+ // newGuy remains null
+ } else {
+ newGuy = new MarkerSegment(buffer);
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties Wed May 07 19:26:47 2014 -0700
+@@ -25,8 +25,8 @@
+ FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
+ FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
+ FileChooser.upFolderAccessibleName=Monter
+-FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
+-FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
++FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire de base
++FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
+ FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
+ FileChooser.newFolderAccessibleName=Nouveau dossier
+ FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
+--- ./jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java Wed May 07 19:26:47 2014 -0700
+@@ -146,7 +146,6 @@
+ int verbose = getPackage().verbose;
+ if (verbose > 2)
+ System.out.println("Reference scan "+this);
+- Class cls = thisClass();
+ refs.addAll(Arrays.asList(handler_class));
+ if (fixups != null) {
+ fixups.visitRefs(refs);
+--- ./jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Wed May 07 19:26:47 2014 -0700
+@@ -670,53 +670,55 @@
+ return new String(sig);
+ }
+
+- static private int skipClassNameChars(String sig, int i) {
+- int len = sig.length();
+- for (; i < len; i++) {
+- char ch = sig.charAt(i);
+- if (ch <= ' ') break;
+- if (ch >= ';' && ch <= '@') break;
+- }
+- return i;
++ static private int skipTo(char semi, String sig, int i) {
++ i = sig.indexOf(semi, i);
++ return (i >= 0) ? i : sig.length();
+ }
+
+ static String[] structureSignature(String sig) {
+- sig = sig.intern();
+-
+- int formLen = 0;
+- int nparts = 1;
+- for (int i = 0; i < sig.length(); i++) {
+- char ch = sig.charAt(i);
+- formLen++;
+- if (ch == 'L') {
+- nparts++;
+- int i2 = skipClassNameChars(sig, i+1);
+- i = i2-1; // keep the semicolon in the form
+- int i3 = sig.indexOf('<', i+1);
+- if (i3 > 0 && i3 < i2)
+- i = i3-1;
+- }
+- }
+- char[] form = new char[formLen];
+- if (nparts == 1) {
++ int firstl = sig.indexOf('L');
++ if (firstl < 0) {
+ String[] parts = { sig };
+ return parts;
+ }
+- String[] parts = new String[nparts];
+- int j = 0;
+- int k = 1;
+- for (int i = 0; i < sig.length(); i++) {
+- char ch = sig.charAt(i);
+- form[j++] = ch;
+- if (ch == 'L') {
+- int i2 = skipClassNameChars(sig, i+1);
+- parts[k++] = sig.substring(i+1, i2);
+- i = i2;
+- --i; // keep the semicolon in the form
++ // Segment the string like sig.split("L\\([^;<]*\\)").
++ // N.B.: Previous version of this code did a more complex match,
++ // to next ch < ' ' or ch in [';'..'@']. The only important
++ // characters are ';' and '<', since they are part of the
++ // signature syntax.
++ // Examples:
++ // "(Ljava/lang/Object;IJLLoo;)V" => {"(L;IJL;)V", "java/lang/Object", "Loo"}
++ // "Ljava/util/List<Ljava/lang/String;>;" => {"L<L;>;", "java/util/List", "java/lang/String"}
++ char[] form = null;
++ String[] parts = null;
++ for (int pass = 0; pass <= 1; pass++) {
++ // pass 0 is a sizing pass, pass 1 packs the arrays
++ int formPtr = 0;
++ int partPtr = 1;
++ int nextsemi = 0, nextangl = 0; // next ';' or '<', or zero, or sigLen
++ int lastj = 0;
++ for (int i = firstl + 1, j; i > 0; i = sig.indexOf('L', j) + 1) {
++ // sig[i-1] is 'L', while sig[j] will be the first ';' or '<' after it
++ // each part is in sig[i .. j-1]
++ if (nextsemi < i) nextsemi = skipTo(';', sig, i);
++ if (nextangl < i) nextangl = skipTo('<', sig, i);
++ j = (nextsemi < nextangl ? nextsemi : nextangl);
++ if (pass != 0) {
++ sig.getChars(lastj, i, form, formPtr);
++ parts[partPtr] = sig.substring(i, j);
++ }
++ formPtr += (i - lastj);
++ partPtr += 1;
++ lastj = j;
+ }
++ if (pass != 0) {
++ sig.getChars(lastj, sig.length(), form, formPtr);
++ break;
++ }
++ formPtr += (sig.length() - lastj);
++ form = new char[formPtr];
++ parts = new String[partPtr];
+ }
+- assert(j == formLen);
+- assert(k == parts.length);
+ parts[0] = new String(form);
+ //assert(flattenSignature(parts).equals(sig));
+ return parts;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,131 @@
++/*
++ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
++ * 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.java.util.jar.pack;
++
++import java.util.ListResourceBundle;
++
++public class DriverResource_ja extends ListResourceBundle {
++ public static final String VERSION ="VERSION";
++ public static final String BAD_ARGUMENT ="BAD_ARGUMENT";
++ public static final String BAD_OPTION ="BAD_OPTION";
++ public static final String BAD_REPACK_OUTPUT="BAD_REPACK_OUTPUT";
++ public static final String DETECTED_ZIP_COMMENT="DETECTED_ZIP_COMMENT";
++ public static final String SKIP_FOR_REPACKED ="SKIP_FOR_REPACKED";
++ public static final String WRITE_PACK_FILE ="WRITE_PACK_FILE";
++ public static final String WIRTE_PACKGZ_FILE="WIRTE_PACKGZ_FILE";
++ public static final String SKIP_FOR_MOVE_FAILED="SKIP_FOR_MOVE_FAILED";
++ public static final String PACK_HELP="PACK_HELP";
++ public static final String UNPACK_HELP ="UNPACK_HELP";
++ public static final String MORE_INFO = "MORE_INFO";
++ public static final String DUPLICATE_OPTION = "DUPLICATE_OPTION";
++ public static final String BAD_SPEC = "BAD_SPEC";
++
++ //The following string is duplicate in PACK and UNPACK comment,which was draw out to ruduce translation work.
++ private static final String PARAMETER_V = " -v, --verbose increase program verbosity";
++ private static final String PARAMETER_Q = " -q, --quiet set verbosity to lowest level";
++ private static final String PARAMETER_LF = " -l{F}, --log-file={F} output to the given log file, or '-' for System.out";
++ private static final String PARAMETER_H = " -?, -h, --help print this message";
++ private static final String PARAMETER_VER = " -V, --version print program version";
++ private static final String PARAMETER_J = " -J{X} pass option X to underlying Java VM";
++
++
++ //The following are outputs of command 'pack200' and 'unpack200'.
++ //Don't translate command arguments ,words with a prefix of '-' or '--'.
++ //
++ private static final Object[][] resource= {
++ {VERSION,"{0}\u30D0\u30FC\u30B8\u30E7\u30F3{1}"},//parameter 0:class name;parameter 1: version value
++ {BAD_ARGUMENT,"\u7121\u52B9\u306A\u5F15\u6570: {0}"},
++ {BAD_OPTION,"\u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}={1}"},//parameter 0:option name;parameter 1:option value
++ {BAD_REPACK_OUTPUT,"\u7121\u52B9\u306A--repack\u51FA\u529B: {0}"},//parameter 0:filename
++ {DETECTED_ZIP_COMMENT,"\u691C\u51FA\u3055\u308C\u305FZIP\u30B3\u30E1\u30F3\u30C8: {0}"},//parameter 0:comment
++ {SKIP_FOR_REPACKED,"\u3059\u3067\u306B\u518D\u5727\u7E2E\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059: {0}"},//parameter 0:filename
++ {WRITE_PACK_FILE,"*.pack\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080\u306B\u306F\u3001--no-gzip\u3092\u6307\u5B9A\u3057\u307E\u3059: {0}"},//parameter 0:filename
++ {WIRTE_PACKGZ_FILE,"*.pack.gz\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080\u306B\u306F\u3001--gzip\u3092\u6307\u5B9A\u3057\u307E\u3059: {0}"},//parameter 0:filename
++ {SKIP_FOR_MOVE_FAILED,"\u79FB\u52D5\u304C\u5931\u6557\u3057\u305F\u305F\u3081\u89E3\u51CD\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059: {0}"},//parameter 0:filename
++ {PACK_HELP,new String[]{
++ "\u4F7F\u7528\u65B9\u6CD5: pack200 [-opt... | --option=value]... x.pack[.gz] y.jar",
++ "",
++ "\u5727\u7E2E\u30AA\u30D7\u30B7\u30E7\u30F3",
++ " -g\u3001--no-gzip \u30D7\u30EC\u30FC\u30F3\u306A*.pack\u30D5\u30A1\u30A4\u30EB\u3092\u5727\u7E2E\u305B\u305A\u306B\u51FA\u529B\u3057\u307E\u3059",
++ " --gzip (\u30C7\u30D5\u30A9\u30EB\u30C8)\u5727\u7E2E\u51FA\u529B\u3092gzip\u3067\u5F8C\u51E6\u7406\u3057\u307E\u3059",
++ " -G\u3001--strip-debug \u5727\u7E2E\u4E2D\u306B\u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059",
++ " -O\u3001--no-keep-file-order \u30D5\u30A1\u30A4\u30EB\u306E\u9806\u5E8F\u4ED8\u3051\u60C5\u5831\u3092\u8EE2\u9001\u3057\u307E\u305B\u3093",
++ " --keep-file-order (\u30C7\u30D5\u30A9\u30EB\u30C8)\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u9806\u5E8F\u4ED8\u3051\u3092\u4FDD\u6301\u3057\u307E\u3059",
++ " -S{N}\u3001--segment-limit={N} \u30BB\u30B0\u30E1\u30F3\u30C8\u5236\u9650\u3092\u51FA\u529B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8N=1Mb)",
++ " -E{N}\u3001--effort={N} \u5727\u7E2E\u306E\u8A66\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8N=5)",
++ " -H{h}\u3001--deflate-hint={h} \u30C7\u30D5\u30EC\u30FC\u30C8\u30FB\u30D2\u30F3\u30C8\u3092\u8EE2\u9001\u3057\u307E\u3059: true\u3001false\u307E\u305F\u306Fkeep(\u30C7\u30D5\u30A9\u30EB\u30C8)",
++ " -m{V}\u3001--modification-time={V} \u5909\u66F4\u6642\u9593\u3092\u8EE2\u9001\u3057\u307E\u3059: latest\u307E\u305F\u306Fkeep(\u30C7\u30D5\u30A9\u30EB\u30C8)",
++ " -P{F}\u3001--pass-file={F} \u6307\u5B9A\u3055\u308C\u305F\u5727\u7E2E\u3055\u308C\u3066\u3044\u306A\u3044\u5165\u529B\u8981\u7D20\u3092\u8EE2\u9001\u3057\u307E\u3059",
++ " -U{a}\u3001--unknown-attribute={a} \u4E0D\u660E\u306E\u5C5E\u6027\u30A2\u30AF\u30B7\u30E7\u30F3: error\u3001strip\u307E\u305F\u306Fpass(\u30C7\u30D5\u30A9\u30EB\u30C8)",
++ " -C{N}={L}\u3001--class-attribute={N}={L} (\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u5C5E\u6027)",
++ " -F{N}={L}\u3001--field-attribute={N}={L} (\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u5C5E\u6027)",
++ " -M{N}={L}\u3001--method-attribute={N}={L} (\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u5C5E\u6027)",
++ " -D{N}={L}\u3001--code-attribute={N}={L} (\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u5C5E\u6027)",
++ " -f{F}\u3001--config-file={F} Pack200.Packer\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u30D5\u30A1\u30A4\u30EBF\u3092\u8AAD\u307F\u8FBC\u307F\u307E\u3059",
++ PARAMETER_V ,
++ PARAMETER_Q ,
++ PARAMETER_LF ,
++ PARAMETER_H ,
++ PARAMETER_VER ,
++ PARAMETER_J,
++ "",
++ "\u6CE8\u610F:",
++ " -P\u3001-C\u3001-F\u3001-M\u304A\u3088\u3073-D\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u7D2F\u7A4D\u3055\u308C\u307E\u3059\u3002",
++ " \u5C5E\u6027\u5B9A\u7FA9\u306E\u4F8B: -C SourceFile=RUH .",
++ " Config.\u30D5\u30A1\u30A4\u30EB\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u306F\u3001Pack200 API\u306B\u3088\u3063\u3066\u5B9A\u7FA9\u3055\u308C\u307E\u3059\u3002",
++ " -S\u3001-E\u3001-H\u3001-m\u3001-U\u306E\u5024\u306E\u610F\u5473\u306F\u3001Pack200 API\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002",
++ " \u30EC\u30A4\u30A2\u30A6\u30C8\u5B9A\u7FA9(RUH\u306A\u3069)\u306FJSR 200\u306B\u3088\u3063\u3066\u5B9A\u7FA9\u3055\u308C\u307E\u3059\u3002",
++ "",
++ "\u518D\u5727\u7E2E\u30E2\u30FC\u30C9\u3067\u306F\u3001JAR\u30D5\u30A1\u30A4\u30EB\u304C\u5727\u7E2E/\u89E3\u51CD\u30B5\u30A4\u30AF\u30EB\u3067\u66F4\u65B0\u3055\u308C\u307E\u3059:",
++ " pack200 [-r|--repack] [-opt | --option=value]... [repackedy.jar] y.jar\n"
++ }
++ },
++ {UNPACK_HELP,new String[]{
++ "\u4F7F\u7528\u65B9\u6CD5: unpack200 [-opt... | --option=value]... x.pack[.gz] y.jar\n",
++ "",
++ "\u89E3\u51CD\u30AA\u30D7\u30B7\u30E7\u30F3",
++ " -H{h}\u3001--deflate-hint={h} \u8EE2\u9001\u3055\u308C\u305F\u30C7\u30D5\u30EC\u30FC\u30C8\u30FB\u30D2\u30F3\u30C8\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059: true\u3001false\u307E\u305F\u306Fkeep(\u30C7\u30D5\u30A9\u30EB\u30C8)",
++ " -r\u3001--remove-pack-file \u89E3\u51CD\u5F8C\u306B\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3057\u307E\u3059",
++ PARAMETER_V ,
++ PARAMETER_Q ,
++ PARAMETER_LF ,
++ PARAMETER_H ,
++ PARAMETER_VER ,
++ PARAMETER_J,
++ }
++ },
++
++ {MORE_INFO,"(\u8A73\u7D30\u306F\u3001{0} --help\u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002)"},//parameter 0:command name
++ {DUPLICATE_OPTION,"\u91CD\u8907\u30AA\u30D7\u30B7\u30E7\u30F3: {0}"},//parameter 0:option
++ {BAD_SPEC,"{0}\u306E\u7121\u52B9\u306A\u4ED5\u69D8: {1}"},//parameter 0:option;parameter 1:specifier
++ };
++
++ protected Object[][] getContents() {
++ return resource;
++ }
++
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,131 @@
++/*
++ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
++ * 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.java.util.jar.pack;
++
++import java.util.ListResourceBundle;
++
++public class DriverResource_zh_CN extends ListResourceBundle {
++ public static final String VERSION ="VERSION";
++ public static final String BAD_ARGUMENT ="BAD_ARGUMENT";
++ public static final String BAD_OPTION ="BAD_OPTION";
++ public static final String BAD_REPACK_OUTPUT="BAD_REPACK_OUTPUT";
++ public static final String DETECTED_ZIP_COMMENT="DETECTED_ZIP_COMMENT";
++ public static final String SKIP_FOR_REPACKED ="SKIP_FOR_REPACKED";
++ public static final String WRITE_PACK_FILE ="WRITE_PACK_FILE";
++ public static final String WIRTE_PACKGZ_FILE="WIRTE_PACKGZ_FILE";
++ public static final String SKIP_FOR_MOVE_FAILED="SKIP_FOR_MOVE_FAILED";
++ public static final String PACK_HELP="PACK_HELP";
++ public static final String UNPACK_HELP ="UNPACK_HELP";
++ public static final String MORE_INFO = "MORE_INFO";
++ public static final String DUPLICATE_OPTION = "DUPLICATE_OPTION";
++ public static final String BAD_SPEC = "BAD_SPEC";
++
++ //The following string is duplicate in PACK and UNPACK comment,which was draw out to ruduce translation work.
++ private static final String PARAMETER_V = " -v, --verbose increase program verbosity";
++ private static final String PARAMETER_Q = " -q, --quiet set verbosity to lowest level";
++ private static final String PARAMETER_LF = " -l{F}, --log-file={F} output to the given log file, or '-' for System.out";
++ private static final String PARAMETER_H = " -?, -h, --help print this message";
++ private static final String PARAMETER_VER = " -V, --version print program version";
++ private static final String PARAMETER_J = " -J{X} pass option X to underlying Java VM";
++
++
++ //The following are outputs of command 'pack200' and 'unpack200'.
++ //Don't translate command arguments ,words with a prefix of '-' or '--'.
++ //
++ private static final Object[][] resource= {
++ {VERSION,"{0}\u7248\u672C {1}"},//parameter 0:class name;parameter 1: version value
++ {BAD_ARGUMENT,"\u9519\u8BEF\u53C2\u6570: {0}"},
++ {BAD_OPTION,"\u9519\u8BEF\u9009\u9879: {0}={1}"},//parameter 0:option name;parameter 1:option value
++ {BAD_REPACK_OUTPUT,"--repack \u8F93\u51FA\u9519\u8BEF: {0}"},//parameter 0:filename
++ {DETECTED_ZIP_COMMENT,"\u68C0\u6D4B\u5230 ZIP \u6CE8\u91CA: {0}"},//parameter 0:comment
++ {SKIP_FOR_REPACKED,"\u7531\u4E8E\u5DF2\u91CD\u65B0\u6253\u5305\u800C\u8DF3\u8FC7: {0}"},//parameter 0:filename
++ {WRITE_PACK_FILE,"\u8981\u5199\u5165 *.pack \u6587\u4EF6, \u8BF7\u6307\u5B9A --no-gzip: {0}"},//parameter 0:filename
++ {WIRTE_PACKGZ_FILE,"\u8981\u5199\u5165 *.pack.gz \u6587\u4EF6, \u8BF7\u6307\u5B9A --gzip: {0}"},//parameter 0:filename
++ {SKIP_FOR_MOVE_FAILED,"\u7531\u4E8E\u79FB\u52A8\u5931\u8D25\u800C\u8DF3\u8FC7\u91CD\u65B0\u6253\u5305: {0}"},//parameter 0:filename
++ {PACK_HELP,new String[]{
++ "\u7528\u6CD5: pack200 [-opt... | --option=value]... x.pack[.gz] y.jar",
++ "",
++ "\u6253\u5305\u9009\u9879",
++ " -g, --no-gzip \u8F93\u51FA\u65E0\u683C\u5F0F\u7684 *.pack \u6587\u4EF6, \u4E0D\u538B\u7F29",
++ " --gzip (\u9ED8\u8BA4\u503C) \u4F7F\u7528 gzip \u5BF9\u6253\u5305\u8FDB\u884C\u540E\u5904\u7406",
++ " -G, --strip-debug \u6253\u5305\u65F6\u5220\u9664\u8C03\u8BD5\u5C5E\u6027",
++ " -O, --no-keep-file-order \u4E0D\u4F20\u8F93\u6587\u4EF6\u6392\u5E8F\u4FE1\u606F",
++ " --keep-file-order (\u9ED8\u8BA4\u503C) \u4FDD\u7559\u8F93\u5165\u6587\u4EF6\u6392\u5E8F",
++ " -S{N}, --segment-limit={N} \u8F93\u51FA\u6BB5\u9650\u5236 (\u9ED8\u8BA4\u503C N=1Mb)",
++ " -E{N}, --effort={N} \u6253\u5305\u6548\u679C (\u9ED8\u8BA4\u503C N=5)",
++ " -H{h}, --deflate-hint={h} \u4F20\u8F93\u538B\u7F29\u63D0\u793A: true, false \u6216 keep (\u9ED8\u8BA4\u503C)",
++ " -m{V}, --modification-time={V} \u4F20\u8F93 modtimes: latest \u6216 keep (\u9ED8\u8BA4\u503C)",
++ " -P{F}, --pass-file={F} \u4F20\u8F93\u672A\u89E3\u538B\u7F29\u7684\u7ED9\u5B9A\u8F93\u5165\u5143\u7D20",
++ " -U{a}, --unknown-attribute={a} \u672A\u77E5\u5C5E\u6027\u64CD\u4F5C: error, strip \u6216 pass (\u9ED8\u8BA4\u503C)",
++ " -C{N}={L}, --class-attribute={N}={L} (\u7528\u6237\u5B9A\u4E49\u7684\u5C5E\u6027)",
++ " -F{N}={L}, --field-attribute={N}={L} (\u7528\u6237\u5B9A\u4E49\u7684\u5C5E\u6027)",
++ " -M{N}={L}, --method-attribute={N}={L} (\u7528\u6237\u5B9A\u4E49\u7684\u5C5E\u6027)",
++ " -D{N}={L}, --code-attribute={N}={L} (\u7528\u6237\u5B9A\u4E49\u7684\u5C5E\u6027)",
++ " -f{F}, --config-file={F} \u8BFB\u53D6\u6587\u4EF6 F \u7684 Pack200.Packer \u5C5E\u6027",
++ PARAMETER_V ,
++ PARAMETER_Q ,
++ PARAMETER_LF ,
++ PARAMETER_H ,
++ PARAMETER_VER ,
++ PARAMETER_J,
++ "",
++ "\u6CE8:",
++ " -P, -C, -F, -M \u548C -D \u9009\u9879\u7D2F\u8BA1\u3002",
++ " \u793A\u4F8B\u5C5E\u6027\u5B9A\u4E49: -C SourceFile=RUH\u3002",
++ " Config. \u6587\u4EF6\u5C5E\u6027\u7531 Pack200 API \u5B9A\u4E49\u3002",
++ " \u6709\u5173 -S, -E, -H-, -m, -U \u503C\u7684\u542B\u4E49, \u8BF7\u53C2\u9605 Pack200 API\u3002",
++ " \u5E03\u5C40\u5B9A\u4E49 (\u4F8B\u5982 RUH) \u7531 JSR 200 \u5B9A\u4E49\u3002",
++ "",
++ "\u91CD\u65B0\u6253\u5305\u6A21\u5F0F\u901A\u8FC7\u6253\u5305/\u89E3\u5305\u5468\u671F\u66F4\u65B0 JAR \u6587\u4EF6:",
++ " pack200 [-r|--repack] [-opt | --option=value]... [repackedy.jar] y.jar\n"
++ }
++ },
++ {UNPACK_HELP,new String[]{
++ "\u7528\u6CD5: unpack200 [-opt... | --option=value]... x.pack[.gz] y.jar\n",
++ "",
++ "\u89E3\u5305\u9009\u9879",
++ " -H{h}, --deflate-hint={h} \u8986\u76D6\u5DF2\u4F20\u8F93\u7684\u538B\u7F29\u63D0\u793A: true, false \u6216 keep (\u9ED8\u8BA4\u503C)",
++ " -r, --remove-pack-file \u89E3\u5305\u4E4B\u540E\u5220\u9664\u8F93\u5165\u6587\u4EF6",
++ PARAMETER_V ,
++ PARAMETER_Q ,
++ PARAMETER_LF ,
++ PARAMETER_H ,
++ PARAMETER_VER ,
++ PARAMETER_J,
++ }
++ },
++
++ {MORE_INFO,"(\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u8FD0\u884C {0} --help\u3002)"},//parameter 0:command name
++ {DUPLICATE_OPTION,"\u91CD\u590D\u7684\u9009\u9879: {0}"},//parameter 0:option
++ {BAD_SPEC,"{0}\u7684\u89C4\u8303\u9519\u8BEF: {1}"},//parameter 0:option;parameter 1:specifier
++ };
++
++ protected Object[][] getContents() {
++ return resource;
++ }
++
++
++}
+--- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties Wed May 07 19:26:47 2014 -0700
+@@ -140,7 +140,7 @@
+ #WebRowSetXmlReader exception
+ wrsxmlreader.invalidcp = Ende von RowSet wurde erreicht. Ung\u00FCltige Cursorposition
+ wrsxmlreader.readxml = readXML: {0}
+-wrsxmlreader.parseerr = ** Parsing-Fehler: {0}, Zeile: {1} , URI: {2}
++wrsxmlreader.parseerr = ** Parsingfehler: {0}, Zeile: {1} , URI: {2}
+
+ #WebRowSetXmlWriter exceptions
+ wrsxmlwriter.ioex = IOException: {0}
+--- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties Wed May 07 19:26:47 2014 -0700
+@@ -51,8 +51,8 @@
+ cachedrowsetimpl.last = last: TYPE_FORWARD_ONLY
+ cachedrowsetimpl.absolute = absolute: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u4F4D\u7F6E
+ cachedrowsetimpl.relative = relative: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u4F4D\u7F6E
+-cachedrowsetimpl.asciistream = ascii\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+-cachedrowsetimpl.binstream = \u30D0\u30A4\u30CA\u30EA\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F
++cachedrowsetimpl.asciistream = ascii\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u304C\u5931\u6557\u3057\u307E\u3057\u305F
++cachedrowsetimpl.binstream = \u30D0\u30A4\u30CA\u30EA\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+ cachedrowsetimpl.failedins = \u884C\u306E\u633F\u5165\u306B\u5931\u6557
+ cachedrowsetimpl.updateins = \u633F\u5165\u884C\u306B\u304A\u3044\u3066updateRow\u304C\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F
+ cachedrowsetimpl.movetoins = moveToInsertRow: CONCUR_READ_ONLY
+@@ -101,7 +101,7 @@
+
+ #JdbcRowSetImpl exceptions
+ jdbcrowsetimpl.invalstate = \u7121\u52B9\u306A\u72B6\u614B
+-jdbcrowsetimpl.connect = JdbcRowSet(connect): JNDI\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093
++jdbcrowsetimpl.connect = JdbcRowSet (connect): JNDI\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093
+ jdbcrowsetimpl.paramtype = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093
+ jdbcrowsetimpl.matchcols = \u4E00\u81F4\u5217\u304C\u5217\u306E\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+ jdbcrowsetimpl.setmatchcols = \u4E00\u81F4\u5217\u3092\u53D6\u5F97\u3059\u308B\u524D\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
+--- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties Wed May 07 19:26:47 2014 -0700
+@@ -29,11 +29,11 @@
+ cachedrowsetimpl.nullhash = Kan inte instansiera CachedRowSetImpl. Null-hashtabell skickades till konstruktor
+ cachedrowsetimpl.invalidop = En ogiltig \u00E5tg\u00E4rd utf\u00F6rdes p\u00E5 infogad rad
+ cachedrowsetimpl.accfailed = acceptChanges utf\u00F6rdes inte
+-cachedrowsetimpl.invalidcp = Mark\u00F6rpositionen \u00E4r ogiltig
++cachedrowsetimpl.invalidcp = Ogiltigt mark\u00F6rl\u00E4ge
+ cachedrowsetimpl.illegalop = En otill\u00E5ten \u00E5tg\u00E4rd utf\u00F6rdes p\u00E5 en icke infogad rad
+ cachedrowsetimpl.clonefail = Kloningen utf\u00F6rdes inte: {0}
+-cachedrowsetimpl.invalidcol = Kolumnindexet \u00E4r ogiltigt
+-cachedrowsetimpl.invalcolnm = Kolumnnamnet \u00E4r ogiltigt
++cachedrowsetimpl.invalidcol = Ogiltigt kolumnindex
++cachedrowsetimpl.invalcolnm = Ogiltigt kolumnnamn
+ cachedrowsetimpl.boolfail = getBoolen utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
+ cachedrowsetimpl.bytefail = getByte utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
+ cachedrowsetimpl.shortfail = getShort utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
+@@ -60,7 +60,7 @@
+ cachedrowsetimpl.movetoins2 = moveToInsertRow: ogiltigt antal kolumner
+ cachedrowsetimpl.tablename = Tabellnamnet kan inte vara null
+ cachedrowsetimpl.keycols = Ogiltiga nyckelkolumner
+-cachedrowsetimpl.invalidcol = Kolumnindexet \u00E4r ogiltigt
++cachedrowsetimpl.invalidcol = Ogiltigt kolumnindex
+ cachedrowsetimpl.opnotsupp = Databasen har inte st\u00F6d f\u00F6r denna \u00E5tg\u00E4rd
+ cachedrowsetimpl.matchcols = Matchningskolumnerna \u00E4r inte samma som de som st\u00E4llts in
+ cachedrowsetimpl.setmatchcols = St\u00E4ll in matchningskolumnerna innan du h\u00E4mtar dem
+@@ -81,7 +81,7 @@
+
+ # WebRowSetImpl exceptions
+ webrowsetimpl.nullhash = Kan inte instansiera WebRowSetImpl. Null-hashtabell skickades till konstruktor.
+-webrowsetimpl.invalidwr = Ogiltig f\u00F6rfattare
++webrowsetimpl.invalidwr = Ogiltig skrivfunktion
+ webrowsetimpl.invalidrd = Ogiltig l\u00E4sare
+
+ #FilteredRowSetImpl exceptions
+--- ./jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Wed May 07 19:26:47 2014 -0700
+@@ -875,8 +875,7 @@
+ char[] tmpPassword = ((PasswordCallback)
+ callbacks[0]).getPassword();
+ if (tmpPassword == null) {
+- // treat a NULL password as an empty password
+- tmpPassword = new char[0];
++ throw new LoginException("No password provided");
+ }
+ password = new char[tmpPassword.length];
+ System.arraycopy(tmpPassword, 0,
+--- ./jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java Wed May 07 19:26:47 2014 -0700
+@@ -252,11 +252,12 @@
+
+
+ /**
+- * Outputs a byte array and converts
++ * Outputs a byte array. Can be null.
+ */
+ protected static final void traceOutput(String srcClass, String srcMethod,
+ String traceTag, byte[] output) {
+- traceOutput(srcClass, srcMethod, traceTag, output, 0, output.length);
++ traceOutput(srcClass, srcMethod, traceTag, output, 0,
++ output == null ? 0 : output.length);
+ }
+
+ protected static final void traceOutput(String srcClass, String srcMethod,
+@@ -272,13 +273,20 @@
+ lev = Level.FINEST;
+ }
+
+- ByteArrayOutputStream out = new ByteArrayOutputStream(len);
+- new HexDumpEncoder().encodeBuffer(
+- new ByteArrayInputStream(output, offset, len), out);
++ String content;
++
++ if (output != null) {
++ ByteArrayOutputStream out = new ByteArrayOutputStream(len);
++ new HexDumpEncoder().encodeBuffer(
++ new ByteArrayInputStream(output, offset, len), out);
++ content = out.toString();
++ } else {
++ content = "NULL";
++ }
+
+ // Message id supplied by caller as part of traceTag
+ logger.logp(lev, srcClass, srcMethod, "{0} ( {1} ): {2}",
+- new Object[] {traceTag, new Integer(origlen), out.toString()});
++ new Object[] {traceTag, new Integer(origlen), content});
+ } catch (Exception e) {
+ logger.logp(Level.WARNING, srcClass, srcMethod,
+ "SASLIMPL09:Error generating trace output: {0}", e);
+--- ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties Wed May 07 19:26:47 2014 -0700
+@@ -25,8 +25,8 @@
+ FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
+ FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
+ FileChooser.upFolderAccessibleName=Monter
+-FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
+-FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
++FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire de base
++FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
+ FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
+ FileChooser.newFolderAccessibleName=Nouveau dossier
+ FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
+--- ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties Wed May 07 19:26:47 2014 -0700
+@@ -25,8 +25,8 @@
+ FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
+ FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
+ FileChooser.upFolderAccessibleName=Monter
+-FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
+-FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
++FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire de base
++FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
+ FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
+ FileChooser.newFolderAccessibleName=Nouveau dossier
+ FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
+--- ./jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties Wed May 07 19:26:47 2014 -0700
+@@ -47,6 +47,6 @@
+ memory_listening.name = VM\u3078\u306E\u63A5\u7D9A\u3092\u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u305F\u3081\u306E\u5171\u6709\u30E1\u30E2\u30EA\u30FC\u9818\u57DF\u540D
+ memory_listening.name.label = \u540D\u524D
+ memory_listening.description = \u305D\u306E\u4ED6\u306EVM\u306B\u3088\u308A\u958B\u59CB\u3055\u308C\u308B\u5171\u6709\u30E1\u30E2\u30EA\u30FC\u63A5\u7D9A\u3092\u53D7\u3051\u5165\u308C\u307E\u3059
+-process_attaching.description = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u306B\u30D7\u30ED\u30BB\u30B9ID(pid)\u3092\u4F7F\u7528\u3057\u3066\u63A5\u7D9A\u3057\u307E\u3059
++process_attaching.description = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u306B\u30D7\u30ED\u30BB\u30B9ID (pid)\u3092\u4F7F\u7528\u3057\u3066\u63A5\u7D9A\u3057\u307E\u3059
+ process_attaching.pid = pid
+-process_attaching.pid.label = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9ID(pid)
++process_attaching.pid.label = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9ID (pid)
+--- ./jdk/src/share/classes/java/awt/AWTException.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/awt/AWTException.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1995, 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,7 +26,7 @@
+
+
+ /**
+- * Signals that an Absract Window Toolkit exception has occurred.
++ * Signals that an Abstract Window Toolkit exception has occurred.
+ *
+ * @author Arthur van Hoff
+ */
+--- ./jdk/src/share/classes/java/awt/Component.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/awt/Component.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1995, 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
+@@ -972,6 +972,10 @@
+ public AccessControlContext getAccessControlContext(Component comp) {
+ return comp.getAccessControlContext();
+ }
++
++ public void revalidateSynchronously(Component comp) {
++ comp.revalidateSynchronously();
++ }
+ });
+ }
+
+@@ -2963,6 +2967,13 @@
+ * @since 1.7
+ */
+ public void revalidate() {
++ revalidateSynchronously();
++ }
++
++ /**
++ * Revalidates the component synchronously.
++ */
++ final void revalidateSynchronously() {
+ synchronized (getTreeLock()) {
+ invalidate();
+
+--- ./jdk/src/share/classes/java/awt/Toolkit.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/awt/Toolkit.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1995, 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
+@@ -56,6 +56,7 @@
+ import sun.awt.NullComponentPeer;
+ import sun.awt.PeerEvent;
+ import sun.awt.SunToolkit;
++import sun.awt.AWTAccessor;
+ import sun.security.util.SecurityConstants;
+
+ import sun.util.CoreResourceBundleControl;
+@@ -1607,6 +1608,12 @@
+ * here, so that only one copy is maintained.
+ */
+ private static ResourceBundle resources;
++ private static ResourceBundle platformResources;
++
++ // called by platform toolkit
++ private static void setPlatformResources(ResourceBundle bundle) {
++ platformResources = bundle;
++ }
+
+ /**
+ * Initialize JNI field and method ids
+@@ -1650,6 +1657,13 @@
+ }
+
+ static {
++ AWTAccessor.setToolkitAccessor(
++ new AWTAccessor.ToolkitAccessor() {
++ @Override
++ public void setPlatformResources(ResourceBundle bundle) {
++ Toolkit.setPlatformResources(bundle);
++ }
++ });
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ public Object run() {
+@@ -1677,6 +1691,14 @@
+ * This method returns defaultValue if the property is not found.
+ */
+ public static String getProperty(String key, String defaultValue) {
++ // first try platform specific bundle
++ if (platformResources != null) {
++ try {
++ return platformResources.getString(key);
++ } catch (MissingResourceException e) {}
++ }
++
++ // then shared one
+ if (resources != null) {
+ try {
+ return resources.getString(key);
+@@ -2544,7 +2566,7 @@
+ Runnable updater = new Runnable() {
+ public void run() {
+ PropertyChangeSupport pcs = (PropertyChangeSupport)
+- AppContext.getAppContext().get(PROP_CHANGE_SUPPORT_KEY);
++ AppContext.getAppContext().get(PROP_CHANGE_SUPPORT_KEY);
+ if (null != pcs) {
+ pcs.firePropertyChange(evt);
+ }
+--- ./jdk/src/share/classes/java/lang/AbstractStringBuilder.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/lang/AbstractStringBuilder.java Wed May 07 19:26:47 2014 -0700
+@@ -1273,7 +1273,7 @@
+ * specified substring, starting at the specified index. The integer
+ * returned is the smallest value <tt>k</tt> for which:
+ * <blockquote><pre>
+- * k >= Math.min(fromIndex, str.length()) &&
++ * k >= Math.min(fromIndex, this.length()) &&
+ * this.toString().startsWith(str, k)
+ * </pre></blockquote>
+ * If no such value of <i>k</i> exists, then -1 is returned.
+@@ -1317,7 +1317,7 @@
+ * specified substring. The integer returned is the largest value <i>k</i>
+ * such that:
+ * <blockquote><pre>
+- * k <= Math.min(fromIndex, str.length()) &&
++ * k <= Math.min(fromIndex, this.length()) &&
+ * this.toString().startsWith(str, k)
+ * </pre></blockquote>
+ * If no such value of <i>k</i> exists, then -1 is returned.
+--- ./jdk/src/share/classes/java/lang/Class.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/lang/Class.java Wed May 07 19:26:47 2014 -0700
+@@ -2207,14 +2207,53 @@
+ */
+ static native Class getPrimitiveClass(String name);
+
+- private static boolean isCheckMemberAccessOverridden(SecurityManager smgr) {
+- if (smgr.getClass() == SecurityManager.class) return false;
++ private static class SecurityManagerHelper {
++ final SecurityManager sm;
++ final boolean overrideCheckMemberAccess;
++ SecurityManagerHelper(SecurityManager sm) {
++ this.sm = sm;
+
+- Class<?>[] paramTypes = new Class<?>[] {Class.class, int.class};
+- return smgr.getClass().getMethod0("checkMemberAccess", paramTypes).
+- getDeclaringClass() != SecurityManager.class;
++ boolean overridden = false;
++ if (sm.getClass() != SecurityManager.class) {
++ try {
++ overridden = getCheckMemberAccessMethod(sm.getClass()).
++ getDeclaringClass() != SecurityManager.class;
++ } catch (NoSuchMethodError e) {
++ // fall back to invoke sm.checkMemberAccess for the member access check
++ }
++ }
++ this.overrideCheckMemberAccess = overridden;
++ }
++
+ }
+
++ private static volatile SecurityManagerHelper smHelper;
++ private static boolean isCheckMemberAccessOverridden(SecurityManager sm) {
++ if (sm.getClass() == SecurityManager.class) return false;
++
++ SecurityManagerHelper helper = smHelper;
++ if (helper == null || helper.sm != sm) {
++ helper = new SecurityManagerHelper(sm);
++ smHelper = helper;
++ }
++ return helper.overrideCheckMemberAccess;
++ }
++
++ /**
++ * Finds the checkMemberAccess method of the given SecurityManager class.
++ *
++ * This method calls JNI_GetMethodID to look up the checkMemberAccess method
++ * instead of Class.getMethod0 that may cause loading of classes referenced
++ * by the SecurityManager subclass and cause ClassCircularityError.
++ *
++ * JNI_GetMethodID may throw NoSuchMethodError if the given class
++ * has a static checkMemberAccess method.
++ *
++ * @throws NoSuchMethodError if the method cannot be found.
++ */
++ private static native Method getCheckMemberAccessMethod(Class<? extends SecurityManager> c)
++ throws NoSuchMethodError;
++
+
+ /*
+ * Check if client is allowed to access members. If access is denied,
+--- ./jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java Wed May 07 19:26:47 2014 -0700
+@@ -74,7 +74,6 @@
+ new Entry(0x00CC, new char[]{0x0069, 0x0307, 0x0300}, new char[]{0x00CC}, "lt", 0), // # LATIN CAPITAL LETTER I WITH GRAVE
+ new Entry(0x00CD, new char[]{0x0069, 0x0307, 0x0301}, new char[]{0x00CD}, "lt", 0), // # LATIN CAPITAL LETTER I WITH ACUTE
+ new Entry(0x0128, new char[]{0x0069, 0x0307, 0x0303}, new char[]{0x0128}, "lt", 0), // # LATIN CAPITAL LETTER I WITH TILDE
+- new Entry(0x0130, new char[]{0x0069, 0x0307}, new char[]{0x0130}, "lt", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
+
+ //# ================================================================================
+ //# Turkish and Azeri
+@@ -85,10 +84,7 @@
+ new Entry(0x0049, new char[]{0x0131}, new char[]{0x0049}, "tr", NOT_BEFORE_DOT), // # LATIN CAPITAL LETTER I
+ new Entry(0x0049, new char[]{0x0131}, new char[]{0x0049}, "az", NOT_BEFORE_DOT), // # LATIN CAPITAL LETTER I
+ new Entry(0x0069, new char[]{0x0069}, new char[]{0x0130}, "tr", 0), // # LATIN SMALL LETTER I
+- new Entry(0x0069, new char[]{0x0069}, new char[]{0x0130}, "az", 0), // # LATIN SMALL LETTER I
+- //# ================================================================================
+- //# Other
+- new Entry(0x0130, new char[]{0x0069, 0x0307}, new char[]{0x0130}, "en", 0), // # LATIN CAPITALLETTER I WITH DOT ABOVE
++ new Entry(0x0069, new char[]{0x0069}, new char[]{0x0130}, "az", 0) // # LATIN SMALL LETTER I
+ };
+
+ // A hash table that contains the above entries
+--- ./jdk/src/share/classes/java/lang/String.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/lang/String.java Wed May 07 19:26:47 2014 -0700
+@@ -2461,21 +2461,14 @@
+ }
+ if (localeDependent || srcChar == '\u03A3') { // GREEK CAPITAL LETTER SIGMA
+ lowerChar = ConditionalSpecialCasing.toLowerCaseEx(this, i, locale);
+- } else if (srcChar == '\u0130') { // LATIN CAPITAL LETTER I DOT
+- lowerChar = Character.ERROR;
+ } else {
+ lowerChar = Character.toLowerCase(srcChar);
+ }
+ if ((lowerChar == Character.ERROR)
+ || (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
+ if (lowerChar == Character.ERROR) {
+- if (!localeDependent && srcChar == '\u0130') {
+- lowerCharArray =
+- ConditionalSpecialCasing.toLowerCaseCharArray(this, i, Locale.ENGLISH);
+- } else {
+- lowerCharArray =
+- ConditionalSpecialCasing.toLowerCaseCharArray(this, i, locale);
+- }
++ lowerCharArray =
++ ConditionalSpecialCasing.toLowerCaseCharArray(this, i, locale);
+ } else if (srcCount == 2) {
+ resultOffset += Character.toChars(lowerChar, result, i + resultOffset) - srcCount;
+ continue;
+--- ./jdk/src/share/classes/java/lang/System.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/lang/System.java Wed May 07 19:26:47 2014 -0700
+@@ -1206,6 +1206,9 @@
+ public Thread newThreadWithAcc(Runnable target, AccessControlContext acc) {
+ return new Thread(target, acc);
+ }
++ public void invokeFinalize(Object o) throws Throwable {
++ o.finalize();
++ }
+ });
+ }
+ }
+--- ./jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java Wed May 07 19:26:47 2014 -0700
+@@ -53,7 +53,8 @@
+ if (!member.isResolved())
+ throw new InternalError();
+
+- if (member.getDeclaringClass().isInterface() && !member.isAbstract()) {
++ if (member.getDeclaringClass().isInterface() &&
++ member.isMethod() && !member.isAbstract()) {
+ // Check for corner case: invokeinterface of Object method
+ MemberName m = new MemberName(Object.class, member.getName(), member.getMethodType(), member.getReferenceKind());
+ m = MemberName.getFactory().resolveOrNull(m.getReferenceKind(), m, null);
+--- ./jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Wed May 07 19:26:47 2014 -0700
+@@ -742,7 +742,8 @@
+ GuardWithCatch gguard = new GuardWithCatch(gtarget, exType, gcatcher);
+ if (gtarget == null || gcatcher == null) throw new InternalError();
+ MethodHandle ginvoker = GuardWithCatch.VARARGS_INVOKE.bindReceiver(gguard);
+- return makeCollectArguments(ginvoker, ValueConversions.varargsArray(nargs), 0, false);
++ MethodHandle gcollect = makeCollectArguments(ginvoker, ValueConversions.varargsArray(nargs), 0, false);
++ return makePairwiseConvert(gcollect, type, 2);
+ }
+ }
+
+--- ./jdk/src/share/classes/java/lang/ref/Finalizer.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/lang/ref/Finalizer.java Wed May 07 19:26:47 2014 -0700
+@@ -27,17 +27,14 @@
+
+ import java.security.PrivilegedAction;
+ import java.security.AccessController;
+-
++import sun.misc.JavaLangAccess;
++import sun.misc.SharedSecrets;
++import sun.misc.VM;
+
+ final class Finalizer extends FinalReference { /* Package-private; must be in
+ same package as the Reference
+ class */
+
+- /* A native method that invokes an arbitrary object's finalize method is
+- required since the finalize method is protected
+- */
+- static native void invokeFinalizeMethod(Object o) throws Throwable;
+-
+ private static ReferenceQueue queue = new ReferenceQueue();
+ private static Finalizer unfinalized = null;
+ private static final Object lock = new Object();
+@@ -90,7 +87,7 @@
+ new Finalizer(finalizee);
+ }
+
+- private void runFinalizer() {
++ private void runFinalizer(JavaLangAccess jla) {
+ synchronized (this) {
+ if (hasBeenFinalized()) return;
+ remove();
+@@ -98,7 +95,8 @@
+ try {
+ Object finalizee = this.get();
+ if (finalizee != null && !(finalizee instanceof java.lang.Enum)) {
+- invokeFinalizeMethod(finalizee);
++ jla.invokeFinalize(finalizee);
++
+ /* Clear stack slot containing this variable, to decrease
+ the chances of false retention with a conservative GC */
+ finalizee = null;
+@@ -141,16 +139,21 @@
+
+ /* Called by Runtime.runFinalization() */
+ static void runFinalization() {
++ if (!VM.isBooted()) {
++ return;
++ }
++
+ forkSecondaryFinalizer(new Runnable() {
+ private volatile boolean running;
+ public void run() {
+ if (running)
+ return;
++ final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
+ running = true;
+ for (;;) {
+ Finalizer f = (Finalizer)queue.poll();
+ if (f == null) break;
+- f.runFinalizer();
++ f.runFinalizer(jla);
+ }
+ }
+ });
+@@ -158,11 +161,16 @@
+
+ /* Invoked by java.lang.Shutdown */
+ static void runAllFinalizers() {
++ if (!VM.isBooted()) {
++ return;
++ }
++
+ forkSecondaryFinalizer(new Runnable() {
+ private volatile boolean running;
+ public void run() {
+ if (running)
+ return;
++ final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
+ running = true;
+ for (;;) {
+ Finalizer f;
+@@ -171,7 +179,7 @@
+ if (f == null) break;
+ unfinalized = f.next;
+ }
+- f.runFinalizer();
++ f.runFinalizer(jla);
+ }}});
+ }
+
+@@ -183,13 +191,25 @@
+ public void run() {
+ if (running)
+ return;
++
++ // Finalizer thread starts before System.initializeSystemClass
++ // is called. Wait until JavaLangAccess is available
++ while (!VM.isBooted()) {
++ // delay until VM completes initialization
++ try {
++ VM.awaitBooted();
++ } catch (InterruptedException x) {
++ // ignore and continue
++ }
++ }
++ final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
+ running = true;
+ for (;;) {
+ try {
+ Finalizer f = (Finalizer)queue.remove();
+- f.runFinalizer();
++ f.runFinalizer(jla);
+ } catch (InterruptedException x) {
+- continue;
++ // ignore and continue
+ }
+ }
+ }
+--- ./jdk/src/share/classes/java/lang/reflect/Proxy.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/lang/reflect/Proxy.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 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,19 +25,15 @@
+
+ package java.lang.reflect;
+
+-import java.lang.ref.Reference;
+ import java.lang.ref.WeakReference;
++import java.lang.reflect.WeakCache.BiFunction;
+ import java.security.AccessController;
+ import java.security.Permission;
+ import java.security.PrivilegedAction;
+ import java.util.Arrays;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.HashSet;
++import java.util.IdentityHashMap;
+ import java.util.Map;
+-import java.util.Set;
+-import java.util.List;
+-import java.util.WeakHashMap;
++import java.util.concurrent.atomic.AtomicLong;
+ import sun.misc.ProxyGenerator;
+ import sun.reflect.CallerSensitive;
+ import sun.reflect.Reflection;
+@@ -230,27 +226,15 @@
+
+ private static final long serialVersionUID = -2222568056686623797L;
+
+- /** prefix for all proxy class names */
+- private final static String proxyClassNamePrefix = "$Proxy";
+-
+ /** parameter types of a proxy class constructor */
+- private final static Class[] constructorParams =
++ private static final Class<?>[] constructorParams =
+ { InvocationHandler.class };
+
+- /** maps a class loader to the proxy class cache for that loader */
+- private static Map<ClassLoader, Map<List<String>, Object>> loaderToCache
+- = new WeakHashMap<>();
+-
+- /** marks that a particular proxy class is currently being generated */
+- private static Object pendingGenerationMarker = new Object();
+-
+- /** next number to use for generation of unique proxy class names */
+- private static long nextUniqueNumber = 0;
+- private static Object nextUniqueNumberLock = new Object();
+-
+- /** set of all generated proxy classes, for isProxyClass implementation */
+- private static Map<Class<?>, Void> proxyClasses =
+- Collections.synchronizedMap(new WeakHashMap<Class<?>, Void>());
++ /**
++ * a cache of proxy classes
++ */
++ private static final WeakCache<ClassLoader, Class<?>[], Class<?>>
++ proxyClassCache = new WeakCache<>(new KeyFactory(), new ProxyClassFactory());
+
+ /**
+ * the invocation handler for this proxy instance.
+@@ -464,131 +448,190 @@
+ throw new IllegalArgumentException("interface limit exceeded");
+ }
+
+- Class<?> proxyClass = null;
++ // If the proxy class defined by the given loader implementing
++ // the given interfaces exists, this will simply return the cached copy;
++ // otherwise, it will create the proxy class via the ProxyClassFactory
++ return proxyClassCache.get(loader, interfaces);
++ }
+
+- /* collect interface names to use as key for proxy class cache */
+- String[] interfaceNames = new String[interfaces.length];
++ /*
++ * a key used for proxy class with 0 implemented interfaces
++ */
++ private static final Object key0 = new Object();
+
+- // for detecting duplicates
+- Set<Class<?>> interfaceSet = new HashSet<>();
++ /*
++ * Key1 and Key2 are optimized for the common use of dynamic proxies
++ * that implement 1 or 2 interfaces.
++ */
+
+- for (int i = 0; i < interfaces.length; i++) {
+- /*
+- * Verify that the class loader resolves the name of this
+- * interface to the same Class object.
+- */
+- String interfaceName = interfaces[i].getName();
+- Class<?> interfaceClass = null;
+- try {
+- interfaceClass = Class.forName(interfaceName, false, loader);
+- } catch (ClassNotFoundException e) {
++ /*
++ * a key used for proxy class with 1 implemented interface
++ */
++ private static final class Key1 extends WeakReference<Class<?>> {
++ private final int hash;
++
++ Key1(Class<?> intf) {
++ super(intf);
++ this.hash = intf.hashCode();
++ }
++
++ @Override
++ public int hashCode() {
++ return hash;
++ }
++
++ @Override
++ public boolean equals(Object obj) {
++ Class<?> intf;
++ return this == obj ||
++ obj != null &&
++ obj.getClass() == Key1.class &&
++ (intf = get()) != null &&
++ intf == ((Key1) obj).get();
++ }
++ }
++
++ /*
++ * a key used for proxy class with 2 implemented interfaces
++ */
++ private static final class Key2 extends WeakReference<Class<?>> {
++ private final int hash;
++ private final WeakReference<Class<?>> ref2;
++
++ Key2(Class<?> intf1, Class<?> intf2) {
++ super(intf1);
++ hash = 31 * intf1.hashCode() + intf2.hashCode();
++ ref2 = new WeakReference<Class<?>>(intf2);
++ }
++
++ @Override
++ public int hashCode() {
++ return hash;
++ }
++
++ @Override
++ public boolean equals(Object obj) {
++ Class<?> intf1, intf2;
++ return this == obj ||
++ obj != null &&
++ obj.getClass() == Key2.class &&
++ (intf1 = get()) != null &&
++ intf1 == ((Key2) obj).get() &&
++ (intf2 = ref2.get()) != null &&
++ intf2 == ((Key2) obj).ref2.get();
++ }
++ }
++
++ /*
++ * a key used for proxy class with any number of implemented interfaces
++ * (used here for 3 or more only)
++ */
++ private static final class KeyX {
++ private final int hash;
++ private final WeakReference<Class<?>>[] refs;
++
++ KeyX(Class<?>[] interfaces) {
++ hash = Arrays.hashCode(interfaces);
++ refs = new WeakReference[interfaces.length];
++ for (int i = 0; i < interfaces.length; i++) {
++ refs[i] = new WeakReference(interfaces[i]);
+ }
+- if (interfaceClass != interfaces[i]) {
+- throw new IllegalArgumentException(
+- interfaces[i] + " is not visible from class loader");
++ }
++
++ @Override
++ public int hashCode() {
++ return hash;
++ }
++
++ @Override
++ public boolean equals(Object obj) {
++ return this == obj ||
++ obj != null &&
++ obj.getClass() == KeyX.class &&
++ equals(refs, ((KeyX) obj).refs);
++ }
++
++ private static boolean equals(WeakReference<Class<?>>[] refs1,
++ WeakReference<Class<?>>[] refs2) {
++ if (refs1.length != refs2.length) {
++ return false;
++ }
++ for (int i = 0; i < refs1.length; i++) {
++ Class<?> intf = refs1[i].get();
++ if (intf == null || intf != refs2[i].get()) {
++ return false;
++ }
++ }
++ return true;
++ }
++ }
++
++ /**
++ * A function that maps an array of interfaces to an optimal key where
++ * Class objects representing interfaces are weakly referenced.
++ */
++ private static final class KeyFactory
++ implements BiFunction<ClassLoader, Class<?>[], Object>
++ {
++ @Override
++ public Object apply(ClassLoader classLoader, Class<?>[] interfaces) {
++ switch (interfaces.length) {
++ case 1: return new Key1(interfaces[0]); // the most frequent
++ case 2: return new Key2(interfaces[0], interfaces[1]);
++ case 0: return key0;
++ default: return new KeyX(interfaces);
++ }
++ }
++ }
++
++ /**
++ * A factory function that generates, defines and returns the proxy class given
++ * the ClassLoader and array of interfaces.
++ */
++ private static final class ProxyClassFactory
++ implements BiFunction<ClassLoader, Class<?>[], Class<?>>
++ {
++ // prefix for all proxy class names
++ private static final String proxyClassNamePrefix = "$Proxy";
++
++ // next number to use for generation of unique proxy class names
++ private static final AtomicLong nextUniqueNumber = new AtomicLong();
++
++ @Override
++ public Class<?> apply(ClassLoader loader, Class<?>[] interfaces) {
++
++ Map<Class<?>, Boolean> interfaceSet = new IdentityHashMap<>(interfaces.length);
++ for (Class<?> intf : interfaces) {
++ /*
++ * Verify that the class loader resolves the name of this
++ * interface to the same Class object.
++ */
++ Class<?> interfaceClass = null;
++ try {
++ interfaceClass = Class.forName(intf.getName(), false, loader);
++ } catch (ClassNotFoundException e) {
++ }
++ if (interfaceClass != intf) {
++ throw new IllegalArgumentException(
++ intf + " is not visible from class loader");
++ }
++ /*
++ * Verify that the Class object actually represents an
++ * interface.
++ */
++ if (!interfaceClass.isInterface()) {
++ throw new IllegalArgumentException(
++ interfaceClass.getName() + " is not an interface");
++ }
++ /*
++ * Verify that this interface is not a duplicate.
++ */
++ if (interfaceSet.put(interfaceClass, Boolean.TRUE) != null) {
++ throw new IllegalArgumentException(
++ "repeated interface: " + interfaceClass.getName());
++ }
+ }
+
+- /*
+- * Verify that the Class object actually represents an
+- * interface.
+- */
+- if (!interfaceClass.isInterface()) {
+- throw new IllegalArgumentException(
+- interfaceClass.getName() + " is not an interface");
+- }
+-
+- /*
+- * Verify that this interface is not a duplicate.
+- */
+- if (interfaceSet.contains(interfaceClass)) {
+- throw new IllegalArgumentException(
+- "repeated interface: " + interfaceClass.getName());
+- }
+- interfaceSet.add(interfaceClass);
+-
+- interfaceNames[i] = interfaceName;
+- }
+-
+- /*
+- * Using string representations of the proxy interfaces as
+- * keys in the proxy class cache (instead of their Class
+- * objects) is sufficient because we require the proxy
+- * interfaces to be resolvable by name through the supplied
+- * class loader, and it has the advantage that using a string
+- * representation of a class makes for an implicit weak
+- * reference to the class.
+- */
+- List<String> key = Arrays.asList(interfaceNames);
+-
+- /*
+- * Find or create the proxy class cache for the class loader.
+- */
+- Map<List<String>, Object> cache;
+- synchronized (loaderToCache) {
+- cache = loaderToCache.get(loader);
+- if (cache == null) {
+- cache = new HashMap<>();
+- loaderToCache.put(loader, cache);
+- }
+- /*
+- * This mapping will remain valid for the duration of this
+- * method, without further synchronization, because the mapping
+- * will only be removed if the class loader becomes unreachable.
+- */
+- }
+-
+- /*
+- * Look up the list of interfaces in the proxy class cache using
+- * the key. This lookup will result in one of three possible
+- * kinds of values:
+- * null, if there is currently no proxy class for the list of
+- * interfaces in the class loader,
+- * the pendingGenerationMarker object, if a proxy class for the
+- * list of interfaces is currently being generated,
+- * or a weak reference to a Class object, if a proxy class for
+- * the list of interfaces has already been generated.
+- */
+- synchronized (cache) {
+- /*
+- * Note that we need not worry about reaping the cache for
+- * entries with cleared weak references because if a proxy class
+- * has been garbage collected, its class loader will have been
+- * garbage collected as well, so the entire cache will be reaped
+- * from the loaderToCache map.
+- */
+- do {
+- Object value = cache.get(key);
+- if (value instanceof Reference) {
+- proxyClass = (Class<?>) ((Reference) value).get();
+- }
+- if (proxyClass != null) {
+- // proxy class already generated: return it
+- return proxyClass;
+- } else if (value == pendingGenerationMarker) {
+- // proxy class being generated: wait for it
+- try {
+- cache.wait();
+- } catch (InterruptedException e) {
+- /*
+- * The class generation that we are waiting for should
+- * take a small, bounded time, so we can safely ignore
+- * thread interrupts here.
+- */
+- }
+- continue;
+- } else {
+- /*
+- * No proxy class for this list of interfaces has been
+- * generated or is being generated, so we will go and
+- * generate it now. Mark it as pending generation.
+- */
+- cache.put(key, pendingGenerationMarker);
+- break;
+- }
+- } while (true);
+- }
+-
+- try {
+ String proxyPkg = null; // package to define proxy class in
+
+ /*
+@@ -596,10 +639,10 @@
+ * proxy class will be defined in the same package. Verify that
+ * all non-public proxy interfaces are in the same package.
+ */
+- for (int i = 0; i < interfaces.length; i++) {
+- int flags = interfaces[i].getModifiers();
++ for (Class<?> intf : interfaces) {
++ int flags = intf.getModifiers();
+ if (!Modifier.isPublic(flags)) {
+- String name = interfaces[i].getName();
++ String name = intf.getName();
+ int n = name.lastIndexOf('.');
+ String pkg = ((n == -1) ? "" : name.substring(0, n + 1));
+ if (proxyPkg == null) {
+@@ -616,60 +659,31 @@
+ proxyPkg = ReflectUtil.PROXY_PACKAGE + ".";
+ }
+
+- {
++ /*
++ * Choose a name for the proxy class to generate.
++ */
++ long num = nextUniqueNumber.getAndIncrement();
++ String proxyName = proxyPkg + proxyClassNamePrefix + num;
++
++ /*
++ * Generate the specified proxy class.
++ */
++ byte[] proxyClassFile = ProxyGenerator.generateProxyClass(
++ proxyName, interfaces);
++ try {
++ return defineClass0(loader, proxyName,
++ proxyClassFile, 0, proxyClassFile.length);
++ } catch (ClassFormatError e) {
+ /*
+- * Choose a name for the proxy class to generate.
++ * A ClassFormatError here means that (barring bugs in the
++ * proxy class generation code) there was some other
++ * invalid aspect of the arguments supplied to the proxy
++ * class creation (such as virtual machine limitations
++ * exceeded).
+ */
+- long num;
+- synchronized (nextUniqueNumberLock) {
+- num = nextUniqueNumber++;
+- }
+- String proxyName = proxyPkg + proxyClassNamePrefix + num;
+- /*
+- * Verify that the class loader hasn't already
+- * defined a class with the chosen name.
+- */
+-
+- /*
+- * Generate the specified proxy class.
+- */
+- byte[] proxyClassFile = ProxyGenerator.generateProxyClass(
+- proxyName, interfaces);
+- try {
+- proxyClass = defineClass0(loader, proxyName,
+- proxyClassFile, 0, proxyClassFile.length);
+- } catch (ClassFormatError e) {
+- /*
+- * A ClassFormatError here means that (barring bugs in the
+- * proxy class generation code) there was some other
+- * invalid aspect of the arguments supplied to the proxy
+- * class creation (such as virtual machine limitations
+- * exceeded).
+- */
+- throw new IllegalArgumentException(e.toString());
+- }
+- }
+- // add to set of all generated proxy classes, for isProxyClass
+- proxyClasses.put(proxyClass, null);
+-
+- } finally {
+- /*
+- * We must clean up the "pending generation" state of the proxy
+- * class cache entry somehow. If a proxy class was successfully
+- * generated, store it in the cache (with a weak reference);
+- * otherwise, remove the reserved entry. In all cases, notify
+- * all waiters on reserved entries in this cache.
+- */
+- synchronized (cache) {
+- if (proxyClass != null) {
+- cache.put(key, new WeakReference<Class<?>>(proxyClass));
+- } else {
+- cache.remove(key);
+- }
+- cache.notifyAll();
++ throw new IllegalArgumentException(e.toString());
+ }
+ }
+- return proxyClass;
+ }
+
+ /**
+@@ -773,11 +787,7 @@
+ * @throws NullPointerException if {@code cl} is {@code null}
+ */
+ public static boolean isProxyClass(Class<?> cl) {
+- if (cl == null) {
+- throw new NullPointerException();
+- }
+-
+- return proxyClasses.containsKey(cl);
++ return Proxy.class.isAssignableFrom(cl) && proxyClassCache.containsValue(cl);
+ }
+
+ /**
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/java/lang/reflect/WeakCache.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,393 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package java.lang.reflect;
++
++import java.lang.ref.ReferenceQueue;
++import java.lang.ref.WeakReference;
++import java.util.Objects;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
++
++/**
++ * Cache mapping pairs of {@code (key, sub-key) -> value}. Keys and values are
++ * weakly but sub-keys are strongly referenced. Keys are passed directly to
++ * {@link #get} method which also takes a {@code parameter}. Sub-keys are
++ * calculated from keys and parameters using the {@code subKeyFactory} function
++ * passed to the constructor. Values are calculated from keys and parameters
++ * using the {@code valueFactory} function passed to the constructor.
++ * Keys can be {@code null} and are compared by identity while sub-keys returned by
++ * {@code subKeyFactory} or values returned by {@code valueFactory}
++ * can not be null. Sub-keys are compared using their {@link #equals} method.
++ * Entries are expunged from cache lazily on each invocation to {@link #get},
++ * {@link #containsValue} or {@link #size} methods when the WeakReferences to
++ * keys are cleared. Cleared WeakReferences to individual values don't cause
++ * expunging, but such entries are logically treated as non-existent and
++ * trigger re-evaluation of {@code valueFactory} on request for their
++ * key/subKey.
++ *
++ * @author Peter Levart
++ * @param <K> type of keys
++ * @param <P> type of parameters
++ * @param <V> type of values
++ */
++final class WeakCache<K, P, V> {
++
++ interface BiFunction<T, U, R> {
++
++ /**
++ * Applies this function to the given arguments.
++ *
++ * @param t the first function argument
++ * @param u the second function argument
++ * @return the function result
++ */
++ R apply(T t, U u);
++ }
++
++ interface Supplier<T> {
++ T get();
++ }
++
++ private final ReferenceQueue<K> refQueue
++ = new ReferenceQueue<>();
++ // the key type is Object for supporting null key
++ private final ConcurrentMap<Object, ConcurrentMap<Object, Supplier<V>>> map
++ = new ConcurrentHashMap<>();
++ private final ConcurrentMap<Supplier<V>, Boolean> reverseMap
++ = new ConcurrentHashMap<>();
++ private final BiFunction<K, P, ?> subKeyFactory;
++ private final BiFunction<K, P, V> valueFactory;
++
++ /**
++ * Construct an instance of {@code WeakCache}
++ *
++ * @param subKeyFactory a function mapping a pair of
++ * {@code (key, parameter) -> sub-key}
++ * @param valueFactory a function mapping a pair of
++ * {@code (key, parameter) -> value}
++ * @throws NullPointerException if {@code subKeyFactory} or
++ * {@code valueFactory} is null.
++ */
++ public WeakCache(BiFunction<K, P, ?> subKeyFactory,
++ BiFunction<K, P, V> valueFactory) {
++ this.subKeyFactory = Objects.requireNonNull(subKeyFactory);
++ this.valueFactory = Objects.requireNonNull(valueFactory);
++ }
++
++ /**
++ * Look-up the value through the cache. This always evaluates the
++ * {@code subKeyFactory} function and optionally evaluates
++ * {@code valueFactory} function if there is no entry in the cache for given
++ * pair of (key, subKey) or the entry has already been cleared.
++ *
++ * @param key possibly null key
++ * @param parameter parameter used together with key to create sub-key and
++ * value (should not be null)
++ * @return the cached value (never null)
++ * @throws NullPointerException if {@code parameter} passed in or
++ * {@code sub-key} calculated by
++ * {@code subKeyFactory} or {@code value}
++ * calculated by {@code valueFactory} is null.
++ */
++ public V get(K key, P parameter) {
++ Objects.requireNonNull(parameter);
++
++ expungeStaleEntries();
++
++ Object cacheKey = CacheKey.valueOf(key, refQueue);
++
++ // lazily install the 2nd level valuesMap for the particular cacheKey
++ ConcurrentMap<Object, Supplier<V>> valuesMap = map.get(cacheKey);
++ if (valuesMap == null) {
++ ConcurrentMap<Object, Supplier<V>> oldValuesMap
++ = map.putIfAbsent(cacheKey,
++ valuesMap = new ConcurrentHashMap<>());
++ if (oldValuesMap != null) {
++ valuesMap = oldValuesMap;
++ }
++ }
++
++ // create subKey and retrieve the possible Supplier<V> stored by that
++ // subKey from valuesMap
++ Object subKey = Objects.requireNonNull(subKeyFactory.apply(key, parameter));
++ Supplier<V> supplier = valuesMap.get(subKey);
++ Factory factory = null;
++
++ while (true) {
++ if (supplier != null) {
++ // supplier might be a Factory or a CacheValue<V> instance
++ V value = supplier.get();
++ if (value != null) {
++ return value;
++ }
++ }
++ // else no supplier in cache
++ // or a supplier that returned null (could be a cleared CacheValue
++ // or a Factory that wasn't successful in installing the CacheValue)
++
++ // lazily construct a Factory
++ if (factory == null) {
++ factory = new Factory(key, parameter, subKey, valuesMap);
++ }
++
++ if (supplier == null) {
++ supplier = valuesMap.putIfAbsent(subKey, factory);
++ if (supplier == null) {
++ // successfully installed Factory
++ supplier = factory;
++ }
++ // else retry with winning supplier
++ } else {
++ if (valuesMap.replace(subKey, supplier, factory)) {
++ // successfully replaced
++ // cleared CacheEntry / unsuccessful Factory
++ // with our Factory
++ supplier = factory;
++ } else {
++ // retry with current supplier
++ supplier = valuesMap.get(subKey);
++ }
++ }
++ }
++ }
++
++ /**
++ * Checks whether the specified non-null value is already present in this
++ * {@code WeakCache}. The check is made using identity comparison regardless
++ * of whether value's class overrides {@link Object#equals} or not.
++ *
++ * @param value the non-null value to check
++ * @return true if given {@code value} is already cached
++ * @throws NullPointerException if value is null
++ */
++ public boolean containsValue(V value) {
++ Objects.requireNonNull(value);
++
++ expungeStaleEntries();
++ return reverseMap.containsKey(new LookupValue<>(value));
++ }
++
++ /**
++ * Returns the current number of cached entries that
++ * can decrease over time when keys/values are GC-ed.
++ */
++ public int size() {
++ expungeStaleEntries();
++ return reverseMap.size();
++ }
++
++ private void expungeStaleEntries() {
++ CacheKey<K> cacheKey;
++ while ((cacheKey = (CacheKey<K>)refQueue.poll()) != null) {
++ cacheKey.expungeFrom(map, reverseMap);
++ }
++ }
++
++ /**
++ * A factory {@link Supplier} that implements the lazy synchronized
++ * construction of the value and installment of it into the cache.
++ */
++ private final class Factory implements Supplier<V> {
++
++ private final K key;
++ private final P parameter;
++ private final Object subKey;
++ private final ConcurrentMap<Object, Supplier<V>> valuesMap;
++
++ Factory(K key, P parameter, Object subKey,
++ ConcurrentMap<Object, Supplier<V>> valuesMap) {
++ this.key = key;
++ this.parameter = parameter;
++ this.subKey = subKey;
++ this.valuesMap = valuesMap;
++ }
++
++ @Override
++ public synchronized V get() { // serialize access
++ // re-check
++ Supplier<V> supplier = valuesMap.get(subKey);
++ if (supplier != this) {
++ // something changed while we were waiting:
++ // might be that we were replaced by a CacheValue
++ // or were removed because of failure ->
++ // return null to signal WeakCache.get() to retry
++ // the loop
++ return null;
++ }
++ // else still us (supplier == this)
++
++ // create new value
++ V value = null;
++ try {
++ value = Objects.requireNonNull(valueFactory.apply(key, parameter));
++ } finally {
++ if (value == null) { // remove us on failure
++ valuesMap.remove(subKey, this);
++ }
++ }
++ // the only path to reach here is with non-null value
++ assert value != null;
++
++ // wrap value with CacheValue (WeakReference)
++ CacheValue<V> cacheValue = new CacheValue<>(value);
++
++ // try replacing us with CacheValue (this should always succeed)
++ if (valuesMap.replace(subKey, this, cacheValue)) {
++ // put also in reverseMap
++ reverseMap.put(cacheValue, Boolean.TRUE);
++ } else {
++ throw new AssertionError("Should not reach here");
++ }
++
++ // successfully replaced us with new CacheValue -> return the value
++ // wrapped by it
++ return value;
++ }
++ }
++
++ /**
++ * Common type of value suppliers that are holding a referent.
++ * The {@link #equals} and {@link #hashCode} of implementations is defined
++ * to compare the referent by identity.
++ */
++ private interface Value<V> extends Supplier<V> {}
++
++ /**
++ * An optimized {@link Value} used to look-up the value in
++ * {@link WeakCache#containsValue} method so that we are not
++ * constructing the whole {@link CacheValue} just to look-up the referent.
++ */
++ private static final class LookupValue<V> implements Value<V> {
++ private final V value;
++
++ LookupValue(V value) {
++ this.value = value;
++ }
++
++ @Override
++ public V get() {
++ return value;
++ }
++
++ @Override
++ public int hashCode() {
++ return System.identityHashCode(value); // compare by identity
++ }
++
++ @Override
++ public boolean equals(Object obj) {
++ return obj == this ||
++ obj instanceof Value &&
++ this.value == ((Value<?>) obj).get(); // compare by identity
++ }
++ }
++
++ /**
++ * A {@link Value} that weakly references the referent.
++ */
++ private static final class CacheValue<V>
++ extends WeakReference<V> implements Value<V>
++ {
++ private final int hash;
++
++ CacheValue(V value) {
++ super(value);
++ this.hash = System.identityHashCode(value); // compare by identity
++ }
++
++ @Override
++ public int hashCode() {
++ return hash;
++ }
++
++ @Override
++ public boolean equals(Object obj) {
++ V value;
++ return obj == this ||
++ obj instanceof Value &&
++ // cleared CacheValue is only equal to itself
++ (value = get()) != null &&
++ value == ((Value<?>) obj).get(); // compare by identity
++ }
++ }
++
++ /**
++ * CacheKey containing a weakly referenced {@code key}. It registers
++ * itself with the {@code refQueue} so that it can be used to expunge
++ * the entry when the {@link WeakReference} is cleared.
++ */
++ private static final class CacheKey<K> extends WeakReference<K> {
++
++ // a replacement for null keys
++ private static final Object NULL_KEY = new Object();
++
++ static <K> Object valueOf(K key, ReferenceQueue<K> refQueue) {
++ return key == null
++ // null key means we can't weakly reference it,
++ // so we use a NULL_KEY singleton as cache key
++ ? NULL_KEY
++ // non-null key requires wrapping with a WeakReference
++ : new CacheKey<>(key, refQueue);
++ }
++
++ private final int hash;
++
++ private CacheKey(K key, ReferenceQueue<K> refQueue) {
++ super(key, refQueue);
++ this.hash = System.identityHashCode(key); // compare by identity
++ }
++
++ @Override
++ public int hashCode() {
++ return hash;
++ }
++
++ @Override
++ public boolean equals(Object obj) {
++ K key;
++ return obj == this ||
++ obj != null &&
++ obj.getClass() == this.getClass() &&
++ // cleared CacheKey is only equal to itself
++ (key = this.get()) != null &&
++ // compare key by identity
++ key == ((CacheKey<K>) obj).get();
++ }
++
++ void expungeFrom(ConcurrentMap<?, ? extends ConcurrentMap<?, ?>> map,
++ ConcurrentMap<?, Boolean> reverseMap) {
++ // removing just by key is always safe here because after a CacheKey
++ // is cleared and enqueue-ed it is only equal to itself
++ // (see equals method)...
++ ConcurrentMap<?, ?> valuesMap = map.remove(this);
++ // remove also from reverseMap if needed
++ if (valuesMap != null) {
++ for (Object cacheValue : valuesMap.values()) {
++ reverseMap.remove(cacheValue);
++ }
++ }
++ }
++ }
++}
+--- ./jdk/src/share/classes/java/net/IDN.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/net/IDN.java Wed May 07 19:26:47 2014 -0700
+@@ -271,13 +271,17 @@
+ if (useSTD3ASCIIRules) {
+ for (int i = 0; i < dest.length(); i++) {
+ int c = dest.charAt(i);
+- if (!isLDHChar(c)) {
+- throw new IllegalArgumentException("Contains non-LDH characters");
++ if (isNonLDHAsciiCodePoint(c)) {
++ throw new IllegalArgumentException(
++ "Contains non-LDH ASCII characters");
+ }
+ }
+
+- if (dest.charAt(0) == '-' || dest.charAt(dest.length() - 1) == '-') {
+- throw new IllegalArgumentException("Has leading or trailing hyphen");
++ if (dest.charAt(0) == '-' ||
++ dest.charAt(dest.length() - 1) == '-') {
++
++ throw new IllegalArgumentException(
++ "Has leading or trailing hyphen");
+ }
+ }
+
+@@ -380,26 +384,20 @@
+ //
+ // LDH stands for "letter/digit/hyphen", with characters restricted to the
+ // 26-letter Latin alphabet <A-Z a-z>, the digits <0-9>, and the hyphen
+- // <->
+- // non-LDH = 0..0x2C, 0x2E..0x2F, 0x3A..0x40, 0x56..0x60, 0x7B..0x7F
++ // <->.
++ // Non LDH refers to characters in the ASCII range, but which are not
++ // letters, digits or the hypen.
+ //
+- private static boolean isLDHChar(int ch){
+- // high runner case
+- if(ch > 0x007A){
+- return false;
+- }
+- //['-' '0'..'9' 'A'..'Z' 'a'..'z']
+- if((ch == 0x002D) ||
+- (0x0030 <= ch && ch <= 0x0039) ||
+- (0x0041 <= ch && ch <= 0x005A) ||
+- (0x0061 <= ch && ch <= 0x007A)
+- ){
+- return true;
+- }
+- return false;
++ // non-LDH = 0..0x2C, 0x2E..0x2F, 0x3A..0x40, 0x5B..0x60, 0x7B..0x7F
++ //
++ private static boolean isNonLDHAsciiCodePoint(int ch){
++ return (0x0000 <= ch && ch <= 0x002C) ||
++ (0x002E <= ch && ch <= 0x002F) ||
++ (0x003A <= ch && ch <= 0x0040) ||
++ (0x005B <= ch && ch <= 0x0060) ||
++ (0x007B <= ch && ch <= 0x007F);
+ }
+
+-
+ //
+ // search dots in a string and return the index of that character;
+ // or if there is no dots, return the length of input string
+--- ./jdk/src/share/classes/java/nio/charset/Charset.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/nio/charset/Charset.java Wed May 07 19:26:47 2014 -0700
+@@ -426,39 +426,32 @@
+ }
+
+ /* The extended set of charsets */
+- private static Object extendedProviderLock = new Object();
+- private static boolean extendedProviderProbed = false;
+- private static CharsetProvider extendedProvider = null;
+-
+- private static void probeExtendedProvider() {
+- AccessController.doPrivileged(new PrivilegedAction<Object>() {
+- public Object run() {
+- try {
+- Class epc
+- = Class.forName("sun.nio.cs.ext.ExtendedCharsets");
+- extendedProvider = (CharsetProvider)epc.newInstance();
+- } catch (ClassNotFoundException x) {
+- // Extended charsets not available
+- // (charsets.jar not present)
+- } catch (InstantiationException x) {
+- throw new Error(x);
+- } catch (IllegalAccessException x) {
+- throw new Error(x);
+- }
+- return null;
+- }
+- });
++ private static class ExtendedProviderHolder {
++ static final CharsetProvider extendedProvider = extendedProvider();
++ // returns ExtendedProvider, if installed
++ private static CharsetProvider extendedProvider() {
++ return AccessController.doPrivileged(
++ new PrivilegedAction<CharsetProvider>() {
++ public CharsetProvider run() {
++ try {
++ Class<?> epc
++ = Class.forName("sun.nio.cs.ext.ExtendedCharsets");
++ return (CharsetProvider)epc.newInstance();
++ } catch (ClassNotFoundException x) {
++ // Extended charsets not available
++ // (charsets.jar not present)
++ } catch (InstantiationException |
++ IllegalAccessException x) {
++ throw new Error(x);
++ }
++ return null;
++ }
++ });
++ }
+ }
+
+ private static Charset lookupExtendedCharset(String charsetName) {
+- CharsetProvider ecp = null;
+- synchronized (extendedProviderLock) {
+- if (!extendedProviderProbed) {
+- probeExtendedProvider();
+- extendedProviderProbed = true;
+- }
+- ecp = extendedProvider;
+- }
++ CharsetProvider ecp = ExtendedProviderHolder.extendedProvider;
+ return (ecp != null) ? ecp.charsetForName(charsetName) : null;
+ }
+
+@@ -588,6 +581,9 @@
+ new TreeMap<String,Charset>(
+ ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER);
+ put(standardProvider.charsets(), m);
++ CharsetProvider ecp = ExtendedProviderHolder.extendedProvider;
++ if (ecp != null)
++ put(ecp.charsets(), m);
+ for (Iterator i = providers(); i.hasNext();) {
+ CharsetProvider cp = (CharsetProvider)i.next();
+ put(cp.charsets(), m);
+--- ./jdk/src/share/classes/java/nio/file/Files.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/nio/file/Files.java Wed May 07 19:26:47 2014 -0700
+@@ -28,6 +28,8 @@
+ import java.nio.file.attribute.*;
+ import java.nio.file.spi.FileSystemProvider;
+ import java.nio.file.spi.FileTypeDetector;
++import java.nio.channels.Channels;
++import java.nio.channels.FileChannel;
+ import java.nio.channels.SeekableByteChannel;
+ import java.io.InputStream;
+ import java.io.OutputStream;
+@@ -2896,41 +2898,63 @@
+ }
+
+ /**
+- * Read all the bytes from an input stream. The {@code initialSize}
+- * parameter indicates the initial size of the byte[] to allocate.
++ * The maximum size of array to allocate.
++ * Some VMs reserve some header words in an array.
++ * Attempts to allocate larger arrays may result in
++ * OutOfMemoryError: Requested array size exceeds VM limit
++ */
++ private static final int MAX_BUFFER_SIZE = Integer.MAX_VALUE - 8;
++
++ /**
++ * Reads all the bytes from an input stream. Uses {@code initialSize} as a hint
++ * about how many bytes the stream will have.
++ *
++ * @param source
++ * the input stream to read from
++ * @param initialSize
++ * the initial size of the byte array to allocate
++ *
++ * @return a byte array containing the bytes read from the file
++ *
++ * @throws IOException
++ * if an I/O error occurs reading from the stream
++ * @throws OutOfMemoryError
++ * if an array of the required size cannot be allocated
+ */
+ private static byte[] read(InputStream source, int initialSize)
+- throws IOException
++ throws IOException
+ {
+ int capacity = initialSize;
+ byte[] buf = new byte[capacity];
+ int nread = 0;
+- int rem = buf.length;
+ int n;
+- // read to EOF which may read more or less than initialSize (eg: file
+- // is truncated while we are reading)
+- while ((n = source.read(buf, nread, rem)) > 0) {
+- nread += n;
+- rem -= n;
+- assert rem >= 0;
+- if (rem == 0) {
+- // need larger buffer
+- int newCapacity = capacity << 1;
+- if (newCapacity < 0) {
+- if (capacity == Integer.MAX_VALUE)
+- throw new OutOfMemoryError("Required array size too large");
+- newCapacity = Integer.MAX_VALUE;
+- }
+- rem = newCapacity - capacity;
+- buf = Arrays.copyOf(buf, newCapacity);
+- capacity = newCapacity;
++ for (;;) {
++ // read to EOF which may read more or less than initialSize (eg: file
++ // is truncated while we are reading)
++ while ((n = source.read(buf, nread, capacity - nread)) > 0)
++ nread += n;
++
++ // if last call to source.read() returned -1, we are done
++ // otherwise, try to read one more byte; if that failed we're done too
++ if (n < 0 || (n = source.read()) < 0)
++ break;
++
++ // one more byte was read; need to allocate a larger buffer
++ if (capacity <= MAX_BUFFER_SIZE - capacity) {
++ capacity = Math.max(capacity << 1, BUFFER_SIZE);
++ } else {
++ if (capacity == MAX_BUFFER_SIZE)
++ throw new OutOfMemoryError("Required array size too large");
++ capacity = MAX_BUFFER_SIZE;
+ }
++ buf = Arrays.copyOf(buf, capacity);
++ buf[nread++] = (byte)n;
+ }
+ return (capacity == nread) ? buf : Arrays.copyOf(buf, nread);
+ }
+
+ /**
+- * Read all the bytes from a file. The method ensures that the file is
++ * Reads all the bytes from a file. The method ensures that the file is
+ * closed when all bytes have been read or an I/O error, or other runtime
+ * exception, is thrown.
+ *
+@@ -2954,12 +2978,13 @@
+ * method is invoked to check read access to the file.
+ */
+ public static byte[] readAllBytes(Path path) throws IOException {
+- long size = size(path);
+- if (size > (long)Integer.MAX_VALUE)
+- throw new OutOfMemoryError("Required array size too large");
++ try (SeekableByteChannel sbc = Files.newByteChannel(path);
++ InputStream in = Channels.newInputStream(sbc)) {
++ long size = sbc.size();
++ if (size > (long)MAX_BUFFER_SIZE)
++ throw new OutOfMemoryError("Required array size too large");
+
+- try (InputStream in = newInputStream(path)) {
+- return read(in, (int)size);
++ return read(in, (int)size);
+ }
+ }
+
+--- ./jdk/src/share/classes/java/util/ComparableTimSort.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/util/ComparableTimSort.java Wed May 07 19:26:47 2014 -0700
+@@ -131,7 +131,7 @@
+ */
+ int stackLen = (len < 120 ? 5 :
+ len < 1542 ? 10 :
+- len < 119151 ? 19 : 40);
++ len < 119151 ? 24 : 40);
+ runBase = new int[stackLen];
+ runLen = new int[stackLen];
+ }
+--- ./jdk/src/share/classes/java/util/HashMap.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/util/HashMap.java Wed May 07 19:26:47 2014 -0700
+@@ -300,13 +300,9 @@
+
+ private static int roundUpToPowerOf2(int number) {
+ // assert number >= 0 : "number must be non-negative";
+- int rounded = number >= MAXIMUM_CAPACITY
++ return number >= MAXIMUM_CAPACITY
+ ? MAXIMUM_CAPACITY
+- : (rounded = Integer.highestOneBit(number)) != 0
+- ? (Integer.bitCount(number) > 1) ? rounded << 1 : rounded
+- : 1;
+-
+- return rounded;
++ : (number > 1) ? Integer.highestOneBit((number - 1) << 1) : 1;
+ }
+
+ /**
+--- ./jdk/src/share/classes/java/util/TimSort.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/util/TimSort.java Wed May 07 19:26:47 2014 -0700
+@@ -158,7 +158,7 @@
+ */
+ int stackLen = (len < 120 ? 5 :
+ len < 1542 ? 10 :
+- len < 119151 ? 19 : 40);
++ len < 119151 ? 24 : 40);
+ runBase = new int[stackLen];
+ runLen = new int[stackLen];
+ }
+--- ./jdk/src/share/classes/java/util/TimeZone.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/util/TimeZone.java Wed May 07 19:26:47 2014 -0700
+@@ -168,7 +168,7 @@
+ // TimeZone.setDefault maintains the compatible behavior of the AppContext-based
+ // default setting for untrusted code if allowSetDefault is true.
+ private static final boolean allowSetDefault = AccessController.doPrivileged(
+- new sun.security.action.GetPropertyAction("jdk.util.TimeZone.allowSetDefault")) != null;
++ new sun.security.action.GetPropertyAction("jdk.util.TimeZone.allowSetDefault")) != null;
+
+ /**
+ * Gets the time zone offset, for current date, modified in case of
+@@ -738,17 +738,16 @@
+ if (allowSetDefault) {
+ // JavaAWTAccess provides access implementation-private methods without using reflection.
+ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
+- if (javaAWTAccess == null) {
++ if (System.getSecurityManager() == null || javaAWTAccess == null) {
+ return mainAppContextDefault;
++ } else if (javaAWTAccess.isDisposed()) {
++ return null;
+ } else {
+- if (!javaAWTAccess.isDisposed()) {
+- TimeZone tz = (TimeZone)
+- javaAWTAccess.get(TimeZone.class);
+- if (tz == null && javaAWTAccess.isMainAppContext()) {
+- return mainAppContextDefault;
+- } else {
+- return tz;
+- }
++ TimeZone tz = (TimeZone) javaAWTAccess.get(TimeZone.class);
++ if (tz == null && javaAWTAccess.isMainAppContext()) {
++ return mainAppContextDefault;
++ } else {
++ return tz;
+ }
+ }
+ }
+@@ -770,14 +769,12 @@
+ if (allowSetDefault) {
+ // JavaAWTAccess provides access implementation-private methods without using reflection.
+ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
+- if (javaAWTAccess == null) {
++ if (System.getSecurityManager() == null || javaAWTAccess == null) {
+ mainAppContextDefault = tz;
+- } else {
+- if (!javaAWTAccess.isDisposed()) {
+- javaAWTAccess.put(TimeZone.class, tz);
+- if (javaAWTAccess.isMainAppContext()) {
+- mainAppContextDefault = null;
+- }
++ } else if (!javaAWTAccess.isDisposed()) {
++ javaAWTAccess.put(TimeZone.class, tz);
++ if (javaAWTAccess.isMainAppContext()) {
++ mainAppContextDefault = null;
+ }
+ }
+ }
+--- ./jdk/src/share/classes/java/util/jar/JarFile.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/util/jar/JarFile.java Wed May 07 19:26:47 2014 -0700
+@@ -38,6 +38,7 @@
+ import sun.security.action.GetPropertyAction;
+ import sun.security.util.ManifestEntryVerifier;
+ import sun.misc.SharedSecrets;
++import sun.security.util.SignatureFileVerifier;
+
+ /**
+ * The <code>JarFile</code> class is used to read the contents of a jar file
+@@ -329,11 +330,13 @@
+ String[] names = getMetaInfEntryNames();
+ if (names != null) {
+ for (int i = 0; i < names.length; i++) {
+- JarEntry e = getJarEntry(names[i]);
+- if (e == null) {
+- throw new JarException("corrupted jar file");
+- }
+- if (!e.isDirectory()) {
++ String uname = names[i].toUpperCase(Locale.ENGLISH);
++ if (MANIFEST_NAME.equals(uname)
++ || SignatureFileVerifier.isBlockOrSF(uname)) {
++ JarEntry e = getJarEntry(names[i]);
++ if (e == null) {
++ throw new JarException("corrupted jar file");
++ }
+ if (mev == null) {
+ mev = new ManifestEntryVerifier
+ (getManifestFromReference());
+--- ./jdk/src/share/classes/java/util/jar/JarVerifier.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/util/jar/JarVerifier.java Wed May 07 19:26:47 2014 -0700
+@@ -32,6 +32,7 @@
+ import java.security.cert.CertificateException;
+ import java.util.zip.ZipEntry;
+
++import sun.misc.JarIndex;
+ import sun.security.util.ManifestDigester;
+ import sun.security.util.ManifestEntryVerifier;
+ import sun.security.util.SignatureFileVerifier;
+@@ -139,13 +140,22 @@
+ return;
+ }
+
++ if (uname.equals(JarFile.MANIFEST_NAME) ||
++ uname.equals(JarIndex.INDEX_NAME)) {
++ return;
++ }
++
+ if (SignatureFileVerifier.isBlockOrSF(uname)) {
+ /* We parse only DSA, RSA or EC PKCS7 blocks. */
+ parsingBlockOrSF = true;
+ baos.reset();
+ mev.setEntry(null, je);
++ return;
+ }
+- return;
++
++ // If a META-INF entry is not MF or block or SF, they should
++ // be normal entries. According to 2 above, no more block or
++ // SF will appear. Let's doneWithMeta.
+ }
+ }
+
+--- ./jdk/src/share/classes/java/util/logging/Level.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/util/logging/Level.java Wed May 07 19:26:47 2014 -0700
+@@ -27,6 +27,7 @@
+ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.List;
++import java.util.Locale;
+ import java.util.Map;
+ import java.util.ResourceBundle;
+
+@@ -63,7 +64,7 @@
+ */
+
+ public class Level implements java.io.Serializable {
+- private static String defaultBundle = "sun.util.logging.resources.logging";
++ private static final String defaultBundle = "sun.util.logging.resources.logging";
+
+ /**
+ * @serial The non-localized name of the level.
+@@ -81,7 +82,8 @@
+ private final String resourceBundleName;
+
+ // localized level name
+- private String localizedLevelName;
++ private transient String localizedLevelName;
++ private transient Locale cachedLocale;
+
+ /**
+ * OFF is a special level that can be used to turn off logging.
+@@ -209,6 +211,7 @@
+ this.value = value;
+ this.resourceBundleName = resourceBundleName;
+ this.localizedLevelName = resourceBundleName == null ? name : null;
++ this.cachedLocale = null;
+ KnownLevel.add(this);
+ }
+
+@@ -250,17 +253,71 @@
+ return this.name;
+ }
+
+- final synchronized String getLocalizedLevelName() {
++ private String computeLocalizedLevelName(Locale newLocale) {
++ ResourceBundle rb = ResourceBundle.getBundle(resourceBundleName, newLocale);
++ final String localizedName = rb.getString(name);
++
++ final boolean isDefaultBundle = defaultBundle.equals(resourceBundleName);
++ if (!isDefaultBundle) return localizedName;
++
++ // This is a trick to determine whether the name has been translated
++ // or not. If it has not been translated, we need to use Locale.ROOT
++ // when calling toUpperCase().
++ final Locale rbLocale = rb.getLocale();
++ final Locale locale =
++ Locale.ROOT.equals(rbLocale)
++ || name.equals(localizedName.toUpperCase(Locale.ROOT))
++ ? Locale.ROOT : rbLocale;
++
++ // ALL CAPS in a resource bundle's message indicates no translation
++ // needed per Oracle translation guideline. To workaround this
++ // in Oracle JDK implementation, convert the localized level name
++ // to uppercase for compatibility reason.
++ return Locale.ROOT.equals(locale) ? name : localizedName.toUpperCase(locale);
++ }
++
++ // Avoid looking up the localizedLevelName twice if we already
++ // have it.
++ final String getCachedLocalizedLevelName() {
++
+ if (localizedLevelName != null) {
+- return localizedLevelName;
++ if (cachedLocale != null) {
++ if (cachedLocale.equals(Locale.getDefault())) {
++ // OK: our cached value was looked up with the same
++ // locale. We can use it.
++ return localizedLevelName;
++ }
++ }
+ }
+
++ if (resourceBundleName == null) {
++ // No resource bundle: just use the name.
++ return name;
++ }
++
++ // We need to compute the localized name.
++ // Either because it's the first time, or because our cached
++ // value is for a different locale. Just return null.
++ return null;
++ }
++
++ final synchronized String getLocalizedLevelName() {
++
++ // See if we have a cached localized name
++ final String cachedLocalizedName = getCachedLocalizedLevelName();
++ if (cachedLocalizedName != null) {
++ return cachedLocalizedName;
++ }
++
++ // No cached localized name or cache invalid.
++ // Need to compute the localized name.
++ final Locale newLocale = Locale.getDefault();
+ try {
+- ResourceBundle rb = ResourceBundle.getBundle(resourceBundleName);
+- localizedLevelName = rb.getString(name);
++ localizedLevelName = computeLocalizedLevelName(newLocale);
+ } catch (Exception ex) {
+ localizedLevelName = name;
+ }
++ cachedLocale = newLocale;
+ return localizedLevelName;
+ }
+
+@@ -318,6 +375,7 @@
+ *
+ * @return the non-localized name of the Level, for example "INFO".
+ */
++ @Override
+ public final String toString() {
+ return name;
+ }
+@@ -420,6 +478,7 @@
+ * Compare two objects for value equality.
+ * @return true if and only if the two objects have the same level value.
+ */
++ @Override
+ public boolean equals(Object ox) {
+ try {
+ Level lx = (Level)ox;
+@@ -433,6 +492,7 @@
+ * Generate a hashcode.
+ * @return a hashcode based on the level value
+ */
++ @Override
+ public int hashCode() {
+ return this.value;
+ }
+--- ./jdk/src/share/classes/java/util/logging/LogManager.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/util/logging/LogManager.java Wed May 07 19:26:47 2014 -0700
+@@ -149,7 +149,15 @@
+ // The global LogManager object
+ private static LogManager manager;
+
+- private Properties props = new Properties();
++ // 'props' is assigned within a lock but accessed without it.
++ // Declaring it volatile makes sure that another thread will not
++ // be able to see a partially constructed 'props' object.
++ // (seeing a partially constructed 'props' object can result in
++ // NPE being thrown in Hashtable.get(), because it leaves the door
++ // open for props.getProperties() to be called before the construcor
++ // of Hashtable is actually completed).
++ private volatile Properties props = new Properties();
++
+ private PropertyChangeSupport changes
+ = new PropertyChangeSupport(LogManager.class);
+ private final static Level defaultLevel = Level.INFO;
+@@ -540,7 +548,7 @@
+ if (logger == null) {
+ // Hashtable holds stale weak reference
+ // to a logger which has been GC-ed.
+- removeLogger(name);
++ ref.dispose();
+ }
+ return logger;
+ }
+@@ -627,7 +635,7 @@
+ // It's possible that the Logger was GC'ed after a
+ // drainLoggerRefQueueBounded() call so allow
+ // a new one to be registered.
+- removeLogger(name);
++ ref.dispose();
+ } else {
+ // We already have a registered logger with the given name.
+ return false;
+@@ -673,10 +681,10 @@
+ return true;
+ }
+
+- // note: all calls to removeLogger are synchronized on LogManager's
+- // intrinsic lock
+- void removeLogger(String name) {
+- namedLoggers.remove(name);
++ synchronized void removeLoggerRef(String name, LoggerWeakRef ref) {
++ if (namedLoggers.get(name) == ref) {
++ namedLoggers.remove(name);
++ }
+ }
+
+ synchronized Enumeration<String> getLoggerNames() {
+@@ -854,6 +862,7 @@
+ private String name; // for namedLoggers cleanup
+ private LogNode node; // for loggerRef cleanup
+ private WeakReference<Logger> parentRef; // for kids cleanup
++ private boolean disposed = false; // avoid calling dispose twice
+
+ LoggerWeakRef(Logger logger) {
+ super(logger, loggerRefQueue);
+@@ -863,14 +872,45 @@
+
+ // dispose of this LoggerWeakRef object
+ void dispose() {
+- if (node != null) {
+- // if we have a LogNode, then we were a named Logger
+- // so clear namedLoggers weak ref to us
+- node.context.removeLogger(name);
+- name = null; // clear our ref to the Logger's name
++ // Avoid calling dispose twice. When a Logger is gc'ed, its
++ // LoggerWeakRef will be enqueued.
++ // However, a new logger of the same name may be added (or looked
++ // up) before the queue is drained. When that happens, dispose()
++ // will be called by addLocalLogger() or findLogger().
++ // Later when the queue is drained, dispose() will be called again
++ // for the same LoggerWeakRef. Marking LoggerWeakRef as disposed
++ // avoids processing the data twice (even though the code should
++ // now be reentrant).
++ synchronized(this) {
++ // Note to maintainers:
++ // Be careful not to call any method that tries to acquire
++ // another lock from within this block - as this would surely
++ // lead to deadlocks, given that dispose() can be called by
++ // multiple threads, and from within different synchronized
++ // methods/blocks.
++ if (disposed) return;
++ disposed = true;
++ }
+
+- node.loggerRef = null; // clear LogNode's weak ref to us
+- node = null; // clear our ref to LogNode
++ final LogNode n = node;
++ if (n != null) {
++ // n.loggerRef can only be safely modified from within
++ // a lock on LoggerContext. removeLoggerRef is already
++ // synchronized on LoggerContext so calling
++ // n.context.removeLoggerRef from within this lock is safe.
++ synchronized (n.context) {
++ // if we have a LogNode, then we were a named Logger
++ // so clear namedLoggers weak ref to us
++ n.context.removeLoggerRef(name, this);
++ name = null; // clear our ref to the Logger's name
++
++ // LogNode may have been reused - so only clear
++ // LogNode.loggerRef if LogNode.loggerRef == this
++ if (n.loggerRef == this) {
++ n.loggerRef = null; // clear LogNode's weak ref to us
++ }
++ node = null; // clear our ref to LogNode
++ }
+ }
+
+ if (parentRef != null) {
+@@ -923,7 +963,7 @@
+ // - maximum: 10.9 ms
+ //
+ private final static int MAX_ITERATIONS = 400;
+- final synchronized void drainLoggerRefQueueBounded() {
++ final void drainLoggerRefQueueBounded() {
+ for (int i = 0; i < MAX_ITERATIONS; i++) {
+ if (loggerRefQueue == null) {
+ // haven't finished loading LogManager yet
+--- ./jdk/src/share/classes/java/util/logging/Logger.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/java/util/logging/Logger.java Wed May 07 19:26:47 2014 -0700
+@@ -174,7 +174,7 @@
+ public class Logger {
+ private static final Handler emptyHandlers[] = new Handler[0];
+ private static final int offValue = Level.OFF.intValue();
+- private LogManager manager;
++ private volatile LogManager manager;
+ private String name;
+ private final CopyOnWriteArrayList<Handler> handlers =
+ new CopyOnWriteArrayList<>();
+@@ -1573,6 +1573,9 @@
+ if (parent == null) {
+ throw new NullPointerException();
+ }
++ if (manager == null) {
++ manager = LogManager.getLogManager();
++ }
+ manager.checkPermission();
+ doSetParent(parent);
+ }
+--- ./jdk/src/share/classes/javax/management/MBeanAttributeInfo.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/MBeanAttributeInfo.java Wed May 07 19:26:47 2014 -0700
+@@ -30,6 +30,7 @@
+
+ import com.sun.jmx.mbeanserver.GetPropertyAction;
+ import com.sun.jmx.mbeanserver.Introspector;
++import java.util.Objects;
+
+
+ /**
+@@ -285,10 +286,10 @@
+ if (!(o instanceof MBeanAttributeInfo))
+ return false;
+ MBeanAttributeInfo p = (MBeanAttributeInfo) o;
+- return (p.getName().equals(getName()) &&
+- p.getType().equals(getType()) &&
+- p.getDescription().equals(getDescription()) &&
+- p.getDescriptor().equals(getDescriptor()) &&
++ return (Objects.equals(p.getName(), getName()) &&
++ Objects.equals(p.getType(), getType()) &&
++ Objects.equals(p.getDescription(), getDescription()) &&
++ Objects.equals(p.getDescriptor(), getDescriptor()) &&
+ p.isReadable() == isReadable() &&
+ p.isWritable() == isWritable() &&
+ p.isIs() == isIs());
+@@ -301,7 +302,7 @@
+ right and we needlessly hashed in the description and parameter
+ array. */
+ public int hashCode() {
+- return getName().hashCode() ^ getType().hashCode();
++ return Objects.hash(getName(), getType());
+ }
+
+ private static boolean isIs(Method getter) {
+--- ./jdk/src/share/classes/javax/management/MBeanConstructorInfo.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/MBeanConstructorInfo.java Wed May 07 19:26:47 2014 -0700
+@@ -29,6 +29,7 @@
+ import java.lang.annotation.Annotation;
+ import java.lang.reflect.Constructor;
+ import java.util.Arrays;
++import java.util.Objects;
+
+ /**
+ * Describes a constructor exposed by an MBean. Instances of this
+@@ -190,10 +191,10 @@
+ if (!(o instanceof MBeanConstructorInfo))
+ return false;
+ MBeanConstructorInfo p = (MBeanConstructorInfo) o;
+- return (p.getName().equals(getName()) &&
+- p.getDescription().equals(getDescription()) &&
++ return (Objects.equals(p.getName(), getName()) &&
++ Objects.equals(p.getDescription(), getDescription()) &&
+ Arrays.equals(p.fastGetSignature(), fastGetSignature()) &&
+- p.getDescriptor().equals(getDescriptor()));
++ Objects.equals(p.getDescriptor(), getDescriptor()));
+ }
+
+ /* Unlike attributes and operations, it's quite likely we'll have
+@@ -203,11 +204,7 @@
+ quite long and yet the same between constructors. Likewise for
+ the descriptor. */
+ public int hashCode() {
+- int hash = getName().hashCode();
+- MBeanParameterInfo[] sig = fastGetSignature();
+- for (int i = 0; i < sig.length; i++)
+- hash ^= sig[i].hashCode();
+- return hash;
++ return Objects.hash(getName()) ^ Arrays.hashCode(fastGetSignature());
+ }
+
+ private static MBeanParameterInfo[] constructorSignature(Constructor<?> cn) {
+--- ./jdk/src/share/classes/javax/management/MBeanFeatureInfo.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/MBeanFeatureInfo.java Wed May 07 19:26:47 2014 -0700
+@@ -30,6 +30,7 @@
+ import java.io.ObjectOutputStream;
+ import java.io.Serializable;
+ import java.io.StreamCorruptedException;
++import java.util.Objects;
+
+ /**
+ * <p>Provides general information for an MBean descriptor object.
+@@ -147,9 +148,9 @@
+ if (!(o instanceof MBeanFeatureInfo))
+ return false;
+ MBeanFeatureInfo p = (MBeanFeatureInfo) o;
+- return (p.getName().equals(getName()) &&
+- p.getDescription().equals(getDescription()) &&
+- p.getDescriptor().equals(getDescriptor()));
++ return (Objects.equals(p.getName(), getName()) &&
++ Objects.equals(p.getDescription(), getDescription()) &&
++ Objects.equals(p.getDescriptor(), getDescriptor()));
+ }
+
+ public int hashCode() {
+--- ./jdk/src/share/classes/javax/management/MBeanInfo.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/MBeanInfo.java Wed May 07 19:26:47 2014 -0700
+@@ -36,6 +36,7 @@
+ import java.util.WeakHashMap;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
++import java.util.Objects;
+
+ import static javax.management.ImmutableDescriptor.nonNullDescriptor;
+
+@@ -515,24 +516,15 @@
+ if (hashCode != 0)
+ return hashCode;
+
+- hashCode =
+- getClassName().hashCode() ^
+- getDescriptor().hashCode() ^
+- arrayHashCode(fastGetAttributes()) ^
+- arrayHashCode(fastGetOperations()) ^
+- arrayHashCode(fastGetConstructors()) ^
+- arrayHashCode(fastGetNotifications());
++ hashCode = Objects.hash(getClassName(), getDescriptor())
++ ^ Arrays.hashCode(fastGetAttributes())
++ ^ Arrays.hashCode(fastGetOperations())
++ ^ Arrays.hashCode(fastGetConstructors())
++ ^ Arrays.hashCode(fastGetNotifications());
+
+ return hashCode;
+ }
+
+- private static int arrayHashCode(Object[] array) {
+- int hash = 0;
+- for (int i = 0; i < array.length; i++)
+- hash ^= array[i].hashCode();
+- return hash;
+- }
+-
+ /**
+ * Cached results of previous calls to arrayGettersSafe. This is
+ * a WeakHashMap so that we don't prevent a class from being
+--- ./jdk/src/share/classes/javax/management/MBeanNotificationInfo.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/MBeanNotificationInfo.java Wed May 07 19:26:47 2014 -0700
+@@ -29,6 +29,7 @@
+ import java.io.InvalidObjectException;
+ import java.io.ObjectInputStream;
+ import java.util.Arrays;
++import java.util.Objects;
+
+ /**
+ * <p>The <CODE>MBeanNotificationInfo</CODE> class is used to describe the
+@@ -193,9 +194,9 @@
+ if (!(o instanceof MBeanNotificationInfo))
+ return false;
+ MBeanNotificationInfo p = (MBeanNotificationInfo) o;
+- return (p.getName().equals(getName()) &&
+- p.getDescription().equals(getDescription()) &&
+- p.getDescriptor().equals(getDescriptor()) &&
++ return (Objects.equals(p.getName(), getName()) &&
++ Objects.equals(p.getDescription(), getDescription()) &&
++ Objects.equals(p.getDescriptor(), getDescriptor()) &&
+ Arrays.equals(p.fastGetNotifTypes(), fastGetNotifTypes()));
+ }
+
+--- ./jdk/src/share/classes/javax/management/MBeanOperationInfo.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/MBeanOperationInfo.java Wed May 07 19:26:47 2014 -0700
+@@ -29,6 +29,7 @@
+ import java.lang.annotation.Annotation;
+ import java.lang.reflect.Method;
+ import java.util.Arrays;
++import java.util.Objects;
+
+ /**
+ * Describes a management operation exposed by an MBean. Instances of
+@@ -293,12 +294,12 @@
+ if (!(o instanceof MBeanOperationInfo))
+ return false;
+ MBeanOperationInfo p = (MBeanOperationInfo) o;
+- return (p.getName().equals(getName()) &&
+- p.getReturnType().equals(getReturnType()) &&
+- p.getDescription().equals(getDescription()) &&
++ return (Objects.equals(p.getName(), getName()) &&
++ Objects.equals(p.getReturnType(), getReturnType()) &&
++ Objects.equals(p.getDescription(), getDescription()) &&
+ p.getImpact() == getImpact() &&
+ Arrays.equals(p.fastGetSignature(), fastGetSignature()) &&
+- p.getDescriptor().equals(getDescriptor()));
++ Objects.equals(p.getDescriptor(), getDescriptor()));
+ }
+
+ /* We do not include everything in the hashcode. We assume that
+@@ -309,7 +310,7 @@
+ parameter array. */
+ @Override
+ public int hashCode() {
+- return getName().hashCode() ^ getReturnType().hashCode();
++ return Objects.hash(getName(), getReturnType());
+ }
+
+ private static MBeanParameterInfo[] methodSignature(Method method) {
+--- ./jdk/src/share/classes/javax/management/MBeanParameterInfo.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/MBeanParameterInfo.java Wed May 07 19:26:47 2014 -0700
+@@ -25,6 +25,8 @@
+
+ package javax.management;
+
++import java.util.Objects;
++
+
+ /**
+ * Describes an argument of an operation exposed by an MBean.
+@@ -136,13 +138,13 @@
+ if (!(o instanceof MBeanParameterInfo))
+ return false;
+ MBeanParameterInfo p = (MBeanParameterInfo) o;
+- return (p.getName().equals(getName()) &&
+- p.getType().equals(getType()) &&
+- p.getDescription().equals(getDescription()) &&
+- p.getDescriptor().equals(getDescriptor()));
++ return (Objects.equals(p.getName(), getName()) &&
++ Objects.equals(p.getType(), getType()) &&
++ Objects.equals(p.getDescription(), getDescription()) &&
++ Objects.equals(p.getDescriptor(), getDescriptor()));
+ }
+
+ public int hashCode() {
+- return getName().hashCode() ^ getType().hashCode();
++ return Objects.hash(getName(), getType());
+ }
+ }
+--- ./jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java Wed May 07 19:26:47 2014 -0700
+@@ -31,6 +31,7 @@
+ //
+ import java.util.Arrays;
+ import java.util.HashSet;
++import java.util.Objects;
+
+ import javax.management.Descriptor;
+ import javax.management.MBeanAttributeInfo;
+@@ -269,8 +270,9 @@
+ //
+
+ // their MBean className should be equal
+- if ( ! this.getClassName().equals(other.getClassName()) )
++ if (!Objects.equals(this.getClassName(), other.getClassName())) {
+ return false;
++ }
+
+ // their infos on attributes should be equal (order not
+ // significant => equality between sets, not arrays or lists)
+@@ -342,7 +344,9 @@
+ //
+ if (myHashCode == null) {
+ int value = 0;
+- value += this.getClassName().hashCode();
++ if (this.getClassName() != null) {
++ value += this.getClassName().hashCode();
++ }
+ value += arraySetHash(this.getAttributes());
+ value += arraySetHash(this.getConstructors());
+ value += arraySetHash(this.getOperations());
+--- ./jdk/src/share/classes/javax/management/relation/RelationNotification.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/relation/RelationNotification.java Wed May 07 19:26:47 2014 -0700
+@@ -260,7 +260,7 @@
+
+ super(notifType, sourceObj, sequence, timeStamp, message);
+
+- if (!isValidBasic(notifType,sourceObj,id,typeName) || !isValidCreate(notifType)) {
++ if (!isValidBasicStrict(notifType,sourceObj,id,typeName) || !isValidCreate(notifType)) {
+ throw new IllegalArgumentException("Invalid parameter.");
+ }
+
+@@ -310,7 +310,7 @@
+
+ super(notifType, sourceObj, sequence, timeStamp, message);
+
+- if (!isValidBasic(notifType,sourceObj,id,typeName) || !isValidUpdate(notifType,name,newValue,oldValue)) {
++ if (!isValidBasicStrict(notifType,sourceObj,id,typeName) || !isValidUpdate(notifType,name,newValue,oldValue)) {
+ throw new IllegalArgumentException("Invalid parameter.");
+ }
+
+@@ -457,14 +457,26 @@
+ // - no role old value (for role update)
+ // - no role new value (for role update)
+
++ // Despite the fact, that validation in constructor of RelationNotification prohibit
++ // creation of the class instance with null sourceObj its possible to set it to null later
++ // by public setSource() method.
++ // So we should relax validation rules to preserve serialization behavior compatibility.
++
++ private boolean isValidBasicStrict(String notifType, Object sourceObj, String id, String typeName){
++ if (sourceObj == null) {
++ return false;
++ }
++ return isValidBasic(notifType,sourceObj,id,typeName);
++ }
++
+ private boolean isValidBasic(String notifType, Object sourceObj, String id, String typeName){
+- if (notifType == null || sourceObj == null ||
+- id == null || typeName == null) {
++ if (notifType == null || id == null || typeName == null) {
+ return false;
+ }
+
+- if (!(sourceObj instanceof RelationService) &&
+- !(sourceObj instanceof ObjectName)) {
++ if (sourceObj != null && (
++ !(sourceObj instanceof RelationService) &&
++ !(sourceObj instanceof ObjectName))) {
+ return false;
+ }
+
+--- ./jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java Wed May 07 19:26:47 2014 -0700
+@@ -405,14 +405,7 @@
+ throw new IOException("Not connected");
+ }
+
+- MBeanServerConnection rmbsc = rmbscMap.get(delegationSubject);
+- if (rmbsc != null) {
+- return rmbsc;
+- }
+-
+- rmbsc = new RemoteMBeanServerConnection(delegationSubject);
+- rmbscMap.put(delegationSubject, rmbsc);
+- return rmbsc;
++ return getConnectionWithSubject(delegationSubject);
+ }
+
+ public void
+@@ -1831,7 +1824,7 @@
+
+ // Initialization of transient variables.
+ private void initTransients() {
+- rmbscMap = new WeakHashMap<Subject, MBeanServerConnection>();
++ rmbscMap = new WeakHashMap<Subject, WeakReference<MBeanServerConnection>>();
+ connected = false;
+ terminated = false;
+
+@@ -2011,6 +2004,25 @@
+ private final ClassLoader loader;
+ }
+
++ private MBeanServerConnection getConnectionWithSubject(Subject delegationSubject) {
++ MBeanServerConnection conn = null;
++
++ if (delegationSubject == null) {
++ if (nullSubjectConnRef == null
++ || (conn = nullSubjectConnRef.get()) == null) {
++ conn = new RemoteMBeanServerConnection(null);
++ nullSubjectConnRef = new WeakReference(conn);
++ }
++ } else {
++ WeakReference<MBeanServerConnection> wr = rmbscMap.get(delegationSubject);
++ if (wr == null || (conn = wr.get()) == null) {
++ conn = new RemoteMBeanServerConnection(delegationSubject);
++ rmbscMap.put(delegationSubject, new WeakReference(conn));
++ }
++ }
++ return conn;
++ }
++
+ /*
+ The following section of code avoids a class loading problem
+ with RMI. The problem is that an RMI stub, when deserializing
+@@ -2559,7 +2571,8 @@
+
+ private transient long clientNotifSeqNo = 0;
+
+- private transient WeakHashMap<Subject, MBeanServerConnection> rmbscMap;
++ private transient WeakHashMap<Subject, WeakReference<MBeanServerConnection>> rmbscMap;
++ private transient WeakReference<MBeanServerConnection> nullSubjectConnRef = null;
+
+ private transient RMINotifClient rmiNotifClient;
+ // = new RMINotifClient(new Integer(0));
+--- ./jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -42,6 +42,7 @@
+ import javax.swing.tree.*;
+ import javax.swing.text.Position;
+ import javax.swing.plaf.basic.DragRecognitionSupport.BeforeDrag;
++import sun.awt.AWTAccessor;
+ import sun.swing.SwingUtilities2;
+
+ import sun.swing.DefaultLookup;
+@@ -2165,11 +2166,7 @@
+ nodeBounds.width,
+ nodeBounds.height);
+ editingPath = path;
+- if (editingComponent instanceof JComponent) {
+- ((JComponent)editingComponent).revalidate();
+- } else {
+- editingComponent.validate();
+- }
++ AWTAccessor.getComponentAccessor().revalidateSynchronously(editingComponent);
+ editingComponent.repaint();
+ if(cellEditor.shouldSelectCell(event)) {
+ stopEditingInCompleteEditing = false;
+--- ./jdk/src/share/classes/javax/swing/text/FlowView.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/text/FlowView.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 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
+@@ -796,6 +796,22 @@
+ v.setParent(parent);
+ }
+
++ /** {@inheritDoc} */
++ @Override
++ protected void forwardUpdate(DocumentEvent.ElementChange ec,
++ DocumentEvent e, Shape a, ViewFactory f) {
++ calculateUpdateIndexes(e);
++ // Send update event to all views followed by the changed place.
++ lastUpdateIndex = Math.max((getViewCount() - 1), 0);
++ for (int i = firstUpdateIndex; i <= lastUpdateIndex; i++) {
++ View v = getView(i);
++ if (v != null) {
++ Shape childAlloc = getChildAllocation(i, a);
++ forwardUpdateToView(v, e, childAlloc, f);
++ }
++ }
++ }
++
+ // The following methods don't do anything useful, they
+ // simply keep the class from being abstract.
+
+--- ./jdk/src/share/classes/javax/swing/text/GlyphView.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/text/GlyphView.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 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
+@@ -514,7 +514,7 @@
+ int x1 = x0 + (int) painter.getSpan(this, p0, p1, getTabExpander(), x0);
+
+ // calculate y coordinate
+- int y = alloc.y + alloc.height - (int) painter.getDescent(this);
++ int y = alloc.y + (int)(painter.getHeight(this) - painter.getDescent(this));
+ if (underline) {
+ int yTmp = y + 1;
+ g.drawLine(x0, yTmp, x1, yTmp);
+--- ./jdk/src/share/classes/javax/swing/text/View.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/text/View.java Wed May 07 19:26:47 2014 -0700
+@@ -1137,32 +1137,9 @@
+ */
+ protected void forwardUpdate(DocumentEvent.ElementChange ec,
+ DocumentEvent e, Shape a, ViewFactory f) {
+- Element elem = getElement();
+- int pos = e.getOffset();
+- int index0 = getViewIndex(pos, Position.Bias.Forward);
+- if (index0 == -1 && e.getType() == DocumentEvent.EventType.REMOVE &&
+- pos >= getEndOffset()) {
+- // Event beyond our offsets. We may have represented this, that is
+- // the remove may have removed one of our child Elements that
+- // represented this, so, we should foward to last element.
+- index0 = getViewCount() - 1;
+- }
+- int index1 = index0;
+- View v = (index0 >= 0) ? getView(index0) : null;
+- if (v != null) {
+- if ((v.getStartOffset() == pos) && (pos > 0)) {
+- // If v is at a boundary, forward the event to the previous
+- // view too.
+- index0 = Math.max(index0 - 1, 0);
+- }
+- }
+- if (e.getType() != DocumentEvent.EventType.REMOVE) {
+- index1 = getViewIndex(pos + e.getLength(), Position.Bias.Forward);
+- if (index1 < 0) {
+- index1 = getViewCount() - 1;
+- }
+- }
+- int hole0 = index1 + 1;
++ calculateUpdateIndexes(e);
++
++ int hole0 = lastUpdateIndex + 1;
+ int hole1 = hole0;
+ Element[] addedElems = (ec != null) ? ec.getChildrenAdded() : null;
+ if ((addedElems != null) && (addedElems.length > 0)) {
+@@ -1173,11 +1150,9 @@
+ // forward to any view not in the forwarding hole
+ // formed by added elements (i.e. they will be updated
+ // by initialization.
+- index0 = Math.max(index0, 0);
+- index1 = Math.max((getViewCount() - 1), 0);
+- for (int i = index0; i <= index1; i++) {
++ for (int i = firstUpdateIndex; i <= lastUpdateIndex; i++) {
+ if (! ((i >= hole0) && (i <= hole1))) {
+- v = getView(i);
++ View v = getView(i);
+ if (v != null) {
+ Shape childAlloc = getChildAllocation(i, a);
+ forwardUpdateToView(v, e, childAlloc, f);
+@@ -1187,6 +1162,39 @@
+ }
+
+ /**
++ * Calculates the first and the last indexes of the child views
++ * that need to be notified of the change to the model.
++ * @param e the change information from the associated document
++ */
++ void calculateUpdateIndexes(DocumentEvent e) {
++ int pos = e.getOffset();
++ firstUpdateIndex = getViewIndex(pos, Position.Bias.Forward);
++ if (firstUpdateIndex == -1 && e.getType() == DocumentEvent.EventType.REMOVE &&
++ pos >= getEndOffset()) {
++ // Event beyond our offsets. We may have represented this, that is
++ // the remove may have removed one of our child Elements that
++ // represented this, so, we should forward to last element.
++ firstUpdateIndex = getViewCount() - 1;
++ }
++ lastUpdateIndex = firstUpdateIndex;
++ View v = (firstUpdateIndex >= 0) ? getView(firstUpdateIndex) : null;
++ if (v != null) {
++ if ((v.getStartOffset() == pos) && (pos > 0)) {
++ // If v is at a boundary, forward the event to the previous
++ // view too.
++ firstUpdateIndex = Math.max(firstUpdateIndex - 1, 0);
++ }
++ }
++ if (e.getType() != DocumentEvent.EventType.REMOVE) {
++ lastUpdateIndex = getViewIndex(pos + e.getLength(), Position.Bias.Forward);
++ if (lastUpdateIndex < 0) {
++ lastUpdateIndex = getViewCount() - 1;
++ }
++ }
++ firstUpdateIndex = Math.max(firstUpdateIndex, 0);
++ }
++
++ /**
+ * Forwards the <code>DocumentEvent</code> to the give child view. This
+ * simply messages the view with a call to <code>insertUpdate</code>,
+ * <code>removeUpdate</code>, or <code>changedUpdate</code> depending
+@@ -1345,4 +1353,14 @@
+ private View parent;
+ private Element elem;
+
++ /**
++ * The index of the first child view to be notified.
++ */
++ int firstUpdateIndex;
++
++ /**
++ * The index of the last child view to be notified.
++ */
++ int lastUpdateIndex;
++
+ };
+--- ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java Wed May 07 19:26:47 2014 -0700
+@@ -57,9 +57,9 @@
+ {"appletviewer.appletinfo.applet", "-- \u30A2\u30D7\u30EC\u30C3\u30C8\u60C5\u5831\u306A\u3057 --"},
+ {"appletviewer.appletinfo.param", "-- \u30D1\u30E9\u30E1\u30FC\u30BF\u60C5\u5831\u306A\u3057 --"},
+ {"appletviewer.appletinfo.textframe", "\u30A2\u30D7\u30EC\u30C3\u30C8\u60C5\u5831"},
+- {"appletviewer.appletprint.fail", "\u5370\u5237\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002"},
+- {"appletviewer.appletprint.finish", "\u5370\u5237\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002"},
+- {"appletviewer.appletprint.cancel", "\u5370\u5237\u304C\u4E2D\u6B62\u3055\u308C\u307E\u3057\u305F\u3002"},
++ {"appletviewer.appletprint.fail", "\u5370\u5237\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002"},
++ {"appletviewer.appletprint.finish", "\u5370\u5237\u3092\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002"},
++ {"appletviewer.appletprint.cancel", "\u5370\u5237\u304C\u53D6\u308A\u6D88\u3055\u308C\u307E\u3057\u305F\u3002"},
+ {"appletviewer.appletencoding", "\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0: {0}"},
+ {"appletviewer.parse.warning.requiresname", "\u8B66\u544A: <param name=... value=...>\u30BF\u30B0\u306Bname\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
+ {"appletviewer.parse.warning.paramoutside", "\u8B66\u544A: <param>\u30BF\u30B0\u304C<applet> ... </applet>\u306E\u5916\u5074\u3067\u3059\u3002"},
+@@ -98,7 +98,7 @@
+ {"appletioexception.loadclass.throw.notloaded", "\u30AF\u30E9\u30B9\u304C\u30ED\u30FC\u30C9\u3055\u308C\u307E\u305B\u3093: {0}"},
+ {"appletclassloader.loadcode.verbose", "{1}\u3092\u53D6\u5F97\u3059\u308B\u305F\u3081\u306E{0}\u3078\u306E\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u958B\u304D\u307E\u3059"},
+ {"appletclassloader.filenotfound", "{0}\u306E\u691C\u7D22\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
+- {"appletclassloader.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u30FB\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
++ {"appletclassloader.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
+ {"appletclassloader.fileioexception", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u5165\u51FA\u529B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
+ {"appletclassloader.fileexception", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
+ {"appletclassloader.filedeath", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u304C\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3057\u305F"},
+@@ -132,7 +132,7 @@
+ {"appletpanel.notdisposed", "\u30ED\u30FC\u30C9: \u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u7834\u68C4\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
+ {"appletpanel.bail", "\u4E2D\u65AD\u6E08: \u7D42\u4E86\u3057\u3066\u3044\u307E\u3059\u3002"},
+ {"appletpanel.filenotfound", "{0}\u306E\u691C\u7D22\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
+- {"appletpanel.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u30FB\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
++ {"appletpanel.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
+ {"appletpanel.fileioexception", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u5165\u51FA\u529B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
+ {"appletpanel.fileexception", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
+ {"appletpanel.filedeath", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u304C\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3057\u305F"},
+--- ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java Wed May 07 19:26:47 2014 -0700
+@@ -93,7 +93,7 @@
+ {"appletviewer.main.nosecmgr", "Advert\u00EAncia: SecurityManager n\u00E3o instalado!"},
+ {"appletviewer.main.warning", "Advert\u00EAncia: Nenhum applet iniciado. Certifique-se de que a entrada contenha uma tag <applet>."},
+ {"appletviewer.main.warn.prop.overwrite", "Advert\u00EAncia: Substituindo a propriedade do sistema temporariamente a pedido do usu\u00E1rio: chave: {0} valor antigo: {1} valor novo: {2}"},
+- {"appletviewer.main.warn.cantreadprops", "Advert\u00EAncia: N\u00E3o \u00E9 poss\u00EDvel ler o arquivo de propriedades AppletViewer: {0} Usando defaults."},
++ {"appletviewer.main.warn.cantreadprops", "Advert\u00EAncia: N\u00E3o \u00E9 poss\u00EDvel ler o arquivo de propriedades AppletViewer: {0} Usando padr\u00F5es."},
+ {"appletioexception.loadclass.throw.interrupted", "carregamento de classe interrompido: {0}"},
+ {"appletioexception.loadclass.throw.notloaded", "classe n\u00E3o carregada: {0}"},
+ {"appletclassloader.loadcode.verbose", "Fluxo de abertura para: {0} para obter {1}"},
+--- ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java Wed May 07 19:26:47 2014 -0700
+@@ -85,7 +85,7 @@
+ {"appletviewer.main.prop.store", "Anv\u00E4ndarspecifika egenskaper f\u00F6r AppletViewer"},
+ {"appletviewer.main.err.prop.cantread", "Kan inte l\u00E4sa egenskapsfilen: {0}"},
+ {"appletviewer.main.err.prop.cantsave", "Kan inte spara egenskapsfilen: {0}"},
+- {"appletviewer.main.warn.nosecmgr", "Varning: s\u00E4kerheten inaktiveras."},
++ {"appletviewer.main.warn.nosecmgr", "Varning! S\u00E4kerheten avaktiveras."},
+ {"appletviewer.main.debug.cantfinddebug", "Hittar inte fels\u00F6kningsprogrammet!"},
+ {"appletviewer.main.debug.cantfindmain", "Hittar inte huvudmetoden i fels\u00F6kningsprogrammet!"},
+ {"appletviewer.main.debug.exceptionindebug", "Undantag i fels\u00F6kningsprogrammet!"},
+--- ./jdk/src/share/classes/sun/awt/AWTAccessor.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/AWTAccessor.java Wed May 07 19:26:47 2014 -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
+@@ -40,6 +40,7 @@
+ import java.security.AccessControlContext;
+
+ import java.io.File;
++import java.util.ResourceBundle;
+ import java.util.Vector;
+
+ /**
+@@ -237,6 +238,11 @@
+ */
+ AccessControlContext getAccessControlContext(Component comp);
+
++ /**
++ * Revalidates the component synchronously.
++ */
++ void revalidateSynchronously(Component comp);
++
+ }
+
+ /*
+@@ -691,6 +697,13 @@
+ }
+
+ /*
++ *An accessor for the toolkit class
++ */
++ public interface ToolkitAccessor {
++ void setPlatformResources(ResourceBundle bundle);
++ }
++
++ /*
+ * An accessor object for the InvocationEvent class
+ */
+ public interface InvocationEventAccessor {
+@@ -737,6 +750,7 @@
+ private static DefaultKeyboardFocusManagerAccessor defaultKeyboardFocusManagerAccessor;
+ private static SequencedEventAccessor sequencedEventAccessor;
+ private static InvocationEventAccessor invocationEventAccessor;
++ private static ToolkitAccessor toolkitAccessor;
+
+ /*
+ * Set an accessor object for the java.awt.Component class.
+@@ -1133,6 +1147,24 @@
+ }
+
+ /*
++ * Set an accessor object for the java.awt.Toolkit class.
++ */
++ public static void setToolkitAccessor(ToolkitAccessor ta) {
++ toolkitAccessor = ta;
++ }
++
++ /*
++ * Get the accessor object for the java.awt.Toolkit class.
++ */
++ public static ToolkitAccessor getToolkitAccessor() {
++ if (toolkitAccessor == null) {
++ unsafe.ensureClassInitialized(Toolkit.class);
++ }
++
++ return toolkitAccessor;
++ }
++
++ /*
+ * Get the accessor object for the java.awt.event.InvocationEvent class.
+ */
+ public static void setInvocationEventAccessor(InvocationEventAccessor invocationEventAccessor) {
+--- ./jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java Wed May 07 19:26:47 2014 -0700
+@@ -98,8 +98,7 @@
+ }
+
+ flavors = DataTransferer.getInstance().
+- setToSortedDataFlavorArray(flavorsToData.keySet(),
+- flavorsForFormats);
++ setToSortedDataFlavorArray(flavorsToData.keySet());
+ }
+ } finally {
+ clipboard.closeClipboard();
+--- ./jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Wed May 07 19:26:47 2014 -0700
+@@ -2406,15 +2406,6 @@
+ }
+
+ /**
+- * Helper function to reduce a Map with DataFlavor keys to a DataFlavor
+- * array. The array will be sorted according to
+- * <code>DataFlavorComparator</code>.
+- */
+- public static DataFlavor[] keysToDataFlavorArray(Map map) {
+- return setToSortedDataFlavorArray(map.keySet(), map);
+- }
+-
+- /**
+ * Helper function to convert a Set of DataFlavors to a sorted array.
+ * The array will be sorted according to <code>DataFlavorComparator</code>.
+ */
+@@ -2428,24 +2419,6 @@
+ }
+
+ /**
+- * Helper function to convert a Set of DataFlavors to a sorted array.
+- * The array will be sorted according to a
+- * <code>DataFlavorComparator</code> created with the specified
+- * flavor-to-native map as an argument.
+- */
+- public static DataFlavor[] setToSortedDataFlavorArray
+- (Set flavorsSet, Map flavorToNativeMap)
+- {
+- DataFlavor[] flavors = new DataFlavor[flavorsSet.size()];
+- flavorsSet.toArray(flavors);
+- Comparator comparator =
+- new DataFlavorComparator(flavorToNativeMap,
+- IndexedComparator.SELECT_WORST);
+- Arrays.sort(flavors, comparator);
+- return flavors;
+- }
+-
+- /**
+ * Helper function to convert an InputStream to a byte[] array.
+ */
+ protected static byte[] inputStreamToByteArray(InputStream str)
+@@ -2723,11 +2696,9 @@
+ * application/x-java-* MIME types. Unknown application types are preferred
+ * because if the user provides his own data flavor, it will likely be the
+ * most descriptive one. For flavors which are otherwise equal, the
+- * flavors' native formats are compared, with greater long values
+- * taking precedence.
++ * flavors' string representation are compared in the alphabetical order.
+ */
+ public static class DataFlavorComparator extends IndexedComparator {
+- protected final Map flavorToFormatMap;
+
+ private final CharsetComparator charsetComparator;
+
+@@ -2863,20 +2834,6 @@
+ super(order);
+
+ charsetComparator = new CharsetComparator(order);
+- flavorToFormatMap = Collections.EMPTY_MAP;
+- }
+-
+- public DataFlavorComparator(Map map) {
+- this(map, SELECT_BEST);
+- }
+-
+- public DataFlavorComparator(Map map, boolean order) {
+- super(order);
+-
+- charsetComparator = new CharsetComparator(order);
+- HashMap hashMap = new HashMap(map.size());
+- hashMap.putAll(map);
+- flavorToFormatMap = Collections.unmodifiableMap(hashMap);
+ }
+
+ public int compare(Object obj1, Object obj2) {
+@@ -2972,10 +2929,9 @@
+ }
+ }
+
+- // As a last resort, take the DataFlavor with the greater integer
+- // format.
+- return compareLongs(flavorToFormatMap, flavor1, flavor2,
+- UNKNOWN_OBJECT_LOSES_L);
++ // The flavours are not equal but still not distinguishable.
++ // Compare String representations in alphabetical order
++ return flavor1.getMimeType().compareTo(flavor2.getMimeType());
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties Wed May 07 19:26:47 2014 -0700
+@@ -151,7 +151,7 @@
+ AWT.undefined=Indefinido
+
+ # Predefined cursor names
+-AWT.DefaultCursor=Cursor Default
++AWT.DefaultCursor=Cursor Padr\u00E3o
+ AWT.CrosshairCursor=Cursor em Forma de Cruz
+ AWT.TextCursor=Cursor de Texto
+ AWT.WaitCursor=Cursor em Forma de Ampulheta
+@@ -165,9 +165,9 @@
+ AWT.EResizeCursor=Cursor de Seta Que Aponta \u00E0 Direita
+ AWT.HandCursor=Cursor em Forma de M\u00E3o
+ AWT.MoveCursor=Cursor de Movimento
+-AWT.DefaultDragCursor=Cursor Default de Arrastar
+-AWT.DefaultNoDropCursor=Cursor Default sem Arrastar
+-AWT.DefaultDropCursor=Cursor Default de Soltar
++AWT.DefaultDragCursor=Cursor Padr\u00E3o de Arrastar
++AWT.DefaultNoDropCursor=Cursor Padr\u00E3o sem Arrastar
++AWT.DefaultDropCursor=Cursor Padr\u00E3o de Soltar
+
+ # Input method related strings
+ AWT.CompositionWindowTitle=Janela de Entrada
+--- ./jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Wed May 07 19:26:47 2014 -0700
+@@ -37,7 +37,7 @@
+ java.launcher.opt.footer =\ -cp <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n -classpath <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n und ZIP-Archiven zur Suche nach Klassendateien.\n -D<name>=<value>\n Legt eine Systemeigenschaft fest\n -verbose:[class|gc|jni]\n Aktiviert die Verbose-Ausgabe\n -version Druckt Produktversion und beendet das Programm\n -version:<value>\n Erfordert die angegebene Version zur Ausf\u00FChrung\n -showversion Druckt Produktversion und f\u00E4hrt fort\n -jre-restrict-search | -no-jre-restrict-search\n Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n -? -help Druckt diese Hilfemeldung\n -X Druckt Hilfe zu Nicht-Standardoptionen\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n Aktiviert Assertionen mit angegebener Granularit\u00E4t\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n Deaktiviert Assertionen mit angegebener Granularit\u00E4t\n -esa | -enablesystemassertions\n Aktiviert Systemassertionen\n -dsa | -disablesystemassertions\n Deaktiviert Systemassertionen\n -agentlib:<libname>[=<options>]\n L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n siehe auch -agentlib:jdwp=help und -agentlib:hprof=help\n -agentpath:<pathname>[=<options>]\n L\u00E4dt native Agent Library nach vollem Pfadnamen\n -javaagent:<jarpath>[=<options>]\n L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n -splash:<imagepath>\n Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://www.oracle.com/technetwork/java/javase/documentation/index.html
+
+ # Translators please note do not translate the options themselves
+-java.launcher.X.usage=\ -Xmixed Ausf\u00FChrung im gemischten Modus (Standard)\n -Xint Nur Ausf\u00FChrung im interpretierten Modus\n -Xbootclasspath:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Legt Suchpfad f\u00FCr Bootstrap-Klassen und Ressourcen fest\n -Xbootclasspath/a:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n H\u00E4ngt an das Ende des Bootstrap Classpath an\n -Xbootclasspath/p:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Stellt Bootstrap Classpath voran\n -Xdiag Zeigt zus\u00E4tzliche Diagnosemeldungen an\n -Xnoclassgc Deaktiviert Klassen-Garbage Collection\n -Xincgc Aktiviert inkrementelle Garbage Collection\n -Xloggc:<file> Loggt GC-Status in einer Datei mit Zeitstempeln\n -Xbatch Deaktiviert Hintergrundkompilierung\n -Xms<size> Legt anf\u00E4ngliche Java Heap-Gr\u00F6\u00DFe fest\n -Xmx<size> Legt maximale Java Heap-Gr\u00F6\u00DFe fest\n -Xss<size> Legt Java-Thread-Stackgr\u00F6\u00DFe fest\n -Xprof Gibt CPU-Profiling-Daten aus\n -Xfuture Aktiviert strengste Pr\u00FCfungen, antizipiert zuk\u00FCnftigen Standardwert\n -Xrs Reduziert Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n -Xcheck:jni F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen durch\n -Xshare:off Kein Versuch, gemeinsame Klassendaten zu verwenden\n -Xshare:auto Verwendet gemeinsame Klassendaten, wenn m\u00F6glich (Standard)\n -Xshare:on Erfordert die Verwendung gemeinsamer Klassendaten, sonst verl\u00E4uft der Vorgang nicht erfolgreich.\n -XshowSettings Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:all\n Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen und f\u00E4hrt fort\n -XshowSettings:properties\n Zeigt alle Eigenschaftseinstellungen und f\u00E4hrt fort\n -XshowSettings:locale\n Zeigt alle gebietsschemabezogenen Einstellungen und f\u00E4hrt fort\n\nDie -X-Optionen sind keine Standardoptionen und k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
++java.launcher.X.usage=\ -Xmixed Ausf\u00FChrung im gemischten Modus (Standard)\n -Xint Nur Ausf\u00FChrung im interpretierten Modus\n -Xbootclasspath:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Legt Suchpfad f\u00FCr Bootstrap-Klassen und Ressourcen fest\n -Xbootclasspath/a:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n H\u00E4ngt an das Ende des Bootstrap Classpath an\n -Xbootclasspath/p:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Stellt Bootstrap Classpath voran\n -Xdiag Zeigt zus\u00E4tzliche Diagnosemeldungen an\n -Xnoclassgc Deaktiviert Klassen-Garbage Collection\n -Xincgc Aktiviert inkrementelle Garbage Collection\n -Xloggc:<file> Loggt GC-Status in einer Datei mit Zeitstempeln\n -Xbatch Deaktiviert Hintergrundkompilierung\n -Xms<size> Legt anf\u00E4ngliche Java Heap-Gr\u00F6\u00DFe fest\n -Xmx<size> Legt maximale Java Heap-Gr\u00F6\u00DFe fest\n -Xss<size> Legt Java-Threadstackgr\u00F6\u00DFe fest\n -Xprof Gibt CPU-Profiling-Daten aus\n -Xfuture Aktiviert strengste Pr\u00FCfungen, antizipiert zuk\u00FCnftigen Standardwert\n -Xrs Reduziert Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n -Xcheck:jni F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen durch\n -Xshare:off Kein Versuch, gemeinsame Klassendaten zu verwenden\n -Xshare:auto Verwendet gemeinsame Klassendaten, wenn m\u00F6glich (Standard)\n -Xshare:on Erfordert die Verwendung gemeinsamer Klassendaten, sonst verl\u00E4uft der Vorgang nicht erfolgreich.\n -XshowSettings Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:all\n Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen und f\u00E4hrt fort\n -XshowSettings:properties\n Zeigt alle Eigenschaftseinstellungen und f\u00E4hrt fort\n -XshowSettings:locale\n Zeigt alle gebietsschemabezogenen Einstellungen und f\u00E4hrt fort\n\nDie -X-Optionen sind keine Standardoptionen und k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
+
+ # Translators please note do not translate the options themselves
+ java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr Mac OS X spezifisch:\n -XstartOnFirstThread\n f\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit) Thread aus\n -Xdock:name=<Anwendungsname>"\n \u00DCberschreibt den in der Uhr angezeigten Standardanwendungsnamen\n -Xdock:icon=<Pfad zu Symboldatei>\n \u00DCberschreibt das in der Uhr angezeigte Standardsymbol\n\n
+--- ./jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Wed May 07 19:26:47 2014 -0700
+@@ -30,17 +30,17 @@
+ java.launcher.opt.vmselect =\ {0}\t para selecionar a VM "{1}"\n
+ java.launcher.opt.hotspot =\ {0}\t \u00E9 um sin\u00F4nimo da VM "{1}" [obsoleto]\n
+
+-java.launcher.ergo.message1 =\ A VM default \u00E9 {0}
++java.launcher.ergo.message1 =\ A VM padr\u00E3o \u00E9 {0}
+ java.launcher.ergo.message2 =\ porque a execu\u00E7\u00E3o est\u00E1 sendo feita em uma m\u00E1quina de classe de servidor.\n
+
+ # Translators please note do not translate the options themselves
+ java.launcher.opt.footer =\ -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n Uma lista separada por {0} de diret\u00F3rios, archives JAR\n e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n -D<nome>=<valor>\n define uma propriedade do sistema\n -verbose:[class|gc|jni]\n ativa a sa\u00EDda detalhada\n -version imprime a vers\u00E3o do produto e sai do programa\n -version:<valor>\n requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n -showversion imprime a vers\u00E3o do produto e continua\n -jre-restrict-search | -no-jre-restrict-search\n inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n -? -help imprime esta mensagem de ajuda\n -X imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n -ea[:<nome do pacote>...|:<nome da classe>]\n -enableassertions[:<nome do pacote>...|:<nome da classe>]\n ativa asser\u00E7\u00F5es com granularidade especificada\n -da[:<nome do pacote>...|:<nome da classe>]\n -disableassertions[:<nome do pacote>...|:<nome da classe>]\n desativa asser\u00E7\u00F5es com granularidade especificada\n -esa | -enablesystemassertions\n ativa asser\u00E7\u00F5es do sistema\n -dsa | -disablesystemassertions\n desativa asser\u00E7\u00F5es do sistema\n -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa <nome da biblioteca>, por exemplo: -agentlib:hprof\n consulte tamb\u00E9m: -agentlib:jdwp=help e -agentlib:hprof=help\n -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa com base no nome do caminho completo\n -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n -splash:<caminho da imagem>\n mostra a tela de abertura com a imagem especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para obter mais detalhes.
+
+ # 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
++java.launcher.X.usage=\ -Xmixed execu\u00E7\u00E3o no modo misto (padr\u00E3o)\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 padr\u00E3o 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 (padr\u00E3o)\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
+
+ # Translators please note do not translate the options themselves
+-java.launcher.X.macosx.usage=\nAs op\u00E7\u00F5es a seguir s\u00E3o espec\u00EDficas para o Mac OS X:\n -XstartOnFirstThread\n executa o m\u00E9todo main() no primeiro thread (AppKit)\n -Xdock:name=<nome da aplica\u00E7\u00E3o>"\n substitui o nome da aplica\u00E7\u00E3o default exibido no encaixe\n -Xdock:icon=<caminho para o arquivo do \u00EDcone>\n substitui o \u00EDcone exibido no encaixe\n\n
++java.launcher.X.macosx.usage=\nAs op\u00E7\u00F5es a seguir s\u00E3o espec\u00EDficas para o Mac OS X:\n -XstartOnFirstThread\n executa o m\u00E9todo main() no primeiro thread (AppKit)\n -Xdock:name=<nome da aplica\u00E7\u00E3o>"\n substitui o nome da aplica\u00E7\u00E3o padr\u00E3o exibido no encaixe\n -Xdock:icon=<caminho para o arquivo do \u00EDcone>\n substitui o \u00EDcone exibido no encaixe\n\n
+
+ java.launcher.cls.error1=Erro: N\u00E3o foi poss\u00EDvel localizar nem carregar a classe principal {0}
+ java.launcher.cls.error2=Erro: o m\u00E9todo main n\u00E3o \u00E9 {0} na classe {1}; defina o m\u00E9todo main como:\n public static void main(String[] args)
+--- ./jdk/src/share/classes/sun/management/resources/agent_ja.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/management/resources/agent_ja.properties Wed May 07 19:26:47 2014 -0700
+@@ -36,7 +36,7 @@
+ agent.err.configfile.closed.failed = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u3092\u9589\u3058\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+ agent.err.configfile.access.denied = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
+
+-agent.err.exportaddress.failed = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30A2\u30C9\u30EC\u30B9\u306E\u8A08\u6E2C\u30D0\u30C3\u30D5\u30A1\u3078\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u306B\u5931\u6557\u3057\u307E\u3057\u305F
++agent.err.exportaddress.failed = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30A2\u30C9\u30EC\u30B9\u306E\u8A08\u6E2C\u30D0\u30C3\u30D5\u30A1\u3078\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+
+ agent.err.agentclass.notfound = \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+ agent.err.agentclass.failed = \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+--- ./jdk/src/share/classes/sun/misc/FloatingDecimal.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/misc/FloatingDecimal.java Wed May 07 19:26:47 2014 -0700
+@@ -70,6 +70,15 @@
+ static final int minDecimalExponent = -324;
+ static final int bigDecimalExponent = 324; // i.e. abs(minDecimalExponent)
+
++ //
++ // The value below is chosen as a conservative threshold. It
++ // can be demonstrated that a decimal ulp less than 10^(-1075)
++ // is enough to guarantee correctness. Compensation is also made
++ // for the binary mantissa which takes 53 binary digits, or
++ // 17 decimal ones. Hence 1075 + 17 =~ 1100.
++ //
++ static final int MAX_NDIGITS = 1100;
++
+ static final long highbyte = 0xff00000000000000L;
+ static final long highbit = 0x8000000000000000L;
+ static final long lowbytes = ~highbyte;
+@@ -1468,6 +1477,10 @@
+ * Formulate the EXACT big-number result as
+ * bigD0 * 10^exp
+ */
++ if (nDigits > MAX_NDIGITS) {
++ nDigits = MAX_NDIGITS + 1;
++ digits[MAX_NDIGITS] = '1';
++ }
+ FDBigInt bigD0 = new FDBigInt( lValue, digits, kDigits, nDigits );
+ exp = decExponent - nDigits;
+
+--- ./jdk/src/share/classes/sun/misc/JavaLangAccess.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/misc/JavaLangAccess.java Wed May 07 19:26:47 2014 -0700
+@@ -95,4 +95,9 @@
+ * inherited AccessControlContext.
+ */
+ Thread newThreadWithAcc(Runnable target, AccessControlContext acc);
++
++ /**
++ * Invokes the finalize method of the given object.
++ */
++ void invokeFinalize(Object o) throws Throwable;
+ }
+--- ./jdk/src/share/classes/sun/misc/VM.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/misc/VM.java Wed May 07 19:26:47 2014 -0700
+@@ -147,6 +147,7 @@
+
+
+ private static volatile boolean booted = false;
++ private static final Object lock = new Object();
+
+ // Invoked by by System.initializeSystemClass just before returning.
+ // Subsystems that are invoked during initialization can check this
+@@ -154,13 +155,27 @@
+ // application class loader has been set up.
+ //
+ public static void booted() {
+- booted = true;
++ synchronized (lock) {
++ booted = true;
++ lock.notifyAll();
++ }
+ }
+
+ public static boolean isBooted() {
+ return booted;
+ }
+
++ // Waits until VM completes initialization
++ //
++ // This method is invoked by the Finalizer thread
++ public static void awaitBooted() throws InterruptedException {
++ synchronized (lock) {
++ while (!booted) {
++ lock.wait();
++ }
++ }
++ }
++
+ // A user-settable upper limit on the maximum amount of allocatable direct
+ // buffer memory. This value may be changed during VM initialization if
+ // "java" is launched with "-XX:MaxDirectMemorySize=<size>".
+--- ./jdk/src/share/classes/sun/nio/cs/ext/META-INF/services/java.nio.charset.spi.CharsetProvider Tue Mar 18 12:35:25 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,2 +0,0 @@
+-# NIO charset SPI extended charset provider
+-sun.nio.cs.ext.ExtendedCharsets
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/sun/print/DocumentPropertiesUI.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,62 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package sun.print;
++
++import java.awt.Window;
++import java.awt.print.PrinterJob;
++import javax.print.PrintService;
++import javax.print.ServiceUIFactory;
++import javax.print.attribute.PrintRequestAttributeSet;
++
++public abstract class DocumentPropertiesUI {
++
++ /**
++ * For Win32 doc properties sheet.
++ */
++ public static final int
++ DOCUMENTPROPERTIES_ROLE = ServiceUIFactory.RESERVED_UIROLE +100;
++
++ /**
++ * Name of (this) abstract class for Document Properties.
++ */
++ public static final String
++ DOCPROPERTIESCLASSNAME = DocumentPropertiesUI.class.getName();
++
++ /**
++ * Invokes whatever code is needed to display a native dialog
++ * with the specified owner. The owner should be the cross-platform
++ * dialog. If the user cancels the dialog the return value is null.
++ * A non-null return value is always a new attribute set (or is it?)
++ * The cross-platform dialog may need to be updated to reflect the
++ * updated properties.
++ */
++ public abstract PrintRequestAttributeSet
++ showDocumentProperties(PrinterJob job,
++ Window owner,
++ PrintService service,
++ PrintRequestAttributeSet aset);
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/sun/print/PrinterJobWrapper.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,60 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package sun.print;
++
++import java.awt.print.PrinterJob;
++import javax.print.attribute.PrintRequestAttribute;
++
++public class PrinterJobWrapper implements PrintRequestAttribute {
++
++ private static final long serialVersionUID = -8792124426995707237L;
++
++ private PrinterJob job;
++
++ public PrinterJobWrapper(PrinterJob job) {
++ this.job = job;
++ }
++
++ public PrinterJob getPrinterJob() {
++ return job;
++ }
++
++ public final Class getCategory() {
++ return PrinterJobWrapper.class;
++ }
++
++ public final String getName() {
++ return "printerjob-wrapper";
++ }
++
++ public String toString() {
++ return "printerjob-wrapper: " + job.toString();
++ }
++
++ public int hashCode() {
++ return job.hashCode();
++ }
++}
+--- ./jdk/src/share/classes/sun/print/RasterPrinterJob.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/print/RasterPrinterJob.java Wed May 07 19:26:47 2014 -0700
+@@ -879,6 +879,9 @@
+ int x = bounds.x+bounds.width/3;
+ int y = bounds.y+bounds.height/3;
+ PrintService newService;
++ // temporarily add an attribute pointing back to this job.
++ PrinterJobWrapper jobWrapper = new PrinterJobWrapper(this);
++ attributes.add(jobWrapper);
+ try {
+ newService =
+ ServiceUI.printDialog(gc, x, y,
+@@ -891,6 +894,7 @@
+ DocFlavor.SERVICE_FORMATTED.PAGEABLE,
+ attributes);
+ }
++ attributes.remove(PrinterJobWrapper.class);
+
+ if (newService == null) {
+ return false;
+--- ./jdk/src/share/classes/sun/print/ServiceDialog.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/print/ServiceDialog.java Wed May 07 19:26:47 2014 -0700
+@@ -46,6 +46,7 @@
+ import java.awt.event.ItemListener;
+ import java.awt.event.WindowEvent;
+ import java.awt.event.WindowAdapter;
++import java.awt.print.PrinterJob;
+ import java.io.File;
+ import java.io.FilePermission;
+ import java.io.IOException;
+@@ -119,8 +120,6 @@
+ private AppearancePanel pnlAppearance;
+
+ private boolean isAWT = false;
+-
+-
+ static {
+ initResource();
+ }
+@@ -801,9 +800,32 @@
+ if (dialog != null) {
+ dialog.show();
+ } else {
+- // REMIND: may want to notify the user why we're
+- // disabling the button
+- btnProperties.setEnabled(false);
++ DocumentPropertiesUI docPropertiesUI = null;
++ try {
++ docPropertiesUI =
++ (DocumentPropertiesUI)uiFactory.getUI
++ (DocumentPropertiesUI.DOCUMENTPROPERTIES_ROLE,
++ DocumentPropertiesUI.DOCPROPERTIESCLASSNAME);
++ } catch (Exception ex) {
++ }
++ if (docPropertiesUI != null) {
++ PrinterJobWrapper wrapper = (PrinterJobWrapper)
++ asCurrent.get(PrinterJobWrapper.class);
++ if (wrapper == null) {
++ return; // should not happen, defensive only.
++ }
++ PrinterJob job = wrapper.getPrinterJob();
++ if (job == null) {
++ return; // should not happen, defensive only.
++ }
++ PrintRequestAttributeSet newAttrs =
++ docPropertiesUI.showDocumentProperties
++ (job, ServiceDialog.this, psCurrent, asCurrent);
++ if (newAttrs != null) {
++ asCurrent.addAll(newAttrs);
++ updatePanels();
++ }
++ }
+ }
+ }
+ }
+--- ./jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java Wed May 07 19:26:47 2014 -0700
+@@ -525,6 +525,10 @@
+
+ // get the mechanism token
+ byte[] mechToken = initToken.getMechToken();
++ if (mechToken == null) {
++ throw new GSSException(GSSException.FAILURE, -1,
++ "mechToken is missing");
++ }
+
+ /*
+ * Select the best match between the list of mechs
+--- ./jdk/src/share/classes/sun/security/krb5/Credentials.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/security/krb5/Credentials.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 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,7 +62,9 @@
+ private static CredentialsCache cache;
+ static boolean alreadyLoaded = false;
+ private static boolean alreadyTried = false;
+- private static native Credentials acquireDefaultNativeCreds();
++
++ // Read native ticket with session key type in the given list
++ private static native Credentials acquireDefaultNativeCreds(int[] eTypes);
+
+ public Credentials(Ticket new_ticket,
+ PrincipalName new_client,
+@@ -373,6 +375,8 @@
+ // It assumes that the GSS call has
+ // the privilege to access the default cache file.
+
++ // This method is only called on Windows and Mac OS X, the native
++ // acquireDefaultNativeCreds is also available on these platforms.
+ public static synchronized Credentials acquireDefaultCreds() {
+ Credentials result = null;
+
+@@ -416,10 +420,11 @@
+ }
+ if (alreadyLoaded) {
+ // There is some native code
+- if (DEBUG)
+- System.out.println(">> Acquire default native Credentials");
+- result = acquireDefaultNativeCreds();
+- // only TGT with DES key will be returned by native method
++ if (DEBUG) {
++ System.out.println(">> Acquire default native Credentials");
++ }
++ result = acquireDefaultNativeCreds(
++ EType.getDefaults("default_tkt_enctypes"));
+ }
+ }
+ return result;
+--- ./jdk/src/share/classes/sun/security/krb5/Realm.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/security/krb5/Realm.java Wed May 07 19:26:47 2014 -0700
+@@ -34,6 +34,7 @@
+ import sun.security.krb5.internal.Krb5;
+ import sun.security.util.*;
+ import java.io.IOException;
++import java.util.LinkedList;
+ import java.util.StringTokenizer;
+ import java.util.Vector;
+ import java.util.Stack;
+@@ -301,21 +302,25 @@
+ }
+
+ /**
+- * Parses the [capaths] stanza of the configuration file
+- * for a list of realms to traverse
+- * to obtain credentials from the initiating realm cRealm to
+- * the target realm sRealm.
+- * @param cRealm the initiating realm
+- * @param sRealm the target realm
+- * @returns array of realms
+- * @ throws KrbException
+- */
+-
+- /*
+- * parseCapaths works for a capaths organized such that
+- * for a given client realm C there is a tag C that
+- * contains subtags Ci ... Cn that completely define intermediate
+- * realms from C to target T. For example:
++ * Parses the [capaths] stanza of the configuration file for a
++ * list of realms to traverse to obtain credentials from the
++ * initiating realm cRealm to the target realm sRealm.
++ *
++ * For a given client realm C there is a tag C in [capaths] whose
++ * subtag S has a value which is a (possibly partial) path from C
++ * to S. When the path is partial, it contains only the tail of the
++ * full path. Values of other subtags will be used to build the full
++ * path. The value "." means a direct path from C to S. If realm S
++ * does not appear as a subtag, there is no path defined here.
++ *
++ * The implementation ignores all values which equals to C or S, or
++ * a "." in multiple values, or any duplicated realm names.
++ *
++ * When a path value has more than two realms, they can be specified
++ * with multiple key-value pairs each having a single value, but the
++ * order must not change.
++ *
++ * For example:
+ *
+ * [capaths]
+ * TIVOLI.COM = {
+@@ -324,19 +329,24 @@
+ * LDAPCENTRAL.NET = .
+ * }
+ *
+- * The tag TIVOLI.COM contains subtags IBM.COM, IBM_LDAPCENTRAL.COM
+- * and LDAPCENTRAL.NET that completely define the path from TIVOLI.COM
+- * to IBM.COM (TIVOLI.COM->LADAPCENTRAL.NET->IBM_LDAPCENTRAL.COM->IBM
+- * or TIVOLI.COM->MOONLITE.ORG->IBM.COM).
++ * TIVOLI.COM has a direct path to LDAPCENTRAL.NET, which has a direct
++ * path to IBM_LDAPCENTRAL.COM. It also has a partial path to IBM.COM
++ * being "IBM_LDAPCENTRAL.COM MOONLITE.ORG". Merging these info together,
++ * a full path from TIVOLI.COM to IBM.COM will be
+ *
+- * A direct path is assumed for an intermediary whose entry is not
+- * "closed" by a "." In the above example, TIVOLI.COM is assumed
+- * to have a direct path to MOONLITE.ORG and MOONLITE.COM
+- * in turn to IBM.COM.
++ * TIVOLI.COM -> LDAPCENTRAL.NET -> IBM_LDAPCENTRAL.COM
++ * -> IBM_LDAPCENTRAL.COM -> MOONLITE.ORG
++ *
++ * Please note the sRealm IBM.COM does not appear in the path.
++ *
++ * @param cRealm the initiating realm
++ * @param sRealm the target realm, not the same as cRealm
++ * @returns array of realms including at least cRealm as the first
++ * element, or null if the config does not contain a sub-stanza
++ * for cRealm in [capaths] or the sub-stanza does not contain
++ * sRealm as a tag
+ */
+-
+- private static String[] parseCapaths(String cRealm, String sRealm) throws KrbException {
+- String[] retList = null;
++ private static String[] parseCapaths(String cRealm, String sRealm) {
+
+ Config cfg = null;
+ try {
+@@ -358,323 +368,102 @@
+ return null;
+ }
+
+- String tempTarget = null, tempRealm = null;
+- Stack<String> iStack = new Stack<>();
++ LinkedList<String> path = new LinkedList<>();
+
+- /*
+- * The half-established reversed-path, starting from the final target
+- * (sRealm), each item can be connected to by the next one.
+- * Might contains wrong item, if found, a bad track is performed
+- */
+- Vector<String> tempList = new Vector<>(8, 8);
+- tempList.add(sRealm);
+-
+- int count = 0; // For debug only
+- tempTarget = sRealm;
+-
+- out: do {
+- if (DEBUG) {
+- count++;
+- System.out.println(">>> Realm parseCapaths: loop " +
+- count + ": target=" + tempTarget);
+- }
+-
+- if (intermediaries != null &&
+- !intermediaries.equals(".") &&
+- !intermediaries.equals(cRealm)) {
+- if (DEBUG) {
+- System.out.println(">>> Realm parseCapaths: loop " +
+- count + ": intermediaries=[" +
+- intermediaries + "]");
+- }
+-
+- /*
+- * We have one or more space-separated intermediary realms.
+- * Stack them. A null is always added between intermedies of
+- * different targets. When this null is popped, it means none
+- * of the intermedies for this target is useful (because of
+- * infinite loop), the target is then removed from the partial
+- * tempList, and the next possible intermediary is tried.
+- */
+- iStack.push(null);
+- String[] ints = intermediaries.split("\\s+");
+- for (int i = ints.length-1; i>=0; i--)
+- {
+- tempRealm = ints[i];
+- if (tempRealm.equals(PrincipalName.REALM_COMPONENT_SEPARATOR_STR)) {
+- break out;
+- }
+- if (!tempList.contains(tempRealm)) {
+- iStack.push(tempRealm);
+- if (DEBUG) {
+- System.out.println(">>> Realm parseCapaths: loop " +
+- count +
+- ": pushed realm on to stack: " +
+- tempRealm);
+- }
+- } else if (DEBUG) {
+- System.out.println(">>> Realm parseCapaths: loop " +
+- count +
+- ": ignoring realm: [" +
+- tempRealm + "]");
+- }
+- }
+- } else {
+- if (DEBUG) {
+- System.out.println(">>> Realm parseCapaths: loop " +
+- count +
+- ": no intermediaries");
+- }
++ String head = sRealm;
++ while (true) {
++ String value = cfg.getDefault(head, cRealm);
++ if (value == null) {
+ break;
+ }
+-
+- /*
+- * Get next intermediary realm from the stack
+- */
+-
+- try {
+- while ((tempTarget = iStack.pop()) == null) {
+- tempList.removeElementAt(tempList.size()-1);
+- if (DEBUG) {
+- System.out.println(">>> Realm parseCapaths: backtrack, remove tail");
+- }
++ String[] more = value.split("\\s+");
++ boolean changed = false;
++ for (int i=more.length-1; i>=0; i--) {
++ if (path.contains(more[i])
++ || more[i].equals(".")
++ || more[i].equals(cRealm)
++ || more[i].equals(sRealm)
++ || more[i].equals(head)) {
++ // Ignore invalid values
++ continue;
+ }
+- } catch (EmptyStackException exc) {
+- tempTarget = null;
++ changed = true;
++ path.addFirst(more[i]);
+ }
+-
+- if (tempTarget == null) {
+- /*
+- * No more intermediaries. We're done.
+- */
+- break;
+- }
+-
+- tempList.add(tempTarget);
+-
+- if (DEBUG) {
+- System.out.println(">>> Realm parseCapaths: loop " + count +
+- ": added intermediary to list: " +
+- tempTarget);
+- }
+-
+- intermediaries = cfg.getDefault(tempTarget, cRealm);
+-
+- } while (true);
+-
+- if (tempList.isEmpty()) {
+- return null;
++ if (!changed) break;
++ head = path.getFirst();
+ }
+-
+- // From (SREALM, T1, T2) to (CREALM, T2, T1)
+- retList = new String[tempList.size()];
+- retList[0] = cRealm;
+- for (int i=1; i<tempList.size(); i++) {
+- retList[i] = tempList.elementAt(tempList.size()-i);
+- }
+-
+- if (DEBUG && retList != null) {
+- for (int i = 0; i < retList.length; i++) {
+- System.out.println(">>> Realm parseCapaths [" + i +
+- "]=" + retList[i]);
+- }
+- }
+-
+- return retList;
+- }
++ path.addFirst(cRealm);
++ return path.toArray(new String[path.size()]);
++ }
+
+ /**
+ * Build a list of realm that can be traversed
+ * to obtain credentials from the initiating realm cRealm
+ * for a service in the target realm sRealm.
+ * @param cRealm the initiating realm
+- * @param sRealm the target realm
+- * @returns array of realms
+- * @throws KrbException
++ * @param sRealm the target realm, not the same as cRealm
++ * @returns array of realms including cRealm as the first element
+ */
+- private static String[] parseHierarchy(String cRealm, String sRealm)
+- throws KrbException
+- {
+- String[] retList = null;
++ private static String[] parseHierarchy(String cRealm, String sRealm) {
+
+- // Parse the components and determine common part, if any.
++ String[] cComponents = cRealm.split("\\.");
++ String[] sComponents = sRealm.split("\\.");
+
+- String[] cComponents = null;
+- String[] sComponents = null;
++ int cPos = cComponents.length;
++ int sPos = sComponents.length;
+
+- StringTokenizer strTok =
+- new StringTokenizer(cRealm,
+- PrincipalName.REALM_COMPONENT_SEPARATOR_STR);
+-
+- // Parse cRealm
+-
+- int cCount = strTok.countTokens();
+- cComponents = new String[cCount];
+-
+- for (cCount = 0; strTok.hasMoreTokens(); cCount++) {
+- cComponents[cCount] = strTok.nextToken();
++ boolean hasCommon = false;
++ for (sPos--, cPos--; sPos >=0 && cPos >= 0 &&
++ sComponents[sPos].equals(cComponents[cPos]);
++ sPos--, cPos--) {
++ hasCommon = true;
+ }
+
+- if (DEBUG) {
+- System.out.println(">>> Realm parseHierarchy: cRealm has " +
+- cCount + " components:");
+- int j = 0;
+- while (j < cCount) {
+- System.out.println(">>> Realm parseHierarchy: " +
+- "cComponents["+j+"]=" + cComponents[j++]);
+- }
++ // For those with common components:
++ // length pos
++ // SITES1.SALES.EXAMPLE.COM 4 1
++ // EVERYWHERE.EXAMPLE.COM 3 0
++
++ // For those without common components:
++ // length pos
++ // DEVEL.EXAMPLE.COM 3 2
++ // PROD.EXAMPLE.ORG 3 2
++
++ LinkedList<String> path = new LinkedList<>();
++
++ // Un-common ones for client side
++ for (int i=0; i<=cPos; i++) {
++ path.addLast(subStringFrom(cComponents, i));
+ }
+
+- // Parse sRealm
+-
+- strTok = new StringTokenizer(sRealm,
+- PrincipalName.REALM_COMPONENT_SEPARATOR_STR);
+-
+- int sCount = strTok.countTokens();
+- sComponents = new String[sCount];
+-
+- for (sCount = 0; strTok.hasMoreTokens(); sCount++) {
+- sComponents[sCount] = strTok.nextToken();
++ // Common one
++ if (hasCommon) {
++ path.addLast(subStringFrom(cComponents, cPos+1));
+ }
+
+- if (DEBUG) {
+- System.out.println(">>> Realm parseHierarchy: sRealm has " +
+- sCount + " components:");
+- int j = 0;
+- while (j < sCount) {
+- System.out.println(">>> Realm parseHierarchy: sComponents["+j+
+- "]=" + sComponents[j++]);
+- }
++ // Un-common ones for server side
++ for (int i=sPos; i>=0; i--) {
++ path.addLast(subStringFrom(sComponents, i));
+ }
+
+- // Determine common components, if any.
++ // Remove sRealm from path. Note that it might be added at last loop
++ // or as a common component, if sRealm is a parent of cRealm
++ path.removeLast();
+
+- int commonComponents = 0;
+-
+- //while (sCount > 0 && cCount > 0 &&
+- // sComponents[--sCount].equals(cComponents[--cCount]))
+-
+- for (sCount--, cCount--; sCount >=0 && cCount >= 0 &&
+- sComponents[sCount].equals(cComponents[cCount]);
+- sCount--, cCount--) {
+- commonComponents++;
+- }
+-
+- int cCommonStart = -1;
+- int sCommonStart = -1;
+-
+- int links = 0;
+-
+- if (commonComponents > 0) {
+- sCommonStart = sCount+1;
+- cCommonStart = cCount+1;
+-
+- // components from common to ancestors
+- links += sCommonStart;
+- links += cCommonStart;
+- } else {
+- links++;
+- }
+-
+- if (DEBUG) {
+- if (commonComponents > 0) {
+- System.out.println(">>> Realm parseHierarchy: " +
+- commonComponents + " common component" +
+- (commonComponents > 1 ? "s" : " "));
+-
+- System.out.println(">>> Realm parseHierarchy: common part "
+- +
+- "in cRealm (starts at index " +
+- cCommonStart + ")");
+- System.out.println(">>> Realm parseHierarchy: common part in sRealm (starts at index " +
+- sCommonStart + ")");
+-
+-
+- String commonPart = substring(cRealm, cCommonStart);
+- System.out.println(">>> Realm parseHierarchy: common part in cRealm=" +
+- commonPart);
+-
+- commonPart = substring(sRealm, sCommonStart);
+- System.out.println(">>> Realm parseHierarchy: common part in sRealm=" +
+- commonPart);
+-
+- } else
+- System.out.println(">>> Realm parseHierarchy: no common part");
+- }
+-
+- if (DEBUG) {
+- System.out.println(">>> Realm parseHierarchy: total links=" + links);
+- }
+-
+- retList = new String[links];
+-
+- retList[0] = new String(cRealm);
+-
+- if (DEBUG) {
+- System.out.println(">>> Realm parseHierarchy A: retList[0]=" +
+- retList[0]);
+- }
+-
+- // For an initiator realm A.B.C.D.COM,
+- // build a list krbtgt/B.C.D.COM@A.B.C.D.COM up to the common part,
+- // ie the issuer realm is the immediate descendant
+- // of the target realm.
+-
+- String cTemp = null, sTemp = null;
+- int i;
+- for (i = 1, cCount = 0; i < links && cCount < cCommonStart; cCount++) {
+- sTemp = substring(cRealm, cCount+1);
+- //cTemp = substring(cRealm, cCount);
+- retList[i++] = new String(sTemp);
+-
+- if (DEBUG) {
+- System.out.println(">>> Realm parseHierarchy B: retList[" +
+- (i-1) +"]="+retList[i-1]);
+- }
+- }
+-
+-
+- for (sCount = sCommonStart; i < links && sCount - 1 > 0; sCount--) {
+- sTemp = substring(sRealm, sCount-1);
+- //cTemp = substring(sRealm, sCount);
+- retList[i++] = new String(sTemp);
+- if (DEBUG) {
+- System.out.println(">>> Realm parseHierarchy D: retList[" +
+- (i-1) +"]="+retList[i-1]);
+- }
+- }
+-
+- return retList;
++ return path.toArray(new String[path.size()]);
+ }
+
+- private static String substring(String realm, int componentIndex)
+- {
+- int i = 0 , j = 0, len = realm.length();
+-
+- while(i < len && j != componentIndex) {
+- if (realm.charAt(i++) != PrincipalName.REALM_COMPONENT_SEPARATOR)
+- continue;
+- j++;
++ /**
++ * Creates a realm name using components from the given postion.
++ * For example, subStringFrom({"A", "B", "C"}, 1) is "B.C".
++ */
++ private static String subStringFrom(String[] components, int from) {
++ StringBuilder sb = new StringBuilder();
++ for (int i=from; i<components.length; i++) {
++ if (sb.length() != 0) sb.append('.');
++ sb.append(components[i]);
+ }
+-
+- return realm.substring(i);
++ return sb.toString();
+ }
+-
+- static int getRandIndex(int arraySize) {
+- return (int)(Math.random() * 16384.0) % arraySize;
+- }
+-
+- static void printNames(String[] names) {
+- if (names == null || names.length == 0)
+- return;
+-
+- int len = names.length;
+- int i = 0;
+- System.out.println("List length = " + len);
+- while (i < names.length) {
+- System.out.println("["+ i +"]=" + names[i]);
+- i++;
+- }
+- }
+-
+ }
+--- ./jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java Wed May 07 19:26:47 2014 -0700
+@@ -155,13 +155,11 @@
+ }
+
+ /*
+- * No tgt found. Try to get one for a
+- * realm as close to the target as possible.
+- * That means traversing the realms list backwards.
++ * No tgt found. Let's go thru the realms list one by one.
+ */
+
+- for (newTgt = null, k = realms.length - 1;
+- newTgt == null && k > i; k--)
++ for (newTgt = null, k = i+1;
++ newTgt == null && k < realms.length; k++)
+ {
+
+ tempService = new ServiceName(
+--- ./jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Wed May 07 19:26:47 2014 -0700
+@@ -172,7 +172,7 @@
+ /*
+ * Drives the protocol state machine.
+ */
+- private int connectionState;
++ private volatile int connectionState;
+
+ /*
+ * Flag indicating if the next record we receive MUST be a Finished
+@@ -1443,7 +1443,7 @@
+ * Return whether the socket has been explicitly closed by the application.
+ */
+ public boolean isClosed() {
+- return getConnectionState() == cs_APP_CLOSED;
++ return connectionState == cs_APP_CLOSED;
+ }
+
+ /**
+--- ./jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java Wed May 07 19:26:47 2014 -0700
+@@ -55,7 +55,7 @@
+ {"Usage.jarsigner.options.jar.file.alias",
+ "\u7528\u6CD5: jarsigner [\u9009\u9879] jar-file \u522B\u540D"},
+ {".jarsigner.verify.options.jar.file.alias.",
+- " jarsigner -verify [options] jar-file [alias...]"},
++ " jarsigner -verify [\u9009\u9879] jar-file [\u522B\u540D...]"},
+ {".keystore.url.keystore.location",
+ "[-keystore <url>] \u5BC6\u94A5\u5E93\u4F4D\u7F6E"},
+ {".storepass.password.password.for.keystore.integrity",
+@@ -65,7 +65,7 @@
+ {".keypass.password.password.for.private.key.if.different.",
+ "[-keypass <\u53E3\u4EE4>] \u79C1\u6709\u5BC6\u94A5\u7684\u53E3\u4EE4 (\u5982\u679C\u4E0D\u540C)"},
+ {".certchain.file.name.of.alternative.certchain.file",
+- "[-certchain <file>] \u66FF\u4EE3 certchain \u6587\u4EF6\u7684\u540D\u79F0"},
++ "[-certchain <\u6587\u4EF6>] \u66FF\u4EE3\u8BC1\u4E66\u94FE\u6587\u4EF6\u7684\u540D\u79F0"},
+ {".sigfile.file.name.of.SF.DSA.file",
+ "[-sigfile <\u6587\u4EF6>] .SF/.DSA \u6587\u4EF6\u7684\u540D\u79F0"},
+ {".signedjar.file.name.of.signed.JAR.file",
+--- ./jdk/src/share/classes/sun/swing/SwingUtilities2.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/swing/SwingUtilities2.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 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,6 +34,7 @@
+ import java.awt.geom.*;
+ import java.awt.print.PrinterGraphics;
+ import java.text.Bidi;
++import java.text.CharacterIterator;
+ import java.text.AttributedCharacterIterator;
+ import java.text.AttributedString;
+
+@@ -503,22 +504,25 @@
+ * it to fit in the screen width. This distributes the spacing
+ * more evenly than directly laying out to the screen advances.
+ */
+- float screenWidth = (float)
+- g2d.getFont().getStringBounds(text, DEFAULT_FRC).getWidth();
+- TextLayout layout = createTextLayout(c, text, g2d.getFont(),
+- g2d.getFontRenderContext());
++ String trimmedText = trimTrailingSpaces(text);
++ if (!trimmedText.isEmpty()) {
++ float screenWidth = (float) g2d.getFont().getStringBounds
++ (trimmedText, DEFAULT_FRC).getWidth();
++ TextLayout layout = createTextLayout(c, text, g2d.getFont(),
++ g2d.getFontRenderContext());
+
+- layout = layout.getJustifiedLayout(screenWidth);
+- /* Use alternate print color if specified */
+- Color col = g2d.getColor();
+- if (col instanceof PrintColorUIResource) {
+- g2d.setColor(((PrintColorUIResource)col).getPrintColor());
++ layout = layout.getJustifiedLayout(screenWidth);
++ /* Use alternate print color if specified */
++ Color col = g2d.getColor();
++ if (col instanceof PrintColorUIResource) {
++ g2d.setColor(((PrintColorUIResource)col).getPrintColor());
++ }
++
++ layout.draw(g2d, x, y);
++
++ g2d.setColor(col);
+ }
+
+- layout.draw(g2d, x, y);
+-
+- g2d.setColor(col);
+-
+ return;
+ }
+ }
+@@ -777,25 +781,27 @@
+ if (frc != null &&
+ !isFontRenderContextPrintCompatible
+ (deviceFontRenderContext, frc)) {
+- TextLayout layout =
+- createTextLayout(c, new String(data, offset, length),
+- g2d.getFont(),
+- deviceFontRenderContext);
+- float screenWidth = (float)g2d.getFont().
+- getStringBounds(data, offset, offset + length, frc).
+- getWidth();
+- layout = layout.getJustifiedLayout(screenWidth);
+
+- /* Use alternate print color if specified */
+- Color col = g2d.getColor();
+- if (col instanceof PrintColorUIResource) {
+- g2d.setColor(((PrintColorUIResource)col).getPrintColor());
++ String text = new String(data, offset, length);
++ TextLayout layout = new TextLayout(text, g2d.getFont(),
++ deviceFontRenderContext);
++ String trimmedText = trimTrailingSpaces(text);
++ if (!trimmedText.isEmpty()) {
++ float screenWidth = (float)g2d.getFont().
++ getStringBounds(trimmedText, frc).getWidth();
++ layout = layout.getJustifiedLayout(screenWidth);
++
++ /* Use alternate print color if specified */
++ Color col = g2d.getColor();
++ if (col instanceof PrintColorUIResource) {
++ g2d.setColor(((PrintColorUIResource)col).getPrintColor());
++ }
++
++ layout.draw(g2d,x,y);
++
++ g2d.setColor(col);
+ }
+
+- layout.draw(g2d,x,y);
+-
+- g2d.setColor(col);
+-
+ return nextX;
+ }
+ }
+@@ -876,14 +882,23 @@
+ } else {
+ frc = g2d.getFontRenderContext();
+ }
+- TextLayout layout = new TextLayout(iterator, frc);
++ TextLayout layout;
+ if (isPrinting) {
+ FontRenderContext deviceFRC = g2d.getFontRenderContext();
+ if (!isFontRenderContextPrintCompatible(frc, deviceFRC)) {
+- float screenWidth = layout.getAdvance();
+ layout = new TextLayout(iterator, deviceFRC);
+- layout = layout.getJustifiedLayout(screenWidth);
++ AttributedCharacterIterator trimmedIt =
++ getTrimmedTrailingSpacesIterator(iterator);
++ if (trimmedIt != null) {
++ float screenWidth = new TextLayout(trimmedIt, frc).
++ getAdvance();
++ layout = layout.getJustifiedLayout(screenWidth);
++ }
++ } else {
++ layout = new TextLayout(iterator, frc);
+ }
++ } else {
++ layout = new TextLayout(iterator, frc);
+ }
+ layout.draw(g2d, x, y);
+ retVal = layout.getAdvance();
+@@ -1035,6 +1050,39 @@
+ return (g instanceof PrinterGraphics || g instanceof PrintGraphics);
+ }
+
++ private static String trimTrailingSpaces(String s) {
++ int i = s.length() - 1;
++ while(i >= 0 && Character.isWhitespace(s.charAt(i))) {
++ i--;
++ }
++ return s.substring(0, i + 1);
++ }
++
++ private static AttributedCharacterIterator getTrimmedTrailingSpacesIterator
++ (AttributedCharacterIterator iterator) {
++ int curIdx = iterator.getIndex();
++
++ char c = iterator.last();
++ while(c != CharacterIterator.DONE && Character.isWhitespace(c)) {
++ c = iterator.previous();
++ }
++
++ if (c != CharacterIterator.DONE) {
++ int endIdx = iterator.getIndex();
++
++ if (endIdx == iterator.getEndIndex() - 1) {
++ iterator.setIndex(curIdx);
++ return iterator;
++ } else {
++ AttributedString trimmedText = new AttributedString(iterator,
++ iterator.getBeginIndex(), endIdx + 1);
++ return trimmedText.getIterator();
++ }
++ } else {
++ return null;
++ }
++ }
++
+ /**
+ * Determines whether the SelectedTextColor should be used for painting text
+ * foreground for the specified highlight.
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties Wed May 07 19:26:47 2014 -0700
+@@ -44,4 +44,4 @@
+ out.inflated=\ inflado: {0}
+ out.size=(entrada = {0}) (sa\u00EDda= {1})
+
+-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
++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 atualiza 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 passa para o diret\u00F3rio especificado e inclui o arquivo a seguir\nSe um arquivo tamb\u00E9m for um diret\u00F3rio, ele 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 denominado 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/jconsole/Messages.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/tools/jconsole/Messages.java Wed May 07 19:26:47 2014 -0700
+@@ -36,7 +36,7 @@
+ Resources.initializeMessages(Messages.class, BUNDLE_NAME);
+ }
+ // TODO:
+- // The names of some of the constants below looks strange.
++ // The names of some of the constants below look strange.
+ // That's because they were generated programmatically
+ // from the messages. They should be cleaned up,
+ // ___ should be removed etc.
+@@ -265,6 +265,7 @@
+ public static String SUMMARY_TAB_TAB_NAME;
+ public static String SUMMARY_TAB_VM_VERSION;
+ public static String THREADS;
++ public static String THREAD_TAB_INFO_LABEL_FORMAT;
+ public static String THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME;
+ public static String THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME;
+ public static String THRESHOLD;
+@@ -304,9 +305,9 @@
+ public static String WRITABLE;
+ public static String CONNECTION_FAILED1;
+ public static String CONNECTION_FAILED2;
++ public static String CONNECTION_FAILED_SSL1;
++ public static String CONNECTION_FAILED_SSL2;
+ public static String CONNECTION_LOST1;
+- public static String CONNECTION_INSECURE1;
+- public static String CONNECTION_INSECURE2;
+ public static String CONNECTING_TO1;
+ public static String CONNECTING_TO2;
+ public static String DEADLOCK_TAB;
+--- ./jdk/src/share/classes/sun/tools/jconsole/SummaryTab.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/tools/jconsole/SummaryTab.java Wed May 07 19:26:47 2014 -0700
+@@ -213,8 +213,8 @@
+ String[] strings2 = formatKByteStrings(u.getCommitted());
+ append(Messages.COMMITTED_MEMORY, strings2[0]);
+ append(Messages.SUMMARY_TAB_PENDING_FINALIZATION_LABEL,
+- Messages.SUMMARY_TAB_PENDING_FINALIZATION_VALUE,
+- memoryBean.getObjectPendingFinalizationCount());
++ Resources.format(Messages.SUMMARY_TAB_PENDING_FINALIZATION_VALUE,
++ memoryBean.getObjectPendingFinalizationCount()));
+ append(endTable);
+
+ append(newTable);
+--- ./jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java Wed May 07 19:26:47 2014 -0700
+@@ -66,9 +66,6 @@
+
+ private static final Border thinEmptyBorder = new EmptyBorder(2, 2, 2, 2);
+
+- private static final String infoLabelFormat = "ThreadTab.infoLabelFormat";
+-
+-
+ /*
+ Hierarchy of panels and layouts for this tab:
+
+@@ -690,7 +687,7 @@
+
+ private void updateThreadsInfo(long tlCount, long tpCount, long ttCount, long timeStamp) {
+ getPlotter().addValues(timeStamp, tlCount);
+- getInfoLabel().setText(Resources.format(infoLabelFormat, tlCount, tpCount, ttCount));
++ getInfoLabel().setText(Resources.format(Messages.THREAD_TAB_INFO_LABEL_FORMAT, tlCount, tpCount, ttCount));
+ }
+ }
+ }
+--- ./jdk/src/share/classes/sun/tools/jconsole/VMPanel.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/tools/jconsole/VMPanel.java Wed May 07 19:26:47 2014 -0700
+@@ -469,8 +469,8 @@
+ msgExplanation = Resources.format(Messages.CONNECTING_TO2, getConnectionName());
+ buttonStr = Messages.RECONNECT;
+ } else if (shouldUseSSL) {
+- msgTitle = Messages.CONNECTION_INSECURE1;
+- msgExplanation = Resources.format(Messages.CONNECTION_INSECURE2, getConnectionName());
++ msgTitle = Messages.CONNECTION_FAILED_SSL1;
++ msgExplanation = Resources.format(Messages.CONNECTION_FAILED_SSL2, getConnectionName());
+ buttonStr = Messages.INSECURE;
+ } else {
+ msgTitle = Messages.CONNECTION_FAILED1;
+--- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties Wed May 07 19:26:47 2014 -0700
+@@ -223,6 +223,7 @@
+ SUMMARY_TAB_TAB_NAME=VM Summary
+ SUMMARY_TAB_VM_VERSION={0} version {1}
+ THREADS=Threads
++THREAD_TAB_INFO_LABEL_FORMAT=<html>Live: {0} Peak: {1} Total: {2}</html>
+ THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=Thread Information
+ THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=Chart for number of threads.
+ THRESHOLD=Threshold
+@@ -244,7 +245,7 @@
+ UNREGISTER=Unregister
+ UPTIME=Uptime
+ USAGE_THRESHOLD=Usage Threshold
+-REMOTE_TF_USAGE=<b>Usage</b>: &lt;hostname&gt;:&lt;port&gt; OR service:jmx:&lt;protocol&gt;:&lt;sap&gt;
++REMOTE_TF_USAGE=<b>Usage</b>: &&lt;hostname&&gt;:&&lt;port&&gt; OR service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
+ USED=Used
+ USERNAME_COLON_=&Username:
+ USERNAME_ACCESSIBLE_NAME=User Name
+@@ -262,9 +263,9 @@
+ WRITABLE=Writable
+ CONNECTION_FAILED1=Connection Failed: Retry?
+ CONNECTION_FAILED2=The connection to {0} did not succeed.<br>Would you like to try again?
++CONNECTION_FAILED_SSL1=Secure connection failed. Retry insecurely?
++CONNECTION_FAILED_SSL2=The connection to {0} could not be made using SSL.<br>Would you like to try without SSL?<br>(Username and password will be sent in plain text.)
+ CONNECTION_LOST1=Connection Lost: Reconnect?
+-CONNECTION_INSECURE1=ConnectionFailedSSL1
+-CONNECTION_INSECURE2=ConnectionFailedSSL2
+ CONNECTING_TO1=Connecting to {0}
+ CONNECTING_TO2=You are currently being connected to {0}.<br>This will take a few moments.
+ DEADLOCK_TAB=Deadlock
+--- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Wed May 07 19:26:47 2014 -0700
+@@ -52,7 +52,7 @@
+ CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u30B9\u30C6\u30FC\u30BF\u30B9\u30FB\u30D0\u30FC
+ CONNECT_DIALOG_TITLE=JConsole: \u65B0\u898F\u63A5\u7D9A
+ CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u63A5\u7D9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u5207\u65AD\u3057\u307E\u3059\u3002
+-CONNECTION_FAILED=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
++CONNECTION_FAILED=\u63A5\u7D9A\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+ CONNECTION=\u63A5\u7D9A(&C)
+ CONNECTION_NAME=\u63A5\u7D9A\u540D
+ CONNECTION_NAME__DISCONNECTED_={0} (\u5207\u65AD\u6E08)
+@@ -88,8 +88,8 @@
+ FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u7F6E\u63DB
+ FILE_CHOOSER_FILE_EXISTS_TITLE=\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
+ FILE_CHOOSER_SAVED_FILE=<html>\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3057\u305F:<br>{0}<br>({1}\u30D0\u30A4\u30C8)
+-FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F:<br>{0}<br>{1}
+-FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F
++FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u4FDD\u5B58\u304C\u5931\u6557\u3057\u307E\u3057\u305F:<br>{0}<br>{1}
++FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+ FREE_PHYSICAL_MEMORY=\u7A7A\u304D\u7269\u7406\u30E1\u30E2\u30EA\u30FC
+ FREE_SWAP_SPACE=\u7A7A\u304D\u30B9\u30EF\u30C3\u30D7\u30FB\u30B9\u30DA\u30FC\u30B9
+ GARBAGE_COLLECTOR=\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30BF
+@@ -161,7 +161,7 @@
+ MESSAGE=\u30E1\u30C3\u30BB\u30FC\u30B8
+ METHOD_SUCCESSFULLY_INVOKED=\u30E1\u30BD\u30C3\u30C9\u304C\u6B63\u5E38\u306B\u8D77\u52D5\u3055\u308C\u307E\u3057\u305F
+ MINIMIZE_ALL=\u3059\u3079\u3066\u6700\u5C0F\u5316(&M)
+-MONITOR_LOCKED=\ \ \ - \u30ED\u30C3\u30AF\u6E08{0}\n
++MONITOR_LOCKED=\ - \u30ED\u30C3\u30AF\u6E08{0}\n
+ NAME=\u540D\u524D
+ NAME_AND_BUILD={0} (\u30D3\u30EB\u30C9{1})
+ NAME_STATE=\u540D\u524D: {0}\n\u72B6\u614B: {1}\n
+@@ -205,6 +205,7 @@
+ PROCESS_CPU_TIME=\u30D7\u30ED\u30BB\u30B9CPU\u6642\u9593
+ READABLE=\u8AAD\u53D6\u308A\u53EF\u80FD
+ RECONNECT=\u518D\u63A5\u7D9A
++INSECURE=\u975E\u30BB\u30AD\u30E5\u30A2
+ REMOTE_PROCESS_COLON=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9(&R):
+ REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9
+ RESTORE_ALL=\u3059\u3079\u3066\u5FA9\u5143(&R)
+@@ -222,6 +223,7 @@
+ SUMMARY_TAB_TAB_NAME=VM\u30B5\u30DE\u30EA\u30FC
+ SUMMARY_TAB_VM_VERSION={0}\u30D0\u30FC\u30B8\u30E7\u30F3{1}
+ THREADS=\u30B9\u30EC\u30C3\u30C9
++THREAD_TAB_INFO_LABEL_FORMAT=<html>\u5B9F\u884C\u4E2D: {0} \u30D4\u30FC\u30AF: {1} \u5408\u8A08: {2}</html>
+ THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u60C5\u5831
+ THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u6570\u306E\u30C1\u30E3\u30FC\u30C8\u3002
+ THRESHOLD=\u3057\u304D\u3044\u5024
+@@ -243,7 +245,7 @@
+ UNREGISTER=\u767B\u9332\u89E3\u9664
+ UPTIME=\u7A3C\u50CD\u6642\u9593
+ USAGE_THRESHOLD=\u4F7F\u7528\u3057\u304D\u3044\u5024
+-REMOTE_TF_USAGE=<b>\u4F7F\u7528\u65B9\u6CD5</b>: &lt;hostname&gt;:&lt;port&gt;\u307E\u305F\u306Fservice:jmx:&lt;protocol&gt;:&lt;sap&gt;
++REMOTE_TF_USAGE=<b>\u4F7F\u7528\u65B9\u6CD5</b>: &&lt;hostname&&gt;:&&lt;port&&gt; OR service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
+ USED=\u4F7F\u7528\u6E08
+ USERNAME_COLON_=\u30E6\u30FC\u30B6\u30FC\u540D(&U):
+ USERNAME_ACCESSIBLE_NAME=\u30E6\u30FC\u30B6\u30FC\u540D
+@@ -259,8 +261,10 @@
+ WINDOW=\u30A6\u30A3\u30F3\u30C9\u30A6(&W)
+ WINDOWS=\u30A6\u30A3\u30F3\u30C9\u30A6
+ WRITABLE=\u66F8\u8FBC\u307F\u53EF\u80FD
+-CONNECTION_FAILED1=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F: \u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
+-CONNECTION_FAILED2={0}\u3078\u306E\u63A5\u7D9A\u304C\u6210\u529F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002<br>\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u307E\u3059\u304B\u3002
++CONNECTION_FAILED1=\u63A5\u7D9A\u304C\u5931\u6557\u3057\u307E\u3057\u305F: \u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
++CONNECTION_FAILED2={0}\u3078\u306E\u63A5\u7D9A\u304C\u6210\u529F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002<br>\u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
++CONNECTION_FAILED_SSL1=\u30BB\u30AD\u30E5\u30A2\u306A\u63A5\u7D9A\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u975E\u30BB\u30AD\u30E5\u30A2\u3067\u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
++CONNECTION_FAILED_SSL2=SSL\u3092\u4F7F\u7528\u3057\u3066{0}\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002<br>SSL\u306A\u3057\u3067\u63A5\u7D9A\u3057\u307E\u3059\u304B\u3002<br>(\u30E6\u30FC\u30B6\u30FC\u540D\u304A\u3088\u3073\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u30D7\u30EC\u30FC\u30F3\u30FB\u30C6\u30AD\u30B9\u30C8\u3067\u9001\u4FE1\u3055\u308C\u307E\u3059\u3002)
+ CONNECTION_LOST1=\u63A5\u7D9A\u304C\u5931\u308F\u308C\u307E\u3057\u305F: \u518D\u63A5\u7D9A\u3057\u307E\u3059\u304B\u3002
+ CONNECTING_TO1={0}\u306B\u63A5\u7D9A\u4E2D
+ CONNECTING_TO2={0}\u306B\u73FE\u5728\u63A5\u7D9A\u4E2D\u3067\u3059\u3002<br>\u3053\u308C\u306B\u306F\u6570\u5206\u304B\u304B\u308A\u307E\u3059\u3002
+@@ -270,4 +274,4 @@
+ KBYTES={0} KB
+ PLOT=\u30D7\u30ED\u30C3\u30C8
+ VISUALIZE=\u8996\u899A\u5316
+-ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n -interval \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n -notile \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u4E26\u3079\u3066\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n -version \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5370\u5237\u3059\u308B\n\n connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n pid \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n host \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n port \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n -J JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B
++ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n -interval \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n -notile \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u4E26\u3079\u3066\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n -version \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3059\u308B\n\n connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n pid \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n host \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n port \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n -J JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B
+--- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties Wed May 07 19:26:47 2014 -0700
+@@ -161,7 +161,7 @@
+ MESSAGE=\u6D88\u606F
+ METHOD_SUCCESSFULLY_INVOKED=\u5DF2\u6210\u529F\u8C03\u7528\u65B9\u6CD5
+ MINIMIZE_ALL=\u5168\u90E8\u6700\u5C0F\u5316(&M)
+-MONITOR_LOCKED=\ \ \ - \u5DF2\u9501\u5B9A {0}\n
++MONITOR_LOCKED=\ - \u5DF2\u9501\u5B9A {0}\n
+ NAME=\u540D\u79F0
+ NAME_AND_BUILD={0} (\u5DE5\u4F5C\u7248\u672C {1})
+ NAME_STATE=\u540D\u79F0: {0}\n\u72B6\u6001: {1}\n
+@@ -205,6 +205,7 @@
+ PROCESS_CPU_TIME=\u8FDB\u7A0B CPU \u65F6\u95F4
+ READABLE=\u53EF\u8BFB
+ RECONNECT=\u91CD\u65B0\u8FDE\u63A5
++INSECURE=\u4E0D\u5B89\u5168
+ REMOTE_PROCESS_COLON=\u8FDC\u7A0B\u8FDB\u7A0B(&R):
+ REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u8FDC\u7A0B\u8FDB\u7A0B
+ RESTORE_ALL=\u5168\u90E8\u8FD8\u539F(&R)
+@@ -222,6 +223,7 @@
+ SUMMARY_TAB_TAB_NAME=VM \u6982\u8981
+ SUMMARY_TAB_VM_VERSION={0}\u7248\u672C {1}
+ THREADS=\u7EBF\u7A0B
++THREAD_TAB_INFO_LABEL_FORMAT=<html>\u6D3B\u52A8: {0} \u5CF0\u503C: {1} \u603B\u8BA1: {2}</html>
+ THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u7EBF\u7A0B\u4FE1\u606F
+ THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u8868\u793A\u7EBF\u7A0B\u6570\u7684\u56FE\u8868\u3002
+ THRESHOLD=\u9608\u503C
+@@ -243,7 +245,7 @@
+ UNREGISTER=\u6CE8\u9500
+ UPTIME=\u8FD0\u884C\u65F6\u95F4
+ USAGE_THRESHOLD=\u7528\u6CD5\u9608\u503C
+-REMOTE_TF_USAGE=<b>\u7528\u6CD5</b>: &lt;hostname&gt;:&lt;port&gt; \u6216 service:jmx:&lt;protocol&gt;:&lt;sap&gt;
++REMOTE_TF_USAGE=<b>\u7528\u6CD5</b>: &&lt;hostname&&gt;:&&lt;port&&gt; \u6216 service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
+ USED=\u5DF2\u7528
+ USERNAME_COLON_=\u7528\u6237\u540D(&U):
+ USERNAME_ACCESSIBLE_NAME=\u7528\u6237\u540D
+@@ -261,6 +263,8 @@
+ WRITABLE=\u53EF\u5199\u5165
+ CONNECTION_FAILED1=\u8FDE\u63A5\u5931\u8D25: \u662F\u5426\u91CD\u8BD5?
+ CONNECTION_FAILED2=\u672A\u6210\u529F\u8FDE\u63A5\u5230{0}\u3002<br>\u662F\u5426\u8981\u91CD\u8BD5?
++CONNECTION_FAILED_SSL1=\u5B89\u5168\u8FDE\u63A5\u5931\u8D25\u3002\u662F\u5426\u4EE5\u4E0D\u5B89\u5168\u7684\u65B9\u5F0F\u91CD\u8BD5?
++CONNECTION_FAILED_SSL2=\u65E0\u6CD5\u4F7F\u7528 SSL \u8FDE\u63A5\u5230{0}\u3002<br>\u662F\u5426\u5728\u4E0D\u4F7F\u7528 SSL \u7684\u60C5\u51B5\u4E0B\u8FDB\u884C\u5C1D\u8BD5?<br>(\u7528\u6237\u540D\u548C\u53E3\u4EE4\u5C06\u4EE5\u7EAF\u6587\u672C\u683C\u5F0F\u53D1\u9001\u3002)
+ CONNECTION_LOST1=\u8FDE\u63A5\u4E22\u5931: \u662F\u5426\u91CD\u65B0\u8FDE\u63A5?
+ CONNECTING_TO1=\u6B63\u5728\u8FDE\u63A5\u5230{0}
+ CONNECTING_TO2=\u60A8\u5F53\u524D\u6B63\u5728\u8FDE\u63A5\u5230{0}\u3002<br>\u8FD9\u5C06\u9700\u8981\u51E0\u5206\u949F\u7684\u65F6\u95F4\u3002
+--- ./jdk/src/share/classes/sun/util/logging/resources/logging.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/logging/resources/logging.properties Wed May 07 19:26:47 2014 -0700
+@@ -27,20 +27,20 @@
+ # these are the same as the non-localized level name.
+
+ # The following ALL CAPS words should be translated.
+-ALL=ALL
++ALL=All
+ # The following ALL CAPS words should be translated.
+-SEVERE=SEVERE
++SEVERE=Severe
+ # The following ALL CAPS words should be translated.
+-WARNING=WARNING
++WARNING=Warning
+ # The following ALL CAPS words should be translated.
+-INFO=INFO
++INFO=Info
+ # The following ALL CAPS words should be translated.
+-CONFIG= CONFIG
++CONFIG= Config
+ # The following ALL CAPS words should be translated.
+-FINE=FINE
++FINE=Fine
+ # The following ALL CAPS words should be translated.
+-FINER=FINER
++FINER=Finer
+ # The following ALL CAPS words should be translated.
+-FINEST=FINEST
++FINEST=Finest
+ # The following ALL CAPS words should be translated.
+-OFF=OFF
++OFF=Off
+--- ./jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties Wed May 07 19:26:47 2014 -0700
+@@ -27,7 +27,7 @@
+ # these are the same as the non-localized level name.
+
+ # The following ALL CAPS words should be translated.
+-ALL=\u5168\u90E8
++ALL=\u6240\u6709
+ # The following ALL CAPS words should be translated.
+ SEVERE=\u56B4\u91CD
+ # The following ALL CAPS words should be translated.
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"Syowa Time", "SYOT",
+ "Syowa Summer Time", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"Coordinated Universal Time", "UTC",
++ "Central European Summer Time", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"Vostok Time", "VOST",
+ "Vostok Summer Time", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "Samara Summer Time", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"Syowa Zeit", "SYOT",
+ "Syowa Sommerzeit", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"Koordinierte Universalzeit", "UTC",
++ "Mitteleurop\u00e4ische Sommerzeit", "MESZ"}},
+ {"Antarctica/Vostok", new String[] {"Vostok Zeit", "VOST",
+ "Vostok Sommerzeit", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "Samarische Sommerzeit", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"Hora de Syowa", "SYOT",
+ "Hora de verano de Syowa", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"Hora Universal Coordinada", "UTC",
++ "Hora de verano de Europa Central", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"Hora de Vostok", "VOST",
+ "Hora de verano de Vostok", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "Hora de verano de Samara", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"Heure de Syowa", "SYOT",
+ "Heure d'\u00e9t\u00e9 de Syowa", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"Temps universel coordonn\u00e9", "UTC",
++ "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"Heure de Vostok", "VOST",
+ "Heure d'\u00e9t\u00e9 de Vostok", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "Heure d'\u00e9t\u00e9 de Samara", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"Ora di Syowa", "SYOT",
+ "Ora estiva di Syowa", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"Tempo universale coordinato", "UTC",
++ "Ora estiva dell'Europa centrale", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"Ora di Vostok", "VOST",
+ "Ora estiva di Vostok", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "Ora estiva di Samara", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"\u662d\u548c\u57fa\u5730\u6642\u9593", "SYOT",
+ "\u662d\u548c\u57fa\u5730\u590f\u6642\u9593", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC",
++ "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u6642\u9593", "VOST",
+ "\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u590f\u6642\u9593", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"Syowa \uc2dc\uac04", "SYOT",
+ "Syowa \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC",
++ "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"Vostok \uc2dc\uac04", "VOST",
+ "Vostok \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"Fuso hor\u00e1rio de Syowa", "SYOT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Syowa", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"Tempo universal coordenado", "UTC",
++ "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"Fuso hor\u00e1rio de Vostok", "VOST",
+ "Fuso hor\u00e1rio de ver\u00e3o de Vostok", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"Syowa, normaltid", "SYOT",
+ "Syowa, sommartid", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"Koordinerad universell tid", "UTC",
++ "Centraleuropeisk sommartid", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"Vostok, normaltid", "VOST",
+ "Vostok, sommartid", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "Samara, sommartid", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"Syowa \u65f6\u95f4", "SYOT",
+ "Syowa \u590f\u4ee4\u65f6", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC",
++ "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"\u83ab\u65af\u6258\u514b\u65f6\u95f4", "VOST",
+ "\u83ab\u65af\u6258\u514b\u590f\u4ee4\u65f6", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -707,7 +709,7 @@
+ "\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Wed May 07 19:26:47 2014 -0700
+@@ -477,6 +477,8 @@
+ {"Antarctica/South_Pole", NZST},
+ {"Antarctica/Syowa", new String[] {"\u5915\u6b50\u74e6 (Syowa) \u6642\u9593", "SYOT",
+ "\u5915\u6b50\u74e6 (Syowa) \u590f\u4ee4\u6642\u9593", "SYOST"}},
++ {"Antarctica/Troll", new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC",
++ "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST"}},
+ {"Antarctica/Vostok", new String[] {"\u4f5b\u65af\u6258 (Vostok) \u6642\u9593", "VOST",
+ "\u4f5b\u65af\u6258 (Vostok) \u590f\u4ee4\u6642\u9593", "VOSST"}},
+ {"Arctic/Longyearbyen", CET},
+@@ -708,7 +710,7 @@
+ "\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST"}},
+ {"Europe/San_Marino", CET},
+ {"Europe/Sarajevo", CET},
+- {"Europe/Simferopol", EET},
++ {"Europe/Simferopol", MSK},
+ {"Europe/Skopje", CET},
+ {"Europe/Sofia", EET},
+ {"Europe/Stockholm", CET},
+--- ./jdk/src/share/demo/jvmti/hprof/hprof_init.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/demo/jvmti/hprof/hprof_init.c Wed May 07 19:26:47 2014 -0700
+@@ -1899,11 +1899,17 @@
+ */
+ getSystemProperty("sun.boot.library.path", &boot_path);
+ md_build_library_name(lname, FILENAME_MAX, boot_path, name);
++ if ( strlen(lname) == 0 ) {
++ HPROF_ERROR(JNI_TRUE, "Could not find library");
++ }
+ jvmtiDeallocate(boot_path);
+ handle = md_load_library(lname, err_buf, (int)sizeof(err_buf));
+ if ( handle == NULL ) {
+ /* This may be necessary on Windows. */
+ md_build_library_name(lname, FILENAME_MAX, "", name);
++ if ( strlen(lname) == 0 ) {
++ HPROF_ERROR(JNI_TRUE, "Could not find library");
++ }
+ handle = md_load_library(lname, err_buf, (int)sizeof(err_buf));
+ if ( handle == NULL ) {
+ HPROF_ERROR(JNI_TRUE, err_buf);
+@@ -1968,6 +1974,9 @@
+ getSystemProperty("sun.boot.library.path", &boot_path);
+ /* Load in NPT library for character conversions */
+ md_build_library_name(npt_lib, sizeof(npt_lib), boot_path, NPT_LIBNAME);
++ if ( strlen(npt_lib) == 0 ) {
++ HPROF_ERROR(JNI_TRUE, "Could not find npt library");
++ }
+ jvmtiDeallocate(boot_path);
+ NPT_INITIALIZE(npt_lib, &(gdata->npt), NPT_VERSION, NULL);
+ if ( gdata->npt == NULL ) {
+--- ./jdk/src/share/demo/jvmti/hprof/hprof_md.h Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/demo/jvmti/hprof/hprof_md.h Wed May 07 19:26:47 2014 -0700
+@@ -69,7 +69,7 @@
+ unsigned md_ntohs(unsigned short s);
+ unsigned md_ntohl(unsigned l);
+
+-void md_build_library_name(char *holder, int holderlen, char *pname, char *fname);
++void md_build_library_name(char *holder, int holderlen, const char *pname, const char *fname);
+ void * md_load_library(const char *name, char *err_buf, int err_buflen);
+ void md_unload_library(void *handle);
+ void * md_find_library_entry(void *handle, const char *name);
+--- ./jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+@@ -54,7 +54,7 @@
+ * jconsole's script console.
+ */
+
+-class ScriptShellPanel extends JPanel {
++public class ScriptShellPanel extends JPanel {
+
+ private static final long serialVersionUID = 4116273141148726319L;
+
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Wed May 07 19:26:47 2014 -0700
+@@ -62,7 +62,7 @@
+
+ #endif // End of ZLIB
+
+-#ifdef sparc
++#ifdef _BIG_ENDIAN
+ #define SWAP_BYTES(a) \
+ ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
+ #else
+--- ./jdk/src/share/native/common/check_code.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/native/common/check_code.c Wed May 07 19:26:47 2014 -0700
+@@ -90,6 +90,12 @@
+ #include "classfile_constants.h"
+ #include "opcodes.in_out"
+
++#ifdef __APPLE__
++/* use setjmp/longjmp versions that do not save/restore the signal mask */
++#define setjmp _setjmp
++#define longjmp _longjmp
++#endif
++
+ #define MAX_ARRAY_DIMENSIONS 255
+ /* align byte code */
+ #ifndef ALIGN_UP
+--- ./jdk/src/share/native/java/lang/Class.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/native/java/lang/Class.c Wed May 07 19:26:47 2014 -0700
+@@ -187,3 +187,16 @@
+
+ return result;
+ }
++
++JNIEXPORT jobject JNICALL
++Java_java_lang_Class_getCheckMemberAccessMethod(JNIEnv *env, jclass cls, jclass smClass)
++{
++ jmethodID mid;
++
++ mid = (*env)->GetMethodID(env, smClass, "checkMemberAccess", "(Ljava/lang/Class;I)V");
++ if (mid == NULL) {
++ return NULL;
++ }
++ return (*env)->ToReflectedMethod(env, smClass, mid, JNI_FALSE);
++}
++
+--- ./jdk/src/share/native/java/lang/ref/Finalizer.c Tue Mar 18 12:35:25 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,42 +0,0 @@
+-/*
+- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. Oracle designates this
+- * particular file as subject to the "Classpath" exception as provided
+- * by Oracle in the LICENSE file that accompanied this code.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- */
+-
+-#include "jni.h"
+-#include "java_lang_ref_Finalizer.h"
+-
+-
+-JNIEXPORT void JNICALL
+-Java_java_lang_ref_Finalizer_invokeFinalizeMethod(JNIEnv *env, jclass clazz,
+- jobject ob)
+-{
+- jclass cls;
+- jmethodID mid;
+-
+- cls = (*env)->GetObjectClass(env, ob);
+- if (cls == NULL) return;
+- mid = (*env)->GetMethodID(env, cls, "finalize", "()V");
+- if (mid == NULL) return;
+- (*env)->CallVoidMethod(env, ob, mid);
+-}
+--- ./jdk/src/share/native/sun/security/krb5/nativeccache.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/share/native/sun/security/krb5/nativeccache.c Wed May 07 19:26:47 2014 -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
+@@ -264,13 +264,22 @@
+
+ }
+
++int isIn(krb5_enctype e, int n, jint* etypes)
++{
++ int i;
++ for (i=0; i<n; i++) {
++ if (e == etypes[i]) return 1;
++ }
++ return 0;
++}
++
+ /*
+ * Class: sun_security_krb5_Credentials
+ * Method: acquireDefaultNativeCreds
+ * Signature: ()Lsun/security/krb5/Credentials;
+ */
+ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativeCreds
+-(JNIEnv *env, jclass krbcredsClass)
++(JNIEnv *env, jclass krbcredsClass, jintArray jetypes)
+ {
+ jobject krbCreds = NULL;
+ krb5_error_code err = 0;
+@@ -279,6 +288,8 @@
+ krb5_creds creds;
+ krb5_flags flags = 0;
+ krb5_context kcontext = NULL;
++ int netypes;
++ jint *etypes = NULL;
+
+ /* Initialize the Kerberos 5 context */
+ err = krb5_init_context (&kcontext);
+@@ -295,6 +306,9 @@
+ err = krb5_cc_start_seq_get (kcontext, ccache, &cursor);
+ }
+
++ netypes = (*env)->GetArrayLength(env, jetypes);
++ etypes = (jint *) (*env)->GetIntArrayElements(env, jetypes, NULL);
++
+ if (!err) {
+ while ((err = krb5_cc_next_cred (kcontext, ccache, &cursor, &creds)) == 0) {
+ char *serverName = NULL;
+@@ -305,7 +319,8 @@
+ }
+
+ if (!err) {
+- if (strncmp (serverName, "krbtgt", strlen("krbtgt")) == 0) {
++ if (strncmp (serverName, "krbtgt", sizeof("krbtgt")-1) == 0 &&
++ isIn(creds.keyblock.enctype, netypes, etypes)) {
+ jobject ticket, clientPrincipal, targetPrincipal, encryptionKey;
+ jobject ticketFlags, startTime, endTime;
+ jobject authTime, renewTillTime, hostAddresses;
+@@ -321,7 +336,7 @@
+ targetPrincipal = BuildClientPrincipal(env, kcontext, creds.server);
+ if (targetPrincipal == NULL) goto cleanup;
+
+- // Build a com.ibm.security.krb5.Ticket
++ // Build a sun/security/krb5/internal/Ticket
+ ticket = BuildTicket(env, &creds.ticket);
+ if (ticket == NULL) goto cleanup;
+
+@@ -353,7 +368,7 @@
+ krbcredsConstructor = (*env)->GetMethodID(env, krbcredsClass, "<init>",
+ "(Lsun/security/krb5/internal/Ticket;Lsun/security/krb5/PrincipalName;Lsun/security/krb5/PrincipalName;Lsun/security/krb5/EncryptionKey;Lsun/security/krb5/internal/TicketFlags;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/HostAddresses;)V");
+ if (krbcredsConstructor == 0) {
+- printf("Couldn't find com.ibm.security.krb5.Credentials constructor\n");
++ printf("Couldn't find sun.security.krb5.internal.Ticket constructor\n");
+ break;
+ }
+ }
+@@ -409,6 +424,10 @@
+ printiferr (err, "while finishing ticket retrieval");
+ }
+
++ if (etypes != NULL) {
++ (*env)->ReleaseIntArrayElements(env, jetypes, etypes, 0);
++ }
++
+ krb5_free_context (kcontext);
+ return krbCreds;
+ }
+--- ./jdk/src/solaris/back/linker_md.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/back/linker_md.c Wed May 07 19:26:47 2014 -0700
+@@ -55,29 +55,27 @@
+ #endif
+
+ static void dll_build_name(char* buffer, size_t buflen,
+- const char* pname, const char* fname) {
+- // Based on os_solaris.cpp
++ const char* paths, const char* fname) {
++ char *path, *paths_copy, *next_token;
+
+- char *path_sep = PATH_SEPARATOR;
+- char *pathname = (char *)pname;
+- while (strlen(pathname) > 0) {
+- char *p = strchr(pathname, *path_sep);
+- if (p == NULL) {
+- p = pathname + strlen(pathname);
+- }
+- /* check for NULL path */
+- if (p == pathname) {
+- continue;
+- }
+- (void)snprintf(buffer, buflen, "%.*s/lib%s." LIB_SUFFIX, (p - pathname),
+- pathname, fname);
++ paths_copy = strdup(paths);
++ if (paths_copy == NULL) {
++ return;
++ }
+
++ next_token = NULL;
++ path = strtok_r(paths_copy, PATH_SEPARATOR, &next_token);
++
++ while (path != NULL) {
++ snprintf(buffer, buflen, "%s/lib%s." LIB_SUFFIX, path, fname);
+ if (access(buffer, F_OK) == 0) {
+ break;
+ }
+- pathname = p + 1;
+ *buffer = '\0';
++ path = strtok_r(NULL, PATH_SEPARATOR, &next_token);
+ }
++
++ free(paths_copy);
+ }
+
+ /*
+@@ -98,7 +96,7 @@
+ * appropriate pre and extensions to a filename and the path
+ */
+ void
+-dbgsysBuildLibName(char *holder, int holderlen, char *pname, char *fname)
++dbgsysBuildLibName(char *holder, int holderlen, const char *pname, const char *fname)
+ {
+ const int pnamelen = pname ? strlen(pname) : 0;
+
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Wed May 07 19:26:47 2014 -0700
+@@ -303,40 +303,54 @@
+ * able to read any buffered data lingering in the OS pipe buffer.
+ */
+ static class ProcessPipeInputStream extends BufferedInputStream {
++ private final Object closeLock = new Object();
++
+ ProcessPipeInputStream(int fd) {
+ super(new FileInputStream(newFileDescriptor(fd)));
+ }
+
+- private static byte[] drainInputStream(InputStream in)
++ private InputStream drainInputStream(InputStream in)
+ throws IOException {
+- if (in == null) return null;
+ int n = 0;
+ int j;
+ byte[] a = null;
+- while ((j = in.available()) > 0) {
++ synchronized (closeLock) {
++ if (buf == null) // asynchronous close()?
++ return null; // discard
++ j = in.available();
++ }
++ while (j > 0) {
+ a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j);
+- n += in.read(a, n, j);
++ synchronized (closeLock) {
++ if (buf == null) // asynchronous close()?
++ return null; // discard
++ n += in.read(a, n, j);
++ j = in.available();
++ }
+ }
+- return (a == null || n == a.length) ? a : Arrays.copyOf(a, n);
++ return (a == null) ?
++ ProcessBuilder.NullInputStream.INSTANCE :
++ new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n));
+ }
+
+ /** Called by the process reaper thread when the process exits. */
+ synchronized void processExited() {
+- // Most BufferedInputStream methods are synchronized, but close()
+- // is not, and so we have to handle concurrent racing close().
+ try {
+ InputStream in = this.in;
+ if (in != null) {
+- byte[] stragglers = drainInputStream(in);
++ InputStream stragglers = drainInputStream(in);
+ in.close();
+- this.in = (stragglers == null) ?
+- ProcessBuilder.NullInputStream.INSTANCE :
+- new ByteArrayInputStream(stragglers);
+- if (buf == null) // asynchronous close()?
+- this.in = null;
++ this.in = stragglers;
+ }
+- } catch (IOException ignored) {
+- // probably an asynchronous close().
++ } catch (IOException ignored) { }
++ }
++
++ @Override
++ public void close() throws IOException {
++ // BufferedInputStream#close() is not synchronized unlike most other methods.
++ // Synchronizing helps avoid racing with drainInputStream().
++ synchronized (closeLock) {
++ super.close();
+ }
+ }
+ }
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux Wed May 07 19:26:47 2014 -0700
+@@ -305,40 +305,54 @@
+ * able to read any buffered data lingering in the OS pipe buffer.
+ */
+ static class ProcessPipeInputStream extends BufferedInputStream {
++ private final Object closeLock = new Object();
++
+ ProcessPipeInputStream(int fd) {
+ super(new FileInputStream(newFileDescriptor(fd)));
+ }
+
+- private static byte[] drainInputStream(InputStream in)
++ private InputStream drainInputStream(InputStream in)
+ throws IOException {
+- if (in == null) return null;
+ int n = 0;
+ int j;
+ byte[] a = null;
+- while ((j = in.available()) > 0) {
++ synchronized (closeLock) {
++ if (buf == null) // asynchronous close()?
++ return null; // discard
++ j = in.available();
++ }
++ while (j > 0) {
+ a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j);
+- n += in.read(a, n, j);
++ synchronized (closeLock) {
++ if (buf == null) // asynchronous close()?
++ return null; // discard
++ n += in.read(a, n, j);
++ j = in.available();
++ }
+ }
+- return (a == null || n == a.length) ? a : Arrays.copyOf(a, n);
++ return (a == null) ?
++ ProcessBuilder.NullInputStream.INSTANCE :
++ new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n));
+ }
+
+ /** Called by the process reaper thread when the process exits. */
+ synchronized void processExited() {
+- // Most BufferedInputStream methods are synchronized, but close()
+- // is not, and so we have to handle concurrent racing close().
+ try {
+ InputStream in = this.in;
+ if (in != null) {
+- byte[] stragglers = drainInputStream(in);
++ InputStream stragglers = drainInputStream(in);
+ in.close();
+- this.in = (stragglers == null) ?
+- ProcessBuilder.NullInputStream.INSTANCE :
+- new ByteArrayInputStream(stragglers);
+- if (buf == null) // asynchronous close()?
+- this.in = null;
++ this.in = stragglers;
+ }
+- } catch (IOException ignored) {
+- // probably an asynchronous close().
++ } catch (IOException ignored) { }
++ }
++
++ @Override
++ public void close() throws IOException {
++ // BufferedInputStream#close() is not synchronized unlike most other methods.
++ // Synchronizing helps avoid racing with drainInputStream().
++ synchronized (closeLock) {
++ super.close();
+ }
+ }
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -190,7 +190,7 @@
+ try {
+ Native.putLong(data, motifWindow);
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XlibWrapper.XChangeProperty(XToolkit.getDisplay(),
+ defaultRootWindow,
+ XA_MOTIF_DRAG_WINDOW.getAtom(),
+@@ -198,10 +198,10 @@
+ XConstants.PropModeReplace,
+ data, 1);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write motif drag window handle.");
+ }
+
+@@ -394,7 +394,7 @@
+ }
+ }
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XlibWrapper.XChangeProperty(XToolkit.getDisplay(),
+ motifWindow,
+ XA_MOTIF_DRAG_TARGETS.getAtom(),
+@@ -402,15 +402,15 @@
+ XConstants.PropModeReplace,
+ data, tableSize);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+
+ // Create a new motif window and retry.
+ motifWindow = createMotifWindow();
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XlibWrapper.XChangeProperty(XToolkit.getDisplay(),
+ motifWindow,
+ XA_MOTIF_DRAG_TARGETS.getAtom(),
+@@ -418,10 +418,10 @@
+ XConstants.PropModeReplace,
+ data, tableSize);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write motif drag targets property.");
+ }
+ }
+@@ -534,16 +534,16 @@
+ // CARD32 icc_handle
+ unsafe.putInt(structData + 4, (int)XA_MOTIF_ATOM_0.getAtom());
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), window,
+ XA_MOTIF_ATOM_0.getAtom(),
+ XA_MOTIF_DRAG_INITIATOR_INFO.getAtom(),
+ 8, XConstants.PropModeReplace,
+ structData, MOTIF_INITIATOR_INFO_SIZE);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write drag initiator info");
+ }
+ } finally {
+@@ -567,16 +567,16 @@
+ unsafe.putShort(data + 10, (short)0); /* pad */
+ unsafe.putInt(data + 12, dataSize);
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), window,
+ XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
+ XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
+ 8, XConstants.PropModeReplace,
+ data, dataSize);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write Motif receiver info property");
+ }
+ } finally {
+--- ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java Wed May 07 19:26:47 2014 -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
+@@ -162,16 +162,16 @@
+ unsafe.putInt(data + 12, dataSize);
+ }
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), embedder,
+ MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
+ MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
+ 8, XConstants.PropModeReplace,
+ data, dataSize);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write Motif receiver info property");
+ }
+ } finally {
+@@ -236,16 +236,16 @@
+
+ unsafe.putInt(data + 4, tproxy);
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XlibWrapper.XChangeProperty(XToolkit.getDisplay(), embedder,
+ MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
+ MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
+ 8, XConstants.PropModeReplace,
+ data, dataSize);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write Motif receiver info property");
+ }
+ }
+@@ -412,15 +412,15 @@
+ */
+ XWindowAttributes wattr = new XWindowAttributes();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
+ source_win, wattr.pData);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (status == 0 ||
+- (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
++ if ((status == 0) ||
++ ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
+ throw new XException("XGetWindowAttributes failed");
+ }
+
+@@ -429,15 +429,15 @@
+ wattr.dispose();
+ }
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ XlibWrapper.XSelectInput(XToolkit.getDisplay(), source_win,
+ source_win_mask |
+ XConstants.StructureNotifyMask);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("XSelectInput failed");
+ }
+
+@@ -1024,10 +1024,10 @@
+ if (sourceWindow != 0) {
+ XToolkit.awtLock();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ XlibWrapper.XSelectInput(XToolkit.getDisplay(), sourceWindow,
+ sourceWindowMask);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+ } finally {
+ XToolkit.awtUnlock();
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -99,7 +99,7 @@
+ }
+
+ if (errorHandler != null) {
+- XToolkit.WITH_XERROR_HANDLER(errorHandler);
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);
+ }
+ Native.putLong(data, 0);
+ int status = XlibWrapper.XGetWindowProperty(XToolkit.getDisplay(), window, property.getAtom(),
+@@ -112,7 +112,7 @@
+ }
+
+ if (errorHandler != null) {
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+ }
+ return status;
+ } finally {
+--- ./jdk/src/solaris/classes/sun/awt/X11/XConstants.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XConstants.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2009, 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
+--- ./jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -96,14 +96,14 @@
+ action_count++;
+ }
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndActionList.setAtomData(window,
+ XAtom.XA_ATOM,
+ data, action_count);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ cleanup();
+ throw new XException("Cannot write XdndActionList property");
+ }
+@@ -117,14 +117,14 @@
+ try {
+ Native.put(data, formats);
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndTypeList.setAtomData(window,
+ XAtom.XA_ATOM,
+ data, formats.length);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ cleanup();
+ throw new XException("Cannot write XdndActionList property");
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -88,12 +88,12 @@
+ try {
+ Native.putLong(data, 0, XDnDConstants.XDND_PROTOCOL_VERSION);
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndAware.setAtomData(window, XAtom.XA_ATOM, data, 1);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write XdndAware property");
+ }
+ } finally {
+@@ -205,54 +205,50 @@
+
+ /* The proxy window must have the XdndAware set, as XDnD protocol
+ prescribes to check the proxy window for XdndAware. */
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndAware.setAtomData(newProxy, XAtom.XA_ATOM,
+ data, 1);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() !=
+- XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write XdndAware property");
+ }
+
+ Native.putLong(data, 0, newProxy);
+
+ /* The proxy window must have the XdndProxy set to point to itself.*/
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndProxy.setAtomData(newProxy, XAtom.XA_WINDOW,
+ data, 1);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() !=
+- XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write XdndProxy property");
+ }
+
+ Native.putLong(data, 0, XDnDConstants.XDND_PROTOCOL_VERSION);
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndAware.setAtomData(embedder, XAtom.XA_ATOM,
+ data, 1);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() !=
+- XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write XdndAware property");
+ }
+
+ Native.putLong(data, 0, newProxy);
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndProxy.setAtomData(embedder, XAtom.XA_WINDOW,
+ data, 1);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() !=
+- XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write XdndProxy property");
+ }
+ } finally {
+@@ -278,27 +274,25 @@
+ try {
+ Native.putLong(data, 0, entry.getVersion());
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndAware.setAtomData(embedder, XAtom.XA_ATOM,
+ data, 1);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() !=
+- XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write XdndAware property");
+ }
+
+ Native.putLong(data, 0, (int)entry.getProxy());
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndProxy.setAtomData(embedder, XAtom.XA_WINDOW,
+ data, 1);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() !=
+- XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("Cannot write XdndProxy property");
+ }
+ } finally {
+@@ -541,15 +535,15 @@
+ */
+ XWindowAttributes wattr = new XWindowAttributes();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
+ source_win, wattr.pData);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (status == 0 ||
+- (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
++ if ((status == 0) ||
++ ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
+ throw new XException("XGetWindowAttributes failed");
+ }
+
+@@ -558,15 +552,15 @@
+ wattr.dispose();
+ }
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ XlibWrapper.XSelectInput(XToolkit.getDisplay(), source_win,
+ source_win_mask |
+ XConstants.StructureNotifyMask);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("XSelectInput failed");
+ }
+
+@@ -963,10 +957,10 @@
+ if (sourceWindow != 0) {
+ XToolkit.awtLock();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ XlibWrapper.XSelectInput(XToolkit.getDisplay(), sourceWindow,
+ sourceWindowMask);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+ } finally {
+ XToolkit.awtUnlock();
+ }
+@@ -1111,15 +1105,15 @@
+
+ XToolkit.awtLock();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XDnDConstants.XA_XdndTypeList.setAtomData(xclient.get_window(),
+ XAtom.XA_ATOM,
+ wpg.getData(),
+ wpg.getNumberOfItems());
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ if (logger.isLoggable(PlatformLogger.WARNING)) {
+ logger.warning("Cannot set XdndTypeList on the proxy window");
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -181,15 +181,15 @@
+ long time) {
+ XWindowAttributes wattr = new XWindowAttributes();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
+ targetWindow, wattr.pData);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (status == 0 ||
+- (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
++ if ((status == 0) ||
++ ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
+ throw new XException("XGetWindowAttributes failed");
+ }
+
+@@ -198,15 +198,15 @@
+ wattr.dispose();
+ }
+
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ XlibWrapper.XSelectInput(XToolkit.getDisplay(), targetWindow,
+ targetWindowMask |
+ XConstants.StructureNotifyMask);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("XSelectInput failed");
+ }
+
+@@ -214,10 +214,10 @@
+ }
+
+ protected final void finalizeDrop() {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ XlibWrapper.XSelectInput(XToolkit.getDisplay(), targetWindow,
+ targetWindowMask);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+ }
+
+ public abstract boolean processProxyModeEvent(XClientMessageEvent xclient,
+--- ./jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -168,14 +168,14 @@
+ if (dest_x >= 0 && dest_y >= 0) {
+ XWindowAttributes wattr = new XWindowAttributes();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
+ window, wattr.pData);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (status == 0 ||
+- (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
++ if ((status == 0) ||
++ ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
+ continue;
+ }
+
+@@ -222,14 +222,14 @@
+ long event_mask = 0;
+ XWindowAttributes wattr = new XWindowAttributes();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
+ embedder, wattr.pData);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (status == 0 ||
+- (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
++ if ((status == 0) ||
++ ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
+ throw new XException("XGetWindowAttributes failed");
+ }
+
+@@ -240,13 +240,13 @@
+ }
+
+ if ((event_mask & XConstants.PropertyChangeMask) == 0) {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ XlibWrapper.XSelectInput(XToolkit.getDisplay(), embedder,
+ event_mask | XConstants.PropertyChangeMask);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("XSelectInput failed");
+ }
+ }
+@@ -394,13 +394,13 @@
+
+ /* Restore the original event mask for the embedder. */
+ if ((event_mask & XConstants.PropertyChangeMask) == 0) {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ XlibWrapper.XSelectInput(XToolkit.getDisplay(), embedder,
+ event_mask);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ throw new XException("XSelectInput failed");
+ }
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -295,15 +295,15 @@
+ try {
+ XWindowAttributes wattr = new XWindowAttributes();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
+ xembed.handle, wattr.pData);
+
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (status == 0 ||
+- (XToolkit.saved_error != null &&
+- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
++ if ((status == 0) ||
++ ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
+ return null;
+ }
+
+--- ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2009, 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
+@@ -38,7 +38,7 @@
+ public static class XBaseErrorHandler extends XErrorHandler {
+ @Override
+ public int handleError(long display, XErrorEvent err) {
+- return XToolkit.SAVED_ERROR_HANDLER(display, err);
++ return XErrorHandlerUtil.SAVED_XERROR_HANDLER(display, err);
+ }
+ }
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,168 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++package sun.awt.X11;
++
++import java.security.AccessController;
++import sun.awt.SunToolkit;
++import sun.security.action.GetBooleanAction;
++import sun.util.logging.PlatformLogger;
++
++/**
++ * This class contains code of the global toolkit error handler, exposes static
++ * methods which allow to set and unset synthetic error handlers.
++ */
++public final class XErrorHandlerUtil {
++ private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XErrorHandlerUtil");
++
++ /**
++ * The connection to X11 window server.
++ */
++ private static long display;
++
++ /**
++ * Error handler at the moment of {@code XErrorHandlerUtil} initialization.
++ */
++ private static long saved_error_handler;
++
++ /**
++ * XErrorEvent being handled.
++ */
++ static volatile XErrorEvent saved_error;
++
++ /**
++ * Current error handler or null if no error handler is set.
++ */
++ private static XErrorHandler current_error_handler;
++
++ /**
++ * Value of sun.awt.noisyerrorhandler system property.
++ */
++ private static boolean noisyAwtHandler = AccessController.doPrivileged(
++ new GetBooleanAction("sun.awt.noisyerrorhandler"));
++
++ /**
++ * The flag indicating that {@code init} was called already.
++ */
++ private static boolean initPassed;
++
++ /**
++ * Guarantees that no instance of this class can be created.
++ */
++ private XErrorHandlerUtil() {}
++
++ /**
++ * Sets the toolkit global error handler, stores the connection to X11 server,
++ * which will be used during an error handling process. This method is called
++ * once from {@code awt_init_Display} function defined in {@code awt_GraphicsEnv.c}
++ * file immediately after the connection to X11 window server is opened.
++ * @param display the connection to X11 server which should be stored
++ */
++ private static void init(long display) {
++ SunToolkit.awtLock();
++ try {
++ if (!initPassed) {
++ XErrorHandlerUtil.display = display;
++ saved_error_handler = XlibWrapper.SetToolkitErrorHandler();
++ initPassed = true;
++ }
++ } finally {
++ SunToolkit.awtUnlock();
++ }
++ }
++
++ /**
++ * Sets a synthetic error handler. Must be called with the acquired AWT lock.
++ * @param handler the synthetic error handler to set
++ */
++ public static void WITH_XERROR_HANDLER(XErrorHandler handler) {
++ saved_error = null;
++ current_error_handler = handler;
++ }
++
++ /**
++ * Unsets a current synthetic error handler. Must be called with the acquired AWT lock.
++ */
++ public static void RESTORE_XERROR_HANDLER() {
++ RESTORE_XERROR_HANDLER(true);
++ }
++
++ private static void RESTORE_XERROR_HANDLER(boolean doXSync) {
++ if (doXSync) {
++ // Wait until all requests are processed by the X server
++ // and only then uninstall the error handler.
++ XSync();
++ }
++ current_error_handler = null;
++ }
++
++ /**
++ * Should be called under LOCK.
++ */
++ public static int SAVED_XERROR_HANDLER(long display, XErrorEvent error) {
++ if (saved_error_handler != 0) {
++ // Default XErrorHandler may just terminate the process. Don't call it.
++ // return XlibWrapper.CallErrorHandler(saved_error_handler, display, error.pData);
++ }
++ if (log.isLoggable(PlatformLogger.FINE)) {
++ log.fine("Unhandled XErrorEvent: " +
++ "id=" + error.get_resourceid() + ", " +
++ "serial=" + error.get_serial() + ", " +
++ "ec=" + error.get_error_code() + ", " +
++ "rc=" + error.get_request_code() + ", " +
++ "mc=" + error.get_minor_code());
++ }
++ return 0;
++ }
++
++ /**
++ * Called from the native code when an error occurs.
++ */
++ private static int globalErrorHandler(long display, long event_ptr) {
++ if (noisyAwtHandler) {
++ XlibWrapper.PrintXErrorEvent(display, event_ptr);
++ }
++ XErrorEvent event = new XErrorEvent(event_ptr);
++ saved_error = event;
++ try {
++ if (current_error_handler != null) {
++ return current_error_handler.handleError(display, event);
++ } else {
++ return SAVED_XERROR_HANDLER(display, event);
++ }
++ } catch (Throwable z) {
++ log.fine("Error in GlobalErrorHandler", z);
++ }
++ return 0;
++ }
++
++ private static void XSync() {
++ SunToolkit.awtLock();
++ try {
++ XlibWrapper.XSync(display, 0);
++ } finally {
++ SunToolkit.awtUnlock();
++ }
++ }
++}
+--- ./jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2008, 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
+@@ -26,9 +26,11 @@
+
+ import java.awt.Component;
+ import java.awt.Window;
+-import sun.util.logging.PlatformLogger;
++
++import sun.awt.AWTAccessor;
+ import sun.awt.CausedFocusEvent;
+ import sun.awt.KeyboardFocusManagerPeerImpl;
++import sun.util.logging.PlatformLogger;
+
+ public class XKeyboardFocusManagerPeer extends KeyboardFocusManagerPeerImpl {
+ private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XKeyboardFocusManagerPeer");
+@@ -68,13 +70,13 @@
+
+ synchronized(this) {
+ if (currentFocusedWindow != null) {
+- from = (XWindowPeer)currentFocusedWindow.getPeer();
++ from = (XWindowPeer)AWTAccessor.getComponentAccessor().getPeer(currentFocusedWindow);
+ }
+
+ currentFocusedWindow = win;
+
+ if (currentFocusedWindow != null) {
+- to = (XWindowPeer)currentFocusedWindow.getPeer();
++ to = (XWindowPeer)AWTAccessor.getComponentAccessor().getPeer(currentFocusedWindow);
+ }
+ }
+
+--- ./jdk/src/solaris/classes/sun/awt/X11/XQueryTree.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XQueryTree.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2005, 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
+@@ -61,7 +61,7 @@
+ }
+ __executed = true;
+ if (errorHandler != null) {
+- XToolkit.WITH_XERROR_HANDLER(errorHandler);
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);
+ }
+ Native.putLong(children_ptr, 0);
+ int status =
+@@ -72,7 +72,7 @@
+ children_ptr,
+ nchildren_ptr );
+ if (errorHandler != null) {
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+ }
+ return status;
+ } finally {
+--- ./jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Wed May 07 19:26:47 2014 -0700
+@@ -128,7 +128,6 @@
+ initIDs();
+ setBackingStoreType();
+ }
+- noisyAwtHandler = AccessController.doPrivileged(new GetBooleanAction("sun.awt.noisyerrorhandler"));
+ }
+
+ /*
+@@ -137,78 +136,6 @@
+ */
+ static native long getTrayIconDisplayTimeout();
+
+- //---- ERROR HANDLER CODE ----//
+-
+- /*
+- * Error handler at the moment of XToolkit initialization
+- */
+- private static long saved_error_handler;
+-
+- /*
+- * XErrorEvent being handled
+- */
+- static volatile XErrorEvent saved_error;
+-
+- /*
+- * Current error handler or null if no error handler is set
+- */
+- private static XErrorHandler current_error_handler;
+-
+- /*
+- * Value of sun.awt.noisyerrorhandler system property
+- */
+- private static boolean noisyAwtHandler;
+-
+- public static void WITH_XERROR_HANDLER(XErrorHandler handler) {
+- saved_error = null;
+- current_error_handler = handler;
+- }
+-
+- public static void RESTORE_XERROR_HANDLER() {
+- // wait until all requests are processed by the X server
+- // and only then uninstall the error handler
+- XSync();
+- current_error_handler = null;
+- }
+-
+- // Should be called under LOCK
+- public static int SAVED_ERROR_HANDLER(long display, XErrorEvent error) {
+- if (saved_error_handler != 0) {
+- // Default XErrorHandler may just terminate the process. Don't call it.
+- // return XlibWrapper.CallErrorHandler(saved_error_handler, display, error.pData);
+- }
+- if (log.isLoggable(PlatformLogger.FINE)) {
+- log.fine("Unhandled XErrorEvent: " +
+- "id=" + error.get_resourceid() + ", " +
+- "serial=" + error.get_serial() + ", " +
+- "ec=" + error.get_error_code() + ", " +
+- "rc=" + error.get_request_code() + ", " +
+- "mc=" + error.get_minor_code());
+- }
+- return 0;
+- }
+-
+- // Called from the native code when an error occurs
+- private static int globalErrorHandler(long display, long event_ptr) {
+- if (noisyAwtHandler) {
+- XlibWrapper.PrintXErrorEvent(display, event_ptr);
+- }
+- XErrorEvent event = new XErrorEvent(event_ptr);
+- saved_error = event;
+- try {
+- if (current_error_handler != null) {
+- return current_error_handler.handleError(display, event);
+- } else {
+- return SAVED_ERROR_HANDLER(display, event);
+- }
+- } catch (Throwable z) {
+- log.fine("Error in GlobalErrorHandler", z);
+- }
+- return 0;
+- }
+-
+- //---- END OF ERROR HANDLER CODE ----//
+-
+ private native static void initIDs();
+ native static void waitForEvents(long nextTaskTime);
+ static Thread toolkitThread;
+@@ -305,8 +232,6 @@
+ areExtraMouseButtonsEnabled = Boolean.parseBoolean(System.getProperty("sun.awt.enableExtraMouseButtons", "true"));
+ //set system property if not yet assigned
+ System.setProperty("sun.awt.enableExtraMouseButtons", ""+areExtraMouseButtonsEnabled);
+-
+- saved_error_handler = XlibWrapper.SetToolkitErrorHandler();
+ } finally {
+ awtUnlock();
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2005, 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
+@@ -68,7 +68,7 @@
+ }
+ __executed = true;
+ if (errorHandler != null) {
+- XToolkit.WITH_XERROR_HANDLER(errorHandler);
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);
+ }
+ int status =
+ XlibWrapper.XTranslateCoordinates(XToolkit.getDisplay(),
+@@ -80,7 +80,7 @@
+ dest_y_ptr,
+ child_ptr );
+ if (errorHandler != null) {
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+ }
+ return status;
+ } finally {
+--- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java Wed May 07 19:26:47 2014 -0700
+@@ -283,12 +283,12 @@
+ winmgr_running = false;
+ substruct.set_event_mask(XConstants.SubstructureRedirectMask);
+
+- XToolkit.WITH_XERROR_HANDLER(detectWMHandler);
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(detectWMHandler);
+ XlibWrapper.XChangeWindowAttributes(XToolkit.getDisplay(),
+ XToolkit.getDefaultRootWindow(),
+ XConstants.CWEventMask,
+ substruct.pData);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+ /*
+ * If no WM is running then our selection for SubstructureRedirect
+@@ -617,15 +617,16 @@
+
+ XToolkit.awtLock();
+ try {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
+ XlibWrapper.XChangePropertyS(XToolkit.getDisplay(), XToolkit.getDefaultRootWindow(),
+ XA_ICEWM_WINOPTHINT.getAtom(),
+ XA_ICEWM_WINOPTHINT.getAtom(),
+ 8, XConstants.PropModeReplace,
+ new String(opt));
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+
+- if (XToolkit.saved_error != null && XToolkit.saved_error.get_error_code() != XConstants.Success) {
++ if ((XErrorHandlerUtil.saved_error != null) &&
++ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
+ log.finer("Erorr getting XA_ICEWM_WINOPTHINT property");
+ return false;
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/XlibUtil.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XlibUtil.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -151,8 +151,8 @@
+ {
+ int status = xtc.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ if ((status != 0) &&
+- ((XToolkit.saved_error == null) ||
+- (XToolkit.saved_error.get_error_code() == XConstants.Success)))
++ ((XErrorHandlerUtil.saved_error == null) ||
++ (XErrorHandlerUtil.saved_error.get_error_code() == XConstants.Success)))
+ {
+ translated = new Point(xtc.get_dest_x(), xtc.get_dest_y());
+ }
+@@ -345,13 +345,13 @@
+ XWindowAttributes wattr = new XWindowAttributes();
+ try
+ {
+- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
++ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
+ int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
+ window, wattr.pData);
+- XToolkit.RESTORE_XERROR_HANDLER();
++ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
+ if ((status != 0) &&
+- ((XToolkit.saved_error == null) ||
+- (XToolkit.saved_error.get_error_code() == XConstants.Success)))
++ ((XErrorHandlerUtil.saved_error == null) ||
++ (XErrorHandlerUtil.saved_error.get_error_code() == XConstants.Success)))
+ {
+ return wattr.get_map_state();
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2009, 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
+@@ -992,7 +992,7 @@
+ pw.println("\t\t\t}");
+ pw.println("\t\t\t__executed = true;");
+ pw.println("\t\t\tif (errorHandler != null) {");
+- pw.println("\t\t\t XToolkit.WITH_XERROR_HANDLER(errorHandler);");
++ pw.println("\t\t\t XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);");
+ pw.println("\t\t\t}");
+ iter = ft.getArguments().iterator();
+ while (iter.hasNext()) {
+@@ -1021,7 +1021,7 @@
+ }
+ pw.println("\t\t\t);");
+ pw.println("\t\t\tif (errorHandler != null) {");
+- pw.println("\t\t\t XToolkit.RESTORE_XERROR_HANDLER();");
++ pw.println("\t\t\t XErrorHandlerUtil.RESTORE_XERROR_HANDLER();");
+ pw.println("\t\t\t}");
+ if (!ft.isVoid()) {
+ pw.println("\t\t\treturn status;");
+--- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c Wed May 07 19:26:47 2014 -0700
+@@ -376,33 +376,32 @@
+ }
+
+ static void dll_build_name(char* buffer, size_t buflen,
+- const char* pname, const char* fname) {
+- // Loosely based on os_solaris.cpp
++ const char* paths, const char* fname) {
++ char *path, *paths_copy, *next_token;
+
+- char *pathname = (char *)pname;
+- while (strlen(pathname) > 0) {
+- char *p = strchr(pathname, ':');
+- if (p == NULL) {
+- p = pathname + strlen(pathname);
+- }
+- /* check for NULL path */
+- if (p == pathname) {
+- continue;
+- }
+- (void)snprintf(buffer, buflen, "%.*s/lib%s" JNI_LIB_SUFFIX,
+- (p - pathname), pathname, fname);
++ paths_copy = strdup(paths);
++ if (paths_copy == NULL) {
++ return;
++ }
+
+- if (access(buffer, F_OK) == 0) {
++ next_token = NULL;
++ path = strtok_r(paths_copy, ":", &next_token);
++
++ while (path != NULL) {
++ snprintf(buffer, buflen, "%s/lib%s" JNI_LIB_SUFFIX, path, fname);
++ if (access(buffer, F_OK) == 0) {
+ break;
+- }
+- pathname = p + 1;
+- *buffer = '\0';
+- }
++ }
++ *buffer = '\0';
++ path = strtok_r(NULL, ":", &next_token);
++ }
++
++ free(paths_copy);
+ }
+
+ /* Create the actual fill filename for a dynamic library. */
+ void
+-md_build_library_name(char *holder, int holderlen, char *pname, char *fname)
++md_build_library_name(char *holder, int holderlen, const char *pname, const char *fname)
+ {
+ int pnamelen;
+
+--- ./jdk/src/solaris/native/java/lang/java_props_macosx.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/lang/java_props_macosx.c Wed May 07 19:26:47 2014 -0700
+@@ -31,6 +31,7 @@
+ #include <Security/AuthSession.h>
+ #include <CoreFoundation/CoreFoundation.h>
+ #include <SystemConfiguration/SystemConfiguration.h>
++#include <Foundation/Foundation.h>
+
+ #include "java_props_macosx.h"
+
+@@ -262,9 +263,20 @@
+ return c_exception;
+ }
+
++/*
++ * Method for fetching the user.home path and storing it in the property list.
++ * For signed .apps running in the Mac App Sandbox, user.home is set to the
++ * app's sandbox container.
++ */
++void setUserHome(java_props_t *sprops) {
++ if (sprops == NULL) { return; }
++ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
++ sprops->user_home = createUTF8CString((CFStringRef)NSHomeDirectory());
++ [pool drain];
++}
+
+ /*
+- * Method for fetching proxy info and storing it in the propery list.
++ * Method for fetching proxy info and storing it in the property list.
+ */
+ void setProxyProperties(java_props_t *sProps) {
+ if (sProps == NULL) return;
+--- ./jdk/src/solaris/native/java/lang/java_props_macosx.h Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/lang/java_props_macosx.h Wed May 07 19:26:47 2014 -0700
+@@ -27,6 +27,7 @@
+
+ char *setupMacOSXLocale(int cat);
+ void setOSNameAndVersion(java_props_t *sprops);
++void setUserHome(java_props_t *sprops);
+ void setProxyProperties(java_props_t *sProps);
+
+ enum PreferredToolkit_enum {
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c Wed May 07 19:26:47 2014 -0700
+@@ -324,6 +324,25 @@
+ *std_encoding = "Big5-HKSCS-2001";
+ }
+ #endif
++#ifdef MACOSX
++ /*
++ * For the case on MacOS X where encoding is set to US-ASCII, but we
++ * don't have any encoding hints from LANG/LC_ALL/LC_CTYPE, use UTF-8
++ * instead.
++ *
++ * The contents of ASCII files will still be read and displayed
++ * correctly, but so will files containing UTF-8 characters beyond the
++ * standard ASCII range.
++ *
++ * Specifically, this allows apps launched by double-clicking a .jar
++ * file to correctly read UTF-8 files using the default encoding (see
++ * 8011194).
++ */
++ if (strcmp(p,"US-ASCII") == 0 && getenv("LANG") == NULL &&
++ getenv("LC_ALL") == NULL && getenv("LC_CTYPE") == NULL) {
++ *std_encoding = "UTF-8";
++ }
++#endif
+ }
+
+ return 1;
+@@ -527,7 +546,14 @@
+ {
+ struct passwd *pwent = getpwuid(getuid());
+ sprops.user_name = pwent ? strdup(pwent->pw_name) : "?";
+- sprops.user_home = pwent ? strdup(pwent->pw_dir) : "?";
++#ifdef MACOSX
++ setUserHome(&sprops);
++#else
++ sprops.user_home = pwent ? strdup(pwent->pw_dir) : NULL;
++#endif
++ if (sprops.user_home == NULL) {
++ sprops.user_home = "?";
++ }
+ }
+
+ /* User TIMEZONE */
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Wed May 07 19:26:47 2014 -0700
+@@ -559,11 +559,9 @@
+
+ if ((sock = openSocketWithFallback(env, name_utf)) < 0) {
+ (*env)->ReleaseStringUTFChars(env, name, name_utf);
+- return -1;
++ return -1;
+ }
+
+- name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
+-
+ ret = getFlags(sock, name_utf, &flags);
+
+ close(sock);
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Wed May 07 19:26:47 2014 -0700
+@@ -574,6 +574,8 @@
+ } else if (ret == JVM_IO_ERR) {
+ if (errno == EBADF) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
++ } else if (errno == ENOMEM) {
++ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
+ } else {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "Peek failed");
+ }
+@@ -674,15 +676,18 @@
+ "Receive timed out");
+ return -1;
+ } else if (ret == JVM_IO_ERR) {
++ if (errno == ENOMEM) {
++ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
+ #ifdef __linux__
+- if (errno == EBADF) {
++ } else if (errno == EBADF) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
+ } else {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "Receive failed");
++#else
++ } else {
++ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
++#endif
+ }
+-#else
+- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
+-#endif
+ return -1;
+ } else if (ret == JVM_IO_INTR) {
+ JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
+@@ -910,15 +915,18 @@
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
+ "Receive timed out");
+ } else if (ret == JVM_IO_ERR) {
++ if (errno == ENOMEM) {
++ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
+ #ifdef __linux__
+- if (errno == EBADF) {
++ } else if (errno == EBADF) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
+ } else {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "Receive failed");
++#else
++ } else {
++ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
++#endif
+ }
+-#else
+- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
+-#endif
+ } else if (ret == JVM_IO_INTR) {
+ JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
+ "operation interrupted");
+--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Wed May 07 19:26:47 2014 -0700
+@@ -708,7 +708,6 @@
+ } else {
+ ret = NET_Timeout(fd, timeout);
+ }
+-
+ if (ret == 0) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
+ "Accept timed out");
+@@ -716,6 +715,8 @@
+ } else if (ret == JVM_IO_ERR) {
+ if (errno == EBADF) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
++ } else if (errno == ENOMEM) {
++ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
+ } else {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "Accept failed");
+ }
+--- ./jdk/src/solaris/native/java/net/SocketInputStream.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/net/SocketInputStream.c Wed May 07 19:26:47 2014 -0700
+@@ -108,6 +108,8 @@
+ } else if (nread == JVM_IO_ERR) {
+ if (errno == EBADF) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
++ } else if (errno == ENOMEM) {
++ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
+ } else {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
+ "select/poll failed");
+--- ./jdk/src/solaris/native/java/net/bsd_close.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/net/bsd_close.c Wed May 07 19:26:47 2014 -0700
+@@ -25,6 +25,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/param.h>
+ #include <signal.h>
+ #include <pthread.h>
+ #include <sys/types.h>
+@@ -35,7 +36,6 @@
+ #include <sys/uio.h>
+ #include <unistd.h>
+ #include <errno.h>
+-
+ #include <sys/poll.h>
+
+ /*
+@@ -347,6 +347,10 @@
+ int NET_Timeout(int s, long timeout) {
+ long prevtime = 0, newtime;
+ struct timeval t, *tp = &t;
++ fd_set fds;
++ fd_set* fdsp = NULL;
++ int allocated = 0;
++ threadEntry_t self;
+ fdEntry_t *fdEntry = getFdEntry(s);
+
+ /*
+@@ -376,20 +380,29 @@
+ t.tv_usec = 0;
+ }
+
++ if (s < FD_SETSIZE) {
++ fdsp = &fds;
++ FD_ZERO(fdsp);
++ } else {
++ int length = (howmany(s+1, NFDBITS)) * sizeof(int);
++ fdsp = (fd_set *) calloc(1, length);
++ if (fdsp == NULL) {
++ return -1; // errno will be set to ENOMEM
++ }
++ allocated = 1;
++ }
++ FD_SET(s, fdsp);
++
+ for(;;) {
+- fd_set rfds;
+ int rv;
+- threadEntry_t self;
+
+ /*
+ * call select on the fd. If interrupted by our wakeup signal
+ * errno will be set to EBADF.
+ */
+- FD_ZERO(&rfds);
+- FD_SET(s, &rfds);
+
+ startOp(fdEntry, &self);
+- rv = select(s+1, &rfds, 0, 0, tp);
++ rv = select(s+1, fdsp, 0, 0, tp);
+ endOp(fdEntry, &self);
+
+ /*
+@@ -403,6 +416,8 @@
+ newtime = now.tv_sec * 1000 + now.tv_usec / 1000;
+ timeout -= newtime - prevtime;
+ if (timeout <= 0) {
++ if (allocated != 0)
++ free(fdsp);
+ return 0;
+ }
+ prevtime = newtime;
+@@ -410,6 +425,8 @@
+ t.tv_usec = (timeout % 1000) * 1000;
+ }
+ } else {
++ if (allocated != 0)
++ free(fdsp);
+ return rv;
+ }
+
+--- ./jdk/src/solaris/native/java/net/linux_close.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/net/linux_close.c Wed May 07 19:26:47 2014 -0700
+@@ -34,7 +34,6 @@
+ #include <sys/uio.h>
+ #include <unistd.h>
+ #include <errno.h>
+-
+ #include <sys/poll.h>
+
+ /*
+@@ -192,17 +191,6 @@
+
+ {
+ /*
+- * Send a wakeup signal to all threads blocked on this
+- * file descriptor.
+- */
+- threadEntry_t *curr = fdEntry->threads;
+- while (curr != NULL) {
+- curr->intr = 1;
+- pthread_kill( curr->thr, sigWakeup );
+- curr = curr->next;
+- }
+-
+- /*
+ * And close/dup the file descriptor
+ * (restart if interrupted by signal)
+ */
+@@ -214,6 +202,16 @@
+ }
+ } while (rv == -1 && errno == EINTR);
+
++ /*
++ * Send a wakeup signal to all threads blocked on this
++ * file descriptor.
++ */
++ threadEntry_t *curr = fdEntry->threads;
++ while (curr != NULL) {
++ curr->intr = 1;
++ pthread_kill( curr->thr, sigWakeup );
++ curr = curr->next;
++ }
+ }
+
+ /*
+--- ./jdk/src/solaris/native/java/net/net_util_md.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.c Wed May 07 19:26:47 2014 -0700
+@@ -114,9 +114,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;
+--- ./jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 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
+@@ -405,7 +405,14 @@
+ target = (*env)->GetObjectField(env, peer, mComponentPeerIDs.target);
+ }
+ #else
+- target = (*env)->GetObjectField(env, peer, targetID);
++ if (window != None) {
++ peer = JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit",
++ "windowToXWindow", "(J)Lsun/awt/X11/XBaseWindow;", (jlong)window).l;
++ }
++ if ((peer != NULL) &&
++ (JNU_IsInstanceOfByName(env, peer, "sun/awt/X11/XWindow") == 1)) {
++ target = (*env)->GetObjectField(env, peer, targetID);
++ }
+ #endif
+
+ if (target == NULL) {
+@@ -414,7 +421,6 @@
+ return (jobject)NULL;
+ }
+
+-
+ AWT_UNLOCK();
+
+ return target;
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2011, 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
+@@ -830,6 +830,8 @@
+ }
+
+ XSetIOErrorHandler(xioerror_handler);
++ JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XErrorHandlerUtil", "init", "(J)V",
++ ptr_to_jlong(awt_display));
+
+ /* set awt_numScreens, and whether or not we're using Xinerama */
+ xineramaInit();
+@@ -978,16 +980,11 @@
+ static jint canUseShmExtPixmaps = UNSET_MITSHM;
+ static jboolean xshmAttachFailed = JNI_FALSE;
+
+-extern int mitShmPermissionMask;
+-
+-int J2DXErrHandler(Display *display, XErrorEvent *xerr) {
+- int ret = 0;
++int XShmAttachXErrHandler(Display *display, XErrorEvent *xerr) {
+ if (xerr->minor_code == X_ShmAttach) {
+ xshmAttachFailed = JNI_TRUE;
+- } else {
+- ret = (*xerror_saved_handler)(display, xerr);
+ }
+- return ret;
++ return 0;
+ }
+ jboolean isXShmAttachFailed() {
+ return xshmAttachFailed;
+@@ -996,6 +993,8 @@
+ xshmAttachFailed = JNI_FALSE;
+ }
+
++extern int mitShmPermissionMask;
++
+ void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps) {
+ XShmSegmentInfo shminfo;
+ int XShmMajor, XShmMinor;
+@@ -1043,7 +1042,7 @@
+ * The J2DXErrHandler handler will set xshmAttachFailed
+ * to JNI_TRUE if any Shm error has occured.
+ */
+- EXEC_WITH_XERROR_HANDLER(J2DXErrHandler,
++ EXEC_WITH_XERROR_HANDLER(XShmAttachXErrHandler,
+ XShmAttach(awt_display, &shminfo));
+
+ /**
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
++ * 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
+--- ./jdk/src/solaris/native/sun/awt/awt_util.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_util.c Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1995, 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
+@@ -58,16 +58,14 @@
+ #include "java_awt_event_MouseWheelEvent.h"
+
+ /*
+- * Since X reports protocol errors asynchronously, we often need to
+- * install an error handler that acts like a callback. While that
+- * specialized handler is installed we save original handler here.
++ * Called by "ToolkitErrorHandler" function in "XlibWrapper.c" file.
+ */
+-XErrorHandler xerror_saved_handler;
++XErrorHandler current_native_xerror_handler = NULL;
+
+ /*
+ * A place for error handler to report the error code.
+ */
+-unsigned char xerror_code;
++unsigned char xerror_code = Success;
+
+ extern jint getModifiers(uint32_t state, jint button, jint keyCode);
+ extern jint getButton(uint32_t button);
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_util.h Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1995, 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
+@@ -82,7 +82,7 @@
+ #define WITH_XERROR_HANDLER(f) do { \
+ XSync(awt_display, False); \
+ xerror_code = Success; \
+- xerror_saved_handler = XSetErrorHandler(f); \
++ current_native_xerror_handler = (f); \
+ } while (0)
+
+ /* Convenience macro for handlers to use */
+@@ -92,7 +92,7 @@
+
+ #define RESTORE_XERROR_HANDLER do { \
+ XSync(awt_display, False); \
+- XSetErrorHandler(xerror_saved_handler); \
++ current_native_xerror_handler = NULL; \
+ } while (0)
+
+ #define EXEC_WITH_XERROR_HANDLER(f, code) do { \
+@@ -104,11 +104,9 @@
+ } while (0)
+
+ /*
+- * Since X reports protocol errors asynchronously, we often need to
+- * install an error handler that acts like a callback. While that
+- * specialized handler is installed we save original handler here.
++ * Called by "ToolkitErrorHandler" function in "XlibWrapper.c" file.
+ */
+-extern XErrorHandler xerror_saved_handler;
++extern XErrorHandler current_native_xerror_handler;
+
+ /*
+ * A place for error handler to report the error code.
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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
+@@ -382,14 +382,10 @@
+ XERROR_SAVE(err);
+ if (err->error_code == BadWindow) {
+ DTRACE_PRINTLN("IGNORING BadWindow");
+- return 0; /* ok to fail */
+ }
+- else {
+- return (*xerror_saved_handler)(dpy, err);
+- }
++ return 0; /* ok to fail */
+ }
+
+-
+ /*
+ * Convenience wrapper for XGetWindowProperty for XA_ATOM properties.
+ * E.g. WM_PROTOCOLS, _NET_WM_STATE, _OL_DECOR_DEL.
+@@ -1011,7 +1007,6 @@
+ return awt_wm_isNetWMName("Metacity");
+ }
+
+-
+ /*
+ * Temporary error handler that ensures that we know if
+ * XChangeProperty succeeded or not.
+@@ -1020,15 +1015,10 @@
+ xerror_verify_change_property(Display *dpy, XErrorEvent *err)
+ {
+ XERROR_SAVE(err);
+- if (err->request_code == X_ChangeProperty) {
+- return 0;
+- }
+- else {
+- return (*xerror_saved_handler)(dpy, err);
+- }
++ if (err->request_code == X_ChangeProperty) { }
++ return 0;
+ }
+
+-
+ /*
+ * Prepare IceWM check.
+ *
+@@ -1159,8 +1149,6 @@
+ return True;
+ }
+
+-
+-
+ static Boolean winmgr_running = False;
+
+ /*
+@@ -1176,14 +1164,10 @@
+ {
+ DTRACE_PRINTLN("some WM is running (hmm, we'll see)");
+ winmgr_running = True;
+- return 0;
+ }
+- else {
+- return (*xerror_saved_handler)(dpy, err);
+- }
++ return 0;
+ }
+
+-
+ /*
+ * Make an educated guess about running window manager.
+ * XXX: ideally, we should detect wm restart.
+--- ./jdk/src/solaris/native/sun/awt/awt_xembed_server.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_xembed_server.c Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2005, 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
+--- ./jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c Wed May 07 19:26:47 2014 -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
+@@ -396,13 +396,10 @@
+ static int
+ GLXSD_BadAllocXErrHandler(Display *display, XErrorEvent *xerr)
+ {
+- int ret = 0;
+ if (xerr->error_code == BadAlloc) {
+ surfaceCreationFailed = JNI_TRUE;
+- } else {
+- ret = (*xerror_saved_handler)(display, xerr);
+ }
+- return ret;
++ return 0;
+ }
+
+ JNIEXPORT jboolean JNICALL
+--- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 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
+@@ -68,7 +68,7 @@
+ #ifndef XAWT
+ extern struct MComponentPeerIDs mComponentPeerIDs;
+ #endif
+-extern int J2DXErrHandler(Display *display, XErrorEvent *xerr);
++extern int XShmAttachXErrHandler(Display *display, XErrorEvent *xerr);
+ extern AwtGraphicsConfigDataPtr
+ getGraphicsConfigFromComponentPeer(JNIEnv *env, jobject this);
+ extern struct X11GraphicsConfigIDs x11GraphicsConfigIDs;
+@@ -591,7 +591,7 @@
+ shminfo->readOnly = False;
+
+ resetXShmAttachFailed();
+- EXEC_WITH_XERROR_HANDLER(J2DXErrHandler,
++ EXEC_WITH_XERROR_HANDLER(XShmAttachXErrHandler,
+ XShmAttach(awt_display, shminfo));
+
+ /*
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c Wed May 07 19:26:47 2014 -0700
+@@ -38,8 +38,7 @@
+ #include "sun_nio_ch_SctpResultContainer.h"
+ #include "sun_nio_ch_SctpPeerAddrChange.h"
+
+-/* sizeof(union sctp_notification */
+-#define NOTIFICATION_BUFFER_SIZE 280
++static int SCTP_NOTIFICATION_SIZE = sizeof(union sctp_notification);
+
+ #define MESSAGE_IMPL_CLASS "sun/nio/ch/SctpMessageInfoImpl"
+ #define RESULT_CONTAINER_CLASS "sun/nio/ch/SctpResultContainer"
+@@ -458,20 +457,47 @@
+ if (msg->msg_flags & MSG_NOTIFICATION) {
+ char *bufp = (char*)addr;
+ union sctp_notification *snp;
++ jboolean allocated = JNI_FALSE;
+
+- if (!(msg->msg_flags & MSG_EOR) && length < NOTIFICATION_BUFFER_SIZE) {
+- char buf[NOTIFICATION_BUFFER_SIZE];
++ if (rv > SCTP_NOTIFICATION_SIZE) {
++ JNU_ThrowInternalError(env, "should not reach here");
++ return -1;
++ }
++
++ if (!(msg->msg_flags & MSG_EOR) && length < SCTP_NOTIFICATION_SIZE) {
++ char* newBuf;
+ int rvSAVE = rv;
+- memcpy(buf, addr, rv);
+- iov->iov_base = buf + rv;
+- iov->iov_len = NOTIFICATION_BUFFER_SIZE - rv;
++
++ if ((newBuf = malloc(SCTP_NOTIFICATION_SIZE)) == NULL) {
++ JNU_ThrowOutOfMemoryError(env, "Out of native heap space.");
++ return -1;
++ }
++ allocated = JNI_TRUE;
++
++ memcpy(newBuf, addr, rv);
++ iov->iov_base = newBuf + rv;
++ iov->iov_len = SCTP_NOTIFICATION_SIZE - rv;
+ if ((rv = recvmsg(fd, msg, flags)) < 0) {
+ handleSocketError(env, errno);
+ return 0;
+ }
+- bufp = buf;
++ bufp = newBuf;
+ rv += rvSAVE;
+ }
++#ifdef __sparc
++ else if ((intptr_t)addr & 0x3) {
++ /* the given buffer is not 4 byte aligned */
++ char* newBuf;
++ if ((newBuf = malloc(SCTP_NOTIFICATION_SIZE)) == NULL) {
++ JNU_ThrowOutOfMemoryError(env, "Out of native heap space.");
++ return -1;
++ }
++ allocated = JNI_TRUE;
++
++ memcpy(newBuf, addr, rv);
++ bufp = newBuf;
++ }
++#endif
+ snp = (union sctp_notification *) bufp;
+ if (handleNotification(env, fd, resultContainerObj, snp, rv,
+ (msg->msg_flags & MSG_EOR),
+@@ -479,9 +505,16 @@
+ /* We have received a notification that is of interest to
+ to the Java API. The appropriate notification will be
+ set in the result container. */
++ if (allocated == JNI_TRUE) {
++ free(bufp);
++ }
+ return 0;
+ }
+
++ if (allocated == JNI_TRUE) {
++ free(bufp);
++ }
++
+ // set iov back to addr, and reset msg_controllen
+ iov->iov_base = addr;
+ iov->iov_len = length;
+--- ./jdk/src/solaris/native/sun/xawt/XlibWrapper.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/solaris/native/sun/xawt/XlibWrapper.c Wed May 07 19:26:47 2014 -0700
+@@ -41,6 +41,7 @@
+ #include <sizecalc.h>
+
+ #include <awt.h>
++#include <awt_util.h>
+ #include <jvm.h>
+
+ #include <Region.h>
+@@ -1262,11 +1263,15 @@
+ JavaVM* jvm = NULL;
+ static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) {
+ JNIEnv * env;
++ // First call the native synthetic error handler declared in "awt_util.h" file.
++ if (current_native_xerror_handler != NULL) {
++ current_native_xerror_handler(dpy, event);
++ }
+ if (jvm != NULL) {
+ env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+ if (env) {
+- return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I",
+- ptr_to_jlong(dpy), ptr_to_jlong(event)).i;
++ return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XErrorHandlerUtil",
++ "globalErrorHandler", "(JJ)I", ptr_to_jlong(dpy), ptr_to_jlong(event)).i;
+ }
+ }
+ return 0;
+--- ./jdk/src/windows/back/linker_md.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/back/linker_md.c Wed May 07 19:26:47 2014 -0700
+@@ -39,33 +39,27 @@
+ #include "path_md.h"
+
+ static void dll_build_name(char* buffer, size_t buflen,
+- const char* pname, const char* fname) {
+- // Based on os_windows.cpp
++ const char* paths, const char* fname) {
++ char *path, *paths_copy, *next_token;
+
+- char *path_sep = PATH_SEPARATOR;
+- char *pathname = (char *)pname;
+- while (strlen(pathname) > 0) {
+- char *p = strchr(pathname, *path_sep);
+- if (p == NULL) {
+- p = pathname + strlen(pathname);
+- }
+- /* check for NULL path */
+- if (p == pathname) {
+- continue;
+- }
+- if (*(p-1) == ':' || *(p-1) == '\\') {
+- (void)_snprintf(buffer, buflen, "%.*s%s.dll", (p - pathname),
+- pathname, fname);
+- } else {
+- (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (p - pathname),
+- pathname, fname);
+- }
++ paths_copy = strdup(paths);
++ if (paths_copy == NULL) {
++ return;
++ }
++
++ next_token = NULL;
++ path = strtok_s(paths_copy, PATH_SEPARATOR, &next_token);
++
++ while (path != NULL) {
++ _snprintf(buffer, buflen, "%s\\%s.dll", path, fname);
+ if (_access(buffer, 0) == 0) {
+ break;
+ }
+- pathname = p + 1;
+ *buffer = '\0';
++ path = strtok_s(NULL, PATH_SEPARATOR, &next_token);
+ }
++
++ free(paths_copy);
+ }
+
+ /*
+@@ -108,7 +102,7 @@
+ * Build a machine dependent library name out of a path and file name.
+ */
+ void
+-dbgsysBuildLibName(char *holder, int holderlen, char *pname, char *fname)
++dbgsysBuildLibName(char *holder, int holderlen, const char *pname, const char *fname)
+ {
+ const int pnamelen = pname ? (int)strlen(pname) : 0;
+
+--- ./jdk/src/windows/bin/cmdtoargs.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/bin/cmdtoargs.c Wed May 07 19:26:47 2014 -0700
+@@ -53,6 +53,16 @@
+ static StdArg *stdargs;
+ static int stdargc;
+
++static int copyCh(USHORT ch, char* dest) {
++ if (HIBYTE(ch) == 0) {
++ *dest = (char)ch;
++ return 1;
++ } else {
++ *((USHORT *)dest) = ch;
++ return 2;
++ }
++}
++
+ static char* next_arg(char* cmdline, char* arg, jboolean* wildcard) {
+
+ char* src = cmdline;
+@@ -61,31 +71,43 @@
+ int quotes = 0;
+ int slashes = 0;
+
+- char prev = 0;
+- char ch = 0;
++ // "prev"/"ch" may contain either a single byte, or a double byte
++ // character encoded in CP_ACP.
++ USHORT prev = 0;
++ USHORT ch = 0;
+ int i;
+ jboolean done = JNI_FALSE;
++ int charLength;
+
+ *wildcard = JNI_FALSE;
+- while ((ch = *src) != 0 && !done) {
++ while (!done) {
++ charLength = CharNextExA(CP_ACP, src, 0) - src;
++ if (charLength == 0) {
++ break;
++ } else if (charLength == 1) {
++ ch = (USHORT)(UCHAR)src[0];
++ } else {
++ ch = ((USHORT *)src)[0];
++ }
++
+ switch (ch) {
+- case '"':
++ case L'"':
+ if (separator) {
+ done = JNI_TRUE;
+ break;
+ }
+- if (prev == '\\') {
++ if (prev == L'\\') {
+ for (i = 1; i < slashes; i += 2) {
+- *dest++ = prev;
++ dest += copyCh(prev, dest);
+ }
+ if (slashes % 2 == 1) {
+- *dest++ = ch;
++ dest += copyCh(ch, dest);
+ } else {
+ quotes++;
+ }
+- } else if (prev == '"' && quotes % 2 == 0) {
++ } else if (prev == L'"' && quotes % 2 == 0) {
+ quotes++;
+- *dest++ = ch; // emit every other consecutive quote
++ dest += copyCh(ch, dest); // emit every other consecutive quote
+ } else if (quotes == 0) {
+ quotes++; // starting quote
+ } else {
+@@ -94,7 +116,7 @@
+ slashes = 0;
+ break;
+
+- case '\\':
++ case L'\\':
+ slashes++;
+ if (separator) {
+ done = JNI_TRUE;
+@@ -102,23 +124,23 @@
+ }
+ break;
+
+- case ' ':
+- case '\t':
+- if (prev == '\\') {
++ case L' ':
++ case L'\t':
++ if (prev == L'\\') {
+ for (i = 0 ; i < slashes; i++) {
+- *dest++ = prev;
++ dest += copyCh(prev, dest);
+ }
+ }
+ if (quotes % 2 == 1) {
+- *dest++ = ch;
++ dest += copyCh(ch, dest);
+ } else {
+ separator = JNI_TRUE;
+ }
+ slashes = 0;
+ break;
+
+- case '*':
+- case '?':
++ case L'*':
++ case L'?':
+ if (separator) {
+ done = JNI_TRUE;
+ separator = JNI_FALSE;
+@@ -127,36 +149,36 @@
+ if (quotes % 2 == 0) {
+ *wildcard = JNI_TRUE;
+ }
+- if (prev == '\\') {
++ if (prev == L'\\') {
+ for (i = 0 ; i < slashes ; i++) {
+- *dest++ = prev;
++ dest += copyCh(prev, dest);
+ }
+ }
+- *dest++ = ch;
++ dest += copyCh(ch, dest);
+ break;
+
+ default:
+- if (prev == '\\') {
++ if (prev == L'\\') {
+ for (i = 0 ; i < slashes ; i++) {
+- *dest++ = prev;
++ dest += copyCh(prev, dest);
+ }
+- *dest++ = ch;
++ dest += copyCh(ch, dest);
+ } else if (separator) {
+ done = JNI_TRUE;
+ } else {
+- *dest++ = ch;
++ dest += copyCh(ch, dest);
+ }
+ slashes = 0;
+ }
+
+ if (!done) {
+ prev = ch;
+- src++;
++ src += charLength;
+ }
+ }
+- if (prev == '\\') {
++ if (prev == L'\\') {
+ for (i = 0; i < slashes; i++) {
+- *dest++ = prev;
++ dest += copyCh(prev, dest);
+ }
+ }
+ *dest = 0;
+--- ./jdk/src/windows/classes/java/lang/ProcessImpl.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/java/lang/ProcessImpl.java Wed May 07 19:26:47 2014 -0700
+@@ -457,8 +457,10 @@
+
+ /**
+ * Create a process using the win32 function CreateProcess.
++ * The method is synchronized due to MS kb315939 problem.
++ * All native handles should restore the inherit flag at the end of call.
+ *
+- * @param cmdstr the Windows commandline
++ * @param cmdstr the Windows command line
+ * @param envblock NUL-separated, double-NUL-terminated list of
+ * environment strings in VAR=VALUE form
+ * @param dir the working directory of the process, or null if
+@@ -474,7 +476,7 @@
+ * @param redirectErrorStream redirectErrorStream attribute
+ * @return the native subprocess HANDLE returned by CreateProcess
+ */
+- private static native long create(String cmdstr,
++ private static synchronized native long create(String cmdstr,
+ String envblock,
+ String dir,
+ long[] stdHandles,
+--- ./jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2007, 2008, 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
+@@ -162,8 +162,9 @@
+ if (!fd.valid())
+ return;
+
+- close0(fdAccess.get(fd));
++ final int nativefd = fdAccess.get(fd);
+ fdAccess.set(fd, -1);
++ close0(nativefd);
+ }
+
+ void socketShutdown(int howto) throws IOException {
+--- ./jdk/src/windows/classes/java/net/PlainSocketImpl.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/java/net/PlainSocketImpl.java Wed May 07 19:26:47 2014 -0700
+@@ -191,14 +191,17 @@
+ }
+
+ protected synchronized void accept(SocketImpl s) throws IOException {
+- // pass in the real impl not the wrapper.
+- SocketImpl delegate = ((PlainSocketImpl)s).impl;
+- delegate.address = new InetAddress();
+- delegate.fd = new FileDescriptor();
+- impl.accept(delegate);
+-
+- // set fd to delegate's fd to be compatible with older releases
+- s.fd = delegate.fd;
++ if (s instanceof PlainSocketImpl) {
++ // pass in the real impl not the wrapper.
++ SocketImpl delegate = ((PlainSocketImpl)s).impl;
++ delegate.address = new InetAddress();
++ delegate.fd = new FileDescriptor();
++ impl.accept(delegate);
++ // set fd to delegate's fd to be compatible with older releases
++ s.fd = delegate.fd;
++ } else {
++ impl.accept(s);
++ }
+ }
+
+ void setFileDescriptor(FileDescriptor fd) {
+--- ./jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java Wed May 07 19:26:47 2014 -0700
+@@ -179,6 +179,7 @@
+ private static final int SET_RES_LOW = 0x00000080;
+ private static final int SET_COLOR = 0x00000200;
+ private static final int SET_ORIENTATION = 0x00004000;
++ private static final int SET_COLLATED = 0x00008000;
+
+ /**
+ * Values must match those defined in wingdi.h & commdlg.h
+@@ -189,10 +190,33 @@
+ private static final int PD_NOSELECTION = 0x00000004;
+ private static final int PD_COLLATE = 0x00000010;
+ private static final int PD_PRINTTOFILE = 0x00000020;
+- private static final int DM_ORIENTATION = 0x00000001;
+- private static final int DM_PRINTQUALITY = 0x00000400;
+- private static final int DM_COLOR = 0x00000800;
+- private static final int DM_DUPLEX = 0x00001000;
++ private static final int DM_ORIENTATION = 0x00000001;
++ private static final int DM_PAPERSIZE = 0x00000002;
++ private static final int DM_COPIES = 0x00000100;
++ private static final int DM_DEFAULTSOURCE = 0x00000200;
++ private static final int DM_PRINTQUALITY = 0x00000400;
++ private static final int DM_COLOR = 0x00000800;
++ private static final int DM_DUPLEX = 0x00001000;
++ private static final int DM_YRESOLUTION = 0x00002000;
++ private static final int DM_COLLATE = 0x00008000;
++
++ private static final short DMCOLLATE_FALSE = 0;
++ private static final short DMCOLLATE_TRUE = 1;
++
++ private static final short DMORIENT_PORTRAIT = 1;
++ private static final short DMORIENT_LANDSCAPE = 2;
++
++ private static final short DMCOLOR_MONOCHROME = 1;
++ private static final short DMCOLOR_COLOR = 2;
++
++ private static final short DMRES_DRAFT = -1;
++ private static final short DMRES_LOW = -2;
++ private static final short DMRES_MEDIUM = -3;
++ private static final short DMRES_HIGH = -4;
++
++ private static final short DMDUP_SIMPLEX = 1;
++ private static final short DMDUP_VERTICAL = 2;
++ private static final short DMDUP_HORIZONTAL = 3;
+
+ /**
+ * Pageable MAX pages
+@@ -592,13 +616,23 @@
+ }
+ driverDoesMultipleCopies = false;
+ driverDoesCollation = false;
+- setNativePrintService(service.getName());
++ setNativePrintServiceIfNeeded(service.getName());
+ }
+
+ /* associates this job with the specified native service */
+ private native void setNativePrintService(String name)
+ throws PrinterException;
+
++ private String lastNativeService = null;
++ private void setNativePrintServiceIfNeeded(String name)
++ throws PrinterException {
++
++ if (name != null && !(name.equals(lastNativeService))) {
++ setNativePrintService(name);
++ lastNativeService = name;
++ }
++ }
++
+ public PrintService getPrintService() {
+ if (myService == null) {
+ String printerName = getNativePrintService();
+@@ -616,7 +650,7 @@
+ myService = PrintServiceLookup.lookupDefaultPrintService();
+ if (myService != null) {
+ try {
+- setNativePrintService(myService.getName());
++ setNativePrintServiceIfNeeded(myService.getName());
+ } catch (Exception e) {
+ myService = null;
+ }
+@@ -1742,8 +1776,13 @@
+ mAttMediaSizeName = ((Win32PrintService)myService).findPaperID(msn);
+ }
+
+- private void setWin32MediaAttrib(int dmIndex, int width, int length) {
+- MediaSizeName msn =
++ private void addPaperSize(PrintRequestAttributeSet aset,
++ int dmIndex, int width, int length) {
++
++ if (aset == null) {
++ return;
++ }
++ MediaSizeName msn =
+ ((Win32PrintService)myService).findWin32Media(dmIndex);
+ if (msn == null) {
+ msn = ((Win32PrintService)myService).
+@@ -1751,10 +1790,12 @@
+ }
+
+ if (msn != null) {
+- if (attributes != null) {
+- attributes.add(msn);
+- }
++ aset.add(msn);
+ }
++ }
++
++ private void setWin32MediaAttrib(int dmIndex, int width, int length) {
++ addPaperSize(attributes, dmIndex, width, length);
+ mAttMediaSizeName = dmIndex;
+ }
+
+@@ -1776,7 +1817,7 @@
+ // no equivalent predefined value
+ mAttMediaTray = 7; // DMBIN_AUTO
+ } else if (attr == MediaTray.TOP) {
+- mAttMediaTray =1; // DMBIN_UPPER
++ mAttMediaTray = 1; // DMBIN_UPPER
+ } else {
+ if (attr instanceof Win32MediaTray) {
+ mAttMediaTray = ((Win32MediaTray)attr).winID;
+@@ -1902,6 +1943,254 @@
+ }
+ }
+
++ private static final class DevModeValues {
++ int dmFields;
++ short copies;
++ short collate;
++ short color;
++ short duplex;
++ short orient;
++ short paper;
++ short bin;
++ short xres_quality;
++ short yres;
++ }
++
++ private void getDevModeValues(PrintRequestAttributeSet aset,
++ DevModeValues info) {
++
++ Copies c = (Copies)aset.get(Copies.class);
++ if (c != null) {
++ info.dmFields |= DM_COPIES;
++ info.copies = (short)c.getValue();
++ }
++
++ SheetCollate sc = (SheetCollate)aset.get(SheetCollate.class);
++ if (sc != null) {
++ info.dmFields |= DM_COLLATE;
++ info.collate = (sc == SheetCollate.COLLATED) ?
++ DMCOLLATE_TRUE : DMCOLLATE_FALSE;
++ }
++
++ Chromaticity ch = (Chromaticity)aset.get(Chromaticity.class);
++ if (ch != null) {
++ info.dmFields |= DM_COLOR;
++ if (ch == Chromaticity.COLOR) {
++ info.color = DMCOLOR_COLOR;
++ } else {
++ info.color = DMCOLOR_MONOCHROME;
++ }
++ }
++
++ Sides s = (Sides)aset.get(Sides.class);
++ if (s != null) {
++ info.dmFields |= DM_DUPLEX;
++ if (s == Sides.TWO_SIDED_LONG_EDGE) {
++ info.duplex = DMDUP_VERTICAL;
++ } else if (s == Sides.TWO_SIDED_SHORT_EDGE) {
++ info.duplex = DMDUP_HORIZONTAL;
++ } else { // Sides.ONE_SIDED
++ info.duplex = DMDUP_SIMPLEX;
++ }
++ }
++
++ OrientationRequested or =
++ (OrientationRequested)aset.get(OrientationRequested.class);
++ if (or != null) {
++ info.dmFields |= DM_ORIENTATION;
++ info.orient = (or == OrientationRequested.LANDSCAPE)
++ ? DMORIENT_LANDSCAPE : DMORIENT_PORTRAIT;
++ }
++
++ Media m = (Media)aset.get(Media.class);
++ if (m instanceof MediaSizeName) {
++ info.dmFields |= DM_PAPERSIZE;
++ MediaSizeName msn = (MediaSizeName)m;
++ info.paper =
++ (short)((Win32PrintService)myService).findPaperID(msn);
++ }
++
++ MediaTray mt = null;
++ if (m instanceof MediaTray) {
++ mt = (MediaTray)m;
++ }
++ if (mt == null) {
++ SunAlternateMedia sam =
++ (SunAlternateMedia)aset.get(SunAlternateMedia.class);
++ if (sam != null && (sam.getMedia() instanceof MediaTray)) {
++ mt = (MediaTray)sam.getMedia();
++ }
++ }
++
++ if (mt != null) {
++ info.dmFields |= DM_DEFAULTSOURCE;
++ info.bin = (short)(((Win32PrintService)myService).findTrayID(mt));
++ }
++
++ PrintQuality q = (PrintQuality)aset.get(PrintQuality.class);
++ if (q != null) {
++ info.dmFields |= DM_PRINTQUALITY;
++ if (q == PrintQuality.DRAFT) {
++ info.xres_quality = DMRES_DRAFT;
++ } else if (q == PrintQuality.HIGH) {
++ info.xres_quality = DMRES_HIGH;
++ } else {
++ info.xres_quality = DMRES_MEDIUM;
++ }
++ }
++
++ PrinterResolution r =
++ (PrinterResolution)aset.get(PrinterResolution.class);
++ if (r != null) {
++ info.dmFields |= DM_PRINTQUALITY | DM_YRESOLUTION;
++ info.xres_quality =
++ (short)r.getCrossFeedResolution(PrinterResolution.DPI);
++ info.yres = (short)r.getFeedResolution(PrinterResolution.DPI);
++ }
++ }
++
++ /* This method is called from native to update the values in the
++ * attribute set which originates from the cross-platform dialog,
++ * but updated by the native DocumentPropertiesUI which updates the
++ * devmode. This syncs the devmode back in to the attributes so that
++ * we can update the cross-platform dialog.
++ * The attribute set here is a temporary one installed whilst this
++ * happens,
++ */
++ private final void setJobAttributes(PrintRequestAttributeSet attributes,
++ int fields, int values,
++ short copies,
++ short dmPaperSize,
++ short dmPaperWidth,
++ short dmPaperLength,
++ short dmDefaultSource,
++ short xRes,
++ short yRes) {
++
++ if (attributes == null) {
++ return;
++ }
++
++ if ((fields & DM_COPIES) != 0) {
++ attributes.add(new Copies(copies));
++ }
++
++ if ((fields & DM_COLLATE) != 0) {
++ if ((values & SET_COLLATED) != 0) {
++ attributes.add(SheetCollate.COLLATED);
++ } else {
++ attributes.add(SheetCollate.UNCOLLATED);
++ }
++ }
++
++ if ((fields & DM_ORIENTATION) != 0) {
++ if ((values & SET_ORIENTATION) != 0) {
++ attributes.add(OrientationRequested.LANDSCAPE);
++ } else {
++ attributes.add(OrientationRequested.PORTRAIT);
++ }
++ }
++
++ if ((fields & DM_COLOR) != 0) {
++ if ((values & SET_COLOR) != 0) {
++ attributes.add(Chromaticity.COLOR);
++ } else {
++ attributes.add(Chromaticity.MONOCHROME);
++ }
++ }
++
++ if ((fields & DM_PRINTQUALITY) != 0) {
++ /* value < 0 indicates quality setting.
++ * value > 0 indicates X resolution. In that case
++ * hopefully we will also find y-resolution specified.
++ * If its not, assume its the same as x-res.
++ * Maybe Java code should try to reconcile this against
++ * the printers claimed set of supported resolutions.
++ */
++ if (xRes < 0) {
++ PrintQuality quality;
++ if ((values & SET_RES_LOW) != 0) {
++ quality = PrintQuality.DRAFT;
++ } else if ((fields & SET_RES_HIGH) != 0) {
++ quality = PrintQuality.HIGH;
++ } else {
++ quality = PrintQuality.NORMAL;
++ }
++ attributes.add(quality);
++ } else if (xRes > 0 && yRes > 0) {
++ attributes.add(
++ new PrinterResolution(xRes, yRes, PrinterResolution.DPI));
++ }
++ }
++
++ if ((fields & DM_DUPLEX) != 0) {
++ Sides sides;
++ if ((values & SET_DUP_VERTICAL) != 0) {
++ sides = Sides.TWO_SIDED_LONG_EDGE;
++ } else if ((values & SET_DUP_HORIZONTAL) != 0) {
++ sides = Sides.TWO_SIDED_SHORT_EDGE;
++ } else {
++ sides = Sides.ONE_SIDED;
++ }
++ attributes.add(sides);
++ }
++
++ if ((fields & DM_PAPERSIZE) != 0) {
++ addPaperSize(attributes, dmPaperSize, dmPaperWidth, dmPaperLength);
++ }
++
++ if ((fields & DM_DEFAULTSOURCE) != 0) {
++ MediaTray tray =
++ ((Win32PrintService)myService).findMediaTray(dmDefaultSource);
++ attributes.add(new SunAlternateMedia(tray));
++ }
++ }
++
++ private native boolean showDocProperties(long hWnd,
++ PrintRequestAttributeSet aset,
++ int dmFields,
++ short copies,
++ short collate,
++ short color,
++ short duplex,
++ short orient,
++ short paper,
++ short bin,
++ short xres_quality,
++ short yres);
++
++ @SuppressWarnings("deprecation")
++ public PrintRequestAttributeSet
++ showDocumentProperties(Window owner,
++ PrintService service,
++ PrintRequestAttributeSet aset)
++ {
++ try {
++ setNativePrintServiceIfNeeded(service.getName());
++ } catch (PrinterException e) {
++ }
++ long hWnd = ((WWindowPeer)(owner.getPeer())).getHWnd();
++ DevModeValues info = new DevModeValues();
++ getDevModeValues(aset, info);
++ boolean ok =
++ showDocProperties(hWnd, aset,
++ info.dmFields,
++ info.copies,
++ info.collate,
++ info.color,
++ info.duplex,
++ info.orient,
++ info.paper,
++ info.bin,
++ info.xres_quality,
++ info.yres);
++
++ if (ok) {
++ return aset;
++ } else {
++ return null;
++ }
++ }
+
+ /* Printer Resolution. See also getXRes() and getYRes() */
+ private final void setResolutionDPI(int xres, int yres) {
+@@ -1944,7 +2233,7 @@
+ }
+ //** END Functions called by native code for querying/updating attributes
+
+- }
++ }
+
+ class PrintToFileErrorDialog extends Dialog implements ActionListener{
+ public PrintToFileErrorDialog(Frame parent, String title, String message,
+--- ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java Wed May 07 19:26:47 2014 -0700
+@@ -37,6 +37,7 @@
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ import sun.awt.AWTAutoShutdown;
++import sun.awt.AppContext;
+ import sun.awt.SunToolkit;
+ import sun.misc.ThreadGroupUtils;
+ import sun.awt.Win32GraphicsDevice;
+@@ -864,6 +865,7 @@
+ */
+ private void windowsSettingChange() {
+ EventQueue.invokeLater(new Runnable() {
++ @Override
+ public void run() {
+ updateProperties();
+ }
+--- ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java Wed May 07 19:26:47 2014 -0700
+@@ -230,6 +230,7 @@
+ @Override
+ public void run() {
+ long overlapped = 0L;
++ boolean pending = false;
+ try {
+ begin();
+
+@@ -243,6 +244,7 @@
+ overlapped);
+ if (n == IOStatus.UNAVAILABLE) {
+ // I/O is pending
++ pending = true;
+ return;
+ }
+ // acquired lock immediately
+@@ -252,10 +254,10 @@
+ } catch (Throwable x) {
+ // lock failed or channel closed
+ removeFromFileLockTable(fli);
+- if (overlapped != 0L)
+- ioCache.remove(overlapped);
+ result.setFailure(toIOException(x));
+ } finally {
++ if (!pending && overlapped != 0L)
++ ioCache.remove(overlapped);
+ end();
+ }
+
+--- ./jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java Wed May 07 19:26:47 2014 -0700
+@@ -100,6 +100,7 @@
+ public static final int ERROR_INVALID_LEVEL = 124;
+ public static final int ERROR_DIR_NOT_EMPTY = 145;
+ public static final int ERROR_ALREADY_EXISTS = 183;
++ public static final int ERROR_MORE_DATA = 234;
+ public static final int ERROR_DIRECTORY = 267;
+ public static final int ERROR_NOTIFY_ENUM_DIR = 1022;
+ public static final int ERROR_NONE_MAPPED = 1332;
+--- ./jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java Wed May 07 19:26:47 2014 -0700
+@@ -973,19 +973,19 @@
+ * HANDLE CreateIoCompletionPort (
+ * HANDLE FileHandle,
+ * HANDLE ExistingCompletionPort,
+- * DWORD CompletionKey,
++ * ULONG_PTR CompletionKey,
+ * DWORD NumberOfConcurrentThreads
+ * )
+ */
+ static native long CreateIoCompletionPort(long fileHandle, long existingPort,
+- int completionKey) throws WindowsException;
++ long completionKey) throws WindowsException;
+
+
+ /**
+ * GetQueuedCompletionStatus(
+ * HANDLE CompletionPort,
+ * LPDWORD lpNumberOfBytesTransferred,
+- * LPDWORD lpCompletionKey,
++ * PULONG_PTR lpCompletionKey,
+ * LPOVERLAPPED *lpOverlapped,
+ * DWORD dwMilliseconds
+ */
+@@ -999,12 +999,12 @@
+ static class CompletionStatus {
+ private int error;
+ private int bytesTransferred;
+- private int completionKey;
++ private long completionKey;
+ private CompletionStatus() { }
+
+ int error() { return error; }
+ int bytesTransferred() { return bytesTransferred; }
+- int completionKey() { return completionKey; }
++ long completionKey() { return completionKey; }
+ }
+ private static native void GetQueuedCompletionStatus0(long completionPort,
+ CompletionStatus status) throws WindowsException;
+@@ -1013,12 +1013,12 @@
+ * PostQueuedCompletionStatus(
+ * HANDLE CompletionPort,
+ * DWORD dwNumberOfBytesTransferred,
+- * DWORD dwCompletionKey,
++ * ULONG_PTR dwCompletionKey,
+ * LPOVERLAPPED lpOverlapped
+ * )
+ */
+ static native void PostQueuedCompletionStatus(long completionPort,
+- int completionKey) throws WindowsException;
++ long completionKey) throws WindowsException;
+
+ /**
+ * ReadDirectoryChangesW(
+--- ./jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java Wed May 07 19:26:47 2014 -0700
+@@ -41,6 +41,7 @@
+ class WindowsWatchService
+ extends AbstractWatchService
+ {
++ private final static int WAKEUP_COMPLETION_KEY = 0;
+ private final Unsafe unsafe = Unsafe.getUnsafe();
+
+ // background thread to service I/O completion port
+@@ -83,7 +84,7 @@
+ */
+ private class WindowsWatchKey extends AbstractWatchKey {
+ // file key (used to detect existing registrations)
+- private FileKey fileKey;
++ private final FileKey fileKey;
+
+ // handle to directory
+ private volatile long handle = INVALID_HANDLE_VALUE;
+@@ -223,8 +224,7 @@
+ FileKey other = (FileKey)obj;
+ if (this.volSerialNumber != other.volSerialNumber) return false;
+ if (this.fileIndexHigh != other.fileIndexHigh) return false;
+- if (this.fileIndexLow != other.fileIndexLow) return false;
+- return true;
++ return this.fileIndexLow == other.fileIndexLow;
+ }
+ }
+
+@@ -268,6 +268,7 @@
+ private static final short OFFSETOF_FILENAME = 12;
+
+ // size of per-directory buffer for events (FIXME - make this configurable)
++ // Need to be less than 4*16384 = 65536. DWORD align.
+ private static final int CHANGES_BUFFER_SIZE = 16 * 1024;
+
+ private final WindowsFileSystem fs;
+@@ -275,27 +276,28 @@
+ private final long port;
+
+ // maps completion key to WatchKey
+- private final Map<Integer,WindowsWatchKey> int2key;
++ private final Map<Integer,WindowsWatchKey> ck2key;
+
+ // maps file key to WatchKey
+ private final Map<FileKey,WindowsWatchKey> fk2key;
+
+ // unique completion key for each directory
++ // native completion key capacity is 64 bits on Win64.
+ private int lastCompletionKey;
+
+ Poller(WindowsFileSystem fs, WindowsWatchService watcher, long port) {
+ this.fs = fs;
+ this.watcher = watcher;
+ this.port = port;
+- this.int2key = new HashMap<Integer,WindowsWatchKey>();
+- this.fk2key = new HashMap<FileKey,WindowsWatchKey>();
++ this.ck2key = new HashMap<>();
++ this.fk2key = new HashMap<>();
+ this.lastCompletionKey = 0;
+ }
+
+ @Override
+ void wakeup() throws IOException {
+ try {
+- PostQueuedCompletionStatus(port, 0);
++ PostQueuedCompletionStatus(port, WAKEUP_COMPLETION_KEY);
+ } catch (WindowsException x) {
+ throw new IOException(x.getMessage());
+ }
+@@ -322,7 +324,6 @@
+ for (WatchEvent.Modifier modifier: modifiers) {
+ if (modifier == ExtendedWatchEventModifier.FILE_TREE) {
+ watchSubtree = true;
+- continue;
+ } else {
+ if (modifier == null)
+ return new NullPointerException();
+@@ -333,7 +334,7 @@
+ }
+
+ // open directory
+- long handle = -1L;
++ long handle;
+ try {
+ handle = CreateFile(dir.getPathForWin32Calls(),
+ FILE_LIST_DIRECTORY,
+@@ -347,7 +348,7 @@
+ boolean registered = false;
+ try {
+ // read attributes and check file is a directory
+- WindowsFileAttributes attrs = null;
++ WindowsFileAttributes attrs;
+ try {
+ attrs = WindowsFileAttributes.readAttributes(handle);
+ } catch (WindowsException x) {
+@@ -370,9 +371,10 @@
+ return existing;
+ }
+
+- // unique completion key (skip 0)
++ // Can overflow the int type capacity.
++ // Skip WAKEUP_COMPLETION_KEY value.
+ int completionKey = ++lastCompletionKey;
+- if (completionKey == 0)
++ if (completionKey == WAKEUP_COMPLETION_KEY)
+ completionKey = ++lastCompletionKey;
+
+ // associate handle with completion port
+@@ -418,13 +420,13 @@
+ // 1. remove mapping from old completion key to existing watch key
+ // 2. release existing key's resources (handle/buffer)
+ // 3. re-initialize key with new handle/buffer
+- int2key.remove(existing.completionKey());
++ ck2key.remove(existing.completionKey());
+ existing.releaseResources();
+ watchKey = existing.init(handle, events, watchSubtree, buffer,
+ countAddress, overlappedAddress, completionKey);
+ }
+ // map completion map to watch key
+- int2key.put(completionKey, watchKey);
++ ck2key.put(completionKey, watchKey);
+
+ registered = true;
+ return watchKey;
+@@ -440,7 +442,7 @@
+ WindowsWatchKey key = (WindowsWatchKey)obj;
+ if (key.isValid()) {
+ fk2key.remove(key.fileKey());
+- int2key.remove(key.completionKey());
++ ck2key.remove(key.completionKey());
+ key.invalidate();
+ }
+ }
+@@ -449,11 +451,11 @@
+ @Override
+ void implCloseAll() {
+ // cancel all keys
+- for (Map.Entry<Integer,WindowsWatchKey> entry: int2key.entrySet()) {
++ for (Map.Entry<Integer, WindowsWatchKey> entry: ck2key.entrySet()) {
+ entry.getValue().invalidate();
+ }
+ fk2key.clear();
+- int2key.clear();
++ ck2key.clear();
+
+ // close I/O completion port
+ CloseHandle(port);
+@@ -517,7 +519,7 @@
+ @Override
+ public void run() {
+ for (;;) {
+- CompletionStatus info = null;
++ CompletionStatus info;
+ try {
+ info = GetQueuedCompletionStatus(port);
+ } catch (WindowsException x) {
+@@ -527,7 +529,7 @@
+ }
+
+ // wakeup
+- if (info.completionKey() == 0) {
++ if (info.completionKey() == WAKEUP_COMPLETION_KEY) {
+ boolean shutdown = processRequests();
+ if (shutdown) {
+ return;
+@@ -536,7 +538,7 @@
+ }
+
+ // map completionKey to get WatchKey
+- WindowsWatchKey key = int2key.get(info.completionKey());
++ WindowsWatchKey key = ck2key.get((int)info.completionKey());
+ if (key == null) {
+ // We get here when a registration is changed. In that case
+ // the directory is closed which causes an event with the
+@@ -544,38 +546,44 @@
+ continue;
+ }
+
+- // ReadDirectoryChangesW failed
+- if (info.error() != 0) {
++ boolean criticalError = false;
++ int errorCode = info.error();
++ int messageSize = info.bytesTransferred();
++ if (errorCode == ERROR_NOTIFY_ENUM_DIR) {
+ // buffer overflow
+- if (info.error() == ERROR_NOTIFY_ENUM_DIR) {
++ key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
++ } else if (errorCode != 0 && errorCode != ERROR_MORE_DATA) {
++ // ReadDirectoryChangesW failed
++ criticalError = true;
++ } else {
++ // ERROR_MORE_DATA is a warning about incomplite
++ // data transfer over TCP/UDP stack. For the case
++ // [messageSize] is zero in the most of cases.
++
++ if (messageSize > 0) {
++ // process non-empty events.
++ processEvents(key, messageSize);
++ } else if (errorCode == 0) {
++ // insufficient buffer size
++ // not described, but can happen.
+ key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
+- } else {
+- // other error so cancel key
+- implCancelKey(key);
+- key.signal();
+ }
+- continue;
++
++ // start read for next batch of changes
++ try {
++ ReadDirectoryChangesW(key.handle(),
++ key.buffer().address(),
++ CHANGES_BUFFER_SIZE,
++ key.watchSubtree(),
++ ALL_FILE_NOTIFY_EVENTS,
++ key.countAddress(),
++ key.overlappedAddress());
++ } catch (WindowsException x) {
++ // no choice but to cancel key
++ criticalError = true;
++ }
+ }
+-
+- // process the events
+- if (info.bytesTransferred() > 0) {
+- processEvents(key, info.bytesTransferred());
+- } else {
+- // insufficient buffer size
+- key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
+- }
+-
+- // start read for next batch of changes
+- try {
+- ReadDirectoryChangesW(key.handle(),
+- key.buffer().address(),
+- CHANGES_BUFFER_SIZE,
+- key.watchSubtree(),
+- ALL_FILE_NOTIFY_EVENTS,
+- key.countAddress(),
+- key.overlappedAddress());
+- } catch (WindowsException x) {
+- // no choice but to cancel key
++ if (criticalError) {
+ implCancelKey(key);
+ key.signal();
+ }
+--- ./jdk/src/windows/classes/sun/print/Win32MediaTray.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/sun/print/Win32MediaTray.java Wed May 07 19:26:47 2014 -0700
+@@ -70,6 +70,10 @@
+ winEnumTable.add(this);
+ }
+
++ public int getDMBinID() {
++ return winID;
++ }
++
+ private static final String[] myStringTable ={
+ "Manual-Envelope",
+ "Automatic-Feeder",
+--- ./jdk/src/windows/classes/sun/print/Win32PrintService.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/classes/sun/print/Win32PrintService.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 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,14 +25,13 @@
+
+ package sun.print;
+
++import java.awt.Window;
++import java.awt.print.PrinterJob;
+ import java.io.File;
+ import java.net.URI;
+ import java.net.URISyntaxException;
+-import java.net.URL;
+-
+-import java.util.Vector;
++import java.util.ArrayList;
+ import java.util.HashMap;
+-
+ import javax.print.DocFlavor;
+ import javax.print.DocPrintJob;
+ import javax.print.PrintService;
+@@ -42,6 +41,7 @@
+ import javax.print.attribute.AttributeSetUtilities;
+ import javax.print.attribute.EnumSyntax;
+ import javax.print.attribute.HashAttributeSet;
++import javax.print.attribute.PrintRequestAttributeSet;
+ import javax.print.attribute.PrintServiceAttribute;
+ import javax.print.attribute.PrintServiceAttributeSet;
+ import javax.print.attribute.HashPrintServiceAttributeSet;
+@@ -69,22 +69,15 @@
+ import javax.print.attribute.standard.Sides;
+ import javax.print.attribute.standard.ColorSupported;
+ import javax.print.attribute.standard.PrintQuality;
+-import javax.print.attribute.ResolutionSyntax;
+ import javax.print.attribute.standard.PrinterResolution;
+ import javax.print.attribute.standard.SheetCollate;
+ import javax.print.event.PrintServiceAttributeListener;
+-import java.util.ArrayList;
+-
+-import sun.print.SunPrinterJobService;
++import sun.awt.windows.WPrinterJob;
+
+ public class Win32PrintService implements PrintService, AttributeUpdater,
+ SunPrinterJobService {
+
+- public static MediaSize[] predefMedia;
+-
+- static {
+- Class c = Win32MediaSize.class;
+- }
++ public static MediaSize[] predefMedia = Win32MediaSize.getPredefMedia();
+
+ private static final DocFlavor[] supportedFlavors = {
+ DocFlavor.BYTE_ARRAY.GIF,
+@@ -290,6 +283,22 @@
+ return 0;
+ }
+
++ public int findTrayID(MediaTray tray) {
++
++ getMediaTrays(); // make sure they are initialised.
++
++ if (tray instanceof Win32MediaTray) {
++ Win32MediaTray winTray = (Win32MediaTray)tray;
++ return winTray.getDMBinID();
++ }
++ for (int id=0; id<dmPaperBinToPrintService.length; id++) {
++ if (tray.equals(dmPaperBinToPrintService[id])) {
++ return id+1; // DMBIN_FIRST = 1;
++ }
++ }
++ return 0; // didn't find the tray
++ }
++
+ public MediaTray findMediaTray(int dmBin) {
+ if (dmBin >= 1 && dmBin <= dmPaperBinToPrintService.length) {
+ return dmPaperBinToPrintService[dmBin-1];
+@@ -310,7 +319,9 @@
+
+ public MediaSizeName findWin32Media(int dmIndex) {
+ if (dmIndex >= 1 && dmIndex <= dmPaperToPrintService.length) {
+- switch(dmIndex) {
++ return dmPaperToPrintService[dmIndex - 1];
++ }
++ switch(dmIndex) {
+ /* matching media sizes with indices beyond
+ dmPaperToPrintService's length */
+ case DMPAPER_A2:
+@@ -320,11 +331,8 @@
+ case DMPAPER_B6_JIS:
+ return MediaSizeName.JIS_B6;
+ default:
+- return dmPaperToPrintService[dmIndex - 1];
+- }
++ return null;
+ }
+-
+- return null;
+ }
+
+ private boolean addToUniqueList(ArrayList msnList, MediaSizeName mediaName) {
+@@ -350,6 +358,7 @@
+ }
+
+ ArrayList msnList = new ArrayList();
++ ArrayList<Win32MediaSize> trailingWmsList = new ArrayList<Win32MediaSize>();
+ ArrayList printableList = new ArrayList();
+ MediaSizeName mediaName;
+ boolean added;
+@@ -368,7 +377,8 @@
+ idList.add(Integer.valueOf(media[i]));
+ }
+
+- mediaSizes = getMediaSizes(idList, media);
++ ArrayList<String> dmPaperNameList = new ArrayList<String>();
++ mediaSizes = getMediaSizes(idList, media, dmPaperNameList);
+ for (int i = 0; i < idList.size(); i++) {
+
+ // match Win ID with our predefined ID using table
+@@ -387,6 +397,7 @@
+ mediaName = null;
+ }
+ }
++ boolean dmPaperIDMatched = (mediaName != null);
+
+ // No match found, then we get the MediaSizeName out of the MediaSize
+ // This requires 1-1 correspondence, lengths must be checked.
+@@ -395,9 +406,32 @@
+ }
+
+ // Add mediaName to the msnList
++ added = false;
+ if (mediaName != null) {
+ added = addToUniqueList(msnList, mediaName);
+ }
++ if ((!dmPaperIDMatched || !added) && (idList.size() == dmPaperNameList.size())) {
++ /* The following block allows to add such media names to the list, whose sizes
++ * matched with media sizes predefined in JDK, while whose paper IDs did not,
++ * or whose sizes and paper IDs both did not match with any predefined in JDK.
++ */
++ Win32MediaSize wms = Win32MediaSize.findMediaName(dmPaperNameList.get(i));
++ if ((wms == null) && (idList.size() == mediaSizes.length)) {
++ wms = new Win32MediaSize(dmPaperNameList.get(i), (Integer)idList.get(i));
++ mediaSizes[i] = new MediaSize(mediaSizes[i].getX(MediaSize.MM),
++ mediaSizes[i].getY(MediaSize.MM), MediaSize.MM, wms);
++ }
++ if ((wms != null) && (wms != mediaName)) {
++ if (!added) {
++ added = addToUniqueList(msnList, mediaName = wms);
++ } else {
++ trailingWmsList.add(wms);
++ }
++ }
++ }
++ }
++ for (Win32MediaSize wms : trailingWmsList) {
++ added = addToUniqueList(msnList, wms);
+ }
+
+ // init mediaSizeNames
+@@ -588,7 +622,11 @@
+ }
+
+
+- private MediaSize[] getMediaSizes(ArrayList idList, int[] media) {
++ private MediaSize[] getMediaSizes(ArrayList idList, int[] media, ArrayList<String> dmPaperNameList) {
++ if (dmPaperNameList == null) {
++ dmPaperNameList = new ArrayList<String>();
++ }
++
+ String prnPort = getPort();
+ int[] mediaSz = getAllMediaSizes(printer, prnPort);
+ String[] winMediaNames = getAllMediaNames(printer, prnPort);
+@@ -607,40 +645,43 @@
+ wid = mediaSz[i*2]/10f;
+ ht = mediaSz[i*2+1]/10f;
+
+- // Make sure to validate wid & ht.
+- // HP LJ 4050 (german) causes IAE in Sonderformat paper, wid & ht
+- // returned is not constant.
+- if ((wid <= 0) || (ht <= 0)) {
+- //Remove corresponding ID from list
+- if (nMedia == media.length) {
+- Integer remObj = Integer.valueOf(media[i]);
+- idList.remove(idList.indexOf(remObj));
++ // Make sure to validate wid & ht.
++ // HP LJ 4050 (german) causes IAE in Sonderformat paper, wid & ht
++ // returned is not constant.
++ if ((wid <= 0) || (ht <= 0)) {
++ //Remove corresponding ID from list
++ if (nMedia == media.length) {
++ Integer remObj = Integer.valueOf(media[i]);
++ idList.remove(idList.indexOf(remObj));
++ }
++ continue;
+ }
+- continue;
+- }
+- // Find matching media using dimensions.
+- // This call matches only with our own predefined sizes.
+- msn = findMatchingMediaSizeNameMM(wid, ht);
+- if (msn != null) {
+- ms = MediaSize.getMediaSizeForName(msn);
+- }
++ // Find matching media using dimensions.
++ // This call matches only with our own predefined sizes.
++ msn = findMatchingMediaSizeNameMM(wid, ht);
++ if (msn != null) {
++ ms = MediaSize.getMediaSizeForName(msn);
++ }
+
+- if (ms != null) {
+- msList.add(ms);
+- } else {
+- Win32MediaSize wms =
+- new Win32MediaSize(winMediaNames[i], media[i]);
+- try {
+- ms = new MediaSize(wid, ht, MediaSize.MM, wms);
+- msList.add(ms);
+- } catch(IllegalArgumentException e) {
+- if (nMedia == media.length) {
+- Integer remObj = Integer.valueOf(media[i]);
+- idList.remove(idList.indexOf(remObj));
+- }
++ if (ms != null) {
++ msList.add(ms);
++ dmPaperNameList.add(winMediaNames[i]);
++ } else {
++ Win32MediaSize wms = Win32MediaSize.findMediaName(winMediaNames[i]);
++ if (wms == null) {
++ wms = new Win32MediaSize(winMediaNames[i], media[i]);
++ }
++ try {
++ ms = new MediaSize(wid, ht, MediaSize.MM, wms);
++ msList.add(ms);
++ dmPaperNameList.add(winMediaNames[i]);
++ } catch(IllegalArgumentException e) {
++ if (nMedia == media.length) {
++ Integer remObj = Integer.valueOf(media[i]);
++ idList.remove(idList.indexOf(remObj));
++ }
++ }
+ }
+- }
+-
+ }
+
+ MediaSize[] arr2 = new MediaSize[msList.size()];
+@@ -649,7 +690,6 @@
+ return arr2;
+ }
+
+-
+ private PrinterIsAcceptingJobs getPrinterIsAcceptingJobs() {
+ if (getJobStatus(printer, 2) != 1) {
+ return PrinterIsAcceptingJobs.NOT_ACCEPTING_JOBS;
+@@ -1572,8 +1612,76 @@
+ }
+ }
+
+- public ServiceUIFactory getServiceUIFactory() {
+- return null;
++ private Win32DocumentPropertiesUI docPropertiesUI = null;
++
++ private static class Win32DocumentPropertiesUI
++ extends DocumentPropertiesUI {
++
++ Win32PrintService service;
++
++ private Win32DocumentPropertiesUI(Win32PrintService s) {
++ service = s;
++ }
++
++ public PrintRequestAttributeSet
++ showDocumentProperties(PrinterJob job,
++ Window owner,
++ PrintService service,
++ PrintRequestAttributeSet aset) {
++
++ if (!(job instanceof WPrinterJob)) {
++ return null;
++ }
++ WPrinterJob wJob = (WPrinterJob)job;
++ return wJob.showDocumentProperties(owner, service, aset);
++ }
++ }
++
++ private synchronized DocumentPropertiesUI getDocumentPropertiesUI() {
++ return new Win32DocumentPropertiesUI(this);
++ }
++
++ private static class Win32ServiceUIFactory extends ServiceUIFactory {
++
++ Win32PrintService service;
++
++ Win32ServiceUIFactory(Win32PrintService s) {
++ service = s;
++ }
++
++ public Object getUI(int role, String ui) {
++ if (role <= ServiceUIFactory.MAIN_UIROLE) {
++ return null;
++ }
++ if (role == DocumentPropertiesUI.DOCUMENTPROPERTIES_ROLE &&
++ DocumentPropertiesUI.DOCPROPERTIESCLASSNAME.equals(ui))
++ {
++ return service.getDocumentPropertiesUI();
++ }
++ throw new IllegalArgumentException("Unsupported role");
++ }
++
++ public String[] getUIClassNamesForRole(int role) {
++
++ if (role <= ServiceUIFactory.MAIN_UIROLE) {
++ return null;
++ }
++ if (role == DocumentPropertiesUI.DOCUMENTPROPERTIES_ROLE) {
++ String[] names = new String[0];
++ names[0] = DocumentPropertiesUI.DOCPROPERTIESCLASSNAME;
++ return names;
++ }
++ throw new IllegalArgumentException("Unsupported role");
++ }
++ }
++
++ private Win32ServiceUIFactory uiFactory = null;
++
++ public synchronized ServiceUIFactory getServiceUIFactory() {
++ if (uiFactory == null) {
++ uiFactory = new Win32ServiceUIFactory(this);
++ }
++ return uiFactory;
+ }
+
+ public String toString() {
+@@ -1614,6 +1722,7 @@
+ class Win32MediaSize extends MediaSizeName {
+ private static ArrayList winStringTable = new ArrayList();
+ private static ArrayList winEnumTable = new ArrayList();
++ private static MediaSize[] predefMedia;
+
+ private int dmPaperID; // driver ID for this paper.
+
+@@ -1627,6 +1736,18 @@
+ return (winStringTable.size()-1);
+ }
+
++ public static synchronized Win32MediaSize findMediaName(String name) {
++ int nameIndex = winStringTable.indexOf(name);
++ if (nameIndex != -1) {
++ return (Win32MediaSize)winEnumTable.get(nameIndex);
++ }
++ return null;
++ }
++
++ public static MediaSize[] getPredefMedia() {
++ return predefMedia;
++ }
++
+ public Win32MediaSize(String name, int dmPaper) {
+ super(nextValue(name));
+ dmPaperID = dmPaper;
+@@ -1638,18 +1759,17 @@
+ }
+
+ static {
+- /* initialize Win32PrintService.predefMedia */
++ /* initialize predefMedia */
+ {
+ Win32MediaSize winMedia = new Win32MediaSize(-1);
+
+ // cannot call getSuperEnumTable directly because of static context
+ MediaSizeName[] enumMedia = winMedia.getSuperEnumTable();
+ if (enumMedia != null) {
+- Win32PrintService.predefMedia = new MediaSize[enumMedia.length];
++ predefMedia = new MediaSize[enumMedia.length];
+
+ for (int i=0; i<enumMedia.length; i++) {
+- Win32PrintService.predefMedia[i] =
+- MediaSize.getMediaSizeForName(enumMedia[i]);
++ predefMedia[i] = MediaSize.getMediaSizeForName(enumMedia[i]);
+ }
+ }
+ }
+--- ./jdk/src/windows/demo/jvmti/hprof/hprof_md.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/demo/jvmti/hprof/hprof_md.c Wed May 07 19:26:47 2014 -0700
+@@ -368,37 +368,32 @@
+ }
+
+ static void dll_build_name(char* buffer, size_t buflen,
+- const char* pname, const char* fname) {
+- // Loosley based on os_windows.cpp
++ const char* paths, const char* fname) {
++ char *path, *paths_copy, *next_token;
+
+- char *pathname = (char *)pname;
+- while (strlen(pathname) > 0) {
+- char *p = strchr(pathname, ';');
+- if (p == NULL) {
+- p = pathname + strlen(pathname);
+- }
+- /* check for NULL path */
+- if (p == pathname) {
+- continue;
+- }
+- if (*(p-1) == ':' || *(p-1) == '\\') {
+- (void)_snprintf(buffer, buflen, "%.*s%s.dll", (p - pathname),
+- pathname, fname);
+- } else {
+- (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (p - pathname),
+- pathname, fname);
+- }
++ paths_copy = strdup(paths);
++ if (paths_copy == NULL) {
++ return;
++ }
++
++ next_token = NULL;
++ path = strtok_s(paths_copy, ";", &next_token);
++
++ while (path != NULL) {
++ _snprintf(buffer, buflen, "%s\\%s.dll", path, fname);
+ if (_access(buffer, 0) == 0) {
+ break;
+ }
+- pathname = p + 1;
+ *buffer = '\0';
++ path = strtok_s(NULL, ";", &next_token);
+ }
++
++ free(paths_copy);
+ }
+
+ /* Build a machine dependent library name out of a path and file name. */
+ void
+-md_build_library_name(char *holder, int holderlen, char *pname, char *fname)
++md_build_library_name(char *holder, int holderlen, const char *pname, const char *fname)
+ {
+ int pnamelen;
+
+--- ./jdk/src/windows/native/java/lang/ProcessImpl_md.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/native/java/lang/ProcessImpl_md.c Wed May 07 19:26:47 2014 -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
+@@ -63,46 +63,52 @@
+ return source;
+ }
+
++static const char EXE_EXT[] = ".exe";
++
+ DWORD
+ selectProcessFlag(JNIEnv *env, jstring cmd0)
+ {
+- char buf[MAX_PATH];
+ DWORD newFlag = 0;
+- char *exe, *p, *name;
+- unsigned char buffer[2];
+- long headerLoc = 0;
+- int fd = 0;
+-
+- exe = (char *)JNU_GetStringPlatformChars(env, cmd0, 0);
+- exe = extractExecutablePath(env, exe);
+-
++ char *exe = (char *)JNU_GetStringPlatformChars(env, cmd0, 0);
+ if (exe != NULL) {
+- if ((p = strchr(exe, '\\')) == NULL) {
+- SearchPath(NULL, exe, ".exe", MAX_PATH, buf, &name);
+- } else {
+- p = strrchr(exe, '\\');
+- *p = 0;
+- p++;
+- SearchPath(exe, p, ".exe", MAX_PATH, buf, &name);
+- }
+- }
+-
+- fd = _open(buf, _O_RDONLY);
+- if (fd > 0) {
+- _read(fd, buffer, 2);
+- if (buffer[0] == 'M' && buffer[1] == 'Z') {
+- _lseek(fd, 60L, SEEK_SET);
+- _read(fd, buffer, 2);
+- headerLoc = (long)buffer[1] << 8 | (long)buffer[0];
+- _lseek(fd, headerLoc, SEEK_SET);
+- _read(fd, buffer, 2);
+- if (buffer[0] == 'P' && buffer[1] == 'E') {
+- newFlag = DETACHED_PROCESS;
++ char buf[MAX_PATH];
++ char *name;
++ DWORD len;
++ exe = extractExecutablePath(env, exe);
++ if (exe != NULL) {
++ /* We are here for Win9x/Me, so the [/] is not the path sep */
++ char *p = strrchr(exe, '\\');
++ if (p == NULL) {
++ len = SearchPath(NULL, exe, EXE_EXT, MAX_PATH, buf, &name);
++ } else {
++ *p = 0;
++ len = SearchPath(exe, p + 1, EXE_EXT, MAX_PATH, buf, &name);
+ }
+ }
+- _close(fd);
++
++ if (len > 0 && len < MAX_PATH) {
++ /* Here the [buf] path is valid and null terminated */
++ int fd = _open(buf, _O_RDONLY);
++ if (fd != -1) {
++ unsigned char buffer[2];
++ if (_read(fd, buffer, 2) == 2
++ && buffer[0] == 'M' && buffer[1] == 'Z'
++ && _lseek(fd, 60L, SEEK_SET) == 60L
++ && _read(fd, buffer, 2) == 2)
++ {
++ long headerLoc = (long)buffer[1] << 8 | (long)buffer[0];
++ if (_lseek(fd, headerLoc, SEEK_SET) == headerLoc
++ && _read(fd, buffer, 2) == 2
++ && buffer[0] == 'P' && buffer[1] == 'E')
++ {
++ newFlag = DETACHED_PROCESS;
++ }
++ }
++ _close(fd);
++ }
++ }
++ JNU_ReleaseStringPlatformChars(env, cmd0, exe);
+ }
+- JNU_ReleaseStringPlatformChars(env, cmd0, exe);
+ return newFlag;
+ }
+
+@@ -129,6 +135,237 @@
+ CloseHandle(handle);
+ }
+
++static BOOL hasInheritFlag(HANDLE handle)
++{
++ DWORD mask;
++ if (GetHandleInformation(handle, &mask)) {
++ return mask & HANDLE_FLAG_INHERIT;
++ }
++ return FALSE;
++}
++
++#define HANDLE_STORAGE_SIZE 6
++#define OFFSET_READ 0
++#define OFFSET_WRITE 1
++//long signed version of INVALID_HANDLE_VALUE
++#define JAVA_INVALID_HANDLE_VALUE ((jlong) -1)
++#define OPPOSITE_END(offset) (offset==OFFSET_READ ? OFFSET_WRITE : OFFSET_READ)
++
++/* Pipe holder structure */
++typedef struct _STDHOLDER {
++ HANDLE pipe[2];
++ int offset;
++} STDHOLDER;
++
++/* Responsible for correct initialization of the [pHolder] structure
++ (that is used for handles recycling) if needs,
++ and appropriate setup of IOE handle [phStd] for child process based
++ on created pipe or Java handle. */
++static BOOL initHolder(
++ JNIEnv *env,
++ jlong *pjhandles, /* IN OUT - the handle form Java,
++ that can be a file, console or undefined */
++ STDHOLDER *pHolder, /* OUT - initialized structure that holds pipe
++ handles */
++ HANDLE *phStd /* OUT - initialized handle for child process */
++) {
++ /* Here we test the value from Java against invalid
++ handle value. We are not using INVALID_HANDLE_VALUE macro
++ due to double signed/unsigned and 32/64bit ambiguity.
++ Otherwise it will be easy to get the wrong
++ value 0x00000000FFFFFFFF
++ instead 0xFFFFFFFFFFFFFFFF. */
++ if (*pjhandles != JAVA_INVALID_HANDLE_VALUE) {
++ /* Java file or console redirection */
++ *phStd = (HANDLE) *pjhandles;
++ /* Here we set the related Java stream (Process.getXXXXStream())
++ to [ProcessBuilder.NullXXXXStream.INSTANCE] value.
++ The initial Java handle [*pjhandles] will be closed in
++ ANY case. It is not a handle leak. */
++ *pjhandles = JAVA_INVALID_HANDLE_VALUE;
++ } else {
++ /* Creation of parent-child pipe */
++ if (!CreatePipe(
++ &pHolder->pipe[OFFSET_READ],
++ &pHolder->pipe[OFFSET_WRITE],
++ NULL, /* we would like to inherit
++ default process access,
++ instead of 'Everybody' access */
++ PIPE_SIZE))
++ {
++ win32Error(env, "CreatePipe");
++ return FALSE;
++ } else {
++ /* [thisProcessEnd] has no the inherit flag because
++ the [lpPipeAttributes] param of [CreatePipe]
++ had the NULL value. */
++ HANDLE thisProcessEnd = pHolder->pipe[OPPOSITE_END(pHolder->offset)];
++ *phStd = pHolder->pipe[pHolder->offset];
++ *pjhandles = (jlong) thisProcessEnd;
++ }
++ }
++ /* Pipe handle will be closed in the [releaseHolder] call,
++ file handle will be closed in Java.
++ The long-live handle need to restore the inherit flag,
++ we do it later in the [prepareIOEHandleState] call. */
++ SetHandleInformation(
++ *phStd,
++ HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
++ return TRUE;
++}
++
++/* Smart recycling of pipe handles in [pHolder]. For the failed
++ create process attempts, both ends of pipe need to be released.
++ The [complete] has the [TRUE] value in the failed attempt. */
++static void releaseHolder(BOOL complete, STDHOLDER *pHolder) {
++ closeSafely(pHolder->pipe[pHolder->offset]);
++ if (complete) {
++ /* Error occur, close this process pipe end */
++ closeSafely(pHolder->pipe[OPPOSITE_END(pHolder->offset)]);
++ }
++}
++
++/* Stores and drops the inherit flag of handles that should not
++ be shared with the child process by default, but can hold the
++ inherit flag due to MS process birth specific. */
++static void prepareIOEHandleState(
++ HANDLE *stdIOE,
++ BOOL *inherit)
++{
++ int i;
++ for (i = 0; i < HANDLE_STORAGE_SIZE; ++i) {
++ HANDLE hstd = stdIOE[i];
++ if (INVALID_HANDLE_VALUE != hstd && hasInheritFlag(hstd)) {
++ /* FALSE by default */
++ inherit[i] = TRUE;
++ /* Java does not need implicit inheritance for IOE handles,
++ so we drop inherit flag that probably was installed by
++ previous CreateProcess call that launched current process.
++ We will return the handle state back after CreateProcess call.
++ By clearing inherit flag we prevent "greedy grandchild" birth.
++ The explicit inheritance for child process IOE handles is
++ implemented in the [initHolder] call. */
++ SetHandleInformation(hstd, HANDLE_FLAG_INHERIT, 0);
++ }
++ }
++}
++
++/* Restores the inheritance flag of handles from stored values. */
++static void restoreIOEHandleState(
++ const HANDLE *stdIOE,
++ const BOOL *inherit)
++{
++ /* The set of current process standard IOE handles and
++ the set of child process IOE handles can intersect.
++ To restore the inherit flag right, we use backward
++ array iteration. */
++ int i;
++ for (i = HANDLE_STORAGE_SIZE - 1; i >= 0; --i)
++ if (INVALID_HANDLE_VALUE != stdIOE[i]) {
++ /* Restore inherit flag for any case.
++ The handle can be changed by explicit inheritance.*/
++ SetHandleInformation(stdIOE[i],
++ HANDLE_FLAG_INHERIT,
++ inherit[i] ? HANDLE_FLAG_INHERIT : 0);
++ }
++}
++
++/* Please, read about the MS inheritance problem
++ http://support.microsoft.com/kb/315939
++ and critical section/synchronized block solution. */
++static jlong processCreate(
++ JNIEnv *env,
++ const jchar *pcmd,
++ const jchar *penvBlock,
++ const jchar *pdir,
++ jlong *handles,
++ jboolean redirectErrorStream)
++{
++ jlong ret = 0L;
++ STARTUPINFOW si = {sizeof(si)};
++
++ /* Handles for which the inheritance flag must be restored. */
++ HANDLE stdIOE[HANDLE_STORAGE_SIZE] = {
++ /* Current process standard IOE handles: JDK-7147084 */
++ INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE,
++ /* Child process IOE handles: JDK-6921885 */
++ (HANDLE)handles[0], (HANDLE)handles[1], (HANDLE)handles[2]};
++ BOOL inherit[HANDLE_STORAGE_SIZE] = {
++ FALSE, FALSE, FALSE,
++ FALSE, FALSE, FALSE};
++
++ {
++ /* Extraction of current process standard IOE handles */
++ DWORD idsIOE[3] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE};
++ int i;
++ for (i = 0; i < 3; ++i)
++ /* Should not be closed by CloseHandle! */
++ stdIOE[i] = GetStdHandle(idsIOE[i]);
++ }
++
++ prepareIOEHandleState(stdIOE, inherit);
++ {
++ /* Input */
++ STDHOLDER holderIn = {{INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE}, OFFSET_READ};
++ if (initHolder(env, &handles[0], &holderIn, &si.hStdInput)) {
++
++ /* Output */
++ STDHOLDER holderOut = {{INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE}, OFFSET_WRITE};
++ if (initHolder(env, &handles[1], &holderOut, &si.hStdOutput)) {
++
++ /* Error */
++ STDHOLDER holderErr = {{INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE}, OFFSET_WRITE};
++ BOOL success;
++ if (redirectErrorStream) {
++ si.hStdError = si.hStdOutput;
++ /* Here we set the error stream to [ProcessBuilder.NullInputStream.INSTANCE]
++ value. That is in accordance with Java Doc for the redirection case.
++ The Java file for the [ handles[2] ] will be closed in ANY case. It is not
++ a handle leak. */
++ handles[2] = JAVA_INVALID_HANDLE_VALUE;
++ success = TRUE;
++ } else {
++ success = initHolder(env, &handles[2], &holderErr, &si.hStdError);
++ }
++
++ if (success) {
++ PROCESS_INFORMATION pi;
++ DWORD processFlag = CREATE_UNICODE_ENVIRONMENT;
++
++ /* Suppress popping-up of a console window for non-console applications */
++ if (GetConsoleWindow() == NULL)
++ processFlag |= CREATE_NO_WINDOW;
++
++ si.dwFlags = STARTF_USESTDHANDLES;
++ if (!CreateProcessW(
++ NULL, /* executable name */
++ (LPWSTR)pcmd, /* command line */
++ NULL, /* process security attribute */
++ NULL, /* thread security attribute */
++ TRUE, /* inherits system handles */
++ processFlag, /* selected based on exe type */
++ (LPVOID)penvBlock,/* environment block */
++ (LPCWSTR)pdir, /* change to the new current directory */
++ &si, /* (in) startup information */
++ &pi)) /* (out) process information */
++ {
++ win32Error(env, "CreateProcess");
++ } else {
++ closeSafely(pi.hThread);
++ ret = (jlong)pi.hProcess;
++ }
++ }
++ releaseHolder(ret == 0, &holderErr);
++ releaseHolder(ret == 0, &holderOut);
++ }
++ releaseHolder(ret == 0, &holderIn);
++ }
++ }
++ restoreIOEHandleState(stdIOE, inherit);
++
++ return ret;
++}
++
+ JNIEXPORT jlong JNICALL
+ Java_java_lang_ProcessImpl_create(JNIEnv *env, jclass ignored,
+ jstring cmd,
+@@ -137,142 +374,35 @@
+ jlongArray stdHandles,
+ jboolean redirectErrorStream)
+ {
+- HANDLE inRead = INVALID_HANDLE_VALUE;
+- HANDLE inWrite = INVALID_HANDLE_VALUE;
+- HANDLE outRead = INVALID_HANDLE_VALUE;
+- HANDLE outWrite = INVALID_HANDLE_VALUE;
+- HANDLE errRead = INVALID_HANDLE_VALUE;
+- HANDLE errWrite = INVALID_HANDLE_VALUE;
+- SECURITY_ATTRIBUTES sa;
+- PROCESS_INFORMATION pi;
+- STARTUPINFOW si;
+- const jchar* pcmd = NULL;
+- const jchar* pdir = NULL;
+- const jchar* penvBlock = NULL;
+- jlong *handles = NULL;
+ jlong ret = 0;
+- OSVERSIONINFO ver;
+- jboolean onNT = JNI_FALSE;
+- DWORD processFlag;
+-
+- ver.dwOSVersionInfoSize = sizeof(ver);
+- GetVersionEx(&ver);
+- if (ver.dwPlatformId == VER_PLATFORM_WIN32_NT)
+- onNT = JNI_TRUE;
+-
+- assert(cmd != NULL);
+- pcmd = (*env)->GetStringChars(env, cmd, NULL);
+- if (pcmd == NULL) goto Catch;
+-
+- if (dir != 0) {
+- pdir = (*env)->GetStringChars(env, dir, NULL);
+- if (pdir == NULL) goto Catch;
++ if (cmd != NULL && stdHandles != NULL) {
++ const jchar *pcmd = (*env)->GetStringChars(env, cmd, NULL);
++ if (pcmd != NULL) {
++ const jchar *penvBlock = (envBlock != NULL)
++ ? (*env)->GetStringChars(env, envBlock, NULL)
++ : NULL;
++ const jchar *pdir = (dir != NULL)
++ ? (*env)->GetStringChars(env, dir, NULL)
++ : NULL;
++ jlong *handles = (*env)->GetLongArrayElements(env, stdHandles, NULL);
++ if (handles != NULL) {
++ ret = processCreate(
++ env,
++ pcmd,
++ penvBlock,
++ pdir,
++ handles,
++ redirectErrorStream);
++ (*env)->ReleaseLongArrayElements(env, stdHandles, handles, 0);
++ }
++ if (pdir != NULL)
++ (*env)->ReleaseStringChars(env, dir, pdir);
++ if (penvBlock != NULL)
++ (*env)->ReleaseStringChars(env, envBlock, penvBlock);
++ (*env)->ReleaseStringChars(env, cmd, pcmd);
++ }
+ }
+- if (envBlock != NULL) {
+- penvBlock = ((*env)->GetStringChars(env, envBlock, NULL));
+- if (penvBlock == NULL) goto Catch;
+- }
+- assert(stdHandles != NULL);
+- handles = (*env)->GetLongArrayElements(env, stdHandles, NULL);
+- if (handles == NULL) goto Catch;
+-
+- memset(&si, 0, sizeof(si));
+- si.cb = sizeof(si);
+- si.dwFlags = STARTF_USESTDHANDLES;
+-
+- sa.nLength = sizeof(sa);
+- sa.lpSecurityDescriptor = 0;
+- sa.bInheritHandle = TRUE;
+-
+- if (handles[0] != (jlong) -1) {
+- si.hStdInput = (HANDLE) handles[0];
+- handles[0] = (jlong) -1;
+- } else {
+- if (! CreatePipe(&inRead, &inWrite, &sa, PIPE_SIZE)) {
+- win32Error(env, "CreatePipe");
+- goto Catch;
+- }
+- si.hStdInput = inRead;
+- SetHandleInformation(inWrite, HANDLE_FLAG_INHERIT, FALSE);
+- handles[0] = (jlong) inWrite;
+- }
+- SetHandleInformation(si.hStdInput, HANDLE_FLAG_INHERIT, TRUE);
+-
+- if (handles[1] != (jlong) -1) {
+- si.hStdOutput = (HANDLE) handles[1];
+- handles[1] = (jlong) -1;
+- } else {
+- if (! CreatePipe(&outRead, &outWrite, &sa, PIPE_SIZE)) {
+- win32Error(env, "CreatePipe");
+- goto Catch;
+- }
+- si.hStdOutput = outWrite;
+- SetHandleInformation(outRead, HANDLE_FLAG_INHERIT, FALSE);
+- handles[1] = (jlong) outRead;
+- }
+- SetHandleInformation(si.hStdOutput, HANDLE_FLAG_INHERIT, TRUE);
+-
+- if (redirectErrorStream) {
+- si.hStdError = si.hStdOutput;
+- handles[2] = (jlong) -1;
+- } else if (handles[2] != (jlong) -1) {
+- si.hStdError = (HANDLE) handles[2];
+- handles[2] = (jlong) -1;
+- } else {
+- if (! CreatePipe(&errRead, &errWrite, &sa, PIPE_SIZE)) {
+- win32Error(env, "CreatePipe");
+- goto Catch;
+- }
+- si.hStdError = errWrite;
+- SetHandleInformation(errRead, HANDLE_FLAG_INHERIT, FALSE);
+- handles[2] = (jlong) errRead;
+- }
+- SetHandleInformation(si.hStdError, HANDLE_FLAG_INHERIT, TRUE);
+-
+- if (onNT)
+- processFlag = CREATE_NO_WINDOW | CREATE_UNICODE_ENVIRONMENT;
+- else
+- processFlag = selectProcessFlag(env, cmd) | CREATE_UNICODE_ENVIRONMENT;
+- ret = CreateProcessW(0, /* executable name */
+- (LPWSTR)pcmd, /* command line */
+- 0, /* process security attribute */
+- 0, /* thread security attribute */
+- TRUE, /* inherits system handles */
+- processFlag, /* selected based on exe type */
+- (LPVOID)penvBlock,/* environment block */
+- (LPCWSTR)pdir, /* change to the new current directory */
+- &si, /* (in) startup information */
+- &pi); /* (out) process information */
+- if (!ret) {
+- win32Error(env, "CreateProcess");
+- goto Catch;
+- }
+-
+- CloseHandle(pi.hThread);
+- ret = (jlong)pi.hProcess;
+-
+- Finally:
+- /* Always clean up the child's side of the pipes */
+- closeSafely(inRead);
+- closeSafely(outWrite);
+- closeSafely(errWrite);
+-
+- if (pcmd != NULL)
+- (*env)->ReleaseStringChars(env, cmd, pcmd);
+- if (pdir != NULL)
+- (*env)->ReleaseStringChars(env, dir, pdir);
+- if (penvBlock != NULL)
+- (*env)->ReleaseStringChars(env, envBlock, penvBlock);
+- if (handles != NULL)
+- (*env)->ReleaseLongArrayElements(env, stdHandles, handles, 0);
+ return ret;
+-
+- Catch:
+- /* Clean up the parent's side of the pipes in case of failure only */
+- closeSafely(inWrite);
+- closeSafely(outRead);
+- closeSafely(errRead);
+- goto Finally;
+ }
+
+ JNIEXPORT jint JNICALL
+--- ./jdk/src/windows/native/java/net/SocketInputStream.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/native/java/net/SocketInputStream.c Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2003, 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
+@@ -134,32 +134,34 @@
+ (*env)->SetByteArrayRegion(env, data, off, nread, (jbyte *)bufP);
+ } else {
+ if (nread < 0) {
+- /*
+- * Recv failed.
+- */
+- switch (WSAGetLastError()) {
+- case WSAEINTR:
+- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
+- "socket closed");
+- break;
++ // Check if the socket has been closed since we last checked.
++ // This could be a reason for recv failing.
++ if ((*env)->GetIntField(env, fdObj, IO_fd_fdID) == -1) {
++ NET_ThrowSocketException(env, "Socket closed");
++ } else {
++ switch (WSAGetLastError()) {
++ case WSAEINTR:
++ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
++ "socket closed");
++ break;
++ case WSAECONNRESET:
++ case WSAESHUTDOWN:
++ /*
++ * Connection has been reset - Windows sometimes reports
++ * the reset as a shutdown error.
++ */
++ JNU_ThrowByName(env, "sun/net/ConnectionResetException",
++ "");
++ break;
+
+- case WSAECONNRESET:
+- case WSAESHUTDOWN:
+- /*
+- * Connection has been reset - Windows sometimes reports
+- * the reset as a shutdown error.
+- */
+- JNU_ThrowByName(env, "sun/net/ConnectionResetException",
+- "");
+- break;
++ case WSAETIMEDOUT :
++ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
++ "Read timed out");
++ break;
+
+- case WSAETIMEDOUT :
+- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
+- "Read timed out");
+- break;
+-
+- default:
+- NET_ThrowCurrent(env, "recv failed");
++ default:
++ NET_ThrowCurrent(env, "recv failed");
++ }
+ }
+ }
+ }
+--- ./jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c Wed May 07 19:26:47 2014 -0700
+@@ -192,45 +192,66 @@
+ jobject fdo, jlong address, jint len)
+ {
+ /* set up */
+- int i = 0;
++ int next_index, next_offset, ret=0;
+ DWORD written = 0;
+ jint fd = fdval(env, fdo);
+ struct iovec *iovp = (struct iovec *)address;
+ WSABUF *bufs = malloc(len * sizeof(WSABUF));
+- jint rem = MAX_BUFFER_SIZE;
++ jlong count = 0;
+
+ if (bufs == 0) {
+ JNU_ThrowOutOfMemoryError(env, 0);
+ return IOS_THROWN;
+ }
+
+- /* copy iovec into WSABUF */
+- for(i=0; i<len; i++) {
+- jint iov_len = iovp[i].iov_len;
+- if (iov_len > rem)
+- iov_len = rem;
+- bufs[i].buf = (char *)iovp[i].iov_base;
+- bufs[i].len = (u_long)iov_len;
+- rem -= iov_len;
+- if (rem == 0) {
+- len = i+1;
++ // next buffer and offset to consume
++ next_index = 0;
++ next_offset = 0;
++
++ while (next_index < len) {
++ DWORD buf_count = 0;
++
++ /* Prepare the WSABUF array to a maximum total size of MAX_BUFFER_SIZE */
++ jint rem = MAX_BUFFER_SIZE;
++ while (next_index < len && rem > 0) {
++ jint iov_len = iovp[next_index].iov_len - next_offset;
++ char* ptr = (char *)iovp[next_index].iov_base;
++ ptr += next_offset;
++ if (iov_len > rem) {
++ iov_len = rem;
++ next_offset += rem;
++ } else {
++ next_index ++;
++ next_offset = 0;
++ }
++
++ bufs[buf_count].buf = ptr;
++ bufs[buf_count].len = (u_long)iov_len;
++ buf_count++;
++
++ rem -= iov_len;
++ }
++
++ /* write the buffers */
++ ret = WSASend((SOCKET)fd, /* Socket */
++ bufs, /* pointers to the buffers */
++ buf_count, /* number of buffers to process */
++ &written, /* receives number of bytes written */
++ 0, /* no flags */
++ 0, /* no overlapped sockets */
++ 0); /* no completion routine */
++
++ if (ret == SOCKET_ERROR) {
+ break;
+ }
++
++ count += written;
+ }
+
+- /* read into the buffers */
+- i = WSASend((SOCKET)fd, /* Socket */
+- bufs, /* pointers to the buffers */
+- (DWORD)len, /* number of buffers to process */
+- &written, /* receives number of bytes written */
+- 0, /* no flags */
+- 0, /* no overlapped sockets */
+- 0); /* no completion routine */
+-
+ /* clean up */
+ free(bufs);
+
+- if (i != 0) {
++ if (ret == SOCKET_ERROR && count == 0) {
+ int theErr = (jint)WSAGetLastError();
+ if (theErr == WSAEWOULDBLOCK) {
+ return IOS_UNAVAILABLE;
+@@ -239,7 +260,7 @@
+ return IOS_THROWN;
+ }
+
+- return convertLongReturnVal(env, (jlong)written, JNI_FALSE);
++ return convertLongReturnVal(env, count, JNI_FALSE);
+ }
+
+ JNIEXPORT void JNICALL
+--- ./jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c Wed May 07 19:26:47 2014 -0700
+@@ -162,7 +162,7 @@
+ }
+ completionStatus_error = (*env)->GetFieldID(env, clazz, "error", "I");
+ completionStatus_bytesTransferred = (*env)->GetFieldID(env, clazz, "bytesTransferred", "I");
+- completionStatus_completionKey = (*env)->GetFieldID(env, clazz, "completionKey", "I");
++ completionStatus_completionKey = (*env)->GetFieldID(env, clazz, "completionKey", "J");
+
+ clazz = (*env)->FindClass(env, "sun/nio/fs/WindowsNativeDispatcher$BackupResult");
+ if (clazz == NULL) {
+@@ -1169,12 +1169,11 @@
+
+ JNIEXPORT jlong JNICALL
+ Java_sun_nio_fs_WindowsNativeDispatcher_CreateIoCompletionPort(JNIEnv* env, jclass this,
+- jlong fileHandle, jlong existingPort, jint completionKey)
++ jlong fileHandle, jlong existingPort, jlong completionKey)
+ {
+- ULONG_PTR ck = completionKey;
+ HANDLE port = CreateIoCompletionPort((HANDLE)jlong_to_ptr(fileHandle),
+ (HANDLE)jlong_to_ptr(existingPort),
+- ck,
++ (ULONG_PTR)completionKey,
+ 0);
+ if (port == NULL) {
+ throwWindowsException(env, GetLastError());
+@@ -1203,21 +1202,20 @@
+ (*env)->SetIntField(env, obj, completionStatus_error, ioResult);
+ (*env)->SetIntField(env, obj, completionStatus_bytesTransferred,
+ (jint)bytesTransferred);
+- (*env)->SetIntField(env, obj, completionStatus_completionKey,
+- (jint)completionKey);
+-
++ (*env)->SetLongField(env, obj, completionStatus_completionKey,
++ (jlong)completionKey);
+ }
+ }
+
+ JNIEXPORT void JNICALL
+ Java_sun_nio_fs_WindowsNativeDispatcher_PostQueuedCompletionStatus(JNIEnv* env, jclass this,
+- jlong completionPort, jint completionKey)
++ jlong completionPort, jlong completionKey)
+ {
+ BOOL res;
+
+ res = PostQueuedCompletionStatus((HANDLE)jlong_to_ptr(completionPort),
+ (DWORD)0, /* dwNumberOfBytesTransferred */
+- (DWORD)completionKey,
++ (ULONG_PTR)completionKey,
+ NULL); /* lpOverlapped */
+ if (res == 0) {
+ throwWindowsException(env, GetLastError());
+@@ -1232,7 +1230,17 @@
+ BOOL res;
+ BOOL subtree = (watchSubTree == JNI_TRUE) ? TRUE : FALSE;
+
+- ((LPOVERLAPPED)jlong_to_ptr(pOverlapped))->hEvent = NULL;
++ /* Any unused members of [OVERLAPPED] structure should always be initialized to zero
++ before the structure is used in a function call.
++ Otherwise, the function may fail and return ERROR_INVALID_PARAMETER.
++ http://msdn.microsoft.com/en-us/library/windows/desktop/ms684342%28v=vs.85%29.aspx
++
++ The [Offset] and [OffsetHigh] members of this structure are not used.
++ http://msdn.microsoft.com/en-us/library/windows/desktop/aa365465%28v=vs.85%29.aspx
++
++ [hEvent] should be zero, other fields are the return values. */
++ ZeroMemory((LPOVERLAPPED)jlong_to_ptr(pOverlapped), sizeof(OVERLAPPED));
++
+ res = ReadDirectoryChangesW((HANDLE)jlong_to_ptr(hDirectory),
+ (LPVOID)jlong_to_ptr(bufferAddress),
+ (DWORD)bufferLength,
+--- ./jdk/src/windows/native/sun/security/krb5/NativeCreds.c Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/native/sun/security/krb5/NativeCreds.c Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 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
+@@ -380,7 +380,8 @@
+ */
+ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativeCreds(
+ JNIEnv *env,
+- jclass krbcredsClass) {
++ jclass krbcredsClass,
++ jintArray jetypes) {
+
+ KERB_QUERY_TKT_CACHE_REQUEST CacheRequest;
+ PKERB_RETRIEVE_TKT_RESPONSE TktCacheResponse = NULL;
+@@ -396,9 +397,12 @@
+ jobject ticketFlags, startTime, endTime, krbCreds = NULL;
+ jobject authTime, renewTillTime, hostAddresses = NULL;
+ KERB_EXTERNAL_TICKET *msticket;
+- int ignore_cache = 0;
++ int found_in_cache = 0;
+ FILETIME Now, EndTime, LocalEndTime;
+
++ int i, netypes;
++ jint *etypes = NULL;
++
+ while (TRUE) {
+
+ if (krbcredsConstructor == 0) {
+@@ -465,31 +469,33 @@
+ // got the native MS TGT
+ msticket = &(TktCacheResponse->Ticket);
+
++ netypes = (*env)->GetArrayLength(env, jetypes);
++ etypes = (jint *) (*env)->GetIntArrayElements(env, jetypes, NULL);
++
+ // check TGT validity
+- switch (msticket->SessionKey.KeyType) {
+- case KERB_ETYPE_DES_CBC_CRC:
+- case KERB_ETYPE_DES_CBC_MD5:
+- case KERB_ETYPE_NULL:
+- case KERB_ETYPE_RC4_HMAC_NT:
+- GetSystemTimeAsFileTime(&Now);
+- EndTime.dwLowDateTime = msticket->EndTime.LowPart;
+- EndTime.dwHighDateTime = msticket->EndTime.HighPart;
+- FileTimeToLocalFileTime(&EndTime, &LocalEndTime);
+- if (CompareFileTime(&Now, &LocalEndTime) >= 0) {
+- ignore_cache = 1;
+- }
+- if (msticket->TicketFlags & KERB_TICKET_FLAGS_invalid) {
+- ignore_cache = 1;
+- }
+- break;
+- case KERB_ETYPE_RC4_MD4:
+- default:
+- // not supported
+- ignore_cache = 1;
+- break;
++ if (native_debug) {
++ printf("LSA: TICKET SessionKey KeyType is %d\n", msticket->SessionKey.KeyType);
+ }
+
+- if (ignore_cache) {
++ if ((msticket->TicketFlags & KERB_TICKET_FLAGS_invalid) == 0) {
++ GetSystemTimeAsFileTime(&Now);
++ EndTime.dwLowDateTime = msticket->EndTime.LowPart;
++ EndTime.dwHighDateTime = msticket->EndTime.HighPart;
++ FileTimeToLocalFileTime(&EndTime, &LocalEndTime);
++ if (CompareFileTime(&Now, &LocalEndTime) < 0) {
++ for (i=0; i<netypes; i++) {
++ if (etypes[i] == msticket->SessionKey.KeyType) {
++ found_in_cache = 1;
++ if (native_debug) {
++ printf("LSA: Valid etype found: %d\n", etypes[i]);
++ }
++ break;
++ }
++ }
++ }
++ }
++
++ if (!found_in_cache) {
+ if (native_debug) {
+ printf("LSA: MS TGT in cache is invalid/not supported; request new ticket\n");
+ }
+@@ -503,34 +509,40 @@
+ }
+
+ pTicketRequest->MessageType = KerbRetrieveEncodedTicketMessage;
+- pTicketRequest->EncryptionType = KERB_ETYPE_DES_CBC_MD5;
+ pTicketRequest->CacheOptions = KERB_RETRIEVE_TICKET_DONT_USE_CACHE;
+
+- Status = LsaCallAuthenticationPackage(
+- LogonHandle,
+- PackageId,
+- pTicketRequest,
+- requestSize,
+- &pTicketResponse,
+- &responseSize,
+- &SubStatus
+- );
++ for (i=0; i<netypes; i++) {
++ pTicketRequest->EncryptionType = etypes[i];
++ Status = LsaCallAuthenticationPackage(
++ LogonHandle,
++ PackageId,
++ pTicketRequest,
++ requestSize,
++ &pTicketResponse,
++ &responseSize,
++ &SubStatus
++ );
+
+- if (native_debug) {
+- printf("LSA: Response size is %d\n", responseSize);
+- }
++ if (native_debug) {
++ printf("LSA: Response size is %d for %d\n", responseSize, etypes[i]);
++ }
+
+- if (!LSA_SUCCESS(Status) || !LSA_SUCCESS(SubStatus)) {
+- if (!LSA_SUCCESS(Status)) {
+- ShowNTError("LsaCallAuthenticationPackage", Status);
+- } else {
+- ShowNTError("Protocol status", SubStatus);
++ if (!LSA_SUCCESS(Status) || !LSA_SUCCESS(SubStatus)) {
++ if (!LSA_SUCCESS(Status)) {
++ ShowNTError("LsaCallAuthenticationPackage", Status);
++ } else {
++ ShowNTError("Protocol status", SubStatus);
++ }
++ continue;
+ }
++
++ // got the native MS Kerberos TGT
++ msticket = &(pTicketResponse->Ticket);
+ break;
+ }
+-
+- // got the native MS Kerberos TGT
+- msticket = &(pTicketResponse->Ticket);
++ }
++ if (etypes != NULL) {
++ (*env)->ReleaseIntArrayElements(env, jetypes, etypes, 0);
+ }
+
+ /*
+@@ -653,7 +665,7 @@
+ hostAddresses);
+
+ break;
+- } // end of WHILE
++ } // end of WHILE. This WHILE will never loop.
+
+ // clean up resources
+ if (TktCacheResponse != NULL) {
+--- ./jdk/src/windows/native/sun/windows/awt_FileDialog.cpp Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/native/sun/windows/awt_FileDialog.cpp Wed May 07 19:26:47 2014 -0700
+@@ -372,7 +372,9 @@
+
+ // Report result to peer.
+ if (result) {
+- jint length = (jint)GetBufferLength(ofn.lpstrFile, ofn.nMaxFile);
++ jint length = multipleMode
++ ? (jint)GetBufferLength(ofn.lpstrFile, ofn.nMaxFile)
++ : (jint)_tcslen(ofn.lpstrFile);
+ jcharArray jnames = env->NewCharArray(length);
+ env->SetCharArrayRegion(jnames, 0, length, (jchar*)ofn.lpstrFile);
+
+--- ./jdk/src/windows/native/sun/windows/awt_PrintControl.cpp Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/native/sun/windows/awt_PrintControl.cpp Wed May 07 19:26:47 2014 -0700
+@@ -81,6 +81,7 @@
+ jmethodID AwtPrintControl::setNativeAttID;
+ jmethodID AwtPrintControl::setRangeCopiesID;
+ jmethodID AwtPrintControl::setResID;
++jmethodID AwtPrintControl::setJobAttributesID;
+
+
+ BOOL AwtPrintControl::IsSupportedLevel(HANDLE hPrinter, DWORD dwLevel) {
+@@ -297,6 +298,10 @@
+ AwtPrintControl::setPrinterID =
+ env->GetMethodID(cls, "setPrinterNameAttrib", "(Ljava/lang/String;)V");
+
++ AwtPrintControl::setJobAttributesID =
++ env->GetMethodID(cls, "setJobAttributes",
++ "(Ljavax/print/attribute/PrintRequestAttributeSet;IISSSSSSS)V");
++
+ DASSERT(AwtPrintControl::driverDoesMultipleCopiesID != NULL);
+ DASSERT(AwtPrintControl::getPrintDCID != NULL);
+ DASSERT(AwtPrintControl::setPrintDCID != NULL);
+@@ -327,6 +332,7 @@
+ DASSERT(AwtPrintControl::getSidesID != NULL);
+ DASSERT(AwtPrintControl::getSelectID != NULL);
+ DASSERT(AwtPrintControl::getPrintToFileEnabledID != NULL);
++ DASSERT(AwtPrintControl::setJobAttributesID != NULL);
+
+
+ CATCH_BAD_ALLOC;
+--- ./jdk/src/windows/native/sun/windows/awt_PrintControl.h Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/native/sun/windows/awt_PrintControl.h Wed May 07 19:26:47 2014 -0700
+@@ -47,7 +47,6 @@
+ static jmethodID setDevmodeID;
+ static jmethodID getDevnamesID;
+ static jmethodID setDevnamesID;
+-
+ static jmethodID getWin32MediaID;
+ static jmethodID setWin32MediaID;
+ static jmethodID getWin32MediaTrayID;
+@@ -73,6 +72,7 @@
+ static jmethodID setNativeAttID;
+ static jmethodID setRangeCopiesID;
+ static jmethodID setResID;
++ static jmethodID setJobAttributesID;
+
+ static void initIDs(JNIEnv *env, jclass cls);
+ static BOOL FindPrinter(jstring printerName, LPBYTE pPrinterEnum,
+--- ./jdk/src/windows/native/sun/windows/awt_PrintJob.cpp Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/src/windows/native/sun/windows/awt_PrintJob.cpp Wed May 07 19:26:47 2014 -0700
+@@ -329,6 +329,156 @@
+ static int embolden(int currentWeight);
+ static BOOL getPrintableArea(HDC pdc, HANDLE hDevMode, RectDouble *margin);
+
++
++
++/************************************************************************
++ * DocumentProperties native support
++ */
++
++/* Values must match those defined in WPrinterJob.java */
++static const DWORD SET_COLOR = 0x00000200;
++static const DWORD SET_ORIENTATION = 0x00004000;
++static const DWORD SET_COLLATED = 0x00008000;
++static const DWORD SET_DUP_VERTICAL = 0x00000010;
++static const DWORD SET_DUP_HORIZONTAL = 0x00000020;
++static const DWORD SET_RES_HIGH = 0x00000040;
++static const DWORD SET_RES_LOW = 0x00000080;
++
++/*
++ * Copy DEVMODE state back into JobAttributes.
++ */
++
++static void UpdateJobAttributes(JNIEnv *env,
++ jobject wJob,
++ jobject attrSet,
++ DEVMODE *devmode) {
++
++ DWORD dmValues = 0;
++ int xRes = 0, yRes = 0;
++
++ if (devmode->dmFields & DM_COLOR) {
++ if (devmode->dmColor == DMCOLOR_COLOR) {
++ dmValues |= SET_COLOR;
++ }
++ }
++
++ if (devmode->dmFields & DM_ORIENTATION) {
++ if (devmode->dmOrientation == DMORIENT_LANDSCAPE) {
++ dmValues |= SET_ORIENTATION;
++ }
++ }
++
++ if (devmode->dmFields & DM_COLLATE &&
++ devmode->dmCollate == DMCOLLATE_TRUE) {
++ dmValues |= SET_COLLATED;
++ }
++
++ if (devmode->dmFields & DM_PRINTQUALITY) {
++ /* value < 0 indicates quality setting.
++ * value > 0 indicates X resolution. In that case
++ * hopefully we will also find y-resolution specified.
++ * If its not, assume its the same as x-res.
++ * Maybe Java code should try to reconcile this against
++ * the printers claimed set of supported resolutions.
++ */
++ if (devmode->dmPrintQuality < 0) {
++ if (devmode->dmPrintQuality == DMRES_HIGH) {
++ dmValues |= SET_RES_HIGH;
++ } else if ((devmode->dmPrintQuality == DMRES_LOW) ||
++ (devmode->dmPrintQuality == DMRES_DRAFT)) {
++ dmValues |= SET_RES_LOW;
++ }
++ /* else if (devmode->dmPrintQuality == DMRES_MEDIUM)
++ * will set to NORMAL.
++ */
++ } else {
++ xRes = devmode->dmPrintQuality;
++ yRes = (devmode->dmFields & DM_YRESOLUTION) ?
++ devmode->dmYResolution : devmode->dmPrintQuality;
++ }
++ }
++
++ if (devmode->dmFields & DM_DUPLEX) {
++ if (devmode->dmDuplex == DMDUP_HORIZONTAL) {
++ dmValues |= SET_DUP_HORIZONTAL;
++ } else if (devmode->dmDuplex == DMDUP_VERTICAL) {
++ dmValues |= SET_DUP_VERTICAL;
++ }
++ }
++
++ env->CallVoidMethod(wJob, AwtPrintControl::setJobAttributesID, attrSet,
++ devmode->dmFields, dmValues, devmode->dmCopies,
++ devmode->dmPaperSize, devmode->dmPaperWidth,
++ devmode->dmPaperLength, devmode->dmDefaultSource,
++ xRes, yRes);
++
++}
++
++JNIEXPORT jboolean JNICALL
++Java_sun_awt_windows_WPrinterJob_showDocProperties(JNIEnv *env,
++ jobject wJob,
++ jlong hWndParent,
++ jobject attrSet,
++ jint dmFields,
++ jshort copies,
++ jshort collate,
++ jshort color,
++ jshort duplex,
++ jshort orient,
++ jshort paper,
++ jshort bin,
++ jshort xres_quality,
++ jshort yres)
++{
++ TRY;
++
++ HGLOBAL hDevMode = AwtPrintControl::getPrintHDMode(env, wJob);
++ HGLOBAL hDevNames = AwtPrintControl::getPrintHDName(env, wJob);
++ DEVMODE *devmode = NULL;
++ DEVNAMES *devnames = NULL;
++ LONG rval = IDCANCEL;
++ jboolean ret = JNI_FALSE;
++
++ if (hDevMode != NULL && hDevNames != NULL) {
++ devmode = (DEVMODE *)::GlobalLock(hDevMode);
++ devnames = (DEVNAMES *)::GlobalLock(hDevNames);
++
++ LPTSTR lpdevnames = (LPTSTR)devnames;
++ // No need to call _tcsdup as we won't unlock until we are done.
++ LPTSTR printerName = lpdevnames+devnames->wDeviceOffset;
++ LPTSTR portName = lpdevnames+devnames->wOutputOffset;
++
++ HANDLE hPrinter;
++ if (::OpenPrinter(printerName, &hPrinter, NULL) == TRUE) {
++ devmode->dmFields |= dmFields;
++ devmode->dmCopies = copies;
++ devmode->dmCollate = collate;
++ devmode->dmColor = color;
++ devmode->dmDuplex = duplex;
++ devmode->dmOrientation = orient;
++ devmode->dmPrintQuality = xres_quality;
++ devmode->dmYResolution = yres;
++ devmode->dmPaperSize = paper;
++ devmode->dmDefaultSource = bin;
++
++ rval = ::DocumentProperties((HWND)hWndParent,
++ hPrinter, printerName, devmode, devmode,
++ DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT);
++ if (rval == IDOK) {
++ UpdateJobAttributes(env, wJob, attrSet, devmode);
++ ret = JNI_TRUE;
++ }
++ VERIFY(::ClosePrinter(hPrinter));
++ }
++ ::GlobalUnlock(hDevNames);
++ ::GlobalUnlock(hDevMode);
++ }
++
++ return ret;
++
++ CATCH_BAD_ALLOC_RET(0);
++}
++
+ /************************************************************************
+ * WPageDialog native methods
+ */
+@@ -732,7 +882,6 @@
+ memset(&pd, 0, sizeof(PRINTDLG));
+ pd.lStructSize = sizeof(PRINTDLG);
+ pd.Flags = PD_RETURNDEFAULT | PD_RETURNDC;
+-
+ if (::PrintDlg(&pd)) {
+ printDC = pd.hDC;
+ hDevMode = pd.hDevMode;
+@@ -792,8 +941,19 @@
+ jint imgPixelWid = GetDeviceCaps(printDC, HORZRES);
+ jint imgPixelHgt = GetDeviceCaps(printDC, VERTRES);
+
++ // The DC may be obtained when we first selected the printer as a
++ // result of a call to setNativePrintService.
++ // If the Devmode was obtained later on from the DocumentProperties dialog
++ // the DC won't have been updated and its settings may be for PORTRAIT.
++ // This may happen in other cases too, but was observed for the above.
++ // To get a DC compatible with this devmode we should really call
++ // CreateDC() again to get a DC for the devmode we are using.
++ // The changes for that are a lot more risk, so to minimise that
++ // risk, assume its not LANDSCAPE unless width > height, even if the
++ // devmode says its LANDSCAPE.
+ // if the values were obtained from a rotated device, swap.
+- if (getOrientationFromDevMode2(hDevMode) == DMORIENT_LANDSCAPE) {
++ if ((getOrientationFromDevMode2(hDevMode) == DMORIENT_LANDSCAPE) &&
++ (imgPixelWid > imgPixelHgt)) {
+ jint tmp;
+ tmp = xPixelRes;
+ xPixelRes = yPixelRes;
+@@ -941,6 +1101,9 @@
+ setBooleanField(env, self, DRIVER_COLLATE_STR, JNI_FALSE);
+ }
+
++ if (dmFields & DM_COPIES) {
++ setBooleanField(env, self, DRIVER_COPIES_STR, JNI_TRUE);
++ }
+ }
+
+ CATCH_BAD_ALLOC;
+--- ./jdk/test/ProblemList.txt Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/ProblemList.txt Wed May 07 19:26:47 2014 -0700
+@@ -369,15 +369,6 @@
+ # 7147060
+ com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java generic-all
+
+-# 8000439: NPG: REGRESSION : sun/security/krb5/auto/MaxRetries.java fails with timeout
+-sun/security/krb5/auto/MaxRetries.java solaris-sparcv9
+-
+-# 8006690: sun/security/krb5/auto/BadKdc1.java fails intermittently
+-sun/security/krb5/auto/BadKdc1.java solaris-sparcv9
+-sun/security/krb5/auto/BadKdc2.java solaris-sparcv9
+-sun/security/krb5/auto/BadKdc3.java solaris-sparcv9
+-sun/security/krb5/auto/BadKdc4.java solaris-sparcv9
+-
+ ############################################################################
+
+ # jdk_swing
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,108 @@
++/*
++ * 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 8007267
++ * @summary [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
++ * @author leonid.romanov@oracle.com
++ * @run main DefaultMenuBarTest
++ */
++
++import java.awt.*;
++import java.awt.event.*;
++import javax.swing.*;
++import sun.awt.*;
++import java.lang.reflect.Method;
++
++
++public class DefaultMenuBarTest {
++ static KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.META_MASK);
++
++ static volatile int listenerCallCounter = 0;
++ public static void main(String[] args) throws Exception {
++ if (sun.awt.OSInfo.getOSType() != sun.awt.OSInfo.OSType.MACOSX) {
++ System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
++ return;
++ }
++
++ System.setProperty("apple.laf.useScreenMenuBar", "true");
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ Robot robot = new Robot();
++ robot.setAutoDelay(100);
++
++ robot.keyPress(KeyEvent.VK_META);
++ robot.keyPress(ks.getKeyCode());
++ robot.keyRelease(ks.getKeyCode());
++ robot.keyRelease(KeyEvent.VK_META);
++
++ toolkit.realSync();
++
++ if (listenerCallCounter != 1) {
++ throw new Exception("Test failed: ActionListener either wasn't called or was called more than once");
++ }
++ }
++
++ private static void createAndShowGUI() {
++ JMenu menu = new JMenu("File");
++ JMenuItem newItem = new JMenuItem("Open");
++
++ newItem.setAccelerator(ks);
++ newItem.addActionListener(
++ new ActionListener(){
++ public void actionPerformed(ActionEvent e) {
++ listenerCallCounter++;
++ }
++ }
++ );
++ menu.add(newItem);
++
++ JMenuBar defaultMenu = new JMenuBar();
++ defaultMenu.add(menu);
++
++ // Application.getApplication().setDefaultMenuBar(defaultMenu);
++ try {
++ Class appClass = Class.forName("com.apple.eawt.Application");
++ if (appClass != null) {
++ Method method = appClass.getMethod("getApplication");
++ if (method != null) {
++ Object app = method.invoke(null, new Object[]{});
++ if (app != null) {
++ method = appClass.getMethod("setDefaultMenuBar", new Class[]{JMenuBar.class});
++ if (method != null) {
++ method.invoke(app, new Object[]{defaultMenu});
++ }
++ }
++ }
++ }
++ } catch (Exception e) {
++ e.printStackTrace();
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/corba/transport/KeepAliveSockets.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,68 @@
++/*
++ * 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 8017195
++ * @summary Introduce option to setKeepAlive parameter on CORBA sockets
++ *
++ * @run main/othervm KeepAliveSockets
++ * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive KeepAliveSockets
++ * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive=true KeepAliveSockets
++ * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive=false KeepAliveSockets
++ */
++
++import java.lang.*;
++import java.net.InetSocketAddress;
++import java.net.Socket;
++import java.nio.channels.ServerSocketChannel;
++import java.util.*;
++import com.sun.corba.se.impl.orb.*;
++
++import com.sun.corba.se.impl.transport.*;
++
++public class KeepAliveSockets {
++
++ public static void main(String[] args) throws Exception {
++
++ boolean keepAlive = false;
++ String prop = System.getProperty("com.sun.CORBA.transport.enableTcpKeepAlive");
++ if (prop != null)
++ keepAlive = !"false".equalsIgnoreCase(prop);
++
++ DefaultSocketFactoryImpl sfImpl = new DefaultSocketFactoryImpl();
++ ORBImpl orb = new ORBImpl();
++ orb.set_parameters(null);
++ sfImpl.setORB(orb);
++
++ ServerSocketChannel ssc = ServerSocketChannel.open();
++ ssc.socket().bind(new InetSocketAddress(0));
++
++ InetSocketAddress isa = new InetSocketAddress("localhost", ssc.socket().getLocalPort());
++ Socket s = sfImpl.createSocket("ignore", isa);
++ System.out.println("Received factory socket" + s);
++ if (keepAlive != s.getKeepAlive())
++ throw new RuntimeException("KeepAlive value not honoured in CORBA socket");
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,276 @@
++/*
++ * 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 8034181
++ * @summary SIGBUS in SctpChannelImpl receive
++ * @author chegar
++ */
++
++import java.net.InetSocketAddress;
++import java.net.SocketAddress;
++import java.io.IOException;
++import java.nio.ByteBuffer;
++import com.sun.nio.sctp.AbstractNotificationHandler;
++import com.sun.nio.sctp.AssociationChangeNotification;
++import com.sun.nio.sctp.AssociationChangeNotification.AssocChangeEvent;
++import com.sun.nio.sctp.HandlerResult;
++import com.sun.nio.sctp.MessageInfo;
++import com.sun.nio.sctp.Notification;
++import com.sun.nio.sctp.PeerAddressChangeNotification;
++import com.sun.nio.sctp.SctpChannel;
++import com.sun.nio.sctp.SctpServerChannel;
++import com.sun.nio.sctp.ShutdownNotification;
++import static java.lang.System.out;
++import static java.lang.System.err;
++import static java.nio.charset.StandardCharsets.US_ASCII;
++
++public class ReceiveIntoDirect {
++ /* suitably small message to NOT overrun small buffers */
++ final byte[] msgBytes = "Hello".getBytes(US_ASCII);
++
++ /* number of client connections/combinations (accepted by the server) */
++ final int NUM_CONNECTIONS = 75;
++
++ void test(String[] args) throws IOException {
++ SocketAddress address = null;
++ Server server;
++
++ if (!Util.isSCTPSupported()) {
++ out.println("SCTP protocol is not supported");
++ out.println("Test cannot be run");
++ return;
++ }
++
++ if (args.length == 2) {
++ /* requested to connecct to a specific address */
++ try {
++ int port = Integer.valueOf(args[1]);
++ address = new InetSocketAddress(args[0], port);
++ } catch (NumberFormatException nfe) {
++ err.println(nfe);
++ }
++ } else {
++ /* start server on local machine, default */
++ server = new Server();
++ server.start();
++ address = server.address();
++ debug("Server started and listening on " + address);
++ }
++
++ /* many combinations with varing buffer sizes, and offsets */
++ runWithManyOffsets(address, 20);
++ runWithManyOffsets(address, 49);
++ runWithManyOffsets(address, 50);
++ runWithManyOffsets(address, 51);
++ runWithManyOffsets(address, 1024);
++ }
++
++ void runWithManyOffsets(SocketAddress addr, int bufferSize)
++ throws IOException
++ {
++ doTest(addr, bufferSize, 1);
++ doTest(addr, bufferSize, 2);
++ doTest(addr, bufferSize, 3);
++ doTest(addr, bufferSize, 4);
++ doTest(addr, bufferSize, 5);
++ doTest(addr, bufferSize, 6);
++ doTest(addr, bufferSize, 7);
++ doTest(addr, bufferSize, 8);
++ doTest(addr, bufferSize, 9);
++ doTest(addr, bufferSize, 10);
++ doTest(addr, bufferSize, 11);
++ doTest(addr, bufferSize, 12);
++ doTest(addr, bufferSize, 13);
++ doTest(addr, bufferSize, 14);
++ doTest(addr, bufferSize, 15);
++ }
++
++ void doTest(SocketAddress peerAddress, int bufferSize, int bufferOffset)
++ throws IOException
++ {
++ debug("\n\nTesting with bufferSize " + bufferSize + " and offset " + bufferOffset);
++ assert bufferOffset + msgBytes.length <= bufferSize :
++ "buffer offset + message length greater than buffer size ";
++
++ ByteBuffer buffer = ByteBuffer.allocateDirect(bufferSize);
++ MessageInfo info;
++
++ try (SctpChannel channel = SctpChannel.open()) {
++ channel.connect(peerAddress);
++
++ ReceiveNotificationHandler handler =
++ new ReceiveNotificationHandler();
++
++ /* TEST 1: Assoc/peer change notif into direct buffer with offest */
++ do {
++ debug("Test 1: Assoc/peer change with offset " + bufferOffset);
++ buffer.position(bufferOffset);
++ info = channel.receive(buffer, null, handler);
++ if (info == null) {
++ fail("unexpected null from receive");
++ return;
++ }
++ } while (!info.isComplete());
++
++ buffer.flip().position(bufferOffset);
++ check(handler.receivedCommUp(), "SCTP_COMM_UP not received");
++ check(info != null, "info is null");
++ check(info.address() != null, "address is null");
++ check(info.association() != null, "association is null");
++ check(info.isComplete(), "message is not complete");
++ check(info.isUnordered() != true,
++ "message should not be unordered");
++ check(info.streamNumber() >= 0, "invalid stream number");
++ check(info.bytes() == msgBytes.length,
++ "bytes received not equal to message length");
++ check(info.bytes() == buffer.remaining(), "bytes != remaining");
++ check(Util.compare(buffer, msgBytes),
++ "received message not the same as sent message");
++
++ /* TEST 2: shutdown notification with offset */
++ debug("Test 2: shutdown notif with offset " + bufferOffset);
++ buffer.clear().position(bufferOffset);
++ while ((info = channel.receive(buffer, null, handler )) != null &&
++ info.bytes() != -1 );
++ }
++ }
++
++ class Server implements Runnable
++ {
++ private final InetSocketAddress serverAddr;
++ private final SctpServerChannel ssc;
++
++ public Server() throws IOException {
++ ssc = SctpServerChannel.open().bind(null);
++ java.util.Set<SocketAddress> addrs = ssc.getAllLocalAddresses();
++ if (addrs.isEmpty())
++ debug("addrs should not be empty");
++
++ serverAddr = (InetSocketAddress) addrs.iterator().next();
++ }
++
++ public void start() {
++ (new Thread(this, "Server-" + serverAddr.getPort())).start();
++ }
++
++ public InetSocketAddress address() {
++ return serverAddr;
++ }
++
++ @Override
++ public void run() {
++ try {
++ for (int i=0; i<NUM_CONNECTIONS; i++) {
++ SctpChannel sc = ssc.accept();
++
++ /* send a small message */
++ MessageInfo info = MessageInfo.createOutgoing(null, 0);
++ ByteBuffer buf = ByteBuffer.allocateDirect(Util.SMALL_BUFFER);
++ buf.put(msgBytes);
++ buf.flip();
++
++ debug("sending small message: " + buf);
++ sc.send(buf, info);
++
++ sc.shutdown();
++ sc.close();
++ }
++ } catch (IOException x) {
++ unexpected(x);
++ } finally {
++ try { ssc.close(); }
++ catch (IOException x) { unexpected(x); }
++ }
++ }
++ }
++
++ class ReceiveNotificationHandler extends AbstractNotificationHandler<Object>
++ {
++ boolean receivedCommUp; // false
++
++ public ReceiveNotificationHandler() { }
++
++ public boolean receivedCommUp() {
++ return receivedCommUp;
++ }
++
++ @Override
++ public HandlerResult handleNotification(
++ Notification notification, Object attachment) {
++ fail("Unknown notification type");
++ return HandlerResult.CONTINUE;
++ }
++
++ @Override
++ public HandlerResult handleNotification(
++ AssociationChangeNotification notification, Object attachment) {
++ AssocChangeEvent event = notification.event();
++ debug("AssociationChangeNotification");
++ debug(" Association: " + notification.association());
++ debug(" Event: " + event);
++
++ if (event.equals(AssocChangeEvent.COMM_UP))
++ receivedCommUp = true;
++
++ return HandlerResult.CONTINUE;
++ }
++
++ @Override
++ public HandlerResult handleNotification(
++ PeerAddressChangeNotification pacn, Object unused)
++ {
++ debug("PeerAddressChangeNotification: " + pacn);
++ return HandlerResult.CONTINUE;
++ }
++
++ @Override
++ public HandlerResult handleNotification(
++ ShutdownNotification notification, Object attachment) {
++ debug("ShutdownNotification");
++ debug(" Association: " + notification.association());
++ return HandlerResult.CONTINUE;
++ }
++ }
++ //--------------------- Infrastructure ---------------------------
++ boolean debug = true;
++ volatile int passed = 0, failed = 0;
++ void pass() {passed++;}
++ void fail() {failed++; Thread.dumpStack();}
++ void fail(String msg) {System.err.println(msg); fail();}
++ void unexpected(Throwable t) {failed++; t.printStackTrace();}
++ void check(boolean cond) {if (cond) pass(); else fail();}
++ void check(boolean cond, String failMessage) {if (cond) pass(); else fail(failMessage);}
++ void debug(String message) {if(debug) {
++ System.out.println(Thread.currentThread() + " " + message); } }
++ public static void main(String[] args) throws Throwable {
++ Class<?> k = new Object(){}.getClass().getEnclosingClass();
++ try {k.getMethod("instanceMain",String[].class)
++ .invoke( k.newInstance(), (Object) args);}
++ catch (Throwable e) {throw e.getCause();}}
++ public void instanceMain(String[] args) throws Throwable {
++ try {test(args);} catch (Throwable t) {unexpected(t);}
++ System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
++ if (failed > 0) throw new AssertionError("Some tests failed");}
++
++}
+--- ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -24,5 +24,6 @@
+ interface InterprocessMessages {
+ final static int EXECUTION_IS_SUCCESSFULL = 0;
+ final static int DATA_IS_CORRUPTED = 212;
++ final static int NO_DROP_HAPPENED = 112;
+ }
+
+--- ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html Wed May 07 19:26:47 2014 -0700
+@@ -1,7 +1,30 @@
+ <html>
+ <!--
++ Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
++ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++
++ This code is free software; you can redistribute it and/or modify it
++ under the terms of the GNU General Public License version 2 only, as
++ published by the Free Software Foundation.
++
++ 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 8005932
++ @bug 8005932 8017456
+ @summary Java 7 on mac os x only provides text clipboard formats
+ @author mikhail.cherkasov@oracle.com
+ @library ../../regtesthelpers
+--- ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -42,6 +42,7 @@
+ import static java.lang.Thread.sleep;
+
+ public class MissedHtmlAndRtfBug extends Applet {
++
+ public void init() {
+ setLayout(new BorderLayout());
+ }//End init()
+@@ -77,9 +78,6 @@
+ args.add(concatStrings(DataFlavorSearcher.RICH_TEXT_NAMES));
+
+ ProcessResults processResults =
+-// ProcessCommunicator.executeChildProcess(this.getClass(), "/Users/mcherkasov/ws/clipboard/DataFlover/out/production/DataFlover" +
+-// " -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 ",
+-// args.toArray(new String[0]));
+ ProcessCommunicator.executeChildProcess(this.getClass(),
+ "." + File.separator + System.getProperty("java.class.path"), args.toArray(new String[]{}));
+
+@@ -112,6 +110,13 @@
+ throw new RuntimeException("TEST IS FAILED: Target has received" +
+ " corrupted data.");
+ }
++ if (InterprocessMessages.NO_DROP_HAPPENED ==
++ processResults.getExitValue()) {
++ processResults.printProcessErrorOutput(System.err);
++ throw new RuntimeException("Error. Drop did not happen." +
++ " Target frame is possibly covered by a window of other application." +
++ " Please, rerun the test with all windows minimized.");
++ }
+ processResults.verifyStdErr(System.err);
+ processResults.verifyProcessExitValue(System.err);
+ processResults.printProcessStandartOutput(System.out);
+@@ -179,7 +184,7 @@
+ }
+ }
+
+- public static void main(String[] args) {
++ public static void main(String[] args) throws InterruptedException {
+ Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extractInt(args),
+ InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extractInt(args));
+ Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extractInt(args),
+@@ -192,6 +197,8 @@
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
++ sleep(5000);
++ System.exit(InterprocessMessages.NO_DROP_HAPPENED);
+ }
+
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,144 @@
++/*
++ * 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 4476629
++ @library ../../../../javax/swing/regtesthelpers
++ @build Util
++ @summary KeyEvents dispatched to old focus owner that is no longer showing
++ @author son@sparc.spb.su: area=awt.focus
++ @run main KeyEventForBadFocusOwnerTest
++*/
++
++/**
++ * KeyEventForBadFocusOwnerTest.java
++ *
++ * summary: KeyEvents dispatched to old focus owner that is no longer showing
++ */
++
++
++import java.awt.Robot;
++import java.awt.Toolkit;
++
++import java.awt.event.*;
++
++import javax.swing.*;
++import javax.swing.event.*;
++import sun.awt.SunToolkit;
++
++public class KeyEventForBadFocusOwnerTest {
++ final static String ITEM_ONE_TEXT = "one";
++ final static String ITEM_TWO_TEXT = "two";
++
++ volatile static boolean itemOneSelected = false;
++ volatile static boolean itemTwoSelected = false;
++ volatile static boolean unexpectedItemSelected = false;
++
++ static Robot robot;
++ static SunToolkit toolkit;
++
++ public static void main(String[] args) throws Exception {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ JFrame frame = new JFrame("TEST");
++ JMenuBar mb = new JMenuBar();
++ JMenu one = new JMenu(ITEM_ONE_TEXT);
++ JMenu two = new JMenu(ITEM_TWO_TEXT);
++
++ mb.add(one);
++ mb.add(two);
++
++ ActionListener al = new ActionListener() {
++ public void actionPerformed(ActionEvent ae) {
++ String itemText = ((JMenuItem)ae.getSource()).getText();
++ System.out.println("--> " + itemText);
++ unexpectedItemSelected = true;
++ }
++ };
++ one.setMnemonic(KeyEvent.VK_O);
++ JMenuItem item = new JMenuItem("one 1");
++ item.setMnemonic(KeyEvent.VK_O);
++ item.addActionListener(al);
++ one.add(item);
++ one.add("two");
++ one.add("three");
++
++ two.setMnemonic(KeyEvent.VK_T);
++ item = new JMenuItem("two 2");
++ item.setMnemonic(KeyEvent.VK_T);
++ item.addActionListener(al);
++ two.add(item);
++ two.add("three");
++ two.add("four");
++
++ PopupMenuListener popupMenuListener = new PopupMenuListener() {
++ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
++ System.out.print(e);
++ System.out.print(e.getSource());
++ String itemText = ((JPopupMenu)e.getSource()).getName();
++ System.out.println("Menu " + itemText + "is opened.");
++ switch(itemText) {
++ case ITEM_ONE_TEXT:
++ itemOneSelected = true;
++ break;
++ case ITEM_TWO_TEXT:
++ itemTwoSelected = true;
++ break;
++ }
++ }
++
++ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
++ public void popupMenuCanceled(PopupMenuEvent e) {}
++ };
++ one.getPopupMenu().setName(ITEM_ONE_TEXT);
++ two.getPopupMenu().setName(ITEM_TWO_TEXT);
++ one.getPopupMenu().addPopupMenuListener(popupMenuListener);
++ two.getPopupMenu().addPopupMenuListener(popupMenuListener);
++ frame.setJMenuBar(mb);
++ frame.setSize(100,100);
++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++ frame.pack();
++ frame.setVisible(true);
++ }
++ });
++
++ toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ toolkit.realSync();
++
++ robot = new Robot();
++ robot.setAutoDelay(100);
++
++ Util.hitMnemonics(robot, KeyEvent.VK_O);
++ Util.hitMnemonics(robot, KeyEvent.VK_T);
++
++ toolkit.realSync();
++ Thread.sleep(1000); // workaround for MacOS
++
++ if (unexpectedItemSelected) {
++ throw new Exception("Test failed. KeyEvent dispatched to old focus owner. ");
++ }
++ if (!itemOneSelected || !itemTwoSelected) {
++ throw new Exception("Not all expected events were received");
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Frame/DefaultUnixIcon/TestUnixDefaultIcon.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,448 @@
++/*
++ * 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 4934843
++@summary Tests that Frame/Dialog have java-cup icon on Unix
++@author dom@sparc.spb.su: area=awt.toplevel
++@run main/manual TestUnixDefaultIcon
++*/
++
++import java.awt.*;
++import java.awt.event.*;
++import java.awt.image.*;
++import javax.imageio.ImageIO;
++import java.lang.reflect.*;
++import java.io.*;
++import java.awt.color.*;
++
++public class TestUnixDefaultIcon
++{
++ private static void init()
++ {
++ //*** Create instructions for the user here ***
++ boolean isWindows = Toolkit.getDefaultToolkit().getClass().getName().equals("sun.awt.windows.WToolkit");
++
++ String[] instructions;
++ if (isWindows){
++ instructions = new String[]{"This test is for linux only. Passed automatically."};
++ } else {
++ instructions = new String[]{
++ "This test verifies that Frame and Dialog on Unix have Java-cup",
++ "icon by default as their icon. For your convenience, the example ",
++ "of such icons of different sizes are displayed inside of the frame",
++ "Press Pass if it is so, Fail otherwise."
++ };
++ }
++ Sysout.createDialog( );
++ Sysout.printInstructions( instructions );
++
++ if (isWindows){
++ pass();
++ return;
++ }
++
++ Frame frame = new Frame("frame");
++ frame.setLayout(new FlowLayout());
++ frame.add(new IconCanvas(16, getImage("16")));
++ frame.add(new IconCanvas(24, getImage("24")));
++ frame.add(new IconCanvas(32, getImage("32")));
++ frame.add(new IconCanvas(48, getImage("48")));
++ frame.setBounds(0, 500, 200, 100);
++ frame.setVisible(true);
++
++ Dialog d = new Dialog(frame, "Dialog", false);
++ d.setBounds(200, 500, 200, 100);
++ d.setVisible(true);
++
++ }//End init()
++
++ private static BufferedImage createImage(int[] bits) {
++ ColorModel cm =
++ new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), 32,
++ 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000,
++ false, DataBuffer.TYPE_INT);
++ DataBuffer buffer = new DataBufferInt(bits, bits.length-2, 2);
++ WritableRaster raster =
++ Raster.createPackedRaster(buffer, bits[0], bits[1],
++ bits[0],
++ new int[] {0x00ff0000, 0x0000ff00,
++ 0x000000ff, 0xff000000},
++ null);
++ BufferedImage im = new BufferedImage(cm, raster, false, null);
++ return im;
++ }
++ private static Image getImage(String name) {
++ try {
++ Class cl = Class.forName("sun.awt.AWTIcon32_java_icon" + name + "_png");
++ Field f = cl.getField("java_icon" + name + "_png");
++ int[] ints = (int[])f.get(cl);
++
++ return createImage(ints);
++ } catch (ClassNotFoundException | IllegalAccessException | NoSuchFieldException e) {
++ throw new RuntimeException(e);
++ }
++ }
++
++ static class IconCanvas extends Canvas {
++ private Image im;
++ private int s;
++ public IconCanvas(int s, Image im) {
++ this.im = im;
++ this.s = s;
++ }
++
++ public Dimension getPreferredSize() {
++ return new Dimension(s, s);
++ }
++
++ public void paint(Graphics g) {
++ if (im != null) {
++ g.drawImage(im, 0, 0, this);
++ }
++ }
++ }
++
++ /*****************************************************
++ * Standard Test Machinery Section
++ * DO NOT modify anything in this section -- it's a
++ * standard chunk of code which has all of the
++ * synchronisation necessary for the test harness.
++ * By keeping it the same in all tests, it is easier
++ * to read and understand someone else's test, as
++ * well as insuring that all tests behave correctly
++ * with the test harness.
++ * There is a section following this for test-defined
++ * classes
++ ******************************************************/
++ private static boolean theTestPassed = false;
++ private static boolean testGeneratedInterrupt = false;
++ private static String failureMessage = "";
++
++ private static Thread mainThread = null;
++
++ private static int sleepTime = 300000;
++
++ public static void main( String args[] ) throws InterruptedException
++ {
++ mainThread = Thread.currentThread();
++ try
++ {
++ init();
++ }
++ catch( TestPassedException e )
++ {
++ //The test passed, so just return from main and harness will
++ // interepret this return as a pass
++ return;
++ }
++ //At this point, neither test passed nor test failed has been
++ // called -- either would have thrown an exception and ended the
++ // test, so we know we have multiple threads.
++
++ //Test involves other threads, so sleep and wait for them to
++ // called pass() or fail()
++ try
++ {
++ Thread.sleep( sleepTime );
++ //Timed out, so fail the test
++ throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
++ }
++ catch (InterruptedException e)
++ {
++ if( ! testGeneratedInterrupt ) throw e;
++
++ //reset flag in case hit this code more than once for some reason (just safety)
++ testGeneratedInterrupt = false;
++ if ( theTestPassed == false )
++ {
++ throw new RuntimeException( failureMessage );
++ }
++ }
++
++ }//main
++
++ public static synchronized void setTimeoutTo( int seconds )
++ {
++ sleepTime = seconds * 1000;
++ }
++
++ public static synchronized void pass()
++ {
++ Sysout.println( "The test passed." );
++ Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
++ //first check if this is executing in main thread
++ if ( mainThread == Thread.currentThread() )
++ {
++ //Still in the main thread, so set the flag just for kicks,
++ // and throw a test passed exception which will be caught
++ // and end the test.
++ theTestPassed = true;
++ throw new TestPassedException();
++ }
++ //pass was called from a different thread, so set the flag and interrupt
++ // the main thead.
++ theTestPassed = true;
++ testGeneratedInterrupt = true;
++ mainThread.interrupt();
++ }//pass()
++
++ public static synchronized void fail()
++ {
++ //test writer didn't specify why test failed, so give generic
++ fail( "it just plain failed! :-)" );
++ }
++
++ public static synchronized void fail( String whyFailed )
++ {
++ Sysout.println( "The test failed: " + whyFailed );
++ Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
++ //check if this called from main thread
++ if ( mainThread == Thread.currentThread() )
++ {
++ //If main thread, fail now 'cause not sleeping
++ throw new RuntimeException( whyFailed );
++ }
++ theTestPassed = false;
++ testGeneratedInterrupt = true;
++ failureMessage = whyFailed;
++ mainThread.interrupt();
++ }//fail()
++
++}// class TestUnixDefaultIcon
++
++//This exception is used to exit from any level of call nesting
++// when it's determined that the test has passed, and immediately
++// end the test.
++class TestPassedException extends RuntimeException
++{
++}
++
++//*********** End Standard Test Machinery Section **********
++
++
++//************ Begin classes defined for the test ****************
++
++// make listeners in a class defined here, and instantiate them in init()
++
++/* Example of a class which may be written as part of a test
++class NewClass implements anInterface
++ {
++ static int newVar = 0;
++
++ public void eventDispatched(AWTEvent e)
++ {
++ //Counting events to see if we get enough
++ eventCount++;
++
++ if( eventCount == 20 )
++ {
++ //got enough events, so pass
++
++ TestUnixDefaultIcon.pass();
++ }
++ else if( tries == 20 )
++ {
++ //tried too many times without getting enough events so fail
++
++ TestUnixDefaultIcon.fail();
++ }
++
++ }// eventDispatched()
++
++ }// NewClass class
++
++*/
++
++
++//************** End classes defined for the test *******************
++
++
++
++
++/****************************************************
++ Standard Test Machinery
++ DO NOT modify anything below -- it's a standard
++ chunk of code whose purpose is to make user
++ interaction uniform, and thereby make it simpler
++ to read and understand someone else's test.
++ ****************************************************/
++
++/**
++ This is part of the standard test machinery.
++ It creates a dialog (with the instructions), and is the interface
++ for sending text messages to the user.
++ To print the instructions, send an array of strings to Sysout.createDialog
++ WithInstructions method. Put one line of instructions per array entry.
++ To display a message for the tester to see, simply call Sysout.println
++ with the string to be displayed.
++ This mimics System.out.println but works within the test harness as well
++ as standalone.
++ */
++
++class Sysout
++{
++ private static TestDialog dialog;
++
++ public static void createDialogWithInstructions( String[] instructions )
++ {
++ dialog = new TestDialog( new Frame(), "Instructions" );
++ dialog.printInstructions( instructions );
++ dialog.setVisible(true);
++ println( "Any messages for the tester will display here." );
++ }
++
++ public static void createDialog( )
++ {
++ dialog = new TestDialog( new Frame(), "Instructions" );
++ String[] defInstr = { "Instructions will appear here. ", "" } ;
++ dialog.printInstructions( defInstr );
++ dialog.setVisible(true);
++ println( "Any messages for the tester will display here." );
++ }
++
++
++ public static void printInstructions( String[] instructions )
++ {
++ dialog.printInstructions( instructions );
++ }
++
++
++ public static void println( String messageIn )
++ {
++ dialog.displayMessage( messageIn );
++ }
++
++}// Sysout class
++
++/**
++ This is part of the standard test machinery. It provides a place for the
++ test instructions to be displayed, and a place for interactive messages
++ to the user to be displayed.
++ To have the test instructions displayed, see Sysout.
++ To have a message to the user be displayed, see Sysout.
++ Do not call anything in this dialog directly.
++ */
++class TestDialog extends Dialog implements ActionListener
++{
++
++ TextArea instructionsText;
++ TextArea messageText;
++ int maxStringLength = 80;
++ Panel buttonP = new Panel();
++ Button passB = new Button( "pass" );
++ Button failB = new Button( "fail" );
++
++ //DO NOT call this directly, go through Sysout
++ public TestDialog( Frame frame, String name )
++ {
++ super( frame, name );
++ int scrollBoth = TextArea.SCROLLBARS_BOTH;
++ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
++ add( "North", instructionsText );
++
++ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
++ add("Center", messageText);
++
++ passB = new Button( "pass" );
++ passB.setActionCommand( "pass" );
++ passB.addActionListener( this );
++ buttonP.add( "East", passB );
++
++ failB = new Button( "fail" );
++ failB.setActionCommand( "fail" );
++ failB.addActionListener( this );
++ buttonP.add( "West", failB );
++
++ add( "South", buttonP );
++ pack();
++
++ setVisible(true);
++ }// TestDialog()
++
++ //DO NOT call this directly, go through Sysout
++ public void printInstructions( String[] instructions )
++ {
++ //Clear out any current instructions
++ instructionsText.setText( "" );
++
++ //Go down array of instruction strings
++
++ String printStr, remainingStr;
++ for( int i=0; i < instructions.length; i++ )
++ {
++ //chop up each into pieces maxSringLength long
++ remainingStr = instructions[ i ];
++ while( remainingStr.length() > 0 )
++ {
++ //if longer than max then chop off first max chars to print
++ if( remainingStr.length() >= maxStringLength )
++ {
++ //Try to chop on a word boundary
++ int posOfSpace = remainingStr.
++ lastIndexOf( ' ', maxStringLength - 1 );
++
++ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
++
++ printStr = remainingStr.substring( 0, posOfSpace + 1 );
++ remainingStr = remainingStr.substring( posOfSpace + 1 );
++ }
++ //else just print
++ else
++ {
++ printStr = remainingStr;
++ remainingStr = "";
++ }
++
++ instructionsText.append( printStr + "\n" );
++
++ }// while
++
++ }// for
++
++ }//printInstructions()
++
++ //DO NOT call this directly, go through Sysout
++ public void displayMessage( String messageIn )
++ {
++ messageText.append( messageIn + "\n" );
++ System.out.println(messageIn);
++ }
++
++ //catch presses of the passed and failed buttons.
++ //simply call the standard pass() or fail() static methods of
++ //TestUnixDefaultIcon
++ public void actionPerformed( ActionEvent e )
++ {
++ if( e.getActionCommand() == "pass" )
++ {
++ TestUnixDefaultIcon.pass();
++ }
++ else
++ {
++ TestUnixDefaultIcon.fail();
++ }
++ }
++
++}// TestDialog class
+--- ./jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java Wed May 07 19:26:47 2014 -0700
+@@ -42,6 +42,7 @@
+ GraphicsDevice gd = ge.getDefaultScreenDevice();
+
+ Frame f = new Frame("Test frame");
++ f.setUndecorated(true);
+ f.setBounds(100, 100, 320, 240);
+
+ // First, check it can be made fullscreen window without any effects applied
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/JAWT/JAWT.sh Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,173 @@
++#!/bin/sh
++
++# 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.
++
++# @test JAWT.sh
++# @bug 7190587
++# @summary Tests Java AWT native interface library
++# @author kshefov
++# @run shell JAWT.sh
++
++# NB: To run on Windows with MKS and Visual Studio compiler
++# add the following options to jtreg: -e INCLUDE="%INCLUDE%;." -e LIB="%LIB%;."
++
++if [ "${TESTSRC}" = "" ]
++then TESTSRC=.
++fi
++
++if [ "${TESTJAVA}" = "" ]
++then
++ PARENT=`dirname \`which java\``
++ TESTJAVA=`dirname ${PARENT}`
++ echo "TESTJAVA not set, selecting " ${TESTJAVA}
++ echo "If this is incorrect, try setting the variable manually."
++fi
++
++# set platform-dependent variables
++OS=`uname -s`
++case "$OS" in
++ Linux )
++ NULL=/dev/null
++ PS=":"
++ FS="/"
++ ${TESTJAVA}${FS}bin${FS}java -version 2>&1 | grep '64-Bit' > $NULL
++ if [ $? -eq '0' ]
++ then
++ ARCH="amd64"
++ else
++ ARCH="i386"
++ fi
++ SYST="linux"
++ MAKEFILE="Makefile.unix"
++ CC="gcc"
++ MAKE="make"
++ LD_LIBRARY_PATH=".":${TESTJAVA}${FS}jre${FS}lib${FS}${ARCH}
++ ;;
++ SunOS )
++ NULL=/dev/null
++ PS=":"
++ FS="/"
++ if [ `uname -p | grep -c 'sparc'` -gt '0' ]
++ then
++ ARCH="sparc"
++ else
++ ARCH="i386"
++ fi
++ SYST="solaris"
++ MAKEFILE="Makefile.unix"
++ CC="gcc"
++ MAKE="make"
++ LD_LIBRARY_PATH=".":${TESTJAVA}${FS}jre${FS}lib${FS}${ARCH}
++ ;;
++ Windows* )
++ NULL=null
++ PS=";"
++ FS="\\"
++ MAKEFILE="Makefile.win"
++ CC="cl"
++ MAKE="nmake"
++ ${TESTJAVA}${FS}bin${FS}java -d64 -version 2>&1 | grep '64-Bit' > $NULL
++ if [ "$?" -eq '0' ]
++ then
++ ARCH="amd64"
++ else
++ ARCH="i386"
++ fi
++ SYST="windows"
++ ;;
++ CYGWIN* )
++ NULL=/dev/null
++ PS=":"
++ FS="/"
++ MAKEFILE="Makefile.cygwin"
++ CC="gcc"
++ ${TESTJAVA}${FS}bin${FS}java -d64 -version 2>&1 | grep '64-Bit' > $NULL
++ if [ "$?" -eq '0' ]
++ then
++ ARCH="amd64"
++ else
++ ARCH="i386"
++ fi
++ SYST="cygwin"
++ MAKE="make"
++ ;;
++ Darwin )
++ echo "Test passed. This test is not for MacOS."
++ exit 0;
++ ;;
++ * )
++ echo "Unrecognized system!"
++ exit 1;
++ ;;
++esac
++
++# Skip unsupported platforms
++case `uname -m` in
++ arm* | ppc* )
++ echo "Test passed. Not supported on current architecture."
++ exit 0
++ ;;
++esac
++
++echo "OS-ARCH is" ${SYST}-${ARCH}
++${TESTJAVA}${FS}jre${FS}bin${FS}java -fullversion 2>&1
++
++which ${MAKE} >${NULL} 2>&1
++if [ "$?" -ne '0' ]
++then
++ echo "No make found. Test passed."
++ exit 0
++fi
++
++which ${CC} >${NULL} 2>&1
++if [ "$?" -ne '0' ]
++then
++ echo "No C compiler found. Test passed."
++ exit 0
++fi
++case "$OS" in
++ SunOS )
++ ${CC} -v >${NULL} 2>&1
++ if [ "$?" -ne '0' ]
++ then
++ echo "No C compiler found. Test passed."
++ exit 0
++ fi
++esac
++
++cp ${TESTSRC}${FS}${MAKEFILE} .
++
++JAVA=${TESTJAVA}${FS}jre${FS}bin${FS}java
++JAVAC=${TESTJAVA}${FS}bin${FS}javac
++JAVAH=${TESTJAVA}${FS}bin${FS}javah
++
++export CC SYST ARCH LD_LIBRARY_PATH
++
++${JAVAC} -d . ${TESTSRC}${FS}MyCanvas.java
++${JAVAH} -jni -classpath . -d . MyCanvas
++${MAKE} -f ${MAKEFILE}
++${JAVA} -classpath . MyCanvas
++
++exit $?
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/JAWT/Makefile.cygwin Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,49 @@
++# 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.
++
++CFLAGS =
++OBJS = myfile.o
++HEADERS = MyCanvas.h
++CLASSES = MyCanvas.class
++
++JAVA = $(TESTJAVA)/bin/java -classpath .
++JAVAC = $(TESTJAVA)/bin/javac
++JAVAH = $(TESTJAVA)/bin/javah
++DEL = rm -rf
++LINK = $(CC)
++
++INCLUDES = -I $(TESTJAVA)/include/win32 -I $(TESTJAVA)/include -I .
++
++LIBS = $(TESTJAVA)/lib/jawt.lib -lgdi32
++
++all: $(CLASSES) mylib.dll
++
++mylib.dll: $(HEADERS) $(OBJS)
++ $(LINK) -shared -o mylib.dll $(OBJS) $(LIBS)
++
++myfile.o:
++ $(CC) $(CFLAGS) $(INCLUDES) -c $(TESTSRC)/myfile.cpp
++
++clean:
++ $(DEL) mylib.* *.h *.class *.o
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/JAWT/Makefile.unix Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,48 @@
++# 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.
++
++CFLAGS = -fPIC -O
++OBJS = myfile.o
++HEADERS = MyCanvas.h
++CLASSES = MyCanvas.class
++
++ENV = /usr/bin/env
++JAVA = $(TESTJAVA)/bin/java -classpath .
++JAVAC = $(TESTJAVA)/bin/javac
++JAVAH = $(TESTJAVA)/bin/javah
++LINK = ld
++
++J_INC = $(TESTJAVA)/include
++INCLUDES = -I$(J_INC) -I$(J_INC)/$(SYST) -I.
++LIBS = -L$(TESTJAVA)/jre/lib/$(ARCH) -ljawt -lX11
++
++all: $(CLASSES) libmylib.so
++
++libmylib.so: $(HEADERS) $(OBJS)
++ $(LINK) -G -o libmylib.so $(OBJS) $(LIBS)
++
++myfile.o: $(TESTSRC)/myfile.c
++ $(CC) $(CFLAGS) $(INCLUDES) -c $(TESTSRC)/myfile.c
++
++clean:
++ rm -rf libmylib.so $(HEADERS) $(CLASSES) $(OBJS)
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/JAWT/Makefile.win Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,47 @@
++# 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.
++
++CFLAGS = -nologo
++OBJS = myfile.obj
++HEADERS = MyCanvas.h
++CLASSES = MyCanvas.class
++
++DEL = del /Q
++LINK = link
++
++INCLUDES = -I$(TESTJAVA)\include\win32 -I$(TESTJAVA)\include
++
++LIBS = gdi32.lib user32.lib $(TESTJAVA)\lib\jawt.lib
++
++all: $(CLASSES) mylib.dll
++
++mylib.dll: $(HEADERS) $(OBJS)
++ $(LINK) -nologo -dll -out:mylib.dll $(OBJS) $(LIBS)
++
++myfile.obj: $(TESTSRC)\myfile.cpp
++ $(CC) $(CFLAGS) $(INCLUDES) -c $(TESTSRC)\myfile.cpp
++
++clean:
++ $(DEL) mylib.*
++ $(DEL) $(HEADERS) $(CLASSES)
++ $(DEL) *.obj
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/JAWT/MyCanvas.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,72 @@
++/**
++ * 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.
++ */
++
++import java.awt.*;
++import java.awt.event.*;
++
++public class MyCanvas extends Canvas {
++
++ static {
++ try {
++ System.loadLibrary("mylib");
++ } catch (Throwable t) {
++ System.out.println("Test failed!!");
++ t.printStackTrace();
++ System.exit(1);
++ }
++ }
++
++ public native void paint(Graphics g);
++
++ public static void main(String[] args) {
++ try {
++ Robot robot = new Robot();
++ Frame f = new Frame();
++ f.setBounds(0, 0, 100, 100);
++ f.add(new MyCanvas());
++ f.addWindowListener(new WindowAdapter() {
++ public void windowClosing(WindowEvent ev) {
++ System.exit(0);
++ }
++ });
++ f.setVisible(true);
++ robot.delay(5000);
++ Color col1 = new Color(0, 0, 0);
++ Color col2 = robot.getPixelColor(f.getX()+50, f.getY()+50);
++ if (col1.equals(col2)) {
++ System.out.println("Test passed!");
++ } else {
++ throw new RuntimeException("Color of JAWT canvas is wrong or " +
++ "it was not rendered. " + "Check that other windows " +
++ "do not block the test frame.");
++ }
++ System.exit(0);
++ } catch (Throwable t) {
++ System.out.println("Test failed!");
++ t.printStackTrace();
++ System.exit(1);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/JAWT/myfile.c Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,106 @@
++/*
++ * 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 "MyCanvas.h"
++#include "jawt_md.h"
++
++/*
++ * Class: MyCanvas
++ * Method: paint
++ * Signature: (Ljava/awt/Graphics;)V
++ */
++JNIEXPORT void JNICALL Java_MyCanvas_paint
++(JNIEnv* env, jobject canvas, jobject graphics)
++{
++ JAWT awt;
++ JAWT_DrawingSurface* ds;
++ JAWT_DrawingSurfaceInfo* dsi;
++ JAWT_X11DrawingSurfaceInfo* dsi_x11;
++ jboolean result;
++ jint lock;
++ GC gc;
++ jobject ref;
++
++ /* Get the AWT */
++ awt.version = JAWT_VERSION_1_4;
++ if (JAWT_GetAWT(env, &awt) == JNI_FALSE) {
++ printf("AWT Not found\n");
++ return;
++ }
++
++ /* Lock the AWT */
++ awt.Lock(env);
++
++ /* Unlock the AWT */
++ awt.Unlock(env);
++
++ /* Get the drawing surface */
++ ds = awt.GetDrawingSurface(env, canvas);
++ if (ds == NULL) {
++ printf("NULL drawing surface\n");
++ return;
++ }
++
++ /* Lock the drawing surface */
++ lock = ds->Lock(ds);
++ printf("Lock value %d\n", (int)lock);
++ if((lock & JAWT_LOCK_ERROR) != 0) {
++ printf("Error locking surface\n");
++ awt.FreeDrawingSurface(ds);
++ return;
++ }
++
++ /* Get the drawing surface info */
++ dsi = ds->GetDrawingSurfaceInfo(ds);
++ if (dsi == NULL) {
++ printf("Error getting surface info\n");
++ ds->Unlock(ds);
++ awt.FreeDrawingSurface(ds);
++ return;
++ }
++
++ /* Get the platform-specific drawing info */
++ dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo;
++
++ /* Now paint */
++ gc = XCreateGC(dsi_x11->display, dsi_x11->drawable, 0, 0);
++ XSetForeground(dsi_x11->display, gc, 0);
++ XFillRectangle(dsi_x11->display, dsi_x11->drawable, gc,
++ 5, 5, 90, 90);
++ XFreeGC(dsi_x11->display, gc);
++ ref = awt.GetComponent(env, (void*)(dsi_x11->drawable));
++ if (!(*env)->IsSameObject(env, ref, canvas)) {
++ printf("Error! Different objects!\n");
++ }
++
++ /* Free the drawing surface info */
++ ds->FreeDrawingSurfaceInfo(dsi);
++
++ /* Unlock the drawing surface */
++ ds->Unlock(ds);
++
++ /* Free the drawing surface */
++ awt.FreeDrawingSurface(ds);
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/JAWT/myfile.cpp Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,110 @@
++/*
++ * 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 <windows.h>
++#include "MyCanvas.h"
++#include "jawt_md.h"
++
++/*
++ * Class: MyCanvas
++ * Method: paint
++ * Signature: (Ljava/awt/Graphics;)V
++ */
++
++extern "C" {
++
++JNIEXPORT void JNICALL Java_MyCanvas_paint
++(JNIEnv* env, jobject canvas, jobject graphics)
++{
++ /* Get the AWT */
++ JAWT awt;
++ awt.version = JAWT_VERSION_1_4;
++ if (JAWT_GetAWT(env, &awt) == JNI_FALSE) {
++ printf("AWT Not found\n");
++ return;
++ }
++
++ /* Lock the AWT */
++ awt.Lock(env);
++
++ /* Unlock the AWT */
++ awt.Unlock(env);
++
++ /* Get the drawing surface */
++ JAWT_DrawingSurface* ds = awt.GetDrawingSurface(env, canvas);
++ if (ds == NULL) {
++ printf("NULL drawing surface\n");
++ return;
++ }
++
++ /* Lock the drawing surface */
++ jint lock = ds->Lock(ds);
++ printf("Lock value %d\n", (int)lock);
++ if((lock & JAWT_LOCK_ERROR) != 0) {
++ printf("Error locking surface\n");
++ return;
++ }
++
++ /* Get the drawing surface info */
++ JAWT_DrawingSurfaceInfo* dsi = ds->GetDrawingSurfaceInfo(ds);
++ if (dsi == NULL) {
++ printf("Error getting surface info\n");
++ ds->Unlock(ds);
++ return;
++ }
++
++ /* Get the platform-specific drawing info */
++ JAWT_Win32DrawingSurfaceInfo* dsi_win =
++ (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
++
++ /* Now paint */
++ PAINTSTRUCT ps;
++ /* Do not use the HDC returned from BeginPaint()!! */
++ ::BeginPaint(dsi_win->hwnd, &ps);
++ HBRUSH hbrush = (HBRUSH)::GetStockObject(BLACK_BRUSH);
++ RECT rect;
++ rect.left = 5;
++ rect.top = 5;
++ rect.right = 95;
++ rect.bottom = 95;
++ ::FillRect(dsi_win->hdc, &rect, hbrush);
++ ::EndPaint(dsi_win->hwnd, &ps);
++
++ jobject ref = awt.GetComponent(env, (void*)(dsi_win->hwnd));
++ if (!env->IsSameObject(ref, canvas)) {
++ printf("Error! Different objects!\n");
++ }
++
++ /* Free the drawing surface info */
++ ds->FreeDrawingSurfaceInfo(dsi);
++
++ /* Unlock the drawing surface */
++ ds->Unlock(ds);
++
++ /* Free the drawing surface */
++ awt.FreeDrawingSurface(ds);
++}
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,43 @@
++<html>
++<!--
++ 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 6299858
++ @summary PIT. Focused border not shown on List if selected item is removed, XToolkit
++ @author Dmitry.Cherepanov@SUN.COM area=awt.list
++ @run applet FirstItemRemoveTest.html
++ -->
++<head>
++<title> </title>
++</head>
++<body>
++
++<h1>FirstItemRemoveTest<br>Bug ID: 6299858 </h1>
++
++<p> This is an AUTOMATIC test, simply wait for completion </p>
++
++<APPLET CODE="FirstItemRemoveTest.class" WIDTH=200 HEIGHT=200></APPLET>
++</body>
++</html>
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,119 @@
++/*
++ * 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 6299858 7124338
++ @summary PIT. Focused border not shown on List if selected item is removed, XToolkit
++ @author Dmitry.Cherepanov@SUN.COM area=awt.list
++ @run applet FirstItemRemoveTest.html
++*/
++
++import java.applet.Applet;
++import java.awt.*;
++import java.awt.event.*;
++
++public class FirstItemRemoveTest extends Applet
++{
++ List list = new List(4, false);
++ Panel panel = new Panel();
++
++ public void init()
++ {
++ list.add("000");
++ list.add("111");
++ list.add("222");
++ list.add("333");
++ list.add("444");
++ list.add("555");
++
++ panel.setLayout(new FlowLayout ());
++ panel.add(list);
++
++ this.add(panel);
++ this.setLayout (new FlowLayout ());
++ }//End init()
++
++ public void start ()
++ {
++ setSize (200,200);
++ setVisible(true);
++ validate();
++
++ test();
++ }// start()
++
++ private void test(){
++
++ if (sun.awt.OSInfo.getOSType() == sun.awt.OSInfo.OSType.MACOSX) {
++ System.err.println("Skipped. This test is not for OS X.");
++ return;
++ }
++
++ Robot r;
++ try {
++ r = new Robot();
++ } catch(AWTException e) {
++ throw new RuntimeException(e.getMessage());
++ }
++
++ // Removing first item in order to reproduce incorrect behaviour
++ r.delay(1000);
++ list.remove(0);
++ r.delay(1000);
++
++ // Request focus to list
++ Point loc = this.getLocationOnScreen();
++ r.delay(1000);
++
++ r.mouseMove(loc.x+10, loc.y+10);
++ r.delay(10);
++ r.mousePress(InputEvent.BUTTON1_MASK);
++ r.delay(10);
++ r.mouseRelease(InputEvent.BUTTON1_MASK);
++ r.delay(1000);
++
++ list.requestFocusInWindow();
++ r.delay(1000);
++ r.waitForIdle();
++ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != list){
++ throw new RuntimeException("Test failed - list isn't focus owner.");
++ }
++
++ // The focus index should be set to first item after removing
++ // So if we press VK_SPACE then the selected item will be equals 0.
++ r.delay(100);
++ r.keyPress(KeyEvent.VK_SPACE);
++ r.delay(10);
++ r.keyRelease(KeyEvent.VK_SPACE);
++ r.delay(1000);
++ r.waitForIdle();
++
++ int selectedIndex = list.getSelectedIndex();
++ if (selectedIndex != 0){
++ throw new RuntimeException("Test failed. list.getSelectedIndex() = "+selectedIndex);
++ }
++
++ }
++
++}// class AutomaticAppletTest
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,50 @@
++/*
++ * 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 7129133
++ * @summary [macosx] Accelerators are displayed as Meta instead of the Command symbol
++ * @author leonid.romanov@oracle.com
++ * @run main bug7129133
++ */
++
++import java.awt.*;
++
++public class bug7129133 {
++ public static void main(String[] args) throws Exception {
++ if (sun.awt.OSInfo.getOSType() != sun.awt.OSInfo.OSType.MACOSX) {
++ System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
++ return;
++ }
++
++ Toolkit.getDefaultToolkit();
++
++ String cmdSymbol = "\u2318";
++ String val = Toolkit.getProperty("AWT.meta", "Meta");
++
++ if (!val.equals(cmdSymbol)) {
++ throw new Exception("Wrong property value for AWT.meta. Expected: " + cmdSymbol + ", actual: " + val);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,43 @@
++<html>
++<!--
++ 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 6384984 8004032
++ @summary TrayIcon try to dispay a tooltip when is not visible
++ @author Dmitry.Cherepanov@sun.com area=awt.tray
++ @run applet/manual=yesno ShowAfterDisposeTest.html
++ -->
++<head>
++<title> ShowAfterDisposeTest </title>
++</head>
++<body>
++
++<h1>ShowAfterDisposeTest<br>Bug ID: 6384984</h1>
++
++<p> See the dialog box (usually in upper left corner) for instructions</p>
++
++<APPLET CODE="ShowAfterDisposeTest.class" WIDTH=200 HEIGHT=200></APPLET>
++</body>
++</html>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,246 @@
++/*
++ * 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 6384984 8004032
++ @summary TrayIcon try to dispay a tooltip when is not visible
++ @author Dmitry.Cherepanov@sun.com area=awt.tray
++ @run applet/manual=yesno ShowAfterDisposeTest.html
++*/
++
++import java.applet.*;
++
++import java.awt.*;
++import java.awt.event.*;
++import java.awt.image.*;
++
++public class ShowAfterDisposeTest extends Applet
++{
++ boolean traySupported;
++
++ public void init()
++ {
++ this.setLayout (new BorderLayout ());
++
++ String[] instructions;
++ traySupported = SystemTray.isSupported();
++ if (traySupported)
++ {
++ String[] s =
++ {
++ "1) When the test starts an icon is added to the SystemTray area.",
++ "2a) If you use Apple OS X,",
++ " right click on this icon (it's important to click before the tooltip is shown).",
++ " The icon should disappear.",
++ "2b) If you use other os (Windows, Linux, Solaris),",
++ " double click on this icon (it's important to click before the tooltip is shown).",
++ " The icon should disappear.",
++ "3) If the bug is reproducible then the test will fail without assistance.",
++ "4) Just press the 'pass' button."
++ };
++ instructions = s;
++ }
++ else
++ {
++ String[] s =
++ {
++ "The test cannot be run because SystemTray is not supported.",
++ "Simply press PASS button."
++ };
++ instructions = s;
++ }
++ Sysout.createDialogWithInstructions(instructions);
++ }
++
++ public void start ()
++ {
++ setSize (200,200);
++ setVisible(true);
++ validate();
++
++ if (!traySupported)
++ {
++ return;
++ }
++
++ BufferedImage img = new BufferedImage(32, 32, BufferedImage.TYPE_INT_ARGB);
++ Graphics g = img.createGraphics();
++ g.setColor(Color.WHITE);
++ g.fillRect(0, 0, 32, 32);
++ g.setColor(Color.RED);
++ g.fillRect(6, 6, 20, 20);
++ g.dispose();
++
++ final SystemTray tray = SystemTray.getSystemTray();
++ final TrayIcon icon = new TrayIcon(img);
++ icon.setImageAutoSize(true);
++ icon.addActionListener(new ActionListener()
++ {
++ public void actionPerformed(ActionEvent ev)
++ {
++ tray.remove(icon);
++ }
++ }
++ );
++
++ try {
++ tray.add(icon);
++ } catch (AWTException e) {
++ Sysout.println(e.toString());
++ Sysout.println("!!! The test coudn't be performed !!!");
++ return;
++ }
++ icon.setToolTip("tooltip");
++ }
++}
++
++/****************************************************
++ Standard Test Machinery
++ DO NOT modify anything below -- it's a standard
++ chunk of code whose purpose is to make user
++ interaction uniform, and thereby make it simpler
++ to read and understand someone else's test.
++ ****************************************************/
++
++/**
++ This is part of the standard test machinery.
++ It creates a dialog (with the instructions), and is the interface
++ for sending text messages to the user.
++ To print the instructions, send an array of strings to Sysout.createDialog
++ WithInstructions method. Put one line of instructions per array entry.
++ To display a message for the tester to see, simply call Sysout.println
++ with the string to be displayed.
++ This mimics System.out.println but works within the test harness as well
++ as standalone.
++ */
++
++class Sysout
++{
++ private static TestDialog dialog;
++
++ public static void createDialogWithInstructions( String[] instructions )
++ {
++ dialog = new TestDialog( new Frame(), "Instructions" );
++ dialog.printInstructions( instructions );
++ dialog.setVisible(true);
++ println( "Any messages for the tester will display here." );
++ }
++
++ public static void createDialog( )
++ {
++ dialog = new TestDialog( new Frame(), "Instructions" );
++ String[] defInstr = { "Instructions will appear here. ", "" } ;
++ dialog.printInstructions( defInstr );
++ dialog.setVisible(true);
++ println( "Any messages for the tester will display here." );
++ }
++
++ public static void printInstructions( String[] instructions )
++ {
++ dialog.printInstructions( instructions );
++ }
++
++ public static void println( String messageIn )
++ {
++ dialog.displayMessage( messageIn );
++ }
++}
++
++/**
++ This is part of the standard test machinery. It provides a place for the
++ test instructions to be displayed, and a place for interactive messages
++ to the user to be displayed.
++ To have the test instructions displayed, see Sysout.
++ To have a message to the user be displayed, see Sysout.
++ Do not call anything in this dialog directly.
++ */
++class TestDialog extends Dialog
++{
++
++ TextArea instructionsText;
++ TextArea messageText;
++ int maxStringLength = 80;
++
++ //DO NOT call this directly, go through Sysout
++ public TestDialog( Frame frame, String name )
++ {
++ super( frame, name );
++ int scrollBoth = TextArea.SCROLLBARS_BOTH;
++ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
++ add( "North", instructionsText );
++
++ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
++ add("Center", messageText);
++
++ pack();
++
++ setVisible(true);
++ }
++
++ //DO NOT call this directly, go through Sysout
++ public void printInstructions( String[] instructions )
++ {
++ //Clear out any current instructions
++ instructionsText.setText( "" );
++
++ //Go down array of instruction strings
++
++ String printStr, remainingStr;
++ for( int i=0; i < instructions.length; i++ )
++ {
++ //chop up each into pieces maxSringLength long
++ remainingStr = instructions[ i ];
++ while( remainingStr.length() > 0 )
++ {
++ //if longer than max then chop off first max chars to print
++ if( remainingStr.length() >= maxStringLength )
++ {
++ //Try to chop on a word boundary
++ int posOfSpace = remainingStr.
++ lastIndexOf( ' ', maxStringLength - 1 );
++
++ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
++
++ printStr = remainingStr.substring( 0, posOfSpace + 1 );
++ remainingStr = remainingStr.substring( posOfSpace + 1 );
++ }
++ //else just print
++ else
++ {
++ printStr = remainingStr;
++ remainingStr = "";
++ }
++
++ instructionsText.append( printStr + "\n" );
++ }
++ }
++ }
++
++ //DO NOT call this directly, go through Sysout
++ public void displayMessage( String messageIn )
++ {
++ messageText.append( messageIn + "\n" );
++ System.out.println(messageIn);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,133 @@
++/*
++ * 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 8024163
++ * @summary Checks the dragEnter event is correctly generated
++ * @library ../../regtesthelpers
++ * @build Util
++ * @compile ExtraDragEnterTest.java
++ * @run main/othervm ExtraDragEnterTest
++ * @author Petr Pchelko
++ */
++
++import test.java.awt.regtesthelpers.Util;
++
++import javax.swing.*;
++import java.awt.*;
++import java.awt.datatransfer.StringSelection;
++import java.awt.dnd.DnDConstants;
++import java.awt.dnd.DragGestureEvent;
++import java.awt.dnd.DragGestureListener;
++import java.awt.dnd.DragSource;
++import java.awt.dnd.DropTarget;
++import java.awt.dnd.DropTargetAdapter;
++import java.awt.dnd.DropTargetDragEvent;
++import java.awt.dnd.DropTargetDropEvent;
++import java.awt.event.InputEvent;
++import java.util.concurrent.atomic.AtomicInteger;
++
++public class ExtraDragEnterTest {
++
++ private static final int FRAME_SIZE = 100;
++ private static final int FRAME_LOCATION = 100;
++
++ private static AtomicInteger dragEnterCalled = new AtomicInteger(0);
++
++ private static volatile Panel mainPanel;
++ private static volatile Frame f;
++
++ private static void initAndShowUI() {
++ f = new Frame("Test frame");
++ f.setBounds(FRAME_LOCATION,FRAME_LOCATION,FRAME_SIZE,FRAME_SIZE);
++ mainPanel = new Panel();
++ mainPanel.setBounds(0, 0, FRAME_SIZE, FRAME_SIZE);
++ mainPanel.setBackground(Color.black);
++ mainPanel.setLayout(new GridLayout(2, 1));
++
++ final DraggablePanel dragSource = new DraggablePanel();
++ dragSource.setBackground(Color.yellow);
++ dragSource.setDropTarget(null);
++ mainPanel.add(dragSource);
++
++ Panel dropTarget = new Panel();
++ dropTarget.setBackground(Color.red);
++ DropTarget dt = new DropTarget(dropTarget, new DropTargetAdapter() {
++ @Override public void drop(DropTargetDropEvent dtde) { }
++
++ @Override
++ public void dragEnter(DropTargetDragEvent dtde) {
++ dragEnterCalled.incrementAndGet();
++ }
++ });
++ dropTarget.setDropTarget(dt);
++ mainPanel.add(dropTarget);
++
++ f.add(mainPanel);
++ f.setVisible(true);
++ }
++
++ public static void main(String[] args) throws Throwable {
++ try {
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ initAndShowUI();
++ }
++ });
++
++ Robot r = new Robot();
++ Util.waitForIdle(r);
++ Point leftCorner = new Point(mainPanel.getLocationOnScreen());
++ leftCorner.translate(5, 5);
++ Point rightCorner = new Point(mainPanel.getLocationOnScreen());
++ rightCorner.translate(mainPanel.getWidth(), mainPanel.getHeight());
++ rightCorner.translate(-5, -5);
++ Util.drag(r, leftCorner, rightCorner, InputEvent.BUTTON1_MASK);
++ Util.waitForIdle(r);
++
++ int called = dragEnterCalled.get();
++ if (called != 1) {
++ throw new RuntimeException("Failed. Drag enter called " + called + " times. Expected 1" );
++ }
++ } finally {
++ if (f != null) {
++ f.dispose();
++ }
++ }
++ }
++
++ private static class DraggablePanel extends Panel implements DragGestureListener {
++
++ public DraggablePanel() {
++ (new DragSource()).createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY, this);
++ }
++
++ @Override
++ public void dragGestureRecognized(DragGestureEvent dge) {
++ dge.startDrag(Cursor.getDefaultCursor(), new StringSelection("test"));
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,128 @@
++/*
++ * 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 8024163
++ * @summary Checks that dragExit is generated when the new DropTarget is created under the drag
++ * @library ../../regtesthelpers
++ * @build Util
++ * @compile MissedDragExitTest.java
++ * @run main/othervm MissedDragExitTest
++ * @author Petr Pchelko
++ */
++
++import test.java.awt.regtesthelpers.Util;
++
++import javax.swing.*;
++import java.awt.*;
++import java.awt.datatransfer.StringSelection;
++import java.awt.dnd.DnDConstants;
++import java.awt.dnd.DragGestureEvent;
++import java.awt.dnd.DragGestureListener;
++import java.awt.dnd.DragSource;
++import java.awt.dnd.DropTarget;
++import java.awt.dnd.DropTargetAdapter;
++import java.awt.dnd.DropTargetDragEvent;
++import java.awt.dnd.DropTargetDropEvent;
++import java.awt.dnd.DropTargetEvent;
++import java.awt.event.InputEvent;
++
++public class MissedDragExitTest {
++
++ private static final int FRAME_SIZE = 100;
++ private static final int FRAME_LOCATION = 100;
++
++ private static volatile boolean dragExitCalled = false;
++
++ private static volatile Frame f;
++
++ private static void initAndShowUI() {
++ f = new Frame("Test frame");
++ f.setBounds(FRAME_LOCATION,FRAME_LOCATION,FRAME_SIZE,FRAME_SIZE);
++
++ final DraggablePanel dragSource = new DraggablePanel();
++ dragSource.setBackground(Color.yellow);
++ DropTarget dt = new DropTarget(dragSource, new DropTargetAdapter() {
++ @Override public void drop(DropTargetDropEvent dtde) { }
++
++ @Override
++ public void dragExit(DropTargetEvent dte) {
++ dragExitCalled = true;
++ }
++
++ @Override
++ public void dragOver(DropTargetDragEvent dtde) {
++ Panel newDropTarget = new Panel();
++ newDropTarget.setDropTarget(new DropTarget());
++ newDropTarget.setBackground(Color.red);
++ newDropTarget.setBounds(0, 0, FRAME_SIZE, FRAME_SIZE);
++ dragSource.add(newDropTarget);
++ }
++ });
++ dragSource.setDropTarget(dt);
++ f.add(dragSource);
++
++ f.setVisible(true);
++ }
++
++ public static void main(String[] args) throws Throwable {
++ try {
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ initAndShowUI();
++ }
++ });
++
++ Robot r = new Robot();
++ Util.waitForIdle(r);
++ Util.drag(r,
++ new Point(FRAME_LOCATION + FRAME_SIZE / 3, FRAME_LOCATION + FRAME_SIZE / 3),
++ new Point(FRAME_LOCATION + FRAME_SIZE / 3 * 2, FRAME_LOCATION + FRAME_SIZE / 3 * 2),
++ InputEvent.BUTTON1_MASK);
++ Util.waitForIdle(r);
++
++ if (!dragExitCalled) {
++ throw new RuntimeException("Failed. Drag exit was not called" );
++ }
++ } finally {
++ if (f != null) {
++ f.dispose();
++ }
++ }
++ }
++
++ private static class DraggablePanel extends Panel implements DragGestureListener {
++
++ public DraggablePanel() {
++ (new DragSource()).createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY, this);
++ }
++
++ @Override
++ public void dragGestureRecognized(DragGestureEvent dge) {
++ dge.startDrag(Cursor.getDefaultCursor(), new StringSelection("test"));
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/print/bug8023392/bug8023392.html Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,20 @@
++<html>
++<!--
++ @test
++ @bug 8023392
++ @summary Swing text components printed with spaces between chars
++ @author Anton Nashatyrev
++ @run applet/manual=yesno bug8023392.html
++ -->
++<head>
++ <title> Bug 8023392 </title>
++</head>
++<body>
++
++<h1>Bug ID: 8023392</h1>
++
++<p> See the dialog box (usually in upper left corner) for instructions</p>
++
++<APPLET CODE="bug8023392.class" WIDTH=400 HEIGHT=400></APPLET>
++</body>
++</html>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/print/bug8023392/bug8023392.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,286 @@
++/*
++ * 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.
++ */
++
++/*
++ test
++ @bug 8023392
++ @summary Swing text components printed with spaces between chars
++ @author Anton Nashatyrev
++ @run applet/manual=yesno bug8023392.html
++*/
++
++import javax.swing.*;
++import javax.swing.border.LineBorder;
++import java.applet.Applet;
++import java.awt.*;
++import java.awt.event.ActionEvent;
++import java.awt.event.ActionListener;
++import java.awt.font.TextAttribute;
++import java.awt.print.PageFormat;
++import java.awt.print.Printable;
++import java.awt.print.PrinterException;
++import java.awt.print.PrinterJob;
++import java.text.AttributedCharacterIterator;
++import java.text.AttributedString;
++
++
++public class bug8023392 extends Applet {
++ static final String[] instructions = {
++ "A Frame containing several pairs of labels ((a) and (b)) is displayed.",
++ "Labels of each pair look the same and are left-aligned (with spaces ",
++ "between chars).",
++ "1. Hit the print button.",
++ "2. Select any available printer (printing to file is also fine).",
++ "3. Look at the printing result (paper, PDF, PS, etc.):",
++ " The (a) and (b) labels should look almost the same and the (a) labels",
++ " shouldn't appear as if they are stretched along X axis."};
++
++ public void init() {
++ this.setLayout(new BorderLayout());
++ add(new SimplePrint2(), BorderLayout.CENTER);
++
++ Sysout.createDialogWithInstructions(instructions);
++
++ }
++
++ public static class SimplePrint2 extends JPanel
++ implements ActionListener, Printable {
++ JLabel label1;
++ JLabel label2;
++ JButton printButton;
++
++
++ public SimplePrint2() {
++ setLayout(new BorderLayout());
++ label1 = new JLabel("2a) a b c d e" +
++ " ");
++ label2 = new JLabel("2b) a b c d e");
++
++ Box p1 = new Box(BoxLayout.Y_AXIS);
++ p1.add(label1);
++ p1.add(label2);
++ p1.add(new JLabel("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww") {
++ String s = "3a) a b c d e ";
++ @Override
++ protected void paintComponent(Graphics g) {
++ sun.swing.SwingUtilities2.drawChars(this, g, s.toCharArray(),
++ 0, s.length(), 0, 15);
++ }
++ });
++ p1.add(new JLabel("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww") {
++ String s = "3b) a b c d e";
++ @Override
++ protected void paintComponent(Graphics g) {
++ sun.swing.SwingUtilities2.drawChars(this, g, s.toCharArray(),
++ 0, s.length(), 0, 15);
++ }
++ });
++ p1.add(new JLabel("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww") {
++ String s = "4a) a b c d e ";
++ AttributedCharacterIterator it;
++ {
++ AttributedString as = new AttributedString(s);
++ as.addAttribute(TextAttribute.FONT, getFont());
++ as.addAttribute(TextAttribute.FOREGROUND, Color.RED, 3, 8);
++ it = as.getIterator();
++ }
++ @Override
++ protected void paintComponent(Graphics g) {
++ sun.swing.SwingUtilities2.drawString(this, g, it, 0, 15);
++ }
++ });
++
++ p1.add(new JLabel("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww") {
++ String s = "4b) a b c d e";
++ AttributedCharacterIterator it;
++ {
++ AttributedString as = new AttributedString(s);
++ as.addAttribute(TextAttribute.FONT, getFont());
++ as.addAttribute(TextAttribute.FOREGROUND, Color.RED, 3, 8);
++ it = as.getIterator();
++ }
++ @Override
++ protected void paintComponent(Graphics g) {
++ sun.swing.SwingUtilities2.drawString(this, g, it, 0, 15);
++ }
++ });
++
++ JPanel p2 = new JPanel();
++ printButton = new JButton("Print");
++ printButton.addActionListener(this);
++ p2.add(printButton);
++
++ Container c = this;
++ c.add(p1, BorderLayout.CENTER);
++ c.add(p2, BorderLayout.SOUTH);
++
++ String[] data = {
++ "1a) \u30aa\u30f3\u30e9\u30a4\u30f3\u6d88\u8fbc" +
++ " ",
++ "1b) \u30aa\u30f3\u30e9\u30a4\u30f3\u6d88\u8fbc"
++ };
++ JList l0 = new JList(data);
++ l0.setVisibleRowCount(l0.getModel().getSize());
++ JScrollPane jsp = new JScrollPane(l0);
++ l0.setBorder(new LineBorder(Color.GRAY));
++ c.add(jsp, BorderLayout.NORTH);
++
++ for (Component comp : new Component[]{label1, label2, printButton}) {
++ comp.setFont(new Font("Monospaced", 0, 16));
++ }
++ }
++
++ public void actionPerformed(ActionEvent e) {
++ PrinterJob job = PrinterJob.getPrinterJob();
++ job.setPrintable(this);
++ if (job.printDialog()) {
++ try {
++ job.print();
++ } catch (PrinterException ex) {
++ ex.printStackTrace();
++ }
++ }
++ }
++
++ public int print(Graphics graphics,
++ PageFormat pageFormat,
++ int pageIndex)
++ throws PrinterException {
++ if (pageIndex >= 1) {
++ return Printable.NO_SUCH_PAGE;
++ }
++
++ this.paint(graphics);
++ return Printable.PAGE_EXISTS;
++ }
++ }
++}
++
++
++/**
++ * *************************************************
++ * Standard Test Machinery
++ * DO NOT modify anything below -- it's a standard
++ * chunk of code whose purpose is to make user
++ * interaction uniform, and thereby make it simpler
++ * to read and understand someone else's test.
++ * **************************************************
++ */
++class Sysout {
++ private static TestDialog dialog;
++
++ public static void createDialogWithInstructions(String[] instructions) {
++ dialog = new TestDialog(new Frame(), "Instructions");
++ dialog.printInstructions(instructions);
++ dialog.show();
++ println("Any messages for the tester will display here.");
++ }
++
++ public static void createDialog() {
++ dialog = new TestDialog(new Frame(), "Instructions");
++ String[] defInstr = {"Instructions will appear here. ", ""};
++ dialog.printInstructions(defInstr);
++ dialog.show();
++ println("Any messages for the tester will display here.");
++ }
++
++
++ public static void printInstructions(String[] instructions) {
++ dialog.printInstructions(instructions);
++ }
++
++
++ public static void println(String messageIn) {
++ dialog.displayMessage(messageIn);
++ }
++
++}// Sysout class
++
++
++class TestDialog extends Dialog {
++
++ TextArea instructionsText;
++ TextArea messageText;
++ int maxStringLength = 80;
++
++ //DO NOT call this directly, go through Sysout
++ public TestDialog(Frame frame, String name) {
++ super(frame, name);
++ int scrollBoth = TextArea.SCROLLBARS_BOTH;
++ instructionsText = new TextArea("", 15, maxStringLength, scrollBoth);
++ add("North", instructionsText);
++
++ messageText = new TextArea("", 5, maxStringLength, scrollBoth);
++ add("South", messageText);
++
++ pack();
++
++ show();
++ }// TestDialog()
++
++ //DO NOT call this directly, go through Sysout
++ public void printInstructions(String[] instructions) {
++ //Clear out any current instructions
++ instructionsText.setText("");
++
++ //Go down array of instruction strings
++
++ String printStr, remainingStr;
++ for (int i = 0; i < instructions.length; i++) {
++ //chop up each into pieces maxSringLength long
++ remainingStr = instructions[i];
++ while (remainingStr.length() > 0) {
++ //if longer than max then chop off first max chars to print
++ if (remainingStr.length() >= maxStringLength) {
++ //Try to chop on a word boundary
++ int posOfSpace = remainingStr.
++ lastIndexOf(' ', maxStringLength - 1);
++
++ if (posOfSpace <= 0) posOfSpace = maxStringLength - 1;
++
++ printStr = remainingStr.substring(0, posOfSpace + 1);
++ remainingStr = remainingStr.substring(posOfSpace + 1);
++ }
++ //else just print
++ else {
++ printStr = remainingStr;
++ remainingStr = "";
++ }
++
++ instructionsText.append(printStr + "\n");
++
++ }// while
++
++ }// for
++
++ }//printInstructions()
++
++ //DO NOT call this directly, go through Sysout
++ public void displayMessage(String messageIn) {
++ messageText.append(messageIn + "\n");
++ }
++
++}// TestDialog class
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/beans/XMLDecoder/8028054/Task.java Wed May 07 19:26:47 2014 -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.
++ */
++
++import java.util.ArrayList;
++import java.util.Enumeration;
++import java.util.List;
++import java.util.jar.JarEntry;
++import java.util.jar.JarFile;
++import java.util.regex.Matcher;
++import java.util.regex.Pattern;
++
++abstract class Task<T> implements Runnable {
++ private transient boolean working = true;
++ private final List<T> methods;
++ private final Thread thread;
++
++ Task(List<T> methods) {
++ this.methods = methods;
++ this.thread = new Thread(this);
++ this.thread.start();
++ }
++
++ boolean isAlive() {
++ return this.thread.isAlive();
++ }
++
++ boolean isWorking() {
++ boolean working = this.working && this.thread.isAlive();
++ this.working = false;
++ return working;
++ }
++
++ @Override
++ public void run() {
++ long time = -System.currentTimeMillis();
++ for (T method : this.methods) {
++ this.working = true;
++ try {
++ for (int i = 0; i < 100; i++) {
++ process(method);
++ }
++ } catch (NoSuchMethodException ignore) {
++ }
++ }
++ time += System.currentTimeMillis();
++ print("thread done in " + time / 1000 + " seconds");
++ }
++
++ protected abstract void process(T method) throws NoSuchMethodException;
++
++ static synchronized void print(Object message) {
++ System.out.println(message);
++ System.out.flush();
++ }
++
++ static List<Class<?>> getClasses(int count) throws Exception {
++ String resource = ClassLoader.getSystemClassLoader().getResource("java/lang/Object.class").toString();
++
++ Pattern pattern = Pattern.compile("jar:file:(.*)!.*");
++ Matcher matcher = pattern.matcher(resource);
++ matcher.matches();
++ resource = matcher.group(1);
++
++ List<Class<?>> classes = new ArrayList<>();
++ try (JarFile jarFile = new JarFile(resource)) {
++ Enumeration<JarEntry> entries = jarFile.entries();
++ while (entries.hasMoreElements()) {
++ String name = entries.nextElement().getName();
++ if (name.startsWith("java") && name.endsWith(".class")) {
++ classes.add(Class.forName(name.substring(0, name.indexOf(".")).replace('/', '.')));
++ if (count == classes.size()) {
++ break;
++ }
++ }
++ }
++ }
++ return classes;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java Wed May 07 19:26:47 2014 -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 com.sun.beans.finder.ConstructorFinder;
++
++import java.lang.reflect.Constructor;
++import java.util.ArrayList;
++import java.util.Collections;
++import java.util.List;
++
++/*
++ * @test
++ * @bug 8028054
++ * @summary Tests that cached constructors have synchronized access
++ * @author Sergey Malenkov
++ * @compile -XDignore.symbol.file TestConstructorFinder.java
++ * @run main TestConstructorFinder
++ */
++
++public class TestConstructorFinder {
++ public static void main(String[] args) throws Exception {
++ List<Class<?>> classes = Task.getClasses(Integer.MAX_VALUE);
++ List<Constructor> constructors = new ArrayList<>();
++ for (Class<?> type : classes) {
++ Collections.addAll(constructors, type.getConstructors());
++ }
++ Task.print("found " + constructors.size() + " constructors in " + classes.size() + " classes");
++
++ List<Task> tasks = new ArrayList<>();
++ for (int i = 0; i < 50; i++) {
++ tasks.add(new Task<Constructor>(constructors) {
++ @Override
++ protected void process(Constructor constructor) throws NoSuchMethodException {
++ ConstructorFinder.findConstructor(constructor.getDeclaringClass(), constructor.getParameterTypes());
++ }
++ });
++ }
++ int alarm = 0;
++ while (true) {
++ int alive = 0;
++ int working = 0;
++ for (Task task : tasks) {
++ if (task.isWorking()) {
++ working++;
++ alive++;
++ } else if (task.isAlive()) {
++ alive++;
++ }
++ }
++ if (alive == 0) {
++ break;
++ }
++ Task.print(working + " out of " + alive + " threads are working");
++ if ((working == 0) && (++alarm == 10)) {
++ Task.print("DEADLOCK DETECTED");
++ System.exit(100);
++ }
++ Thread.sleep(1000);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java Wed May 07 19:26:47 2014 -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 com.sun.beans.finder.MethodFinder;
++
++import java.lang.reflect.Method;
++import java.util.ArrayList;
++import java.util.Collections;
++import java.util.List;
++
++/*
++ * @test
++ * @bug 8028054
++ * @summary Tests that cached methods have synchronized access
++ * @author Sergey Malenkov
++ * @compile -XDignore.symbol.file TestMethodFinder.java
++ * @run main TestMethodFinder
++ */
++
++public class TestMethodFinder {
++ public static void main(String[] args) throws Exception {
++ List<Class<?>> classes = Task.getClasses(4000);
++ List<Method> methods = new ArrayList<>();
++ for (Class<?> type : classes) {
++ Collections.addAll(methods, type.getMethods());
++ }
++ Task.print("found " + methods.size() + " methods in " + classes.size() + " classes");
++
++ List<Task> tasks = new ArrayList<>();
++ for (int i = 0; i < 50; i++) {
++ tasks.add(new Task<Method>(methods) {
++ @Override
++ protected void process(Method method) throws NoSuchMethodException {
++ MethodFinder.findMethod(method.getDeclaringClass(), method.getName(), method.getParameterTypes());
++ }
++ });
++ }
++ int alarm = 0;
++ while (true) {
++ int alive = 0;
++ int working = 0;
++ for (Task task : tasks) {
++ if (task.isWorking()) {
++ working++;
++ alive++;
++ } else if (task.isAlive()) {
++ alive++;
++ }
++ }
++ if (alive == 0) {
++ break;
++ }
++ Task.print(working + " out of " + alive + " threads are working");
++ if ((working == 0) && (++alarm == 10)) {
++ Task.print("DEADLOCK DETECTED");
++ System.exit(100);
++ }
++ Thread.sleep(1000);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/beans/XMLEncoder/Test8027066.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,41 @@
++/*
++ * 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 8027066
++ * @summary Tests that the same array can be encoded twice
++ * @author Anton Nashatyrev
++ */
++public class Test8027066 extends AbstractTest<String[][]> {
++ public static void main(String[] args) {
++ new Test8027066().test(true);
++ }
++
++ @Override
++ protected String[][] getObject() {
++ String[] strings = {"first", "second"};
++ String[][] arrays = {strings, strings};
++ return arrays;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/Class/checkMemberAccess/CheckMemberAccess.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,123 @@
++/*
++ * 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.IOException;
++import java.lang.reflect.Method;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++
++/*
++ * @test
++ * @bug 8021368
++ * @summary SecurityManager.checkMemberAccess call should not resolve
++ * and load other classes
++ * @run main/othervm/policy=test.policy CheckMemberAccess
++ */
++
++public class CheckMemberAccess {
++ private static int count = 0;
++ public static void main(String[] args) throws Exception {
++ String testClasses = System.getProperty("test.classes", ".");
++ // remove Foo class
++ // the test will verify SecurityManager.checkMemberAccess should not
++ // cause any class loading of implementation classes
++ Path p = Paths.get(testClasses, "CheckMemberAccess$Foo.class");
++ if (Files.exists(p)) {
++ // Foo already deleted in rerun
++ Files.delete(p);
++ }
++ // patch the checkMemberAcces_ method name
++ patch(Paths.get(testClasses, "CheckMemberAccess$PrivateCheckMemberAccess.class"));
++ patch(Paths.get(testClasses, "CheckMemberAccess$StaticCheckMemberAccess.class"));
++
++ test(new OverriddedCheckMemberAccess(), count+1);
++ test(new NoOverriddedCheckMemberAccess(), count+1);
++ test(new PrivateCheckMemberAccess(), count);
++ test(new StaticCheckMemberAccess(), count);
++ }
++
++ private static void patch(Path p) throws IOException {
++ // s/checkMemberAcces_/checkMemberAccess
++ byte[] bytes = Files.readAllBytes(p);
++ int len = "Acces_".length();
++ for (int i=0; i < bytes.length-len; i++) {
++ if (bytes[i] == 'A' &&
++ bytes[i+1] == 'c' &&
++ bytes[i+2] == 'c' &&
++ bytes[i+3] == 'e' &&
++ bytes[i+4] == 's' &&
++ bytes[i+5] == '_') {
++ bytes[i+5] = 's';
++ break;
++ }
++ }
++ Files.write(p, bytes);
++ }
++
++ public void findMe() {};
++ public static void test(SecurityManager smgr, int expected) throws Exception {
++ System.setSecurityManager(smgr);
++ // this will trigger SecurityManager.checkMemberAccess to be called
++ Method m = CheckMemberAccess.class.getMethod("findMe", new Class<?>[0]);
++ if (count != expected) {
++ throw new RuntimeException(smgr.getClass() + ": " + count + " != " + expected);
++ }
++ }
++
++ static class OverriddedCheckMemberAccess extends SecurityManager {
++ @Override
++ public void checkMemberAccess(Class<?> clazz, int which) {
++ System.out.println("OverriddedCheckMemberAccess.checkMemberAccess called");
++ count++;
++ }
++ // implementation-specific class should not be loaded when
++ // this.checkMemberAccess is called
++ public Foo foo() {
++ return null;
++ }
++ }
++ static class NoOverriddedCheckMemberAccess extends OverriddedCheckMemberAccess {
++ }
++ static class PrivateCheckMemberAccess extends SecurityManager {
++ private void checkMemberAcces_(Class<?> clazz, int which) {
++ throw new RuntimeException("should not reach here");
++ }
++ // implementation-specific class should not be loaded when
++ // this.checkMemberAccess is called
++ public Foo foo() {
++ return null;
++ }
++ }
++ static class StaticCheckMemberAccess extends SecurityManager {
++ public static void checkMemberAcces_(Class<?> clazz, int which) {
++ throw new RuntimeException("should not reach here");
++ }
++ // implementation-specific class should not be loaded when
++ // this.checkMemberAccess is called
++ public Foo foo() {
++ return null;
++ }
++ }
++ static class Foo {}
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/Class/checkMemberAccess/test.policy Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,6 @@
++grant {
++ permission java.lang.RuntimePermission "createSecurityManager";
++ permission java.lang.RuntimePermission "setSecurityManager";
++ permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
++ permission java.util.PropertyPermission "*", "read";
++};
+--- ./jdk/test/java/lang/ProcessBuilder/Basic.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/ProcessBuilder/Basic.java Wed May 07 19:26:47 2014 -0700
+@@ -296,11 +296,15 @@
+ System.exit(5);
+ System.err.print("standard error");
+ System.out.print("standard output");
+- } else if (action.equals("testInheritIO")) {
++ } else if (action.equals("testInheritIO")
++ || action.equals("testRedirectInherit")) {
+ List<String> childArgs = new ArrayList<String>(javaChildArgs);
+ childArgs.add("testIO");
+ ProcessBuilder pb = new ProcessBuilder(childArgs);
+- pb.inheritIO();
++ if (action.equals("testInheritIO"))
++ pb.inheritIO();
++ else
++ redirectIO(pb, INHERIT, INHERIT, INHERIT);
+ ProcessResults r = run(pb);
+ if (! r.out().equals(""))
+ System.exit(7);
+@@ -555,9 +559,10 @@
+ System.getProperty("java.class.path");
+
+ private static final List<String> javaChildArgs =
+- Arrays.asList(new String[]
+- { javaExe, "-classpath", absolutifyPath(classpath),
+- "Basic$JavaChild"});
++ Arrays.asList(javaExe,
++ "-XX:+DisplayVMOutputToStderr",
++ "-classpath", absolutifyPath(classpath),
++ "Basic$JavaChild");
+
+ private static void testEncoding(String encoding, String tested) {
+ try {
+@@ -989,10 +994,10 @@
+ // Note that this requires __FOUR__ nested JVMs involved in one test,
+ // if you count the harness JVM.
+ //----------------------------------------------------------------
+- {
++ for (String testName : new String[] { "testInheritIO", "testRedirectInherit" } ) {
+ redirectIO(pb, PIPE, PIPE, PIPE);
+ List<String> command = pb.command();
+- command.set(command.size() - 1, "testInheritIO");
++ command.set(command.size() - 1, testName);
+ Process p = pb.start();
+ new PrintStream(p.getOutputStream()).print("standard input");
+ p.getOutputStream().close();
+@@ -1593,8 +1598,8 @@
+ javaExe));
+ list.add("ArrayOOME");
+ ProcessResults r = run(new ProcessBuilder(list));
+- check(r.out().contains("java.lang.OutOfMemoryError:"));
+- check(r.out().contains(javaExe));
++ check(r.err().contains("java.lang.OutOfMemoryError:"));
++ check(r.err().contains(javaExe));
+ check(r.err().contains(System.getProperty("java.version")));
+ equal(r.exitValue(), 1);
+ } catch (Throwable t) { unexpected(t); }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,47 @@
++/*
++ * 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 static java.lang.ProcessBuilder.Redirect.*;
++
++class InheritIO {
++
++ public static class TestInheritIO {
++ public static void main(String args[]) throws Throwable {
++ int err = new ProcessBuilder(args).inheritIO().start().waitFor();
++ System.err.print("exit value: " + err);
++ System.exit(err);
++ }
++ }
++
++ public static class TestRedirectInherit {
++ public static void main(String args[]) throws Throwable {
++ int err = new ProcessBuilder(args)
++ .redirectInput(INHERIT)
++ .redirectOutput(INHERIT)
++ .redirectError(INHERIT)
++ .start().waitFor();
++ System.err.print("exit value: " + err);
++ System.exit(err);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh Wed May 07 19:26:47 2014 -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.
++#
++
++# @test
++# @bug 8023130
++# @summary (process) ProcessBuilder#inheritIO does not work on Windows
++# @run shell InheritIO.sh
++
++if [ "x${TESTSRC}" = "x" ]; then
++ echo "TESTSRC not set. Test cannot execute. Failed."
++ exit 1
++fi
++
++if [ "x${TESTJAVA}" = "x" ]; then
++ echo "TESTJAVA not set. Test cannot execute. Failed."
++ exit 1
++fi
++
++
++JAVA="${TESTJAVA}/bin/java"
++JAVAC="${TESTJAVA}/bin/javac"
++
++cp -f ${TESTSRC}/InheritIO.java .
++
++# compile the class ourselves, so this can run as a standalone test
++
++${JAVAC} InheritIO.java
++RES="$?"
++if [ ${RES} != 0 ]; then
++ echo 'FAIL: Cannot compile InheritIO.java'
++ exit ${RES}
++fi
++
++
++for TEST_NAME in TestInheritIO TestRedirectInherit
++do
++ ${JAVA} ${TESTVMOPTS} -classpath . \
++ 'InheritIO$'${TEST_NAME} printf message > stdout.txt 2> stderr.txt
++
++ RES="$?"
++ if [ ${RES} != 0 ]; then
++ echo 'FAIL: InheritIO$'${TEST_NAME}' failed with '${RES}
++ exit ${RES}
++ fi
++
++ OUT_EXPECTED='message'
++ OUT_RECEIVED=`cat stdout.txt`
++ if [ "x${OUT_RECEIVED}" != "x${OUT_EXPECTED}" ]; then
++ echo "FAIL: unexpected '${OUT_RECEIVED}' in stdout"
++ exit 1
++ fi
++
++ ERR_EXPECTED='exit value: 0'
++ ERR_RECEIVED=`cat stderr.txt`
++ if [ "x${ERR_RECEIVED}" != "x${ERR_EXPECTED}" ]; then
++ echo "FAIL: unexpected '${ERR_RECEIVED}' in stderr"
++ exit 1
++ fi
++done
++
++echo 'PASS: InheritIO works as expected'
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,147 @@
++/*
++ * 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 7147084
++ * @run main/othervm InheritIOEHandle
++ * @summary inherit IOE handles and MS CreateProcess limitations (kb315939)
++ */
++
++import java.io.BufferedReader;
++import java.io.File;
++import java.io.IOException;
++import java.io.InputStreamReader;
++
++public class InheritIOEHandle {
++ private static enum APP {
++ B, C;
++ }
++ private static File stopC = new File(".\\StopC.txt");
++ private static String SIGNAL = "After call child process";
++ private static String JAVA_EXE = System.getProperty("java.home")
++ + File.separator + "bin"
++ + File.separator + "java";
++
++ private static String[] getCommandArray(String processName) {
++ String[] cmdArray = {
++ JAVA_EXE,
++ "-cp",
++ System.getProperty("java.class.path"),
++ InheritIOEHandle.class.getName(),
++ processName
++ };
++ return cmdArray;
++ }
++
++ public static void main(String[] args) throws Exception {
++ if (!System.getProperty("os.name").startsWith("Windows")) {
++ return;
++ }
++
++ if (args.length > 0) {
++ APP app = APP.valueOf(args[0]);
++ switch (app) {
++ case B:
++ performB();
++ break;
++ case C:
++ performC();
++ break;
++ }
++ return;
++ }
++ performA();
++ }
++
++ private static void performA() {
++ try {
++ stopC.delete();
++
++ ProcessBuilder builder = new ProcessBuilder(
++ getCommandArray(APP.B.name()));
++ builder.redirectErrorStream(true);
++
++ Process process = builder.start();
++
++ process.getOutputStream().close();
++ process.getErrorStream().close();
++
++ try (BufferedReader in = new BufferedReader( new InputStreamReader(
++ process.getInputStream(), "utf-8")))
++ {
++ String result;
++ while ((result = in.readLine()) != null) {
++ if (!SIGNAL.equals(result)) {
++ throw new Error("Catastrophe in process B! Bad output.");
++ }
++ }
++ }
++
++ // If JDK-7147084 is not fixed that point is unreachable.
++
++ // write signal file
++ stopC.createNewFile();
++
++ System.err.println("Read stream finished.");
++ } catch (IOException ex) {
++ throw new Error("Catastrophe in process A!", ex);
++ }
++ }
++
++ private static void performB() {
++ try {
++ ProcessBuilder builder = new ProcessBuilder(
++ getCommandArray(APP.C.name()));
++
++ Process process = builder.start();
++
++ process.getInputStream().close();
++ process.getOutputStream().close();
++ process.getErrorStream().close();
++
++ System.out.println(SIGNAL);
++
++ // JDK-7147084 subject:
++ // Process C inherits the [System.out] handle and
++ // handle close in B does not finalize the streaming for A.
++ // (handle reference count > 1).
++ } catch (IOException ex) {
++ throw new Error("Catastrophe in process B!", ex);
++ }
++ }
++
++ private static void performC() {
++ // If JDK-7147084 is not fixed the loop is 5min long.
++ for (int i = 0; i < 5*60; ++i) {
++ try {
++ Thread.sleep(1000);
++ // check for sucess
++ if (stopC.exists())
++ break;
++ } catch (InterruptedException ex) {
++ // that is ok. Longer sleep - better effect.
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,205 @@
++/*
++ * 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 6921885
++ * @run main/othervm SiblingIOEHandle
++ * @summary inherit IOE handles and MS CreateProcess limitations (kb315939)
++ */
++
++import java.io.BufferedReader;
++import java.io.File;
++import java.io.IOException;
++import java.io.InputStreamReader;
++import java.util.concurrent.BrokenBarrierException;
++import java.util.concurrent.CyclicBarrier;
++
++public class SiblingIOEHandle {
++ private static enum APP {
++ B, C;
++ }
++ private static File stopC = new File(".\\StopCs.txt");
++ private static String SIGNAL = "B child reported.";
++ private static String JAVA_EXE = System.getProperty("java.home")
++ + File.separator + "bin"
++ + File.separator + "java";
++
++ private static String[] getCommandArray(String processName) {
++ String[] cmdArray = {
++ JAVA_EXE,
++ "-cp",
++ System.getProperty("java.class.path"),
++ SiblingIOEHandle.class.getName(),
++ processName
++ };
++ return cmdArray;
++ }
++
++ public static void main(String[] args) {
++ if (!System.getProperty("os.name").startsWith("Windows")) {
++ return;
++ }
++
++ if (args.length > 0) {
++ APP app = APP.valueOf(args[0]);
++ switch (app) {
++ case B:
++ performB();
++ break;
++ case C:
++ performC();
++ break;
++ }
++ return;
++ }
++ performA(true);
++ performA(false);
++ }
++
++ static boolean procClaunched = false;
++
++ private static void waitAbit() {
++ try {
++ Thread.sleep(0);
++ } catch (InterruptedException ex) {
++ // that was long enough
++ }
++ }
++ private static boolean waitBarrier(CyclicBarrier barrier) {
++ while (true) try {
++ barrier.await();
++ return true;
++ } catch (InterruptedException ex) {
++ continue;
++ } catch (BrokenBarrierException ex) {
++ ex.printStackTrace();
++ return false;
++ }
++ }
++
++ private static void performA(boolean fileOut) {
++ try {
++ stopC.delete();
++ ProcessBuilder builderB = new ProcessBuilder(
++ getCommandArray(APP.B.name()));
++
++ File outB = null;
++ if (fileOut) {
++ outB = new File("outB.txt");
++ builderB.redirectOutput(outB);
++ }
++ builderB.redirectErrorStream(true);
++
++ final CyclicBarrier barrier = new CyclicBarrier(2);
++ Thread procCRunner = new Thread(new Runnable() {
++ @Override public void run() {
++ try {
++ if (waitBarrier(barrier)) {
++ waitAbit();
++ // Run process C next to B ASAP to make an attempt
++ // to capture the B-process IOE handles in C process.
++ Runtime.getRuntime().exec(getCommandArray(APP.C.name()));
++ procClaunched = true;
++ }
++ } catch (IOException ex) {
++ ex.printStackTrace();
++ }
++ }
++ });
++ procCRunner.start();
++
++
++ if (!waitBarrier(barrier)) {
++ throw new Error("Catastrophe in process A! Synchronization failed.");
++ }
++ // Run process B first.
++ Process processB = builderB.start();
++
++ while (true) try {
++ procCRunner.join();
++ break;
++ } catch (InterruptedException ex) {
++ continue;
++ }
++
++ if (!procClaunched) {
++ throw new Error("Catastrophe in process A! C was not launched.");
++ }
++
++ processB.getOutputStream().close();
++ processB.getErrorStream().close();
++
++ if (fileOut) {
++ try {
++ processB.waitFor();
++ } catch (InterruptedException ex) {
++ throw new Error("Catastrophe in process B! B hung up.");
++ }
++ System.err.println("Trying to delete [outB.txt].");
++ if (!outB.delete()) {
++ throw new Error("Greedy brother C deadlock! File share.");
++ }
++ System.err.println("Succeeded in delete [outB.txt].");
++ } else {
++ System.err.println("Read stream start.");
++ try (BufferedReader in = new BufferedReader( new InputStreamReader(
++ processB.getInputStream(), "utf-8")))
++ {
++ String result;
++ while ((result = in.readLine()) != null) {
++ if (!SIGNAL.equals(result)) {
++ throw new Error("Catastrophe in process B! Bad output.");
++ }
++ }
++ }
++ System.err.println("Read stream finished.");
++ }
++ // If JDK-6921885 is not fixed that point is unreachable.
++ // Test timeout exception.
++
++ // write signal file to stop C process.
++ stopC.createNewFile();
++ } catch (IOException ex) {
++ throw new Error("Catastrophe in process A!", ex);
++ }
++ }
++
++ private static void performB() {
++ System.out.println(SIGNAL);
++ }
++
++ private static void performC() {
++ // If JDK-7147084 is not fixed the loop is 5min long.
++ for (int i = 0; i < 5*60; ++i) {
++ try {
++ Thread.sleep(1000);
++ // check for sucess
++ if (stopC.exists())
++ break;
++ } catch (InterruptedException ex) {
++ // that is ok. Longer sleep - better effect.
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/Runtime/exec/CloseRace.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,146 @@
++/*
++ * 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 8024521
++ * @summary Closing ProcessPipeInputStream at the time the process exits is racy
++ * and leads to the data corruption.
++ * @library /lib/testlibrary
++ * @run main/othervm/timeout=80 CloseRace
++ */
++
++/**
++ * This test has a little chance to catch the race during the given default
++ * time gap of 20 seconds. To increase the time gap, set the system property
++ * CloseRaceTimeGap=N to the number of seconds.
++ * Jtreg's timeoutFactor should also be set appropriately.
++ *
++ * For example, to run the test for 10 minutes:
++ * > jtreg \
++ * -testjdk:$(PATH_TO_TESTED_JDK) \
++ * -timeoutFactor:10 \
++ * -DCloseRaceTimeGap=600 \
++ * $(PATH_TO_TESTED_JDK_SOURCE)/test/java/lang/Runtime/exec/CloseRace.java
++ */
++
++import java.io.*;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++import java.util.ArrayList;
++import java.util.Arrays;
++import java.util.LinkedList;
++import java.util.List;
++import jdk.testlibrary.OutputAnalyzer;
++import static jdk.testlibrary.ProcessTools.*;
++
++public class CloseRace {
++
++ public static void main(String args[]) throws Exception {
++ ProcessBuilder pb = createJavaProcessBuilder("-Xmx64M", "CloseRace$Child",
++ System.getProperty("CloseRaceTimeGap", "20"));
++ OutputAnalyzer oa = new OutputAnalyzer(pb.start());
++ oa.stderrShouldNotContain("java.lang.OutOfMemoryError");
++ }
++
++ public static class Child {
++ private static final String BIG_FILE = "bigfile";
++ private static final String SMALL_FILE = "smallfile";
++ private static int timeGap = 20; // seconds
++
++ public static void main(String args[]) throws Exception {
++ if (args.length > 0) {
++ try {
++ timeGap = Integer.parseInt(args[0]);
++ timeGap = Math.max(timeGap, 10);
++ timeGap = Math.min(timeGap, 10 * 60 * 60); // no more than 10 hours
++ } catch (NumberFormatException ignore) {}
++ }
++ try (RandomAccessFile f = new RandomAccessFile(BIG_FILE, "rw")) {
++ f.setLength(1024 * 1024 * 1024); // 1 Gb, greater than max heap size
++ }
++ try (FileOutputStream fs = new FileOutputStream(SMALL_FILE);
++ PrintStream ps = new PrintStream(fs)) {
++ for (int i = 0; i < 128; ++i)
++ ps.println("line of text");
++ }
++
++ List<Thread> threads = new LinkedList<>();
++ for (int i = 0; i < 99; ++i) {
++ Thread t = new Thread (new OpenLoop());
++ t.start();
++ threads.add(t);
++ }
++ Thread t2 = new Thread (new ExecLoop());
++ t2.start();
++ threads.add(t2);
++
++ Thread.sleep(timeGap);
++
++ for (Thread t : threads) {
++ t.interrupt();
++ t.join();
++ }
++ }
++
++ private static class OpenLoop implements Runnable {
++ public void run() {
++ final Path bigFilePath = Paths.get(BIG_FILE);
++ while (!Thread.interrupted()) {
++ try (InputStream in = Files.newInputStream(bigFilePath)) {
++ // Widen the race window by sleeping 1ms
++ Thread.sleep(1);
++ } catch (InterruptedException e) {
++ break;
++ } catch (Exception e) {
++ System.err.println(e);
++ }
++ }
++ }
++ }
++
++ private static class ExecLoop implements Runnable {
++ public void run() {
++ List<String> command = new ArrayList<>(
++ Arrays.asList("/bin/cat", SMALL_FILE));
++ while (!Thread.interrupted()) {
++ try {
++ ProcessBuilder builder = new ProcessBuilder(command);
++ final Process process = builder.start();
++ InputStream is = process.getInputStream();
++ InputStreamReader isr = new InputStreamReader(is);
++ BufferedReader br = new BufferedReader(isr);
++ while (br.readLine() != null) {}
++ process.waitFor();
++ isr.close();
++ } catch (InterruptedException e) {
++ break;
++ } catch (Exception e) {
++ System.err.println(e);
++ }
++ }
++ }
++ }
++ }
++}
+--- ./jdk/test/java/lang/String/ToLowerCase.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/String/ToLowerCase.java Wed May 07 19:26:47 2014 -0700
+@@ -23,7 +23,7 @@
+
+ /*
+ @test
+- @bug 4217441 4533872 4900935
++ @bug 4217441 4533872 4900935 8020037
+ @summary toLowerCase should lower-case Greek Sigma correctly depending
+ on the context (final/non-final). Also it should handle
+ Locale specific (lt, tr, and az) lowercasings and supplementary
+@@ -69,10 +69,11 @@
+ test("\u00CD", Locale.US, "\u00ED");
+ test("\u0128", Locale.US, "\u0129");
+
+- // I-dot tests (Turkish and Azeri)
++ // I-dot tests
+ test("\u0130", turkish, "i");
+ test("\u0130", az, "i");
+- test("\u0130", Locale.US, "i\u0307");
++ test("\u0130", lt, "i");
++ test("\u0130", Locale.US, "i");
+
+ // Remove dot_above in the sequence I + dot_above (Turkish and Azeri)
+ test("I\u0307", turkish, "i");
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,66 @@
++/*
++ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++/**
++ * Check that the value of file.encoding and sun.jnu.encoding match the expected
++ * values passed in on the command-line.
++ */
++public class ExpectedEncoding {
++ public static void main(String[] args) {
++ boolean failed = false;
++ if (args.length != 2) {
++ System.out.println("Usage:");
++ System.out.println("$ java ExpectedEncoding <expected file.encoding> <expected sun.jnu.encoding>");
++ System.out.println("$ use \"skip\" to skip checking property's value");
++ System.exit(1);
++ }
++ String expectFileEnc = args[0];
++ String expectSunJnuEnc = args[1];
++
++ String fileEnc = System.getProperty("file.encoding");
++ String jnuEnc = System.getProperty("sun.jnu.encoding");
++
++ if ("skip".equals(expectFileEnc)) {
++ System.err.println("Expected file.encoding is \"skip\", ignoring");
++ } else {
++ System.err.println("Expected file.encoding: " + expectFileEnc);
++ System.err.println("Actual file.encoding: " + fileEnc);
++ if (fileEnc == null || !fileEnc.equals(expectFileEnc)) {
++ failed = true;
++ }
++ }
++ if ("skip".equals(expectSunJnuEnc)) {
++ System.err.println("Expected sun.jnu.encoding is \"skip\", ignoring");
++ } else {
++ if (jnuEnc == null || !jnuEnc.equals(expectSunJnuEnc)) {
++ System.err.println("Expected sun.jnu.encoding: " + expectSunJnuEnc);
++ System.err.println("Actual sun.jnu.encoding: " + jnuEnc);
++ failed = true;
++ }
++ }
++
++ if (failed) {
++ throw new RuntimeException("Test Failed");
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.sh Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,96 @@
++#!/bin/sh
++
++#
++# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++
++# @test
++# @bug 8003228
++# @summary Test the value of sun.jnu.encoding on Mac
++# @author Brent Christian
++#
++# @run shell MacJNUEncoding.sh
++
++# Only run test on Mac
++OS=`uname -s`
++case "$OS" in
++ Darwin ) ;;
++ * )
++ exit 0
++ ;;
++esac
++
++if [ "${TESTJAVA}" = "" ]
++then
++ echo "TESTJAVA not set. Test cannot execute. Failed."
++ exit 1
++fi
++
++if [ "${TESTSRC}" = "" ]
++then
++ echo "TESTSRC not set. Test cannot execute. Failed."
++ exit 1
++fi
++
++if [ "${TESTCLASSES}" = "" ]
++then
++ echo "TESTCLASSES not set. Test cannot execute. Failed."
++ exit 1
++fi
++
++JAVAC="${TESTJAVA}"/bin/javac
++JAVA="${TESTJAVA}"/bin/java
++
++echo "Building test classes..."
++"$JAVAC" -d "${TESTCLASSES}" "${TESTSRC}"/ExpectedEncoding.java
++
++echo ""
++echo "Running test for C locale"
++export LANG=C
++export LC_ALL=C
++"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding US-ASCII UTF-8
++result1=$?
++
++echo ""
++echo "Running test for en_US.UTF-8 locale"
++export LANG=en_US.UTF-8
++export LC_ALL=en_US.UTF-8
++"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding UTF-8 UTF-8
++result2=$?
++
++echo ""
++echo "Cleanup"
++rm ${TESTCLASSES}/ExpectedEncoding.class
++
++if [ ${result1} -ne 0 ] ; then
++ echo "Test failed for C locale"
++ echo " LANG=\"${LANG}\""
++ echo " LC_ALL=\"${LC_ALL}\""
++ exit ${result1}
++fi
++if [ ${result2} -ne 0 ] ; then
++ echo "Test failed for en_US.UTF-8 locale"
++ echo " LANG=\"${LANG}\""
++ echo " LC_ALL=\"${LC_ALL}\""
++ exit ${result2}
++fi
++exit 0
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/System/MacEncoding/TestFileEncoding.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,168 @@
++/*
++ * 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.*;
++
++/*
++ * @test
++ * @bug 8011194
++ * @summary Test value of file.encoding for corresponding value of LANG, etc
++ * @library ../../../../tools/launcher/ ../
++ * @build TestHelper TestFileEncoding ExpectedEncoding
++ * @run main TestFileEncoding UTF-8
++ * @run main/othervm -Dfile.encoding=MyEncoding -DuserEncoding=MyEncoding TestFileEncoding MyEncoding
++ * @run main TestFileEncoding UTF-8 en_US.UTF-8
++ * @run main/othervm -Dfile.encoding=MyEncoding -DuserEncoding=MyEncoding TestFileEncoding MyEncoding en_US.UTF-8
++ * @run main TestFileEncoding US-ASCII C
++ * @run main/othervm -Dfile.encoding=MyEncoding -DuserEncoding=MyEncoding TestFileEncoding MyEncoding C
++ * @author Brent Christian
++ */
++
++/**
++ * Setup the environment and run a sub-test to check the expected value of
++ * file.encoding, based on the value(s) of encoding-related environment vars
++ * (LANG, LC_ALL, LC_CTYPE).
++ *
++ * The first argument (required) is the expected value of the
++ * file.encoding System property.
++ * The second argument (optional) is the value to set to the LANG/etc env vars.
++ */
++public class TestFileEncoding {
++ private static final String TEST_NAME = "ExpectedEncoding";
++
++ private String expectedEncoding; // Expected value for file.encoding
++ private String langVar = null; // Value to set for LANG, etc
++
++ private static Set<String> envToRm = new HashSet<>(3);
++ static {
++ // Take these vars out of the test's run environment, possibly adding
++ // our own value back in.
++ envToRm.add("LANG");
++ envToRm.add("LC_ALL");
++ envToRm.add("LC_CTYPE");
++ }
++
++ public TestFileEncoding(String expectedEncoding) {
++ this.expectedEncoding = expectedEncoding;
++ }
++
++ public TestFileEncoding(String expectedEncoding, String langVar) {
++ this.expectedEncoding = expectedEncoding;
++ this.langVar = langVar;
++ }
++
++ /*
++ * Launch ExpectedEncoding with the given parameters, check for the
++ * expected file.encoding.
++ */
++ private void run() {
++ String testClasses = System.getProperty("test.classes");
++
++ // Pick up VM opts
++ String vmOptsStr = System.getProperty("test.vm.opts");
++ System.out.println("test.vm.opts: " + vmOptsStr);
++ String[] vmOpts = new String[0];
++ if (vmOptsStr != null && !"".equals(vmOptsStr)) {
++ vmOpts = vmOptsStr.split(" ");
++ System.out.println("found vm options:");
++ for (String opt : vmOpts) {
++ System.out.println(" <" + opt + ">");
++ }
++ }
++
++ // Build java cmd
++ LinkedList<String> cmdList = new LinkedList<>();
++ cmdList.add(TestHelper.javaCmd);
++ for (String vmOpt : vmOpts) {
++ if (vmOpt != null && !vmOpt.equals("")) {
++ cmdList.add(vmOpt);
++ }
++ }
++
++ // See if the user specified a file.encoding that we should pass through
++ String userEncoding = System.getProperty("userEncoding");
++ if (userEncoding != null) {
++ cmdList.add("-Dfile.encoding="+userEncoding);
++ }
++
++ cmdList.add("-cp");
++ cmdList.add(testClasses);
++ cmdList.add(TEST_NAME);
++ cmdList.add(expectedEncoding);
++ cmdList.add("skip"); // ignore sun.jnu.encoding for this test
++
++ String cmdArray[] = new String[cmdList.size()];
++ cmdList.toArray(cmdArray);
++
++ // Run the test(s)
++ if (langVar == null) {
++ System.out.println("TestFileEncoding: Running with no envvars set");
++ TestHelper.TestResult tr = TestHelper.doExec(null, envToRm,
++ cmdArray);
++ checkResult(tr);
++ } else {
++ runWithEnvVar("LANG", cmdArray);
++ runWithEnvVar("LC_ALL", cmdArray);
++ runWithEnvVar("LC_CTYPE", cmdArray);
++ }
++ }
++
++ /*
++ * Run the test, setting the environment named by envVarName to the value
++ * in langVar.
++ */
++ private void runWithEnvVar(String envVarName, String[] cmdArray) {
++ Map<String, String> envToAdd = new HashMap<>(1);
++ TestHelper.TestResult tr = null;
++
++ System.out.println("TestFileEncoding: Running with " + envVarName + "=" + langVar);
++ envToAdd.put(envVarName, langVar);
++ tr = TestHelper.doExec(envToAdd, envToRm, cmdArray);
++ checkResult(tr);
++ }
++
++ private void checkResult(TestHelper.TestResult tr) {
++ System.out.println(tr);
++ if (!tr.isOK()) {
++ throw new RuntimeException("TEST FAILED: !tr.isOK()");
++ }
++ }
++
++ public static void main(String[] args) {
++ TestFileEncoding cfe = null;
++ if (!TestHelper.isMacOSX) {
++ System.out.println("Test is currently only for Mac OS X - pass.");
++ return;
++ }
++ if (args.length == 1) {
++ cfe = new TestFileEncoding(args[0]);
++ } else if (args.length == 2) {
++ cfe = new TestFileEncoding(args[0], args[1]);
++ } else {
++ System.out.println("Usage: TestFileEncoding <expected file.encoding>");
++ System.out.println(" TestFileEncoding <expected file.encoding> <value for LANG/etc env var>");
++ return;
++ }
++ cfe.run();
++ }
++}
+--- ./jdk/test/java/lang/System/MacJNUEncoding/ExpectedEncoding.java Tue Mar 18 12:35:25 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,56 +0,0 @@
+-/*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- */
+-
+-/**
+- * Check that the value of file.encoding and sun.jnu.encoding match the expected
+- * values passed in on the command-line.
+- */
+-public class ExpectedEncoding {
+- public static void main(String[] args) {
+- boolean failed = false;
+- if (args.length != 2) {
+- System.out.println("Usage:");
+- System.out.println("$ java ExpectedEncoding <expected file.encoding> <expected sun.jnu.encoding>");
+- System.exit(1);
+- }
+- String expectFileEnc = args[0];
+- String expectSunJnuEnc = args[1];
+-
+- String fileEnc = System.getProperty("file.encoding");
+- String jnuEnc = System.getProperty("sun.jnu.encoding");
+-
+- if (fileEnc == null || !fileEnc.equals(expectFileEnc)) {
+- System.err.println("Expected file.encoding: " + expectFileEnc);
+- System.err.println("Actual file.encoding: " + fileEnc);
+- failed = true;
+- }
+- if (jnuEnc == null || !jnuEnc.equals(expectSunJnuEnc)) {
+- System.err.println("Expected sun.jnu.encoding: " + expectSunJnuEnc);
+- System.err.println("Actual sun.jnu.encoding: " + jnuEnc);
+- failed = true;
+- }
+- if (failed) {
+- throw new RuntimeException("Test Failed");
+- }
+- }
+-}
+--- ./jdk/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh Tue Mar 18 12:35:25 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,96 +0,0 @@
+-#!/bin/sh
+-
+-#
+-# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-
+-# @test
+-# @bug 8003228
+-# @summary Test the value of sun.jnu.encoding on Mac
+-# @author Brent Christian
+-#
+-# @run shell MacJNUEncoding.sh
+-
+-# Only run test on Mac
+-OS=`uname -s`
+-case "$OS" in
+- Darwin ) ;;
+- * )
+- exit 0
+- ;;
+-esac
+-
+-if [ "${TESTJAVA}" = "" ]
+-then
+- echo "TESTJAVA not set. Test cannot execute. Failed."
+- exit 1
+-fi
+-
+-if [ "${TESTSRC}" = "" ]
+-then
+- echo "TESTSRC not set. Test cannot execute. Failed."
+- exit 1
+-fi
+-
+-if [ "${TESTCLASSES}" = "" ]
+-then
+- echo "TESTCLASSES not set. Test cannot execute. Failed."
+- exit 1
+-fi
+-
+-JAVAC="${TESTJAVA}"/bin/javac
+-JAVA="${TESTJAVA}"/bin/java
+-
+-echo "Building test classes..."
+-"$JAVAC" -d "${TESTCLASSES}" "${TESTSRC}"/ExpectedEncoding.java
+-
+-echo ""
+-echo "Running test for C locale"
+-export LANG=C
+-export LC_ALL=C
+-"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding US-ASCII UTF-8
+-result1=$?
+-
+-echo ""
+-echo "Running test for en_US.UTF-8 locale"
+-export LANG=en_US.UTF-8
+-export LC_ALL=en_US.UTF-8
+-"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding UTF-8 UTF-8
+-result2=$?
+-
+-echo ""
+-echo "Cleanup"
+-rm ${TESTCLASSES}/ExpectedEncoding.class
+-
+-if [ ${result1} -ne 0 ] ; then
+- echo "Test failed for C locale"
+- echo " LANG=\"${LANG}\""
+- echo " LC_ALL=\"${LC_ALL}\""
+- exit ${result1}
+-fi
+-if [ ${result2} -ne 0 ] ; then
+- echo "Test failed for en_US.UTF-8 locale"
+- echo " LANG=\"${LANG}\""
+- echo " LC_ALL=\"${LC_ALL}\""
+- exit ${result2}
+-fi
+-exit 0
+-
+--- ./jdk/test/java/lang/ThreadGroup/Suspend.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/ThreadGroup/Suspend.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 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
+@@ -23,47 +23,55 @@
+
+ /**
+ * @test
+- * @bug 4176355
++ * @bug 4176355 7181748
+ * @summary Suspending a ThreadGroup that contains the current thread has
+ * unpredictable results.
+ */
+
+ public class Suspend implements Runnable {
+- private static Thread first=null;
+- private static Thread second=null;
+- private static ThreadGroup group = new ThreadGroup("");
+- private static int count = 0;
+
+- Suspend() {
+- Thread thread = new Thread(group, this);
+- if (first == null)
+- first = thread;
+- else
+- second = thread;
+-
+- thread.start();
+- }
++ private static volatile int count = 0;
++ private static final ThreadGroup group = new ThreadGroup("");
++ private static final Thread first = new Thread(group, new Suspend());
++ private static final Thread second = new Thread(group, new Suspend());
+
+ public void run() {
+ while (true) {
+ try {
+- Thread.sleep(1000); // Give other thread a chance to start
+- if (Thread.currentThread() == first)
+- group.suspend();
+- else
++ Thread.sleep(100);
++ if (Thread.currentThread() == first) {
++ if (second.isAlive()) {
++ group.suspend();
++ }
++ } else {
+ count++;
+- } catch(InterruptedException e){
++ }
++ } catch (InterruptedException e) {
+ }
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+- for (int i=0; i<2; i++)
+- new Suspend();
+- Thread.sleep(3000);
++ // Launch two threads as part of the same thread group
++ first.start();
++ second.start();
++
++ // Wait for the thread group suspend to be issued
++ while (!first.isAlive() || !second.isAlive()) {
++ Thread.sleep(100);
++ }
++ Thread.sleep(1000);
++ // Suppose, the thread group is now suspended
++
++ count = 0;
++ Thread.sleep(1000);
++
++ // Increment of the count indicates that the second thread is still running
+ boolean failed = (count > 1);
+- first.stop(); second.stop();
+- if (failed)
++ first.stop();
++ second.stop();
++ if (failed) {
+ throw new RuntimeException("Failure.");
++ }
+ }
+ }
+--- ./jdk/test/java/lang/instrument/RedefineBigClass.sh Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/instrument/RedefineBigClass.sh Wed May 07 19:26:47 2014 -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
+@@ -22,7 +22,7 @@
+ #
+
+ # @test
+-# @bug 7121600
++# @bug 7121600 8016838
+ # @summary Redefine a big class.
+ # @author Daniel D. Daugherty
+ #
+--- ./jdk/test/java/lang/instrument/RedefineBigClassApp.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/instrument/RedefineBigClassApp.java Wed May 07 19:26:47 2014 -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
+@@ -21,12 +21,21 @@
+ * questions.
+ */
+
++import java.io.*;
++
+ public class RedefineBigClassApp {
++ /**
++ * Memory leak is assumed, if application consumes more than specified amount of memory during its execution.
++ * The number is given in Kb.
++ */
++ private static final long MEM_LEAK_THRESHOLD = 32 * 1024; // 32Mb
++
+ public static void main(String[] args) throws Exception {
+ System.out.println("Creating instance of " +
+ RedefineBigClassAgent.clz);
+ RedefineBigClassAgent.clz.newInstance();
+
++ long vMemBefore = getVMemSize();
+ int count = 0;
+ while (!RedefineBigClassAgent.doneRedefining) {
+ System.out.println("App loop count: " + ++count);
+@@ -37,6 +46,39 @@
+ }
+ System.out.println("App looped " + count + " times.");
+
++ long vMemAfter = getVMemSize();
++ if (vMemBefore == 0 || vMemAfter == 0) {
++ System.err.println("WARNING: Cannot perform memory leak detection on this OS");
++ } else {
++ long vMemDelta = vMemAfter - vMemBefore;
++ if (vMemDelta > MEM_LEAK_THRESHOLD) {
++ System.err.println("FAIL: Virtual memory usage increased by " + vMemDelta + "Kb " +
++ "(greater than " + MEM_LEAK_THRESHOLD + "Kb)");
++ System.exit(1);
++ }
++ System.err.println("PASS: Virtual memory usage increased by " + vMemDelta + "Kb " +
++ "(not greater than " + MEM_LEAK_THRESHOLD + "Kb)");
++ }
+ System.exit(0);
+ }
++
++ /**
++ * Return size of virtual memory allocated to the process in Kb.
++ * Linux specific. On other platforms and in case of any errors return 0.
++ */
++ private static long getVMemSize() {
++
++ // Refer to the Linux proc(5) man page for details about /proc/self/stat file
++ //
++ // In short, this file contains status information about the current process
++ // written in one line. The fields are separated with spaces.
++ // The 23rd field is defined as 'vsize %lu Virtual memory size in bytes'
++
++ try (FileReader fileReader = new FileReader("/proc/self/stat");
++ BufferedReader bufferedReader = new BufferedReader(fileReader)) {
++ String line = bufferedReader.readLine();
++ return Long.parseLong(line.split(" ")[22]) / 1024;
++ } catch (Exception ex) {}
++ return 0;
++ }
+ }
+--- ./jdk/test/java/lang/instrument/RetransformBigClass.sh Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/instrument/RetransformBigClass.sh Wed May 07 19:26:47 2014 -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
+@@ -22,7 +22,7 @@
+ #
+
+ # @test
+-# @bug 7122253
++# @bug 7122253 8016838
+ # @ignore until the fix for 7122253 (from HotSpot) is in a promoted build
+ # @summary Retransform a big class.
+ # @author Daniel D. Daugherty
+--- ./jdk/test/java/lang/instrument/RetransformBigClassApp.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/instrument/RetransformBigClassApp.java Wed May 07 19:26:47 2014 -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
+@@ -21,12 +21,21 @@
+ * questions.
+ */
+
++import java.io.*;
++
+ public class RetransformBigClassApp {
++ /**
++ * Memory leak is assumed, if application consumes more than specified amount of memory during its execution.
++ * The number is given in Kb.
++ */
++ private static final long MEM_LEAK_THRESHOLD = 32 * 1024; // 32Mb
++
+ public static void main(String[] args) throws Exception {
+ System.out.println("Creating instance of " +
+ RetransformBigClassAgent.clz);
+ RetransformBigClassAgent.clz.newInstance();
+
++ long vMemBefore = getVMemSize();
+ int count = 0;
+ while (!RetransformBigClassAgent.doneRetransforming) {
+ System.out.println("App loop count: " + ++count);
+@@ -37,6 +46,39 @@
+ }
+ System.out.println("App looped " + count + " times.");
+
++ long vMemAfter = getVMemSize();
++ if (vMemBefore == 0 || vMemAfter == 0) {
++ System.err.println("WARNING: Cannot perform memory leak detection on this OS");
++ } else {
++ long vMemDelta = vMemAfter - vMemBefore;
++ if (vMemDelta > MEM_LEAK_THRESHOLD) {
++ System.err.println("FAIL: Virtual memory usage increased by " + vMemDelta + "Kb " +
++ "(greater than " + MEM_LEAK_THRESHOLD + "Kb)");
++ System.exit(1);
++ }
++ System.err.println("PASS: Virtual memory usage increased by " + vMemDelta + "Kb " +
++ "(not greater than " + MEM_LEAK_THRESHOLD + "Kb)");
++ }
+ System.exit(0);
+ }
++
++ /**
++ * Return size of virtual memory allocated to the process in Kb.
++ * Linux specific. On other platforms and in case of any errors return 0.
++ */
++ private static long getVMemSize() {
++
++ // Refer to the Linux proc(5) man page for details about /proc/self/stat file
++ //
++ // In short, this file contains status information about the current process
++ // written in one line. The fields are separated with spaces.
++ // The 23rd field is defined as 'vsize %lu Virtual memory size in bytes'
++
++ try (FileReader fileReader = new FileReader("/proc/self/stat");
++ BufferedReader bufferedReader = new BufferedReader(fileReader)) {
++ String line = bufferedReader.readLine();
++ return Long.parseLong(line.split(" ")[22]) / 1024;
++ } catch (Exception ex) {}
++ return 0;
++ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/invoke/8009222/Test8009222.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,49 @@
++/*
++ * 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 8009222
++ * @summary java.lang.IllegalArgumentException: not invocable, no method type
++ * when attempting to get getter method handle for a static field
++ *
++ * @run main/othervm Test8009222
++ */
++
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodHandles;
++
++interface Intf {
++ static int i = 0;
++}
++
++public class Test8009222 {
++ public static void main(String[] args) throws Exception {
++ MethodHandles.lookup()
++ .findStaticGetter(Intf.class, "i", int.class)
++ .getClass(); // null check
++
++ System.out.println("TEST PASSED");
++ }
++}
+--- ./jdk/test/java/lang/invoke/BigArityTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/invoke/BigArityTest.java Wed May 07 19:26:47 2014 -0700
+@@ -26,7 +26,7 @@
+ /* @test
+ * @summary High arity invocations, up to the maximum of 255 arguments
+ * @compile BigArityTest.java
+- * @run junit/othervm -DBigArityTest.ITERATION_COUNT=1 test.java.lang.invoke.BigArityTest
++ * @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -esa -DBigArityTest.ITERATION_COUNT=1 test.java.lang.invoke.BigArityTest
+ */
+
+ package test.java.lang.invoke;
+--- ./jdk/test/java/lang/invoke/CallSiteTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/invoke/CallSiteTest.java Wed May 07 19:26:47 2014 -0700
+@@ -28,7 +28,7 @@
+ *
+ * @build indify.Indify
+ * @compile CallSiteTest.java
+- * @run main/othervm
++ * @run main/othervm/timeout=3600 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies
+ * indify.Indify
+ * --expand-properties --classpath ${test.classes}
+ * --java test.java.lang.invoke.CallSiteTest
+--- ./jdk/test/java/lang/invoke/MethodHandlesTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/invoke/MethodHandlesTest.java Wed May 07 19:26:47 2014 -0700
+@@ -26,7 +26,7 @@
+ /* @test
+ * @summary unit tests for java.lang.invoke.MethodHandles
+ * @compile MethodHandlesTest.java remote/RemoteExample.java
+- * @run junit/othervm test.java.lang.invoke.MethodHandlesTest
++ * @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -esa test.java.lang.invoke.MethodHandlesTest
+ */
+
+ package test.java.lang.invoke;
+--- ./jdk/test/java/lang/invoke/RicochetTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/invoke/RicochetTest.java Wed May 07 19:26:47 2014 -0700
+@@ -25,7 +25,7 @@
+
+ /* @test
+ * @summary unit tests for recursive method handles
+- * @run junit/othervm -DRicochetTest.MAX_ARITY=50 test.java.lang.invoke.RicochetTest
++ * @run junit/othervm/timeout=3600 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -DRicochetTest.MAX_ARITY=10 test.java.lang.invoke.RicochetTest
+ */
+ /*
+ * @ignore The following test creates an unreasonable number of adapters in -Xcomp mode (7049122)
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/invoke/TestCatchExceptionWithVarargs.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,97 @@
++/*
++ * 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.
++ */
++
++/*
++ * @test
++ * @bug 8019184
++ * @summary MethodHandles.catchException() fails when methods have 8 args + varargs
++ */
++
++import java.util.*;
++import java.lang.invoke.*;
++
++public class TestCatchExceptionWithVarargs {
++
++ private static final Class<?> CLASS = TestCatchExceptionWithVarargs.class;
++ private static final int MAX_MH_ARITY = 254;
++
++ public static MethodHandle target;
++ public static MethodHandle handler;
++
++ private static Object firstArg;
++
++ static class MyException extends Exception {
++ }
++
++ public static Object target(Object... a) throws Exception {
++ if (a[0] != firstArg) {
++ throw new AssertionError("first argument different than expected: " + a[0] + " != " + firstArg);
++ }
++ throw new MyException();
++ }
++
++ public static Object handler(Object... a) {
++ if (a[0] != firstArg) {
++ throw new AssertionError("first argument different than expected: " + a[0] + " != " + firstArg);
++ }
++ return a[0];
++ }
++
++ static {
++ try {
++ MethodType mtype = MethodType.methodType(Object.class, Object[].class);
++ target = MethodHandles.lookup().findStatic(CLASS, "target", mtype);
++ handler = MethodHandles.lookup().findStatic(CLASS, "handler", mtype);
++ } catch (Exception e) {
++ throw new AssertionError(e);
++ }
++ }
++
++ public static void main(String[] args) throws Throwable {
++ List<Class<?>> ptypes = new LinkedList<>();
++ ptypes.add(Object[].class);
++
++ // We use MAX_MH_ARITY - 1 here to account for the Object[] argument.
++ for (int i = 1; i < MAX_MH_ARITY - 1; i++) {
++ ptypes.add(0, Object.class);
++
++ MethodHandle targetWithArgs = target.asType(MethodType.methodType(Object.class, ptypes));
++ MethodHandle handlerWithArgs = handler.asType(MethodType.methodType(Object.class, ptypes));
++ handlerWithArgs = MethodHandles.dropArguments(handlerWithArgs, 0, MyException.class);
++
++ MethodHandle gwc1 = MethodHandles.catchException(targetWithArgs, MyException.class, handlerWithArgs);
++
++ // The next line throws an IllegalArgumentException if there is a bug.
++ MethodHandle gwc2 = MethodHandles.catchException(gwc1, MyException.class, handlerWithArgs);
++
++ // This is only to verify that the method handles can actually be invoked and do the right thing.
++ firstArg = new Object();
++ Object o = gwc2.asSpreader(Object[].class, ptypes.size() - 1).invoke(firstArg, new Object[i]);
++ if (o != firstArg) {
++ throw new AssertionError("return value different than expected: " + o + " != " + firstArg);
++ }
++ }
++ }
++}
+--- ./jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java Wed May 07 19:26:47 2014 -0700
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 7024172
++ * @bug 7024172 7067691
+ * @summary Test if proxy for PlatformLoggingMXBean is equivalent
+ * to proxy for LoggingMXBean
+ *
+@@ -36,12 +36,21 @@
+ import java.util.logging.*;
+ import java.util.ArrayList;
+ import java.util.List;
++import java.util.Map;
++import java.util.HashMap;
+
+ public class LoggingMXBeanTest
+ {
+- static String LOGGER_NAME_1 = "com.sun.management.Logger";
+- static String LOGGER_NAME_2 = "com.sun.management.Logger.Logger2";
+- static String UNKNOWN_LOGGER_NAME = "com.sun.management.Unknown";
++ static final String LOGGER_NAME_1 = "com.sun.management.Logger";
++ static final String LOGGER_NAME_2 = "com.sun.management.Logger.Logger2";
++ static final String UNKNOWN_LOGGER_NAME = "com.sun.management.Unknown";
++
++ // These instance variables prevent premature logger garbage collection
++ // See getLogger() weak reference warnings.
++ Logger logger1;
++ Logger logger2;
++
++ static LoggingMXBeanTest test;
+
+ public static void main(String[] argv) throws Exception {
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+@@ -51,7 +60,7 @@
+ LoggingMXBean.class);
+
+ // test LoggingMXBean proxy
+- LoggingMXBeanTest p = new LoggingMXBeanTest(proxy);
++ test = new LoggingMXBeanTest(proxy);
+
+ // check if the attributes implemented by PlatformLoggingMXBean
+ // and LoggingMXBean return the same value
+@@ -64,9 +73,9 @@
+ // same verification as in java/util/logging/LoggingMXBeanTest2
+ public LoggingMXBeanTest(LoggingMXBean mbean) throws Exception {
+
+- Logger logger1 = Logger.getLogger( LOGGER_NAME_1 );
++ logger1 = Logger.getLogger( LOGGER_NAME_1 );
+ logger1.setLevel(Level.FINE);
+- Logger logger2 = Logger.getLogger( LOGGER_NAME_2 );
++ logger2 = Logger.getLogger( LOGGER_NAME_2 );
+ logger2.setLevel(null);
+
+ /*
+@@ -206,20 +215,36 @@
+ PlatformLoggingMXBean mxbean2) {
+ // verify logger names
+ List<String> loggers1 = mxbean1.getLoggerNames();
++ System.out.println("Loggers: " + loggers1);
++
++ // Retrieve the named loggers to prevent them from being
++ // spontaneously gc'ed.
++ Map<String, Logger> loggersMap = new HashMap<>();
++ for (String n : loggers1) {
++ loggersMap.put(n, Logger.getLogger(n));
++ }
++
+ List<String> loggers2 = mxbean2.getLoggerNames();
++
++ // loggers1 and loggers2 should be identical - no new logger should
++ // have been created in between (at least no new logger name)
++ //
+ if (loggers1.size() != loggers2.size())
+ throw new RuntimeException("LoggerNames: unmatched number of entries");
+- List<String> loggers3 = new ArrayList<>(loggers1);
+- loggers3.removeAll(loggers2);
+- if (loggers3.size() != 0)
++ if (!loggers2.containsAll(loggersMap.keySet()))
+ throw new RuntimeException("LoggerNames: unmatched loggers");
+
++
+ // verify logger's level and parent
+ for (String logger : loggers1) {
+- if (!mxbean1.getLoggerLevel(logger)
+- .equals(mxbean2.getLoggerLevel(logger)))
++ String level1 = mxbean1.getLoggerLevel(logger);
++ String level2 = mxbean2.getLoggerLevel(logger);
++ if (!java.util.Objects.equals(level1, level2)) {
+ throw new RuntimeException(
+- "LoggerLevel: unmatched level for " + logger);
++ "LoggerLevel: unmatched level for " + logger
++ + ", " + level1 + ", " + level2);
++ }
++
+ if (!mxbean1.getParentLoggerName(logger)
+ .equals(mxbean2.getParentLoggerName(logger)))
+ throw new RuntimeException(
+--- ./jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java Wed May 07 19:26:47 2014 -0700
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 6876135 7024172
++ * @bug 6876135 7024172 7067691
+ *
+ * @summary Test PlatformLoggingMXBean
+ * This test performs similar testing as
+@@ -41,11 +41,15 @@
+
+ public class PlatformLoggingMXBeanTest
+ {
+-
+ ObjectName objectName = null;
+ static String LOGGER_NAME_1 = "com.sun.management.Logger1";
+ static String LOGGER_NAME_2 = "com.sun.management.Logger2";
+
++ // Use Logger instance variables to prevent premature garbage collection
++ // of weak references.
++ Logger logger1;
++ Logger logger2;
++
+ public PlatformLoggingMXBeanTest() throws Exception {
+ }
+
+@@ -135,8 +139,8 @@
+ System.out.println( "*********** Phase 3 ***********" );
+ System.out.println( "*******************************" );
+ System.out.println( " Create and test new Loggers" );
+- Logger logger1 = Logger.getLogger( LOGGER_NAME_1 );
+- Logger logger2 = Logger.getLogger( LOGGER_NAME_2 );
++ logger1 = Logger.getLogger( LOGGER_NAME_1 );
++ logger2 = Logger.getLogger( LOGGER_NAME_2 );
+
+ // check that Level object are returned properly
+ try {
+@@ -187,6 +191,7 @@
+ System.out.println( " Set and Check the Logger Level" );
+ log1 = false;
+ log2 = false;
++
+ try {
+ // Set the level of logger1 to ALL
+ params = new Object[2];
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/ref/FinalizeOverride.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,167 @@
++/*
++ * 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.ByteArrayOutputStream;
++import java.io.IOException;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++import java.util.concurrent.atomic.AtomicInteger;
++
++/* @test
++ * @bug 8027351
++ * @summary Basic test of the finalize method
++ */
++
++public class FinalizeOverride {
++ // finalizedCount is incremented when the finalize method is invoked
++ private static AtomicInteger finalizedCount = new AtomicInteger();
++
++ // finalizedSum and privateFinalizedInvoke are used to verify
++ // the right overrided finalize method is invoked
++ private static AtomicInteger finalizedSum = new AtomicInteger();
++ private static volatile boolean privateFinalizeInvoked = false;
++
++ public static void main(String[] argvs) throws IOException {
++ patchPrivateFinalize();
++
++ test(new Base(10), 10);
++ test(new Subclass(20), 0);
++ test(new SubSubclass(30), 30);
++ test(new PublicFinalize(40), 40*100+40);
++ test(new PrivateFinalize(50), 50);
++ test(new NoOverride(60), 60);
++ }
++
++ static void test(Object o, int expected) {
++ int count = finalizedCount.get();
++ int sum = finalizedSum.get();
++ privateFinalizeInvoked = false;
++
++ // force GC and finalization
++ o = null;
++ while (finalizedCount.get() != (count+1)) {
++ System.gc();
++ System.runFinalization();
++ }
++
++ if (privateFinalizeInvoked) {
++ throw new RuntimeException("private finalize method invoked");
++ }
++ if (finalizedCount.get() != (count+1)) {
++ throw new RuntimeException("Unexpected count=" + finalizedCount +
++ " expected=" + (count+1));
++ }
++ if (finalizedSum.get() != (sum+expected)) {
++ throw new RuntimeException("Unexpected sum=" + finalizedSum +
++ " prev=" + sum + " value=" + expected);
++ }
++ }
++
++ static void patchPrivateFinalize() throws IOException {
++ // patch the private f_nal_ze method name to "finalize"
++ String testClasses = System.getProperty("test.classes", ".");
++ Path p = Paths.get(testClasses, "FinalizeOverride$PrivateFinalize.class");
++ byte[] bytes = Files.readAllBytes(p);
++ int len = "f_nal_ze".length();
++ for (int i=0; i < bytes.length-len; i++) {
++ if (bytes[i] == 'f' &&
++ bytes[i+1] == '_' &&
++ bytes[i+2] == 'n' &&
++ bytes[i+3] == 'a' &&
++ bytes[i+4] == 'l' &&
++ bytes[i+5] == '_' &&
++ bytes[i+6] == 'z' &&
++ bytes[i+7] == 'e')
++ {
++ // s%_%i%
++ bytes[i+1] = 'i';
++ bytes[i+5] = 'i';
++ break;
++ }
++ }
++ Files.write(p, bytes);
++ }
++
++ static class Base {
++ protected int value;
++ Base(int v) {
++ this.value = v;
++ }
++ int called() {
++ finalizedSum.addAndGet(value);
++ return value;
++ }
++ protected void finalize() {
++ System.out.println("Base.finalize() sum += " + called());
++ finalizedCount.incrementAndGet();
++ }
++ }
++ static class PublicFinalize extends Base {
++ PublicFinalize(int v) {
++ super(v);
++ }
++ public void finalize() {
++ finalizedSum.addAndGet(value * 100);
++ System.out.println("PublicFinalize.finalize() sum += " + called() +
++ "+"+value+"*100");
++ finalizedCount.incrementAndGet();
++ }
++ }
++ static class Subclass extends Base {
++ Subclass(int v) {
++ super(v);
++ }
++ protected void finalize() {
++ // no value added to sum
++ System.out.println("Subclass.finalize() sum += 0");
++ finalizedCount.incrementAndGet();
++ }
++ }
++ static class SubSubclass extends Subclass {
++ SubSubclass(int v) {
++ super(v);
++ }
++ protected final void finalize() {
++ finalizedSum.addAndGet(value);
++ System.out.println("SubSubclass.finalize() sum +=" +value);
++ finalizedCount.incrementAndGet();
++ }
++ }
++ static class PrivateFinalize extends Base {
++ PrivateFinalize(int v) {
++ super(v);
++ }
++ private void f_nal_ze() {
++ // finalization catches any exception
++ System.out.println("Error: private finalize invoked!!");
++ privateFinalizeInvoked = true;
++ finalizedCount.incrementAndGet();
++ }
++ }
++ static class NoOverride extends PrivateFinalize {
++ NoOverride(int v) {
++ super(v);
++ }
++ }
++}
+--- ./jdk/test/java/net/Authenticator/B4769350.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/net/Authenticator/B4769350.java Wed May 07 19:26:47 2014 -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
+@@ -23,9 +23,7 @@
+
+ /**
+ * @test
+- * @bug 4769350
+- * @library ../../../sun/net/www/httptest/
+- * @build HttpCallback HttpServer ClosedChannelList HttpTransaction AbstractCallback
++ * @bug 4769350 8017779
+ * @run main/othervm B4769350 server
+ * @run main/othervm B4769350 proxy
+ * @summary proxy authentication username and password caching only works in serial case
+@@ -34,8 +32,17 @@
+ * tests may already have invoked the HTTP handler.
+ */
+
++import com.sun.net.httpserver.HttpExchange;
++import com.sun.net.httpserver.HttpHandler;
++import com.sun.net.httpserver.HttpServer;
+ import java.io.*;
+ import java.net.*;
++import java.util.concurrent.BrokenBarrierException;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.CyclicBarrier;
++import java.util.concurrent.Executor;
++import java.util.concurrent.ExecutorService;
++import java.util.concurrent.Executors;
+
+ public class B4769350 {
+
+@@ -43,13 +50,12 @@
+ static boolean error = false;
+
+ static void read (InputStream is) throws IOException {
+- int c;
+- while ((c=is.read()) != -1) {
++ while (is.read() != -1) {
+ //System.out.write (c);
+ }
+ }
+
+- static class Client extends Thread {
++ static class Client extends Thread {
+ String authority, path;
+ boolean allowerror;
+
+@@ -64,8 +70,8 @@
+ try {
+ URI u = new URI ("http", authority, path, null, null);
+ URL url = u.toURL();
+- URLConnection urlc = url.openConnection ();
+- InputStream is = urlc.getInputStream ();
++ URLConnection urlc = url.openConnection();
++ InputStream is = urlc.getInputStream();
+ read (is);
+ is.close();
+ } catch (URISyntaxException e) {
+@@ -73,7 +79,8 @@
+ error = true;
+ } catch (IOException e) {
+ if (!allowerror) {
+- System.out.println (Thread.currentThread().getName() + " " + e);
++ System.out.println (Thread.currentThread().getName()
++ + " " + e);
+ e.printStackTrace();
+ error = true;
+ }
+@@ -81,55 +88,58 @@
+ }
+ }
+
+- static class CallBack extends AbstractCallback {
++ class Server implements AutoCloseable {
++ HttpServer server;
++ Executor executor;
++ CyclicBarrier t1Cond1;
++ CyclicBarrier t1Cond2;
+
+- void errorReply (HttpTransaction req, String reply) throws IOException {
+- req.addResponseHeader ("Connection", "close");
+- req.addResponseHeader ("WWW-Authenticate", reply);
+- req.sendResponse (401, "Unauthorized");
+- req.orderlyClose();
++ public String getAddress() {
++ return server.getAddress().getHostName();
+ }
+
+- void proxyReply (HttpTransaction req, String reply) throws IOException {
+- req.addResponseHeader ("Proxy-Authenticate", reply);
+- req.sendResponse (407, "Proxy Authentication Required");
++ public void startServer() {
++ InetSocketAddress addr = new InetSocketAddress(0);
++
++ try {
++ server = HttpServer.create(addr, 0);
++ } catch (IOException ioe) {
++ throw new RuntimeException("Server could not be created");
++ }
++ executor = Executors.newFixedThreadPool(10);
++ server.setExecutor(executor);
++ server.createContext("/test/realm1/t1a",
++ new AuthenticationHandlerT1a() );
++ server.createContext("/test/realm2/t1b",
++ new AuthenticationHandlerT1b());
++ server.createContext("/test/realm1/t1c",
++ new AuthenticationHandlerT1c());
++ server.createContext("/test/realm2/t1d",
++ new AuthenticationHandlerT1d());
++ server.createContext("/test/realm3/t2a",
++ new AuthenticationHandlerT2a());
++ server.createContext("/test/realm3/t2b",
++ new AuthenticationHandlerT2b());
++ server.createContext("/test/realm4/t3a",
++ new AuthenticationHandlerT3a());
++ server.createContext("/test/realm4/t3b",
++ new AuthenticationHandlerT3bc());
++ server.createContext("/test/realm4/t3c",
++ new AuthenticationHandlerT3bc());
++ t1Cond1 = new CyclicBarrier(2);
++ t1Cond2 = new CyclicBarrier(2);
++ server.start();
+ }
+
+- void okReply (HttpTransaction req) throws IOException {
+- req.addResponseHeader ("Connection", "close");
+- req.setResponseEntityBody ("Hello .");
+- req.sendResponse (200, "Ok");
+- req.orderlyClose();
++ public int getPort() {
++ return server.getAddress().getPort();
+ }
+
+- public void request (HttpTransaction req, int count) {
+- try {
+- URI uri = req.getRequestURI();
+- String path = uri.getPath();
+- if (path.endsWith ("/t1a")) {
+- doT1a (req, count);
+- } else if (path.endsWith ("/t1b")) {
+- doT1b (req, count);
+- } else if (path.endsWith ("/t1c")) {
+- doT1c (req, count);
+- } else if (path.endsWith ("/t1d")) {
+- doT1d (req, count);
+- } else if (path.endsWith ("/t2a")) {
+- doT2a (req, count);
+- } else if (path.endsWith ("/t2b")) {
+- doT2b (req, count);
+- } else if (path.endsWith ("/t3a")) {
+- doT3a (req, count);
+- } else if (path.endsWith ("/t3b")) {
+- doT3bc (req, count);
+- } else if (path.endsWith ("/t3c")) {
+- doT3bc (req, count);
+- } else {
+- System.out.println ("unexpected request URI");
+- }
+- } catch (IOException e) {
+- e.printStackTrace();
+- }
++ public void close() {
++ if (executor != null)
++ ((ExecutorService)executor).shutdownNow();
++ if (server != null)
++ server.stop(0);
+ }
+
+ /* T1 tests the client by sending 4 requests to 2 different realms
+@@ -138,90 +148,158 @@
+ * the second requests should be executed without calling the authenticator.
+ * The test succeeds if the authenticator was only called twice.
+ */
+- void doT1a (HttpTransaction req, int count) throws IOException {
+- switch (count) {
+- case 0:
+- errorReply (req, "Basic realm=\"realm1\"");
+- HttpServer.rendezvous ("one", 2);
+- break;
+- case 1:
+- HttpServer.waitForCondition ("cond2");
+- okReply (req);
+- break;
+- default:
+- System.out.println ("Unexpected request");
++ class AuthenticationHandlerT1a implements HttpHandler
++ {
++ volatile int count = -1;
++
++ @Override
++ public void handle(HttpExchange exchange) throws IOException {
++ count++;
++ try {
++ switch(count) {
++ case 0:
++ AuthenticationHandler.errorReply(exchange,
++ "Basic realm=\"realm1\"");
++ break;
++ case 1:
++ t1Cond1.await();
++ t1cond2latch.await();
++ AuthenticationHandler.okReply(exchange);
++ break;
++ default:
++ System.out.println ("Unexpected request");
++ }
++ } catch (InterruptedException |
++ BrokenBarrierException e)
++ {
++ throw new RuntimeException(e);
++ }
+ }
+ }
+
++ class AuthenticationHandlerT1b implements HttpHandler
++ {
++ volatile int count = -1;
+
+- void doT1b (HttpTransaction req, int count) throws IOException {
+- switch (count) {
+- case 0:
+- errorReply (req, "Basic realm=\"realm2\"");
+- HttpServer.rendezvous ("one", 2);
+- HttpServer.setCondition ("cond1");
+- break;
+- case 1:
+- HttpServer.waitForCondition ("cond2");
+- okReply (req);
+- break;
+- default:
+- System.out.println ("Unexpected request");
++ @Override
++ public void handle(HttpExchange exchange) throws IOException {
++ count++;
++ try {
++ switch(count) {
++ case 0:
++ AuthenticationHandler.errorReply(exchange,
++ "Basic realm=\"realm2\"");
++ break;
++ case 1:
++ t1Cond1.await();
++ t1cond1latch.countDown();
++ t1cond2latch.await();
++ AuthenticationHandler.okReply(exchange);
++ break;
++ default:
++ System.out.println ("Unexpected request");
++ }
++ } catch (InterruptedException | BrokenBarrierException e) {
++ throw new RuntimeException(e);
++ }
+ }
+ }
+
+- void doT1c (HttpTransaction req, int count) throws IOException {
+- switch (count) {
+- case 0:
+- errorReply (req, "Basic realm=\"realm1\"");
+- HttpServer.rendezvous ("two", 2);
+- break;
+- case 1:
+- okReply (req);
+- break;
+- default:
+- System.out.println ("Unexpected request");
++ class AuthenticationHandlerT1c implements HttpHandler
++ {
++ volatile int count = -1;
++
++ @Override
++ public void handle(HttpExchange exchange) throws IOException {
++ count++;
++ switch(count) {
++ case 0:
++ AuthenticationHandler.errorReply(exchange,
++ "Basic realm=\"realm1\"");
++ try {
++ t1Cond2.await();
++ } catch (InterruptedException |
++ BrokenBarrierException e)
++ {
++ throw new RuntimeException(e);
++ }
++ break;
++ case 1:
++ AuthenticationHandler.okReply(exchange);
++ break;
++ default:
++ System.out.println ("Unexpected request");
++ }
+ }
+ }
+
+- void doT1d (HttpTransaction req, int count) throws IOException {
+- switch (count) {
+- case 0:
+- errorReply (req, "Basic realm=\"realm2\"");
+- HttpServer.rendezvous ("two", 2);
+- HttpServer.setCondition ("cond2");
+- break;
+- case 1:
+- okReply (req);
+- break;
+- default:
+- System.out.println ("Unexpected request");
++ class AuthenticationHandlerT1d implements HttpHandler
++ {
++ volatile int count = -1;
++
++ @Override
++ public void handle(HttpExchange exchange) throws IOException {
++ count++;
++ switch(count) {
++ case 0:
++ AuthenticationHandler.errorReply(exchange,
++ "Basic realm=\"realm2\"");
++ try {
++ t1Cond2.await();
++ } catch (InterruptedException |
++ BrokenBarrierException e)
++ {
++ throw new RuntimeException(e);
++ }
++ t1cond2latch.countDown();
++ break;
++ case 1:
++ AuthenticationHandler.okReply(exchange);
++ break;
++ default:
++ System.out.println ("Unexpected request");
++ }
+ }
+ }
+
+-
+ /* T2 tests to check that if initial authentication fails, the second will
+ * succeed, and the authenticator is called twice
+ */
+
+- void doT2a (HttpTransaction req, int count) throws IOException {
+- /* This will be called several times */
+- if (count == 1) {
+- HttpServer.setCondition ("T2cond1");
++ class AuthenticationHandlerT2a implements HttpHandler
++ {
++ volatile int count = -1;
++
++ @Override
++ public void handle(HttpExchange exchange) throws IOException {
++ count++;
++ if (count == 1) {
++ t2condlatch.countDown();
++ }
++ AuthenticationHandler.errorReply(exchange,
++ "Basic realm=\"realm3\"");
++
+ }
+- errorReply (req, "Basic realm=\"realm3\"");
+ }
+
+- void doT2b (HttpTransaction req, int count) throws IOException {
+- switch (count) {
+- case 0:
+- errorReply (req, "Basic realm=\"realm3\"");
+- break;
+- case 1:
+- okReply (req);
+- break;
+- default:
+- System.out.println ("Unexpected request");
++ class AuthenticationHandlerT2b implements HttpHandler
++ {
++ volatile int count = -1;
++
++ @Override
++ public void handle(HttpExchange exchange) throws IOException {
++ count++;
++ switch(count) {
++ case 0:
++ AuthenticationHandler.errorReply(exchange,
++ "Basic realm=\"realm3\"");
++ break;
++ case 1:
++ AuthenticationHandler.okReply(exchange);
++ break;
++ default:
++ System.out.println ("Unexpected request");
++ }
+ }
+ }
+
+@@ -229,36 +307,82 @@
+ * resource at same time. Authenticator should be called once for server
+ * and once for proxy
+ */
+- void doT3a (HttpTransaction req, int count) throws IOException {
+- switch (count) {
+- case 0:
+- proxyReply (req, "Basic realm=\"proxy\"");
+- HttpServer.setCondition ("T3cond1");
+- break;
+- case 1:
+- errorReply (req, "Basic realm=\"realm4\"");
+- break;
+- case 2:
+- okReply (req);
+- break;
+- default:
+- System.out.println ("Unexpected request");
++
++ class AuthenticationHandlerT3a implements HttpHandler
++ {
++ volatile int count = -1;
++
++ @Override
++ public void handle(HttpExchange exchange) throws IOException {
++ count++;
++ switch(count) {
++ case 0:
++ AuthenticationHandler.proxyReply(exchange,
++ "Basic realm=\"proxy\"");
++ break;
++ case 1:
++ t3cond1.countDown();
++ AuthenticationHandler.errorReply(exchange,
++ "Basic realm=\"realm4\"");
++ break;
++ case 2:
++ AuthenticationHandler.okReply(exchange);
++ break;
++ default:
++ System.out.println ("Unexpected request");
++ }
+ }
+ }
+
+- void doT3bc (HttpTransaction req, int count) throws IOException {
+- switch (count) {
+- case 0:
+- proxyReply (req, "Basic realm=\"proxy\"");
+- break;
+- case 1:
+- okReply (req);
+- break;
+- default:
+- System.out.println ("Unexpected request");
++ class AuthenticationHandlerT3bc implements HttpHandler
++ {
++ volatile int count = -1;
++
++ @Override
++ public void handle(HttpExchange exchange) throws IOException {
++ count++;
++ switch(count) {
++ case 0:
++ AuthenticationHandler.proxyReply(exchange,
++ "Basic realm=\"proxy\"");
++ break;
++ case 1:
++ AuthenticationHandler.okReply(exchange);
++ break;
++ default:
++ System.out.println ("Unexpected request");
++ }
+ }
+ }
+- };
++ }
++
++ static class AuthenticationHandler {
++ static void errorReply(HttpExchange exchange, String reply)
++ throws IOException
++ {
++ exchange.getResponseHeaders().add("Connection", "close");
++ exchange.getResponseHeaders().add("WWW-Authenticate", reply);
++ exchange.sendResponseHeaders(401, 0);
++ exchange.close();
++ }
++
++ static void proxyReply (HttpExchange exchange, String reply)
++ throws IOException
++ {
++ exchange.getResponseHeaders().add("Proxy-Authenticate", reply);
++ exchange.sendResponseHeaders(407, 0);
++ }
++
++ static void okReply (HttpExchange exchange) throws IOException {
++ exchange.getResponseHeaders().add("Connection", "close");
++ String response = "Hello .";
++ exchange.sendResponseHeaders(200, response.getBytes().length);
++ OutputStream os = exchange.getResponseBody();
++ os.write(response.getBytes());
++ os.close();
++ exchange.close();
++ }
++ }
+
+ static HttpServer server;
+ static MyAuthenticator auth = new MyAuthenticator ();
+@@ -267,7 +391,14 @@
+
+ static Client c1,c2,c3,c4,c5,c6,c7,c8,c9;
+
+- static void doServerTests (String authority) throws Exception {
++ static CountDownLatch t1cond1latch;
++ static CountDownLatch t1cond2latch;
++ static CountDownLatch t2condlatch;
++ static CountDownLatch t3cond1;
++
++ static void doServerTests (String authority, Server server) throws Exception
++ {
++
+ System.out.println ("Doing Server tests");
+ System.out.println ("T1");
+ c1 = new Client (authority, "/test/realm1/t1a", false);
+@@ -275,17 +406,20 @@
+ c3 = new Client (authority, "/test/realm1/t1c", false);
+ c4 = new Client (authority, "/test/realm2/t1d", false);
+
++ t1cond1latch = new CountDownLatch(1);
++ t1cond2latch = new CountDownLatch(1);
+ c1.start(); c2.start();
+- HttpServer.waitForCondition ("cond1");
++ t1cond1latch.await();
+ c3.start(); c4.start();
+ c1.join(); c2.join(); c3.join(); c4.join();
+
+ int f = auth.getCount();
+ if (f != 2) {
+- except ("Authenticator was called "+f+" times. Should be 2");
++ except ("Authenticator was called "+f+" times. Should be 2",
++ server);
+ }
+ if (error) {
+- except ("error occurred");
++ except ("error occurred", server);
+ }
+
+ auth.resetCount();
+@@ -293,73 +427,71 @@
+
+ c5 = new Client (authority, "/test/realm3/t2a", true);
+ c6 = new Client (authority, "/test/realm3/t2b", false);
++ t2condlatch = new CountDownLatch(1);
+ c5.start ();
+- HttpServer.waitForCondition ("T2cond1");
++ t2condlatch.await();
+ c6.start ();
+ c5.join(); c6.join();
+
+ f = auth.getCount();
+ if (f != redirects+1) {
+- except ("Authenticator was called "+f+" times. Should be: " + redirects+1);
++ except ("Authenticator was called "+f+" times. Should be: "
++ + redirects+1, server);
+ }
+ if (error) {
+- except ("error occurred");
++ except ("error occurred", server);
+ }
+ }
+
+- static void doProxyTests (String authority) throws Exception {
++ static void doProxyTests (String authority, Server server) throws Exception
++ {
+ System.out.println ("Doing Proxy tests");
+ c7 = new Client (authority, "/test/realm4/t3a", false);
+ c8 = new Client (authority, "/test/realm4/t3b", false);
+ c9 = new Client (authority, "/test/realm4/t3c", false);
++ t3cond1 = new CountDownLatch(1);
+ c7.start ();
+- HttpServer.waitForCondition ("T3cond1");
++ t3cond1.await();
+ c8.start ();
+ c9.start ();
+ c7.join(); c8.join(); c9.join();
+
+ int f = auth.getCount();
+ if (f != 2) {
+- except ("Authenticator was called "+f+" times. Should be: " + 2);
++ except ("Authenticator was called "+f+" times. Should be: " + 2,
++ server);
+ }
+ if (error) {
+- except ("error occurred");
++ except ("error occurred", server);
+ }
+ }
+
+ public static void main (String[] args) throws Exception {
++ new B4769350().runTest(args[0].equals ("proxy"));
++ }
++
++ public void runTest(boolean proxy) throws Exception {
+ System.setProperty ("http.maxRedirects", Integer.toString (redirects));
+ System.setProperty ("http.auth.serializeRequests", "true");
+ Authenticator.setDefault (auth);
+- boolean proxy = args[0].equals ("proxy");
+- try {
+- server = new HttpServer (new CallBack(), 10, 1, 0);
+- System.out.println ("Server: listening on port: " + server.getLocalPort());
++ try (Server server = new Server()) {
++ server.startServer();
++ System.out.println ("Server: listening on port: "
++ + server.getPort());
+ if (proxy) {
+ System.setProperty ("http.proxyHost", "localhost");
+- System.setProperty ("http.proxyPort",Integer.toString(server.getLocalPort()));
+- doProxyTests ("www.foo.com");
++ System.setProperty ("http.proxyPort",
++ Integer.toString(server.getPort()));
++ doProxyTests ("www.foo.com", server);
+ } else {
+- doServerTests ("localhost:"+server.getLocalPort());
++ doServerTests ("localhost:"+server.getPort(), server);
+ }
+- server.terminate();
++ }
+
+- } catch (Exception e) {
+- if (server != null) {
+- server.terminate();
+- }
+- throw e;
+- }
+ }
+
+- static void pause (int millis) {
+- try {
+- Thread.sleep (millis);
+- } catch (InterruptedException e) {}
+- }
+-
+- public static void except (String s) {
+- server.terminate();
++ public static void except (String s, Server server) {
++ server.close();
+ throw new RuntimeException (s);
+ }
+
+@@ -368,13 +500,10 @@
+ super ();
+ }
+
+- int count = 0;
++ volatile int count = 0;
+
++ @Override
+ public PasswordAuthentication getPasswordAuthentication () {
+- //System.out.println ("Authenticator called: " + getRequestingPrompt());
+- //try {
+- //Thread.sleep (1000);
+- //} catch (InterruptedException e) {}
+ PasswordAuthentication pw;
+ pw = new PasswordAuthentication ("user", "pass1".toCharArray());
+ count ++;
+@@ -386,7 +515,7 @@
+ }
+
+ public int getCount () {
+- return (count);
++ return count;
+ }
+ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/net/IDN/UseSTD3ASCIIRules.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,80 @@
++/*
++ * 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 8023881
++ * @summary IDN.USE_STD3_ASCII_RULES option is too strict to use Unicode
++ * in IDN.toASCII
++ */
++
++import java.net.*;
++
++public class UseSTD3ASCIIRules {
++
++ public static void main(String[] args) throws Exception {
++ // Per Section 4.1, RFC 3490, if the UseSTD3ASCIIRules flag is set,
++ // then perform these checks:
++ //
++ // (a) Verify the absence of non-LDH ASCII code points; that is, the
++ // absence of 0..2C, 2E..2F, 3A..40, 5B..60, and 7B..7F.
++ //
++ // (b) Verify the absence of leading and trailing hyphen-minus; that
++ // is, the absence of U+002D at the beginning and end of the
++ // sequence.
++ String[] illegalNames = {
++ "www.example.com-",
++ "-www.example.com",
++ "-www.example.com-",
++ "www.ex\u002Cmple.com",
++ "www.ex\u007Bmple.com",
++ "www.ex\u007Fmple.com"
++ };
++
++ String[] legalNames = {
++ "www.ex-ample.com",
++ "www.ex\u002Dmple.com", // www.ex-mple.com
++ "www.ex\u007Ample.com", // www.exzmple.com
++ "www.ex\u3042mple.com", // www.xn--exmple-j43e.com
++ "www.\u3042\u3044\u3046.com", // www.xn--l8jeg.com
++ "www.\u793A\u4F8B.com" // www.xn--fsq092h.com
++ };
++
++ for (String name : illegalNames) {
++ try {
++ System.out.println("Convering illegal IDN: " + name);
++ IDN.toASCII(name, IDN.USE_STD3_ASCII_RULES);
++ throw new Exception(
++ "Expected to get IllegalArgumentException for " + name);
++ } catch (IllegalArgumentException iae) {
++ // That's the right behavior.
++ }
++ }
++
++ for (String name : legalNames) {
++ System.out.println("Convering legal IDN: " + name);
++ System.out.println("\tThe ACE form is: " +
++ IDN.toASCII(name, IDN.USE_STD3_ASCII_RULES));
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/net/PlainSocketImpl/CustomSocketImplFactory.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,107 @@
++/*
++ * 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 8024952
++ * @summary ClassCastException in PlainSocketImpl.accept() when using custom socketImpl
++ * @run main/othervm CustomSocketImplFactory
++ */
++
++import java.net.*;
++import java.io.*;
++
++public class CustomSocketImplFactory implements SocketImplFactory {
++
++ @Override
++ public SocketImpl createSocketImpl() {
++ try {
++ SocketImpl s = new CustomSocketImpl();
++ System.out.println("Created " + s);
++ return s;
++ } catch (Exception e) {
++ throw new RuntimeException(e);
++ }
++ }
++
++ public static void main(String[] args) throws Exception {
++
++ Socket.setSocketImplFactory(new CustomSocketImplFactory());
++ try (ServerSocket ss = new ServerSocket(0)) {
++ ss.setSoTimeout(1);
++ ss.accept();
++ System.out.println("PASS");
++ } catch (SocketTimeoutException | NullPointerException e) {
++ // Not a real socket impl
++ }
++ }
++
++ class CustomSocketImpl extends SocketImpl {
++
++ public void create(boolean stream) throws IOException {
++ }
++
++ public void connect(String host, int port) throws IOException {
++ }
++
++ public void connect(InetAddress addr, int port) throws IOException {
++ }
++
++ public void connect(SocketAddress addr, int timeout) throws IOException {
++ }
++
++ public void bind(InetAddress host, int port) throws IOException {
++ }
++
++ public void listen(int backlog) throws IOException {
++ }
++
++ public void accept(SocketImpl s) throws IOException {
++ }
++
++ public InputStream getInputStream() throws IOException {
++ return null;
++ }
++
++ public OutputStream getOutputStream() throws IOException {
++ return null;
++ }
++
++ public int available() throws IOException {
++ return 0;
++ }
++
++ public void close() throws IOException {
++ }
++
++ public void sendUrgentData(int data) throws IOException {
++ }
++
++ public Object getOption(int i) throws SocketException {
++ return null;
++ }
++
++ public void setOption(int i, Object o) throws SocketException {
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/net/ServerSocket/AnotherSelectFdsLimit.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,78 @@
++/*
++ * 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 8035897
++ * @summary FD_SETSIZE should be set on macosx
++ * @run main/othervm AnotherSelectFdsLimit 1023
++ * @run main/othervm AnotherSelectFdsLimit 1024
++ * @run main/othervm AnotherSelectFdsLimit 1025
++ * @run main/othervm AnotherSelectFdsLimit 1600
++ */
++
++import java.io.IOException;
++import java.net.ServerSocket;
++import java.net.SocketTimeoutException;
++import java.util.ArrayList;
++import java.util.List;
++
++public class AnotherSelectFdsLimit {
++ static final int DEFAULT_FDS_TO_USE = 1600;
++
++ public static void main(String [] args) throws Exception {
++ if (!System.getProperty("os.name").contains("OS X")) {
++ System.out.println("Test only run on MAC. Exiting.");
++ return;
++ }
++
++ int fdsToUse = DEFAULT_FDS_TO_USE;
++ if (args.length == 1)
++ fdsToUse = Integer.parseInt(args[0]);
++
++ System.out.println("Using " + fdsToUse + " fds.");
++
++ List<Thread> threads = new ArrayList<>();
++ for (int i=0; i<fdsToUse; i++)
++ threads.add(new WorkerThread());
++
++ for (Thread t : threads)
++ t.start();
++
++ for (Thread t : threads)
++ t.join();
++ }
++
++ static class WorkerThread extends Thread {
++ public void run() {
++ try (ServerSocket ss = new ServerSocket(0)) {
++ ss.setSoTimeout(2000);
++ ss.accept();
++ } catch (SocketTimeoutException x) {
++ // expected
++ } catch (IOException x) {
++ throw new RuntimeException(x);
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/net/ServerSocket/SelectFdsLimit.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,104 @@
++/*
++ * 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 8021820
++ * @summary The total number of file descriptors is limited to
++ * 1024(FDSET_SIZE) on MacOSX (the size of fd array passed to select()
++ * call in java.net classes is limited to this value).
++ * @run main/othervm SelectFdsLimit
++ * @author aleksej.efimov@oracle.com
++ */
++
++import java.io.File;
++import java.io.FileInputStream;
++import java.io.FileNotFoundException;
++import java.io.IOException;
++import java.io.InputStream;
++import java.net.ServerSocket;
++import java.net.SocketTimeoutException;
++
++
++/*
++ * Test must be run in othervm mode to ensure that all files
++ * opened by openFiles() are closed propertly.
++*/
++public class SelectFdsLimit {
++ static final int FDTOOPEN = 1023;
++ static final String TESTFILE = "testfile";
++ static FileInputStream [] testFIS;
++
++ static void prepareTestEnv() throws IOException {
++ File fileToCreate = new File(TESTFILE);
++ if (!fileToCreate.exists())
++ if (!fileToCreate.createNewFile())
++ throw new RuntimeException("Can't create test file");
++ }
++
++ //If there will be some problem (i.e. ulimits on number of opened files will fail)
++ //then this method will fail with exception and test will be considered as
++ //failed. But allocated fds will be released because the test is executed by
++ //dedicated VM (@run main/othervm).
++ static void openFiles(int fn, File f) throws FileNotFoundException, IOException {
++ testFIS = new FileInputStream[FDTOOPEN];
++ for (;;) {
++ if (0 == fn)
++ break;
++ FileInputStream fis = new FileInputStream(f);
++ testFIS[--fn] = fis;
++ }
++ }
++
++ public static void main(String [] args) throws IOException, FileNotFoundException {
++
++ //The bug 8021820 is a Mac specific and because of that test will pass on all
++ //other platforms
++ if (!System.getProperty("os.name").contains("OS X")) {
++ return;
++ }
++
++ //Create test directory with test files
++ prepareTestEnv();
++
++ //Consume FD ids for this java process to overflow the 1024
++ openFiles(FDTOOPEN,new File(TESTFILE));
++
++ //Wait for incoming connection and make the select() used in java.net
++ //classes fail the limitation on FDSET_SIZE
++ ServerSocket socket = new ServerSocket(0);
++
++ //Set the minimal timeout, no one is
++ //going to connect to this server socket
++ socket.setSoTimeout(1);
++
++ // The accept() call will throw SocketException if the
++ // select() has failed due to limitation on fds size,
++ // indicating test failure. A SocketTimeoutException
++ // is expected, so it is caught and ignored, and the test
++ // passes.
++ try {
++ socket.accept();
++ } catch (SocketTimeoutException e) { }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/net/Socket/asyncClose/Race.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,77 @@
++/*
++ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * 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 8006395 8012244
++ * @summary Tests racing code that reads and closes a Socket
++ */
++
++import java.io.InputStream;
++import java.net.ServerSocket;
++import java.net.Socket;
++import java.net.SocketException;
++import java.util.concurrent.Phaser;
++
++// Racey test, will not always fail, but if it does then we have a problem.
++
++public class Race {
++ final static int THREADS = 100;
++
++ public static void main(String[] args) throws Exception {
++ try (ServerSocket ss = new ServerSocket(0)) {
++ final int port = ss.getLocalPort();
++ final Phaser phaser = new Phaser(THREADS + 1);
++ for (int i=0; i<100; i++) {
++ final Socket s = new Socket("localhost", port);
++ s.setSoLinger(false, 0);
++ try (Socket sa = ss.accept()) {
++ sa.setSoLinger(false, 0);
++ final InputStream is = s.getInputStream();
++ Thread[] threads = new Thread[THREADS];
++ for (int j=0; j<THREADS; j++) {
++ threads[j] = new Thread() {
++ public void run() {
++ try {
++ phaser.arriveAndAwaitAdvance();
++ while (is.read() != -1)
++ Thread.sleep(50);
++ } catch (Exception x) {
++ if (!(x instanceof SocketException
++ && x.getMessage().equalsIgnoreCase("socket closed")))
++ x.printStackTrace();
++ // ok, expect Socket closed
++ }
++ }};
++ }
++ for (int j=0; j<100; j++)
++ threads[j].start();
++ phaser.arriveAndAwaitAdvance();
++ s.close();
++ for (int j=0; j<100; j++)
++ threads[j].join();
++ }
++ }
++ }
++ }
++}
+--- ./jdk/test/java/net/URLClassLoader/closetest/CloseTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/net/URLClassLoader/closetest/CloseTest.java Wed May 07 19:26:47 2014 -0700
+@@ -25,7 +25,8 @@
+ * @test
+ * @bug 4167874
+ * @library ../../../../com/sun/net/httpserver
+- * @build FileServerHandler
++ * @library /lib/testlibrary
++ * @build FileServerHandler jdk.testlibrary.FileUtils
+ * @run shell build.sh
+ * @run main/othervm CloseTest
+ * @summary URL-downloaded jar files can consume all available file descriptors
+--- ./jdk/test/java/net/URLClassLoader/closetest/Common.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/net/URLClassLoader/closetest/Common.java Wed May 07 19:26:47 2014 -0700
+@@ -23,6 +23,9 @@
+
+ import java.io.*;
+ import java.net.*;
++import java.nio.file.Files;
++import jdk.testlibrary.FileUtils;
++import static java.nio.file.StandardCopyOption.*;
+
+ public class Common {
+
+@@ -39,42 +42,16 @@
+ if (!src.isFile()) {
+ throw new RuntimeException ("File not found: " + src.toString());
+ }
+- dst.delete();
+- dst.createNewFile();
+- FileInputStream i = new FileInputStream (src);
+- FileOutputStream o = new FileOutputStream (dst);
+- byte[] buf = new byte [1024];
+- int count;
+- while ((count=i.read(buf)) >= 0) {
+- o.write (buf, 0, count);
+- }
+- i.close();
+- o.close();
++ Files.copy(src.toPath(), dst.toPath(), REPLACE_EXISTING);
+ } catch (IOException e) {
+ throw new RuntimeException (e);
+ }
+ }
+
+- static void rm_minus_rf (File path) {
+- if (!path.exists()) {
++ static void rm_minus_rf (File path) throws IOException, InterruptedException {
++ if (!path.exists())
+ return;
+- }
+- if (path.isFile()) {
+- if (!path.delete()) {
+- throw new RuntimeException ("Could not delete " + path);
+- }
+- } else if (path.isDirectory ()) {
+- String[] names = path.list();
+- File[] files = path.listFiles();
+- for (int i=0; i<files.length; i++) {
+- rm_minus_rf (new File(path, names[i]));
+- }
+- if (!path.delete()) {
+- throw new RuntimeException ("Could not delete " + path);
+- }
+- } else {
+- throw new RuntimeException ("Trying to delete something that isn't a file or a directory");
+- }
++ FileUtils.deleteFileTreeWithRetry(path.toPath());
+ }
+
+ static void copyDir (File src, File dst) {
+--- ./jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java Wed May 07 19:26:47 2014 -0700
+@@ -24,6 +24,8 @@
+ /**
+ * @test
+ * @bug 6899919
++ * @library /lib/testlibrary
++ * @build jdk.testlibrary.FileUtils
+ * @run shell build2.sh
+ * @run main/othervm GetResourceAsStream
+ */
+--- ./jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java Wed May 07 19:26:47 2014 -0700
+@@ -36,44 +36,31 @@
+ // number of concurrent completion handlers
+ static final int CONCURRENCY_COUNT = 256;
+
++ // set to true if an I/O operation fails
++ static volatile boolean failed;
++
++ // set to true when the test is done
++ static volatile boolean finished;
++
+ public static void main(String[] args) throws Exception {
+- // all accepted connections are added to a queue
+- final ArrayBlockingQueue<AsynchronousSocketChannel> queue =
+- new ArrayBlockingQueue<AsynchronousSocketChannel>(CONCURRENCY_COUNT);
+-
+ // create listener to accept connections
+- final AsynchronousServerSocketChannel listener =
++ AsynchronousServerSocketChannel listener =
+ AsynchronousServerSocketChannel.open()
+ .bind(new InetSocketAddress(0));
+- listener.accept((Void)null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
+- public void completed(AsynchronousSocketChannel ch, Void att) {
+- queue.add(ch);
+- listener.accept((Void)null, this);
+- }
+- public void failed(Throwable exc, Void att) {
+- }
+- });
+- System.out.println("Listener created.");
+
+- // establish lots of connections
++ // establish connections
++
++ AsynchronousSocketChannel[] clients = new AsynchronousSocketChannel[CONCURRENCY_COUNT];
++ AsynchronousSocketChannel[] peers = new AsynchronousSocketChannel[CONCURRENCY_COUNT];
++
+ int port = ((InetSocketAddress)(listener.getLocalAddress())).getPort();
+ SocketAddress sa = new InetSocketAddress(InetAddress.getLocalHost(), port);
+- AsynchronousSocketChannel[] channels =
+- new AsynchronousSocketChannel[CONCURRENCY_COUNT];
++
+ for (int i=0; i<CONCURRENCY_COUNT; i++) {
+- int attempts = 0;
+- for (;;) {
+- try {
+- channels[i] = AsynchronousSocketChannel.open();
+- channels[i].connect(sa).get();
+- break;
+- } catch (IOException x) {
+- // probably resource issue so back off and retry
+- if (++attempts >= 3)
+- throw x;
+- Thread.sleep(50);
+- }
+- }
++ clients[i] = AsynchronousSocketChannel.open();
++ Future<Void> result = clients[i].connect(sa);
++ peers[i] = listener.accept().get();
++ result.get();
+ }
+ System.out.println("All connection established.");
+
+@@ -81,9 +68,9 @@
+ final CyclicBarrier barrier = new CyclicBarrier(CONCURRENCY_COUNT+1);
+
+ // initiate a read operation on each channel.
+- for (int i=0; i<CONCURRENCY_COUNT; i++) {
++ for (AsynchronousSocketChannel client: clients) {
+ ByteBuffer buf = ByteBuffer.allocateDirect(100);
+- channels[i].read( buf, channels[i],
++ client.read(buf, client,
+ new CompletionHandler<Integer,AsynchronousSocketChannel>() {
+ public void completed(Integer bytesRead, AsynchronousSocketChannel ch) {
+ try {
+@@ -94,23 +81,29 @@
+ }
+ }
+ public void failed(Throwable exc, AsynchronousSocketChannel ch) {
++ failed = true;
++ System.err.println("read failed: " + exc);
++ completed(0, ch);
+ }
+ });
+ }
+ System.out.println("All read operations outstanding.");
+
+ // write data to each of the accepted connections
+- int remaining = CONCURRENCY_COUNT;
+- while (remaining > 0) {
+- AsynchronousSocketChannel ch = queue.take();
+- ch.write(ByteBuffer.wrap("welcome".getBytes())).get();
+- ch.close();
+- remaining--;
++ for (AsynchronousSocketChannel peer: peers) {
++ peer.write(ByteBuffer.wrap("welcome".getBytes())).get();
++ peer.shutdownOutput();
++ peer.close();
+ }
+
+ // wait for all threads to reach the barrier
+ System.out.println("Waiting for all threads to reach barrier");
+ barrier.await();
++
++ // finish up
++ finished = true;
+ listener.close();
++ if (failed)
++ throw new RuntimeException("I/O operation failed, see log for details");
+ }
+ }
+--- ./jdk/test/java/nio/channels/SocketChannel/ShortWrite.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/nio/channels/SocketChannel/ShortWrite.java Wed May 07 19:26:47 2014 -0700
+@@ -22,7 +22,7 @@
+ */
+
+ /* @test
+- * @bug 7176630
++ * @bug 7176630 7074436
+ * @summary Check for short writes on SocketChannels configured in blocking mode
+ */
+
+@@ -40,9 +40,10 @@
+ /**
+ * Returns a checksum on the remaining bytes in the given buffer.
+ */
+- static long computeChecksum(ByteBuffer bb) {
++ static long computeChecksum(ByteBuffer... bufs) {
+ CRC32 crc32 = new CRC32();
+- crc32.update(bb.array());
++ for (int i=0; i<bufs.length; i++)
++ crc32.update(bufs[i].array());
+ return crc32.getValue();
+ }
+
+@@ -71,15 +72,15 @@
+ }
+
+ /**
+- * Run test with a write of the given number of bytes.
++ * Exercise write(ByteBuffer) with given number of bytes.
+ */
+- static void test(ExecutorService pool,
+- SocketChannel source,
+- SocketChannel sink,
+- int size)
++ static void test1(ExecutorService pool,
++ SocketChannel source,
++ SocketChannel sink,
++ int size)
+ throws Exception
+ {
+- System.out.println(size);
++ System.out.println("write(ByteBuffer), size=" + size);
+
+ // random bytes in the buffer
+ ByteBuffer buf = ByteBuffer.allocate(size);
+@@ -101,6 +102,47 @@
+ throw new RuntimeException("Checksum did not match");
+ }
+
++ /**
++ * Exercise write(ByteBuffer[]) with buffers of the given sizes.
++ */
++ static void testN(ExecutorService pool,
++ SocketChannel source,
++ SocketChannel sink,
++ int... sizes)
++ throws Exception
++ {
++ System.out.print("write(ByteBuffer[]), sizes=");
++ for (int size: sizes)
++ System.out.print(size + " ");
++ System.out.println();
++
++ int total = 0;
++ int len = sizes.length;
++ ByteBuffer[] bufs = new ByteBuffer[len];
++ for (int i=0; i<len; i++) {
++ int size = sizes[i];
++ ByteBuffer buf = ByteBuffer.allocate(size);
++ rand.nextBytes(buf.array());
++ bufs[i] = buf;
++ total += size;
++ }
++
++ // submit task to read the bytes
++ Future<Long> result = pool.submit(new Reader(sink, total));
++
++ // write the bytes
++ long n = source.write(bufs);
++ if (n != total)
++ throw new RuntimeException("Short write detected");
++
++ // check the bytes that were received match
++ for (int i=0; i<len; i++)
++ bufs[i].rewind();
++ long expected = computeChecksum(bufs);
++ long actual = result.get();
++ if (actual != expected)
++ throw new RuntimeException("Checksum did not match");
++ }
+
+ public static void main(String[] args) throws Exception {
+ ExecutorService pool = Executors.newSingleThreadExecutor();
+@@ -114,17 +156,47 @@
+ try (SocketChannel source = SocketChannel.open(sa);
+ SocketChannel sink = ssc.accept())
+ {
+- // run tests on sizes around 128k as that is the problem
+- // area on Windows.
++ // Exercise write(BufferBuffer) on sizes around 128k
+ int BOUNDARY = 128 * 1024;
+ for (int size=(BOUNDARY-2); size<=(BOUNDARY+2); size++) {
+- test(pool, source, sink, size);
++ test1(pool, source, sink, size);
+ }
+
+- // run tests on random sizes
++ // Exercise write(BufferBuffer) on random sizes
+ for (int i=0; i<20; i++) {
+ int size = rand.nextInt(1024*1024);
+- test(pool, source, sink, size);
++ test1(pool, source, sink, size);
++ }
++
++ // Exercise write(BufferBuffer[]) on sizes around 128k
++ for (int i=BOUNDARY-2; i<=BOUNDARY+2; i++) {
++ testN(pool, source, sink, i);
++ testN(pool, source, sink, 0, i);
++ testN(pool, source, sink, i, 0);
++ for (int j=BOUNDARY-2; j<=BOUNDARY+2; j++) {
++ testN(pool, source, sink, i, j);
++ testN(pool, source, sink, 0, i, j);
++ testN(pool, source, sink, i, 0, j);
++ testN(pool, source, sink, i, j, 0);
++ for (int k=BOUNDARY-2; k<=BOUNDARY+2; k++) {
++ testN(pool, source, sink, i, j, k);
++ testN(pool, source, sink, 0, i, j, k);
++ testN(pool, source, sink, i, 0, j, k);
++ testN(pool, source, sink, i, j, 0, k);
++ testN(pool, source, sink, i, j, k, 0);
++ }
++ }
++ }
++
++ // Exercise write(BufferBuffer[]) on random sizes
++ // (assumes IOV_MAX >= 8)
++ for (int i=0; i<20; i++) {
++ int n = rand.nextInt(9);
++ int[] sizes = new int[n];
++ for (int j=0; j<n; j++) {
++ sizes[j] = rand.nextInt(1024*1024);
++ }
++ testN(pool, source, sink, sizes);
+ }
+ }
+ }
+--- ./jdk/test/java/nio/file/Files/BytesAndLines.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/nio/file/Files/BytesAndLines.java Wed May 07 19:26:47 2014 -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
+@@ -22,7 +22,9 @@
+ */
+
+ /* @test
+- * @bug 7006126
++ * @bug 7006126 8020669 8024788
++ * @build BytesAndLines PassThroughFileSystem
++ * @run main BytesAndLines
+ * @summary Unit test for methods for Files readAllBytes, readAllLines and
+ * and write methods.
+ */
+@@ -82,6 +84,26 @@
+ write(file, lines, Charset.defaultCharset(), opts);
+ throw new RuntimeException("NullPointerException expected");
+ } catch (NullPointerException ignore) { }
++
++ // read from procfs
++ if (System.getProperty("os.name").equals("Linux")) {
++ // Refer to the Linux proc(5) man page for details about /proc/self/stat file
++ // procfs reports it to be zero sized, even though data can be read from it
++ String statFile = "/proc/self/stat";
++ Path pathStat = Paths.get(statFile);
++ byte[] data = Files.readAllBytes(pathStat);
++ assertTrue(data.length > 0, "Files.readAllBytes('" + statFile + "') failed to read");
++ }
++
++ // test readAllBytes on custom file system
++ Path myfile = PassThroughFileSystem.create().getPath(file.toString());
++ for (int size=0; size<=1024; size+=512) {
++ byte[] b1 = new byte[size];
++ rand.nextBytes(b1);
++ Files.write(myfile, b1);
++ byte[] b2 = Files.readAllBytes(myfile);
++ assertTrue(Arrays.equals(b1, b2), "bytes not equal");
++ }
+ }
+
+
+@@ -174,6 +196,16 @@
+ throw new RuntimeException("NullPointerException expected");
+ } catch (NullPointerException ignore) { }
+
++ // read from procfs
++ if (System.getProperty("os.name").equals("Linux")) {
++ // Refer to the Linux proc(5) man page for details about /proc/self/status file
++ // procfs reports this file to be zero sized, even though data can be read from it
++ String statusFile = "/proc/self/status";
++ Path pathStatus = Paths.get(statusFile);
++ lines = Files.readAllLines(pathStatus, US_ASCII);
++ assertTrue(lines.size() > 0, "Files.readAllLines('" + pathStatus + "') failed to read");
++ }
++
+ } finally {
+ delete(tmpfile);
+ }
+--- ./jdk/test/java/rmi/testlibrary/TestLibrary.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/rmi/testlibrary/TestLibrary.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
++ * 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
+@@ -127,6 +127,33 @@
+ bomb(null, e);
+ }
+
++ /**
++ * Helper method to determine if registry has started
++ *
++ * @param port The port number to check
++ * @param msTimeout The amount of milliseconds to spend checking
++ */
++
++ public static boolean checkIfRegistryRunning(int port, int msTimeout) {
++ long stopTime = System.currentTimeMillis() + msTimeout;
++ do {
++ try {
++ Registry r = LocateRegistry.getRegistry(port);
++ String[] s = r.list();
++ // no exception. We're now happy that registry is running
++ return true;
++ } catch (RemoteException e) {
++ // problem - not ready ? Try again
++ try {
++ Thread.sleep(500);
++ } catch (InterruptedException ie) {
++ // not expected
++ }
++ }
++ } while (stopTime > System.currentTimeMillis());
++ return false;
++ }
++
+ public static String getProperty(String property, String defaultVal) {
+ final String prop = property;
+ final String def = defaultVal;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/Arrays/TimSortStackSize.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,123 @@
++/*
++ * 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 8011944
++ * @summary Test TimSort stack size
++ */
++import java.util.Arrays;
++import java.util.ArrayDeque;
++import java.util.Comparator;
++
++public class TimSortStackSize {
++
++ public static void main(String[] args) {
++ testComparableTimSort();
++ testTimSort();
++ }
++
++ static void testComparableTimSort() {
++ System.out.printf("testComparableTimSort()%n");
++ Arrays.sort(genData());
++ }
++
++ static void testTimSort() {
++ System.out.printf("testTimSort()%n");
++ //Arrays.sort(genData(), Integer::compare);
++ Arrays.sort(genData(),
++ new java.util.Comparator<Integer>() {
++ public int compare(Integer a1, Integer a2){
++ return Integer.compare(a1.intValue(), a2.intValue());
++ }
++ });
++ }
++
++ private static final int MIN = 16;
++
++ private static final int BOUND1 = 2 * MIN + 1;
++ private static final int BOUND2 = BOUND1 + MIN + 2;
++ private static final int BOUND3 = BOUND1 + 1 + BOUND2;
++ private static final int BOUND4 = BOUND2 + 1 + BOUND3;
++ private static final int BOUND5 = BOUND3 + 1 + BOUND4;
++
++ static int build(int size, int B, ArrayDeque<Integer> chunks) {
++ chunks.addFirst(B);
++ if (size < BOUND1) {
++ chunks.addFirst(size);
++ return size;
++ }
++
++ int asize = (size + 2) / 2;
++ if (size >= BOUND2 && asize < BOUND1) {
++ asize = BOUND1;
++ } else if (size >= BOUND3 && asize < BOUND2) {
++ asize = BOUND2;
++ } else if (size >= BOUND4 && asize < BOUND3) {
++ asize = BOUND3;
++ } else if (size >= BOUND5 && asize < BOUND4) {
++ asize = BOUND4;
++ }
++ if (size - asize >= B) {
++ throw new AssertionError(" " + size + " , " + asize + " , " + B);
++ }
++ return build(asize, size - asize, chunks);
++ }
++
++ static Integer[] genData() {
++ ArrayDeque<Integer> chunks = new ArrayDeque<Integer>();
++ chunks.addFirst(MIN);
++
++ int B = MIN + 4;
++ int A = B + MIN + 1;
++
++ for (int i = 0; i < 8; i++) {
++ int eps = build(A, B, chunks);
++ B = B + A + 1;
++ A = B + eps + 1;
++ }
++ chunks.addFirst(B);
++ chunks.addFirst(A);
++ int total = 0;
++ for (Integer len : chunks) {
++ total += len;
++ }
++ int pow = MIN;
++ while (pow < total) {
++ pow += pow;
++ }
++ chunks.addLast(pow - total);
++ System.out.println(" Total: " + total);
++ Integer[] array = new Integer[pow];
++ int off = 0;
++ int pos = 0;
++ for (Integer len : chunks) {
++ for (int i = 0; i < len; i++) {
++ array[pos++] = Integer.valueOf(i == 0 ? 0 : 1);
++ }
++ off++;
++ }
++ return array;
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,71 @@
++/*
++ * 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 8021788
++ * @summary JarInputStream doesn't provide certificates for some file under META-INF
++ */
++
++import java.util.jar.*;
++import java.io.*;
++import java.util.zip.ZipEntry;
++import java.util.zip.ZipOutputStream;
++
++public class ExtraFileInMetaInf {
++ public static void main(String args[]) throws Exception {
++
++ // Create a zip file with 2 entries
++ try (ZipOutputStream zos =
++ new ZipOutputStream(new FileOutputStream("x.jar"))) {
++ zos.putNextEntry(new ZipEntry("META-INF/SUB/file"));
++ zos.write(new byte[10]);
++ zos.putNextEntry(new ZipEntry("x"));
++ zos.write(new byte[10]);
++ zos.close();
++ }
++
++ // Sign it
++ new File("ks").delete();
++ sun.security.tools.KeyTool.main(
++ ("-keystore ks -storepass changeit -keypass changeit " +
++ "-alias a -dname CN=A -genkeypair").split(" "));
++ sun.security.tools.JarSigner.main(
++ "-keystore ks -storepass changeit x.jar a".split(" "));
++
++ // Check if the entries are signed
++ try (JarInputStream jis =
++ new JarInputStream(new FileInputStream("x.jar"))) {
++ JarEntry je;
++ while ((je = jis.getNextJarEntry()) != null) {
++ String name = je.toString();
++ if (name.equals("META-INF/SUB/file") || name.equals("x")) {
++ while (jis.read(new byte[1000]) >= 0);
++ if (je.getCertificates() == null) {
++ throw new Exception(name + " not signed");
++ }
++ }
++ }
++ }
++ }
++}
+--- ./jdk/test/java/util/logging/LevelResourceBundle.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/util/logging/LevelResourceBundle.java Wed May 07 19:26:47 2014 -0700
+@@ -33,15 +33,19 @@
+
+ public class LevelResourceBundle {
+ public static void main(String args[]) throws Exception {
+- final String name = "SEVERE";
+- String en = getLocalizedMessage(Locale.getDefault(), name);
+- String fr = getLocalizedMessage(Locale.FRANCE, name);
++ final String key = "SEVERE";
++ final String name = "Severe";
++ String en = getLocalizedMessage(Locale.getDefault(), key);
++ String fr = getLocalizedMessage(Locale.FRANCE, key);
+ if (!name.equals(en)) {
+ throw new RuntimeException("Expect " + name + " equals " + en);
+ }
+ if (name.equals(fr)) {
+ throw new RuntimeException("Expect " + name + " not equals " + fr);
+ }
++ if (key.equals(fr)) {
++ throw new RuntimeException("Expect " + key + " not equals " + fr);
++ }
+ }
+
+ private static final String RBNAME = "sun.util.logging.resources.logging";
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/logging/LocalizedLevelName.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,103 @@
++/*
++ * 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.*;
++import java.util.logging.*;
++
++/*
++ * @test
++ * @bug 8016127 8024131
++ * @summary test logging.properties localized
++ * @run main/othervm LocalizedLevelName
++ */
++
++public class LocalizedLevelName {
++ private static Object[] namesMap = {
++ "SEVERE", Locale.ENGLISH, "Severe", Level.SEVERE,
++ "WARNING", Locale.FRENCH, "Avertissement", Level.WARNING,
++ "INFO", Locale.ITALIAN, "Informazioni", Level.INFO,
++ "SEVERE", Locale.FRENCH, "Grave", Level.SEVERE,
++ "CONFIG", Locale.GERMAN, "Konfiguration", Level.CONFIG,
++ "ALL", Locale.ROOT, "All", Level.ALL,
++ "SEVERE", Locale.ROOT, "Severe", Level.SEVERE,
++ "WARNING", Locale.ROOT, "Warning", Level.WARNING,
++ "CONFIG", Locale.ROOT, "Config", Level.CONFIG,
++ "INFO", Locale.ROOT, "Info", Level.INFO,
++ "FINE", Locale.ROOT, "Fine", Level.FINE,
++ "FINER", Locale.ROOT, "Finer", Level.FINER,
++ "FINEST", Locale.ROOT, "Finest", Level.FINEST
++ };
++
++ public static void main(String args[]) throws Exception {
++ Locale defaultLocale = Locale.getDefault();
++ for (int i=0; i<namesMap.length; i += 4) {
++ final String key = (String) namesMap[i];
++ final Locale locale = (Locale) namesMap[i+1];
++ final String expectedTranslation = (String) namesMap[i+2];
++ final Level level = (Level) namesMap[i+3];
++
++ final String en = getLocalizedMessage(Locale.ENGLISH, key);
++ final String other = getLocalizedMessage(locale, key);
++
++ System.out.println(locale + ": " + key + "=" + expectedTranslation
++ + ", (Level." + level.getName() + ")");
++ System.out.println(" => localized(" + Locale.ENGLISH + ", "
++ + key + ")=" + en);
++ System.out.println(" => localized(" + locale + ", " + key
++ + ")=" + other);
++ if (!key.equals(en.toUpperCase(Locale.ROOT))) {
++ throw new RuntimeException("Expect " + key
++ + " equals upperCase(" + en + ")");
++ }
++ if (!Locale.ENGLISH.equals(locale) && !Locale.ROOT.equals(locale)
++ && key.equals(other.toUpperCase(Locale.ROOT))) {
++ throw new RuntimeException("Expect " + key
++ + " not equals upperCase(" + other +")");
++ }
++ if ((Locale.ENGLISH.equals(locale) || Locale.ROOT.equals(locale))
++ && !key.equals(other.toUpperCase(Locale.ROOT))) {
++ throw new RuntimeException("Expect " + key
++ + " equals upperCase(" + other +")");
++ }
++ if (!other.equals(expectedTranslation)) {
++ throw new RuntimeException("Expected \"" + expectedTranslation
++ + "\" for '" + locale + "' but got \"" + other + "\"");
++ }
++ Locale.setDefault(locale);
++ final String levelName = level.getLocalizedName();
++ System.out.println("Level.getLocalizedName() is: " + levelName);
++ if (!levelName.equals(other.toUpperCase(locale))) {
++ throw new RuntimeException("Expected \""
++ + other.toUpperCase(locale) + "\" for '"
++ + locale + "' but got \"" + levelName + "\"");
++ }
++ Locale.setDefault(defaultLocale);
++ }
++ }
++
++ private static final String RBNAME = "sun.util.logging.resources.logging";
++ private static String getLocalizedMessage(Locale locale, String key) {
++ ResourceBundle rb = ResourceBundle.getBundle(RBNAME, locale);
++ return rb.getString(key);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/logging/TestGetLoggerNPE.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,91 @@
++/*
++ * 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.PrintStream;
++import java.security.Permission;
++import java.security.Policy;
++import java.security.ProtectionDomain;
++import java.util.logging.LogManager;
++import java.util.logging.Logger;
++import sun.awt.SunToolkit;
++
++/*
++ * @test
++ * @bug 8025512
++ *
++ * @summary NPE with logging while launching webstart
++ *
++ * @build TestGetLoggerNPE
++ * @run main/othervm TestGetLoggerNPE getLogger
++ * @run main/othervm TestGetLoggerNPE getLogManager
++ */
++public class TestGetLoggerNPE {
++ static volatile Throwable thrown = null;
++ static volatile sun.awt.AppContext context = null;
++ public static void main(String[] args) throws Exception {
++ final String testCase = args.length == 0 ? "getLogger" : args[0];
++ final ThreadGroup tg = new ThreadGroup("TestGroup");
++ Thread t = new Thread(tg, "test") {
++ public void run() {
++ try {
++ context = SunToolkit.createNewAppContext();
++ final PrintStream out = System.out;
++ System.setOut(null);
++ try {
++ if ("getLogger".equals(testCase)) {
++ Logger.getLogger("sun.plugin");
++ } else {
++ LogManager.getLogManager();
++ }
++ } finally {
++ System.setOut(out);
++ }
++
++ System.out.println(Logger.global);
++ } catch (Throwable x) {
++ x.printStackTrace();
++ thrown = x;
++ }
++ }
++ };
++ Policy.setPolicy(new Policy() {
++ public boolean implies(ProtectionDomain domain,
++ Permission permission) {
++ return true; // all permissions
++ }
++ });
++ System.setSecurityManager(new SecurityManager());
++ t.start();
++ t.join();
++ if (context != null && !context.isDisposed()) {
++ context.dispose();
++ }
++ if (thrown == null) {
++ System.out.println("PASSED: " + testCase);
++ } else {
++ System.err.println("FAILED: " + testCase);
++ throw new Error("Test failed: " + testCase + " - " + thrown, thrown);
++ }
++
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/logging/TestLogConfigurationDeadLock.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,256 @@
++/*
++ * 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.lang.management.ManagementFactory;
++import java.lang.management.ThreadInfo;
++import java.security.Permission;
++import java.security.Policy;
++import java.security.ProtectionDomain;
++import java.util.ArrayList;
++import java.util.List;
++import java.util.concurrent.atomic.AtomicLong;
++import java.util.logging.LogManager;
++import java.util.logging.Logger;
++
++
++/**
++ * @test
++ * @bug 8029281 8027670
++ * @summary Synchronization issues in Logger and LogManager. This test
++ * focusses more particularly on potential deadlock in
++ * drainLoggerRefQueueBounded / readConfiguration
++ * @run main/othervm TestLogConfigurationDeadLock
++ * @author danielfuchs
++ */
++// This test is a best effort to try & detect issues. The test itself will run
++// for 8secs. This is usually unsufficient to detect issues.
++// To get a greater confidence it is recommended to run this test in a loop:
++// e.g. use something like:
++// $ while jtreg -jdk:$JDK -verbose:all \
++// test/java/util/logging/TestLogConfigurationDeadLock.java ; \
++// do echo Running test again ; done
++// and let it run for a few hours...
++//
++public class TestLogConfigurationDeadLock {
++
++ static volatile Exception thrown = null;
++ static volatile boolean goOn = true;
++
++ static final int READERS = 2;
++ static final int LOGGERS = 2;
++ static final long TIME = 4 * 1000; // 4 sec.
++ static final long STEP = 1 * 1000; // message every 1 sec.
++ static final int LCOUNT = 50; // 50 loggers created in a row...
++ static final AtomicLong nextLogger = new AtomicLong(0);
++ static final AtomicLong readCount = new AtomicLong(0);
++ static final AtomicLong checkCount = new AtomicLong(0);
++
++ /**
++ * This test will run both with and without a security manager.
++ *
++ * The test starts a number of threads that will call
++ * LogManager.readConfiguration() concurrently (ReadConf), then starts
++ * a number of threads that will create new loggers concurrently
++ * (AddLogger), and then two additional threads: one (Stopper) that
++ * will stop the test after 4secs (TIME ms), and one DeadlockDetector
++ * that will attempt to detect deadlocks.
++ * If after 4secs no deadlock was detected and no exception was thrown
++ * then the test is considered a success and passes.
++ *
++ * This procedure is done twice: once without a security manager and once
++ * again with a security manager - which means the test takes ~8secs to
++ * run.
++ *
++ * Note that 8sec may not be enough to detect issues if there are some.
++ * This is a best effort test.
++ *
++ * @param args the command line arguments
++ */
++ public static void main(String[] args) throws Exception {
++
++ // test without security
++ System.out.println("No security");
++ test();
++
++ // test with security
++ System.out.println("\nWith security");
++ Policy.setPolicy(new Policy() {
++ @Override
++ public boolean implies(ProtectionDomain domain, Permission permission) {
++ if (super.implies(domain, permission)) return true;
++ // System.out.println("Granting " + permission);
++ return true; // all permissions
++ }
++ });
++ System.setSecurityManager(new SecurityManager());
++ test();
++ }
++
++ /**
++ * Starts all threads, wait 4secs, then stops all threads.
++ * @throws Exception if a deadlock was detected or an error occurred.
++ */
++ public static void test() throws Exception {
++ goOn = true;
++ thrown = null;
++ long sNextLogger = nextLogger.get();
++ long sReadCount = readCount.get();
++ long sCheckCount = checkCount.get();
++ List<Thread> threads = new ArrayList<>();
++ for (int i = 0; i<READERS; i++) {
++ threads.add(new ReadConf());
++ }
++ for (int i = 0; i<LOGGERS; i++) {
++ threads.add(new AddLogger());
++ }
++ threads.add(new DeadlockDetector());
++ threads.add(0, new Stopper(TIME));
++ for (Thread t : threads) {
++ t.start();
++ }
++ for (Thread t : threads) {
++ try {
++ t.join();
++ } catch (Exception x) {
++ fail(x);
++ }
++ }
++ if (thrown != null) {
++ throw thrown;
++ }
++ System.out.println("Passed: " + (nextLogger.get() - sNextLogger)
++ + " loggers created by " + LOGGERS + " Thread(s),");
++ System.out.println("\t LogManager.readConfiguration() called "
++ + (readCount.get() - sReadCount) + " times by " + READERS
++ + " Thread(s).");
++ System.out.println("\t ThreadMXBean.findDeadlockedThreads called "
++ + (checkCount.get() -sCheckCount) + " times by 1 Thread.");
++
++ }
++
++
++ final static class ReadConf extends Thread {
++ @Override
++ public void run() {
++ while (goOn) {
++ try {
++ LogManager.getLogManager().readConfiguration();
++ readCount.incrementAndGet();
++ Thread.sleep(1);
++ } catch (Exception x) {
++ fail(x);
++ }
++ }
++ }
++ }
++
++ final static class AddLogger extends Thread {
++ @Override
++ public void run() {
++ try {
++ while (goOn) {
++ Logger l;
++ Logger foo = Logger.getLogger("foo");
++ Logger bar = Logger.getLogger("foo.bar");
++ for (int i=0; i < LCOUNT ; i++) {
++ l = Logger.getLogger("foo.bar.l"+nextLogger.incrementAndGet());
++ l.fine("I'm fine");
++ if (!goOn) break;
++ Thread.sleep(1);
++ }
++ }
++ } catch (InterruptedException | RuntimeException x ) {
++ fail(x);
++ }
++ }
++ }
++
++ final static class DeadlockDetector extends Thread {
++
++ @Override
++ public void run() {
++ while(goOn) {
++ try {
++ long[] ids = ManagementFactory.getThreadMXBean().findDeadlockedThreads();
++ checkCount.incrementAndGet();
++ ids = ids == null ? new long[0] : ids;
++ if (ids.length == 1) {
++ throw new RuntimeException("Found 1 deadlocked thread: "+ids[0]);
++ } else if (ids.length > 0) {
++ ThreadInfo[] infos = ManagementFactory.getThreadMXBean()
++ .getThreadInfo(ids, Integer.MAX_VALUE);
++ System.err.println("Found "+ids.length+" deadlocked threads: ");
++ for (ThreadInfo inf : infos) {
++ System.err.println(inf.toString());
++ }
++ throw new RuntimeException("Found "+ids.length+" deadlocked threads");
++ }
++ Thread.sleep(100);
++ } catch(InterruptedException | RuntimeException x) {
++ fail(x);
++ }
++ }
++ }
++
++ }
++
++ static final class Stopper extends Thread {
++ long start;
++ long time;
++
++ Stopper(long time) {
++ start = System.currentTimeMillis();
++ this.time = time;
++ }
++
++ @Override
++ public void run() {
++ try {
++ long rest, previous;
++ previous = time;
++ while (goOn && (rest = start - System.currentTimeMillis() + time) > 0) {
++ if (previous == time || previous - rest >= STEP) {
++ Logger.getLogger("remaining").info(String.valueOf(rest)+"ms remaining...");
++ previous = rest == time ? rest -1 : rest;
++ System.gc();
++ }
++ if (goOn == false) break;
++ Thread.sleep(Math.min(rest, 100));
++ }
++ System.out.println(System.currentTimeMillis() - start
++ + " ms elapsed ("+time+ " requested)");
++ goOn = false;
++ } catch(InterruptedException | RuntimeException x) {
++ fail(x);
++ }
++ }
++
++ }
++
++ static void fail(Exception x) {
++ x.printStackTrace();
++ if (thrown == null) {
++ thrown = x;
++ }
++ goOn = false;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,340 @@
++/*
++ * 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.PrintStream;
++import java.lang.management.ManagementFactory;
++import java.lang.management.ThreadInfo;
++import java.security.Permission;
++import java.security.Policy;
++import java.security.ProtectionDomain;
++import java.util.ArrayList;
++import java.util.Collections;
++import java.util.HashSet;
++import java.util.List;
++import java.util.Random;
++import java.util.Set;
++import java.util.concurrent.atomic.AtomicLong;
++import java.util.logging.Level;
++import java.util.logging.LogManager;
++import java.util.logging.Logger;
++
++
++/**
++ * @test
++ * @bug 8027670 8029281
++ * @summary Deadlock in drainLoggerRefQueueBounded / readConfiguration
++ * caused by synchronization issues in Logger and LogManager.
++ * @run main/othervm TestLogConfigurationDeadLockWithConf
++ * @author danielfuchs
++ */
++// This test is a best effort to try & detect issues. The test itself will run
++// for 8secs. This is usually sufficient to detect issues.
++// However to get a greater confidence it is recommended to run this test in a loop:
++// e.g. use something like:
++// $ while jtreg -jdk:$JDK -verbose:all \
++// test/java/util/logging/TestLogConfigurationDeadLockWithConf.java ; \
++// do echo Running test again ; done
++// and let it run for a few hours...
++//
++public class TestLogConfigurationDeadLockWithConf {
++
++ static volatile Exception thrown = null;
++ static volatile boolean goOn = true;
++
++ static final int READERS = 2;
++ static final int LOGGERS = 2;
++ static final long TIME = 4 * 1000; // 4 sec.
++ static final long STEP = 1 * 1000; // message every 1 sec.
++ static final int LCOUNT = 50; // 50 loggers created in a row...
++ static final AtomicLong nextLogger = new AtomicLong(0);
++ static final AtomicLong readCount = new AtomicLong(0);
++ static final AtomicLong checkCount = new AtomicLong(0);
++
++ /**
++ * This test will run both with and without a security manager.
++ *
++ * The test starts a number of threads that will call
++ * LogManager.readConfiguration() concurrently (ReadConf), then starts
++ * a number of threads that will create new loggers concurrently
++ * (AddLogger), and then two additional threads: one (Stopper) that
++ * will stop the test after 4secs (TIME ms), and one DeadlockDetector
++ * that will attempt to detect deadlocks.
++ * If after 4secs no deadlock was detected and no exception was thrown
++ * then the test is considered a success and passes.
++ *
++ * This procedure is done twice: once without a security manager and once
++ * again with a security manager - which means the test takes ~8secs to
++ * run.
++ *
++ * Note that 8sec may not be enough to detect issues if there are some.
++ * This is a best effort test.
++ *
++ * @param args the command line arguments
++ * @throws java.lang.Exception if the test fails.
++ */
++ public static void main(String[] args) throws Exception {
++ File config = new File(System.getProperty("test.src", "."),
++ "deadlockconf.properties");
++ if (!config.canRead()) {
++ System.err.println("Can't read config file: test cannot execute.");
++ System.err.println("Please check your test environment: ");
++ System.err.println("\t -Dtest.src=" + System.getProperty("test.src", "."));
++ System.err.println("\t config file is: " + config.getAbsolutePath());
++ throw new RuntimeException("Can't read config file: "
++ + config.getAbsolutePath());
++ }
++
++ System.setProperty("java.util.logging.config.file",
++ config.getAbsolutePath());
++
++ // test without security
++ System.out.println("No security");
++ test();
++
++ // test with security
++ System.out.println("\nWith security");
++ Policy.setPolicy(new Policy() {
++ @Override
++ public boolean implies(ProtectionDomain domain, Permission permission) {
++ if (super.implies(domain, permission)) return true;
++ // System.out.println("Granting " + permission);
++ return true; // all permissions
++ }
++ });
++ System.setSecurityManager(new SecurityManager());
++ test();
++ }
++
++ static Random rand = new Random(System.currentTimeMillis());
++ private static int getBarCount() {
++ return rand.nextInt(10);
++ }
++
++ /**
++ * Starts all threads, wait 4secs, then stops all threads.
++ * @throws Exception if a deadlock was detected or an error occurred.
++ */
++ public static void test() throws Exception {
++ goOn = true;
++ thrown = null;
++ long sNextLogger = nextLogger.get();
++ long sReadCount = readCount.get();
++ long sCheckCount = checkCount.get();
++ List<Thread> threads = new ArrayList<>();
++ for (int i = 0; i<READERS; i++) {
++ threads.add(new ReadConf());
++ }
++ for (int i = 0; i<LOGGERS; i++) {
++ threads.add(new AddLogger());
++ }
++ DeadlockDetector detector = new DeadlockDetector();
++ threads.add(detector);
++ threads.add(0, new Stopper(TIME));
++ for (Thread t : threads) {
++ t.start();
++ }
++
++ // wait for the detector to finish.
++ detector.join();
++
++ final PrintStream out = thrown == null ? System.out : System.err;
++
++ // Try to wait for all threads to finish.
++ // This is a best effort: if some threads are in deadlock we can't
++ // obviously wait for them, and other threads may have joined in
++ // the deadlock since we last checked.
++ // However, all threads which are succeptible of deadlocking
++ // extend DeamonThread.
++ for (Thread t : threads) {
++ if (t == detector) {
++ continue;
++ }
++ if (detector.deadlocked.contains(t.getId())) {
++ out.println("Skipping deadlocked thread "
++ + t.getClass().getSimpleName() + ": " + t);
++ continue; // don't wait for deadlocked thread: they won't terminate
++ }
++ try {
++ if (detector.deadlocked.isEmpty()) {
++ t.join();
++ } else {
++ if (t instanceof DaemonThread) {
++ // Some other threads may have join the deadlock.
++ // don't wait forever.
++ t.join(100);
++ } else {
++ // Those threads that don't extend DaemonThread
++ // should be safe from deadlock.
++ out.println("Waiting for "
++ + t.getClass().getSimpleName() + ": " + t);
++ t.join();
++ }
++ }
++ } catch (Exception x) {
++ fail(x);
++ }
++ }
++ out.println("All threads joined.");
++
++ final String status = thrown == null ? "Passed" : "FAILED";
++
++ out.println(status + ": " + (nextLogger.get() - sNextLogger)
++ + " loggers created by " + LOGGERS + " Thread(s),");
++ out.println("\t LogManager.readConfiguration() called "
++ + (readCount.get() - sReadCount) + " times by " + READERS
++ + " Thread(s).");
++ out.println("\t ThreadMXBean.findDeadlockedThreads called "
++ + (checkCount.get() -sCheckCount) + " times by 1 Thread.");
++
++ if (thrown != null) {
++ out.println("\t Error is: "+thrown.getMessage());
++ throw thrown;
++ }
++ }
++
++ static class DaemonThread extends Thread {
++ public DaemonThread() {
++ this.setDaemon(true);
++ }
++ }
++
++ final static class ReadConf extends DaemonThread {
++ @Override
++ public void run() {
++ while (goOn) {
++ try {
++ LogManager.getLogManager().readConfiguration();
++ readCount.incrementAndGet();
++ Thread.sleep(1);
++ } catch (Exception x) {
++ fail(x);
++ }
++ }
++ }
++ }
++
++ final static class AddLogger extends DaemonThread {
++ @Override
++ public void run() {
++ try {
++ while (goOn) {
++ Logger l;
++ int barcount = getBarCount();
++ for (int i=0; i < LCOUNT ; i++) {
++ l = Logger.getLogger("foo.bar"+barcount+".l"+nextLogger.incrementAndGet());
++ l.fine("I'm fine");
++ if (!goOn) break;
++ Thread.sleep(1);
++ }
++ }
++ } catch (InterruptedException | RuntimeException x ) {
++ fail(x);
++ }
++ }
++ }
++
++ final static class DeadlockDetector extends Thread {
++
++ final Set<Long> deadlocked = Collections.synchronizedSet(new HashSet<Long>());
++
++ static List<Long> asList(long... ids) {
++ final List<Long> list = new ArrayList<>(ids.length);
++ for (long id : ids) {
++ list.add(id);
++ }
++ return list;
++ }
++
++ @Override
++ public void run() {
++ while(goOn) {
++ try {
++ long[] ids = ManagementFactory.getThreadMXBean().findDeadlockedThreads();
++ checkCount.incrementAndGet();
++ ids = ids == null ? new long[0] : ids;
++ if (ids.length > 0) {
++ deadlocked.addAll(asList(ids));
++ }
++ if (ids.length == 1) {
++ throw new RuntimeException("Found 1 deadlocked thread: "+ids[0]);
++ } else if (ids.length > 0) {
++ ThreadInfo[] infos = ManagementFactory.getThreadMXBean().getThreadInfo(ids, Integer.MAX_VALUE);
++ System.err.println("Found "+ids.length+" deadlocked threads: ");
++ for (ThreadInfo inf : infos) {
++ System.err.println(inf.toString());
++ }
++ throw new RuntimeException("Found "+ids.length+" deadlocked threads");
++ }
++ Thread.sleep(100);
++ } catch(InterruptedException | RuntimeException x) {
++ fail(x);
++ }
++ }
++ }
++
++ }
++
++ static final class Stopper extends Thread {
++ long start;
++ long time;
++
++ static final Logger logger = Logger.getLogger("remaining");
++
++ Stopper(long time) {
++ start = System.currentTimeMillis();
++ this.time = time;
++ }
++
++ @Override
++ public void run() {
++ try {
++ long rest, previous;
++ previous = time;
++ while (goOn && (rest = start - System.currentTimeMillis() + time) > 0) {
++ if (previous == time || previous - rest >= STEP) {
++ logger.log(Level.INFO,
++ "{0}ms remaining...", String.valueOf(rest));
++ previous = rest == time ? rest -1 : rest;
++ System.gc();
++ }
++ if (goOn == false) break;
++ Thread.sleep(Math.min(rest, 100));
++ }
++ System.out.println(System.currentTimeMillis() - start
++ + " ms elapsed ("+time+ " requested)");
++ goOn = false;
++ } catch(InterruptedException | RuntimeException x) {
++ fail(x);
++ }
++ }
++
++ }
++
++ static void fail(Exception x) {
++ x.printStackTrace();
++ if (thrown == null) {
++ thrown = x;
++ }
++ goOn = false;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/logging/TestLoggerBundleSync.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,535 @@
++/*
++ * 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.lang.management.ManagementFactory;
++import java.lang.management.ThreadInfo;
++import java.security.Permission;
++import java.security.Policy;
++import java.security.ProtectionDomain;
++import java.util.ArrayList;
++import java.util.List;
++import java.util.ListResourceBundle;
++import java.util.Objects;
++import java.util.ResourceBundle;
++import java.util.concurrent.Callable;
++import java.util.concurrent.ExecutorService;
++import java.util.concurrent.Executors;
++import java.util.concurrent.FutureTask;
++import java.util.concurrent.atomic.AtomicLong;
++import java.util.logging.Handler;
++import java.util.logging.Level;
++import java.util.logging.LogRecord;
++import java.util.logging.Logger;
++
++/**
++ * @test
++ * @bug 8029281 8028763
++ * @summary Attempts to detect synchronization issues with getResourceBundle()
++ * and getResourceBundleName(). It might also detect issues in the way
++ * that the logger tree is cleaned up after a logger has been garbage
++ * collected. This test helped find the root cause of 8029092, so if
++ * this test fails one might also expect failures in
++ * java/util/logging/Logger/logrb/TestLogrbResourceBundle.java and
++ * java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java.
++ * Note that this is a best effort test. Running it in a loop to
++ * reproduce intermittent issues can be a good idea.
++ * @run main/othervm TestLoggerBundleSync
++ * @author danielfuchs
++ */
++public class TestLoggerBundleSync {
++
++ static volatile Exception thrown = null;
++ static volatile boolean goOn = true;
++
++ static final int READERS = 3;
++ static final long TIME = 4 * 1000; // 4 sec.
++ static final long STEP = 1 * 1000; // message every 1 sec.
++ static final int LCOUNT = 50; // change bundle 50 times...
++ static final AtomicLong setRBcount = new AtomicLong(0);
++ static final AtomicLong setRBNameCount = new AtomicLong(0);
++ static final AtomicLong getRBcount = new AtomicLong(0);
++ static final AtomicLong checkCount = new AtomicLong(0);
++ static final AtomicLong nextLong = new AtomicLong(0);
++
++ public static class MyBundle extends ListResourceBundle {
++ @Override
++ protected Object[][] getContents() {
++ return new Object[][] {
++ {"dummy", "foo"}
++ };
++ }
++ }
++
++ public static final class MyBundle1 extends MyBundle { };
++ public static final class MyBundle2 extends MyBundle { };
++ public static final class MyBundle3 extends MyBundle { };
++
++
++ public static final class LoggerRB {
++ public final String resourceBundleName;
++ public final ResourceBundle userBundle;
++ public LoggerRB(String name, ResourceBundle bundle) {
++ resourceBundleName = name;
++ userBundle = bundle;
++ }
++ }
++
++ static final List<Class<? extends ResourceBundle>> classes = new ArrayList<>();
++ static {
++ classes.add(MyBundle1.class);
++ classes.add(MyBundle2.class);
++ classes.add(MyBundle3.class);
++ }
++
++
++ /**
++ * This test will run both with and without a security manager.
++ *
++ * The test starts a number of threads that will attempt to concurrently
++ * set resource bundles on Logger, and verifies the consistency of the
++ * obtained results.
++ *
++ * This is a best effort test.
++ *
++ * @param args the command line arguments
++ */
++ public static void main(String[] args) throws Exception {
++
++ try {
++ // test without security
++ System.out.println("No security");
++ test();
++
++ // test with security
++ System.out.println("\nWith security");
++ Policy.setPolicy(new Policy() {
++ @Override
++ public boolean implies(ProtectionDomain domain, Permission permission) {
++ if (super.implies(domain, permission)) return true;
++ // System.out.println("Granting " + permission);
++ return true; // all permissions
++ }
++ });
++ System.setSecurityManager(new SecurityManager());
++ test();
++ } finally {
++ SetRB.executor.shutdownNow();
++ SetRBName.executor.shutdownNow();
++ }
++ }
++
++ /**
++ * Starts all threads, wait 15secs, then stops all threads.
++ * @throws Exception if a deadlock was detected or an error occurred.
++ */
++ public static void test() throws Exception {
++ goOn = true;
++ thrown = null;
++ long sGetRBCount = getRBcount.get();
++ long sSetRBCount = setRBcount.get();
++ long sSetRBNameCount = setRBNameCount.get();
++ long sCheckCount = checkCount.get();
++ long sNextLong = nextLong.get();
++ List<Thread> threads = new ArrayList<>();
++ for (Class<? extends ResourceBundle> type : classes) {
++ threads.add(new SetRB(type));
++ threads.add(new SetRBName(type));
++ }
++ for (int i =0 ; i < READERS ; i++) {
++ threads.add(new GetRB());
++ }
++ threads.add(new DeadlockDetector());
++ threads.add(0, new Stopper(TIME));
++ for (Thread t : threads) {
++ t.start();
++ }
++ for (Thread t : threads) {
++ try {
++ t.join();
++ } catch (Exception x) {
++ fail(x);
++ }
++ }
++ if (thrown != null) {
++ throw thrown;
++ }
++ System.out.println("Passed: " + (nextLong.longValue() - sNextLong)
++ + " unique loggers created");
++ System.out.println("\t " +(getRBcount.get() - sGetRBCount)
++ + " loggers tested by " + READERS + " Thread(s),");
++ System.out.println("\t " + (setRBcount.get() - sSetRBCount)
++ + " resource bundles set by " + classes.size() + " Thread(s),");
++ System.out.println("\t " + (setRBNameCount.get() - sSetRBNameCount)
++ + " resource bundle names set by " + classes.size() + " Thread(s),");
++ System.out.println("\t ThreadMXBean.findDeadlockedThreads called "
++ + (checkCount.get() -sCheckCount) + " times by 1 Thread.");
++
++ }
++
++ final static class GetRB extends Thread {
++ final static class MyHandler extends Handler {
++ volatile ResourceBundle rb;
++ volatile String rbName;
++ @Override
++ public synchronized void publish(LogRecord record) {
++ rb = record.getResourceBundle();
++ rbName = record.getResourceBundleName();
++ }
++
++ @Override
++ public void flush() {
++ }
++
++ @Override
++ public void close() throws SecurityException {
++ }
++ };
++ final MyHandler handler = new MyHandler();
++ @Override
++ public void run() {
++ try {
++ handler.setLevel(Level.FINEST);
++ while (goOn) {
++ Logger l;
++ Logger foo = Logger.getLogger("foo");
++ Logger bar = Logger.getLogger("foo.bar");
++ for (long i=0; i < nextLong.longValue() + 100 ; i++) {
++ if (!goOn) break;
++ l = Logger.getLogger("foo.bar.l"+i);
++ final ResourceBundle b = l.getResourceBundle();
++ final String name = l.getResourceBundleName();
++ if (b != null) {
++ if (!name.equals(b.getClass().getName())) {
++ throw new RuntimeException("Unexpected bundle name: "
++ +b.getClass().getName());
++ }
++ }
++ Logger ll = Logger.getLogger(l.getName()+".bie.bye");
++ ResourceBundle hrb;
++ String hrbName;
++ ll.setLevel(Level.FINEST);
++ ll.addHandler(handler);
++ ll.fine("dummy");
++ ll.removeHandler(handler);
++ hrb = handler.rb;
++ hrbName = handler.rbName;
++ if (name != null) {
++ if (!name.equals(hrbName)) {
++ throw new RuntimeException("Unexpected bundle name: "
++ +hrb.getClass().getName());
++ }
++ if (!name.equals(hrb.getClass().getName())) {
++ throw new RuntimeException("Unexpected bundle name: "
++ +hrb.getClass().getName());
++ }
++ }
++
++ getRBcount.incrementAndGet();
++ if (!goOn) break;
++ Thread.sleep(1);
++ }
++ }
++ } catch (Exception x) {
++ fail(x);
++ }
++ }
++ }
++
++ final static class SetRB extends Thread {
++ final Class<? extends ResourceBundle> type;
++ final static ExecutorService executor = Executors.newSingleThreadExecutor();
++ final static class CheckRBTask implements Callable<Exception> {
++ final Logger logger;
++ volatile String rbName;
++ volatile ResourceBundle rb;
++
++ public CheckRBTask(Logger logger) {
++ this.logger = logger;
++ }
++
++ @Override
++ public Exception call() throws Exception {
++ try {
++ final String name = logger.getResourceBundleName();
++ if (!Objects.equals(name, rbName)) {
++ throw new RuntimeException("Unexpected rbname for "
++ + logger.getName() + ": " + name);
++ }
++ final ResourceBundle b = logger.getResourceBundle();
++ if (b != rb) {
++ throw new RuntimeException("Unexpected rb for "
++ + logger.getName() + ": " + b);
++ }
++ } catch(Exception x) {
++ return x;
++ }
++ return null;
++ }
++
++ public void check() throws Exception {
++ final FutureTask<Exception> futureTask = new FutureTask<>(this);
++ executor.submit(futureTask);
++ Exception x = futureTask.get();
++ if ( x != null) {
++ throw new RuntimeException("Check failed: "+x,x);
++ }
++ }
++ }
++ SetRB(Class<? extends ResourceBundle> type) {
++ super("SetRB["+type.getSimpleName()+"]");
++ this.type = type;
++ }
++ @Override
++ public void run() {
++ try {
++ while (goOn) {
++ Logger l;
++ Logger foo = Logger.getLogger("foo");
++ Logger bar = Logger.getLogger("foo.bar");
++ l = Logger.getLogger("foo.bar.l"+nextLong.incrementAndGet());
++ final CheckRBTask checkTask = new CheckRBTask(l);
++ checkTask.check();
++ Logger l1 = l;
++
++ for (int i=0; i < LCOUNT ; i++) {
++ if (!goOn) break;
++
++ ResourceBundle b = ResourceBundle.getBundle(type.getName());
++ try {
++ l = Logger.getLogger(l1.getName(), type.getName());
++ checkTask.rb = b;
++ checkTask.rbName = type.getName();
++ checkTask.check();
++ if (!goOn) break;
++
++ String name = l.getResourceBundleName();
++ ResourceBundle bb = l.getResourceBundle();
++ if (!type.getName().equals(name)) {
++ throw new RuntimeException(this.getName()
++ + ": Unexpected name: "+name);
++ }
++ if (!b.getClass().getName().equals(name)) {
++ throw new RuntimeException(this.getName()
++ + ": Unexpected base name: " +
++ b.getClass().getName());
++ }
++ if (b != bb) {
++ throw new RuntimeException(this.getName()
++ + ": Unexpected bundle: "+bb);
++ }
++ setRBcount.incrementAndGet();
++ } catch (IllegalArgumentException x) {
++ final String name = l.getResourceBundleName();
++ if (!name.startsWith(MyBundle.class.getName())) {
++ throw new RuntimeException(this.getName()
++ + ": Unexpected name: "+name, x);
++ } else if (type.getName().equals(name)) {
++ throw new RuntimeException(this.getName()
++ + ": Unexpected exception for "+name, x);
++ }
++ throw x;
++ }
++ l.fine("I'm fine");
++ if (!goOn) break;
++ Thread.sleep(1);
++ }
++ }
++ } catch (Exception x) {
++ fail(x);
++ }
++ }
++ }
++
++ final static class SetRBName extends Thread {
++ int nexti = 0;
++ final Class<? extends ResourceBundle> type;
++ final static ExecutorService executor = Executors.newSingleThreadExecutor();
++ final static class CheckRBNameTask implements Callable<Exception> {
++ final Logger logger;
++ volatile String rbName;
++
++ public CheckRBNameTask(Logger logger) {
++ this.logger = logger;
++ }
++
++ @Override
++ public Exception call() throws Exception {
++ try {
++ final String name = logger.getResourceBundleName();
++ if (!Objects.equals(name, rbName)) {
++ throw new RuntimeException("Unexpected rbname for "
++ + logger.getName() + ": " + name);
++ }
++ final ResourceBundle b = logger.getResourceBundle();
++ if (!Objects.equals(b == null ? null : b.getClass().getName(), rbName)) {
++ throw new RuntimeException("Unexpected base name for "
++ + logger.getName() + ": " + b.getClass().getName());
++ }
++ } catch(Exception x) {
++ return x;
++ }
++ return null;
++ }
++
++ public void check() throws Exception {
++ final FutureTask<Exception> futureTask = new FutureTask<>(this);
++ executor.submit(futureTask);
++ Exception x = futureTask.get();
++ if ( x != null) {
++ throw new RuntimeException("Check failed: "+x,x);
++ }
++ }
++
++ }
++ SetRBName(Class<? extends ResourceBundle> type) {
++ super("SetRB["+type.getSimpleName()+"]");
++ this.type = type;
++ }
++ @Override
++ public void run() {
++ try {
++ while (goOn) {
++ Logger foo = Logger.getLogger("foo");
++ Logger bar = Logger.getLogger("foo.bar");
++ Logger l = Logger.getLogger("foo.bar.l"+nextLong.incrementAndGet());
++ final CheckRBNameTask checkTask = new CheckRBNameTask(l);
++ checkTask.check();
++
++ for (int i=0; i < LCOUNT ; i++) {
++ if (!goOn) break;
++
++ try {
++ Logger l2 = Logger.getLogger(l.getName(), type.getName());
++ if (l2 != l) {
++ System.err.println("**** ERROR WITH "+l.getName());
++ throw new RuntimeException("l2 != l ["
++ + l2 + "(" + l2.getName() + ") != "
++ + l + "(" + l.getName() + ")]");
++ }
++ checkTask.rbName = type.getName();
++ checkTask.check();
++ if (!goOn) break;
++
++ String name = l.getResourceBundleName();
++ ResourceBundle bb = l.getResourceBundle();
++ if (!type.getName().equals(name)) {
++ throw new RuntimeException(this.getName()
++ + ": Unexpected name: "+name);
++ }
++ if (!bb.getClass().getName().equals(name)) {
++ throw new RuntimeException(this.getName()
++ + ": Unexpected base name: "
++ + bb.getClass().getName());
++ }
++ setRBNameCount.incrementAndGet();
++ } catch (IllegalArgumentException x) {
++ final String name = l.getResourceBundleName();
++ if (!name.startsWith(MyBundle.class.getName())) {
++ throw new RuntimeException(this.getName()
++ + ": Unexpected name: "+name, x);
++ } else if (type.getName().equals(name)) {
++ throw new RuntimeException(this.getName()
++ + ": Unexpected exception for "+name, x);
++ }
++ throw x;
++ }
++ l.fine("I'm fine");
++ if (!goOn) break;
++ Thread.sleep(1);
++ }
++ }
++ } catch (Exception x) {
++ fail(x);
++ }
++ }
++ }
++
++ final static class DeadlockDetector extends Thread {
++
++ @Override
++ public void run() {
++ while(goOn) {
++ try {
++ long[] ids = ManagementFactory.getThreadMXBean().findDeadlockedThreads();
++ checkCount.incrementAndGet();
++ ids = ids == null ? new long[0] : ids;
++ if (ids.length == 1) {
++ throw new RuntimeException("Found 1 deadlocked thread: "+ids[0]);
++ } else if (ids.length > 0) {
++ ThreadInfo[] infos = ManagementFactory.getThreadMXBean().getThreadInfo(ids);
++ System.err.println("Found "+ids.length+" deadlocked threads: ");
++ for (ThreadInfo inf : infos) {
++ System.err.println(inf.toString());
++ }
++ throw new RuntimeException("Found "+ids.length+" deadlocked threads");
++ }
++ Thread.sleep(100);
++ } catch(InterruptedException | RuntimeException x) {
++ fail(x);
++ }
++ }
++ }
++
++ }
++
++ static final class Stopper extends Thread {
++ long start;
++ long time;
++
++ Stopper(long time) {
++ start = System.currentTimeMillis();
++ this.time = time;
++ }
++
++ @Override
++ public void run() {
++ try {
++ long rest, previous;
++ previous = time;
++ while (goOn && (rest = start - System.currentTimeMillis() + time) > 0) {
++ if (previous == time || previous - rest >= STEP) {
++ Logger.getLogger("remaining").info(String.valueOf(rest)+"ms remaining...");
++ previous = rest == time ? rest -1 : rest;
++ System.gc();
++ }
++ if (goOn == false) break;
++ Thread.sleep(Math.min(rest, 100));
++ }
++ System.out.println(System.currentTimeMillis() - start
++ + " ms elapsed ("+time+ " requested)");
++ goOn = false;
++ } catch(InterruptedException | RuntimeException x) {
++ fail(x);
++ }
++ }
++
++ }
++
++ static void fail(Exception x) {
++ x.printStackTrace();
++ if (thrown == null) {
++ thrown = x;
++ }
++ goOn = false;
++ }
++}
+--- ./jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java Wed May 07 19:26:47 2014 -0700
+@@ -59,9 +59,32 @@
+ private static int numFail = 0;
+ private static List<String> msgs = new ArrayList<>();
+
++ // This test has been falling in timeout - so we're adding some
++ // time stamp here and there to help diagnose whether it's a
++ // simple system slowness or whether there's a deeper issue,
++ // like a deadlock. The timeout issue should be fixed now,
++ // but we leave the time stamps in case it reappears.
++ //
++ static final long stamp = System.currentTimeMillis();
++ private static String getTimeStamp() {
++ long time = System.currentTimeMillis();
++ long delta = time - stamp;
++ long min = delta/60000;
++ long sec = (delta - min * 60000) / 10000;
++ long msec = delta - min * 60000 - sec * 1000;
++ return (min == 0 ? "" : (min + " min. ")) +
++ (sec == 0 ? "" : (sec + " sec. ")) +
++ (msec == 0 ? "" : (msec + "ms."));
++ }
++
+ public static void main(String[] args) throws Throwable {
++ System.out.println("ResourceBundleSearchTest starting: "+getTimeStamp());
+ ResourceBundleSearchTest test = new ResourceBundleSearchTest();
+- test.runTests();
++ try {
++ test.runTests();
++ } finally {
++ System.out.println("ResourceBundleSearchTest terminated: "+getTimeStamp());
++ }
+ }
+
+ private void runTests() throws Throwable {
+@@ -82,7 +105,8 @@
+ // Test 1 - can we find a Logger bundle from doing a stack search?
+ // We shouldn't be able to
+ // unless -Djdk.logging.allowStackWalkSearch=true is set
+-
++ int testnb = 1;
++ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
+ boolean allowStackWalkSearch = Boolean.getBoolean("jdk.logging.allowStackWalkSearch");
+ if (allowStackWalkSearch) {
+ assertTrue(testGetBundleFromStackSearch(), "1-testGetBundleFromStackSearch");
+@@ -93,6 +117,7 @@
+
+ // Test 2 - can we find a Logger bundle off of the Thread context class
+ // loader? We should be able to.
++ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
+ assertTrue(testGetBundleFromTCCL(TCCL_TEST_BUNDLE, rbClassLoader),
+ "2-testGetBundleFromTCCL");
+
+@@ -100,6 +125,7 @@
+ // able to. We'll first check to make sure the setup is correct and
+ // it actually is on the classpath before checking whether logging
+ // can see it there.
++ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
+ if (isOnClassPath(PROP_RB_NAME, myClassLoader)) {
+ debug("We should be able to see " + PROP_RB_NAME + " on the classpath");
+ assertTrue(testGetBundleFromSystemClassLoader(PROP_RB_NAME),
+@@ -111,17 +137,20 @@
+
+ // Test 4 - we should be able to find a bundle from the caller's
+ // classloader, but only one level up.
++ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
+ assertTrue(testGetBundleFromCallersClassLoader(),
+ "4-testGetBundleFromCallersClassLoader");
+
+ // Test 5 - this ensures that getAnonymousLogger(String rbName)
+ // can find the bundle from the caller's classloader
++ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
+ assertTrue(testGetAnonymousLogger(), "5-testGetAnonymousLogger");
+
+ // Test 6 - first call getLogger("myLogger").
+ // Then call getLogger("myLogger","bundleName") from a different ClassLoader
+ // Make sure we find the bundle
+ if (!allowStackWalkSearch) {
++ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
+ assertTrue(testGetBundleFromSecondCallersClassLoader(),
+ "6-testGetBundleFromSecondCallersClassLoader");
+ }
+@@ -144,6 +173,7 @@
+ public void assertTrue(boolean testResult, String testName) {
+ if (testResult) {
+ numPass++;
++ System.out.println("PASSED: " + testName);
+ } else {
+ numFail++;
+ System.out.println("FAILED: " + testName
+@@ -154,6 +184,7 @@
+ public void assertFalse(boolean testResult, String testName) {
+ if (!testResult) {
+ numPass++;
++ System.out.println("PASSED: " + testName);
+ } else {
+ numFail++;
+ System.out.println("FAILED: " + testName
+@@ -182,12 +213,10 @@
+ debug("Looking for " + bundleName + " using TCCL");
+ LoggingThread lr = new LoggingThread(bundleName, setOnTCCL);
+ lr.start();
+- synchronized (lr) {
+- try {
+- lr.wait();
+- } catch (InterruptedException ex) {
+- throw ex;
+- }
++ try {
++ lr.join();
++ } catch (InterruptedException ex) {
++ throw ex;
+ }
+ msgs.add(lr.msg);
+ return lr.foundBundle;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/util/logging/deadlockconf.properties Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,22 @@
++# This file is used by TestLogConfigurationDeadLockWithConf
++handlers= java.util.logging.ConsoleHandler
++.level= INFO
++java.util.logging.ConsoleHandler.level = INFO
++java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
++
++
++foo.bar0.level = INFO
++foo.bar1.level = INFO
++foo.bar2.level = INFO
++foo.bar3.level = INFO
++foo.bar4.level = INFO
++
++# We leave foo.bar5 out so that we have at least
++# one logger whose parent won't be in the configuration
++# file
++#foo.bar5.level = INFO
++
++foo.bar6.level = INFO
++foo.bar7.level = INFO
++foo.bar8.level = INFO
++foo.bar9.level = INFO
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,216 @@
++/*
++ * 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 javax.management.MBeanAttributeInfo;
++import javax.management.MBeanConstructorInfo;
++import javax.management.MBeanFeatureInfo;
++import javax.management.MBeanInfo;
++import javax.management.MBeanNotificationInfo;
++import javax.management.MBeanOperationInfo;
++import javax.management.MBeanParameterInfo;
++import javax.management.modelmbean.DescriptorSupport;
++import javax.management.openmbean.SimpleType;
++
++/*
++ * @test
++ * @bug 8023954
++ * @summary Test that MBean*Info.equals do not throw NPE
++ * @author Shanliang JIANG
++ * @run clean MBeanInfoEqualsNPETest
++ * @run build MBeanInfoEqualsNPETest
++ * @run main MBeanInfoEqualsNPETest
++ */
++public class MBeanInfoEqualsNPETest {
++ private static int failed = 0;
++
++ public static void main(String[] args) throws Exception {
++ System.out.println("---MBeanInfoEqualsNPETest-main ...");
++
++ // ----
++ System.out.println("\n---Testing on MBeanAttributeInfo...");
++ MBeanAttributeInfo mbeanAttributeInfo0 = new MBeanAttributeInfo(
++ "name", SimpleType.INTEGER.getClassName(), "description", true, true, false);
++ MBeanAttributeInfo mbeanAttributeInfo = new MBeanAttributeInfo(
++ null, SimpleType.INTEGER.getClassName(), "description", true, true, false);
++ test(mbeanAttributeInfo0, mbeanAttributeInfo, "class name");
++
++ mbeanAttributeInfo = new MBeanAttributeInfo(
++ "name", null, "description", true, true, false);
++ test(mbeanAttributeInfo0, mbeanAttributeInfo, "type");
++
++ mbeanAttributeInfo = new MBeanAttributeInfo(
++ "name", SimpleType.INTEGER.getClassName(), null, true, true, false);
++ test(mbeanAttributeInfo0, mbeanAttributeInfo, "description");
++
++ // ----
++ System.out.println("\n---Testing on MBeanConstructorInfo...");
++ MBeanConstructorInfo mbeanConstructorInfo0 = new MBeanConstructorInfo(
++ "", "", new MBeanParameterInfo[]{}, new DescriptorSupport());
++ MBeanConstructorInfo mbeanConstructorInfo = new MBeanConstructorInfo(
++ null, "", new MBeanParameterInfo[]{}, new DescriptorSupport());
++ test(mbeanConstructorInfo0, mbeanConstructorInfo, "name");
++
++ mbeanConstructorInfo = new MBeanConstructorInfo(
++ "", null, new MBeanParameterInfo[]{}, new DescriptorSupport());
++ test(mbeanConstructorInfo0, mbeanConstructorInfo, "description");
++
++ mbeanConstructorInfo = new MBeanConstructorInfo(
++ "", "", null, new DescriptorSupport());
++ test(mbeanConstructorInfo0, mbeanConstructorInfo, "MBeanParameterInfo");
++
++ mbeanConstructorInfo = new MBeanConstructorInfo(
++ "", "", new MBeanParameterInfo[]{}, null);
++ test(mbeanConstructorInfo0, mbeanConstructorInfo, "descriptor");
++
++ // ----
++ System.out.println("\n---Testing on MBeanOperationInfo...");
++ MBeanOperationInfo mbeanOperationInfo0 = new MBeanOperationInfo(
++ "name", "description", new MBeanParameterInfo[]{}, "type",
++ MBeanOperationInfo.UNKNOWN, new DescriptorSupport());
++
++ MBeanOperationInfo mbeanOperationInfo = new MBeanOperationInfo(
++ null, "description", new MBeanParameterInfo[]{}, "type",
++ MBeanOperationInfo.UNKNOWN, new DescriptorSupport());
++ test(mbeanOperationInfo0, mbeanOperationInfo, "name");
++
++ mbeanOperationInfo = new MBeanOperationInfo(
++ "name", null, new MBeanParameterInfo[]{}, "type",
++ MBeanOperationInfo.UNKNOWN, new DescriptorSupport());
++ test(mbeanOperationInfo0, mbeanOperationInfo, "description");
++
++ mbeanOperationInfo = new MBeanOperationInfo(
++ "name", "description", null, "type", 1, new DescriptorSupport());
++ test(mbeanOperationInfo0, mbeanOperationInfo, "MBeanParameterInfo");
++
++ mbeanOperationInfo = new MBeanOperationInfo(
++ "name", "description", new MBeanParameterInfo[]{}, null,
++ MBeanOperationInfo.UNKNOWN, new DescriptorSupport());
++ test(mbeanOperationInfo0, mbeanOperationInfo, "type");
++
++ mbeanOperationInfo = new MBeanOperationInfo(
++ "name", "description", new MBeanParameterInfo[]{}, null,
++ MBeanOperationInfo.UNKNOWN, null);
++ test(mbeanOperationInfo0, mbeanOperationInfo, "Descriptor");
++
++ // ----
++ System.out.println("\n---Testing on MBeanParameterInfo...");
++ MBeanParameterInfo mbeanParameterInfo0 = new MBeanParameterInfo(
++ "name", "type", "description", new DescriptorSupport());
++ MBeanParameterInfo mbeanParameterInfo = new MBeanParameterInfo(
++ null, "type", "description", new DescriptorSupport());
++ test(mbeanParameterInfo0, mbeanParameterInfo, "name");
++
++ mbeanParameterInfo = new MBeanParameterInfo(
++ "name", null, "description", new DescriptorSupport());
++ test(mbeanParameterInfo0, mbeanParameterInfo, "type");
++
++ mbeanParameterInfo = new MBeanParameterInfo(
++ "name", "type", null, new DescriptorSupport());
++ test(mbeanParameterInfo0, mbeanParameterInfo, "description");
++
++ mbeanParameterInfo = new MBeanParameterInfo(
++ "name", "type", "description", null);
++ test(mbeanParameterInfo0, mbeanParameterInfo, "Descriptor");
++
++ // ----
++ System.out.println("\n---Testing on MBeanFeatureInfo ...");
++ MBeanFeatureInfo mbeanFeatureInfo0 = new MBeanFeatureInfo(
++ "name", "description", new DescriptorSupport());
++ MBeanFeatureInfo mbeanFeatureInfo = new MBeanFeatureInfo(
++ null, "description", new DescriptorSupport());
++ test(mbeanFeatureInfo0, mbeanFeatureInfo, "name");
++
++ mbeanFeatureInfo = new MBeanFeatureInfo(
++ "name", null, new DescriptorSupport());
++ test(mbeanParameterInfo0, mbeanParameterInfo, "description");
++
++ mbeanFeatureInfo = new MBeanFeatureInfo(
++ "name", "description", null);
++ test(mbeanParameterInfo0, mbeanParameterInfo, "Descriptor");
++
++ // ----
++ System.out.println("\n---Testing on MBeanInfo...");
++ String className = "toto";
++ String description = "titi";
++ MBeanAttributeInfo[] attrInfos = new MBeanAttributeInfo[]{};
++ MBeanConstructorInfo[] constrInfos = new MBeanConstructorInfo[]{};
++ MBeanOperationInfo[] operaInfos = new MBeanOperationInfo[]{};
++ MBeanNotificationInfo[] notifInfos = new MBeanNotificationInfo[]{};
++
++ MBeanInfo minfo0 = new MBeanInfo("toto", description, attrInfos, constrInfos, operaInfos, notifInfos);
++ MBeanInfo minfo = new MBeanInfo(null, description, attrInfos, constrInfos, operaInfos, notifInfos);
++ test(minfo0, minfo, "class name");
++
++ minfo = new MBeanInfo(className, null, attrInfos, constrInfos, operaInfos, notifInfos);
++ test(minfo0, minfo, "description");
++
++ minfo = new MBeanInfo(className, description, null, constrInfos, operaInfos, notifInfos);
++ test(minfo0, minfo, "attrInfos");
++
++ minfo = new MBeanInfo(className, description, attrInfos, null, operaInfos, notifInfos);
++ test(minfo0, minfo, "constrInfos");
++
++ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, null, notifInfos);
++ test(minfo0, minfo, "operaInfos");
++
++ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, operaInfos, null);
++ test(minfo0, minfo, "notifInfos");
++
++ if (failed > 0) {
++ throw new RuntimeException("Test failed: "+failed);
++ } else {
++ System.out.println("---Test: PASSED");
++ }
++ }
++
++ private static void test(Object obj1, Object obj2, String param) {
++ try {
++ obj1.equals(obj2);
++ System.out.println("OK-1: "+obj1.getClass().getSimpleName()+".equals worked with a null paramer: "+param);
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO-1!!! "+obj1.getClass().getSimpleName()+".equals got NPE with a null paramer: "+param);
++ npe.printStackTrace();
++ failed++;
++ }
++
++ try {
++ obj2.equals(obj1);
++ System.out.println("OK-2: "+obj2.getClass().getSimpleName()+".equals worked with a null paramer: "+param);
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO-2!!! "+obj2.getClass().getSimpleName()+".equals got NPE with a null paramer: "+param);
++ npe.printStackTrace();
++ failed++;
++ }
++
++ try {
++ obj1.equals(null);
++ obj2.equals(null);
++
++ System.out.println("OK-3: "+obj1.getClass().getSimpleName()+".equals worked with a null field.");
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO-3!!! "+obj1.getClass().getSimpleName()+".equals got NPE with a null field.");
++ npe.printStackTrace();
++ failed++;
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,176 @@
++/*
++ * 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 javax.management.MBeanAttributeInfo;
++import javax.management.MBeanConstructorInfo;
++import javax.management.MBeanInfo;
++import javax.management.MBeanNotificationInfo;
++import javax.management.MBeanOperationInfo;
++import javax.management.MBeanParameterInfo;
++import javax.management.modelmbean.DescriptorSupport;
++import javax.management.openmbean.SimpleType;
++
++/*
++ * @test
++ * @bug 8023669
++ * @summary Test that hashCode()throws NullPointerException
++ * @author Shanliang JIANG
++ * @run clean MBeanInfoHashCodeNPETest
++ * @run build MBeanInfoHashCodeNPETest
++ * @run main MBeanInfoHashCodeNPETest
++ */
++public class MBeanInfoHashCodeNPETest {
++ private static int failed = 0;
++
++ public static void main(String[] args) throws Exception {
++ System.out.println("---MBeanInfoHashCodeNPETest-main ...");
++
++ // ----
++ System.out.println("\n---Testing on MBeanAttributeInfo...");
++ MBeanAttributeInfo mbeanAttributeInfo = new MBeanAttributeInfo(
++ null, SimpleType.INTEGER.getClassName(), "description", true, true, false);
++ test(mbeanAttributeInfo, "class name");
++
++ mbeanAttributeInfo = new MBeanAttributeInfo(
++ "name", null, "description", true, true, false);
++ test(mbeanAttributeInfo, "type");
++
++ mbeanAttributeInfo = new MBeanAttributeInfo(
++ "name", SimpleType.INTEGER.getClassName(), null, true, true, false);
++ test(mbeanAttributeInfo, "description");
++
++ // ----
++ System.out.println("\n---Testing on MBeanConstructorInfo...");
++ MBeanConstructorInfo mbeanConstructorInfo = new MBeanConstructorInfo(
++ null, "", new MBeanParameterInfo[]{}, new DescriptorSupport());
++ test(mbeanConstructorInfo, "name");
++
++ mbeanConstructorInfo = new MBeanConstructorInfo(
++ "", null, new MBeanParameterInfo[]{}, new DescriptorSupport());
++ test(mbeanConstructorInfo, "description");
++
++ mbeanConstructorInfo = new MBeanConstructorInfo(
++ "", "", null, new DescriptorSupport());
++ test(mbeanConstructorInfo, "MBeanParameterInfo");
++
++ mbeanConstructorInfo = new MBeanConstructorInfo(
++ "", "", new MBeanParameterInfo[]{}, null);
++ test(mbeanConstructorInfo, "descriptor");
++
++ // ----
++ System.out.println("\n---Testing on MBeanOperationInfo...");
++ MBeanOperationInfo mbeanOperationInfo = new MBeanOperationInfo(
++ null, "description", new MBeanParameterInfo[]{}, "type", 1, new DescriptorSupport());
++ test(mbeanOperationInfo, "name");
++
++ mbeanOperationInfo = new MBeanOperationInfo(
++ "name", null, new MBeanParameterInfo[]{}, "type", 1, new DescriptorSupport());
++ test(mbeanOperationInfo, "description");
++
++ mbeanOperationInfo = new MBeanOperationInfo(
++ "name", "description", null, "type", 1, new DescriptorSupport());
++ test(mbeanOperationInfo, "MBeanParameterInfo");
++
++ mbeanOperationInfo = new MBeanOperationInfo(
++ "name", "description", new MBeanParameterInfo[]{}, null, 1, new DescriptorSupport());
++ test(mbeanOperationInfo, "type");
++
++ mbeanOperationInfo = new MBeanOperationInfo(
++ "name", "description", new MBeanParameterInfo[]{}, "type", -1, new DescriptorSupport());
++ test(mbeanOperationInfo, "native impact");
++
++ mbeanOperationInfo = new MBeanOperationInfo(
++ "name", "description", new MBeanParameterInfo[]{}, "type", 1, null);
++ test(mbeanOperationInfo, "Descriptor");
++
++ // ----
++ System.out.println("\n---Testing on MBeanParameterInfo...");
++ MBeanParameterInfo mbeanParameterInfo = new MBeanParameterInfo(
++ null, "type", "description", new DescriptorSupport());
++ test(mbeanParameterInfo, "name");
++
++ mbeanParameterInfo = new MBeanParameterInfo(
++ "name", null, "description", new DescriptorSupport());
++ test(mbeanParameterInfo, "description");
++
++ mbeanParameterInfo = new MBeanParameterInfo(
++ "name", "type", null, new DescriptorSupport());
++ test(mbeanParameterInfo, "description");
++
++ mbeanParameterInfo = new MBeanParameterInfo(
++ "name", "type", "description", null);
++ test(mbeanParameterInfo, "Descriptor");
++
++ // ----
++ System.out.println("\n---Testing on MBeanInfo...");
++ String className = "toto";
++ String description = "titi";
++ MBeanAttributeInfo[] attrInfos = new MBeanAttributeInfo[]{};
++ MBeanConstructorInfo[] constrInfos = new MBeanConstructorInfo[]{};
++ MBeanOperationInfo[] operaInfos = new MBeanOperationInfo[]{};
++ MBeanNotificationInfo[] notifInfos = new MBeanNotificationInfo[]{};
++
++ MBeanInfo minfo = new MBeanInfo(null, description, attrInfos, constrInfos, operaInfos, notifInfos);
++ test(minfo, "class name");
++
++ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, operaInfos, notifInfos);
++ test(minfo, "name");
++
++ minfo = new MBeanInfo(className, null, attrInfos, constrInfos, operaInfos, notifInfos);
++ test(minfo, "description");
++
++ minfo = new MBeanInfo(className, description, null, constrInfos, operaInfos, notifInfos);
++ test(minfo, "attrInfos");
++
++ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, null, notifInfos);
++ test(minfo, "operaInfos");
++
++ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, operaInfos, null);
++ test(minfo, "notifInfos");
++
++ Thread.sleep(100);
++ if (failed > 0) {
++ throw new RuntimeException("Test failed: "+failed);
++ } else {
++ System.out.println("---Test: PASSED");
++ }
++ }
++
++ private static void test(Object obj, String param) {
++ try {
++ obj.hashCode();
++ System.out.println("OK: "+obj.getClass().getSimpleName()+".hashCode worked with a null "+param);
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO!!! "+obj.getClass().getSimpleName()+".hashCode got NPE with a null "+param);
++ failed++;
++ }
++
++ try {
++ obj.toString();
++ System.out.println("OK: "+obj.getClass().getSimpleName()+".toString worked with a null "+param);
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO!!! "+obj.getClass().getSimpleName()+".toString got NPE.");
++ failed++;
++ }
++ }
++}
+--- ./jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java Wed May 07 19:26:47 2014 -0700
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 6229368
++ * @bug 6229368 8025207
+ * @summary Wrong threshold value in CounterMonitor with offset and modulus.
+ * @author Luis-Miguel Alventosa
+ * @run clean CounterMonitorThresholdTest
+@@ -144,16 +144,14 @@
+ for (int i = 0; i < counter.length; i++) {
+ mbean.setCounter(counter[i]);
+ System.out.println("\nCounter = " + mbean.getCounter());
+- Thread.sleep(300);
+- Integer derivedGaugeValue = (Integer) cm.getDerivedGauge(name);
+- System.out.println("Derived Gauge = " + derivedGaugeValue);
+- if (derivedGaugeValue.intValue() != derivedGauge[i]) {
+- System.out.println("Wrong derived gauge! Current value = " +
+- derivedGaugeValue + " Expected value = " + derivedGauge[i]);
+- System.out.println("\nStop monitoring...");
+- cm.stop();
+- throw new IllegalArgumentException("wrong derived gauge");
+- }
++ Integer derivedGaugeValue;
++ // either pass or test timeout (killed by test harness)
++ // see 8025207
++ do {
++ Thread.sleep(150);
++ derivedGaugeValue = (Integer) cm.getDerivedGauge(name);
++ } while (derivedGaugeValue.intValue() != derivedGauge[i]);
++
+ Number thresholdValue = cm.getThreshold(name);
+ System.out.println("Threshold = " + thresholdValue);
+ if (thresholdValue.intValue() != threshold[i]) {
+@@ -163,7 +161,6 @@
+ cm.stop();
+ throw new IllegalArgumentException("wrong threshold");
+ }
+- Thread.sleep(300);
+ }
+
+ // Stop the monitor
+--- ./jdk/test/javax/management/monitor/NullAttributeValueTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/management/monitor/NullAttributeValueTest.java Wed May 07 19:26:47 2014 -0700
+@@ -23,11 +23,12 @@
+
+ /*
+ * @test
+- * @bug 6200031
++ * @bug 6200031 8025206
+ * @summary Test that the counter/gauge/string monitors emit a
+ * jmx.monitor.error.type notification when the attribute
+ * being monitored returns a null value.
+ * @author Luis-Miguel Alventosa
++ * @author Shanliang JIANG
+ * @run clean NullAttributeValueTest
+ * @run build NullAttributeValueTest
+ * @run main NullAttributeValueTest
+@@ -39,7 +40,7 @@
+ public class NullAttributeValueTest implements NotificationListener {
+
+ // Flag to notify that a message has been received
+- private boolean messageReceived = false;
++ private volatile boolean messageReceived = false;
+
+ // MBean class
+ public class ObservedObject implements ObservedObjectMBean {
+@@ -83,7 +84,6 @@
+ * Update the counter and check for notifications
+ */
+ public int counterMonitorNotification() throws Exception {
+-
+ CounterMonitor counterMonitor = null;
+ try {
+ MBeanServer server = MBeanServerFactory.newMBeanServer();
+@@ -134,31 +134,17 @@
+ echo(">>> START the CounterMonitor");
+ counterMonitor.start();
+
+- // Wait for granularity period (multiplied by 2 for sure)
+- //
+- Thread.sleep(granularityperiod * 2);
+-
+- // Check if notification was received
+- //
+- if (messageReceived) {
+- echo("\tOK: CounterMonitor notification received");
+- } else {
+- echo("\tKO: CounterMonitor notification missed or not emitted");
+- return 1;
+- }
++ return checkReceived(granularityperiod, "CounterMonitor");
+ } finally {
+ if (counterMonitor != null)
+ counterMonitor.stop();
+ }
+-
+- return 0;
+ }
+
+ /**
+ * Update the gauge and check for notifications
+ */
+ public int gaugeMonitorNotification() throws Exception {
+-
+ GaugeMonitor gaugeMonitor = null;
+ try {
+ MBeanServer server = MBeanServerFactory.newMBeanServer();
+@@ -212,31 +198,17 @@
+ echo(">>> START the GaugeMonitor");
+ gaugeMonitor.start();
+
+- // Wait for granularity period (multiplied by 2 for sure)
+- //
+- Thread.sleep(granularityperiod * 2);
+-
+- // Check if notification was received
+- //
+- if (messageReceived) {
+- echo("\tOK: GaugeMonitor notification received");
+- } else {
+- echo("\tKO: GaugeMonitor notification missed or not emitted");
+- return 1;
+- }
++ return checkReceived(granularityperiod, "GaugeMonitor");
+ } finally {
+ if (gaugeMonitor != null)
+ gaugeMonitor.stop();
+ }
+-
+- return 0;
+ }
+
+ /**
+ * Update the string and check for notifications
+ */
+ public int stringMonitorNotification() throws Exception {
+-
+ StringMonitor stringMonitor = null;
+ try {
+ MBeanServer server = MBeanServerFactory.newMBeanServer();
+@@ -289,24 +261,11 @@
+ echo(">>> START the StringMonitor");
+ stringMonitor.start();
+
+- // Wait for granularity period (multiplied by 2 for sure)
+- //
+- Thread.sleep(granularityperiod * 2);
+-
+- // Check if notification was received
+- //
+- if (messageReceived) {
+- echo("\tOK: StringMonitor notification received");
+- } else {
+- echo("\tKO: StringMonitor notification missed or not emitted");
+- return 1;
+- }
++ return checkReceived(granularityperiod, "StringMonitor");
+ } finally {
+ if (stringMonitor != null)
+ stringMonitor.stop();
+ }
+-
+- return 0;
+ }
+
+ /**
+@@ -326,6 +285,21 @@
+ return error;
+ }
+
++ private int checkReceived(long granularityperiod, String caller) throws InterruptedException {
++ int i = 100;
++ do {
++ Thread.sleep(granularityperiod);
++ } while (!messageReceived && i-- > 0);
++
++ if (messageReceived) {
++ echo("\tOK: " + caller + " notification received");
++ } else {
++ echo("\tKO: " + caller + " notification missed or not emitted");
++ }
++
++ return messageReceived ? 0 : 1;
++ }
++
+ /*
+ * Print message
+ */
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,196 @@
++/*
++ * 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 javax.management.MBeanNotificationInfo;
++import javax.management.MBeanOperationInfo;
++import javax.management.modelmbean.DescriptorSupport;
++import javax.management.openmbean.OpenMBeanAttributeInfo;
++import javax.management.openmbean.OpenMBeanAttributeInfoSupport;
++import javax.management.openmbean.OpenMBeanConstructorInfo;
++import javax.management.openmbean.OpenMBeanConstructorInfoSupport;
++import javax.management.openmbean.OpenMBeanInfo;
++import javax.management.openmbean.OpenMBeanInfoSupport;
++import javax.management.openmbean.OpenMBeanOperationInfo;
++import javax.management.openmbean.OpenMBeanOperationInfoSupport;
++import javax.management.openmbean.OpenMBeanParameterInfo;
++import javax.management.openmbean.OpenMBeanParameterInfoSupport;
++import javax.management.openmbean.SimpleType;
++
++/*
++ * @test
++ * @bug 8023529
++ * @summary Test that OpenMBean*Info.equals do not throw NPE
++ * @author Shanliang JIANG
++ * @run clean OpenMBeanInfoEqualsNPETest
++ * @run build OpenMBeanInfoEqualsNPETest
++ * @run main OpenMBeanInfoEqualsNPETest
++ */
++public class OpenMBeanInfoEqualsNPETest {
++ private static int failed = 0;
++
++ public static void main(String[] args) throws Exception {
++ System.out.println("---OpenMBeanInfoEqualsNPETest-main ...");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanAttributeInfoSupport...");
++ OpenMBeanAttributeInfo openMBeanAttributeInfo0 = new OpenMBeanAttributeInfoSupport(
++ "name", "description", SimpleType.INTEGER, true, true, false, 1, new Integer[]{1, 2, 3});
++ OpenMBeanAttributeInfo openMBeanAttributeInfo = new OpenMBeanAttributeInfoSupport(
++ "name", "description", SimpleType.INTEGER, true, true, false, null, new Integer[]{1, 2, 3});
++ test(openMBeanAttributeInfo0, openMBeanAttributeInfo, "defaultValue");
++
++ openMBeanAttributeInfo = new OpenMBeanAttributeInfoSupport(
++ "name", "description", SimpleType.INTEGER, true, true, false, 1, null);
++ test(openMBeanAttributeInfo0, openMBeanAttributeInfo, "legalValues");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanConstructorInfoSupport...");
++ OpenMBeanConstructorInfo openMBeanConstructorInfo0 = new OpenMBeanConstructorInfoSupport(
++ "name", "description", new OpenMBeanParameterInfo[]{}, new DescriptorSupport());
++ OpenMBeanConstructorInfo openMBeanConstructorInfo;
++
++ openMBeanConstructorInfo = new OpenMBeanConstructorInfoSupport(
++ "name", "description", null, new DescriptorSupport());
++ test(openMBeanConstructorInfo0, openMBeanConstructorInfo, "sigs");
++
++ openMBeanConstructorInfo = new OpenMBeanConstructorInfoSupport(
++ "name", "description", new OpenMBeanParameterInfo[]{}, null);
++ test(openMBeanConstructorInfo0, openMBeanConstructorInfo, "Descriptor");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanOperationInfoSupport...");
++ OpenMBeanOperationInfo openMBeanOperationInfo0 = new OpenMBeanOperationInfoSupport(
++ "name", "description", new OpenMBeanParameterInfo[]{}, SimpleType.INTEGER, 1, new DescriptorSupport());
++ OpenMBeanOperationInfo openMBeanOperationInfo;
++
++ openMBeanOperationInfo = new OpenMBeanOperationInfoSupport(
++ "name", "description", null, SimpleType.INTEGER, 1, new DescriptorSupport());
++ test(openMBeanOperationInfo0, openMBeanOperationInfo, "sigs");
++
++ openMBeanOperationInfo = new OpenMBeanOperationInfoSupport(
++ "name", "description", new OpenMBeanParameterInfo[]{}, SimpleType.INTEGER, MBeanOperationInfo.UNKNOWN, null);
++ test(openMBeanOperationInfo0, openMBeanOperationInfo, "Descriptor");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanParameterInfoSupport 1...");
++ OpenMBeanParameterInfo openMBeanParameterInfo0 = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, 0, -1, 1);
++ OpenMBeanParameterInfo openMBeanParameterInfo;
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, null, -1, 1);
++ test(openMBeanParameterInfo0, openMBeanParameterInfo, "default value");
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, 0, null, 1);
++ test(openMBeanParameterInfo0, openMBeanParameterInfo, "min value");
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, 0, -1, null);
++ test(openMBeanParameterInfo0, openMBeanParameterInfo, "max value");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanParameterInfoSupport 2...");
++ openMBeanParameterInfo0 = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, 1, new Integer[]{-1, 1, 2});
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, null, new Integer[]{-1, 1, 2});
++ test(openMBeanParameterInfo0, openMBeanParameterInfo, "default value");
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, 1, null);
++ test(openMBeanParameterInfo0, openMBeanParameterInfo, "legal values");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanInfoSupport...");
++ String className = "toto";
++ String description = "titi";
++ OpenMBeanAttributeInfo[] attrInfos = new OpenMBeanAttributeInfo[]{};
++ OpenMBeanConstructorInfo[] constrInfos = new OpenMBeanConstructorInfo[]{};
++ OpenMBeanOperationInfo[] operaInfos = new OpenMBeanOperationInfo[]{};
++ MBeanNotificationInfo[] notifInfos = new MBeanNotificationInfo[]{};
++
++ OpenMBeanInfo ominfo0 = new OpenMBeanInfoSupport("toto", description, attrInfos, constrInfos, operaInfos, notifInfos);
++ OpenMBeanInfo ominfo = new OpenMBeanInfoSupport(null, description, attrInfos, constrInfos, operaInfos, notifInfos);
++ test(ominfo0, ominfo, "class name");
++
++ ominfo = new OpenMBeanInfoSupport(className, null, attrInfos, constrInfos, operaInfos, notifInfos);
++ test(ominfo0, ominfo, "description");
++
++ ominfo = new OpenMBeanInfoSupport(className, description, null, constrInfos, operaInfos, notifInfos);
++ test(ominfo0, ominfo, "attrInfos");
++
++ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, null, operaInfos, notifInfos);
++ test(ominfo0, ominfo, "constructor infos");
++
++ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, constrInfos, null, notifInfos);
++ test(ominfo0, ominfo, "operation infos");
++
++ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, constrInfos, operaInfos, null);
++ test(ominfo0, ominfo, "notif infos");
++
++ if (failed > 0) {
++ throw new RuntimeException("Test failed: "+failed);
++ } else {
++ System.out.println("---Test: PASSED");
++ }
++ }
++
++ private static void test(Object obj1, Object obj2, String param) {
++ try {
++ obj1.equals(obj2);
++ System.out.println("OK-1: "+obj1.getClass().getSimpleName()+
++ ".equals worked with a null field: "+param);
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO-1!!! "+obj1.getClass().getSimpleName()+
++ ".equals got NPE with a null field: "+param);
++ npe.printStackTrace();
++ failed++;
++ }
++
++ try {
++ obj2.equals(obj1);
++ System.out.println("OK-2: "+obj2.getClass().getSimpleName()+
++ ".equals worked with a null field: "+param);
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO-2!!! "+obj2.getClass().getSimpleName()+
++ ".equals got NPE with a null field: "+param);
++ npe.printStackTrace();
++ failed++;
++ }
++
++ try {
++ obj1.equals(null);
++ obj2.equals(null);
++
++ System.out.println("OK-3: "+obj1.getClass().getSimpleName()+
++ ".equals worked with a null object.");
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO-3!!! "+obj1.getClass().getSimpleName()+
++ ".equals got NPE with a null object.");
++ npe.printStackTrace();
++ failed++;
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,173 @@
++/*
++ * 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 javax.management.MBeanNotificationInfo;
++import javax.management.modelmbean.DescriptorSupport;
++import javax.management.openmbean.OpenMBeanAttributeInfo;
++import javax.management.openmbean.OpenMBeanAttributeInfoSupport;
++import javax.management.openmbean.OpenMBeanConstructorInfo;
++import javax.management.openmbean.OpenMBeanConstructorInfoSupport;
++import javax.management.openmbean.OpenMBeanInfo;
++import javax.management.openmbean.OpenMBeanInfoSupport;
++import javax.management.openmbean.OpenMBeanOperationInfo;
++import javax.management.openmbean.OpenMBeanOperationInfoSupport;
++import javax.management.openmbean.OpenMBeanParameterInfo;
++import javax.management.openmbean.OpenMBeanParameterInfoSupport;
++import javax.management.openmbean.SimpleType;
++
++/*
++ * @test
++ * @bug 8023529
++ * @summary Test that OpenMBean*Info.hashCode do not throw NPE
++ * @author Shanliang JIANG
++ * @run clean OpenMBeanInfoHashCodeNPETest
++ * @run build OpenMBeanInfoHashCodeNPETest
++ * @run main OpenMBeanInfoHashCodeNPETest
++ */
++public class OpenMBeanInfoHashCodeNPETest {
++ private static int failed = 0;
++
++ public static void main(String[] args) throws Exception {
++ System.out.println("---OpenMBeanInfoHashCodeNPETest-main ...");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanInfohashCodeTest...");
++ OpenMBeanAttributeInfo openMBeanAttributeInfo = new OpenMBeanAttributeInfoSupport(
++ "name", "description", SimpleType.INTEGER, true, true, false, null, new Integer[]{1, 2, 3});
++ test(openMBeanAttributeInfo, "defaultValue");
++
++ openMBeanAttributeInfo = new OpenMBeanAttributeInfoSupport(
++ "name", "description", SimpleType.INTEGER, true, true, false, 1, null);
++ test(openMBeanAttributeInfo, "legalValues");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanConstructorInfoSupport...");
++ OpenMBeanConstructorInfo openMBeanConstructorInfo;
++
++ openMBeanConstructorInfo = new OpenMBeanConstructorInfoSupport(
++ "name", "description", null, new DescriptorSupport());
++ test(openMBeanConstructorInfo, "sigs");
++
++ openMBeanConstructorInfo = new OpenMBeanConstructorInfoSupport(
++ "name", "description", new OpenMBeanParameterInfo[]{}, null);
++ test(openMBeanConstructorInfo, "Descriptor");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanOperationInfoSupport...");
++ OpenMBeanOperationInfo openMBeanOperationInfo;
++
++ openMBeanOperationInfo = new OpenMBeanOperationInfoSupport(
++ "name", "description", null, SimpleType.INTEGER, 1, new DescriptorSupport());
++ test(openMBeanOperationInfo, "sigs");
++
++ openMBeanOperationInfo = new OpenMBeanOperationInfoSupport(
++ "name", "description", new OpenMBeanParameterInfo[]{}, SimpleType.INTEGER, 1, null);
++ test(openMBeanOperationInfo, "Descriptor");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanParameterInfoSupport 1...");
++ OpenMBeanParameterInfo openMBeanParameterInfo;
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, null, -1, 1);
++ test(openMBeanParameterInfo, "default value");
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, 0, null, 1);
++ test(openMBeanParameterInfo, "min value");
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, 0, -1, null);
++ test(openMBeanParameterInfo, "max value");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanParameterInfoSupport 2...");
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, 1, new Integer[]{-1, 1, 2});
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, null, new Integer[]{-1, 1, 2});
++ test(openMBeanParameterInfo, "default value");
++
++ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
++ "name", "description", SimpleType.INTEGER, 1, null);
++ test(openMBeanParameterInfo, "legal values");
++
++ // ----
++ System.out.println("\n---Testing on OpenMBeanInfoSupport...");
++ String className = "toto";
++ String description = "titi";
++ OpenMBeanAttributeInfo[] attrInfos = new OpenMBeanAttributeInfo[]{};
++ OpenMBeanConstructorInfo[] constrInfos = new OpenMBeanConstructorInfo[]{};
++ OpenMBeanOperationInfo[] operaInfos = new OpenMBeanOperationInfo[]{};
++ MBeanNotificationInfo[] notifInfos = new MBeanNotificationInfo[]{};
++
++ OpenMBeanInfo ominfo = new OpenMBeanInfoSupport(null, description, attrInfos, constrInfos, operaInfos, notifInfos);
++ test(ominfo, "class name");
++
++ ominfo = new OpenMBeanInfoSupport(className, null, attrInfos, constrInfos, operaInfos, notifInfos);
++ test(ominfo, "description");
++
++ ominfo = new OpenMBeanInfoSupport(className, description, null, constrInfos, operaInfos, notifInfos);
++ test(ominfo, "attrInfos");
++
++ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, null, operaInfos, notifInfos);
++ test(ominfo, "constructor infos");
++
++ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, constrInfos, null, notifInfos);
++ test(ominfo, "operation infos");
++
++ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, constrInfos, operaInfos, null);
++ test(ominfo, "notif infos");
++
++ if (failed > 0) {
++ throw new RuntimeException("Test failed: "+failed);
++ } else {
++ System.out.println("---Test: PASSED");
++ }
++ }
++
++ private static void test(Object obj, String param) {
++ try {
++ obj.hashCode();
++ System.out.println("OK-1: "+obj.getClass().getSimpleName()+
++ ".hashCode worked with a null paramer: "+param);
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO-1!!! "+obj.getClass().getSimpleName()+
++ ".hashCode got NPE with null paramer: "+param);
++ npe.printStackTrace();
++ failed++;
++ }
++
++ try {
++ obj.toString();
++ System.out.println("OK-1: "+obj.getClass().getSimpleName()+
++ ".toString worked with a null paramer: "+param);
++ } catch (NullPointerException npe) {
++ System.out.println("--->KO-1!!! "+obj.getClass().getSimpleName()+
++ ".toString got NPE with null paramer: "+param);
++ npe.printStackTrace();
++ failed++;
++ }
++ }
++}
+--- ./jdk/test/javax/management/remote/mandatory/URLTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/management/remote/mandatory/URLTest.java Wed May 07 19:26:47 2014 -0700
+@@ -24,8 +24,6 @@
+ /*
+ * @test
+ * @bug 5057532
+- * @ignore Test will fail until 6338951 is resolved (java.net.URI now
+- * accepts "http://-a").
+ * @summary Tests that host names are parsed correctly in URLs
+ * @author Eamonn McManus
+ * @run clean URLTest
+--- ./jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java Wed May 07 19:26:47 2014 -0700
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 4940957
++ * @bug 4940957 8025205
+ * @summary Tests behaviour when connections break
+ * @author Eamonn McManus
+ * @run clean BrokenConnectionTest
+@@ -485,14 +485,13 @@
+ }
+ if (thisok) {
+ System.out.println("Waiting for failure notif");
+- long deadline = System.currentTimeMillis() + 5000;
+- while (failureListener.count < 1
+- && System.currentTimeMillis() < deadline)
+- Thread.sleep(500);
+- if (failureListener.count < 1) {
+- System.out.println("Did not get failure notif!");
+- thisok = false;
+- } else if (failureListener.count > 1) {
++ // pass or test timeout. see 8025205
++ do {
++ Thread.sleep(100);
++ } while (failureListener.count < 1);
++
++ Thread.sleep(1000); // if more notif coming ...
++ if (failureListener.count > 1) {
+ System.out.println("Got too many failure notifs: " +
+ failureListener.count);
+ thisok = false;
+--- ./jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java Wed May 07 19:26:47 2014 -0700
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 4886838 4886830
++ * @bug 4886838 4886830 8025204
+ * @summary Tests that idle timeouts happen at appropriate times
+ * @author Eamonn McManus
+ * @run clean IdleTimeoutTest
+@@ -272,19 +272,11 @@
+ }
+
+ System.out.println("Waiting for id list to drop ours");
+- deadline = System.currentTimeMillis() + timeout*2 + 10000;
+- while (true) {
+- ids = Arrays.asList(server.getConnectionIds());
+- if (!ids.contains(connId)
+- || System.currentTimeMillis() >= deadline)
+- break;
+- Thread.sleep(500);
+- }
+- if (ids.contains(connId)) {
+- System.out.println("Client id still in list after " +
+- "deadline: " + ids);
+- return false;
+- }
++ // pass or timed out by test harness - see 8025204
++ do {
++ Thread.sleep(100);
++ ids = Arrays.asList(server.getConnectionIds());
++ } while (ids.contains(connId));
+
+ conn.getDefaultDomain();
+ if (connId.equals(client.getConnectionId())) {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,122 @@
++/*
++ * 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.lang.management.ManagementFactory;
++import java.lang.ref.WeakReference;
++import java.lang.reflect.Field;
++import java.util.Collections;
++import java.util.Map;
++import javax.management.MBeanServer;
++import javax.management.MBeanServerConnection;
++import javax.management.remote.JMXConnector;
++import javax.management.remote.JMXConnectorFactory;
++import javax.management.remote.JMXConnectorServer;
++import javax.management.remote.JMXConnectorServerFactory;
++import javax.management.remote.JMXPrincipal;
++import javax.management.remote.JMXServiceURL;
++import javax.management.remote.rmi.RMIConnector;
++import javax.security.auth.Subject;
++
++/*
++ * @test
++ * @bug 6566891
++ * @summary Check no memory leak on RMIConnector's rmbscMap
++ * @author Shanliang JIANG
++ * @run clean RMIConnectorInternalMapTest
++ * @run build RMIConnectorInternalMapTest
++ * @run main RMIConnectorInternalMapTest
++ */
++
++public class RMIConnectorInternalMapTest {
++ public static void main(String[] args) throws Exception {
++ System.out.println("---RMIConnectorInternalMapTest starting...");
++
++ JMXConnectorServer connectorServer = null;
++ JMXConnector connectorClient = null;
++
++ try {
++ MBeanServer mserver = ManagementFactory.getPlatformMBeanServer();
++ JMXServiceURL serverURL = new JMXServiceURL("rmi", "localhost", 0);
++ connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(serverURL, null, mserver);
++ connectorServer.start();
++
++ JMXServiceURL serverAddr = connectorServer.getAddress();
++ connectorClient = JMXConnectorFactory.connect(serverAddr, null);
++ connectorClient.connect();
++
++ Field rmbscMapField = RMIConnector.class.getDeclaredField("rmbscMap");
++ rmbscMapField.setAccessible(true);
++ Map<Subject, WeakReference<MBeanServerConnection>> map =
++ (Map<Subject, WeakReference<MBeanServerConnection>>) rmbscMapField.get(connectorClient);
++ if (map != null && !map.isEmpty()) { // failed
++ throw new RuntimeException("RMIConnector's rmbscMap must be empty at the initial time.");
++ }
++
++ Subject delegationSubject =
++ new Subject(true,
++ Collections.singleton(new JMXPrincipal("delegate")),
++ Collections.EMPTY_SET,
++ Collections.EMPTY_SET);
++ MBeanServerConnection mbsc1 =
++ connectorClient.getMBeanServerConnection(delegationSubject);
++ MBeanServerConnection mbsc2 =
++ connectorClient.getMBeanServerConnection(delegationSubject);
++
++ if (mbsc1 == null) {
++ throw new RuntimeException("Got null connection.");
++ }
++ if (mbsc1 != mbsc2) {
++ throw new RuntimeException("Not got same connection with a same subject.");
++ }
++
++ map = (Map<Subject, WeakReference<MBeanServerConnection>>) rmbscMapField.get(connectorClient);
++ if (map == null || map.isEmpty()) { // failed
++ throw new RuntimeException("RMIConnector's rmbscMap has wrong size "
++ + "after creating a delegated connection.");
++ }
++
++ delegationSubject = null;
++ mbsc1 = null;
++ mbsc2 = null;
++
++ int i = 0;
++ while (!map.isEmpty() && i++ < 60) {
++ System.gc();
++ Thread.sleep(100);
++ }
++ System.out.println("---GC times: " + i);
++
++ if (!map.isEmpty()) {
++ throw new RuntimeException("Failed to clean RMIConnector's rmbscMap");
++ } else {
++ System.out.println("---RMIConnectorInternalMapTest: PASSED!");
++ }
++ } finally {
++ try {
++ connectorClient.close();
++ connectorServer.stop();
++ } catch (Exception e) {
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,105 @@
++/*
++ * 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.lang.management.ManagementFactory;
++import java.lang.ref.WeakReference;
++import java.lang.reflect.Field;
++import javax.management.MBeanServer;
++import javax.management.MBeanServerConnection;
++import javax.management.remote.JMXConnector;
++import javax.management.remote.JMXConnectorFactory;
++import javax.management.remote.JMXConnectorServer;
++import javax.management.remote.JMXConnectorServerFactory;
++import javax.management.remote.JMXServiceURL;
++import javax.management.remote.rmi.RMIConnector;
++
++/*
++ * @test
++ * @bug 6566891
++ * @summary Check no memory leak on RMIConnector's nullSubjectConn
++ * @author Shanliang JIANG
++ * @run clean RMIConnectorNullSubjectConnTest
++ * @run build RMIConnectorNullSubjectConnTest
++ * @run main RMIConnectorNullSubjectConnTest
++ */
++
++public class RMIConnectorNullSubjectConnTest {
++ public static void main(String[] args) throws Exception {
++ System.out.println("---RMIConnectorNullSubjectConnTest starting...");
++
++ JMXConnectorServer connectorServer = null;
++ JMXConnector connectorClient = null;
++
++ try {
++ MBeanServer mserver = ManagementFactory.getPlatformMBeanServer();
++ JMXServiceURL serverURL = new JMXServiceURL("rmi", "localhost", 0);
++ connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(serverURL, null, mserver);
++ connectorServer.start();
++
++ JMXServiceURL serverAddr = connectorServer.getAddress();
++ connectorClient = JMXConnectorFactory.connect(serverAddr, null);
++ connectorClient.connect();
++
++ Field nullSubjectConnField = RMIConnector.class.getDeclaredField("nullSubjectConnRef");
++ nullSubjectConnField.setAccessible(true);
++
++ WeakReference<MBeanServerConnection> weak =
++ (WeakReference<MBeanServerConnection>)nullSubjectConnField.get(connectorClient);
++
++ if (weak != null && weak.get() != null) {
++ throw new RuntimeException("nullSubjectConnRef must be null at initial time.");
++ }
++
++ MBeanServerConnection conn1 = connectorClient.getMBeanServerConnection(null);
++ MBeanServerConnection conn2 = connectorClient.getMBeanServerConnection(null);
++ if (conn1 == null) {
++ throw new RuntimeException("A connection with null subject should not be null.");
++ } else if (conn1 != conn2) {
++ throw new RuntimeException("The 2 connections with null subject are not equal.");
++ }
++
++ conn1 = null;
++ conn2 = null;
++ int i = 1;
++ do {
++ System.gc();
++ Thread.sleep(100);
++ weak = (WeakReference<MBeanServerConnection>)nullSubjectConnField.get(connectorClient);
++ } while ((weak != null && weak.get() != null) && i++ < 60);
++
++ System.out.println("---GC times: " + i);
++
++ if (weak != null && weak.get() != null) {
++ throw new RuntimeException("Failed to clean RMIConnector's nullSubjectConn");
++ } else {
++ System.out.println("---RMIConnectorNullSubjectConnTest: PASSED!");
++ }
++ } finally {
++ try {
++ connectorClient.close();
++ connectorServer.stop();
++ } catch (Exception e) {
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JComboBox/6236162/bug6236162.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,119 @@
++/*
++ * 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 6236162
++ @summary Checks that there is no an inconsistence in combo box
++ behavior when user points an item in combo popup
++ by mouse and then uses UP/DOWN keys.
++ @library ../../regtesthelpers
++ @build Util
++ @author Mikhail Lapshin
++ @run main bug6236162
++*/
++
++import sun.awt.SunToolkit;
++
++import javax.swing.*;
++import javax.swing.plaf.basic.*;
++import javax.swing.plaf.metal.MetalComboBoxUI;
++import java.awt.*;
++import java.awt.event.KeyEvent;
++
++public class bug6236162 {
++ private static final SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ private static JFrame frame;
++ private static JComboBox combo;
++ private static MyComboUI comboUI;
++
++ public static void main(String[] args) throws Exception {
++ UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++ toolkit.realSync();
++ test();
++ System.out.println("Test passed");
++ }
++
++ private static void createAndShowGUI() {
++ frame = new JFrame("bug6236162");
++
++ combo = new JComboBox(new String[]{"one", "two", "three", "four", "five"});
++ combo.setEditable(true);
++ comboUI = new MyComboUI();
++ combo.setUI(comboUI);
++ combo.setSelectedIndex(3);
++ frame.getContentPane().add(combo);
++
++ frame.pack();
++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++ frame.setLocationRelativeTo(null);
++ frame.setVisible(true);
++ }
++
++ private static void test() throws AWTException {
++ Robot robot = new Robot();
++ robot.setAutoDelay(50);
++
++ // Open popup menu
++ realSync();
++ Util.hitKeys(robot, KeyEvent.VK_DOWN);
++
++ // Move mouse to the first popup menu item
++ realSync();
++ Point p = combo.getLocationOnScreen();
++ Dimension size = combo.getSize();
++ p.x += size.width / 2;
++ p.y += size.height;
++ float dy = 1;
++ robot.mouseMove(p.x, p.y - 5);
++ for (int i=1; i <= 10; i++) {
++ robot.mouseMove((int)(p.x), (int)(p.y - 5 + dy*i));
++ }
++
++ // Select the second popup menu item
++ realSync();
++ Util.hitKeys(robot, KeyEvent.VK_DOWN);
++
++ realSync();
++ JList list = comboUI.getComboPopup().getList();
++ if (list.getSelectedIndex() != 1) {
++ throw new RuntimeException("There is an inconsistence in combo box " +
++ "behavior when user points an item in combo popup " +
++ "by mouse and then uses UP/DOWN keys.");
++ }
++ }
++
++ private static void realSync() {
++ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
++ }
++
++ // Gives access to BasicComboBoxUI.popup field
++ private static class MyComboUI extends MetalComboBoxUI {
++ public ComboPopup getComboPopup() {
++ return popup;
++ }
++ }
++}
+--- ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html Wed May 07 19:26:47 2014 -0700
+@@ -1,6 +1,38 @@
+ <html>
++<!--
++ 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 4150029 8006087
++ @summary BackSpace keyboard button does not lead to parent directory
++ @author Oleg Mokhovikov
++ @run applet/manual=done bug4150029.html
++-->
++
+ <body>
+ <applet code="bug4150029.class" width=200 height=200></applet>
++Follow the instructions below.
+ 1.Go into 'subDir' folder.
+ 2.Press BACKSPACE key.
+ 3.Push OPEN button.
+--- ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.java Wed May 07 19:26:47 2014 -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
+@@ -21,11 +21,10 @@
+ * questions.
+ */
+
+-/* @test
+- @bug 4150029
+- @summary BackSpace keyboard button does not lead to parent directory
+- @author Oleg Mokhovikov
+- @run applet/manual=done bug4150029.html
++/*
++ bug 4150029 8006087
++ summary BackSpace keyboard button does not lead to parent directory
++ author Oleg Mokhovikov
+ */
+
+ import javax.swing.*;
+@@ -36,6 +35,14 @@
+ private boolean res;
+
+ public void init() {
++ if (sun.awt.OSInfo.getOSType() == sun.awt.OSInfo.OSType.MACOSX) {
++ try {
++ UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
++ } catch (Exception e) {
++ throw new RuntimeException(e);
++ }
++ }
++
+ String tmpDir = System.getProperty("java.io.tmpdir");
+
+ if (tmpDir.length() == 0) {//'java.io.tmpdir' isn't guaranteed to be defined
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JInternalFrame/4193219/IconCoord.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,161 @@
++/*
++ * 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 4193219
++ @summary
++ @author Your Name: Hania Gajewska area=swing
++ @run main/manual IconCoord
++*/
++
++import java.awt.*;
++import java.awt.event.*;
++import javax.swing.*;
++
++public class IconCoord {
++ static Test test = new Test();
++
++ public static void main(String[] args) throws Exception {
++ UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ new IconCoord().createAndShowGUI();
++ }
++ });
++ test.waitTestResult();
++ }
++
++ private void createAndShowGUI() {
++ StringBuilder instrText = new StringBuilder();
++ instrText.append("First, iconify internal frame \"Frame 1\" by clicking on its iconify button.\n");
++ instrText.append("Now, maximize the top-level window \"IconCoord\".\n");
++ instrText.append("The \"Frame 1\" icon should stay in the lower left corner of the desktop; ");
++ instrText.append("if it doesn't, press \"Fail\".\n");
++ instrText.append("Now move the icon to the middle of the desktop by dragging it by its ");
++ instrText.append("bumpy left side. Then iconify \"Frame 2\" by clicking on its iconify button.\n");
++ instrText.append("If the icon for frame two gets placed in the lower left corner of the ");
++ instrText.append("desktop (where the icon for \"Frame 1\" used to be before you moved it), ");
++ instrText.append("press \"Pass\". Otherwise, press \"Fail\".\n");
++
++ JDesktopPane dt = new JDesktopPane();
++
++ JButton tf;
++ JInternalFrame if1 = new JInternalFrame("Frame 1", false, false, false, true);
++ JComponent c = (JComponent) if1.getContentPane();
++ c.setLayout(new BorderLayout());
++
++ tf = new JButton ("ignore");
++ c.add (tf, BorderLayout.NORTH);
++
++ tf = new JButton ("ignore");
++ c.add (tf, BorderLayout.CENTER);
++
++ JInternalFrame if2 = new JInternalFrame("Frame 2", false, false, false, true);
++ c = (JComponent) if2.getContentPane();
++ c.setLayout(new BorderLayout());
++
++ tf = new JButton ("ignore");
++ c.add (tf, BorderLayout.NORTH);
++
++ tf = new JButton ("ignore");
++ c.add (tf, BorderLayout.CENTER);
++
++ if1.pack();
++ if1.setBounds(300, 0, 300, 80);
++ if2.pack();
++ if2.setBounds(0, 0, 300, 80);
++ dt.add(if1);
++ dt.add(if2);
++
++ if1.setVisible(true);
++ if2.setVisible(true);
++
++ int frameHeight = 500;
++
++ JScrollPane dtScrollPane = new JScrollPane(dt);
++ JFrame frame = test.createTestFrame("IconCoord", dtScrollPane, instrText.toString(), 250);
++ dt.setPreferredSize(new Dimension(650, frameHeight - 250));
++ frame.setSize (600,500);
++ frame.setVisible(true);
++ }
++
++ static class Test {
++ private boolean pass;
++ JFrame createTestFrame(String name, Component topComponent, String instructions, int instrHeight) {
++ final String PASS = "Pass";
++ final String FAIL = "Fail";
++ JFrame frame = new JFrame(name);
++ frame.setLayout(new BorderLayout());
++
++ JPanel testButtonsPanel = new JPanel();
++ testButtonsPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, 20));
++
++ ActionListener btnAL = new ActionListener() {
++ public void actionPerformed(ActionEvent event) {
++ switch (event.getActionCommand()) {
++ case PASS:
++ pass();
++ break;
++ default:
++ throw new RuntimeException("Test failed.");
++ }
++ }
++ };
++ JButton passBtn = new JButton(PASS);
++ passBtn.addActionListener(btnAL);
++ passBtn.setActionCommand(PASS);
++
++ JButton failBtn = new JButton(FAIL);
++ failBtn.addActionListener(btnAL);
++ failBtn.setActionCommand(FAIL);
++
++ testButtonsPanel.add(BorderLayout.WEST, passBtn);
++ testButtonsPanel.add(BorderLayout.EAST, failBtn);
++
++ JTextArea instrText = new JTextArea();
++ instrText.setLineWrap(true);
++ instrText.setEditable(false);
++ JScrollPane instrScrollPane = new JScrollPane(instrText);
++ instrScrollPane.setMaximumSize(new Dimension(Integer.MAX_VALUE, instrHeight));
++ instrText.append(instructions);
++
++ JPanel servicePanel = new JPanel();
++ servicePanel.setLayout(new BorderLayout());
++ servicePanel.add(BorderLayout.CENTER, instrScrollPane);
++ servicePanel.add(BorderLayout.SOUTH, testButtonsPanel);
++
++ frame.add(BorderLayout.SOUTH, servicePanel);
++ frame.add(BorderLayout.CENTER, topComponent);
++ return frame;
++ }
++ synchronized void pass() {
++ pass = true;
++ notifyAll();
++ }
++ synchronized void waitTestResult() throws InterruptedException {
++ while (!pass) {
++ wait();
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JInternalFrame/4251301/bug4251301.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,139 @@
++/*
++ * 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 4251301
++ @summary Keybinding for show/hide the system menu.
++ @author Andrey Pikalev
++ @run main/manual bug4251301
++*/
++
++import javax.swing.*;
++import java.awt.*;
++import java.awt.event.ActionEvent;
++import java.awt.event.ActionListener;
++import java.beans.*;
++import sun.awt.OSInfo;
++import sun.awt.SunToolkit;
++
++
++public class bug4251301 {
++ private static final SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ static Test test = new Test();
++ public static void main(String[] args) throws Exception {
++ if (OSInfo.getOSType() == OSInfo.OSType.MACOSX) {
++ System.out.println("This test is not applicable for MacOS. Passed.");
++ return;
++ }
++ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++ toolkit.realSync();
++ test.waitTestResult();
++ }
++
++ public static void createAndShowGUI() {
++ final StringBuilder instructions = new StringBuilder();
++ instructions.append("Click with your mouse the content area of the internal frame with the title \"IFrame\" ");
++ instructions.append("and press Ctrl+Space. \n");
++ instructions.append("If the system menu shows up, press Esc. Then system menu should hide. \n");
++ instructions.append("If you success then press \"Pass\", else press \"Fail\".\n");
++
++ JDesktopPane dp = new JDesktopPane();
++ JInternalFrame jif = new JInternalFrame("IFrame",true,true,true,true);
++ dp.add(jif);
++ jif.setBounds(20, 20, 220, 100);
++ jif.setVisible(true);
++ try {
++ jif.setSelected(true);
++ } catch(PropertyVetoException pve) {
++ pve.printStackTrace();
++ throw new Error("Occures PropertyVetoException while set selection...");
++ }
++ JScrollPane dtScrollPane = new JScrollPane(dp);
++ JFrame testFrame = test.createTestFrame("Instructions", dtScrollPane, instructions.toString(), 500);
++ testFrame.setSize(500, 400);
++ testFrame.setVisible(true);
++ }
++ static class Test {
++ private boolean pass;
++ JFrame createTestFrame(String name, Component topComponent, String instructions, int instrHeight) {
++ final String PASS = "Pass";
++ final String FAIL = "Fail";
++ JFrame frame = new JFrame(name);
++ frame.setLayout(new BorderLayout());
++
++ JPanel testButtonsPanel = new JPanel();
++ testButtonsPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, 20));
++
++ ActionListener btnAL = new ActionListener() {
++ public void actionPerformed(ActionEvent event) {
++ switch (event.getActionCommand()) {
++ case PASS:
++ pass();
++ break;
++ default:
++ throw new RuntimeException("Test failed.");
++ }
++ }
++ };
++ JButton passBtn = new JButton(PASS);
++ passBtn.addActionListener(btnAL);
++ passBtn.setActionCommand(PASS);
++
++ JButton failBtn = new JButton(FAIL);
++ failBtn.addActionListener(btnAL);
++ failBtn.setActionCommand(FAIL);
++
++ testButtonsPanel.add(BorderLayout.WEST, passBtn);
++ testButtonsPanel.add(BorderLayout.EAST, failBtn);
++
++ JTextArea instrText = new JTextArea();
++ instrText.setLineWrap(true);
++ instrText.setEditable(false);
++ JScrollPane instrScrollPane = new JScrollPane(instrText);
++ instrScrollPane.setMaximumSize(new Dimension(Integer.MAX_VALUE, instrHeight));
++ instrText.append(instructions);
++
++ JPanel servicePanel = new JPanel();
++ servicePanel.setLayout(new BorderLayout());
++ servicePanel.add(BorderLayout.CENTER, instrScrollPane);
++ servicePanel.add(BorderLayout.SOUTH, testButtonsPanel);
++
++ frame.add(BorderLayout.SOUTH, servicePanel);
++ frame.add(BorderLayout.CENTER, topComponent);
++ return frame;
++ }
++ synchronized void pass() {
++ pass = true;
++ notifyAll();
++ }
++ synchronized void waitTestResult() throws InterruptedException {
++ while (!pass) {
++ wait();
++ }
++ }
++ }
++}
+--- ./jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java Wed May 07 19:26:47 2014 -0700
+@@ -27,19 +27,19 @@
+ @author mcherkas
+ @run main InternalFrameIsNotCollectedTest
+ */
+-
+ import sun.awt.SunToolkit;
+
+ import javax.swing.*;
+ import java.awt.*;
+-import java.awt.event.KeyEvent;
+ import java.beans.PropertyVetoException;
+ import java.util.Date;
+
+ public class InternalFrameIsNotCollectedTest {
+
+- public static final int waitTime = 10000;
++ public static final int maxWaitTime = 100000;
++ public static final int waitTime = 5000;
+ private static Robot robot;
++ private static CustomInternalFrame iFrame;
+
+ public static void sync() {
+
+@@ -62,12 +62,13 @@
+ });
+ sync();
+ invokeGC();
++ System.runFinalization();
+ Thread.sleep(1000); // it's better to wait 1 sec now then 10 sec later
+ Date startWaiting = new Date();
+ synchronized (CustomInternalFrame.waiter) {
+ // Sync with finalization thread.
+ Date now = new Date();
+- while (now.getTime() - startWaiting.getTime() < waitTime && !CustomInternalFrame.finalized) {
++ while (now.getTime() - startWaiting.getTime() < maxWaitTime && !CustomInternalFrame.finalized) {
+ CustomInternalFrame.waiter.wait(waitTime);
+ now = new Date();
+ }
+@@ -83,10 +84,8 @@
+ }
+
+ private static void closeInternalFrame() throws PropertyVetoException {
+- robot.keyPress(KeyEvent.VK_CONTROL);
+- robot.keyPress(KeyEvent.VK_F4);
+- robot.keyRelease(KeyEvent.VK_F4);
+- robot.keyRelease(KeyEvent.VK_CONTROL);
++ iFrame.setClosed(true);
++ iFrame = null;
+ }
+
+ private static void initUI() {
+@@ -96,7 +95,7 @@
+ desktopPane.setDesktopManager(new DefaultDesktopManager());
+ frame.getContentPane().add(desktopPane, BorderLayout.CENTER);
+
+- CustomInternalFrame iFrame = new CustomInternalFrame("Dummy Frame");
++ iFrame = new CustomInternalFrame("Dummy Frame");
+
+ iFrame.setSize(200, 200);
+ iFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,98 @@
++/*
++ * 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
++ @library ../../regtesthelpers
++ @build Util
++ @bug 4750590 8015597
++ @summary SwingSet: Cannot change Themes using menu accelerators
++ @author Alexander Zuev
++ @run main bug4750590
++ */
++
++import javax.swing.*;
++import java.awt.event.*;
++import java.awt.*;
++
++public class bug4750590 {
++
++ public static PassedListener pass = new PassedListener();
++ public static volatile boolean passed = false;
++
++ public static void main(String args[]) throws Throwable {
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++
++ sun.awt.SunToolkit toolkit = (sun.awt.SunToolkit) Toolkit.getDefaultToolkit();
++ toolkit.realSync();
++
++ Robot robo = new Robot();
++ robo.setAutoDelay(500);
++ Util.hitMnemonics(robo, KeyEvent.VK_F);
++ robo.keyPress(KeyEvent.VK_M);
++ robo.keyRelease(KeyEvent.VK_M);
++
++ toolkit.realSync();
++
++ if (passed) {
++ System.out.println("Test passed!");
++ } else {
++ throw new RuntimeException("Test FAILED!");
++ }
++ }
++
++ private static void createAndShowGUI() {
++ JFrame mainFrame = new JFrame("Bug 4750590");
++ JMenuBar mbar = new JMenuBar();
++ JMenu menu = new JMenu("File");
++ menu.setMnemonic('F');
++ JMenu submenu = new JMenu("Submenu");
++ submenu.add(new JMenuItem("SubMenu Item 1")).setMnemonic('S');
++ submenu.add(new JMenuItem("SubMenu Item 2"));
++ menu.add(submenu);
++
++ menu.add(new JMenuItem("Menu Item 1"));
++ JMenuItem menuItem = menu.add(new JMenuItem("Menu Item 2"));
++ menuItem.setMnemonic('M');
++ menuItem.addActionListener(pass);
++ mbar.add(menu);
++ mainFrame.setJMenuBar(mbar);
++
++ mainFrame.setSize(200, 200);
++ mainFrame.setLocation(200, 200);
++ mainFrame.setVisible(true);
++ mainFrame.toFront();
++ }
++
++ public static class PassedListener implements ActionListener {
++ public void actionPerformed(ActionEvent ev) {
++ passed = true;
++ }
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,108 @@
++/*
++ * 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 4171437
++ @library ../../regtesthelpers
++ @build Util
++ @author Georges Saab
++ @run main bug4171437
++*/
++import java.awt.*;
++import java.awt.event.*;
++import java.util.ArrayList;
++import javax.swing.*;
++import javax.swing.event.*;
++import sun.awt.SunToolkit;
++
++public class bug4171437 {
++ static volatile boolean closeActivated = false;
++ static volatile boolean customActivated = false;
++
++ public static void main(String[] args) throws Exception {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ toolkit.realSync();
++
++ Robot robot = new Robot();
++ robot.setAutoDelay(50);
++
++ Util.hitMnemonics(robot, KeyEvent.VK_F);
++ Util.hitKeys(robot, KeyEvent.VK_C);
++
++ toolkit.realSync();
++ Thread.sleep(1000);
++
++ if (!closeActivated || customActivated) {
++ throw new RuntimeException("Didn't pass the muster");
++ }
++ }
++ public static void createAndShowGUI() {
++ JMenuBar menubar = new JMenuBar();
++
++ JMenu fileMenu = new JMenu("File");
++ fileMenu.setMnemonic('f');
++
++ JMenuItem fmi1 = new JMenuItem();
++ fmi1 = new JMenuItem("Open");
++ JMenuItem fmi2 = new JMenuItem();
++ fmi2 = new JMenuItem("Close");
++ fmi2.setMnemonic('c');
++ fmi2.addActionListener(new ActionListener() {
++ public void actionPerformed(ActionEvent e) {
++ closeActivated = true;
++ }
++ });
++
++ fileMenu.add( fmi1);
++ fileMenu.add( fmi2);
++
++ menubar.add( fileMenu);
++
++ JMenu custom = new JMenu("Custom");
++ custom.setMnemonic('c');
++ JMenuItem cmi = new JMenuItem();
++ cmi = new JMenuItem("Properties");
++ cmi.setMnemonic('p');
++ custom.add( cmi);
++ custom.addMenuListener(new MenuListener() {
++ public void menuSelected(MenuEvent e) {
++ customActivated = true;
++ }
++ public void menuDeselected(MenuEvent e) {}
++ public void menuCanceled(MenuEvent e) {}
++ });
++ menubar.add( custom);
++
++ JFrame frame = new JFrame();
++ frame.setJMenuBar( menubar);
++ frame.setSize(300, 300);
++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++ frame.pack();
++ frame.setVisible(true);
++ }
++}
+--- ./jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java Wed May 07 19:26:47 2014 -0700
+@@ -35,11 +35,12 @@
+ import javax.swing.*;
+
+ public class ActionListenerCalledTwiceTest {
+- static String menuItems[] = { "Item1", "Item2", "Item3" };
++ static String menuItems[] = { "Item1", "Item2", "Item3", "Item4" };
+ static KeyStroke keyStrokes[] = {
+ KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.META_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),
+ KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.SHIFT_MASK),
++ KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.META_MASK)
+ };
+
+ static volatile int listenerCallCounter = 0;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,110 @@
++/*
++ * 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 4458079
++ @library ../../regtesthelpers
++ @build Util
++ @summary Tests calling removeAll() from PopupMenuListener
++ @author Peter Zhelezniakov
++ @run main bug4458079
++*/
++import java.awt.Robot;
++import java.awt.Toolkit;
++import java.awt.event.*;
++import javax.swing.*;
++import javax.swing.event.*;
++import java.awt.event.KeyEvent;
++import java.util.ArrayList;
++import sun.awt.SunToolkit;
++
++public class bug4458079 extends JFrame implements PopupMenuListener {
++ public JMenu menu;
++
++ static volatile boolean itemASelected = false;
++ public static void main(String[] args) throws Exception {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ new bug4458079().createAndShowGUI();
++ }
++ });
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ toolkit.realSync();
++
++ Robot robot = new Robot();
++ robot.setAutoDelay(50);
++
++ Util.hitMnemonics(robot, KeyEvent.VK_M);
++
++ toolkit.realSync();
++ Thread.sleep(1000);
++
++ Util.hitKeys(robot, KeyEvent.VK_DOWN);
++ Util.hitKeys(robot, KeyEvent.VK_ENTER);
++
++ toolkit.realSync();
++ Thread.sleep(1000);
++
++ if (!itemASelected) {
++ throw new RuntimeException("Test failed: arrow key traversal in JMenu broken!");
++ }
++ }
++ public void createAndShowGUI() {
++ JMenuBar bar = new JMenuBar();
++ menu = new JMenu("Menu");
++ menu.add(new JMenuItem("1"));
++ menu.add(new JMenuItem("2"));
++ menu.setMnemonic(KeyEvent.VK_M);
++ menu.getPopupMenu().addPopupMenuListener(this);
++ bar.add(menu);
++
++ setJMenuBar(bar);
++ getContentPane().add(new JButton(""));
++ setSize(300, 300);
++ setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++ pack();
++ setVisible(true);
++ }
++
++ public void rebuildMenu() {
++ menu.removeAll();
++ final String itemCommand = "A";
++ JMenuItem item = new JMenuItem(itemCommand);
++ item.addActionListener(new ActionListener() {
++ public void actionPerformed(ActionEvent e) {
++ JMenuItem item = ((JMenuItem)e.getSource());
++ if (e.getActionCommand() == itemCommand) {
++ itemASelected = true;
++ }
++ }
++ });
++ menu.add(item);
++ menu.add(new JMenuItem("B"));
++ }
++
++ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
++ rebuildMenu();
++ }
++
++ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
++ public void popupMenuCanceled(PopupMenuEvent e) {}
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,151 @@
++/*
++ * 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 4816114
++ @summary REGRESSION: Regression in divider location behavior when JSplitPane is resized
++ @author Andrey Pikalev
++ @run main bug4816114
++*/
++
++import javax.swing.*;
++import java.awt.*;
++import java.lang.reflect.*;
++import sun.awt.SunToolkit;
++
++
++public class bug4816114 {
++
++ JFrame fr;
++ JSplitPane splitPane;
++
++ boolean[] resized = new boolean[] { false, false, false,
++ false, false, false };
++ static int step = 0;
++ boolean h_passed = false;
++ boolean v_passed = false;
++
++ static bug4816114 test = new bug4816114();
++
++ public static void main(String[] args) throws InterruptedException, InvocationTargetException {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ test.createAndShowGUI();
++ }
++ });
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ toolkit.realSync();
++ Thread.sleep(1000);
++
++ step++;
++ test.doTest(150, 300);
++
++ step++;
++ test.doTest(650, 300);
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ test.splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
++ }
++ });
++
++ step++;
++ test.doTest(300, 650);
++
++ step++;
++ test.doTest(300, 150);
++
++ step++;
++ test.doTest(300, 650);
++
++ if ( !test.isPassed() ) {
++ throw new Error("The divider location is wrong.");
++ }
++ }
++ public void createAndShowGUI() {
++ fr = new JFrame("Test");
++
++ splitPane = new TestSplitPane();
++ splitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
++ splitPane.setResizeWeight(0);
++ splitPane.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
++
++ JButton leftButton = new JButton("LEFT");
++ leftButton.setPreferredSize(new Dimension(300, 300));
++ leftButton.setMinimumSize(new Dimension(150, 150));
++ splitPane.setLeftComponent(leftButton);
++
++ JButton rightButton = new JButton("RIGHT");
++ rightButton.setPreferredSize(new Dimension(300, 300));
++ rightButton.setMinimumSize(new Dimension(150, 150));
++ splitPane.setRightComponent(rightButton);
++
++ fr.getContentPane().add(splitPane, BorderLayout.CENTER);
++
++ fr.pack();
++ fr.setVisible(true);
++ }
++
++ void doTest(final int width, final int height) throws InterruptedException, InvocationTargetException {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ splitPane.setPreferredSize(new Dimension(width, height));
++ fr.pack();
++ }
++ });
++
++ synchronized (bug4816114.this) {
++ while (!resized[step]) {
++ bug4816114.this.wait();
++ }
++ }
++ }
++
++ synchronized void setPassed(int orientation, boolean passed) {
++ if (orientation == JSplitPane.HORIZONTAL_SPLIT) {
++ this.h_passed = passed;
++ }
++ else {
++ this.v_passed = passed;
++ }
++ }
++
++ synchronized boolean isPassed() {
++ return h_passed && v_passed;
++ }
++
++
++ class TestSplitPane extends JSplitPane {
++ public void setDividerLocation(int location) {
++ super.setDividerLocation(location);
++
++ if ( splitPane.getDividerLocation() == 151 ) {
++ setPassed(getOrientation(), true);
++ }
++
++ synchronized (bug4816114.this) {
++ resized[step] = true;
++ bug4816114.this.notifyAll();
++ }
++ }
++ }
++}
+--- ./jdk/test/javax/swing/JTable/7068740/bug7068740.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/swing/JTable/7068740/bug7068740.java Wed May 07 19:26:47 2014 -0700
+@@ -37,6 +37,7 @@
+ import java.awt.*;
+ import java.awt.event.KeyEvent;
+ import java.lang.reflect.InvocationTargetException;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ public class bug7068740 extends JFrame {
+
+@@ -66,6 +67,7 @@
+ };
+
+ table = new JTable(model);
++ table.setRowSelectionInterval(0, 0);
+ LayerUI<JComponent> layerUI = new LayerUI<>();
+ JLayer<JComponent> layer = new JLayer<>(table, layerUI);
+ JScrollPane scrollPane = new JScrollPane(layer);
+@@ -78,7 +80,7 @@
+ try {
+ if (robot == null) {
+ robot = new Robot();
+- robot.setAutoDelay(20);
++ robot.setAutoDelay(50);
+ }
+
+ if (toolkit == null) {
+@@ -104,24 +106,37 @@
+ }
+ }
+
+- private static void doTest() {
++ private static int getSelectedRow() throws Exception {
++ final AtomicInteger row = new AtomicInteger(-1);
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ row.set(table.getSelectedRow());
++ }
++ });
++ return row.intValue();
++ }
++
++ private static void doTest() throws Exception {
+ toolkit.realSync();
+- table.setRowSelectionInterval(0, 0);
+
+ robot.keyPress(KeyEvent.VK_PAGE_DOWN);
++ robot.keyRelease(KeyEvent.VK_PAGE_DOWN);
+ toolkit.realSync();
+- if (table.getSelectedRow() != 19) {
++
++ if (getSelectedRow() != 19) {
+ throw new RuntimeException("Test failed");
+ }
+
+ robot.keyPress(KeyEvent.VK_PAGE_UP);
++ robot.keyRelease(KeyEvent.VK_PAGE_UP);
+ toolkit.realSync();
+- if (table.getSelectedRow() != 0) {
++ if (getSelectedRow() != 0) {
+ throw new RuntimeException("Test failed");
+ }
+ }
+
+- public static void main(String[] args) {
++ public static void main(String[] args) throws Exception {
+ try {
+ UIManager.setLookAndFeel(new MetalLookAndFeel());
+ setUp();
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JTree/4927934/bug4927934.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,247 @@
++/*
++ * 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 4927934
++ @summary JTree traversal is unlike Native windows tree traversal
++ @author Andrey Pikalev
++ @run main bug4927934
++*/
++
++import javax.swing.*;
++import javax.swing.event.*;
++import javax.swing.tree.*;
++import java.awt.*;
++import java.awt.event.*;
++import java.lang.reflect.InvocationTargetException;
++import sun.awt.*;
++
++public class bug4927934 implements TreeSelectionListener, TreeExpansionListener, FocusListener {
++
++ final static Object listener = new bug4927934();
++
++ static boolean focusGained = false;
++ public static boolean selectionChanged = false;
++ public static boolean treeExpanded = false;
++ public static boolean treeCollapsed = false;
++
++ static JFrame frame;
++ static JTree tree;
++ static Robot robot;
++
++ public static void main(String args[]) throws Exception {
++ UIManager.setLookAndFeel(new javax.swing.plaf.metal.MetalLookAndFeel());
++
++ robot = new Robot();
++ robot.setAutoDelay(50);
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ frame = new JFrame();
++
++ DefaultMutableTreeNode root = new DefaultMutableTreeNode("root");
++ createNodes(root);
++ tree = new JTree(root);
++ JScrollPane scrollPane = new JScrollPane(tree);
++ frame.getContentPane().add(scrollPane);
++
++ tree.addFocusListener((FocusListener)listener);
++ tree.addTreeSelectionListener((TreeSelectionListener)listener);
++ tree.addTreeExpansionListener((TreeExpansionListener)listener);
++
++ frame.setSize(300, 300);
++ frame.setVisible(true);
++ }
++ });
++
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ toolkit.realSync();
++ Thread.sleep(1000);
++
++ SwingUtilities.invokeLater(new Runnable() {
++ public void run() {
++ tree.requestFocus();
++ }
++ });
++
++ synchronized(listener) {
++ if (!focusGained) {
++ System.out.println("waiting focusGained...");
++ try {
++ listener.wait(10000);
++ } catch (InterruptedException e) {
++ e.printStackTrace();
++ }
++ }
++ }
++
++ // GO TO RIGHT
++ selectionChanged = false;
++ hitKey(KeyEvent.VK_RIGHT);
++ toolkit.realSync();
++ if (!checkSelectionChanged(tree, 0)) {
++ throw new RuntimeException("Root should be selected");
++ }
++
++ selectionChanged = false;
++ hitKey(KeyEvent.VK_RIGHT);
++ toolkit.realSync();
++ if (!checkSelectionChanged(tree, 1)) {
++ throw new RuntimeException("Node should be selected");
++ }
++
++ treeExpanded = false;
++ hitKey(KeyEvent.VK_RIGHT);
++ toolkit.realSync();
++ if (!isTreeExpanded()) {
++ throw new RuntimeException("Node should be expanded");
++ }
++
++ selectionChanged = false;
++ hitKey(KeyEvent.VK_RIGHT);
++ toolkit.realSync();
++ if (!checkSelectionChanged(tree, 2)) {
++ throw new RuntimeException("Leaf1 should be selected");
++ }
++
++ selectionChanged = false;
++ hitKey(KeyEvent.VK_RIGHT);
++ toolkit.realSync();
++ if (!checkSelectionChanged(tree, 2)) {
++ throw new RuntimeException("Leaf1 should be selected");
++ }
++
++ // GO TO LEFT
++ selectionChanged = false;
++ hitKey(KeyEvent.VK_LEFT);
++ toolkit.realSync();
++ if (!checkSelectionChanged(tree, 1)) {
++ throw new RuntimeException("Node should be selected");
++ }
++
++ treeCollapsed = false;
++ hitKey(KeyEvent.VK_LEFT);
++ if (!isTreeCollapsed()) {
++ throw new RuntimeException("Node should be collapsed");
++ }
++
++ selectionChanged = false;
++ hitKey(KeyEvent.VK_LEFT);
++ toolkit.realSync();
++ if (!checkSelectionChanged(tree, 0)) {
++ throw new RuntimeException("Root should be selected");
++ }
++
++ treeCollapsed = false;
++ hitKey(KeyEvent.VK_LEFT);
++ toolkit.realSync();
++ if (!isTreeCollapsed()) {
++ throw new RuntimeException("Root should be collapsed");
++ }
++ }
++
++
++ synchronized public void focusLost(FocusEvent e) {
++ }
++
++ synchronized public void focusGained(FocusEvent e) {
++ focusGained = true;
++ System.out.println("focusGained");
++ listener.notifyAll();
++ }
++
++ private static void createNodes(DefaultMutableTreeNode root) {
++ DefaultMutableTreeNode node = new DefaultMutableTreeNode("Node");
++ node.add(new DefaultMutableTreeNode("Leaf1"));
++ node.add(new DefaultMutableTreeNode("Leaf2"));
++ root.add(node);
++ root.add(new DefaultMutableTreeNode("Leaf3"));
++ }
++
++ synchronized public void valueChanged(TreeSelectionEvent e) {
++ selectionChanged = true;
++ System.out.println("selectionChanged");
++ notifyAll();
++ }
++
++ synchronized public void treeCollapsed(TreeExpansionEvent e) {
++ System.out.println("treeCollapsed");
++ treeCollapsed = true;
++ notifyAll();
++ }
++
++ synchronized public void treeExpanded(TreeExpansionEvent e) {
++ System.out.println("treeExpanded");
++ treeExpanded = true;
++ notifyAll();
++ }
++
++ private static void hitKey(int key) {
++ System.out.println("key " + key + " pressed");
++ robot.keyPress(key);
++ robot.keyRelease(key);
++ }
++
++ private static boolean checkSelectionChanged(JTree tree, int shouldBeSel) {
++ synchronized(listener) {
++ if (!selectionChanged) {
++ System.out.println("waiting for selectionChanged...");
++ try {
++ listener.wait(5000);
++ } catch (InterruptedException e) {
++ e.printStackTrace();
++ }
++ }
++ }
++ int selRow = tree.getLeadSelectionRow();
++ System.out.println("Selected row: " + selRow);
++ return selRow == shouldBeSel;
++ }
++
++ private static boolean isTreeExpanded() {
++ synchronized(listener) {
++ if (!treeExpanded) {
++ System.out.println("waiting for treeExpanded...");
++ try {
++ listener.wait(5000);
++ } catch (InterruptedException e) {
++ e.printStackTrace();
++ }
++ }
++ }
++ return treeExpanded;
++ }
++
++ private static boolean isTreeCollapsed() {
++ synchronized(listener) {
++ if (!treeCollapsed) {
++ System.out.println("waiting for treeCollapsed...");
++ try {
++ listener.wait(5000);
++ } catch (InterruptedException e) {
++ e.printStackTrace();
++ }
++ }
++ }
++ return treeCollapsed;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/Popup/TaskbarPositionTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,340 @@
++/*
++ * 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.*;
++import java.awt.event.*;
++import javax.swing.*;
++import javax.swing.event.*;
++
++/**
++ * @test @bug 4245587 4474813 4425878 4767478 8015599
++ * @author Mark Davidson
++ * @summary Tests the location of the heavy weight popup portion of JComboBox,
++ * JMenu and JPopupMenu.
++ * @library ../regtesthelpers
++ * @build Util
++ * @run main TaskbarPositionTest
++ */
++public class TaskbarPositionTest extends JFrame implements ActionListener {
++
++ private boolean done;
++ private Throwable error;
++ private static TaskbarPositionTest test;
++ private static JPopupMenu popupMenu;
++ private static JPanel panel;
++ private static JComboBox<String> combo1;
++ private static JComboBox<String> combo2;
++ private static JMenuBar menubar;
++ private static JMenu menu1;
++ private static JMenu menu2;
++ private static Rectangle fullScreenBounds;
++ // The usable desktop space: screen size - screen insets.
++ private static Rectangle screenBounds;
++ private static String[] numData = {
++ "One", "Two", "Three", "Four", "Five", "Six", "Seven"
++ };
++ private static String[] dayData = {
++ "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
++ };
++ private static char[] mnDayData = {
++ 'M', 'T', 'W', 'R', 'F', 'S', 'U'
++ };
++
++ public TaskbarPositionTest() {
++ super("Use CTRL-down to show a JPopupMenu");
++ setContentPane(panel = createContentPane());
++ setJMenuBar(createMenuBar("1 - First Menu", true));
++ setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++
++ // CTRL-down will show the popup.
++ panel.getInputMap().put(KeyStroke.getKeyStroke(
++ KeyEvent.VK_DOWN, InputEvent.CTRL_MASK), "OPEN_POPUP");
++ panel.getActionMap().put("OPEN_POPUP", new PopupHandler());
++
++ pack();
++
++ Toolkit toolkit = Toolkit.getDefaultToolkit();
++ fullScreenBounds = new Rectangle(new Point(), toolkit.getScreenSize());
++ screenBounds = new Rectangle(new Point(), toolkit.getScreenSize());
++
++ // Place the frame near the bottom. This is a pretty wild guess.
++ this.setLocation(0, (int) screenBounds.getHeight() - 2 * this.getHeight());
++
++ // Reduce the screen bounds by the insets.
++ GraphicsConfiguration gc = this.getGraphicsConfiguration();
++ if (gc != null) {
++ Insets screenInsets = toolkit.getScreenInsets(gc);
++ screenBounds = gc.getBounds();
++ screenBounds.width -= (screenInsets.left + screenInsets.right);
++ screenBounds.height -= (screenInsets.top + screenInsets.bottom);
++ screenBounds.x += screenInsets.left;
++ screenBounds.y += screenInsets.top;
++ }
++
++ setVisible(true);
++ }
++
++ public static class ComboPopupCheckListener implements PopupMenuListener {
++
++ public void popupMenuCanceled(PopupMenuEvent ev) {
++ }
++
++ public void popupMenuWillBecomeVisible(PopupMenuEvent ev) {
++ }
++
++ public void popupMenuWillBecomeInvisible(PopupMenuEvent ev) {
++ Point cpos = combo1.getLocation();
++ SwingUtilities.convertPointToScreen(cpos, panel);
++
++ JPopupMenu pm = (JPopupMenu) combo1.getUI().getAccessibleChild(combo1, 0);
++
++ if (pm != null) {
++ Point p = pm.getLocation();
++ SwingUtilities.convertPointToScreen(p, pm);
++ if (p.y < cpos.y) {
++ throw new RuntimeException("ComboBox popup is wrongly aligned");
++ } // check that popup was opened down
++ }
++ }
++ }
++
++ private class PopupHandler extends AbstractAction {
++
++ public void actionPerformed(ActionEvent e) {
++ if (!popupMenu.isVisible()) {
++ popupMenu.show((Component) e.getSource(), 40, 40);
++ }
++ isPopupOnScreen(popupMenu, fullScreenBounds);
++ }
++ }
++
++ class PopupListener extends MouseAdapter {
++
++ private JPopupMenu popup;
++
++ public PopupListener(JPopupMenu popup) {
++ this.popup = popup;
++ }
++
++ public void mousePressed(MouseEvent e) {
++ maybeShowPopup(e);
++ }
++
++ public void mouseReleased(MouseEvent e) {
++ maybeShowPopup(e);
++ }
++
++ private void maybeShowPopup(MouseEvent e) {
++ if (e.isPopupTrigger()) {
++ popup.show(e.getComponent(), e.getX(), e.getY());
++ isPopupOnScreen(popup, fullScreenBounds);
++ }
++ }
++ }
++
++ /**
++ * Tests if the popup is on the screen.
++ */
++ public static void isPopupOnScreen(JPopupMenu popup, Rectangle checkBounds) {
++ Dimension dim = popup.getSize();
++ Point pt = new Point();
++ SwingUtilities.convertPointToScreen(pt, popup);
++ Rectangle bounds = new Rectangle(pt, dim);
++
++ if (!SwingUtilities.isRectangleContainingRectangle(checkBounds, bounds)) {
++ throw new RuntimeException("We do not match! " + checkBounds + " / " + bounds);
++ }
++
++ }
++
++ private JPanel createContentPane() {
++ JPanel panel = new JPanel();
++
++ combo1 = new JComboBox<>(numData);
++ panel.add(combo1);
++ combo2 = new JComboBox<>(dayData);
++ combo2.setEditable(true);
++ panel.add(combo2);
++ panel.setSize(300, 200);
++
++ popupMenu = new JPopupMenu();
++ JMenuItem item;
++ for (int i = 0; i < dayData.length; i++) {
++ item = popupMenu.add(new JMenuItem(dayData[i], mnDayData[i]));
++ item.addActionListener(this);
++ }
++ panel.addMouseListener(new PopupListener(popupMenu));
++
++ JTextField field = new JTextField("CTRL+down for Popup");
++ // CTRL-down will show the popup.
++ field.getInputMap().put(KeyStroke.getKeyStroke(
++ KeyEvent.VK_DOWN, InputEvent.CTRL_MASK), "OPEN_POPUP");
++ field.getActionMap().put("OPEN_POPUP", new PopupHandler());
++
++ panel.add(field);
++
++ return panel;
++ }
++
++ /**
++ * @param str name of Menu
++ * @param bFlag set mnemonics on menu items
++ */
++ private JMenuBar createMenuBar(String str, boolean bFlag) {
++ menubar = new JMenuBar();
++
++ menu1 = new JMenu(str);
++ menu1.setMnemonic(str.charAt(0));
++ menu1.addActionListener(this);
++
++ menubar.add(menu1);
++ for (int i = 0; i < 8; i++) {
++ JMenuItem menuitem = new JMenuItem("1 JMenuItem" + i);
++ menuitem.addActionListener(this);
++ if (bFlag) {
++ menuitem.setMnemonic('0' + i);
++ }
++ menu1.add(menuitem);
++ }
++
++ // second menu
++ menu2 = new JMenu("2 - Second Menu");
++ menu2.addActionListener(this);
++ menu2.setMnemonic('2');
++
++ menubar.add(menu2);
++ for (int i = 0; i < 5; i++) {
++ JMenuItem menuitem = new JMenuItem("2 JMenuItem" + i);
++ menuitem.addActionListener(this);
++
++ if (bFlag) {
++ menuitem.setMnemonic('0' + i);
++ }
++ menu2.add(menuitem);
++ }
++ JMenu submenu = new JMenu("Sub Menu");
++ submenu.setMnemonic('S');
++ submenu.addActionListener(this);
++ for (int i = 0; i < 5; i++) {
++ JMenuItem menuitem = new JMenuItem("S JMenuItem" + i);
++ menuitem.addActionListener(this);
++ if (bFlag) {
++ menuitem.setMnemonic('0' + i);
++ }
++ submenu.add(menuitem);
++ }
++ menu2.add(new JSeparator());
++ menu2.add(submenu);
++
++ return menubar;
++ }
++
++ public void actionPerformed(ActionEvent evt) {
++ Object obj = evt.getSource();
++ if (obj instanceof JMenuItem) {
++ // put the focus on the noneditable combo.
++ combo1.requestFocus();
++ }
++ }
++
++ public static void main(String[] args) throws Throwable {
++
++ sun.awt.SunToolkit toolkit = (sun.awt.SunToolkit) Toolkit.getDefaultToolkit();
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ test = new TaskbarPositionTest();
++ }
++ });
++
++ // Use Robot to automate the test
++ Robot robot;
++ robot = new Robot();
++ robot.setAutoDelay(125);
++
++ // 1 - menu
++ Util.hitMnemonics(robot, KeyEvent.VK_1);
++
++ toolkit.realSync();
++ isPopupOnScreen(menu1.getPopupMenu(), screenBounds);
++
++ // 2 menu with sub menu
++ robot.keyPress(KeyEvent.VK_RIGHT);
++ robot.keyRelease(KeyEvent.VK_RIGHT);
++ Util.hitMnemonics(robot, KeyEvent.VK_S);
++
++ toolkit.realSync();
++ isPopupOnScreen(menu2.getPopupMenu(), screenBounds);
++
++ robot.keyPress(KeyEvent.VK_ENTER);
++ robot.keyRelease(KeyEvent.VK_ENTER);
++
++ // Focus should go to non editable combo box
++ toolkit.realSync();
++ Thread.sleep(500);
++
++ robot.keyPress(KeyEvent.VK_DOWN);
++
++ // How do we check combo boxes?
++
++ // Editable combo box
++ robot.keyPress(KeyEvent.VK_TAB);
++ robot.keyRelease(KeyEvent.VK_TAB);
++ robot.keyPress(KeyEvent.VK_DOWN);
++ robot.keyRelease(KeyEvent.VK_DOWN);
++
++ // combo1.getUI();
++
++ // Popup from Text field
++ robot.keyPress(KeyEvent.VK_TAB);
++ robot.keyRelease(KeyEvent.VK_TAB);
++ robot.keyPress(KeyEvent.VK_CONTROL);
++ robot.keyPress(KeyEvent.VK_DOWN);
++ robot.keyRelease(KeyEvent.VK_DOWN);
++ robot.keyRelease(KeyEvent.VK_CONTROL);
++
++ // Popup from a mouse click.
++ Point pt = new Point(2, 2);
++ SwingUtilities.convertPointToScreen(pt, panel);
++ robot.mouseMove((int) pt.getX(), (int) pt.getY());
++ robot.mousePress(InputEvent.BUTTON3_MASK);
++ robot.mouseRelease(InputEvent.BUTTON3_MASK);
++
++ toolkit.realSync();
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ test.setLocation(-30, 100);
++ combo1.addPopupMenuListener(new ComboPopupCheckListener());
++ combo1.requestFocus();
++ }
++ });
++
++ robot.keyPress(KeyEvent.VK_DOWN);
++ robot.keyRelease(KeyEvent.VK_DOWN);
++ robot.keyPress(KeyEvent.VK_ESCAPE);
++ robot.keyRelease(KeyEvent.VK_ESCAPE);
++
++ toolkit.realSync();
++ Thread.sleep(500);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,89 @@
++/*
++ * 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 4983388 8015600
++ @summary shortcuts on menus do not work on JDS
++ @author Oleg Mokhovikov
++ @library ../../../../regtesthelpers
++ @build Util
++ @run main bug4983388
++*/
++
++import sun.awt.*;
++import java.awt.*;
++import javax.swing.*;
++import javax.swing.event.MenuListener;
++import javax.swing.event.MenuEvent;
++import java.awt.event.KeyEvent;
++
++public class bug4983388 {
++ static volatile boolean bMenuSelected = false;
++
++ private static class TestMenuListener implements MenuListener {
++ public void menuCanceled(MenuEvent e) {}
++ public void menuDeselected(MenuEvent e) {}
++ public void menuSelected(MenuEvent e) {
++ System.out.println("menuSelected");
++ bMenuSelected = true;
++ }
++ }
++
++ private static void createAndShowGUI() {
++ JMenuBar menuBar = new JMenuBar();
++ JMenu menu = new JMenu("File");
++ menu.setMnemonic('F');
++ menuBar.add(menu);
++ JFrame frame = new JFrame();
++ frame.setJMenuBar(menuBar);
++ frame.pack();
++ frame.setVisible(true);
++ MenuListener listener = new TestMenuListener();
++ menu.addMenuListener(listener);
++ }
++
++ public static void main(String[] args) throws Exception {
++
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ try {
++ UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
++ } catch (UnsupportedLookAndFeelException | ClassNotFoundException ex) {
++ System.err.println("GTKLookAndFeel is not supported on this platform. Using defailt LaF for this platform.");
++ }
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++
++ Robot robot = new Robot();
++ Util.hitMnemonics(robot, KeyEvent.VK_F);
++
++ toolkit.realSync();
++
++ if (!bMenuSelected) {
++ throw new RuntimeException("shortcuts on menus do not work");
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,174 @@
++/*
++ * 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 8023474
++ * @summary Tests that the first mouse press starts editing in JTree
++ * @author Dmitry Markov
++ * @run main bug8023474
++ */
++
++import sun.awt.SunToolkit;
++
++import javax.swing.*;
++import javax.swing.event.CellEditorListener;
++import javax.swing.tree.DefaultMutableTreeNode;
++import javax.swing.tree.DefaultTreeModel;
++import javax.swing.tree.TreeCellEditor;
++import javax.swing.tree.TreeCellRenderer;
++import java.awt.*;
++import java.awt.event.InputEvent;
++import java.util.EventObject;
++
++public class bug8023474 {
++ private static JTree tree;
++
++ public static void main(String[] args) throws Exception {
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ Robot robot = new Robot();
++ robot.setAutoDelay(50);
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++
++ toolkit.realSync();
++
++ Point point = getRowPointToClick(1);
++ robot.mouseMove(point.x, point.y);
++ robot.mousePress(InputEvent.BUTTON1_MASK);
++ robot.mouseRelease(InputEvent.BUTTON1_MASK);
++
++ toolkit.realSync();
++
++ Boolean result = (Boolean)tree.getCellEditor().getCellEditorValue();
++ if (!result) {
++ throw new RuntimeException("Test Failed!");
++ }
++ }
++
++ private static void createAndShowGUI() {
++ try {
++ UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
++ } catch (Exception e) {
++ throw new RuntimeException(e);
++ }
++
++ DefaultMutableTreeNode root = new DefaultMutableTreeNode("root");
++ DefaultMutableTreeNode item = new DefaultMutableTreeNode("item");
++ DefaultMutableTreeNode subItem = new DefaultMutableTreeNode("subItem");
++
++ root.add(item);
++ item.add(subItem);
++
++ DefaultTreeModel model = new DefaultTreeModel(root);
++ tree = new JTree(model);
++
++ tree.setCellEditor(new Editor());
++ tree.setEditable(true);
++ tree.setRowHeight(30);
++ tree.setCellRenderer(new CheckboxCellRenderer());
++
++ JFrame frame = new JFrame("bug8023474");
++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++ frame.add(new JScrollPane(tree));
++ frame.setSize(400, 300);
++ frame.setVisible(true);
++ }
++
++ private static Point getRowPointToClick(final int row) throws Exception {
++ final Point[] result = new Point[1];
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ Rectangle rect = tree.getRowBounds(row);
++ Point point = new Point(rect.x + 10, rect.y + rect.height / 2);
++ SwingUtilities.convertPointToScreen(point, tree);
++ result[0] = point;
++ }
++ });
++ return result[0];
++ }
++
++ private static class Editor extends JPanel implements TreeCellEditor {
++ private JCheckBox checkbox;
++
++ public Editor() {
++ setOpaque(false);
++ checkbox = new JCheckBox();
++ add(checkbox);
++ }
++
++ public Component getTreeCellEditorComponent(JTree tree, Object value, boolean isSelected,
++ boolean expanded, boolean leaf, int row) {
++ checkbox.setText(value.toString());
++ checkbox.setSelected(false);
++ return this;
++ }
++
++ public Object getCellEditorValue() {
++ return checkbox.isSelected();
++ }
++
++ public boolean isCellEditable(EventObject anEvent) {
++ return true;
++ }
++
++ public boolean shouldSelectCell(EventObject anEvent) {
++ return true;
++ }
++
++ public boolean stopCellEditing() {
++ return true;
++ }
++
++ public void cancelCellEditing() {
++ }
++
++ public void addCellEditorListener(CellEditorListener l) {
++ }
++
++ public void removeCellEditorListener(CellEditorListener l) {
++ }
++ }
++
++ private static class CheckboxCellRenderer extends JPanel implements TreeCellRenderer {
++ private JCheckBox checkbox;
++
++ public CheckboxCellRenderer() {
++ setOpaque(false);
++ checkbox = new JCheckBox();
++ add(checkbox);
++ }
++
++ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,
++ boolean leaf, int row, boolean hasFocus) {
++ checkbox.setText(value.toString());
++ checkbox.setSelected(false);
++ return this;
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,270 @@
++/*
++ * 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 8016833
++ @summary underlines and strikethroughs should be painted at the correct
++ positions for different kind of text styles: normal, superscript and subscript
++ @author Anton Nashatyrev
++ @run main bug8016833
++*/
++import javax.swing.*;
++import javax.swing.text.BadLocationException;
++import javax.swing.text.Style;
++import javax.swing.text.StyleConstants;
++import javax.swing.text.StyledDocument;
++import java.awt.*;
++import java.awt.image.BufferedImage;
++import java.lang.reflect.InvocationTargetException;
++
++public class bug8016833 {
++
++ void drawText(final Graphics g, final boolean underline, final boolean strikethrough, final boolean background) {
++ drawText(g, "mama", underline, strikethrough, background);
++ }
++
++ void drawText(final Graphics g, final String text, final boolean underline, final boolean strikethrough, final boolean background) {
++ try {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ final JTextPane comp = new JTextPane();
++ final StyledDocument doc = comp.getStyledDocument();
++
++ Style style = comp.addStyle("superscript", null);
++ setNormalStyle(style);
++
++ if (underline) {
++ StyleConstants.setUnderline(style, true);
++ }
++ if (strikethrough) {
++ StyleConstants.setStrikeThrough(style, true);
++ }
++ if (background) {
++ StyleConstants.setBackground(style, Color.BLUE);
++ }
++ try {
++ doc.insertString(doc.getLength(), "mama", style);
++ } catch (BadLocationException e) {
++ throw new RuntimeException(e);
++ }
++
++ comp.setSize(200, 100);
++ comp.paint(g);
++ }
++ });
++ } catch (InterruptedException e) {
++ throw new RuntimeException(e);
++ } catch (InvocationTargetException e) {
++ throw new RuntimeException(e);
++ }
++ }
++
++ void setNormalStyle(Style style) {
++ StyleConstants.setSuperscript(style, true);
++ }
++
++ int getEmptyPixel() {
++ return 0xFFFFFFFF;
++ }
++
++ boolean isPixelEmpty(int argb) {
++ return (argb & 0x00FFFFFF) == (getEmptyPixel() & 0x00FFFFFF);
++ }
++
++ boolean isLineEmpty(BufferedImage img, int coord, boolean isHorizontal) {
++ int len = isHorizontal ? img.getWidth() : img.getHeight();
++ for (int i = 0; i < len; i++) {
++ int pixel = isHorizontal ? img.getRGB(i, coord) : img.getRGB(coord, i);
++ if (!isPixelEmpty(pixel)) {
++ return false;
++ }
++ }
++ return true;
++ }
++
++ Rectangle getPixelsOutline(BufferedImage img) {
++ int x1 = 0;
++ while (x1 < img.getWidth() && isLineEmpty(img, x1, false)) {
++ x1++;
++ }
++ int x2 = img.getWidth() - 1;
++ while (x2 >= 0 && isLineEmpty(img, x2, false)) {
++ x2--;
++ }
++ int y1 = 0;
++ while (y1 < img.getHeight() && isLineEmpty(img, y1, true)) {
++ y1++;
++ }
++ int y2 = img.getHeight() - 1;
++ while (y2 >= 0 && isLineEmpty(img, y2, true)) {
++ y2--;
++ }
++
++ return new Rectangle(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
++ }
++
++ BufferedImage createImage() {
++ final BufferedImage img = new BufferedImage(200, 100, BufferedImage.TYPE_INT_ARGB);
++ try {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ Graphics g = img.getGraphics();
++ g.setColor(new Color(getEmptyPixel()));
++ g.fillRect(0, 0, 10000, 10000);
++ }
++ });
++ } catch (InterruptedException e) {
++ throw new RuntimeException(e);
++ } catch (InvocationTargetException e) {
++ throw new RuntimeException(e);
++ }
++ return img;
++ }
++
++ int subPixels(int pix1, int pix2) {
++ if (pix1 == pix2) {
++ return getEmptyPixel();
++ }
++ return pix1;
++ }
++
++ /**
++ * Subtracts img2 from img1
++ */
++ BufferedImage subImages(BufferedImage img1, BufferedImage img2) {
++ if (img1.getHeight() != img2.getHeight() ||
++ img1.getWidth() != img2.getWidth()) {
++ throw new RuntimeException("Different sizes");
++ }
++ BufferedImage ret = new BufferedImage(img1.getWidth(), img1.getHeight(), img1.getType());
++
++ for (int x = 0; x < ret.getWidth(); x++) {
++ for (int y = 0; y < ret.getHeight(); y++) {
++ ret.setRGB(x, y, subPixels(img1.getRGB(x, y), img2.getRGB(x, y)));
++ }
++ }
++ return ret;
++ }
++
++ void testUnderline() {
++ System.out.println(" testUnderline()");
++
++ final BufferedImage img1 = createImage();
++ drawText(img1.getGraphics(), true, false, false);
++ final Rectangle out1 = getPixelsOutline(img1);
++ System.out.println(" Underlined: " + out1);
++
++ final BufferedImage img2 = createImage();
++ drawText(img2.getGraphics(), false, false, false);
++ final Rectangle out2 = getPixelsOutline(img2);
++ System.out.println(" Normal: " + out2);
++
++ final BufferedImage img3 = subImages(img1, img2);
++ final Rectangle out3 = getPixelsOutline(img3);
++ System.out.println(" Sub: " + out3);
++
++ // underline is not too thick
++ assertTrue(out3.getHeight() <= 2);
++ // not too wide
++ assertTrue(out3.getWidth() * 0.8 < out2.getWidth());
++ // not too low
++ assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) < 3);
++ // not too high
++ assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) > 0);
++ }
++
++ void testStrikthrough() {
++ System.out.println(" testStrikthrough()");
++
++ final BufferedImage img1 = createImage();
++ drawText(img1.getGraphics(), false, true, false);
++ final Rectangle out1 = getPixelsOutline(img1);
++ System.out.println(" Striked: " + out1);
++
++ final BufferedImage img2 = createImage();
++ drawText(img2.getGraphics(), false, false, false);
++ final Rectangle out2 = getPixelsOutline(img2);
++ System.out.println(" Normal: " + out2);
++
++ final BufferedImage img3 = subImages(img1, img2);
++ final Rectangle out3 = getPixelsOutline(img3);
++ System.out.println(" Sub: " + out3);
++
++ // strikethrough is not too thick
++ assertTrue(out3.getHeight() <= 2);
++ // not too wide
++ assertTrue(out3.getWidth() * 0.8 < out2.getWidth());
++ // not too low
++ assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) < 0);
++ // not too high
++ assertTrue(out3.getY() - out1.getY() > 1);
++ }
++ void assertTrue(boolean b) {
++ if (!b) {
++ throw new RuntimeException("Assertion failed");
++ }
++ }
++
++ static void testSuperScript() {
++ System.out.println("testSuperScript()");
++ bug8016833 b = new bug8016833() {
++ @Override
++ void setNormalStyle(Style style) {
++ StyleConstants.setSuperscript(style, true);
++ }
++ };
++ b.testUnderline();
++ b.testStrikthrough();
++ }
++
++ static void testSubScript() {
++ System.out.println("testSubScript()");
++ bug8016833 b = new bug8016833() {
++ @Override
++ void setNormalStyle(Style style) {
++ StyleConstants.setSubscript(style, true);
++ }
++ };
++ b.testUnderline();
++ b.testStrikthrough();
++ }
++
++ static void testNormalScript() {
++ System.out.println("testNormalScript()");
++ bug8016833 b = new bug8016833() {
++ @Override
++ void setNormalStyle(Style style) {
++ }
++ };
++ b.testUnderline();
++ b.testStrikthrough();
++ }
++
++ public static void main(String[] args) {
++ testSubScript();
++ testSuperScript();
++ testNormalScript();
++ }
++}
+--- ./jdk/test/javax/swing/text/View/8014863/bug8014863.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/swing/text/View/8014863/bug8014863.java Wed May 07 19:26:47 2014 -0700
+@@ -24,6 +24,7 @@
+ /*
+ * @test
+ * @bug 8014863
++ * @bug 8024395
+ * @summary Tests the calculation of the line breaks when a text is inserted
+ * @author Dmitry Markov
+ * @library ../../../regtesthelpers
+@@ -34,91 +35,107 @@
+ import sun.awt.SunToolkit;
+
+ import javax.swing.*;
++import javax.swing.text.GlyphView;
++import javax.swing.text.View;
+ import javax.swing.text.html.HTMLEditorKit;
+ import java.awt.*;
+ import java.awt.event.KeyEvent;
++import java.lang.reflect.Field;
++import java.util.ArrayList;
++import java.util.Arrays;
+
+ public class bug8014863 {
+
+ private static JEditorPane editorPane;
++ private static JFrame frame;
+ private static Robot robot;
+ private static SunToolkit toolkit;
+
++ private static String text1 = "<p>one two qqqq <em>this is a test sentence</em> qqqq <em>pp</em> qqqq <em>pp</em> " +
++ "qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq</p>";
++ private static String text2 = "<p>qqqq <em>this is a test sentence</em> qqqq <em>pp</em> qqqq <em>pp</em> " +
++ "qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq</p>";
++
++ private static ArrayList<GlyphView> glyphViews;
++
+ public static void main(String[] args) throws Exception {
+ toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+ robot = new Robot();
++ robot.setAutoDelay(50);
++ glyphViews = new ArrayList<GlyphView>();
+
+- createAndShowGUI();
++ createAndShowGUI(text1);
++
++ toolkit.realSync();
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ retrieveGlyphViews(editorPane.getUI().getRootView(editorPane));
++ }
++ });
++ GlyphView [] arr1 = glyphViews.toArray(new GlyphView[glyphViews.size()]);
++
++ frame.dispose();
++ glyphViews.clear();
++
++ createAndShowGUI(text2);
+
+ toolkit.realSync();
+
+ Util.hitKeys(robot, KeyEvent.VK_HOME);
+- Util.hitKeys(robot, KeyEvent.VK_O);
+-
+ toolkit.realSync();
+
+- if (3 != getNumberOfTextLines()) {
+- throw new RuntimeException("The number of texts lines does not meet the expectation");
+- }
+-
++ Util.hitKeys(robot, KeyEvent.VK_O);
+ Util.hitKeys(robot, KeyEvent.VK_N);
+-
+- toolkit.realSync();
+-
+- if (3 != getNumberOfTextLines()) {
+- throw new RuntimeException("The number of texts lines does not meet the expectation");
+- }
+-
+ Util.hitKeys(robot, KeyEvent.VK_E);
+ Util.hitKeys(robot, KeyEvent.VK_SPACE);
+ Util.hitKeys(robot, KeyEvent.VK_T);
+ Util.hitKeys(robot, KeyEvent.VK_W);
++ Util.hitKeys(robot, KeyEvent.VK_O);
++ Util.hitKeys(robot, KeyEvent.VK_SPACE);
+
+ toolkit.realSync();
+
+- if (3 != getNumberOfTextLines()) {
+- throw new RuntimeException("The number of texts lines does not meet the expectation");
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ retrieveGlyphViews(editorPane.getUI().getRootView(editorPane));
++ }
++ });
++ GlyphView [] arr2 = glyphViews.toArray(new GlyphView[glyphViews.size()]);
++
++ if (arr1.length != arr2.length) {
++ throw new RuntimeException("Test Failed!");
++ }
++
++ for (int i=0; i<arr1.length; i++) {
++ GlyphView v1 = arr1[i];
++ GlyphView v2 = arr2[i];
++ Field field = GlyphView.class.getDeclaredField("breakSpots");
++ field.setAccessible(true);
++ int[] breakSpots1 = (int[])field.get(v1);
++ int[] breakSpots2 = (int[])field.get(v2);
++ if (!Arrays.equals(breakSpots1,breakSpots2)) {
++ throw new RuntimeException("Test Failed!");
++ }
++ }
++
++ frame.dispose();
++ }
++
++ private static void retrieveGlyphViews(View root) {
++ for (int i=0; i<= root.getViewCount()-1; i++) {
++ View view = root.getView(i);
++ if (view instanceof GlyphView && view.isVisible()) {
++ if (!glyphViews.contains(view)) {
++ glyphViews.add((GlyphView)view);
++ }
++ } else {
++ retrieveGlyphViews(view);
++ }
+ }
+ }
+
+- private static int getNumberOfTextLines() throws Exception {
+- int numberOfLines = 0;
+- int caretPosition = getCaretPosition();
+- int current = 1;
+- int previous;
+-
+- setCaretPosition(current);
+- do {
+- previous = current;
+- Util.hitKeys(robot, KeyEvent.VK_DOWN);
+- toolkit.realSync();
+- current = getCaretPosition();
+- numberOfLines++;
+- } while (current != previous);
+-
+- setCaretPosition(caretPosition);
+- return numberOfLines;
+- }
+-
+- private static int getCaretPosition() throws Exception {
+- final int[] result = new int[1];
+- SwingUtilities.invokeAndWait(new Runnable() {
+- public void run() {
+- result[0] = editorPane.getCaretPosition();
+- }
+- });
+- return result[0];
+- }
+-
+- private static void setCaretPosition(final int position) throws Exception {
+- SwingUtilities.invokeAndWait(new Runnable() {
+- public void run() {
+- editorPane.setCaretPosition(position);
+- }
+- });
+- }
+-
+- private static void createAndShowGUI() throws Exception {
++ private static void createAndShowGUI(final String text) throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ try {
+@@ -126,17 +143,14 @@
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+- JFrame frame = new JFrame();
++ frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ editorPane = new JEditorPane();
+ HTMLEditorKit editorKit = new HTMLEditorKit();
+ editorPane.setEditorKit(editorKit);
+- editorPane.setText("<p>qqqq <em>pp</em> qqqq <em>pp</em> " +
+- "qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp" +
+- "</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq</p>");
++ editorPane.setText(text);
+ editorPane.setCaretPosition(1);
+-
+ frame.add(editorPane);
+ frame.setSize(200, 200);
+ frame.setVisible(true);
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,220 @@
++/*
++ * 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 8009579
++ * @summary The initCause() incorrectly initialise the cause in
++ * XPathException class when used with XPathException(String)
++ * constructor.
++ * @run main XPathExceptionInitCause
++ * @author aleksej.efimov@oracle.com
++ */
++
++import javax.xml.xpath.XPathException;
++import java.io.ByteArrayOutputStream;
++import java.io.ByteArrayInputStream;
++import java.io.ObjectOutputStream;
++import java.io.ObjectInputStream;
++import java.io.IOException;
++import java.io.InvalidClassException;
++
++
++public class XPathExceptionInitCause {
++
++ /* This is a serial form of XPathException with two causes serialized
++ * by JDK7 code:
++ *
++ * ByteArrayOutputStream fser = new ByteArrayOutputStream();
++ * ObjectOutputStream oos = new ObjectOutputStream(fser);
++ * oos.writeObject(new XPathException(new Exception()).initCause(null));
++ * oos.close();
++ */
++ static final byte [] TWOCAUSES = {-84,-19,0,5,115,114,0,30,106,97,118,97,120,46,120,
++ 109,108,46,120,112,97,116,104,46,88,80,97,116,104,69,120,99,101,112,116,
++ 105,111,110,-26,-127,97,60,-120,119,127,28,2,0,1,76,0,5,99,97,117,115,101,
++ 116,0,21,76,106,97,118,97,47,108,97,110,103,47,84,104,114,111,119,97,98,
++ 108,101,59,120,114,0,19,106,97,118,97,46,108,97,110,103,46,69,120,99,101,
++ 112,116,105,111,110,-48,-3,31,62,26,59,28,-60,2,0,0,120,114,0,19,106,97,
++ 118,97,46,108,97,110,103,46,84,104,114,111,119,97,98,108,101,-43,-58,53,
++ 39,57,119,-72,-53,3,0,4,76,0,5,99,97,117,115,101,113,0,126,0,1,76,0,13,
++ 100,101,116,97,105,108,77,101,115,115,97,103,101,116,0,18,76,106,97,118,
++ 97,47,108,97,110,103,47,83,116,114,105,110,103,59,91,0,10,115,116,97,99,
++ 107,84,114,97,99,101,116,0,30,91,76,106,97,118,97,47,108,97,110,103,47,83,
++ 116,97,99,107,84,114,97,99,101,69,108,101,109,101,110,116,59,76,0,20,115,
++ 117,112,112,114,101,115,115,101,100,69,120,99,101,112,116,105,111,110,115,
++ 116,0,16,76,106,97,118,97,47,117,116,105,108,47,76,105,115,116,59,120,112,
++ 112,112,117,114,0,30,91,76,106,97,118,97,46,108,97,110,103,46,83,116,97,99,
++ 107,84,114,97,99,101,69,108,101,109,101,110,116,59,2,70,42,60,60,-3,34,57,
++ 2,0,0,120,112,0,0,0,1,115,114,0,27,106,97,118,97,46,108,97,110,103,46,83,
++ 116,97,99,107,84,114,97,99,101,69,108,101,109,101,110,116,97,9,-59,-102,
++ 38,54,-35,-123,2,0,4,73,0,10,108,105,110,101,78,117,109,98,101,114,76,0,
++ 14,100,101,99,108,97,114,105,110,103,67,108,97,115,115,113,0,126,0,4,76,
++ 0,8,102,105,108,101,78,97,109,101,113,0,126,0,4,76,0,10,109,101,116,104,
++ 111,100,78,97,109,101,113,0,126,0,4,120,112,0,0,0,31,116,0,23,88,80,97,116,
++ 104,69,120,99,101,112,116,105,111,110,83,101,114,105,97,108,105,122,101,
++ 116,0,28,88,80,97,116,104,69,120,99,101,112,116,105,111,110,83,101,114,105,
++ 97,108,105,122,101,46,106,97,118,97,116,0,4,109,97,105,110,115,114,0,38,
++ 106,97,118,97,46,117,116,105,108,46,67,111,108,108,101,99,116,105,111,110,
++ 115,36,85,110,109,111,100,105,102,105,97,98,108,101,76,105,115,116,-4,15,
++ 37,49,-75,-20,-114,16,2,0,1,76,0,4,108,105,115,116,113,0,126,0,6,120,114,
++ 0,44,106,97,118,97,46,117,116,105,108,46,67,111,108,108,101,99,116,105,111,
++ 110,115,36,85,110,109,111,100,105,102,105,97,98,108,101,67,111,108,108,101,
++ 99,116,105,111,110,25,66,0,-128,-53,94,-9,30,2,0,1,76,0,1,99,116,0,22,76,
++ 106,97,118,97,47,117,116,105,108,47,67,111,108,108,101,99,116,105,111,110,
++ 59,120,112,115,114,0,19,106,97,118,97,46,117,116,105,108,46,65,114,114,97,
++ 121,76,105,115,116,120,-127,-46,29,-103,-57,97,-99,3,0,1,73,0,4,115,105,
++ 122,101,120,112,0,0,0,0,119,4,0,0,0,0,120,113,0,126,0,20,120,115,113,0,126,
++ 0,2,113,0,126,0,21,112,117,113,0,126,0,8,0,0,0,1,115,113,0,126,0,10,0,0,0,
++ 31,113,0,126,0,12,113,0,126,0,13,113,0,126,0,14,113,0,126,0,18,120
++ };
++
++ /* This is a serial form of ordinary XPathException serialized by JDK7 code:
++ *
++ * Throwable cause = new Throwable( "message 1" );
++ * XPathException xpathexcep = new XPathException( "message 2" );
++ * xpathexcep.initCause( cause );
++ * ByteArrayOutputStream fser = new ByteArrayOutputStream();
++ * ObjectOutputStream oos = new ObjectOutputStream(fser);
++ * oos.writeObject(xpathexcep);
++ * oos.close();
++ */
++ static final byte [] NORMALJDK7SER = {-84,-19,0,5,115,114,0,30,106,97,118,97,120,
++ 46,120,109,108,46,120,112,97,116,104,46,88,80,97,116,104,69,120,99,101,112,
++ 116,105,111,110,-26,-127,97,60,-120,119,127,28,2,0,1,76,0,5,99,97,117,115,
++ 101,116,0,21,76,106,97,118,97,47,108,97,110,103,47,84,104,114,111,119,97,
++ 98,108,101,59,120,114,0,19,106,97,118,97,46,108,97,110,103,46,69,120,99,
++ 101,112,116,105,111,110,-48,-3,31,62,26,59,28,-60,2,0,0,120,114,0,19,106,
++ 97,118,97,46,108,97,110,103,46,84,104,114,111,119,97,98,108,101,-43,-58,
++ 53,39,57,119,-72,-53,3,0,4,76,0,5,99,97,117,115,101,113,0,126,0,1,76,0,13,
++ 100,101,116,97,105,108,77,101,115,115,97,103,101,116,0,18,76,106,97,118,
++ 97,47,108,97,110,103,47,83,116,114,105,110,103,59,91,0,10,115,116,97,99,
++ 107,84,114,97,99,101,116,0,30,91,76,106,97,118,97,47,108,97,110,103,47,83,
++ 116,97,99,107,84,114,97,99,101,69,108,101,109,101,110,116,59,76,0,20,115,
++ 117,112,112,114,101,115,115,101,100,69,120,99,101,112,116,105,111,110,115,
++ 116,0,16,76,106,97,118,97,47,117,116,105,108,47,76,105,115,116,59,120,112,
++ 115,113,0,126,0,3,113,0,126,0,8,116,0,9,109,101,115,115,97,103,101,32,49,
++ 117,114,0,30,91,76,106,97,118,97,46,108,97,110,103,46,83,116,97,99,107,84,
++ 114,97,99,101,69,108,101,109,101,110,116,59,2,70,42,60,60,-3,34,57,2,0,0,
++ 120,112,0,0,0,1,115,114,0,27,106,97,118,97,46,108,97,110,103,46,83,116,97,
++ 99,107,84,114,97,99,101,69,108,101,109,101,110,116,97,9,-59,-102,38,54,-35,
++ -123,2,0,4,73,0,10,108,105,110,101,78,117,109,98,101,114,76,0,14,100,101,
++ 99,108,97,114,105,110,103,67,108,97,115,115,113,0,126,0,4,76,0,8,102,105,
++ 108,101,78,97,109,101,113,0,126,0,4,76,0,10,109,101,116,104,111,100,78,97,
++ 109,101,113,0,126,0,4,120,112,0,0,0,19,116,0,23,88,80,97,116,104,69,120,
++ 99,101,112,116,105,111,110,83,101,114,105,97,108,105,122,101,116,0,28,88,
++ 80,97,116,104,69,120,99,101,112,116,105,111,110,83,101,114,105,97,108,105,
++ 122,101,46,106,97,118,97,116,0,4,109,97,105,110,115,114,0,38,106,97,118,
++ 97,46,117,116,105,108,46,67,111,108,108,101,99,116,105,111,110,115,36,85,
++ 110,109,111,100,105,102,105,97,98,108,101,76,105,115,116,-4,15,37,49,-75,
++ -20,-114,16,2,0,1,76,0,4,108,105,115,116,113,0,126,0,6,120,114,0,44,106,
++ 97,118,97,46,117,116,105,108,46,67,111,108,108,101,99,116,105,111,110,115,
++ 36,85,110,109,111,100,105,102,105,97,98,108,101,67,111,108,108,101,99,116,
++ 105,111,110,25,66,0,-128,-53,94,-9,30,2,0,1,76,0,1,99,116,0,22,76,106,97,
++ 118,97,47,117,116,105,108,47,67,111,108,108,101,99,116,105,111,110,59,120,
++ 112,115,114,0,19,106,97,118,97,46,117,116,105,108,46,65,114,114,97,121,76,
++ 105,115,116,120,-127,-46,29,-103,-57,97,-99,3,0,1,73,0,4,115,105,122,101,
++ 120,112,0,0,0,0,119,4,0,0,0,0,120,113,0,126,0,22,120,116,0,9,109,101,115,
++ 115,97,103,101,32,50,117,113,0,126,0,10,0,0,0,1,115,113,0,126,0,12,0,0,0,
++ 20,113,0,126,0,14,113,0,126,0,15,113,0,126,0,16,113,0,126,0,20,120,112
++ };
++
++ //Serialize XPathException
++ static byte [] pickleXPE(XPathException xpe) throws IOException {
++ ByteArrayOutputStream bos = new ByteArrayOutputStream();
++ ObjectOutputStream xpeos = new ObjectOutputStream(bos);
++ xpeos.writeObject(xpe);
++ xpeos.close();
++ return bos.toByteArray();
++ }
++
++ //Deserialize XPathException with byte array as serial data source
++ static XPathException unpickleXPE(byte [] ser)
++ throws IOException, ClassNotFoundException {
++ XPathException xpe;
++ ByteArrayInputStream bis = new ByteArrayInputStream(ser);
++ ObjectInputStream xpeis = new ObjectInputStream(bis);
++ xpe = (XPathException) xpeis.readObject();
++ xpeis.close();
++ return xpe;
++ }
++
++ public static void main(String[] args) throws Exception {
++ Throwable cause = new Throwable("message 1");
++ XPathException xpathexcep = new XPathException("message 2");
++
++ //Test XPE initCause() method
++ xpathexcep.initCause(cause);
++ System.out.println("getCause() result: '" + xpathexcep.getCause()
++ + "' Cause itself: '" + cause + "'");
++ if (!xpathexcep.getCause().toString().equals(cause.toString())) {
++ throw new Exception("Incorrect cause is set by initCause()");
++ }
++
++ //Test serialization/deserialization of initialized XPE
++ byte [] xpeserial;
++ XPathException xpedeser;
++ xpeserial = pickleXPE(xpathexcep);
++ xpedeser = unpickleXPE(xpeserial);
++ System.out.println("Serialized XPE: message='" + xpathexcep.getMessage()
++ + "' cause='" + xpathexcep.getCause().toString() + "'");
++ System.out.println("Deserialized XPE: message='" + xpedeser.getMessage()
++ + "' cause='" + xpedeser.getCause().toString()+"'");
++ if(xpedeser.getCause() == null ||
++ !xpedeser.getCause().toString().equals(cause.toString()) ||
++ !xpedeser.getMessage().toString().equals("message 2") )
++ throw new Exception("XPathException incorrectly serialized/deserialized");
++
++ //Test serialization/deserialization of uninitialized cause in XPE
++ XPathException xpeuninit = new XPathException("uninitialized cause");
++ xpeserial = pickleXPE(xpeuninit);
++ xpedeser = unpickleXPE(xpeserial);
++ System.out.println("Serialized XPE: message='" + xpeuninit.getMessage()
++ + "' cause='" + xpeuninit.getCause()+"'");
++ System.out.println("Deserialized XPE: message='" + xpedeser.getMessage()
++ + "' cause='" + xpedeser.getCause()+"'");
++ if(xpedeser.getCause() != null ||
++ !xpedeser.getMessage().toString().equals("uninitialized cause") )
++ throw new Exception("XPathException incorrectly serialized/deserialized");
++
++ //Test deserialization of normal XPathException serialized by JDK7
++ XPathException xpejdk7 = unpickleXPE(NORMALJDK7SER);
++ if(xpejdk7 == null || xpejdk7.getCause() == null ||
++ !xpejdk7.getMessage().equals("message 2") ||
++ !xpejdk7.getCause().getMessage().equals("message 1"))
++ throw new Exception("XpathException serialized by JDK7 was "
++ + "incorrectly deserialized.");
++
++ //Test deserialization of XPathException with two causes from JDK7.
++ //The serialization are done for the following XPathException object:
++ // new XPathException(new Exception()).initCause(null)
++ try {
++ xpejdk7 = unpickleXPE(TWOCAUSES);
++ throw new Exception("Expected InvalidClassException but it wasn't"
++ + " observed");
++ } catch(InvalidClassException e) {
++ System.out.println("InvalidClassException caught as expected.");
++ }
++
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,72 @@
++/*
++ * 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 8015978
++ * @summary Incorrect transformation of XPath expression "string(-0)"
++ * @run main XPathNegativeZero
++ * @author aleksej.efimov@oracle.com
++ */
++
++import java.io.File;
++import java.io.StringWriter;
++import javax.xml.transform.TransformerFactory;
++import javax.xml.transform.Templates;
++import javax.xml.transform.Transformer;
++import javax.xml.transform.Source;
++import javax.xml.transform.Result;
++import javax.xml.transform.stream.StreamSource;
++import javax.xml.transform.stream.StreamResult;
++
++
++public class XPathNegativeZero {
++
++ static final String EXPECTEDXML = "<newtop>\"0\"</newtop>";
++
++ public static void main(final String[] args) throws Exception {
++ //file name of XML file to transform
++ final String xml = System.getProperty("test.src", ".")+"/dummy.xml";
++ //file name of XSL file w/ transformation
++ final String xsl = System.getProperty("test.src", ".")+"/negativezero.xsl";
++ final String result = xform(xml, xsl).trim();
++
++ System.out.println("transformed XML: '"+result+ "' expected XML: '"+EXPECTEDXML+"'");
++ if (!result.equals(EXPECTEDXML))
++ throw new Exception("Negative zero was incorrectly transformed");
++ }
++
++ private static String xform(final String xml, final String xsl) throws Exception {
++ final TransformerFactory tf = TransformerFactory.newInstance();
++ final Source xslsrc = new StreamSource(new File(xsl));
++ final Templates tmpl = tf.newTemplates(xslsrc);
++ final Transformer t = tmpl.newTransformer();
++
++ StringWriter writer = new StringWriter();
++ final Source src = new StreamSource(new File(xml));
++ final Result res = new StreamResult(writer);
++
++ t.transform(src, res);
++ return writer.toString();
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/XPath/8015978/dummy.xml Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,1 @@
++<top/>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/XPath/8015978/negativezero.xsl Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,4 @@
++<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>
++ <xsl:output method='xml' indent='yes' omit-xml-declaration='yes'/>
++ <xsl:template match='/'><newtop>"<xsl:value-of select='string(-0.0)'/>"</newtop></xsl:template>
++</xsl:stylesheet>
+--- ./jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java Wed May 07 19:26:47 2014 -0700
+@@ -22,7 +22,8 @@
+ */
+
+ /**
+- * @test @bug 8022548
++ * @test
++ * @bug 8022548
+ * @summary test that a parser can use DTDConfiguration
+ * @run main XOMParserTest
+ */
+@@ -60,30 +61,27 @@
+ }
+
+ public final void testTransform() {
++ String inFilename = filePath + "/JDK8022548.xml";
++ String xslFilename = filePath + "/JDK8022548.xsl";
++ String outFilename = "JDK8022548.out";
+
+- try {
++ try (InputStream xslInput = new FileInputStream(xslFilename);
++ InputStream xmlInput = new FileInputStream(inFilename);
++ OutputStream out = new FileOutputStream(outFilename);
++ ) {
+
+- String inFilename = filePath + "/JDK8022548.xml";
+- String xslFilename = filePath + "/JDK8022548.xsl";
+- String outFilename = filePath + "/JDK8022548.out";
+
+ StringWriter sw = new StringWriter();
+ // Create transformer factory
+ TransformerFactory factory = TransformerFactory.newInstance();
+- // set the translet name
+-// factory.setAttribute("translet-name", "myTranslet");
+-
+- // set the destination directory
+-// factory.setAttribute("destination-directory", "c:\\temp");
+-// factory.setAttribute("generate-translet", Boolean.TRUE);
+
+ // Use the factory to create a template containing the xsl file
+- Templates template = factory.newTemplates(new StreamSource(new FileInputStream(xslFilename)));
++ Templates template = factory.newTemplates(new StreamSource(xslInput));
+ // Use the template to create a transformer
+ Transformer xformer = template.newTransformer();
+ // Prepare the input and output files
+- Source source = new StreamSource(new FileInputStream(inFilename));
+- Result result = new StreamResult(new FileOutputStream(outFilename));
++ Source source = new StreamSource(xmlInput);
++ Result result = new StreamResult(outFilename);
+ //Result result = new StreamResult(sw);
+ // Apply the xsl file to the source file and write the result to the output file
+ xformer.transform(source, result);
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8024707/TestFunc.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,35 @@
++/*
++ * 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 org.w3c.dom.Node;
++import org.w3c.dom.NodeList;
++
++/**
++ * bug 8024707
++ */
++
++public class TestFunc {
++ public static Node test( NodeList list ) {
++ return list.item(0);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8024707/XSLT.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,51 @@
++/*
++ * 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 8024707
++ * @summary Test for XSLT extension function with 1 element sized nodelist
++ * @compile TestFunc.java XSLT.java
++ * @run main/othervm XSLT
++ * @author aleksej.efimov@oracle.com
++ */
++
++import javax.xml.transform.*;
++import javax.xml.transform.stream.*;
++import java.io.ByteArrayOutputStream;
++
++public class XSLT {
++ static final String XMLTOTRANSFORM = "/in.xml";
++ static final String XSLTRANSFORMER = "/test.xsl";
++ static final String EXPECTEDRESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>inp1_1";
++
++ public static void main(String[] args) throws Exception {
++ ByteArrayOutputStream resStream = new ByteArrayOutputStream();
++ TransformerFactory trf = TransformerFactory.newInstance();
++ Transformer tr = trf.newTransformer( new StreamSource(System.getProperty("test.src", ".")+XSLTRANSFORMER));
++ tr.transform( new StreamSource(System.getProperty("test.src", ".")+XMLTOTRANSFORM), new StreamResult(resStream));
++ System.out.println("Transformation completed. Result:"+resStream.toString());
++ if (!resStream.toString().equals(EXPECTEDRESULT))
++ throw new RuntimeException("Incorrect transformation result");
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8024707/in.xml Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,4 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<root>
++<input1><seq-elem1>inp1_1</seq-elem1></input1>
++</root>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8024707/test.xsl Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,10 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xsl:transform exclude-result-prefixes="cscdt_ufunc" version="1.0"
++ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++ xmlns:cscdt_ufunc="http://xml.apache.org/xalan/java">
++ <xsl:template match="/">
++ <xsl:value-of
++ select="cscdt_ufunc:TestFunc.test(/root/input1/seq-elem1)"
++ />
++ </xsl:template>
++</xsl:transform>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,2 @@
++<?xml version="1.0"?>
++<helloWorld/>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,82 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
++ */
++import java.security.Policy;
++
++/**
++ *
++ *
++ * @author huizhe.wang@oracle.com
++ */
++public class TestBase {
++ public static boolean isWindows = false;
++ static {
++ if (System.getProperty("os.name").indexOf("Windows")>-1) {
++ isWindows = true;
++ }
++ };
++
++ String filepath;
++ boolean hasSM;
++ String curDir;
++ Policy origPolicy;
++ String testName;
++ static String errMessage;
++
++ int passed = 0, failed = 0;
++
++ /**
++ * Creates a new instance of StreamReader
++ */
++ public TestBase(String name) {
++ testName = name;
++ }
++
++ //junit @Override
++ protected void setUp() {
++ if (System.getSecurityManager() != null) {
++ hasSM = true;
++ System.setSecurityManager(null);
++ }
++
++ filepath = System.getProperty("test.src");
++ if (filepath == null) {
++ //current directory
++ filepath = System.getProperty("user.dir");
++ }
++ origPolicy = Policy.getPolicy();
++
++ }
++
++ //junit @Override
++ public void tearDown() {
++ // turn off security manager and restore policy
++ System.setSecurityManager(null);
++ Policy.setPolicy(origPolicy);
++ if (hasSM) {
++ System.setSecurityManager(new SecurityManager());
++ }
++ System.out.println("\nNumber of tests passed: " + passed);
++ System.out.println("Number of tests failed: " + failed + "\n");
++
++ if (errMessage != null ) {
++ throw new RuntimeException(errMessage);
++ }
++ }
++
++ void fail(String errMsg) {
++ if (errMessage == null) {
++ errMessage = errMsg;
++ } else {
++ errMessage = errMessage + "\n" + errMsg;
++ }
++ failed++;
++ }
++
++ void success(String msg) {
++ passed++;
++ System.out.println(msg);
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,287 @@
++/*
++ * 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 8004476
++ * @summary test XPath extension functions
++ * @run main/othervm XPathExFuncTest
++ */
++import java.io.FileInputStream;
++import java.io.InputStream;
++import java.security.AllPermission;
++import java.security.CodeSource;
++import java.security.Permission;
++import java.security.PermissionCollection;
++import java.security.Permissions;
++import java.security.Policy;
++import java.security.ProtectionDomain;
++import java.util.Iterator;
++import java.util.List;
++import javax.xml.XMLConstants;
++import javax.xml.namespace.NamespaceContext;
++import javax.xml.namespace.QName;
++import javax.xml.parsers.DocumentBuilder;
++import javax.xml.parsers.DocumentBuilderFactory;
++import javax.xml.xpath.XPath;
++import javax.xml.xpath.XPathExpressionException;
++import javax.xml.xpath.XPathFactory;
++import javax.xml.xpath.XPathFactoryConfigurationException;
++import javax.xml.xpath.XPathFunction;
++import javax.xml.xpath.XPathFunctionException;
++import javax.xml.xpath.XPathFunctionResolver;
++import org.w3c.dom.Document;
++
++/**
++ * test XPath extension functions
++ *
++ * @author huizhe.wang@oracle.com
++ */
++public class XPathExFuncTest extends TestBase {
++
++ final static String ENABLE_EXTENSION_FUNCTIONS = "http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions";
++ final static String CLASSNAME = "DocumentBuilderFactoryImpl";
++ final String XPATH_EXPRESSION = "ext:helloWorld()";
++
++ /**
++ * Creates a new instance of StreamReader
++ */
++ public XPathExFuncTest(String name) {
++ super(name);
++ }
++ boolean hasSM;
++ String xslFile, xslFileId;
++ String xmlFile, xmlFileId;
++
++ protected void setUp() {
++ super.setUp();
++ xmlFile = filepath + "/SecureProcessingTest.xml";
++
++ }
++
++ /**
++ * @param args the command line arguments
++ */
++ public static void main(String[] args) {
++ XPathExFuncTest test = new XPathExFuncTest("OneTest");
++ test.setUp();
++
++ test.testExtFunc();
++ test.testExtFuncNotAllowed();
++ test.testEnableExtFunc();
++ test.tearDown();
++
++ }
++
++ /**
++ * by default, extension function is enabled
++ */
++ public void testExtFunc() {
++
++ try {
++ evaluate(false);
++ System.out.println("testExtFunc: OK");
++ } catch (XPathFactoryConfigurationException e) {
++ fail(e.getMessage());
++ } catch (XPathExpressionException e) {
++ fail(e.getMessage());
++ }
++ }
++
++ /**
++ * Security is enabled, extension function not allowed
++ */
++ public void testExtFuncNotAllowed() {
++ Policy p = new SimplePolicy(new AllPermission());
++ Policy.setPolicy(p);
++ System.setSecurityManager(new SecurityManager());
++
++ try {
++ evaluate(false);
++ } catch (XPathFactoryConfigurationException e) {
++ fail(e.getMessage());
++ } catch (XPathExpressionException ex) {
++ //expected since extension function is disallowed
++ System.out.println("testExtFuncNotAllowed: OK");
++ } finally {
++ System.setSecurityManager(null);
++ }
++ }
++
++ /**
++ * Security is enabled, use new feature: enableExtensionFunctions
++ */
++ public void testEnableExtFunc() {
++ Policy p = new SimplePolicy(new AllPermission());
++ Policy.setPolicy(p);
++ System.setSecurityManager(new SecurityManager());
++
++
++ try {
++ evaluate(true);
++ System.out.println("testEnableExt: OK");
++ } catch (XPathFactoryConfigurationException e) {
++ fail(e.getMessage());
++ } catch (XPathExpressionException e) {
++ fail(e.getMessage());
++ } finally {
++ System.setSecurityManager(null);
++ }
++ }
++
++ Document getDocument() {
++ // the xml source
++ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
++ DocumentBuilder documentBuilder = null;
++ Document document = null;
++
++ try {
++ documentBuilder = documentBuilderFactory.newDocumentBuilder();
++ InputStream xmlStream = new FileInputStream(xmlFile);
++ document = documentBuilder.parse(xmlStream);
++ } catch (Exception e) {
++ fail(e.toString());
++ }
++ return document;
++ }
++
++ void evaluate(boolean enableExt) throws XPathFactoryConfigurationException, XPathExpressionException {
++ Document document = getDocument();
++
++ XPathFactory xPathFactory = XPathFactory.newInstance();
++ /**
++ * Use of the extension function 'http://exslt.org/strings:tokenize' is
++ * not allowed when the secure processing feature is set to true.
++ * Attempt to use the new property to enable extension function
++ */
++ if (enableExt) {
++ boolean isExtensionSupported = enableExtensionFunction(xPathFactory);
++ }
++
++ xPathFactory.setXPathFunctionResolver(new MyXPathFunctionResolver());
++ if (System.getSecurityManager() == null) {
++ xPathFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false);
++ }
++
++ XPath xPath = xPathFactory.newXPath();
++ xPath.setNamespaceContext(new MyNamespaceContext());
++
++ String xPathResult = xPath.evaluate(XPATH_EXPRESSION, document);
++ System.out.println(
++ "XPath result (enableExtensionFunction == " + enableExt + ") = \""
++ + xPathResult
++ + "\"");
++ }
++
++ public class MyXPathFunctionResolver
++ implements XPathFunctionResolver {
++
++ public XPathFunction resolveFunction(QName functionName, int arity) {
++
++ // not a real ewsolver, always return a default XPathFunction
++ return new MyXPathFunction();
++ }
++ }
++
++ public class MyXPathFunction
++ implements XPathFunction {
++
++ public Object evaluate(List list) throws XPathFunctionException {
++
++ return "Hello World";
++ }
++ }
++
++ public class MyNamespaceContext implements NamespaceContext {
++
++ public String getNamespaceURI(String prefix) {
++ if (prefix == null) {
++ throw new IllegalArgumentException("The prefix cannot be null.");
++ }
++
++ if (prefix.equals("ext")) {
++ return "http://ext.com";
++ } else {
++ return null;
++ }
++ }
++
++ public String getPrefix(String namespace) {
++
++ if (namespace == null) {
++ throw new IllegalArgumentException("The namespace uri cannot be null.");
++ }
++
++ if (namespace.equals("http://ext.com")) {
++ return "ext";
++ } else {
++ return null;
++ }
++ }
++
++ public Iterator getPrefixes(String namespace) {
++ return null;
++ }
++ }
++
++ boolean enableExtensionFunction(XPathFactory factory) {
++ boolean isSupported = true;
++ try {
++ factory.setFeature(ENABLE_EXTENSION_FUNCTIONS, true);
++ } catch (XPathFactoryConfigurationException ex) {
++ isSupported = false;
++ }
++ return isSupported;
++ }
++
++ class SimplePolicy extends Policy {
++
++ private final Permissions perms;
++
++ public SimplePolicy(Permission... permissions) {
++ perms = new Permissions();
++ for (Permission permission : permissions) {
++ perms.add(permission);
++ }
++ }
++
++ @Override
++ public PermissionCollection getPermissions(CodeSource cs) {
++ return perms;
++ }
++
++ @Override
++ public PermissionCollection getPermissions(ProtectionDomain pd) {
++ return perms;
++ }
++
++ @Override
++ public boolean implies(ProtectionDomain pd, Permission p) {
++ return perms.implies(p);
++ }
++
++ //for older jdk
++ @Override
++ public void refresh() {
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,248 @@
++/*
++ * 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 8004476
++ * @summary test XSLT extension functions
++ * @run main/othervm XSLTExFuncTest
++ */
++
++import java.io.StringWriter;
++import java.security.AllPermission;
++import java.security.CodeSource;
++import java.security.Permission;
++import java.security.PermissionCollection;
++import java.security.Permissions;
++import java.security.Policy;
++import java.security.ProtectionDomain;
++import javax.xml.transform.*;
++import javax.xml.transform.sax.SAXSource;
++import javax.xml.transform.stream.StreamResult;
++import org.xml.sax.InputSource;
++
++/**
++ * test XSLT extension functions
++ *
++ * @author huizhe.wang@oracle.com
++ */
++public class XSLTExFuncTest extends TestBase {
++
++ final static String ENABLE_EXTENSION_FUNCTIONS = "http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions";
++ final static String CLASSNAME = "DocumentBuilderFactoryImpl";
++
++ /**
++ * Creates a new instance of StreamReader
++ */
++ public XSLTExFuncTest(String name) {
++ super(name);
++ }
++ boolean hasSM;
++ String xslFile, xslFileId;
++ String xmlFile, xmlFileId;
++
++ protected void setUp() {
++ super.setUp();
++ xmlFile = filepath + "/tokenize.xml";
++ xslFile = filepath + "/tokenize.xsl";
++
++ /**
++ * On Windows platform it needs triple '/' for valid URL while double '/' is enough on Linux or Solaris.
++ * Here use file:/// directly to make it work on Windows and it will not impact other platforms.
++ */
++ xslFileId = "file:///" + xslFile;
++ }
++
++ /**
++ * @param args the command line arguments
++ */
++ public static void main(String[] args) {
++ XSLTExFuncTest test = new XSLTExFuncTest("OneTest");
++ test.setUp();
++
++ test.testExtFunc();
++ test.testExtFuncNotAllowed();
++ test.testEnableExtFunc();
++ test.testTemplatesEnableExtFunc();
++ test.tearDown();
++
++ }
++
++ /**
++ * by default, extension function is enabled
++ */
++ public void testExtFunc() {
++ TransformerFactory factory = TransformerFactory.newInstance();
++
++ try {
++ transform(factory);
++ System.out.println("testExtFunc: OK");
++ } catch (TransformerConfigurationException e) {
++ fail(e.getMessage());
++ } catch (TransformerException ex) {
++ fail(ex.getMessage());
++ }
++ }
++
++ /**
++ * Security is enabled, extension function not allowed
++ */
++ public void testExtFuncNotAllowed() {
++ Policy p = new SimplePolicy(new AllPermission());
++ Policy.setPolicy(p);
++ System.setSecurityManager(new SecurityManager());
++ TransformerFactory factory = TransformerFactory.newInstance();
++
++ try {
++ transform(factory);
++ } catch (TransformerConfigurationException e) {
++ fail(e.getMessage());
++ } catch (TransformerException ex) {
++ //expected since extension function is disallowed
++ System.out.println("testExtFuncNotAllowed: OK");
++ } finally {
++ System.setSecurityManager(null);
++ }
++ }
++
++ /**
++ * Security is enabled, use new feature: enableExtensionFunctions
++ */
++ public void testEnableExtFunc() {
++ Policy p = new SimplePolicy(new AllPermission());
++ Policy.setPolicy(p);
++ System.setSecurityManager(new SecurityManager());
++ TransformerFactory factory = TransformerFactory.newInstance();
++
++ /**
++ * Use of the extension function 'http://exslt.org/strings:tokenize' is
++ * not allowed when the secure processing feature is set to true.
++ * Attempt to use the new property to enable extension function
++ */
++ boolean isExtensionSupported = enableExtensionFunction(factory);
++
++ try {
++ transform(factory);
++ System.out.println("testEnableExt: OK");
++ } catch (TransformerConfigurationException e) {
++ fail(e.getMessage());
++ } catch (TransformerException e) {
++ fail(e.getMessage());
++ } finally {
++ System.setSecurityManager(null);
++ }
++ }
++
++ /**
++ * use Templates template = factory.newTemplates(new StreamSource( new
++ * FileInputStream(xslFilename))); // Use the template to create a
++ * transformer Transformer xformer = template.newTransformer();
++ *
++ * @param factory
++ * @return
++ */
++ /**
++ * Security is enabled, use new feature: enableExtensionFunctions Use the
++ * template to create a transformer
++ */
++ public void testTemplatesEnableExtFunc() {
++ Policy p = new SimplePolicy(new AllPermission());
++ Policy.setPolicy(p);
++ System.setSecurityManager(new SecurityManager());
++ TransformerFactory factory = TransformerFactory.newInstance();
++
++ /**
++ * Use of the extension function 'http://exslt.org/strings:tokenize' is
++ * not allowed when the secure processing feature is set to true.
++ * Attempt to use the new property to enable extension function
++ */
++ boolean isExtensionSupported = enableExtensionFunction(factory);
++
++ try {
++ SAXSource xslSource = new SAXSource(new InputSource(xslFile));
++ xslSource.setSystemId(xslFileId);
++ Templates template = factory.newTemplates(xslSource);
++ Transformer transformer = template.newTransformer();
++ StringWriter stringResult = new StringWriter();
++ Result result = new StreamResult(stringResult);
++ transformer.transform(new SAXSource(new InputSource(xmlFile)), result);
++ System.out.println("testTemplatesEnableExtFunc: OK");
++ } catch (TransformerConfigurationException e) {
++ fail(e.getMessage());
++ } catch (TransformerException e) {
++ fail(e.getMessage());
++ } finally {
++ System.setSecurityManager(null);
++ }
++ }
++
++ boolean enableExtensionFunction(TransformerFactory factory) {
++ boolean isSupported = true;
++ try {
++ factory.setFeature(ENABLE_EXTENSION_FUNCTIONS, true);
++ } catch (TransformerConfigurationException ex) {
++ isSupported = false;
++ }
++ return isSupported;
++ }
++
++ void transform(TransformerFactory factory) throws TransformerConfigurationException, TransformerException {
++ SAXSource xslSource = new SAXSource(new InputSource(xslFile));
++ xslSource.setSystemId(xslFileId);
++ Transformer transformer = factory.newTransformer(xslSource);
++ StringWriter stringResult = new StringWriter();
++ Result result = new StreamResult(stringResult);
++ transformer.transform(new SAXSource(new InputSource(xmlFile)), result);
++ }
++
++ class SimplePolicy extends Policy {
++
++ private final Permissions perms;
++
++ public SimplePolicy(Permission... permissions) {
++ perms = new Permissions();
++ for (Permission permission : permissions) {
++ perms.add(permission);
++ }
++ }
++
++ @Override
++ public PermissionCollection getPermissions(CodeSource cs) {
++ return perms;
++ }
++
++ @Override
++ public PermissionCollection getPermissions(ProtectionDomain pd) {
++ return perms;
++ }
++
++ @Override
++ public boolean implies(ProtectionDomain pd, Permission p) {
++ return perms.implies(p);
++ }
++
++ //for older jdk
++ @Override
++ public void refresh() {
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,7 @@
++<?xml version="1.0" encoding="UTF-8" ?>
++<html>
++<a>
++ <b>Is this EXSLT? No. no</b>
++ <c>Is this EXSLT? No. no</c>
++</a>
++</html>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,30 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++ xmlns:str="http://exslt.org/strings"
++ xmlns:xalan="http://xml.apache.org/xalan"
++ version="1.0">
++<xsl:template match="a">
++ <xsl:apply-templates />
++</xsl:template>
++<xsl:template match="//a/c">
++ <xsl:value-of select="." />
++ -
++ <xsl:value-of select="str:tokenize(string(.), ' ')" />
++ <xsl:value-of select="str:tokenize(string(.), '')" />
++ <xsl:for-each select="str:tokenize(string(.), ' ')">
++ <xsl:value-of select="." />
++ </xsl:for-each>
++ <xsl:apply-templates select="*" />
++</xsl:template>
++<xsl:template match="//a/b">
++ <xsl:value-of select="." />
++ -
++ <xsl:value-of select="xalan:tokenize(string(.), ' ')" />
++ <xsl:value-of select="xalan:tokenize(string(.), '')" />
++ <xsl:for-each select="xalan:tokenize(string(.), ' ')">
++ <xsl:value-of select="." />
++ </xsl:for-each>
++ <xsl:apply-templates select="*" />
++</xsl:template>
++
++</xsl:stylesheet>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,60 @@
++/*
++ * 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 8015092
++ * @summary whitespace within patterns in Selector XPath expression is accepted
++ * @run main/othervm XPathWhiteSpaceTest
++ */
++
++import java.io.*;
++import javax.xml.XMLConstants;
++import javax.xml.validation.Schema;
++import javax.xml.validation.SchemaFactory;
++import org.xml.sax.SAXException;
++
++/**
++ * http://www.w3.org/TR/xmlschema-1/#coss-identity-constraint
++ * For readability, whitespace may be used in selector XPath expressions even though
++ * not explicitly allowed by the grammar:
++ * whitespace may be freely added within patterns before or after any token.
++ *
++ * @author huizhe.wang@oracle.com
++ */
++public class XPathWhiteSpaceTest {
++ static final String XSDFILE = "/idJ029.xsd";
++
++ public static void main(String[] args) throws Exception {
++ try{
++ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
++ Schema schema = schemaFactory.newSchema(new File(System.getProperty("test.src", ".")+XSDFILE));
++ } catch (SAXException e) {
++ throw new RuntimeException(e.getMessage());
++ }
++
++
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,12 @@
++<?xml version="1.0"?>
++<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns.org" xmlns:xpns="xpns.org">
++ <xsd:element name="xsid" type="xsd:string"/>
++ <xsd:element name="xiid">
++ <xsd:complexType>
++ <xsd:sequence>
++ <xsd:element name="xiid2" type="xsd:string" maxOccurs="unbounded"/>
++ </xsd:sequence>
++ <xsd:attribute name="val" type="xsd:string"/>
++ </xsd:complexType>
++ </xsd:element>
++</xsd:schema>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,12 @@
++<?xml version="1.0"?>
++<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns1.org" xmlns:xpns="xpns1.org">
++ <xsd:element name="xsid" type="xsd:string"/>
++ <xsd:element name="xiid">
++ <xsd:complexType>
++ <xsd:sequence>
++ <xsd:element name="xiid2" type="xsd:string" maxOccurs="unbounded"/>
++ </xsd:sequence>
++ <xsd:attribute name="val" type="xsd:string"/>
++ </xsd:complexType>
++ </xsd:element>
++</xsd:schema>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,21 @@
++<?xml version="1.0"?>
++<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xpns="xpns.org" xmlns:xpns1="xpns1.org" xmlns:xpns2="xpns2.org" xmlns:imp="importNS">
++ <xsd:import namespace="importNS" schemaLocation="idJimp.xsd"/>
++ <xsd:import namespace="xpns.org" schemaLocation="idIxpns.xsd"/>
++ <xsd:import namespace="xpns1.org" schemaLocation="idIxpns1.xsd"/>
++ <xsd:element name="root">
++ <xsd:complexType>
++ <xsd:sequence>
++ <xsd:element ref="tid" maxOccurs="unbounded"/>
++ <xsd:element ref="imp:iid1" maxOccurs="unbounded"/>
++ <xsd:element ref="imp:sid" maxOccurs="unbounded"/>
++ <xsd:element ref="xpns:xiid" maxOccurs="unbounded"/>
++ </xsd:sequence>
++ </xsd:complexType>
++ <xsd:unique id="foo123" name="uid">
++ <xsd:selector xpath=".//tid"/>
++ <xsd:field xpath=". //."/>
++ </xsd:unique>
++ </xsd:element>
++ <xsd:element name="tid" type="xsd:string"/>
++</xsd:schema>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,11 @@
++<?xml version="1.0"?>
++<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="importNS" xmlns:imp="importNS">
++ <xsd:element name="sid" type="xsd:string"/>
++ <xsd:element name="iid1">
++ <xsd:complexType>
++ <xsd:sequence>
++ <xsd:element name="iid2" type="xsd:string" maxOccurs="unbounded"/>
++ </xsd:sequence>
++ </xsd:complexType>
++ </xsd:element>
++</xsd:schema>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,60 @@
++/*
++ * 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 8015243
++ * @summary verifies that illegal URI such as // is rejected
++ * @run main/othervm AnyURITest
++ */
++
++import java.io.*;
++import javax.xml.XMLConstants;
++import javax.xml.validation.Schema;
++import javax.xml.validation.SchemaFactory;
++import org.xml.sax.SAXException;
++
++/**
++ * Similar to java.net.URI, allow empty authority prior to non-empty
++ * path, query component or fragment identifier
++ *
++ * @author huizhe.wang@oracle.com
++ */
++public class AnyURITest {
++ static final String XSDFILE = "anyURI_b006.xsd";
++
++ public static void main(String[] args) throws Exception {
++ try{
++ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
++ Schema schema = schemaFactory.newSchema(new File(System.getProperty("test.src", "."), XSDFILE));
++ throw new RuntimeException("Illegal URI // should be rejected.");
++ } catch (SAXException e) {
++ //expected:
++ //Enumeration value '//' is not in the value space of the base type, anyURI.
++ }
++
++
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,32 @@
++<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
++
++ <xsd:element name="root">
++ <xsd:complexType>
++ <xsd:choice maxOccurs="unbounded">
++ <xsd:element ref="foo"/>
++ <xsd:element ref="bar"/>
++ </xsd:choice>
++ </xsd:complexType>
++ </xsd:element>
++
++ <xsd:element type="xsd:anyURI" name="foo"></xsd:element>
++ <xsd:element type="st" name="bar"></xsd:element>
++
++ <xsd:simpleType name="st">
++ <xsd:restriction base="xsd:anyURI">
++ <xsd:enumeration value="/"/>
++ <xsd:enumeration value="//"/>
++ <xsd:enumeration value="///"/>
++ <xsd:enumeration value="//a\\b"/>
++ <xsd:enumeration value="\"/>
++ <xsd:enumeration value="\\"/>
++ <xsd:enumeration value="\\\"/>
++ <xsd:enumeration value="\\/"/>
++ <xsd:enumeration value="\\a\b"/>
++ <xsd:enumeration value="\a\b"/>
++ <xsd:enumeration value="/a\b"/>
++ <xsd:enumeration value="..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\a"/>
++ </xsd:restriction>
++ </xsd:simpleType>
++
++</xsd:schema>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/clientjar/TestService.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,39 @@
++/*
++ * 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 javax.jws.WebService;
++
++@WebService(serviceName ="TestService", targetNamespace = "http://test/jaxws/sample/")
++public class TestService {
++ public void foo() {
++ try {
++ bar();
++ } catch (Exception e) {
++ throw new AssertionError(e);
++ }
++ }
++
++ private void bar() {
++ // nothing done
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/clientjar/TestWsImport.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,151 @@
++/*
++ * 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 8016271 8026405
++ * @summary wsimport -clientjar does not create portable jar on windows due to hardcoded '\'
++ * @run main/othervm TestWsImport
++ */
++
++import javax.xml.namespace.QName;
++import javax.xml.ws.Endpoint;
++import javax.xml.ws.Service;
++import java.io.InputStreamReader;
++import java.io.IOException;
++import java.io.BufferedReader;
++import java.io.File;
++import java.net.InetSocketAddress;
++import java.net.URL;
++import java.nio.file.Files;
++import java.nio.file.FileVisitResult;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++import java.nio.file.SimpleFileVisitor;
++import java.nio.file.attribute.BasicFileAttributes;
++import static java.nio.file.FileVisitResult.*;
++import java.util.Enumeration;
++import java.util.jar.JarFile;
++
++import com.sun.net.httpserver.HttpContext;
++import com.sun.net.httpserver.HttpServer;
++
++public class TestWsImport {
++
++ public static void main(String[] args) throws IOException {
++
++ String javaHome = System.getProperty("java.home");
++ if (javaHome.endsWith("jre")) {
++ javaHome = new File(javaHome).getParent();
++ }
++ String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport";
++ if (System.getProperty("os.name").startsWith("Windows")) {
++ wsimport = wsimport.concat(".exe");
++ }
++
++ Endpoint endpoint = Endpoint.create(new TestService());
++ HttpServer httpServer = null;
++ try {
++ // Manually create HttpServer here using ephemeral address for port
++ // so as to not end up with attempt to bind to an in-use port
++ httpServer = HttpServer.create(new InetSocketAddress(0), 0);
++ HttpContext httpContext = httpServer.createContext("/hello");
++ int port = httpServer.getAddress().getPort();
++ System.out.println("port = " + port);
++ httpServer.start();
++ endpoint.publish(httpContext);
++ String address = "http://localhost:" + port + "/hello";
++
++ Service service = Service.create(new URL(address + "?wsdl"),
++ new QName("http://test/jaxws/sample/", "TestService"));
++
++ String[] wsargs = {
++ wsimport,
++ "-p",
++ "wstest",
++ "-J-Djavax.xml.accessExternalSchema=all",
++ "-J-Dcom.sun.tools.internal.ws.Invoker.noSystemProxies=true",
++ address + "?wsdl",
++ "-clientjar",
++ "wsjar.jar"
++ };
++ ProcessBuilder pb = new ProcessBuilder(wsargs);
++ pb.redirectErrorStream(true);
++ Process p = pb.start();
++ BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream()));
++ String s = r.readLine();
++ while (s != null) {
++ System.out.println(s.trim());
++ s = r.readLine();
++ }
++ p.waitFor();
++ p.destroy();
++
++ try (JarFile jarFile = new JarFile("wsjar.jar")) {
++ for (Enumeration em = jarFile.entries(); em.hasMoreElements();) {
++ String fileName = em.nextElement().toString();
++ if (fileName.contains("\\")) {
++ throw new RuntimeException("\"\\\" character detected in jar file: " + fileName);
++ }
++ }
++ }
++ } catch (Exception e) {
++ e.printStackTrace();
++ throw new RuntimeException(e.getMessage());
++ } finally {
++ endpoint.stop();
++ if (httpServer != null) {
++ httpServer.stop(0);
++ }
++ Path p = Paths.get("wsjar.jar");
++ Files.deleteIfExists(p);
++ p = Paths.get("wstest");
++ if (Files.exists(p)) {
++ try {
++ Files.walkFileTree(p, new SimpleFileVisitor<Path>() {
++ @Override
++ public FileVisitResult visitFile(Path file,
++ BasicFileAttributes attrs) throws IOException {
++
++ Files.delete(file);
++ return CONTINUE;
++ }
++ @Override
++ public FileVisitResult postVisitDirectory(Path dir,
++ IOException exc) throws IOException {
++
++ if (exc == null) {
++ Files.delete(dir);
++ return CONTINUE;
++ } else {
++ throw exc;
++ }
++ }
++ });
++ } catch (IOException ioe) {
++ ioe.printStackTrace();
++ }
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,194 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++import java.io.IOException;
++import java.nio.file.DirectoryNotEmptyException;
++import java.nio.file.FileVisitResult;
++import java.nio.file.Files;
++import java.nio.file.NoSuchFileException;
++import java.nio.file.Path;
++import java.nio.file.SimpleFileVisitor;
++import java.nio.file.attribute.BasicFileAttributes;
++import java.util.ArrayList;
++import java.util.List;
++
++
++/**
++ * Common library for various test file utility functions.
++ */
++public final class FileUtils {
++
++ private static final boolean isWindows =
++ System.getProperty("os.name").startsWith("Windows");
++ private static final int RETRY_DELETE_MILLIS = isWindows ? 500 : 0;
++ private static final int MAX_RETRY_DELETE_TIMES = isWindows ? 15 : 0;
++
++ /**
++ * Deletes a file, retrying if necessary.
++ *
++ * @param path the file to delete
++ *
++ * @throws NoSuchFileException
++ * if the file does not exist (optional specific exception)
++ * @throws DirectoryNotEmptyException
++ * if the file is a directory and could not otherwise be deleted
++ * because the directory is not empty (optional specific exception)
++ * @throws IOException
++ * if an I/O error occurs
++ */
++ public static void deleteFileWithRetry(Path path)
++ throws IOException
++ {
++ try {
++ deleteFileWithRetry0(path);
++ } catch (InterruptedException x) {
++ throw new IOException("Interrupted while deleting.", x);
++ }
++ }
++
++ /**
++ * Deletes a file, retrying if necessary.
++ * No exception thrown if file doesn't exist.
++ *
++ * @param path the file to delete
++ *
++ * @throws NoSuchFileException
++ * if the file does not exist (optional specific exception)
++ * @throws DirectoryNotEmptyException
++ * if the file is a directory and could not otherwise be deleted
++ * because the directory is not empty (optional specific exception)
++ * @throws IOException
++ * if an I/O error occurs
++ */
++ public static void deleteFileIfExistsWithRetry(Path path)
++ throws IOException
++ {
++ try {
++ if(Files.exists(path))
++ deleteFileWithRetry0(path);
++ } catch (InterruptedException x) {
++ throw new IOException("Interrupted while deleting.", x);
++ }
++ }
++
++ private static void deleteFileWithRetry0(Path path)
++ throws IOException, InterruptedException
++ {
++ int times = 0;
++ IOException ioe = null;
++ while (true) {
++ try {
++ Files.delete(path);
++ while (Files.exists(path)) {
++ times++;
++ if (times > MAX_RETRY_DELETE_TIMES)
++ throw new IOException("File still exists after " + times + " waits.");
++ Thread.sleep(RETRY_DELETE_MILLIS);
++ }
++ break;
++ } catch (NoSuchFileException | DirectoryNotEmptyException x) {
++ throw x;
++ } catch (IOException x) {
++ // Backoff/retry in case another process is accessing the file
++ times++;
++ if (ioe == null)
++ ioe = x;
++ else
++ ioe.addSuppressed(x);
++
++ if (times > MAX_RETRY_DELETE_TIMES)
++ throw ioe;
++ Thread.sleep(RETRY_DELETE_MILLIS);
++ }
++ }
++ }
++
++ /**
++ * Deletes a directory and its subdirectories, retrying if necessary.
++ *
++ * @param dir the directory to delete
++ *
++ * @throws IOException
++ * If an I/O error occurs. Any such exceptions are caught
++ * internally. If only one is caught, then it is re-thrown.
++ * If more than one exception is caught, then the second and
++ * following exceptions are added as suppressed exceptions of the
++ * first one caught, which is then re-thrown.
++ */
++ public static void deleteFileTreeWithRetry(Path dir)
++ throws IOException
++ {
++ IOException ioe = null;
++ final List<IOException> excs = deleteFileTreeUnchecked(dir);
++ if (!excs.isEmpty()) {
++ ioe = excs.remove(0);
++ for (IOException x : excs)
++ ioe.addSuppressed(x);
++ }
++ if (ioe != null)
++ throw ioe;
++ }
++
++ public static List<IOException> deleteFileTreeUnchecked(Path dir) {
++ final List<IOException> excs = new ArrayList<>();
++ try {
++ java.nio.file.Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
++ @Override
++ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
++ try {
++ deleteFileWithRetry0(file);
++ } catch (IOException x) {
++ excs.add(x);
++ } catch (InterruptedException x) {
++ excs.add(new IOException("Interrupted while deleting.", x));
++ return FileVisitResult.TERMINATE;
++ }
++ return FileVisitResult.CONTINUE;
++ }
++ @Override
++ public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
++ try {
++ deleteFileWithRetry0(dir);
++ } catch (IOException x) {
++ excs.add(x);
++ } catch (InterruptedException x) {
++ excs.add(new IOException("Interrupted while deleting.", x));
++ return FileVisitResult.TERMINATE;
++ }
++ return FileVisitResult.CONTINUE;
++ }
++ @Override
++ public FileVisitResult visitFileFailed(Path file, IOException exc) {
++ excs.add(exc);
++ return FileVisitResult.CONTINUE;
++ }
++ });
++ } catch (IOException x) {
++ excs.add(x);
++ }
++ return excs;
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,46 @@
++/*
++ * 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 7173464
++ @summary Clipboard.getAvailableDataFlavors: Comparison method violates contract
++ @author Petr Pchelko
++ @run main DataFlavorComparatorTest
++*/
++
++import sun.awt.datatransfer.DataTransferer;
++
++import java.awt.datatransfer.DataFlavor;
++
++public class DataFlavorComparatorTest {
++
++ public static void main(String[] args) {
++ DataTransferer.DataFlavorComparator comparator = new DataTransferer.DataFlavorComparator();
++ DataFlavor flavor1 = new DataFlavor("application/image", "Image");
++ DataFlavor flavor2 = new DataFlavor("application/html", "HTML");
++ if (comparator.compare(flavor1, flavor2) == 0) {
++ throw new RuntimeException(flavor1.getMimeType() + " and " + flavor2.getMimeType() +
++ " should not be equal");
++ }
++ }
++}
+--- ./jdk/test/sun/management/jdp/JdpTest.sh Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/management/jdp/JdpTest.sh Wed May 07 19:26:47 2014 -0700
+@@ -84,15 +84,29 @@
+ ${TESTJAVA}/bin/java -server $* -cp ${_testclasses} ${testappname} >> ${_logname} 2>&1 &
+ _last_pid=$!
+
+- npid=`_get_pid`
+- if [ "${npid}" = "" ]
+- then
+- echo "ERROR: Test app not started. Please check machine resources before filing a bug."
+- if [ "${_jtreg}" = "yes" ]
+- then
+- exit 255
+- fi
+- fi
++# wait until VM is actually starts.
++# please note, if vm doesn't start for some reason
++# jtreg kills the test by timeout. Don't file a bug.
++ cnt=1
++ while true
++ do
++ npid=`_get_pid`
++ if [ "${npid}" != "" ]
++ then
++ break
++ fi
++ if [ "${cnt}" = "10" ]
++ then
++ echo "ERROR: Test app not started. Please check machine resources before filing a bug."
++ if [ "${_jtreg}" = "yes" ]
++ then
++ exit 255
++ fi
++ break
++ fi
++ cnt=`expr $cnt + 1`
++ sleep 1
++ done
+ }
+
+ _get_pid(){
+--- ./jdk/test/sun/misc/IoTrace/IoTraceAgent.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/misc/IoTrace/IoTraceAgent.java Wed May 07 19:26:47 2014 -0700
+@@ -27,6 +27,7 @@
+ import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ACC_STATIC;
+ import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ACC_SUPER;
+ import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ILOAD;
++import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ALOAD;
+ import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.INVOKESPECIAL;
+ import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.INVOKESTATIC;
+ import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.IRETURN;
+@@ -165,6 +166,7 @@
+
+ // return the value from the called method
+ mv.visitInsn(retType.getOpcode(IRETURN));
++ mv.visitMaxs(0, 0);
+ mv.visitEnd();
+ }
+
+@@ -172,8 +174,10 @@
+ MethodVisitor mv = cw.visitMethod(ACC_PRIVATE, "<init>", "()V", null,
+ null);
+ mv.visitCode();
++ mv.visitVarInsn(ALOAD, 0);
+ mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
+ mv.visitInsn(RETURN);
++ mv.visitMaxs(0, 0);
+ mv.visitEnd();
+
+ cw.visitEnd();
+--- ./jdk/test/sun/misc/IoTrace/ioTraceTest.sh Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/misc/IoTrace/ioTraceTest.sh Wed May 07 19:26:47 2014 -0700
+@@ -31,4 +31,4 @@
+ ${TESTJAVA}/bin/jar cfm iotraceagent.jar ${TESTSRC}/iotraceagent.mf IoTraceAgent.class IoTraceListener.class
+
+ cd ${PWD}
+-${TESTJAVA}/bin/java ${TESTVMOPTS} -javaagent:${TESTCLASSES}/iotraceagent.jar -cp ${TESTCLASSES} $*
++${TESTJAVA}/bin/java -Xverify:all ${TESTVMOPTS} -javaagent:${TESTCLASSES}/iotraceagent.jar -cp ${TESTCLASSES} $*
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/jgss/spnego/MechTokenMissing.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,53 @@
++/*
++ * 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 8024861
++ * @summary Incomplete token triggers GSS-API NullPointerException
++ */
++
++import org.ietf.jgss.GSSContext;
++import org.ietf.jgss.GSSCredential;
++import org.ietf.jgss.GSSException;
++import org.ietf.jgss.GSSManager;
++
++public class MechTokenMissing {
++ public static void main(String[] args) throws Exception {
++ GSSCredential cred = null;
++ GSSContext ctx = GSSManager.getInstance().createContext(cred);
++
++ String var =
++ /*0000*/ "60 1C 06 06 2B 06 01 05 05 02 A0 12 30 10 A0 0E " +
++ /*0010*/ "30 0C 06 0A 2B 06 01 04 01 82 37 02 02 0A ";
++ byte[] token = new byte[var.length()/3];
++ for (int i=0; i<token.length; i++) {
++ token[i] = Integer.valueOf(var.substring(3*i,3*i+2), 16).byteValue();
++ }
++ try {
++ ctx.acceptSecContext(token, 0, token.length);
++ } catch (GSSException gsse) {
++ System.out.println("Expected exception: " + gsse);
++ }
++ }
++}
+--- ./jdk/test/sun/security/krb5/ParseCAPaths.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/krb5/ParseCAPaths.java Wed May 07 19:26:47 2014 -0700
+@@ -22,7 +22,7 @@
+ */
+ /*
+ * @test
+- * @bug 6789935
++ * @bug 6789935 8012615
+ * @run main/othervm ParseCAPaths
+ * @summary cross-realm capath search error
+ */
+@@ -35,37 +35,75 @@
+ public static void main(String[] args) throws Exception {
+ System.setProperty("java.security.krb5.conf",
+ System.getProperty("test.src", ".") +"/krb5-capaths.conf");
+- //System.setProperty("sun.security.krb5.debug", "true");
+
+- // Standard example
++ // MIT
+ check("ANL.GOV", "TEST.ANL.GOV", "ANL.GOV");
+ check("ANL.GOV", "ES.NET", "ANL.GOV");
+ check("ANL.GOV", "PNL.GOV", "ANL.GOV", "ES.NET");
+ check("ANL.GOV", "NERSC.GOV", "ANL.GOV", "ES.NET");
++ check("NERSC.GOV", "TEST.ANL.GOV", "NERSC.GOV", "ES.NET", "ANL.GOV");
++
++ // RedHat
++ // 3.6.2.1. Configuring a Shared Hierarchy of Names
++ check("AA.EXAMPLE.COM", "BB.EXAMPLE.COM",
++ "AA.EXAMPLE.COM", "EXAMPLE.COM");
++ check("SITE1.SALES.EXAMPLE.COM", "EVERYWHERE.EXAMPLE.COM",
++ "SITE1.SALES.EXAMPLE.COM", "SALES.EXAMPLE.COM",
++ "EXAMPLE.COM");
++ check("DEVEL.EXAMPLE.COM", "PROD.EXAMPLE.ORG",
++ "DEVEL.EXAMPLE.COM", "EXAMPLE.COM", "COM",
++ "ORG", "EXAMPLE.ORG");
++ // 3.6.2.2. Configuring Paths in krb5.conf
++ check("A.EXAMPLE.COM", "B.EXAMPLE.COM", "A.EXAMPLE.COM");
++ check("A.EXAMPLE.COM", "C.EXAMPLE.COM",
++ "A.EXAMPLE.COM", "B.EXAMPLE.COM");
++ check("A.EXAMPLE.COM", "D.EXAMPLE.COM",
++ "A.EXAMPLE.COM", "B.EXAMPLE.COM", "C.EXAMPLE.COM");
++
++ // The original JDK example
++ check("TIVOLI.COM", "IBM.COM", "TIVOLI.COM", "LDAPCENTRAL.NET",
++ "IBM_LDAPCENTRAL.COM", "MOONLITE.ORG");
++
+ // Hierachical
+- check("N1.N.COM", "N2.N.COM", "N1.N.COM", "N.COM"); // 2 common
+- check("N1.N.COM", "N2.N3.COM", "N1.N.COM", "N.COM", // 1 common
++ check("N1.N.COM", "N2.N.COM", "N1.N.COM", "N.COM");
++ check("N1.N.COM", "N2.N3.COM", "N1.N.COM", "N.COM",
+ "COM", "N3.COM");
+- check("N1.COM", "N2.COM", "N1.COM", "COM"); // 1 common
+- check("N1", "N2", "N1"); // 0 common
+- // Extra garbages
+- check("A1.COM", "A4.COM", "A1.COM", "A2.COM");
++ check("N1.COM", "N2.COM", "N1.COM", "COM");
++ check("N1", "N2", "N1");
++ check("N1.COM", "N2.ORG", "N1.COM", "COM", "ORG");
++ check("N1.N.COM", "N.COM", "N1.N.COM");
++ check("X.N1.N.COM", "N.COM", "X.N1.N.COM", "N1.N.COM");
++ check("N.COM", "N1.N.COM", "N.COM");
++ check("N.COM", "X.N1.N.COM", "N.COM", "N1.N.COM");
++ check("A.B.C", "D.E.F", "A.B.C", "B.C", "C", "F", "E.F");
++
++ // Full path
++ check("A1.COM", "A2.COM", "A1.COM");
++ check("A1.COM", "A3.COM", "A1.COM", "A2.COM");
++ check("A1.COM", "A4.COM", "A1.COM", "A2.COM", "A3.COM");
++
++ // Shortest path
++ check("B1.COM", "B2.COM", "B1.COM");
+ check("B1.COM", "B3.COM", "B1.COM", "B2.COM");
++ check("B1.COM", "B4.COM", "B1.COM", "B2.COM", "B3.COM");
++
+ // Missing is "."
++ check("C1.COM", "C2.COM", "C1.COM", "COM");
+ check("C1.COM", "C3.COM", "C1.COM", "C2.COM");
+- // Multiple path
+- check("D1.COM", "D4.COM", "D1.COM", "D2.COM");
+- check("E1.COM", "E4.COM", "E1.COM", "E2.COM");
+- check("F1.COM", "F4.COM", "F1.COM", "F9.COM");
+- // Infinite loop
+- check("G1.COM", "G3.COM", "G1.COM", "COM");
+- check("H1.COM", "H3.COM", "H1.COM");
++
++ // cRealm = .
++ check("D1.COM", "D2.COM", "D1.COM");
++
++ // Bad cases
++ check("E1.COM", "E2.COM", "E1.COM");
++ check("E1.COM", "E3.COM", "E1.COM", "E4.COM");
++ check("G1.COM", "G3.COM", "G1.COM", "G2.COM");
+ check("I1.COM", "I4.COM", "I1.COM", "I5.COM");
+- // J2=J1 is the same as J2=.
+- check("J1.COM", "J2.COM", "J1.COM");
++
+ // 7019384
+ check("A9.PRAGUE.XXX.CZ", "SERVIS.XXX.CZ",
+ "A9.PRAGUE.XXX.CZ", "PRAGUE.XXX.CZ", "ROOT.XXX.CZ");
++
+ if (failed != null) {
+ throw failed;
+ }
+@@ -75,6 +113,7 @@
+ try {
+ check2(from, to, paths);
+ } catch (Exception e) {
++ System.out.println(" " + e.getMessage());
+ failed = e;
+ }
+ }
+@@ -84,18 +123,15 @@
+ System.out.println(from + " -> " + to);
+ System.out.println(" expected: " + Arrays.toString(paths));
+ String[] result = Realm.getRealmsList(from, to);
+- System.out.println(" result: " + Arrays.toString(result));
+- if (result == null) {
+- if (paths.length == 0) {
+- // OK
+- } else {
+- throw new Exception("Shouldn't have a valid path.");
+- }
++ System.out.println(" result: " + Arrays.toString(result));
++ if (result == null || result.length == 0) {
++ throw new Exception("There is always a valid path.");
+ } else if(result.length != paths.length) {
+ throw new Exception("Length of path not correct");
+ } else {
+ for (int i=0; i<result.length; i++) {
+ if (!result[i].equals(paths[i])) {
++ System.out.println(" result: " + Arrays.toString(result));
+ throw new Exception("Path not same");
+ }
+ }
+--- ./jdk/test/sun/security/krb5/auto/BadKdc.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/krb5/auto/BadKdc.java Wed May 07 19:26:47 2014 -0700
+@@ -39,7 +39,29 @@
+ // ^ kdc# ^ timeout
+ static final Pattern re = Pattern.compile(
+ ">>> KDCCommunication: kdc=kdc.rabbit.hole UDP:(\\d)...., " +
+- "timeout=(\\d)000,");
++ "timeout=(\\d+),");
++
++ // Ratio for timeout values of all timeout tests. Not final so that
++ // each test can choose their own.
++ static float ratio = 2f;
++
++ static void setRatio(float ratio) {
++ BadKdc.ratio = ratio;
++ }
++
++ static float getRatio() {
++ return ratio;
++ }
++
++ // Gets real timeout value. This method is called when writing krb5.conf
++ static int toReal(int from) {
++ return (int)(from * ratio + .5);
++ }
++
++ // De-ratio a millisecond value to second
++ static int toSymbolicSec(int from) {
++ return (int)(from / ratio / 1000f + 0.5);
++ }
+
+ /*
+ * There are several cases this test fails:
+@@ -97,7 +119,7 @@
+
+ fw.write("[libdefaults]\n" +
+ "default_realm = " + OneKDC.REALM + "\n" +
+- "kdc_timeout = 2000\n");
++ "kdc_timeout = " + toReal(2000) + "\n");
+ fw.write("[realms]\n" + OneKDC.REALM + " = {\n" +
+ "kdc = " + OneKDC.KDCHOST + ":" + p1 + "\n" +
+ "kdc = " + OneKDC.KDCHOST + ":" + p2 + "\n" +
+@@ -171,7 +193,8 @@
+ Matcher m = re.matcher(line);
+ if (m.find()) {
+ System.out.println(line);
+- sb.append(m.group(1)).append(m.group(2));
++ sb.append(m.group(1))
++ .append(toSymbolicSec(Integer.parseInt(m.group(2))));
+ }
+ }
+ if (failed) sb.append('-');
+--- ./jdk/test/sun/security/krb5/auto/BadKdc1.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/krb5/auto/BadKdc1.java Wed May 07 19:26:47 2014 -0700
+@@ -28,14 +28,21 @@
+ * @summary krb5 should not try to access unavailable kdc too often
+ */
+
+-import java.io.*;
+ import java.security.Security;
+
+ public class BadKdc1 {
+
+ public static void main(String[] args)
+ throws Exception {
+- Security.setProperty("krb5.kdc.bad.policy", "tryLess");
++
++ // 5 sec is default timeout for tryLess
++ if (BadKdc.getRatio() > 2.5) {
++ Security.setProperty("krb5.kdc.bad.policy",
++ "tryLess:1," + BadKdc.toReal(2000));
++ } else {
++ Security.setProperty("krb5.kdc.bad.policy", "tryLess");
++ }
++
+ BadKdc.go(
+ "121212222222(32){1,2}1222(32){1,2}", // 1 2
+ // The above line means try kdc1 for 2 seconds then kdc1
+--- ./jdk/test/sun/security/krb5/auto/BadKdc2.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/krb5/auto/BadKdc2.java Wed May 07 19:26:47 2014 -0700
+@@ -35,7 +35,12 @@
+
+ public static void main(String[] args)
+ throws Exception {
+- Security.setProperty("krb5.kdc.bad.policy", "tryLess:2,1000");
++
++ // 1 sec is too short.
++ BadKdc.setRatio(3.0f);
++
++ Security.setProperty(
++ "krb5.kdc.bad.policy", "tryLess:2," + BadKdc.toReal(1000));
+ BadKdc.go(
+ "121212222222(32){1,2}11112121(32){1,2}", // 1 2
+ "11112121(32){1,2}11112121(32){1,2}", // 1 2
+--- ./jdk/test/sun/security/krb5/auto/KDC.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/krb5/auto/KDC.java Wed May 07 19:26:47 2014 -0700
+@@ -630,7 +630,7 @@
+ * @return the response
+ * @throws java.lang.Exception for various errors
+ */
+- private byte[] processMessage(byte[] in) throws Exception {
++ protected byte[] processMessage(byte[] in) throws Exception {
+ if ((in[0] & 0x1f) == Krb5.KRB_AS_REQ)
+ return processAsReq(in);
+ else
+@@ -643,7 +643,7 @@
+ * @return the response
+ * @throws java.lang.Exception for various errors
+ */
+- private byte[] processTgsReq(byte[] in) throws Exception {
++ protected byte[] processTgsReq(byte[] in) throws Exception {
+ TGSReq tgsReq = new TGSReq(in);
+ PrincipalName service = tgsReq.reqBody.sname;
+ if (options.containsKey(KDC.Option.RESP_NT)) {
+@@ -809,7 +809,7 @@
+ * @return the response
+ * @throws java.lang.Exception for various errors
+ */
+- private byte[] processAsReq(byte[] in) throws Exception {
++ protected byte[] processAsReq(byte[] in) throws Exception {
+ ASReq asReq = new ASReq(in);
+ int[] eTypes = null;
+ List<PAData> outPAs = new ArrayList<>();
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/krb5/auto/LoginNoPass.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,73 @@
++/*
++ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++/*
++ * @test
++ * @bug 8028351
++ * @summary JWS doesn't get authenticated when using kerberos auth proxy
++ * @compile -XDignore.symbol.file LoginNoPass.java
++ * @run main/othervm LoginNoPass
++ */
++
++import sun.security.jgss.GSSUtil;
++
++import javax.security.auth.callback.Callback;
++import javax.security.auth.callback.CallbackHandler;
++import javax.security.auth.callback.NameCallback;
++import javax.security.auth.callback.PasswordCallback;
++import java.security.Security;
++
++public class LoginNoPass {
++
++ static boolean kdcTouched = false;
++ public static void main(String[] args) throws Exception {
++
++ new OneKDC(null) {
++ protected byte[] processAsReq(byte[] in) throws Exception {
++ kdcTouched = true;
++ return super.processAsReq(in);
++ }
++ }.writeJAASConf();
++ Security.setProperty("auth.login.defaultCallbackHandler",
++ "LoginNoPass$CallbackForClient");
++ System.setProperty("javax.security.auth.useSubjectCredsOnly", "false");
++
++ try {
++ Context c;
++ c = Context.fromJAAS("client");
++ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
++ c.take(new byte[0]);
++ } catch (Exception e) {
++ e.printStackTrace(System.out);
++ // OK
++ }
++ if (kdcTouched) {
++ throw new Exception("Failed");
++ }
++ }
++ public static class CallbackForClient implements CallbackHandler {
++ public void handle(Callback[] callbacks) {
++ // Do nothing
++ }
++ }
++}
+--- ./jdk/test/sun/security/krb5/auto/MaxRetries.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/krb5/auto/MaxRetries.java Wed May 07 19:26:47 2014 -0700
+@@ -54,7 +54,7 @@
+ test1(5000, 2); // 2 2
+
+ // For tryLess
+- Security.setProperty("krb5.kdc.bad.policy", "tryless");
++ Security.setProperty("krb5.kdc.bad.policy", "tryless:1," + BadKdc.toReal(5000));
+ rewriteMaxRetries(4);
+ test1(4000, 7); // 1 1 1 1 2 1 2
+ test1(4000, 4); // 1 2 1 2
+@@ -86,7 +86,7 @@
+ * @param count the expected total try
+ */
+ private static void test1(int timeout, int count) throws Exception {
+- String timeoutTag = "timeout=" + timeout;
++ String timeoutTag = "timeout=" + BadKdc.toReal(timeout);
+ ByteArrayOutputStream bo = new ByteArrayOutputStream();
+ PrintStream oldout = System.out;
+ System.setOut(new PrintStream(bo));
+@@ -184,12 +184,12 @@
+ if (s.startsWith("[realms]")) {
+ // Reconfig global setting
+ fw.write("max_retries = 2\n");
+- fw.write("kdc_timeout = 5000\n");
++ fw.write("kdc_timeout = " + BadKdc.toReal(5000) + "\n");
+ } else if (s.trim().startsWith("kdc = ")) {
+ if (value != -1) {
+ // Reconfig for realm
+ fw.write(" max_retries = " + value + "\n");
+- fw.write(" kdc_timeout = " + (value*1000) + "\n");
++ fw.write(" kdc_timeout = " + BadKdc.toReal(value*1000) + "\n");
+ }
+ // Add a bad KDC as the first candidate
+ fw.write(" kdc = localhost:33333\n");
+--- ./jdk/test/sun/security/krb5/auto/SaslGSS.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/krb5/auto/SaslGSS.java Wed May 07 19:26:47 2014 -0700
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 8012082
++ * @bug 8012082 8019267
+ * @summary SASL: auth-conf negotiated, but unencrypted data is accepted,
+ * reset to unencrypt
+ * @compile -XDignore.symbol.file SaslGSS.java
+@@ -37,9 +37,16 @@
+ import javax.security.sasl.RealmCallback;
+ import javax.security.sasl.Sasl;
+ import javax.security.sasl.SaslServer;
++import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
++import java.io.PrintStream;
+ import java.util.HashMap;
+ import java.util.Locale;
++import java.util.logging.ConsoleHandler;
++import java.util.logging.Handler;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++
+ import org.ietf.jgss.*;
+ import sun.security.jgss.GSSUtil;
+
+@@ -79,14 +86,28 @@
+ }
+ });
+
+- // Handshake
++ ByteArrayOutputStream bout = new ByteArrayOutputStream();
++ PrintStream oldErr = System.err;
++ System.setErr(new PrintStream(bout));
++
++ Logger.getLogger("javax.security.sasl").setLevel(Level.ALL);
++ Handler h = new ConsoleHandler();
++ h.setLevel(Level.ALL);
++ Logger.getLogger("javax.security.sasl").addHandler(h);
++
+ byte[] token = new byte[0];
+- token = sc.initSecContext(token, 0, token.length);
+- token = ss.evaluateResponse(token);
+- token = sc.unwrap(token, 0, token.length, new MessageProp(0, false));
+- token[0] = (byte)(((token[0] & 4) != 0) ? 4 : 2);
+- token = sc.wrap(token, 0, token.length, new MessageProp(0, false));
+- ss.evaluateResponse(token);
++
++ try {
++ // Handshake
++ token = sc.initSecContext(token, 0, token.length);
++ token = ss.evaluateResponse(token);
++ token = sc.unwrap(token, 0, token.length, new MessageProp(0, false));
++ token[0] = (byte)(((token[0] & 4) != 0) ? 4 : 2);
++ token = sc.wrap(token, 0, token.length, new MessageProp(0, false));
++ ss.evaluateResponse(token);
++ } finally {
++ System.setErr(oldErr);
++ }
+
+ // Talk
+ // 1. Client sends a auth-int message
+@@ -102,5 +123,15 @@
+ if (!qop.getPrivacy()) {
+ throw new Exception();
+ }
++
++ for (String s: bout.toString().split("\\n")) {
++ if (s.contains("KRB5SRV04") && s.contains("NULL")) {
++ return;
++ }
++ }
++ System.out.println("=======================");
++ System.out.println(bout.toString());
++ System.out.println("=======================");
++ throw new Exception("Haven't seen KRB5SRV04 with NULL");
+ }
+ }
+--- ./jdk/test/sun/security/krb5/auto/TcpTimeout.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/krb5/auto/TcpTimeout.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -24,7 +24,8 @@
+ /*
+ * @test
+ * @bug 6952519
+- * @run main/timeout=40/othervm TcpTimeout
++ * @compile -XDignore.symbol.file TcpTimeout.java
++ * @run main/othervm TcpTimeout
+ * @summary kdc_timeout is not being honoured when using TCP
+ */
+
+@@ -36,103 +37,71 @@
+ public static void main(String[] args)
+ throws Exception {
+
++ // Set debug to grab debug output like ">>> KDCCommunication"
+ System.setProperty("sun.security.krb5.debug", "true");
+- final int p1 = 10000 + new java.util.Random().nextInt(10000);
+- final int p2 = 20000 + new java.util.Random().nextInt(10000);
+- final int p3 = 30000 + new java.util.Random().nextInt(10000);
+
+- KDC k = new KDC(OneKDC.REALM, OneKDC.KDCHOST, p3, true);
++ // Called before new ServerSocket on p1 and p2 to make sure
++ // customized nameservice is used
++ KDC k = new KDC(OneKDC.REALM, OneKDC.KDCHOST, 0, true);
++ int p3 = k.getPort();
+ k.addPrincipal(OneKDC.USER, OneKDC.PASS);
+ k.addPrincipalRandKey("krbtgt/" + OneKDC.REALM);
+
+ // Start two listener that does not communicate, simulate timeout
+- new Thread() {
+- public void run() {
+- try {
+- new ServerSocket(p1).accept();
+- } catch (Exception e) {
+- }}
+- }.start();
+- new Thread() {
+- public void run() {
+- try {
+- new ServerSocket(p2).accept();
+- } catch (Exception e) {
+- }}
+- }.start();
++ ServerSocket ss1 = null;
++ ServerSocket ss2 = null;
+
+- FileWriter fw = new FileWriter("alternative-krb5.conf");
++ try {
++ ss1 = new ServerSocket(0);
++ ss2 = new ServerSocket(0);
++ int p1 = ss1.getLocalPort();
++ int p2 = ss2.getLocalPort();
+
+- fw.write("[libdefaults]\n" +
+- "udp_preference_limit = 1\n" +
+- "max_retries = 2\n" +
+- "default_realm = " + OneKDC.REALM + "\n" +
+- "kdc_timeout = 5000\n");
+- fw.write("[realms]\n" + OneKDC.REALM + " = {\n" +
+- "kdc = " + OneKDC.KDCHOST + ":" + p1 + "\n" +
+- "kdc = " + OneKDC.KDCHOST + ":" + p2 + "\n" +
+- "kdc = " + OneKDC.KDCHOST + ":" + p3 + "\n" +
+- "}\n");
++ FileWriter fw = new FileWriter("alternative-krb5.conf");
+
+- fw.close();
+- System.setProperty("java.security.krb5.conf", "alternative-krb5.conf");
+- Config.refresh();
++ fw.write("[libdefaults]\n" +
++ "udp_preference_limit = 1\n" +
++ "max_retries = 2\n" +
++ "default_realm = " + OneKDC.REALM + "\n" +
++ "kdc_timeout = " + BadKdc.toReal(5000) + "\n");
++ fw.write("[realms]\n" + OneKDC.REALM + " = {\n" +
++ "kdc = " + OneKDC.KDCHOST + ":" + p1 + "\n" +
++ "kdc = " + OneKDC.KDCHOST + ":" + p2 + "\n" +
++ "kdc = " + OneKDC.KDCHOST + ":" + p3 + "\n" +
++ "}\n");
+
+- // The correct behavior should be:
+- // 5 sec on p1, 5 sec on p1, fail
+- // 5 sec on p2, 5 sec on p2, fail
+- // p3 ok, p3 ok again for preauth.
+- // The total time should be 20sec + 2x. x is processing time for AS-REQ.
+- int count = 6;
+- long start = System.nanoTime();
++ fw.close();
++ System.setProperty("java.security.krb5.conf",
++ "alternative-krb5.conf");
++ Config.refresh();
+
+- ByteArrayOutputStream bo = new ByteArrayOutputStream();
+- PrintStream oldout = System.out;
+- System.setOut(new PrintStream(bo));
+- Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
+- System.setOut(oldout);
++ System.out.println("Ports opened on " + p1 + ", " + p2 + ", " + p3);
+
+- String[] lines = new String(bo.toByteArray()).split("\n");
+- for (String line: lines) {
+- if (line.startsWith(">>> KDCCommunication")) {
+- System.out.println(line);
+- count--;
++ // The correct behavior should be:
++ // 5 sec on p1, 5 sec on p1, fail
++ // 5 sec on p2, 5 sec on p2, fail
++ // p3 ok, p3 ok again for preauth.
++ int count = 6;
++
++ ByteArrayOutputStream bo = new ByteArrayOutputStream();
++ PrintStream oldout = System.out;
++ System.setOut(new PrintStream(bo));
++ Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
++ System.setOut(oldout);
++
++ String[] lines = new String(bo.toByteArray()).split("\n");
++ for (String line: lines) {
++ if (line.startsWith(">>> KDCCommunication")) {
++ System.out.println(line);
++ count--;
++ }
+ }
+- }
+- if (count != 0) {
+- throw new Exception("Retry count is " + count + " less");
+- }
+-
+- long end = System.nanoTime();
+- if ((end - start)/1000000000L < 20) {
+- throw new Exception("Too fast? " + (end - start)/1000000000L);
++ if (count != 0) {
++ throw new Exception("Retry count is " + count + " less");
++ }
++ } finally {
++ if (ss1 != null) ss1.close();
++ if (ss2 != null) ss2.close();
+ }
+ }
+-
+- private static KDC on(int p) throws Exception {
+- KDC k = new KDC(OneKDC.REALM, OneKDC.KDCHOST, p, true);
+- k.addPrincipal(OneKDC.USER, OneKDC.PASS);
+- k.addPrincipalRandKey("krbtgt/" + OneKDC.REALM);
+- return k;
+- }
+-
+- private static void addFakeKDCs()
+- throws Exception {
+- BufferedReader fr = new BufferedReader(new FileReader(OneKDC.KRB5_CONF));
+- FileWriter fw = new FileWriter("alternative-krb5.conf");
+- while (true) {
+- String s = fr.readLine();
+- if (s == null) {
+- break;
+- }
+- if (s.trim().startsWith("kdc = ")) {
+- fw.write(" kdc = localhost:33333\n");
+- fw.write(" kdc = localhost:22222\n");
+- }
+- fw.write(s + "\n");
+- }
+- fr.close();
+- fw.close();
+- sun.security.krb5.Config.refresh();
+- }
+ }
+--- ./jdk/test/sun/security/krb5/krb5-capaths.conf Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/krb5/krb5-capaths.conf Wed May 07 19:26:47 2014 -0700
+@@ -1,6 +1,6 @@
+ [capaths]
+
+-# Standard
++# http://web.mit.edu/kerberos/krb5-1.5/krb5-1.5.4/doc/krb5-admin/capaths.html
+
+ ANL.GOV = {
+ TEST.ANL.GOV = .
+@@ -14,81 +14,86 @@
+ PNL.GOV = {
+ ANL.GOV = ES.NET
+ }
+-NERSC.GOV = {
+- ANL.GOV = ES.NET
+-}
++#NERSC.GOV = {
++# ANL.GOV = ES.NET
++#}
+ ES.NET = {
+ ANL.GOV = .
+ }
++NERSC.GOV = {
++ ANL.GOV = ES.NET
++ TEST.ANL.GOV = ES.NET
++ TEST.ANL.GOV = ANL.GOV
++ PNL.GOV = ES.NET
++ ES.NET = .
++}
+
+-# Extra garbages
++# The original JDK example
++
++TIVOLI.COM = {
++ IBM.COM = IBM_LDAPCENTRAL.COM MOONLITE.ORG
++ IBM_LDAPCENTRAL.COM = LDAPCENTRAL.NET
++ LDAPCENTRAL.NET = .
++}
++
++# https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Managing_Smart_Cards/Setting_Up_Cross_Realm_Authentication.html
++
++A.EXAMPLE.COM = {
++ B.EXAMPLE.COM = .
++ C.EXAMPLE.COM = B.EXAMPLE.COM
++ D.EXAMPLE.COM = B.EXAMPLE.COM
++ D.EXAMPLE.COM = C.EXAMPLE.COM
++}
++
++# Full path
+
+ A1.COM = {
+ A2.COM = .
++ A3.COM = A2.COM
+ A4.COM = A2.COM
+- A3.COM = A4.COM
+- A3.COM = A2.COM
++ A4.COM = A3.COM
+ }
+
++# Shortest path
++
+ B1.COM = {
+ B2.COM = .
+ B3.COM = B2.COM
+- B3.COM = B4.COM
++ B4.COM = B3.COM
+ }
+
+-# Missing is "."
++# If no sRealm key, fallback to hierarchy
+
+ C1.COM = {
+ C3.COM = C2.COM
+ }
+
+-# Multiple paths
++# cRealm is "."
+
+ D1.COM = {
+- D2.COM = .
+- D3.COM = .
+- D4.COM = D2.COM
+- D4.COM = D3.COM
++ D2.COM=D1.COM
+ }
+
++# Bad cases
++
+ E1.COM = {
+- E2.COM = .
++ E2.COM = E2.COM
++ E3.COM = E4.COM
+ E3.COM = .
+- E4.COM = E2.COM E3.COM E2.COM
+ }
+
+-# Shortest or First?
+-
+-F1.COM = {
+- F2.COM = .
+- F3.COM = F2.COM
+- F4.COM = F9.COM
+- F4.COM = F3.COM
+- F4.COM = F2.COM
+-}
+-
+-# Infinite loop
+-
+ G1.COM = {
+ G2.COM = G3.COM
+ G3.COM = G2.COM
+ }
+
+-H1.COM = {
+- H2.COM = H3.COM
+- H3.COM = H2.COM
+- H3.COM = .
+-}
+-
+ I1.COM = {
+ I2.COM = I3.COM
+ I3.COM = I2.COM
+- I4.COM = I2.COM I5.COM
++ I4.COM = I5.COM
+ }
+
+-J1.COM = {
+- J2.COM=J1.COM
+-}
++# 7019384
+
+ A9.PRAGUE.XXX.CZ = {
+ PRAGUE.XXX.CZ = .
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java Tue Mar 18 12:35:25 2014 -0700
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java Wed May 07 19:26:47 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2007, 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
+@@ -75,6 +75,7 @@
+ import java.io.*;
+ import java.security.*;
+ import java.nio.*;
++import java.lang.management.*;
+
+ public class SSLEngineDeadlock {
+
+@@ -145,6 +146,8 @@
+ }
+ SSLEngineDeadlock test = new SSLEngineDeadlock();
+ test.runTest();
++
++ detectDeadLock();
+ }
+ System.out.println("Test Passed.");
+ }
+@@ -362,6 +365,22 @@
+ }
+
+ /*
++ * Detect dead lock
++ */
++ private static void detectDeadLock() throws Exception {
++ ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
++ long[] threadIds = threadBean.findDeadlockedThreads();
++ if (threadIds != null && threadIds.length != 0) {
++ for (long id : threadIds) {
++ ThreadInfo info =
++ threadBean.getThreadInfo(id, Integer.MAX_VALUE);
++ System.out.println("Deadlocked ThreadInfo: " + info);
++ }
++ throw new Exception("Found Deadlock!");
++ }
++ }
++
++ /*
+ * Logging code
+ */
+ private static boolean resultOnce = true;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/tools/jarsigner/EntriesOrder.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,204 @@
++/*
++ * 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 8031572
++ * @summary jarsigner -verify exits with 0 when a jar file is not properly signed
++ */
++
++import java.io.FileInputStream;
++import java.io.FileOutputStream;
++import java.nio.file.Files;
++import java.nio.file.Paths;
++import java.security.cert.Certificate;
++import java.util.*;
++import java.util.jar.JarEntry;
++import java.util.jar.JarFile;
++import java.util.jar.JarInputStream;
++import java.util.zip.ZipEntry;
++import java.util.zip.ZipOutputStream;
++
++public class EntriesOrder {
++
++ public static void main(String[] args) throws Exception {
++
++ String[] entries = {
++ "META-INF/",
++ "META-INF/MANIFEST.MF",
++ "META-INF/A.RSA",
++ "META-INF/A.SF",
++ "META-INF/inf",
++ "a"};
++
++ Map<String,byte[]> content = new HashMap<>();
++
++ // We will create a jar containing entries above. Try all permutations
++ // and confirm 1) When opened as a JarFile, we can always get 3 signed
++ // ones (MANIFEST, inf, a), and 2) When opened as a JarInputStream,
++ // when the order is correct (MANIFEST at beginning, followed by RSA/SF,
++ // directory ignored), we can get 2 signed ones (inf, a).
++
++ // Prepares raw files
++ Files.write(Paths.get("a"), "a".getBytes());
++ Files.createDirectory(Paths.get("META-INF/"));
++ Files.write(Paths.get("META-INF/inf"), "inf".getBytes());
++
++ // Pack, sign, and extract to get all files
++ sun.tools.jar.Main m =
++ new sun.tools.jar.Main(System.out, System.err, "jar");
++ if (!m.run("cvf a.jar a META-INF/inf".split(" "))) {
++ throw new Exception("jar creation failed");
++ }
++ sun.security.tools.KeyTool.main(
++ ("-keystore jks -storepass changeit -keypass changeit -dname" +
++ " CN=A -alias a -genkeypair -keyalg rsa").split(" "));
++ sun.security.tools.JarSigner.main(
++ "-keystore jks -storepass changeit a.jar a".split(" "));
++ m = new sun.tools.jar.Main(System.out, System.err, "jar");
++ if (!m.run("xvf a.jar".split(" "))) {
++ throw new Exception("jar extraction failed");
++ }
++
++ // Data
++ for (String s: entries) {
++ if (!s.endsWith("/")) {
++ content.put(s, Files.readAllBytes(Paths.get(s)));
++ }
++ }
++
++ // Test
++ for (List<String> perm: Permute(entries)) {
++
++ // Recreate a jar
++ try (ZipOutputStream zos
++ = new ZipOutputStream(new FileOutputStream("x.jar"))) {
++ for (String e: perm) {
++ zos.putNextEntry(new ZipEntry(e));
++ if (Paths.get(e).toFile().isDirectory()) continue;
++ zos.write(content.get(e));
++ }
++ }
++
++ // Open with JarFile, number of signed entries should be 3.
++ int cc = 0;
++ try (JarFile jf = new JarFile("x.jar")) {
++ Enumeration<JarEntry> jes = jf.entries();
++ while (jes.hasMoreElements()) {
++ JarEntry je = jes.nextElement();
++ sun.misc.IOUtils.readFully(jf.getInputStream(je), -1, true);
++ Certificate[] certs = je.getCertificates();
++ if (certs != null && certs.length > 0) {
++ cc++;
++ }
++ }
++ }
++
++ if (cc != 3) {
++ System.out.println(perm + " - jf - " + cc);
++ throw new Exception();
++ }
++
++ // Open with JarInputStream
++ int signed;
++
++ perm.remove("META-INF/");
++ if (perm.get(0).equals("META-INF/MANIFEST.MF") &&
++ perm.get(1).contains("/A.") &&
++ perm.get(2).contains("/A.")) {
++ signed = 2; // Good order
++ } else {
++ signed = 0; // Bad order. In this case, the number of signed
++ // entries is not documented. Just test impl.
++ }
++
++ cc = 0;
++ try (JarInputStream jis
++ = new JarInputStream(new FileInputStream("x.jar"))) {
++ while (true) {
++ JarEntry je = jis.getNextJarEntry();
++ if (je == null) break;
++ sun.misc.IOUtils.readFully(jis, -1, true);
++ Certificate[] certs = je.getCertificates();
++ if (certs != null && certs.length > 0) {
++ cc++;
++ }
++ }
++ }
++
++ if (cc != signed) {
++ System.out.println(perm + " - jis - " + cc + " " + signed);
++ throw new Exception();
++ }
++ }
++ }
++
++ // Helper method to return all permutations of an array. Each output can
++ // be altered without damaging the iteration process.
++ static Iterable<List<String>> Permute(final String[] entries) {
++ return new Iterable<List<String>>() {
++
++ int s = entries.length;
++ long c = factorial(s) - 1; // number of permutations
++
++ private long factorial(int n) {
++ return (n == 1) ? 1: (n * factorial(n-1));
++ }
++
++ @Override
++ public Iterator<List<String>> iterator() {
++ return new Iterator<List<String>>() {
++ @Override
++ public boolean hasNext() {
++ return c >= 0;
++ }
++
++ @Override
++ public void remove() {
++ throw new UnsupportedOperationException("remove");
++ }
++
++ @Override
++ public List<String> next() {
++ if (c < 0) return null;
++ List<String> result = new ArrayList<>(s);
++ LinkedList<String> source = new LinkedList<>(
++ Arrays.asList(entries));
++ // Treat c as a integer with different radixes at
++ // different digits, i.e. at digit 0, radix is s;
++ // at digit 1, radix is s-1. Thus a s-digit number
++ // is able to represent s! different values.
++ long n = c;
++ for (int i=s; i>=1; i--) {
++ int x = (int)(n % i);
++ result.add(source.remove(x));
++ n = n / i;
++ }
++ c--;
++ return result;
++ }
++ };
++ }
++ };
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/tools/jarsigner/jvindex.sh Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,76 @@
++#
++# 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 8022761
++# @summary regression: SecurityException is NOT thrown while trying to pack a wrongly signed Indexed Jar file
++#
++
++if [ "${TESTJAVA}" = "" ] ; then
++ JAVAC_CMD=`which javac`
++ TESTJAVA=`dirname $JAVAC_CMD`/..
++fi
++
++# set platform-dependent variables
++OS=`uname -s`
++case "$OS" in
++ Windows_* )
++ FS="\\"
++ ;;
++ * )
++ FS="/"
++ ;;
++esac
++
++F=abcde
++KS=jvindex.jks
++JFILE=jvindex.jar
++
++KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit \
++ -keystore $KS"
++JAR=$TESTJAVA${FS}bin${FS}jar
++JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner -keystore $KS -storepass changeit"
++
++rm $F $KS $JFILE 2> /dev/null
++
++echo 12345 > $F
++$JAR cvf $JFILE $F
++
++ERR=""
++
++$KT -alias a -dname CN=a -genkey -validity 300 || ERR="$ERR 1"
++
++$JARSIGNER $JFILE a || ERR="$ERR 2"
++$JAR i $JFILE
++
++# Make sure the $F line has "sm" (signed and in manifest)
++$JARSIGNER -verify -verbose $JFILE | grep $F | grep sm || ERR="$ERR 3"
++
++if [ "$ERR" = "" ]; then
++ exit 0
++else
++ echo "ERR is $ERR"
++ exit 1
++fi
++
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/tools/launcher/I18NArgTest.java Wed May 07 19:26:47 2014 -0700
+@@ -0,0 +1,111 @@
++/*
++ * 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 8016110
++ * @summary verify Japanese character in an argument are treated correctly
++ * @compile -XDignore.symbol.file I18NArgTest.java
++ * @run main I18NArgTest
++ */
++import java.io.IOException;
++
++public class I18NArgTest extends TestHelper {
++ public static void main(String... args) throws IOException {
++ if (!isWindows) {
++ return;
++ }
++ if (!"MS932".equals(System.getProperty("sun.jnu.encoding"))) {
++ System.err.println("MS932 encoding not set, test skipped");
++ return;
++ }
++ if (args.length == 0) {
++ execTest(0x30bd); // MS932 Katakana SO, 0x835C
++ } else {
++ testCharacters(args);
++ }
++ }
++ static void execTest(int unicodeValue) {
++ String hexValue = Integer.toHexString(unicodeValue);
++ String unicodeStr = Character.toString((char)unicodeValue);
++ execTest("\"" + unicodeStr + "\"", hexValue);
++ execTest("\\" + unicodeStr + "\\", hexValue);
++ execTest(" " + unicodeStr + " ", hexValue);
++ execTest("'" + unicodeStr + "'", hexValue);
++ execTest("\t" + unicodeStr + "\t", hexValue);
++ execTest("*" + unicodeStr + "*", hexValue);
++ execTest("?" + unicodeStr + "?", hexValue);
++
++ execTest("\"" + unicodeStr + unicodeStr + "\"", hexValue + hexValue);
++ execTest("\\" + unicodeStr + unicodeStr + "\\", hexValue + hexValue);
++ execTest(" " + unicodeStr + unicodeStr + " ", hexValue + hexValue);
++ execTest("'" + unicodeStr + unicodeStr + "'", hexValue + hexValue);
++ execTest("\t" + unicodeStr + unicodeStr + "\t", hexValue + hexValue);
++ execTest("*" + unicodeStr + unicodeStr + "*", hexValue + hexValue);
++ execTest("?" + unicodeStr + unicodeStr + "?", hexValue + hexValue);
++
++ execTest("\"" + unicodeStr + "a" + unicodeStr + "\"", hexValue + "61" + hexValue);
++ execTest("\\" + unicodeStr + "a" + unicodeStr + "\\", hexValue + "61" + hexValue);
++ execTest(" " + unicodeStr + "a" + unicodeStr + " ", hexValue + "61"+ hexValue);
++ execTest("'" + unicodeStr + "a" + unicodeStr + "'", hexValue + "61"+ hexValue);
++ execTest("\t" + unicodeStr + "a" + unicodeStr + "\t", hexValue + "61"+ hexValue);
++ execTest("*" + unicodeStr + "a" + unicodeStr + "*", hexValue + "61"+ hexValue);
++ execTest("?" + unicodeStr + "a" + unicodeStr + "?", hexValue + "61"+ hexValue);
++
++ execTest("\"" + unicodeStr + "\u00b1" + unicodeStr + "\"", hexValue + "b1" + hexValue);
++ execTest("\\" + unicodeStr + "\u00b1" + unicodeStr + "\\", hexValue + "b1" + hexValue);
++ execTest(" " + unicodeStr + "\u00b1" + unicodeStr + " ", hexValue + "b1"+ hexValue);
++ execTest("'" + unicodeStr + "\u00b1" + unicodeStr + "'", hexValue + "b1"+ hexValue);
++ execTest("\t" + unicodeStr + "\u00b1" + unicodeStr + "\t", hexValue + "b1"+ hexValue);
++ execTest("*" + unicodeStr + "\u00b1" + unicodeStr + "*", hexValue + "b1"+ hexValue);
++ execTest("?" + unicodeStr + "\u00b1" + unicodeStr + "?", hexValue + "b1"+ hexValue);
++ }
++ static void execTest(String unicodeStr, String hexValue) {
++ TestResult tr = doExec(javaCmd,
++ "-Dtest.src=" + TEST_SOURCES_DIR.getAbsolutePath(),
++ "-Dtest.classes=" + TEST_CLASSES_DIR.getAbsolutePath(),
++ "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
++ "I18NArgTest", unicodeStr, hexValue);
++ System.out.println(tr.testOutput);
++ if (!tr.isOK()) {
++ System.err.println(tr);
++ throw new RuntimeException("test fails");
++ }
++ }
++ static void testCharacters(String... args) {
++ String input = args[0];
++ String expected = args[1];
++ String hexValue = "";
++ for (int i = 0; i < input.length(); i++) {
++ hexValue = hexValue.concat(Integer.toHexString((int)input.charAt(i)));
++ }
++ System.out.println("input:" + input);
++ System.out.println("expected:" + expected);
++ System.out.println("obtained:" + hexValue);
++ if (!hexValue.contains(expected)) {
++ String message = "Error: output does not contain expected value" +
++ "expected:" + expected + " obtained:" + hexValue;
++ throw new RuntimeException(message);
++ }
++ }
++}
+--- ./langtools/.hgtags Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/.hgtags Wed May 07 19:27:09 2014 -0700
+@@ -359,6 +359,7 @@
+ 765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42
+ 988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43
+ a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60
++849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
+ b2e29b79e54e58349c1dbcf5449f67fc5d5a235a jdk7u40-b61
+ 94ea3d062a3c28c64a837fa8f999c6b6956ff7c4 jdk7u40-b62
+ 9bbfba4981e1db5016bbfbc23025763966021c26 jdk7u45-b01
+@@ -416,3 +417,26 @@
+ 2bdd105e433da7fbf7f37ec2f75fc4bed4e54280 jdk7u55-b11
+ a3cdca5d3773f67a49091f9131a4d073bc6b83d9 jdk7u55-b12
+ 81bf1ca3a3a71c628b7d952ba47c6f200a223f27 jdk7u55-b13
++96d55b4d88fea1d9f8227e70003210a6c10a1dba jdk7u55-b30
++c1964a222000b4884b992fdbaf8f62a45fb893c9 jdk7u55-b14
++4f6115ba266e5489b5e1968a28304f82be1f5641 jdk7u55-b31
++849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
++b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01
++954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02
++4170784840d510b4e8ae7ae250b92279aaf5eb25 jdk7u60-b03
++772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u60-b04
++744287fccf3b2c4fba2abf105863f0a44c3bd4da jdk7u60-b05
++8f6db72756f3e4c3cca8731d20e978fb741846d2 jdk7u60-b06
++02f050bc5569fb058ace44ed705bbb0f9022a6fe jdk7u60-b07
++be8e34e4920ebd1cfb89739d636e363c7881a548 jdk7u60-b08
++3f8b585403e596b7eadc231484f5480361c52c4b jdk7u60-b09
++3ee98cd07065dfa9a982e6692a3e875684a7e820 jdk7u60-b10
++3cc64ba8cf85942929b15c5ef21360f96db3b99c jdk7u60-b11
++b79b8b1dc88faa73229b2bce04e979ff5ec854f5 jdk7u60-b12
++3dc3e59e9580dfdf95dac57c54fe1a4209401125 jdk7u60-b13
++a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14
++7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15
++057caf9e0774e7c530c5710127f70c8d5f46deab jdk7u60-b16
++b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b18
++b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17
++40aa95c8477aa0a3f090859570f5536afc9026b7 jdk7u60-b19
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Wed May 07 19:27:09 2014 -0700
+@@ -181,12 +181,14 @@
+ String label, boolean strong,
+ String stylename, String title, String target) {
+ StringBuffer retlink = new StringBuffer();
++ StringBuilder lnk = new StringBuilder();
+ retlink.append("<a href=\"");
+- retlink.append(link);
++ lnk.append(link);
+ if (where != null && where.length() != 0) {
+- retlink.append("#");
+- retlink.append(where);
++ lnk.append("#");
++ lnk.append(where);
+ }
++ retlink.append(HtmlTree.encodeURL(lnk.toString()));
+ retlink.append("\"");
+ if (title != null && title.length() != 0) {
+ retlink.append(" title=\"" + title + "\"");
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 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,6 +26,7 @@
+ package com.sun.tools.doclets.formats.html.markup;
+
+ import java.util.*;
++import java.nio.charset.*;
+ import com.sun.tools.doclets.internal.toolkit.Content;
+ import com.sun.tools.doclets.internal.toolkit.util.*;
+
+@@ -116,6 +117,46 @@
+ }
+
+ /**
++ * A set of ASCII URI characters to be left unencoded.
++ */
++ public static final BitSet NONENCODING_CHARS = new BitSet(256);
++
++ static {
++ // alphabetic characters
++ for (int i = 'a'; i <= 'z'; i++) {
++ NONENCODING_CHARS.set(i);
++ }
++ for (int i = 'A'; i <= 'Z'; i++) {
++ NONENCODING_CHARS.set(i);
++ }
++ // numeric characters
++ for (int i = '0'; i <= '9'; i++) {
++ NONENCODING_CHARS.set(i);
++ }
++ // Reserved characters as per RFC 3986. These are set of delimiting characters.
++ String noEnc = ":/?#[]@!$&'()*+,;=";
++ // Unreserved characters as per RFC 3986 which should not be percent encoded.
++ noEnc += "-._~";
++ for (int i = 0; i < noEnc.length(); i++) {
++ NONENCODING_CHARS.set(noEnc.charAt(i));
++ }
++ }
++
++ protected static String encodeURL(String url) {
++ byte[] urlBytes = url.getBytes(Charset.forName("UTF-8"));
++ StringBuilder sb = new StringBuilder();
++ for (int i = 0; i < urlBytes.length; i++) {
++ int c = urlBytes[i];
++ if (NONENCODING_CHARS.get(c & 0xFF)) {
++ sb.append((char) c);
++ } else {
++ sb.append(String.format("%%%02X", c & 0xFF));
++ }
++ }
++ return sb.toString();
++ }
++
++ /**
+ * Generates an HTML anchor tag.
+ *
+ * @param ref reference url for the anchor tag
+@@ -124,7 +165,7 @@
+ */
+ public static HtmlTree A(String ref, Content body) {
+ HtmlTree htmltree = new HtmlTree(HtmlTag.A, nullCheck(body));
+- htmltree.addAttr(HtmlAttr.HREF, nullCheck(ref));
++ htmltree.addAttr(HtmlAttr.HREF, encodeURL(ref));
+ return htmltree;
+ }
+
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed May 07 19:27:09 2014 -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
+@@ -362,6 +362,12 @@
+ " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
+ " targetPage = \"undefined\";" + DocletConstants.NL +
+ " function validURL(url) {" + DocletConstants.NL +
++ " try {" + DocletConstants.NL +
++ " url = decodeURIComponent(url);" + DocletConstants.NL +
++ " }" + DocletConstants.NL +
++ " catch (error) {" + DocletConstants.NL +
++ " return false;" + DocletConstants.NL +
++ " }" + DocletConstants.NL +
+ " var pos = url.indexOf(\".html\");" + DocletConstants.NL +
+ " if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL +
+ " return false;" + DocletConstants.NL +
+@@ -373,7 +379,8 @@
+ " if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL +
+ " 'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL +
+ " ch == '$' ||" + DocletConstants.NL +
+- " ch == '_') {" + DocletConstants.NL +
++ " ch == '_' ||" + DocletConstants.NL +
++ " ch.charCodeAt(0) > 127) {" + DocletConstants.NL +
+ " allowNumber = true;" + DocletConstants.NL +
+ " allowSep = true;" + DocletConstants.NL +
+ " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL +
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Wed May 07 19:27:09 2014 -0700
+@@ -25,7 +25,7 @@
+ doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
+ doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
+ doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+-doclet.Summary=\u6982\u8981:
++doclet.Summary=\u30B5\u30DE\u30EA\u30FC:
+ doclet.Detail=\u8A73\u7D30:
+ doclet.navNested=\u30CD\u30B9\u30C8
+ doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3
+@@ -68,7 +68,7 @@
+ doclet.see.class_or_package_not_found=\u30BF\u30B0{0}: \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1}
+ doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1}
+ doclet.see.malformed_tag={0}\u30BF\u30B0: \u4E0D\u6B63\u306A{1}\u30BF\u30B0
+-doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u6982\u8981
++doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u30B5\u30DE\u30EA\u30FC
+ doclet.Deprecated_API=\u975E\u63A8\u5968\u306EAPI
+ doclet.Deprecated_Packages=\u975E\u63A8\u5968\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
+ doclet.Deprecated_Classes=\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9
+@@ -135,18 +135,18 @@
+ doclet.Help_title=API\u30D8\u30EB\u30D7
+ doclet.Window_Help_title=API\u30D8\u30EB\u30D7
+ doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
+-doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+-doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+-doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
++doclet.Help_line_2=\u3053\u306EAPI (Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
++doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30B5\u30DE\u30EA\u30FC\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u5168\u4F53\u7684\u306A\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
++doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u30B5\u30DE\u30EA\u30FC\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
+ doclet.Help_line_5=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+-doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
++doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u30B5\u30DE\u30EA\u30FC\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+ doclet.Help_line_7=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
+ doclet.Help_line_8=\u76F4\u7CFB\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
+ doclet.Help_line_9=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8
+ doclet.Help_line_10=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8
+ doclet.Help_line_11=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
+ doclet.Help_line_12=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
+-doclet.Help_line_13=\u5404\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306B\u306F\u3001\u305D\u306E\u9805\u76EE\u306E\u8A73\u7D30\u306A\u8AAC\u660E\u306E\u4E2D\u304B\u30891\u884C\u76EE\u306E\u6587\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
++doclet.Help_line_13=\u5404\u30B5\u30DE\u30EA\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306B\u306F\u3001\u305D\u306E\u9805\u76EE\u306E\u8A73\u7D30\u8AAC\u660E\u306E\u4E2D\u304B\u30891\u884C\u76EE\u306E\u6587\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u30B5\u30DE\u30EA\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u3067\u3059\u304C\u3001\u8A73\u7D30\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
+ doclet.Help_line_14=\u4F7F\u7528
+ doclet.Help_line_15=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ doclet.Help_line_16=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64)
+--- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties Wed May 07 19:27:09 2014 -0700
+@@ -182,25 +182,32 @@
+ doclet.0_and_1={0} and {1}
+
+ #Documentation for Enums
+-doclet.enum_values_doc=\n\
++doclet.enum_values_doc.main=\n\
+ Returns an array containing the constants of this enum type, in\n\
+ the order they are declared. This method may be used to iterate\n\
+ over the constants as follows:\n\
+ <pre>\n\
+ for ({0} c : {0}.values())\n\
+ &nbsp; System.out.println(c);\n\
+- </pre>\n\
+- @return an array containing the constants of this enum type, in\n\
+- the order they are declared
++ </pre>
+
+-doclet.enum_valueof_doc=\n\
++doclet.enum_values_doc.return=\n\
++ an array containing the constants of this enum type, in the order they are declared
++
++doclet.enum_valueof_doc.main=\n\
+ Returns the enum constant of this type with the specified name.\n\
+ The string must match <i>exactly</i> an identifier used to declare an\n\
+ enum constant in this type. (Extraneous whitespace characters are \n\
+- not permitted.)\n\
+- \n\
+- @param name the name of the enum constant to be returned.\n\
+- @return the enum constant with the specified name\n\
+- @throws IllegalArgumentException if this enum type has no constant\n\
+- with the specified name\n\
+- @throws NullPointerException if the argument is null
++ not permitted.)
++
++doclet.enum_valueof_doc.param_name=\
++ the name of the enum constant to be returned.
++
++doclet.enum_valueof_doc.return=\
++ the enum constant with the specified name
++
++doclet.enum_valueof_doc.throws_ila=\
++ if this enum type has no constant with the specified name
++
++doclet.enum_valueof_doc.throws_npe=\
++ if the argument is null
+--- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Wed May 07 19:27:09 2014 -0700
+@@ -66,22 +66,22 @@
+ doclet.malformed_html_link_tag=<a> \u30BF\u30B0\u306E\u5F62\u5F0F\u304C\u4E0D\u6B63:\n"{0}"
+ doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002
+ doclet.javafx_tag_misuse=\u30BF\u30B0@propertyGetter\u3001@propertySetter\u304A\u3088\u3073@propertyDescription\u306F\u3001JavaFX\u306E\u30D7\u30ED\u30D1\u30C6\u30A3getter\u3068setter\u306E\u307F\u3067\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+-doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981
+-doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6982\u8981
+-doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u6982\u8981
+-doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u6982\u8981
+-doclet.Exception_Summary=\u4F8B\u5916\u306E\u6982\u8981
+-doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u6982\u8981
+-doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u6982\u8981
+-doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u6982\u8981
+-doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u6982\u8981
+-doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u6982\u8981
+-doclet.Field_Summary=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u6982\u8981
+-doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u6982\u8981
+-doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981
+-doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981
+-doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
+-doclet.Factory_Method_Summary=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
++doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Exception_Summary=\u4F8B\u5916\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Field_Summary=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC
++doclet.Factory_Method_Summary=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC
+ doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
+ doclet.Enums=\u5217\u6319\u578B
+ doclet.AnnotationTypes=\u6CE8\u91C8\u578B
+@@ -180,6 +180,16 @@
+ doclet.0_and_1={0}\u3068{1}
+
+ #Documentation for Enums
+-doclet.enum_values_doc=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n<pre>\nfor({0} c: {0}.values())\n&nbsp; System.out.println(c);\n</pre>\n@return \u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u542B\u3080\u914D\u5217
++doclet.enum_values_doc.main=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n<pre>\nfor({0} c: {0}.values())\n&nbsp; System.out.println(c);\n</pre>\n
+
+-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_values_doc.return=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u306E\u914D\u5217
++
++doclet.enum_valueof_doc.main=\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
++
++doclet.enum_valueof_doc.param_name=\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\u3002
++
++doclet.enum_valueof_doc.return=\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5217\u6319\u578B\u5B9A\u6570
++
++doclet.enum_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u578B\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
++
++doclet.enum_valueof_doc.throws_npe=\u5F15\u6570\u304Cnull\u306E\u5834\u5408
+--- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties Wed May 07 19:27:09 2014 -0700
+@@ -180,6 +180,16 @@
+ doclet.0_and_1={0}\u548C{1}
+
+ #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
++doclet.enum_values_doc.main=\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>
+
+-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
++doclet.enum_values_doc.return=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F\u8FD4\u56DE\u7684\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4
++
++doclet.enum_valueof_doc.main=\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)
++
++doclet.enum_valueof_doc.param_name=\u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002
++
++doclet.enum_valueof_doc.return=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF
++
++doclet.enum_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
++
++doclet.enum_valueof_doc.throws_npe=\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C
+--- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Wed May 07 19:27:09 2014 -0700
+@@ -852,16 +852,28 @@
+ for (int j = 0; j < methods.length; j++) {
+ MethodDoc currentMethod = methods[j];
+ if (currentMethod.name().equals("values") &&
+- currentMethod.parameters().length == 0) {
+- currentMethod.setRawCommentText(
+- configuration.getText("doclet.enum_values_doc", classDoc.name()));
++ currentMethod.parameters().length == 0) {
++ StringBuilder sb = new StringBuilder();
++ sb.append(configuration.getText("doclet.enum_values_doc.main", classDoc.name()));
++ sb.append("\n@return ");
++ sb.append(configuration.getText("doclet.enum_values_doc.return"));
++ currentMethod.setRawCommentText(sb.toString());
+ } else if (currentMethod.name().equals("valueOf") &&
+- currentMethod.parameters().length == 1) {
++ currentMethod.parameters().length == 1) {
+ Type paramType = currentMethod.parameters()[0].type();
+ if (paramType != null &&
+- paramType.qualifiedTypeName().equals(String.class.getName())) {
+- currentMethod.setRawCommentText(
+- configuration.getText("doclet.enum_valueof_doc"));
++ paramType.qualifiedTypeName().equals(String.class.getName())) {
++ StringBuilder sb = new StringBuilder();
++ sb.append(configuration.getText("doclet.enum_valueof_doc.main", classDoc.name()));
++ sb.append("\n@param name ");
++ sb.append(configuration.getText("doclet.enum_valueof_doc.param_name"));
++ sb.append("\n@return ");
++ sb.append(configuration.getText("doclet.enum_valueof_doc.return"));
++ sb.append("\n@throws IllegalArgumentException ");
++ sb.append(configuration.getText("doclet.enum_valueof_doc.throws_ila"));
++ sb.append("\n@throws NullPointerException ");
++ sb.append(configuration.getText("doclet.enum_valueof_doc.throws_npe"));
++ currentMethod.setRawCommentText(sb.toString());
+ }
+ }
+ }
+--- ./langtools/src/share/classes/com/sun/tools/javac/code/Type.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javac/code/Type.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2011, 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
+@@ -597,6 +597,10 @@
+ };
+ }
+
++ public List<Type> getComponents() {
++ return interfaces_field.prepend(supertype_field);
++ }
++
+ /** The Java source which this type represents.
+ */
+ public String toString() {
+--- ./langtools/src/share/classes/com/sun/tools/javac/code/Types.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javac/code/Types.java Wed May 07 19:27:09 2014 -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
+@@ -1012,23 +1012,10 @@
+ }
+ }
+
+- if (t.isCompound()) {
+- Warner oldWarner = warnStack.head;
+- warnStack.head = Warner.noWarnings;
+- if (!visit(supertype(t), s))
+- return false;
+- for (Type intf : interfaces(t)) {
+- if (!visit(intf, s))
+- return false;
+- }
+- if (warnStack.head.hasLint(LintCategory.UNCHECKED))
+- oldWarner.warn(LintCategory.UNCHECKED);
+- return true;
+- }
+-
+- if (s.isCompound()) {
+- // call recursively to reuse the above code
+- return visitClassType((ClassType)s, t);
++ if (t.isCompound() || s.isCompound()) {
++ return !t.isCompound() ?
++ visitIntersectionType((ClassType)s, t, true) :
++ visitIntersectionType(t, s, false);
+ }
+
+ if (s.tag == CLASS || s.tag == ARRAY) {
+@@ -1106,6 +1093,18 @@
+ return false;
+ }
+
++ boolean visitIntersectionType(ClassType ict, Type s, boolean reverse) {
++ Warner warn = Warner.noWarnings;
++ for (Type c : ict.getComponents()) {
++ warn.clear();
++ if (reverse ? !isCastable(s, c, warn) : !isCastable(c, s, warn))
++ return false;
++ }
++ if (warn.hasLint(LintCategory.UNCHECKED))
++ warnStack.head.warn(LintCategory.UNCHECKED);
++ return true;
++ }
++
+ @Override
+ public Boolean visitArrayType(ArrayType t, Type s) {
+ switch (s.tag) {
+@@ -3369,11 +3368,18 @@
+ }
+
+ private boolean giveWarning(Type from, Type to) {
+- Type subFrom = asSub(from, to.tsym);
+- return to.isParameterized() &&
+- (!(isUnbounded(to) ||
+- isSubtype(from, to) ||
+- ((subFrom != null) && containsType(to.allparams(), subFrom.allparams()))));
++ List<Type> bounds = to.isCompound() ?
++ ((ClassType)to).getComponents() : List.of(to);
++ for (Type b : bounds) {
++ Type subFrom = asSub(from, b.tsym);
++ if (b.isParameterized() &&
++ (!(isUnbounded(b) ||
++ isSubtype(from, b) ||
++ ((subFrom != null) && containsType(b.allparams(), subFrom.allparams()))))) {
++ return true;
++ }
++ }
++ return false;
+ }
+
+ private List<Type> superClosure(Type t, Type s) {
+--- ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Wed May 07 19:27:09 2014 -0700
+@@ -30,14 +30,14 @@
+ javac.opt.g.lines.vars.source=\u3044\u304F\u3064\u304B\u306E\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u306E\u307F\u3092\u751F\u6210\u3059\u308B
+ javac.opt.nowarn=\u8B66\u544A\u3092\u767A\u751F\u3055\u305B\u306A\u3044
+ javac.opt.verbose=\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u52D5\u4F5C\u306B\u3064\u3044\u3066\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
+-javac.opt.deprecation=\u975E\u63A8\u5968\u306EAPI\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30BD\u30FC\u30B9\u306E\u4F4D\u7F6E\u3092\u51FA\u529B\u3059\u308B
++javac.opt.deprecation=\u975E\u63A8\u5968\u306EAPI\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30BD\u30FC\u30B9\u306E\u5834\u6240\u3092\u51FA\u529B\u3059\u308B
+ javac.opt.classpath=\u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
+ javac.opt.sourcepath=\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
+-javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
++javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+ javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B
+ javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
+-javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+-javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
++javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
++javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+ javac.opt.processorpath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
+ javac.opt.processor=\u5B9F\u884C\u3059\u308B\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u540D\u524D\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u691C\u51FA\u51E6\u7406\u3092\u30D0\u30A4\u30D1\u30B9
+ javac.opt.proc.none.only=\u6CE8\u91C8\u51E6\u7406\u3084\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002
+@@ -115,7 +115,7 @@
+
+ javac.msg.usage.nonstandard.footer=\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
+
+-javac.msg.bug=\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002Bug Parade\u306B\u540C\u3058\u30D0\u30B0\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u306A\u3044\u3053\u3068\u3092\u3054\u78BA\u8A8D\u306E\u4E0A\u3001Java Developer Connection(http://java.sun.com/webapps/bugreport)\u3067\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u305D\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u4E0B\u8A18\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
++javac.msg.bug=\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002Bug Parade\u306B\u540C\u3058\u30D0\u30B0\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u306A\u3044\u3053\u3068\u3092\u3054\u78BA\u8A8D\u306E\u4E0A\u3001Java Developer Connection (http://java.sun.com/webapps/bugreport)\u3067\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u305D\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u4E0B\u8A18\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
+
+ javac.msg.io=\n\n\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
+
+--- ./langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Wed May 07 19:27:09 2014 -0700
+@@ -55,8 +55,8 @@
+ main.opt.o=\ -o <file> \u51FA\u529B\u30D5\u30A1\u30A4\u30EB(-d\u304B-o\u306E\u3069\u3061\u3089\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3059\u308B)
+ main.opt.d=\ -d <dir> \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+ main.opt.v=\ -v -verbose \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046
+-main.opt.h=\ -h --help -? \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B
+-main.opt.version=\ -version \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3059\u308B
++main.opt.h=\ -h --help -? \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
++main.opt.version=\ -version \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
+ main.opt.jni=\ -jni JNI\u5F62\u5F0F\u306E\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)
+ main.opt.force=\ -force \u5E38\u306B\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080
+ main.opt.classpath=\ -classpath <path> \u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties Wed May 07 19:27:09 2014 -0700
+@@ -0,0 +1,63 @@
++
++err.prefix=\u30A8\u30E9\u30FC:
++
++err.bad.constant.pool={0}\u306E\u5B9A\u6570\u30D7\u30FC\u30EB\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
++err.class.not.found=\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
++err.crash=\u91CD\u5927\u306A\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\u6B21\u306E\u60C5\u5831\u3092\u542B\u3080\u30D0\u30B0\u30FB\u30EC\u30DD\u30FC\u30C8\u3092\u30D5\u30A1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044:\n{1}
++err.end.of.file={0}\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F
++err.file.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
++err.h.not.supported=-h\u306F\u4F7F\u7528\u53EF\u80FD\u3067\u306A\u304F\u306A\u308A\u307E\u3057\u305F - 'javah'\u30D7\u30ED\u30B0\u30E9\u30E0\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
++err.incompatible.options=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u7D44\u5408\u305B\u304C\u4E0D\u6B63\u3067\u3059: {0}
++err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0} {1} {2}
++err.invalid.arg.for.option=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: {0}
++err.ioerror={0}\u306E\u8AAD\u53D6\u308A\u4E2D\u306BIO\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
++err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
++err.no.classes.specified=\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
++err.not.standard.file.manager=\u6A19\u6E96\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u5834\u5408\u306F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u307F\u6307\u5B9A\u3067\u304D\u307E\u3059
++err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
++err.verify.not.supported=-verify\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
++err.no.SourceFile.attribute=SourceFile\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
++err.source.file.not.found=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
++err.bad.innerclasses.attribute={0}\u306EInnerClasses\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059
++warn.Xold.not.supported=-Xold\u306F\u4F7F\u7528\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3057\u305F
++
++main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001-help\u3092\u4F7F\u7528\u3057\u307E\u3059
++
++warn.prefix=\u8B66\u544A:
++warn.unexpected.class=\u30D0\u30A4\u30CA\u30EA\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306B{1}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
++
++note.prefix=\u6CE8:
++
++main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001-help\u3092\u4F7F\u7528\u3057\u307E\u3059
++
++main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:
++
++
++main.opt.help=\ -help --help -? \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
++
++main.opt.version=\ -version \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
++
++main.opt.v=\ -v -verbose \u8FFD\u52A0\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
++
++main.opt.l=\ -l \u884C\u756A\u53F7\u3068\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u8868\u3092\u51FA\u529B\u3059\u308B
++
++main.opt.public=\ -public public\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3059\u308B
++
++main.opt.protected=\ -protected protected/public\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3059\u308B
++
++main.opt.package=\ -package package/protected/public\u30AF\u30E9\u30B9\u304A\u3088\u3073\n \u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)
++
++main.opt.p=\ -p -private \u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u8868\u793A\u3059\u308B
++
++main.opt.c=\ -c \u30B3\u30FC\u30C9\u3092\u9006\u30A2\u30BB\u30F3\u30D6\u30EB\u3059\u308B
++
++main.opt.s=\ -s \u5185\u90E8\u30BF\u30A4\u30D7\u7F72\u540D\u3092\u51FA\u529B\u3059\u308B
++
++main.opt.classpath=\ -classpath <path> \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
++
++main.opt.bootclasspath=\ -bootclasspath <path> \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
++
++main.opt.constants=\ -constants \u9759\u7684final\u5B9A\u6570\u3092\u8868\u793A\u3059\u308B
++
++
++main.opt.sysinfo=\ -sysinfo \u51E6\u7406\u3057\u3066\u3044\u308B\u30AF\u30E9\u30B9\u306E\u30B7\u30B9\u30C6\u30E0\u60C5\u5831(\u30D1\u30B9\u3001\u30B5\u30A4\u30BA\u3001\u65E5\u4ED8\u3001MD5\u30CF\u30C3\u30B7\u30E5)\n \u3092\u8868\u793A\u3059\u308B
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties Wed May 07 19:27:09 2014 -0700
+@@ -0,0 +1,63 @@
++
++err.prefix=\u9519\u8BEF:
++
++err.bad.constant.pool=\u8BFB\u53D6{0}\u7684\u5E38\u91CF\u6C60\u65F6\u51FA\u9519: {1}
++err.class.not.found=\u627E\u4E0D\u5230\u7C7B: {0}
++err.crash=\u51FA\u73B0\u4E25\u91CD\u7684\u5185\u90E8\u9519\u8BEF: {0}\n\u8BF7\u5EFA\u7ACB Bug \u62A5\u544A, \u5E76\u5305\u62EC\u4EE5\u4E0B\u4FE1\u606F:\n{1}
++err.end.of.file=\u8BFB\u53D6{0}\u65F6\u51FA\u73B0\u610F\u5916\u7684\u6587\u4EF6\u7ED3\u5C3E
++err.file.not.found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
++err.h.not.supported=-h \u4E0D\u518D\u53EF\u7528 - \u8BF7\u4F7F\u7528 'javah' \u7A0B\u5E8F
++err.incompatible.options=\u9009\u9879\u7EC4\u5408\u9519\u8BEF: {0}
++err.internal.error=\u5185\u90E8\u9519\u8BEF: {0} {1} {2}
++err.invalid.arg.for.option=\u9009\u9879\u7684\u53C2\u6570\u65E0\u6548: {0}
++err.ioerror=\u8BFB\u53D6{0}\u65F6\u51FA\u73B0 IO \u9519\u8BEF: {1}
++err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
++err.no.classes.specified=\u672A\u6307\u5B9A\u7C7B
++err.not.standard.file.manager=\u4F7F\u7528\u6807\u51C6\u6587\u4EF6\u7BA1\u7406\u5668\u65F6\u53EA\u80FD\u6307\u5B9A\u7C7B\u6587\u4EF6
++err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
++err.verify.not.supported=\u4E0D\u652F\u6301 -verify
++err.no.SourceFile.attribute=\u6CA1\u6709 SourceFile \u5C5E\u6027
++err.source.file.not.found=\u627E\u4E0D\u5230\u6E90\u6587\u4EF6
++err.bad.innerclasses.attribute={0}\u7684 InnerClasses \u5C5E\u6027\u9519\u8BEF
++warn.Xold.not.supported=-Xold \u4E0D\u518D\u53EF\u7528
++
++main.usage.summary=\u7528\u6CD5: {0} <options> <classes>\n\u4F7F\u7528 -help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
++
++warn.prefix=\u8B66\u544A:
++warn.unexpected.class=\u4E8C\u8FDB\u5236\u6587\u4EF6{0}\u5305\u542B{1}
++
++note.prefix=\u6CE8:
++
++main.usage.summary=\u7528\u6CD5: {0} <options> <classes>\n\u4F7F\u7528 -help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
++
++main.usage=\u7528\u6CD5: {0} <options> <classes>\n\u5176\u4E2D, \u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
++
++
++main.opt.help=\ -help --help -? \u8F93\u51FA\u6B64\u7528\u6CD5\u6D88\u606F
++
++main.opt.version=\ -version \u7248\u672C\u4FE1\u606F
++
++main.opt.v=\ -v -verbose \u8F93\u51FA\u9644\u52A0\u4FE1\u606F
++
++main.opt.l=\ -l \u8F93\u51FA\u884C\u53F7\u548C\u672C\u5730\u53D8\u91CF\u8868
++
++main.opt.public=\ -public \u4EC5\u663E\u793A\u516C\u5171\u7C7B\u548C\u6210\u5458
++
++main.opt.protected=\ -protected \u663E\u793A\u53D7\u4FDD\u62A4\u7684/\u516C\u5171\u7C7B\u548C\u6210\u5458
++
++main.opt.package=\ -package \u663E\u793A\u7A0B\u5E8F\u5305/\u53D7\u4FDD\u62A4\u7684/\u516C\u5171\u7C7B\n \u548C\u6210\u5458 (\u9ED8\u8BA4)
++
++main.opt.p=\ -p -private \u663E\u793A\u6240\u6709\u7C7B\u548C\u6210\u5458
++
++main.opt.c=\ -c \u5BF9\u4EE3\u7801\u8FDB\u884C\u53CD\u6C47\u7F16
++
++main.opt.s=\ -s \u8F93\u51FA\u5185\u90E8\u7C7B\u578B\u7B7E\u540D
++
++main.opt.classpath=\ -classpath <path> \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
++
++main.opt.bootclasspath=\ -bootclasspath <path> \u8986\u76D6\u5F15\u5BFC\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
++
++main.opt.constants=\ -constants \u663E\u793A\u9759\u6001\u6700\u7EC8\u5E38\u91CF
++
++
++main.opt.sysinfo=\ -sysinfo \u663E\u793A\u6B63\u5728\u5904\u7406\u7684\u7C7B\u7684\n \u7CFB\u7EDF\u4FE1\u606F (\u8DEF\u5F84, \u5927\u5C0F, \u65E5\u671F, MD5 \u6563\u5217)
+--- ./langtools/test/com/sun/javadoc/testHref/TestHref.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/com/sun/javadoc/testHref/TestHref.java Wed May 07 19:27:09 2014 -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
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 4663254
++ * @bug 4663254 8016328
+ * @summary Verify that spaces do not appear in hrefs and anchors.
+ * @author jamieh
+ * @library ../lib/
+@@ -46,11 +46,11 @@
+ private static final String[][] TEST = {
+ //External link.
+ {BUG_ID + FS + "pkg" + FS + "C1.html",
+- "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait(long, int)\""
++ "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)\""
+ },
+ //Member summary table link.
+ {BUG_ID + FS + "pkg" + FS + "C1.html",
+- "href=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\""
++ "href=\"../pkg/C1.html#method(int,%20int,%20java.util.ArrayList)\""
+ },
+ //Anchor test.
+ {BUG_ID + FS + "pkg" + FS + "C1.html",
+@@ -66,11 +66,11 @@
+ },
+ //{@link} test.
+ {BUG_ID + FS + "pkg" + FS + "C2.html",
+- "Link: <a href=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\">"
++ "Link: <a href=\"../pkg/C1.html#method(int,%20int,%20java.util.ArrayList)\">"
+ },
+ //@see test.
+ {BUG_ID + FS + "pkg" + FS + "C2.html",
+- "See Also:</span></dt><dd><a href=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\">"
++ "See Also:</span></dt><dd><a href=\"../pkg/C1.html#method(int,%20int,%20java.util.ArrayList)\">"
+ },
+
+ //Header does not link to the page itself.
+--- ./langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 4665566 4855876 7025314 8012375 8015998
++ * @bug 4665566 4855876 7025314 8012375 8015998 8016328
+ * @summary Verify that the output has the right javascript.
+ * @author jamieh
+ * @library ../lib/
+@@ -56,6 +56,12 @@
+ " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
+ " targetPage = \"undefined\";" + NL +
+ " function validURL(url) {" + NL +
++ " try {" + NL +
++ " url = decodeURIComponent(url);" + NL +
++ " }" + NL +
++ " catch (error) {" + NL +
++ " return false;" + NL +
++ " }" + NL +
+ " var pos = url.indexOf(\".html\");" + NL +
+ " if (pos == -1 || pos != url.length - 5)" + NL +
+ " return false;" + NL +
+@@ -67,7 +73,8 @@
+ " if ('a' <= ch && ch <= 'z' ||" + NL +
+ " 'A' <= ch && ch <= 'Z' ||" + NL +
+ " ch == '$' ||" + NL +
+- " ch == '_') {" + NL +
++ " ch == '_' ||" + NL +
++ " ch.charCodeAt(0) > 127) {" + NL +
+ " allowNumber = true;" + NL +
+ " allowSep = true;" + NL +
+ " } else if ('0' <= ch && ch <= '9'" + NL +
+--- ./langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 4732864 6280605 7064544
++ * @bug 4732864 6280605 7064544 8016328
+ * @summary Make sure that you can link from one member to another using
+ * non-qualified name, furthermore, ensure the right one is linked.
+ * @author jamieh
+@@ -49,9 +49,9 @@
+ "Qualified Link: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
+ " Unqualified Link1: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
+ " Unqualified Link2: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
+- " Qualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>\n" +
+- " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>\n" +
+- " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(InnerC, InnerC2)</code></a>.<br/>"
++ " Qualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC,%20pkg.C.InnerC2)\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>\n" +
++ " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC,%20pkg.C.InnerC2)\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>\n" +
++ " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC,%20pkg.C.InnerC2)\"><code>method(InnerC, InnerC2)</code></a>.<br/>"
+ },
+ {BUG_ID + FS + "pkg" + FS + "C.InnerC.html",
+ "Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>\n" +
+--- ./langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Wed May 07 19:27:09 2014 -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
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 4780441 4874845 4978816
++ * @bug 4780441 4874845 4978816 8016328
+ * @summary Make sure that when the -private flag is not used, members
+ * inherited from package private class are documented in the child.
+ *
+@@ -175,7 +175,7 @@
+ // Should document that a method overrides method from private class.
+ {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
+ "<dt><strong>Overrides:</strong></dt>" + NL +
+- "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[], int, T, V, java.util.List)\">" +
++ "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[],%20int,%20T,%20V,%20java.util.List)\">" +
+ "methodOverridenFromParent</a></code>&nbsp;in class&nbsp;<code>" +
+ "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
+ "PrivateParent</a></code></dd>"},
+--- ./langtools/test/tools/javac/6567415/T6567415.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/6567415/T6567415.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 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
+@@ -137,7 +137,7 @@
+ }
+ };
+ t.start();
+- t.join(1000*10);
++ t.join(1000*60);
+ System.out.println(t.getState());
+ if (t.isAlive()) {
+ throw new RuntimeException("Error: compilation is looping");
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/test/tools/javac/T8033294/RedundantWarningInIntersectionTest.java Wed May 07 19:27:09 2014 -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.
++ */
++
++/*
++ * @test
++ * @bug 8033294
++ * @summary javac, spurious warning for instanceof operator
++ * @compile -Werror -Xlint:unchecked RedundantWarningInIntersectionTest.java
++ */
++
++import java.math.BigDecimal;
++
++public class RedundantWarningInIntersectionTest {
++
++ class A<S extends A<S, T>, T> {
++
++ protected T p;
++
++ A(T p) {}
++
++ public S m(T parameter) {
++ @SuppressWarnings("unchecked")
++ S self = (S) new A<>(parameter);
++ return self;
++ }
++ }
++
++ class B<K extends Number & Comparable<? super K>> extends A<B<K>, K> {
++
++ B(K parameter) {
++ super(parameter);
++ }
++
++ public boolean m2() {
++ return (p instanceof BigDecimal);
++ }
++ }
++}
+--- ./langtools/test/tools/javac/api/6406133/T6406133.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6406133/T6406133.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 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
+@@ -27,6 +27,8 @@
+ * @summary Compiler API ignores locale settings
+ * @author Maurizio Cimadamore
+ * @library ../lib
++ * @build ToolTester
++ * @run main T6406133
+ */
+
+ import javax.tools.*;
+--- ./langtools/test/tools/javac/api/6410643/T6410643.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6410643/T6410643.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,8 @@
+ * @summary JSR 199: The method JavaCompilerTool.run fails to handle null arguments
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
++ * @run main T6410643
+ */
+
+ import javax.tools.JavaFileObject;
+--- ./langtools/test/tools/javac/api/6411310/T6411310.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6411310/T6411310.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary JSR 199: FileObject should support user-friendly names via getName()
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6411310.java
+ * @run main T6411310
+ */
+--- ./langtools/test/tools/javac/api/6411333/T6411333.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6411333/T6411333.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary Ensure 6400208, 6400225, and 6400267 are tested
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6411333.java
+ * @run main T6411333
+ */
+--- ./langtools/test/tools/javac/api/6412656/T6412656.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6412656/T6412656.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,8 @@
+ * @summary JSR 199: pass annotation processor instances to compiler
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
++ * @run main T6412656
+ */
+
+ import java.util.Set;
+--- ./langtools/test/tools/javac/api/6415780/T6415780.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6415780/T6415780.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -28,6 +28,8 @@
+ * @author igor.tseytin@...
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
++ * @run main T6415780
+ */
+
+ import static javax.tools.StandardLocation.CLASS_PATH;
+--- ./langtools/test/tools/javac/api/6418694/T6418694.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6418694/T6418694.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary JSR 199: JavaFileManager.hasLocation(Location)
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6418694.java
+ * @run main T6418694
+ */
+--- ./langtools/test/tools/javac/api/6421111/T6421111.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6421111/T6421111.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary NullPointerException thrown when retrieving bounds for the type parameter
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile -Xlint:all T6421111.java
+ * @run main T6421111
+ */
+--- ./langtools/test/tools/javac/api/6421756/T6421756.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6421756/T6421756.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary 6421756 JSR 199: In the method JavaCompilerTool.getTask 'options' can be supplied in the place of 'classes'
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6421756.java
+ * @run main T6421756
+ */
+--- ./langtools/test/tools/javac/api/6422215/T6422215.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6422215/T6422215.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,8 @@
+ * @summary JSR 199: What happens if a directory is missing
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
++ * @run main T6422215
+ */
+
+ import java.io.File;
+--- ./langtools/test/tools/javac/api/6422327/T6422327.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6422327/T6422327.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,8 @@
+ * @summary JSR 199: JavaCompilerTool can compile and generate '.class' of non '.java' files
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
++ * @run main T6422327
+ */
+
+ import java.io.File;
+--- ./langtools/test/tools/javac/api/6423003/T6423003.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6423003/T6423003.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary JSR 199: confusing help message with compiler API
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6423003.java
+ * @run main T6423003
+ */
+--- ./langtools/test/tools/javac/api/6431257/T6431257.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6431257/T6431257.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary JSR 199: Changes to JavaFileManager to support JSR 269 Filer API
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6431257.java package-info.java
+ * @run main T6431257 foo.bar.baz foo/bar/baz
+ */
+--- ./langtools/test/tools/javac/api/6437349/T6437349.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6437349/T6437349.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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,7 @@
+ * @bug 6437349
+ * @summary JSR 199: JavaFileObject.isNameCompatible() will give true with some incompatible kinds
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6437349.java
+ * @run main T6437349
+ */
+--- ./langtools/test/tools/javac/api/6437999/T6437999.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6437999/T6437999.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary Unit test for encoding argument to standard file manager
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6437999.java
+ * @run main T6437999
+ */
+--- ./langtools/test/tools/javac/api/6440333/T6440333.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6440333/T6440333.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary SimpleJavaFileObject.toString() generates URI with some extra message
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6440333.java
+ * @run main T6440333
+ */
+--- ./langtools/test/tools/javac/api/6440528/T6440528.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6440528/T6440528.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary javac deposits package-info.class in bogus directory
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6440528.java
+ * @run main T6440528
+ */
+--- ./langtools/test/tools/javac/api/6468404/T6468404.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6468404/T6468404.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -28,6 +28,7 @@
+ * @author jesse.glick@...
+ * @author Peter von der Ah\u00e9
+ * @library ../lib
++ * @build ToolTester
+ * @compile T6468404.java
+ * @run main T6468404
+ */
+--- ./langtools/test/tools/javac/api/6731573/T6731573.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6731573/T6731573.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 2010, 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
+@@ -27,6 +27,8 @@
+ * @summary diagnostic output should optionally include source line
+ * @author Maurizio Cimadamore
+ * @library ../lib
++ * @build ToolTester
++ * @run main T6731573
+ */
+
+ import java.io.*;
+--- ./langtools/test/tools/javac/api/6733837/T6733837.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/6733837/T6733837.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 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
+@@ -27,6 +27,8 @@
+ * @summary Compiler API ignores locale settings
+ * @author Maurizio Cimadamore
+ * @library ../lib
++ * @build ToolTester
++ * @run main T6733837
+ */
+
+ import java.io.StringWriter;
+--- ./langtools/test/tools/javac/api/TestJavacTaskScanner.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/TestJavacTaskScanner.java Wed May 07 19:27:09 2014 -0700
+@@ -27,6 +27,7 @@
+ * @summary Additional functionality test of task and JSR 269
+ * @author Peter von der Ah\u00e9
+ * @library ./lib
++ * @build ToolTester
+ * @run main TestJavacTaskScanner TestJavacTaskScanner.java
+ */
+
+@@ -159,7 +160,7 @@
+ StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, encoding);
+ try {
+ fm.setLocation(SOURCE_PATH, Arrays.asList(test_src));
+- fm.setLocation(CLASS_PATH, Arrays.asList(test_classes, javac_classes));
++ fm.setLocation(CLASS_PATH, join(test_class_path, Arrays.asList(javac_classes)));
+ fm.setLocation(CLASS_OUTPUT, Arrays.asList(test_classes));
+ } catch (IOException e) {
+ throw new AssertionError(e);
+--- ./langtools/test/tools/javac/api/guide/Test.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/guide/Test.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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
+@@ -27,6 +27,7 @@
+ * @summary Various bugs fixed while writing Compiler API Guide
+ * @author Peter von der Ah\u0081
+ * @library ../lib
++ * @build ToolTester
+ * @compile Test.java
+ * @run main Test
+ */
+--- ./langtools/test/tools/javac/api/lib/ToolTester.java Tue Mar 18 12:45:26 2014 -0700
++++ ./langtools/test/tools/javac/api/lib/ToolTester.java Wed May 07 19:27:09 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2006, 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,7 +24,7 @@
+ import java.io.File;
+ import java.io.IOException;
+ import java.nio.charset.Charset;
+-import java.util.Arrays;
++import java.util.*;
+ import javax.tools.*;
+
+ import static javax.tools.StandardLocation.CLASS_PATH;
+@@ -34,6 +34,8 @@
+ public class ToolTester {
+ public final File test_src = new File(System.getProperty("test.src", "."));
+ public final File test_classes = new File(System.getProperty("test.classes", "."));
++ public final List<File> test_class_path = pathToFiles(System.getProperty("test.class.path"),
++ Arrays.asList(test_classes));
+ public final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
+ public final StandardJavaFileManager fm = getFileManager(tool, null, null);
+ public JavaCompiler.CompilationTask task = null;
+@@ -43,11 +45,36 @@
+ StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, encoding);
+ try {
+ fm.setLocation(SOURCE_PATH, Arrays.asList(test_src));
+- fm.setLocation(CLASS_PATH, Arrays.asList(test_classes));
++ fm.setLocation(CLASS_PATH, test_class_path);
+ fm.setLocation(CLASS_OUTPUT, Arrays.asList(test_classes));
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ return fm;
+ }
++
++ protected List<File> pathToFiles(String path, List<File> defaultPath) {
++ List<File> files = new ArrayList<>();
++ for (String f: path.split(File.pathSeparator)) {
++ if (f.isEmpty())
++ continue;
++ File file = new File(f);
++ if (file.exists())
++ files.add(file);
++ }
++ if (files.isEmpty())
++ files.addAll(defaultPath);
++ return files;
++ }
++
++ protected <T> List<T> join(List<T> a, List<T> b) {
++ if (a.isEmpty())
++ return b;
++ if (b.isEmpty())
++ return a;
++ List<T> result = new ArrayList<>();
++ result.addAll(a);
++ result.addAll(b);
++ return result;
++ }
+ }
diff --git a/java/openjdk7/files/patch-7u65-b31 b/java/openjdk7/files/patch-7u65-b31
new file mode 100644
index 000000000000..90705302ecb0
--- /dev/null
+++ b/java/openjdk7/files/patch-7u65-b31
@@ -0,0 +1,13021 @@
+--- ./.hgtags Wed May 07 19:25:50 2014 -0700
++++ ./.hgtags Wed Jun 25 09:01:10 2014 -0700
+@@ -405,6 +405,7 @@
+ b829c5947c6cd473f42cadfe2c61399fb67c2da6 jdk7u55-b02
+ a72b902cdd39d9f2f2d353d5ad629e543cbc01ae jdk7u55-b03
+ 6a8ee38075621564dd276e8ed7be576d637acf79 jdk7u55-b04
++92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u65-b00
+ 92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u55-b05
+ 6c7cd2146f69cf0823765b3cf84c338c1dc7157c jdk7u55-b06
+ 5cad0f56c685a0673944dbc5632ea9ae7b9340c7 jdk7u55-b07
+@@ -418,6 +419,11 @@
+ 0820b4707cfa75f8211b88b0daa67bba8475f498 jdk7u55-b30
+ 997ab3897d6ede80b0decdda94b569e57dd7dd90 jdk7u55-b14
+ 1f52edec29fd44c8bacce11ba7440287b37d04d1 jdk7u55-b31
++5b15555172019b3c92484abff7c92f066e162d29 jdk7u55-b32
++fa5ead8cb7d2de49cd138d93fb86fa5a10b07037 jdk7u55-b33
++6041c68893932ee16a272a8d5a42069e217d888c jdk7u55-b34
++8733fb47b3338e9285870b09eb326e758cf69771 jdk7u55-b35
++b9c954604ecaaf8d8a1568ababd9508ff09b742e jdk7u55-b36
+ 11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00
+ 88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01
+ 6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02
+@@ -435,6 +441,28 @@
+ 1ca6a368aec38ee91a41dc03899d7dc1037de44d jdk7u60-b14
+ a95b821a2627295b90fb4ae8f3b8bc2ff9c64acc jdk7u60-b15
+ 19a3f6f48c541a8cf144eedffa0e52e108052e82 jdk7u60-b16
++472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b17
+ 472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b18
+-472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b17
++b9264ea7e0887d511318bf7b53d12f944760bbbb jdk7u65-b01
+ 2a7a5e774023944f291ee27ca5b3ad89e0e62aaf jdk7u60-b19
++ac5183999ba532c6b89f24fe01f6f0eb96799719 jdk7u60-b30
++7e9c1a4c2d50e10ccc6d81b8dc0786e82128a676 jdk7u60-b31
++f792c1446b57932f5cd661afa72bcf41cfe6d1a6 jdk7u60-b32
++870408bbbfa50a6f44997a844c6c31c0cb0cbc40 jdk7u60-b33
++3a683f1730a148bcc1ca6eb9137116db427093f6 jdk7u65-b02
++c154a8de7d34128ab75f46a2b6a909796f63b6e3 jdk7u65-b03
++62e22dbc36410d76716bfa5e9fd679fcb4b1d845 jdk7u65-b04
++4cab26e4e27f8ff382b8d6487224af59dc7c1fa1 jdk7u65-b05
++b2cd3babc4ca1fb48b6073665e627f8bfb65d547 jdk7u65-b06
++bc5e69657c0f6d58775ac7441033bbcbbaee3268 jdk7u65-b07
++48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u65-b08
++2e7881991d5294061023f8862b702e4730f2860d jdk7u65-b09
++db03cbff389500c7ccfd4b476ab78319f6e24d2d jdk7u65-b10
++9f629f70ec6c4249baadaadd05b0f32c9129ad05 jdk7u65-b11
++71cd7866ca68b333e36330e179ab1d69d721aaee jdk7u65-b12
++49dbfea9d3a4b709f3230d581a09d960c2de5109 jdk7u65-b13
++0cfadcb9f8006ac5601bb0ce8b74211d6b223c11 jdk7u65-b14
++3cce3737be368dc3d304508cd0d6e354f8a19f55 jdk7u65-b15
++2c8b05ed9802cf4e5f61439a6d6286e7f7cd444e jdk7u65-b16
++927d8d3db13c5221237b51efe45206054ee6e3f3 jdk7u65-b17
++b51ccd32894662064192857007ef41175d433901 jdk7u65-b30
+--- ./corba/.hgtags Wed May 07 19:25:52 2014 -0700
++++ ./corba/.hgtags Wed Jun 25 09:01:20 2014 -0700
+@@ -407,6 +407,7 @@
+ db2e6d87bade9d2061646ff9a6b39b5159fba0ec jdk7u55-b02
+ 02ff18f156bd3382fe22e4758b138370f5238e97 jdk7u55-b03
+ 6a88a170331fb38af5046e54bf75f38176af5c41 jdk7u55-b04
++a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u65-b00
+ a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u55-b05
+ af7f1808106bf4e9b4680d943677299829245d08 jdk7u55-b06
+ 44801796d42bebc90e8c4c7fb5bd79db04b10b75 jdk7u55-b07
+@@ -420,6 +421,11 @@
+ e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30
+ a0bfd0e80ae0ae6e3a29bf527b5911c83163b3f5 jdk7u55-b14
+ 55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31
++fba15e177b15873e3c63b0efc7c0f5647a243a79 jdk7u55-b32
++6503115cbedda9216083fc1798e2fa5a2775f68a jdk7u55-b33
++c8614d56bc1c5c60431f938a0c33d8fc42e7aef0 jdk7u55-b34
++be587f9142bcb694b647642fbbb05dbaa7b1b1b3 jdk7u55-b35
++05ea23fd127a217965eb304932e8c0ce5933f04b jdk7u55-b36
+ c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00
+ a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01
+ d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02
+@@ -437,6 +443,28 @@
+ 02bdeb33754315f589bd650dde656d2c9947976d jdk7u60-b14
+ e5946b2cf82bdea3a4b85917e903168e65a543a7 jdk7u60-b15
+ e424fb8452851b56db202488a4e9a283934c4887 jdk7u60-b16
++b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17
+ b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18
+-b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17
++550ae238459e0f59d9a85d183bc2b4520adac05b jdk7u65-b01
+ 5d1b39fe68944cff6380db56fbe2fbaa28091bf6 jdk7u60-b19
++39734d26e279098fae06cee5a127e126090ddec9 jdk7u60-b30
++8939f268abb8c153de653f2659fff6716e5f83f8 jdk7u60-b31
++9665790000e22370daefddbf56dd81e89e07b7c4 jdk7u60-b32
++437b4b2aed4811af16efcafca7995684493d205b jdk7u60-b33
++6a89d959cbade46fcd281f421ac40a804d098f0b jdk7u65-b02
++afed3d62e8051fe65f431abe87dad50cbeba3800 jdk7u65-b03
++38fabf72970ae509350f57ffad99f6ac8fc6fdad jdk7u65-b04
++12c1621ce88defa65ebc1bdffb7141bd7d0089a6 jdk7u65-b05
++5041c713522c0fc68239fc91f7fb9498dd7edebb jdk7u65-b06
++144887a766dc17a139524dd43f1a0bc8f2a2a3a2 jdk7u65-b07
++5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u65-b08
++1f7156e0a46129dbaf5b248802371564d92630a3 jdk7u65-b09
++be3cbbea3ec1e14b6492acbbd5c08222c24a5061 jdk7u65-b10
++fd7e4972cfefa174ce3d6dcb7f4b409df11a745b jdk7u65-b11
++792ef0370bf7bcf83c9404d2b44f08722dcd73aa jdk7u65-b12
++b95f46ae5207853a89d52b0453a2fb99fffee817 jdk7u65-b13
++6efadedfe3295dbf2af4a350d813524af029b116 jdk7u65-b14
++78966cf34d868ef18b8a3fa7edec368e1cc4739d jdk7u65-b15
++d765ed30bd5ed2bdd71fda56c056333e1b4b0d7d jdk7u65-b16
++cd642d59aca29ff2b56e7ed016be758828f199cd jdk7u65-b17
++8740dc71b1ceb49c76470b46205c28c1302e864d jdk7u65-b30
+--- ./corba/src/share/classes/org/omg/CORBA/ORB.java Wed May 07 19:25:52 2014 -0700
++++ ./corba/src/share/classes/org/omg/CORBA/ORB.java Wed Jun 25 09:01:20 2014 -0700
+@@ -291,28 +291,12 @@
+ (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
+ singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
+ } else {
+- singleton = create_impl_with_systemclassloader(className);
++ singleton = create_impl(className);
+ }
+ }
+ return singleton;
+ }
+
+- 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)
+--- ./hotspot/.hgtags Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/.hgtags Wed Jun 25 09:01:56 2014 -0700
+@@ -616,6 +616,7 @@
+ 408028d410e316a99495c42df0031018890c22fe jdk7u55-b02
+ 50fb91504dd8cdf410eb956075442daf3aacf1db jdk7u55-b03
+ 3be3b8a032a5508646c1c5620cee18d3e69fc708 jdk7u55-b04
++b86119fa2748bd91ae4984ff2264da92b6626f8c jdk7u65-b00
+ b86119fa2748bd91ae4984ff2264da92b6626f8c jdk7u55-b05
+ 260d919d52e500a0b20f911fade2a7710474067a jdk7u55-b06
+ 8cf6e0a3a0651c4132ae034c2b68ddf4eb5c4d88 jdk7u55-b07
+@@ -629,6 +630,11 @@
+ d27b468d5f3be3329ff1ff342f3347e6b2e0303b jdk7u55-b30
+ dff9147a781672f20bb0577a94233264ea4a95d1 jdk7u55-b14
+ 8175599864880938d68d0a515fa561043d7d5fd0 jdk7u55-b31
++ba9270b8fb1f4852ff1d9dab15571eb9e0714495 jdk7u55-b32
++0901a8cf66a0494b55bf104c9666d4e3c6ff93f0 jdk7u55-b33
++278d7e230b297a4632b94ddc07d591e74736e039 jdk7u55-b34
++db88943dba0b7672a09e22974934022fbe8ba8dd jdk7u55-b35
++b3e388601b0fc0922b311e2cc68b9417cedd16ef jdk7u55-b36
+ ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00
+ af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
+ cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01
+@@ -655,6 +661,28 @@
+ b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14
+ 2871f345b7e5585e20dc7aa91035967fe774cfba jdk7u60-b15
+ ec76bacbb5b90efc7988dee5345c656126b97561 jdk7u60-b16
++617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b17
+ 617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b18
+-617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b17
++4a9635c98a917cfcef506ca5d034c733a33c53f3 jdk7u65-b01
+ 361493c7cdb5f75b28efc63389d6cebaaaa43a2c jdk7u60-b19
++13f561930b3e80a94e2baddc51dfc6c43c5ca601 jdk7u60-b30
++35b2dbe7f7c69ea0f2feb1e66fe8651511a5fb6d jdk7u60-b31
++f166d2e391993f1b12b4ad1685baf999c78e6372 jdk7u60-b32
++cc1fea28c886ef100632247a708eac0c83640914 jdk7u60-b33
++eb797fab50d3b440b17b3e7c5d83f42bfa73655e jdk7u65-b02
++bb00df28ecdbd0da89ab4ed81f6f2b732fa512da jdk7u65-b03
++848481af9003067546c7f34c166bb8d745b95d5f jdk7u65-b04
++98a884fa64a9ef1753a28691106efe10942b9d70 jdk7u65-b05
++6f1dddf9c632bfb14121c9521d17b64bd0be0cd2 jdk7u65-b06
++a053d3d805355ffcd85c17e653182e17d4456bd5 jdk7u65-b07
++6f03dfb50363d26599fcf726586ea3f6d0e0347d jdk7u65-b08
++b4930eb1ea7630b4d8609e2efe6f000d3dc83235 jdk7u65-b09
++4736382ac9d999044b05eb26932ab6fc59dbb159 jdk7u65-b10
++7345c7bf20fd8c91492240a95082af9a201b3a96 jdk7u65-b11
++28b81694b89f88541e28bbc767d78e77ec66cce6 jdk7u65-b12
++f4ed018b4c51dae699da835617b19e8a49c124a4 jdk7u65-b13
++7ec585caae47f7202fb5357607f9ad058b03870e jdk7u65-b14
++7058f0d30de6826b6866ce2d146c63e943be33af jdk7u65-b15
++f1b2970a2564c3360db420431cfbba215da6ae43 jdk7u65-b16
++4c6df9a369cb9d54fe2d898452883a22b8ec6640 jdk7u65-b17
++aca05127f95b5704ee3a34104a8f86e36326f0c0 jdk7u65-b30
+--- ./hotspot/make/hotspot_version Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/make/hotspot_version Wed Jun 25 09:01:56 2014 -0700
+@@ -34,8 +34,8 @@
+ HOTSPOT_VM_COPYRIGHT=Copyright 2014
+
+ HS_MAJOR_VER=24
+-HS_MINOR_VER=60
+-HS_BUILD_NUMBER=09
++HS_MINOR_VER=65
++HS_BUILD_NUMBER=04
+
+ JDK_MAJOR_VER=1
+ JDK_MINOR_VER=7
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Wed Jun 25 09:01:56 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2013, 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
+@@ -1819,9 +1819,6 @@
+ ::abort();
+ }
+
+-// unused on bsd for now.
+-void os::set_error_file(const char *logfile) {}
+-
+
+ // This method is a copy of JDK's sysGetLastErrorString
+ // from src/solaris/hpi/src/system_md.c
+@@ -2585,6 +2582,7 @@
+ // determine if this is a legacy image or modules image
+ // modules image doesn't have "jre" subdirectory
+ len = strlen(buf);
++ assert(len < buflen, "Ran out of buffer space");
+ jrelib_p = buf + len;
+
+ // Add the appropriate library subdir
+@@ -2620,7 +2618,7 @@
+ }
+ }
+
+- strcpy(saved_jvm_path, buf);
++ strncpy(saved_jvm_path, buf, MAXPATHLEN);
+ }
+
+ void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
+--- ./hotspot/src/os/linux/vm/os_linux.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/os/linux/vm/os_linux.cpp Wed Jun 25 09:01:56 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2013, 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
+@@ -1614,9 +1614,6 @@
+ ::abort();
+ }
+
+-// unused on linux for now.
+-void os::set_error_file(const char *logfile) {}
+-
+
+ // This method is a copy of JDK's sysGetLastErrorString
+ // from src/solaris/hpi/src/system_md.c
+@@ -2413,6 +2410,7 @@
+ // determine if this is a legacy image or modules image
+ // modules image doesn't have "jre" subdirectory
+ len = strlen(buf);
++ assert(len < buflen, "Ran out of buffer room");
+ jrelib_p = buf + len;
+ snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
+ if (0 != access(buf, F_OK)) {
+@@ -2435,7 +2433,7 @@
+ }
+ }
+
+- strcpy(saved_jvm_path, buf);
++ strncpy(saved_jvm_path, buf, MAXPATHLEN);
+ }
+
+ void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
+--- ./hotspot/src/os/solaris/vm/os_solaris.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Wed Jun 25 09:01:56 2014 -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
+@@ -1877,9 +1877,6 @@
+ ::abort(); // dump core (for debugging)
+ }
+
+-// unused
+-void os::set_error_file(const char *logfile) {}
+-
+ // DLL functions
+
+ const char* os::dll_file_extension() { return ".so"; }
+@@ -2561,6 +2558,7 @@
+ // determine if this is a legacy image or modules image
+ // modules image doesn't have "jre" subdirectory
+ len = strlen(buf);
++ assert(len < buflen, "Ran out of buffer space");
+ jrelib_p = buf + len;
+ snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
+ if (0 != access(buf, F_OK)) {
+@@ -2581,7 +2579,7 @@
+ }
+ }
+
+- strcpy(saved_jvm_path, buf);
++ strncpy(saved_jvm_path, buf, MAXPATHLEN);
+ }
+
+
+--- ./hotspot/src/os/windows/vm/os_windows.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/os/windows/vm/os_windows.cpp Wed Jun 25 09:01:56 2014 -0700
+@@ -1773,27 +1773,28 @@
+ // libjvm.so is installed there (append a fake suffix
+ // hotspot/libjvm.so).
+ char* java_home_var = ::getenv("JAVA_HOME");
+- if (java_home_var != NULL && java_home_var[0] != 0) {
+-
+- strncpy(buf, java_home_var, buflen);
+-
+- // determine if this is a legacy image or modules image
+- // modules image doesn't have "jre" subdirectory
+- size_t len = strlen(buf);
+- char* jrebin_p = buf + len;
+- jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\");
+- if (0 != _access(buf, 0)) {
+- jio_snprintf(jrebin_p, buflen-len, "\\bin\\");
+- }
+- len = strlen(buf);
+- jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll");
++ if (java_home_var != NULL && java_home_var[0] != 0 &&
++ strlen(java_home_var) < (size_t)buflen) {
++
++ strncpy(buf, java_home_var, buflen);
++
++ // determine if this is a legacy image or modules image
++ // modules image doesn't have "jre" subdirectory
++ size_t len = strlen(buf);
++ char* jrebin_p = buf + len;
++ jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\");
++ if (0 != _access(buf, 0)) {
++ jio_snprintf(jrebin_p, buflen-len, "\\bin\\");
++ }
++ len = strlen(buf);
++ jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll");
+ }
+ }
+
+ if(buf[0] == '\0') {
+- GetModuleFileName(vm_lib_handle, buf, buflen);
+- }
+- strcpy(saved_jvm_path, buf);
++ GetModuleFileName(vm_lib_handle, buf, buflen);
++ }
++ strncpy(saved_jvm_path, buf, MAX_PATH);
+ }
+
+
+@@ -2218,17 +2219,6 @@
+ #endif //_WIN64
+
+
+-// Fatal error reporting is single threaded so we can make this a
+-// static and preallocated. If it's more than MAX_PATH silently ignore
+-// it.
+-static char saved_error_file[MAX_PATH] = {0};
+-
+-void os::set_error_file(const char *logfile) {
+- if (strlen(logfile) <= MAX_PATH) {
+- strncpy(saved_error_file, logfile, MAX_PATH);
+- }
+-}
+-
+ static inline void report_error(Thread* t, DWORD exception_code,
+ address addr, void* siginfo, void* context) {
+ VMError err(t, exception_code, addr, siginfo, context);
+--- ./hotspot/src/share/vm/classfile/classFileParser.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/classfile/classFileParser.cpp Wed Jun 25 09:01:56 2014 -0700
+@@ -961,7 +961,7 @@
+ "Wrong size %u for field's Signature attribute in class file %s",
+ attribute_length, CHECK);
+ }
+- generic_signature_index = cfs->get_u2(CHECK);
++ generic_signature_index = parse_generic_signature_attribute(cp, CHECK);
+ } else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
+ runtime_visible_annotations_length = attribute_length;
+ runtime_visible_annotations = cfs->get_u1_buffer();
+@@ -1698,7 +1698,8 @@
+ }
+
+ // Sift through annotations, looking for those significant to the VM:
+-void ClassFileParser::parse_annotations(u1* buffer, int limit,
++void ClassFileParser::parse_annotations(Handle class_loader,
++ u1* buffer, int limit,
+ constantPoolHandle cp,
+ ClassFileParser::AnnotationCollector* coll,
+ TRAPS) {
+@@ -1736,7 +1737,7 @@
+ }
+
+ // Here is where parsing particular annotations will take place.
+- AnnotationCollector::ID id = coll->annotation_index(aname);
++ AnnotationCollector::ID id = coll->annotation_index(class_loader, is_anonymous(), aname);
+ if (id == AnnotationCollector::_unknown) continue;
+ coll->set_annotation(id);
+ // If there are no values, just set the bit and move on:
+@@ -1765,20 +1766,30 @@
+ }
+ }
+
+-ClassFileParser::AnnotationCollector::ID ClassFileParser::AnnotationCollector::annotation_index(Symbol* name) {
++ClassFileParser::AnnotationCollector::ID ClassFileParser::AnnotationCollector::annotation_index(Handle class_loader,
++ bool is_anonymous,
++ Symbol* name) {
+ vmSymbols::SID sid = vmSymbols::find_sid(name);
++ // Privileged code can use all annotations. Other code silently drops some.
++ const bool privileged = class_loader.is_null() || is_anonymous ||
++ class_loader()->klass()->klass_part()->name() ==
++ vmSymbols::sun_misc_Launcher_ExtClassLoader();
+ switch (sid) {
+ case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature):
+ if (_location != _in_method) break; // only allow for methods
++ if (!privileged) break; // only allow in privileged code
+ return _method_ForceInline;
+ case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature):
+ if (_location != _in_method) break; // only allow for methods
++ if (!privileged) break; // only allow in privileged code
+ return _method_DontInline;
+ case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature):
+ if (_location != _in_method) break; // only allow for methods
++ if (!privileged) break; // only allow in privileged code
+ return _method_LambdaForm_Compiled;
+ case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature):
+ if (_location != _in_method) break; // only allow for methods
++ if (!privileged) break; // only allow in privileged code
+ return _method_LambdaForm_Hidden;
+ default: break;
+ }
+@@ -1818,8 +1829,8 @@
+ // from the method back up to the containing klass. These flag values
+ // are added to klass's access_flags.
+
+-methodHandle ClassFileParser::parse_method(constantPoolHandle cp, bool is_interface,
+- AccessFlags *promoted_flags,
++methodHandle ClassFileParser::parse_method(Handle class_loader, constantPoolHandle cp,
++ bool is_interface, AccessFlags *promoted_flags,
+ typeArrayHandle* method_annotations,
+ typeArrayHandle* method_parameter_annotations,
+ typeArrayHandle* method_default_annotations,
+@@ -2122,13 +2133,12 @@
+ "Invalid Signature attribute length %u in class file %s",
+ method_attribute_length, CHECK_(nullHandle));
+ }
+- cfs->guarantee_more(2, CHECK_(nullHandle)); // generic_signature_index
+- generic_signature_index = cfs->get_u2_fast();
++ generic_signature_index = parse_generic_signature_attribute(cp, CHECK_(nullHandle));
+ } else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
+ runtime_visible_annotations_length = method_attribute_length;
+ runtime_visible_annotations = cfs->get_u1_buffer();
+ assert(runtime_visible_annotations != NULL, "null visible annotations");
+- parse_annotations(runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle));
++ parse_annotations(class_loader, runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle));
+ cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle));
+ } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
+ runtime_invisible_annotations_length = method_attribute_length;
+@@ -2357,8 +2367,8 @@
+ // from the methods back up to the containing klass. These flag values
+ // are added to klass's access_flags.
+
+-objArrayHandle ClassFileParser::parse_methods(constantPoolHandle cp, bool is_interface,
+- AccessFlags* promoted_flags,
++objArrayHandle ClassFileParser::parse_methods(Handle class_loader, constantPoolHandle cp,
++ bool is_interface, AccessFlags* promoted_flags,
+ bool* has_final_method,
+ objArrayOop* methods_annotations_oop,
+ objArrayOop* methods_parameter_annotations_oop,
+@@ -2381,7 +2391,8 @@
+ objArrayHandle methods_parameter_annotations;
+ objArrayHandle methods_default_annotations;
+ for (int index = 0; index < length; index++) {
+- methodHandle method = parse_method(cp, is_interface,
++ methodHandle method = parse_method(class_loader, cp,
++ is_interface,
+ promoted_flags,
+ &method_annotations,
+ &method_parameter_annotations,
+@@ -2490,6 +2501,17 @@
+ }
+ }
+
++// Parse generic_signature attribute for methods and fields
++u2 ClassFileParser::parse_generic_signature_attribute(constantPoolHandle cp, TRAPS) {
++ ClassFileStream* cfs = stream();
++ cfs->guarantee_more(2, CHECK_0); // generic_signature_index
++ u2 generic_signature_index = cfs->get_u2_fast();
++ check_property(
++ valid_symbol_at(cp, generic_signature_index),
++ "Invalid Signature attribute at constant pool index %u in class file %s",
++ generic_signature_index, CHECK_0);
++ return generic_signature_index;
++}
+
+ void ClassFileParser::parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS) {
+ ClassFileStream* cfs = stream();
+@@ -2654,18 +2676,19 @@
+ ClassFileStream* cfs = stream();
+ u1* current_start = cfs->current();
+
+- cfs->guarantee_more(2, CHECK); // length
+- int attribute_array_length = cfs->get_u2_fast();
+-
+- guarantee_property(_max_bootstrap_specifier_index < attribute_array_length,
+- "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);
+
++ cfs->guarantee_more(attribute_byte_length, CHECK);
++
++ int attribute_array_length = cfs->get_u2_fast();
++
++ guarantee_property(_max_bootstrap_specifier_index < attribute_array_length,
++ "Short length on BootstrapMethods in class file %s",
++ CHECK);
++
+ // The attribute contains a counted array of counted tuples of shorts,
+ // represending bootstrap specifiers:
+ // length*{bootstrap_method_index, argument_count*{argument_index}}
+@@ -2726,7 +2749,8 @@
+ }
+
+
+-void ClassFileParser::parse_classfile_attributes(constantPoolHandle cp,
++void ClassFileParser::parse_classfile_attributes(Handle class_loader,
++ constantPoolHandle cp,
+ ClassFileParser::ClassAnnotationCollector* parsed_annotations,
+ TRAPS) {
+ ClassFileStream* cfs = stream();
+@@ -2809,7 +2833,8 @@
+ runtime_visible_annotations_length = attribute_length;
+ runtime_visible_annotations = cfs->get_u1_buffer();
+ assert(runtime_visible_annotations != NULL, "null visible annotations");
+- parse_annotations(runtime_visible_annotations,
++ parse_annotations(class_loader,
++ runtime_visible_annotations,
+ runtime_visible_annotations_length,
+ cp,
+ parsed_annotations,
+@@ -3172,7 +3197,8 @@
+ objArrayOop methods_annotations_oop = NULL;
+ objArrayOop methods_parameter_annotations_oop = NULL;
+ objArrayOop methods_default_annotations_oop = NULL;
+- objArrayHandle methods = parse_methods(cp, access_flags.is_interface(),
++ objArrayHandle methods = parse_methods(class_loader, cp,
++ access_flags.is_interface(),
+ &promoted_flags,
+ &has_final_method,
+ &methods_annotations_oop,
+@@ -3186,7 +3212,7 @@
+
+ // Additional attributes
+ ClassAnnotationCollector parsed_annotations;
+- parse_classfile_attributes(cp, &parsed_annotations, CHECK_(nullHandle));
++ parse_classfile_attributes(class_loader, cp, &parsed_annotations, CHECK_(nullHandle));
+
+ // Make sure this is the end of class file stream
+ guarantee_property(cfs->at_eos(), "Extra bytes at the end of class file %s", CHECK_(nullHandle));
+--- ./hotspot/src/share/vm/classfile/classFileParser.hpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/classfile/classFileParser.hpp Wed Jun 25 09:01:56 2014 -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
+@@ -102,7 +102,7 @@
+ assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, "");
+ }
+ // If this annotation name has an ID, report it (or _none).
+- ID annotation_index(Symbol* name);
++ ID annotation_index(Handle class_loader, bool is_anonymous, Symbol* name);
+ // Set the annotation name:
+ void set_annotation(ID id) {
+ assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob");
+@@ -169,14 +169,14 @@
+ u2* java_fields_count_ptr, TRAPS);
+
+ // Method parsing
+- methodHandle parse_method(constantPoolHandle cp, bool is_interface,
+- AccessFlags* promoted_flags,
++ methodHandle parse_method(Handle class_loader, constantPoolHandle cp,
++ bool is_interface, AccessFlags* promoted_flags,
+ typeArrayHandle* method_annotations,
+ typeArrayHandle* method_parameter_annotations,
+ typeArrayHandle* method_default_annotations,
+ TRAPS);
+- objArrayHandle parse_methods (constantPoolHandle cp, bool is_interface,
+- AccessFlags* promoted_flags,
++ objArrayHandle parse_methods (Handle class_loader, constantPoolHandle cp,
++ bool is_interface, AccessFlags* promoted_flags,
+ bool* has_final_method,
+ objArrayOop* methods_annotations_oop,
+ objArrayOop* methods_parameter_annotations_oop,
+@@ -202,6 +202,7 @@
+ typeArrayOop parse_stackmap_table(u4 code_attribute_length, TRAPS);
+
+ // Classfile attribute parsing
++ u2 parse_generic_signature_attribute(constantPoolHandle cp, TRAPS);
+ void parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS);
+ void parse_classfile_source_debug_extension_attribute(constantPoolHandle cp, int length, TRAPS);
+ u2 parse_classfile_inner_classes_attribute(u1* inner_classes_attribute_start,
+@@ -210,7 +211,8 @@
+ u2 enclosing_method_method_index,
+ constantPoolHandle cp,
+ TRAPS);
+- void parse_classfile_attributes(constantPoolHandle cp,
++ void parse_classfile_attributes(Handle class_loader,
++ constantPoolHandle cp,
+ ClassAnnotationCollector* parsed_annotations,
+ TRAPS);
+ void parse_classfile_synthetic_attribute(constantPoolHandle cp, TRAPS);
+@@ -224,7 +226,7 @@
+ int runtime_invisible_annotations_length, TRAPS);
+ int skip_annotation(u1* buffer, int limit, int index);
+ int skip_annotation_value(u1* buffer, int limit, int index);
+- void parse_annotations(u1* buffer, int limit, constantPoolHandle cp,
++ void parse_annotations(Handle class_loader, u1* buffer, int limit, constantPoolHandle cp,
+ /* Results (currently, only one result is supported): */
+ AnnotationCollector* result,
+ TRAPS);
+@@ -335,6 +337,12 @@
+ : cp->tag_at(index).is_klass_reference());
+ }
+
++ // Checks that the cpool index is in range and is a utf8
++ bool valid_symbol_at(constantPoolHandle cp, int cpool_index) {
++ return (cp->is_within_bounds(cpool_index) &&
++ cp->tag_at(cpool_index).is_utf8());
++ }
++
+ public:
+ // Constructor
+ ClassFileParser(ClassFileStream* st) { set_stream(st); }
+--- ./hotspot/src/share/vm/classfile/stackMapTable.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/classfile/stackMapTable.cpp Wed Jun 25 09:01:56 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -134,6 +134,7 @@
+ }
+ // check if uninitialized objects exist on backward branches
+ check_new_object(frame, target, CHECK_VERIFY(frame->verifier()));
++ frame->verifier()->update_furthest_jump(target);
+ }
+
+ void StackMapTable::check_new_object(
+--- ./hotspot/src/share/vm/classfile/verifier.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/classfile/verifier.cpp Wed Jun 25 09:01:56 2014 -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
+@@ -629,6 +629,9 @@
+ bool no_control_flow = false; // Set to true when there is no direct control
+ // flow from current instruction to the next
+ // instruction in sequence
++
++ set_furthest_jump(0);
++
+ Bytecodes::Code opcode;
+ while (!bcs.is_last_bytecode()) {
+ // Check for recursive re-verification before each bytecode.
+@@ -2239,6 +2242,29 @@
+ "Bad <init> method call");
+ return;
+ }
++
++ // Make sure that this call is not jumped over.
++ if (bci < furthest_jump()) {
++ verify_error(ErrorContext::bad_code(bci),
++ "Bad <init> method call from inside of a branch");
++ return;
++ }
++
++ // Make sure that this call is not done from within a TRY block because
++ // that can result in returning an incomplete object. Simply checking
++ // (bci >= start_pc) also ensures that this call is not done after a TRY
++ // block. That is also illegal because this call must be the first Java
++ // statement in the constructor.
++ ExceptionTable exhandlers(_method());
++ int exlength = exhandlers.length();
++ for(int i = 0; i < exlength; i++) {
++ if (bci >= exhandlers.start_pc(i)) {
++ verify_error(ErrorContext::bad_code(bci),
++ "Bad <init> method call from after the start of a try block");
++ return;
++ }
++ }
++
+ current_frame->initialize_object(type, current_type());
+ *this_uninit = true;
+ } else if (type.is_uninitialized()) {
+@@ -2275,6 +2301,11 @@
+ methodOop m = instanceKlass::cast(ref_klass)->uncached_lookup_method(
+ vmSymbols::object_initializer_name(),
+ cp->signature_ref_at(bcs->get_index_u2()));
++ if (m == NULL) {
++ verify_error(ErrorContext::bad_code(bci),
++ "Call to missing <init> method");
++ return;
++ }
+ instanceKlassHandle mh(THREAD, m->method_holder());
+ if (m->is_protected() && !mh->is_same_class_package(_klass())) {
+ bool assignable = current_type().is_assignable_from(
+--- ./hotspot/src/share/vm/classfile/verifier.hpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/classfile/verifier.hpp Wed Jun 25 09:01:56 2014 -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
+@@ -256,6 +256,9 @@
+
+ ErrorContext _error_context; // contains information about an error
+
++ // Used to detect illegal jumps over calls to super() and this() in ctors.
++ int32_t _furthest_jump;
++
+ void verify_method(methodHandle method, TRAPS);
+ char* generate_code_data(methodHandle m, u4 code_length, TRAPS);
+ void verify_exception_handler_table(u4 code_length, char* code_data,
+@@ -398,6 +401,20 @@
+ Symbol* create_temporary_symbol(const char *s, int length, TRAPS);
+
+ TypeOrigin ref_ctx(const char* str, TRAPS);
++
++ // Keep track of the furthest branch done in a method to make sure that
++ // there are no branches over calls to super() or this() from inside of
++ // a constructor.
++ int32_t furthest_jump() { return _furthest_jump; }
++
++ void set_furthest_jump(int32_t target) {
++ _furthest_jump = target;
++ }
++
++ void update_furthest_jump(int32_t target) {
++ if (target > _furthest_jump) _furthest_jump = target;
++ }
++
+ };
+
+ inline int ClassVerifier::change_sig_to_verificationType(
+--- ./hotspot/src/share/vm/compiler/compileBroker.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/compiler/compileBroker.cpp Wed Jun 25 09:01:56 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2012, 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
+@@ -1921,6 +1921,7 @@
+ ResourceMark rm;
+ char* method_name = method->name()->as_C_string();
+ strncpy(_last_method_compiled, method_name, CompileBroker::name_buffer_length);
++ _last_method_compiled[CompileBroker::name_buffer_length - 1] = '\0'; // ensure null terminated
+ char current_method[CompilerCounters::cmname_buffer_length];
+ size_t maxLen = CompilerCounters::cmname_buffer_length;
+
+--- ./hotspot/src/share/vm/oops/klassVtable.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/oops/klassVtable.cpp Wed Jun 25 09:01:56 2014 -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
+@@ -209,6 +209,17 @@
+ // For bytecodes not produced by javac together it is possible that a method does not override
+ // the superclass's method, but might indirectly override a super-super class's vtable entry
+ // If none found, return a null superk, else return the superk of the method this does override
++// For public and protected methods: if they override a superclass, they will
++// also be overridden themselves appropriately.
++// Private methods do not override and are not overridden.
++// Package Private methods are trickier:
++// e.g. P1.A, pub m
++// P2.B extends A, package private m
++// P1.C extends B, public m
++// P1.C.m needs to override P1.A.m and can not override P2.B.m
++// Therefore: all package private methods need their own vtable entries for
++// them to be the root of an inheritance overriding decision
++// Package private methods may also override other vtable entries
+ instanceKlass* klassVtable::find_transitive_override(instanceKlass* initialsuper, methodHandle target_method,
+ int vtable_index, Handle target_loader, Symbol* target_classname, Thread * THREAD) {
+ instanceKlass* superk = initialsuper;
+@@ -310,8 +321,12 @@
+ ((klass->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION)
+ && ((super_klass = find_transitive_override(super_klass, target_method, i, target_loader,
+ target_classname, THREAD)) != (instanceKlass*)NULL))) {
+- // overriding, so no new entry
+- allocate_new = false;
++
++ // Package private methods always need a new entry to root their own
++ // overriding. They may also override other methods.
++ if (!target_method()->is_package_private()) {
++ allocate_new = false;
++ }
+
+ if (checkconstraints) {
+ // Override vtable entry if passes loader constraint check
+@@ -433,6 +448,12 @@
+ return true;
+ }
+
++ // Package private methods always need a new entry to root their own
++ // overriding. This allows transitive overriding to work.
++ if (target_method()->is_package_private()) {
++ return true;
++ }
++
+ // search through the super class hierarchy to see if we need
+ // a new entry
+ ResourceMark rm;
+--- ./hotspot/src/share/vm/opto/graphKit.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/opto/graphKit.cpp Wed Jun 25 09:01:56 2014 -0700
+@@ -1120,6 +1120,17 @@
+ }
+ return _gvn.transform( new (C) ConvI2LNode(offset));
+ }
++
++Node* GraphKit::ConvI2UL(Node* offset) {
++ juint offset_con = (juint) find_int_con(offset, Type::OffsetBot);
++ if (offset_con != (juint) Type::OffsetBot) {
++ return longcon((julong) offset_con);
++ }
++ Node* conv = _gvn.transform( new (C) ConvI2LNode(offset));
++ Node* mask = _gvn.transform( ConLNode::make(C, (julong) max_juint) );
++ return _gvn.transform( new (C) AndLNode(conv, mask) );
++}
++
+ Node* GraphKit::ConvL2I(Node* offset) {
+ // short-circuit a common case
+ jlong offset_con = find_long_con(offset, (jlong)Type::OffsetBot);
+--- ./hotspot/src/share/vm/opto/graphKit.hpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/opto/graphKit.hpp Wed Jun 25 09:01:56 2014 -0700
+@@ -338,6 +338,7 @@
+ // Convert between int and long, and size_t.
+ // (See macros ConvI2X, etc., in type.hpp for ConvI2X, etc.)
+ Node* ConvI2L(Node* offset);
++ Node* ConvI2UL(Node* offset);
+ Node* ConvL2I(Node* offset);
+ // Find out the klass of an object.
+ Node* load_object_klass(Node* object);
+--- ./hotspot/src/share/vm/opto/library_call.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/opto/library_call.cpp Wed Jun 25 09:01:56 2014 -0700
+@@ -2432,7 +2432,7 @@
+ case T_ADDRESS:
+ // Cast to an int type.
+ p = _gvn.transform(new (C) CastP2XNode(NULL, p));
+- p = ConvX2L(p);
++ p = ConvX2UL(p);
+ break;
+ default:
+ fatal(err_msg_res("unexpected type %d: %s", type, type2name(type)));
+--- ./hotspot/src/share/vm/opto/type.hpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/opto/type.hpp Wed Jun 25 09:01:56 2014 -0700
+@@ -1348,6 +1348,7 @@
+ #define ConvL2X(x) (x)
+ #define ConvX2I(x) ConvL2I(x)
+ #define ConvX2L(x) (x)
++#define ConvX2UL(x) (x)
+
+ #else
+
+@@ -1392,6 +1393,7 @@
+ #define ConvL2X(x) ConvL2I(x)
+ #define ConvX2I(x) (x)
+ #define ConvX2L(x) ConvI2L(x)
++#define ConvX2UL(x) ConvI2UL(x)
+
+ #endif
+
+--- ./hotspot/src/share/vm/runtime/os.hpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/runtime/os.hpp Wed Jun 25 09:01:56 2014 -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
+@@ -460,9 +460,6 @@
+ // run cmd in a separate process and return its exit code; or -1 on failures
+ static int fork_and_exec(char *cmd);
+
+- // Set file to send error reports.
+- static void set_error_file(const char *logfile);
+-
+ // os::exit() is merged with vm_exit()
+ // static void exit(int num);
+
+--- ./hotspot/src/share/vm/utilities/events.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/utilities/events.cpp Wed Jun 25 09:01:56 2014 -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
+@@ -93,7 +93,7 @@
+ va_start(ap, format);
+ // Save a copy of begin message and log it.
+ _buffer.printv(format, ap);
+- Events::log(NULL, _buffer);
++ Events::log(NULL, "%s", (const char*)_buffer);
+ va_end(ap);
+ }
+ }
+@@ -102,6 +102,6 @@
+ if (LogEvents) {
+ // Append " done" to the begin message and log it
+ _buffer.append(" done");
+- Events::log(NULL, _buffer);
++ Events::log(NULL, "%s", (const char*)_buffer);
+ }
+ }
+--- ./hotspot/src/share/vm/utilities/vmError.cpp Wed May 07 19:26:16 2014 -0700
++++ ./hotspot/src/share/vm/utilities/vmError.cpp Wed Jun 25 09:01:56 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -951,7 +951,6 @@
+ if (fd != -1) {
+ out.print_raw("# An error report file with more information is saved as:\n# ");
+ out.print_raw_cr(buffer);
+- os::set_error_file(buffer);
+
+ log.set_fd(fd);
+ } else {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/6653795/UnsafeGetAddressTest.java Wed Jun 25 09:01:56 2014 -0700
+@@ -0,0 +1,68 @@
++/*
++ * 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 6653795
++ * @summary C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
++ * @run main UnsafeGetAddressTest
++ *
++ */
++
++import sun.misc.Unsafe;
++import java.lang.reflect.*;
++
++public class UnsafeGetAddressTest {
++ private static Unsafe unsafe;
++
++ public static void main(String[] args) throws Exception {
++ Class c = UnsafeGetAddressTest.class.getClassLoader().loadClass("sun.misc.Unsafe");
++ Field f = c.getDeclaredField("theUnsafe");
++ f.setAccessible(true);
++ unsafe = (Unsafe)f.get(c);
++
++ long address = unsafe.allocateMemory(unsafe.addressSize());
++ unsafe.putAddress(address, 0x0000000080000000L);
++ // from sun.misc.Unsafe.getAddress' documentation:
++ // "If the native pointer is less than 64 bits wide, it is
++ // extended as an unsigned number to a Java long."
++ result = unsafe.getAddress(address);
++ System.out.printf("1: was 0x%x, expected 0x%x\n", result,
++ 0x0000000080000000L);
++ for (int i = 0; i < 1000000; i++) {
++ result = unsafe.getAddress(address);
++ }
++
++ // The code has got compiled, check the result now
++ System.out.printf("2: was 0x%x, expected 0x%x\n", result,
++ 0x0000000080000000L);
++ if (result != 0x0000000080000000L) {
++ System.out.println("Test Failed");
++ System.exit(97);
++ } else {
++ System.out.println("Test Passed");
++ }
++ }
++ static volatile long result;
++}
++
+--- ./jaxp/.hgtags Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/.hgtags Wed Jun 25 09:03:02 2014 -0700
+@@ -408,6 +408,7 @@
+ 8275dc4db7f852edb331ae48d663d08b9ab2b5c7 jdk7u55-b02
+ 381e73f93a83e8d3bfd7dbf79f4f363a8fd6442f jdk7u55-b03
+ c72c57f71c2ba6362d9ccfbf4743947b9ecefcac jdk7u55-b04
++5592b0c44617022e3c136eedfa1e98d4f254c964 jdk7u65-b00
+ 5592b0c44617022e3c136eedfa1e98d4f254c964 jdk7u55-b05
+ c59d714090080ad2e06f0ca5e8d354403059d8ce jdk7u55-b06
+ 125ea54089add3a16898b801a9989bf6cca05da6 jdk7u55-b07
+@@ -421,6 +422,11 @@
+ 01f26830f88cf4f10897416fe1f4f372efcdecf5 jdk7u55-b30
+ 26187a65c765b3177f1b7ff0638259bf66f9ec47 jdk7u55-b14
+ 5be97f6c25d9eb3ef0a05fc860964cb3d27134b0 jdk7u55-b31
++94f3ad704f28d5ec65f7a3b1cbf5cfe7e42151f3 jdk7u55-b32
++476aad2c130e2b1b7033fa6789754c03151da95c jdk7u55-b33
++32aa4a5892b0567b19da2bc5b72aa3f3a3398130 jdk7u55-b34
++1f8449a6e05ee0a495ba89c3b4021b46f641ff40 jdk7u55-b35
++7767e8740aea3283703e634ffdbfccd0fbebe82d jdk7u55-b36
+ d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
+ ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01
+ 050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02
+@@ -438,6 +444,28 @@
+ 2814f43a6c73414dcb2b799e1a52d5b44688590d jdk7u60-b14
+ 10eed57b66336660f71f7524f2283478bdf373dc jdk7u60-b15
+ fefd2d5c524b0be78876d9b98d926abda2828e79 jdk7u60-b16
++ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17
+ ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b18
+-ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17
++dd5a398eedc7031a4fb8682bc423e787db465c9e jdk7u65-b01
+ 581752d32aebea959fec84e8ae692e1f63d2c4a8 jdk7u60-b19
++cef2dec8b5d76555c5b7b2e1a62275206f76a07a jdk7u60-b30
++bfa8403a1e28bdc1e94ba61d89e170e4ccc7d58b jdk7u60-b31
++33a8a292a02aa76139d0d04970a0d87cc674f2e3 jdk7u60-b32
++583c5eeb9f31275121aecca60307b8885a1a80d0 jdk7u60-b33
++27909f138bdb9ffdd2ab4bded231c7ccc2264046 jdk7u65-b02
++b3307181bd0f1a2c6e1e2c403b87a76e34452110 jdk7u65-b03
++efa9425faaf402b7ea9c6226eb08236d8fa1ff2b jdk7u65-b04
++319df7bff5bf7a9c2d659dd9021b918e729fa56f jdk7u65-b05
++5fd236e2f1bbc09349858f9c56dd223b6d6f21f6 jdk7u65-b06
++e1ae0b54e22200f2d67de39f6a16899ad4a1e574 jdk7u65-b07
++86e93799766d67102a37559b3831abcc825d7e24 jdk7u65-b08
++e24ee8ca453937c11be2fdbab0b4244aa7ec22bd jdk7u65-b09
++6c20039a2e0104f30697e22dc06fe83ff7a43d39 jdk7u65-b10
++50625e7c71b9b1d31bb901aec66366cacc239b3b jdk7u65-b11
++b56b145c3d85b649188a40a91106005a3ebfcf2b jdk7u65-b12
++3a8933cb0219594b72c797732768070fa23c491e jdk7u65-b13
++ddb29a56b839563502b9f80deca5d6064641f1d7 jdk7u65-b14
++708c636721447ebf679c2c754cb36a503c6177b8 jdk7u65-b15
++a34a9f6740955e1cd844c5b701d76dbe7290913a jdk7u65-b16
++178512d1bd9caf56d61811ad0d4b4269475407aa jdk7u65-b17
++be897d0fd2a0b5f43b0d0e48075e5b070ca584d4 jdk7u65-b30
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java Wed Jun 25 09:03:02 2014 -0700
+@@ -91,6 +91,13 @@
+ */
+ public static final String JDK_XML_NAME_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
++
++ /**
++ * JDK maxElementDepth limit
++ */
++ public static final String JDK_MAX_ELEMENT_DEPTH =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxElementDepth";
++
+ /**
+ * JDK property indicating whether the parser shall print out entity
+ * count information
+@@ -139,6 +146,11 @@
+ */
+ public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
+
++ /**
++ * JDK maxElementDepth limit
++ */
++ public static final String SP_MAX_ELEMENT_DEPTH = "jdk.xml.maxElementDepth";
++
+ //legacy System Properties
+ public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
+ public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java Wed Jun 25 09:03:02 2014 -0700
+@@ -76,7 +76,9 @@
+ GENEAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_GENEAL_ENTITY_SIZE_LIMIT,
+ XalanConstants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
+ PARAMETER_ENTITY_SIZE_LIMIT(XalanConstants.JDK_PARAMETER_ENTITY_SIZE_LIMIT,
+- XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000);
++ XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000),
++ MAX_ELEMENT_DEPTH_LIMIT(XalanConstants.JDK_MAX_ELEMENT_DEPTH,
++ XalanConstants.SP_MAX_ELEMENT_DEPTH, 0, 0);
+
+ final String apiProperty;
+ final String systemProperty;
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java Wed Jun 25 09:03:02 2014 -0700
+@@ -252,6 +252,13 @@
+ */
+ public static final String JDK_XML_NAME_LIMIT =
+ ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
++
++ /**
++ * JDK maxElementDepth limit
++ */
++ public static final String JDK_MAX_ELEMENT_DEPTH =
++ ORACLE_JAXP_PROPERTY_PREFIX + "maxElementDepth";
++
+ /**
+ * JDK property to allow printing out information from the limit analyzer
+ */
+@@ -297,6 +304,11 @@
+ */
+ public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
+
++ /**
++ * JDK maxElementDepth limit
++ */
++ public static final String SP_MAX_ELEMENT_DEPTH = "jdk.xml.maxElementDepth";
++
+ //legacy System Properties
+ public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
+ public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Wed Jun 25 09:03:02 2014 -0700
+@@ -1309,6 +1309,7 @@
+
+ fAttributes.removeAllAttributes();
+
++ checkDepth(rawname);
+ if(!seekCloseOfStartTag()){
+ fReadingAttributes = true;
+ fAttributeCacheUsedCount =0;
+@@ -1913,6 +1914,21 @@
+ // utility methods
+
+ /**
++ * Check if the depth exceeds the maxElementDepth limit
++ * @param elementName name of the current element
++ */
++ void checkDepth(String elementName) {
++ fLimitAnalyzer.addValue(Limit.MAX_ELEMENT_DEPTH_LIMIT, elementName, fElementStack.fDepth);
++ if (fSecurityManager.isOverLimit(Limit.MAX_ELEMENT_DEPTH_LIMIT,fLimitAnalyzer)) {
++ fSecurityManager.debugPrint(fLimitAnalyzer);
++ reportFatalError("MaxElementDepthLimit", new Object[]{elementName,
++ fLimitAnalyzer.getTotalValue(Limit.MAX_ELEMENT_DEPTH_LIMIT),
++ fSecurityManager.getLimit(Limit.MAX_ELEMENT_DEPTH_LIMIT),
++ "maxElementDepth"});
++ }
++ }
++
++ /**
+ * Calls document handler with a single character resulting from
+ * built-in entity resolution.
+ *
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Wed Jun 25 09:03:02 2014 -0700
+@@ -220,6 +220,7 @@
+ fCurrentElement = fElementQName;
+
+ String rawname = fElementQName.rawname;
++ checkDepth(rawname);
+ if (fBindNamespaces) {
+ fNamespaceContext.pushContext();
+ if (fScannerState == SCANNER_STATE_ROOT_ELEMENT) {
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -299,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: The length of entity \"{0}\" is \"{1}\" that exceeds the \"{2}\" limit set by \"{3}\".
+ TotalEntitySizeLimit=JAXP00010004: The accumulated size \"{0}\" of entities exceeded the \"{1}\" limit set by \"{2}\".
+ MaxXMLNameLimit=JAXP00010005: The name \"{0}\" exceeded the \"{1}\" limit set by \"{2}\".
++ MaxElementDepthLimit=JAXP00010006: The element \"{0}\" has a depth of \"{1}\" that exceeds the limit \"{2}\" set by \"{3}\".
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,28 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -276,7 +251,7 @@
+ NMTOKENInvalid = Attributwert "{0}" mit dem Typ NMTOKEN muss ein Namenstoken sein.
+ NMTOKENSInvalid = Attributwert "{0}" mit dem Typ NMTOKENS muss mindestens ein Namenstoken sein.
+ NoNotationOnEmptyElement = Elementtyp "{0}", der als EMPTY deklariert wurde, kann nicht das Attribut "{1}" mit dem Typ NOTATION deklarieren.
+- RootElementTypeMustMatchDoctypedecl = Dokument-Root-Element "{1}"muss mit DOCTYPE-Root "{0}" \u00FCbereinstimmen.
++ RootElementTypeMustMatchDoctypedecl = Document Root-Element "{1}"muss mit DOCTYPE-Root "{0}" \u00FCbereinstimmen.
+ UndeclaredElementInContentSpec = Contentmodell des Elements "{0}" verweist auf das nicht deklarierte Element "{1}".
+ UniqueNotationName = Deklaration f\u00FCr die Notation "{0}" ist nicht eindeutig. Ein jeweiliger Name darf nicht in mehreren Notationsdeklarationen deklariert werden.
+ ENTITYFailedInitializeGrammar = ENTITYDatatype-Validator: Nicht erfolgreich. Initialisierungsmethode muss mit einer g\u00FCltigen Grammatikreferenz aufgerufen werden. \t
+@@ -324,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: Die L\u00E4nge von Entit\u00E4t "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
+ TotalEntitySizeLimit=JAXP00010004: Die akkumulierte Gr\u00F6\u00DFe "{0}" der Entit\u00E4ten \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
+ MaxXMLNameLimit=JAXP00010005: Der Name "{0}" \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
++ MaxElementDepthLimit=JAXP00010006: Die Tiefe von Element "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,28 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -324,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: la longitud de la entidad "{0}" es "{1}", que excede el l\u00EDmite de "{2}" que ha definido "{3}".
+ TotalEntitySizeLimit=JAXP00010004: el tama\u00F1o acumulado "{0}" de las entidades ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
+ MaxXMLNameLimit=JAXP00010005: el nombre "{0}" ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
++ MaxElementDepthLimit=JAXP00010006: El elemento "{0}" tiene una profundidad de "{1}" que excede el l\u00EDmite "{2}" definido por "{3}".
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,28 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -324,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003 : La longueur de l''entit\u00E9 "{0}" est de "{1}". Cette valeur d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}".
+ TotalEntitySizeLimit=JAXP00010004 : La taille cumul\u00E9e des entit\u00E9s ("{0}") d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}".
+ MaxXMLNameLimit=JAXP00010005 : le nom "{0}" d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}".
++ MaxElementDepthLimit=JAXP00010006 : l''\u00E9l\u00E9ment "{0}" a une profondeur de "{1}" qui d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}".
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,28 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -324,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: la lunghezza dell''entit\u00E0 "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}".
+ TotalEntitySizeLimit=JAXP00010004: le dimensioni accumulate "{0}" delle entit\u00E0 supera il limite "{1}" definito da "{2}".
+ MaxXMLNameLimit=JAXP00010005: il nome "{0}" supera il limite "{1}" definito da "{2}".
++ MaxElementDepthLimit=JAXP00010006: la profondit\u00E0 dell''elemento "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}".
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,27 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -146,7 +122,7 @@
+ ExpectedByte = {1}\u30D0\u30A4\u30C8\u306EUTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u30D0\u30A4\u30C8{0}\u304C\u5FC5\u8981\u3067\u3059\u3002
+ InvalidHighSurrogate = UTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u4E0A\u4F4D\u30B5\u30ED\u30B2\u30FC\u30C8\u30FB\u30D3\u30C3\u30C8\u306E\u4E0A\u9650\u306F0x10\u3067\u3059\u304C\u30010x{0}\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
+ OperationNotSupported = \u64CD\u4F5C"{0}"\u306F{1}\u30EA\u30FC\u30C0\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+- InvalidASCII = \u30D0\u30A4\u30C8"{0}"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u30AD\u30E3\u30E9\u30AF\u30BF\u30FB\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
++ InvalidASCII = \u30D0\u30A4\u30C8"{0}"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u6587\u5B57\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+ CharConversionFailure = \u7279\u5B9A\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3042\u308B\u3068\u78BA\u5B9A\u3055\u308C\u305F\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u305D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u4E0D\u6B63\u306A\u30B7\u30FC\u30B1\u30F3\u30B9\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+
+ # DTD Messages
+@@ -323,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u9577\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
+ TotalEntitySizeLimit=JAXP00010004: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u7D2F\u7A4D\u30B5\u30A4\u30BA"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u307E\u3057\u305F\u3002
+ MaxXMLNameLimit=JAXP00010005: \u540D\u524D"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
++ MaxElementDepthLimit=JAXP00010006: \u8981\u7D20"{0}"\u306E\u6DF1\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,28 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -324,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: "{0}" \uC5D4\uD2F0\uD2F0\uC758 \uAE38\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4.
+ TotalEntitySizeLimit=JAXP00010004: \uC5D4\uD2F0\uD2F0\uC758 \uB204\uC801 \uD06C\uAE30 "{0}"\uC774(\uAC00) "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
+ MaxXMLNameLimit=JAXP00010005: "{0}" \uC774\uB984\uC774 "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
++ MaxElementDepthLimit=JAXP00010006: "{0}" \uC694\uC18C\uC758 \uAE4A\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4.
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,28 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -154,7 +129,7 @@
+ # 2.2 Characters
+ InvalidCharInEntityValue = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no valor da entidade da literal.
+ InvalidCharInExternalSubset = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no subconjunto externo do DTD.
+- InvalidCharInIgnoreSect = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na se\u00E7\u00E3o condicional deletada.
++ InvalidCharInIgnoreSect = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na se\u00E7\u00E3o condicional exclu\u00EDda.
+ InvalidCharInPublicID = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no identificador p\u00FAblico.
+ InvalidCharInSystemID = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no identificador do sistema.
+ # 2.3 Common Syntactic Constructs
+@@ -173,7 +148,7 @@
+ PEReferenceWithinMarkup = A refer\u00EAncia da entidade do par\u00E2metro "%{0};" n\u00E3o pode ocorrer na marca\u00E7\u00E3o no subconjunto interno do DTD.
+ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = As declara\u00E7\u00F5es de marca\u00E7\u00E3o contidas ou apontadas pela declara\u00E7\u00E3o do tipo de documento devem estar corretas.
+ # 2.10 White Space Handling
+- MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para "xml:space" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o "default" e "preserve".
++ MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para "xml:space" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o "padr\u00E3o" e "preserve".
+ # 3.2 Element Type Declarations
+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ELEMENT" na declara\u00E7\u00E3o do tipo de elemento.
+ MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = O tipo de elemento \u00E9 necess\u00E1rio na declara\u00E7\u00E3o do tipo de elemento.
+@@ -194,7 +169,7 @@
+ AttNameRequiredInAttDef = O nome do atributo deve ser especificado na declara\u00E7\u00E3o da lista de atributos do elemento "{0}".
+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
+ AttTypeRequiredInAttDef = \u00C9 necess\u00E1rio o tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
+- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do default do atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do padr\u00E3o do atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mais de uma defini\u00E7\u00E3o de atributo fornecida para o mesmo atributo "{1}" de um determinado elemento "{0}".
+ # 3.3.1 Attribute Types
+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = O espa\u00E7o em branco deve aparecer ap\u00F3s "NOTATION" na declara\u00E7\u00E3o do atributo "{1}".
+@@ -241,7 +216,7 @@
+ DuplicateTypeInMixedContent = O tipo de elemento "{1}" j\u00E1 foi especificado no modelo de conte\u00FAdo da declara\u00E7\u00E3o do elemento "{0}".
+ ENTITIESInvalid = O valor do atributo "{1}" do tipo ENTITIES deve ser o nome de uma ou mais entidades n\u00E3o submetidas a parsing.
+ ENTITYInvalid = O valor do atributo "{1}" do tipo ENTITY deve ser o nome de uma entidade n\u00E3o submetida a parsing.
+- IDDefaultTypeInvalid = O atributo do ID "{0}" deve ter um default declarado "#IMPLIED" ou "#REQUIRED".
++ IDDefaultTypeInvalid = O atributo do ID "{0}" deve ter um padr\u00E3o declarado "#IMPLIED" ou "#REQUIRED".
+ IDInvalid = O valor do atributo "{0}" do ID de tipo deve ser um nome.
+ IDInvalidWithNamespaces = O valor do atributo "{0}" do ID de tipo deve ser um NCName quando os namespaces estiverem ativados.
+ IDNotUnique = O valor do atributo "{0}" do ID de tipo deve ser exclusivo no documento.
+@@ -258,7 +233,7 @@
+ MSG_CONTENT_INCOMPLETE = O conte\u00FAdo do tipo de elemento "{0}" est\u00E1 incompleto; ele deve corresponder a "{1}".
+ MSG_CONTENT_INVALID = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}".
+ MSG_CONTENT_INVALID_SPECIFIED = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}". N\u00E3o s\u00E3o permitidos os filhos do tipo "{2}".
+- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" do tipo de elemento "{0}" tem um valor default e deve ser especificado em um documento stand-alone.
++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" do tipo de elemento "{0}" tem um valor padr\u00E3o e deve ser especificado em um documento stand-alone.
+ MSG_DUPLICATE_ATTDEF = O atributo "{1}" j\u00E1 foi declarado para o tipo de elemento "{0}".
+ MSG_ELEMENT_ALREADY_DECLARED = O tipo de elemento "{0}" n\u00E3o deve ser declarado mais de uma vez.
+ MSG_ELEMENT_NOT_DECLARED = O tipo de elemento "{0}" deve ser declarado.
+@@ -324,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: o tamanho da entidade "{0}" \u00E9 "{1}", o que excede o limite de "{2}" definido por "{3}".
+ TotalEntitySizeLimit=JAXP00010004: o tamanho acumulado "{0}" de entidades excedeu o limite de "{1}" definido por "{2}".
+ MaxXMLNameLimit=JAXP00010005: o nome "{0}" excedeu o limite de "{1}" definido por "{2}".
++ MaxElementDepthLimit=JAXP00010006: o elemento "{0}" tem uma profundidade de "{1}" que excede o limite de "{2}" definido por "{3}".
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,28 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -32,7 +7,7 @@
+ FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
+
+ # Document messages
+- PrematureEOF=F\u00F6r tidigt filslut (EOF).
++ PrematureEOF=Filen har avslutats f\u00F6r tidigt.
+ # 2.1 Well-Formed XML Documents
+ RootElementRequired = Rotelementet kr\u00E4vs i ett v\u00E4lformulerat dokument.
+ # 2.2 Characters
+@@ -324,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: L\u00E4ngden p\u00E5 enheten "{0}" \u00E4r "{1}" som \u00F6verskriver gr\u00E4nsv\u00E4rdet p\u00E5 "{2}" som anges av "{3}".
+ TotalEntitySizeLimit=JAXP00010004: Den ackumulerade storleken "{0}" f\u00F6r enheter \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}".
+ MaxXMLNameLimit=JAXP00010005: Namnet "{0}" \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}".
++ MaxElementDepthLimit=JAXP00010006: Elementet "{0}" har djupet "{1}" vilket \u00E4r st\u00F6rre \u00E4n gr\u00E4nsen "{2}" som anges av "{3}".
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,27 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -323,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: \u5B9E\u4F53 "{0}" \u7684\u957F\u5EA6\u4E3A "{1}", \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684 "{2}" \u9650\u5236\u3002
+ TotalEntitySizeLimit=JAXP00010004: \u5B9E\u4F53\u7684\u7D2F\u8BA1\u5927\u5C0F "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002
+ MaxXMLNameLimit=JAXP00010005: \u540D\u79F0 "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002
++ MaxElementDepthLimit=JAXP00010006: \u5143\u7D20 "{0}" \u7684\u6DF1\u5EA6 "{1}" \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684\u9650\u5236 "{2}"\u3002
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties Wed Jun 25 09:03:02 2014 -0700
+@@ -1,28 +1,3 @@
+-#
+-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+ # This file contains error and warning messages related to XML
+ # The messages are arranged in key and value tuples in a ListResourceBundle.
+ #
+@@ -324,4 +299,5 @@
+ MaxEntitySizeLimit=JAXP00010003: \u5BE6\u9AD4 "{0}" \u7684\u9577\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u6240\u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002
+ TotalEntitySizeLimit=JAXP00010004: \u5BE6\u9AD4\u7684\u7D2F\u7A4D\u5927\u5C0F "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
+ MaxXMLNameLimit=JAXP00010005: \u540D\u7A31 "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
++ MaxElementDepthLimit=JAXP00010006: \u5143\u7D20 "{0}" \u7684\u6DF1\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002
+
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java Wed Jun 25 09:03:02 2014 -0700
+@@ -132,6 +132,10 @@
+ totalValue[index] += value;
+ return;
+ }
++ if (index == Limit.MAX_ELEMENT_DEPTH_LIMIT.ordinal()) {
++ totalValue[index] = value;
++ return;
++ }
+
+ Map<String, Integer> cache;
+ if (caches[index] == null) {
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java Wed May 07 19:26:26 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java Wed Jun 25 09:03:02 2014 -0700
+@@ -66,7 +66,8 @@
+ ELEMENT_ATTRIBUTE_LIMIT(Constants.JDK_ELEMENT_ATTRIBUTE_LIMIT, Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
+ TOTAL_ENTITY_SIZE_LIMIT(Constants.JDK_TOTAL_ENTITY_SIZE_LIMIT, Constants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
+ GENEAL_ENTITY_SIZE_LIMIT(Constants.JDK_GENEAL_ENTITY_SIZE_LIMIT, Constants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
+- PARAMETER_ENTITY_SIZE_LIMIT(Constants.JDK_PARAMETER_ENTITY_SIZE_LIMIT, Constants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000);
++ PARAMETER_ENTITY_SIZE_LIMIT(Constants.JDK_PARAMETER_ENTITY_SIZE_LIMIT, Constants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000),
++ MAX_ELEMENT_DEPTH_LIMIT(Constants.JDK_MAX_ELEMENT_DEPTH, Constants.SP_MAX_ELEMENT_DEPTH, 0, 0);
+
+ final String apiProperty;
+ final String systemProperty;
+@@ -429,9 +430,10 @@
+ return false;
+ }
+
+- if (index==Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal() ||
+- index==Limit.ENTITY_EXPANSION_LIMIT.ordinal() ||
+- index==Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal()) {
++ if (index == Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal() ||
++ index == Limit.ENTITY_EXPANSION_LIMIT.ordinal() ||
++ index == Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal() ||
++ index == Limit.MAX_ELEMENT_DEPTH_LIMIT.ordinal()) {
+ return (limitAnalyzer.getTotalValue(index) > values[index]);
+ } else {
+ return (limitAnalyzer.getValue(index) > values[index]);
+--- ./jaxws/.hgtags Wed May 07 19:26:28 2014 -0700
++++ ./jaxws/.hgtags Wed Jun 25 09:03:17 2014 -0700
+@@ -407,6 +407,7 @@
+ a257072fc2aa482abd6ffa28e235dbe532af6d00 jdk7u55-b02
+ 2916fdfc475bf29bc702887bf5ba02df67c98916 jdk7u55-b03
+ f4759b4547602b3bc865db8c5f356f46979c6389 jdk7u55-b04
++8a8dfdbc66149b89f804c5a50e4692c2520569ae jdk7u65-b00
+ 8a8dfdbc66149b89f804c5a50e4692c2520569ae jdk7u55-b05
+ 2696d6747826cea92a97b2d80be4a59ff99462bd jdk7u55-b06
+ 1ad971afe2b5db93420654fa65b23f827760fed7 jdk7u55-b07
+@@ -420,6 +421,11 @@
+ 5d726bf8fedc1f10d250e980653315919b7602f2 jdk7u55-b30
+ 81d0f297557c4a876727cabeb2bfcdf066a1fc9d jdk7u55-b14
+ 2d103c97c9bd0b3357e6d5e2b5b9ffb64c271288 jdk7u55-b31
++b15b4084288fa4ea9caf7f6b4e79d164c77bb1d6 jdk7u55-b32
++efd71c6ca0832e894b7e1619111860062fa96458 jdk7u55-b33
++485d7912bc20775bda670ea2236c883366590dd7 jdk7u55-b34
++587be38f9a6d60fbefc92dbe9fbd4c83d579c680 jdk7u55-b35
++62332eaec2ff8fc8bece2a905554ac08e375a661 jdk7u55-b36
+ cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
+ f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01
+ 8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02
+@@ -437,6 +443,28 @@
+ 43b5a7cf08e7ee018b1fa42a89510b4c381dc4c5 jdk7u60-b14
+ d00389bf5439e5c42599604d2ebc909d26df8dcf jdk7u60-b15
+ 2fc16d3a321212abc0cc93462b22c4be7f693ab9 jdk7u60-b16
++b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17
+ b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b18
+-b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17
++23598a667bb89b57d5abab5b37781a0952e16cf9 jdk7u65-b01
+ 1d21eb9011a060c7761c9a8a53e69d58bbea4893 jdk7u60-b19
++39e67887a3b112bf74f84df2aac0f46c65bfb005 jdk7u60-b30
++dfc2c4b9b16bd2d68435ddc9bb12036982021844 jdk7u60-b31
++0e17943c39fadb810b4dd2e9ac732503b86043f4 jdk7u60-b32
++910559d7f754d8fd6ab80a627869877443358316 jdk7u60-b33
++8ac19021e6af5d92b46111a6c41430f36ccdb901 jdk7u65-b02
++a70d681bc273a110d10cf3c4f9b35b25ca6a600f jdk7u65-b03
++7cd17f96988509e99fbb71003aeb76d92b638fef jdk7u65-b04
++7bafb24c6466999bc08742b160d0e450bc12a2c5 jdk7u65-b05
++35b31c516cab0a81fa9d2a119ec101be3f5a2969 jdk7u65-b06
++eb89c1c30a93b1d43cbc1b7520bca46d31d0829a jdk7u65-b07
++d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u65-b08
++e4cc1e93c6332c8463e75a25c3d735884d185259 jdk7u65-b09
++d10ec17267415303a71d358ae6202369db77ba96 jdk7u65-b10
++2f5dcee6d56b00551db21408ebad2ff2faad7c7a jdk7u65-b11
++f03350485cd388620981bb7e7faa2d1890d11a1b jdk7u65-b12
++471f883e9830d8341248b99da7c9cfab9fcc94d6 jdk7u65-b13
++11deffa2096f08dab69de13d4fcf361c6d252636 jdk7u65-b14
++39ad61a579fd824fbec1bec4e071376449ba8195 jdk7u65-b15
++198bf1acd262f2c16715d3be5e33d7b8de1e7776 jdk7u65-b16
++df4dc644fe344e973fc1692c28683eec8ba82600 jdk7u65-b17
++0e0ca87a6d5212a0885f0c8c00b8f7cf24a64d89 jdk7u65-b30
+--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Wed May 07 19:26:28 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Wed Jun 25 09:03:17 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -31,6 +31,8 @@
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Type;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
+@@ -41,22 +43,32 @@
+ *
+ * Has *package private* access to avoid inappropriate usage.
+ */
+-/* package */ final class Utils {
++final class Utils {
+
+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
+
+ /**
+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
+ */
+- /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+- Class refNav = null;
+ try {
+- refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+ //noinspection unchecked
+- Method getInstance = refNav.getDeclaredMethod("getInstance");
+- getInstance.setAccessible(true);
++ final Method getInstance = refNav.getDeclaredMethod("getInstance");
++
++ // requires accessClassInPackage privilege
++ AccessController.doPrivileged(
++ new PrivilegedAction<Object>() {
++ @Override
++ public Object run() {
++ getInstance.setAccessible(true);
++ return null;
++ }
++ }
++ );
++
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Wed May 07 19:26:28 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Wed Jun 25 09:03:17 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -31,6 +31,8 @@
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Type;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
+@@ -41,22 +43,32 @@
+ *
+ * Has *package private* access to avoid inappropriate usage.
+ */
+-/* package */ final class Utils {
++final class Utils {
+
+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
+
+ /**
+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
+ */
+- /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+- Class refNav = null;
+ try {
+- refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+ //noinspection unchecked
+- Method getInstance = refNav.getDeclaredMethod("getInstance");
+- getInstance.setAccessible(true);
++ final Method getInstance = refNav.getDeclaredMethod("getInstance");
++
++ // requires accessClassInPackage privilege
++ AccessController.doPrivileged(
++ new PrivilegedAction<Object>() {
++ @Override
++ public Object run() {
++ getInstance.setAccessible(true);
++ return null;
++ }
++ }
++ );
++
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java Wed May 07 19:26:28 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java Wed Jun 25 09:03:17 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -31,6 +31,8 @@
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Type;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
+@@ -41,22 +43,32 @@
+ *
+ * Has *package private* access to avoid inappropriate usage.
+ */
+-/* package */ final class Utils {
++final class Utils {
+
+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
+
+ /**
+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
+ */
+- /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+- Class refNav = null;
+ try {
+- refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+ //noinspection unchecked
+- Method getInstance = refNav.getDeclaredMethod("getInstance");
+- getInstance.setAccessible(true);
++ final Method getInstance = refNav.getDeclaredMethod("getInstance");
++
++ // requires accessClassInPackage privilege
++ AccessController.doPrivileged(
++ new PrivilegedAction<Object>() {
++ @Override
++ public Object run() {
++ getInstance.setAccessible(true);
++ return null;
++ }
++ }
++ );
++
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java Wed May 07 19:26:28 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java Wed Jun 25 09:03:17 2014 -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
+@@ -130,14 +130,6 @@
+ private final Map<TypeReference,Bridge> bridges = new LinkedHashMap<TypeReference,Bridge>();
+
+ /**
+- * Shared instance of {@link TransformerFactory}.
+- * Lock before use, because a {@link TransformerFactory} is not thread-safe
+- * whereas {@link JAXBContextImpl} is.
+- * Lazily created.
+- */
+- private volatile static SAXTransformerFactory tf;
+-
+- /**
+ * Shared instance of {@link DocumentBuilder}.
+ * Lock before use. Lazily created.
+ */
+@@ -702,13 +694,7 @@
+ */
+ static Transformer createTransformer() {
+ try {
+- if (tf==null) {
+- synchronized(JAXBContextImpl.class) {
+- if (tf==null) {
+- tf = (SAXTransformerFactory)TransformerFactory.newInstance();
+- }
+- }
+- }
++ SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance();
+ return tf.newTransformer();
+ } catch (TransformerConfigurationException e) {
+ throw new Error(e); // impossible
+@@ -720,13 +706,7 @@
+ */
+ public static TransformerHandler createTransformerHandler() {
+ try {
+- if (tf==null) {
+- synchronized(JAXBContextImpl.class) {
+- if (tf==null) {
+- tf = (SAXTransformerFactory)TransformerFactory.newInstance();
+- }
+- }
+- }
++ SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance();
+ return tf.newTransformerHandler();
+ } catch (TransformerConfigurationException e) {
+ throw new Error(e); // impossible
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java Wed May 07 19:26:28 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java Wed Jun 25 09:03:17 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -31,6 +31,8 @@
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Type;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
+@@ -41,22 +43,32 @@
+ *
+ * Has *package private* access to avoid inappropriate usage.
+ */
+-/* package */ final class Utils {
++final class Utils {
+
+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
+
+ /**
+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
+ */
+- /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+- Class refNav = null;
+ try {
+- refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+ //noinspection unchecked
+- Method getInstance = refNav.getDeclaredMethod("getInstance");
+- getInstance.setAccessible(true);
++ final Method getInstance = refNav.getDeclaredMethod("getInstance");
++
++ // requires accessClassInPackage privilege
++ AccessController.doPrivileged(
++ new PrivilegedAction<Object>() {
++ @Override
++ public Object run() {
++ getInstance.setAccessible(true);
++ return null;
++ }
++ }
++ );
++
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java Wed May 07 19:26:28 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java Wed Jun 25 09:03:17 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -31,6 +31,8 @@
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Type;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
+@@ -41,22 +43,32 @@
+ *
+ * Has *package private* access to avoid inappropriate usage.
+ */
+-/* package */ final class Utils {
++final class Utils {
+
+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
+
+ /**
+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
+ */
+- /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+- Class refNav = null;
+ try {
+- refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+ //noinspection unchecked
+- Method getInstance = refNav.getDeclaredMethod("getInstance");
+- getInstance.setAccessible(true);
++ final Method getInstance = refNav.getDeclaredMethod("getInstance");
++
++ // requires accessClassInPackage privilege
++ AccessController.doPrivileged(
++ new PrivilegedAction<Object>() {
++ @Override
++ public Object run() {
++ getInstance.setAccessible(true);
++ return null;
++ }
++ }
++ );
++
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java Wed May 07 19:26:28 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java Wed Jun 25 09:03:17 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -31,6 +31,8 @@
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Type;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
+@@ -41,22 +43,32 @@
+ *
+ * Has *package private* access to avoid inappropriate usage.
+ */
+-/* package */ final class Utils {
++final class Utils {
+
+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
+
+ /**
+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
+ */
+- /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+- Class refNav = null;
+ try {
+- refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+ //noinspection unchecked
+- Method getInstance = refNav.getDeclaredMethod("getInstance");
+- getInstance.setAccessible(true);
++ final Method getInstance = refNav.getDeclaredMethod("getInstance");
++
++ // requires accessClassInPackage privilege
++ AccessController.doPrivileged(
++ new PrivilegedAction<Object>() {
++ @Override
++ public Object run() {
++ getInstance.setAccessible(true);
++ return null;
++ }
++ }
++ );
++
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java Wed May 07 19:26:28 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java Wed Jun 25 09:03:17 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * 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
+@@ -31,6 +31,8 @@
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Type;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
+@@ -41,22 +43,32 @@
+ *
+ * Has *package private* access to avoid inappropriate usage.
+ */
+-/* package */ final class Utils {
++final class Utils {
+
+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
+
+ /**
+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
+ */
+- /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+- Class refNav = null;
+ try {
+- refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+ //noinspection unchecked
+- Method getInstance = refNav.getDeclaredMethod("getInstance");
+- getInstance.setAccessible(true);
++ final Method getInstance = refNav.getDeclaredMethod("getInstance");
++
++ // requires accessClassInPackage privilege
++ AccessController.doPrivileged(
++ new PrivilegedAction<Object>() {
++ @Override
++ public Object run() {
++ getInstance.setAccessible(true);
++ return null;
++ }
++ }
++ );
++
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+--- ./jdk/.hgtags Wed May 07 19:26:47 2014 -0700
++++ ./jdk/.hgtags Wed Apr 16 12:37:49 2014 +0400
+@@ -391,6 +391,7 @@
+ 2ca3e1fa4455ad564228ad6e654498167af2f20d jdk7u55-b02
+ c12b3c81366cb067ff4444952209d54bfa387353 jdk7u55-b03
+ 476d1bddaa32bf440953c3b1814ba38f16886c03 jdk7u55-b04
++7fa6d3ba2cc77cd1e6f24e33f0c39788cb2893b8 jdk7u65-b00
+ 7fa6d3ba2cc77cd1e6f24e33f0c39788cb2893b8 jdk7u55-b05
+ 795654fce29c38d4c8504f760d8d8a36248d38ed jdk7u55-b06
+ 4b2ed892b195e95f7541aaa3b129a2caa5faae1d jdk7u55-b07
+@@ -404,6 +405,11 @@
+ 4a5651c84b1e6cf26dc9b19f00747e5004efba68 jdk7u55-b30
+ ffd99c5975217a14609851602c5f5dc005234aba jdk7u55-b14
+ 88f1bf248cc520e0bf7ef17bc862f87aab958373 jdk7u55-b31
++b83f5194edf23b752fe2c0a9be361455f87196df jdk7u55-b32
++01a4cd03a6c85abb62eb5d1c2b5bf7d2f544c04e jdk7u55-b33
++3f54f8a387c1a908c07106b685183b19a5fc1064 jdk7u55-b34
++2cdc52ec4813abe38b4e52ae9c9f0ff5dcc87faa jdk7u55-b35
++6845d311ff990d422f9376d37e3e82d5d06bff3f jdk7u55-b36
+ db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
+ def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01
+ ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02
+@@ -421,6 +427,28 @@
+ b7fbd9b4febf8961091fdf451d3da477602a8f1d jdk7u60-b14
+ 04882f9a073e8de153ec7ad32486569fd9a087ec jdk7u60-b15
+ 41547583c3a035c3924ffedfa8704e58d69e5c50 jdk7u60-b16
++e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17
+ e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b18
+-e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17
++c220d329a78161f79df73048ed55db91f538e3b7 jdk7u65-b01
+ 7190843ddaf4f3ad158c3071be0f4ca42a5802dc jdk7u60-b19
++8dc56d0f3e860658619eaa57d10fb1a4182d71cd jdk7u60-b30
++feac9624a1e1ffebe09a19ae351d88e3ef98c441 jdk7u60-b31
++fb40615ef352e03ee94c0682a6ca0a0e6a33a70b jdk7u60-b32
++9cfcdeeecfac66004cb5bbb2c5bba5c57e170539 jdk7u60-b33
++a42a3bb22f6991d8f6a30e4f1782ad620c40eb65 jdk7u65-b02
++756071871d61e1ca410c63a3f1c4dabcc51a90df jdk7u65-b03
++bac16c82c14a35d1e9d3c4d0bd317dbbb296f34e jdk7u65-b04
++14b3f82c245fb8d0eeb21dc99ff0b4985571910c jdk7u65-b05
++7d8e5d90789533b5cc22eeb15c19ce1bb8a20573 jdk7u65-b06
++cde691a6989fa875107a3974aa92681d286be6ec jdk7u65-b07
++d5353f8e1e02e12a1262d65ed85183425b0cdf13 jdk7u65-b08
++45913a29c1edd3e63c9c818ffab7aebd4d75fa40 jdk7u65-b09
++3bb943c6ff7dd614cb428501db8c2c655e5f5223 jdk7u65-b10
++b84e98280630be44a87f4336009f61350f3c7dc0 jdk7u65-b11
++61d15f512305655a51c04811006850e4955936bd jdk7u65-b12
++69698344d0a1771ed9162ecad2065829ca1f8994 jdk7u65-b13
++2e6105ddad44866c4cdc1ba06620b48685e34111 jdk7u65-b14
++8cff6ce00a91820b4cb7ef24ed42063c2305127d jdk7u65-b15
++190017413768f02addea8b2c5106157e3c4076c7 jdk7u65-b16
++23e78e36bc39f4f761ac2b0e055c562c3ff204f5 jdk7u65-b17
++96d1fa382dda17ae105f28083bda41f79fc3093f jdk7u65-b30
+--- ./jdk/make/java/util/FILES_properties.gmk Wed May 07 19:26:47 2014 -0700
++++ ./jdk/make/java/util/FILES_properties.gmk Wed Apr 16 12:37:49 2014 +0400
+@@ -107,6 +107,7 @@
+ sun/util/resources/CalendarData_pl.properties \
+ sun/util/resources/CalendarData_pt.properties \
+ sun/util/resources/CalendarData_pt_PT.properties \
++ sun/util/resources/CalendarData_pt_BR.properties \
+ sun/util/resources/CalendarData_ro.properties \
+ sun/util/resources/CalendarData_ru.properties \
+ sun/util/resources/CalendarData_sk.properties \
+--- ./jdk/make/sun/javazic/tzdata/VERSION Wed May 07 19:26:47 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/VERSION Wed Apr 16 12:37:49 2014 +0400
+@@ -21,4 +21,4 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-tzdata2014b
++tzdata2014c
+--- ./jdk/make/sun/javazic/tzdata/africa Wed May 07 19:26:47 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/africa Wed Apr 16 12:37:49 2014 +0400
+@@ -358,11 +358,54 @@
+ # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
+ # </a>
+
++# From Ahmad El-Dardiry (2014-05-07):
++# Egypt is to change back to Daylight system on May 15
++# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
++
++# From Gunther Vermier (2015-05-13):
++# our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
++
++# From Paul Eggert (2014-05-13):
++# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
++# the change is because of blackouts in Cairo, even though Ahram Online (cited
++# above) says DST had no affect on electricity consumption. The AP story says
++# DST will not be observed during Ramadan. There is no information about when
++# DST will end. See:
++# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
++#
++# For now, guess that later transitions will use 2010's rules, and that
++# Egypt will agree with Morocco (see below) about the date Ramadan starts and
++# ends, though (unlike Morocco) it will switch at 00:00 standard time. In
++# Egypt the spring-forward transitions are removed for 2020-2022, when the
++# guessed spring-forward date falls during the estimated Ramadan, and all
++# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
++# outside the guessed daylight-saving time. Ramadan intrudes on the guessed
++# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
++
+ Rule Egypt 2008 only - Aug lastThu 23:00s 0 -
+ Rule Egypt 2009 only - Aug 20 23:00s 0 -
+ Rule Egypt 2010 only - Aug 11 0:00 0 -
+ Rule Egypt 2010 only - Sep 10 0:00 1:00 S
+ Rule Egypt 2010 only - Sep lastThu 23:00s 0 -
++Rule Egypt 2014 only - May 15 24:00 1:00 S
++Rule Egypt 2014 only - Jun 29 0:00s 0 -
++Rule Egypt 2014 only - Jul 29 0:00s 1:00 S
++Rule Egypt 2014 max - Sep lastThu 23:00s 0 -
++Rule Egypt 2015 2019 - Apr lastFri 0:00s 1:00 S
++Rule Egypt 2015 only - Jun 18 0:00s 0 -
++Rule Egypt 2015 only - Jul 18 0:00s 1:00 S
++Rule Egypt 2016 only - Jun 7 0:00s 0 -
++Rule Egypt 2016 only - Jul 7 0:00s 1:00 S
++Rule Egypt 2017 only - May 27 0:00s 0 -
++Rule Egypt 2017 only - Jun 26 0:00s 1:00 S
++Rule Egypt 2018 only - May 16 0:00s 0 -
++Rule Egypt 2018 only - Jun 15 0:00s 1:00 S
++Rule Egypt 2019 only - May 6 0:00s 0 -
++Rule Egypt 2019 only - Jun 5 0:00s 1:00 S
++Rule Egypt 2020 only - May 24 0:00s 1:00 S
++Rule Egypt 2021 only - May 13 0:00s 1:00 S
++Rule Egypt 2022 only - May 3 0:00s 1:00 S
++Rule Egypt 2023 max - Apr lastFri 0:00s 1:00 S
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
+--- ./jdk/make/sun/javazic/tzdata/asia Wed May 07 19:26:47 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/asia Wed Apr 16 12:37:49 2014 +0400
+@@ -1370,22 +1370,6 @@
+ # "Jordan will switch to winter time on Friday, October 27".
+ #
+
+-# From Phil Pizzey (2009-04-02):
+-# ...I think I may have spotted an error in the timezone data for
+-# Jordan.
+-# The current (2009d) asia file shows Jordan going to daylight
+-# saving
+-# time on the last Thursday in March.
+-#
+-# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S
+-#
+-# However timeanddate.com, which I usually find reliable, shows Jordan
+-# going to daylight saving time on the last Friday in March since 2002.
+-# Please see
+-# <a href="http://www.timeanddate.com/worldclock/timezone.html?n=11">
+-# http://www.timeanddate.com/worldclock/timezone.html?n=11
+-# </a>
+-
+ # From Steffen Thorsen (2009-04-02):
+ # This single one might be good enough, (2009-03-24, Arabic):
+ # <a href="http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279">
+--- ./jdk/make/sun/javazic/tzdata/europe Wed May 07 19:26:47 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/europe Wed Apr 16 12:37:49 2014 +0400
+@@ -2989,6 +2989,10 @@
+ # From Alexander Krivenyshev (2014-03-17):
+ # time change at 2:00 (2am) on March 30, 2014
+ # http://vz.ru/news/2014/3/17/677464.html
++# From Paul Eggert (2014-03-30):
++# Simferopol and Sevastopol reportedly changed their central town clocks
++# late the previous day, but this appears to have been ceremonial
++# and the discrepancies are small enough to not worry about.
+ 2:00 EU EE%sT 2014 Mar 30 2:00
+ 4:00 - MSK
+
+--- ./jdk/make/sun/lwawt/FILES_export_macosx.gmk Wed May 07 19:26:47 2014 -0700
++++ ./jdk/make/sun/lwawt/FILES_export_macosx.gmk Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -141,7 +141,6 @@
+ sun/lwawt/macosx/CMenuBar.java \
+ sun/lwawt/macosx/CMenuComponent.java \
+ sun/lwawt/macosx/CMenuItem.java \
+- sun/lwawt/macosx/CMouseInfoPeer.java \
+ sun/lwawt/macosx/CPlatformView.java \
+ sun/lwawt/macosx/CPlatformWindow.java \
+ sun/lwawt/macosx/CPlatformComponent.java \
+--- ./jdk/make/sun/security/ec/mapfile-vers Wed May 07 19:26:47 2014 -0700
++++ ./jdk/make/sun/security/ec/mapfile-vers Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2009, 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
+@@ -28,7 +28,6 @@
+ SUNWprivate_1.1 {
+ global:
+ Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair;
+- Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes;
+ Java_sun_security_ec_ECDSASignature_signDigest;
+ Java_sun_security_ec_ECDSASignature_verifySignedDigest;
+ Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
+--- ./jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -89,10 +89,15 @@
+
+ private volatile int windowState = Frame.NORMAL;
+
++ // check that the mouse is over the window
++ private volatile boolean isMouseOver = false;
++ // A peer where the last mouse event came to. Used by cursor manager to
++ // find the component under cursor
++ private static volatile LWComponentPeer lastCommonMouseEventPeer = null;
++
+ // A peer where the last mouse event came to. Used to generate
+- // MOUSE_ENTERED/EXITED notifications and by cursor manager to
+- // find the component under cursor
+- private static volatile LWComponentPeer lastMouseEventPeer = null;
++ // MOUSE_ENTERED/EXITED notifications
++ private volatile LWComponentPeer lastMouseEventPeer;
+
+ // Peers where all dragged/released events should come to,
+ // depending on what mouse button is being dragged according to Cocoa
+@@ -773,59 +778,62 @@
+ Rectangle r = getBounds();
+ // findPeerAt() expects parent coordinates
+ LWComponentPeer targetPeer = findPeerAt(r.x + x, r.y + y);
+- LWWindowPeer lastWindowPeer =
+- (lastMouseEventPeer != null) ? lastMouseEventPeer.getWindowPeerOrSelf() : null;
+- LWWindowPeer curWindowPeer =
+- (targetPeer != null) ? targetPeer.getWindowPeerOrSelf() : null;
+
+ if (id == MouseEvent.MOUSE_EXITED) {
+- // Sometimes we may get MOUSE_EXITED after lastMouseEventPeer is switched
+- // to a peer from another window. So we must first check if this peer is
+- // the same as lastWindowPeer
+- if (lastWindowPeer == this) {
+- if (isEnabled()) {
++ isMouseOver = false;
++ if (lastMouseEventPeer != null) {
++ if (lastMouseEventPeer.isEnabled()) {
+ Point lp = lastMouseEventPeer.windowToLocal(x, y,
+- lastWindowPeer);
++ this);
+ Component target = lastMouseEventPeer.getTarget();
+ postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED,
+ when, modifiers, lp,
+ screenX, screenY, clickCount, popupTrigger, button);
+ }
++
++ // Sometimes we may get MOUSE_EXITED after lastCommonMouseEventPeer is switched
++ // to a peer from another window. So we must first check if this peer is
++ // the same as lastWindowPeer
++ if (lastCommonMouseEventPeer != null && lastCommonMouseEventPeer.getWindowPeerOrSelf() == this) {
++ lastCommonMouseEventPeer = null;
++ }
+ lastMouseEventPeer = null;
+ }
+- } else {
+- if (targetPeer != lastMouseEventPeer) {
+- // lastMouseEventPeer may be null if mouse was out of Java windows
+- if (lastMouseEventPeer != null && lastMouseEventPeer.isEnabled()) {
+- // Sometimes, MOUSE_EXITED is not sent by delegate (or is sent a bit
+- // later), in which case lastWindowPeer is another window
+- if (lastWindowPeer != this) {
+- Point oldp = lastMouseEventPeer.windowToLocal(x, y, lastWindowPeer);
+- // Additionally translate from this to lastWindowPeer coordinates
+- Rectangle lr = lastWindowPeer.getBounds();
+- oldp.x += r.x - lr.x;
+- oldp.y += r.y - lr.y;
+- Component target = lastMouseEventPeer.getTarget();
+- postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED,
+- when, modifiers, oldp,
+- screenX, screenY, clickCount, popupTrigger, button);
+- } else {
+- Point oldp = lastMouseEventPeer.windowToLocal(x, y, this);
+- Component target = lastMouseEventPeer.getTarget();
+- postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED,
+- when, modifiers, oldp,
+- screenX, screenY, clickCount, popupTrigger, button);
+- }
+- }
+- lastMouseEventPeer = targetPeer;
+- if (targetPeer != null && targetPeer.isEnabled() && id != MouseEvent.MOUSE_ENTERED) {
+- Point newp = targetPeer.windowToLocal(x, y, curWindowPeer);
++ } else if (id == MouseEvent.MOUSE_ENTERED) {
++ isMouseOver = true;
++ if (targetPeer != null) {
++ if (targetPeer.isEnabled()) {
++ Point lp = targetPeer.windowToLocal(x, y, this);
+ Component target = targetPeer.getTarget();
+- postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_ENTERED,
+- when, modifiers, newp,
++ postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_ENTERED, when, modifiers, lp,
+ screenX, screenY, clickCount, popupTrigger, button);
+ }
++ lastCommonMouseEventPeer = targetPeer;
++ lastMouseEventPeer = targetPeer;
+ }
++ } else {
++ PlatformWindow topmostPlatformWindow =
++ platformWindow.getTopmostPlatformWindowUnderMouse();
++
++ LWWindowPeer topmostWindowPeer =
++ topmostPlatformWindow != null ? topmostPlatformWindow.getPeer() : null;
++
++ // topmostWindowPeer == null condition is added for the backword
++ // compatibility with applets. It can be removed when the
++ // getTopmostPlatformWindowUnderMouse() method will be properly
++ // implemented i CPlatformEmbeddedFrame class
++ if (topmostWindowPeer == this || topmostWindowPeer == null) {
++ generateMouseEnterExitEventsForComponents(when, button, x, y,
++ screenX, screenY, modifiers, clickCount, popupTrigger,
++ targetPeer);
++ } else {
++ LWComponentPeer topmostTargetPeer =
++ topmostWindowPeer != null ? topmostWindowPeer.findPeerAt(r.x + x, r.y + y) : null;
++ topmostWindowPeer.generateMouseEnterExitEventsForComponents(when, button, x, y,
++ screenX, screenY, modifiers, clickCount, popupTrigger,
++ topmostTargetPeer);
++ }
++
+ // TODO: fill "bdata" member of AWTEvent
+
+ int eventButtonMask = (button > 0)? MouseEvent.getMaskForButton(button) : 0;
+@@ -875,19 +883,13 @@
+ // mouseClickButtons is updated below, after MOUSE_CLICK is sent
+ }
+
+- // check if we receive mouseEvent from outside the window's bounds
+- // it can be either mouseDragged or mouseReleased
+- if (curWindowPeer == null) {
+- //TODO This can happen if this window is invisible. this is correct behavior in this case?
+- curWindowPeer = this;
+- }
+ if (targetPeer == null) {
+ //TODO This can happen if this window is invisible. this is correct behavior in this case?
+ targetPeer = this;
+ }
+
+
+- Point lp = targetPeer.windowToLocal(x, y, curWindowPeer);
++ Point lp = targetPeer.windowToLocal(x, y, this);
+ if (targetPeer.isEnabled()) {
+ if (id == MouseEvent.MOUSE_ENTERED || id == MouseEvent.MOUSE_EXITED) {
+ postMouseEnteredExitedEvent(targetPeer.getTarget(), id,
+@@ -918,6 +920,33 @@
+ notifyUpdateCursor();
+ }
+
++ private void generateMouseEnterExitEventsForComponents(long when,
++ int button, int x, int y, int screenX, int screenY,
++ int modifiers, int clickCount, boolean popupTriger,
++ LWComponentPeer targetPeer) {
++ if (!isMouseOver || targetPeer == lastMouseEventPeer) {
++ return;
++ }
++
++ // Generate Mouse Exit for components
++ if (lastMouseEventPeer != null && lastMouseEventPeer.isEnabled()) {
++ Point oldp = lastMouseEventPeer.windowToLocal(x, y, this);
++ Component target = lastMouseEventPeer.getTarget();
++ postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED, when, modifiers,
++ oldp, screenX, screenY, clickCount, popupTriger, button);
++ }
++ lastCommonMouseEventPeer = targetPeer;
++ lastMouseEventPeer = targetPeer;
++
++ // Genrate Mouse Enter for Componetns
++ if (targetPeer != null && targetPeer.isEnabled()) {
++ Point newp = targetPeer.windowToLocal(x, y, this);
++ Component target = targetPeer.getTarget();
++ postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_ENTERED, when, modifiers,
++ newp, screenX, screenY, clickCount, popupTriger, button);
++ }
++ }
++
+ private void postMouseEnteredExitedEvent(
+ Component target, int id, long when, int modifiers,
+ Point loc, int xAbs, int yAbs,
+@@ -1198,11 +1227,11 @@
+ }
+
+ public static LWWindowPeer getWindowUnderCursor() {
+- return lastMouseEventPeer != null ? lastMouseEventPeer.getWindowPeerOrSelf() : null;
++ return lastCommonMouseEventPeer != null ? lastCommonMouseEventPeer.getWindowPeerOrSelf() : null;
+ }
+
+ public static LWComponentPeer<?, ?> getPeerUnderCursor() {
+- return lastMouseEventPeer;
++ return lastCommonMouseEventPeer;
+ }
+
+ /*
+--- ./jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -118,6 +118,8 @@
+
+ public void setAlwaysOnTop(boolean value);
+
++ public PlatformWindow getTopmostPlatformWindowUnderMouse();
++
+ public void updateFocusableWindowState();
+
+ public boolean rejectFocusRequest(CausedFocusEvent.Cause cause);
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java Wed May 07 19:26:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,45 +0,0 @@
+-/*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. 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.lwawt.macosx;
+-
+-import java.awt.Window;
+-import sun.lwawt.LWMouseInfoPeer;
+-import sun.lwawt.LWWindowPeer;
+-
+-public class CMouseInfoPeer extends LWMouseInfoPeer
+-{
+- //If a new window is to appear under the cursor,
+- //we get wrong window.
+- //This is a workaround for macosx.
+- @Override
+- public boolean isWindowUnderMouse(Window w) {
+- if (w == null) {
+- return false;
+- }
+-
+- return ((LWWindowPeer)w.getPeer()).getPlatformWindow().isUnderMouse();
+- }
+-}
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -151,6 +151,11 @@
+ @Override
+ public void setAlwaysOnTop(boolean value) {}
+
++ // This method should be properly implemented for applets.
++ // It returns null just as a stub.
++ @Override
++ public PlatformWindow getTopmostPlatformWindowUnderMouse() { return null; }
++
+ @Override
+ public void updateFocusableWindowState() {}
+
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -61,8 +61,9 @@
+ private static native void nativeSetNSWindowMinimizedIcon(long nsWindowPtr, long nsImage);
+ private static native void nativeSetNSWindowRepresentedFilename(long nsWindowPtr, String representedFilename);
+ private static native void nativeSetEnabled(long nsWindowPtr, boolean isEnabled);
+- private static native void nativeSynthesizeMouseEnteredExitedEvents(long nsWindowPtr);
++ private static native void nativeSynthesizeMouseEnteredExitedEvents();
+ private static native void nativeDispose(long nsWindowPtr);
++ private static native CPlatformWindow nativeGetTopmostPlatformWindowUnderMouse();
+
+ // Loger to report issues happened during execution but that do not affect functionality
+ private static final PlatformLogger logger = PlatformLogger.getLogger("sun.lwawt.macosx.CPlatformWindow");
+@@ -593,7 +594,7 @@
+ }
+ }
+
+- nativeSynthesizeMouseEnteredExitedEvents(nsWindowPtr);
++ nativeSynthesizeMouseEnteredExitedEvents();
+
+ // Configure stuff #2
+ updateFocusabilityForAutoRequestFocus(true);
+@@ -738,6 +739,9 @@
+ setStyleBits(ALWAYS_ON_TOP, isAlwaysOnTop);
+ }
+
++ public PlatformWindow getTopmostPlatformWindowUnderMouse() {
++ return CPlatformWindow.nativeGetTopmostPlatformWindowUnderMouse();
++ }
+ @Override
+ public void setOpacity(float opacity) {
+ CWrapper.NSWindow.setAlphaValue(getNSWindowPtr(), opacity);
+@@ -830,7 +834,7 @@
+ throw new RuntimeException("Unknown window state: " + windowState);
+ }
+
+- nativeSynthesizeMouseEnteredExitedEvents(nsWindowPtr);
++ nativeSynthesizeMouseEnteredExitedEvents();
+
+ // NOTE: the SWP.windowState field gets updated to the newWindowState
+ // value when the native notification comes to us
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+@@ -148,6 +148,11 @@
+ }
+
+ @Override
++ public PlatformWindow getTopmostPlatformWindowUnderMouse() {
++ return null;
++ }
++
++ @Override
+ public void updateFocusableWindowState() {
+ }
+
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+@@ -300,11 +300,6 @@
+ }
+
+ @Override
+- protected MouseInfoPeer createMouseInfoPeerImpl() {
+- return new CMouseInfoPeer();
+- }
+-
+- @Override
+ protected int getScreenHeight() {
+ return GraphicsEnvironment.getLocalGraphicsEnvironment()
+ .getDefaultScreenDevice().getDefaultConfiguration().getBounds().height;
+--- ./jdk/src/macosx/native/sun/awt/AWTView.h Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/AWTView.h Wed Apr 16 12:37:49 2014 +0400
+@@ -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,8 +33,8 @@
+ @private
+ jobject m_cPlatformView;
+
+- // Handler for the tracking rect needed for Enter/Exit events management.
+- NSTrackingRectTag rolloverTrackingRectTag;
++ // Handler for the tracking area needed for Enter/Exit events management.
++ NSTrackingArea* rolloverTrackingArea;
+
+ // TODO: NSMenu *contextualMenu;
+
+@@ -61,7 +61,7 @@
+
+ - (id) initWithRect:(NSRect) rect platformView:(jobject)cPlatformView windowLayer:(CALayer*)windowLayer;
+ - (void) deliverJavaMouseEvent: (NSEvent *) event;
+-- (void) resetTrackingRect;
++- (void) resetTrackingArea;
+ - (void) deliverJavaKeyEventHelper: (NSEvent *) event;
+ - (jobject) awtComponent:(JNIEnv *)env;
+
+--- ./jdk/src/macosx/native/sun/awt/AWTView.m Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/AWTView.m Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -82,6 +82,7 @@
+ fPAHNeedsToSelect = NO;
+
+ mouseIsOver = NO;
++ [self resetTrackingArea];
+
+ if (windowLayer != nil) {
+ self.cglLayer = windowLayer;
+@@ -149,7 +150,7 @@
+ [[self window] makeFirstResponder: self];
+ }];
+ if ([self window] != NULL) {
+- [self resetTrackingRect];
++ [self resetTrackingArea];
+ }
+ }
+
+@@ -380,30 +381,31 @@
+ JNFCallVoidMethod(env, m_cPlatformView, jm_deliverMouseEvent, jEvent);
+ }
+
++- (void) resetTrackingArea {
++ if (rolloverTrackingArea != nil) {
++ [self removeTrackingArea:rolloverTrackingArea];
++ [rolloverTrackingArea release];
++ }
+
+-- (void) clearTrackingRect {
+- if (rolloverTrackingRectTag > 0) {
+- [self removeTrackingRect:rolloverTrackingRectTag];
+- rolloverTrackingRectTag = 0;
+- }
+-}
++ int options = (NSTrackingActiveAlways | NSTrackingMouseEnteredAndExited |
++ NSTrackingMouseMoved | NSTrackingEnabledDuringMouseDrag);
+
+-- (void) resetTrackingRect {
+- [self clearTrackingRect];
+- rolloverTrackingRectTag = [self addTrackingRect:[self visibleRect]
+- owner:self
+- userData:NULL
+- assumeInside:NO];
++ rolloverTrackingArea = [[NSTrackingArea alloc] initWithRect:[self visibleRect]
++ options:options
++ owner:self
++ userInfo:nil
++ ];
++ [self addTrackingArea:rolloverTrackingArea];
+ }
+
+ - (void)updateTrackingAreas {
+ [super updateTrackingAreas];
+- [self resetTrackingRect];
++ [self resetTrackingArea];
+ }
+
+ - (void) resetCursorRects {
+ [super resetCursorRects];
+- [self resetTrackingRect];
++ [self resetTrackingArea];
+ }
+
+ -(void) deliverJavaKeyEventHelper: (NSEvent *) event {
+--- ./jdk/src/macosx/native/sun/awt/AWTWindow.m Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/AWTWindow.m Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -314,10 +314,8 @@
+ return [window isKindOfClass: [AWTWindow_Panel class]] || [window isKindOfClass: [AWTWindow_Normal class]];
+ }
+
+-// checks that this window is under the mouse cursor and this point is not overlapped by others windows
+-- (BOOL) isTopmostWindowUnderMouse {
+-
+- int currentWinID = [self.nsWindow windowNumber];
++// return id for the topmost window under mouse
+++ (NSInteger) getTopmostWindowUnderMouseID {
+
+ NSRect screenRect = [[NSScreen mainScreen] frame];
+ NSPoint nsMouseLocation = [NSEvent mouseLocation];
+@@ -327,51 +325,75 @@
+
+
+ for (NSDictionary *window in windows) {
+- int layer = [[window objectForKey:(id)kCGWindowLayer] intValue];
++ NSInteger layer = [[window objectForKey:(id)kCGWindowLayer] integerValue];
+ if (layer == 0) {
+- int winID = [[window objectForKey:(id)kCGWindowNumber] intValue];
+ CGRect rect;
+ CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[window objectForKey:(id)kCGWindowBounds], &rect);
+ if (CGRectContainsPoint(rect, cgMouseLocation)) {
+- return currentWinID == winID;
+- } else if (currentWinID == winID) {
+- return NO;
++ return [[window objectForKey:(id)kCGWindowNumber] integerValue];
+ }
+ }
+ }
+- return NO;
++ return -1;
+ }
+
+-- (void) synthesizeMouseEnteredExitedEvents {
++// checks that this window is under the mouse cursor and this point is not overlapped by other windows
++- (BOOL) isTopmostWindowUnderMouse {
++ return [self.nsWindow windowNumber] == [AWTWindow getTopmostWindowUnderMouseID];
++}
+
+- int eventType = 0;
+- BOOL isUnderMouse = [self isTopmostWindowUnderMouse];
+- BOOL mouseIsOver = [[self.nsWindow contentView] mouseIsOver];
+++ (AWTWindow *) getTopmostWindowUnderMouse {
++ NSEnumerator *windowEnumerator = [[NSApp windows] objectEnumerator];
++ NSWindow *window;
+
+- if (isUnderMouse && !mouseIsOver) {
+- eventType = NSMouseEntered;
+- } else if (!isUnderMouse && mouseIsOver) {
+- eventType = NSMouseExited;
+- } else {
+- return;
++ NSInteger topmostWindowUnderMouseID = [AWTWindow getTopmostWindowUnderMouseID];
++
++ while ((window = [windowEnumerator nextObject]) != nil) {
++ if ([window windowNumber] == topmostWindowUnderMouseID) {
++ BOOL isAWTWindow = [AWTWindow isAWTWindow: window];
++ return isAWTWindow ? (AWTWindow *) [window delegate] : nil;
++ }
+ }
++ return nil;
++}
++
+++ (void) synthesizeMouseEnteredExitedEvents:(NSWindow*)window withType:(NSEventType)eventType {
+
+ NSPoint screenLocation = [NSEvent mouseLocation];
+- NSPoint windowLocation = [self.nsWindow convertScreenToBase: screenLocation];
++ NSPoint windowLocation = [window convertScreenToBase: screenLocation];
+ int modifierFlags = (eventType == NSMouseEntered) ? NSMouseEnteredMask : NSMouseExitedMask;
+
+ NSEvent *mouseEvent = [NSEvent enterExitEventWithType: eventType
+ location: windowLocation
+ modifierFlags: modifierFlags
+ timestamp: 0
+- windowNumber: [self.nsWindow windowNumber]
++ windowNumber: [window windowNumber]
+ context: nil
+ eventNumber: 0
+ trackingNumber: 0
+ userData: nil
+ ];
+
+- [[self.nsWindow contentView] deliverJavaMouseEvent: mouseEvent];
++ [[window contentView] deliverJavaMouseEvent: mouseEvent];
++}
++
+++(void) synthesizeMouseEnteredExitedEventsForAllWindows {
++ NSInteger topmostWindowUnderMouseID = [AWTWindow getTopmostWindowUnderMouseID];
++ NSArray *windows = [NSApp windows];
++ NSWindow *window;
++
++ NSEnumerator *windowEnumerator = [windows objectEnumerator];
++ while ((window = [windowEnumerator nextObject]) != nil) {
++ if ([AWTWindow isAWTWindow: window]) {
++ BOOL isUnderMouse = ([window windowNumber] == topmostWindowUnderMouseID);
++ BOOL mouseIsOver = [[window contentView] mouseIsOver];
++ if (isUnderMouse && !mouseIsOver) {
++ [AWTWindow synthesizeMouseEnteredExitedEvents: window withType:NSMouseEntered];
++ } else if (!isUnderMouse && mouseIsOver) {
++ [AWTWindow synthesizeMouseEnteredExitedEvents: window withType:NSMouseExited];
++ }
++ }
++ }
+ }
+
+ + (NSNumber *) getNSWindowDisplayID_AppKitThread:(NSWindow *)window {
+@@ -979,7 +1001,7 @@
+ // (this will also re-enable screen updates, which were disabled above)
+ // TODO: send PaintEvent
+
+- [window synthesizeMouseEnteredExitedEvents];
++ [AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
+ }];
+
+ JNF_COCOA_EXIT(env);
+@@ -1158,19 +1180,40 @@
+
+ /*
+ * Class: sun_lwawt_macosx_CPlatformWindow
++ * Method: nativeGetTopMostWindowUnderMouse
++ * Signature: (J)V
++ */
++JNIEXPORT jobject
++JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeGetTopmostPlatformWindowUnderMouse
++(JNIEnv *env, jclass clazz)
++{
++ jobject topmostWindowUnderMouse = nil;
++
++ JNF_COCOA_ENTER(env);
++ AWT_ASSERT_APPKIT_THREAD;
++
++ AWTWindow *awtWindow = [AWTWindow getTopmostWindowUnderMouse];
++ if (awtWindow != nil) {
++ topmostWindowUnderMouse = [awtWindow.javaPlatformWindow jObject];
++ }
++
++ JNF_COCOA_EXIT(env);
++
++ return topmostWindowUnderMouse;
++}
++
++/*
++ * Class: sun_lwawt_macosx_CPlatformWindow
+ * Method: nativeSynthesizeMouseEnteredExitedEvents
+ * Signature: (J)V
+ */
+ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents
+-(JNIEnv *env, jclass clazz, jlong windowPtr)
++(JNIEnv *env, jclass clazz)
+ {
+ JNF_COCOA_ENTER(env);
+
+- NSWindow *nsWindow = OBJC(windowPtr);
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
+- AWTWindow *window = (AWTWindow*)[nsWindow delegate];
+-
+- [window synthesizeMouseEnteredExitedEvents];
++ [AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
+ }];
+
+ JNF_COCOA_EXIT(env);
+--- ./jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2009, 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
+@@ -39,6 +39,8 @@
+
+ import sun.security.rsa.*;
+ import sun.security.jca.Providers;
++import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
++import sun.security.util.KeyUtil;
+
+ /**
+ * RSA cipher implementation. Supports RSA en/decryption and signing/verifying
+@@ -91,8 +93,8 @@
+ // padding object
+ private RSAPadding padding;
+
+- // cipher parameter for OAEP padding
+- private OAEPParameterSpec spec = null;
++ // cipher parameter for OAEP padding and TLS RSA premaster secret
++ private AlgorithmParameterSpec spec = null;
+
+ // buffer for the data
+ private byte[] buffer;
+@@ -110,6 +112,9 @@
+ // hash algorithm for OAEP
+ private String oaepHashAlgorithm = "SHA-1";
+
++ // the source of randomness
++ private SecureRandom random;
++
+ public RSACipher() {
+ paddingType = PAD_PKCS1;
+ }
+@@ -175,7 +180,7 @@
+
+ // see JCE spec
+ protected AlgorithmParameters engineGetParameters() {
+- if (spec != null) {
++ if (spec != null && spec instanceof OAEPParameterSpec) {
+ try {
+ AlgorithmParameters params =
+ AlgorithmParameters.getInstance("OAEP", "SunJCE");
+@@ -278,8 +283,13 @@
+ buffer = new byte[n];
+ } else if (paddingType == PAD_PKCS1) {
+ if (params != null) {
+- throw new InvalidAlgorithmParameterException
+- ("Parameters not supported");
++ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
++ throw new InvalidAlgorithmParameterException(
++ "Parameters not supported");
++ }
++
++ spec = params;
++ this.random = random; // for TLS RSA premaster secret
+ }
+ int blockType = (mode <= MODE_DECRYPT) ? RSAPadding.PAD_BLOCKTYPE_2
+ : RSAPadding.PAD_BLOCKTYPE_1;
+@@ -295,19 +305,18 @@
+ throw new InvalidKeyException
+ ("OAEP cannot be used to sign or verify signatures");
+ }
+- OAEPParameterSpec myParams;
+ if (params != null) {
+ if (!(params instanceof OAEPParameterSpec)) {
+ throw new InvalidAlgorithmParameterException
+ ("Wrong Parameters for OAEP Padding");
+ }
+- myParams = (OAEPParameterSpec) params;
++ spec = params;
+ } else {
+- myParams = new OAEPParameterSpec(oaepHashAlgorithm, "MGF1",
++ spec = new OAEPParameterSpec(oaepHashAlgorithm, "MGF1",
+ MGF1ParameterSpec.SHA1, PSource.PSpecified.DEFAULT);
+ }
+ padding = RSAPadding.getInstance(RSAPadding.PAD_OAEP_MGF1, n,
+- random, myParams);
++ random, (OAEPParameterSpec)spec);
+ if (encrypt) {
+ int k = padding.getMaxDataSize();
+ buffer = new byte[k];
+@@ -422,17 +431,40 @@
+ if (wrappedKey.length > buffer.length) {
+ throw new InvalidKeyException("Key is too long for unwrapping");
+ }
++
++ boolean isTlsRsaPremasterSecret =
++ algorithm.equals("TlsRsaPremasterSecret");
++ Exception failover = null;
++ byte[] encoded = null;
++
+ update(wrappedKey, 0, wrappedKey.length);
+ try {
+- byte[] encoded = doFinal();
+- return ConstructKeys.constructKey(encoded, algorithm, type);
++ encoded = doFinal();
+ } catch (BadPaddingException e) {
+- // should not occur
+- throw new InvalidKeyException("Unwrapping failed", e);
++ if (isTlsRsaPremasterSecret) {
++ failover = e;
++ } else {
++ throw new InvalidKeyException("Unwrapping failed", e);
++ }
+ } catch (IllegalBlockSizeException e) {
+ // should not occur, handled with length check above
+ throw new InvalidKeyException("Unwrapping failed", e);
+ }
++
++ if (isTlsRsaPremasterSecret) {
++ if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) {
++ throw new IllegalStateException(
++ "No TlsRsaPremasterSecretParameterSpec specified");
++ }
++
++ // polish the TLS premaster secret
++ encoded = KeyUtil.checkTlsPreMasterSecretKey(
++ ((TlsRsaPremasterSecretParameterSpec)spec).getClientVersion(),
++ ((TlsRsaPremasterSecretParameterSpec)spec).getServerVersion(),
++ random, encoded, (failover != null));
++ }
++
++ return ConstructKeys.constructKey(encoded, algorithm, type);
+ }
+
+ // see JCE spec
+@@ -440,5 +472,4 @@
+ RSAKey rsaKey = RSAKeyFactory.toRSAKey(key);
+ return rsaKey.getModulus().bitLength();
+ }
+-
+ }
+--- ./jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2013, 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
+@@ -56,7 +56,7 @@
+
+ protected void engineInit(AlgorithmParameterSpec params,
+ SecureRandom random) throws InvalidAlgorithmParameterException {
+- if (params instanceof TlsRsaPremasterSecretParameterSpec == false) {
++ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
+ throw new InvalidAlgorithmParameterException(MSG);
+ }
+ this.spec = (TlsRsaPremasterSecretParameterSpec)params;
+@@ -67,21 +67,20 @@
+ throw new InvalidParameterException(MSG);
+ }
+
++ // Only can be used in client side to generate TLS RSA premaster secret.
+ protected SecretKey engineGenerateKey() {
+ if (spec == null) {
+ throw new IllegalStateException(
+ "TlsRsaPremasterSecretGenerator must be initialized");
+ }
+- byte[] b = spec.getEncodedSecret();
+- if (b == null) {
+- if (random == null) {
+- random = new SecureRandom();
+- }
+- b = new byte[48];
+- random.nextBytes(b);
+- b[0] = (byte)spec.getMajorVersion();
+- b[1] = (byte)spec.getMinorVersion();
++
++ if (random == null) {
++ random = new SecureRandom();
+ }
++ byte[] b = new byte[48];
++ random.nextBytes(b);
++ b[0] = (byte)spec.getMajorVersion();
++ b[1] = (byte)spec.getMinorVersion();
+
+ return new SecretKeySpec(b, "TlsRsaPremasterSecret");
+ }
+--- ./jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2006, 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
+@@ -34,22 +34,14 @@
+
+ import javax.management.remote.SubjectDelegationPermission;
+
+-import com.sun.jmx.remote.util.CacheMap;
+-import java.util.ArrayList;
+-import java.util.Collection;
++import java.util.*;
+
+ public class SubjectDelegator {
+- private static final int PRINCIPALS_CACHE_SIZE = 10;
+- private static final int ACC_CACHE_SIZE = 10;
+-
+- private CacheMap<Subject, Principal[]> principalsCache;
+- private CacheMap<Subject, AccessControlContext> accCache;
+-
+ /* Return the AccessControlContext appropriate to execute an
+ operation on behalf of the delegatedSubject. If the
+ authenticatedAccessControlContext does not have permission to
+ delegate to that subject, throw SecurityException. */
+- public synchronized AccessControlContext
++ public AccessControlContext
+ delegatedContext(AccessControlContext authenticatedACC,
+ Subject delegatedSubject,
+ boolean removeCallerContext)
+@@ -58,56 +50,14 @@
+ if (System.getSecurityManager() != null && authenticatedACC == null) {
+ throw new SecurityException("Illegal AccessControlContext: null");
+ }
+- if (principalsCache == null || accCache == null) {
+- principalsCache =
+- new CacheMap<>(PRINCIPALS_CACHE_SIZE);
+- accCache =
+- new CacheMap<>(ACC_CACHE_SIZE);
+- }
+-
+- // Retrieve the principals for the given
+- // delegated subject from the cache
+- //
+- Principal[] delegatedPrincipals = principalsCache.get(delegatedSubject);
+-
+- // Convert the set of principals stored in the
+- // delegated subject into an array of principals
+- // and store it in the cache
+- //
+- if (delegatedPrincipals == null) {
+- delegatedPrincipals =
+- delegatedSubject.getPrincipals().toArray(new Principal[0]);
+- principalsCache.put(delegatedSubject, delegatedPrincipals);
+- }
+-
+- // Retrieve the access control context for the
+- // given delegated subject from the cache
+- //
+- AccessControlContext delegatedACC = accCache.get(delegatedSubject);
+-
+- // Build the access control context to be used
+- // when executing code as the delegated subject
+- // and store it in the cache
+- //
+- if (delegatedACC == null) {
+- if (removeCallerContext) {
+- delegatedACC =
+- JMXSubjectDomainCombiner.getDomainCombinerContext(
+- delegatedSubject);
+- } else {
+- delegatedACC =
+- JMXSubjectDomainCombiner.getContext(delegatedSubject);
+- }
+- accCache.put(delegatedSubject, delegatedACC);
+- }
+
+ // Check if the subject delegation permission allows the
+ // authenticated subject to assume the identity of each
+ // principal in the delegated subject
+ //
+- final Principal[] dp = delegatedPrincipals;
+- final Collection<Permission> permissions = new ArrayList<>(dp.length);
+- for(Principal p : dp) {
++ Collection<Principal> ps = getSubjectPrincipals(delegatedSubject);
++ final Collection<Permission> permissions = new ArrayList<>(ps.size());
++ for(Principal p : ps) {
+ final String pname = p.getClass().getName() + "." + p.getName();
+ permissions.add(new SubjectDelegationPermission(pname));
+ }
+@@ -122,7 +72,15 @@
+ };
+ AccessController.doPrivileged(action, authenticatedACC);
+
+- return delegatedACC;
++ return getDelegatedAcc(delegatedSubject, removeCallerContext);
++ }
++
++ private AccessControlContext getDelegatedAcc(Subject delegatedSubject, boolean removeCallerContext) {
++ if (removeCallerContext) {
++ return JMXSubjectDomainCombiner.getDomainCombinerContext(delegatedSubject);
++ } else {
++ return JMXSubjectDomainCombiner.getContext(delegatedSubject);
++ }
+ }
+
+ /**
+@@ -137,11 +95,9 @@
+ public static synchronized boolean
+ checkRemoveCallerContext(Subject subject) {
+ try {
+- final Principal[] dp =
+- subject.getPrincipals().toArray(new Principal[0]);
+- for (int i = 0 ; i < dp.length ; i++) {
++ for (Principal p : getSubjectPrincipals(subject)) {
+ final String pname =
+- dp[i].getClass().getName() + "." + dp[i].getName();
++ p.getClass().getName() + "." + p.getName();
+ final Permission sdp =
+ new SubjectDelegationPermission(pname);
+ AccessController.checkPermission(sdp);
+@@ -151,4 +107,19 @@
+ }
+ return true;
+ }
++
++ /**
++ * Retrieves the {@linkplain Subject} principals
++ * @param subject The subject
++ * @return If the {@code Subject} is immutable it will return the principals directly.
++ * If the {@code Subject} is mutable it will create an unmodifiable copy.
++ */
++ private static Collection<Principal> getSubjectPrincipals(Subject subject) {
++ if (subject.isReadOnly()) {
++ return subject.getPrincipals();
++ }
++
++ List<Principal> principals = Arrays.asList(subject.getPrincipals().toArray(new Principal[0]));
++ return Collections.unmodifiableList(principals);
++ }
+ }
+--- ./jdk/src/share/classes/com/sun/jmx/remote/util/CacheMap.java Wed May 07 19:26:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,121 +0,0 @@
+-/*
+- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+- * 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.jmx.remote.util;
+-
+-import java.lang.ref.SoftReference;
+-import java.util.Iterator;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.WeakHashMap;
+-
+-import com.sun.jmx.mbeanserver.Util;
+-
+-/**
+- * <p>Like WeakHashMap, except that the keys of the <em>n</em> most
+- * recently-accessed entries are kept as {@link SoftReference soft
+- * references}. Accessing an element means creating it, or retrieving
+- * it with {@link #get(Object) get}. Because these entries are kept
+- * with soft references, they will tend to remain even if their keys
+- * are not referenced elsewhere. But if memory is short, they will
+- * be removed.</p>
+- */
+-public class CacheMap<K, V> extends WeakHashMap<K, V> {
+- /**
+- * <p>Create a <code>CacheMap</code> that can keep up to
+- * <code>nSoftReferences</code> as soft references.</p>
+- *
+- * @param nSoftReferences Maximum number of keys to keep as soft
+- * references. Access times for {@link #get(Object) get} and
+- * {@link #put(Object, Object) put} have a component that scales
+- * linearly with <code>nSoftReferences</code>, so this value
+- * should not be too great.
+- *
+- * @throws IllegalArgumentException if
+- * <code>nSoftReferences</code> is negative.
+- */
+- public CacheMap(int nSoftReferences) {
+- if (nSoftReferences < 0) {
+- throw new IllegalArgumentException("nSoftReferences = " +
+- nSoftReferences);
+- }
+- this.nSoftReferences = nSoftReferences;
+- }
+-
+- public V put(K key, V value) {
+- cache(key);
+- return super.put(key, value);
+- }
+-
+- public V get(Object key) {
+- cache(Util.<K>cast(key));
+- return super.get(key);
+- }
+-
+- /* We don't override remove(Object) or try to do something with
+- the map's iterators to detect removal. So we may keep useless
+- entries in the soft reference list for keys that have since
+- been removed. The assumption is that entries are added to the
+- cache but never removed. But the behavior is not wrong if
+- they are in fact removed -- the caching is just less
+- performant. */
+-
+- private void cache(K key) {
+- Iterator<SoftReference<K>> it = cache.iterator();
+- while (it.hasNext()) {
+- SoftReference<K> sref = it.next();
+- K key1 = sref.get();
+- if (key1 == null)
+- it.remove();
+- else if (key.equals(key1)) {
+- // Move this element to the head of the LRU list
+- it.remove();
+- cache.add(0, sref);
+- return;
+- }
+- }
+-
+- int size = cache.size();
+- if (size == nSoftReferences) {
+- if (size == 0)
+- return; // degenerate case, equivalent to WeakHashMap
+- it.remove();
+- }
+-
+- cache.add(0, new SoftReference<K>(key));
+- }
+-
+- /* List of soft references for the most-recently referenced keys.
+- The list is in most-recently-used order, i.e. the first element
+- is the most-recently referenced key. There are never more than
+- nSoftReferences elements of this list.
+-
+- If we didn't care about J2SE 1.3 compatibility, we could use
+- LinkedHashSet in conjunction with a subclass of SoftReference
+- whose equals and hashCode reflect the referent. */
+- private final LinkedList<SoftReference<K>> cache =
+- new LinkedList<SoftReference<K>>();
+- private final int nSoftReferences;
+-}
+--- ./jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 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
+@@ -32,6 +32,7 @@
+ import java.security.NoSuchAlgorithmException;
+ import java.security.MessageDigest;
+
++import java.util.Arrays;
+ import java.util.logging.Logger;
+
+ /**
+@@ -159,7 +160,7 @@
+ MessageDigest md5 = MessageDigest.getInstance("MD5");
+
+ /* digest the key if longer than 64 bytes */
+- if (key.length > 64) {
++ if (key.length > MD5_BLOCKSIZE) {
+ key = md5.digest(key);
+ }
+
+@@ -169,13 +170,9 @@
+ int i;
+
+ /* store key in pads */
+- for (i = 0; i < MD5_BLOCKSIZE; i++) {
+- for ( ; i < key.length; i++) {
+- ipad[i] = key[i];
+- opad[i] = key[i];
+- }
+- ipad[i] = 0x00;
+- opad[i] = 0x00;
++ for (i = 0; i < key.length; i++) {
++ ipad[i] = key[i];
++ opad[i] = key[i];
+ }
+
+ /* XOR key with pads */
+@@ -207,6 +204,11 @@
+ }
+ }
+
++ Arrays.fill(ipad, (byte)0);
++ Arrays.fill(opad, (byte)0);
++ ipad = null;
++ opad = null;
++
+ return (digestString.toString());
+ }
+
+--- ./jdk/src/share/classes/java/awt/Component.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/awt/Component.java Wed Apr 16 12:37:49 2014 +0400
+@@ -7922,7 +7922,7 @@
+ res = toFocus.requestFocusInWindow(CausedFocusEvent.Cause.TRAVERSAL_BACKWARD);
+ }
+ }
+- if (!res) {
++ if (clearOnFailure && !res) {
+ if (focusLog.isLoggable(PlatformLogger.FINER)) {
+ focusLog.finer("clear global focus owner");
+ }
+--- ./jdk/src/share/classes/java/awt/KeyboardFocusManager.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/awt/KeyboardFocusManager.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2011, 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
+@@ -248,15 +248,7 @@
+ public static void setCurrentKeyboardFocusManager(
+ KeyboardFocusManager newManager) throws SecurityException
+ {
+- SecurityManager security = System.getSecurityManager();
+- if (security != null) {
+- if (replaceKeyboardFocusManagerPermission == null) {
+- replaceKeyboardFocusManagerPermission =
+- new AWTPermission("replaceKeyboardFocusManager");
+- }
+- security.
+- checkPermission(replaceKeyboardFocusManagerPermission);
+- }
++ checkReplaceKFMPermission();
+
+ KeyboardFocusManager oldManager = null;
+
+@@ -508,7 +500,7 @@
+ */
+ protected Component getGlobalFocusOwner() throws SecurityException {
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+ return focusOwner;
+ }
+ }
+@@ -543,7 +535,7 @@
+
+ if (focusOwner == null || focusOwner.isFocusable()) {
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+
+ oldFocusOwner = getFocusOwner();
+
+@@ -595,7 +587,7 @@
+ */
+ public void clearGlobalFocusOwner() {
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+ }
+ if (!GraphicsEnvironment.isHeadless()) {
+ // Toolkit must be fully initialized, otherwise
+@@ -676,7 +668,7 @@
+ throws SecurityException
+ {
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+ return permanentFocusOwner;
+ }
+ }
+@@ -712,7 +704,7 @@
+
+ if (permanentFocusOwner == null || permanentFocusOwner.isFocusable()) {
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+
+ oldPermanentFocusOwner = getPermanentFocusOwner();
+
+@@ -779,7 +771,7 @@
+ */
+ protected Window getGlobalFocusedWindow() throws SecurityException {
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+ return focusedWindow;
+ }
+ }
+@@ -811,7 +803,7 @@
+
+ if (focusedWindow == null || focusedWindow.isFocusableWindow()) {
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+
+ oldFocusedWindow = getFocusedWindow();
+
+@@ -879,7 +871,7 @@
+ */
+ protected Window getGlobalActiveWindow() throws SecurityException {
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+ return activeWindow;
+ }
+ }
+@@ -909,7 +901,7 @@
+ protected void setGlobalActiveWindow(Window activeWindow) {
+ Window oldActiveWindow;
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+
+ oldActiveWindow = getActiveWindow();
+ if (focusLog.isLoggable(PlatformLogger.FINER)) {
+@@ -1205,7 +1197,7 @@
+ throws SecurityException
+ {
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+ return currentFocusCycleRoot;
+ }
+ }
+@@ -1230,7 +1222,7 @@
+ Container oldFocusCycleRoot;
+
+ synchronized (KeyboardFocusManager.class) {
+- checkCurrentKFMSecurity();
++ checkKFMSecurity();
+
+ oldFocusCycleRoot = getCurrentFocusCycleRoot();
+ currentFocusCycleRoot = newFocusCycleRoot;
+@@ -2368,7 +2360,8 @@
+ focusLog.finest("Request {0}", String.valueOf(hwFocusRequest));
+ }
+ if (hwFocusRequest == null &&
+- heavyweight == nativeFocusOwner)
++ heavyweight == nativeFocusOwner &&
++ heavyweight.getContainingWindow() == nativeFocusedWindow)
+ {
+ if (descendant == currentFocusOwner) {
+ // Redundant request.
+@@ -3050,13 +3043,36 @@
+ }
+ }
+
+- private void checkCurrentKFMSecurity() {
++ private static void checkReplaceKFMPermission()
++ throws SecurityException
++ {
++ SecurityManager security = System.getSecurityManager();
++ if (security != null) {
++ if (replaceKeyboardFocusManagerPermission == null) {
++ replaceKeyboardFocusManagerPermission =
++ new AWTPermission("replaceKeyboardFocusManager");
++ }
++ security.
++ checkPermission(replaceKeyboardFocusManagerPermission);
++ }
++ }
++
++ // Checks if this KeyboardFocusManager instance is the current KFM,
++ // or otherwise checks if the calling thread has "replaceKeyboardFocusManager"
++ // permission. Here's the reasoning to do so:
++ //
++ // A system KFM instance (which is the current KFM by default) may have no
++ // "replaceKFM" permission when a client code is on the call stack beneath,
++ // but still it should be able to execute the methods protected by this check
++ // due to the system KFM is trusted (and so it does like "privileged").
++ //
++ // If this KFM instance is not the current KFM but the client code has all
++ // permissions we can't throw SecurityException because it would contradict
++ // the security concepts. In this case the trusted client code is responsible
++ // for calling the secured methods from KFM instance which is not current.
++ private void checkKFMSecurity() {
+ if (this != getCurrentKeyboardFocusManager()) {
+- if (focusLog.isLoggable(PlatformLogger.FINER)) {
+- focusLog.finer("This manager is " + this +
+- ", current is " + getCurrentKeyboardFocusManager());
+- }
+- throw new SecurityException(notPrivileged);
++ checkReplaceKFMPermission();
+ }
+ }
+ }
+--- ./jdk/src/share/classes/java/io/ObjectOutputStream.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/io/ObjectOutputStream.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1254,7 +1254,7 @@
+ }
+
+ bout.setBlockDataMode(true);
+- if (isCustomSubclass()) {
++ if (cl != null && isCustomSubclass()) {
+ ReflectUtil.checkPackageAccess(cl);
+ }
+ annotateProxyClass(cl);
+@@ -1283,7 +1283,7 @@
+
+ Class cl = desc.forClass();
+ bout.setBlockDataMode(true);
+- if (isCustomSubclass()) {
++ if (cl != null && isCustomSubclass()) {
+ ReflectUtil.checkPackageAccess(cl);
+ }
+ annotateClass(cl);
+--- ./jdk/src/share/classes/java/lang/Class.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/Class.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1994, 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
+@@ -2338,44 +2338,110 @@
+ }
+
+ /**
++ * Atomic operations support.
++ */
++ private static class Atomic {
++ // initialize Unsafe machinery here, since we need to call Class.class instance method
++ // and have to avoid calling it in the static initializer of the Class class...
++ private static final Unsafe unsafe = Unsafe.getUnsafe();
++ // offset of Class.reflectionData instance field
++ private static final long reflectionDataOffset;
++ // offset of Class.annotationType instance field
++ private static final long annotationTypeOffset;
++
++ static {
++ Field[] fields = Class.class.getDeclaredFields0(false); // bypass caches
++ reflectionDataOffset = objectFieldOffset(fields, "reflectionData");
++ annotationTypeOffset = objectFieldOffset(fields, "annotationType");
++ }
++
++ private static long objectFieldOffset(Field[] fields, String fieldName) {
++ Field field = searchFields(fields, fieldName);
++ if (field == null) {
++ throw new Error("No " + fieldName + " field found in java.lang.Class");
++ }
++ return unsafe.objectFieldOffset(field);
++ }
++
++ static <T> boolean casReflectionData(Class<?> clazz,
++ SoftReference<ReflectionData<T>> oldData,
++ SoftReference<ReflectionData<T>> newData) {
++ return unsafe.compareAndSwapObject(clazz, reflectionDataOffset, oldData, newData);
++ }
++
++ static <T> boolean casAnnotationType(Class<?> clazz,
++ AnnotationType oldType,
++ AnnotationType newType) {
++ return unsafe.compareAndSwapObject(clazz, annotationTypeOffset, oldType, newType);
++ }
++ }
++
++ /**
+ * Reflection support.
+ */
+
+ // Caches for certain reflective results
+ private static boolean useCaches = true;
+- private volatile transient SoftReference<Field[]> declaredFields;
+- private volatile transient SoftReference<Field[]> publicFields;
+- private volatile transient SoftReference<Method[]> declaredMethods;
+- private volatile transient SoftReference<Method[]> publicMethods;
+- private volatile transient SoftReference<Constructor<T>[]> declaredConstructors;
+- private volatile transient SoftReference<Constructor<T>[]> publicConstructors;
+- // Intermediate results for getFields and getMethods
+- private volatile transient SoftReference<Field[]> declaredPublicFields;
+- private volatile transient SoftReference<Method[]> declaredPublicMethods;
++
++ // reflection data that might get invalidated when JVM TI RedefineClasses() is called
++ static class ReflectionData<T> {
++ volatile Field[] declaredFields;
++ volatile Field[] publicFields;
++ volatile Method[] declaredMethods;
++ volatile Method[] publicMethods;
++ volatile Constructor<T>[] declaredConstructors;
++ volatile Constructor<T>[] publicConstructors;
++ // Intermediate results for getFields and getMethods
++ volatile Field[] declaredPublicFields;
++ volatile Method[] declaredPublicMethods;
++ // Value of classRedefinedCount when we created this ReflectionData instance
++ final int redefinedCount;
++
++ ReflectionData(int redefinedCount) {
++ this.redefinedCount = redefinedCount;
++ }
++ }
++
++ private volatile transient SoftReference<ReflectionData<T>> reflectionData;
+
+ // Incremented by the VM on each call to JVM TI RedefineClasses()
+ // that redefines this class or a superclass.
+ private volatile transient int classRedefinedCount = 0;
+
+- // Value of classRedefinedCount when we last cleared the cached values
+- // that are sensitive to class redefinition.
+- private volatile transient int lastRedefinedCount = 0;
++ // Lazily create and cache ReflectionData
++ private ReflectionData<T> reflectionData() {
++ SoftReference<ReflectionData<T>> reflectionData = this.reflectionData;
++ int classRedefinedCount = this.classRedefinedCount;
++ ReflectionData<T> rd;
++ if (useCaches &&
++ reflectionData != null &&
++ (rd = reflectionData.get()) != null &&
++ rd.redefinedCount == classRedefinedCount) {
++ return rd;
++ }
++ // else no SoftReference or cleared SoftReference or stale ReflectionData
++ // -> create and replace new instance
++ return newReflectionData(reflectionData, classRedefinedCount);
++ }
+
+- // Clears cached values that might possibly have been obsoleted by
+- // a class redefinition.
+- private void clearCachesOnClassRedefinition() {
+- if (lastRedefinedCount != classRedefinedCount) {
+- declaredFields = publicFields = declaredPublicFields = null;
+- declaredMethods = publicMethods = declaredPublicMethods = null;
+- declaredConstructors = publicConstructors = null;
+- annotations = declaredAnnotations = null;
++ private ReflectionData<T> newReflectionData(SoftReference<ReflectionData<T>> oldReflectionData,
++ int classRedefinedCount) {
++ if (!useCaches) return null;
+
+- // Use of "volatile" (and synchronization by caller in the case
+- // of annotations) ensures that no thread sees the update to
+- // lastRedefinedCount before seeing the caches cleared.
+- // We do not guard against brief windows during which multiple
+- // threads might redundantly work to fill an empty cache.
+- lastRedefinedCount = classRedefinedCount;
++ while (true) {
++ ReflectionData<T> rd = new ReflectionData<>(classRedefinedCount);
++ // try to CAS it...
++ if (Atomic.casReflectionData(this, oldReflectionData, new SoftReference<>(rd))) {
++ return rd;
++ }
++ // else retry
++ oldReflectionData = this.reflectionData;
++ classRedefinedCount = this.classRedefinedCount;
++ if (oldReflectionData != null &&
++ (rd = oldReflectionData.get()) != null &&
++ rd.redefinedCount == classRedefinedCount) {
++ return rd;
++ }
+ }
+ }
+
+@@ -2403,7 +2469,7 @@
+ }
+
+ // Annotations handling
+- private native byte[] getRawAnnotations();
++ native byte[] getRawAnnotations();
+
+ native ConstantPool getConstantPool();
+
+@@ -2418,27 +2484,19 @@
+ // via ReflectionFactory.copyField.
+ private Field[] privateGetDeclaredFields(boolean publicOnly) {
+ checkInitted();
+- Field[] res = null;
+- if (useCaches) {
+- clearCachesOnClassRedefinition();
+- if (publicOnly) {
+- if (declaredPublicFields != null) {
+- res = declaredPublicFields.get();
+- }
+- } else {
+- if (declaredFields != null) {
+- res = declaredFields.get();
+- }
+- }
++ Field[] res;
++ ReflectionData<T> rd = reflectionData();
++ if (rd != null) {
++ res = publicOnly ? rd.declaredPublicFields : rd.declaredFields;
+ if (res != null) return res;
+ }
+ // No cached value available; request value from VM
+ res = Reflection.filterFields(this, getDeclaredFields0(publicOnly));
+- if (useCaches) {
++ if (rd != null) {
+ if (publicOnly) {
+- declaredPublicFields = new SoftReference<>(res);
++ rd.declaredPublicFields = res;
+ } else {
+- declaredFields = new SoftReference<>(res);
++ rd.declaredFields = res;
+ }
+ }
+ return res;
+@@ -2449,12 +2507,10 @@
+ // via ReflectionFactory.copyField.
+ private Field[] privateGetPublicFields(Set<Class<?>> traversedInterfaces) {
+ checkInitted();
+- Field[] res = null;
+- if (useCaches) {
+- clearCachesOnClassRedefinition();
+- if (publicFields != null) {
+- res = publicFields.get();
+- }
++ Field[] res;
++ ReflectionData<T> rd = reflectionData();
++ if (rd != null) {
++ res = rd.publicFields;
+ if (res != null) return res;
+ }
+
+@@ -2487,8 +2543,8 @@
+
+ res = new Field[fields.size()];
+ fields.toArray(res);
+- if (useCaches) {
+- publicFields = new SoftReference<>(res);
++ if (rd != null) {
++ rd.publicFields = res;
+ }
+ return res;
+ }
+@@ -2511,18 +2567,10 @@
+ // instead be copied via ReflectionFactory.copyConstructor.
+ private Constructor<T>[] privateGetDeclaredConstructors(boolean publicOnly) {
+ checkInitted();
+- Constructor<T>[] res = null;
+- if (useCaches) {
+- clearCachesOnClassRedefinition();
+- if (publicOnly) {
+- if (publicConstructors != null) {
+- res = publicConstructors.get();
+- }
+- } else {
+- if (declaredConstructors != null) {
+- res = declaredConstructors.get();
+- }
+- }
++ Constructor<T>[] res;
++ ReflectionData<T> rd = reflectionData();
++ if (rd != null) {
++ res = publicOnly ? rd.publicConstructors : rd.declaredConstructors;
+ if (res != null) return res;
+ }
+ // No cached value available; request value from VM
+@@ -2531,11 +2579,11 @@
+ } else {
+ res = getDeclaredConstructors0(publicOnly);
+ }
+- if (useCaches) {
++ if (rd != null) {
+ if (publicOnly) {
+- publicConstructors = new SoftReference<>(res);
++ rd.publicConstructors = res;
+ } else {
+- declaredConstructors = new SoftReference<>(res);
++ rd.declaredConstructors = res;
+ }
+ }
+ return res;
+@@ -2552,27 +2600,19 @@
+ // via ReflectionFactory.copyMethod.
+ private Method[] privateGetDeclaredMethods(boolean publicOnly) {
+ checkInitted();
+- Method[] res = null;
+- if (useCaches) {
+- clearCachesOnClassRedefinition();
+- if (publicOnly) {
+- if (declaredPublicMethods != null) {
+- res = declaredPublicMethods.get();
+- }
+- } else {
+- if (declaredMethods != null) {
+- res = declaredMethods.get();
+- }
+- }
++ Method[] res;
++ ReflectionData<T> rd = reflectionData();
++ if (rd != null) {
++ res = publicOnly ? rd.declaredPublicMethods : rd.declaredMethods;
+ if (res != null) return res;
+ }
+ // No cached value available; request value from VM
+ res = Reflection.filterMethods(this, getDeclaredMethods0(publicOnly));
+- if (useCaches) {
++ if (rd != null) {
+ if (publicOnly) {
+- declaredPublicMethods = new SoftReference<>(res);
++ rd.declaredPublicMethods = res;
+ } else {
+- declaredMethods = new SoftReference<>(res);
++ rd.declaredMethods = res;
+ }
+ }
+ return res;
+@@ -2674,12 +2714,10 @@
+ // via ReflectionFactory.copyMethod.
+ private Method[] privateGetPublicMethods() {
+ checkInitted();
+- Method[] res = null;
+- if (useCaches) {
+- clearCachesOnClassRedefinition();
+- if (publicMethods != null) {
+- res = publicMethods.get();
+- }
++ Method[] res;
++ ReflectionData<T> rd = reflectionData();
++ if (rd != null) {
++ res = rd.publicMethods;
+ if (res != null) return res;
+ }
+
+@@ -2727,8 +2765,8 @@
+ methods.addAllIfNotPresent(inheritedMethods);
+ methods.compactAndTrim();
+ res = methods.getArray();
+- if (useCaches) {
+- publicMethods = new SoftReference<>(res);
++ if (rd != null) {
++ rd.publicMethods = res;
+ }
+ return res;
+ }
+@@ -2738,7 +2776,7 @@
+ // Helpers for fetchers of one field, method, or constructor
+ //
+
+- private Field searchFields(Field[] fields, String name) {
++ private static Field searchFields(Field[] fields, String name) {
+ String internedName = name.intern();
+ for (int i = 0; i < fields.length; i++) {
+ if (fields[i].getName() == internedName) {
+@@ -2756,7 +2794,7 @@
+ // of Field objects which have to be created for the common
+ // case where the field being requested is declared in the
+ // class which is being queried.
+- Field res = null;
++ Field res;
+ // Search declared public fields
+ if ((res = searchFields(privateGetDeclaredFields(true), name)) != null) {
+ return res;
+@@ -2808,7 +2846,7 @@
+ // number of Method objects which have to be created for the
+ // common case where the method being requested is declared in
+ // the class which is being queried.
+- Method res = null;
++ Method res;
+ // Search declared public methods
+ if ((res = searchMethods(privateGetDeclaredMethods(true),
+ name,
+@@ -3209,9 +3247,20 @@
+ // Annotations cache
+ private transient Map<Class<? extends Annotation>, Annotation> annotations;
+ private transient Map<Class<? extends Annotation>, Annotation> declaredAnnotations;
++ // Value of classRedefinedCount when we last cleared the cached annotations and declaredAnnotations fields
++ private transient int lastAnnotationsRedefinedCount = 0;
++
++ // Clears cached values that might possibly have been obsoleted by
++ // a class redefinition.
++ private void clearAnnotationCachesOnClassRedefinition() {
++ if (lastAnnotationsRedefinedCount != classRedefinedCount) {
++ annotations = declaredAnnotations = null;
++ lastAnnotationsRedefinedCount = classRedefinedCount;
++ }
++ }
+
+ private synchronized void initAnnotationsIfNecessary() {
+- clearCachesOnClassRedefinition();
++ clearAnnotationCachesOnClassRedefinition();
+ if (annotations != null)
+ return;
+ declaredAnnotations = AnnotationParser.parseAnnotations(
+@@ -3233,10 +3282,11 @@
+
+ // Annotation types cache their internal (AnnotationType) form
+
+- private AnnotationType annotationType;
++ @SuppressWarnings("UnusedDeclaration")
++ private volatile transient AnnotationType annotationType;
+
+- void setAnnotationType(AnnotationType type) {
+- annotationType = type;
++ boolean casAnnotationType(AnnotationType oldType, AnnotationType newType) {
++ return Atomic.casAnnotationType(this, oldType, newType);
+ }
+
+ AnnotationType getAnnotationType() {
+--- ./jdk/src/share/classes/java/lang/ProcessBuilder.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/ProcessBuilder.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1018,6 +1018,12 @@
+
+ String dir = directory == null ? null : directory.toString();
+
++ for (int i = 1; i < cmdarray.length; i++) {
++ if (cmdarray[i].indexOf('\u0000') >= 0) {
++ throw new IOException("invalid null character in command");
++ }
++ }
++
+ try {
+ return ProcessImpl.start(cmdarray,
+ environment,
+--- ./jdk/src/share/classes/java/lang/System.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/System.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1994, 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
+@@ -1178,12 +1178,15 @@
+ public sun.reflect.ConstantPool getConstantPool(Class klass) {
+ return klass.getConstantPool();
+ }
+- public void setAnnotationType(Class klass, AnnotationType type) {
+- klass.setAnnotationType(type);
++ public boolean casAnnotationType(Class<?> klass, AnnotationType oldType, AnnotationType newType) {
++ return klass.casAnnotationType(oldType, newType);
+ }
+ public AnnotationType getAnnotationType(Class klass) {
+ return klass.getAnnotationType();
+ }
++ public byte[] getRawClassAnnotations(Class<?> klass) {
++ return klass.getRawAnnotations();
++ }
+ public <E extends Enum<E>>
+ E[] getEnumConstantsShared(Class<E> klass) {
+ return klass.getEnumConstantsShared();
+--- ./jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java Wed Apr 16 12:37:49 2014 +0400
+@@ -243,12 +243,12 @@
+ assert(names.length == nameCursor);
+ if (doesAlloc) {
+ // names = { argx,y,z,... new C, init method }
+- names[NEW_OBJ] = new Name(NF_allocateInstance, names[DMH_THIS]);
+- names[GET_MEMBER] = new Name(NF_constructorMethod, names[DMH_THIS]);
++ names[NEW_OBJ] = new Name(Lazy.NF_allocateInstance, names[DMH_THIS]);
++ names[GET_MEMBER] = new Name(Lazy.NF_constructorMethod, names[DMH_THIS]);
+ } else if (needsInit) {
+- names[GET_MEMBER] = new Name(NF_internalMemberNameEnsureInit, names[DMH_THIS]);
++ names[GET_MEMBER] = new Name(Lazy.NF_internalMemberNameEnsureInit, names[DMH_THIS]);
+ } else {
+- names[GET_MEMBER] = new Name(NF_internalMemberName, names[DMH_THIS]);
++ names[GET_MEMBER] = new Name(Lazy.NF_internalMemberName, names[DMH_THIS]);
+ }
+ Object[] outArgs = Arrays.copyOfRange(names, ARG_BASE, GET_MEMBER+1, Object[].class);
+ assert(outArgs[outArgs.length-1] == names[GET_MEMBER]); // look, shifted args!
+@@ -596,18 +596,18 @@
+ final int RESULT = nameCursor-1; // either the call or the cast
+ Name[] names = arguments(nameCursor - ARG_LIMIT, mtype.invokerType());
+ if (needsInit)
+- names[INIT_BAR] = new Name(NF_ensureInitialized, names[DMH_THIS]);
++ names[INIT_BAR] = new Name(Lazy.NF_ensureInitialized, names[DMH_THIS]);
+ if (needsCast && !isGetter)
+- names[PRE_CAST] = new Name(NF_checkCast, names[DMH_THIS], names[SET_VALUE]);
++ names[PRE_CAST] = new Name(Lazy.NF_checkCast, names[DMH_THIS], names[SET_VALUE]);
+ Object[] outArgs = new Object[1 + linkerType.parameterCount()];
+ assert(outArgs.length == (isGetter ? 3 : 4));
+ outArgs[0] = UNSAFE;
+ if (isStatic) {
+- outArgs[1] = names[F_HOLDER] = new Name(NF_staticBase, names[DMH_THIS]);
+- outArgs[2] = names[F_OFFSET] = new Name(NF_staticOffset, names[DMH_THIS]);
++ outArgs[1] = names[F_HOLDER] = new Name(Lazy.NF_staticBase, names[DMH_THIS]);
++ outArgs[2] = names[F_OFFSET] = new Name(Lazy.NF_staticOffset, names[DMH_THIS]);
+ } else {
+- outArgs[1] = names[OBJ_CHECK] = new Name(NF_checkBase, names[OBJ_BASE]);
+- outArgs[2] = names[F_OFFSET] = new Name(NF_fieldOffset, names[DMH_THIS]);
++ outArgs[1] = names[OBJ_CHECK] = new Name(Lazy.NF_checkBase, names[OBJ_BASE]);
++ outArgs[2] = names[F_OFFSET] = new Name(Lazy.NF_fieldOffset, names[DMH_THIS]);
+ }
+ if (!isGetter) {
+ outArgs[3] = (needsCast ? names[PRE_CAST] : names[SET_VALUE]);
+@@ -615,7 +615,7 @@
+ for (Object a : outArgs) assert(a != null);
+ names[LINKER_CALL] = new Name(linker, outArgs);
+ if (needsCast && isGetter)
+- names[POST_CAST] = new Name(NF_checkCast, names[DMH_THIS], names[LINKER_CALL]);
++ names[POST_CAST] = new Name(Lazy.NF_checkCast, names[DMH_THIS], names[LINKER_CALL]);
+ for (Name n : names) assert(n != null);
+ String fieldOrStatic = (isStatic ? "Static" : "Field");
+ String lambdaName = (linkerName + fieldOrStatic); // significant only for debugging
+@@ -624,48 +624,54 @@
+ return new LambdaForm(lambdaName, ARG_LIMIT, names, RESULT);
+ }
+
+- private static final NamedFunction
+- NF_internalMemberName,
+- NF_internalMemberNameEnsureInit,
+- NF_ensureInitialized,
+- NF_fieldOffset,
+- NF_checkBase,
+- NF_staticBase,
+- NF_staticOffset,
+- NF_checkCast,
+- NF_allocateInstance,
+- NF_constructorMethod;
+- static {
+- try {
+- NamedFunction nfs[] = {
+- NF_internalMemberName = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("internalMemberName", Object.class)),
+- NF_internalMemberNameEnsureInit = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("internalMemberNameEnsureInit", Object.class)),
+- NF_ensureInitialized = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("ensureInitialized", Object.class)),
+- NF_fieldOffset = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("fieldOffset", Object.class)),
+- NF_checkBase = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("checkBase", Object.class)),
+- NF_staticBase = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("staticBase", Object.class)),
+- NF_staticOffset = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("staticOffset", Object.class)),
+- NF_checkCast = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("checkCast", Object.class, Object.class)),
+- NF_allocateInstance = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("allocateInstance", Object.class)),
+- NF_constructorMethod = new NamedFunction(DirectMethodHandle.class
+- .getDeclaredMethod("constructorMethod", Object.class))
+- };
+- for (NamedFunction nf : nfs) {
+- // Each nf must be statically invocable or we get tied up in our bootstraps.
+- assert(InvokerBytecodeGenerator.isStaticallyInvocable(nf.member)) : nf;
+- nf.resolve();
++ /**
++ * Pre-initialized NamedFunctions for bootstrapping purposes.
++ * Factored in an inner class to delay initialization until first usage.
++ */
++ private static class Lazy {
++ static final NamedFunction
++ NF_internalMemberName,
++ NF_internalMemberNameEnsureInit,
++ NF_ensureInitialized,
++ NF_fieldOffset,
++ NF_checkBase,
++ NF_staticBase,
++ NF_staticOffset,
++ NF_checkCast,
++ NF_allocateInstance,
++ NF_constructorMethod;
++ static {
++ try {
++ NamedFunction nfs[] = {
++ NF_internalMemberName = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("internalMemberName", Object.class)),
++ NF_internalMemberNameEnsureInit = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("internalMemberNameEnsureInit", Object.class)),
++ NF_ensureInitialized = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("ensureInitialized", Object.class)),
++ NF_fieldOffset = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("fieldOffset", Object.class)),
++ NF_checkBase = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("checkBase", Object.class)),
++ NF_staticBase = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("staticBase", Object.class)),
++ NF_staticOffset = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("staticOffset", Object.class)),
++ NF_checkCast = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("checkCast", Object.class, Object.class)),
++ NF_allocateInstance = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("allocateInstance", Object.class)),
++ NF_constructorMethod = new NamedFunction(DirectMethodHandle.class
++ .getDeclaredMethod("constructorMethod", Object.class))
++ };
++ for (NamedFunction nf : nfs) {
++ // Each nf must be statically invocable or we get tied up in our bootstraps.
++ assert(InvokerBytecodeGenerator.isStaticallyInvocable(nf.member)) : nf;
++ nf.resolve();
++ }
++ } catch (ReflectiveOperationException ex) {
++ throw newInternalError(ex);
+ }
+- } catch (ReflectiveOperationException ex) {
+- throw newInternalError(ex);
+ }
+ }
+ }
+--- ./jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Wed Apr 16 12:37:49 2014 +0400
+@@ -613,6 +613,12 @@
+ return false; // inner class of some sort
+ if (cls.getClassLoader() != MethodHandle.class.getClassLoader())
+ return false; // not on BCP
++ MethodType mtype = member.getMethodOrFieldType();
++ if (!isStaticallyNameable(mtype.returnType()))
++ return false;
++ for (Class<?> ptype : mtype.parameterArray())
++ if (!isStaticallyNameable(ptype))
++ return false;
+ if (!member.isPrivate() && VerifyAccess.isSamePackage(MethodHandle.class, cls))
+ return true; // in java.lang.invoke package
+ if (member.isPublic() && isStaticallyNameable(cls))
+--- ./jdk/src/share/classes/java/lang/invoke/Invokers.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/Invokers.java Wed Apr 16 12:37:49 2014 +0400
+@@ -318,6 +318,7 @@
+ // let mt=TYPEOF(a*:R), tmh=asType(mh, mt);
+ // tmh.invokeBasic(a*)
+ outArgs = Arrays.copyOfRange(names, CALL_MH, OUTARG_LIMIT, Object[].class);
++ outArgs[0] = names[CHECK_TYPE];
+ outCallType = mtype;
+ } else {
+ names[CHECK_TYPE] = new Name(NF_checkGenericType, names[CALL_MH], mtypeArg);
+--- ./jdk/src/share/classes/java/lang/invoke/MethodHandle.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandle.java Wed Apr 16 12:37:49 2014 +0400
+@@ -753,6 +753,10 @@
+ * to the target method handle.
+ * (The array may also be null when zero elements are required.)
+ * <p>
++ * If, when the adapter is called, the supplied array argument does
++ * not have the correct number of elements, the adapter will throw
++ * an {@link IllegalArgumentException} instead of invoking the target.
++ * <p>
+ * Here are some simple examples of array-spreading method handles:
+ * <blockquote><pre>
+ MethodHandle equals = publicLookup()
+@@ -763,6 +767,12 @@
+ MethodHandle eq2 = equals.asSpreader(Object[].class, 2);
+ assert( (boolean) eq2.invokeExact(new Object[]{ "me", "me" }));
+ assert(!(boolean) eq2.invokeExact(new Object[]{ "me", "thee" }));
++// try to spread from anything but a 2-array:
++for (int n = 0; n <= 10; n++) {
++ Object[] badArityArgs = (n == 2 ? null : new Object[n]);
++ try { assert((boolean) eq2.invokeExact(badArityArgs) && false); }
++ catch (IllegalArgumentException ex) { } // OK
++}
+ // spread both arguments from a String array:
+ MethodHandle eq2s = equals.asSpreader(String[].class, 2);
+ assert( (boolean) eq2s.invokeExact(new String[]{ "me", "me" }));
+--- ./jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Wed Apr 16 12:37:49 2014 +0400
+@@ -430,7 +430,7 @@
+ // Spread the array.
+ MethodHandle aload = MethodHandles.arrayElementGetter(spreadArgType);
+ Name array = names[argIndex];
+- names[nameCursor++] = new Name(NF_checkSpreadArgument, array, spreadArgCount);
++ names[nameCursor++] = new Name(Lazy.NF_checkSpreadArgument, array, spreadArgCount);
+ for (int j = 0; j < spreadArgCount; i++, j++) {
+ indexes[i] = nameCursor;
+ names[nameCursor++] = new Name(aload, array, j);
+@@ -454,14 +454,8 @@
+ }
+
+ static void checkSpreadArgument(Object av, int n) {
+- // FIXME: regression test for bug 7141637 erroneously expects an NPE, and other tests may expect IAE
+- // but the actual exception raised by an arity mismatch should be WMTE
+- final boolean RAISE_RANDOM_EXCEPTIONS = true; // FIXME: delete in JSR 292 M1
+ if (av == null) {
+ if (n == 0) return;
+- int len;
+- if (RAISE_RANDOM_EXCEPTIONS)
+- len = ((Object[])av).length; // throw NPE; but delete this after tests are fixed
+ } else if (av instanceof Object[]) {
+ int len = ((Object[])av).length;
+ if (len == n) return;
+@@ -470,19 +464,23 @@
+ if (len == n) return;
+ }
+ // fall through to error:
+- if (RAISE_RANDOM_EXCEPTIONS)
+- throw newIllegalArgumentException("Array is not of length "+n);
+- throw new WrongMethodTypeException("Array is not of length "+n);
++ throw newIllegalArgumentException("array is not of length "+n);
+ }
+
+- private static final NamedFunction NF_checkSpreadArgument;
+- static {
+- try {
+- NF_checkSpreadArgument = new NamedFunction(MethodHandleImpl.class
+- .getDeclaredMethod("checkSpreadArgument", Object.class, int.class));
+- NF_checkSpreadArgument.resolve();
+- } catch (ReflectiveOperationException ex) {
+- throw newInternalError(ex);
++ /**
++ * Pre-initialized NamedFunctions for bootstrapping purposes.
++ * Factored in an inner class to delay initialization until first usage.
++ */
++ private static class Lazy {
++ static final NamedFunction NF_checkSpreadArgument;
++ static {
++ try {
++ NF_checkSpreadArgument = new NamedFunction(MethodHandleImpl.class
++ .getDeclaredMethod("checkSpreadArgument", Object.class, int.class));
++ NF_checkSpreadArgument.resolve();
++ } catch (ReflectiveOperationException ex) {
++ throw newInternalError(ex);
++ }
+ }
+ }
+
+--- ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java Wed Apr 16 12:37:49 2014 +0400
+@@ -26,12 +26,15 @@
+ package java.lang.invoke;
+
+ import java.lang.reflect.*;
++
+ import sun.invoke.util.ValueConversions;
+ import sun.invoke.util.VerifyAccess;
+ import sun.invoke.util.Wrapper;
++
+ import java.util.List;
+ import java.util.ArrayList;
+ import java.util.Arrays;
++
+ import sun.reflect.CallerSensitive;
+ import sun.reflect.Reflection;
+ import sun.reflect.misc.ReflectUtil;
+@@ -245,6 +248,9 @@
+ * In general, the conditions under which a method handle may be
+ * looked up for a method {@code M} are exactly equivalent to the conditions
+ * under which the lookup class could have compiled and resolved a call to {@code M}.
++ * Where the JVM would raise exceptions like {@code NoSuchMethodError},
++ * a method handle lookup will generally raise a corresponding
++ * checked exception, such as {@code NoSuchMethodException}.
+ * And the effect of invoking the method handle resulting from the lookup
+ * is exactly equivalent to executing the compiled and resolved call to {@code M}.
+ * The same point is true of fields and constructors.
+@@ -261,6 +267,12 @@
+ * (which will necessarily be a superclass of the lookup class)
+ * to the lookup class itself.
+ * <p>
++ * The JVM represents constructors and static initializer blocks as internal methods
++ * with special names ({@code "<init>"} and {@code "<clinit>"}).
++ * The internal syntax of invocation instructions allows them to refer to such internal
++ * methods as if they were normal methods, but the JVM verifier rejects them.
++ * A lookup of such an internal method will produce a {@code NoSuchMethodException}.
++ * <p>
+ * In some cases, access between nested classes is obtained by the Java compiler by creating
+ * an wrapper method to access a private method of another class
+ * in the same top-level declaration.
+@@ -575,6 +587,15 @@
+ * The returned method handle will have
+ * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
+ * the method's variable arity modifier bit ({@code 0x0080}) is set.
++ * <b>Example:</b>
++ * <p><blockquote><pre>{@code
++import static java.lang.invoke.MethodHandles.*;
++import static java.lang.invoke.MethodType.*;
++...
++MethodHandle MH_asList = publicLookup().findStatic(Arrays.class,
++ "asList", methodType(List.class, Object[].class));
++assertEquals("[x, y]", MH_asList.invoke("x", "y").toString());
++ * }</pre></blockquote>
+ * @param refc the class from which the method is accessed
+ * @param name the name of the method
+ * @param type the type of the method
+@@ -625,6 +646,34 @@
+ * {@link java.lang.invoke.MethodHandles#invoker MethodHandles.invoker}
+ * with the same {@code type} argument.
+ *
++ * <b>Example:</b>
++ * <p><blockquote><pre>{@code
++import static java.lang.invoke.MethodHandles.*;
++import static java.lang.invoke.MethodType.*;
++...
++MethodHandle MH_concat = publicLookup().findVirtual(String.class,
++ "concat", methodType(String.class, String.class));
++MethodHandle MH_hashCode = publicLookup().findVirtual(Object.class,
++ "hashCode", methodType(int.class));
++MethodHandle MH_hashCode_String = publicLookup().findVirtual(String.class,
++ "hashCode", methodType(int.class));
++assertEquals("xy", (String) MH_concat.invokeExact("x", "y"));
++assertEquals("xy".hashCode(), (int) MH_hashCode.invokeExact((Object)"xy"));
++assertEquals("xy".hashCode(), (int) MH_hashCode_String.invokeExact("xy"));
++// interface method:
++MethodHandle MH_subSequence = publicLookup().findVirtual(CharSequence.class,
++ "subSequence", methodType(CharSequence.class, int.class, int.class));
++assertEquals("def", MH_subSequence.invoke("abcdefghi", 3, 6).toString());
++// constructor "internal method" must be accessed differently:
++MethodType MT_newString = methodType(void.class); //()V for new String()
++try { assertEquals("impossible", lookup()
++ .findVirtual(String.class, "<init>", MT_newString));
++ } catch (NoSuchMethodException ex) { } // OK
++MethodHandle MH_newString = publicLookup()
++ .findConstructor(String.class, MT_newString);
++assertEquals("", (String) MH_newString.invokeExact());
++ * }</pre></blockquote>
++ *
+ * @param refc the class or interface from which the method is accessed
+ * @param name the name of the method
+ * @param type the type of the method, with the receiver argument omitted
+@@ -666,12 +715,30 @@
+ * If the constructor's class has not yet been initialized, that is done
+ * immediately, before the method handle is returned.
+ * <p>
+- * Note: The requested type must have a return type of {@code void}.
+- * This is consistent with the JVM's treatment of constructor type descriptors.
++ * <em>(Note: The requested type must have a return type of {@code void}.
++ * This is consistent with the JVM's treatment of constructor type descriptors.)</em>
+ * <p>
+ * The returned method handle will have
+ * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
+ * the constructor's variable arity modifier bit ({@code 0x0080}) is set.
++ * <b>Example:</b>
++ * <p><blockquote><pre>{@code
++import static java.lang.invoke.MethodHandles.*;
++import static java.lang.invoke.MethodType.*;
++...
++MethodHandle MH_newArrayList = publicLookup().findConstructor(
++ ArrayList.class, methodType(void.class, Collection.class));
++Collection orig = Arrays.asList("x", "y");
++Collection copy = (ArrayList) MH_newArrayList.invokeExact(orig);
++assert(orig != copy);
++assertEquals(orig, copy);
++// a variable-arity constructor:
++MethodHandle MH_newProcessBuilder = publicLookup().findConstructor(
++ ProcessBuilder.class, methodType(void.class, String[].class));
++ProcessBuilder pb = (ProcessBuilder)
++ MH_newProcessBuilder.invoke("x", "y", "z");
++assertEquals("[x, y, z]", pb.command().toString());
++ * }</pre></blockquote>
+ * @param refc the class or interface from which the method is accessed
+ * @param type the type of the method, with the receiver argument omitted, and a void return type
+ * @return the desired method handle
+@@ -711,6 +778,45 @@
+ * The returned method handle will have
+ * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
+ * the method's variable arity modifier bit ({@code 0x0080}) is set.
++ * <p>
++ * <em>(Note: JVM internal methods named {@code <init>} not visible to this API,
++ * even though the {@code invokespecial} instruction can refer to them
++ * in special circumstances. Use {@link #findConstructor findConstructor}
++ * to access instance initialization methods in a safe manner.)</em>
++ * <b>Example:</b>
++ * <p><blockquote><pre>{@code
++import static java.lang.invoke.MethodHandles.*;
++import static java.lang.invoke.MethodType.*;
++...
++static class Listie extends ArrayList {
++ public String toString() { return "[wee Listie]"; }
++ static Lookup lookup() { return MethodHandles.lookup(); }
++}
++...
++// no access to constructor via invokeSpecial:
++MethodHandle MH_newListie = Listie.lookup()
++ .findConstructor(Listie.class, methodType(void.class));
++Listie l = (Listie) MH_newListie.invokeExact();
++try { assertEquals("impossible", Listie.lookup().findSpecial(
++ Listie.class, "<init>", methodType(void.class), Listie.class));
++ } catch (NoSuchMethodException ex) { } // OK
++// access to super and self methods via invokeSpecial:
++MethodHandle MH_super = Listie.lookup().findSpecial(
++ ArrayList.class, "toString" , methodType(String.class), Listie.class);
++MethodHandle MH_this = Listie.lookup().findSpecial(
++ Listie.class, "toString" , methodType(String.class), Listie.class);
++MethodHandle MH_duper = Listie.lookup().findSpecial(
++ Object.class, "toString" , methodType(String.class), Listie.class);
++assertEquals("[]", (String) MH_super.invokeExact(l));
++assertEquals(""+l, (String) MH_this.invokeExact(l));
++assertEquals("[]", (String) MH_duper.invokeExact(l)); // ArrayList method
++try { assertEquals("inaccessible", Listie.lookup().findSpecial(
++ String.class, "toString", methodType(String.class), Listie.class));
++ } catch (IllegalAccessException ex) { } // OK
++Listie subl = new Listie() { public String toString() { return "[subclass]"; } };
++assertEquals(""+l, (String) MH_this.invokeExact(subl)); // Listie method
++ * }</pre></blockquote>
++ *
+ * @param refc the class or interface from which the method is accessed
+ * @param name the name of the method (which must not be "&lt;init&gt;")
+ * @param type the type of the method, with the receiver argument omitted
+@@ -1014,15 +1120,16 @@
+ /// Helper methods, all package-private.
+
+ MemberName resolveOrFail(byte refKind, Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
++ name.getClass(); type.getClass(); // NPE
+ checkSymbolicClass(refc); // do this before attempting to resolve
+- name.getClass(); type.getClass(); // NPE
+ return IMPL_NAMES.resolveOrFail(refKind, new MemberName(refc, name, type, refKind), lookupClassOrNull(),
+ NoSuchFieldException.class);
+ }
+
+ MemberName resolveOrFail(byte refKind, Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
++ type.getClass(); // NPE
+ checkSymbolicClass(refc); // do this before attempting to resolve
+- name.getClass(); type.getClass(); // NPE
++ checkMethodName(refKind, name);
+ return IMPL_NAMES.resolveOrFail(refKind, new MemberName(refc, name, type, refKind), lookupClassOrNull(),
+ NoSuchMethodException.class);
+ }
+@@ -1033,6 +1140,12 @@
+ throw new MemberName(refc).makeAccessException("symbolic reference class is not public", this);
+ }
+
++ void checkMethodName(byte refKind, String name) throws NoSuchMethodException {
++ if (name.startsWith("<") && refKind != REF_newInvokeSpecial)
++ throw new NoSuchMethodException("illegal method name: "+name);
++ }
++
++
+ /**
+ * Find my trustable caller class if m is a caller sensitive method.
+ * If this lookup object has private access, then the caller class is the lookupClass.
+@@ -1155,6 +1268,10 @@
+ int allowedModes = this.allowedModes;
+ if (allowedModes == TRUSTED) return;
+ int mods = m.getModifiers();
++ if (Modifier.isProtected(mods) && refKind == REF_newInvokeSpecial) {
++ // cannot "new" a protected ctor in a different package
++ mods ^= Modifier.PROTECTED;
++ }
+ if (Modifier.isFinal(mods) &&
+ MethodHandleNatives.refKindIsSetter(refKind))
+ throw m.makeAccessException("unexpected set of a final field", this);
+@@ -1399,6 +1516,9 @@
+ * <p>
+ * Before invoking its target, the invoker will spread the final array, apply
+ * reference casts as necessary, and unbox and widen primitive arguments.
++ * If, when the invoker is called, the supplied array argument does
++ * not have the correct number of elements, the invoker will throw
++ * an {@link IllegalArgumentException} instead of invoking the target.
+ * <p>
+ * This method is equivalent to the following code (though it may be more efficient):
+ * <p><blockquote><pre>
+--- ./jdk/src/share/classes/java/lang/reflect/Proxy.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/lang/reflect/Proxy.java Wed Apr 16 12:37:49 2014 +0400
+@@ -396,12 +396,13 @@
+ Class<?>... interfaces)
+ throws IllegalArgumentException
+ {
+- SecurityManager sm = System.getSecurityManager();
++ final Class<?>[] intfs = interfaces.clone();
++ final SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+- checkProxyAccess(Reflection.getCallerClass(), loader, interfaces);
++ checkProxyAccess(Reflection.getCallerClass(), loader, intfs);
+ }
+
+- return getProxyClass0(loader, interfaces);
++ return getProxyClass0(loader, intfs);
+ }
+
+ /*
+@@ -725,15 +726,16 @@
+ throw new NullPointerException();
+ }
+
++ final Class<?>[] intfs = interfaces.clone();
+ final SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+- checkProxyAccess(Reflection.getCallerClass(), loader, interfaces);
++ checkProxyAccess(Reflection.getCallerClass(), loader, intfs);
+ }
+
+ /*
+ * Look up or generate the designated proxy class.
+ */
+- Class<?> cl = getProxyClass0(loader, interfaces);
++ Class<?> cl = getProxyClass0(loader, intfs);
+
+ /*
+ * Invoke its constructor with the designated invocation handler.
+--- ./jdk/src/share/classes/java/security/Provider.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/security/Provider.java Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -1017,7 +1017,7 @@
+ * <p>This class defines the methods {@link #supportsParameter
+ * supportsParameter()} and {@link #newInstance newInstance()}
+ * which are used by the Java security framework when it searches for
+- * suitable services and instantes them. The valid arguments to those
++ * suitable services and instantiates them. The valid arguments to those
+ * methods depend on the type of service. For the service types defined
+ * within Java SE, see the
+ * <a href="../../../technotes/guides/security/crypto/CryptoSpec.html">
+@@ -1207,7 +1207,7 @@
+ *
+ * @throws InvalidParameterException if the value of
+ * constructorParameter is invalid for this type of service.
+- * @throws NoSuchAlgorithmException if instantation failed for
++ * @throws NoSuchAlgorithmException if instantiation failed for
+ * any other reason.
+ */
+ public Object newInstance(Object constructorParameter)
+@@ -1235,7 +1235,9 @@
+ + " engines");
+ }
+ Class clazz = getImplClass();
+- return clazz.newInstance();
++ Class<?>[] empty = {};
++ Constructor<?> con = clazz.getConstructor(empty);
++ return con.newInstance();
+ } else {
+ Class paramClass = cap.getConstructorParameterClass();
+ if (constructorParameter != null) {
+@@ -1278,13 +1280,18 @@
+ } else {
+ clazz = cl.loadClass(className);
+ }
++ if (!Modifier.isPublic(clazz.getModifiers())) {
++ throw new NoSuchAlgorithmException
++ ("class configured for " + type + " (provider: " +
++ provider.getName() + ") is not public.");
++ }
+ classRef = new WeakReference<Class>(clazz);
+ }
+ return clazz;
+ } catch (ClassNotFoundException e) {
+ throw new NoSuchAlgorithmException
+ ("class configured for " + type + "(provider: " +
+- provider.getName() + ")" + "cannot be found.", e);
++ provider.getName() + ") cannot be found.", e);
+ }
+ }
+
+@@ -1297,15 +1304,21 @@
+ throws Exception {
+ Class clazz = getImplClass();
+ if (constructorParameter == null) {
+- Object o = clazz.newInstance();
+- return o;
++ // create instance with public no-arg constructor if it exists
++ try {
++ Class<?>[] empty = {};
++ Constructor<?> con = clazz.getConstructor(empty);
++ return con.newInstance();
++ } catch (NoSuchMethodException e) {
++ throw new NoSuchAlgorithmException("No public no-arg "
++ + "constructor found in class " + className);
++ }
+ }
+ Class argClass = constructorParameter.getClass();
+ Constructor[] cons = clazz.getConstructors();
+ // find first public constructor that can take the
+ // argument as parameter
+- for (int i = 0; i < cons.length; i++) {
+- Constructor con = cons[i];
++ for (Constructor<?> con : cons) {
+ Class[] paramTypes = con.getParameterTypes();
+ if (paramTypes.length != 1) {
+ continue;
+@@ -1313,10 +1326,9 @@
+ if (paramTypes[0].isAssignableFrom(argClass) == false) {
+ continue;
+ }
+- Object o = con.newInstance(new Object[] {constructorParameter});
+- return o;
++ return con.newInstance(constructorParameter);
+ }
+- throw new NoSuchAlgorithmException("No constructor matching "
++ throw new NoSuchAlgorithmException("No public constructor matching "
+ + argClass.getName() + " found in class " + className);
+ }
+
+--- ./jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java Wed Apr 16 12:37:49 2014 +0400
+@@ -221,6 +221,8 @@
+
+ if (vclass != fieldClass)
+ throw new ClassCastException();
++ if (vclass.isPrimitive())
++ throw new IllegalArgumentException("Must be reference type");
+
+ if (!Modifier.isVolatile(modifiers))
+ throw new IllegalArgumentException("Must be volatile type");
+--- ./jdk/src/share/classes/javax/crypto/JceSecurity.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/javax/crypto/JceSecurity.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2009, 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
+@@ -216,26 +216,28 @@
+ private static final Map codeBaseCacheRef = new WeakHashMap();
+
+ /*
+- * Retuns the CodeBase for the given class.
++ * Returns the CodeBase for the given class.
+ */
+ static URL getCodeBase(final Class clazz) {
+- URL url = (URL)codeBaseCacheRef.get(clazz);
+- if (url == null) {
+- url = (URL)AccessController.doPrivileged(new PrivilegedAction() {
+- public Object run() {
+- ProtectionDomain pd = clazz.getProtectionDomain();
+- if (pd != null) {
+- CodeSource cs = pd.getCodeSource();
+- if (cs != null) {
+- return cs.getLocation();
++ synchronized (codeBaseCacheRef) {
++ URL url = (URL)codeBaseCacheRef.get(clazz);
++ if (url == null) {
++ url = (URL)AccessController.doPrivileged(new PrivilegedAction() {
++ public Object run() {
++ ProtectionDomain pd = clazz.getProtectionDomain();
++ if (pd != null) {
++ CodeSource cs = pd.getCodeSource();
++ if (cs != null) {
++ return cs.getLocation();
++ }
+ }
++ return NULL_URL;
+ }
+- return NULL_URL;
+- }
+- });
+- codeBaseCacheRef.put(clazz, url);
++ });
++ codeBaseCacheRef.put(clazz, url);
++ }
++ return (url == NULL_URL) ? null : url;
+ }
+- return (url == NULL_URL) ? null : url;
+ }
+
+ private static void setupJurisdictionPolicies() throws Exception {
+--- ./jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java Wed Apr 16 12:37:49 2014 +0400
+@@ -718,7 +718,8 @@
+ * @return the Desktop folder.
+ */
+ public File getHomeDirectory() {
+- return getRoots()[0];
++ File[] roots = getRoots();
++ return (roots.length == 0) ? null : roots[0];
+ }
+
+ /**
+--- ./jdk/src/share/classes/sun/awt/AppContext.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/AppContext.java Wed Apr 16 12:37:49 2014 +0400
+@@ -323,6 +323,20 @@
+ while (context == null) {
+ threadGroup = threadGroup.getParent();
+ if (threadGroup == null) {
++ // We've got up to the root thread group and did not find an AppContext
++ // Try to get it from the security manager
++ SecurityManager securityManager = System.getSecurityManager();
++ if (securityManager != null) {
++ ThreadGroup smThreadGroup = securityManager.getThreadGroup();
++ if (smThreadGroup != null) {
++ /*
++ * If we get this far then it's likely that
++ * the ThreadGroup does not actually belong
++ * to the applet, so do not cache it.
++ */
++ return threadGroup2appContext.get(smThreadGroup);
++ }
++ }
+ return null;
+ }
+ context = threadGroup2appContext.get(threadGroup);
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -867,7 +867,7 @@
+ return descriptors;
+ }
+
+- private FontDescriptor[] buildFontDescriptors(int fontIndex, int styleIndex) {
++ protected FontDescriptor[] buildFontDescriptors(int fontIndex, int styleIndex) {
+ String fontName = fontNames[fontIndex];
+ String styleName = styleNames[styleIndex];
+
+--- ./jdk/src/share/classes/sun/awt/image/ByteBandedRaster.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/image/ByteBandedRaster.java Wed Apr 16 12:37:49 2014 +0400
+@@ -755,10 +755,22 @@
+ + scanlineStride);
+ }
+
+- for (int i = 0; i < data.length; i++) {
+- if (scanlineStride > data[i].length) {
+- throw new RasterFormatException("Incorrect scanline stride: "
+- + scanlineStride);
++ if ((long)minX - sampleModelTranslateX < 0 ||
++ (long)minY - sampleModelTranslateY < 0) {
++
++ throw new RasterFormatException("Incorrect origin/translate: (" +
++ minX + ", " + minY + ") / (" +
++ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
++ }
++
++
++ if (height > 1 || minY - sampleModelTranslateY > 0) {
++ // buffer should contain at least one scanline
++ for (int i = 0; i < data.length; i++) {
++ if (scanlineStride > data[i].length) {
++ throw new RasterFormatException("Incorrect scanline stride: "
++ + scanlineStride);
++ }
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java Wed Apr 16 12:37:49 2014 +0400
+@@ -885,15 +885,31 @@
+ }
+ }
+
++ if ((long)minX - sampleModelTranslateX < 0 ||
++ (long)minY - sampleModelTranslateY < 0) {
++
++ throw new RasterFormatException("Incorrect origin/translate: (" +
++ minX + ", " + minY + ") / (" +
++ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
++ }
++
+ // we can be sure that width and height are greater than 0
+ if (scanlineStride < 0 ||
+- scanlineStride > (Integer.MAX_VALUE / height) ||
+- scanlineStride > data.length)
++ scanlineStride > (Integer.MAX_VALUE / height))
+ {
+ // integer overflow
+ throw new RasterFormatException("Incorrect scanline stride: "
+ + scanlineStride);
+ }
++
++ if (height > 1 || minY - sampleModelTranslateY > 0) {
++ // buffer should contain at least one scanline
++ if (scanlineStride > data.length) {
++ throw new RasterFormatException("Incorrect scanline stride: "
++ + scanlineStride);
++ }
++ }
++
+ int lastScanOffset = (height - 1) * scanlineStride;
+
+ if (pixelStride < 0 ||
+--- ./jdk/src/share/classes/sun/awt/image/BytePackedRaster.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/image/BytePackedRaster.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1386,13 +1386,28 @@
+ throw new RasterFormatException("Invalid raster dimension");
+ }
+
++ if ((long)minX - sampleModelTranslateX < 0 ||
++ (long)minY - sampleModelTranslateY < 0) {
++
++ throw new RasterFormatException("Incorrect origin/translate: (" +
++ minX + ", " + minY + ") / (" +
++ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
++ }
++
+ if (scanlineStride < 0 ||
+- scanlineStride > (Integer.MAX_VALUE / height) ||
+- scanlineStride > data.length)
++ scanlineStride > (Integer.MAX_VALUE / height))
+ {
+ throw new RasterFormatException("Invalid scanline stride");
+ }
+
++ if (height > 1 || minY - sampleModelTranslateY > 0) {
++ // buffer should contain at least one scanline
++ if (scanlineStride > data.length) {
++ throw new RasterFormatException("Incorrect scanline stride: "
++ + scanlineStride);
++ }
++ }
++
+ int lastbit = (dataBitOffset
+ + (height-1) * scanlineStride * 8
+ + (width-1) * pixelBitStride
+--- ./jdk/src/share/classes/sun/awt/image/IntegerComponentRaster.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/image/IntegerComponentRaster.java Wed Apr 16 12:37:49 2014 +0400
+@@ -654,15 +654,31 @@
+ ") must be >= 0");
+ }
+
++ if ((long)minX - sampleModelTranslateX < 0 ||
++ (long)minY - sampleModelTranslateY < 0) {
++
++ throw new RasterFormatException("Incorrect origin/translate: (" +
++ minX + ", " + minY + ") / (" +
++ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
++ }
++
+ // we can be sure that width and height are greater than 0
+ if (scanlineStride < 0 ||
+- scanlineStride > (Integer.MAX_VALUE / height) ||
+- scanlineStride > data.length)
++ scanlineStride > (Integer.MAX_VALUE / height))
+ {
+ // integer overflow
+ throw new RasterFormatException("Incorrect scanline stride: "
+ + scanlineStride);
+ }
++
++ if (height > 1 || minY - sampleModelTranslateY > 0) {
++ // buffer should contain at least one scanline
++ if (scanlineStride > data.length) {
++ throw new RasterFormatException("Incorrect scanline stride: "
++ + scanlineStride);
++ }
++ }
++
+ int lastScanOffset = (height - 1) * scanlineStride;
+
+ if (pixelStride < 0 ||
+--- ./jdk/src/share/classes/sun/awt/image/ShortBandedRaster.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/image/ShortBandedRaster.java Wed Apr 16 12:37:49 2014 +0400
+@@ -754,10 +754,21 @@
+ + scanlineStride);
+ }
+
+- for (int i = 0; i < data.length; i++) {
+- if (scanlineStride > data[i].length) {
+- throw new RasterFormatException("Incorrect scanline stride: "
+- + scanlineStride);
++ if ((long)minX - sampleModelTranslateX < 0 ||
++ (long)minY - sampleModelTranslateY < 0) {
++
++ throw new RasterFormatException("Incorrect origin/translate: (" +
++ minX + ", " + minY + ") / (" +
++ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
++ }
++
++ if (height > 1 || minY - sampleModelTranslateY > 0) {
++ // buffer should contain at least one scanline
++ for (int i = 0; i < data.length; i++) {
++ if (scanlineStride > data[i].length) {
++ throw new RasterFormatException("Incorrect scanline stride: "
++ + scanlineStride);
++ }
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java Wed Apr 16 12:37:49 2014 +0400
+@@ -819,15 +819,31 @@
+ }
+ }
+
++ if ((long)minX - sampleModelTranslateX < 0 ||
++ (long)minY - sampleModelTranslateY < 0) {
++
++ throw new RasterFormatException("Incorrect origin/translate: (" +
++ minX + ", " + minY + ") / (" +
++ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
++ }
++
+ // we can be sure that width and height are greater than 0
+ if (scanlineStride < 0 ||
+- scanlineStride > (Integer.MAX_VALUE / height) ||
+- scanlineStride > data.length)
++ scanlineStride > (Integer.MAX_VALUE / height))
+ {
+ // integer overflow
+ throw new RasterFormatException("Incorrect scanline stride: "
+ + scanlineStride);
+ }
++
++ if (height > 1 || minY - sampleModelTranslateY > 0) {
++ // buffer should contain at least one scanline
++ if (scanlineStride > data.length) {
++ throw new RasterFormatException("Incorrect scanline stride: "
++ + scanlineStride);
++ }
++ }
++
+ int lastScanOffset = (height - 1) * scanlineStride;
+
+ if (pixelStride < 0 ||
+--- ./jdk/src/share/classes/sun/invoke/util/VerifyAccess.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/invoke/util/VerifyAccess.java Wed Apr 16 12:37:49 2014 +0400
+@@ -89,35 +89,28 @@
+ if (allowedModes == 0) return false;
+ assert((allowedModes & PUBLIC) != 0 &&
+ (allowedModes & ~(ALL_ACCESS_MODES|PACKAGE_ALLOWED)) == 0);
+- // Usually refc and defc are the same, but if they differ, verify them both.
+- if (refc != defc) {
+- if (!isClassAccessible(refc, lookupClass, allowedModes)) {
+- // Note that defc is verified in the switch below.
+- return false;
+- }
+- if ((mods & (ALL_ACCESS_MODES|STATIC)) == (PROTECTED|STATIC) &&
+- (allowedModes & PROTECTED_OR_PACKAGE_ALLOWED) != 0) {
+- // Apply the special rules for refc here.
+- if (!isRelatedClass(refc, lookupClass))
+- return isSamePackage(defc, lookupClass);
+- // If refc == defc, the call to isPublicSuperClass will do
+- // the whole job, since in that case refc (as defc) will be
+- // a superclass of the lookup class.
+- }
++ // The symbolic reference class (refc) must always be fully verified.
++ if (!isClassAccessible(refc, lookupClass, allowedModes)) {
++ return false;
+ }
++ // Usually refc and defc are the same, but verify defc also in case they differ.
+ if (defc == lookupClass &&
+ (allowedModes & PRIVATE) != 0)
+ return true; // easy check; all self-access is OK
+ switch (mods & ALL_ACCESS_MODES) {
+ case PUBLIC:
+- if (refc != defc) return true; // already checked above
+- return isClassAccessible(refc, lookupClass, allowedModes);
++ return true; // already checked above
+ case PROTECTED:
+ if ((allowedModes & PROTECTED_OR_PACKAGE_ALLOWED) != 0 &&
+ isSamePackage(defc, lookupClass))
+ return true;
++ if ((allowedModes & PROTECTED) == 0)
++ return false;
++ if ((mods & STATIC) != 0 &&
++ !isRelatedClass(refc, lookupClass))
++ return false;
+ if ((allowedModes & PROTECTED) != 0 &&
+- isPublicSuperClass(defc, lookupClass))
++ isSuperClass(defc, lookupClass))
+ return true;
+ return false;
+ case PACKAGE_ONLY: // That is, zero. Unmarked member is package-only access.
+@@ -139,8 +132,8 @@
+ lookupClass.isAssignableFrom(refc));
+ }
+
+- static boolean isPublicSuperClass(Class<?> defc, Class<?> lookupClass) {
+- return isPublic(defc.getModifiers()) && defc.isAssignableFrom(lookupClass);
++ static boolean isSuperClass(Class<?> defc, Class<?> lookupClass) {
++ return defc.isAssignableFrom(lookupClass);
+ }
+
+ /**
+--- ./jdk/src/share/classes/sun/misc/JavaLangAccess.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/misc/JavaLangAccess.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2006, 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
+@@ -35,10 +35,10 @@
+ ConstantPool getConstantPool(Class klass);
+
+ /**
+- * Set the AnnotationType instance corresponding to this class.
++ * Compare-And-Swap the AnnotationType instance corresponding to this class.
+ * (This method only applies to annotation types.)
+ */
+- void setAnnotationType(Class klass, AnnotationType annotationType);
++ boolean casAnnotationType(Class<?> klass, AnnotationType oldType, AnnotationType newType);
+
+ /**
+ * Get the AnnotationType instance corresponding to this class.
+@@ -47,6 +47,12 @@
+ AnnotationType getAnnotationType(Class klass);
+
+ /**
++ * Get the array of bytes that is the class-file representation
++ * of this Class' annotations.
++ */
++ byte[] getRawClassAnnotations(Class<?> klass);
++
++ /**
+ * Returns the elements of an enum class or null if the
+ * Class object does not represent an enum type;
+ * the result is uncloned, cached, and shared by all callers.
+--- ./jdk/src/share/classes/sun/reflect/annotation/AnnotationParser.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/reflect/annotation/AnnotationParser.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2005, 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
+@@ -67,7 +67,35 @@
+ return Collections.emptyMap();
+
+ try {
+- return parseAnnotations2(rawAnnotations, constPool, container);
++ return parseAnnotations2(rawAnnotations, constPool, container, null);
++ } catch(BufferUnderflowException e) {
++ throw new AnnotationFormatError("Unexpected end of annotations.");
++ } catch(IllegalArgumentException e) {
++ // Type mismatch in constant pool
++ throw new AnnotationFormatError(e);
++ }
++ }
++
++ /**
++ * Like {@link #parseAnnotations(byte[], sun.reflect.ConstantPool, Class)}
++ * with an additional parameter {@code selectAnnotationClasses} which selects the
++ * annotation types to parse (other than selected are quickly skipped).<p>
++ * This method is only used to parse select meta annotations in the construction
++ * phase of {@link AnnotationType} instances to prevent infinite recursion.
++ *
++ * @param selectAnnotationClasses an array of annotation types to select when parsing
++ */
++ @SafeVarargs
++ static Map<Class<? extends Annotation>, Annotation> parseSelectAnnotations(
++ byte[] rawAnnotations,
++ ConstantPool constPool,
++ Class<?> container,
++ Class<? extends Annotation> ... selectAnnotationClasses) {
++ if (rawAnnotations == null)
++ return Collections.emptyMap();
++
++ try {
++ return parseAnnotations2(rawAnnotations, constPool, container, selectAnnotationClasses);
+ } catch(BufferUnderflowException e) {
+ throw new AnnotationFormatError("Unexpected end of annotations.");
+ } catch(IllegalArgumentException e) {
+@@ -79,22 +107,23 @@
+ private static Map<Class<? extends Annotation>, Annotation> parseAnnotations2(
+ byte[] rawAnnotations,
+ ConstantPool constPool,
+- Class<?> container) {
++ Class<?> container,
++ Class<? extends Annotation>[] selectAnnotationClasses) {
+ Map<Class<? extends Annotation>, Annotation> result =
+ new LinkedHashMap<Class<? extends Annotation>, Annotation>();
+ ByteBuffer buf = ByteBuffer.wrap(rawAnnotations);
+ int numAnnotations = buf.getShort() & 0xFFFF;
+ for (int i = 0; i < numAnnotations; i++) {
+- Annotation a = parseAnnotation(buf, constPool, container, false);
++ Annotation a = parseAnnotation2(buf, constPool, container, false, selectAnnotationClasses);
+ if (a != null) {
+ Class<? extends Annotation> klass = a.annotationType();
+- AnnotationType type = AnnotationType.getInstance(klass);
+- if (type.retention() == RetentionPolicy.RUNTIME)
+- if (result.put(klass, a) != null)
++ if (AnnotationType.getInstance(klass).retention() == RetentionPolicy.RUNTIME &&
++ result.put(klass, a) != null) {
+ throw new AnnotationFormatError(
+ "Duplicate annotation for class: "+klass+": " + a);
+ }
+ }
++ }
+ return result;
+ }
+
+@@ -191,6 +220,15 @@
+ ConstantPool constPool,
+ Class<?> container,
+ boolean exceptionOnMissingAnnotationClass) {
++ return parseAnnotation2(buf, constPool, container, exceptionOnMissingAnnotationClass, null);
++ }
++
++ @SuppressWarnings("unchecked")
++ private static Annotation parseAnnotation2(ByteBuffer buf,
++ ConstantPool constPool,
++ Class<?> container,
++ boolean exceptionOnMissingAnnotationClass,
++ Class<? extends Annotation>[] selectAnnotationClasses) {
+ int typeIndex = buf.getShort() & 0xFFFF;
+ Class<? extends Annotation> annotationClass = null;
+ String sig = "[unknown]";
+@@ -216,6 +254,10 @@
+ skipAnnotation(buf, false);
+ return null;
+ }
++ if (selectAnnotationClasses != null && !contains(selectAnnotationClasses, annotationClass)) {
++ skipAnnotation(buf, false);
++ return null;
++ }
+ AnnotationType type = null;
+ try {
+ type = AnnotationType.getInstance(annotationClass);
+@@ -791,6 +833,17 @@
+ skipMemberValue(buf);
+ }
+
++ /**
++ * Searches for given {@code element} in given {@code array} by identity.
++ * Returns {@code true} if found {@code false} if not.
++ */
++ private static boolean contains(Object[] array, Object element) {
++ for (Object e : array)
++ if (e == element)
++ return true;
++ return false;
++ }
++
+ /*
+ * This method converts the annotation map returned by the parseAnnotations()
+ * method to an array. It is called by Field.getDeclaredAnnotations(),
+--- ./jdk/src/share/classes/sun/reflect/annotation/AnnotationType.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/reflect/annotation/AnnotationType.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2006, 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
+@@ -25,6 +25,8 @@
+
+ package sun.reflect.annotation;
+
++import sun.misc.JavaLangAccess;
++
+ import java.lang.annotation.*;
+ import java.lang.reflect.*;
+ import java.util.*;
+@@ -45,29 +47,28 @@
+ * types. This matches the return value that must be used for a
+ * dynamic proxy, allowing for a simple isInstance test.
+ */
+- private final Map<String, Class<?>> memberTypes = new HashMap<String,Class<?>>();
++ private final Map<String, Class<?>> memberTypes;
+
+ /**
+ * Member name -> default value mapping.
+ */
+- private final Map<String, Object> memberDefaults =
+- new HashMap<String, Object>();
++ private final Map<String, Object> memberDefaults;
+
+ /**
+- * Member name -> Method object mapping. This (and its assoicated
++ * Member name -> Method object mapping. This (and its associated
+ * accessor) are used only to generate AnnotationTypeMismatchExceptions.
+ */
+- private final Map<String, Method> members = new HashMap<String, Method>();
++ private final Map<String, Method> members;
+
+ /**
+ * The retention policy for this annotation type.
+ */
+- private RetentionPolicy retention = RetentionPolicy.RUNTIME;;
++ private final RetentionPolicy retention;
+
+ /**
+ * Whether this annotation type is inherited.
+ */
+- private boolean inherited = false;
++ private final boolean inherited;
+
+ /**
+ * Returns an AnnotationType instance for the specified annotation type.
+@@ -75,13 +76,20 @@
+ * @throw IllegalArgumentException if the specified class object for
+ * does not represent a valid annotation type
+ */
+- public static synchronized AnnotationType getInstance(
++ public static AnnotationType getInstance(
+ Class<? extends Annotation> annotationClass)
+ {
+- AnnotationType result = sun.misc.SharedSecrets.getJavaLangAccess().
+- getAnnotationType(annotationClass);
+- if (result == null)
+- result = new AnnotationType((Class<? extends Annotation>) annotationClass);
++ JavaLangAccess jla = sun.misc.SharedSecrets.getJavaLangAccess();
++ AnnotationType result = jla.getAnnotationType(annotationClass); // volatile read
++ if (result == null) {
++ result = new AnnotationType(annotationClass);
++ // try to CAS the AnnotationType: null -> result
++ if (!jla.casAnnotationType(annotationClass, null, result)) {
++ // somebody was quicker -> read it's result
++ result = jla.getAnnotationType(annotationClass);
++ assert result != null;
++ }
++ }
+
+ return result;
+ }
+@@ -105,6 +113,9 @@
+ }
+ });
+
++ memberTypes = new HashMap<String,Class<?>>(methods.length+1, 1.0f);
++ memberDefaults = new HashMap<String, Object>(0);
++ members = new HashMap<String, Method>(methods.length+1, 1.0f);
+
+ for (Method method : methods) {
+ if (method.getParameterTypes().length != 0)
+@@ -117,20 +128,27 @@
+ Object defaultValue = method.getDefaultValue();
+ if (defaultValue != null)
+ memberDefaults.put(name, defaultValue);
+-
+- members.put(name, method);
+ }
+
+- sun.misc.SharedSecrets.getJavaLangAccess().
+- setAnnotationType(annotationClass, this);
+-
+ // Initialize retention, & inherited fields. Special treatment
+ // of the corresponding annotation types breaks infinite recursion.
+ if (annotationClass != Retention.class &&
+ annotationClass != Inherited.class) {
+- Retention ret = annotationClass.getAnnotation(Retention.class);
++ JavaLangAccess jla = sun.misc.SharedSecrets.getJavaLangAccess();
++ Map<Class<? extends Annotation>, Annotation> metaAnnotations =
++ AnnotationParser.parseSelectAnnotations(
++ jla.getRawClassAnnotations(annotationClass),
++ jla.getConstantPool(annotationClass),
++ annotationClass,
++ Retention.class, Inherited.class
++ );
++ Retention ret = (Retention) metaAnnotations.get(Retention.class);
+ retention = (ret == null ? RetentionPolicy.CLASS : ret.value());
+- inherited = annotationClass.isAnnotationPresent(Inherited.class);
++ inherited = metaAnnotations.containsKey(Inherited.class);
++ }
++ else {
++ retention = RetentionPolicy.RUNTIME;
++ inherited = false;
+ }
+ }
+
+@@ -205,11 +223,10 @@
+ * For debugging.
+ */
+ public String toString() {
+- StringBuffer s = new StringBuffer("Annotation Type:" + "\n");
+- s.append(" Member types: " + memberTypes + "\n");
+- s.append(" Member defaults: " + memberDefaults + "\n");
+- s.append(" Retention policy: " + retention + "\n");
+- s.append(" Inherited: " + inherited);
+- return s.toString();
++ return "Annotation Type:\n" +
++ " Member types: " + memberTypes + "\n" +
++ " Member defaults: " + memberDefaults + "\n" +
++ " Retention policy: " + retention + "\n" +
++ " Inherited: " + inherited;
+ }
+ }
+--- ./jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2009, 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
+@@ -123,19 +123,19 @@
+
+ try {
+
+- long[] handles = generateECKeyPair(keySize, encodedParams, seed);
++ Object[] keyBytes = generateECKeyPair(keySize, encodedParams, seed);
+
+ // The 'params' object supplied above is equivalent to the native
+ // one so there is no need to fetch it.
+
+- // handles[0] points to the native private key
+- BigInteger s = new BigInteger(1, getEncodedBytes(handles[0]));
++ // keyBytes[0] is the encoding of the native private key
++ BigInteger s = new BigInteger(1, (byte[])keyBytes[0]);
+
+ PrivateKey privateKey =
+ new ECPrivateKeyImpl(s, (ECParameterSpec)params);
+
+- // handles[1] points to the native public key
+- ECPoint w = ECParameters.decodePoint(getEncodedBytes(handles[1]),
++ // keyBytes[1] is the encoding of the native public key
++ ECPoint w = ECParameters.decodePoint((byte[])keyBytes[1],
+ ((ECParameterSpec)params).getCurve());
+ PublicKey publicKey =
+ new ECPublicKeyImpl(w, (ECParameterSpec)params);
+@@ -160,14 +160,9 @@
+ }
+
+ /*
+- * Generates the keypair and returns a 2-element array of handles.
+- * The first handle points to the private key, the second to the public key.
++ * Generates the keypair and returns a 2-element array of encoding bytes.
++ * The first one is for the private key, the second for the public key.
+ */
+- private static native long[] generateECKeyPair(int keySize,
++ private static native Object[] generateECKeyPair(int keySize,
+ byte[] encodedParams, byte[] seed) throws GeneralSecurityException;
+-
+- /*
+- * Extracts the encoded key data using the supplied handle.
+- */
+- private static native byte[] getEncodedBytes(long handle);
+ }
+--- ./jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java Wed Apr 16 12:37:49 2014 +0400
+@@ -26,11 +26,11 @@
+ package sun.security.internal.spec;
+
+ import java.security.spec.AlgorithmParameterSpec;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+
+ /**
+- * Parameters for SSL/TLS RSA Premaster secret generation.
+- * This class is used by SSL/TLS client to initialize KeyGenerators of the
+- * type "TlsRsaPremasterSecret".
++ * Parameters for SSL/TLS RSA premaster secret.
+ *
+ * <p>Instances of this class are immutable.
+ *
+@@ -43,90 +43,108 @@
+ public class TlsRsaPremasterSecretParameterSpec
+ implements AlgorithmParameterSpec {
+
+- private final int majorVersion;
+- private final int minorVersion;
+- private final byte[] encodedSecret;
++ /*
++ * The TLS spec says that the version in the RSA premaster secret must
++ * be the maximum version supported by the client (i.e. the version it
++ * requested in its client hello version). However, we (and other
++ * implementations) used to send the active negotiated version. The
++ * system property below allows to toggle the behavior.
++ */
++ private final static String PROP_NAME =
++ "com.sun.net.ssl.rsaPreMasterSecretFix";
++
++ /*
++ * Default is "false" (old behavior) for compatibility reasons in
++ * SSLv3/TLSv1. Later protocols (TLSv1.1+) do not use this property.
++ */
++ private final static boolean rsaPreMasterSecretFix =
++ AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
++ public Boolean run() {
++ String value = System.getProperty(PROP_NAME);
++ if (value != null && value.equalsIgnoreCase("true")) {
++ return Boolean.TRUE;
++ }
++
++ return Boolean.FALSE;
++ }
++ });
++
++ private final int clientVersion;
++ private final int serverVersion;
+
+ /**
+ * Constructs a new TlsRsaPremasterSecretParameterSpec.
+- * <P>
+- * The version numbers will be placed inside the premaster secret to
+- * detect version rollbacks attacks as described in the TLS specification.
+- * Note that they do not indicate the protocol version negotiated for
+- * the handshake.
+ *
+- * @param majorVersion the major number of the protocol version
+- * @param minorVersion the minor number of the protocol version
++ * @param clientVersion the version of the TLS protocol by which the
++ * client wishes to communicate during this session
++ * @param serverVersion the negotiated version of the TLS protocol which
++ * contains the lower of that suggested by the client in the client
++ * hello and the highest supported by the server.
+ *
+- * @throws IllegalArgumentException if minorVersion or majorVersion are
+- * negative or larger than 255
++ * @throws IllegalArgumentException if clientVersion or serverVersion are
++ * negative or larger than (2^16 - 1)
+ */
+- public TlsRsaPremasterSecretParameterSpec(int majorVersion,
+- int minorVersion) {
+- this.majorVersion =
+- TlsMasterSecretParameterSpec.checkVersion(majorVersion);
+- this.minorVersion =
+- TlsMasterSecretParameterSpec.checkVersion(minorVersion);
+- this.encodedSecret = null;
++ public TlsRsaPremasterSecretParameterSpec(
++ int clientVersion, int serverVersion) {
++
++ this.clientVersion = checkVersion(clientVersion);
++ this.serverVersion = checkVersion(serverVersion);
+ }
+
+ /**
+- * Constructs a new TlsRsaPremasterSecretParameterSpec.
+- * <P>
+- * The version numbers will be placed inside the premaster secret to
+- * detect version rollbacks attacks as described in the TLS specification.
+- * Note that they do not indicate the protocol version negotiated for
+- * the handshake.
+- * <P>
+- * Usually, the encoded secret key is a random number that acts as
+- * dummy pre_master_secret to avoid vulnerabilities described by
+- * section 7.4.7.1, RFC 5246.
++ * Returns the version of the TLS protocol by which the client wishes to
++ * communicate during this session.
+ *
+- * @param majorVersion the major number of the protocol version
+- * @param minorVersion the minor number of the protocol version
+- * @param encodedSecret the encoded secret key
+- *
+- * @throws IllegalArgumentException if minorVersion or majorVersion are
+- * negative or larger than 255, or encodedSecret is not exactly 48 bytes.
++ * @return the version of the TLS protocol in ClientHello message
+ */
+- public TlsRsaPremasterSecretParameterSpec(int majorVersion,
+- int minorVersion, byte[] encodedSecret) {
+- this.majorVersion =
+- TlsMasterSecretParameterSpec.checkVersion(majorVersion);
+- this.minorVersion =
+- TlsMasterSecretParameterSpec.checkVersion(minorVersion);
+-
+- if (encodedSecret == null || encodedSecret.length != 48) {
+- throw new IllegalArgumentException(
+- "Encoded secret is not exactly 48 bytes");
+- }
+- this.encodedSecret = encodedSecret.clone();
++ public int getClientVersion() {
++ return clientVersion;
+ }
+
+ /**
+- * Returns the major version.
++ * Returns the negotiated version of the TLS protocol which contains the
++ * lower of that suggested by the client in the client hello and the
++ * highest supported by the server.
+ *
+- * @return the major version.
++ * @return the negotiated version of the TLS protocol in ServerHello message
+ */
+- public int getMajorVersion() {
+- return majorVersion;
++ public int getServerVersion() {
++ return serverVersion;
+ }
+
+ /**
+- * Returns the minor version.
++ * Returns the major version used in RSA premaster secret.
+ *
+- * @return the minor version.
++ * @return the major version used in RSA premaster secret.
+ */
+- public int getMinorVersion() {
+- return minorVersion;
++ public int getMajorVersion() {
++ if (rsaPreMasterSecretFix || clientVersion >= 0x0302) {
++ // 0x0302: TLSv1.1
++ return (clientVersion >>> 8) & 0xFF;
++ }
++
++ return (serverVersion >>> 8) & 0xFF;
+ }
+
+ /**
+- * Returns the encoded secret.
++ * Returns the minor version used in RSA premaster secret.
+ *
+- * @return the encoded secret, may be null if no encoded secret.
++ * @return the minor version used in RSA premaster secret.
+ */
+- public byte[] getEncodedSecret() {
+- return encodedSecret == null ? null : encodedSecret.clone();
++ public int getMinorVersion() {
++ if (rsaPreMasterSecretFix || clientVersion >= 0x0302) {
++ // 0x0302: TLSv1.1
++ return clientVersion & 0xFF;
++ }
++
++ return serverVersion & 0xFF;
++ }
++
++ private int checkVersion(int version) {
++ if ((version < 0) || (version > 0xFFFF)) {
++ throw new IllegalArgumentException(
++ "Version must be between 0 and 65,535");
++ }
++ return version;
+ }
+ }
+--- ./jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java Wed Apr 16 12:37:49 2014 +0400
+@@ -37,6 +37,8 @@
+ import static sun.security.pkcs11.TemplateManager.*;
+ import sun.security.pkcs11.wrapper.*;
+ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
++import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
++import sun.security.util.KeyUtil;
+
+ /**
+ * RSA Cipher implementation class. We currently only support
+@@ -102,6 +104,12 @@
+ // maximum output size. this is the length of the key
+ private int outputSize;
+
++ // cipher parameter for TLS RSA premaster secret
++ private AlgorithmParameterSpec spec = null;
++
++ // the source of randomness
++ private SecureRandom random;
++
+ P11RSACipher(Token token, String algorithm, long mechanism)
+ throws PKCS11Exception {
+ super();
+@@ -165,8 +173,12 @@
+ AlgorithmParameterSpec params, SecureRandom random)
+ throws InvalidKeyException, InvalidAlgorithmParameterException {
+ if (params != null) {
+- throw new InvalidAlgorithmParameterException
+- ("Parameters not supported");
++ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
++ throw new InvalidAlgorithmParameterException(
++ "Parameters not supported");
++ }
++ spec = params;
++ this.random = random; // for TLS RSA premaster secret
+ }
+ implInit(opmode, key);
+ }
+@@ -176,8 +188,8 @@
+ SecureRandom random)
+ throws InvalidKeyException, InvalidAlgorithmParameterException {
+ if (params != null) {
+- throw new InvalidAlgorithmParameterException
+- ("Parameters not supported");
++ throw new InvalidAlgorithmParameterException(
++ "Parameters not supported");
+ }
+ implInit(opmode, key);
+ }
+@@ -452,21 +464,101 @@
+ protected Key engineUnwrap(byte[] wrappedKey, String algorithm,
+ int type) throws InvalidKeyException, NoSuchAlgorithmException {
+
+- // XXX implement unwrap using C_Unwrap() for all keys
+- implInit(Cipher.DECRYPT_MODE, p11Key);
+- if (wrappedKey.length > maxInputSize) {
+- throw new InvalidKeyException("Key is too long for unwrapping");
++ boolean isTlsRsaPremasterSecret =
++ algorithm.equals("TlsRsaPremasterSecret");
++ Exception failover = null;
++
++ SecureRandom secureRandom = random;
++ if (secureRandom == null && isTlsRsaPremasterSecret) {
++ secureRandom = new SecureRandom();
+ }
+- implUpdate(wrappedKey, 0, wrappedKey.length);
+- try {
+- byte[] encoded = doFinal();
++
++ // Should C_Unwrap be preferred for non-TLS RSA premaster secret?
++ if (token.supportsRawSecretKeyImport()) {
++ // XXX implement unwrap using C_Unwrap() for all keys
++ implInit(Cipher.DECRYPT_MODE, p11Key);
++ if (wrappedKey.length > maxInputSize) {
++ throw new InvalidKeyException("Key is too long for unwrapping");
++ }
++
++ byte[] encoded = null;
++ implUpdate(wrappedKey, 0, wrappedKey.length);
++ try {
++ encoded = doFinal();
++ } catch (BadPaddingException e) {
++ if (isTlsRsaPremasterSecret) {
++ failover = e;
++ } else {
++ throw new InvalidKeyException("Unwrapping failed", e);
++ }
++ } catch (IllegalBlockSizeException e) {
++ // should not occur, handled with length check above
++ throw new InvalidKeyException("Unwrapping failed", e);
++ }
++
++ if (isTlsRsaPremasterSecret) {
++ if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) {
++ throw new IllegalStateException(
++ "No TlsRsaPremasterSecretParameterSpec specified");
++ }
++
++ // polish the TLS premaster secret
++ TlsRsaPremasterSecretParameterSpec psps =
++ (TlsRsaPremasterSecretParameterSpec)spec;
++ encoded = KeyUtil.checkTlsPreMasterSecretKey(
++ psps.getClientVersion(), psps.getServerVersion(),
++ secureRandom, encoded, (failover != null));
++ }
++
+ return ConstructKeys.constructKey(encoded, algorithm, type);
+- } catch (BadPaddingException e) {
+- // should not occur
+- throw new InvalidKeyException("Unwrapping failed", e);
+- } catch (IllegalBlockSizeException e) {
+- // should not occur, handled with length check above
+- throw new InvalidKeyException("Unwrapping failed", e);
++ } else {
++ Session s = null;
++ SecretKey secretKey = null;
++ try {
++ try {
++ s = token.getObjSession();
++ long keyType = CKK_GENERIC_SECRET;
++ CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] {
++ new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY),
++ new CK_ATTRIBUTE(CKA_KEY_TYPE, keyType),
++ };
++ attributes = token.getAttributes(
++ O_IMPORT, CKO_SECRET_KEY, keyType, attributes);
++ long keyID = token.p11.C_UnwrapKey(s.id(),
++ new CK_MECHANISM(mechanism), p11Key.keyID,
++ wrappedKey, attributes);
++ secretKey = P11Key.secretKey(s, keyID,
++ algorithm, 48 << 3, attributes);
++ } catch (PKCS11Exception e) {
++ if (isTlsRsaPremasterSecret) {
++ failover = e;
++ } else {
++ throw new InvalidKeyException("unwrap() failed", e);
++ }
++ }
++
++ if (isTlsRsaPremasterSecret) {
++ byte[] replacer = new byte[48];
++ if (failover == null) {
++ // Does smart compiler dispose this operation?
++ secureRandom.nextBytes(replacer);
++ }
++
++ TlsRsaPremasterSecretParameterSpec psps =
++ (TlsRsaPremasterSecretParameterSpec)spec;
++
++ // Please use the tricky failover and replacer byte array
++ // as the parameters so that smart compiler won't dispose
++ // the unused variable .
++ secretKey = polishPreMasterSecretKey(token, s,
++ failover, replacer, secretKey,
++ psps.getClientVersion(), psps.getServerVersion());
++ }
++
++ return secretKey;
++ } finally {
++ token.releaseSession(s);
++ }
+ }
+ }
+
+@@ -475,6 +567,34 @@
+ int n = P11KeyFactory.convertKey(token, key, algorithm).length();
+ return n;
+ }
++
++ private static SecretKey polishPreMasterSecretKey(
++ Token token, Session session,
++ Exception failover, byte[] replacer, SecretKey secretKey,
++ int clientVersion, int serverVersion) {
++
++ if (failover != null) {
++ CK_VERSION version = new CK_VERSION(
++ (clientVersion >>> 8) & 0xFF, clientVersion & 0xFF);
++ try {
++ CK_ATTRIBUTE[] attributes = token.getAttributes(
++ O_GENERATE, CKO_SECRET_KEY,
++ CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
++ long keyID = token.p11.C_GenerateKey(session.id(),
++ // new CK_MECHANISM(CKM_TLS_PRE_MASTER_KEY_GEN, version),
++ new CK_MECHANISM(CKM_SSL3_PRE_MASTER_KEY_GEN, version),
++ attributes);
++ return P11Key.secretKey(session,
++ keyID, "TlsRsaPremasterSecret", 48 << 3, attributes);
++ } catch (PKCS11Exception e) {
++ throw new ProviderException(
++ "Could not generate premaster secret", e);
++ }
++ }
++
++ return secretKey;
++ }
++
+ }
+
+ final class ConstructKeys {
+--- ./jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java Wed Apr 16 12:37:49 2014 +0400
+@@ -73,7 +73,7 @@
+
+ protected void engineInit(AlgorithmParameterSpec params,
+ SecureRandom random) throws InvalidAlgorithmParameterException {
+- if (params instanceof TlsRsaPremasterSecretParameterSpec == false) {
++ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
+ throw new InvalidAlgorithmParameterException(MSG);
+ }
+ this.spec = (TlsRsaPremasterSecretParameterSpec)params;
+@@ -83,38 +83,32 @@
+ throw new InvalidParameterException(MSG);
+ }
+
++ // Only can be used in client side to generate TLS RSA premaster secret.
+ protected SecretKey engineGenerateKey() {
+ if (spec == null) {
+ throw new IllegalStateException
+ ("TlsRsaPremasterSecretGenerator must be initialized");
+ }
+
+- byte[] b = spec.getEncodedSecret();
+- if (b == null) {
+- CK_VERSION version = new CK_VERSION(
++ CK_VERSION version = new CK_VERSION(
+ spec.getMajorVersion(), spec.getMinorVersion());
+- Session session = null;
+- try {
+- session = token.getObjSession();
+- CK_ATTRIBUTE[] attributes = token.getAttributes(
+- O_GENERATE, CKO_SECRET_KEY,
+- CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
+- long keyID = token.p11.C_GenerateKey(session.id(),
+- new CK_MECHANISM(mechanism, version), attributes);
+- SecretKey key = P11Key.secretKey(session,
+- keyID, "TlsRsaPremasterSecret", 48 << 3, attributes);
+- return key;
+- } catch (PKCS11Exception e) {
+- throw new ProviderException(
+- "Could not generate premaster secret", e);
+- } finally {
+- token.releaseSession(session);
+- }
++ Session session = null;
++ try {
++ session = token.getObjSession();
++ CK_ATTRIBUTE[] attributes = token.getAttributes(
++ O_GENERATE, CKO_SECRET_KEY,
++ CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
++ long keyID = token.p11.C_GenerateKey(session.id(),
++ new CK_MECHANISM(mechanism, version), attributes);
++ SecretKey key = P11Key.secretKey(session,
++ keyID, "TlsRsaPremasterSecret", 48 << 3, attributes);
++ return key;
++ } catch (PKCS11Exception e) {
++ throw new ProviderException(
++ "Could not generate premaster secret", e);
++ } finally {
++ token.releaseSession(session);
+ }
+-
+- // Won't worry, the TlsRsaPremasterSecret will be soon converted to
+- // TlsMasterSecret.
+- return new SecretKeySpec(b, "TlsRsaPremasterSecret");
+ }
+
+ }
+--- ./jdk/src/share/classes/sun/security/pkcs11/Token.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs11/Token.java Wed Apr 16 12:37:49 2014 +0400
+@@ -35,6 +35,7 @@
+ import sun.security.jca.JCAUtil;
+
+ import sun.security.pkcs11.wrapper.*;
++import static sun.security.pkcs11.TemplateManager.*;
+ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
+
+ /**
+@@ -121,6 +122,9 @@
+ private final static CK_MECHANISM_INFO INVALID_MECH =
+ new CK_MECHANISM_INFO(0, 0, 0);
+
++ // flag indicating whether the token supports raw secret key material import
++ private Boolean supportsRawSecretKeyImport;
++
+ Token(SunPKCS11 provider) throws PKCS11Exception {
+ this.provider = provider;
+ this.removable = provider.removable;
+@@ -159,6 +163,36 @@
+ return writeProtected;
+ }
+
++ // return whether the token supports raw secret key material import
++ boolean supportsRawSecretKeyImport() {
++ if (supportsRawSecretKeyImport == null) {
++ SecureRandom random = JCAUtil.getSecureRandom();
++ byte[] encoded = new byte[48];
++ random.nextBytes(encoded);
++
++ CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[3];
++ attributes[0] = new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY);
++ attributes[1] = new CK_ATTRIBUTE(CKA_KEY_TYPE, CKK_GENERIC_SECRET);
++ attributes[2] = new CK_ATTRIBUTE(CKA_VALUE, encoded);
++
++ Session session = null;
++ try {
++ attributes = getAttributes(O_IMPORT,
++ CKO_SECRET_KEY, CKK_GENERIC_SECRET, attributes);
++ session = getObjSession();
++ long keyID = p11.C_CreateObject(session.id(), attributes);
++
++ supportsRawSecretKeyImport = Boolean.TRUE;
++ } catch (PKCS11Exception e) {
++ supportsRawSecretKeyImport = Boolean.FALSE;
++ } finally {
++ releaseSession(session);
++ }
++ }
++
++ return supportsRawSecretKeyImport;
++ }
++
+ // return whether we are logged in
+ // uses cached result if current. session is optional and may be null
+ boolean isLoggedIn(Session session) throws PKCS11Exception {
+--- ./jdk/src/share/classes/sun/security/rsa/RSACore.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/security/rsa/RSACore.java Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -50,6 +50,15 @@
+ */
+ public final class RSACore {
+
++ // globally enable/disable use of blinding
++ private final static boolean ENABLE_BLINDING = true;
++
++ // cache for blinding parameters. Map<BigInteger, BlindingParameters>
++ // use a weak hashmap so that cached values are automatically cleared
++ // when the modulus is GC'ed
++ private final static Map<BigInteger, BlindingParameters>
++ blindingCache = new WeakHashMap<>();
++
+ private RSACore() {
+ // empty
+ }
+@@ -100,12 +109,12 @@
+ if (key instanceof RSAPrivateCrtKey) {
+ return crtCrypt(msg, (RSAPrivateCrtKey)key);
+ } else {
+- return crypt(msg, key.getModulus(), key.getPrivateExponent());
++ return priCrypt(msg, key.getModulus(), key.getPrivateExponent());
+ }
+ }
+
+ /**
+- * RSA public key ops and non-CRT private key ops. Simple modPow().
++ * RSA public key ops. Simple modPow().
+ */
+ private static byte[] crypt(byte[] msg, BigInteger n, BigInteger exp)
+ throws BadPaddingException {
+@@ -115,22 +124,29 @@
+ }
+
+ /**
++ * RSA non-CRT private key operations.
++ */
++ private static byte[] priCrypt(byte[] msg, BigInteger n, BigInteger exp)
++ throws BadPaddingException {
++
++ BigInteger c = parseMsg(msg, n);
++ BlindingRandomPair brp = null;
++ BigInteger m;
++ if (ENABLE_BLINDING) {
++ brp = getBlindingRandomPair(null, exp, n);
++ c = c.multiply(brp.u).mod(n);
++ m = c.modPow(exp, n);
++ m = m.multiply(brp.v).mod(n);
++ } else {
++ m = c.modPow(exp, n);
++ }
++
++ return toByteArray(m, getByteLength(n));
++ }
++
++ /**
+ * RSA private key operations with CRT. Algorithm and variable naming
+ * are taken from PKCS#1 v2.1, section 5.1.2.
+- *
+- * The only difference is the addition of blinding to twart timing attacks.
+- * This is described in the RSA Bulletin#2 (Jan 96) among other places.
+- * This means instead of implementing RSA as
+- * m = c ^ d mod n (or RSA in CRT variant)
+- * we do
+- * r = random(0, n-1)
+- * c' = c * r^e mod n
+- * m' = c' ^ d mod n (or RSA in CRT variant)
+- * m = m' * r^-1 mod n (where r^-1 is the modular inverse of r mod n)
+- * This works because r^(e*d) * r^-1 = r * r^-1 = 1 (all mod n)
+- *
+- * We do not generate new blinding parameters for each operation but reuse
+- * them BLINDING_MAX_REUSE times (see definition below).
+ */
+ private static byte[] crtCrypt(byte[] msg, RSAPrivateCrtKey key)
+ throws BadPaddingException {
+@@ -141,13 +157,13 @@
+ BigInteger dP = key.getPrimeExponentP();
+ BigInteger dQ = key.getPrimeExponentQ();
+ BigInteger qInv = key.getCrtCoefficient();
++ BigInteger e = key.getPublicExponent();
++ BigInteger d = key.getPrivateExponent();
+
+- BlindingParameters params;
++ BlindingRandomPair brp;
+ if (ENABLE_BLINDING) {
+- params = getBlindingParameters(key);
+- c = c.multiply(params.re).mod(n);
+- } else {
+- params = null;
++ brp = getBlindingRandomPair(e, d, n);
++ c = c.multiply(brp.u).mod(n);
+ }
+
+ // m1 = c ^ dP mod p
+@@ -165,8 +181,8 @@
+ // m = m2 + q * h
+ BigInteger m = h.multiply(q).add(m2);
+
+- if (params != null) {
+- m = m.multiply(params.rInv).mod(n);
++ if (ENABLE_BLINDING) {
++ m = m.multiply(brp.v).mod(n);
+ }
+
+ return toByteArray(m, getByteLength(n));
+@@ -208,82 +224,221 @@
+ return t;
+ }
+
+- // globally enable/disable use of blinding
+- private final static boolean ENABLE_BLINDING = true;
++ /**
++ * Parameters (u,v) for RSA Blinding. This is described in the RSA
++ * Bulletin#2 (Jan 96) and other places:
++ *
++ * ftp://ftp.rsa.com/pub/pdfs/bull-2.pdf
++ *
++ * The standard RSA Blinding decryption requires the public key exponent
++ * (e) and modulus (n), and converts ciphertext (c) to plaintext (p).
++ *
++ * Before the modular exponentiation operation, the input message should
++ * be multiplied by (u (mod n)), and afterward the result is corrected
++ * by multiplying with (v (mod n)). The system should reject messages
++ * equal to (0 (mod n)). That is:
++ *
++ * 1. Generate r between 0 and n-1, relatively prime to n.
++ * 2. Compute x = (c*u) mod n
++ * 3. Compute y = (x^d) mod n
++ * 4. Compute p = (y*v) mod n
++ *
++ * The Java APIs allows for either standard RSAPrivateKey or
++ * RSAPrivateCrtKey RSA keys.
++ *
++ * If the public exponent is available to us (e.g. RSAPrivateCrtKey),
++ * choose a random r, then let (u, v):
++ *
++ * u = r ^ e mod n
++ * v = r ^ (-1) mod n
++ *
++ * The proof follows:
++ *
++ * p = (((c * u) ^ d mod n) * v) mod n
++ * = ((c ^ d) * (u ^ d) * v) mod n
++ * = ((c ^ d) * (r ^ e) ^ d) * (r ^ (-1))) mod n
++ * = ((c ^ d) * (r ^ (e * d)) * (r ^ (-1))) mod n
++ * = ((c ^ d) * (r ^ 1) * (r ^ (-1))) mod n (see below)
++ * = (c ^ d) mod n
++ *
++ * because in RSA cryptosystem, d is the multiplicative inverse of e:
++ *
++ * (r^(e * d)) mod n
++ * = (r ^ 1) mod n
++ * = r mod n
++ *
++ * However, if the public exponent is not available (e.g. RSAPrivateKey),
++ * we mitigate the timing issue by using a similar random number blinding
++ * approach using the private key:
++ *
++ * u = r
++ * v = ((r ^ (-1)) ^ d) mod n
++ *
++ * This returns the same plaintext because:
++ *
++ * p = (((c * u) ^ d mod n) * v) mod n
++ * = ((c ^ d) * (u ^ d) * v) mod n
++ * = ((c ^ d) * (u ^ d) * ((u ^ (-1)) ^d)) mod n
++ * = (c ^ d) mod n
++ *
++ * Computing inverses mod n and random number generation is slow, so
++ * it is often not practical to generate a new random (u, v) pair for
++ * each new exponentiation. The calculation of parameters might even be
++ * subject to timing attacks. However, (u, v) pairs should not be
++ * reused since they themselves might be compromised by timing attacks,
++ * leaving the private exponent vulnerable. An efficient solution to
++ * this problem is update u and v before each modular exponentiation
++ * step by computing:
++ *
++ * u = u ^ 2
++ * v = v ^ 2
++ *
++ * The total performance cost is small.
++ */
++ private final static class BlindingRandomPair {
++ final BigInteger u;
++ final BigInteger v;
+
+- // maximum number of times that we will use a set of blinding parameters
+- // value suggested by Paul Kocher (quoted by NSS)
+- private final static int BLINDING_MAX_REUSE = 50;
+-
+- // cache for blinding parameters. Map<BigInteger, BlindingParameters>
+- // use a weak hashmap so that cached values are automatically cleared
+- // when the modulus is GC'ed
+- private final static Map<BigInteger, BlindingParameters> blindingCache =
+- new WeakHashMap<>();
++ BlindingRandomPair(BigInteger u, BigInteger v) {
++ this.u = u;
++ this.v = v;
++ }
++ }
+
+ /**
+ * Set of blinding parameters for a given RSA key.
+ *
+ * The RSA modulus is usually unique, so we index by modulus in
+- * blindingCache. However, to protect against the unlikely case of two
+- * keys sharing the same modulus, we also store the public exponent.
+- * This means we cannot cache blinding parameters for multiple keys that
+- * share the same modulus, but since sharing moduli is fundamentally broken
+- * an insecure, this does not matter.
++ * {@code blindingCache}. However, to protect against the unlikely
++ * case of two keys sharing the same modulus, we also store the public
++ * or the private exponent. This means we cannot cache blinding
++ * parameters for multiple keys that share the same modulus, but
++ * since sharing moduli is fundamentally broken and insecure, this
++ * does not matter.
+ */
+- private static final class BlindingParameters {
+- // e (RSA public exponent)
+- final BigInteger e;
+- // r ^ e mod n
+- final BigInteger re;
+- // inverse of r mod n
+- final BigInteger rInv;
+- // how many more times this parameter object can be used
+- private volatile int remainingUses;
+- BlindingParameters(BigInteger e, BigInteger re, BigInteger rInv) {
++ private final static class BlindingParameters {
++ private final static BigInteger BIG_TWO = BigInteger.valueOf(2L);
++
++ // RSA public exponent
++ private final BigInteger e;
++
++ // hash code of RSA private exponent
++ private final BigInteger d;
++
++ // r ^ e mod n (CRT), or r mod n (Non-CRT)
++ private BigInteger u;
++
++ // r ^ (-1) mod n (CRT) , or ((r ^ (-1)) ^ d) mod n (Non-CRT)
++ private BigInteger v;
++
++ // e: the public exponent
++ // d: the private exponent
++ // n: the modulus
++ BlindingParameters(BigInteger e, BigInteger d, BigInteger n) {
++ this.u = null;
++ this.v = null;
+ this.e = e;
+- this.re = re;
+- this.rInv = rInv;
+- // initialize remaining uses, subtract current use now
+- remainingUses = BLINDING_MAX_REUSE - 1;
++ this.d = d;
++
++ int len = n.bitLength();
++ SecureRandom random = JCAUtil.getSecureRandom();
++ u = new BigInteger(len, random).mod(n);
++ // Although the possibility is very much limited that u is zero
++ // or is not relatively prime to n, we still want to be careful
++ // about the special value.
++ //
++ // Secure random generation is expensive, try to use BigInteger.ONE
++ // this time if this new generated random number is zero or is not
++ // relatively prime to n. Next time, new generated secure random
++ // number will be used instead.
++ if (u.equals(BigInteger.ZERO)) {
++ u = BigInteger.ONE; // use 1 this time
++ }
++
++ try {
++ // The call to BigInteger.modInverse() checks that u is
++ // relatively prime to n. Otherwise, ArithmeticException is
++ // thrown.
++ v = u.modInverse(n);
++ } catch (ArithmeticException ae) {
++ // if u is not relatively prime to n, use 1 this time
++ u = BigInteger.ONE;
++ v = BigInteger.ONE;
++ }
++
++ if (e != null) {
++ u = u.modPow(e, n); // e: the public exponent
++ // u: random ^ e
++ // v: random ^ (-1)
++ } else {
++ v = v.modPow(d, n); // d: the private exponent
++ // u: random
++ // v: random ^ (-d)
++ }
+ }
+- boolean valid(BigInteger e) {
+- int k = remainingUses--;
+- return (k > 0) && this.e.equals(e);
++
++ // return null if need to reset the parameters
++ BlindingRandomPair getBlindingRandomPair(
++ BigInteger e, BigInteger d, BigInteger n) {
++
++ if ((this.e != null && this.e.equals(e)) ||
++ (this.d != null && this.d.equals(d))) {
++
++ BlindingRandomPair brp = null;
++ synchronized (this) {
++ if (!u.equals(BigInteger.ZERO) &&
++ !v.equals(BigInteger.ZERO)) {
++
++ brp = new BlindingRandomPair(u, v);
++ if (u.compareTo(BigInteger.ONE) <= 0 ||
++ v.compareTo(BigInteger.ONE) <= 0) {
++
++ // need to reset the random pair next time
++ u = BigInteger.ZERO;
++ v = BigInteger.ZERO;
++ } else {
++ u = u.modPow(BIG_TWO, n);
++ v = v.modPow(BIG_TWO, n);
++ }
++ } // Otherwise, need to reset the random pair.
++ }
++ return brp;
++ }
++
++ return null;
+ }
+ }
+
+- /**
+- * Return valid RSA blinding parameters for the given private key.
+- * Use cached parameters if available. If not, generate new parameters
+- * and cache.
+- */
+- private static BlindingParameters getBlindingParameters
+- (RSAPrivateCrtKey key) {
+- BigInteger modulus = key.getModulus();
+- BigInteger e = key.getPublicExponent();
+- BlindingParameters params;
+- // we release the lock between get() and put()
+- // that means threads might concurrently generate new blinding
+- // parameters for the same modulus. this is only a slight waste
+- // of cycles and seems preferable in terms of scalability
+- // to locking out all threads while generating new parameters
++ private static BlindingRandomPair getBlindingRandomPair(
++ BigInteger e, BigInteger d, BigInteger n) {
++
++ BlindingParameters bps = null;
+ synchronized (blindingCache) {
+- params = blindingCache.get(modulus);
++ bps = blindingCache.get(n);
+ }
+- if ((params != null) && params.valid(e)) {
+- return params;
++
++ if (bps == null) {
++ bps = new BlindingParameters(e, d, n);
++ synchronized (blindingCache) {
++ if (blindingCache.get(n) == null) {
++ blindingCache.put(n, bps);
++ }
++ }
+ }
+- int len = modulus.bitLength();
+- SecureRandom random = JCAUtil.getSecureRandom();
+- BigInteger r = new BigInteger(len, random).mod(modulus);
+- BigInteger re = r.modPow(e, modulus);
+- BigInteger rInv = r.modInverse(modulus);
+- params = new BlindingParameters(e, re, rInv);
+- synchronized (blindingCache) {
+- blindingCache.put(modulus, params);
++
++ BlindingRandomPair brp = bps.getBlindingRandomPair(e, d, n);
++ if (brp == null) {
++ // need to reset the blinding parameters
++ bps = new BlindingParameters(e, d, n);
++ synchronized (blindingCache) {
++ if (blindingCache.get(n) != null) {
++ blindingCache.put(n, bps);
++ }
++ }
++ brp = bps.getBlindingRandomPair(e, d, n);
+ }
+- return params;
++
++ return brp;
+ }
+
+ }
+--- ./jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java Wed Apr 16 12:37:49 2014 +0400
+@@ -50,23 +50,6 @@
+ */
+ final class RSAClientKeyExchange extends HandshakeMessage {
+
+- /**
+- * The TLS spec says that the version in the RSA premaster secret must
+- * be the maximum version supported by the client (i.e. the version it
+- * requested in its client hello version). However, we (and other
+- * implementations) used to send the active negotiated version. The
+- * system property below allows to toggle the behavior.
+- */
+- private final static String PROP_NAME =
+- "com.sun.net.ssl.rsaPreMasterSecretFix";
+-
+- /*
+- * Default is "false" (old behavior) for compatibility reasons in
+- * SSLv3/TLSv1. Later protocols (TLSv1.1+) do not use this property.
+- */
+- private final static boolean rsaPreMasterSecretFix =
+- Debug.getBooleanProperty(PROP_NAME, false);
+-
+ /*
+ * The following field values were encrypted with the server's public
+ * key (or temp key from server key exchange msg) and are presented
+@@ -90,22 +73,12 @@
+ }
+ this.protocolVersion = protocolVersion;
+
+- int major, minor;
+-
+- if (rsaPreMasterSecretFix || maxVersion.v >= ProtocolVersion.TLS11.v) {
+- major = maxVersion.major;
+- minor = maxVersion.minor;
+- } else {
+- major = protocolVersion.major;
+- minor = protocolVersion.minor;
+- }
+-
+ try {
+ String s = ((protocolVersion.v >= ProtocolVersion.TLS12.v) ?
+ "SunTls12RsaPremasterSecret" : "SunTlsRsaPremasterSecret");
+ KeyGenerator kg = JsseJce.getKeyGenerator(s);
+- kg.init(new TlsRsaPremasterSecretParameterSpec(major, minor),
+- generator);
++ kg.init(new TlsRsaPremasterSecretParameterSpec(
++ maxVersion.v, protocolVersion.v), generator);
+ preMaster = kg.generateKey();
+
+ Cipher cipher = JsseJce.getCipher(JsseJce.CIPHER_RSA_PKCS1);
+@@ -140,18 +113,17 @@
+ }
+ }
+
+- Exception failover = null;
+- byte[] encoded = null;
+ try {
+ Cipher cipher = JsseJce.getCipher(JsseJce.CIPHER_RSA_PKCS1);
+ // Cannot generate key here, please don't use Cipher.UNWRAP_MODE!
+- cipher.init(Cipher.DECRYPT_MODE, privateKey);
+- encoded = cipher.doFinal(encrypted);
+- } catch (BadPaddingException bpe) {
+- failover = bpe;
+- encoded = null;
+- } catch (IllegalBlockSizeException ibse) {
+- // the message it too big to process with RSA
++ cipher.init(Cipher.UNWRAP_MODE, privateKey,
++ new TlsRsaPremasterSecretParameterSpec(
++ maxVersion.v, currentVersion.v),
++ generator);
++ preMaster = (SecretKey)cipher.unwrap(encrypted,
++ "TlsRsaPremasterSecret", Cipher.SECRET_KEY);
++ } catch (InvalidKeyException ibk) {
++ // the message is too big to process with RSA
+ throw new SSLProtocolException(
+ "Unable to process PreMasterSecret, may be too big");
+ } catch (Exception e) {
+@@ -162,124 +134,6 @@
+ }
+ throw new RuntimeException("Could not generate dummy secret", e);
+ }
+-
+- // polish the premaster secret
+- preMaster = polishPreMasterSecretKey(
+- currentVersion, maxVersion, generator, encoded, failover);
+- }
+-
+- /**
+- * To avoid vulnerabilities described by section 7.4.7.1, RFC 5246,
+- * treating incorrectly formatted message blocks and/or mismatched
+- * version numbers in a manner indistinguishable from correctly
+- * formatted RSA blocks.
+- *
+- * RFC 5246 describes the approach as :
+- *
+- * 1. Generate a string R of 48 random bytes
+- *
+- * 2. Decrypt the message to recover the plaintext M
+- *
+- * 3. If the PKCS#1 padding is not correct, or the length of message
+- * M is not exactly 48 bytes:
+- * pre_master_secret = R
+- * else If ClientHello.client_version <= TLS 1.0, and version
+- * number check is explicitly disabled:
+- * premaster secret = M
+- * else If M[0..1] != ClientHello.client_version:
+- * premaster secret = R
+- * else:
+- * premaster secret = M
+- *
+- * Note that #2 has completed before the call of this method.
+- */
+- private SecretKey polishPreMasterSecretKey(ProtocolVersion currentVersion,
+- ProtocolVersion clientHelloVersion, SecureRandom generator,
+- byte[] encoded, Exception failoverException) {
+-
+- this.protocolVersion = clientHelloVersion;
+- if (generator == null) {
+- generator = new SecureRandom();
+- }
+- byte[] random = new byte[48];
+- generator.nextBytes(random);
+-
+- if (failoverException == null && encoded != null) {
+- // check the length
+- if (encoded.length != 48) {
+- if (debug != null && Debug.isOn("handshake")) {
+- System.out.println(
+- "incorrect length of premaster secret: " +
+- encoded.length);
+- }
+-
+- return generatePreMasterSecret(
+- clientHelloVersion, random, generator);
+- }
+-
+- if (clientHelloVersion.major != encoded[0] ||
+- clientHelloVersion.minor != encoded[1]) {
+-
+- if (clientHelloVersion.v <= ProtocolVersion.TLS10.v &&
+- currentVersion.major == encoded[0] &&
+- currentVersion.minor == encoded[1]) {
+- /*
+- * For compatibility, we maintain the behavior that the
+- * version in pre_master_secret can be the negotiated
+- * version for TLS v1.0 and SSL v3.0.
+- */
+- this.protocolVersion = currentVersion;
+- } else {
+- if (debug != null && Debug.isOn("handshake")) {
+- System.out.println("Mismatching Protocol Versions, " +
+- "ClientHello.client_version is " +
+- clientHelloVersion +
+- ", while PreMasterSecret.client_version is " +
+- ProtocolVersion.valueOf(encoded[0], encoded[1]));
+- }
+-
+- encoded = random;
+- }
+- }
+-
+- return generatePreMasterSecret(
+- clientHelloVersion, encoded, generator);
+- }
+-
+- if (debug != null && Debug.isOn("handshake") &&
+- failoverException != null) {
+- System.out.println("Error decrypting premaster secret:");
+- failoverException.printStackTrace(System.out);
+- }
+-
+- return generatePreMasterSecret(clientHelloVersion, random, generator);
+- }
+-
+- // generate a premaster secret with the specified version number
+- private static SecretKey generatePreMasterSecret(
+- ProtocolVersion version, byte[] encodedSecret,
+- SecureRandom generator) {
+-
+- if (debug != null && Debug.isOn("handshake")) {
+- System.out.println("Generating a random fake premaster secret");
+- }
+-
+- try {
+- String s = ((version.v >= ProtocolVersion.TLS12.v) ?
+- "SunTls12RsaPremasterSecret" : "SunTlsRsaPremasterSecret");
+- KeyGenerator kg = JsseJce.getKeyGenerator(s);
+- kg.init(new TlsRsaPremasterSecretParameterSpec(
+- version.major, version.minor, encodedSecret), generator);
+- return kg.generateKey();
+- } catch (InvalidAlgorithmParameterException |
+- NoSuchAlgorithmException iae) {
+- // unlikely to happen, otherwise, must be a provider exception
+- if (debug != null && Debug.isOn("handshake")) {
+- System.out.println("RSA premaster secret generation error:");
+- iae.printStackTrace(System.out);
+- }
+- throw new RuntimeException("Could not generate dummy secret", iae);
+- }
+ }
+
+ @Override
+--- ./jdk/src/share/classes/sun/security/util/KeyUtil.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/classes/sun/security/util/KeyUtil.java Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+@@ -32,6 +32,7 @@
+ import java.security.interfaces.ECKey;
+ import java.security.interfaces.RSAKey;
+ import java.security.interfaces.DSAKey;
++import java.security.SecureRandom;
+ import java.security.spec.KeySpec;
+ import javax.crypto.SecretKey;
+ import javax.crypto.interfaces.DHKey;
+@@ -157,6 +158,79 @@
+ }
+
+ /**
++ * Check the format of TLS PreMasterSecret.
++ * <P>
++ * To avoid vulnerabilities described by section 7.4.7.1, RFC 5246,
++ * treating incorrectly formatted message blocks and/or mismatched
++ * version numbers in a manner indistinguishable from correctly
++ * formatted RSA blocks.
++ *
++ * RFC 5246 describes the approach as :
++ *
++ * 1. Generate a string R of 48 random bytes
++ *
++ * 2. Decrypt the message to recover the plaintext M
++ *
++ * 3. If the PKCS#1 padding is not correct, or the length of message
++ * M is not exactly 48 bytes:
++ * pre_master_secret = R
++ * else If ClientHello.client_version <= TLS 1.0, and version
++ * number check is explicitly disabled:
++ * premaster secret = M
++ * else If M[0..1] != ClientHello.client_version:
++ * premaster secret = R
++ * else:
++ * premaster secret = M
++ *
++ * Note that #2 should have completed before the call to this method.
++ *
++ * @param clientVersion the version of the TLS protocol by which the
++ * client wishes to communicate during this session
++ * @param serverVersion the negotiated version of the TLS protocol which
++ * contains the lower of that suggested by the client in the client
++ * hello and the highest supported by the server.
++ * @param encoded the encoded key in its "RAW" encoding format
++ * @param isFailover whether or not the previous decryption of the
++ * encrypted PreMasterSecret message run into problem
++ * @return the polished PreMasterSecret key in its "RAW" encoding format
++ */
++ public static byte[] checkTlsPreMasterSecretKey(
++ int clientVersion, int serverVersion, SecureRandom random,
++ byte[] encoded, boolean isFailOver) {
++
++ if (random == null) {
++ random = new SecureRandom();
++ }
++ byte[] replacer = new byte[48];
++ random.nextBytes(replacer);
++
++ if (!isFailOver && (encoded != null)) {
++ // check the length
++ if (encoded.length != 48) {
++ // private, don't need to clone the byte array.
++ return replacer;
++ }
++
++ int encodedVersion =
++ ((encoded[0] & 0xFF) << 8) | (encoded[1] & 0xFF);
++ if (clientVersion != encodedVersion) {
++ if (clientVersion > 0x0301 || // 0x0301: TLSv1
++ serverVersion != encodedVersion) {
++ encoded = replacer;
++ } // Otherwise, For compatibility, we maintain the behavior
++ // that the version in pre_master_secret can be the
++ // negotiated version for TLS v1.0 and SSL v3.0.
++ }
++
++ // private, don't need to clone the byte array.
++ return encoded;
++ }
++
++ // private, don't need to clone the byte array.
++ return replacer;
++ }
++
++ /**
+ * Returns whether the Diffie-Hellman public key is valid or not.
+ *
+ * Per RFC 2631 and NIST SP800-56A, the following algorithm is used to
+@@ -198,7 +272,16 @@
+ "Diffie-Hellman public key is too large");
+ }
+
+- // Don't bother to check against the y^q mod p if safe primes are used.
++ // y^q mod p == 1?
++ // Unable to perform this check as q is unknown in this circumstance.
++
++ // p is expected to be prime. However, it is too expensive to check
++ // that p is prime. Instead, in order to mitigate the impact of
++ // non-prime values, we check that y is not a factor of p.
++ BigInteger r = p.remainder(y);
++ if (r.equals(BigInteger.ZERO)) {
++ throw new InvalidKeyException("Invalid Diffie-Hellman parameters");
++ }
+ }
+
+ /**
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/sun/util/resources/CalendarData_pt_BR.properties Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,40 @@
++#
++# 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.
++#
++
++# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
++# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved
++#
++# The original version of this source code and documentation
++# is copyrighted and owned by Taligent, Inc., a wholly-owned
++# subsidiary of IBM. These materials are provided under terms
++# of a License Agreement between Taligent and Sun. This technology
++# is protected by multiple US and International patents.
++#
++# This notice and attribution to Taligent may not be removed.
++# Taligent is a registered trademark of Taligent, Inc.
++
++
++firstDayOfWeek=1
++minimalDaysInFirstWeek=1
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2009, 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
+@@ -79,6 +79,7 @@
+ #define ERROR_RESOURCE "Cannot extract resource file"
+ #define ERROR_OVERFLOW "Internal buffer overflow"
+ #define ERROR_INTERNAL "Internal error"
++#define ERROR_INIT "cannot init class members"
+
+ #define LOGFILE_STDOUT "-"
+ #define LOGFILE_STDERR ""
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -56,6 +56,45 @@
+
+ #define THROW_IOE(x) JNU_ThrowIOException(env,x)
+
++#define CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(CERVTI_exception, CERVTI_message) \
++ do { \
++ if ((env)->ExceptionOccurred()) { \
++ THROW_IOE(CERVTI_message); \
++ return; \
++ } \
++ if ((CERVTI_exception) == NULL) { \
++ THROW_IOE(CERVTI_message); \
++ return; \
++ } \
++ } while (JNI_FALSE)
++
++
++#define CHECK_EXCEPTION_RETURN_VALUE(CERL_exception, CERL_return_value) \
++ do { \
++ if ((env)->ExceptionOccurred()) { \
++ return CERL_return_value; \
++ } \
++ if ((CERL_exception) == NULL) { \
++ return CERL_return_value; \
++ } \
++ } while (JNI_FALSE)
++
++
++// If these useful macros aren't defined in jni_util.h then define them here
++#ifndef CHECK_NULL_RETURN
++#define CHECK_NULL_RETURN(x, y) \
++ do { \
++ if ((x) == NULL) return (y); \
++ } while (JNI_FALSE)
++#endif
++
++#ifndef CHECK_EXCEPTION_RETURN
++#define CHECK_EXCEPTION_RETURN(env, y) \
++ do { \
++ if ((*env)->ExceptionCheck(env)) return (y); \
++ } while (JNI_FALSE)
++#endif
++
+ static jlong read_input_via_jni(unpacker* self,
+ void* buf, jlong minlen, jlong maxlen);
+
+@@ -92,9 +131,11 @@
+ vm->GetEnv(&envRaw, JNI_VERSION_1_1);
+ JNIEnv* env = (JNIEnv*) envRaw;
+ //fprintf(stderr, "get_unpacker() env=%p\n", env);
+- if (env == null)
+- return null;
++ CHECK_NULL_RETURN(env, NULL);
+ jobject pObj = env->CallStaticObjectMethod(NIclazz, currentInstMID);
++ // We should check upon the known non-null variable because here we want to check
++ // only for pending exceptions. If pObj is null we'll deal with it later.
++ CHECK_EXCEPTION_RETURN_VALUE(env, NULL);
+ //fprintf(stderr, "get_unpacker0() pObj=%p\n", pObj);
+ if (pObj != null) {
+ // Got pObj and env; now do it the easy way.
+@@ -137,20 +178,20 @@
+ while( dbg != null) { sleep(10); }
+ #endif
+ NIclazz = (jclass) env->NewGlobalRef(clazz);
++
+ unpackerPtrFID = env->GetFieldID(clazz, "unpackerPtr", "J");
++ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(unpackerPtrFID, ERROR_INIT);
++
+ currentInstMID = env->GetStaticMethodID(clazz, "currentInstance",
+ "()Ljava/lang/Object;");
++ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(currentInstMID, ERROR_INIT);
++
+ readInputMID = env->GetMethodID(clazz, "readInputFn",
+ "(Ljava/nio/ByteBuffer;J)J");
++ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(readInputMID, ERROR_INIT);
++
+ getUnpackerPtrMID = env->GetMethodID(clazz, "getUnpackerPtr", "()J");
+-
+- if (unpackerPtrFID == null ||
+- currentInstMID == null ||
+- readInputMID == null ||
+- NIclazz == null ||
+- getUnpackerPtrMID == null) {
+- THROW_IOE("cannot init class members");
+- }
++ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(getUnpackerPtrMID, ERROR_INIT);
+ }
+
+ JNIEXPORT jlong JNICALL
+@@ -160,9 +201,7 @@
+ // valid object pointers and env is intact, if not now is good time to bail.
+ unpacker* uPtr = get_unpacker();
+ //fprintf(stderr, "start(%p) uPtr=%p initializing\n", pObj, uPtr);
+- if (uPtr == null) {
+- return -1;
+- }
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, -1);
+ // redirect our io to the default log file or whatever.
+ uPtr->redirect_stdio();
+
+@@ -200,6 +239,7 @@
+ jobjectArray pParts) {
+
+ unpacker* uPtr = get_unpacker(env, pObj);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
+ unpacker::file* filep = uPtr->get_next_file();
+
+ if (uPtr->aborting()) {
+@@ -207,32 +247,38 @@
+ return false;
+ }
+
+- if (filep == null) {
+- return false; // end of the sequence
+- }
++ CHECK_NULL_RETURN(filep, false);
+ assert(filep == &uPtr->cur_file);
+
+ int pidx = 0, iidx = 0;
+ jintArray pIntParts = (jintArray) env->GetObjectArrayElement(pParts, pidx++);
++ CHECK_EXCEPTION_RETURN_VALUE(pIntParts, false);
+ jint* intParts = env->GetIntArrayElements(pIntParts, null);
+ intParts[iidx++] = (jint)( (julong)filep->size >> 32 );
+ intParts[iidx++] = (jint)( (julong)filep->size >> 0 );
+ intParts[iidx++] = filep->modtime;
+ intParts[iidx++] = filep->deflate_hint() ? 1 : 0;
+ env->ReleaseIntArrayElements(pIntParts, intParts, JNI_COMMIT);
+-
+- env->SetObjectArrayElement(pParts, pidx++, env->NewStringUTF(filep->name));
+-
++ jstring filename = env->NewStringUTF(filep->name);
++ CHECK_EXCEPTION_RETURN_VALUE(filename, false);
++ env->SetObjectArrayElement(pParts, pidx++, filename);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
+ jobject pDataBuf = null;
+- if (filep->data[0].len > 0)
++ if (filep->data[0].len > 0) {
+ pDataBuf = env->NewDirectByteBuffer(filep->data[0].ptr,
+ filep->data[0].len);
++ CHECK_EXCEPTION_RETURN_VALUE(pDataBuf, false);
++ }
+ env->SetObjectArrayElement(pParts, pidx++, pDataBuf);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
+ pDataBuf = null;
+- if (filep->data[1].len > 0)
++ if (filep->data[1].len > 0) {
+ pDataBuf = env->NewDirectByteBuffer(filep->data[1].ptr,
+ filep->data[1].len);
++ CHECK_EXCEPTION_RETURN_VALUE(pDataBuf, false);
++ }
+ env->SetObjectArrayElement(pParts, pidx++, pDataBuf);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
+
+ return true;
+ }
+@@ -241,6 +287,7 @@
+ JNIEXPORT jobject JNICALL
+ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject pObj) {
+ unpacker* uPtr = get_unpacker(env, pObj);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
+ unpacker::file* filep = &uPtr->cur_file;
+
+ if (uPtr->aborting()) {
+@@ -263,7 +310,7 @@
+ JNIEXPORT jlong JNICALL
+ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
+ unpacker* uPtr = get_unpacker(env, pObj, false);
+- if (uPtr == null) return 0;
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
+ size_t consumed = uPtr->input_consumed();
+ free_unpacker(env, pObj, uPtr);
+ return consumed;
+@@ -274,7 +321,9 @@
+ jstring pProp, jstring pValue) {
+ unpacker* uPtr = get_unpacker(env, pObj);
+ const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
++ CHECK_EXCEPTION_RETURN_VALUE(prop, false);
+ const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
++ CHECK_EXCEPTION_RETURN_VALUE(value, false);
+ jboolean retval = uPtr->set_option(prop, value);
+ env->ReleaseStringUTFChars(pProp, prop);
+ env->ReleaseStringUTFChars(pValue, value);
+@@ -286,9 +335,11 @@
+ jstring pProp) {
+
+ unpacker* uPtr = get_unpacker(env, pObj);
++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
+ const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
++ CHECK_EXCEPTION_RETURN_VALUE(prop, NULL);
+ const char* value = uPtr->get_option(prop);
++ CHECK_EXCEPTION_RETURN_VALUE(value, NULL);
+ env->ReleaseStringUTFChars(pProp, prop);
+- if (value == null) return null;
+ return env->NewStringUTF(value);
+ }
+--- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -373,14 +373,14 @@
+
+
+ /* Parse the source image */
+- if ((status = awt_parseImage(env, jsrc, &srcImageP, FALSE)) <= 0) {
++ if (awt_parseImage(env, jsrc, &srcImageP, FALSE) <= 0) {
+ /* Can't handle any custom images */
+ free(dkern);
+ return 0;
+ }
+
+ /* Parse the destination image */
+- if ((status = awt_parseImage(env, jdst, &dstImageP, FALSE)) <= 0) {
++ if (awt_parseImage(env, jdst, &dstImageP, FALSE) <= 0) {
+ /* Can't handle any custom images */
+ awt_freeParsedImage(srcImageP, TRUE);
+ free(dkern);
+@@ -627,7 +627,7 @@
+ }
+
+ /* Parse the source raster */
+- if ((status = awt_parseRaster(env, jsrc, srcRasterP)) <= 0) {
++ if (awt_parseRaster(env, jsrc, srcRasterP) <= 0) {
+ /* Can't handle any custom rasters */
+ free(srcRasterP);
+ free(dstRasterP);
+@@ -636,7 +636,7 @@
+ }
+
+ /* Parse the destination raster */
+- if ((status = awt_parseRaster(env, jdst, dstRasterP)) <= 0) {
++ if (awt_parseRaster(env, jdst, dstRasterP) <= 0) {
+ /* Can't handle any custom images */
+ awt_freeParsedRaster(srcRasterP, TRUE);
+ free(dstRasterP);
+@@ -839,13 +839,13 @@
+ (*env)->ReleasePrimitiveArrayCritical(env, jmatrix, matrix, JNI_ABORT);
+
+ /* Parse the source image */
+- if ((status = awt_parseImage(env, jsrc, &srcImageP, FALSE)) <= 0) {
++ if (awt_parseImage(env, jsrc, &srcImageP, FALSE) <= 0) {
+ /* Can't handle any custom images */
+ return 0;
+ }
+
+ /* Parse the destination image */
+- if ((status = awt_parseImage(env, jdst, &dstImageP, FALSE)) <= 0) {
++ if (awt_parseImage(env, jdst, &dstImageP, FALSE) <= 0) {
+ /* Can't handle any custom images */
+ awt_freeParsedImage(srcImageP, TRUE);
+ return 0;
+@@ -1059,7 +1059,7 @@
+ (*env)->ReleasePrimitiveArrayCritical(env, jmatrix, matrix, JNI_ABORT);
+
+ /* Parse the source raster */
+- if ((status = awt_parseRaster(env, jsrc, srcRasterP)) <= 0) {
++ if (awt_parseRaster(env, jsrc, srcRasterP) <= 0) {
+ /* Can't handle any custom rasters */
+ free(srcRasterP);
+ free(dstRasterP);
+@@ -1067,7 +1067,7 @@
+ }
+
+ /* Parse the destination raster */
+- if ((status = awt_parseRaster(env, jdst, dstRasterP)) <= 0) {
++ if (awt_parseRaster(env, jdst, dstRasterP) <= 0) {
+ /* Can't handle any custom images */
+ awt_freeParsedRaster(srcRasterP, TRUE);
+ free(dstRasterP);
+@@ -1305,13 +1305,13 @@
+ if (s_timeIt) (*start_timer)(3600);
+
+ /* Parse the source image */
+- if ((status = awt_parseImage(env, jsrc, &srcImageP, FALSE)) <= 0) {
++ if (awt_parseImage(env, jsrc, &srcImageP, FALSE) <= 0) {
+ /* Can't handle any custom images */
+ return 0;
+ }
+
+ /* Parse the destination image */
+- if ((status = awt_parseImage(env, jdst, &dstImageP, FALSE)) <= 0) {
++ if (awt_parseImage(env, jdst, &dstImageP, FALSE) <= 0) {
+ /* Can't handle any custom images */
+ awt_freeParsedImage(srcImageP, TRUE);
+ return 0;
+@@ -1553,14 +1553,14 @@
+ }
+
+ /* Parse the source raster - reject custom images */
+- if ((status = awt_parseRaster(env, jsrc, srcRasterP)) <= 0) {
++ if (awt_parseRaster(env, jsrc, srcRasterP) <= 0) {
+ free(srcRasterP);
+ free(dstRasterP);
+ return 0;
+ }
+
+ /* Parse the destination image - reject custom images */
+- if ((status = awt_parseRaster(env, jdst, dstRasterP)) <= 0) {
++ if (awt_parseRaster(env, jdst, dstRasterP) <= 0) {
+ awt_freeParsedRaster(srcRasterP, TRUE);
+ free(dstRasterP);
+ return 0;
+--- ./jdk/src/share/native/sun/font/freetypeScaler.c Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/native/sun/font/freetypeScaler.c Wed Apr 16 12:37:49 2014 +0400
+@@ -177,18 +177,10 @@
+ if (numBytes > FILEDATACACHESIZE) {
+ bBuffer = (*env)->NewDirectByteBuffer(env, destBuffer, numBytes);
+ if (bBuffer != NULL) {
+- /* Loop until the read succeeds (or EOF).
+- * This should improve robustness in the event of a problem in
+- * the I/O system. If we find that we ever end up spinning here
+- * we are going to have to do some serious work to recover.
+- * Just returning without reading the data will cause a crash.
+- */
+- while (bread == 0) {
+- bread = (*env)->CallIntMethod(env,
+- scalerInfo->font2D,
+- sunFontIDs.ttReadBlockMID,
+- bBuffer, offset, numBytes);
+- }
++ bread = (*env)->CallIntMethod(env,
++ scalerInfo->font2D,
++ sunFontIDs.ttReadBlockMID,
++ bBuffer, offset, numBytes);
+ return bread;
+ } else {
+ /* We probably hit bug bug 4845371. For reasons that
+@@ -224,19 +216,10 @@
+ (offset + FILEDATACACHESIZE > scalerInfo->fileSize) ?
+ scalerInfo->fileSize - offset : FILEDATACACHESIZE;
+ bBuffer = scalerInfo->directBuffer;
+- /* Loop until all the read succeeds (or EOF).
+- * This should improve robustness in the event of a problem in
+- * the I/O system. If we find that we ever end up spinning here
+- * we are going to have to do some serious work to recover.
+- * Just returning without reading the data will cause a crash.
+- */
+- while (bread == 0) {
+- bread = (*env)->CallIntMethod(env, scalerInfo->font2D,
+- sunFontIDs.ttReadBlockMID,
+- bBuffer, offset,
+- scalerInfo->fontDataLength);
+- }
+-
++ bread = (*env)->CallIntMethod(env, scalerInfo->font2D,
++ sunFontIDs.ttReadBlockMID,
++ bBuffer, offset,
++ scalerInfo->fontDataLength);
+ memcpy(destBuffer, scalerInfo->fontData, numBytes);
+ return numBytes;
+ }
+--- ./jdk/src/share/native/sun/management/GcInfoBuilder.c Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/native/sun/management/GcInfoBuilder.c Wed Apr 16 12:37:49 2014 +0400
+@@ -190,7 +190,7 @@
+
+ if (ext_att_count <= 0) {
+ JNU_ThrowIllegalArgumentException(env, "Invalid ext_att_count");
+- return;
++ return 0;
+ }
+
+ gc_stat.usage_before_gc = usageBeforeGC;
+--- ./jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Apr 16 12:37:49 2014 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2009, 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
+@@ -62,24 +62,42 @@
+ SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
+ if (freeStruct)
+ free(ecparams);
++
++}
++
++jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
++{
++ SECItem *s = (SECItem *)hSECItem;
++
++ jbyteArray jEncodedBytes = env->NewByteArray(s->len);
++ if (jEncodedBytes == NULL) {
++ return NULL;
++ }
++ // Copy bytes from a native SECItem buffer to java byte array
++ env->SetByteArrayRegion(jEncodedBytes, 0, s->len, (jbyte *)s->data);
++ if (env->ExceptionCheck()) { //should never happen
++ return NULL;
++ }
++ return jEncodedBytes;
+ }
+
+ /*
+ * Class: sun_security_ec_ECKeyPairGenerator
+ * Method: generateECKeyPair
+- * Signature: (I[B[B)[J
++ * Signature: (I[B[B)[B
+ */
+-JNIEXPORT jlongArray
++JNIEXPORT jobjectArray
+ JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
+ (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
+ {
+- ECPrivateKey *privKey; /* contains both public and private values */
++ ECPrivateKey *privKey = NULL; /* contains both public and private values */
+ ECParams *ecparams = NULL;
+ SECKEYECParams params_item;
+ jint jSeedLength;
+ jbyte* pSeedBuffer = NULL;
+- jlongArray result = NULL;
+- jlong* resultElements = NULL;
++ jobjectArray result = NULL;
++ jclass baCls = NULL;
++ jbyteArray jba;
+
+ // Initialize the ECParams struct
+ params_item.len = env->GetArrayLength(encodedParams);
+@@ -106,61 +124,64 @@
+ }
+
+ jboolean isCopy;
+- result = env->NewLongArray(2);
+- resultElements = env->GetLongArrayElements(result, &isCopy);
++ baCls = env->FindClass("[B");
++ if (baCls == NULL) {
++ goto cleanup;
++ }
++ result = env->NewObjectArray(2, baCls, NULL);
++ if (result == NULL) {
++ goto cleanup;
++ }
++ jba = getEncodedBytes(env, &(privKey->privateValue));
++ if (jba == NULL) {
++ result = NULL;
++ goto cleanup;
++ }
++ env->SetObjectArrayElement(result, 0, jba); // big integer
++ if (env->ExceptionCheck()) { // should never happen
++ result = NULL;
++ goto cleanup;
++ }
+
+- resultElements[0] = (jlong) &(privKey->privateValue); // private big integer
+- resultElements[1] = (jlong) &(privKey->publicValue); // encoded ec point
+-
+- // If the array is a copy then we must write back our changes
+- if (isCopy == JNI_TRUE) {
+- env->ReleaseLongArrayElements(result, resultElements, 0);
++ jba = getEncodedBytes(env, &(privKey->publicValue));
++ if (jba == NULL) {
++ result = NULL;
++ goto cleanup;
++ }
++ env->SetObjectArrayElement(result, 1, jba); // encoded ec point
++ if (env->ExceptionCheck()) { // should never happen
++ result = NULL;
++ goto cleanup;
+ }
+
+ cleanup:
+ {
+- if (params_item.data)
++ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++ }
+
+- if (ecparams)
++ if (ecparams) {
+ FreeECParams(ecparams, true);
++ }
+
+ if (privKey) {
+ FreeECParams(&privKey->ecParams, false);
+ SECITEM_FreeItem(&privKey->version, B_FALSE);
+- // Don't free privKey->privateValue and privKey->publicValue
++ SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
++ SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
++ free(privKey);
+ }
+
+- if (pSeedBuffer)
++ if (pSeedBuffer) {
+ delete [] pSeedBuffer;
++ }
+ }
+
+ return result;
+ }
+
+ /*
+- * Class: sun_security_ec_ECKeyPairGenerator
+- * Method: getEncodedBytes
+- * Signature: (J)[B
+- */
+-JNIEXPORT jbyteArray
+-JNICALL Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes
+- (JNIEnv *env, jclass clazz, jlong hSECItem)
+-{
+- SECItem *s = (SECItem *)hSECItem;
+- jbyteArray jEncodedBytes = env->NewByteArray(s->len);
+-
+- // Copy bytes from a native SECItem buffer to Java byte array
+- env->SetByteArrayRegion(jEncodedBytes, 0, s->len, (jbyte *)s->data);
+-
+- // Use B_FALSE to free only the SECItem->data
+- SECITEM_FreeItem(s, B_FALSE);
+-
+- return jEncodedBytes;
+-}
+-
+-/*
+ * Class: sun_security_ec_ECDSASignature
+ * Method: signDigest
+ * Signature: ([B[B[B[B)[B
+@@ -234,21 +255,31 @@
+
+ cleanup:
+ {
+- if (params_item.data)
++ if (params_item.data) {
+ env->ReleaseByteArrayElements(encodedParams,
+ (jbyte *) params_item.data, JNI_ABORT);
++ }
+
+- if (pDigestBuffer)
++ if (privKey.privateValue.data) {
++ env->ReleaseByteArrayElements(privateKey,
++ (jbyte *) privKey.privateValue.data, JNI_ABORT);
++ }
++
++ if (pDigestBuffer) {
+ delete [] pDigestBuffer;
++ }
+
+- if (pSignedDigestBuffer)
++ if (pSignedDigestBuffer) {
+ delete [] pSignedDigestBuffer;
++ }
+
+- if (pSeedBuffer)
++ if (pSeedBuffer) {
+ delete [] pSeedBuffer;
++ }
+
+- if (ecparams)
++ if (ecparams) {
+ FreeECParams(ecparams, true);
++ }
+ }
+
+ return jSignedDigest;
+--- ./jdk/src/solaris/classes/sun/font/FcFontConfiguration.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/solaris/classes/sun/font/FcFontConfiguration.java Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -33,6 +33,7 @@
+ import java.net.InetAddress;
+ import java.net.UnknownHostException;
+ import java.nio.charset.Charset;
++import java.nio.charset.StandardCharsets;
+ import java.nio.file.Files;
+ import java.util.HashMap;
+ import java.util.HashSet;
+@@ -173,8 +174,16 @@
+ }
+
+ @Override
+- public FontDescriptor[] getFontDescriptors(String fontName, int style) {
+- return new FontDescriptor[0];
++ protected FontDescriptor[] buildFontDescriptors(int fontIndex, int styleIndex) {
++ CompositeFontDescriptor[] cfi = get2DCompositeFontInfo();
++ int idx = fontIndex * NUM_STYLES + styleIndex;
++ String[] componentFaceNames = cfi[idx].getComponentFaceNames();
++ FontDescriptor[] ret = new FontDescriptor[componentFaceNames.length];
++ for (int i = 0; i < componentFaceNames.length; i++) {
++ ret[i] = new FontDescriptor(componentFaceNames[i], StandardCharsets.UTF_8.newEncoder(), new int[0]);
++ }
++
++ return ret;
+ }
+
+ @Override
+@@ -250,10 +259,12 @@
+ }
+
+ String[] fileNames = new String[numFonts];
++ String[] faceNames = new String[numFonts];
+
+ int index;
+ for (index = 0; index < fcFonts.length; index++) {
+ fileNames[index] = fcFonts[index].fontFile;
++ faceNames[index] = fcFonts[index].familyName;
+ }
+
+ if (installedFallbackFontFiles != null) {
+@@ -266,7 +277,7 @@
+ = new CompositeFontDescriptor(
+ faceName,
+ 1,
+- null,
++ faceNames,
+ fileNames,
+ null, null);
+ }
+--- ./jdk/src/windows/bin/java_md.c Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/windows/bin/java_md.c Wed Apr 16 12:37:49 2014 +0400
+@@ -1301,6 +1301,14 @@
+ /* save path length */
+ jrePathLen = JLI_StrLen(libraryPath);
+
++ if (jrePathLen + JLI_StrLen("\\bin\\verify.dll") >= MAXPATHLEN) {
++ /* jre path is too long, the library path will not fit there;
++ * report and abort preloading
++ */
++ JLI_ReportErrorMessage(JRE_ERROR11);
++ break;
++ }
++
+ /* load msvcrt 1st */
+ LoadMSVCRT();
+
+--- ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java Wed Apr 16 12:37:49 2014 +0400
+@@ -583,11 +583,18 @@
+
+ // Needs to be accessible to Win32ShellFolderManager2
+ static String getFileSystemPath(final int csidl) throws IOException, InterruptedException {
+- return invoke(new Callable<String>() {
++ String path = invoke(new Callable<String>() {
+ public String call() throws IOException {
+ return getFileSystemPath0(csidl);
+ }
+ }, IOException.class);
++ if (path != null) {
++ SecurityManager security = System.getSecurityManager();
++ if (security != null) {
++ security.checkRead(path);
++ }
++ }
++ return path;
+ }
+
+ // NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details
+--- ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java Wed Apr 16 12:37:49 2014 +0400
+@@ -138,6 +138,8 @@
+ if (desktop == null) {
+ try {
+ desktop = new Win32ShellFolder2(DESKTOP);
++ } catch (SecurityException e) {
++ // Ignore error
+ } catch (IOException e) {
+ // Ignore error
+ } catch (InterruptedException e) {
+@@ -151,6 +153,8 @@
+ if (drives == null) {
+ try {
+ drives = new Win32ShellFolder2(DRIVES);
++ } catch (SecurityException e) {
++ // Ignore error
+ } catch (IOException e) {
+ // Ignore error
+ } catch (InterruptedException e) {
+@@ -167,6 +171,8 @@
+ if (path != null) {
+ recent = createShellFolder(getDesktop(), new File(path));
+ }
++ } catch (SecurityException e) {
++ // Ignore error
+ } catch (InterruptedException e) {
+ // Ignore error
+ } catch (IOException e) {
+@@ -180,6 +186,8 @@
+ if (network == null) {
+ try {
+ network = new Win32ShellFolder2(NETWORK);
++ } catch (SecurityException e) {
++ // Ignore error
+ } catch (IOException e) {
+ // Ignore error
+ } catch (InterruptedException e) {
+@@ -203,6 +211,8 @@
+ personal.setIsPersonal();
+ }
+ }
++ } catch (SecurityException e) {
++ // Ignore error
+ } catch (InterruptedException e) {
+ // Ignore error
+ } catch (IOException e) {
+--- ./jdk/src/windows/classes/sun/awt/windows/ThemeReader.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/windows/ThemeReader.java Wed Apr 16 12:37:49 2014 +0400
+@@ -56,18 +56,12 @@
+ new ReentrantReadWriteLock();
+ private static final Lock readLock = readWriteLock.readLock();
+ private static final Lock writeLock = readWriteLock.writeLock();
++ private static volatile boolean valid = false;
+
+ static void flush() {
+- writeLock.lock();
+- try {
+- // Close old themes.
+- for (Long value : widgetToTheme.values()) {
+- closeTheme(value.longValue());
+- }
+- widgetToTheme.clear();
+- } finally {
+- writeLock.unlock();
+- }
++ // Could be called on Toolkit thread, so do not try to aquire locks
++ // to avoid deadlock with theme initialization
++ valid = false;
+ }
+
+ public native static boolean isThemed();
+@@ -94,6 +88,24 @@
+ // returns theme value
+ // this method should be invoked with readLock locked
+ private static Long getTheme(String widget) {
++ if (!valid) {
++ readLock.unlock();
++ writeLock.lock();
++ try {
++ if (!valid) {
++ // Close old themes.
++ for (Long value : widgetToTheme.values()) {
++ closeTheme(value);
++ }
++ widgetToTheme.clear();
++ valid = true;
++ }
++ } finally {
++ readLock.lock();
++ writeLock.unlock();
++ }
++ }
++
+ // mostly copied from the javadoc for ReentrantReadWriteLock
+ Long theme = widgetToTheme.get(widget);
+ if (theme == null) {
+--- ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java Wed Apr 16 12:37:49 2014 +0400
+@@ -864,12 +864,18 @@
+ * Windows doesn't always send WM_SETTINGCHANGE when it should.
+ */
+ private void windowsSettingChange() {
+- EventQueue.invokeLater(new Runnable() {
+- @Override
+- public void run() {
+- updateProperties();
+- }
+- });
++ if (AppContext.getAppContext() == null) {
++ // We cannot post the update to any EventQueue. Listeners will
++ // be called on EDTs by DesktopPropertyChangeSupport
++ updateProperties();
++ } else {
++ EventQueue.invokeLater(new Runnable() {
++ @Override
++ public void run() {
++ updateProperties();
++ }
++ });
++ }
+ }
+
+ private synchronized void updateProperties() {
+--- ./jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java Wed Apr 16 12:37:49 2014 +0400
+@@ -421,6 +421,7 @@
+ */
+ public static long[] getActiveWindowHandles() {
+ AppContext appContext = AppContext.getAppContext();
++ if (appContext == null) return null;
+ synchronized (appContext) {
+ List<WWindowPeer> l = (List<WWindowPeer>)appContext.get(ACTIVE_WINDOWS_KEY);
+ if (l == null) {
+--- ./jdk/src/windows/classes/sun/security/mscapi/RSACipher.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/windows/classes/sun/security/mscapi/RSACipher.java Wed Apr 16 12:37:49 2014 +0400
+@@ -35,6 +35,8 @@
+ import javax.crypto.spec.*;
+
+ import sun.security.rsa.RSAKeyFactory;
++import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
++import sun.security.util.KeyUtil;
+
+ /**
+ * RSA cipher implementation using the Microsoft Crypto API.
+@@ -92,9 +94,16 @@
+
+ // the public key, if we were initialized using a public key
+ private sun.security.mscapi.Key publicKey;
++
+ // the private key, if we were initialized using a private key
+ private sun.security.mscapi.Key privateKey;
+
++ // cipher parameter for TLS RSA premaster secret
++ private AlgorithmParameterSpec spec = null;
++
++ // the source of randomness
++ private SecureRandom random;
++
+ public RSACipher() {
+ paddingType = PAD_PKCS1;
+ }
+@@ -155,8 +164,12 @@
+ throws InvalidKeyException, InvalidAlgorithmParameterException {
+
+ if (params != null) {
+- throw new InvalidAlgorithmParameterException
+- ("Parameters not supported");
++ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
++ throw new InvalidAlgorithmParameterException(
++ "Parameters not supported");
++ }
++ spec = params;
++ this.random = random; // for TLS RSA premaster secret
+ }
+ init(opmode, key);
+ }
+@@ -356,39 +369,47 @@
+ }
+
+ // see JCE spec
+- protected java.security.Key engineUnwrap(byte[] wrappedKey, String algorithm,
++ protected java.security.Key engineUnwrap(byte[] wrappedKey,
++ String algorithm,
+ int type) throws InvalidKeyException, NoSuchAlgorithmException {
+
+ if (wrappedKey.length > buffer.length) {
+ throw new InvalidKeyException("Key is too long for unwrapping");
+ }
++
++ boolean isTlsRsaPremasterSecret =
++ algorithm.equals("TlsRsaPremasterSecret");
++ Exception failover = null;
++ byte[] encoded = null;
++
+ update(wrappedKey, 0, wrappedKey.length);
+-
+ try {
+- byte[] encoding = doFinal();
+-
+- switch (type) {
+- case Cipher.PUBLIC_KEY:
+- return constructPublicKey(encoding, algorithm);
+-
+- case Cipher.PRIVATE_KEY:
+- return constructPrivateKey(encoding, algorithm);
+-
+- case Cipher.SECRET_KEY:
+- return constructSecretKey(encoding, algorithm);
+-
+- default:
+- throw new InvalidKeyException("Unknown key type " + type);
++ encoded = doFinal();
++ } catch (BadPaddingException e) {
++ if (isTlsRsaPremasterSecret) {
++ failover = e;
++ } else {
++ throw new InvalidKeyException("Unwrapping failed", e);
+ }
+-
+- } catch (BadPaddingException e) {
+- // should not occur
+- throw new InvalidKeyException("Unwrapping failed", e);
+-
+ } catch (IllegalBlockSizeException e) {
+ // should not occur, handled with length check above
+ throw new InvalidKeyException("Unwrapping failed", e);
+ }
++
++ if (isTlsRsaPremasterSecret) {
++ if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) {
++ throw new IllegalStateException(
++ "No TlsRsaPremasterSecretParameterSpec specified");
++ }
++
++ // polish the TLS premaster secret
++ encoded = KeyUtil.checkTlsPreMasterSecretKey(
++ ((TlsRsaPremasterSecretParameterSpec)spec).getClientVersion(),
++ ((TlsRsaPremasterSecretParameterSpec)spec).getServerVersion(),
++ random, encoded, (failover != null));
++ }
++
++ return constructKey(encoded, algorithm, type);
+ }
+
+ // see JCE spec
+@@ -452,6 +473,22 @@
+ return new SecretKeySpec(encodedKey, encodedKeyAlgorithm);
+ }
+
++ private static Key constructKey(byte[] encodedKey,
++ String encodedKeyAlgorithm,
++ int keyType) throws InvalidKeyException, NoSuchAlgorithmException {
++
++ switch (keyType) {
++ case Cipher.PUBLIC_KEY:
++ return constructPublicKey(encodedKey, encodedKeyAlgorithm);
++ case Cipher.PRIVATE_KEY:
++ return constructPrivateKey(encodedKey, encodedKeyAlgorithm);
++ case Cipher.SECRET_KEY:
++ return constructSecretKey(encodedKey, encodedKeyAlgorithm);
++ default:
++ throw new InvalidKeyException("Unknown key type " + keyType);
++ }
++ }
++
+ /*
+ * Encrypt/decrypt a data buffer using Microsoft Crypto API with HCRYPTKEY.
+ * It expects and returns ciphertext data in big-endian form.
+--- ./jdk/src/windows/native/sun/windows/awt_Component.cpp Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/windows/native/sun/windows/awt_Component.cpp Wed Apr 16 12:37:49 2014 +0400
+@@ -1719,9 +1719,11 @@
+ case WM_IME_SETCONTEXT:
+ // lParam is passed as pointer and it can be modified.
+ mr = WmImeSetContext(static_cast<BOOL>(wParam), &lParam);
++ CallProxyDefWindowProc(message, wParam, lParam, retValue, mr);
+ break;
+ case WM_IME_NOTIFY:
+ mr = WmImeNotify(wParam, lParam);
++ CallProxyDefWindowProc(message, wParam, lParam, retValue, mr);
+ break;
+ case WM_IME_STARTCOMPOSITION:
+ mr = WmImeStartComposition();
+@@ -4066,7 +4068,7 @@
+ {
+ if (mr != mrConsume) {
+ HWND proxy = GetProxyFocusOwner();
+- if (proxy != NULL) {
++ if (proxy != NULL && ::IsWindowEnabled(proxy)) {
+ retVal = ComCtl32Util::GetInstance().DefWindowProc(NULL, proxy, message, wParam, lParam);
+ mr = mrConsume;
+ }
+--- ./jdk/src/windows/native/sun/windows/awt_Frame.cpp Wed May 07 19:26:47 2014 -0700
++++ ./jdk/src/windows/native/sun/windows/awt_Frame.cpp Wed Apr 16 12:37:49 2014 +0400
+@@ -319,6 +319,8 @@
+ case WM_IME_STARTCOMPOSITION:
+ case WM_IME_ENDCOMPOSITION:
+ case WM_IME_COMPOSITION:
++ case WM_IME_SETCONTEXT:
++ case WM_IME_NOTIFY:
+ case WM_IME_CONTROL:
+ case WM_IME_COMPOSITIONFULL:
+ case WM_IME_SELECT:
+--- ./jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java Wed Apr 16 12:37:49 2014 +0400
+@@ -33,6 +33,7 @@
+
+ import javax.crypto.KeyGenerator;
+ import javax.crypto.SecretKey;
++import java.util.Formatter;
+
+ import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
+
+@@ -52,27 +53,51 @@
+ System.out.println("OK: " + e);
+ }
+
+- test(kg, 3, 0);
+- test(kg, 3, 1);
+- test(kg, 3, 2);
+- test(kg, 4, 0);
++ int[] protocolVersions = {0x0300, 0x0301, 0x0302, 0x0400};
++ for (int clientVersion : protocolVersions) {
++ for (int serverVersion : protocolVersions) {
++ test(kg, clientVersion, serverVersion);
++ if (serverVersion >= clientVersion) {
++ break;
++ }
++ }
++ }
+
+ System.out.println("Done.");
+ }
+
+- private static void test(KeyGenerator kg, int major, int minor)
+- throws Exception {
++ private static void test(KeyGenerator kg,
++ int clientVersion, int serverVersion) throws Exception {
+
+- kg.init(new TlsRsaPremasterSecretParameterSpec(major, minor));
++ System.out.printf(
++ "Testing RSA pre-master secret key generation between " +
++ "client (0x%04X) and server(0x%04X)%n",
++ clientVersion, serverVersion);
++ kg.init(new TlsRsaPremasterSecretParameterSpec(
++ clientVersion, serverVersion));
++
+ SecretKey key = kg.generateKey();
+ byte[] encoded = key.getEncoded();
+- if (encoded.length != 48) {
+- throw new Exception("length: " + encoded.length);
+- }
+- if ((encoded[0] != major) || (encoded[1] != minor)) {
+- throw new Exception("version mismatch: " + encoded[0] +
+- "." + encoded[1]);
+- }
+- System.out.println("OK: " + major + "." + minor);
++ if (encoded != null) { // raw key material may be not extractable
++ if (encoded.length != 48) {
++ throw new Exception("length: " + encoded.length);
++ }
++ int v = versionOf(encoded[0], encoded[1]);
++ if (clientVersion != v) {
++ if (serverVersion != v || clientVersion >= 0x0302) {
++ throw new Exception(String.format(
++ "version mismatch: (0x%04X) rather than (0x%04X) " +
++ "is used in pre-master secret", v, clientVersion));
++ }
++ System.out.printf("Use compatible version (0x%04X)%n", v);
++ }
++ System.out.println("Passed, version matches!");
++ } else {
++ System.out.println("Raw key material is not extractable");
++ }
++ }
++
++ private static int versionOf(int major, int minor) {
++ return ((major & 0xFF) << 8) | (minor & 0xFF);
+ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/8013611/JDK8013611.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,111 @@
++/*
++ * 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 8013611
++ @summary Tests showing a modal dialog with requesting focus in frame.
++ @author Anton.Tarasov: area=awt.focus
++ @library ../../regtesthelpers
++ @build Util
++ @run main JDK8013611
++*/
++
++import java.awt.*;
++import java.awt.event.*;
++import javax.swing.*;
++import test.java.awt.regtesthelpers.Util;
++
++import java.awt.*;
++
++public class JDK8013611 extends JFrame {
++ static JTextField textField = new JTextField("text");
++ static JButton button1 = new JButton("button1");
++ static JButton button2 = new JButton("button2");
++ static Robot robot;
++
++ static JDialog dialog;
++ static JButton button3 = new JButton("button3");
++
++ public static void main(String[] args) {
++ robot = Util.createRobot();
++
++ JDK8013611 frame = new JDK8013611();
++ frame.setLayout(new FlowLayout());
++ frame.add(textField);
++ frame.add(button1);
++ frame.add(button2);
++ frame.pack();
++
++ dialog = new JDialog(frame, true);
++ dialog.add(button3);
++ dialog.pack();
++
++ textField.addFocusListener(new FocusAdapter() {
++ @Override
++ public void focusLost(FocusEvent e) {
++ dialog.setVisible(true);
++ }
++ });
++
++ button1.addFocusListener(new FocusAdapter() {
++ @Override
++ public void focusGained(FocusEvent e) {
++ button2.requestFocusInWindow();
++ }
++ });
++
++ frame.setVisible(true);
++
++ frame.test();
++ }
++
++ public void test() {
++ if (!testFocused(textField)) {
++ Util.clickOnComp(textField, robot);
++ if (!testFocused(textField)) {
++ throw new RuntimeException("Error: couldn't focus " + textField);
++ }
++ }
++
++ robot.keyPress(KeyEvent.VK_TAB);
++ robot.delay(50);
++ robot.keyRelease(KeyEvent.VK_TAB);
++
++ if (!testFocused(button3)) {
++ throw new RuntimeException("Test failed: dialog didn't get focus!");
++ }
++
++ System.out.println("Test passed.");
++ }
++
++ boolean testFocused(Component c) {
++ for (int i=0; i<10; i++) {
++ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() == c) {
++ return true;
++ }
++ Util.waitForIdle(robot);
++ }
++ return false;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/DialogTraversFocusBackTest/DialogTraversFocusBackTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,94 @@
++/*
++ * 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 8031075
++ @summary Regression: focus disappears with shift+tab on dialogue having a focus component
++ @author mcherkas
++ @run main DialogTraversFocusBackTest
++*/
++
++import sun.awt.SunToolkit;
++
++import javax.swing.*;
++import java.awt.*;
++import java.awt.event.KeyEvent;
++
++public class DialogTraversFocusBackTest {
++
++ private static Robot robot;
++ private volatile static JButton button;
++ private static Component currentFocusOwner;
++
++ public static void main(String[] args) throws Exception {
++ initUI();
++ sync();
++ initRobot();
++ runScript();
++ sync();
++ validate();
++ }
++
++ public static void sync() {
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ toolkit.realSync();
++ }
++
++ private static void validate() throws Exception {
++ currentFocusOwner = FocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
++ if(currentFocusOwner
++ != button) {
++ throw new Exception("Test failed! Wrong focus owner: " +
++ String.valueOf(currentFocusOwner) + "\n but must be: " +
++ button);
++ }
++ }
++
++ private static void runScript() {
++ robot.keyPress(KeyEvent.VK_SHIFT);
++ robot.keyPress(KeyEvent.VK_TAB);
++ robot.keyRelease(KeyEvent.VK_TAB);
++ robot.keyRelease(KeyEvent.VK_SHIFT);
++
++ }
++
++ private static void initRobot() throws AWTException {
++ robot = new Robot();
++ robot.setAutoDelay(100);
++
++ }
++
++ private static void initUI() throws Exception {
++ SwingUtilities.invokeAndWait( new Runnable() {
++ @Override
++ public void run() {
++ JDialog dialog = new JDialog((Frame)null, "Test Dialog");
++ button = new JButton("Button 1");
++ dialog.add(button);
++ dialog.pack();
++ dialog.setVisible(true);
++ }
++ });
++
++ }
++}
+--- ./jdk/test/java/awt/Frame/7024749/bug7024749.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/java/awt/Frame/7024749/bug7024749.java Wed Apr 16 12:37:49 2014 +0400
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 7024749 7184326
++ * @bug 7024749 7184326 8019990
+ * @summary JDK7 b131---a crash in: Java_sun_awt_windows_ThemeReader_isGetThemeTransitionDurationDefined+0x75
+ * @library ../../regtesthelpers
+ * @build Util
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,219 @@
++/*
++ * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
++ * 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 7154048
++ * @summary Window created under a mouse does not receive mouse enter event.
++ * Mouse Entered/Exited events are wrongly generated during dragging the window
++ * from one component to another
++ * @library ../../regtesthelpers
++ * @build Util
++ * @author alexandr.scherbatiy area=awt.event
++ * @run main DragWindowTest
++ */
++
++import java.awt.*;
++import java.awt.event.*;
++import javax.swing.*;
++
++import java.util.concurrent.*;
++import sun.awt.SunToolkit;
++
++import test.java.awt.regtesthelpers.Util;
++
++public class DragWindowTest {
++
++ private static volatile int dragWindowMouseEnteredCount = 0;
++ private static volatile int dragWindowMouseReleasedCount = 0;
++ private static volatile int buttonMouseEnteredCount = 0;
++ private static volatile int labelMouseReleasedCount = 0;
++ private static MyDragWindow dragWindow;
++ private static JLabel label;
++ private static JButton button;
++
++ public static void main(String[] args) throws Exception {
++
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ Robot robot = new Robot();
++ robot.setAutoDelay(50);
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++
++ @Override
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++
++ toolkit.realSync();
++
++ Point pointToClick = Util.invokeOnEDT(new Callable<Point>() {
++
++ @Override
++ public Point call() throws Exception {
++ return getCenterPoint(label);
++ }
++ });
++
++
++ robot.mouseMove(pointToClick.x, pointToClick.y);
++ robot.mousePress(InputEvent.BUTTON1_MASK);
++ toolkit.realSync();
++
++ if (dragWindowMouseEnteredCount != 1) {
++ throw new RuntimeException("No MouseEntered event on Drag Window!");
++ }
++
++ Point pointToDrag = Util.invokeOnEDT(new Callable<Point>() {
++
++ @Override
++ public Point call() throws Exception {
++ button.addMouseListener(new ButtonMouseListener());
++ return getCenterPoint(button);
++ }
++ });
++
++ robot.mouseMove(pointToDrag.x, pointToDrag.y);
++ toolkit.realSync();
++
++ if (buttonMouseEnteredCount != 0) {
++ throw new RuntimeException("Extra MouseEntered event on button!");
++ }
++
++ robot.mouseRelease(InputEvent.BUTTON1_MASK);
++ toolkit.realSync();
++
++ if (labelMouseReleasedCount != 1) {
++ throw new RuntimeException("No MouseReleased event on label!");
++ }
++
++ }
++
++ private static Point getCenterPoint(Component comp) {
++ Point p = comp.getLocationOnScreen();
++ Rectangle rect = comp.getBounds();
++ return new Point(p.x + rect.width / 2, p.y + rect.height / 2);
++ }
++
++ private static void createAndShowGUI() {
++
++ JFrame frame = new JFrame("Main Frame");
++ frame.setSize(300, 200);
++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++
++ label = new JLabel("Label");
++
++ LabelMouseListener listener = new LabelMouseListener(frame);
++ label.addMouseListener(listener);
++ label.addMouseMotionListener(listener);
++
++ button = new JButton("Button");
++ Panel panel = new Panel(new BorderLayout());
++
++ panel.add(label, BorderLayout.NORTH);
++ panel.add(button, BorderLayout.CENTER);
++
++ frame.getContentPane().add(panel);
++ frame.setVisible(true);
++
++ }
++
++ private static Point getAbsoluteLocation(MouseEvent e) {
++ return new Point(e.getXOnScreen(), e.getYOnScreen());
++ }
++
++ static class MyDragWindow extends Window {
++
++ static int d = 30;
++
++ public MyDragWindow(Window parent, Point location) {
++ super(parent);
++ setSize(150, 150);
++ setVisible(true);
++ JPanel panel = new JPanel();
++ add(panel);
++ setLocation(location.x - d, location.y - d);
++ addMouseListener(new DragWindowMouseListener());
++ }
++
++ void dragTo(Point point) {
++ setLocation(point.x - d, point.y - d);
++ }
++ }
++
++ static class LabelMouseListener extends MouseAdapter {
++
++ Point origin;
++ Window parent;
++
++ public LabelMouseListener(Window parent) {
++ this.parent = parent;
++ }
++
++ @Override
++ public void mousePressed(MouseEvent e) {
++ if (dragWindow == null) {
++ dragWindow = new MyDragWindow(parent, getAbsoluteLocation(e));
++ } else {
++ dragWindow.setVisible(true);
++ dragWindow.dragTo(getAbsoluteLocation(e));
++ }
++ }
++
++ @Override
++ public void mouseReleased(MouseEvent e) {
++ labelMouseReleasedCount++;
++ if (dragWindow != null) {
++ dragWindow.setVisible(false);
++ }
++ }
++
++ public void mouseDragged(MouseEvent e) {
++ if (dragWindow != null) {
++ dragWindow.dragTo(getAbsoluteLocation(e));
++ }
++ }
++ }
++
++ static class DragWindowMouseListener extends MouseAdapter {
++
++ @Override
++ public void mouseEntered(MouseEvent e) {
++ dragWindowMouseEnteredCount++;
++ }
++
++ @Override
++ public void mouseReleased(MouseEvent e) {
++ dragWindowMouseReleasedCount++;
++ }
++ }
++
++ static class ButtonMouseListener extends MouseAdapter {
++
++ @Override
++ public void mouseEntered(MouseEvent e) {
++ buttonMouseEnteredCount++;
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,108 @@
++/*
++ * 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 test.java.awt.regtesthelpers.Util;
++
++import javax.swing.*;
++import java.awt.*;
++import java.util.concurrent.atomic.AtomicReference;
++
++/**
++ * @test
++ * @bug 8012026
++ * @summary Component.getMousePosition() does not work in an applet on MacOS
++ * @author Petr Pchelko
++ * @library ../../regtesthelpers
++ * @build Util
++ * @compile GetMousePositionWithOverlay.java
++ * @run main/othervm GetMousePositionWithOverlay
++ */
++
++public class GetMousePositionWithOverlay {
++
++ static Frame backFrame;
++ static Frame frontFrame;
++
++ public static void main(String[] args) throws Throwable {
++ try {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ constructTestUI();
++ }
++ });
++ Util.waitForIdle(null);
++
++ Robot r = new Robot();
++ Util.pointOnComp(frontFrame, r);
++ Util.waitForIdle(null);
++
++ Point pos = getMousePosition(backFrame);
++ if (pos != null) {
++ throw new RuntimeException("Test failed. Mouse position should be null but was" + pos);
++ }
++
++ pos = getMousePosition(frontFrame);
++ if (pos == null) {
++ throw new RuntimeException("Test failed. Mouse position should not be null");
++ }
++
++ r.mouseMove(189, 189);
++ Util.waitForIdle(null);
++
++ pos = getMousePosition(backFrame);
++ if (pos == null) {
++ throw new RuntimeException("Test failed. Mouse position should not be null");
++ }
++ } finally {
++ SwingUtilities.invokeLater(new Runnable() {
++ @Override
++ public void run() {
++ backFrame.dispose();
++ frontFrame.dispose();
++ }
++ });
++ }
++ }
++
++ private static Point getMousePosition(final Component component) throws Exception {
++ final AtomicReference<Point> pos = new AtomicReference<Point>();
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ pos.set(component.getMousePosition());
++ }
++ });
++ return pos.get();
++ }
++
++ private static void constructTestUI() {
++ backFrame = new Frame();
++ backFrame.setBounds(100, 100, 100, 100);
++ backFrame.setVisible(true);
++
++ frontFrame = new Frame();
++ frontFrame.setBounds(120, 120, 60, 60);
++ frontFrame.setVisible(true);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,111 @@
++/*
++ * 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 test.java.awt.regtesthelpers.Util;
++
++import javax.swing.*;
++import java.awt.*;
++import java.awt.event.MouseEvent;
++import java.awt.event.MouseMotionAdapter;
++
++/**
++ * @test
++ * @bug 8012026
++ * @summary Component.getMousePosition() does not work in an applet on MacOS
++ * @author Petr Pchelko
++ * @library ../../regtesthelpers
++ * @build Util
++ * @compile GetMousePositionWithPopup.java
++ * @run main/othervm GetMousePositionWithPopup
++ */
++
++public class GetMousePositionWithPopup {
++
++ private static Frame frame1;
++ private static Frame frame2;
++
++ public static void main(String[] args) throws Exception {
++ try {
++ Robot r = Util.createRobot();
++ r.mouseMove(0, 0);
++ Util.waitForIdle(null);
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ constructTestUI();
++ }
++ });
++
++ Util.waitForIdle(null);
++ r.mouseMove(149, 149);
++ Util.waitForIdle(null);
++ r.mouseMove(150, 150);
++ Util.waitForIdle(null);
++
++ } finally {
++ SwingUtilities.invokeLater(new Runnable() {
++ @Override
++ public void run() {
++ frame1.dispose();
++ frame2.dispose();
++ }
++ });
++ }
++ }
++
++ private static void constructTestUI() {
++ frame1 = new Frame();
++ frame1.setBounds(100, 100, 100, 100);
++ frame1.addMouseMotionListener(new MouseMotionAdapter() {
++
++ private boolean shown = false;
++
++ @Override
++ public void mouseMoved(MouseEvent e) {
++ if (shown) {
++ return;
++ }
++
++ shown = true;
++
++ frame2 = new Frame();
++ frame2.setBounds(120, 120, 120, 120);
++ frame2.setVisible(true);
++
++ Point positionInFrame2 = frame2.getMousePosition();
++ if (positionInFrame2.x != 30 || positionInFrame2.y != 30) {
++ throw new RuntimeException("Wrong position reported. Should be [30, 30] but was [" +
++ positionInFrame2.x + ", " + positionInFrame2.y + "]");
++ }
++
++ Point positionInFrame1 = frame1.getMousePosition();
++ if (positionInFrame1 != null) {
++ throw new RuntimeException("Wrong position reported. Should be null");
++ }
++
++ }
++ });
++ frame1.setVisible(true);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/io/Serializable/unresolvableObjectStreamClass/UnresolvableObjectStreamClass.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,68 @@
++/*
++ * 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 8039396
++ * @run main UnresolvableObjectStreamClass serialize
++ * @clean MySerializable
++ * @run main UnresolvableObjectStreamClass deserialize
++ *
++ * @summary NPE when writing a class descriptor object to a custom
++ * ObjectOutputStream
++ */
++
++import java.io.*;
++
++public class UnresolvableObjectStreamClass {
++ public static void main(String[] args) throws Throwable {
++ if (args.length > 0 && args[0].equals("serialize")) {
++ try (FileOutputStream fos = new FileOutputStream("temp1.ser");
++ ObjectOutputStream oos = new ObjectOutputStream(fos)) {
++ ObjectStreamClass osc =
++ ObjectStreamClass.lookup(MySerializable.class);
++ oos.writeObject(osc);
++ }
++ } else if (args.length > 0 && args[0].equals("deserialize")) {
++ try (FileInputStream fis = new FileInputStream("temp1.ser");
++ ObjectInputStream ois = new ObjectInputStream(fis);
++ FileOutputStream fos = new FileOutputStream("temp2.ser");
++ ObjectOutputStream oos = new ObjectOutputStream(fos) {
++ /*must be subclassed*/}) {
++ ObjectStreamClass osc = (ObjectStreamClass)ois.readObject();
++ // serialize it again
++ try {
++ oos.writeObject(osc);
++ } catch (NullPointerException e) {
++ throw new RuntimeException("Failed to write" +
++ " unresolvable ObjectStreamClass", e);
++ }
++ }
++ } else {
++ throw new RuntimeException("The command line option must be" +
++ " one of: serialize or deserialize");
++ }
++ }
++}
++
++class MySerializable implements Serializable {
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,101 @@
++/*
++ * 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 7122142
++ * @summary Test deadlock situation when recursive annotations are parsed
++ */
++
++import java.lang.annotation.Retention;
++import java.lang.management.ManagementFactory;
++import java.lang.management.ThreadInfo;
++import java.lang.management.ThreadMXBean;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.atomic.AtomicInteger;
++
++import static java.lang.annotation.RetentionPolicy.RUNTIME;
++
++public class AnnotationTypeDeadlockTest {
++
++ @Retention(RUNTIME)
++ @AnnB
++ public @interface AnnA {
++ }
++
++ @Retention(RUNTIME)
++ @AnnA
++ public @interface AnnB {
++ }
++
++ static class Task extends Thread {
++ final CountDownLatch prepareLatch;
++ final AtomicInteger goLatch;
++ final Class<?> clazz;
++
++ Task(CountDownLatch prepareLatch, AtomicInteger goLatch, Class<?> clazz) {
++ super(clazz.getSimpleName());
++ setDaemon(true); // in case it deadlocks
++ this.prepareLatch = prepareLatch;
++ this.goLatch = goLatch;
++ this.clazz = clazz;
++ }
++
++ @Override
++ public void run() {
++ prepareLatch.countDown(); // notify we are prepared
++ while (goLatch.get() > 0); // spin-wait before go
++ clazz.getDeclaredAnnotations();
++ }
++ }
++
++ public static void main(String[] args) throws Exception {
++ CountDownLatch prepareLatch = new CountDownLatch(2);
++ AtomicInteger goLatch = new AtomicInteger(1);
++ Task taskA = new Task(prepareLatch, goLatch, AnnA.class);
++ Task taskB = new Task(prepareLatch, goLatch, AnnB.class);
++ taskA.start();
++ taskB.start();
++ // wait until both threads start-up
++ prepareLatch.await();
++ // let them go
++ goLatch.set(0);
++ // obtain ThreadMXBean
++ ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
++ // wait for threads to finish or dead-lock
++ while (taskA.isAlive() || taskB.isAlive()) {
++ // attempt to join threads
++ taskA.join(500L);
++ taskB.join(500L);
++ // detect dead-lock
++ long[] deadlockedIds = threadBean.findMonitorDeadlockedThreads();
++ if (deadlockedIds != null && deadlockedIds.length > 0) {
++ StringBuilder sb = new StringBuilder("deadlock detected:\n\n");
++ for (ThreadInfo ti : threadBean.getThreadInfo(deadlockedIds, Integer.MAX_VALUE)) {
++ sb.append(ti);
++ }
++ throw new IllegalStateException(sb.toString());
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeRuntimeAssumptionTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,187 @@
++/*
++ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * 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 7122142
++ * @summary Test consistent parsing of ex-RUNTIME annotations that
++ * were changed and separately compiled to have CLASS retention
++ */
++
++import sun.misc.IOUtils;
++
++import java.io.IOException;
++import java.io.InputStream;
++import java.lang.annotation.Annotation;
++import java.lang.annotation.Retention;
++import java.lang.annotation.RetentionPolicy;
++
++import static java.lang.annotation.RetentionPolicy.CLASS;
++import static java.lang.annotation.RetentionPolicy.RUNTIME;
++
++/**
++ * This test simulates a situation where there are two mutually recursive
++ * {@link RetentionPolicy#RUNTIME RUNTIME} annotations {@link AnnA_v1 AnnA_v1}
++ * and {@link AnnB AnnB} and then the first is changed to have
++ * {@link RetentionPolicy#CLASS CLASS} retention and separately compiled.
++ * When {@link AnnA_v1 AnnA_v1} annotation is looked-up on {@link AnnB AnnB}
++ * it still appears to have {@link RetentionPolicy#RUNTIME RUNTIME} retention.
++ */
++public class AnnotationTypeRuntimeAssumptionTest {
++
++ @Retention(RUNTIME)
++ @AnnB
++ public @interface AnnA_v1 {
++ }
++
++ // An alternative version of AnnA_v1 with CLASS retention instead.
++ // Used to simulate separate compilation (see AltClassLoader below).
++ @Retention(CLASS)
++ @AnnB
++ public @interface AnnA_v2 {
++ }
++
++ @Retention(RUNTIME)
++ @AnnA_v1
++ public @interface AnnB {
++ }
++
++ @AnnA_v1
++ public static class TestTask implements Runnable {
++ @Override
++ public void run() {
++ AnnA_v1 ann1 = getDeclaredAnnotation(TestTask.class, AnnA_v1.class);
++ if (ann1 != null) {
++ throw new IllegalStateException(
++ "@" + ann1.annotationType().getSimpleName() +
++ " found on: " + TestTask.class.getName() +
++ " should not be visible at runtime");
++ }
++ AnnA_v1 ann2 = getDeclaredAnnotation(AnnB.class, AnnA_v1.class);
++ if (ann2 != null) {
++ throw new IllegalStateException(
++ "@" + ann2.annotationType().getSimpleName() +
++ " found on: " + AnnB.class.getName() +
++ " should not be visible at runtime");
++ }
++ }
++
++ private static <A extends Annotation> A getDeclaredAnnotation(Class<?> clazz, Class<A> annotationClass) {
++ for (Annotation ann : clazz.getDeclaredAnnotations()) {
++ if (ann.annotationType() == annotationClass) {
++ return annotationClass.cast(ann);
++ }
++ }
++ return null;
++ }
++ }
++
++ public static void main(String[] args) throws Exception {
++ ClassLoader altLoader = new AltClassLoader(
++ AnnotationTypeRuntimeAssumptionTest.class.getClassLoader());
++
++ Runnable altTask = (Runnable) Class.forName(
++ TestTask.class.getName(),
++ true,
++ altLoader).newInstance();
++
++ altTask.run();
++ }
++
++ /**
++ * A ClassLoader implementation that loads alternative implementations of
++ * classes. If class name ends with "_v1" it locates instead a class with
++ * name ending with "_v2" and loads that class instead.
++ */
++ static class AltClassLoader extends ClassLoader {
++ AltClassLoader(ClassLoader parent) {
++ super(parent);
++ }
++
++ @Override
++ protected Class<?> loadClass(String name, boolean resolve)
++ throws ClassNotFoundException {
++ if (name.indexOf('.') < 0) { // root package is our class
++ synchronized (getClassLoadingLock(name)) {
++ // First, check if the class has already been loaded
++ Class<?> c = findLoadedClass(name);
++ if (c == null) {
++ c = findClass(name);
++ }
++ if (resolve) {
++ resolveClass(c);
++ }
++ return c;
++ }
++ }
++ else { // not our class
++ return super.loadClass(name, resolve);
++ }
++ }
++
++ @Override
++ protected Class<?> findClass(String name)
++ throws ClassNotFoundException {
++ // special class name -> replace it with alternative name
++ if (name.endsWith("_v1")) {
++ String altName = name.substring(0, name.length() - 3) + "_v2";
++ String altPath = altName.replace('.', '/').concat(".class");
++ try (InputStream is = getResourceAsStream(altPath)) {
++ if (is != null) {
++ byte[] bytes = IOUtils.readFully(is, -1, true);
++ // patch class bytes to contain original name
++ for (int i = 0; i < bytes.length - 2; i++) {
++ if (bytes[i] == '_' &&
++ bytes[i + 1] == 'v' &&
++ bytes[i + 2] == '2') {
++ bytes[i + 2] = '1';
++ }
++ }
++ return defineClass(name, bytes, 0, bytes.length);
++ }
++ else {
++ throw new ClassNotFoundException(name);
++ }
++ }
++ catch (IOException e) {
++ throw new ClassNotFoundException(name, e);
++ }
++ }
++ else { // not special class name -> just load the class
++ String path = name.replace('.', '/').concat(".class");
++ try (InputStream is = getResourceAsStream(path)) {
++ if (is != null) {
++ byte[] bytes = IOUtils.readFully(is, -1, true);
++ return defineClass(name, bytes, 0, bytes.length);
++ }
++ else {
++ throw new ClassNotFoundException(name);
++ }
++ }
++ catch (IOException e) {
++ throw new ClassNotFoundException(name, e);
++ }
++ }
++ }
++ }
++}
+--- ./jdk/test/java/lang/invoke/JavaDocExamplesTest.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/java/lang/invoke/JavaDocExamplesTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -64,7 +64,11 @@
+ new JavaDocExamplesTest().run();
+ }
+ public void run() throws Throwable {
++ testMisc();
++ testFindStatic();
++ testFindConstructor();
+ testFindVirtual();
++ testFindSpecial();
+ testPermuteArguments();
+ testDropArguments();
+ testFilterArguments();
+@@ -110,7 +114,8 @@
+
+ {}
+
+- @Test public void testFindVirtual() throws Throwable {
++ @Test public void testMisc() throws Throwable {
++// Extra tests, not from javadoc:
+ {}
+ MethodHandle CONCAT_3 = LOOKUP.findVirtual(String.class,
+ "concat", methodType(String.class, String.class));
+@@ -125,6 +130,92 @@
+ {}
+ }
+
++ @Test public void testFindStatic() throws Throwable {
++{}
++MethodHandle MH_asList = publicLookup().findStatic(Arrays.class,
++ "asList", methodType(List.class, Object[].class));
++assertEquals("[x, y]", MH_asList.invoke("x", "y").toString());
++{}
++ }
++
++ @Test public void testFindVirtual() throws Throwable {
++{}
++MethodHandle MH_concat = publicLookup().findVirtual(String.class,
++ "concat", methodType(String.class, String.class));
++MethodHandle MH_hashCode = publicLookup().findVirtual(Object.class,
++ "hashCode", methodType(int.class));
++MethodHandle MH_hashCode_String = publicLookup().findVirtual(String.class,
++ "hashCode", methodType(int.class));
++assertEquals("xy", (String) MH_concat.invokeExact("x", "y"));
++assertEquals("xy".hashCode(), (int) MH_hashCode.invokeExact((Object)"xy"));
++assertEquals("xy".hashCode(), (int) MH_hashCode_String.invokeExact("xy"));
++// interface method:
++MethodHandle MH_subSequence = publicLookup().findVirtual(CharSequence.class,
++ "subSequence", methodType(CharSequence.class, int.class, int.class));
++assertEquals("def", MH_subSequence.invoke("abcdefghi", 3, 6).toString());
++// constructor "internal method" must be accessed differently:
++MethodType MT_newString = methodType(void.class); //()V for new String()
++try { assertEquals("impossible", lookup()
++ .findVirtual(String.class, "<init>", MT_newString));
++ } catch (NoSuchMethodException ex) { } // OK
++MethodHandle MH_newString = publicLookup()
++ .findConstructor(String.class, MT_newString);
++assertEquals("", (String) MH_newString.invokeExact());
++{}
++ }
++
++ @Test public void testFindConstructor() throws Throwable {
++{}
++MethodHandle MH_newArrayList = publicLookup().findConstructor(
++ ArrayList.class, methodType(void.class, Collection.class));
++Collection orig = Arrays.asList("x", "y");
++Collection copy = (ArrayList) MH_newArrayList.invokeExact(orig);
++assert(orig != copy);
++assertEquals(orig, copy);
++// a variable-arity constructor:
++MethodHandle MH_newProcessBuilder = publicLookup().findConstructor(
++ ProcessBuilder.class, methodType(void.class, String[].class));
++ProcessBuilder pb = (ProcessBuilder)
++ MH_newProcessBuilder.invoke("x", "y", "z");
++assertEquals("[x, y, z]", pb.command().toString());
++{}
++ }
++
++// for testFindSpecial
++{}
++static class Listie extends ArrayList {
++ public String toString() { return "[wee Listie]"; }
++ static Lookup lookup() { return MethodHandles.lookup(); }
++}
++{}
++
++ @Test public void testFindSpecial() throws Throwable {
++{}
++// no access to constructor via invokeSpecial:
++MethodHandle MH_newListie = Listie.lookup()
++ .findConstructor(Listie.class, methodType(void.class));
++Listie l = (Listie) MH_newListie.invokeExact();
++try { assertEquals("impossible", Listie.lookup().findSpecial(
++ Listie.class, "<init>", methodType(void.class), Listie.class));
++ } catch (NoSuchMethodException ex) { } // OK
++// access to super and self methods via invokeSpecial:
++MethodHandle MH_super = Listie.lookup().findSpecial(
++ ArrayList.class, "toString" , methodType(String.class), Listie.class);
++MethodHandle MH_this = Listie.lookup().findSpecial(
++ Listie.class, "toString" , methodType(String.class), Listie.class);
++MethodHandle MH_duper = Listie.lookup().findSpecial(
++ Object.class, "toString" , methodType(String.class), Listie.class);
++assertEquals("[]", (String) MH_super.invokeExact(l));
++assertEquals(""+l, (String) MH_this.invokeExact(l));
++assertEquals("[]", (String) MH_duper.invokeExact(l)); // ArrayList method
++try { assertEquals("inaccessible", Listie.lookup().findSpecial(
++ String.class, "toString", methodType(String.class), Listie.class));
++ } catch (IllegalAccessException ex) { } // OK
++Listie subl = new Listie() { public String toString() { return "[subclass]"; } };
++assertEquals(""+l, (String) MH_this.invokeExact(subl)); // Listie method
++{}
++ }
++
+ @Test public void testPermuteArguments() throws Throwable {
+ {{
+ {} /// JAVADOC
+@@ -275,6 +366,12 @@
+ MethodHandle eq2 = equals.asSpreader(Object[].class, 2);
+ assert( (boolean) eq2.invokeExact(new Object[]{ "me", "me" }));
+ assert(!(boolean) eq2.invokeExact(new Object[]{ "me", "thee" }));
++// try to spread from anything but a 2-array:
++for (int n = 0; n <= 10; n++) {
++ Object[] badArityArgs = (n == 2 ? null : new Object[n]);
++ try { assert((boolean) eq2.invokeExact(badArityArgs) && false); }
++ catch (IllegalArgumentException ex) { } // OK
++}
+ // spread both arguments from a String array:
+ MethodHandle eq2s = equals.asSpreader(String[].class, 2);
+ assert( (boolean) eq2s.invokeExact(new String[]{ "me", "me" }));
+--- ./jdk/test/java/lang/invoke/MethodHandlesTest.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/java/lang/invoke/MethodHandlesTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -363,6 +363,7 @@
+ protected Example(String name) { this.name = name; }
+ @SuppressWarnings("LeakingThisInConstructor")
+ protected Example(int x) { this(); called("protected <init>", this, x); }
++ //Example(Void x) { does not exist; lookup elicts NoSuchMethodException }
+ @Override public String toString() { return name; }
+
+ public void v0() { called("v0", this); }
+@@ -463,6 +464,9 @@
+ return lookup.in(defc);
+ }
+
++ /** Is findVirtual (etc.) of "<init>" supposed to elicit a NoSuchMethodException? */
++ final static boolean INIT_REF_CAUSES_NSME = true;
++
+ @Test
+ public void testFindStatic() throws Throwable {
+ if (CAN_SKIP_WORKING) return;
+@@ -483,6 +487,8 @@
+ testFindStatic(Example.class, Object.class, "s7", float.class, double.class);
+
+ testFindStatic(false, PRIVATE, Example.class, void.class, "bogus");
++ testFindStatic(false, PRIVATE, Example.class, void.class, "<init>", int.class);
++ testFindStatic(false, PRIVATE, Example.class, void.class, "<init>", Void.class);
+ testFindStatic(false, PRIVATE, Example.class, void.class, "v0");
+ }
+
+@@ -505,11 +511,12 @@
+ target = maybeMoveIn(lookup, defc).findStatic(defc, methodName, type);
+ } catch (ReflectiveOperationException ex) {
+ noAccess = ex;
++ assertExceptionClass(
++ (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>"))
++ ? NoSuchMethodException.class
++ : IllegalAccessException.class,
++ noAccess);
+ if (verbosity >= 5) ex.printStackTrace(System.out);
+- if (name.contains("bogus"))
+- assertTrue(noAccess instanceof NoSuchMethodException);
+- else
+- assertTrue(noAccess instanceof IllegalAccessException);
+ }
+ if (verbosity >= 3)
+ System.out.println("findStatic "+lookup+": "+defc.getName()+"."+name+"/"+type+" => "+target
+@@ -527,6 +534,13 @@
+ System.out.print(':');
+ }
+
++ static void assertExceptionClass(Class<? extends Throwable> expected,
++ Throwable actual) {
++ if (expected.isInstance(actual)) return;
++ actual.printStackTrace();
++ assertEquals(expected, actual.getClass());
++ }
++
+ static final boolean DEBUG_METHOD_HANDLE_NAMES = Boolean.getBoolean("java.lang.invoke.MethodHandle.DEBUG_NAMES");
+
+ // rough check of name string
+@@ -556,6 +570,8 @@
+ testFindVirtual(PubExample.class, void.class, "Pub/pro_v0");
+
+ testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "bogus");
++ testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "<init>", int.class);
++ testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "<init>", Void.class);
+ testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "s0");
+
+ // test dispatch
+@@ -591,11 +607,12 @@
+ target = maybeMoveIn(lookup, defc).findVirtual(defc, methodName, type);
+ } catch (ReflectiveOperationException ex) {
+ noAccess = ex;
++ assertExceptionClass(
++ (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>"))
++ ? NoSuchMethodException.class
++ : IllegalAccessException.class,
++ noAccess);
+ if (verbosity >= 5) ex.printStackTrace(System.out);
+- if (name.contains("bogus"))
+- assertTrue(noAccess instanceof NoSuchMethodException);
+- else
+- assertTrue(noAccess instanceof IllegalAccessException);
+ }
+ if (verbosity >= 3)
+ System.out.println("findVirtual "+lookup+": "+defc.getName()+"."+name+"/"+type+" => "+target
+@@ -632,11 +649,11 @@
+ testFindSpecial(SubExample.class, Example.class, void.class, "pkg_v0");
+ testFindSpecial(RemoteExample.class, PubExample.class, void.class, "Pub/pro_v0");
+ // Do some negative testing:
+- testFindSpecial(false, EXAMPLE, SubExample.class, Example.class, void.class, "bogus");
+- testFindSpecial(false, PRIVATE, SubExample.class, Example.class, void.class, "bogus");
+ for (Lookup lookup : new Lookup[]{ PRIVATE, EXAMPLE, PACKAGE, PUBLIC }) {
+ testFindSpecial(false, lookup, Object.class, Example.class, void.class, "v0");
++ testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "bogus");
+ testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "<init>", int.class);
++ testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "<init>", Void.class);
+ testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "s0");
+ }
+ }
+@@ -662,19 +679,25 @@
+ countTest(positive);
+ String methodName = name.substring(1 + name.indexOf('/')); // foo/bar => foo
+ MethodType type = MethodType.methodType(ret, params);
++ Lookup specialLookup = maybeMoveIn(lookup, specialCaller);
++ boolean specialAccessOK = (specialLookup.lookupClass() == specialCaller &&
++ (specialLookup.lookupModes() & Lookup.PRIVATE) != 0);
+ MethodHandle target = null;
+ Exception noAccess = null;
+ try {
+ if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type);
+- if (verbosity >= 5) System.out.println(" lookup => "+maybeMoveIn(lookup, specialCaller));
+- target = maybeMoveIn(lookup, specialCaller).findSpecial(defc, methodName, type, specialCaller);
++ if (verbosity >= 5) System.out.println(" lookup => "+specialLookup);
++ target = specialLookup.findSpecial(defc, methodName, type, specialCaller);
+ } catch (ReflectiveOperationException ex) {
+ noAccess = ex;
++ assertExceptionClass(
++ (!specialAccessOK) // this check should happen first
++ ? IllegalAccessException.class
++ : (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>"))
++ ? NoSuchMethodException.class
++ : IllegalAccessException.class,
++ noAccess);
+ if (verbosity >= 5) ex.printStackTrace(System.out);
+- if (name.contains("bogus"))
+- assertTrue(noAccess instanceof NoSuchMethodException);
+- else
+- assertTrue(noAccess instanceof IllegalAccessException);
+ }
+ if (verbosity >= 3)
+ System.out.println("findSpecial from "+specialCaller.getName()+" to "+defc.getName()+"."+name+"/"+type+" => "+target
+@@ -719,7 +742,7 @@
+ target = lookup.findConstructor(defc, type);
+ } catch (ReflectiveOperationException ex) {
+ noAccess = ex;
+- assertTrue(noAccess instanceof IllegalAccessException);
++ assertTrue(noAccess.getClass().getName(), noAccess instanceof IllegalAccessException);
+ }
+ if (verbosity >= 3)
+ System.out.println("findConstructor "+defc.getName()+".<init>/"+type+" => "+target
+@@ -750,6 +773,8 @@
+ testBind(Example.class, Object.class, "v2", int.class, Object.class);
+ testBind(Example.class, Object.class, "v2", int.class, int.class);
+ testBind(false, PRIVATE, Example.class, void.class, "bogus");
++ testBind(false, PRIVATE, Example.class, void.class, "<init>", int.class);
++ testBind(false, PRIVATE, Example.class, void.class, "<init>", Void.class);
+ testBind(SubExample.class, void.class, "Sub/v0");
+ testBind(SubExample.class, void.class, "Sub/pkg_v0");
+ testBind(IntExample.Impl.class, void.class, "Int/v0");
+@@ -773,11 +798,12 @@
+ target = maybeMoveIn(lookup, defc).bind(receiver, methodName, type);
+ } catch (ReflectiveOperationException ex) {
+ noAccess = ex;
++ assertExceptionClass(
++ (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>"))
++ ? NoSuchMethodException.class
++ : IllegalAccessException.class,
++ noAccess);
+ if (verbosity >= 5) ex.printStackTrace(System.out);
+- if (name.contains("bogus"))
+- assertTrue(noAccess instanceof NoSuchMethodException);
+- else
+- assertTrue(noAccess instanceof IllegalAccessException);
+ }
+ if (verbosity >= 3)
+ System.out.println("bind "+receiver+"."+name+"/"+type+" => "+target
+@@ -840,6 +866,10 @@
+ countTest(positive);
+ String methodName = name.substring(1 + name.indexOf('/')); // foo/bar => foo
+ MethodType type = MethodType.methodType(ret, params);
++ Lookup specialLookup = (specialCaller != null ? maybeMoveIn(lookup, specialCaller) : null);
++ boolean specialAccessOK = (specialCaller != null &&
++ specialLookup.lookupClass() == specialCaller &&
++ (specialLookup.lookupModes() & Lookup.PRIVATE) != 0);
+ Method rmethod = defc.getDeclaredMethod(methodName, params);
+ MethodHandle target = null;
+ Exception noAccess = null;
+@@ -848,16 +878,15 @@
+ try {
+ if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type);
+ if (isSpecial)
+- target = maybeMoveIn(lookup, specialCaller).unreflectSpecial(rmethod, specialCaller);
++ target = specialLookup.unreflectSpecial(rmethod, specialCaller);
+ else
+ target = maybeMoveIn(lookup, defc).unreflect(rmethod);
+ } catch (ReflectiveOperationException ex) {
+ noAccess = ex;
++ assertExceptionClass(
++ IllegalAccessException.class, // NSME is impossible, since it was already reflected
++ noAccess);
+ if (verbosity >= 5) ex.printStackTrace(System.out);
+- if (name.contains("bogus"))
+- assertTrue(noAccess instanceof NoSuchMethodException);
+- else
+- assertTrue(noAccess instanceof IllegalAccessException);
+ }
+ if (verbosity >= 3)
+ System.out.println("unreflect"+(isSpecial?"Special":"")+" "+defc.getName()+"."+name+"/"+type
+@@ -1091,11 +1120,12 @@
+ } catch (ReflectiveOperationException ex) {
+ mh = null;
+ noAccess = ex;
++ assertExceptionClass(
++ (fname.contains("bogus"))
++ ? NoSuchFieldException.class
++ : IllegalAccessException.class,
++ noAccess);
+ if (verbosity >= 5) ex.printStackTrace(System.out);
+- if (fname.contains("bogus"))
+- assertTrue(noAccess instanceof NoSuchFieldException);
+- else
+- assertTrue(noAccess instanceof IllegalAccessException);
+ }
+ if (verbosity >= 3)
+ System.out.println("find"+(isStatic?"Static":"")+(isGetter?"Getter":"Setter")+" "+fclass.getName()+"."+fname+"/"+ftype
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,33 @@
++/*
++ * 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 8032585 8033278
++ * @summary JSR292: IllegalAccessError when attempting to invoke protected method from different package
++ *
++ * @compile p1/T2.java p2/T3.java
++ * @run main/othervm p2.T3
++ */
++public class Test {}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,127 @@
++/*
++ * 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.
++ *
++ */
++package p1;
++
++import p2.T3;
++
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodHandles;
++import java.lang.invoke.MethodHandles.Lookup;
++import java.lang.invoke.MethodType;
++import java.util.concurrent.Callable;
++
++class T1 {
++ protected void m1() {}
++ protected static void m2() {}
++}
++
++public class T2 extends T1 {
++ public static void main(String[] args) throws Throwable {
++ final Lookup LOOKUP = T3.lookup();
++ Class<IllegalAccessException> IAE = IllegalAccessException.class;
++
++ assertFailure(IAE, new Callable<Integer>() {
++ public Integer call() throws Exception {
++ LOOKUP.findVirtual(T1.class, "m1", MethodType.methodType(void.class));
++ return null;
++ }
++ }
++ );
++ assertFailure(IAE, new Callable<Integer>() {
++ public Integer call() throws Exception {
++ LOOKUP.findStatic(T1.class, "m2", MethodType.methodType(void.class));
++ return null;
++ }
++ }
++ );
++
++ assertSuccess(new Callable<Integer>() {
++ public Integer call() throws Exception {
++ LOOKUP.findVirtual(T2.class, "m1", MethodType.methodType(void.class));
++ return null;
++ }
++ }
++ );
++ assertSuccess(new Callable<Integer>() {
++ public Integer call() throws Exception {
++ LOOKUP.findVirtual(T3.class, "m1", MethodType.methodType(void.class));
++ return null;
++ }
++ }
++ );
++
++ assertSuccess(new Callable<Integer>() {
++ public Integer call() throws Exception {
++ LOOKUP.findStatic(T2.class, "m2", MethodType.methodType(void.class));
++ return null;
++ }
++ }
++ );
++ assertSuccess(new Callable<Integer>() {
++ public Integer call() throws Exception {
++ LOOKUP.findStatic(T3.class, "m2", MethodType.methodType(void.class));
++ return null;
++ }
++ }
++ );
++
++ assertFailure(IAE, new Callable<Integer>() {
++ public Integer call() throws Exception {
++ LOOKUP.unreflect(T1.class.getDeclaredMethod("m1"));
++ return null;
++ }
++ }
++ );
++ assertFailure(IAE, new Callable<Integer>() {
++ public Integer call() throws Exception {
++ LOOKUP.unreflect(T1.class.getDeclaredMethod("m2"));
++ return null;
++ }
++ }
++ );
++
++ System.out.println("TEST PASSED");
++ }
++
++ public static void assertFailure(Class<? extends Throwable> expectedError, Callable r) {
++ try {
++ r.call();
++ } catch(Throwable e) {
++ if (expectedError.isAssignableFrom(e.getClass())) {
++ return; // expected error
++ } else {
++ throw new Error("Unexpected error type: "+e.getClass()+"; expected type: "+expectedError, e);
++ }
++ }
++ throw new Error("No error");
++ }
++
++ public static void assertSuccess(Callable r) {
++ try {
++ r.call();
++ } catch(Throwable e) {
++ throw new Error("Unexpected error", e);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,32 @@
++/*
++ * 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.
++ *
++ */
++package p2;
++
++import p1.T2;
++
++import java.lang.invoke.MethodHandles;
++
++public class T3 extends T2 {
++ public static MethodHandles.Lookup lookup() { return MethodHandles.lookup(); }
++}
+--- ./jdk/test/java/nio/channels/Selector/ByteServer.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/java/nio/channels/Selector/ByteServer.java Wed Apr 16 12:37:49 2014 +0400
+@@ -22,52 +22,54 @@
+ */
+
+ /**
+- *
+- * Utility class for tests. A simple server, which waits for a connection,
+- * writes out n bytes and waits.
++ * Utility class for tests. A simple "in-thread" server to accept connections
++ * and write bytes.
+ * @author kladko
+ */
+
+ import java.net.Socket;
+ import java.net.ServerSocket;
++import java.net.SocketAddress;
++import java.net.InetSocketAddress;
++import java.io.IOException;
++import java.io.Closeable;
+
+-public class ByteServer {
++public class ByteServer implements Closeable {
+
+- public static final String LOCALHOST = "localhost";
+- private int bytecount;
+- private Socket socket;
+- private ServerSocket serversocket;
+- private Thread serverthread;
+- volatile Exception savedException;
++ private final ServerSocket ss;
++ private Socket s;
+
+- public ByteServer(int bytecount) throws Exception{
+- this.bytecount = bytecount;
+- serversocket = new ServerSocket(0);
++ ByteServer() throws IOException {
++ this.ss = new ServerSocket(0);
+ }
+
+- public int port() {
+- return serversocket.getLocalPort();
++ SocketAddress address() {
++ return new InetSocketAddress(ss.getInetAddress(), ss.getLocalPort());
+ }
+
+- public void start() {
+- serverthread = new Thread() {
+- public void run() {
+- try {
+- socket = serversocket.accept();
+- socket.getOutputStream().write(new byte[bytecount]);
+- socket.getOutputStream().flush();
+- } catch (Exception e) {
+- System.err.println("Exception in ByteServer: " + e);
+- System.exit(1);
+- }
+- }
+- };
+- serverthread.start();
++ void acceptConnection() throws IOException {
++ if (s != null)
++ throw new IllegalStateException("already connected");
++ this.s = ss.accept();
+ }
+
+- public void exit() throws Exception {
+- serverthread.join();
+- socket.close();
+- serversocket.close();
++ void closeConnection() throws IOException {
++ Socket s = this.s;
++ if (s != null) {
++ this.s = null;
++ s.close();
++ }
++ }
++
++ void write(int count) throws IOException {
++ if (s == null)
++ throw new IllegalStateException("no connection");
++ s.getOutputStream().write(new byte[count]);
++ }
++
++ public void close() throws IOException {
++ if (s != null)
++ s.close();
++ ss.close();
+ }
+ }
+--- ./jdk/test/java/nio/channels/Selector/ReadAfterConnect.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/java/nio/channels/Selector/ReadAfterConnect.java Wed Apr 16 12:37:49 2014 +0400
+@@ -27,27 +27,25 @@
+ * @author kladko
+ */
+
+-import java.net.*;
+-import java.nio.*;
+-import java.nio.channels.*;
++import java.nio.channels.Selector;
++import java.nio.channels.SelectionKey;
++import java.nio.channels.SocketChannel;
+
+ public class ReadAfterConnect {
++ public static void main(String[] argv) throws Exception {
++ try (ByteServer server = new ByteServer();
++ SocketChannel sc = SocketChannel.open(server.address())) {
+
+- public static void main(String[] argv) throws Exception {
+- ByteServer server = new ByteServer(0); // server: accept connection and do nothing
+- server.start();
+- InetSocketAddress isa = new InetSocketAddress(
+- InetAddress.getByName(ByteServer.LOCALHOST), server.port());
+- Selector sel = Selector.open();
+- SocketChannel sc = SocketChannel.open();
+- sc.connect(isa);
+- sc.configureBlocking(false);
+- sc.register(sel, SelectionKey.OP_READ);
+- // Previously channel would get selected here, although there is nothing to read
+- if (sel.selectNow() != 0)
+- throw new Exception("Select returned nonzero value");
+- sc.close();
+- server.exit();
++ server.acceptConnection();
++
++ try (Selector sel = Selector.open()) {
++ sc.configureBlocking(false);
++ sc.register(sel, SelectionKey.OP_READ);
++ // Previously channel would get selected here, although there is nothing to read
++ if (sel.selectNow() != 0)
++ throw new Exception("Select returned nonzero value");
++ }
++ }
+ }
+
+ }
+--- ./jdk/test/java/nio/channels/Selector/SelectAfterRead.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/java/nio/channels/Selector/SelectAfterRead.java Wed Apr 16 12:37:49 2014 +0400
+@@ -28,60 +28,62 @@
+ * @author kladko
+ */
+
+-import java.net.*;
+-import java.nio.*;
+-import java.nio.channels.*;
++import java.nio.ByteBuffer;
++import java.nio.channels.Selector;
++import java.nio.channels.SelectionKey;
++import java.nio.channels.SocketChannel;
+
+ public class SelectAfterRead {
+
+- final static int TIMEOUT = 1000;
++ private static final int TIMEOUT = 1000;
+
+ public static void main(String[] argv) throws Exception {
+- InetAddress lh = InetAddress.getByName(ByteServer.LOCALHOST);
+
+ // server: accept connection and write one byte
+- ByteServer server = new ByteServer(1);
+- server.start();
+- Selector sel = Selector.open();
+- SocketChannel sc = SocketChannel.open();
+- sc.connect(new InetSocketAddress(lh, server.port()));
+- sc.read(ByteBuffer.allocate(1));
+- sc.configureBlocking(false);
+- sc.register(sel, SelectionKey.OP_READ);
+- // previously on Windows select would select channel here, although there was
+- // nothing to read
+- if (sel.selectNow() != 0)
+- throw new Exception("Select returned nonzero value");
+- sc.close();
+- sel.close();
+- server.exit();
++ try (ByteServer server = new ByteServer();
++ SocketChannel sc = SocketChannel.open(server.address())) {
++
++ server.acceptConnection();
++ server.write(1);
++
++ try (Selector sel = Selector.open()) {
++ sc.read(ByteBuffer.allocate(1));
++ sc.configureBlocking(false);
++ sc.register(sel, SelectionKey.OP_READ);
++ // previously on Windows select would select channel here, although there was
++ // nothing to read
++ if (sel.selectNow() != 0)
++ throw new Exception("Select returned nonzero value");
++ }
++ }
+
+ // Now we will test a two reads combination
+ // server: accept connection and write two bytes
+- server = new ByteServer(2);
+- server.start();
+- sc = SocketChannel.open();
+- sc.connect(new InetSocketAddress(lh, server.port()));
+- sc.configureBlocking(false);
+- sel = Selector.open();
+- sc.register(sel, SelectionKey.OP_READ);
+- if (sel.select(TIMEOUT) != 1)
+- throw new Exception("One selected key expected");
+- sel.selectedKeys().clear();
+- // previously on Windows a channel would get selected only once
+- if (sel.selectNow() != 1)
+- throw new Exception("One selected key expected");
+- // Previously on Windows two consequent reads would cause select()
+- // to select a channel, although there was nothing remaining to
+- // read in the channel
+- if (sc.read(ByteBuffer.allocate(1)) != 1)
+- throw new Exception("One byte expected");
+- if (sc.read(ByteBuffer.allocate(1)) != 1)
+- throw new Exception("One byte expected");
+- if (sel.selectNow() != 0)
+- throw new Exception("Select returned nonzero value");
+- sc.close();
+- sel.close();
+- server.exit();
++ try (ByteServer server = new ByteServer();
++ SocketChannel sc = SocketChannel.open(server.address())) {
++
++ server.acceptConnection();
++ server.write(2);
++
++ try (Selector sel = Selector.open()) {
++ sc.configureBlocking(false);
++ sc.register(sel, SelectionKey.OP_READ);
++ if (sel.select(TIMEOUT) != 1)
++ throw new Exception("One selected key expected");
++ sel.selectedKeys().clear();
++ // previously on Windows a channel would get selected only once
++ if (sel.selectNow() != 1)
++ throw new Exception("One selected key expected");
++ // Previously on Windows two consequent reads would cause select()
++ // to select a channel, although there was nothing remaining to
++ // read in the channel
++ if (sc.read(ByteBuffer.allocate(1)) != 1)
++ throw new Exception("One byte expected");
++ if (sc.read(ByteBuffer.allocate(1)) != 1)
++ throw new Exception("One byte expected");
++ if (sel.selectNow() != 0)
++ throw new Exception("Select returned nonzero value");
++ }
++ }
+ }
+ }
+--- ./jdk/test/java/nio/channels/Selector/SelectWrite.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/java/nio/channels/Selector/SelectWrite.java Wed Apr 16 12:37:49 2014 +0400
+@@ -22,36 +22,33 @@
+ */
+
+ /* @test
+- @bug 4645302
+- @summary Socket with OP_WRITE would get selected only once
+- @author kladko
++ * @bug 4645302
++ * @summary Socket with OP_WRITE would get selected only once
++ * @author kladko
+ */
+
+-import java.net.*;
+-import java.nio.*;
+-import java.nio.channels.*;
+-
++import java.nio.channels.Selector;
++import java.nio.channels.SelectionKey;
++import java.nio.channels.SocketChannel;
+
+ public class SelectWrite {
+
+ public static void main(String[] argv) throws Exception {
+- ByteServer server = new ByteServer(0);
+- // server: accept connection and do nothing
+- server.start();
+- InetSocketAddress isa = new InetSocketAddress(
+- InetAddress.getByName(ByteServer.LOCALHOST), server.port());
+- Selector sel = Selector.open();
+- SocketChannel sc = SocketChannel.open();
+- sc.connect(isa);
+- sc.configureBlocking(false);
+- sc.register(sel, SelectionKey.OP_WRITE);
+- sel.select();
+- sel.selectedKeys().clear();
+- if (sel.select() == 0) {
+- throw new Exception("Select returned zero");
++ try (ByteServer server = new ByteServer();
++ SocketChannel sc = SocketChannel.open(server.address())) {
++
++ server.acceptConnection();
++
++ try (Selector sel = Selector.open()) {
++ sc.configureBlocking(false);
++ sc.register(sel, SelectionKey.OP_WRITE);
++ sel.select();
++ sel.selectedKeys().clear();
++ if (sel.select() == 0) {
++ throw new Exception("Select returned zero");
++ }
++ }
+ }
+- sc.close();
+- sel.close();
+ }
+
+ }
+--- ./jdk/test/javax/management/remote/mandatory/util/CacheMapTest.java Wed May 07 19:26:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,110 +0,0 @@
+-/*
+- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- */
+-
+-/*
+- * @test
+- * @bug 7654321
+- * @summary Tests the CacheMap class.
+- * @author Eamonn McManus
+- * @run clean CacheMapTest
+- * @run build CacheMapTest
+- * @run main CacheMapTest
+- */
+-
+-import java.util.Iterator;
+-import java.util.Map;
+-
+-import com.sun.jmx.remote.util.CacheMap;
+-
+-public class CacheMapTest {
+- public static void main(String[] args) {
+- try {
+- boolean ok = test(5) && test(100);
+- if (ok) {
+- System.out.println("Test completed");
+- return;
+- } else {
+- System.out.println("Test failed!");
+- System.exit(1);
+- }
+- } catch (Exception e) {
+- System.err.println("Unexpected exception: " + e);
+- e.printStackTrace();
+- System.exit(1);
+- }
+- }
+-
+- private static boolean test(int cacheSize) throws Exception {
+- System.out.println("CacheMap test with cache size " + cacheSize);
+- CacheMap map = new CacheMap(cacheSize);
+- int size = 0;
+- int maxIterations = cacheSize * 10;
+- while (map.size() == size && size < maxIterations) {
+- Integer key = new Integer(size);
+- Object x = map.put(key, "x");
+- if (x != null) {
+- System.out.println("Map already had entry " + key + "!");
+- return false;
+- }
+- x = map.get(key);
+- if (!"x".equals(x)) {
+- System.out.println("Got back surprising value: " + x);
+- return false;
+- }
+- size++;
+- }
+- System.out.println("Map size is " + map.size() + " after inserting " +
+- size + " elements");
+- do {
+- System.gc();
+- Thread.sleep(1);
+- System.out.println("Map size is " + map.size() + " after GC");
+- } while (map.size() > cacheSize);
+- if (map.size() < cacheSize) {
+- System.out.println("Map shrank to less than cache size: " +
+- map.size() + " (surprising but not wrong)");
+- } else
+- System.out.println("Map shrank to cache size as expected");
+- int lowest = size - cacheSize;
+- // lowest value that can still be in cache if LRU is respected
+- for (Iterator it = map.entrySet().iterator(); it.hasNext(); ) {
+- Map.Entry entry = (Map.Entry) it.next();
+- Integer x = (Integer) entry.getKey();
+- int xx = x.intValue();
+- if (xx < lowest || xx >= size) {
+- System.out.println("Old value remained (" + x + "), " +
+- "expected none earlier than " + lowest);
+- return false;
+- }
+- Object xxx = entry.getValue();
+- if (!"x".equals(xxx)) {
+- System.out.println("Got back surprising value: " + xxx);
+- return false;
+- }
+- }
+- if (map.size() > 0)
+- System.out.println("Remaining elements are the most recent ones");
+- System.out.println("Test passed");
+- return true;
+- }
+-}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/AssertsTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,237 @@
++/*
++ * 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 static jdk.testlibrary.Asserts.*;
++
++/* @test
++ * @summary Tests the different assertions in the Assert class
++ * @library /testlibrary
++ */
++public class AssertsTest {
++ private static class Foo implements Comparable<Foo> {
++ final int id;
++ public Foo(int id) {
++ this.id = id;
++ }
++
++ public int compareTo(Foo f) {
++ return new Integer(id).compareTo(new Integer(f.id));
++ }
++ }
++
++ public static void main(String[] args) throws Exception {
++ testLessThan();
++ testLessThanOrEqual();
++ testEquals();
++ testGreaterThanOrEqual();
++ testGreaterThan();
++ testNotEquals();
++ testNull();
++ testNotNull();
++ testTrue();
++ testFalse();
++ }
++
++ private static void testLessThan() throws Exception {
++ expectPass(Assertion.LT, 1, 2);
++
++ expectFail(Assertion.LT, 2, 2);
++ expectFail(Assertion.LT, 2, 1);
++ expectFail(Assertion.LT, null, 2);
++ expectFail(Assertion.LT, 2, null);
++ }
++
++ private static void testLessThanOrEqual() throws Exception {
++ expectPass(Assertion.LTE, 1, 2);
++ expectPass(Assertion.LTE, 2, 2);
++
++ expectFail(Assertion.LTE, 3, 2);
++ expectFail(Assertion.LTE, null, 2);
++ expectFail(Assertion.LTE, 2, null);
++ }
++
++ private static void testEquals() throws Exception {
++ expectPass(Assertion.EQ, 1, 1);
++ expectPass(Assertion.EQ, null, null);
++
++ Foo f1 = new Foo(1);
++ expectPass(Assertion.EQ, f1, f1);
++
++ Foo f2 = new Foo(1);
++ expectFail(Assertion.EQ, f1, f2);
++ expectFail(Assertion.LTE, null, 2);
++ expectFail(Assertion.LTE, 2, null);
++ }
++
++ private static void testGreaterThanOrEqual() throws Exception {
++ expectPass(Assertion.GTE, 1, 1);
++ expectPass(Assertion.GTE, 2, 1);
++
++ expectFail(Assertion.GTE, 1, 2);
++ expectFail(Assertion.GTE, null, 2);
++ expectFail(Assertion.GTE, 2, null);
++ }
++
++ private static void testGreaterThan() throws Exception {
++ expectPass(Assertion.GT, 2, 1);
++
++ expectFail(Assertion.GT, 1, 1);
++ expectFail(Assertion.GT, 1, 2);
++ expectFail(Assertion.GT, null, 2);
++ expectFail(Assertion.GT, 2, null);
++ }
++
++ private static void testNotEquals() throws Exception {
++ expectPass(Assertion.NE, null, 1);
++ expectPass(Assertion.NE, 1, null);
++
++ Foo f1 = new Foo(1);
++ Foo f2 = new Foo(1);
++ expectPass(Assertion.NE, f1, f2);
++
++ expectFail(Assertion.NE, null, null);
++ expectFail(Assertion.NE, f1, f1);
++ expectFail(Assertion.NE, 1, 1);
++ }
++
++ private static void testNull() throws Exception {
++ expectPass(Assertion.NULL, null);
++
++ expectFail(Assertion.NULL, 1);
++ }
++
++ private static void testNotNull() throws Exception {
++ expectPass(Assertion.NOTNULL, 1);
++
++ expectFail(Assertion.NOTNULL, null);
++ }
++
++ private static void testTrue() throws Exception {
++ expectPass(Assertion.TRUE, true);
++
++ expectFail(Assertion.TRUE, false);
++ }
++
++ private static void testFalse() throws Exception {
++ expectPass(Assertion.FALSE, false);
++
++ expectFail(Assertion.FALSE, true);
++ }
++
++ private static <T extends Comparable<T>> void expectPass(Assertion assertion, T ... args)
++ throws Exception {
++ Assertion.run(assertion, args);
++ }
++
++ private static <T extends Comparable<T>> void expectFail(Assertion assertion, T ... args)
++ throws Exception {
++ try {
++ Assertion.run(assertion, args);
++ } catch (RuntimeException e) {
++ return;
++ }
++ throw new Exception("Expected " + Assertion.format(assertion, (Object[]) args) +
++ " to throw a RuntimeException");
++ }
++
++}
++
++enum Assertion {
++ LT, LTE, EQ, GTE, GT, NE, NULL, NOTNULL, FALSE, TRUE;
++
++ public static <T extends Comparable<T>> void run(Assertion assertion, T ... args) {
++ String msg = "Expected " + format(assertion, args) + " to pass";
++ switch (assertion) {
++ case LT:
++ assertLessThan(args[0], args[1], msg);
++ break;
++ case LTE:
++ assertLessThanOrEqual(args[0], args[1], msg);
++ break;
++ case EQ:
++ assertEquals(args[0], args[1], msg);
++ break;
++ case GTE:
++ assertGreaterThanOrEqual(args[0], args[1], msg);
++ break;
++ case GT:
++ assertGreaterThan(args[0], args[1], msg);
++ break;
++ case NE:
++ assertNotEquals(args[0], args[1], msg);
++ break;
++ case NULL:
++ assertNull(args == null ? args : args[0], msg);
++ break;
++ case NOTNULL:
++ assertNotNull(args == null ? args : args[0], msg);
++ break;
++ case FALSE:
++ assertFalse((Boolean) args[0], msg);
++ break;
++ case TRUE:
++ assertTrue((Boolean) args[0], msg);
++ break;
++ default:
++ // do nothing
++ }
++ }
++
++ public static String format(Assertion assertion, Object ... args) {
++ switch (assertion) {
++ case LT:
++ return asString("assertLessThan", args);
++ case LTE:
++ return asString("assertLessThanOrEqual", args);
++ case EQ:
++ return asString("assertEquals", args);
++ case GTE:
++ return asString("assertGreaterThanOrEquals", args);
++ case GT:
++ return asString("assertGreaterThan", args);
++ case NE:
++ return asString("assertNotEquals", args);
++ case NULL:
++ return asString("assertNull", args);
++ case NOTNULL:
++ return asString("assertNotNull", args);
++ case FALSE:
++ return asString("assertFalse", args);
++ case TRUE:
++ return asString("assertTrue", args);
++ default:
++ return "";
++ }
++ }
++
++ private static String asString(String assertion, Object ... args) {
++ if (args == null) {
++ return String.format("%s(null)", assertion);
++ }
++ if (args.length == 1) {
++ return String.format("%s(%s)", assertion, args[0]);
++ } else {
++ return String.format("%s(%s, %s)", assertion, args[0], args[1]);
++ }
++ }
++}
+--- ./jdk/test/lib/testlibrary/ClassFileInstaller.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/lib/testlibrary/ClassFileInstaller.java Wed Apr 16 12:37:49 2014 +0400
+@@ -45,7 +45,10 @@
+
+ // Create the class file's package directory
+ Path p = Paths.get(pathName);
+- Files.createDirectories(p.getParent());
++ Path parent = p.getParent();
++ if (parent != null) {
++ Files.createDirectories(parent);
++ }
+ // Create the class file
+ Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,122 @@
++/*
++ * 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
++ * @summary Test the OutputAnalyzer reporting functionality,
++ * such as printing additional diagnostic info
++ * (exit code, stdout, stderr, command line, etc.)
++ * @library /testlibrary
++ */
++
++import java.io.ByteArrayOutputStream;
++import java.io.PrintStream;
++
++import jdk.testlibrary.OutputAnalyzer;
++
++public class OutputAnalyzerReportingTest {
++
++ public static void main(String[] args) throws Exception {
++ // Create the output analyzer under test
++ String stdout = "aaaaaa";
++ String stderr = "bbbbbb";
++ OutputAnalyzer output = new OutputAnalyzer(stdout, stderr);
++
++ // Expected summary values should be the same for all cases,
++ // since the outputAnalyzer object is the same
++ String expectedExitValue = "-1";
++ String expectedSummary =
++ " stdout: [" + stdout + "];\n" +
++ " stderr: [" + stderr + "]\n" +
++ " exitValue = " + expectedExitValue + "\n";
++
++
++ DiagnosticSummaryTestRunner testRunner =
++ new DiagnosticSummaryTestRunner();
++
++ // should have exit value
++ testRunner.init(expectedSummary);
++ int unexpectedExitValue = 2;
++ try {
++ output.shouldHaveExitValue(unexpectedExitValue);
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ // should not contain
++ testRunner.init(expectedSummary);
++ try {
++ output.shouldNotContain(stdout);
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ // should contain
++ testRunner.init(expectedSummary);
++ try {
++ output.shouldContain("unexpected-stuff");
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ // should not match
++ testRunner.init(expectedSummary);
++ try {
++ output.shouldNotMatch("[a]");
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ // should match
++ testRunner.init(expectedSummary);
++ try {
++ output.shouldMatch("[qwerty]");
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ }
++
++ private static class DiagnosticSummaryTestRunner {
++ private ByteArrayOutputStream byteStream =
++ new ByteArrayOutputStream(10000);
++
++ private String expectedSummary = "";
++ private PrintStream errStream;
++
++
++ public void init(String expectedSummary) {
++ this.expectedSummary = expectedSummary;
++ byteStream.reset();
++ errStream = new PrintStream(byteStream);
++ System.setErr(errStream);
++ }
++
++ public void closeAndCheckResults() {
++ // check results
++ errStream.close();
++ String stdErrStr = byteStream.toString();
++ if (!stdErrStr.contains(expectedSummary)) {
++ throw new RuntimeException("The output does not contain "
++ + "the diagnostic message, or the message is incorrect");
++ }
++ }
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,395 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++/**
++ * Asserts that can be used for verifying assumptions in tests.
++ *
++ * An assertion will throw a {@link RuntimeException} if the assertion isn't
++ * valid. All the asserts can be imported into a test by using a static
++ * import:
++ *
++ * <pre>
++ * {@code
++ * import static com.oracle.java.testlibrary.Asserts.*;
++ * }
++ *
++ * Always provide a message describing the assumption if the line number of the
++ * failing assertion isn't enough to understand why the assumption failed. For
++ * example, if the assertion is in a loop or in a method that is called
++ * multiple times, then the line number won't provide enough context to
++ * understand the failure.
++ * </pre>
++ */
++public class Asserts {
++
++ /**
++ * Shorthand for {@link #assertLessThan(T, T)}.
++ *
++ * @see #assertLessThan(T, T)
++ */
++ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs) {
++ assertLessThan(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertLessThan(T, T, String)}.
++ *
++ * @see #assertLessThan(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs, String msg) {
++ assertLessThan(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertLessThan(T, T, String)} with a default message.
++ *
++ * @see #assertLessThan(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertLessThan(T lhs, T rhs) {
++ String msg = "Expected that " + format(lhs) + " < " + format(rhs);
++ assertLessThan(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is less than {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static <T extends Comparable<T>>void assertLessThan(T lhs, T rhs, String msg) {
++ assertTrue(compare(lhs, rhs, msg) < 0, msg);
++ }
++
++ /**
++ * Shorthand for {@link #assertLessThanOrEqual(T, T)}.
++ *
++ * @see #assertLessThanOrEqual(T, T)
++ */
++ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs) {
++ assertLessThanOrEqual(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertLessThanOrEqual(T, T, String)}.
++ *
++ * @see #assertLessThanOrEqual(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs, String msg) {
++ assertLessThanOrEqual(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertLessThanOrEqual(T, T, String)} with a default message.
++ *
++ * @see #assertLessThanOrEqual(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs) {
++ String msg = "Expected that " + format(lhs) + " <= " + format(rhs);
++ assertLessThanOrEqual(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is less than or equal to {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs, String msg) {
++ assertTrue(compare(lhs, rhs, msg) <= 0, msg);
++ }
++
++ /**
++ * Shorthand for {@link #assertEquals(T, T)}.
++ *
++ * @see #assertEquals(T, T)
++ */
++ public static void assertEQ(Object lhs, Object rhs) {
++ assertEquals(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertEquals(T, T, String)}.
++ *
++ * @see #assertEquals(T, T, String)
++ */
++ public static void assertEQ(Object lhs, Object rhs, String msg) {
++ assertEquals(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertEquals(T, T, String)} with a default message.
++ *
++ * @see #assertEquals(T, T, String)
++ */
++ public static void assertEquals(Object lhs, Object rhs) {
++ String msg = "Expected " + format(lhs) + " to equal " + format(rhs);
++ assertEquals(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is equal to {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertEquals(Object lhs, Object rhs, String msg) {
++ if (lhs == null) {
++ if (rhs != null) {
++ error(msg);
++ }
++ } else {
++ assertTrue(lhs.equals(rhs), msg);
++ }
++ }
++
++ /**
++ * Shorthand for {@link #assertGreaterThanOrEqual(T, T)}.
++ *
++ * @see #assertGreaterThanOrEqual(T, T)
++ */
++ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs) {
++ assertGreaterThanOrEqual(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertGreaterThanOrEqual(T, T, String)}.
++ *
++ * @see #assertGreaterThanOrEqual(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs, String msg) {
++ assertGreaterThanOrEqual(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertGreaterThanOrEqual(T, T, String)} with a default message.
++ *
++ * @see #assertGreaterThanOrEqual(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs) {
++ String msg = "Expected that " + format(lhs) + " >= " + format(rhs);
++ assertGreaterThanOrEqual(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is greater than or equal to {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs, String msg) {
++ assertTrue(compare(lhs, rhs, msg) >= 0, msg);
++ }
++
++ /**
++ * Shorthand for {@link #assertGreaterThan(T, T)}.
++ *
++ * @see #assertGreaterThan(T, T)
++ */
++ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs) {
++ assertGreaterThan(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertGreaterThan(T, T, String)}.
++ *
++ * @see #assertGreaterThan(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs, String msg) {
++ assertGreaterThan(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertGreaterThan(T, T, String)} with a default message.
++ *
++ * @see #assertGreaterThan(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs) {
++ String msg = "Expected that " + format(lhs) + " > " + format(rhs);
++ assertGreaterThan(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is greater than {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, String msg) {
++ assertTrue(compare(lhs, rhs, msg) > 0, msg);
++ }
++
++ /**
++ * Shorthand for {@link #assertNotEquals(T, T)}.
++ *
++ * @see #assertNotEquals(T, T)
++ */
++ public static void assertNE(Object lhs, Object rhs) {
++ assertNotEquals(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertNotEquals(T, T, String)}.
++ *
++ * @see #assertNotEquals(T, T, String)
++ */
++ public static void assertNE(Object lhs, Object rhs, String msg) {
++ assertNotEquals(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertNotEquals(T, T, String)} with a default message.
++ *
++ * @see #assertNotEquals(T, T, String)
++ */
++ public static void assertNotEquals(Object lhs, Object rhs) {
++ String msg = "Expected " + format(lhs) + " to not equal " + format(rhs);
++ assertNotEquals(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is not equal to {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertNotEquals(Object lhs, Object rhs, String msg) {
++ if (lhs == null) {
++ if (rhs == null) {
++ error(msg);
++ }
++ } else {
++ assertFalse(lhs.equals(rhs), msg);
++ }
++ }
++
++ /**
++ * Calls {@link #assertNull(Object, String)} with a default message.
++ *
++ * @see #assertNull(Object, String)
++ */
++ public static void assertNull(Object o) {
++ assertNull(o, "Expected " + format(o) + " to be null");
++ }
++
++ /**
++ * Asserts that {@code o} is null.
++ *
++ * @param o The reference assumed to be null.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertNull(Object o, String msg) {
++ assertEquals(o, null, msg);
++ }
++
++ /**
++ * Calls {@link #assertNotNull(Object, String)} with a default message.
++ *
++ * @see #assertNotNull(Object, String)
++ */
++ public static void assertNotNull(Object o) {
++ assertNotNull(o, "Expected non null reference");
++ }
++
++ /**
++ * Asserts that {@code o} is <i>not</i> null.
++ *
++ * @param o The reference assumed <i>not</i> to be null,
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertNotNull(Object o, String msg) {
++ assertNotEquals(o, null, msg);
++ }
++
++ /**
++ * Calls {@link #assertFalse(boolean, String)} with a default message.
++ *
++ * @see #assertFalse(boolean, String)
++ */
++ public static void assertFalse(boolean value) {
++ assertFalse(value, "Expected value to be false");
++ }
++
++ /**
++ * Asserts that {@code value} is {@code false}.
++ *
++ * @param value The value assumed to be false.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertFalse(boolean value, String msg) {
++ assertTrue(!value, msg);
++ }
++
++ /**
++ * Calls {@link #assertTrue(boolean, String)} with a default message.
++ *
++ * @see #assertTrue(boolean, String)
++ */
++ public static void assertTrue(boolean value) {
++ assertTrue(value, "Expected value to be true");
++ }
++
++ /**
++ * Asserts that {@code value} is {@code true}.
++ *
++ * @param value The value assumed to be true.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertTrue(boolean value, String msg) {
++ if (!value) {
++ error(msg);
++ }
++ }
++
++ private static <T extends Comparable<T>> int compare(T lhs, T rhs, String msg) {
++ assertNotNull(lhs, msg);
++ assertNotNull(rhs, msg);
++ return lhs.compareTo(rhs);
++ }
++
++ private static String format(Object o) {
++ return o == null? "null" : o.toString();
++ }
++
++ private static void error(String msg) {
++ throw new RuntimeException(msg);
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/InputArguments.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,88 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++import java.lang.management.RuntimeMXBean;
++import java.lang.management.ManagementFactory;
++import java.util.List;
++
++/**
++ * This class provides access to the input arguments to the VM.
++ */
++public class InputArguments {
++ private static final List<String> args;
++
++ static {
++ RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
++ args = runtimeMxBean.getInputArguments();
++ }
++
++ /**
++ * Returns true if {@code arg} is an input argument to the VM.
++ *
++ * This is useful for checking boolean flags such as -XX:+UseSerialGC or
++ * -XX:-UsePerfData.
++ *
++ * @param arg The name of the argument.
++ * @return {@code true} if the given argument is an input argument,
++ * otherwise {@code false}.
++ */
++ public static boolean contains(String arg) {
++ return args.contains(arg);
++ }
++
++ /**
++ * Returns true if {@code prefix} is the start of an input argument to the
++ * VM.
++ *
++ * This is useful for checking if flags describing a quantity, such as
++ * -XX:+MaxMetaspaceSize=100m, is set without having to know the quantity.
++ * To check if the flag -XX:MaxMetaspaceSize is set, use
++ * {@code InputArguments.containsPrefix("-XX:MaxMetaspaceSize")}.
++ *
++ * @param prefix The start of the argument.
++ * @return {@code true} if the given argument is the start of an input
++ * argument, otherwise {@code false}.
++ */
++ public static boolean containsPrefix(String prefix) {
++ for (String arg : args) {
++ if (arg.startsWith(prefix)) {
++ return true;
++ }
++ }
++ return false;
++ }
++
++ /**
++ * Get the string containing input arguments passed to the VM
++ */
++ public static String getInputArguments() {
++ StringBuilder result = new StringBuilder();
++ for (String arg : args)
++ result.append(arg).append(' ');
++
++ return result.toString();
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,106 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++import java.io.FileNotFoundException;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++
++public final class JDKToolFinder {
++
++ private JDKToolFinder() {
++ }
++
++ /**
++ * Returns the full path to an executable in jdk/bin based on System
++ * property {@code test.jdk} or {@code compile.jdk} (both are set by the jtreg test suite)
++ *
++ * @return Full path to an executable in jdk/bin
++ */
++ public static String getJDKTool(String tool) {
++
++ // First try to find the executable in test.jdk
++ try {
++ return getTool(tool, "test.jdk");
++ } catch (FileNotFoundException e) {
++
++ }
++
++ // Now see if it's available in compile.jdk
++ try {
++ return getTool(tool, "compile.jdk");
++ } catch (FileNotFoundException e) {
++ throw new RuntimeException("Failed to find " + tool +
++ ", looked in test.jdk (" + System.getProperty("test.jdk") +
++ ") and compile.jdk (" + System.getProperty("compile.jdk") + ")");
++ }
++ }
++
++ /**
++ * Returns the full path to an executable in jdk/bin based on System
++ * property {@code compile.jdk}
++ *
++ * @return Full path to an executable in jdk/bin
++ */
++ public static String getCompileJDKTool(String tool) {
++ try {
++ return getTool(tool, "compile.jdk");
++ } catch (FileNotFoundException e) {
++ throw new RuntimeException(e);
++ }
++ }
++
++ /**
++ * Returns the full path to an executable in jdk/bin based on System
++ * property {@code test.jdk}
++ *
++ * @return Full path to an executable in jdk/bin
++ */
++ public static String getTestJDKTool(String tool) {
++ try {
++ return getTool(tool, "test.jdk");
++ } catch (FileNotFoundException e) {
++ throw new RuntimeException(e);
++ }
++ }
++
++ private static String getTool(String tool, String property) throws FileNotFoundException {
++ String jdkPath = System.getProperty(property);
++
++ if (jdkPath == null) {
++ throw new RuntimeException(
++ "System property '" + property + "' not set. This property is normally set by jtreg. "
++ + "When running test separately, set this property using '-D" + property + "=/path/to/jdk'.");
++ }
++
++ Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : ""));
++
++ Path jdkTool = Paths.get(jdkPath, toolName.toString());
++ if (!jdkTool.toFile().exists()) {
++ throw new FileNotFoundException("Could not find file " + jdkTool.toAbsolutePath());
++ }
++
++ return jdkTool.toAbsolutePath().toString();
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,134 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++import java.util.ArrayList;
++import java.util.Arrays;
++import java.util.List;
++
++/**
++ * A utility for constructing command lines for starting JDK tool processes.
++ *
++ * The JDKToolLauncher can in particular be combined with a
++ * java.lang.ProcessBuilder to easily run a JDK tool. For example, the following
++ * code run {@code jmap -heap} against a process with GC logging turned on for
++ * the {@code jmap} process:
++ *
++ * <pre>
++ * {@code
++ * JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
++ * .addVMArg("-XX:+PrintGC");
++ * .addVMArg("-XX:+PrintGCDetails")
++ * .addToolArg("-heap")
++ * .addToolArg(pid);
++ * ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
++ * Process p = pb.start();
++ * }
++ * </pre>
++ */
++public class JDKToolLauncher {
++ private final String executable;
++ private final List<String> vmArgs = new ArrayList<String>();
++ private final List<String> toolArgs = new ArrayList<String>();
++
++ private JDKToolLauncher(String tool, boolean useCompilerJDK) {
++ if (useCompilerJDK) {
++ executable = JDKToolFinder.getJDKTool(tool);
++ } else {
++ executable = JDKToolFinder.getTestJDKTool(tool);
++ }
++ vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
++ }
++
++ /**
++ * Creates a new JDKToolLauncher for the specified tool. Using tools path
++ * from the compiler JDK.
++ *
++ * @param tool
++ * The name of the tool
++ * @return A new JDKToolLauncher
++ */
++ public static JDKToolLauncher create(String tool) {
++ return new JDKToolLauncher(tool, true);
++ }
++
++ /**
++ * Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
++ *
++ * @param tool
++ * The name of the tool
++ *
++ * @return A new JDKToolLauncher
++ */
++ public static JDKToolLauncher createUsingTestJDK(String tool) {
++ return new JDKToolLauncher(tool, false);
++ }
++
++ /**
++ * Adds an argument to the JVM running the tool.
++ *
++ * The JVM arguments are passed to the underlying JVM running the tool.
++ * Arguments will automatically be prepended with "-J".
++ *
++ * Any platform specific arguments required for running the tool are
++ * automatically added.
++ *
++ *
++ * @param arg
++ * The argument to VM running the tool
++ * @return The JDKToolLauncher instance
++ */
++ public JDKToolLauncher addVMArg(String arg) {
++ vmArgs.add(arg);
++ return this;
++ }
++
++ /**
++ * Adds an argument to the tool.
++ *
++ * @param arg
++ * The argument to the tool
++ * @return The JDKToolLauncher instance
++ */
++ public JDKToolLauncher addToolArg(String arg) {
++ toolArgs.add(arg);
++ return this;
++ }
++
++ /**
++ * Returns the command that can be used for running the tool.
++ *
++ * @return An array whose elements are the arguments of the command.
++ */
++ public String[] getCommand() {
++ List<String> command = new ArrayList<String>();
++ command.add(executable);
++ // Add -J in front of all vmArgs
++ for (String arg : vmArgs) {
++ command.add("-J" + arg);
++ }
++ command.addAll(toolArgs);
++ return command.toArray(new String[command.size()]);
++ }
++}
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/JcmdBase.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JcmdBase.java Wed Apr 16 12:37:49 2014 +0400
+@@ -23,8 +23,11 @@
+
+ package jdk.testlibrary;
+
+-import java.util.ArrayList;
++import java.util.Arrays;
+
++/**
++ * Super class for tests which need to attach jcmd to the current process.
++ */
+ public class JcmdBase {
+
+ private static ProcessBuilder processBuilder = new ProcessBuilder();
+@@ -32,46 +35,24 @@
+ /**
+ * Attach jcmd to the current process
+ *
+- * @param commandArgs
+- * jcmd command line parameters, e.g. JFR.start
++ * @param toolArgs
++ * jcmd command line parameters, e.g. VM.flags
+ * @return jcmd output
+ * @throws Exception
+ */
+- public final static OutputAnalyzer jcmd(String... commandArgs)
++ public final static OutputAnalyzer jcmd(String... toolArgs)
+ throws Exception {
+- ArrayList<String> cmd = new ArrayList<String>();
+- String cmdString = "";
+-
+- // jcmd from the jdk to be tested
+- String jcmdPath = JdkFinder.getTool("jcmd", false);
+- cmd.add(jcmdPath);
+- cmdString += jcmdPath;
+-
+- String pid = Integer.toString(ProcessTools.getProcessId());
+- cmd.add(pid);
+- cmdString += " " + pid;
+-
+- for (int i = 0; i < commandArgs.length; i++) {
+- cmd.add(commandArgs[i]);
+- cmdString += " " + commandArgs[i];
++ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jcmd");
++ launcher.addToolArg(Integer.toString(ProcessTools.getProcessId()));
++ for (String toolArg : toolArgs) {
++ launcher.addToolArg(toolArg);
+ }
+-
+- // Log command line for debugging purpose
+- System.out.println("Command line:");
+- System.out.println(cmdString);
+-
+- processBuilder.command(cmd);
++ processBuilder.command(launcher.getCommand());
++ System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+-
+- // Log output for debugging purpose
+- System.out.println("Command output:");
+ System.out.println(output.getOutput());
+
+- if (output.getExitValue() != 0) {
+- throw new Exception(processBuilder.command()
+- + " resulted in exit value " + output.getExitValue()
+- + " , expected to get 0");
+- }
++ output.shouldHaveExitValue(0);
+
+ return output;
+ }
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java Wed May 07 19:26:47 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,78 +0,0 @@
+-/*
+- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation.
+- *
+- * 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 jdk.testlibrary;
+-
+-import java.io.File;
+-
+-public final class JdkFinder {
+-
+- private JdkFinder() {
+- }
+-
+- private static String getExecutable(String executable, String property) {
+- String binPath = System.getProperty(property);
+- if (binPath == null) {
+- throw new RuntimeException(
+- "System property '" + property + "' not set");
+- }
+-
+- binPath += File.separatorChar + "bin" + File.separatorChar + executable;
+-
+- return binPath;
+- }
+-
+- /**
+- * Returns the full path to a java launcher in jdk/bin based on system
+- * property.
+- *
+- * @param stableJdk
+- * see {@link #getTool(String, boolean)}
+- * @return Full path to a java launcher in jdk/bin.
+- */
+- public static String getJavaLauncher(boolean stableJdk) {
+- return getTool("java", stableJdk);
+- }
+-
+- /**
+- * Returns the full path to an executable in jdk/bin based on system
+- * property. Depending on value of {@code stableJdk} the method will look for
+- * either 'compile.jdk' or 'test.jdk' system properties.
+- * 'test.jdk' is normally set by jtreg. When running test separately,
+- * set this property using '-Dtest.jdk=/path/to/jdk'.
+- *
+- * @param stableJdk
+- * If {@code true} the {@code tool} will be retrieved
+- * from the compile (stable) JDK.
+- * If {@code false} the {@code tool} will be retrieved
+- * from the test JDK.
+- * @return Full path to an executable in jdk/bin.
+- */
+- public static String getTool(String tool, boolean stableJdk) {
+- if (stableJdk) {
+- return getExecutable(tool, "compile.jdk");
+- } else {
+- return getExecutable(tool, "test.jdk");
+- }
+- }
+-}
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java Wed Apr 16 12:37:49 2014 +0400
+@@ -27,6 +27,9 @@
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+
++/**
++ * Utility class for verifying output and exit value from a {@code Process}.
++ */
+ public final class OutputAnalyzer {
+
+ private final String stdout;
+@@ -85,9 +88,9 @@
+ public void shouldContain(String expectedString) {
+ if (!stdout.contains(expectedString)
+ && !stderr.contains(expectedString)) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + expectedString
+- + "' missing from stdout/stderr: [" + stdout + stderr
+- + "]\n");
++ + "' missing from stdout/stderr \n");
+ }
+ }
+
+@@ -101,8 +104,9 @@
+ */
+ public void stdoutShouldContain(String expectedString) {
+ if (!stdout.contains(expectedString)) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + expectedString
+- + "' missing from stdout: [" + stdout + "]\n");
++ + "' missing from stdout \n");
+ }
+ }
+
+@@ -116,8 +120,9 @@
+ */
+ public void stderrShouldContain(String expectedString) {
+ if (!stderr.contains(expectedString)) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + expectedString
+- + "' missing from stderr: [" + stderr + "]\n");
++ + "' missing from stderr \n");
+ }
+ }
+
+@@ -132,12 +137,14 @@
+ */
+ public void shouldNotContain(String notExpectedString) {
+ if (stdout.contains(notExpectedString)) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + notExpectedString
+- + "' found in stdout: [" + stdout + "]\n");
++ + "' found in stdout \n");
+ }
+ if (stderr.contains(notExpectedString)) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + notExpectedString
+- + "' found in stderr: [" + stderr + "]\n");
++ + "' found in stderr \n");
+ }
+ }
+
+@@ -152,8 +159,9 @@
+ */
+ public void stdoutShouldNotContain(String notExpectedString) {
+ if (stdout.contains(notExpectedString)) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + notExpectedString
+- + "' found in stdout: [" + stdout + "]\n");
++ + "' found in stdout \n");
+ }
+ }
+
+@@ -168,55 +176,63 @@
+ */
+ public void stderrShouldNotContain(String notExpectedString) {
+ if (stderr.contains(notExpectedString)) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + notExpectedString
+- + "' found in stderr: [" + stderr + "]\n");
++ + "' found in stderr \n");
+ }
+ }
+
+ /**
+- * Verify that the stdout and stderr contents of output buffer matches
+- * the pattern
++ * Verify that the stdout and stderr contents of output buffer matches the
++ * pattern
+ *
+ * @param pattern
+- * @throws RuntimeException If the pattern was not found
++ * @throws RuntimeException
++ * If the pattern was not found
+ */
+ public void shouldMatch(String pattern) {
+- Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+- Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
++ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE)
++ .matcher(stdout);
++ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE)
++ .matcher(stderr);
+ if (!stdoutMatcher.find() && !stderrMatcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' missing from stdout/stderr: [" + stdout + stderr
+- + "]\n");
++ + "' missing from stdout/stderr \n");
+ }
+ }
+
+ /**
+- * Verify that the stdout contents of output buffer matches the
+- * pattern
++ * Verify that the stdout contents of output buffer matches the pattern
+ *
+ * @param pattern
+- * @throws RuntimeException If the pattern was not found
++ * @throws RuntimeException
++ * If the pattern was not found
+ */
+ public void stdoutShouldMatch(String pattern) {
+- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
++ stdout);
+ if (!matcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' missing from stdout: [" + stdout + "]\n");
++ + "' missing from stdout \n");
+ }
+ }
+
+ /**
+- * Verify that the stderr contents of output buffer matches the
+- * pattern
++ * Verify that the stderr contents of output buffer matches the pattern
+ *
+ * @param pattern
+- * @throws RuntimeException If the pattern was not found
++ * @throws RuntimeException
++ * If the pattern was not found
+ */
+ public void stderrShouldMatch(String pattern) {
+- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
++ stderr);
+ if (!matcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' missing from stderr: [" + stderr + "]\n");
++ + "' missing from stderr \n");
+ }
+ }
+
+@@ -225,18 +241,22 @@
+ * match the pattern
+ *
+ * @param pattern
+- * @throws RuntimeException If the pattern was found
++ * @throws RuntimeException
++ * If the pattern was found
+ */
+ public void shouldNotMatch(String pattern) {
+- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
++ stdout);
+ if (matcher.find()) {
+- throw new RuntimeException("'" + pattern
+- + "' found in stdout: [" + stdout + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + pattern + "' found in stdout: '"
++ + matcher.group() + "' \n");
+ }
+ matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ if (matcher.find()) {
+- throw new RuntimeException("'" + pattern
+- + "' found in stderr: [" + stderr + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + pattern + "' found in stderr: '"
++ + matcher.group() + "' \n");
+ }
+ }
+
+@@ -245,13 +265,15 @@
+ * pattern
+ *
+ * @param pattern
+- * @throws RuntimeException If the pattern was found
++ * @throws RuntimeException
++ * If the pattern was found
+ */
+ public void stdoutShouldNotMatch(String pattern) {
+- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
++ stdout);
+ if (matcher.find()) {
+- throw new RuntimeException("'" + pattern
+- + "' found in stdout: [" + stdout + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + pattern + "' found in stdout \n");
+ }
+ }
+
+@@ -260,18 +282,56 @@
+ * pattern
+ *
+ * @param pattern
+- * @throws RuntimeException If the pattern was found
++ * @throws RuntimeException
++ * If the pattern was found
+ */
+ public void stderrShouldNotMatch(String pattern) {
+- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
++ stderr);
+ if (matcher.find()) {
+- throw new RuntimeException("'" + pattern
+- + "' found in stderr: [" + stderr + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + pattern + "' found in stderr \n");
+ }
+ }
+
+ /**
+- * Verifiy the exit value of the process
++ * Get the captured group of the first string matching the pattern. stderr
++ * is searched before stdout.
++ *
++ * @param pattern
++ * The multi-line pattern to match
++ * @param group
++ * The group to capture
++ * @return The matched string or null if no match was found
++ */
++ public String firstMatch(String pattern, int group) {
++ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE)
++ .matcher(stderr);
++ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE)
++ .matcher(stdout);
++ if (stderrMatcher.find()) {
++ return stderrMatcher.group(group);
++ }
++ if (stdoutMatcher.find()) {
++ return stdoutMatcher.group(group);
++ }
++ return null;
++ }
++
++ /**
++ * Get the first string matching the pattern. stderr is searched before
++ * stdout.
++ *
++ * @param pattern
++ * The multi-line pattern to match
++ * @return The matched string or null if no match was found
++ */
++ public String firstMatch(String pattern) {
++ return firstMatch(pattern, 0);
++ }
++
++ /**
++ * Verify the exit value of the process
+ *
+ * @param expectedExitValue
+ * Expected exit value from process
+@@ -281,12 +341,25 @@
+ */
+ public void shouldHaveExitValue(int expectedExitValue) {
+ if (getExitValue() != expectedExitValue) {
+- throw new RuntimeException("Exit value " + getExitValue()
+- + " , expected to get " + expectedExitValue);
++ reportDiagnosticSummary();
++ throw new RuntimeException("Expected to get exit value of ["
++ + expectedExitValue + "]\n");
+ }
+ }
+
+ /**
++ * Report summary that will help to diagnose the problem Currently includes:
++ * - standard input produced by the process under test - standard output -
++ * exit code Note: the command line is printed by the ProcessTools
++ */
++ private void reportDiagnosticSummary() {
++ String msg = " stdout: [" + stdout + "];\n" + " stderr: [" + stderr
++ + "]\n" + " exitValue = " + getExitValue() + "\n";
++
++ System.err.println(msg);
++ }
++
++ /**
+ * Get the contents of the output buffer (stdout and stderr)
+ *
+ * @return Content of the output buffer
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,103 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++public class Platform {
++ private static final String osName = System.getProperty("os.name");
++ private static final String dataModel = System.getProperty("sun.arch.data.model");
++ private static final String vmVersion = System.getProperty("java.vm.version");
++ private static final String osArch = System.getProperty("os.arch");
++
++ public static boolean is32bit() {
++ return dataModel.equals("32");
++ }
++
++ public static boolean is64bit() {
++ return dataModel.equals("64");
++ }
++
++ public static boolean isSolaris() {
++ return isOs("sunos");
++ }
++
++ public static boolean isWindows() {
++ return isOs("win");
++ }
++
++ public static boolean isOSX() {
++ return isOs("mac");
++ }
++
++ public static boolean isLinux() {
++ return isOs("linux");
++ }
++
++ private static boolean isOs(String osname) {
++ return osName.toLowerCase().startsWith(osname.toLowerCase());
++ }
++
++ public static String getOsName() {
++ return osName;
++ }
++
++ public static boolean isDebugBuild() {
++ return vmVersion.toLowerCase().contains("debug");
++ }
++
++ public static String getVMVersion() {
++ return vmVersion;
++ }
++
++ // Returns true for sparc and sparcv9.
++ public static boolean isSparc() {
++ return isArch("sparc");
++ }
++
++ public static boolean isARM() {
++ return isArch("arm");
++ }
++
++ public static boolean isPPC() {
++ return isArch("ppc");
++ }
++
++ public static boolean isX86() {
++ // On Linux it's 'i386', Windows 'x86'
++ return (isArch("i386") || isArch("x86"));
++ }
++
++ public static boolean isX64() {
++ // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
++ return (isArch("amd64") || isArch("x86_64"));
++ }
++
++ private static boolean isArch(String archname) {
++ return osArch.toLowerCase().startsWith(archname.toLowerCase());
++ }
++
++ public static String getOsArch() {
++ return osArch;
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessThread.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,143 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++import static jdk.testlibrary.Asserts.assertNotEquals;
++import static jdk.testlibrary.Asserts.assertTrue;
++
++import java.util.List;
++import java.util.concurrent.CountDownLatch;
++
++/**
++ * The helper class for starting and stopping {@link Process} in a separate thread.
++ */
++public class ProcessThread extends TestThread {
++
++ /**
++ * Creates a new {@code ProcessThread} object.
++ *
++ * @param threadName The name of thread
++ * @param cmd The string array of program and its arguments to pass to {@link ProcessBuilder}
++ */
++ public ProcessThread(String threadName, String... cmd) {
++ super(new ProcessRunnable(new ProcessBuilder(cmd)), threadName);
++ }
++
++ /**
++ * Creates a new {@code ProcessThread} object.
++ *
++ * @param threadName The name of thread.
++ * @param pb The ProcessBuilder to execute.
++ */
++ public ProcessThread(String threadName, ProcessBuilder pb) {
++ super(new ProcessRunnable(pb), threadName);
++ }
++
++ /**
++ * Stops {@link Process} started by {@code ProcessRunnable}.
++ *
++ * @throws InterruptedException
++ */
++ public void stopProcess() throws InterruptedException {
++ ((ProcessRunnable) getRunnable()).stopProcess();
++ }
++
++ /**
++ * @return The process output, or null if the process has not yet completed.
++ */
++ public OutputAnalyzer getOutput() {
++ return ((ProcessRunnable) getRunnable()).getOutput();
++ }
++
++ /**
++ * {@link Runnable} interface for starting and stopping {@link Process}.
++ */
++ static class ProcessRunnable extends XRun {
++
++ private final ProcessBuilder processBuilder;
++ private final CountDownLatch latch;
++ private volatile Process process;
++ private volatile OutputAnalyzer output;
++
++ /**
++ * Creates a new {@code ProcessRunnable} object.
++ *
++ * @param pb The {@link ProcessBuilder} to run.
++ */
++ public ProcessRunnable(ProcessBuilder pb) {
++ super();
++ this.processBuilder = pb;
++ this.latch = new CountDownLatch(1);
++ }
++
++ /**
++ * Starts the process in {@code ProcessThread}.
++ * All exceptions which occurs here will be caught and stored in {@code ProcessThread}.
++ *
++ * see {@link XRun}
++ */
++ @Override
++ public void xrun() throws Throwable {
++ this.process = processBuilder.start();
++ // Release when process is started
++ latch.countDown();
++
++ // Will block...
++ try {
++ output = new OutputAnalyzer(this.process);
++ } catch (Throwable t) {
++ String name = Thread.currentThread().getName();
++ System.out.println(String.format("ProcessThread[%s] failed: %s", name, t.toString()));
++ throw t;
++ } finally {
++ String logMsg = ProcessTools.getProcessLog(processBuilder, output);
++ System.out.println(logMsg);
++ }
++ }
++
++ /**
++ * Stops the process.
++ *
++ * @throws InterruptedException
++ */
++ public void stopProcess() throws InterruptedException {
++ // Wait until process is started
++ latch.await();
++ if (this.process != null) {
++ System.out.println("ProcessThread.stopProcess() will kill process");
++ this.process.destroy();
++ }
++ }
++
++ /**
++ * Returns the OutputAnalyzer with stdout/stderr from the process.
++ * @return The process output, or null if process not completed.
++ * @throws InterruptedException
++ */
++ public OutputAnalyzer getOutput() {
++ return output;
++ }
++ }
++
++}
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java Wed Apr 16 12:37:49 2014 +0400
+@@ -25,24 +25,107 @@
+
+ import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
++import java.io.PrintStream;
+ import java.lang.management.ManagementFactory;
+ import java.lang.management.RuntimeMXBean;
+ import java.lang.reflect.Field;
+ import java.lang.reflect.Method;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.Map;
++import java.util.concurrent.ExecutionException;
++import java.util.concurrent.Future;
++import java.util.concurrent.Phaser;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeoutException;
+
+ import sun.management.VMManagement;
+
+ public final class ProcessTools {
++ private static final class LineForwarder extends StreamPumper.LinePump {
++ private final PrintStream ps;
++ private final String prefix;
++ LineForwarder(String prefix, PrintStream os) {
++ this.ps = os;
++ this.prefix = prefix;
++ }
++ @Override
++ protected void processLine(String line) {
++ ps.println("[" + prefix + "] " + line);
++ }
++ }
+
+ private ProcessTools() {
+ }
+
+ /**
++ * <p>Starts a process from its builder.</p>
++ * <span>The default redirects of STDOUT and STDERR are started</span>
++ * @param name The process name
++ * @param processBuilder The process builder
++ * @return Returns the initialized process
++ * @throws IOException
++ */
++ public static Process startProcess(String name,
++ ProcessBuilder processBuilder)
++ throws IOException {
++ Process p = null;
++ try {
++ p = startProcess(name, processBuilder, -1, TimeUnit.NANOSECONDS);
++ } catch (InterruptedException | TimeoutException e) {
++ // can't ever happen
++ }
++ return p;
++ }
++
++ /**
++ * <p>Starts a process from its builder.</p>
++ * <span>The default redirects of STDOUT and STDERR are started</span>
++ * @param name The process name
++ * @param processBuilder The process builder
++ * @param timeout The timeout for the warmup waiting
++ * @param unit The timeout {@linkplain TimeUnit}
++ * @return Returns the initialized {@linkplain Process}
++ * @throws IOException
++ * @throws InterruptedException
++ * @throws TimeoutException
++ */
++ public static Process startProcess(String name,
++ ProcessBuilder processBuilder,
++ long timeout,
++ TimeUnit unit)
++ throws IOException, InterruptedException, TimeoutException {
++ Process p = processBuilder.start();
++ StreamPumper stdout = new StreamPumper(p.getInputStream());
++ StreamPumper stderr = new StreamPumper(p.getErrorStream());
++
++ stdout.addPump(new LineForwarder(name, System.out));
++ stderr.addPump(new LineForwarder(name, System.err));
++ final Phaser phs = new Phaser(1);
++ Future<Void> stdoutTask = stdout.process();
++ Future<Void> stderrTask = stderr.process();
++
++ try {
++ if (timeout > -1) {
++ phs.awaitAdvanceInterruptibly(0, timeout, unit);
++ }
++ } catch (TimeoutException | InterruptedException e) {
++ System.err.println("Failed to start a process (thread dump follows)");
++ for(Map.Entry<Thread, StackTraceElement[]> s : Thread.getAllStackTraces().entrySet()) {
++ printStack(s.getKey(), s.getValue());
++ }
++ stdoutTask.cancel(true);
++ stderrTask.cancel(true);
++ throw e;
++ }
++
++ return p;
++ }
++
++ /**
+ * Pumps stdout and stderr from running the process into a String.
+ *
+- * @param processHandler
++ * @param processBuilder
+ * ProcessHandler to run.
+ * @return Output from process.
+ * @throws IOException
+@@ -69,22 +152,19 @@
+ stdoutBuffer);
+ StreamPumper errPumper = new StreamPumper(process.getErrorStream(),
+ stderrBuffer);
+- Thread outPumperThread = new Thread(outPumper);
+- Thread errPumperThread = new Thread(errPumper);
+
+- outPumperThread.setDaemon(true);
+- errPumperThread.setDaemon(true);
+-
+- outPumperThread.start();
+- errPumperThread.start();
++ Future<Void> outTask = outPumper.process();
++ Future<Void> errTask = errPumper.process();
+
+ try {
+ process.waitFor();
+- outPumperThread.join();
+- errPumperThread.join();
++ outTask.get();
++ errTask.get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return null;
++ } catch (ExecutionException e) {
++ throw new IOException(e);
+ }
+
+ return new OutputBuffer(stdoutBuffer.toString(),
+@@ -137,15 +217,106 @@
+ */
+ public static ProcessBuilder createJavaProcessBuilder(String... command)
+ throws Exception {
+- String javapath = JdkFinder.getJavaLauncher(false);
++ String javapath = JDKToolFinder.getJDKTool("java");
+
+ ArrayList<String> args = new ArrayList<>();
+ args.add(javapath);
+ Collections.addAll(args, getPlatformSpecificVMArgs());
+ Collections.addAll(args, command);
+
++ // Reporting
++ StringBuilder cmdLine = new StringBuilder();
++ for (String cmd : args)
++ cmdLine.append(cmd).append(' ');
++ System.out.println("Command line: [" + cmdLine.toString() + "]");
++
+ return new ProcessBuilder(args.toArray(new String[args.size()]));
+-
+ }
+
++ private static void printStack(Thread t, StackTraceElement[] stack) {
++ System.out.println("\t" + t +
++ " stack: (length = " + stack.length + ")");
++ if (t != null) {
++ for (StackTraceElement stack1 : stack) {
++ System.out.println("\t" + stack1);
++ }
++ System.out.println();
++ }
++ }
++
++ /**
++ * Executes a test jvm process, waits for it to finish and returns the process output.
++ * The default jvm options from jtreg, test.vm.opts and test.java.opts, are added.
++ * The java from the test.jdk is used to execute the command.
++ *
++ * The command line will be like:
++ * {test.jdk}/bin/java {test.vm.opts} {test.java.opts} cmds
++ *
++ * @param cmds User specifed arguments.
++ * @return The output from the process.
++ */
++ public static OutputAnalyzer executeTestJvm(String... cmds) throws Throwable {
++ ProcessBuilder pb = createJavaProcessBuilder(Utils.addTestJavaOpts(cmds));
++ return executeProcess(pb);
++ }
++
++ /**
++ * Executes a process, waits for it to finish and returns the process output.
++ * @param pb The ProcessBuilder to execute.
++ * @return The output from the process.
++ */
++ public static OutputAnalyzer executeProcess(ProcessBuilder pb) throws Throwable {
++ OutputAnalyzer output = null;
++ try {
++ output = new OutputAnalyzer(pb.start());
++ return output;
++ } catch (Throwable t) {
++ System.out.println("executeProcess() failed: " + t);
++ throw t;
++ } finally {
++ System.out.println(getProcessLog(pb, output));
++ }
++ }
++
++ /**
++ * Executes a process, waits for it to finish and returns the process output.
++ * @param cmds The command line to execute.
++ * @return The output from the process.
++ */
++ public static OutputAnalyzer executeProcess(String... cmds) throws Throwable {
++ return executeProcess(new ProcessBuilder(cmds));
++ }
++
++ /**
++ * Used to log command line, stdout, stderr and exit code from an executed process.
++ * @param pb The executed process.
++ * @param output The output from the process.
++ */
++ public static String getProcessLog(ProcessBuilder pb, OutputAnalyzer output) {
++ String stderr = output == null ? "null" : output.getStderr();
++ String stdout = output == null ? "null" : output.getStdout();
++ String exitValue = output == null ? "null": Integer.toString(output.getExitValue());
++ StringBuilder logMsg = new StringBuilder();
++ final String nl = System.getProperty("line.separator");
++ logMsg.append("--- ProcessLog ---" + nl);
++ logMsg.append("cmd: " + getCommandLine(pb) + nl);
++ logMsg.append("exitvalue: " + exitValue + nl);
++ logMsg.append("stderr: " + stderr + nl);
++ logMsg.append("stdout: " + stdout + nl);
++ return logMsg.toString();
++ }
++
++ /**
++ * @return The full command line for the ProcessBuilder.
++ */
++ public static String getCommandLine(ProcessBuilder pb) {
++ if (pb == null) {
++ return "null";
++ }
++ StringBuilder cmd = new StringBuilder();
++ for (String s : pb.command()) {
++ cmd.append(s).append(" ");
++ }
++ return cmd.toString().trim();
++ }
+ }
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java Wed Apr 16 12:37:49 2014 +0400
+@@ -23,16 +23,65 @@
+
+ package jdk.testlibrary;
+
++import java.io.BufferedInputStream;
++import java.io.ByteArrayOutputStream;
+ import java.io.OutputStream;
+ import java.io.InputStream;
+ import java.io.IOException;
++import java.util.HashSet;
++import java.util.Set;
++import java.util.concurrent.Future;
++import java.util.concurrent.FutureTask;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ public final class StreamPumper implements Runnable {
+
+ private static final int BUF_SIZE = 256;
+
+- private final OutputStream out;
++ /**
++ * Pump will be called by the StreamPumper to process the incoming data
++ */
++ abstract public static class Pump {
++ abstract void register(StreamPumper d);
++ }
++
++ /**
++ * OutputStream -> Pump adapter
++ */
++ final public static class StreamPump extends Pump {
++ private final OutputStream out;
++ public StreamPump(OutputStream out) {
++ this.out = out;
++ }
++
++ @Override
++ void register(StreamPumper sp) {
++ sp.addOutputStream(out);
++ }
++ }
++
++ /**
++ * Used to process the incoming data line-by-line
++ */
++ abstract public static class LinePump extends Pump {
++ @Override
++ final void register(StreamPumper sp) {
++ sp.addLineProcessor(this);
++ }
++
++ abstract protected void processLine(String line);
++ }
++
+ private final InputStream in;
++ private final Set<OutputStream> outStreams = new HashSet<>();
++ private final Set<LinePump> linePumps = new HashSet<>();
++
++ private final AtomicBoolean processing = new AtomicBoolean(false);
++ private final FutureTask<Void> processingTask = new FutureTask(this, null);
++
++ public StreamPumper(InputStream in) {
++ this.in = in;
++ }
+
+ /**
+ * Create a StreamPumper that reads from in and writes to out.
+@@ -43,8 +92,8 @@
+ * The stream to write to.
+ */
+ public StreamPumper(InputStream in, OutputStream out) {
+- this.in = in;
+- this.out = out;
++ this(in);
++ this.addOutputStream(out);
+ }
+
+ /**
+@@ -54,25 +103,97 @@
+ */
+ @Override
+ public void run() {
+- int length;
+- InputStream localIn = in;
+- OutputStream localOut = out;
+- byte[] buffer = new byte[BUF_SIZE];
++ try (BufferedInputStream is = new BufferedInputStream(in)) {
++ ByteArrayOutputStream lineBos = new ByteArrayOutputStream();
++ byte[] buf = new byte[BUF_SIZE];
++ int len = 0;
++ int linelen = 0;
+
+- try {
+- while ((length = localIn.read(buffer)) > 0 && !Thread.interrupted()) {
+- localOut.write(buffer, 0, length);
++ while ((len = is.read(buf)) > 0 && !Thread.interrupted()) {
++ for(OutputStream out : outStreams) {
++ out.write(buf, 0, len);
++ }
++ if (!linePumps.isEmpty()) {
++ int i = 0;
++ int lastcrlf = -1;
++ while (i < len) {
++ if (buf[i] == '\n' || buf[i] == '\r') {
++ int bufLinelen = i - lastcrlf - 1;
++ if (bufLinelen > 0) {
++ lineBos.write(buf, lastcrlf + 1, bufLinelen);
++ }
++ linelen += bufLinelen;
++
++ if (linelen > 0) {
++ lineBos.flush();
++ final String line = lineBos.toString();
++ for (LinePump lp : linePumps) {
++ lp.processLine(line);
++ };
++ lineBos.reset();
++ linelen = 0;
++ }
++ lastcrlf = i;
++ }
++
++ i++;
++ }
++ if (lastcrlf == -1) {
++ lineBos.write(buf, 0, len);
++ linelen += len;
++ } else if (lastcrlf < len - 1) {
++ lineBos.write(buf, lastcrlf + 1, len - lastcrlf - 1);
++ linelen += len - lastcrlf - 1;
++ }
++ }
+ }
++
+ } catch (IOException e) {
+- // Just abort if something like this happens.
+ e.printStackTrace();
+ } finally {
++ for(OutputStream out : outStreams) {
++ try {
++ out.flush();
++ } catch (IOException e) {}
++ }
+ try {
+- localOut.flush();
+ in.close();
+- } catch (IOException e) {
+- e.printStackTrace();
+- }
++ } catch (IOException e) {}
+ }
+ }
++
++ final void addOutputStream(OutputStream out) {
++ outStreams.add(out);
++ }
++
++ final void addLineProcessor(LinePump lp) {
++ linePumps.add(lp);
++ }
++
++ final public StreamPumper addPump(Pump ... pump) {
++ if (processing.get()) {
++ throw new IllegalStateException("Can not modify pumper while " +
++ "processing is in progress");
++ }
++ for(Pump p : pump) {
++ p.register(this);
++ }
++ return this;
++ }
++
++ final public Future<Void> process() {
++ if (!processing.compareAndSet(false, true)) {
++ throw new IllegalStateException("Can not re-run the processing");
++ }
++ Thread t = new Thread(new Runnable() {
++ @Override
++ public void run() {
++ processingTask.run();
++ }
++ });
++ t.setDaemon(true);
++ t.start();
++
++ return processingTask;
++ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/TestThread.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,249 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++import java.lang.management.ManagementFactory;
++import java.lang.management.ThreadInfo;
++import java.lang.management.ThreadMXBean;
++import java.util.concurrent.TimeoutException;
++
++/**
++ * Thread which catches exceptions thrown during the execution
++ * and stores them for later analysis.
++ *
++ * <pre>
++ * {@code
++ * TestThread thread = new TestThread(new XRun() {
++ * public void run() {
++ * // do something
++ * }
++ * });
++ * thread.start();
++ * // do something
++ * Throwable uncaught = thread.getUncaught();
++ * }
++ * </pre>
++ */
++public class TestThread extends Thread {
++
++ private final Runnable runnable;
++ private volatile Throwable uncaught;
++
++ /**
++ * Returns {@link Runnable} the thread has been created with.
++ *
++ * @return The object whose {@code run} method is called
++ */
++ public Runnable getRunnable() {
++ return runnable;
++ }
++
++ /**
++ * Creates a new {@code TestThread} object.
++ *
++ * @param target The object whose {@code run} method is called
++ * @param name The thread name
++ */
++ public TestThread(Runnable target, String name) {
++ super(target, name);
++ this.runnable = target;
++ }
++
++ /**
++ * Creates a new {@code TestThread} object.
++ *
++ * @param target The object whose {@code run} method is called
++ */
++ public TestThread(Runnable target) {
++ super(target);
++ this.runnable = target;
++ }
++
++ /**
++ * Creates a new {@code TestThread} object.
++ *
++ * @param group The thread group
++ * @param target The object whose {@code run} method is called
++ * @param name The thread name
++ * @param stackSize Stack size
++ */
++ public TestThread(ThreadGroup group, Runnable target, String name,
++ long stackSize) {
++ super(group, target, name, stackSize);
++ this.runnable = target;
++ }
++
++ /**
++ * Creates a new {@code TestThread} object.
++ *
++ * @param group The thread group
++ * @param target The object whose {@code run} method is called
++ * @param name The thread name
++ */
++ public TestThread(ThreadGroup group, Runnable target, String name) {
++ super(group, target, name);
++ this.runnable = target;
++ }
++
++ /**
++ * Creates a new {@code TestThread} object.
++ *
++ * @param group The thread group
++ * @param target The object whose {@code run} method is called
++ */
++ public TestThread(ThreadGroup group, Runnable target) {
++ super(group, target);
++ this.runnable = target;
++ }
++
++ /**
++ * The thread executor.
++ */
++ @Override
++ public void run() {
++ try {
++ super.run();
++ } catch (Throwable t) {
++ uncaught = t;
++ }
++ }
++
++ /**
++ * Returns exception caught during the execution.
++ *
++ * @return {@link Throwable}
++ */
++ public Throwable getUncaught() {
++ return uncaught;
++ }
++
++ /**
++ * Waits for {@link TestThread} to die
++ * and throws exception caught during the execution.
++ *
++ * @throws InterruptedException
++ * @throws Throwable
++ */
++ public void joinAndThrow() throws InterruptedException, Throwable {
++ join();
++ if (uncaught != null) {
++ throw uncaught;
++ }
++ }
++
++ /**
++ * Waits during {@code timeout} for {@link TestThread} to die
++ * and throws exception caught during the execution.
++ *
++ * @param timeout The time to wait in milliseconds
++ * @throws InterruptedException
++ * @throws Throwable
++ */
++ public void joinAndThrow(long timeout) throws InterruptedException,
++ Throwable {
++ join(timeout);
++ if (isAlive()) {
++ throw new TimeoutException();
++ }
++ if (uncaught != null) {
++ throw uncaught;
++ }
++ }
++
++ /**
++ * Waits for {@link TestThread} to die
++ * and returns exception caught during the execution.
++ *
++ * @return Exception caught during the execution
++ * @throws InterruptedException
++ */
++ public Throwable joinAndReturn() throws InterruptedException {
++ join();
++ if (uncaught != null) {
++ return uncaught;
++ }
++ return null;
++ }
++
++ /**
++ * Waits during {@code timeout} for {@link TestThread} to die
++ * and returns exception caught during the execution.
++ *
++ * @param timeout The time to wait in milliseconds
++ * @return Exception caught during the execution
++ * @throws InterruptedException
++ */
++ public Throwable joinAndReturn(long timeout) throws InterruptedException {
++ join(timeout);
++ if (isAlive()) {
++ return new TimeoutException();
++ }
++ if (uncaught != null) {
++ return uncaught;
++ }
++ return null;
++ }
++
++ /**
++ * Waits until {@link TestThread} is in the certain {@link State}
++ * and blocking on {@code object}.
++ *
++ * @param state The thread state
++ * @param object The object to block on
++ */
++ public void waitUntilBlockingOnObject(Thread.State state, Object object) {
++ String want = object == null ? null : object.getClass().getName() + '@'
++ + Integer.toHexString(System.identityHashCode(object));
++ ThreadMXBean tmx = ManagementFactory.getThreadMXBean();
++ while (isAlive()) {
++ ThreadInfo ti = tmx.getThreadInfo(getId());
++ if (ti.getThreadState() == state
++ && (want == null || want.equals(ti.getLockName()))) {
++ return;
++ }
++ try {
++ Thread.sleep(1);
++ } catch (InterruptedException e) {
++ }
++ }
++ }
++
++ /**
++ * Waits until {@link TestThread} is in native.
++ */
++ public void waitUntilInNative() {
++ ThreadMXBean tmx = ManagementFactory.getThreadMXBean();
++ while (isAlive()) {
++ ThreadInfo ti = tmx.getThreadInfo(getId());
++ if (ti.isInNative()) {
++ return;
++ }
++ try {
++ Thread.sleep(1);
++ } catch (InterruptedException e) {
++ }
++ }
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,232 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++import static jdk.testlibrary.Asserts.assertTrue;
++
++import java.io.IOException;
++import java.net.InetAddress;
++import java.net.ServerSocket;
++import java.net.UnknownHostException;
++import java.util.ArrayList;
++import java.util.List;
++import java.util.Arrays;
++import java.util.Collections;
++import java.util.regex.Pattern;
++import java.util.regex.Matcher;
++
++/**
++ * Common library for various test helper functions.
++ */
++public final class Utils {
++
++ /**
++ * Returns the sequence used by operating system to separate lines.
++ */
++ public static final String NEW_LINE = System.getProperty("line.separator");
++
++ /**
++ * Returns the value of 'test.vm.opts'system property.
++ */
++ public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "").trim();
++
++ /**
++ * Returns the value of 'test.java.opts'system property.
++ */
++ public static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "").trim();
++
++
++ private Utils() {
++ // Private constructor to prevent class instantiation
++ }
++
++ /**
++ * Returns the list of VM options.
++ *
++ * @return List of VM options
++ */
++ public static List<String> getVmOptions() {
++ return Arrays.asList(safeSplitString(VM_OPTIONS));
++ }
++
++ /**
++ * Returns the list of VM options with -J prefix.
++ *
++ * @return The list of VM options with -J prefix
++ */
++ public static List<String> getForwardVmOptions() {
++ String[] opts = safeSplitString(VM_OPTIONS);
++ for (int i = 0; i < opts.length; i++) {
++ opts[i] = "-J" + opts[i];
++ }
++ return Arrays.asList(opts);
++ }
++
++ /**
++ * Returns the default JTReg arguments for a jvm running a test.
++ * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
++ * @return An array of options, or an empty array if no opptions.
++ */
++ public static String[] getTestJavaOpts() {
++ List<String> opts = new ArrayList<String>();
++ Collections.addAll(opts, safeSplitString(VM_OPTIONS));
++ Collections.addAll(opts, safeSplitString(JAVA_OPTIONS));
++ return opts.toArray(new String[0]);
++ }
++
++ /**
++ * Combines given arguments with default JTReg arguments for a jvm running a test.
++ * This is the combination of JTReg arguments test.vm.opts and test.java.opts
++ * @return The combination of JTReg test java options and user args.
++ */
++ public static String[] addTestJavaOpts(String... userArgs) {
++ List<String> opts = new ArrayList<String>();
++ Collections.addAll(opts, getTestJavaOpts());
++ Collections.addAll(opts, userArgs);
++ return opts.toArray(new String[0]);
++ }
++
++ /**
++ * Splits a string by white space.
++ * Works like String.split(), but returns an empty array
++ * if the string is null or empty.
++ */
++ private static String[] safeSplitString(String s) {
++ if (s == null || s.trim().isEmpty()) {
++ return new String[] {};
++ }
++ return s.trim().split("\\s+");
++ }
++
++ /**
++ * @return The full command line for the ProcessBuilder.
++ */
++ public static String getCommandLine(ProcessBuilder pb) {
++ StringBuilder cmd = new StringBuilder();
++ for (String s : pb.command()) {
++ cmd.append(s).append(" ");
++ }
++ return cmd.toString();
++ }
++
++ /**
++ * Returns the free port on the local host.
++ * The function will spin until a valid port number is found.
++ *
++ * @return The port number
++ * @throws InterruptedException if any thread has interrupted the current thread
++ * @throws IOException if an I/O error occurs when opening the socket
++ */
++ public static int getFreePort() throws InterruptedException, IOException {
++ int port = -1;
++
++ while (port <= 0) {
++ Thread.sleep(100);
++
++ ServerSocket serverSocket = null;
++ try {
++ serverSocket = new ServerSocket(0);
++ port = serverSocket.getLocalPort();
++ } finally {
++ serverSocket.close();
++ }
++ }
++
++ return port;
++ }
++
++ /**
++ * Returns the name of the local host.
++ *
++ * @return The host name
++ * @throws UnknownHostException if IP address of a host could not be determined
++ */
++ public static String getHostname() throws UnknownHostException {
++ InetAddress inetAddress = InetAddress.getLocalHost();
++ String hostName = inetAddress.getHostName();
++
++ assertTrue((hostName != null && !hostName.isEmpty()),
++ "Cannot get hostname");
++
++ return hostName;
++ }
++
++ /**
++ * Uses "jcmd -l" to search for a jvm pid. This function will wait
++ * forever (until jtreg timeout) for the pid to be found.
++ * @param key Regular expression to search for
++ * @return The found pid.
++ */
++ public static int waitForJvmPid(String key) throws Throwable {
++ final long iterationSleepMillis = 250;
++ System.out.println("waitForJvmPid: Waiting for key '" + key + "'");
++ System.out.flush();
++ while (true) {
++ int pid = tryFindJvmPid(key);
++ if (pid >= 0) {
++ return pid;
++ }
++ Thread.sleep(iterationSleepMillis);
++ }
++ }
++
++ /**
++ * Searches for a jvm pid in the output from "jcmd -l".
++ *
++ * Example output from jcmd is:
++ * 12498 sun.tools.jcmd.JCmd -l
++ * 12254 /tmp/jdk8/tl/jdk/JTwork/classes/com/sun/tools/attach/Application.jar
++ *
++ * @param key A regular expression to search for.
++ * @return The found pid, or -1 if Enot found.
++ * @throws Exception If multiple matching jvms are found.
++ */
++ public static int tryFindJvmPid(String key) throws Throwable {
++ ProcessBuilder pb = null;
++ OutputAnalyzer output = null;
++ try {
++ JDKToolLauncher jcmdLauncher = JDKToolLauncher.create("jcmd");
++ jcmdLauncher.addToolArg("-l");
++ output = ProcessTools.executeProcess(jcmdLauncher.getCommand());
++ output.shouldHaveExitValue(0);
++
++ // Search for a line starting with numbers (pid), follwed by the key.
++ Pattern pattern = Pattern.compile("([0-9]+)\\s.*(" + key + ").*\\r?\\n");
++ Matcher matcher = pattern.matcher(output.getStdout());
++
++ int pid = -1;
++ if (matcher.find()) {
++ pid = Integer.parseInt(matcher.group(1));
++ System.out.println("findJvmPid.pid: " + pid);
++ if (matcher.find()) {
++ throw new Exception("Found multiple JVM pids for key: " + key);
++ }
++ }
++ return pid;
++ } catch (Throwable t) {
++ System.out.println(String.format("Utils.findJvmPid(%s) failed: %s", key, t));
++ throw t;
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/XRun.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,56 @@
++/*
++ * 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.
++ */
++
++package jdk.testlibrary;
++
++/**
++ * This type serves no other purpose than to simply allow automatically running
++ * something in a thread, and have all exceptions propagated to
++ * RuntimeExceptions, which are thrown up to thread, which in turn should
++ * probably be a {@link TestThread} to they are stored.
++ */
++public abstract class XRun implements Runnable {
++
++ /**
++ * Invokes {@code xrun()} and throws all exceptions caught in it
++ * up to the thread.
++ */
++ public final void run() {
++ try {
++ xrun();
++ } catch (Error e) {
++ throw e;
++ } catch (RuntimeException e) {
++ throw e;
++ } catch (Throwable e) {
++ throw new RuntimeException(e);
++ }
++ }
++
++ /**
++ * Override this method to implement what to run in the thread.
++ *
++ * @throws Throwable
++ */
++ protected abstract void xrun() throws Throwable;
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/awt/image/bug8038000.java Wed Apr 16 12:37:49 2014 +0400
+@@ -0,0 +1,153 @@
++/*
++ * 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 8038000
++ *
++ * @summary Verifies that we could create different type of Rasters with height 1
++ * and strideline which exceeds raster width.
++ * Also checks that a set of RasterOp work correctly with such kind of Rasters.
++ *
++ * @run main bug8038000
++ */
++
++import java.awt.*;
++import java.awt.color.ColorSpace;
++import java.awt.geom.AffineTransform;
++import java.awt.image.*;
++import java.util.Arrays;
++
++public class bug8038000 {
++
++ public static void main(String[] args) throws Exception {
++ new bug8038000().checkOps();
++
++ // No exceptions - Passed
++ }
++
++ private void checkOps() throws Exception {
++
++ RasterOp[] ops = new RasterOp[] {
++ new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_sRGB),
++ ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), null),
++ new AffineTransformOp(AffineTransform.getScaleInstance(1, 1.1), null)
++ };
++
++
++ for (RasterOp op: ops) {
++ // Banded rasters
++ checkOp(Raster.createBandedRaster(DataBuffer.TYPE_BYTE, 10, 1, 10,
++ new int[] {0, 1, 2}, new int[]{2,1,0}, null),
++ Raster.createBandedRaster(DataBuffer.TYPE_BYTE, 10, 1, 1001,
++ new int[] {0, 1, 2}, new int[]{2,1,0}, null), op);
++ checkOp(Raster.createBandedRaster(DataBuffer.TYPE_USHORT, 10, 1, 10,
++ new int[] {0, 1, 2}, new int[]{2,1,0}, null),
++ Raster.createBandedRaster(DataBuffer.TYPE_USHORT, 10, 1, 1001,
++ new int[] {0, 1, 2}, new int[]{2,1,0}, null), op);
++ checkOp(Raster.createBandedRaster(DataBuffer.TYPE_INT, 10, 1, 10,
++ new int[] {0, 1, 2}, new int[]{2,1,0}, null),
++ Raster.createBandedRaster(DataBuffer.TYPE_INT, 10, 1, 1001,
++ new int[] {0, 1, 2}, new int[]{2,1,0}, null), op);
++
++ // Interleaved rasters
++ checkOp(Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
++ 10, 1, 30, 3, new int[]{0, 1, 2}, null),
++ Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
++ 10, 1, 1001, 3, new int[]{0, 1, 2}, null),
++ op);
++
++ checkOp(Raster.createInterleavedRaster(DataBuffer.TYPE_USHORT,
++ 10, 1, 30, 3, new int[]{0, 1, 2}, null),
++ Raster.createInterleavedRaster(DataBuffer.TYPE_USHORT,
++ 10, 1, 1001, 3, new int[]{0, 1, 2}, null),
++ op);
++
++ // Packed rasters
++ checkOp(Raster.createPackedRaster(new DataBufferByte(10), 10, 1, 10,
++ new int[] {0x01, 0x02, 0x04}, null),
++ Raster.createPackedRaster(new DataBufferByte(10), 10, 1, 2000,
++ new int[] {0x01, 0x02, 0x04}, null),
++ op);
++ checkOp(Raster.createPackedRaster(new DataBufferInt(10), 10, 1, 10,
++ new int[] {0xff0000, 0x00ff00, 0x0000ff}, null),
++ Raster.createPackedRaster(new DataBufferInt(10), 10, 1, 20,
++ new int[] {0xff0000, 0x00ff00, 0x0000ff}, null),
++ op);
++
++ }
++ }
++
++ /**
++ * Takes two identical rasters (identical with the exception of scanline stride)
++ * fills their pixels with identical data, applies the RasterOp to both rasters
++ * and checks that the result is the same
++ */
++ private void checkOp(WritableRaster wr1, WritableRaster wr2, RasterOp op) {
++ System.out.println("Checking " + op + " with rasters: \n " + wr1 +
++ "\n " + wr2);
++ try {
++ WritableRaster r1 = op.filter(fillRaster(wr1), null);
++ WritableRaster r2 = op.filter(fillRaster(wr2), null);
++ compareRasters(r1, r2);
++ } catch (ImagingOpException e) {
++ System.out.println(" Skip: Op is not supported: " + e);
++ }
++ }
++
++ private WritableRaster fillRaster(WritableRaster wr) {
++ int c = 0;
++ for(int x = wr.getMinX(); x < wr.getMinX() + wr.getWidth(); x++) {
++ for(int y = wr.getMinY(); y < wr.getMinY() + wr.getHeight(); y++) {
++ for (int b = 0; b < wr.getNumBands(); b++) {
++ wr.setSample(x, y, b, c++);
++ }
++ }
++ }
++ return wr;
++ }
++
++ private void compareRasters(Raster r1, Raster r2) {
++ Rectangle bounds = r1.getBounds();
++ if (!bounds.equals(r2.getBounds())) {
++ throw new RuntimeException("Bounds differ.");
++ }
++
++ if (r1.getNumBands() != r2.getNumBands()) {
++ throw new RuntimeException("Bands differ.");
++ }
++
++ int[] b1 = new int[r1.getNumBands()];
++ int[] b2 = new int[r1.getNumBands()];
++
++ for (int x = (int) bounds.getX(); x < bounds.getMaxX(); x++) {
++ for (int y = (int) bounds.getY(); y < bounds.getMaxY(); y++) {
++ r1.getPixel(x,y, b1);
++ r2.getPixel(x,y, b2);
++ if (!Arrays.equals(b1, b2)) {
++ throw new RuntimeException("Pixels differ.");
++ }
++ }
++ }
++ }
++}
+--- ./jdk/test/sun/security/pkcs11/fips/CipherTest.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/sun/security/pkcs11/fips/CipherTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -458,8 +458,21 @@
+ return false;
+ }
+
++ // No ECDH-capable certificate in key store. May restructure
++ // this in the future.
++ if (cipherSuite.contains("ECDHE_ECDSA") ||
++ cipherSuite.contains("ECDH_ECDSA") ||
++ cipherSuite.contains("ECDH_RSA")) {
++ System.out.println("Skipping unsupported test for " +
++ cipherSuite + " of " + protocol);
++ return false;
++ }
++
+ // skip SSLv2Hello protocol
+- if (protocol.equals("SSLv2Hello")) {
++ //
++ // skip TLSv1.2 protocol, we have not implement "SunTls12Prf" and
++ // SunTls12RsaPremasterSecret in SunPKCS11 provider
++ if (protocol.equals("SSLv2Hello") || protocol.equals("TLSv1.2")) {
+ System.out.println("Skipping unsupported test for " +
+ cipherSuite + " of " + protocol);
+ return false;
+--- ./jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java Wed Apr 16 12:37:49 2014 +0400
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 6313675 6323647
++ * @bug 6313675 6323647 8028192
+ * @summary Verify that all ciphersuites work in FIPS mode
+ * @library ..
+ * @ignore JSSE supported cipher suites are changed with CR 6916074,
+@@ -44,9 +44,13 @@
+ return;
+ }
+
+- if ("sparc".equals(System.getProperty("os.arch")) == false) {
+- // we have not updated other platforms with the proper NSS libraries yet
+- System.out.println("Test currently works only on solaris-sparc, skipping");
++ String arch = System.getProperty("os.arch");
++ if (!("sparc".equals(arch) || "sparcv9".equals(arch))) {
++ // we have not updated other platforms with the proper NSS
++ // libraries yet
++ System.out.println(
++ "Test currently works only on solaris-sparc " +
++ "and solaris-sparcv9. Skipping on " + arch);
+ return;
+ }
+
+--- ./jdk/test/sun/security/pkcs11/tls/TestPremaster.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/sun/security/pkcs11/tls/TestPremaster.java Wed Apr 16 12:37:49 2014 +0400
+@@ -34,6 +34,7 @@
+
+ import javax.crypto.KeyGenerator;
+ import javax.crypto.SecretKey;
++import java.util.Formatter;
+
+ import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
+
+@@ -59,27 +60,51 @@
+ System.out.println("OK: " + e);
+ }
+
+- test(kg, 3, 0);
+- test(kg, 3, 1);
+- test(kg, 3, 2);
+- test(kg, 4, 0);
++ int[] protocolVersions = {0x0300, 0x0301, 0x0302, 0x0400};
++ for (int clientVersion : protocolVersions) {
++ for (int serverVersion : protocolVersions) {
++ test(kg, clientVersion, serverVersion);
++ if (serverVersion >= clientVersion) {
++ break;
++ }
++ }
++ }
+
+ System.out.println("Done.");
+ }
+
+- private static void test(KeyGenerator kg, int major, int minor)
+- throws Exception {
++ private static void test(KeyGenerator kg,
++ int clientVersion, int serverVersion) throws Exception {
+
+- kg.init(new TlsRsaPremasterSecretParameterSpec(major, minor));
++ System.out.printf(
++ "Testing RSA pre-master secret key generation between " +
++ "client (0x%04X) and server(0x%04X)%n",
++ clientVersion, serverVersion);
++ kg.init(new TlsRsaPremasterSecretParameterSpec(
++ clientVersion, serverVersion));
+ SecretKey key = kg.generateKey();
+ byte[] encoded = key.getEncoded();
+- if (encoded.length != 48) {
+- throw new Exception("length: " + encoded.length);
+- }
+- if ((encoded[0] != major) || (encoded[1] != minor)) {
+- throw new Exception("version mismatch: " + encoded[0] +
+- "." + encoded[1]);
+- }
+- System.out.println("OK: " + major + "." + minor);
++ if (encoded != null) { // raw key material may be not extractable
++ if (encoded.length != 48) {
++ throw new Exception("length: " + encoded.length);
++ }
++ int v = versionOf(encoded[0], encoded[1]);
++ if (clientVersion != v) {
++ if (serverVersion != v || clientVersion >= 0x0302) {
++ throw new Exception(String.format(
++ "version mismatch: (0x%04X) rather than (0x%04X) " +
++ "is used in pre-master secret", v, clientVersion));
++ }
++ System.out.printf("Use compatible version (0x%04X)%n", v);
++ }
++ System.out.println("Passed, version matches!");
++ } else {
++ System.out.println("Raw key material is not extractable");
++ }
+ }
++
++ private static int versionOf(int major, int minor) {
++ return ((major & 0xFF) << 8) | (minor & 0xFF);
++ }
++
+ }
+--- ./jdk/test/sun/text/resources/LocaleData Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/sun/text/resources/LocaleData Wed Apr 16 12:37:49 2014 +0400
+@@ -11,7 +11,7 @@
+ # bug #4052679
+ LocaleNames/fr/fr=fran\u00e7ais
+
+-# bug #4055602, 4290801
++# bug #4055602, 4290801, 8013836
+ CurrencyNames/pt_BR/BRL=R$
+ FormatData/pt_BR/NumberPatterns/0=#,##0.###;-#,##0.###
+ # FormatData/pt_BR/NumberPatterns/1=R$ #,##0.##;-R$ #,##0.## # Changed; see bug 4122840
+@@ -37,7 +37,7 @@
+ FormatData/pt_BR/DayNames/0=Domingo
+ FormatData/pt_BR/DayNames/1=Segunda-feira
+ FormatData/pt_BR/DayNames/2=Ter\u00e7a-feira
+-CalendarData/pt_BR/firstDayOfWeek=2
++CalendarData/pt_BR/firstDayOfWeek=1
+ CalendarData/pt_BR/minimalDaysInFirstWeek=1
+ FormatData/pt_BR/MonthNames/0=Janeiro
+ FormatData/pt_BR/MonthNames/1=Fevereiro
+--- ./jdk/test/sun/text/resources/LocaleDataTest.java Wed May 07 19:26:47 2014 -0700
++++ ./jdk/test/sun/text/resources/LocaleDataTest.java Wed Apr 16 12:37:49 2014 +0400
+@@ -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
+@@ -34,7 +34,7 @@
+ * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
+ * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
+ * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7189611
+- * 7171028
++ * 7171028 8013836
+ * @summary Verify locale data
+ *
+ */
+--- ./langtools/.hgtags Wed May 07 19:27:09 2014 -0700
++++ ./langtools/.hgtags Wed Jun 25 09:05:13 2014 -0700
+@@ -408,6 +408,7 @@
+ 2a9f5c00ba46f895bc9d16a584bf7d80c1822268 jdk7u55-b02
+ 0479d260ac835eb3f0c7f3d7d15be0599b92a20a jdk7u55-b03
+ a244cc40ae0b29028ff8503ee516cb5f9e3db6e3 jdk7u55-b04
++25d63d986653d81522b01bbd2664083ae5fdc243 jdk7u65-b00
+ 25d63d986653d81522b01bbd2664083ae5fdc243 jdk7u55-b05
+ 76eeeaace70d38795eef5215f758493421cee0ac jdk7u55-b06
+ 08f7914d6aa947e73269b4e60110ed12573ffa28 jdk7u55-b07
+@@ -420,6 +421,11 @@
+ 96d55b4d88fea1d9f8227e70003210a6c10a1dba jdk7u55-b30
+ c1964a222000b4884b992fdbaf8f62a45fb893c9 jdk7u55-b14
+ 4f6115ba266e5489b5e1968a28304f82be1f5641 jdk7u55-b31
++ec8793f5aa4fb0aff4aa2f02f458fa6720f3ec6f jdk7u55-b32
++13fed9e9f022e4a7f914c8410cbaa6f6564d4efd jdk7u55-b33
++d9e4f2bb3d75d15dac2c37c6ef9f64ee49ea1728 jdk7u55-b34
++c5cfebcc373607c78d577fad2146821fafc46868 jdk7u55-b35
++284494d407006c826bc434a79cab37b17e1849e3 jdk7u55-b36
+ 849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
+ b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01
+ 954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02
+@@ -437,6 +443,28 @@
+ a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14
+ 7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15
+ 057caf9e0774e7c530c5710127f70c8d5f46deab jdk7u60-b16
++b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17
+ b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b18
+-b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17
++7effcbb8d1fd7ced194a294e29eea28bf552ac34 jdk7u65-b01
+ 40aa95c8477aa0a3f090859570f5536afc9026b7 jdk7u60-b19
++b578e801c5f0e41be96d58e213b32f5c0c9278e8 jdk7u60-b30
++c1c8f9d50b3e0d7d8af08be4270649a7572b68d4 jdk7u60-b31
++ab67af57536bf46e54b5b28462d34274aaa67025 jdk7u60-b32
++e7a68fd132f7a2f39ed72d804b4574a4cc3defb2 jdk7u60-b33
++75b8c65f4c148baa4084022035b22de47df9426b jdk7u65-b02
++16bb02dae837566f3c350c6313b09f6110dcba68 jdk7u65-b03
++91677116552f743f3589f3d2ba255fa1079c0c48 jdk7u65-b04
++8f585b94be8c83f89fc481cf010a129ef75cd31b jdk7u65-b05
++c3a8556785e89b7868fc4ece666120dbf8c5c7a7 jdk7u65-b06
++1978b6434c4f717ba1bd715f016ab99dff879857 jdk7u65-b07
++684f0285b699d304d1efff487b550ff2e1679e98 jdk7u65-b08
++2715f752385349274b43a1efaab5733bafc40557 jdk7u65-b09
++98cac38ef1302939a37b85c0208a7969ba4cd8ad jdk7u65-b10
++4c40603840a8ffbf5e30049b52ff336a9aca04c1 jdk7u65-b11
++36b01ef633b2e70836b5914aa6924e81ff4d41ec jdk7u65-b12
++5ba8a1ef0f82d341ede3ec2fdac7e012e42594c4 jdk7u65-b13
++52769f410515f6a7fa66a93b24a1327fa6b6174a jdk7u65-b14
++7f2891e4c6fcd9c0e31f50189a50c8de189d774f jdk7u65-b15
++dea7e67840b68ae6752b37e69e242dae2765b878 jdk7u65-b16
++15a051dfadb6a7d014f0d2739ccf0a63ade56313 jdk7u65-b17
++576e2fd21368ba67f1f19d3180f78bc440b795a1 jdk7u65-b30
diff --git a/java/openjdk7/files/patch-7u71-b14 b/java/openjdk7/files/patch-7u71-b14
new file mode 100644
index 000000000000..669d64046671
--- /dev/null
+++ b/java/openjdk7/files/patch-7u71-b14
@@ -0,0 +1,7855 @@
+--- ./.hgtags Wed Jun 25 09:01:10 2014 -0700
++++ ./.hgtags Mon Sep 08 12:14:23 2014 -0700
+@@ -418,6 +418,7 @@
+ d972a2d9e4f3f864d26c33ccfdacd8269e0f29a8 jdk7u55-b13
+ 0820b4707cfa75f8211b88b0daa67bba8475f498 jdk7u55-b30
+ 997ab3897d6ede80b0decdda94b569e57dd7dd90 jdk7u55-b14
++744f7b17de89527bf639d5bff3533a9ce72dfa84 jdk7u55-b15
+ 1f52edec29fd44c8bacce11ba7440287b37d04d1 jdk7u55-b31
+ 5b15555172019b3c92484abff7c92f066e162d29 jdk7u55-b32
+ fa5ead8cb7d2de49cd138d93fb86fa5a10b07037 jdk7u55-b33
+@@ -466,3 +467,36 @@
+ 2c8b05ed9802cf4e5f61439a6d6286e7f7cd444e jdk7u65-b16
+ 927d8d3db13c5221237b51efe45206054ee6e3f3 jdk7u65-b17
+ b51ccd32894662064192857007ef41175d433901 jdk7u65-b30
++fa242615607fa5f6cdd1ae93bc2fb9cc2100c179 jdk7u65-b18
++64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b19
++90f56be6f9d90f66e558c4e08084e2b169738fba jdk7u65-b32
++b6da128e8a7957f139933a48580e201e938c4684 jdk7u65-b20
++d6a1d32534d188e73f7962d40d21584c44e65acd jdk7u67-b01
++64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b40
++9dfdf107c6971cd30c7e1f656cddc6b8d495c290 jdk7u65-b31
++fe700de0735dc4e8ce5a50971ad3ea3dc052d21d jdk7u65-b33
++48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u66-b00
++4fb9423d086d86d212257afd6fc79957f737af5b jdk7u66-b01
++964663d4303723fbcb16cf05e857576c08c237ae jdk7u66-b09
++6bf8128234ad7ffae0cfe53ba19202559743de97 jdk7u66-b10
++0d8c4e40851835989386c1b1db4041b6f18b037e jdk7u66-b11
++422f828e10beb3ca9e14b10774e624ec0c4fc84d jdk7u66-b12
++236545aa997a99b397e73dc9b13353231f20ea1e jdk7u66-b13
++d06bbfe19d6cefe62e359c2fd8bf9243a148a337 jdk7u66-b14
++df30693e9a66897ba0dced205bbaefc57dca7704 jdk7u66-b15
++6dc5eb9b70071b43cb0e287f30afd0348ae20ae1 jdk7u66-b16
++4f4905b6d3e837c50654bc432956a4a100246d4e jdk7u66-b17
++c779fbb7b87ec014a3371b0dd1e9317ba1280469 jdk7u71-b00
++4f0a225f8d383d22a890575b1206f916277c0a07 jdk7u71-b01
++94e1109f4cb79ba1c5369d93d0cdf300f1434a3a jdk7u71-b02
++91df9e49ab7d35ee61f88eedd4289aa33163287d jdk7u71-b03
++47c30fe92b9dad64f99d7aa72a2258bc3558f0a1 jdk7u71-b04
++d534e7f2caadd145b30dfda8b913c9a5fdb62553 jdk7u71-b05
++8821211202a58c0086e7cd57960a3f33e5c3d4a1 jdk7u71-b06
++6955561791886ef36236799794e4be79d0a65007 jdk7u71-b07
++fac69efbf4eb609e860c8c4a056dbe02b3679b87 jdk7u71-b08
++ac4596f9cdeb084af75884825e04dbcf1fd3d407 jdk7u71-b09
++38f4eee9c9387d3f683b86657fd6e3d4a90e5b0f jdk7u71-b10
++e9663e434024cb6e011013e774445a056417bb3b jdk7u71-b11
++78aa78b55b843697a630ed886962ab07d1b76358 jdk7u71-b12
++9fc5aeb0e0a8c97b1cd263a55f3aeb030cbcdf89 jdk7u71-b13
+--- ./corba/.hgtags Wed Jun 25 09:01:20 2014 -0700
++++ ./corba/.hgtags Mon Sep 08 12:14:31 2014 -0700
+@@ -420,6 +420,7 @@
+ 8efa6e66c13a5329c312d1a521ffab75d9a330e3 jdk7u55-b13
+ e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30
+ a0bfd0e80ae0ae6e3a29bf527b5911c83163b3f5 jdk7u55-b14
++ae8120f628c237b18fa5c2610898659b49a60075 jdk7u55-b15
+ 55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31
+ fba15e177b15873e3c63b0efc7c0f5647a243a79 jdk7u55-b32
+ 6503115cbedda9216083fc1798e2fa5a2775f68a jdk7u55-b33
+@@ -468,3 +469,36 @@
+ d765ed30bd5ed2bdd71fda56c056333e1b4b0d7d jdk7u65-b16
+ cd642d59aca29ff2b56e7ed016be758828f199cd jdk7u65-b17
+ 8740dc71b1ceb49c76470b46205c28c1302e864d jdk7u65-b30
++b7f66b9f9e8e099428ed7640a184f6135b77e40d jdk7u65-b18
++50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b19
++dae3f20d2306622e39606d0dc967147de174afce jdk7u65-b32
++ac05dfedf008e83c2044666a70635cf82e932e41 jdk7u65-b20
++244756837ab4b214decd0e6f26b0071a483f143f jdk7u67-b01
++50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b40
++d2f7358b01d3d8b877b2ec2ca2989bd1daf17472 jdk7u65-b31
++2067d7202adcedb80fa676dacb22a0b73d5e8548 jdk7u65-b33
++5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u66-b00
++9f0f0bdd4cfb01a5d64f9528b7ffda3974171120 jdk7u66-b01
++596d979a5d4deb9d10b068479276cd4b2a12432e jdk7u66-b09
++fec514d46b860920690707e9d0538ad76ca3f886 jdk7u66-b10
++09655f16930ece8e7a8342f335726fe9ea327812 jdk7u66-b11
++dca36b02c6e10fa303023a62f51ea4bf0497ae94 jdk7u66-b12
++d0d039a1eca081bc05e833dfc027df1aa1bd018a jdk7u66-b13
++1e46e65dd58db00180f1ccaaae93ae7946b22d29 jdk7u66-b14
++f2c867d52b393e661216057f0b559ef3fd122530 jdk7u66-b15
++3039f266eef2ba54ec2869d87adac6e395c82fe9 jdk7u66-b16
++0b46b93a61966e8d2332f1d3899d7c858a653d91 jdk7u66-b17
++fd1c9030a08d513b5a477f82a46855bb6a9cacac jdk7u71-b00
++50e4090a8583a88875ab7323fc2e5b6ba2f1de7f jdk7u71-b01
++5bd7482913f6a498c2b2b6c80478b2af93dee805 jdk7u71-b02
++557d335eb4a358ffe7a8114685f11831da5d4510 jdk7u71-b03
++ccf59458d69f7fd0d6b119ee1ef16a2b131f84b8 jdk7u71-b04
++92d099fedc269d61dd10bba0f79a224c1bf40c25 jdk7u71-b05
++19de752151f6abfb477c72a92e59993a6c3c3f99 jdk7u71-b06
++36d628e53ebf7f6251395e6eb409239b473a7f16 jdk7u71-b07
++2fdf855f6d9fe27bcf102e64c120375f331ee75d jdk7u71-b08
++1655475001d914bc105959d94c24e0671591e845 jdk7u71-b09
++9508dd229246b82201fb7075ebfe2c913f89a196 jdk7u71-b10
++3e804dc3cea9ff145f375a50a161f3e173e8d3f6 jdk7u71-b11
++cc3072067ae8ac685d400ced4c0f144d6a1d9f1e jdk7u71-b12
++1616089899e25679d6cf70c77023f2a37ff85ad1 jdk7u71-b13
+--- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties Wed Jun 25 09:01:20 2014 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties Mon Sep 08 12:14:31 2014 -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
+@@ -95,7 +95,7 @@
+ bootstrap.exception=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4FDD\u5B58\u4E2D\u306B\u4F8B\u5916\u3092\u6355\u6349\u3057\u307E\u3057\u305F: \u4F8B\u5916{1}
+
+ tnameserv.exception=\u30DD\u30FC\u30C8{0}\u3067\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30B5\u30FC\u30D3\u30B9\u3092\u8D77\u52D5\u4E2D\u306B\u4F8B\u5916\u3092\u6355\u6349\u3057\u307E\u3057\u305F
+-tnameserv.usage=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570-ORBInitialPort<portno>\u3092\u4F7F\u7528\u3057\u3066\u5225\u306E\u30DD\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
++tnameserv.usage=\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570-ORBInitialPort<portno>\u3092\u4F7F\u7528\u3057\u3066\u5225\u306E\u30DD\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+ tnameserv.invalidhostoption=ORBInitialHost\u306FNameService\u306B\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+ tnameserv.orbinitialport0=ORBInitialPort 0\u306FNameService\u306B\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+ tnameserv.hs1=\u521D\u671F\u30CD\u30FC\u30DF\u30F3\u30B0\u30FB\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8:\n{0}
+--- ./hotspot/.hgtags Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/.hgtags Mon Sep 08 12:15:04 2014 -0700
+@@ -629,6 +629,7 @@
+ b021fd817a0177b31d1e3d65127a27458e85801e jdk7u55-b13
+ d27b468d5f3be3329ff1ff342f3347e6b2e0303b jdk7u55-b30
+ dff9147a781672f20bb0577a94233264ea4a95d1 jdk7u55-b14
++4e73c6403b44f86d579b1ba03ea636c52c4b559b jdk7u55-b15
+ 8175599864880938d68d0a515fa561043d7d5fd0 jdk7u55-b31
+ ba9270b8fb1f4852ff1d9dab15571eb9e0714495 jdk7u55-b32
+ 0901a8cf66a0494b55bf104c9666d4e3c6ff93f0 jdk7u55-b33
+@@ -686,3 +687,36 @@
+ f1b2970a2564c3360db420431cfbba215da6ae43 jdk7u65-b16
+ 4c6df9a369cb9d54fe2d898452883a22b8ec6640 jdk7u65-b17
+ aca05127f95b5704ee3a34104a8f86e36326f0c0 jdk7u65-b30
++d006213be74730453cf5c3ce31f1d1d505334419 jdk7u65-b18
++1d8226b3e9896656451801393eb3ae394faeb638 jdk7u65-b19
++c43b0b843f897a4d8cf0a3566b017b87230dd3b4 jdk7u65-b32
++d3c9265e12fa115052f18d1e3d379143b56bbf63 jdk7u65-b20
++39776d90970221dd260187acb4c37631e41a66a9 jdk7u67-b01
++1d8226b3e9896656451801393eb3ae394faeb638 jdk7u65-b40
++cf8b3a090e597e59177c5f67d44cdec12309777f jdk7u65-b31
++df855c3f4d31dd7db081d68e3054518380127893 jdk7u65-b33
++6b37a189944aaa09e81d97d394496464d16bee42 jdk7u66-b00
++121dc94194d9234e2b13c867d875e23e1bdd6abd jdk7u66-b01
++f28ea516eb0b9e99f1e342954ab4642456af4da1 jdk7u66-b09
++3dc6ae1972a45ba563518cc0e51f09885258f69d jdk7u66-b10
++8d2b3f7d5b3001d019832476d684679ca6be0c8d jdk7u66-b11
++5ee19b64ef208daaef91f063d800aa162427f8f6 jdk7u66-b12
++a1e6f9c4c1f47be1b0edef6bd92399f8f07b7d15 jdk7u66-b13
++b44baba406f2de6eeccc57dbfae653cf124b527b jdk7u66-b14
++d20b495c96d3f8899a64657aba0fc72799773cb3 jdk7u66-b15
++3bbfed065c601187449d319fd70bba6ae1ebb707 jdk7u66-b16
++4abb71ff14b2e6cf932e5c61900f480d5e1afedb jdk7u66-b17
++4ceb9c03fe8ee6b93d22854780ef8c737edd14b2 jdk7u71-b00
++f95d6d32e08006209f1798f82b60d7d05767a3e8 jdk7u71-b01
++1c760efe2d0795f4ce8260ec655b8870bfd77ca1 jdk7u71-b02
++0cb0b5abd0b5aa25fc8bd5920c8d61c5b85a10c6 jdk7u71-b03
++a491e5e52998c23502ebb1340955e3e726d44ad6 jdk7u71-b04
++c93efe6377ffd7484c50cba9a88a37bebf525114 jdk7u71-b05
++f95fa655cc119659686ba68c7242497fd209f9e1 jdk7u71-b06
++7f32b65fde34db41bf951ed81374240840ef88f4 jdk7u71-b07
++4e17bd4fb2304d068023d9d805e86d6b592d4230 jdk7u71-b08
++1ffc702334d960aa4015e5cc6f4fb9e971952b54 jdk7u71-b09
++9a17c184bcb99f13dc6ab714ad98976410429637 jdk7u71-b10
++d6cb97651f0bd8d61f4d22aa7550145bbe6fb051 jdk7u71-b11
++959b4e5d2e3111920c198187f3bc66eba3e457f1 jdk7u71-b12
++608f470d22689bab17bab0ea1dbee3e1a0802d5b jdk7u71-b13
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Sep 08 12:15:04 2014 -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
+@@ -82,6 +82,7 @@
+ _JVM_EnableCompiler
+ _JVM_Exit
+ _JVM_FillInStackTrace
++ _JVM_FindClassFromCaller
+ _JVM_FindClassFromClass
+ _JVM_FindClassFromClassLoader
+ _JVM_FindClassFromBootLoader
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Sep 08 12:15:04 2014 -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
+@@ -82,6 +82,7 @@
+ _JVM_EnableCompiler
+ _JVM_Exit
+ _JVM_FillInStackTrace
++ _JVM_FindClassFromCaller
+ _JVM_FindClassFromClass
+ _JVM_FindClassFromClassLoader
+ _JVM_FindClassFromBootLoader
+--- ./hotspot/make/hotspot_version Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/make/hotspot_version Mon Sep 08 12:15:04 2014 -0700
+@@ -34,8 +34,8 @@
+ HOTSPOT_VM_COPYRIGHT=Copyright 2014
+
+ HS_MAJOR_VER=24
+-HS_MINOR_VER=65
+-HS_BUILD_NUMBER=04
++HS_MINOR_VER=71
++HS_BUILD_NUMBER=01
+
+ JDK_MAJOR_VER=1
+ JDK_MINOR_VER=7
+--- ./hotspot/make/linux/makefiles/mapfile-vers-debug Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/make/linux/makefiles/mapfile-vers-debug Mon Sep 08 12:15:04 2014 -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
+@@ -84,6 +84,7 @@
+ JVM_EnableCompiler;
+ JVM_Exit;
+ JVM_FillInStackTrace;
++ JVM_FindClassFromCaller;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindClassFromBootLoader;
+--- ./hotspot/make/linux/makefiles/mapfile-vers-product Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/make/linux/makefiles/mapfile-vers-product Mon Sep 08 12:15:04 2014 -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
+@@ -84,6 +84,7 @@
+ JVM_EnableCompiler;
+ JVM_Exit;
+ JVM_FillInStackTrace;
++ JVM_FindClassFromCaller;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindClassFromBootLoader;
+--- ./hotspot/make/solaris/makefiles/mapfile-vers Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/make/solaris/makefiles/mapfile-vers Mon Sep 08 12:15:04 2014 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2000, 2011, 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
+@@ -84,6 +84,7 @@
+ JVM_EnableCompiler;
+ JVM_Exit;
+ JVM_FillInStackTrace;
++ JVM_FindClassFromCaller;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindClassFromBootLoader;
+--- ./hotspot/make/windows/makefiles/trace.make Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/make/windows/makefiles/trace.make Mon Sep 08 12:15:04 2014 -0700
+@@ -40,8 +40,7 @@
+ traceEventIds.hpp \
+ traceTypes.hpp
+
+-
+-!if "$(OPENJDK)" != "true"
++!if EXISTS($(TraceAltSrcDir))
+ TraceGeneratedNames = $(TraceGeneratedNames) \
+ traceRequestables.hpp \
+ traceEventControl.hpp \
+@@ -56,7 +55,7 @@
+ $(TraceOutDir)/traceEventIds.hpp \
+ $(TraceOutDir)/traceTypes.hpp
+
+-!if "$(OPENJDK)" != "true"
++!if EXISTS($(TraceAltSrcDir))
+ TraceGeneratedFiles = $(TraceGeneratedFiles) \
+ $(TraceOutDir)/traceRequestables.hpp \
+ $(TraceOutDir)/traceEventControl.hpp \
+@@ -68,7 +67,7 @@
+ XML_DEPS = $(TraceSrcDir)/trace.xml $(TraceSrcDir)/tracetypes.xml \
+ $(TraceSrcDir)/trace.dtd $(TraceSrcDir)/xinclude.mod
+
+-!if "$(OPENJDK)" != "true"
++!if EXISTS($(TraceAltSrcDir))
+ XML_DEPS = $(XML_DEPS) $(TraceAltSrcDir)/traceevents.xml
+ !endif
+
+@@ -87,7 +86,7 @@
+ @echo Generating $@
+ @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceTypes.xsl -OUT $(TraceOutDir)/traceTypes.hpp
+
+-!if "$(OPENJDK)" == "true"
++!if !EXISTS($(TraceAltSrcDir))
+
+ $(TraceOutDir)/traceEventClasses.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceEventClasses.xsl $(XML_DEPS)
+ @echo Generating $@
+--- ./hotspot/src/share/vm/adlc/formssel.cpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/adlc/formssel.cpp Mon Sep 08 12:15:04 2014 -0700
+@@ -536,12 +536,6 @@
+ if( data_type != Form::none )
+ rematerialize = true;
+
+- // Ugly: until a better fix is implemented, disable rematerialization for
+- // negD nodes because they are proved to be problematic.
+- if (is_ideal_negD()) {
+- return false;
+- }
+-
+ // Constants
+ if( _components.count() == 1 && _components[0]->is(Component::USE_DEF) )
+ rematerialize = true;
+--- ./hotspot/src/share/vm/classfile/classFileParser.cpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/classfile/classFileParser.cpp Mon Sep 08 12:15:04 2014 -0700
+@@ -2721,6 +2721,11 @@
+ "bootstrap_method_index %u has bad constant type in class file %s",
+ bootstrap_method_index,
+ CHECK);
++
++ guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(),
++ "Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s",
++ CHECK);
++
+ operands->short_at_put(operand_fill_index++, bootstrap_method_index);
+ operands->short_at_put(operand_fill_index++, argument_count);
+
+@@ -2738,7 +2743,6 @@
+ }
+
+ assert(operand_fill_index == operands()->length(), "exact fill");
+- assert(constantPoolOopDesc::operand_array_length(operands()) == attribute_array_length, "correct decode");
+
+ u1* current_end = cfs->current();
+ guarantee_property(current_end == current_start + attribute_byte_length,
+--- ./hotspot/src/share/vm/classfile/verifier.cpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/classfile/verifier.cpp Mon Sep 08 12:15:04 2014 -0700
+@@ -2224,6 +2224,181 @@
+ }
+ }
+
++// Look at the method's handlers. If the bci is in the handler's try block
++// then check if the handler_pc is already on the stack. If not, push it.
++void ClassVerifier::push_handlers(ExceptionTable* exhandlers,
++ GrowableArray<u4>* handler_stack,
++ u4 bci) {
++ int exlength = exhandlers->length();
++ for(int x = 0; x < exlength; x++) {
++ if (bci >= exhandlers->start_pc(x) && bci < exhandlers->end_pc(x)) {
++ handler_stack->append_if_missing(exhandlers->handler_pc(x));
++ }
++ }
++}
++
++// Return TRUE if all code paths starting with start_bc_offset end in
++// bytecode athrow or loop.
++bool ClassVerifier::ends_in_athrow(u4 start_bc_offset) {
++ ResourceMark rm;
++ // Create bytecode stream.
++ RawBytecodeStream bcs(method());
++ u4 code_length = method()->code_size();
++ bcs.set_start(start_bc_offset);
++ u4 target;
++ // Create stack for storing bytecode start offsets for if* and *switch.
++ GrowableArray<u4>* bci_stack = new GrowableArray<u4>(30);
++ // Create stack for handlers for try blocks containing this handler.
++ GrowableArray<u4>* handler_stack = new GrowableArray<u4>(30);
++ // Create list of visited branch opcodes (goto* and if*).
++ GrowableArray<u4>* visited_branches = new GrowableArray<u4>(30);
++ ExceptionTable exhandlers(_method());
++
++ while (true) {
++ if (bcs.is_last_bytecode()) {
++ // if no more starting offsets to parse or if at the end of the
++ // method then return false.
++ if ((bci_stack->is_empty()) || ((u4)bcs.end_bci() == code_length))
++ return false;
++ // Pop a bytecode starting offset and scan from there.
++ bcs.set_start(bci_stack->pop());
++ }
++ Bytecodes::Code opcode = bcs.raw_next();
++ u4 bci = bcs.bci();
++
++ // If the bytecode is in a TRY block, push its handlers so they
++ // will get parsed.
++ push_handlers(&exhandlers, handler_stack, bci);
++
++ switch (opcode) {
++ case Bytecodes::_if_icmpeq:
++ case Bytecodes::_if_icmpne:
++ case Bytecodes::_if_icmplt:
++ case Bytecodes::_if_icmpge:
++ case Bytecodes::_if_icmpgt:
++ case Bytecodes::_if_icmple:
++ case Bytecodes::_ifeq:
++ case Bytecodes::_ifne:
++ case Bytecodes::_iflt:
++ case Bytecodes::_ifge:
++ case Bytecodes::_ifgt:
++ case Bytecodes::_ifle:
++ case Bytecodes::_if_acmpeq:
++ case Bytecodes::_if_acmpne:
++ case Bytecodes::_ifnull:
++ case Bytecodes::_ifnonnull:
++ target = bcs.dest();
++ if (visited_branches->contains(bci)) {
++ if (bci_stack->is_empty()) return true;
++ // Pop a bytecode starting offset and scan from there.
++ bcs.set_start(bci_stack->pop());
++ } else {
++ if (target > bci) { // forward branch
++ if (target >= code_length) return false;
++ // Push the branch target onto the stack.
++ bci_stack->push(target);
++ // then, scan bytecodes starting with next.
++ bcs.set_start(bcs.next_bci());
++ } else { // backward branch
++ // Push bytecode offset following backward branch onto the stack.
++ bci_stack->push(bcs.next_bci());
++ // Check bytecodes starting with branch target.
++ bcs.set_start(target);
++ }
++ // Record target so we don't branch here again.
++ visited_branches->append(bci);
++ }
++ break;
++
++ case Bytecodes::_goto:
++ case Bytecodes::_goto_w:
++ target = (opcode == Bytecodes::_goto ? bcs.dest() : bcs.dest_w());
++ if (visited_branches->contains(bci)) {
++ if (bci_stack->is_empty()) return true;
++ // Been here before, pop new starting offset from stack.
++ bcs.set_start(bci_stack->pop());
++ } else {
++ if (target >= code_length) return false;
++ // Continue scanning from the target onward.
++ bcs.set_start(target);
++ // Record target so we don't branch here again.
++ visited_branches->append(bci);
++ }
++ break;
++
++ // Check that all switch alternatives end in 'athrow' bytecodes. Since it
++ // is difficult to determine where each switch alternative ends, parse
++ // each switch alternative until either hit a 'return', 'athrow', or reach
++ // the end of the method's bytecodes. This is gross but should be okay
++ // because:
++ // 1. tableswitch and lookupswitch byte codes in handlers for ctor explicit
++ // constructor invocations should be rare.
++ // 2. if each switch alternative ends in an athrow then the parsing should be
++ // short. If there is no athrow then it is bogus code, anyway.
++ case Bytecodes::_lookupswitch:
++ case Bytecodes::_tableswitch:
++ {
++ address aligned_bcp = (address) round_to((intptr_t)(bcs.bcp() + 1), jintSize);
++ u4 default_offset = Bytes::get_Java_u4(aligned_bcp) + bci;
++ int keys, delta;
++ if (opcode == Bytecodes::_tableswitch) {
++ jint low = (jint)Bytes::get_Java_u4(aligned_bcp + jintSize);
++ jint high = (jint)Bytes::get_Java_u4(aligned_bcp + 2*jintSize);
++ // This is invalid, but let the regular bytecode verifier
++ // report this because the user will get a better error message.
++ if (low > high) return true;
++ keys = high - low + 1;
++ delta = 1;
++ } else {
++ keys = (int)Bytes::get_Java_u4(aligned_bcp + jintSize);
++ delta = 2;
++ }
++ // Invalid, let the regular bytecode verifier deal with it.
++ if (keys < 0) return true;
++
++ // Push the offset of the next bytecode onto the stack.
++ bci_stack->push(bcs.next_bci());
++
++ // Push the switch alternatives onto the stack.
++ for (int i = 0; i < keys; i++) {
++ u4 target = bci + (jint)Bytes::get_Java_u4(aligned_bcp+(3+i*delta)*jintSize);
++ if (target > code_length) return false;
++ bci_stack->push(target);
++ }
++
++ // Start bytecode parsing for the switch at the default alternative.
++ if (default_offset > code_length) return false;
++ bcs.set_start(default_offset);
++ break;
++ }
++
++ case Bytecodes::_return:
++ return false;
++
++ case Bytecodes::_athrow:
++ {
++ if (bci_stack->is_empty()) {
++ if (handler_stack->is_empty()) {
++ return true;
++ } else {
++ // Parse the catch handlers for try blocks containing athrow.
++ bcs.set_start(handler_stack->pop());
++ }
++ } else {
++ // Pop a bytecode offset and starting scanning from there.
++ bcs.set_start(bci_stack->pop());
++ }
++ }
++ break;
++
++ default:
++ ;
++ } // end switch
++ } // end while loop
++
++ return false;
++}
++
+ void ClassVerifier::verify_invoke_init(
+ RawBytecodeStream* bcs, u2 ref_class_index, VerificationType ref_class_type,
+ StackMapFrame* current_frame, u4 code_length, bool *this_uninit,
+@@ -2250,18 +2425,26 @@
+ return;
+ }
+
+- // Make sure that this call is not done from within a TRY block because
+- // that can result in returning an incomplete object. Simply checking
+- // (bci >= start_pc) also ensures that this call is not done after a TRY
+- // block. That is also illegal because this call must be the first Java
+- // statement in the constructor.
++ // Check if this call is done from inside of a TRY block. If so, make
++ // sure that all catch clause paths end in a throw. Otherwise, this
++ // can result in returning an incomplete object.
+ ExceptionTable exhandlers(_method());
+ int exlength = exhandlers.length();
+ for(int i = 0; i < exlength; i++) {
+- if (bci >= exhandlers.start_pc(i)) {
+- verify_error(ErrorContext::bad_code(bci),
+- "Bad <init> method call from after the start of a try block");
+- return;
++ u2 start_pc = exhandlers.start_pc(i);
++ u2 end_pc = exhandlers.end_pc(i);
++
++ if (bci >= start_pc && bci < end_pc) {
++ if (!ends_in_athrow(exhandlers.handler_pc(i))) {
++ verify_error(ErrorContext::bad_code(bci),
++ "Bad <init> method call from after the start of a try block");
++ return;
++ } else if (VerboseVerification) {
++ ResourceMark rm;
++ tty->print_cr(
++ "Survived call to ends_in_athrow(): %s",
++ current_class()->name()->as_C_string());
++ }
+ }
+ }
+
+--- ./hotspot/src/share/vm/classfile/verifier.hpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/classfile/verifier.hpp Mon Sep 08 12:15:04 2014 -0700
+@@ -30,6 +30,7 @@
+ #include "oops/klass.hpp"
+ #include "oops/methodOop.hpp"
+ #include "runtime/handles.hpp"
++#include "utilities/growableArray.hpp"
+ #include "utilities/exceptions.hpp"
+
+ // The verifier class
+@@ -304,6 +305,16 @@
+ StackMapFrame* current_frame, u4 code_length, bool* this_uninit,
+ constantPoolHandle cp, TRAPS);
+
++ // Used by ends_in_athrow() to push all handlers that contain bci onto
++ // the handler_stack, if the handler is not already on the stack.
++ void push_handlers(ExceptionTable* exhandlers,
++ GrowableArray<u4>* handler_stack,
++ u4 bci);
++
++ // Returns true if all paths starting with start_bc_offset end in athrow
++ // bytecode or loop.
++ bool ends_in_athrow(u4 start_bc_offset);
++
+ void verify_invoke_instructions(
+ RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame,
+ bool* this_uninit, VerificationType return_type,
+--- ./hotspot/src/share/vm/interpreter/linkResolver.cpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/interpreter/linkResolver.cpp Mon Sep 08 12:15:04 2014 -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
+@@ -187,6 +187,14 @@
+
+ void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
+ methodOop result_oop = klass->uncached_lookup_method(name, signature);
++
++ //JDK 7 does not support default methods, but this code ported from JDK8 to keep code consistent for all JDK.
++ if (klass->oop_is_array()) {
++ // Only consider klass and super klass for arrays
++ result = methodHandle(THREAD, result_oop);
++ return;
++ }
++
+ if (EnableInvokeDynamic && result_oop != NULL) {
+ vmIntrinsics::ID iid = result_oop->intrinsic_id();
+ if (MethodHandles::is_signature_polymorphic(iid)) {
+@@ -421,7 +429,7 @@
+ // 2. lookup method in resolved klass and its super klasses
+ lookup_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, CHECK);
+
+- if (resolved_method.is_null()) { // not found in the class hierarchy
++ if (resolved_method.is_null() && !resolved_klass->oop_is_array()) { // not found in the class hierarchy
+ // 3. lookup method in all the interfaces implemented by the resolved klass
+ lookup_method_in_interfaces(resolved_method, resolved_klass, method_name, method_signature, CHECK);
+
+@@ -434,16 +442,16 @@
+ CLEAR_PENDING_EXCEPTION;
+ }
+ }
++ }
+
+- if (resolved_method.is_null()) {
+- // 4. method lookup failed
+- ResourceMark rm(THREAD);
+- THROW_MSG_CAUSE(vmSymbols::java_lang_NoSuchMethodError(),
+- methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
+- method_name,
+- method_signature),
+- nested_exception);
+- }
++ if (resolved_method.is_null()) {
++ // 4. method lookup failed
++ ResourceMark rm(THREAD);
++ THROW_MSG_CAUSE(vmSymbols::java_lang_NoSuchMethodError(),
++ methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
++ method_name,
++ method_signature),
++ nested_exception);
+ }
+
+ // 5. check if method is concrete
+@@ -514,17 +522,18 @@
+ // lookup method in this interface or its super, java.lang.Object
+ lookup_instance_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, CHECK);
+
+- if (resolved_method.is_null()) {
++ if (resolved_method.is_null() && !resolved_klass->oop_is_array()) {
+ // lookup method in all the super-interfaces
+ lookup_method_in_interfaces(resolved_method, resolved_klass, method_name, method_signature, CHECK);
+- if (resolved_method.is_null()) {
+- // no method found
+- ResourceMark rm(THREAD);
+- THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(),
+- methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
+- method_name,
+- method_signature));
+- }
++ }
++
++ if (resolved_method.is_null()) {
++ // no method found
++ ResourceMark rm(THREAD);
++ THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(),
++ methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
++ method_name,
++ method_signature));
+ }
+
+ if (check_access) {
+@@ -614,7 +623,7 @@
+
+ // Resolve instance field
+ fieldDescriptor fd; // find_field initializes fd if found
+- KlassHandle sel_klass(THREAD, instanceKlass::cast(resolved_klass())->find_field(field, sig, &fd));
++ KlassHandle sel_klass(THREAD, resolved_klass->find_field(field, sig, &fd));
+ // check if field exists; i.e., if a klass containing the field def has been selected
+ if (sel_klass.is_null()){
+ ResourceMark rm(THREAD);
+--- ./hotspot/src/share/vm/oops/arrayKlass.cpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/oops/arrayKlass.cpp Mon Sep 08 12:15:04 2014 -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
+@@ -64,6 +64,13 @@
+ return NULL;
+ }
+
++// find field according to JVM spec 5.4.3.2, returns the klass in which the field is defined
++klassOop arrayKlass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const {
++ // There are no fields in an array klass but look to the super class (Object)
++ assert(super(), "super klass must be present");
++ return Klass::cast(super())->find_field(name, sig, fd);
++}
++
+ methodOop arrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const {
+ // There are no methods in an array klass but the super class (Object) has some
+ assert(super(), "super klass must be present");
+--- ./hotspot/src/share/vm/oops/arrayKlass.hpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/oops/arrayKlass.hpp Mon Sep 08 12:15:04 2014 -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
+@@ -30,6 +30,8 @@
+ #include "oops/klassOop.hpp"
+ #include "oops/klassVtable.hpp"
+
++class fieldDescriptor;
++
+ // arrayKlass is the abstract baseclass for all array classes
+
+ class arrayKlass: public Klass {
+@@ -83,6 +85,9 @@
+ virtual oop multi_allocate(int rank, jint* sizes, TRAPS);
+ objArrayOop allocate_arrayArray(int n, int length, TRAPS);
+
++ // find field according to JVM spec 5.4.3.2, returns the klass in which the field is defined
++ klassOop find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const;
++
+ // Lookup operations
+ methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const;
+
+--- ./hotspot/src/share/vm/oops/klass.cpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/oops/klass.cpp Mon Sep 08 12:15:04 2014 -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
+@@ -119,6 +119,15 @@
+ return is_subclass_of(k);
+ }
+
++klassOop Klass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const {
++#ifdef ASSERT
++ tty->print_cr("Error: find_field called on a klass oop."
++ " Likely error: reflection method does not correctly"
++ " wrap return value in a mirror object.");
++#endif
++ ShouldNotReachHere();
++ return NULL;
++}
+
+ methodOop Klass::uncached_lookup_method(Symbol* name, Symbol* signature) const {
+ #ifdef ASSERT
+--- ./hotspot/src/share/vm/oops/klass.hpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/oops/klass.hpp Mon Sep 08 12:15:04 2014 -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
+@@ -88,6 +88,7 @@
+ class klassVtable;
+ class KlassHandle;
+ class OrderAccess;
++class fieldDescriptor;
+
+ // Holder (or cage) for the C++ vtable of each kind of Klass.
+ // We want to tightly constrain the location of the C++ vtable in the overall layout.
+@@ -514,6 +515,7 @@
+ virtual void initialize(TRAPS);
+ // lookup operation for MethodLookupCache
+ friend class MethodLookupCache;
++ virtual klassOop find_field(Symbol* name, Symbol* signature, fieldDescriptor* fd) const;
+ virtual methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const;
+ public:
+ methodOop lookup_method(Symbol* name, Symbol* signature) const {
+--- ./hotspot/src/share/vm/opto/reg_split.cpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/opto/reg_split.cpp Mon Sep 08 12:15:04 2014 -0700
+@@ -51,15 +51,6 @@
+
+ static const char out_of_nodes[] = "out of nodes during split";
+
+-static bool contains_no_live_range_input(const Node* def) {
+- for (uint i = 1; i < def->req(); ++i) {
+- if (def->in(i) != NULL && def->in_RegMask(i).is_NotEmpty()) {
+- return false;
+- }
+- }
+- return true;
+-}
+-
+ //------------------------------get_spillcopy_wide-----------------------------
+ // Get a SpillCopy node with wide-enough masks. Use the 'wide-mask', the
+ // wide ideal-register spill-mask if possible. If the 'wide-mask' does
+@@ -326,10 +317,13 @@
+ if( def->req() > 1 ) {
+ for( uint i = 1; i < def->req(); i++ ) {
+ Node *in = def->in(i);
+- // Check for single-def (LRG cannot redefined)
+ uint lidx = n2lidx(in);
+- if( lidx >= _maxlrg ) continue; // Value is a recent spill-copy
+- if (lrgs(lidx).is_singledef()) continue;
++ // We do not need this for live ranges that are only defined once.
++ // However, this is not true for spill copies that are added in this
++ // Split() pass, since they might get coalesced later on in this pass.
++ if (lidx < _maxlrg && lrgs(lidx).is_singledef()) {
++ continue;
++ }
+
+ Block *b_def = _cfg._bbs[def->_idx];
+ int idx_def = b_def->find_node(def);
+@@ -1303,7 +1297,7 @@
+ Node *def = Reaches[pidx][slidx];
+ assert( def, "must have reaching def" );
+ // If input up/down sense and reg-pressure DISagree
+- if (def->rematerialize() && contains_no_live_range_input(def)) {
++ if (def->rematerialize()) {
+ // Place the rematerialized node above any MSCs created during
+ // phi node splitting. end_idx points at the insertion point
+ // so look at the node before it.
+--- ./hotspot/src/share/vm/prims/jvm.cpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/prims/jvm.cpp Mon Sep 08 12:15:04 2014 -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
+@@ -746,6 +746,7 @@
+ return (jclass) JNIHandles::make_local(env, Klass::cast(k)->java_mirror());
+ JVM_END
+
++// Not used; JVM_FindClassFromCaller replaces this.
+ JVM_ENTRY(jclass, JVM_FindClassFromClassLoader(JNIEnv* env, const char* name,
+ jboolean init, jobject loader,
+ jboolean throwError))
+@@ -772,6 +773,42 @@
+ return result;
+ JVM_END
+
++// Find a class with this name in this loader, using the caller's protection domain.
++JVM_ENTRY(jclass, JVM_FindClassFromCaller(JNIEnv* env, const char* name,
++ jboolean init, jobject loader,
++ jclass caller))
++ JVMWrapper2("JVM_FindClassFromCaller %s throws ClassNotFoundException", name);
++ // Java libraries should ensure that name is never null...
++ if (name == NULL || (int)strlen(name) > Symbol::max_length()) {
++ // It's impossible to create this class; the name cannot fit
++ // into the constant pool.
++ THROW_MSG_0(vmSymbols::java_lang_ClassNotFoundException(), name);
++ }
++
++ TempNewSymbol h_name = SymbolTable::new_symbol(name, CHECK_NULL);
++
++ oop loader_oop = JNIHandles::resolve(loader);
++ oop from_class = JNIHandles::resolve(caller);
++ oop protection_domain = NULL;
++ // If loader is null, shouldn't call ClassLoader.checkPackageAccess; otherwise get
++ // NPE. Put it in another way, the bootstrap class loader has all permission and
++ // thus no checkPackageAccess equivalence in the VM class loader.
++ // The caller is also passed as NULL by the java code if there is no security
++ // manager to avoid the performance cost of getting the calling class.
++ if (from_class != NULL && loader_oop != NULL) {
++ protection_domain = instanceKlass::cast(java_lang_Class::as_klassOop(from_class))->protection_domain();
++ }
++
++ Handle h_loader(THREAD, loader_oop);
++ Handle h_prot(THREAD, protection_domain);
++ jclass result = find_class_from_class_loader(env, h_name, init, h_loader,
++ h_prot, false, THREAD);
++
++ if (TraceClassResolution && result != NULL) {
++ trace_class_resolution(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(result)));
++ }
++ return result;
++JVM_END
+
+ JVM_ENTRY(jclass, JVM_FindClassFromClass(JNIEnv *env, const char *name,
+ jboolean init, jclass from))
+@@ -4098,10 +4135,15 @@
+
+ // Shared JNI/JVM entry points //////////////////////////////////////////////////////////////
+
+-jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS) {
++jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init,
++ Handle loader, Handle protection_domain,
++ jboolean throwError, TRAPS) {
+ // Security Note:
+ // The Java level wrapper will perform the necessary security check allowing
+- // us to pass the NULL as the initiating class loader.
++ // us to pass the NULL as the initiating class loader. The VM is responsible for
++ // the checkPackageAccess relative to the initiating class loader via the
++ // protection_domain. The protection_domain is passed as NULL by the java code
++ // if there is no security manager in 3-arg Class.forName().
+ klassOop klass = SystemDictionary::resolve_or_fail(name, loader, protection_domain, throwError != 0, CHECK_NULL);
+
+ KlassHandle klass_handle(THREAD, klass);
+--- ./hotspot/src/share/vm/prims/jvm.h Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/prims/jvm.h Mon Sep 08 12:15:04 2014 -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
+@@ -415,6 +415,19 @@
+ JVM_FindClassFromBootLoader(JNIEnv *env, const char *name);
+
+ /*
++ * Find a class from a given class loader. Throws ClassNotFoundException.
++ * name: name of class
++ * init: whether initialization is done
++ * loader: class loader to look up the class. This may not be the same as the caller's
++ * class loader.
++ * caller: initiating class. The initiating class may be null when a security
++ * manager is not installed.
++ */
++JNIEXPORT jclass JNICALL
++JVM_FindClassFromCaller(JNIEnv *env, const char *name, jboolean init,
++ jobject loader, jclass caller);
++
++/*
+ * Find a class from a given class.
+ */
+ JNIEXPORT jclass JNICALL
+--- ./hotspot/src/share/vm/runtime/arguments.cpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/runtime/arguments.cpp Mon Sep 08 12:15:04 2014 -0700
+@@ -2057,6 +2057,10 @@
+ PrintNMTStatistics = false;
+ }
+
++#ifdef COMPILER1
++ status &= verify_interval(SafepointPollOffset, 0, os::vm_page_size() - BytesPerWord, "SafepointPollOffset");
++#endif
++
+ return status;
+ }
+
+--- ./hotspot/src/share/vm/runtime/globals.hpp Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/src/share/vm/runtime/globals.hpp Mon Sep 08 12:15:04 2014 -0700
+@@ -1094,9 +1094,11 @@
+ "Prevent spurious or premature wakeups from object.wait " \
+ "(Solaris only)") \
+ \
+- product(intx, NativeMonitorTimeout, -1, "(Unstable)" ) \
+- product(intx, NativeMonitorFlags, 0, "(Unstable)" ) \
+- product(intx, NativeMonitorSpinLimit, 20, "(Unstable)" ) \
++ experimental(intx, NativeMonitorTimeout, -1, "(Unstable)") \
++ \
++ experimental(intx, NativeMonitorFlags, 0, "(Unstable)") \
++ \
++ experimental(intx, NativeMonitorSpinLimit, 20, "(Unstable)") \
+ \
+ develop(bool, UsePthreads, false, \
+ "Use pthread-based instead of libthread-based synchronization " \
+--- ./hotspot/test/compiler/7141637/SpreadNullArg.java Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/test/compiler/7141637/SpreadNullArg.java Mon Sep 08 12:15:04 2014 -0700
+@@ -46,13 +46,17 @@
+ mh_spread_target =
+ MethodHandles.lookup().findStatic(SpreadNullArg.class, "target_spread_arg", mt_ref_arg);
+ result = (int) mh_spreadInvoker.invokeExact(mh_spread_target, (Object[]) null);
+- } catch(NullPointerException e) {
+- // Expected exception - do nothing!
+- } catch(Throwable e) {
++ throw new Error("Expected IllegalArgumentException was not thrown");
++ } catch (IllegalArgumentException e) {
++ System.out.println("Expected exception : " + e);
++ } catch (Throwable e) {
+ throw new Error(e);
+ }
+
+- if (result != 42) throw new Error("Expected NullPointerException was not thrown");
++ if (result != 42) {
++ throw new Error("result [" + result
++ + "] != 42 : Expected IllegalArgumentException was not thrown?");
++ }
+ }
+
+ public static int target_spread_arg(Integer i1) {
+--- ./hotspot/test/testlibrary/ClassFileInstaller.java Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/test/testlibrary/ClassFileInstaller.java Mon Sep 08 12:15:04 2014 -0700
+@@ -45,7 +45,9 @@
+
+ // Create the class file's package directory
+ Path p = Paths.get(pathName);
+- Files.createDirectories(p.getParent());
++ if (pathName.contains("/")) {
++ Files.createDirectories(p.getParent());
++ }
+ // Create the class file
+ Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
+ }
+--- ./hotspot/test/testlibrary/OutputAnalyzerTest.java Wed Jun 25 09:01:56 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,193 +0,0 @@
+-/*
+- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation.
+- *
+- * 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 Test the OutputAnalyzer utility class
+- * @library /testlibrary
+- */
+-
+-import com.oracle.java.testlibrary.OutputAnalyzer;
+-
+-public class OutputAnalyzerTest {
+-
+- public static void main(String args[]) throws Exception {
+-
+- String stdout = "aaaaaa";
+- String stderr = "bbbbbb";
+-
+- // Regexps used for testing pattern matching of the test input
+- String stdoutPattern = "[a]";
+- String stderrPattern = "[b]";
+- String nonExistingPattern = "[c]";
+-
+- OutputAnalyzer output = new OutputAnalyzer(stdout, stderr);
+-
+- if (!stdout.equals(output.getStdout())) {
+- throw new Exception("getStdout() returned '" + output.getStdout() + "', expected '" + stdout + "'");
+- }
+-
+- if (!stderr.equals(output.getStderr())) {
+- throw new Exception("getStderr() returned '" + output.getStderr() + "', expected '" + stderr + "'");
+- }
+-
+- try {
+- output.shouldContain(stdout);
+- output.stdoutShouldContain(stdout);
+- output.shouldContain(stderr);
+- output.stderrShouldContain(stderr);
+- } catch (RuntimeException e) {
+- throw new Exception("shouldContain() failed", e);
+- }
+-
+- try {
+- output.shouldContain("cccc");
+- throw new Exception("shouldContain() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- try {
+- output.stdoutShouldContain(stderr);
+- throw new Exception("stdoutShouldContain() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- try {
+- output.stderrShouldContain(stdout);
+- throw new Exception("stdoutShouldContain() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- try {
+- output.shouldNotContain("cccc");
+- output.stdoutShouldNotContain("cccc");
+- output.stderrShouldNotContain("cccc");
+- } catch (RuntimeException e) {
+- throw new Exception("shouldNotContain() failed", e);
+- }
+-
+- try {
+- output.shouldNotContain(stdout);
+- throw new Exception("shouldContain() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- try {
+- output.stdoutShouldNotContain(stdout);
+- throw new Exception("shouldContain() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- try {
+- output.stderrShouldNotContain(stderr);
+- throw new Exception("shouldContain() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- // Should match
+- try {
+- output.shouldMatch(stdoutPattern);
+- output.stdoutShouldMatch(stdoutPattern);
+- output.shouldMatch(stderrPattern);
+- output.stderrShouldMatch(stderrPattern);
+- } catch (RuntimeException e) {
+- throw new Exception("shouldMatch() failed", e);
+- }
+-
+- try {
+- output.shouldMatch(nonExistingPattern);
+- throw new Exception("shouldMatch() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- try {
+- output.stdoutShouldMatch(stderrPattern);
+- throw new Exception(
+- "stdoutShouldMatch() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- try {
+- output.stderrShouldMatch(stdoutPattern);
+- throw new Exception(
+- "stderrShouldMatch() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- // Should not match
+- try {
+- output.shouldNotMatch(nonExistingPattern);
+- output.stdoutShouldNotMatch(nonExistingPattern);
+- output.stderrShouldNotMatch(nonExistingPattern);
+- } catch (RuntimeException e) {
+- throw new Exception("shouldNotMatch() failed", e);
+- }
+-
+- try {
+- output.shouldNotMatch(stdoutPattern);
+- throw new Exception("shouldNotMatch() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- try {
+- output.stdoutShouldNotMatch(stdoutPattern);
+- throw new Exception("shouldNotMatch() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- try {
+- output.stderrShouldNotMatch(stderrPattern);
+- throw new Exception("shouldNotMatch() failed to throw exception");
+- } catch (RuntimeException e) {
+- // expected
+- }
+-
+- {
+- String aaaa = "aaaa";
+- String result = output.firstMatch(aaaa);
+- if (!aaaa.equals(result)) {
+- throw new Exception("firstMatch(String) faild to match. Expected: " + aaaa + " got: " + result);
+- }
+- }
+-
+- {
+- String aa = "aa";
+- String aa_grouped_aa = aa + "(" + aa + ")";
+- String result = output.firstMatch(aa_grouped_aa, 1);
+- if (!aa.equals(result)) {
+- throw new Exception("firstMatch(String, int) failed to match. Expected: " + aa + " got: " + result);
+- }
+- }
+- }
+-}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Asserts.java Mon Sep 08 12:15:04 2014 -0700
+@@ -0,0 +1,395 @@
++/*
++ * 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.
++ */
++
++package com.oracle.java.testlibrary;
++
++/**
++ * Asserts that can be used for verifying assumptions in tests.
++ *
++ * An assertion will throw a {@link RuntimeException} if the assertion isn't
++ * valid. All the asserts can be imported into a test by using a static
++ * import:
++ *
++ * <pre>
++ * {@code
++ * import static com.oracle.java.testlibrary.Asserts.*;
++ * }
++ *
++ * Always provide a message describing the assumption if the line number of the
++ * failing assertion isn't enough to understand why the assumption failed. For
++ * example, if the assertion is in a loop or in a method that is called
++ * multiple times, then the line number won't provide enough context to
++ * understand the failure.
++ * </pre>
++ */
++public class Asserts {
++
++ /**
++ * Shorthand for {@link #assertLessThan(T, T)}.
++ *
++ * @see #assertLessThan(T, T)
++ */
++ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs) {
++ assertLessThan(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertLessThan(T, T, String)}.
++ *
++ * @see #assertLessThan(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs, String msg) {
++ assertLessThan(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertLessThan(T, T, String)} with a default message.
++ *
++ * @see #assertLessThan(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertLessThan(T lhs, T rhs) {
++ String msg = "Expected that " + format(lhs) + " < " + format(rhs);
++ assertLessThan(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is less than {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static <T extends Comparable<T>>void assertLessThan(T lhs, T rhs, String msg) {
++ assertTrue(compare(lhs, rhs, msg) < 0, msg);
++ }
++
++ /**
++ * Shorthand for {@link #assertLessThanOrEqual(T, T)}.
++ *
++ * @see #assertLessThanOrEqual(T, T)
++ */
++ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs) {
++ assertLessThanOrEqual(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertLessThanOrEqual(T, T, String)}.
++ *
++ * @see #assertLessThanOrEqual(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs, String msg) {
++ assertLessThanOrEqual(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertLessThanOrEqual(T, T, String)} with a default message.
++ *
++ * @see #assertLessThanOrEqual(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs) {
++ String msg = "Expected that " + format(lhs) + " <= " + format(rhs);
++ assertLessThanOrEqual(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is less than or equal to {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs, String msg) {
++ assertTrue(compare(lhs, rhs, msg) <= 0, msg);
++ }
++
++ /**
++ * Shorthand for {@link #assertEquals(T, T)}.
++ *
++ * @see #assertEquals(T, T)
++ */
++ public static void assertEQ(Object lhs, Object rhs) {
++ assertEquals(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertEquals(T, T, String)}.
++ *
++ * @see #assertEquals(T, T, String)
++ */
++ public static void assertEQ(Object lhs, Object rhs, String msg) {
++ assertEquals(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertEquals(T, T, String)} with a default message.
++ *
++ * @see #assertEquals(T, T, String)
++ */
++ public static void assertEquals(Object lhs, Object rhs) {
++ String msg = "Expected " + format(lhs) + " to equal " + format(rhs);
++ assertEquals(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is equal to {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertEquals(Object lhs, Object rhs, String msg) {
++ if (lhs == null) {
++ if (rhs != null) {
++ error(msg);
++ }
++ } else {
++ assertTrue(lhs.equals(rhs), msg);
++ }
++ }
++
++ /**
++ * Shorthand for {@link #assertGreaterThanOrEqual(T, T)}.
++ *
++ * @see #assertGreaterThanOrEqual(T, T)
++ */
++ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs) {
++ assertGreaterThanOrEqual(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertGreaterThanOrEqual(T, T, String)}.
++ *
++ * @see #assertGreaterThanOrEqual(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs, String msg) {
++ assertGreaterThanOrEqual(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertGreaterThanOrEqual(T, T, String)} with a default message.
++ *
++ * @see #assertGreaterThanOrEqual(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs) {
++ String msg = "Expected that " + format(lhs) + " >= " + format(rhs);
++ assertGreaterThanOrEqual(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is greater than or equal to {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs, String msg) {
++ assertTrue(compare(lhs, rhs, msg) >= 0, msg);
++ }
++
++ /**
++ * Shorthand for {@link #assertGreaterThan(T, T)}.
++ *
++ * @see #assertGreaterThan(T, T)
++ */
++ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs) {
++ assertGreaterThan(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertGreaterThan(T, T, String)}.
++ *
++ * @see #assertGreaterThan(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs, String msg) {
++ assertGreaterThan(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertGreaterThan(T, T, String)} with a default message.
++ *
++ * @see #assertGreaterThan(T, T, String)
++ */
++ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs) {
++ String msg = "Expected that " + format(lhs) + " > " + format(rhs);
++ assertGreaterThan(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is greater than {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, String msg) {
++ assertTrue(compare(lhs, rhs, msg) > 0, msg);
++ }
++
++ /**
++ * Shorthand for {@link #assertNotEquals(T, T)}.
++ *
++ * @see #assertNotEquals(T, T)
++ */
++ public static void assertNE(Object lhs, Object rhs) {
++ assertNotEquals(lhs, rhs);
++ }
++
++ /**
++ * Shorthand for {@link #assertNotEquals(T, T, String)}.
++ *
++ * @see #assertNotEquals(T, T, String)
++ */
++ public static void assertNE(Object lhs, Object rhs, String msg) {
++ assertNotEquals(lhs, rhs, msg);
++ }
++
++ /**
++ * Calls {@link #assertNotEquals(T, T, String)} with a default message.
++ *
++ * @see #assertNotEquals(T, T, String)
++ */
++ public static void assertNotEquals(Object lhs, Object rhs) {
++ String msg = "Expected " + format(lhs) + " to not equal " + format(rhs);
++ assertNotEquals(lhs, rhs, msg);
++ }
++
++ /**
++ * Asserts that {@code lhs} is not equal to {@code rhs}.
++ *
++ * @param lhs The left hand side of the comparison.
++ * @param rhs The right hand side of the comparison.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertNotEquals(Object lhs, Object rhs, String msg) {
++ if (lhs == null) {
++ if (rhs == null) {
++ error(msg);
++ }
++ } else {
++ assertFalse(lhs.equals(rhs), msg);
++ }
++ }
++
++ /**
++ * Calls {@link #assertNull(Object, String)} with a default message.
++ *
++ * @see #assertNull(Object, String)
++ */
++ public static void assertNull(Object o) {
++ assertNull(o, "Expected " + format(o) + " to be null");
++ }
++
++ /**
++ * Asserts that {@code o} is null.
++ *
++ * @param o The reference assumed to be null.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertNull(Object o, String msg) {
++ assertEquals(o, null, msg);
++ }
++
++ /**
++ * Calls {@link #assertNotNull(Object, String)} with a default message.
++ *
++ * @see #assertNotNull(Object, String)
++ */
++ public static void assertNotNull(Object o) {
++ assertNotNull(o, "Expected non null reference");
++ }
++
++ /**
++ * Asserts that {@code o} is <i>not</i> null.
++ *
++ * @param o The reference assumed <i>not</i> to be null,
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertNotNull(Object o, String msg) {
++ assertNotEquals(o, null, msg);
++ }
++
++ /**
++ * Calls {@link #assertFalse(boolean, String)} with a default message.
++ *
++ * @see #assertFalse(boolean, String)
++ */
++ public static void assertFalse(boolean value) {
++ assertFalse(value, "Expected value to be false");
++ }
++
++ /**
++ * Asserts that {@code value} is {@code false}.
++ *
++ * @param value The value assumed to be false.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertFalse(boolean value, String msg) {
++ assertTrue(!value, msg);
++ }
++
++ /**
++ * Calls {@link #assertTrue(boolean, String)} with a default message.
++ *
++ * @see #assertTrue(boolean, String)
++ */
++ public static void assertTrue(boolean value) {
++ assertTrue(value, "Expected value to be true");
++ }
++
++ /**
++ * Asserts that {@code value} is {@code true}.
++ *
++ * @param value The value assumed to be true.
++ * @param msg A description of the assumption.
++ * @throws RuntimeException if the assertion isn't valid.
++ */
++ public static void assertTrue(boolean value, String msg) {
++ if (!value) {
++ error(msg);
++ }
++ }
++
++ private static <T extends Comparable<T>> int compare(T lhs, T rhs, String msg) {
++ assertNotNull(lhs, msg);
++ assertNotNull(rhs, msg);
++ return lhs.compareTo(rhs);
++ }
++
++ private static String format(Object o) {
++ return o == null? "null" : o.toString();
++ }
++
++ private static void error(String msg) {
++ throw new RuntimeException(msg);
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/ByteCodeLoader.java Mon Sep 08 12:15:04 2014 -0700
+@@ -0,0 +1,74 @@
++/*
++ * 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.
++ */
++
++package com.oracle.java.testlibrary;
++
++import java.security.SecureClassLoader;
++
++/**
++ * {@code ByteCodeLoader} can be used for easy loading of byte code already
++ * present in memory.
++ *
++ * {@code InMemoryCompiler} can be used for compiling source code in a string
++ * into byte code, which then can be loaded with {@code ByteCodeLoader}.
++ *
++ * @see InMemoryCompiler
++ */
++public class ByteCodeLoader extends SecureClassLoader {
++ private final String className;
++ private final byte[] byteCode;
++
++ /**
++ * Creates a new {@code ByteCodeLoader} ready to load a class with the
++ * given name and the given byte code.
++ *
++ * @param className The name of the class
++ * @param byteCode The byte code of the class
++ */
++ public ByteCodeLoader(String className, byte[] byteCode) {
++ this.className = className;
++ this.byteCode = byteCode;
++ }
++
++ @Override
++ protected Class<?> findClass(String name) throws ClassNotFoundException {
++ if (!name.equals(className)) {
++ throw new ClassNotFoundException(name);
++ }
++
++ return defineClass(name, byteCode, 0, byteCode.length);
++ }
++
++ /**
++ * Utility method for creating a new {@code ByteCodeLoader} and then
++ * directly load the given byte code.
++ *
++ * @param className The name of the class
++ * @param byteCode The byte code for the class
++ * @throws ClassNotFoundException if the class can't be loaded
++ * @return A {@see Class} object representing the class
++ */
++ public static Class<?> load(String className, byte[] byteCode) throws ClassNotFoundException {
++ return new ByteCodeLoader(className, byteCode).loadClass(className);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/InMemoryJavaCompiler.java Mon Sep 08 12:15:04 2014 -0700
+@@ -0,0 +1,154 @@
++/*
++ * 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.
++ */
++
++package com.oracle.java.testlibrary;
++
++import java.io.ByteArrayOutputStream;
++import java.io.IOException;
++import java.io.OutputStream;
++
++import java.net.URI;
++import java.util.Arrays;
++
++import javax.tools.ForwardingJavaFileManager;
++import javax.tools.ForwardingJavaFileManager;
++import javax.tools.FileObject;
++import javax.tools.JavaCompiler;
++import javax.tools.JavaCompiler.CompilationTask;
++import javax.tools.JavaFileManager;
++import javax.tools.JavaFileObject;
++import javax.tools.JavaFileObject.Kind;
++import javax.tools.SimpleJavaFileObject;
++import javax.tools.ToolProvider;
++
++/**
++ * {@code InMemoryJavaCompiler} can be used for compiling a {@link
++ * CharSequence} to a {@code byte[]}.
++ *
++ * The compiler will not use the file system at all, instead using a {@link
++ * ByteArrayOutputStream} for storing the byte code. For the source code, any
++ * kind of {@link CharSequence} can be used, e.g. {@link String}, {@link
++ * StringBuffer} or {@link StringBuilder}.
++ *
++ * The {@code InMemoryCompiler} can easily be used together with a {@code
++ * ByteClassLoader} to easily compile and load source code in a {@link String}:
++ *
++ * <pre>
++ * {@code
++ * import com.oracle.java.testlibrary.InMemoryJavaCompiler;
++ * import com.oracle.java.testlibrary.ByteClassLoader;
++ *
++ * class Example {
++ * public static void main(String[] args) {
++ * String className = "Foo";
++ * String sourceCode = "public class " + className + " {" +
++ * " public void bar() {" +
++ * " System.out.println("Hello from bar!");" +
++ * " }" +
++ * "}";
++ * byte[] byteCode = InMemoryJavaCompiler.compile(className, sourceCode);
++ * Class fooClass = ByteClassLoader.load(className, byteCode);
++ * }
++ * }
++ * }
++ * </pre>
++ */
++public class InMemoryJavaCompiler {
++ private static class MemoryJavaFileObject extends SimpleJavaFileObject {
++ private final String className;
++ private final CharSequence sourceCode;
++ private final ByteArrayOutputStream byteCode;
++
++ public MemoryJavaFileObject(String className, CharSequence sourceCode) {
++ super(URI.create("string:///" + className.replace('.','/') + Kind.SOURCE.extension), Kind.SOURCE);
++ this.className = className;
++ this.sourceCode = sourceCode;
++ this.byteCode = new ByteArrayOutputStream();
++ }
++
++ @Override
++ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
++ return sourceCode;
++ }
++
++ @Override
++ public OutputStream openOutputStream() throws IOException {
++ return byteCode;
++ }
++
++ public byte[] getByteCode() {
++ return byteCode.toByteArray();
++ }
++
++ public String getClassName() {
++ return className;
++ }
++ }
++
++ private static class FileManagerWrapper extends ForwardingJavaFileManager {
++ private MemoryJavaFileObject file;
++
++ public FileManagerWrapper(MemoryJavaFileObject file) {
++ super(getCompiler().getStandardFileManager(null, null, null));
++ this.file = file;
++ }
++
++ @Override
++ public JavaFileObject getJavaFileForOutput(Location location, String className,
++ Kind kind, FileObject sibling)
++ throws IOException {
++ if (!file.getClassName().equals(className)) {
++ throw new IOException("Expected class with name " + file.getClassName() +
++ ", but got " + className);
++ }
++ return file;
++ }
++ }
++
++ /**
++ * Compiles the class with the given name and source code.
++ *
++ * @param className The name of the class
++ * @param sourceCode The source code for the class with name {@code className}
++ * @throws RuntimeException if the compilation did not succeed
++ * @return The resulting byte code from the compilation
++ */
++ public static byte[] compile(String className, CharSequence sourceCode) {
++ MemoryJavaFileObject file = new MemoryJavaFileObject(className, sourceCode);
++ CompilationTask task = getCompilationTask(file);
++
++ if(!task.call()) {
++ throw new RuntimeException("Could not compile " + className + " with source code " + sourceCode);
++ }
++
++ return file.getByteCode();
++ }
++
++ private static JavaCompiler getCompiler() {
++ return ToolProvider.getSystemJavaCompiler();
++ }
++
++ private static CompilationTask getCompilationTask(MemoryJavaFileObject file) {
++ return getCompiler().getTask(null, new FileManagerWrapper(file), null, null, null, Arrays.asList(file));
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/InputArguments.java Mon Sep 08 12:15:04 2014 -0700
+@@ -0,0 +1,76 @@
++/*
++ * 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.
++ */
++
++package com.oracle.java.testlibrary;
++
++import java.lang.management.RuntimeMXBean;
++import java.lang.management.ManagementFactory;
++import java.util.List;
++
++/**
++ * This class provides access to the input arguments to the VM.
++ */
++public class InputArguments {
++ private static final List<String> args;
++
++ static {
++ RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
++ args = runtimeMxBean.getInputArguments();
++ }
++
++ /**
++ * Returns true if {@code arg} is an input argument to the VM.
++ *
++ * This is useful for checking boolean flags such as -XX:+UseSerialGC or
++ * -XX:-UsePerfData.
++ *
++ * @param arg The name of the argument.
++ * @return {@code true} if the given argument is an input argument,
++ * otherwise {@code false}.
++ */
++ public static boolean contains(String arg) {
++ return args.contains(arg);
++ }
++
++ /**
++ * Returns true if {@code prefix} is the start of an input argument to the
++ * VM.
++ *
++ * This is useful for checking if flags describing a quantity, such as
++ * -XX:+MaxMetaspaceSize=100m, is set without having to know the quantity.
++ * To check if the flag -XX:MaxMetaspaceSize is set, use
++ * {@code InputArguments.containsPrefix("-XX:MaxMetaspaceSize")}.
++ *
++ * @param prefix The start of the argument.
++ * @return {@code true} if the given argument is the start of an input
++ * argument, otherwise {@code false}.
++ */
++ public static boolean containsPrefix(String prefix) {
++ for (String arg : args) {
++ if (arg.startsWith(prefix)) {
++ return true;
++ }
++ }
++ return false;
++ }
++}
+--- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java Mon Sep 08 12:15:04 2014 -0700
+@@ -23,28 +23,84 @@
+
+ package com.oracle.java.testlibrary;
+
+-import java.io.File;
++import java.io.FileNotFoundException;
++import java.nio.file.Path;
++import java.nio.file.Paths;
+
+ public final class JDKToolFinder {
+
+- private JDKToolFinder() {
+- }
+-
+- /**
+- * Returns the full path to an executable in jdk/bin based on System property
+- * test.jdk (set by jtreg test suite)
+- *
+- * @return Full path to an executable in jdk/bin
+- */
+- public static String getJDKTool(String tool) {
+- String binPath = System.getProperty("test.jdk");
+- if (binPath == null) {
+- throw new RuntimeException("System property 'test.jdk' not set. This property is normally set by jtreg. "
+- + "When running test separately, set this property using '-Dtest.jdk=/path/to/jdk'.");
++ private JDKToolFinder() {
+ }
+
+- binPath += File.separatorChar + "bin" + File.separatorChar + tool;
++ /**
++ * Returns the full path to an executable in jdk/bin based on System
++ * property {@code test.jdk} or {@code compile.jdk} (both are set by the jtreg test suite)
++ *
++ * @return Full path to an executable in jdk/bin
++ */
++ public static String getJDKTool(String tool) {
+
+- return binPath;
+- }
++ // First try to find the executable in test.jdk
++ try {
++ return getTool(tool, "test.jdk");
++ } catch (FileNotFoundException e) {
++
++ }
++
++ // Now see if it's available in compile.jdk
++ try {
++ return getTool(tool, "compile.jdk");
++ } catch (FileNotFoundException e) {
++ throw new RuntimeException("Failed to find " + tool +
++ ", looked in test.jdk (" + System.getProperty("test.jdk") +
++ ") and compile.jdk (" + System.getProperty("compile.jdk") + ")");
++ }
++ }
++
++ /**
++ * Returns the full path to an executable in jdk/bin based on System
++ * property {@code compile.jdk}
++ *
++ * @return Full path to an executable in jdk/bin
++ */
++ public static String getCompileJDKTool(String tool) {
++ try {
++ return getTool(tool, "compile.jdk");
++ } catch (FileNotFoundException e) {
++ throw new RuntimeException(e);
++ }
++ }
++
++ /**
++ * Returns the full path to an executable in jdk/bin based on System
++ * property {@code test.jdk}
++ *
++ * @return Full path to an executable in jdk/bin
++ */
++ public static String getTestJDKTool(String tool) {
++ try {
++ return getTool(tool, "test.jdk");
++ } catch (FileNotFoundException e) {
++ throw new RuntimeException(e);
++ }
++ }
++
++ private static String getTool(String tool, String property) throws FileNotFoundException {
++ String jdkPath = System.getProperty(property);
++
++ if (jdkPath == null) {
++ throw new RuntimeException(
++ "System property '" + property + "' not set. This property is normally set by jtreg. "
++ + "When running test separately, set this property using '-D" + property + "=/path/to/jdk'.");
++ }
++
++ Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : ""));
++
++ Path jdkTool = Paths.get(jdkPath, toolName.toString());
++ if (!jdkTool.toFile().exists()) {
++ throw new FileNotFoundException("Could not find file " + jdkTool.toAbsolutePath());
++ }
++
++ return jdkTool.toAbsolutePath().toString();
++ }
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java Mon Sep 08 12:15:04 2014 -0700
+@@ -0,0 +1,134 @@
++/*
++ * 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.
++ */
++
++package com.oracle.java.testlibrary;
++
++import java.util.ArrayList;
++import java.util.Arrays;
++import java.util.List;
++
++/**
++ * A utility for constructing command lines for starting JDK tool processes.
++ *
++ * The JDKToolLauncher can in particular be combined with a
++ * java.lang.ProcessBuilder to easily run a JDK tool. For example, the following
++ * code run {@code jmap -heap} against a process with GC logging turned on for
++ * the {@code jmap} process:
++ *
++ * <pre>
++ * {@code
++ * JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
++ * .addVMArg("-XX:+PrintGC");
++ * .addVMArg("-XX:+PrintGCDetails")
++ * .addToolArg("-heap")
++ * .addToolArg(pid);
++ * ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
++ * Process p = pb.start();
++ * }
++ * </pre>
++ */
++public class JDKToolLauncher {
++ private final String executable;
++ private final List<String> vmArgs = new ArrayList<String>();
++ private final List<String> toolArgs = new ArrayList<String>();
++
++ private JDKToolLauncher(String tool, boolean useCompilerJDK) {
++ if (useCompilerJDK) {
++ executable = JDKToolFinder.getJDKTool(tool);
++ } else {
++ executable = JDKToolFinder.getTestJDKTool(tool);
++ }
++ vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
++ }
++
++ /**
++ * Creates a new JDKToolLauncher for the specified tool. Using tools path
++ * from the compiler JDK.
++ *
++ * @param tool
++ * The name of the tool
++ * @return A new JDKToolLauncher
++ */
++ public static JDKToolLauncher create(String tool) {
++ return new JDKToolLauncher(tool, true);
++ }
++
++ /**
++ * Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
++ *
++ * @param tool
++ * The name of the tool
++ *
++ * @return A new JDKToolLauncher
++ */
++ public static JDKToolLauncher createUsingTestJDK(String tool) {
++ return new JDKToolLauncher(tool, false);
++ }
++
++ /**
++ * Adds an argument to the JVM running the tool.
++ *
++ * The JVM arguments are passed to the underlying JVM running the tool.
++ * Arguments will automatically be prepended with "-J".
++ *
++ * Any platform specific arguments required for running the tool are
++ * automatically added.
++ *
++ *
++ * @param arg
++ * The argument to VM running the tool
++ * @return The JDKToolLauncher instance
++ */
++ public JDKToolLauncher addVMArg(String arg) {
++ vmArgs.add(arg);
++ return this;
++ }
++
++ /**
++ * Adds an argument to the tool.
++ *
++ * @param arg
++ * The argument to the tool
++ * @return The JDKToolLauncher instance
++ */
++ public JDKToolLauncher addToolArg(String arg) {
++ toolArgs.add(arg);
++ return this;
++ }
++
++ /**
++ * Returns the command that can be used for running the tool.
++ *
++ * @return An array whose elements are the arguments of the command.
++ */
++ public String[] getCommand() {
++ List<String> command = new ArrayList<String>();
++ command.add(executable);
++ // Add -J in front of all vmArgs
++ for (String arg : vmArgs) {
++ command.add("-J" + arg);
++ }
++ command.addAll(toolArgs);
++ return command.toArray(new String[command.size()]);
++ }
++}
+--- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java Mon Sep 08 12:15:04 2014 -0700
+@@ -76,7 +76,8 @@
+ */
+ public void shouldContain(String expectedString) {
+ if (!stdout.contains(expectedString) && !stderr.contains(expectedString)) {
+- throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr: [" + stdout + stderr + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr \n");
+ }
+ }
+
+@@ -88,7 +89,8 @@
+ */
+ public void stdoutShouldContain(String expectedString) {
+ if (!stdout.contains(expectedString)) {
+- throw new RuntimeException("'" + expectedString + "' missing from stdout: [" + stdout + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + expectedString + "' missing from stdout \n");
+ }
+ }
+
+@@ -100,7 +102,8 @@
+ */
+ public void stderrShouldContain(String expectedString) {
+ if (!stderr.contains(expectedString)) {
+- throw new RuntimeException("'" + expectedString + "' missing from stderr: [" + stderr + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + expectedString + "' missing from stderr \n");
+ }
+ }
+
+@@ -112,10 +115,12 @@
+ */
+ public void shouldNotContain(String notExpectedString) {
+ if (stdout.contains(notExpectedString)) {
+- throw new RuntimeException("'" + notExpectedString + "' found in stdout: [" + stdout + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
+ }
+ if (stderr.contains(notExpectedString)) {
+- throw new RuntimeException("'" + notExpectedString + "' found in stderr: [" + stderr + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
+ }
+ }
+
+@@ -127,7 +132,8 @@
+ */
+ public void stdoutShouldNotContain(String notExpectedString) {
+ if (stdout.contains(notExpectedString)) {
+- throw new RuntimeException("'" + notExpectedString + "' found in stdout: [" + stdout + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
+ }
+ }
+
+@@ -139,7 +145,8 @@
+ */
+ public void stderrShouldNotContain(String notExpectedString) {
+ if (stderr.contains(notExpectedString)) {
+- throw new RuntimeException("'" + notExpectedString + "' found in stderr: [" + stderr + "]\n");
++ reportDiagnosticSummary();
++ throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
+ }
+ }
+
+@@ -154,9 +161,9 @@
+ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ if (!stdoutMatcher.find() && !stderrMatcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' missing from stdout/stderr: [" + stdout + stderr
+- + "]\n");
++ + "' missing from stdout/stderr \n");
+ }
+ }
+
+@@ -170,8 +177,9 @@
+ public void stdoutShouldMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+ if (!matcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' missing from stdout: [" + stdout + "]\n");
++ + "' missing from stdout \n");
+ }
+ }
+
+@@ -185,8 +193,9 @@
+ public void stderrShouldMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ if (!matcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' missing from stderr: [" + stderr + "]\n");
++ + "' missing from stderr \n");
+ }
+ }
+
+@@ -200,13 +209,15 @@
+ public void shouldNotMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+ if (matcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' found in stdout: [" + stdout + "]\n");
++ + "' found in stdout: '" + matcher.group() + "' \n");
+ }
+ matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ if (matcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' found in stderr: [" + stderr + "]\n");
++ + "' found in stderr: '" + matcher.group() + "' \n");
+ }
+ }
+
+@@ -220,8 +231,9 @@
+ public void stdoutShouldNotMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+ if (matcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' found in stdout: [" + stdout + "]\n");
++ + "' found in stdout \n");
+ }
+ }
+
+@@ -235,8 +247,9 @@
+ public void stderrShouldNotMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ if (matcher.find()) {
++ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+- + "' found in stderr: [" + stderr + "]\n");
++ + "' found in stderr \n");
+ }
+ }
+
+@@ -279,10 +292,31 @@
+ */
+ public void shouldHaveExitValue(int expectedExitValue) {
+ if (getExitValue() != expectedExitValue) {
+- throw new RuntimeException("Exit value " + getExitValue() + " , expected to get " + expectedExitValue);
++ reportDiagnosticSummary();
++ throw new RuntimeException("Expected to get exit value of ["
++ + expectedExitValue + "]\n");
+ }
+ }
+
++
++ /**
++ * Report summary that will help to diagnose the problem
++ * Currently includes:
++ * - standard input produced by the process under test
++ * - standard output
++ * - exit code
++ * Note: the command line is printed by the ProcessTools
++ */
++ private void reportDiagnosticSummary() {
++ String msg =
++ " stdout: [" + stdout + "];\n" +
++ " stderr: [" + stderr + "]\n" +
++ " exitValue = " + getExitValue() + "\n";
++
++ System.err.println(msg);
++ }
++
++
+ /**
+ * Get the contents of the output buffer (stdout and stderr)
+ *
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounter.java Mon Sep 08 12:15:04 2014 -0700
+@@ -0,0 +1,70 @@
++/*
++ * 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.
++ */
++
++package com.oracle.java.testlibrary;
++
++import sun.jvmstat.monitor.Monitor;
++
++/**
++ * Represents a performance counter in the JVM.
++ *
++ * See http://openjdk.java.net/groups/hotspot/docs/Serviceability.html#bjvmstat
++ * for more details about performance counters.
++ */
++public class PerfCounter {
++ private final Monitor monitor;
++ private final String name;
++
++ PerfCounter(Monitor monitor, String name) {
++ this.monitor = monitor;
++ this.name = name;
++ }
++
++ /**
++ * Returns the value of this performance counter as a long.
++ *
++ * @return The long value of this performance counter
++ * @throws RuntimeException If the value of the performance counter isn't a long
++ */
++ public long longValue() {
++ Object value = monitor.getValue();
++ if (value instanceof Long) {
++ return ((Long) value).longValue();
++ }
++ throw new RuntimeException("Expected " + monitor.getName() + " to have a long value");
++ }
++
++ /**
++ * Returns the name of the performance counter.
++ *
++ * @return The name of the performance counter.
++ */
++ public String getName() {
++ return name;
++ }
++
++ @Override
++ public String toString() {
++ return name;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounters.java Mon Sep 08 12:15:04 2014 -0700
+@@ -0,0 +1,69 @@
++/*
++ * 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.
++ */
++
++package com.oracle.java.testlibrary;
++
++import sun.jvmstat.monitor.Monitor;
++import sun.jvmstat.monitor.MonitorException;
++import sun.jvmstat.monitor.MonitoredHost;
++import sun.jvmstat.monitor.MonitoredVm;
++import sun.jvmstat.monitor.VmIdentifier;
++
++/**
++ * PerfCounters can be used to get a performance counter from the currently
++ * executing VM.
++ *
++ * Throws a runtime exception if an error occurs while communicating with the
++ * currently executing VM.
++ */
++public class PerfCounters {
++ private final static MonitoredVm vm;
++
++ static {
++ try {
++ String pid = Integer.toString(ProcessTools.getProcessId());
++ VmIdentifier vmId = new VmIdentifier(pid);
++ MonitoredHost host = MonitoredHost.getMonitoredHost(vmId);
++ vm = host.getMonitoredVm(vmId);
++ } catch (Exception e) {
++ throw new RuntimeException("Could not connect to the VM");
++ }
++ }
++
++ /**
++ * Returns the performance counter with the given name.
++ *
++ * @param name The name of the performance counter.
++ * @throws IllegalArgumentException If no counter with the given name exists.
++ * @throws MonitorException If an error occurs while communicating with the VM.
++ * @return The performance counter with the given name.
++ */
++ public static PerfCounter findByName(String name)
++ throws MonitorException, IllegalArgumentException {
++ Monitor m = vm.findByName(name);
++ if (m == null) {
++ throw new IllegalArgumentException("Did not find a performance counter with name " + name);
++ }
++ return new PerfCounter(m, name);
++ }
++}
+--- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Mon Sep 08 12:15:04 2014 -0700
+@@ -24,39 +24,80 @@
+ package com.oracle.java.testlibrary;
+
+ public class Platform {
+- private static final String osName = System.getProperty("os.name");
+- private static final String dataModel = System.getProperty("sun.arch.data.model");
+- private static final String vmVersion = System.getProperty("java.vm.version");
++ private static final String osName = System.getProperty("os.name");
++ private static final String dataModel = System.getProperty("sun.arch.data.model");
++ private static final String vmVersion = System.getProperty("java.vm.version");
++ private static final String osArch = System.getProperty("os.arch");
+
+- public static boolean is64bit() {
+- return dataModel.equals("64");
+- }
++ public static boolean is32bit() {
++ return dataModel.equals("32");
++ }
+
+- public static boolean isSolaris() {
+- return osName.toLowerCase().startsWith("sunos");
+- }
++ public static boolean is64bit() {
++ return dataModel.equals("64");
++ }
+
+- public static boolean isWindows() {
+- return osName.toLowerCase().startsWith("win");
+- }
++ public static boolean isSolaris() {
++ return isOs("sunos");
++ }
+
+- public static boolean isOSX() {
+- return osName.toLowerCase().startsWith("mac");
+- }
++ public static boolean isWindows() {
++ return isOs("win");
++ }
+
+- public static boolean isLinux() {
+- return osName.toLowerCase().startsWith("linux");
+- }
++ public static boolean isOSX() {
++ return isOs("mac");
++ }
+
+- public static String getOsName() {
+- return osName;
+- }
++ public static boolean isLinux() {
++ return isOs("linux");
++ }
+
+- public static boolean isDebugBuild() {
+- return vmVersion.toLowerCase().contains("debug");
+- }
++ private static boolean isOs(String osname) {
++ return osName.toLowerCase().startsWith(osname.toLowerCase());
++ }
+
+- public static String getVMVersion() {
+- return vmVersion;
+- }
++ public static String getOsName() {
++ return osName;
++ }
++
++ public static boolean isDebugBuild() {
++ return vmVersion.toLowerCase().contains("debug");
++ }
++
++ public static String getVMVersion() {
++ return vmVersion;
++ }
++
++ // Returns true for sparc and sparcv9.
++ public static boolean isSparc() {
++ return isArch("sparc");
++ }
++
++ public static boolean isARM() {
++ return isArch("arm");
++ }
++
++ public static boolean isPPC() {
++ return isArch("ppc");
++ }
++
++ public static boolean isX86() {
++ // On Linux it's 'i386', Windows 'x86'
++ return (isArch("i386") || isArch("x86"));
++ }
++
++ public static boolean isX64() {
++ // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
++ return (isArch("amd64") || isArch("x86_64"));
++ }
++
++ private static boolean isArch(String archname) {
++ return osArch.toLowerCase().startsWith(archname.toLowerCase());
++ }
++
++ public static String getOsArch() {
++ return osArch;
++ }
++
+ }
+--- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java Wed Jun 25 09:01:56 2014 -0700
++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java Mon Sep 08 12:15:04 2014 -0700
+@@ -31,6 +31,7 @@
+ import java.lang.reflect.Method;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.List;
+
+ import sun.management.VMManagement;
+
+@@ -107,15 +108,29 @@
+ }
+
+ /**
++ * Get the string containing input arguments passed to the VM
++ *
++ * @return arguments
++ */
++ public static String getVmInputArguments() {
++ RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
++
++ List<String> args = runtime.getInputArguments();
++ StringBuilder result = new StringBuilder();
++ for (String arg : args)
++ result.append(arg).append(' ');
++
++ return result.toString();
++ }
++
++ /**
+ * Get platform specific VM arguments (e.g. -d64 on 64bit Solaris)
+ *
+ * @return String[] with platform specific arguments, empty if there are none
+ */
+ public static String[] getPlatformSpecificVMArgs() {
+- String osName = System.getProperty("os.name");
+- String dataModel = System.getProperty("sun.arch.data.model");
+
+- if (osName.equals("SunOS") && dataModel.equals("64")) {
++ if (Platform.is64bit() && Platform.isSolaris()) {
+ return new String[] { "-d64" };
+ }
+
+@@ -134,8 +149,13 @@
+ Collections.addAll(args, getPlatformSpecificVMArgs());
+ Collections.addAll(args, command);
+
++ // Reporting
++ StringBuilder cmdLine = new StringBuilder();
++ for (String cmd : args)
++ cmdLine.append(cmd).append(' ');
++ System.out.println("Command line: [" + cmdLine.toString() + "]");
++
+ return new ProcessBuilder(args.toArray(new String[args.size()]));
+-
+ }
+
+ }
+--- ./jaxp/.hgtags Wed Jun 25 09:03:02 2014 -0700
++++ ./jaxp/.hgtags Mon Sep 08 12:15:56 2014 -0700
+@@ -421,6 +421,7 @@
+ 14719f73596f5c90e3f46c0f4312f32e5b105edd jdk7u55-b13
+ 01f26830f88cf4f10897416fe1f4f372efcdecf5 jdk7u55-b30
+ 26187a65c765b3177f1b7ff0638259bf66f9ec47 jdk7u55-b14
++b81309c6014182819d752a4517d48b201d91b154 jdk7u55-b15
+ 5be97f6c25d9eb3ef0a05fc860964cb3d27134b0 jdk7u55-b31
+ 94f3ad704f28d5ec65f7a3b1cbf5cfe7e42151f3 jdk7u55-b32
+ 476aad2c130e2b1b7033fa6789754c03151da95c jdk7u55-b33
+@@ -469,3 +470,36 @@
+ a34a9f6740955e1cd844c5b701d76dbe7290913a jdk7u65-b16
+ 178512d1bd9caf56d61811ad0d4b4269475407aa jdk7u65-b17
+ be897d0fd2a0b5f43b0d0e48075e5b070ca584d4 jdk7u65-b30
++45db678253587755df4a00066e42e2fce04bbb71 jdk7u65-b18
++4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b19
++f3b7bb6f1924ab7f635cdd60db7fbab64576cd6d jdk7u65-b32
++d41f31b707c87675f3467e980b1ceef2e53b3b5d jdk7u65-b20
++d1f8566d39c56e40516a1afb304ed7c0681355d8 jdk7u67-b01
++4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b40
++a5f829d7fa05cf769402dfc82c94b737b8d011b0 jdk7u65-b31
++f33ea72260ca7480f4a1405d35a3709895b491a2 jdk7u65-b33
++86e93799766d67102a37559b3831abcc825d7e24 jdk7u66-b00
++d34839cb2f15dee01cdfb1fd93378849de34d662 jdk7u66-b01
++19e4e978c8212921104ba16d0db6bf18c6f8d0ab jdk7u66-b09
++533ecae83034da1e68ee9a414b690c9b6eead293 jdk7u66-b10
++763f80d4aae130a89efa4c6544ee98fcb7e6a2ca jdk7u66-b11
++0d91d2f038d19261e0085a76bb8974c3b7609c5d jdk7u66-b12
++cddc3774bebfe597228c7b3e386859b1fa775387 jdk7u66-b13
++15206a7046a97d0a0fd824bec8b0e4174a56d8eb jdk7u66-b14
++af60b8e3b9deb32d50552916e0afd38a30feaef0 jdk7u66-b15
++36bba6c72f866df5c65ba8678544bf0442a952b3 jdk7u66-b16
++9a777cc0d6b3b25d13feca1e610584d042565367 jdk7u66-b17
++174a2f822f4f600f798e9963f0c1496206dce471 jdk7u71-b00
++df8d93eddfc2de1046b8fb87204bc945c538a282 jdk7u71-b01
++153724c929075f0a741aacead679af39f03a0a80 jdk7u71-b02
++9e2007e23f356b7bc5d4d0c6c6350e9b3b3cd56b jdk7u71-b03
++f58a7f8db6c54cd76621d1f48d17102ffbe93983 jdk7u71-b04
++edab7f6d9a30feea45bf9185de0c65e11ab3a7b0 jdk7u71-b05
++ca2992ad734eaf8295e21351b0de329555e9e60a jdk7u71-b06
++5fbecd4c30c2e566e9b815818d51042e20d3ab83 jdk7u71-b07
++acf176ea76f904674228745c25af195e460f1240 jdk7u71-b08
++8a9f55d8d011ad6dc36f307dfac47981b676b379 jdk7u71-b09
++d82fd2f6c5c8ed03c75828033058b675f9239d4b jdk7u71-b10
++f7542072016b7972b383075f84df29bc05495d2e jdk7u71-b11
++109dd4c4a07a8adfaf59e11c29e502277b803c44 jdk7u71-b12
++df2c7c9a3609f8f4b30b09c29a9cfddc8b4b90ef jdk7u71-b13
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java Wed Jun 25 09:03:02 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java Mon Sep 08 12:15:56 2014 -0700
+@@ -26,7 +26,7 @@
+ import java.util.Vector;
+
+ import com.sun.org.apache.bcel.internal.generic.ConstantPoolGen;
+-import com.sun.org.apache.bcel.internal.generic.INVOKEVIRTUAL;
++import com.sun.org.apache.bcel.internal.generic.INVOKESTATIC;
+ import com.sun.org.apache.bcel.internal.generic.InstructionList;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ClassGenerator;
+ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.MethodGenerator;
+@@ -51,7 +51,8 @@
+ il.append(methodGen.loadContextNode());
+ Type.Node.translateTo(classGen, methodGen, Type.String);
+ }
+- il.append(new INVOKEVIRTUAL(cpg.addMethodref(STRING_CLASS,
+- "length", "()I")));
++ il.append(new INVOKESTATIC(cpg.addMethodref(BASIS_LIBRARY_CLASS,
++ "getStringLength",
++ "(Ljava/lang/String;)I")));
+ }
+ }
+--- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Wed Jun 25 09:03:02 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Mon Sep 08 12:15:56 2014 -0700
+@@ -1660,5 +1660,14 @@
+
+ }
+
++ /**
++ * Utility method to calculate string-length as a number of code points,
++ * to avoid possible errors with string that contains
++ * complementary characters
++ */
++ public static int getStringLength(String str) {
++ return str.codePointCount(0,str.length());
++ }
++
+ //-- End utility functions
+ }
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java Wed Jun 25 09:03:02 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java Mon Sep 08 12:15:56 2014 -0700
+@@ -61,14 +61,13 @@
+
+ package com.sun.org.apache.xerces.internal.impl;
+
+-import java.io.IOException;
+-
+ import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
++import com.sun.org.apache.xerces.internal.util.XML11Char;
+ import com.sun.org.apache.xerces.internal.util.XMLChar;
+-import com.sun.org.apache.xerces.internal.util.XML11Char;
+ import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
+ import com.sun.org.apache.xerces.internal.xni.QName;
+ import com.sun.org.apache.xerces.internal.xni.XMLString;
++import java.io.IOException;
+
+ /**
+ * Implements the entity scanner methods in
+@@ -78,6 +77,7 @@
+ *
+ * @author Michael Glavassevich, IBM
+ * @author Neil Graham, IBM
++ * @version $Id: XML11EntityScanner.java,v 1.5 2010-11-01 04:39:40 joehw Exp $
+ */
+
+ public class XML11EntityScanner
+@@ -108,7 +108,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // peek at character
+@@ -136,7 +136,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // scan character
+@@ -148,7 +148,7 @@
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+ fCurrentEntity.ch[0] = (char)c;
+- load(1, false);
++ load(1, false, true);
+ }
+ if (c == '\r' && external) {
+ int cc = fCurrentEntity.ch[fCurrentEntity.position++];
+@@ -183,7 +183,7 @@
+ public String scanNmtoken() throws IOException {
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // scan nmtoken
+@@ -194,6 +194,7 @@
+ if (XML11Char.isXML11Name(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -206,7 +207,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -214,6 +215,7 @@
+ else if (XML11Char.isXML11NameHighSurrogate(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -226,7 +228,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ --fCurrentEntity.startPosition;
+ --fCurrentEntity.position;
+ break;
+@@ -240,6 +242,7 @@
+ }
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -252,7 +255,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -294,7 +297,7 @@
+ public String scanName() throws IOException {
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // scan name
+@@ -305,7 +308,7 @@
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false)) {
++ if (load(1, false, true)) {
+ fCurrentEntity.columnNumber++;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
+ return symbol;
+@@ -316,7 +319,7 @@
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false)) {
++ if (load(1, false, true)) {
+ --fCurrentEntity.position;
+ --fCurrentEntity.startPosition;
+ return null;
+@@ -332,7 +335,7 @@
+ fCurrentEntity.ch[0] = ch;
+ fCurrentEntity.ch[1] = ch2;
+ offset = 0;
+- if (load(2, false)) {
++ if (load(2, false, true)) {
+ fCurrentEntity.columnNumber += 2;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 2);
+ return symbol;
+@@ -348,6 +351,7 @@
+ if (XML11Char.isXML11Name(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -360,7 +364,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -368,6 +372,7 @@
+ else if (XML11Char.isXML11NameHighSurrogate(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -380,7 +385,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ --fCurrentEntity.position;
+ --fCurrentEntity.startPosition;
+ break;
+@@ -394,6 +399,7 @@
+ }
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -406,7 +412,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -449,7 +455,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // scan name
+@@ -460,7 +466,7 @@
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false)) {
++ if (load(1, false, true)) {
+ fCurrentEntity.columnNumber++;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
+ return symbol;
+@@ -471,7 +477,7 @@
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false)) {
++ if (load(1, false, true)) {
+ --fCurrentEntity.position;
+ --fCurrentEntity.startPosition;
+ return null;
+@@ -487,7 +493,7 @@
+ fCurrentEntity.ch[0] = ch;
+ fCurrentEntity.ch[1] = ch2;
+ offset = 0;
+- if (load(2, false)) {
++ if (load(2, false, true)) {
+ fCurrentEntity.columnNumber += 2;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 2);
+ return symbol;
+@@ -503,6 +509,7 @@
+ if (XML11Char.isXML11NCName(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -515,7 +522,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -523,6 +530,7 @@
+ else if (XML11Char.isXML11NameHighSurrogate(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -535,7 +543,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ --fCurrentEntity.startPosition;
+ --fCurrentEntity.position;
+ break;
+@@ -549,6 +557,7 @@
+ }
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -561,7 +570,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -610,7 +619,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // scan qualified name
+@@ -621,7 +630,7 @@
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false)) {
++ if (load(1, false, true)) {
+ fCurrentEntity.columnNumber++;
+ String name = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
+ qname.setValues(null, name, name, null);
+@@ -633,7 +642,7 @@
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false)) {
++ if (load(1, false, true)) {
+ --fCurrentEntity.startPosition;
+ --fCurrentEntity.position;
+ return false;
+@@ -649,7 +658,7 @@
+ fCurrentEntity.ch[0] = ch;
+ fCurrentEntity.ch[1] = ch2;
+ offset = 0;
+- if (load(2, false)) {
++ if (load(2, false, true)) {
+ fCurrentEntity.columnNumber += 2;
+ String name = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 2);
+ qname.setValues(null, name, name, null);
+@@ -674,6 +683,7 @@
+ }
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -689,7 +699,7 @@
+ index = index - offset;
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -697,6 +707,7 @@
+ else if (XML11Char.isXML11NameHighSurrogate(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -712,7 +723,7 @@
+ index = index - offset;
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ sawIncompleteSurrogatePair = true;
+ --fCurrentEntity.startPosition;
+ --fCurrentEntity.position;
+@@ -728,6 +739,7 @@
+ }
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+ int length = fCurrentEntity.position - offset;
++ invokeListeners(length);
+ if (length == fCurrentEntity.ch.length) {
+ // bad luck we have to resize our buffer
+ char[] tmp = new char[fCurrentEntity.ch.length << 1];
+@@ -743,7 +755,7 @@
+ index = index - offset;
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -820,11 +832,11 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+ else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
+- load(1, false);
++ load(1, false, true);
+ fCurrentEntity.position = 0;
+ fCurrentEntity.startPosition = 0;
+ }
+@@ -846,7 +858,7 @@
+ fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
+ fCurrentEntity.position = newlines;
+ fCurrentEntity.startPosition = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -869,7 +881,7 @@
+ fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
+ fCurrentEntity.position = newlines;
+ fCurrentEntity.startPosition = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -961,11 +973,11 @@
+ throws IOException {
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+ else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
+- load(1, false);
++ load(1, false, true);
+ fCurrentEntity.startPosition = 0;
+ fCurrentEntity.position = 0;
+ }
+@@ -987,7 +999,7 @@
+ fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
+ fCurrentEntity.position = newlines;
+ fCurrentEntity.startPosition = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -1010,7 +1022,7 @@
+ fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
+ fCurrentEntity.position = newlines;
+ fCurrentEntity.startPosition = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -1113,7 +1125,7 @@
+ do {
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, false);
+ }
+
+ boolean bNextEntity = false;
+@@ -1127,7 +1139,7 @@
+ 0,
+ fCurrentEntity.count - fCurrentEntity.position);
+
+- bNextEntity = load(fCurrentEntity.count - fCurrentEntity.position, false);
++ bNextEntity = load(fCurrentEntity.count - fCurrentEntity.position, false, false);
+ fCurrentEntity.position = 0;
+ fCurrentEntity.startPosition = 0;
+ }
+@@ -1140,7 +1152,7 @@
+ fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
+ fCurrentEntity.position = fCurrentEntity.count;
+ fCurrentEntity.startPosition = fCurrentEntity.count;
+- load(0,true);
++ load(0,true, false);
+ return false;
+ }
+
+@@ -1160,7 +1172,7 @@
+ fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
+ fCurrentEntity.position = newlines;
+ fCurrentEntity.startPosition = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -1184,7 +1196,7 @@
+ fCurrentEntity.position = newlines;
+ fCurrentEntity.startPosition = newlines;
+ fCurrentEntity.count = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -1309,7 +1321,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // skip character
+@@ -1335,7 +1347,7 @@
+ // handle newlines
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+ fCurrentEntity.ch[0] = (char)cc;
+- load(1, false);
++ load(1, false, true);
+ }
+ int ccc = fCurrentEntity.ch[++fCurrentEntity.position];
+ if (ccc == '\n' || ccc == 0x85) {
+@@ -1369,7 +1381,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+
+
+@@ -1397,7 +1409,7 @@
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+ fCurrentEntity.ch[0] = (char)c;
+- entityChanged = load(1, true);
++ entityChanged = load(1, true, true);
+ if (!entityChanged) {
+ // the load change the position to be 1,
+ // need to restore it when entity not changed
+@@ -1424,7 +1436,7 @@
+ if (!entityChanged)
+ fCurrentEntity.position++;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+
+ if(fCurrentEntity == null){
+ return true ;
+@@ -1445,7 +1457,7 @@
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+ fCurrentEntity.ch[0] = (char)c;
+- entityChanged = load(1, true);
++ entityChanged = load(1, true, true);
+ if (!entityChanged) {
+ // the load change the position to be 1,
+ // need to restore it when entity not changed
+@@ -1463,7 +1475,7 @@
+ if (!entityChanged)
+ fCurrentEntity.position++;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+
+ if(fCurrentEntity == null){
+ return true ;
+@@ -1496,7 +1508,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // skip string
+@@ -1508,10 +1520,11 @@
+ return false;
+ }
+ if (i < length - 1 && fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(0);
+ System.arraycopy(fCurrentEntity.ch, fCurrentEntity.count - i - 1, fCurrentEntity.ch, 0, i + 1);
+ // REVISIT: Can a string to be skipped cross an
+ // entity boundary? -Ac
+- if (load(i + 1, false)) {
++ if (load(i + 1, false, false)) {
+ fCurrentEntity.startPosition -= i + 1;
+ fCurrentEntity.position -= i + 1;
+ return false;
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Wed Jun 25 09:03:02 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Mon Sep 08 12:15:56 2014 -0700
+@@ -612,9 +612,9 @@
+ //fElementStack2.clear();
+ //fReplaceEntityReferences = true;
+ //fSupportExternalEntities = true;
+- Boolean bo = (Boolean)propertyManager.getProperty(XMLInputFactoryImpl.IS_REPLACING_ENTITY_REFERENCES);
++ Boolean bo = (Boolean)propertyManager.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES);
+ fReplaceEntityReferences = bo.booleanValue();
+- bo = (Boolean)propertyManager.getProperty(XMLInputFactoryImpl.IS_SUPPORTING_EXTERNAL_ENTITIES);
++ bo = (Boolean)propertyManager.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES);
+ fSupportExternalEntities = bo.booleanValue();
+ Boolean cdata = (Boolean)propertyManager.getProperty(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.STAX_REPORT_CDATA_EVENT) ;
+ if(cdata != null)
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Wed Jun 25 09:03:02 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Mon Sep 08 12:15:56 2014 -0700
+@@ -50,6 +50,7 @@
+ import java.util.Map;
+ import java.util.Stack;
+ import javax.xml.XMLConstants;
++import javax.xml.stream.XMLInputFactory;
+
+
+ /**
+@@ -302,6 +303,11 @@
+ /** Property Manager. This is used from Stax */
+ protected PropertyManager fPropertyManager ;
+
++ /** StAX properties */
++ boolean fSupportDTD = true;
++ boolean fReplaceEntityReferences = true;
++ boolean fSupportExternalEntities = true;
++
+ /** used to restrict external access */
+ protected String fAccessExternalDTD = EXTERNAL_ACCESS_DEFAULT;
+
+@@ -1133,7 +1139,8 @@
+ boolean parameter = entityName.startsWith("%");
+ boolean general = !parameter;
+ if (unparsed || (general && !fExternalGeneralEntities) ||
+- (parameter && !fExternalParameterEntities)) {
++ (parameter && !fExternalParameterEntities) ||
++ !fSupportDTD || !fSupportExternalEntities) {
+
+ if (fEntityHandler != null) {
+ fResourceIdentifier.clear();
+@@ -1428,6 +1435,10 @@
+ fStaxEntityResolver = null;
+ }
+
++ fSupportDTD = ((Boolean)propertyManager.getProperty(XMLInputFactory.SUPPORT_DTD)).booleanValue();
++ fReplaceEntityReferences = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES)).booleanValue();
++ fSupportExternalEntities = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES)).booleanValue();
++
+ // Zephyr feature ignore-external-dtd is the opposite of Xerces' load-external-dtd
+ fLoadExternalDTD = !((Boolean)propertyManager.getProperty(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.IGNORE_EXTERNAL_DTD)).booleanValue();
+
+@@ -1499,6 +1510,11 @@
+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER, null);
+ entityExpansionIndex = fSecurityManager.getIndex(Constants.JDK_ENTITY_EXPANSION_LIMIT);
+
++ //StAX Property
++ fSupportDTD = true;
++ fReplaceEntityReferences = true;
++ fSupportExternalEntities = true;
++
+ // JAXP 1.5 feature
+ XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER, null);
+ if (spm == null) {
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Wed Jun 25 09:03:02 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Mon Sep 08 12:15:56 2014 -0700
+@@ -20,34 +20,28 @@
+
+ package com.sun.org.apache.xerces.internal.impl;
+
+-import java.io.EOFException;
+-import java.io.IOException;
+-import java.util.Locale;
+-import java.util.Vector;
+-
+-import com.sun.xml.internal.stream.Entity;
+-import com.sun.xml.internal.stream.XMLBufferListener;
+-import java.io.InputStream;
+-import java.io.InputStreamReader;
+-import java.io.Reader;
+
+
+ import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader;
+ import com.sun.org.apache.xerces.internal.impl.io.UCSReader;
+ import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader;
+-
+-
+ import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
+ import com.sun.org.apache.xerces.internal.util.EncodingMap;
+-
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
+ import com.sun.org.apache.xerces.internal.util.XMLChar;
+ import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
+-import com.sun.org.apache.xerces.internal.xni.QName;
+-import com.sun.org.apache.xerces.internal.xni.XMLString;
++import com.sun.org.apache.xerces.internal.xni.*;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
+ import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
+-import com.sun.org.apache.xerces.internal.xni.*;
++import com.sun.xml.internal.stream.Entity;
++import com.sun.xml.internal.stream.XMLBufferListener;
++import java.io.EOFException;
++import java.io.IOException;
++import java.io.InputStream;
++import java.io.InputStreamReader;
++import java.io.Reader;
++import java.util.Locale;
++import java.util.Vector;
+
+ /**
+ * Implements the entity scanner methods.
+@@ -493,8 +487,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // peek at character
+@@ -535,8 +528,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // scan character
+@@ -546,9 +538,8 @@
+ fCurrentEntity.lineNumber++;
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(1);
+ fCurrentEntity.ch[0] = (char)c;
+- load(1, false);
++ load(1, false, true);
+ }
+ if (c == '\r' && isExternal) {
+ if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') {
+@@ -593,8 +584,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // scan nmtoken
+@@ -626,7 +616,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -673,18 +663,16 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // scan name
+ int offset = fCurrentEntity.position;
+ if (XMLChar.isNameStart(fCurrentEntity.ch[offset])) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(1);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[offset];
+ offset = 0;
+- if (load(1, false)) {
++ if (load(1, false, true)) {
+ fCurrentEntity.columnNumber++;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
+
+@@ -721,7 +709,7 @@
+ fCurrentEntity.ch, 0, length);
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -776,8 +764,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // scan qualified name
+@@ -789,11 +776,10 @@
+
+ if (XMLChar.isNameStart(fCurrentEntity.ch[offset])) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(1);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[offset];
+ offset = 0;
+
+- if (load(1, false)) {
++ if (load(1, false, true)) {
+ fCurrentEntity.columnNumber++;
+ //adding into symbol table.
+ //XXX We are trying to add single character in SymbolTable??????
+@@ -843,7 +829,7 @@
+ index = index - offset;
+ }
+ offset = 0;
+- if (load(length, false)) {
++ if (load(length, false, false)) {
+ break;
+ }
+ }
+@@ -918,12 +904,10 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+ } else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+- invokeListeners(0);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
+- load(1, false);
++ load(1, false, true);
+ fCurrentEntity.position = 0;
+ }
+
+@@ -945,9 +929,8 @@
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+ offset = 0;
+- invokeListeners(newlines);
+ fCurrentEntity.position = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -965,9 +948,8 @@
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+ offset = 0;
+- invokeListeners(newlines);
+ fCurrentEntity.position = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -1070,13 +1052,10 @@
+ }
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+ } else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+- invokeListeners(0);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
+-
+- load(1, false);
++ load(1, false, true);
+ fCurrentEntity.position = 0;
+ }
+
+@@ -1099,10 +1078,9 @@
+ fCurrentEntity.lineNumber++;
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(newlines);
+ offset = 0;
+ fCurrentEntity.position = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -1121,9 +1099,8 @@
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+ offset = 0;
+- invokeListeners(newlines);
+ fCurrentEntity.position = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -1249,7 +1226,7 @@
+ // load more characters, if needed
+
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, false);
+ }
+
+ boolean bNextEntity = false;
+@@ -1263,7 +1240,7 @@
+ 0,
+ fCurrentEntity.count - fCurrentEntity.position);
+
+- bNextEntity = load(fCurrentEntity.count - fCurrentEntity.position, false);
++ bNextEntity = load(fCurrentEntity.count - fCurrentEntity.position, false, false);
+ fCurrentEntity.position = 0;
+ fCurrentEntity.startPosition = 0;
+ }
+@@ -1276,7 +1253,7 @@
+ fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
+ fCurrentEntity.position = fCurrentEntity.count;
+ fCurrentEntity.startPosition = fCurrentEntity.count;
+- load(0, true);
++ load(0, true, false);
+ return false;
+ }
+
+@@ -1298,9 +1275,8 @@
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+ offset = 0;
+- invokeListeners(newlines);
+ fCurrentEntity.position = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -1318,10 +1294,9 @@
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+ offset = 0;
+- invokeListeners(newlines);
+ fCurrentEntity.position = newlines;
+ fCurrentEntity.count = newlines;
+- if (load(newlines, false)) {
++ if (load(newlines, false, true)) {
+ break;
+ }
+ }
+@@ -1422,8 +1397,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+ }
+
+ // skip character
+@@ -1445,9 +1419,8 @@
+ } else if (c == '\n' && cc == '\r' && isExternal) {
+ // handle newlines
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(1);
+ fCurrentEntity.ch[0] = (char)cc;
+- load(1, false);
++ load(1, false, true);
+ }
+ fCurrentEntity.position++;
+ if (fCurrentEntity.ch[fCurrentEntity.position] == '\n') {
+@@ -1498,8 +1471,7 @@
+ //boolean entityChanged = false;
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+ }
+
+ //we are doing this check only in skipSpace() because it is called by
+@@ -1522,9 +1494,8 @@
+ fCurrentEntity.lineNumber++;
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+- invokeListeners(0);
+ fCurrentEntity.ch[0] = (char)c;
+- entityChanged = load(1, true);
++ entityChanged = load(1, true, true);
+ if (!entityChanged){
+ // the load change the position to be 1,
+ // need to restore it when entity not changed
+@@ -1549,8 +1520,7 @@
+ }
+
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- invokeListeners(0);
+- load(0, true);
++ load(0, true, true);
+
+ //we are doing this check only in skipSpace() because it is called by
+ //fMiscDispatcher and we want the parser to exit gracefully when document
+@@ -1626,7 +1596,7 @@
+ if((fCurrentEntity.count - fCurrentEntity.position) < length){
+ int pos = fCurrentEntity.position;
+ invokeListeners(pos);
+- entityChanged = load(fCurrentEntity.count, changeEntity);
++ entityChanged = load(fCurrentEntity.count, changeEntity, false);
+ fCurrentEntity.position = pos;
+ if(entityChanged)break;
+ }
+@@ -1731,17 +1701,22 @@
+ * the current entity in place and the entity
+ * boundary will be signaled by the return
+ * value.
++ * @param notify Determine whether to notify listeners of
++ * the event
+ *
+ * @returns Returns true if the entity changed as a result of this
+ * load operation.
+ */
+- final boolean load(int offset, boolean changeEntity)
++ final boolean load(int offset, boolean changeEntity, boolean notify)
+ throws IOException {
+ if (DEBUG_BUFFER) {
+ System.out.print("(load, "+offset+": ");
+ print();
+ System.out.println();
+ }
++ if (notify) {
++ invokeListeners(offset);
++ }
+ //maintaing the count till last load
+ fCurrentEntity.fTotalCountTillLastLoad = fCurrentEntity.fTotalCountTillLastLoad + fCurrentEntity.fLastCount ;
+ // read characters
+@@ -1778,7 +1753,7 @@
+ }
+ // handle the trailing edges
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, false);
+ }
+ }
+
+@@ -2075,7 +2050,7 @@
+ *
+ * @param loadPos Starting position from which new data is being loaded into scanner buffer.
+ */
+- private void invokeListeners(int loadPos){
++ public void invokeListeners(int loadPos){
+ for(int i=0;i<listeners.size();i++){
+ XMLBufferListener listener =(XMLBufferListener) listeners.get(i);
+ listener.refresh(loadPos);
+@@ -2108,7 +2083,7 @@
+
+ // load more characters, if needed
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, false);
+ }
+
+ // skip spaces
+@@ -2123,7 +2098,7 @@
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+ fCurrentEntity.ch[0] = (char)c;
+- entityChanged = load(1, true);
++ entityChanged = load(1, true, false);
+ if (!entityChanged)
+ // the load change the position to be 1,
+ // need to restore it when entity not changed
+@@ -2151,7 +2126,7 @@
+ if (!entityChanged)
+ fCurrentEntity.position++;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+- load(0, true);
++ load(0, true, false);
+ }
+ } while (XMLChar.isSpace(c = fCurrentEntity.ch[fCurrentEntity.position]));
+ if (DEBUG_BUFFER) {
+--- ./jaxws/.hgtags Wed Jun 25 09:03:17 2014 -0700
++++ ./jaxws/.hgtags Mon Sep 08 12:16:05 2014 -0700
+@@ -420,6 +420,7 @@
+ 3b0da73591b1ea23c48aa7babc34ed776fc183f0 jdk7u55-b13
+ 5d726bf8fedc1f10d250e980653315919b7602f2 jdk7u55-b30
+ 81d0f297557c4a876727cabeb2bfcdf066a1fc9d jdk7u55-b14
++f616603ab693f6629c2994f6006ed4a21a428d8e jdk7u55-b15
+ 2d103c97c9bd0b3357e6d5e2b5b9ffb64c271288 jdk7u55-b31
+ b15b4084288fa4ea9caf7f6b4e79d164c77bb1d6 jdk7u55-b32
+ efd71c6ca0832e894b7e1619111860062fa96458 jdk7u55-b33
+@@ -468,3 +469,36 @@
+ 198bf1acd262f2c16715d3be5e33d7b8de1e7776 jdk7u65-b16
+ df4dc644fe344e973fc1692c28683eec8ba82600 jdk7u65-b17
+ 0e0ca87a6d5212a0885f0c8c00b8f7cf24a64d89 jdk7u65-b30
++dedfc93eeb5f4b28ad1a91902a0676aef0937e42 jdk7u65-b18
++db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b19
++0cd66509e11335fac490076cbdcb2f47c592de86 jdk7u65-b32
++28d868d40df0d420b87698e1215e5039d24a8ae5 jdk7u65-b20
++1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01
++db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b40
++190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31
++6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33
++d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00
++1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01
++04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09
++73d97ba8b2d94c904f2b087b9f28664eb19e9ce2 jdk7u66-b10
++7ecf8d9df00c185f381fa8cb92ea66fe1e5798ca jdk7u66-b11
++9ac1d99f712a04548d7e5d784f06c87e35023080 jdk7u66-b12
++f562dd8fb2b211a11b9a84849995d61b541723c3 jdk7u66-b13
++ae584331109f291e03af72cc9fcbbe5f8f789ab1 jdk7u66-b14
++36461c772d3101a8cb1eca16a9c81ed53218a4c9 jdk7u66-b15
++19ed8a653a3e8c6536fd1090c14f93e690eda7a3 jdk7u66-b16
++ea1e6f01f95c9a0984378643754d0f493bfa4484 jdk7u66-b17
++6092d0059338df25e82fbc69cc749b95e2565547 jdk7u71-b00
++814a3f0bb13071666375dd35bab7c9cc44c62448 jdk7u71-b01
++ba22fdc22c0410b91f6f992e480d9e8b4c5e85d0 jdk7u71-b02
++30edf4d8760f96b420bd40a2d9552826435356d4 jdk7u71-b03
++22cc8b125a119f9c23d0e81fc6627af330a27e4a jdk7u71-b04
++f612dbc0589894463f569fba245a98f842182d7a jdk7u71-b05
++15bdfc8b209a7c5b4e06907df11d3f795d326c14 jdk7u71-b06
++26ad03c06f31c516329059c5f053330570455887 jdk7u71-b07
++8d9d92a8e6d8610994d1596961395a4ce2bc5a69 jdk7u71-b08
++9ad7bbe28aecaf22c4f5c9ab905207ae963ec2c2 jdk7u71-b09
++32406b446fd458c6d0d8bd610eeb12d96a5f20a4 jdk7u71-b10
++b37043cee55ed025b04a3420908897e69c6c687f jdk7u71-b11
++3a432d7f01ed998ee6ca2ed04e818849a3d1e0c7 jdk7u71-b12
++9dd0dea849dd2550b58346977d9111717c1f38b2 jdk7u71-b13
+--- ./jdk/.hgtags Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/.hgtags Mon Sep 08 12:16:34 2014 -0700
+@@ -404,6 +404,7 @@
+ 92fd166252c2701092a510002f4cf9285a20473d jdk7u55-b13
+ 4a5651c84b1e6cf26dc9b19f00747e5004efba68 jdk7u55-b30
+ ffd99c5975217a14609851602c5f5dc005234aba jdk7u55-b14
++a015a0971dacd536f1ab92bf9bcf0dafb7684e61 jdk7u55-b15
+ 88f1bf248cc520e0bf7ef17bc862f87aab958373 jdk7u55-b31
+ b83f5194edf23b752fe2c0a9be361455f87196df jdk7u55-b32
+ 01a4cd03a6c85abb62eb5d1c2b5bf7d2f544c04e jdk7u55-b33
+@@ -452,3 +453,36 @@
+ 190017413768f02addea8b2c5106157e3c4076c7 jdk7u65-b16
+ 23e78e36bc39f4f761ac2b0e055c562c3ff204f5 jdk7u65-b17
+ 96d1fa382dda17ae105f28083bda41f79fc3093f jdk7u65-b30
++7f7430459adfe7b7fb65da8c3fac2ac5e3495ea1 jdk7u65-b18
++ba6cef21c369076be97dd8133fd4a158cd486bd8 jdk7u65-b19
++c3a56021fc22f886106f123d4f25b385ac6b79d7 jdk7u65-b32
++8b9d926bd35adceb99f244b7b068fedb0f220f03 jdk7u65-b20
++5cf343beab2ce73d299d4f1a8f3b95892f9fd818 jdk7u67-b01
++ba6cef21c369076be97dd8133fd4a158cd486bd8 jdk7u65-b40
++7b47a34063e94e1ab5636b11231d33fae92754c9 jdk7u65-b31
++4cb63f8ca9ee8c60d6f3d0051b69acc8392bd8de jdk7u65-b33
++9ccfe70cee626ac7831cfa7b7a7eb7a88fe1cd42 jdk7u66-b00
++fc87b55d62fc1e81aaf61ff21175129b8ccc302e jdk7u66-b01
++c67e394e49429565540f04c5c2a5544f750658bb jdk7u66-b09
++257fd79cdef52511db18e1bab8967d94a03920bc jdk7u66-b10
++6f38c929df1b9d6df7760b2eb9bf3e4681a27c56 jdk7u66-b11
++d4f0008cdf6d3ec8e8e210c03e55aaa751647e8d jdk7u66-b12
++24b7c3d0942766af3415dd6125b9b8da059dbccc jdk7u66-b13
++74d01c3385b915490255cd7467a3740aa3dce310 jdk7u66-b14
++07fc91c550da6ba689e3abc9e688edcb73f9c95c jdk7u66-b15
++d4814cafa25f5b076be9e99be2a8c0d98929476d jdk7u66-b16
++69adfb3ccee5373438a6c394646c2c5ab93c89ee jdk7u66-b17
++ee0cedc50d3250edf24e96aecc785580dd61944f jdk7u71-b00
++6c865d8ab14093e4ef95e7c548c432e4bf887760 jdk7u71-b01
++829ca47df2ced2d0dc330391bf7578363369b92b jdk7u71-b02
++5b9e9506bd57763c958ea6fcff99b03d47942b9d jdk7u71-b03
++347bc2b7831097ea373ef7be72bfbf0ba3de4b7f jdk7u71-b04
++3019595da91688c79f617cf737431a2acee3ef71 jdk7u71-b05
++0a05fabc719fe6c1ed02678d255f1250b32c30ed jdk7u71-b06
++48db48aab05e47cafc37b277f68a0e2ff5f1f0b6 jdk7u71-b07
++9ff013674339cb269280bfb4eaba40bba0584c40 jdk7u71-b08
++7e47a971eff7d78a459c23ee0d44b8f6c6c4c812 jdk7u71-b09
++919e84964279a058da2c8d4088c570c19543979f jdk7u71-b10
++1108ab8e3dce0318529b4bcda46ce895659bb09b jdk7u71-b11
++ae4e88c495851c43862e2fc3d1ff7b64c68f368c jdk7u71-b12
++a6cbc82d62f915cdcd6037c8b40a4590585553c7 jdk7u71-b13
+--- ./jdk/make/java/net/FILES_c.gmk Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/make/java/net/FILES_c.gmk Mon Sep 08 12:16:34 2014 -0700
+@@ -24,6 +24,7 @@
+ #
+
+ FILES_c = \
++ AbstractPlainDatagramSocketImpl.c \
+ DatagramPacket.c \
+ InetAddress.c \
+ Inet4Address.c \
+--- ./jdk/make/java/net/mapfile-vers Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/make/java/net/mapfile-vers Mon Sep 08 12:16:34 2014 -0700
+@@ -28,6 +28,8 @@
+ SUNWprivate_1.1 {
+ global:
+ JNI_OnLoad;
++ Java_java_net_AbstractPlainDatagramSocketImpl_init;
++ Java_java_net_AbstractPlainDatagramSocketImpl_dataAvailable;
+ Java_java_net_PlainSocketImpl_socketListen;
+ Java_java_net_PlainDatagramSocketImpl_getTTL;
+ Java_java_net_PlainDatagramSocketImpl_init;
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Sep 08 12:16:34 2014 -0700
+@@ -580,7 +580,12 @@
+ if (visible) {
+ // Apply the extended state as expected in shared code
+ if (target instanceof Frame) {
+- switch (((Frame)target).getExtendedState()) {
++ int frameState = ((Frame)target).getExtendedState();
++ if ((frameState & Frame.ICONIFIED) != 0) {
++ // Treat all state bit masks with ICONIFIED bit as ICONIFIED state.
++ frameState = Frame.ICONIFIED;
++ }
++ switch (frameState) {
+ case Frame.ICONIFIED:
+ CWrapper.NSWindow.miniaturize(nsWindowPtr);
+ break;
+@@ -806,6 +811,10 @@
+ if (prevWindowState == windowState) return;
+
+ final long nsWindowPtr = getNSWindowPtr();
++ if ((windowState & Frame.ICONIFIED) != 0) {
++ // Treat all state bit masks with ICONIFIED bit as ICONIFIED state.
++ windowState = Frame.ICONIFIED;
++ }
+ switch (windowState) {
+ case Frame.ICONIFIED:
+ if (prevWindowState == Frame.MAXIMIZED_BOTH) {
+--- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties Mon Sep 08 12:16:34 2014 -0700
+@@ -44,7 +44,7 @@
+ popupmenu=\u5373\u73FE\u5F0F\u529F\u80FD\u8868
+ progressbar=\u9032\u5EA6\u5217
+ pushbutton=\u4E0B\u58D3\u6309\u9215
+-radiobutton=\u55AE\u9078\u9215
++radiobutton=\u5713\u9215
+ rootpane=root \u7A97\u683C
+ rowheader=\u5217\u6A19\u984C
+ scrollbar=\u6372\u8EF8
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties Mon Sep 08 12:16:34 2014 -0700
+@@ -22,7 +22,7 @@
+ FileChooser.saveInLabel.textAndMnemonic=Spara i:
+ FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
+ FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
+-FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typ:
++FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typen:
+ FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+ FileChooser.upFolderAccessibleName=Upp
+ FileChooser.homeFolderToolTip.textAndMnemonic=Hem
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java Mon Sep 08 12:16:34 2014 -0700
+@@ -25,6 +25,8 @@
+ import java.io.InputStream;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
++import java.security.PrivilegedActionException;
++import java.security.PrivilegedExceptionAction;
+ import java.util.ArrayList;
+ import java.util.List;
+
+@@ -35,6 +37,7 @@
+ import com.sun.org.apache.xml.internal.security.algorithms.JCEMapper;
+ import com.sun.org.apache.xml.internal.security.algorithms.SignatureAlgorithm;
+ import com.sun.org.apache.xml.internal.security.c14n.Canonicalizer;
++import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
+ import com.sun.org.apache.xml.internal.security.keys.keyresolver.KeyResolver;
+ import com.sun.org.apache.xml.internal.security.transforms.Transform;
+ import com.sun.org.apache.xml.internal.security.utils.ElementProxy;
+@@ -118,43 +121,50 @@
+ log.log(java.util.logging.Level.FINE, "Registering default algorithms");
+ }
+ try {
+- //
+- // Bind the default prefixes
+- //
+- ElementProxy.registerDefaultPrefixes();
++ AccessController.doPrivileged(new PrivilegedExceptionAction<Void>(){
++ @Override public Void run() throws XMLSecurityException {
++ //
++ // Bind the default prefixes
++ //
++ ElementProxy.registerDefaultPrefixes();
+
+- //
+- // Set the default Transforms
+- //
+- Transform.registerDefaultAlgorithms();
++ //
++ // Set the default Transforms
++ //
++ Transform.registerDefaultAlgorithms();
+
+- //
+- // Set the default signature algorithms
+- //
+- SignatureAlgorithm.registerDefaultAlgorithms();
++ //
++ // Set the default signature algorithms
++ //
++ SignatureAlgorithm.registerDefaultAlgorithms();
+
+- //
+- // Set the default JCE algorithms
+- //
+- JCEMapper.registerDefaultAlgorithms();
++ //
++ // Set the default JCE algorithms
++ //
++ JCEMapper.registerDefaultAlgorithms();
+
+- //
+- // Set the default c14n algorithms
+- //
+- Canonicalizer.registerDefaultAlgorithms();
++ //
++ // Set the default c14n algorithms
++ //
++ Canonicalizer.registerDefaultAlgorithms();
+
+- //
+- // Register the default resolvers
+- //
+- ResourceResolver.registerDefaultResolvers();
++ //
++ // Register the default resolvers
++ //
++ ResourceResolver.registerDefaultResolvers();
+
+- //
+- // Register the default key resolvers
+- //
+- KeyResolver.registerDefaultResolvers();
+- } catch (Exception ex) {
+- log.log(java.util.logging.Level.SEVERE, ex.getMessage(), ex);
+- ex.printStackTrace();
++ //
++ // Register the default key resolvers
++ //
++ KeyResolver.registerDefaultResolvers();
++
++ return null;
++ }
++ });
++ } catch (PrivilegedActionException ex) {
++ XMLSecurityException xse = (XMLSecurityException)ex.getException();
++ log.log(java.util.logging.Level.SEVERE, xse.getMessage(), xse);
++ xse.printStackTrace();
+ }
+ }
+
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java Mon Sep 08 12:16:34 2014 -0700
+@@ -27,6 +27,7 @@
+
+ import com.sun.org.apache.xml.internal.security.encryption.XMLCipher;
+ import com.sun.org.apache.xml.internal.security.signature.XMLSignature;
++import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
+ import org.w3c.dom.Element;
+
+
+@@ -49,8 +50,11 @@
+ *
+ * @param id
+ * @param algorithm
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the JCE algorithm
+ */
+ public static void register(String id, Algorithm algorithm) {
++ JavaUtils.checkRegisterPermission();
+ algorithmsMap.put(id, algorithm);
+ }
+
+@@ -264,8 +268,11 @@
+ /**
+ * Sets the default Provider for obtaining the security algorithms
+ * @param provider the default providerId.
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to set the JCE provider
+ */
+ public static void setProviderId(String provider) {
++ JavaUtils.checkRegisterPermission();
+ providerName = provider;
+ }
+
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java Mon Sep 08 12:16:34 2014 -0700
+@@ -37,6 +37,7 @@
+ import com.sun.org.apache.xml.internal.security.signature.XMLSignature;
+ import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
+ import com.sun.org.apache.xml.internal.security.utils.Constants;
++import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
+ import org.w3c.dom.Attr;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+@@ -314,18 +315,21 @@
+ }
+
+ /**
+- * Registers implementing class of the Transform algorithm with algorithmURI
++ * Registers implementing class of the SignatureAlgorithm with algorithmURI
+ *
+- * @param algorithmURI algorithmURI URI representation of <code>Transform algorithm</code>.
++ * @param algorithmURI algorithmURI URI representation of <code>SignatureAlgorithm</code>.
+ * @param implementingClass <code>implementingClass</code> the implementing class of
+ * {@link SignatureAlgorithmSpi}
+ * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
+ * @throws XMLSignatureException
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the signature algorithm
+ */
+ @SuppressWarnings("unchecked")
+ public static void register(String algorithmURI, String implementingClass)
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException,
+ XMLSignatureException {
++ JavaUtils.checkRegisterPermission();
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
+ }
+@@ -352,15 +356,18 @@
+ /**
+ * Registers implementing class of the Transform algorithm with algorithmURI
+ *
+- * @param algorithmURI algorithmURI URI representation of <code>Transform algorithm</code>.
++ * @param algorithmURI algorithmURI URI representation of <code>SignatureAlgorithm</code>.
+ * @param implementingClass <code>implementingClass</code> the implementing class of
+ * {@link SignatureAlgorithmSpi}
+ * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
+ * @throws XMLSignatureException
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the signature algorithm
+ */
+ public static void register(String algorithmURI, Class<? extends SignatureAlgorithmSpi> implementingClass)
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException,
+ XMLSignatureException {
++ JavaUtils.checkRegisterPermission();
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
+ }
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java Mon Sep 08 12:16:34 2014 -0700
+@@ -40,6 +40,7 @@
+ import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315OmitComments;
+ import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315WithComments;
+ import com.sun.org.apache.xml.internal.security.exceptions.AlgorithmAlreadyRegisteredException;
++import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
+@@ -136,10 +137,13 @@
+ * @param algorithmURI
+ * @param implementingClass
+ * @throws AlgorithmAlreadyRegisteredException
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the canonicalizer
+ */
+ @SuppressWarnings("unchecked")
+ public static void register(String algorithmURI, String implementingClass)
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException {
++ JavaUtils.checkRegisterPermission();
+ // check whether URI is already registered
+ Class<? extends CanonicalizerSpi> registeredClass =
+ canonicalizerHash.get(algorithmURI);
+@@ -160,9 +164,12 @@
+ * @param algorithmURI
+ * @param implementingClass
+ * @throws AlgorithmAlreadyRegisteredException
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the canonicalizer
+ */
+- public static void register(String algorithmURI, Class<CanonicalizerSpi> implementingClass)
++ public static void register(String algorithmURI, Class<? extends CanonicalizerSpi> implementingClass)
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException {
++ JavaUtils.checkRegisterPermission();
+ // check whether URI is already registered
+ Class<? extends CanonicalizerSpi> registeredClass = canonicalizerHash.get(algorithmURI);
+
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java Mon Sep 08 12:16:34 2014 -0700
+@@ -39,6 +39,7 @@
+ import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SKIResolver;
+ import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SubjectNameResolver;
+ import com.sun.org.apache.xml.internal.security.keys.storage.StorageResolver;
++import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
+ import org.w3c.dom.Element;
+ import org.w3c.dom.Node;
+
+@@ -172,9 +173,12 @@
+ * @throws InstantiationException
+ * @throws IllegalAccessException
+ * @throws ClassNotFoundException
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the key resolver
+ */
+ public static void register(String className, boolean globalResolver)
+ throws ClassNotFoundException, IllegalAccessException, InstantiationException {
++ JavaUtils.checkRegisterPermission();
+ KeyResolverSpi keyResolverSpi =
+ (KeyResolverSpi) Class.forName(className).newInstance();
+ keyResolverSpi.setGlobalResolver(globalResolver);
+@@ -192,8 +196,11 @@
+ *
+ * @param className
+ * @param globalResolver Whether the KeyResolverSpi is a global resolver or not
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the key resolver
+ */
+ public static void registerAtStart(String className, boolean globalResolver) {
++ JavaUtils.checkRegisterPermission();
+ KeyResolverSpi keyResolverSpi = null;
+ Exception ex = null;
+ try {
+@@ -225,11 +232,14 @@
+ *
+ * @param keyResolverSpi a KeyResolverSpi instance to register
+ * @param start whether to register the KeyResolverSpi at the start of the list or not
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the key resolver
+ */
+ public static void register(
+ KeyResolverSpi keyResolverSpi,
+ boolean start
+ ) {
++ JavaUtils.checkRegisterPermission();
+ KeyResolver resolver = new KeyResolver(keyResolverSpi);
+ if (start) {
+ resolverVector.add(0, resolver);
+@@ -251,9 +261,12 @@
+ * @throws InstantiationException
+ * @throws IllegalAccessException
+ * @throws ClassNotFoundException
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the key resolver
+ */
+ public static void registerClassNames(List<String> classNames)
+ throws ClassNotFoundException, IllegalAccessException, InstantiationException {
++ JavaUtils.checkRegisterPermission();
+ List<KeyResolver> keyResolverList = new ArrayList<KeyResolver>(classNames.size());
+ for (String className : classNames) {
+ KeyResolverSpi keyResolverSpi =
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java Mon Sep 08 12:16:34 2014 -0700
+@@ -46,6 +46,7 @@
+ import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXSLT;
+ import com.sun.org.apache.xml.internal.security.utils.Constants;
+ import com.sun.org.apache.xml.internal.security.utils.HelperNodeList;
++import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
+ import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
+ import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
+ import org.w3c.dom.Document;
+@@ -181,11 +182,14 @@
+ * class of {@link TransformSpi}
+ * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI
+ * is already registered
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the transform
+ */
+ @SuppressWarnings("unchecked")
+ public static void register(String algorithmURI, String implementingClass)
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException,
+ InvalidTransformException {
++ JavaUtils.checkRegisterPermission();
+ // are we already registered?
+ Class<? extends TransformSpi> transformSpi = transformSpiHash.get(algorithmURI);
+ if (transformSpi != null) {
+@@ -206,9 +210,12 @@
+ * class of {@link TransformSpi}
+ * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI
+ * is already registered
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register the transform
+ */
+ public static void register(String algorithmURI, Class<? extends TransformSpi> implementingClass)
+ throws AlgorithmAlreadyRegisteredException {
++ JavaUtils.checkRegisterPermission();
+ // are we already registered?
+ Class<? extends TransformSpi> transformSpi = transformSpiHash.get(algorithmURI);
+ if (transformSpi != null) {
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java Mon Sep 08 12:16:34 2014 -0700
+@@ -468,9 +468,12 @@
+ * @param namespace
+ * @param prefix
+ * @throws XMLSecurityException
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to set the default prefix
+ */
+ public static void setDefaultPrefix(String namespace, String prefix)
+ throws XMLSecurityException {
++ JavaUtils.checkRegisterPermission();
+ if (prefixMappings.containsValue(prefix)) {
+ String storedPrefix = prefixMappings.get(namespace);
+ if (!storedPrefix.equals(prefix)) {
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java Mon Sep 08 12:16:34 2014 -0700
+@@ -26,6 +26,7 @@
+ import java.io.FileOutputStream;
+ import java.io.IOException;
+ import java.io.InputStream;
++import java.security.SecurityPermission;
+
+ /**
+ * A collection of different, general-purpose methods for JAVA-specific things
+@@ -37,6 +38,10 @@
+ static java.util.logging.Logger log =
+ java.util.logging.Logger.getLogger(JavaUtils.class.getName());
+
++ private static final SecurityPermission REGISTER_PERMISSION =
++ new SecurityPermission(
++ "com.sun.org.apache.xml.internal.security.register");
++
+ private JavaUtils() {
+ // we don't allow instantiation
+ }
+@@ -128,4 +133,21 @@
+ refBytes = baos.toByteArray();
+ return refBytes;
+ }
++
++ /**
++ * Throws a {@code SecurityException} if a security manager is installed
++ * and the caller is not allowed to register an implementation of an
++ * algorithm, transform, or other security sensitive XML Signature function.
++ *
++ * @throws SecurityException if a security manager is installed and the
++ * caller has not been granted the
++ * {@literal "com.sun.org.apache.xml.internal.security.register"}
++ * {@code SecurityPermission}
++ */
++ public static void checkRegisterPermission() {
++ SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ sm.checkPermission(REGISTER_PERMISSION);
++ }
++ }
+ }
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java Mon Sep 08 12:16:34 2014 -0700
+@@ -79,16 +79,22 @@
+ /**
+ * Set the prefix for the digital signature namespace
+ * @param prefix the new prefix for the digital signature namespace
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to set the prefix
+ */
+ public static void setDsPrefix(String prefix) {
++ JavaUtils.checkRegisterPermission();
+ dsPrefix = prefix;
+ }
+
+ /**
+ * Set the prefix for the encryption namespace
+ * @param prefix the new prefix for the encryption namespace
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to set the prefix
+ */
+ public static void setXencPrefix(String prefix) {
++ JavaUtils.checkRegisterPermission();
+ xencPrefix = prefix;
+ }
+
+--- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java Mon Sep 08 12:16:34 2014 -0700
+@@ -27,6 +27,7 @@
+ import java.util.Map;
+
+ import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
++import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
+ import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverDirectHTTP;
+ import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverFragment;
+ import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverLocalFilesystem;
+@@ -192,9 +193,12 @@
+ * the class cannot be registered.
+ *
+ * @param className the name of the ResourceResolverSpi class to be registered
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register a resource resolver
+ */
+ @SuppressWarnings("unchecked")
+ public static void register(String className) {
++ JavaUtils.checkRegisterPermission();
+ try {
+ Class<ResourceResolverSpi> resourceResolverClass =
+ (Class<ResourceResolverSpi>) Class.forName(className);
+@@ -209,9 +213,12 @@
+ * list. This method logs a warning if the class cannot be registered.
+ *
+ * @param className the name of the ResourceResolverSpi class to be registered
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register a resource resolver
+ */
+ @SuppressWarnings("unchecked")
+ public static void registerAtStart(String className) {
++ JavaUtils.checkRegisterPermission();
+ try {
+ Class<ResourceResolverSpi> resourceResolverClass =
+ (Class<ResourceResolverSpi>) Class.forName(className);
+@@ -226,8 +233,11 @@
+ * cannot be registered.
+ * @param className
+ * @param start
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register a resource resolver
+ */
+ public static void register(Class<? extends ResourceResolverSpi> className, boolean start) {
++ JavaUtils.checkRegisterPermission();
+ try {
+ ResourceResolverSpi resourceResolverSpi = className.newInstance();
+ register(resourceResolverSpi, start);
+@@ -243,8 +253,11 @@
+ * cannot be registered.
+ * @param resourceResolverSpi
+ * @param start
++ * @throws SecurityException if a security manager is installed and the
++ * caller does not have permission to register a resource resolver
+ */
+ public static void register(ResourceResolverSpi resourceResolverSpi, boolean start) {
++ JavaUtils.checkRegisterPermission();
+ synchronized(resolverList) {
+ if (start) {
+ resolverList.add(0, new ResourceResolver(resourceResolverSpi));
+--- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties Mon Sep 08 12:16:34 2014 -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
+@@ -153,7 +153,7 @@
+ xmlrch.errmetadata = Erro ao definir metadados : {0}
+ xmlrch.errinsertval = Erro ao inserir valores : {0}
+ xmlrch.errconstr = Erro ao construir a linha : {0}
+-xmlrch.errdel = Erro ao deletar a linha : {0}
++xmlrch.errdel = Erro ao excluir a linha : {0}
+ xmlrch.errinsert = Erro ao construir a linha de inser\u00E7\u00E3o : {0}
+ xmlrch.errinsdel = Erro ao construir a linha insdel : {0}
+ xmlrch.errupdate = Erro ao construir a linha de atualiza\u00E7\u00E3o : {0}
+--- ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties Mon Sep 08 12:16:34 2014 -0700
+@@ -22,7 +22,7 @@
+ FileChooser.saveInLabel.textAndMnemonic=Spara i:
+ FileChooser.fileNameLabel.textAndMnemonic=&Fil:
+ FileChooser.folderNameLabel.textAndMnemonic=&Mapp:
+-FileChooser.filesOfTypeLabel.textAndMnemonic=Mapp&namn:
++FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typen:
+ FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+ FileChooser.upFolderAccessibleName=Upp
+ FileChooser.homeFolderToolTip.textAndMnemonic=Hem
+--- ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties Mon Sep 08 12:16:34 2014 -0700
+@@ -22,7 +22,7 @@
+ FileChooser.saveInLabel.textAndMnemonic=Spara i:
+ FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
+ FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
+-FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typ:
++FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typen:
+ FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+ FileChooser.upFolderAccessibleName=Upp
+ FileChooser.homeFolderToolTip.textAndMnemonic=Hem
+--- ./jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2010, 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
+@@ -82,7 +82,7 @@
+ {"Can only trace", "'methods'\u3001'method exit'\u307E\u305F\u306F'method exits'\u306E\u307F\u30C8\u30EC\u30FC\u30B9\u3067\u304D\u307E\u3059"},
+ {"cannot redefine existing connection", "{0}\u306F\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u518D\u5B9A\u7FA9\u3067\u304D\u307E\u305B\u3093"},
+ {"Cannot assign to a method invocation", "\u30E1\u30BD\u30C3\u30C9\u547C\u51FA\u3057\u306B\u5272\u5F53\u3066\u3067\u304D\u307E\u305B\u3093"},
+- {"Cannot specify command line with connector:", "\u30B3\u30CD\u30AF\u30BF\u3067\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093: {0}"},
++ {"Cannot specify command line with connector:", "\u30B3\u30CD\u30AF\u30BF\u3067\u30B3\u30DE\u30F3\u30C9\u884C\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093: {0}"},
+ {"Cannot specify target vm arguments with connector:", "\u30B3\u30CD\u30AF\u30BF\u3067\u30BF\u30FC\u30B2\u30C3\u30C8VM\u5F15\u6570\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093: {0}"},
+ {"Class containing field must be specified.", "\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u542B\u3080\u30AF\u30E9\u30B9\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
+ {"Class:", "\u30AF\u30E9\u30B9: {0}"},
+--- ./jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties Mon Sep 08 12:16:34 2014 -0700
+@@ -5,9 +5,9 @@
+ raw.command.label = \u30B3\u30DE\u30F3\u30C9
+ raw.address = raw\u30B3\u30DE\u30F3\u30C9\u5B9F\u884C\u5F8C\u306B\u63A5\u7D9A\u3092\u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30A2\u30C9\u30EC\u30B9
+ raw.address.label = \u30A2\u30C9\u30EC\u30B9
+-raw.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
++raw.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
+ raw.quote.label = \u5F15\u7528\u7B26
+-raw.description = \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
++raw.description = \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30B3\u30DE\u30F3\u30C9\u884C\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
+ sun.home = SDK\u306E\u30DB\u30FC\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u307E\u305F\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u8D77\u52D5\u306B\u4F7F\u7528\u3055\u308C\u308B\u5B9F\u884C\u74B0\u5883
+ sun.home.label = \u30DB\u30FC\u30E0
+ sun.options = \u8D77\u52D5\u3059\u308BVM\u306E\u30AA\u30D7\u30B7\u30E7\u30F3
+@@ -16,11 +16,11 @@
+ sun.main.label = \u30E1\u30A4\u30F3
+ sun.init_suspend = \u30E1\u30A4\u30F3\u306E\u5B9F\u884C\u524D\u306B\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3059\u3002
+ sun.init_suspend.label = \u4E2D\u65AD
+-sun.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
++sun.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
+ sun.quote.label = \u5F15\u7528\u7B26
+ sun.vm_exec = Java VM\u8D77\u52D5\u30C4\u30FC\u30EB\u540D
+ sun.vm_exec.label = \u8D77\u52D5\u30C4\u30FC\u30EB
+-sun.description = Sun\u306EJava VM\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
++sun.description = Sun\u306EJava VM\u30B3\u30DE\u30F3\u30C9\u884C\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
+ generic_attaching.address = VM\u306B\u63A5\u7D9A\u3059\u308B\u30A2\u30C9\u30EC\u30B9
+ generic_attaching.address.label = \u30A2\u30C9\u30EC\u30B9
+ generic_attaching.timeout = \u63A5\u7D9A\u3092\u5F85\u3064\u9593\u306E\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
+--- ./jdk/src/share/classes/java/lang/Class.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/lang/Class.java Mon Sep 08 12:16:34 2014 -0700
+@@ -187,8 +187,8 @@
+ @CallerSensitive
+ public static Class<?> forName(String className)
+ throws ClassNotFoundException {
+- return forName0(className, true,
+- ClassLoader.getClassLoader(Reflection.getCallerClass()));
++ Class<?> caller = Reflection.getCallerClass();
++ return forName0(className, true, ClassLoader.getClassLoader(caller), caller);
+ }
+
+
+@@ -257,22 +257,27 @@
+ ClassLoader loader)
+ throws ClassNotFoundException
+ {
+- if (loader == null) {
+- SecurityManager sm = System.getSecurityManager();
+- if (sm != null) {
+- ClassLoader ccl = ClassLoader.getClassLoader(Reflection.getCallerClass());
++ Class<?> caller = null;
++ SecurityManager sm = System.getSecurityManager();
++ if (sm != null) {
++ // Reflective call to get caller class is only needed if a security manager
++ // is present. Avoid the overhead of making this call otherwise.
++ caller = Reflection.getCallerClass();
++ if (loader == null) {
++ ClassLoader ccl = ClassLoader.getClassLoader(caller);
+ if (ccl != null) {
+ sm.checkPermission(
+ SecurityConstants.GET_CLASSLOADER_PERMISSION);
+ }
+ }
+ }
+- return forName0(name, initialize, loader);
++ return forName0(name, initialize, loader, caller);
+ }
+
+- /** Called after security checks have been made. */
++ /** Called after security check for system loader access checks have been made. */
+ private static native Class<?> forName0(String name, boolean initialize,
+- ClassLoader loader)
++ ClassLoader loader,
++ Class<?> caller)
+ throws ClassNotFoundException;
+
+ /**
+--- ./jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Mon Sep 08 12:16:34 2014 -0700
+@@ -661,6 +661,12 @@
+ refKind = REF_invokeVirtual;
+ }
+
++ if (member.getDeclaringClass().isInterface() && refKind == REF_invokeVirtual) {
++ // Methods from Object declared in an interface can be resolved by JVM to invokevirtual kind.
++ // Need to convert it back to invokeinterface to pass verification and make the invocation works as expected.
++ refKind = REF_invokeInterface;
++ }
++
+ // push arguments
+ for (int i = 0; i < name.arguments.length; i++) {
+ emitPushArgument(name, i);
+--- ./jdk/src/share/classes/java/lang/invoke/MethodHandle.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandle.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1260,8 +1260,6 @@
+ /*non-public*/
+ MethodHandle viewAsType(MethodType newType) {
+ // No actual conversions, just a new view of the same method.
+- if (!type.isViewableAs(newType))
+- throw new InternalError();
+ return MethodHandleImpl.makePairwiseConvert(this, newType, 0);
+ }
+
+--- ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1268,9 +1268,30 @@
+ int allowedModes = this.allowedModes;
+ if (allowedModes == TRUSTED) return;
+ int mods = m.getModifiers();
+- if (Modifier.isProtected(mods) && refKind == REF_newInvokeSpecial) {
+- // cannot "new" a protected ctor in a different package
+- mods ^= Modifier.PROTECTED;
++ if (Modifier.isProtected(mods)) {
++ if (refKind == REF_invokeVirtual &&
++ m.getDeclaringClass() == Object.class &&
++ m.getName().equals("clone") &&
++ refc.isArray()) {
++ // The JVM does this hack also.
++ // (See ClassVerifier::verify_invoke_instructions
++ // and LinkResolver::check_method_accessability.)
++ // Because the JVM does not allow separate methods on array types,
++ // there is no separate method for int[].clone.
++ // All arrays simply inherit Object.clone.
++ // But for access checking logic, we make Object.clone
++ // (normally protected) appear to be public.
++ // Later on, when the DirectMethodHandle is created,
++ // its leading argument will be restricted to the
++ // requested array type.
++ // N.B. The return type is not adjusted, because
++ // that is *not* the bytecode behavior.
++ mods ^= Modifier.PROTECTED | Modifier.PUBLIC;
++ }
++ if (refKind == REF_newInvokeSpecial) {
++ // cannot "new" a protected ctor in a different package
++ mods ^= Modifier.PROTECTED;
++ }
+ }
+ if (Modifier.isFinal(mods) &&
+ MethodHandleNatives.refKindIsSetter(refKind))
+--- ./jdk/src/share/classes/java/lang/invoke/MethodType.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/lang/invoke/MethodType.java Mon Sep 08 12:16:34 2014 -0700
+@@ -628,7 +628,7 @@
+ * @return the parameter types (as an immutable list)
+ */
+ public List<Class<?>> parameterList() {
+- return Collections.unmodifiableList(Arrays.asList(ptypes));
++ return Collections.unmodifiableList(Arrays.asList(ptypes.clone()));
+ }
+
+ /*non-public*/ Class<?> lastParameterType() {
+--- ./jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Mon Sep 08 12:16:34 2014 -0700
+@@ -70,6 +70,7 @@
+ static {
+ java.security.AccessController.doPrivileged(
+ new sun.security.action.LoadLibraryAction("net"));
++ init();
+ }
+
+ /**
+@@ -362,4 +363,7 @@
+ protected boolean nativeConnectDisabled() {
+ return connectDisabled;
+ }
++
++ native int dataAvailable();
++ private static native void init();
+ }
+--- ./jdk/src/share/classes/java/net/DatagramSocket.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/net/DatagramSocket.java Mon Sep 08 12:16:34 2014 -0700
+@@ -85,6 +85,17 @@
+ */
+ boolean oldImpl = false;
+
++ /**
++ * Set when a socket is ST_CONNECTED until we are certain
++ * that any packets which might have been received prior
++ * to calling connect() but not read by the application
++ * have been read. During this time we check the source
++ * address of all packets received to be sure they are from
++ * the connected destination. Other packets are read but
++ * silently dropped.
++ */
++ private boolean explicitFilter = false;
++ private int bytesLeftToFilter;
+ /*
+ * Connection state:
+ * ST_NOT_CONNECTED = socket not connected
+@@ -144,6 +155,15 @@
+
+ // socket is now connected by the impl
+ connectState = ST_CONNECTED;
++ // Do we need to filter some packets?
++ int avail = getImpl().dataAvailable();
++ if (avail == -1) {
++ throw new SocketException();
++ }
++ explicitFilter = avail > 0;
++ if (explicitFilter) {
++ bytesLeftToFilter = getReceiveBufferSize();
++ }
+ } catch (SocketException se) {
+
+ // connection will be emulated by DatagramSocket
+@@ -494,6 +514,7 @@
+ connectedAddress = null;
+ connectedPort = -1;
+ connectState = ST_NOT_CONNECTED;
++ explicitFilter = false;
+ }
+ }
+
+@@ -752,10 +773,13 @@
+ } // end of while
+ }
+ }
+- if (connectState == ST_CONNECTED_NO_IMPL) {
++ DatagramPacket tmp = null;
++ if ((connectState == ST_CONNECTED_NO_IMPL) || explicitFilter) {
+ // We have to do the filtering the old fashioned way since
+ // the native impl doesn't support connect or the connect
+- // via the impl failed.
++ // via the impl failed, or .. "explicitFilter" may be set when
++ // a socket is connected via the impl, for a period of time
++ // when packets from other sources might be queued on socket.
+ boolean stop = false;
+ while (!stop) {
+ InetAddress peekAddress = null;
+@@ -774,8 +798,14 @@
+ if ((!connectedAddress.equals(peekAddress)) ||
+ (connectedPort != peekPort)) {
+ // throw the packet away and silently continue
+- DatagramPacket tmp = new DatagramPacket(new byte[1], 1);
++ tmp = new DatagramPacket(
++ new byte[1024], 1024);
+ getImpl().receive(tmp);
++ if (explicitFilter) {
++ if (checkFiltering(tmp)) {
++ stop = true;
++ }
++ }
+ } else {
+ stop = true;
+ }
+@@ -784,9 +814,23 @@
+ // If the security check succeeds, or the datagram is
+ // connected then receive the packet
+ getImpl().receive(p);
++ if (explicitFilter && tmp == null) {
++ // packet was not filtered, account for it here
++ checkFiltering(p);
++ }
+ }
+ }
+
++ // Update the filter information and return true if finished
++ private boolean checkFiltering(DatagramPacket p) throws SocketException {
++ bytesLeftToFilter -= p.getLength();
++ if (bytesLeftToFilter <= 0 || getImpl().dataAvailable() <= 0) {
++ explicitFilter = false;
++ return true;
++ }
++ return false;
++ }
++
+ /**
+ * Gets the local address to which the socket is bound.
+ *
+--- ./jdk/src/share/classes/java/net/DatagramSocketImpl.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/net/DatagramSocketImpl.java Mon Sep 08 12:16:34 2014 -0700
+@@ -47,6 +47,12 @@
+ */
+ protected FileDescriptor fd;
+
++ int dataAvailable() {
++ // default impl returns zero, which disables the calling
++ // functionality
++ return 0;
++ }
++
+ /**
+ * Creates a datagram socket.
+ * @exception SocketException if there is an error in the
+--- ./jdk/src/share/classes/java/security/DigestOutputStream.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/security/DigestOutputStream.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 1999, 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
+@@ -112,10 +112,10 @@
+ * @see MessageDigest#update(byte)
+ */
+ public void write(int b) throws IOException {
++ out.write(b);
+ if (on) {
+ digest.update((byte)b);
+ }
+- out.write(b);
+ }
+
+ /**
+@@ -142,10 +142,10 @@
+ * @see MessageDigest#update(byte[], int, int)
+ */
+ public void write(byte[] b, int off, int len) throws IOException {
++ out.write(b, off, len);
+ if (on) {
+ digest.update(b, off, len);
+ }
+- out.write(b, off, len);
+ }
+
+ /**
+--- ./jdk/src/share/classes/java/security/Signature.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/security/Signature.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2012, 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
+@@ -589,6 +589,9 @@
+ if (outbuf == null) {
+ throw new IllegalArgumentException("No output buffer given");
+ }
++ if (offset < 0 || len < 0) {
++ throw new IllegalArgumentException("offset or len is less than 0");
++ }
+ if (outbuf.length - offset < len) {
+ throw new IllegalArgumentException
+ ("Output buffer too small for specified offset and length");
+@@ -657,9 +660,16 @@
+ public final boolean verify(byte[] signature, int offset, int length)
+ throws SignatureException {
+ if (state == VERIFY) {
+- if ((signature == null) || (offset < 0) || (length < 0) ||
+- (length > signature.length - offset)) {
+- throw new IllegalArgumentException("Bad arguments");
++ if (signature == null) {
++ throw new IllegalArgumentException("signature is null");
++ }
++ if (offset < 0 || length < 0) {
++ throw new IllegalArgumentException
++ ("offset or length is less than 0");
++ }
++ if (signature.length - offset < length) {
++ throw new IllegalArgumentException
++ ("signature too small for specified offset and length");
+ }
+
+ return engineVerify(signature, offset, length);
+@@ -712,6 +722,16 @@
+ public final void update(byte[] data, int off, int len)
+ throws SignatureException {
+ if (state == SIGN || state == VERIFY) {
++ if (data == null) {
++ throw new IllegalArgumentException("data is null");
++ }
++ if (off < 0 || len < 0) {
++ throw new IllegalArgumentException("off or len is less than 0");
++ }
++ if (data.length - off < len) {
++ throw new IllegalArgumentException
++ ("data too small for specified offset and length");
++ }
+ engineUpdate(data, off, len);
+ } else {
+ throw new SignatureException("object not initialized for "
+--- ./jdk/src/share/classes/java/security/cert/CertificateRevokedException.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/security/cert/CertificateRevokedException.java Mon Sep 08 12:16:34 2014 -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
+@@ -95,7 +95,10 @@
+ this.revocationDate = new Date(revocationDate.getTime());
+ this.reason = reason;
+ this.authority = authority;
+- this.extensions = new HashMap(extensions);
++ // make sure Map only contains correct types
++ this.extensions = Collections.checkedMap(new HashMap<String, Extension>(),
++ String.class, Extension.class);
++ this.extensions.putAll(extensions);
+ }
+
+ /**
+@@ -174,7 +177,8 @@
+ public String getMessage() {
+ return "Certificate has been revoked, reason: "
+ + reason + ", revocation date: " + revocationDate
+- + ", authority: " + authority + ", extensions: " + extensions;
++ + ", authority: " + authority + ", extension OIDs: "
++ + extensions.keySet();
+ }
+
+ /**
+--- ./jdk/src/share/classes/java/util/ResourceBundle.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/util/ResourceBundle.java Mon Sep 08 12:16:34 2014 -0700
+@@ -2577,7 +2577,10 @@
+ } catch (ClassNotFoundException e) {
+ }
+ } else if (format.equals("java.properties")) {
+- final String resourceName = toResourceName(bundleName, "properties");
++ final String resourceName = toResourceName0(bundleName, "properties");
++ if (resourceName == null) {
++ return bundle;
++ }
+ final ClassLoader classLoader = loader;
+ final boolean reloadFlag = reload;
+ InputStream stream = null;
+@@ -2731,7 +2734,10 @@
+ }
+ boolean result = false;
+ try {
+- String resourceName = toResourceName(toBundleName(baseName, locale), format);
++ String resourceName = toResourceName0(toBundleName(baseName, locale), format);
++ if (resourceName == null) {
++ return result;
++ }
+ URL url = loader.getResource(resourceName);
+ if (url != null) {
+ long lastModified = 0;
+@@ -2865,6 +2871,15 @@
+ sb.append(bundleName.replace('.', '/')).append('.').append(suffix);
+ return sb.toString();
+ }
++
++ private String toResourceName0(String bundleName, String suffix) {
++ // application protocol check
++ if (bundleName.contains("://")) {
++ return null;
++ } else {
++ return toResourceName(bundleName, suffix);
++ }
++ }
+ }
+
+ private static class SingleFormatControl extends Control {
+--- ./jdk/src/share/classes/java/util/logging/LogRecord.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/util/logging/LogRecord.java Mon Sep 08 12:16:34 2014 -0700
+@@ -510,7 +510,13 @@
+ // If necessary, try to regenerate the resource bundle.
+ if (resourceBundleName != null) {
+ try {
+- resourceBundle = ResourceBundle.getBundle(resourceBundleName);
++ // use system class loader to ensure the ResourceBundle
++ // instance is a different instance than null loader uses
++ final ResourceBundle bundle =
++ ResourceBundle.getBundle(resourceBundleName,
++ Locale.getDefault(),
++ ClassLoader.getSystemClassLoader());
++ resourceBundle = bundle;
+ } catch (MissingResourceException ex) {
+ // This is not a good place to throw an exception,
+ // so we simply leave the resourceBundle null.
+--- ./jdk/src/share/classes/java/util/logging/Logger.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/java/util/logging/Logger.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2013, 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
+@@ -1526,6 +1526,9 @@
+ }
+
+ setCallersClassLoaderRef(callersClass);
++ if (isSystemLogger && getCallersClassLoader() != null) {
++ checkPermission();
++ }
+ if (findResourceBundle(name, true) == null) {
+ // We've failed to find an expected ResourceBundle.
+ // unset the caller's ClassLoader since we were unable to find the
+@@ -1689,7 +1692,9 @@
+ Logger target = this;
+ while (target != null) {
+ final String rbn = isSystemLogger
+- ? target.resourceBundleName
++ // ancestor of a system logger is expected to be a system logger.
++ // ignore resource bundle name if it's not.
++ ? (target.isSystemLogger ? target.resourceBundleName : null)
+ : target.getResourceBundleName();
+ if (rbn != null) {
+ return rbn;
+--- ./jdk/src/share/classes/javax/crypto/CipherInputStream.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/javax/crypto/CipherInputStream.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2007, 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,6 +86,10 @@
+ private int ostart = 0;
+ // the offset pointing to the last "new" byte
+ private int ofinish = 0;
++ // stream status
++ private boolean closed = false;
++ // The stream has been read from. False if the stream has never been read.
++ private boolean read = false;
+
+ /**
+ * private convenience function.
+@@ -101,13 +105,15 @@
+ private int getMoreData() throws IOException {
+ if (done) return -1;
+ int readin = input.read(ibuffer);
++ read = true;
+ if (readin == -1) {
+ done = true;
+ try {
+ obuffer = cipher.doFinal();
++ } catch (IllegalBlockSizeException | BadPaddingException e) {
++ obuffer = null;
++ throw new IOException(e);
+ }
+- catch (IllegalBlockSizeException e) {obuffer = null;}
+- catch (BadPaddingException e) {obuffer = null;}
+ if (obuffer == null)
+ return -1;
+ else {
+@@ -118,7 +124,10 @@
+ }
+ try {
+ obuffer = cipher.update(ibuffer, 0, readin);
+- } catch (IllegalStateException e) {obuffer = null;};
++ } catch (IllegalStateException e) {
++ obuffer = null;
++ throw e;
++ }
+ ostart = 0;
+ if (obuffer == null)
+ ofinish = 0;
+@@ -293,14 +302,24 @@
+ * @since JCE1.2
+ */
+ public void close() throws IOException {
++ if (closed) {
++ return;
++ }
++
++ closed = true;
+ input.close();
+ try {
+ // throw away the unprocessed data
+- cipher.doFinal();
++ if (!done) {
++ cipher.doFinal();
++ }
+ }
+- catch (BadPaddingException ex) {
+- }
+- catch (IllegalBlockSizeException ex) {
++ catch (BadPaddingException | IllegalBlockSizeException ex) {
++ /* If no data has been read from the stream to be en/decrypted,
++ we supress any exceptions, and close quietly. */
++ if (read) {
++ throw new IOException(ex);
++ }
+ }
+ ostart = 0;
+ ofinish = 0;
+--- ./jdk/src/share/classes/javax/crypto/CipherOutputStream.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/javax/crypto/CipherOutputStream.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2007, 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
+@@ -74,6 +74,9 @@
+ // the buffer holding data ready to be written out
+ private byte[] obuffer;
+
++ // stream status
++ private boolean closed = false;
++
+ /**
+ *
+ * Constructs a CipherOutputStream from an OutputStream and a
+@@ -198,11 +201,14 @@
+ * @since JCE1.2
+ */
+ public void close() throws IOException {
++ if (closed) {
++ return;
++ }
++
++ closed = true;
+ try {
+ obuffer = cipher.doFinal();
+- } catch (IllegalBlockSizeException e) {
+- obuffer = null;
+- } catch (BadPaddingException e) {
++ } catch (IllegalBlockSizeException | BadPaddingException e) {
+ obuffer = null;
+ }
+ try {
+--- ./jdk/src/share/classes/javax/swing/JDesktopPane.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/javax/swing/JDesktopPane.java Mon Sep 08 12:16:34 2014 -0700
+@@ -43,6 +43,7 @@
+ import java.beans.PropertyVetoException;
+ import java.util.Set;
+ import java.util.TreeSet;
++import java.util.LinkedHashSet;
+ /**
+ * A container used to create a multiple-document interface or a virtual desktop.
+ * You create <code>JInternalFrame</code> objects and add them to the
+@@ -266,7 +267,7 @@
+
+ private static Collection<JInternalFrame> getAllFrames(Container parent) {
+ int i, count;
+- Collection<JInternalFrame> results = new ArrayList<JInternalFrame>();
++ Collection<JInternalFrame> results = new LinkedHashSet<>();
+ count = parent.getComponentCount();
+ for (i = 0; i < count; i++) {
+ Component next = parent.getComponent(i);
+--- ./jdk/src/share/classes/sun/awt/image/BytePackedRaster.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/awt/image/BytePackedRaster.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1408,10 +1408,10 @@
+ }
+ }
+
+- int lastbit = (dataBitOffset
+- + (height-1) * scanlineStride * 8
+- + (width-1) * pixelBitStride
+- + pixelBitStride - 1);
++ long lastbit = (long) dataBitOffset
++ + (long) (height - 1) * (long) scanlineStride * 8
++ + (long) (width - 1) * (long) pixelBitStride
++ + (long) pixelBitStride - 1;
+ if (lastbit < 0 || lastbit / 8 >= data.length) {
+ throw new RasterFormatException("raster dimensions overflow " +
+ "array bounds");
+--- ./jdk/src/share/classes/sun/awt/image/FileImageSource.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/awt/image/FileImageSource.java Mon Sep 08 12:16:34 2014 -0700
+@@ -48,6 +48,10 @@
+ }
+
+ protected ImageDecoder getDecoder() {
++ if (imagefile == null) {
++ return null;
++ }
++
+ InputStream is;
+ try {
+ is = new BufferedInputStream(new FileInputStream(imagefile));
+--- ./jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties Mon Sep 08 12:16:34 2014 -0700
+@@ -44,7 +44,7 @@
+ AWT.subtract=Teclado Num\u00E9rico -
+ AWT.decimal=Teclado Num\u00E9rico .
+ AWT.divide=Teclado Num\u00E9rico /
+-AWT.delete=Deletar
++AWT.delete=Excluir
+ AWT.numLock=Num Lock
+ AWT.scrollLock=Scroll Lock
+ AWT.f1=F1
+--- ./jdk/src/share/classes/sun/net/www/http/ChunkedOutputStream.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/net/www/http/ChunkedOutputStream.java Mon Sep 08 12:16:34 2014 -0700
+@@ -125,7 +125,7 @@
+ completeHeader = getHeader(preferredChunkDataSize);
+
+ /* start with an initial buffer */
+- buf = new byte[preferredChunkDataSize + 32];
++ buf = new byte[preferredChunkGrossSize];
+ reset();
+ }
+
+--- ./jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java Mon Sep 08 12:16:34 2014 -0700
+@@ -751,6 +751,26 @@
+
+ // set or refresh local address
+ localAddress = Net.localAddress(fd);
++
++ // flush any packets already received.
++ boolean blocking = false;
++ synchronized (blockingLock()) {
++ try {
++ blocking = isBlocking();
++ // remainder of each packet thrown away
++ ByteBuffer tmpBuf = ByteBuffer.allocate(1);
++ if (blocking) {
++ configureBlocking(false);
++ }
++ do {
++ tmpBuf.clear();
++ } while (receive(tmpBuf) != null);
++ } finally {
++ if (blocking) {
++ configureBlocking(true);
++ }
++ }
++ }
+ }
+ }
+ }
+--- ./jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2013, 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
+@@ -29,7 +29,6 @@
+ import java.lang.reflect.*;
+ import java.io.Serializable;
+ import java.util.*;
+-import java.lang.annotation.*;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+
+@@ -45,6 +44,11 @@
+ private final Map<String, Object> memberValues;
+
+ AnnotationInvocationHandler(Class<? extends Annotation> type, Map<String, Object> memberValues) {
++ Class<?>[] superInterfaces = type.getInterfaces();
++ if (!type.isAnnotation() ||
++ superInterfaces.length != 1 ||
++ superInterfaces[0] != java.lang.annotation.Annotation.class)
++ throw new AnnotationFormatError("Attempt to create proxy for a non-annotation type.");
+ this.type = type;
+ this.memberValues = memberValues;
+ }
+@@ -57,13 +61,17 @@
+ if (member.equals("equals") && paramTypes.length == 1 &&
+ paramTypes[0] == Object.class)
+ return equalsImpl(args[0]);
+- assert paramTypes.length == 0;
+- if (member.equals("toString"))
++ if (paramTypes.length != 0)
++ throw new AssertionError("Too many parameters for an annotation method");
++
++ switch(member) {
++ case "toString":
+ return toStringImpl();
+- if (member.equals("hashCode"))
++ case "hashCode":
+ return hashCodeImpl();
+- if (member.equals("annotationType"))
++ case "annotationType":
+ return type;
++ }
+
+ // Handle annotation member accessors
+ Object result = memberValues.get(member);
+@@ -129,7 +137,7 @@
+ * Implementation of dynamicProxy.toString()
+ */
+ private String toStringImpl() {
+- StringBuffer result = new StringBuffer(128);
++ StringBuilder result = new StringBuilder(128);
+ result.append('@');
+ result.append(type.getName());
+ result.append('(');
+@@ -277,6 +285,7 @@
+ new PrivilegedAction<Method[]>() {
+ public Method[] run() {
+ final Method[] mm = type.getDeclaredMethods();
++ validateAnnotationMethods(mm);
+ AccessibleObject.setAccessible(mm, true);
+ return mm;
+ }
+@@ -287,6 +296,93 @@
+ private transient volatile Method[] memberMethods = null;
+
+ /**
++ * Validates that a method is structurally appropriate for an
++ * annotation type. As of Java SE 7, annotation types cannot
++ * contain static methods and the declared methods of an
++ * annotation type must take zero arguments and there are
++ * restrictions on the return type.
++ */
++ private void validateAnnotationMethods(Method[] memberMethods) {
++ /*
++ * Specification citations below are from JLS
++ * 9.6.1. Annotation Type Elements
++ */
++ boolean valid = true;
++ for(Method method : memberMethods) {
++ /*
++ * "By virtue of the AnnotationTypeElementDeclaration
++ * production, a method declaration in an annotation type
++ * declaration cannot have formal parameters, type
++ * parameters, or a throws clause.
++ *
++ * "By virtue of the AnnotationTypeElementModifier
++ * production, a method declaration in an annotation type
++ * declaration cannot be default or static."
++ */
++ if (method.getModifiers() != (Modifier.PUBLIC | Modifier.ABSTRACT) ||
++ method.getParameterTypes().length != 0 ||
++ method.getExceptionTypes().length != 0) {
++ valid = false;
++ break;
++ }
++
++ /*
++ * "It is a compile-time error if the return type of a
++ * method declared in an annotation type is not one of the
++ * following: a primitive type, String, Class, any
++ * parameterized invocation of Class, an enum type
++ * (section 8.9), an annotation type, or an array type
++ * (chapter 10) whose element type is one of the preceding
++ * types."
++ */
++ Class<?> returnType = method.getReturnType();
++ if (returnType.isArray()) {
++ returnType = returnType.getComponentType();
++ if (returnType.isArray()) { // Only single dimensional arrays
++ valid = false;
++ break;
++ }
++ }
++
++ if (!((returnType.isPrimitive() && returnType != void.class) ||
++ returnType == java.lang.String.class ||
++ returnType == java.lang.Class.class ||
++ returnType.isEnum() ||
++ returnType.isAnnotation())) {
++ valid = false;
++ break;
++ }
++
++ /*
++ * "It is a compile-time error if any method declared in an
++ * annotation type has a signature that is
++ * override-equivalent to that of any public or protected
++ * method declared in class Object or in the interface
++ * java.lang.annotation.Annotation."
++ *
++ * The methods in Object or Annotation meeting the other
++ * criteria (no arguments, contrained return type, etc.)
++ * above are:
++ *
++ * String toString()
++ * int hashCode()
++ * Class<? extends Annotation> annotationType()
++ */
++ String methodName = method.getName();
++ if ((methodName.equals("toString") && returnType == java.lang.String.class) ||
++ (methodName.equals("hashCode") && returnType == int.class) ||
++ (methodName.equals("annotationType") && returnType == java.lang.Class.class)) {
++ valid = false;
++ break;
++ }
++ }
++ if (valid)
++ return;
++ else
++ throw new AnnotationFormatError("Malformed method on an annotation type");
++ }
++
++ /**
+ * Implementation of dynamicProxy.hashCode()
+ */
+ private int hashCodeImpl() {
+@@ -330,7 +426,6 @@
+ throws java.io.IOException, ClassNotFoundException {
+ s.defaultReadObject();
+
+-
+ // Check to make sure that types have not evolved incompatibly
+
+ AnnotationType annotationType = null;
+@@ -343,7 +438,6 @@
+
+ Map<String, Class<?>> memberTypes = annotationType.memberTypes();
+
+-
+ // If there are annotation members without values, that
+ // situation is handled by the invoke method.
+ for (Map.Entry<String, Object> memberValue : memberValues.entrySet()) {
+--- ./jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties Mon Sep 08 12:16:34 2014 -0700
+@@ -1,6 +1,6 @@
+ #
+ #
+-# Copyright (c) 1996, 2010, 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
+@@ -91,8 +91,8 @@
+ rmic.warnings=\u8B66\u544A{0}\u500B
+ rmic.1warning=\u8B66\u544A1\u500B
+ rmic.done_in=[{0}\u30DF\u30EA\u79D2\u3067\u5B8C\u4E86]
+-rmic.no.memory=\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u30E1\u30E2\u30EA\u30FC\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002"-J-Xmx<size>"\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+-rmic.stack.overflow=\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u30B9\u30BF\u30C3\u30AF\u7A7A\u9593\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002"-J-Xss<size>"\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001Java\u30B9\u30BF\u30C3\u30AF\u306B\u5272\u308A\u5F53\u3066\u308B\u30E1\u30E2\u30EA\u30FC\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002
++rmic.no.memory=\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u30E1\u30E2\u30EA\u30FC\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002"-J-Xmx<size>"\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002
++rmic.stack.overflow=\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u30B9\u30BF\u30C3\u30AF\u7A7A\u9593\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002"-J-Xss<size>"\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001Java\u30B9\u30BF\u30C3\u30AF\u306B\u5272\u308A\u5F53\u3066\u308B\u30E1\u30E2\u30EA\u30FC\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ rmic.class.not.found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+ rmic.missing.property=\u30D7\u30ED\u30D1\u30C6\u30A3generator.class.{0}\u304C\u3042\u308A\u307E\u305B\u3093
+ rmic.cannot.instantiate=\u30AF\u30E9\u30B9{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093
+--- ./jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2012, 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
+@@ -36,6 +36,8 @@
+
+ import java.security.cert.X509Certificate;
+ import java.security.cert.CertificateException;
++import java.security.cert.CertificateParsingException;
++import javax.security.auth.x500.X500Principal;
+
+ import javax.crypto.SecretKey;
+ import javax.crypto.spec.SecretKeySpec;
+@@ -93,6 +95,60 @@
+ Debug.getBooleanProperty("jsse.enableSNIExtension", true);
+
+ /*
++ * Allow unsafe server certificate change?
++ *
++ * Server certificate change during SSL/TLS renegotiation may be considered
++ * unsafe, as described in the Triple Handshake attacks:
++ *
++ * https://secure-resumption.com/tlsauth.pdf
++ *
++ * Endpoint identification (See
++ * SSLParameters.getEndpointIdentificationAlgorithm()) is a pretty nice
++ * guarantee that the server certificate change in the renegotiation is legal.
++ * However, endpoint identification is only enabled for HTTPS and LDAP
++ * over SSL/TLS by default. It is not enough to protect SSL/TLS
++ * connections other than HTTPS and LDAP.
++ *
++ * The renegotiation indication extension (See RFC 5764) is a pretty
++ * strong guarantee that the endpoints on both client and server sides
++ * are identical on the same connection. However, the Triple Handshake
++ * attacks can bypass this guarantee if there is a session-resumption
++ * handshake between the initial full handshake and the renegotiation
++ * full handshake.
++ *
++ * Server certificate change may be unsafe and should be restricted if
++ * endpoint identification is not enabled and the previous handshake is
++ * a session-resumption abbreviated initial handshake, unless the
++ * identities reproesented by both certificates can be regraded as the
++ * same (See isIdentityEquivalent()).
++ *
++ * Considering the compatibility impact and the actual requirements to
++ * support server certificate change in practice, the system property,
++ * jdk.tls.allowUnsafeServerCertChange, is used to define whether unsafe
++ * server certificate change in renegotiation is allowed or not. The
++ * default value of the system property is "false". To mitigate the
++ * compatibility impact, applications may want to set the system
++ * property to "true" at their own risk.
++ *
++ * If the value of the system property is "false", server certificate
++ * change in renegotiation after a session-resumption abbreviated initial
++ * handshake is restricted (See isIdentityEuivalent()).
++ *
++ * If the system property is set to "truie" explicitly, the restriction on
++ * server certificate change in renegotiation is disabled.
++ */
++ private final static boolean allowUnsafeServerCertChange =
++ Debug.getBooleanProperty("jdk.tls.allowUnsafeServerCertChange", false);
++
++ /*
++ * the reserved server certificate chain in previous handshaking
++ *
++ * The server certificate chain is only reserved if the previous
++ * handshake is a session-resumption abbreviated initial handshake.
++ */
++ private X509Certificate[] reservedServerCerts = null;
++
++ /*
+ * Constructors
+ */
+ ClientHandshaker(SSLSocketImpl socket, SSLContextImpl context,
+@@ -551,8 +607,7 @@
+ // we wanted to resume, but the server refused
+ session = null;
+ if (!enableNewSession) {
+- throw new SSLException
+- ("New session creation is disabled");
++ throw new SSLException("New session creation is disabled");
+ }
+ }
+ }
+@@ -563,6 +618,11 @@
+ }
+
+ setHandshakeSessionSE(session);
++ // Reserve the handshake state if this is a session-resumption
++ // abbreviated initial handshake.
++ if (isInitialHandshake) {
++ session.setAsSessionResumption(true);
++ }
+ return;
+ }
+
+@@ -1035,6 +1095,13 @@
+ }
+
+ /*
++ * Reset the handshake state if this is not an initial handshake.
++ */
++ if (!isInitialHandshake) {
++ session.setAsSessionResumption(false);
++ }
++
++ /*
+ * OK, it verified. If we're doing the fast handshake, add that
+ * "Finished" message to the hash of handshake messages, then send
+ * our own change_cipher_spec and Finished message for the server
+@@ -1131,8 +1198,22 @@
+ System.out.println("%% No cached client session");
+ }
+ }
+- if ((session != null) && (session.isRejoinable() == false)) {
+- session = null;
++ if (session != null) {
++ // If unsafe server certificate change is not allowed, reserve
++ // current server certificates if the preious handshake is a
++ // session-resumption abbreviated initial handshake.
++ if (!allowUnsafeServerCertChange && session.isSessionResumption()) {
++ try {
++ // If existing, peer certificate chain cannot be null.
++ reservedServerCerts =
++ (X509Certificate[])session.getPeerCertificates();
++ } catch (SSLPeerUnverifiedException puve) {
++ // Maybe not certificate-based, ignore the exception.
++ }
++ }
++ if (!session.isRejoinable()) {
++ session = null;
++ }
+ }
+
+ if (session != null) {
+@@ -1303,8 +1384,25 @@
+ }
+ X509Certificate[] peerCerts = mesg.getCertificateChain();
+ if (peerCerts.length == 0) {
+- fatalSE(Alerts.alert_bad_certificate,
+- "empty certificate chain");
++ fatalSE(Alerts.alert_bad_certificate, "empty certificate chain");
++ }
++
++ // Allow server certificate change in client side during renegotiation
++ // after session-resumption abbreviated initial handshake ?
++ //
++ // DO NOT need to check allowUnsafeServerCertChange here. We only
++ // reserve server certificates when allowUnsafeServerCertChange is
++ // false.
++ if (reservedServerCerts != null) {
++ // It is not necessary to check the certificate update if endpoint
++ // identification is enabled.
++ String identityAlg = getEndpointIdentificationAlgorithmSE();
++ if ((identityAlg == null || identityAlg.length() == 0) &&
++ !isIdentityEquivalent(peerCerts[0], reservedServerCerts[0])) {
++ fatalSE(Alerts.alert_bad_certificate,
++ "server certificate change is restricted" +
++ "during renegotiation");
++ }
+ }
+ // ask the trust manager to verify the chain
+ X509TrustManager tm = sslContext.getX509TrustManager();
+@@ -1342,4 +1440,82 @@
+ }
+ session.setPeerCertificates(peerCerts);
+ }
++
++ /*
++ * Whether the certificates can represent the same identity?
++ *
++ * The certificates can be used to represent the same identity:
++ * 1. If the subject alternative names of IP address are present in
++ * both certificates, they should be identical; otherwise,
++ * 2. if the subject alternative names of DNS name are present in
++ * both certificates, they should be identical; otherwise,
++ * 3. if the subject fields are present in both certificates, the
++ * certificate subjects and issuers should be identical.
++ */
++
++ private static boolean isIdentityEquivalent(X509Certificate thisCert,
++ X509Certificate prevCert) {
++ if (thisCert.equals(prevCert)) {
++ return true;
++ }
++
++ // check the iPAddress field in subjectAltName extension
++ Object thisIPAddress = getSubjectAltName(thisCert, 7); // 7: iPAddress
++ Object prevIPAddress = getSubjectAltName(prevCert, 7);
++ if (thisIPAddress != null && prevIPAddress!= null) {
++ // only allow the exactly match
++ return Objects.equals(thisIPAddress, prevIPAddress);
++ }
++
++ // check the dNSName field in subjectAltName extension
++ Object thisDNSName = getSubjectAltName(thisCert, 2); // 2: dNSName
++ Object prevDNSName = getSubjectAltName(prevCert, 2);
++ if (thisDNSName != null && prevDNSName!= null) {
++ // only allow the exactly match
++ return Objects.equals(thisDNSName, prevDNSName);
++ }
++
++ // check the certificate subject and issuer
++ X500Principal thisSubject = thisCert.getSubjectX500Principal();
++ X500Principal prevSubject = prevCert.getSubjectX500Principal();
++ X500Principal thisIssuer = thisCert.getIssuerX500Principal();
++ X500Principal prevIssuer = prevCert.getIssuerX500Principal();
++ if (!thisSubject.getName().isEmpty() &&
++ !prevSubject.getName().isEmpty() &&
++ thisSubject.equals(prevSubject) &&
++ thisIssuer.equals(prevIssuer)) {
++ return true;
++ }
++
++ return false;
++ }
++
++ /*
++ * Returns the subject alternative name of the specified type in the
++ * subjectAltNames extension of a certificate.
++ */
++ private static Object getSubjectAltName(X509Certificate cert, int type) {
++ Collection<List<?>> subjectAltNames;
++
++ try {
++ subjectAltNames = cert.getSubjectAlternativeNames();
++ } catch (CertificateParsingException cpe) {
++ if (debug != null && Debug.isOn("handshake")) {
++ System.out.println(
++ "Attempt to obtain subjectAltNames extension failed!");
++ }
++ return null;
++ }
++
++ if (subjectAltNames != null) {
++ for (List<?> subjectAltName : subjectAltNames) {
++ int subjectAltNameType = (Integer)subjectAltName.get(0);
++ if (subjectAltNameType == type) {
++ return subjectAltName.get(1);
++ }
++ }
++ }
++
++ return null;
++ }
+ }
+--- ./jdk/src/share/classes/sun/security/ssl/Handshaker.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/security/ssl/Handshaker.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2013, 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
+@@ -348,6 +348,16 @@
+ }
+ }
+
++ String getEndpointIdentificationAlgorithmSE() {
++ SSLParameters paras;
++ if (conn != null) {
++ paras = conn.getSSLParameters();
++ } else {
++ paras = engine.getSSLParameters();
++ }
++ return paras.getEndpointIdentificationAlgorithm();
++ }
++
+ private void setVersionSE(ProtocolVersion protocolVersion) {
+ if (conn != null) {
+ conn.setVersion(protocolVersion);
+--- ./jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java Mon Sep 08 12:16:34 2014 -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
+@@ -117,6 +117,14 @@
+ private Principal localPrincipal;
+
+ /*
++ * Is the session currently re-established with a session-resumption
++ * abbreviated initial handshake?
++ *
++ * Note that currently we only set this variable in client side.
++ */
++ private boolean isSessionResumption = false;
++
++ /*
+ * We count session creations, eventually for statistical data but
+ * also since counters make shorter debugging IDs than the big ones
+ * we use in the protocol for uniqueness-over-time.
+@@ -320,6 +328,22 @@
+ }
+
+ /**
++ * Return true if the session is currently re-established with a
++ * session-resumption abreviated initial handshake.
++ */
++ boolean isSessionResumption() {
++ return isSessionResumption;
++ }
++
++ /**
++ * Resets whether the session is re-established with a session-resumption
++ * abbreviated initial handshake.
++ */
++ void setAsSessionResumption(boolean flag) {
++ isSessionResumption = flag;
++ }
++
++ /**
+ * Returns the name of the cipher suite in use on this session
+ */
+ public String getCipherSuite() {
+--- ./jdk/src/share/classes/sun/security/util/Resources_de.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/security/util/Resources_de.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2011, 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
+@@ -75,7 +75,7 @@
+ {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
+ "Importiert Eintr\u00E4ge aus einer Identity-Datenbank im JDK 1.1.x-Stil"}, //-identitydb
+ {"Imports.a.certificate.or.a.certificate.chain",
+- "Importiert ein Zertifikat oder eine Zertifikatkette"}, //-importcert
++ "Importiert ein Zertifikat oder eine Zertifikatskette"}, //-importcert
+ {"Imports.one.or.all.entries.from.another.keystore",
+ "Importiert einen oder alle Eintr\u00E4ge aus einem anderen Keystore"}, //-importkeystore
+ {"Clones.a.key.entry",
+@@ -301,7 +301,7 @@
+ "{0}, {1,date}, "},
+ {"alias.", "{0}, "},
+ {"Entry.type.type.", "Eintragstyp: {0}"},
+- {"Certificate.chain.length.", "Zertifikatkettenl\u00E4nge: "},
++ {"Certificate.chain.length.", "Zertifikatskettenl\u00E4nge: "},
+ {"Certificate.i.1.", "Zertifikat[{0,number,integer}]:"},
+ {"Certificate.fingerprint.SHA1.", "Zertifikat-Fingerprint (SHA1): "},
+ {"Keystore.type.", "Keystore-Typ: "},
+@@ -384,9 +384,9 @@
+ {"Certificate.reply.does.not.contain.public.key.for.alias.",
+ "Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
+ {"Incomplete.certificate.chain.in.reply",
+- "Unvollst\u00E4ndige Zertifikatkette in Antwort"},
++ "Unvollst\u00E4ndige Zertifikatskette in Antwort"},
+ {"Certificate.chain.in.reply.does.not.verify.",
+- "Zertifikatkette in Antwort verifiziert nicht: "},
++ "Zertifikatskette in Antwort verifiziert nicht: "},
+ {"Top.level.certificate.in.reply.",
+ "Zertifikat der obersten Ebene in Antwort:\n"},
+ {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "},
+--- ./jdk/src/share/classes/sun/security/util/Resources_fr.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/security/util/Resources_fr.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2011, 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
+@@ -444,7 +444,7 @@
+ {"Retain", "Conserver"},
+
+ {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
+- "Avertissement : il se peut que le nom de fichier contienne des barres obliques inverses avec caract\u00E8re d'\u00E9chappement. Il n'est pas n\u00E9cessaire d'ajouter un caract\u00E8re d'\u00E9chappement aux barres obliques inverses. L'outil proc\u00E8de \u00E0 l'\u00E9chappement si n\u00E9cessaire lorsqu'il \u00E9crit le contenu des r\u00E8gles dans la zone de stockage persistant).\n\nCliquez sur Conserver pour garder le nom saisi ou sur Modifier pour le remplacer."},
++ "Avertissement : il se peut que le nom de fichier contienne des barres obliques inverses avec caract\u00E8re d'\u00E9chappement. Il n'est pas n\u00E9cessaire d'ajouter un caract\u00E8re d'\u00E9chappement aux barres obliques inverses. (L'outil proc\u00E8de \u00E0 l'\u00E9chappement si n\u00E9cessaire lorsqu'il \u00E9crit le contenu des r\u00E8gles dans la zone de stockage persistant).\n\nCliquez sur Conserver pour garder le nom saisi ou sur Modifier pour le remplacer."},
+
+ {"Add.Public.Key.Alias", "Ajouter un alias de cl\u00E9 publique"},
+ {"Remove.Public.Key.Alias", "Enlever un alias de cl\u00E9 publique"},
+--- ./jdk/src/share/classes/sun/security/util/Resources_it.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/security/util/Resources_it.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2011, 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
+@@ -340,7 +340,7 @@
+ "Immettere un nuovo nome alias\t(premere INVIO per annullare l'importazione della voce): "},
+ {"Enter.alias.name.", "Immettere nome alias: "},
+ {".RETURN.if.same.as.for.otherAlias.",
+- "\t(INVIO se corrisponde al nome di <{0}>"},
++ "\t(INVIO se corrisponde al nome di <{0}>)"},
+ {".PATTERN.printX509Cert",
+ "Proprietario: {0}\nAutorit\u00E0 emittente: {1}\nNumero di serie: {2}\nValido da: {3} a: {4}\nImpronte digitali certificato:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nome algoritmo firma: {8}\n\t Versione: {9}"},
+ {"What.is.your.first.and.last.name.",
+--- ./jdk/src/share/classes/sun/security/util/Resources_pt_BR.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/security/util/Resources_pt_BR.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2011, 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
+@@ -62,7 +62,7 @@
+ {"Changes.an.entry.s.alias",
+ "Altera um alias de entrada"}, //-changealias
+ {"Deletes.an.entry",
+- "Deleta uma entrada"}, //-delete
++ "Exclui uma entrada"}, //-delete
+ {"Exports.certificate",
+ "Exporta o certificado"}, //-exportcert
+ {"Generates.a.key.pair",
+--- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Mon Sep 08 12:16:34 2014 -0700
+@@ -31,7 +31,7 @@
+ CPU_USAGE=CPU\u4F7F\u7528\u7387
+ CPU_USAGE_FORMAT=CPU\u4F7F\u7528\u7387: {0}%
+ CANCEL=\u53D6\u6D88
+-CASCADE=\u91CD\u306D\u3066\u8868\u793A(&C)
++CASCADE=\u30AB\u30B9\u30B1\u30FC\u30C9\u8868\u793A(&C)
+ CHART_COLON=\u30C1\u30E3\u30FC\u30C8(&C):
+ CLASS_PATH=\u30AF\u30E9\u30B9\u30D1\u30B9
+ CLASS_NAME=ClassName
+@@ -227,7 +227,7 @@
+ THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u60C5\u5831
+ THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u6570\u306E\u30C1\u30E3\u30FC\u30C8\u3002
+ THRESHOLD=\u3057\u304D\u3044\u5024
+-TILE=\u4E26\u3079\u3066\u8868\u793A(&T)
++TILE=\u30BF\u30A4\u30EB\u8868\u793A(&T)
+ TIME_RANGE_COLON=\u6642\u9593\u7BC4\u56F2(&T):
+ TIME=\u6642\u9593
+ TIME_STAMP=TimeStamp
+@@ -252,7 +252,7 @@
+ USER_DATA=UserData
+ VIRTUAL_MACHINE=\u4EEE\u60F3\u30DE\u30B7\u30F3
+ VM_ARGUMENTS=VM\u5F15\u6570
+-VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30E2\u30CB\u30BF\u30FC\u7528\u306E\u5185\u90E8\u30D5\u30EC\u30FC\u30E0
++VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30E2\u30CB\u30BF\u30EA\u30F3\u30B0\u7528\u306E\u5185\u90E8\u30D5\u30EC\u30FC\u30E0
+ VALUE=\u5024
+ VENDOR=\u30D9\u30F3\u30C0\u30FC
+ VERBOSE_OUTPUT=\u8A73\u7D30\u51FA\u529B
+@@ -274,4 +274,4 @@
+ KBYTES={0} KB
+ PLOT=\u30D7\u30ED\u30C3\u30C8
+ VISUALIZE=\u8996\u899A\u5316
+-ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n -interval \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n -notile \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u4E26\u3079\u3066\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n -version \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3059\u308B\n\n connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n pid \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n host \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n port \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n -J JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B
++ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n -interval \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n -notile \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u30BF\u30A4\u30EB\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n -version \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3059\u308B\n\n connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n pid \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n host \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n port \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n -J JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B
+--- ./jdk/src/share/classes/sun/util/locale/BaseLocale.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/util/locale/BaseLocale.java Mon Sep 08 12:16:34 2014 -0700
+@@ -31,6 +31,7 @@
+ */
+
+ package sun.util.locale;
++import java.lang.ref.SoftReference;
+
+
+ public final class BaseLocale {
+@@ -163,11 +164,11 @@
+ return h;
+ }
+
+- private static final class Key implements Comparable<Key> {
+- private final String lang;
+- private final String scrt;
+- private final String regn;
+- private final String vart;
++ private static final class Key {
++ private final SoftReference<String> lang;
++ private final SoftReference<String> scrt;
++ private final SoftReference<String> regn;
++ private final SoftReference<String> vart;
+ private final boolean normalized;
+ private final int hash;
+
+@@ -179,10 +180,10 @@
+ assert language.intern() == language
+ && region.intern() == region;
+
+- lang = language;
+- scrt = "";
+- regn = region;
+- vart = "";
++ lang = new SoftReference(language);
++ scrt = new SoftReference("");
++ regn = new SoftReference(region);
++ vart = new SoftReference("");
+ this.normalized = true;
+
+ int h = language.hashCode();
+@@ -203,40 +204,40 @@
+ String variant, boolean normalized) {
+ int h = 0;
+ if (language != null) {
+- lang = language;
++ lang = new SoftReference(language);
+ int len = language.length();
+ for (int i = 0; i < len; i++) {
+ h = 31*h + LocaleUtils.toLower(language.charAt(i));
+ }
+ } else {
+- lang = "";
++ lang = new SoftReference("");
+ }
+ if (script != null) {
+- scrt = script;
++ scrt = new SoftReference(script);
+ int len = script.length();
+ for (int i = 0; i < len; i++) {
+ h = 31*h + LocaleUtils.toLower(script.charAt(i));
+ }
+ } else {
+- scrt = "";
++ scrt = new SoftReference("");
+ }
+ if (region != null) {
+- regn = region;
++ regn = new SoftReference(region);
+ int len = region.length();
+ for (int i = 0; i < len; i++) {
+ h = 31*h + LocaleUtils.toLower(region.charAt(i));
+ }
+ } else {
+- regn = "";
++ regn = new SoftReference("");
+ }
+ if (variant != null) {
+- vart = variant;
++ vart = new SoftReference(variant);
+ int len = variant.length();
+ for (int i = 0; i < len; i++) {
+ h = 31*h + variant.charAt(i);
+ }
+ } else {
+- vart = "";
++ vart = new SoftReference("");
+ }
+ hash = h;
+ this.normalized = normalized;
+@@ -244,28 +245,31 @@
+
+ @Override
+ public boolean equals(Object obj) {
+- return (this == obj) ||
+- (obj instanceof Key)
+- && this.hash == ((Key)obj).hash
+- && LocaleUtils.caseIgnoreMatch(((Key)obj).lang, this.lang)
+- && LocaleUtils.caseIgnoreMatch(((Key)obj).scrt, this.scrt)
+- && LocaleUtils.caseIgnoreMatch(((Key)obj).regn, this.regn)
+- && ((Key)obj).vart.equals(vart); // variant is case sensitive in JDK!
++ if (this == obj) {
++ return true;
+ }
+
+- @Override
+- public int compareTo(Key other) {
+- int res = LocaleUtils.caseIgnoreCompare(this.lang, other.lang);
+- if (res == 0) {
+- res = LocaleUtils.caseIgnoreCompare(this.scrt, other.scrt);
+- if (res == 0) {
+- res = LocaleUtils.caseIgnoreCompare(this.regn, other.regn);
+- if (res == 0) {
+- res = this.vart.compareTo(other.vart);
++ if (obj instanceof Key && this.hash == ((Key)obj).hash) {
++ String tl = this.lang.get();
++ String ol = ((Key)obj).lang.get();
++ if (tl != null && ol != null &&
++ LocaleUtils.caseIgnoreMatch(ol, tl)) {
++ String ts = this.scrt.get();
++ String os = ((Key)obj).scrt.get();
++ if (ts != null && os != null &&
++ LocaleUtils.caseIgnoreMatch(os, ts)) {
++ String tr = this.regn.get();
++ String or = ((Key)obj).regn.get();
++ if (tr != null && or != null &&
++ LocaleUtils.caseIgnoreMatch(or, tr)) {
++ String tv = this.vart.get();
++ String ov = ((Key)obj).vart.get();
++ return (ov != null && ov.equals(tv));
+ }
+ }
+ }
+- return res;
++ }
++ return false;
+ }
+
+ @Override
+@@ -278,10 +282,10 @@
+ return key;
+ }
+
+- String lang = LocaleUtils.toLowerString(key.lang).intern();
+- String scrt = LocaleUtils.toTitleString(key.scrt).intern();
+- String regn = LocaleUtils.toUpperString(key.regn).intern();
+- String vart = key.vart.intern(); // preserve upper/lower cases
++ String lang = LocaleUtils.toLowerString(key.lang.get()).intern();
++ String scrt = LocaleUtils.toTitleString(key.scrt.get()).intern();
++ String regn = LocaleUtils.toUpperString(key.regn.get()).intern();
++ String vart = key.vart.get().intern(); // preserve upper/lower cases
+
+ return new Key(lang, scrt, regn, vart, true);
+ }
+@@ -294,12 +298,18 @@
+
+ @Override
+ protected Key normalizeKey(Key key) {
++ assert key.lang.get() != null &&
++ key.scrt.get() != null &&
++ key.regn.get() != null &&
++ key.vart.get() != null;
++
+ return Key.normalize(key);
+ }
+
+ @Override
+ protected BaseLocale createObject(Key key) {
+- return new BaseLocale(key.lang, key.scrt, key.regn, key.vart);
++ return new BaseLocale(key.lang.get(), key.scrt.get(),
++ key.regn.get(), key.vart.get());
+ }
+ }
+ }
+--- ./jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java Mon Sep 08 12:16:34 2014 -0700
+@@ -57,8 +57,10 @@
+ value = entry.get();
+ }
+ if (value == null) {
++ V newVal = createObject(key);
++ // make sure key is normalized *after* the object creation
++ // so that newVal is assured to be created from a valid key.
+ key = normalizeKey(key);
+- V newVal = createObject(key);
+ if (key == null || newVal == null) {
+ // subclass must return non-null key/value object
+ return null;
+--- ./jdk/src/share/javavm/export/jvm.h Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/javavm/export/jvm.h Mon Sep 08 12:16:34 2014 -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
+@@ -384,6 +384,19 @@
+ JVM_FindClassFromBootLoader(JNIEnv *env, const char *name);
+
+ /*
++ * Find a class from a given class loader. Throws ClassNotFoundException.
++ * name: name of class
++ * init: whether initialization is done
++ * loader: class loader to look up the class. This may not be the same as the caller's
++ * class loader.
++ * caller: initiating class. The initiating class may be null when a security
++ * manager is not installed.
++ */
++JNIEXPORT jclass JNICALL
++JVM_FindClassFromCaller(JNIEnv *env, const char *name, jboolean init,
++ jobject loader, jclass caller);
++
++/*
+ * Find a class from a given class loader. Throw ClassNotFoundException
+ * or NoClassDefFoundError depending on the value of the last
+ * argument.
+--- ./jdk/src/share/native/java/lang/Class.c Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/native/java/lang/Class.c Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1994, 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
+@@ -97,7 +97,7 @@
+
+ JNIEXPORT jclass JNICALL
+ Java_java_lang_Class_forName0(JNIEnv *env, jclass this, jstring classname,
+- jboolean initialize, jobject loader)
++ jboolean initialize, jobject loader, jclass caller)
+ {
+ char *clname;
+ jclass cls = 0;
+@@ -135,8 +135,7 @@
+ goto done;
+ }
+
+- cls = JVM_FindClassFromClassLoader(env, clname, initialize,
+- loader, JNI_FALSE);
++ cls = JVM_FindClassFromCaller(env, clname, initialize, loader, caller);
+
+ done:
+ if (clname != buf) {
+--- ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp Mon Sep 08 12:16:34 2014 -0700
+@@ -243,12 +243,22 @@
+ le_uint16 srSetCount = SWAPW(subRuleSetCount);
+
+ if (coverageIndex < srSetCount) {
++ LEReferenceToArrayOf<Offset> subRuleSetTableOffsetArrayRef(base, success,
++ &subRuleSetTableOffsetArray[coverageIndex], 1);
++ if (LE_FAILURE(success)) {
++ return 0;
++ }
+ Offset subRuleSetTableOffset = SWAPW(subRuleSetTableOffsetArray[coverageIndex]);
+ LEReferenceTo<SubRuleSetTable>
+ subRuleSetTable(base, success, (const SubRuleSetTable *) ((char *) this + subRuleSetTableOffset));
+ le_uint16 subRuleCount = SWAPW(subRuleSetTable->subRuleCount);
+ le_int32 position = glyphIterator->getCurrStreamPosition();
+
++ LEReferenceToArrayOf<Offset> subRuleTableOffsetArrayRef(base, success,
++ subRuleSetTable->subRuleTableOffsetArray, subRuleCount);
++ if (LE_FAILURE(success)) {
++ return 0;
++ }
+ for (le_uint16 subRule = 0; subRule < subRuleCount; subRule += 1) {
+ Offset subRuleTableOffset =
+ SWAPW(subRuleSetTable->subRuleTableOffsetArray[subRule]);
+@@ -301,13 +311,22 @@
+ glyphIterator->getCurrGlyphID(),
+ success);
+
+- if (setClass < scSetCount && subClassSetTableOffsetArray[setClass] != 0) {
++ if (setClass < scSetCount) {
++ LEReferenceToArrayOf<Offset>
++ subClassSetTableOffsetArrayRef(base, success, subClassSetTableOffsetArray, setClass);
++ if (LE_FAILURE(success)) { return 0; }
++ if (subClassSetTableOffsetArray[setClass] != 0) {
++
+ Offset subClassSetTableOffset = SWAPW(subClassSetTableOffsetArray[setClass]);
+ LEReferenceTo<SubClassSetTable>
+ subClassSetTable(base, success, (const SubClassSetTable *) ((char *) this + subClassSetTableOffset));
+ le_uint16 subClassRuleCount = SWAPW(subClassSetTable->subClassRuleCount);
+ le_int32 position = glyphIterator->getCurrStreamPosition();
+-
++ LEReferenceToArrayOf<Offset>
++ subClassRuleTableOffsetArrayRef(base, success, subClassSetTable->subClassRuleTableOffsetArray, subClassRuleCount);
++ if (LE_FAILURE(success)) {
++ return 0;
++ }
+ for (le_uint16 scRule = 0; scRule < subClassRuleCount; scRule += 1) {
+ Offset subClassRuleTableOffset =
+ SWAPW(subClassSetTable->subClassRuleTableOffsetArray[scRule]);
+@@ -331,6 +350,7 @@
+ glyphIterator->setCurrStreamPosition(position);
+ }
+ }
++ }
+
+ // XXX If we get here, the table is mal-formed...
+ }
+@@ -442,13 +462,22 @@
+ le_uint16 srSetCount = SWAPW(chainSubRuleSetCount);
+
+ if (coverageIndex < srSetCount) {
++ LEReferenceToArrayOf<Offset>
++ chainSubRuleSetTableOffsetArrayRef(base, success, chainSubRuleSetTableOffsetArray, coverageIndex);
++ if (LE_FAILURE(success)) {
++ return 0;
++ }
+ Offset chainSubRuleSetTableOffset = SWAPW(chainSubRuleSetTableOffsetArray[coverageIndex]);
+ LEReferenceTo<ChainSubRuleSetTable>
+ chainSubRuleSetTable(base, success, (const ChainSubRuleSetTable *) ((char *) this + chainSubRuleSetTableOffset));
+ le_uint16 chainSubRuleCount = SWAPW(chainSubRuleSetTable->chainSubRuleCount);
+ le_int32 position = glyphIterator->getCurrStreamPosition();
+ GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
+-
++ LEReferenceToArrayOf<Offset>
++ chainSubRuleTableOffsetArrayRef(base, success, chainSubRuleSetTable->chainSubRuleTableOffsetArray, chainSubRuleCount);
++ if (LE_FAILURE(success)) {
++ return 0;
++ }
+ for (le_uint16 subRule = 0; subRule < chainSubRuleCount; subRule += 1) {
+ Offset chainSubRuleTableOffset =
+ SWAPW(chainSubRuleSetTable->chainSubRuleTableOffsetArray[subRule]);
+@@ -530,6 +559,11 @@
+ le_int32 setClass = inputClassDefinitionTable->getGlyphClass(inputClassDefinitionTable,
+ glyphIterator->getCurrGlyphID(),
+ success);
++ LEReferenceToArrayOf<Offset>
++ chainSubClassSetTableOffsetArrayRef(base, success, chainSubClassSetTableOffsetArray, setClass);
++ if (LE_FAILURE(success)) {
++ return 0;
++ }
+
+ if (setClass < scSetCount && chainSubClassSetTableOffsetArray[setClass] != 0) {
+ Offset chainSubClassSetTableOffset = SWAPW(chainSubClassSetTableOffsetArray[setClass]);
+@@ -538,7 +572,11 @@
+ le_uint16 chainSubClassRuleCount = SWAPW(chainSubClassSetTable->chainSubClassRuleCount);
+ le_int32 position = glyphIterator->getCurrStreamPosition();
+ GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
+-
++ LEReferenceToArrayOf<Offset>
++ chainSubClassRuleTableOffsetArrayRef(base, success, chainSubClassSetTable->chainSubClassRuleTableOffsetArray, chainSubClassRuleCount);
++ if (LE_FAILURE(success)) {
++ return 0;
++ }
+ for (le_uint16 scRule = 0; scRule < chainSubClassRuleCount; scRule += 1) {
+ Offset chainSubClassRuleTableOffset =
+ SWAPW(chainSubClassSetTable->chainSubClassRuleTableOffsetArray[scRule]);
+@@ -603,12 +641,14 @@
+ }
+
+ le_uint16 backtrkGlyphCount = SWAPW(backtrackGlyphCount);
++ LEReferenceToArrayOf<Offset> backtrackGlyphArrayRef(base, success, backtrackCoverageTableOffsetArray, backtrkGlyphCount);
++ if (LE_FAILURE(success)) {
++ return 0;
++ }
+ le_uint16 inputGlyphCount = (le_uint16) SWAPW(backtrackCoverageTableOffsetArray[backtrkGlyphCount]);
+ 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]);
+-
+- if( LE_FAILURE(success) ) { return 0; }
+ LEReferenceToArrayOf<Offset> lookaheadCoverageTableOffsetArray(base, success, inputCoverageTableOffsetArray.getAlias(inputGlyphCount + 1, success), lookaheadGlyphCount+2);
+
+ if( LE_FAILURE(success) ) { return 0; }
+--- ./jdk/src/share/native/sun/font/layout/LEScripts.h Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/share/native/sun/font/layout/LEScripts.h Mon Sep 08 12:16:34 2014 -0700
+@@ -263,12 +263,6 @@
+ tirhScriptCode = 158,
+
+ /**
+- * @stable ICU 52
+- */
+- aghbScriptCode = 159,
+- mahjScriptCode = 160,
+-
+-/**
+ * @stable ICU 2.2
+ */
+ scriptCodeCount
+--- ./jdk/src/solaris/classes/sun/print/CUPSPrinter.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/solaris/classes/sun/print/CUPSPrinter.java Mon Sep 08 12:16:34 2014 -0700
+@@ -121,7 +121,7 @@
+ /**
+ * Returns array of MediaSizeNames derived from PPD.
+ */
+- public MediaSizeName[] getMediaSizeNames() {
++ MediaSizeName[] getMediaSizeNames() {
+ initMedia();
+ return cupsMediaSNames;
+ }
+@@ -130,7 +130,7 @@
+ /**
+ * Returns array of Custom MediaSizeNames derived from PPD.
+ */
+- public CustomMediaSizeName[] getCustomMediaSizeNames() {
++ CustomMediaSizeName[] getCustomMediaSizeNames() {
+ initMedia();
+ return cupsCustomMediaSNames;
+ }
+@@ -139,7 +139,7 @@
+ /**
+ * Returns array of MediaPrintableArea derived from PPD.
+ */
+- public MediaPrintableArea[] getMediaPrintableArea() {
++ MediaPrintableArea[] getMediaPrintableArea() {
+ initMedia();
+ return cupsMediaPrintables;
+ }
+@@ -147,7 +147,7 @@
+ /**
+ * Returns array of MediaTrays derived from PPD.
+ */
+- public MediaTray[] getMediaTrays() {
++ MediaTray[] getMediaTrays() {
+ initMedia();
+ return cupsMediaTrays;
+ }
+--- ./jdk/src/solaris/classes/sun/print/IPPPrintService.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/solaris/classes/sun/print/IPPPrintService.java Mon Sep 08 12:16:34 2014 -0700
+@@ -991,7 +991,9 @@
+
+ public synchronized Class[] getSupportedAttributeCategories() {
+ if (supportedCats != null) {
+- return supportedCats;
++ Class<?> [] copyCats = new Class<?>[supportedCats.length];
++ System.arraycopy(supportedCats, 0, copyCats, 0, copyCats.length);
++ return copyCats;
+ }
+
+ initAttributes();
+@@ -1048,7 +1050,9 @@
+ }
+ supportedCats = new Class[catList.size()];
+ catList.toArray(supportedCats);
+- return supportedCats;
++ Class<?>[] copyCats = new Class<?>[supportedCats.length];
++ System.arraycopy(supportedCats, 0, copyCats, 0, copyCats.length);
++ return copyCats;
+ }
+
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/solaris/native/java/net/AbstractPlainDatagramSocketImpl.c Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,89 @@
++/*
++ * 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.
++ */
++
++#include <sys/types.h>
++#include <sys/socket.h>
++
++#ifdef __solaris__
++#include <unistd.h>
++#include <stropts.h>
++
++#ifndef BSD_COMP
++#define BSD_COMP
++#endif
++
++#endif
++
++#include <sys/ioctl.h>
++
++#include "jvm.h"
++#include "jni_util.h"
++#include "net_util.h"
++
++#include "java_net_AbstractPlainDatagramSocketImpl.h"
++
++static jfieldID IO_fd_fdID;
++
++static jfieldID apdsi_fdID;
++
++
++/*
++ * Class: java_net_AbstractPlainDatagramSocketImpl
++ * Method: init
++ * Signature: ()V
++ */
++JNIEXPORT void JNICALL
++Java_java_net_AbstractPlainDatagramSocketImpl_init(JNIEnv *env, jclass cls) {
++
++ apdsi_fdID = (*env)->GetFieldID(env, cls, "fd",
++ "Ljava/io/FileDescriptor;");
++ CHECK_NULL(apdsi_fdID);
++
++ IO_fd_fdID = NET_GetFileDescriptorID(env);
++}
++
++/*
++ * Class: java_net_AbstractPlainDatagramSocketImpl
++ * Method: dataAvailable
++ * Signature: ()I
++ */
++JNIEXPORT jint JNICALL Java_java_net_AbstractPlainDatagramSocketImpl_dataAvailable
++(JNIEnv *env, jobject this) {
++ int fd, retval;
++
++ jobject fdObj = (*env)->GetObjectField(env, this, apdsi_fdID);
++
++ if (IS_NULL(fdObj)) {
++ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
++ "Socket closed");
++ return -1;
++ }
++ fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
++
++ if (ioctl(fd, FIONREAD, &retval) < 0) {
++ return -1;
++ }
++ return retval;
++}
+--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2004, 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
+@@ -38,12 +38,14 @@
+ JNIEXPORT jint JNICALL
+ Java_java_util_prefs_FileSystemPreferences_chmod(JNIEnv *env,
+ jclass thisclass, jstring java_fname, jint permission) {
+- const char *fname = JNU_GetStringPlatformChars(env, java_fname, JNI_FALSE);
+- int result;
+- result = chmod(fname, permission);
+- if (result != 0)
+- result = errno;
+- JNU_ReleaseStringPlatformChars(env, java_fname, fname);
++ const char *fname = JNU_GetStringPlatformChars(env, java_fname, NULL);
++ int result = -1;
++ if (fname) {
++ result = chmod(fname, permission);
++ if (result != 0)
++ result = errno;
++ JNU_ReleaseStringPlatformChars(env, java_fname, fname);
++ }
+ return (jint) result;
+ }
+
+@@ -61,13 +63,16 @@
+ JNIEXPORT jintArray JNICALL
+ Java_java_util_prefs_FileSystemPreferences_lockFile0(JNIEnv *env,
+ jclass thisclass, jstring java_fname, jint permission, jboolean shared) {
+- const char *fname = JNU_GetStringPlatformChars(env, java_fname, JNI_FALSE);
++ const char *fname = JNU_GetStringPlatformChars(env, java_fname, NULL);
+ int fd, rc;
+ int result[2];
+- jintArray javaResult;
++ jintArray javaResult = NULL;
+ int old_umask;
+ FLOCK fl;
+
++ if (!fname)
++ return javaResult;
++
+ fl.l_whence = SEEK_SET;
+ fl.l_len = 0;
+ fl.l_start = 0;
+@@ -104,7 +109,8 @@
+ }
+ JNU_ReleaseStringPlatformChars(env, java_fname, fname);
+ javaResult = (*env)->NewIntArray(env,2);
+- (*env)->SetIntArrayRegion(env, javaResult, 0, 2, result);
++ if (javaResult)
++ (*env)->SetIntArrayRegion(env, javaResult, 0, 2, result);
+ return javaResult;
+ }
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/windows/native/java/net/AbstractPlainDatagramSocketImpl.c Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,111 @@
++/*
++ * 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.
++ */
++
++#include <windows.h>
++#include <winsock2.h>
++
++#include "jvm.h"
++#include "jni_util.h"
++#include "net_util.h"
++
++#include "java_net_AbstractPlainDatagramSocketImpl.h"
++
++static jfieldID IO_fd_fdID = NULL;
++static jfieldID apdsi_fdID = NULL;
++
++static jfieldID apdsi_fd1ID = NULL;
++static jclass two_stacks_clazz = NULL;
++
++
++/*
++ * Class: java_net_AbstractPlainDatagramSocketImpl
++ * Method: init
++ * Signature: ()V
++ */
++JNIEXPORT void JNICALL
++Java_java_net_AbstractPlainDatagramSocketImpl_init(JNIEnv *env, jclass cls) {
++
++ apdsi_fdID = (*env)->GetFieldID(env, cls, "fd",
++ "Ljava/io/FileDescriptor;");
++ CHECK_NULL(apdsi_fdID);
++ IO_fd_fdID = NET_GetFileDescriptorID(env);
++ CHECK_NULL(IO_fd_fdID);
++
++ two_stacks_clazz = (*env)->FindClass(env, "java/net/TwoStacksPlainDatagramSocketImpl");
++ CHECK_NULL(two_stacks_clazz);
++
++ /* Handle both TwoStacks and DualStack here */
++
++ if (JNU_Equals(env, cls, two_stacks_clazz)) {
++ /* fd1 present only in TwoStack.. */
++ apdsi_fd1ID = (*env)->GetFieldID(env, cls, "fd1",
++ "Ljava/io/FileDescriptor;");
++ CHECK_NULL(apdsi_fd1ID);
++ }
++}
++
++/*
++ * Class: java_net_AbstractPlainDatagramSocketImpl
++ * Method: dataAvailable
++ * Signature: ()I
++ */
++JNIEXPORT jint JNICALL Java_java_net_AbstractPlainDatagramSocketImpl_dataAvailable
++(JNIEnv *env, jobject this) {
++ SOCKET fd;
++ SOCKET fd1;
++ int rv = -1, rv1 = -1;
++ jobject fdObj = (*env)->GetObjectField(env, this, apdsi_fdID);
++
++ if (!IS_NULL(fdObj)) {
++ int retval = 0;
++ fd = (SOCKET)(*env)->GetIntField(env, fdObj, IO_fd_fdID);
++ rv = ioctlsocket(fd, FIONREAD, &retval);
++ if (retval > 0) {
++ return retval;
++ }
++ }
++
++ if (!IS_NULL(apdsi_fd1ID)) {
++ /* TwoStacks */
++ jobject fd1Obj = (*env)->GetObjectField(env, this, apdsi_fd1ID);
++ if (!IS_NULL(fd1Obj)) {
++ int retval = 0;
++ fd1 = (SOCKET)(*env)->GetIntField(env, fd1Obj, IO_fd_fdID);
++ rv1 = ioctlsocket(fd1, FIONREAD, &retval);
++ if (retval > 0) {
++ return retval;
++ }
++ }
++ }
++
++ if (rv < 0 && rv1 < 0) {
++ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
++ "Socket closed");
++ return -1;
++ }
++
++ return 0;
++}
++
+--- ./jdk/src/windows/native/java/net/NetworkInterface_winXP.c Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/windows/native/java/net/NetworkInterface_winXP.c Mon Sep 08 12:16:34 2014 -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
+@@ -145,8 +145,12 @@
+ ptr = adapterInfo;
+ ret = NULL;
+ while (ptr != NULL) {
+- // IPv4 interface
+- if (ptr->Ipv6IfIndex == index) {
++ // in theory the IPv4 index and the IPv6 index can be the same
++ // where an interface is enabled for v4 and v6
++ // IfIndex == 0 IPv4 not available on this interface
++ // Ipv6IfIndex == 0 IPv6 not available on this interface
++ if (((ptr->IfIndex != 0)&&(ptr->IfIndex == index)) ||
++ ((ptr->Ipv6IfIndex !=0) && (ptr->Ipv6IfIndex == index))) {
+ ret = (IP_ADAPTER_ADDRESSES *) malloc(sizeof(IP_ADAPTER_ADDRESSES));
+ memcpy(ret, ptr, sizeof(IP_ADAPTER_ADDRESSES));
+ }
+@@ -241,7 +245,7 @@
+ * set the index to the IPv6 index and add the
+ * IPv6 addresses
+ */
+- nif->index = ptr->Ipv6IfIndex;
++ nif->ipv6Index = ptr->Ipv6IfIndex;
+ c = getAddrsFromAdapter(ptr, &nif->addrs);
+ nif->naddrs += c;
+ break;
+@@ -286,6 +290,9 @@
+ strcpy (nif->name, newname);
+ wcscpy ((PWCHAR)nif->displayName, ptr->FriendlyName);
+ nif->dNameIsUnicode = TRUE;
++
++ // the java.net.NetworkInterface abstraction only has index
++ // so the Ipv6IfIndex needs to map onto index
+ nif->index = ptr->Ipv6IfIndex;
+ nif->ipv6Index = ptr->Ipv6IfIndex;
+ nif->hasIpv6Address = TRUE;
+@@ -442,7 +449,6 @@
+ (*env)->SetObjectField(env, netifObj, ni_nameID, name);
+ (*env)->SetObjectField(env, netifObj, ni_displayNameID, displayName);
+ (*env)->SetIntField(env, netifObj, ni_indexID, ifs->index);
+-
+ /*
+ * Get the IP addresses for this interface if necessary
+ * Note that 0 is a valid number of addresses.
+--- ./jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2008, 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
+@@ -213,6 +213,14 @@
+ void
+ SplashRedrawWindow(Splash * splash)
+ {
++ if (!SplashIsStillLooping(splash)) {
++ KillTimer(splash->hWnd, 0);
++ }
++
++ if (splash->currentFrame < 0) {
++ return;
++ }
++
+ SplashUpdateScreenData(splash);
+ if (splash->isLayered) {
+ BLENDFUNCTION bf;
+@@ -303,9 +311,6 @@
+ time = 0;
+ SetTimer(splash->hWnd, 0, time, NULL);
+ }
+- else {
+- KillTimer(splash->hWnd, 0);
+- }
+ }
+
+ void SplashReconfigureNow(Splash * splash) {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,104 @@
++/*
++ * 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 8032078
++ @summary Frame.setExtendedState throws RuntimeException, if
++ windowState=ICONIFIED|MAXIMIZED_BOTH, on OS X
++ @author Anton Litvinov
++*/
++
++import java.awt.*;
++
++import sun.awt.SunToolkit;
++
++public class ExceptionOnSetExtendedStateTest {
++ private static final int[] frameStates = { Frame.NORMAL, Frame.ICONIFIED, Frame.MAXIMIZED_BOTH };
++ private static final SunToolkit toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
++
++ private static boolean validatePlatform() {
++ String osName = System.getProperty("os.name");
++ if (osName == null) {
++ throw new RuntimeException("Name of the current OS could not be retrieved.");
++ }
++ return osName.startsWith("Mac");
++ }
++
++ private static void testStateChange(int oldState, int newState, boolean decoratedFrame) {
++ System.out.println(String.format(
++ "testStateChange: oldState='%d', newState='%d', decoratedFrame='%b'",
++ oldState, newState, decoratedFrame));
++
++ Frame frame = new Frame("ExceptionOnSetExtendedStateTest");
++ frame.setSize(200, 200);
++ frame.setUndecorated(!decoratedFrame);
++ frame.setVisible(true);
++ toolkit.realSync();
++
++ frame.setExtendedState(oldState);
++ sleep(1000);
++ frame.setExtendedState(newState);
++
++ boolean stateWasNotChanged = true;
++ int currentState = 0;
++ for (int i = 0; (i < 3) && stateWasNotChanged; i++) {
++ sleep(1000);
++ currentState = frame.getExtendedState();
++ if ((currentState == newState) ||
++ (((newState & Frame.ICONIFIED) != 0) && ((currentState & Frame.ICONIFIED) != 0))) {
++ stateWasNotChanged = false;
++ }
++ }
++ frame.dispose();
++
++ if (stateWasNotChanged) {
++ throw new RuntimeException(String.format(
++ "Frame state was not changed. currentState='%d'", currentState));
++ }
++ }
++
++ private static void sleep(int millis) {
++ try {
++ Thread.sleep(millis);
++ } catch (Exception e) {
++ e.printStackTrace();
++ }
++ }
++
++ public static void main(String[] args) {
++ if (!validatePlatform()) {
++ System.out.println("This test is only for OS X.");
++ return;
++ }
++
++ // Verify that changing states of decorated/undecorated frame to/from supported states
++ // and the state bit mask ICONIFIED | MAXIMIZED_BOTH does not raise RuntimeException.
++ for (int i = 0; i < frameStates.length; i++) {
++ testStateChange(frameStates[i], Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, true);
++ testStateChange(frameStates[i], Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, false);
++ testStateChange(Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, frameStates[i], true);
++ // Uncomment the line below, when 8026143 is ported to JDK 7.
++ //testStateChange(Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, frameStates[i], false);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/image/ImageIconHang.java Mon Sep 08 12:16:34 2014 -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.
++ *
++ * 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.*;
++
++/*
++ * @test
++ * @bug 8032788
++ * @summary Checks that null filename argument is processed correctly
++ *
++ * @run main ImageIconHang
++ */
++public class ImageIconHang {
++ public static void main(String[] args) throws Exception {
++ Image image = Toolkit.getDefaultToolkit().getImage((String) null);
++ MediaTracker mt = new MediaTracker(new Component() {});
++ mt.addImage(image, 1);
++ mt.waitForID(1, 5000);
++
++ int status = mt.statusID(1, false);
++
++ System.out.println("Status: " + status);
++
++ if (status != MediaTracker.ERRORED) {
++ throw new RuntimeException("MediaTracker.waitForID() hung.");
++ }
++ }
++}
+--- ./jdk/test/java/lang/invoke/MethodHandlesTest.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/test/java/lang/invoke/MethodHandlesTest.java Mon Sep 08 12:16:34 2014 -0700
+@@ -140,7 +140,7 @@
+ Object actual = calledLog.get(calledLog.size() - 1);
+ if (expected.equals(actual) && verbosity < 9) return;
+ System.out.println("assertCalled "+name+":");
+- System.out.println("expected: "+expected);
++ System.out.println("expected: "+deepToString(expected));
+ System.out.println("actual: "+actual);
+ System.out.println("ex. types: "+getClasses(expected));
+ System.out.println("act. types: "+getClasses(actual));
+@@ -148,7 +148,25 @@
+ }
+ static void printCalled(MethodHandle target, String name, Object... args) {
+ if (verbosity >= 3)
+- System.out.println("calling MH="+target+" to "+name+Arrays.toString(args));
++ System.out.println("calling MH="+target+" to "+name+deepToString(args));
++ }
++ static String deepToString(Object x) {
++ if (x == null) return "null";
++ if (x instanceof Collection)
++ x = ((Collection)x).toArray();
++ if (x instanceof Object[]) {
++ Object[] ax = (Object[]) x;
++ ax = Arrays.copyOf(ax, ax.length, Object[].class);
++ for (int i = 0; i < ax.length; i++)
++ ax[i] = deepToString(ax[i]);
++ x = Arrays.deepToString(ax);
++ }
++ if (x.getClass().isArray())
++ try {
++ x = Arrays.class.getMethod("toString", x.getClass()).invoke(null, x);
++ } catch (ReflectiveOperationException ex) { throw new Error(ex); }
++ assert(!(x instanceof Object[]));
++ return x.toString();
+ }
+
+ static Object castToWrapper(Object value, Class<?> dst) {
+@@ -230,6 +248,12 @@
+ { param = c; break; }
+ }
+ }
++ if (param.isArray()) {
++ Class<?> ctype = param.getComponentType();
++ Object arg = Array.newInstance(ctype, 2);
++ Array.set(arg, 0, randomArg(ctype));
++ return arg;
++ }
+ if (param.isInterface() && param.isAssignableFrom(List.class))
+ return Arrays.asList("#"+nextArg());
+ if (param.isInterface() || param.isAssignableFrom(String.class))
+@@ -584,6 +608,16 @@
+ testFindVirtual(IntExample.Impl.class, IntExample.class, void.class, "Int/v0");
+ }
+
++ @Test
++ public void testFindVirtualClone() throws Throwable {
++ // test some ad hoc system methods
++ testFindVirtual(false, PUBLIC, Object.class, Object.class, "clone");
++ testFindVirtual(true, PUBLIC, Object[].class, Object.class, "clone");
++ testFindVirtual(true, PUBLIC, int[].class, Object.class, "clone");
++ for (Class<?> cls : new Class<?>[]{ boolean[].class, long[].class, float[].class, char[].class })
++ testFindVirtual(true, PUBLIC, cls, Object.class, "clone");
++ }
++
+ void testFindVirtual(Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable {
+ Class<?> rcvc = defc;
+ testFindVirtual(rcvc, defc, ret, name, params);
+@@ -596,6 +630,9 @@
+ void testFindVirtual(Lookup lookup, Class<?> rcvc, Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable {
+ testFindVirtual(true, lookup, rcvc, defc, ret, name, params);
+ }
++ void testFindVirtual(boolean positive, Lookup lookup, Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable {
++ testFindVirtual(positive, lookup, defc, defc, ret, name, params);
++ }
+ void testFindVirtual(boolean positive, Lookup lookup, Class<?> rcvc, Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable {
+ countTest(positive);
+ String methodName = name.substring(1 + name.indexOf('/')); // foo/bar => foo
+@@ -635,8 +672,21 @@
+ Object[] argsWithSelf = randomArgs(paramsWithSelf);
+ if (selfc.isAssignableFrom(rcvc) && rcvc != selfc) argsWithSelf[0] = randomArg(rcvc);
+ printCalled(target, name, argsWithSelf);
+- target.invokeWithArguments(argsWithSelf);
+- assertCalled(name, argsWithSelf);
++ Object res = target.invokeWithArguments(argsWithSelf);
++ if (Example.class.isAssignableFrom(defc) || IntExample.class.isAssignableFrom(defc)) {
++ assertCalled(name, argsWithSelf);
++ } else if (name.equals("clone")) {
++ // Ad hoc method call outside Example. For Object[].clone.
++ printCalled(target, name, argsWithSelf);
++ assertEquals(MethodType.methodType(Object.class, rcvc), target.type());
++ Object orig = argsWithSelf[0];
++ assertEquals(orig.getClass(), res.getClass());
++ if (res instanceof Object[])
++ assertArrayEquals((Object[])res, (Object[])argsWithSelf[0]);
++ assert(Arrays.deepEquals(new Object[]{res}, new Object[]{argsWithSelf[0]}));
++ } else {
++ assert(false) : Arrays.asList(positive, lookup, rcvc, defc, ret, name, deepToString(params));
++ }
+ if (verbosity >= 1)
+ System.out.print(':');
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/invoke/ObjectMethodInInterfaceTest.java Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,46 @@
++/*
++ * 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 8031502
++ * @summary JSR292: IncompatibleClassChangeError in LambdaForm for CharSequence.toString() method handle type converter
++ * @compile ObjectMethodInInterfaceTest.java
++ * @run main/othervm -Djava.lang.invoke.MethodHandle.COMPILE_THRESHOLD=0 test.java.lang.invoke.ObjectMethodInInterfaceTest
++ */
++package test.java.lang.invoke;
++
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodHandles;
++import java.lang.invoke.MethodType;
++
++public class ObjectMethodInInterfaceTest {
++ public static void main(String[] args) throws Throwable {
++ MethodHandle mh = MethodHandles.lookup().findVirtual(CharSequence.class, "toString", MethodType.methodType(String.class));
++ MethodType mt = MethodType.methodType(Object.class, CharSequence.class);
++ mh = mh.asType(mt);
++
++ Object res = mh.invokeExact((CharSequence)"123");
++
++ System.out.println("TEST PASSED");
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/net/NetworkInterface/UniqueMacAddressesTest.java Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,129 @@
++/*
++ * 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.net.InetAddress;
++import java.net.NetworkInterface;
++import java.net.SocketException;
++import java.util.ArrayList;
++import java.util.Arrays;
++import java.util.Enumeration;
++import java.util.List;
++
++
++/*
++ * @test
++ * @bug 8021372
++ * @summary Tests that the MAC addresses returned by NetworkInterface.getNetworkInterfaces are unique for each adapter.
++ *
++ */
++public class UniqueMacAddressesTest {
++
++ public static void main(String[] args) throws Exception {
++ new UniqueMacAddressesTest().execute();
++ System.out.println("UniqueMacAddressesTest: OK");
++ }
++
++ public UniqueMacAddressesTest() {
++ System.out.println("UniqueMacAddressesTest: start ");
++ }
++
++ public void execute() throws Exception {
++ Enumeration<NetworkInterface> networkInterfaces;
++ boolean areMacAddressesUnique = false;
++ List<NetworkInterface> networkInterfaceList = new ArrayList<NetworkInterface>();
++ networkInterfaces = NetworkInterface.getNetworkInterfaces();
++
++ // build a list of NetworkInterface objects to test MAC address
++ // uniqueness
++ createNetworkInterfaceList(networkInterfaces, networkInterfaceList);
++ areMacAddressesUnique = checkMacAddressesAreUnique(networkInterfaceList);
++ if (!areMacAddressesUnique) {
++ throw new RuntimeException("mac address uniqueness test failed");
++ }
++ }
++
++ private boolean checkMacAddressesAreUnique (
++ List<NetworkInterface> networkInterfaces) throws Exception {
++ boolean uniqueMacAddresses = true;
++ for (NetworkInterface networkInterface : networkInterfaces) {
++ for (NetworkInterface comparisonNetIf : networkInterfaces) {
++ System.out.println("Comparing netif "
++ + networkInterface.getName() + " and netif "
++ + comparisonNetIf.getName());
++ if (testMacAddressesEqual(networkInterface, comparisonNetIf)) {
++ uniqueMacAddresses = false;
++ break;
++ }
++ }
++ if (uniqueMacAddresses != true)
++ break;
++ }
++ return uniqueMacAddresses;
++ }
++
++ private boolean testMacAddressesEqual(NetworkInterface netIf1,
++ NetworkInterface netIf2) throws Exception {
++
++ byte[] rawMacAddress1 = null;
++ byte[] rawMacAddress2 = null;
++ boolean macAddressesEqual = false;
++ if (!netIf1.getName().equals(netIf2.getName())) {
++ System.out.println("compare hardware addresses "
++ + createMacAddressString(netIf1) + " and " + createMacAddressString(netIf2));
++ rawMacAddress1 = netIf1.getHardwareAddress();
++ rawMacAddress2 = netIf2.getHardwareAddress();
++ macAddressesEqual = Arrays.equals(rawMacAddress1, rawMacAddress2);
++ } else {
++ // same interface
++ macAddressesEqual = false;
++ }
++ return macAddressesEqual;
++ }
++
++ private String createMacAddressString (NetworkInterface netIf) throws Exception {
++ byte[] macAddr = netIf.getHardwareAddress();
++ StringBuilder sb = new StringBuilder();
++ if (macAddr != null) {
++ for (int i = 0; i < macAddr.length; i++) {
++ sb.append(String.format("%02X%s", macAddr[i],
++ (i < macAddr.length - 1) ? "-" : ""));
++ }
++ }
++ return sb.toString();
++ }
++
++ private void createNetworkInterfaceList(Enumeration<NetworkInterface> nis,
++ List<NetworkInterface> networkInterfaceList) throws Exception {
++ byte[] macAddr = null;
++ NetworkInterface netIf = null;
++ while (nis.hasMoreElements()) {
++ netIf = (NetworkInterface) nis.nextElement();
++ macAddr = netIf.getHardwareAddress();
++ if (macAddr != null) {
++ System.out
++ .println("Adding NetworkInterface " + netIf.getName());
++ networkInterfaceList.add(netIf);
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/crypto/Cipher/CipherStreamClose.java Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,167 @@
++/*
++ * 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 7160837
++ * @summary Make sure Cipher IO streams doesn't call extra doFinal if close()
++ * is called multiple times. Additionally, verify the input and output streams
++ * match with encryption and decryption with non-stream crypto.
++ */
++
++import java.io.*;
++import java.security.DigestOutputStream;
++import java.security.DigestInputStream;
++import java.security.MessageDigest;
++import java.util.Arrays;
++
++import javax.crypto.Cipher;
++import javax.crypto.CipherOutputStream;
++import javax.crypto.CipherInputStream;
++import javax.crypto.SecretKey;
++import javax.crypto.spec.SecretKeySpec;
++import javax.xml.bind.DatatypeConverter;
++
++public class CipherStreamClose {
++ private static final String message = "This is the sample message";
++ static boolean debug = false;
++
++ /*
++ * This method does encryption by cipher.doFinal(), and not with
++ * CipherOutputStream
++ */
++ public static byte[] blockEncrypt(String message, SecretKey key)
++ throws Exception {
++
++ byte[] data;
++ Cipher encCipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
++ encCipher.init(Cipher.ENCRYPT_MODE, key);
++ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
++ try (ObjectOutputStream oos = new ObjectOutputStream(bos)) {
++ oos.writeObject(message);
++ }
++ data = bos.toByteArray();
++ }
++
++ if (debug) {
++ System.out.println(DatatypeConverter.printHexBinary(data));
++ }
++ return encCipher.doFinal(data);
++
++ }
++
++ /*
++ * This method does decryption by cipher.doFinal(), and not with
++ * CipherIntputStream
++ */
++ public static Object blockDecrypt(byte[] data, SecretKey key)
++ throws Exception {
++
++ Cipher c = Cipher.getInstance("AES/ECB/PKCS5Padding");
++ c.init(Cipher.DECRYPT_MODE, key);
++ data = c.doFinal(data);
++ try (ByteArrayInputStream bis = new ByteArrayInputStream(data)) {
++ try (ObjectInputStream ois = new ObjectInputStream(bis)) {
++ return ois.readObject();
++ }
++ }
++ }
++
++ public static byte[] streamEncrypt(String message, SecretKey key,
++ MessageDigest digest)
++ throws Exception {
++
++ byte[] data;
++ Cipher encCipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
++ encCipher.init(Cipher.ENCRYPT_MODE, key);
++ try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
++ DigestOutputStream dos = new DigestOutputStream(bos, digest);
++ CipherOutputStream cos = new CipherOutputStream(dos, encCipher)) {
++ try (ObjectOutputStream oos = new ObjectOutputStream(cos)) {
++ oos.writeObject(message);
++ }
++ data = bos.toByteArray();
++ }
++
++ if (debug) {
++ System.out.println(DatatypeConverter.printHexBinary(data));
++ }
++ return data;
++ }
++
++ public static Object streamDecrypt(byte[] data, SecretKey key,
++ MessageDigest digest) throws Exception {
++
++ Cipher decCipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
++ decCipher.init(Cipher.DECRYPT_MODE, key);
++ digest.reset();
++ try (ByteArrayInputStream bis = new ByteArrayInputStream(data);
++ DigestInputStream dis = new DigestInputStream(bis, digest);
++ CipherInputStream cis = new CipherInputStream(dis, decCipher)) {
++
++ try (ObjectInputStream ois = new ObjectInputStream(cis)) {
++ return ois.readObject();
++ }
++ }
++ }
++
++ public static void main(String[] args) throws Exception {
++ MessageDigest digest = MessageDigest.getInstance("SHA1");
++ SecretKeySpec key = new SecretKeySpec(
++ DatatypeConverter.parseHexBinary(
++ "12345678123456781234567812345678"), "AES");
++
++ // Run 'message' through streamEncrypt
++ byte[] se = streamEncrypt(message, key, digest);
++ // 'digest' already has the value from the stream, just finish the op
++ byte[] sd = digest.digest();
++ digest.reset();
++ // Run 'message' through blockEncrypt
++ byte[] be = blockEncrypt(message, key);
++ // Take digest of encrypted blockEncrypt result
++ byte[] bd = digest.digest(be);
++ // Verify both returned the same value
++ if (!Arrays.equals(sd, bd)) {
++ System.err.println("Stream: "+DatatypeConverter.printHexBinary(se)+
++ "\t Digest: "+DatatypeConverter.printHexBinary(sd));
++ System.err.println("Block : "+DatatypeConverter.printHexBinary(be)+
++ "\t Digest: "+DatatypeConverter.printHexBinary(bd));
++ throw new Exception("stream & block encryption does not match");
++ }
++
++ digest.reset();
++ // Sanity check: Decrypt separately from stream to verify operations
++ String bm = (String) blockDecrypt(be, key);
++ if (message.compareTo(bm) != 0) {
++ System.err.println("Expected: "+message+"\nBlock: "+bm);
++ throw new Exception("Block decryption does not match expected");
++ }
++
++ // Have decryption and digest included in the object stream
++ String sm = (String) streamDecrypt(se, key, digest);
++ if (message.compareTo(sm) != 0) {
++ System.err.println("Expected: "+message+"\nStream: "+sm);
++ throw new Exception("Stream decryption does not match expected.");
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8027359/XML11EntityScannerTest.java Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,184 @@
++/*
++ * 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 8027359
++ * @summary test that the XML11EntityScanner refreshes cache when it loads new data
++ * @run main XML11EntityScannerTest
++ */
++
++import java.io.*;
++import java.util.regex.Pattern;
++import javax.xml.parsers.DocumentBuilderFactory;
++import org.w3c.dom.*;
++
++
++/**
++ * XML11EntityScanner functions similarly as XMLEntityScanner in handling data
++ * cache
++ */
++public class XML11EntityScannerTest {
++ static final String rawXML =
++ "<?xml version=\"1.1\" encoding=\"UTF-8\" standalone=\"no\"?>"
++ + "<WebOfTrustRC2 Version=\"4004\">"
++ + "<Identity Name=\"maggot\" PublishesTrustList=\"true\" Version=\"1\">"
++ + "<Context Name=\"Introduction\"/>"
++ + "<Context Name=\"FreetalkRC2\"/>"
++ + "<Property Name=\"IntroductionPuzzleCount\" Value=\"10\"/>"
++ + "<TrustList>"
++ + "<Trust Comment=\"\" Identity=\"USK@fdZ2In5mnLVG6RTc5hq9P~M1EG0WuH-itZ7mnQx2iuM,aUG-57VqxQLhQ4N1uNmH9kSI2syEfVFrVOIPAKTY2Yg,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@YwwRkHSo-xU8CvSFcLqlU2FFsQ3ztjr0X~xPXkX-klY,poB3tdcXrBU9naI0pyNVYp~zQmHaFkRRTj8xB8tuiPc,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@lsd~~79wrGvfb99FnAEY4VhJg2b5KFUloCOUff-Q2fk,71eV-F580euOtaCgim69Yw~2Rjh43DT49sl6zNamjk0,AQACAAE/WebOfTrustRC2/47\" Value=\"100\"/>"
++ + "<Trust Comment=\"Automatically assigned trust to a seed identity.\" Identity=\"USK@xyzElfFQnwBb4ZuSEh1aSNsbRjEGCTa-2rcjeW58A4E,TiYrXSCcoGETPf0TWLNthaimJEP1PW7nJ2tYXKxdC4s,AQACAAE/WebOfTrustRC2/456\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@pTtYoCsMO-~~2Grqya6Y7cf7nIU3VlL4168-c6EIwA8,QabBgrH1LYKKyBROnWz1r6iI8N7WFTt-mKD-0Qxsw1w,AQACAAE/WebOfTrustRC2/133\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@m~lDSvnetPNy77wsoxDZDUf7OkgX6ZAd7ob9orm3J4Y,SEX20g148KGJg3bsxvXNPNbUsVs1yQ5LfVUOGMh~1Q0,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@ss5yQit~bQL5easM68d4sImnPAxHNUbi99XtDMhpzgQ,CnpuD8dO29KvpkQyxtz1llAxHCB7yXfqrQLNRIELZow,AQACAAE/WebOfTrustRC2/2\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@krPcyGts~~wZTbABTAJ59nSplmum2~EkSD5IzinrFko,7YEbm-YEx1LFoZVHtGmIa5q0KbEjw48Rgwx2NqwrH~o,AQACAAE/WebOfTrustRC2/15\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@Usl-yNWc3VtuQWQ9srowZaWyfB6MiD9fzM5WexrlKE8,qMS83aGFsN~aFGajUmGrnbXvRIYZMd8N8IjnGmEvi-s,AQACAAE/WebOfTrustRC2/68\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@St0yKRdQJ3Lq17yoVt9h08bMfhqRhH1vtrcVVInoZVU,BaYM72qM3CYO1yzfVyO1UDUobL56CMbt9EQt3sEXabA,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@P8v4ZHUBPYGylYC-KHeWmeu5ZvB6RPYGgKcI5639Wz8,OM9PvjwMlt4L6jKRhqpvyblwpVMYumUgYFrAu3NxY~o,AQACAAE/WebOfTrustRC2/54\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@u2vn3Lh6Kte2-TgBSNKorbsKkuAt34ckoLmgx0ndXO0,4~q8q~3wIHjX9DT0yCNfQmr9oxmYrDZoQVLOdNg~yk0,AQACAAE/WebOfTrustRC2/2\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@MotrIucaZk37pJNS~HHpW5Vea3q0EZpfENPNGSjWh9s,RkFyDjl6-l7V-xYMWtGypmDYk-VehAU1LXmNYdIlHJs,AQACAAE/WebOfTrustRC2/108\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@KXAWN8DJxJ48XzZu7IBBpZ7SFc4n-OXqu4HhQC0V9Ww,DyklyACbgDCZyFpq-LeNqmuve7KWv-WDvJicd37ycn4,AQACAAE/WebOfTrustRC2/11\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@D6BZ1sSEmDMKNMPUN9I~7AalkkXockAdtbxONEN315w,0LiGUSSv4Ln4O7Xe4GQjpMEflNN7okKAH42Vlpv8d8s,AQACAAE/WebOfTrustRC2/56\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@sDehmSJoiaKYT455GIGHIVNKMs7KmiiwXXcCIcDhZ3o,upypWy-ze9Cz7WiCnbbJmoZOh7Xtveitftc5bE~p0Ug,AQACAAE/WebOfTrustRC2/6\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@GsTGXzIm9BTM5~KSZJknfTcPpJtlRs62aJtkNp05T5A,wuQcDjsdPQD9Fa21zWGB5GiiDlmf56vI9Niu5jl8eiM,AQACAAE/WebOfTrustRC2/31\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@eLFdT9VWP60iPNf8a3AkZrzgkcgje2n3Ca1yS8Tc5HU,5D0PISp19VkgzD4VSrRFTmo2CCvRoIuxlQzgMZBmj74,AQACAAE/WebOfTrustRC2/62\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@rz12UCXn-lG53i-6JswD98Kk9Zp0kt05gqIMNYc~9d0,42hoYZ5f~1fPuyvTOVYGJ~28MgYBSfoyzceR8-u1Z2I,AQACAAE/WebOfTrustRC2/126\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@5CYp3t28N5ZbPss9XhOkwUjD~T65q6-nc4aGwbV~-O0,CBfwMjYBiqKunzj3k6Ofpo9pyQsVFPz0OUWVzfd5a0c,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@dSSrRL9BY7JmTQD0dCpcIgVaLFF7pqU8EJzVUp1BYPA,EkTPkLrhEBQLPq-dRVPB1f2CAVdFGbXbUBlIww6re60,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@cw2rrCAcYTBjlO-I8DfEj-txttebZMG2LwuPGJV3Qlg,5ZcXLJW8G-R2SFqg4TEQX7IMs~e3Q4DjxUXGuHr9fxA,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@7zpRmhkkd5XcAUY6yUwp-53t7to3UN96w98~KQEwha0,30VpXev32s2mhmM5aBRJ---I0OlYbbN6~18j8rJ6qMU,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@YmCWYwlaSeE8o~8GawGYWeuPwsgVQtlBwlBkhGQFX04,H3DthY0MZXTe4rL0vsUOOMQDaj6UB9wK59yEwG8Q6No,AQACAAE/WebOfTrustRC2/13\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@aO9svsQEWmib~UyF1ihRUHA8i6uZprGy-tIS-Od9MMk,kwaMemPMVp-jcIRgGLAdF6PZimNE2cZFbvM6ShXAuZw,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@6J7FWPHwiCElTRXAO77tMGYAiLxerNF~5olAG0alQxQ,cz72iTz9FT~H57TgroVFv1eZlN5Ia5dhCtRa8bLh1KQ,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@kukYpNG56TNUnQzQe1RZvSYoqQ5B9lcoMZyDlh7xfO4,DNybejZVcWBAaByMRYYLZlgzUjQg28V8j6Zu1CtBc~g,AQACAAE/WebOfTrustRC2/27\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@a-tin0kMl1I~8xn5lkQDqYZRExKLzJITrxcNsr4T~fY,0VmnI67gAzIpdXlZFq~hYD8ikR5IEAg5QTwQv5Ifv5M,AQACAAE/WebOfTrustRC2/24\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@g~4XXw0hjp9TLocYZzunYWX6Don2AQhG-zplmzoCmY0,lyNjClSjRCrBZXVcmPKEAfvH01ySPgv1NWqL8wd11L8,AQACAAE/WebOfTrustRC2/115\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@UXgNMPe1YbVpXHOBXgMlcm9XcGY0G3gUtu43IO-YLLA,7EHSp20GHupg0rWrGPRY1g0TFJcRs-kubVtAcQRMxAc,AQACAAE/WebOfTrustRC2/69\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@lHrF2trsC9gyVeT2zpoL6IlZMz0aKlhN4xa2Ig70rmA,niASdKFC3nDfW6KMvzcv6VmRoHakE7GQAFpfz~2-v3Y,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@hp7IFNYSA97cHNAnHcreTJjQE5fF5sbsFlvbcZXaoxQ,O5h6cAcl5MvxuE2-xOkuvUP4JkT59NQNtaSmtuAS2Y8,AQACAAE/WebOfTrustRC2/16\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@QKPxALYrv6UyAGJs7tor8YlcikFzmy2msZ~42JMT~80,vx01piijkj0o3K8gzNaAOIIZ7NAtQVvPBxlRKtc4iP0,AQACAAE/WebOfTrustRC2/35\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@NmNfUNIr2WwIb9Ej1038Pk0M5gS1M0eHKvxdWqRUfTg,JUJYTsWuNQPOHK039Rczp6oPZDbfPdbO62gSaCuBXFQ,AQACAAE/WebOfTrustRC2/69\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@ONB7kRFo7mI0O3~QLRWlTbo1oB91XmGGS7KtSzz4XVI,yGiqMWRwR~i6ffAXOTBvrngHGC6nYOETUXj4L6Izj64,AQACAAE/WebOfTrustRC2/122\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@k-i0PmxoxO6Mahx8s850Rd7TEe0r4cnEohqC66aMDKw,IlTVYmQ9OSHjiu5pOLq4t-8r50SsVPNMlXn56zfpfDI,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@GtzvV-VHMGQILkpZ3O4CWBTWlhB423UUwpIlzRDgBLs,HUxBDT-Hhy6GqjBV24NRMjlK-o76YGMEgO~ZS6yighU,AQACAAE/WebOfTrustRC2/6\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@Ws0yzkcOYw6ax~kCtnzyX4MgLBHiQd5a6u9FMUmqLG4,zqNjNNGLz7HE4pdSPTovX2AwzGQWJ3-LI7YZt7aq3gg,AQACAAE/WebOfTrustRC2/30\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@6brkdrKlglWHnqMjWG6wrdLMWGPooc~7wQ7ID-PIsJk,X3RRBIdOQ5zthpkk8FjLL33LyoVVI4csJ1~g~sZ1msc,AQACAAE/WebOfTrustRC2/63\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@4DO0Yp1a3RZeAUAjeoPVu~GqpKhaX8RYqe~mwcWgjsM,klsqky963KI6uG3JqE1crihSeBbKBgkJHkIZ2xkWJ4A,AQACAAE/WebOfTrustRC2/36\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@axtoU6zHIkx3bicWK-hLNOj0br4xi0HW1qZ8H6CEv0U,SuPIncAHyYXmR9jQkTFUJd-QgGm0g9lW5ESUjzFOl~Q,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@BYsosP8TA22rSz1uA0KGbp6OVFZXhdgAlpH4R4hX9zE,o~qV5IzMR3m7ZOnnG5FPnDqpdffEpu7yOM7VEU9j6lQ,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@EilKmVin5cVL7b4FoEQ7ZoHS932O8OI880Qkd~tmzWs,8WK34lo95u~b60GLVczYU6EiRpY0LH7130~ASP9F6dU,AQACAAE/WebOfTrustRC2/75\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@xDYiCplSPLvFGC2dQjAC6eeaYVyQMtV-HmkpuKIJPgQ,CYKZcPacSNfB67IK10xlq7~bAqR-aOnZIA~yhHs2Hj0,AQACAAE/WebOfTrustRC2/71\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@DfCUA1sEJgiGzijEO0BWgeGjjHi28GGgv76H4rLujp8,1lnaOtPiXmvhpRZkBamZNF47uETNKIBgjSzElxcLhZc,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@F45FWNz9rs6TmafG~6n5Bg3Sr69YCHY9v01KTyK17lw,ikIvUS079Qw3aQknvdM8yKgr0XwjcqHgW0pWLu-1osA,AQACAAE/WebOfTrustRC2/13\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@VTDWbj9C5FUEXZBQRXmSsV1aEdOfsB9QHKzZ7-CnCh4,aDjtAVMuGPpCmw1rnCAj5myEnq9HYZeIzrfrhJO2JNw,AQACAAE/WebOfTrustRC2/52\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@dhYMUELq~HtJOweiV2JkGcoFS6hulHd9O~7a9LpGIxM,M-H3ySL8BdCctDUvwvbFNwHUyO1zghSNyotLqkKowi8,AQACAAE/WebOfTrustRC2/20\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@oRpTFVvCqp8qFWiZyCh2QhQ85eh3eP8C8G4YTFhm~rw,kyyeUPuksdt7omGFYFxoWPz3lu6e0q~G1HBx8wFztFc,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@RINL4YHPkTUGBWSoohAoO7Knzk89XSnqnQ6pUZkRY~w,OvIyTUUf4T2Tm46-em~A7zn1zBksIwe-hJP3KKdCe6s,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@sEZ-eWgUcQSj-To7lClNN6QNoKuvt0Cz3iTGKv63wQo,krEwvob7MhJ-pGvIk-RM8pVDPFSuXYTZw58oc2Lc49o,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@gNTVpdblFLSKMzUBEQM8YTfrO2fQQNIZeV7yJRTqYTQ,EKJhCmbQ5hpMU3cd-J91uneBF7CxTLPqffPs6DxoSMs,AQACAAE/WebOfTrustRC2/21\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@AV8Ubs8pbsMQ1F028a~pSJqtatznLjvhnwfSAtm1QKg,lUHPp~mgzV-pVoG9lYpceL6oOUtFRpvyQjGQdfx1GjY,AQACAAE/WebOfTrustRC2/41\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@xb3QGWdoUpeX9Fn1ZKeDwGN884c2XAMTpYLM9z4OIKo,aWNEDvjhhacFKAjiYJLaUnK1e7dQ9sCk-cnqkGZd7F8,AQACAAE/WebOfTrustRC2/9\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@MrxyFFM~n-kZ4kYvOOZodsvAA2vwp2XtAQJCrkEEU6s,tSHvx3u7uJN8ciaTqBIzt3lLmonM9mj6I7pz88MtBXc,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@-tpkd0enlFMTnjANRjzMKyfE3uyXU-WDX8VUqk3MXEg,J6h7edIdQCsiuc53qahzMzxsyNayXL~9IR0x5QoJVxk,AQACAAE/WebOfTrustRC2/15\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@gBQsXbnA9HX6wQB8x7DIEJT6e7lOxq5jGF353Po~p90,HjdyCLfG9r-zSBN6-AXwA1he9blIO2WEN9u7dMQ7H1w,AQACAAE/WebOfTrustRC2/13\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@ye~rQ4m~pu2Iu3O2TH-GOLBbSeKoQ~QR~vC6tJbKmDg,YSuI-J1nKZjGB2zmIa9Bh2Wtud~jzYBuR7OVhXYh7qM,AQACAAE/WebOfTrustRC2/99\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@HwgX8mU9A7bd2sCsM9And7fotpMGqfba9LzxZtOHHOU,10nYjjfKDH5RB3YvCCi5bpq4GPR-myd8ea7n8DRvx~c,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@qQArPJZuODDeM6C2ndbSczsFLWmLDm2SoaE-9F1hwQU,E3x6TbIvBj~6D9GrMUWSYgnNkLRg85BXXy5~mncoNEI,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@4hm9fo4IN0akORyJECttbEGZ~rPCPQ9KKAAH2AWMy8E,klvTyVp-GJznJq8Sln4W2GUfV6tVX2TI2sPCGBFU4tM,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@x7SDH5rL2-tGOaOKFFNMRrylCq94OfiZTWt4t3nwRHk,~E-kX9VqlANo4MeccvNlXDIjJ5xTWTEDNW-Qk04Ke6U,AQACAAE/WebOfTrustRC2/17\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@A9RAAKmky5yroigSupz6Bvrmc4q5FN1SXSrSXa6oRUg,s3RfurouqPnKmlGRkERao6jOJv9kcrVBBKAHqZVuQH4,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@yEstdNIW54-3~YA7QnYodpyWgPZStskrN9WXLHujUrE,j4PciAtpUHOjR2wmaaCKwiryJAi~exjETJ13UPGJLTg,AQACAAE/WebOfTrustRC2/58\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@NZSwPe8RJQOTSQ-~cAuxy97ieuX9reSft0cyD0vfbJg,99y8KOdRJmVLCWqryDzB8NdBrQGY7V9JDFtgCQBuGsU,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@Nq6iEvHP0B2VCszLCenQrfyJmkD0vas~00-9MoWgcTA,6dI2kB1z9mtjwITkhc9~V86QE5gM9CJBMjdpvRzKAoY,AQACAAE/WebOfTrustRC2/29\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@ZaNXnLCT7OQrwhp4I9V-rI1ZAV9WzegFj0HSaEJQ-Z4,i23K-dQupDenVE8O3xGv92vVanfDeyjLYWescevMbGg,AQACAAE/WebOfTrustRC2/14\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@53e9r9zEkJ0TRW~Tq8XIWjZ3WkL7Jv5Ez8LDhdwwzwM,7a0vL0OmWkHy3gC5Zs~MxB4k0QppwK4igrH6iuwls68,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@W1c~RYRC09xIHiHIucfV~Rj4J8uKAGrUeHmrH-q-U1c,niOrI75WMQ-Dtl9luIbKBmnvf6chkQEKvUvoKvSjhxI,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@G6zv74PaPcVZcf78lWp-e1TfrCSNZa1ZaPvmjm7DVzk,f4Ft3sLQ6cUEwpumpTMt5N17UORfZoXjGfmke5PJbdc,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@m5ILsPVAlcOY5D91J2iQu~PIntZb3L-B1VkONjEZs2k,592dl39JXIF1kpC4OMkw7ELOhdPrn~WXBsZln20pM7Q,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@iK69tf7gzQ53oZV60rF6ZSwwCfADMRsJeG2YmODdmJc,5czI5ZmWbWLDr2L9JdDmkt7qrr8fs55VDt3tXnrFw0E,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@bloE1LJ~qzSYUkU2nt7sB9kq060D4HTQC66pk5Q8NpA,DOOASUnp0kj6tOdhZJ-h5Tk7Ka50FSrUgsH7tCG1usU,AQACAAE/WebOfTrustRC2/58\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@0j-H~zKeP9mh6LEJUl4HSJYC-lQWstYRJeC~5E2F5~c,VbjnSixETRzKp80jYYXD-bqsTUWzxwcYmI9ZSWsBrik,AQACAAE/WebOfTrustRC2/13\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@~4ZW0eji3~hYAakiCI056soETGPf9O94GtoIpE2NGEg,GdtKsS~WeDlBS~OL1egxqZ4pr-iPXHjT2zcy8pjvEK4,AQACAAE/WebOfTrustRC2/88\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@YommlOi4fTYx9axhnl9iAi9BNHRvnM5XWjl21i0563k,5FswxS7hPf2erR8KkrBobG8R9bekaakeY1tM8DDNsjI,AQACAAE/WebOfTrustRC2/2\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@-ucM1bn8sICGRAemM8wZ~BVHgX3ZPUoutjZY64mBIcQ,Ko~kC54wZ-joCpfdc67Vds8LkAIxvTJGpMtfQSl4mAA,AQACAAE/WebOfTrustRC2/2\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@VwcZEhjtMuFcYIa8r0yksTs~FvMWB7swEz6tK67Vmsw,0blSLTQDms-WWbw1IBuKIoR2ZvSHpI21lMFeByQPuII,AQACAAE/WebOfTrustRC2/56\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@HAoXk-dW6~j5eLdAZCEjyKTVC974wkdl-4QqrPcbyzE,NlS05DkGK8QzL~EVUOfb~Jl1EZoVJTQBQBzA6N2qMn4,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@2PK-12eJFcVziT6eMpiUpOpTlmDNAoVOKZvA~8s7VSg,EaHdnKfKoWQDclX1mwcQeGr5jo1ijxyExYqL7Vsf-o8,AQACAAE/WebOfTrustRC2/33\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@8D3L5TDTyp5jnbT4imUWK12QC-B0iaSxFPOstMX2URg,ZtSShNkEVV8whaGQtIxiJ3FBroihw8YDyZrWvqncs0s,AQACAAE/WebOfTrustRC2/12\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@HKv7Hp94hFz8CKlINXCImq~XIBL9VfsPSgqfR0QIZFQ,vFM45qVvCajf3iqZm~ykZYwqM0KhaUSkU3RGaxJzHLI,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@NJu4xYtC3cgZo8s2xqmap3eh1dy60tFQFoxU8aeSnq8,fp~WLcrSSUKnr9wDDz-geb8FDwADCMCA9fjKt04Cyg8,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@IazjsmIK8VnIjDkq3-ecMEKHmi0dBT1QsNBq2mp2Fuo,uu24sWwNW~tjszdw19Mz18NBGx1MSADi03BHZnttwFo,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@IfxF-y7PNV97WUiHLqlIwXQyfVsHjI-Am4unZ0AK-Qk,Xm78gNC236A3wZ1RWBnft4oBGHU1R88Yt9AlphmtJPo,AQACAAE/WebOfTrustRC2/36\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@i1YvNnlMkd0i~0SiXiDHlGaxbtYd8ZqEUij~VzxyXmM,rxi19mph9KtHA6~gVGJ1rZ6kytff~kJDm6~NrA4YQaI,AQACAAE/WebOfTrustRC2/9\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@nXf5sbMSDqE~OkCQ~8JaMgPbj2LQJcuouvO56ADo28s,uEMqVaBzpA06TaC8A0cqKuv~lSfqZBiijasA3nlQ0Fc,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@Y8fLVylNs~pB6sdA5Dl1l6T~hXQrLNZLMgfDl5-E5Z0,n0zdN5XUa-D5Puf0L9wu~xQQmU~A5TpfqJ4RFHJLjLs,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@F0ixRao2hQlvTQDkN6rPcwLTG2nA6x0r8RrTQ0443IQ,LxN-gYvq4eWRuhjAgejmgNqYJdIw0q8IJ2XNwwVHhmQ,AQACAAE/WebOfTrustRC2/12\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@Pgk~nJzSVNAjFHh-qTovvm6muY08igdOCEWuyUrbFvk,NlwUDwfQlbXRjIaFAVljD5E1loXi31Xq6dG8YC7JOR0,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@m9gYemmVNXe32Ao6jeUgW8ttgGlMSIAW1608YZ19olE,LnEWPRzsPlPfq2~gIYQ5SVV-V2lthAx254dht9EZgyU,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@Pwiulr-xlPJelS5CO4~do78zZHTL5TNIChF5hpz8nkY,z77V~KhcKZRWLSWtVzaWO-dt~TzCCJFCHUDhHXI715M,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@OH3ZkrLAkMJbQTjVW3e9ioH04F7jpUVNMekiQAAvRjs,J6qOC05GoqRgST93M1V90HWxq9VK4PCKIpltkL8GAhg,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@nirNdzBgVyqMpnuT5UrmX~TU354qDIY7XAp04Kutysg,vpf1npG3nUARPSkFRx9xbVT~w1ELw0jQhdiXbxWcafg,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@ozK579KUDjjxkve1gKeV8IDd5qe0NPtxlFVV2-8iXrM,hlU82qnHi5ZnIfSD5~hr4wmUjNFJjQYted7FJWBj8z8,AQACAAE/WebOfTrustRC2/12\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@D6JSlrnlDDXfnGhijswHC5a4-EBuYNFhg2IyoFhzRRM,tCJy6EvZRhk-Og9CIkR3jfLD4VYxwOY5Wf991XMLdmE,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@Bn1Ozb4~Q639N~GvSXrbzZoVx9ziFfbkiKf1akXr9dQ,DrwwRjH~WrErR595BqxyDeisgcTLRZjCsQUBQSdnPLk,AQACAAE/WebOfTrustRC2/10\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@~aHztTNobVhKiaJ2eE-k6LLMy3qrRzL0zvk1UZp1xAU,xs3tuQsYRrTgxoU5qrayiwoOYEOLE6bTHvIKBQLIwco,AQACAAE/WebOfTrustRC2/3\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@jr3FrHPhtxP-IYQ-A12A3jjNNK4-KcHsUH8qNpBGHJ0,WK9IlZuG17JZ3YvaRUR-3uHf1YqkxxyGxkpkLW56ZTY,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@iBBjdbuuabx3v7iy-Pt3WZjWuixqo2-rzH~2kV4FkwE,Hll6SNQ~FXY5mrOY2W0GTfyNhJSlOrYutJmoXeSKseE,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@TKOVixP3xx6nA3-cgl2fksatQzxg4LlReoK0GFl7uAo,r~MCdO2rhGxBgRYv2EPuIE-tP7-0z6vuwbS04oyoAyI,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@bK9LQT2mqilUY4DxwmlKvKi5Jfwf4Brr~EQGa8RLIRU,Ni90~c4q-VNFrxFS7cDimQwCcRsqdScHoElWQgBpoT8,AQACAAE/WebOfTrustRC2/6\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@DYXv~V1jDo0XBhaiaGeRvy-~snqMbBiFR~R8TK8VBNg,4YYHZfVVYZmudSCOetDlNxnvbLy6IULV1SOgeC1zXmI,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@CSWvDlm9RM31O9NPpZomFvpTVM8cV0brixDXxpwnJ7A,4wfD~qxb5hFgCBN0JWgK6p11wUCpOHGOWhJ4i2FgFhY,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@sFsqYnIVQ9FwULsp3e-q0M46fRw2jVsLJYF9PUyHVME,aDhfrzYPt4O0BTuuRF3aCPTR0A~zr2rqHtPpJXeSqFU,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
++ + "<Trust Comment=\"\" Identity=\"USK@1QwMtp0oc4jIh6DFUjec~U0O3ldWHrRmhh5OZd41MMo,GZ-QOMc4mAkHhG4LwJWU~-rl0zJIp90YcB5hn3M9tlg,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
++ + "</TrustList>"
++ + "</Identity>"
++ + "</WebOfTrustRC2>";
++
++ /**
++ * main method.
++ *
++ * @param args Standard args.
++ */
++ public static void main(String[] args) {
++ try {
++ final Document xmlDoc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(rawXML.getBytes("UTF-8")));
++ final Element identityElement = (Element) xmlDoc.getElementsByTagName("Identity").item(0);
++ final Element trustListElement = (Element) identityElement.getElementsByTagName("TrustList").item(0);
++ final NodeList trustList = trustListElement.getElementsByTagName("Trust");
++ final Pattern keyPattern = Pattern.compile("USK@[%,~" + "*-_./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz" + "]+");
++ for (int i = 0; i < trustList.getLength(); ++i) {
++ Element trustElement = (Element) trustList.item(i);
++ final String identity = trustElement.getAttribute("Identity");
++ if (!keyPattern.matcher(identity).matches()) {
++ throw new RuntimeException("Parsing failure: Instead of USK URI I got: " + identity);
++ }
++ }
++ } catch (Exception ex) {
++ throw new RuntimeException(ex.getMessage());
++ }
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8032909/XSLT.java Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,54 @@
++/*
++ * 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 8032909
++ * @summary Test for XSLT string-length function with complementary chars
++ * @compile XSLT.java
++ * @run main/othervm XSLT a_utf16.xml a_utf16.xsl 1270
++ * @run main/othervm XSLT a_utf8.xml a_utf8.xsl 130
++ * @run main/othervm XSLT a_windows1252.xml a_windows1252.xsl 200
++ */
++
++import java.io.ByteArrayOutputStream;
++import javax.xml.transform.stream.StreamResult;
++import javax.xml.transform.stream.StreamSource;
++import javax.xml.transform.Transformer;
++import javax.xml.transform.TransformerFactory;
++
++public class XSLT {
++ public static void main(String[] args) throws Exception {
++
++ ByteArrayOutputStream resStream = new ByteArrayOutputStream();
++ TransformerFactory trf = TransformerFactory.newInstance();
++ Transformer tr = trf.newTransformer(new StreamSource(System.getProperty("test.src", ".")+"/"+args[1]));
++ String res, expectedRes;
++ tr.transform( new StreamSource(System.getProperty("test.src", ".")+"/"+args[0]), new StreamResult(resStream));
++ res = resStream.toString();
++ System.out.println("Transformation completed. Result:"+res);
++
++ if (!res.replaceAll("\\s","").equals(args[2]))
++ throw new RuntimeException("Incorrect transformation result. Expected:"+args[2]+" Observed:"+res);
++ }
++}
+Binary file test/javax/xml/jaxp/parsers/8032909/a_utf16.xml has changed
+Binary file test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl has changed
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xml Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<testxml>
++<Element>UTF-8_Element</Element>
++<Element2></Element2>
++</testxml>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,13 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
++
++<xsl:output method="text" />
++
++<xsl:template match="Element">
++<xsl:value-of select="string-length(.)"/>
++</xsl:template>
++<xsl:template match="Element2">
++<xsl:value-of select="string-length(.)"/>
++</xsl:template>
++
++</xsl:stylesheet>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,5 @@
++<?xml version="1.0" encoding="windows-1252"?>
++<testxml>
++<Element>Windows-1252_Element</Element>
++<Element2></Element2>
++</testxml>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl Mon Sep 08 12:16:34 2014 -0700
+@@ -0,0 +1,13 @@
++<?xml version="1.0" encoding="windows-1252"?>
++<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
++
++<xsl:output method="text" />
++
++<xsl:template match="Element">
++<xsl:value-of select="string-length(.)"/>
++</xsl:template>
++<xsl:template match="Element2">
++<xsl:value-of select="string-length(.)"/>
++</xsl:template>
++
++</xsl:stylesheet>
+--- ./jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java Mon Sep 08 12:16:34 2014 -0700
+@@ -23,7 +23,7 @@
+
+ /**
+ * @test
+- * @bug 6476665 7033534
++ * @bug 6476665 7033534 8052162
+ * @summary Verifies color conversion of Component Color Model based images
+ * @run main ColConvCCMTest
+ */
+--- ./jdk/test/sun/tools/native2ascii/NativeErrors.java Wed Apr 16 12:37:49 2014 +0400
++++ ./jdk/test/sun/tools/native2ascii/NativeErrors.java Mon Sep 08 12:16:34 2014 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 1999, 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
+@@ -25,12 +25,18 @@
+ * @test
+ * @bug 4136352
+ * @summary Test Native2ASCII error messages
+- *
++ * @library /lib/testlibrary
++ * @build jdk.testlibrary.* NativeErrors
++ * @run main NativeErrors
+ */
+
+-import java.io.*;
+-import sun.tools.native2ascii.*;
+-import java.util.*;
++
++import java.io.File;
++import java.util.ResourceBundle;
++import java.util.MissingResourceException;
++import jdk.testlibrary.OutputAnalyzer;
++import jdk.testlibrary.JDKToolLauncher;
++import jdk.testlibrary.ProcessTools;
+
+ public class NativeErrors {
+
+@@ -45,30 +51,18 @@
+ }
+ }
+
+- public static void main(String args[]) throws Exception {
+- String[] command;
+- Process p = null;
+- BufferedReader in = null;
++ public static void main(String args[]) throws Throwable {
++ // Execute command in another vm. Verify stdout for expected err msg.
+
+- // Construct a command that runs the test in other vm
+- // Exec another vm to run test in
+- // Read the result to determine if test failed
+-
+- command = getComString("-encoding");
+- p = Runtime.getRuntime().exec(command);
+- in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+- checkResult(in, "err.bad.arg");
++ // Test with no input file given.
++ checkResult(executeCmd("-encoding"), "err.bad.arg");
+
+ File f0 = new File(System.getProperty("test.src", "."), "test123");
+ String path0 = f0.getPath();
+ if ( f0.exists() ) {
+ throw new Error("Input file should not exist: " + path0);
+ }
+-
+- command = getComString(path0);
+- p = Runtime.getRuntime().exec(command);
+- in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+- checkResult(in, "err.cannot.read");
++ checkResult(executeCmd(path0), "err.cannot.read");
+
+ File f1 = new File(System.getProperty("test.src", "."), "test1");
+ File f2 = File.createTempFile("test2", ".tmp");
+@@ -81,71 +75,38 @@
+ throw new Error("Output file cannot be made read only: " + path2);
+ }
+ f2.deleteOnExit();
+-
+- command = getComString(path1, path2);
+- p = Runtime.getRuntime().exec(command);
+- in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+- checkResult(in, "err.cannot.write");
++ checkResult(executeCmd(path1, path2), "err.cannot.write");
+ }
+
+-
+- private static void checkResult(BufferedReader in, String errorExpected)
+- throws Exception {
+- String errorReceived;
+- errorReceived = in.readLine();
+- assert errorReceived != null : "First readline cannot be null";
+- errorExpected = rsrc.getString(errorExpected);
+- assert errorExpected != null : "Expected message cannot be null";
+- StringBuffer error = new StringBuffer(errorExpected);
+- int start = errorExpected.indexOf("{0}");
+- if (start >= 0) {
+- error.delete(start, start+3);
+- errorExpected = error.toString();
++ private static String executeCmd(String... toolArgs) throws Throwable {
++ JDKToolLauncher cmd = JDKToolLauncher.createUsingTestJDK("native2ascii");
++ for (String s : toolArgs) {
++ cmd.addToolArg(s);
+ }
+- //System.out.println("received: " + errorReceived);
+- //System.out.println("expected: " + errorExpected);
+- if (!errorReceived.endsWith(errorExpected))
+- throw new RuntimeException("Native2ascii bad arg error broken.");
++ OutputAnalyzer output = ProcessTools.executeProcess(cmd.getCommand());
++ if (output == null || output.getStdout() == null) {
++ throw new Exception("Output was null. Process did not finish correctly.");
++ }
++ if (output.getExitValue() == 0) {
++ throw new Exception("Process exit code was 0, but error was expected.");
++ }
++ return output.getStdout();
+ }
+
+- private static String[] getComString(String arg2) {
+- String[] coms = new String[2];
+- coms[0] = getPathString();
+- coms[1] = arg2;
+- return coms;
+- }
++ private static void checkResult(
++ String errorReceived, String errorKey) throws Exception {
++ String errorExpected = rsrc.getString(errorKey);
++ if (errorExpected == null) {
++ throw new Exception("No error message for key: " + errorKey);
++ }
++ // Remove template tag from error message.
++ errorExpected = errorExpected.replaceAll("\\{0\\}", "");
+
+- private static String[] getComString(String arg2, String arg3) {
+- String[] coms = new String[3];
+- coms[0] = getPathString();
+- coms[1] = arg2;
+- coms[2] = arg3;
+- return coms;
+- }
+-
+- /*
+- * Search for path to native2ascii
+- */
+- private static String getPathString() {
+- String path = System.getProperty("java.home") + File.separator +
+- "bin" + File.separator + "native2ascii";
+- if (File.separatorChar == '\\') {
+- path = path + ".exe";
++ System.out.println("received: " + errorReceived);
++ System.out.println("expected: " + errorExpected);
++ if (errorReceived.indexOf(errorExpected) < 0) {
++ throw new RuntimeException("Native2ascii bad arg error broken.");
+ }
+- File f = new File(path);
+- if (!f.exists()) {
+- System.out.println("Cannot find native2ascii at "+path);
+- path = System.getProperty("java.home") + File.separator + ".." +
+- File.separator + "bin" + File.separator + "native2ascii";
+- if (File.separatorChar == '\\') {
+- path = path + ".exe";
+- }
+- f = new File(path);
+- if (!f.exists())
+- throw new RuntimeException("Cannot find native2ascii at "+path);
+- System.out.println("Using native2ascii at "+path);
+- }
+- return path;
+ }
+
+ }
+--- ./langtools/.hgtags Wed Jun 25 09:05:13 2014 -0700
++++ ./langtools/.hgtags Mon Sep 08 12:17:52 2014 -0700
+@@ -420,6 +420,7 @@
+ 81bf1ca3a3a71c628b7d952ba47c6f200a223f27 jdk7u55-b13
+ 96d55b4d88fea1d9f8227e70003210a6c10a1dba jdk7u55-b30
+ c1964a222000b4884b992fdbaf8f62a45fb893c9 jdk7u55-b14
++56c12a84e86eb47e24e4bc50a4602a276e6b4e4b jdk7u55-b15
+ 4f6115ba266e5489b5e1968a28304f82be1f5641 jdk7u55-b31
+ ec8793f5aa4fb0aff4aa2f02f458fa6720f3ec6f jdk7u55-b32
+ 13fed9e9f022e4a7f914c8410cbaa6f6564d4efd jdk7u55-b33
+@@ -468,3 +469,36 @@
+ dea7e67840b68ae6752b37e69e242dae2765b878 jdk7u65-b16
+ 15a051dfadb6a7d014f0d2739ccf0a63ade56313 jdk7u65-b17
+ 576e2fd21368ba67f1f19d3180f78bc440b795a1 jdk7u65-b30
++0f809f893588548a3b5c8441e28c9e0a62bc13ef jdk7u65-b18
++eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b19
++afc940d62b49059f565f87c83343fa3d28df883b jdk7u65-b32
++114c4fc53777e4067a26f6510fe72fa770a9253c jdk7u65-b20
++8a09cca8f12027ba59df4bb18d49e855c4db4811 jdk7u67-b01
++eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b40
++5e4cc118e2d1f7a8eefca5dd7146d46a1b0ca911 jdk7u65-b31
++59575d1928f98d1e26ea548ff4d5e2415dfe9b57 jdk7u65-b33
++684f0285b699d304d1efff487b550ff2e1679e98 jdk7u66-b00
++a927daae851fa81d0470d2b67f52e8156e4d423c jdk7u66-b01
++6f229fda19bdabf7a3d1caad9d809dd713cce65d jdk7u66-b09
++77e053e3a41f254d99e7a1151b6cf874265132e5 jdk7u66-b10
++596cf48685bcf7970275ce637ea2e58b16e9816e jdk7u66-b11
++021fb086f47f6f3659f0fe2de824c3b5548530c4 jdk7u66-b12
++b9801badec029e241a580aa52db27e03fc5e2b88 jdk7u66-b13
++3ceea3a91e4cbc29a435519747c22dfb02e68f67 jdk7u66-b14
++2918f02cde3e0fd134e2051e67296c3f935825e6 jdk7u66-b15
++9442596a63f000f4290265aa0574ee5fa8865808 jdk7u66-b16
++bd740cf100e1f7f866bd902fb668e77dcd866251 jdk7u66-b17
++df0aa7e382459053c7fa92f133080cdf679c6100 jdk7u71-b00
++46244a1e94b97b324a9ab97322b710af63b2f20b jdk7u71-b01
++29583e3ca6f9cb337fb203a84be70d234e667c1d jdk7u71-b02
++8a5c2c7dd6dce2c0540ace9c4372cf984ad62b9b jdk7u71-b03
++c4b7f94c483e9092ab634067095f4f325f9648a9 jdk7u71-b04
++103784a125a4a4fa40981f524a64cfd5b0c61722 jdk7u71-b05
++6d6a78b11de79b7f38c95e597ea0f33952716e99 jdk7u71-b06
++6c6763cce51e8e888130033350dc37114b17b6a5 jdk7u71-b07
++a5e828c017c4371d7a8cd0be812e7282dc5b7772 jdk7u71-b08
++42d1ec856f73bf3378346d66ad42cd5c57a5f8f2 jdk7u71-b09
++1579a3e24c494de0ee63bed2a4c3fbd176e95abc jdk7u71-b10
++df957022bc94fc84c3d9e6f1f23af29b6afeb63d jdk7u71-b11
++a8fd0637a601ee2747e785bd5e9e2a0262acf280 jdk7u71-b12
++1cefc4b498a60ebc86b76eb2e9e861dbb072bd85 jdk7u71-b13
+--- ./langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Wed Jun 25 09:05:13 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Mon Sep 08 12:17:52 2014 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 1999, 2011, 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
+@@ -98,11 +98,11 @@
+
+ compiler.err.annotation.value.not.allowable.type=\u4F7F\u7528\u3067\u304D\u306A\u3044\u578B\u306E\u6CE8\u91C8\u306E\u5024\u3067\u3059
+
+-compiler.err.anon.class.impl.intf.no.args=\u540D\u524D\u306E\u306A\u3044\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
++compiler.err.anon.class.impl.intf.no.args=\u533F\u540D\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+
+-compiler.err.anon.class.impl.intf.no.typeargs=\u540D\u524D\u306E\u306A\u3044\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u578B\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
++compiler.err.anon.class.impl.intf.no.typeargs=\u533F\u540D\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u578B\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+
+-compiler.err.anon.class.impl.intf.no.qual.for.new=\u540D\u524D\u306E\u306A\u3044\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002new\u306B\u4FEE\u98FE\u5B50\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
++compiler.err.anon.class.impl.intf.no.qual.for.new=\u533F\u540D\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002new\u306B\u4FEE\u98FE\u5B50\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
+
+ # 0: symbol, 1: symbol, 2: symbol
+ compiler.err.array.and.varargs={2}\u3067{0}\u3068{1}\u306E\u4E21\u65B9\u3092\u5BA3\u8A00\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+--- ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Wed Jun 25 09:05:13 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Mon Sep 08 12:17:52 2014 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 1999, 2011, 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
+@@ -115,7 +115,7 @@
+
+ javac.msg.usage.nonstandard.footer=\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
+
+-javac.msg.bug=\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002Bug Parade\u306B\u540C\u3058\u30D0\u30B0\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u306A\u3044\u3053\u3068\u3092\u3054\u78BA\u8A8D\u306E\u4E0A\u3001Java Developer Connection (http://java.sun.com/webapps/bugreport)\u3067\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u305D\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u4E0B\u8A18\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
++javac.msg.bug=\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002Bug Parade\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java Developer Connection (http://java.sun.com/webapps/bugreport)\u3067bug\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u305D\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u4E0B\u8A18\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
+
+ javac.msg.io=\n\n\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
+
+--- ./langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Wed Jun 25 09:05:13 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties Mon Sep 08 12:17:52 2014 -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
+@@ -31,7 +31,7 @@
+ main.Xusage=-Xmaxerrs <number> \u51FA\u529B\u3059\u308B\u30A8\u30E9\u30FC\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B\n-Xmaxwarns <number> \u51FA\u529B\u3059\u308B\u8B66\u544A\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B\n\n\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
+ main.option.already.seen={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u8907\u6570\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+ main.requires_argument=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
+-main.locale_first=\u30AA\u30D7\u30B7\u30E7\u30F3-locale\u306F\u3001\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u306E\u6700\u521D\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
++main.locale_first=\u30AA\u30D7\u30B7\u30E7\u30F3-locale\u306F\u3001\u30B3\u30DE\u30F3\u30C9\u884C\u306E\u6700\u521D\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ main.invalid_flag={0}\u306F\u7121\u52B9\u306A\u30D5\u30E9\u30B0\u3067\u3059
+ main.No_packages_or_classes_specified=\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+ main.incompatible.access.flags=-public\u3001-private\u3001-package\u307E\u305F\u306F-protected\u306E\u3046\u3061\u306E2\u3064\u4EE5\u4E0A\u3092\u6307\u5B9A\u3057\u307E\u3057\u305F\u3002
+--- ./langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Wed Jun 25 09:05:13 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties Mon Sep 08 12:17:52 2014 -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
+@@ -27,9 +27,9 @@
+ # User errors, command line errors.
+ #
+ cant.create.dir=\u51FA\u529B\u7528\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
+-at.args.cant.read=\u30D5\u30A1\u30A4\u30EB{1}\u304B\u3089\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3002
++at.args.cant.read=\u30D5\u30A1\u30A4\u30EB{1}\u304B\u3089\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3002
+ at.args.file.not.found=\u30D5\u30A1\u30A4\u30EB{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+-at.args.io.exception=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u306E@\u5F15\u6570\u306E\u51E6\u7406\u4E2D\u306B\u3001\u6B21\u306E\u5165\u51FA\u529B\u306E\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\u3002
++at.args.io.exception=\u30B3\u30DE\u30F3\u30C9\u884C\u306E@\u5F15\u6570\u306E\u51E6\u7406\u4E2D\u306B\u3001\u6B21\u306E\u5165\u51FA\u529B\u306E\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\u3002
+ old.jni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-jni\u3068-old\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ old.llni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-old\u3068-llni\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ old.not.supported=\u3053\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306Ejavah\u3067\u306F\u30AA\u30D7\u30B7\u30E7\u30F3-old\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+@@ -38,11 +38,11 @@
+ jni.no.stubs=JNI\u306F\u30B9\u30BF\u30D6\u3092\u5FC5\u8981\u3068\u3057\u307E\u305B\u3093\u3002JNI\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ jni.sigerror={0}\u306E\u30B7\u30B0\u30CD\u30C1\u30E3\u3092\u5224\u5225\u3067\u304D\u307E\u305B\u3093
+ dir.file.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-d\u3068-o\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+-no.classes.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+-no.outputfile.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+-no.outputdir.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+-no.classpath.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+-no.bootclasspath.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
++no.classes.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
++no.outputfile.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
++no.outputdir.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
++no.classpath.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
++no.bootclasspath.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ unknown.option={0}\u306F\u4E0D\u6B63\u306A\u5F15\u6570\u3067\u3059\n
+ tracing.not.supported=\u8B66\u544A: \u30C8\u30EC\u30FC\u30B9\u306F\u73FE\u5728\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u304B\u308F\u308A\u306B\u3001Virtual Machine\u306E-verbose:jni\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+
+--- ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties Wed Jun 25 09:05:13 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties Mon Sep 08 12:17:52 2014 -0700
+@@ -3,7 +3,7 @@
+
+ err.bad.constant.pool={0}\u306E\u5B9A\u6570\u30D7\u30FC\u30EB\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
+ err.class.not.found=\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+-err.crash=\u91CD\u5927\u306A\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\u6B21\u306E\u60C5\u5831\u3092\u542B\u3080\u30D0\u30B0\u30FB\u30EC\u30DD\u30FC\u30C8\u3092\u30D5\u30A1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044:\n{1}
++err.crash=\u91CD\u5927\u306A\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\u6B21\u306E\u60C5\u5831\u3092\u542B\u3080bug\u30EC\u30DD\u30FC\u30C8\u3092\u30D5\u30A1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044:\n{1}
+ err.end.of.file={0}\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F
+ err.file.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
+ err.h.not.supported=-h\u306F\u4F7F\u7528\u53EF\u80FD\u3067\u306A\u304F\u306A\u308A\u307E\u3057\u305F - 'javah'\u30D7\u30ED\u30B0\u30E9\u30E0\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
diff --git a/java/openjdk7/files/patch-7u76-b31 b/java/openjdk7/files/patch-7u76-b31
new file mode 100644
index 000000000000..fc2391ef18ee
--- /dev/null
+++ b/java/openjdk7/files/patch-7u76-b31
@@ -0,0 +1,42160 @@
+--- ./.hgtags Mon Sep 08 12:14:23 2014 -0700
++++ ./.hgtags Mon Jan 05 11:48:37 2015 -0800
+@@ -470,11 +470,19 @@
+ fa242615607fa5f6cdd1ae93bc2fb9cc2100c179 jdk7u65-b18
+ 64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b19
+ 90f56be6f9d90f66e558c4e08084e2b169738fba jdk7u65-b32
++d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u80-b00
++90564f0970e92b844122be27f051655aef6dc423 jdk7u80-b01
++36e8397bf04d972519b80ca9e24e68a2ed1e4dbd jdk7u80-b02
+ b6da128e8a7957f139933a48580e201e938c4684 jdk7u65-b20
+ d6a1d32534d188e73f7962d40d21584c44e65acd jdk7u67-b01
+ 64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b40
+ 9dfdf107c6971cd30c7e1f656cddc6b8d495c290 jdk7u65-b31
+ fe700de0735dc4e8ce5a50971ad3ea3dc052d21d jdk7u65-b33
++d6a1d32534d188e73f7962d40d21584c44e65acd jdk7u67-b01
++d3b934344cb17238ea27cd1e0b824f856addc815 jdk7u67-b31
++79c6f8d257776b93485f4c1014dfcf61cc75a667 jdk7u67-b32
++5aef2a187827f1e7f48a619af4bee118ca99efea jdk7u67-b33
++b86df0257fad12e8802fe43d53e932b7b0253112 jdk7u67-b34
+ 48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u66-b00
+ 4fb9423d086d86d212257afd6fc79957f737af5b jdk7u66-b01
+ 964663d4303723fbcb16cf05e857576c08c237ae jdk7u66-b09
+@@ -500,3 +508,51 @@
+ e9663e434024cb6e011013e774445a056417bb3b jdk7u71-b11
+ 78aa78b55b843697a630ed886962ab07d1b76358 jdk7u71-b12
+ 9fc5aeb0e0a8c97b1cd263a55f3aeb030cbcdf89 jdk7u71-b13
++ade1a91dba7391ef319a2fc646138387e6416436 jdk7u71-b14
++423ddccf39073af15eb78623f89f1080612b5b3d jdk7u72-b01
++5f985e54beec37de3ad2261d82665d378143a8dc jdk7u72-b02
++e6e679e8dc418d9174668f445af10e2a6d71ce39 jdk7u72-b03
++32b4ccb2a7ada38639a4869a5628bda061d8563e jdk7u72-b04
++15e7f04f32510469be2ab44b4547cb8acb19d04a jdk7u72-b05
++9c732ba56ec06696e218f7b70ddc432295638d79 jdk7u72-b06
++a7679adac6cc7ff6a2893e4df447c39937f59eda jdk7u72-b07
++44a9b66255b9b8a200c0e53338145bac86381576 jdk7u72-b08
++66c1df24154b1c8c67fd9bed0b6d366452a46fb0 jdk7u72-b09
++a8993ba5a86938e6bd9ab7c41401610b0e36afce jdk7u72-b10
++8d695cc7268f902f235506ac8d3849a4dd118bee jdk7u72-b11
++965b19722fce7a8303b89fc9288f7b6a9cf70922 jdk7u72-b12
++9c6095c8748ba80aa1ffd14f978b24e50abcfdc1 jdk7u72-b13
++fa606411d8fd650334b6f90d626399e13e77740f jdk7u72-b14
++f42462b4dfd81539eacf90955d2d26e1dc1686c0 jdk7u72-b30
++891bb800d7b2abff392669276f9e55ff30ba9962 jdk7u72-b31
++569e053e97b4fecaf1371f7cf2645394edb8a11a jdk7u75-b00
++618b221a71a962f1d62a5b02db1b4256bad9441a jdk7u75-b01
++eb36016211cb5d412c779836bd8efbf133cbf6f5 jdk7u75-b02
++134f5183bd712b940056508bcd0988cce7a60ec7 jdk7u75-b03
++dcc07fe8d380a63c22086abeb62a5a9780b3639c jdk7u75-b04
++5acf5e095d7b3a9364b278911047a4fad15a1ae7 jdk7u75-b05
++709239275717263b600f6c8816b023de3442eb0f jdk7u75-b06
++79414f9ef336b48c3766a7e994ac3efce3877b61 jdk7u75-b07
++0fa6cf059c5c262a410220bfb9ec7d83d44a8030 jdk7u75-b08
++109dfa012fb50a65c9dcb5eb36c530a2001d139b jdk7u75-b09
++a90c928524da634a18ea5a9ca2d6aba839c9bf8a jdk7u75-b10
++ae1470a6681851d99608269ac902383ce44c9f10 jdk7u75-b11
++cca6b8a583cef75117297d9522adc33f7ab516c2 jdk7u75-b12
++669bd350d550600a3f0c4556da9bc4bb6006dc5c jdk7u75-b13
++7d45f621855a37b70a239edc6f8ac3b75ca7862b jdk7u75-b30
++37b5893cb60f897f28b1999be7f88335409beda5 jdk7u75-b31
++b39439fb5dcdef664c7a6cd638642b22c79f2393 jdk7u76-b00
++dc25c29542f743722854fe37336630b23ebccfff jdk7u76-b01
++7402e2fd4c2865f4605fe4d84fa43883029e221d jdk7u76-b02
++d0967df4a33229cf4e297a4892972bc30f23daad jdk7u76-b03
++e840541117dcf21601adb496a8ba2a54b019f3db jdk7u76-b04
++369a28aac29d6cfadfd4ef6930e5b1c2c622b826 jdk7u76-b05
++9304abb58c14bfe3314141ea4176db757e5b5d4f jdk7u76-b06
++6065e7008ae5fa5ae730f8d2318fedac821c50c1 jdk7u76-b07
++c891034902a4d6d2db813bd128dca273c7640baf jdk7u76-b08
++a85cb73f4f32c7faad49b77c307adbd11d481dd1 jdk7u76-b09
++fc18a1bf57b62578466a4de68314bba79721c8fd jdk7u76-b10
++4f5b251f1daa41a9143636a9b8aaf0cf4ce00f26 jdk7u76-b11
++01d1d34f82f30de97a61f8b0048c61aa17d0dd12 jdk7u76-b12
++a9728fbea214dbf6f58567e729fdc5276f3c704f jdk7u76-b13
++a788e9c5671436bb711f0e185cd74b17220d6e35 jdk7u76-b30
+--- ./corba/.hgtags Mon Sep 08 12:14:31 2014 -0700
++++ ./corba/.hgtags Mon Jan 05 11:49:17 2015 -0800
+@@ -472,11 +472,19 @@
+ b7f66b9f9e8e099428ed7640a184f6135b77e40d jdk7u65-b18
+ 50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b19
+ dae3f20d2306622e39606d0dc967147de174afce jdk7u65-b32
++1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u80-b00
++df1decc820934ad8bf91c853e81c88d4f7590e25 jdk7u80-b01
++2444fa7df7e3e07f2533f6c875c3a8e408048f6c jdk7u80-b02
+ ac05dfedf008e83c2044666a70635cf82e932e41 jdk7u65-b20
+ 244756837ab4b214decd0e6f26b0071a483f143f jdk7u67-b01
+ 50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b40
+ d2f7358b01d3d8b877b2ec2ca2989bd1daf17472 jdk7u65-b31
+ 2067d7202adcedb80fa676dacb22a0b73d5e8548 jdk7u65-b33
++244756837ab4b214decd0e6f26b0071a483f143f jdk7u67-b01
++507cb7e62dfed67b467a1767d9c56d276551d6f3 jdk7u67-b31
++aef9e24b79543a3b58bb4575266b9b87ca84e4e1 jdk7u67-b32
++7c1d15d36a6c40b4a4f75bc03729136a104d2434 jdk7u67-b33
++f026080f4fcc9eca5589d8747c66bfa123c5a87d jdk7u67-b34
+ 5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u66-b00
+ 9f0f0bdd4cfb01a5d64f9528b7ffda3974171120 jdk7u66-b01
+ 596d979a5d4deb9d10b068479276cd4b2a12432e jdk7u66-b09
+@@ -502,3 +510,51 @@
+ 3e804dc3cea9ff145f375a50a161f3e173e8d3f6 jdk7u71-b11
+ cc3072067ae8ac685d400ced4c0f144d6a1d9f1e jdk7u71-b12
+ 1616089899e25679d6cf70c77023f2a37ff85ad1 jdk7u71-b13
++701e1d5cea2e8065d2282eb3ebe31b6829a72a95 jdk7u71-b14
++287c772d7245396a7a6c7fc409ca8d21ba1ae2c5 jdk7u72-b01
++92552d17915bdf467fe758293eded9e6290f4ce2 jdk7u72-b02
++ae522462810fd74a92b4408b12b036bed5ea3efe jdk7u72-b03
++42a799212f4a287be3d2fd272b9faa3c65326b05 jdk7u72-b04
++a2d4167edbf96cdfda04e829d2baa361ade14bf5 jdk7u72-b05
++01922ce7611b852c7fdc4c0f88c9500c55eccd50 jdk7u72-b06
++b5a2d85c7fce5461d8e1be7e89a891a3ce40f805 jdk7u72-b07
++2b6d8a79df83bc5732ef7c65c51cfe9feac52559 jdk7u72-b08
++c62534f0e97dc7100da18b0b9c034d846f7067dc jdk7u72-b09
++62668c37376f462cfe7bfdfa001f902f52d450ef jdk7u72-b10
++39828d500dfef8045eb5b531182a09ea6ecdfb71 jdk7u72-b11
++990f51c3edeb4f25d0be95d51b23e5a4e8e02f06 jdk7u72-b12
++9e0c893977bba3ed7820f173d386e197f3c06e7b jdk7u72-b13
++bd80d0c18ccd97669dd8392dbde5cd91f647ee1d jdk7u72-b14
++66da7f46eff05df2aa3bb9b5c1f7ee47a75828a5 jdk7u72-b30
++4fefe5c11ddb650e681e2dd5e8ac8dfeb15e6afd jdk7u72-b31
++88772da384953fed254492c3ea9da498381081f2 jdk7u75-b00
++0466441d71122c9af252ec17f597f228dbf64578 jdk7u75-b01
++9aa7fe309fa584ff782ab9d557632321747ba11e jdk7u75-b02
++c734b5009fc92667af13c36b1f23e153a3e2dfca jdk7u75-b03
++f55967c261230a4fcc8d71ecfe58f2f47ea50393 jdk7u75-b04
++86369ed6e77c65496f2c167c00ed48d1e488845c jdk7u75-b05
++6831d2ff20362464a754f53bf8eb3ec1aacd6271 jdk7u75-b06
++33cf9bbc4ff36cb9e65e9fc22eabd606b98b6b8c jdk7u75-b07
++160cce8c24c4af6481426c931e400dfec29fe0d1 jdk7u75-b08
++ac5f25a05f13d81e4e18f5447e60dddee77d8d17 jdk7u75-b09
++c762a8187b1fe223b92aca3aaf7ee2dfe03e2ae6 jdk7u75-b10
++e05b02f8d5c988e55e985d767420e0b7e35d996e jdk7u75-b11
++45136140d2bcf28009271a047eea9a89c95378d7 jdk7u75-b12
++fb49daa5d7f89cbe60ff4b598c6b3e976ad04e4d jdk7u75-b13
++f3d39b94209598ba90e221d60ff3325dbe37fe2e jdk7u75-b30
++94386a790f9469f9da1328a7d0c2a2d63f03404b jdk7u75-b31
++2d6f594ce6c5dafc1ad9a9368186817212120d84 jdk7u76-b00
++b4d4ec688a281a362524291f2cff15c59b85dbb5 jdk7u76-b01
++c24e65a16f334611f95a8ae46769375b20818b74 jdk7u76-b02
++a1de50d45daa0728ea269a9e19e7d83208eec894 jdk7u76-b03
++806fb93eff9b30b3b36b46e04ef25fd62b28e674 jdk7u76-b04
++62f9b33fc90163c4d6b0953405c29f6328d9cd40 jdk7u76-b05
++89194b328cd0e4ef0d672d97e818e58ebf52a23b jdk7u76-b06
++9e17d3cd8fd256417dbecf751d6ac3f8195411b1 jdk7u76-b07
++f224787154b09e211cbb78f99889f6f6c394e60b jdk7u76-b08
++220b87dd1f9b26d3167582c699b6f41ac3516696 jdk7u76-b09
++b10583d82c01a621beb89a4a8e0f4830cdda703b jdk7u76-b10
++c947bf709139b13476a1df4ca8a92583fb1de5a4 jdk7u76-b11
++14f0846f4d1b8373e3e3cce10901f37341bf6980 jdk7u76-b12
++0db41b697138ce89f15c49eef1dc670f94a27d89 jdk7u76-b13
++71a8665159f2f014b1869f3d723d3b6fbe878a16 jdk7u76-b30
+--- ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Mon Sep 08 12:14:31 2014 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Mon Jan 05 11:49:17 2015 -0800
+@@ -587,7 +587,7 @@
+ java.lang.Object[] objholder = new java.lang.Object[1];
+ objholder[0] = object;
+ long[] longholder = new long[1];
+- TCUtility.unmarshalIn(in, typeCode, longholder, objholder);
++ TCUtility.unmarshalIn(in, realType(), longholder, objholder);
+ value = longholder[0];
+ object = objholder[0];
+ stream = null;
+--- ./corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Mon Sep 08 12:14:31 2014 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Mon Jan 05 11:49:17 2015 -0800
+@@ -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
+@@ -35,7 +35,8 @@
+ import java.io.OutputStream;
+ import java.io.ObjectOutputStream;
+ import java.io.ObjectOutput;
+-import java.util.Hashtable;
++import java.util.Map;
++import java.util.HashMap;
+
+ import org.omg.CORBA.INTERNAL;
+
+@@ -49,7 +50,7 @@
+ */
+ private class HookPutFields extends ObjectOutputStream.PutField
+ {
+- private Hashtable fields = new Hashtable();
++ private Map<String,Object> fields = new HashMap<>();
+
+ /**
+ * Put the value of the named boolean field into the persistent field.
+@@ -140,7 +141,6 @@
+ public OutputStreamHook()
+ throws java.io.IOException {
+ super();
+-
+ }
+
+ public void defaultWriteObject() throws IOException {
+--- ./corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java Mon Sep 08 12:14:31 2014 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java Mon Jan 05 11:49:17 2015 -0800
+@@ -253,6 +253,13 @@
+ // registered with the selector. Otherwise if the bytes
+ // are read on the connection it will attempt a time stamp
+ // but the cache will be null, resulting in NPE.
++
++ // A connection needs to be timestamped before putting to the cache.
++ // Otherwise the newly created connection (with 0 timestamp) could be
++ // incorrectly reclaimed by concurrent reclaim() call OR if there
++ // will be no events on this connection then it could be reclaimed
++ // by upcoming reclaim() call.
++ getConnectionCache().stampTime(connection);
+ getConnectionCache().put(this, connection);
+
+ if (connection.shouldRegisterServerReadEvent()) {
+--- ./hotspot/.hgtags Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/.hgtags Mon Jan 05 11:51:17 2015 -0800
+@@ -690,11 +690,26 @@
+ d006213be74730453cf5c3ce31f1d1d505334419 jdk7u65-b18
+ 1d8226b3e9896656451801393eb3ae394faeb638 jdk7u65-b19
+ c43b0b843f897a4d8cf0a3566b017b87230dd3b4 jdk7u65-b32
++b92f390febd01615af4a736b4f830f6052aa1d09 hs24.80-b00
++1448ebfef4f1aae0174eca983ad05507730ca6fd hs24.80-b01
++b1d29549dca7e36a4d050af5a54f8f56963a5c7d hs24.80-b02
++ff18bcebe2943527cdbc094375c38c27ec7f2442 hs24.80-b03
++1b9722b5134a8e565d8b8fe851849e034beff057 hs24.80-b04
++04d6919c44db8c9d811ef0ac4775a579f854cdfc hs24.80-b05
++ee18e60e7e8da9f1912895af353564de0330a2b1 hs24.80-b06
++05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u80-b00
++e2533d62ca887078e4b952a75a75680cfb7894b9 jdk7u80-b01
++bad107a5d096b070355c5a2d80aa50bc5576144b jdk7u80-b02
+ d3c9265e12fa115052f18d1e3d379143b56bbf63 jdk7u65-b20
+ 39776d90970221dd260187acb4c37631e41a66a9 jdk7u67-b01
+ 1d8226b3e9896656451801393eb3ae394faeb638 jdk7u65-b40
+ cf8b3a090e597e59177c5f67d44cdec12309777f jdk7u65-b31
+ df855c3f4d31dd7db081d68e3054518380127893 jdk7u65-b33
++39776d90970221dd260187acb4c37631e41a66a9 jdk7u67-b01
++7152f5f6395c66c8d6389100d880882d5cfe9af3 jdk7u67-b31
++4fb7952ebba8ba45be16bdc64184259e8076ffcf jdk7u67-b32
++a20f1b6311e10b755d949a088e7aeca2ba088a59 jdk7u67-b33
++39c07d2fb4d3d97bf3bb53c1c1e199709c5c49fe jdk7u67-b34
+ 6b37a189944aaa09e81d97d394496464d16bee42 jdk7u66-b00
+ 121dc94194d9234e2b13c867d875e23e1bdd6abd jdk7u66-b01
+ f28ea516eb0b9e99f1e342954ab4642456af4da1 jdk7u66-b09
+@@ -720,3 +735,51 @@
+ d6cb97651f0bd8d61f4d22aa7550145bbe6fb051 jdk7u71-b11
+ 959b4e5d2e3111920c198187f3bc66eba3e457f1 jdk7u71-b12
+ 608f470d22689bab17bab0ea1dbee3e1a0802d5b jdk7u71-b13
++ad909197a1ce2df483a20ff9ac380382f779a9d3 jdk7u71-b14
++1bd3adac3aac3c29c81303812b35f484ff90cb2b jdk7u72-b01
++0caed46767e35c00eff69b22acf984d98eb66b3d jdk7u72-b02
++3a2934191de4bb8ca9d2faca93f3381e521e8cac jdk7u72-b03
++e4708cde2898df4c936595aacb57bc5b4e15869a jdk7u72-b04
++137e0859cd296cb8d9f9e327112ddc793ed59318 jdk7u72-b05
++4d9d227d70f33b70461230172386217317954312 jdk7u72-b06
++ece56f93f37b41b9c8875e54fbd8010277f6b460 jdk7u72-b07
++439c695a7aa03652ab92681120434b9ce8cdd2b7 jdk7u72-b08
++a27f16d45457a68a723acca621cb11bc173a0eb6 jdk7u72-b09
++e6508ab77271d1d3ce7b5f60d91a7334fdacb03a jdk7u72-b10
++c17a8487086433e14cd22373039a8b6b48e7cbb8 jdk7u72-b11
++a9e695f0d831f115720a4dcad3d33e0003b0acad jdk7u72-b12
++ac701f87d1ea46033c69f3e1cb84fc0a971da70c jdk7u72-b13
++d9b56c6bdddb6f9d8242230f5fdd58f9c7d30ea5 jdk7u72-b14
++a6ae698522bfab3c595a4f8c2c3ee7e8939eb1bb jdk7u72-b30
++492a2abed4ca015459e24f7348233531b7e929d2 jdk7u72-b31
++e6b6d91b3934c281086f8efacb0926e7451cc18b jdk7u75-b00
++9096ac248b379a0f3012f18c7289ec47cdef8459 jdk7u75-b01
++a6964b2822d906eab9c923cdd723cf3dd4facfcd jdk7u75-b02
++6c1a8b7ed616311a932715428620e262076bb68a jdk7u75-b03
++2480d9d778301a3f88b0ab8ee35a585df82528e5 jdk7u75-b04
++d81faf9016ce5c9f98264b1f724b3d6d85b12c07 jdk7u75-b05
++2ec4b796b1de3cfe58f051111dfd70ab367e553e jdk7u75-b06
++1d3906064cae18fdb0ff9a2045f2d8d48067bcd1 jdk7u75-b07
++dfcf951330b6f7c1a3cb88c819e94f680054a970 jdk7u75-b08
++ca20e7886db63792593f048f7308aed383775829 jdk7u75-b09
++5a0321dcf89383c31f3c6e4827b3275f9ef09a5e jdk7u75-b10
++82dcfb646bd5bc9f3674cb02ea9ba2598cff6bbe jdk7u75-b11
++18b74ded3ffc2e6fc5a3853f923c8dd49849dee1 jdk7u75-b12
++384fba17a49738baddeb55a4bfcf00b01af199ef jdk7u75-b13
++0c7d7c067c46fa0ddcb9170bed1d52f52a9ec831 jdk7u75-b30
++db9672d640ffd4e81348bdb718afab76032d8858 jdk7u75-b31
++3c01618f40c059bf192c0b16176b144113965ea7 jdk7u76-b00
++7b5d132c3a70f3c0667fe9df4cae045b46673267 jdk7u76-b01
++10c2cb5743cac7d6fedc9307af8450283367e5e2 jdk7u76-b02
++99a8d8e3f1c6311853bfc0a86de503830cd3db1a jdk7u76-b03
++15079dd9fd20f252d4c6dc6972508d3375cf5af2 jdk7u76-b04
++0ac38b5b642738fb27b446b0c1bc6108f31f197c jdk7u76-b05
++8580db8e38a232978f69fe627f3373e12c467803 jdk7u76-b06
++475a5cf6fc80c085c1be11b502ef44e7206c73d3 jdk7u76-b07
++64a7fa638019deebae59be4a4a262cfa1d7947ad jdk7u76-b08
++103eec0b084f7dfa0afce1ed9adebd6a9fab1aa8 jdk7u76-b09
++82b681cadc354b08b0aa2858d9b7f78576a8c1a4 jdk7u76-b10
++fd16bf65cfed7208af5740977a6699d18ac103b2 jdk7u76-b11
++e375023d196199ffb263cb15739f7218e1621be6 jdk7u76-b12
++a395c29532e5322657c542d54dd957940cf2f523 jdk7u76-b13
++98f0c5279ba76eb1b5741dc67f7b5f10e7508449 jdk7u76-b30
+--- ./hotspot/agent/src/os/linux/libproc.h Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/agent/src/os/linux/libproc.h Mon Jan 05 11:51:17 2015 -0800
+@@ -34,19 +34,7 @@
+ #include "libproc_md.h"
+ #endif
+
+-#if defined(sparc) || defined(sparcv9)
+-/*
+- If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64
+- otherwise it should be from /usr/include/asm-sparc
+- These two files define pt_regs structure differently
+-*/
+-#ifdef _LP64
+-#include "asm-sparc64/ptrace.h"
+-#else
+-#include "asm-sparc/ptrace.h"
+-#endif
+-
+-#endif //sparc or sparcv9
++#include <linux/ptrace.h>
+
+ /************************************************************************************
+
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -61,8 +61,9 @@
+ long h = 0;
+ int s = 0;
+ int len = buf.length;
++ // Emulate the unsigned int in java_lang_String::hash_code
+ while (len-- > 0) {
+- h = 31*h + (0xFFL & buf[s]);
++ h = 31*h + (0xFFFFFFFFL & buf[s]);
+ s++;
+ }
+ return h & 0xFFFFFFFFL;
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Jan 05 11:51:17 2015 -0800
+@@ -158,6 +158,7 @@
+ _JVM_GetStackTraceElement
+ _JVM_GetSystemPackage
+ _JVM_GetSystemPackages
++ _JVM_GetTemporaryDirectory
+ _JVM_GetThreadStateNames
+ _JVM_GetThreadStateValues
+ _JVM_GetVersionInfo
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Jan 05 11:51:17 2015 -0800
+@@ -158,6 +158,7 @@
+ _JVM_GetStackTraceElement
+ _JVM_GetSystemPackage
+ _JVM_GetSystemPackages
++ _JVM_GetTemporaryDirectory
+ _JVM_GetThreadStateNames
+ _JVM_GetThreadStateValues
+ _JVM_GetVersionInfo
+--- ./hotspot/make/hotspot_version Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/make/hotspot_version Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -31,11 +31,11 @@
+ #
+
+ # Don't put quotes (fail windows build).
+-HOTSPOT_VM_COPYRIGHT=Copyright 2014
++HOTSPOT_VM_COPYRIGHT=Copyright 2015
+
+ HS_MAJOR_VER=24
+-HS_MINOR_VER=71
+-HS_BUILD_NUMBER=01
++HS_MINOR_VER=76
++HS_BUILD_NUMBER=04
+
+ JDK_MAJOR_VER=1
+ JDK_MINOR_VER=7
+--- ./hotspot/make/jprt.properties Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/make/jprt.properties Mon Jan 05 11:51:17 2015 -0800
+@@ -38,7 +38,7 @@
+
+ # This tells jprt what default release we want to build
+
+-jprt.hotspot.default.release=jdk7u40
++jprt.hotspot.default.release=jdk7u60
+
+ jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
+
+@@ -54,97 +54,92 @@
+ # Define the Solaris platforms we want for the various releases
+ jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
+ jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
+-jprt.my.solaris.sparc.jdk7u40=${jprt.my.solaris.sparc.jdk7}
++jprt.my.solaris.sparc.jdk7u60=${jprt.my.solaris.sparc.jdk7}
+ jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
+
+ jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
+ jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
+-jprt.my.solaris.sparcv9.jdk7u40=${jprt.my.solaris.sparcv9.jdk7}
++jprt.my.solaris.sparcv9.jdk7u60=${jprt.my.solaris.sparcv9.jdk7}
+ jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
+
+ jprt.my.solaris.i586.jdk8=solaris_i586_5.10
+ jprt.my.solaris.i586.jdk7=solaris_i586_5.10
+-jprt.my.solaris.i586.jdk7u40=${jprt.my.solaris.i586.jdk7}
++jprt.my.solaris.i586.jdk7u60=${jprt.my.solaris.i586.jdk7}
+ jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
+
+ jprt.my.solaris.x64.jdk8=solaris_x64_5.10
+ jprt.my.solaris.x64.jdk7=solaris_x64_5.10
+-jprt.my.solaris.x64.jdk7u40=${jprt.my.solaris.x64.jdk7}
++jprt.my.solaris.x64.jdk7u60=${jprt.my.solaris.x64.jdk7}
+ jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
+
+ jprt.my.linux.i586.jdk8=linux_i586_2.6
+ jprt.my.linux.i586.jdk7=linux_i586_2.6
+-jprt.my.linux.i586.jdk7u40=${jprt.my.linux.i586.jdk7}
++jprt.my.linux.i586.jdk7u60=${jprt.my.linux.i586.jdk7}
+ jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
+
+ jprt.my.linux.x64.jdk8=linux_x64_2.6
+ jprt.my.linux.x64.jdk7=linux_x64_2.6
+-jprt.my.linux.x64.jdk7u40=${jprt.my.linux.x64.jdk7}
++jprt.my.linux.x64.jdk7u60=${jprt.my.linux.x64.jdk7}
+ jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
+
+ jprt.my.linux.ppc.jdk8=linux_ppc_2.6
+ jprt.my.linux.ppc.jdk7=linux_ppc_2.6
+-jprt.my.linux.ppc.jdk7u40=${jprt.my.linux.ppc.jdk7}
++jprt.my.linux.ppc.jdk7u60=${jprt.my.linux.ppc.jdk7}
+ jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
+
+ jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
+ jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
+-jprt.my.linux.ppcv2.jdk7u40=${jprt.my.linux.ppcv2.jdk7}
++jprt.my.linux.ppcv2.jdk7u60=${jprt.my.linux.ppcv2.jdk7}
+ jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
+
+-jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
+-jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
+-jprt.my.linux.ppcsflt.jdk7u40=${jprt.my.linux.ppcsflt.jdk7}
+-jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
+-
+ jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
+ jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
+-jprt.my.linux.armvfp.jdk7u40=${jprt.my.linux.armvfp.jdk7}
++jprt.my.linux.armvfp.jdk7u60=${jprt.my.linux.armvfp.jdk7}
+ jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
+
+ jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6
+ jprt.my.linux.armvfpsflt.jdk7=linux_armvfpsflt_2.6
+-jprt.my.linux.armvfpsflt.jdk7u40=${jprt.my.linux.armvfpsflt.jdk7}
++jprt.my.linux.armvfpsflt.jdk7u60=${jprt.my.linux.armvfpsflt.jdk7}
+ jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}}
+
+ jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6
+ jprt.my.linux.armvfphflt.jdk7=linux_armvfphflt_2.6
+-jprt.my.linux.armvfphflt.jdk7u40=${jprt.my.linux.armvfphflt.jdk7}
++jprt.my.linux.armvfphflt.jdk7u60=${jprt.my.linux.armvfphflt.jdk7}
+ jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}}
+
+ jprt.my.linux.armv6.jdk8=linux_armv6_2.6
+ jprt.my.linux.armv6.jdk7=linux_armv6_2.6
+-jprt.my.linux.armv6.jdk7u40=${jprt.my.linux.armv6.jdk7}
++jprt.my.linux.armv6.jdk7u60=${jprt.my.linux.armv6.jdk7}
+ jprt.my.linux.armv6=${jprt.my.linux.armv6.${jprt.tools.default.release}}
+
+ jprt.my.linux.armvs.jdk8=linux_armvs_2.6
+ jprt.my.linux.armvs.jdk7=linux_armvs_2.6
+-jprt.my.linux.armvs.jdk7u40=${jprt.my.linux.armvs.jdk7}
++jprt.my.linux.armvs.jdk7u60=${jprt.my.linux.armvs.jdk7}
+ jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}}
+
+ jprt.my.linux.armvh.jdk8=linux_armvh_2.6
+ jprt.my.linux.armvh.jdk7=linux_armvh_2.6
+-jprt.my.linux.armvh.jdk7u40=${jprt.my.linux.armvh.jdk7}
++jprt.my.linux.armvh.jdk7u60=${jprt.my.linux.armvh.jdk7}
+ jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}}
+
+ jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
+ jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
+-jprt.my.linux.armsflt.jdk7u40=${jprt.my.linux.armsflt.jdk7}
++jprt.my.linux.armsflt.jdk7u60=${jprt.my.linux.armsflt.jdk7}
+ jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
+
+ jprt.my.macosx.x64.jdk8=macosx_x64_10.7
+ jprt.my.macosx.x64.jdk7=macosx_x64_10.7
+-jprt.my.macosx.x64.jdk7u40=${jprt.my.macosx.x64.jdk7}
++jprt.my.macosx.x64.jdk7u60=${jprt.my.macosx.x64.jdk7}
+ jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
+
+ jprt.my.windows.i586.jdk8=windows_i586_5.1
+ jprt.my.windows.i586.jdk7=windows_i586_5.1
+-jprt.my.windows.i586.jdk7u40=${jprt.my.windows.i586.jdk7}
++jprt.my.windows.i586.jdk7u60=${jprt.my.windows.i586.jdk7}
+ jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
+
+ jprt.my.windows.x64.jdk8=windows_x64_5.2
+ jprt.my.windows.x64.jdk7=windows_x64_5.2
+-jprt.my.windows.x64.jdk7u40=${jprt.my.windows.x64.jdk7}
++jprt.my.windows.x64.jdk7u60=${jprt.my.windows.x64.jdk7}
+ jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
+
+ # Standard list of jprt build targets for this source tree
+@@ -172,7 +167,6 @@
+ ${jprt.my.linux.i586}-{productEmb|fastdebugEmb|debugEmb}, \
+ ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \
+ ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \
+- ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \
+ ${jprt.my.linux.armvfp}-{productEmb|fastdebugEmb}, \
+ ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb}, \
+ ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \
+@@ -183,7 +177,7 @@
+
+ jprt.build.targets.jdk8=${jprt.build.targets.all}
+ jprt.build.targets.jdk7=${jprt.build.targets.all}
+-jprt.build.targets.jdk7u40=${jprt.build.targets.all}
++jprt.build.targets.jdk7u60=${jprt.build.targets.all}
+ jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
+
+ # Subset lists of test targets for this source tree
+@@ -476,7 +470,7 @@
+
+ jprt.test.targets.jdk8=${jprt.test.targets.standard}
+ jprt.test.targets.jdk7=${jprt.test.targets.standard}
+-jprt.test.targets.jdk7u40=${jprt.test.targets.jdk7}
++jprt.test.targets.jdk7u60=${jprt.test.targets.jdk7}
+ jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
+
+ # The default test/Makefile targets that should be run
+@@ -536,7 +530,7 @@
+
+ jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
+ jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
+-jprt.make.rule.test.targets.jdk7u40=${jprt.make.rule.test.targets.jdk7}
++jprt.make.rule.test.targets.jdk7u60=${jprt.make.rule.test.targets.jdk7}
+ jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
+
+ # 7155453: Work-around to prevent popups on OSX from blocking test completion
+--- ./hotspot/make/linux/makefiles/mapfile-vers-debug Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/make/linux/makefiles/mapfile-vers-debug Mon Jan 05 11:51:17 2015 -0800
+@@ -123,7 +123,7 @@
+ JVM_GetClassModifiers;
+ JVM_GetClassName;
+ JVM_GetClassNameUTF;
+- JVM_GetClassSignature;
++ JVM_GetClassSignature;
+ JVM_GetClassSigners;
+ JVM_GetComponentType;
+ JVM_GetDeclaredClasses;
+@@ -160,6 +160,7 @@
+ JVM_GetStackTraceElement;
+ JVM_GetSystemPackage;
+ JVM_GetSystemPackages;
++ JVM_GetTemporaryDirectory;
+ JVM_GetThreadStateNames;
+ JVM_GetThreadStateValues;
+ JVM_GetVersionInfo;
+--- ./hotspot/make/linux/makefiles/mapfile-vers-product Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/make/linux/makefiles/mapfile-vers-product Mon Jan 05 11:51:17 2015 -0800
+@@ -160,6 +160,7 @@
+ JVM_GetStackTraceElement;
+ JVM_GetSystemPackage;
+ JVM_GetSystemPackages;
++ JVM_GetTemporaryDirectory;
+ JVM_GetThreadStateNames;
+ JVM_GetThreadStateValues;
+ JVM_GetVersionInfo;
+--- ./hotspot/make/solaris/makefiles/mapfile-vers Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/make/solaris/makefiles/mapfile-vers Mon Jan 05 11:51:17 2015 -0800
+@@ -160,6 +160,7 @@
+ JVM_GetStackTraceElement;
+ JVM_GetSystemPackage;
+ JVM_GetSystemPackages;
++ JVM_GetTemporaryDirectory;
+ JVM_GetThreadStateNames;
+ JVM_GetThreadStateValues;
+ JVM_GetVersionInfo;
+--- ./hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1745,7 +1745,7 @@
+
+ inline void swap( Register s1, Register s2, Register d );
+ inline void swap( Register s1, int simm13a, Register d);
+- inline void swap( Address& a, Register d, int offset = 0 );
++ inline void swap( const Address& a, Register d, int offset = 0 );
+
+ // pp 232
+
+--- ./hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -347,7 +347,7 @@
+ inline void Assembler::swap( Register s1, Register s2, Register d) { v9_dep(); emit_long( op(ldst_op) | rd(d) | op3(swap_op3) | rs1(s1) | rs2(s2) ); }
+ inline void Assembler::swap( Register s1, int simm13a, Register d) { v9_dep(); emit_data( op(ldst_op) | rd(d) | op3(swap_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
+
+-inline void Assembler::swap( Address& a, Register d, int offset ) {
++inline void Assembler::swap( const Address& a, Register d, int offset ) {
+ relocate(a.rspec(offset));
+ if (a.has_index()) { assert(offset == 0, ""); swap( a.base(), a.index(), d ); }
+ else { swap( a.base(), a.disp() + offset, d ); }
+--- ./hotspot/src/cpu/sparc/vm/copy_sparc.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/copy_sparc.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -184,7 +184,7 @@
+ assert(MinObjAlignmentInBytes >= BytesPerLong, "need alternate implementation");
+
+ if (value == 0 && UseBlockZeroing &&
+- (count > (BlockZeroingLowLimit >> LogHeapWordSize))) {
++ (count > (size_t)(BlockZeroingLowLimit >> LogHeapWordSize))) {
+ // Call it only when block zeroing is used
+ ((_zero_Fn)StubRoutines::zero_aligned_words())(tohw, count);
+ } else {
+--- ./hotspot/src/cpu/sparc/vm/frame_sparc.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/frame_sparc.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -282,8 +282,8 @@
+
+ // next two fns read and write Lmonitors value,
+ private:
+- BasicObjectLock* interpreter_frame_monitors() const { return *interpreter_frame_monitors_addr(); }
+- void interpreter_frame_set_monitors(BasicObjectLock* monitors) { *interpreter_frame_monitors_addr() = monitors; }
++ BasicObjectLock* interpreter_frame_monitors() const;
++ void interpreter_frame_set_monitors(BasicObjectLock* monitors);
+ #else
+ public:
+ inline interpreterState get_interpreterState() const {
+--- ./hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -217,6 +217,13 @@
+ return (methodOop*)sp_addr_at( Lmethod->sp_offset_in_saved_window());
+ }
+
++inline BasicObjectLock* frame::interpreter_frame_monitors() const {
++ return *interpreter_frame_monitors_addr();
++}
++
++inline void frame::interpreter_frame_set_monitors(BasicObjectLock* monitors) {
++ *interpreter_frame_monitors_addr() = monitors;
++}
+
+ // Constant pool cache
+
+--- ./hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1142,50 +1142,81 @@
+ // Hoist any int/ptr/long's in the first 6 to int regs.
+ // Hoist any flt/dbl's in the first 16 dbl regs.
+ int j = 0; // Count of actual args, not HALVES
+- for( int i=0; i<total_args_passed; i++, j++ ) {
+- switch( sig_bt[i] ) {
++ VMRegPair param_array_reg; // location of the argument in the parameter array
++ for (int i = 0; i < total_args_passed; i++, j++) {
++ param_array_reg.set_bad();
++ switch (sig_bt[i]) {
+ case T_BOOLEAN:
+ case T_BYTE:
+ case T_CHAR:
+ case T_INT:
+ case T_SHORT:
+- regs[i].set1( int_stk_helper( j ) ); break;
++ regs[i].set1(int_stk_helper(j));
++ break;
+ case T_LONG:
+- assert( sig_bt[i+1] == T_VOID, "expecting half" );
++ assert(sig_bt[i+1] == T_VOID, "expecting half");
+ case T_ADDRESS: // raw pointers, like current thread, for VM calls
+ case T_ARRAY:
+ case T_OBJECT:
+- regs[i].set2( int_stk_helper( j ) );
++ regs[i].set2(int_stk_helper(j));
+ break;
+ case T_FLOAT:
+- if ( j < 16 ) {
+- // V9ism: floats go in ODD registers
+- regs[i].set1(as_FloatRegister(1 + (j<<1))->as_VMReg());
+- } else {
+- // V9ism: floats go in ODD stack slot
+- regs[i].set1(VMRegImpl::stack2reg(1 + (j<<1)));
++ // Per SPARC Compliance Definition 2.4.1, page 3P-12 available here
++ // http://www.sparc.org/wp-content/uploads/2014/01/SCD.2.4.1.pdf.gz
++ //
++ // "When a callee prototype exists, and does not indicate variable arguments,
++ // floating-point values assigned to locations %sp+BIAS+128 through %sp+BIAS+248
++ // will be promoted to floating-point registers"
++ //
++ // By "promoted" it means that the argument is located in two places, an unused
++ // spill slot in the "parameter array" (starts at %sp+BIAS+128), and a live
++ // float register. In most cases, there are 6 or fewer arguments of any type,
++ // and the standard parameter array slots (%sp+BIAS+128 to %sp+BIAS+176 exclusive)
++ // serve as shadow slots. Per the spec floating point registers %d6 to %d16
++ // require slots beyond that (up to %sp+BIAS+248).
++ //
++ {
++ // V9ism: floats go in ODD registers and stack slots
++ int float_index = 1 + (j << 1);
++ param_array_reg.set1(VMRegImpl::stack2reg(float_index));
++ if (j < 16) {
++ regs[i].set1(as_FloatRegister(float_index)->as_VMReg());
++ } else {
++ regs[i] = param_array_reg;
++ }
+ }
+ break;
+ case T_DOUBLE:
+- assert( sig_bt[i+1] == T_VOID, "expecting half" );
+- if ( j < 16 ) {
+- // V9ism: doubles go in EVEN/ODD regs
+- regs[i].set2(as_FloatRegister(j<<1)->as_VMReg());
+- } else {
+- // V9ism: doubles go in EVEN/ODD stack slots
+- regs[i].set2(VMRegImpl::stack2reg(j<<1));
++ {
++ assert(sig_bt[i + 1] == T_VOID, "expecting half");
++ // V9ism: doubles go in EVEN/ODD regs and stack slots
++ int double_index = (j << 1);
++ param_array_reg.set2(VMRegImpl::stack2reg(double_index));
++ if (j < 16) {
++ regs[i].set2(as_FloatRegister(double_index)->as_VMReg());
++ } else {
++ // V9ism: doubles go in EVEN/ODD stack slots
++ regs[i] = param_array_reg;
++ }
+ }
+ break;
+- case T_VOID: regs[i].set_bad(); j--; break; // Do not count HALVES
++ case T_VOID:
++ regs[i].set_bad();
++ j--;
++ break; // Do not count HALVES
+ default:
+ ShouldNotReachHere();
+ }
+- if (regs[i].first()->is_stack()) {
+- int off = regs[i].first()->reg2stack();
++ // Keep track of the deepest parameter array slot.
++ if (!param_array_reg.first()->is_valid()) {
++ param_array_reg = regs[i];
++ }
++ if (param_array_reg.first()->is_stack()) {
++ int off = param_array_reg.first()->reg2stack();
+ if (off > max_stack_slots) max_stack_slots = off;
+ }
+- if (regs[i].second()->is_stack()) {
+- int off = regs[i].second()->reg2stack();
++ if (param_array_reg.second()->is_stack()) {
++ int off = param_array_reg.second()->reg2stack();
+ if (off > max_stack_slots) max_stack_slots = off;
+ }
+ }
+@@ -1193,8 +1224,8 @@
+ #else // _LP64
+ // V8 convention: first 6 things in O-regs, rest on stack.
+ // Alignment is willy-nilly.
+- for( int i=0; i<total_args_passed; i++ ) {
+- switch( sig_bt[i] ) {
++ for (int i = 0; i < total_args_passed; i++) {
++ switch (sig_bt[i]) {
+ case T_ADDRESS: // raw pointers, like current thread, for VM calls
+ case T_ARRAY:
+ case T_BOOLEAN:
+@@ -1204,23 +1235,23 @@
+ case T_INT:
+ case T_OBJECT:
+ case T_SHORT:
+- regs[i].set1( int_stk_helper( i ) );
++ regs[i].set1(int_stk_helper(i));
+ break;
+ case T_DOUBLE:
+ case T_LONG:
+- assert( sig_bt[i+1] == T_VOID, "expecting half" );
+- regs[i].set_pair( int_stk_helper( i+1 ), int_stk_helper( i ) );
++ assert(sig_bt[i + 1] == T_VOID, "expecting half");
++ regs[i].set_pair(int_stk_helper(i + 1), int_stk_helper(i));
+ break;
+ case T_VOID: regs[i].set_bad(); break;
+ default:
+ ShouldNotReachHere();
+ }
+ if (regs[i].first()->is_stack()) {
+- int off = regs[i].first()->reg2stack();
++ int off = regs[i].first()->reg2stack();
+ if (off > max_stack_slots) max_stack_slots = off;
+ }
+ if (regs[i].second()->is_stack()) {
+- int off = regs[i].second()->reg2stack();
++ int off = regs[i].second()->reg2stack();
+ if (off > max_stack_slots) max_stack_slots = off;
+ }
+ }
+@@ -1369,11 +1400,10 @@
+ const Register rOop = src.first()->as_Register();
+ const Register rHandle = L5;
+ int oop_slot = rOop->input_number() * VMRegImpl::slots_per_word + oop_handle_offset;
+- int offset = oop_slot*VMRegImpl::stack_slot_size;
+- Label skip;
++ int offset = oop_slot * VMRegImpl::stack_slot_size;
+ __ st_ptr(rOop, SP, offset + STACK_BIAS);
+ if (is_receiver) {
+- *receiver_offset = oop_slot * VMRegImpl::stack_slot_size;
++ *receiver_offset = offset;
+ }
+ map->set_oop(VMRegImpl::stack2reg(oop_slot));
+ __ add(SP, offset + STACK_BIAS, rHandle);
+--- ./hotspot/src/cpu/sparc/vm/sparc.ad Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/sparc.ad Mon Jan 05 11:51:17 2015 -0800
+@@ -1978,7 +1978,7 @@
+ // to implement the UseStrictFP mode.
+ const bool Matcher::strict_fp_requires_explicit_rounding = false;
+
+-// Are floats conerted to double when stored to stack during deoptimization?
++// Are floats converted to double when stored to stack during deoptimization?
+ // Sparc does not handle callee-save floats.
+ bool Matcher::float_in_double() { return false; }
+
+@@ -3216,7 +3216,7 @@
+ // are owned by the CALLEE. Holes should not be nessecary in the
+ // incoming area, as the Java calling convention is completely under
+ // the control of the AD file. Doubles can be sorted and packed to
+-// avoid holes. Holes in the outgoing arguments may be nessecary for
++// avoid holes. Holes in the outgoing arguments may be necessary for
+ // varargs C calling conventions.
+ // Note 3: Region 0-3 is even aligned, with pad2 as needed. Region 3-5 is
+ // even aligned with pad0 as needed.
+@@ -3282,7 +3282,7 @@
+ %}
+
+ // Body of function which returns an OptoRegs array locating
+- // arguments either in registers or in stack slots for callin
++ // arguments either in registers or in stack slots for calling
+ // C.
+ c_calling_convention %{
+ // This is obviously always outgoing
+--- ./hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -89,7 +89,7 @@
+ private:
+
+ #ifdef PRODUCT
+-#define inc_counter_np(a,b,c) (0)
++#define inc_counter_np(a,b,c)
+ #else
+ #define inc_counter_np(counter, t1, t2) \
+ BLOCK_COMMENT("inc_counter " #counter); \
+@@ -1126,7 +1126,7 @@
+ Label& L_loop, bool use_prefetch, bool use_bis);
+
+ void disjoint_copy_core(Register from, Register to, Register count, int log2_elem_size,
+- int iter_size, CopyLoopFunc copy_loop_func) {
++ int iter_size, StubGenerator::CopyLoopFunc copy_loop_func) {
+ Label L_copy;
+
+ assert(log2_elem_size <= 3, "the following code should be changed");
+@@ -1277,7 +1277,7 @@
+ __ inc(from, 8);
+ __ sllx(O3, left_shift, O3);
+
+- disjoint_copy_core(from, to, count, log2_elem_size, 16, copy_16_bytes_shift_loop);
++ disjoint_copy_core(from, to, count, log2_elem_size, 16, &StubGenerator::copy_16_bytes_shift_loop);
+
+ __ inccc(count, count_dec>>1 ); // + 8 bytes
+ __ brx(Assembler::negative, true, Assembler::pn, L_copy_last_bytes);
+@@ -2156,7 +2156,7 @@
+ __ dec(count, 4); // The cmp at the beginning guaranty count >= 4
+ __ sllx(O3, 32, O3);
+
+- disjoint_copy_core(from, to, count, 2, 16, copy_16_bytes_loop);
++ disjoint_copy_core(from, to, count, 2, 16, &StubGenerator::copy_16_bytes_loop);
+
+ __ br(Assembler::always, false, Assembler::pt, L_copy_4_bytes);
+ __ delayed()->inc(count, 4); // restore 'count'
+@@ -2437,7 +2437,7 @@
+ // count >= 0 (original count - 8)
+ __ mov(from, from64);
+
+- disjoint_copy_core(from64, to64, count, 3, 64, copy_64_bytes_loop);
++ disjoint_copy_core(from64, to64, count, 3, 64, &StubGenerator::copy_64_bytes_loop);
+
+ // Restore O4(offset0), O5(offset8)
+ __ sub(from64, from, offset0);
+--- ./hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -48,7 +48,8 @@
+ sparc64_family = 14,
+ M_family = 15,
+ T_family = 16,
+- T1_model = 17
++ T1_model = 17,
++ sparc5_instructions = 18
+ };
+
+ enum Feature_Flag_Set {
+@@ -73,6 +74,7 @@
+ M_family_m = 1 << M_family,
+ T_family_m = 1 << T_family,
+ T1_model_m = 1 << T1_model,
++ sparc5_instructions_m = 1 << sparc5_instructions,
+
+ generic_v8_m = v8_instructions_m | hardware_mul32_m | hardware_div32_m | hardware_fsmuld_m,
+ generic_v9_m = generic_v8_m | v9_instructions_m,
+@@ -117,6 +119,7 @@
+ static bool has_vis3() { return (_features & vis3_instructions_m) != 0; }
+ static bool has_blk_init() { return (_features & blk_init_instructions_m) != 0; }
+ static bool has_cbcond() { return (_features & cbcond_instructions_m) != 0; }
++ static bool has_sparc5_instr() { return (_features & sparc5_instructions_m) != 0; }
+
+ static bool supports_compare_and_exchange()
+ { return has_v9(); }
+@@ -127,6 +130,7 @@
+
+ static bool is_M_series() { return is_M_family(_features); }
+ static bool is_T4() { return is_T_family(_features) && has_cbcond(); }
++ static bool is_T7() { return is_T_family(_features) && has_sparc5_instr(); }
+
+ // Fujitsu SPARC64
+ static bool is_sparc64() { return (_features & sparc64_family_m) != 0; }
+@@ -146,7 +150,7 @@
+ static const char* cpu_features() { return _features_str; }
+
+ static intx prefetch_data_size() {
+- return is_T4() ? 32 : 64; // default prefetch block size on sparc
++ return is_T4() && !is_T7() ? 32 : 64; // default prefetch block size on sparc
+ }
+
+ // Prefetch
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1297,9 +1297,20 @@
+ //////////////////////////////////////////////////////////////////////////////
+ // thread local storage
+
++// Restore the thread pointer if the destructor is called. This is in case
++// someone from JNI code sets up a destructor with pthread_key_create to run
++// detachCurrentThread on thread death. Unless we restore the thread pointer we
++// will hang or crash. When detachCurrentThread is called the key will be set
++// to null and we will not be called again. If detachCurrentThread is never
++// called we could loop forever depending on the pthread implementation.
++static void restore_thread_pointer(void* p) {
++ Thread* thread = (Thread*) p;
++ os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
++}
++
+ int os::allocate_thread_local_storage() {
+ pthread_key_t key;
+- int rslt = pthread_key_create(&key, NULL);
++ int rslt = pthread_key_create(&key, restore_thread_pointer);
+ assert(rslt == 0, "cannot allocate thread local storage");
+ return (int)key;
+ }
+@@ -4422,11 +4433,15 @@
+ // and if UserSignalHandler is installed all bets are off
+ if (CheckJNICalls) {
+ if (libjsig_is_loaded) {
+- tty->print_cr("Info: libjsig is activated, all active signal checking is disabled");
++ if (PrintJNIResolving) {
++ tty->print_cr("Info: libjsig is activated, all active signal checking is disabled");
++ }
+ check_signals = false;
+ }
+ if (AllowUserSignalHandlers) {
+- tty->print_cr("Info: AllowUserSignalHandlers is activated, all active signal checking is disabled");
++ if (PrintJNIResolving) {
++ tty->print_cr("Info: AllowUserSignalHandlers is activated, all active signal checking is disabled");
++ }
+ check_signals = false;
+ }
+ }
+--- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -197,7 +197,38 @@
+ }
+
+
+-// check if the given path is considered a secure directory for
++// Check if the given statbuf is considered a secure directory for
++// the backing store files. Returns true if the directory is considered
++// a secure location. Returns false if the statbuf is a symbolic link or
++// if an error occurred.
++//
++static bool is_statbuf_secure(struct stat *statp) {
++ if (S_ISLNK(statp->st_mode) || !S_ISDIR(statp->st_mode)) {
++ // The path represents a link or some non-directory file type,
++ // which is not what we expected. Declare it insecure.
++ //
++ return false;
++ }
++ // We have an existing directory, check if the permissions are safe.
++ //
++ if ((statp->st_mode & (S_IWGRP|S_IWOTH)) != 0) {
++ // The directory is open for writing and could be subjected
++ // to a symlink or a hard link attack. Declare it insecure.
++ //
++ return false;
++ }
++ // See if the uid of the directory matches the effective uid of the process.
++ //
++ if (statp->st_uid != geteuid()) {
++ // The directory was not created by this user, declare it insecure.
++ //
++ return false;
++ }
++ return true;
++}
++
++
++// Check if the given path is considered a secure directory for
+ // the backing store files. Returns true if the directory exists
+ // and is considered a secure location. Returns false if the path
+ // is a symbolic link or if an error occurred.
+@@ -211,27 +242,185 @@
+ return false;
+ }
+
+- // the path exists, now check it's mode
+- if (S_ISLNK(statbuf.st_mode) || !S_ISDIR(statbuf.st_mode)) {
+- // the path represents a link or some non-directory file type,
+- // which is not what we expected. declare it insecure.
+- //
++ // The path exists, see if it is secure.
++ return is_statbuf_secure(&statbuf);
++}
++
++
++// Check if the given directory file descriptor is considered a secure
++// directory for the backing store files. Returns true if the directory
++// exists and is considered a secure location. Returns false if the path
++// is a symbolic link or if an error occurred.
++//
++static bool is_dirfd_secure(int dir_fd) {
++ struct stat statbuf;
++ int result = 0;
++
++ RESTARTABLE(::fstat(dir_fd, &statbuf), result);
++ if (result == OS_ERR) {
+ return false;
+ }
+- else {
+- // we have an existing directory, check if the permissions are safe.
+- //
+- if ((statbuf.st_mode & (S_IWGRP|S_IWOTH)) != 0) {
+- // the directory is open for writing and could be subjected
+- // to a symlnk attack. declare it insecure.
+- //
+- return false;
++
++ // The path exists, now check its mode.
++ return is_statbuf_secure(&statbuf);
++}
++
++
++// Check to make sure fd1 and fd2 are referencing the same file system object.
++//
++static bool is_same_fsobject(int fd1, int fd2) {
++ struct stat statbuf1;
++ struct stat statbuf2;
++ int result = 0;
++
++ RESTARTABLE(::fstat(fd1, &statbuf1), result);
++ if (result == OS_ERR) {
++ return false;
++ }
++ RESTARTABLE(::fstat(fd2, &statbuf2), result);
++ if (result == OS_ERR) {
++ return false;
++ }
++
++ if ((statbuf1.st_ino == statbuf2.st_ino) &&
++ (statbuf1.st_dev == statbuf2.st_dev)) {
++ return true;
++ } else {
++ return false;
++ }
++}
++
++
++// Open the directory of the given path and validate it.
++// Return a DIR * of the open directory.
++//
++static DIR *open_directory_secure(const char* dirname) {
++ // Open the directory using open() so that it can be verified
++ // to be secure by calling is_dirfd_secure(), opendir() and then check
++ // to see if they are the same file system object. This method does not
++ // introduce a window of opportunity for the directory to be attacked that
++ // calling opendir() and is_directory_secure() does.
++ int result;
++ DIR *dirp = NULL;
++ RESTARTABLE(::open(dirname, O_RDONLY|O_NOFOLLOW), result);
++ if (result == OS_ERR) {
++ // Directory doesn't exist or is a symlink, so there is nothing to cleanup.
++ if (PrintMiscellaneous && Verbose) {
++ if (errno == ELOOP) {
++ warning("directory %s is a symlink and is not secure\n", dirname);
++ } else {
++ warning("could not open directory %s: %s\n", dirname, strerror(errno));
++ }
+ }
++ return dirp;
++ }
++ int fd = result;
++
++ // Determine if the open directory is secure.
++ if (!is_dirfd_secure(fd)) {
++ // The directory is not a secure directory.
++ os::close(fd);
++ return dirp;
++ }
++
++ // Open the directory.
++ dirp = ::opendir(dirname);
++ if (dirp == NULL) {
++ // The directory doesn't exist, close fd and return.
++ os::close(fd);
++ return dirp;
++ }
++
++ // Check to make sure fd and dirp are referencing the same file system object.
++ if (!is_same_fsobject(fd, dirfd(dirp))) {
++ // The directory is not secure.
++ os::close(fd);
++ os::closedir(dirp);
++ dirp = NULL;
++ return dirp;
++ }
++
++ // Close initial open now that we know directory is secure
++ os::close(fd);
++
++ return dirp;
++}
++
++// NOTE: The code below uses fchdir(), open() and unlink() because
++// fdopendir(), openat() and unlinkat() are not supported on all
++// versions. Once the support for fdopendir(), openat() and unlinkat()
++// is available on all supported versions the code can be changed
++// to use these functions.
++
++// Open the directory of the given path, validate it and set the
++// current working directory to it.
++// Return a DIR * of the open directory and the saved cwd fd.
++//
++static DIR *open_directory_secure_cwd(const char* dirname, int *saved_cwd_fd) {
++
++ // Open the directory.
++ DIR* dirp = open_directory_secure(dirname);
++ if (dirp == NULL) {
++ // Directory doesn't exist or is insecure, so there is nothing to cleanup.
++ return dirp;
++ }
++ int fd = dirfd(dirp);
++
++ // Open a fd to the cwd and save it off.
++ int result;
++ RESTARTABLE(::open(".", O_RDONLY), result);
++ if (result == OS_ERR) {
++ *saved_cwd_fd = -1;
++ } else {
++ *saved_cwd_fd = result;
++ }
++
++ // Set the current directory to dirname by using the fd of the directory.
++ result = fchdir(fd);
++
++ return dirp;
++}
++
++// Close the directory and restore the current working directory.
++//
++static void close_directory_secure_cwd(DIR* dirp, int saved_cwd_fd) {
++
++ int result;
++ // If we have a saved cwd change back to it and close the fd.
++ if (saved_cwd_fd != -1) {
++ result = fchdir(saved_cwd_fd);
++ ::close(saved_cwd_fd);
++ }
++
++ // Close the directory.
++ os::closedir(dirp);
++}
++
++// Check if the given file descriptor is considered a secure.
++//
++static bool is_file_secure(int fd, const char *filename) {
++
++ int result;
++ struct stat statbuf;
++
++ // Determine if the file is secure.
++ RESTARTABLE(::fstat(fd, &statbuf), result);
++ if (result == OS_ERR) {
++ if (PrintMiscellaneous && Verbose) {
++ warning("fstat failed on %s: %s\n", filename, strerror(errno));
++ }
++ return false;
++ }
++ if (statbuf.st_nlink > 1) {
++ // A file with multiple links is not expected.
++ if (PrintMiscellaneous && Verbose) {
++ warning("file %s has multiple links\n", filename);
++ }
++ return false;
+ }
+ return true;
+ }
+
+-
+ // return the user name for the given user id
+ //
+ // the caller is expected to free the allocated memory.
+@@ -317,9 +506,11 @@
+
+ const char* tmpdirname = os::get_temp_directory();
+
++ // open the temp directory
+ DIR* tmpdirp = os::opendir(tmpdirname);
+
+ if (tmpdirp == NULL) {
++ // Cannot open the directory to get the user name, return.
+ return NULL;
+ }
+
+@@ -344,25 +535,14 @@
+ strcat(usrdir_name, "/");
+ strcat(usrdir_name, dentry->d_name);
+
+- DIR* subdirp = os::opendir(usrdir_name);
++ // open the user directory
++ DIR* subdirp = open_directory_secure(usrdir_name);
+
+ if (subdirp == NULL) {
+ FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
+ continue;
+ }
+
+- // Since we don't create the backing store files in directories
+- // pointed to by symbolic links, we also don't follow them when
+- // looking for the files. We check for a symbolic link after the
+- // call to opendir in order to eliminate a small window where the
+- // symlink can be exploited.
+- //
+- if (!is_directory_secure(usrdir_name)) {
+- FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
+- os::closedir(subdirp);
+- continue;
+- }
+-
+ struct dirent* udentry;
+ char* udbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(usrdir_name), mtInternal);
+ errno = 0;
+@@ -465,26 +645,6 @@
+ }
+
+
+-// remove file
+-//
+-// this method removes the file with the given file name in the
+-// named directory.
+-//
+-static void remove_file(const char* dirname, const char* filename) {
+-
+- size_t nbytes = strlen(dirname) + strlen(filename) + 2;
+- char* path = NEW_C_HEAP_ARRAY(char, nbytes, mtInternal);
+-
+- strcpy(path, dirname);
+- strcat(path, "/");
+- strcat(path, filename);
+-
+- remove_file(path);
+-
+- FREE_C_HEAP_ARRAY(char, path, mtInternal);
+-}
+-
+-
+ // cleanup stale shared memory resources
+ //
+ // This method attempts to remove all stale shared memory files in
+@@ -496,16 +656,11 @@
+ //
+ static void cleanup_sharedmem_resources(const char* dirname) {
+
+- // open the user temp directory
+- DIR* dirp = os::opendir(dirname);
+-
++ int saved_cwd_fd;
++ // open the directory and set the current working directory to it
++ DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd);
+ if (dirp == NULL) {
+- // directory doesn't exist, so there is nothing to cleanup
+- return;
+- }
+-
+- if (!is_directory_secure(dirname)) {
+- // the directory is not a secure directory
++ // directory doesn't exist or is insecure, so there is nothing to cleanup
+ return;
+ }
+
+@@ -519,6 +674,7 @@
+ //
+ struct dirent* entry;
+ char* dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(dirname), mtInternal);
++
+ errno = 0;
+ while ((entry = os::readdir(dirp, (struct dirent *)dbuf)) != NULL) {
+
+@@ -529,7 +685,7 @@
+ if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) {
+
+ // attempt to remove all unexpected files, except "." and ".."
+- remove_file(dirname, entry->d_name);
++ unlink(entry->d_name);
+ }
+
+ errno = 0;
+@@ -552,11 +708,14 @@
+ if ((pid == os::current_process_id()) ||
+ (kill(pid, 0) == OS_ERR && (errno == ESRCH || errno == EPERM))) {
+
+- remove_file(dirname, entry->d_name);
++ unlink(entry->d_name);
+ }
+ errno = 0;
+ }
+- os::closedir(dirp);
++
++ // close the directory and reset the current working directory
++ close_directory_secure_cwd(dirp, saved_cwd_fd);
++
+ FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
+ }
+
+@@ -613,19 +772,54 @@
+ return -1;
+ }
+
++ int saved_cwd_fd;
++ // open the directory and set the current working directory to it
++ DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd);
++ if (dirp == NULL) {
++ // Directory doesn't exist or is insecure, so cannot create shared
++ // memory file.
++ return -1;
++ }
++
++ // Open the filename in the current directory.
++ // Cannot use O_TRUNC here; truncation of an existing file has to happen
++ // after the is_file_secure() check below.
+ int result;
+-
+- RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IREAD|S_IWRITE), result);
++ RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_NOFOLLOW, S_IREAD|S_IWRITE), result);
+ if (result == OS_ERR) {
+ if (PrintMiscellaneous && Verbose) {
+- warning("could not create file %s: %s\n", filename, strerror(errno));
++ if (errno == ELOOP) {
++ warning("file %s is a symlink and is not secure\n", filename);
++ } else {
++ warning("could not create file %s: %s\n", filename, strerror(errno));
++ }
+ }
++ // close the directory and reset the current working directory
++ close_directory_secure_cwd(dirp, saved_cwd_fd);
++
+ return -1;
+ }
++ // close the directory and reset the current working directory
++ close_directory_secure_cwd(dirp, saved_cwd_fd);
+
+ // save the file descriptor
+ int fd = result;
+
++ // check to see if the file is secure
++ if (!is_file_secure(fd, filename)) {
++ ::close(fd);
++ return -1;
++ }
++
++ // truncate the file to get rid of any existing data
++ RESTARTABLE(::ftruncate(fd, (off_t)0), result);
++ if (result == OS_ERR) {
++ if (PrintMiscellaneous && Verbose) {
++ warning("could not truncate shared memory file: %s\n", strerror(errno));
++ }
++ ::close(fd);
++ return -1;
++ }
+ // set the file size
+ RESTARTABLE(::ftruncate(fd, (off_t)size), result);
+ if (result == OS_ERR) {
+@@ -683,8 +877,15 @@
+ THROW_MSG_0(vmSymbols::java_io_IOException(), strerror(errno));
+ }
+ }
++ int fd = result;
+
+- return result;
++ // check to see if the file is secure
++ if (!is_file_secure(fd, filename)) {
++ ::close(fd);
++ return -1;
++ }
++
++ return fd;
+ }
+
+ // create a named shared memory region. returns the address of the
+@@ -716,13 +917,21 @@
+ char* dirname = get_user_tmp_dir(user_name);
+ char* filename = get_sharedmem_filename(dirname, vmid);
+
++ // get the short filename
++ char* short_filename = strrchr(filename, '/');
++ if (short_filename == NULL) {
++ short_filename = filename;
++ } else {
++ short_filename++;
++ }
++
+ // cleanup any stale shared memory files
+ cleanup_sharedmem_resources(dirname);
+
+ assert(((size > 0) && (size % os::vm_page_size() == 0)),
+ "unexpected PerfMemory region size");
+
+- fd = create_sharedmem_resources(dirname, filename, size);
++ fd = create_sharedmem_resources(dirname, short_filename, size);
+
+ FREE_C_HEAP_ARRAY(char, user_name, mtInternal);
+ FREE_C_HEAP_ARRAY(char, dirname, mtInternal);
+@@ -839,12 +1048,12 @@
+ // constructs for the file and the shared memory mapping.
+ if (mode == PerfMemory::PERF_MODE_RO) {
+ mmap_prot = PROT_READ;
+- file_flags = O_RDONLY;
++ file_flags = O_RDONLY | O_NOFOLLOW;
+ }
+ else if (mode == PerfMemory::PERF_MODE_RW) {
+ #ifdef LATER
+ mmap_prot = PROT_READ | PROT_WRITE;
+- file_flags = O_RDWR;
++ file_flags = O_RDWR | O_NOFOLLOW;
+ #else
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Unsupported access mode");
+--- ./hotspot/src/os/linux/vm/os_linux.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os/linux/vm/os_linux.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1103,9 +1103,20 @@
+ //////////////////////////////////////////////////////////////////////////////
+ // thread local storage
+
++// Restore the thread pointer if the destructor is called. This is in case
++// someone from JNI code sets up a destructor with pthread_key_create to run
++// detachCurrentThread on thread death. Unless we restore the thread pointer we
++// will hang or crash. When detachCurrentThread is called the key will be set
++// to null and we will not be called again. If detachCurrentThread is never
++// called we could loop forever depending on the pthread implementation.
++static void restore_thread_pointer(void* p) {
++ Thread* thread = (Thread*) p;
++ os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
++}
++
+ int os::allocate_thread_local_storage() {
+ pthread_key_t key;
+- int rslt = pthread_key_create(&key, NULL);
++ int rslt = pthread_key_create(&key, restore_thread_pointer);
+ assert(rslt == 0, "cannot allocate thread local storage");
+ return (int)key;
+ }
+--- ./hotspot/src/os/linux/vm/perfMemory_linux.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os/linux/vm/perfMemory_linux.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -197,7 +197,38 @@
+ }
+
+
+-// check if the given path is considered a secure directory for
++// Check if the given statbuf is considered a secure directory for
++// the backing store files. Returns true if the directory is considered
++// a secure location. Returns false if the statbuf is a symbolic link or
++// if an error occurred.
++//
++static bool is_statbuf_secure(struct stat *statp) {
++ if (S_ISLNK(statp->st_mode) || !S_ISDIR(statp->st_mode)) {
++ // The path represents a link or some non-directory file type,
++ // which is not what we expected. Declare it insecure.
++ //
++ return false;
++ }
++ // We have an existing directory, check if the permissions are safe.
++ //
++ if ((statp->st_mode & (S_IWGRP|S_IWOTH)) != 0) {
++ // The directory is open for writing and could be subjected
++ // to a symlink or a hard link attack. Declare it insecure.
++ //
++ return false;
++ }
++ // See if the uid of the directory matches the effective uid of the process.
++ //
++ if (statp->st_uid != geteuid()) {
++ // The directory was not created by this user, declare it insecure.
++ //
++ return false;
++ }
++ return true;
++}
++
++
++// Check if the given path is considered a secure directory for
+ // the backing store files. Returns true if the directory exists
+ // and is considered a secure location. Returns false if the path
+ // is a symbolic link or if an error occurred.
+@@ -211,22 +242,180 @@
+ return false;
+ }
+
+- // the path exists, now check it's mode
+- if (S_ISLNK(statbuf.st_mode) || !S_ISDIR(statbuf.st_mode)) {
+- // the path represents a link or some non-directory file type,
+- // which is not what we expected. declare it insecure.
+- //
++ // The path exists, see if it is secure.
++ return is_statbuf_secure(&statbuf);
++}
++
++
++// Check if the given directory file descriptor is considered a secure
++// directory for the backing store files. Returns true if the directory
++// exists and is considered a secure location. Returns false if the path
++// is a symbolic link or if an error occurred.
++//
++static bool is_dirfd_secure(int dir_fd) {
++ struct stat statbuf;
++ int result = 0;
++
++ RESTARTABLE(::fstat(dir_fd, &statbuf), result);
++ if (result == OS_ERR) {
+ return false;
+ }
+- else {
+- // we have an existing directory, check if the permissions are safe.
+- //
+- if ((statbuf.st_mode & (S_IWGRP|S_IWOTH)) != 0) {
+- // the directory is open for writing and could be subjected
+- // to a symlnk attack. declare it insecure.
+- //
+- return false;
++
++ // The path exists, now check its mode.
++ return is_statbuf_secure(&statbuf);
++}
++
++
++// Check to make sure fd1 and fd2 are referencing the same file system object.
++//
++static bool is_same_fsobject(int fd1, int fd2) {
++ struct stat statbuf1;
++ struct stat statbuf2;
++ int result = 0;
++
++ RESTARTABLE(::fstat(fd1, &statbuf1), result);
++ if (result == OS_ERR) {
++ return false;
++ }
++ RESTARTABLE(::fstat(fd2, &statbuf2), result);
++ if (result == OS_ERR) {
++ return false;
++ }
++
++ if ((statbuf1.st_ino == statbuf2.st_ino) &&
++ (statbuf1.st_dev == statbuf2.st_dev)) {
++ return true;
++ } else {
++ return false;
++ }
++}
++
++
++// Open the directory of the given path and validate it.
++// Return a DIR * of the open directory.
++//
++static DIR *open_directory_secure(const char* dirname) {
++ // Open the directory using open() so that it can be verified
++ // to be secure by calling is_dirfd_secure(), opendir() and then check
++ // to see if they are the same file system object. This method does not
++ // introduce a window of opportunity for the directory to be attacked that
++ // calling opendir() and is_directory_secure() does.
++ int result;
++ DIR *dirp = NULL;
++ RESTARTABLE(::open(dirname, O_RDONLY|O_NOFOLLOW), result);
++ if (result == OS_ERR) {
++ if (PrintMiscellaneous && Verbose) {
++ if (errno == ELOOP) {
++ warning("directory %s is a symlink and is not secure\n", dirname);
++ } else {
++ warning("could not open directory %s: %s\n", dirname, strerror(errno));
++ }
+ }
++ return dirp;
++ }
++ int fd = result;
++
++ // Determine if the open directory is secure.
++ if (!is_dirfd_secure(fd)) {
++ // The directory is not a secure directory.
++ os::close(fd);
++ return dirp;
++ }
++
++ // Open the directory.
++ dirp = ::opendir(dirname);
++ if (dirp == NULL) {
++ // The directory doesn't exist, close fd and return.
++ os::close(fd);
++ return dirp;
++ }
++
++ // Check to make sure fd and dirp are referencing the same file system object.
++ if (!is_same_fsobject(fd, dirfd(dirp))) {
++ // The directory is not secure.
++ os::close(fd);
++ os::closedir(dirp);
++ dirp = NULL;
++ return dirp;
++ }
++
++ // Close initial open now that we know directory is secure
++ os::close(fd);
++
++ return dirp;
++}
++
++// NOTE: The code below uses fchdir(), open() and unlink() because
++// fdopendir(), openat() and unlinkat() are not supported on all
++// versions. Once the support for fdopendir(), openat() and unlinkat()
++// is available on all supported versions the code can be changed
++// to use these functions.
++
++// Open the directory of the given path, validate it and set the
++// current working directory to it.
++// Return a DIR * of the open directory and the saved cwd fd.
++//
++static DIR *open_directory_secure_cwd(const char* dirname, int *saved_cwd_fd) {
++
++ // Open the directory.
++ DIR* dirp = open_directory_secure(dirname);
++ if (dirp == NULL) {
++ // Directory doesn't exist or is insecure, so there is nothing to cleanup.
++ return dirp;
++ }
++ int fd = dirfd(dirp);
++
++ // Open a fd to the cwd and save it off.
++ int result;
++ RESTARTABLE(::open(".", O_RDONLY), result);
++ if (result == OS_ERR) {
++ *saved_cwd_fd = -1;
++ } else {
++ *saved_cwd_fd = result;
++ }
++
++ // Set the current directory to dirname by using the fd of the directory.
++ result = fchdir(fd);
++
++ return dirp;
++}
++
++// Close the directory and restore the current working directory.
++//
++static void close_directory_secure_cwd(DIR* dirp, int saved_cwd_fd) {
++
++ int result;
++ // If we have a saved cwd change back to it and close the fd.
++ if (saved_cwd_fd != -1) {
++ result = fchdir(saved_cwd_fd);
++ ::close(saved_cwd_fd);
++ }
++
++ // Close the directory.
++ os::closedir(dirp);
++}
++
++// Check if the given file descriptor is considered a secure.
++//
++static bool is_file_secure(int fd, const char *filename) {
++
++ int result;
++ struct stat statbuf;
++
++ // Determine if the file is secure.
++ RESTARTABLE(::fstat(fd, &statbuf), result);
++ if (result == OS_ERR) {
++ if (PrintMiscellaneous && Verbose) {
++ warning("fstat failed on %s: %s\n", filename, strerror(errno));
++ }
++ return false;
++ }
++ if (statbuf.st_nlink > 1) {
++ // A file with multiple links is not expected.
++ if (PrintMiscellaneous && Verbose) {
++ warning("file %s has multiple links\n", filename);
++ }
++ return false;
+ }
+ return true;
+ }
+@@ -317,9 +506,11 @@
+
+ const char* tmpdirname = os::get_temp_directory();
+
++ // open the temp directory
+ DIR* tmpdirp = os::opendir(tmpdirname);
+
+ if (tmpdirp == NULL) {
++ // Cannot open the directory to get the user name, return.
+ return NULL;
+ }
+
+@@ -344,7 +535,8 @@
+ strcat(usrdir_name, "/");
+ strcat(usrdir_name, dentry->d_name);
+
+- DIR* subdirp = os::opendir(usrdir_name);
++ // open the user directory
++ DIR* subdirp = open_directory_secure(usrdir_name);
+
+ if (subdirp == NULL) {
+ FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
+@@ -465,26 +657,6 @@
+ }
+
+
+-// remove file
+-//
+-// this method removes the file with the given file name in the
+-// named directory.
+-//
+-static void remove_file(const char* dirname, const char* filename) {
+-
+- size_t nbytes = strlen(dirname) + strlen(filename) + 2;
+- char* path = NEW_C_HEAP_ARRAY(char, nbytes, mtInternal);
+-
+- strcpy(path, dirname);
+- strcat(path, "/");
+- strcat(path, filename);
+-
+- remove_file(path);
+-
+- FREE_C_HEAP_ARRAY(char, path, mtInternal);
+-}
+-
+-
+ // cleanup stale shared memory resources
+ //
+ // This method attempts to remove all stale shared memory files in
+@@ -496,16 +668,11 @@
+ //
+ static void cleanup_sharedmem_resources(const char* dirname) {
+
+- // open the user temp directory
+- DIR* dirp = os::opendir(dirname);
+-
++ int saved_cwd_fd;
++ // open the directory
++ DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd);
+ if (dirp == NULL) {
+- // directory doesn't exist, so there is nothing to cleanup
+- return;
+- }
+-
+- if (!is_directory_secure(dirname)) {
+- // the directory is not a secure directory
++ // directory doesn't exist or is insecure, so there is nothing to cleanup
+ return;
+ }
+
+@@ -519,6 +686,7 @@
+ //
+ struct dirent* entry;
+ char* dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(dirname), mtInternal);
++
+ errno = 0;
+ while ((entry = os::readdir(dirp, (struct dirent *)dbuf)) != NULL) {
+
+@@ -527,9 +695,8 @@
+ if (pid == 0) {
+
+ if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) {
+-
+ // attempt to remove all unexpected files, except "." and ".."
+- remove_file(dirname, entry->d_name);
++ unlink(entry->d_name);
+ }
+
+ errno = 0;
+@@ -551,12 +718,14 @@
+ //
+ if ((pid == os::current_process_id()) ||
+ (kill(pid, 0) == OS_ERR && (errno == ESRCH || errno == EPERM))) {
+-
+- remove_file(dirname, entry->d_name);
++ unlink(entry->d_name);
+ }
+ errno = 0;
+ }
+- os::closedir(dirp);
++
++ // close the directory and reset the current working directory
++ close_directory_secure_cwd(dirp, saved_cwd_fd);
++
+ FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
+ }
+
+@@ -613,19 +782,54 @@
+ return -1;
+ }
+
++ int saved_cwd_fd;
++ // open the directory and set the current working directory to it
++ DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd);
++ if (dirp == NULL) {
++ // Directory doesn't exist or is insecure, so cannot create shared
++ // memory file.
++ return -1;
++ }
++
++ // Open the filename in the current directory.
++ // Cannot use O_TRUNC here; truncation of an existing file has to happen
++ // after the is_file_secure() check below.
+ int result;
+-
+- RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IREAD|S_IWRITE), result);
++ RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_NOFOLLOW, S_IREAD|S_IWRITE), result);
+ if (result == OS_ERR) {
+ if (PrintMiscellaneous && Verbose) {
+- warning("could not create file %s: %s\n", filename, strerror(errno));
++ if (errno == ELOOP) {
++ warning("file %s is a symlink and is not secure\n", filename);
++ } else {
++ warning("could not create file %s: %s\n", filename, strerror(errno));
++ }
+ }
++ // close the directory and reset the current working directory
++ close_directory_secure_cwd(dirp, saved_cwd_fd);
++
+ return -1;
+ }
++ // close the directory and reset the current working directory
++ close_directory_secure_cwd(dirp, saved_cwd_fd);
+
+ // save the file descriptor
+ int fd = result;
+
++ // check to see if the file is secure
++ if (!is_file_secure(fd, filename)) {
++ ::close(fd);
++ return -1;
++ }
++
++ // truncate the file to get rid of any existing data
++ RESTARTABLE(::ftruncate(fd, (off_t)0), result);
++ if (result == OS_ERR) {
++ if (PrintMiscellaneous && Verbose) {
++ warning("could not truncate shared memory file: %s\n", strerror(errno));
++ }
++ ::close(fd);
++ return -1;
++ }
+ // set the file size
+ RESTARTABLE(::ftruncate(fd, (off_t)size), result);
+ if (result == OS_ERR) {
+@@ -683,8 +887,15 @@
+ THROW_MSG_0(vmSymbols::java_io_IOException(), strerror(errno));
+ }
+ }
++ int fd = result;
+
+- return result;
++ // check to see if the file is secure
++ if (!is_file_secure(fd, filename)) {
++ ::close(fd);
++ return -1;
++ }
++
++ return fd;
+ }
+
+ // create a named shared memory region. returns the address of the
+@@ -715,6 +926,13 @@
+
+ char* dirname = get_user_tmp_dir(user_name);
+ char* filename = get_sharedmem_filename(dirname, vmid);
++ // get the short filename
++ char* short_filename = strrchr(filename, '/');
++ if (short_filename == NULL) {
++ short_filename = filename;
++ } else {
++ short_filename++;
++ }
+
+ // cleanup any stale shared memory files
+ cleanup_sharedmem_resources(dirname);
+@@ -722,7 +940,7 @@
+ assert(((size > 0) && (size % os::vm_page_size() == 0)),
+ "unexpected PerfMemory region size");
+
+- fd = create_sharedmem_resources(dirname, filename, size);
++ fd = create_sharedmem_resources(dirname, short_filename, size);
+
+ FREE_C_HEAP_ARRAY(char, user_name, mtInternal);
+ FREE_C_HEAP_ARRAY(char, dirname, mtInternal);
+@@ -839,12 +1057,12 @@
+ // constructs for the file and the shared memory mapping.
+ if (mode == PerfMemory::PERF_MODE_RO) {
+ mmap_prot = PROT_READ;
+- file_flags = O_RDONLY;
++ file_flags = O_RDONLY | O_NOFOLLOW;
+ }
+ else if (mode == PerfMemory::PERF_MODE_RW) {
+ #ifdef LATER
+ mmap_prot = PROT_READ | PROT_WRITE;
+- file_flags = O_RDWR;
++ file_flags = O_RDWR | O_NOFOLLOW;
+ #else
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Unsupported access mode");
+--- ./hotspot/src/os/solaris/vm/perfMemory_solaris.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os/solaris/vm/perfMemory_solaris.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -199,7 +199,38 @@
+ }
+
+
+-// check if the given path is considered a secure directory for
++// Check if the given statbuf is considered a secure directory for
++// the backing store files. Returns true if the directory is considered
++// a secure location. Returns false if the statbuf is a symbolic link or
++// if an error occurred.
++//
++static bool is_statbuf_secure(struct stat *statp) {
++ if (S_ISLNK(statp->st_mode) || !S_ISDIR(statp->st_mode)) {
++ // The path represents a link or some non-directory file type,
++ // which is not what we expected. Declare it insecure.
++ //
++ return false;
++ }
++ // We have an existing directory, check if the permissions are safe.
++ //
++ if ((statp->st_mode & (S_IWGRP|S_IWOTH)) != 0) {
++ // The directory is open for writing and could be subjected
++ // to a symlink or a hard link attack. Declare it insecure.
++ //
++ return false;
++ }
++ // See if the uid of the directory matches the effective uid of the process.
++ //
++ if (statp->st_uid != geteuid()) {
++ // The directory was not created by this user, declare it insecure.
++ //
++ return false;
++ }
++ return true;
++}
++
++
++// Check if the given path is considered a secure directory for
+ // the backing store files. Returns true if the directory exists
+ // and is considered a secure location. Returns false if the path
+ // is a symbolic link or if an error occurred.
+@@ -213,27 +244,185 @@
+ return false;
+ }
+
+- // the path exists, now check it's mode
+- if (S_ISLNK(statbuf.st_mode) || !S_ISDIR(statbuf.st_mode)) {
+- // the path represents a link or some non-directory file type,
+- // which is not what we expected. declare it insecure.
+- //
++ // The path exists, see if it is secure.
++ return is_statbuf_secure(&statbuf);
++}
++
++
++// Check if the given directory file descriptor is considered a secure
++// directory for the backing store files. Returns true if the directory
++// exists and is considered a secure location. Returns false if the path
++// is a symbolic link or if an error occurred.
++//
++static bool is_dirfd_secure(int dir_fd) {
++ struct stat statbuf;
++ int result = 0;
++
++ RESTARTABLE(::fstat(dir_fd, &statbuf), result);
++ if (result == OS_ERR) {
+ return false;
+ }
+- else {
+- // we have an existing directory, check if the permissions are safe.
+- //
+- if ((statbuf.st_mode & (S_IWGRP|S_IWOTH)) != 0) {
+- // the directory is open for writing and could be subjected
+- // to a symlnk attack. declare it insecure.
+- //
+- return false;
++
++ // The path exists, now check its mode.
++ return is_statbuf_secure(&statbuf);
++}
++
++
++// Check to make sure fd1 and fd2 are referencing the same file system object.
++//
++static bool is_same_fsobject(int fd1, int fd2) {
++ struct stat statbuf1;
++ struct stat statbuf2;
++ int result = 0;
++
++ RESTARTABLE(::fstat(fd1, &statbuf1), result);
++ if (result == OS_ERR) {
++ return false;
++ }
++ RESTARTABLE(::fstat(fd2, &statbuf2), result);
++ if (result == OS_ERR) {
++ return false;
++ }
++
++ if ((statbuf1.st_ino == statbuf2.st_ino) &&
++ (statbuf1.st_dev == statbuf2.st_dev)) {
++ return true;
++ } else {
++ return false;
++ }
++}
++
++
++// Open the directory of the given path and validate it.
++// Return a DIR * of the open directory.
++//
++static DIR *open_directory_secure(const char* dirname) {
++ // Open the directory using open() so that it can be verified
++ // to be secure by calling is_dirfd_secure(), opendir() and then check
++ // to see if they are the same file system object. This method does not
++ // introduce a window of opportunity for the directory to be attacked that
++ // calling opendir() and is_directory_secure() does.
++ int result;
++ DIR *dirp = NULL;
++ RESTARTABLE(::open(dirname, O_RDONLY|O_NOFOLLOW), result);
++ if (result == OS_ERR) {
++ // Directory doesn't exist or is a symlink, so there is nothing to cleanup.
++ if (PrintMiscellaneous && Verbose) {
++ if (errno == ELOOP) {
++ warning("directory %s is a symlink and is not secure\n", dirname);
++ } else {
++ warning("could not open directory %s: %s\n", dirname, strerror(errno));
++ }
+ }
++ return dirp;
++ }
++ int fd = result;
++
++ // Determine if the open directory is secure.
++ if (!is_dirfd_secure(fd)) {
++ // The directory is not a secure directory.
++ os::close(fd);
++ return dirp;
++ }
++
++ // Open the directory.
++ dirp = ::opendir(dirname);
++ if (dirp == NULL) {
++ // The directory doesn't exist, close fd and return.
++ os::close(fd);
++ return dirp;
++ }
++
++ // Check to make sure fd and dirp are referencing the same file system object.
++ if (!is_same_fsobject(fd, dirp->dd_fd)) {
++ // The directory is not secure.
++ os::close(fd);
++ os::closedir(dirp);
++ dirp = NULL;
++ return dirp;
++ }
++
++ // Close initial open now that we know directory is secure
++ os::close(fd);
++
++ return dirp;
++}
++
++// NOTE: The code below uses fchdir(), open() and unlink() because
++// fdopendir(), openat() and unlinkat() are not supported on all
++// versions. Once the support for fdopendir(), openat() and unlinkat()
++// is available on all supported versions the code can be changed
++// to use these functions.
++
++// Open the directory of the given path, validate it and set the
++// current working directory to it.
++// Return a DIR * of the open directory and the saved cwd fd.
++//
++static DIR *open_directory_secure_cwd(const char* dirname, int *saved_cwd_fd) {
++
++ // Open the directory.
++ DIR* dirp = open_directory_secure(dirname);
++ if (dirp == NULL) {
++ // Directory doesn't exist or is insecure, so there is nothing to cleanup.
++ return dirp;
++ }
++ int fd = dirp->dd_fd;
++
++ // Open a fd to the cwd and save it off.
++ int result;
++ RESTARTABLE(::open(".", O_RDONLY), result);
++ if (result == OS_ERR) {
++ *saved_cwd_fd = -1;
++ } else {
++ *saved_cwd_fd = result;
++ }
++
++ // Set the current directory to dirname by using the fd of the directory.
++ result = fchdir(fd);
++
++ return dirp;
++}
++
++// Close the directory and restore the current working directory.
++//
++static void close_directory_secure_cwd(DIR* dirp, int saved_cwd_fd) {
++
++ int result;
++ // If we have a saved cwd change back to it and close the fd.
++ if (saved_cwd_fd != -1) {
++ result = fchdir(saved_cwd_fd);
++ ::close(saved_cwd_fd);
++ }
++
++ // Close the directory.
++ os::closedir(dirp);
++}
++
++// Check if the given file descriptor is considered a secure.
++//
++static bool is_file_secure(int fd, const char *filename) {
++
++ int result;
++ struct stat statbuf;
++
++ // Determine if the file is secure.
++ RESTARTABLE(::fstat(fd, &statbuf), result);
++ if (result == OS_ERR) {
++ if (PrintMiscellaneous && Verbose) {
++ warning("fstat failed on %s: %s\n", filename, strerror(errno));
++ }
++ return false;
++ }
++ if (statbuf.st_nlink > 1) {
++ // A file with multiple links is not expected.
++ if (PrintMiscellaneous && Verbose) {
++ warning("file %s has multiple links\n", filename);
++ }
++ return false;
+ }
+ return true;
+ }
+
+-
+ // return the user name for the given user id
+ //
+ // the caller is expected to free the allocated memory.
+@@ -308,9 +497,11 @@
+
+ const char* tmpdirname = os::get_temp_directory();
+
++ // open the temp directory
+ DIR* tmpdirp = os::opendir(tmpdirname);
+
+ if (tmpdirp == NULL) {
++ // Cannot open the directory to get the user name, return.
+ return NULL;
+ }
+
+@@ -335,7 +526,8 @@
+ strcat(usrdir_name, "/");
+ strcat(usrdir_name, dentry->d_name);
+
+- DIR* subdirp = os::opendir(usrdir_name);
++ // open the user directory
++ DIR* subdirp = open_directory_secure(usrdir_name);
+
+ if (subdirp == NULL) {
+ FREE_C_HEAP_ARRAY(char, usrdir_name, mtInternal);
+@@ -502,26 +694,6 @@
+ }
+
+
+-// remove file
+-//
+-// this method removes the file with the given file name in the
+-// named directory.
+-//
+-static void remove_file(const char* dirname, const char* filename) {
+-
+- size_t nbytes = strlen(dirname) + strlen(filename) + 2;
+- char* path = NEW_C_HEAP_ARRAY(char, nbytes, mtInternal);
+-
+- strcpy(path, dirname);
+- strcat(path, "/");
+- strcat(path, filename);
+-
+- remove_file(path);
+-
+- FREE_C_HEAP_ARRAY(char, path, mtInternal);
+-}
+-
+-
+ // cleanup stale shared memory resources
+ //
+ // This method attempts to remove all stale shared memory files in
+@@ -533,16 +705,11 @@
+ //
+ static void cleanup_sharedmem_resources(const char* dirname) {
+
+- // open the user temp directory
+- DIR* dirp = os::opendir(dirname);
+-
++ int saved_cwd_fd;
++ // open the directory
++ DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd);
+ if (dirp == NULL) {
+- // directory doesn't exist, so there is nothing to cleanup
+- return;
+- }
+-
+- if (!is_directory_secure(dirname)) {
+- // the directory is not a secure directory
++ // directory doesn't exist or is insecure, so there is nothing to cleanup
+ return;
+ }
+
+@@ -556,6 +723,7 @@
+ //
+ struct dirent* entry;
+ char* dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(dirname), mtInternal);
++
+ errno = 0;
+ while ((entry = os::readdir(dirp, (struct dirent *)dbuf)) != NULL) {
+
+@@ -566,7 +734,7 @@
+ if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) {
+
+ // attempt to remove all unexpected files, except "." and ".."
+- remove_file(dirname, entry->d_name);
++ unlink(entry->d_name);
+ }
+
+ errno = 0;
+@@ -589,11 +757,14 @@
+ if ((pid == os::current_process_id()) ||
+ (kill(pid, 0) == OS_ERR && (errno == ESRCH || errno == EPERM))) {
+
+- remove_file(dirname, entry->d_name);
++ unlink(entry->d_name);
+ }
+ errno = 0;
+ }
+- os::closedir(dirp);
++
++ // close the directory and reset the current working directory
++ close_directory_secure_cwd(dirp, saved_cwd_fd);
++
+ FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
+ }
+
+@@ -650,19 +821,54 @@
+ return -1;
+ }
+
++ int saved_cwd_fd;
++ // open the directory and set the current working directory to it
++ DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd);
++ if (dirp == NULL) {
++ // Directory doesn't exist or is insecure, so cannot create shared
++ // memory file.
++ return -1;
++ }
++
++ // Open the filename in the current directory.
++ // Cannot use O_TRUNC here; truncation of an existing file has to happen
++ // after the is_file_secure() check below.
+ int result;
+-
+- RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IREAD|S_IWRITE), result);
++ RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_NOFOLLOW, S_IREAD|S_IWRITE), result);
+ if (result == OS_ERR) {
+ if (PrintMiscellaneous && Verbose) {
+- warning("could not create file %s: %s\n", filename, strerror(errno));
++ if (errno == ELOOP) {
++ warning("file %s is a symlink and is not secure\n", filename);
++ } else {
++ warning("could not create file %s: %s\n", filename, strerror(errno));
++ }
+ }
++ // close the directory and reset the current working directory
++ close_directory_secure_cwd(dirp, saved_cwd_fd);
++
+ return -1;
+ }
++ // close the directory and reset the current working directory
++ close_directory_secure_cwd(dirp, saved_cwd_fd);
+
+ // save the file descriptor
+ int fd = result;
+
++ // check to see if the file is secure
++ if (!is_file_secure(fd, filename)) {
++ ::close(fd);
++ return -1;
++ }
++
++ // truncate the file to get rid of any existing data
++ RESTARTABLE(::ftruncate(fd, (off_t)0), result);
++ if (result == OS_ERR) {
++ if (PrintMiscellaneous && Verbose) {
++ warning("could not truncate shared memory file: %s\n", strerror(errno));
++ }
++ ::close(fd);
++ return -1;
++ }
+ // set the file size
+ RESTARTABLE(::ftruncate(fd, (off_t)size), result);
+ if (result == OS_ERR) {
+@@ -698,8 +904,15 @@
+ THROW_MSG_0(vmSymbols::java_io_IOException(), strerror(errno));
+ }
+ }
++ int fd = result;
+
+- return result;
++ // check to see if the file is secure
++ if (!is_file_secure(fd, filename)) {
++ ::close(fd);
++ return -1;
++ }
++
++ return fd;
+ }
+
+ // create a named shared memory region. returns the address of the
+@@ -731,13 +944,21 @@
+ char* dirname = get_user_tmp_dir(user_name);
+ char* filename = get_sharedmem_filename(dirname, vmid);
+
++ // get the short filename
++ char* short_filename = strrchr(filename, '/');
++ if (short_filename == NULL) {
++ short_filename = filename;
++ } else {
++ short_filename++;
++ }
++
+ // cleanup any stale shared memory files
+ cleanup_sharedmem_resources(dirname);
+
+ assert(((size > 0) && (size % os::vm_page_size() == 0)),
+ "unexpected PerfMemory region size");
+
+- fd = create_sharedmem_resources(dirname, filename, size);
++ fd = create_sharedmem_resources(dirname, short_filename, size);
+
+ FREE_C_HEAP_ARRAY(char, user_name, mtInternal);
+ FREE_C_HEAP_ARRAY(char, dirname, mtInternal);
+@@ -854,12 +1075,12 @@
+ // constructs for the file and the shared memory mapping.
+ if (mode == PerfMemory::PERF_MODE_RO) {
+ mmap_prot = PROT_READ;
+- file_flags = O_RDONLY;
++ file_flags = O_RDONLY | O_NOFOLLOW;
+ }
+ else if (mode == PerfMemory::PERF_MODE_RW) {
+ #ifdef LATER
+ mmap_prot = PROT_READ | PROT_WRITE;
+- file_flags = O_RDWR;
++ file_flags = O_RDWR | O_NOFOLLOW;
+ #else
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Unsupported access mode");
+--- ./hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -28,7 +28,7 @@
+ #include "runtime/os.hpp"
+ #include "runtime/threadLocalStorage.hpp"
+
+-#include <asm-sparc/traps.h>
++#include <asm/traps.h>
+
+ void MacroAssembler::read_ccr_trap(Register ccr_save) {
+ // No implementation
+--- ./hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -79,12 +79,12 @@
+ __asm__ volatile(
+ "1: \n\t"
+ " ldx [%2], %%o2\n\t"
+- " add %0, %%o2, %%o3\n\t"
++ " add %1, %%o2, %%o3\n\t"
+ " casx [%2], %%o2, %%o3\n\t"
+ " cmp %%o2, %%o3\n\t"
+ " bne %%xcc, 1b\n\t"
+ " nop\n\t"
+- " add %0, %%o2, %0\n\t"
++ " add %1, %%o2, %0\n\t"
+ : "=r" (rv)
+ : "r" (add_value), "r" (dest)
+ : "memory", "o2", "o3");
+--- ./hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -118,7 +118,7 @@
+ *ret_sp = os::Linux::ucontext_get_sp(uc);
+ }
+ if (ret_fp) {
+- *ret_fp = os::Linux::ucontext_get_fp(uc);
++ *ret_fp = (intptr_t*)NULL;
+ }
+ } else {
+ // construct empty ExtendedPC for return value checking
+@@ -136,18 +136,15 @@
+
+ frame os::fetch_frame_from_context(void* ucVoid) {
+ intptr_t* sp;
+- intptr_t* fp;
+- ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
+- return frame(sp, fp, epc.pc());
++ ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, NULL);
++ return frame(sp, frame::unpatchable, epc.pc());
+ }
+
+ frame os::get_sender_for_C_frame(frame* fr) {
+- return frame(fr->sender_sp(), fr->link(), fr->sender_pc());
++ return frame(fr->sender_sp(), frame::unpatchable, fr->sender_pc());
+ }
+
+ frame os::current_frame() {
+- fprintf(stderr, "current_frame()");
+-
+ intptr_t* sp = StubRoutines::Sparc::flush_callers_register_windows_func()();
+ frame myframe(sp, frame::unpatchable,
+ CAST_FROM_FN_PTR(address, os::current_frame));
+@@ -302,29 +299,30 @@
+ if (context == NULL) return;
+
+ ucontext_t *uc = (ucontext_t*)context;
++ sigcontext* sc = (sigcontext*)context;
+ intptr_t *sp = (intptr_t *)os::Linux::ucontext_get_sp(uc);
+
+ st->print_cr("Register to memory mapping:");
+ st->cr();
+
+ // this is only for the "general purpose" registers
+- st->print("G1="); print_location(st, SIG_REGS(sc).u_regs[CON__G1]);
+- st->print("G2="); print_location(st, SIG_REGS(sc).u_regs[CON__G2]);
+- st->print("G3="); print_location(st, SIG_REGS(sc).u_regs[CON__G3]);
+- st->print("G4="); print_location(st, SIG_REGS(sc).u_regs[CON__G4]);
+- st->print("G5="); print_location(st, SIG_REGS(sc).u_regs[CON__G5]);
+- st->print("G6="); print_location(st, SIG_REGS(sc).u_regs[CON__G6]);
+- st->print("G7="); print_location(st, SIG_REGS(sc).u_regs[CON__G7]);
++ st->print("G1="); print_location(st, SIG_REGS(sc).u_regs[CON_G1]);
++ st->print("G2="); print_location(st, SIG_REGS(sc).u_regs[CON_G2]);
++ st->print("G3="); print_location(st, SIG_REGS(sc).u_regs[CON_G3]);
++ st->print("G4="); print_location(st, SIG_REGS(sc).u_regs[CON_G4]);
++ st->print("G5="); print_location(st, SIG_REGS(sc).u_regs[CON_G5]);
++ st->print("G6="); print_location(st, SIG_REGS(sc).u_regs[CON_G6]);
++ st->print("G7="); print_location(st, SIG_REGS(sc).u_regs[CON_G7]);
+ st->cr();
+
+- st->print("O0="); print_location(st, SIG_REGS(sc).u_regs[CON__O0]);
+- st->print("O1="); print_location(st, SIG_REGS(sc).u_regs[CON__O1]);
+- st->print("O2="); print_location(st, SIG_REGS(sc).u_regs[CON__O2]);
+- st->print("O3="); print_location(st, SIG_REGS(sc).u_regs[CON__O3]);
+- st->print("O4="); print_location(st, SIG_REGS(sc).u_regs[CON__O4]);
+- st->print("O5="); print_location(st, SIG_REGS(sc).u_regs[CON__O5]);
+- st->print("O6="); print_location(st, SIG_REGS(sc).u_regs[CON__O6]);
+- st->print("O7="); print_location(st, SIG_REGS(sc).u_regs[CON__O7]);
++ st->print("O0="); print_location(st, SIG_REGS(sc).u_regs[CON_O0]);
++ st->print("O1="); print_location(st, SIG_REGS(sc).u_regs[CON_O1]);
++ st->print("O2="); print_location(st, SIG_REGS(sc).u_regs[CON_O2]);
++ st->print("O3="); print_location(st, SIG_REGS(sc).u_regs[CON_O3]);
++ st->print("O4="); print_location(st, SIG_REGS(sc).u_regs[CON_O4]);
++ st->print("O5="); print_location(st, SIG_REGS(sc).u_regs[CON_O5]);
++ st->print("O6="); print_location(st, SIG_REGS(sc).u_regs[CON_O6]);
++ st->print("O7="); print_location(st, SIG_REGS(sc).u_regs[CON_O7]);
+ st->cr();
+
+ st->print("L0="); print_location(st, sp[L0->sp_offset_in_saved_window()]);
+@@ -525,7 +523,7 @@
+ if (nativeInstruction_at(*pc)->is_ic_miss_trap()) {
+ #ifdef ASSERT
+ #ifdef TIERED
+- CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
++ CodeBlob* cb = CodeCache::find_blob_unsafe(*pc);
+ assert(cb->is_compiled_by_c2(), "Wrong compiler");
+ #endif // TIERED
+ #endif // ASSERT
+--- ./hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -55,7 +55,7 @@
+
+ if (detect_niagara()) {
+ NOT_PRODUCT(if (PrintMiscellaneous && Verbose) tty->print_cr("Detected Linux on Niagara");)
+- features = niagara1_m;
++ features = niagara1_m | T_family_m;
+ }
+
+ return features;
+--- ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2011, 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
+@@ -899,7 +899,7 @@
+ */
+ char* hint = (char*) (Linux::initial_thread_stack_bottom() -
+ ((StackYellowPages + StackRedPages + 1) * page_size));
+- char* codebuf = os::reserve_memory(page_size, hint);
++ char* codebuf = os::pd_attempt_reserve_memory_at(page_size, hint);
+ if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
+ return; // No matter, we tried, best effort.
+ }
+--- ./hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -75,13 +75,19 @@
+ do_sysinfo(SI_ARCHITECTURE_64, "sparcv9", &features, generic_v9_m);
+
+ // Extract valid instruction set extensions.
+- uint_t av;
+- uint_t avn = os::Solaris::getisax(&av, 1);
+- assert(avn == 1, "should only return one av");
++ uint_t avs[2];
++ uint_t avn = os::Solaris::getisax(avs, 2);
++ assert(avn <= 2, "should return two or less av's");
++ uint_t av = avs[0];
+
+ #ifndef PRODUCT
+- if (PrintMiscellaneous && Verbose)
+- tty->print_cr("getisax(2) returned: " PTR32_FORMAT, av);
++ if (PrintMiscellaneous && Verbose) {
++ tty->print("getisax(2) returned: " PTR32_FORMAT, av);
++ if (avn > 1) {
++ tty->print(", " PTR32_FORMAT, avs[1]);
++ }
++ tty->cr();
++ }
+ #endif
+
+ if (av & AV_SPARC_MUL32) features |= hardware_mul32_m;
+@@ -91,6 +97,13 @@
+ if (av & AV_SPARC_POPC) features |= hardware_popc_m;
+ if (av & AV_SPARC_VIS) features |= vis1_instructions_m;
+ if (av & AV_SPARC_VIS2) features |= vis2_instructions_m;
++ if (avn > 1) {
++ uint_t av2 = avs[1];
++#ifndef AV2_SPARC_SPARC5
++#define AV2_SPARC_SPARC5 0x00000008 /* The 29 new fp and sub instructions */
++#endif
++ if (av2 & AV2_SPARC_SPARC5) features |= sparc5_instructions_m;
++ }
+
+ // Next values are not defined before Solaris 10
+ // but Solaris 8 is used for jdk6 update builds.
+--- ./hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -89,8 +89,8 @@
+ public:
+ ArgumentMap *_vars;
+ ArgumentMap *_stack;
+- short _stack_height;
+- short _max_stack;
++ int _stack_height;
++ int _max_stack;
+ bool _initialized;
+ ArgumentMap empty_map;
+
+@@ -158,6 +158,9 @@
+
+ void BCEscapeAnalyzer::set_method_escape(ArgumentMap vars) {
+ clear_bits(vars, _arg_local);
++ if (vars.contains_allocated()) {
++ _allocated_escapes = true;
++ }
+ }
+
+ void BCEscapeAnalyzer::set_global_escape(ArgumentMap vars, bool merge) {
+--- ./hotspot/src/share/vm/classfile/classFileParser.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/classFileParser.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -2676,7 +2676,7 @@
+ ClassFileStream* cfs = stream();
+ u1* current_start = cfs->current();
+
+- guarantee_property(attribute_byte_length > sizeof(u2),
++ guarantee_property(attribute_byte_length >= sizeof(u2),
+ "Invalid BootstrapMethods attribute length %u in class file %s",
+ attribute_byte_length,
+ CHECK);
+--- ./hotspot/src/share/vm/classfile/stackMapFrame.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/stackMapFrame.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -54,15 +54,19 @@
+ return frame;
+ }
+
+-bool StackMapFrame::has_new_object() const {
++// Return true if frame has an uninitialized (new) object that differs
++// from the target frame's object.
++bool StackMapFrame::has_nonmatching_new_object(const StackMapFrame *target_frame) const {
+ int32_t i;
+ for (i = 0; i < _max_locals; i++) {
+- if (_locals[i].is_uninitialized()) {
++ if (_locals[i].is_uninitialized() &&
++ !_locals[i].equals(target_frame->_locals[i])) {
+ return true;
+ }
+ }
+ for (i = 0; i < _stack_size; i++) {
+- if (_stack[i].is_uninitialized()) {
++ if (_stack[i].is_uninitialized() &&
++ !_stack[i].equals(target_frame->_stack[i])) {
+ return true;
+ }
+ }
+--- ./hotspot/src/share/vm/classfile/stackMapFrame.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/stackMapFrame.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -155,8 +155,9 @@
+ const methodHandle m, VerificationType thisKlass, TRAPS);
+
+ // Search local variable type array and stack type array.
+- // Return true if an uninitialized object is found.
+- bool has_new_object() const;
++ // Return true if an uninitialized object is found that is
++ // not equal to the corresponding object on the target frame.
++ bool has_nonmatching_new_object(const StackMapFrame *target_frame) const;
+
+ // Search local variable type array and stack type array.
+ // Set every element with type of old_object to new_object.
+--- ./hotspot/src/share/vm/classfile/stackMapTable.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/stackMapTable.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -70,24 +70,26 @@
+
+ bool StackMapTable::match_stackmap(
+ StackMapFrame* frame, int32_t target,
+- bool match, bool update, ErrorContext* ctx, TRAPS) const {
++ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const {
+ int index = get_index_from_offset(target);
+- return match_stackmap(frame, target, index, match, update, ctx, THREAD);
++ return match_stackmap(frame, target, index, match, update, handler, ctx, THREAD);
+ }
+
+ // Match and/or update current_frame to the frame in stackmap table with
+ // specified offset and frame index. Return true if the two frames match.
++// handler is true if the frame in stackmap_table is for an exception handler.
+ //
+-// The values of match and update are: _match__update_
++// The values of match and update are: _match__update__handler
+ //
+-// checking a branch target/exception handler: true false
++// checking a branch target: true false false
++// checking an exception handler: true false true
+ // linear bytecode verification following an
+-// unconditional branch: false true
++// unconditional branch: false true false
+ // linear bytecode verification not following an
+-// unconditional branch: true true
++// unconditional branch: true true false
+ bool StackMapTable::match_stackmap(
+ StackMapFrame* frame, int32_t target, int32_t frame_index,
+- bool match, bool update, ErrorContext* ctx, TRAPS) const {
++ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const {
+ if (frame_index < 0 || frame_index >= _frame_count) {
+ *ctx = ErrorContext::missing_stackmap(frame->offset());
+ frame->verifier()->verify_error(
+@@ -98,11 +100,9 @@
+ StackMapFrame *stackmap_frame = _frame_array[frame_index];
+ bool result = true;
+ if (match) {
+- // when checking handler target, match == true && update == false
+- bool is_exception_handler = !update;
+ // Has direct control flow from last instruction, need to match the two
+ // frames.
+- result = frame->is_assignable_to(stackmap_frame, is_exception_handler,
++ result = frame->is_assignable_to(stackmap_frame, handler,
+ ctx, CHECK_VERIFY_(frame->verifier(), result));
+ }
+ if (update) {
+@@ -126,7 +126,7 @@
+ StackMapFrame* frame, int32_t target, TRAPS) const {
+ ErrorContext ctx;
+ bool match = match_stackmap(
+- frame, target, true, false, &ctx, CHECK_VERIFY(frame->verifier()));
++ frame, target, true, false, false, &ctx, CHECK_VERIFY(frame->verifier()));
+ if (!match || (target < 0 || target >= _code_length)) {
+ frame->verifier()->verify_error(ctx,
+ "Inconsistent stackmap frames at branch target %d", target);
+@@ -134,12 +134,14 @@
+ }
+ // check if uninitialized objects exist on backward branches
+ check_new_object(frame, target, CHECK_VERIFY(frame->verifier()));
+- frame->verifier()->update_furthest_jump(target);
+ }
+
+ void StackMapTable::check_new_object(
+ const StackMapFrame* frame, int32_t target, TRAPS) const {
+- if (frame->offset() > target && frame->has_new_object()) {
++ int frame_index = get_index_from_offset(target);
++ assert(frame_index >= 0 && frame_index < _frame_count, "bad frame index");
++ if (frame->offset() > target &&
++ frame->has_nonmatching_new_object(_frame_array[frame_index])) {
+ frame->verifier()->verify_error(
+ ErrorContext::bad_code(frame->offset()),
+ "Uninitialized object exists on backward branch %d", target);
+--- ./hotspot/src/share/vm/classfile/stackMapTable.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/stackMapTable.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2012, 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
+@@ -74,12 +74,12 @@
+ // specified offset. Return true if the two frames match.
+ bool match_stackmap(
+ StackMapFrame* current_frame, int32_t offset,
+- bool match, bool update, ErrorContext* ctx, TRAPS) const;
++ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
+ // Match and/or update current_frame to the frame in stackmap table with
+ // specified offset and frame index. Return true if the two frames match.
+ bool match_stackmap(
+ StackMapFrame* current_frame, int32_t offset, int32_t frame_index,
+- bool match, bool update, ErrorContext* ctx, TRAPS) const;
++ bool match, bool update, bool handler, ErrorContext* ctx, TRAPS) const;
+
+ // Check jump instructions. Make sure there are no uninitialized
+ // instances on backward branch.
+--- ./hotspot/src/share/vm/classfile/systemDictionary.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/systemDictionary.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1872,11 +1872,12 @@
+ instanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER);
+ instanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass));
+
+- initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK);
++ initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Cleaner_klass), scan, CHECK);
+ instanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT);
+ instanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK);
+ instanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL);
+ instanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM);
++ instanceKlass::cast(WK_KLASS(Cleaner_klass))->set_reference_type(REF_CLEANER);
+
+ // JSR 292 classes
+ WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);
+--- ./hotspot/src/share/vm/classfile/systemDictionary.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/systemDictionary.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -126,6 +126,7 @@
+ do_klass(WeakReference_klass, java_lang_ref_WeakReference, Pre ) \
+ do_klass(FinalReference_klass, java_lang_ref_FinalReference, Pre ) \
+ do_klass(PhantomReference_klass, java_lang_ref_PhantomReference, Pre ) \
++ do_klass(Cleaner_klass, sun_misc_Cleaner, Pre ) \
+ do_klass(Finalizer_klass, java_lang_ref_Finalizer, Pre ) \
+ \
+ do_klass(Thread_klass, java_lang_Thread, Pre ) \
+--- ./hotspot/src/share/vm/classfile/verifier.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/verifier.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -630,8 +630,6 @@
+ // flow from current instruction to the next
+ // instruction in sequence
+
+- set_furthest_jump(0);
+-
+ Bytecodes::Code opcode;
+ while (!bcs.is_last_bytecode()) {
+ // Check for recursive re-verification before each bytecode.
+@@ -1551,14 +1549,14 @@
+ case Bytecodes::_invokespecial :
+ case Bytecodes::_invokestatic :
+ verify_invoke_instructions(
+- &bcs, code_length, &current_frame,
+- &this_uninit, return_type, cp, CHECK_VERIFY(this));
++ &bcs, code_length, &current_frame, (bci >= ex_min && bci < ex_max),
++ &this_uninit, return_type, cp, &stackmap_table, CHECK_VERIFY(this));
+ no_control_flow = false; break;
+ case Bytecodes::_invokeinterface :
+ case Bytecodes::_invokedynamic :
+ verify_invoke_instructions(
+- &bcs, code_length, &current_frame,
+- &this_uninit, return_type, cp, CHECK_VERIFY(this));
++ &bcs, code_length, &current_frame, (bci >= ex_min && bci < ex_max),
++ &this_uninit, return_type, cp, &stackmap_table, CHECK_VERIFY(this));
+ no_control_flow = false; break;
+ case Bytecodes::_new :
+ {
+@@ -1788,7 +1786,7 @@
+ // If matched, current_frame will be updated by this method.
+ bool matches = stackmap_table->match_stackmap(
+ current_frame, this_offset, stackmap_index,
+- !no_control_flow, true, &ctx, CHECK_VERIFY_(this, 0));
++ !no_control_flow, true, false, &ctx, CHECK_VERIFY_(this, 0));
+ if (!matches) {
+ // report type error
+ verify_error(ctx, "Instruction type does not match stack map");
+@@ -1835,7 +1833,7 @@
+ }
+ ErrorContext ctx;
+ bool matches = stackmap_table->match_stackmap(
+- new_frame, handler_pc, true, false, &ctx, CHECK_VERIFY(this));
++ new_frame, handler_pc, true, false, true, &ctx, CHECK_VERIFY(this));
+ if (!matches) {
+ verify_error(ctx, "Stack map does not match the one at "
+ "exception handler %d", handler_pc);
+@@ -2401,8 +2399,9 @@
+
+ void ClassVerifier::verify_invoke_init(
+ RawBytecodeStream* bcs, u2 ref_class_index, VerificationType ref_class_type,
+- StackMapFrame* current_frame, u4 code_length, bool *this_uninit,
+- constantPoolHandle cp, TRAPS) {
++ StackMapFrame* current_frame, u4 code_length, bool in_try_block,
++ bool *this_uninit, constantPoolHandle cp, StackMapTable* stackmap_table,
++ TRAPS) {
+ u2 bci = bcs->bci();
+ VerificationType type = current_frame->pop_stack(
+ VerificationType::reference_check(), CHECK_VERIFY(this));
+@@ -2418,35 +2417,38 @@
+ return;
+ }
+
+- // Make sure that this call is not jumped over.
+- if (bci < furthest_jump()) {
+- verify_error(ErrorContext::bad_code(bci),
+- "Bad <init> method call from inside of a branch");
+- return;
+- }
++ // If this invokespecial call is done from inside of a TRY block then make
++ // sure that all catch clause paths end in a throw. Otherwise, this can
++ // result in returning an incomplete object.
++ if (in_try_block) {
++ ExceptionTable exhandlers(_method());
++ int exlength = exhandlers.length();
++ for(int i = 0; i < exlength; i++) {
++ // Reacquire the table in case a GC happened
++ ExceptionTable exhandlers(_method());
++ u2 start_pc = exhandlers.start_pc(i);
++ u2 end_pc = exhandlers.end_pc(i);
+
+- // Check if this call is done from inside of a TRY block. If so, make
+- // sure that all catch clause paths end in a throw. Otherwise, this
+- // can result in returning an incomplete object.
+- ExceptionTable exhandlers(_method());
+- int exlength = exhandlers.length();
+- for(int i = 0; i < exlength; i++) {
+- u2 start_pc = exhandlers.start_pc(i);
+- u2 end_pc = exhandlers.end_pc(i);
+-
+- if (bci >= start_pc && bci < end_pc) {
+- if (!ends_in_athrow(exhandlers.handler_pc(i))) {
+- verify_error(ErrorContext::bad_code(bci),
+- "Bad <init> method call from after the start of a try block");
+- return;
+- } else if (VerboseVerification) {
+- ResourceMark rm;
+- tty->print_cr(
+- "Survived call to ends_in_athrow(): %s",
+- current_class()->name()->as_C_string());
++ if (bci >= start_pc && bci < end_pc) {
++ if (!ends_in_athrow(exhandlers.handler_pc(i))) {
++ verify_error(ErrorContext::bad_code(bci),
++ "Bad <init> method call from after the start of a try block");
++ return;
++ } else if (VerboseVerification) {
++ ResourceMark rm;
++ tty->print_cr(
++ "Survived call to ends_in_athrow(): %s",
++ current_class()->name()->as_C_string());
++ }
+ }
+ }
+- }
++
++ // Check the exception handler target stackmaps with the locals from the
++ // incoming stackmap (before initialize_object() changes them to outgoing
++ // state).
++ verify_exception_handler_targets(bci, true, current_frame,
++ stackmap_table, CHECK_VERIFY(this));
++ } // in_try_block
+
+ current_frame->initialize_object(type, current_type());
+ *this_uninit = true;
+@@ -2502,6 +2504,13 @@
+ }
+ }
+ }
++ // Check the exception handler target stackmaps with the locals from the
++ // incoming stackmap (before initialize_object() changes them to outgoing
++ // state).
++ if (in_try_block) {
++ verify_exception_handler_targets(bci, *this_uninit, current_frame,
++ stackmap_table, CHECK_VERIFY(this));
++ }
+ current_frame->initialize_object(type, new_class_type);
+ } else {
+ verify_error(ErrorContext::bad_type(bci, current_frame->stack_top_ctx()),
+@@ -2512,8 +2521,8 @@
+
+ void ClassVerifier::verify_invoke_instructions(
+ RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame,
+- bool *this_uninit, VerificationType return_type,
+- constantPoolHandle cp, TRAPS) {
++ bool in_try_block, bool *this_uninit, VerificationType return_type,
++ constantPoolHandle cp, StackMapTable* stackmap_table, TRAPS) {
+ // Make sure the constant pool item is the right type
+ u2 index = bcs->get_index_u2();
+ Bytecodes::Code opcode = bcs->raw_code();
+@@ -2649,7 +2658,8 @@
+ opcode != Bytecodes::_invokedynamic) {
+ if (method_name == vmSymbols::object_initializer_name()) { // <init> method
+ verify_invoke_init(bcs, index, ref_class_type, current_frame,
+- code_length, this_uninit, cp, CHECK_VERIFY(this));
++ code_length, in_try_block, this_uninit, cp, stackmap_table,
++ CHECK_VERIFY(this));
+ } else { // other methods
+ // Ensures that target class is assignable to method class.
+ if (opcode == Bytecodes::_invokespecial) {
+--- ./hotspot/src/share/vm/classfile/verifier.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/verifier.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -257,9 +257,6 @@
+
+ ErrorContext _error_context; // contains information about an error
+
+- // Used to detect illegal jumps over calls to super() and this() in ctors.
+- int32_t _furthest_jump;
+-
+ void verify_method(methodHandle method, TRAPS);
+ char* generate_code_data(methodHandle m, u4 code_length, TRAPS);
+ void verify_exception_handler_table(u4 code_length, char* code_data,
+@@ -302,8 +299,9 @@
+
+ void verify_invoke_init(
+ RawBytecodeStream* bcs, u2 ref_index, VerificationType ref_class_type,
+- StackMapFrame* current_frame, u4 code_length, bool* this_uninit,
+- constantPoolHandle cp, TRAPS);
++ StackMapFrame* current_frame, u4 code_length, bool in_try_block,
++ bool* this_uninit, constantPoolHandle cp, StackMapTable* stackmap_table,
++ TRAPS);
+
+ // Used by ends_in_athrow() to push all handlers that contain bci onto
+ // the handler_stack, if the handler is not already on the stack.
+@@ -317,8 +315,8 @@
+
+ void verify_invoke_instructions(
+ RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame,
+- bool* this_uninit, VerificationType return_type,
+- constantPoolHandle cp, TRAPS);
++ bool in_try_block, bool* this_uninit, VerificationType return_type,
++ constantPoolHandle cp, StackMapTable* stackmap_table, TRAPS);
+
+ VerificationType get_newarray_type(u2 index, u2 bci, TRAPS);
+ void verify_anewarray(u2 bci, u2 index, constantPoolHandle cp,
+@@ -413,19 +411,6 @@
+
+ TypeOrigin ref_ctx(const char* str, TRAPS);
+
+- // Keep track of the furthest branch done in a method to make sure that
+- // there are no branches over calls to super() or this() from inside of
+- // a constructor.
+- int32_t furthest_jump() { return _furthest_jump; }
+-
+- void set_furthest_jump(int32_t target) {
+- _furthest_jump = target;
+- }
+-
+- void update_furthest_jump(int32_t target) {
+- if (target > _furthest_jump) _furthest_jump = target;
+- }
+-
+ };
+
+ inline int ClassVerifier::change_sig_to_verificationType(
+--- ./hotspot/src/share/vm/classfile/vmSymbols.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/classfile/vmSymbols.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -81,6 +81,7 @@
+ template(java_lang_ref_WeakReference, "java/lang/ref/WeakReference") \
+ template(java_lang_ref_FinalReference, "java/lang/ref/FinalReference") \
+ template(java_lang_ref_PhantomReference, "java/lang/ref/PhantomReference") \
++ template(sun_misc_Cleaner, "sun/misc/Cleaner") \
+ template(java_lang_ref_Finalizer, "java/lang/ref/Finalizer") \
+ template(java_lang_reflect_AccessibleObject, "java/lang/reflect/AccessibleObject") \
+ template(java_lang_reflect_Method, "java/lang/reflect/Method") \
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -2752,10 +2752,12 @@
+ }
+ }
+
+-void CompactibleFreeListSpace:: par_get_chunk_of_blocks(size_t word_sz, size_t n, FreeList<FreeChunk>* fl) {
+- assert(fl->count() == 0, "Precondition.");
+- assert(word_sz < CompactibleFreeListSpace::IndexSetSize,
+- "Precondition");
++// Used by par_get_chunk_of_blocks() for the chunks from the
++// indexed_free_lists. Looks for a chunk with size that is a multiple
++// of "word_sz" and if found, splits it into "word_sz" chunks and add
++// to the free list "fl". "n" is the maximum number of chunks to
++// be added to "fl".
++bool CompactibleFreeListSpace:: par_get_chunk_of_blocks_IFL(size_t word_sz, size_t n, FreeList<FreeChunk>* fl) {
+
+ // We'll try all multiples of word_sz in the indexed set, starting with
+ // word_sz itself and, if CMSSplitIndexedFreeListBlocks, try larger multiples,
+@@ -2836,11 +2838,15 @@
+ Mutex::_no_safepoint_check_flag);
+ ssize_t births = _indexedFreeList[word_sz].split_births() + num;
+ _indexedFreeList[word_sz].set_split_births(births);
+- return;
++ return true;
+ }
+ }
++ return found;
+ }
+- // Otherwise, we'll split a block from the dictionary.
++}
++
++FreeChunk* CompactibleFreeListSpace::get_n_way_chunk_to_split(size_t word_sz, size_t n) {
++
+ FreeChunk* fc = NULL;
+ FreeChunk* rem_fc = NULL;
+ size_t rem;
+@@ -2852,16 +2858,12 @@
+ _dictionary->min_size()),
+ FreeBlockDictionary<FreeChunk>::atLeast);
+ if (fc != NULL) {
+- _bt.allocated((HeapWord*)fc, fc->size(), true /* reducing */); // update _unallocated_blk
+- dictionary()->dict_census_udpate(fc->size(),
+- true /*split*/,
+- false /*birth*/);
+ break;
+ } else {
+ n--;
+ }
+ }
+- if (fc == NULL) return;
++ if (fc == NULL) return NULL;
+ // Otherwise, split up that block.
+ assert((ssize_t)n >= 1, "Control point invariant");
+ assert(fc->is_free(), "Error: should be a free block");
+@@ -2883,10 +2885,14 @@
+ // dictionary and return, leaving "fl" empty.
+ if (n == 0) {
+ returnChunkToDictionary(fc);
+- assert(fl->count() == 0, "We never allocated any blocks");
+- return;
++ return NULL;
+ }
+
++ _bt.allocated((HeapWord*)fc, fc->size(), true /* reducing */); // update _unallocated_blk
++ dictionary()->dict_census_udpate(fc->size(),
++ true /*split*/,
++ false /*birth*/);
++
+ // First return the remainder, if any.
+ // Note that we hold the lock until we decide if we're going to give
+ // back the remainder to the dictionary, since a concurrent allocation
+@@ -2919,7 +2925,24 @@
+ _indexedFreeList[rem].return_chunk_at_head(rem_fc);
+ smallSplitBirth(rem);
+ }
+- assert((ssize_t)n > 0 && fc != NULL, "Consistency");
++ assert(n * word_sz == fc->size(),
++ err_msg("Chunk size " SIZE_FORMAT " is not exactly splittable by "
++ SIZE_FORMAT " sized chunks of size " SIZE_FORMAT,
++ fc->size(), n, word_sz));
++ return fc;
++}
++
++void CompactibleFreeListSpace:: par_get_chunk_of_blocks_dictionary(size_t word_sz, size_t targetted_number_of_chunks, FreeList<FreeChunk>* fl) {
++
++ FreeChunk* fc = get_n_way_chunk_to_split(word_sz, targetted_number_of_chunks);
++
++ if (fc == NULL) {
++ return;
++ }
++
++ size_t n = fc->size() / word_sz;
++
++ assert((ssize_t)n > 0, "Consistency");
+ // Now do the splitting up.
+ // Must do this in reverse order, so that anybody attempting to
+ // access the main chunk sees it as a single free block until we
+@@ -2967,6 +2990,20 @@
+ assert(fl->tail()->next() == NULL, "List invariant.");
+ }
+
++void CompactibleFreeListSpace:: par_get_chunk_of_blocks(size_t word_sz, size_t n, FreeList<FreeChunk>* fl) {
++ assert(fl->count() == 0, "Precondition.");
++ assert(word_sz < CompactibleFreeListSpace::IndexSetSize,
++ "Precondition");
++
++ if (par_get_chunk_of_blocks_IFL(word_sz, n, fl)) {
++ // Got it
++ return;
++ }
++
++ // Otherwise, we'll split a block from the dictionary.
++ par_get_chunk_of_blocks_dictionary(word_sz, n, fl);
++}
++
+ // Set up the space's par_seq_tasks structure for work claiming
+ // for parallel rescan. See CMSParRemarkTask where this is currently used.
+ // XXX Need to suitably abstract and generalize this and the next
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -171,6 +171,20 @@
+ // list of size "word_sz", and must now be decremented.
+ void par_get_chunk_of_blocks(size_t word_sz, size_t n, FreeList<FreeChunk>* fl);
+
++ // Used by par_get_chunk_of_blocks() for the chunks from the
++ // indexed_free_lists.
++ bool par_get_chunk_of_blocks_IFL(size_t word_sz, size_t n, FreeList<FreeChunk>* fl);
++
++ // Used by par_get_chunk_of_blocks_dictionary() to get a chunk
++ // evenly splittable into "n" "word_sz" chunks. Returns that
++ // evenly splittable chunk. May split a larger chunk to get the
++ // evenly splittable chunk.
++ FreeChunk* get_n_way_chunk_to_split(size_t word_sz, size_t n);
++
++ // Used by par_get_chunk_of_blocks() for the chunks from the
++ // dictionary.
++ void par_get_chunk_of_blocks_dictionary(size_t word_sz, size_t n, FreeList<FreeChunk>* fl);
++
+ // Allocation helper functions
+ // Allocate using a strategy that takes from the indexed free lists
+ // first. This allocation strategy assumes a companion sweeping
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -757,7 +757,7 @@
+ // Support for parallelizing survivor space rescan
+ if ((CMSParallelRemarkEnabled && CMSParallelSurvivorRemarkEnabled) || CMSParallelInitialMarkEnabled) {
+ const size_t max_plab_samples =
+- ((DefNewGeneration*)_young_gen)->max_survivor_size()/MinTLABSize;
++ ((DefNewGeneration*)_young_gen)->max_survivor_size() / plab_sample_minimum_size();
+
+ _survivor_plab_array = NEW_C_HEAP_ARRAY(ChunkArray, ParallelGCThreads, mtGC);
+ _survivor_chunk_array = NEW_C_HEAP_ARRAY(HeapWord*, 2*max_plab_samples, mtGC);
+@@ -824,6 +824,12 @@
+ _inter_sweep_timer.start(); // start of time
+ }
+
++size_t CMSCollector::plab_sample_minimum_size() {
++ // The default value of MinTLABSize is 2k, but there is
++ // no way to get the default value if the flag has been overridden.
++ return MAX2(ThreadLocalAllocBuffer::min_size() * HeapWordSize, 2 * K);
++}
++
+ const char* ConcurrentMarkSweepGeneration::name() const {
+ return "concurrent mark-sweep generation";
+ }
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -766,6 +766,10 @@
+ size_t* _cursor;
+ ChunkArray* _survivor_plab_array;
+
++ // A bounded minimum size of PLABs, should not return too small values since
++ // this will affect the size of the data structures used for parallel young gen rescan
++ size_t plab_sample_minimum_size();
++
+ // Support for marking stack overflow handling
+ bool take_from_overflow_list(size_t num, CMSMarkStack* to_stack);
+ bool par_take_from_overflow_list(size_t num,
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -172,7 +172,7 @@
+
+ // Should be called when we want to release the active region which
+ // is returned after it's been retired.
+- HeapRegion* release();
++ virtual HeapRegion* release();
+
+ #if G1_ALLOC_REGION_TRACING
+ void trace(const char* str, size_t word_size = 0, HeapWord* result = NULL);
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2013, 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
+@@ -1519,7 +1519,7 @@
+ }
+
+ if (G1Log::finer()) {
+- g1_policy()->print_detailed_heap_transition();
++ g1_policy()->print_detailed_heap_transition(true /* full */);
+ }
+
+ print_heap_after_gc();
+@@ -6628,6 +6628,35 @@
+ _g1h->retire_gc_alloc_region(alloc_region, allocated_bytes,
+ GCAllocForTenured);
+ }
++
++HeapRegion* OldGCAllocRegion::release() {
++ HeapRegion* cur = get();
++ if (cur != NULL) {
++ // Determine how far we are from the next card boundary. If it is smaller than
++ // the minimum object size we can allocate into, expand into the next card.
++ HeapWord* top = cur->top();
++ HeapWord* aligned_top = (HeapWord*)align_ptr_up(top, G1BlockOffsetSharedArray::N_bytes);
++
++ size_t to_allocate_words = pointer_delta(aligned_top, top, HeapWordSize);
++
++ if (to_allocate_words != 0) {
++ // We are not at a card boundary. Fill up, possibly into the next, taking the
++ // end of the region and the minimum object size into account.
++ to_allocate_words = MIN2(pointer_delta(cur->end(), cur->top(), HeapWordSize),
++ MAX2(to_allocate_words, G1CollectedHeap::min_fill_size()));
++
++ // Skip allocation if there is not enough space to allocate even the smallest
++ // possible object. In this case this region will not be retained, so the
++ // original problem cannot occur.
++ if (to_allocate_words >= G1CollectedHeap::min_fill_size()) {
++ HeapWord* dummy = attempt_allocation(to_allocate_words, true /* bot_updates */);
++ CollectedHeap::fill_with_object(dummy, to_allocate_words);
++ }
++ }
++ }
++ return G1AllocRegion::release();
++}
++
+ // Heap region set verification
+
+ class VerifyRegionListsClosure : public HeapRegionClosure {
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -183,6 +183,13 @@
+ public:
+ OldGCAllocRegion()
+ : G1AllocRegion("Old GC Alloc Region", true /* bot_updates */) { }
++
++ // This specialization of release() makes sure that the last card that has been
++ // allocated into has been completely filled by a dummy object.
++ // This avoids races when remembered set scanning wants to update the BOT of the
++ // last card in the retained old gc alloc region, and allocation threads
++ // allocating into that card at the same time.
++ virtual HeapRegion* release();
+ };
+
+ // The G1 STW is alive closure.
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2013, 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
+@@ -124,9 +124,12 @@
+ _last_young_gc(false),
+ _last_gc_was_young(false),
+
+- _eden_bytes_before_gc(0),
+- _survivor_bytes_before_gc(0),
+- _capacity_before_gc(0),
++ _eden_used_bytes_before_gc(0),
++ _survivor_used_bytes_before_gc(0),
++ _heap_used_bytes_before_gc(0),
++ _permgen_used_bytes_before_gc(0),
++ _eden_capacity_bytes_before_gc(0),
++ _heap_capacity_bytes_before_gc(0),
+
+ _eden_cset_region_length(0),
+ _survivor_cset_region_length(0),
+@@ -747,7 +750,7 @@
+
+ void G1CollectorPolicy::record_full_collection_start() {
+ _full_collection_start_sec = os::elapsedTime();
+- record_heap_size_info_at_start();
++ record_heap_size_info_at_start(true /* full */);
+ // Release the future to-space so that it is available for compaction into.
+ _g1->set_full_collection();
+ }
+@@ -804,7 +807,7 @@
+ _trace_gen0_time_data.record_start_collection(s_w_t_ms);
+ _stop_world_start = 0.0;
+
+- record_heap_size_info_at_start();
++ record_heap_size_info_at_start(false /* full */);
+
+ phase_times()->record_cur_collection_start_sec(start_time_sec);
+ _pending_cards = _g1->pending_card_num();
+@@ -939,14 +942,6 @@
+ _mmu_tracker->add_pause(end_time_sec - pause_time_ms/1000.0,
+ end_time_sec, false);
+
+- size_t freed_bytes =
+- _cur_collection_pause_used_at_start_bytes - cur_used_bytes;
+- size_t surviving_bytes = _collection_set_bytes_used_before - freed_bytes;
+-
+- double survival_fraction =
+- (double)surviving_bytes/
+- (double)_collection_set_bytes_used_before;
+-
+ evacuation_info.set_collectionset_used_before(_collection_set_bytes_used_before);
+ evacuation_info.set_bytes_copied(_bytes_copied_during_gc);
+
+@@ -1002,6 +997,7 @@
+ }
+ }
+ }
++
+ bool new_in_marking_window = _in_marking_window;
+ bool new_in_marking_window_im = false;
+ if (during_initial_mark_pause()) {
+@@ -1087,8 +1083,10 @@
+ }
+ _rs_length_diff_seq->add((double) rs_length_diff);
+
+- size_t copied_bytes = surviving_bytes;
++ size_t freed_bytes = _heap_used_bytes_before_gc - cur_used_bytes;
++ size_t copied_bytes = _collection_set_bytes_used_before - freed_bytes;
+ double cost_per_byte_ms = 0.0;
++
+ if (copied_bytes > 0) {
+ cost_per_byte_ms = phase_times()->average_last_obj_copy_time() / (double) copied_bytes;
+ if (_in_marking_window) {
+@@ -1152,51 +1150,66 @@
+ byte_size_in_proper_unit((double)(bytes)), \
+ proper_unit_for_byte_size((bytes))
+
+-void G1CollectorPolicy::record_heap_size_info_at_start() {
++void G1CollectorPolicy::record_heap_size_info_at_start(bool full) {
+ YoungList* young_list = _g1->young_list();
+- _eden_bytes_before_gc = young_list->eden_used_bytes();
+- _survivor_bytes_before_gc = young_list->survivor_used_bytes();
+- _capacity_before_gc = _g1->capacity();
+-
+- _cur_collection_pause_used_at_start_bytes = _g1->used();
++ _eden_used_bytes_before_gc = young_list->eden_used_bytes();
++ _survivor_used_bytes_before_gc = young_list->survivor_used_bytes();
++ _heap_capacity_bytes_before_gc = _g1->capacity();
++ _heap_used_bytes_before_gc = _g1->used();
+ _cur_collection_pause_used_regions_at_start = _g1->used_regions();
+
+- size_t eden_capacity_before_gc =
+- (_young_list_target_length * HeapRegion::GrainBytes) - _survivor_bytes_before_gc;
++ _eden_capacity_bytes_before_gc =
++ (_young_list_target_length * HeapRegion::GrainBytes) - _survivor_used_bytes_before_gc;
+
+- _prev_eden_capacity = eden_capacity_before_gc;
++ if (full) {
++ _permgen_used_bytes_before_gc = _g1->perm_gen()->used();
++ }
++}
++void G1CollectorPolicy::print_perm_heap_change(size_t perm_prev_used) const {
++ gclog_or_tty->print(", [%s:", _g1->perm_gen()->short_name());
++ _g1->perm_gen()->print_heap_change(perm_prev_used);
++ gclog_or_tty->print("]");
+ }
+
+ void G1CollectorPolicy::print_heap_transition() {
+ _g1->print_size_transition(gclog_or_tty,
+- _cur_collection_pause_used_at_start_bytes, _g1->used(), _g1->capacity());
++ _heap_used_bytes_before_gc,
++ _g1->used(),
++ _g1->capacity());
+ }
+
+-void G1CollectorPolicy::print_detailed_heap_transition() {
+- YoungList* young_list = _g1->young_list();
+- size_t eden_bytes = young_list->eden_used_bytes();
+- size_t survivor_bytes = young_list->survivor_used_bytes();
+- size_t used_before_gc = _cur_collection_pause_used_at_start_bytes;
+- size_t used = _g1->used();
+- size_t capacity = _g1->capacity();
+- size_t eden_capacity =
+- (_young_list_target_length * HeapRegion::GrainBytes) - survivor_bytes;
++void G1CollectorPolicy::print_detailed_heap_transition(bool full) {
++ YoungList* young_list = _g1->young_list();
+
+- gclog_or_tty->print_cr(
+- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
+- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
+- "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
+- EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
+- EXT_SIZE_PARAMS(_eden_bytes_before_gc),
+- EXT_SIZE_PARAMS(_prev_eden_capacity),
+- EXT_SIZE_PARAMS(eden_bytes),
+- EXT_SIZE_PARAMS(eden_capacity),
+- EXT_SIZE_PARAMS(_survivor_bytes_before_gc),
+- EXT_SIZE_PARAMS(survivor_bytes),
+- EXT_SIZE_PARAMS(used_before_gc),
+- EXT_SIZE_PARAMS(_capacity_before_gc),
+- EXT_SIZE_PARAMS(used),
+- EXT_SIZE_PARAMS(capacity));
++ size_t eden_used_bytes_after_gc = young_list->eden_used_bytes();
++ size_t survivor_used_bytes_after_gc = young_list->survivor_used_bytes();
++ size_t heap_used_bytes_after_gc = _g1->used();
++
++ size_t heap_capacity_bytes_after_gc = _g1->capacity();
++ size_t eden_capacity_bytes_after_gc =
++ (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
++
++ gclog_or_tty->print(
++ " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
++ "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
++ "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
++ EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
++ EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
++ EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
++ EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
++ EXT_SIZE_PARAMS(eden_capacity_bytes_after_gc),
++ EXT_SIZE_PARAMS(_survivor_used_bytes_before_gc),
++ EXT_SIZE_PARAMS(survivor_used_bytes_after_gc),
++ EXT_SIZE_PARAMS(_heap_used_bytes_before_gc),
++ EXT_SIZE_PARAMS(_heap_capacity_bytes_before_gc),
++ EXT_SIZE_PARAMS(heap_used_bytes_after_gc),
++ EXT_SIZE_PARAMS(heap_capacity_bytes_after_gc));
++
++ if (full) {
++ print_perm_heap_change(_permgen_used_bytes_before_gc);
++ }
++
++ gclog_or_tty->cr();
+ }
+
+ void G1CollectorPolicy::adjust_concurrent_refinement(double update_rs_time,
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2013, 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
+@@ -176,7 +176,6 @@
+ CollectionSetChooser* _collectionSetChooser;
+
+ double _full_collection_start_sec;
+- size_t _cur_collection_pause_used_at_start_bytes;
+ uint _cur_collection_pause_used_regions_at_start;
+
+ // These exclude marking times.
+@@ -195,7 +194,6 @@
+
+ uint _young_list_target_length;
+ uint _young_list_fixed_length;
+- size_t _prev_eden_capacity; // used for logging
+
+ // The max number of regions we can extend the eden by while the GC
+ // locker is active. This should be >= _young_list_target_length;
+@@ -694,11 +692,12 @@
+
+ // Records the information about the heap size for reporting in
+ // print_detailed_heap_transition
+- void record_heap_size_info_at_start();
++ void record_heap_size_info_at_start(bool full);
+
+ // Print heap sizing transition (with less and more detail).
+ void print_heap_transition();
+- void print_detailed_heap_transition();
++ void print_detailed_heap_transition(bool full = false);
++ void print_perm_heap_change(size_t perm_prev_used) const;
+
+ void record_stop_world_start();
+ void record_concurrent_pause();
+@@ -862,9 +861,16 @@
+ uint _max_survivor_regions;
+
+ // For reporting purposes.
+- size_t _eden_bytes_before_gc;
+- size_t _survivor_bytes_before_gc;
+- size_t _capacity_before_gc;
++ // The value of _heap_bytes_before_gc is also used to calculate
++ // the cost of copying.
++
++ size_t _eden_used_bytes_before_gc; // Eden occupancy before GC
++ size_t _survivor_used_bytes_before_gc; // Survivor occupancy before GC
++ size_t _heap_used_bytes_before_gc; // Heap occupancy before GC
++ size_t _permgen_used_bytes_before_gc; // PermGen occupancy before GC
++
++ size_t _eden_capacity_bytes_before_gc; // Eden capacity before GC
++ size_t _heap_capacity_bytes_before_gc; // Heap capacity before GC
+
+ // The amount of survor regions after a collection.
+ uint _recorded_survivor_regions;
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -107,7 +107,15 @@
+ jbyte *const first = byte_for(mr.start());
+ jbyte *const last = byte_after(mr.last());
+
+- memset(first, g1_young_gen, last - first);
++ // Below we may use an explicit loop instead of memset() because on
++ // certain platforms memset() can give concurrent readers phantom zeros.
++ if (UseMemSetInBOT) {
++ memset(first, g1_young_gen, last - first);
++ } else {
++ for (jbyte* i = first; i < last; i++) {
++ *i = g1_young_gen;
++ }
++ }
+ }
+
+ #ifndef PRODUCT
+--- ./hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -62,7 +62,8 @@
+ ParGCAllocBuffer(size_t word_sz);
+
+ static const size_t min_size() {
+- return ThreadLocalAllocBuffer::min_size();
++ // Make sure that we return something that is larger than AlignmentReserve
++ return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve;
+ }
+
+ static const size_t max_size() {
+--- ./hotspot/src/share/vm/memory/referenceProcessor.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/memory/referenceProcessor.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -119,6 +119,7 @@
+ _discoveredWeakRefs = &_discoveredSoftRefs[_max_num_q];
+ _discoveredFinalRefs = &_discoveredWeakRefs[_max_num_q];
+ _discoveredPhantomRefs = &_discoveredFinalRefs[_max_num_q];
++ _discoveredCleanerRefs = &_discoveredPhantomRefs[_max_num_q];
+
+ // Initialize all entries to NULL
+ for (uint i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+@@ -250,6 +251,13 @@
+ phantom_count =
+ process_discovered_reflist(_discoveredPhantomRefs, NULL, false,
+ is_alive, keep_alive, complete_gc, task_executor);
++
++ // Process cleaners, but include them in phantom statistics. We expect
++ // Cleaner references to be temporary, and don't want to deal with
++ // possible incompatibilities arising from making it more visible.
++ phantom_count +=
++ process_discovered_reflist(_discoveredCleanerRefs, NULL, false,
++ is_alive, keep_alive, complete_gc, task_executor);
+ }
+
+ // Weak global JNI references. It would make more sense (semantically) to
+@@ -899,6 +907,7 @@
+ balance_queues(_discoveredWeakRefs);
+ balance_queues(_discoveredFinalRefs);
+ balance_queues(_discoveredPhantomRefs);
++ balance_queues(_discoveredCleanerRefs);
+ }
+
+ size_t
+@@ -1058,6 +1067,9 @@
+ case REF_PHANTOM:
+ list = &_discoveredPhantomRefs[id];
+ break;
++ case REF_CLEANER:
++ list = &_discoveredCleanerRefs[id];
++ break;
+ case REF_NONE:
+ // we should not reach here if we are an instanceRefKlass
+ default:
+@@ -1353,6 +1365,17 @@
+ preclean_discovered_reflist(_discoveredPhantomRefs[i], is_alive,
+ keep_alive, complete_gc, yield);
+ }
++
++ // Cleaner references. Included in timing for phantom references. We
++ // expect Cleaner references to be temporary, and don't want to deal with
++ // possible incompatibilities arising from making it more visible.
++ for (uint i = 0; i < _max_num_q; i++) {
++ if (yield->should_return()) {
++ return;
++ }
++ preclean_discovered_reflist(_discoveredCleanerRefs[i], is_alive,
++ keep_alive, complete_gc, yield);
++ }
+ }
+ }
+
+@@ -1421,6 +1444,7 @@
+ case 1: return "WeakRef";
+ case 2: return "FinalRef";
+ case 3: return "PhantomRef";
++ case 4: return "CleanerRef";
+ }
+ ShouldNotReachHere();
+ return NULL;
+--- ./hotspot/src/share/vm/memory/referenceProcessor.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/memory/referenceProcessor.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -272,9 +272,10 @@
+ DiscoveredList* _discoveredWeakRefs;
+ DiscoveredList* _discoveredFinalRefs;
+ DiscoveredList* _discoveredPhantomRefs;
++ DiscoveredList* _discoveredCleanerRefs;
+
+ public:
+- static int number_of_subclasses_of_ref() { return (REF_PHANTOM - REF_OTHER); }
++ static int number_of_subclasses_of_ref() { return (REF_CLEANER - REF_OTHER); }
+
+ uint num_q() { return _num_q; }
+ uint max_num_q() { return _max_num_q; }
+--- ./hotspot/src/share/vm/memory/referenceType.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/memory/referenceType.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -35,7 +35,8 @@
+ REF_SOFT, // Subclass of java/lang/ref/SoftReference
+ REF_WEAK, // Subclass of java/lang/ref/WeakReference
+ REF_FINAL, // Subclass of java/lang/ref/FinalReference
+- REF_PHANTOM // Subclass of java/lang/ref/PhantomReference
++ REF_PHANTOM, // Subclass of java/lang/ref/PhantomReference
++ REF_CLEANER // Subclass of sun/misc/Cleaner
+ };
+
+ #endif // SHARE_VM_MEMORY_REFRERENCETYPE_HPP
+--- ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -240,22 +240,19 @@
+ }
+
+ size_t ThreadLocalAllocBuffer::initial_desired_size() {
+- size_t init_sz;
++ size_t init_sz = 0;
+
+ if (TLABSize > 0) {
+- init_sz = MIN2(TLABSize / HeapWordSize, max_size());
+- } else if (global_stats() == NULL) {
+- // Startup issue - main thread initialized before heap initialized.
+- init_sz = min_size();
+- } else {
++ init_sz = TLABSize / HeapWordSize;
++ } else if (global_stats() != NULL) {
+ // Initial size is a function of the average number of allocating threads.
+ unsigned nof_threads = global_stats()->allocating_threads_avg();
+
+ init_sz = (Universe::heap()->tlab_capacity(myThread()) / HeapWordSize) /
+ (nof_threads * target_refills());
+ init_sz = align_object_size(init_sz);
+- init_sz = MIN2(MAX2(init_sz, min_size()), max_size());
+ }
++ init_sz = MIN2(MAX2(init_sz, min_size()), max_size());
+ return init_sz;
+ }
+
+--- ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -103,7 +103,7 @@
+ // do nothing. tlabs must be inited by initialize() calls
+ }
+
+- static const size_t min_size() { return align_object_size(MinTLABSize / HeapWordSize); }
++ static const size_t min_size() { return align_object_size(MinTLABSize / HeapWordSize) + alignment_reserve(); }
+ static const size_t max_size();
+
+ HeapWord* start() const { return _start; }
+--- ./hotspot/src/share/vm/oops/cpCacheOop.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/oops/cpCacheOop.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -140,8 +140,15 @@
+ oop_store(&_f1, f1);
+ }
+ void release_set_f1(oop f1);
+- void set_f2(intx f2) { assert(_f2 == 0 || _f2 == f2, "illegal field change"); _f2 = f2; }
+- void set_f2_as_vfinal_method(methodOop f2) { assert(_f2 == 0 || _f2 == (intptr_t) f2, "illegal field change"); assert(is_vfinal(), "flags must be set"); _f2 = (intptr_t) f2; }
++ void set_f2(intx f2) {
++ intx existing_f2 = _f2; // read once
++ assert(existing_f2 == 0 || existing_f2 == f2, "illegal field change");
++ _f2 = f2;
++ }
++ void set_f2_as_vfinal_method(methodOop f2) {
++ assert(is_vfinal(), "flags must be set");
++ set_f2((intx)f2);
++ }
+ int make_flags(TosState state, int option_bits, int field_index_or_method_params);
+ void set_flags(intx flags) { _flags = flags; }
+ bool init_flags_atomic(intx flags);
+--- ./hotspot/src/share/vm/oops/objArrayOop.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/oops/objArrayOop.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -45,9 +45,10 @@
+ private:
+ // Give size of objArrayOop in HeapWords minus the header
+ static int array_size(int length) {
+- const int OopsPerHeapWord = HeapWordSize/heapOopSize;
++ const uint OopsPerHeapWord = HeapWordSize/heapOopSize;
+ assert(OopsPerHeapWord >= 1 && (HeapWordSize % heapOopSize == 0),
+ "Else the following (new) computation would be in error");
++ uint res = ((uint)length + OopsPerHeapWord - 1)/OopsPerHeapWord;
+ #ifdef ASSERT
+ // The old code is left in for sanity-checking; it'll
+ // go away pretty soon. XXX
+@@ -55,16 +56,15 @@
+ // oop->length() * HeapWordsPerOop;
+ // With narrowOops, HeapWordsPerOop is 1/2 or equal 0 as an integer.
+ // The oop elements are aligned up to wordSize
+- const int HeapWordsPerOop = heapOopSize/HeapWordSize;
+- int old_res;
++ const uint HeapWordsPerOop = heapOopSize/HeapWordSize;
++ uint old_res;
+ if (HeapWordsPerOop > 0) {
+ old_res = length * HeapWordsPerOop;
+ } else {
+- old_res = align_size_up(length, OopsPerHeapWord)/OopsPerHeapWord;
++ old_res = align_size_up((uint)length, OopsPerHeapWord)/OopsPerHeapWord;
+ }
++ assert(res == old_res, "Inconsistency between old and new.");
+ #endif // ASSERT
+- int res = ((uint)length + OopsPerHeapWord - 1)/OopsPerHeapWord;
+- assert(res == old_res, "Inconsistency between old and new.");
+ return res;
+ }
+
+--- ./hotspot/src/share/vm/oops/typeArrayOop.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/oops/typeArrayOop.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -162,7 +162,7 @@
+ DEBUG_ONLY(BasicType etype = Klass::layout_helper_element_type(lh));
+ assert(length <= arrayOopDesc::max_array_length(etype), "no overflow");
+
+- julong size_in_bytes = length;
++ julong size_in_bytes = (juint)length;
+ size_in_bytes <<= element_shift;
+ size_in_bytes += instance_header_size;
+ julong size_in_words = ((size_in_bytes + (HeapWordSize-1)) >> LogHeapWordSize);
+--- ./hotspot/src/share/vm/opto/compile.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/compile.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -669,6 +669,7 @@
+ #endif
+ set_print_inlining(PrintInlining || method()->has_option("PrintInlining") NOT_PRODUCT( || PrintOptoInlining));
+ set_print_intrinsics(PrintIntrinsics || method()->has_option("PrintIntrinsics"));
++ set_has_irreducible_loop(true); // conservative until build_loop_tree() reset it
+
+ if (ProfileTraps) {
+ // Make sure the method being compiled gets its own MDO,
+@@ -936,6 +937,8 @@
+ set_print_assembly(PrintFrameConverterAssembly);
+ set_parsed_irreducible_loop(false);
+ #endif
++ set_has_irreducible_loop(false); // no loops
++
+ CompileWrapper cw(this);
+ Init(/*AliasLevel=*/ 0);
+ init_tf((*generator)());
+@@ -1100,7 +1103,7 @@
+ if( start->is_Start() )
+ return start->as_Start();
+ }
+- ShouldNotReachHere();
++ fatal("Did not find Start node!");
+ return NULL;
+ }
+
+--- ./hotspot/src/share/vm/opto/compile.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/compile.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -291,6 +291,7 @@
+ bool _trace_opto_output;
+ bool _parsed_irreducible_loop; // True if ciTypeFlow detected irreducible loops during parsing
+ #endif
++ bool _has_irreducible_loop; // Found irreducible loops
+
+ // JSR 292
+ bool _has_method_handle_invokes; // True if this method has MethodHandle invokes.
+@@ -552,6 +553,8 @@
+ bool parsed_irreducible_loop() const { return _parsed_irreducible_loop; }
+ void set_parsed_irreducible_loop(bool z) { _parsed_irreducible_loop = z; }
+ #endif
++ bool has_irreducible_loop() const { return _has_irreducible_loop; }
++ void set_has_irreducible_loop(bool z) { _has_irreducible_loop = z; }
+
+ // JSR 292
+ bool has_method_handle_invokes() const { return _has_method_handle_invokes; }
+--- ./hotspot/src/share/vm/opto/ifnode.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/ifnode.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2010, 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
+@@ -503,7 +503,7 @@
+ jint off = 0;
+ if (l->is_top()) {
+ return 0;
+- } else if (l->is_Add()) {
++ } else if (l->Opcode() == Op_AddI) {
+ if ((off = l->in(1)->find_int_con(0)) != 0) {
+ ind = l->in(2);
+ } else if ((off = l->in(2)->find_int_con(0)) != 0) {
+--- ./hotspot/src/share/vm/opto/library_call.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/library_call.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2012, 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
+@@ -3699,8 +3699,11 @@
+ }
+
+
+-//------------------------------inline_native_hashcode--------------------
+-// Build special case code for calls to hashCode on an object.
++/**
++ * Build special case code for calls to hashCode on an object. This call may
++ * be virtual (invokevirtual) or bound (invokespecial). For each case we generate
++ * slightly different code.
++ */
+ bool LibraryCallKit::inline_native_hashcode(bool is_virtual, bool is_static) {
+ assert(is_static == callee()->is_static(), "correct intrinsic selection");
+ assert(!(is_virtual && is_static), "either virtual, special, or static");
+@@ -3708,11 +3711,9 @@
+ enum { _slow_path = 1, _fast_path, _null_path, PATH_LIMIT };
+
+ RegionNode* result_reg = new(C) RegionNode(PATH_LIMIT);
+- PhiNode* result_val = new(C) PhiNode(result_reg,
+- TypeInt::INT);
++ PhiNode* result_val = new(C) PhiNode(result_reg, TypeInt::INT);
+ PhiNode* result_io = new(C) PhiNode(result_reg, Type::ABIO);
+- PhiNode* result_mem = new(C) PhiNode(result_reg, Type::MEMORY,
+- TypePtr::BOTTOM);
++ PhiNode* result_mem = new(C) PhiNode(result_reg, Type::MEMORY, TypePtr::BOTTOM);
+ Node* obj = NULL;
+ if (!is_static) {
+ // Check for hashing null object
+@@ -3738,12 +3739,6 @@
+ return true;
+ }
+
+- // After null check, get the object's klass.
+- Node* obj_klass = load_object_klass(obj);
+-
+- // This call may be virtual (invokevirtual) or bound (invokespecial).
+- // For each case we generate slightly different code.
+-
+ // We only go to the fast case code if we pass a number of guards. The
+ // paths which do not pass are accumulated in the slow_region.
+ RegionNode* slow_region = new (C) RegionNode(1);
+@@ -3756,19 +3751,24 @@
+ // guard for non-virtual calls -- the caller is known to be the native
+ // Object hashCode().
+ if (is_virtual) {
++ // After null check, get the object's klass.
++ Node* obj_klass = load_object_klass(obj);
+ generate_virtual_guard(obj_klass, slow_region);
+ }
+
+ // Get the header out of the object, use LoadMarkNode when available
+ Node* header_addr = basic_plus_adr(obj, oopDesc::mark_offset_in_bytes());
+- Node* header = make_load(control(), header_addr, TypeX_X, TypeX_X->basic_type());
++ // The control of the load must be NULL. Otherwise, the load can move before
++ // the null check after castPP removal.
++ Node* no_ctrl = NULL;
++ Node* header = make_load(no_ctrl, header_addr, TypeX_X, TypeX_X->basic_type());
+
+ // Test the header to see if it is unlocked.
+- Node *lock_mask = _gvn.MakeConX(markOopDesc::biased_lock_mask_in_place);
+- Node *lmasked_header = _gvn.transform( new (C) AndXNode(header, lock_mask) );
+- Node *unlocked_val = _gvn.MakeConX(markOopDesc::unlocked_value);
+- Node *chk_unlocked = _gvn.transform( new (C) CmpXNode( lmasked_header, unlocked_val));
+- Node *test_unlocked = _gvn.transform( new (C) BoolNode( chk_unlocked, BoolTest::ne) );
++ Node* lock_mask = _gvn.MakeConX(markOopDesc::biased_lock_mask_in_place);
++ Node* lmasked_header = _gvn.transform(new (C) AndXNode(header, lock_mask));
++ Node* unlocked_val = _gvn.MakeConX(markOopDesc::unlocked_value);
++ Node* chk_unlocked = _gvn.transform(new (C) CmpXNode( lmasked_header, unlocked_val));
++ Node* test_unlocked = _gvn.transform(new (C) BoolNode( chk_unlocked, BoolTest::ne));
+
+ generate_slow_guard(test_unlocked, slow_region);
+
+@@ -3776,19 +3776,19 @@
+ // We depend on hash_mask being at most 32 bits and avoid the use of
+ // hash_mask_in_place because it could be larger than 32 bits in a 64-bit
+ // vm: see markOop.hpp.
+- Node *hash_mask = _gvn.intcon(markOopDesc::hash_mask);
+- Node *hash_shift = _gvn.intcon(markOopDesc::hash_shift);
+- Node *hshifted_header= _gvn.transform( new (C) URShiftXNode(header, hash_shift) );
++ Node* hash_mask = _gvn.intcon(markOopDesc::hash_mask);
++ Node* hash_shift = _gvn.intcon(markOopDesc::hash_shift);
++ Node* hshifted_header= _gvn.transform(new (C) URShiftXNode(header, hash_shift));
+ // This hack lets the hash bits live anywhere in the mark object now, as long
+ // as the shift drops the relevant bits into the low 32 bits. Note that
+ // Java spec says that HashCode is an int so there's no point in capturing
+ // an 'X'-sized hashcode (32 in 32-bit build or 64 in 64-bit build).
+ hshifted_header = ConvX2I(hshifted_header);
+- Node *hash_val = _gvn.transform( new (C) AndINode(hshifted_header, hash_mask) );
+-
+- Node *no_hash_val = _gvn.intcon(markOopDesc::no_hash);
+- Node *chk_assigned = _gvn.transform( new (C) CmpINode( hash_val, no_hash_val));
+- Node *test_assigned = _gvn.transform( new (C) BoolNode( chk_assigned, BoolTest::eq) );
++ Node* hash_val = _gvn.transform(new (C) AndINode(hshifted_header, hash_mask));
++
++ Node* no_hash_val = _gvn.intcon(markOopDesc::no_hash);
++ Node* chk_assigned = _gvn.transform(new (C) CmpINode( hash_val, no_hash_val));
++ Node* test_assigned = _gvn.transform(new (C) BoolNode( chk_assigned, BoolTest::eq));
+
+ generate_slow_guard(test_assigned, slow_region);
+
+--- ./hotspot/src/share/vm/opto/loopTransform.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/loopTransform.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1127,6 +1127,7 @@
+ // Now force out all loop-invariant dominating tests. The optimizer
+ // finds some, but we _know_ they are all useless.
+ peeled_dom_test_elim(loop,old_new);
++ loop->record_for_igvn();
+ }
+
+ //------------------------------is_invariant-----------------------------
+--- ./hotspot/src/share/vm/opto/loopnode.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/loopnode.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -266,9 +266,9 @@
+
+ // Counted loop head must be a good RegionNode with only 3 not NULL
+ // control input edges: Self, Entry, LoopBack.
+- if (x->in(LoopNode::Self) == NULL || x->req() != 3)
++ if (x->in(LoopNode::Self) == NULL || x->req() != 3 || loop->_irreducible) {
+ return false;
+-
++ }
+ Node *init_control = x->in(LoopNode::EntryControl);
+ Node *back_control = x->in(LoopNode::LoopBackControl);
+ if (init_control == NULL || back_control == NULL) // Partially dead
+@@ -1522,11 +1522,11 @@
+
+ // If I have one hot backedge, peel off myself loop.
+ // I better be the outermost loop.
+- if( _head->req() > 3 ) {
++ if (_head->req() > 3 && !_irreducible) {
+ split_outer_loop( phase );
+ result = true;
+
+- } else if( !_head->is_Loop() && !_irreducible ) {
++ } else if (!_head->is_Loop() && !_irreducible) {
+ // Make a new LoopNode to replace the old loop head
+ Node *l = new (phase->C) LoopNode( _head->in(1), _head->in(2) );
+ l = igvn.register_new_node_with_optimizer(l, _head);
+@@ -2938,6 +2938,7 @@
+ return pre_order;
+ }
+ }
++ C->set_has_irreducible_loop(_has_irreducible_loops);
+ }
+
+ // This Node might be a decision point for loops. It is only if
+@@ -3171,17 +3172,16 @@
+ bool had_error = false;
+ #ifdef ASSERT
+ if (early != C->root()) {
+- // Make sure that there's a dominance path from use to LCA
+- Node* d = use;
+- while (d != LCA) {
+- d = idom(d);
++ // Make sure that there's a dominance path from LCA to early
++ Node* d = LCA;
++ while (d != early) {
+ if (d == C->root()) {
+- tty->print_cr("*** Use %d isn't dominated by def %s", use->_idx, n->_idx);
+- n->dump();
+- use->dump();
++ dump_bad_graph("Bad graph detected in compute_lca_of_uses", n, early, LCA);
++ tty->print_cr("*** Use %d isn't dominated by def %d ***", use->_idx, n->_idx);
+ had_error = true;
+ break;
+ }
++ d = idom(d);
+ }
+ }
+ #endif
+@@ -3434,6 +3434,13 @@
+ _igvn._worklist.push(n); // Maybe we'll normalize it, if no more loops.
+ }
+
++#ifdef ASSERT
++ if (_verify_only && !n->is_CFG()) {
++ // Check def-use domination.
++ compute_lca_of_uses(n, get_ctrl(n), true /* verify */);
++ }
++#endif
++
+ // CFG and pinned nodes already handled
+ if( n->in(0) ) {
+ if( n->in(0)->is_top() ) return; // Dead?
+--- ./hotspot/src/share/vm/opto/loopopts.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/loopopts.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -2684,6 +2684,7 @@
+ // Inhibit more partial peeling on this loop
+ new_head_clone->set_partial_peel_loop();
+ C->set_major_progress();
++ loop->record_for_igvn();
+
+ #if !defined(PRODUCT)
+ if (TracePartialPeeling) {
+--- ./hotspot/src/share/vm/opto/memnode.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/memnode.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -292,33 +292,16 @@
+ int alias_idx = phase->C->get_alias_index(t_adr->is_ptr());
+ }
+
+-#ifdef ASSERT
+ Node* base = NULL;
+- if (address->is_AddP())
++ if (address->is_AddP()) {
+ base = address->in(AddPNode::Base);
++ }
+ if (base != NULL && phase->type(base)->higher_equal(TypePtr::NULL_PTR) &&
+ !t_adr->isa_rawptr()) {
+ // Note: raw address has TOP base and top->higher_equal(TypePtr::NULL_PTR) is true.
+- Compile* C = phase->C;
+- tty->cr();
+- tty->print_cr("===== NULL+offs not RAW address =====");
+- if (C->is_dead_node(this->_idx)) tty->print_cr("'this' is dead");
+- if ((ctl != NULL) && C->is_dead_node(ctl->_idx)) tty->print_cr("'ctl' is dead");
+- if (C->is_dead_node(mem->_idx)) tty->print_cr("'mem' is dead");
+- if (C->is_dead_node(address->_idx)) tty->print_cr("'address' is dead");
+- if (C->is_dead_node(base->_idx)) tty->print_cr("'base' is dead");
+- tty->cr();
+- base->dump(1);
+- tty->cr();
+- this->dump(2);
+- tty->print("this->adr_type(): "); adr_type()->dump(); tty->cr();
+- tty->print("phase->type(address): "); t_adr->dump(); tty->cr();
+- tty->print("phase->type(base): "); phase->type(address)->dump(); tty->cr();
+- tty->cr();
++ // Skip this node optimization if its address has TOP base.
++ return NodeSentinel; // caller will return NULL
+ }
+- assert(base == NULL || t_adr->isa_rawptr() ||
+- !phase->type(base)->higher_equal(TypePtr::NULL_PTR), "NULL+offs not RAW address?");
+-#endif
+
+ // Avoid independent memory operations
+ Node* old_mem = mem;
+--- ./hotspot/src/share/vm/opto/node.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/node.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -27,6 +27,7 @@
+ #include "memory/allocation.inline.hpp"
+ #include "opto/cfgnode.hpp"
+ #include "opto/connode.hpp"
++#include "opto/loopnode.hpp"
+ #include "opto/machnode.hpp"
+ #include "opto/matcher.hpp"
+ #include "opto/node.hpp"
+@@ -1225,6 +1226,7 @@
+
+ Node *top = igvn->C->top();
+ nstack.push(dead);
++ bool has_irreducible_loop = igvn->C->has_irreducible_loop();
+
+ while (nstack.size() > 0) {
+ dead = nstack.pop();
+@@ -1239,13 +1241,31 @@
+ assert (!use->is_Con(), "Control for Con node should be Root node.");
+ use->set_req(0, top); // Cut dead edge to prevent processing
+ nstack.push(use); // the dead node again.
++ } else if (!has_irreducible_loop && // Backedge could be alive in irreducible loop
++ use->is_Loop() && !use->is_Root() && // Don't kill Root (RootNode extends LoopNode)
++ use->in(LoopNode::EntryControl) == dead) { // Dead loop if its entry is dead
++ use->set_req(LoopNode::EntryControl, top); // Cut dead edge to prevent processing
++ use->set_req(0, top); // Cut self edge
++ nstack.push(use);
+ } else { // Else found a not-dead user
++ // Dead if all inputs are top or null
++ bool dead_use = !use->is_Root(); // Keep empty graph alive
+ for (uint j = 1; j < use->req(); j++) {
+- if (use->in(j) == dead) { // Turn all dead inputs into TOP
++ Node* in = use->in(j);
++ if (in == dead) { // Turn all dead inputs into TOP
+ use->set_req(j, top);
++ } else if (in != NULL && !in->is_top()) {
++ dead_use = false;
+ }
+ }
+- igvn->_worklist.push(use);
++ if (dead_use) {
++ if (use->is_Region()) {
++ use->set_req(0, top); // Cut self edge
++ }
++ nstack.push(use);
++ } else {
++ igvn->_worklist.push(use);
++ }
+ }
+ // Refresh the iterator, since any number of kills might have happened.
+ k = dead->last_outs(kmin);
+--- ./hotspot/src/share/vm/opto/runtime.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/runtime.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1307,6 +1307,7 @@
+ // add counters so this is safe.
+ NamedCounter* head;
+ do {
++ c->set_next(NULL);
+ head = _named_counters;
+ c->set_next(head);
+ } while (Atomic::cmpxchg_ptr(c, &_named_counters, head) != head);
+--- ./hotspot/src/share/vm/opto/runtime.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/runtime.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -85,7 +85,7 @@
+
+ NamedCounter* next() const { return _next; }
+ void set_next(NamedCounter* next) {
+- assert(_next == NULL, "already set");
++ assert(_next == NULL || next == NULL, "already set");
+ _next = next;
+ }
+
+--- ./hotspot/src/share/vm/opto/superword.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/opto/superword.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1262,8 +1262,9 @@
+ memops.clear();
+ for (DUIterator i = upper_insert_pt->outs(); upper_insert_pt->has_out(i); i++) {
+ Node* use = upper_insert_pt->out(i);
+- if (!use->is_Store())
++ if (use->is_Mem() && !use->is_Store()) {
+ memops.push(use);
++ }
+ }
+
+ MemNode* lower_insert_pt = last;
+--- ./hotspot/src/share/vm/prims/jni.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/prims/jni.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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.
+ * Copyright (c) 2012 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+@@ -5037,6 +5037,7 @@
+ #include "gc_implementation/shared/gcTimer.hpp"
+ #include "gc_interface/collectedHeap.hpp"
+ #include "utilities/quickSort.hpp"
++#include "utilities/ostream.hpp"
+
+ #define run_unit_test(unit_test_function_call) \
+ tty->print_cr("Running test: " #unit_test_function_call); \
+@@ -5058,6 +5059,7 @@
+ run_unit_test(QuickSort::test_quick_sort());
+ run_unit_test(AltHashing::test_alt_hash());
+ run_unit_test(TestOldFreeSpaceCalculation_test());
++ run_unit_test(test_loggc_filename());
+ tty->print_cr("All internal VM tests passed");
+ }
+ }
+--- ./hotspot/src/share/vm/prims/jvm.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/prims/jvm.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -388,6 +388,23 @@
+ JVM_END
+
+
++/*
++ * Return the temporary directory that the VM uses for the attach
++ * and perf data files.
++ *
++ * It is important that this directory is well-known and the
++ * same for all VM instances. It cannot be affected by configuration
++ * variables such as java.io.tmpdir.
++ */
++JVM_ENTRY(jstring, JVM_GetTemporaryDirectory(JNIEnv *env))
++ JVMWrapper("JVM_GetTemporaryDirectory");
++ HandleMark hm(THREAD);
++ const char* temp_dir = os::get_temp_directory();
++ Handle h = java_lang_String::create_from_platform_dependent_str(temp_dir, CHECK_NULL);
++ return (jstring) JNIHandles::make_local(env, h());
++JVM_END
++
++
+ // java.lang.Runtime /////////////////////////////////////////////////////////////////////////
+
+ extern volatile jint vm_created;
+@@ -527,6 +544,12 @@
+ JavaThreadInObjectWaitState jtiows(thread, ms != 0);
+ if (JvmtiExport::should_post_monitor_wait()) {
+ JvmtiExport::post_monitor_wait((JavaThread *)THREAD, (oop)obj(), ms);
++
++ // The current thread already owns the monitor and it has not yet
++ // been added to the wait queue so the current thread cannot be
++ // made the successor. This means that the JVMTI_EVENT_MONITOR_WAIT
++ // event handler cannot accidentally consume an unpark() meant for
++ // the ParkEvent associated with this ObjectMonitor.
+ }
+ ObjectSynchronizer::wait(obj, ms, THREAD);
+ JVM_END
+--- ./hotspot/src/share/vm/prims/jvm.h Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/prims/jvm.h Mon Jan 05 11:51:17 2015 -0800
+@@ -1477,6 +1477,9 @@
+ JNIEXPORT jobject JNICALL
+ JVM_InitAgentProperties(JNIEnv *env, jobject agent_props);
+
++JNIEXPORT jstring JNICALL
++JVM_GetTemporaryDirectory(JNIEnv *env);
++
+ /* Generics reflection support.
+ *
+ * Returns information about the given class's EnclosingMethod
+--- ./hotspot/src/share/vm/prims/jvmtiEnvBase.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/prims/jvmtiEnvBase.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -400,7 +400,11 @@
+ VMOp_Type type() const { return VMOp_GetCurrentContendedMonitor; }
+ jvmtiError result() { return _result; }
+ void doit() {
+- _result = ((JvmtiEnvBase *)_env)->get_current_contended_monitor(_calling_thread,_java_thread,_owned_monitor_ptr);
++ _result = JVMTI_ERROR_THREAD_NOT_ALIVE;
++ if (Threads::includes(_java_thread) && !_java_thread->is_exiting() &&
++ _java_thread->threadObj() != NULL) {
++ _result = ((JvmtiEnvBase *)_env)->get_current_contended_monitor(_calling_thread,_java_thread,_owned_monitor_ptr);
++ }
+ }
+ };
+
+--- ./hotspot/src/share/vm/runtime/arguments.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/runtime/arguments.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -55,7 +55,7 @@
+ #endif
+
+ // Note: This is a special bug reporting site for the JVM
+-#define DEFAULT_VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/crash.jsp"
++#define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp"
+ #define DEFAULT_JAVA_LAUNCHER "generic"
+
+ char** Arguments::_jvm_flags_array = NULL;
+@@ -1758,24 +1758,22 @@
+ // check if do gclog rotation
+ // +UseGCLogFileRotation is a must,
+ // no gc log rotation when log file not supplied or
+-// NumberOfGCLogFiles is 0, or GCLogFileSize is 0
++// NumberOfGCLogFiles is 0
+ void check_gclog_consistency() {
+ if (UseGCLogFileRotation) {
+- if ((Arguments::gc_log_filename() == NULL) ||
+- (NumberOfGCLogFiles == 0) ||
+- (GCLogFileSize == 0)) {
++ if ((Arguments::gc_log_filename() == NULL) || (NumberOfGCLogFiles == 0)) {
+ jio_fprintf(defaultStream::output_stream(),
+- "To enable GC log rotation, use -Xloggc:<filename> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=<num_of_files> -XX:GCLogFileSize=<num_of_size>\n"
+- "where num_of_file > 0 and num_of_size > 0\n"
++ "To enable GC log rotation, use -Xloggc:<filename> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=<num_of_files>\n"
++ "where num_of_file > 0\n"
+ "GC log rotation is turned off\n");
+ UseGCLogFileRotation = false;
+ }
+ }
+
+- if (UseGCLogFileRotation && GCLogFileSize < 8*K) {
+- FLAG_SET_CMDLINE(uintx, GCLogFileSize, 8*K);
+- jio_fprintf(defaultStream::output_stream(),
+- "GCLogFileSize changed to minimum 8K\n");
++ if (UseGCLogFileRotation && (GCLogFileSize != 0) && (GCLogFileSize < 8*K)) {
++ FLAG_SET_CMDLINE(uintx, GCLogFileSize, 8*K);
++ jio_fprintf(defaultStream::output_stream(),
++ "GCLogFileSize changed to minimum 8K\n");
+ }
+ }
+
+@@ -1807,6 +1805,51 @@
+ return true;
+ }
+
++// This function is called for -Xloggc:<filename>, it can be used
++// to check if a given file name(or string) conforms to the following
++// specification:
++// A valid string only contains "[A-Z][a-z][0-9].-_%[p|t]"
++// %p and %t only allowed once. We only limit usage of filename not path
++bool is_filename_valid(const char *file_name) {
++ const char* p = file_name;
++ char file_sep = os::file_separator()[0];
++ const char* cp;
++ // skip prefix path
++ for (cp = file_name; *cp != '\0'; cp++) {
++ if (*cp == '/' || *cp == file_sep) {
++ p = cp + 1;
++ }
++ }
++
++ int count_p = 0;
++ int count_t = 0;
++ while (*p != '\0') {
++ if ((*p >= '0' && *p <= '9') ||
++ (*p >= 'A' && *p <= 'Z') ||
++ (*p >= 'a' && *p <= 'z') ||
++ *p == '-' ||
++ *p == '_' ||
++ *p == '.') {
++ p++;
++ continue;
++ }
++ if (*p == '%') {
++ if(*(p + 1) == 'p') {
++ p += 2;
++ count_p ++;
++ continue;
++ }
++ if (*(p + 1) == 't') {
++ p += 2;
++ count_t ++;
++ continue;
++ }
++ }
++ return false;
++ }
++ return count_p < 2 && count_t < 2;
++}
++
+ // Check consistency of GC selection
+ bool Arguments::check_gc_consistency() {
+ check_gclog_consistency();
+@@ -2398,7 +2441,7 @@
+ (size_t)InitialCodeCacheSize);
+ if (errcode != arg_in_range) {
+ jio_fprintf(defaultStream::error_stream(),
+- "Invalid maximum code cache size: %s. Should be greater than InitialCodeCacheSize=%dK\n",
++ "Invalid maximum code cache size: %s. Should be greater than or equal to InitialCodeCacheSize=%dK\n",
+ option->optionString, InitialCodeCacheSize/K);
+ describe_range_error(errcode);
+ return JNI_EINVAL;
+@@ -2524,6 +2567,13 @@
+ // ostream_init_log(), when called will use this filename
+ // to initialize a fileStream.
+ _gc_log_filename = strdup(tail);
++ if (!is_filename_valid(_gc_log_filename)) {
++ jio_fprintf(defaultStream::output_stream(),
++ "Invalid file name for use with -Xloggc: Filename can only contain the "
++ "characters [A-Z][a-z][0-9]-_.%%[p|t] but it has been %s\n"
++ "Note %%p or %%t can only be used once\n", _gc_log_filename);
++ return JNI_EINVAL;
++ }
+ FLAG_SET_CMDLINE(bool, PrintGC, true);
+ FLAG_SET_CMDLINE(bool, PrintGCTimeStamps, true);
+
+@@ -3288,9 +3338,6 @@
+ #endif // CC_INTERP
+
+ #ifdef COMPILER2
+- if (!UseBiasedLocking || EmitSync != 0) {
+- UseOptoBiasInlining = false;
+- }
+ if (!EliminateLocks) {
+ EliminateNestedLocks = false;
+ }
+@@ -3334,6 +3381,12 @@
+ }
+ }
+
++#ifdef COMPILER2
++ if (!UseBiasedLocking || EmitSync != 0) {
++ UseOptoBiasInlining = false;
++ }
++#endif
++
+ // set PauseAtExit if the gamma launcher was used and a debugger is attached
+ // but only if not already set on the commandline
+ if (Arguments::created_by_gamma_launcher() && os::is_debugger_attached()) {
+--- ./hotspot/src/share/vm/runtime/globals.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/runtime/globals.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -1204,7 +1204,7 @@
+ "Decay time (in milliseconds) to re-enable bulk rebiasing of a " \
+ "type after previous bulk rebias") \
+ \
+- develop(bool, JavaObjectsInPerm, false, \
++ diagnostic(bool, JavaObjectsInPerm, false, \
+ "controls whether Classes and interned Strings are allocated" \
+ "in perm. This purely intended to allow debugging issues" \
+ "in production.") \
+@@ -2339,9 +2339,9 @@
+ "Number of gclog files in rotation, " \
+ "Default: 0, no rotation") \
+ \
+- product(uintx, GCLogFileSize, 0, \
+- "GC log file size, Default: 0 bytes, no rotation " \
+- "Only valid with UseGCLogFileRotation") \
++ product(uintx, GCLogFileSize, 8*K, \
++ "GC log file size, requires UseGCLogFileRotation. " \
++ "Set to 0 to only trigger rotation via jcmd") \
+ \
+ /* JVMTI heap profiling */ \
+ \
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2013, 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
+@@ -385,6 +385,12 @@
+ DTRACE_MONITOR_PROBE(contended__enter, this, object(), jt);
+ if (JvmtiExport::should_post_monitor_contended_enter()) {
+ JvmtiExport::post_monitor_contended_enter(jt, this);
++
++ // The current thread does not yet own the monitor and does not
++ // yet appear on any queues that would get it made the successor.
++ // This means that the JVMTI_EVENT_MONITOR_CONTENDED_ENTER event
++ // handler cannot accidentally consume an unpark() meant for the
++ // ParkEvent associated with this ObjectMonitor.
+ }
+
+ OSThreadContendState osts(Self->osthread());
+@@ -442,6 +448,12 @@
+ DTRACE_MONITOR_PROBE(contended__entered, this, object(), jt);
+ if (JvmtiExport::should_post_monitor_contended_entered()) {
+ JvmtiExport::post_monitor_contended_entered(jt, this);
++
++ // The current thread already owns the monitor and is not going to
++ // call park() for the remainder of the monitor enter protocol. So
++ // it doesn't matter if the JVMTI_EVENT_MONITOR_CONTENDED_ENTERED
++ // event handler consumed an unpark() issued by the thread that
++ // just exited the monitor.
+ }
+
+ if (event.should_commit()) {
+@@ -1459,6 +1471,14 @@
+ // Note: 'false' parameter is passed here because the
+ // wait was not timed out due to thread interrupt.
+ JvmtiExport::post_monitor_waited(jt, this, false);
++
++ // In this short circuit of the monitor wait protocol, the
++ // current thread never drops ownership of the monitor and
++ // never gets added to the wait queue so the current thread
++ // cannot be made the successor. This means that the
++ // JVMTI_EVENT_MONITOR_WAITED event handler cannot accidentally
++ // consume an unpark() meant for the ParkEvent associated with
++ // this ObjectMonitor.
+ }
+ if (event.should_commit()) {
+ post_monitor_wait_event(&event, 0, millis, false);
+@@ -1502,21 +1522,6 @@
+ exit (true, Self) ; // exit the monitor
+ guarantee (_owner != Self, "invariant") ;
+
+- // As soon as the ObjectMonitor's ownership is dropped in the exit()
+- // call above, another thread can enter() the ObjectMonitor, do the
+- // notify(), and exit() the ObjectMonitor. If the other thread's
+- // exit() call chooses this thread as the successor and the unpark()
+- // call happens to occur while this thread is posting a
+- // MONITOR_CONTENDED_EXIT event, then we run the risk of the event
+- // handler using RawMonitors and consuming the unpark().
+- //
+- // To avoid the problem, we re-post the event. This does no harm
+- // even if the original unpark() was not consumed because we are the
+- // chosen successor for this monitor.
+- if (node._notified != 0 && _succ == Self) {
+- node._event->unpark();
+- }
+-
+ // The thread is on the WaitSet list - now park() it.
+ // On MP systems it's conceivable that a brief spin before we park
+ // could be profitable.
+@@ -1600,6 +1605,33 @@
+ JvmtiExport::post_monitor_waited(jt, this, ret == OS_TIMEOUT);
+ }
+
++ // Without the fix for 8028280, it is possible for the above call:
++ //
++ // Thread::SpinAcquire (&_WaitSetLock, "WaitSet - unlink") ;
++ //
++ // to consume the unpark() that was done when the successor was set.
++ // The solution for this very rare possibility is to redo the unpark()
++ // outside of the JvmtiExport::should_post_monitor_waited() check.
++ //
++ if (node._notified != 0 && _succ == Self) {
++ // In this part of the monitor wait-notify-reenter protocol it
++ // is possible (and normal) for another thread to do a fastpath
++ // monitor enter-exit while this thread is still trying to get
++ // to the reenter portion of the protocol.
++ //
++ // The ObjectMonitor was notified and the current thread is
++ // the successor which also means that an unpark() has already
++ // been done. The JVMTI_EVENT_MONITOR_WAITED event handler can
++ // consume the unpark() that was done when the successor was
++ // set because the same ParkEvent is shared between Java
++ // monitors and JVM/TI RawMonitors (for now).
++ //
++ // We redo the unpark() to ensure forward progress, i.e., we
++ // don't want all pending threads hanging (parked) with none
++ // entering the unlocked monitor.
++ node._event->unpark();
++ }
++
+ if (event.should_commit()) {
+ post_monitor_wait_event(&event, node._notifier_tid, millis, ret == OS_TIMEOUT);
+ }
+--- ./hotspot/src/share/vm/runtime/safepoint.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/runtime/safepoint.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -545,7 +545,7 @@
+
+ // rotate log files?
+ if (UseGCLogFileRotation) {
+- gclog_or_tty->rotate_log();
++ gclog_or_tty->rotate_log(false);
+ }
+
+ if (MemTracker::is_on()) {
+--- ./hotspot/src/share/vm/runtime/vmStructs.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -706,6 +706,7 @@
+ static_field(SystemDictionary, WK_KLASS(WeakReference_klass), klassOop) \
+ static_field(SystemDictionary, WK_KLASS(FinalReference_klass), klassOop) \
+ static_field(SystemDictionary, WK_KLASS(PhantomReference_klass), klassOop) \
++ static_field(SystemDictionary, WK_KLASS(Cleaner_klass), klassOop) \
+ static_field(SystemDictionary, WK_KLASS(Finalizer_klass), klassOop) \
+ static_field(SystemDictionary, WK_KLASS(Thread_klass), klassOop) \
+ static_field(SystemDictionary, WK_KLASS(ThreadGroup_klass), klassOop) \
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -327,6 +327,9 @@
+ _terminate_lock->notify();
+ }
+
++ // Thread destructor usually does this.
++ ThreadLocalStorage::set_thread(NULL);
++
+ // Deletion must be done synchronously by the JNI DestroyJavaVM thread
+ // so that the VMThread deletion completes before the main thread frees
+ // up the CodeHeap.
+--- ./hotspot/src/share/vm/runtime/vm_operations.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/runtime/vm_operations.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -96,6 +96,7 @@
+ template(JFRCheckpoint) \
+ template(Exit) \
+ template(LinuxDllLoad) \
++ template(RotateGCLog) \
+
+ class VM_Operation: public CHeapObj<mtInternal> {
+ public:
+@@ -409,4 +410,15 @@
+ void doit();
+ };
+
++
++class VM_RotateGCLog: public VM_Operation {
++ private:
++ outputStream* _out;
++
++ public:
++ VM_RotateGCLog(outputStream* st) : _out(st) {}
++ VMOp_Type type() const { return VMOp_RotateGCLog; }
++ void doit() { gclog_or_tty->rotate_log(true, _out); }
++};
++
+ #endif // SHARE_VM_RUNTIME_VM_OPERATIONS_HPP
+--- ./hotspot/src/share/vm/services/diagnosticCommand.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/services/diagnosticCommand.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -51,7 +51,7 @@
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartRemoteDCmd>(true,false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartLocalDCmd>(true,false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStopRemoteDCmd>(true,false));
+-
++ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RotateGCLogDCmd>(true, false));
+ }
+
+ #ifndef HAVE_EXTRA_DCMD
+@@ -565,3 +565,11 @@
+ JavaCalls::call_static(&result, ik, vmSymbols::stopRemoteAgent_name(), vmSymbols::void_method_signature(), CHECK);
+ }
+
++void RotateGCLogDCmd::execute(TRAPS) {
++ if (UseGCLogFileRotation) {
++ VM_RotateGCLog rotateop(output());
++ VMThread::execute(&rotateop);
++ } else {
++ output()->print_cr("Target VM does not support GC log file rotation.");
++ }
++}
+--- ./hotspot/src/share/vm/services/diagnosticCommand.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/services/diagnosticCommand.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2011, 2012, 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
+@@ -302,4 +302,14 @@
+ virtual void execute(TRAPS);
+ };
+
++class RotateGCLogDCmd : public DCmd {
++public:
++ RotateGCLogDCmd(outputStream* output, bool heap) : DCmd(output, heap) {}
++ static const char* name() { return "GC.rotate_log"; }
++ static const char* description() {
++ return "Force the GC log file to be rotated.";
++ }
++ virtual void execute(TRAPS);
++};
++
+ #endif // SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_HPP
+--- ./hotspot/src/share/vm/services/heapDumper.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/services/heapDumper.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -720,7 +720,7 @@
+
+ // reflection and sun.misc.Unsafe classes may have a reference to a
+ // klassOop so filter it out.
+- if (o != NULL && o->is_klass()) {
++ if (o != NULL && o->is_perm() && o->is_klass()) {
+ o = NULL;
+ }
+
+--- ./hotspot/src/share/vm/utilities/defaultStream.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/utilities/defaultStream.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -41,6 +41,8 @@
+
+ void init();
+ void init_log();
++ fileStream* open_file(const char* log_name);
++ void start_log();
+ void finish_log();
+ void finish_log_on_error(char *buf, int buflen);
+ public:
+--- ./hotspot/src/share/vm/utilities/ostream.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/utilities/ostream.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -341,7 +341,7 @@
+ }
+
+ char* stringStream::as_string() {
+- char* copy = NEW_RESOURCE_ARRAY(char, buffer_pos+1);
++ char* copy = NEW_RESOURCE_ARRAY(char, buffer_pos + 1);
+ strncpy(copy, buffer, buffer_pos);
+ copy[buffer_pos] = 0; // terminating null
+ return copy;
+@@ -354,14 +354,148 @@
+ outputStream* gclog_or_tty;
+ extern Mutex* tty_lock;
+
++#define EXTRACHARLEN 32
++#define CURRENTAPPX ".current"
++#define FILENAMEBUFLEN 1024
++// convert YYYY-MM-DD HH:MM:SS to YYYY-MM-DD_HH-MM-SS
++char* get_datetime_string(char *buf, size_t len) {
++ os::local_time_string(buf, len);
++ int i = (int)strlen(buf);
++ while (i-- >= 0) {
++ if (buf[i] == ' ') buf[i] = '_';
++ else if (buf[i] == ':') buf[i] = '-';
++ }
++ return buf;
++}
++
++static const char* make_log_name_internal(const char* log_name, const char* force_directory,
++ int pid, const char* tms) {
++ const char* basename = log_name;
++ char file_sep = os::file_separator()[0];
++ const char* cp;
++ char pid_text[32];
++
++ for (cp = log_name; *cp != '\0'; cp++) {
++ if (*cp == '/' || *cp == file_sep) {
++ basename = cp + 1;
++ }
++ }
++ const char* nametail = log_name;
++ // Compute buffer length
++ size_t buffer_length;
++ if (force_directory != NULL) {
++ buffer_length = strlen(force_directory) + strlen(os::file_separator()) +
++ strlen(basename) + 1;
++ } else {
++ buffer_length = strlen(log_name) + 1;
++ }
++
++ // const char* star = strchr(basename, '*');
++ const char* pts = strstr(basename, "%p");
++ int pid_pos = (pts == NULL) ? -1 : (pts - nametail);
++
++ if (pid_pos >= 0) {
++ jio_snprintf(pid_text, sizeof(pid_text), "pid%u", pid);
++ buffer_length += strlen(pid_text);
++ }
++
++ pts = strstr(basename, "%t");
++ int tms_pos = (pts == NULL) ? -1 : (pts - nametail);
++ if (tms_pos >= 0) {
++ buffer_length += strlen(tms);
++ }
++
++ // File name is too long.
++ if (buffer_length > JVM_MAXPATHLEN) {
++ return NULL;
++ }
++
++ // Create big enough buffer.
++ char *buf = NEW_C_HEAP_ARRAY(char, buffer_length, mtInternal);
++
++ strcpy(buf, "");
++ if (force_directory != NULL) {
++ strcat(buf, force_directory);
++ strcat(buf, os::file_separator());
++ nametail = basename; // completely skip directory prefix
++ }
++
++ // who is first, %p or %t?
++ int first = -1, second = -1;
++ const char *p1st = NULL;
++ const char *p2nd = NULL;
++
++ if (pid_pos >= 0 && tms_pos >= 0) {
++ // contains both %p and %t
++ if (pid_pos < tms_pos) {
++ // case foo%pbar%tmonkey.log
++ first = pid_pos;
++ p1st = pid_text;
++ second = tms_pos;
++ p2nd = tms;
++ } else {
++ // case foo%tbar%pmonkey.log
++ first = tms_pos;
++ p1st = tms;
++ second = pid_pos;
++ p2nd = pid_text;
++ }
++ } else if (pid_pos >= 0) {
++ // contains %p only
++ first = pid_pos;
++ p1st = pid_text;
++ } else if (tms_pos >= 0) {
++ // contains %t only
++ first = tms_pos;
++ p1st = tms;
++ }
++
++ int buf_pos = (int)strlen(buf);
++ const char* tail = nametail;
++
++ if (first >= 0) {
++ tail = nametail + first + 2;
++ strncpy(&buf[buf_pos], nametail, first);
++ strcpy(&buf[buf_pos + first], p1st);
++ buf_pos = (int)strlen(buf);
++ if (second >= 0) {
++ strncpy(&buf[buf_pos], tail, second - first - 2);
++ strcpy(&buf[buf_pos + second - first - 2], p2nd);
++ tail = nametail + second + 2;
++ }
++ }
++ strcat(buf, tail); // append rest of name, or all of name
++ return buf;
++}
++
++// log_name comes from -XX:LogFile=log_name or -Xloggc:log_name
++// in log_name, %p => pipd1234 and
++// %t => YYYY-MM-DD_HH-MM-SS
++static const char* make_log_name(const char* log_name, const char* force_directory) {
++ char timestr[32];
++ get_datetime_string(timestr, sizeof(timestr));
++ return make_log_name_internal(log_name, force_directory, os::current_process_id(),
++ timestr);
++}
++
+ fileStream::fileStream(const char* file_name) {
+ _file = fopen(file_name, "w");
+- _need_close = true;
++ if (_file != NULL) {
++ _need_close = true;
++ } else {
++ warning("Cannot open file %s due to %s\n", file_name, strerror(errno));
++ _need_close = false;
++ }
+ }
+
+ fileStream::fileStream(const char* file_name, const char* opentype) {
+ _file = fopen(file_name, opentype);
+- _need_close = true;
++ if (_file != NULL) {
++ _need_close = true;
++ } else {
++ warning("Cannot open file %s due to %s\n", file_name, strerror(errno));
++ _need_close = false;
++ }
+ }
+
+ void fileStream::write(const char* s, size_t len) {
+@@ -422,34 +556,51 @@
+ update_position(s, len);
+ }
+
+-rotatingFileStream::~rotatingFileStream() {
++// dump vm version, os version, platform info, build id,
++// memory usage and command line flags into header
++void gcLogFileStream::dump_loggc_header() {
++ if (is_open()) {
++ print_cr(Abstract_VM_Version::internal_vm_info_string());
++ os::print_memory_info(this);
++ print("CommandLine flags: ");
++ CommandLineFlags::printSetFlags(this);
++ }
++}
++
++gcLogFileStream::~gcLogFileStream() {
+ if (_file != NULL) {
+ if (_need_close) fclose(_file);
+- _file = NULL;
++ _file = NULL;
++ }
++ if (_file_name != NULL) {
+ FREE_C_HEAP_ARRAY(char, _file_name, mtInternal);
+ _file_name = NULL;
+ }
+ }
+
+-rotatingFileStream::rotatingFileStream(const char* file_name) {
++gcLogFileStream::gcLogFileStream(const char* file_name) {
+ _cur_file_num = 0;
+ _bytes_written = 0L;
+- _file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10, mtInternal);
+- jio_snprintf(_file_name, strlen(file_name)+10, "%s.%d", file_name, _cur_file_num);
+- _file = fopen(_file_name, "w");
+- _need_close = true;
++ _file_name = make_log_name(file_name, NULL);
++
++ // gc log file rotation
++ if (UseGCLogFileRotation && NumberOfGCLogFiles > 1) {
++ char tempbuf[FILENAMEBUFLEN];
++ jio_snprintf(tempbuf, sizeof(tempbuf), "%s.%d" CURRENTAPPX, _file_name, _cur_file_num);
++ _file = fopen(tempbuf, "w");
++ } else {
++ _file = fopen(_file_name, "w");
++ }
++ if (_file != NULL) {
++ _need_close = true;
++ dump_loggc_header();
++ } else {
++ warning("Cannot open file %s due to %s\n", _file_name, strerror(errno));
++ _need_close = false;
++ }
+ }
+
+-rotatingFileStream::rotatingFileStream(const char* file_name, const char* opentype) {
+- _cur_file_num = 0;
+- _bytes_written = 0L;
+- _file_name = NEW_C_HEAP_ARRAY(char, strlen(file_name)+10, mtInternal);
+- jio_snprintf(_file_name, strlen(file_name)+10, "%s.%d", file_name, _cur_file_num);
+- _file = fopen(_file_name, opentype);
+- _need_close = true;
+-}
+-
+-void rotatingFileStream::write(const char* s, size_t len) {
++void gcLogFileStream::write(const char* s, size_t len) {
+ if (_file != NULL) {
+ size_t count = fwrite(s, 1, len, _file);
+ _bytes_written += count;
+@@ -465,8 +616,13 @@
+ // write to gc log file at safepoint. If in future, changes made for mutator threads or
+ // concurrent GC threads to run parallel with VMThread at safepoint, write and rotate_log
+ // must be synchronized.
+-void rotatingFileStream::rotate_log() {
+- if (_bytes_written < (jlong)GCLogFileSize) {
++void gcLogFileStream::rotate_log(bool force, outputStream* out) {
++ char time_msg[FILENAMEBUFLEN];
++ char time_str[EXTRACHARLEN];
++ char current_file_name[FILENAMEBUFLEN];
++ char renamed_file_name[FILENAMEBUFLEN];
++
++ if (!should_rotate(force)) {
+ return;
+ }
+
+@@ -480,27 +636,105 @@
+ // rotate in same file
+ rewind();
+ _bytes_written = 0L;
++ jio_snprintf(time_msg, sizeof(time_msg), "File %s rotated at %s\n",
++ _file_name, os::local_time_string((char *)time_str, sizeof(time_str)));
++ write(time_msg, strlen(time_msg));
++
++ if (out != NULL) {
++ out->print(time_msg);
++ }
++
++ dump_loggc_header();
+ return;
+ }
+
+- // rotate file in names file.0, file.1, file.2, ..., file.<MaxGCLogFileNumbers-1>
+- // close current file, rotate to next file
++#if defined(_WINDOWS)
++#ifndef F_OK
++#define F_OK 0
++#endif
++#endif // _WINDOWS
++
++ // rotate file in names extended_filename.0, extended_filename.1, ...,
++ // extended_filename.<NumberOfGCLogFiles - 1>. Current rotation file name will
++ // have a form of extended_filename.<i>.current where i is the current rotation
++ // file number. After it reaches max file size, the file will be saved and renamed
++ // with .current removed from its tail.
++ size_t filename_len = strlen(_file_name);
+ if (_file != NULL) {
+- _cur_file_num ++;
+- if (_cur_file_num >= NumberOfGCLogFiles) _cur_file_num = 0;
+- jio_snprintf(_file_name, strlen(Arguments::gc_log_filename()) + 10, "%s.%d",
+- Arguments::gc_log_filename(), _cur_file_num);
++ jio_snprintf(renamed_file_name, filename_len + EXTRACHARLEN, "%s.%d",
++ _file_name, _cur_file_num);
++ jio_snprintf(current_file_name, filename_len + EXTRACHARLEN, "%s.%d" CURRENTAPPX,
++ _file_name, _cur_file_num);
++
++ const char* msg = force ? "GC log rotation request has been received."
++ : "GC log file has reached the maximum size.";
++ jio_snprintf(time_msg, sizeof(time_msg), "%s %s Saved as %s\n",
++ os::local_time_string((char *)time_str, sizeof(time_str)),
++ msg, renamed_file_name);
++ write(time_msg, strlen(time_msg));
++
++ if (out != NULL) {
++ out->print(time_msg);
++ }
++
+ fclose(_file);
+ _file = NULL;
++
++ bool can_rename = true;
++ if (access(current_file_name, F_OK) != 0) {
++ // current file does not exist?
++ warning("No source file exists, cannot rename\n");
++ can_rename = false;
++ }
++ if (can_rename) {
++ if (access(renamed_file_name, F_OK) == 0) {
++ if (remove(renamed_file_name) != 0) {
++ warning("Could not delete existing file %s\n", renamed_file_name);
++ can_rename = false;
++ }
++ } else {
++ // file does not exist, ok to rename
++ }
++ }
++ if (can_rename && rename(current_file_name, renamed_file_name) != 0) {
++ warning("Could not rename %s to %s\n", _file_name, renamed_file_name);
++ }
+ }
+- _file = fopen(_file_name, "w");
++
++ _cur_file_num++;
++ if (_cur_file_num > NumberOfGCLogFiles - 1) _cur_file_num = 0;
++ jio_snprintf(current_file_name, filename_len + EXTRACHARLEN, "%s.%d" CURRENTAPPX,
++ _file_name, _cur_file_num);
++ _file = fopen(current_file_name, "w");
++
+ if (_file != NULL) {
+ _bytes_written = 0L;
+ _need_close = true;
++ // reuse current_file_name for time_msg
++ jio_snprintf(current_file_name, filename_len + EXTRACHARLEN,
++ "%s.%d", _file_name, _cur_file_num);
++ jio_snprintf(time_msg, sizeof(time_msg), "%s GC log file created %s\n",
++ os::local_time_string((char *)time_str, sizeof(time_str)),
++ current_file_name);
++ write(time_msg, strlen(time_msg));
++
++ if (out != NULL) {
++ out->print(time_msg);
++ }
++
++ dump_loggc_header();
++ // remove the existing file
++ if (access(current_file_name, F_OK) == 0) {
++ if (remove(current_file_name) != 0) {
++ warning("Could not delete existing file %s\n", current_file_name);
++ }
++ }
+ } else {
+- tty->print_cr("failed to open rotation log file %s due to %s\n",
++ warning("failed to open rotation log file %s due to %s\n"
++ "Turned off GC log file rotation\n",
+ _file_name, strerror(errno));
+ _need_close = false;
++ FLAG_SET_DEFAULT(UseGCLogFileRotation, false);
+ }
+ }
+
+@@ -529,147 +763,55 @@
+ return _log_file != NULL;
+ }
+
+-static const char* make_log_name(const char* log_name, const char* force_directory) {
+- const char* basename = log_name;
+- char file_sep = os::file_separator()[0];
+- const char* cp;
+- for (cp = log_name; *cp != '\0'; cp++) {
+- if (*cp == '/' || *cp == file_sep) {
+- basename = cp+1;
+- }
+- }
+- const char* nametail = log_name;
+-
+- // Compute buffer length
+- size_t buffer_length;
+- if (force_directory != NULL) {
+- buffer_length = strlen(force_directory) + strlen(os::file_separator()) +
+- strlen(basename) + 1;
+- } else {
+- buffer_length = strlen(log_name) + 1;
++fileStream* defaultStream::open_file(const char* log_name) {
++ const char* try_name = make_log_name(log_name, NULL);
++ if (try_name == NULL) {
++ warning("Cannot open file %s: file name is too long.\n", log_name);
++ return NULL;
+ }
+
+- const char* star = strchr(basename, '*');
+- int star_pos = (star == NULL) ? -1 : (star - nametail);
+- int skip = 1;
+- if (star == NULL) {
+- // Try %p
+- star = strstr(basename, "%p");
+- if (star != NULL) {
+- skip = 2;
+- }
+- }
+- star_pos = (star == NULL) ? -1 : (star - nametail);
+-
+- char pid[32];
+- if (star_pos >= 0) {
+- jio_snprintf(pid, sizeof(pid), "%u", os::current_process_id());
+- buffer_length += strlen(pid);
++ fileStream* file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name);
++ FREE_C_HEAP_ARRAY(char, try_name, mtInternal);
++ if (file->is_open()) {
++ return file;
+ }
+
+- // Create big enough buffer.
+- char *buf = NEW_C_HEAP_ARRAY(char, buffer_length, mtInternal);
+-
+- strcpy(buf, "");
+- if (force_directory != NULL) {
+- strcat(buf, force_directory);
+- strcat(buf, os::file_separator());
+- nametail = basename; // completely skip directory prefix
++ // Try again to open the file in the temp directory.
++ delete file;
++ char warnbuf[O_BUFLEN*2];
++ jio_snprintf(warnbuf, sizeof(warnbuf), "Warning: Cannot open log file: %s\n", log_name);
++ // Note: This feature is for maintainer use only. No need for L10N.
++ jio_print(warnbuf);
++ try_name = make_log_name(log_name, os::get_temp_directory());
++ if (try_name == NULL) {
++ warning("Cannot open file %s: file name is too long for directory %s.\n", log_name, os::get_temp_directory());
++ return NULL;
+ }
+
+- if (star_pos >= 0) {
+- // convert foo*bar.log or foo%pbar.log to foo123bar.log
+- int buf_pos = (int) strlen(buf);
+- strncpy(&buf[buf_pos], nametail, star_pos);
+- strcpy(&buf[buf_pos + star_pos], pid);
+- nametail += star_pos + skip; // skip prefix and pid format
++ jio_snprintf(warnbuf, sizeof(warnbuf),
++ "Warning: Forcing option -XX:LogFile=%s\n", try_name);
++ jio_print(warnbuf);
++
++ file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name);
++ FREE_C_HEAP_ARRAY(char, try_name, mtInternal);
++ if (file->is_open()) {
++ return file;
+ }
+
+- strcat(buf, nametail); // append rest of name, or all of name
+- return buf;
++ delete file;
++ return NULL;
+ }
+
+ void defaultStream::init_log() {
+ // %%% Need a MutexLocker?
+ const char* log_name = LogFile != NULL ? LogFile : "hotspot.log";
+- const char* try_name = make_log_name(log_name, NULL);
+- fileStream* file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name);
+- if (!file->is_open()) {
+- // Try again to open the file.
+- char warnbuf[O_BUFLEN*2];
+- jio_snprintf(warnbuf, sizeof(warnbuf),
+- "Warning: Cannot open log file: %s\n", try_name);
+- // Note: This feature is for maintainer use only. No need for L10N.
+- jio_print(warnbuf);
+- FREE_C_HEAP_ARRAY(char, try_name, mtInternal);
+- try_name = make_log_name("hs_pid%p.log", os::get_temp_directory());
+- jio_snprintf(warnbuf, sizeof(warnbuf),
+- "Warning: Forcing option -XX:LogFile=%s\n", try_name);
+- jio_print(warnbuf);
+- delete file;
+- file = new(ResourceObj::C_HEAP, mtInternal) fileStream(try_name);
+- FREE_C_HEAP_ARRAY(char, try_name, mtInternal);
+- }
+- if (file->is_open()) {
++ fileStream* file = open_file(log_name);
++
++ if (file != NULL) {
+ _log_file = file;
+- xmlStream* xs = new(ResourceObj::C_HEAP, mtInternal) xmlStream(file);
+- _outer_xmlStream = xs;
+- if (this == tty) xtty = xs;
+- // Write XML header.
+- xs->print_cr("<?xml version='1.0' encoding='UTF-8'?>");
+- // (For now, don't bother to issue a DTD for this private format.)
+- jlong time_ms = os::javaTimeMillis() - tty->time_stamp().milliseconds();
+- // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
+- // we ever get round to introduce that method on the os class
+- xs->head("hotspot_log version='%d %d'"
+- " process='%d' time_ms='"INT64_FORMAT"'",
+- LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
+- os::current_process_id(), time_ms);
+- // Write VM version header immediately.
+- xs->head("vm_version");
+- xs->head("name"); xs->text("%s", VM_Version::vm_name()); xs->cr();
+- xs->tail("name");
+- xs->head("release"); xs->text("%s", VM_Version::vm_release()); xs->cr();
+- xs->tail("release");
+- xs->head("info"); xs->text("%s", VM_Version::internal_vm_info_string()); xs->cr();
+- xs->tail("info");
+- xs->tail("vm_version");
+- // Record information about the command-line invocation.
+- xs->head("vm_arguments"); // Cf. Arguments::print_on()
+- if (Arguments::num_jvm_flags() > 0) {
+- xs->head("flags");
+- Arguments::print_jvm_flags_on(xs->text());
+- xs->tail("flags");
+- }
+- if (Arguments::num_jvm_args() > 0) {
+- xs->head("args");
+- Arguments::print_jvm_args_on(xs->text());
+- xs->tail("args");
+- }
+- if (Arguments::java_command() != NULL) {
+- xs->head("command"); xs->text()->print_cr("%s", Arguments::java_command());
+- xs->tail("command");
+- }
+- if (Arguments::sun_java_launcher() != NULL) {
+- xs->head("launcher"); xs->text()->print_cr("%s", Arguments::sun_java_launcher());
+- xs->tail("launcher");
+- }
+- if (Arguments::system_properties() != NULL) {
+- xs->head("properties");
+- // Print it as a java-style property list.
+- // System properties don't generally contain newlines, so don't bother with unparsing.
+- for (SystemProperty* p = Arguments::system_properties(); p != NULL; p = p->next()) {
+- xs->text()->print_cr("%s=%s", p->key(), p->value());
+- }
+- xs->tail("properties");
+- }
+- xs->tail("vm_arguments");
+- // tty output per se is grouped under the <tty>...</tty> element.
+- xs->head("tty");
+- // All further non-markup text gets copied to the tty:
+- xs->_text = this; // requires friend declaration!
++ _outer_xmlStream = new(ResourceObj::C_HEAP, mtInternal) xmlStream(file);
++ start_log();
+ } else {
+- delete(file);
+ // and leave xtty as NULL
+ LogVMOutput = false;
+ DisplayVMOutput = true;
+@@ -677,6 +819,64 @@
+ }
+ }
+
++void defaultStream::start_log() {
++ xmlStream* xs = _outer_xmlStream;
++ if (this == tty) xtty = xs;
++ // Write XML header.
++ xs->print_cr("<?xml version='1.0' encoding='UTF-8'?>");
++ // (For now, don't bother to issue a DTD for this private format.)
++ jlong time_ms = os::javaTimeMillis() - tty->time_stamp().milliseconds();
++ // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
++ // we ever get round to introduce that method on the os class
++ xs->head("hotspot_log version='%d %d'"
++ " process='%d' time_ms='"INT64_FORMAT"'",
++ LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
++ os::current_process_id(), time_ms);
++ // Write VM version header immediately.
++ xs->head("vm_version");
++ xs->head("name"); xs->text("%s", VM_Version::vm_name()); xs->cr();
++ xs->tail("name");
++ xs->head("release"); xs->text("%s", VM_Version::vm_release()); xs->cr();
++ xs->tail("release");
++ xs->head("info"); xs->text("%s", VM_Version::internal_vm_info_string()); xs->cr();
++ xs->tail("info");
++ xs->tail("vm_version");
++ // Record information about the command-line invocation.
++ xs->head("vm_arguments"); // Cf. Arguments::print_on()
++ if (Arguments::num_jvm_flags() > 0) {
++ xs->head("flags");
++ Arguments::print_jvm_flags_on(xs->text());
++ xs->tail("flags");
++ }
++ if (Arguments::num_jvm_args() > 0) {
++ xs->head("args");
++ Arguments::print_jvm_args_on(xs->text());
++ xs->tail("args");
++ }
++ if (Arguments::java_command() != NULL) {
++ xs->head("command"); xs->text()->print_cr("%s", Arguments::java_command());
++ xs->tail("command");
++ }
++ if (Arguments::sun_java_launcher() != NULL) {
++ xs->head("launcher"); xs->text()->print_cr("%s", Arguments::sun_java_launcher());
++ xs->tail("launcher");
++ }
++ if (Arguments::system_properties() != NULL) {
++ xs->head("properties");
++ // Print it as a java-style property list.
++ // System properties don't generally contain newlines, so don't bother with unparsing.
++ for (SystemProperty* p = Arguments::system_properties(); p != NULL; p = p->next()) {
++ xs->text()->print_cr("%s=%s", p->key(), p->value());
++ }
++ xs->tail("properties");
++ }
++ xs->tail("vm_arguments");
++ // tty output per se is grouped under the <tty>...</tty> element.
++ xs->head("tty");
++ // All further non-markup text gets copied to the tty:
++ xs->_text = this; // requires friend declaration!
++}
++
+ // finish_log() is called during normal VM shutdown. finish_log_on_error() is
+ // called by ostream_abort() after a fatal error.
+ //
+@@ -876,11 +1076,8 @@
+
+ gclog_or_tty = tty; // default to tty
+ if (Arguments::gc_log_filename() != NULL) {
+- fileStream * gclog = UseGCLogFileRotation ?
+- new(ResourceObj::C_HEAP, mtInternal)
+- rotatingFileStream(Arguments::gc_log_filename()) :
+- new(ResourceObj::C_HEAP, mtInternal)
+- fileStream(Arguments::gc_log_filename());
++ fileStream * gclog = new(ResourceObj::C_HEAP, mtInternal)
++ gcLogFileStream(Arguments::gc_log_filename());
+ if (gclog->is_open()) {
+ // now we update the time stamp of the GC log to be synced up
+ // with tty.
+@@ -1038,6 +1235,50 @@
+ }
+
+ #ifndef PRODUCT
++void test_loggc_filename() {
++ const char* o_result;
++
++ {
++ // longest filename
++ char longest_name[JVM_MAXPATHLEN];
++ memset(longest_name, 'a', sizeof(longest_name));
++ longest_name[JVM_MAXPATHLEN - 1] = '\0';
++ o_result = make_log_name((const char*)&longest_name, NULL);
++ assert(strcmp(longest_name, o_result) == 0, err_msg("longest name does not match. expected '%s' but got '%s'", longest_name, o_result));
++ FREE_C_HEAP_ARRAY(char, o_result, mtInternal);
++ }
++
++ {
++ // too long file name
++ char too_long_name[JVM_MAXPATHLEN + 100];
++ int too_long_length = sizeof(too_long_name);
++ memset(too_long_name, 'a', too_long_length);
++ too_long_name[too_long_length - 1] = '\0';
++ o_result = make_log_name((const char*)&too_long_name, NULL);
++ assert(o_result == NULL, err_msg("Too long file name should return NULL, but got '%s'", o_result));
++ }
++
++ {
++ // too long with pid
++ char longest_name[JVM_MAXPATHLEN];
++ memset(longest_name, 'a', JVM_MAXPATHLEN);
++ longest_name[JVM_MAXPATHLEN - 3] = '%';
++ longest_name[JVM_MAXPATHLEN - 2] = 'p';
++ longest_name[JVM_MAXPATHLEN - 1] = '\0';
++ o_result = make_log_name((const char*)&longest_name, NULL);
++ assert(o_result == NULL, err_msg("Too long file name after %%p pid expansion should return NULL, but got '%s'", o_result));
++ }
++
++ {
++ // too long with pid (star)
++ char longest_name[JVM_MAXPATHLEN];
++ memset(longest_name, 'a', JVM_MAXPATHLEN);
++ longest_name[JVM_MAXPATHLEN - 2] = '*';
++ longest_name[JVM_MAXPATHLEN - 1] = '\0';
++ o_result = make_log_name((const char*)&longest_name, NULL);
++ assert(o_result == NULL, err_msg("Too long file name after star (pid) expansion should return NULL, but got '%s'", o_result));
++ }
++}
+
+ #if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
+ #include <sys/types.h>
+--- ./hotspot/src/share/vm/utilities/ostream.hpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/utilities/ostream.hpp Mon Jan 05 11:51:17 2015 -0800
+@@ -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
+@@ -113,7 +113,7 @@
+ // flushing
+ virtual void flush() {}
+ virtual void write(const char* str, size_t len) = 0;
+- virtual void rotate_log() {} // GC log rotation
++ virtual void rotate_log(bool force, outputStream* out = NULL) {} // GC log rotation
+ virtual ~outputStream() {} // close properly on deletion
+
+ void dec_cr() { dec(); cr(); }
+@@ -228,20 +228,31 @@
+ void flush() {};
+ };
+
+-class rotatingFileStream : public fileStream {
++class gcLogFileStream : public fileStream {
+ protected:
+- char* _file_name;
++ const char* _file_name;
+ jlong _bytes_written;
+- uintx _cur_file_num; // current logfile rotation number, from 0 to MaxGCLogFileNumbers-1
++ uintx _cur_file_num; // current logfile rotation number, from 0 to NumberOfGCLogFiles-1
+ public:
+- rotatingFileStream(const char* file_name);
+- rotatingFileStream(const char* file_name, const char* opentype);
+- rotatingFileStream(FILE* file) : fileStream(file) {}
+- ~rotatingFileStream();
++ gcLogFileStream(const char* file_name);
++ ~gcLogFileStream();
+ virtual void write(const char* c, size_t len);
+- virtual void rotate_log();
++ virtual void rotate_log(bool force, outputStream* out = NULL);
++ void dump_loggc_header();
++
++ /* If "force" sets true, force log file rotation from outside JVM */
++ bool should_rotate(bool force) {
++ return force ||
++ ((GCLogFileSize != 0) && ((uintx)_bytes_written >= GCLogFileSize));
++ }
++
+ };
+
++#ifndef PRODUCT
++// unit test for checking -Xloggc:<filename> parsing result
++void test_loggc_filename();
++#endif
++
+ void ostream_init();
+ void ostream_init_log();
+ void ostream_exit();
+--- ./hotspot/src/share/vm/utilities/vmError.cpp Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/src/share/vm/utilities/vmError.cpp Mon Jan 05 11:51:17 2015 -0800
+@@ -22,6 +22,7 @@
+ *
+ */
+
++#include <fcntl.h>
+ #include "precompiled.hpp"
+ #include "compiler/compileBroker.hpp"
+ #include "gc_interface/collectedHeap.hpp"
+@@ -924,7 +925,7 @@
+ bool copy_ok =
+ Arguments::copy_expand_pid(ErrorFile, strlen(ErrorFile), buffer, sizeof(buffer));
+ if (copy_ok) {
+- fd = open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666);
++ fd = open(buffer, O_RDWR | O_CREAT | O_EXCL, 0666);
+ }
+ }
+
+@@ -935,7 +936,7 @@
+ // so use the default name in the current directory
+ jio_snprintf(&buffer[len], sizeof(buffer)-len, "%shs_err_pid%u.log",
+ os::file_separator(), os::current_process_id());
+- fd = open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666);
++ fd = open(buffer, O_RDWR | O_CREAT | O_EXCL, 0666);
+ }
+
+ if (fd == -1) {
+@@ -944,7 +945,7 @@
+ if (tmpdir != NULL && tmpdir[0] != '\0') {
+ jio_snprintf(buffer, sizeof(buffer), "%s%shs_err_pid%u.log",
+ tmpdir, os::file_separator(), os::current_process_id());
+- fd = open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666);
++ fd = open(buffer, O_RDWR | O_CREAT | O_EXCL, 0666);
+ }
+ }
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/EscapeAnalysis/TestAllocatedEscapesPtrComparison.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,107 @@
++/*
++ * Copyright 2014 Google, Inc. All Rights Reserved.
++ * 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 8043354
++ * @summary bcEscapeAnalyzer allocated_escapes not conservative enough
++ * @run main/othervm -XX:CompileOnly=.visitAndPop TestAllocatedEscapesPtrComparison
++ * @author Chuck Rasbold rasbold@google.com
++ */
++
++/*
++ * Test always passes with -XX:-OptmimizePtrCompare
++ */
++
++import java.util.ArrayList;
++import java.util.List;
++
++public class TestAllocatedEscapesPtrComparison {
++
++ static TestAllocatedEscapesPtrComparison dummy;
++
++ class Marker {
++ }
++
++ List<Marker> markerList = new ArrayList<>();
++
++ // Suppress compilation of this method, it must be processed
++ // by the bytecode escape analyzer.
++
++ // Make a new marker and put it on the List
++ Marker getMarker() {
++ // result escapes through markerList
++ final Marker result = new Marker();
++ markerList.add(result);
++ return result;
++ }
++
++ void visit(int depth) {
++ // Make a new marker
++ getMarker();
++
++ // Call visitAndPop every once in a while
++ // Cap the depth of our recursive visits
++ if (depth % 10 == 2) {
++ visitAndPop(depth + 1);
++ } else if (depth < 15) {
++ visit(depth + 1);
++ }
++ }
++
++ void visitAndPop(int depth) {
++ // Random dummy allocation to force EscapeAnalysis to process this method
++ dummy = new TestAllocatedEscapesPtrComparison();
++
++ // Make a new marker
++ Marker marker = getMarker();
++
++ visit(depth + 1);
++
++ // Walk and pop the marker list up to the current marker
++ boolean found = false;
++ for (int i = markerList.size() - 1; i >= 0; i--) {
++ Marker removed = markerList.remove(i);
++
++ // In the failure, EA mistakenly converts this comparison to false
++ if (removed == marker) {
++ found = true;
++ break;
++ }
++ }
++
++ if (!found) {
++ throw new RuntimeException("test fails");
++ }
++ }
++
++
++ public static void main(String args[]) {
++ TestAllocatedEscapesPtrComparison tc = new TestAllocatedEscapesPtrComparison();
++
++ // Warmup and run enough times
++ for (int i = 0; i < 20000; i++) {
++ tc.visit(0);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/compiler/intrinsics/hashcode/TestHashCode.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,73 @@
++/*
++ * 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 8011646
++ * @summary SEGV in compiled code with loop predication
++ * @run main/othervm -XX:-TieredCompilation -XX:CompileOnly=TestHashCode.m1,Object.hashCode TestHashCode
++ *
++ */
++
++public class TestHashCode {
++ static class A {
++ int i;
++ }
++
++ static class B extends A {
++ }
++
++ static boolean crash = false;
++
++ static A m2() {
++ if (crash) {
++ return null;
++ }
++ return new A();
++ }
++
++ static int m1(A aa) {
++ int res = 0;
++ for (int i = 0; i < 10; i++) {
++ A a = m2();
++ int j = a.i;
++ if (aa instanceof B) {
++ }
++ res += a.hashCode();
++ }
++ return res;
++ }
++
++ public static void main(String[] args) {
++ A a = new A();
++ for (int i = 0; i < 20000; i++) {
++ m1(a);
++ }
++ crash = true;
++ try {
++ m1(a);
++ } catch (NullPointerException e) {
++ System.out.println("Test passed");
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/g1/TestPrintGCDetails.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,57 @@
++/*
++ * 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 TestPrintGCDetails
++ * @bug 8010738
++ * @summary Ensure that the PrintGCDetails for a full GC with G1 includes PermGen size info.
++ * @key gc
++ * @key regression
++ * @library /testlibrary
++ */
++
++import com.oracle.java.testlibrary.ProcessTools;
++import com.oracle.java.testlibrary.OutputAnalyzer;
++
++public class TestPrintGCDetails {
++ public static void main(String[] args) throws Exception {
++
++ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
++ "-XX:+PrintGCDetails",
++ SystemGCTest.class.getName());
++
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++
++ System.out.println("Output:\n" + output.getOutput());
++
++ output.shouldContain("Perm");
++ output.shouldHaveExitValue(0);
++ }
++
++ static class SystemGCTest {
++ public static void main(String [] args) {
++ System.out.println("Calling System.gc()");
++ System.gc();
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/gc/heap_inspection/TestG1ConcurrentGCHeapDump.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,108 @@
++/*
++ * 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 TestG1ConcurrentGCHeapDump
++ * @bug 8038925
++ * @summary Checks that a heap dump can be made with G1 when no fullgc
++ * has been made
++ * @run main/othervm -Xms512m -Xmx1024m -XX:+ExplicitGCInvokesConcurrent TestG1ConcurrentGCHeapDump
++ */
++import java.util.List;
++import java.util.ArrayList;
++import java.util.LinkedList;
++
++import javax.management.MBeanServer;
++import java.lang.management.ManagementFactory;
++import java.lang.management.GarbageCollectorMXBean;
++
++import sun.management.ManagementFactoryHelper;
++import com.sun.management.HotSpotDiagnosticMXBean;
++import com.sun.management.VMOption;
++
++import java.io.IOException;
++
++import java.io.File;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++import java.nio.file.Files;
++
++public class TestG1ConcurrentGCHeapDump {
++
++ private static final String HOTSPOT_BEAN_NAME =
++ "com.sun.management:type=HotSpotDiagnostic";
++
++ private static final String G1_OLD_BEAN_NAME =
++ "java.lang:type=GarbageCollector,name=G1 Old Generation";
++
++ private static MBeanServer server = ManagementFactory.getPlatformMBeanServer();
++
++ private static void dumpHeap() throws IOException {
++ HotSpotDiagnosticMXBean hotspot_bean =
++ ManagementFactory.newPlatformMXBeanProxy(server,
++ HOTSPOT_BEAN_NAME, HotSpotDiagnosticMXBean.class);
++
++ Path dir = Files.createTempDirectory("JDK-8038925_");
++ String file = dir + File.separator + "heapdump";
++ hotspot_bean.dumpHeap(file, false);
++ Files.delete(Paths.get(file));
++ Files.delete(dir);
++ }
++
++ private static void verifyNoFullGC() throws IOException {
++ GarbageCollectorMXBean g1_old_bean =
++ ManagementFactory.newPlatformMXBeanProxy(server,
++ G1_OLD_BEAN_NAME, GarbageCollectorMXBean.class);
++
++ if (g1_old_bean.getCollectionCount() != 0) {
++ throw new RuntimeException("A full GC has occured, this test will not work.");
++ }
++ }
++
++ public static void main(String[] args) throws IOException {
++ HotSpotDiagnosticMXBean diagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
++ VMOption option = diagnostic.getVMOption("UseG1GC");
++ if (option.getValue().equals("false")) {
++ System.out.println("Skipping this test. It is only a G1 test.");
++ return;
++ }
++
++ // Create some dead objects
++ ArrayList<List<Integer>> arraylist = new ArrayList<List<Integer>>();
++ for (int i = 0; i < 2; i++) {
++ for (int j = 0; j < 100; j++) {
++ LinkedList<Integer> li = new LinkedList<Integer>();
++ arraylist.add(li);
++ for (int k = 0; k < 10000; k++) {
++ li.add(k);
++ }
++ }
++ arraylist = new ArrayList<List<Integer>>();
++ System.gc();
++ }
++ // Try to dump heap
++ dumpHeap();
++ // Make sure no full GC has happened, since test won't work if that is the case
++ verifyNoFullGC();
++ }
++}
+--- ./hotspot/test/runtime/7051189/Xchecksig.sh Mon Sep 08 12:15:04 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,126 +0,0 @@
+-#
+-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+-
+-# @test Xchecksig.sh
+-# @bug 7051189
+-# @summary Need to suppress info message if -xcheck:jni used with libjsig.so
+-# @run shell Xchecksig.sh
+-#
+-
+-if [ "${TESTSRC}" = "" ]
+-then
+- TESTSRC=${PWD}
+- echo "TESTSRC not set. Using "${TESTSRC}" as default"
+-fi
+-echo "TESTSRC=${TESTSRC}"
+-## Adding common setup Variables for running shell tests.
+-. ${TESTSRC}/../../test_env.sh
+-
+-OS=`uname -s`
+-case "$OS" in
+- Windows_* | CYGWIN_* )
+- printf "Not testing libjsig.so on Windows. PASSED.\n "
+- exit 0
+- ;;
+-esac
+-
+-JAVA=${TESTJAVA}${FS}bin${FS}java
+-
+-# LD_PRELOAD arch needs to match the binary we run, so run the java
+-# 64-bit binary directly if we are testing 64-bit (bin/ARCH/java).
+-# Check if TESTVMOPS contains -d64, but cannot use
+-# java ${TESTVMOPS} to run "java -d64" with LD_PRELOAD.
+-
+-if [ ${OS} -eq "SunOS" ]
+-then
+- printf "SunOS test TESTVMOPTS = ${TESTVMOPTS}"
+- printf ${TESTVMOPTS} | grep d64 > /dev/null
+- if [ $? -eq 0 ]
+- then
+- printf "SunOS 64-bit test\n"
+- BIT_FLAG=-d64
+- fi
+-fi
+-
+-ARCH=`uname -p`
+-case $ARCH in
+- i386)
+- if [ X${BIT_FLAG} != "X" ]
+- then
+- ARCH=amd64
+- JAVA=${TESTJAVA}${FS}bin${FS}${ARCH}${FS}java
+- fi
+- ;;
+- sparc)
+- if [ X${BIT_FLAG} != "X" ]
+- then
+- ARCH=sparcv9
+- JAVA=${TESTJAVA}${FS}bin${FS}${ARCH}${FS}java
+- fi
+- ;;
+- * )
+- printf "Not testing architecture $ARCH, skipping test.\n"
+- exit 0
+- ;;
+-esac
+-
+-LIBJSIG=${COMPILEJAVA}${FS}jre${FS}lib${FS}${ARCH}${FS}libjsig.so
+-
+-# If libjsig and binary do not match, skip test.
+-
+-A=`file ${LIBJSIG} | awk '{ print $3 }'`
+-B=`file ${JAVA} | awk '{ print $3 }'`
+-
+-if [ $A -ne $B ]
+-then
+- printf "Mismatching binary and library to preload, skipping test.\n"
+- exit 0
+-fi
+-
+-if [ ! -f ${LIBJSIG} ]
+-then
+- printf "Skipping test: libjsig missing for given architecture: ${LIBJSIG}\n"
+- exit 0
+-fi
+-# Use java -version to test, java version info appears on stderr,
+-# the libjsig message we are removing appears on stdout.
+-
+-# grep returns zero meaning found, non-zero means not found:
+-
+-LD_PRELOAD=${LIBJSIG} ${JAVA} ${TESTVMOPTS} -Xcheck:jni -version 2>&1 | grep "libjsig is activated"
+-if [ $? -eq 0 ]; then
+- printf "Failed: -Xcheck:jni prints message when libjsig.so is loaded.\n"
+- exit 1
+-fi
+-
+-
+-LD_PRELOAD=${LIBJSIG} ${JAVA} ${TESTVMOPTS} -Xcheck:jni -verbose:jni -version 2>&1 | grep "libjsig is activated"
+-if [ $? != 0 ]; then
+- printf "Failed: -Xcheck:jni does not print message when libjsig.so is loaded and -verbose:jni is set.\n"
+- exit 1
+-fi
+-
+-printf "PASSED\n"
+-exit 0
+-
+--- ./hotspot/test/runtime/7196045/Test7196045.java Mon Sep 08 12:15:04 2014 -0700
++++ ./hotspot/test/runtime/7196045/Test7196045.java Mon Jan 05 11:51:17 2015 -0800
+@@ -26,7 +26,7 @@
+ * @test
+ * @bug 7196045
+ * @summary Possible JVM deadlock in ThreadTimesClosure when using HotspotInternal non-public API.
+- * @run main/othervm Test7196045
++ * @run main/othervm -XX:+UsePerfData Test7196045
+ */
+
+ import java.lang.management.ManagementFactory;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,82 @@
++/*
++ * 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 7051189 8023393
++ * @summary Need to suppress info message if -Xcheck:jni is used with libjsig.so
++ * @library /testlibrary
++ * @run main XCheckJSig
++ */
++
++import java.util.*;
++import com.oracle.java.testlibrary.*;
++
++public class XCheckJSig {
++ public static void main(String args[]) throws Throwable {
++
++ System.out.println("Regression test for bugs 7051189 and 8023393");
++ if (!Platform.isSolaris() && !Platform.isLinux() && !Platform.isOSX()) {
++ System.out.println("Test only applicable on Solaris, Linux, and Mac OSX, skipping");
++ return;
++ }
++
++ String jdk_path = System.getProperty("test.jdk");
++ String os_arch = Platform.getOsArch();
++ String libjsig;
++ String env_var;
++ if (Platform.isOSX()) {
++ libjsig = jdk_path + "/jre/lib/server/libjsig.dylib";
++ env_var = "DYLD_INSERT_LIBRARIES";
++ } else {
++ libjsig = jdk_path + "/jre/lib/" + os_arch + "/libjsig.so";
++ env_var = "LD_PRELOAD";
++ }
++ String java_program;
++ if (Platform.isSolaris()) {
++ // On Solaris, need to call the 64-bit Java directly in order for
++ // LD_PRELOAD to work because libjsig.so is 64-bit.
++ java_program = jdk_path + "/jre/bin/" + os_arch + "/java";
++ } else {
++ java_program = JDKToolFinder.getJDKTool("java");
++ }
++ // If this test fails, these might be useful to know.
++ System.out.println("libjsig: " + libjsig);
++ System.out.println("osArch: " + os_arch);
++ System.out.println("java_program: " + java_program);
++
++ ProcessBuilder pb = new ProcessBuilder(java_program, "-Xcheck:jni", "-version");
++ Map<String, String> env = pb.environment();
++ env.put(env_var, libjsig);
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++ output.shouldNotContain("libjsig is activated");
++ output.shouldHaveExitValue(0);
++
++ pb = new ProcessBuilder(java_program, "-Xcheck:jni", "-verbose:jni", "-version");
++ env = pb.environment();
++ env.put(env_var, libjsig);
++ output = new OutputAnalyzer(pb.start());
++ output.shouldContain("libjsig is activated");
++ output.shouldHaveExitValue(0);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,75 @@
++/*
++ * 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 TestEmptyBootstrapMethodsAttr
++ * @bug 8041918
++ * @library /testlibrary
++ * @summary Test empty bootstrap_methods table within BootstrapMethods attribute
++ * @compile TestEmptyBootstrapMethodsAttr.java
++ * @run main TestEmptyBootstrapMethodsAttr
++ */
++
++import java.io.File;
++import com.oracle.java.testlibrary.*;
++
++public class TestEmptyBootstrapMethodsAttr {
++
++ public static void main(String args[]) throws Throwable {
++ System.out.println("Regression test for bug 8041918");
++ String jarFile = System.getProperty("test.src") + File.separator + "emptynumbootstrapmethods.jar";
++
++ // ====== extract the test case
++ ProcessBuilder pb = new ProcessBuilder(new String[] { JDKToolFinder.getJDKTool("jar"), "xvf", jarFile } );
++ OutputAnalyzer output = new OutputAnalyzer(pb.start());
++ output.shouldHaveExitValue(0);
++
++ // Test case #1:
++ // Try loading class with empty bootstrap_methods table where no
++ // other attributes are following BootstrapMethods in attribute table.
++ String className = "emptynumbootstrapmethods1";
++
++ // ======= execute test case #1
++ // Expect a lack of main method, this implies that the class loaded correctly
++ // with an empty bootstrap_methods and did not generate a ClassFormatError.
++ pb = ProcessTools.createJavaProcessBuilder("-cp", ".", className);
++ output = new OutputAnalyzer(pb.start());
++ output.shouldNotContain("java.lang.ClassFormatError");
++ output.shouldContain("Main method not found in class " + className);
++ output.shouldHaveExitValue(1);
++
++ // Test case #2:
++ // Try loading class with empty bootstrap_methods table where an
++ // AnnotationDefault attribute follows the BootstrapMethods in the attribute table.
++ className = "emptynumbootstrapmethods2";
++
++ // ======= execute test case #2
++ // Expect a lack of main method, this implies that the class loaded correctly
++ // with an empty bootstrap_methods and did not generate ClassFormatError.
++ pb = ProcessTools.createJavaProcessBuilder("-cp", ".", className);
++ output = new OutputAnalyzer(pb.start());
++ output.shouldNotContain("java.lang.ClassFormatError");
++ output.shouldContain("Main method not found in class " + className);
++ output.shouldHaveExitValue(1);
++ }
++}
+Binary file test/runtime/classFileParserBug/emptynumbootstrapmethods.jar has changed
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/runtime/classFileParserBug/emptynumbootstrapmethods1.jcod Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,68 @@
++/*
++ * 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.
++ */
++
++/*
++ * This test contains a BootstrapMethods attribute with an empty
++ * bootstrap_methods table. This yields a BootstrapMethods
++ * attribute length of 2 and should not cause a
++ * java.lang.ClassFormatError to be thrown.
++ */
++class emptynumbootstrapmethods1 {
++ 0xCAFEBABE;
++ 0; // minor version
++ 51; // version
++ [12] { // Constant Pool
++ ; // first element is empty
++ class #2; // #1 at 0x0A
++ Utf8 "emptynumbootstrapmethods1"; // #2 at 0x0D
++ class #4; // #3 at 0x1F
++ Utf8 "java/lang/Object"; // #4 at 0x22
++ MethodHandle 5b #9; // #5 at 0x35
++ NameAndType #7 #8; // #6 at 0x39
++ Utf8 "equals"; // #7 at 0x3E
++ Utf8 "(Ljava/lang/Object;)Z"; // #8 at 0x47
++ Method #3 #6; // #9 at 0x5F
++ Utf8 "equalsx"; // #10 at 0x3E
++ Utf8 "BootstrapMethods"; // #11 at 0x69
++ } // Constant Pool
++
++ 0x0001; // access
++ #1;// this_cpx
++ #3;// super_cpx
++
++ [0] { // Interfaces
++ } // Interfaces
++
++ [0] { // fields
++ } // fields
++
++ [0] { // methods
++ } // methods
++
++ [1] { // Attributes
++ Attr(#11, 2) { // BootstrapMethods at 0x8A
++ [0] { // bootstrap_methods
++ }
++ } // end BootstrapMethods
++ } // Attributes
++} // end class atrbsm00101m10p
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/runtime/classFileParserBug/emptynumbootstrapmethods2.jcod Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,89 @@
++/*
++ * 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.
++ */
++
++/*
++ * This test contains a BootstrapMethods attribute with an empty
++ * bootstrap_methods table. This yields a BootstrapMethods
++ * attribute length of 2 and should not cause a
++ * java.lang.ClassFormatError to be thrown. To ensure that an empty
++ * bootstrap_methods table is parsed correctly, another attribute,
++ * AnnotationDefault, follows the BootstrapMethods attribute in
++ * the attribute table.
++ */
++
++class emptynumbootstrapmethods2 {
++ 0xCAFEBABE;
++ 0; // minor version
++ 51; // version
++ [14] { // Constant Pool
++ ; // first element is empty
++ class #2; // #1 at 0x0A
++ Utf8 "emptynumbootstrapmethods2"; // #2 at 0x0D
++ class #4; // #3 at 0x1F
++ Utf8 "java/lang/Object"; // #4 at 0x22
++ MethodHandle 5b #9; // #5 at 0x35
++ NameAndType #7 #8; // #6 at 0x39
++ Utf8 "equals"; // #7 at 0x3E
++ Utf8 "(Ljava/lang/Object;)Z"; // #8 at 0x47
++ Method #3 #6; // #9 at 0x5F
++ Utf8 "equalsx"; // #10 at 0x3E
++ Utf8 "BootstrapMethods"; // #11 at 0x69
++ Utf8 "AnnotationDefault"; // #12
++ Utf8 "LAnnotationDefaultI;"; // #13
++ } // Constant Pool
++
++ 0x0001; // access
++ #1;// this_cpx
++ #3;// super_cpx
++
++ [0] { // Interfaces
++ } // Interfaces
++
++ [0] { // fields
++ } // fields
++
++ [0] { // methods
++ } // methods
++
++ [2] { // Attributes
++ Attr(#11, 2) { // BootstrapMethods at 0x8A
++ [0] { // bootstrap_methods
++ }
++ } // end BootstrapMethods
++ ;
++ Attr(#12) { // AnnotationDefault
++ [] { // type annotations
++ { // type annotation
++ 0x00; // target_type
++ 0x00; // type_parameter_index
++ []b { // type_path
++ }
++
++ #13; // type_index
++ [] { // element_value_pairs
++ } // element_value_pairs
++ } // type annotation
++ } // type annotations
++ } // end AnnotationDefault
++ } // Attributes
++} // end class atrbsm00101m10p
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/serviceability/sa/jmap-hashcode/Test8028623.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,74 @@
++/*
++ * 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 8028623
++ * @summary Test hashing of extended characters in Serviceability Agent.
++ * @library /testlibrary
++ * @compile -encoding utf8 Test8028623.java
++ * @run main Test8028623
++ */
++
++import com.oracle.java.testlibrary.JDKToolLauncher;
++import com.oracle.java.testlibrary.OutputBuffer;
++import com.oracle.java.testlibrary.ProcessTools;
++
++import java.io.File;
++
++public class Test8028623 {
++
++ public static int \u00CB = 1;
++ public static String dumpFile = "heap.out";
++
++ public static void main (String[] args) {
++
++ System.out.println(\u00CB);
++
++ try {
++ int pid = ProcessTools.getProcessId();
++ JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
++ .addToolArg("-F")
++ .addToolArg("-dump:live,format=b,file=" + dumpFile)
++ .addToolArg(Integer.toString(pid));
++ ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
++ OutputBuffer output = ProcessTools.getOutput(pb);
++ Process p = pb.start();
++ int e = p.waitFor();
++ System.out.println("stdout:");
++ System.out.println(output.getStdout());
++ System.out.println("stderr:");
++ System.out.println(output.getStderr());
++
++ if (e != 0) {
++ throw new RuntimeException("jmap returns: " + e);
++ }
++ if (! new File(dumpFile).exists()) {
++ throw new RuntimeException("dump file NOT created: '" + dumpFile + "'");
++ }
++ } catch (Throwable t) {
++ t.printStackTrace();
++ throw new RuntimeException("Test failed with: " + t);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary_tests/AssertsTest.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,237 @@
++/*
++ * 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 static com.oracle.java.testlibrary.Asserts.*;
++
++/* @test
++ * @summary Tests the different assertions in the Assert class
++ * @library /testlibrary
++ */
++public class AssertsTest {
++ private static class Foo implements Comparable<Foo> {
++ final int id;
++ public Foo(int id) {
++ this.id = id;
++ }
++
++ public int compareTo(Foo f) {
++ return new Integer(id).compareTo(new Integer(f.id));
++ }
++ }
++
++ public static void main(String[] args) throws Exception {
++ testLessThan();
++ testLessThanOrEqual();
++ testEquals();
++ testGreaterThanOrEqual();
++ testGreaterThan();
++ testNotEquals();
++ testNull();
++ testNotNull();
++ testTrue();
++ testFalse();
++ }
++
++ private static void testLessThan() throws Exception {
++ expectPass(Assertion.LT, 1, 2);
++
++ expectFail(Assertion.LT, 2, 2);
++ expectFail(Assertion.LT, 2, 1);
++ expectFail(Assertion.LT, null, 2);
++ expectFail(Assertion.LT, 2, null);
++ }
++
++ private static void testLessThanOrEqual() throws Exception {
++ expectPass(Assertion.LTE, 1, 2);
++ expectPass(Assertion.LTE, 2, 2);
++
++ expectFail(Assertion.LTE, 3, 2);
++ expectFail(Assertion.LTE, null, 2);
++ expectFail(Assertion.LTE, 2, null);
++ }
++
++ private static void testEquals() throws Exception {
++ expectPass(Assertion.EQ, 1, 1);
++ expectPass(Assertion.EQ, null, null);
++
++ Foo f1 = new Foo(1);
++ expectPass(Assertion.EQ, f1, f1);
++
++ Foo f2 = new Foo(1);
++ expectFail(Assertion.EQ, f1, f2);
++ expectFail(Assertion.LTE, null, 2);
++ expectFail(Assertion.LTE, 2, null);
++ }
++
++ private static void testGreaterThanOrEqual() throws Exception {
++ expectPass(Assertion.GTE, 1, 1);
++ expectPass(Assertion.GTE, 2, 1);
++
++ expectFail(Assertion.GTE, 1, 2);
++ expectFail(Assertion.GTE, null, 2);
++ expectFail(Assertion.GTE, 2, null);
++ }
++
++ private static void testGreaterThan() throws Exception {
++ expectPass(Assertion.GT, 2, 1);
++
++ expectFail(Assertion.GT, 1, 1);
++ expectFail(Assertion.GT, 1, 2);
++ expectFail(Assertion.GT, null, 2);
++ expectFail(Assertion.GT, 2, null);
++ }
++
++ private static void testNotEquals() throws Exception {
++ expectPass(Assertion.NE, null, 1);
++ expectPass(Assertion.NE, 1, null);
++
++ Foo f1 = new Foo(1);
++ Foo f2 = new Foo(1);
++ expectPass(Assertion.NE, f1, f2);
++
++ expectFail(Assertion.NE, null, null);
++ expectFail(Assertion.NE, f1, f1);
++ expectFail(Assertion.NE, 1, 1);
++ }
++
++ private static void testNull() throws Exception {
++ expectPass(Assertion.NULL, null);
++
++ expectFail(Assertion.NULL, 1);
++ }
++
++ private static void testNotNull() throws Exception {
++ expectPass(Assertion.NOTNULL, 1);
++
++ expectFail(Assertion.NOTNULL, null);
++ }
++
++ private static void testTrue() throws Exception {
++ expectPass(Assertion.TRUE, true);
++
++ expectFail(Assertion.TRUE, false);
++ }
++
++ private static void testFalse() throws Exception {
++ expectPass(Assertion.FALSE, false);
++
++ expectFail(Assertion.FALSE, true);
++ }
++
++ private static <T extends Comparable<T>> void expectPass(Assertion assertion, T ... args)
++ throws Exception {
++ Assertion.run(assertion, args);
++ }
++
++ private static <T extends Comparable<T>> void expectFail(Assertion assertion, T ... args)
++ throws Exception {
++ try {
++ Assertion.run(assertion, args);
++ } catch (RuntimeException e) {
++ return;
++ }
++ throw new Exception("Expected " + Assertion.format(assertion, (Object[]) args) +
++ " to throw a RuntimeException");
++ }
++
++}
++
++enum Assertion {
++ LT, LTE, EQ, GTE, GT, NE, NULL, NOTNULL, FALSE, TRUE;
++
++ public static <T extends Comparable<T>> void run(Assertion assertion, T ... args) {
++ String msg = "Expected " + format(assertion, args) + " to pass";
++ switch (assertion) {
++ case LT:
++ assertLessThan(args[0], args[1], msg);
++ break;
++ case LTE:
++ assertLessThanOrEqual(args[0], args[1], msg);
++ break;
++ case EQ:
++ assertEquals(args[0], args[1], msg);
++ break;
++ case GTE:
++ assertGreaterThanOrEqual(args[0], args[1], msg);
++ break;
++ case GT:
++ assertGreaterThan(args[0], args[1], msg);
++ break;
++ case NE:
++ assertNotEquals(args[0], args[1], msg);
++ break;
++ case NULL:
++ assertNull(args == null ? args : args[0], msg);
++ break;
++ case NOTNULL:
++ assertNotNull(args == null ? args : args[0], msg);
++ break;
++ case FALSE:
++ assertFalse((Boolean) args[0], msg);
++ break;
++ case TRUE:
++ assertTrue((Boolean) args[0], msg);
++ break;
++ default:
++ // do nothing
++ }
++ }
++
++ public static String format(Assertion assertion, Object ... args) {
++ switch (assertion) {
++ case LT:
++ return asString("assertLessThan", args);
++ case LTE:
++ return asString("assertLessThanOrEqual", args);
++ case EQ:
++ return asString("assertEquals", args);
++ case GTE:
++ return asString("assertGreaterThanOrEquals", args);
++ case GT:
++ return asString("assertGreaterThan", args);
++ case NE:
++ return asString("assertNotEquals", args);
++ case NULL:
++ return asString("assertNull", args);
++ case NOTNULL:
++ return asString("assertNotNull", args);
++ case FALSE:
++ return asString("assertFalse", args);
++ case TRUE:
++ return asString("assertTrue", args);
++ default:
++ return "";
++ }
++ }
++
++ private static String asString(String assertion, Object ... args) {
++ if (args == null) {
++ return String.format("%s(null)", assertion);
++ }
++ if (args.length == 1) {
++ return String.format("%s(%s)", assertion, args[0]);
++ } else {
++ return String.format("%s(%s, %s)", assertion, args[0], args[1]);
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary_tests/OutputAnalyzerReportingTest.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,124 @@
++/*
++ * 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
++ * @summary Test the OutputAnalyzer reporting functionality,
++ * such as printing additional diagnostic info
++ * (exit code, stdout, stderr, command line, etc.)
++ * @library /testlibrary
++ */
++
++import java.io.ByteArrayOutputStream;
++import java.io.PrintStream;
++
++import com.oracle.java.testlibrary.OutputAnalyzer;
++import com.oracle.java.testlibrary.ProcessTools;
++
++
++public class OutputAnalyzerReportingTest {
++
++ public static void main(String[] args) throws Exception {
++ // Create the output analyzer under test
++ String stdout = "aaaaaa";
++ String stderr = "bbbbbb";
++ OutputAnalyzer output = new OutputAnalyzer(stdout, stderr);
++
++ // Expected summary values should be the same for all cases,
++ // since the outputAnalyzer object is the same
++ String expectedExitValue = "-1";
++ String expectedSummary =
++ " stdout: [" + stdout + "];\n" +
++ " stderr: [" + stderr + "]\n" +
++ " exitValue = " + expectedExitValue + "\n";
++
++
++ DiagnosticSummaryTestRunner testRunner =
++ new DiagnosticSummaryTestRunner();
++
++ // should have exit value
++ testRunner.init(expectedSummary);
++ int unexpectedExitValue = 2;
++ try {
++ output.shouldHaveExitValue(unexpectedExitValue);
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ // should not contain
++ testRunner.init(expectedSummary);
++ try {
++ output.shouldNotContain(stdout);
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ // should contain
++ testRunner.init(expectedSummary);
++ try {
++ output.shouldContain("unexpected-stuff");
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ // should not match
++ testRunner.init(expectedSummary);
++ try {
++ output.shouldNotMatch("[a]");
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ // should match
++ testRunner.init(expectedSummary);
++ try {
++ output.shouldMatch("[qwerty]");
++ } catch (RuntimeException e) { }
++ testRunner.closeAndCheckResults();
++
++ }
++
++ private static class DiagnosticSummaryTestRunner {
++ private ByteArrayOutputStream byteStream =
++ new ByteArrayOutputStream(10000);
++
++ private String expectedSummary = "";
++ private PrintStream errStream;
++
++
++ public void init(String expectedSummary) {
++ this.expectedSummary = expectedSummary;
++ byteStream.reset();
++ errStream = new PrintStream(byteStream);
++ System.setErr(errStream);
++ }
++
++ public void closeAndCheckResults() {
++ // check results
++ errStream.close();
++ String stdErrStr = byteStream.toString();
++ if (!stdErrStr.contains(expectedSummary)) {
++ throw new RuntimeException("The output does not contain "
++ + "the diagnostic message, or the message is incorrect");
++ }
++ }
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/testlibrary_tests/OutputAnalyzerTest.java Mon Jan 05 11:51:17 2015 -0800
+@@ -0,0 +1,193 @@
++/*
++ * 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
++ * @summary Test the OutputAnalyzer utility class
++ * @library /testlibrary
++ */
++
++import com.oracle.java.testlibrary.OutputAnalyzer;
++
++public class OutputAnalyzerTest {
++
++ public static void main(String args[]) throws Exception {
++
++ String stdout = "aaaaaa";
++ String stderr = "bbbbbb";
++
++ // Regexps used for testing pattern matching of the test input
++ String stdoutPattern = "[a]";
++ String stderrPattern = "[b]";
++ String nonExistingPattern = "[c]";
++
++ OutputAnalyzer output = new OutputAnalyzer(stdout, stderr);
++
++ if (!stdout.equals(output.getStdout())) {
++ throw new Exception("getStdout() returned '" + output.getStdout() + "', expected '" + stdout + "'");
++ }
++
++ if (!stderr.equals(output.getStderr())) {
++ throw new Exception("getStderr() returned '" + output.getStderr() + "', expected '" + stderr + "'");
++ }
++
++ try {
++ output.shouldContain(stdout);
++ output.stdoutShouldContain(stdout);
++ output.shouldContain(stderr);
++ output.stderrShouldContain(stderr);
++ } catch (RuntimeException e) {
++ throw new Exception("shouldContain() failed", e);
++ }
++
++ try {
++ output.shouldContain("cccc");
++ throw new Exception("shouldContain() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ try {
++ output.stdoutShouldContain(stderr);
++ throw new Exception("stdoutShouldContain() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ try {
++ output.stderrShouldContain(stdout);
++ throw new Exception("stdoutShouldContain() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ try {
++ output.shouldNotContain("cccc");
++ output.stdoutShouldNotContain("cccc");
++ output.stderrShouldNotContain("cccc");
++ } catch (RuntimeException e) {
++ throw new Exception("shouldNotContain() failed", e);
++ }
++
++ try {
++ output.shouldNotContain(stdout);
++ throw new Exception("shouldContain() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ try {
++ output.stdoutShouldNotContain(stdout);
++ throw new Exception("shouldContain() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ try {
++ output.stderrShouldNotContain(stderr);
++ throw new Exception("shouldContain() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ // Should match
++ try {
++ output.shouldMatch(stdoutPattern);
++ output.stdoutShouldMatch(stdoutPattern);
++ output.shouldMatch(stderrPattern);
++ output.stderrShouldMatch(stderrPattern);
++ } catch (RuntimeException e) {
++ throw new Exception("shouldMatch() failed", e);
++ }
++
++ try {
++ output.shouldMatch(nonExistingPattern);
++ throw new Exception("shouldMatch() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ try {
++ output.stdoutShouldMatch(stderrPattern);
++ throw new Exception(
++ "stdoutShouldMatch() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ try {
++ output.stderrShouldMatch(stdoutPattern);
++ throw new Exception(
++ "stderrShouldMatch() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ // Should not match
++ try {
++ output.shouldNotMatch(nonExistingPattern);
++ output.stdoutShouldNotMatch(nonExistingPattern);
++ output.stderrShouldNotMatch(nonExistingPattern);
++ } catch (RuntimeException e) {
++ throw new Exception("shouldNotMatch() failed", e);
++ }
++
++ try {
++ output.shouldNotMatch(stdoutPattern);
++ throw new Exception("shouldNotMatch() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ try {
++ output.stdoutShouldNotMatch(stdoutPattern);
++ throw new Exception("shouldNotMatch() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ try {
++ output.stderrShouldNotMatch(stderrPattern);
++ throw new Exception("shouldNotMatch() failed to throw exception");
++ } catch (RuntimeException e) {
++ // expected
++ }
++
++ {
++ String aaaa = "aaaa";
++ String result = output.firstMatch(aaaa);
++ if (!aaaa.equals(result)) {
++ throw new Exception("firstMatch(String) faild to match. Expected: " + aaaa + " got: " + result);
++ }
++ }
++
++ {
++ String aa = "aa";
++ String aa_grouped_aa = aa + "(" + aa + ")";
++ String result = output.firstMatch(aa_grouped_aa, 1);
++ if (!aa.equals(result)) {
++ throw new Exception("firstMatch(String, int) failed to match. Expected: " + aa + " got: " + result);
++ }
++ }
++ }
++}
+--- ./jaxp/.hgtags Mon Sep 08 12:15:56 2014 -0700
++++ ./jaxp/.hgtags Mon Jan 05 11:56:34 2015 -0800
+@@ -473,11 +473,19 @@
+ 45db678253587755df4a00066e42e2fce04bbb71 jdk7u65-b18
+ 4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b19
+ f3b7bb6f1924ab7f635cdd60db7fbab64576cd6d jdk7u65-b32
++7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00
++4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01
++25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02
+ d41f31b707c87675f3467e980b1ceef2e53b3b5d jdk7u65-b20
+ d1f8566d39c56e40516a1afb304ed7c0681355d8 jdk7u67-b01
+ 4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b40
+ a5f829d7fa05cf769402dfc82c94b737b8d011b0 jdk7u65-b31
+ f33ea72260ca7480f4a1405d35a3709895b491a2 jdk7u65-b33
++d1f8566d39c56e40516a1afb304ed7c0681355d8 jdk7u67-b01
++a9c1c53386a9b7856802a98a597a8cbf73e28fa0 jdk7u67-b31
++e7300cd38793c7620f39be5f73b7fcba2f80555b jdk7u67-b32
++78c4bc9bfa12cc97039fd84c5ec1cbd086a0ba35 jdk7u67-b33
++39a6fbc6ef75eba7b3c28e8485a0665d904f21eb jdk7u67-b34
+ 86e93799766d67102a37559b3831abcc825d7e24 jdk7u66-b00
+ d34839cb2f15dee01cdfb1fd93378849de34d662 jdk7u66-b01
+ 19e4e978c8212921104ba16d0db6bf18c6f8d0ab jdk7u66-b09
+@@ -503,3 +511,51 @@
+ f7542072016b7972b383075f84df29bc05495d2e jdk7u71-b11
+ 109dd4c4a07a8adfaf59e11c29e502277b803c44 jdk7u71-b12
+ df2c7c9a3609f8f4b30b09c29a9cfddc8b4b90ef jdk7u71-b13
++018049539cc25653eeba682b3ca5abcd63839d78 jdk7u71-b14
++0e7c12377e0120b908fc594afc596ce1f5f2b234 jdk7u72-b01
++bc5b33e920af4b34facfa85a6bf48d5f55b05116 jdk7u72-b02
++b1f6b12c1fcac4b0ea89bf3f134324aa8968b847 jdk7u72-b03
++f59d0ae0995d2cdb57ea482a8fa47575e0d8b57f jdk7u72-b04
++ed071d27bf7320265d8ae527bb622f2e26e1a89c jdk7u72-b05
++d3c5c35f617e33f673420ff9da8051c742513af3 jdk7u72-b06
++ef0842fc31d98031ad9bb514b0f8d2db7bcf4162 jdk7u72-b07
++89117e4403e61b9c033bcab65da30abf2219e385 jdk7u72-b08
++7637d4b21a9e3237f129f69a0dc7132877f3ab19 jdk7u72-b09
++a3d6d3327b32cd7fb41a144d48f957170dde3ba8 jdk7u72-b10
++d3fbd111daa01dc1737afd0a59084e14664d581a jdk7u72-b11
++fb713c907f33689a418c87bf721dafcdc9616ca8 jdk7u72-b12
++8f0d267ca63ab2f9d7839604ae88fafbcc0ad2d4 jdk7u72-b13
++fec38133453a8d70d4c528595ae1cab47909c4bd jdk7u72-b14
++e8ab19435208726b1334ba8e7928ea154e0959b3 jdk7u72-b30
++d8246774af472f617033202d2c58c7572da08dcd jdk7u72-b31
++4173f90038ff1764576d08efa34109a7895f106b jdk7u75-b00
++b9eaa7d194dd5e23bd2d53be4d57b25fdcb08e31 jdk7u75-b01
++98eaae4f301779861be3f9a8b0854ec83074615a jdk7u75-b02
++eb57739c7818a0dbaa39122ad35f5e48584be5df jdk7u75-b03
++908a056c8d8fa65864cbf5745a050f675be35288 jdk7u75-b04
++079579b6672777d71624b49b29042cd19cbccef2 jdk7u75-b05
++967717c26bb17ff3c3aa399072eebed17c599a92 jdk7u75-b06
++1a9565415e4142f9914b309888056f9b8f27de97 jdk7u75-b07
++d8419be679448402af177510f1a154ca7935d24f jdk7u75-b08
++08599c76e606df8d369d1eda03ac876ffbaafb36 jdk7u75-b09
++d3c566dedbcde177bfa573ae3632ad21c335a03d jdk7u75-b10
++1d6f8fbbfefc63adde96d70d74dc281616b7ac01 jdk7u75-b11
++15f65800816f164b5855744b59fbc3d661e0511d jdk7u75-b12
++d6c90cc2e91d58688884a8e659e79603e37d4cd5 jdk7u75-b13
++999eb9cbf8404232a03e3a877680ca3541b8f62c jdk7u75-b30
++4efcb94971a21562649ae01c07880139a35d3403 jdk7u75-b31
++8405eb3c02e3f81b20faa1adf43d447e2e7b7705 jdk7u76-b00
++f478245e2c18bd459d085c70cf7aa212b1f30dbf jdk7u76-b01
++bb77b08b760634a87ee3c1fbb3c7a519d61d4e87 jdk7u76-b02
++0c337b6088029d8867732a2f1e08dcc7271e6111 jdk7u76-b03
++0d0d6c0a1ae3cae89f59491c6643fe7f12c497bc jdk7u76-b04
++5bde0c6472681b8e508c7f54692ad3ca69c6a544 jdk7u76-b05
++9e39563c9f33ceac879ee214bc27db3e5f1d5004 jdk7u76-b06
++4e5b7d15fad4fc32c67a45512391c71e7e33460e jdk7u76-b07
++aefcd8f73cfb456a133ee923859683c68338649f jdk7u76-b08
++c6675d4d08b8d5e6a2bb9f631d8b5762f0b51cdf jdk7u76-b09
++62e1b60c3adfd3133e3fe9f8d5194512f503c540 jdk7u76-b10
++33040bd2deb5371a85fe7d7a9442cdf649919b39 jdk7u76-b11
++7167fcf821b00424c0464086f4047a7209dc9e59 jdk7u76-b12
++6262c3d41bb13f58338c4bc7946468ba70825046 jdk7u76-b13
++d3907dca5ffc798076f44cc63f01f7beb41343a9 jdk7u76-b30
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java Mon Sep 08 12:15:56 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java Mon Jan 05 11:56:34 2015 -0800
+@@ -147,8 +147,9 @@
+ fCurrentEntity.lineNumber++;
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = (char)c;
+- load(1, false, true);
++ load(1, false, false);
+ }
+ if (c == '\r' && external) {
+ int cc = fCurrentEntity.ch[fCurrentEntity.position++];
+@@ -306,9 +307,10 @@
+
+ if (XML11Char.isXML11NameStart(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false, true)) {
++ if (load(1, false, false)) {
+ fCurrentEntity.columnNumber++;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
+ return symbol;
+@@ -317,9 +319,10 @@
+ }
+ else if (XML11Char.isXML11NameHighSurrogate(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false, true)) {
++ if (load(1, false, false)) {
+ --fCurrentEntity.position;
+ --fCurrentEntity.startPosition;
+ return null;
+@@ -332,10 +335,11 @@
+ return null;
+ }
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(2);
+ fCurrentEntity.ch[0] = ch;
+ fCurrentEntity.ch[1] = ch2;
+ offset = 0;
+- if (load(2, false, true)) {
++ if (load(2, false, false)) {
+ fCurrentEntity.columnNumber += 2;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 2);
+ return symbol;
+@@ -464,9 +468,10 @@
+
+ if (XML11Char.isXML11NCNameStart(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false, true)) {
++ if (load(1, false, false)) {
+ fCurrentEntity.columnNumber++;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
+ return symbol;
+@@ -475,9 +480,10 @@
+ }
+ else if (XML11Char.isXML11NameHighSurrogate(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false, true)) {
++ if (load(1, false, false)) {
+ --fCurrentEntity.position;
+ --fCurrentEntity.startPosition;
+ return null;
+@@ -490,10 +496,11 @@
+ return null;
+ }
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(2);
+ fCurrentEntity.ch[0] = ch;
+ fCurrentEntity.ch[1] = ch2;
+ offset = 0;
+- if (load(2, false, true)) {
++ if (load(2, false, false)) {
+ fCurrentEntity.columnNumber += 2;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 2);
+ return symbol;
+@@ -628,9 +635,10 @@
+
+ if (XML11Char.isXML11NCNameStart(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false, true)) {
++ if (load(1, false, false)) {
+ fCurrentEntity.columnNumber++;
+ String name = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
+ qname.setValues(null, name, name, null);
+@@ -640,9 +648,10 @@
+ }
+ else if (XML11Char.isXML11NameHighSurrogate(ch)) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = ch;
+ offset = 0;
+- if (load(1, false, true)) {
++ if (load(1, false, false)) {
+ --fCurrentEntity.startPosition;
+ --fCurrentEntity.position;
+ return false;
+@@ -655,10 +664,11 @@
+ return false;
+ }
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(2);
+ fCurrentEntity.ch[0] = ch;
+ fCurrentEntity.ch[1] = ch2;
+ offset = 0;
+- if (load(2, false, true)) {
++ if (load(2, false, false)) {
+ fCurrentEntity.columnNumber += 2;
+ String name = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 2);
+ qname.setValues(null, name, name, null);
+@@ -835,8 +845,9 @@
+ load(0, true, true);
+ }
+ else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
++ invokeListeners(0);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
+- load(1, false, true);
++ load(1, false, false);
+ fCurrentEntity.position = 0;
+ fCurrentEntity.startPosition = 0;
+ }
+@@ -976,8 +987,9 @@
+ load(0, true, true);
+ }
+ else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
++ invokeListeners(0);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
+- load(1, false, true);
++ load(1, false, false);
+ fCurrentEntity.startPosition = 0;
+ fCurrentEntity.position = 0;
+ }
+@@ -1346,8 +1358,9 @@
+ else if (c == '\n' && (cc == '\r' ) && fCurrentEntity.isExternal()) {
+ // handle newlines
+ if (fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = (char)cc;
+- load(1, false, true);
++ load(1, false, false);
+ }
+ int ccc = fCurrentEntity.ch[++fCurrentEntity.position];
+ if (ccc == '\n' || ccc == 0x85) {
+@@ -1408,8 +1421,9 @@
+ fCurrentEntity.lineNumber++;
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count - 1) {
++ invokeListeners(0);
+ fCurrentEntity.ch[0] = (char)c;
+- entityChanged = load(1, true, true);
++ entityChanged = load(1, true, false);
+ if (!entityChanged) {
+ // the load change the position to be 1,
+ // need to restore it when entity not changed
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Mon Sep 08 12:15:56 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Mon Jan 05 11:56:34 2015 -0800
+@@ -538,8 +538,9 @@
+ fCurrentEntity.lineNumber++;
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = (char)c;
+- load(1, false, true);
++ load(1, false, false);
+ }
+ if (c == '\r' && isExternal) {
+ if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') {
+@@ -670,9 +671,10 @@
+ int offset = fCurrentEntity.position;
+ if (XMLChar.isNameStart(fCurrentEntity.ch[offset])) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[offset];
+ offset = 0;
+- if (load(1, false, true)) {
++ if (load(1, false, false)) {
+ fCurrentEntity.columnNumber++;
+ String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
+
+@@ -776,10 +778,11 @@
+
+ if (XMLChar.isNameStart(fCurrentEntity.ch[offset])) {
+ if (++fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[offset];
+ offset = 0;
+
+- if (load(1, false, true)) {
++ if (load(1, false, false)) {
+ fCurrentEntity.columnNumber++;
+ //adding into symbol table.
+ //XXX We are trying to add single character in SymbolTable??????
+@@ -906,8 +909,9 @@
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+ load(0, true, true);
+ } else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
++ invokeListeners(0);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
+- load(1, false, true);
++ load(1, false, false);
+ fCurrentEntity.position = 0;
+ }
+
+@@ -1054,8 +1058,9 @@
+ if (fCurrentEntity.position == fCurrentEntity.count) {
+ load(0, true, true);
+ } else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
++ invokeListeners(0);
+ fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
+- load(1, false, true);
++ load(1, false, false);
+ fCurrentEntity.position = 0;
+ }
+
+@@ -1419,8 +1424,9 @@
+ } else if (c == '\n' && cc == '\r' && isExternal) {
+ // handle newlines
+ if (fCurrentEntity.position == fCurrentEntity.count) {
++ invokeListeners(1);
+ fCurrentEntity.ch[0] = (char)cc;
+- load(1, false, true);
++ load(1, false, false);
+ }
+ fCurrentEntity.position++;
+ if (fCurrentEntity.ch[fCurrentEntity.position] == '\n') {
+@@ -1494,8 +1500,9 @@
+ fCurrentEntity.lineNumber++;
+ fCurrentEntity.columnNumber = 1;
+ if (fCurrentEntity.position == fCurrentEntity.count - 1) {
++ invokeListeners(0);
+ fCurrentEntity.ch[0] = (char)c;
+- entityChanged = load(1, true, true);
++ entityChanged = load(1, true, false);
+ if (!entityChanged){
+ // the load change the position to be 1,
+ // need to restore it when entity not changed
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java Mon Sep 08 12:15:56 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java Mon Jan 05 11:56:34 2015 -0800
+@@ -54,6 +54,7 @@
+ import com.sun.org.apache.xerces.internal.util.SymbolTable;
+ import com.sun.org.apache.xerces.internal.util.XMLSymbols;
+ import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
++import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+ import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+ import com.sun.org.apache.xerces.internal.xni.XNIException;
+ import com.sun.org.apache.xerces.internal.xni.grammars.Grammar;
+@@ -983,6 +984,18 @@
+ */
+ public void reset(XMLComponentManager componentManager) throws XMLConfigurationException {
+
++ XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
++ if (spm == null) {
++ spm = new XMLSecurityPropertyManager();
++ setProperty(XML_SECURITY_PROPERTY_MANAGER, spm);
++ }
++
++ XMLSecurityManager sm = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
++ if (sm == null)
++ setProperty(SECURITY_MANAGER,new XMLSecurityManager(true));
++
++ faccessExternalSchema = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA);
++
+ fGrammarBucket.reset();
+
+ fSubGroupHandler.reset();
+@@ -1066,9 +1079,6 @@
+ // get generate-synthetic-annotations feature
+ fSchemaHandler.setGenerateSyntheticAnnotations(componentManager.getFeature(GENERATE_SYNTHETIC_ANNOTATIONS, false));
+ fSchemaHandler.reset(componentManager);
+-
+- XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
+- faccessExternalSchema = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA);
+ }
+
+ private void initGrammarBucket(){
+--- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Mon Sep 08 12:15:56 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Mon Jan 05 11:56:34 2015 -0800
+@@ -450,7 +450,8 @@
+ }
+
+ private void propagateFeatures(AbstractXMLSchema schema) {
+- schema.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, fSecurityManager != null);
++ schema.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
++ (fSecurityManager != null && fSecurityManager.isSecureProcessing()));
+ schema.setFeature(Constants.ORACLE_FEATURE_SERVICE_MECHANISM, fUseServicesMechanism);
+ String[] features = fXMLSchemaLoader.getRecognizedFeatures();
+ for (int i = 0; i < features.length; ++i) {
+--- ./jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Mon Sep 08 12:15:56 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Mon Jan 05 11:56:34 2015 -0800
+@@ -3145,7 +3145,11 @@
+ m_data.elementAt(-dataIndex+1));
+ }
+ }
+- else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type
++ else if (DTM.ELEMENT_NODE == type)
++ {
++ return getStringValueX(nodeHandle);
++ }
++ else if (DTM.DOCUMENT_FRAGMENT_NODE == type
+ || DTM.DOCUMENT_NODE == type)
+ {
+ return null;
+--- ./jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java Mon Sep 08 12:15:56 2014 -0700
++++ ./jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java Mon Jan 05 11:56:34 2015 -0800
+@@ -851,7 +851,6 @@
+ ser.fDOMErrorHandler.handleError(error);
+
+ }
+- e.printStackTrace();
+ throw (LSException) DOMUtil.createLSException(LSException.SERIALIZE_ERR, e).fillInStackTrace();
+ }
+ return true;
+--- ./jaxws/.hgtags Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/.hgtags Mon Jan 05 11:56:55 2015 -0800
+@@ -472,11 +472,19 @@
+ dedfc93eeb5f4b28ad1a91902a0676aef0937e42 jdk7u65-b18
+ db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b19
+ 0cd66509e11335fac490076cbdcb2f47c592de86 jdk7u65-b32
++bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00
++0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01
++579128925dd9a0e9c529125c9e299dc0518037a5 jdk7u80-b02
+ 28d868d40df0d420b87698e1215e5039d24a8ae5 jdk7u65-b20
+ 1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01
+ db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b40
+ 190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31
+ 6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33
++1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01
++34e3554140b7f9efe2ad20fa04dfd5faf5821248 jdk7u67-b31
++6090119e680a65addafb82f2b6227315813b7e68 jdk7u67-b32
++aa1879afbb8dc4dd157eab31c86de2845a3cad6a jdk7u67-b33
++a3290ceed5750bfc62a5ec5c00ee1aea125e9db3 jdk7u67-b34
+ d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00
+ 1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01
+ 04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09
+@@ -502,3 +510,51 @@
+ b37043cee55ed025b04a3420908897e69c6c687f jdk7u71-b11
+ 3a432d7f01ed998ee6ca2ed04e818849a3d1e0c7 jdk7u71-b12
+ 9dd0dea849dd2550b58346977d9111717c1f38b2 jdk7u71-b13
++a580f2c49eacc68a11cf0e724aec4a974fb77745 jdk7u71-b14
++18676fc7713f5341f298a1ae2aee9e217fcdb5a5 jdk7u72-b01
++e4bbb79df2b13cea8c24ee2e6346e1aa30645400 jdk7u72-b02
++646f7c237e9ecde8df0fc6524b3605a89e6dc135 jdk7u72-b03
++30d42f2fde558b4aeae26cc7bda89b2badf88aab jdk7u72-b04
++761c40c9076aefac72bbff913e8bc088e565386f jdk7u72-b05
++a3961ce4d5c1fd1f9cde546e62760a008b5b9d60 jdk7u72-b06
++1153553de579fbbf8c328ea47f07accf8e2d9ac2 jdk7u72-b07
++7b00d0359f49c82b38bb2f2faafae53eacc1a995 jdk7u72-b08
++f16ea19cfd03274e9e1fd5367c3f4c23accf4e75 jdk7u72-b09
++615c0d49e8927c9b03f5694df4ddb7a5e45eaf6d jdk7u72-b10
++b34f135642cddf3c15f1fecaad320cb12cbd9472 jdk7u72-b11
++cfa494e8b9bcd29ba59f1bfa3c365418b4102f71 jdk7u72-b12
++d4be88d9bfbff3e41bc4121838e90160734d9805 jdk7u72-b13
++e33bca6f8dab3e82b2dec2c52074f19a88e1267e jdk7u72-b14
++587c4a3bfb76c03fa589f61e28ed739c537409bc jdk7u72-b30
++4257d52e30b4054c9ce43cfe830dff2b8f740037 jdk7u72-b31
++664724762a245f1cd9d89ccd3d3833fcb16bed80 jdk7u75-b00
++ce5b9e0d988cb52d9e6c36edeafe60bd16280534 jdk7u75-b01
++1b6ba791cbf7d995a81dfd1478906ebae3769ea2 jdk7u75-b02
++033349ac9e45fd897571ff4f6e38ed48d46cd539 jdk7u75-b03
++f1266833b5a07aa84d5da263f4a18503838286f4 jdk7u75-b04
++bfe594779717071439b94ddc771117eedb442a25 jdk7u75-b05
++b700cddd5754a82fca4f5465116fbba516a96667 jdk7u75-b06
++781d7a0230eef7cbef89bb32bc0d722730c198e3 jdk7u75-b07
++b85627d6afbb758fc244147dfdbbd287ee524eed jdk7u75-b08
++e7aef72db8cf95b27af7c2508a02bf87b52b325b jdk7u75-b09
++d7c340b9d530da158dce7da897f66e31e83b1366 jdk7u75-b10
++4b36c07b29c32064abdfa6df09c381861875ddd4 jdk7u75-b11
++5458349b0e4860662dc5a4f96363c0e714d09c65 jdk7u75-b12
++38d474b401c6a69dfc7cea5ba79a894980fa8107 jdk7u75-b13
++4d068ffb0b544d004792b3047c5aa9ab72b53529 jdk7u75-b30
++2232599a19acc7c45baa0b3c70f072a47f1cbc22 jdk7u75-b31
++5d60eecdd6b881856ddfc34e0d34f3072575662a jdk7u76-b00
++9fed28dcccaafd49f9a4b2aee30b2babc97d4a93 jdk7u76-b01
++7e479fddbf5d7b7840319a44d9e72562d7cfd83b jdk7u76-b02
++2dcdee347bf25efe5e5d5242a5608547398bb7c7 jdk7u76-b03
++42324883f9b32a6eaaf39c8e5d8ba2c65fb1015e jdk7u76-b04
++129bfaec2a1aca5c3ca3db303dd7e7342c17e350 jdk7u76-b05
++7c564f2cbb1cc439506a26785d07683f16b9ec40 jdk7u76-b06
++c99e49a9c2bf9503135ad319bcdb3b3724d1af5c jdk7u76-b07
++e98a28d564626be745026d697d7bb68a7f053ed7 jdk7u76-b08
++7de80762ae307e56156279d84c8d1dcf73b26164 jdk7u76-b09
++c84694b00c547056b8da98ae4c0c7c9feb06863b jdk7u76-b10
++df2786b1daffc450d7e7e43c9d63aaf72a5cd2f0 jdk7u76-b11
++dc818936e1050f0058d35a7a27946e4e2bfb27ee jdk7u76-b12
++a986e4b755f388532378d595831bebece7bf72c4 jdk7u76-b13
++260565d7fba1a2d176bd43d81b0714bd19cf4459 jdk7u76-b30
+--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Mon Jan 05 11:56:55 2015 -0800
+@@ -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,6 @@
+
+ package com.sun.tools.internal.ws.processor.model;
+
+-import com.sun.tools.internal.ws.wsdl.framework.Entity;
+ import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+ import com.sun.tools.internal.ws.wscompile.AbortException;
+ import com.sun.tools.internal.ws.resources.ModelMessages;
+@@ -177,7 +176,8 @@
+ throw new AbortException();
+ }
+ _parameters.add(p);
+- _parametersByName.put(p.getName(), p);
++ String name = p.getCustomName() != null ? p.getCustomName() : p.getName();
++ _parametersByName.put(name, p);
+ }
+
+ public Parameter getParameterByName(String name) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Mon Jan 05 11:56:55 2015 -0800
+@@ -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
+@@ -1757,9 +1757,9 @@
+ }
+
+ if (part.isIN())
+- setCustomizedParameterName(info.portTypeOperation, inMsg, part, param, false);
++ setCustomizedParameterName(info.bindingOperation, inMsg, part, param, false);
+ else if (outMsg != null)
+- setCustomizedParameterName(info.portTypeOperation, outMsg, part, param, false);
++ setCustomizedParameterName(info.bindingOperation, outMsg, part, param, false);
+
+ params.add(param);
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Mon Jan 05 11:56:55 2015 -0800
+@@ -54,17 +54,21 @@
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+ try {
+- Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+- //noinspection unchecked
+- final Method getInstance = refNav.getDeclaredMethod("getInstance");
++ final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+
+ // requires accessClassInPackage privilege
+- AccessController.doPrivileged(
+- new PrivilegedAction<Object>() {
++ final Method getInstance = AccessController.doPrivileged(
++ new PrivilegedAction<Method>() {
++
+ @Override
+- public Object run() {
+- getInstance.setAccessible(true);
+- return null;
++ public Method run() {
++ try {
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ return getInstance;
++ } catch (NoSuchMethodException e) {
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ }
+ }
+ }
+ );
+@@ -72,16 +76,10 @@
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("Can't find ReflectionNavigator class");
+ } catch (InvocationTargetException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
+- } catch (NoSuchMethodException e) {
+- e.printStackTrace();
+- throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ } catch (IllegalAccessException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
+ } catch (SecurityException e) {
+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Mon Jan 05 11:56:55 2015 -0800
+@@ -54,17 +54,20 @@
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+ try {
+- Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+- //noinspection unchecked
+- final Method getInstance = refNav.getDeclaredMethod("getInstance");
++ final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+
+ // requires accessClassInPackage privilege
+- AccessController.doPrivileged(
+- new PrivilegedAction<Object>() {
++ final Method getInstance = AccessController.doPrivileged(
++ new PrivilegedAction<Method>() {
+ @Override
+- public Object run() {
+- getInstance.setAccessible(true);
+- return null;
++ public Method run() {
++ try {
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ return getInstance;
++ } catch (NoSuchMethodException e) {
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ }
+ }
+ }
+ );
+@@ -72,16 +75,10 @@
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("Can't find ReflectionNavigator class");
+ } catch (InvocationTargetException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
+- } catch (NoSuchMethodException e) {
+- e.printStackTrace();
+- throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ } catch (IllegalAccessException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
+ } catch (SecurityException e) {
+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Mon Jan 05 11:56:55 2015 -0800
+@@ -40,6 +40,8 @@
+ import java.net.URI;
+ import java.net.URISyntaxException;
+ import java.net.URL;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.ArrayList;
+ import java.util.Calendar;
+ import java.util.Collections;
+@@ -194,8 +196,15 @@
+
+ static {
+
+- QName[] qnames = (System.getProperty(MAP_ANYURI_TO_URI) == null) ? new QName[] {
+- createXS("string"),
++ String MAP_ANYURI_TO_URI_VALUE = AccessController.doPrivileged(
++ new PrivilegedAction<String>() {
++ @Override
++ public String run() {
++ return System.getProperty(MAP_ANYURI_TO_URI);
++ }
++ }
++ );
++ QName[] qnames = (MAP_ANYURI_TO_URI_VALUE == null) ? new QName[] { createXS("string"),
+ createXS("anySimpleType"),
+ createXS("normalizedString"),
+ createXS("anyURI"),
+@@ -307,7 +316,7 @@
+ return v.toExternalForm();
+ }
+ });
+- if (System.getProperty(MAP_ANYURI_TO_URI) == null) {
++ if (MAP_ANYURI_TO_URI_VALUE == null) {
+ secondaryList.add(
+ new StringImpl<URI>(URI.class, createXS("string")) {
+ public URI parse(CharSequence text) throws SAXException {
+@@ -771,17 +780,18 @@
+ }
+ });
+ primaryList.add(
+- new StringImpl<BigDecimal>(BigDecimal.class,
+- createXS("decimal")
++ new StringImpl<BigDecimal>(BigDecimal.class,
++ createXS("decimal")
+ ) {
+- public BigDecimal parse(CharSequence text) {
+- return DatatypeConverterImpl._parseDecimal(text.toString());
++ public BigDecimal parse(CharSequence text) {
++ return DatatypeConverterImpl._parseDecimal(text.toString());
++ }
++
++ public String print(BigDecimal v) {
++ return DatatypeConverterImpl._printDecimal(v);
++ }
+ }
+-
+- public String print(BigDecimal v) {
+- return DatatypeConverterImpl._printDecimal(v);
+- }
+- });
++ );
+ primaryList.add(
+ new StringImpl<QName>(QName.class,
+ createXS("QName")
+@@ -809,7 +819,7 @@
+ w.getNamespaceContext().declareNamespace(v.getNamespaceURI(),v.getPrefix(),false);
+ }
+ });
+- if (System.getProperty(MAP_ANYURI_TO_URI) != null) {
++ if (MAP_ANYURI_TO_URI_VALUE != null) {
+ primaryList.add(
+ new StringImpl<URI>(URI.class, createXS("anyURI")) {
+ public URI parse(CharSequence text) throws SAXException {
+@@ -827,16 +837,17 @@
+ });
+ }
+ primaryList.add(
+- new StringImpl<Duration>(Duration.class, createXS("duration")) {
+- public String print(Duration duration) {
+- return duration.toString();
++ new StringImpl<Duration>(Duration.class, createXS("duration")) {
++ public String print(Duration duration) {
++ return duration.toString();
++ }
++
++ public Duration parse(CharSequence lexical) {
++ TODO.checkSpec("JSR222 Issue #42");
++ return DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString());
++ }
+ }
+-
+- public Duration parse(CharSequence lexical) {
+- TODO.checkSpec("JSR222 Issue #42");
+- return DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString());
+- }
+- });
++ );
+ primaryList.add(
+ new StringImpl<Void>(Void.class) {
+ // 'void' binding isn't defined by the spec, but when the JAX-RPC processes user-defined
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java Mon Jan 05 11:56:55 2015 -0800
+@@ -54,17 +54,20 @@
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+ try {
+- Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+- //noinspection unchecked
+- final Method getInstance = refNav.getDeclaredMethod("getInstance");
++ final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+
+ // requires accessClassInPackage privilege
+- AccessController.doPrivileged(
+- new PrivilegedAction<Object>() {
++ final Method getInstance = AccessController.doPrivileged(
++ new PrivilegedAction<Method>() {
+ @Override
+- public Object run() {
+- getInstance.setAccessible(true);
+- return null;
++ public Method run() {
++ try {
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ return getInstance;
++ } catch (NoSuchMethodException e) {
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ }
+ }
+ }
+ );
+@@ -72,16 +75,10 @@
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("Can't find ReflectionNavigator class");
+ } catch (InvocationTargetException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
+- } catch (NoSuchMethodException e) {
+- e.printStackTrace();
+- throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ } catch (IllegalAccessException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
+ } catch (SecurityException e) {
+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java Mon Jan 05 11:56:55 2015 -0800
+@@ -79,19 +79,19 @@
+
+ @Override
+ public void startElement(UnmarshallingContext.State state, TagName ea) {
+- state.target = new ArrayList();
++ state.setTarget(new ArrayList());
+ }
+
+ @Override
+ public void leaveElement(UnmarshallingContext.State state, TagName ea) {
+- state.target = toArray((List)state.target);
++ state.setTarget(toArray((List)state.getTarget()));
+ }
+
+ @Override
+ public void childElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+ if(ea.matches("","item")) {
+- state.loader = itemLoader;
+- state.receiver = this;
++ state.setLoader(itemLoader);
++ state.setReceiver(this);
+ } else {
+ super.childElement(state,ea);
+ }
+@@ -103,9 +103,9 @@
+ }
+
+ public void receive(UnmarshallingContext.State state, Object o) {
+- ((List)state.target).add(o);
++ ((List)state.getTarget()).add(o);
+ }
+- };
++ }
+
+ protected Object toArray( List list ) {
+ int len = list.size();
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java Mon Jan 05 11:56:55 2015 -0800
+@@ -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
+@@ -25,10 +25,6 @@
+
+ package com.sun.xml.internal.bind.v2.runtime;
+
+-import java.io.IOException;
+-
+-import javax.xml.stream.XMLStreamException;
+-
+ import com.sun.istack.internal.FinalArrayList;
+ import com.sun.istack.internal.SAXException2;
+
+@@ -36,6 +32,9 @@
+ import org.xml.sax.SAXException;
+ import org.xml.sax.helpers.DefaultHandler;
+
++import javax.xml.stream.XMLStreamException;
++import java.io.IOException;
++
+ /**
+ * Receives SAX2 events and send the equivalent events to
+ * {@link XMLSerializer}
+@@ -70,14 +69,14 @@
+ private boolean containsPrefixMapping(String prefix, String uri) {
+ for( int i=0; i<prefixMap.size(); i+=2 ) {
+ if(prefixMap.get(i).equals(prefix)
+- && prefixMap.get(i+1).equals(uri))
++ && prefixMap.get(i+1).equals(uri))
+ return true;
+ }
+ return false;
+ }
+
+ public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
+- throws SAXException {
++ throws SAXException {
+ try {
+ flushText();
+
+@@ -92,13 +91,13 @@
+ serializer.startElement(namespaceURI,localName, p,null);
+
+ // declare namespace events
+- for( int i=0; i<prefixMap.size(); i+=2 ) {
++ for (int i = 0; i < prefixMap.size(); i += 2) {
+ // forcibly set this binding, instead of using declareNsUri.
+ // this guarantees that namespaces used in DOM will show up
+ // as-is in the marshalled output (instead of reassigned to something else,
+ // which may happen if you'd use declareNsUri.)
+ serializer.getNamespaceContext().force(
+- prefixMap.get(i+1), prefixMap.get(i) );
++ prefixMap.get(i + 1), prefixMap.get(i));
+ }
+ // make sure namespaces needed by attributes are bound
+ for( int i=0; i<len; i++ ) {
+@@ -108,7 +107,7 @@
+ String prefix = getPrefix(qname);
+
+ serializer.getNamespaceContext().declareNamespace(
+- atts.getURI(i), prefix, true );
++ atts.getURI(i), prefix, true );
+ }
+
+ serializer.endNamespaceDecls(null);
+@@ -128,9 +127,10 @@
+ }
+ }
+
++ // make sure namespaces needed by attributes are bound
+ private String getPrefix(String qname) {
+ int idx = qname.indexOf(':');
+- String prefix = (idx==-1)?qname:qname.substring(0,idx);
++ String prefix = (idx == -1) ? "" : qname.substring(0, idx);
+ return prefix;
+ }
+
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java Mon Jan 05 11:56:55 2015 -0800
+@@ -208,8 +208,8 @@
+
+ @Override
+ public final void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+- state.loader = core;
+- state.intercepter = this;
++ state.setLoader(core);
++ state.setIntercepter(this);
+
+ // TODO: make sure there aren't too many duplicate of this code
+ // create the object to unmarshal
+@@ -231,21 +231,21 @@
+ fireBeforeUnmarshal(ElementBeanInfoImpl.this, child, state);
+
+ context.recordOuterPeer(child);
+- UnmarshallingContext.State p = state.prev;
+- p.backup = p.target;
+- p.target = child;
++ UnmarshallingContext.State p = state.getPrev();
++ p.setBackup(p.getTarget());
++ p.setTarget(child);
+
+ core.startElement(state,ea);
+ }
+
+ public Object intercept(UnmarshallingContext.State state, Object o) throws SAXException {
+- JAXBElement e = (JAXBElement)state.target;
+- state.target = state.backup;
+- state.backup = null;
++ JAXBElement e = (JAXBElement)state.getTarget();
++ state.setTarget(state.getBackup());
++ state.setBackup(null);
+
+- if (state.nil) {
++ if (state.isNil()) {
+ e.setNil(true);
+- state.nil = false;
++ state.setNil(false);
+ }
+
+ if(o!=null)
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java Mon Jan 05 11:56:55 2015 -0800
+@@ -54,17 +54,20 @@
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+ try {
+- Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+- //noinspection unchecked
+- final Method getInstance = refNav.getDeclaredMethod("getInstance");
++ final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+
+ // requires accessClassInPackage privilege
+- AccessController.doPrivileged(
+- new PrivilegedAction<Object>() {
++ final Method getInstance = AccessController.doPrivileged(
++ new PrivilegedAction<Method>() {
+ @Override
+- public Object run() {
+- getInstance.setAccessible(true);
+- return null;
++ public Method run() {
++ try {
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ return getInstance;
++ } catch (NoSuchMethodException e) {
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ }
+ }
+ }
+ );
+@@ -72,16 +75,10 @@
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("Can't find ReflectionNavigator class");
+ } catch (InvocationTargetException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
+- } catch (NoSuchMethodException e) {
+- e.printStackTrace();
+- throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ } catch (IllegalAccessException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
+ } catch (SecurityException e) {
+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java Mon Jan 05 11:56:55 2015 -0800
+@@ -90,7 +90,7 @@
+ idx = p;
+ }
+
+- state.target = toArray(r);
++ state.setTarget(toArray(r));
+ }
+ };
+
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java Mon Jan 05 11:56:55 2015 -0800
+@@ -98,7 +98,7 @@
+ UnmarshallingContext context = state.getContext();
+ context.startScope(1);
+ // inherit the target so that our children can access its target
+- state.target = state.prev.target;
++ state.setTarget(state.getPrev().getTarget());
+
+ // start it now, so that even if there's no children we can still return empty collection
+ context.getScope(0).start(acc,lister);
+@@ -116,8 +116,8 @@
+ super.childElement(state,ea);
+ return;
+ }
+- state.loader = child.loader;
+- state.receiver = child.receiver;
++ state.setLoader(child.loader);
++ state.setReceiver(child.receiver);
+ }
+
+ @Override
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java Mon Jan 05 11:56:55 2015 -0800
+@@ -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
+@@ -147,17 +147,17 @@
+ public void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+ // create or obtain the Map object
+ try {
+- target.set((BeanT)state.prev.target);
++ target.set((BeanT)state.getPrev().getTarget());
+ map.set(acc.get(target.get()));
+ if(map.get() == null) {
+ map.set(ClassFactory.create(mapImplClass));
+ }
+ map.get().clear();
+- state.target = map.get();
++ state.setTarget(map.get());
+ } catch (AccessorException e) {
+ // recover from error by setting a dummy Map that receives and discards the values
+ handleGenericException(e,true);
+- state.target = new HashMap();
++ state.setTarget(new HashMap());
+ }
+ }
+
+@@ -175,7 +175,7 @@
+ @Override
+ public void childElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+ if(ea.matches(entryTag)) {
+- state.loader = entryLoader;
++ state.setLoader(entryLoader);
+ } else {
+ super.childElement(state,ea);
+ }
+@@ -195,26 +195,26 @@
+ private final Loader entryLoader = new Loader(false) {
+ @Override
+ public void startElement(UnmarshallingContext.State state, TagName ea) {
+- state.target = new Object[2]; // this is inefficient
++ state.setTarget(new Object[2]); // this is inefficient
+ }
+
+ @Override
+ public void leaveElement(UnmarshallingContext.State state, TagName ea) {
+- Object[] keyValue = (Object[])state.target;
+- Map map = (Map) state.prev.target;
++ Object[] keyValue = (Object[])state.getTarget();
++ Map map = (Map) state.getPrev().getTarget();
+ map.put(keyValue[0],keyValue[1]);
+ }
+
+ @Override
+ public void childElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+ if(ea.matches(keyTag)) {
+- state.loader = keyLoader;
+- state.receiver = keyReceiver;
++ state.setLoader(keyLoader);
++ state.setReceiver(keyReceiver);
+ return;
+ }
+ if(ea.matches(valueTag)) {
+- state.loader = valueLoader;
+- state.receiver = valueReceiver;
++ state.setLoader(valueLoader);
++ state.setReceiver(valueReceiver);
+ return;
+ }
+ super.childElement(state,ea);
+@@ -232,7 +232,7 @@
+ this.index = index;
+ }
+ public void receive(UnmarshallingContext.State state, Object o) {
+- ((Object[])state.target)[index] = o;
++ ((Object[])state.getTarget())[index] = o;
+ }
+ }
+
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java Mon Jan 05 11:56:55 2015 -0800
+@@ -54,17 +54,20 @@
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+ try {
+- Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+- //noinspection unchecked
+- final Method getInstance = refNav.getDeclaredMethod("getInstance");
++ final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+
+ // requires accessClassInPackage privilege
+- AccessController.doPrivileged(
+- new PrivilegedAction<Object>() {
++ final Method getInstance = AccessController.doPrivileged(
++ new PrivilegedAction<Method>() {
+ @Override
+- public Object run() {
+- getInstance.setAccessible(true);
+- return null;
++ public Method run() {
++ try {
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ return getInstance;
++ } catch (NoSuchMethodException e) {
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ }
+ }
+ }
+ );
+@@ -72,16 +75,10 @@
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("Can't find ReflectionNavigator class");
+ } catch (InvocationTargetException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
+- } catch (NoSuchMethodException e) {
+- e.printStackTrace();
+- throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ } catch (IllegalAccessException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
+ } catch (SecurityException e) {
+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java Mon Jan 05 11:56:55 2015 -0800
+@@ -152,7 +152,7 @@
+
+ public void receive(UnmarshallingContext.State state, Object o) throws SAXException {
+ try {
+- set((BeanT) state.target, (ValueT) o);
++ set((BeanT) state.getTarget(), (ValueT) o);
+ } catch (AccessorException e) {
+ Loader.handleGenericException(e, true);
+ } catch (IllegalAccessError iae) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java Mon Jan 05 11:56:55 2015 -0800
+@@ -54,17 +54,20 @@
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+ try {
+- Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+- //noinspection unchecked
+- final Method getInstance = refNav.getDeclaredMethod("getInstance");
++ final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+
+ // requires accessClassInPackage privilege
+- AccessController.doPrivileged(
+- new PrivilegedAction<Object>() {
++ final Method getInstance = AccessController.doPrivileged(
++ new PrivilegedAction<Method>() {
+ @Override
+- public Object run() {
+- getInstance.setAccessible(true);
+- return null;
++ public Method run() {
++ try {
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ return getInstance;
++ } catch (NoSuchMethodException e) {
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ }
+ }
+ }
+ );
+@@ -72,16 +75,10 @@
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("Can't find ReflectionNavigator class");
+ } catch (InvocationTargetException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
+- } catch (NoSuchMethodException e) {
+- e.printStackTrace();
+- throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ } catch (IllegalAccessException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
+ } catch (SecurityException e) {
+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java Mon Jan 05 11:56:55 2015 -0800
+@@ -44,10 +44,10 @@
+ @Override
+ public void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+ // install the default value, but don't override the one given by the parent loader
+- if(state.elementDefaultValue==null)
+- state.elementDefaultValue = defaultValue;
++ if(state.getElementDefaultValue() == null)
++ state.setElementDefaultValue(defaultValue);
+
+- state.loader = l;
++ state.setLoader(l);
+ l.startElement(state,ea);
+ }
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java Mon Jan 05 11:56:55 2015 -0800
+@@ -44,8 +44,8 @@
+
+ @Override
+ public void childElement(UnmarshallingContext.State state, TagName ea) {
+- state.target = null;
++ state.setTarget(null);
+ // registering this allows the discarder to process the whole subtree.
+- state.loader = this;
++ state.setLoader(this);
+ }
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -98,10 +98,10 @@
+ @Override
+ public void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+ UnmarshallingContext context = state.getContext();
+- if (state.target == null)
+- state.target = new State(context);
++ if (state.getTarget() == null)
++ state.setTarget(new State(context));
+
+- State s = (State) state.target;
++ State s = (State) state.getTarget();
+ try {
+ s.declarePrefixes(context, context.getNewlyDeclaredPrefixes());
+ s.handler.startElement(ea.uri, ea.local, ea.getQname(), ea.atts);
+@@ -113,10 +113,10 @@
+
+ @Override
+ public void childElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+- state.loader = this;
+- State s = (State) state.prev.target;
++ state.setLoader(this);
++ State s = (State) state.getPrev().getTarget();
+ s.depth++;
+- state.target = s;
++ state.setTarget(s);
+ }
+
+ @Override
+@@ -124,7 +124,7 @@
+ if(text.length()==0)
+ return; // there's no point in creating an empty Text node in DOM.
+ try {
+- State s = (State) state.target;
++ State s = (State) state.getTarget();
+ s.handler.characters(text.toString().toCharArray(),0,text.length());
+ } catch( SAXException e ) {
+ state.getContext().handleError(e);
+@@ -134,7 +134,7 @@
+
+ @Override
+ public void leaveElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+- State s = (State) state.target;
++ State s = (State) state.getTarget();
+ UnmarshallingContext context = state.getContext();
+
+ try {
+@@ -156,7 +156,7 @@
+ }
+
+ // we are done
+- state.target = s.getElement();
++ state.setTarget(s.getElement());
+ }
+ }
+
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -47,7 +47,7 @@
+
+ public void text(UnmarshallingContext.State state, CharSequence text) throws SAXException {
+ try {
+- xacc.parse(state.prev.target,text);
++ xacc.parse(state.getPrev().getTarget(), text);
+ } catch (AccessorException e) {
+ handleGenericException(e,true);
+ } catch (RuntimeException e) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -55,9 +55,9 @@
+
+ @Override
+ public void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+- state.loader = selectLoader(state, ea);
+-
+- state.loader.startElement(state, ea);
++ final Loader loader = selectLoader(state, ea);
++ state.setLoader(loader);
++ loader.startElement(state, ea);
+ }
+
+ protected Loader selectLoader(UnmarshallingContext.State state, TagName ea) throws SAXException {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -88,8 +88,8 @@
+ public void childElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+ // notify the error, then recover by ignoring the whole element.
+ reportUnexpectedChildElement(ea, true);
+- state.loader = Discarder.INSTANCE;
+- state.receiver = null;
++ state.setLoader(Discarder.INSTANCE);
++ state.setReceiver(null);
+ }
+
+ @SuppressWarnings({"StringEquality"})
+@@ -191,10 +191,10 @@
+ UnmarshallingContext context = state.getContext();
+ Unmarshaller.Listener listener = context.parent.getListener();
+ if(beanInfo.hasBeforeUnmarshalMethod()) {
+- beanInfo.invokeBeforeUnmarshalMethod(context.parent, child, state.prev.target);
++ beanInfo.invokeBeforeUnmarshalMethod(context.parent, child, state.getPrev().getTarget());
+ }
+ if(listener!=null) {
+- listener.beforeUnmarshal(child, state.prev.target);
++ listener.beforeUnmarshal(child, state.getPrev().getTarget());
+ }
+ }
+ }
+@@ -211,10 +211,10 @@
+ UnmarshallingContext context = state.getContext();
+ Unmarshaller.Listener listener = context.parent.getListener();
+ if(beanInfo.hasAfterUnmarshalMethod()) {
+- beanInfo.invokeAfterUnmarshalMethod(context.parent, child, state.target);
++ beanInfo.invokeAfterUnmarshalMethod(context.parent, child, state.getTarget());
+ }
+ if(listener!=null)
+- listener.afterUnmarshal(child, state.target);
++ listener.afterUnmarshal(child, state.getTarget());
+ }
+ }
+
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -41,7 +41,7 @@
+ @Override
+ public final void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+ Loader loader = selectLoader(state,ea);
+- state.loader = loader;
++ state.setLoader(loader);
+ loader.startElement(state,ea);
+ }
+
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java Mon Jan 05 11:56:55 2015 -0800
+@@ -116,17 +116,7 @@
+ if( qname==null || qname.length()==0 )
+ qname=local;
+
+-
+- boolean ignorable = true;
+- StructureLoader sl;
+-
+- // not null only if element content is processed (StructureLoader is used)
+- // ugly
+- if((sl = this.context.getStructureLoader()) != null) {
+- ignorable = ((ClassBeanInfoImpl)sl.getBeanInfo()).hasElementOnlyContentModel();
+- }
+-
+- processText(ignorable);
++ processText(!context.getCurrentState().isMixed());
+
+ tagName.uri = uri;
+ tagName.local = local;
+@@ -162,7 +152,7 @@
+ }
+
+ private void processText( boolean ignorable ) throws SAXException {
+- if( predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer)))
++ if (predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer)))
+ next.text(buffer);
+ buffer.setLength(0);
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java Mon Jan 05 11:56:55 2015 -0800
+@@ -97,7 +97,7 @@
+ public void add( Accessor<BeanT,PropT> acc, Lister<BeanT,PropT,ItemT,PackT> lister, ItemT value) throws SAXException{
+ try {
+ if(!hasStarted()) {
+- this.bean = (BeanT)context.getCurrentState().target;
++ this.bean = (BeanT)context.getCurrentState().getTarget();
+ this.acc = acc;
+ this.lister = lister;
+ this.pack = lister.startPacking(bean,acc);
+@@ -121,7 +121,7 @@
+ public void start( Accessor<BeanT,PropT> acc, Lister<BeanT,PropT,ItemT,PackT> lister) throws SAXException{
+ try {
+ if(!hasStarted()) {
+- this.bean = (BeanT)context.getCurrentState().target;
++ this.bean = (BeanT)context.getCurrentState().getTarget();
+ this.acc = acc;
+ this.lister = lister;
+ this.pack = lister.startPacking(bean,acc);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java Mon Jan 05 11:56:55 2015 -0800
+@@ -70,7 +70,7 @@
+ // Quick hack until SJSXP fixes 6270116
+ boolean isZephyr = readerClass.getName().equals("com.sun.xml.internal.stream.XMLReaderImpl");
+ if (getBoolProp(reader,"org.codehaus.stax2.internNames") &&
+- getBoolProp(reader,"org.codehaus.stax2.internNsUris"))
++ getBoolProp(reader,"org.codehaus.stax2.internNsUris"))
+ ; // no need for interning
+ else
+ if (isZephyr)
+@@ -219,8 +219,8 @@
+ int nsCount = staxStreamReader.getNamespaceCount();
+ for (int i = 0; i < nsCount; i++) {
+ visitor.startPrefixMapping(
+- fixNull(staxStreamReader.getNamespacePrefix(i)),
+- fixNull(staxStreamReader.getNamespaceURI(i)));
++ fixNull(staxStreamReader.getNamespacePrefix(i)),
++ fixNull(staxStreamReader.getNamespaceURI(i)));
+ }
+
+ // fire startElement
+@@ -310,13 +310,13 @@
+ protected void handleCharacters() throws XMLStreamException, SAXException {
+ if( predictor.expectText() )
+ buffer.append(
+- staxStreamReader.getTextCharacters(),
+- staxStreamReader.getTextStart(),
+- staxStreamReader.getTextLength() );
++ staxStreamReader.getTextCharacters(),
++ staxStreamReader.getTextStart(),
++ staxStreamReader.getTextLength() );
+ }
+
+ private void processText( boolean ignorable ) throws SAXException {
+- if( predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer))) {
++ if( predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer) || context.getCurrentState().isMixed())) {
+ if(textReported) {
+ textReported = false;
+ } else {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -171,7 +171,7 @@
+
+ context.recordInnerPeer(child);
+
+- state.target = child;
++ state.setTarget(child);
+
+ fireBeforeUnmarshal(beanInfo, child, state);
+
+@@ -196,7 +196,7 @@
+ String qname = atts.getQName(i);
+ if(atts.getURI(i).equals(WellKnownNamespace.XML_SCHEMA_INSTANCE))
+ continue; // xsi:* attributes are meant to be processed by us, not by user apps.
+- Object o = state.target;
++ Object o = state.getTarget();
+ Map<QName,String> map = attCatchAll.get(o);
+ if(map==null) {
+ // TODO: use ClassFactory.inferImplClass(sig,knownImplClasses)
+@@ -238,8 +238,8 @@
+ }
+ }
+
+- state.loader = child.loader;
+- state.receiver = child.receiver;
++ state.setLoader(child.loader);
++ state.setReceiver(child.receiver);
+ }
+
+ @Override
+@@ -261,7 +261,7 @@
+ @Override
+ public void leaveElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+ state.getContext().endScope(frameSize);
+- fireAfterUnmarshal(beanInfo, state.target, state.prev);
++ fireAfterUnmarshal(beanInfo, state.getTarget(), state.getPrev());
+ }
+
+ private static final QNameMap<TransducedAccessor> EMPTY = new QNameMap<TransducedAccessor>();
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -51,7 +51,7 @@
+
+ public void text(UnmarshallingContext.State state, CharSequence text) throws SAXException {
+ try {
+- state.target = xducer.parse(text);
++ state.setTarget(xducer.parse(text));
+ } catch (AccessorException e) {
+ handleGenericException(e,true);
+ } catch (RuntimeException e) {
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java Mon Jan 05 11:56:55 2015 -0800
+@@ -183,20 +183,19 @@
+ /**
+ * Loader that owns this element.
+ */
+- public Loader loader;
++ private Loader loader;
+ /**
+ * Once {@link #loader} is completed, this receiver
+ * receives the result.
+ */
+- public Receiver receiver;
++ private Receiver receiver;
+
+- public Intercepter intercepter;
+-
++ private Intercepter intercepter;
+
+ /**
+ * Object being unmarshalled by this {@link #loader}.
+ */
+- public Object target;
++ private Object target;
+
+ /**
+ * Hack for making JAXBElement unmarshalling work.
+@@ -225,7 +224,7 @@
+ * @see ElementBeanInfoImpl.IntercepterLoader#startElement(State, TagName)
+ * @see ElementBeanInfoImpl.IntercepterLoader#intercept(State, Object)
+ */
+- public Object backup;
++ private Object backup;
+
+ /**
+ * Number of {@link UnmarshallingContext#nsBind}s declared thus far.
+@@ -241,17 +240,22 @@
+ * or by a child {@link Loader} when
+ * {@link Loader#startElement(State, TagName)} is called.
+ */
+- public String elementDefaultValue;
++ private String elementDefaultValue;
+
+ /**
+ * {@link State} for the parent element
+ *
+ * {@link State} objects form a doubly linked list.
+ */
+- public State prev;
++ private State prev;
+ private State next;
+
+- public boolean nil = false;
++ private boolean nil = false;
++
++ /**
++ * specifies that we are working with mixed content
++ */
++ private boolean mixed = false;
+
+ /**
+ * Gets the context.
+@@ -262,13 +266,17 @@
+
+ private State(State prev) {
+ this.prev = prev;
+- if(prev!=null)
++ if(prev!=null) {
+ prev.next = this;
++ if (prev.mixed) // parent is in mixed mode
++ this.mixed = true;
++ }
+ }
+
+ private void push() {
+- if(next==null)
+- allocateMoreStates();
++ if(next==null) {
++ next = new State(this);
++ }
+ State n = next;
+ n.numNsDecl = nsLen;
+ current = n;
+@@ -278,11 +286,71 @@
+ assert prev!=null;
+ loader = null;
+ nil = false;
++ mixed = false;
+ receiver = null;
+ intercepter = null;
+ elementDefaultValue = null;
+ target = null;
+ current = prev;
++ next = null;
++ }
++
++ public boolean isMixed() {
++ return mixed;
++ }
++
++ public Object getTarget() {
++ return target;
++ }
++
++ public void setLoader(Loader loader) {
++ if (loader instanceof StructureLoader) // set mixed mode
++ mixed = !((StructureLoader)loader).getBeanInfo().hasElementOnlyContentModel();
++ this.loader = loader;
++ }
++
++ public void setReceiver(Receiver receiver) {
++ this.receiver = receiver;
++ }
++
++ public State getPrev() {
++ return prev;
++ }
++
++ public void setIntercepter(Intercepter intercepter) {
++ this.intercepter = intercepter;
++ }
++
++ public void setBackup(Object backup) {
++ this.backup = backup;
++ }
++
++ public void setTarget(Object target) {
++ this.target = target;
++ }
++
++ public Object getBackup() {
++ return backup;
++ }
++
++ public boolean isNil() {
++ return nil;
++ }
++
++ public void setNil(boolean nil) {
++ this.nil = nil;
++ }
++
++ public Loader getLoader() {
++ return loader;
++ }
++
++ public String getElementDefaultValue() {
++ return elementDefaultValue;
++ }
++
++ public void setElementDefaultValue(String elementDefaultValue) {
++ this.elementDefaultValue = elementDefaultValue;
+ }
+ }
+
+@@ -322,7 +390,6 @@
+ this.parent = _parent;
+ this.assoc = assoc;
+ this.root = this.current = new State(null);
+- allocateMoreStates();
+ }
+
+ public void reset(InfosetScanner scanner,boolean isInplaceMode, JaxBeanInfo expectedType, IDResolver idResolver) {
+@@ -369,22 +436,6 @@
+ return null;
+ }
+
+- /**
+- * Allocates a few more {@link State}s.
+- *
+- * Allocating multiple {@link State}s at once allows those objects
+- * to be allocated near each other, which reduces the working set
+- * of CPU. It improves the chance the relevant data is in the cache.
+- */
+- private void allocateMoreStates() {
+- // this method should be used only when we run out of a state.
+- assert current.next==null;
+-
+- State s = current;
+- for( int i=0; i<8; i++ )
+- s = new State(s);
+- }
+-
+ public void clearStates() {
+ State last = current;
+ while (last.next != null) last = last.next;
+@@ -487,16 +538,15 @@
+ }
+
+ public void text(CharSequence pcdata) throws SAXException {
+- State cur = current;
+ pushCoordinator();
+ try {
+- if(cur.elementDefaultValue!=null) {
+- if(pcdata.length()==0) {
++ if (current.elementDefaultValue != null) {
++ if (pcdata.length() == 0) {
+ // send the default value into the unmarshaller instead
+- pcdata = cur.elementDefaultValue;
++ pcdata = current.elementDefaultValue;
+ }
+ }
+- cur.loader.text(cur,pcdata);
++ current.loader.text(current, pcdata);
+ } finally {
+ popCoordinator();
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -49,18 +49,17 @@
+
+ public void text(UnmarshallingContext.State state, CharSequence text) throws SAXException {
+ try {
+- xacc.parse(state.target,text);
++ xacc.parse(state.getTarget(),text);
+ } catch (AccessorException e) {
+ handleGenericException(e,true);
+ } catch (RuntimeException e) {
+- if(state.prev != null) {
+- if(state.prev.target instanceof JAXBElement) {
+- ; // do nothing - issue 601 - don't report exceptions like
+- // NumberFormatException when unmarshalling "nillable" element
+- // (I suppose JAXBElement indicates this
+- } else {
++ if(state.getPrev() != null) {
++ if (!(state.getPrev().getTarget() instanceof JAXBElement))
+ handleParseConversionException(state,e);
+- }
++ // else
++ // do nothing - issue 601 - don't report exceptions like
++ // NumberFormatException when unmarshalling "nillable" element
++ // (I suppose JAXBElement indicates this
+ } else {
+ handleParseConversionException(state,e);
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -62,7 +62,7 @@
+ onNil(state);
+ boolean hasOtherAttributes = (ea.atts.getLength() - 1) > 0;
+ // see issues 6759703 and 565 - need to preserve attributes even if the element is nil; only when the type is stored in JAXBElement
+- if (!(hasOtherAttributes && (state.prev.target instanceof JAXBElement))) {
++ if (!(hasOtherAttributes && (state.getPrev().getTarget() instanceof JAXBElement))) {
+ return Discarder.INSTANCE;
+ }
+ }
+@@ -96,8 +96,8 @@
+ @Override
+ protected void onNil(UnmarshallingContext.State state) throws SAXException {
+ try {
+- acc.set(state.prev.target,null);
+- state.prev.nil = true;
++ acc.set(state.getPrev().getTarget(),null);
++ state.getPrev().setNil(true);
+ } catch (AccessorException e) {
+ handleGenericException(e,true);
+ }
+@@ -113,7 +113,7 @@
+ @Override
+ protected void onNil(UnmarshallingContext.State state) {
+ // let the receiver add this to the lister
+- state.target = null;
++ state.setTarget(null);
+ }
+ }
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java Mon Jan 05 11:56:55 2015 -0800
+@@ -61,7 +61,7 @@
+ beanInfo = defaultBeanInfo;
+
+ Loader loader = beanInfo.getLoader(null,false);
+- state.loader = loader;
++ state.setLoader(loader);
+ loader.startElement(state,ea);
+ }
+
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Mon Jan 05 11:56:55 2015 -0800
+@@ -571,7 +571,8 @@
+ 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");
++ // this handler seems to be not used according VCS history ...
++ // 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");
+ }
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java Mon Jan 05 11:56:55 2015 -0800
+@@ -54,17 +54,20 @@
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+ try {
+- Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+- //noinspection unchecked
+- final Method getInstance = refNav.getDeclaredMethod("getInstance");
++ final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+
+ // requires accessClassInPackage privilege
+- AccessController.doPrivileged(
+- new PrivilegedAction<Object>() {
++ final Method getInstance = AccessController.doPrivileged(
++ new PrivilegedAction<Method>() {
+ @Override
+- public Object run() {
+- getInstance.setAccessible(true);
+- return null;
++ public Method run() {
++ try {
++ Method getInstance = refNav.getDeclaredMethod("getInstance");
++ getInstance.setAccessible(true);
++ return getInstance;
++ } catch (NoSuchMethodException e) {
++ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
++ }
+ }
+ }
+ );
+@@ -72,16 +75,10 @@
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("Can't find ReflectionNavigator class");
+ } catch (InvocationTargetException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
+- } catch (NoSuchMethodException e) {
+- e.printStackTrace();
+- throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ } catch (IllegalAccessException e) {
+- e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
+ } catch (SecurityException e) {
+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
+--- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java Mon Sep 08 12:16:05 2014 -0700
++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java Mon Jan 05 11:56:55 2015 -0800
+@@ -139,19 +139,12 @@
+ }
+
+ public EndpointReference readEndpointReference(final Source eprInfoset) {
+- // EPR constructors are private, so we need privilege escalation.
+- // this unmarshalling can only access instances of a fixed, known set of classes,
+- // so doing that shouldn't introduce security vulnerability.
+- return AccessController.doPrivileged(new PrivilegedAction<EndpointReference>() {
+- public EndpointReference run() {
+- try {
+- Unmarshaller unmarshaller = eprjc.get().createUnmarshaller();
+- return (EndpointReference) unmarshaller.unmarshal(eprInfoset);
+- } catch (JAXBException e) {
+- throw new WebServiceException("Error creating Marshaller or marshalling.", e);
+- }
+- }
+- });
++ try {
++ Unmarshaller unmarshaller = eprjc.get().createUnmarshaller();
++ return (EndpointReference) unmarshaller.unmarshal(eprInfoset);
++ } catch (JAXBException e) {
++ throw new WebServiceException("Error creating Marshaller or marshalling.", e);
++ }
+ }
+
+ public <T> T getPort(EndpointReference endpointReference, Class<T> clazz, WebServiceFeature... webServiceFeatures) {
+--- ./jdk/.hgtags Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/.hgtags Mon Jan 05 11:57:27 2015 -0800
+@@ -456,11 +456,19 @@
+ 7f7430459adfe7b7fb65da8c3fac2ac5e3495ea1 jdk7u65-b18
+ ba6cef21c369076be97dd8133fd4a158cd486bd8 jdk7u65-b19
+ c3a56021fc22f886106f123d4f25b385ac6b79d7 jdk7u65-b32
++efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u80-b00
++bc7f9d966c1df3748ef9c148eab25976cd065963 jdk7u80-b01
++2590a9c18fdba19086712bb91a28352e9239a2be jdk7u80-b02
+ 8b9d926bd35adceb99f244b7b068fedb0f220f03 jdk7u65-b20
+ 5cf343beab2ce73d299d4f1a8f3b95892f9fd818 jdk7u67-b01
+ ba6cef21c369076be97dd8133fd4a158cd486bd8 jdk7u65-b40
+ 7b47a34063e94e1ab5636b11231d33fae92754c9 jdk7u65-b31
+ 4cb63f8ca9ee8c60d6f3d0051b69acc8392bd8de jdk7u65-b33
++5cf343beab2ce73d299d4f1a8f3b95892f9fd818 jdk7u67-b01
++388d34a2e45c2660e7ede2a9d80949b14b5d8df9 jdk7u67-b31
++de2b809bb95904bfd5c2ad47cf0f41c97abd5750 jdk7u67-b32
++193d852a6dce1aaf47f1e6960e1c83936bd0e0a4 jdk7u67-b33
++d425e2aa1a6bcdf909c9ac7f690f3e87dcf6e3f6 jdk7u67-b34
+ 9ccfe70cee626ac7831cfa7b7a7eb7a88fe1cd42 jdk7u66-b00
+ fc87b55d62fc1e81aaf61ff21175129b8ccc302e jdk7u66-b01
+ c67e394e49429565540f04c5c2a5544f750658bb jdk7u66-b09
+@@ -486,3 +494,55 @@
+ 1108ab8e3dce0318529b4bcda46ce895659bb09b jdk7u71-b11
+ ae4e88c495851c43862e2fc3d1ff7b64c68f368c jdk7u71-b12
+ a6cbc82d62f915cdcd6037c8b40a4590585553c7 jdk7u71-b13
++78a7e3c7165d4c281d4f90bb2304e95ca2c96969 jdk7u71-b14
++c76a5b2876b98194ccbeffeab76a0326bf163ba2 jdk7u72-b01
++b02c1a8b10cd7338eb808ebfaa5a74b4997fdc8f jdk7u72-b02
++bc98cecdab4cd4a97316a5407c91bdedc92d4bb5 jdk7u72-b03
++b227c93ab2c91ce4b412d1cfb4f7649bff30677b jdk7u72-b04
++dd7983c1586dd9e6e6d53bfa05d7e164329979b0 jdk7u72-b05
++b57a21af9f6d3cd9498099c329063a671b39e3c4 jdk7u72-b06
++9d53e2319954cc1479e190e26b110168c7073b0a jdk7u72-b07
++584b227e8efe21dd47a616afdb4f1f2a2fd630cf jdk7u72-b08
++2ee54b1c7203b9973e0b2ab06cf73e98886ee099 jdk7u72-b09
++d3257f2beb42163afe64adea65b53a18d039eb0d jdk7u72-b10
++4946dc66a0c77133a0a6e3198bd9bd1ec5ef0344 jdk7u72-b11
++e556571078d5c8d24b527ed809d12f37f6e3745b jdk7u72-b12
++13ed37084621a8af551ec46650c07ea96f1a22ba jdk7u72-b13
++f4cf053f2ed3df23b756dd182061876ac9774bc5 jdk7u72-b14
++6ef59d24666e8af5428706fc32295a5d088a48c9 jdk7u72-b30
++550c9196d41b566e01f2d164a1b5e0aba9871f5e jdk7u72-b31
++87f9570ca734714f981d4a47477dcc6c80a7d324 jdk7u75-b00
++0fefa48e670a31015be985ba74e35841d0cc66c1 jdk7u75-b01
++e885a036cc5dc0f8fa07dc0a5f55647f819f3fc5 jdk7u75-b02
++4b81833e1c004460c78208c2529775a05f3abf80 jdk7u75-b03
++1964c973dcc1ddb30115b7c7b6183548b3adcdf5 jdk7u75-b04
++ec3e1e179298a41bc6b77a170e2da66efb0bae3b jdk7u75-b05
++e9596c6470c944ff19c5198cfeb7fd979aad9120 jdk7u75-b06
++e0afb6ec0633d18f360f074c5672fa4c2196ea39 jdk7u75-b07
++8268d82995af433655d3db9a51b549032c19537d jdk7u75-b08
++0a1fe04693dd9f65176c35dc0631652086795f01 jdk7u75-b09
++c43642c55cd483f1d270e9ce55b9721fc32f900c jdk7u75-b10
++7bac76091c46f667f69aa9e426c29cc8e3a2d861 jdk7u75-b11
++1a37584734ff241c0c4c4382f7870efedef7e706 jdk7u75-b12
++16043c4cefc3cc5d859d97434abbdf79a7a58e49 jdk7u75-b13
++3778e2621fc972f88ac8a247543ad63527e7d9cd jdk7u75-b30
++cc9469a8208838cc4adec61acf0429c17622e75b jdk7u75-b31
++0666a58a7e584380c1b1dadb50ec67400110a9ab jdk7u76-b00
++182b3e8a732d6b0d21bd7d602361e5276f14b886 jdk7u76-b01
++3c743031578a431ccc1e27691b1958355d02caec jdk7u76-b02
++5e3a73518863851da31129b815a142ad34a3d376 jdk7u76-b03
++50322d45a16bd3f50a050f858495a586395e6095 jdk7u76-b04
++e41867e626749cf34019f9e45493cf049acbcec4 jdk7u76-b05
++7ca26abf06dd8e11c6d7f6ad724b8d5abc3c709d jdk7u76-b06
++84163d4b66f0acc5301223cd25b4093780950640 jdk7u76-b07
++81f8878be887f80e2bcd4c7f43f1da2de8d22273 jdk7u76-b08
++81f8878be887f80e2bcd4c7f43f1da2de8d22273 jdk7u76-b08
++0000000000000000000000000000000000000000 jdk7u76-b08
++0000000000000000000000000000000000000000 jdk7u76-b08
++9c008aa88919f1ab6d4337b66546f594443680b2 jdk7u76-b08
++70371a63e6c9ff4a73a2bbb09315c4138cf25792 jdk7u76-b09
++c67a0b63cc6971ced2e233b63ebbdec063ad81d2 jdk7u76-b10
++e0e3c03502518c460d51d8c517b081cbd712a9c1 jdk7u76-b11
++9af83882ca9e628f9e35634b930081271a91d561 jdk7u76-b12
++1af0023da23e23482947b715fbf3bdfdee0d2813 jdk7u76-b13
++c5567031a820910ded5f20f2d7fa21c433d744ca jdk7u76-b30
+--- ./jdk/make/bridge/Jabswitch/Makefile Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/bridge/Jabswitch/Makefile Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2012, 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
+@@ -44,7 +44,10 @@
+ JAB_MANIFEST_INP = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/jabswitch.manifest
+ JAB_MANIFEST_OUT = $(TEMPDIR)/jabswitch.exe.intermediate.manifest
+
+-RC_FLAGS += /fo "$(VERSIONRES)"
++RC_FLAGS += /fo "$(VERSIONRES)" \
++ /D "JDK_FNAME=$(PROGRAM)$(EXE_SUFFIX)" \
++ /D "JDK_INTERNAL_NAME=$(PROGRAM)" \
++ /D "JDK_FTYPE=0x1L"
+ OTHER_CPPFLAGS += /MD /Fo"$(TEMPDIR)/" /Fd"$(TEMPDIR)/" /analyze- /Od /Gd /nologo /Gm /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /RTC1 /W3 /ZI /Zc:wchar_t /EHsc
+ LDDFLAGS += Advapi32.lib Version.lib User32.lib
+
+--- ./jdk/make/com/apple/osxui/Makefile Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/com/apple/osxui/Makefile Mon Jan 05 11:57:27 2015 -0800
+@@ -67,6 +67,7 @@
+
+ RESOURCE_BUNDLES_COMPILED_PROPERTIES += \
+ com/apple/laf/resources/aqua.properties
++LOCALE_SET_DEFINITION = jre
+
+ #
+ # Rules
+--- ./jdk/make/com/sun/nio/Makefile Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/com/sun/nio/Makefile Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2009, 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
+@@ -29,13 +29,8 @@
+
+ BUILDDIR = ../../..
+ include $(BUILDDIR)/common/Defs.gmk
+-
+-# MMM: disable for now
+-ifneq ($(PLATFORM), macosx)
+ include $(BUILDDIR)/common/Subdirs.gmk
+ SUBDIRS = sctp
+-endif
+-
+
+ all build clean clobber::
+ $(SUBDIRS-loop)
+--- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2009, 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
+@@ -28,6 +28,7 @@
+ #
+
+ ifneq ($(PLATFORM), windows)
++ifneq ($(PLATFORM), macosx)
+ FILES_export = \
+ sun/nio/ch/SctpAssocChange.java \
+ sun/nio/ch/SctpChannelImpl.java \
+@@ -37,3 +38,4 @@
+ sun/nio/ch/SctpServerChannelImpl.java \
+ sun/nio/ch/SctpStdSocketOption.java
+ endif
++endif
+--- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2009, 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
+@@ -24,8 +24,10 @@
+ #
+
+ ifneq ($(PLATFORM),windows)
++ifneq ($(PLATFORM),macosx)
+ FILES_c = \
+ SctpNet.c \
+ SctpChannelImpl.c \
+ SctpServerChannelImpl.c
+ endif
++endif
+--- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2009, 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
+@@ -23,7 +23,7 @@
+ # questions.
+ #
+ FILES_java = \
+- com/sun/nio/sctp/AbstractNotificationHandler.java \
++ com/sun/nio/sctp/AbstractNotificationHandler.java \
+ com/sun/nio/sctp/Association.java \
+ com/sun/nio/sctp/AssociationChangeNotification.java \
+ com/sun/nio/sctp/HandlerResult.java \
+@@ -43,9 +43,13 @@
+ com/sun/nio/sctp/ShutdownNotification.java \
+ \
+ sun/nio/ch/SctpMessageInfoImpl.java \
+- sun/nio/ch/SctpStdSocketOption.java
++ sun/nio/ch/SctpStdSocketOption.java \
++ sun/nio/ch/SctpChannelImpl.java \
++ sun/nio/ch/SctpMultiChannelImpl.java \
++ sun/nio/ch/SctpServerChannelImpl.java
+
+ ifneq ($(PLATFORM), windows)
++ifneq ($(PLATFORM), macosx)
+ FILES_java += \
+ sun/nio/ch/SctpAssocChange.java \
+ sun/nio/ch/SctpAssociationImpl.java \
+@@ -58,9 +62,5 @@
+ sun/nio/ch/SctpSendFailed.java \
+ sun/nio/ch/SctpServerChannelImpl.java \
+ sun/nio/ch/SctpShutdown.java
+-else
+-FILES_java += \
+- sun/nio/ch/SctpChannelImpl.java \
+- sun/nio/ch/SctpMultiChannelImpl.java \
+- sun/nio/ch/SctpServerChannelImpl.java
+ endif
++endif
+--- ./jdk/make/com/sun/nio/sctp/Makefile Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/com/sun/nio/sctp/Makefile Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2009, 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,7 +41,15 @@
+ include FILES_java.gmk
+ include Exportedfiles.gmk
+
++ifeq ($(PLATFORM), windows)
++include $(BUILDDIR)/common/Classes.gmk
++endif
++ifeq ($(PLATFORM), macosx)
++include $(BUILDDIR)/common/Classes.gmk
++endif
++
+ ifneq ($(PLATFORM), windows)
++ifneq ($(PLATFORM), macosx)
+ include $(BUILDDIR)/common/Mapfile-vers.gmk
+ include $(BUILDDIR)/common/Library.gmk
+
+@@ -67,12 +75,9 @@
+ ifeq ($(PLATFORM), solaris)
+ #LIBSCTP = -lsctp
+ OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
+-endif # PLATFORM
+-
+-else # windows
+-include $(BUILDDIR)/common/Classes.gmk
+-endif # ifneq windows
+-
++endif
++endif # macosx
++endif # windows
+
+ clean clobber::
+ $(RM) -r $(CLASSDESTDIR)/com/sun/nio/sctp
+--- ./jdk/make/common/Defs-linux.gmk Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/common/Defs-linux.gmk Mon Jan 05 11:57:27 2015 -0800
+@@ -191,9 +191,9 @@
+ CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+-CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
++CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 -D_BIG_ENDIAN
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+-CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
++CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 -D_BIG_ENDIAN
+ LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
+ CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN
+--- ./jdk/make/common/internal/Resources.gmk Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/common/internal/Resources.gmk Mon Jan 05 11:57:27 2015 -0800
+@@ -225,6 +225,10 @@
+ $(add-property-java-file)
+ $(GENSRCDIR)/%_zh_HK.java: $(SHARE_SRC)/classes/%_zh_TW.properties
+ $(add-property-java-file)
++ifdef PLATFORM_SRC_MACOS
++$(GENSRCDIR)/%_zh_HK.java: $(PLATFORM_SRC_MACOS)/classes/%_zh_TW.properties
++ $(add-property-java-file)
++endif
+
+ # Simple delivery of zh_HK properties files just copies zh_TW properties files
+ $(CLASSDESTDIR)/%_zh_HK.properties: \
+--- ./jdk/make/java/java/mapfile-vers Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/java/java/mapfile-vers Mon Jan 05 11:57:27 2015 -0800
+@@ -275,6 +275,7 @@
+ Java_sun_misc_VM_latestUserDefinedLoader;
+ Java_sun_misc_VM_initialize;
+ Java_sun_misc_VMSupport_initAgentProperties;
++ Java_sun_misc_VMSupport_getVMTemporaryDirectory;
+
+ # ZipFile.c needs this one
+ throwFileNotFoundException;
+--- ./jdk/make/sun/javazic/tzdata/VERSION Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/VERSION Mon Jan 05 11:57:27 2015 -0800
+@@ -1,24 +1,24 @@
+ #
+ # 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.
+ #
+-tzdata2014c
++tzdata2014j
+--- ./jdk/make/sun/javazic/tzdata/africa Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/africa Mon Jan 05 11:57:27 2015 -0800
+@@ -21,36 +21,35 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future). For more, please see
++# the file CONTRIBUTING in the tz distribution.
+
+-# From Paul Eggert (2013-02-21):
++# From Paul Eggert (2014-10-31):
+ #
+-# A good source for time zone historical data outside the U.S. is
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually. Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990. Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Another source occasionally used is Edward W. Whitman, World Time Differences,
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+ # I found in the UCLA library.
+ #
+ # For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+@@ -58,13 +57,13 @@
+ # Previous editions of this database used WAT, CAT, SAT, and EAT
+ # for +0:00 through +3:00, respectively,
+ # but Mark R V Murray reports that
+-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
+-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
+-# `WAT' is probably the best name for +1:00, as the common phrase for
+-# the area that includes Nigeria is ``West Africa''.
+-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
++# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
++# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
++# 'WAT' is probably the best name for +1:00, as the common phrase for
++# the area that includes Nigeria is "West Africa".
++# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
+ #
+-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
++# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
+ # I'd guess that this was because people needed _some_ name for -1:00,
+ # and at the time, far west Africa was the only major land area in -1:00.
+ # This usage is now obsolete, as the last use of -1:00 on the African
+@@ -77,7 +76,7 @@
+ # 2:00 SAST South Africa Standard Time
+ # and Murray suggests the following abbreviation:
+ # 1:00 WAT West Africa Time
+-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
++# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
+ # for times before 1976, but this is the best I can think of
+ # until we get more information.
+ #
+@@ -88,7 +87,6 @@
+ # 3:00 CAST Central Africa Summer Time (no longer used)
+ # 3:00 SAST South Africa Summer Time (no longer used)
+ # 3:00 EAT East Africa Time
+-# 4:00 EAST East Africa Summer Time (no longer used)
+
+ # Algeria
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+@@ -117,9 +115,9 @@
+ # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
+ # more precise 0:09:21.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
+- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
+- 0:00 Algeria WE%sT 1940 Feb 25 2:00
++Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
++ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
++ 0:00 Algeria WE%sT 1940 Feb 25 2:00
+ 1:00 Algeria CE%sT 1946 Oct 7
+ 0:00 - WET 1956 Jan 29
+ 1:00 - CET 1963 Apr 14
+@@ -129,92 +127,71 @@
+ 1:00 - CET
+
+ # Angola
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Luanda 0:52:56 - LMT 1892
+- 0:52:04 - AOT 1911 May 26 # Angola Time
+- 1:00 - WAT
+-
+ # Benin
+-# Whitman says they switched to 1:00 in 1946, not 1934;
+-# go with Shanks & Pottenger.
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Porto-Novo 0:10:28 - LMT 1912
+- 0:00 - GMT 1934 Feb 26
+- 1:00 - WAT
++# See Africa/Lagos.
+
+ # Botswana
+-# From Paul Eggert (2013-02-21):
+-# Milne says they were regulated by the Cape Town Signal in 1899;
+-# assume they switched to 2:00 when Cape Town did.
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Gaborone 1:43:40 - LMT 1885
+- 1:30 - SAST 1903 Mar
+- 2:00 - CAT 1943 Sep 19 2:00
+- 2:00 1:00 CAST 1944 Mar 19 2:00
+- 2:00 - CAT
++# See Africa/Maputo.
+
+ # Burkina Faso
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Ouagadougou -0:06:04 - LMT 1912
+- 0:00 - GMT
++# See Africa/Abidjan.
+
+ # Burundi
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Bujumbura 1:57:28 - LMT 1890
+- 2:00 - CAT
++# See Africa/Maputo.
+
+ # Cameroon
+-# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Douala 0:38:48 - LMT 1912
+- 1:00 - WAT
++# See Africa/Lagos.
+
+ # Cape Verde
++#
++# Shanks gives 1907 for the transition to CVT.
++# Perhaps the 1911-05-26 Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# merely made it official?
++#
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Atlantic/Cape_Verde -1:34:04 - LMT 1907 # Praia
++Zone Atlantic/Cape_Verde -1:34:04 - LMT 1907 # Praia
+ -2:00 - CVT 1942 Sep
+ -2:00 1:00 CVST 1945 Oct 15
+- -2:00 - CVT 1975 Nov 25 2:00
++ -2:00 - CVT 1975 Nov 25 2:00
+ -1:00 - CVT
+
+ # Central African Republic
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Bangui 1:14:20 - LMT 1912
+- 1:00 - WAT
++# See Africa/Lagos.
+
+ # Chad
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Ndjamena 1:00:12 - LMT 1912
++Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena
+ 1:00 - WAT 1979 Oct 14
+ 1:00 1:00 WAST 1980 Mar 8
+ 1:00 - WAT
+
+ # Comoros
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro
+- 3:00 - EAT
++# See Africa/Nairobi.
+
+-# Democratic Republic of Congo
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9
+- 1:00 - WAT
+-Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9
+- 2:00 - CAT
++# Democratic Republic of the Congo
++# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
+
+ # Republic of the Congo
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Brazzaville 1:01:08 - LMT 1912
+- 1:00 - WAT
++# See Africa/Lagos.
+
+-# Cote D'Ivoire
++# Côte d'Ivoire / Ivory Coast
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Africa/Abidjan -0:16:08 - LMT 1912
+ 0:00 - GMT
++Link Africa/Abidjan Africa/Bamako # Mali
++Link Africa/Abidjan Africa/Banjul # Gambia
++Link Africa/Abidjan Africa/Conakry # Guinea
++Link Africa/Abidjan Africa/Dakar # Senegal
++Link Africa/Abidjan Africa/Freetown # Sierra Leone
++Link Africa/Abidjan Africa/Lome # Togo
++Link Africa/Abidjan Africa/Nouakchott # Mauritania
++Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso
++Link Africa/Abidjan Africa/Sao_Tome # São Tomé and Príncipe
++Link Africa/Abidjan Atlantic/St_Helena # St Helena
+
+ # Djibouti
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul
+- 3:00 - EAT
++# See Africa/Nairobi.
+
+ ###############################################################################
+
+@@ -254,30 +231,26 @@
+ # Egyptians would approve the cancellation."
+ #
+ # Egypt to cancel daylight saving time
+-# <a href="http://www.almasryalyoum.com/en/node/407168">
+ # http://www.almasryalyoum.com/en/node/407168
+-# </a>
+ # or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt04.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
+-# </a>
+ Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S
+-Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 -
++Rule Egypt 1995 2005 - Sep lastThu 24:00 0 -
+ # From Steffen Thorsen (2006-09-19):
+ # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
+ # Egypt will turn back clocks by one hour at the midnight of Thursday
+ # after observing the daylight saving time since May.
+ # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
+-Rule Egypt 2006 only - Sep 21 23:00s 0 -
++Rule Egypt 2006 only - Sep 21 24:00 0 -
+ # From Dirk Losch (2007-08-14):
+ # I received a mail from an airline which says that the daylight
+ # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
+-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
++# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
+ # http://www.nentjes.info/Bill/bill5.htm
+ # http://www.timeanddate.com/worldclock/city.html?n=53
+ # From Steffen Thorsen (2007-09-04): The official information...:
+ # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
+-Rule Egypt 2007 only - Sep Thu>=1 23:00s 0 -
++Rule Egypt 2007 only - Sep Thu>=1 24:00 0 -
+ # From Abdelrahman Hassan (2007-09-06):
+ # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
+ # than the year of the Gregorian calendar, Ramadan shifts earlier each
+@@ -311,15 +284,9 @@
+ #
+ # timeanddate[2] and another site I've found[3] also support that.
+ #
+-# [1] <a href="https://bugzilla.redhat.com/show_bug.cgi?id=492263">
+-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
+-# </a>
+-# [2] <a href="http://www.timeanddate.com/worldclock/clockchange.html?n=53">
+-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
+-# </a>
+-# [3] <a href="http://wwp.greenwichmeantime.com/time-zone/africa/egypt/">
+-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
+-# </a>
++# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
++# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
++# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
+
+ # From Arthur David Olson (2009-04-20):
+ # In 2009 (and for the next several years), Ramadan ends before the fourth
+@@ -329,14 +296,10 @@
+ # From Steffen Thorsen (2009-08-11):
+ # We have been able to confirm the August change with the Egyptian Cabinet
+ # Information and Decision Support Center:
+-# <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html">
+ # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
+-# </a>
+ #
+ # The Middle East News Agency
+-# <a href="http://www.mena.org.eg/index.aspx">
+ # http://www.mena.org.eg/index.aspx
+-# </a>
+ # also reports "Egypt starts winter time on August 21"
+ # today in article numbered "71, 11/08/2009 12:25 GMT."
+ # Only the title above is available without a subscription to their service,
+@@ -344,67 +307,93 @@
+ # (at least today).
+
+ # From Alexander Krivenyshev (2010-07-20):
+-# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
++# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
+ # decided that Daylight Saving Time will not be used in Egypt during
+ # Ramadan.
+ #
+ # Arabic translation:
+-# "Clocks to go back during Ramadan--and then forward again"
+-# <a href="http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again">
++# "Clocks to go back during Ramadan - and then forward again"
+ # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt02.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
+-# </a>
+
+ # From Ahmad El-Dardiry (2014-05-07):
+ # Egypt is to change back to Daylight system on May 15
+ # http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
+
+-# From Gunther Vermier (2015-05-13):
++# From Gunther Vermier (2014-05-13):
+ # our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
+
+-# From Paul Eggert (2014-05-13):
++# From Imed Chihi (2014-06-04):
++# We have finally "located" a precise official reference about the DST changes
++# in Egypt. The Ministers Cabinet decision is explained at
++# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
++# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
++# translates into: "With regard to daylight saving time, it is scheduled to
++# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
++# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
++# and re-established again at the end of the month of Ramadan, at twelve
++# o'clock on the evening of Thursday, 31 JUL 2014." This statement has been
++# reproduced by other (more accessible) sites[, e.g.,]...
++# http://elgornal.net/news/news.aspx?id=4699258
++
++# From Paul Eggert (2014-06-04):
+ # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
+ # the change is because of blackouts in Cairo, even though Ahram Online (cited
+-# above) says DST had no affect on electricity consumption. The AP story says
+-# DST will not be observed during Ramadan. There is no information about when
+-# DST will end. See:
++# above) says DST had no affect on electricity consumption. There is
++# no information about when DST will end this fall. See:
+ # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
+ #
+-# For now, guess that later transitions will use 2010's rules, and that
+-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
+-# ends, though (unlike Morocco) it will switch at 00:00 standard time. In
+-# Egypt the spring-forward transitions are removed for 2020-2022, when the
+-# guessed spring-forward date falls during the estimated Ramadan, and all
+-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
+-# outside the guessed daylight-saving time. Ramadan intrudes on the guessed
+-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
+-
+-Rule Egypt 2008 only - Aug lastThu 23:00s 0 -
+-Rule Egypt 2009 only - Aug 20 23:00s 0 -
+-Rule Egypt 2010 only - Aug 11 0:00 0 -
+-Rule Egypt 2010 only - Sep 10 0:00 1:00 S
+-Rule Egypt 2010 only - Sep lastThu 23:00s 0 -
++# For now, guess that later spring and fall transitions will use
++# 2010's rules, and guess that Egypt will switch to standard time at
++# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
++# first Friday after Ramadan. To implement this,
++# transition dates for 2015 through 2037 were determined by running
++# the following program under GNU Emacs 24.3, with the results integrated
++# by hand into the table below. Ramadan again intrudes on the guessed
++# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
++# (let ((islamic-year 1436))
++# (while (< islamic-year 1460)
++# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
++# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
++# (friday 5))
++# (while (/= friday (mod a 7))
++# (setq a (1- a)))
++# (while (/= friday (mod b 7))
++# (setq b (1+ b)))
++# (setq a (1- a))
++# (setq b (1- b))
++# (setq a (calendar-gregorian-from-absolute a))
++# (setq b (calendar-gregorian-from-absolute b))
++# (insert
++# (format
++# (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
++# "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
++# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
++# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
++# (setq islamic-year (+ 1 islamic-year))))
++Rule Egypt 2008 only - Aug lastThu 24:00 0 -
++Rule Egypt 2009 only - Aug 20 24:00 0 -
++Rule Egypt 2010 only - Aug 10 24:00 0 -
++Rule Egypt 2010 only - Sep 9 24:00 1:00 S
++Rule Egypt 2010 only - Sep lastThu 24:00 0 -
+ Rule Egypt 2014 only - May 15 24:00 1:00 S
+-Rule Egypt 2014 only - Jun 29 0:00s 0 -
+-Rule Egypt 2014 only - Jul 29 0:00s 1:00 S
+-Rule Egypt 2014 max - Sep lastThu 23:00s 0 -
++Rule Egypt 2014 only - Jun 26 24:00 0 -
++Rule Egypt 2014 only - Jul 31 24:00 1:00 S
++Rule Egypt 2014 max - Sep lastThu 24:00 0 -
+ Rule Egypt 2015 2019 - Apr lastFri 0:00s 1:00 S
+-Rule Egypt 2015 only - Jun 18 0:00s 0 -
+-Rule Egypt 2015 only - Jul 18 0:00s 1:00 S
+-Rule Egypt 2016 only - Jun 7 0:00s 0 -
+-Rule Egypt 2016 only - Jul 7 0:00s 1:00 S
+-Rule Egypt 2017 only - May 27 0:00s 0 -
+-Rule Egypt 2017 only - Jun 26 0:00s 1:00 S
+-Rule Egypt 2018 only - May 16 0:00s 0 -
+-Rule Egypt 2018 only - Jun 15 0:00s 1:00 S
+-Rule Egypt 2019 only - May 6 0:00s 0 -
+-Rule Egypt 2019 only - Jun 5 0:00s 1:00 S
+-Rule Egypt 2020 only - May 24 0:00s 1:00 S
+-Rule Egypt 2021 only - May 13 0:00s 1:00 S
+-Rule Egypt 2022 only - May 3 0:00s 1:00 S
++Rule Egypt 2015 only - Jun 11 24:00 0 -
++Rule Egypt 2015 only - Jul 23 24:00 1:00 S
++Rule Egypt 2016 only - Jun 2 24:00 0 -
++Rule Egypt 2016 only - Jul 7 24:00 1:00 S
++Rule Egypt 2017 only - May 25 24:00 0 -
++Rule Egypt 2017 only - Jun 29 24:00 1:00 S
++Rule Egypt 2018 only - May 10 24:00 0 -
++Rule Egypt 2018 only - Jun 14 24:00 1:00 S
++Rule Egypt 2019 only - May 2 24:00 0 -
++Rule Egypt 2019 only - Jun 6 24:00 1:00 S
++Rule Egypt 2020 only - May 28 24:00 1:00 S
++Rule Egypt 2021 only - May 13 24:00 1:00 S
++Rule Egypt 2022 only - May 5 24:00 1:00 S
+ Rule Egypt 2023 max - Apr lastFri 0:00s 1:00 S
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -412,60 +401,44 @@
+ 2:00 Egypt EE%sT
+
+ # Equatorial Guinea
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Malabo 0:35:08 - LMT 1912
+- 0:00 - GMT 1963 Dec 15
+- 1:00 - WAT
++# See Africa/Lagos.
+
+ # Eritrea
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Asmara 2:35:32 - LMT 1870
+- 2:35:32 - AMT 1890 # Asmara Mean Time
+- 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
+- 3:00 - EAT
+-
+ # Ethiopia
+-# From Paul Eggert (2006-03-22):
+-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
+-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
+-# We'll guess that 38E50 is for Adis Dera.
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Addis_Ababa 2:34:48 - LMT 1870
+- 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
+- 3:00 - EAT
++# See Africa/Nairobi.
+
+ # Gabon
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Libreville 0:37:48 - LMT 1912
+- 1:00 - WAT
++# See Africa/Lagos.
+
+ # Gambia
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Banjul -1:06:36 - LMT 1912
+- -1:06:36 - BMT 1935 # Banjul Mean Time
+- -1:00 - WAT 1964
+- 0:00 - GMT
++# See Africa/Abidjan.
+
+ # Ghana
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-# Whitman says DST was observed from 1931 to ``the present'';
+-# go with Shanks & Pottenger.
+-Rule Ghana 1936 1942 - Sep 1 0:00 0:20 GHST
+-Rule Ghana 1936 1942 - Dec 31 0:00 0 GMT
++# Whitman says DST was observed from 1931 to "the present";
++# Shanks & Pottenger say 1936 to 1942;
++# and September 1 to January 1 is given by:
++# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
++# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
++# For lack of better info, assume DST was observed from 1920 to 1942.
++Rule Ghana 1920 1942 - Sep 1 0:00 0:20 GHST
++Rule Ghana 1920 1942 - Dec 31 0:00 0 GMT
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Africa/Accra -0:00:52 - LMT 1918
+ 0:00 Ghana %s
+
+ # Guinea
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Conakry -0:54:52 - LMT 1912
+- 0:00 - GMT 1934 Feb 26
+- -1:00 - WAT 1960
+- 0:00 - GMT
++# See Africa/Abidjan.
+
+ # Guinea-Bissau
++#
++# Shanks gives 1911-05-26 for the transition to WAT,
++# evidently confusing the date of the Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# with the date that it took effect, namely 1912-01-01.
++#
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Bissau -1:02:20 - LMT 1911 May 26
++Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1
+ -1:00 - WAT 1975
+ 0:00 - GMT
+
+@@ -476,13 +449,18 @@
+ 2:30 - BEAT 1940
+ 2:45 - BEAUT 1960
+ 3:00 - EAT
++Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia
++Link Africa/Nairobi Africa/Asmara # Eritrea
++Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
++Link Africa/Nairobi Africa/Djibouti
++Link Africa/Nairobi Africa/Kampala # Uganda
++Link Africa/Nairobi Africa/Mogadishu # Somalia
++Link Africa/Nairobi Indian/Antananarivo # Madagascar
++Link Africa/Nairobi Indian/Comoro
++Link Africa/Nairobi Indian/Mayotte
+
+ # Lesotho
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Maseru 1:50:00 - LMT 1903 Mar
+- 2:00 - SAST 1943 Sep 19 2:00
+- 2:00 1:00 SAST 1944 Mar 19 2:00
+- 2:00 - SAST
++# See Africa/Johannesburg.
+
+ # Liberia
+ # From Paul Eggert (2006-03-22):
+@@ -549,38 +527,22 @@
+ 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.
++# the IATA SSIM data entries contain some obvious errors.
+ 2:00 - EET 1996 Sep 30
+ 1:00 Libya CE%sT 1997 Oct 4
+- 2:00 - EET 2012 Nov 10 2:00
+- 1:00 Libya CE%sT 2013 Oct 25 2:00
++ 2:00 - EET 2012 Nov 10 2:00
++ 1:00 Libya CE%sT 2013 Oct 25 2:00
+ 2:00 - EET
+
+ # Madagascar
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Indian/Antananarivo 3:10:04 - LMT 1911 Jul
+- 3:00 - EAT 1954 Feb 27 23:00s
+- 3:00 1:00 EAST 1954 May 29 23:00s
+- 3:00 - EAT
++# See Africa/Nairobi.
+
+ # Malawi
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar
+- 2:00 - CAT
++# See Africa/Maputo.
+
+ # Mali
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Bamako -0:32:00 - LMT 1912
+- 0:00 - GMT 1934 Feb 26
+- -1:00 - WAT 1960 Jun 20
+- 0:00 - GMT
+-
+ # Mauritania
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Nouakchott -1:03:48 - LMT 1912
+- 0:00 - GMT 1934 Feb 26
+- -1:00 - WAT 1960 Nov 28
+- 0:00 - GMT
++# See Africa/Abidjan.
+
+ # Mauritius
+
+@@ -604,9 +566,7 @@
+
+ # From Steffen Thorsen (2008-07-10):
+ # According to
+-# <a href="http://www.lexpress.mu/display_article.php?news_id=111216">
+ # http://www.lexpress.mu/display_article.php?news_id=111216
+-# </a>
+ # (in French), Mauritius will start and end their DST a few days earlier
+ # than previously announced (2008-11-01 to 2009-03-31). The new start
+ # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
+@@ -621,22 +581,17 @@
+
+ # From Alex Krivenyshev (2008-07-11):
+ # Seems that English language article "The revival of daylight saving
+-# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally
++# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally
+ # published on Monday, June 30, 2008...
+ #
+ # I guess that article in French "Le gouvernement avance l'introduction
+-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
+-# and ending on March 27, 2009 is the most recent one.
+-# ...
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html">
++# de l'heure d'été" stating that DST in Mauritius starting on October 26
++# and ending on March 27, 2009 is the most recent one....
+ # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
+-# </a>
+
+ # From Riad M. Hossen Ally (2008-08-03):
+ # The Government of Mauritius weblink
+-# <a href="http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD">
+ # http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
+-# </a>
+ # Cabinet Decision of July 18th, 2008 states as follows:
+ #
+ # 4. ...Cabinet has agreed to the introduction into the National Assembly
+@@ -646,33 +601,25 @@
+ # States of America. It will start at two o'clock in the morning on the
+ # last Sunday of October and will end at two o'clock in the morning on
+ # the last Sunday of March the following year. The summer time for the
+-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
++# year 2008-2009 will, therefore, be effective as from 26 October 2008
+ # and end on 29 March 2009.
+
+ # From Ed Maste (2008-10-07):
+ # THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
+ # beginning / ending of summer time is 2 o'clock standard time in the
+ # morning of the last Sunday of October / last Sunday of March.
+-# <a href="http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf">
+ # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
+-# </a>
+
+ # From Steffen Thorsen (2009-06-05):
+ # According to several sources, Mauritius will not continue to observe
+ # DST the coming summer...
+ #
+ # Some sources, in French:
+-# <a href="http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB">
+ # http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
+-# </a>
+-# <a href="http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-">
+ # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
+-# </a>
+ #
+ # Our wrap-up:
+-# <a href="http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html">
+ # http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
+-# </a>
+
+ # From Arthur David Olson (2009-07-11):
+ # The "mauritius-dst-will-not-repeat" wrapup includes this:
+@@ -685,18 +632,16 @@
+ Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 S
+ Rule Mauritius 2009 only - Mar lastSun 2:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
++Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
+ 4:00 Mauritius MU%sT # Mauritius Time
+ # Agalega Is, Rodriguez
+ # no information; probably like Indian/Mauritius
+
+ # Mayotte
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
+- 3:00 - EAT
++# See Africa/Nairobi.
+
+ # Morocco
+-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
++# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
+
+ # From Alex Krivenyshev (2008-05-09):
+ # Here is an article that Morocco plan to introduce Daylight Saving Time between
+@@ -704,60 +649,44 @@
+ #
+ # "... Morocco is to save energy by adjusting its clock during summer so it will
+ # be one hour ahead of GMT between 1 June and 27 September, according to
+-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
++# Communication Minister and Government Spokesman, Khalid Naciri...."
+ #
+-# <a href="http://www.worldtimezone.net/dst_news/dst_news_morocco01.html">
+ # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
+-# </a>
+-# OR
+-# <a href="http://en.afrik.com/news11892.html">
+ # http://en.afrik.com/news11892.html
+-# </a>
+
+ # From Alex Krivenyshev (2008-05-09):
+-# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
+-# <a href="http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view">
++# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe
++# Presse:
+ # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
+-# </a>
+ #
+ # Morocco shifts to daylight time on June 1st through September 27, Govt.
+ # spokesman.
+
+ # From Patrice Scattolin (2008-05-09):
+ # According to this article:
+-# <a href="http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html">
+ # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
+-# </a>
+-# (and republished here:
+-# <a href="http://www.actu.ma/heure-dete-comment_i127896_0.html">
+-# http://www.actu.ma/heure-dete-comment_i127896_0.html
+-# </a>
+-# )
+-# the changes occurs at midnight:
++# (and republished here: <http://www.actu.ma/heure-dete-comment_i127896_0.html>)
++# the changes occur at midnight:
+ #
+-# saturday night may 31st at midnight (which in french is to be
+-# intrepreted as the night between saturday and sunday)
+-# sunday night the 28th at midnight
++# Saturday night May 31st at midnight (which in French is to be
++# interpreted as the night between Saturday and Sunday)
++# Sunday night the 28th at midnight
+ #
+-# Seeing that the 28th is monday, I am guessing that she intends to say
+-# the midnight of the 28th which is the midnight between sunday and
+-# monday, which jives with other sources that say that it's inclusive
+-# june1st to sept 27th.
++# Seeing that the 28th is Monday, I am guessing that she intends to say
++# the midnight of the 28th which is the midnight between Sunday and
++# Monday, which jives with other sources that say that it's inclusive
++# June 1st to Sept 27th.
+ #
+ # The decision was taken by decree *2-08-224 *but I can't find the decree
+ # published on the web.
+ #
+ # It's also confirmed here:
+-# <a href="http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm">
+ # http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
+-# </a>
+-# on a government portal as being between june 1st and sept 27th (not yet
+-# posted in english).
++# on a government portal as being between June 1st and Sept 27th (not yet
++# posted in English).
+ #
+-# The following google query will generate many relevant hits:
+-# <a href="http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search">
++# The following Google query will generate many relevant hits:
+ # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
+-# </a>
+
+ # From Steffen Thorsen (2008-08-27):
+ # Morocco will change the clocks back on the midnight between August 31
+@@ -765,47 +694,32 @@
+ # of September:
+ #
+ # One article about it (in French):
+-# <a href="http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default">
+ # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
+-# </a>
+ #
+ # We have some further details posted here:
+-# <a href="http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html">
+ # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
+-# </a>
+
+ # From Steffen Thorsen (2009-03-17):
+ # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
+ # to many sources, such as
+-# <a href="http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html">
+ # http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
+-# </a>
+-# <a href="http://www.medi1sat.ma/fr/depeche.aspx?idp=2312">
+ # http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
+-# </a>
+ # (French)
+ #
+ # Our summary:
+-# <a href="http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html">
+ # http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
+-# </a>
+
+ # From Alexander Krivenyshev (2009-03-17):
+ # Here is a link to official document from Royaume du Maroc Premier Ministre,
+-# Ministere de la Modernisation des Secteurs Publics
++# Ministère de la Modernisation des Secteurs Publics
+ #
+ # Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
+ # concerning the amendment of the legal time, the Ministry of Modernization of
+ # Public Sectors announced that the official time in the Kingdom will be
+ # advanced 60 minutes from Sunday 31 May 2009 at midnight.
+ #
+-# <a href="http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf">
+ # http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
+-# </a>
+-#
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco03.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
+-# </a>
+
+ # From Steffen Thorsen (2010-04-13):
+ # Several news media in Morocco report that the Ministry of Modernization
+@@ -813,51 +727,33 @@
+ # 2010-05-02 to 2010-08-08.
+ #
+ # Example:
+-# <a href="http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html">
+ # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
+-# </a>
+ # (French)
+ # Our page:
+-# <a href="http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html">
+ # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
+-# </a>
+
+ # From Dan Abitol (2011-03-30):
+ # ...Rules for Africa/Casablanca are the following (24h format)
+-# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00
+-# The 31th july 2011 at 00:59:59, [it] will be 31th July 00:00:00
++# The 3rd April 2011 at 00:00:00, [it] will be 3rd April 01:00:00
++# The 31st July 2011 at 00:59:59, [it] will be 31st July 00:00:00
+ # ...Official links of change in morocco
+ # The change was broadcast on the FM Radio
+ # I ve called ANRT (telecom regulations in Morocco) at
+ # +212.537.71.84.00
+-# <a href="http://www.anrt.net.ma/fr/">
+ # http://www.anrt.net.ma/fr/
+-# </a>
+ # They said that
+-# <a href="http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view">
+ # http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
+-# </a>
+ # is the official publication to look at.
+ # They said that the decision was already taken.
+ #
+ # More articles in the press
+-# <a href="http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev">
+-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
+-# </a>
+-# e.html
+-# <a href="http://www.lematin.ma/Actualite/Express/Article.asp?id=148923">
++# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
+ # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
+-# </a>
+-# <a href="http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim">
+ # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
+-# anche-prochain-5538.html
+-# </a>
+
+ # From Petr Machata (2011-03-30):
+ # They have it written in English here:
+-# <a href="http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view">
+ # http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
+-# </a>
+ #
+ # It says there that "Morocco will resume its standard time on July 31,
+ # 2011 at midnight." Now they don't say whether they mean midnight of
+@@ -865,20 +761,16 @@
+ # also been like that in the past.
+
+ # From Alexander Krivenyshev (2012-03-09):
+-# According to Infom&eacute;diaire web site from Morocco (infomediaire.ma),
+-# on March 9, 2012, (in French) Heure l&eacute;gale:
+-# Le Maroc adopte officiellement l'heure d'&eacute;t&eacute;
+-# <a href="http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9">
++# According to Infomédiaire web site from Morocco (infomediaire.ma),
++# on March 9, 2012, (in French) Heure légale:
++# Le Maroc adopte officiellement l'heure d'été
+ # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
+-# </a>
+ # Governing Council adopted draft decree, that Morocco DST starts on
+ # the last Sunday of March (March 25, 2012) and ends on
+ # last Sunday of September (September 30, 2012)
+ # except the month of Ramadan.
+ # or (brief)
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco06.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
+-# </a>
+
+ # From Arthur David Olson (2012-03-10):
+ # The infomediaire.ma source indicates that the system is to be in
+@@ -889,17 +781,13 @@
+
+ # From Christophe Tropamer (2012-03-16):
+ # Seen Morocco change again:
+-# <a href="http://www.le2uminutes.com/actualite.php">
+ # http://www.le2uminutes.com/actualite.php
+-# </a>
+-# "...&agrave; partir du dernier dimance d'avril et non fins mars,
+-# comme annonc&eacute; pr&eacute;c&eacute;demment."
++# "...à partir du dernier dimanche d'avril et non fins mars,
++# comme annoncé précédemment."
+
+ # From Milamber Space Network (2012-07-17):
+ # The official return to GMT is announced by the Moroccan government:
+-# <a href="http://www.mmsp.gov.ma/fr/actualites.aspx?id=288">
+ # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
+-# </a>
+ #
+ # Google translation, lightly edited:
+ # Back to the standard time of the Kingdom (GMT)
+@@ -917,7 +805,7 @@
+ # announced a bit in advance. On 2012-07-11 the Moroccan government
+ # announced that year's Ramadan daylight-saving transitions would be
+ # 2012-07-20 and 2012-08-20; see
+-# <http://www.mmsp.gov.ma/fr/actualites.aspx?id=288>.
++# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288
+
+ # From Andrew Paprocki (2013-07-02):
+ # Morocco announced that the year's Ramadan daylight-savings
+@@ -937,39 +825,36 @@
+ # From Sebastien Willemijns (2014-03-18):
+ # http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
+
+-# From Paul Eggert (2014-03-19):
+-# To estimate what the Moroccan government will do in future years,
+-# transition dates for 2014 through 2038 were determined by running
+-# the following program under GNU Emacs 24.3:
+-#
+-# (let ((islamic-year 1435))
+-# (while (< islamic-year 1461)
+-# (let ((a
+-# (calendar-gregorian-from-absolute
+-# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
+-# (b
+-# (calendar-gregorian-from-absolute
+-# (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
+-# (insert
+-# (format
+-# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
+-# "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
+-# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+-# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
++# From Milamber Space Network (2014-06-05):
++# The Moroccan government has recently announced that the country will return
++# to standard time at 03:00 on Saturday, June 28, 2014 local time.... DST
++# will resume again at 02:00 on Saturday, August 2, 2014....
++# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
++
++# From Paul Eggert (2014-06-05):
++# For now, guess that later spring and fall transitions will use 2014's rules,
++# and guess that Morocco will switch to standard time at 03:00 the last
++# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
++# Ramadan. To implement this, transition dates for 2015 through 2037 were
++# determined by running the following program under GNU Emacs 24.3, with the
++# results integrated by hand into the table below.
++# (let ((islamic-year 1436))
++# (while (< islamic-year 1460)
++# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
++# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
++# (saturday 6))
++# (while (/= saturday (mod (setq a (1- a)) 7)))
++# (while (/= saturday (mod b 7))
++# (setq b (1+ b)))
++# (setq a (calendar-gregorian-from-absolute a))
++# (setq b (calendar-gregorian-from-absolute b))
++# (insert
++# (format
++# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
++# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
++# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
++# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+ # (setq islamic-year (+ 1 islamic-year))))
+-#
+-# with spring-forward transitions removed for 2023-2025, when the
+-# normal spring-forward date falls during the estimated Ramadan; with
+-# all transitions removed for 2026-2035, where the estimated Ramadan
+-# falls entirely outside daylight-saving time; and with fall-back
+-# transitions removed for 2036-2037, where the normal fall-back
+-# date falls during the estimated Ramadan. Normally, the table would
+-# stop after 2037 because 32-bit time_t values roll around early in 2038,
+-# but that would imply a prediction of perpetual DST after March 2038
+-# due to the year-2037 glitches. So, this table instead stops after
+-# 2038, the first non-glitchy year after the 32-bit rollover.
+-# An advantage of stopping after 2038 is that it lets zic guess
+-# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
+
+ # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+
+@@ -991,46 +876,44 @@
+ Rule Morocco 2008 only - Jun 1 0:00 1:00 S
+ Rule Morocco 2008 only - Sep 1 0:00 0 -
+ Rule Morocco 2009 only - Jun 1 0:00 1:00 S
+-Rule Morocco 2009 only - Aug 21 0:00 0 -
++Rule Morocco 2009 only - Aug 21 0:00 0 -
+ Rule Morocco 2010 only - May 2 0:00 1:00 S
+ 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 -
+-Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S
+-Rule Morocco 2012 only - Sep 30 3:00 0 -
+-Rule Morocco 2012 only - Jul 20 3:00 0 -
+-Rule Morocco 2012 only - Aug 20 2:00 1:00 S
+-Rule Morocco 2013 only - Jul 7 3:00 0 -
+-Rule Morocco 2013 only - Aug 10 2:00 1:00 S
+-Rule Morocco 2013 2035 - Oct lastSun 3:00 0 -
+-Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
+-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 -
+-Rule Morocco 2015 only - Jul 18 2:00 1:00 S
+-Rule Morocco 2016 only - Jun 7 3:00 0 -
+-Rule Morocco 2016 only - Jul 7 2:00 1:00 S
+-Rule Morocco 2017 only - May 27 3:00 0 -
+-Rule Morocco 2017 only - Jun 26 2:00 1:00 S
+-Rule Morocco 2018 only - May 16 3:00 0 -
+-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
+-Rule Morocco 2020 only - Apr 24 3:00 0 -
+-Rule Morocco 2020 only - May 24 2:00 1:00 S
+-Rule Morocco 2021 only - Apr 13 3:00 0 -
+-Rule Morocco 2021 only - May 13 2:00 1:00 S
+-Rule Morocco 2022 only - Apr 3 3:00 0 -
+-Rule Morocco 2022 only - May 3 2:00 1:00 S
+-Rule Morocco 2023 only - Apr 22 2:00 1:00 S
+-Rule Morocco 2024 only - Apr 10 2:00 1:00 S
+-Rule Morocco 2025 only - Mar 31 2:00 1:00 S
+-Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
+-Rule Morocco 2036 only - Oct 21 3:00 0 -
+-Rule Morocco 2037 only - Oct 11 3:00 0 -
+-Rule Morocco 2038 only - Sep 30 3:00 0 -
+-Rule Morocco 2038 only - Oct 30 2:00 1:00 S
+-Rule Morocco 2038 max - Oct lastSun 3:00 0 -
++Rule Morocco 2011 only - Jul 31 0 0 -
++Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S
++Rule Morocco 2012 only - Sep 30 3:00 0 -
++Rule Morocco 2012 only - Jul 20 3:00 0 -
++Rule Morocco 2012 only - Aug 20 2:00 1:00 S
++Rule Morocco 2013 only - Jul 7 3:00 0 -
++Rule Morocco 2013 only - Aug 10 2:00 1:00 S
++Rule Morocco 2013 max - Oct lastSun 3:00 0 -
++Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
++Rule Morocco 2014 only - Jun 28 3:00 0 -
++Rule Morocco 2014 only - Aug 2 2:00 1:00 S
++Rule Morocco 2015 only - Jun 13 3:00 0 -
++Rule Morocco 2015 only - Jul 18 2:00 1:00 S
++Rule Morocco 2016 only - Jun 4 3:00 0 -
++Rule Morocco 2016 only - Jul 9 2:00 1:00 S
++Rule Morocco 2017 only - May 20 3:00 0 -
++Rule Morocco 2017 only - Jul 1 2:00 1:00 S
++Rule Morocco 2018 only - May 12 3:00 0 -
++Rule Morocco 2018 only - Jun 16 2:00 1:00 S
++Rule Morocco 2019 only - May 4 3:00 0 -
++Rule Morocco 2019 only - Jun 8 2:00 1:00 S
++Rule Morocco 2020 only - Apr 18 3:00 0 -
++Rule Morocco 2020 only - May 30 2:00 1:00 S
++Rule Morocco 2021 only - Apr 10 3:00 0 -
++Rule Morocco 2021 only - May 15 2:00 1:00 S
++Rule Morocco 2022 only - Apr 2 3:00 0 -
++Rule Morocco 2022 only - May 7 2:00 1:00 S
++Rule Morocco 2023 only - Apr 22 2:00 1:00 S
++Rule Morocco 2024 only - Apr 13 2:00 1:00 S
++Rule Morocco 2025 only - Apr 5 2:00 1:00 S
++Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
++Rule Morocco 2035 only - Oct 27 3:00 0 -
++Rule Morocco 2036 only - Oct 18 3:00 0 -
++Rule Morocco 2037 only - Oct 10 3:00 0 -
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
+@@ -1049,21 +932,34 @@
+ # Assume that this has been true since Western Sahara switched to GMT,
+ # since most of it was then controlled by Morocco.
+
+-Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
++Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
+ -1:00 - WAT 1976 Apr 14
+ 0:00 Morocco WE%sT
+
+ # Mozambique
++#
++# Shanks gives 1903-03-01 for the transition to CAT.
++# Perhaps the 1911-05-26 Portuguese decree
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# merely made it official?
++#
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
+ 2:00 - CAT
++Link Africa/Maputo Africa/Blantyre # Malawi
++Link Africa/Maputo Africa/Bujumbura # Burundi
++Link Africa/Maputo Africa/Gaborone # Botswana
++Link Africa/Maputo Africa/Harare # Zimbabwe
++Link Africa/Maputo Africa/Kigali # Rwanda
++Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo
++Link Africa/Maputo Africa/Lusaka # Zambia
+
+ # Namibia
+ # The 1994-04-03 transition is from Shanks & Pottenger.
+ # Shanks & Pottenger report no DST after 1998-04; go with IATA.
+
+-# From Petronella Sibeene (2007-03-30) in
+-# <http://allafrica.com/stories/200703300178.html>:
++# From Petronella Sibeene (2007-03-30):
++# http://allafrica.com/stories/200703300178.html
+ # While the entire country changes its time, Katima Mulilo and other
+ # settlements in Caprivi unofficially will not because the sun there
+ # rises and sets earlier compared to other regions. Chief of
+@@ -1080,34 +976,41 @@
+ Rule Namibia 1995 max - Apr Sun>=1 2:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
+- 1:30 - SWAT 1903 Mar # SW Africa Time
+- 2:00 - SAST 1942 Sep 20 2:00
+- 2:00 1:00 SAST 1943 Mar 21 2:00
++ 1:30 - SWAT 1903 Mar # SW Africa Time
++ 2:00 - SAST 1942 Sep 20 2:00
++ 2:00 1:00 SAST 1943 Mar 21 2:00
+ 2:00 - SAST 1990 Mar 21 # independence
+ 2:00 - CAT 1994 Apr 3
+ 1:00 Namibia WA%sT
+
+ # Niger
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Niamey 0:08:28 - LMT 1912
+- -1:00 - WAT 1934 Feb 26
+- 0:00 - GMT 1960
+- 1:00 - WAT
++# See Africa/Lagos.
+
+ # Nigeria
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Africa/Lagos 0:13:36 - LMT 1919 Sep
+ 1:00 - WAT
++Link Africa/Lagos Africa/Bangui # Central African Republic
++Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
++Link Africa/Lagos Africa/Douala # Cameroon
++Link Africa/Lagos Africa/Kinshasa # Dem. Rep. of the Congo (west)
++Link Africa/Lagos Africa/Libreville # Gabon
++Link Africa/Lagos Africa/Luanda # Angola
++Link Africa/Lagos Africa/Malabo # Equatorial Guinea
++Link Africa/Lagos Africa/Niamey # Niger
++Link Africa/Lagos Africa/Porto-Novo # Benin
+
+-# Reunion
++# Réunion
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
+- 4:00 - RET # Reunion Time
++Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
++ 4:00 - RET # Réunion Time
+ #
+-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
++# Crozet Islands also observes Réunion time; see the 'antarctica' file.
++#
++# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
+ # The following information about them is taken from
+-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
+-# no longer available as of 1999-08-17).
++# Îles Éparses (<http://www.outre-mer.gouv.fr/domtom/ile.htm>, 1997-07-22,
++# in French; no longer available as of 1999-08-17).
+ # We have no info about their time zone histories.
+ #
+ # Bassas da India - uninhabited
+@@ -1117,37 +1020,24 @@
+ # Tromelin - inhabited until at least 1958
+
+ # Rwanda
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Kigali 2:00:16 - LMT 1935 Jun
+- 2:00 - CAT
++# See Africa/Maputo.
+
+ # St Helena
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Atlantic/St_Helena -0:22:48 - LMT 1890 # Jamestown
+- -0:22:48 - JMT 1951 # Jamestown Mean Time
+- 0:00 - GMT
++# See Africa/Abidjan.
+ # The other parts of the St Helena territory are similar:
+ # Tristan da Cunha: on GMT, say Whitman and the CIA
+-# Ascension: on GMT, says usno1995 and the CIA
++# Ascension: on GMT, say the USNO (1995-12-21) and the CIA
+ # Gough (scientific station since 1955; sealers wintered previously):
+ # on GMT, says the CIA
+-# Inaccessible, Nightingale: no information, but probably GMT
++# Inaccessible, Nightingale: uninhabited
+
+-# Sao Tome and Principe
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Sao_Tome 0:26:56 - LMT 1884
+- -0:36:32 - LMT 1912 # Lisbon Mean Time
+- 0:00 - GMT
+-
++# São Tomé and Príncipe
+ # Senegal
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Dakar -1:09:44 - LMT 1912
+- -1:00 - WAT 1941 Jun
+- 0:00 - GMT
++# See Africa/Abidjan.
+
+ # Seychelles
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria
++Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria
+ 4:00 - SCT # Seychelles Time
+ # From Paul Eggert (2001-05-30):
+ # Aldabra, Farquhar, and Desroches, originally dependencies of the
+@@ -1157,24 +1047,10 @@
+ # Possibly the islands were uninhabited.
+
+ # Sierra Leone
+-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
+-Rule SL 1935 1942 - Jun 1 0:00 0:40 SLST
+-Rule SL 1935 1942 - Oct 1 0:00 0 WAT
+-Rule SL 1957 1962 - Jun 1 0:00 1:00 SLST
+-Rule SL 1957 1962 - Sep 1 0:00 0 GMT
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Freetown -0:53:00 - LMT 1882
+- -0:53:00 - FMT 1913 Jun # Freetown Mean Time
+- -1:00 SL %s 1957
+- 0:00 SL %s
++# See Africa/Abidjan.
+
+ # Somalia
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Mogadishu 3:01:28 - LMT 1893 Nov
+- 3:00 - EAT 1931
+- 2:30 - BEAT 1957
+- 3:00 - EAT
++# See Africa/Nairobi.
+
+ # South Africa
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+@@ -1184,15 +1060,18 @@
+ Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
+ 1:30 - SAST 1903 Mar
+ 2:00 SA SAST
++Link Africa/Johannesburg Africa/Maseru # Lesotho
++Link Africa/Johannesburg Africa/Mbabane # Swaziland
++#
+ # Marion and Prince Edward Is
+ # scientific station since 1947
+ # no information
+
+ # Sudan
+ #
+-# From <a href="http://www.sunanews.net/sn13jane.html">
+-# Sudan News Agency (2000-01-13)
+-# </a>, also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
++# From <http://www.sunanews.net/sn13jane.html>
++# Sudan News Agency (2000-01-13),
++# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
+ # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
+ # Saturday.... This was announced Thursday by Caretaker State Minister for
+ # Manpower Abdul-Rahman Nur-Eddin.
+@@ -1211,26 +1090,18 @@
+ Link Africa/Khartoum Africa/Juba
+
+ # Swaziland
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar
+- 2:00 - SAST
++# See Africa/Johannesburg.
+
+ # Tanzania
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Dar_es_Salaam 2:37:08 - LMT 1931
+- 3:00 - EAT 1948
+- 2:45 - BEAUT 1961
+- 3:00 - EAT
++# See Africa/Nairobi.
+
+ # Togo
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Lome 0:04:52 - LMT 1893
+- 0:00 - GMT
++# See Africa/Abidjan.
+
+ # Tunisia
+
+ # From Gwillim Law (2005-04-30):
+-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
++# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
+ # this time in Tunisia. According to Yahoo France News
+ # <http://fr.news.yahoo.com/050426/5/4dumk.html>, in a story attributed to AP
+ # and dated 2005-04-26, "Tunisia has decided to advance its official time by
+@@ -1239,8 +1110,8 @@
+ # Saturday." (My translation)
+ #
+ # From Oscar van Vlijmen (2005-05-02):
+-# LaPresse, the first national daily newspaper ...
+-# <http://www.lapresse.tn/archives/archives280405/actualites/lheure.html>
++# La Presse, the first national daily newspaper ...
++# http://www.lapresse.tn/archives/archives280405/actualites/lheure.html
+ # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
+ # 1h standard time.
+ #
+@@ -1253,18 +1124,12 @@
+ # From Steffen Thorsen (2009-03-16):
+ # According to several news sources, Tunisia will not observe DST this year.
+ # (Arabic)
+-# <a href="http://www.elbashayer.com/?page=viewn&nid=42546">
+ # http://www.elbashayer.com/?page=viewn&nid=42546
+-# </a>
+-# <a href="http://www.babnet.net/kiwidetail-15295.asp">
+ # http://www.babnet.net/kiwidetail-15295.asp
+-# </a>
+ #
+ # We have also confirmed this with the US embassy in Tunisia.
+ # We have a wrap-up about this on the following page:
+-# <a href="http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html">
+ # http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
+-# </a>
+
+ # From Alexander Krivenyshev (2009-03-17):
+ # Here is a link to Tunis Afrique Presse News Agency
+@@ -1272,20 +1137,17 @@
+ # Standard time to be kept the whole year long (tap.info.tn):
+ #
+ # (in English)
+-# <a href="http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157">
+ # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
+-# </a>
+ #
+ # (in Arabic)
+-# <a href="http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1">
+ # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
+-# </a>
+
+-# From Arthur David Olson (2009--3-18):
+-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
+-# that the fasting month of ramadan coincides with the period concerned by summer time.
+-# Therefore, the standard time will be kept unchanged the whole year long."
+-# So foregoing DST seems to be an exception (albeit one that may be repeated in the future).
++# From Arthur David Olson (2009-03-18):
++# The Tunis Afrique Presse News Agency notice contains this: "This measure is
++# due to the fact that the fasting month of Ramadan coincides with the period
++# concerned by summer time. Therefore, the standard time will be kept
++# unchanged the whole year long." So foregoing DST seems to be an exception
++# (albeit one that may be repeated in the future).
+
+ # From Alexander Krivenyshev (2010-03-27):
+ # According to some news reports Tunis confirmed not to use DST in 2010
+@@ -1297,12 +1159,8 @@
+ # coincided with the month of Ramadan..."
+ #
+ # (in Arabic)
+-# <a href="http://www.moheet.com/show_news.aspx?nid=358861&pg=1">
+ # http://www.moheet.com/show_news.aspx?nid=358861&pg=1
+-# <a href="http://www.almadenahnews.com/newss/news.php?c=118&id=38036">
+ # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_tunis02.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+@@ -1337,23 +1195,12 @@
+ # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
+- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
++ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
+ 1:00 Tunisia CE%sT
+
+ # Uganda
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Kampala 2:09:40 - LMT 1928 Jul
+- 3:00 - EAT 1930
+- 2:30 - BEAT 1948
+- 2:45 - BEAUT 1957
+- 3:00 - EAT
++# See Africa/Nairobi.
+
+ # Zambia
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar
+- 2:00 - CAT
+-
+ # Zimbabwe
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Africa/Harare 2:04:12 - LMT 1903 Mar
+- 2:00 - CAT
++# See Africa/Maputo.
+--- ./jdk/make/sun/javazic/tzdata/antarctica Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/antarctica Mon Jan 05 11:57:27 2015 -0800
+@@ -21,19 +21,16 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+ # From Paul Eggert (1999-11-15):
+ # To keep things manageable, we list only locations occupied year-round; see
+-# <a href="http://www.comnap.aq/comnap/comnap.nsf/P/Stations/">
+ # COMNAP - Stations and Bases
+-# </a>
++# http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
+ # and
+-# <a href="http://www.spri.cam.ac.uk/bob/periant.htm">
+ # Summary of the Peri-Antarctic Islands (1998-07-23)
+-# </a>
++# http://www.spri.cam.ac.uk/bob/periant.htm
+ # for information.
+ # Unless otherwise specified, we have no time zone information.
+ #
+@@ -78,19 +75,19 @@
+
+ # Argentina - year-round bases
+ # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
+-# Esperanza, San Martin Land, -6323-05659, since 1952-12-17
+-# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01
+-# Marambio, Seymour I, -6414-05637, since 1969-10-29
++# Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
++# Esperanza, Hope Bay, -6323-05659, since 1952-12-17
++# Marambio, -6414-05637, since 1969-10-29
+ # Orcadas, Laurie I, -6016-04444, since 1904-02-22
+-# San Martin, Debenham I, -6807-06708, since 1951-03-21
++# San Martín, Barry I, -6808-06706, since 1951-03-21
+ # (except 1960-03 / 1976-03-21)
+
+ # Australia - territories
+ # Heard Island, McDonald Islands (uninhabited)
+ # previously sealers and scientific personnel wintered
+-# <a href="http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html">
+ # Margaret Turner reports
+-# </a> (1999-09-30) that they're UTC+5, with no DST;
++# http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
++# (1999-09-30) that they're UTC+5, with no DST;
+ # presumably this is when they have visitors.
+ #
+ # year-round bases
+@@ -107,14 +104,10 @@
+ # The changes occurred on 2009-10-18 at 02:00 (local times).
+ #
+ # Government source: (Australian Antarctic Division)
+-# <a href="http://www.aad.gov.au/default.asp?casid=37079">
+ # http://www.aad.gov.au/default.asp?casid=37079
+-# </a>
+ #
+ # We have more background information here:
+-# <a href="http://www.timeanddate.com/news/time/antarctica-new-times.html">
+ # http://www.timeanddate.com/news/time/antarctica-new-times.html
+-# </a>
+
+ # From Steffen Thorsen (2010-03-10):
+ # We got these changes from the Australian Antarctic Division: ...
+@@ -129,50 +122,49 @@
+ # - Mawson station stays on UTC+5.
+ #
+ # Background:
+-# <a href="http://www.timeanddate.com/news/time/antartica-time-changes-2010.html">
+ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
+-# </a>
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Antarctica/Casey 0 - zzz 1969
+- 8:00 - WST 2009 Oct 18 2:00
+- # Western (Aus) Standard Time
+- 11:00 - CAST 2010 Mar 5 2:00
+- # Casey Time
+- 8:00 - WST 2011 Oct 28 2:00
++ 8:00 - AWST 2009 Oct 18 2:00
++ # Australian Western Std Time
++ 11:00 - CAST 2010 Mar 5 2:00 # Casey Time
++ 8:00 - AWST 2011 Oct 28 2:00
+ 11:00 - CAST 2012 Feb 21 17:00u
+- 8:00 - WST
++ 8:00 - AWST
+ Zone Antarctica/Davis 0 - zzz 1957 Jan 13
+- 7:00 - DAVT 1964 Nov # Davis Time
++ 7:00 - DAVT 1964 Nov # Davis Time
+ 0 - zzz 1969 Feb
+- 7:00 - DAVT 2009 Oct 18 2:00
++ 7:00 - DAVT 2009 Oct 18 2:00
+ 5:00 - DAVT 2010 Mar 10 20:00u
+- 7:00 - DAVT 2011 Oct 28 2:00
++ 7:00 - DAVT 2011 Oct 28 2:00
+ 5:00 - DAVT 2012 Feb 21 20:00u
+ 7:00 - DAVT
+ Zone Antarctica/Mawson 0 - zzz 1954 Feb 13
+- 6:00 - MAWT 2009 Oct 18 2:00
+- # Mawson Time
++ 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time
+ 5:00 - MAWT
+ # References:
+-# <a href="http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html">
+ # Casey Weather (1998-02-26)
+-# </a>
+-# <a href="http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html">
++# http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
+ # Davis Station, Antarctica (1998-02-26)
+-# </a>
+-# <a href="http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html">
++# http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html
+ # Mawson Station, Antarctica (1998-02-25)
+-# </a>
++# http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html
++
++# Belgium - year-round base
++# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
+
+ # Brazil - year-round base
+-# Comandante Ferraz, King George Island, -6205+05824, since 1983/4
++# Ferraz, King George Island, -6205+05824, since 1983/4
++
++# Bulgaria - year-round base
++# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
+
+ # Chile - year-round bases and towns
+ # Escudero, South Shetland Is, -621157-0585735, since 1994
+-# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07
+-# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
+-# Capitan Arturo Prat, -6230-05941
++# Frei Montalva, King George Island, -6214-05848, since 1969-03-07
++# O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
++# Prat, -6230-05941
+ # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
+ # These locations have always used Santiago time; use TZ='America/Santiago'.
+
+@@ -180,31 +172,35 @@
+ # Great Wall, King George Island, -6213-05858, since 1985-02-20
+ # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
+
+-# France - year-round bases
++# France - year-round bases (also see "France & Italy")
+ #
+ # From Antoine Leca (1997-01-20):
+-# Time data are from Nicole Pailleau at the IFRTP
++# Time data entries are from Nicole Pailleau at the IFRTP
+ # (French Institute for Polar Research and Technology).
+-# She confirms that French Southern Territories and Terre Adelie bases
+-# don't observe daylight saving time, even if Terre Adelie supplies came
++# She confirms that French Southern Territories and Terre Adélie bases
++# don't observe daylight saving time, even if Terre Adélie supplies came
+ # from Tasmania.
+ #
+ # French Southern Territories with year-round inhabitants
+ #
+-# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950
+-# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964
+-# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951;
++# Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
++# sealing & whaling stations operated variously 1802/1911+;
++# see Indian/Reunion.
++#
++# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
++# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
+ # whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
+ #
+ # St Paul Island - near Amsterdam, uninhabited
+ # fishing stations operated variously 1819/1931
+ #
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Francais
++Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Français
+ 5:00 - TFT # ISO code TF Time
+ #
+ # year-round base in the main continent
+-# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11
++# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
++# <http://en.wikipedia.org/wiki/Dumont_d'Urville_Station> (2005-12-05)
+ #
+ # Another base at Port-Martin, 50km east, began operation in 1947.
+ # It was destroyed by fire on 1952-01-14.
+@@ -214,20 +210,22 @@
+ 10:00 - PMT 1952 Jan 14 # Port-Martin Time
+ 0 - zzz 1956 Nov
+ 10:00 - DDUT # Dumont-d'Urville Time
+-# Reference:
+-# <a href="http://en.wikipedia.org/wiki/Dumont_d'Urville_Station">
+-# Dumont d'Urville Station (2005-12-05)
+-# </a>
++
++# France & Italy - year-round base
++# Concordia, -750600+1232000, since 2005
+
+ # Germany - year-round base
+-# Georg von Neumayer, -7039-00815
++# Neumayer III, -704080-0081602, since 2009
+
+-# India - year-round base
+-# Dakshin Gangotri, -7005+01200
++# India - year-round bases
++# Bharati, -692428+0761114, since 2012
++# Maitri, -704558+0114356, since 1989
++
++# Italy - year-round base (also see "France & Italy")
++# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
+
+ # Japan - year-round bases
+-# Dome Fuji, -7719+03942
+-# Syowa, -690022+0393524
++# Syowa (also known as Showa), -690022+0393524, since 1957
+ #
+ # From Hideyuki Suzuki (1999-02-06):
+ # In all Japanese stations, +0300 is used as the standard time.
+@@ -239,11 +237,11 @@
+ Zone Antarctica/Syowa 0 - zzz 1957 Jan 29
+ 3:00 - SYOT # Syowa Time
+ # See:
+-# <a href="http://www.nipr.ac.jp/english/ara01.html">
+ # NIPR Antarctic Research Activities (1999-08-17)
+-# </a>
++# http://www.nipr.ac.jp/english/ara01.html
+
+ # S Korea - year-round base
++# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
+ # King Sejong, King George Island, -6213-05847, since 1988
+
+ # New Zealand - claims
+@@ -287,11 +285,14 @@
+ Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
+- 0:00 Troll %s
++ 0:00 Troll %s
+
+ # Poland - year-round base
+ # Arctowski, King George Island, -620945-0582745, since 1977
+
++# Romania - year-bound base
++# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
++
+ # Russia - year-round bases
+ # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
+ # Mirny, Davis coast, -6633+09301, since 1956-02
+@@ -301,8 +302,8 @@
+ # year-round from 1960/61 to 1992
+
+ # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
+-# <a href="http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP">
+-# From Craig Mundell (1994-12-15)</a>:
++# From Craig Mundell (1994-12-15):
++# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
+ # Vostok, which is one of the Russian stations, is set on the same
+ # time as Moscow, Russia.
+ #
+@@ -317,7 +318,7 @@
+ #
+ # From Paul Eggert (2001-05-04):
+ # This seems to be hopelessly confusing, so I asked Lee Hotz about it
+-# in person. He said that some Antartic locations set their local
++# in person. He said that some Antarctic locations set their local
+ # time so that noon is the warmest part of the day, and that this
+ # changes during the year and does not necessarily correspond to mean
+ # solar noon. So the Vostok time might have been whatever the clocks
+@@ -329,9 +330,12 @@
+
+ # S Africa - year-round bases
+ # Marion Island, -4653+03752
+-# Sanae, -7141-00250
++# SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
+
+-# UK
++# Ukraine - year-round base
++# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
++
++# United Kingdom
+ #
+ # British Antarctic Territories (BAT) claims
+ # South Orkney Islands
+@@ -387,7 +391,7 @@
+ # but that he found it more convenient to keep GMT+12
+ # as supplies for the station were coming from McMurdo Sound,
+ # which was on GMT+12 because New Zealand was on GMT+12 all year
+-# at that time (1957). (Source: Siple's book 90 degrees SOUTH.)
++# at that time (1957). (Source: Siple's book 90 Degrees South.)
+ #
+ # From Susan Smith
+ # http://www.cybertours.com/whs/pole10.html
+--- ./jdk/make/sun/javazic/tzdata/asia Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/asia Mon Jan 05 11:57:27 2015 -0800
+@@ -21,41 +21,44 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future). For more, please see
++# the file CONTRIBUTING in the tz distribution.
+
+-# From Paul Eggert (2013-08-11):
++# From Paul Eggert (2014-10-31):
+ #
+-# A good source for time zone historical data outside the U.S. is
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually. Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990. Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Another source occasionally used is Edward W. Whitman, World Time Differences,
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+ # I found in the UCLA library.
+ #
+ # For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
++#
++# For Russian data circa 1919, a source is:
++# Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
++# (See the 'europe' file for a fuller citation.)
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+ #
+-# I invented the abbreviations marked `*' in the following table;
++# I invented the abbreviations marked '*' in the following table;
+ # the rest are from earlier versions of this file, or from other sources.
+ # Corrections are welcome!
+ # std dst
+@@ -66,17 +69,19 @@
+ # 3:30 IRST IRDT Iran
+ # 4:00 GST Gulf*
+ # 5:30 IST India
+-# 7:00 ICT Indochina*
++# 7:00 ICT Indochina, most times and locations*
+ # 7:00 WIB west Indonesia (Waktu Indonesia Barat)
+ # 8:00 WITA central Indonesia (Waktu Indonesia Tengah)
+ # 8:00 CST China
+-# 9:00 CJT Central Japanese Time (1896/1937)*
++# 8:00 IDT Indochina, 1943-45, 1947-55, 1960-75 (some locations)*
++# 8:00 JWST Western Standard Time (Japan, 1896/1937)*
++# 9:00 JCST Central Standard Time (Japan, 1896/1937)
+ # 9:00 WIT east Indonesia (Waktu Indonesia Timur)
+ # 9:00 JST JDT Japan
+ # 9:00 KST KDT Korea
+-# 9:30 CST (Australian) Central Standard Time
++# 9:30 ACST Australian Central Standard Time
+ #
+-# See the `europe' file for Russia and Turkey in Asia.
++# See the 'europe' file for Russia and Turkey in Asia.
+
+ # From Guy Harris:
+ # Incorporates data for Singapore from Robert Elz' asia 1.1, as well as
+@@ -86,7 +91,7 @@
+
+ ###############################################################################
+
+-# These rules are stolen from the `europe' file.
++# These rules are stolen from the 'europe' file.
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule EUAsia 1981 max - Mar lastSun 1:00u 1:00 S
+ Rule EUAsia 1979 1995 - Sep lastSun 1:00u 0 -
+@@ -138,11 +143,11 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2
+ 3:00 - YERT 1957 Mar # Yerevan Time
+- 4:00 RussiaAsia YER%sT 1991 Mar 31 2:00s
++ 4:00 RussiaAsia YER%sT 1991 Mar 31 2:00s
+ 3:00 1:00 YERST 1991 Sep 23 # independence
+- 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s
++ 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s
+ 4:00 - AMT 1997
+- 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s
++ 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s
+ 4:00 - AMT
+
+ # Azerbaijan
+@@ -155,16 +160,16 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Baku 3:19:24 - LMT 1924 May 2
+ 3:00 - BAKT 1957 Mar # Baku Time
+- 4:00 RussiaAsia BAK%sT 1991 Mar 31 2:00s
++ 4:00 RussiaAsia BAK%sT 1991 Mar 31 2:00s
+ 3:00 1:00 BAKST 1991 Aug 30 # independence
+ 3:00 RussiaAsia AZ%sT 1992 Sep lastSat 23:00
+- 4:00 - AZT 1996 # Azerbaijan time
++ 4:00 - AZT 1996 # Azerbaijan Time
+ 4:00 EUAsia AZ%sT 1997
+ 4:00 Azer AZ%sT
+
+ # Bahrain
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Bahrain 3:22:20 - LMT 1920 # Al Manamah
++Zone Asia/Bahrain 3:22:20 - LMT 1920 # Manamah
+ 4:00 - GST 1972 Jun
+ 3:00 - AST
+
+@@ -174,13 +179,8 @@
+ # Daylight Saving Time from June 16 to Sept 30
+ #
+ # Bangladesh to introduce daylight saving time likely from June 16
+-# <a href="http://www.asiantribune.com/?q=node/17288">
+ # http://www.asiantribune.com/?q=node/17288
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_bangladesh02.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_bangladesh02.html
+-# </a>
+ #
+ # "... Bangladesh government has decided to switch daylight saving time from
+ # June
+@@ -195,17 +195,11 @@
+ # the 19th and 20th, and they have not set the end date yet.
+ #
+ # Some sources:
+-# <a href="http://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601">
+ # http://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601
+-# </a>
+-# <a href="http://bdnews24.com/details.php?id=85889&cid=2">
+ # http://bdnews24.com/details.php?id=85889&cid=2
+-# </a>
+ #
+ # Our wrap-up:
+-# <a href="http://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html">
+ # http://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html
+-# </a>
+
+ # From A. N. M. Kamrus Saadat (2009-06-15):
+ # Finally we've got the official mail regarding DST start time where DST start
+@@ -220,13 +214,8 @@
+ #
+ # Following report by same newspaper-"The Daily Star Friday":
+ # "DST change awaits cabinet decision-Clock won't go back by 1-hr from Oct 1"
+-# <a href="http://www.thedailystar.net/newDesign/news-details.php?nid=107021">
+ # http://www.thedailystar.net/newDesign/news-details.php?nid=107021
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_bangladesh04.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_bangladesh04.html
+-# </a>
+
+ # From Steffen Thorsen (2009-10-13):
+ # IANS (Indo-Asian News Service) now reports:
+@@ -235,22 +224,15 @@
+ # "continue for an indefinite period."
+ #
+ # One of many places where it is published:
+-# <a href="http://www.thaindian.com/newsportal/business/bangladesh-to-continue-indefinitely-with-advanced-time_100259987.html">
+ # http://www.thaindian.com/newsportal/business/bangladesh-to-continue-indefinitely-with-advanced-time_100259987.html
+-# </a>
+
+ # From Alexander Krivenyshev (2009-12-24):
+ # According to Bangladesh newspaper "The Daily Star,"
+ # Bangladesh will change its clock back to Standard Time on Dec 31, 2009.
+ #
+ # Clock goes back 1-hr on Dec 31 night.
+-# <a href="http://www.thedailystar.net/newDesign/news-details.php?nid=119228">
+ # http://www.thedailystar.net/newDesign/news-details.php?nid=119228
+-# </a>
+-# and
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_bangladesh05.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_bangladesh05.html
+-# </a>
+ #
+ # "...The government yesterday decided to put the clock back by one hour
+ # on December 31 midnight and the new time will continue until March 31,
+@@ -260,17 +242,12 @@
+ # From Alexander Krivenyshev (2010-03-22):
+ # According to Bangladesh newspaper "The Daily Star,"
+ # Cabinet cancels Daylight Saving Time
+-# <a href="http://www.thedailystar.net/newDesign/latest_news.php?nid=22817">
+ # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
+-# </a>
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Dhaka 2009 only - Jun 19 23:00 1:00 S
+-Rule Dhaka 2009 only - Dec 31 23:59 0 -
++Rule Dhaka 2009 only - Dec 31 24:00 0 -
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Dhaka 6:01:40 - LMT 1890
+@@ -301,7 +278,7 @@
+
+ # Brunei
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Bandar Seri Begawan
++Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Bandar Seri Begawan
+ 7:30 - BNT 1933
+ 8:00 - BNT
+
+@@ -310,19 +287,15 @@
+ # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Rangoon 6:24:40 - LMT 1880 # or Yangon
+- 6:24:40 - RMT 1920 # Rangoon Mean Time?
+- 6:30 - BURT 1942 May # Burma Time
+- 9:00 - JST 1945 May 3
+- 6:30 - MMT # Myanmar Time
++Zone Asia/Rangoon 6:24:40 - LMT 1880 # or Yangon
++ 6:24:40 - RMT 1920 # Rangoon Mean Time?
++ 6:30 - BURT 1942 May # Burma Time
++ 9:00 - JST 1945 May 3
++ 6:30 - MMT # Myanmar Time
+
+ # Cambodia
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Phnom_Penh 6:59:40 - LMT 1906 Jun 9
+- 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT?
+- 7:00 - ICT 1912 May
+- 8:00 - ICT 1931 May
+- 7:00 - ICT
++# See Asia/Bangkok.
++
+
+ # China
+
+@@ -332,12 +305,12 @@
+ # From Bob Devine (1988-01-28):
+ # No they don't. See TIME mag, 1986-02-17 p.52. Even though
+ # China is across 4 physical time zones, before Feb 1, 1986 only the
+-# Peking (Bejing) time zone was recognized. Since that date, China
+-# has two of 'em -- Peking's and Urumqi (named after the capital of
++# Peking (Beijing) time zone was recognized. Since that date, China
++# has two of 'em - Peking's and Ürümqi (named after the capital of
+ # the Xinjiang Uyghur Autonomous Region). I don't know about DST for it.
+ #
+ # . . .I just deleted the DST table and this editor makes it too
+-# painful to suck in another copy.. So, here is what I have for
++# painful to suck in another copy. So, here is what I have for
+ # DST start/end dates for Peking's time zone (info from AP):
+ #
+ # 1986 May 4 - Sept 14
+@@ -347,15 +320,16 @@
+ # CHINA 8 H AHEAD OF UTC ALL OF CHINA, INCL TAIWAN
+ # CHINA 9 H AHEAD OF UTC APR 17 - SEP 10
+
+-# From Paul Eggert (2006-03-22):
+-# Shanks & Pottenger write that China (except for Hong Kong and Macau)
+-# has had a single time zone since 1980 May 1, observing summer DST
+-# from 1986 through 1991; this contradicts Devine's
+-# note about Time magazine, though apparently _something_ happened in 1986.
+-# Go with Shanks & Pottenger for now. I made up names for the other
+-# pre-1980 time zones.
++# From Paul Eggert (2008-02-11):
++# Jim Mann, "A clumsy embrace for another western custom: China on daylight
++# time - sort of", Los Angeles Times, 1986-05-05 ... [says] that China began
++# observing daylight saving time in 1986.
+
+-# From Shanks & Pottenger:
++# From Paul Eggert (2014-06-30):
++# Shanks & Pottenger have China switching to a single time zone in 1980, but
++# this doesn't seem to be correct. They also write that China observed summer
++# DST from 1986 through 1991, which seems to match the above commentary, so
++# go with them for DST rules as follows:
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Shang 1940 only - Jun 3 0:00 1:00 D
+ Rule Shang 1940 1941 - Oct 1 0:00 0 S
+@@ -369,7 +343,7 @@
+ # historic timezones from some Taiwan websites. And yes, there are official
+ # Chinese names for these locales (before 1949).
+ #
+-# From Jesper Norgaard Welen (2006-07-14):
++# From Jesper Nørgaard Welen (2006-07-14):
+ # I have investigated the timezones around 1970 on the
+ # http://www.astro.com/atlas site [with provinces and county
+ # boundaries summarized below].... A few other exceptions were two
+@@ -380,65 +354,97 @@
+ # (could be true), for the moment I am assuming that those two
+ # counties are mistakes in the astro.com data.
+
+-# From Paul Eggert (2008-02-11):
+-# I just now checked Google News for western news sources that talk
+-# about China's single time zone, and couldn't find anything before 1986
+-# talking about China being in one time zone. (That article was: Jim
+-# Mann, "A clumsy embrace for another western custom: China on daylight
+-# time--sort of", Los Angeles Times, 1986-05-05. By the way, this
+-# article confirms the tz database's data claiming that China began
+-# observing daylight saving time in 1986.
++# From Paul Eggert (2014-06-30):
++# Alois Treindl kindly sent me translations of the following two sources:
+ #
+-# From Thomas S. Mullaney (2008-02-11):
+-# I think you're combining two subjects that need to treated
+-# separately: daylight savings (which, you're correct, wasn't
+-# implemented until the 1980s) and the unified time zone centered near
+-# Beijing (which was implemented in 1949). Briefly, there was also a
+-# "Lhasa Time" in Tibet and "Urumqi Time" in Xinjiang. The first was
+-# ceased, and the second eventually recognized (again, in the 1980s).
++# (1)
++# Guo Qingsheng (National Time-Service Center, CAS, Xi'an 710600, China)
++# Beijing Time at the Beginning of the PRC
++# China Historical Materials of Science and Technology
++# (Zhongguo ke ji shi liao, 中国科技å²æ–™), Vol. 24, No. 1 (2003)
++# It gives evidence that at the beginning of the PRC, Beijing time was
++# officially apparent solar time! However, Guo also says that the
++# evidence is dubious, as the relevant institute of astronomy had not
++# been taken over by the PRC yet. It's plausible that apparent solar
++# time was announced but never implemented, and that people continued
++# to use UT+8. As the Shanghai radio station (and I presume the
++# observatory) was still under control of French missionaries, it
++# could well have ignored any such mandate.
+ #
+-# From Paul Eggert (2008-06-30):
+-# There seems to be a good chance China switched to a single time zone in 1949
+-# rather than in 1980 as Shanks & Pottenger have it, but we don't have a
+-# reliable documentary source saying so yet, so for now we still go with
+-# Shanks & Pottenger.
+-
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-# Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
++# (2)
++# Guo Qing-sheng (Shaanxi Astronomical Observatory, CAS, Xi'an 710600, China)
++# A Study on the Standard Time Changes for the Past 100 Years in China
++# [undated and unknown publication location]
++# It says several things:
++# * The Qing dynasty used local apparent solar time throughout China.
++# * The Republic of China instituted Beijing mean solar time effective
++# the official calendar book of 1914.
++# * The French Concession in Shanghai set up signal stations in
++# French docks in the 1890s, controlled by Xujiahui (Zikawei)
++# Observatory and set to local mean time.
++# * "From the end of the 19th century" it changed to UT+8.
++# * Chinese Customs (by then reduced to a tool of foreign powers)
++# eventually standardized on this time for all ports, and it
++# became used by railways as well.
++# * In 1918 the Central Observatory proposed dividing China into
++# five time zones (see below for details). This caught on
++# at first only in coastal areas observing UT+8.
++# * During WWII all of China was in theory was at UT+7. In practice
++# this was ignored in the west, and I presume was ignored in
++# Japanese-occupied territory.
++# * Japanese-occupied Manchuria was at UT+9, i.e., Japan time.
++# * The five-zone plan was resurrected after WWII and officially put into
++# place (with some modifications) in March 1948. It's not clear
++# how well it was observed in areas under Nationalist control.
++# * The People's Liberation Army used UT+8 during the civil war.
++#
++# An AP article "Shanghai Internat'l Area Little Changed" in the
++# Lewiston (ME) Daily Sun (1939-05-29), p 17, said "Even the time is
++# different - the occupied districts going by Tokyo time, an hour
++# ahead of that prevailing in the rest of Shanghai." Guess that the
++# Xujiahui Observatory was under French control and stuck with UT+8.
++#
++# In earlier versions of this file, China had many separate Zone entries, but
++# this was based on what were apparently incorrect data in Shanks & Pottenger.
++# This has now been simplified to the two entries Asia/Shanghai and
++# Asia/Urumqi, with the others being links for backward compatibility.
++# Proposed in 1918 and theoretically in effect until 1949 (although in practice
++# mainly observed in coastal areas), the five zones were:
++#
++# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT+8.5
++# Asia/Harbin (currently a link to Asia/Shanghai)
+ # Heilongjiang (except Mohe county), Jilin
+-Zone Asia/Harbin 8:26:44 - LMT 1928 # or Haerbin
+- 8:30 - CHAT 1932 Mar # Changbai Time
+- 8:00 - CST 1940
+- 9:00 - CHAT 1966 May
+- 8:30 - CHAT 1980 May
+- 8:00 PRC C%sT
+-# Zhongyuan Time ("Central plain Time")
++#
++# Zhongyuan Time ("Central plain Time") UT+8
++# Asia/Shanghai
+ # most of China
+-# Milne gives 8:05:56.7; round to nearest.
+-Zone Asia/Shanghai 8:05:57 - LMT 1928
+- 8:00 Shang C%sT 1949
+- 8:00 PRC C%sT
+-# Long-shu Time (probably due to Long and Shu being two names of that area)
++# This currently represents most other zones as well,
++# as apparently these regions have been the same since 1970.
++# Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest.
++# Guo says Shanghai switched to UT+8 "from the end of the 19th century".
++#
++# Long-shu Time (probably due to Long and Shu being two names of that area) UT+7
++# Asia/Chongqing (currently a link to Asia/Shanghai)
+ # Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
+ # most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
+ # counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
+ # Yangchun, Yangjiang, Yu'nan, and Yunfu.
+-Zone Asia/Chongqing 7:06:20 - LMT 1928 # or Chungking
+- 7:00 - LONT 1980 May # Long-shu Time
+- 8:00 PRC C%sT
+-# Xin-zang Time ("Xinjiang-Tibet Time")
++#
++# Xin-zang Time ("Xinjiang-Tibet Time") UT+6
++# Asia/Urumqi
++# This currently represents Kunlun Time as well,
++# as apparently the two regions have been the same since 1970.
+ # The Gansu counties Aksay, Anxi, Dunhuang, Subei; west Qinghai;
+ # the Guangdong counties Xuwen, Haikang, Suixi, Lianjiang,
+ # Zhanjiang, Wuchuan, Huazhou, Gaozhou, Maoming, Dianbai, and Xinyi;
+ # east Tibet, including Lhasa, Chamdo, Shigaise, Jimsar, Shawan and Hutubi;
+-# east Xinjiang, including Urumqi, Turpan, Karamay, Korla, Minfeng, Jinghe,
++# east Xinjiang, including Ürümqi, Turpan, Karamay, Korla, Minfeng, Jinghe,
+ # Wusu, Qiemo, Xinyan, Wulanwusu, Jinghe, Yumin, Tacheng, Tuoli, Emin,
+ # Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami,
+ # Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan.
+-Zone Asia/Urumqi 5:50:20 - LMT 1928 # or Urumchi
+- 6:00 - URUT 1980 May # Urumqi Time
+- 8:00 PRC C%sT
+-# Kunlun Time
++#
++# Kunlun Time UT+5.5
++# Asia/Kashgar (currently a link to Asia/Urumqi)
+ # West Tibet, including Pulan, Aheqi, Shufu, Shule;
+ # West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke,
+ # Zhaosu, Tekesi, Gongliu, Chabuchaer, Huocheng, Bole, Pishan, Suiding,
+@@ -455,9 +461,9 @@
+ # population of Xinjiang, typically use "Xinjiang time" which is two
+ # hours behind Beijing time, or UTC +0600. The government of the Xinjiang
+ # Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as
+-# local governments such as the Urumqi city government use both times in
++# local governments such as the Ürümqi city government use both times in
+ # publications, referring to what is popularly called Xinjiang time as
+-# "Urumqi time." When Uyghurs make an appointment in the Uyghur language
++# "Ürümqi time." When Uyghurs make an appointment in the Uyghur language
+ # they almost invariably use Xinjiang time.
+ #
+ # (Their ethnic Han compatriots would typically have no clue of its
+@@ -469,21 +475,6 @@
+ # the province not having dual times but four times in use at the same
+ # time. Some areas remained on standard Xinjiang time or Beijing time and
+ # others moving their clocks ahead.)
+-#
+-# ...an example of an official website using of Urumqi time.
+-#
+-# The first few lines of the Google translation of
+-# <a href="http://www.fjysgl.gov.cn/show.aspx?id=2379&cid=39">
+-# http://www.fjysgl.gov.cn/show.aspx?id=2379&cid=39
+-# </a>
+-# (retrieved 2009-10-13)
+-# > Urumqi fire seven people are missing the alleged losses of at least
+-# > 500 million yuan
+-# >
+-# > (Reporter Dong Liu) the day before 20:20 or so (Urumqi Time 18:20),
+-# > Urumqi City Department of International Plaza Luther Qiantang River
+-# > burst fire. As of yesterday, 18:30, Urumqi City Fire officers and men
+-# > have worked continuously for 22 hours...
+
+ # From Luther Ma (2009-11-19):
+ # With the risk of being redundant to previous answers these are the most common
+@@ -494,7 +485,7 @@
+ # 3. Urumqi...
+ # 4. Kashgar...
+ # ...
+-# 5. It seems that Uyghurs in Urumqi has been using Xinjiang since at least the
++# 5. It seems that Uyghurs in Ürümqi has been using Xinjiang since at least the
+ # 1960's. I know of one Han, now over 50, who grew up in the surrounding
+ # countryside and used Xinjiang time as a child.
+ #
+@@ -506,10 +497,55 @@
+ # Autonomous Region under the PRC. (Before that Uyghurs, of course, would also
+ # not be using Beijing time, but some local time.)
+
+-Zone Asia/Kashgar 5:03:56 - LMT 1928 # or Kashi or Kaxgar
+- 5:30 - KAST 1940 # Kashgar Time
+- 5:00 - KAST 1980 May
++# From David Cochrane (2014-03-26):
++# Just a confirmation that Ürümqi time was implemented in Ürümqi on 1 Feb 1986:
++# http://content.time.com/time/magazine/article/0,9171,960684,00.html
++
++# From Luther Ma (2014-04-22):
++# I have interviewed numerous people of various nationalities and from
++# different localities in Xinjiang and can confirm the information in Guo's
++# report regarding Xinjiang, as well as the Time article reference by David
++# Cochrane. Whether officially recognized or not (and both are officially
++# recognized), two separate times have been in use in Xinjiang since at least
++# the Cultural Revolution: Xinjiang Time (XJT), aka Ürümqi Time or local time;
++# and Beijing Time. There is no confusion in Xinjiang as to which name refers
++# to which time. Both are widely used in the province, although in some
++# population groups might be use one to the exclusion of the other. The only
++# problem is that computers and smart phones list Ürümqi (or Kashgar) as
++# having the same time as Beijing.
++
++# From Paul Eggert (2014-06-30):
++# In the early days of the PRC, Tibet was given its own time zone (UT+6) but
++# this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
++# Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
++# 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
++# As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
++#
++# Xinjiang Time is well-documented as being officially recognized. E.g., see
++# "The Working-Calendar for The Xinjiang Uygur Autonomous Region Government"
++# <http://www.sinkiang.gov.cn/service/ourworking/> (2014-04-22).
++# Unfortunately, we have no good records of time in Xinjiang before 1986.
++# During the 20th century parts of Xinjiang were ruled by the Qing dynasty,
++# the Republic of China, various warlords, the First and Second East Turkestan
++# Republics, the Soviet Union, the Kuomintang, and the People's Republic of
++# China, and tracking down all these organizations' timekeeping rules would be
++# quite a trick. Approximate this lost history by a transition from LMT to
++# XJT at the start of 1928, the year of accession of the warlord Jin Shuren,
++# which happens to be the date given by Shanks & Pottenger (no doubt as a
++# guess) as the transition from LMT. Ignore the usage of UT+8 before
++# 1986-02-01 under the theory that the transition date to UT+8 is unknown and
++# that the sort of users who prefer Asia/Urumqi now typically ignored the
++# UT+8 mandate back then.
++
++# Zone NAME GMTOFF RULES FORMAT [UNTIL]
++# Beijing time, used throughout China; represented by Shanghai.
++Zone Asia/Shanghai 8:05:43 - LMT 1901
++ 8:00 Shang C%sT 1949
+ 8:00 PRC C%sT
++# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
++# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
++Zone Asia/Urumqi 5:50:20 - LMT 1928
++ 6:00 - XJT
+
+
+ # Hong Kong (Xianggang)
+@@ -524,15 +560,11 @@
+ # and incorrect rules. Although the exact switch over time is missing, I
+ # think 3:30 is correct. The official DST record for Hong Kong can be
+ # obtained from
+-# <a href="http://www.hko.gov.hk/gts/time/Summertime.htm">
+ # http://www.hko.gov.hk/gts/time/Summertime.htm
+-# </a>.
+
+ # From Arthur David Olson (2009-10-28):
+ # Here are the dates given at
+-# <a href="http://www.hko.gov.hk/gts/time/Summertime.htm">
+ # http://www.hko.gov.hk/gts/time/Summertime.htm
+-# </a>
+ # as of 2009-10-28:
+ # Year Period
+ # 1941 1 Apr to 30 Sep
+@@ -612,35 +644,113 @@
+
+ # Taiwan
+
+-# Shanks & Pottenger write that Taiwan observed DST during 1945, when it
+-# was still controlled by Japan. This is hard to believe, but we don't
+-# have any other information.
+-
+ # From smallufo (2010-04-03):
+-# According to Taiwan's CWB,
+-# <a href="http://www.cwb.gov.tw/V6/astronomy/cdata/summert.htm">
++# According to Taiwan's CWB [Central Weather Bureau],
+ # http://www.cwb.gov.tw/V6/astronomy/cdata/summert.htm
+-# </a>
+ # Taipei has DST in 1979 between July 1st and Sep 30.
+
+-# From Arthur David Olson (2010-04-07):
+-# Here's Google's translation of the table at the bottom of the "summert.htm" page:
+-# Decade Name Start and end date
+-# Republic of China 34 years to 40 years (AD 1945-1951 years) Summer Time May 1 to September 30
+-# 41 years of the Republic of China (AD 1952) Daylight Saving Time March 1 to October 31
+-# Republic of China 42 years to 43 years (AD 1953-1954 years) Daylight Saving Time April 1 to October 31
+-# In the 44 years to 45 years (AD 1955-1956 years) Daylight Saving Time April 1 to September 30
+-# Republic of China 46 years to 48 years (AD 1957-1959) Summer Time April 1 to September 30
+-# Republic of China 49 years to 50 years (AD 1960-1961) Summer Time June 1 to September 30
+-# Republic of China 51 years to 62 years (AD 1962-1973 years) Stop Summer Time
+-# Republic of China 63 years to 64 years (1974-1975 AD) Daylight Saving Time April 1 to September 30
+-# Republic of China 65 years to 67 years (1976-1978 AD) Stop Daylight Saving Time
+-# Republic of China 68 years (AD 1979) Daylight Saving Time July 1 to September 30
+-# Republic of China since 69 years (AD 1980) Stop Daylight Saving Time
++# From Yu-Cheng Chuang (2013-07-12):
++# On Dec 28, 1895, the Meiji Emperor announced Ordinance No. 167 of
++# Meiji Year 28 "The clause about standard time", mentioned that
++# Taiwan and Penghu Islands, as well as Yaeyama and Miyako Islands
++# (both in Okinawa) adopt the Western Standard Time which is based on
++# 120E. The adoption began from Jan 1, 1896. The original text can be
++# found on Wikisource:
++# http://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
++# ... This could be the first adoption of time zone in Taiwan, because
++# during the Qing Dynasty, it seems that there was no time zone
++# declared officially.
++#
++# Later, in the beginning of World War II, on Sep 25, 1937, the Showa
++# Emperor announced Ordinance No. 529 of Showa Year 12 "The clause of
++# revision in the ordinance No. 167 of Meiji year 28 about standard
++# time", in which abolished the adoption of Western Standard Time in
++# western islands (listed above), which means the whole Japan
++# territory, including later occupations, adopt Japan Central Time
++# (UTC+9). The adoption began on Oct 1, 1937. The original text can
++# be found on Wikisource:
++# http://ja.wikisource.org/wiki/明治二å八年勅令第百六å七號標準時ニ關スル件中改正ノ件
++#
++# That is, the time zone of Taipei switched to UTC+9 on Oct 1, 1937.
++
++# From Yu-Cheng Chuang (2014-07-02):
++# I've found more evidence about when the time zone was switched from UTC+9
++# back to UTC+8 after WW2. I believe it was on Sep 21, 1945. In a document
++# during Japanese era [1] in which the officer told the staff to change time
++# zone back to Western Standard Time (UTC+8) on Sep 21. And in another
++# history page of National Cheng Kung University [2], on Sep 21 there is a
++# note "from today, switch back to Western Standard Time". From these two
++# materials, I believe that the time zone change happened on Sep 21. And
++# today I have found another monthly journal called "The Astronomical Herald"
++# from The Astronomical Society of Japan [3] in which it mentioned the fact
++# that:
++#
++# 1. Standard Time of the Country (Japan) was adopted on Jan 1, 1888, using
++# the time at 135E (GMT+9)
++#
++# 2. Standard Time of the Country was renamed to Central Standard Time, on Jan
++# 1, 1898, and on the same day, the new territories Taiwan and Penghu islands,
++# as well as Yaeyama and Miyako islands, adopted a new time zone called
++# Western Standard Time, which is in GMT+8.
++#
++# 3. Western Standard Time was deprecated on Sep 30, 1937. From then all the
++# territories of Japan adopted the same time zone, which is Central Standard
++# Time.
++#
++# [1] Academica Historica, Taiwan:
++# http://163.29.208.22:8080/govsaleShowImage/connect_img.php?s=00101738900090036&e=00101738900090037
++# [2] Nat'l Cheng Kung University 70th Anniversary Special Site:
++# http://www.ncku.edu.tw/~ncku70/menu/001/01_01.htm
++# [3] Yukio Niimi, The Standard Time in Japan (1997), p.475:
++# http://www.asj.or.jp/geppou/archive_open/1997/pdf/19971001c.pdf
++
++# Yu-Cheng Chuang (2014-07-03):
++# I finally have found the real official gazette about changing back to
++# Western Standard Time on Sep 21 in Taiwan. It's Taiwan Governor-General
++# Bulletin No. 386 in Showa 20 years (1945), published on Sep 19, 1945. [1] ...
++# [It] abolishes Bulletin No. 207 in Showa 12 years (1937), which is a local
++# bulletin in Taiwan for that Ordinance No. 529. It also mentioned that 1am on
++# Sep 21, 1945 will be 12am on Sep 21. I think this bulletin is much more
++# official than the one I mentioned in my first mail, because it's from the
++# top-level government in Taiwan. If you're going to quote any resource, this
++# would be a good one.
++# [1] Taiwan Governor-General Gazette, No. 1018, Sep 19, 1945:
++# http://db2.th.gov.tw/db2/view/viewImg.php?imgcode=0072031018a&num=19&bgn=019&end=019&otherImg=&type=gener
++
++# From Yu-Cheng Chuang (2014-07-02):
++# In 1946, DST in Taiwan was from May 15 and ended on Sep 30. The info from
++# Central Weather Bureau website was not correct.
++#
++# Original Bulletin:
++# http://subtpg.tpg.gov.tw/og/image2.asp?f=03502F0AKM1AF
++# http://subtpg.tpg.gov.tw/og/image2.asp?f=0350300AKM1B0 (cont.)
++#
++# In 1947, DST in Taiwan was expanded to Oct 31. There is a backup of that
++# telegram announcement from Taiwan Province Government:
++#
++# http://subtpg.tpg.gov.tw/og/image2.asp?f=0360310AKZ431
++#
++# Here is a brief translation:
++#
++# The Summer Time this year is adopted from midnight Apr 15 until Sep 20
++# midnight. To save (energy?) consumption, we're expanding Summer Time
++# adoption till Oct 31 midnight.
++#
++# The Central Weather Bureau website didn't mention that, however it can
++# be found from historical government announcement database.
++
++# From Paul Eggert (2014-07-03):
++# As per Yu-Cheng Chuang, say that Taiwan was at UT+9 from 1937-10-01
++# until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
++# Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule Taiwan 1945 1951 - May 1 0:00 1:00 D
+-Rule Taiwan 1945 1951 - Oct 1 0:00 0 S
++Rule Taiwan 1946 only - May 15 0:00 1:00 D
++Rule Taiwan 1946 only - Oct 1 0:00 0 S
++Rule Taiwan 1947 only - Apr 15 0:00 1:00 D
++Rule Taiwan 1947 only - Nov 1 0:00 0 S
++Rule Taiwan 1948 1951 - May 1 0:00 1:00 D
++Rule Taiwan 1948 1951 - Oct 1 0:00 0 S
+ Rule Taiwan 1952 only - Mar 1 0:00 1:00 D
+ Rule Taiwan 1952 1954 - Nov 1 0:00 0 S
+ Rule Taiwan 1953 1959 - Apr 1 0:00 1:00 D
+@@ -648,11 +758,14 @@
+ Rule Taiwan 1960 1961 - Jun 1 0:00 1:00 D
+ Rule Taiwan 1974 1975 - Apr 1 0:00 1:00 D
+ Rule Taiwan 1974 1975 - Oct 1 0:00 0 S
+-Rule Taiwan 1979 only - Jun 30 0:00 1:00 D
+-Rule Taiwan 1979 only - Sep 30 0:00 0 S
++Rule Taiwan 1979 only - Jul 1 0:00 1:00 D
++Rule Taiwan 1979 only - Oct 1 0:00 0 S
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Taipei 8:06:00 - LMT 1896 # or Taibei or T'ai-pei
++# Taipei or Taibei or T'ai-pei
++Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
++ 8:00 - JWST 1937 Oct 1
++ 9:00 - JST 1945 Sep 21 1:00
+ 8:00 Taiwan C%sT
+
+ # Macau (Macao, Aomen)
+@@ -672,7 +785,7 @@
+ Rule Macau 1978 1980 - Apr Sun>=15 0:00 1:00 S
+ Rule Macau 1978 1980 - Oct Sun>=15 0:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Macau 7:34:20 - LMT 1912
++Zone Asia/Macau 7:34:20 - LMT 1912 Jan 1
+ 8:00 Macau MO%sT 1999 Dec 20 # return to China
+ 8:00 PRC C%sT
+
+@@ -721,7 +834,7 @@
+ # republic has changed its time zone back to that of Moscow. As a result it
+ # is now just four hours ahead of Greenwich Mean Time, rather than five hours
+ # ahead. The switch was decreed by the pro-Western president of Georgia,
+-# Mikhail Saakashvili, who said the change was partly prompted by the process
++# Mikheil Saakashvili, who said the change was partly prompted by the process
+ # of integration into Europe.
+
+ # From Teimuraz Abashidze (2005-11-07):
+@@ -734,29 +847,31 @@
+ # I don't know what can be done, especially knowing that some years ago our
+ # DST rules where changed THREE TIMES during one month.
+
++# Milne 1899 says Tbilisi (Tiflis) time was 2:59:05.7.
++# Byalokoz 1919 says Georgia was 2:59:11.
++# Go with Byalokoz.
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Tbilisi 2:59:16 - LMT 1880
+- 2:59:16 - TBMT 1924 May 2 # Tbilisi Mean Time
++Zone Asia/Tbilisi 2:59:11 - LMT 1880
++ 2:59:11 - TBMT 1924 May 2 # Tbilisi Mean Time
+ 3:00 - TBIT 1957 Mar # Tbilisi Time
+- 4:00 RussiaAsia TBI%sT 1991 Mar 31 2:00s
++ 4:00 RussiaAsia TBI%sT 1991 Mar 31 2:00s
+ 3:00 1:00 TBIST 1991 Apr 9 # independence
+- 3:00 RussiaAsia GE%sT 1992 # Georgia Time
++ 3:00 RussiaAsia GE%sT 1992 # Georgia Time
+ 3:00 E-EurAsia GE%sT 1994 Sep lastSun
+ 4:00 E-EurAsia GE%sT 1996 Oct lastSun
+ 4:00 1:00 GEST 1997 Mar lastSun
+ 4:00 E-EurAsia GE%sT 2004 Jun 27
+- 3:00 RussiaAsia GE%sT 2005 Mar lastSun 2:00
++ 3:00 RussiaAsia GE%sT 2005 Mar lastSun 2:00
+ 4:00 - GET
+
+ # East Timor
+
+ # See Indonesia for the 1945 transition.
+
+-# From Joao Carrascalao, brother of the former governor of East Timor, in
+-# <a href="http://etan.org/et99c/december/26-31/30ETMAY.htm">
++# From João Carrascalão, brother of the former governor of East Timor, in
+ # East Timor may be late for its millennium
+-# </a> (1999-12-26/31):
++# <http://etan.org/et99c/december/26-31/30ETMAY.htm> (1999-12-26/31):
+ # Portugal tried to change the time forward in 1974 because the sun
+ # rises too early but the suggestion raised a lot of problems with the
+ # Timorese and I still don't think it would work today because it
+@@ -766,25 +881,25 @@
+ # We don't have any record of the above attempt.
+ # Most likely our records are incomplete, but we have no better data.
+
+-# <a href="http://www.hri.org/news/world/undh/last/00-08-16.undh.html">
+ # From Manoel de Almeida e Silva, Deputy Spokesman for the UN Secretary-General
+-# (2000-08-16)</a>:
++# http://www.hri.org/news/world/undh/2000/00-08-16.undh.html
++# (2000-08-16):
+ # The Cabinet of the East Timor Transition Administration decided
+ # today to advance East Timor's time by one hour. The time change,
+ # which will be permanent, with no seasonal adjustment, will happen at
+ # midnight on Saturday, September 16.
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Dili 8:22:20 - LMT 1912
++Zone Asia/Dili 8:22:20 - LMT 1912 Jan 1
+ 8:00 - TLT 1942 Feb 21 23:00 # E Timor Time
+ 9:00 - JST 1945 Sep 23
+ 9:00 - TLT 1976 May 3
+- 8:00 - WITA 2000 Sep 17 00:00
++ 8:00 - WITA 2000 Sep 17 0:00
+ 9:00 - TLT
+
+ # India
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
++Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
+ 5:53:20 - HMT 1941 Oct # Howrah Mean Time?
+ 6:30 - BURT 1942 May 15 # Burma Time
+ 5:30 - IST 1942 Sep
+@@ -797,8 +912,12 @@
+
+ # Indonesia
+ #
++# From Paul Eggert (2014-09-06):
++# The 1876 Report of the Secretary of the [US] Navy, p 306 says that Batavia
++# civil time was 7:07:12.5; round to even for Jakarta.
++#
+ # From Gwillim Law (2001-05-28), overriding Shanks & Pottenger:
+-# <http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime>
++# http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime
+ # says that Indonesia's time zones changed on 1988-01-01. Looking at some
+ # time zone maps, I think that must refer to Western Borneo (Kalimantan Barat
+ # and Kalimantan Tengah) switching from UTC+8 to UTC+7.
+@@ -810,7 +929,7 @@
+ # other formal surrender ceremonies were September 9, 11, and 13, plus
+ # September 12 for the regional surrender to Mountbatten in Singapore.
+ # These would be the earliest possible times for a change.
+-# Regimes horaires pour le monde entier, by Henri Le Corre, (Editions
++# Régimes horaires pour le monde entier, by Henri Le Corre, (Éditions
+ # Traditionnelles, 1987, Paris) says that Java and Madura switched
+ # from JST to UTC+07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
+ # (Hollandia). For now, assume all Indonesian locations other than Jayapura
+@@ -835,7 +954,7 @@
+ # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
+ # but this must be a typo.
+ 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia
+- 7:20 - JAVT 1932 Nov # Java Time
++ 7:20 - JAVT 1932 Nov # Java Time
+ 7:30 - WIB 1942 Mar 23
+ 9:00 - JST 1945 Sep 23
+ 7:30 - WIB 1948 May
+@@ -861,7 +980,7 @@
+ # Maluku Islands, West Papua, Papua
+ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
+ 9:00 - WIT 1944 Sep 1
+- 9:30 - CST 1964
++ 9:30 - ACST 1964
+ 9:00 - WIT
+
+ # Iran
+@@ -927,7 +1046,7 @@
+ # Several of my users have reported that Iran will not observe DST anymore:
+ # http://www.irna.ir/en/news/view/line-17/0603193812164948.htm
+ #
+-# From Reuters (2007-09-16), with a heads-up from Jesper Norgaard Welen:
++# From Reuters (2007-09-16), with a heads-up from Jesper Nørgaard Welen:
+ # ... the Guardian Council ... approved a law on Sunday to re-introduce
+ # daylight saving time ...
+ # http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
+@@ -993,7 +1112,7 @@
+ Rule Iran 2036 2037 - Sep 21 0:00 0 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Tehran 3:25:44 - LMT 1916
+- 3:25:44 - TMT 1946 # Tehran Mean Time
++ 3:25:44 - TMT 1946 # Tehran Mean Time
+ 3:30 - IRST 1977 Nov
+ 4:00 Iran IR%sT 1979
+ 3:30 Iran IR%sT
+@@ -1018,17 +1137,11 @@
+ # From Steffen Thorsen (2008-03-10):
+ # The cabinet in Iraq abolished DST last week, according to the following
+ # news sources (in Arabic):
+-# <a href="http://www.aljeeran.net/wesima_articles/news-20080305-98602.html">
+ # http://www.aljeeran.net/wesima_articles/news-20080305-98602.html
+-# </a>
+-# <a href="http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10">
+ # http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10
+-# </a>
+ #
+ # We have published a short article in English about the change:
+-# <a href="http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html">
+ # http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
+-# </a>
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Iraq 1982 only - May 1 0:00 1:00 D
+@@ -1037,14 +1150,14 @@
+ Rule Iraq 1984 1985 - Apr 1 0:00 1:00 D
+ Rule Iraq 1985 1990 - Sep lastSun 1:00s 0 S
+ Rule Iraq 1986 1990 - Mar lastSun 1:00s 1:00 D
+-# IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the `:01' is a typo.
++# IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the ':01' is a typo.
+ # Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
+ #
+ Rule Iraq 1991 2007 - Apr 1 3:00s 1:00 D
+ Rule Iraq 1991 2007 - Oct 1 3:00s 0 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Baghdad 2:57:40 - LMT 1890
+- 2:57:36 - BMT 1918 # Baghdad Mean Time?
++ 2:57:36 - BMT 1918 # Baghdad Mean Time?
+ 3:00 - AST 1982 May
+ 3:00 Iraq A%sT
+
+@@ -1272,7 +1385,7 @@
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Jerusalem 2:20:54 - LMT 1880
+- 2:20:40 - JMT 1918 # Jerusalem Mean Time?
++ 2:20:40 - JMT 1918 # Jerusalem Mean Time?
+ 2:00 Zion I%sT
+
+
+@@ -1281,15 +1394,15 @@
+
+ # Japan
+
+-# `9:00' and `JST' is from Guy Harris.
++# '9:00' and 'JST' is from Guy Harris.
+
+ # From Paul Eggert (1995-03-06):
+ # Today's _Asahi Evening News_ (page 4) reports that Japan had
+-# daylight saving between 1948 and 1951, but ``the system was discontinued
+-# because the public believed it would lead to longer working hours.''
++# daylight saving between 1948 and 1951, but "the system was discontinued
++# because the public believed it would lead to longer working hours."
+
+-# From Mayumi Negishi in the 2005-08-10 Japan Times
+-# <http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm>:
++# From Mayumi Negishi in the 2005-08-10 Japan Times:
++# http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm
+ # Occupation authorities imposed daylight-saving time on Japan on
+ # [1948-05-01].... But lack of prior debate and the execution of
+ # daylight-saving time just three days after the bill was passed generated
+@@ -1313,7 +1426,8 @@
+
+ # From Hideyuki Suzuki (1998-11-09):
+ # 'Tokyo' usually stands for the former location of Tokyo Astronomical
+-# Observatory: E 139 44' 40".90 (9h 18m 58s.727), N 35 39' 16".0.
++# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s),
++# 35 degrees 39' 16.0" N.
+ # This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
+ # edited by National Astronomical Observatory of Japan....
+ # JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
+@@ -1321,10 +1435,10 @@
+
+ # From Hideyuki Suzuki (1998-11-16):
+ # The ordinance No. 51 (1886) established "standard time" in Japan,
+-# which stands for the time on E 135 degree.
++# which stands for the time on 135 degrees E.
+ # In the ordinance No. 167 (1895), "standard time" was renamed to "central
+ # standard time". And the same ordinance also established "western standard
+-# time", which stands for the time on E 120 degree.... But "western standard
++# time", which stands for the time on 120 degrees E.... But "western standard
+ # time" was abolished in the ordinance No. 529 (1937). In the ordinance No.
+ # 167, there is no mention regarding for what place western standard time is
+ # standard....
+@@ -1332,27 +1446,33 @@
+ # I wrote "ordinance" above, but I don't know how to translate.
+ # In Japanese it's "chokurei", which means ordinance from emperor.
+
+-# Shanks & Pottenger claim JST in use since 1896, and that a few
+-# places (e.g. Ishigaki) use +0800; go with Suzuki. Guess that all
+-# ordinances took effect on Jan 1.
++# From Yu-Cheng Chuang (2013-07-12):
++# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause
++# about standard time" ... The adoption began from Jan 1, 1896.
++# http://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
++#
++# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which
++# means the whole Japan territory, including later occupations, adopt Japan
++# Central Time (UTC+9). The adoption began on Oct 1, 1937.
++# http://ja.wikisource.org/wiki/明治二å八年勅令第百六å七號標準時ニ關スル件中改正ノ件
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
+- 9:00 - JST 1896
+- 9:00 - CJT 1938
++ 9:00 - JST 1896 Jan 1
++ 9:00 - JCST 1937 Oct 1
+ 9:00 Japan J%sT
+ # Since 1938, all Japanese possessions have been like Asia/Tokyo.
+
+ # Jordan
+ #
+-# From <a href="http://star.arabia.com/990701/JO9.html">
+-# Jordan Week (1999-07-01) </a> via Steffen Thorsen (1999-09-09):
++# From <http://star.arabia.com/990701/JO9.html>
++# Jordan Week (1999-07-01) via Steffen Thorsen (1999-09-09):
+ # Clocks in Jordan were forwarded one hour on Wednesday at midnight,
+ # in accordance with the government's decision to implement summer time
+ # all year round.
+ #
+-# From <a href="http://star.arabia.com/990930/JO9.html">
+-# Jordan Week (1999-09-30) </a> via Steffen Thorsen (1999-11-09):
++# From <http://star.arabia.com/990930/JO9.html>
++# Jordan Week (1999-09-30) via Steffen Thorsen (1999-11-09):
+ # Winter time starts today Thursday, 30 September. Clocks will be turned back
+ # by one hour. This is the latest government decision and it's final!
+ # The decision was taken because of the increase in working hours in
+@@ -1372,9 +1492,7 @@
+
+ # From Steffen Thorsen (2009-04-02):
+ # This single one might be good enough, (2009-03-24, Arabic):
+-# <a href="http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279">
+ # http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279
+-# </a>
+ #
+ # Google's translation:
+ #
+@@ -1465,9 +1583,8 @@
+ # - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
+ # - Oral switched from +5:00 to +4:00 in spring 1989.
+
+-# <a href="http://www.kazsociety.org.uk/news/2005/03/30.htm">
+-# From Kazakhstan Embassy's News Bulletin #11 (2005-03-21):
+-# </a>
++# From Kazakhstan Embassy's News Bulletin #11
++# <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
+ # The Government of Kazakhstan passed a resolution March 15 abolishing
+ # daylight saving time citing lack of economic benefits and health
+ # complications coupled with a decrease in productivity.
+@@ -1500,10 +1617,10 @@
+ 6:00 - KIZT 1982 Apr 1
+ 5:00 RussiaAsia KIZ%sT 1991
+ 5:00 - KIZT 1991 Dec 16 # independence
+- 5:00 - QYZT 1992 Jan 19 2:00
++ 5:00 - QYZT 1992 Jan 19 2:00
+ 6:00 RussiaAsia QYZ%sT 2005 Mar 15
+ 6:00 - QYZT
+-# Aqtobe (aka Aktobe, formerly Akt'ubinsk)
++# Aqtobe (aka Aktobe, formerly Aktyubinsk)
+ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2
+ 4:00 - AKTT 1930 Jun 21 # Aktyubinsk Time
+ 5:00 - AKTT 1981 Apr 1
+@@ -1523,7 +1640,7 @@
+ 6:00 - SHET 1982 Apr 1
+ 5:00 RussiaAsia SHE%sT 1991
+ 5:00 - SHET 1991 Dec 16 # independence
+- 5:00 RussiaAsia AQT%sT 1995 Mar lastSun 2:00 # Aqtau Time
++ 5:00 RussiaAsia AQT%sT 1995 Mar lastSun 2:00 # Aqtau Time
+ 4:00 RussiaAsia AQT%sT 2005 Mar 15
+ 5:00 - AQTT
+ # West Kazakhstan
+@@ -1532,7 +1649,7 @@
+ 5:00 - URAT 1981 Apr 1
+ 5:00 1:00 URAST 1981 Oct 1
+ 6:00 - URAT 1982 Apr 1
+- 5:00 RussiaAsia URA%sT 1989 Mar 26 2:00
++ 5:00 RussiaAsia URA%sT 1989 Mar 26 2:00
+ 4:00 RussiaAsia URA%sT 1991
+ 4:00 - URAT 1991 Dec 16 # independence
+ 4:00 RussiaAsia ORA%sT 2005 Mar 15 # Oral Time
+@@ -1543,7 +1660,7 @@
+
+ # From Paul Eggert (2005-08-15):
+ # According to an article dated today in the Kyrgyzstan Development Gateway
+-# <http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml>
++# http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml
+ # Kyrgyzstan is canceling the daylight saving time system. I take the article
+ # to mean that they will leave their clocks at 6 hours ahead of UTC.
+ # From Malik Abdugaliev (2005-09-21):
+@@ -1558,68 +1675,92 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Bishkek 4:58:24 - LMT 1924 May 2
+ 5:00 - FRUT 1930 Jun 21 # Frunze Time
+- 6:00 RussiaAsia FRU%sT 1991 Mar 31 2:00s
+- 5:00 1:00 FRUST 1991 Aug 31 2:00 # independence
+- 5:00 Kyrgyz KG%sT 2005 Aug 12 # Kyrgyzstan Time
++ 6:00 RussiaAsia FRU%sT 1991 Mar 31 2:00s
++ 5:00 1:00 FRUST 1991 Aug 31 2:00 # independence
++ 5:00 Kyrgyz KG%sT 2005 Aug 12 # Kyrgyzstan Time
+ 6:00 - KGT
+
+ ###############################################################################
+
+ # Korea (North and South)
+
+-# From Annie I. Bang (2006-07-10) in
+-# <http://www.koreaherald.co.kr/SITE/data/html_dir/2006/07/10/200607100012.asp>:
+-# The Ministry of Commerce, Industry and Energy has already
+-# commissioned a research project [to reintroduce DST] and has said
+-# the system may begin as early as 2008.... Korea ran a daylight
+-# saving program from 1949-61 but stopped it during the 1950-53 Korean War.
++# From Annie I. Bang (2006-07-10):
++# http://www.koreaherald.com/view.php?ud=200607100012
++# Korea ran a daylight saving program from 1949-61 but stopped it
++# during the 1950-53 Korean War. The system was temporarily enforced
++# between 1987 and 1988 ...
+
+-# From Shanks & Pottenger:
++# From Sanghyuk Jung (2014-10-29):
++# http://mm.icann.org/pipermail/tz/2014-October/021830.html
++# According to the Korean Wikipedia
++# http://ko.wikipedia.org/wiki/한국_표준시
++# [oldid=12896437 2014-09-04 08:03 UTC]
++# DST in Republic of Korea was as follows.... And I checked old
++# newspapers in Korean, all articles correspond with data in Wikipedia.
++# For example, the article in 1948 (Korean Language) proved that DST
++# started at June 1 in that year. For another example, the article in
++# 1988 said that DST started at 2:00 AM in that year.
++
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule ROK 1960 only - May 15 0:00 1:00 D
+-Rule ROK 1960 only - Sep 13 0:00 0 S
+-Rule ROK 1987 1988 - May Sun>=8 0:00 1:00 D
+-Rule ROK 1987 1988 - Oct Sun>=8 0:00 0 S
++Rule ROK 1948 only - Jun 1 0:00 1:00 D
++Rule ROK 1948 only - Sep 13 0:00 0 S
++Rule ROK 1949 only - Apr 3 0:00 1:00 D
++Rule ROK 1949 1951 - Sep Sun>=8 0:00 0 S
++Rule ROK 1950 only - Apr 1 0:00 1:00 D
++Rule ROK 1951 only - May 6 0:00 1:00 D
++Rule ROK 1955 only - May 5 0:00 1:00 D
++Rule ROK 1955 only - Sep 9 0:00 0 S
++Rule ROK 1956 only - May 20 0:00 1:00 D
++Rule ROK 1956 only - Sep 30 0:00 0 S
++Rule ROK 1957 1960 - May Sun>=1 0:00 1:00 D
++Rule ROK 1957 1960 - Sep Sun>=18 0:00 0 S
++Rule ROK 1987 1988 - May Sun>=8 2:00 1:00 D
++Rule ROK 1987 1988 - Oct Sun>=8 3:00 0 S
++
++# From Paul Eggert (2014-10-30):
++# The Korean Wikipedia entry gives the following sources for UT offsets:
++#
++# 1908: Official Journal Article No. 3994 (Edict No. 5)
++# 1912: Governor-General of Korea Official Gazette Issue No. 367
++# (Announcement No. 338)
++# 1954: Presidential Decree No. 876 (1954-03-17)
++# 1961: Law No. 676 (1961-08-07)
++# 1987: Law No. 3919 (1986-12-31)
++#
++# The Wikipedia entry also has confusing information about a change
++# to UT+9 in April 1910, but then what would be the point of the later change
++# to UT+9 on 1912-01-01? Omit the 1910 change for now.
++#
++# I guessed that time zone abbreviations through 1945 followed the same
++# rules as discussed under Taiwan, with nominal switches from JST to KST
++# when the respective cities were taken over by the Allies after WWII.
++#
++# For Pyongyang we have no information; guess no changes since World War II.
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Seoul 8:27:52 - LMT 1890
+- 8:30 - KST 1904 Dec
+- 9:00 - KST 1928
+- 8:30 - KST 1932
++Zone Asia/Seoul 8:27:52 - LMT 1908 Apr 1
++ 8:30 - KST 1912 Jan 1
++ 9:00 - JCST 1937 Oct 1
++ 9:00 - JST 1945 Sep 8
+ 9:00 - KST 1954 Mar 21
+- 8:00 ROK K%sT 1961 Aug 10
+- 8:30 - KST 1968 Oct
++ 8:30 ROK K%sT 1961 Aug 10
+ 9:00 ROK K%sT
+-Zone Asia/Pyongyang 8:23:00 - LMT 1890
+- 8:30 - KST 1904 Dec
+- 9:00 - KST 1928
+- 8:30 - KST 1932
+- 9:00 - KST 1954 Mar 21
+- 8:00 - KST 1961 Aug 10
++Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1
++ 8:30 - KST 1912 Jan 1
++ 9:00 - JCST 1937 Oct 1
++ 9:00 - JST 1945 Aug 24
+ 9:00 - KST
+
+ ###############################################################################
+
+ # Kuwait
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-# From the Arab Times (2007-03-14):
+-# The Civil Service Commission (CSC) has approved a proposal forwarded
+-# by MP Ahmad Baqer on implementing the daylight saving time (DST) in
+-# Kuwait starting from April until the end of Sept this year, reports Al-Anba.
+-# <http://www.arabtimesonline.com/arabtimes/kuwait/Viewdet.asp?ID=9950>.
+-# From Paul Eggert (2007-03-29):
+-# We don't know the details, or whether the approval means it'll happen,
+-# so for now we assume no DST.
+ Zone Asia/Kuwait 3:11:56 - LMT 1950
+ 3:00 - AST
+
+ # Laos
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Vientiane 6:50:24 - LMT 1906 Jun 9 # or Viangchan
+- 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT?
+- 7:00 - ICT 1912 May
+- 8:00 - ICT 1931 May
+- 7:00 - ICT
++# See Asia/Bangkok.
++
+
+ # Lebanon
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+@@ -1657,8 +1798,8 @@
+ Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
+ #
+ # peninsular Malaysia
+-# The data here are taken from Mok Ly Yng (2003-10-30)
+-# <http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html>.
++# taken from Mok Ly Yng (2003-10-30)
++# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Kuala_Lumpur 6:46:46 - LMT 1901 Jan 1
+ 6:55:25 - SMT 1905 Jun 1 # Singapore M.T.
+@@ -1670,12 +1811,12 @@
+ 7:30 - MALT 1982 Jan 1
+ 8:00 - MYT # Malaysia Time
+ # Sabah & Sarawak
+-# From Paul Eggert (2006-03-22):
+-# The data here are mostly from Shanks & Pottenger, but the 1942, 1945 and 1982
+-# transition dates are from Mok Ly Yng.
++# From Paul Eggert (2014-08-12):
++# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945
++# and 1982 transition dates are from Mok Ly Yng.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Kuching 7:21:20 - LMT 1926 Mar
+- 7:30 - BORT 1933 # Borneo Time
++ 7:30 - BORT 1933 # Borneo Time
+ 8:00 NBorneo BOR%sT 1942 Feb 16
+ 9:00 - JST 1945 Sep 12
+ 8:00 - BORT 1982 Jan 1
+@@ -1683,22 +1824,21 @@
+
+ # Maldives
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Indian/Maldives 4:54:00 - LMT 1880 # Male
+- 4:54:00 - MMT 1960 # Male Mean Time
+- 5:00 - MVT # Maldives Time
++Zone Indian/Maldives 4:54:00 - LMT 1880 # Male
++ 4:54:00 - MMT 1960 # Male Mean Time
++ 5:00 - MVT # Maldives Time
+
+ # Mongolia
+
+ # Shanks & Pottenger say that Mongolia has three time zones, but
+-# usno1995 and the CIA map Standard Time Zones of the World (2005-03)
+-# both say that it has just one.
++# The USNO (1995-12-21) and the CIA map Standard Time Zones of the World
++# (2005-03) both say that it has just one.
+
+ # From Oscar van Vlijmen (1999-12-11):
+-# <a href="http://www.mongoliatourism.gov.mn/general.htm">
+ # General Information Mongolia
+-# </a> (1999-09)
++# <http://www.mongoliatourism.gov.mn/general.htm> (1999-09)
+ # "Time: Mongolia has two time zones. Three westernmost provinces of
+-# Bayan-Ulgii, Uvs, and Hovd are one hour earlier than the capital city, and
++# Bayan-Ölgii, Uvs, and Hovd are one hour earlier than the capital city, and
+ # the rest of the country follows the Ulaanbaatar time, which is UTC/GMT plus
+ # eight hours."
+
+@@ -1709,7 +1849,7 @@
+ # of implementation may have been different....
+ # Some maps in the past have indicated that there was an additional time
+ # zone in the eastern part of Mongolia, including the provinces of Dornod,
+-# Suhbaatar, and possibly Khentij.
++# Sükhbaatar, and possibly Khentii.
+
+ # From Paul Eggert (1999-12-15):
+ # Naming and spelling is tricky in Mongolia.
+@@ -1723,10 +1863,10 @@
+ # (adopted DST on 2001-04-27 02:00 local time, ending 2001-09-28),
+ # there are three time zones.
+ #
+-# Provinces [at 7:00]: Bayan-ulgii, Uvs, Khovd, Zavkhan, Govi-Altai
+-# Provinces [at 8:00]: Khovsgol, Bulgan, Arkhangai, Khentii, Tov,
+-# Bayankhongor, Ovorkhangai, Dundgovi, Dornogovi, Omnogovi
+-# Provinces [at 9:00]: Dornod, Sukhbaatar
++# Provinces [at 7:00]: Bayan-Ölgii, Uvs, Khovd, Zavkhan, Govi-Altai
++# Provinces [at 8:00]: Khövsgöl, Bulgan, Arkhangai, Khentii, Töv,
++# Bayankhongor, Övörkhangai, Dundgovi, Dornogovi, Ömnögovi
++# Provinces [at 9:00]: Dornod, Sükhbaatar
+ #
+ # [The province of Selenge is omitted from the above lists.]
+
+@@ -1743,16 +1883,16 @@
+ # We have wildly conflicting information about Mongolia's time zones.
+ # Bill Bonnet (2005-05-19) reports that the US Embassy in Ulaanbaatar says
+ # there is only one time zone and that DST is observed, citing Microsoft
+-# Windows XP as the source. Risto Nykanen (2005-05-16) reports that
++# Windows XP as the source. Risto Nykänen (2005-05-16) reports that
+ # travelmongolia.org says there are two time zones (UTC+7, UTC+8) with no DST.
+ # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in
+ # Washington, DC says there are two time zones, with DST observed.
+ # He also found
+-# <http://ubpost.mongolnews.mn/index.php?subaction=showcomments&id=1111634894&archive=&start_from=&ucat=1&>
++# http://ubpost.mongolnews.mn/index.php?subaction=showcomments&id=1111634894&archive=&start_from=&ucat=1&
+ # which also says that there is DST, and which has a comment by "Toddius"
+ # (2005-03-31 06:05 +0700) saying "Mongolia actually has 3.5 time zones.
+ # The West (OLGII) is +7 GMT, most of the country is ULAT is +8 GMT
+-# and some Eastern provinces are +9 GMT but Sukhbaatar Aimag is SUHK +8.5 GMT.
++# and some Eastern provinces are +9 GMT but Sükhbaatar Aimag is SUHK +8.5 GMT.
+ # The SUKH timezone is new this year, it is one of the few things the
+ # parliament passed during the tumultuous winter session."
+ # For now, let's ignore this information, until we have more confirmation.
+@@ -1768,29 +1908,23 @@
+ # +08:00 instead. Different sources appear to disagree with the tz
+ # database on this, e.g.:
+ #
+-# <a href="http://www.timeanddate.com/worldclock/city.html?n=1026">
+ # http://www.timeanddate.com/worldclock/city.html?n=1026
+-# </a>
+-# <a href="http://www.worldtimeserver.com/current_time_in_MN.aspx">
+ # http://www.worldtimeserver.com/current_time_in_MN.aspx
+-# </a>
+ #
+ # both say GMT+08:00.
+
+ # From Steffen Thorsen (2008-03-31):
+ # eznis airways, which operates several domestic flights, has a flight
+ # schedule here:
+-# <a href="http://www.eznis.com/Container.jsp?id=112">
+ # http://www.eznis.com/Container.jsp?id=112
+-# </a>
+ # (click the English flag for English)
+ #
+-# There it appears that flights between Choibalsan and Ulaanbatar arrive
++# There it appears that flights between Choibalsan and Ulaanbaatar arrive
+ # about 1:35 - 1:50 hours later in local clock time, no matter the
+-# direction, while Ulaanbaatar-Khvod takes 2 hours in the Eastern
+-# direction and 3:35 back, which indicates that Ulaanbatar and Khvod are
++# direction, while Ulaanbaatar-Khovd takes 2 hours in the Eastern
++# direction and 3:35 back, which indicates that Ulaanbaatar and Khovd are
+ # in different time zones (like we know about), while Choibalsan and
+-# Ulaanbatar are in the same time zone (correction needed).
++# Ulaanbaatar are in the same time zone (correction needed).
+
+ # From Arthur David Olson (2008-05-19):
+ # Assume that Choibalsan is indeed offset by 8:00.
+@@ -1806,7 +1940,7 @@
+ # (1996-09) says 1996-10-25. Go with Shanks & Pottenger through 1998.
+ #
+ # Shanks & Pottenger say that the Sept. 1984 through Sept. 1990 switches
+-# in Choibalsan (more precisely, in Dornod and Sukhbaatar) took place
++# in Choibalsan (more precisely, in Dornod and Sükhbaatar) took place
+ # at 02:00 standard time, not at 00:00 local time as in the rest of
+ # the country. That would be odd, and possibly is a result of their
+ # correction of 02:00 (in the previous edition) not being done correctly
+@@ -1822,13 +1956,13 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ # Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
+ Zone Asia/Hovd 6:06:36 - LMT 1905 Aug
+- 6:00 - HOVT 1978 # Hovd Time
++ 6:00 - HOVT 1978 # Hovd Time
+ 7:00 Mongol HOV%sT
+ # Ulaanbaatar, a.k.a. Ulan Bataar, Ulan Bator, Urga
+ Zone Asia/Ulaanbaatar 7:07:32 - LMT 1905 Aug
+- 7:00 - ULAT 1978 # Ulaanbaatar Time
++ 7:00 - ULAT 1978 # Ulaanbaatar Time
+ 8:00 Mongol ULA%sT
+-# Choibalsan, a.k.a. Bajan Tuemen, Bajan Tumen, Chojbalsan,
++# Choibalsan, a.k.a. Bajan Tümen, Bajan Tumen, Chojbalsan,
+ # Choybalsan, Sanbejse, Tchoibalsan
+ Zone Asia/Choibalsan 7:38:00 - LMT 1905 Aug
+ 7:00 - ULAT 1978
+@@ -1860,7 +1994,7 @@
+ # 00:01 was to make it clear which day it was on.
+
+ # From Paul Eggert (2002-03-15):
+-# Jesper Norgaard found this URL:
++# Jesper Nørgaard found this URL:
+ # http://www.pak.gov.pk/public/news/app/app06_dec.htm
+ # (dated 2001-12-06) which says that the Cabinet adopted a scheme "to
+ # advance the clocks by one hour on the night between the first
+@@ -1892,43 +2026,30 @@
+ # Here is an article that Pakistan plan to introduce Daylight Saving Time
+ # on June 1, 2008 for 3 months.
+ #
+-# "... The federal cabinet on Wednesday announced a new conservation plan to help
+-# reduce load shedding by approving the closure of commercial centres at 9pm and
+-# moving clocks forward by one hour for the next three months.
+-# ...."
++# "... The federal cabinet on Wednesday announced a new conservation plan to
++# help reduce load shedding by approving the closure of commercial centres at
++# 9pm and moving clocks forward by one hour for the next three months. ...."
+ #
+-# <a href="http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html">
+ # http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html
+-# </a>
+-# OR
+-# <a href="http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4">
+ # http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
+-# </a>
+
+ # From Arthur David Olson (2008-05-19):
+ # XXX--midnight transitions is a guess; 2008 only is a guess.
+
+ # From Alexander Krivenyshev (2008-08-28):
+ # Pakistan government has decided to keep the watches one-hour advanced
+-# for another 2 months--plan to return to Standard Time on October 31
++# for another 2 months - plan to return to Standard Time on October 31
+ # instead of August 31.
+ #
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_pakistan02.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_pakistan02.html
+-# </a>
+-# OR
+-# <a href="http://dailymailnews.com/200808/28/news/dmbrn03.html">
+ # http://dailymailnews.com/200808/28/news/dmbrn03.html
+-# </a>
+
+ # From Alexander Krivenyshev (2009-04-08):
+ # Based on previous media reports that "... proposed plan to
+ # advance clocks by one hour from May 1 will cause disturbance
+ # to the working schedules rather than bringing discipline in
+ # official working."
+-# <a href="http://www.thenews.com.pk/daily_detail.asp?id=171280">
+ # http://www.thenews.com.pk/daily_detail.asp?id=171280
+-# </a>
+ #
+ # recent news that instead of May 2009 - Pakistan plan to
+ # introduce DST from April 15, 2009
+@@ -1936,15 +2057,8 @@
+ # FYI: Associated Press Of Pakistan
+ # April 08, 2009
+ # Cabinet okays proposal to advance clocks by one hour from April 15
+-# <a href="http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=73043&Itemid=1">
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=73043&Itemid=1
+-# </a>
+-#
+-# or
+-#
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_pakistan05.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_pakistan05.html
+-# </a>
+ #
+ # ....
+ # The Federal Cabinet on Wednesday approved the proposal to
+@@ -1957,34 +2071,20 @@
+ # clocks backward by one hour from October 1. A formal announcement to
+ # this effect will be made after the Prime Minister grants approval in
+ # this regard."
+-# <a href="http://www.thenews.com.pk/updates.asp?id=87168">
+ # http://www.thenews.com.pk/updates.asp?id=87168
+-# </a>
+
+ # From Alexander Krivenyshev (2009-09-28):
+ # According to Associated Press Of Pakistan, it is confirmed that
+-# Pakistan clocks across the country would be turned back by an hour from October
+-# 1, 2009.
++# Pakistan clocks across the country would be turned back by an hour from
++# October 1, 2009.
+ #
+ # "Clocks to go back one hour from 1 Oct"
+-# <a href="http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=86715&Itemid=2">
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=86715&Itemid=2
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_pakistan07.htm">
+ # http://www.worldtimezone.com/dst_news/dst_news_pakistan07.htm
+-# </a>
+-
++#
+ # From Steffen Thorsen (2009-09-29):
+-# Alexander Krivenyshev wrote:
+-# > According to Associated Press Of Pakistan, it is confirmed that
+-# > Pakistan clocks across the country would be turned back by an hour from October
+-# > 1, 2009.
+-#
+ # Now they seem to have changed their mind, November 1 is the new date:
+-# <a href="http://www.thenews.com.pk/top_story_detail.asp?Id=24742">
+ # http://www.thenews.com.pk/top_story_detail.asp?Id=24742
+-# </a>
+ # "The country's clocks will be reversed by one hour on November 1.
+ # Officials of Federal Ministry for Interior told this to Geo News on
+ # Monday."
+@@ -1996,11 +2096,9 @@
+ #
+ # We have confirmed this year's end date with both with the Ministry of
+ # Water and Power and the Pakistan Electric Power Company:
+-# <a href="http://www.timeanddate.com/news/time/pakistan-ends-dst09.html">
+ # http://www.timeanddate.com/news/time/pakistan-ends-dst09.html
+-# </a>
+
+-# From Christoph Goehre (2009-10-01):
++# From Christoph Göhre (2009-10-01):
+ # [T]he German Consulate General in Karachi reported me today that Pakistan
+ # will go back to standard time on 1st of November.
+
+@@ -2016,22 +2114,17 @@
+ # Now, it seems that the decision to not observe DST in final:
+ #
+ # "Govt Withdraws Plan To Advance Clocks"
+-# <a href="http://www.apakistannews.com/govt-withdraws-plan-to-advance-clocks-172041">
+ # http://www.apakistannews.com/govt-withdraws-plan-to-advance-clocks-172041
+-# </a>
+ #
+ # "People laud PM's announcement to end DST"
+-# <a href="http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2">
+ # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
+-# </a>
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S
+ Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 -
+ Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
+-Rule Pakistan 2008 only - Nov 1 0:00 0 -
++Rule Pakistan 2008 2009 - Nov 1 0:00 0 -
+ Rule Pakistan 2009 only - Apr 15 0:00 1:00 S
+-Rule Pakistan 2009 only - Nov 1 0:00 0 -
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Karachi 4:28:12 - LMT 1907
+@@ -2105,10 +2198,9 @@
+ # the PA has decided to implement DST in April.
+
+ # From Paul Eggert (1999-09-20):
+-# Daoud Kuttab writes in
+-# <a href="http://www.jpost.com/com/Archive/22.Apr.1999/Opinion/Article-2.html">
+-# Holiday havoc
+-# </a> (Jerusalem Post, 1999-04-22) that
++# Daoud Kuttab writes in Holiday havoc
++# http://www.jpost.com/com/Archive/22.Apr.1999/Opinion/Article-2.html
++# (Jerusalem Post, 1999-04-22) that
+ # the Palestinian National Authority changed to DST on 1999-04-15.
+ # I vaguely recall that they switch back in October (sorry, forgot the source).
+ # For now, let's assume that the spring switch was at 24:00,
+@@ -2121,7 +2213,7 @@
+ # A user from Gaza reported that Gaza made the change early because of
+ # the Ramadan. Next year Ramadan will be even earlier, so I think
+ # there is a good chance next year's end date will be around two weeks
+-# earlier--the same goes for Jordan.
++# earlier - the same goes for Jordan.
+
+ # From Steffen Thorsen (2006-08-17):
+ # I was informed by a user in Bethlehem that in Bethlehem it started the
+@@ -2140,7 +2232,7 @@
+ # I guess it is likely that next year's date will be moved as well,
+ # because of the Ramadan.
+
+-# From Jesper Norgaard Welen (2007-09-18):
++# From Jesper Nørgaard Welen (2007-09-18):
+ # According to Steffen Thorsen's web site the Gaza Strip and the rest of the
+ # Palestinian territories left DST early on 13.th. of September at 2:00.
+
+@@ -2157,16 +2249,9 @@
+ # Gaza Strip (as Egypt) ended DST at midnight Thursday (Aug 28, 2008), while
+ # the West Bank will end Daylight Saving Time at midnight Sunday (Aug 31, 2008).
+ #
+-# <a href="http://www.guardian.co.uk/world/feedarticle/7759001">
+ # http://www.guardian.co.uk/world/feedarticle/7759001
+-# </a>
+-# <a href="http://www.abcnews.go.com/International/wireStory?id=5676087">
+ # http://www.abcnews.go.com/International/wireStory?id=5676087
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_gazastrip01.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_gazastrip01.html
+-# </a>
+
+ # From Alexander Krivenyshev (2009-03-26):
+ # According to the Palestine News Network (arabic.pnn.ps), Palestinian
+@@ -2174,24 +2259,17 @@
+ # 26 and continue until the night of 27 September 2009.
+ #
+ # (in Arabic)
+-# <a href="http://arabic.pnn.ps/index.php?option=com_content&task=view&id=50850">
+ # http://arabic.pnn.ps/index.php?option=com_content&task=view&id=50850
+-# </a>
+ #
+-# or
+ # (English translation)
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_westbank01.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_westbank01.html
+-# </a>
+
+ # From Steffen Thorsen (2009-08-31):
+ # Palestine's Council of Ministers announced that they will revert back to
+ # winter time on Friday, 2009-09-04.
+ #
+ # One news source:
+-# <a href="http://www.safa.ps/ara/?action=showdetail&seid=4158">
+ # http://www.safa.ps/ara/?action=showdetail&seid=4158
+-# </a>
+ # (Palestinian press agency, Arabic),
+ # Google translate: "Decided that the Palestinian government in Ramallah
+ # headed by Salam Fayyad, the start of work in time for the winter of
+@@ -2200,9 +2278,7 @@
+ #
+ # We are not sure if Gaza will do the same, last year they had a different
+ # end date, we will keep this page updated:
+-# <a href="http://www.timeanddate.com/news/time/westbank-gaza-dst-2009.html">
+ # http://www.timeanddate.com/news/time/westbank-gaza-dst-2009.html
+-# </a>
+
+ # From Alexander Krivenyshev (2009-09-02):
+ # Seems that Gaza Strip will go back to Winter Time same date as West Bank.
+@@ -2212,51 +2288,35 @@
+ #
+ # "Winter time unite the West Bank and Gaza"
+ # (from Palestinian National Authority):
+-# <a href="http://www.moi.gov.ps/en/?page=633167343250594025&nid=11505
+ # http://www.moi.gov.ps/en/?page=633167343250594025&nid=11505
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html>
+ # http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html
+-# </a>
+
+ # From Alexander Krivenyshev (2010-03-19):
+ # According to Voice of Palestine DST will last for 191 days, from March
+ # 26, 2010 till "the last Sunday before the tenth day of Tishri
+ # (October), each year" (October 03, 2010?)
+ #
+-# <a href="http://palvoice.org/forums/showthread.php?t=245697">
+ # http://palvoice.org/forums/showthread.php?t=245697
+-# </a>
+ # (in Arabic)
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_westbank03.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_westbank03.html
+-# </a>
+
+ # From Steffen Thorsen (2010-03-24):
+ # ...Ma'an News Agency reports that Hamas cabinet has decided it will
+ # start one day later, at 12:01am. Not sure if they really mean 12:01am or
+ # noon though:
+ #
+-# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=271178">
+ # http://www.maannews.net/eng/ViewDetails.aspx?ID=271178
+-# </a>
+ # (Ma'an News Agency)
+ # "At 12:01am Friday, clocks in Israel and the West Bank will change to
+ # 1:01am, while Gaza clocks will change at 12:01am Saturday morning."
+
+ # From Steffen Thorsen (2010-08-11):
+ # According to several sources, including
+-# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=306795">
+ # http://www.maannews.net/eng/ViewDetails.aspx?ID=306795
+-# </a>
+ # the clocks were set back one hour at 2010-08-11 00:00:00 local time in
+ # Gaza and the West Bank.
+ # Some more background info:
+-# <a href="http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html">
+ # http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
+-# </a>
+
+ # From Steffen Thorsen (2011-08-26):
+ # Gaza and the West Bank did go back to standard time in the beginning of
+@@ -2264,13 +2324,9 @@
+ # 00:00 (so two periods of DST in 2011). The pause was because of
+ # Ramadan.
+ #
+-# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=416217">
+ # http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
+-# </a>
+ # Additional info:
+-# <a href="http://www.timeanddate.com/news/time/palestine-dst-2011.html">
+ # http://www.timeanddate.com/news/time/palestine-dst-2011.html
+-# </a>
+
+ # From Alexander Krivenyshev (2011-08-27):
+ # According to the article in The Jerusalem Post:
+@@ -2280,14 +2336,9 @@
+ # The Hamas government said on Saturday that it won't observe summertime after
+ # the Muslim feast of Id al-Fitr, which begins on Tuesday..."
+ # ...
+-# <a href="http://www.jpost.com/MiddleEast/Article.aspx?id=235650">
+ # http://www.jpost.com/MiddleEast/Article.aspx?id=235650
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
+-# </a>
+-# The rules for Egypt are stolen from the `africa' file.
++# The rules for Egypt are stolen from the 'africa' file.
+
+ # From Steffen Thorsen (2011-09-30):
+ # West Bank did end Daylight Saving Time this morning/midnight (2011-09-30
+@@ -2295,26 +2346,18 @@
+ # So West Bank and Gaza now have the same time again.
+ #
+ # Many sources, including:
+-# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=424808">
+ # http://www.maannews.net/eng/ViewDetails.aspx?ID=424808
+-# </a>
+
+ # From Steffen Thorsen (2012-03-26):
+ # Palestinian news sources tell that both Gaza and West Bank will start DST
+ # on Friday (Thursday midnight, 2012-03-29 24:00).
+ # Some of many sources in Arabic:
+-# <a href="http://www.samanews.com/index.php?act=Show&id=122638">
+ # http://www.samanews.com/index.php?act=Show&id=122638
+-# </a>
+ #
+-# <a href="http://safa.ps/details/news/74352/%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-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html">
+ # http://safa.ps/details/news/74352/%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-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html
+-# </a>
+ #
+ # Our brief summary:
+-# <a href="http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html">
+ # http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
+-# </a>
+
+ # From Steffen Thorsen (2013-03-26):
+ # The following news sources tells that Palestine will "start daylight saving
+@@ -2374,10 +2417,10 @@
+ 2:00 EgyptAsia EE%sT 1967 Jun 5
+ 2:00 Zion I%sT 1996
+ 2:00 Jordan EE%sT 1999
+- 2:00 Palestine EE%sT 2008 Aug 29 0:00
++ 2:00 Palestine EE%sT 2008 Aug 29 0:00
+ 2:00 - EET 2008 Sep
+ 2:00 Palestine EE%sT 2010
+- 2:00 - EET 2010 Mar 27 0:01
++ 2:00 - EET 2010 Mar 27 0:01
+ 2:00 Palestine EE%sT 2011 Aug 1
+ 2:00 - EET 2012
+ 2:00 Palestine EE%sT
+@@ -2393,25 +2436,27 @@
+ # no information
+
+ # Philippines
+-# On 1844-08-16, Narciso Claveria, governor-general of the
++# On 1844-08-16, Narciso Clavería, governor-general of the
+ # Philippines, issued a proclamation announcing that 1844-12-30 was to
+-# be immediately followed by 1845-01-01. Robert H. van Gent has a
+-# transcript of the decree in <http://www.phys.uu.nl/~vgent/idl/idl.htm>.
+-# The rest of the data are from Shanks & Pottenger.
++# be immediately followed by 1845-01-01; see R.H. van Gent's
++# History of the International Date Line
++# http://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm
++# The rest of the data entries are from Shanks & Pottenger.
+
+-# From Paul Eggert (2006-04-25):
+-# Tomorrow's Manila Standard reports that the Philippines Department of
+-# Trade and Industry is considering adopting DST this June when the
+-# rainy season begins. See
+-# <http://www.manilastandardtoday.com/?page=politics02_april26_2006>.
+-# For now, we'll ignore this, since it's not definite and we lack details.
+-#
+-# From Jesper Norgaard Welen (2006-04-26):
++# From Jesper Nørgaard Welen (2006-04-26):
+ # ... claims that Philippines had DST last time in 1990:
+ # http://story.philippinetimes.com/p.x/ct/9/id/145be20cc6b121c0/cid/3e5bbccc730d258c/
+ # [a story dated 2006-04-25 by Cris Larano of Dow Jones Newswires,
+ # but no details]
+
++# From Paul Eggert (2014-08-14):
++# The following source says DST may be instituted November-January and again
++# March-June, but this is not definite. It also says DST was last proclaimed
++# during the Ramos administration (1992-1998); but again, no details.
++# Carcamo D. PNoy urged to declare use of daylight saving time.
++# Philippine Star 2014-08-05
++# http://www.philstar.com/headlines/2014/08/05/1354152/pnoy-urged-declare-use-daylight-saving-time
++
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Phil 1936 only - Nov 1 0:00 1:00 S
+ Rule Phil 1937 only - Feb 1 0:00 0 -
+@@ -2428,18 +2473,39 @@
+
+ # Qatar
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha
++Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha
+ 4:00 - GST 1972 Jun
+ 3:00 - AST
+
+ # Saudi Arabia
++#
++# From Paul Eggert (2014-07-15):
++# Time in Saudi Arabia and other countries in the Arabian peninsula was not
++# standardized until relatively recently; we don't know when, and possibly it
++# has never been made official. Richard P Hunt, in "Islam city yielding to
++# modern times", New York Times (1961-04-09), p 20, wrote that only airlines
++# observed standard time, and that people in Jeddah mostly observed quasi-solar
++# time, doing so by setting their watches at sunrise to 6 o'clock (or to 12
++# o'clock for "Arab" time).
++#
++# The TZ database cannot represent quasi-solar time; airline time is the best
++# we can do. The 1946 foreign air news digest of the U.S. Civil Aeronautics
++# Board (OCLC 42299995) reported that the "... Arabian Government, inaugurated
++# a weekly Dhahran-Cairo service, via the Saudi Arabian cities of Riyadh and
++# Jidda, on March 14, 1947". Shanks & Pottenger guessed 1950; go with the
++# earlier date.
++#
++# Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
++# time zones; the other zone, at UTC+4, was in the far eastern part of
++# the country. Ignore this, as it's before our 1970 cutoff.
++#
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Riyadh 3:06:52 - LMT 1950
++Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14
+ 3:00 - AST
+
+ # Singapore
+-# The data here are taken from Mok Ly Yng (2003-10-30)
+-# <http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html>.
++# taken from Mok Ly Yng (2003-10-30)
++# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1
+ 6:55:25 - SMT 1905 Jun 1 # Singapore M.T.
+@@ -2465,26 +2531,24 @@
+
+ # From Paul Eggert (1996-09-03):
+ # "Sri Lanka advances clock by an hour to avoid blackout"
+-# (www.virtual-pc.com/lankaweb/news/items/240596-2.html, 1996-05-24,
++# (<http://www.virtual-pc.com/lankaweb/news/items/240596-2.html>, 1996-05-24,
+ # no longer available as of 1999-08-17)
+-# reported ``the country's standard time will be put forward by one hour at
+-# midnight Friday (1830 GMT) `in the light of the present power crisis'.''
++# reported "the country's standard time will be put forward by one hour at
++# midnight Friday (1830 GMT) 'in the light of the present power crisis'."
+ #
+ # From Dharmasiri Senanayake, Sri Lanka Media Minister (1996-10-24), as quoted
+-# by Shamindra in
+-# <a href="news:54rka5$m5h@mtinsc01-mgt.ops.worldnet.att.net">
+-# Daily News - Hot News Section (1996-10-26)
+-# </a>:
++# by Shamindra in Daily News - Hot News Section
++# <news:54rka5$m5h@mtinsc01-mgt.ops.worldnet.att.net> (1996-10-26):
+ # With effect from 12.30 a.m. on 26th October 1996
+ # Sri Lanka will be six (06) hours ahead of GMT.
+
+-# From Jesper Norgaard Welen (2006-04-14), quoting Sri Lanka News Online
++# From Jesper Nørgaard Welen (2006-04-14), quoting Sri Lanka News Online
+ # <http://news.sinhalaya.com/wmview.php?ArtID=11002> (2006-04-13):
+ # 0030 hrs on April 15, 2006 (midnight of April 14, 2006 +30 minutes)
+ # at present, become 2400 hours of April 14, 2006 (midnight of April 14, 2006).
+
+ # From Peter Apps and Ranga Sirila of Reuters (2006-04-12) in:
+-# <http://today.reuters.co.uk/news/newsArticle.aspx?type=scienceNews&storyID=2006-04-12T172228Z_01_COL295762_RTRIDST_0_SCIENCE-SRILANKA-TIME-DC.XML>
++# http://today.reuters.co.uk/news/newsArticle.aspx?type=scienceNews&storyID=2006-04-12T172228Z_01_COL295762_RTRIDST_0_SCIENCE-SRILANKA-TIME-DC.XML
+ # [The Tamil Tigers] never accepted the original 1996 time change and simply
+ # kept their clocks set five and a half hours ahead of Greenwich Mean
+ # Time (GMT), in line with neighbor India.
+@@ -2498,7 +2562,7 @@
+ # twice in 1996 and probably SL Government or its standardization
+ # agencies never declared an abbreviation as a national standard.
+ #
+-# I recollect before the recent change the government annoucemments
++# I recollect before the recent change the government announcements
+ # mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka
+ # Time and no mention was made about the abbreviation.
+ #
+@@ -2508,7 +2572,7 @@
+ # item....
+ #
+ # Within Sri Lanka I think LKT is well known among computer users and
+-# adminsitrators. In my opinion SLT may not be a good choice because the
++# administrators. In my opinion SLT may not be a good choice because the
+ # nation's largest telcom / internet operator Sri Lanka Telcom is well
+ # known by that abbreviation - simply as SLT (there IP domains are
+ # slt.lk and sltnet.lk).
+@@ -2523,13 +2587,13 @@
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Colombo 5:19:24 - LMT 1880
+- 5:19:32 - MMT 1906 # Moratuwa Mean Time
++ 5:19:32 - MMT 1906 # Moratuwa Mean Time
+ 5:30 - IST 1942 Jan 5
+ 5:30 0:30 IHST 1942 Sep
+- 5:30 1:00 IST 1945 Oct 16 2:00
+- 5:30 - IST 1996 May 25 0:00
+- 6:30 - LKT 1996 Oct 26 0:30
+- 6:00 - LKT 2006 Apr 15 0:30
++ 5:30 1:00 IST 1945 Oct 16 2:00
++ 5:30 - IST 1996 May 25 0:00
++ 6:30 - LKT 1996 Oct 26 0:30
++ 6:00 - LKT 2006 Apr 15 0:30
+ 5:30 - IST
+
+ # Syria
+@@ -2580,7 +2644,7 @@
+ # Today the AP reported "Syria will switch to summertime at midnight Thursday."
+ # http://www.iht.com/articles/ap/2007/03/29/africa/ME-GEN-Syria-Time-Change.php
+ Rule Syria 2007 only - Mar lastFri 0:00 1:00 S
+-# From Jesper Norgard (2007-10-27):
++# From Jesper Nørgaard (2007-10-27):
+ # The sister center ICARDA of my work CIMMYT is confirming that Syria DST will
+ # not take place 1st November at 0:00 o'clock but 1st November at 24:00 or
+ # rather Midnight between Thursday and Friday. This does make more sense than
+@@ -2589,7 +2653,7 @@
+ # it is implemented at midnight of the last workday before weekend...
+ #
+ # From Steffen Thorsen (2007-10-27):
+-# Jesper Norgaard Welen wrote:
++# Jesper Nørgaard Welen wrote:
+ #
+ # > "Winter local time in Syria will be observed at midnight of Thursday 1
+ # > November 2007, and the clock will be put back 1 hour."
+@@ -2605,8 +2669,7 @@
+
+ # From Stephen Colebourne (2008-03-17):
+ # For everyone's info, I saw an IATA time zone change for [Syria] for
+-# this month (March 2008) in the last day or so...This is the data IATA
+-# are now using:
++# this month (March 2008) in the last day or so....
+ # Country Time Standard --- DST Start --- --- DST End --- DST
+ # Name Zone Variation Time Date Time Date
+ # Variation
+@@ -2618,16 +2681,15 @@
+ # From Arthur David Olson (2008-03-17):
+ # Here's a link to English-language coverage by the Syrian Arab News
+ # Agency (SANA)...
+-# <a href="http://www.sana.sy/eng/21/2008/03/11/165173.htm">
+ # http://www.sana.sy/eng/21/2008/03/11/165173.htm
+-# </a>...which reads (in part) "The Cabinet approved the suggestion of the
++# ...which reads (in part) "The Cabinet approved the suggestion of the
+ # Ministry of Electricity to begin daylight savings time on Friday April
+ # 4th, advancing clocks one hour ahead on midnight of Thursday April 3rd."
+ # Since Syria is two hours east of UTC, the 2200 and 2100 transition times
+ # shown above match up with midnight in Syria.
+
+ # From Arthur David Olson (2008-03-18):
+-# My buest guess at a Syrian rule is "the Friday nearest April 1";
++# My best guess at a Syrian rule is "the Friday nearest April 1";
+ # coding that involves either using a "Mar Fri>=29" construct that old time zone
+ # compilers can't handle or having multiple Rules (a la Israel).
+ # For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
+@@ -2640,37 +2702,27 @@
+ # winter time on 2008-11-01 at 00:00 local daylight time (delaying/setting
+ # clocks back 60 minutes).
+ #
+-# <a href="http://sana.sy/ara/2/2008/10/07/195459.htm">
+ # http://sana.sy/ara/2/2008/10/07/195459.htm
+-# </a>
+
+ # From Steffen Thorsen (2009-03-19):
+ # Syria will start DST on 2009-03-27 00:00 this year according to many sources,
+ # two examples:
+ #
+-# <a href="http://www.sana.sy/eng/21/2009/03/17/217563.htm">
+ # http://www.sana.sy/eng/21/2009/03/17/217563.htm
+-# </a>
+ # (English, Syrian Arab News # Agency)
+-# <a href="http://thawra.alwehda.gov.sy/_View_news2.asp?FileName=94459258720090318012209">
+ # http://thawra.alwehda.gov.sy/_View_news2.asp?FileName=94459258720090318012209
+-# </a>
+ # (Arabic, gov-site)
+ #
+ # We have not found any sources saying anything about when DST ends this year.
+ #
+ # Our summary
+-# <a href="http://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html">
+ # http://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html
+-# </a>
+
+ # From Steffen Thorsen (2009-10-27):
+ # The Syrian Arab News Network on 2009-09-29 reported that Syria will
+ # revert back to winter (standard) time on midnight between Thursday
+ # 2009-10-29 and Friday 2009-10-30:
+-# <a href="http://www.sana.sy/ara/2/2009/09/29/247012.htm">
+ # http://www.sana.sy/ara/2/2009/09/29/247012.htm (Arabic)
+-# </a>
+
+ # From Arthur David Olson (2009-10-28):
+ # We'll see if future DST switching times turn out to be end of the last
+@@ -2681,23 +2733,17 @@
+ # The "Syrian News Station" reported on 2010-03-16 that the Council of
+ # Ministers has decided that Syria will start DST on midnight Thursday
+ # 2010-04-01: (midnight between Thursday and Friday):
+-# <a href="http://sns.sy/sns/?path=news/read/11421">
+ # http://sns.sy/sns/?path=news/read/11421 (Arabic)
+-# </a>
+
+ # From Steffen Thorsen (2012-03-26):
+ # Today, Syria's government announced that they will start DST early on Friday
+ # (00:00). This is a bit earlier than the past two years.
+ #
+ # From Syrian Arab News Agency, in Arabic:
+-# <a href="http://www.sana.sy/ara/2/2012/03/26/408215.htm">
+ # http://www.sana.sy/ara/2/2012/03/26/408215.htm
+-# </a>
+ #
+ # Our brief summary:
+-# <a href="http://www.timeanddate.com/news/time/syria-dst-2012.html">
+ # http://www.timeanddate.com/news/time/syria-dst-2012.html
+-# </a>
+
+ # From Arthur David Olson (2012-03-27):
+ # Assume last Friday in March going forward XXX.
+@@ -2710,7 +2756,7 @@
+ Rule Syria 2009 max - Oct lastFri 0:00 0 -
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
++Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
+ 2:00 Syria EE%sT
+
+ # Tajikistan
+@@ -2718,24 +2764,26 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Dushanbe 4:35:12 - LMT 1924 May 2
+ 5:00 - DUST 1930 Jun 21 # Dushanbe Time
+- 6:00 RussiaAsia DUS%sT 1991 Mar 31 2:00s
+- 5:00 1:00 DUSST 1991 Sep 9 2:00s
+- 5:00 - TJT # Tajikistan Time
++ 6:00 RussiaAsia DUS%sT 1991 Mar 31 2:00s
++ 5:00 1:00 DUSST 1991 Sep 9 2:00s
++ 5:00 - TJT # Tajikistan Time
+
+ # Thailand
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Bangkok 6:42:04 - LMT 1880
+ 6:42:04 - BMT 1920 Apr # Bangkok Mean Time
+ 7:00 - ICT
++Link Asia/Bangkok Asia/Phnom_Penh # Cambodia
++Link Asia/Bangkok Asia/Vientiane # Laos
+
+ # Turkmenistan
+ # From Shanks & Pottenger.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Ashgabat 3:53:32 - LMT 1924 May 2 # or Ashkhabad
+ 4:00 - ASHT 1930 Jun 21 # Ashkhabad Time
+- 5:00 RussiaAsia ASH%sT 1991 Mar 31 2:00
++ 5:00 RussiaAsia ASH%sT 1991 Mar 31 2:00
+ 4:00 RussiaAsia ASH%sT 1991 Oct 27 # independence
+- 4:00 RussiaAsia TM%sT 1992 Jan 19 2:00
++ 4:00 RussiaAsia TM%sT 1992 Jan 19 2:00
+ 5:00 - TMT
+
+ # United Arab Emirates
+@@ -2744,8 +2792,9 @@
+ 4:00 - GST
+
+ # Uzbekistan
++# Byalokoz 1919 says Uzbekistan was 4:27:53.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Samarkand 4:27:12 - LMT 1924 May 2
++Zone Asia/Samarkand 4:27:53 - LMT 1924 May 2
+ 4:00 - SAMT 1930 Jun 21 # Samarkand Time
+ 5:00 - SAMT 1981 Apr 1
+ 5:00 1:00 SAMST 1981 Oct 1
+@@ -2753,31 +2802,75 @@
+ 5:00 RussiaAsia SAM%sT 1991 Sep 1 # independence
+ 5:00 RussiaAsia UZ%sT 1992
+ 5:00 - UZT
+-Zone Asia/Tashkent 4:37:12 - LMT 1924 May 2
++# Milne says Tashkent was 4:37:10.8; round to nearest.
++Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2
+ 5:00 - TAST 1930 Jun 21 # Tashkent Time
+- 6:00 RussiaAsia TAS%sT 1991 Mar 31 2:00
++ 6:00 RussiaAsia TAS%sT 1991 Mar 31 2:00
+ 5:00 RussiaAsia TAS%sT 1991 Sep 1 # independence
+ 5:00 RussiaAsia UZ%sT 1992
+ 5:00 - UZT
+
+ # Vietnam
+
+-# From Paul Eggert (2013-02-21):
++# From Paul Eggert (2014-10-04):
+ # Milne gives 7:16:56 for the meridian of Saigon in 1899, as being
+ # used in Lower Laos, Cambodia, and Annam. But this is quite a ways
+ # from Saigon's location. For now, ignore this and stick with Shanks
+-# and Pottenger.
++# and Pottenger for LMT before 1906.
+
+ # From Arthur David Olson (2008-03-18):
+-# The English-language name of Vietnam's most populous city is "Ho Chi Min City";
+-# we use Ho_Chi_Minh below to avoid a name of more than 14 characters.
++# The English-language name of Vietnam's most populous city is "Ho Chi Minh
++# City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters.
+
+-# From Shanks & Pottenger:
++# From Paul Eggert (2014-10-21) after a heads-up from Trần Ngá»c Quân:
++# Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)"
++# (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50,
++# is quoted verbatim in:
++# http://www.thoigian.com.vn/?mPage=P80D01
++# is translated by Brian Inglis in:
++# http://mm.icann.org/pipermail/tz/2014-October/021654.html
++# and is the basis for the information below.
++#
++# The 1906 transition was effective July 1 and standardized Indochina to
++# Phù Liễn Observatory, legally 104 deg. 17'17" east of Paris.
++# It's unclear whether this meant legal Paris Mean Time (00:09:21) or
++# the Paris Meridian (2 deg. 20'14.03" E); the former yields 07:06:30.1333...
++# and the latter 07:06:29.333... so either way it rounds to 07:06:30,
++# which is used below even though the modern-day Phù Liễn Observatory
++# is closer to 07:06:31. Abbreviate Phù Liễn Mean Time as PLMT.
++#
++# The following transitions occurred in Indochina in general (before 1954)
++# and in South Vietnam in particular (after 1954):
++# To 07:00 on 1911-05-01.
++# To 08:00 on 1942-12-31 at 23:00.
++# To 09:00 in 1945-03-14 at 23:00.
++# To 07:00 on 1945-09-02 in Vietnam.
++# To 08:00 on 1947-04-01 in French-controlled Indochina.
++# To 07:00 on 1955-07-01 in South Vietnam.
++# To 08:00 on 1959-12-31 at 23:00 in South Vietnam.
++# To 07:00 on 1975-06-13 in South Vietnam.
++#
++# Trần cites the following sources; it's unclear which supplied the info above.
++#
++# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa há»c Xã há»™i,
++# No. 9, Paris, February 1982.
++#
++# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)",
++# NXB Thống kê, Hanoi, 2000.
++#
++# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu",
++# NXB Thuận Hoá, Huế, 1995.
++
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 Jun 9
+- 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT?
+- 7:00 - ICT 1912 May
+- 8:00 - ICT 1931 May
++Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 Jul 1
++ 7:06:30 - PLMT 1911 May 1
++ 7:00 - ICT 1942 Dec 31 23:00
++ 8:00 - IDT 1945 Mar 14 23:00
++ 9:00 - JST 1945 Sep 2
++ 7:00 - ICT 1947 Apr 1
++ 8:00 - IDT 1955 Jul 1
++ 7:00 - ICT 1959 Dec 31 23:00
++ 8:00 - IDT 1975 Jun 13
+ 7:00 - ICT
+
+ # Yemen
+--- ./jdk/make/sun/javazic/tzdata/australasia Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/australasia Mon Jan 05 11:57:27 2015 -0800
+@@ -21,7 +21,6 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+@@ -36,13 +35,13 @@
+ # Please see the notes below for the controversy about "EST" versus "AEST" etc.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule Aus 1917 only - Jan 1 0:01 1:00 -
+-Rule Aus 1917 only - Mar 25 2:00 0 -
+-Rule Aus 1942 only - Jan 1 2:00 1:00 -
+-Rule Aus 1942 only - Mar 29 2:00 0 -
+-Rule Aus 1942 only - Sep 27 2:00 1:00 -
+-Rule Aus 1943 1944 - Mar lastSun 2:00 0 -
+-Rule Aus 1943 only - Oct 3 2:00 1:00 -
++Rule Aus 1917 only - Jan 1 0:01 1:00 D
++Rule Aus 1917 only - Mar 25 2:00 0 S
++Rule Aus 1942 only - Jan 1 2:00 1:00 D
++Rule Aus 1942 only - Mar 29 2:00 0 S
++Rule Aus 1942 only - Sep 27 2:00 1:00 D
++Rule Aus 1943 1944 - Mar lastSun 2:00 0 S
++Rule Aus 1943 only - Oct 3 2:00 1:00 D
+ # Go with Whitman and the Australian National Standards Commission, which
+ # says W Australia didn't use DST in 1943/1944. Ignore Whitman's claim that
+ # 1944/1945 was just like 1943/1944.
+@@ -50,26 +49,26 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ # Northern Territory
+ Zone Australia/Darwin 8:43:20 - LMT 1895 Feb
+- 9:00 - CST 1899 May
+- 9:30 Aus CST
++ 9:00 - ACST 1899 May
++ 9:30 Aus AC%sT
+ # Western Australia
+ #
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule AW 1974 only - Oct lastSun 2:00s 1:00 -
+-Rule AW 1975 only - Mar Sun>=1 2:00s 0 -
+-Rule AW 1983 only - Oct lastSun 2:00s 1:00 -
+-Rule AW 1984 only - Mar Sun>=1 2:00s 0 -
+-Rule AW 1991 only - Nov 17 2:00s 1:00 -
+-Rule AW 1992 only - Mar Sun>=1 2:00s 0 -
+-Rule AW 2006 only - Dec 3 2:00s 1:00 -
+-Rule AW 2007 2009 - Mar lastSun 2:00s 0 -
+-Rule AW 2007 2008 - Oct lastSun 2:00s 1:00 -
++Rule AW 1974 only - Oct lastSun 2:00s 1:00 D
++Rule AW 1975 only - Mar Sun>=1 2:00s 0 S
++Rule AW 1983 only - Oct lastSun 2:00s 1:00 D
++Rule AW 1984 only - Mar Sun>=1 2:00s 0 S
++Rule AW 1991 only - Nov 17 2:00s 1:00 D
++Rule AW 1992 only - Mar Sun>=1 2:00s 0 S
++Rule AW 2006 only - Dec 3 2:00s 1:00 D
++Rule AW 2007 2009 - Mar lastSun 2:00s 0 S
++Rule AW 2007 2008 - Oct lastSun 2:00s 1:00 D
+ Zone Australia/Perth 7:43:24 - LMT 1895 Dec
+- 8:00 Aus WST 1943 Jul
+- 8:00 AW WST
++ 8:00 Aus AW%sT 1943 Jul
++ 8:00 AW AW%sT
+ Zone Australia/Eucla 8:35:28 - LMT 1895 Dec
+- 8:45 Aus CWST 1943 Jul
+- 8:45 AW CWST
++ 8:45 Aus ACW%sT 1943 Jul
++ 8:45 AW ACW%sT
+
+ # Queensland
+ #
+@@ -85,150 +84,150 @@
+ # so use Lindeman.
+ #
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule AQ 1971 only - Oct lastSun 2:00s 1:00 -
+-Rule AQ 1972 only - Feb lastSun 2:00s 0 -
+-Rule AQ 1989 1991 - Oct lastSun 2:00s 1:00 -
+-Rule AQ 1990 1992 - Mar Sun>=1 2:00s 0 -
+-Rule Holiday 1992 1993 - Oct lastSun 2:00s 1:00 -
+-Rule Holiday 1993 1994 - Mar Sun>=1 2:00s 0 -
++Rule AQ 1971 only - Oct lastSun 2:00s 1:00 D
++Rule AQ 1972 only - Feb lastSun 2:00s 0 S
++Rule AQ 1989 1991 - Oct lastSun 2:00s 1:00 D
++Rule AQ 1990 1992 - Mar Sun>=1 2:00s 0 S
++Rule Holiday 1992 1993 - Oct lastSun 2:00s 1:00 D
++Rule Holiday 1993 1994 - Mar Sun>=1 2:00s 0 S
+ Zone Australia/Brisbane 10:12:08 - LMT 1895
+- 10:00 Aus EST 1971
+- 10:00 AQ EST
++ 10:00 Aus AE%sT 1971
++ 10:00 AQ AE%sT
+ Zone Australia/Lindeman 9:55:56 - LMT 1895
+- 10:00 Aus EST 1971
+- 10:00 AQ EST 1992 Jul
+- 10:00 Holiday EST
++ 10:00 Aus AE%sT 1971
++ 10:00 AQ AE%sT 1992 Jul
++ 10:00 Holiday AE%sT
+
+ # South Australia
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 -
+-Rule AS 1986 only - Oct 19 2:00s 1:00 -
+-Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 -
+-Rule AS 1972 only - Feb 27 2:00s 0 -
+-Rule AS 1973 1985 - Mar Sun>=1 2:00s 0 -
+-Rule AS 1986 1990 - Mar Sun>=15 2:00s 0 -
+-Rule AS 1991 only - Mar 3 2:00s 0 -
+-Rule AS 1992 only - Mar 22 2:00s 0 -
+-Rule AS 1993 only - Mar 7 2:00s 0 -
+-Rule AS 1994 only - Mar 20 2:00s 0 -
+-Rule AS 1995 2005 - Mar lastSun 2:00s 0 -
+-Rule AS 2006 only - Apr 2 2:00s 0 -
+-Rule AS 2007 only - Mar lastSun 2:00s 0 -
+-Rule AS 2008 max - Apr Sun>=1 2:00s 0 -
+-Rule AS 2008 max - Oct Sun>=1 2:00s 1:00 -
++Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 D
++Rule AS 1986 only - Oct 19 2:00s 1:00 D
++Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 D
++Rule AS 1972 only - Feb 27 2:00s 0 S
++Rule AS 1973 1985 - Mar Sun>=1 2:00s 0 S
++Rule AS 1986 1990 - Mar Sun>=15 2:00s 0 S
++Rule AS 1991 only - Mar 3 2:00s 0 S
++Rule AS 1992 only - Mar 22 2:00s 0 S
++Rule AS 1993 only - Mar 7 2:00s 0 S
++Rule AS 1994 only - Mar 20 2:00s 0 S
++Rule AS 1995 2005 - Mar lastSun 2:00s 0 S
++Rule AS 2006 only - Apr 2 2:00s 0 S
++Rule AS 2007 only - Mar lastSun 2:00s 0 S
++Rule AS 2008 max - Apr Sun>=1 2:00s 0 S
++Rule AS 2008 max - Oct Sun>=1 2:00s 1:00 D
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Australia/Adelaide 9:14:20 - LMT 1895 Feb
+- 9:00 - CST 1899 May
+- 9:30 Aus CST 1971
+- 9:30 AS CST
++ 9:00 - ACST 1899 May
++ 9:30 Aus AC%sT 1971
++ 9:30 AS AC%sT
+
+ # Tasmania
+ #
+ # From Paul Eggert (2005-08-16):
+-# <http://www.bom.gov.au/climate/averages/tables/dst_times.shtml>
++# http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
+ # says King Island didn't observe DST from WWII until late 1971.
+ #
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule AT 1967 only - Oct Sun>=1 2:00s 1:00 -
+-Rule AT 1968 only - Mar lastSun 2:00s 0 -
+-Rule AT 1968 1985 - Oct lastSun 2:00s 1:00 -
+-Rule AT 1969 1971 - Mar Sun>=8 2:00s 0 -
+-Rule AT 1972 only - Feb lastSun 2:00s 0 -
+-Rule AT 1973 1981 - Mar Sun>=1 2:00s 0 -
+-Rule AT 1982 1983 - Mar lastSun 2:00s 0 -
+-Rule AT 1984 1986 - Mar Sun>=1 2:00s 0 -
+-Rule AT 1986 only - Oct Sun>=15 2:00s 1:00 -
+-Rule AT 1987 1990 - Mar Sun>=15 2:00s 0 -
+-Rule AT 1987 only - Oct Sun>=22 2:00s 1:00 -
+-Rule AT 1988 1990 - Oct lastSun 2:00s 1:00 -
+-Rule AT 1991 1999 - Oct Sun>=1 2:00s 1:00 -
+-Rule AT 1991 2005 - Mar lastSun 2:00s 0 -
+-Rule AT 2000 only - Aug lastSun 2:00s 1:00 -
+-Rule AT 2001 max - Oct Sun>=1 2:00s 1:00 -
+-Rule AT 2006 only - Apr Sun>=1 2:00s 0 -
+-Rule AT 2007 only - Mar lastSun 2:00s 0 -
+-Rule AT 2008 max - Apr Sun>=1 2:00s 0 -
++Rule AT 1967 only - Oct Sun>=1 2:00s 1:00 D
++Rule AT 1968 only - Mar lastSun 2:00s 0 S
++Rule AT 1968 1985 - Oct lastSun 2:00s 1:00 D
++Rule AT 1969 1971 - Mar Sun>=8 2:00s 0 S
++Rule AT 1972 only - Feb lastSun 2:00s 0 S
++Rule AT 1973 1981 - Mar Sun>=1 2:00s 0 S
++Rule AT 1982 1983 - Mar lastSun 2:00s 0 S
++Rule AT 1984 1986 - Mar Sun>=1 2:00s 0 S
++Rule AT 1986 only - Oct Sun>=15 2:00s 1:00 D
++Rule AT 1987 1990 - Mar Sun>=15 2:00s 0 S
++Rule AT 1987 only - Oct Sun>=22 2:00s 1:00 D
++Rule AT 1988 1990 - Oct lastSun 2:00s 1:00 D
++Rule AT 1991 1999 - Oct Sun>=1 2:00s 1:00 D
++Rule AT 1991 2005 - Mar lastSun 2:00s 0 S
++Rule AT 2000 only - Aug lastSun 2:00s 1:00 D
++Rule AT 2001 max - Oct Sun>=1 2:00s 1:00 D
++Rule AT 2006 only - Apr Sun>=1 2:00s 0 S
++Rule AT 2007 only - Mar lastSun 2:00s 0 S
++Rule AT 2008 max - Apr Sun>=1 2:00s 0 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Australia/Hobart 9:49:16 - LMT 1895 Sep
+- 10:00 - EST 1916 Oct 1 2:00
+- 10:00 1:00 EST 1917 Feb
+- 10:00 Aus EST 1967
+- 10:00 AT EST
++ 10:00 - AEST 1916 Oct 1 2:00
++ 10:00 1:00 AEDT 1917 Feb
++ 10:00 Aus AE%sT 1967
++ 10:00 AT AE%sT
+ Zone Australia/Currie 9:35:28 - LMT 1895 Sep
+- 10:00 - EST 1916 Oct 1 2:00
+- 10:00 1:00 EST 1917 Feb
+- 10:00 Aus EST 1971 Jul
+- 10:00 AT EST
++ 10:00 - AEST 1916 Oct 1 2:00
++ 10:00 1:00 AEDT 1917 Feb
++ 10:00 Aus AE%sT 1971 Jul
++ 10:00 AT AE%sT
+
+ # Victoria
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule AV 1971 1985 - Oct lastSun 2:00s 1:00 -
+-Rule AV 1972 only - Feb lastSun 2:00s 0 -
+-Rule AV 1973 1985 - Mar Sun>=1 2:00s 0 -
+-Rule AV 1986 1990 - Mar Sun>=15 2:00s 0 -
+-Rule AV 1986 1987 - Oct Sun>=15 2:00s 1:00 -
+-Rule AV 1988 1999 - Oct lastSun 2:00s 1:00 -
+-Rule AV 1991 1994 - Mar Sun>=1 2:00s 0 -
+-Rule AV 1995 2005 - Mar lastSun 2:00s 0 -
+-Rule AV 2000 only - Aug lastSun 2:00s 1:00 -
+-Rule AV 2001 2007 - Oct lastSun 2:00s 1:00 -
+-Rule AV 2006 only - Apr Sun>=1 2:00s 0 -
+-Rule AV 2007 only - Mar lastSun 2:00s 0 -
+-Rule AV 2008 max - Apr Sun>=1 2:00s 0 -
+-Rule AV 2008 max - Oct Sun>=1 2:00s 1:00 -
++Rule AV 1971 1985 - Oct lastSun 2:00s 1:00 D
++Rule AV 1972 only - Feb lastSun 2:00s 0 S
++Rule AV 1973 1985 - Mar Sun>=1 2:00s 0 S
++Rule AV 1986 1990 - Mar Sun>=15 2:00s 0 S
++Rule AV 1986 1987 - Oct Sun>=15 2:00s 1:00 D
++Rule AV 1988 1999 - Oct lastSun 2:00s 1:00 D
++Rule AV 1991 1994 - Mar Sun>=1 2:00s 0 S
++Rule AV 1995 2005 - Mar lastSun 2:00s 0 S
++Rule AV 2000 only - Aug lastSun 2:00s 1:00 D
++Rule AV 2001 2007 - Oct lastSun 2:00s 1:00 D
++Rule AV 2006 only - Apr Sun>=1 2:00s 0 S
++Rule AV 2007 only - Mar lastSun 2:00s 0 S
++Rule AV 2008 max - Apr Sun>=1 2:00s 0 S
++Rule AV 2008 max - Oct Sun>=1 2:00s 1:00 D
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Australia/Melbourne 9:39:52 - LMT 1895 Feb
+- 10:00 Aus EST 1971
+- 10:00 AV EST
++ 10:00 Aus AE%sT 1971
++ 10:00 AV AE%sT
+
+ # New South Wales
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule AN 1971 1985 - Oct lastSun 2:00s 1:00 -
+-Rule AN 1972 only - Feb 27 2:00s 0 -
+-Rule AN 1973 1981 - Mar Sun>=1 2:00s 0 -
+-Rule AN 1982 only - Apr Sun>=1 2:00s 0 -
+-Rule AN 1983 1985 - Mar Sun>=1 2:00s 0 -
+-Rule AN 1986 1989 - Mar Sun>=15 2:00s 0 -
+-Rule AN 1986 only - Oct 19 2:00s 1:00 -
+-Rule AN 1987 1999 - Oct lastSun 2:00s 1:00 -
+-Rule AN 1990 1995 - Mar Sun>=1 2:00s 0 -
+-Rule AN 1996 2005 - Mar lastSun 2:00s 0 -
+-Rule AN 2000 only - Aug lastSun 2:00s 1:00 -
+-Rule AN 2001 2007 - Oct lastSun 2:00s 1:00 -
+-Rule AN 2006 only - Apr Sun>=1 2:00s 0 -
+-Rule AN 2007 only - Mar lastSun 2:00s 0 -
+-Rule AN 2008 max - Apr Sun>=1 2:00s 0 -
+-Rule AN 2008 max - Oct Sun>=1 2:00s 1:00 -
++Rule AN 1971 1985 - Oct lastSun 2:00s 1:00 D
++Rule AN 1972 only - Feb 27 2:00s 0 S
++Rule AN 1973 1981 - Mar Sun>=1 2:00s 0 S
++Rule AN 1982 only - Apr Sun>=1 2:00s 0 S
++Rule AN 1983 1985 - Mar Sun>=1 2:00s 0 S
++Rule AN 1986 1989 - Mar Sun>=15 2:00s 0 S
++Rule AN 1986 only - Oct 19 2:00s 1:00 D
++Rule AN 1987 1999 - Oct lastSun 2:00s 1:00 D
++Rule AN 1990 1995 - Mar Sun>=1 2:00s 0 S
++Rule AN 1996 2005 - Mar lastSun 2:00s 0 S
++Rule AN 2000 only - Aug lastSun 2:00s 1:00 D
++Rule AN 2001 2007 - Oct lastSun 2:00s 1:00 D
++Rule AN 2006 only - Apr Sun>=1 2:00s 0 S
++Rule AN 2007 only - Mar lastSun 2:00s 0 S
++Rule AN 2008 max - Apr Sun>=1 2:00s 0 S
++Rule AN 2008 max - Oct Sun>=1 2:00s 1:00 D
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Australia/Sydney 10:04:52 - LMT 1895 Feb
+- 10:00 Aus EST 1971
+- 10:00 AN EST
++ 10:00 Aus AE%sT 1971
++ 10:00 AN AE%sT
+ Zone Australia/Broken_Hill 9:25:48 - LMT 1895 Feb
+- 10:00 - EST 1896 Aug 23
+- 9:00 - CST 1899 May
+- 9:30 Aus CST 1971
+- 9:30 AN CST 2000
+- 9:30 AS CST
++ 10:00 - AEST 1896 Aug 23
++ 9:00 - ACST 1899 May
++ 9:30 Aus AC%sT 1971
++ 9:30 AN AC%sT 2000
++ 9:30 AS AC%sT
+
+ # Lord Howe Island
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule LH 1981 1984 - Oct lastSun 2:00 1:00 -
+-Rule LH 1982 1985 - Mar Sun>=1 2:00 0 -
+-Rule LH 1985 only - Oct lastSun 2:00 0:30 -
+-Rule LH 1986 1989 - Mar Sun>=15 2:00 0 -
+-Rule LH 1986 only - Oct 19 2:00 0:30 -
+-Rule LH 1987 1999 - Oct lastSun 2:00 0:30 -
+-Rule LH 1990 1995 - Mar Sun>=1 2:00 0 -
+-Rule LH 1996 2005 - Mar lastSun 2:00 0 -
+-Rule LH 2000 only - Aug lastSun 2:00 0:30 -
+-Rule LH 2001 2007 - Oct lastSun 2:00 0:30 -
+-Rule LH 2006 only - Apr Sun>=1 2:00 0 -
+-Rule LH 2007 only - Mar lastSun 2:00 0 -
+-Rule LH 2008 max - Apr Sun>=1 2:00 0 -
+-Rule LH 2008 max - Oct Sun>=1 2:00 0:30 -
++Rule LH 1981 1984 - Oct lastSun 2:00 1:00 D
++Rule LH 1982 1985 - Mar Sun>=1 2:00 0 S
++Rule LH 1985 only - Oct lastSun 2:00 0:30 D
++Rule LH 1986 1989 - Mar Sun>=15 2:00 0 S
++Rule LH 1986 only - Oct 19 2:00 0:30 D
++Rule LH 1987 1999 - Oct lastSun 2:00 0:30 D
++Rule LH 1990 1995 - Mar Sun>=1 2:00 0 S
++Rule LH 1996 2005 - Mar lastSun 2:00 0 S
++Rule LH 2000 only - Aug lastSun 2:00 0:30 D
++Rule LH 2001 2007 - Oct lastSun 2:00 0:30 D
++Rule LH 2006 only - Apr Sun>=1 2:00 0 S
++Rule LH 2007 only - Mar lastSun 2:00 0 S
++Rule LH 2008 max - Apr Sun>=1 2:00 0 S
++Rule LH 2008 max - Oct Sun>=1 2:00 0:30 D
+ Zone Australia/Lord_Howe 10:36:20 - LMT 1895 Feb
+- 10:00 - EST 1981 Mar
+- 10:30 LH LHST
++ 10:00 - AEST 1981 Mar
++ 10:30 LH LH%sT
+
+ # Australian miscellany
+ #
+@@ -244,8 +243,8 @@
+ # Permanent occupation (scientific station) 1911-1915 and since 25 March 1948;
+ # sealing and penguin oil station operated Nov 1899 to Apr 1919. See the
+ # Tasmania Parks & Wildlife Service history of sealing at Macquarie Island
+-# <http://www.parks.tas.gov.au/index.aspx?base=1828>
+-# <http://www.parks.tas.gov.au/index.aspx?base=1831>.
++# http://www.parks.tas.gov.au/index.aspx?base=1828
++# http://www.parks.tas.gov.au/index.aspx?base=1831
+ # Guess that it was like Australia/Hobart while inhabited before 2010.
+ #
+ # From Steffen Thorsen (2010-03-10):
+@@ -256,16 +255,16 @@
+ #
+ # From Arthur David Olson (2013-05-23):
+ # The 1919 transition is overspecified below so pre-2013 zics
+-# will produce a binary file with an EST-type as the first 32-bit type;
++# will produce a binary file with an [A]EST-type as the first 32-bit type;
+ # this is required for correct handling of times before 1916 by
+ # pre-2013 versions of localtime.
+ Zone Antarctica/Macquarie 0 - zzz 1899 Nov
+- 10:00 - EST 1916 Oct 1 2:00
+- 10:00 1:00 EST 1917 Feb
+- 10:00 Aus EST 1919 Apr 1 0:00s
++ 10:00 - AEST 1916 Oct 1 2:00
++ 10:00 1:00 AEDT 1917 Feb
++ 10:00 Aus AE%sT 1919 Apr 1 0:00s
+ 0 - zzz 1948 Mar 25
+- 10:00 Aus EST 1967
+- 10:00 AT EST 2010 Apr 4 3:00
++ 10:00 Aus AE%sT 1967
++ 10:00 AT AE%sT 2010 Apr 4 3:00
+ 11:00 - MIST # Macquarie I Standard Time
+
+ # Christmas
+@@ -273,24 +272,14 @@
+ Zone Indian/Christmas 7:02:52 - LMT 1895 Feb
+ 7:00 - CXT # Christmas Island Time
+
+-# Cook Is
+-# From Shanks & Pottenger:
+-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule Cook 1978 only - Nov 12 0:00 0:30 HS
+-Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
+-Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 HS
+-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Rarotonga -10:39:04 - LMT 1901 # Avarua
+- -10:30 - CKT 1978 Nov 12 # Cook Is Time
+- -10:00 Cook CK%sT
+-
+-# Cocos
++# Cocos (Keeling) Is
+ # These islands were ruled by the Ross family from about 1830 to 1978.
+ # We don't know when standard time was introduced; for now, we guess 1900.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Indian/Cocos 6:27:40 - LMT 1900
+ 6:30 - CCT # Cocos Islands Time
+
++
+ # Fiji
+
+ # Milne gives 11:55:44 for Suva.
+@@ -300,20 +289,13 @@
+ # from November 29th 2009 to April 25th 2010.
+ #
+ # "Daylight savings to commence this month"
+-# <a href="http://www.radiofiji.com.fj/fullstory.php?id=23719">
+ # http://www.radiofiji.com.fj/fullstory.php?id=23719
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_fiji01.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_fiji01.html
+-# </a>
+
+ # From Steffen Thorsen (2009-11-10):
+ # The Fiji Government has posted some more details about the approved
+ # amendments:
+-# <a href="http://www.fiji.gov.fj/publish/page_16198.shtml">
+ # http://www.fiji.gov.fj/publish/page_16198.shtml
+-# </a>
+
+ # From Steffen Thorsen (2010-03-03):
+ # The Cabinet in Fiji has decided to end DST about a month early, on
+@@ -322,35 +304,24 @@
+ # 2011 (last Sunday a good guess?).
+ #
+ # Official source:
+-# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=1096:3310-cabinet-approves-change-in-daylight-savings-dates&catid=49:cabinet-releases&Itemid=166">
+ # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=1096:3310-cabinet-approves-change-in-daylight-savings-dates&catid=49:cabinet-releases&Itemid=166
+-# </a>
+ #
+ # A bit more background info here:
+-# <a href="http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html">
+ # http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html
+-# </a>
+
+ # From Alexander Krivenyshev (2010-10-24):
+ # According to Radio Fiji and Fiji Times online, Fiji will end DST 3
+ # weeks earlier than expected - on March 6, 2011, not March 27, 2011...
+ # Here is confirmation from Government of the Republic of the Fiji Islands,
+ # Ministry of Information (fiji.gov.fj) web site:
+-# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155">
+ # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155
+-# </a>
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_fiji04.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_fiji04.html
+-# </a>
+
+ # From Steffen Thorsen (2011-10-03):
+ # Now the dates have been confirmed, and at least our start date
+ # assumption was correct (end date was one week wrong).
+ #
+-# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155">
+-# www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155
+-# </a>
++# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155
+ # which says
+ # Members of the public are reminded to change their time to one hour in
+ # advance at 2am to 3am on October 23, 2011 and one hour back at 3am to
+@@ -360,9 +331,7 @@
+ # Another change to the Fiji DST end date. In the TZ database the end date for
+ # Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22.
+ #
+-# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155">
+ # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155
+-# </a>
+ # states:
+ #
+ # The end of daylight saving scheduled initially for the 26th of February 2012
+@@ -385,31 +354,38 @@
+ # Fiji will end DST on 2014-01-19 02:00:
+ # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
+
+-# From Paul Eggert (2014-01-10):
+-# For now, guess that Fiji springs forward the Sunday before the fourth
+-# Monday in October, and springs back the penultimate Sunday in January.
+-# This is ad hoc, but matches recent practice.
++# From Ken Rylander (2014-10-20):
++# DST will start Nov. 2 this year.
++# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-NOVEMBER-2ND.aspx
++
++# From Paul Eggert (2014-10-20):
++# For now, guess DST from 02:00 the first Sunday in November to
++# 03:00 the first Sunday on or after January 18. Although ad hoc, it
++# matches this year's plan and seems more likely to match future
++# practice than guessing no DST.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
+ Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
+ Rule Fiji 2009 only - Nov 29 2:00 1:00 S
+ Rule Fiji 2010 only - Mar lastSun 3:00 0 -
+-Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S
++Rule Fiji 2010 2013 - Oct Sun>=21 2:00 1:00 S
+ Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
+ Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
+-Rule Fiji 2014 max - Jan Sun>=18 2:00 0 -
++Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
++Rule Fiji 2014 max - Nov Sun>=1 2:00 1:00 S
++Rule Fiji 2015 max - Jan Sun>=18 3:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
++Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
+ 12:00 Fiji FJ%sT # Fiji Time
+
+ # French Polynesia
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Gambier -8:59:48 - LMT 1912 Oct # Rikitea
++Zone Pacific/Gambier -8:59:48 - LMT 1912 Oct # Rikitea
+ -9:00 - GAMT # Gambier Time
+ Zone Pacific/Marquesas -9:18:00 - LMT 1912 Oct
+ -9:30 - MART # Marquesas Time
+-Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete
++Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete
+ -10:00 - TAHT # Tahiti Time
+ # Clipperton (near North America) is administered from French Polynesia;
+ # it is uninhabited.
+@@ -417,14 +393,14 @@
+ # Guam
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31
+- 9:39:00 - LMT 1901 # Agana
+- 10:00 - GST 2000 Dec 23 # Guam
++ 9:39:00 - LMT 1901 # Agana
++ 10:00 - GST 2000 Dec 23 # Guam
+ 10:00 - ChST # Chamorro Standard Time
+
+ # Kiribati
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Tarawa 11:32:04 - LMT 1901 # Bairiki
+- 12:00 - GILT # Gilbert Is Time
++Zone Pacific/Tarawa 11:32:04 - LMT 1901 # Bairiki
++ 12:00 - GILT # Gilbert Is Time
+ Zone Pacific/Enderbury -11:24:20 - LMT 1901
+ -12:00 - PHOT 1979 Oct # Phoenix Is Time
+ -11:00 - PHOT 1995
+@@ -438,7 +414,7 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Pacific/Saipan -14:17:00 - LMT 1844 Dec 31
+ 9:43:00 - LMT 1901
+- 9:00 - MPT 1969 Oct # N Mariana Is Time
++ 9:00 - MPT 1969 Oct # N Mariana Is Time
+ 10:00 - MPT 2000 Dec 23
+ 10:00 - ChST # Chamorro Standard Time
+
+@@ -449,24 +425,24 @@
+ 12:00 - MHT
+ Zone Pacific/Kwajalein 11:09:20 - LMT 1901
+ 11:00 - MHT 1969 Oct
+- -12:00 - KWAT 1993 Aug 20 # Kwajalein Time
++ -12:00 - KWAT 1993 Aug 20 # Kwajalein Time
+ 12:00 - MHT
+
+ # Micronesia
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Pacific/Chuuk 10:07:08 - LMT 1901
+- 10:00 - CHUT # Chuuk Time
+-Zone Pacific/Pohnpei 10:32:52 - LMT 1901 # Kolonia
+- 11:00 - PONT # Pohnpei Time
++ 10:00 - CHUT # Chuuk Time
++Zone Pacific/Pohnpei 10:32:52 - LMT 1901 # Kolonia
++ 11:00 - PONT # Pohnpei Time
+ Zone Pacific/Kosrae 10:51:56 - LMT 1901
+- 11:00 - KOST 1969 Oct # Kosrae Time
++ 11:00 - KOST 1969 Oct # Kosrae Time
+ 12:00 - KOST 1999
+ 11:00 - KOST
+
+ # Nauru
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Nauru 11:07:40 - LMT 1921 Jan 15 # Uaobe
+- 11:30 - NRT 1942 Mar 15 # Nauru Time
++Zone Pacific/Nauru 11:07:40 - LMT 1921 Jan 15 # Uaobe
++ 11:30 - NRT 1942 Mar 15 # Nauru Time
+ 9:00 - JST 1944 Aug 15
+ 11:30 - NRT 1979 May
+ 12:00 - NRT
+@@ -479,7 +455,7 @@
+ # Shanks & Pottenger say the following was at 2:00; go with IATA.
+ Rule NC 1997 only - Mar 2 2:00s 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Noumea 11:05:48 - LMT 1912 Jan 13
++Zone Pacific/Noumea 11:05:48 - LMT 1912 Jan 13 # Nouméa
+ 11:00 NC NC%sT
+
+
+@@ -496,7 +472,8 @@
+ Rule NZ 1934 1940 - Sep lastSun 2:00 0:30 S
+ Rule NZ 1946 only - Jan 1 0:00 0 S
+ # Since 1957 Chatham has been 45 minutes ahead of NZ, but there's no
+-# convenient notation for this so we must duplicate the Rule lines.
++# convenient single notation for the date and time of this transition
++# so we must duplicate the Rule lines.
+ Rule NZ 1974 only - Nov Sun>=1 2:00s 1:00 D
+ Rule Chatham 1974 only - Nov Sun>=1 2:45s 1:00 D
+ Rule NZ 1975 only - Feb lastSun 2:00s 0 S
+@@ -519,13 +496,14 @@
+ Zone Pacific/Auckland 11:39:04 - LMT 1868 Nov 2
+ 11:30 NZ NZ%sT 1946 Jan 1
+ 12:00 NZ NZ%sT
+-Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1
++Zone Pacific/Chatham 12:13:48 - LMT 1868 Nov 2
++ 12:15 - CHAST 1946 Jan 1
+ 12:45 Chatham CHA%sT
+
+ Link Pacific/Auckland Antarctica/McMurdo
+
+ # Auckland Is
+-# uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers,
++# uninhabited; MÄori and Moriori, colonial settlers, pastoralists, sealers,
+ # and scientific personnel have wintered
+
+ # Campbell I
+@@ -534,48 +512,82 @@
+ # previously whalers, sealers, pastoralists, and scientific personnel wintered
+ # was probably like Pacific/Auckland
+
++# Cook Is
++# From Shanks & Pottenger:
++# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
++Rule Cook 1978 only - Nov 12 0:00 0:30 HS
++Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
++Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 HS
++# Zone NAME GMTOFF RULES FORMAT [UNTIL]
++Zone Pacific/Rarotonga -10:39:04 - LMT 1901 # Avarua
++ -10:30 - CKT 1978 Nov 12 # Cook Is Time
++ -10:00 Cook CK%sT
++
+ ###############################################################################
+
+
+ # Niue
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Niue -11:19:40 - LMT 1901 # Alofi
+- -11:20 - NUT 1951 # Niue Time
+- -11:30 - NUT 1978 Oct 1
++Zone Pacific/Niue -11:19:40 - LMT 1901 # Alofi
++ -11:20 - NUT 1951 # Niue Time
++ -11:30 - NUT 1978 Oct 1
+ -11:00 - NUT
+
+ # Norfolk
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Norfolk 11:11:52 - LMT 1901 # Kingston
+- 11:12 - NMT 1951 # Norfolk Mean Time
+- 11:30 - NFT # Norfolk Time
++Zone Pacific/Norfolk 11:11:52 - LMT 1901 # Kingston
++ 11:12 - NMT 1951 # Norfolk Mean Time
++ 11:30 - NFT # Norfolk Time
+
+ # Palau (Belau)
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Palau 8:57:56 - LMT 1901 # Koror
++Zone Pacific/Palau 8:57:56 - LMT 1901 # Koror
+ 9:00 - PWT # Palau Time
+
+ # Papua New Guinea
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Pacific/Port_Moresby 9:48:40 - LMT 1880
+- 9:48:32 - PMMT 1895 # Port Moresby Mean Time
+- 10:00 - PGT # Papua New Guinea Time
++ 9:48:32 - PMMT 1895 # Port Moresby Mean Time
++ 10:00 - PGT # Papua New Guinea Time
++#
++# From Paul Eggert (2014-10-13):
++# Base the Bougainville entry on the Arawa-Kieta region, which appears to have
++# the most people even though it was devastated in the Bougainville Civil War.
++#
++# Although Shanks gives 1942-03-15 / 1943-11-01 for JST, these dates
++# are apparently rough guesswork from the starts of military campaigns.
++# The World War II entries below are instead based on Arawa-Kieta.
++# The Japanese occupied Kieta in July 1942,
++# according to the Pacific War Online Encyclopedia
++# http://pwencycl.kgbudge.com/B/o/Bougainville.htm
++# and seem to have controlled it until their 1945-08-21 surrender.
++#
++# The Autonomous Region of Bougainville plans to switch from UTC+10 to UTC+11
++# on 2014-12-28 at 02:00. They call UTC+11 "Bougainville Standard Time";
++# abbreviate this as BST. See:
++# http://www.bougainville24.com/bougainville-issues/bougainville-gets-own-timezone/
++#
++Zone Pacific/Bougainville 10:22:16 - LMT 1880
++ 9:48:32 - PMMT 1895
++ 10:00 - PGT 1942 Jul
++ 9:00 - JST 1945 Aug 21
++ 10:00 - PGT 2014 Dec 28 2:00
++ 11:00 - BST
+
+ # Pitcairn
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Pitcairn -8:40:20 - LMT 1901 # Adamstown
+- -8:30 - PNT 1998 Apr 27 00:00
++Zone Pacific/Pitcairn -8:40:20 - LMT 1901 # Adamstown
++ -8:30 - PNT 1998 Apr 27 0:00
+ -8:00 - PST # Pitcairn Standard Time
+
+ # American Samoa
+ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5
+ -11:22:48 - LMT 1911
+- -11:30 - SAMT 1950 # Samoa Time
+- -11:00 - NST 1967 Apr # N=Nome
+- -11:00 - BST 1983 Nov 30 # B=Bering
+- -11:00 - SST # S=Samoa
++ -11:00 - NST 1967 Apr # N=Nome
++ -11:00 - BST 1983 Nov 30 # B=Bering
++ -11:00 - SST # S=Samoa
+
+-# Samoa
++# Samoa (formerly and also known as Western Samoa)
+
+ # From Steffen Thorsen (2009-10-16):
+ # We have been in contact with the government of Samoa again, and received
+@@ -586,141 +598,80 @@
+ # Sunday of April 2011."
+ #
+ # Background info:
+-# <a href="http://www.timeanddate.com/news/time/samoa-dst-plan-2009.html">
+ # http://www.timeanddate.com/news/time/samoa-dst-plan-2009.html
+-# </a>
+ #
+ # Samoa's Daylight Saving Time Act 2009 is available here, but does not
+ # contain any dates:
+-# <a href="http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf">
+ # http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf
+-# </a>
+
+ # From Laupue Raymond Hughes (2010-10-07):
+ # Please see
+-# <a href="http://www.mcil.gov.ws">
+ # http://www.mcil.gov.ws
+-# </a>,
+ # the Ministry of Commerce, Industry and Labour (sideframe) "Last Sunday
+ # September 2010 (26/09/10) - adjust clocks forward from 12:00 midnight
+ # to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks
+ # backwards from 1:00am to 12:00am"
+
+ # From Laupue Raymond Hughes (2011-03-07):
+-# I believe this will be posted shortly on the website
+-# <a href="http://www.mcil.gov.ws">
+-# www.mcil.gov.ws
+-# </a>
++# [http://www.mcil.gov.ws/ftcd/daylight_saving_2011.pdf]
+ #
+-# PUBLIC NOTICE ON DAYLIGHT SAVING TIME
+-#
+-# Pursuant to the Daylight Saving Act 2009 and Cabinets decision,
+-# businesses and the general public are hereby advised that daylight
+-# saving time is on the first Saturday of April 2011 (02/04/11).
+-#
+-# The public is therefore advised that when the standard time strikes
+-# the hour of four oclock (4.00am or 0400 Hours) on the 2nd April 2011,
+-# then all instruments used to measure standard time are to be
+-# adjusted/changed to three oclock (3:00am or 0300Hrs).
+-#
+-# Margaret Fruean ACTING CHIEF EXECUTIVE OFFICER MINISTRY OF COMMERCE,
+-# INDUSTRY AND LABOUR 28th February 2011
++# ... when the standard time strikes the hour of four o'clock (4.00am
++# or 0400 Hours) on the 2nd April 2011, then all instruments used to
++# measure standard time are to be adjusted/changed to three o'clock
++# (3:00am or 0300Hrs).
+
+-# From David Zuelke (2011-05-09):
++# From David Zülke (2011-05-09):
+ # Subject: Samoa to move timezone from east to west of international date line
+ #
+-# <a href="http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963">
+ # http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963
+-# </a>
+
+-# From Mark Sim-Smith (2011-08-17):
+-# I have been in contact with Leilani Tuala Warren from the Samoa Law
+-# Reform Commission, and she has sent me a copy of the Bill that she
+-# confirmed has been passed...Most of the sections are about maps rather
+-# than the time zone change, but I'll paste the relevant bits below. But
+-# the essence is that at midnight 29 Dec (UTC-11 I suppose), Samoa
+-# changes from UTC-11 to UTC+13:
+-#
+-# International Date Line Bill 2011
+-#
+-# AN ACT to provide for the change to standard time in Samoa and to make
+-# consequential amendments to the position of the International Date
+-# Line, and for related purposes.
+-#
+-# BE IT ENACTED by the Legislative Assembly of Samoa in Parliament
+-# assembled as follows:
+-#
+-# 1. Short title and commencement-(1) This Act may be cited as the
+-# International Date Line Act 2011. (2) Except for section 5(3) this Act
+-# commences at 12 o'clock midnight, on Thursday 29th December 2011. (3)
+-# Section 5(3) commences on the date of assent by the Head of State.
+-#
+-# [snip]
+-#
+-# 3. Interpretation - [snip] "Samoa standard time" in this Act and any
+-# other statute of Samoa which refers to 'Samoa standard time' means the
+-# time 13 hours in advance of Co-ordinated Universal Time.
+-#
+-# 4. Samoa standard time - (1) Upon the commencement of this Act, Samoa
+-# standard time shall be set at 13 hours in advance of Co-ordinated
+-# Universal Time for the whole of Samoa. (2) All references to Samoa's
+-# time zone and to Samoa standard time in Samoa in all legislation and
+-# instruments after the commencement of this Act shall be references to
+-# Samoa standard time as provided for in this Act. (3) Nothing in this
+-# Act affects the provisions of the Daylight Saving Act 2009, except that
+-# it defines Samoa standard time....
++# From Paul Eggert (2014-06-27):
++# The International Date Line Act 2011
++# http://www.parliament.gov.ws/images/ACTS/International_Date_Line_Act__2011_-_Eng.pdf
++# changed Samoa from UTC-11 to UTC+13, effective "12 o'clock midnight, on
++# Thursday 29th December 2011". The International Date Line was adjusted
++# accordingly.
+
+ # From Laupue Raymond Hughes (2011-09-02):
+-# <a href="http://www.mcil.gov.ws/mcil_publications.html">
+ # http://www.mcil.gov.ws/mcil_publications.html
+-# </a>
+ #
+ # here is the official website publication for Samoa DST and dateline change
+ #
+ # DST
+-# Year End Time Start Time
+-# 2011 - - - - - - 24 September 3:00am to 4:00am
+-# 2012 01 April 4:00am to 3:00am - - - - - -
++# Year End Time Start Time
++# 2011 - - - - - - 24 September 3:00am to 4:00am
++# 2012 01 April 4:00am to 3:00am - - - - - -
+ #
+ # Dateline Change skip Friday 30th Dec 2011
+ # Thursday 29th December 2011 23:59:59 Hours
+ # Saturday 31st December 2011 00:00:00 Hours
+ #
+-# Clarification by Tim Parenti (2012-01-03):
+-# Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012
+-# seasons, there is not yet any indication that this trend will continue on
+-# a regular basis. For now, we have explicitly listed the transitions below.
+-#
+-# From Nicky (2012-09-10):
++# From Nicholas Pereira (2012-09-10):
+ # Daylight Saving Time commences on Sunday 30th September 2012 and
+-# ends on Sunday 7th of April 2013.
+-#
+-# Please find link below for more information.
++# ends on Sunday 7th of April 2013....
+ # http://www.mcil.gov.ws/mcil_publications.html
+ #
+-# That publication also includes dates for Summer of 2013/4 as well
+-# which give the impression of a pattern in selecting dates for the
+-# future, so for now, we will guess this will continue.
++# From Paul Eggert (2014-07-08):
++# That web page currently lists transitions for 2012/3 and 2013/4.
++# Assume the pattern instituted in 2012 will continue indefinitely.
+
+-# Western Samoa
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
++Rule WS 2010 only - Sep lastSun 0:00 1 D
++Rule WS 2011 only - Apr Sat>=1 4:00 0 S
++Rule WS 2011 only - Sep lastSat 3:00 1 D
++Rule WS 2012 max - Apr Sun>=1 4:00 0 S
+ Rule WS 2012 max - Sep lastSun 3:00 1 D
+-Rule WS 2012 max - Apr Sun>=1 4:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5
+ -11:26:56 - LMT 1911
+- -11:30 - SAMT 1950 # Samoa Time
+- -11:00 - WST 2010 Sep 26
+- -11:00 1:00 WSDT 2011 Apr 2 4:00
+- -11:00 - WST 2011 Sep 24 3:00
+- -11:00 1:00 WSDT 2011 Dec 30
+- 13:00 1:00 WSDT 2012 Apr Sun>=1 4:00
++ -11:30 - WSST 1950
++ -11:00 WS S%sT 2011 Dec 29 24:00 # S=Samoa
+ 13:00 WS WS%sT
+
+ # Solomon Is
+ # excludes Bougainville, for which see Papua New Guinea
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara
++Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara
+ 11:00 - SBT # Solomon Is Time
+
+ # Tokelau Is
+@@ -744,7 +695,7 @@
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Pacific/Fakaofo -11:24:56 - LMT 1901
+- -11:00 - TKT 2011 Dec 30 # Tokelau Time
++ -11:00 - TKT 2011 Dec 30 # Tokelau Time
+ 13:00 - TKT
+
+ # Tonga
+@@ -804,8 +755,8 @@
+ # time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
+ # Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
+ # "The United States High-Altitude Test Experience: A Review Emphasizing the
+-# Impact on the Environment", Los Alamos LA-6405, Oct 1976
+-# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
++# Impact on the Environment", Los Alamos LA-6405, Oct 1976.
++# http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf
+ # See the table on page 4 where he lists GMT and local times for the tests; a
+ # footnote for the JI tests reads that local time is "JI time = Hawaii Time
+ # Minus One Hour".
+@@ -820,7 +771,7 @@
+ # From Mark Brader (2005-01-23):
+ # [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
+ # published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
+-# reproduced a Pan American Airways timeables from 1936, for their weekly
++# reproduced a Pan American Airways timetable from 1936, for their weekly
+ # "Orient Express" flights between San Francisco and Manila, and connecting
+ # flights to Chicago and the US East Coast. As it uses some time zone
+ # designations that I've never seen before:....
+@@ -830,9 +781,9 @@
+ Zone Pacific/Midway -11:49:28 - LMT 1901
+ -11:00 - NST 1956 Jun 3
+ -11:00 1:00 NDT 1956 Sep 2
+- -11:00 - NST 1967 Apr # N=Nome
+- -11:00 - BST 1983 Nov 30 # B=Bering
+- -11:00 - SST # S=Samoa
++ -11:00 - NST 1967 Apr # N=Nome
++ -11:00 - BST 1983 Nov 30 # B=Bering
++ -11:00 - SST # S=Samoa
+
+ # Palmyra
+ # uninhabited since World War II; was probably like Pacific/Kiritimati
+@@ -852,7 +803,7 @@
+ Rule Vanuatu 1992 1993 - Jan Sun>=23 0:00 0 -
+ Rule Vanuatu 1992 only - Oct Sun>=23 0:00 1:00 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
++Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
+ 11:00 Vanuatu VU%sT # Vanuatu Time
+
+ # Wallis and Futuna
+@@ -864,188 +815,213 @@
+
+ # NOTES
+
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future). For more, please see
++# the file CONTRIBUTING in the tz distribution.
+
+-# From Paul Eggert (2013-02-21):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually. Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990. Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Another source occasionally used is Edward W. Whitman, World Time Differences,
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
+ # I found in the UCLA library.
+ #
+ # For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
+ #
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+ #
+-# I invented the abbreviations marked `*' in the following table;
++# I invented the abbreviations marked '*' in the following table;
+ # the rest are from earlier versions of this file, or from other sources.
+ # Corrections are welcome!
+-# std dst
+-# LMT Local Mean Time
+-# 8:00 WST WST Western Australia
+-# 8:45 CWST CWST Central Western Australia*
+-# 9:00 JST Japan
+-# 9:30 CST CST Central Australia
+-# 10:00 EST EST Eastern Australia
+-# 10:00 ChST Chamorro
+-# 10:30 LHST LHST Lord Howe*
+-# 11:30 NZMT NZST New Zealand through 1945
+-# 12:00 NZST NZDT New Zealand 1946-present
+-# 12:45 CHAST CHADT Chatham*
+-# -11:00 SST Samoa
+-# -10:00 HST Hawaii
+-# - 8:00 PST Pitcairn*
++# std dst
++# LMT Local Mean Time
++# 8:00 AWST AWDT Western Australia
++# 8:45 ACWST ACWDT Central Western Australia*
++# 9:00 JST Japan
++# 9:30 ACST ACDT Central Australia
++# 10:00 AEST AEDT Eastern Australia
++# 10:00 ChST Chamorro
++# 10:30 LHST LHDT Lord Howe*
++# 11:00 BST Bougainville*
++# 11:30 NZMT NZST New Zealand through 1945
++# 12:00 NZST NZDT New Zealand 1946-present
++# 12:15 CHAST Chatham through 1945*
++# 12:45 CHAST CHADT Chatham 1946-present*
++# 13:00 WSST WSDT (western) Samoa 2011-present*
++# -11:30 WSST Western Samoa through 1950*
++# -11:00 SST Samoa
++# -10:00 HST Hawaii
++# - 8:00 PST Pitcairn*
+ #
+-# See the `northamerica' file for Hawaii.
+-# See the `southamerica' file for Easter I and the Galapagos Is.
++# See the 'northamerica' file for Hawaii.
++# See the 'southamerica' file for Easter I and the Galápagos Is.
+
+ ###############################################################################
+
+ # Australia
+
++# From Paul Eggert (2014-06-30):
++# Daylight saving time has long been controversial in Australia, pitting
++# region against region, rural against urban, and local against global.
++# For example, in her review of Graeme Davison's _The Unforgiving
++# Minute: how Australians learned to tell the time_ (1993), Perth native
++# Phillipa J Martyr wrote, "The section entitled 'Saving Daylight' was
++# very informative, but was (as can, sadly, only be expected from a
++# Melbourne-based study) replete with the usual chuckleheaded
++# Queenslanders and straw-chewing yokels from the West prattling fables
++# about fading curtains and crazed farm animals."
++# Electronic Journal of Australian and New Zealand History (1997-03-03)
++# http://www.jcu.edu.au/aff/history/reviews/davison.htm
++
+ # From Paul Eggert (2005-12-08):
+-# <a href="http://www.bom.gov.au/climate/averages/tables/dst_times.shtml">
+ # Implementation Dates of Daylight Saving Time within Australia
+-# </a> summarizes daylight saving issues in Australia.
++# http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
++# summarizes daylight saving issues in Australia.
+
+ # From Arthur David Olson (2005-12-12):
+-# <a href="http://www.lawlink.nsw.gov.au/lawlink/Corporate/ll_agdinfo.nsf/pages/community_relations_daylight_saving">
+ # Lawlink NSW:Daylight Saving in New South Wales
+-# </a> covers New South Wales in particular.
++# http://www.lawlink.nsw.gov.au/lawlink/Corporate/ll_agdinfo.nsf/pages/community_relations_daylight_saving
++# covers New South Wales in particular.
+
+ # From John Mackin (1991-03-06):
+-# We in Australia have _never_ referred to DST as `daylight' time.
+-# It is called `summer' time. Now by a happy coincidence, `summer'
+-# and `standard' happen to start with the same letter; hence, the
++# We in Australia have _never_ referred to DST as 'daylight' time.
++# It is called 'summer' time. Now by a happy coincidence, 'summer'
++# and 'standard' happen to start with the same letter; hence, the
+ # abbreviation does _not_ change...
+ # The legislation does not actually define abbreviations, at least
+ # in this State, but the abbreviation is just commonly taken to be the
+ # initials of the phrase, and the legislation here uniformly uses
+-# the phrase `summer time' and does not use the phrase `daylight
++# the phrase 'summer time' and does not use the phrase 'daylight
+ # time'.
+ # Announcers on the Commonwealth radio network, the ABC (for Australian
+-# Broadcasting Commission), use the phrases `Eastern Standard Time'
+-# or `Eastern Summer Time'. (Note, though, that as I say in the
++# Broadcasting Commission), use the phrases 'Eastern Standard Time'
++# or 'Eastern Summer Time'. (Note, though, that as I say in the
+ # current australasia file, there is really no such thing.) Announcers
+ # on its overseas service, Radio Australia, use the same phrases
+-# prefixed by the word `Australian' when referring to local times;
++# prefixed by the word 'Australian' when referring to local times;
+ # time announcements on that service, naturally enough, are made in UTC.
+
+-# From Arthur David Olson (1992-03-08):
+-# Given the above, what's chosen for year-round use is:
+-# CST for any place operating at a GMTOFF of 9:30
+-# WST for any place operating at a GMTOFF of 8:00
+-# EST for any place operating at a GMTOFF of 10:00
+-
+-# From Chuck Soper (2006-06-01):
+-# I recently found this Australian government web page on time zones:
+-# <http://www.australia.gov.au/about-australia-13time>
+-# And this government web page lists time zone names and abbreviations:
+-# <http://www.bom.gov.au/climate/averages/tables/daysavtm.shtml>
+-
+-# From Paul Eggert (2001-04-05), summarizing a long discussion about "EST"
+-# versus "AEST" etc.:
++# From Paul Eggert (2014-06-30):
+ #
+-# I see the following points of dispute:
++# Inspired by Mackin's remarks quoted above, earlier versions of this
++# file used "EST" for both Eastern Standard Time and Eastern Summer
++# Time in Australia, and similarly for "CST", "CWST", and "WST".
++# However, these abbreviations were confusing and were not common
++# practice among Australians, and there were justifiable complaints
++# about them, so I attempted to survey current Australian usage.
++# For the tz database, the full English phrase is not that important;
++# what matters is the abbreviation. It's difficult to survey the web
++# directly for abbreviation usage, as there are so many false hits for
++# strings like "EST" and "EDT", so I looked for pages that defined an
++# abbreviation for eastern or central DST in Australia, and got the
++# following numbers of unique hits for the listed Google queries:
+ #
+-# * How important are unique time zone abbreviations?
++# 10 "Eastern Daylight Time AEST" site:au [some are false hits]
++# 10 "Eastern Summer Time AEST" site:au
++# 10 "Summer Time AEDT" site:au
++# 13 "EDST Eastern Daylight Saving Time" site:au
++# 18 "Summer Time ESST" site:au
++# 28 "Eastern Daylight Saving Time EDST" site:au
++# 39 "EDT Eastern Daylight Time" site:au [some are false hits]
++# 53 "Eastern Daylight Time EDT" site:au [some are false hits]
++# 54 "AEDT Australian Eastern Daylight Time" site:au
++# 182 "Eastern Daylight Time AEDT" site:au
+ #
+-# Here I tend to agree with the point (most recently made by Chris
+-# Newman) that unique abbreviations should not be essential for proper
+-# operation of software. We have other instances of ambiguity
+-# (e.g. "IST" denoting both "Israel Standard Time" and "Indian
+-# Standard Time"), and they are not likely to go away any time soon.
+-# In the old days, some software mistakenly relied on unique
+-# abbreviations, but this is becoming less true with time, and I don't
+-# think it's that important to cater to such software these days.
++# 17 "Central Daylight Time CDT" site:au [some are false hits]
++# 46 "Central Daylight Time ACDT" site:au
+ #
+-# On the other hand, there is another motivation for unambiguous
+-# abbreviations: it cuts down on human confusion. This is
+-# particularly true for Australia, where "EST" can mean one thing for
+-# time T and a different thing for time T plus 1 second.
++# I tried several other variants (e.g., "Eastern Summer Time EST") but
++# they all returned fewer than 10 unique hits. I also looked for pages
++# mentioning both "western standard time" and an abbreviation, since
++# there is no WST in the US to generate false hits, and found:
+ #
+-# * Does the relevant legislation indicate which abbreviations should be used?
++# 156 "western standard time" AWST site:au
++# 226 "western standard time" WST site:au
+ #
+-# Here I tend to think that things are a mess, just as they are in
+-# many other countries. We Americans are currently disagreeing about
+-# which abbreviation to use for the newly legislated Chamorro Standard
+-# Time, for example.
++# I then surveyed the top ten newspapers in Australia by circulation as
++# listed in Wikipedia, using Google queries like "AEDT site:heraldsun.com.au"
++# and obtaining estimated counts from the initial page of search results.
++# All ten papers greatly preferred "AEDT" to "EDT". The papers
++# surveyed were the Herald Sun, The Daily Telegraph, The Courier-Mail,
++# The Sydney Morning Herald, The West Australian, The Age, The Advertiser,
++# The Australian, The Financial Review, and The Herald (Newcastle).
+ #
+-# Personally, I would prefer to use common practice; I would like to
+-# refer to legislation only for examples of common practice, or as a
+-# tiebreaker.
++# I also searched for historical usage, to see whether abbreviations
++# like "AEDT" are new. A Trove search <http://trove.nla.gov.au/>
++# found only one newspaper (The Canberra Times) with a house style
++# dating back to the 1970s, I expect because other newspapers weren't
++# fully indexed. The Canberra Times strongly preferred abbreviations
++# like "AEDT". The first occurrence of "AEDT" was a World Weather
++# column (1971-11-17, page 24), and of "ACDT" was a Scoreboard column
++# (1993-01-24, p 16). The style was the typical usage but was not
++# strictly enforced; for example, "Welcome to the twilight zones ..."
++# (1994-10-29, p 1) uses the abbreviations AEST/AEDT, CST/CDT, and
++# WST, and goes on to say, "The confusion and frustration some feel
++# about the lack of uniformity among Australia's six states and two
++# territories has prompted one group to form its very own political
++# party -- the Sydney-based Daylight Saving Extension Party."
+ #
+-# * Do Australians more often use "Eastern Daylight Time" or "Eastern
+-# Summer Time"? Do they typically prefix the time zone names with
+-# the word "Australian"?
++# I also surveyed federal government sources. They did not agree:
+ #
+-# My own impression is that both "Daylight Time" and "Summer Time" are
+-# common and are widely understood, but that "Summer Time" is more
+-# popular; and that the leading "A" is also common but is omitted more
+-# often than not. I just used AltaVista advanced search and got the
+-# following count of page hits:
++# The Australian Government (2014-03-26)
++# http://australia.gov.au/about-australia/our-country/time
++# (This document was produced by the Department of Finance.)
++# AEST ACST AWST AEDT ACDT
+ #
+-# 1,103 "Eastern Summer Time" AND domain:au
+-# 971 "Australian Eastern Summer Time" AND domain:au
+-# 613 "Eastern Daylight Time" AND domain:au
+-# 127 "Australian Eastern Daylight Time" AND domain:au
++# Bureau of Meteorology (2012-11-08)
++# http://www.bom.gov.au/climate/averages/tables/daysavtm.shtml
++# EST CST WST EDT CDT
+ #
+-# Here "Summer" seems quite a bit more popular than "Daylight",
+-# particularly when we know the time zone is Australian and not US,
+-# say. The "Australian" prefix seems to be popular for Eastern Summer
+-# Time, but unpopular for Eastern Daylight Time.
++# Civil Aviation Safety Authority (undated)
++# http://services.casa.gov.au/outnback/inc/pages/episode3/episode-3_time_zones.shtml
++# EST CST WST (no abbreviations given for DST)
+ #
+-# For abbreviations, tools like AltaVista are less useful because of
+-# ambiguity. Many hits are not really time zones, unfortunately, and
+-# many hits denote US time zones and not Australian ones. But here
+-# are the hit counts anyway:
++# Geoscience Australia (2011-11-24)
++# http://www.ga.gov.au/geodesy/astro/sunrise.jsp
++# AEST ACST AWST AEDT ACDT
+ #
+-# 161,304 "EST" and domain:au
+-# 25,156 "EDT" and domain:au
+-# 18,263 "AEST" and domain:au
+-# 10,416 "AEDT" and domain:au
++# Parliamentary Library (2008-11-10)
++# http://www.aph.gov.au/binaries/library/pubs/rp/2008-09/09rp14.pdf
++# EST CST WST preferred for standard time; AEST AEDT ACST ACDT also used
+ #
+-# 14,538 "CST" and domain:au
+-# 5,728 "CDT" and domain:au
+-# 176 "ACST" and domain:au
+-# 29 "ACDT" and domain:au
++# The Transport Safety Bureau has an extensive series of accident reports,
++# and investigators seem to use whatever abbreviation they like.
++# Googling site:atsb.gov.au found the following number of unique hits:
++# 311 "ESuT", 195 "EDT", 26 "AEDT", 83 "CSuT", 46 "CDT".
++# "_SuT" tended to appear in older reports, and "A_DT" tended to
++# appear in reports of events with international implications.
+ #
+-# 7,539 "WST" and domain:au
+-# 68 "AWST" and domain:au
+-#
+-# This data suggest that Australians tend to omit the "A" prefix in
+-# practice. The situation for "ST" versus "DT" is less clear, given
+-# the ambiguities involved.
+-#
+-# * How do Australians feel about the abbreviations in the tz database?
+-#
+-# If you just count Australians on this list, I count 2 in favor and 3
+-# against. One of the "against" votes (David Keegel) counseled delay,
+-# saying that both AEST/AEDT and EST/EST are widely used and
+-# understood in Australia.
++# From the above it appears that there is a working consensus in
++# Australia to use trailing "DT" for daylight saving time; although
++# some sources use trailing "SST" or "ST" or "SuT" they are by far in
++# the minority. The case for leading "A" is weaker, but since it
++# seems to be preferred in the overall web and is preferred in all
++# the leading newspaper websites and in many government departments,
++# it has a stronger case than omitting the leading "A". The current
++# version of the database therefore uses abbreviations like "AEST" and
++# "AEDT" for Australian time zones.
+
+ # From Paul Eggert (1995-12-19):
+ # Shanks & Pottenger report 2:00 for all autumn changes in Australia and NZ.
+ # Mark Prior writes that his newspaper
+ # reports that NSW's fall 1995 change will occur at 2:00,
+ # but Robert Elz says it's been 3:00 in Victoria since 1970
+-# and perhaps the newspaper's `2:00' is referring to standard time.
++# and perhaps the newspaper's '2:00' is referring to standard time.
+ # For now we'll continue to assume 2:00s for changes since 1960.
+
+ # From Eric Ulevik (1998-01-05):
+@@ -1055,17 +1031,14 @@
+ # relevant entries in this database.
+ #
+ # NSW (including LHI and Broken Hill):
+-# <a href="http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html">
+ # Standard Time Act 1987 (updated 1995-04-04)
+-# </a>
++# http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html
+ # ACT
+-# <a href="http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html">
+ # Standard Time and Summer Time Act 1972
+-# </a>
++# http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html
+ # SA
+-# <a href="http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html">
+ # Standard Time Act, 1898
+-# </a>
++# http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html
+
+ # From David Grosz (2005-06-13):
+ # It was announced last week that Daylight Saving would be extended by
+@@ -1083,7 +1056,7 @@
+ # Victoria: I wasn't able to find anything separate, but the other articles
+ # allude to it.
+ # But not Queensland
+-# http://www.news.com.au/story/0,10117,15564030-1248,00.html.
++# http://www.news.com.au/story/0,10117,15564030-1248,00.html
+
+ # Northern Territory
+
+@@ -1130,9 +1103,9 @@
+ # The 1992 ending date used in the rules is a best guess;
+ # it matches what was used in the past.
+
+-# <a href="http://www.bom.gov.au/faq/faqgen.htm">
+ # The Australian Bureau of Meteorology FAQ
+-# </a> (1999-09-27) writes that Giles Meteorological Station uses
++# http://www.bom.gov.au/faq/faqgen.htm
++# (1999-09-27) writes that Giles Meteorological Station uses
+ # South Australian time even though it's located in Western Australia.
+
+ # Queensland
+@@ -1173,9 +1146,9 @@
+ # The chosen rules the union of the 1971/1972 change and the 1989-1992 changes.
+
+ # From Christopher Hunt (2006-11-21), after an advance warning
+-# from Jesper Norgaard Welen (2006-11-01):
++# from Jesper Nørgaard Welen (2006-11-01):
+ # WA are trialing DST for three years.
+-# <http://www.parliament.wa.gov.au/parliament/bills.nsf/9A1B183144403DA54825721200088DF1/$File/Bill175-1B.pdf>
++# http://www.parliament.wa.gov.au/parliament/bills.nsf/9A1B183144403DA54825721200088DF1/$File/Bill175-1B.pdf
+
+ # From Rives McDow (2002-04-09):
+ # The most interesting region I have found consists of three towns on the
+@@ -1189,7 +1162,7 @@
+ # From Paul Eggert (2002-04-09):
+ # This is confirmed by the section entitled
+ # "What's the deal with time zones???" in
+-# <http://www.earthsci.unimelb.edu.au/~awatkins/null.html>.
++# http://www.earthsci.unimelb.edu.au/~awatkins/null.html
+ #
+ # From Alex Livingston (2006-12-07):
+ # ... it was just on four years ago that I drove along the Eyre Highway,
+@@ -1337,7 +1310,7 @@
+ # Based on law library research by John Mackin,
+ # who notes:
+ # In Australia, time is not legislated federally, but rather by the
+-# individual states. Thus, while such terms as ``Eastern Standard Time''
++# individual states. Thus, while such terms as "Eastern Standard Time"
+ # [I mean, of course, Australian EST, not any other kind] are in common
+ # use, _they have NO REAL MEANING_, as they are not defined in the
+ # legislation. This is very important to understand.
+@@ -1345,48 +1318,42 @@
+
+ # From Eric Ulevik (1999-05-26):
+ # DST will start in NSW on the last Sunday of August, rather than the usual
+-# October in 2000. [See: Matthew Moore,
+-# <a href="http://www.smh.com.au/news/9905/26/pageone/pageone4.html">
+-# Two months more daylight saving
+-# </a>
+-# Sydney Morning Herald (1999-05-26).]
++# October in 2000. See: Matthew Moore,
++# Two months more daylight saving, Sydney Morning Herald (1999-05-26).
++# http://www.smh.com.au/news/9905/26/pageone/pageone4.html
+
+ # From Paul Eggert (1999-09-27):
+ # See the following official NSW source:
+-# <a href="http://dir.gis.nsw.gov.au/cgi-bin/genobject/document/other/daylightsaving/tigGmZ">
+ # Daylight Saving in New South Wales.
+-# </a>
++# http://dir.gis.nsw.gov.au/cgi-bin/genobject/document/other/daylightsaving/tigGmZ
+ #
+ # Narrabri Shire (NSW) council has announced it will ignore the extension of
+ # daylight saving next year. See:
+-# <a href="http://abc.net.au/news/regionals/neweng/monthly/regeng-22jul1999-1.htm">
+ # Narrabri Council to ignore daylight saving
+-# </a> (1999-07-22). For now, we'll wait to see if this really happens.
++# http://abc.net.au/news/regionals/neweng/monthly/regeng-22jul1999-1.htm
++# (1999-07-22). For now, we'll wait to see if this really happens.
+ #
+ # Victoria will following NSW. See:
+-# <a href="http://abc.net.au/local/news/olympics/1999/07/item19990728112314_1.htm">
+-# Vic to extend daylight saving
+-# </a> (1999-07-28).
++# Vic to extend daylight saving (1999-07-28)
++# http://abc.net.au/local/news/olympics/1999/07/item19990728112314_1.htm
+ #
+ # However, South Australia rejected the DST request. See:
+-# <a href="http://abc.net.au/news/olympics/1999/07/item19990719151754_1.htm">
+-# South Australia rejects Olympics daylight savings request
+-# </a> (1999-07-19).
++# South Australia rejects Olympics daylight savings request (1999-07-19)
++# http://abc.net.au/news/olympics/1999/07/item19990719151754_1.htm
+ #
+ # Queensland also will not observe DST for the Olympics. See:
+-# <a href="http://abc.net.au/news/olympics/1999/06/item19990601114608_1.htm">
+ # Qld says no to daylight savings for Olympics
+-# </a> (1999-06-01), which quotes Queensland Premier Peter Beattie as saying
+-# ``Look you've got to remember in my family when this came up last time
++# http://abc.net.au/news/olympics/1999/06/item19990601114608_1.htm
++# (1999-06-01), which quotes Queensland Premier Peter Beattie as saying
++# "Look you've got to remember in my family when this came up last time
+ # I voted for it, my wife voted against it and she said to me it's all very
+ # well for you, you don't have to worry about getting the children out of
+ # bed, getting them to school, getting them to sleep at night.
+-# I've been through all this argument domestically...my wife rules.''
++# I've been through all this argument domestically...my wife rules."
+ #
+ # Broken Hill will stick with South Australian time in 2000. See:
+-# <a href="http://abc.net.au/news/regionals/brokenh/monthly/regbrok-21jul1999-6.htm">
+-# Broken Hill to be behind the times
+-# </a> (1999-07-21).
++# Broken Hill to be behind the times (1999-07-21)
++# http://abc.net.au/news/regionals/brokenh/monthly/regbrok-21jul1999-6.htm
+
+ # IATA SSIM (1998-09) says that the spring 2000 change for Australian
+ # Capital Territory, New South Wales except Lord Howe Island and Broken
+@@ -1402,7 +1369,7 @@
+ # Yancowinna
+
+ # From John Mackin (1989-01-04):
+-# `Broken Hill' means the County of Yancowinna.
++# 'Broken Hill' means the County of Yancowinna.
+
+ # From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
+ # # YANCOWINNA.. [ Confirmation courtesy of Broken Hill Postmaster ]
+@@ -1459,9 +1426,7 @@
+ # summer (southern hemisphere).
+ #
+ # From
+-# <a href="http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf">
+ # http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf
+-# </a>
+ # The extended daylight saving period that South Australia has been trialling
+ # for over the last year is now set to be ongoing.
+ # Daylight saving will continue to start on the first Sunday in October each
+@@ -1471,9 +1436,7 @@
+ # the ACT for all 52 weeks of the year...
+ #
+ # We have a wrap-up here:
+-# <a href="http://www.timeanddate.com/news/time/south-australia-extends-dst.html">
+ # http://www.timeanddate.com/news/time/south-australia-extends-dst.html
+-# </a>
+ ###############################################################################
+
+ # New Zealand
+@@ -1482,7 +1445,7 @@
+ # the 1989/90 year was a trial of an extended "daylight saving" period.
+ # This trial was deemed successful and the extended period adopted for
+ # subsequent years (with the addition of a further week at the start).
+-# source -- phone call to Ministry of Internal Affairs Head Office.
++# source - phone call to Ministry of Internal Affairs Head Office.
+
+ # From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
+ # # The Country of New Zealand (Australia's east island -) Gee they hate that!
+@@ -1524,6 +1487,19 @@
+ # that DST will begin on 2007-09-30 2008-04-06.
+ # http://www.dia.govt.nz/diawebsite.nsf/wpg_URL/Services-Daylight-Saving-Daylight-saving-to-be-extended
+
++# From Paul Eggert (2014-07-14):
++# Chatham Island time was formally standardized on 1957-01-01 by
++# New Zealand's Standard Time Amendment Act 1956 (1956-10-26).
++# http://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf
++# According to Google Books snippet view, a speaker in the New Zealand
++# parliamentary debates in 1956 said "Clause 78 makes provision for standard
++# time in the Chatham Islands. The time there is 45 minutes in advance of New
++# Zealand time. I understand that is the time they keep locally, anyhow."
++# For now, assume this practice goes back to the introduction of standard time
++# in New Zealand, as this would make Chatham Islands time almost exactly match
++# LMT back when New Zealand was at UTC+11:30; also, assume Chatham Islands did
++# not observe New Zealand's prewar DST.
++
+ ###############################################################################
+
+
+@@ -1543,7 +1519,7 @@
+
+ # From the BBC World Service in
+ # http://news.bbc.co.uk/2/hi/asia-pacific/205226.stm (1998-10-31 16:03 UTC):
+-# The Fijiian government says the main reasons for the time change is to
++# The Fijian government says the main reasons for the time change is to
+ # improve productivity and reduce road accidents.... [T]he move is also
+ # intended to boost Fiji's ability to attract tourists to witness the dawning
+ # of the new millennium.
+@@ -1551,16 +1527,12 @@
+ # http://www.fiji.gov.fj/press/2000_09/2000_09_13-05.shtml (2000-09-13)
+ # reports that Fiji has discontinued DST.
+
+-# Johnston
+-
+-# Johnston data is from usno1995.
+-
+
+ # Kiribati
+
+ # From Paul Eggert (1996-01-22):
+ # Today's _Wall Street Journal_ (page 1) reports that Kiribati
+-# ``declared it the same day [throughout] the country as of Jan. 1, 1995''
++# "declared it the same day [throughout] the country as of Jan. 1, 1995"
+ # as part of the competition to be first into the 21st century.
+
+
+@@ -1575,8 +1547,8 @@
+
+ # N Mariana Is, Guam
+
+-# Howse writes (p 153) ``The Spaniards, on the other hand, reached the
+-# Philippines and the Ladrones from America,'' and implies that the Ladrones
++# Howse writes (p 153) "The Spaniards, on the other hand, reached the
++# Philippines and the Ladrones from America," and implies that the Ladrones
+ # (now called the Marianas) kept American date for quite some time.
+ # For now, we assume the Ladrones switched at the same time as the Philippines;
+ # see Asia/Manila.
+@@ -1590,17 +1562,16 @@
+ # Micronesia
+
+ # Alan Eugene Davis writes (1996-03-16),
+-# ``I am certain, having lived there for the past decade, that "Truk"
+-# (now properly known as Chuuk) ... is in the time zone GMT+10.''
++# "I am certain, having lived there for the past decade, that 'Truk'
++# (now properly known as Chuuk) ... is in the time zone GMT+10."
+ #
+ # Shanks & Pottenger write that Truk switched from UTC+10 to UTC+11
+ # on 1978-10-01; ignore this for now.
+
+ # From Paul Eggert (1999-10-29):
+ # The Federated States of Micronesia Visitors Board writes in
+-# <a href="http://www.fsmgov.org/info/clocks.html">
+-# The Federated States of Micronesia - Visitor Information
+-# </a> (1999-01-26)
++# The Federated States of Micronesia - Visitor Information (1999-01-26)
++# http://www.fsmgov.org/info/clocks.html
+ # that Truk and Yap are UTC+10, and Ponape and Kosrae are UTC+11.
+ # We don't know when Kosrae switched from UTC+12; assume January 1 for now.
+
+@@ -1646,27 +1617,34 @@
+ # Sacramento but it was changed a couple of years ago.
+
+
+-# Samoa
++# (Western) Samoa and American Samoa
+
+ # Howse writes (p 153, citing p 10 of the 1883-11-18 New York Herald)
+ # that in 1879 the King of Samoa decided to change
+-# ``the date in his kingdom from the Antipodean to the American system,
+-# ordaining -- by a masterpiece of diplomatic flattery -- that
+-# the Fourth of July should be celebrated twice in that year.''
++# "the date in his kingdom from the Antipodean to the American system,
++# ordaining - by a masterpiece of diplomatic flattery - that
++# the Fourth of July should be celebrated twice in that year."
+
++# Although Shanks & Pottenger says they both switched to UTC-11:30
++# in 1911, and to UTC-11 in 1950. many earlier sources give UTC-11
++# for American Samoa, e.g., the US National Bureau of Standards
++# circular "Standard Time Throughout the World", 1932.
++# Assume American Samoa switched to UTC-11 in 1911, not 1950,
++# and that after 1950 they agreed until (western) Samoa skipped a
++# day in 2011. Assume also that the Samoas follow the US and New
++# Zealand's "ST"/"DT" style of daylight-saving abbreviations.
+
+ # Tonga
+
+ # From Paul Eggert (1996-01-22):
+-# Today's _Wall Street Journal_ (p 1) reports that ``Tonga has been plotting
+-# to sneak ahead of [New Zealanders] by introducing daylight-saving time.''
++# Today's _Wall Street Journal_ (p 1) reports that "Tonga has been plotting
++# to sneak ahead of [New Zealanders] by introducing daylight-saving time."
+ # Since Kiribati has moved the Date Line it's not clear what Tonga will do.
+
+ # Don Mundell writes in the 1997-02-20 Tonga Chronicle
+-# <a href="http://www.tongatapu.net.to/tonga/homeland/timebegins.htm">
+-# How Tonga became `The Land where Time Begins'
+-# </a>:
+-
++# How Tonga became 'The Land where Time Begins':
++# http://www.tongatapu.net.to/tonga/homeland/timebegins.htm
++#
+ # Until 1941 Tonga maintained a standard time 50 minutes ahead of NZST
+ # 12 hours and 20 minutes ahead of GMT. When New Zealand adjusted its
+ # standard time in 1940s, Tonga had the choice of subtracting from its
+@@ -1674,8 +1652,8 @@
+ # advancing its time to maintain the differential of 13 degrees
+ # (approximately 50 minutes ahead of New Zealand time).
+ #
+-# Because His Majesty King Taufa'ahau Tupou IV, then Crown Prince
+-# Tungi, preferred to ensure Tonga's title as the land where time
++# Because His Majesty King TÄufaÊ»Ähau Tupou IV, then Crown Prince
++# Tungī, preferred to ensure Tonga's title as the land where time
+ # begins, the Legislative Assembly approved the latter change.
+ #
+ # But some of the older, more conservative members from the outer
+@@ -1701,9 +1679,7 @@
+ # * Tonga will introduce DST in November
+ #
+ # I was given this link by John Letts:
+-# <a href="http://news.bbc.co.uk/hi/english/world/asia-pacific/newsid_424000/424764.stm">
+ # http://news.bbc.co.uk/hi/english/world/asia-pacific/newsid_424000/424764.stm
+-# </a>
+ #
+ # I have not been able to find exact dates for the transition in November
+ # yet. By reading this article it seems like Fiji will be 14 hours ahead
+@@ -1711,9 +1687,7 @@
+ # (12 + 1 hour DST).
+
+ # From Arthur David Olson (1999-09-20):
+-# According to <a href="http://www.tongaonline.com/news/sept1799.html">
+-# http://www.tongaonline.com/news/sept1799.html
+-# </a>:
++# According to <http://www.tongaonline.com/news/sept1799.html>:
+ # "Daylight Savings Time will take effect on Oct. 2 through April 15, 2000
+ # and annually thereafter from the first Saturday in October through the
+ # third Saturday of April. Under the system approved by Privy Council on
+@@ -1731,7 +1705,7 @@
+ # instead of the original reported date April 16. Unfortunately, the article
+ # is no longer available on the site, and I did not make a copy of the
+ # text, and I have forgotten to report it here.
+-# (Original URL was: http://www.tongaonline.com/news/march162000.htm )
++# (Original URL was <http://www.tongaonline.com/news/march162000.htm>)
+
+ # From Rives McDow (2000-12-01):
+ # Tonga is observing DST as of 2000-11-04 and will stop on 2001-01-27.
+@@ -1751,7 +1725,7 @@
+ # From Vernice Anderson, Personal Secretary to Philip Jessup,
+ # US Ambassador At Large (oral history interview, 1971-02-02):
+ #
+-# Saturday, the 14th [of October, 1950] -- ... The time was all the
++# Saturday, the 14th [of October, 1950] - ... The time was all the
+ # more confusing at that point, because we had crossed the
+ # International Date Line, thus getting two Sundays. Furthermore, we
+ # discovered that Wake Island had two hours of daylight saving time
+@@ -1796,7 +1770,7 @@
+ # on the high seas. Whenever a ship was within the territorial waters of any
+ # nation it would use that nation's standard time. The captain was permitted
+ # to change his ship's clocks at a time of his choice following his ship's
+-# entry into another zone time--he often chose midnight. These zones were
++# entry into another zone time - he often chose midnight. These zones were
+ # adopted by all major fleets between 1920 and 1925 but not by many
+ # independent merchant ships until World War II.
+
+@@ -1804,6 +1778,6 @@
+ # (2005-03-20):
+ #
+ # The American Practical Navigator (2002)
+-# <http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187>
++# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187
+ # talks only about the 180-degree meridian with respect to ships in
+ # international waters; it ignores the international date line.
+--- ./jdk/make/sun/javazic/tzdata/backward Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/backward Mon Jan 05 11:57:27 2015 -0800
+@@ -21,15 +21,15 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+ # This file provides links between current names for time zones
+ # and their old names. Many names changed in late 1993.
+
++# Link TARGET LINK-NAME
+ Link Africa/Asmara Africa/Asmera
+-Link Africa/Bamako Africa/Timbuktu
++Link Africa/Abidjan Africa/Timbuktu
+ Link America/Argentina/Catamarca America/Argentina/ComodRivadavia
+ Link America/Adak America/Atka
+ Link America/Argentina/Buenos_Aires America/Buenos_Aires
+@@ -50,8 +50,11 @@
+ Link Pacific/Auckland Antarctica/South_Pole
+ Link Asia/Ashgabat Asia/Ashkhabad
+ Link Asia/Kolkata Asia/Calcutta
+-Link Asia/Chongqing Asia/Chungking
++Link Asia/Shanghai Asia/Chongqing
++Link Asia/Shanghai Asia/Chungking
+ Link Asia/Dhaka Asia/Dacca
++Link Asia/Shanghai Asia/Harbin
++Link Asia/Urumqi Asia/Kashgar
+ Link Asia/Kathmandu Asia/Katmandu
+ Link Asia/Macau Asia/Macao
+ Link Asia/Ho_Chi_Minh Asia/Saigon
+--- ./jdk/make/sun/javazic/tzdata/etcetera Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/etcetera Mon Jan 05 11:57:27 2015 -0800
+@@ -21,7 +21,6 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+@@ -37,7 +36,7 @@
+ Zone Etc/UCT 0 - UCT
+
+ # The following link uses older naming conventions,
+-# but it belongs here, not in the file `backward',
++# but it belongs here, not in the file 'backward',
+ # as functions like gmtime load the "GMT" file to handle leap seconds properly.
+ # We want this to work even on installations that omit the other older names.
+ Link Etc/GMT GMT
+--- ./jdk/make/sun/javazic/tzdata/europe Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/europe Mon Jan 05 11:57:27 2015 -0800
+@@ -21,24 +21,30 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future). For more, please see
++# the file CONTRIBUTING in the tz distribution.
+
+-# From Paul Eggert (2006-03-22):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually. Law sent in several helpful summaries
+-# of the IATA's data after 1990.
++# of the IATA's data after 1990. Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
++#
++# A reliable and entertaining source about time zones is
++# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+ #
+ # Except where otherwise noted, Shanks & Pottenger is the source for
+ # entries through 1991, and IATA SSIM is the source for entries afterwards.
+@@ -49,9 +55,9 @@
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
+ # which I found in the UCLA library.
+ #
+-# <a href="http://www.pettswoodvillage.co.uk/Daylight_Savings_William_Willett.pdf">
+ # William Willett, The Waste of Daylight, 19th edition
+-# </a> (1914-03)
++# <http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
++# [PDF] (1914-03)
+ #
+ # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+ # <http://www.jstor.org/stable/1774359>. He writes:
+@@ -59,10 +65,20 @@
+ # may be sent to Mr. John Milne, Royal Geographical Society,
+ # Savile Row, London." Nowadays please email them to tz@iana.org.
+ #
+-# Brazil's Departamento Servico da Hora (DSH),
+-# <a href="http://pcdsh01.on.br/HISTHV.htm">
++# Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
++# This Russian-language source was consulted by Vladimir Karpinsky; see
++# http://mm.icann.org/pipermail/tz/2014-August/021320.html
++# The full Russian citation is:
++# БÑлокоз, Евгений Людвигович. Ðовый Ñчет времени в течении Ñуток
++# введенный декретом Совета народных комиÑÑаров Ð´Ð»Ñ Ð²Ñей РоÑÑии Ñ 1-го
++# Ð¸ÑŽÐ»Ñ 1919 г. / Изд. 2-е МеждуведомÑтвенной комиÑÑии. - Петроград:
++# ДеÑÑÑ‚Ð°Ñ Ð³Ð¾Ñ. тип., 1919.
++# http://resolver.gpntb.ru/purl?docushare/dsweb/Get/Resource-2011/Byalokoz__E.L.__Novyy__schet__vremeni__v__techenie__sutok__izd__2(1).pdf
++#
++# Brazil's Divisão Serviço da Hora (DSHO),
+ # History of Summer Time
+-# </a> (1998-09-21, in Portuguese)
++# <http://pcdsh01.on.br/HISTHV.htm>
++# (1998-09-21, in Portuguese)
+
+ #
+ # I invented the abbreviations marked '*' in the following table;
+@@ -78,13 +94,12 @@
+ # 0:00 WET WEST WEMT Western Europe
+ # 0:19:32.13 AMT NST Amsterdam, Netherlands Summer (1835-1937)*
+ # 0:20 NET NEST Netherlands (1937-1940)*
++# 1:00 BST British Standard (1968-1971)
+ # 1:00 CET CEST CEMT Central Europe
+ # 1:00:14 SET Swedish (1879-1899)*
+ # 2:00 EET EEST Eastern Europe
+-# 3:00 MSK MSD Moscow
+-#
+-# A reliable and entertaining source about time zones, especially in Britain,
+-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
++# 3:00 FET Further-eastern Europe (2011-2014)*
++# 3:00 MSK MSD MSM* Moscow
+
+ # From Peter Ilieve (1994-12-04),
+ # The original six [EU members]: Belgium, France, (West) Germany, Italy,
+@@ -128,7 +143,7 @@
+ # along the towpath within a few yards of it.'
+ #
+ # I have a one inch to one mile map of London and my estimate of the stone's
+-# position is 51 deg. 28' 30" N, 0 deg. 18' 45" W. The longitude should
++# position is 51 degrees 28' 30" N, 0 degrees 18' 45" W. The longitude should
+ # be within about +-2". The Ordnance Survey grid reference is TQ172761.
+ #
+ # [This yields GMTOFF = -0:01:15 for London LMT in the 18th century.]
+@@ -160,8 +175,22 @@
+ # transition date for London, namely 1847-12-01. We don't know as much
+ # about Dublin, so we use 1880-08-02, the legal transition time.
+
+-# From Paul Eggert (2003-09-27):
+-# Summer Time was first seriously proposed by William Willett (1857-1915),
++# From Paul Eggert (2014-07-19):
++# The ancients had no need for daylight saving, as they kept time
++# informally or via hours whose length depended on the time of year.
++# Daylight saving time in its modern sense was invented by the
++# New Zealand entomologist George Vernon Hudson (1867-1946),
++# whose day job as a postal clerk led him to value
++# after-hours daylight in which to pursue his research.
++# In 1895 he presented a paper to the Wellington Philosophical Society
++# that proposed a two-hour daylight-saving shift. See:
++# Hudson GV. On seasonal time-adjustment in countries south of lat. 30 deg.
++# Transactions and Proceedings of the New Zealand Institute. 1895;28:734
++# http://rsnz.natlib.govt.nz/volume/rsnz_28/rsnz_28_00_006110.html
++# Although some interest was expressed in New Zealand, his proposal
++# did not find its way into law and eventually it was almost forgotten.
++#
++# In England, DST was independently reinvented by William Willett (1857-1915),
+ # a London builder and member of the Royal Astronomical Society
+ # who circulated a pamphlet "The Waste of Daylight" (1907)
+ # that proposed advancing clocks 20 minutes on each of four Sundays in April,
+@@ -174,7 +203,7 @@
+ # A monument to Willett was unveiled on 1927-05-21, in an open space in
+ # a 45-acre wood near Chislehurst, Kent that was purchased by popular
+ # subscription and open to the public. On the south face of the monolith,
+-# designed by G. W. Miller, is the...William Willett Memorial Sundial,
++# designed by G. W. Miller, is the William Willett Memorial Sundial,
+ # which is permanently set to Summer Time.
+
+ # From Winston Churchill (1934-04-28):
+@@ -183,9 +212,9 @@
+ # between 160 and 170 hours more daylight leisure, to a war which
+ # plunged Europe into darkness for four years, and shook the
+ # foundations of civilization throughout the world.
+-# -- <a href="http://www.winstonchurchill.org/fh114willett.htm">
+-# "A Silent Toast to William Willett", Pictorial Weekly
+-# </a>
++# -- "A Silent Toast to William Willett", Pictorial Weekly;
++# republished in Finest Hour (Spring 2002) 1(114):26
++# http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
+
+ # From Paul Eggert (1996-09-03):
+ # The OED Supplement says that the English originally said "Daylight Saving"
+@@ -194,7 +223,6 @@
+ # proponents (who eventually won the argument) are quoted as using "Summer".
+
+ # From Arthur David Olson (1989-01-19):
+-#
+ # A source at the British Information Office in New York avers that it's
+ # known as "British" Summer Time in all parts of the United Kingdom.
+
+@@ -221,8 +249,8 @@
+ # official designation; the reply of the 21st was that there wasn't
+ # but he couldn't think of anything better than the "Double British
+ # Summer Time" that the BBC had been using informally.
+-# http://student.cusu.cam.ac.uk/~jsm28/british-time/bbc-19410418.png
+-# http://student.cusu.cam.ac.uk/~jsm28/british-time/ho-19410421.png
++# http://www.polyomino.org.uk/british-time/bbc-19410418.png
++# http://www.polyomino.org.uk/british-time/ho-19410421.png
+
+ # From Sir Alexander Maxwell in the above-mentioned letter (1941-04-21):
+ # [N]o official designation has as far as I know been adopted for the time
+@@ -239,23 +267,14 @@
+ # the history of summer time legislation in the United Kingdom.
+ # Since 1998 Joseph S. Myers has been updating
+ # and extending this list, which can be found in
+-# http://student.cusu.cam.ac.uk/~jsm28/british-time/
+-# <a href="http://www.polyomino.org.uk/british-time/">
+-# History of legal time in Britain
+-# </a>
+-# Rob Crowther (2012-01-04) reports that that URL no longer
+-# exists, and the article can now be found at:
+-# <a href="http://www.polyomino.org.uk/british-time/">
+ # http://www.polyomino.org.uk/british-time/
+-# </a>
+
+ # From Joseph S. Myers (1998-01-06):
+ #
+ # The legal time in the UK outside of summer time is definitely GMT, not UTC;
+ # see Lord Tanlaw's speech
+-# <a href="http://www.parliament.the-stationery-office.co.uk/pa/ld199697/ldhansrd/pdvn/lds97/text/70611-20.htm#70611-20_head0">
+-# (Lords Hansard 11 June 1997 columns 964 to 976)
+-# </a>.
++# http://www.publications.parliament.uk/pa/ld199798/ldhansrd/vo970611/text/70611-10.htm#70611-10_head0
++# (Lords Hansard 11 June 1997 columns 964 to 976).
+
+ # From Paul Eggert (2006-03-22):
+ #
+@@ -294,9 +313,17 @@
+ # "Timeball on the ballast office is down. Dunsink time."
+ # -- James Joyce, Ulysses
+
++# "Countess Markievicz ... claimed that the [1916] abolition of Dublin Mean Time
++# was among various actions undertaken by the 'English' government that
++# would 'put the whole country into the SF (Sinn Féin) camp'. She claimed
++# Irish 'public feeling (was) outraged by forcing of English time on us'."
++# -- Parsons M. Dublin lost its time zone - and 25 minutes - after 1916 Rising.
++# Irish Times 2014-10-27.
++# http://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
++
+ # From Joseph S. Myers (2005-01-26):
+-# Irish laws are available online at www.irishstatutebook.ie. These include
+-# various relating to legal time, for example:
++# Irish laws are available online at <http://www.irishstatutebook.ie>.
++# These include various relating to legal time, for example:
+ #
+ # ZZA13Y1923.html ZZA12Y1924.html ZZA8Y1925.html ZZSIV20PG1267.html
+ #
+@@ -458,25 +485,27 @@
+ # Use Europe/London for Jersey, Guernsey, and the Isle of Man.
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s
++Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s
+ 0:00 GB-Eire %s 1968 Oct 27
+- 1:00 - BST 1971 Oct 31 2:00u
++ 1:00 - BST 1971 Oct 31 2:00u
+ 0:00 GB-Eire %s 1996
+ 0:00 EU GMT/BST
+ Link Europe/London Europe/Jersey
+ Link Europe/London Europe/Guernsey
+ Link Europe/London Europe/Isle_of_Man
++
++# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
+- -0:25:21 - DMT 1916 May 21 2:00
+- -0:25:21 1:00 IST 1916 Oct 1 2:00s
++ -0:25:21 - DMT 1916 May 21 2:00
++ -0:25:21 1:00 IST 1916 Oct 1 2:00s
+ 0:00 GB-Eire %s 1921 Dec 6 # independence
+- 0:00 GB-Eire GMT/IST 1940 Feb 25 2:00
+- 0:00 1:00 IST 1946 Oct 6 2:00
+- 0:00 - GMT 1947 Mar 16 2:00
+- 0:00 1:00 IST 1947 Nov 2 2:00
+- 0:00 - GMT 1948 Apr 18 2:00
++ 0:00 GB-Eire GMT/IST 1940 Feb 25 2:00
++ 0:00 1:00 IST 1946 Oct 6 2:00
++ 0:00 - GMT 1947 Mar 16 2:00
++ 0:00 1:00 IST 1947 Nov 2 2:00
++ 0:00 - GMT 1948 Apr 18 2:00
+ 0:00 GB-Eire GMT/IST 1968 Oct 27
+- 1:00 - IST 1971 Oct 31 2:00u
++ 1:00 - IST 1971 Oct 31 2:00u
+ 0:00 GB-Eire GMT/IST 1996
+ 0:00 EU GMT/IST
+
+@@ -495,10 +524,9 @@
+ Rule EU 1981 max - Mar lastSun 1:00u 1:00 S
+ Rule EU 1996 max - Oct lastSun 1:00u 0 -
+ # The most recent directive covers the years starting in 2002. See:
+-# <a="http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0084:EN:NOT">
+ # Directive 2000/84/EC of the European Parliament and of the Council
+ # of 19 January 2001 on summer-time arrangements.
+-# </a>
++# http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0084:EN:NOT
+
+ # W-Eur differs from EU only in that W-Eur uses standard time.
+ Rule W-Eur 1977 1980 - Apr Sun>=1 1:00s 1:00 S
+@@ -521,18 +549,18 @@
+ Rule C-Eur 1944 1945 - Apr Mon>=1 2:00s 1:00 S
+ # Whitman gives 1944 Oct 7; go with Shanks & Pottenger.
+ Rule C-Eur 1944 only - Oct 2 2:00s 0 -
+-# From Jesper Norgaard Welen (2008-07-13):
++# From Jesper Nørgaard Welen (2008-07-13):
+ #
+ # I found what is probably a typo of 2:00 which should perhaps be 2:00s
+ # in the C-Eur rule from tz database version 2008d (this part was
+-# corrected in version 2008d). The circumstancial evidence is simply the
++# corrected in version 2008d). The circumstantial evidence is simply the
+ # tz database itself, as seen below:
+ #
+ # Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
+ # 0:00 France WE%sT 1945 Sep 16 3:00
+ #
+ # Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
+-# 0:00 France WE%sT 1945 Sep 16 3:00
++# 0:00 France WE%sT 1945 Sep 16 3:00
+ #
+ # Zone Europe/Belgrade 1:22:00 - LMT 1884
+ # 1:00 1:00 CEST 1945 Sep 16 2:00s
+@@ -576,16 +604,16 @@
+ Rule E-Eur 1996 max - Oct lastSun 0:00 0 -
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule Russia 1917 only - Jul 1 23:00 1:00 MST # Moscow Summer Time
+-Rule Russia 1917 only - Dec 28 0:00 0 MMT # Moscow Mean Time
+-Rule Russia 1918 only - May 31 22:00 2:00 MDST # Moscow Double Summer Time
++Rule Russia 1917 only - Jul 1 23:00 1:00 MST # Moscow Summer Time
++Rule Russia 1917 only - Dec 28 0:00 0 MMT # Moscow Mean Time
++Rule Russia 1918 only - May 31 22:00 2:00 MDST # Moscow Double Summer Time
+ Rule Russia 1918 only - Sep 16 1:00 1:00 MST
+ Rule Russia 1919 only - May 31 23:00 2:00 MDST
+-Rule Russia 1919 only - Jul 1 2:00 1:00 S
+-Rule Russia 1919 only - Aug 16 0:00 0 -
+-Rule Russia 1921 only - Feb 14 23:00 1:00 S
+-Rule Russia 1921 only - Mar 20 23:00 2:00 M # Midsummer
+-Rule Russia 1921 only - Sep 1 0:00 1:00 S
++Rule Russia 1919 only - Jul 1 2:00 1:00 MSD
++Rule Russia 1919 only - Aug 16 0:00 0 MSK
++Rule Russia 1921 only - Feb 14 23:00 1:00 MSD
++Rule Russia 1921 only - Mar 20 23:00 2:00 MSM # Midsummer
++Rule Russia 1921 only - Sep 1 0:00 1:00 MSD
+ Rule Russia 1921 only - Oct 1 0:00 0 -
+ # Act No.925 of the Council of Ministers of the USSR (1980-10-24):
+ Rule Russia 1981 1984 - Apr 1 0:00 1:00 S
+@@ -600,6 +628,7 @@
+ Rule Russia 1993 2010 - Mar lastSun 2:00s 1:00 S
+ Rule Russia 1993 1995 - Sep lastSun 2:00s 0 -
+ Rule Russia 1996 2010 - Oct lastSun 2:00s 0 -
++# As described below, Russia's 2014 change affects Zone data, not Rule data.
+
+ # From Alexander Krivenyshev (2011-06-14):
+ # According to Kremlin press service, Russian President Dmitry Medvedev
+@@ -607,14 +636,10 @@
+ # According to the law Russia is abolishing daylight saving time.
+ #
+ # Medvedev signed a law "On the Calculation of Time" (in russian):
+-# <a href="http://bmockbe.ru/events/?ID=7583">
+ # http://bmockbe.ru/events/?ID=7583
+-# </a>
+ #
+ # Medvedev signed a law on the calculation of the time (in russian):
+-# <a href="http://www.regnum.ru/news/polit/1413906.html">
+ # http://www.regnum.ru/news/polit/1413906.html
+-# </a>
+
+ # From Arthur David Olson (2011-06-15):
+ # Take "abolishing daylight saving time" to mean that time is now considered
+@@ -634,10 +659,10 @@
+ # From Markus Kuhn (1996-07-12):
+ # The official German names ... are
+ #
+-# Mitteleuropaeische Zeit (MEZ) = UTC+01:00
+-# Mitteleuropaeische Sommerzeit (MESZ) = UTC+02:00
++# Mitteleuropäische Zeit (MEZ) = UTC+01:00
++# Mitteleuropäische Sommerzeit (MESZ) = UTC+02:00
+ #
+-# as defined in the German Time Act (Gesetz ueber die Zeitbestimmung (ZeitG),
++# as defined in the German Time Act (Gesetz über die Zeitbestimmung (ZeitG),
+ # 1978-07-25, Bundesgesetzblatt, Jahrgang 1978, Teil I, S. 1110-1111)....
+ # I wrote ... to the German Federal Physical-Technical Institution
+ #
+@@ -692,7 +717,7 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Andorra 0:06:04 - LMT 1901
+ 0:00 - WET 1946 Sep 30
+- 1:00 - CET 1985 Mar 31 2:00
++ 1:00 - CET 1985 Mar 31 2:00
+ 1:00 EU CE%sT
+
+ # Austria
+@@ -718,9 +743,9 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Vienna 1:05:21 - LMT 1893 Apr
+ 1:00 C-Eur CE%sT 1920
+- 1:00 Austria CE%sT 1940 Apr 1 2:00s
+- 1:00 C-Eur CE%sT 1945 Apr 2 2:00s
+- 1:00 1:00 CEST 1945 Apr 12 2:00s
++ 1:00 Austria CE%sT 1940 Apr 1 2:00s
++ 1:00 C-Eur CE%sT 1945 Apr 2 2:00s
++ 1:00 1:00 CEST 1945 Apr 12 2:00s
+ 1:00 - CET 1946
+ 1:00 Austria CE%sT 1981
+ 1:00 EU CE%sT
+@@ -731,38 +756,37 @@
+ # GMT+3 without DST (was GMT+2 with DST).
+ #
+ # Sources (Russian language):
+-# 1.
+-# <a href="http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html">
+ # http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
+-# </a>
+-# 2.
+-# <a href="http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/">
+ # http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
+-# </a>
+-# 3.
+-# <a href="http://news.tut.by/society/250578.html">
+ # http://news.tut.by/society/250578.html
+-# </a>
++#
++# From Alexander Bokovoy (2014-10-09):
++# Belarussian government decided against changing to winter time....
++# http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
++# From Paul Eggert (2014-10-08):
++# Hence Belarus can share time zone abbreviations with Moscow again.
++#
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Minsk 1:50:16 - LMT 1880
+- 1:50 - MMT 1924 May 2 # Minsk Mean Time
++ 1:50 - MMT 1924 May 2 # Minsk Mean Time
+ 2:00 - EET 1930 Jun 21
+ 3:00 - MSK 1941 Jun 28
+ 1:00 C-Eur CE%sT 1944 Jul 3
+ 3:00 Russia MSK/MSD 1990
+- 3:00 - MSK 1991 Mar 31 2:00s
+- 2:00 1:00 EEST 1991 Sep 29 2:00s
+- 2:00 - EET 1992 Mar 29 0:00s
+- 2:00 1:00 EEST 1992 Sep 27 0:00s
+- 2:00 Russia EE%sT 2011 Mar 27 2:00s
+- 3:00 - FET # Further-eastern European Time
++ 3:00 - MSK 1991 Mar 31 2:00s
++ 2:00 1:00 EEST 1991 Sep 29 2:00s
++ 2:00 - EET 1992 Mar 29 0:00s
++ 2:00 1:00 EEST 1992 Sep 27 0:00s
++ 2:00 Russia EE%sT 2011 Mar 27 2:00s
++ 3:00 - FET 2014 Oct 26 1:00s
++ 3:00 - MSK
+
+ # Belgium
+ #
+ # From Paul Eggert (1997-07-02):
+ # Entries from 1918 through 1991 are taken from:
+ # Annuaire de L'Observatoire Royal de Belgique,
+-# Avenue Circulaire, 3, B-1180 BRUXELLES, CLVIIe annee, 1991
++# Avenue Circulaire, 3, B-1180 BRUXELLES, CLVIIe année, 1991
+ # (Imprimerie HAYEZ, s.p.r.l., Rue Fin, 4, 1080 BRUXELLES, MCMXC),
+ # pp 8-9.
+ # LMT before 1892 was 0:17:30, according to the official journal of Belgium:
+@@ -812,7 +836,7 @@
+ Rule Belgium 1946 only - Oct 7 2:00s 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Brussels 0:17:30 - LMT 1880
+- 0:17:30 - BMT 1892 May 1 12:00 # Brussels MT
++ 0:17:30 - BMT 1892 May 1 12:00 # Brussels MT
+ 0:00 - WET 1914 Nov 8
+ 1:00 - CET 1916 May 1 0:00
+ 1:00 C-Eur CE%sT 1918 Nov 11 11:00u
+@@ -828,8 +852,8 @@
+ #
+ # From Plamen Simenov via Steffen Thorsen (1999-09-09):
+ # A document of Government of Bulgaria (No.94/1997) says:
+-# EET --> EETDST is in 03:00 Local time in last Sunday of March ...
+-# EETDST --> EET is in 04:00 Local time in last Sunday of October
++# EET -> EETDST is in 03:00 Local time in last Sunday of March ...
++# EETDST -> EET is in 04:00 Local time in last Sunday of October
+ #
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Bulg 1979 only - Mar 31 23:00 1:00 S
+@@ -842,7 +866,7 @@
+ 1:56:56 - IMT 1894 Nov 30 # Istanbul MT?
+ 2:00 - EET 1942 Nov 2 3:00
+ 1:00 C-Eur CE%sT 1945
+- 1:00 - CET 1945 Apr 2 3:00
++ 1:00 - CET 1945 Apr 2 3:00
+ 2:00 - EET 1979 Mar 31 23:00
+ 2:00 Bulg EE%sT 1982 Sep 26 2:00
+ 2:00 C-Eur EE%sT 1991
+@@ -866,15 +890,15 @@
+ Rule Czech 1949 only - Apr 9 2:00s 1:00 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Prague 0:57:44 - LMT 1850
+- 0:57:44 - PMT 1891 Oct # Prague Mean Time
+- 1:00 C-Eur CE%sT 1944 Sep 17 2:00s
++ 0:57:44 - PMT 1891 Oct # Prague Mean Time
++ 1:00 C-Eur CE%sT 1944 Sep 17 2:00s
+ 1:00 Czech CE%sT 1979
+ 1:00 EU CE%sT
+ # Use Europe/Prague also for Slovakia.
+
+ # Denmark, Faroe Islands, and Greenland
+
+-# From Jesper Norgaard Welen (2005-04-26):
++# From Jesper Nørgaard Welen (2005-04-26):
+ # http://www.hum.aau.dk/~poe/tid/tine/DanskTid.htm says that the law
+ # [introducing standard time] was in effect from 1894-01-01....
+ # The page http://www.retsinfo.dk/_GETDOCI_/ACCN/A18930008330-REGL
+@@ -884,7 +908,7 @@
+ # http://www.retsinfo.dk/_GETDOCI_/ACCN/A19722110030-REGL
+ #
+ # This provoked a new law from 1974 to make possible summer time changes
+-# in subsequenet decrees with the law
++# in subsequent decrees with the law
+ # http://www.retsinfo.dk/_GETDOCI_/ACCN/A19740022330-REGL
+ #
+ # It seems however that no decree was set forward until 1980. I have
+@@ -899,7 +923,7 @@
+ # was suspended on that night):
+ # http://www.retsinfo.dk/_GETDOCI_/ACCN/C19801120554-REGL
+
+-# From Jesper Norgaard Welen (2005-06-11):
++# From Jesper Nørgaard Welen (2005-06-11):
+ # The Herning Folkeblad (1980-09-26) reported that the night between
+ # Saturday and Sunday the clock is set back from three to two.
+
+@@ -923,11 +947,11 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Copenhagen 0:50:20 - LMT 1890
+ 0:50:20 - CMT 1894 Jan 1 # Copenhagen MT
+- 1:00 Denmark CE%sT 1942 Nov 2 2:00s
+- 1:00 C-Eur CE%sT 1945 Apr 2 2:00
++ 1:00 Denmark CE%sT 1942 Nov 2 2:00s
++ 1:00 C-Eur CE%sT 1945 Apr 2 2:00
+ 1:00 Denmark CE%sT 1980
+ 1:00 EU CE%sT
+-Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Torshavn
++Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn
+ 0:00 - WET 1981
+ 0:00 EU WE%sT
+ #
+@@ -939,11 +963,11 @@
+ # From Paul Eggert (2006-03-22):
+ # Greenland joined the EU as part of Denmark, obtained home rule on 1979-05-01,
+ # and left the EU on 1985-02-01. It therefore should have been using EU
+-# rules at least through 1984. Shanks & Pottenger say Scoresbysund and Godthab
++# rules at least through 1984. Shanks & Pottenger say Scoresbysund and Godthåb
+ # used C-Eur rules after 1980, but IATA SSIM (1991/1996) says they use EU
+ # rules since at least 1991. Assume EU rules since 1980.
+
+-# From Gwillin Law (2001-06-06), citing
++# From Gwillim Law (2001-06-06), citing
+ # <http://www.statkart.no/efs/efshefter/2001/efs5-2001.pdf> (2001-03-15),
+ # and with translations corrected by Steffen Thorsen:
+ #
+@@ -978,16 +1002,16 @@
+ # DPC research station at Zackenberg.
+ #
+ # Scoresbysund and two small villages nearby keep time UTC-1 and use
+-# the same daylight savings time period as in West Greenland (Godthab).
++# the same daylight savings time period as in West Greenland (Godthåb).
+ #
+-# The rest of Greenland, including Godthab (this area, although it
++# The rest of Greenland, including Godthåb (this area, although it
+ # includes central Greenland, is known as west Greenland), keeps time
+ # UTC-3, with daylight savings methods according to European rules.
+ #
+ # It is common procedure to use UTC 0 in the wilderness of East and
+ # North Greenland, because it is mainly Icelandic aircraft operators
+ # maintaining traffic in these areas. However, the official status of
+-# this area is that it sticks with Godthab time. This area might be
++# this area is that it sticks with Godthåb time. This area might be
+ # considered a dual time zone in some respects because of this.
+
+ # From Rives McDow (2001-11-19):
+@@ -996,8 +1020,8 @@
+
+ # From Paul Eggert (2006-03-22):
+ # From 1997 on the CIA map shows Danmarkshavn on GMT;
+-# the 1995 map as like Godthab.
+-# For lack of better info, assume they were like Godthab before 1996.
++# the 1995 map as like Godthåb.
++# For lack of better info, assume they were like Godthåb before 1996.
+ # startkart.no says Thule does not observe DST, but this is clearly an error,
+ # so go with Shanks & Pottenger for Thule transitions until this year.
+ # For 2007 on assume Thule will stay in sync with US DST rules.
+@@ -1012,15 +1036,15 @@
+ #
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
+- -3:00 - WGT 1980 Apr 6 2:00
++ -3:00 - WGT 1980 Apr 6 2:00
+ -3:00 EU WG%sT 1996
+ 0:00 - GMT
+ Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit
+- -2:00 - CGT 1980 Apr 6 2:00
++ -2:00 - CGT 1980 Apr 6 2:00
+ -2:00 C-Eur CG%sT 1981 Mar 29
+ -1:00 EU EG%sT
+ Zone America/Godthab -3:26:56 - LMT 1916 Jul 28 # Nuuk
+- -3:00 - WGT 1980 Apr 6 2:00
++ -3:00 - WGT 1980 Apr 6 2:00
+ -3:00 EU WG%sT
+ Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik air base
+ -4:00 Thule A%sT
+@@ -1042,17 +1066,16 @@
+ # summer time next spring."
+
+ # From Peter Ilieve (1998-11-04), heavily edited:
+-# <a href="http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390">
+ # The 1998-09-22 Estonian time law
+-# </a>
++# http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390
+ # refers to the Eighth Directive and cites the association agreement between
+-# the EU and Estonia, ratified by the Estonian law (RT II 1995, 22--27, 120).
++# the EU and Estonia, ratified by the Estonian law (RT II 1995, 22-27, 120).
+ #
+ # I also asked [my relative] whether they use any standard abbreviation
+ # for their standard and summer times. He says no, they use "suveaeg"
+ # (summer time) and "talveaeg" (winter time).
+
+-# From <a href="http://www.baltictimes.com/">The Baltic Times</a> (1999-09-09)
++# From The Baltic Times <http://www.baltictimes.com/> (1999-09-09)
+ # via Steffen Thorsen:
+ # This year will mark the last time Estonia shifts to summer time,
+ # a council of the ruling coalition announced Sept. 6....
+@@ -1070,19 +1093,19 @@
+ # The Estonian government has changed once again timezone politics.
+ # Now we are using again EU rules.
+ #
+-# From Urmet Jaanes (2002-03-28):
++# From Urmet Jänes (2002-03-28):
+ # The legislative reference is Government decree No. 84 on 2002-02-21.
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Tallinn 1:39:00 - LMT 1880
+- 1:39:00 - TMT 1918 Feb # Tallinn Mean Time
++ 1:39:00 - TMT 1918 Feb # Tallinn Mean Time
+ 1:00 C-Eur CE%sT 1919 Jul
+ 1:39:00 - TMT 1921 May
+ 2:00 - EET 1940 Aug 6
+ 3:00 - MSK 1941 Sep 15
+ 1:00 C-Eur CE%sT 1944 Sep 22
+- 3:00 Russia MSK/MSD 1989 Mar 26 2:00s
+- 2:00 1:00 EEST 1989 Sep 24 2:00s
++ 3:00 Russia MSK/MSD 1989 Mar 26 2:00s
++ 2:00 1:00 EEST 1989 Sep 24 2:00s
+ 2:00 C-Eur EE%sT 1998 Sep 22
+ 2:00 EU EE%sT 1999 Nov 1
+ 2:00 - EET 2002 Feb 21
+@@ -1104,35 +1127,45 @@
+ # This is documented in Heikki Oja: Aikakirja 2007, published by The Almanac
+ # Office of University of Helsinki, ISBN 952-10-3221-9, available online (in
+ # Finnish) at
+-#
+-# <a href="http://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf">
+ # http://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf
+-# </a>
+ #
+ # Page 105 (56 in PDF version) has a handy table of all past daylight savings
+ # transitions. It is easy enough to interpret without Finnish skills.
+ #
+ # This is also confirmed by Finnish Broadcasting Company's archive at:
+-#
+-# <a href="http://www.yle.fi/elavaarkisto/?s=s&g=1&ag=5&t=&a=3401">
+ # http://www.yle.fi/elavaarkisto/?s=s&g=1&ag=5&t=&a=3401
+-# </a>
+ #
+ # The news clip from 1981 says that "the time between 2 and 3 o'clock does not
+ # exist tonight."
+
++# From Konstantin Hyppönen (2014-06-13):
++# [Heikki Oja's book Aikakirja 2013]
++# http://almanakka.helsinki.fi/images/aikakirja/Aikakirja2013kokonaan.pdf
++# pages 104-105, including a scan from a newspaper published on Apr 2 1942
++# say that ... [o]n Apr 2 1942, 24 o'clock (which means Apr 3 1942,
++# 00:00), clocks were moved one hour forward. The newspaper
++# mentions "on the night from Thursday to Friday"....
++# On Oct 4 1942, clocks were moved at 1:00 one hour backwards.
++#
++# From Paul Eggert (2014-06-14):
++# Go with Oja over Shanks.
++
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule Finland 1942 only - Apr 3 0:00 1:00 S
+-Rule Finland 1942 only - Oct 3 0:00 0 -
++Rule Finland 1942 only - Apr 2 24:00 1:00 S
++Rule Finland 1942 only - Oct 4 1:00 0 -
+ Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S
+ Rule Finland 1981 1982 - Sep lastSun 3:00 0 -
++
++# Milne says Helsinki (Helsingfors) time was 1:39:49.2 (official document);
++# round to nearest.
++
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Europe/Helsinki 1:39:52 - LMT 1878 May 31
+- 1:39:52 - HMT 1921 May # Helsinki Mean Time
++Zone Europe/Helsinki 1:39:49 - LMT 1878 May 31
++ 1:39:49 - HMT 1921 May # Helsinki Mean Time
+ 2:00 Finland EE%sT 1983
+ 2:00 EU EE%sT
+
+-# Aaland Is
++# Ã…land Is
+ Link Europe/Helsinki Europe/Mariehamn
+
+
+@@ -1140,14 +1173,14 @@
+
+ # From Ciro Discepolo (2000-12-20):
+ #
+-# Henri Le Corre, Regimes Horaires pour le monde entier, Editions
++# Henri Le Corre, Régimes horaires pour le monde entier, Éditions
+ # Traditionnelles - Paris 2 books, 1993
+ #
+-# Gabriel, Traite de l'heure dans le monde, Guy Tredaniel editeur,
++# Gabriel, Traité de l'heure dans le monde, Guy Trédaniel,
+ # Paris, 1991
+ #
+-# Francoise Gauquelin, Problemes de l'heure resolus en astrologie,
+-# Guy tredaniel, Paris 1987
++# Françoise Gauquelin, Problèmes de l'heure résolus en astrologie,
++# Guy Trédaniel, Paris 1987
+
+
+ #
+@@ -1188,16 +1221,16 @@
+ Rule France 1940 only - Feb 25 2:00 1:00 S
+ # The French rules for 1941-1944 were not used in Paris, but Shanks & Pottenger
+ # write that they were used in Monaco and in many French locations.
+-# Le Corre writes that the upper limit of the free zone was Arneguy, Orthez,
+-# Mont-de-Marsan, Bazas, Langon, Lamotte-Montravel, Marouil, La
+-# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Descartes,
++# Le Corre writes that the upper limit of the free zone was Arnéguy, Orthez,
++# Mont-de-Marsan, Bazas, Langon, Lamothe-Montravel, Marœuil, La
++# Rochefoucauld, Champagne-Mouton, La Roche-Posay, La Haye-Descartes,
+ # Loches, Montrichard, Vierzon, Bourges, Moulins, Digoin,
+-# Paray-le-Monial, Montceau-les-Mines, Chalons-sur-Saone, Arbois,
++# Paray-le-Monial, Montceau-les-Mines, Chalon-sur-Saône, Arbois,
+ # Dole, Morez, St-Claude, and Collonges (Haute-Savoie).
+ Rule France 1941 only - May 5 0:00 2:00 M # Midsummer
+ # Shanks & Pottenger say this transition occurred at Oct 6 1:00,
+ # but go with Denis Excoffier (1997-12-12),
+-# who quotes the Ephemerides Astronomiques for 1998 from Bureau des Longitudes
++# who quotes the Ephémérides astronomiques for 1998 from Bureau des Longitudes
+ # as saying 5/10/41 22hUT.
+ Rule France 1941 only - Oct 6 0:00 1:00 S
+ Rule France 1942 only - Mar 9 0:00 2:00 M
+@@ -1218,7 +1251,7 @@
+ # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
+- 0:09:21 - PMT 1911 Mar 11 0:01 # Paris MT
++ 0:09:21 - PMT 1911 Mar 11 0:01 # Paris MT
+ # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
+ 0:00 France WE%sT 1940 Jun 14 23:00
+ # Le Corre says Paris stuck with occupied-France time after the liberation;
+@@ -1235,15 +1268,13 @@
+ # Bundesanstalt contains DST information back to 1916.
+ # [See tz-link.htm for the URL.]
+
+-# From Joerg Schilling (2002-10-23):
++# From Jörg Schilling (2002-10-23):
+ # In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
+-# <a href="http://www.dhm.de/lemo/html/biografien/BersarinNikolai/">
+-# General [Nikolai] Bersarin</a>.
++# http://www.dhm.de/lemo/html/biografien/BersarinNikolai/
++# General [Nikolai] Bersarin.
+
+ # From Paul Eggert (2003-03-08):
+-# <a href="http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf">
+ # http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
+-# </a>
+ # says that Bersarin issued an order to use Moscow time on May 20.
+ # However, Moscow did not observe daylight saving in 1945, so
+ # this was equivalent to CEMT (GMT+3), not GMT+4.
+@@ -1268,23 +1299,23 @@
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Berlin 0:53:28 - LMT 1893 Apr
+- 1:00 C-Eur CE%sT 1945 May 24 2:00
++ 1:00 C-Eur CE%sT 1945 May 24 2:00
+ 1:00 SovietZone CE%sT 1946
+ 1:00 Germany CE%sT 1980
+ 1:00 EU CE%sT
+
+ # From Tobias Conradi (2011-09-12):
+-# Busingen <http://www.buesingen.de>, surrounded by the Swiss canton
++# Büsingen <http://www.buesingen.de>, surrounded by the Swiss canton
+ # Schaffhausen, did not start observing DST in 1980 as the rest of DE
+ # (West Germany at that time) and DD (East Germany at that time) did.
+ # DD merged into DE, the area is currently covered by code DE in ISO 3166-1,
+ # which in turn is covered by the zone Europe/Berlin.
+ #
+-# Source for the time in Busingen 1980:
++# Source for the time in Büsingen 1980:
+ # http://www.srf.ch/player/video?id=c012c029-03b7-4c2b-9164-aa5902cd58d3
+
+ # From Arthur David Olson (2012-03-03):
+-# Busingen and Zurich have shared clocks since 1970.
++# Büsingen and Zurich have shared clocks since 1970.
+
+ Link Europe/Zurich Europe/Busingen
+
+@@ -1295,8 +1326,8 @@
+
+ # Gibraltar
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Europe/Gibraltar -0:21:24 - LMT 1880 Aug 2 0:00s
+- 0:00 GB-Eire %s 1957 Apr 14 2:00
++Zone Europe/Gibraltar -0:21:24 - LMT 1880 Aug 2 0:00s
++ 0:00 GB-Eire %s 1957 Apr 14 2:00
+ 1:00 - CET 1982
+ 1:00 EU CE%sT
+
+@@ -1327,7 +1358,7 @@
+ Rule Greece 1980 only - Sep 28 0:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Athens 1:34:52 - LMT 1895 Sep 14
+- 1:34:52 - AMT 1916 Jul 28 0:01 # Athens MT
++ 1:34:52 - AMT 1916 Jul 28 0:01 # Athens MT
+ 2:00 Greece EE%sT 1941 Apr 30
+ 1:00 Greece CE%sT 1944 Apr 4
+ 2:00 Greece EE%sT 1981
+@@ -1336,15 +1367,20 @@
+ 2:00 EU EE%sT
+
+ # Hungary
++# From Paul Eggert (2014-07-15):
++# Dates for 1916-1945 are taken from:
++# Oross A. Jelen a múlt jövője: a nyári időszámítás Magyarországon 1916-1945.
++# National Archives of Hungary (2012-10-29).
++# http://mnl.gov.hu/a_het_dokumentuma/a_nyari_idoszamitas_magyarorszagon_19161945.html
++# This source does not always give times, which are taken from Shanks
++# & Pottenger (which disagree about the dates).
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Hungary 1918 only - Apr 1 3:00 1:00 S
+-Rule Hungary 1918 only - Sep 29 3:00 0 -
++Rule Hungary 1918 only - Sep 16 3:00 0 -
+ Rule Hungary 1919 only - Apr 15 3:00 1:00 S
+-Rule Hungary 1919 only - Sep 15 3:00 0 -
+-Rule Hungary 1920 only - Apr 5 3:00 1:00 S
+-Rule Hungary 1920 only - Sep 30 3:00 0 -
++Rule Hungary 1919 only - Nov 24 3:00 0 -
+ Rule Hungary 1945 only - May 1 23:00 1:00 S
+-Rule Hungary 1945 only - Nov 3 0:00 0 -
++Rule Hungary 1945 only - Nov 1 0:00 0 -
+ Rule Hungary 1946 only - Mar 31 2:00s 1:00 S
+ Rule Hungary 1946 1949 - Oct Sun>=1 2:00s 0 -
+ Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
+@@ -1360,7 +1396,7 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Budapest 1:16:20 - LMT 1890 Oct
+ 1:00 C-Eur CE%sT 1918
+- 1:00 Hungary CE%sT 1941 Apr 6 2:00
++ 1:00 Hungary CE%sT 1941 Apr 8
+ 1:00 C-Eur CE%sT 1945
+ 1:00 Hungary CE%sT 1980 Sep 28 2:00s
+ 1:00 EU CE%sT
+@@ -1423,7 +1459,7 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Atlantic/Reykjavik -1:27:24 - LMT 1837
+ -1:27:48 - RMT 1908 # Reykjavik Mean Time?
+- -1:00 Iceland IS%sT 1968 Apr 7 1:00s
++ -1:00 Iceland IS%sT 1968 Apr 7 1:00s
+ 0:00 - GMT
+
+ # Italy
+@@ -1438,9 +1474,8 @@
+ # From Paul Eggert (2006-03-22):
+ # For Italian DST we have three sources: Shanks & Pottenger, Whitman, and
+ # F. Pollastri
+-# <a href="http://toi.iriti.cnr.it/uk/ienitlt.html">
+ # Day-light Saving Time in Italy (2006-02-03)
+-# </a>
++# http://toi.iriti.cnr.it/uk/ienitlt.html
+ # ('FP' below), taken from an Italian National Electrotechnical Institute
+ # publication. When the three sources disagree, guess who's right, as follows:
+ #
+@@ -1500,8 +1535,8 @@
+ Rule Italy 1979 only - Sep 30 0:00s 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Rome 0:49:56 - LMT 1866 Sep 22
+- 0:49:56 - RMT 1893 Nov 1 0:00s # Rome Mean
+- 1:00 Italy CE%sT 1942 Nov 2 2:00s
++ 0:49:56 - RMT 1893 Nov 1 0:00s # Rome Mean
++ 1:00 Italy CE%sT 1942 Nov 2 2:00s
+ 1:00 C-Eur CE%sT 1944 Jul
+ 1:00 Italy CE%sT 1980
+ 1:00 EU CE%sT
+@@ -1548,18 +1583,18 @@
+
+ # From Andrei Ivanov (2000-03-06):
+ # This year Latvia will not switch to Daylight Savings Time (as specified in
+-# <a href="http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm">
+ # The Regulations of the Cabinet of Ministers of the Rep. of Latvia of
+-# 29-Feb-2000 (#79)</a>, in Latvian for subscribers only).
++# 29-Feb-2000 (#79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
++# in Latvian for subscribers only).
+
+-# <a href="http://www.rferl.org/newsline/2001/01/3-CEE/cee-030101.html">
+-# From RFE/RL Newsline (2001-01-03), noted after a heads-up by Rives McDow:
+-# </a>
++# From RFE/RL Newsline
++# http://www.rferl.org/newsline/2001/01/3-CEE/cee-030101.html
++# (2001-01-03), noted after a heads-up by Rives McDow:
+ # The Latvian government on 2 January decided that the country will
+ # institute daylight-saving time this spring, LETA reported.
+ # Last February the three Baltic states decided not to turn back their
+ # clocks one hour in the spring....
+-# Minister of Economy Aigars Kalvitis noted that Latvia had too few
++# Minister of Economy Aigars Kalvītis noted that Latvia had too few
+ # daylight hours and thus decided to comply with a draft European
+ # Commission directive that provides for instituting daylight-saving
+ # time in EU countries between 2002 and 2006. The Latvian government
+@@ -1569,18 +1604,23 @@
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Latvia 1989 1996 - Mar lastSun 2:00s 1:00 S
+ Rule Latvia 1989 1996 - Sep lastSun 2:00s 0 -
++
++# Milne 1899 says Riga was 1:36:28 (Polytechnique House time).
++# Byalokoz 1919 says Latvia was 1:36:34.
++# Go with Byalokoz.
++
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Europe/Riga 1:36:24 - LMT 1880
+- 1:36:24 - RMT 1918 Apr 15 2:00 #Riga Mean Time
+- 1:36:24 1:00 LST 1918 Sep 16 3:00 #Latvian Summer
+- 1:36:24 - RMT 1919 Apr 1 2:00
+- 1:36:24 1:00 LST 1919 May 22 3:00
+- 1:36:24 - RMT 1926 May 11
++Zone Europe/Riga 1:36:34 - LMT 1880
++ 1:36:34 - RMT 1918 Apr 15 2:00 # Riga MT
++ 1:36:34 1:00 LST 1918 Sep 16 3:00 # Latvian ST
++ 1:36:34 - RMT 1919 Apr 1 2:00
++ 1:36:34 1:00 LST 1919 May 22 3:00
++ 1:36:34 - RMT 1926 May 11
+ 2:00 - EET 1940 Aug 5
+ 3:00 - MSK 1941 Jul
+ 1:00 C-Eur CE%sT 1944 Oct 13
+- 3:00 Russia MSK/MSD 1989 Mar lastSun 2:00s
+- 2:00 1:00 EEST 1989 Sep lastSun 2:00s
++ 3:00 Russia MSK/MSD 1989 Mar lastSun 2:00s
++ 2:00 1:00 EEST 1989 Sep lastSun 2:00s
+ 2:00 Latvia EE%sT 1997 Jan 21
+ 2:00 EU EE%sT 2000 Feb 29
+ 2:00 - EET 2001 Jan 2
+@@ -1614,7 +1654,7 @@
+ # I would like to inform that in this year Lithuanian time zone
+ # (Europe/Vilnius) was changed.
+
+-# From <a href="http://www.elta.lt/">ELTA</a> No. 972 (2582) (1999-09-29),
++# From ELTA No. 972 (2582) (1999-09-29) <http://www.elta.lt/>,
+ # via Steffen Thorsen:
+ # Lithuania has shifted back to the second time zone (GMT plus two hours)
+ # to be valid here starting from October 31,
+@@ -1623,9 +1663,9 @@
+ # motion to give up shifting to summer time in spring, as it was
+ # already done by Estonia.
+
+-# From the <a href="http://www.tourism.lt/informa/ff.htm">
+-# Fact File, Lithuanian State Department of Tourism
+-# </a> (2000-03-27): Local time is GMT+2 hours ..., no daylight saving.
++# From the Fact File, Lithuanian State Department of Tourism
++# <http://www.tourism.lt/informa/ff.htm> (2000-03-27):
++# Local time is GMT+2 hours ..., no daylight saving.
+
+ # From a user via Klaus Marten (2003-02-07):
+ # As a candidate for membership of the European Union, Lithuania will
+@@ -1638,18 +1678,18 @@
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Vilnius 1:41:16 - LMT 1880
+- 1:24:00 - WMT 1917 # Warsaw Mean Time
++ 1:24:00 - WMT 1917 # Warsaw Mean Time
+ 1:35:36 - KMT 1919 Oct 10 # Kaunas Mean Time
+ 1:00 - CET 1920 Jul 12
+ 2:00 - EET 1920 Oct 9
+ 1:00 - CET 1940 Aug 3
+ 3:00 - MSK 1941 Jun 24
+ 1:00 C-Eur CE%sT 1944 Aug
+- 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
+- 2:00 1:00 EEST 1991 Sep 29 2:00s
++ 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
++ 2:00 1:00 EEST 1991 Sep 29 2:00s
+ 2:00 C-Eur EE%sT 1998
+- 2:00 - EET 1998 Mar 29 1:00u
+- 1:00 EU CE%sT 1999 Oct 31 1:00u
++ 2:00 - EET 1998 Mar 29 1:00u
++ 1:00 EU CE%sT 1999 Oct 31 1:00u
+ 2:00 - EET 2003 Jan 1
+ 2:00 EU EE%sT
+
+@@ -1683,9 +1723,9 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Luxembourg 0:24:36 - LMT 1904 Jun
+ 1:00 Lux CE%sT 1918 Nov 25
+- 0:00 Lux WE%sT 1929 Oct 6 2:00s
+- 0:00 Belgium WE%sT 1940 May 14 3:00
+- 1:00 C-Eur WE%sT 1944 Sep 18 3:00
++ 0:00 Lux WE%sT 1929 Oct 6 2:00s
++ 0:00 Belgium WE%sT 1940 May 14 3:00
++ 1:00 C-Eur WE%sT 1944 Sep 18 3:00
+ 1:00 Belgium CE%sT 1977
+ 1:00 EU CE%sT
+
+@@ -1702,9 +1742,9 @@
+ Rule Malta 1975 1980 - Sep Sun>=15 2:00 0 -
+ Rule Malta 1980 only - Mar 31 2:00 1:00 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Europe/Malta 0:58:04 - LMT 1893 Nov 2 0:00s # Valletta
+- 1:00 Italy CE%sT 1942 Nov 2 2:00s
+- 1:00 C-Eur CE%sT 1945 Apr 2 2:00s
++Zone Europe/Malta 0:58:04 - LMT 1893 Nov 2 0:00s # Valletta
++ 1:00 Italy CE%sT 1942 Nov 2 2:00s
++ 1:00 C-Eur CE%sT 1945 Apr 2 2:00s
+ 1:00 Italy CE%sT 1973 Mar 31
+ 1:00 Malta CE%sT 1981
+ 1:00 EU CE%sT
+@@ -1719,7 +1759,7 @@
+ # In early 1992 there was large-scale interethnic violence in the area
+ # and it's possible that some Russophones continued to observe Moscow time.
+ # But [two people] separately reported via
+-# Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau.
++# Jesper Nørgaard that as of 2001-01-24 Tiraspol was like Chisinau.
+ # The Tiraspol entry has therefore been removed for now.
+ #
+ # From Alexander Krivenyshev (2011-10-17):
+@@ -1728,13 +1768,8 @@
+ # to the Winter Time).
+ #
+ # News (in Russian):
+-# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">
+ # http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html
+-# </a>
+-#
+-# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">
+ # http://www.allmoldova.com/moldova-news/1249064116.html
+-# </a>
+ #
+ # The substance of this change (reinstatement of the Tiraspol entry)
+ # is from a patch from Petr Machata (2011-10-17)
+@@ -1752,9 +1787,7 @@
+ # Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)-
+ # Tiraspol will go back to winter time on October 30, 2011.
+ # News from Moldova (in russian):
+-# <a href="http://ru.publika.md/link_317061.html">
+ # http://ru.publika.md/link_317061.html
+-# </a>
+
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -1777,8 +1810,8 @@
+ # more precise 0:09:21.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
+- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
+- 0:00 France WE%sT 1945 Sep 16 3:00
++ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
++ 0:00 France WE%sT 1945 Sep 16 3:00
+ 1:00 France CE%sT 1977
+ 1:00 EU CE%sT
+
+@@ -1822,8 +1855,8 @@
+ # was not until 1866 when they were all required by law to observe
+ # Amsterdam mean time.
+
+-# The data before 1945 are taken from
+-# <http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm>.
++# The data entries before 1945 are taken from
++# http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
+@@ -1854,8 +1887,8 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Amsterdam 0:19:32 - LMT 1835
+ 0:19:32 Neth %s 1937 Jul 1
+- 0:20 Neth NE%sT 1940 May 16 0:00 # Dutch Time
+- 1:00 C-Eur CE%sT 1945 Apr 2 2:00
++ 0:20 Neth NE%sT 1940 May 16 0:00 # Dutch Time
++ 1:00 C-Eur CE%sT 1945 Apr 2 2:00
+ 1:00 Neth CE%sT 1977
+ 1:00 EU CE%sT
+
+@@ -1885,14 +1918,14 @@
+ # time they were declared as parts of Norway. Svalbard was declared
+ # as a part of Norway by law of 1925-07-17 no 11, section 4 and Jan
+ # Mayen by law of 1930-02-27 no 2, section 2. (From
+-# http://www.lovdata.no/all/nl-19250717-011.html and
+-# http://www.lovdata.no/all/nl-19300227-002.html). The law/regulation
++# <http://www.lovdata.no/all/nl-19250717-011.html> and
++# <http://www.lovdata.no/all/nl-19300227-002.html>). The law/regulation
+ # for normal/standard time in Norway is from 1894-06-29 no 1 (came
+ # into operation on 1895-01-01) and Svalbard/Jan Mayen seem to be a
+ # part of this law since 1925/1930. (From
+-# http://www.lovdata.no/all/nl-18940629-001.html ) I have not been
++# <http://www.lovdata.no/all/nl-18940629-001.html>) I have not been
+ # able to find if Jan Mayen used a different time zone (e.g. -0100)
+-# before 1930. Jan Mayen has only been "inhabitated" since 1921 by
++# before 1930. Jan Mayen has only been "inhabited" since 1921 by
+ # Norwegian meteorologists and maybe used the same time as Norway ever
+ # since 1921. Svalbard (Arctic/Longyearbyen) has been inhabited since
+ # before 1895, and therefore probably changed the local time somewhere
+@@ -1907,7 +1940,7 @@
+ # <http://home.no.net/janmayen/history.htm> says that the meteorologists
+ # burned down their station in 1940 and left the island, but returned in
+ # 1941 with a small Norwegian garrison and continued operations despite
+-# frequent air ttacks from Germans. In 1943 the Americans established a
++# frequent air attacks from Germans. In 1943 the Americans established a
+ # radiolocating station on the island, called "Atlantic City". Possibly
+ # the UT offset changed during the war, but I think it unlikely that
+ # Jan Mayen used German daylight-saving rules.
+@@ -1918,7 +1951,7 @@
+ # <http://www.svalbard.com/SvalbardFAQ.html> says that the Germans were
+ # expelled on 1942-05-14. However, small parties of Germans did return,
+ # and according to Wilhelm Dege's book "War North of 80" (1954)
+-# <http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html>
++# http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html
+ # the German armed forces at the Svalbard weather station code-named
+ # Haudegen did not surrender to the Allies until September 1945.
+ #
+@@ -1927,6 +1960,10 @@
+ Link Europe/Oslo Arctic/Longyearbyen
+
+ # Poland
++
++# The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20),
++# <http://www.wbc.poznan.pl/publication/32156> pp 1-2.
++
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Poland 1918 1919 - Sep 16 2:00s 0 -
+ Rule Poland 1919 only - Apr 15 2:00s 1:00 S
+@@ -1937,9 +1974,9 @@
+ Rule Poland 1945 only - Apr 29 0:00 1:00 S
+ Rule Poland 1945 only - Nov 1 0:00 0 -
+ # For 1946 on the source is Kazimierz Borkowski,
+-# Torun Center for Astronomy, Dept. of Radio Astronomy, Nicolaus Copernicus U.,
+-# <http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1>
+-# Thanks to Przemyslaw Augustyniak (2005-05-28) for this reference.
++# Toruń Center for Astronomy, Dept. of Radio Astronomy, Nicolaus Copernicus U.,
++# http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1
++# Thanks to Przemysław Augustyniak (2005-05-28) for this reference.
+ # He also gives these further references:
+ # Mon Pol nr 13, poz 162 (1995) <http://www.abc.com.pl/serwis/mp/1995/0162.htm>
+ # Druk nr 2180 (2003) <http://www.senat.gov.pl/k5/dok/sejm/053/2180.pdf>
+@@ -1959,10 +1996,10 @@
+ Rule Poland 1962 1964 - Sep lastSun 1:00s 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Warsaw 1:24:00 - LMT 1880
+- 1:24:00 - WMT 1915 Aug 5 # Warsaw Mean Time
+- 1:00 C-Eur CE%sT 1918 Sep 16 3:00
++ 1:24:00 - WMT 1915 Aug 5 # Warsaw Mean Time
++ 1:00 C-Eur CE%sT 1918 Sep 16 3:00
+ 2:00 Poland EE%sT 1922 Jun
+- 1:00 Poland CE%sT 1940 Jun 23 2:00
++ 1:00 Poland CE%sT 1940 Jun 23 2:00
+ 1:00 C-Eur CE%sT 1944 Oct
+ 1:00 Poland CE%sT 1977
+ 1:00 W-Eur CE%sT 1988
+@@ -1970,6 +2007,14 @@
+
+ # Portugal
+ #
++# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
++# According to a Portuguese decree (1911-05-26)
++# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
++# Lisbon was at -0:36:44.68, but switched to GMT on 1912-01-01 at 00:00.
++# Round the old offset to -0:36:45. This agrees with Willett but disagrees
++# with Shanks, who says the transition occurred on 1911-05-24 at 00:00 for
++# Europe/Lisbon, Atlantic/Azores, and Atlantic/Madeira.
++#
+ # From Rui Pedro Salgueiro (1992-11-12):
+ # Portugal has recently (September, 27) changed timezone
+ # (from WET to MET or CET) to harmonize with EEC.
+@@ -2049,35 +2094,34 @@
+ Rule Port 1980 only - Mar lastSun 0:00s 1:00 S
+ Rule Port 1981 1982 - Mar lastSun 1:00s 1:00 S
+ Rule Port 1983 only - Mar lastSun 2:00s 1:00 S
++#
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-# Shanks & Pottenger say the transition from LMT to WET occurred 1911-05-24;
+-# Willett says 1912-01-01. Go with Willett.
+-Zone Europe/Lisbon -0:36:32 - LMT 1884
+- -0:36:32 - LMT 1912 Jan 1 # Lisbon Mean Time
+- 0:00 Port WE%sT 1966 Apr 3 2:00
+- 1:00 - CET 1976 Sep 26 1:00
+- 0:00 Port WE%sT 1983 Sep 25 1:00s
+- 0:00 W-Eur WE%sT 1992 Sep 27 1:00s
+- 1:00 EU CE%sT 1996 Mar 31 1:00u
++Zone Europe/Lisbon -0:36:45 - LMT 1884
++ -0:36:45 - LMT 1912 Jan 1 # Lisbon Mean Time
++ 0:00 Port WE%sT 1966 Apr 3 2:00
++ 1:00 - CET 1976 Sep 26 1:00
++ 0:00 Port WE%sT 1983 Sep 25 1:00s
++ 0:00 W-Eur WE%sT 1992 Sep 27 1:00s
++ 1:00 EU CE%sT 1996 Mar 31 1:00u
+ 0:00 EU WE%sT
+-Zone Atlantic/Azores -1:42:40 - LMT 1884 # Ponta Delgada
+- -1:54:32 - HMT 1911 May 24 # Horta Mean Time
+- -2:00 Port AZO%sT 1966 Apr 3 2:00 # Azores Time
+- -1:00 Port AZO%sT 1983 Sep 25 1:00s
+- -1:00 W-Eur AZO%sT 1992 Sep 27 1:00s
+- 0:00 EU WE%sT 1993 Mar 28 1:00u
++Zone Atlantic/Azores -1:42:40 - LMT 1884 # Ponta Delgada
++ -1:54:32 - HMT 1912 Jan 1 # Horta Mean Time
++ -2:00 Port AZO%sT 1966 Apr 3 2:00 # Azores Time
++ -1:00 Port AZO%sT 1983 Sep 25 1:00s
++ -1:00 W-Eur AZO%sT 1992 Sep 27 1:00s
++ 0:00 EU WE%sT 1993 Mar 28 1:00u
+ -1:00 EU AZO%sT
+-Zone Atlantic/Madeira -1:07:36 - LMT 1884 # Funchal
+- -1:07:36 - FMT 1911 May 24 # Funchal Mean Time
+- -1:00 Port MAD%sT 1966 Apr 3 2:00 # Madeira Time
+- 0:00 Port WE%sT 1983 Sep 25 1:00s
++Zone Atlantic/Madeira -1:07:36 - LMT 1884 # Funchal
++ -1:07:36 - FMT 1912 Jan 1 # Funchal Mean Time
++ -1:00 Port MAD%sT 1966 Apr 3 2:00 # Madeira Time
++ 0:00 Port WE%sT 1983 Sep 25 1:00s
+ 0:00 EU WE%sT
+
+ # Romania
+ #
+ # From Paul Eggert (1999-10-07):
+-# <a href="http://www.nineoclock.ro/POL/1778pol.html">
+-# Nine O'clock</a> (1998-10-23) reports that the switch occurred at
++# Nine O'clock <http://www.nineoclock.ro/POL/1778pol.html>
++# (1998-10-23) reports that the switch occurred at
+ # 04:00 local time in fall 1998. For lack of better info,
+ # assume that Romania and Moldova switched to EU rules in 1997,
+ # the same year as Bulgaria.
+@@ -2094,32 +2138,28 @@
+ Rule Romania 1991 1993 - Sep lastSun 0:00s 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Bucharest 1:44:24 - LMT 1891 Oct
+- 1:44:24 - BMT 1931 Jul 24 # Bucharest MT
+- 2:00 Romania EE%sT 1981 Mar 29 2:00s
++ 1:44:24 - BMT 1931 Jul 24 # Bucharest MT
++ 2:00 Romania EE%sT 1981 Mar 29 2:00s
+ 2:00 C-Eur EE%sT 1991
+ 2:00 Romania EE%sT 1994
+ 2:00 E-Eur EE%sT 1997
+ 2:00 EU EE%sT
+
++
+ # Russia
+
+ # From Alexander Krivenyshev (2011-09-15):
+ # Based on last Russian Government Decree # 725 on August 31, 2011
+ # (Government document
+-# <a href="http://www.government.ru/gov/results/16355/print/">
+ # http://www.government.ru/gov/results/16355/print/
+-# </a>
+ # in Russian)
+ # there are few corrections have to be made for some Russian time zones...
+ # All updated Russian Time Zones were placed in table and translated to English
+ # by WorldTimeZone.com at the link below:
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_russia36.htm">
+ # http://www.worldtimezone.com/dst_news/dst_news_russia36.htm
+-# </a>
+
+ # From Sanjeev Gupta (2011-09-27):
+ # Scans of [Decree #23 of January 8, 1992] are available at:
+-# <a href="http://government.consultant.ru/page.aspx?1223966">
+ # http://government.consultant.ru/page.aspx?1223966
+ # They are in Cyrillic letters (presumably Russian).
+
+@@ -2128,16 +2168,12 @@
+ # changed in September 2011:
+ #
+ # One source is
+-# < a href="http://government.ru/gov/results/16355/>
+ # http://government.ru/gov/results/16355/
+-# </a>
+ # which, according to translate.google.com, begins "Decree of August 31,
+ # 2011 No 725" and contains no other dates or "effective date" information.
+ #
+ # Another source is
+-# <a href="http://www.rg.ru/2011/09/06/chas-zona-dok.html">
+ # http://www.rg.ru/2011/09/06/chas-zona-dok.html
+-# </a>
+ # which, according to translate.google.com, begins "Resolution of the
+ # Government of the Russian Federation on August 31, 2011 N 725" and also
+ # contains "Date first official publication: September 6, 2011 Posted on:
+@@ -2145,28 +2181,45 @@
+ # does not contain any "effective date" information.
+ #
+ # Another source is
+-# <a href="http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7">
+ # http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
+-# </a>
+ # which, in note 8, contains "Resolution #725 of August 31, 2011...
+ # Effective as of after 7 days following the day of the official publication"
+ # but which does not contain any reference to September 6, 2011.
+ #
+ # The Wikipedia article refers to
+-# <a href="http://base.consultant.ru/cons/cgi/online.cgi?req=doc;base=LAW;n=118896">
+ # http://base.consultant.ru/cons/cgi/online.cgi?req=doc;base=LAW;n=118896
+-# </a>
+ # which seems to copy the text of the government.ru page.
+ #
+ # Tobias Conradi combines Wikipedia's
+ # "as of after 7 days following the day of the official publication"
+-# with www.rg.ru's "Date of first official publication: September 6, 2011" to get
+-# September 13, 2011 as the cutover date (unusually, a Tuesday, as Tobias Conradi notes).
++# with www.rg.ru's "Date of first official publication: September 6, 2011" to
++# get September 13, 2011 as the cutover date (unusually, a Tuesday, as Tobias
++# Conradi notes).
+ #
+ # None of the sources indicates a time of day for changing clocks.
+ #
+ # Go with 2011-09-13 0:00s.
+
++# From Alexander Krivenyshev (2014-07-01):
++# According to the Russian news (ITAR-TASS News Agency)
++# http://en.itar-tass.com/russia/738562
++# the State Duma has approved ... the draft bill on returning to
++# winter time standard and return Russia 11 time zones. The new
++# regulations will come into effect on October 26, 2014 at 02:00 ...
++# http://asozd2.duma.gov.ru/main.nsf/%28Spravka%29?OpenAgent&RN=431985-6&02
++# Here is a link where we put together table (based on approved Bill N
++# 431985-6) with proposed 11 Russian time zones and corresponding
++# areas/cities/administrative centers in the Russian Federation (in English):
++# http://www.worldtimezone.com/dst_news/dst_news_russia65.html
++#
++# From Alexander Krivenyshev (2014-07-22):
++# Putin signed the Federal Law 431985-6 ... (in Russian)
++# http://itar-tass.com/obschestvo/1333711
++# http://www.pravo.gov.ru:8080/page.aspx?111660
++# http://www.kremlin.ru/acts/46279
++# From October 26, 2014 the new Russian time zone map will looks like this:
++# http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
++
+ # From Paul Eggert (2006-03-22):
+ # Except for Moscow after 1919-07-01, I invented the time zone abbreviations.
+ # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
+@@ -2193,9 +2246,9 @@
+ #
+ # For Grozny, Chechnya, we have the following story from
+ # John Daniszewski, "Scavengers in the Rubble", Los Angeles Times (2001-02-07):
+-# News--often false--is spread by word of mouth. A rumor that it was
++# News - often false - is spread by word of mouth. A rumor that it was
+ # time to move the clocks back put this whole city out of sync with
+-# the rest of Russia for two weeks--even soldiers stationed here began
++# the rest of Russia for two weeks - even soldiers stationed here began
+ # enforcing curfew at the wrong time.
+ #
+ # From Gwillim Law (2001-06-05):
+@@ -2206,107 +2259,265 @@
+ # since September 1997.... Although the Kuril Islands are
+ # administratively part of Sakhalin oblast', they appear to have
+ # remained on UTC+11 along with Magadan.
+-#
++
++# From Tim Parenti (2014-07-06):
++# The comments detailing the coverage of each Russian zone are meant to assist
++# with maintenance only and represent our best guesses as to which regions
++# are covered by each zone. They are not meant to be taken as an authoritative
++# listing. The region codes listed come from
++# http://en.wikipedia.org/w/?title=Federal_subjects_of_Russia&oldid=611810498
++# and are used for convenience only; no guarantees are made regarding their
++# future stability. ISO 3166-2:RU codes are also listed for first-level
++# divisions where available.
++
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-#
+-# Kaliningradskaya oblast'.
++
++
++# From Tim Parenti (2014-07-03):
++# Europe/Kaliningrad covers...
++# 39 RU-KGD Kaliningrad Oblast
++
+ Zone Europe/Kaliningrad 1:22:00 - LMT 1893 Apr
+ 1:00 C-Eur CE%sT 1945
+ 2:00 Poland CE%sT 1946
+- 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
+- 2:00 Russia EE%sT 2011 Mar 27 2:00s
+- 3:00 - FET # Further-eastern European Time
++ 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
++ 2:00 Russia EE%sT 2011 Mar 27 2:00s
++ 3:00 - FET 2014 Oct 26 2:00s
++ 2:00 - EET
++
++
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# Europe/Moscow covers...
++# 01 RU-AD Adygea, Republic of
++# 05 RU-DA Dagestan, Republic of
++# 06 RU-IN Ingushetia, Republic of
++# 07 RU-KB Kabardino-Balkar Republic
++# 08 RU-KL Kalmykia, Republic of
++# 09 RU-KC Karachay-Cherkess Republic
++# 10 RU-KR Karelia, Republic of
++# 11 RU-KO Komi Republic
++# 12 RU-ME Mari El Republic
++# 13 RU-MO Mordovia, Republic of
++# 15 RU-SE North Ossetia-Alania, Republic of
++# 16 RU-TA Tatarstan, Republic of
++# 20 RU-CE Chechen Republic
++# 21 RU-CU Chuvash Republic
++# 23 RU-KDA Krasnodar Krai
++# 26 RU-STA Stavropol Krai
++# 29 RU-ARK Arkhangelsk Oblast
++# 31 RU-BEL Belgorod Oblast
++# 32 RU-BRY Bryansk Oblast
++# 33 RU-VLA Vladimir Oblast
++# 35 RU-VLG Vologda Oblast
++# 36 RU-VOR Voronezh Oblast
++# 37 RU-IVA Ivanovo Oblast
++# 40 RU-KLU Kaluga Oblast
++# 44 RU-KOS Kostroma Oblast
++# 46 RU-KRS Kursk Oblast
++# 47 RU-LEN Leningrad Oblast
++# 48 RU-LIP Lipetsk Oblast
++# 50 RU-MOS Moscow Oblast
++# 51 RU-MUR Murmansk Oblast
++# 52 RU-NIZ Nizhny Novgorod Oblast
++# 53 RU-NGR Novgorod Oblast
++# 57 RU-ORL Oryol Oblast
++# 58 RU-PNZ Penza Oblast
++# 60 RU-PSK Pskov Oblast
++# 61 RU-ROS Rostov Oblast
++# 62 RU-RYA Ryazan Oblast
++# 67 RU-SMO Smolensk Oblast
++# 68 RU-TAM Tambov Oblast
++# 69 RU-TVE Tver Oblast
++# 71 RU-TUL Tula Oblast
++# 73 RU-ULY Ulyanovsk Oblast
++# 76 RU-YAR Yaroslavl Oblast
++# 77 RU-MOW Moscow
++# 78 RU-SPE Saint Petersburg
++# 83 RU-NEN Nenets Autonomous Okrug
++
++# From Vladimir Karpinsky (2014-07-08):
++# LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
++# Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
++# LMT in Moscow since Jul 3, 1916 is 2:31:01 as a result of new standard.
++# (The info is from the book by Byalokoz ... p. 18.)
++# The time in St. Petersburg as capital of Russia was defined by
++# Pulkov observatory, near St. Petersburg. In 1916 LMT Moscow
++# was synchronized with LMT St. Petersburg (+30 minutes), (Pulkov observatory
++# coordinates: 59 deg. 46'18.70", 30 deg. 19'40.70") so 30 deg. 19'40.70" >
++# 2h01m18.7s = 2:01:19. LMT Moscow = LMT St.Petersburg + 30m 2:01:19 + 0:30 =
++# 2:31:19 ...
+ #
+-# From Oscar van Vlijmen (2001-08-25): [This region consists of]
+-# Respublika Adygeya, Arkhangel'skaya oblast',
+-# Belgorodskaya oblast', Bryanskaya oblast', Vladimirskaya oblast',
+-# Vologodskaya oblast', Voronezhskaya oblast',
+-# Respublika Dagestan, Ivanovskaya oblast', Respublika Ingushetiya,
+-# Kabarbino-Balkarskaya Respublika, Respublika Kalmykiya,
+-# Kalyzhskaya oblast', Respublika Karachaevo-Cherkessiya,
+-# Respublika Kareliya, Respublika Komi,
+-# Kostromskaya oblast', Krasnodarskij kraj, Kurskaya oblast',
+-# Leningradskaya oblast', Lipetskaya oblast', Respublika Marij El,
+-# Respublika Mordoviya, Moskva, Moskovskaya oblast',
+-# Murmanskaya oblast', Nenetskij avtonomnyj okrug,
+-# Nizhegorodskaya oblast', Novgorodskaya oblast', Orlovskaya oblast',
+-# Penzenskaya oblast', Pskovskaya oblast', Rostovskaya oblast',
+-# Ryazanskaya oblast', Sankt-Peterburg,
+-# Respublika Severnaya Osetiya, Smolenskaya oblast',
+-# Stavropol'skij kraj, Tambovskaya oblast', Respublika Tatarstan,
+-# Tverskaya oblast', Tyl'skaya oblast', Ul'yanovskaya oblast',
+-# Chechenskaya Respublika, Chuvashskaya oblast',
+-# Yaroslavskaya oblast'
+-Zone Europe/Moscow 2:30:20 - LMT 1880
+- 2:30 - MMT 1916 Jul 3 # Moscow Mean Time
+- 2:30:48 Russia %s 1919 Jul 1 2:00
++# From Paul Eggert (2014-07-08):
++# Milne does not list Moscow, but suggests that its time might be listed in
++# Résumés mensuels et annuels des observations météorologiques (1895).
++# Presumably this is OCLC 85825704, a journal published with parallel text in
++# Russian and French. This source has not been located; go with Karpinsky.
++
++Zone Europe/Moscow 2:30:17 - LMT 1880
++ 2:30:17 - MMT 1916 Jul 3 # Moscow Mean Time
++ 2:31:19 Russia %s 1919 Jul 1 2:00
++ 3:00 Russia %s 1921 Oct
+ 3:00 Russia MSK/MSD 1922 Oct
+ 2:00 - EET 1930 Jun 21
+- 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
+- 2:00 Russia EE%sT 1992 Jan 19 2:00s
+- 3:00 Russia MSK/MSD 2011 Mar 27 2:00s
+- 4:00 - MSK
++ 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
++ 2:00 Russia EE%sT 1992 Jan 19 2:00s
++ 3:00 Russia MSK/MSD 2011 Mar 27 2:00s
++ 4:00 - MSK 2014 Oct 26 2:00s
++ 3:00 - MSK
++
++
++# From Tim Parenti (2014-07-03):
++# Europe/Simferopol covers...
++# ** **** Crimea, Republic of
++# ** **** Sevastopol
++
++Zone Europe/Simferopol 2:16:24 - LMT 1880
++ 2:16 - SMT 1924 May 2 # Simferopol Mean T
++ 2:00 - EET 1930 Jun 21
++ 3:00 - MSK 1941 Nov
++ 1:00 C-Eur CE%sT 1944 Apr 13
++ 3:00 Russia MSK/MSD 1990
++ 3:00 - MSK 1990 Jul 1 2:00
++ 2:00 - EET 1992
++# Central Crimea used Moscow time 1994/1997.
+ #
+-# Astrakhanskaya oblast', Kirovskaya oblast', Saratovskaya oblast',
+-# Volgogradskaya oblast'. Shanks & Pottenger say Kirov is still at +0400
+-# but Wikipedia (2006-05-09) says +0300. Perhaps it switched after the
+-# others? But we have no data.
++# From Paul Eggert (2006-03-22):
++# The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
++# from Kiev to Moscow time sometime after the January 1994 elections.
++# Shanks (1999) says "date of change uncertain", but implies that it happened
++# sometime between the 1994 DST switches. Shanks & Pottenger simply say
++# 1994-09-25 03:00, but that can't be right. For now, guess it
++# changed in May.
++ 2:00 E-Eur EE%sT 1994 May
++# From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
++ 3:00 E-Eur MSK/MSD 1996 Mar 31 3:00s
++ 3:00 1:00 MSD 1996 Oct 27 3:00s
++# IATA SSIM (1997-09) says Crimea switched to EET/EEST.
++# Assume it happened in March by not changing the clocks.
++ 3:00 Russia MSK/MSD 1997
++ 3:00 - MSK 1997 Mar lastSun 1:00u
++# From Alexander Krivenyshev (2014-03-17):
++# time change at 2:00 (2am) on March 30, 2014
++# http://vz.ru/news/2014/3/17/677464.html
++# From Paul Eggert (2014-03-30):
++# Simferopol and Sevastopol reportedly changed their central town clocks
++# late the previous day, but this appears to have been ceremonial
++# and the discrepancies are small enough to not worry about.
++ 2:00 EU EE%sT 2014 Mar 30 2:00
++ 4:00 - MSK 2014 Oct 26 2:00s
++ 3:00 - MSK
++
++
++# From Tim Parenti (2014-07-03):
++# Europe/Volgograd covers...
++# 30 RU-AST Astrakhan Oblast
++# 34 RU-VGG Volgograd Oblast
++# 43 RU-KIR Kirov Oblast
++# 64 RU-SAR Saratov Oblast
++
++# From Paul Eggert (2006-05-09):
++# Shanks & Pottenger say Kirov is still at +0400 but Wikipedia says +0300.
++# Perhaps it switched after the others? But we have no data.
++
+ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
+ 3:00 - TSAT 1925 Apr 6 # Tsaritsyn Time
+ 3:00 - STAT 1930 Jun 21 # Stalingrad Time
+ 4:00 - STAT 1961 Nov 11
+- 4:00 Russia VOL%sT 1989 Mar 26 2:00s # Volgograd T
+- 3:00 Russia VOL%sT 1991 Mar 31 2:00s
+- 4:00 - VOLT 1992 Mar 29 2:00s
+- 3:00 Russia VOL%sT 2011 Mar 27 2:00s
+- 4:00 - VOLT
+-#
+-# From Oscar van Vlijmen (2001-08-25): [This region consists of]
+-# Samarskaya oblast', Udmyrtskaya respublika
+-Zone Europe/Samara 3:20:36 - LMT 1919 Jul 1 2:00
++ 4:00 Russia VOL%sT 1989 Mar 26 2:00s # Volgograd T
++ 3:00 Russia VOL%sT 1991 Mar 31 2:00s
++ 4:00 - VOLT 1992 Mar 29 2:00s
++ 3:00 Russia MSK 2011 Mar 27 2:00s
++ 4:00 - MSK 2014 Oct 26 2:00s
++ 3:00 - MSK
++
++
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# Europe/Samara covers...
++# 18 RU-UD Udmurt Republic
++# 63 RU-SAM Samara Oblast
++
++# Byalokoz 1919 says Samara was 3:20:20.
++
++Zone Europe/Samara 3:20:20 - LMT 1919 Jul 1 2:00
+ 3:00 - SAMT 1930 Jun 21
+ 4:00 - SAMT 1935 Jan 27
+- 4:00 Russia KUY%sT 1989 Mar 26 2:00s # Kuybyshev
+- 3:00 Russia KUY%sT 1991 Mar 31 2:00s
+- 2:00 Russia KUY%sT 1991 Sep 29 2:00s
+- 3:00 - KUYT 1991 Oct 20 3:00
+- 4:00 Russia SAM%sT 2010 Mar 28 2:00s # Samara Time
+- 3:00 Russia SAM%sT 2011 Mar 27 2:00s
++ 4:00 Russia KUY%sT 1989 Mar 26 2:00s # Kuybyshev
++ 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
++ 2:00 Russia EE%sT 1991 Sep 29 2:00s
++ 3:00 - KUYT 1991 Oct 20 3:00
++ 4:00 Russia SAM%sT 2010 Mar 28 2:00s # Samara Time
++ 3:00 Russia SAM%sT 2011 Mar 27 2:00s
+ 4:00 - SAMT
+
++
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# Asia/Yekaterinburg covers...
++# 02 RU-BA Bashkortostan, Republic of
++# 90 RU-PER Perm Krai
++# 45 RU-KGN Kurgan Oblast
++# 56 RU-ORE Orenburg Oblast
++# 66 RU-SVE Sverdlovsk Oblast
++# 72 RU-TYU Tyumen Oblast
++# 74 RU-CHE Chelyabinsk Oblast
++# 86 RU-KHM Khanty-Mansi Autonomous Okrug - Yugra
++# 89 RU-YAN Yamalo-Nenets Autonomous Okrug
+ #
+-# From Oscar van Vlijmen (2001-08-25): [This region consists of]
+-# Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug,
+-# Kurganskaya oblast', Orenburgskaya oblast', Permskaya oblast',
+-# Sverdlovskaya oblast', Tyumenskaya oblast',
+-# Khanty-Manskijskij avtonomnyj okrug, Chelyabinskaya oblast',
+-# Yamalo-Nenetskij avtonomnyj okrug.
+-Zone Asia/Yekaterinburg 4:02:24 - LMT 1919 Jul 15 4:00
++# Note: Effective 2005-12-01, (59) Perm Oblast and (81) Komi-Permyak
++# Autonomous Okrug merged to form (90, RU-PER) Perm Krai.
++
++# Milne says Yekaterinburg was 4:02:32.9; round to nearest.
++# Byalokoz 1919 says its provincial time was based on Perm, at 3:45:05.
++# Assume it switched on 1916-07-03, the time of the new standard.
++# The 1919 and 1930 transitions are from Shanks.
++
++Zone Asia/Yekaterinburg 4:02:33 - LMT 1916 Jul 3
++ 3:45:05 - PMT 1919 Jul 15 4:00
+ 4:00 - SVET 1930 Jun 21 # Sverdlovsk Time
+- 5:00 Russia SVE%sT 1991 Mar 31 2:00s
+- 4:00 Russia SVE%sT 1992 Jan 19 2:00s
+- 5:00 Russia YEK%sT 2011 Mar 27 2:00s
+- 6:00 - YEKT # Yekaterinburg Time
+-#
+-# From Oscar van Vlijmen (2001-08-25): [This region consists of]
+-# Respublika Altaj, Altajskij kraj, Omskaya oblast'.
+-Zone Asia/Omsk 4:53:36 - LMT 1919 Nov 14
+- 5:00 - OMST 1930 Jun 21 # Omsk TIme
+- 6:00 Russia OMS%sT 1991 Mar 31 2:00s
+- 5:00 Russia OMS%sT 1992 Jan 19 2:00s
+- 6:00 Russia OMS%sT 2011 Mar 27 2:00s
+- 7:00 - OMST
+-#
++ 5:00 Russia SVE%sT 1991 Mar 31 2:00s
++ 4:00 Russia SVE%sT 1992 Jan 19 2:00s
++ 5:00 Russia YEK%sT 2011 Mar 27 2:00s
++ 6:00 - YEKT 2014 Oct 26 2:00s
++ 5:00 - YEKT
++
++
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# Asia/Omsk covers...
++# 04 RU-AL Altai Republic
++# 22 RU-ALT Altai Krai
++# 55 RU-OMS Omsk Oblast
++
++# Byalokoz 1919 says Omsk was 4:53:30.
++
++Zone Asia/Omsk 4:53:30 - LMT 1919 Nov 14
++ 5:00 - OMST 1930 Jun 21 # Omsk Time
++ 6:00 Russia OMS%sT 1991 Mar 31 2:00s
++ 5:00 Russia OMS%sT 1992 Jan 19 2:00s
++ 6:00 Russia OMS%sT 2011 Mar 27 2:00s
++ 7:00 - OMST 2014 Oct 26 2:00s
++ 6:00 - OMST
++
++
++# From Tim Parenti (2014-07-03):
++# Asia/Novosibirsk covers...
++# 54 RU-NVS Novosibirsk Oblast
++# 70 RU-TOM Tomsk Oblast
++
+ # From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
+ # not clear when it switched from +7 to +6.
+-# Novosibirskaya oblast', Tomskaya oblast'.
+-Zone Asia/Novosibirsk 5:31:40 - LMT 1919 Dec 14 6:00
++
++Zone Asia/Novosibirsk 5:31:40 - LMT 1919 Dec 14 6:00
+ 6:00 - NOVT 1930 Jun 21 # Novosibirsk Time
+- 7:00 Russia NOV%sT 1991 Mar 31 2:00s
+- 6:00 Russia NOV%sT 1992 Jan 19 2:00s
++ 7:00 Russia NOV%sT 1991 Mar 31 2:00s
++ 6:00 Russia NOV%sT 1992 Jan 19 2:00s
+ 7:00 Russia NOV%sT 1993 May 23 # say Shanks & P.
+- 6:00 Russia NOV%sT 2011 Mar 27 2:00s
+- 7:00 - NOVT
++ 6:00 Russia NOV%sT 2011 Mar 27 2:00s
++ 7:00 - NOVT 2014 Oct 26 2:00s
++ 6:00 - NOVT
++
++
++# From Tim Parenti (2014-07-03):
++# Asia/Novokuznetsk covers...
++# 42 RU-KEM Kemerovo Oblast
+
+ # From Alexander Krivenyshev (2009-10-13):
+ # Kemerovo oblast' (Kemerovo region) in Russia will change current time zone on
+@@ -2319,14 +2530,10 @@
+ # time zone." ("Russia Zone 5" or old "USSR Zone 5" is GMT +0600)
+ #
+ # Russian Government web site (Russian language)
+-# <a href="http://www.government.ru/content/governmentactivity/rfgovernmentdecisions/archiv">
+ # http://www.government.ru/content/governmentactivity/rfgovernmentdecisions/archive/2009/09/14/991633.htm
+-# </a>
+ # or Russian-English translation by WorldTimeZone.com with reference
+ # map to local region and new Russia Time Zone map after March 28, 2010
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_russia03.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_russia03.html
+-# </a>
+ #
+ # Thus, when Russia will switch to DST on the night of March 28, 2010
+ # Kemerovo region (Kemerovo oblast') will not change the clock.
+@@ -2334,152 +2541,319 @@
+ # As a result, Kemerovo oblast' will be in the same time zone as
+ # Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
+
+-Zone Asia/Novokuznetsk 5:48:48 - NMT 1920 Jan 6
++# From Tim Parenti (2014-07-02), per Alexander Krivenyshev (2014-07-02):
++# The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
++# realigning itself with KRAT.
++
++Zone Asia/Novokuznetsk 5:48:48 - LMT 1924 May 1
+ 6:00 - KRAT 1930 Jun 21 # Krasnoyarsk Time
+- 7:00 Russia KRA%sT 1991 Mar 31 2:00s
+- 6:00 Russia KRA%sT 1992 Jan 19 2:00s
+- 7:00 Russia KRA%sT 2010 Mar 28 2:00s
+- 6:00 Russia NOV%sT 2011 Mar 27 2:00s
+- 7:00 - NOVT # Novosibirsk/Novokuznetsk Time
++ 7:00 Russia KRA%sT 1991 Mar 31 2:00s
++ 6:00 Russia KRA%sT 1992 Jan 19 2:00s
++ 7:00 Russia KRA%sT 2010 Mar 28 2:00s
++ 6:00 Russia NOV%sT 2011 Mar 27 2:00s # Novosibirsk
++ 7:00 - NOVT 2014 Oct 26 2:00s
++ 7:00 - KRAT # Krasnoyarsk Time
+
++
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# Asia/Krasnoyarsk covers...
++# 17 RU-TY Tuva Republic
++# 19 RU-KK Khakassia, Republic of
++# 24 RU-KYA Krasnoyarsk Krai
+ #
+-# From Oscar van Vlijmen (2001-08-25): [This region consists of]
+-# Krasnoyarskij kraj,
+-# Tajmyrskij (Dolgano-Nenetskij) avtonomnyj okrug,
+-# Respublika Tuva, Respublika Khakasiya, Evenkijskij avtonomnyj okrug.
+-Zone Asia/Krasnoyarsk 6:11:20 - LMT 1920 Jan 6
++# Note: Effective 2007-01-01, (88) Evenk Autonomous Okrug and (84) Taymyr
++# Autonomous Okrug were merged into (24, RU-KYA) Krasnoyarsk Krai.
++
++# Byalokoz 1919 says Krasnoyarsk was 6:11:26.
++
++Zone Asia/Krasnoyarsk 6:11:26 - LMT 1920 Jan 6
+ 6:00 - KRAT 1930 Jun 21 # Krasnoyarsk Time
+- 7:00 Russia KRA%sT 1991 Mar 31 2:00s
+- 6:00 Russia KRA%sT 1992 Jan 19 2:00s
+- 7:00 Russia KRA%sT 2011 Mar 27 2:00s
+- 8:00 - KRAT
++ 7:00 Russia KRA%sT 1991 Mar 31 2:00s
++ 6:00 Russia KRA%sT 1992 Jan 19 2:00s
++ 7:00 Russia KRA%sT 2011 Mar 27 2:00s
++ 8:00 - KRAT 2014 Oct 26 2:00s
++ 7:00 - KRAT
++
++
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# Asia/Irkutsk covers...
++# 03 RU-BU Buryatia, Republic of
++# 38 RU-IRK Irkutsk Oblast
+ #
+-# From Oscar van Vlijmen (2001-08-25): [This region consists of]
+-# Respublika Buryatiya, Irkutskaya oblast',
+-# Ust'-Ordynskij Buryatskij avtonomnyj okrug.
+-Zone Asia/Irkutsk 6:57:20 - LMT 1880
+- 6:57:20 - IMT 1920 Jan 25 # Irkutsk Mean Time
++# Note: Effective 2008-01-01, (85) Ust-Orda Buryat Autonomous Okrug was
++# merged into (38, RU-IRK) Irkutsk Oblast.
++
++# Milne 1899 says Irkutsk was 6:57:15.
++# Byalokoz 1919 says Irkutsk was 6:57:05.
++# Go with Byalokoz.
++
++Zone Asia/Irkutsk 6:57:05 - LMT 1880
++ 6:57:05 - IMT 1920 Jan 25 # Irkutsk Mean Time
+ 7:00 - IRKT 1930 Jun 21 # Irkutsk Time
+- 8:00 Russia IRK%sT 1991 Mar 31 2:00s
+- 7:00 Russia IRK%sT 1992 Jan 19 2:00s
+- 8:00 Russia IRK%sT 2011 Mar 27 2:00s
+- 9:00 - IRKT
++ 8:00 Russia IRK%sT 1991 Mar 31 2:00s
++ 7:00 Russia IRK%sT 1992 Jan 19 2:00s
++ 8:00 Russia IRK%sT 2011 Mar 27 2:00s
++ 9:00 - IRKT 2014 Oct 26 2:00s
++ 8:00 - IRKT
++
++
++# From Tim Parenti (2014-07-06):
++# Asia/Chita covers...
++# 92 RU-ZAB Zabaykalsky Krai
+ #
+-# From Oscar van Vlijmen (2003-10-18): [This region consists of]
+-# Aginskij Buryatskij avtonomnyj okrug, Amurskaya oblast',
+-# [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
++# Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
++# Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
+
+-# From Oscar van Vlijmen (2009-11-29):
+-# ...some regions of [Russia] were merged with others since 2005...
+-# Some names were changed, no big deal, except for one instance: a new name.
+-# YAK/YAKST: UTC+9 Zabajkal'skij kraj.
++Zone Asia/Chita 7:33:52 - LMT 1919 Dec 15
++ 8:00 - YAKT 1930 Jun 21 # Yakutsk Time
++ 9:00 Russia YAK%sT 1991 Mar 31 2:00s
++ 8:00 Russia YAK%sT 1992 Jan 19 2:00s
++ 9:00 Russia YAK%sT 2011 Mar 27 2:00s
++ 10:00 - YAKT 2014 Oct 26 2:00s
++ 8:00 - IRKT
+
+-# From Oscar van Vlijmen (2009-11-29):
+-# The Sakha districts are: Aldanskij, Amginskij, Anabarskij,
+-# Verkhnevilyujskij, Vilyujskij, Gornyj,
+-# Zhiganskij, Kobyajskij, Lenskij, Megino-Kangalasskij, Mirninskij,
+-# Namskij, Nyurbinskij, Olenyokskij, Olyokminskij,
+-# Suntarskij, Tattinskij, Ust'-Aldanskij, Khangalasskij,
+-# Churapchinskij, Eveno-Bytantajskij Natsional'nij.
+
+-Zone Asia/Yakutsk 8:38:40 - LMT 1919 Dec 15
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
++# Asia/Yakutsk covers...
++# 28 RU-AMU Amur Oblast
++#
++# ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
++# 14-02 **** Aldansky District
++# 14-04 **** Amginsky District
++# 14-05 **** Anabarsky District
++# 14-06 **** Bulunsky District
++# 14-07 **** Verkhnevilyuysky District
++# 14-10 **** Vilyuysky District
++# 14-11 **** Gorny District
++# 14-12 **** Zhigansky District
++# 14-13 **** Kobyaysky District
++# 14-14 **** Lensky District
++# 14-15 **** Megino-Kangalassky District
++# 14-16 **** Mirninsky District
++# 14-18 **** Namsky District
++# 14-19 **** Neryungrinsky District
++# 14-21 **** Nyurbinsky District
++# 14-23 **** Olenyoksky District
++# 14-24 **** Olyokminsky District
++# 14-26 **** Suntarsky District
++# 14-27 **** Tattinsky District
++# 14-29 **** Ust-Aldansky District
++# 14-32 **** Khangalassky District
++# 14-33 **** Churapchinsky District
++# 14-34 **** Eveno-Bytantaysky National District
++
++# From Tim Parenti (2014-07-03):
++# Our commentary seems to have lost mention of (14-19) Neryungrinsky District.
++# Since the surrounding districts of Sakha are all YAKT, assume this is, too.
++# Also assume its history has been the same as the rest of Asia/Yakutsk.
++
++# Byalokoz 1919 says Yakutsk was 8:38:58.
++
++Zone Asia/Yakutsk 8:38:58 - LMT 1919 Dec 15
+ 8:00 - YAKT 1930 Jun 21 # Yakutsk Time
+- 9:00 Russia YAK%sT 1991 Mar 31 2:00s
+- 8:00 Russia YAK%sT 1992 Jan 19 2:00s
+- 9:00 Russia YAK%sT 2011 Mar 27 2:00s
+- 10:00 - YAKT
++ 9:00 Russia YAK%sT 1991 Mar 31 2:00s
++ 8:00 Russia YAK%sT 1992 Jan 19 2:00s
++ 9:00 Russia YAK%sT 2011 Mar 27 2:00s
++ 10:00 - YAKT 2014 Oct 26 2:00s
++ 9:00 - YAKT
++
++
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
++# Asia/Vladivostok covers...
++# 25 RU-PRI Primorsky Krai
++# 27 RU-KHA Khabarovsk Krai
++# 79 RU-YEV Jewish Autonomous Oblast
+ #
+-# From Oscar van Vlijmen (2003-10-18): [This region consists of]
+-# Evrejskaya avtonomnaya oblast', Khabarovskij kraj, Primorskij kraj,
+-# [parts of] Respublika Sakha (Yakutiya).
++# ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
++# 14-09 **** Verkhoyansky District
++# 14-31 **** Ust-Yansky District
+
+-# From Oscar van Vlijmen (2009-11-29):
+-# The Sakha districts are: Bulunskij, Verkhoyanskij, ... Ust'-Yanskij.
+-Zone Asia/Vladivostok 8:47:44 - LMT 1922 Nov 15
++# Milne 1899 says Vladivostok was 8:47:33.5.
++# Byalokoz 1919 says Vladivostok was 8:47:31.
++# Go with Byalokoz.
++
++Zone Asia/Vladivostok 8:47:31 - LMT 1922 Nov 15
+ 9:00 - VLAT 1930 Jun 21 # Vladivostok Time
+- 10:00 Russia VLA%sT 1991 Mar 31 2:00s
+- 9:00 Russia VLA%sST 1992 Jan 19 2:00s
+- 10:00 Russia VLA%sT 2011 Mar 27 2:00s
+- 11:00 - VLAT
++ 10:00 Russia VLA%sT 1991 Mar 31 2:00s
++ 9:00 Russia VLA%sT 1992 Jan 19 2:00s
++ 10:00 Russia VLA%sT 2011 Mar 27 2:00s
++ 11:00 - VLAT 2014 Oct 26 2:00s
++ 10:00 - VLAT
++
++
++# From Tim Parenti (2014-07-03):
++# Asia/Khandyga covers parts of (14, RU-SA) Sakha (Yakutia) Republic:
++# 14-28 **** Tomponsky District
++# 14-30 **** Ust-Maysky District
+
+ # From Arthur David Olson (2012-05-09):
+ # Tomponskij and Ust'-Majskij switched from Vladivostok time to Yakutsk time
+ # in 2011.
+-#
++
+ # From Paul Eggert (2012-11-25):
+ # Shanks and Pottenger (2003) has Khandyga on Yakutsk time.
+ # Make a wild guess that it switched to Vladivostok time in 2004.
+ # This transition is no doubt wrong, but we have no better info.
+-#
++
+ Zone Asia/Khandyga 9:02:13 - LMT 1919 Dec 15
+ 8:00 - YAKT 1930 Jun 21 # Yakutsk Time
+- 9:00 Russia YAK%sT 1991 Mar 31 2:00s
+- 8:00 Russia YAK%sT 1992 Jan 19 2:00s
++ 9:00 Russia YAK%sT 1991 Mar 31 2:00s
++ 8:00 Russia YAK%sT 1992 Jan 19 2:00s
+ 9:00 Russia YAK%sT 2004
+- 10:00 Russia VLA%sT 2011 Mar 27 2:00s
+- 11:00 - VLAT 2011 Sep 13 0:00s # Decree 725?
+- 10:00 - YAKT
++ 10:00 Russia VLA%sT 2011 Mar 27 2:00s
++ 11:00 - VLAT 2011 Sep 13 0:00s # Decree 725?
++ 10:00 - YAKT 2014 Oct 26 2:00s
++ 9:00 - YAKT
+
+-#
+-# Sakhalinskaya oblast'.
+-# The Zone name should be Yuzhno-Sakhalinsk, but that's too long.
++
++# From Tim Parenti (2014-07-03):
++# Asia/Sakhalin covers...
++# 65 RU-SAK Sakhalin Oblast
++# ...with the exception of:
++# 65-11 **** Severo-Kurilsky District (North Kuril Islands)
++
++# The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
+ Zone Asia/Sakhalin 9:30:48 - LMT 1905 Aug 23
+- 9:00 - CJT 1938
++ 9:00 - JCST 1937 Oct 1
+ 9:00 - JST 1945 Aug 25
+- 11:00 Russia SAK%sT 1991 Mar 31 2:00s # Sakhalin T.
+- 10:00 Russia SAK%sT 1992 Jan 19 2:00s
+- 11:00 Russia SAK%sT 1997 Mar lastSun 2:00s
+- 10:00 Russia SAK%sT 2011 Mar 27 2:00s
+- 11:00 - SAKT
+-#
+-# From Oscar van Vlijmen (2003-10-18): [This region consists of]
+-# Magadanskaya oblast', Respublika Sakha (Yakutiya).
+-# Probably also: Kuril Islands.
++ 11:00 Russia SAK%sT 1991 Mar 31 2:00s # Sakhalin T
++ 10:00 Russia SAK%sT 1992 Jan 19 2:00s
++ 11:00 Russia SAK%sT 1997 Mar lastSun 2:00s
++ 10:00 Russia SAK%sT 2011 Mar 27 2:00s
++ 11:00 - SAKT 2014 Oct 26 2:00s
++ 10:00 - SAKT
+
+-# From Oscar van Vlijmen (2009-11-29):
+-# The Sakha districts are: Abyjskij, Allaikhovskij, Verkhhhnekolymskij, Momskij,
+-# Nizhnekolymskij, ... Srednekolymskij.
++
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
++# Asia/Magadan covers...
++# 49 RU-MAG Magadan Oblast
++
++# From Tim Parenti (2014-07-06), per Alexander Krivenyshev (2014-07-02):
++# Magadan Oblast is moving from UTC+12 to UTC+10 on 2014-10-26; however,
++# several districts of Sakha Republic as well as Severo-Kurilsky District of
++# the Sakhalin Oblast (also known as the North Kuril Islands), represented
++# until now by Asia/Magadan, will instead move to UTC+11. These regions will
++# need their own zone.
++
+ Zone Asia/Magadan 10:03:12 - LMT 1924 May 2
+ 10:00 - MAGT 1930 Jun 21 # Magadan Time
+- 11:00 Russia MAG%sT 1991 Mar 31 2:00s
+- 10:00 Russia MAG%sT 1992 Jan 19 2:00s
+- 11:00 Russia MAG%sT 2011 Mar 27 2:00s
+- 12:00 - MAGT
++ 11:00 Russia MAG%sT 1991 Mar 31 2:00s
++ 10:00 Russia MAG%sT 1992 Jan 19 2:00s
++ 11:00 Russia MAG%sT 2011 Mar 27 2:00s
++ 12:00 - MAGT 2014 Oct 26 2:00s
++ 10:00 - MAGT
++
++
++# From Tim Parenti (2014-07-06):
++# Asia/Srednekolymsk covers parts of (14, RU-SA) Sakha (Yakutia) Republic:
++# 14-01 **** Abyysky District
++# 14-03 **** Allaikhovsky District
++# 14-08 **** Verkhnekolymsky District
++# 14-17 **** Momsky District
++# 14-20 **** Nizhnekolymsky District
++# 14-25 **** Srednekolymsky District
++#
++# ...and parts of (65, RU-SAK) Sakhalin Oblast:
++# 65-11 **** Severo-Kurilsky District (North Kuril Islands)
++
++# From Tim Parenti (2014-07-02):
++# Oymyakonsky District of Sakha Republic (represented by Ust-Nera), along with
++# most of Sakhalin Oblast (represented by Sakhalin) will be moving to UTC+10 on
++# 2014-10-26 to stay aligned with VLAT/SAKT; however, Severo-Kurilsky District
++# of the Sakhalin Oblast (also known as the North Kuril Islands, represented by
++# Severo-Kurilsk) will remain on UTC+11.
++
++# From Tim Parenti (2014-07-06):
++# Assume North Kuril Islands have history like Magadan before 2011-03-27.
++# There is a decent chance this is wrong, in which case a new zone
++# Asia/Severo-Kurilsk would become necessary.
++#
++# Srednekolymsk and Zyryanka are the most populous places amongst these
++# districts, but have very similar populations. In fact, Wikipedia currently
++# lists them both as having 3528 people, exactly 1668 males and 1860 females
++# each! (Yikes!)
++# http://en.wikipedia.org/w/?title=Srednekolymsky_District&oldid=603435276
++# http://en.wikipedia.org/w/?title=Verkhnekolymsky_District&oldid=594378493
++# Assume this is a mistake, albeit an amusing one.
++#
++# Looking at censuses, the populations of the two municipalities seem to have
++# fluctuated recently. Zyryanka was more populous than Srednekolymsk in the
++# 1989 and 2002 censuses, but Srednekolymsk was more populous in the most
++# recent (2010) census, 3525 to 3170. (See pages 195 and 197 of
++# http://www.gks.ru/free_doc/new_site/perepis2010/croc/Documents/Vol1/pub-01-05.pdf
++# in Russian.) In addition, Srednekolymsk appears to be a much older
++# settlement and the population of Zyryanka seems to be declining.
++# Go with Srednekolymsk.
++#
++# Since Magadan Oblast moves to UTC+10 on 2014-10-26, we cannot keep using MAGT
++# as the abbreviation. Use SRET instead.
++
++Zone Asia/Srednekolymsk 10:14:52 - LMT 1924 May 2
++ 10:00 - MAGT 1930 Jun 21 # Magadan Time
++ 11:00 Russia MAG%sT 1991 Mar 31 2:00s
++ 10:00 Russia MAG%sT 1992 Jan 19 2:00s
++ 11:00 Russia MAG%sT 2011 Mar 27 2:00s
++ 12:00 - MAGT 2014 Oct 26 2:00s
++ 11:00 - SRET # Srednekolymsk Time
++
++
++# From Tim Parenti (2014-07-03):
++# Asia/Ust-Nera covers parts of (14, RU-SA) Sakha (Yakutia) Republic:
++# 14-22 **** Oymyakonsky District
+
+ # From Arthur David Olson (2012-05-09):
+-# Ojmyakonskij and the Kuril Islands switched from
++# Ojmyakonskij [and the Kuril Islands] switched from
+ # Magadan time to Vladivostok time in 2011.
++#
++# From Tim Parenti (2014-07-06), per Alexander Krivenyshev (2014-07-02):
++# It's unlikely that any of the Kuril Islands were involved in such a switch,
++# as the South and Middle Kurils have been on UTC+11 (SAKT) with the rest of
++# Sakhalin Oblast since at least 2011-09, and the North Kurils have been on
++# UTC+12 since at least then, too.
++
+ Zone Asia/Ust-Nera 9:32:54 - LMT 1919 Dec 15
+ 8:00 - YAKT 1930 Jun 21 # Yakutsk Time
+ 9:00 Russia YAKT 1981 Apr 1
+- 11:00 Russia MAG%sT 1991 Mar 31 2:00s
+- 10:00 Russia MAG%sT 1992 Jan 19 2:00s
+- 11:00 Russia MAG%sT 2011 Mar 27 2:00s
+- 12:00 - MAGT 2011 Sep 13 0:00s # Decree 725?
+- 11:00 - VLAT
++ 11:00 Russia MAG%sT 1991 Mar 31 2:00s
++ 10:00 Russia MAG%sT 1992 Jan 19 2:00s
++ 11:00 Russia MAG%sT 2011 Mar 27 2:00s
++ 12:00 - MAGT 2011 Sep 13 0:00s # Decree 725?
++ 11:00 - VLAT 2014 Oct 26 2:00s
++ 10:00 - VLAT
+
+-# From Oscar van Vlijmen (2001-08-25): [This region consists of]
+-# Kamchatskaya oblast', Koryakskij avtonomnyj okrug.
++
++# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
++# Asia/Kamchatka covers...
++# 91 RU-KAM Kamchatka Krai
+ #
+-# The Zone name should be Asia/Petropavlovsk-Kamchatski, but that's too long.
++# Note: Effective 2007-07-01, (41) Kamchatka Oblast and (82) Koryak
++# Autonomous Okrug merged to form (91, RU-KAM) Kamchatka Krai.
++
++# The Zone name should be Asia/Petropavlovsk-Kamchatski or perhaps
++# Asia/Petropavlovsk-Kamchatsky, but these are too long.
+ Zone Asia/Kamchatka 10:34:36 - LMT 1922 Nov 10
+ 11:00 - PETT 1930 Jun 21 # P-K Time
+- 12:00 Russia PET%sT 1991 Mar 31 2:00s
+- 11:00 Russia PET%sT 1992 Jan 19 2:00s
+- 12:00 Russia PET%sT 2010 Mar 28 2:00s
+- 11:00 Russia PET%sT 2011 Mar 27 2:00s
++ 12:00 Russia PET%sT 1991 Mar 31 2:00s
++ 11:00 Russia PET%sT 1992 Jan 19 2:00s
++ 12:00 Russia PET%sT 2010 Mar 28 2:00s
++ 11:00 Russia PET%sT 2011 Mar 27 2:00s
+ 12:00 - PETT
+-#
+-# Chukotskij avtonomnyj okrug
++
++
++# From Tim Parenti (2014-07-03):
++# Asia/Anadyr covers...
++# 87 RU-CHU Chukotka Autonomous Okrug
++
+ Zone Asia/Anadyr 11:49:56 - LMT 1924 May 2
+ 12:00 - ANAT 1930 Jun 21 # Anadyr Time
+- 13:00 Russia ANA%sT 1982 Apr 1 0:00s
+- 12:00 Russia ANA%sT 1991 Mar 31 2:00s
+- 11:00 Russia ANA%sT 1992 Jan 19 2:00s
+- 12:00 Russia ANA%sT 2010 Mar 28 2:00s
+- 11:00 Russia ANA%sT 2011 Mar 27 2:00s
++ 13:00 Russia ANA%sT 1982 Apr 1 0:00s
++ 12:00 Russia ANA%sT 1991 Mar 31 2:00s
++ 11:00 Russia ANA%sT 1992 Jan 19 2:00s
++ 12:00 Russia ANA%sT 2010 Mar 28 2:00s
++ 11:00 Russia ANA%sT 2011 Mar 27 2:00s
+ 12:00 - ANAT
+
++
+ # San Marino
+ # See Europe/Rome.
+
+@@ -2488,11 +2862,11 @@
+ Zone Europe/Belgrade 1:22:00 - LMT 1884
+ 1:00 - CET 1941 Apr 18 23:00
+ 1:00 C-Eur CE%sT 1945
+- 1:00 - CET 1945 May 8 2:00s
++ 1:00 - CET 1945 May 8 2:00s
+ 1:00 1:00 CEST 1945 Sep 16 2:00s
+-# Metod Kozelj reports that the legal date of
++# Metod Koželj reports that the legal date of
+ # transition to EU rules was 1982-11-27, for all of Yugoslavia at the time.
+-# Shanks & Pottenger don't give as much detail, so go with Kozelj.
++# Shanks & Pottenger don't give as much detail, so go with Koželj.
+ 1:00 - CET 1982 Nov 27
+ 1:00 EU CE%sT
+ Link Europe/Belgrade Europe/Ljubljana # Slovenia
+@@ -2568,13 +2942,13 @@
+ 0:00 1:00 WEST 1918 Oct 7 23:00
+ 0:00 - WET 1924
+ 0:00 Spain WE%sT 1929
+- 0:00 SpainAfrica WE%sT 1984 Mar 16
++ 0:00 SpainAfrica WE%sT 1984 Mar 16
+ 1:00 - CET 1986
+ 1:00 EU CE%sT
+ Zone Atlantic/Canary -1:01:36 - LMT 1922 Mar # Las Palmas de Gran C.
+- -1:00 - CANT 1946 Sep 30 1:00 # Canaries Time
+- 0:00 - WET 1980 Apr 6 0:00s
+- 0:00 1:00 WEST 1980 Sep 28 0:00s
++ -1:00 - CANT 1946 Sep 30 1:00 # Canaries T
++ 0:00 - WET 1980 Apr 6 0:00s
++ 0:00 1:00 WEST 1980 Sep 28 0:00s
+ 0:00 EU WE%sT
+ # IATA SSIM (1996-09) says the Canaries switch at 2:00u, not 1:00u.
+ # Ignore this for now, as the Canaries are part of the EU.
+@@ -2583,7 +2957,7 @@
+
+ # From Ivan Nilsson (2001-04-13), superseding Shanks & Pottenger:
+ #
+-# The law "Svensk forfattningssamling 1878, no 14" about standard time in 1879:
++# The law "Svensk författningssamling 1878, no 14" about standard time in 1879:
+ # From the beginning of 1879 (that is 01-01 00:00) the time for all
+ # places in the country is "the mean solar time for the meridian at
+ # three degrees, or twelve minutes of time, to the west of the
+@@ -2594,7 +2968,7 @@
+ # national standard time as 01:00:14 ahead of GMT....
+ #
+ # About the beginning of CET in Sweden. The lawtext ("Svensk
+-# forfattningssamling 1899, no 44") states, that "from the beginning
++# författningssamling 1899, no 44") states, that "from the beginning
+ # of 1900... ... the same as the mean solar time for the meridian at
+ # the distance of one hour of time from the meridian of the English
+ # observatory at Greenwich, or at 12 minutes 14 seconds to the west
+@@ -2602,7 +2976,7 @@
+ # 1899-06-16. In short: At 1900-01-01 00:00:00 the new standard time
+ # in Sweden is 01:00:00 ahead of GMT.
+ #
+-# 1916: The lawtext ("Svensk forfattningssamling 1916, no 124") states
++# 1916: The lawtext ("Svensk författningssamling 1916, no 124") states
+ # that "1916-05-15 is considered to begin one hour earlier". It is
+ # pretty obvious that at 05-14 23:00 the clocks are set to 05-15 00:00....
+ # Further the law says, that "1916-09-30 is considered to end one hour later".
+@@ -2612,7 +2986,7 @@
+ # not available on the site (to my knowledge they are only available
+ # in Swedish): <http://www.riksdagen.se/english/work/sfst.asp> (type
+ # "sommartid" without the quotes in the field "Fritext" and then click
+-# the Sok-button).
++# the Sök-button).
+ #
+ # (2001-05-13):
+ #
+@@ -2627,9 +3001,9 @@
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Stockholm 1:12:12 - LMT 1879 Jan 1
+- 1:00:14 - SET 1900 Jan 1 # Swedish Time
++ 1:00:14 - SET 1900 Jan 1 # Swedish Time
+ 1:00 - CET 1916 May 14 23:00
+- 1:00 1:00 CEST 1916 Oct 1 01:00
++ 1:00 1:00 CEST 1916 Oct 1 1:00
+ 1:00 - CET 1980
+ 1:00 EU CE%sT
+
+@@ -2637,7 +3011,7 @@
+ # From Howse:
+ # By the end of the 18th century clocks and watches became commonplace
+ # and their performance improved enormously. Communities began to keep
+-# mean time in preference to apparent time -- Geneva from 1780 ....
++# mean time in preference to apparent time - Geneva from 1780 ....
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ # From Whitman (who writes "Midnight?"):
+ # Rule Swiss 1940 only - Nov 2 0:00 1:00 S
+@@ -2653,7 +3027,7 @@
+ # to be wrong. This is now verified.
+ #
+ # I have found copies of the original ruling by the Swiss Federal
+-# government, in 'Eidgen[o]ssische Gesetzessammlung 1941 and 1942' (Swiss
++# government, in 'Eidgenössische Gesetzessammlung 1941 and 1942' (Swiss
+ # federal law collection)...
+ #
+ # DST began on Monday 5 May 1941, 1:00 am by shifting the clocks to 2:00 am
+@@ -2672,7 +3046,7 @@
+ # night as an absolute novelty, because this was the first time that such
+ # a thing had happened in Switzerland.
+ #
+-# I have also checked 1916, because one book source (Gabriel, Traite de
++# I have also checked 1916, because one book source (Gabriel, Traité de
+ # l'heure dans le monde) claims that Switzerland had DST in 1916. This is
+ # false, no official document could be found. Probably Gabriel got misled
+ # by references to Germany, which introduced DST in 1916 for the first time.
+@@ -2686,19 +3060,19 @@
+ # One further detail for Switzerland, which is probably out of scope for
+ # most users of tzdata: The [Europe/Zurich zone] ...
+ # describes all of Switzerland correctly, with the exception of
+-# the Cantone Geneve (Geneva, Genf). Between 1848 and 1894 Geneve did not
++# the Canton de Genève (Geneva, Genf). Between 1848 and 1894 Geneva did not
+ # follow Bern Mean Time but kept its own local mean time.
+ # To represent this, an extra zone would be needed.
+ #
+ # From Alois Treindl (2013-09-11):
+ # The Federal regulations say
+ # http://www.admin.ch/opc/de/classified-compilation/20071096/index.html
+-# ... the meridian for Bern mean time ... is 7 degrees 26'22.50".
++# ... the meridian for Bern mean time ... is 7 degrees 26' 22.50".
+ # Expressed in time, it is 0h29m45.5s.
+
+ # From Pierre-Yves Berger (2013-09-11):
+-# the "Circulaire du conseil federal" (December 11 1893)
+-# <http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353> ...
++# the "Circulaire du conseil fédéral" (December 11 1893)
++# http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353
+ # clearly states that the [1894-06-01] change should be done at midnight
+ # but if no one is present after 11 at night, could be postponed until one
+ # hour before the beginning of service.
+@@ -2709,14 +3083,14 @@
+ # We can find no reliable source for Shanks's assertion that all of Switzerland
+ # except Geneva switched to Bern Mean Time at 00:00 on 1848-09-12. This book:
+ #
+-# Jakob Messerli. Gleichmassig, punktlich, schnell: Zeiteinteilung und
++# Jakob Messerli. Gleichmässig, pünktlich, schnell. Zeiteinteilung und
+ # Zeitgebrauch in der Schweiz im 19. Jahrhundert. Chronos, Zurich 1995,
+ # ISBN 3-905311-68-2, OCLC 717570797.
+ #
+ # suggests that the transition was more gradual, and that the Swiss did not
+ # agree about civil time during the transition. The timekeeping it gives the
+ # most detail for is postal and telegraph time: here, federal legislation (the
+-# "Bundesgesetz uber die Erstellung von elektrischen Telegraphen") passed on
++# "Bundesgesetz über die Erstellung von elektrischen Telegraphen") passed on
+ # 1851-11-23, and an official implementation notice was published 1853-07-16
+ # (Bundesblatt 1853, Bd. II, S. 859). On p 72 Messerli writes that in
+ # practice since July 1853 Bernese time was used in "all postal and telegraph
+@@ -2730,7 +3104,7 @@
+ Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
+- 0:29:46 - BMT 1894 Jun # Bern Mean Time
++ 0:29:46 - BMT 1894 Jun # Bern Mean Time
+ 1:00 Swiss CE%sT 1981
+ 1:00 EU CE%sT
+
+@@ -2738,7 +3112,7 @@
+
+ # From Amar Devegowda (2007-01-03):
+ # The time zone rules for Istanbul, Turkey have not been changed for years now.
+-# ... The latest rules are available at -
++# ... The latest rules are available at:
+ # http://www.timeanddate.com/worldclock/timezone.html?n=107
+ # From Steffen Thorsen (2007-01-03):
+ # I have been able to find press records back to 1996 which all say that
+@@ -2763,8 +3137,7 @@
+ # (on a non-government server though) describing dates between 2002 and 2006:
+ # http://www.alomaliye.com/bkk_2002_3769.htm
+
+-# From G&ouml;kdeniz Karada&#x011f; (2011-03-10):
+-#
++# From Gökdeniz Karadağ (2011-03-10):
+ # According to the articles linked below, Turkey will change into summer
+ # time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27.
+ # This change is due to a nationwide exam on 27th.
+@@ -2777,9 +3150,16 @@
+ # Turkish Local election....
+ # http://www.sabah.com.tr/Ekonomi/2014/02/12/yaz-saatinde-onemli-degisiklik
+ # ... so Turkey will move clocks forward one hour on March 31 at 3:00 a.m.
+-# From Paul Eggert (2014-02-17):
+-# Here is an English-language source:
+-# http://www.worldbulletin.net/turkey/129016/turkey-switches-to-daylight-saving-time-march-31
++# From Randal L. Schwartz (2014-04-15):
++# Having landed on a flight from the states to Istanbul (via AMS) on March 31,
++# I can tell you that NOBODY (even the airlines) respected this timezone DST
++# change delay. Maybe the word just didn't get out in time.
++# From Paul Eggert (2014-06-15):
++# The press reported massive confusion, as election officials obeyed the rule
++# change but cell phones (and airline baggage systems) did not. See:
++# Kostidis M. Eventful elections in Turkey. Balkan News Agency
++# http://www.balkaneu.com/eventful-elections-turkey/ 2014-03-30.
++# I guess the best we can do is document the official time.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Turkey 1916 only - May 1 0:00 1:00 S
+@@ -2846,10 +3226,10 @@
+ 2:00 Turkey EE%sT 1978 Oct 15
+ 3:00 Turkey TR%sT 1985 Apr 20 # Turkey Time
+ 2:00 Turkey EE%sT 2007
+- 2:00 EU EE%sT 2011 Mar 27 1:00u
+- 2:00 - EET 2011 Mar 28 1:00u
+- 2:00 EU EE%sT 2014 Mar 30 1:00u
+- 2:00 - EET 2014 Mar 31 1:00u
++ 2:00 EU EE%sT 2011 Mar 27 1:00u
++ 2:00 - EET 2011 Mar 28 1:00u
++ 2:00 EU EE%sT 2014 Mar 30 1:00u
++ 2:00 - EET 2014 Mar 31 1:00u
+ 2:00 EU EE%sT
+ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
+
+@@ -2870,7 +3250,7 @@
+ # Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
+ # approval from 266 deputies.
+ #
+-# Ukraine abolishes transter back to the winter time (in Russian)
++# Ukraine abolishes transfer back to the winter time (in Russian)
+ # http://news.mail.ru/politics/6861560/
+ #
+ # The Ukrainians will no longer change the clock (in Russian)
+@@ -2931,12 +3311,12 @@
+ 2:00 - EET 1930 Jun 21
+ 3:00 - MSK 1941 Sep 20
+ 1:00 C-Eur CE%sT 1943 Nov 6
+- 3:00 Russia MSK/MSD 1990 Jul 1 2:00
+- 2:00 1:00 EEST 1991 Sep 29 3:00
++ 3:00 Russia MSK/MSD 1990 Jul 1 2:00
++ 2:00 1:00 EEST 1991 Sep 29 3:00
+ 2:00 E-Eur EE%sT 1995
+ 2:00 EU EE%sT
+ # Ruthenia used CET 1990/1991.
+-# "Uzhhorod" is the transliteration of the Ukrainian name, but
++# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
+ # "Uzhgorod" is more common in English.
+ Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
+ 1:00 - CET 1940
+@@ -2944,8 +3324,8 @@
+ 1:00 1:00 CEST 1944 Oct 26
+ 1:00 - CET 1945 Jun 29
+ 3:00 Russia MSK/MSD 1990
+- 3:00 - MSK 1990 Jul 1 2:00
+- 1:00 - CET 1991 Mar 31 3:00
++ 3:00 - MSK 1990 Jul 1 2:00
++ 1:00 - CET 1991 Mar 31 3:00
+ 2:00 - EET 1992
+ 2:00 E-Eur EE%sT 1995
+ 2:00 EU EE%sT
+@@ -2959,42 +3339,9 @@
+ 2:00 - EET 1930 Jun 21
+ 3:00 - MSK 1941 Aug 25
+ 1:00 C-Eur CE%sT 1943 Oct 25
+- 3:00 Russia MSK/MSD 1991 Mar 31 2:00
++ 3:00 Russia MSK/MSD 1991 Mar 31 2:00
+ 2:00 E-Eur EE%sT 1995
+ 2:00 EU EE%sT
+-# Central Crimea used Moscow time 1994/1997.
+-Zone Europe/Simferopol 2:16:24 - LMT 1880
+- 2:16 - SMT 1924 May 2 # Simferopol Mean T
+- 2:00 - EET 1930 Jun 21
+- 3:00 - MSK 1941 Nov
+- 1:00 C-Eur CE%sT 1944 Apr 13
+- 3:00 Russia MSK/MSD 1990
+- 3:00 - MSK 1990 Jul 1 2:00
+- 2:00 - EET 1992
+-# From Paul Eggert (2006-03-22):
+-# The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
+-# from Kiev to Moscow time sometime after the January 1994 elections.
+-# Shanks (1999) says "date of change uncertain", but implies that it happened
+-# sometime between the 1994 DST switches. Shanks & Pottenger simply say
+-# 1994-09-25 03:00, but that can't be right. For now, guess it
+-# changed in May.
+- 2:00 E-Eur EE%sT 1994 May
+-# From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
+- 3:00 E-Eur MSK/MSD 1996 Mar 31 3:00s
+- 3:00 1:00 MSD 1996 Oct 27 3:00s
+-# IATA SSIM (1997-09) says Crimea switched to EET/EEST.
+-# Assume it happened in March by not changing the clocks.
+- 3:00 Russia MSK/MSD 1997
+- 3:00 - MSK 1997 Mar lastSun 1:00u
+-# From Alexander Krivenyshev (2014-03-17):
+-# time change at 2:00 (2am) on March 30, 2014
+-# http://vz.ru/news/2014/3/17/677464.html
+-# From Paul Eggert (2014-03-30):
+-# Simferopol and Sevastopol reportedly changed their central town clocks
+-# late the previous day, but this appears to have been ceremonial
+-# and the discrepancies are small enough to not worry about.
+- 2:00 EU EE%sT 2014 Mar 30 2:00
+- 4:00 - MSK
+
+ # Vatican City
+ # See Europe/Rome.
+@@ -3018,7 +3365,7 @@
+ # ...
+ #
+ # ...the European time rules are...standardized since 1981, when
+-# most European coun[tr]ies started DST. Before that year, only
++# most European countries started DST. Before that year, only
+ # a few countries (UK, France, Italy) had DST, each according
+ # to own national rules. In 1981, however, DST started on
+ # 'Apr firstSun', and not on 'Mar lastSun' as in the following
+@@ -3026,7 +3373,7 @@
+ # But also since 1981 there are some more national exceptions
+ # than listed in 'europe': Switzerland, for example, joined DST
+ # one year later, Denmark ended DST on 'Oct 1' instead of 'Sep
+-# lastSun' in 1981---I don't know how they handle now.
++# lastSun' in 1981 - I don't know how they handle now.
+ #
+ # Finally, DST ist always from 'Apr 1' to 'Oct 1' in the
+ # Soviet Union (as far as I know).
+--- ./jdk/make/sun/javazic/tzdata/factory Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/factory Mon Jan 05 11:57:27 2015 -0800
+@@ -21,7 +21,6 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+--- ./jdk/make/sun/javazic/tzdata/iso3166.tab Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/iso3166.tab Mon Jan 05 11:57:27 2015 -0800
+@@ -26,21 +26,21 @@
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ #
+-# From Paul Eggert (2013-05-27):
++# From Paul Eggert (2014-07-18):
++# This file contains a table of two-letter country codes. Columns are
++# separated by a single tab. Lines beginning with '#' are comments.
++# Although all text currently uses ASCII encoding, this is planned to
++# change to UTF-8 soon. The columns of the table are as follows:
+ #
+-# This file contains a table with the following columns:
+ # 1. ISO 3166-1 alpha-2 country code, current as of
+-# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166
++# ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166
+ # http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
+ # 2. The usual English name for the coded region,
+ # chosen so that alphabetic sorting of subsets produces helpful lists.
+ # This is not the same as the English name in the ISO 3166 tables.
+ #
+-# Columns are separated by a single tab.
+ # The table is sorted by country code.
+ #
+-# Lines beginning with `#' are comments.
+-#
+ # This table is intended as an aid for users, to help them select time
+ # zone data appropriate for their practical needs. It is not intended
+ # to take or endorse any position on legal or territorial claims.
+--- ./jdk/make/sun/javazic/tzdata/leapseconds Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/leapseconds Mon Jan 05 11:57:27 2015 -0800
+@@ -21,7 +21,7 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# Allowance for leapseconds added to each timezone file.
++# Allowance for leap seconds added to each time zone file.
+
+ # This file is in the public domain.
+
+@@ -31,10 +31,10 @@
+ # you should be able to pick up leap-seconds.list from a secondary NIST server.
+ # For more about leap-seconds.list, please see
+ # The NTP Timescale and Leap Seconds
+-# <http://www.eecis.udel.edu/~mills/leap.html>.
++# http://www.eecis.udel.edu/~mills/leap.html
+
+-# The International Earth Rotation Service periodically uses leap seconds
+-# to keep UTC to within 0.9 s of UT1
++# The International Earth Rotation and Reference Systems Service
++# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
+ # (which measures the true angular orientation of the earth in space); see
+ # Terry J Quinn, The BIPM and the accurate measure of time,
+ # Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
+--- ./jdk/make/sun/javazic/tzdata/northamerica Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/northamerica Mon Jan 05 11:57:27 2015 -0800
+@@ -21,15 +21,15 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+ # also includes Central America and the Caribbean
+
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future). For more, please see
++# the file CONTRIBUTING in the tz distribution.
+
+ # From Paul Eggert (1999-03-22):
+ # A reliable and entertaining source about time zones is
+@@ -78,13 +78,13 @@
+ # to push people into bed earlier, and get them up earlier, to make
+ # them healthy, wealthy and wise in spite of themselves.
+ #
+-# -- Robertson Davies, The diary of Samuel Marchbanks,
++# -- Robertson Davies, The diary of Samuel Marchbanks,
+ # Clarke, Irwin (1947), XIX, Sunday
+ #
+ # For more about the first ten years of DST in the United States, see
+-# Robert Garland's <a href="http://www.clpgh.org/exhibit/dst.html">
+-# Ten years of daylight saving from the Pittsburgh standpoint
+-# (Carnegie Library of Pittsburgh, 1927)</a>.
++# Robert Garland, Ten years of daylight saving from the Pittsburgh standpoint
++# (Carnegie Library of Pittsburgh, 1927).
++# http://www.clpgh.org/exhibit/dst.html
+ #
+ # Shanks says that DST was called "War Time" in the US in 1918 and 1919.
+ # However, DST was imposed by the Standard Time Act of 1918, which
+@@ -103,11 +103,11 @@
+ # From Arthur David Olson (2000-09-25):
+ # Last night I heard part of a rebroadcast of a 1945 Arch Oboler radio drama.
+ # In the introduction, Oboler spoke of "Eastern Peace Time."
+-# An AltaVista search turned up
+-# <a href="http://rowayton.org/rhs/hstaug45.html">:
++# An AltaVista search turned up:
++# http://rowayton.org/rhs/hstaug45.html
+ # "When the time is announced over the radio now, it is 'Eastern Peace
+ # Time' instead of the old familiar 'Eastern War Time.' Peace is wonderful."
+-# </a> (August 1945) by way of confirmation.
++# (August 1945) by way of confirmation.
+
+ # From Joseph Gallant citing
+ # George H. Douglas, _The Early Days of Radio Broadcasting_ (1987):
+@@ -205,7 +205,7 @@
+ # USA ALASKA STD 9 H BEHIND UTC MOST OF ALASKA (AKST)
+ # USA ALASKA STD 8 H BEHIND UTC APR 3 - OCT 30 (AKDT)
+ # USA ALEUTIAN 10 H BEHIND UTC ISLANDS WEST OF 170W
+-# USA - " - 9 H BEHIND UTC APR 3 - OCT 30
++# USA " 9 H BEHIND UTC APR 3 - OCT 30
+ # USA HAWAII 10 H BEHIND UTC
+ # USA BERING 11 H BEHIND UTC SAMOA, MIDWAY
+
+@@ -258,19 +258,19 @@
+ # The following was signed into law on 2005-08-08.
+ #
+ # H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS.
+-# (a) Amendment- Section 3(a) of the Uniform Time Act of 1966 (15
++# (a) Amendment.--Section 3(a) of the Uniform Time Act of 1966 (15
+ # U.S.C. 260a(a)) is amended--
+-# (1) by striking 'first Sunday of April' and inserting 'second
+-# Sunday of March'; and
+-# (2) by striking 'last Sunday of October' and inserting 'first
++# (1) by striking "first Sunday of April" and inserting "second
++# Sunday of March"; and
++# (2) by striking "last Sunday of October" and inserting "first
+ # Sunday of November'.
+-# (b) Effective Date- Subsection (a) shall take effect 1 year after the
++# (b) Effective Date.--Subsection (a) shall take effect 1 year after the
+ # date of enactment of this Act or March 1, 2007, whichever is later.
+-# (c) Report to Congress- Not later than 9 months after the effective
++# (c) Report to Congress.--Not later than 9 months after the effective
+ # date stated in subsection (b), the Secretary shall report to Congress
+ # on the impact of this section on energy consumption in the United
+ # States.
+-# (d) Right to Revert- Congress retains the right to revert the
++# (d) Right to Revert.--Congress retains the right to revert the
+ # Daylight Saving Time back to the 2005 time schedules once the
+ # Department study is complete.
+
+@@ -292,7 +292,7 @@
+
+ # From Paul Eggert (2005-08-26):
+ # According to today's Huntsville Times
+-# <http://www.al.com/news/huntsvilletimes/index.ssf?/base/news/1125047783228320.xml&coll=1>
++# http://www.al.com/news/huntsvilletimes/index.ssf?/base/news/1125047783228320.xml&coll=1
+ # a few towns on Alabama's "eastern border with Georgia, such as Phenix City
+ # in Russell County, Lanett in Chambers County and some towns in Lee County,
+ # set their watches and clocks on Eastern time." It quotes H.H. "Bubba"
+@@ -300,6 +300,12 @@
+ # time zone, but we do go by the Eastern time zone because so many people work
+ # in Columbus."
+
++# From Paul Eggert (2014-09-06):
++# Monthly Notices of the Royal Astronomical Society 44, 4 (1884-02-08), 208
++# says that New York City Hall time was 3 minutes 58.4 seconds fast of
++# Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the
++# nearest second.
++
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
+ Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
+ Rule NYC 1920 only - Oct lastSun 2:00 0 S
+@@ -347,15 +353,15 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24
+ -6:00 US C%sT 1920
+- -6:00 Chicago C%sT 1936 Mar 1 2:00
+- -5:00 - EST 1936 Nov 15 2:00
++ -6:00 Chicago C%sT 1936 Mar 1 2:00
++ -5:00 - EST 1936 Nov 15 2:00
+ -6:00 Chicago C%sT 1942
+ -6:00 US C%sT 1946
+ -6:00 Chicago C%sT 1967
+ -6:00 US C%sT
+ # Oliver County, ND switched from mountain to central time on 1992-10-25.
+ Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48
+- -7:00 US M%sT 1992 Oct 25 02:00
++ -7:00 US M%sT 1992 Oct 25 2:00
+ -6:00 US C%sT
+ # Morton County, ND, switched from mountain to central time on
+ # 2003-10-26, except for the area around Mandan which was already central time.
+@@ -364,29 +370,26 @@
+ # Jones, Mellette, and Todd Counties in South Dakota;
+ # but in practice these other counties were already observing central time.
+ # See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
+-Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
+- -7:00 US M%sT 2003 Oct 26 02:00
++Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
++ -7:00 US M%sT 2003 Oct 26 2:00
+ -6:00 US C%sT
+
+ # From Josh Findley (2011-01-21):
+ # ...it appears that Mercer County, North Dakota, changed from the
+ # mountain time zone to the central time zone at the last transition from
+ # daylight-saving to standard time (on Nov. 7, 2010):
+-# <a href="http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm">
+ # http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm
+-# </a>
+-# <a href="http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html">
+ # http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html
+-# </a>
+
+ # From Andy Lipscomb (2011-01-24):
+ # ...according to the Census Bureau, the largest city is Beulah (although
+ # it's commonly referred to as Beulah-Hazen, with Hazen being the next
+ # largest city in Mercer County). Google Maps places Beulah's city hall
+-# at 4715'51" north, 10146'40" west, which yields an offset of 6h47'07".
++# at 47 degrees 15' 51" N, 101 degrees 46' 40" W, which yields an offset
++# of 6h47'07".
+
+-Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
+- -7:00 US M%sT 2010 Nov 7 2:00
++Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
++ -7:00 US M%sT 2010 Nov 7 2:00
+ -6:00 US C%sT
+
+ # US mountain time, represented by Denver
+@@ -448,15 +451,18 @@
+ # was destroyed in 1805 by a Yakutat-kon war party.) However, there
+ # were nearby inhabitants in some cases and for our purposes perhaps
+ # it's best to simply use the official transition.
++
++# From Paul Eggert (2014-07-18):
++# One opinion of the early-1980s turmoil in Alaska over time zones and
++# daylight saving time appeared as graffiti on a Juneau airport wall:
++# "Welcome to Juneau. Please turn your watch back to the 19th century."
++# See: Turner W. Alaska's four time zones now two. NY Times 1983-11-01.
++# http://www.nytimes.com/1983/11/01/us/alaska-s-four-time-zones-now-two.html
+ #
+-
+-# From Steve Ferguson (2011-01-31):
+-# The author lives in Alaska and many of the references listed are only
+-# available to Alaskan residents.
+-#
+-# <a href="http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98">
+-# http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
+-# </a>
++# Steve Ferguson (2011-01-31) referred to the following source:
++# Norris F. Keeping time in Alaska: national directives, local response.
++# Alaska History 2001;16(1-2).
++# http://alaskahistoricalsociety.org/discover-alaska/glimpses-of-the-past/keeping-time-in-alaska/
+
+ # From Arthur David Olson (2011-02-01):
+ # Here's database-relevant material from the 2001 "Alaska History" article:
+@@ -482,12 +488,10 @@
+ # From Arthur David Olson (2011-02-09):
+ # I just spoke by phone with a staff member at the Metlakatla Indian
+ # Community office (using contact information available at
+-# <a href="http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla">
+ # http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
+-# </a>).
+ # It's shortly after 1:00 here on the east coast of the United States;
+ # the staffer said it was shortly after 10:00 there. When I asked whether
+-# that meant they were on Pacific time, they said no--they were on their
++# that meant they were on Pacific time, they said no - they were on their
+ # own time. I asked about daylight saving; they said it wasn't used. I
+ # did not inquire about practices in the past.
+
+@@ -501,9 +505,9 @@
+ -8:00 - PST 1942
+ -8:00 US P%sT 1946
+ -8:00 - PST 1969
+- -8:00 US P%sT 1980 Apr 27 2:00
+- -9:00 US Y%sT 1980 Oct 26 2:00
+- -8:00 US P%sT 1983 Oct 30 2:00
++ -8:00 US P%sT 1980 Apr 27 2:00
++ -9:00 US Y%sT 1980 Oct 26 2:00
++ -8:00 US P%sT 1983 Oct 30 2:00
+ -9:00 US Y%sT 1983 Nov 30
+ -9:00 US AK%sT
+ Zone America/Sitka 14:58:47 - LMT 1867 Oct 18
+@@ -511,7 +515,7 @@
+ -8:00 - PST 1942
+ -8:00 US P%sT 1946
+ -8:00 - PST 1969
+- -8:00 US P%sT 1983 Oct 30 2:00
++ -8:00 US P%sT 1983 Oct 30 2:00
+ -9:00 US Y%sT 1983 Nov 30
+ -9:00 US AK%sT
+ Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 18
+@@ -519,8 +523,8 @@
+ -8:00 - PST 1942
+ -8:00 US P%sT 1946
+ -8:00 - PST 1969
+- -8:00 US P%sT 1983 Oct 30 2:00
+- -8:00 - MeST
++ -8:00 US P%sT 1983 Oct 30 2:00
++ -8:00 - PST
+ Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18
+ -9:18:55 - LMT 1900 Aug 20 12:00
+ -9:00 - YST 1942
+@@ -535,7 +539,7 @@
+ -10:00 US CAT/CAPT 1946 # Peace
+ -10:00 - CAT 1967 Apr
+ -10:00 - AHST 1969
+- -10:00 US AH%sT 1983 Oct 30 2:00
++ -10:00 US AH%sT 1983 Oct 30 2:00
+ -9:00 US Y%sT 1983 Nov 30
+ -9:00 US AK%sT
+ Zone America/Nome 12:58:21 - LMT 1867 Oct 18
+@@ -544,7 +548,7 @@
+ -11:00 US N%sT 1946
+ -11:00 - NST 1967 Apr
+ -11:00 - BST 1969
+- -11:00 US B%sT 1983 Oct 30 2:00
++ -11:00 US B%sT 1983 Oct 30 2:00
+ -9:00 US Y%sT 1983 Nov 30
+ -9:00 US AK%sT
+ Zone America/Adak 12:13:21 - LMT 1867 Oct 18
+@@ -553,7 +557,7 @@
+ -11:00 US N%sT 1946
+ -11:00 - NST 1967 Apr
+ -11:00 - BST 1969
+- -11:00 US B%sT 1983 Oct 30 2:00
++ -11:00 US B%sT 1983 Oct 30 2:00
+ -10:00 US AH%sT 1983 Nov 30
+ -10:00 US HA%sT
+ # The following switches don't quite make our 1970 cutoff.
+@@ -571,7 +575,7 @@
+ # Minutes of the Unalaska City Council Meeting, January 10, 1967:
+ # "Except for St. Paul and Akutan, Unalaska is the only important
+ # location not on Alaska Standard Time. The following resolution was
+-# made by William Robinson and seconded by Henry Swanson: Be it
++# made by William Robinson and seconded by Henry Swanson: Be it
+ # resolved that the City of Unalaska hereby goes to Alaska Standard
+ # Time as of midnight Friday, January 13, 1967 (1 A.M. Saturday,
+ # January 14, Alaska Standard Time.) This resolution was passed with
+@@ -583,9 +587,7 @@
+ # "Hawaiian Time" by Robert C. Schmitt and Doak C. Cox appears on pages 207-225
+ # of volume 26 of The Hawaiian Journal of History (1992). As of 2010-12-09,
+ # the article is available at
+-# <a href="http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf">
+ # http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf
+-# </a>
+ # and indicates that standard time was adopted effective noon, January
+ # 13, 1896 (page 218), that in "1933, the Legislature decreed daylight
+ # saving for the period between the last Sunday of each April and the
+@@ -606,7 +608,7 @@
+ # year, the standard time of this Territory shall be advanced one
+ # hour...This Act shall take effect upon its approval. Approved this 26th
+ # day of April, A. D. 1933. LAWRENCE M JUDD, Governor of the Territory of
+-# Hawaii." Page 172: "Act 163...Act 90 of the Session Laws of 1933 is
++# Hawaii." Page 172: "Act 163...Act 90 of the Session Laws of 1933 is
+ # hereby repealed...This Act shall take effect upon its approval, upon
+ # which date the standard time of this Territory shall be restored to
+ # that existing immediately prior to the taking effect of said Act 90.
+@@ -616,14 +618,14 @@
+ # Note that 1933-05-21 was a Sunday.
+ # We're left to guess the time of day when Act 163 was approved; guess noon.
+
+-Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00 #Schmitt&Cox
+- -10:30 - HST 1933 Apr 30 2:00 #Laws 1933
+- -10:30 1:00 HDT 1933 May 21 12:00 #Laws 1933+12
+- -10:30 - HST 1942 Feb 09 2:00 #Schmitt&Cox+2
+- -10:30 1:00 HDT 1945 Sep 30 2:00 #Schmitt&Cox+2
+- -10:30 - HST 1947 Jun 8 2:00 #Schmitt&Cox+2
++# Zone NAME GMTOFF RULES FORMAT [UNTIL]
++Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00
++ -10:30 - HST 1933 Apr 30 2:00
++ -10:30 1:00 HDT 1933 May 21 12:00
++ -10:30 - HST 1942 Feb 9 2:00
++ -10:30 1:00 HDT 1945 Sep 30 2:00
++ -10:30 - HST 1947 Jun 8 2:00
+ -10:00 - HST
+-
+ Link Pacific/Honolulu Pacific/Johnston
+
+ # Now we turn to US areas that have diverged from the consensus since 1970.
+@@ -633,9 +635,9 @@
+ # From Paul Eggert (2002-10-20):
+ #
+ # The information in the rest of this paragraph is derived from the
+-# <a href="http://www.dlapr.lib.az.us/links/daylight.htm">
+-# Daylight Saving Time web page (2002-01-23)</a> maintained by the
+-# Arizona State Library, Archives and Public Records.
++# Daylight Saving Time web page
++# <http://www.dlapr.lib.az.us/links/daylight.htm> (2002-01-23)
++# maintained by the Arizona State Library, Archives and Public Records.
+ # Between 1944-01-01 and 1944-04-01 the State of Arizona used standard
+ # time, but by federal law railroads, airlines, bus lines, military
+ # personnel, and some engaged in interstate commerce continued to
+@@ -649,10 +651,11 @@
+ # Shanks says the 1944 experiment came to an end on 1944-03-17.
+ # Go with the Arizona State Library instead.
+
++# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42
+- -7:00 US M%sT 1944 Jan 1 00:01
+- -7:00 - MST 1944 Apr 1 00:01
+- -7:00 US M%sT 1944 Oct 1 00:01
++ -7:00 US M%sT 1944 Jan 1 0:01
++ -7:00 - MST 1944 Apr 1 0:01
++ -7:00 US M%sT 1944 Oct 1 0:01
+ -7:00 - MST 1967
+ -7:00 US M%sT 1968 Mar 21
+ -7:00 - MST
+@@ -676,24 +679,22 @@
+ #
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
+- -8:00 US P%sT 1923 May 13 2:00
++ -8:00 US P%sT 1923 May 13 2:00
+ -7:00 US M%sT 1974
+- -7:00 - MST 1974 Feb 3 2:00
++ -7:00 - MST 1974 Feb 3 2:00
+ -7:00 US M%sT
+
+ # Indiana
+ #
+ # For a map of Indiana's time zone regions, see:
+-# <a href="http://www.mccsc.edu/time.html">
+-# What time is it in Indiana?
+-# </a> (2006-03-01)
++# http://en.wikipedia.org/wiki/Time_in_Indiana
+ #
+ # From Paul Eggert (2007-08-17):
+ # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
+ # with the following exceptions:
+ #
+ # - Gibson, Jasper, Lake, LaPorte, Newton, Porter, Posey, Spencer,
+-# Vandenburgh, and Warrick counties have been like America/Chicago.
++# Vanderburgh, and Warrick counties have been like America/Chicago.
+ #
+ # - Dearborn and Ohio counties have been like America/New_York.
+ #
+@@ -712,22 +713,16 @@
+ # that they would be ambiguous if we left them at the 'America' level.
+ # So we reluctantly put them all in a subdirectory 'America/Indiana'.
+
+-# From Paul Eggert (2005-08-16):
+-# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
+-
+-# From Nathan Stratton Treadway (2006-03-30):
+-# http://www.dot.gov/affairs/dot0406.htm [3705 B]
+-# From Deborah Goldsmith (2006-01-18):
+-# http://dmses.dot.gov/docimages/pdf95/382329_web.pdf [2.9 MB]
+-# From Paul Eggert (2006-01-20):
+-# It says "DOT is relocating the time zone boundary in Indiana to move Starke,
++# From Paul Eggert (2014-06-26):
++# https://www.federalregister.gov/articles/2006/01/20/06-563/standard-time-zone-boundary-in-the-state-of-indiana
++# says "DOT is relocating the time zone boundary in Indiana to move Starke,
+ # Pulaski, Knox, Daviess, Martin, Pike, Dubois, and Perry Counties from the
+ # Eastern Time Zone to the Central Time Zone.... The effective date of
+-# this rule is 2:OO a.m. EST Sunday, April 2, 2006, which is the
++# this rule is 2 a.m. EST Sunday, April 2, 2006, which is the
+ # changeover date from standard time to Daylight Saving Time."
+-# Strictly speaking, this means the affected counties will change their
+-# clocks twice that night, but this obviously is in error. The intent
+-# is that 01:59:59 EST be followed by 02:00:00 CDT.
++# Strictly speaking, this meant the affected counties changed their
++# clocks twice that night, but this obviously was in error. The intent
++# was that 01:59:59 EST be followed by 02:00:00 CDT.
+
+ # From Gwillim Law (2007-02-10):
+ # The Associated Press has been reporting that Pulaski County, Indiana is
+@@ -739,13 +734,13 @@
+ Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
+ Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
++Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
+ -6:00 US C%sT 1920
+ -6:00 Indianapolis C%sT 1942
+ -6:00 US C%sT 1946
+- -6:00 Indianapolis C%sT 1955 Apr 24 2:00
+- -5:00 - EST 1957 Sep 29 2:00
+- -6:00 - CST 1958 Apr 27 2:00
++ -6:00 Indianapolis C%sT 1955 Apr 24 2:00
++ -5:00 - EST 1957 Sep 29 2:00
++ -6:00 - CST 1958 Apr 27 2:00
+ -5:00 - EST 1969
+ -5:00 US E%sT 1971
+ -5:00 - EST 2006
+@@ -761,10 +756,10 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 12:14:37
+ -6:00 US C%sT 1951
+- -6:00 Marengo C%sT 1961 Apr 30 2:00
++ -6:00 Marengo C%sT 1961 Apr 30 2:00
+ -5:00 - EST 1969
+- -5:00 US E%sT 1974 Jan 6 2:00
+- -6:00 1:00 CDT 1974 Oct 27 2:00
++ -5:00 US E%sT 1974 Jan 6 2:00
++ -6:00 1:00 CDT 1974 Oct 27 2:00
+ -5:00 US E%sT 1976
+ -5:00 - EST 2006
+ -5:00 US E%sT
+@@ -785,11 +780,11 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 12:09:53
+ -6:00 US C%sT 1946
+- -6:00 Vincennes C%sT 1964 Apr 26 2:00
++ -6:00 Vincennes C%sT 1964 Apr 26 2:00
+ -5:00 - EST 1969
+ -5:00 US E%sT 1971
+- -5:00 - EST 2006 Apr 2 2:00
+- -6:00 US C%sT 2007 Nov 4 2:00
++ -5:00 - EST 2006 Apr 2 2:00
++ -6:00 US C%sT 2007 Nov 4 2:00
+ -5:00 US E%sT
+ #
+ # Perry County, Indiana, switched from eastern to central time in April 2006.
+@@ -806,10 +801,10 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 12:12:57
+ -6:00 US C%sT 1946
+- -6:00 Perry C%sT 1964 Apr 26 2:00
++ -6:00 Perry C%sT 1964 Apr 26 2:00
+ -5:00 - EST 1969
+ -5:00 US E%sT 1971
+- -5:00 - EST 2006 Apr 2 2:00
++ -5:00 - EST 2006 Apr 2 2:00
+ -6:00 US C%sT
+ #
+ # Pike County, Indiana moved from central to eastern time in 1977,
+@@ -822,11 +817,11 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 12:10:53
+ -6:00 US C%sT 1955
+- -6:00 Pike C%sT 1965 Apr 25 2:00
+- -5:00 - EST 1966 Oct 30 2:00
+- -6:00 US C%sT 1977 Oct 30 2:00
+- -5:00 - EST 2006 Apr 2 2:00
+- -6:00 US C%sT 2007 Nov 4 2:00
++ -6:00 Pike C%sT 1965 Apr 25 2:00
++ -5:00 - EST 1966 Oct 30 2:00
++ -6:00 US C%sT 1977 Oct 30 2:00
++ -5:00 - EST 2006 Apr 2 2:00
++ -6:00 US C%sT 2007 Nov 4 2:00
+ -5:00 US E%sT
+ #
+ # Starke County, Indiana moved from central to eastern time in 1991,
+@@ -844,10 +839,10 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 12:13:30
+ -6:00 US C%sT 1947
+- -6:00 Starke C%sT 1962 Apr 29 2:00
+- -5:00 - EST 1963 Oct 27 2:00
+- -6:00 US C%sT 1991 Oct 27 2:00
+- -5:00 - EST 2006 Apr 2 2:00
++ -6:00 Starke C%sT 1962 Apr 29 2:00
++ -5:00 - EST 1963 Oct 27 2:00
++ -6:00 US C%sT 1991 Oct 27 2:00
++ -5:00 - EST 2006 Apr 2 2:00
+ -6:00 US C%sT
+ #
+ # Pulaski County, Indiana, switched from eastern to central time in
+@@ -860,17 +855,17 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
+ -6:00 US C%sT 1946
+- -6:00 Pulaski C%sT 1961 Apr 30 2:00
++ -6:00 Pulaski C%sT 1961 Apr 30 2:00
+ -5:00 - EST 1969
+ -5:00 US E%sT 1971
+- -5:00 - EST 2006 Apr 2 2:00
+- -6:00 US C%sT 2007 Mar 11 2:00
++ -5:00 - EST 2006 Apr 2 2:00
++ -6:00 US C%sT 2007 Mar 11 2:00
+ -5:00 US E%sT
+ #
+ # Switzerland County, Indiana, did not observe DST from 1973 through 2005.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44
+- -6:00 US C%sT 1954 Apr 25 2:00
++ -6:00 US C%sT 1954 Apr 25 2:00
+ -5:00 - EST 1969
+ -5:00 US E%sT 1973
+ -5:00 - EST 2006
+@@ -891,18 +886,17 @@
+ -6:00 US C%sT 1921
+ -6:00 Louisville C%sT 1942
+ -6:00 US C%sT 1946
+- -6:00 Louisville C%sT 1961 Jul 23 2:00
++ -6:00 Louisville C%sT 1961 Jul 23 2:00
+ -5:00 - EST 1968
+- -5:00 US E%sT 1974 Jan 6 2:00
+- -6:00 1:00 CDT 1974 Oct 27 2:00
++ -5:00 US E%sT 1974 Jan 6 2:00
++ -6:00 1:00 CDT 1974 Oct 27 2:00
+ -5:00 US E%sT
+ #
+ # Wayne County, Kentucky
+ #
+-# From
+-# <a href="http://www.lake-cumberland.com/life/archive/news990129time.shtml">
+-# Lake Cumberland LIFE
+-# </a> (1999-01-29) via WKYM-101.7:
++# From Lake Cumberland LIFE
++# http://www.lake-cumberland.com/life/archive/news990129time.shtml
++# (1999-01-29) via WKYM-101.7:
+ # Clinton County has joined Wayne County in asking the DoT to change from
+ # the Central to the Eastern time zone.... The Wayne County government made
+ # the same request in December. And while Russell County officials have not
+@@ -919,9 +913,8 @@
+ #
+ # From Paul Eggert (2001-07-16):
+ # The final rule was published in the
+-# <a href="http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=2000_register&docid=fr17au00-22">
+-# Federal Register 65, 160 (2000-08-17), page 50154-50158.
+-# </a>
++# Federal Register 65, 160 (2000-08-17), pp 50154-50158.
++# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=2000_register&docid=fr17au00-22
+ #
+ Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36
+ -6:00 US C%sT 1946
+@@ -946,9 +939,8 @@
+ # See America/North_Dakota/Center for the Oliver County, ND change.
+ # West Wendover, NV officially switched from Pacific to mountain time on
+ # 1999-10-31. See the
+-# <a href="http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=fr21oc99-15">
+-# Federal Register 64, 203 (1999-10-21), page 56705-56707.
+-# </a>
++# Federal Register 64, 203 (1999-10-21), pp 56705-56707.
++# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=fr21oc99-15
+ # However, the Federal Register says that West Wendover already operated
+ # on mountain time, and the rule merely made this official;
+ # hence a separate tz entry is not needed.
+@@ -986,12 +978,12 @@
+ Rule Detroit 1967 only - Oct lastSun 2:00 0 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Detroit -5:32:11 - LMT 1905
+- -6:00 - CST 1915 May 15 2:00
++ -6:00 - CST 1915 May 15 2:00
+ -5:00 - EST 1942
+ -5:00 US E%sT 1946
+ -5:00 Detroit E%sT 1973
+ -5:00 US E%sT 1975
+- -5:00 - EST 1975 Apr 27 2:00
++ -5:00 - EST 1975 Apr 27 2:00
+ -5:00 US E%sT
+ #
+ # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
+@@ -1004,8 +996,8 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00
+ -6:00 US C%sT 1946
+- -6:00 Menominee C%sT 1969 Apr 27 2:00
+- -5:00 - EST 1973 Apr 29 2:00
++ -6:00 Menominee C%sT 1969 Apr 27 2:00
++ -5:00 - EST 1973 Apr 29 2:00
+ -6:00 US C%sT
+
+ # Navassa
+@@ -1022,19 +1014,19 @@
+ ################################################################################
+
+
+-# From Paul Eggert (2006-03-22):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually. Law sent in several helpful summaries
+-# of the IATA's data after 1990.
+-#
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# of the IATA's data after 1990. Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+ # Other sources occasionally used include:
+ #
+@@ -1042,9 +1034,9 @@
+ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
+ # which I found in the UCLA library.
+ #
+-# <a href="http://www.pettswoodvillage.co.uk/Daylight_Savings_William_Willett.pdf">
+ # William Willett, The Waste of Daylight, 19th edition
+-# </a> (1914-03)
++# <http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
++# [PDF] (1914-03)
+ #
+ # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+ # <http://www.jstor.org/stable/1774359>.
+@@ -1053,11 +1045,11 @@
+
+ # Canada
+
+-# From Alain LaBont<e'> (1994-11-14):
++# From Alain LaBonté (1994-11-14):
+ # I post here the time zone abbreviations standardized in Canada
+ # for both English and French in the CAN/CSA-Z234.4-89 standard....
+ #
+-# UTC Standard time Daylight savings time
++# UTC Standard time Daylight saving time
+ # offset French English French English
+ # -2:30 - - HAT NDT
+ # -3 - - HAA ADT
+@@ -1070,7 +1062,7 @@
+ # -9 HNY YST - -
+ #
+ # HN: Heure Normale ST: Standard Time
+-# HA: Heure Avanc<e'>e DT: Daylight saving Time
++# HA: Heure Avancée DT: Daylight saving Time
+ #
+ # A: de l'Atlantique Atlantic
+ # C: du Centre Central
+@@ -1085,7 +1077,7 @@
+ # From Paul Eggert (1994-11-22):
+ # Alas, this sort of thing must be handled by localization software.
+
+-# Unless otherwise specified, the data for Canada are all from Shanks
++# Unless otherwise specified, the data entries for Canada are all from Shanks
+ # & Pottenger.
+
+ # From Chris Walton (2006-04-01, 2006-04-25, 2006-06-26, 2007-01-31,
+@@ -1132,17 +1124,16 @@
+ # An amendment to the Interpretation Act was registered on February 19/2007....
+ # http://action.attavik.ca/home/justice-gn/attach/2007/gaz02part2.pdf
+
+-# From Paul Eggert (2006-04-25):
++# From Paul Eggert (2014-10-18):
+ # H. David Matthews and Mary Vincent's map
+-# <a href="http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp">
+ # "It's about TIME", _Canadian Geographic_ (September-October 1998)
+-# </a> contains detailed boundaries for regions observing nonstandard
++# http://www.canadiangeographic.ca/Magazine/SO98/alacarte.asp
++# contains detailed boundaries for regions observing nonstandard
+ # time and daylight saving time arrangements in Canada circa 1998.
+ #
+-# INMS, the Institute for National Measurement Standards in Ottawa, has <a
+-# href="http://inms-ienm.nrc-cnrc.gc.ca/en/time_services/daylight_saving_e.php">
+-# information about standard and daylight saving time zones in Canada.
+-# </a> (updated periodically).
++# National Research Council Canada maintains info about time zones and DST.
++# http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html
++# http://www.nrc-cnrc.gc.ca/eng/services/time/faq/index.html#Q5
+ # Its unofficial information is often taken from Matthews and Vincent.
+
+ # From Paul Eggert (2006-06-27):
+@@ -1151,9 +1142,7 @@
+
+ # From Chris Walton (2011-12-01)
+ # In the first of Tammy Hardwick's articles
+-# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260">
+ # http://www.ilovecreston.com/?p=articles&t=spec&ar=260
+-# </a>
+ # she quotes the Friday November 1/1918 edition of the Creston Review.
+ # The quote includes these two statements:
+ # 'Sunday the CPR went back to the old system of time...'
+@@ -1221,9 +1210,7 @@
+ # Time to Standard Time and from Standard Time to Daylight Savings Time
+ # now occurs at 2:00AM.
+ # ...
+-# <a href="http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm">
+ # http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm
+-# </a>
+ # ...
+ # MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery
+ # Office of the Chief Information Officer
+@@ -1259,7 +1246,7 @@
+ -3:30 - NST 1936
+ -3:30 StJohns N%sT 1942 May 11
+ -3:30 Canada N%sT 1946
+- -3:30 StJohns N%sT 1966 Mar 15 2:00
++ -3:30 StJohns N%sT 1966 Mar 15 2:00
+ -4:00 StJohns A%sT 2011 Nov
+ -4:00 Canada A%sT
+
+@@ -1320,7 +1307,7 @@
+ Zone America/Halifax -4:14:24 - LMT 1902 Jun 15
+ -4:00 Halifax A%sT 1918
+ -4:00 Canada A%sT 1919
+- -4:00 Halifax A%sT 1942 Feb 9 2:00s
++ -4:00 Halifax A%sT 1942 Feb 9 2:00s
+ -4:00 Canada A%sT 1946
+ -4:00 Halifax A%sT 1974
+ -4:00 Canada A%sT
+@@ -1379,7 +1366,7 @@
+ # meridian is supposed to observe AST, but residents as far east as
+ # Natashquan use EST/EDT, and residents east of Natashquan use AST.
+ # The Quebec department of justice writes in
+-# "The situation in Minganie and Basse-Cote-Nord"
++# "The situation in Minganie and Basse-Côte-Nord"
+ # http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
+ # that the coastal strip from just east of Natashquan to Blanc-Sablon
+ # observes Atlantic standard time all year round.
+@@ -1387,7 +1374,6 @@
+ # says this common practice was codified into law as of 2007.
+ # For lack of better info, guess this practice began around 1970, contra to
+ # Shanks & Pottenger who have this region observing AST/ADT.
+-# for post-1970 data America/Puerto_Rico.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Mont 1917 only - Mar 25 2:00 1:00 D
+@@ -1401,18 +1387,10 @@
+ Rule Mont 1924 only - May 17 2:00 1:00 D
+ Rule Mont 1924 1926 - Sep lastSun 2:30 0 S
+ Rule Mont 1925 1926 - May Sun>=1 2:00 1:00 D
+-# The 1927-to-1937 rules can be expressed more simply as
+-# Rule Mont 1927 1937 - Apr lastSat 24:00 1:00 D
+-# Rule Mont 1927 1937 - Sep lastSat 24:00 0 S
+-# The rules below avoid use of 24:00
+-# (which pre-1998 versions of zic cannot handle).
+-Rule Mont 1927 only - May 1 0:00 1:00 D
+-Rule Mont 1927 1932 - Sep lastSun 0:00 0 S
+-Rule Mont 1928 1931 - Apr lastSun 0:00 1:00 D
+-Rule Mont 1932 only - May 1 0:00 1:00 D
+-Rule Mont 1933 1940 - Apr lastSun 0:00 1:00 D
+-Rule Mont 1933 only - Oct 1 0:00 0 S
+-Rule Mont 1934 1939 - Sep lastSun 0:00 0 S
++Rule Mont 1927 1937 - Apr lastSat 24:00 1:00 D
++Rule Mont 1927 1937 - Sep lastSat 24:00 0 S
++Rule Mont 1938 1940 - Apr lastSun 0:00 1:00 D
++Rule Mont 1938 1939 - Sep lastSun 0:00 0 S
+ Rule Mont 1946 1973 - Apr lastSun 2:00 1:00 D
+ Rule Mont 1945 1948 - Sep lastSun 2:00 0 S
+ Rule Mont 1949 1950 - Oct lastSun 2:00 0 S
+@@ -1426,7 +1404,7 @@
+ Zone America/Montreal -4:54:16 - LMT 1884
+ -5:00 Mont E%sT 1918
+ -5:00 Canada E%sT 1919
+- -5:00 Mont E%sT 1942 Feb 9 2:00s
++ -5:00 Mont E%sT 1942 Feb 9 2:00s
+ -5:00 Canada E%sT 1946
+ -5:00 Mont E%sT 1974
+ -5:00 Canada E%sT
+@@ -1448,7 +1426,7 @@
+ # have already done so. In Orillia DST was to run until Saturday,
+ # 1912-08-31 (no time mentioned), but it was met with considerable
+ # hostility from certain segments of the public, and was revoked after
+-# only two weeks -- I copied it as Saturday, 1912-07-07, 22:00, but
++# only two weeks - I copied it as Saturday, 1912-07-07, 22:00, but
+ # presumably that should be -07-06. (1912-06-19, -07-12; also letters
+ # earlier in June).
+ #
+@@ -1458,10 +1436,8 @@
+ # Mark Brader writes that an article in the 1997-10-14 Toronto Star
+ # says that Atikokan, Ontario currently does not observe DST,
+ # but will vote on 11-10 whether to use EST/EDT.
+-# He also writes that the
+-# <a href="http://www.gov.on.ca/MBS/english/publications/statregs/conttext.html">
+-# Ontario Time Act (1990, Chapter T.9)
+-# </a>
++# He also writes that the Ontario Time Act (1990, Chapter T.9)
++# http://www.gov.on.ca/MBS/english/publications/statregs/conttext.html
+ # says that Ontario east of 90W uses EST/EDT, and west of 90W uses CST/CDT.
+ # Officially Atikokan is therefore on CST/CDT, and most likely this report
+ # concerns a non-official time observed as a matter of local practice.
+@@ -1540,9 +1516,7 @@
+ # The Journal of The Royal Astronomical Society of Canada,
+ # volume 26, number 2 (February 1932) and, as of 2010-07-17,
+ # was available at
+-# <a href="http://adsabs.harvard.edu/full/1932JRASC..26...49S">
+ # http://adsabs.harvard.edu/full/1932JRASC..26...49S
+-# </a>
+ #
+ # It includes the text below (starting on page 57):
+ #
+@@ -1553,26 +1527,26 @@
+ # ing in 1930. The information for the province of Quebec is definite,
+ # for the other provinces only approximate:
+ #
+-# Province Daylight saving time used
++# Province Daylight saving time used
+ # Prince Edward Island Not used.
+ # Nova Scotia In Halifax only.
+ # New Brunswick In St. John only.
+ # Quebec In the following places:
+-# Montreal Lachine
+-# Quebec Mont-Royal
+-# Levis Iberville
+-# St. Lambert Cap de la Madeleine
+-# Verdun Loretteville
+-# Westmount Richmond
+-# Outremont St. Jerome
+-# Longueuil Greenfield Park
+-# Arvida Waterloo
+-# Chambly-Canton Beaulieu
+-# Melbourne La Tuque
+-# St. Theophile Buckingham
++# Montreal Lachine
++# Quebec Mont-Royal
++# Lévis Iberville
++# St. Lambert Cap de la Madelèine
++# Verdun Loretteville
++# Westmount Richmond
++# Outremont St. Jérôme
++# Longueuil Greenfield Park
++# Arvida Waterloo
++# Chambly-Canton Beaulieu
++# Melbourne La Tuque
++# St. Théophile Buckingham
+ # Ontario Used generally in the cities and towns along
+-# the southerly part of the province. Not
+-# used in the northwesterlhy part.
++# the southerly part of the province. Not
++# used in the northwesterly part.
+ # Manitoba Not used.
+ # Saskatchewan In Regina only.
+ # Alberta Not used.
+@@ -1641,7 +1615,7 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Toronto -5:17:32 - LMT 1895
+ -5:00 Canada E%sT 1919
+- -5:00 Toronto E%sT 1942 Feb 9 2:00s
++ -5:00 Toronto E%sT 1942 Feb 9 2:00s
+ -5:00 Canada E%sT 1946
+ -5:00 Toronto E%sT 1974
+ -5:00 Canada E%sT
+@@ -1654,16 +1628,16 @@
+ -5:00 Canada E%sT
+ Zone America/Nipigon -5:53:04 - LMT 1895
+ -5:00 Canada E%sT 1940 Sep 29
+- -5:00 1:00 EDT 1942 Feb 9 2:00s
++ -5:00 1:00 EDT 1942 Feb 9 2:00s
+ -5:00 Canada E%sT
+ Zone America/Rainy_River -6:18:16 - LMT 1895
+ -6:00 Canada C%sT 1940 Sep 29
+- -6:00 1:00 CDT 1942 Feb 9 2:00s
++ -6:00 1:00 CDT 1942 Feb 9 2:00s
+ -6:00 Canada C%sT
+ Zone America/Atikokan -6:06:28 - LMT 1895
+ -6:00 Canada C%sT 1940 Sep 29
+- -6:00 1:00 CDT 1942 Feb 9 2:00s
+- -6:00 Canada C%sT 1945 Sep 30 2:00
++ -6:00 1:00 CDT 1942 Feb 9 2:00s
++ -6:00 Canada C%sT 1945 Sep 30 2:00
+ -5:00 - EST
+
+
+@@ -1676,7 +1650,7 @@
+ # the first Sunday of April of each year and two o'clock Central
+ # Standard Time in the morning of the last Sunday of October next
+ # following, one hour in advance of Central Standard Time."...
+-# I believe that the English legislation [of the old time act] had =
++# I believe that the English legislation [of the old time act] had
+ # been assented to (March 22, 1967)....
+ # Also, as far as I can tell, there was no order-in-council varying
+ # the time of Daylight Saving Time for 2005 and so the provisions of
+@@ -1799,12 +1773,12 @@
+ Rule Swift 1960 1961 - Sep lastSun 2:00 0 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Regina -6:58:36 - LMT 1905 Sep
+- -7:00 Regina M%sT 1960 Apr lastSun 2:00
++ -7:00 Regina M%sT 1960 Apr lastSun 2:00
+ -6:00 - CST
+ Zone America/Swift_Current -7:11:20 - LMT 1905 Sep
+- -7:00 Canada M%sT 1946 Apr lastSun 2:00
++ -7:00 Canada M%sT 1946 Apr lastSun 2:00
+ -7:00 Regina M%sT 1950
+- -7:00 Swift M%sT 1972 Apr lastSun 2:00
++ -7:00 Swift M%sT 1972 Apr lastSun 2:00
+ -6:00 - CST
+
+
+@@ -1854,9 +1828,7 @@
+ # Earlier this year I stumbled across a detailed article about the time
+ # keeping history of Creston; it was written by Tammy Hardwick who is the
+ # manager of the Creston & District Museum. The article was written in May 2009.
+-# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260">
+ # http://www.ilovecreston.com/?p=articles&t=spec&ar=260
+-# </a>
+ # According to the article, Creston has not changed its clocks since June 1918.
+ # i.e. Creston has been stuck on UTC-7 for 93 years.
+ # Dawson Creek, on the other hand, changed its clocks as recently as April 1972.
+@@ -1864,18 +1836,16 @@
+ # Unfortunately the exact date for the time change in June 1918 remains
+ # unknown and will be difficult to ascertain. I e-mailed Tammy a few months
+ # ago to ask if Sunday June 2 was a reasonable guess. She said it was just
+-# as plausible as any other date (in June). She also said that after writing the
+-# article she had discovered another time change in 1916; this is the subject
+-# of another article which she wrote in October 2010.
+-# <a href="http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56">
++# as plausible as any other date (in June). She also said that after writing
++# the article she had discovered another time change in 1916; this is the
++# subject of another article which she wrote in October 2010.
+ # http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56
+-# </a>
+
+ # Here is a summary of the three clock change events in Creston's history:
+ # 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7)
+ # Exact date unknown
+ # 2. Oct 1916: switch to Pacific Standard Time (GMT-8)
+-# Exact date in October unknown; Sunday October 1 is a reasonable guess.
++# Exact date in October unknown; Sunday October 1 is a reasonable guess.
+ # 3. June 1918: switch to Pacific Daylight Time (GMT-7)
+ # Exact date in June unknown; Sunday June 2 is a reasonable guess.
+ # note#1:
+@@ -1888,9 +1858,7 @@
+ # There is no guarantee that Creston will remain on Mountain Standard Time
+ # (UTC-7) forever.
+ # The subject was debated at least once this year by the town Council.
+-# <a href="http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html">
+ # http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html
+-# </a>
+
+ # During a period WWII, summer time (Daylight saying) was mandatory in Canada.
+ # In Creston, that was handled by shifting the area to PST (-8:00) then applying
+@@ -1917,7 +1885,7 @@
+ -8:00 Canada P%sT
+ Zone America/Dawson_Creek -8:00:56 - LMT 1884
+ -8:00 Canada P%sT 1947
+- -8:00 Vanc P%sT 1972 Aug 30 2:00
++ -8:00 Vanc P%sT 1972 Aug 30 2:00
+ -7:00 - MST
+ Zone America/Creston -7:46:04 - LMT 1884
+ -7:00 - MST 1916 Oct 1
+@@ -1944,18 +1912,17 @@
+
+ # From Rives McDow (1999-09-04):
+ # Nunavut ... moved ... to incorporate the whole territory into one time zone.
+-# <a href="http://www.nunatsiaq.com/nunavut/nvt90903_13.html">
+ # Nunavut moves to single time zone Oct. 31
+-# </a>
++# http://www.nunatsiaq.com/nunavut/nvt90903_13.html
+ #
+ # From Antoine Leca (1999-09-06):
+ # We then need to create a new timezone for the Kitikmeot region of Nunavut
+ # to differentiate it from the Yellowknife region.
+
+ # From Paul Eggert (1999-09-20):
+-# <a href="http://www.nunavut.com/basicfacts/english/basicfacts_1territory.html">
+ # Basic Facts: The New Territory
+-# </a> (1999) reports that Pangnirtung operates on eastern time,
++# http://www.nunavut.com/basicfacts/english/basicfacts_1territory.html
++# (1999) reports that Pangnirtung operates on eastern time,
+ # and that Coral Harbour does not observe DST. We don't know when
+ # Pangnirtung switched to eastern time; we'll guess 1995.
+
+@@ -1983,8 +1950,8 @@
+ # the current state of affairs.
+
+ # From Michaela Rodrigue, writing in the
+-# <a href="http://www.nunatsiaq.com/archives/nunavut991130/nvt91119_17.html">
+-# Nunatsiaq News (1999-11-19)</a>:
++# Nunatsiaq News (1999-11-19):
++# http://www.nunatsiaq.com/archives/nunavut991130/nvt91119_17.html
+ # Clyde River, Pangnirtung and Sanikiluaq now operate with two time zones,
+ # central - or Nunavut time - for government offices, and eastern time
+ # for municipal offices and schools.... Igloolik [was similar but then]
+@@ -2002,10 +1969,8 @@
+ # Central Time and Southampton Island [in the Central zone] is not
+ # required to use daylight savings.
+
+-# From
+-# <a href="http://www.nunatsiaq.com/archives/nunavut001130/nvt21110_02.html">
+-# Nunavut now has two time zones
+-# </a> (2000-11-10):
++# From <http://www.nunatsiaq.com/archives/nunavut001130/nvt21110_02.html>
++# Nunavut now has two time zones (2000-11-10):
+ # The Nunavut government would allow its employees in Kugluktuk and
+ # Cambridge Bay to operate on central time year-round, putting them
+ # one hour behind the rest of Nunavut for six months during the winter.
+@@ -2033,10 +1998,7 @@
+ # [Also see <http://www.nunatsiaq.com/nunavut/nvt10309_06.html> (2001-03-09).]
+
+ # From Gwillim Law (2005-05-21):
+-# According to maps at
+-# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SWE.jpg
+-# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SSE.jpg
+-# (both dated 2003), and
++# According to ...
+ # http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp
+ # (from a 1998 Canadian Geographic article), the de facto and de jure time
+ # for Southampton Island (at the north end of Hudson Bay) is UTC-5 all year
+@@ -2045,9 +2007,11 @@
+ # predates the creation of Nunavut, it probably goes back many years....
+ # The Inuktitut name of Coral Harbour is Sallit, but it's rarely used.
+ #
+-# From Paul Eggert (2005-07-26):
++# From Paul Eggert (2014-10-17):
+ # For lack of better information, assume that Southampton Island observed
+-# daylight saving only during wartime.
++# daylight saving only during wartime. Gwillim Law's email also
++# mentioned maps now maintained by National Research Council Canada;
++# see above for an up-to-date link.
+
+ # From Chris Walton (2007-03-01):
+ # ... the community of Resolute (located on Cornwallis Island in
+@@ -2096,9 +2060,7 @@
+ # used to be the mayor of Resolute Bay and he apparently owns half the
+ # businesses including "South Camp Inn." This website has some info on
+ # Aziz:
+-# <a href="http://www.uphere.ca/node/493">
+ # http://www.uphere.ca/node/493
+-# </a>
+ #
+ # I sent Aziz an e-mail asking when Resolute Bay had stopped using
+ # Eastern Standard Time.
+@@ -2136,47 +2098,47 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ # aka Panniqtuuq
+ Zone America/Pangnirtung 0 - zzz 1921 # trading post est.
+- -4:00 NT_YK A%sT 1995 Apr Sun>=1 2:00
+- -5:00 Canada E%sT 1999 Oct 31 2:00
+- -6:00 Canada C%sT 2000 Oct 29 2:00
++ -4:00 NT_YK A%sT 1995 Apr Sun>=1 2:00
++ -5:00 Canada E%sT 1999 Oct 31 2:00
++ -6:00 Canada C%sT 2000 Oct 29 2:00
+ -5:00 Canada E%sT
+ # formerly Frobisher Bay
+ Zone America/Iqaluit 0 - zzz 1942 Aug # Frobisher Bay est.
+- -5:00 NT_YK E%sT 1999 Oct 31 2:00
+- -6:00 Canada C%sT 2000 Oct 29 2:00
++ -5:00 NT_YK E%sT 1999 Oct 31 2:00
++ -6:00 Canada C%sT 2000 Oct 29 2:00
+ -5:00 Canada E%sT
+ # aka Qausuittuq
+ Zone America/Resolute 0 - zzz 1947 Aug 31 # Resolute founded
+- -6:00 NT_YK C%sT 2000 Oct 29 2:00
+- -5:00 - EST 2001 Apr 1 3:00
+- -6:00 Canada C%sT 2006 Oct 29 2:00
+- -5:00 - EST 2007 Mar 11 3:00
++ -6:00 NT_YK C%sT 2000 Oct 29 2:00
++ -5:00 - EST 2001 Apr 1 3:00
++ -6:00 Canada C%sT 2006 Oct 29 2:00
++ -5:00 - EST 2007 Mar 11 3:00
+ -6:00 Canada C%sT
+ # aka Kangiqiniq
+ Zone America/Rankin_Inlet 0 - zzz 1957 # Rankin Inlet founded
+- -6:00 NT_YK C%sT 2000 Oct 29 2:00
+- -5:00 - EST 2001 Apr 1 3:00
++ -6:00 NT_YK C%sT 2000 Oct 29 2:00
++ -5:00 - EST 2001 Apr 1 3:00
+ -6:00 Canada C%sT
+ # aka Iqaluktuuttiaq
+ Zone America/Cambridge_Bay 0 - zzz 1920 # trading post est.?
+- -7:00 NT_YK M%sT 1999 Oct 31 2:00
+- -6:00 Canada C%sT 2000 Oct 29 2:00
+- -5:00 - EST 2000 Nov 5 0:00
+- -6:00 - CST 2001 Apr 1 3:00
++ -7:00 NT_YK M%sT 1999 Oct 31 2:00
++ -6:00 Canada C%sT 2000 Oct 29 2:00
++ -5:00 - EST 2000 Nov 5 0:00
++ -6:00 - CST 2001 Apr 1 3:00
+ -7:00 Canada M%sT
+ Zone America/Yellowknife 0 - zzz 1935 # Yellowknife founded?
+ -7:00 NT_YK M%sT 1980
+ -7:00 Canada M%sT
+ Zone America/Inuvik 0 - zzz 1953 # Inuvik founded
+- -8:00 NT_YK P%sT 1979 Apr lastSun 2:00
++ -8:00 NT_YK P%sT 1979 Apr lastSun 2:00
+ -7:00 NT_YK M%sT 1980
+ -7:00 Canada M%sT
+ Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20
+- -9:00 NT_YK Y%sT 1966 Jul 1 2:00
++ -9:00 NT_YK Y%sT 1966 Jul 1 2:00
+ -8:00 NT_YK P%sT 1980
+ -8:00 Canada P%sT
+ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
+- -9:00 NT_YK Y%sT 1973 Oct 28 0:00
++ -9:00 NT_YK Y%sT 1973 Oct 28 0:00
+ -8:00 NT_YK P%sT 1980
+ -8:00 Canada P%sT
+
+@@ -2188,9 +2150,8 @@
+ # From Paul Eggert (2001-03-05):
+ # The Investigation and Analysis Service of the
+ # Mexican Library of Congress (MLoC) has published a
+-# <a href="http://www.cddhcu.gob.mx/bibliot/publica/inveyana/polisoc/horver/">
+ # history of Mexican local time (in Spanish)
+-# </a>.
++# http://www.cddhcu.gob.mx/bibliot/publica/inveyana/polisoc/horver/
+ #
+ # Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC.
+ # (In all cases we go with the MLoC.)
+@@ -2235,9 +2196,8 @@
+ # -------------- End Forwarded Message --------------
+ # From Paul Eggert (1996-06-12):
+ # For an English translation of the decree, see
+-# <a href="http://mexico-travel.com/extra/timezone_eng.html">
+ # "Diario Oficial: Time Zone Changeover" (1996-01-04).
+-# </a>
++# http://mexico-travel.com/extra/timezone_eng.html
+
+ # From Rives McDow (1998-10-08):
+ # The State of Quintana Roo has reverted back to central STD and DST times
+@@ -2249,7 +2209,7 @@
+ # savings time so as to stay on the same time zone as the southern part of
+ # Arizona year round.
+
+-# From Jesper Norgaard, translating
++# From Jesper Nørgaard, translating
+ # <http://www.reforma.com/nacional/articulo/064327/> (2001-01-17):
+ # In Oaxaca, the 55.000 teachers from the Section 22 of the National
+ # Syndicate of Education Workers, refuse to apply daylight saving each
+@@ -2262,7 +2222,7 @@
+ # January 17, 2000 - The Energy Secretary, Ernesto Martens, announced
+ # that Summer Time will be reduced from seven to five months, starting
+ # this year....
+-# <http://www.publico.com.mx/scripts/texto3.asp?action=pagina&pag=21&pos=p&secc=naci&date=01/17/2001>
++# http://www.publico.com.mx/scripts/texto3.asp?action=pagina&pag=21&pos=p&secc=naci&date=01/17/2001
+ # [translated], says "summer time will ... take effect on the first Sunday
+ # in May, and end on the last Sunday of September.
+
+@@ -2270,23 +2230,22 @@
+ # The 2001-01-24 traditional Washington Post contained the page one
+ # story "Timely Issue Divides Mexicans."...
+ # http://www.washingtonpost.com/wp-dyn/articles/A37383-2001Jan23.html
+-# ... Mexico City Mayor Lopez Obrador "...is threatening to keep
++# ... Mexico City Mayor López Obrador "...is threatening to keep
+ # Mexico City and its 20 million residents on a different time than
+-# the rest of the country..." In particular, Lopez Obrador would abolish
++# the rest of the country..." In particular, López Obrador would abolish
+ # observation of Daylight Saving Time.
+
+-# <a href="http://www.conae.gob.mx/ahorro/decretohorver2001.html#decre">
+ # Official statute published by the Energy Department
+-# </a> (2001-02-01) shows Baja and Chihauhua as still using US DST rules,
+-# and Sonora with no DST. This was reported by Jesper Norgaard (2001-02-03).
++# http://www.conae.gob.mx/ahorro/decretohorver2001.html#decre
++# (2001-02-01) shows Baja and Chihauhua as still using US DST rules,
++# and Sonora with no DST. This was reported by Jesper Nørgaard (2001-02-03).
+
+ # From Paul Eggert (2001-03-03):
+ #
+-# <a href="http://www.latimes.com/news/nation/20010303/t000018766.html">
++# http://www.latimes.com/news/nation/20010303/t000018766.html
+ # James F. Smith writes in today's LA Times
+-# </a>
+ # * Sonora will continue to observe standard time.
+-# * Last week Mexico City's mayor Andres Manuel Lopez Obrador decreed that
++# * Last week Mexico City's mayor Andrés Manuel López Obrador decreed that
+ # the Federal District will not adopt DST.
+ # * 4 of 16 district leaders announced they'll ignore the decree.
+ # * The decree does not affect federal-controlled facilities including
+@@ -2294,7 +2253,7 @@
+ #
+ # For now we'll assume that the Federal District will bow to federal rules.
+
+-# From Jesper Norgaard (2001-04-01):
++# From Jesper Nørgaard (2001-04-01):
+ # I found some references to the Mexican application of daylight
+ # saving, which modifies what I had already sent you, stating earlier
+ # that a number of northern Mexican states would go on daylight
+@@ -2303,7 +2262,7 @@
+ # saving all year) will follow the original decree of president
+ # Vicente Fox, starting daylight saving May 6, 2001 and ending
+ # September 30, 2001.
+-# References: "Diario de Monterrey" <www.diariodemonterrey.com/index.asp>
++# References: "Diario de Monterrey" <http://www.diariodemonterrey.com/index.asp>
+ # Palabra <http://palabra.infosel.com/010331/primera/ppri3101.pdf> (2001-03-31)
+
+ # From Reuters (2001-09-04):
+@@ -2315,7 +2274,7 @@
+ # standard time. "This is so residents of the Federal District are not
+ # subject to unexpected time changes," a statement from the court said.
+
+-# From Jesper Norgaard Welen (2002-03-12):
++# From Jesper Nørgaard Welen (2002-03-12):
+ # ... consulting my local grocery store(!) and my coworkers, they all insisted
+ # that a new decision had been made to reinstate US style DST in Mexico....
+ # http://www.conae.gob.mx/ahorro/horaver2001_m1_2002.html (2002-02-20)
+@@ -2329,48 +2288,36 @@
+ # > the United States.
+ # Now this has passed both the Congress and the Senate, so starting from
+ # 2010, some border regions will be the same:
+-# <a href="http://www.signonsandiego.com/news/2009/dec/28/clocks-will-match-both-sides-border/">
+ # http://www.signonsandiego.com/news/2009/dec/28/clocks-will-match-both-sides-border/
+-# </a>
+-# <a href="http://www.elmananarey.com/diario/noticia/nacional/noticias/empatan_horario_de_frontera_con_eu/621939">
+ # http://www.elmananarey.com/diario/noticia/nacional/noticias/empatan_horario_de_frontera_con_eu/621939
+-# </a>
+ # (Spanish)
+ #
+ # Could not find the new law text, but the proposed law text changes are here:
+-# <a href="http://gaceta.diputados.gob.mx/Gaceta/61/2009/dic/20091210-V.pdf">
+ # http://gaceta.diputados.gob.mx/Gaceta/61/2009/dic/20091210-V.pdf
+-# </a>
+ # (Gaceta Parlamentaria)
+ #
+ # There is also a list of the votes here:
+-# <a href="http://gaceta.diputados.gob.mx/Gaceta/61/2009/dic/V2-101209.html">
+ # http://gaceta.diputados.gob.mx/Gaceta/61/2009/dic/V2-101209.html
+-# </a>
+ #
+ # Our page:
+-# <a href="http://www.timeanddate.com/news/time/north-mexico-dst-change.html">
+ # http://www.timeanddate.com/news/time/north-mexico-dst-change.html
+-# </a>
+
+ # From Arthur David Olson (2010-01-20):
+ # The page
+-# <a href="http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010">
+ # http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
+-# </a>
+ # includes this text:
+ # En los municipios fronterizos de Tijuana y Mexicali en Baja California;
+-# Ju&aacute;rez y Ojinaga en Chihuahua; Acu&ntilde;a y Piedras Negras en Coahuila;
+-# An&aacute;huac en Nuevo Le&oacute;n; y Nuevo Laredo, Reynosa y Matamoros en
+-# Tamaulipas, la aplicaci&oacute;n de este horario estacional surtir&aacute; efecto
+-# desde las dos horas del segundo domingo de marzo y concluir&aacute; a las dos
++# Juárez y Ojinaga en Chihuahua; Acuña y Piedras Negras en Coahuila;
++# Anáhuac en Nuevo León; y Nuevo Laredo, Reynosa y Matamoros en
++# Tamaulipas, la aplicación de este horario estacional surtirá efecto
++# desde las dos horas del segundo domingo de marzo y concluirá a las dos
+ # horas del primer domingo de noviembre.
+ # En los municipios fronterizos que se encuentren ubicados en la franja
+-# fronteriza norte en el territorio comprendido entre la l&iacute;nea
+-# internacional y la l&iacute;nea paralela ubicada a una distancia de veinte
+-# kil&oacute;metros, as&iacute; como la Ciudad de Ensenada, Baja California, hacia el
+-# interior del pa&iacute;s, la aplicaci&oacute;n de este horario estacional surtir&aacute;
+-# efecto desde las dos horas del segundo domingo de marzo y concluir&aacute; a
++# fronteriza norte en el territorio comprendido entre la línea
++# internacional y la línea paralela ubicada a una distancia de veinte
++# kilómetros, así como la Ciudad de Ensenada, Baja California, hacia el
++# interior del país, la aplicación de este horario estacional surtirá
++# efecto desde las dos horas del segundo domingo de marzo y concluirá a
+ # las dos horas del primer domingo de noviembre.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+@@ -2389,39 +2336,39 @@
+ Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D
+ Rule Mexico 2002 max - Oct lastSun 2:00 0 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-# Quintana Roo
++# Quintana Roo; represented by Cancún
+ Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56
+ -6:00 - CST 1981 Dec 23
+ -5:00 Mexico E%sT 1998 Aug 2 2:00
+ -6:00 Mexico C%sT
+-# Campeche, Yucatan
++# Campeche, Yucatán; represented by Mérida
+ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
+ -6:00 - CST 1981 Dec 23
+ -5:00 - EST 1982 Dec 2
+ -6:00 Mexico C%sT
+-# Coahuila, Durango, Nuevo Leon, Tamaulipas (near US border)
++# Coahuila, Durango, Nuevo León, Tamaulipas (near US border)
+ Zone America/Matamoros -6:40:00 - LMT 1921 Dec 31 23:20:00
+ -6:00 - CST 1988
+ -6:00 US C%sT 1989
+ -6:00 Mexico C%sT 2010
+ -6:00 US C%sT
+-# Coahuila, Durango, Nuevo Leon, Tamaulipas (away from US border)
++# Coahuila, Durango, Nuevo León, Tamaulipas (away from US border)
+ Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44
+ -6:00 - CST 1988
+ -6:00 US C%sT 1989
+ -6:00 Mexico C%sT
+ # Central Mexico
+-Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
++Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
+ -7:00 - MST 1927 Jun 10 23:00
+ -6:00 - CST 1930 Nov 15
+ -7:00 - MST 1931 May 1 23:00
+ -6:00 - CST 1931 Oct
+ -7:00 - MST 1932 Apr 1
+- -6:00 Mexico C%sT 2001 Sep 30 02:00
++ -6:00 Mexico C%sT 2001 Sep 30 2:00
+ -6:00 - CST 2002 Feb 20
+ -6:00 Mexico C%sT
+ # Chihuahua (near US border)
+-Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
++Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
+ -7:00 - MST 1927 Jun 10 23:00
+ -6:00 - CST 1930 Nov 15
+ -7:00 - MST 1931 May 1 23:00
+@@ -2429,7 +2376,7 @@
+ -7:00 - MST 1932 Apr 1
+ -6:00 - CST 1996
+ -6:00 Mexico C%sT 1998
+- -6:00 - CST 1998 Apr Sun>=1 3:00
++ -6:00 - CST 1998 Apr Sun>=1 3:00
+ -7:00 Mexico M%sT 2010
+ -7:00 US M%sT
+ # Chihuahua (away from US border)
+@@ -2441,7 +2388,7 @@
+ -7:00 - MST 1932 Apr 1
+ -6:00 - CST 1996
+ -6:00 Mexico C%sT 1998
+- -6:00 - CST 1998 Apr Sun>=1 3:00
++ -6:00 - CST 1998 Apr Sun>=1 3:00
+ -7:00 Mexico M%sT
+ # Sonora
+ Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
+@@ -2457,42 +2404,33 @@
+ -7:00 - MST
+
+ # From Alexander Krivenyshev (2010-04-21):
+-# According to news, Bah&iacute;a de Banderas (Mexican state of Nayarit)
++# According to news, Bahía de Banderas (Mexican state of Nayarit)
+ # changed time zone UTC-7 to new time zone UTC-6 on April 4, 2010 (to
+ # share the same time zone as nearby city Puerto Vallarta, Jalisco).
+ #
+ # (Spanish)
+-# Bah&iacute;a de Banderas homologa su horario al del centro del
+-# pa&iacute;s, a partir de este domingo
+-# <a href="http://www.nayarit.gob.mx/notes.asp?id=20748">
++# Bahía de Banderas homologa su horario al del centro del
++# país, a partir de este domingo
+ # http://www.nayarit.gob.mx/notes.asp?id=20748
+-# </a>
+ #
+-# Bah&iacute;a de Banderas homologa su horario con el del Centro del
+-# Pa&iacute;s
+-# <a href="http://www.bahiadebanderas.gob.mx/principal/index.php?option=com_content&view=article&id=261:bahia-de-banderas-homologa-su-horario-con-el-del-centro-del-pais&catid=42:comunicacion-social&Itemid=50">
+-# http://www.bahiadebanderas.gob.mx/principal/index.php?option=com_content&view=article&id=261:bahia-de-banderas-homologa-su-horario-con-el-del-centro-del-pais&catid=42:comunicacion-social&Itemid=50"
+-# </a>
++# Bahía de Banderas homologa su horario con el del Centro del
++# País
++# http://www.bahiadebanderas.gob.mx/principal/index.php?option=com_content&view=article&id=261:bahia-de-banderas-homologa-su-horario-con-el-del-centro-del-pais&catid=42:comunicacion-social&Itemid=50
+ #
+ # (English)
+-# Puerto Vallarta and Bah&iacute;a de Banderas: One Time Zone
+-# <a href="http://virtualvallarta.com/puertovallarta/puertovallarta/localnews/2009-12-03-Puerto-Vallarta-and-Bahia-de-Banderas-One-Time-Zone.shtml">
++# Puerto Vallarta and Bahía de Banderas: One Time Zone
+ # http://virtualvallarta.com/puertovallarta/puertovallarta/localnews/2009-12-03-Puerto-Vallarta-and-Bahia-de-Banderas-One-Time-Zone.shtml
+-# </a>
+-#
+-# or
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_mexico08.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_mexico08.html
+-# </a>
+ #
+ # "Mexico's Senate approved the amendments to the Mexican Schedule System that
+-# will allow Bah&iacute;a de Banderas and Puerto Vallarta to share the same time
++# will allow Bahía de Banderas and Puerto Vallarta to share the same time
+ # zone ..."
+ # Baja California Sur, Nayarit, Sinaloa
+
+ # From Arthur David Olson (2010-05-01):
+ # Use "Bahia_Banderas" to keep the name to fourteen characters.
+
++# Mazatlán
+ Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
+ -7:00 - MST 1927 Jun 10 23:00
+ -6:00 - CST 1930 Nov 15
+@@ -2504,6 +2442,7 @@
+ -8:00 - PST 1970
+ -7:00 Mexico M%sT
+
++# Bahía de Banderas
+ Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
+ -7:00 - MST 1927 Jun 10 23:00
+ -6:00 - CST 1930 Nov 15
+@@ -2513,7 +2452,7 @@
+ -6:00 - CST 1942 Apr 24
+ -7:00 - MST 1949 Jan 14
+ -8:00 - PST 1970
+- -7:00 Mexico M%sT 2010 Apr 4 2:00
++ -7:00 Mexico M%sT 2010 Apr 4 2:00
+ -6:00 Mexico C%sT
+
+ # Baja California (near US border)
+@@ -2560,7 +2499,7 @@
+ # America/Tijuana only in that it did not observe DST from 1976
+ # through 1995. This was as per Shanks (1999). But Shanks & Pottenger say
+ # Ensenada did not observe DST from 1948 through 1975. Guy Harris reports
+-# that the 1987 OAG says "Only Ensenada, Mexicale, San Felipe and
++# that the 1987 OAG says "Only Ensenada, Mexicali, San Felipe and
+ # Tijuana observe DST," which agrees with Shanks & Pottenger but implies that
+ # DST-observance was a town-by-town matter back then. This concerns
+ # data after 1970 so most likely there should be at least one Zone
+@@ -2573,7 +2512,7 @@
+ ###############################################################################
+
+ # Anguilla
+-# See 'southamerica'.
++# See America/Port_of_Spain.
+
+ # Antigua and Barbuda
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+@@ -2609,8 +2548,8 @@
+ Rule Barb 1979 only - Sep 30 2:00 0 S
+ Rule Barb 1980 only - Sep 25 2:00 0 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Barbados -3:58:29 - LMT 1924 # Bridgetown
+- -3:58:29 - BMT 1932 # Bridgetown Mean Time
++Zone America/Barbados -3:58:29 - LMT 1924 # Bridgetown
++ -3:58:29 - BMT 1932 # Bridgetown Mean Time
+ -4:00 Barb A%sT
+
+ # Belize
+@@ -2640,20 +2579,20 @@
+ # http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
+- -4:00 - AST 1974 Apr 28 2:00
++Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
++ -4:00 - AST 1974 Apr 28 2:00
+ -4:00 Canada A%sT 1976
+ -4:00 US A%sT
+
+ # Cayman Is
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
+- -5:07:11 - KMT 1912 Feb # Kingston Mean Time
++Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
++ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
+ -5:00 - EST
+
+ # Costa Rica
+
+-# Milne gives -5:36:13.3 as San Jose mean time; round to nearest.
++# Milne gives -5:36:13.3 as San José mean time; round to nearest.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule CR 1979 1980 - Feb lastSun 0:00 1:00 D
+@@ -2663,10 +2602,10 @@
+ # go with Shanks & Pottenger.
+ Rule CR 1991 only - Jul 1 0:00 0 S
+ Rule CR 1992 only - Mar 15 0:00 0 S
+-# There are too many San Joses elsewhere, so we'll use 'Costa Rica'.
++# There are too many San Josés elsewhere, so we'll use 'Costa Rica'.
+ # 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
++Zone America/Costa_Rica -5:36:13 - LMT 1890 # San José
++ -5:36:13 - SJMT 1921 Jan 15 # San José Mean Time
+ -6:00 CR C%sT
+ # Coco
+ # no information; probably like America/Costa_Rica
+@@ -2685,8 +2624,8 @@
+ # During the game, play-by-play announcer Jim Hunter noted that
+ # "We'll be losing two hours of sleep...Cuba switched to Daylight Saving
+ # Time today." (The "two hour" remark referred to losing one hour of
+-# sleep on 1999-03-28--when the announcers were in Cuba as it switched
+-# to DST--and one more hour on 1999-04-04--when the announcers will have
++# sleep on 1999-03-28 - when the announcers were in Cuba as it switched
++# 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):
+@@ -2708,16 +2647,16 @@
+ # adjustment in Cuba. We will stay in daylight saving time:
+ # http://www.granma.cu/espanol/2005/noviembre/mier9/horario.html
+
+-# From Jesper Norgaard Welen (2006-10-21):
++# From Jesper Nørgaard Welen (2006-10-21):
+ # An article in GRANMA INTERNACIONAL claims that Cuba will end
+ # the 3 years of permanent DST next weekend, see
+ # http://www.granma.cu/ingles/2006/octubre/lun16/43horario.html
+ # "On Saturday night, October 28 going into Sunday, October 29, at 01:00,
+-# watches should be set back one hour -- going back to 00:00 hours -- returning
++# watches should be set back one hour - going back to 00:00 hours - returning
+ # to the normal schedule....
+
+ # From Paul Eggert (2007-03-02):
+-# http://www.granma.cubaweb.cu/english/news/art89.html, dated yesterday,
++# <http://www.granma.cubaweb.cu/english/news/art89.html>, dated yesterday,
+ # says Cuban clocks will advance at midnight on March 10.
+ # For lack of better information, assume Cuba will use US rules,
+ # except that it switches at midnight standard time as usual.
+@@ -2731,10 +2670,10 @@
+ # http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES
+ # http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm
+ #
+-# From Alex Kryvenishev (2007-10-25):
++# From Alex Krivenyshev (2007-10-25):
+ # Here is also article from Granma (Cuba):
+ #
+-# [Regira] el Horario Normal desde el [proximo] domingo 28 de octubre
++# Regirá el Horario Normal desde el próximo domingo 28 de octubre
+ # http://www.granma.cubaweb.cu/2007/10/24/nacional/artic07.html
+ #
+ # http://www.worldtimezone.com/dst_news/dst_news_cuba03.html
+@@ -2742,23 +2681,18 @@
+ # From Arthur David Olson (2008-03-09):
+ # I'm in Maryland which is now observing United States Eastern Daylight
+ # Time. At 9:44 local time I used RealPlayer to listen to
+-# <a href="http://media.enet.cu/radioreloj">
+ # http://media.enet.cu/radioreloj
+-# </a>, a Cuban information station, and heard
++# a Cuban information station, and heard
+ # the time announced as "ocho cuarenta y cuatro" ("eight forty-four"),
+ # indicating that Cuba is still on standard time.
+
+ # From Steffen Thorsen (2008-03-12):
+ # It seems that Cuba will start DST on Sunday, 2007-03-16...
+ # It was announced yesterday, according to this source (in Spanish):
+-# <a href="http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm">
+ # http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm
+-# </a>
+ #
+ # Some more background information is posted here:
+-# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html">
+ # http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html
+-# </a>
+ #
+ # The article also says that Cuba has been observing DST since 1963,
+ # while Shanks (and tzdata) has 1965 as the first date (except in the
+@@ -2768,18 +2702,14 @@
+ # change some historic records as well.
+ #
+ # One example:
+-# <a href="http://www.radiohc.cu/espanol/noticias/mar07/11mar/hor.htm">
+ # http://www.radiohc.cu/espanol/noticias/mar07/11mar/hor.htm
+-# </a>
+
+-# From Jesper Norgaard Welen (2008-03-13):
++# From Jesper Nørgaard Welen (2008-03-13):
+ # The Cuban time change has just been confirmed on the most authoritative
+ # web site, the Granma. Please check out
+-# <a href="http://www.granma.cubaweb.cu/2008/03/13/nacional/artic10.html">
+ # http://www.granma.cubaweb.cu/2008/03/13/nacional/artic10.html
+-# </a>
+ #
+-# Basically as expected after Steffen Thorsens information, the change
++# Basically as expected after Steffen Thorsen's information, the change
+ # will take place midnight between Saturday and Sunday.
+
+ # From Arthur David Olson (2008-03-12):
+@@ -2790,18 +2720,14 @@
+ # midnight between Saturday, March 07, 2009 and Sunday, March 08, 2009-
+ # not on midnight March 14 / March 15 as previously thought.
+ #
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_cuba05.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_cuba05.html
+ # (in Spanish)
+-# </a>
+
+ # From Arthur David Olson (2009-03-09)
+ # I listened over the Internet to
+-# <a href="http://media.enet.cu/readioreloj">
+ # http://media.enet.cu/readioreloj
+-# </a>
+ # this morning; when it was 10:05 a. m. here in Bethesda, Maryland the
+-# the time was announced as "diez cinco"--the same time as here, indicating
++# the time was announced as "diez cinco" - the same time as here, indicating
+ # that has indeed switched to DST. Assume second Sunday from 2009 forward.
+
+ # From Steffen Thorsen (2011-03-08):
+@@ -2810,42 +2736,30 @@
+ # changed at all).
+ #
+ # Source:
+-# <a href="http://granma.co.cu/2011/03/08/nacional/artic01.html">
+ # http://granma.co.cu/2011/03/08/nacional/artic01.html
+-# </a>
+ #
+ # Our info:
+-# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html">
+ # http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
+-# </a>
+ #
+ # From Steffen Thorsen (2011-10-30)
+ # Cuba will end DST two weeks later this year. Instead of going back
+ # tonight, it has been delayed to 2011-11-13 at 01:00.
+ #
+ # One source (Spanish)
+-# <a href="http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html">
+ # http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html
+-# </a>
+ #
+ # Our page:
+-# <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html">
+ # http://www.timeanddate.com/news/time/cuba-time-changes-2011.html
+-# </a>
+ #
+ # From Steffen Thorsen (2012-03-01)
+ # According to Radio Reloj, Cuba will start DST on Midnight between March
+ # 31 and April 1.
+ #
+ # Radio Reloj has the following info (Spanish):
+-# <a href="http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril">
+ # http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril
+-# </a>
+ #
+ # Our info on it:
+-# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html">
+ # http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
+-# </a>
+
+ # From Steffen Thorsen (2012-11-03):
+ # Radio Reloj and many other sources report that Cuba is changing back
+@@ -2901,7 +2815,7 @@
+ -5:00 Cuba C%sT
+
+ # Dominica
+-# See 'southamerica'.
++# See America/Port_of_Spain.
+
+ # Dominican Republic
+
+@@ -2934,8 +2848,8 @@
+ Zone America/Santo_Domingo -4:39:36 - LMT 1890
+ -4:40 - SDMT 1933 Apr 1 12:00 # S. Dom. MT
+ -5:00 DR E%sT 1974 Oct 27
+- -4:00 - AST 2000 Oct 29 02:00
+- -5:00 US E%sT 2000 Dec 3 01:00
++ -4:00 - AST 2000 Oct 29 2:00
++ -5:00 US E%sT 2000 Dec 3 1:00
+ -4:00 - AST
+
+ # El Salvador
+@@ -2946,20 +2860,20 @@
+ # There are too many San Salvadors elsewhere, so use America/El_Salvador
+ # instead of America/San_Salvador.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/El_Salvador -5:56:48 - LMT 1921 # San Salvador
++Zone America/El_Salvador -5:56:48 - LMT 1921 # San Salvador
+ -6:00 Salv C%sT
+
+ # Grenada
+ # Guadeloupe
+-# St Barthelemy
++# St Barthélemy
+ # St Martin (French part)
+-# See 'southamerica'.
++# See America/Port_of_Spain.
+
+ # Guatemala
+ #
+ # From Gwillim Law (2006-04-22), after a heads-up from Oscar van Vlijmen:
+ # Diario Co Latino, at
+-# http://www.diariocolatino.com/internacionales/detalles.asp?NewsID=8079,
++# <http://www.diariocolatino.com/internacionales/detalles.asp?NewsID=8079>,
+ # says in an article dated 2006-04-19 that the Guatemalan government had
+ # decided on that date to advance official time by 60 minutes, to lessen the
+ # impact of the elevated cost of oil.... Daylight saving time will last from
+@@ -2967,7 +2881,7 @@
+ # From Paul Eggert (2006-06-22):
+ # The Ministry of Energy and Mines, press release CP-15/2006
+ # (2006-04-19), says DST ends at 24:00. See
+-# <http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Horario_Nac_190406.pdf>.
++# http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Horario_Nac_190406.pdf
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule Guat 1973 only - Nov 25 0:00 1:00 D
+@@ -2984,11 +2898,10 @@
+
+ # Haiti
+ # From Gwillim Law (2005-04-15):
+-# Risto O. Nykanen wrote me that Haiti is now on DST.
+-# I searched for confirmation, and I found a
+-# <a href="http://www.haitianconsulate.org/time.doc"> press release
++# Risto O. Nykänen wrote me that Haiti is now on DST.
++# I searched for confirmation, and I found a press release
+ # on the Web page of the Haitian Consulate in Chicago (2005-03-31),
+-# </a>. Translated from French, it says:
++# <http://www.haitianconsulate.org/time.doc>. Translated from French, it says:
+ #
+ # "The Prime Minister's Communication Office notifies the public in general
+ # and the press in particular that, following a decision of the Interior
+@@ -3065,14 +2978,14 @@
+ # <http://www.latribuna.hn/99299.html> that Manuel Zelaya, the president
+ # of Honduras, refused to back down on this.
+
+-# From Jesper Norgaard Welen (2006-08-08):
++# From Jesper Nørgaard Welen (2006-08-08):
+ # It seems that Honduras has returned from DST to standard time this Monday at
+ # 00:00 hours (prolonging Sunday to 25 hours duration).
+ # http://www.worldtimezone.com/dst_news/dst_news_honduras04.html
+
+ # From Paul Eggert (2006-08-08):
+-# Also see Diario El Heraldo, The country returns to standard time (2006-08-08)
+-# <http://www.elheraldo.hn/nota.php?nid=54941&sec=12>.
++# Also see Diario El Heraldo, The country returns to standard time (2006-08-08).
++# http://www.elheraldo.hn/nota.php?nid=54941&sec=12
+ # It mentions executive decree 18-2006.
+
+ # From Steffen Thorsen (2006-08-17):
+@@ -3099,23 +3012,34 @@
+ # Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
+ # unspecified official document, and says "This time is used throughout the
+ # island". Go with Milne. Round to the nearest second as required by zic.
++#
++# Shanks & Pottenger give April 28 for the 1974 spring-forward transition, but
++# Lance Neita writes that Prime Minister Michael Manley decreed it January 5.
++# Assume Neita meant Jan 6 02:00, the same as the US. Neita also writes that
++# Manley's supporters associated this act with Manley's nickname "Joshua"
++# (recall that in the Bible the sun stood still at Joshua's request),
++# and with the Rod of Correction which Manley said he had received from
++# Haile Selassie, Emperor of Ethiopia. See:
++# Neita L. The politician in all of us. Jamaica Observer 2014-09-20
++# http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647
++#
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Jamaica -5:07:11 - LMT 1890 # Kingston
++Zone America/Jamaica -5:07:11 - LMT 1890 # Kingston
+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
+- -5:00 - EST 1974 Apr 28 2:00
++ -5:00 - EST 1974
+ -5:00 US E%sT 1984
+ -5:00 - EST
+
+ # Martinique
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Martinique -4:04:20 - LMT 1890 # Fort-de-France
+- -4:04:20 - FFMT 1911 May # Fort-de-France MT
++Zone America/Martinique -4:04:20 - LMT 1890 # Fort-de-France
++ -4:04:20 - FFMT 1911 May # Fort-de-France MT
+ -4:00 - AST 1980 Apr 6
+ -4:00 1:00 ADT 1980 Sep 28
+ -4:00 - AST
+
+ # Montserrat
+-# See 'southamerica'.
++# See America/Port_of_Spain.
+
+ # Nicaragua
+ #
+@@ -3138,27 +3062,27 @@
+ # From Gwillim Law (2005-04-21):
+ # The Associated Press story on the time change, which can be found at
+ # http://www.lapalmainteractivo.com/guias/content/gen/ap/America_Latina/AMC_GEN_NICARAGUA_HORA.html
+-# and elsewhere, says (fifth paragraph, translated from Spanish): "The last
++# and elsewhere, says (fifth paragraph, translated from Spanish): "The last
+ # time that a change of clocks was applied to save energy was in the year 2000
+-# during the Arnoldo Aleman administration."...
++# during the Arnoldo Alemán administration."...
+ # The northamerica file says that Nicaragua has been on UTC-6 continuously
+ # since December 1998. I wasn't able to find any details of Nicaraguan time
+ # changes in 2000. Perhaps a note could be added to the northamerica file, to
+ # the effect that we have indirect evidence that DST was observed in 2000.
+ #
+-# From Jesper Norgaard Welen (2005-11-02):
++# From Jesper Nørgaard Welen (2005-11-02):
+ # Nicaragua left DST the 2005-10-02 at 00:00 (local time).
+ # http://www.presidencia.gob.ni/presidencia/files_index/secretaria/comunicados/2005/septiembre/26septiembre-cambio-hora.htm
+ # (2005-09-26)
+ #
+-# From Jesper Norgaard Welen (2006-05-05):
++# From Jesper Nørgaard Welen (2006-05-05):
+ # http://www.elnuevodiario.com.ni/2006/05/01/nacionales/18410
+ # (my informal translation)
+-# By order of the president of the republic, Enrique Bolanos, Nicaragua
++# By order of the president of the republic, Enrique Bolaños, Nicaragua
+ # advanced by sixty minutes their official time, yesterday at 2 in the
+-# morning, and will stay that way until 30.th. of september.
++# morning, and will stay that way until 30th of September.
+ #
+-# From Jesper Norgaard Welen (2006-09-30):
++# From Jesper Nørgaard Welen (2006-09-30):
+ # http://www.presidencia.gob.ni/buscador_gaceta/BD/DECRETOS/2006/D-063-2006P-PRN-Cambio-Hora.pdf
+ # My informal translation runs:
+ # The natural sun time is restored in all the national territory, in that the
+@@ -3176,7 +3100,7 @@
+ -5:45:12 - MMT 1934 Jun 23 # Managua Mean Time?
+ -6:00 - CST 1973 May
+ -5:00 - EST 1975 Feb 16
+- -6:00 Nic C%sT 1992 Jan 1 4:00
++ -6:00 Nic C%sT 1992 Jan 1 4:00
+ -5:00 - EST 1992 Sep 24
+ -6:00 - CST 1993
+ -5:00 - EST 1997
+@@ -3185,36 +3109,36 @@
+ # Panama
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Panama -5:18:08 - LMT 1890
+- -5:19:36 - CMT 1908 Apr 22 # Colon Mean Time
++ -5:19:36 - CMT 1908 Apr 22 # Colón Mean Time
+ -5:00 - EST
+
+ # Puerto Rico
+ # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan
++Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan
+ -4:00 - AST 1942 May 3
+ -4:00 US A%sT 1946
+ -4:00 - AST
+
+ # St Kitts-Nevis
+ # St Lucia
+-# See 'southamerica'.
++# See America/Port_of_Spain.
+
+ # St Pierre and Miquelon
+ # There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre
++Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre
+ -4:00 - AST 1980 May
+ -3:00 - PMST 1987 # Pierre & Miquelon Time
+ -3:00 Canada PM%sT
+
+ # St Vincent and the Grenadines
+-# See 'southamerica'.
++# See America/Port_of_Spain.
+
+ # Turks and Caicos
+ #
+ # From Chris Dunn in
+-# <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007>
++# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007
+ # (2007-03-15): In the Turks & Caicos Islands (America/Grand_Turk) the
+ # daylight saving dates for time changes have been adjusted to match
+ # the recent U.S. change of dates.
+@@ -3227,21 +3151,27 @@
+ # Clocks are set back one hour at 2:00 a.m. local Daylight Saving Time"
+ # indicating that the normal ET rules are followed.
+ #
+-# From Paul Eggert (2006-05-01):
+-# Shanks & Pottenger say they use US DST rules, but IATA SSIM (1991/1998)
+-# says they switch at midnight. Go with Shanks & Pottenger.
++# From Paul Eggert (2014-08-19):
++# The 2014-08-13 Cabinet meeting decided to stay on UTC-4 year-round. See:
++# http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
++# Model this as a switch from EST/EDT to AST ...
++# From Chris Walton (2014-11-04):
++# ... the TCI government appears to have delayed the switch to
++# "permanent daylight saving time" by one year....
++# http://tcweeklynews.com/time-change-to-go-ahead-this-november-p5437-127.htm
+ #
+-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-Rule TC 1979 1986 - Apr lastSun 2:00 1:00 D
+-Rule TC 1979 2006 - Oct lastSun 2:00 0 S
+-Rule TC 1987 2006 - Apr Sun>=1 2:00 1:00 D
+-Rule TC 2007 max - Mar Sun>=8 2:00 1:00 D
+-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
+- -5:07:11 - KMT 1912 Feb # Kingston Mean Time
+- -5:00 TC E%sT
++ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
++ -5:00 - EST 1979
++ -5:00 US E%sT 2015 Nov Sun>=1 2:00
++ -4:00 - AST
+
+ # British Virgin Is
+ # Virgin Is
+-# See 'southamerica'.
++# See America/Port_of_Spain.
++
++
++# Local Variables:
++# coding: utf-8
++# End:
+--- ./jdk/make/sun/javazic/tzdata/pacificnew Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/pacificnew Mon Jan 05 11:57:27 2015 -0800
+@@ -21,7 +21,6 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+--- ./jdk/make/sun/javazic/tzdata/southamerica Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/southamerica Mon Jan 05 11:57:27 2015 -0800
+@@ -21,31 +21,31 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+-# This data is by no means authoritative; if you think you know better,
++# This file is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+-# tz@iana.org for general use in the future).
++# tz@iana.org for general use in the future). For more, please see
++# the file CONTRIBUTING in the tz distribution.
+
+-# From Paul Eggert (2006-03-22):
+-# A good source for time zone historical data outside the U.S. is
++# From Paul Eggert (2014-10-31):
++#
++# Unless otherwise specified, the source for data through 1990 is:
+ # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
+ # San Diego: ACS Publications, Inc. (2003).
+-#
+-# For data circa 1899, a common source is:
+-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
+-# <http://www.jstor.org/stable/1774359>.
++# Unfortunately this book contains many errors and cites no sources.
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+ # Association's Standard Schedules Information Manual (IATA SSIM),
+ # published semiannually. Law sent in several helpful summaries
+-# of the IATA's data after 1990.
++# of the IATA's data after 1990. Except where otherwise noted,
++# IATA SSIM is the source for entries after 1990.
+ #
+-# Except where otherwise noted, Shanks & Pottenger is the source for
+-# entries through 1990, and IATA SSIM is the source for entries afterwards.
++# For data circa 1899, a common source is:
++# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
++# http://www.jstor.org/stable/1774359
+ #
+ # Earlier editions of these tables used the North American style (e.g. ARST and
+ # ARDT for Argentine Standard and Daylight Time), but the following quote
+@@ -53,24 +53,24 @@
+ # I suggest the use of _Summer time_ instead of the more cumbersome
+ # _daylight-saving time_. _Summer time_ seems to be in general use
+ # in Europe and South America.
+-# -- E O Cutler, _New York Times_ (1937-02-14), quoted in
++# -- E O Cutler, _New York Times_ (1937-02-14), quoted in
+ # H L Mencken, _The American Language: Supplement I_ (1960), p 466
+ #
+ # Earlier editions of these tables also used the North American style
+ # for time zones in Brazil, but this was incorrect, as Brazilians say
+-# "summer time". Reinaldo Goulart, a Sao Paulo businessman active in
++# "summer time". Reinaldo Goulart, a São Paulo businessman active in
+ # the railroad sector, writes (1999-07-06):
+ # The subject of time zones is currently a matter of discussion/debate in
+-# Brazil. Let's say that "the Brasilia time" is considered the
+-# "official time" because Brasilia is the capital city.
+-# The other three time zones are called "Brasilia time "minus one" or
++# Brazil. Let's say that "the Brasília time" is considered the
++# "official time" because Brasília is the capital city.
++# The other three time zones are called "Brasília time "minus one" or
+ # "plus one" or "plus two". As far as I know there is no such
+ # name/designation as "Eastern Time" or "Central Time".
+ # So I invented the following (English-language) abbreviations for now.
+ # Corrections are welcome!
+ # std dst
+ # -2:00 FNT FNST Fernando de Noronha
+-# -3:00 BRT BRST Brasilia
++# -3:00 BRT BRST Brasília
+ # -4:00 AMT AMST Amazon
+ # -5:00 ACT ACST Acre
+
+@@ -84,7 +84,7 @@
+ # Argentina: first Sunday in October to first Sunday in April since 1976.
+ # Double Summer time from 1969 to 1974. Switches at midnight.
+
+-# From U. S. Naval Observatory (1988-01-199):
++# From U. S. Naval Observatory (1988-01-19):
+ # ARGENTINA 3 H BEHIND UTC
+
+ # From Hernan G. Otero (1995-06-26):
+@@ -118,7 +118,7 @@
+ # From Hernan G. Otero (1995-06-26):
+ # These corrections were contributed by InterSoft Argentina S.A.,
+ # obtaining the data from the:
+-# Talleres de Hidrografia Naval Argentina
++# Talleres de Hidrografía Naval Argentina
+ # (Argentine Naval Hydrography Institute)
+ Rule Arg 1989 1993 - Mar Sun>=1 0:00 0 -
+ Rule Arg 1989 1992 - Oct Sun>=15 0:00 1:00 S
+@@ -140,13 +140,13 @@
+ Rule Arg 2000 only - Mar 3 0:00 0 -
+ #
+ # From Peter Gradelski via Steffen Thorsen (2000-03-01):
+-# We just checked with our Sao Paulo office and they say the government of
++# We just checked with our São Paulo office and they say the government of
+ # Argentina decided not to become one of the countries that go on or off DST.
+ # So Buenos Aires should be -3 hours from GMT at all times.
+ #
+-# From Fabian L. Arce Jofre (2000-04-04):
++# From Fabián L. Arce Jofré (2000-04-04):
+ # The law that claimed DST for Argentina was derogated by President Fernando
+-# de la Rua on March 2, 2000, because it would make people spend more energy
++# de la Rúa on March 2, 2000, because it would make people spend more energy
+ # in the winter time, rather than less. The change took effect on March 3.
+ #
+ # From Mariano Absatz (2001-06-06):
+@@ -179,15 +179,13 @@
+ # that Argentina will use DST next year as well, from October to
+ # March, although exact rules are not given.
+ #
+-# From Jesper Norgaard Welen (2007-12-26)
++# From Jesper Nørgaard Welen (2007-12-26)
+ # The last hurdle of Argentina DST is over, the proposal was approved in
+-# the lower chamber too (Deputados) with a vote 192 for and 2 against.
++# the lower chamber too (Diputados) with a vote 192 for and 2 against.
+ # By the way thanks to Mariano Absatz and Daniel Mario Vega for the link to
+ # the original scanned proposal, where the dates and the zero hours are
+ # clear and unambiguous...This is the article about final approval:
+-# <a href="http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996">
+ # http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996
+-# </a>
+ #
+ # From Paul Eggert (2007-12-22):
+ # For dates after mid-2008, the following rules are my guesses and
+@@ -197,13 +195,8 @@
+ # As per message from Carlos Alberto Fonseca Arauz (Nicaragua),
+ # Argentina will start DST on Sunday October 19, 2008.
+ #
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_argentina03.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
+-# </a>
+-# OR
+-# <a href="http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)">
+ # http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
+-# </a>
+
+ # From Rodrigo Severo (2008-10-06):
+ # Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+@@ -212,48 +205,39 @@
+ # Hi, there is a problem with timezone-data-2008e and maybe with
+ # timezone-data-2008f
+ # Argentinian law [Number] 25.155 is no longer valid.
+-# <a href="http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm">
+ # http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
+-# </a>
+ # The new one is law [Number] 26.350
+-# <a href="http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm">
+ # http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
+-# </a>
+ # So there is no summer time in Argentina for now.
+
+ # From Mariano Absatz (2008-10-20):
+-# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+-# From 2008-10-19 until 2009-03-15
+-# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01">
++# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST
++# in Argentina from 2008-10-19 until 2009-03-15.
+ # http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+-# </a>
+ #
+-# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
+-# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
+-# and Tierra del Fuego
+-# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01">
++
++# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer
++# 2008/2009: Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La
++# Pampa, Neuquén, Rio Negro, Chubut, Santa Cruz and Tierra del Fuego
+ # http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+-# </a>
+ #
+-# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+-# it will not apply DST either (even when it was not included in Decree 1705/2008)
+-# <a href="http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc">
++# Press release 235 dated Saturday October 18th, from the Government of the
++# Province of Jujuy saying it will not apply DST either (even when it was not
++# included in Decree 1705/2008).
+ # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+-# </a>
+
+ # From fullinet (2009-10-18):
+ # As announced in
+-# <a hef="http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356">
+ # http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356
+-# </a>
+-# (an official .gob.ar) under title: "Sin Cambio de Hora" (english: "No hour change")
++# (an official .gob.ar) under title: "Sin Cambio de Hora"
++# (English: "No hour change").
+ #
+-# "Por el momento, el Gobierno Nacional resolvio no modificar la hora
+-# oficial, decision que estaba en estudio para su implementacion el
+-# domingo 18 de octubre. Desde el Ministerio de Planificacion se anuncio
+-# que la Argentina hoy, en estas condiciones meteorologicas, no necesita
+-# la modificacion del huso horario, ya que 2009 nos encuentra con
+-# crecimiento en la produccion y distribucion energetica."
++# "Por el momento, el Gobierno Nacional resolvió no modificar la hora
++# oficial, decisión que estaba en estudio para su implementación el
++# domingo 18 de octubre. Desde el Ministerio de Planificación se anunció
++# que la Argentina hoy, en estas condiciones meteorológicas, no necesita
++# la modificación del huso horario, ya que 2009 nos encuentra con
++# crecimiento en la producción y distribución energética."
+
+ Rule Arg 2007 only - Dec 30 0:00 1:00 S
+ Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 -
+@@ -267,10 +251,10 @@
+ # It's Law No. 7,210. This change is due to a public power emergency, so for
+ # now we'll assume it's for this year only.
+ #
+-# From Paul Eggert (2006-03-22):
+-# <a href="http://www.spicasc.net/horvera.html">
+-# Hora de verano para la Republica Argentina (2003-06-08)
+-# </a> says that standard time in Argentina from 1894-10-31
++# From Paul Eggert (2014-08-09):
++# Hora de verano para la República Argentina
++# http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html
++# says that standard time in Argentina from 1894-10-31
+ # to 1920-05-01 was -4:16:48.25. Go with this more-precise value
+ # over Shanks & Pottenger.
+ #
+@@ -285,10 +269,10 @@
+ # time in October 17th.
+ #
+ # Catamarca, Chubut, La Rioja, San Juan, San Luis, Santa Cruz,
+-# Tierra del Fuego, Tucuman.
++# Tierra del Fuego, Tucumán.
+ #
+ # From Mariano Absatz (2004-06-14):
+-# ... this weekend, the Province of Tucuman decided it'd go back to UTC-03:00
++# ... this weekend, the Province of Tucumán decided it'd go back to UTC-03:00
+ # yesterday midnight (that is, at 24:00 Saturday 12th), since the people's
+ # annoyance with the change is much higher than the power savings obtained....
+ #
+@@ -323,49 +307,38 @@
+ # Here are articles that Argentina Province San Luis is planning to end DST
+ # as earlier as upcoming Monday January 21, 2008 or February 2008:
+ #
+-# Provincia argentina retrasa reloj y marca diferencia con resto del pais
++# Provincia argentina retrasa reloj y marca diferencia con resto del país
+ # (Argentine Province delayed clock and mark difference with the rest of the
+ # country)
+-# <a href="http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel">
+ # http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel
+-# </a>
+ #
+ # Es inminente que en San Luis atrasen una hora los relojes
+ # (It is imminent in San Luis clocks one hour delay)
+-# <a href="http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414">
+-# http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414
+-# </a>
+-#
+-# <a href="http://www.worldtimezone.net/dst_news/dst_news_argentina02.html">
++# http://www.lagaceta.com.ar/nota/253414/Economia/Es-inminente-que-en-San-Luis-atrasen-una-hora-los-relojes.html
+ # http://www.worldtimezone.net/dst_news/dst_news_argentina02.html
+-# </a>
+
+-# From Jesper Norgaard Welen (2008-01-18):
++# From Jesper Nørgaard Welen (2008-01-18):
+ # The page of the San Luis provincial government
+-# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812">
+ # http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812
+-# </a>
+ # confirms what Alex Krivenyshev has earlier sent to the tz
+ # emailing list about that San Luis plans to return to standard
+ # time much earlier than the rest of the country. It also
+ # confirms that upon request the provinces San Juan and Mendoza
+ # refused to follow San Luis in this change.
+ #
+-# The change is supposed to take place Monday the 21.st at 0:00
++# The change is supposed to take place Monday the 21st at 0:00
+ # hours. As far as I understand it if this goes ahead, we need
+ # a new timezone for San Luis (although there are also documented
+ # independent changes in the southamerica file of San Luis in
+ # 1990 and 1991 which has not been confirmed).
+
+-# From Jesper Norgaard Welen (2008-01-25):
++# From Jesper Nørgaard Welen (2008-01-25):
+ # Unfortunately the below page has become defunct, about the San Luis
+ # time change. Perhaps because it now is part of a group of pages "Most
+ # important pages of 2008."
+ #
+ # You can use
+-# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834">
+ # http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834
+-# </a>
+ # instead it seems. Or use "Buscador" from the main page of the San Luis
+ # government, and fill in "huso" and click OK, and you will get 3 pages
+ # from which the first one is identical to the above.
+@@ -385,9 +358,9 @@
+ # back in 2004, when these provinces changed to UTC-4 for a few days, I
+ # mailed them personally and never got an answer).
+
+-# From Paul Eggert (2008-06-30):
+-# Unless otherwise specified, data are from Shanks & Pottenger through 1992,
+-# from the IATA otherwise. As noted below, Shanks & Pottenger say that
++# From Paul Eggert (2014-08-12):
++# Unless otherwise specified, data entries are from Shanks & Pottenger through
++# 1992, from the IATA otherwise. As noted below, Shanks & Pottenger say that
+ # America/Cordoba split into 6 subregions during 1991/1992, one of which
+ # was America/San_Luis, but we haven't verified this yet so for now we'll
+ # keep America/Cordoba a single region rather than splitting it into the
+@@ -399,14 +372,9 @@
+ # to utc-04:00 until the second Saturday in October...
+ #
+ # The press release is at
+-# <a href="http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102">
+ # http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102
+-# </a>
+-# (I couldn't find the decree, but
+-# <a href="http://www.sanluis.gov.ar">
+-# www.sanluis.gov.ar
+-# <a/>
+-# is the official page for the Province Government).
++# (I couldn't find the decree, but www.sanluis.gov.ar
++# is the official page for the Province Government.)
+ #
+ # There's also a note in only one of the major national papers ...
+ # http://www.lanacion.com.ar/nota.asp?nota_id=1107912
+@@ -423,9 +391,7 @@
+ # ...the Province of San Luis is a case in itself.
+ #
+ # The Law at
+-# <a href="http://www.diputadossanluis.gov.ar/diputadosasp/paginas/verNorma.asp?NormaID=276>"
+ # http://www.diputadossanluis.gov.ar/diputadosasp/paginas/verNorma.asp?NormaID=276
+-# </a>
+ # is ambiguous because establishes a calendar from the 2nd Sunday in
+ # October at 0:00 thru the 2nd Saturday in March at 24:00 and the
+ # complement of that starting on the 2nd Sunday of March at 0:00 and
+@@ -454,19 +420,15 @@
+ # ...
+
+ # From Alexander Krivenyshev (2010-04-09):
+-# According to news reports from El Diario de la Republica Province San
++# According to news reports from El Diario de la República Province San
+ # Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
+-# after April 11, 2010--will continue to have same time as rest of
++# after April 11, 2010 - will continue to have same time as rest of
+ # Argentina (UTC-3) (no DST).
+ #
+-# Confirmaron la pr&oacute;rroga del huso horario de verano (Spanish)
+-# <a href="http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9">
++# Confirmaron la prórroga del huso horario de verano (Spanish)
+ # http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9
+-# </a>
+ # or (some English translation):
+-# <a href="http://www.worldtimezone.com/dst_news/dst_news_argentina08.html">
+ # http://www.worldtimezone.com/dst_news/dst_news_argentina08.html
+-# </a>
+
+ # From Mariano Absatz (2010-04-12):
+ # yes...I can confirm this...and given that San Luis keeps calling
+@@ -478,7 +440,7 @@
+ # Perhaps San Luis operates on the legal fiction that it is at UTC-4
+ # with perpetual summer time, but ordinary usage typically seems to
+ # just say it's at UTC-3; see, for example,
+-# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
++# http://es.wikipedia.org/wiki/Hora_oficial_argentina
+ # We've documented similar situations as being plain changes to
+ # standard time, so let's do that here too. This does not change UTC
+ # offsets, only tm_isdst and the time zone abbreviations. One minor
+@@ -486,20 +448,20 @@
+ # setting for time stamps past 2038.
+
+ # From Paul Eggert (2013-02-21):
+-# Milne says Cordoba time was -4:16:48.2. Round to the nearest second.
++# Milne says Córdoba time was -4:16:48.2. Round to the nearest second.
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ #
+ # Buenos Aires (BA), Capital Federal (CF),
+-Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
+- -4:16:48 - CMT 1920 May # Cordoba Mean Time
++Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
++ -4:16:48 - CMT 1920 May # Córdoba Mean Time
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1999 Oct 3
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 Arg AR%sT
+ #
+-# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
++# Córdoba (CB), Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN),
+ # Chaco (CC), Formosa (FM), Santiago del Estero (SE)
+ #
+ # Shanks & Pottenger also make the following claims, which we haven't verified:
+@@ -519,7 +481,7 @@
+ -4:00 Arg AR%sT 2000 Mar 3
+ -3:00 Arg AR%sT
+ #
+-# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
++# Salta (SA), La Pampa (LP), Neuquén (NQ), Rio Negro (RN)
+ Zone America/Argentina/Salta -4:21:40 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+@@ -531,7 +493,7 @@
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+ #
+-# Tucuman (TM)
++# Tucumán (TM)
+ Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+@@ -642,8 +604,8 @@
+ -3:00 - ART
+ #
+ # Santa Cruz (SC)
+-Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
+- -4:16:48 - CMT 1920 May # Cordoba Mean Time
++Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
++ -4:16:48 - CMT 1920 May # Córdoba Mean Time
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1999 Oct 3
+@@ -653,9 +615,9 @@
+ -3:00 Arg AR%sT 2008 Oct 18
+ -3:00 - ART
+ #
+-# Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
+-Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
+- -4:16:48 - CMT 1920 May # Cordoba Mean Time
++# Tierra del Fuego, Antártida e Islas del Atlántico Sur (TF)
++Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
++ -4:16:48 - CMT 1920 May # Córdoba Mean Time
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1999 Oct 3
+@@ -686,13 +648,13 @@
+
+ # From IATA SSIM (1996-02):
+ # _Only_ the following states in BR1 observe DST: Rio Grande do Sul (RS),
+-# Santa Catarina (SC), Parana (PR), Sao Paulo (SP), Rio de Janeiro (RJ),
+-# Espirito Santo (ES), Minas Gerais (MG), Bahia (BA), Goias (GO),
++# Santa Catarina (SC), Paraná (PR), São Paulo (SP), Rio de Janeiro (RJ),
++# Espírito Santo (ES), Minas Gerais (MG), Bahia (BA), Goiás (GO),
+ # Distrito Federal (DF), Tocantins (TO), Sergipe [SE] and Alagoas [AL].
+ # [The last three states are new to this issue of the IATA SSIM.]
+
+ # From Gwillim Law (1996-10-07):
+-# Geography, history (Tocantins was part of Goias until 1989), and other
++# Geography, history (Tocantins was part of Goiás until 1989), and other
+ # sources of time zone information lead me to believe that AL, SE, and TO were
+ # always in BR1, and so the only change was whether or not they observed DST....
+ # The earliest issue of the SSIM I have is 2/91. Each issue from then until
+@@ -706,16 +668,14 @@
+ # However, some conclusions can be drawn from another IATA manual: the Airline
+ # Coding Directory, which lists close to 400 airports in Brazil. For each
+ # airport it gives a time zone which is coded to the SSIM. From that
+-# information, I'm led to conclude that the states of Amapa (AP), Ceara (CE),
+-# Maranhao (MA), Paraiba (PR), Pernambuco (PE), Piaui (PI), and Rio Grande do
+-# Norte (RN), and the eastern part of Para (PA) are all in BR1 without DST.
++# information, I'm led to conclude that the states of Amapá (AP), Ceará (CE),
++# Maranhão (MA), Paraíba (PR), Pernambuco (PE), Piauí (PI), and Rio Grande do
++# Norte (RN), and the eastern part of Pará (PA) are all in BR1 without DST.
+
+ # From Marcos Tadeu (1998-09-27):
+-# <a href="http://pcdsh01.on.br/verao1.html">
+-# Brazilian official page
+-# </a>
++# Brazilian official page <http://pcdsh01.on.br/verao1.html>
+
+-# From Jesper Norgaard (2000-11-03):
++# From Jesper Nørgaard (2000-11-03):
+ # [For an official list of which regions in Brazil use which time zones, see:]
+ # http://pcdsh01.on.br/Fusbr.htm
+ # http://pcdsh01.on.br/Fusbrhv.htm
+@@ -748,13 +708,13 @@
+
+ # From Paul Schulze (2008-06-24):
+ # ...by law number 11.662 of April 24, 2008 (published in the "Diario
+-# Oficial da Uniao"...) in Brazil there are changes in the timezones,
++# Oficial da União"...) in Brazil there are changes in the timezones,
+ # effective today (00:00am at June 24, 2008) as follows:
+ #
+-# a) The timezone UTC+5 is e[x]tinguished, with all the Acre state and the
++# a) The timezone UTC+5 is extinguished, with all the Acre state and the
+ # part of the Amazonas state that had this timezone now being put to the
+ # timezone UTC+4
+-# b) The whole Para state now is put at timezone UTC+3, instead of just
++# b) The whole Pará state now is put at timezone UTC+3, instead of just
+ # part of it, as was before.
+ #
+ # This change follows a proposal of senator Tiao Viana of Acre state, that
+@@ -767,13 +727,11 @@
+
+ # From Rodrigo Severo (2008-06-24):
+ # Just correcting the URL:
+-# <a href="https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008">
+ # https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008
+-# </a>
+ #
+ # As a result of the above Decree I believe the America/Rio_Branco
+ # timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall
+-# be created to represent the...west side of the Para State. I
++# be created to represent the...west side of the Pará State. I
+ # suggest this new timezone be called Santarem as the most
+ # important/populated city in the affected area.
+ #
+@@ -782,19 +740,16 @@
+
+ # From Alex Krivenyshev (2008-06-24):
+ # This is a quick reference page for New and Old Brazil Time Zones map.
+-# <a href="http://www.worldtimezone.com/brazil-time-new-old.php">
+ # http://www.worldtimezone.com/brazil-time-new-old.php
+-# </a>
+ #
+-# - 4 time zones replaced by 3 time zones-eliminating time zone UTC- 05
+-# (state Acre and the part of the Amazonas will be UTC/GMT- 04) - western
+-# part of Par state is moving to one timezone UTC- 03 (from UTC -04).
++# - 4 time zones replaced by 3 time zones - eliminating time zone UTC-05
++# (state Acre and the part of the Amazonas will be UTC/GMT-04) - western
++# part of Par state is moving to one timezone UTC-03 (from UTC-04).
+
+ # From Paul Eggert (2002-10-10):
+ # The official decrees referenced below are mostly taken from
+-# <a href="http://pcdsh01.on.br/DecHV.html">
+-# Decretos sobre o Horario de Verao no Brasil
+-# </a>.
++# Decretos sobre o Horário de Verão no Brasil.
++# http://pcdsh01.on.br/DecHV.html
+
+ # From Steffen Thorsen (2008-08-29):
+ # As announced by the government and many newspapers in Brazil late
+@@ -806,25 +761,17 @@
+ # It has not yet been posted to http://pcdsh01.on.br/DecHV.html
+ #
+ # An official page about it:
+-# <a href="http://www.mme.gov.br/site/news/detail.do?newsId=16722">
+ # http://www.mme.gov.br/site/news/detail.do?newsId=16722
+-# </a>
+ # Note that this link does not always work directly, but must be accessed
+ # by going to
+-# <a href="http://www.mme.gov.br/first">
+ # http://www.mme.gov.br/first
+-# </a>
+ #
+ # One example link that works directly:
+-# <a href="http://jornale.com.br/index.php?option=com_content&task=view&id=13530&Itemid=54">
+ # http://jornale.com.br/index.php?option=com_content&task=view&id=13530&Itemid=54
+ # (Portuguese)
+-# </a>
+ #
+ # We have a written a short article about it as well:
+-# <a href="http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html">
+ # http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
+-# </a>
+ #
+ # From Alexander Krivenyshev (2011-10-04):
+ # State Bahia will return to Daylight savings time this year after 8 years off.
+@@ -832,17 +779,12 @@
+ # television station in Salvador.
+
+ # In Portuguese:
+-# <a href="http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html">
+ # http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html
+-# </a> and
+-# <a href="http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html">
+ # http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
+-# </a>
+
+ # From Guilherme Bernardes Rodrigues (2011-10-07):
+ # There is news in the media, however there is still no decree about it.
+-# I just send a e-mail to Zulmira Brandao at
+-# <a href="http://pcdsh01.on.br/">http://pcdsh01.on.br/</a> the
++# I just send a e-mail to Zulmira Brandao at http://pcdsh01.on.br/ the
+ # official agency about time in Brazil, and she confirmed that the old rule is
+ # still in force.
+
+@@ -854,9 +796,7 @@
+ #
+ # DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+ # Link :
+-# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">
+ # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+-# </a>
+
+ # From Kelley Cook (2012-10-16):
+ # The governor of state of Bahia in Brazil announced on Thursday that
+@@ -884,42 +824,42 @@
+ # For now, assume western Amazonas will change as well.
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+-# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
+-# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
++# Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
++# Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
+ Rule Brazil 1931 only - Oct 3 11:00 1:00 S
+ Rule Brazil 1932 1933 - Apr 1 0:00 0 -
+ Rule Brazil 1932 only - Oct 3 0:00 1:00 S
+-# Decree <a href="http://pcdsh01.on.br/HV23195.htm">23,195</a> (1933-10-10)
++# Decree 23,195 <http://pcdsh01.on.br/HV23195.htm> (1933-10-10)
+ # revoked DST.
+-# Decree <a href="http://pcdsh01.on.br/HV27496.htm">27,496</a> (1949-11-24)
+-# Decree <a href="http://pcdsh01.on.br/HV27998.htm">27,998</a> (1950-04-13)
++# Decree 27,496 <http://pcdsh01.on.br/HV27496.htm> (1949-11-24)
++# Decree 27,998 <http://pcdsh01.on.br/HV27998.htm> (1950-04-13)
+ Rule Brazil 1949 1952 - Dec 1 0:00 1:00 S
+ Rule Brazil 1950 only - Apr 16 1:00 0 -
+ Rule Brazil 1951 1952 - Apr 1 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV32308.htm">32,308</a> (1953-02-24)
++# Decree 32,308 <http://pcdsh01.on.br/HV32308.htm> (1953-02-24)
+ Rule Brazil 1953 only - Mar 1 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV34724.htm">34,724</a> (1953-11-30)
++# Decree 34,724 <http://pcdsh01.on.br/HV34724.htm> (1953-11-30)
+ # revoked DST.
+-# Decree <a href="http://pcdsh01.on.br/HV52700.htm">52,700</a> (1963-10-18)
++# Decree 52,700 <http://pcdsh01.on.br/HV52700.htm> (1963-10-18)
+ # established DST from 1963-10-23 00:00 to 1964-02-29 00:00
+ # in SP, RJ, GB, MG, ES, due to the prolongation of the drought.
+-# Decree <a href="http://pcdsh01.on.br/HV53071.htm">53,071</a> (1963-12-03)
++# Decree 53,071 <http://pcdsh01.on.br/HV53071.htm> (1963-12-03)
+ # extended the above decree to all of the national territory on 12-09.
+ Rule Brazil 1963 only - Dec 9 0:00 1:00 S
+-# Decree <a href="http://pcdsh01.on.br/HV53604.htm">53,604</a> (1964-02-25)
++# Decree 53,604 <http://pcdsh01.on.br/HV53604.htm> (1964-02-25)
+ # extended summer time by one day to 1964-03-01 00:00 (start of school).
+ Rule Brazil 1964 only - Mar 1 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV55639.htm">55,639</a> (1965-01-27)
++# Decree 55,639 <http://pcdsh01.on.br/HV55639.htm> (1965-01-27)
+ Rule Brazil 1965 only - Jan 31 0:00 1:00 S
+ Rule Brazil 1965 only - Mar 31 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV57303.htm">57,303</a> (1965-11-22)
++# Decree 57,303 <http://pcdsh01.on.br/HV57303.htm> (1965-11-22)
+ Rule Brazil 1965 only - Dec 1 0:00 1:00 S
+-# Decree <a href="http://pcdsh01.on.br/HV57843.htm">57,843</a> (1966-02-18)
++# Decree 57,843 <http://pcdsh01.on.br/HV57843.htm> (1966-02-18)
+ Rule Brazil 1966 1968 - Mar 1 0:00 0 -
+ Rule Brazil 1966 1967 - Nov 1 0:00 1:00 S
+-# Decree <a href="http://pcdsh01.on.br/HV63429.htm">63,429</a> (1968-10-15)
++# Decree 63,429 <http://pcdsh01.on.br/HV63429.htm> (1968-10-15)
+ # revoked DST.
+-# Decree <a href="http://pcdsh01.on.br/HV91698.htm">91,698</a> (1985-09-27)
++# Decree 91,698 <http://pcdsh01.on.br/HV91698.htm> (1985-09-27)
+ Rule Brazil 1985 only - Nov 2 0:00 1:00 S
+ # Decree 92,310 (1986-01-21)
+ # Decree 92,463 (1986-03-13)
+@@ -927,42 +867,42 @@
+ # Decree 93,316 (1986-10-01)
+ Rule Brazil 1986 only - Oct 25 0:00 1:00 S
+ Rule Brazil 1987 only - Feb 14 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV94922.htm">94,922</a> (1987-09-22)
++# Decree 94,922 <http://pcdsh01.on.br/HV94922.htm> (1987-09-22)
+ Rule Brazil 1987 only - Oct 25 0:00 1:00 S
+ Rule Brazil 1988 only - Feb 7 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV96676.htm">96,676</a> (1988-09-12)
++# Decree 96,676 <http://pcdsh01.on.br/HV96676.htm> (1988-09-12)
+ # except for the states of AC, AM, PA, RR, RO, and AP (then a territory)
+ Rule Brazil 1988 only - Oct 16 0:00 1:00 S
+ Rule Brazil 1989 only - Jan 29 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV98077.htm">98,077</a> (1989-08-21)
++# Decree 98,077 <http://pcdsh01.on.br/HV98077.htm> (1989-08-21)
+ # with the same exceptions
+ Rule Brazil 1989 only - Oct 15 0:00 1:00 S
+ Rule Brazil 1990 only - Feb 11 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV99530.htm">99,530</a> (1990-09-17)
++# Decree 99,530 <http://pcdsh01.on.br/HV99530.htm> (1990-09-17)
+ # adopted by RS, SC, PR, SP, RJ, ES, MG, GO, MS, DF.
+ # Decree 99,629 (1990-10-19) adds BA, MT.
+ Rule Brazil 1990 only - Oct 21 0:00 1:00 S
+ Rule Brazil 1991 only - Feb 17 0:00 0 -
+-# <a href="http://pcdsh01.on.br/HV1991.htm">Unnumbered decree</a> (1991-09-25)
++# Unnumbered decree <http://pcdsh01.on.br/HV1991.htm> (1991-09-25)
+ # adopted by RS, SC, PR, SP, RJ, ES, MG, BA, GO, MT, MS, DF.
+ Rule Brazil 1991 only - Oct 20 0:00 1:00 S
+ Rule Brazil 1992 only - Feb 9 0:00 0 -
+-# <a href="http://pcdsh01.on.br/HV1992.htm">Unnumbered decree</a> (1992-10-16)
++# Unnumbered decree <http://pcdsh01.on.br/HV1992.htm> (1992-10-16)
+ # adopted by same states.
+ Rule Brazil 1992 only - Oct 25 0:00 1:00 S
+ Rule Brazil 1993 only - Jan 31 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV942.htm">942</a> (1993-09-28)
++# Decree 942 <http://pcdsh01.on.br/HV942.htm> (1993-09-28)
+ # adopted by same states, plus AM.
+-# Decree <a href="http://pcdsh01.on.br/HV1252.htm">1,252</a> (1994-09-22;
++# Decree 1,252 <http://pcdsh01.on.br/HV1252.htm> (1994-09-22;
+ # web page corrected 2004-01-07) adopted by same states, minus AM.
+-# Decree <a href="http://pcdsh01.on.br/HV1636.htm">1,636</a> (1995-09-14)
++# Decree 1,636 <http://pcdsh01.on.br/HV1636.htm> (1995-09-14)
+ # adopted by same states, plus MT and TO.
+-# Decree <a href="http://pcdsh01.on.br/HV1674.htm">1,674</a> (1995-10-13)
++# Decree 1,674 <http://pcdsh01.on.br/HV1674.htm> (1995-10-13)
+ # adds AL, SE.
+ Rule Brazil 1993 1995 - Oct Sun>=11 0:00 1:00 S
+ Rule Brazil 1994 1995 - Feb Sun>=15 0:00 0 -
+ Rule Brazil 1996 only - Feb 11 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/HV2000.htm">2,000</a> (1996-09-04)
++# Decree 2,000 <http://pcdsh01.on.br/HV2000.htm> (1996-09-04)
+ # adopted by same states, minus AL, SE.
+ Rule Brazil 1996 only - Oct 6 0:00 1:00 S
+ Rule Brazil 1997 only - Feb 16 0:00 0 -
+@@ -975,53 +915,51 @@
+ #
+ # Decree 2,317 (1997-09-04), adopted by same states.
+ Rule Brazil 1997 only - Oct 6 0:00 1:00 S
+-# Decree <a href="http://pcdsh01.on.br/figuras/HV2495.JPG">2,495</a>
++# Decree 2,495 <http://pcdsh01.on.br/figuras/HV2495.JPG>
+ # (1998-02-10)
+ Rule Brazil 1998 only - Mar 1 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/figuras/Hv98.jpg">2,780</a> (1998-09-11)
++# Decree 2,780 <http://pcdsh01.on.br/figuras/Hv98.jpg> (1998-09-11)
+ # adopted by the same states as before.
+ Rule Brazil 1998 only - Oct 11 0:00 1:00 S
+ Rule Brazil 1999 only - Feb 21 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/figuras/HV3150.gif">3,150</a>
++# Decree 3,150 <http://pcdsh01.on.br/figuras/HV3150.gif>
+ # (1999-08-23) adopted by same states.
+-# Decree <a href="http://pcdsh01.on.br/DecHV99.gif">3,188</a> (1999-09-30)
++# Decree 3,188 <http://pcdsh01.on.br/DecHV99.gif> (1999-09-30)
+ # adds SE, AL, PB, PE, RN, CE, PI, MA and RR.
+ Rule Brazil 1999 only - Oct 3 0:00 1:00 S
+ Rule Brazil 2000 only - Feb 27 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/DEC3592.htm">3,592</a> (2000-09-06)
++# Decree 3,592 <http://pcdsh01.on.br/DEC3592.htm> (2000-09-06)
+ # adopted by the same states as before.
+-# Decree <a href="http://pcdsh01.on.br/Dec3630.jpg">3,630</a> (2000-10-13)
++# Decree 3,630 <http://pcdsh01.on.br/Dec3630.jpg> (2000-10-13)
+ # repeals DST in PE and RR, effective 2000-10-15 00:00.
+-# Decree <a href="http://pcdsh01.on.br/Dec3632.jpg">3,632</a> (2000-10-17)
++# Decree 3,632 <http://pcdsh01.on.br/Dec3632.jpg> (2000-10-17)
+ # repeals DST in SE, AL, PB, RN, CE, PI and MA, effective 2000-10-22 00:00.
+-# Decree <a href="http://pcdsh01.on.br/figuras/HV3916.gif">3,916</a>
++# Decree 3,916 <http://pcdsh01.on.br/figuras/HV3916.gif>
+ # (2001-09-13) reestablishes DST in AL, CE, MA, PB, PE, PI, RN, SE.
+ Rule Brazil 2000 2001 - Oct Sun>=8 0:00 1:00 S
+ Rule Brazil 2001 2006 - Feb Sun>=15 0:00 0 -
+ # Decree 4,399 (2002-10-01) repeals DST in AL, CE, MA, PB, PE, PI, RN, SE.
+-# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm">4,399</a>
++# 4,399 <http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm>
+ Rule Brazil 2002 only - Nov 3 0:00 1:00 S
+ # Decree 4,844 (2003-09-24; corrected 2003-09-26) repeals DST in BA, MT, TO.
+-# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm">4,844</a>
++# 4,844 <http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm>
+ Rule Brazil 2003 only - Oct 19 0:00 1:00 S
+ # Decree 5,223 (2004-10-01) reestablishes DST in MT.
+-# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm">5,223</a>
++# 5,223 <http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm>
+ Rule Brazil 2004 only - Nov 2 0:00 1:00 S
+-# Decree <a href="http://pcdsh01.on.br/DecHV5539.gif">5,539</a> (2005-09-19),
++# Decree 5,539 <http://pcdsh01.on.br/DecHV5539.gif> (2005-09-19),
+ # adopted by the same states as before.
+ Rule Brazil 2005 only - Oct 16 0:00 1:00 S
+-# Decree <a href="http://pcdsh01.on.br/DecHV5920.gif">5,920</a> (2006-10-03),
++# Decree 5,920 <http://pcdsh01.on.br/DecHV5920.gif> (2006-10-03),
+ # adopted by the same states as before.
+ Rule Brazil 2006 only - Nov 5 0:00 1:00 S
+ Rule Brazil 2007 only - Feb 25 0:00 0 -
+-# Decree <a href="http://pcdsh01.on.br/DecHV6212.gif">6,212</a> (2007-09-26),
++# Decree 6,212 <http://pcdsh01.on.br/DecHV6212.gif> (2007-09-26),
+ # adopted by the same states as before.
+ Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 S
+ # From Frederico A. C. Neves (2008-09-10):
+ # According to this decree
+-# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm">
+ # http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
+-# </a>
+ # [t]he DST period in Brazil now on will be from the 3rd Oct Sunday to the
+ # 3rd Feb Sunday. There is an exception on the return date when this is
+ # the Carnival Sunday then the return date will be the next Sunday...
+@@ -1056,29 +994,29 @@
+ -2:00 Brazil FN%sT 2002 Oct 1
+ -2:00 - FNT
+ # Other Atlantic islands have no permanent settlement.
+-# These include Trindade and Martin Vaz (administratively part of ES),
+-# Atol das Rocas (RN), and Penedos de Sao Pedro e Sao Paulo (PE).
++# These include Trindade and Martim Vaz (administratively part of ES),
++# Rocas Atoll (RN), and the St Peter and St Paul Archipelago (PE).
+ # Fernando de Noronha was a separate territory from 1942-09-02 to 1989-01-01;
+ # it also included the Penedos.
+ #
+-# Amapa (AP), east Para (PA)
+-# East Para includes Belem, Maraba, Serra Norte, and Sao Felix do Xingu.
+-# The division between east and west Para is the river Xingu.
++# Amapá (AP), east Pará (PA)
++# East Pará includes Belém, Marabá, Serra Norte, and São Félix do Xingu.
++# The division between east and west Pará is the river Xingu.
+ # In the north a very small part from the river Javary (now Jari I guess,
+-# the border with Amapa) to the Amazon, then to the Xingu.
++# the border with Amapá) to the Amazon, then to the Xingu.
+ Zone America/Belem -3:13:56 - LMT 1914
+ -3:00 Brazil BR%sT 1988 Sep 12
+ -3:00 - BRT
+ #
+-# west Para (PA)
+-# West Para includes Altamira, Oribidos, Prainha, Oriximina, and Santarem.
++# west Pará (PA)
++# West Pará includes Altamira, Óbidos, Prainha, Oriximiná, and Santarém.
+ Zone America/Santarem -3:38:48 - LMT 1914
+ -4:00 Brazil AM%sT 1988 Sep 12
+- -4:00 - AMT 2008 Jun 24 00:00
++ -4:00 - AMT 2008 Jun 24 0:00
+ -3:00 - BRT
+ #
+-# Maranhao (MA), Piaui (PI), Ceara (CE), Rio Grande do Norte (RN),
+-# Paraiba (PB)
++# Maranhão (MA), Piauí (PI), Ceará (CE), Rio Grande do Norte (RN),
++# Paraíba (PB)
+ Zone America/Fortaleza -2:34:00 - LMT 1914
+ -3:00 Brazil BR%sT 1990 Sep 17
+ -3:00 - BRT 1999 Sep 30
+@@ -1125,11 +1063,11 @@
+ -3:00 Brazil BR%sT 2012 Oct 21
+ -3:00 - BRT
+ #
+-# Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
+-# Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
++# Goiás (GO), Distrito Federal (DF), Minas Gerais (MG),
++# Espírito Santo (ES), Rio de Janeiro (RJ), São Paulo (SP), Paraná (PR),
+ # Santa Catarina (SC), Rio Grande do Sul (RS)
+ Zone America/Sao_Paulo -3:06:28 - LMT 1914
+- -3:00 Brazil BR%sT 1963 Oct 23 00:00
++ -3:00 Brazil BR%sT 1963 Oct 23 0:00
+ -3:00 1:00 BRST 1964
+ -3:00 Brazil BR%sT
+ #
+@@ -1143,7 +1081,7 @@
+ -4:00 - AMT 2004 Oct 1
+ -4:00 Brazil AM%sT
+ #
+-# Rondonia (RO)
++# Rondônia (RO)
+ Zone America/Porto_Velho -4:15:36 - LMT 1914
+ -4:00 Brazil AM%sT 1988 Sep 12
+ -4:00 - AMT
+@@ -1155,7 +1093,7 @@
+ -4:00 Brazil AM%sT 2000 Oct 15
+ -4:00 - AMT
+ #
+-# east Amazonas (AM): Boca do Acre, Jutai, Manaus, Floriano Peixoto
++# east Amazonas (AM): Boca do Acre, Jutaí, Manaus, Floriano Peixoto
+ # The great circle line from Tabatinga to Porto Acre divides
+ # east from west Amazonas.
+ Zone America/Manaus -4:00:04 - LMT 1914
+@@ -1165,19 +1103,19 @@
+ -4:00 - AMT
+ #
+ # west Amazonas (AM): Atalaia do Norte, Boca do Maoco, Benjamin Constant,
+-# Eirunepe, Envira, Ipixuna
++# Eirunepé, Envira, Ipixuna
+ Zone America/Eirunepe -4:39:28 - LMT 1914
+ -5:00 Brazil AC%sT 1988 Sep 12
+ -5:00 - ACT 1993 Sep 28
+ -5:00 Brazil AC%sT 1994 Sep 22
+- -5:00 - ACT 2008 Jun 24 00:00
++ -5:00 - ACT 2008 Jun 24 0:00
+ -4:00 - AMT 2013 Nov 10
+ -5:00 - ACT
+ #
+ # Acre (AC)
+ Zone America/Rio_Branco -4:31:12 - LMT 1914
+ -5:00 Brazil AC%sT 1988 Sep 12
+- -5:00 - ACT 2008 Jun 24 00:00
++ -5:00 - ACT 2008 Jun 24 0:00
+ -4:00 - AMT 2013 Nov 10
+ -5:00 - ACT
+
+@@ -1198,66 +1136,54 @@
+ # From Oscar van Vlijmen (2006-10-08):
+ # http://www.horaoficial.cl/cambio.htm
+
+-# From Jesper Norgaard Welen (2006-10-08):
++# From Jesper Nørgaard Welen (2006-10-08):
+ # I think that there are some obvious mistakes in the suggested link
+ # from Oscar van Vlijmen,... for instance entry 66 says that GMT-4
+ # ended 1990-09-12 while entry 67 only begins GMT-3 at 1990-09-15
+ # (they should have been 1990-09-15 and 1990-09-16 respectively), but
+ # anyhow it clears up some doubts too.
+
+-# From Paul Eggert (2006-12-27):
+-# The following data for Chile and America/Santiago are from
++# From Paul Eggert (2014-08-12):
++# The following data entries for Chile and America/Santiago are from
+ # <http://www.horaoficial.cl/horaof.htm> (2006-09-20), transcribed by
+-# Jesper Norgaard Welen. The data for Pacific/Easter are from Shanks
++# Jesper Nørgaard Welen. The data entries for Pacific/Easter are from Shanks
+ # & Pottenger, except with DST transitions after 1932 cloned from
+-# America/Santiago. The pre-1980 Pacific/Easter data are dubious,
++# America/Santiago. The pre-1980 Pacific/Easter data entries are dubious,
+ # but we have no other source.
+
+-# From German Poo-Caaman~o (2008-03-03):
++# From Germán Poo-Caamaño (2008-03-03):
+ # Due to drought, Chile extends Daylight Time in three weeks. This
+ # is one-time change (Saturday 3/29 at 24:00 for America/Santiago
+ # and Saturday 3/29 at 22:00 for Pacific/Easter)
+ # The Supreme Decree is located at
+-# <a href="http://www.shoa.cl/servicios/supremo316.pdf">
+ # http://www.shoa.cl/servicios/supremo316.pdf
+-# </a>
+ # and the instructions for 2008 are located in:
+-# <a href="http://www.horaoficial.cl/cambio.htm">
+ # http://www.horaoficial.cl/cambio.htm
+-# </a>.
+
+-# From Jose Miguel Garrido (2008-03-05):
++# From José Miguel Garrido (2008-03-05):
+ # ...
+ # You could see the announces of the change on
+-# <a href="http://www.shoa.cl/noticias/2008/04hora/hora.htm">
+ # http://www.shoa.cl/noticias/2008/04hora/hora.htm
+-# </a>.
+
+ # From Angel Chiang (2010-03-04):
+ # Subject: DST in Chile exceptionally extended to 3 April due to earthquake
+-# <a href="http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098">
+ # http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098
+-# </a>
+ # (in Spanish, last paragraph).
+ #
+ # This is breaking news. There should be more information available later.
+
+-# From Arthur Daivd Olson (2010-03-06):
++# From Arthur David Olson (2010-03-06):
+ # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
+
+-# From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
++# From Glenn Eychaner (2011-03-02):
+ # It appears that the Chilean government has decided to postpone the
+ # change from summer time to winter time again, by three weeks to April
+ # 2nd:
+-# <a href="http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651">
+ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
+-# </a>
+ #
+ # This is not yet reflected in the official "cambio de hora" site, but
+ # probably will be soon:
+-# <a href="http://www.horaoficial.cl/cambio.htm">
+ # http://www.horaoficial.cl/cambio.htm
+-# </a>
+
+ # From Arthur David Olson (2011-03-02):
+ # The emol.com article mentions a water shortage as the cause of the
+@@ -1265,9 +1191,7 @@
+
+ # From Glenn Eychaner (2011-03-28):
+ # The article:
+-# <a href="http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}">
+ # http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
+-# </a>
+ #
+ # In English:
+ # Chile's clocks will go back an hour this year on the 7th of May instead
+@@ -1298,7 +1222,7 @@
+ # start date is 2013-09-08 00:00....
+ # http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm
+
+-# From Jose Miguel Garrido (2014-02-19):
++# From José Miguel Garrido (2014-02-19):
+ # Today appeared in the Diario Oficial a decree amending the time change
+ # dates to 2014.
+ # DST End: last Saturday of April 2014 (Sun 27 Apr 2014 03:00 UTC)
+@@ -1352,7 +1276,7 @@
+ # (1996-09) says 1998-03-08. Ignore these.
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Santiago -4:42:46 - LMT 1890
+- -4:42:46 - SMT 1910 # Santiago Mean Time
++ -4:42:46 - SMT 1910 # Santiago Mean Time
+ -5:00 - CLT 1916 Jul 1 # Chile Time
+ -4:42:46 - SMT 1918 Sep 1 # Santiago Mean Time
+ -4:00 - CLT 1919 Jul 1 # Chile Time
+@@ -1361,16 +1285,16 @@
+ -4:00 Chile CL%sT
+ Zone Pacific/Easter -7:17:44 - LMT 1890
+ -7:17:28 - EMT 1932 Sep # Easter Mean Time
+- -7:00 Chile EAS%sT 1982 Mar 13 21:00 # Easter I Time
++ -7:00 Chile EAS%sT 1982 Mar 13 21:00 # Easter Time
+ -6:00 Chile EAS%sT
+ #
+-# Sala y Gomez Island is like Pacific/Easter.
+-# Other Chilean locations, including Juan Fernandez Is, San Ambrosio,
+-# San Felix, and Antarctic bases, are like America/Santiago.
++# Salas y Gómez Island is uninhabited.
++# Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
++# and Antarctic bases, are like America/Santiago.
+
+ # Colombia
+
+-# Milne gives 4:56:16.4 for Bogota time in 1899; round to nearest. He writes,
++# Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest. He writes,
+ # "A variation of fifteen minutes in the public clocks of Bogota is not rare."
+
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+@@ -1378,37 +1302,37 @@
+ Rule CO 1993 only - Apr 4 0:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Bogota -4:56:16 - LMT 1884 Mar 13
+- -4:56:16 - BMT 1914 Nov 23 # Bogota Mean Time
++ -4:56:16 - BMT 1914 Nov 23 # Bogotá Mean Time
+ -5:00 CO CO%sT # Colombia Time
+ # Malpelo, Providencia, San Andres
+ # no information; probably like America/Bogota
+
+-# Curacao
++# Curaçao
+
+-# Milne gives 4:35:46.9 for Curacao mean time; round to nearest.
++# Milne gives 4:35:46.9 for Curaçao mean time; round to nearest.
+ #
+ # From Paul Eggert (2006-03-22):
+ # Shanks & Pottenger say that The Bottom and Philipsburg have been at
+ # -4:00 since standard time was introduced on 1912-03-02; and that
+ # Kralendijk and Rincon used Kralendijk Mean Time (-4:33:08) from
+ # 1912-02-02 to 1965-01-01. The former is dubious, since S&P also say
+-# Saba Island has been like Curacao.
++# Saba Island has been like Curaçao.
+ # This all predates our 1970 cutoff, though.
+ #
+-# By July 2007 Curacao and St Maarten are planned to become
++# By July 2007 Curaçao and St Maarten are planned to become
+ # associated states within the Netherlands, much like Aruba;
+ # Bonaire, Saba and St Eustatius would become directly part of the
+ # Netherlands as Kingdom Islands. This won't affect their time zones
+ # though, as far as we know.
+ #
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad
++Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad
+ -4:30 - ANT 1965 # Netherlands Antilles Time
+ -4:00 - AST
+
+ # From Arthur David Olson (2011-06-15):
+ # use links for places with new iso3166 codes.
+-# The name "Lower Prince's Quarter" is both longer than fourteen charaters
++# The name "Lower Prince's Quarter" is both longer than fourteen characters
+ # and contains an apostrophe; use "Lower_Princes" below.
+
+ Link America/Curacao America/Lower_Princes # Sint Maarten
+@@ -1416,7 +1340,7 @@
+
+ # Ecuador
+ #
+-# Milne says the Sentral and South American Telegraph Company used -5:24:15.
++# Milne says the Central and South American Telegraph Company used -5:24:15.
+ #
+ # From Paul Eggert (2007-03-04):
+ # Apparently Ecuador had a failed experiment with DST in 1992.
+@@ -1427,10 +1351,10 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Guayaquil -5:19:20 - LMT 1890
+ -5:14:00 - QMT 1931 # Quito Mean Time
+- -5:00 - ECT # Ecuador Time
++ -5:00 - ECT # Ecuador Time
+ Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno
+ -5:00 - ECT 1986
+- -6:00 - GALT # Galapagos Time
++ -6:00 - GALT # Galápagos Time
+
+ # Falklands
+
+@@ -1439,7 +1363,7 @@
+ # the IATA gives 1996-09-08. Go with Shanks & Pottenger.
+
+ # From Falkland Islands Government Office, London (2001-01-22)
+-# via Jesper Norgaard:
++# via Jesper Nørgaard:
+ # ... the clocks revert back to Local Mean Time at 2 am on Sunday 15
+ # April 2001 and advance one hour to summer time at 2 am on Sunday 2
+ # September. It is anticipated that the clocks will revert back at 2
+@@ -1488,9 +1412,7 @@
+ # daylight saving time.
+ #
+ # One source:
+-# <a href="http://www.falklandnews.com/public/story.cfm?get=5914&source=3">
+ # http://www.falklandnews.com/public/story.cfm?get=5914&source=3
+-# </a>
+ #
+ # We have gotten this confirmed by a clerk of the legislative assembly:
+ # Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the
+@@ -1531,10 +1453,10 @@
+ Rule Falk 2001 2010 - Sep Sun>=1 2:00 1:00 S
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Atlantic/Stanley -3:51:24 - LMT 1890
+- -3:51:24 - SMT 1912 Mar 12 # Stanley Mean Time
+- -4:00 Falk FK%sT 1983 May # Falkland Is Time
++ -3:51:24 - SMT 1912 Mar 12 # Stanley Mean Time
++ -4:00 Falk FK%sT 1983 May # Falkland Is Time
+ -3:00 Falk FK%sT 1985 Sep 15
+- -4:00 Falk FK%sT 2010 Sep 5 02:00
++ -4:00 Falk FK%sT 2010 Sep 5 2:00
+ -3:00 - FKST
+
+ # French Guiana
+@@ -1545,7 +1467,7 @@
+
+ # Guyana
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone America/Guyana -3:52:40 - LMT 1915 Mar # Georgetown
++Zone America/Guyana -3:52:40 - LMT 1915 Mar # Georgetown
+ -3:45 - GBGT 1966 May 26 # Br Guiana Time
+ -3:45 - GYT 1975 Jul 31 # Guyana Time
+ -3:00 - GYT 1991
+@@ -1555,8 +1477,8 @@
+ # Paraguay
+ #
+ # From Paul Eggert (2006-03-22):
+-# Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
+-# and autumn transitions are from 00:00 -> 23:00. Go with pre-1999
++# Shanks & Pottenger say that spring transitions are 01:00 -> 02:00,
++# and autumn transitions are 00:00 -> 23:00. Go with pre-1999
+ # editions of Shanks, and with the IATA, who say transitions occur at 00:00.
+ #
+ # From Waldemar Villamayor-Venialbo (2013-09-20):
+@@ -1582,9 +1504,8 @@
+ # (10-01).
+ #
+ # Translated by Gwillim Law (2001-02-27) from
+-# <a href="http://www.diarionoticias.com.py/011000/nacional/naciona1.htm">
+-# Noticias, a daily paper in Asuncion, Paraguay (2000-10-01)
+-# </a>:
++# Noticias, a daily paper in Asunción, Paraguay (2000-10-01):
++# http://www.diarionoticias.com.py/011000/nacional/naciona1.htm
+ # Starting at 0:00 today, the clock will be set forward 60 minutes, in
+ # fulfillment of Decree No. 7,273 of the Executive Power.... The time change
+ # system has been operating for several years. Formerly there was a separate
+@@ -1605,21 +1526,18 @@
+ Rule Para 2002 2004 - Apr Sun>=1 0:00 0 -
+ Rule Para 2002 2003 - Sep Sun>=1 0:00 1:00 S
+ #
+-# From Jesper Norgaard Welen (2005-01-02):
++# From Jesper Nørgaard Welen (2005-01-02):
+ # There are several sources that claim that Paraguay made
+ # a timezone rule change in autumn 2004.
+ # From Steffen Thorsen (2005-01-05):
+ # Decree 1,867 (2004-03-05)
+-# From Carlos Raul Perasso via Jesper Norgaard Welen (2006-10-13)
+-# <http://www.presidencia.gov.py/decretos/D1867.pdf>
++# From Carlos Raúl Perasso via Jesper Nørgaard Welen (2006-10-13)
++# http://www.presidencia.gov.py/decretos/D1867.pdf
+ Rule Para 2004 2009 - Oct Sun>=15 0:00 1:00 S
+ Rule Para 2005 2009 - Mar Sun>=8 0:00 0 -
+-# From Carlos Raul Perasso (2010-02-18):
+-# By decree number 3958 issued yesterday (
+-# <a href="http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf">
++# From Carlos Raúl Perasso (2010-02-18):
++# By decree number 3958 issued yesterday
+ # http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf
+-# </a>
+-# )
+ # Paraguay changes its DST schedule, postponing the March rule to April and
+ # modifying the October date. The decree reads:
+ # ...
+@@ -1635,25 +1553,25 @@
+ # Paraguay will end DST on 2013-03-24 00:00....
+ # http://www.ande.gov.py/interna.php?id=1075
+ #
+-# From Carlos Raul Perasso (2013-03-15):
++# From Carlos Raúl Perasso (2013-03-15):
+ # The change in Paraguay is now final. Decree number 10780
+ # http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf
+-# From Carlos Raul Perasso (2014-02-28):
++# From Carlos Raúl Perasso (2014-02-28):
+ # Decree 1264 can be found at:
+ # http://www.presidencia.gov.py/archivos/documentos/DECRETO1264_ey9r8zai.pdf
+ Rule Para 2013 max - Mar Sun>=22 0:00 0 -
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Asuncion -3:50:40 - LMT 1890
+- -3:50:40 - AMT 1931 Oct 10 # Asuncion Mean Time
+- -4:00 - PYT 1972 Oct # Paraguay Time
++ -3:50:40 - AMT 1931 Oct 10 # Asunción Mean Time
++ -4:00 - PYT 1972 Oct # Paraguay Time
+ -3:00 - PYT 1974 Apr
+ -4:00 Para PY%sT
+
+ # Peru
+ #
+-# <a href="news:xrGmb.39935$gA1.13896113@news4.srv.hcvlny.cv.net">
+-# From Evelyn C. Leeper via Mark Brader (2003-10-26):</a>
++# From Evelyn C. Leeper via Mark Brader (2003-10-26)
++# <news:xrGmb.39935$gA1.13896113@news4.srv.hcvlny.cv.net>:
+ # When we were in Peru in 1985-1986, they apparently switched over
+ # sometime between December 29 and January 3 while we were on the Amazon.
+ #
+@@ -1679,7 +1597,7 @@
+
+ # South Georgia
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+-Zone Atlantic/South_Georgia -2:26:08 - LMT 1890 # Grytviken
++Zone Atlantic/South_Georgia -2:26:08 - LMT 1890 # Grytviken
+ -2:00 - GST # South Georgia Time
+
+ # South Sandwich Is
+@@ -1689,9 +1607,9 @@
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Paramaribo -3:40:40 - LMT 1911
+ -3:40:52 - PMT 1935 # Paramaribo Mean Time
+- -3:40:36 - PMT 1945 Oct # The capital moved?
++ -3:40:36 - PMT 1945 Oct # The capital moved?
+ -3:30 - NEGT 1975 Nov 20 # Dutch Guiana Time
+- -3:30 - SRT 1984 Oct # Suriname Time
++ -3:30 - SRT 1984 Oct # Suriname Time
+ -3:00 - SRT
+
+ # Trinidad and Tobago
+@@ -1706,7 +1624,7 @@
+ Link America/Port_of_Spain America/Guadeloupe
+ Link America/Port_of_Spain America/Marigot # St Martin (French part)
+ Link America/Port_of_Spain America/Montserrat
+-Link America/Port_of_Spain America/St_Barthelemy
++Link America/Port_of_Spain America/St_Barthelemy # St Barthélemy
+ Link America/Port_of_Spain America/St_Kitts # St Kitts & Nevis
+ Link America/Port_of_Spain America/St_Lucia
+ Link America/Port_of_Spain America/St_Thomas # Virgin Islands (US)
+@@ -1765,7 +1683,7 @@
+ Rule Uruguay 1992 only - Oct 18 0:00 1:00 S
+ Rule Uruguay 1993 only - Feb 28 0:00 0 -
+ # From Eduardo Cota (2004-09-20):
+-# The uruguayan government has decreed a change in the local time....
++# The Uruguayan government has decreed a change in the local time....
+ # http://www.presidencia.gub.uy/decretos/2004091502.htm
+ Rule Uruguay 2004 only - Sep 19 0:00 1:00 S
+ # From Steffen Thorsen (2005-03-11):
+@@ -1779,14 +1697,14 @@
+ # 02:00 local time, official time in Uruguay will be at GMT -2.
+ Rule Uruguay 2005 only - Oct 9 2:00 1:00 S
+ Rule Uruguay 2006 only - Mar 12 2:00 0 -
+-# From Jesper Norgaard Welen (2006-09-06):
++# From Jesper Nørgaard Welen (2006-09-06):
+ # http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
+ Rule Uruguay 2006 max - Oct Sun>=1 2:00 1:00 S
+ Rule Uruguay 2007 max - Mar Sun>=8 2:00 0 -
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Montevideo -3:44:44 - LMT 1898 Jun 28
+- -3:44:44 - MMT 1920 May 1 # Montevideo MT
+- -3:30 Uruguay UY%sT 1942 Dec 14 # Uruguay Time
++ -3:44:44 - MMT 1920 May 1 # Montevideo MT
++ -3:30 Uruguay UY%sT 1942 Dec 14 # Uruguay Time
+ -3:00 Uruguay UY%sT
+
+ # Venezuela
+@@ -1794,14 +1712,14 @@
+ # From John Stainforth (2007-11-28):
+ # ... the change for Venezuela originally expected for 2007-12-31 has
+ # been brought forward to 2007-12-09. The official announcement was
+-# published today in the "Gaceta Oficial de la Republica Bolivariana
+-# de Venezuela, numero 38.819" (official document for all laws or
++# published today in the "Gaceta Oficial de la República Bolivariana
++# de Venezuela, número 38.819" (official document for all laws or
+ # resolution publication)
+ # http://www.globovision.com/news.php?nid=72208
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone America/Caracas -4:27:44 - LMT 1890
+ -4:27:40 - CMT 1912 Feb 12 # Caracas Mean Time?
+- -4:30 - VET 1965 # Venezuela Time
+- -4:00 - VET 2007 Dec 9 03:00
++ -4:30 - VET 1965 # Venezuela Time
++ -4:00 - VET 2007 Dec 9 3:00
+ -4:30 - VET
+--- ./jdk/make/sun/javazic/tzdata/systemv Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/systemv Mon Jan 05 11:57:27 2015 -0800
+@@ -21,7 +21,6 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# <pre>
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+--- ./jdk/make/sun/javazic/tzdata/zone.tab Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/javazic/tzdata/zone.tab Mon Jan 05 11:57:27 2015 -0800
+@@ -21,39 +21,27 @@
+ # or visit www.oracle.com if you need additional information or have any
+ # questions.
+ #
+-# TZ zone descriptions
++# tz zone descriptions (deprecated version)
+ #
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ #
+-# From Paul Eggert (2013-08-14):
++# From Paul Eggert (2014-07-31):
++# This file is intended as a backward-compatibility aid for older programs.
++# New programs should use zone1970.tab. This file is like zone1970.tab (see
++# zone1970.tab's comments), but with the following additional restrictions:
+ #
+-# This file contains a table where each row stands for an area that is
+-# the intersection of a region identified by a country code and of a
+-# zone where civil clocks have agreed since 1970. The columns of the
+-# table are as follows:
++# 1. This file contains only ASCII characters.
++# 2. The first data column contains exactly one country code.
+ #
+-# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'.
+-# 2. Latitude and longitude of the area's principal location
+-# in ISO 6709 sign-degrees-minutes-seconds format,
+-# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
+-# first latitude (+ is north), then longitude (+ is east).
+-# 3. Zone name used in value of TZ environment variable.
+-# Please see the 'Theory' file for how zone names are chosen.
+-# If multiple zones overlap a country, each has a row in the
+-# table, with column 1 being duplicated.
+-# 4. Comments; present if and only if the country has multiple rows.
+-#
+-# Columns are separated by a single tab.
+-# The table is sorted first by country, then an order within the country that
+-# (1) makes some geographical sense, and
+-# (2) puts the most populous areas first, where that does not contradict (1).
+-#
+-# Lines beginning with '#' are comments.
++# Because of (2), each row stands for an area that is the intersection
++# of a region identified by a country code and of a zone where civil
++# clocks have agreed since 1970; this is a narrower definition than
++# that of zone1970.tab.
+ #
+ # This table is intended as an aid for users, to help them select time
+-# zone data appropriate for their practical needs. It is not intended
+-# to take or endorse any position on legal or territorial claims.
++# zone data entries appropriate for their practical needs. It is not
++# intended to take or endorse any position on legal or territorial claims.
+ #
+ #country-
+ #code coordinates TZ comments
+@@ -72,7 +60,7 @@
+ AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills
+ AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula
+ AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
+-AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
++AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Adelie Land
+ AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
+ AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land
+ AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
+@@ -151,7 +139,7 @@
+ CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario
+ CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations
+ CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut
+-CA +744144-0944945 America/Resolute Central Standard Time - Resolute, Nunavut
++CA +744144-0944945 America/Resolute Central Time - Resolute, Nunavut
+ CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+ CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut
+ CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario
+@@ -176,13 +164,10 @@
+ CI +0519-00402 Africa/Abidjan
+ CK -2114-15946 Pacific/Rarotonga
+ CL -3327-07040 America/Santiago most locations
+-CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez
++CL -2709-10926 Pacific/Easter Easter Island
+ CM +0403+00942 Africa/Douala
+-CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc.
+-CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin
+-CN +2934+10635 Asia/Chongqing central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc.
+-CN +4348+08735 Asia/Urumqi most of Tibet & Xinjiang
+-CN +3929+07559 Asia/Kashgar west Tibet & Xinjiang
++CN +3114+12128 Asia/Shanghai Beijing Time
++CN +4348+08735 Asia/Urumqi Xinjiang Time
+ CO +0436-07405 America/Bogota
+ CR +0956-08405 America/Costa_Rica
+ CU +2308-08222 America/Havana
+@@ -345,7 +330,8 @@
+ PF -1732-14934 Pacific/Tahiti Society Islands
+ PF -0900-13930 Pacific/Marquesas Marquesas Islands
+ PF -2308-13457 Pacific/Gambier Gambier Islands
+-PG -0930+14710 Pacific/Port_Moresby
++PG -0930+14710 Pacific/Port_Moresby most locations
++PG -0613+15534 Pacific/Bougainville Bougainville
+ PH +1435+12100 Asia/Manila
+ PK +2452+06703 Asia/Karachi
+ PL +5215+02100 Europe/Warsaw
+@@ -364,24 +350,26 @@
+ RO +4426+02606 Europe/Bucharest
+ RS +4450+02030 Europe/Belgrade
+ RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
+-RU +5545+03735 Europe/Moscow Moscow+00 - west Russia
++RU +554521+0373704 Europe/Moscow Moscow+00 - west Russia
++RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea
+ RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
+-RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia
+-RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea
++RU +5312+05009 Europe/Samara Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+ RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
+ RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
+ RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
+-RU +5345+08707 Asia/Novokuznetsk Moscow+03 - Novokuznetsk
++RU +5345+08707 Asia/Novokuznetsk Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+ RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River
+ RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal
++RU +5203+11328 Asia/Chita Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+ RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River
+ RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky
+ RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River
+ RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island
+ RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky
+-RU +5934+15048 Asia/Magadan Moscow+08 - Magadan
+-RU +5301+15839 Asia/Kamchatka Moscow+08 - Kamchatka
+-RU +6445+17729 Asia/Anadyr Moscow+08 - Bering Sea
++RU +5934+15048 Asia/Magadan Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
++RU +6728+15343 Asia/Srednekolymsk Moscow+08 - E Sakha, N Kuril Is
++RU +5301+15839 Asia/Kamchatka Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
++RU +6445+17729 Asia/Anadyr Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
+ RW -0157+03004 Africa/Kigali
+ SA +2438+04643 Asia/Riyadh
+ SB -0932+16012 Pacific/Guadalcanal
+@@ -448,13 +436,13 @@
+ US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
+ US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
+ US +340308-1181434 America/Los_Angeles Pacific Time
++US +550737-1313435 America/Metlakatla Pacific Standard Time - Annette Island, Alaska
+ US +611305-1495401 America/Anchorage Alaska Time
+ US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
+ US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle
+ US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck
+ US +643004-1652423 America/Nome Alaska Time - west Alaska
+ US +515248-1763929 America/Adak Aleutian Islands
+-US +550737-1313435 America/Metlakatla Metlakatla Time - Annette Island
+ US +211825-1575130 Pacific/Honolulu Hawaii
+ UY -3453-05611 America/Montevideo
+ UZ +3940+06648 Asia/Samarkand west Uzbekistan
+--- ./jdk/make/sun/security/krb5/Makefile Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/sun/security/krb5/Makefile Mon Jan 05 11:57:27 2015 -0800
+@@ -92,7 +92,7 @@
+ OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
+ endif
+
+-build:
++all:
+ ifeq ($(PLATFORM),windows)
+ $(call make-launcher, kinit, sun.security.krb5.internal.tools.Kinit, , )
+ $(call make-launcher, klist, sun.security.krb5.internal.tools.Klist, , )
+--- ./jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java Mon Jan 05 11:57:27 2015 -0800
+@@ -281,8 +281,8 @@
+ checkCurrencyCode(newCurrency);
+ String timeString = currencyInfo.substring(4, length - 4);
+ long time = format.parse(timeString).getTime();
+- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+- throw new RuntimeException("time is more than 10 years from present: " + time);
++ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
++ throw new RuntimeException("time is more than 10 years from present: " + time + " " + timeString + " " + currencyInfo);
+ }
+ specialCaseCutOverTimes[specialCaseCount] = time;
+ specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
+--- ./jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Mon Jan 05 11:57:27 2015 -0800
+@@ -755,7 +755,7 @@
+ public void notifyNCMouseDown() {
+ // Ungrab except for a click on a Dialog with the grabbing owner
+ if (grabbingWindow != null &&
+- grabbingWindow != getOwnerFrameDialog(this))
++ !grabbingWindow.isOneOfOwnersOf(this))
+ {
+ grabbingWindow.ungrab();
+ }
+@@ -851,7 +851,7 @@
+
+ // Ungrab only if this window is not an owned window of the grabbing one.
+ if (!isGrabbing() && grabbingWindow != null &&
+- grabbingWindow != getOwnerFrameDialog(this))
++ !grabbingWindow.isOneOfOwnersOf(this))
+ {
+ grabbingWindow.ungrab();
+ }
+@@ -1321,6 +1321,17 @@
+ return !(window instanceof Dialog || window instanceof Frame);
+ }
+
++ private boolean isOneOfOwnersOf(LWWindowPeer peer) {
++ Window owner = (peer != null ? peer.getTarget().getOwner() : null);
++ while (owner != null) {
++ if ((LWWindowPeer)owner.getPeer() == this) {
++ return true;
++ }
++ owner = owner.getOwner();
++ }
++ return false;
++ }
++
+ /*
+ * Changes focused window on java level.
+ */
+@@ -1352,7 +1363,7 @@
+ // - when the opposite (gaining focus) window is an owned/owner window.
+ // - for a simple window in any case.
+ if (!becomesFocused &&
+- (isGrabbing() || getOwnerFrameDialog(grabbingWindow) == this))
++ (isGrabbing() || this.isOneOfOwnersOf(grabbingWindow)))
+ {
+ focusLog.fine("ungrabbing on " + grabbingWindow);
+ // ungrab a simple window if its owner looses activation.
+@@ -1369,6 +1380,11 @@
+ postEvent(windowEvent);
+ }
+
++ /*
++ * Retrieves the owner of the peer.
++ * Note: this method returns the owner which can be activated, (i.e. the instance
++ * of Frame or Dialog may be returned).
++ */
+ static LWWindowPeer getOwnerFrameDialog(LWWindowPeer peer) {
+ Window owner = (peer != null ? peer.getTarget().getOwner() : null);
+ while (owner != null && !(owner instanceof Frame || owner instanceof Dialog)) {
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Mon Jan 05 11:57:27 2015 -0800
+@@ -39,7 +39,8 @@
+
+ private CPlatformResponder responder;
+ private static final Object classLock = new Object();
+- private static volatile CEmbeddedFrame focusedWindow;
++ private static volatile CEmbeddedFrame globalFocusedWindow;
++ private CEmbeddedFrame browserWindowFocusedApplet;
+ private boolean parentWindowActive = true;
+
+ public CEmbeddedFrame() {
+@@ -98,7 +99,8 @@
+ public void handleKeyEvent(int eventType, int modifierFlags, String characters,
+ String charsIgnoringMods, boolean isRepeat, short keyCode,
+ boolean needsKeyTyped) {
+- responder.handleKeyEvent(eventType, modifierFlags, charsIgnoringMods, keyCode, needsKeyTyped, isRepeat);
++ responder.handleKeyEvent(eventType, modifierFlags, characters, charsIgnoringMods,
++ keyCode, needsKeyTyped, isRepeat);
+ }
+
+ // REMIND: delete this method once 'deploy' changes for 7156194 is pushed
+@@ -117,10 +119,10 @@
+ synchronized (classLock) {
+ // In some cases an applet may not receive the focus lost event
+ // from the parent window (see 8012330)
+- focusedWindow = (focused) ? this
+- : ((focusedWindow == this) ? null : focusedWindow);
++ globalFocusedWindow = (focused) ? this
++ : ((globalFocusedWindow == this) ? null : globalFocusedWindow);
+ }
+- if (focusedWindow == this) {
++ if (globalFocusedWindow == this) {
+ // see bug 8010925
+ // we can't put this to handleWindowFocusEvent because
+ // it won't be invoced if focuse is moved to a html element
+@@ -150,9 +152,23 @@
+ */
+ public void handleWindowFocusEvent(boolean parentWindowActive) {
+ this.parentWindowActive = parentWindowActive;
++ // If several applets are running in different browser's windows, it is necessary to
++ // detect the switching between the parent windows and update globalFocusedWindow accordingly.
++ synchronized (classLock) {
++ if (!parentWindowActive) {
++ this.browserWindowFocusedApplet = globalFocusedWindow;
++ }
++ if (parentWindowActive && globalFocusedWindow != this && isParentWindowChanged()) {
++ // It looks like we have switched to another browser window, let's restore focus to
++ // the previously focused applet in this window. If no applets were focused in the
++ // window, we will set focus to the first applet in the window.
++ globalFocusedWindow = (this.browserWindowFocusedApplet != null) ? this.browserWindowFocusedApplet
++ : this;
++ }
++ }
+ // ignore focus "lost" native request as it may mistakenly
+ // deactivate active window (see 8001161)
+- if (focusedWindow == this && parentWindowActive) {
++ if (globalFocusedWindow == this && parentWindowActive) {
+ responder.handleWindowFocusEvent(parentWindowActive, null);
+ }
+ }
+@@ -160,4 +176,10 @@
+ public boolean isParentWindowActive() {
+ return parentWindowActive;
+ }
++
++ private boolean isParentWindowChanged() {
++ // If globalFocusedWindow is located at inactive parent window or null, we have swithed to
++ // another window.
++ return globalFocusedWindow != null ? !globalFocusedWindow.isParentWindowActive() : true;
++ }
+ }
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java Mon Jan 05 11:57:27 2015 -0800
+@@ -126,7 +126,7 @@
+ /**
+ * Handles key events.
+ */
+- void handleKeyEvent(int eventType, int modifierFlags, String chars,
++ void handleKeyEvent(int eventType, int modifierFlags, String chars, String charsIgnoringModifiers,
+ short keyCode, boolean needsKeyTyped, boolean needsKeyReleased) {
+ boolean isFlagsChangedEvent =
+ isNpapiCallback ? (eventType == CocoaConstants.NPCocoaEventFlagsChanged) :
+@@ -154,7 +154,10 @@
+ testChar = chars.charAt(0);
+ }
+
+- int[] in = new int[] {testChar, isDeadChar ? 1 : 0, modifierFlags, keyCode};
++ char testCharIgnoringModifiers = charsIgnoringModifiers != null && charsIgnoringModifiers.length() > 0 ?
++ charsIgnoringModifiers.charAt(0) : KeyEvent.CHAR_UNDEFINED;
++
++ int[] in = new int[] {testCharIgnoringModifiers, isDeadChar ? 1 : 0, modifierFlags, keyCode};
+ int[] out = new int[3]; // [jkeyCode, jkeyLocation, deadChar]
+
+ postsTyped = NSEvent.nsToJavaKeyInfo(in, out);
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Mon Jan 05 11:57:27 2015 -0800
+@@ -227,7 +227,7 @@
+ }
+
+ private void deliverKeyEvent(NSEvent event) {
+- responder.handleKeyEvent(event.getType(), event.getModifierFlags(),
++ responder.handleKeyEvent(event.getType(), event.getModifierFlags(), event.getCharacters(),
+ event.getCharactersIgnoringModifiers(), event.getKeyCode(), true, false);
+ }
+
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Jan 05 11:57:27 2015 -0800
+@@ -118,6 +118,7 @@
+ static final int NONACTIVATING = 1 << 24;
+ static final int IS_DIALOG = 1 << 25;
+ static final int IS_MODAL = 1 << 26;
++ static final int IS_POPUP = 1 << 27;
+
+ static final int _STYLE_PROP_BITMASK = DECORATED | TEXTURED | UNIFIED | UTILITY | HUD | SHEET | CLOSEABLE | MINIMIZABLE | RESIZABLE;
+
+@@ -308,6 +309,7 @@
+ styleBits = SET(styleBits, TEXTURED, false);
+ // Popups in applets don't activate applet's process
+ styleBits = SET(styleBits, NONACTIVATING, true);
++ styleBits = SET(styleBits, IS_POPUP, true);
+ }
+
+ if (Window.Type.UTILITY.equals(target.getType())) {
+--- ./jdk/src/macosx/classes/sun/lwawt/macosx/event/NSEvent.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/event/NSEvent.java Mon Jan 05 11:57:27 2015 -0800
+@@ -48,12 +48,14 @@
+
+ // Key event information
+ private short keyCode;
++ private String characters;
+ private String charactersIgnoringModifiers;
+
+- public NSEvent(int type, int modifierFlags, short keyCode, String charactersIgnoringModifiers) {
++ public NSEvent(int type, int modifierFlags, short keyCode, String characters, String charactersIgnoringModifiers) {
+ this.type = type;
+ this.modifierFlags = modifierFlags;
+ this.keyCode = keyCode;
++ this.characters = characters;
+ this.charactersIgnoringModifiers = charactersIgnoringModifiers;
+ }
+
+@@ -120,12 +122,16 @@
+ return charactersIgnoringModifiers;
+ }
+
++ public String getCharacters() {
++ return characters;
++ }
++
+ @Override
+ public String toString() {
+ return "NSEvent[" + getType() + " ," + getModifierFlags() + " ,"
+ + getClickCount() + " ," + getButtonNumber() + " ," + getX() + " ,"
+ + getY() + " ," + getAbsX() + " ," + getAbsY()+ " ," + getKeyCode() + " ,"
+- + getCharactersIgnoringModifiers() + "]";
++ + getCharacters() + " ," + getCharactersIgnoringModifiers() + "]";
+ }
+
+ /*
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/macosx/classes/sun/nio/ch/SctpChannelImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,150 @@
++/*
++ * Copyright (c) 2009, 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.nio.ch;
++
++import java.net.SocketAddress;
++import java.net.InetAddress;
++import java.io.IOException;
++import java.util.Set;
++import java.nio.ByteBuffer;
++import java.nio.channels.spi.SelectorProvider;
++import com.sun.nio.sctp.Association;
++import com.sun.nio.sctp.MessageInfo;
++import com.sun.nio.sctp.NotificationHandler;
++import com.sun.nio.sctp.SctpChannel;
++import com.sun.nio.sctp.SctpSocketOption;
++
++/**
++ * Unimplemented.
++ */
++public class SctpChannelImpl extends SctpChannel
++{
++ private static final String message = "SCTP not supported on this platform";
++
++ public SctpChannelImpl(SelectorProvider provider) {
++ super(provider);
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Association association() {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpChannel bind(SocketAddress local)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpChannel bindAddress(InetAddress address)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpChannel unbindAddress(InetAddress address)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public boolean connect(SocketAddress remote) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public boolean connect(SocketAddress remote, int maxOutStreams,
++ int maxInStreams) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public boolean isConnectionPending() {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public boolean finishConnect() throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Set<SocketAddress> getAllLocalAddresses()
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Set<SocketAddress> getRemoteAddresses()
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpChannel shutdown() throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public <T> T getOption(SctpSocketOption<T> name)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public <T> SctpChannel setOption(SctpSocketOption<T> name, T value)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Set<SctpSocketOption<?>> supportedOptions() {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public <T> MessageInfo receive(ByteBuffer dst, T attachment,
++ NotificationHandler<T> handler) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public int send(ByteBuffer src, MessageInfo messageInfo)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ protected void implConfigureBlocking(boolean block) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public void implCloseSelectableChannel() throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/macosx/classes/sun/nio/ch/SctpMultiChannelImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,137 @@
++/*
++ * Copyright (c) 2009, 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.nio.ch;
++
++import java.net.SocketAddress;
++import java.net.InetAddress;
++import java.io.IOException;
++import java.util.Set;
++import java.nio.ByteBuffer;
++import java.nio.channels.spi.SelectorProvider;
++import com.sun.nio.sctp.Association;
++import com.sun.nio.sctp.SctpChannel;
++import com.sun.nio.sctp.MessageInfo;
++import com.sun.nio.sctp.NotificationHandler;
++import com.sun.nio.sctp.SctpMultiChannel;
++import com.sun.nio.sctp.SctpSocketOption;
++
++/**
++ * Unimplemented.
++ */
++public class SctpMultiChannelImpl extends SctpMultiChannel
++{
++ private static final String message = "SCTP not supported on this platform";
++
++ public SctpMultiChannelImpl(SelectorProvider provider) {
++ super(provider);
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Set<Association> associations() {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpMultiChannel bind(SocketAddress local,
++ int backlog) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpMultiChannel bindAddress(InetAddress address)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpMultiChannel unbindAddress(InetAddress address)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Set<SocketAddress> getAllLocalAddresses()
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Set<SocketAddress> getRemoteAddresses
++ (Association association) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpMultiChannel shutdown(Association association)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public <T> T getOption(SctpSocketOption<T> name,
++ Association association) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public <T> SctpMultiChannel setOption(SctpSocketOption<T> name,
++ T value, Association association) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Set<SctpSocketOption<?>> supportedOptions() {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public <T> MessageInfo receive(ByteBuffer buffer, T attachment,
++ NotificationHandler<T> handler) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public int send(ByteBuffer buffer, MessageInfo messageInfo)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpChannel branch(Association association)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ protected void implConfigureBlocking(boolean block) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public void implCloseSelectableChannel() throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/macosx/classes/sun/nio/ch/SctpServerChannelImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,102 @@
++/*
++ * Copyright (c) 2009, 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.nio.ch;
++
++import java.net.SocketAddress;
++import java.net.InetAddress;
++import java.io.IOException;
++import java.util.Set;
++import java.nio.channels.spi.SelectorProvider;
++import com.sun.nio.sctp.SctpChannel;
++import com.sun.nio.sctp.SctpServerChannel;
++import com.sun.nio.sctp.SctpSocketOption;
++
++/**
++ * Unimplemented.
++ */
++public class SctpServerChannelImpl extends SctpServerChannel
++{
++ private static final String message = "SCTP not supported on this platform";
++
++ public SctpServerChannelImpl(SelectorProvider provider) {
++ super(provider);
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpChannel accept() throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpServerChannel bind(SocketAddress local,
++ int backlog) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpServerChannel bindAddress(InetAddress address)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public SctpServerChannel unbindAddress(InetAddress address)
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Set<SocketAddress> getAllLocalAddresses()
++ throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public <T> T getOption(SctpSocketOption<T> name) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public <T> SctpServerChannel setOption(SctpSocketOption<T> name,
++ T value) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public Set<SctpSocketOption<?>> supportedOptions() {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ protected void implConfigureBlocking(boolean block) throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++
++ @Override
++ public void implCloseSelectableChannel() throws IOException {
++ throw new UnsupportedOperationException(message);
++ }
++}
+--- ./jdk/src/macosx/native/sun/awt/AWTView.m Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/AWTView.m Mon Jan 05 11:57:27 2015 -0800
+@@ -421,17 +421,20 @@
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+
+ jstring characters = NULL;
++ jstring charactersIgnoringModifiers = NULL;
+ if ([event type] != NSFlagsChanged) {
+ characters = JNFNSToJavaString(env, [event characters]);
++ charactersIgnoringModifiers = JNFNSToJavaString(env, [event charactersIgnoringModifiers]);
+ }
+
+ static JNF_CLASS_CACHE(jc_NSEvent, "sun/lwawt/macosx/event/NSEvent");
+- static JNF_CTOR_CACHE(jctor_NSEvent, jc_NSEvent, "(IISLjava/lang/String;)V");
++ static JNF_CTOR_CACHE(jctor_NSEvent, jc_NSEvent, "(IISLjava/lang/String;Ljava/lang/String;)V");
+ jobject jevent = JNFNewObject(env, jctor_NSEvent,
+ [event type],
+ [event modifierFlags],
+ [event keyCode],
+- characters);
++ characters,
++ charactersIgnoringModifiers);
+
+ static JNF_CLASS_CACHE(jc_PlatformView, "sun/lwawt/macosx/CPlatformView");
+ static JNF_MEMBER_CACHE(jm_deliverKeyEvent, jc_PlatformView,
+--- ./jdk/src/macosx/native/sun/awt/AWTWindow.m Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/AWTWindow.m Mon Jan 05 11:57:27 2015 -0800
+@@ -307,6 +307,10 @@
+ [self adjustGrowBoxWindow];
+ } else growBoxWindow = nil;
+
++ if (IS(self.styleBits, IS_POPUP)) {
++ [self.nsWindow setCollectionBehavior:(1 << 8) /*NSWindowCollectionBehaviorFullScreenAuxiliary*/];
++ }
++
+ return self;
+ }
+
+@@ -316,7 +320,8 @@
+
+ // return id for the topmost window under mouse
+ + (NSInteger) getTopmostWindowUnderMouseID {
+-
++ NSInteger result = -1;
++
+ NSRect screenRect = [[NSScreen mainScreen] frame];
+ NSPoint nsMouseLocation = [NSEvent mouseLocation];
+ CGPoint cgMouseLocation = CGPointMake(nsMouseLocation.x, screenRect.size.height - nsMouseLocation.y);
+@@ -330,11 +335,13 @@
+ CGRect rect;
+ CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[window objectForKey:(id)kCGWindowBounds], &rect);
+ if (CGRectContainsPoint(rect, cgMouseLocation)) {
+- return [[window objectForKey:(id)kCGWindowNumber] integerValue];
++ result = [[window objectForKey:(id)kCGWindowNumber] integerValue];
++ break;
+ }
+ }
+ }
+- return -1;
++ [windows release];
++ return result;
+ }
+
+ // checks that this window is under the mouse cursor and this point is not overlapped by other windows
+--- ./jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m Mon Jan 05 11:57:27 2015 -0800
+@@ -256,11 +256,15 @@
+ jsize count = [ignoredKeys count];
+
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+- jclass clazz = (*env)->FindClass(env, "java/lang/String");
+- result = (*env)->NewObjectArray(env, count, clazz, NULL); // AWT_THREADING Safe (known object)
+- (*env)->DeleteLocalRef(env, clazz);
+
+- NSUInteger i;
++ static JNF_CLASS_CACHE(jc_String, "java/lang/String");
++ result = JNFNewObjectArray(env, &jc_String, count);
++ if (!result) {
++ NSLog(@"In %s, can't create Java array of String objects", __FUNCTION__);
++ return;
++ }
++
++ NSInteger i;
+ for (i = 0; i < count; i++) {
+ jstring jString = JNFNSToJavaString(env, [ignoredKeys objectAtIndex:i]);
+ (*env)->SetObjectArrayElement(env, result, i, jString);
+@@ -295,7 +299,7 @@
+ jsize arrayLen = (*env)->GetArrayLength(env, jchildrenAndRoles);
+ NSMutableArray *children = [NSMutableArray arrayWithCapacity:arrayLen/2]; //childrenAndRoles array contains two elements (child, role) for each child
+
+- NSUInteger i;
++ NSInteger i;
+ NSUInteger childIndex = (whichChildren >= 0) ? whichChildren : 0; // if we're getting one particular child, make sure to set its index correctly
+ for(i = 0; i < arrayLen; i+=2)
+ {
+@@ -391,8 +395,13 @@
+ // Get all the other accessibility attributes states we need in one swell foop.
+ // javaRole isn't pulled in because we need protected access to AccessibleRole.key
+ jbooleanArray attributeStates = JNFCallStaticObjectMethod(env, jm_getInitialAttributeStates, fAccessible, fComponent); // AWT_THREADING Safe (AWTRunLoop)
+- if (attributeStates == NULL) return NULL;
++ if (attributeStates == NULL) return nil;
+ jboolean *attributeStatesArray = (*env)->GetBooleanArrayElements(env, attributeStates, 0);
++ if (attributeStatesArray == NULL) {
++ // Note: Java will not be on the stack here so a java exception can't happen and no need to call ExceptionCheck.
++ NSLog(@"%s failed calling GetBooleanArrayElements", __FUNCTION__);
++ return nil;
++ }
+
+ // if there's a component, it can be enabled and it has a size/position
+ if (attributeStatesArray[0]) {
+@@ -1113,7 +1122,9 @@
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ id value = nil;
+
++ NSWindow* hostWindow = [[self->fView window] retain];
+ jobject focused = JNFCallStaticObjectMethod(env, jm_getFocusOwner, fComponent); // AWT_THREADING Safe (AWTRunLoop)
++ [hostWindow release];
+ if (focused != NULL) {
+ if (JNFIsInstanceOf(env, focused, &sjc_Accessible)) {
+ value = [JavaComponentAccessibility createWithAccessible:focused withEnv:env withView:fView];
+@@ -1220,7 +1231,7 @@
+ // Go through the tabs and find selAccessible
+ _numTabs = [tabs count];
+ JavaComponentAccessibility *aTab;
+- NSUInteger i;
++ NSInteger i;
+ for (i = 0; i < _numTabs; i++) {
+ aTab = (JavaComponentAccessibility *)[tabs objectAtIndex:i];
+ if ([aTab isAccessibleWithEnv:env forAccessible:selAccessible]) {
+@@ -1247,7 +1258,7 @@
+
+ NSString *tabJavaRole = JNFJavaToNSString(env, JNFGetObjectField(env, jtabJavaRole, sjf_key));
+
+- NSUInteger i;
++ NSInteger i;
+ NSUInteger tabIndex = (whichTabs >= 0) ? whichTabs : 0; // if we're getting one particular child, make sure to set its index correctly
+ for(i = 0; i < arrayLen; i+=2) {
+ jobject jtab = (*env)->GetObjectArrayElement(env, jtabsAndRoles, i);
+--- ./jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m Mon Jan 05 11:57:27 2015 -0800
+@@ -40,6 +40,11 @@
+ */
+ NSValue *javaIntArrayToNSRangeValue(JNIEnv* env, jintArray array) {
+ jint *values = (*env)->GetIntArrayElements(env, array, 0);
++ if (values == NULL) {
++ // Note: Java will not be on the stack here so a java exception can't happen and no need to call ExceptionCheck.
++ NSLog(@"%s failed calling GetIntArrayElements", __FUNCTION__);
++ return nil;
++ };
+ NSValue *value = [NSValue valueWithRange:NSMakeRange(values[0], values[1] - values[0])];
+ (*env)->ReleaseIntArrayElements(env, array, values, 0);
+ return value;
+@@ -285,6 +290,11 @@
+
+ // We cheat because we know that the array is 4 elements long (x, y, width, height)
+ jdouble *values = (*env)->GetDoubleArrayElements(env, axBounds, 0);
++ if (values == NULL) {
++ // Note: Java will not be on the stack here so a java exception can't happen and no need to call ExceptionCheck.
++ NSLog(@"%s failed calling GetDoubleArrayElements", __FUNCTION__);
++ return nil;
++ };
+ NSRect bounds;
+ bounds.origin.x = values[0];
+ bounds.origin.y = [[[[self view] window] screen] frame].size.height - values[1] - values[3]; //values[1] is y-coord from top-left of screen. Flip. Account for the height (values[3]) when flipping
+--- ./jdk/src/share/classes/com/sun/crypto/provider/OAEPParameters.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/crypto/provider/OAEPParameters.java Mon Jan 05 11:57:27 2015 -0800
+@@ -106,20 +106,6 @@
+ }
+ }
+
+- private static String convertToStandardName(String internalName) {
+- if (internalName.equals("SHA")) {
+- return "SHA-1";
+- } else if (internalName.equals("SHA256")) {
+- return "SHA-256";
+- } else if (internalName.equals("SHA384")) {
+- return "SHA-384";
+- } else if (internalName.equals("SHA512")) {
+- return "SHA-512";
+- } else {
+- return internalName;
+- }
+- }
+-
+ protected void engineInit(byte[] encoded)
+ throws IOException {
+ DerInputStream der = new DerInputStream(encoded);
+@@ -131,7 +117,7 @@
+ DerValue data = datum[i];
+ if (data.isContextSpecific((byte) 0x00)) {
+ // hash algid
+- mdName = convertToStandardName(AlgorithmId.parse
++ mdName = AlgorithmId.getStandardDigestName(AlgorithmId.parse
+ (data.data.getDerValue()).getName());
+ } else if (data.isContextSpecific((byte) 0x01)) {
+ // mgf algid
+@@ -141,7 +127,8 @@
+ }
+ AlgorithmId params = AlgorithmId.parse(
+ new DerValue(val.getEncodedParams()));
+- String mgfDigestName = convertToStandardName(params.getName());
++ String mgfDigestName = AlgorithmId.getStandardDigestName(
++ params.getName());
+ if (mgfDigestName.equals("SHA-1")) {
+ mgfSpec = MGF1ParameterSpec.SHA1;
+ } else if (mgfDigestName.equals("SHA-256")) {
+--- ./jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1256,8 +1256,11 @@
+ if (name.equals("IHDR")) {
+ IHDR_width = getIntAttribute(node, "width");
+ IHDR_height = getIntAttribute(node, "height");
+- IHDR_bitDepth = getEnumeratedAttribute(node, "bitDepth",
+- IHDR_bitDepths);
++ IHDR_bitDepth =
++ Integer.valueOf(IHDR_bitDepths[
++ getEnumeratedAttribute(node,
++ "bitDepth",
++ IHDR_bitDepths)]);
+ IHDR_colorType = getEnumeratedAttribute(node, "colorType",
+ IHDR_colorTypeNames);
+ IHDR_compressionMethod =
+--- ./jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java Mon Jan 05 11:57:27 2015 -0800
+@@ -27,6 +27,8 @@
+
+ import sun.awt.EventQueueDelegate;
+ import sun.awt.AppContext;
++import sun.awt.SunToolkit;
++
+ import java.util.Collections;
+ import java.util.Map;
+ import java.util.WeakHashMap;
+@@ -117,8 +119,8 @@
+ public static RepaintManager getDelegateRepaintManager(Component
+ component) {
+ RepaintManager delegate = null;
+- if (Boolean.TRUE == AppContext.getAppContext().get(
+- DELEGATE_REPAINT_MANAGER_KEY)) {
++ if (Boolean.TRUE == SunToolkit.targetToAppContext(component)
++ .get(DELEGATE_REPAINT_MANAGER_KEY)) {
+ while (delegate == null && component != null) {
+ while (component != null
+ && ! (component instanceof JComponent)) {
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, 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
+@@ -130,11 +130,14 @@
+ //one second seems plausible value
+ duration = 1000;
+ } else {
+- duration = XPStyle.getXP().getThemeTransitionDuration(
+- c, part,
+- normalizeState(oldState),
+- normalizeState(newState),
+- Prop.TRANSITIONDURATIONS);
++ XPStyle xp = XPStyle.getXP();
++ duration = (xp != null)
++ ? xp.getThemeTransitionDuration(
++ c, part,
++ normalizeState(oldState),
++ normalizeState(newState),
++ Prop.TRANSITIONDURATIONS)
++ : 1000;
+ }
+ controller.startAnimation(c, part, oldState, newState, duration);
+ }
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -37,6 +37,7 @@
+ import static com.sun.java.swing.plaf.windows.TMSchema.Part;
+ import static com.sun.java.swing.plaf.windows.TMSchema.State;
+ import static com.sun.java.swing.plaf.windows.XPStyle.Skin;
++
+ import sun.swing.DefaultLookup;
+ import sun.swing.StringUIClientPropertyKey;
+
+@@ -231,6 +232,9 @@
+
+ private void paintXPComboBoxBackground(Graphics g, JComponent c) {
+ XPStyle xp = XPStyle.getXP();
++ if (xp == null) {
++ return;
++ }
+ State state = getXPComboBoxState(c);
+ Skin skin = null;
+ if (! comboBox.isEditable()
+@@ -400,17 +404,18 @@
+ * @return a button which represents the popup control
+ */
+ protected JButton createArrowButton() {
+- if (XPStyle.getXP() != null) {
+- return new XPComboBoxButton();
++ XPStyle xp = XPStyle.getXP();
++ if (xp != null) {
++ return new XPComboBoxButton(xp);
+ } else {
+ return super.createArrowButton();
+ }
+ }
+
+ private class XPComboBoxButton extends XPStyle.GlyphButton {
+- public XPComboBoxButton() {
++ public XPComboBoxButton(XPStyle xp) {
+ super(null,
+- (! XPStyle.getXP().isSkinDefined(comboBox, Part.CP_DROPDOWNBUTTONRIGHT))
++ (! xp.isSkinDefined(comboBox, Part.CP_DROPDOWNBUTTONRIGHT))
+ ? Part.CP_DROPDOWNBUTTON
+ : (comboBox.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
+ ? Part.CP_DROPDOWNBUTTONLEFT
+@@ -423,10 +428,11 @@
+ protected State getState() {
+ State rv;
+ rv = super.getState();
++ XPStyle xp = XPStyle.getXP();
+ if (rv != State.DISABLED
+ && comboBox != null && ! comboBox.isEditable()
+- && XPStyle.getXP().isSkinDefined(comboBox,
+- Part.CP_DROPDOWNBUTTONRIGHT)) {
++ && xp != null && xp.isSkinDefined(comboBox,
++ Part.CP_DROPDOWNBUTTONRIGHT)) {
+ /*
+ * for non editable ComboBoxes Vista seems to have the
+ * same glyph for all non DISABLED states
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1067,16 +1067,9 @@
+
+ directories.clear();
+
+- File[] baseFolders;
+- if (useShellFolder) {
+- baseFolders = AccessController.doPrivileged(new PrivilegedAction<File[]>() {
+- public File[] run() {
+- return (File[]) ShellFolder.get("fileChooserComboBoxFolders");
+- }
+- });
+- } else {
+- baseFolders = fsv.getRoots();
+- }
++ File[] baseFolders = (useShellFolder)
++ ? (File[]) ShellFolder.get("fileChooserComboBoxFolders")
++ : fsv.getRoots();
+ directories.addAll(Arrays.asList(baseFolders));
+
+ // Get the canonical (full) path. This has the side
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -125,6 +125,9 @@
+ static void paintXPText(AbstractButton b, Part part, State state,
+ Graphics g, int x, int y, String text, int mnemIndex) {
+ XPStyle xp = XPStyle.getXP();
++ if (xp == null) {
++ return;
++ }
+ Color textColor = b.getForeground();
+
+ if (textColor instanceof UIResource) {
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2006, 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
+@@ -613,8 +613,8 @@
+
+ private static class MenuArrowIcon implements Icon, UIResource, Serializable {
+ public void paintIcon(Component c, Graphics g, int x, int y) {
+- if (WindowsMenuItemUI.isVistaPainting()) {
+- XPStyle xp = XPStyle.getXP();
++ XPStyle xp = XPStyle.getXP();
++ if (WindowsMenuItemUI.isVistaPainting(xp)) {
+ State state = State.NORMAL;
+ if (c instanceof JMenuItem) {
+ state = ((JMenuItem) c).getModel().isEnabled()
+@@ -647,16 +647,18 @@
+ }
+ }
+ public int getIconWidth() {
+- if (WindowsMenuItemUI.isVistaPainting()) {
+- Skin skin = XPStyle.getXP().getSkin(null, Part.MP_POPUPSUBMENU);
++ XPStyle xp = XPStyle.getXP();
++ if (WindowsMenuItemUI.isVistaPainting(xp)) {
++ Skin skin = xp.getSkin(null, Part.MP_POPUPSUBMENU);
+ return skin.getWidth();
+ } else {
+ return 4;
+ }
+ }
+ public int getIconHeight() {
+- if (WindowsMenuItemUI.isVistaPainting()) {
+- Skin skin = XPStyle.getXP().getSkin(null, Part.MP_POPUPSUBMENU);
++ XPStyle xp = XPStyle.getXP();
++ if (WindowsMenuItemUI.isVistaPainting(xp)) {
++ Skin skin = xp.getSkin(null, Part.MP_POPUPSUBMENU);
+ return skin.getHeight();
+ } else {
+ return 8;
+@@ -682,7 +684,8 @@
+ }
+
+ static int getIconWidth() {
+- return XPStyle.getXP().getSkin(null, Part.MP_POPUPCHECK).getWidth()
++ XPStyle xp = XPStyle.getXP();
++ return ((xp != null) ? xp.getSkin(null, Part.MP_POPUPCHECK).getWidth() : 16)
+ + 2 * OFFSET;
+ }
+
+@@ -745,12 +748,17 @@
+ Icon icon = getIcon();
+ int height = 0;
+ if (icon != null) {
+- height = icon.getIconHeight() + 2 * OFFSET;
++ height = icon.getIconHeight();
+ } else {
+- Skin skin =
+- XPStyle.getXP().getSkin(null, Part.MP_POPUPCHECK);
+- height = skin.getHeight() + 2 * OFFSET;
++ XPStyle xp = XPStyle.getXP();
++ if (xp != null) {
++ Skin skin = xp.getSkin(null, Part.MP_POPUPCHECK);
++ height = skin.getHeight();
++ } else {
++ height = 16;
++ }
+ }
++ height += 2 * OFFSET;
+ return height;
+ }
+
+@@ -798,14 +806,16 @@
+ ? State.BULLETDISABLED
+ : State.CHECKMARKDISABLED;
+ }
+- Skin skin;
+ XPStyle xp = XPStyle.getXP();
+- skin = xp.getSkin(c, backgroundPart);
+- skin.paintSkin(g, x, y,
+- getIconWidth(), getIconHeight(), backgroundState);
+- if (icon == null) {
+- skin = xp.getSkin(c, part);
+- skin.paintSkin(g, x + OFFSET, y + OFFSET, state);
++ if (xp != null) {
++ Skin skin;
++ skin = xp.getSkin(c, backgroundPart);
++ skin.paintSkin(g, x, y,
++ getIconWidth(), getIconHeight(), backgroundState);
++ if (icon == null) {
++ skin = xp.getSkin(c, part);
++ skin.paintSkin(g, x + OFFSET, y + OFFSET, state);
++ }
+ }
+ }
+ }
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2008, 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
+@@ -85,14 +85,15 @@
+ }
+ } else {
+ buttonWidth += 2;
+- selectedTitleGradientColor =
+- UIManager.getColor("InternalFrame.activeTitleGradient");
+- notSelectedTitleGradientColor =
+- UIManager.getColor("InternalFrame.inactiveTitleGradient");
+ Color activeBorderColor =
+ UIManager.getColor("InternalFrame.activeBorderColor");
+ setBorder(BorderFactory.createLineBorder(activeBorderColor, 1));
+ }
++ // JDK-8039383: initialize these colors because getXP() may return null when theme is changed
++ selectedTitleGradientColor =
++ UIManager.getColor("InternalFrame.activeTitleGradient");
++ notSelectedTitleGradientColor =
++ UIManager.getColor("InternalFrame.inactiveTitleGradient");
+ }
+
+ protected void uninstallListeners() {
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -2400,8 +2400,9 @@
+ }
+
+ public Object getXPValue(UIDefaults table) {
+- Border xpBorder = XPStyle.getXP().getBorder(null, (Part)xpValue);
+- if (extraMargin != null) {
++ XPStyle xp = XPStyle.getXP();
++ Border xpBorder = xp != null ? xp.getBorder(null, (Part)xpValue) : null;
++ if (xpBorder != null && extraMargin != null) {
+ return new BorderUIResource.
+ CompoundBorderUIResource(xpBorder, extraMargin);
+ } else {
+@@ -2417,7 +2418,8 @@
+
+ public Object getXPValue(UIDefaults table) {
+ XPColorValueKey key = (XPColorValueKey)xpValue;
+- return XPStyle.getXP().getColor(key.skin, key.prop, null);
++ XPStyle xp = XPStyle.getXP();
++ return xp != null ? xp.getColor(key.skin, key.prop, null) : null;
+ }
+
+ private static class XPColorValueKey {
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2006, 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
+@@ -155,8 +155,8 @@
+
+ @Override
+ public void paint(Graphics g, JComponent c) {
+- if (WindowsMenuItemUI.isVistaPainting()) {
+- XPStyle xp = XPStyle.getXP();
++ XPStyle xp = XPStyle.getXP();
++ if (WindowsMenuItemUI.isVistaPainting(xp)) {
+ Skin skin;
+ skin = xp.getSkin(c, Part.MP_BARBACKGROUND);
+ int width = c.getWidth();
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2006, 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
+@@ -108,8 +108,9 @@
+
+ static void paintBackground(WindowsMenuItemUIAccessor menuItemUI,
+ Graphics g, JMenuItem menuItem, Color bgColor) {
+- assert isVistaPainting();
+- if (isVistaPainting()) {
++ XPStyle xp = XPStyle.getXP();
++ assert isVistaPainting(xp);
++ if (isVistaPainting(xp)) {
+ int menuWidth = menuItem.getWidth();
+ int menuHeight = menuItem.getHeight();
+ if (menuItem.isOpaque()) {
+@@ -118,7 +119,6 @@
+ g.fillRect(0,0, menuWidth, menuHeight);
+ g.setColor(oldColor);
+ }
+- XPStyle xp = XPStyle.getXP();
+ Part part = menuItemUI.getPart(menuItem);
+ Skin skin = xp.getSkin(menuItem, part);
+ skin.paintSkin(g, 0 , 0,
+@@ -170,8 +170,11 @@
+ * is it possible that in some theme some Vista parts are not defined while
+ * others are?
+ */
+- static boolean isVistaPainting() {
+- XPStyle xp = XPStyle.getXP();
++ static boolean isVistaPainting(final XPStyle xp) {
+ return xp != null && xp.isSkinDefined(null, Part.MP_POPUPITEM);
+ }
++
++ static boolean isVistaPainting() {
++ return isVistaPainting(XPStyle.getXP());
++ }
+ }
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -50,7 +50,8 @@
+
+ public void paint(Graphics g, JComponent c) {
+ Dimension s = c.getSize();
+- if (WindowsMenuItemUI.isVistaPainting()) {
++ XPStyle xp = XPStyle.getXP();
++ if (WindowsMenuItemUI.isVistaPainting(xp)) {
+ int x = 1;
+ Component parent = c.getParent();
+ if (parent instanceof JComponent) {
+@@ -67,7 +68,7 @@
+ x += WindowsPopupMenuUI.getGutterWidth();
+ }
+ }
+- Skin skin = XPStyle.getXP().getSkin(c, Part.MP_POPUPSEPARATOR);
++ Skin skin = xp.getSkin(c, Part.MP_POPUPSEPARATOR);
+ int skinHeight = skin.getHeight();
+ int y = (s.height - skinHeight) / 2;
+ skin.paintSkin(g, x, y, s.width - x - 1, skinHeight, State.NORMAL);
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2006, 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
+@@ -194,8 +194,8 @@
+
+ @Override
+ public void paint(Graphics g, JComponent c) {
+- if (WindowsMenuItemUI.isVistaPainting()) {
+- XPStyle xp = XPStyle.getXP();
++ XPStyle xp = XPStyle.getXP();
++ if (WindowsMenuItemUI.isVistaPainting(xp)) {
+ Skin skin = xp.getSkin(c, Part.MP_POPUPBACKGROUND);
+ skin.paintSkin(g, 0, 0, c.getWidth(),c.getHeight(), State.NORMAL);
+ int textOffset = getTextOffset(c);
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2006, 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
+@@ -317,8 +317,9 @@
+ private Rectangle getFullChunkBounds(Rectangle box) {
+ boolean vertical = (progressBar.getOrientation() == JProgressBar.VERTICAL);
+ XPStyle xp = XPStyle.getXP();
+- int gap = xp.getInt(progressBar, Part.PP_PROGRESS, null,
+- Prop.PROGRESSSPACESIZE, 0);
++ int gap = (xp != null) ? xp.getInt(progressBar, Part.PP_PROGRESS,
++ null, Prop.PROGRESSSPACESIZE, 0)
++ : 0;
+
+ if (!vertical) {
+ int chunksize = box.width+gap;
+@@ -333,6 +334,9 @@
+ boolean vertical,
+ int bgwidth, int bgheight) {
+ XPStyle xp = XPStyle.getXP();
++ if (xp == null) {
++ return;
++ }
+
+ // create a new graphics to keep drawing surface state
+ Graphics2D gfx = (Graphics2D)g.create();
+@@ -391,6 +395,9 @@
+ private void paintXPBackground(Graphics g, boolean vertical,
+ int barRectWidth, int barRectHeight) {
+ XPStyle xp = XPStyle.getXP();
++ if (xp == null) {
++ return;
++ }
+ Part part = vertical ? Part.PP_BARVERT : Part.PP_BAR;
+ Skin skin = xp.getSkin(progressBar, part);
+
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2005, 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
+@@ -215,7 +215,6 @@
+ }
+
+ private Part getXPThumbPart() {
+- XPStyle xp = XPStyle.getXP();
+ Part part;
+ boolean vertical = (slider.getOrientation() == JSlider.VERTICAL);
+ boolean leftToRight = slider.getComponentOrientation().isLeftToRight();
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2006, 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
+@@ -63,6 +63,9 @@
+
+ private void paintXPBackground(Graphics g, JComponent c) {
+ XPStyle xp = XPStyle.getXP();
++ if (xp == null) {
++ return;
++ }
+ Skin skin = xp.getSkin(c, Part.EP_EDIT);
+ State state = getXPState(c);
+ skin.paintSkin(g, 0, 0, c.getWidth(), c.getHeight(), state);
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -90,9 +90,10 @@
+ this.column = column;
+ this.hasRollover = (column == getRolloverColumn());
+ if (skin == null) {
+- skin = XPStyle.getXP().getSkin(header, Part.HP_HEADERITEM);
++ XPStyle xp = XPStyle.getXP();
++ skin = (xp != null) ? xp.getSkin(header, Part.HP_HEADERITEM) : null;
+ }
+- Insets margins = skin.getContentMargin();
++ Insets margins = (skin != null) ? skin.getContentMargin() : null;
+ Border border = null;
+ int contentTop = 0;
+ int contentLeft = 0;
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2007, 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
+@@ -115,7 +115,7 @@
+ }
+ }
+ }
+- return xp;
++ return ThemeReader.isXPStyleEnabled() ? xp : null;
+ }
+
+ static boolean isVista() {
+@@ -180,9 +180,10 @@
+ * should probably be cached there instead of here.
+ */
+ Dimension getDimension(Component c, Part part, State state, Prop prop) {
+- return ThemeReader.getPosition(part.getControlName(c), part.getValue(),
+- State.getValue(part, state),
+- prop.getValue());
++ Dimension d = ThemeReader.getPosition(part.getControlName(c), part.getValue(),
++ State.getValue(part, state),
++ prop.getValue());
++ return (d != null) ? d : new Dimension();
+ }
+
+ /** Get a named <code>Point</code> (e.g. a location or an offset) value
+@@ -199,11 +200,7 @@
+ Dimension d = ThemeReader.getPosition(part.getControlName(c), part.getValue(),
+ State.getValue(part, state),
+ prop.getValue());
+- if (d != null) {
+- return new Point(d.width, d.height);
+- } else {
+- return null;
+- }
++ return (d != null) ? new Point(d.width, d.height) : new Point();
+ }
+
+ /** Get a named <code>Insets</code> value from the current style
+@@ -217,9 +214,10 @@
+ * The return value is already cached in those places.
+ */
+ Insets getMargin(Component c, Part part, State state, Prop prop) {
+- return ThemeReader.getThemeMargins(part.getControlName(c), part.getValue(),
+- State.getValue(part, state),
+- prop.getValue());
++ Insets insets = ThemeReader.getThemeMargins(part.getControlName(c), part.getValue(),
++ State.getValue(part, state),
++ prop.getValue());
++ return (insets != null) ? insets : new Insets(0, 0, 0, 0);
+ }
+
+
+@@ -505,16 +503,17 @@
+ int boundingWidth = 100;
+ int boundingHeight = 100;
+
+- return ThemeReader.getThemeBackgroundContentMargins(
++ Insets insets = ThemeReader.getThemeBackgroundContentMargins(
+ part.getControlName(null), part.getValue(),
+ 0, boundingWidth, boundingHeight);
++ return (insets != null) ? insets : new Insets(0, 0, 0, 0);
+ }
+
+ private int getWidth(State state) {
+ if (size == null) {
+ size = getPartSize(part, state);
+ }
+- return size.width;
++ return (size != null) ? size.width : 0;
+ }
+
+ int getWidth() {
+@@ -525,7 +524,7 @@
+ if (size == null) {
+ size = getPartSize(part, state);
+ }
+- return size.height;
++ return (size != null) ? size.height : 0;
+ }
+
+ int getHeight() {
+@@ -582,6 +581,9 @@
+ * @param state which state to paint
+ */
+ void paintSkin(Graphics g, int dx, int dy, int dw, int dh, State state) {
++ if (XPStyle.getXP() == null) {
++ return;
++ }
+ if (ThemeReader.isGetThemeTransitionDurationDefined()
+ && component instanceof JComponent
+ && SwingUtilities.getAncestorOfClass(CellRendererPane.class,
+@@ -607,6 +609,9 @@
+ * @param state which state to paint
+ */
+ void paintSkinRaw(Graphics g, int dx, int dy, int dw, int dh, State state) {
++ if (XPStyle.getXP() == null) {
++ return;
++ }
+ skinPainter.paint(null, g, dx, dy, dw, dh, this, state);
+ }
+
+@@ -625,6 +630,9 @@
+ */
+ void paintSkin(Graphics g, int dx, int dy, int dw, int dh, State state,
+ boolean borderFill) {
++ if (XPStyle.getXP() == null) {
++ return;
++ }
+ if(borderFill && "borderfill".equals(getTypeEnumName(component, part,
+ state, Prop.BGTYPE))) {
+ return;
+@@ -679,7 +687,7 @@
+
+ public GlyphButton(Component parent, Part part) {
+ XPStyle xp = getXP();
+- skin = xp.getSkin(parent, part);
++ skin = xp != null ? xp.getSkin(parent, part) : null;
+ setBorder(null);
+ setContentAreaFilled(false);
+ setMinimumSize(new Dimension(5, 5));
+@@ -704,13 +712,16 @@
+ }
+
+ public void paintComponent(Graphics g) {
++ if (XPStyle.getXP() == null || skin == null) {
++ return;
++ }
+ Dimension d = getSize();
+ skin.paintSkin(g, 0, 0, d.width, d.height, getState());
+ }
+
+ public void setPart(Component parent, Part part) {
+ XPStyle xp = getXP();
+- skin = xp.getSkin(parent, part);
++ skin = xp != null ? xp.getSkin(parent, part) : null;
+ revalidate();
+ repaint();
+ }
+--- ./jdk/src/share/classes/com/sun/jndi/ldap/BerDecoder.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/jndi/ldap/BerDecoder.java Mon Jan 05 11:57:27 2015 -0800
+@@ -95,6 +95,9 @@
+ for( int i = 0; i < lengthbyte; i++) {
+ retval = (retval << 8) + (buf[offset++] & 0xff);
+ }
++ if (retval < 0) {
++ throw new DecodeException("Invalid length bytes");
++ }
+ return retval;
+ } else {
+ return lengthbyte;
+--- ./jdk/src/share/classes/com/sun/jndi/ldap/Connection.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/com/sun/jndi/ldap/Connection.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2012, 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
+@@ -464,10 +464,10 @@
+ // will be woken up before readTimeout only if reply is
+ // available
+ ldr.wait(readTimeout);
+- waited = true;
+ } else {
+ ldr.wait(15 * 1000); // 15 second timeout
+ }
++ waited = true;
+ } else {
+ break;
+ }
+@@ -479,7 +479,7 @@
+ }
+
+ if ((rber == null) && waited) {
+- removeRequest(ldr);
++ abandonRequest(ldr, null);
+ throw new NamingException("LDAP response read timed out, timeout used:"
+ + readTimeout + "ms." );
+
+--- ./jdk/src/share/classes/java/awt/Component.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/awt/Component.java Mon Jan 05 11:57:27 2015 -0800
+@@ -3394,7 +3394,7 @@
+ (width > 0) && (height > 0)) {
+ PaintEvent e = new PaintEvent(this, PaintEvent.UPDATE,
+ new Rectangle(x, y, width, height));
+- Toolkit.getEventQueue().postEvent(e);
++ SunToolkit.postEvent(SunToolkit.targetToAppContext(this), e);
+ }
+ }
+ }
+--- ./jdk/src/share/classes/java/awt/EventQueue.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/awt/EventQueue.java Mon Jan 05 11:57:27 2015 -0800
+@@ -209,6 +209,11 @@
+ {
+ EventQueue.invokeAndWait(source, r);
+ }
++
++ @Override
++ public long getMostRecentEventTime(EventQueue eventQueue) {
++ return eventQueue.getMostRecentEventTimeImpl();
++ }
+ });
+ }
+
+--- ./jdk/src/share/classes/java/awt/event/InputMethodEvent.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/awt/event/InputMethodEvent.java Mon Jan 05 11:57:27 2015 -0800
+@@ -25,6 +25,10 @@
+
+ package java.awt.event;
+
++import sun.awt.AWTAccessor;
++import sun.awt.AppContext;
++import sun.awt.SunToolkit;
++
+ import java.awt.AWTEvent;
+ import java.awt.Component;
+ import java.awt.EventQueue;
+@@ -217,8 +221,10 @@
+ public InputMethodEvent(Component source, int id,
+ AttributedCharacterIterator text, int committedCharacterCount,
+ TextHitInfo caret, TextHitInfo visiblePosition) {
+- this(source, id, EventQueue.getMostRecentEventTime(), text,
+- committedCharacterCount, caret, visiblePosition);
++ this(source, id,
++ getMostRecentEventTimeForSource(source),
++ text, committedCharacterCount,
++ caret, visiblePosition);
+ }
+
+ /**
+@@ -258,8 +264,9 @@
+ */
+ public InputMethodEvent(Component source, int id, TextHitInfo caret,
+ TextHitInfo visiblePosition) {
+- this(source, id, EventQueue.getMostRecentEventTime(), null,
+- 0, caret, visiblePosition);
++ this(source, id,
++ getMostRecentEventTimeForSource(source),
++ null, 0, caret, visiblePosition);
+ }
+
+ /**
+@@ -410,7 +417,26 @@
+ private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
+ s.defaultReadObject();
+ if (when == 0) {
++ // Can't use getMostRecentEventTimeForSource because source is always null during deserialization
+ when = EventQueue.getMostRecentEventTime();
+ }
+ }
++
++ /**
++ * Get the most recent event time in the {@code EventQueue} which the {@code source}
++ * belongs to.
++ *
++ * @param source the source of the event
++ * @exception IllegalArgumentException if source is null.
++ * @return most recent event time in the {@code EventQueue}
++ */
++ private static long getMostRecentEventTimeForSource(Object source) {
++ if (source == null) {
++ // throw the IllegalArgumentException to conform to EventObject spec
++ throw new IllegalArgumentException("null source");
++ }
++ AppContext appContext = SunToolkit.targetToAppContext(source);
++ EventQueue eventQueue = SunToolkit.getSystemEventQueueImplPP(appContext);
++ return AWTAccessor.getEventQueueAccessor().getMostRecentEventTime(eventQueue);
++ }
+ }
+--- ./jdk/src/share/classes/java/awt/event/MouseEvent.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/awt/event/MouseEvent.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2008, 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
+@@ -758,7 +758,6 @@
+
+ if (getModifiersEx() != 0) { //There is at least one more button in a pressed state.
+ if (id == MouseEvent.MOUSE_RELEASED || id == MouseEvent.MOUSE_CLICKED){
+- System.out.println("MEvent. CASE!");
+ shouldExcludeButtonFromExtModifiers = true;
+ }
+ }
+--- ./jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2010, 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
+@@ -41,8 +41,8 @@
+ public class IndexedPropertyDescriptor extends PropertyDescriptor {
+
+ private Reference<Class> indexedPropertyTypeRef;
+- private Reference<Method> indexedReadMethodRef;
+- private Reference<Method> indexedWriteMethodRef;
++ private final MethodRef indexedReadMethodRef = new MethodRef();
++ private final MethodRef indexedWriteMethodRef = new MethodRef();
+
+ private String indexedReadMethodName;
+ private String indexedWriteMethodName;
+@@ -173,11 +173,11 @@
+ * May return null if the property isn't indexed or is write-only.
+ */
+ public synchronized Method getIndexedReadMethod() {
+- Method indexedReadMethod = getIndexedReadMethod0();
++ Method indexedReadMethod = this.indexedReadMethodRef.get();
+ if (indexedReadMethod == null) {
+ Class cls = getClass0();
+ if (cls == null ||
+- (indexedReadMethodName == null && indexedReadMethodRef == null)) {
++ (indexedReadMethodName == null && !this.indexedReadMethodRef.isSet())) {
+ // the Indexed readMethod was explicitly set to null.
+ return null;
+ }
+@@ -213,20 +213,19 @@
+
+ // the indexed property type is set by the reader.
+ setIndexedPropertyType(findIndexedPropertyType(readMethod,
+- getIndexedWriteMethod0()));
++ this.indexedWriteMethodRef.get()));
+ setIndexedReadMethod0(readMethod);
+ }
+
+ private void setIndexedReadMethod0(Method readMethod) {
++ this.indexedReadMethodRef.set(readMethod);
+ if (readMethod == null) {
+ indexedReadMethodName = null;
+- indexedReadMethodRef = null;
+ return;
+ }
+ setClass0(readMethod.getDeclaringClass());
+
+ indexedReadMethodName = readMethod.getName();
+- this.indexedReadMethodRef = getSoftReference(readMethod);
+ setTransient(readMethod.getAnnotation(Transient.class));
+ }
+
+@@ -239,11 +238,11 @@
+ * May return null if the property isn't indexed or is read-only.
+ */
+ public synchronized Method getIndexedWriteMethod() {
+- Method indexedWriteMethod = getIndexedWriteMethod0();
++ Method indexedWriteMethod = this.indexedWriteMethodRef.get();
+ if (indexedWriteMethod == null) {
+ Class cls = getClass0();
+ if (cls == null ||
+- (indexedWriteMethodName == null && indexedWriteMethodRef == null)) {
++ (indexedWriteMethodName == null && !this.indexedWriteMethodRef.isSet())) {
+ // the Indexed writeMethod was explicitly set to null.
+ return null;
+ }
+@@ -297,15 +296,14 @@
+ }
+
+ private void setIndexedWriteMethod0(Method writeMethod) {
++ this.indexedWriteMethodRef.set(writeMethod);
+ if (writeMethod == null) {
+ indexedWriteMethodName = null;
+- indexedWriteMethodRef = null;
+ return;
+ }
+ setClass0(writeMethod.getDeclaringClass());
+
+ indexedWriteMethodName = writeMethod.getName();
+- this.indexedWriteMethodRef = getSoftReference(writeMethod);
+ setTransient(writeMethod.getAnnotation(Transient.class));
+ }
+
+@@ -345,18 +343,6 @@
+ : null;
+ }
+
+- private Method getIndexedReadMethod0() {
+- return (this.indexedReadMethodRef != null)
+- ? this.indexedReadMethodRef.get()
+- : null;
+- }
+-
+- private Method getIndexedWriteMethod0() {
+- return (this.indexedWriteMethodRef != null)
+- ? this.indexedWriteMethodRef.get()
+- : null;
+- }
+-
+ private Class findIndexedPropertyType(Method indexedReadMethod,
+ Method indexedWriteMethod)
+ throws IntrospectionException {
+@@ -488,8 +474,8 @@
+ */
+ IndexedPropertyDescriptor(IndexedPropertyDescriptor old) {
+ super(old);
+- indexedReadMethodRef = old.indexedReadMethodRef;
+- indexedWriteMethodRef = old.indexedWriteMethodRef;
++ this.indexedReadMethodRef.set(old.indexedReadMethodRef.get());
++ this.indexedWriteMethodRef.set(old.indexedWriteMethodRef.get());
+ indexedPropertyTypeRef = old.indexedPropertyTypeRef;
+ indexedWriteMethodName = old.indexedWriteMethodName;
+ indexedReadMethodName = old.indexedReadMethodName;
+@@ -498,7 +484,7 @@
+ void updateGenericsFor(Class<?> type) {
+ super.updateGenericsFor(type);
+ try {
+- setIndexedPropertyType(findIndexedPropertyType(getIndexedReadMethod0(), getIndexedWriteMethod0()));
++ setIndexedPropertyType(findIndexedPropertyType(this.indexedReadMethodRef.get(), this.indexedWriteMethodRef.get()));
+ }
+ catch (IntrospectionException exception) {
+ setIndexedPropertyType(null);
+@@ -528,7 +514,7 @@
+ void appendTo(StringBuilder sb) {
+ super.appendTo(sb);
+ appendTo(sb, "indexedPropertyType", this.indexedPropertyTypeRef);
+- appendTo(sb, "indexedReadMethod", this.indexedReadMethodRef);
+- appendTo(sb, "indexedWriteMethod", this.indexedWriteMethodRef);
++ appendTo(sb, "indexedReadMethod", this.indexedReadMethodRef.get());
++ appendTo(sb, "indexedWriteMethod", this.indexedWriteMethodRef.get());
+ }
+ }
+--- ./jdk/src/share/classes/java/beans/MethodDescriptor.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/beans/MethodDescriptor.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2010, 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,7 +38,7 @@
+
+ public class MethodDescriptor extends FeatureDescriptor {
+
+- private Reference<Method> methodRef;
++ private final MethodRef methodRef = new MethodRef();
+
+ private String[] paramNames;
+
+@@ -79,7 +79,7 @@
+ * @return The low-level description of the method
+ */
+ public synchronized Method getMethod() {
+- Method method = getMethod0();
++ Method method = this.methodRef.get();
+ if (method == null) {
+ Class cls = getClass0();
+ String name = getName();
+@@ -112,13 +112,7 @@
+ setClass0(method.getDeclaringClass());
+ }
+ setParams(getParameterTypes(getClass0(), method));
+- this.methodRef = getSoftReference(method);
+- }
+-
+- private Method getMethod0() {
+- return (this.methodRef != null)
+- ? this.methodRef.get()
+- : null;
++ this.methodRef.set(method);
+ }
+
+ private synchronized void setParams(Class[] param) {
+@@ -173,12 +167,10 @@
+ */
+
+ MethodDescriptor(MethodDescriptor x, MethodDescriptor y) {
+- super(x,y);
++ super(x, y);
+
+- methodRef = x.methodRef;
+- if (y.methodRef != null) {
+- methodRef = y.methodRef;
+- }
++ Method method = y.methodRef.get();
++ this.methodRef.set(null != method ? method : x.methodRef.get());
+ params = x.params;
+ if (y.params != null) {
+ params = y.params;
+@@ -201,7 +193,7 @@
+ MethodDescriptor(MethodDescriptor old) {
+ super(old);
+
+- methodRef = old.methodRef;
++ this.methodRef.set(old.getMethod());
+ params = old.params;
+ paramNames = old.paramNames;
+
+@@ -215,7 +207,7 @@
+ }
+
+ void appendTo(StringBuilder sb) {
+- appendTo(sb, "method", this.methodRef);
++ appendTo(sb, "method", this.methodRef.get());
+ if (this.parameterDescriptors != null) {
+ sb.append("; parameterDescriptors={");
+ for (ParameterDescriptor pd : this.parameterDescriptors) {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/share/classes/java/beans/MethodRef.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,87 @@
++/*
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package java.beans;
++
++import java.lang.ref.SoftReference;
++import java.lang.ref.WeakReference;
++import java.lang.reflect.Method;
++
++import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
++
++final class MethodRef {
++ private String signature;
++ private SoftReference<Method> methodRef;
++ private WeakReference<Class<?>> typeRef;
++
++ void set(Method method) {
++ if (method == null) {
++ this.signature = null;
++ this.methodRef = null;
++ this.typeRef = null;
++ }
++ else {
++ this.signature = method.toGenericString();
++ this.methodRef = new SoftReference<>(method);
++ this.typeRef = new WeakReference<Class<?>>(method.getDeclaringClass());
++ }
++ }
++
++ boolean isSet() {
++ return this.methodRef != null;
++ }
++
++ Method get() {
++ if (this.methodRef == null) {
++ return null;
++ }
++ Method method = this.methodRef.get();
++ if (method == null) {
++ method = find(this.typeRef.get(), this.signature);
++ if (method == null) {
++ this.signature = null;
++ this.methodRef = null;
++ this.typeRef = null;
++ }
++ else {
++ this.methodRef = new SoftReference<>(method);
++ }
++ }
++ return isPackageAccessible(method.getDeclaringClass()) ? method : null;
++ }
++
++ private static Method find(Class<?> type, String signature) {
++ if (type != null) {
++ for (Method method : type.getMethods()) {
++ if (type.equals(method.getDeclaringClass())) {
++ if (method.toGenericString().equals(signature)) {
++ return method;
++ }
++ }
++ }
++ }
++ return null;
++ }
++}
+--- ./jdk/src/share/classes/java/beans/PropertyDescriptor.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/beans/PropertyDescriptor.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2013, 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
+@@ -36,8 +36,8 @@
+ public class PropertyDescriptor extends FeatureDescriptor {
+
+ private Reference<Class> propertyTypeRef;
+- private Reference<Method> readMethodRef;
+- private Reference<Method> writeMethodRef;
++ private final MethodRef readMethodRef = new MethodRef();
++ private final MethodRef writeMethodRef = new MethodRef();
+ private Reference<Class> propertyEditorClassRef;
+
+ private boolean bound;
+@@ -68,8 +68,8 @@
+ public PropertyDescriptor(String propertyName, Class<?> beanClass)
+ throws IntrospectionException {
+ this(propertyName, beanClass,
+- Introspector.IS_PREFIX + NameGenerator.capitalize(propertyName),
+- Introspector.SET_PREFIX + NameGenerator.capitalize(propertyName));
++ Introspector.IS_PREFIX + NameGenerator.capitalize(propertyName),
++ Introspector.SET_PREFIX + NameGenerator.capitalize(propertyName));
+ }
+
+ /**
+@@ -203,10 +203,10 @@
+ * May return null if the property can't be read.
+ */
+ public synchronized Method getReadMethod() {
+- Method readMethod = getReadMethod0();
++ Method readMethod = this.readMethodRef.get();
+ if (readMethod == null) {
+ Class cls = getClass0();
+- if (cls == null || (readMethodName == null && readMethodRef == null)) {
++ if (cls == null || (readMethodName == null && !this.readMethodRef.isSet())) {
+ // The read method was explicitly set to null.
+ return null;
+ }
+@@ -246,17 +246,16 @@
+ */
+ public synchronized void setReadMethod(Method readMethod)
+ throws IntrospectionException {
++ this.readMethodRef.set(readMethod);
+ if (readMethod == null) {
+ readMethodName = null;
+- readMethodRef = null;
+ return;
+ }
+ // The property type is determined by the read method.
+- setPropertyType(findPropertyType(readMethod, getWriteMethod0()));
++ setPropertyType(findPropertyType(readMethod, this.writeMethodRef.get()));
+ setClass0(readMethod.getDeclaringClass());
+
+ readMethodName = readMethod.getName();
+- this.readMethodRef = getSoftReference(readMethod);
+ setTransient(readMethod.getAnnotation(Transient.class));
+ }
+
+@@ -267,10 +266,10 @@
+ * May return null if the property can't be written.
+ */
+ public synchronized Method getWriteMethod() {
+- Method writeMethod = getWriteMethod0();
++ Method writeMethod = this.writeMethodRef.get();
+ if (writeMethod == null) {
+ Class cls = getClass0();
+- if (cls == null || (writeMethodName == null && writeMethodRef == null)) {
++ if (cls == null || (writeMethodName == null && !this.writeMethodRef.isSet())) {
+ // The write method was explicitly set to null.
+ return null;
+ }
+@@ -316,9 +315,9 @@
+ */
+ public synchronized void setWriteMethod(Method writeMethod)
+ throws IntrospectionException {
++ this.writeMethodRef.set(writeMethod);
+ if (writeMethod == null) {
+ writeMethodName = null;
+- writeMethodRef = null;
+ return;
+ }
+ // Set the property type - which validates the method
+@@ -326,22 +325,9 @@
+ setClass0(writeMethod.getDeclaringClass());
+
+ writeMethodName = writeMethod.getName();
+- this.writeMethodRef = getSoftReference(writeMethod);
+ setTransient(writeMethod.getAnnotation(Transient.class));
+ }
+
+- private Method getReadMethod0() {
+- return (this.readMethodRef != null)
+- ? this.readMethodRef.get()
+- : null;
+- }
+-
+- private Method getWriteMethod0() {
+- return (this.writeMethodRef != null)
+- ? this.writeMethodRef.get()
+- : null;
+- }
+-
+ /**
+ * Overridden to ensure that a super class doesn't take precedent
+ */
+@@ -618,8 +604,8 @@
+ PropertyDescriptor(PropertyDescriptor old) {
+ super(old);
+ propertyTypeRef = old.propertyTypeRef;
+- readMethodRef = old.readMethodRef;
+- writeMethodRef = old.writeMethodRef;
++ this.readMethodRef.set(old.readMethodRef.get());
++ this.writeMethodRef.set(old.writeMethodRef.get());
+ propertyEditorClassRef = old.propertyEditorClassRef;
+
+ writeMethodName = old.writeMethodName;
+@@ -633,7 +619,7 @@
+ void updateGenericsFor(Class<?> type) {
+ setClass0(type);
+ try {
+- setPropertyType(findPropertyType(getReadMethod0(), getWriteMethod0()));
++ setPropertyType(findPropertyType(this.readMethodRef.get(), this.writeMethodRef.get()));
+ }
+ catch (IntrospectionException exception) {
+ setPropertyType(null);
+@@ -724,8 +710,8 @@
+ appendTo(sb, "constrained", this.constrained);
+ appendTo(sb, "propertyEditorClass", this.propertyEditorClassRef);
+ appendTo(sb, "propertyType", this.propertyTypeRef);
+- appendTo(sb, "readMethod", this.readMethodRef);
+- appendTo(sb, "writeMethod", this.writeMethodRef);
++ appendTo(sb, "readMethod", this.readMethodRef.get());
++ appendTo(sb, "writeMethod", this.writeMethodRef.get());
+ }
+
+ private boolean isAssignable(Method m1, Method m2) {
+--- ./jdk/src/share/classes/java/beans/XMLEncoder.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/beans/XMLEncoder.java Mon Jan 05 11:57:27 2015 -0800
+@@ -377,7 +377,7 @@
+ Object arg = args[i];
+ mark(arg, true);
+ }
+- mark(stm.getTarget(), false);
++ mark(stm.getTarget(), stm instanceof Expression);
+ }
+
+
+--- ./jdk/src/share/classes/java/io/ByteArrayOutputStream.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/io/ByteArrayOutputStream.java Mon Jan 05 11:57:27 2015 -0800
+@@ -94,6 +94,14 @@
+ }
+
+ /**
++ * The maximum size of array to allocate.
++ * Some VMs reserve some header words in an array.
++ * Attempts to allocate larger arrays may result in
++ * OutOfMemoryError: Requested array size exceeds VM limit
++ */
++ private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
++
++ /**
+ * Increases the capacity to ensure that it can hold at least the
+ * number of elements specified by the minimum capacity argument.
+ *
+@@ -105,14 +113,19 @@
+ int newCapacity = oldCapacity << 1;
+ if (newCapacity - minCapacity < 0)
+ newCapacity = minCapacity;
+- if (newCapacity < 0) {
+- if (minCapacity < 0) // overflow
+- throw new OutOfMemoryError();
+- newCapacity = Integer.MAX_VALUE;
+- }
++ if (newCapacity - MAX_ARRAY_SIZE > 0)
++ newCapacity = hugeCapacity(minCapacity);
+ buf = Arrays.copyOf(buf, newCapacity);
+ }
+
++ private static int hugeCapacity(int minCapacity) {
++ if (minCapacity < 0) // overflow
++ throw new OutOfMemoryError();
++ return (minCapacity > MAX_ARRAY_SIZE) ?
++ Integer.MAX_VALUE :
++ MAX_ARRAY_SIZE;
++ }
++
+ /**
+ * Writes the specified byte to this byte array output stream.
+ *
+--- ./jdk/src/share/classes/java/io/File.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/io/File.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1891,7 +1891,7 @@
+
+ String name = prefix + Long.toString(n) + suffix;
+ File f = new File(dir, name);
+- if (!name.equals(f.getName())) {
++ if (!name.equals(f.getName()) || f.isInvalid()) {
+ if (System.getSecurityManager() != null)
+ throw new IOException("Unable to create temporary file");
+ else
+@@ -1981,19 +1981,26 @@
+
+ File tmpdir = (directory != null) ? directory
+ : TempDirectory.location();
++ SecurityManager sm = System.getSecurityManager();
+ File f;
+- try {
+- do {
+- f = TempDirectory.generateFile(prefix, suffix, tmpdir);
+- } while (f.exists());
+- if (!f.createNewFile())
+- throw new IOException("Unable to create temporary file");
+- } catch (SecurityException se) {
+- // don't reveal temporary directory location
+- if (directory == null)
+- throw new SecurityException("Unable to create temporary file");
+- throw se;
+- }
++ do {
++ f = TempDirectory.generateFile(prefix, suffix, tmpdir);
++
++ if (sm != null) {
++ try {
++ sm.checkWrite(f.getPath());
++ } catch (SecurityException se) {
++ // don't reveal temporary directory location
++ if (directory == null)
++ throw new SecurityException("Unable to create temporary file");
++ throw se;
++ }
++ }
++ } while ((fs.getBooleanAttributes(f) & FileSystem.BA_EXISTS) != 0);
++
++ if (!fs.createFileExclusively(f.getPath()))
++ throw new IOException("Unable to create temporary file");
++
+ return f;
+ }
+
+--- ./jdk/src/share/classes/java/lang/ClassValue.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/lang/ClassValue.java Mon Jan 05 11:57:27 2015 -0800
+@@ -489,9 +489,18 @@
+ /** Remove an entry. */
+ synchronized
+ void removeEntry(ClassValue<?> classValue) {
+- // make all cache elements for this guy go stale:
+- if (remove(classValue.identity) != null) {
++ Entry<?> e = remove(classValue.identity);
++ if (e == null) {
++ // Uninitialized, and no pending calls to computeValue. No change.
++ } else if (e.isPromise()) {
++ // State is uninitialized, with a pending call to finishEntry.
++ // Since remove is a no-op in such a state, keep the promise
++ // by putting it back into the map.
++ put(classValue.identity, e);
++ } else {
++ // In an initialized state. Bump forward, and de-initialize.
+ classValue.bumpVersion();
++ // Make all cache elements for this guy go stale.
+ removeStaleEntries(classValue);
+ }
+ }
+--- ./jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java Mon Jan 05 11:57:27 2015 -0800
+@@ -62,6 +62,7 @@
+ //# Conditional mappings
+ //# ================================================================================
+ new Entry(0x03A3, new char[]{0x03C2}, new char[]{0x03A3}, null, FINAL_CASED), // # GREEK CAPITAL LETTER SIGMA
++ new Entry(0x0130, new char[]{0x0069, 0x0307}, new char[]{0x0130}, null, 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
+
+ //# ================================================================================
+ //# Locale-sensitive mappings
+@@ -77,8 +78,8 @@
+
+ //# ================================================================================
+ //# Turkish and Azeri
+-// new Entry(0x0130, new char[]{0x0069}, new char[]{0x0130}, "tr", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
+-// new Entry(0x0130, new char[]{0x0069}, new char[]{0x0130}, "az", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
++ new Entry(0x0130, new char[]{0x0069}, new char[]{0x0130}, "tr", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
++ new Entry(0x0130, new char[]{0x0069}, new char[]{0x0130}, "az", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
+ new Entry(0x0307, new char[]{}, new char[]{0x0307}, "tr", AFTER_I), // # COMBINING DOT ABOVE
+ new Entry(0x0307, new char[]{}, new char[]{0x0307}, "az", AFTER_I), // # COMBINING DOT ABOVE
+ new Entry(0x0049, new char[]{0x0131}, new char[]{0x0049}, "tr", NOT_BEFORE_DOT), // # LATIN CAPITAL LETTER I
+@@ -148,21 +149,25 @@
+
+ private static char[] lookUpTable(String src, int index, Locale locale, boolean bLowerCasing) {
+ HashSet set = (HashSet)entryTable.get(new Integer(src.codePointAt(index)));
++ char[] ret = null;
+
+ if (set != null) {
+ Iterator iter = set.iterator();
+ String currentLang = locale.getLanguage();
+ while (iter.hasNext()) {
+ Entry entry = (Entry)iter.next();
+- String conditionLang= entry.getLanguage();
++ String conditionLang = entry.getLanguage();
+ if (((conditionLang == null) || (conditionLang.equals(currentLang))) &&
+ isConditionMet(src, index, locale, entry.getCondition())) {
+- return (bLowerCasing ? entry.getLowerCase() : entry.getUpperCase());
++ ret = bLowerCasing ? entry.getLowerCase() : entry.getUpperCase();
++ if (conditionLang != null) {
++ break;
++ }
+ }
+ }
+ }
+
+- return null;
++ return ret;
+ }
+
+ private static boolean isConditionMet(String src, int index, Locale locale, int condition) {
+--- ./jdk/src/share/classes/java/lang/String.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/lang/String.java Mon Jan 05 11:57:27 2015 -0800
+@@ -2459,7 +2459,9 @@
+ } else {
+ srcCount = 1;
+ }
+- if (localeDependent || srcChar == '\u03A3') { // GREEK CAPITAL LETTER SIGMA
++ if (localeDependent ||
++ srcChar == '\u03A3' || // GREEK CAPITAL LETTER SIGMA
++ srcChar == '\u0130') { // LATIN CAPITAL LETTER I WITH DOT ABOVE
+ lowerChar = ConditionalSpecialCasing.toLowerCaseEx(this, i, locale);
+ } else {
+ lowerChar = Character.toLowerCase(srcChar);
+--- ./jdk/src/share/classes/java/net/InetAddress.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/net/InetAddress.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1128,7 +1128,7 @@
+ // see if it is IPv4 address
+ addr = IPAddressUtil.textToNumericFormatV4(host);
+ if (addr == null) {
+- // see if it is IPv6 address
++ // This is supposed to be an IPv6 literal
+ // Check if a numeric or string zone id is present
+ int pos;
+ if ((pos=host.indexOf ("%")) != -1) {
+@@ -1137,7 +1137,9 @@
+ ifname = host.substring (pos+1);
+ }
+ }
+- addr = IPAddressUtil.textToNumericFormatV6(host);
++ if ((addr = IPAddressUtil.textToNumericFormatV6(host)) == null && host.contains(":")) {
++ throw new UnknownHostException(host + ": invalid IPv6 address");
++ }
+ } else if (ipv6Expected) {
+ // Means an IPv4 litteral between brackets!
+ throw new UnknownHostException("["+host+"]");
+@@ -1155,10 +1157,10 @@
+ }
+ return ret;
+ }
+- } else if (ipv6Expected) {
+- // We were expecting an IPv6 Litteral, but got something else
+- throw new UnknownHostException("["+host+"]");
+- }
++ } else if (ipv6Expected) {
++ // We were expecting an IPv6 Litteral, but got something else
++ throw new UnknownHostException("["+host+"]");
++ }
+ return getAllByName0(host, reqAddr, true);
+ }
+
+--- ./jdk/src/share/classes/java/net/MulticastSocket.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/net/MulticastSocket.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1995, 2007, 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
+@@ -565,7 +565,7 @@
+ public NetworkInterface getNetworkInterface() throws SocketException {
+ NetworkInterface ni
+ = (NetworkInterface)getImpl().getOption(SocketOptions.IP_MULTICAST_IF2);
+- if (ni.getIndex() == 0) {
++ if ((ni.getIndex() == 0) || (ni.getIndex() == -1)) {
+ InetAddress[] addrs = new InetAddress[1];
+ addrs[0] = InetAddress.anyLocalAddress();
+ return new NetworkInterface(addrs[0].getHostName(), 0, addrs);
+--- ./jdk/src/share/classes/java/util/CurrencyData.properties Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/util/CurrencyData.properties Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2000, 2008, 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,9 @@
+ formatVersion=1
+
+ # Version of the currency code information in this class.
+-# It is a serial number that accompanies with each amendment, such as
+-# 'MAxxx.doc'
++# It is a serial number that accompanies with each amendment.
+
+-dataVersion=151
++dataVersion=159
+
+ # List of all valid ISO 4217 currency codes.
+ # To ensure compatibility, do not remove codes.
+@@ -49,11 +48,12 @@
+ NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
+ PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
+ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
+- SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
++ SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
+ TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\
+ UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
+ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
+- XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZWD716-ZWL932-ZWN942-ZWR935
++ XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\
++ ZWN942-ZWR935
+
+
+ # Mappings from ISO 3166 country codes to ISO 4217 currency codes.
+@@ -71,7 +71,7 @@
+ #
+ # The table is based on the following web sites:
+ # http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/db_en.html
+-# http://www.bsi-global.com/iso4217currency
++# http://www.currency-iso.org/iso_index/iso_tables.htm
+ # http://www.cia.gov/cia/publications/factbook/indexgeo.html
+
+ # AFGHANISTAN
+@@ -105,7 +105,7 @@
+ # AUSTRIA
+ AT=EUR
+ # AZERBAIJAN
+-AZ=AZM;2005-12-31-20-00-00;AZN
++AZ=AZN
+ # BAHAMAS
+ BS=BSD
+ # BAHRAIN
+@@ -320,7 +320,7 @@
+ # LAO PEOPLE'S DEMOCRATIC REPUBLIC
+ LA=LAK
+ # LATVIA
+-LV=LVL
++LV=LVL;2013-12-31-22-00-00;EUR
+ # LEBANON
+ LB=LBP
+ # LESOTHO
+@@ -332,7 +332,7 @@
+ # LIECHTENSTEIN
+ LI=CHF
+ # LITHUANIA
+-LT=LTL
++LT=LTL;2014-12-31-22-00-00;EUR
+ # LUXEMBOURG
+ LU=EUR
+ # MACAU
+@@ -378,7 +378,7 @@
+ # MOROCCO
+ MA=MAD
+ # MOZAMBIQUE
+-MZ=MZM;2006-06-30-22-00-00;MZN
++MZ=MZN
+ # MYANMAR
+ MM=MMK
+ # NAMIBIA
+@@ -440,7 +440,7 @@
+ # REUNION
+ RE=EUR
+ # ROMANIA
+-RO=ROL;2005-06-30-21-00-00;RON
++RO=RON
+ # RUSSIAN FEDERATION
+ RU=RUB
+ # RWANDA
+@@ -463,6 +463,8 @@
+ WS=WST
+ # SAN MARINO
+ SM=EUR
++# SOUTH SUDAN
++SS=SSP
+ # SAO TOME AND PRINCIPE
+ ST=STD
+ # SAUDI ARABIA
+@@ -532,7 +534,7 @@
+ # TUNISIA
+ TN=TND
+ # TURKEY
+-TR=TRL;2004-12-31-22-00-00;TRY
++TR=TRY
+ # TURKMENISTAN
+ TM=TMT
+ # TURKS AND CAICOS ISLANDS
+@@ -558,7 +560,7 @@
+ # VANUATU
+ VU=VUV
+ # VENEZUELA
+-VE=VEB;2008-01-01-04-00-00;VEF
++VE=VEF
+ # VIET NAM
+ VN=VND
+ # VIRGIN ISLANDS, BRITISH
+@@ -572,7 +574,7 @@
+ # YEMEN
+ YE=YER
+ # ZAMBIA
+-ZM=ZMK
++ZM=ZMW
+ # ZIMBABWE
+ ZW=ZWL
+
+@@ -583,7 +585,7 @@
+ minor0=\
+ ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\
+ GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\
+- TPE-TRL-VUV-XAF-XOF-XPF
++ TPE-TRL-UGX-VND-VUV-XAF-XOF-XPF
+ minor1=
+ minor3=\
+ BHD-IQD-JOD-KWD-LYD-OMR-TND
+--- ./jdk/src/share/classes/java/util/LocaleISOData.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/java/util/LocaleISOData.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2011, 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
+@@ -433,6 +433,7 @@
+ + "SN" + "SEN" // Senegal, Republic of
+ + "SO" + "SOM" // Somalia, Somali Republic
+ + "SR" + "SUR" // Suriname, Republic of
++ + "SS" + "SSD" // South Sudan
+ + "ST" + "STP" // Sao Tome and Principe, Democratic Republic of
+ + "SV" + "SLV" // El Salvador, Republic of
+ + "SX" + "SXM" // Sint Maarten (Dutch part)
+--- ./jdk/src/share/classes/javax/accessibility/AccessibleContext.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/accessibility/AccessibleContext.java Mon Jan 05 11:57:27 2015 -0800
+@@ -25,6 +25,9 @@
+
+ package javax.accessibility;
+
++import sun.awt.AWTAccessor;
++import sun.awt.AppContext;
++
+ import java.util.Locale;
+ import java.beans.PropertyChangeListener;
+ import java.beans.PropertyChangeSupport;
+@@ -79,6 +82,26 @@
+ */
+ public abstract class AccessibleContext {
+
++ /**
++ * The AppContext that should be used to dispatch events for this
++ * AccessibleContext
++ */
++ private volatile AppContext targetAppContext;
++
++ static {
++ AWTAccessor.setAccessibleContextAccessor(new AWTAccessor.AccessibleContextAccessor() {
++ @Override
++ public void setAppContext(AccessibleContext accessibleContext, AppContext appContext) {
++ accessibleContext.targetAppContext = appContext;
++ }
++
++ @Override
++ public AppContext getAppContext(AccessibleContext accessibleContext) {
++ return accessibleContext.targetAppContext;
++ }
++ });
++ }
++
+ /**
+ * Constant used to determine when the accessibleName property has
+ * changed. The old value in the PropertyChangeEvent will be the old
+--- ./jdk/src/share/classes/javax/swing/JComboBox.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/JComboBox.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1418,6 +1418,28 @@
+ }
+
+ /**
++ * {@inheritDoc}
++ */
++ @Override
++ protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition, boolean pressed) {
++ if (super.processKeyBinding(ks, e, condition, pressed)) {
++ return true;
++ }
++
++ if (!isEditable() || condition != WHEN_FOCUSED || getEditor() == null
++ || !Boolean.TRUE.equals(getClientProperty("JComboBox.isTableCellEditor"))) {
++ return false;
++ }
++
++ Component editorComponent = getEditor().getEditorComponent();
++ if (editorComponent instanceof JComponent) {
++ JComponent component = (JComponent) editorComponent;
++ return component.processKeyBinding(ks, e, WHEN_FOCUSED, pressed);
++ }
++ return false;
++ }
++
++ /**
+ * Sets the object that translates a keyboard character into a list
+ * selection. Typically, the first selection with a matching first
+ * character becomes the selected item.
+--- ./jdk/src/share/classes/javax/swing/JComponent.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/JComponent.java Mon Jan 05 11:57:27 2015 -0800
+@@ -63,6 +63,7 @@
+ import static javax.swing.ClientPropertyKey.*;
+ import javax.accessibility.*;
+
++import sun.awt.SunToolkit;
+ import sun.swing.SwingUtilities2;
+ import sun.swing.UIClientPropertyKey;
+
+@@ -3989,6 +3990,17 @@
+ * @since 1.4
+ */
+ public AccessibleKeyBinding getAccessibleKeyBinding() {
++ // Try to get the linked label's mnemonic if it exists
++ Object o = getClientProperty(JLabel.LABELED_BY_PROPERTY);
++ if (o instanceof Accessible){
++ AccessibleContext ac = ((Accessible) o).getAccessibleContext();
++ if (ac != null){
++ AccessibleComponent comp = ac.getAccessibleComponent();
++ if (! (comp instanceof AccessibleExtendedComponent))
++ return null;
++ return ((AccessibleExtendedComponent)comp).getAccessibleKeyBinding();
++ }
++ }
+ return null;
+ }
+ } // inner class AccessibleJComponent
+@@ -4790,7 +4802,8 @@
+ * @see RepaintManager#addDirtyRegion
+ */
+ public void repaint(long tm, int x, int y, int width, int height) {
+- RepaintManager.currentManager(this).addDirtyRegion(this, x, y, width, height);
++ RepaintManager.currentManager(SunToolkit.targetToAppContext(this))
++ .addDirtyRegion(this, x, y, width, height);
+ }
+
+
+@@ -4845,7 +4858,7 @@
+ // which was causing some people grief.
+ return;
+ }
+- if (SwingUtilities.isEventDispatchThread()) {
++ if (SunToolkit.isDispatchThreadForAppContext(this)) {
+ invalidate();
+ RepaintManager.currentManager(this).addInvalidComponent(this);
+ }
+@@ -4867,7 +4880,7 @@
+ revalidate();
+ }
+ };
+- SwingUtilities.invokeLater(callRevalidate);
++ SunToolkit.executeOnEventHandlerThread(this, callRevalidate);
+ }
+ }
+
+--- ./jdk/src/share/classes/javax/swing/JPopupMenu.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/JPopupMenu.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2008, 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
+@@ -735,7 +735,7 @@
+
+ if (pref == null || pref.width != getWidth() ||
+ pref.height != getHeight()) {
+- popup = getPopup();
++ showPopup();
+ } else {
+ validate();
+ }
+@@ -786,7 +786,7 @@
+
+ if(b) {
+ firePopupMenuWillBecomeVisible();
+- popup = getPopup();
++ showPopup();
+ firePropertyChange("visible", Boolean.FALSE, Boolean.TRUE);
+
+
+@@ -804,7 +804,7 @@
+ }
+
+ /**
+- * Returns a <code>Popup</code> instance from the
++ * Retrieves <code>Popup</code> instance from the
+ * <code>PopupMenuUI</code> that has had <code>show</code> invoked on
+ * it. If the current <code>popup</code> is non-null,
+ * this will invoke <code>dispose</code> of it, and then
+@@ -813,7 +813,7 @@
+ * This does NOT fire any events, it is up the caller to dispatch
+ * the necessary events.
+ */
+- private Popup getPopup() {
++ private void showPopup() {
+ Popup oldPopup = popup;
+
+ if (oldPopup != null) {
+@@ -837,8 +837,8 @@
+ desiredLocationY);
+
+ popupFactory.setPopupType(PopupFactory.LIGHT_WEIGHT_POPUP);
++ popup = newPopup;
+ newPopup.show();
+- return newPopup;
+ }
+
+ /**
+@@ -867,7 +867,7 @@
+ desiredLocationX = x;
+ desiredLocationY = y;
+ if(popup != null && (x != oldX || y != oldY)) {
+- popup = getPopup();
++ showPopup();
+ }
+ }
+
+@@ -1024,7 +1024,7 @@
+ Dimension newSize = getPreferredSize();
+
+ if (!oldSize.equals(newSize)) {
+- popup = getPopup();
++ showPopup();
+ }
+ }
+ }
+--- ./jdk/src/share/classes/javax/swing/JTable.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/JTable.java Mon Jan 05 11:57:27 2015 -0800
+@@ -4041,7 +4041,7 @@
+ }
+ // Restore the lead
+ int viewLeadIndex = modelSelection.getLeadSelectionIndex();
+- if (viewLeadIndex != -1) {
++ if (viewLeadIndex != -1 && !modelSelection.isSelectionEmpty()) {
+ viewLeadIndex = convertRowIndexToView(viewLeadIndex);
+ }
+ SwingUtilities2.setLeadAnchorWithoutSelection(
+@@ -6587,8 +6587,8 @@
+ TableColumnModelListener, CellEditorListener, PropertyChangeListener,
+ AccessibleExtendedTable {
+
+- int lastSelectedRow;
+- int lastSelectedCol;
++ int previousFocusedRow;
++ int previousFocusedCol;
+
+ /**
+ * AccessibleJTable constructor
+@@ -6603,8 +6603,10 @@
+ tcm.addColumnModelListener(this);
+ tcm.getSelectionModel().addListSelectionListener(this);
+ JTable.this.getModel().addTableModelListener(this);
+- lastSelectedRow = JTable.this.getSelectedRow();
+- lastSelectedCol = JTable.this.getSelectedColumn();
++ previousFocusedRow = JTable.this.getSelectionModel().
++ getLeadSelectionIndex();
++ previousFocusedCol = JTable.this.getColumnModel().
++ getSelectionModel().getLeadSelectionIndex();
+ }
+
+ // Listeners to track model, etc. changes to as to re-place the other
+@@ -6932,18 +6934,21 @@
+ firePropertyChange(AccessibleContext.ACCESSIBLE_SELECTION_PROPERTY,
+ Boolean.valueOf(false), Boolean.valueOf(true));
+
+- int selectedRow = JTable.this.getSelectedRow();
+- int selectedCol = JTable.this.getSelectedColumn();
+- if (selectedRow != lastSelectedRow ||
+- selectedCol != lastSelectedCol) {
+- Accessible oldA = getAccessibleAt(lastSelectedRow,
+- lastSelectedCol);
+- Accessible newA = getAccessibleAt(selectedRow, selectedCol);
++ // Using lead selection index to cover both cases: node selected and node
++ // is focused but not selected (Ctrl+up/down)
++ int focusedRow = JTable.this.getSelectionModel().getLeadSelectionIndex();
++ int focusedCol = JTable.this.getColumnModel().getSelectionModel().
++ getLeadSelectionIndex();
++
++ if (focusedRow != previousFocusedRow ||
++ focusedCol != previousFocusedCol){
++ Accessible oldA = getAccessibleAt(previousFocusedRow, previousFocusedCol);
++ Accessible newA = getAccessibleAt(focusedRow, focusedCol);
+ firePropertyChange(AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,
+- oldA, newA);
+- lastSelectedRow = selectedRow;
+- lastSelectedCol = selectedCol;
+- }
++ oldA, newA);
++ previousFocusedRow = focusedRow;
++ previousFocusedCol = focusedCol;
++ }
+ }
+
+
+--- ./jdk/src/share/classes/javax/swing/JTree.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/JTree.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1662,6 +1662,11 @@
+
+ leadPath = newPath;
+ firePropertyChange(LEAD_SELECTION_PATH_PROPERTY, oldValue, newPath);
++
++ if (accessibleContext != null){
++ ((AccessibleJTree)accessibleContext).
++ fireActiveDescendantPropertyChange(oldValue, newPath);
++ }
+ }
+
+ /**
+@@ -4123,23 +4128,6 @@
+ *
+ */
+ public void valueChanged(TreeSelectionEvent e) {
+- // Fixes 4546503 - JTree is sending incorrect active
+- // descendant events
+- TreePath oldLeadSelectionPath = e.getOldLeadSelectionPath();
+- leadSelectionPath = e.getNewLeadSelectionPath();
+-
+- if (oldLeadSelectionPath != leadSelectionPath) {
+- // Set parent to null so AccessibleJTreeNode computes
+- // its parent.
+- Accessible oldLSA = leadSelectionAccessible;
+- leadSelectionAccessible = (leadSelectionPath != null)
+- ? new AccessibleJTreeNode(JTree.this,
+- leadSelectionPath,
+- null) // parent
+- : null;
+- firePropertyChange(AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,
+- oldLSA, leadSelectionAccessible);
+- }
+ firePropertyChange(AccessibleContext.ACCESSIBLE_SELECTION_PROPERTY,
+ Boolean.valueOf(false), Boolean.valueOf(true));
+ }
+@@ -4243,6 +4231,35 @@
+ }
+ }
+
++ /**
++ * Fire an active descendant property change notification.
++ * The active descendant is used for objects such as list,
++ * tree, and table, which may have transient children.
++ * It notifies screen readers the active child of the component
++ * has been changed so user can be notified from there.
++ *
++ * @param oldPath - lead path of previous active child
++ * @param newPath - lead path of current active child
++ *
++ */
++ void fireActiveDescendantPropertyChange(TreePath oldPath, TreePath newPath){
++ if(oldPath != newPath){
++ Accessible oldLSA = (oldPath != null)
++ ? new AccessibleJTreeNode(JTree.this,
++ oldPath,
++ null)
++ : null;
++
++ Accessible newLSA = (newPath != null)
++ ? new AccessibleJTreeNode(JTree.this,
++ newPath,
++ null)
++ : null;
++ firePropertyChange(AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,
++ oldLSA, newLSA);
++ }
++ }
++
+
+ private AccessibleContext getCurrentAccessibleContext() {
+ Component c = getCurrentComponent();
+--- ./jdk/src/share/classes/javax/swing/MenuSelectionManager.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/MenuSelectionManager.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2008, 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
+@@ -30,6 +30,7 @@
+ import javax.swing.event.*;
+
+ import sun.awt.AppContext;
++import sun.swing.SwingUtilities2;
+
+ /**
+ * A MenuSelectionManager owns the selection in menu hierarchy.
+@@ -60,6 +61,12 @@
+ if (msm == null) {
+ msm = new MenuSelectionManager();
+ context.put(MENU_SELECTION_MANAGER_KEY, msm);
++
++ // installing additional listener if found in the AppContext
++ Object o = context.get(SwingUtilities2.MENU_SELECTION_MANAGER_LISTENER_KEY);
++ if (o != null && o instanceof ChangeListener) {
++ msm.addChangeListener((ChangeListener) o);
++ }
+ }
+
+ return msm;
+--- ./jdk/src/share/classes/javax/swing/PopupFactory.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/PopupFactory.java Mon Jan 05 11:57:27 2015 -0800
+@@ -25,10 +25,14 @@
+
+ package javax.swing;
+
++import sun.awt.EmbeddedFrame;
++import sun.awt.OSInfo;
++
+ import java.applet.Applet;
+ import java.awt.*;
+ import java.awt.event.WindowAdapter;
+ import java.awt.event.WindowEvent;
++import java.security.AccessController;
+ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.List;
+@@ -226,7 +230,13 @@
+ case MEDIUM_WEIGHT_POPUP:
+ return getMediumWeightPopup(owner, contents, ownerX, ownerY);
+ case HEAVY_WEIGHT_POPUP:
+- return getHeavyWeightPopup(owner, contents, ownerX, ownerY);
++ Popup popup = getHeavyWeightPopup(owner, contents, ownerX, ownerY);
++ if ((AccessController.doPrivileged(OSInfo.getOSTypeAction()) ==
++ OSInfo.OSType.MACOSX) && (owner != null) &&
++ (EmbeddedFrame.getAppletIfAncestorOf(owner) != null)) {
++ ((HeavyWeightPopup)popup).setCacheEnabled(false);
++ }
++ return popup;
+ }
+ return null;
+ }
+@@ -294,6 +304,8 @@
+ private static final Object heavyWeightPopupCacheKey =
+ new StringBuffer("PopupFactory.heavyWeightPopupCache");
+
++ private volatile boolean isCacheEnabled = true;
++
+ /**
+ * Returns either a new or recycled <code>Popup</code> containing
+ * the specified children.
+@@ -448,12 +460,23 @@
+ }
+ }
+
++ /**
++ * Enables or disables cache for current object.
++ */
++ void setCacheEnabled(boolean enable) {
++ isCacheEnabled = enable;
++ }
++
+ //
+ // Popup methods
+ //
+ public void hide() {
+ super.hide();
+- recycleHeavyWeightPopup(this);
++ if (isCacheEnabled) {
++ recycleHeavyWeightPopup(this);
++ } else {
++ this._dispose();
++ }
+ }
+
+ /**
+--- ./jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java Mon Jan 05 11:57:27 2015 -0800
+@@ -30,6 +30,11 @@
+ import java.util.*;
+ import java.awt.FocusTraversalPolicy;
+ import sun.util.logging.PlatformLogger;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import sun.security.action.GetPropertyAction;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+
+ /**
+ * A FocusTraversalPolicy that determines traversal order by sorting the
+@@ -89,6 +94,34 @@
+ final private int FORWARD_TRAVERSAL = 0;
+ final private int BACKWARD_TRAVERSAL = 1;
+
++ /*
++ * When true (by default), the legacy merge-sort algo is used to sort an FTP cycle.
++ * When false, the default (tim-sort) algo is used, which may lead to an exception.
++ * See: JDK-8048887
++ */
++ private static final boolean legacySortingFTPEnabled;
++ private static final Method legacyMergeSortMethod;
++
++ static {
++ legacySortingFTPEnabled = "true".equals(AccessController.doPrivileged(
++ new GetPropertyAction("swing.legacySortingFTPEnabled", "true")));
++ legacyMergeSortMethod = legacySortingFTPEnabled ?
++ AccessController.doPrivileged(new PrivilegedAction<Method>() {
++ public Method run() {
++ try {
++ Class c = Class.forName("java.util.Arrays");
++ Method m = c.getDeclaredMethod("legacyMergeSort", new Class[]{Object[].class, Comparator.class});
++ m.setAccessible(true);
++ return m;
++ } catch (ClassNotFoundException | NoSuchMethodException e) {
++ // using default sorting algo
++ return null;
++ }
++ }
++ }) :
++ null;
++ }
++
+ /**
+ * Constructs a SortingFocusTraversalPolicy without a Comparator.
+ * Subclasses must set the Comparator using <code>setComparator</code>
+@@ -133,10 +166,32 @@
+ private void enumerateAndSortCycle(Container focusCycleRoot, List<Component> cycle) {
+ if (focusCycleRoot.isShowing()) {
+ enumerateCycle(focusCycleRoot, cycle);
+- Collections.sort(cycle, comparator);
++ if (!legacySortingFTPEnabled ||
++ !legacySort(cycle, comparator))
++ {
++ Collections.sort(cycle, comparator);
++ }
+ }
+ }
+
++ private boolean legacySort(List<Component> l, Comparator<? super Component> c) {
++ if (legacyMergeSortMethod == null)
++ return false;
++
++ Object[] a = l.toArray();
++ try {
++ legacyMergeSortMethod.invoke(null, a, c);
++ } catch (IllegalAccessException | InvocationTargetException e) {
++ return false;
++ }
++ ListIterator<Component> i = l.listIterator();
++ for (Object e : a) {
++ i.next();
++ i.set((Component)e);
++ }
++ return true;
++ }
++
+ private void enumerateCycle(Container container, List<Component> cycle) {
+ if (!(container.isVisible() && container.isDisplayable())) {
+ return;
+--- ./jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java Mon Jan 05 11:57:27 2015 -0800
+@@ -941,16 +941,9 @@
+
+ directories.clear();
+
+- File[] baseFolders;
+- if (useShellFolder) {
+- baseFolders = AccessController.doPrivileged(new PrivilegedAction<File[]>() {
+- public File[] run() {
+- return (File[]) ShellFolder.get("fileChooserComboBoxFolders");
+- }
+- });
+- } else {
+- baseFolders = fsv.getRoots();
+- }
++ File[] baseFolders = (useShellFolder)
++ ? (File[]) ShellFolder.get("fileChooserComboBoxFolders")
++ : fsv.getRoots();
+ directories.addAll(Arrays.asList(baseFolders));
+
+ // Get the canonical (full) path. This has the side
+--- ./jdk/src/share/classes/javax/swing/plaf/nimbus/skin.laf Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/plaf/nimbus/skin.laf Mon Jan 05 11:57:27 2015 -0800
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+
+ <!--
+- 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
+@@ -13424,10 +13424,10 @@
+ <state stateKeys="Selected">
+ <style>
+ <textForeground>
+- <matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
++ <matte red="255" green="255" blue="255" alpha="255" uiDefaultParentName="nimbusLightBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
+ </textForeground>
+ <textBackground>
+- <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
++ <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
+ </textBackground>
+ <background/>
+ <inherit-textForeground>false</inherit-textForeground>
+@@ -13453,7 +13453,7 @@
+ <style>
+ <textForeground/>
+ <textBackground>
+- <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
++ <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
+ </textBackground>
+ <background/>
+ <inherit-textBackground>false</inherit-textBackground>
+@@ -13477,7 +13477,7 @@
+ <state stateKeys="Disabled">
+ <style>
+ <textForeground>
+- <matte red="142" green="143" blue="145" alpha="255" uiDefaultParentName="nimbusDisabledText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
++ <matte red="142" green="143" blue="145" alpha="255" uiDefaultParentName="nimbusDisabledText" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
+ </textForeground>
+ <textBackground/>
+ <background/>
+@@ -13520,7 +13520,7 @@
+ </textForeground>
+ <textBackground/>
+ <background>
+- <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0" uiResource="false"/>
++ <matte red="57" green="105" blue="138" alpha="255" uiDefaultParentName="nimbusSelectionBackground" hueOffset="0.0" saturationOffset="0.0" brightnessOffset="0.0" alphaOffset="0"/>
+ </background>
+ <inherit-textForeground>false</inherit-textForeground>
+ <inherit-background>false</inherit-background>
+--- ./jdk/src/share/classes/javax/swing/text/html/parser/Parser.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/javax/swing/text/html/parser/Parser.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -2081,6 +2081,13 @@
+ // null end tag.
+ endTag(false);
+ continue;
++ } else if (textpos == 0) {
++ if (!legalElementContext(dtd.pcdata)) {
++ error("unexpected.pcdata");
++ }
++ if (last.breaksFlow()) {
++ space = false;
++ }
+ }
+ break;
+
+--- ./jdk/src/share/classes/sun/awt/AWTAccessor.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/AWTAccessor.java Mon Jan 05 11:57:27 2015 -0800
+@@ -25,6 +25,7 @@
+
+ package sun.awt;
+
++import javax.accessibility.AccessibleContext;
+ import java.awt.*;
+ import java.awt.KeyboardFocusManager;
+ import java.awt.DefaultKeyboardFocusManager;
+@@ -491,6 +492,11 @@
+ */
+ void invokeAndWait(Object source, Runnable r)
+ throws InterruptedException, InvocationTargetException;
++
++ /**
++ * Gets most recent event time in the EventQueue
++ */
++ long getMostRecentEventTime(EventQueue eventQueue);
+ }
+
+ /*
+@@ -723,6 +729,14 @@
+
+
+ /*
++ * An accessor object for the AccessibleContext class
++ */
++ public interface AccessibleContextAccessor {
++ void setAppContext(AccessibleContext accessibleContext, AppContext appContext);
++ AppContext getAppContext(AccessibleContext accessibleContext);
++ }
++
++ /*
+ * Accessor instances are initialized in the static initializers of
+ * corresponding AWT classes by using setters defined below.
+ */
+@@ -751,6 +765,7 @@
+ private static SequencedEventAccessor sequencedEventAccessor;
+ private static InvocationEventAccessor invocationEventAccessor;
+ private static ToolkitAccessor toolkitAccessor;
++ private static AccessibleContextAccessor accessibleContextAccessor;
+
+ /*
+ * Set an accessor object for the java.awt.Component class.
+@@ -1177,4 +1192,22 @@
+ public static InvocationEventAccessor getInvocationEventAccessor() {
+ return invocationEventAccessor;
+ }
++
++
++ /*
++ * Get the accessor object for the javax.accessibility.AccessibleContext class.
++ */
++ public static AccessibleContextAccessor getAccessibleContextAccessor() {
++ if (accessibleContextAccessor == null) {
++ unsafe.ensureClassInitialized(AccessibleContext.class);
++ }
++ return accessibleContextAccessor;
++ }
++
++ /*
++ * Set the accessor object for the javax.accessibility.AccessibleContext class.
++ */
++ public static void setAccessibleContextAccessor(AccessibleContextAccessor accessor) {
++ AWTAccessor.accessibleContextAccessor = accessor;
++ }
+ }
+--- ./jdk/src/share/classes/sun/awt/AppContext.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/AppContext.java Mon Jan 05 11:57:27 2015 -0800
+@@ -167,6 +167,9 @@
+ */
+ private static volatile AppContext mainAppContext = null;
+
++ private static class GetAppContextLock {};
++ private final static Object getAppContextLock = new GetAppContextLock();
++
+ /*
+ * The hash map associated with this AppContext. A private delegate
+ * is used instead of subclassing HashMap so as to avoid all of
+@@ -308,14 +311,16 @@
+ // if no contexts have been created yet. This covers standalone apps
+ // and excludes applets because by the time applet starts
+ // a number of contexts have already been created by the plugin.
+- if (numAppContexts.get() == 0) {
+- if (System.getProperty("javaplugin.version") == null &&
+- System.getProperty("javawebstart.version") == null) {
+- initMainAppContext();
+- } else if (System.getProperty("javafx.version") != null &&
+- threadGroup.getParent() != null) {
+- // Swing inside JavaFX case
+- SunToolkit.createNewAppContext();
++ synchronized (getAppContextLock) {
++ if (numAppContexts.get() == 0) {
++ if (System.getProperty("javaplugin.version") == null &&
++ System.getProperty("javawebstart.version") == null) {
++ initMainAppContext();
++ } else if (System.getProperty("javafx.version") != null &&
++ threadGroup.getParent() != null) {
++ // Swing inside JavaFX case
++ SunToolkit.createNewAppContext();
++ }
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/awt/SunToolkit.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/SunToolkit.java Mon Jan 05 11:57:27 2015 -0800
+@@ -378,7 +378,7 @@
+ * null or the target can't be found, a null with be returned.
+ */
+ public static AppContext targetToAppContext(Object target) {
+- if (target == null || GraphicsEnvironment.isHeadless()) {
++ if (target == null) {
+ return null;
+ }
+ AppContext context = getAppContext(target);
+@@ -452,12 +452,10 @@
+ * via targetToAppContext() above.
+ */
+ public static void insertTargetMapping(Object target, AppContext appContext) {
+- if (!GraphicsEnvironment.isHeadless()) {
+- if (!setAppContext(target, appContext)) {
+- // Target is not a Component/MenuComponent, use the private Map
+- // instead.
+- appContextMap.put(target, appContext);
+- }
++ if (!setAppContext(target, appContext)) {
++ // Target is not a Component/MenuComponent, use the private Map
++ // instead.
++ appContextMap.put(target, appContext);
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2010, 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
+@@ -239,6 +239,13 @@
+
+ if (localTransferable != null) {
+ return localTransferable.getTransferData(df);
++ } else if (df.isMimeTypeEqual(DataFlavor.javaJVMLocalObjectMimeType)) {
++ // Workaround to JDK-8024061: Exception thrown when drag and drop
++ // between two components is executed quickly.
++ // It is expected localTransferable is not null if javaJVMLocalObjectMimeType
++ // is used. Executing further results in ClassCastException, so null is
++ // returned here as no transfer data is available in this case.
++ return null;
+ }
+
+ if (dropStatus != STATUS_ACCEPT || dropComplete) {
+--- ./jdk/src/share/classes/sun/awt/image/BytePackedRaster.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/awt/image/BytePackedRaster.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1408,10 +1408,10 @@
+ }
+ }
+
+- long lastbit = (long) dataBitOffset
+- + (long) (height - 1) * (long) scanlineStride * 8
+- + (long) (width - 1) * (long) pixelBitStride
+- + (long) pixelBitStride - 1;
++ int lastbit = (dataBitOffset
++ + (height-1) * scanlineStride * 8
++ + (width-1) * pixelBitStride
++ + pixelBitStride - 1);
+ if (lastbit < 0 || lastbit / 8 >= data.length) {
+ throw new RasterFormatException("raster dimensions overflow " +
+ "array bounds");
+--- ./jdk/src/share/classes/sun/java2d/SunGraphics2D.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/java2d/SunGraphics2D.java Mon Jan 05 11:57:27 2015 -0800
+@@ -2388,6 +2388,8 @@
+ surfaceData = NullSurfaceData.theInstance;
+ }
+
++ invalidatePipe();
++
+ // this will recalculate the composite clip
+ setDevClip(surfaceData.getBounds());
+
+--- ./jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java Mon Jan 05 11:57:27 2015 -0800
+@@ -65,7 +65,11 @@
+ int w, int h)
+ {
+ if (cachedData == null) {
+- cachedData = oglgc.createManagedSurface(w, h, transparency);
++ try {
++ cachedData = oglgc.createManagedSurface(w, h, transparency);
++ } catch (OutOfMemoryError er) {
++ return null;
++ }
+ }
+ return cachedData;
+ }
+--- ./jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java Mon Jan 05 11:57:27 2015 -0800
+@@ -233,8 +233,6 @@
+ * does not conform to the expected pattern
+ */
+ public static int getLocalVmId(File file) {
+- int lvmid = 0;
+-
+ try {
+ // try 1.4.2 and later format first
+ return Integer.parseInt(file.getName());
+@@ -287,31 +285,13 @@
+ return tmpDirName + dirNamePrefix + user + File.separator;
+ }
+
+- /*
+- * this static initializer would not be necessary if the
+- * Solaris java.io.tmpdir property were set to /tmp by default
+- */
+ static {
+ /*
+- * Why is java.io.tmpdir on Solaris set to "/var/tmp/" when the
+- * HotSpot JVM os:get_temp_path() method returns "/tmp/"
+- *
+- * Why do Solaris and Windows return a string with a trailing
+- * file separator character where as Linix does not? (this change
+- * seems to have occurred sometime during hopper beta)
++ * For this to work, the target VM and this code need to use
++ * the same directory. Instead of guessing which directory the
++ * VM is using, we will ask.
+ */
+- String tmpdir = System.getProperty("java.io.tmpdir");
+-
+- if (tmpdir.compareTo("/var/tmp/") == 0) {
+- /*
+- * shared memory files are created in /tmp. Interestingly,
+- * java.io.tmpdir is set to "/var/tmp/" on Solaris and Linux,
+- * but os::get_temp_directory() is set to "/tmp/" on these
+- * platforms. the java.io.logging packages also makes reference
+- * to java.io.tmpdir.
+- */
+- tmpdir = "/tmp/";
+- }
++ String tmpdir = sun.misc.VMSupport.getVMTemporaryDirectory();
+
+ /*
+ * Assure that the string returned has a trailing File.separator
+--- ./jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_de.properties Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -34,7 +34,7 @@
+ java.launcher.ergo.message2 =\ weil die Ausf\u00FChrung auf einem Server-Class-Rechner erfolgt.\n
+
+ # Translators please note do not translate the options themselves
+-java.launcher.opt.footer =\ -cp <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n -classpath <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n und ZIP-Archiven zur Suche nach Klassendateien.\n -D<name>=<value>\n Legt eine Systemeigenschaft fest\n -verbose:[class|gc|jni]\n Aktiviert die Verbose-Ausgabe\n -version Druckt Produktversion und beendet das Programm\n -version:<value>\n Erfordert die angegebene Version zur Ausf\u00FChrung\n -showversion Druckt Produktversion und f\u00E4hrt fort\n -jre-restrict-search | -no-jre-restrict-search\n Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n -? -help Druckt diese Hilfemeldung\n -X Druckt Hilfe zu Nicht-Standardoptionen\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n Aktiviert Assertionen mit angegebener Granularit\u00E4t\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n Deaktiviert Assertionen mit angegebener Granularit\u00E4t\n -esa | -enablesystemassertions\n Aktiviert Systemassertionen\n -dsa | -disablesystemassertions\n Deaktiviert Systemassertionen\n -agentlib:<libname>[=<options>]\n L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n siehe auch -agentlib:jdwp=help und -agentlib:hprof=help\n -agentpath:<pathname>[=<options>]\n L\u00E4dt native Agent Library nach vollem Pfadnamen\n -javaagent:<jarpath>[=<options>]\n L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n -splash:<imagepath>\n Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://www.oracle.com/technetwork/java/javase/documentation/index.html
++java.launcher.opt.footer =\ -cp <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n -classpath <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n und ZIP-Archiven zur Suche nach Klassendateien.\n -D<name>=<value>\n Legt eine Systemeigenschaft fest\n -verbose:[class|gc|jni]\n Aktiviert die Verbose-Ausgabe\n -version Druckt Produktversion und beendet das Programm\n -version:<value>\n Erfordert die angegebene Version zur Ausf\u00FChrung\n -showversion Druckt Produktversion und f\u00E4hrt fort\n -jre-restrict-search | -no-jre-restrict-search\n Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n -? -help Druckt diese Hilfemeldung\n -X Druckt Hilfe zu Nicht-Standardoptionen\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n Aktiviert Assertions mit angegebener Granularit\u00E4t\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n Deaktiviert Assertions mit angegebener Granularit\u00E4t\n -esa | -enablesystemassertions\n Aktiviert Systemassertionen\n -dsa | -disablesystemassertions\n Deaktiviert Systemassertionen\n -agentlib:<libname>[=<options>]\n L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n siehe auch -agentlib:jdwp=help und -agentlib:hprof=help\n -agentpath:<pathname>[=<options>]\n L\u00E4dt native Agent Library nach vollem Pfadnamen\n -javaagent:<jarpath>[=<options>]\n L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n -splash:<imagepath>\n Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://www.oracle.com/technetwork/java/javase/documentation/index.html
+
+ # Translators please note do not translate the options themselves
+ java.launcher.X.usage=\ -Xmixed Ausf\u00FChrung im gemischten Modus (Standard)\n -Xint Nur Ausf\u00FChrung im interpretierten Modus\n -Xbootclasspath:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Legt Suchpfad f\u00FCr Bootstrap-Klassen und Ressourcen fest\n -Xbootclasspath/a:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n H\u00E4ngt an das Ende des Bootstrap Classpath an\n -Xbootclasspath/p:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Stellt Bootstrap Classpath voran\n -Xdiag Zeigt zus\u00E4tzliche Diagnosemeldungen an\n -Xnoclassgc Deaktiviert Klassen-Garbage Collection\n -Xincgc Aktiviert inkrementelle Garbage Collection\n -Xloggc:<file> Loggt GC-Status in einer Datei mit Zeitstempeln\n -Xbatch Deaktiviert Hintergrundkompilierung\n -Xms<size> Legt anf\u00E4ngliche Java Heap-Gr\u00F6\u00DFe fest\n -Xmx<size> Legt maximale Java Heap-Gr\u00F6\u00DFe fest\n -Xss<size> Legt Java-Threadstackgr\u00F6\u00DFe fest\n -Xprof Gibt CPU-Profiling-Daten aus\n -Xfuture Aktiviert strengste Pr\u00FCfungen, antizipiert zuk\u00FCnftigen Standardwert\n -Xrs Reduziert Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n -Xcheck:jni F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen durch\n -Xshare:off Kein Versuch, gemeinsame Klassendaten zu verwenden\n -Xshare:auto Verwendet gemeinsame Klassendaten, wenn m\u00F6glich (Standard)\n -Xshare:on Erfordert die Verwendung gemeinsamer Klassendaten, sonst verl\u00E4uft der Vorgang nicht erfolgreich.\n -XshowSettings Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:all\n Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen und f\u00E4hrt fort\n -XshowSettings:properties\n Zeigt alle Eigenschaftseinstellungen und f\u00E4hrt fort\n -XshowSettings:locale\n Zeigt alle gebietsschemabezogenen Einstellungen und f\u00E4hrt fort\n\nDie -X-Optionen sind keine Standardoptionen und k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
+--- ./jdk/src/share/classes/sun/misc/VMSupport.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/misc/VMSupport.java Mon Jan 05 11:57:27 2015 -0800
+@@ -97,4 +97,14 @@
+ throw new RuntimeException(ioe.getMessage());
+ }
+ }
++
++ /*
++ * Return the temporary directory that the VM uses for the attach
++ * and perf data files.
++ *
++ * It is important that this directory is well-known and the
++ * same for all VM instances. It cannot be affected by configuration
++ * variables such as java.io.tmpdir.
++ */
++ public static native String getVMTemporaryDirectory();
+ }
+--- ./jdk/src/share/classes/sun/net/www/http/HttpClient.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/net/www/http/HttpClient.java Mon Jan 05 11:57:27 2015 -0800
+@@ -651,7 +651,9 @@
+ // try once more
+ openServer();
+ if (needsTunneling()) {
++ MessageHeader origRequests = requests;
+ httpuc.doTunneling();
++ requests = origRequests;
+ }
+ afterConnect();
+ writeRequests(requests, poster);
+@@ -762,7 +764,9 @@
+ cachedHttpClient = false;
+ openServer();
+ if (needsTunneling()) {
++ MessageHeader origRequests = requests;
+ httpuc.doTunneling();
++ requests = origRequests;
+ }
+ afterConnect();
+ writeRequests(requests, poster);
+--- ./jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java Mon Jan 05 11:57:27 2015 -0800
+@@ -301,7 +301,7 @@
+ throw new IOException(fe);
+ }
+ try {
+- ftp.login(user, password.toCharArray());
++ ftp.login(user, password == null ? null : password.toCharArray());
+ } catch (sun.net.ftp.FtpProtocolException e) {
+ ftp.close();
+ // Backward compatibility
+--- ./jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Mon Jan 05 11:57:27 2015 -0800
+@@ -315,6 +315,7 @@
+ /* try auth without calling Authenticator. Used for transparent NTLM authentication */
+ private boolean tryTransparentNTLMServer = true;
+ private boolean tryTransparentNTLMProxy = true;
++ private boolean useProxyResponseCode = false;
+
+ /* Used by Windows specific code */
+ private Object authObj;
+@@ -2032,6 +2033,14 @@
+ if (tryTransparentNTLMProxy) {
+ tryTransparentNTLMProxy =
+ NTLMAuthenticationProxy.proxy.supportsTransparentAuth;
++ /* If the platform supports transparent authentication
++ * then normally it's ok to do transparent auth to a proxy
++ * because we generally trust proxies (chosen by the user)
++ * But not in the case of 305 response where the server
++ * chose it. */
++ if (tryTransparentNTLMProxy && useProxyResponseCode) {
++ tryTransparentNTLMProxy = false;
++ }
+ }
+ a = null;
+ if (tryTransparentNTLMProxy) {
+@@ -2364,6 +2373,10 @@
+ requests.set(0, method + " " + getRequestURI()+" " +
+ httpVersion, null);
+ connected = true;
++ // need to remember this in case NTLM proxy authentication gets
++ // used. We can't use transparent authentication when user
++ // doesn't know about proxy.
++ useProxyResponseCode = true;
+ } else {
+ // maintain previous headers, just change the name
+ // of the file we're getting
+--- ./jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2009, 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
+@@ -32,6 +32,7 @@
+ import sun.net.www.HeaderParser;
+ import sun.misc.BASE64Decoder;
+ import sun.misc.BASE64Encoder;
++import sun.util.logging.PlatformLogger;
+ import static sun.net.www.protocol.http.AuthScheme.NEGOTIATE;
+ import static sun.net.www.protocol.http.AuthScheme.KERBEROS;
+
+@@ -45,6 +46,7 @@
+ class NegotiateAuthentication extends AuthenticationInfo {
+
+ private static final long serialVersionUID = 100L;
++ private static final PlatformLogger logger = HttpURLConnection.getHttpLogger();
+
+ final private HttpCallerInfo hci;
+
+@@ -80,6 +82,31 @@
+ }
+
+ /**
++ * Find out if the HttpCallerInfo supports Negotiate protocol.
++ * @return true if supported
++ */
++ public static boolean isSupported(HttpCallerInfo hci) {
++ ClassLoader loader = null;
++ try {
++ loader = Thread.currentThread().getContextClassLoader();
++ } catch (SecurityException se) {
++ if (logger.isLoggable(PlatformLogger.Level.FINER)) {
++ logger.finer("NegotiateAuthentication: " +
++ "Attempt to get the context class loader failed - " + se);
++ }
++ }
++
++ if (loader != null) {
++ // Lock on the class loader instance to avoid the deadlock engaging
++ // the lock in "ClassLoader.loadClass(String, boolean)" method.
++ synchronized (loader) {
++ return isSupportedImpl(hci);
++ }
++ }
++ return isSupportedImpl(hci);
++ }
++
++ /**
+ * Find out if the HttpCallerInfo supports Negotiate protocol. In order to
+ * find out yes or no, an initialization of a Negotiator object against it
+ * is tried. The generated object will be cached under the name of ths
+@@ -90,7 +117,7 @@
+ *
+ * @return true if supported
+ */
+- synchronized public static boolean isSupported(HttpCallerInfo hci) {
++ private static synchronized boolean isSupportedImpl(HttpCallerInfo hci) {
+ if (supported == null) {
+ supported = new HashMap <String, Boolean>();
+ cache = new HashMap <String, Negotiator>();
+--- ./jdk/src/share/classes/sun/rmi/transport/Transport.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/rmi/transport/Transport.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2008, 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
+@@ -37,6 +37,10 @@
+ import java.rmi.server.RemoteServer;
+ import java.rmi.server.ServerNotActiveException;
+ import java.security.AccessControlContext;
++import java.security.AccessController;
++import java.security.Permissions;
++import java.security.PrivilegedAction;
++import java.security.ProtectionDomain;
+ import sun.rmi.runtime.Log;
+ import sun.rmi.server.Dispatcher;
+ import sun.rmi.server.UnicastServerRef;
+@@ -67,6 +71,15 @@
+ /** ObjID for DGCImpl */
+ private static final ObjID dgcID = new ObjID(ObjID.DGC_ID);
+
++ /** AccessControlContext for setting context ClassLoader */
++ private static final AccessControlContext SETCCL_ACC;
++ static {
++ Permissions perms = new Permissions();
++ perms.add(new RuntimePermission("setContextClassLoader"));
++ ProtectionDomain[] pd = { new ProtectionDomain(null, perms) };
++ SETCCL_ACC = new AccessControlContext(pd);
++ }
++
+ /**
+ * Returns a <I>Channel</I> that generates connections to the
+ * endpoint <I>ep</I>. A Channel is an object that creates and
+@@ -116,6 +129,19 @@
+ protected abstract void checkAcceptPermission(AccessControlContext acc);
+
+ /**
++ * Sets the context class loader for the current thread.
++ */
++ private static void setContextClassLoader(final ClassLoader ccl) {
++ AccessController.doPrivileged(new PrivilegedAction<Void> () {
++ @Override
++ public Void run() {
++ Thread.currentThread().setContextClassLoader(ccl);
++ return null;
++ }
++ }, SETCCL_ACC);
++ }
++
++ /**
+ * Service an incoming remote call. When a message arrives on the
+ * connection indicating the beginning of a remote call, the
+ * threads are required to call the <I>serviceCall</I> method of
+@@ -163,11 +189,10 @@
+ target.getAccessControlContext();
+ ClassLoader ccl = target.getContextClassLoader();
+
+- Thread t = Thread.currentThread();
+- ClassLoader savedCcl = t.getContextClassLoader();
++ ClassLoader savedCcl = Thread.currentThread().getContextClassLoader();
+
+ try {
+- t.setContextClassLoader(ccl);
++ setContextClassLoader(ccl);
+ currentTransport.set(this);
+ try {
+ java.security.AccessController.doPrivileged(
+@@ -182,7 +207,7 @@
+ throw (IOException) pae.getException();
+ }
+ } finally {
+- t.setContextClassLoader(savedCcl);
++ setContextClassLoader(savedCcl);
+ currentTransport.set(null);
+ }
+
+--- ./jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 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
+@@ -49,6 +49,9 @@
+ import java.rmi.server.UID;
+ import java.security.AccessControlContext;
+ import java.security.AccessController;
++import java.security.Permissions;
++import java.security.PrivilegedAction;
++import java.security.ProtectionDomain;
+ import java.util.ArrayList;
+ import java.util.LinkedList;
+ import java.util.List;
+@@ -122,6 +125,14 @@
+ private static final ThreadLocal<ConnectionHandler>
+ threadConnectionHandler = new ThreadLocal<>();
+
++ /** an AccessControlContext with no permissions */
++ private static final AccessControlContext NOPERMS_ACC;
++ static {
++ Permissions perms = new Permissions();
++ ProtectionDomain[] pd = { new ProtectionDomain(null, perms) };
++ NOPERMS_ACC = new AccessControlContext(pd);
++ }
++
+ /** endpoints for this transport */
+ private final LinkedList<TCPEndpoint> epList;
+ /** number of objects exported on this transport */
+@@ -667,7 +678,13 @@
+ t.setName("RMI TCP Connection(" +
+ connectionCount.incrementAndGet() +
+ ")-" + remoteHost);
+- run0();
++ AccessController.doPrivileged(new PrivilegedAction<Void>() {
++ @Override
++ public Void run() {
++ run0();
++ return null;
++ }
++ }, NOPERMS_ACC);
+ } finally {
+ t.setName(name);
+ }
+--- ./jdk/src/share/classes/sun/security/jgss/GSSHeader.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/jgss/GSSHeader.java Mon Jan 05 11:57:27 2015 -0800
+@@ -270,6 +270,9 @@
+ value <<= 8;
+ value += 0x0ff & in.read();
+ }
++ if (value < 0) {
++ throw new IOException("Invalid length bytes");
++ }
+ }
+ return value;
+ }
+--- ./jdk/src/share/classes/sun/security/jgss/GSSNameImpl.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/jgss/GSSNameImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -257,6 +257,10 @@
+ ((0xFF & bytes[pos++]) << 16) |
+ ((0xFF & bytes[pos++]) << 8) |
+ (0xFF & bytes[pos++]));
++ if (mechPortionLen < 0 || pos > bytes.length - mechPortionLen) {
++ throw new GSSExceptionImpl(GSSException.BAD_NAME,
++ "Exported name mech name is corrupted!");
++ }
+ byte[] mechPortion = new byte[mechPortionLen];
+ System.arraycopy(bytes, pos, mechPortion, 0, mechPortionLen);
+
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java Mon Jan 05 11:57:27 2015 -0800
+@@ -233,6 +233,9 @@
+ ((0xFF & nameVal[pos++]) << 16) |
+ ((0xFF & nameVal[pos++]) << 8) |
+ (0xFF & nameVal[pos++]));
++ if (mechPortionLen < 0) {
++ throw new GSSException(GSSException.BAD_NAME);
++ }
+ byte[] mechPortion = new byte[mechPortionLen];
+ System.arraycopy(nameVal, pos, mechPortion, 0, mechPortionLen);
+ return mechPortion;
+--- ./jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java Mon Jan 05 11:57:27 2015 -0800
+@@ -123,7 +123,7 @@
+ } else {
+ type = read(4);
+ }
+- length = read(4);
++ length = readLength4();
+ String[] result = new String[length + 1];
+ /*
+ * DCE includes the principal's realm in the count; the new format
+@@ -132,7 +132,7 @@
+ if (version == KRB5_FCC_FVNO_1)
+ length--;
+ for (int i = 0; i <= length; i++) {
+- namelength = read(4);
++ namelength = readLength4();
+ if (namelength > MAXNAMELENGTH) {
+ throw new IOException("Invalid name length in principal name.");
+ }
+@@ -182,7 +182,7 @@
+ keyType = read(2);
+ if (version == KRB5_FCC_FVNO_3)
+ read(2); /* keytype recorded twice in fvno 3 */
+- keyLen = read(4);
++ keyLen = readLength4();
+ byte[] bytes = new byte[keyLen];
+ for (int i = 0; i < keyLen; i++) {
+ bytes[i] = (byte)read();
+@@ -208,12 +208,12 @@
+
+ HostAddress[] readAddr() throws IOException, KrbApErrException {
+ int numAddrs, addrType, addrLength;
+- numAddrs = read(4);
++ numAddrs = readLength4();
+ if (numAddrs > 0) {
+ HostAddress[] addrs = new HostAddress[numAddrs];
+ for (int i = 0; i < numAddrs; i++) {
+ addrType = read(2);
+- addrLength = read(4);
++ addrLength = readLength4();
+ if (!(addrLength == 4 || addrLength == 16)) {
+ if (DEBUG) {
+ System.out.println("Incorrect address format.");
+@@ -232,13 +232,13 @@
+
+ AuthorizationDataEntry[] readAuth() throws IOException {
+ int num, adtype, adlength;
+- num = read(4);
++ num = readLength4();
+ if (num > 0) {
+ AuthorizationDataEntry[] auData = new AuthorizationDataEntry[num];
+ byte[] data = null;
+ for (int i = 0; i < num; i++) {
+ adtype = read(2);
+- adlength = read(4);
++ adlength = readLength4();
+ data = new byte[adlength];
+ for (int j = 0; j < adlength; j++) {
+ data[j] = (byte)read();
+@@ -252,7 +252,7 @@
+
+ byte[] readData() throws IOException {
+ int length;
+- length = read(4);
++ length = readLength4();
+ if (length == 0) {
+ return null;
+ } else {
+--- ./jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java Mon Jan 05 11:57:27 2015 -0800
+@@ -154,44 +154,44 @@
+ throws IOException, KrbException {
+ primaryPrincipal = principal;
+ primaryRealm = principal.getRealm();
+- CCacheOutputStream cos =
+- new CCacheOutputStream(new FileOutputStream(name));
+- version = KRB5_FCC_FVNO_3;
+- cos.writeHeader(primaryPrincipal, version);
+- cos.close();
++ try (FileOutputStream fos = new FileOutputStream(name);
++ CCacheOutputStream cos = new CCacheOutputStream(fos)) {
++ version = KRB5_FCC_FVNO_3;
++ cos.writeHeader(primaryPrincipal, version);
++ }
+ load(name);
+ }
+
+ synchronized void load(String name) throws IOException, KrbException {
+ PrincipalName p;
+- CCacheInputStream cis =
+- new CCacheInputStream(new FileInputStream(name));
+- version = cis.readVersion();
+- if (version == KRB5_FCC_FVNO_4) {
+- tag = cis.readTag();
+- } else {
+- tag = null;
+- if (version == KRB5_FCC_FVNO_1 || version == KRB5_FCC_FVNO_2) {
+- cis.setNativeByteOrder();
++ try (FileInputStream fis = new FileInputStream(name);
++ CCacheInputStream cis = new CCacheInputStream(fis)) {
++ version = cis.readVersion();
++ if (version == KRB5_FCC_FVNO_4) {
++ tag = cis.readTag();
++ } else {
++ tag = null;
++ if (version == KRB5_FCC_FVNO_1 || version == KRB5_FCC_FVNO_2) {
++ cis.setNativeByteOrder();
++ }
++ }
++ p = cis.readPrincipal(version);
++
++ if (primaryPrincipal != null) {
++ if (!(primaryPrincipal.match(p))) {
++ throw new IOException("Primary principals don't match.");
++ }
++ } else
++ primaryPrincipal = p;
++ primaryRealm = primaryPrincipal.getRealm();
++ credentialsList = new Vector<Credentials>();
++ while (cis.available() > 0) {
++ Credentials cred = cis.readCred(version);
++ if (cred != null) {
++ credentialsList.addElement(cred);
++ }
+ }
+ }
+- p = cis.readPrincipal(version);
+-
+- if (primaryPrincipal != null) {
+- if (!(primaryPrincipal.match(p))) {
+- throw new IOException("Primary principals don't match.");
+- }
+- } else
+- primaryPrincipal = p;
+- primaryRealm = primaryPrincipal.getRealm();
+- credentialsList = new Vector<Credentials> ();
+- while (cis.available() > 0) {
+- Credentials cred = cis.readCred(version);
+- if (cred != null) {
+- credentialsList.addElement(cred);
+- }
+- }
+- cis.close();
+ }
+
+
+@@ -250,16 +250,16 @@
+ * Saves the credentials cache file to the disk.
+ */
+ public synchronized void save() throws IOException, Asn1Exception {
+- CCacheOutputStream cos
+- = new CCacheOutputStream(new FileOutputStream(cacheName));
+- cos.writeHeader(primaryPrincipal, version);
+- Credentials[] tmp = null;
+- if ((tmp = getCredsList()) != null) {
+- for (int i = 0; i < tmp.length; i++) {
+- cos.addCreds(tmp[i]);
++ try (FileOutputStream fos = new FileOutputStream(cacheName);
++ CCacheOutputStream cos = new CCacheOutputStream(fos)) {
++ cos.writeHeader(primaryPrincipal, version);
++ Credentials[] tmp = null;
++ if ((tmp = getCredsList()) != null) {
++ for (int i = 0; i < tmp.length; i++) {
++ cos.addCreds(tmp[i]);
++ }
+ }
+ }
+- cos.close();
+ }
+
+ boolean match(String[] s1, String[] s2) {
+--- ./jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java Mon Jan 05 11:57:27 2015 -0800
+@@ -56,15 +56,33 @@
+ public KrbDataInputStream(InputStream is){
+ super(is);
+ }
++
++ /**
++ * Reads a length value which is represented in 4 bytes from
++ * this input stream. The value must be positive.
++ * @return the length value represented by this byte array.
++ * @throws IOException if there are not enough bytes or it represents
++ * a negative value
++ */
++ final public int readLength4() throws IOException {
++ int len = read(4);
++ if (len < 0) {
++ throw new IOException("Invalid encoding");
++ }
++ return len;
++ }
++
+ /**
+ * Reads up to the specific number of bytes from this input stream.
+ * @param num the number of bytes to be read.
+ * @return the int value of this byte array.
+- * @exception IOException.
++ * @throws IOException if there are not enough bytes
+ */
+- public int read(int num) throws IOException{
++ public int read(int num) throws IOException {
+ byte[] bytes = new byte[num];
+- read(bytes, 0, num);
++ if (read(bytes, 0, num) != num) {
++ throw new IOException("Premature end of stream reached");
++ }
+ int result = 0;
+ for (int i = 0; i < num; i++) {
+ if (bigEndian) {
+--- ./jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/pkcs/SignerInfo.java Mon Jan 05 11:57:27 2015 -0800
+@@ -273,24 +273,6 @@
+ return certList;
+ }
+
+- // Copied from com.sun.crypto.provider.OAEPParameters.
+- private static String convertToStandardName(String internalName) {
+- if (internalName.equals("SHA")) {
+- return "SHA-1";
+- } else if (internalName.equals("SHA224")) {
+- return "SHA-224";
+- } else if (internalName.equals("SHA256")) {
+- return "SHA-256";
+- } else if (internalName.equals("SHA384")) {
+- return "SHA-384";
+- } else if (internalName.equals("SHA512")) {
+- return "SHA-512";
+- } else {
+- return internalName;
+- }
+- }
+-
+-
+ /* Returns null if verify fails, this signerInfo if
+ verify succeeds. */
+ SignerInfo verify(PKCS7 block, byte[] data)
+@@ -330,7 +312,7 @@
+ return null;
+
+ MessageDigest md = MessageDigest.getInstance(
+- convertToStandardName(digestAlgname));
++ AlgorithmId.getStandardDigestName(digestAlgname));
+ byte[] computedMessageDigest = md.digest(data);
+
+ if (messageDigest.length != computedMessageDigest.length)
+--- ./jdk/src/share/classes/sun/security/provider/SecureRandom.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/provider/SecureRandom.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -29,6 +29,7 @@
+ import java.security.MessageDigest;
+ import java.security.SecureRandomSpi;
+ import java.security.NoSuchAlgorithmException;
++import java.security.NoSuchProviderException;
+
+ /**
+ * <p>This class provides a crytpographically strong pseudo-random number
+@@ -94,9 +95,19 @@
+ */
+ private void init(byte[] seed) {
+ try {
+- digest = MessageDigest.getInstance ("SHA");
+- } catch (NoSuchAlgorithmException e) {
+- throw new InternalError("internal error: SHA-1 not available.");
++ /*
++ * Use the local SUN implementation to avoid native
++ * performance overhead.
++ */
++ digest = MessageDigest.getInstance("SHA", "SUN");
++ } catch (NoSuchProviderException | NoSuchAlgorithmException e) {
++ // Fallback to any available.
++ try {
++ digest = MessageDigest.getInstance("SHA");
++ } catch (NoSuchAlgorithmException exc) {
++ throw new InternalError(
++ "internal error: SHA-1 not available.");
++ }
+ }
+
+ if (seed != null) {
+@@ -258,9 +269,19 @@
+ s.defaultReadObject ();
+
+ try {
+- digest = MessageDigest.getInstance ("SHA");
+- } catch (NoSuchAlgorithmException e) {
+- throw new InternalError("internal error: SHA-1 not available.");
++ /*
++ * Use the local SUN implementation to avoid native
++ * performance overhead.
++ */
++ digest = MessageDigest.getInstance("SHA", "SUN");
++ } catch (NoSuchProviderException | NoSuchAlgorithmException e) {
++ // Fallback to any available.
++ try {
++ digest = MessageDigest.getInstance("SHA");
++ } catch (NoSuchAlgorithmException exc) {
++ throw new InternalError(
++ "internal error: SHA-1 not available.");
++ }
+ }
+ }
+ }
+--- ./jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java Mon Jan 05 11:57:27 2015 -0800
+@@ -375,20 +375,22 @@
+ boolean add = false;
+ for (AccessDescription ad : adList) {
+ CertStore cs = URICertStore.getInstance(ad);
+- try {
+- if (certs.addAll((Collection<X509Certificate>)
+- cs.getCertificates(caSelector))) {
+- add = true;
+- if (!searchAllCertStores) {
+- return true;
++ if (cs != null) {
++ try {
++ if (certs.addAll((Collection<X509Certificate>)
++ cs.getCertificates(caSelector))) {
++ add = true;
++ if (!searchAllCertStores) {
++ return true;
++ }
+ }
++ } catch (CertStoreException cse) {
++ if (debug != null) {
++ debug.println("exception getting certs from CertStore:");
++ cse.printStackTrace();
++ }
++ continue;
+ }
+- } catch (CertStoreException cse) {
+- if (debug != null) {
+- debug.println("exception getting certs from CertStore:");
+- cse.printStackTrace();
+- }
+- continue;
+ }
+ }
+ return add;
+--- ./jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java Mon Jan 05 11:57:27 2015 -0800
+@@ -234,10 +234,6 @@
+ // check trusted certificate's subject
+ issuerSelector.setSubject(firstCert.getIssuerX500Principal());
+
+- // check the validity period
+- issuerSelector.setValidityPeriod(firstCert.getNotBefore(),
+- firstCert.getNotAfter());
+-
+ /*
+ * Facilitate certification path construction with authority
+ * key identifier and subject key identifier.
+--- ./jdk/src/share/classes/sun/security/smartcardio/CardImpl.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/smartcardio/CardImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -26,9 +26,9 @@
+ package sun.security.smartcardio;
+
+ import java.nio.ByteBuffer;
+-
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import javax.smartcardio.*;
+-
+ import static sun.security.smartcardio.PCSC.*;
+
+ /**
+@@ -62,6 +62,19 @@
+ // thread holding exclusive access to the card, or null
+ private volatile Thread exclusiveThread;
+
++ // used for platform specific logic
++ private static final boolean isWindows;
++
++ static {
++ final String osName = AccessController.doPrivileged(
++ new PrivilegedAction<String>() {
++ @Override public String run() {
++ return System.getProperty("os.name");
++ }
++ });
++ isWindows = osName.startsWith("Windows");
++ }
++
+ CardImpl(TerminalImpl terminal, String protocol) throws PCSCException {
+ this.terminal = terminal;
+ int sharingMode = SCARD_SHARE_SHARED;
+@@ -74,7 +87,12 @@
+ connectProtocol = SCARD_PROTOCOL_T1;
+ } else if (protocol.equalsIgnoreCase("direct")) {
+ // testing
+- connectProtocol = 0;
++
++ // MSDN states that the preferred protocol can be zero, but doesn't
++ // specify whether other values are allowed.
++ // pcsc-lite implementation expects the preferred protocol to be non zero.
++ connectProtocol = isWindows ? 0 : SCARD_PROTOCOL_RAW;
++
+ sharingMode = SCARD_SHARE_DIRECT;
+ } else {
+ throw new IllegalArgumentException("Unsupported protocol " + protocol);
+@@ -237,6 +255,12 @@
+ }
+ }
+
++ private static final boolean invertReset =
++ Boolean.parseBoolean(
++ java.security.AccessController.doPrivileged(
++ new sun.security.action.GetPropertyAction(
++ "sun.security.smartcardio.invertCardReset", "true")));
++
+ public void disconnect(boolean reset) throws CardException {
+ if (reset) {
+ checkSecurity("reset");
+@@ -245,8 +269,12 @@
+ return;
+ }
+ checkExclusive();
++ // to preserve old behaviour, don't change flag until here
++ if (invertReset) {
++ reset = !reset;
++ }
+ try {
+- SCardDisconnect(cardId, (reset ? SCARD_LEAVE_CARD : SCARD_RESET_CARD));
++ SCardDisconnect(cardId, (reset ? SCARD_RESET_CARD : SCARD_LEAVE_CARD));
+ } catch (PCSCException e) {
+ throw new CardException("disconnect() failed", e);
+ } finally {
+--- ./jdk/src/share/classes/sun/security/ssl/CipherSuite.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/CipherSuite.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -82,6 +82,10 @@
+ private final static boolean ALLOW_ECC = Debug.getBooleanProperty
+ ("com.sun.net.ssl.enableECC", true);
+
++ // preserve the old order of RC4 preference
++ private final static boolean PRESERVE_RC4 = Debug.getBooleanProperty
++ ("jdk.tls.preserveRC4CipherSuites", false);
++
+ // Map Integer(id) -> CipherSuite
+ // contains all known CipherSuites
+ private final static Map<Integer,CipherSuite> idMap;
+@@ -963,16 +967,18 @@
+ add("TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
+ 0x0032, --p, K_DHE_DSS, B_AES_128, T);
+
+- add("TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
+- 0xC007, --p, K_ECDHE_ECDSA, B_RC4_128, N);
+- add("TLS_ECDHE_RSA_WITH_RC4_128_SHA",
+- 0xC011, --p, K_ECDHE_RSA, B_RC4_128, N);
+- add("SSL_RSA_WITH_RC4_128_SHA",
+- 0x0005, --p, K_RSA, B_RC4_128, N);
+- add("TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
+- 0xC002, --p, K_ECDH_ECDSA, B_RC4_128, N);
+- add("TLS_ECDH_RSA_WITH_RC4_128_SHA",
+- 0xC00C, --p, K_ECDH_RSA, B_RC4_128, N);
++ if (PRESERVE_RC4) {
++ add("TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
++ 0xC007, --p, K_ECDHE_ECDSA, B_RC4_128, N);
++ add("TLS_ECDHE_RSA_WITH_RC4_128_SHA",
++ 0xC011, --p, K_ECDHE_RSA, B_RC4_128, N);
++ add("SSL_RSA_WITH_RC4_128_SHA",
++ 0x0005, --p, K_RSA, B_RC4_128, N);
++ add("TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
++ 0xC002, --p, K_ECDH_ECDSA, B_RC4_128, N);
++ add("TLS_ECDH_RSA_WITH_RC4_128_SHA",
++ 0xC00C, --p, K_ECDH_RSA, B_RC4_128, N);
++ }
+
+ add("TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
+ 0xC008, --p, K_ECDHE_ECDSA, B_3DES, T);
+@@ -989,6 +995,18 @@
+ add("SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
+ 0x0013, --p, K_DHE_DSS, B_3DES, N);
+
++ if (!PRESERVE_RC4) {
++ add("TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
++ 0xC007, --p, K_ECDHE_ECDSA, B_RC4_128, N);
++ add("TLS_ECDHE_RSA_WITH_RC4_128_SHA",
++ 0xC011, --p, K_ECDHE_RSA, B_RC4_128, N);
++ add("SSL_RSA_WITH_RC4_128_SHA",
++ 0x0005, --p, K_RSA, B_RC4_128, N);
++ add("TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
++ 0xC002, --p, K_ECDH_ECDSA, B_RC4_128, N);
++ add("TLS_ECDH_RSA_WITH_RC4_128_SHA",
++ 0xC00C, --p, K_ECDH_RSA, B_RC4_128, N);
++ }
+ add("SSL_RSA_WITH_RC4_128_MD5",
+ 0x0004, --p, K_RSA, B_RC4_128, N);
+
+@@ -1008,7 +1026,7 @@
+ * 2. If a cipher suite has been obsoleted, we put it at the end of
+ * the list.
+ * 3. Prefer the stronger bulk cipher, in the order of AES_256,
+- * AES_128, RC-4, 3DES-EDE, DES, RC4_40, DES40, NULL.
++ * AES_128, 3DES-EDE, RC-4, DES, DES40, RC4_40, NULL.
+ * 4. Prefer the stronger MAC algorithm, in the order of SHA384,
+ * SHA256, SHA, MD5.
+ * 5. Prefer the better performance of key exchange and digital
+@@ -1031,15 +1049,51 @@
+ add("TLS_DH_anon_WITH_AES_128_CBC_SHA",
+ 0x0034, --p, K_DH_ANON, B_AES_128, N);
+
++ if (!PRESERVE_RC4) {
++ add("TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
++ 0xC017, --p, K_ECDH_ANON, B_3DES, T);
++ add("SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
++ 0x001b, --p, K_DH_ANON, B_3DES, N);
++ }
++
+ add("TLS_ECDH_anon_WITH_RC4_128_SHA",
+ 0xC016, --p, K_ECDH_ANON, B_RC4_128, N);
+ add("SSL_DH_anon_WITH_RC4_128_MD5",
+ 0x0018, --p, K_DH_ANON, B_RC4_128, N);
+
+- add("TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
+- 0xC017, --p, K_ECDH_ANON, B_3DES, T);
+- add("SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
+- 0x001b, --p, K_DH_ANON, B_3DES, N);
++ if (!PRESERVE_RC4) {
++ // weak cipher suites obsoleted in TLS 1.2
++ add("SSL_RSA_WITH_DES_CBC_SHA",
++ 0x0009, --p, K_RSA, B_DES, N, tls12);
++ add("SSL_DHE_RSA_WITH_DES_CBC_SHA",
++ 0x0015, --p, K_DHE_RSA, B_DES, N, tls12);
++ add("SSL_DHE_DSS_WITH_DES_CBC_SHA",
++ 0x0012, --p, K_DHE_DSS, B_DES, N, tls12);
++ add("SSL_DH_anon_WITH_DES_CBC_SHA",
++ 0x001a, --p, K_DH_ANON, B_DES, N, tls12);
++
++ // weak cipher suites obsoleted in TLS 1.1
++ add("SSL_RSA_EXPORT_WITH_RC4_40_MD5",
++ 0x0003, --p, K_RSA_EXPORT, B_RC4_40, N, tls11);
++ add("SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
++ 0x0017, --p, K_DH_ANON, B_RC4_40, N, tls11);
++
++ add("SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
++ 0x0008, --p, K_RSA_EXPORT, B_DES_40, N, tls11);
++ add("SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
++ 0x0014, --p, K_DHE_RSA, B_DES_40, N, tls11);
++ add("SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
++ 0x0011, --p, K_DHE_DSS, B_DES_40, N, tls11);
++ add("SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
++ 0x0019, --p, K_DH_ANON, B_DES_40, N, tls11);
++ }
++
++ if (PRESERVE_RC4) {
++ add("TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
++ 0xC017, --p, K_ECDH_ANON, B_3DES, T);
++ add("SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
++ 0x001b, --p, K_DH_ANON, B_3DES, N);
++ }
+
+ add("TLS_RSA_WITH_NULL_SHA256",
+ 0x003b, --p, K_RSA, B_NULL, N, max, tls12, P_SHA256);
+@@ -1058,52 +1112,70 @@
+ add("SSL_RSA_WITH_NULL_MD5",
+ 0x0001, --p, K_RSA, B_NULL, N);
+
+- // weak cipher suites obsoleted in TLS 1.2
+- add("SSL_RSA_WITH_DES_CBC_SHA",
+- 0x0009, --p, K_RSA, B_DES, N, tls12);
+- add("SSL_DHE_RSA_WITH_DES_CBC_SHA",
+- 0x0015, --p, K_DHE_RSA, B_DES, N, tls12);
+- add("SSL_DHE_DSS_WITH_DES_CBC_SHA",
+- 0x0012, --p, K_DHE_DSS, B_DES, N, tls12);
+- add("SSL_DH_anon_WITH_DES_CBC_SHA",
+- 0x001a, --p, K_DH_ANON, B_DES, N, tls12);
++ if (PRESERVE_RC4) {
++ // weak cipher suites obsoleted in TLS 1.2
++ add("SSL_RSA_WITH_DES_CBC_SHA",
++ 0x0009, --p, K_RSA, B_DES, N, tls12);
++ add("SSL_DHE_RSA_WITH_DES_CBC_SHA",
++ 0x0015, --p, K_DHE_RSA, B_DES, N, tls12);
++ add("SSL_DHE_DSS_WITH_DES_CBC_SHA",
++ 0x0012, --p, K_DHE_DSS, B_DES, N, tls12);
++ add("SSL_DH_anon_WITH_DES_CBC_SHA",
++ 0x001a, --p, K_DH_ANON, B_DES, N, tls12);
+
+- // weak cipher suites obsoleted in TLS 1.1
+- add("SSL_RSA_EXPORT_WITH_RC4_40_MD5",
+- 0x0003, --p, K_RSA_EXPORT, B_RC4_40, N, tls11);
+- add("SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
+- 0x0017, --p, K_DH_ANON, B_RC4_40, N, tls11);
++ // weak cipher suites obsoleted in TLS 1.1
++ add("SSL_RSA_EXPORT_WITH_RC4_40_MD5",
++ 0x0003, --p, K_RSA_EXPORT, B_RC4_40, N, tls11);
++ add("SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
++ 0x0017, --p, K_DH_ANON, B_RC4_40, N, tls11);
+
+- add("SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
+- 0x0008, --p, K_RSA_EXPORT, B_DES_40, N, tls11);
+- add("SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
+- 0x0014, --p, K_DHE_RSA, B_DES_40, N, tls11);
+- add("SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
+- 0x0011, --p, K_DHE_DSS, B_DES_40, N, tls11);
+- add("SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
+- 0x0019, --p, K_DH_ANON, B_DES_40, N, tls11);
++ add("SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
++ 0x0008, --p, K_RSA_EXPORT, B_DES_40, N, tls11);
++ add("SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
++ 0x0014, --p, K_DHE_RSA, B_DES_40, N, tls11);
++ add("SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
++ 0x0011, --p, K_DHE_DSS, B_DES_40, N, tls11);
++ add("SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
++ 0x0019, --p, K_DH_ANON, B_DES_40, N, tls11);
++ }
+
+ // Supported Kerberos ciphersuites from RFC2712
++ if (!PRESERVE_RC4) {
++ add("TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
++ 0x001f, --p, K_KRB5, B_3DES, N);
++ add("TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
++ 0x0023, --p, K_KRB5, B_3DES, N);
++ }
+ add("TLS_KRB5_WITH_RC4_128_SHA",
+ 0x0020, --p, K_KRB5, B_RC4_128, N);
+ add("TLS_KRB5_WITH_RC4_128_MD5",
+ 0x0024, --p, K_KRB5, B_RC4_128, N);
+- add("TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
+- 0x001f, --p, K_KRB5, B_3DES, N);
+- add("TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
+- 0x0023, --p, K_KRB5, B_3DES, N);
++ if (PRESERVE_RC4) {
++ add("TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
++ 0x001f, --p, K_KRB5, B_3DES, N);
++ add("TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
++ 0x0023, --p, K_KRB5, B_3DES, N);
++ }
+ add("TLS_KRB5_WITH_DES_CBC_SHA",
+ 0x001e, --p, K_KRB5, B_DES, N, tls12);
+ add("TLS_KRB5_WITH_DES_CBC_MD5",
+ 0x0022, --p, K_KRB5, B_DES, N, tls12);
++ if (!PRESERVE_RC4) {
++ add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
++ 0x0026, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
++ add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
++ 0x0029, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
++ }
+ add("TLS_KRB5_EXPORT_WITH_RC4_40_SHA",
+ 0x0028, --p, K_KRB5_EXPORT, B_RC4_40, N, tls11);
+ add("TLS_KRB5_EXPORT_WITH_RC4_40_MD5",
+ 0x002b, --p, K_KRB5_EXPORT, B_RC4_40, N, tls11);
+- add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
+- 0x0026, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
+- add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
+- 0x0029, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
++ if (PRESERVE_RC4) {
++ add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
++ 0x0026, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
++ add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
++ 0x0029, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
++ }
+
+ /*
+ * Other values from the TLS Cipher Suite Registry, as of August 2010.
+--- ./jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java Mon Jan 05 11:57:27 2015 -0800
+@@ -342,6 +342,13 @@
+ break;
+
+ case HandshakeMessage.ht_finished:
++ // A ChangeCipherSpec record must have been received prior to
++ // reception of the Finished message (RFC 5246, 7.4.9).
++ if (!receivedChangeCipherSpec()) {
++ fatalSE(Alerts.alert_handshake_failure,
++ "Received Finished message before ChangeCipherSpec");
++ }
++
+ this.serverFinished(
+ new Finished(protocolVersion, input, cipherSuite));
+ break;
+--- ./jdk/src/share/classes/sun/security/ssl/DHCrypt.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/DHCrypt.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2012, 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
+@@ -188,7 +188,7 @@
+ * the same size as the Diffie-Hellman modulus.
+ */
+ SecretKey getAgreedSecret(BigInteger peerPublicValue,
+- boolean keyIsValidated) throws IOException {
++ boolean keyIsValidated) throws SSLHandshakeException {
+ try {
+ KeyFactory kf = JsseJce.getKeyFactory("DiffieHellman");
+ DHPublicKeySpec spec =
+@@ -211,7 +211,8 @@
+ ka.doPhase(publicKey, true);
+ return ka.generateSecret("TlsPremasterSecret");
+ } catch (GeneralSecurityException e) {
+- throw new RuntimeException("Could not generate secret", e);
++ throw (SSLHandshakeException) new SSLHandshakeException(
++ "Could not generate secret").initCause(e);
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/security/ssl/ECDHCrypt.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/ECDHCrypt.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2006, 2007, 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
+@@ -32,6 +32,7 @@
+ import javax.crypto.SecretKey;
+ import javax.crypto.KeyAgreement;
+ import javax.crypto.spec.*;
++import javax.net.ssl.SSLHandshakeException;
+
+ /**
+ * Helper class for the ECDH key exchange. It generates the appropriate
+@@ -89,19 +90,20 @@
+ }
+
+ // called by ClientHandshaker with either the server's static or ephemeral public key
+- SecretKey getAgreedSecret(PublicKey peerPublicKey) {
++ SecretKey getAgreedSecret(PublicKey peerPublicKey) throws SSLHandshakeException {
+ try {
+ KeyAgreement ka = JsseJce.getKeyAgreement("ECDH");
+ ka.init(privateKey);
+ ka.doPhase(peerPublicKey, true);
+ return ka.generateSecret("TlsPremasterSecret");
+ } catch (GeneralSecurityException e) {
+- throw new RuntimeException("Could not generate secret", e);
++ throw (SSLHandshakeException) new SSLHandshakeException(
++ "Could not generate secret").initCause(e);
+ }
+ }
+
+ // called by ServerHandshaker
+- SecretKey getAgreedSecret(byte[] encodedPoint) {
++ SecretKey getAgreedSecret(byte[] encodedPoint) throws SSLHandshakeException {
+ try {
+ ECParameterSpec params = publicKey.getParams();
+ ECPoint point = JsseJce.decodePoint(encodedPoint, params.getCurve());
+@@ -109,10 +111,9 @@
+ ECPublicKeySpec spec = new ECPublicKeySpec(point, params);
+ PublicKey peerPublicKey = kf.generatePublic(spec);
+ return getAgreedSecret(peerPublicKey);
+- } catch (GeneralSecurityException e) {
+- throw new RuntimeException("Could not generate secret", e);
+- } catch (java.io.IOException e) {
+- throw new RuntimeException("Could not generate secret", e);
++ } catch (GeneralSecurityException | java.io.IOException e) {
++ throw (SSLHandshakeException) new SSLHandshakeException(
++ "Could not generate secret").initCause(e);
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/security/ssl/Handshaker.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/Handshaker.java Mon Jan 05 11:57:27 2015 -0800
+@@ -65,27 +65,27 @@
+ ProtocolVersion protocolVersion;
+
+ // the currently active protocol version during a renegotiation
+- ProtocolVersion activeProtocolVersion;
++ ProtocolVersion activeProtocolVersion;
+
+ // security parameters for secure renegotiation.
+- boolean secureRenegotiation;
+- byte[] clientVerifyData;
+- byte[] serverVerifyData;
++ boolean secureRenegotiation;
++ byte[] clientVerifyData;
++ byte[] serverVerifyData;
+
+ // Is it an initial negotiation or a renegotiation?
+- boolean isInitialHandshake;
++ boolean isInitialHandshake;
+
+ // List of enabled protocols
+- private ProtocolList enabledProtocols;
++ private ProtocolList enabledProtocols;
+
+ // List of enabled CipherSuites
+- private CipherSuiteList enabledCipherSuites;
++ private CipherSuiteList enabledCipherSuites;
+
+ // The endpoint identification protocol
+- String identificationProtocol;
++ String identificationProtocol;
+
+ // The cryptographic algorithm constraints
+- private AlgorithmConstraints algorithmConstraints = null;
++ private AlgorithmConstraints algorithmConstraints = null;
+
+ // Local supported signature and algorithms
+ Collection<SignatureAndHashAlgorithm> localSupportedSignAlgs;
+@@ -94,15 +94,13 @@
+ Collection<SignatureAndHashAlgorithm> peerSupportedSignAlgs;
+
+ /*
+-
+- /*
+ * List of active protocols
+ *
+ * Active protocols is a subset of enabled protocols, and will
+ * contain only those protocols that have vaild cipher suites
+ * enabled.
+ */
+- private ProtocolList activeProtocols;
++ private ProtocolList activeProtocols;
+
+ /*
+ * List of active cipher suites
+@@ -110,33 +108,37 @@
+ * Active cipher suites is a subset of enabled cipher suites, and will
+ * contain only those cipher suites available for the active protocols.
+ */
+- private CipherSuiteList activeCipherSuites;
++ private CipherSuiteList activeCipherSuites;
+
+- private boolean isClient;
+- private boolean needCertVerify;
++ private boolean isClient;
++ private boolean needCertVerify;
+
+- SSLSocketImpl conn = null;
+- SSLEngineImpl engine = null;
++ SSLSocketImpl conn = null;
++ SSLEngineImpl engine = null;
+
+- HandshakeHash handshakeHash;
+- HandshakeInStream input;
+- HandshakeOutStream output;
+- int state;
+- SSLContextImpl sslContext;
+- RandomCookie clnt_random, svr_random;
+- SSLSessionImpl session;
++ HandshakeHash handshakeHash;
++ HandshakeInStream input;
++ HandshakeOutStream output;
++ int state;
++ SSLContextImpl sslContext;
++ RandomCookie clnt_random, svr_random;
++ SSLSessionImpl session;
+
+ // current CipherSuite. Never null, initially SSL_NULL_WITH_NULL_NULL
+- CipherSuite cipherSuite;
++ CipherSuite cipherSuite;
+
+ // current key exchange. Never null, initially K_NULL
+- KeyExchange keyExchange;
++ KeyExchange keyExchange;
+
+- /* True if this session is being resumed (fast handshake) */
+- boolean resumingSession;
++ // True if this session is being resumed (fast handshake)
++ boolean resumingSession;
+
+- /* True if it's OK to start a new SSL session */
+- boolean enableNewSession;
++ // True if it's OK to start a new SSL session
++ boolean enableNewSession;
++
++ // True if session keys have been calculated and the caller may receive
++ // and process a ChangeCipherSpec message
++ private boolean sessKeysCalculated;
+
+ // Temporary storage for the individual keys. Set by
+ // calculateConnectionKeys() and cleared once the ciphers are
+@@ -161,7 +163,7 @@
+ // here instead of using this lock. Consider changing.
+ private Object thrownLock = new Object();
+
+- /* Class and subclass dynamic debugging support */
++ // Class and subclass dynamic debugging support
+ static final Debug debug = Debug.getInstance("ssl");
+
+ // By default, disable the unsafe legacy session renegotiation
+@@ -228,6 +230,7 @@
+ this.serverVerifyData = serverVerifyData;
+ enableNewSession = true;
+ invalidated = false;
++ sessKeysCalculated = false;
+
+ setCipherSuite(CipherSuite.C_NULL);
+ setEnabledProtocols(enabledProtocols);
+@@ -348,6 +351,14 @@
+ }
+ }
+
++ final boolean receivedChangeCipherSpec() {
++ if (conn != null) {
++ return conn.receivedChangeCipherSpec();
++ } else {
++ return engine.receivedChangeCipherSpec();
++ }
++ }
++
+ String getEndpointIdentificationAlgorithmSE() {
+ SSLParameters paras;
+ if (conn != null) {
+@@ -456,7 +467,9 @@
+
+ if (activeProtocols.collection().isEmpty() ||
+ activeProtocols.max.v == ProtocolVersion.NONE.v) {
+- throw new SSLHandshakeException("No appropriate protocol");
++ throw new SSLHandshakeException(
++ "No appropriate protocol (protocol is disabled or " +
++ "cipher suites are inappropriate)");
+ }
+
+ if (activeCipherSuites == null) {
+@@ -625,14 +638,24 @@
+ ProtocolList getActiveProtocols() {
+ if (activeProtocols == null) {
+ ArrayList<ProtocolVersion> protocols = new ArrayList<>(4);
++ EnumSet<CryptoPrimitive> cryptoPrimitives =
++ EnumSet.<CryptoPrimitive>of(CryptoPrimitive.KEY_AGREEMENT);
+ for (ProtocolVersion protocol : enabledProtocols.collection()) {
++ if (!algorithmConstraints.permits(
++ cryptoPrimitives, protocol.name, null)) {
++ if (debug != null && Debug.isOn("verbose")) {
++ System.out.println(
++ "Ignoring disabled protocol: " + protocol);
++ }
++
++ continue;
++ }
+ boolean found = false;
+ for (CipherSuite suite : enabledCipherSuites.collection()) {
+ if (suite.isAvailable() && suite.obsoleted > protocol.v &&
+ suite.supported <= protocol.v) {
+ if (algorithmConstraints.permits(
+- EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+- suite.name, null)) {
++ cryptoPrimitives, suite.name, null)) {
+ protocols.add(protocol);
+ found = true;
+ break;
+@@ -1140,6 +1163,10 @@
+ throw new ProviderException(e);
+ }
+
++ // Mark a flag that allows outside entities (like SSLSocket/SSLEngine)
++ // determine if a ChangeCipherSpec message could be processed.
++ sessKeysCalculated = true;
++
+ //
+ // Dump the connection keys as they're generated.
+ //
+@@ -1190,6 +1217,15 @@
+ }
+ }
+
++ /**
++ * Return whether or not the Handshaker has derived session keys for
++ * this handshake. This is used for determining readiness to process
++ * an incoming ChangeCipherSpec message.
++ */
++ boolean sessionKeysCalculated() {
++ return sessKeysCalculated;
++ }
++
+ private static void printHex(HexDumpEncoder dump, byte[] bytes) {
+ if (bytes == null) {
+ System.out.println("(key bytes not available)");
+--- ./jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java Mon Jan 05 11:57:27 2015 -0800
+@@ -25,6 +25,9 @@
+
+ package sun.security.ssl;
+
++import java.util.*;
++import java.security.CryptoPrimitive;
++
+ /**
+ * Type safe enum for an SSL/TLS protocol version. Instances are obtained
+ * using the static factory methods or by referencing the static members
+@@ -86,6 +89,11 @@
+ // Default version for hello messages (SSLv2Hello)
+ final static ProtocolVersion DEFAULT_HELLO = FIPS ? TLS10 : SSL30;
+
++ // Available protocols
++ //
++ // Including all supported protocols except the disabled ones.
++ final static Set<ProtocolVersion> availableProtocols;
++
+ // version in 16 bit MSB format as it appears in records and
+ // messages, i.e. 0x0301 for TLS 1.0
+ public final int v;
+@@ -96,6 +104,25 @@
+ // name used in JSSE (e.g. TLSv1 for TLS 1.0)
+ final String name;
+
++ // Initialize the available protocols.
++ static {
++ Set<ProtocolVersion> protocols = new HashSet<>(5);
++
++ ProtocolVersion[] pvs = new ProtocolVersion[] {
++ SSL20Hello, SSL30, TLS10, TLS11, TLS12};
++ EnumSet<CryptoPrimitive> cryptoPrimitives =
++ EnumSet.<CryptoPrimitive>of(CryptoPrimitive.KEY_AGREEMENT);
++ for (ProtocolVersion p : pvs) {
++ if (SSLAlgorithmConstraints.DEFAULT_SSL_ONLY.permits(
++ cryptoPrimitives, p.name, null)) {
++ protocols.add(p);
++ }
++ }
++
++ availableProtocols =
++ Collections.<ProtocolVersion>unmodifiableSet(protocols);
++ }
++
+ // private
+ private ProtocolVersion(int v, String name) {
+ this.v = v;
+--- ./jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java Mon Jan 05 11:57:27 2015 -0800
+@@ -55,6 +55,14 @@
+
+ private boolean enabledX509DisabledAlgConstraints = true;
+
++ // the default algorithm constraints
++ final static AlgorithmConstraints DEFAULT =
++ new SSLAlgorithmConstraints(null);
++
++ // the default SSL only algorithm constraints
++ final static AlgorithmConstraints DEFAULT_SSL_ONLY =
++ new SSLAlgorithmConstraints((SSLSocket)null, false);
++
+ SSLAlgorithmConstraints(AlgorithmConstraints algorithmConstraints) {
+ userAlgConstraints = algorithmConstraints;
+ }
+--- ./jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -51,10 +51,6 @@
+ private X509TrustManager trustManager;
+ private SecureRandom secureRandom;
+
+- // The default algrithm constraints
+- private AlgorithmConstraints defaultAlgorithmConstraints =
+- new SSLAlgorithmConstraints(null);
+-
+ // supported and default protocols
+ private ProtocolList defaultServerProtocolList;
+ private ProtocolList defaultClientProtocolList;
+@@ -342,7 +338,7 @@
+ if (suite.isAvailable() &&
+ suite.obsoleted > protocols.min.v &&
+ suite.supported <= protocols.max.v) {
+- if (defaultAlgorithmConstraints.permits(
++ if (SSLAlgorithmConstraints.DEFAULT.permits(
+ EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+ suite.name, null)) {
+ suites.add(suite);
+@@ -384,6 +380,22 @@
+ }
+ }
+
++ static String[] getAvailableProtocols(
++ ProtocolVersion[] protocolCandidates) {
++
++ List<String> availableProtocols = Collections.<String>emptyList();
++ if (protocolCandidates != null && protocolCandidates.length != 0) {
++ availableProtocols = new ArrayList<>(protocolCandidates.length);
++ for (ProtocolVersion p : protocolCandidates) {
++ if (ProtocolVersion.availableProtocols.contains(p)) {
++ availableProtocols.add(p.name);
++ }
++ }
++ }
++
++ return availableProtocols.toArray(new String[0]);
++ }
++
+ /*
+ * The SSLContext implementation for TLS/SSL algorithm
+ *
+@@ -423,28 +435,35 @@
+ */
+ private static class ConservativeSSLContext extends SSLContextImpl {
+ // parameters
+- private static SSLParameters defaultServerSSLParams;
+- private static SSLParameters defaultClientSSLParams;
+- private static SSLParameters supportedSSLParams;
++ private static final SSLParameters defaultServerSSLParams;
++ private static final SSLParameters defaultClientSSLParams;
++ private static final SSLParameters supportedSSLParams;
+
+ static {
++ // supported SSL parameters
++ supportedSSLParams = new SSLParameters();
++
++ // candidates for available protocols
++ ProtocolVersion[] serverCandidates;
++ ProtocolVersion[] clientCandidates;
++
+ if (SunJSSE.isFIPS()) {
+- supportedSSLParams = new SSLParameters();
+ supportedSSLParams.setProtocols(new String[] {
+ ProtocolVersion.TLS10.name,
+ ProtocolVersion.TLS11.name,
+ ProtocolVersion.TLS12.name
+ });
+
+- defaultServerSSLParams = supportedSSLParams;
++ serverCandidates = new ProtocolVersion[] {
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11,
++ ProtocolVersion.TLS12
++ };
+
+- defaultClientSSLParams = new SSLParameters();
+- defaultClientSSLParams.setProtocols(new String[] {
+- ProtocolVersion.TLS10.name
+- });
+-
++ clientCandidates = new ProtocolVersion[] {
++ ProtocolVersion.TLS10
++ };
+ } else {
+- supportedSSLParams = new SSLParameters();
+ supportedSSLParams.setProtocols(new String[] {
+ ProtocolVersion.SSL20Hello.name,
+ ProtocolVersion.SSL30.name,
+@@ -453,14 +472,27 @@
+ ProtocolVersion.TLS12.name
+ });
+
+- defaultServerSSLParams = supportedSSLParams;
++ serverCandidates = new ProtocolVersion[] {
++ ProtocolVersion.SSL20Hello,
++ ProtocolVersion.SSL30,
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11,
++ ProtocolVersion.TLS12
++ };
+
+- defaultClientSSLParams = new SSLParameters();
+- defaultClientSSLParams.setProtocols(new String[] {
+- ProtocolVersion.SSL30.name,
+- ProtocolVersion.TLS10.name
+- });
++ clientCandidates = new ProtocolVersion[] {
++ ProtocolVersion.SSL30,
++ ProtocolVersion.TLS10
++ };
+ }
++
++ defaultClientSSLParams = new SSLParameters();
++ defaultClientSSLParams.setProtocols(
++ getAvailableProtocols(clientCandidates));
++
++ defaultServerSSLParams = new SSLParameters();
++ defaultServerSSLParams.setProtocols(
++ getAvailableProtocols(serverCandidates));
+ }
+
+ SSLParameters getDefaultServerSSLParams() {
+@@ -651,29 +683,36 @@
+ */
+ public static final class TLS11Context extends SSLContextImpl {
+ // parameters
+- private static SSLParameters defaultServerSSLParams;
+- private static SSLParameters defaultClientSSLParams;
+- private static SSLParameters supportedSSLParams;
++ private static final SSLParameters defaultServerSSLParams;
++ private static final SSLParameters defaultClientSSLParams;
++ private static final SSLParameters supportedSSLParams;
+
+ static {
++ // supported SSL parameters
++ supportedSSLParams = new SSLParameters();
++
++ // candidates for available protocols
++ ProtocolVersion[] serverCandidates;
++ ProtocolVersion[] clientCandidates;
++
+ if (SunJSSE.isFIPS()) {
+- supportedSSLParams = new SSLParameters();
+ supportedSSLParams.setProtocols(new String[] {
+ ProtocolVersion.TLS10.name,
+ ProtocolVersion.TLS11.name,
+ ProtocolVersion.TLS12.name
+ });
+
+- defaultServerSSLParams = supportedSSLParams;
++ serverCandidates = new ProtocolVersion[] {
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11,
++ ProtocolVersion.TLS12
++ };
+
+- defaultClientSSLParams = new SSLParameters();
+- defaultClientSSLParams.setProtocols(new String[] {
+- ProtocolVersion.TLS10.name,
+- ProtocolVersion.TLS11.name
+- });
+-
++ clientCandidates = new ProtocolVersion[] {
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11
++ };
+ } else {
+- supportedSSLParams = new SSLParameters();
+ supportedSSLParams.setProtocols(new String[] {
+ ProtocolVersion.SSL20Hello.name,
+ ProtocolVersion.SSL30.name,
+@@ -682,15 +721,28 @@
+ ProtocolVersion.TLS12.name
+ });
+
+- defaultServerSSLParams = supportedSSLParams;
++ serverCandidates = new ProtocolVersion[] {
++ ProtocolVersion.SSL20Hello,
++ ProtocolVersion.SSL30,
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11,
++ ProtocolVersion.TLS12
++ };
+
+- defaultClientSSLParams = new SSLParameters();
+- defaultClientSSLParams.setProtocols(new String[] {
+- ProtocolVersion.SSL30.name,
+- ProtocolVersion.TLS10.name,
+- ProtocolVersion.TLS11.name
+- });
++ clientCandidates = new ProtocolVersion[] {
++ ProtocolVersion.SSL30,
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11
++ };
+ }
++
++ defaultClientSSLParams = new SSLParameters();
++ defaultClientSSLParams.setProtocols(
++ getAvailableProtocols(clientCandidates));
++
++ defaultServerSSLParams = new SSLParameters();
++ defaultServerSSLParams.setProtocols(
++ getAvailableProtocols(serverCandidates));
+ }
+
+ SSLParameters getDefaultServerSSLParams() {
+@@ -713,30 +765,37 @@
+ */
+ public static final class TLS12Context extends SSLContextImpl {
+ // parameters
+- private static SSLParameters defaultServerSSLParams;
+- private static SSLParameters defaultClientSSLParams;
+- private static SSLParameters supportedSSLParams;
++ private static final SSLParameters defaultServerSSLParams;
++ private static final SSLParameters defaultClientSSLParams;
++ private static final SSLParameters supportedSSLParams;
+
+ static {
++ // supported SSL parameters
++ supportedSSLParams = new SSLParameters();
++
++ // candidates for available protocols
++ ProtocolVersion[] serverCandidates;
++ ProtocolVersion[] clientCandidates;
++
+ if (SunJSSE.isFIPS()) {
+- supportedSSLParams = new SSLParameters();
+ supportedSSLParams.setProtocols(new String[] {
+ ProtocolVersion.TLS10.name,
+ ProtocolVersion.TLS11.name,
+ ProtocolVersion.TLS12.name
+ });
+
+- defaultServerSSLParams = supportedSSLParams;
++ serverCandidates = new ProtocolVersion[] {
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11,
++ ProtocolVersion.TLS12
++ };
+
+- defaultClientSSLParams = new SSLParameters();
+- defaultClientSSLParams.setProtocols(new String[] {
+- ProtocolVersion.TLS10.name,
+- ProtocolVersion.TLS11.name,
+- ProtocolVersion.TLS12.name
+- });
+-
++ clientCandidates = new ProtocolVersion[] {
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11,
++ ProtocolVersion.TLS12
++ };
+ } else {
+- supportedSSLParams = new SSLParameters();
+ supportedSSLParams.setProtocols(new String[] {
+ ProtocolVersion.SSL20Hello.name,
+ ProtocolVersion.SSL30.name,
+@@ -745,16 +804,29 @@
+ ProtocolVersion.TLS12.name
+ });
+
+- defaultServerSSLParams = supportedSSLParams;
++ serverCandidates = new ProtocolVersion[] {
++ ProtocolVersion.SSL20Hello,
++ ProtocolVersion.SSL30,
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11,
++ ProtocolVersion.TLS12
++ };
+
+- defaultClientSSLParams = new SSLParameters();
+- defaultClientSSLParams.setProtocols(new String[] {
+- ProtocolVersion.SSL30.name,
+- ProtocolVersion.TLS10.name,
+- ProtocolVersion.TLS11.name,
+- ProtocolVersion.TLS12.name
+- });
++ clientCandidates = new ProtocolVersion[] {
++ ProtocolVersion.SSL30,
++ ProtocolVersion.TLS10,
++ ProtocolVersion.TLS11,
++ ProtocolVersion.TLS12
++ };
+ }
++
++ defaultClientSSLParams = new SSLParameters();
++ defaultClientSSLParams.setProtocols(
++ getAvailableProtocols(clientCandidates));
++
++ defaultServerSSLParams = new SSLParameters();
++ defaultServerSSLParams.setProtocols(
++ getAvailableProtocols(serverCandidates));
+ }
+
+ SSLParameters getDefaultServerSSLParams() {
+--- ./jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2013, 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
+@@ -215,6 +215,11 @@
+ static final byte clauth_required = 2;
+
+ /*
++ * Flag indicating that the engine has received a ChangeCipherSpec message.
++ */
++ private boolean receivedCCS;
++
++ /*
+ * Flag indicating if the next record we receive MUST be a Finished
+ * message. Temporarily set during the handshake to ensure that
+ * a change cipher spec message is followed by a finished message.
+@@ -363,6 +368,7 @@
+ */
+ roleIsServer = true;
+ connectionState = cs_START;
++ receivedCCS = false;
+
+ /*
+ * default read and write side cipher and MAC support
+@@ -1006,6 +1012,7 @@
+
+ if (handshaker.invalidated) {
+ handshaker = null;
++ receivedCCS = false;
+ // if state is cs_RENEGOTIATE, revert it to cs_DATA
+ if (connectionState == cs_RENEGOTIATE) {
+ connectionState = cs_DATA;
+@@ -1024,6 +1031,7 @@
+ }
+ handshaker = null;
+ connectionState = cs_DATA;
++ receivedCCS = false;
+
+ // No handshakeListeners here. That's a
+ // SSLSocket thing.
+@@ -1063,13 +1071,25 @@
+ case Record.ct_change_cipher_spec:
+ if ((connectionState != cs_HANDSHAKE
+ && connectionState != cs_RENEGOTIATE)
+- || inputRecord.available() != 1
++ || !handshaker.sessionKeysCalculated()
++ || receivedCCS) {
++ // For the CCS message arriving in the wrong state
++ fatal(Alerts.alert_unexpected_message,
++ "illegal change cipher spec msg, conn state = "
++ + connectionState + ", handshake state = "
++ + handshaker.state);
++ } else if (inputRecord.available() != 1
+ || inputRecord.read() != 1) {
++ // For structural/content issues with the CCS
+ fatal(Alerts.alert_unexpected_message,
+- "illegal change cipher spec msg, state = "
+- + connectionState);
++ "Malformed change cipher spec msg");
+ }
+
++ // Once we've received CCS, update the flag.
++ // If the remote endpoint sends it again in this handshake
++ // we won't process it.
++ receivedCCS = true;
++
+ //
+ // The first message after a change_cipher_spec
+ // record MUST be a "Finished" handshake record,
+@@ -2065,6 +2085,14 @@
+ return Thread.currentThread().getName();
+ }
+
++ /*
++ * Returns a boolean indicating whether the ChangeCipherSpec message
++ * has been received for this handshake.
++ */
++ boolean receivedChangeCipherSpec() {
++ return receivedCCS;
++ }
++
+ /**
+ * Returns a printable representation of this end of the connection.
+ */
+--- ./jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2013, 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
+@@ -175,6 +175,12 @@
+ private volatile int connectionState;
+
+ /*
++ * Flag indicating that the engine's handshaker has done the necessary
++ * steps so the engine may process a ChangeCipherSpec message.
++ */
++ private boolean receivedCCS;
++
++ /*
+ * Flag indicating if the next record we receive MUST be a Finished
+ * message. Temporarily set during the handshake to ensure that
+ * a change cipher spec message is followed by a finished message.
+@@ -557,6 +563,7 @@
+ */
+ roleIsServer = isServer;
+ connectionState = cs_START;
++ receivedCCS = false;
+
+ /*
+ * default read and write side cipher and MAC support
+@@ -1018,6 +1025,7 @@
+
+ if (handshaker.invalidated) {
+ handshaker = null;
++ receivedCCS = false;
+ // if state is cs_RENEGOTIATE, revert it to cs_DATA
+ if (connectionState == cs_RENEGOTIATE) {
+ connectionState = cs_DATA;
+@@ -1033,6 +1041,7 @@
+ handshakeSession = null;
+ handshaker = null;
+ connectionState = cs_DATA;
++ receivedCCS = false;
+
+ //
+ // Tell folk about handshake completion, but do
+@@ -1080,13 +1089,24 @@
+ case Record.ct_change_cipher_spec:
+ if ((connectionState != cs_HANDSHAKE
+ && connectionState != cs_RENEGOTIATE)
+- || r.available() != 1
+- || r.read() != 1) {
++ || !handshaker.sessionKeysCalculated()
++ || receivedCCS) {
++ // For the CCS message arriving in the wrong state
+ fatal(Alerts.alert_unexpected_message,
+- "illegal change cipher spec msg, state = "
+- + connectionState);
++ "illegal change cipher spec msg, conn state = "
++ + connectionState + ", handshake state = "
++ + handshaker.state);
++ } else if (r.available() != 1 || r.read() != 1) {
++ // For structural/content issues with the CCS
++ fatal(Alerts.alert_unexpected_message,
++ "Malformed change cipher spec msg");
+ }
+
++ // Once we've received CCS, update the flag.
++ // If the remote endpoint sends it again in this handshake
++ // we won't process it.
++ receivedCCS = true;
++
+ //
+ // The first message after a change_cipher_spec
+ // record MUST be a "Finished" handshake record,
+@@ -2478,6 +2498,14 @@
+ }
+ }
+
++ /*
++ * Returns a boolean indicating whether the ChangeCipherSpec message
++ * has been received for this handshake.
++ */
++ boolean receivedChangeCipherSpec() {
++ return receivedCCS;
++ }
++
+ //
+ // We allocate a separate thread to deliver handshake completion
+ // events. This ensures that the notifications don't block the
+--- ./jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java Mon Jan 05 11:57:27 2015 -0800
+@@ -240,6 +240,13 @@
+ break;
+
+ case HandshakeMessage.ht_finished:
++ // A ChangeCipherSpec record must have been received prior to
++ // reception of the Finished message (RFC 5246, 7.4.9).
++ if (!receivedChangeCipherSpec()) {
++ fatalSE(Alerts.alert_handshake_failure,
++ "Received Finished message before ChangeCipherSpec");
++ }
++
+ this.clientFinished(
+ new Finished(protocolVersion, input, cipherSuite));
+ break;
+--- ./jdk/src/share/classes/sun/security/tools/JarSigner.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/tools/JarSigner.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -1547,8 +1547,7 @@
+ first = false;
+ }
+ try {
+- CertPath cp = certificateFactory.generateCertPath(certs);
+- validator.validate(cp, pkixParameters);
++ validateCertChain(certs);
+ } catch (Exception e) {
+ if (debug) {
+ e.printStackTrace();
+@@ -1859,8 +1858,7 @@
+ printCert("", certChain[0], true, null, true);
+
+ try {
+- CertPath cp = certificateFactory.generateCertPath(Arrays.asList(certChain));
+- validator.validate(cp, pkixParameters);
++ validateCertChain(Arrays.asList(certChain));
+ } catch (Exception e) {
+ if (debug) {
+ e.printStackTrace();
+@@ -1925,6 +1923,22 @@
+ System.exit(1);
+ }
+
++ void validateCertChain(List<? extends Certificate> certs) throws Exception {
++ int cpLen = 0;
++ out: for (; cpLen<certs.size(); cpLen++) {
++ for (TrustAnchor ta: pkixParameters.getTrustAnchors()) {
++ if (ta.getTrustedCert().equals(certs.get(cpLen))) {
++ break out;
++ }
++ }
++ }
++ if (cpLen > 0) {
++ CertPath cp = certificateFactory.generateCertPath(
++ (cpLen == certs.size())? certs: certs.subList(0, cpLen));
++ validator.validate(cp, pkixParameters);
++ }
++ }
++
+ char[] getPass(String prompt)
+ {
+ System.err.print(prompt);
+--- ./jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java Mon Jan 05 11:57:27 2015 -0800
+@@ -156,12 +156,18 @@
+ }
+ if (isLongForm(lenByte)) {
+ lenByte &= LEN_MASK;
+- if (lenByte > 4)
++ if (lenByte > 4) {
+ throw new IOException("Too much data");
+- if ((dataSize - dataPos) < (lenByte + 1))
++ }
++ if ((dataSize - dataPos) < (lenByte + 1)) {
+ throw new IOException("Too little data");
+- for (int i = 0; i < lenByte; i++)
++ }
++ for (int i = 0; i < lenByte; i++) {
+ curLen = (curLen << 8) + (data[dataPos++] & 0xff);
++ }
++ if (curLen < 0) {
++ throw new IOException("Invalid length bytes");
++ }
+ } else {
+ curLen = (lenByte & LEN_MASK);
+ }
+@@ -188,10 +194,15 @@
+ }
+ if (isLongForm(lenByte)) {
+ lenByte &= LEN_MASK;
+- for (int i = 0; i < lenByte; i++)
++ for (int i = 0; i < lenByte; i++) {
+ curLen = (curLen << 8) + (data[dataPos++] & 0xff);
+- } else
++ }
++ if (curLen < 0) {
++ throw new IOException("Invalid length bytes");
++ }
++ } else {
+ curLen = (lenByte & LEN_MASK);
++ }
+ writeLength(curLen);
+ writeValue(curLen);
+ }
+--- ./jdk/src/share/classes/sun/security/util/DerInputStream.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/util/DerInputStream.java Mon Jan 05 11:57:27 2015 -0800
+@@ -566,6 +566,10 @@
+ value <<= 8;
+ value += 0x0ff & in.read();
+ }
++ if (value < 0) {
++ throw new IOException("DerInputStream.getLength(): "
++ + "Invalid length bytes");
++ }
+ }
+ return value;
+ }
+--- ./jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Mon Jan 05 11:57:27 2015 -0800
+@@ -39,6 +39,7 @@
+ import sun.misc.BASE64Decoder;
+
+ import sun.security.jca.Providers;
++import sun.security.x509.AlgorithmId;
+
+ public class SignatureFileVerifier {
+
+@@ -613,7 +614,8 @@
+ throws NoSuchAlgorithmException, SignatureException {
+
+ MessageDigest md =
+- MessageDigest.getInstance(token.getHashAlgorithm().getName());
++ MessageDigest.getInstance(AlgorithmId.getStandardDigestName(
++ token.getHashAlgorithm().getName()));
+
+ if (!Arrays.equals(token.getHashedMessage(), md.digest(signature))) {
+ throw new SignatureException("Signature timestamp (#" +
+--- ./jdk/src/share/classes/sun/security/x509/AlgorithmId.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/x509/AlgorithmId.java Mon Jan 05 11:57:27 2015 -0800
+@@ -940,4 +940,21 @@
+ }
+ return null;
+ }
++
++ // Copied from com.sun.crypto.provider.OAEPParameters.convertToStandardName()
++ public static String getStandardDigestName(String internalName) {
++ if (internalName.equals("SHA")) {
++ return "SHA-1";
++ } else if (internalName.equals("SHA224")) {
++ return "SHA-224";
++ } else if (internalName.equals("SHA256")) {
++ return "SHA-256";
++ } else if (internalName.equals("SHA384")) {
++ return "SHA-384";
++ } else if (internalName.equals("SHA512")) {
++ return "SHA-512";
++ } else {
++ return internalName;
++ }
++ }
+ }
+--- ./jdk/src/share/classes/sun/security/x509/CertAndKeyGen.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/security/x509/CertAndKeyGen.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2009, 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
+@@ -156,9 +156,11 @@
+
+ // publicKey's format must be X.509 otherwise
+ // the whole CertGen part of this class is broken.
+- if (!"X.509".equalsIgnoreCase(publicKey.getFormat())) {
+- throw new IllegalArgumentException("publicKey's is not X.509, but "
+- + publicKey.getFormat());
++ // Allow "X509" in 7u for backwards compatibility.
++ if (!"X.509".equalsIgnoreCase(publicKey.getFormat()) &&
++ !"X509".equalsIgnoreCase(publicKey.getFormat())) {
++ throw new IllegalArgumentException("Public key format is " +
++ publicKey.getFormat() + ", must be X.509");
+ }
+ }
+
+--- ./jdk/src/share/classes/sun/swing/FilePane.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/swing/FilePane.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1979,6 +1979,7 @@
+ return false;
+ }
+
++ try {
+ if (f instanceof ShellFolder) {
+ return ((ShellFolder) f).isFileSystem();
+ } else {
+@@ -1994,6 +1995,9 @@
+ return true;
+ }
+ }
++ } catch (SecurityException e) {
++ return false;
++ }
+ }
+
+ /**
+--- ./jdk/src/share/classes/sun/swing/SwingUtilities2.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/swing/SwingUtilities2.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -80,6 +80,9 @@
+ public static final Object LAF_STATE_KEY =
+ new StringBuffer("LookAndFeel State");
+
++ public static final Object MENU_SELECTION_MANAGER_LISTENER_KEY =
++ new StringBuffer("MenuSelectionManager listener key");
++
+ // Maintain a cache of CACHE_SIZE fonts and the left side bearing
+ // of the characters falling into the range MIN_CHAR_INDEX to
+ // MAX_CHAR_INDEX. The values in fontCache are created as needed.
+--- ./jdk/src/share/classes/sun/swing/WindowsPlacesBar.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/swing/WindowsPlacesBar.java Mon Jan 05 11:57:27 2015 -0800
+@@ -81,11 +81,7 @@
+ setBackground(bgColor);
+ FileSystemView fsv = fc.getFileSystemView();
+
+- files = AccessController.doPrivileged(new PrivilegedAction<File[]>() {
+- public File[] run() {
+- return (File[]) ShellFolder.get("fileChooserShortcutPanelFolders");
+- }
+- });
++ files = (File[]) ShellFolder.get("fileChooserShortcutPanelFolders");
+
+ buttons = new JToggleButton[files.length];
+ buttonGroup = new ButtonGroup();
+--- ./jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -771,16 +771,9 @@
+ fireIntervalRemoved(this, 0, oldSize);
+ }
+
+- File[] baseFolders;
+- if (useShellFolder) {
+- baseFolders = AccessController.doPrivileged(new PrivilegedAction<File[]>() {
+- public File[] run() {
+- return (File[]) ShellFolder.get("fileChooserComboBoxFolders");
+- }
+- });
+- } else {
+- baseFolders = fsv.getRoots();
+- }
++ File[] baseFolders = (useShellFolder)
++ ? (File[]) ShellFolder.get("fileChooserComboBoxFolders")
++ : fsv.getRoots();
+ directories.addAll(Arrays.asList(baseFolders));
+
+ // Get the canonical (full) path. This has the side
+--- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Mon Jan 05 11:57:27 2015 -0800
+@@ -103,7 +103,7 @@
+ HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM\u30D0\u30FC\u30B8\u30E7\u30F3:<br>{0}
+ HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62
+ HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsole\u306B\u3064\u3044\u3066
+-HELP_ABOUT_DIALOG_TITLE=JConsole: \u8A73\u7D30
++HELP_ABOUT_DIALOG_TITLE=JConsole: \u60C5\u5831
+ HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U):<br>{0}
+ HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html
+ HELP_MENU_ABOUT_TITLE=JConsole\u306B\u3064\u3044\u3066(&A)
+--- ./jdk/src/share/classes/sun/util/resources/CurrencyNames.properties Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/CurrencyNames.properties Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -26,7 +26,7 @@
+ #
+ # COPYRIGHT AND PERMISSION NOTICE
+ #
+-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
++# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
+ # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining
+@@ -226,6 +226,7 @@
+ SOS=SOS
+ SRD=SRD
+ SRG=SRG
++SSP=SSP
+ STD=STD
+ SVC=SVC
+ SYP=SYP
+@@ -277,6 +278,7 @@
+ YUM=YUM
+ ZAR=ZAR
+ ZMK=ZMK
++ZMW=ZMW
+ ZWD=ZWD
+ ZWL=ZWL
+ ZWN=ZWN
+@@ -443,6 +445,7 @@
+ sos=Somali Shilling
+ srd=Surinamese Dollar
+ srg=Surinamese Guilder
++ssp=South Sudanese Pound
+ std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
+ svc=Salvadoran Col\u00f3n
+ syp=Syrian Pound
+@@ -486,7 +489,9 @@
+ xpd=Palladium
+ xpf=CFP Franc
+ xpt=Platinum
++xsu=Sucre
+ xts=Testing Currency Code
++xua=ADB Unit of Account
+ xxx=Unknown Currency
+ yer=Yemeni Rial
+ yum=Yugoslavian New Dinar (1994-2002)
+--- ./jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties Mon Jan 05 11:57:27 2015 -0800
+@@ -35,4 +35,4 @@
+ # This notice and attribution to Taligent may not be removed.
+ # Taligent is a registered trademark of Taligent, Inc.
+
+-PEN=S/
++PEN=S/.
+--- ./jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties Mon Jan 05 11:57:27 2015 -0800
+@@ -35,4 +35,5 @@
+ # This notice and attribution to Taligent may not be removed.
+ # Taligent is a registered trademark of Taligent, Inc.
+
++EUR=\u20AC
+ LTL=Lt
+--- ./jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties Mon Jan 05 11:57:27 2015 -0800
+@@ -35,4 +35,5 @@
+ # This notice and attribution to Taligent may not be removed.
+ # Taligent is a registered trademark of Taligent, Inc.
+
++EUR=\u20AC
+ LVL=Ls
+--- ./jdk/src/share/classes/sun/util/resources/LocaleNames.properties Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/LocaleNames.properties Mon Jan 05 11:57:27 2015 -0800
+@@ -1077,6 +1077,7 @@
+ SN=Senegal
+ SO=Somalia
+ SR=Suriname
++SS=South Sudan
+ ST=Sao Tome And Principe
+ SV=El Salvador
+ SX=Sint Maarten (Dutch part)
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre Time", "ACT",
+ "Acre Summer Time", "ACST"};
+- String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST",
+- "Central Summer Time (South Australia)", "CST"};
++ String ADELAIDE[] = new String[] {"Australian Central Standard Time (South Australia)", "ACST",
++ "Australian Central Daylight Time (South Australia)", "ACDT"};
+ String AGT[] = new String[] {"Argentine Time", "ART",
+ "Argentine Summer Time", "ARST"};
+ String AKST[] = new String[] {"Alaska Standard Time", "AKST",
+@@ -61,10 +61,10 @@
+ "Atlantic Daylight Time", "ADT"};
+ String BDT[] = new String[] {"Bangladesh Time", "BDT",
+ "Bangladesh Summer Time", "BDST"};
+- String BRISBANE[] = new String[] {"Eastern Standard Time (Queensland)", "EST",
+- "Eastern Summer Time (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Central Standard Time (South Australia/New South Wales)", "CST",
+- "Central Summer Time (South Australia/New South Wales)", "CST"};
++ String BRISBANE[] = new String[] {"Australian Eastern Standard Time (Queensland)", "AEST",
++ "Australian Eastern Daylight Time (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Australian Central Standard Time (South Australia/New South Wales)", "ACST",
++ "Australian Central Daylight Time (South Australia/New South Wales)", "ACDT"};
+ String BRT[] = new String[] {"Brasilia Time", "BRT",
+ "Brasilia Summer Time", "BRST"};
+ String BTT[] = new String[] {"Bhutan Time", "BTT",
+@@ -89,8 +89,8 @@
+ "China Daylight Time", "CDT"};
+ String CUBA[] = new String[] {"Cuba Standard Time", "CST",
+ "Cuba Daylight Time", "CDT"};
+- String DARWIN[] = new String[] {"Central Standard Time (Northern Territory)", "CST",
+- "Central Summer Time (Northern Territory)", "CST"};
++ String DARWIN[] = new String[] {"Australian Central Standard Time (Northern Territory)", "ACST",
++ "Australian Central Daylight Time (Northern Territory)", "ACDT"};
+ String DUBLIN[] = new String[] {"Greenwich Mean Time", "GMT",
+ "Irish Summer Time", "IST"};
+ String EAT[] = new String[] {"Eastern African Time", "EAT",
+@@ -103,8 +103,8 @@
+ "Eastern Greenland Summer Time", "EGST"};
+ String EST[] = new String[] {"Eastern Standard Time", "EST",
+ "Eastern Daylight Time", "EDT"};
+- String EST_NSW[] = new String[] {"Eastern Standard Time (New South Wales)", "EST",
+- "Eastern Summer Time (New South Wales)", "EST"};
++ String EST_NSW[] = new String[] {"Australian Eastern Standard Time (New South Wales)", "AEST",
++ "Australian Eastern Daylight Time (New South Wales)", "AEDT"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
+ String GHMT[] = new String[] {"Ghana Mean Time", "GMT",
+@@ -133,10 +133,12 @@
+ "India Daylight Time", "IDT"};
+ String JST[] = new String[] {"Japan Standard Time", "JST",
+ "Japan Daylight Time", "JDT"};
++ String KRAT[] = new String[] {"Krasnoyarsk Time", "KRAT",
++ "Krasnoyarsk Summer Time", "KRAST"};
+ String KST[] = new String[] {"Korea Standard Time", "KST",
+ "Korea Daylight Time", "KDT"};
+ String LORD_HOWE[] = new String[] {"Lord Howe Standard Time", "LHST",
+- "Lord Howe Summer Time", "LHST"};
++ "Lord Howe Daylight Time", "LHDT"};
+ String MHT[] = new String[] {"Marshall Islands Time", "MHT",
+ "Marshall Islands Summer Time", "MHST"};
+ String MSK[] = new String[] {"Moscow Standard Time", "MSK",
+@@ -167,14 +169,14 @@
+ "Samoa Daylight Time", "SDT"};
+ String SAST[] = new String[] {"South Africa Standard Time", "SAST",
+ "South Africa Summer Time", "SAST"};
++ String IRKT[] = new String[] {"Irkutsk Time", "IRKT",
++ "Irkutsk Summer Time", "IRKST"};
+ String SBT[] = new String[] {"Solomon Is. Time", "SBT",
+ "Solomon Is. Summer Time", "SBST"};
+ String SGT[] = new String[] {"Singapore Time", "SGT",
+ "Singapore Summer Time", "SGST"};
+- String SLST[] = new String[] {"Greenwich Mean Time", "GMT",
+- "Sierra Leone Summer Time", "SLST"};
+- String TASMANIA[] = new String[] {"Eastern Standard Time (Tasmania)", "EST",
+- "Eastern Summer Time (Tasmania)", "EST"};
++ String TASMANIA[] = new String[] {"Australian Eastern Standard Time (Tasmania)", "AEST",
++ "Australian Eastern Daylight Time (Tasmania)", "AEDT"};
+ String TMT[] = new String[] {"Turkmenistan Time", "TMT",
+ "Turkmenistan Summer Time", "TMST"};
+ String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT",
+@@ -183,22 +185,22 @@
+ "Coordinated Universal Time", "UTC"};
+ String UZT[] = new String[] {"Uzbekistan Time", "UZT",
+ "Uzbekistan Summer Time", "UZST"};
+- String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST",
+- "Eastern Summer Time (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"Australian Eastern Standard Time (Victoria)", "AEST",
++ "Australian Eastern Daylight Time (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Vladivostok Time", "VLAT",
+ "Vladivostok Summer Time", "VLAST"};
+- String WART[] = new String[] {"Western Argentine Time", "WART",
+- "Western Argentine Summer Time", "WARST"};
+ String WAT[] = new String[] {"Western African Time", "WAT",
+ "Western African Summer Time", "WAST"};
+ String WET[] = new String[] {"Western European Time", "WET",
+ "Western European Summer Time", "WEST"};
+ String WIT[] = new String[] {"West Indonesia Time", "WIB",
+ "West Indonesia Summer Time", "WIST"};
+- String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST",
+- "Western Summer Time (Australia)", "WST"};
+- String WST_SAMOA[] = new String[] {"West Samoa Time", "WST",
++ String WST_AUS[] = new String[] {"Australian Western Standard Time", "AWST",
++ "Australian Western Daylight Time", "AWDT"};
++ String WST_SAMOA[] = new String[] {"West Samoa Standard Time", "WSST",
+ "West Samoa Daylight Time", "WSDT"};
++ String XJT[] = new String[] {"Xinjiang Standard Time", "XJT",
++ "Xinjiang Daylight Time", "XJDT"};
+ String YAKT[] = new String[] {"Yakutsk Time", "YAKT",
+ "Yakutsk Summer Time", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"Western Greenland Time", "WGT",
+ "Western Greenland Summer Time", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST",
+ "Pierre & Miquelon Daylight Time", "PMDT"}},
+@@ -466,8 +467,8 @@
+ "Davis Summer Time", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Time", "DDUT",
+ "Dumont-d'Urville Summer Time", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"Macquarie Island Standard Time", "MIST",
++ "Macquarie Island Daylight Time", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"Mawson Time", "MAWT",
+ "Mawson Summer Time", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Brunei Time", "BNT",
+ "Brunei Summer Time", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Choibalsan Time", "CHOT",
+ "Choibalsan Summer Time", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"Hovd Time", "HOVT",
+ "Hovd Summer Time", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Irkutsk Time", "IRKT",
+- "Irkutsk Summer Time", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"Petropavlovsk-Kamchatski Time", "PETT",
+ "Petropavlovsk-Kamchatski Summer Time", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
+ "Khandyga Summer Time", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT",
+- "Krasnoyarsk Summer Time", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "Philippines Summer Time", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral Time", "ORAT",
+ "Oral Summer Time", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
+ "Ust-Nera Summer Time", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
+- "Central Western Summer Time (Australia)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Australian Central Western Standard Time", "ACWST",
++ "Australian Central Western Daylight Time", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Volgograd Time", "VOLT",
+- "Volgograd Summer Time", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre Normalzeit", "ACT",
+ "Acre Sommerzeit", "ACST"};
+- String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST",
+- "Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"};
++ String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "ACST",
++ "Zentrale Sommerzeit (S\u00FCdaustralien)", "ACDT"};
+ String AGT[] = new String[] {"Argentinische Zeit", "ART",
+ "Argentinische Sommerzeit", "ARST"};
+ String AKST[] = new String[] {"Alaska Normalzeit", "AKST",
+@@ -61,10 +61,10 @@
+ "Atlantik Sommerzeit", "ADT"};
+ String BDT[] = new String[] {"Bangladesch Zeit", "BDT",
+ "Bangladesch Sommerzeit", "BDST"};
+- String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "EST",
+- "\u00D6stliche Sommerzeit (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "CST",
+- "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "CST"};
++ String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "AEST",
++ "\u00D6stliche Sommerzeit (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "ACST",
++ "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "ACDT"};
+ String BRT[] = new String[] {"Brasilianische Zeit", "BRT",
+ "Brasilianische Sommerzeit", "BRST"};
+ String BTT[] = new String[] {"Bhutanische Zeit", "BTT",
+@@ -89,8 +89,8 @@
+ "Chinesische Sommerzeit", "CDT"};
+ String CUBA[] = new String[] {"Kubanische Normalzeit", "CST",
+ "Kubanische Sommerzeit", "CDT"};
+- String DARWIN[] = new String[] {"Central Normalzeit (Northern Territory)", "CST",
+- "Zentrale Sommerzeit (Northern Territory)", "CST"};
++ String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "ACST",
++ "Zentrale Sommerzeit (Northern Territory)", "ACDT"};
+ String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT",
+ "Irische Sommerzeit", "IST"};
+ String EAT[] = new String[] {"Ostafrikanische Zeit", "EAT",
+@@ -103,8 +103,8 @@
+ "Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST"};
+ String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST",
+ "\u00d6stliche Sommerzeit", "EDT"};
+- String EST_NSW[] = new String[] {"Eastern Normalzeit (Neus\u00FCdwales)", "EST",
+- "\u00D6stliche Sommerzeit (New South Wales)", "EST"};
++ String EST_NSW[] = new String[] {"\u00D6stliche Normalzeit (New South Wales)", "AEST",
++ "\u00D6stliche Sommerzeit (New South Wales)", "AEDT"};
+ String FET[] = new String[] {"Kaliningrader Zeit", "FET",
+ "Kaliningrader Sommerzeit", "FEST"};
+ String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT",
+@@ -133,10 +133,12 @@
+ "Indische Sommerzeit", "IDT"};
+ String JST[] = new String[] {"Japanische Normalzeit", "JST",
+ "Japanische Sommerzeit", "JDT"};
++ String KRAT[] = new String[] {"Krasnojarsker Zeit", "KRAT",
++ "Krasnojarsker Sommerzeit", "KRAST"};
+ String KST[] = new String[] {"Koreanische Normalzeit", "KST",
+ "Koreanische Sommerzeit", "KDT"};
+ String LORD_HOWE[] = new String[] {"Lord Howe Normalzeit", "LHST",
+- "Lord Howe Sommerzeit", "LHST"};
++ "Lord Howe Sommerzeit", "LHDT"};
+ String MHT[] = new String[] {"Marshallinseln Zeit", "MHT",
+ "Marshallinseln Sommerzeit", "MHST"};
+ String MSK[] = new String[] {"Moskauer Normalzeit", "MSK",
+@@ -165,16 +167,16 @@
+ "Pazifische Sommerzeit", "PDT"};
+ String SAMOA[] = new String[] {"Samoa Normalzeit", "SST",
+ "Samoa Sommerzeit", "SDT"};
++ String IRKT[] = new String[] {"Irkutsk Zeit", "IRKT",
++ "Irkutsk Sommerzeit", "IRKST"};
+ String SAST[] = new String[] {"S\u00fcdafrikanische Normalzeit", "SAST",
+ "S\u00fcdafrikanische Sommerzeit", "SAST"};
+ String SBT[] = new String[] {"Salomoninseln Zeit", "SBT",
+ "Salomoninseln Sommerzeit", "SBST"};
+ String SGT[] = new String[] {"Singapur Zeit", "SGT",
+ "Singapur Sommerzeit", "SGST"};
+- String SLST[] = new String[] {"Greenwich Normalzeit", "GMT",
+- "Sierra Leone Sommerzeit", "SLST"};
+- String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "EST",
+- "\u00D6stliche Sommerzeit (Tasmanien)", "EST"};
++ String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "AEST",
++ "\u00D6stliche Sommerzeit (Tasmanien)", "AEDT"};
+ String TMT[] = new String[] {"Turkmenische Zeit", "TMT",
+ "Turkmenische Sommerzeit", "TMST"};
+ String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT",
+@@ -183,22 +185,22 @@
+ "Koordinierte Universalzeit", "UTC"};
+ String UZT[] = new String[] {"Usbekistan Zeit", "UZT",
+ "Usbekistan Sommerzeit", "UZST"};
+- String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "EST",
+- "\u00D6stliche Sommerzeit (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "AEST",
++ "\u00D6stliche Sommerzeit (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Wladiwostok Zeit", "VLAT",
+ "Wladiwostok Sommerzeit", "VLAST"};
+- String WART[] = new String[] {"Westargentinische Zeit", "WART",
+- "Westargentinische Sommerzeit", "WARST"};
+ String WAT[] = new String[] {"Westafrikanische Zeit", "WAT",
+ "Westafrikanische Sommerzeit", "WAST"};
+ String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ",
+ "Westeurop\u00e4ische Sommerzeit", "WESZ"};
+ String WIT[] = new String[] {"Westindonesische Zeit", "WIB",
+ "Westindonesische Sommerzeit", "WIST"};
+- String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST",
+- "Westliche Sommerzeit (Australien)", "WST"};
+- String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WST",
++ String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "AWST",
++ "Westliche Sommerzeit (Australien)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WSST",
+ "West Samoa Sommerzeit", "WSDT"};
++ String XJT[] = new String[] {"Chinesische Normalzeit", "XJT",
++ "Chinesische Sommerzeit", "XJDT"};
+ String YAKT[] = new String[] {"Jakutsk Zeit", "YAKT",
+ "Jakutsk Sommerzeit", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"Westgr\u00f6nl\u00e4ndische Zeit", "WGT",
+ "Westgr\u00f6nl\u00e4ndische Sommerzeit", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Normalzeit", "MeST",
+- "Metlakatla Sommerzeit", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST",
+ "Pierre & Miquelon Sommerzeit", "PMDT"}},
+@@ -467,7 +468,7 @@
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Zeit", "DDUT",
+ "Dumont-d'Urville Sommerzeit", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"Macquarieinsel Zeit", "MIST",
+- "Macquarieinsel Sommerzeit", "MIST"}},
++ "Macquarieinsel Sommerzeit", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT",
+ "Mawson Sommerzeit", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Brunei Zeit", "BNT",
+ "Brunei Sommerzeit", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Choibalsan Zeit", "CHOT",
+ "Choibalsan Sommerzeit", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"Hovd Zeit", "HOVT",
+ "Hovd Sommerzeit", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Irkutsk Zeit", "IRKT",
+- "Irkutsk Sommerzeit", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"Petropawlowsk-Kamtschatkische Zeit", "PETT",
+ "Petropawlowsk-Kamtschatkische Sommerzeit", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT",
+ "Chandyga Sommerzeit", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT",
+- "Krasnojarsker Sommerzeit", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "Philippinische Sommerzeit", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral Zeit", "ORAT",
+ "Oral Sommerzeit", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT",
+ "Ust-Nera Sommerzeit", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "CWST",
+- "Zentral-Westliche Sommerzeit (Australien)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "ACWST",
++ "Zentral-Westliche Sommerzeit (Australien)", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Wolgograder Zeit", "VOLT",
+- "Wolgograder Sommerzeit", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Hora de Acre", "ACT",
+ "Hora de verano de Acre", "ACST"};
+- String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST",
+- "Hora de verano Central (Sur de Australia)", "CST"};
++ String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "ACST",
++ "Hora de verano Central (Sur de Australia)", "ACDT"};
+ String AGT[] = new String[] {"Hora de Argentina", "ART",
+ "Hora de verano de Argentina", "ARST"};
+ String AKST[] = new String[] {"Hora est\u00e1ndar de Alaska", "AKST",
+@@ -61,10 +61,10 @@
+ "Hora de verano Atl\u00e1ntico", "ADT"};
+ String BDT[] = new String[] {"Hora de Bangladesh", "BDT",
+ "Hora de verano de Bangladesh", "BDST"};
+- String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "EST",
+- "Hora est\u00E1ndar de verano del Este (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
+- "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST"};
++ String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "AEST",
++ "Hora est\u00E1ndar de verano del Este (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "ACST",
++ "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "ACDT"};
+ String BRT[] = new String[] {"Hora de Brasil", "BRT",
+ "Hora de verano de Brasil", "BRST"};
+ String BTT[] = new String[] {"Hora de But\u00e1n", "BTT",
+@@ -77,8 +77,8 @@
+ "Hora de verano de Chatham", "CHADT"};
+ String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST",
+ "Hora de verano de Chamorro", "ChDT"};
+- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
+- "Chuuk Summer Time", "CHUST"};
++ String CHUT[] = new String[] {"Hora de Chuuk", "CHUT",
++ "Hora de verano de Chuuk", "CHUST"};
+ String CIT[] = new String[] {"Hora de Indonesia Central", "WITA",
+ "Hora de verano de Indonesia Central", "CIST"};
+ String CLT[] = new String[] {"Hora de Chile", "CLT",
+@@ -89,8 +89,8 @@
+ "Hora de verano de China", "CDT"};
+ String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST",
+ "Hora de verano de Cuba", "CDT"};
+- String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "CST",
+- "Hora de verano Central (territorio del Norte)", "CST"};
++ String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "ACST",
++ "Hora de verano Central (territorio del Norte)", "ACDT"};
+ String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
+ "Hora de verano de Irlanda", "IST"};
+ String EAT[] = new String[] {"Hora de \u00c1frica Oriental", "EAT",
+@@ -103,8 +103,8 @@
+ "Hora de verano de Groenlandia Oriental", "EGST"};
+ String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST",
+ "Hora de verano Oriental", "EDT"};
+- String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "EST",
+- "Hora de verano Oriental (Nueva Gales del Sur)", "EST"};
++ String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "AEST",
++ "Hora de verano Oriental (Nueva Gales del Sur)", "AEDT"};
+ String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET",
+ "Hora de verano de Europa m\u00E1s Oriental", "FEST"};
+ String GHMT[] = new String[] {"Hora central de Ghana", "GMT",
+@@ -133,10 +133,12 @@
+ "Hora de verano de India", "IDT"};
+ String JST[] = new String[] {"Hora est\u00e1ndar de Jap\u00f3n", "JST",
+ "Hora de verano de Jap\u00f3n", "JDT"};
++ String KRAT[] = new String[] {"Hora de Krasnoyarsk", "KRAT",
++ "Hora de verano de Krasnoyarsk", "KRAST"};
+ String KST[] = new String[] {"Hora est\u00e1ndar de Corea", "KST",
+ "Hora de verano de Corea", "KDT"};
+ String LORD_HOWE[] = new String[] {"Hora est\u00e1ndar de Lord Howe", "LHST",
+- "Hora de verano de Lord Howe", "LHST"};
++ "Hora de verano de Lord Howe", "LHDT"};
+ String MHT[] = new String[] {"Hora de las Islas Marshall", "MHT",
+ "Hora de verano de las Islas Marshall", "MHST"};
+ String MSK[] = new String[] {"Hora est\u00e1ndar de Mosc\u00fa", "MSK",
+@@ -159,22 +161,22 @@
+ "Hora de verano de Pitcairn", "PDT"};
+ String PKT[] = new String[] {"Hora de Pakist\u00e1n", "PKT",
+ "Hora de verano de Pakist\u00e1n", "PKST"};
+- String PONT[] = new String[] {"Pohnpei Time", "PONT",
+- "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"Hora de Pohnpei", "PONT",
++ "Hora de verano de Pohnpei", "PONST"};
+ String PST[] = new String[] {"Hora est\u00e1ndar del Pac\u00edfico", "PST",
+ "Hora de verano del Pac\u00edfico", "PDT"};
+ String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST",
+ "Hora de verano de Samoa", "SDT"};
++ String IRKT[] = new String[] {"Hora de Irkutsk", "IRKT",
++ "Hora de verano de Irkutsk", "IRKST"};
+ String SAST[] = new String[] {"Hora est\u00e1ndar de Sud\u00e1frica", "SAST",
+ "Hora de verano de Sud\u00e1frica", "SAST"};
+ String SBT[] = new String[] {"Hora de las Islas Solomon", "SBT",
+ "Hora de verano de las Islas Solomon", "SBST"};
+ String SGT[] = new String[] {"Hora de Singapur", "SGT",
+ "Hora de verano de Singapur", "SGST"};
+- String SLST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
+- "Hora de verano de Sierra Leona", "SLST"};
+- String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "EST",
+- "Hora de verano del Este (Tasmania)", "EST"};
++ String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "AEST",
++ "Hora de verano del Este (Tasmania)", "AEDT"};
+ String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT",
+ "Hora de verano de Turkmenist\u00e1n", "TMST"};
+ String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT",
+@@ -183,22 +185,22 @@
+ "Hora Universal Coordinada", "UTC"};
+ String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT",
+ "Hora de verano de Uzbekist\u00e1n", "UZST"};
+- String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "EST",
+- "Hora de verano del Este (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "AEST",
++ "Hora de verano del Este (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Hora de Vladivostok", "VLAT",
+ "Hora de verano de Vladivostok", "VLAST"};
+- String WART[] = new String[] {"Hora de Argentina Occidental", "WART",
+- "Hora de verano de Argentina Occidental", "WARST"};
+ String WAT[] = new String[] {"Hora de \u00c1frica Occidental", "WAT",
+ "Hora de verano de \u00c1frica Occidental", "WAST"};
+ String WET[] = new String[] {"Hora de Europa Occidental", "WET",
+ "Hora de verano de Europa Occidental", "WEST"};
+ String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIB",
+ "Indonesia Hora de verano de Indonesia Occidental", "WIST"};
+- String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "WST",
+- "Hora de verano Occidental (Australia)", "WST"};
+- String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST",
++ String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "AWST",
++ "Hora de verano Occidental (Australia)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WSST",
+ "Hora de verano de Samoa Occidental", "WSDT"};
++ String XJT[] = new String[] {"Hora est\u00e1ndar de China", "XJT",
++ "Hora de verano de China", "XJDT"};
+ String YAKT[] = new String[] {"Hora de Yakutsk", "YAKT",
+ "Hora de verano de Yakutsk", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"Hora de Groenlandia Occidental", "WGT",
+ "Hora de verano de Groenlandia Occidental", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
+- "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST",
+ "Hora de verano de Pierre & Miquelon", "PMDT"}},
+@@ -466,8 +467,8 @@
+ "Hora de verano de Davis", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Hora de Dumont-d'Urville", "DDUT",
+ "Hora de verano de Dumont-d'Urville", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"Hora de Isla Macquarie", "MIST",
++ "Hora de verano de Isla Macquarie", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"Hora de Mawson", "MAWT",
+ "Hora de verano de Mawson", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Hora de Brunei", "BNT",
+ "Hora de verano de Brunei", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Hora de Choibalsan", "CHOT",
+ "Hora de verano de Choibalsan", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"Hora de Hovd", "HOVT",
+ "Hora de verano de Hovd", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Hora de Irkutsk", "IRKT",
+- "Hora de verano de Irkutsk", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"Hora de Petropavlovsk-Kamchatski", "PETT",
+ "Hora de verano de Petropavlovsk-Kamchatski", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT",
+ "Hora de verano de Khandyga", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT",
+- "Hora de verano de Krasnoyarsk", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "Hora de verano de Filipinas", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Hora de Uralsk", "ORAT",
+ "Hora de verano de Uralsk", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT",
+ "Hora de verano de Ust-Nera", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "CWST",
+- "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST"}},
++ {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "ACWST",
++ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Hora de Volgogrado", "VOLT",
+- "Hora de verano de Volgogrado", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Heure de l'Acre", "ACT",
+ "Heure d'\u00e9t\u00e9 de l'Acre", "ACST"};
+- String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST",
+- "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST"};
++ String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "ACST",
++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "ACDT"};
+ String AGT[] = new String[] {"Heure D'Argentine", "ART",
+ "Heure d'\u00e9t\u00e9 D'Argentine", "ARST"};
+ String AKST[] = new String[] {"Heure normale d'Alaska", "AKST",
+@@ -61,10 +61,10 @@
+ "Heure avanc\u00e9e de l'Atlantique", "ADT"};
+ String BDT[] = new String[] {"Heure du Bangladesh", "BDT",
+ "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"};
+- String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "EST",
+- "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST",
+- "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST"};
++ String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "AEST",
++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "ACST",
++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "ACDT"};
+ String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT",
+ "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST"};
+ String BTT[] = new String[] {"Heure du Bhoutan", "BTT",
+@@ -89,8 +89,8 @@
+ "Heure avanc\u00e9e de Chine", "CDT"};
+ String CUBA[] = new String[] {"Heure standard de Cuba", "CST",
+ "Heure d'\u00e9t\u00e9 de Cuba", "CDT"};
+- String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST",
+- "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "CST"};
++ String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "ACST",
++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "ACDT"};
+ String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
+ "Heure d'\u00e9t\u00e9 irlandaise", "IST"};
+ String EAT[] = new String[] {"Heure d'Afrique de l'Est", "EAT",
+@@ -103,8 +103,8 @@
+ "Heure d'\u00e9t\u00e9 du Groenland de l'Est", "EGST"};
+ String EST[] = new String[] {"Heure normale de l'Est", "EST",
+ "Heure avanc\u00e9e de l'Est", "EDT"};
+- String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST",
+- "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "EST"};
++ String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "AEST",
++ "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "AEDT"};
+ String FET[] = new String[] {"Heure d'Europe de l'Est UTC+3", "FET",
+ "Heure d'\u00E9t\u00E9 d'Europe de l'Est UTC+3", "FEST"};
+ String GHMT[] = new String[] {"Heure du Ghana", "GMT",
+@@ -133,10 +133,12 @@
+ "Heure avanc\u00e9e d'Inde", "IDT"};
+ String JST[] = new String[] {"Heure normale du Japon", "JST",
+ "Heure avanc\u00e9e du Japon", "JDT"};
++ String KRAT[] = new String[] {"Heure de Krasno\u00efarsk", "KRAT",
++ "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"};
+ String KST[] = new String[] {"Heure normale de Cor\u00e9e", "KST",
+ "Heure avanc\u00e9e de Cor\u00e9e", "KDT"};
+ String LORD_HOWE[] = new String[] {"Heure standard de Lord Howe", "LHST",
+- "Heure d'\u00e9t\u00e9 de Lord Howe", "LHST"};
++ "Heure d'\u00e9t\u00e9 de Lord Howe", "LHDT"};
+ String MHT[] = new String[] {"Heure des Iles Marshall", "MHT",
+ "Heure d'\u00e9t\u00e9 des Iles Marshall", "MHST"};
+ String MSK[] = new String[] {"Heure standard de Moscou", "MSK",
+@@ -165,16 +167,16 @@
+ "Heure avanc\u00e9e du Pacifique", "PDT"};
+ String SAMOA[] = new String[] {"Heure standard de Samoa", "SST",
+ "Heure avanc\u00e9e de Samoa", "SDT"};
++ String IRKT[] = new String[] {"Heure d'Irkutsk", "IRKT",
++ "Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"};
+ String SAST[] = new String[] {"Heure normale d'Afrique du Sud", "SAST",
+ "Heure d'\u00e9t\u00e9 d'Afrique du Sud", "SAST"};
+ String SBT[] = new String[] {"Heure des \u00celes Salomon", "SBT",
+ "Heure d'\u00e9t\u00e9 des \u00celes Salomon", "SBST"};
+ String SGT[] = new String[] {"Heure de Singapour", "SGT",
+ "Heure d'\u00e9t\u00e9 de Singapour", "SGST"};
+- String SLST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
+- "Heure d'\u00e9t\u00e9 de Sierra Leone", "SLST"};
+- String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "EST",
+- "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "EST"};
++ String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "AEST",
++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "AEDT"};
+ String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT",
+ "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"};
+ String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT",
+@@ -183,22 +185,22 @@
+ "Temps universel coordonn\u00e9", "UTC"};
+ String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT",
+ "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"};
+- String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST",
+- "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "AEST",
++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Heure de Vladivostok", "VLAT",
+ "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"};
+- String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART",
+- "Heure d'\u00e9t\u00e9 D'Argentine de l'Ouest", "WARST"};
+ String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT",
+ "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"};
+ String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET",
+ "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"};
+ String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB",
+ "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"};
+- String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST",
+- "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "WST"};
+- String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST",
++ String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "AWST",
++ "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WSST",
+ "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"};
++ String XJT[] = new String[] {"Heure normale de Chine", "XJT",
++ "Heure avanc\u00e9e de Chine", "XJDT"};
+ String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT",
+ "Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"Heure du Groenland de l'Ouest", "WGT",
+ "Heure d'\u00e9t\u00e9 du Groenland de l'Ouest", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Heure normale de Metlakatla", "MeST",
+- "Heure avanc\u00E9e de Metlakatla", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST",
+ "Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT"}},
+@@ -467,7 +468,7 @@
+ {"Antarctica/DumontDUrville", new String[] {"Heure de Dumont-d'Urville", "DDUT",
+ "Heure d'\u00e9t\u00e9 de Dumont-d'Urville", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"Heure de l'Ile Macquarie", "MIST",
+- "Heure d'\u00E9t\u00E9 de l'Ile Macquarie", "MIST"}},
++ "Heure d'\u00E9t\u00E9 de l'Ile Macquarie", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT",
+ "Heure d'\u00e9t\u00e9 de Mawson", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Heure du Brunei", "BNT",
+ "Heure d'\u00e9t\u00e9 du Brunei", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Heure de Choibalsan", "CHOT",
+ "Heure d'\u00e9t\u00e9 de Choibalsan", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"Heure de Hovd", "HOVT",
+ "Heure d'\u00e9t\u00e9 de Hovd", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Heure d'Irkutsk", "IRKT",
+- "Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"Heure de Petropavlovsk-Kamchatski", "PETT",
+ "Heure d'\u00e9t\u00e9 de Petropavlovsk-Kamchatski", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT",
+ "Heure d'\u00E9t\u00E9 de Khandyga", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT",
+- "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "Heure d'\u00e9t\u00e9 des Philippines", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Heure d'Oral", "ORAT",
+ "Heure d'\u00e9t\u00e9 d'Oral", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT",
+ "Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST",
+- "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "ACWST",
++ "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Heure de Volgograd", "VOLT",
+- "Heure d'\u00e9t\u00e9 de Volgograd", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Ora di Acre", "ACT",
+ "Ora estiva di Acre", "ACST"};
+- String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "CST",
+- "Ora estiva centrale (Australia del Sud)", "CST"};
++ String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "ACST",
++ "Ora estiva centrale (Australia del Sud)", "ACDT"};
+ String AGT[] = new String[] {"Ora dell'Argentina", "ART",
+ "Ora estiva dell'Argentina", "ARST"};
+ String AKST[] = new String[] {"Ora solare dell'Alaska", "AKST",
+@@ -61,10 +61,10 @@
+ "Ora legale dell'Atlantico occidentale", "ADT"};
+ String BDT[] = new String[] {"Ora del Bangladesh", "BDT",
+ "Ora estiva del Bangladesh", "BDST"};
+- String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "EST",
+- "Ora estiva orientale (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "CST",
+- "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "CST"};
++ String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "AEST",
++ "Ora estiva orientale (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "ACST",
++ "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "ACDT"};
+ String BRT[] = new String[] {"Ora del Brasile", "BRT",
+ "Ora estiva del Brasile", "BRST"};
+ String BTT[] = new String[] {"Ora del Bhutan", "BTT",
+@@ -89,8 +89,8 @@
+ "Ora legale della Cina", "CDT"};
+ String CUBA[] = new String[] {"Ora solare Cuba", "CST",
+ "Ora legale Cuba", "CDT"};
+- String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "CST",
+- "Ora estiva centrale (Territori del Nord)", "CST"};
++ String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "ACST",
++ "Ora estiva centrale (Territori del Nord)", "ACDT"};
+ String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT",
+ "Ora estiva irlandese", "IST"};
+ String EAT[] = new String[] {"Ora dell'Africa orientale", "EAT",
+@@ -103,8 +103,8 @@
+ "Ora estiva della Groenlandia orientale", "EGST"};
+ String EST[] = new String[] {"Ora solare USA orientale", "EST",
+ "Ora legale USA orientale", "EDT"};
+- String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "EST",
+- "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"};
++ String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "AEST",
++ "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "AEDT"};
+ String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET",
+ "Ora estiva dei paesi europei pi\u00F9 orientali", "FEST"};
+ String GHMT[] = new String[] {"Ora media del Ghana", "GMT",
+@@ -133,10 +133,12 @@
+ "Ora legale dell'India", "IDT"};
+ String JST[] = new String[] {"Ora solare del Giappone", "JST",
+ "Ora legale del Giappone", "JDT"};
++ String KRAT[] = new String[] {"Ora di Krasnojarsk", "KRAT",
++ "Ora estiva di Krasnojarsk", "KRAST"};
+ String KST[] = new String[] {"Ora solare della Corea", "KST",
+ "Ora legale della Corea", "KDT"};
+ String LORD_HOWE[] = new String[] {"Ora standard di Lord Howe", "LHST",
+- "Ora estiva di Lord Howe", "LHST"};
++ "Ora estiva di Lord Howe", "LHDT"};
+ String MHT[] = new String[] {"Ora delle Isole Marshall", "MHT",
+ "Ora estiva delle Isole Marshall", "MHST"};
+ String MSK[] = new String[] {"Ora standard di Mosca", "MSK",
+@@ -165,16 +167,16 @@
+ "Ora legale della costa occidentale USA", "PDT"};
+ String SAMOA[] = new String[] {"Ora standard di Samoa", "SST",
+ "Ora legale di Samoa", "SDT"};
++ String IRKT[] = new String[] {"Ora di Irkutsk", "IRKT",
++ "Ora estiva di Irkutsk", "IRKST"};
+ String SAST[] = new String[] {"Ora solare del Sudafrica", "SAST",
+ "Ora estiva del Sudafrica", "SAST"};
+ String SBT[] = new String[] {"Ora delle Isole Salomone", "SBT",
+ "Ora estiva delle Isole Salomone", "SBST"};
+ String SGT[] = new String[] {"Ora di Singapore", "SGT",
+ "Ora estiva di Singapore", "SGST"};
+- String SLST[] = new String[] {"Ora media di Greenwich", "GMT",
+- "Ora legale della Sierra Leone", "SLST"};
+- String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "EST",
+- "Ora estiva orientale (Tasmania)", "EST"};
++ String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "AEST",
++ "Ora estiva orientale (Tasmania)", "AEDT"};
+ String TMT[] = new String[] {"Ora del Turkmenistan", "TMT",
+ "Ora estiva del Turkmenistan", "TMST"};
+ String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT",
+@@ -183,22 +185,22 @@
+ "Tempo universale coordinato", "UTC"};
+ String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT",
+ "Ora estiva dell'Uzbekistan", "UZST"};
+- String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "EST",
+- "Ora estiva orientale (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "AEST",
++ "Ora estiva orientale (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Ora di Vladivostok", "VLAT",
+ "Ora estiva di Vladivostok", "VLAST"};
+- String WART[] = new String[] {"Ora dell'Argentina occidentale", "WART",
+- "Ora estiva dell'Argentina occidentale", "WARST"};
+ String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT",
+ "Ora estiva dell'Africa occidentale", "WAST"};
+ String WET[] = new String[] {"Ora dell'Europa occidentale", "WET",
+ "Ora estiva dell'Europa occidentale", "WEST"};
+ String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIB",
+ "Ora estiva dell'Indonesia occidentale", "WIST"};
+- String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "WST",
+- "Ora estiva dell'Australia occidentale", "WST"};
+- String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST",
++ String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "AWST",
++ "Ora estiva dell'Australia occidentale", "AWDT"};
++ String WST_SAMOA[] = new String[] {"Ora di Samoa", "WSST",
+ "Ora estiva di Samoa", "WSDT"};
++ String XJT[] = new String[] {"Ora solare della Cina", "XJT",
++ "Ora legale della Cina", "XJDT"};
+ String YAKT[] = new String[] {"Ora di Jakutsk", "YAKT",
+ "Ora estiva di Jakutsk", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"Ora della Groenlandia occidentale", "WGT",
+ "Ora estiva della Groenlandia occidentale", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Ora standard di Metlakatla", "MeST",
+- "Ora legale di Metlakatla", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST",
+ "Ora legale di Saint-Pierre e Miquelon", "PMDT"}},
+@@ -467,7 +468,7 @@
+ {"Antarctica/DumontDUrville", new String[] {"Ora di Dumont-d'Urville", "DDUT",
+ "Ora estiva di Dumont-d'Urville", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"Ora dell'Isola Macquarie", "MIST",
+- "Ora estiva dell'Isola Macquarie", "MIST"}},
++ "Ora estiva dell'Isola Macquarie", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT",
+ "Ora estiva di Mawson", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Ora del Brunei", "BNT",
+ "Ora estiva del Brunei", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Ora di Choibalsan", "CHOT",
+ "Ora estiva di Choibalsan", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"Ora di Hovd", "HOVT",
+ "Ora estiva di Hovd", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Ora di Irkutsk", "IRKT",
+- "Ora estiva di Irkutsk", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"Ora di Petropavlovsk-Kamchatski", "PETT",
+ "Ora estiva di Petropavlovsk-Kamchatski", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT",
+ "Ora estiva di Khandyga", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT",
+- "Ora estiva di Krasnojarsk", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "Ora estiva delle Filippine", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Ora di Oral", "ORAT",
+ "Ora estiva di Oral", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT",
+ "Ora estiva di Ust-Nera", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "CWST",
+- "Ora estiva Australia centro-occidentale", "CWST"}},
++ {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "ACWST",
++ "Ora estiva Australia centro-occidentale", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Ora di Volgograd", "VOLT",
+- "Ora estiva di Volgograd", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT",
+ "\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST"};
+- String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST",
+- "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST"};
++ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACST",
++ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACDT"};
+ String AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART",
+ "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "ARST"};
+ String AKST[] = new String[] {"\u30a2\u30e9\u30b9\u30ab\u6a19\u6e96\u6642", "AKST",
+@@ -61,10 +61,10 @@
+ "\u5927\u897f\u6d0b\u590f\u6642\u9593", "ADT"};
+ String BDT[] = new String[] {"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u6642\u9593", "BDT",
+ "\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u590f\u6642\u9593", "BDST"};
+- String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST",
+- "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST"};
+- String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST",
+- "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST"};
++ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AEST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACST",
++ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACDT"};
+ String BRT[] = new String[] {"\u30d6\u30e9\u30b8\u30eb\u6642\u9593", "BRT",
+ "\u30d6\u30e9\u30b8\u30eb\u590f\u6642\u9593", "BRST"};
+ String BTT[] = new String[] {"\u30d6\u30fc\u30bf\u30f3\u6642\u9593", "BTT",
+@@ -89,8 +89,8 @@
+ "\u4e2d\u56fd\u590f\u6642\u9593", "CDT"};
+ String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST",
+ "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT"};
+- String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST",
+- "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST"};
++ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACST",
++ "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACDT"};
+ String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
+ "\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u590f\u6642\u9593", "IST"};
+ String EAT[] = new String[] {"\u6771\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "EAT",
+@@ -103,8 +103,8 @@
+ "\u6771\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "EGST"};
+ String EST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST",
+ "\u6771\u90e8\u590f\u6642\u9593", "EDT"};
+- String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST",
+- "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST"};
++ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AEST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AEDT"};
+ String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET",
+ "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST"};
+ String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT",
+@@ -133,10 +133,12 @@
+ "\u30a4\u30f3\u30c9\u590f\u6642\u9593", "IDT"};
+ String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642", "JST",
+ "\u65e5\u672c\u590f\u6642\u9593", "JDT"};
++ String KRAT[] = new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
++ "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"};
+ String KST[] = new String[] {"\u97d3\u56fd\u6a19\u6e96\u6642", "KST",
+ "\u97d3\u56fd\u590f\u6642\u9593", "KDT"};
+ String LORD_HOWE[] = new String[] {"\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u6a19\u6e96\u6642", "LHST",
+- "\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u590f\u6642\u9593", "LHST"};
++ "\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u590f\u6642\u9593", "LHDT"};
+ String MHT[] = new String[] {"\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u6642\u9593", "MHT",
+ "\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u590f\u6642\u9593", "MHST"};
+ String MSK[] = new String[] {"\u30e2\u30b9\u30af\u30ef\u6a19\u6e96\u6642", "MSK",
+@@ -165,16 +167,16 @@
+ "\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT"};
+ String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST",
+ "\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT"};
++ String IRKT[] = new String[] {"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u6642\u9593", "IRKT",
++ "\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"};
+ String SAST[] = new String[] {"\u5357\u30a2\u30d5\u30ea\u30ab\u6a19\u6e96\u6642", "SAST",
+ "\u5357\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "SAST"};
+ String SBT[] = new String[] {"\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6\u6642\u9593", "SBT",
+ "\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "SBST"};
+ String SGT[] = new String[] {"\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u6642\u9593", "SGT",
+ "\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u590f\u6642\u9593", "SGST"};
+- String SLST[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
+- "\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd\u590f\u6642\u9593", "SLST"};
+- String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST",
+- "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST"};
++ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AEST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AEDT"};
+ String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT",
+ "\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST"};
+ String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT",
+@@ -183,22 +185,22 @@
+ "\u5354\u5b9a\u4e16\u754c\u6642", "UTC"};
+ String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT",
+ "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST"};
+- String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST",
+- "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST"};
++ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AEST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AEDT"};
+ String VLAT[] = new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT",
+ "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"};
+- String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART",
+- "\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"};
+ String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT",
+ "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"};
+ String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET",
+ "\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "WEST"};
+ String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIB",
+ "\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST"};
+- String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST",
+- "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST"};
+- String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST",
++ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWST",
++ "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WSST",
+ "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"};
++ String XJT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "XJT",
++ "\u4e2d\u56fd\u590f\u6642\u9593", "XJDT"};
+ String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT",
+ "\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"\u897f\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u6642\u9593", "WGT",
+ "\u897f\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u6A19\u6E96\u6642\u9593", "MeST",
+- "\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u590F\u6642\u9593", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST",
+ "\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT"}},
+@@ -467,7 +468,7 @@
+ {"Antarctica/DumontDUrville", new String[] {"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u6642\u9593", "DDUT",
+ "\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u590f\u6642\u9593", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u6642\u9593", "MIST",
+- "\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u590F\u6642\u9593", "MIST"}},
++ "\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u590F\u6642\u9593", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"\u30e2\u30fc\u30bd\u30f3\u6642\u9593", "MAWT",
+ "\u30e2\u30fc\u30bd\u30f3\u590f\u6642\u9593", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"\u30d6\u30eb\u30cd\u30a4\u6642\u9593", "BNT",
+ "\u30d6\u30eb\u30cd\u30a4\u590f\u6642\u9593", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u6642\u9593", "CHOT",
+ "\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u590f\u6642\u9593", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"\u30db\u30d6\u30c9\u6642\u9593", "HOVT",
+ "\u30db\u30d6\u30c9\u590f\u6642\u9593", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u6642\u9593", "IRKT",
+- "\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"\u30da\u30c8\u30ed\u30d1\u30d6\u30ed\u30d5\u30b9\u30af\u30ab\u30e0\u30c1\u30e3\u30c4\u30ad\u30fc\u6642\u9593", "PETT",
+ "\u30da\u30c8\u30ed\u30d1\u30d6\u30ed\u30d5\u30b9\u30af\u30ab\u30e0\u30c1\u30e3\u30c4\u30ad\u30fc\u590f\u6642\u9593", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT",
+ "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
+- "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "\u30d5\u30a3\u30ea\u30d4\u30f3\u590f\u6642\u9593", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"\u30aa\u30e9\u30eb\u6642\u9593", "ORAT",
+ "\u30aa\u30e9\u30eb\u590f\u6642\u9593", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT",
+ "\u30A6\u30B9\u30C1\u30CD\u30E9\u590F\u6642\u9593", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST",
+- "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWST",
++ "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u6642\u9593", "VOLT",
+- "\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u590f\u6642\u9593", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT",
+ "\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST"};
+- String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST",
+- "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST"};
++ String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACST",
++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACDT"};
+ String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART",
+ "\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ARST"};
+ String AKST[] = new String[] {"\uc54c\ub798\uc2a4\uce74 \ud45c\uc900\uc2dc", "AKST",
+@@ -61,10 +61,10 @@
+ "\ub300\uc11c\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ADT"};
+ String BDT[] = new String[] {"\ubc29\uae00\ub77c\ub370\uc2dc \uc2dc\uac04", "BDT",
+ "\ubc29\uae00\ub77c\ub370\uc2dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BDST"};
+- String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "EST",
+- "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "EST"};
+- String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST",
+- "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST"};
++ String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "AEST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACST",
++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACDT"};
+ String BRT[] = new String[] {"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc2dc\uac04", "BRT",
+ "\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BRST"};
+ String BTT[] = new String[] {"\ubd80\ud0c4 \uc2dc\uac04", "BTT",
+@@ -89,8 +89,8 @@
+ "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
+ String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST",
+ "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
+- String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "CST",
+- "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "CST"};
++ String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "ACST",
++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "ACDT"};
+ String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
+ "\uc544\uc77c\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IST"};
+ String EAT[] = new String[] {"\ub3d9\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "EAT",
+@@ -103,8 +103,8 @@
+ "\ub3d9\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EGST"};
+ String EST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST",
+ "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT"};
+- String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST",
+- "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST"};
++ String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AEST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AEDT"};
+ String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET",
+ "\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST"};
+ String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT",
+@@ -133,10 +133,12 @@
+ "\uc778\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IDT"};
+ String JST[] = new String[] {"\uc77c\ubcf8 \ud45c\uc900\uc2dc", "JST",
+ "\uc77c\ubcf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "JDT"};
++ String KRAT[] = new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
++ "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"};
+ String KST[] = new String[] {"\ud55c\uad6d \ud45c\uc900\uc2dc", "KST",
+ "\ud55c\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KDT"};
+ String LORD_HOWE[] = new String[] {"\ub85c\ub4dc \ud558\uc6b0 \ud45c\uc900\uc2dc", "LHST",
+- "\ub85c\ub4dc \ud558\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "LHST"};
++ "\ub85c\ub4dc \ud558\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "LHDT"};
+ String MHT[] = new String[] {"\ub9c8\uc15c\uc81c\ub3c4 \uc2dc\uac04", "MHT",
+ "\ub9c8\uc15c\uc81c\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MHST"};
+ String MSK[] = new String[] {"\ubaa8\uc2a4\ud06c\ubc14 \ud45c\uc900\uc2dc", "MSK",
+@@ -165,16 +167,16 @@
+ "\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"};
+ String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST",
+ "\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT"};
++ String IRKT[] = new String[] {"\uc774\ub974\ucfe0\uce20\ud06c \uc2dc\uac04", "IRKT",
++ "\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"};
+ String SAST[] = new String[] {"\ub0a8\uc544\ud504\ub9ac\uce74 \ud45c\uc900\uc2dc", "SAST",
+ "\ub0a8\uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAST"};
+ String SBT[] = new String[] {"\uc194\ub85c\ubaac \uad70\ub3c4 \uc2dc\uac04", "SBT",
+ "\uc194\ub85c\ubaac \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SBST"};
+ String SGT[] = new String[] {"\uc2f1\uac00\ud3ec\ub974 \uc2dc\uac04", "SGT",
+ "\uc2f1\uac00\ud3ec\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SGST"};
+- String SLST[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
+- "\uc2dc\uc5d0\ub77c\ub9ac\uc628 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SLST"};
+- String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST",
+- "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST"};
++ String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AEST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AEDT"};
+ String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT",
+ "\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST"};
+ String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT",
+@@ -183,22 +185,22 @@
+ "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC"};
+ String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT",
+ "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST"};
+- String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "EST",
+- "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "EST"};
++ String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "AEST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "AEDT"};
+ String VLAT[] = new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT",
+ "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"};
+- String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART",
+- "\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"};
+ String WAT[] = new String[] {"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "WAT",
+ "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"};
+ String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET",
+ "\uc11c\uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WEST"};
+ String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIB",
+ "\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST"};
+- String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST",
+- "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST"};
+- String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST",
++ String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWST",
++ "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WSST",
+ "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"};
++ String XJT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "XJT",
++ "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "XJDT"};
+ String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT",
+ "\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"\uc11c\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc2dc\uac04", "WGT",
+ "\uc11c\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uD45C\uC900\uC2DC", "MeST",
+- "\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST",
+ "\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT"}},
+@@ -467,7 +468,7 @@
+ {"Antarctica/DumontDUrville", new String[] {"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc2dc\uac04", "DDUT",
+ "\ub4a4\ubabd \ub4a4\ub974\ube4c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"\uB9E4\uCF70\uB9AC \uC12C \uD45C\uC900\uC2DC", "MIST",
+- "\uB9E4\uCF70\uB9AC \uC12C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MIST"}},
++ "\uB9E4\uCF70\uB9AC \uC12C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT",
+ "\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"\ube0c\ub8e8\ub098\uc774 \uc2dc\uac04", "BNT",
+ "\ube0c\ub8e8\ub098\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Choibalsan \uc2dc\uac04", "CHOT",
+ "Choibalsan \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"Hovd \uc2dc\uac04", "HOVT",
+ "Hovd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"\uc774\ub974\ucfe0\uce20\ud06c \uc2dc\uac04", "IRKT",
+- "\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"\ud398\ud2b8\ub85c\ud30c\ube14\ub85c\ud504\uc2a4\ud06c-\uce84\ucc28\uce20\ud0a4 \uc2dc\uac04", "PETT",
+ "\ud398\ud2b8\ub85c\ud30c\ube14\ub85c\ud504\uc2a4\ud06c-\uce84\ucc28\uce20\ud0a4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT",
+ "\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
+- "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "\ud544\ub9ac\ud540 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral \ud45c\uc900\uc2dc", "ORAT",
+ "Oral \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT",
+ "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST",
+- "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWST",
++ "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"\ubcfc\uace0\uadf8\ub77c\ub4dc \uc2dc\uac04", "VOLT",
+- "\ubcfc\uace0\uadf8\ub77c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"};
+- String ADELAIDE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul)", "CST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "CST"};
++ String ADELAIDE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul)", "ACST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "ACDT"};
+ String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART",
+ "Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST"};
+ String AKST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Alaska", "AKST",
+@@ -61,10 +61,10 @@
+ "Hor\u00e1rio de luz natural do Atl\u00e2ntico", "ADT"};
+ String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST"};
+- String BRISBANE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Queensland)", "EST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST"};
++ String BRISBANE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Queensland)", "AEST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "ACST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "ACDT"};
+ String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST"};
+ String BTT[] = new String[] {"Fuso hor\u00e1rio de But\u00e3o", "BTT",
+@@ -87,8 +87,8 @@
+ "Hor\u00e1rio de luz natural da China", "CDT"};
+ String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST",
+ "Hor\u00e1rio de luz natural de Cuba", "CDT"};
+- String DARWIN[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Territ\u00F3rio do Norte)", "CST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o Central (Territ\u00F3rio do Norte)", "CST"};
++ String DARWIN[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Territ\u00F3rio do Norte)", "ACST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Territ\u00F3rio do Norte)", "ACDT"};
+ String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
+ "Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST"};
+ String EAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Oriental", "EAT",
+@@ -101,8 +101,8 @@
+ "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Oriental", "EGST"};
+ String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST",
+ "Hor\u00e1rio de luz natural oriental", "EDT"};
+- String EST_NSW[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Oriental (Nova Gales do Sul)", "EST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Nova Gales do Sul)", "EST"};
++ String EST_NSW[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Oriental (Nova Gales do Sul)", "AEST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Nova Gales do Sul)", "AEDT"};
+ String FET[] = new String[] {"Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET",
+ "Fuso Hor\u00E1rio de Ver\u00E3o do Extremo Leste Europeu", "FEST"};
+ String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT",
+@@ -131,10 +131,12 @@
+ "Hor\u00e1rio de luz natural da \u00cdndia", "IDT"};
+ String JST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Jap\u00e3o", "JST",
+ "Hor\u00e1rio de luz natural do Jap\u00e3o", "JDT"};
++ String KRAT[] = new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT",
++ "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"};
+ String KST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Coreia", "KST",
+ "Hor\u00e1rio de luz natural da Coreia", "KDT"};
+ String LORD_HOWE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Lord Howe", "LHST",
+- "Fuso hor\u00e1rio de ver\u00e3o de Lord Howe", "LHST"};
++ "Fuso hor\u00e1rio de ver\u00e3o de Lord Howe", "LHDT"};
+ String MHT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Marshall", "MHT",
+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marshall", "MHST"};
+ String MSK[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Moscou", "MSK",
+@@ -163,16 +165,16 @@
+ "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"};
+ String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST",
+ "Hor\u00e1rio de luz natural de Samoa", "SDT"};
++ String IRKT[] = new String[] {"Fuso hor\u00e1rio de Irkutsk", "IRKT",
++ "Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST"};
+ String SAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00c1frica do Sul", "SAST",
+ "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica do Sul", "SAST"};
+ String SBT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Salom\u00e3o", "SBT",
+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Salom\u00e3o", "SBST"};
+ String SGT[] = new String[] {"Fuso hor\u00e1rio de Cingapura", "SGT",
+ "Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST"};
+- String SLST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
+- "Fuso hor\u00e1rio de ver\u00e3o de Serra Leoa", "SLST"};
+- String TASMANIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Tasm\u00E2nia)", "EST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Tasm\u00E2nia)", "EST"};
++ String TASMANIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Tasm\u00E2nia)", "AEST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Tasm\u00E2nia)", "AEDT"};
+ String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST"};
+ String TRUT[] = new String[] {"Fuso Hor\u00E1rio de Chuuk", "CHUT",
+@@ -183,22 +185,22 @@
+ "Tempo universal coordenado", "UTC"};
+ String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST"};
+- String VICTORIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Victoria)", "EST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Victoria)", "AEST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"};
+- String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART",
+- "Fuso hor\u00e1rio de ver\u00e3o da Argentina Ocidental", "WARST"};
+ String WAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Ocidental", "WAT",
+ "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST"};
+ String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET",
+ "Fuso hor\u00e1rio de ver\u00e3o da Europa Ocidental", "WEST"};
+ String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIB",
+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST"};
+- String WST_AUS[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Ocidental (Austr\u00E1lia)", "WST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental (Austr\u00E1lia)", "WST"};
+- String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST",
++ String WST_AUS[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Ocidental (Austr\u00E1lia)", "AWST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental (Austr\u00E1lia)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WSST",
+ "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT"};
++ String XJT[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da China", "XJT",
++ "Hor\u00e1rio de luz natural da China", "XJDT"};
+ String YAKT[] = new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"Fuso hor\u00e1rio da Groenl\u00e2ndia Ocidental", "WGT",
+ "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Ocidental", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Hor\u00E1rio Padr\u00E3o de Metlakatla", "MeST",
+- "Hor\u00E1rio de Luz Natural de Metlakatla", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST",
+ "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT"}},
+@@ -467,7 +468,7 @@
+ {"Antarctica/DumontDUrville", new String[] {"Fuso hor\u00e1rio de Dumont-d'Urville", "DDUT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Dumont-d'Urville", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"Fuso Hor\u00E1rio da Ilha de Macquarie", "MIST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o da Ilha de Macquarie", "MIST"}},
++ "Fuso Hor\u00E1rio de Ver\u00E3o da Ilha de Macquarie", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"Fuso hor\u00e1rio de Mawson", "MAWT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Mawson", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Fuso hor\u00e1rio de Brunei", "BNT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Brunei", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Fuso hor\u00e1rio de Choibalsan", "CHOT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Choibalsan", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"Fuso hor\u00e1rio de Hovd", "HOVT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Hovd", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Fuso hor\u00e1rio de Irkutsk", "IRKT",
+- "Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"Fuso hor\u00e1rio de Petropavlovsk-Kamchatski", "PETT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Petropavlovsk-Kamchatski", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Hor\u00E1rio de Khandyga", "YAKT",
+ "Hor\u00E1rio de Ver\u00E3o de Khandyga", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT",
+- "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "Fuso hor\u00e1rio de ver\u00e3o das Filipinas", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Fuso hor\u00e1rio de Uralsk", "ORAT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Uralsk", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Hor\u00E1rio de Ust-Nera", "VLAT",
+ "Hor\u00E1rio de Ver\u00E3o de Ust-Nera", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Fuso Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "CWST",
+- "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental Central (Austr\u00E1lia)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Fuso Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "ACWST",
++ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental Central (Austr\u00E1lia)", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Fuso hor\u00e1rio de Volgogrado", "VOLT",
+- "Fuso hor\u00e1rio de ver\u00e3o de Volgogrado", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", TRUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre, normaltid", "ACT",
+ "Acre, sommartid", "ACST"};
+- String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST",
+- "Central sommartid (South Australia)", "CST"};
++ String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "ACST",
++ "Central sommartid (South Australia)", "ACDT"};
+ String AGT[] = new String[] {"Argentina, normaltid", "ART",
+ "Argentina, sommartid", "ARST"};
+ String AKST[] = new String[] {"Alaska, normaltid", "AKST",
+@@ -61,10 +61,10 @@
+ "Atlantisk sommartid", "ADT"};
+ String BDT[] = new String[] {"Bangladesh, normaltid", "BDT",
+ "Bangladesh, sommartid", "BDST"};
+- String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "EST",
+- "\u00D6stlig sommartid (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien)/New South Wales)", "CST",
+- "Central sommartid (South Australia/New South Wales)", "CST"};
++ String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "AEST",
++ "\u00D6stlig sommartid (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien/New South Wales)", "ACST",
++ "Central sommartid (South Australia/New South Wales)", "ACDT"};
+ String BRT[] = new String[] {"Brasilien, normaltid", "BRT",
+ "Brasilien, sommartid", "BRST"};
+ String BTT[] = new String[] {"Bhutan, normaltid", "BTT",
+@@ -89,8 +89,8 @@
+ "Kina, sommartid", "CDT"};
+ String CUBA[] = new String[] {"Kuba, normaltid", "CST",
+ "Kuba, sommartid", "CDT"};
+- String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "CST",
+- "Central sommartid (Nordterritoriet)", "CST"};
++ String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "ACST",
++ "Central sommartid (Nordterritoriet)", "ACDT"};
+ String DUBLIN[] = new String[] {"Greenwichtid", "GMT",
+ "Irland, sommartid", "IST"};
+ String EAT[] = new String[] {"\u00d6stafrikansk tid", "EAT",
+@@ -103,8 +103,8 @@
+ "\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST"};
+ String EST[] = new String[] {"Eastern, normaltid", "EST",
+ "Eastern, sommartid", "EDT"};
+- String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "EST",
+- "\u00D6stlig sommartid (New South Wales)", "EST"};
++ String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "AEST",
++ "\u00D6stlig sommartid (New South Wales)", "AEDT"};
+ String FET[] = new String[] {"Kaliningradtid", "FET",
+ "\u00D6steuropeisk sommartid", "FEST"};
+ String GHMT[] = new String[] {"Ghana, normaltid", "GMT",
+@@ -133,10 +133,12 @@
+ "Indien, sommartid", "IDT"};
+ String JST[] = new String[] {"Japan, normaltid", "JST",
+ "Japan, sommartid", "JDT"};
++ String KRAT[] = new String[] {"Krasnojarsk, normaltid", "KRAT",
++ "Krasnojarsk, sommartid", "KRAST"};
+ String KST[] = new String[] {"Korea, normaltid", "KST",
+ "Korea, sommartid", "KDT"};
+ String LORD_HOWE[] = new String[] {"Lord Howe, normaltid", "LHST",
+- "Lord Howe, sommartid", "LHST"};
++ "Lord Howe, sommartid", "LHDT"};
+ String MHT[] = new String[] {"Marshall\u00f6arna, normaltid", "MHT",
+ "Marshall\u00f6arna, sommartid", "MHST"};
+ String MSK[] = new String[] {"Moskva, normaltid", "MSK",
+@@ -165,16 +167,16 @@
+ "Stilla havet, sommartid", "PDT"};
+ String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
+ "Samoa, sommartid", "SDT"};
++ String IRKT[] = new String[] {"Irkutsk, normaltid", "IRKT",
++ "Irkutsk, sommartid", "IRKST"};
+ String SAST[] = new String[] {"Sydafrika, normaltid", "SAST",
+ "Sydafrika, sommartid", "SAST"};
+ String SBT[] = new String[] {"Salomon\u00f6arna, normaltid", "SBT",
+ "Salomon\u00f6arna, sommartid", "SBST"};
+ String SGT[] = new String[] {"Singapore, normaltid", "SGT",
+ "Singapore, sommartid", "SGST"};
+- String SLST[] = new String[] {"Greenwichtid", "GMT",
+- "Sierra Leone, sommartid", "SLST"};
+- String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "EST",
+- "\u00D6stlig sommartid (Tasmanien)", "EST"};
++ String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "AEST",
++ "\u00D6stlig sommartid (Tasmanien)", "AEDT"};
+ String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT",
+ "Turkmenistan, sommartid", "TMST"};
+ String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT",
+@@ -183,22 +185,22 @@
+ "Koordinerad universell tid", "UTC"};
+ String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT",
+ "Uzbekistan, sommartid", "UZST"};
+- String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "EST",
+- "\u00D6stlig sommartid (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "AEST",
++ "\u00D6stlig sommartid (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Vladivostok, normaltid", "VLAT",
+ "Vladivostok, sommartid", "VLAST"};
+- String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART",
+- "V\u00e4stargentina, sommartid", "WARST"};
+ String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT",
+ "V\u00e4stafrikansk sommartid", "WAST"};
+ String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET",
+ "V\u00e4steuropeisk sommartid", "WEST"};
+ String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIB",
+ "V\u00e4stindonesisk sommartid", "WIST"};
+- String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST",
+- "V\u00E4stlig sommartid (Australien)", "WST"};
+- String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST",
++ String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "AWST",
++ "V\u00E4stlig sommartid (Australien)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WSST",
+ "V\u00e4stsamoansk sommartid", "WSDT"};
++ String XJT[] = new String[] {"Kina, normaltid", "XJT",
++ "Kina, sommartid", "XJDT"};
+ String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT",
+ "Jakutsk, sommartid", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"V\u00e4stra Gr\u00f6nland, normaltid", "WGT",
+ "V\u00e4stra Gr\u00f6nland, sommartid", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"Metlakatla, normaltid", "MeST",
+- "Metlakatla, sommartid", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST",
+ "Saint-Pierre-et-Miquelon, sommartid", "PMDT"}},
+@@ -467,7 +468,7 @@
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville, normaltid", "DDUT",
+ "Dumont-d'Urville, sommartid", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"Macquarie\u00F6n, normaltid", "MIST",
+- "Macquarie\u00F6n, sommartid", "MIST"}},
++ "Macquarie\u00F6n, sommartid", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT",
+ "Mawson, sommartid", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -509,6 +510,7 @@
+ "Choibalsan, sommartid", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+ {"Asia/Chungking", CTT},
++ {"Asia/Chita", IRKT},
+ {"Asia/Colombo", IST},
+ {"Asia/Dacca", BDT},
+ {"Asia/Dhaka", BDT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"Hovd, normaltid", "HOVT",
+ "Hovd, sommartid", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Irkutsk, normaltid", "IRKT",
+- "Irkutsk, sommartid", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"Petropavlovsk-Kamtjatka, normaltid", "PETT",
+ "Petropavlovsk-Kamtjatka, sommartid", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT",
+ "Khandyga, sommartid", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT",
+- "Krasnojarsk, sommartid", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "Filippinerna, sommartid", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral, normaltid", "ORAT",
+ "Oral, sommartid", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT",
+ "Ust-Nera, sommartid", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "CWST",
+- "Central v\u00E4stlig sommartid (Australien)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "ACWST",
++ "Central v\u00E4stlig sommartid (Australien)", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Volgograd-tid", "VOLT",
+- "Volgograd, sommartid", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre \u65f6\u95f4", "ACT",
+ "Acre \u590f\u4ee4\u65f6", "ACST"};
+- String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST",
+- "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST"};
++ String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "ACST",
++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "ACDT"};
+ String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART",
+ "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "ARST"};
+ String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6807\u51c6\u65f6\u95f4", "AKST",
+@@ -61,10 +61,10 @@
+ "\u5927\u897f\u6d0b\u590f\u4ee4\u65f6", "ADT"};
+ String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u65f6\u95f4", "BDT",
+ "\u5b5f\u52a0\u62c9\u590f\u4ee4\u65f6", "BDST"};
+- String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "EST",
+- "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "EST"};
+- String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST",
+- "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST"};
++ String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "AEST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACST",
++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACDT"};
+ String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9a\u65f6\u95f4", "BRT",
+ "\u5df4\u897f\u5229\u4e9a\u590f\u4ee4\u65f6", "BRST"};
+ String BTT[] = new String[] {"\u4e0d\u4e39\u65f6\u95f4", "BTT",
+@@ -89,8 +89,8 @@
+ "\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT"};
+ String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST",
+ "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT"};
+- String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "CST",
+- "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "CST"};
++ String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "ACST",
++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "ACDT"};
+ String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
+ "\u7231\u5c14\u5170\u590f\u4ee4\u65f6", "IST"};
+ String EAT[] = new String[] {"\u4e1c\u975e\u65f6\u95f4", "EAT",
+@@ -103,8 +103,8 @@
+ "\u4e1c\u683c\u6797\u5c9b\u590f\u4ee4\u65f6", "EGST"};
+ String EST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST",
+ "\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT"};
+- String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST",
+- "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST"};
++ String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AEST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AEDT"};
+ String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET",
+ "\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST"};
+ String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT",
+@@ -133,10 +133,12 @@
+ "\u5370\u5ea6\u590f\u4ee4\u65f6", "IDT"};
+ String JST[] = new String[] {"\u65e5\u672c\u6807\u51c6\u65f6\u95f4", "JST",
+ "\u65e5\u672c\u590f\u4ee4\u65f6", "JDT"};
++ String KRAT[] = new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
++ "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"};
+ String KST[] = new String[] {"\u97e9\u56fd\u6807\u51c6\u65f6\u95f4", "KST",
+ "\u97e9\u56fd\u590f\u4ee4\u65f6", "KDT"};
+ String LORD_HOWE[] = new String[] {"\u8c6a\u516c\u6807\u51c6\u65f6\u95f4", "LHST",
+- "\u8c6a\u516c\u590f\u4ee4\u65f6", "LHST"};
++ "\u8c6a\u516c\u590f\u4ee4\u65f6", "LHDT"};
+ String MHT[] = new String[] {"\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u65f6\u95f4", "MHT",
+ "\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u590f\u4ee4\u65f6", "MHST"};
+ String MSK[] = new String[] {"\u83ab\u65af\u79d1\u6807\u51c6\u65f6\u95f4", "MSK",
+@@ -165,16 +167,16 @@
+ "\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT"};
+ String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST",
+ "\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT"};
++ String IRKT[] = new String[] {"\u4f0a\u5c14\u5e93\u6b21\u514b\u65f6\u95f4", "IRKT",
++ "\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"};
+ String SAST[] = new String[] {"\u5357\u975e\u6807\u51c6\u65f6\u95f4", "SAST",
+ "\u5357\u975e\u590f\u4ee4\u65f6", "SAST"};
+ String SBT[] = new String[] {"\u6240\u7f57\u95e8\u7fa4\u5c9b\u65f6\u95f4", "SBT",
+ "\u6240\u7f57\u95e8\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SBST"};
+ String SGT[] = new String[] {"\u65b0\u52a0\u5761\u65f6\u95f4", "SGT",
+ "\u65b0\u52a0\u5761\u590f\u4ee4\u65f6", "SGST"};
+- String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
+- "\u585e\u62c9\u5229\u6602\u590f\u4ee4\u65f6", "SLST"};
+- String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST",
+- "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST"};
++ String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AEST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AEDT"};
+ String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT",
+ "\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST"};
+ String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT",
+@@ -183,22 +185,22 @@
+ "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC"};
+ String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT",
+ "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST"};
+- String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "EST",
+- "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "EST"};
++ String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "AEST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "AEDT"};
+ String VLAT[] = new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT",
+ "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"};
+- String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART",
+- "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"};
+ String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT",
+ "\u897f\u975e\u590f\u4ee4\u65f6", "WAST"};
+ String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET",
+ "\u897f\u6b27\u590f\u4ee4\u65f6", "WEST"};
+ String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIB",
+ "\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST"};
+- String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "WST",
+- "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "WST"};
+- String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST",
++ String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "AWST",
++ "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WSST",
+ "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"};
++ String XJT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "XJT",
++ "\u4e2d\u56fd\u590f\u4ee4\u65f6", "XJDT"};
+ String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT",
+ "\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"\u897f\u683c\u6797\u5170\u5c9b\u65f6\u95f4", "WGT",
+ "\u897f\u683c\u6797\u5170\u5c9b\u590f\u4ee4\u65f6", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6807\u51C6\u65F6\u95F4", "MeST",
+- "\u6885\u7279\u62C9\u5361\u7279\u62C9\u590F\u4EE4\u65F6", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST",
+ "\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT"}},
+@@ -467,7 +468,7 @@
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u65f6\u95f4", "DDUT",
+ "Dumont-d'Urville \u590f\u4ee4\u65f6", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"\u9EA6\u5938\u91CC\u5C9B\u65F6\u95F4", "MIST",
+- "\u9EA6\u5938\u91CC\u5C9B\u590F\u4EE4\u65F6", "MIST"}},
++ "\u9EA6\u5938\u91CC\u5C9B\u590F\u4EE4\u65F6", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT",
+ "\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"\u6587\u83b1\u65f6\u95f4", "BNT",
+ "\u6587\u83b1\u590f\u4ee4\u65f6", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Choibalsan \u65f6\u95f4", "CHOT",
+ "Choibalsan \u590f\u4ee4\u65f6", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"\u79d1\u5e03\u591a\u65f6\u95f4", "HOVT",
+ "\u79d1\u5e03\u591a\u590f\u4ee4\u65f6", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"\u4f0a\u5c14\u5e93\u6b21\u514b\u65f6\u95f4", "IRKT",
+- "\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"\u5f7c\u5f97\u7f57\u5df4\u752b\u6d1b\u592b\u65af\u514b\u65f6\u95f4", "PETT",
+ "\u5f7c\u5f97\u7f57\u5df4\u752b\u6d1b\u592b\u65af\u514b\u590f\u4ee4\u65f6", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT",
+ "\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
+- "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "\u83f2\u5f8b\u5bbe\u590f\u4ee4\u65f6", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral \u65f6\u95f4", "ORAT",
+ "Oral \u590f\u4ee4\u65f6", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -588,7 +590,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT",
+ "\u4E4C\u65AF\u5B63\u6D85\u62C9\u590F\u4EE4\u65F6", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -620,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "CWST",
+- "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "ACWST",
++ "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -687,7 +689,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -696,7 +698,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -721,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"\u4f0f\u5c14\u52a0\u683c\u52d2\u65f6\u95f4", "VOLT",
+- "\u4f0f\u5c14\u52a0\u683c\u52d2\u590f\u4ee4\u65f6", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -775,6 +776,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Mon Jan 05 11:57:27 2015 -0800
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre \u6642\u9593", "ACT",
+ "Acre \u590f\u4ee4\u6642\u9593", "ACST"};
+- String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "CST",
+- "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "CST"};
++ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "ACST",
++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "ACDT"};
+ String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART",
+ "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "ARST"};
+ String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6a19\u6e96\u6642\u9593", "AKST",
+@@ -61,10 +61,10 @@
+ "\u5927\u897f\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ADT"};
+ String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u6642\u9593", "BDT",
+ "\u5b5f\u52a0\u62c9\u590f\u4ee4\u6642\u9593", "BDST"};
+- String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "EST",
+- "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "EST"};
+- String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST",
+- "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST"};
++ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "AEST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "ACST",
++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "ACDT"};
+ String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9e\u6642\u9593", "BRT",
+ "\u5df4\u897f\u5229\u4e9e\u590f\u4ee4\u6642\u9593", "BRST"};
+ String BTT[] = new String[] {"\u4e0d\u4e39\u6642\u9593", "BTT",
+@@ -89,8 +89,8 @@
+ "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
+ String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST",
+ "\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
+- String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST",
+- "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST"};
++ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "ACST",
++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "ACDT"};
+ String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
+ "\u611b\u723e\u862d\u590f\u4ee4\u6642\u9593", "IST"};
+ String EAT[] = new String[] {"\u6771\u975e\u6642\u9593", "EAT",
+@@ -103,8 +103,8 @@
+ "\u6771\u683c\u6797\u5cf6\u590f\u4ee4\u6642\u9593", "EGST"};
+ String EST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST",
+ "\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT"};
+- String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST",
+- "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST"};
++ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AEST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AEDT"};
+ String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET",
+ "\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST"};
+ String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT",
+@@ -133,10 +133,12 @@
+ "\u5370\u5ea6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "IDT"};
+ String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642\u9593", "JST",
+ "\u65e5\u672c\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "JDT"};
++ String KRAT[] = new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
++ "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"};
+ String KST[] = new String[] {"\u97d3\u570b\u6a19\u6e96\u6642\u9593", "KST",
+ "\u97d3\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "KDT"};
+ String LORD_HOWE[] = new String[] {"\u8c6a\u52f3\u7235\u5cf6\u6a19\u6e96\u6642\u9593", "LHST",
+- "\u8c6a\u52f3\u7235\u5cf6\u590f\u4ee4\u6642\u9593", "LHST"};
++ "\u8c6a\u52f3\u7235\u5cf6\u590f\u4ee4\u6642\u9593", "LHDT"};
+ String MHT[] = new String[] {"\u99ac\u7d39\u723e\u7fa4\u5cf6\u6642\u9593", "MHT",
+ "\u99ac\u7d39\u723e\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "MHST"};
+ String MSK[] = new String[] {"\u83ab\u65af\u79d1\u6a19\u6e96\u6642\u9593", "MSK",
+@@ -165,16 +167,16 @@
+ "\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"};
+ String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST",
+ "\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT"};
++ String IRKT[] = new String[] {"Irkutsk \u6642\u9593", "IRKT",
++ "Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"};
+ String SAST[] = new String[] {"\u5357\u975e\u6a19\u6e96\u6642\u9593", "SAST",
+ "\u5357\u975e\u590f\u4ee4\u6642\u9593", "SAST"};
+ String SBT[] = new String[] {"\u6240\u7f85\u9580\u7fa4\u5cf6\u6642\u9593", "SBT",
+ "\u6240\u7f85\u9580\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "SBST"};
+ String SGT[] = new String[] {"\u65b0\u52a0\u5761\u6642\u9593", "SGT",
+ "\u65b0\u52a0\u5761\u590f\u4ee4\u6642\u9593", "SGST"};
+- String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
+- "\u7345\u5b50\u5c71\u590f\u4ee4\u6642\u9593", "SLST"};
+- String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST",
+- "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST"};
++ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "AEST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "AEDT"};
+ String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT",
+ "\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST"};
+ String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT",
+@@ -183,22 +185,22 @@
+ "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC"};
+ String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT",
+ "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST"};
+- String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST",
+- "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST"};
++ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "AEST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "AEDT"};
+ String VLAT[] = new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT",
+ "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"};
+- String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART",
+- "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"};
+ String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT",
+ "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"};
+ String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET",
+ "\u897f\u6b50\u590f\u4ee4\u6642\u9593", "WEST"};
+ String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIB",
+ "\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST"};
+- String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST",
+- "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST"};
+- String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST",
++ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWST",
++ "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WSST",
+ "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"};
++ String XJT[] = new String[] {"\u4e2d\u570b\u6a19\u6e96\u6642\u9593", "XJT",
++ "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "XJDT"};
+ String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT",
+ "\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST"};
+
+@@ -262,7 +264,7 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
+ {"Africa/Gaborone", CAT},
+ {"Africa/Harare", CAT},
+ {"Africa/Johannesburg", SAST},
+@@ -358,7 +360,7 @@
+ {"America/Godthab", new String[] {"\u897f\u683c\u6797\u862d\u5cf6\u6642\u9593", "WGT",
+ "\u897f\u683c\u6797\u862d\u5cf6\u590f\u4ee4\u6642\u9593", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -401,8 +403,7 @@
+ {"America/Mendoza", AGT},
+ {"America/Menominee", CST},
+ {"America/Merida", CST},
+- {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6A19\u6E96\u6642\u9593", "MeST",
+- "\u6885\u7279\u62C9\u5361\u7279\u62C9\u65E5\u5149\u7BC0\u7D04\u6642\u9593", "MeDT"}},
++ {"America/Metlakatla", PST},
+ {"America/Mexico_City", CST},
+ {"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST",
+ "\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT"}},
+@@ -467,7 +468,7 @@
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u6642\u9593", "DDUT",
+ "Dumont-d'Urville \u590f\u4ee4\u6642\u9593", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"\u9EA5\u5938\u5229\u5CF6\u6642\u9593", "MIST",
+- "\u9EA5\u5938\u5229\u5CF6\u590F\u4EE4\u6642\u9593", "MIST"}},
++ "\u9EA5\u5938\u5229\u5CF6\u590F\u4EE4\u6642\u9593", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT",
+ "\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -505,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"\u6c76\u840a\u6642\u9593", "BNT",
+ "\u6c76\u840a\u590f\u4ee4\u6642\u9593", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"\u5de7\u5df4\u5c71 (Choibalsan) \u6642\u9593", "CHOT",
+ "\u5de7\u5df4\u5c71 (Choibalsan) \u590f\u4ee4\u6642\u9593", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -525,8 +527,7 @@
+ {"Asia/Hong_Kong", HKT},
+ {"Asia/Hovd", new String[] {"\u4faf\u5fb7 (Hovd) \u6642\u9593", "HOVT",
+ "\u4faf\u5fb7 (Hovd) \u590f\u4ee4\u6642\u9593", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Irkutsk \u6642\u9593", "IRKT",
+- "Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
+ {"Asia/Istanbul", EET},
+ {"Asia/Jakarta", WIT},
+ {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WIT",
+@@ -536,14 +537,13 @@
+ {"Asia/Kamchatka", new String[] {"Petropavlovsk-Kamchatski \u6642\u9593", "PETT",
+ "Petropavlovsk-Kamchatski \u590f\u4ee4\u6642\u9593", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
+ {"Asia/Kathmandu", NPT},
+ {"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT",
+ "\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST"}},
+ {"Asia/Kolkata", IST},
+- {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
+- "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -556,7 +556,7 @@
+ "\u83f2\u5f8b\u8cd3\u590f\u4ee4\u6642\u9593", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"\u6b50\u4f5b\u6642\u9593", "ORAT",
+ "\u6b50\u4f5b\u590f\u4ee4\u6642\u9593", "ORAST"}},
+@@ -577,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", new String[] {"\u53f0\u7063\u6a19\u6e96\u6642\u9593", "TST",
+ "\u53f0\u7063\u590f\u4ee4\u6642\u9593", "TDT"}},
+ {"Asia/Tel_Aviv", ISRAEL},
+@@ -589,7 +591,7 @@
+ {"Asia/Ujung_Pandang", CIT},
+ {"Asia/Ulaanbaatar", ULAT},
+ {"Asia/Ulan_Bator", ULAT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT",
+ "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u590F\u4EE4\u6642\u9593", "VLAST"}},
+ {"Asia/Vientiane", ICT},
+@@ -621,8 +623,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST",
+- "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWST",
++ "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -688,7 +690,7 @@
+ {"Europe/Isle_of_Man", GMTBST},
+ {"Europe/Istanbul", EET},
+ {"Europe/Jersey", GMTBST},
+- {"Europe/Kaliningrad", FET},
++ {"Europe/Kaliningrad", EET},
+ {"Europe/Kiev", EET},
+ {"Europe/Lisbon", WET},
+ {"Europe/Ljubljana", CET},
+@@ -697,7 +699,7 @@
+ {"Europe/Madrid", CET},
+ {"Europe/Malta", CET},
+ {"Europe/Mariehamn", EET},
+- {"Europe/Minsk", FET},
++ {"Europe/Minsk", MSK},
+ {"Europe/Monaco", CET},
+ {"Europe/Moscow", MSK},
+ {"Europe/Nicosia", EET},
+@@ -722,8 +724,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"\u4f0f\u723e\u52a0\u683c\u52d2\u6642\u9593", "VOLT",
+- "\u4f0f\u723e\u52a0\u683c\u52d2\u590f\u4ee4\u6642\u9593", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -776,6 +777,8 @@
+ {"PRT", AST},
+ {"Pacific/Apia", WST_SAMOA},
+ {"Pacific/Auckland", NZST},
++ {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
++ "Bougainville Daylight Time", "BST"}},
+ {"Pacific/Chatham", CHAST},
+ {"Pacific/Chuuk", CHUT},
+ {"Pacific/Easter", EASTER},
+--- ./jdk/src/share/instrument/Reentrancy.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/instrument/Reentrancy.c Mon Jan 05 11:57:27 2015 -0800
+@@ -130,6 +130,7 @@
+ error = confirmingTLSSet ( jvmtienv,
+ thread,
+ JPLIS_CURRENTLY_INSIDE_TOKEN);
++ check_phase_ret_false(error);
+ jplis_assert(error == JVMTI_ERROR_NONE);
+ if ( error != JVMTI_ERROR_NONE ) {
+ result = JNI_FALSE;
+@@ -158,6 +159,7 @@
+ error = confirmingTLSSet( jvmtienv,
+ thread,
+ JPLIS_CURRENTLY_OUTSIDE_TOKEN);
++ check_phase_ret(error);
+ jplis_assert(error == JVMTI_ERROR_NONE);
+
+ }
+--- ./jdk/src/share/javavm/export/jvm.h Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/javavm/export/jvm.h Mon Jan 05 11:57:27 2015 -0800
+@@ -1320,6 +1320,9 @@
+ JNIEXPORT jobject JNICALL
+ JVM_InitAgentProperties(JNIEnv *env, jobject agent_props);
+
++JNIEXPORT jstring JNICALL
++JVM_GetTemporaryDirectory(JNIEnv *env);
++
+ /* Generics reflection support.
+ *
+ * Returns information about the given class's EnclosingMethod
+--- ./jdk/src/share/lib/security/java.security-linux Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/lib/security/java.security-linux Mon Jan 05 11:57:27 2015 -0800
+@@ -412,8 +412,12 @@
+ #
+ # In some environments, certain algorithms or key lengths may be undesirable
+ # when using SSL/TLS. This section describes the mechanism for disabling
+-# algorithms during SSL/TLS security parameters negotiation, including cipher
+-# suites selection, peer authentication and key exchange mechanisms.
++# algorithms during SSL/TLS security parameters negotiation, including
++# protocol version negotiation, cipher suites selection, peer authentication
++# and key exchange mechanisms.
++#
++# Disabled algorithms will not be negotiated for SSL/TLS connections, even
++# if they are enabled explicitly in an application.
+ #
+ # For PKI-based peer authentication and key exchange mechanisms, this list
+ # of disabled algorithms will also be checked during certification path
+@@ -428,4 +432,5 @@
+ # It is not guaranteed to be examined and used by other implementations.
+ #
+ # Example:
+-# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
++# jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
++jdk.tls.disabledAlgorithms=SSLv3
+--- ./jdk/src/share/lib/security/java.security-macosx Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/lib/security/java.security-macosx Mon Jan 05 11:57:27 2015 -0800
+@@ -417,8 +417,12 @@
+ #
+ # In some environments, certain algorithms or key lengths may be undesirable
+ # when using SSL/TLS. This section describes the mechanism for disabling
+-# algorithms during SSL/TLS security parameters negotiation, including cipher
+-# suites selection, peer authentication and key exchange mechanisms.
++# algorithms during SSL/TLS security parameters negotiation, including
++# protocol version negotiation, cipher suites selection, peer authentication
++# and key exchange mechanisms.
++#
++# Disabled algorithms will not be negotiated for SSL/TLS connections, even
++# if they are enabled explicitly in an application.
+ #
+ # For PKI-based peer authentication and key exchange mechanisms, this list
+ # of disabled algorithms will also be checked during certification path
+@@ -433,4 +437,5 @@
+ # It is not guaranteed to be examined and used by other implementations.
+ #
+ # Example:
+-# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
++# jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
++jdk.tls.disabledAlgorithms=SSLv3
+--- ./jdk/src/share/lib/security/java.security-solaris Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/lib/security/java.security-solaris Mon Jan 05 11:57:27 2015 -0800
+@@ -416,8 +416,12 @@
+ #
+ # In some environments, certain algorithms or key lengths may be undesirable
+ # when using SSL/TLS. This section describes the mechanism for disabling
+-# algorithms during SSL/TLS security parameters negotiation, including cipher
+-# suites selection, peer authentication and key exchange mechanisms.
++# algorithms during SSL/TLS security parameters negotiation, including
++# protocol version negotiation, cipher suites selection, peer authentication
++# and key exchange mechanisms.
++#
++# Disabled algorithms will not be negotiated for SSL/TLS connections, even
++# if they are enabled explicitly in an application.
+ #
+ # For PKI-based peer authentication and key exchange mechanisms, this list
+ # of disabled algorithms will also be checked during certification path
+@@ -432,4 +436,5 @@
+ # It is not guaranteed to be examined and used by other implementations.
+ #
+ # Example:
+-# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
++# jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
++jdk.tls.disabledAlgorithms=SSLv3
+--- ./jdk/src/share/lib/security/java.security-windows Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/lib/security/java.security-windows Mon Jan 05 11:57:27 2015 -0800
+@@ -417,8 +417,12 @@
+ #
+ # In some environments, certain algorithms or key lengths may be undesirable
+ # when using SSL/TLS. This section describes the mechanism for disabling
+-# algorithms during SSL/TLS security parameters negotiation, including cipher
+-# suites selection, peer authentication and key exchange mechanisms.
++# algorithms during SSL/TLS security parameters negotiation, including
++# protocol version negotiation, cipher suites selection, peer authentication
++# and key exchange mechanisms.
++#
++# Disabled algorithms will not be negotiated for SSL/TLS connections, even
++# if they are enabled explicitly in an application.
+ #
+ # For PKI-based peer authentication and key exchange mechanisms, this list
+ # of disabled algorithms will also be checked during certification path
+@@ -433,4 +437,5 @@
+ # It is not guaranteed to be examined and used by other implementations.
+ #
+ # Example:
+-# jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
++# jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
++jdk.tls.disabledAlgorithms=SSLv3
+--- ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp Mon Jan 05 11:57:27 2015 -0800
+@@ -583,6 +583,8 @@
+ LEReferenceTo<ChainSubClassRuleTable>
+ chainSubClassRuleTable(chainSubClassSetTable, success, chainSubClassRuleTableOffset);
+ le_uint16 backtrackGlyphCount = SWAPW(chainSubClassRuleTable->backtrackGlyphCount);
++ LEReferenceToArrayOf<le_uint16> backtrackClassArray(base, success, chainSubClassRuleTable->backtrackClassArray, backtrackGlyphCount);
++ if( LE_FAILURE(success) ) { return 0; }
+ le_uint16 inputGlyphCount = SWAPW(chainSubClassRuleTable->backtrackClassArray[backtrackGlyphCount]) - 1;
+ LEReferenceToArrayOf<le_uint16> inputClassArray(base, success, &chainSubClassRuleTable->backtrackClassArray[backtrackGlyphCount + 1],inputGlyphCount+2); // +2 for the lookaheadGlyphCount count
+ le_uint16 lookaheadGlyphCount = SWAPW(inputClassArray.getObject(inputGlyphCount, success));
+@@ -599,8 +601,6 @@
+ }
+
+ tempIterator.prev();
+- LEReferenceToArrayOf<le_uint16> backtrackClassArray(base, success, chainSubClassRuleTable->backtrackClassArray, backtrackGlyphCount);
+- if( LE_FAILURE(success) ) { return 0; }
+ if (! matchGlyphClasses(backtrackClassArray, backtrackGlyphCount,
+ &tempIterator, backtrackClassDefinitionTable, success, TRUE)) {
+ continue;
+--- ./jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp Mon Jan 05 11:57:27 2015 -0800
+@@ -45,6 +45,9 @@
+ le_int32 coverageIndex = getGlyphCoverage(base, glyphID, success);
+ le_uint16 eeCount = SWAPW(entryExitCount);
+
++ LEReferenceToArrayOf<EntryExitRecord>
++ entryExitRecordsArrayRef(base, success, entryExitRecords, coverageIndex);
++
+ if (coverageIndex < 0 || coverageIndex >= eeCount || LE_FAILURE(success)) {
+ glyphIterator->setCursiveGlyph();
+ return 0;
+--- ./jdk/src/share/native/sun/font/layout/Features.cpp Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/native/sun/font/layout/Features.cpp Mon Jan 05 11:57:27 2015 -0800
+@@ -40,6 +40,9 @@
+
+ LEReferenceTo<FeatureTable> FeatureListTable::getFeatureTable(const LETableReference &base, le_uint16 featureIndex, LETag *featureTag, LEErrorCode &success) const
+ {
++ LEReferenceToArrayOf<FeatureRecord>
++ featureRecordArrayRef(base, success, featureRecordArray, featureIndex);
++
+ if (featureIndex >= SWAPW(featureCount) || LE_FAILURE(success)) {
+ return LEReferenceTo<FeatureTable>();
+ }
+--- ./jdk/src/share/native/sun/font/layout/LETableReference.h Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/native/sun/font/layout/LETableReference.h Mon Jan 05 11:57:27 2015 -0800
+@@ -471,7 +471,12 @@
+ #endif
+
+ const T& getObject(le_uint32 i, LEErrorCode &success) const {
+- return *getAlias(i,success);
++ const T *ret = getAlias(i, success);
++ if (LE_FAILURE(success) || ret==NULL) {
++ return *(new T(0));
++ } else {
++ return *ret;
++ }
+ }
+
+ /**
+--- ./jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp Mon Jan 05 11:57:27 2015 -0800
+@@ -64,6 +64,9 @@
+ LEReferenceTo<LigatureTable> ligTable(ligSetTable, success, ligTableOffset);
+ if(LE_FAILURE(success)) { return 0; }
+ le_uint16 compCount = SWAPW(ligTable->compCount) - 1;
++ LEReferenceToArrayOf<TTGlyphID>
++ componentArrayRef(base, success, ligTable->componentArray, compCount);
++ if (LE_FAILURE(success)) { return 0; }
+ le_int32 startPosition = glyphIterator->getCurrStreamPosition();
+ TTGlyphID ligGlyph = SWAPW(ligTable->ligGlyph);
+ le_uint16 comp;
+--- ./jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp Mon Jan 05 11:57:27 2015 -0800
+@@ -61,6 +61,8 @@
+
+ le_int32 coverageIndex = getGlyphCoverage(base, glyph, success);
+ le_uint16 seqCount = SWAPW(sequenceCount);
++ LEReferenceToArrayOf<Offset>
++ sequenceTableOffsetArrayRef(base, success, sequenceTableOffsetArray, seqCount);
+
+ if (LE_FAILURE(success)) {
+ return 0;
+--- ./jdk/src/share/native/sun/misc/VMSupport.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/native/sun/misc/VMSupport.c Mon Jan 05 11:57:27 2015 -0800
+@@ -53,3 +53,9 @@
+ }
+ return (*InitAgentProperties_fp)(env, props);
+ }
++
++JNIEXPORT jstring JNICALL
++Java_sun_misc_VMSupport_getVMTemporaryDirectory(JNIEnv *env, jclass cls)
++{
++ return JVM_GetTemporaryDirectory(env);
++}
+--- ./jdk/src/share/native/sun/security/smartcardio/pcsc.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/native/sun/security/smartcardio/pcsc.c Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2006, 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
+@@ -64,17 +64,32 @@
+
+ #define J2PCSC_EXCEPTION_NAME "sun/security/smartcardio/PCSCException"
+
++void throwOutOfMemoryError(JNIEnv *env, const char *msg) {
++ jclass cls = (*env)->FindClass(env, "java/lang/OutOfMemoryError");
++
++ if (cls != NULL) /* Otherwise an exception has already been thrown */
++ (*env)->ThrowNew(env, cls, msg);
++
++}
++
+ void throwPCSCException(JNIEnv* env, LONG code) {
+ jclass pcscClass;
+ jmethodID constructor;
+ jthrowable pcscException;
+
+ pcscClass = (*env)->FindClass(env, J2PCSC_EXCEPTION_NAME);
+- assert(pcscClass != NULL);
++ if (pcscClass == NULL) {
++ return;
++ }
+ constructor = (*env)->GetMethodID(env, pcscClass, "<init>", "(I)V");
+- assert(constructor != NULL);
+- pcscException = (jthrowable) (*env)->NewObject(env, pcscClass, constructor, (jint)code);
+- (*env)->Throw(env, pcscException);
++ if (constructor == NULL) {
++ return;
++ }
++ pcscException = (jthrowable) (*env)->NewObject(env, pcscClass,
++ constructor, (jint)code);
++ if (pcscException != NULL) {
++ (*env)->Throw(env, pcscException);
++ }
+ }
+
+ jboolean handleRV(JNIEnv* env, LONG code) {
+@@ -93,7 +108,7 @@
+ JNIEXPORT jlong JNICALL Java_sun_security_smartcardio_PCSC_SCardEstablishContext
+ (JNIEnv *env, jclass thisClass, jint dwScope)
+ {
+- SCARDCONTEXT context;
++ SCARDCONTEXT context = 0;
+ LONG rv;
+ dprintf("-establishContext\n");
+ rv = CALL_SCardEstablishContext(dwScope, NULL, NULL, &context);
+@@ -110,7 +125,7 @@
+ jobjectArray pcsc_multi2jstring(JNIEnv *env, char *spec) {
+ jobjectArray result;
+ jclass stringClass;
+- char *cp, **tab;
++ char *cp, **tab = NULL;
+ jstring js;
+ int cnt = 0;
+
+@@ -121,6 +136,10 @@
+ }
+
+ tab = (char **)malloc(cnt * sizeof(char *));
++ if (tab == NULL) {
++ throwOutOfMemoryError(env, NULL);
++ return NULL;
++ }
+
+ cnt = 0;
+ cp = spec;
+@@ -130,12 +149,26 @@
+ }
+
+ stringClass = (*env)->FindClass(env, "java/lang/String");
+- assert(stringClass != NULL);
++ if (stringClass == NULL) {
++ free(tab);
++ return NULL;
++ }
+
+ result = (*env)->NewObjectArray(env, cnt, stringClass, NULL);
+- while (cnt-- > 0) {
+- js = (*env)->NewStringUTF(env, tab[cnt]);
+- (*env)->SetObjectArrayElement(env, result, cnt, js);
++ if (result != NULL) {
++ while (cnt-- > 0) {
++ js = (*env)->NewStringUTF(env, tab[cnt]);
++ if ((*env)->ExceptionCheck(env)) {
++ free(tab);
++ return NULL;
++ }
++ (*env)->SetObjectArrayElement(env, result, cnt, js);
++ if ((*env)->ExceptionCheck(env)) {
++ free(tab);
++ return NULL;
++ }
++ (*env)->DeleteLocalRef(env, js);
++ }
+ }
+ free(tab);
+ return result;
+@@ -146,8 +179,8 @@
+ {
+ SCARDCONTEXT context = (SCARDCONTEXT)jContext;
+ LONG rv;
+- LPTSTR mszReaders;
+- DWORD size;
++ LPTSTR mszReaders = NULL;
++ DWORD size = 0;
+ jobjectArray result;
+
+ dprintf1("-context: %x\n", context);
+@@ -157,13 +190,20 @@
+ }
+ dprintf1("-size: %d\n", size);
+
+- mszReaders = malloc(size);
+- rv = CALL_SCardListReaders(context, NULL, mszReaders, &size);
+- if (handleRV(env, rv)) {
+- free(mszReaders);
+- return NULL;
++ if (size) {
++ mszReaders = malloc(size);
++ if (mszReaders == NULL) {
++ throwOutOfMemoryError(env, NULL);
++ return NULL;
++ }
++
++ rv = CALL_SCardListReaders(context, NULL, mszReaders, &size);
++ if (handleRV(env, rv)) {
++ free(mszReaders);
++ return NULL;
++ }
++ dprintf1("-String: %s\n", mszReaders);
+ }
+- dprintf1("-String: %s\n", mszReaders);
+
+ result = pcsc_multi2jstring(env, mszReaders);
+ free(mszReaders);
+@@ -177,10 +217,13 @@
+ SCARDCONTEXT context = (SCARDCONTEXT)jContext;
+ LONG rv;
+ LPCTSTR readerName;
+- SCARDHANDLE card;
+- DWORD proto;
++ SCARDHANDLE card = 0;
++ DWORD proto = 0;
+
+ readerName = (*env)->GetStringUTFChars(env, jReaderName, NULL);
++ if (readerName == NULL) {
++ return 0;
++ }
+ rv = CALL_SCardConnect(context, readerName, jShareMode, jPreferredProtocols, &card, &proto);
+ (*env)->ReleaseStringUTFChars(env, jReaderName, readerName);
+ dprintf1("-cardhandle: %x\n", card);
+@@ -210,6 +253,9 @@
+ sendPci.cbPciLength = sizeof(SCARD_IO_REQUEST);
+
+ sbuf = (unsigned char *) ((*env)->GetByteArrayElements(env, jBuf, NULL));
++ if (sbuf == NULL) {
++ return NULL;
++ }
+ rv = CALL_SCardTransmit(card, &sendPci, sbuf + ofs, len, NULL, rbuf, &rlen);
+ (*env)->ReleaseByteArrayElements(env, jBuf, (jbyte *)sbuf, JNI_ABORT);
+
+@@ -218,7 +264,12 @@
+ }
+
+ jOut = (*env)->NewByteArray(env, rlen);
+- (*env)->SetByteArrayRegion(env, jOut, 0, rlen, (jbyte *)rbuf);
++ if (jOut != NULL) {
++ (*env)->SetByteArrayRegion(env, jOut, 0, rlen, (jbyte *)rbuf);
++ if ((*env)->ExceptionCheck(env)) {
++ return NULL;
++ }
++ }
+ return jOut;
+ }
+
+@@ -231,10 +282,10 @@
+ DWORD readerLen = READERNAME_BUFFER_SIZE;
+ unsigned char atr[ATR_BUFFER_SIZE];
+ DWORD atrLen = ATR_BUFFER_SIZE;
+- DWORD state;
+- DWORD protocol;
++ DWORD state = 0;
++ DWORD protocol = 0;
+ jbyteArray jArray;
+- jbyte tmp;
++ jbyte status[2];
+
+ rv = CALL_SCardStatus(card, readerName, &readerLen, &state, &protocol, atr, &atrLen);
+ if (handleRV(env, rv)) {
+@@ -245,13 +296,19 @@
+ dprintf1("-protocol: %d\n", protocol);
+
+ jArray = (*env)->NewByteArray(env, atrLen);
++ if (jArray == NULL) {
++ return NULL;
++ }
+ (*env)->SetByteArrayRegion(env, jArray, 0, atrLen, (jbyte *)atr);
+-
+- tmp = (jbyte)state;
+- (*env)->SetByteArrayRegion(env, jStatus, 0, 1, &tmp);
+- tmp = (jbyte)protocol;
+- (*env)->SetByteArrayRegion(env, jStatus, 1, 1, &tmp);
+-
++ if ((*env)->ExceptionCheck(env)) {
++ return NULL;
++ }
++ status[0] = (jbyte) state;
++ status[1] = (jbyte) protocol;
++ (*env)->SetByteArrayRegion(env, jStatus, 0, 2, status);
++ if ((*env)->ExceptionCheck(env)) {
++ return NULL;
++ }
+ return jArray;
+ }
+
+@@ -274,36 +331,78 @@
+ SCARDCONTEXT context = (SCARDCONTEXT)jContext;
+ LONG rv;
+ int readers = (*env)->GetArrayLength(env, jReaderNames);
+- SCARD_READERSTATE *readerState = malloc(readers * sizeof(SCARD_READERSTATE));
++ SCARD_READERSTATE *readerState;
+ int i;
+- jintArray jEventState;
+- int *currentState = (*env)->GetIntArrayElements(env, jCurrentState, NULL);
++ jintArray jEventState = NULL;
++ int *currentState = NULL;
++ const char *readerName;
++
++ readerState = calloc(readers, sizeof(SCARD_READERSTATE));
++ if (readerState == NULL && readers > 0) {
++ throwOutOfMemoryError(env, NULL);
++ return NULL;
++ }
++
++ currentState = (*env)->GetIntArrayElements(env, jCurrentState, NULL);
++ if (currentState == NULL) {
++ free(readerState);
++ return NULL;
++ }
++
++ for (i = 0; i < readers; i++) {
++ readerState[i].szReader = NULL;
++ }
+
+ for (i = 0; i < readers; i++) {
+ jobject jReaderName = (*env)->GetObjectArrayElement(env, jReaderNames, i);
+- readerState[i].szReader = (*env)->GetStringUTFChars(env, jReaderName, NULL);
++ if ((*env)->ExceptionCheck(env)) {
++ goto cleanup;
++ }
++ readerName = (*env)->GetStringUTFChars(env, jReaderName, NULL);
++ if (readerName == NULL) {
++ goto cleanup;
++ }
++ readerState[i].szReader = strdup(readerName);
++ (*env)->ReleaseStringUTFChars(env, jReaderName, readerName);
++ if (readerState[i].szReader == NULL) {
++ throwOutOfMemoryError(env, NULL);
++ goto cleanup;
++ }
+ readerState[i].pvUserData = NULL;
+ readerState[i].dwCurrentState = currentState[i];
+ readerState[i].dwEventState = SCARD_STATE_UNAWARE;
+ readerState[i].cbAtr = 0;
++ (*env)->DeleteLocalRef(env, jReaderName);
+ }
+- (*env)->ReleaseIntArrayElements(env, jCurrentState, currentState, JNI_ABORT);
+
+- rv = CALL_SCardGetStatusChange(context, (DWORD)jTimeout, readerState, readers);
++ if (readers > 0) {
++ rv = CALL_SCardGetStatusChange(context, (DWORD)jTimeout, readerState, readers);
++ if (handleRV(env, rv)) {
++ goto cleanup;
++ }
++ }
+
+ jEventState = (*env)->NewIntArray(env, readers);
++ if (jEventState == NULL) {
++ goto cleanup;
++ }
+ for (i = 0; i < readers; i++) {
+ jint eventStateTmp;
+- jobject jReaderName = (*env)->GetObjectArrayElement(env, jReaderNames, i);
+ dprintf3("-reader status %s: 0x%X, 0x%X\n", readerState[i].szReader,
+ readerState[i].dwCurrentState, readerState[i].dwEventState);
+- (*env)->ReleaseStringUTFChars(env, jReaderName, readerState[i].szReader);
+ eventStateTmp = (jint)readerState[i].dwEventState;
+ (*env)->SetIntArrayRegion(env, jEventState, i, 1, &eventStateTmp);
++ if ((*env)->ExceptionCheck(env)) {
++ jEventState = NULL;
++ goto cleanup;
++ }
++ }
++cleanup:
++ (*env)->ReleaseIntArrayElements(env, jCurrentState, currentState, JNI_ABORT);
++ for (i = 0; i < readers; i++) {
++ free((char *)readerState[i].szReader);
+ }
+ free(readerState);
+-
+- handleRV(env, rv);
+ return jEventState;
+ }
+
+@@ -336,13 +435,18 @@
+ {
+ SCARDHANDLE card = (SCARDHANDLE)jCard;
+ LONG rv;
+- jbyte* sendBuffer = (*env)->GetByteArrayElements(env, jSendBuffer, NULL);
++ jbyte* sendBuffer;
+ jint sendBufferLength = (*env)->GetArrayLength(env, jSendBuffer);
+ jbyte receiveBuffer[MAX_STACK_BUFFER_SIZE];
+ jint receiveBufferLength = MAX_STACK_BUFFER_SIZE;
+ ULONG returnedLength = 0;
+ jbyteArray jReceiveBuffer;
+
++ sendBuffer = (*env)->GetByteArrayElements(env, jSendBuffer, NULL);
++ if (sendBuffer == NULL) {
++ return NULL;
++ }
++
+ #ifdef J2PCSC_DEBUG
+ {
+ int k;
+@@ -375,7 +479,12 @@
+ #endif
+
+ jReceiveBuffer = (*env)->NewByteArray(env, returnedLength);
++ if (jReceiveBuffer == NULL) {
++ return NULL;
++ }
+ (*env)->SetByteArrayRegion(env, jReceiveBuffer, 0, returnedLength, receiveBuffer);
+-
++ if ((*env)->ExceptionCheck(env)) {
++ return NULL;
++ }
+ return jReceiveBuffer;
+ }
+--- ./jdk/src/share/npt/utf.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/share/npt/utf.c Mon Jan 05 11:57:27 2015 -0800
+@@ -390,7 +390,7 @@
+
+ /* ================================================================= */
+
+-#if 1 /* Test program */
++#ifdef COMPILE_WITH_UTF_TEST /* Test program */
+
+ /*
+ * Convert any byte array into a printable string.
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Mon Jan 05 11:57:27 2015 -0800
+@@ -308,47 +308,39 @@
+ ProcessPipeInputStream(int fd) {
+ super(new FileInputStream(newFileDescriptor(fd)));
+ }
+-
+- private InputStream drainInputStream(InputStream in)
++ private static byte[] drainInputStream(InputStream in)
+ throws IOException {
+ int n = 0;
+ int j;
+ byte[] a = null;
+- synchronized (closeLock) {
+- if (buf == null) // asynchronous close()?
+- return null; // discard
+- j = in.available();
++ while ((j = in.available()) > 0) {
++ a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j);
++ n += in.read(a, n, j);
+ }
+- while (j > 0) {
+- a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j);
+- synchronized (closeLock) {
+- if (buf == null) // asynchronous close()?
+- return null; // discard
+- n += in.read(a, n, j);
+- j = in.available();
+- }
+- }
+- return (a == null) ?
+- ProcessBuilder.NullInputStream.INSTANCE :
+- new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n));
++ return (a == null || n == a.length) ? a : Arrays.copyOf(a, n);
+ }
+
+ /** Called by the process reaper thread when the process exits. */
+ synchronized void processExited() {
+- try {
+- InputStream in = this.in;
+- if (in != null) {
+- InputStream stragglers = drainInputStream(in);
+- in.close();
+- this.in = stragglers;
+- }
+- } catch (IOException ignored) { }
++ synchronized (closeLock) {
++ try {
++ InputStream in = this.in;
++ // this stream is closed if and only if: in == null
++ if (in != null) {
++ byte[] stragglers = drainInputStream(in);
++ in.close();
++ this.in = (stragglers == null) ?
++ ProcessBuilder.NullInputStream.INSTANCE :
++ new ByteArrayInputStream(stragglers);
++ }
++ } catch (IOException ignored) {}
++ }
+ }
+
+ @Override
+ public void close() throws IOException {
+ // BufferedInputStream#close() is not synchronized unlike most other methods.
+- // Synchronizing helps avoid racing with drainInputStream().
++ // Synchronizing helps avoid race with processExited().
+ synchronized (closeLock) {
+ super.close();
+ }
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux Mon Jan 05 11:57:27 2015 -0800
+@@ -310,47 +310,39 @@
+ ProcessPipeInputStream(int fd) {
+ super(new FileInputStream(newFileDescriptor(fd)));
+ }
+-
+- private InputStream drainInputStream(InputStream in)
++ private static byte[] drainInputStream(InputStream in)
+ throws IOException {
+ int n = 0;
+ int j;
+ byte[] a = null;
+- synchronized (closeLock) {
+- if (buf == null) // asynchronous close()?
+- return null; // discard
+- j = in.available();
++ while ((j = in.available()) > 0) {
++ a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j);
++ n += in.read(a, n, j);
+ }
+- while (j > 0) {
+- a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j);
+- synchronized (closeLock) {
+- if (buf == null) // asynchronous close()?
+- return null; // discard
+- n += in.read(a, n, j);
+- j = in.available();
+- }
+- }
+- return (a == null) ?
+- ProcessBuilder.NullInputStream.INSTANCE :
+- new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n));
++ return (a == null || n == a.length) ? a : Arrays.copyOf(a, n);
+ }
+
+ /** Called by the process reaper thread when the process exits. */
+ synchronized void processExited() {
+- try {
+- InputStream in = this.in;
+- if (in != null) {
+- InputStream stragglers = drainInputStream(in);
+- in.close();
+- this.in = stragglers;
+- }
+- } catch (IOException ignored) { }
++ synchronized (closeLock) {
++ try {
++ InputStream in = this.in;
++ // this stream is closed if and only if: in == null
++ if (in != null) {
++ byte[] stragglers = drainInputStream(in);
++ in.close();
++ this.in = (stragglers == null) ?
++ ProcessBuilder.NullInputStream.INSTANCE :
++ new ByteArrayInputStream(stragglers);
++ }
++ } catch (IOException ignored) {}
++ }
+ }
+
+ @Override
+ public void close() throws IOException {
+ // BufferedInputStream#close() is not synchronized unlike most other methods.
+- // Synchronizing helps avoid racing with drainInputStream().
++ // Synchronizing helps avoid race with processExited().
+ synchronized (closeLock) {
+ super.close();
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1001,6 +1001,13 @@
+ switch (xev.get_type()) {
+ case XConstants.ButtonPress:
+ if (buttonState == 0) {
++ XWindowPeer parent = getToplevelXWindow();
++ // See 6385277, 6981400.
++ if (parent != null && parent.isFocusableWindow()) {
++ // A click in a client area drops the actual focused window retaining.
++ parent.setActualFocusedWindow(null);
++ parent.requestWindowFocus(xbe.get_time(), true);
++ }
+ XAwtState.setAutoGrabWindow(this);
+ }
+ break;
+--- ./jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Mon Jan 05 11:57:27 2015 -0800
+@@ -605,33 +605,6 @@
+
+ }
+
+- public void handleButtonPressRelease(XEvent xev) {
+- /*
+- * Fix for 6385277.
+- * We request focus on simple Window by click in order
+- * to make it behave like Frame/Dialog in this case and also to unify
+- * the behaviour with what we have on MS Windows.
+- * handleJavaMouseEvent() would be more suitable place to do this
+- * but we want Swing to have this functionality also.
+- */
+- if (xev.get_type() == XConstants.ButtonPress) {
+- final XWindowPeer parentXWindow = getParentTopLevel();
+- Window parentWindow = (Window)parentXWindow.getTarget();
+- if (parentXWindow.isFocusableWindow() && parentXWindow.isSimpleWindow() &&
+- XKeyboardFocusManagerPeer.getInstance().getCurrentFocusedWindow() != parentWindow)
+- {
+- postEvent(new InvocationEvent(parentWindow, new Runnable() {
+- public void run() {
+- // Request focus on the EDT of 'parentWindow' because
+- // XDecoratedPeer.requestWindowFocus() calls client code.
+- parentXWindow.requestXFocus();
+- }
+- }));
+- }
+- }
+- super.handleButtonPressRelease(xev);
+- }
+-
+ public Dimension getMinimumSize() {
+ return target.getSize();
+ }
+--- ./jdk/src/solaris/classes/sun/awt/X11/XWindow.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XWindow.java Mon Jan 05 11:57:27 2015 -0800
+@@ -455,6 +455,7 @@
+ ColorModel cm = getColorModel();
+ int pixel = PixelConverter.instance.rgbToPixel(c.getRGB(), cm);
+ XlibWrapper.XSetWindowBackground(XToolkit.getDisplay(), getContentWindow(), pixel);
++ XlibWrapper.XClearWindow(XToolkit.getDisplay(), getContentWindow());
+ }
+ finally {
+ XToolkit.awtUnlock();
+--- ./jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -41,6 +41,10 @@
+ return false;
+ }
+
++ public static boolean isXPStyleEnabled() {
++ return false;
++ }
++
+ public static void paintBackground(int[] buffer, String widget,
+ int part, int state, int x, int y, int w, int h, int stride) {
+ }
+--- ./jdk/src/solaris/classes/sun/nio/fs/UnixPath.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/classes/sun/nio/fs/UnixPath.java Mon Jan 05 11:57:27 2015 -0800
+@@ -482,7 +482,7 @@
+ @Override
+ public Path normalize() {
+ final int count = getNameCount();
+- if (count == 0)
++ if (count == 0 || isEmpty())
+ return this;
+
+ boolean[] ignore = new boolean[count]; // true => ignore name
+--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c Mon Jan 05 11:57:27 2015 -0800
+@@ -602,9 +602,9 @@
+ */
+ 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;
++ 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);
+@@ -693,10 +693,11 @@
+ closeSafely(childenv[0]);
+ closeSafely(childenv[1]);
+
+- releaseBytes(env, prog, pprog);
+- releaseBytes(env, argBlock, pargBlock);
+- releaseBytes(env, envBlock, penvBlock);
+- releaseBytes(env, dir, c->pdir);
++ releaseBytes(env, helperpath, phelperpath);
++ releaseBytes(env, prog, pprog);
++ releaseBytes(env, argBlock, pargBlock);
++ releaseBytes(env, envBlock, penvBlock);
++ releaseBytes(env, dir, c->pdir);
+
+ free(c->argv);
+ free(c->envv);
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2011, 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
+@@ -530,9 +530,14 @@
+ jboolean isCopy;
+ int ret = -1;
+ int sock;
+- const char* name_utf;
++ const char* name_utf = NULL;
+
+- name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
++ if (name != NULL) {
++ name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
++ } else {
++ JNU_ThrowNullPointerException(env, "network interface name is NULL");
++ return ret;
++ }
+
+ if ((sock =openSocketWithFallback(env, name_utf)) < 0) {
+ (*env)->ReleaseStringUTFChars(env, name, name_utf);
+@@ -555,7 +560,12 @@
+ const char* name_utf;
+ int flags = 0;
+
+- name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
++ if (name != NULL) {
++ name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
++ } else {
++ JNU_ThrowNullPointerException(env, "network interface name is NULL");
++ return -1;
++ }
+
+ if ((sock = openSocketWithFallback(env, name_utf)) < 0) {
+ (*env)->ReleaseStringUTFChars(env, name, name_utf);
+@@ -1026,6 +1036,7 @@
+ */
+
+ #ifdef AF_INET6
++// unused arg ifname and struct if2
+ static int openSocketWithFallback(JNIEnv *env, const char *ifname){
+ int sock;
+ struct ifreq if2;
+@@ -1261,9 +1272,14 @@
+
+ static int getMTU(JNIEnv *env, int sock, const char *ifname) {
+ struct ifreq if2;
++ memset((char *) &if2, 0, sizeof(if2));
+
+- memset((char *) &if2, 0, sizeof(if2));
+- strcpy(if2.ifr_name, ifname);
++ if (ifname != NULL) {
++ strcpy(if2.ifr_name, ifname);
++ } else {
++ JNU_ThrowNullPointerException(env, "network interface name is NULL");
++ return -1;
++ }
+
+ if (ioctl(sock, SIOCGIFMTU, (char *)&if2) < 0) {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFMTU failed");
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -1625,10 +1625,12 @@
+ static jmethodID ni_ctrID;
+ static jfieldID ni_indexID;
+ static jfieldID ni_addrsID;
++ static jfieldID ni_nameID;
+
+ jobjectArray addrArray;
+ jobject addr;
+ jobject ni;
++ jobject ni_name;
+
+ struct in_addr in;
+ struct in_addr *inP = &in;
+@@ -1691,6 +1693,8 @@
+ ni_addrsID = (*env)->GetFieldID(env, c, "addrs",
+ "[Ljava/net/InetAddress;");
+ CHECK_NULL_RETURN(ni_addrsID, NULL);
++ ni_nameID = (*env)->GetFieldID(env, c,"name", "Ljava/lang/String;");
++ CHECK_NULL_RETURN(ni_nameID, NULL);
+ ni_class = (*env)->NewGlobalRef(env, c);
+ CHECK_NULL_RETURN(ni_class, NULL);
+ }
+@@ -1712,6 +1716,9 @@
+ CHECK_NULL_RETURN(addrArray, NULL);
+ (*env)->SetObjectArrayElement(env, addrArray, 0, addr);
+ (*env)->SetObjectField(env, ni, ni_addrsID, addrArray);
++ if (ni_name != NULL) {
++ (*env)->SetObjectField(env, ni, ni_nameID, ni_name);
++ }
+ return ni;
+ }
+
+@@ -1728,14 +1735,16 @@
+ static jfieldID ni_indexID;
+ static jfieldID ni_addrsID;
+ static jclass ia_class;
++ static jfieldID ni_nameID;
+ static jmethodID ia_anyLocalAddressID;
+
+- int index;
++ int index = 0;
+ int len = sizeof(index);
+
+ jobjectArray addrArray;
+ jobject addr;
+ jobject ni;
++ jobject ni_name;
+
+ #ifdef __linux__
+ /*
+@@ -1775,6 +1784,8 @@
+ "anyLocalAddress",
+ "()Ljava/net/InetAddress;");
+ CHECK_NULL_RETURN(ia_anyLocalAddressID, NULL);
++ ni_nameID = (*env)->GetFieldID(env, c,"name", "Ljava/lang/String;");
++ CHECK_NULL_RETURN(ni_nameID, NULL);
+ ni_class = (*env)->NewGlobalRef(env, c);
+ CHECK_NULL_RETURN(ni_class, NULL);
+ }
+@@ -1835,6 +1846,10 @@
+ CHECK_NULL_RETURN(addrArray, NULL);
+ (*env)->SetObjectArrayElement(env, addrArray, 0, addr);
+ (*env)->SetObjectField(env, ni, ni_addrsID, addrArray);
++ ni_name = (*env)->NewStringUTF(env, "");
++ if (ni_name != NULL) {
++ (*env)->SetObjectField(env, ni, ni_nameID, ni_name);
++ }
+ return ni;
+ }
+ #endif
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Mon Jan 05 11:57:27 2015 -0800
+@@ -172,7 +172,6 @@
+ break;
+ }
+ if ((fd = open(pathname, O_RDONLY)) == -1) {
+- fd = 0;
+ break;
+ }
+ if (read(fd, dbuf, size) != (ssize_t) size) {
+@@ -188,7 +187,7 @@
+ free((void *) dbuf);
+ dbuf = NULL;
+ (void) close(fd);
+- fd = 0;
++ fd = -1;
+ }
+ free((void *) pathname);
+ pathname = NULL;
+@@ -203,7 +202,7 @@
+ if (pathname != NULL) {
+ free((void *) pathname);
+ }
+- if (fd != 0) {
++ if (fd != -1) {
+ (void) close(fd);
+ }
+ if (dbuf != NULL) {
+--- ./jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h Mon Jan 05 11:57:27 2015 -0800
+@@ -62,6 +62,8 @@
+
+ #define MAX_ATR_SIZE 33 /* Maximum ATR size */
+
++#ifndef __APPLE__
++
+ typedef struct
+ {
+ const char *szReader;
+@@ -73,9 +75,6 @@
+ }
+ SCARD_READERSTATE_A;
+
+-typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A,
+- *LPSCARD_READERSTATE_A;
+-
+ typedef struct _SCARD_IO_REQUEST
+ {
+ unsigned long dwProtocol; /* Protocol identifier */
+@@ -83,6 +82,33 @@
+ }
+ SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST;
+
++#else // __APPLE__
++
++#pragma pack(1)
++typedef struct
++{
++ const char *szReader;
++ void *pvUserData;
++ uint32_t dwCurrentState;
++ uint32_t dwEventState;
++ uint32_t cbAtr;
++ unsigned char rgbAtr[MAX_ATR_SIZE];
++}
++SCARD_READERSTATE_A;
++
++typedef struct _SCARD_IO_REQUEST
++{
++ uint32_t dwProtocol; /* Protocol identifier */
++ uint32_t cbPciLength; /* Protocol Control Inf Length */
++}
++SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST;
++#pragma pack()
++
++#endif // __APPLE__
++
++typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A,
++ *LPSCARD_READERSTATE_A;
++
+ typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
+
+ extern SCARD_IO_REQUEST g_rgSCardT0Pci, g_rgSCardT1Pci,
+--- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 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
+@@ -32,8 +32,6 @@
+
+ #include <winscard.h>
+
+-#include <jni_util.h>
+-
+ #include "sun_security_smartcardio_PlatformPCSC.h"
+
+ #include "pcsc_md.h"
+@@ -50,12 +48,40 @@
+ FPTR_SCardEndTransaction scardEndTransaction;
+ FPTR_SCardControl scardControl;
+
++/*
++ * Throws a Java Exception by name
++ */
++void throwByName(JNIEnv *env, const char *name, const char *msg)
++{
++ jclass cls = (*env)->FindClass(env, name);
++
++ if (cls != 0) /* Otherwise an exception has already been thrown */
++ (*env)->ThrowNew(env, cls, msg);
++}
++
++/*
++ * Throws java.lang.NullPointerException
++ */
++void throwNullPointerException(JNIEnv *env, const char *msg)
++{
++ throwByName(env, "java/lang/NullPointerException", msg);
++}
++
++/*
++ * Throws java.io.IOException
++ */
++void throwIOException(JNIEnv *env, const char *msg)
++{
++ throwByName(env, "java/io/IOException", msg);
++}
++
++
+ void *findFunction(JNIEnv *env, void *hModule, char *functionName) {
+ void *fAddress = dlsym(hModule, functionName);
+ if (fAddress == NULL) {
+ char errorMessage[256];
+ snprintf(errorMessage, sizeof(errorMessage), "Symbol not found: %s", functionName);
+- JNU_ThrowNullPointerException(env, errorMessage);
++ throwNullPointerException(env, errorMessage);
+ return NULL;
+ }
+ return fAddress;
+@@ -64,21 +90,56 @@
+ JNIEXPORT void JNICALL Java_sun_security_smartcardio_PlatformPCSC_initialize
+ (JNIEnv *env, jclass thisClass, jstring jLibName) {
+ const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
++ if (libName == NULL) {
++ throwNullPointerException(env, "PCSC library name is null");
++ return;
++ }
+ hModule = dlopen(libName, RTLD_LAZY);
+ (*env)->ReleaseStringUTFChars(env, jLibName, libName);
+
+ if (hModule == NULL) {
+- JNU_ThrowIOException(env, dlerror());
++ throwIOException(env, dlerror());
+ return;
+ }
+ scardEstablishContext = (FPTR_SCardEstablishContext)findFunction(env, hModule, "SCardEstablishContext");
++ if ((*env)->ExceptionCheck(env)) {
++ return;
++ }
+ scardConnect = (FPTR_SCardConnect) findFunction(env, hModule, "SCardConnect");
++ if ((*env)->ExceptionCheck(env)) {
++ return;
++ }
+ scardDisconnect = (FPTR_SCardDisconnect) findFunction(env, hModule, "SCardDisconnect");
++ if ((*env)->ExceptionCheck(env)) {
++ return;
++ }
+ scardStatus = (FPTR_SCardStatus) findFunction(env, hModule, "SCardStatus");
++ if ((*env)->ExceptionCheck(env)) {
++ return;
++ }
+ scardGetStatusChange = (FPTR_SCardGetStatusChange) findFunction(env, hModule, "SCardGetStatusChange");
++ if ((*env)->ExceptionCheck(env)) {
++ return;
++ }
+ scardTransmit = (FPTR_SCardTransmit) findFunction(env, hModule, "SCardTransmit");
++ if ((*env)->ExceptionCheck(env)) {
++ return;
++ }
+ scardListReaders = (FPTR_SCardListReaders) findFunction(env, hModule, "SCardListReaders");
++ if ((*env)->ExceptionCheck(env)) {
++ return;
++ }
+ scardBeginTransaction = (FPTR_SCardBeginTransaction)findFunction(env, hModule, "SCardBeginTransaction");
++ if ((*env)->ExceptionCheck(env)) {
++ return;
++ }
+ scardEndTransaction = (FPTR_SCardEndTransaction) findFunction(env, hModule, "SCardEndTransaction");
++ if ((*env)->ExceptionCheck(env)) {
++ return;
++ }
++#ifndef __APPLE__
+ scardControl = (FPTR_SCardControl) findFunction(env, hModule, "SCardControl");
++#else
++ scardControl = (FPTR_SCardControl) findFunction(env, hModule, "SCardControl132");
++#endif // __APPLE__
+ }
+--- ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java Mon Jan 05 11:57:27 2015 -0800
+@@ -253,7 +253,7 @@
+ if (file == null) {
+ file = getDesktop();
+ }
+- return file;
++ return checkFile(file);
+ } else if (key.equals("roots")) {
+ // Should be "History" and "Desktop" ?
+ if (roots == null) {
+@@ -264,11 +264,11 @@
+ roots = (File[])super.get(key);
+ }
+ }
+- return roots;
++ return checkFiles(roots);
+ } else if (key.equals("fileChooserComboBoxFolders")) {
+ Win32ShellFolder2 desktop = getDesktop();
+
+- if (desktop != null) {
++ if (desktop != null && checkFile(desktop) != null) {
+ ArrayList<File> folders = new ArrayList<File>();
+ Win32ShellFolder2 drives = getDrives();
+
+@@ -279,7 +279,7 @@
+
+ folders.add(desktop);
+ // Add all second level folders
+- File[] secondLevelFolders = desktop.listFiles();
++ File[] secondLevelFolders = checkFiles(desktop.listFiles());
+ Arrays.sort(secondLevelFolders);
+ for (File secondLevelFolder : secondLevelFolders) {
+ Win32ShellFolder2 folder = (Win32ShellFolder2) secondLevelFolder;
+@@ -287,7 +287,7 @@
+ folders.add(folder);
+ // Add third level for "My Computer"
+ if (folder.equals(drives)) {
+- File[] thirdLevelFolders = folder.listFiles();
++ File[] thirdLevelFolders = checkFiles(folder.listFiles());
+ if (thirdLevelFolders != null && thirdLevelFolders.length > 0) {
+ List<File> thirdLevelFoldersList = Arrays.asList(thirdLevelFolders);
+
+@@ -297,7 +297,7 @@
+ }
+ }
+ }
+- return folders.toArray(new File[folders.size()]);
++ return checkFiles(folders);
+ } else {
+ return super.get(key);
+ }
+@@ -334,7 +334,7 @@
+ }
+ }
+ }
+- return folders.toArray(new File[folders.size()]);
++ return checkFiles(folders);
+ } else if (key.startsWith("fileChooserIcon ")) {
+ String name = key.substring(key.indexOf(" ") + 1);
+
+@@ -380,6 +380,47 @@
+ return null;
+ }
+
++ private File checkFile(File file) {
++ SecurityManager sm = System.getSecurityManager();
++ return (sm == null || file == null) ? file : checkFile(file, sm);
++ }
++
++ private File checkFile(File file, SecurityManager sm) {
++ try {
++ sm.checkRead(file.getPath());
++ return file;
++ } catch (SecurityException se) {
++ return null;
++ }
++ }
++
++ private File[] checkFiles(File[] files) {
++ SecurityManager sm = System.getSecurityManager();
++ if (sm == null || files == null || files.length == 0) {
++ return files;
++ }
++ return checkFiles(Arrays.asList(files), sm);
++ }
++
++ private File[] checkFiles(List<File> files) {
++ SecurityManager sm = System.getSecurityManager();
++ if (sm == null || files.isEmpty()) {
++ return files.toArray(new File[files.size()]);
++ }
++ return checkFiles(files, sm);
++ }
++
++ private File[] checkFiles(List<File> files, SecurityManager sm) {
++ List<File> checkedFiles = new ArrayList<File>(files.size());
++ for (File file: files) {
++ if(checkFile(file, sm) != null){
++ checkedFiles.add(file);
++ }
++ }
++
++ return checkedFiles.toArray(new File[checkedFiles.size()]);
++ }
++
+ /**
+ * Does <code>dir</code> represent a "computer" such as a node on the network, or
+ * "My Computer" on the desktop.
+--- ./jdk/src/windows/classes/sun/awt/windows/ThemeReader.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/windows/ThemeReader.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -58,6 +58,8 @@
+ private static final Lock writeLock = readWriteLock.writeLock();
+ private static volatile boolean valid = false;
+
++ static volatile boolean xpStyleEnabled;
++
+ static void flush() {
+ // Could be called on Toolkit thread, so do not try to aquire locks
+ // to avoid deadlock with theme initialization
+@@ -66,6 +68,10 @@
+
+ public native static boolean isThemed();
+
++ public static boolean isXPStyleEnabled() {
++ return xpStyleEnabled;
++ }
++
+ // this should be called only with writeLock held
+ private static Long getThemeImpl(String widget) {
+ Long theme = widgetToTheme.get(widget);
+--- ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java Mon Jan 05 11:57:27 2015 -0800
+@@ -36,6 +36,7 @@
+ import java.beans.PropertyChangeListener;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
++import sun.awt.AppContext;
+ import sun.awt.AWTAutoShutdown;
+ import sun.awt.AppContext;
+ import sun.awt.SunToolkit;
+@@ -70,6 +71,9 @@
+
+ private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.windows.WToolkit");
+
++ // Desktop property which specifies whether XP visual styles are in effect
++ public static final String XPSTYLE_THEME_ACTIVE = "win.xpstyle.themeActive";
++
+ static GraphicsConfiguration config;
+
+ // System clipboard.
+@@ -829,7 +833,7 @@
+ private synchronized void lazilyInitWProps() {
+ if (wprops == null) {
+ wprops = new WDesktopProperties(this);
+- updateProperties();
++ updateProperties(wprops.getProperties());
+ }
+ }
+
+@@ -864,27 +868,41 @@
+ * Windows doesn't always send WM_SETTINGCHANGE when it should.
+ */
+ private void windowsSettingChange() {
++ // JDK-8039383: Have to update the value of XPSTYLE_THEME_ACTIVE property
++ // as soon as possible to prevent NPE and other errors because theme data
++ // has become unavailable.
++ final Map<String, Object> props = getWProps();
++ if (props == null) {
++ // props has not been initialized, so we have nothing to update
++ return;
++ }
++
++ updateXPStyleEnabled(props.get(XPSTYLE_THEME_ACTIVE));
++
+ if (AppContext.getAppContext() == null) {
+ // We cannot post the update to any EventQueue. Listeners will
+ // be called on EDTs by DesktopPropertyChangeSupport
+- updateProperties();
++ updateProperties(props);
+ } else {
++ // Cannot update on Toolkit thread.
++ // DesktopPropertyChangeSupport will call listeners on Toolkit
++ // thread if it has AppContext (standalone mode)
+ EventQueue.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+- updateProperties();
++ updateProperties(props);
+ }
+ });
+ }
+ }
+
+- private synchronized void updateProperties() {
+- if (null == wprops) {
+- // wprops has not been initialized, so we have nothing to update
++ private synchronized void updateProperties(final Map<String, Object> props) {
++ if (null == props) {
+ return;
+ }
+
+- Map<String, Object> props = wprops.getProperties();
++ updateXPStyleEnabled(props.get(XPSTYLE_THEME_ACTIVE));
++
+ for (String propName : props.keySet()) {
+ Object val = props.get(propName);
+ if (log.isLoggable(PlatformLogger.FINER)) {
+@@ -1013,6 +1031,14 @@
+
+ private native synchronized int getNumberOfButtonsImpl();
+
++ private synchronized Map<String, Object> getWProps() {
++ return (wprops != null) ? wprops.getProperties() : null;
++ }
++
++ private void updateXPStyleEnabled(final Object dskProp) {
++ ThemeReader.xpStyleEnabled = Boolean.TRUE.equals(dskProp);
++ }
++
+ @Override
+ public int getNumberOfButtons(){
+ if (numberOfButtons == 0) {
+--- ./jdk/src/windows/native/java/net/NetworkInterface.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/native/java/net/NetworkInterface.c Mon Jan 05 11:57:27 2015 -0800
+@@ -175,7 +175,7 @@
+ int count;
+ netif *netifP;
+ DWORD i;
+- int lo=0, eth=0, tr=0, fddi=0, ppp=0, sl=0, net=0, wlen=0;
++ int lo=0, eth=0, tr=0, fddi=0, ppp=0, sl=0, wlan=0, net=0, wlen=0;
+
+ /*
+ * Ask the IP Helper library to enumerate the adapters
+@@ -215,15 +215,15 @@
+ */
+ switch (ifrowP->dwType) {
+ case MIB_IF_TYPE_ETHERNET:
+- sprintf(dev_name, "eth%d", eth++);
++ _snprintf_s(dev_name, 8, _TRUNCATE, "eth%d", eth++);
+ break;
+
+ case MIB_IF_TYPE_TOKENRING:
+- sprintf(dev_name, "tr%d", tr++);
++ _snprintf_s(dev_name, 8, _TRUNCATE, "tr%d", tr++);
+ break;
+
+ case MIB_IF_TYPE_FDDI:
+- sprintf(dev_name, "fddi%d", fddi++);
++ _snprintf_s(dev_name, 8, _TRUNCATE, "fddi%d", fddi++);
+ break;
+
+ case MIB_IF_TYPE_LOOPBACK:
+@@ -231,20 +231,24 @@
+ if (lo > 0) {
+ continue;
+ }
+- strcpy(dev_name, "lo");
++ strncpy_s(dev_name, 8, "lo", _TRUNCATE);
+ lo++;
+ break;
+
+ case MIB_IF_TYPE_PPP:
+- sprintf(dev_name, "ppp%d", ppp++);
++ _snprintf_s(dev_name, 8, _TRUNCATE, "ppp%d", ppp++);
+ break;
+
+ case MIB_IF_TYPE_SLIP:
+- sprintf(dev_name, "sl%d", sl++);
++ _snprintf_s(dev_name, 8, _TRUNCATE, "sl%d", sl++);
++ break;
++
++ case IF_TYPE_IEEE80211:
++ _snprintf_s(dev_name, 8, _TRUNCATE, "wlan%d", wlan++);
+ break;
+
+ default:
+- sprintf(dev_name, "net%d", net++);
++ _snprintf_s(dev_name, 8, _TRUNCATE, "net%d", net++);
+ }
+
+ /*
+@@ -409,6 +413,7 @@
+ case MIB_IF_TYPE_TOKENRING:
+ case MIB_IF_TYPE_FDDI:
+ case MIB_IF_TYPE_LOOPBACK:
++ case IF_TYPE_IEEE80211:
+ /**
+ * Contrary to what it seems to indicate, dwBCastAddr doesn't
+ * contain the broadcast address but 0 or 1 depending on whether
+@@ -856,7 +861,7 @@
+ MIB_IFROW *ifRowP;
+ ifRowP = getIF(index);
+ if (ifRowP != NULL) {
+- ret = ifRowP->dwAdminStatus == 1 &&
++ ret = ifRowP->dwAdminStatus == MIB_IF_ADMIN_STATUS_UP &&
+ (ifRowP->dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL ||
+ ifRowP->dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED);
+ free(ifRowP);
+@@ -949,6 +954,7 @@
+ case MIB_IF_TYPE_ETHERNET:
+ case MIB_IF_TYPE_TOKENRING:
+ case MIB_IF_TYPE_FDDI:
++ case IF_TYPE_IEEE80211:
+ len = ifRowP->dwPhysAddrLen;
+ ret = (*env)->NewByteArray(env, len);
+ if (!IS_NULL(ret)) {
+--- ./jdk/src/windows/native/java/net/NetworkInterface.h Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/native/java/net/NetworkInterface.h Mon Jan 05 11:57:27 2015 -0800
+@@ -88,4 +88,9 @@
+
+ int enumInterfaces(JNIEnv *env, netif **netifPP);
+
++// Windows Visa (and later) only.....
++#ifndef IF_TYPE_IEEE80211
++#define IF_TYPE_IEEE80211 71
+ #endif
++
++#endif
+--- ./jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c Mon Jan 05 11:57:27 2015 -0800
+@@ -43,6 +43,7 @@
+ #include "java_net_SocketOptions.h"
+ #include "java_net_NetworkInterface.h"
+
++#include "NetworkInterface.h"
+ #include "jvm.h"
+ #include "jni_util.h"
+ #include "net_util.h"
+@@ -1638,6 +1639,33 @@
+ return (*env)->GetIntField(env, nif, ni_indexID);
+ }
+
++static int isAdapterIpv6Enabled(JNIEnv *env, int index) {
++ netif *ifList, *curr;
++ int ipv6Enabled = 0;
++ if (getAllInterfacesAndAddresses (env, &ifList) < 0) {
++ return ipv6Enabled;
++ }
++
++ /* search by index */
++ curr = ifList;
++ while (curr != NULL) {
++ if (index == curr->index) {
++ break;
++ }
++ curr = curr->next;
++ }
++
++ /* if found ipv6Index != 0 then interface is configured with IPV6 */
++ if ((curr != NULL) && (curr->ipv6Index !=0)) {
++ ipv6Enabled = 1;
++ }
++
++ /* release the interface list */
++ free_netif(ifList);
++
++ return ipv6Enabled;
++}
++
+ /*
+ * Sets the multicast interface.
+ *
+@@ -1697,7 +1725,6 @@
+ struct in_addr in;
+
+ in.s_addr = htonl(getInetAddress_addr(env, value));
+-
+ if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
+ (const char*)&in, sizeof(in)) < 0) {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
+@@ -1728,19 +1755,20 @@
+ }
+ index = (*env)->GetIntField(env, value, ni_indexID);
+
+- if (setsockopt(fd1, IPPROTO_IPV6, IPV6_MULTICAST_IF,
++ if ( isAdapterIpv6Enabled(env, index) != 0 ) {
++ if (setsockopt(fd1, IPPROTO_IPV6, IPV6_MULTICAST_IF,
+ (const char*)&index, sizeof(index)) < 0) {
+- if (errno == EINVAL && index > 0) {
+- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
+- "IPV6_MULTICAST_IF failed (interface has IPv4 "
+- "address only?)");
+- } else {
+- NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
++ if (errno == EINVAL && index > 0) {
++ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
++ "IPV6_MULTICAST_IF failed (interface has IPv4 "
++ "address only?)");
++ } else {
++ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
+ "Error setting socket option");
++ }
++ return;
+ }
+- return;
+ }
+-
+ /* If there are any IPv4 addresses on this interface then
+ * repeat the operation on the IPv4 fd */
+
+@@ -1791,7 +1819,6 @@
+ char c;
+ } optval;
+ int ipv6_supported = ipv6_available();
+-
+ fd = getFD(env, this);
+
+ if (ipv6_supported) {
+@@ -1892,42 +1919,21 @@
+ }
+
+ /*
+- * Return the multicast interface:
+ *
+- * SocketOptions.IP_MULTICAST_IF
+- * IPv4: Query IPPROTO_IP/IP_MULTICAST_IF
+- * Create InetAddress
+- * IP_MULTICAST_IF returns struct ip_mreqn on 2.2
+- * kernel but struct in_addr on 2.4 kernel
+- * IPv6: Query IPPROTO_IPV6 / IPV6_MULTICAST_IF or
+- * obtain from impl is Linux 2.2 kernel
+- * If index == 0 return InetAddress representing
+- * anyLocalAddress.
+- * If index > 0 query NetworkInterface by index
+- * and returns addrs[0]
++ * called by getMulticastInterface to retrieve a NetworkInterface
++ * configured for IPv4.
++ * The ipv4Mode parameter, is a closet boolean, which allows for a NULL return,
++ * or forces the creation of a NetworkInterface object with null data.
++ * It relates to its calling context in getMulticastInterface.
++ * ipv4Mode == 1, the context is IPV4 processing only.
++ * ipv4Mode == 0, the context is IPV6 processing
+ *
+- * SocketOptions.IP_MULTICAST_IF2
+- * IPv4: Query IPPROTO_IP/IP_MULTICAST_IF
+- * Query NetworkInterface by IP address and
+- * return the NetworkInterface that the address
+- * is bound too.
+- * IPv6: Query IPPROTO_IPV6 / IPV6_MULTICAST_IF
+- * (except Linux .2 kernel)
+- * Query NetworkInterface by index and
+- * return NetworkInterface.
+ */
+-jobject getMulticastInterface(JNIEnv *env, jobject this, int fd, int fd1, jint opt) {
+- jboolean isIPV4 = !ipv6_available() || fd1 == -1;
+-
+- /*
+- * IPv4 implementation
+- */
+- if (isIPV4) {
++static jobject getIPv4NetworkInterface (JNIEnv *env, jobject this, int fd, jint opt, int ipv4Mode) {
+ static jclass inet4_class;
+ static jmethodID inet4_ctrID;
+
+- static jclass ni_class;
+- static jmethodID ni_ctrID;
++ static jclass ni_class; static jmethodID ni_ctrID;
+ static jfieldID ni_indexID;
+ static jfieldID ni_addrsID;
+
+@@ -1938,7 +1944,6 @@
+ struct in_addr in;
+ struct in_addr *inP = &in;
+ int len = sizeof(struct in_addr);
+-
+ if (getsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
+ (char *)inP, &len) < 0) {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
+@@ -1990,24 +1995,58 @@
+ if (ni) {
+ return ni;
+ }
++ if (ipv4Mode) {
++ ni = (*env)->NewObject(env, ni_class, ni_ctrID, 0);
++ CHECK_NULL_RETURN(ni, NULL);
+
+- /*
+- * The address doesn't appear to be bound at any known
+- * NetworkInterface. Therefore we construct a NetworkInterface
+- * with this address.
+- */
+- ni = (*env)->NewObject(env, ni_class, ni_ctrID, 0);
+- CHECK_NULL_RETURN(ni, NULL);
++ (*env)->SetIntField(env, ni, ni_indexID, -1);
++ addrArray = (*env)->NewObjectArray(env, 1, inet4_class, NULL);
++ CHECK_NULL_RETURN(addrArray, NULL);
++ (*env)->SetObjectArrayElement(env, addrArray, 0, addr);
++ (*env)->SetObjectField(env, ni, ni_addrsID, addrArray);
++ } else {
++ ni = NULL;
++ }
++ return ni;
++}
+
+- (*env)->SetIntField(env, ni, ni_indexID, -1);
+- addrArray = (*env)->NewObjectArray(env, 1, inet4_class, NULL);
+- CHECK_NULL_RETURN(addrArray, NULL);
+- (*env)->SetObjectArrayElement(env, addrArray, 0, addr);
+- (*env)->SetObjectField(env, ni, ni_addrsID, addrArray);
+- return ni;
++/*
++ * Return the multicast interface:
++ *
++ * SocketOptions.IP_MULTICAST_IF
++ * IPv4: Query IPPROTO_IP/IP_MULTICAST_IF
++ * Create InetAddress
++ * IP_MULTICAST_IF returns struct ip_mreqn on 2.2
++ * kernel but struct in_addr on 2.4 kernel
++ * IPv6: Query IPPROTO_IPV6 / IPV6_MULTICAST_IF or
++ * obtain from impl is Linux 2.2 kernel
++ * If index == 0 return InetAddress representing
++ * anyLocalAddress.
++ * If index > 0 query NetworkInterface by index
++ * and returns addrs[0]
++ *
++ * SocketOptions.IP_MULTICAST_IF2
++ * IPv4: Query IPPROTO_IP/IP_MULTICAST_IF
++ * Query NetworkInterface by IP address and
++ * return the NetworkInterface that the address
++ * is bound too.
++ * IPv6: Query IPPROTO_IPV6 / IPV6_MULTICAST_IF
++ * (except Linux .2 kernel)
++ * Query NetworkInterface by index and
++ * return NetworkInterface.
++ */
++jobject getMulticastInterface(JNIEnv *env, jobject this, int fd, int fd1, jint opt) {
++ jboolean isIPV4 = !ipv6_available() || fd1 == -1;
++
++ /*
++ * IPv4 implementation
++ */
++ if (isIPV4) {
++ jobject netObject = NULL; // return is either an addr or a netif
++ netObject = getIPv4NetworkInterface(env, this, fd, opt, 1);
++ return netObject;
+ }
+
+-
+ /*
+ * IPv6 implementation
+ */
+@@ -2097,6 +2136,13 @@
+
+ addr = (*env)->GetObjectArrayElement(env, addrArray, 0);
+ return addr;
++ } else if (index == 0) { // index == 0 typically means IPv6 not configured on the interfaces
++ // falling back to treat interface as configured for IPv4
++ jobject netObject = NULL;
++ netObject = getIPv4NetworkInterface(env, this, fd, opt, 0);
++ if (netObject != NULL) {
++ return netObject;
++ }
+ }
+
+ /*
+@@ -2121,6 +2167,8 @@
+ }
+ return NULL;
+ }
++
++
+ /*
+ * Returns relevant info as a jint.
+ *
+--- ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c Mon Jan 05 11:57:27 2015 -0800
+@@ -576,6 +576,7 @@
+ {
+ /* fields on this */
+ jint port;
++ jint scope;
+ jint timeout = (*env)->GetIntField(env, this, psi_timeoutID);
+ jobject fdObj = (*env)->GetObjectField(env, this, psi_fdID);
+ jobject fd1Obj = (*env)->GetObjectField(env, this, psi_fd1ID);
+@@ -751,9 +752,12 @@
+ return;
+ }
+ setInet6Address_ipaddress(env, socketAddressObj, (const char *)&him.him6.sin6_addr);
+-
+ setInetAddress_family(env, socketAddressObj, IPv6);
+- setInet6Address_scopeid(env, socketAddressObj, him.him6.sin6_scope_id);
++ scope = him.him6.sin6_scope_id;
++ (*env)->SetIntField(env, socketAddressObj, ia6_scopeidID, scope);
++ if(scope>0) {
++ (*env)->SetBooleanField(env, socketAddressObj, ia6_scopeidsetID, JNI_TRUE);
++ }
+ }
+ /* fields common to AF_INET and AF_INET6 */
+
+--- ./jdk/src/windows/native/sun/security/krb5/NativeCreds.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/native/sun/security/krb5/NativeCreds.c Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2013, 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
+@@ -397,7 +397,7 @@
+ jobject ticketFlags, startTime, endTime, krbCreds = NULL;
+ jobject authTime, renewTillTime, hostAddresses = NULL;
+ KERB_EXTERNAL_TICKET *msticket;
+- int found_in_cache = 0;
++ int found = 0;
+ FILETIME Now, EndTime, LocalEndTime;
+
+ int i, netypes;
+@@ -485,7 +485,7 @@
+ if (CompareFileTime(&Now, &LocalEndTime) < 0) {
+ for (i=0; i<netypes; i++) {
+ if (etypes[i] == msticket->SessionKey.KeyType) {
+- found_in_cache = 1;
++ found = 1;
+ if (native_debug) {
+ printf("LSA: Valid etype found: %d\n", etypes[i]);
+ }
+@@ -495,7 +495,7 @@
+ }
+ }
+
+- if (!found_in_cache) {
++ if (!found) {
+ if (native_debug) {
+ printf("LSA: MS TGT in cache is invalid/not supported; request new ticket\n");
+ }
+@@ -538,6 +538,13 @@
+
+ // got the native MS Kerberos TGT
+ msticket = &(pTicketResponse->Ticket);
++ if (msticket->SessionKey.KeyType != etypes[i]) {
++ if (native_debug) {
++ printf("LSA: Response etype is %d for %d. Retry.\n", msticket->SessionKey.KeyType, etypes[i]);
++ }
++ continue;
++ }
++ found = 1;
+ break;
+ }
+ }
+@@ -590,6 +597,10 @@
+ PUCHAR Value;
+ } KERB_CRYPTO_KEY, *PKERB_CRYPTO_KEY;
+
++ if (!found) {
++ break;
++ }
++
+ */
+ // Build a com.sun.security.krb5.Ticket
+ ticket = BuildTicket(env, msticket->EncodedTicket,
+--- ./jdk/src/windows/native/sun/windows/awt_Component.cpp Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/native/sun/windows/awt_Component.cpp Mon Jan 05 11:57:27 2015 -0800
+@@ -491,7 +491,12 @@
+ * member is referred in the GetClassName method of AwtLabel class.
+ * So m_peerObject member must be set here.
+ */
+- m_peerObject = env->NewGlobalRef(peer);
++ if (m_peerObject == NULL) {
++ m_peerObject = env->NewGlobalRef(peer);
++ } else {
++ assert(env->IsSameObject(m_peerObject, peer));
++ }
++
+ RegisterClass();
+
+ jobject target = env->GetObjectField(peer, AwtObject::targetID);
+@@ -2126,19 +2131,7 @@
+ }
+
+ jlong getMessageTimeUTC() {
+- return windowsToUTC(getMessageTimeWindows());
+- }
+-
+- // If calling order of GetTickCount and JVM_CurrentTimeMillis
+- // is swapped, it would sometimes give different result.
+- // Anyway, we would not always have determinism
+- // and sortedness of time conversion here (due to Windows's
+- // timers peculiarities). Having some euristic algorithm might
+- // help here.
+- jlong windowsToUTC(DWORD windowsTime) {
+- jlong offset = ::GetTickCount() - windowsTime;
+- jlong jvm_time = ::JVM_CurrentTimeMillis(NULL, 0);
+- return jvm_time - offset;
++ return ::JVM_CurrentTimeMillis(NULL, 0);
+ }
+ } //TimeHelper
+
+@@ -3561,7 +3554,7 @@
+
+
+ SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_PRESSED,
+- TimeHelper::windowsToUTC(msg.time), jkey, character,
++ TimeHelper::getMessageTimeUTC(), jkey, character,
+ modifiers, keyLocation, (jlong)wkey, &msg);
+
+ // bugid 4724007: Windows does not create a WM_CHAR for the Del key
+@@ -3571,7 +3564,7 @@
+ // for Java - we don't want Windows trying to process it).
+ if (jkey == java_awt_event_KeyEvent_VK_DELETE) {
+ SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_TYPED,
+- TimeHelper::windowsToUTC(msg.time),
++ TimeHelper::getMessageTimeUTC(),
+ java_awt_event_KeyEvent_VK_UNDEFINED,
+ character, modifiers,
+ java_awt_event_KeyEvent_KEY_LOCATION_UNKNOWN, (jlong)0);
+@@ -3603,7 +3596,7 @@
+ UpdateDynPrimaryKeymap(wkey, jkey, keyLocation, modifiers);
+
+ SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_RELEASED,
+- TimeHelper::windowsToUTC(msg.time), jkey, character,
++ TimeHelper::getMessageTimeUTC(), jkey, character,
+ modifiers, keyLocation, (jlong)wkey, &msg);
+ return mrConsume;
+ }
+@@ -3648,7 +3641,7 @@
+
+ jint modifiers = GetJavaModifiers();
+ SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_TYPED,
+- TimeHelper::windowsToUTC(msg.time),
++ TimeHelper::getMessageTimeUTC(),
+ java_awt_event_KeyEvent_VK_UNDEFINED,
+ unicodeChar, modifiers,
+ java_awt_event_KeyEvent_KEY_LOCATION_UNKNOWN, (jlong)0,
+@@ -3717,7 +3710,7 @@
+ InitMessage(&msg, message, character,
+ MAKELPARAM(repCnt, flags));
+ SendKeyEventToFocusOwner(java_awt_event_KeyEvent_KEY_TYPED,
+- TimeHelper::windowsToUTC(msg.time),
++ TimeHelper::getMessageTimeUTC(),
+ java_awt_event_KeyEvent_VK_UNDEFINED,
+ unicodeChar, modifiers,
+ java_awt_event_KeyEvent_KEY_LOCATION_UNKNOWN, (jlong)0,
+--- ./jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp Mon Jan 05 11:57:27 2015 -0800
+@@ -325,7 +325,7 @@
+
+ MsgRouting AwtTrayIcon::WmMouseDown(UINT flags, int x, int y, int button)
+ {
+- jlong now = TimeHelper::windowsToUTC(::GetTickCount());
++ jlong now = TimeHelper::getMessageTimeUTC();
+ jint javaModif = AwtComponent::GetJavaModifiers();
+
+ if (lastClickTrIc == this &&
+@@ -361,14 +361,14 @@
+ MSG msg;
+ AwtComponent::InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
+
+- SendMouseEvent(java_awt_event_MouseEvent_MOUSE_RELEASED, TimeHelper::windowsToUTC(::GetTickCount()),
++ SendMouseEvent(java_awt_event_MouseEvent_MOUSE_RELEASED, TimeHelper::getMessageTimeUTC(),
+ x, y, AwtComponent::GetJavaModifiers(), clickCount,
+ (AwtComponent::GetButton(button) == java_awt_event_MouseEvent_BUTTON3 ?
+ TRUE : FALSE), AwtComponent::GetButton(button), &msg);
+
+ if ((m_mouseButtonClickAllowed & AwtComponent::GetButtonMK(button)) != 0) { // No up-button in the drag-state
+ SendMouseEvent(java_awt_event_MouseEvent_MOUSE_CLICKED,
+- TimeHelper::windowsToUTC(::GetTickCount()), x, y, AwtComponent::GetJavaModifiers(),
++ TimeHelper::getMessageTimeUTC(), x, y, AwtComponent::GetJavaModifiers(),
+ clickCount, JNI_FALSE, AwtComponent::GetButton(button));
+ }
+ m_mouseButtonClickAllowed &= ~AwtComponent::GetButtonMK(button); // Exclude the up-button from the drag-state
+@@ -395,7 +395,7 @@
+ if ((flags & ALL_MK_BUTTONS) != 0) {
+ m_mouseButtonClickAllowed = 0;
+ } else {
+- SendMouseEvent(java_awt_event_MouseEvent_MOUSE_MOVED, TimeHelper::windowsToUTC(::GetTickCount()), x, y,
++ SendMouseEvent(java_awt_event_MouseEvent_MOUSE_MOVED, TimeHelper::getMessageTimeUTC(), x, y,
+ AwtComponent::GetJavaModifiers(), 0, JNI_FALSE,
+ java_awt_event_MouseEvent_NOBUTTON, &msg);
+ }
+@@ -408,7 +408,7 @@
+ if (AwtComponent::GetJavaModifiers() & java_awt_event_InputEvent_BUTTON1_DOWN_MASK) {
+ MSG msg;
+ AwtComponent::InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
+- SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, TimeHelper::windowsToUTC(::GetTickCount()),
++ SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, TimeHelper::getMessageTimeUTC(),
+ AwtComponent::GetJavaModifiers(), &msg);
+ }
+ return mrConsume;
+@@ -417,14 +417,14 @@
+ MsgRouting AwtTrayIcon::WmKeySelect(UINT flags, int x, int y)
+ {
+ static jlong lastKeySelectTime = 0;
+- jlong now = TimeHelper::windowsToUTC(::GetTickCount());
++ jlong now = TimeHelper::getMessageTimeUTC();
+
+ // If a user selects a notify icon with the ENTER key,
+ // Shell 5.0 sends double NIN_KEYSELECT notification.
+ if (lastKeySelectTime != now) {
+ MSG msg;
+ AwtComponent::InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
+- SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, TimeHelper::windowsToUTC(::GetTickCount()),
++ SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, TimeHelper::getMessageTimeUTC(),
+ AwtComponent::GetJavaModifiers(), &msg);
+ }
+ lastKeySelectTime = now;
+@@ -441,7 +441,7 @@
+ if (clickCount == 2) {
+ MSG msg;
+ AwtComponent::InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
+- SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, TimeHelper::windowsToUTC(::GetTickCount()),
++ SendActionEvent(java_awt_event_ActionEvent_ACTION_PERFORMED, TimeHelper::getMessageTimeUTC(),
+ AwtComponent::GetJavaModifiers(), &msg);
+ }
+ return mrConsume;
+--- ./jdk/src/windows/transport/shmem/shmem_md.c Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/src/windows/transport/shmem/shmem_md.c Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -30,6 +30,11 @@
+ #include "sysShmem.h"
+ #include "shmemBase.h" /* for exitTransportWithError */
+
++/* Use THIS_FILE when it is available. */
++#ifndef THIS_FILE
++ #define THIS_FILE __FILE__
++#endif
++
+ /*
+ * These functions are not completely universal. For now, they are used
+ * exclusively for Jbug's shared memory transport mechanism. They have
+--- ./jdk/test/ProblemList.txt Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/ProblemList.txt Mon Jan 05 11:57:27 2015 -0800
+@@ -384,9 +384,6 @@
+
+ # jdk_tools
+
+-# 6461635
+-com/sun/tools/attach/BasicTests.sh generic-all
+-
+ # Filed 6986875
+ sun/tools/jps/jps-Vvml.sh generic-all
+
+@@ -396,10 +393,6 @@
+ # 7132203
+ sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all
+
+-# 8001118
+-sun/tools/jcmd/jcmd-f.sh generic-all
+-sun/tools/jcmd/jcmd-help-help.sh generic-all
+-
+ # 7175775
+ sun/tools/jinfo/Basic.sh macosx-all
+
+@@ -444,9 +437,6 @@
+ # Problems on windows, jmap.exe hangs? (these run jmap), fails on Solaris 10 x86
+ java/util/concurrent/locks/Lock/TimedAcquireLeak.java generic-all
+
+-# 7041639, Solaris DSA keypair generation bug
+-java/util/TimeZone/TimeZoneDatePermissionCheck.sh solaris-all
+-
+ # 8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing
+ sun/util/resources/TimeZone/Bug6317929.java generic-all
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/corba/5036554/JavaBug.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,37 @@
++/*
++ * 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.
++ */
++
++package bug;
++
++public class JavaBug {
++ public static void main(String[] args) {
++ try {
++ org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init(args, null);
++ org.omg.CORBA.Any any = orb.create_any();
++ myStringHelper.insert(any, "hello");
++ System.out.println("Any: " + myStringHelper.extract(any));
++ } catch( Exception e ) {
++ e.printStackTrace();
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/corba/5036554/README Mon Jan 05 11:57:27 2015 -0800
+@@ -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.
++ */
++
++Bug # 5036554 unmarshal error on CORBA alias type in CORBA any
++
++Platform : ALL
++
++Testcase directory : <.../corba>
++
++Test Procedure : <STEPS TO FOLLOW TO REPRODUCE THE PROBLEM :
++Step 1: create a file bug.idl with the following content:
++
++// IDL file bug.idl
++module bug {
++ typedef string myString;
++};
++
++Step 2: Translate bug.idl with the command: idlj bug.idl
++This will create the file bug/myStringHelper.java
++
++Step 3:
++Create the file JavaBug.java in directory bug with the following content:
++
++// Java file JavaBug.java
++package bug;
++
++public class JavaBug {
++ public static void main(String[] args) {
++ try {
++ org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init(args, null);
++ org.omg.CORBA.Any any = orb.create_any();
++ myStringHelper.insert(any, "hello");
++ System.out.println("Any: " + myStringHelper.extract(any));
++ } catch( Exception e ) {
++ e.printStackTrace();
++ }
++ }
++}
++
++Step 4:
++Compile all java files with the command: javac -d . bug\*.java
++
++Step 5:
++Execute the program with the command: java -cp . bug/JavaBug
++
++Step 6: Note the null pointer exception in the the output!
++
++
++Without Fix behaviour : <java.lang.NullPointerException
++ at com.sun.corba.se.internal.corba.TCUtility.unmarshalIn(TCUtility.java:290)
++ at com.sun.corba.se.internal.corba.AnyImpl.read_value(AnyImpl.java:561)
++ at bug.myStringHelper.insert(myStringHelper.java:20)
++ at bug.JavaBug.main(JavaBug.java:8)>
++
++With Fix behaviour : <The output message printed on the console: "Any: hello">
++
++Other Comments : <Test case is automated.>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,112 @@
++#!/bin/sh
++#
++# 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 5036554 6357706
++# @summary unmarshal error on CORBA alias type in CORBA any
++# @run shell TestCorbaBug.sh
++
++if [ "${TESTSRC}" = "" ]
++then TESTSRC=.
++fi
++
++if [ "${TESTJAVA}" = "" ]
++then
++ PARENT=`dirname \`which java\``
++ TESTJAVA=`dirname ${PARENT}`
++ echo "TESTJAVA not set, selecting " ${TESTJAVA}
++ echo "If this is incorrect, try setting the variable manually."
++fi
++
++if [ "${TESTCLASSES}" = "" ]
++then
++ echo "TESTCLASSES not set. Test cannot execute. Failed."
++ exit 1
++fi
++
++# set platform-dependent variables
++OS=`uname -s`
++case "$OS" in
++ SunOS | Linux | Darwin )
++ PS=":"
++ FS="/"
++ ;;
++ CYGWIN* )
++ PS=";"
++ FS="/"
++ ;;
++ Windows* )
++ PS=";"
++ FS="\\"
++ ;;
++ * )
++ echo "Unrecognized system!"
++ exit 1;
++ ;;
++esac
++
++CLASSPATH=.${PS}${TESTCLASSES}; export CLASSPATH
++
++THIS_DIR=`pwd`
++
++${TESTJAVA}${FS}bin${FS}java -version
++
++mkdir bug
++
++cp ${TESTSRC}${FS}bug.idl .
++${TESTJAVA}${FS}bin${FS}idlj bug.idl
++
++cp ${TESTSRC}${FS}JavaBug.java bug
++
++chmod -fR 777 bug
++
++${TESTJAVA}${FS}bin${FS}javac -d . bug${FS}*.java
++
++${TESTJAVA}${FS}bin${FS}java -cp . bug/JavaBug > test.out 2>&1
++
++grep "NullPointerException" test.out
++
++ERROR=$?
++
++cat test.out
++
++if [ $ERROR = 0 ]
++then
++ echo "Test Failed"
++ exit 1
++fi
++
++grep "Any: hello" test.out
++
++STATUS=$?
++
++if [ $STATUS = 0 ]
++then
++ echo "Test Passed"
++ exit 0
++else
++ echo "Invalid output"
++ cat test.out
++ exit 2
++fi
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/corba/5036554/bug.idl Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,4 @@
++// IDL file bug.idl
++module bug {
++ typedef string myString;
++};
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/corba/se/impl/io/CustomOutputStream.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,192 @@
++/*
++ * 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.Serializable;
++
++import org.omg.CORBA.Any;
++import org.omg.CORBA.TypeCode;
++import org.omg.CORBA.Principal;
++import org.omg.CORBA_2_3.portable.OutputStream;
++import org.omg.CORBA_2_3.portable.InputStream;
++
++public class CustomOutputStream extends OutputStream {
++
++ @Override
++ public void write_value(Serializable value, Class clz) {
++ }
++
++ @Override
++ public InputStream create_input_stream() {
++ return null;
++ }
++
++ @Override
++ public void write_boolean(boolean value) {
++ }
++
++ @Override
++ public void write_char(char value) {
++ }
++
++ @Override
++ public void write_wchar(char value) {
++ }
++
++ @Override
++ public void write_octet(byte value) {
++ }
++
++ @Override
++ public void write_short(short value) {
++ }
++
++ @Override
++ public void write_ushort(short value) {
++ }
++
++ @Override
++ public void write_long(int value) {
++ }
++
++ @Override
++ public void write_ulong(int value) {
++ }
++
++ @Override
++ public void write_longlong(long value) {
++ }
++
++ @Override
++ public void write_ulonglong(long value) {
++ }
++
++ @Override
++ public void write_float(float value) {
++ }
++
++ @Override
++ public void write_double(double value) {
++ }
++
++ @Override
++ public void write_string(String value) {
++ }
++
++ @Override
++ public void write_wstring(String value) {
++ }
++
++ @Override
++ public void write_boolean_array(boolean[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_char_array(char[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_wchar_array(char[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_octet_array(byte[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_short_array(short[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_ushort_array(short[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_long_array(int[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_ulong_array(int[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_longlong_array(long[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_ulonglong_array(long[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_float_array(float[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_double_array(double[] value, int offset,
++ int length) {
++ }
++
++ @Override
++ public void write_Object(org.omg.CORBA.Object value) {
++ }
++
++ @Override
++ public void write_TypeCode(TypeCode value) {
++ }
++
++ @Override
++ public void write_any(Any value) {
++ }
++
++ @Override
++ public void write_Principal(Principal value) {
++ }
++
++ @Override
++ public void write(int b) throws java.io.IOException {
++ }
++
++ @Override
++ public void write_fixed(java.math.BigDecimal value) {
++ }
++
++ @Override
++ public void write_Context(org.omg.CORBA.Context ctx,
++ org.omg.CORBA.ContextList contexts) {
++ }
++
++ @Override
++ public org.omg.CORBA.ORB orb() {
++ return null;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/corba/se/impl/io/HookPutFieldsTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,42 @@
++/*
++ * 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 7095856
++ * @summary OutputStreamHook doesn't handle null values
++ */
++
++import java.net.InetAddress;
++import javax.rmi.CORBA.Util;
++import javax.rmi.CORBA.ValueHandler;
++
++public class HookPutFieldsTest {
++
++ public static void main(String[] args ) throws Exception {
++ CustomOutputStream os = new CustomOutputStream();
++ InetAddress a = InetAddress.getByAddress(null, new byte[] {1,2,3,4});
++ ValueHandler vh = Util.createValueHandler();
++ vh.writeValue(os, a);
++ }
++}
+--- ./jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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
+@@ -64,11 +64,12 @@
+ env.put(Context.SECURITY_PRINCIPAL, "user");
+ env.put(Context.SECURITY_CREDENTIALS, "password");
+
+- env.put("com.sun.jndi.ldap.connect.timeout", "10");
+- env.put("com.sun.jndi.ldap.read.timeout", "3000");
+-
+ InitialContext ctx = null;
+ try {
++ new LdapTimeoutTest().deadServerNoTimeout(env);
++
++ env.put("com.sun.jndi.ldap.connect.timeout", "10");
++ env.put("com.sun.jndi.ldap.read.timeout", "3000");
+ new LdapTimeoutTest().ldapReadTimeoutTest(env, false);
+ new LdapTimeoutTest().ldapReadTimeoutTest(env, true);
+ new LdapTimeoutTest().simpleAuthConnectTest(env);
+@@ -84,7 +85,7 @@
+ void ldapReadTimeoutTest(Hashtable env, boolean ssl) {
+ InitialContext ctx = null;
+ if (ssl) env.put(Context.SECURITY_PROTOCOL, "ssl");
+- ScheduledFuture killer = killSwitch();
++ ScheduledFuture killer = killSwitch(5000);
+ long start = System.nanoTime();
+ try {
+ ctx = new InitialDirContext(env);
+@@ -112,7 +113,7 @@
+
+ void simpleAuthConnectTest(Hashtable env) {
+ InitialContext ctx = null;
+- ScheduledFuture killer = killSwitch();
++ ScheduledFuture killer = killSwitch(5000);
+ long start = System.nanoTime();
+ try {
+ ctx = new InitialDirContext(env);
+@@ -139,6 +140,32 @@
+ }
+ }
+
++ void deadServerNoTimeout(Hashtable env) {
++ InitialContext ctx = null;
++ ScheduledFuture killer = killSwitch(30000);
++ long start = System.nanoTime();
++ try {
++ ctx = new InitialDirContext(env);
++ SearchControls scl = new SearchControls();
++ scl.setSearchScope(SearchControls.SUBTREE_SCOPE);
++ NamingEnumeration<SearchResult> answer = ((InitialDirContext)ctx)
++ .search("ou=People,o=JNDITutorial", "(objectClass=*)", scl);
++ // shouldn't reach here
++ fail();
++ } catch (NamingException e) {
++ long end = System.nanoTime();
++ if (TimeUnit.NANOSECONDS.toMillis(end - start) < 14000) {
++ System.err.println("fail: timeout should be at least 15 seconds, actual time: "
++ + TimeUnit.NANOSECONDS.toMillis(end - start));
++ fail();
++ } else {
++ pass();
++ }
++ } finally {
++ if (!shutItDown(killer, ctx)) fail();
++ }
++ }
++
+ boolean shutItDown(ScheduledFuture killer, InitialContext ctx) {
+ killer.cancel(true);
+ try {
+@@ -149,15 +176,15 @@
+ }
+ }
+
+- ScheduledFuture killSwitch() {
++ ScheduledFuture killSwitch(int ms) {
+ final Thread current = Thread.currentThread();
+ return LdapTimeoutTest.pool.schedule(new Callable<Void>() {
+ public Void call() throws Exception {
+ System.err.println("Fail: killSwitch()");
+- current.interrupt();
++ System.exit(0);
+ return null;
+ }
+- }, 5000, TimeUnit.MILLISECONDS);
++ }, ms, TimeUnit.MILLISECONDS);
+ }
+
+ static class Server extends Thread {
+--- ./jdk/test/com/sun/tools/attach/AgentSetup.sh Mon Sep 08 12:16:34 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,45 +0,0 @@
+-#!/bin/sh
+-
+-#
+-# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+-# 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.
+-#
+-
+-
+-#
+-#
+-# Agent set - creates Agent.jar, BadAgent.jar and RedefineAgent.jar in ${TESTCLASSES}
+-
+-$JAVAC -d "${TESTCLASSES}" "${TESTSRC}"/Agent.java "${TESTSRC}"/BadAgent.java "${TESTSRC}"/RedefineAgent.java
+-
+-$JAR -cfm "${TESTCLASSES}"/Agent.jar "${TESTSRC}"/agent.mf \
+- -C "${TESTCLASSES}" Agent.class
+-
+-$JAR -cfm "${TESTCLASSES}"/BadAgent.jar "${TESTSRC}"/badagent.mf \
+- -C "${TESTCLASSES}" BadAgent.class
+-
+-$JAR -cfm "${TESTCLASSES}"/RedefineAgent.jar "${TESTSRC}"/redefineagent.mf \
+- -C "${TESTCLASSES}" RedefineAgent.class
+-
+-agent="${TESTCLASSES}${FS}Agent.jar"
+-badagent="${TESTCLASSES}${FS}BadAgent.jar"
+-redefineagent="${TESTCLASSES}${FS}RedefineAgent.jar"
+-
+--- ./jdk/test/com/sun/tools/attach/Application.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/com/sun/tools/attach/Application.java Mon Jan 05 11:57:27 2015 -0800
+@@ -22,25 +22,39 @@
+ */
+
+ /*
+- *
+- *
+ * A simple "Application" used by the Attach API unit tests. This application is
+ * launched by the test. It binds to a random port and shuts down when somebody
+ * connects to that port.
++ * Used port and pid are written both to stdout and to a specified file.
+ */
+ import java.net.Socket;
+ import java.net.ServerSocket;
++import java.io.PrintWriter;
++import jdk.testlibrary.ProcessTools;
+
+ public class Application {
+ public static void main(String args[]) throws Exception {
+ // bind to a random port
++ if (args.length < 1) {
++ System.err.println("First argument should be path to output file.");
++ }
++ String outFileName = args[0];
++
+ ServerSocket ss = new ServerSocket(0);
+ int port = ss.getLocalPort();
++ int pid = ProcessTools.getProcessId();
+
+- // signal test that we are started - do not remove this line!!
+- System.out.println(port);
++ System.out.println("shutdownPort=" + port);
++ System.out.println("pid=" + pid);
+ System.out.flush();
+
++ try (PrintWriter writer = new PrintWriter(outFileName)) {
++ writer.println("shutdownPort=" + port);
++ writer.println("pid=" + pid);
++ writer.println("done");
++ writer.flush();
++ }
++
+ // wait for test harness to connect
+ Socket s = ss.accept();
+ s.close();
+--- ./jdk/test/com/sun/tools/attach/ApplicationSetup.sh Mon Sep 08 12:16:34 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,83 +0,0 @@
+-#!/bin/sh
+-
+-#
+-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# 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.
+-#
+-
+-
+-#
+-#
+-# Application Setup - creates ${TESTCLASSES}/Application.jar and the following
+-# procedures:
+-# startApplication - starts target application
+-# stopApplication $1 - stops application via TCP shutdown port $1
+-
+-$JAVAC -d "${TESTCLASSES}" "${TESTSRC}"/Application.java "${TESTSRC}"/Shutdown.java
+-$JAR -cfm "${TESTCLASSES}"/Application.jar "${TESTSRC}"/application.mf \
+- -C "${TESTCLASSES}" Application.class
+-
+-OUTPUTFILE=${TESTCLASSES}/Application.out
+-rm -f ${OUTPUTFILE}
+-
+-startApplication()
+-{
+- # put all output from the app into ${OUTPUTFILE}
+- ${JAVA} $1 $2 $3 -jar "${TESTCLASSES}"/Application.jar > ${OUTPUTFILE} 2>&1 &
+- pid="$!"
+-
+- # MKS creates an intermediate shell to launch ${JAVA} so
+- # ${pid} is not the actual pid. We have put in a small sleep
+- # to give the intermediate shell process time to launch the
+- # "java" process.
+- if [ "$OS" = "Windows" ]; then
+- sleep 2
+- if [ "${isCygwin}" = "true" ] ; then
+- realpid=`ps -p ${pid} | tail -1 | awk '{print $4;}'`
+- else
+- realpid=`ps -o pid,ppid,comm|grep ${pid}|grep "java"|cut -c1-6`
+- fi
+- pid=${realpid}
+- fi
+-
+- echo "Waiting for Application to initialize..."
+- attempts=0
+- while true; do
+- sleep 1
+- port=`tail -1 ${OUTPUTFILE} | sed -e 's@\\r@@g' `
+- if [ ! -z "$port" ]; then
+- # In case of errors wait time for output to be flushed
+- sleep 1
+- cat ${OUTPUTFILE}
+- break
+- fi
+- attempts=`expr $attempts + 1`
+- echo "Waiting $attempts second(s) ..."
+- done
+- echo "Application is process $pid, shutdown port is $port"
+- return $port
+-}
+-
+-stopApplication()
+-{
+- $JAVA -classpath "${TESTCLASSES}" Shutdown $1
+-}
+-
+--- ./jdk/test/com/sun/tools/attach/BasicTests.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/com/sun/tools/attach/BasicTests.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 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
+@@ -21,127 +21,223 @@
+ * questions.
+ */
+
+-/*
+- *
+- *
+- * Unit test for Attach API. Attaches to the given VM and performs a number
+- * unit tests.
+- */
+ import com.sun.tools.attach.*;
+ import java.net.ServerSocket;
+ import java.net.Socket;
+ import java.io.IOException;
+ import java.util.Properties;
+ import java.util.List;
++import java.io.File;
++import jdk.testlibrary.OutputAnalyzer;
++import jdk.testlibrary.JDKToolLauncher;
++import jdk.testlibrary.ProcessTools;
++import jdk.testlibrary.ProcessThread;
+
++/*
++ * @test
++ * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
++ * @summary Basic unit tests for the VM attach mechanism.
++ * @library /lib/testlibrary
++ * @run build Agent BadAgent RedefineAgent Application Shutdown RedefineDummy RunnerUtil
++ * @run main BasicTests
++ *
++ * This test will perform a number of basic attach tests.
++ */
+ public class BasicTests {
+- public static void main(String args[]) throws Exception {
+- String pid = args[0];
+- String agent = args[1];
+- String badagent = args[2];
+- String redefineagent = args[3];
+
+- System.out.println(" - Attaching to application ...");
+- VirtualMachine vm = VirtualMachine.attach(pid);
++ /*
++ * The actual test is in the nested class TestMain.
++ * The responsibility of this class is to:
++ * 1. Build all needed jars.
++ * 2. Start the Application class in a separate process.
++ * 3. Find the pid and shutdown port of the running Application.
++ * 4. Launches the tests in nested class TestMain that will attach to the Application.
++ * 5. Shut down the Application.
++ */
++ public static void main(String args[]) throws Throwable {
++ final String pidFile = "TestsBasic.Application.pid";
++ ProcessThread processThread = null;
++ RunnerUtil.ProcessInfo info = null;
++ try {
++ buildJars();
++ processThread = RunnerUtil.startApplication(pidFile);
++ info = RunnerUtil.readProcessInfo(pidFile);
++ runTests(info.pid);
++ } catch (Throwable t) {
++ System.out.println("TestBasic got unexpected exception: " + t);
++ t.printStackTrace();
++ throw t;
++ } finally {
++ // Make sure the Application process is stopped.
++ RunnerUtil.stopApplication(info.shutdownPort, processThread);
++ }
++ }
+
+- // Test 1 - read the system properties from the target VM and
+- // check that property is set
+- System.out.println(" - Test: system properties in target VM");
+- Properties props = vm.getSystemProperties();
+- String value = props.getProperty("attach.test");
+- if (value == null || !value.equals("true")) {
+- throw new RuntimeException("attach.test property not set");
++ /**
++ * Runs the actual tests in nested class TestMain.
++ * The reason for running the tests in a separate process
++ * is that we need to modify the class path.
++ */
++ private static void runTests(int pid) throws Throwable {
++ final String sep = File.separator;
++
++ // Need to add jdk/lib/tools.jar to classpath.
++ String classpath =
++ System.getProperty("test.class.path", "") + File.pathSeparator +
++ System.getProperty("test.jdk", ".") + sep + "lib" + sep + "tools.jar";
++ String testClassDir = System.getProperty("test.classes", "") + sep;
++
++ // Argumenta : -classpath cp BasicTests$TestMain pid agent badagent redefineagent
++ String[] args = {
++ "-classpath",
++ classpath,
++ "BasicTests$TestMain",
++ Integer.toString(pid),
++ testClassDir + "Agent.jar",
++ testClassDir + "BadAgent.jar",
++ testClassDir + "RedefineAgent.jar" };
++ OutputAnalyzer output = ProcessTools.executeTestJvm(args);
++ output.shouldHaveExitValue(0);
++ }
++
++ /**
++ * Will build all jars needed by the tests.
++ */
++ private static void buildJars() throws Throwable {
++ String[] jars = {"Agent", "BadAgent", "RedefineAgent", "Application" };
++ for (String jar : jars) {
++ buildJar(jar);
+ }
+- System.out.println(" - attach.test property set as expected");
++ }
+
+- // Test 1a - read the agent properties from the target VM.
+- // By default, the agent property contains "sun.java.command",
+- // "sun.jvm.flags", and "sun.jvm.args".
+- // Just sanity check - make sure not empty.
+- System.out.println(" - Test: agent properties in target VM");
+- props = vm.getAgentProperties();
+- if (props == null || props.size() == 0) {
+- throw new RuntimeException("Agent properties is empty");
+- }
+- System.out.println(" - agent properties non-empty as expected");
++ /**
++ * Will build a jar with the given name.
++ * Class file and manifest must already exist.
++ * @param jarName Name of the jar.
++ */
++ private static void buildJar(String jarName) throws Throwable {
++ String testClasses = System.getProperty("test.classes", "?");
++ String testSrc = System.getProperty("test.src", "?");
++ String jar = String.format("%s/%s.jar", testClasses, jarName);
++ String manifest = String.format("%s/%s.mf", testSrc, jarName.toLowerCase());
++ String clazz = String.format("%s.class", jarName);
+
+- // Test 2 - attempt to load an agent that does not exist
+- System.out.println(" - Test: Load an agent that does not exist");
+- try {
+- vm.loadAgent("SilverBullet.jar");
+- } catch (AgentLoadException x) {
+- System.out.println(" - AgentLoadException thrown as expected!");
+- }
++ // Arguments to the jar command has this format:
++ // "-cfm TESTCLASSES/Agent.jar TESTSRC/agent.mf -C TESTCLASSES Agent.class"
++ RunnerUtil.createJar("-cfm", jar, manifest, "-C", testClasses, clazz);
++ }
+
+- // Test 3 - load an "bad" agent (agentmain throws an exception)
+- System.out.println(" - Test: Load a bad agent");
+- System.out.println("INFO: This test will cause error messages "
+- + "to appear in the application log about SilverBullet.jar "
+- + "not being found and an agent failing to start.");
+- try {
+- vm.loadAgent(badagent);
+- throw new RuntimeException(
+- "AgentInitializationException not thrown as expected!");
+- } catch (AgentInitializationException x) {
+- System.out.println(
+- " - AgentInitializationException thrown as expected!");
+- }
++ /**
++ * This is the actual test. It will attach to the running Application
++ * and perform a number of basic attach tests.
++ */
++ public static class TestMain {
++ public static void main(String args[]) throws Exception {
++ String pid = args[0];
++ String agent = args[1];
++ String badagent = args[2];
++ String redefineagent = args[3];
+
+- // Test 4 - detach from the VM and attempt a load (should throw IOE)
+- System.out.println(" - Test: Detach from VM");
+- System.out.println("INFO: This test will cause error messages "
+- + "to appear in the application log about a BadAgent including "
+- + "a RuntimeException and an InvocationTargetException.");
+- vm.detach();
+- try {
+- vm.loadAgent(agent);
+- throw new RuntimeException("loadAgent did not throw an exception!!");
+- } catch (IOException ioe) {
+- System.out.println(" - IOException as expected");
+- }
++ System.out.println(" - Attaching to application ...");
++ VirtualMachine vm = VirtualMachine.attach(pid);
+
+- // Test 5 - functional "end-to-end" test.
+- // Create a listener socket. Load Agent.jar into the target VM passing
+- // it the port number of our listener. When agent loads it should connect
+- // back to the tool.
++ // Test 1 - read the system properties from the target VM and
++ // check that property is set
++ System.out.println(" - Test: system properties in target VM");
++ Properties props = vm.getSystemProperties();
++ String value = props.getProperty("attach.test");
++ if (value == null || !value.equals("true")) {
++ throw new RuntimeException("attach.test property not set");
++ }
++ System.out.println(" - attach.test property set as expected");
+
+- System.out.println(" - Re-attaching to application ...");
+- vm = VirtualMachine.attach(pid);
++ // Test 1a - read the agent properties from the target VM.
++ // By default, the agent property contains "sun.java.command",
++ // "sun.jvm.flags", and "sun.jvm.args".
++ // Just sanity check - make sure not empty.
++ System.out.println(" - Test: agent properties in target VM");
++ props = vm.getAgentProperties();
++ if (props == null || props.size() == 0) {
++ throw new RuntimeException("Agent properties is empty");
++ }
++ System.out.println(" - agent properties non-empty as expected");
+
+- System.out.println(" - Test: End-to-end connection with agent");
++ // Test 2 - attempt to load an agent that does not exist
++ System.out.println(" - Test: Load an agent that does not exist");
++ try {
++ vm.loadAgent("SilverBullet.jar");
++ } catch (AgentLoadException x) {
++ System.out.println(" - AgentLoadException thrown as expected!");
++ }
+
+- ServerSocket ss = new ServerSocket(0);
+- int port = ss.getLocalPort();
++ // Test 3 - load an "bad" agent (agentmain throws an exception)
++ System.out.println(" - Test: Load a bad agent");
++ System.out.println("INFO: This test will cause error messages "
++ + "to appear in the application log about SilverBullet.jar "
++ + "not being found and an agent failing to start.");
++ try {
++ vm.loadAgent(badagent);
++ throw new RuntimeException(
++ "AgentInitializationException not thrown as expected!");
++ } catch (AgentInitializationException x) {
++ System.out.println(
++ " - AgentInitializationException thrown as expected!");
++ }
+
+- System.out.println(" - Loading Agent.jar into target VM ...");
+- vm.loadAgent(agent, Integer.toString(port));
++ // Test 4 - detach from the VM and attempt a load (should throw IOE)
++ System.out.println(" - Test: Detach from VM");
++ System.out.println("INFO: This test will cause error messages "
++ + "to appear in the application log about a BadAgent including "
++ + "a RuntimeException and an InvocationTargetException.");
++ vm.detach();
++ try {
++ vm.loadAgent(agent);
++ throw new RuntimeException("loadAgent did not throw an exception!!");
++ } catch (IOException ioe) {
++ System.out.println(" - IOException as expected");
++ }
+
+- System.out.println(" - Waiting for agent to connect back to tool ...");
+- Socket s = ss.accept();
+- System.out.println(" - Connected to agent.");
++ // Test 5 - functional "end-to-end" test.
++ // Create a listener socket. Load Agent.jar into the target VM passing
++ // it the port number of our listener. When agent loads it should connect
++ // back to the tool.
+
+- // Test 5b - functional "end-to-end" test.
+- // Now with an agent that does redefine.
++ System.out.println(" - Re-attaching to application ...");
++ vm = VirtualMachine.attach(pid);
+
+- System.out.println(" - Re-attaching to application ...");
+- vm = VirtualMachine.attach(pid);
++ System.out.println(" - Test: End-to-end connection with agent");
+
+- System.out.println(" - Test: End-to-end connection with RedefineAgent");
++ ServerSocket ss = new ServerSocket(0);
++ int port = ss.getLocalPort();
+
+- ServerSocket ss2 = new ServerSocket(0);
+- int port2 = ss2.getLocalPort();
++ System.out.println(" - Loading Agent.jar into target VM ...");
++ vm.loadAgent(agent, Integer.toString(port));
+
+- System.out.println(" - Loading RedefineAgent.jar into target VM ...");
+- vm.loadAgent(redefineagent, Integer.toString(port2));
++ System.out.println(" - Waiting for agent to connect back to tool ...");
++ Socket s = ss.accept();
++ System.out.println(" - Connected to agent.");
+
+- System.out.println(" - Waiting for RedefineAgent to connect back to tool ...");
+- Socket s2 = ss2.accept();
+- System.out.println(" - Connected to RedefineAgent.");
++ // Test 5b - functional "end-to-end" test.
++ // Now with an agent that does redefine.
+
+- // Test 6 - list method should list the target VM
+- System.out.println(" - Test: VirtualMachine.list");
+- List<VirtualMachineDescriptor> l = VirtualMachine.list();
+- if (!l.isEmpty()) {
++ System.out.println(" - Re-attaching to application ...");
++ vm = VirtualMachine.attach(pid);
++
++ System.out.println(" - Test: End-to-end connection with RedefineAgent");
++
++ ServerSocket ss2 = new ServerSocket(0);
++ int port2 = ss2.getLocalPort();
++
++ System.out.println(" - Loading RedefineAgent.jar into target VM ...");
++ vm.loadAgent(redefineagent, Integer.toString(port2));
++
++ System.out.println(" - Waiting for RedefineAgent to connect back to tool ...");
++ Socket s2 = ss2.accept();
++ System.out.println(" - Connected to RedefineAgent.");
++
++ // Test 6 - list method should list the target VM
++ System.out.println(" - Test: VirtualMachine.list");
++ List<VirtualMachineDescriptor> l = VirtualMachine.list();
+ boolean found = false;
+ for (VirtualMachineDescriptor vmd: l) {
+ if (vmd.id().equals(pid)) {
+@@ -154,27 +250,26 @@
+ } else {
+ throw new RuntimeException(pid + " not found in VM list");
+ }
++
++ // test 7 - basic hashCode/equals tests
++ System.out.println(" - Test: hashCode/equals");
++
++ VirtualMachine vm1 = VirtualMachine.attach(pid);
++ VirtualMachine vm2 = VirtualMachine.attach(pid);
++ if (!vm1.equals(vm2)) {
++ throw new RuntimeException("virtual machines are not equal");
++ }
++ if (vm.hashCode() != vm.hashCode()) {
++ throw new RuntimeException("virtual machine hashCodes not equal");
++ }
++ System.out.println(" - hashCode/equals okay");
++
++ // ---
++ System.out.println(" - Cleaning up...");
++ s.close();
++ ss.close();
++ s2.close();
++ ss2.close();
+ }
+-
+- // test 7 - basic hashCode/equals tests
+- System.out.println(" - Test: hashCode/equals");
+-
+- VirtualMachine vm1 = VirtualMachine.attach(pid);
+- VirtualMachine vm2 = VirtualMachine.attach(pid);
+- if (!vm1.equals(vm2)) {
+- throw new RuntimeException("virtual machines are not equal");
+- }
+- if (vm.hashCode() != vm.hashCode()) {
+- throw new RuntimeException("virtual machine hashCodes not equal");
+- }
+- System.out.println(" - hashCode/equals okay");
+-
+-
+- // ---
+- System.out.println(" - Cleaning up...");
+- s.close();
+- ss.close();
+- s2.close();
+- ss2.close();
+ }
+ }
+--- ./jdk/test/com/sun/tools/attach/BasicTests.sh Mon Sep 08 12:16:34 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,86 +0,0 @@
+-#!/bin/sh
+-
+-#
+-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# 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 6173612 6273707 6277253 6335921 6348630 6342019 6381757
+-# @summary Basic unit tests for the VM attach mechanism.
+-#
+-# @build BasicTests
+-# @run shell BasicTests.sh
+-
+-if [ "${TESTSRC}" = "" ]
+-then
+- echo "TESTSRC not set. Test cannot execute. Failed."
+- exit 1
+-fi
+-
+-# Windows 2000 is a problem here, so we skip it, see 6962615
+-osrev=`uname -a`
+-if [ "`echo ${osrev} | grep 'CYGWIN[^ ]*-5\.0'`" != "" ] ; then
+- echo "Treating as a pass, not testing Windows 2000"
+- exit 0
+-fi
+-if [ "`echo ${osrev} | grep 'Windows'`" != "" ] ; then
+- if [ "`echo ${osrev} | grep '5 00'`" != "" ] ; then
+- echo "Treating as a pass, not testing Windows 2000"
+- exit 0
+- fi
+-fi
+-
+-. ${TESTSRC}/CommonSetup.sh
+-. ${TESTSRC}/ApplicationSetup.sh
+-. ${TESTSRC}/AgentSetup.sh
+-
+-startApplication -Dattach.test=true
+-# pid = process-id, port = shutdown port
+-
+-failures=0
+-
+-echo "Running tests ..."
+-
+-$JAVA -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
+- BasicTests $pid $agent $badagent $redefineagent 2>&1
+-if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
+-
+-stopApplication $port
+-
+-# Add these info messages to $OUTPUTFILE just in case someone
+-# looks at it and wonders about the failures. We have to do
+-# this after the application is stopped because it is writing
+-# to $OUTPUTFILE.
+-(
+-echo ""
+-echo "INFO: Test 2 will cause error messages about SilverBullet.jar" \
+- "and an agent failing to start."
+-echo "INFO: Test 3 will cause error messages about BadAgent" \
+- "including a RuntimeException and an InvocationTargetException."
+-) >> ${OUTPUTFILE}
+-
+-if [ $failures = 0 ];
+- then echo "All tests passed.";
+- else echo "$failures test(s) failed:"; cat ${OUTPUTFILE};
+-fi
+-exit $failures
+--- ./jdk/test/com/sun/tools/attach/CommonSetup.sh Mon Sep 08 12:16:34 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,81 +0,0 @@
+-#!/bin/sh
+-
+-#
+-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# 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.
+-#
+-
+-
+-#
+-#
+-# Common setup for the Attach API unit tests. Setups up the following variables:
+-#
+-# PS - path sep.
+-# FS - file sep.
+-# JAVA - java cmd.
+-# JAVAC - javac cmd.
+-# JAR - jar cmd.
+-
+-OS=`uname -s`
+-case "$OS" in
+- SunOS | Linux | Darwin )
+- PS=":"
+- FS="/"
+- ;;
+- Windows* )
+- PS=";"
+- OS="Windows"
+- FS="\\"
+- ;;
+- CYGWIN* )
+- PS=";"
+- OS="Windows"
+- FS="\\"
+- isCygwin=true
+- ;;
+- * )
+- echo "Unrecognized system!"
+- exit 1;
+- ;;
+-esac
+-
+-if [ "${TESTJAVA}" = "" ]
+-then
+- echo "TESTJAVA not set. Test cannot execute. Failed."
+- exit 1
+-fi
+-
+-if [ "${TESTSRC}" = "" ]
+-then
+- echo "TESTSRC not set. Test cannot execute. Failed."
+- exit 1
+-fi
+-
+-if [ "${TESTCLASSES}" = "" ]
+-then
+- echo "TESTCLASSES not set. Test cannot execute. Failed."
+- exit 1
+-fi
+-
+-JAVA="${TESTJAVA}/bin/java"
+-JAVAC="${TESTJAVA}/bin/javac"
+-JAR="${TESTJAVA}/bin/jar"
+-
+--- ./jdk/test/com/sun/tools/attach/PermissionTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/com/sun/tools/attach/PermissionTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 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
+@@ -21,39 +21,119 @@
+ * questions.
+ */
+
+-/*
+- *
+- *
+- * Unit test for Attach API - this checks that a SecurityException is thrown as
+- * expected.
+- */
+ import com.sun.tools.attach.VirtualMachine;
+ import com.sun.tools.attach.AttachNotSupportedException;
+ import java.util.Properties;
++import java.io.File;
++import jdk.testlibrary.OutputAnalyzer;
++import jdk.testlibrary.ProcessTools;
++import jdk.testlibrary.ProcessThread;
+
++/*
++ * @test
++ * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
++ * @summary Basic unit tests for the VM attach mechanism.
++ * @library /lib/testlibrary
++ * @run build Application Shutdown
++ * @run main PermissionTest
++ *
++ * Unit test for Attach API -
++ * this checks that a SecurityException is thrown as expected.
++ */
+ public class PermissionTest {
+- public static void main(String args[]) throws Exception {
+- SecurityManager sm = System.getSecurityManager();
+- if (sm == null) {
+- throw new RuntimeException("Test configuration error - no security manager set");
++
++ /*
++ * The actual test is in the nested class TestMain.
++ * The responsibility of this class is to:
++ * 1. Start the Application class in a separate process.
++ * 2. Find the pid and shutdown port of the running Application.
++ * 3. Run the tests in TstMain that will attach to the Application.
++ * 4. Shut down the Application.
++ */
++ public static void main(String args[]) throws Throwable {
++ final String pidFile ="TestPermission.Application.pid";
++ ProcessThread processThread = null;
++ RunnerUtil.ProcessInfo info = null;
++ try {
++ processThread = RunnerUtil.startApplication(pidFile);
++ info = RunnerUtil.readProcessInfo(pidFile);
++ runTests(info.pid);
++ } catch (Throwable t) {
++ System.out.println("TestPermission got unexpected exception: " + t);
++ t.printStackTrace();
++ throw t;
++ } finally {
++ // Make sure the Application process is stopped.
++ RunnerUtil.stopApplication(info.shutdownPort, processThread);
+ }
++ }
+
+- String pid = args[0];
+- boolean shouldFail = Boolean.parseBoolean(args[1]);
++ /**
++ * Runs the actual test the nested class TestMain.
++ * The test is run in a separate process because we need to add to the classpath.
++ */
++ private static void runTests(int pid) throws Throwable {
++ final String sep = File.separator;
+
+- try {
+- VirtualMachine.attach(pid).detach();
+- if (shouldFail) {
+- throw new RuntimeException("SecurityException should be thrown");
++ // Need to add jdk/lib/tools.jar to classpath.
++ String classpath =
++ System.getProperty("test.class.path", "") + File.pathSeparator +
++ System.getProperty("test.jdk", ".") + sep + "lib" + sep + "tools.jar";
++ String testSrc = System.getProperty("test.src", "") + sep;
++
++ // Use a policy that will NOT allow attach. Test will verify exception.
++ String[] args = {
++ "-classpath",
++ classpath,
++ "-Djava.security.manager",
++ String.format("-Djava.security.policy=%sjava.policy.deny", testSrc),
++ "PermissionTest$TestMain",
++ Integer.toString(pid),
++ "true" };
++ OutputAnalyzer output = ProcessTools.executeTestJvm(args);
++ output.shouldHaveExitValue(0);
++
++ // Use a policy that will allow attach.
++ args = new String[] {
++ "-classpath",
++ classpath,
++ "-Djava.security.manager",
++ String.format("-Djava.security.policy=%sjava.policy.allow", testSrc),
++ "PermissionTest$TestMain",
++ Integer.toString(pid),
++ "false" };
++ output = ProcessTools.executeTestJvm(args);
++ output.shouldHaveExitValue(0);
++ }
++
++ /**
++ * This is the actual test code. It will attach to the Application and verify
++ * that we get a SecurityException when that is expected.
++ */
++ public static class TestMain {
++ public static void main(String args[]) throws Exception {
++ SecurityManager sm = System.getSecurityManager();
++ if (sm == null) {
++ throw new RuntimeException("Test configuration error - no security manager set");
+ }
+- System.out.println(" - attached to target VM as expected.");
+- } catch (Exception x) {
+- // AttachNotSupportedException thrown when no providers can be loaded
+- if (shouldFail && ((x instanceof AttachNotSupportedException) ||
+- (x instanceof SecurityException))) {
+- System.out.println(" - exception thrown as expected.");
+- } else {
+- throw x;
++
++ String pid = args[0];
++ boolean shouldFail = Boolean.parseBoolean(args[1]);
++
++ try {
++ VirtualMachine.attach(pid).detach();
++ if (shouldFail) {
++ throw new RuntimeException("SecurityException should be thrown");
++ }
++ System.out.println(" - attached to target VM as expected.");
++ } catch (Exception x) {
++ // AttachNotSupportedException thrown when no providers can be loaded
++ if (shouldFail && ((x instanceof AttachNotSupportedException) ||
++ (x instanceof SecurityException))) {
++ System.out.println(" - exception thrown as expected.");
++ } else {
++ throw x;
++ }
+ }
+ }
+ }
+--- ./jdk/test/com/sun/tools/attach/PermissionTests.sh Mon Sep 08 12:16:34 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,72 +0,0 @@
+-#!/bin/sh
+-
+-#
+-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# 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 6173612
+-# @summary Security manager and permission tests for Attach API
+-#
+-# @build PermissionTest
+-# @run shell PermissionTests.sh
+-
+-if [ "${TESTSRC}" = "" ]
+-then
+- echo "TESTSRC not set. Test cannot execute. Failed."
+- exit 1
+-fi
+-
+-. ${TESTSRC}/CommonSetup.sh
+-. ${TESTSRC}/ApplicationSetup.sh
+-
+-failures=0
+-
+-# Start target VM
+-startApplication
+-# pid = process-id, port = shutdown port
+-
+-echo "Deny test"
+-# deny
+-$JAVA -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
+- -Djava.security.manager \
+- -Djava.security.policy=${TESTSRC}/java.policy.deny \
+- PermissionTest $pid true 2>&1
+-if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
+-
+-# allow
+-echo "Allow test"
+-$JAVA -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
+- -Djava.security.manager \
+- -Djava.security.policy=${TESTSRC}/java.policy.allow \
+- PermissionTest $pid false 2>&1
+-if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
+-
+-# Stop target VM
+-stopApplication $port
+-
+-if [ $failures = 0 ];
+- then echo "All tests passed.";
+- else echo "$failures test(s) failed:"; cat ${OUTPUTFILE};
+-fi
+-exit $failures
+--- ./jdk/test/com/sun/tools/attach/ProviderTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/com/sun/tools/attach/ProviderTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 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
+@@ -21,24 +21,98 @@
+ * questions.
+ */
+
+-/*
+- *
+- *
+- * Unit test for Attach API. Attaches to the given VM and performs a number
+- * unit tests.
+- */
++import java.io.File;
++import jdk.testlibrary.OutputAnalyzer;
++import jdk.testlibrary.JDKToolLauncher;
++import jdk.testlibrary.ProcessTools;
+ import com.sun.tools.attach.VirtualMachine;
+ import com.sun.tools.attach.spi.AttachProvider;
+
++/*
++ * @test
++ * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
++ * @summary Basic unit tests for the VM attach mechanism.
++ * @library /lib/testlibrary
++ * @run build SimpleProvider
++ * @run main ProviderTest
++ *
++ * The test will attach and detach to/from the running Application.
++ */
+ public class ProviderTest {
+- public static void main(String args[]) throws Exception {
+- // deal with internal builds where classes are loaded from the
+- // 'classes' directory rather than rt.jar
+- ClassLoader cl = AttachProvider.class.getClassLoader();
+- if (cl != ClassLoader.getSystemClassLoader()) {
+- System.out.println("Attach API not loaded by system class loader - test skipped");
+- return;
++
++ /*
++ * The actual tests are in the nested class TestMain below.
++ * The responsibility of this class is to:
++ * 1. Build the needed jar.
++ * 2. Run tests in ProviderTest.TestMain.
++ */
++ public static void main(String args[]) throws Throwable {
++ try {
++ buildJar();
++ runTests();
++ } catch (Throwable t) {
++ System.out.println("TestProvider got unexpected exception: " + t);
++ t.printStackTrace();
++ throw t;
+ }
+- VirtualMachine.attach("simple:1234").detach();
++ }
++
++ /**
++ * Runs the actual tests in the nested class TestMain.
++ * We need to run the tests in a separate process,
++ * because we need to add to the classpath.
++ */
++ private static void runTests() throws Throwable {
++ final String sep = File.separator;
++ String testClassPath = System.getProperty("test.class.path", "");
++ String testClasses = System.getProperty("test.classes", "") + sep;
++ String jdkLib = System.getProperty("test.jdk", ".") + sep + "lib" + sep;
++
++ // Need to add SimpleProvider.jar and tools.jar to classpath.
++ String classpath =
++ testClassPath + File.pathSeparator +
++ testClasses + "SimpleProvider.jar" + File.pathSeparator +
++ jdkLib + "tools.jar";
++
++ String[] args = {
++ "-classpath",
++ classpath,
++ "ProviderTest$TestMain" };
++ OutputAnalyzer output = ProcessTools.executeTestJvm(args);
++ output.shouldHaveExitValue(0);
++ }
++
++ /**
++ * Will build the SimpleProvider.jar.
++ */
++ private static void buildJar() throws Throwable {
++ final String sep = File.separator;
++ String testClasses = System.getProperty("test.classes", "?") + sep;
++ String testSrc = System.getProperty("test.src", "?") + sep;
++ String serviceDir = "META-INF" + sep + "services" + sep;
++
++ RunnerUtil.createJar(
++ "-cf", testClasses + "SimpleProvider.jar",
++ "-C", testClasses, "SimpleProvider.class",
++ "-C", testClasses, "SimpleVirtualMachine.class",
++ "-C", testSrc,
++ serviceDir + "com.sun.tools.attach.spi.AttachProvider");
++ }
++
++ /**
++ * This is the actual test code that attaches to the running Application.
++ * This class is run in a separate process.
++ */
++ public static class TestMain {
++ public static void main(String args[]) throws Exception {
++ // deal with internal builds where classes are loaded from the
++ // 'classes' directory rather than rt.jar
++ ClassLoader cl = AttachProvider.class.getClassLoader();
++ if (cl != ClassLoader.getSystemClassLoader()) {
++ System.out.println("Attach API not loaded by system class loader - test skipped");
++ return;
++ }
++ VirtualMachine.attach("simple:1234").detach();
++ }
+ }
+ }
+--- ./jdk/test/com/sun/tools/attach/ProviderTests.sh Mon Sep 08 12:16:34 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,51 +0,0 @@
+-#
+-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# 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 6173612
+-# @summary AttachProvider unit tests
+-#
+-# @build ProviderTest SimpleProvider
+-# @run shell ProviderTests.sh
+-
+-if [ "${TESTSRC}" = "" ]
+-then
+- echo "TESTSRC not set. Test cannot execute. Failed."
+- exit 1
+-fi
+-
+-. ${TESTSRC}/CommonSetup.sh
+-
+-echo "Creating JAR file ..."
+-
+-$JAR -cf ${TESTCLASSES}/SimpleProvider.jar \
+- -C ${TESTCLASSES} SimpleProvider.class \
+- -C ${TESTCLASSES} SimpleVirtualMachine.class \
+- -C "${TESTSRC}" META-INF/services/com.sun.tools.attach.spi.AttachProvider
+-
+-echo "Running test ..."
+-
+-$JAVA -classpath \
+- "${TESTCLASSES}${PS}${TESTCLASSES}/SimpleProvider.jar${PS}${TESTJAVA}/lib/tools.jar" \
+- ProviderTest
+-
+--- ./jdk/test/com/sun/tools/attach/RedefineAgent.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/com/sun/tools/attach/RedefineAgent.java Mon Jan 05 11:57:27 2015 -0800
+@@ -43,15 +43,15 @@
+ public class RedefineAgent implements ClassFileTransformer {
+
+ static byte[] classfilebytes;
+- static final String targetName = "java.math.BigInteger";
+- static final String targetNameSlashes = "java/math/BigInteger";
++ static final String targetName = "RedefineDummy";
++ static final String targetNameSlashes = "RedefineDummy";
+ static boolean gotRedefineTransform = false;
+
+ // test transform and capture class bytes for redefine
+ public byte[] transform(ClassLoader loader,
+ String className,
+ Class<?> classBeingRedefined,
+- ProtectionDomain protectionDomain,
++ ProtectionDomain protectionDomain,
+ byte[] classfileBuffer) {
+ if (className.equals(targetNameSlashes)) {
+ if (classBeingRedefined == null) {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/tools/attach/RedefineDummy.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,31 @@
++/*
++ * 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.
++ */
++
++/*
++ * Simple dummy class used to test class retransform.
++ */
++public class RedefineDummy {
++ public String toString() {
++ return "RedefineDummy";
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/tools/attach/RunnerUtil.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,195 @@
++/*
++ * 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.IOException;
++import java.io.File;
++import java.nio.file.Files;
++import java.util.Arrays;
++import java.util.regex.Pattern;
++import java.util.regex.Matcher;
++
++import jdk.testlibrary.OutputAnalyzer;
++import jdk.testlibrary.ProcessTools;
++import jdk.testlibrary.Utils;
++import jdk.testlibrary.ProcessThread;
++
++/*
++ * Utility functions for test runners.
++ * (Test runner = class that launch a test)
++ */
++public class RunnerUtil {
++
++ /**
++ * The Application process must be run concurrently with our tests since
++ * the tests will attach to the Application.
++ * We will run the Application process in a separate thread.
++ *
++ * The Application must be started with flag "-Xshare:off" for the Retransform
++ * test in TestBasics to pass on all platforms.
++ *
++ * The Application will write its pid and shutdownPort in the given outFile.
++ */
++ public static ProcessThread startApplication(String outFile, String... additionalOpts) throws Throwable {
++ String classpath = System.getProperty("test.class.path", ".");
++ String[] myArgs = concat(additionalOpts, new String [] { "-Dattach.test=true", "-classpath", classpath, "Application", outFile });
++ String[] args = Utils.addTestJavaOpts(myArgs);
++ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
++ ProcessThread pt = new ProcessThread("runApplication", pb);
++ pt.start();
++ return pt;
++ }
++
++ public static String[] concat(String[] a, String[] b) {
++ if (a == null) {
++ return b;
++ }
++ if (b == null) {
++ return a;
++ }
++ int aLen = a.length;
++ int bLen = b.length;
++ String[] c = new String[aLen + bLen];
++ System.arraycopy(a, 0, c, 0, aLen);
++ System.arraycopy(b, 0, c, aLen, bLen);
++ return c;
++ }
++
++ /**
++ * Will stop the running Application.
++ * First tries to shutdown nicely by connecting to the shut down port.
++ * If that fails, the process will be killed hard with stopProcess().
++ *
++ * If the nice shutdown fails, then an Exception is thrown and the test should fail.
++ *
++ * @param port The shut down port.
++ * @param processThread The process to stop.
++ */
++ public static void stopApplication(int port, ProcessThread processThread) throws Throwable {
++ if (processThread == null) {
++ System.out.println("RunnerUtil.stopApplication ignored since proc is null");
++ return;
++ }
++ try {
++ System.out.println("RunnerUtil.stopApplication waiting to for shutdown");
++ OutputAnalyzer output = ProcessTools.executeTestJvm(
++ "-classpath",
++ System.getProperty("test.class.path", "."),
++ "Shutdown",
++ Integer.toString(port));
++ // Verify that both the Shutdown command and the Application finished ok.
++ output.shouldHaveExitValue(0);
++ processThread.joinAndThrow();
++ processThread.getOutput().shouldHaveExitValue(0);
++ } catch (Throwable t) {
++ System.out.println("RunnerUtil.stopApplication failed. Will kill it hard: " + t);
++ processThread.stopProcess();
++ throw t;
++ }
++ }
++
++ /**
++ * Creates a jar file.
++ * @param args Command to the jar tool.
++ */
++ public static void createJar(String... args) {
++ System.out.println("Running: jar " + Arrays.toString(args));
++ sun.tools.jar.Main jar = new sun.tools.jar.Main(System.out, System.err, "jar");
++ if (!jar.run(args)) {
++ throw new RuntimeException("jar failed: args=" + Arrays.toString(args));
++ }
++ }
++
++ /**
++ * Read process info for the running Application.
++ * The Application writes its info to a file with this format:
++ * shutdownPort=42994
++ * pid=19597
++ * done
++ *
++ * The final "done" is used to make sure the complete file has been written
++ * before we try to read it.
++ * This function will wait until the file is available.
++ *
++ * @param filename Path to file to read.
++ * @return The ProcessInfo containing pid and shutdownPort.
++ */
++ public static ProcessInfo readProcessInfo(String filename) throws Throwable {
++ System.out.println("Reading port and pid from file: " + filename);
++ File file = new File(filename);
++ String content = null;
++
++ // Read file or wait for it to be created.
++ while (true) {
++ content = readFile(file);
++ if (content != null && content.indexOf("done") >= 0) {
++ break;
++ }
++ Thread.sleep(100);
++ }
++
++ ProcessInfo info = new ProcessInfo();
++ // search for a line with format: key=nnn
++ Pattern pattern = Pattern.compile("(\\w*)=([0-9]+)\\r?\\n");
++ Matcher matcher = pattern.matcher(content);
++ while (matcher.find()) {
++ String key = matcher.group(1);
++ int value = Integer.parseInt(matcher.group(2));
++ if ("pid".equals(key)) {
++ info.pid = value;
++ } else if ("shutdownPort".equals(key)) {
++ info.shutdownPort = value;
++ }
++ }
++ System.out.println("processInfo.pid:" + info.pid);
++ System.out.println("processInfo.shutdownPort:" + info.shutdownPort);
++ return info;
++ }
++
++ /**
++ * Read the content of a file.
++ * @param file The file to read.
++ * @return The file content or null if file does not exists.
++ */
++ public static String readFile(File file) throws IOException {
++ if (!file.exists()) {
++ return null;
++ }
++ try {
++ byte[] bytes = Files.readAllBytes(file.toPath());
++ String content = new String(bytes);
++ return content;
++ } catch (IOException e) {
++ e.printStackTrace();
++ throw e;
++ }
++ }
++
++ /**
++ * Helper class with info of the running Application.
++ */
++ public static class ProcessInfo {
++ public int pid = -1;
++ public int shutdownPort = -1;
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/com/sun/tools/attach/TempDirTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,169 @@
++/*
++ * 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 com.sun.tools.attach.*;
++
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.util.Properties;
++import java.util.List;
++import java.io.File;
++
++import jdk.testlibrary.OutputAnalyzer;
++import jdk.testlibrary.ProcessTools;
++import jdk.testlibrary.ProcessThread;
++
++/*
++ * @test
++ * @bug 8033104
++ * @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set
++ * @library /lib/testlibrary
++ * @run build Application Shutdown RunnerUtil
++ * @run main/timeout=10 TempDirTest
++ */
++
++public class TempDirTest {
++
++ public static void main(String args[]) throws Throwable {
++
++ Path clientTmpDir = Files.createTempDirectory("TempDirTest-client");
++ clientTmpDir.toFile().deleteOnExit();
++ Path targetTmpDir = Files.createTempDirectory("TempDirTest-target");
++ targetTmpDir.toFile().deleteOnExit();
++
++ // run the test with all possible combinations of setting java.io.tmpdir
++ runExperiment(null, null);
++ runExperiment(clientTmpDir, null);
++ runExperiment(clientTmpDir, targetTmpDir);
++ runExperiment(null, targetTmpDir);
++
++ }
++
++ private static int counter = 0;
++
++ /*
++ * The actual test is in the nested class TestMain.
++ * The responsibility of this class is to:
++ * 1. Start the Application class in a separate process.
++ * 2. Find the pid and shutdown port of the running Application.
++ * 3. Launches the tests in nested class TestMain that will attach to the Application.
++ * 4. Shut down the Application.
++ */
++ public static void runExperiment(Path clientTmpDir, Path targetTmpDir) throws Throwable {
++
++ System.out.print("### Running tests with overridden tmpdir for");
++ System.out.print(" client: " + (clientTmpDir == null ? "no" : "yes"));
++ System.out.print(" target: " + (targetTmpDir == null ? "no" : "yes"));
++ System.out.println(" ###");
++
++ final String pidFile = "TempDirTest.Application.pid-" + counter++;
++ ProcessThread processThread = null;
++ RunnerUtil.ProcessInfo info = null;
++ try {
++ String[] tmpDirArg = null;
++ if (targetTmpDir != null) {
++ tmpDirArg = new String[] {"-Djava.io.tmpdir=" + targetTmpDir};
++ }
++ processThread = RunnerUtil.startApplication(pidFile, tmpDirArg);
++ info = RunnerUtil.readProcessInfo(pidFile);
++ launchTests(info.pid, clientTmpDir);
++ } catch (Throwable t) {
++ System.out.println("TempDirTest got unexpected exception: " + t);
++ t.printStackTrace();
++ throw t;
++ } finally {
++ // Make sure the Application process is stopped.
++ RunnerUtil.stopApplication(info.shutdownPort, processThread);
++ }
++ }
++
++ /**
++ * Runs the actual tests in nested class TestMain.
++ * The reason for running the tests in a separate process
++ * is that we need to modify the class path and
++ * the -Djava.io.tmpdir property.
++ */
++ private static void launchTests(int pid, Path clientTmpDir) throws Throwable {
++ final String sep = File.separator;
++
++ // Need to add jdk/lib/tools.jar to classpath.
++ String classpath =
++ System.getProperty("test.class.path", "") + File.pathSeparator +
++ System.getProperty("test.jdk", ".") + sep + "lib" + sep + "tools.jar";
++
++ String[] tmpDirArg = null;
++ if (clientTmpDir != null) {
++ tmpDirArg = new String [] {"-Djava.io.tmpdir=" + clientTmpDir};
++ }
++
++ // Arguments : [-Djava.io.tmpdir=] -classpath cp TempDirTest$TestMain pid
++ String[] args = RunnerUtil.concat(
++ tmpDirArg,
++ new String[] {
++ "-classpath",
++ classpath,
++ "TempDirTest$TestMain",
++ Integer.toString(pid) });
++ OutputAnalyzer output = ProcessTools.executeTestJvm(args);
++ output.shouldHaveExitValue(0);
++ }
++
++ /**
++ * This is the actual test. It will attach to the running Application
++ * and perform a number of basic attach tests.
++ */
++ public static class TestMain {
++ public static void main(String args[]) throws Exception {
++ String pid = args[0];
++
++ // Test 1 - list method should list the target VM
++ System.out.println(" - Test: VirtualMachine.list");
++ List<VirtualMachineDescriptor> l = VirtualMachine.list();
++ boolean found = false;
++ for (VirtualMachineDescriptor vmd: l) {
++ if (vmd.id().equals(pid)) {
++ found = true;
++ break;
++ }
++ }
++ if (found) {
++ System.out.println(" - " + pid + " found.");
++ } else {
++ throw new RuntimeException(pid + " not found in VM list");
++ }
++
++ // Test 2 - try to attach and verify connection
++
++ System.out.println(" - Attaching to application ...");
++ VirtualMachine vm = VirtualMachine.attach(pid);
++
++ System.out.println(" - Test: system properties in target VM");
++ Properties props = vm.getSystemProperties();
++ String value = props.getProperty("attach.test");
++ if (value == null || !value.equals("true")) {
++ throw new RuntimeException("attach.test property not set");
++ }
++ System.out.println(" - attach.test property set as expected");
++ }
++ }
++}
+--- ./jdk/test/com/sun/tools/attach/java.policy.allow Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/com/sun/tools/attach/java.policy.allow Mon Jan 05 11:57:27 2015 -0800
+@@ -13,7 +13,6 @@
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.jvmstat.monitor";
+ permission java.lang.RuntimePermission "loadLibrary.attach";
+ permission java.util.PropertyPermission "sun.jvmstat.*", "read";
+- permission java.util.PropertyPermission "java.io.tmpdir", "read";
+
+ /* to read configuration file in META-INF/services, and write/delete .attach_pid<pid> */
+ permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
+--- ./jdk/test/com/sun/tools/attach/java.policy.deny Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/com/sun/tools/attach/java.policy.deny Mon Jan 05 11:57:27 2015 -0800
+@@ -11,7 +11,6 @@
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.tools.attach";
+ permission java.lang.RuntimePermission "loadLibrary.attach";
+ permission java.util.PropertyPermission "sun.jvmstat.*", "read";
+- permission java.util.PropertyPermission "java.io.tmpdir", "read";
+
+ /* to read configuration file in META-INF/services, and write/delete .attach_pid<pid> */
+ permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
+--- ./jdk/test/demo/zipfs/basic.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/demo/zipfs/basic.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -40,7 +40,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- Windows_* )
++ Windows_* | CYGWIN* )
+ CLASSPATH="${TESTCLASSES};${ZIPFS}"
+ ;;
+ * )
+--- ./jdk/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,6 +1,29 @@
++/*
++ * 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 6998877
++ @bug 6998877 8022531
+ @summary After double-click on the folder names, FileNameOverrideTest FAILED
+ @author Sergey.Bylokhov@oracle.com area=awt.filedialog
+ @library ../../regtesthelpers
+@@ -36,7 +59,8 @@
+
+ String[] instructions = {
+ "1) Click on 'Show File Dialog' button. A file dialog will come up.",
+- "2) Double-click on '" + clickDirName + "' and click OK.",
++ "2) Double-click on '" + clickDirName + "' and click a confirmation",
++ " button, it can be 'OK', 'Save' or any other platform-dependent name.",
+ "3) See result of the test below"
+ };
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/8044614/TestApplet.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,34 @@
++/*
++ * 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.applet.Applet;
++import java.awt.TextField;
++
++public class TestApplet extends Applet {
++ TextField textField = null;
++
++ public void init() {
++ textField = new TextField(25);
++ add(textField);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/8044614/applet1.html Mon Jan 05 11:57:27 2015 -0800
+@@ -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.
++-->
++
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<html lang="en">
++<head>
++ <meta http-equiv="content-type" content="text/html; charset=utf-8">
++ <title>First Applet</title>
++</head>
++ <body>
++ <applet
++ code="TestApplet.class"
++ width="400"
++ height="200"/>
++ </applet>
++ </body>
++</html>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/8044614/applet2.html Mon Jan 05 11:57:27 2015 -0800
+@@ -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.
++-->
++
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<html lang="en">
++<head>
++ <meta http-equiv="content-type" content="text/html; charset=utf-8">
++ <title>Second Applet</title>
++</head>
++ <body>
++ <applet
++ code="TestApplet.class"
++ width="400"
++ height="200"/>
++ </applet>
++ </body>
++</html>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/8044614/bug8044614.html Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,36 @@
++<!--
++ 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.
++-->
++
++<html>
++<head>
++<title>bug8044614</title>
++</head>
++<body>
++
++<h1>bug8044614</h1>
++
++<p> See the dialog box (usually in upper left corner) for instructions</p>
++
++<APPLET CODE="bug8044614.class" WIDTH=200 HEIGHT=200></APPLET>
++</body>
++</html>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/8044614/bug8044614.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,56 @@
++/*
++ * 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 8044614
++ * @summary Tests focus transfer between applets in different browser windows
++ * @author Dmitry Markov
++ * @library ../../regtesthelpers
++ * @build Sysout
++ * @run applet/manual=yesno bug8044614.html
++ */
++
++import javax.swing.JApplet;
++
++import test.java.awt.regtesthelpers.Sysout;
++
++public class bug8044614 extends JApplet {
++ public void init() {
++ String[] instructions = {
++ "(1) Go to the test directory test/java/awt/Focus/8044614",
++ "(2) Compile source file: javac TestApplet.java",
++ "(3) Open the \"main.html\" file in the browser",
++ "(4) Click the \"Start First Applet\" link to open the first applet window",
++ "(5) Wait for the applet to start (press \"Run\" to any security alerts that appears)",
++ "(6) Enter \"Hello\" to the text field",
++ "(7) Click the \"Start Second Applet)\" link to open the second applet window",
++ "(8) Wait for the applet to start (press \"Run\" to any security alerts that appears)",
++ "(9) Enter \"World\" to the text field",
++ "(10) Go back to the first applet and make sure you can enter some text to the text field"
++ };
++
++ Sysout.createDialogWithInstructions(instructions);
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/8044614/main.html Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,46 @@
++<!--
++ 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.
++-->
++
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
++<html lang="en">
++<head>
++ <meta http-equiv="content-type" content="text/html; charset=utf-8">
++ <title>Applet Focus Bug main window</title>
++ <script language="JavaScript">
++ function openWindow(strURL, strWindowName, strWindowFeatures) {
++ var win = window.open(strURL, strWindowName, strWindowFeatures);
++ }
++ </script>
++
++</head>
++ <body>
++ <table>
++ <tr>
++ <td><a href="javascript:openWindow('applet1.html', '', 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, width=400, height=400, top=0, left=0, hide=no')">Start First Applet</a></td>
++ </tr>
++ <tr>
++ <td><a href="javascript:openWindow('applet2.html', '', 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, width=400, height=400, top=0, left=350, hide=no')">Start Second Applet</a></td>
++ </tr>
++ </table>
++ </body>
++</html>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,135 @@
++/*
++ * 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 8061954
++ @summary Button does not get the focus on a mouse click, and NPE is thrown in KFM
++ @author Anton Litvinov
++*/
++
++import java.awt.Container;
++import java.awt.FlowLayout;
++import java.awt.Frame;
++import java.awt.Point;
++import java.awt.Robot;
++import java.awt.Toolkit;
++import java.awt.event.InputEvent;
++import javax.swing.JButton;
++import javax.swing.JDialog;
++import javax.swing.SwingUtilities;
++
++import sun.awt.OSInfo;
++import sun.awt.SunToolkit;
++
++public class NPEInKFMOnButtonClickInDialogTest {
++ private static Frame frame = null;
++ private static JDialog dialog = null;
++ private static JButton cancelBtn = null;
++ private static Point clickPoint = null;
++ private static volatile Boolean cancelBtnIsFocused = null;
++
++ public static void main(String[] args) {
++ OSInfo.OSType osType = OSInfo.getOSType();
++ if ((osType != OSInfo.OSType.LINUX) && (osType != OSInfo.OSType.SOLARIS)) {
++ System.out.println("This test is only for Linux OS and Solaris OS.");
++ return;
++ }
++
++ ThreadGroup mainThreadGroup = Thread.currentThread().getThreadGroup();
++ Thread t = new Thread(new ThreadGroup(mainThreadGroup, "TestThreadGroup"), new Runnable() {
++ public void run() {
++ try {
++ SunToolkit.createNewAppContext();
++ doTest();
++ } catch (Exception e) {
++ e.printStackTrace();
++ }
++ }
++ });
++ t.start();
++
++ try {
++ t.join();
++ } catch (InterruptedException ie) {
++ ie.printStackTrace();
++ }
++
++ if (cancelBtnIsFocused == null) {
++ throw new RuntimeException("Test failed for an unknown reason, look at error log.");
++ } else if (cancelBtnIsFocused.booleanValue() == false) {
++ throw new RuntimeException("'Cancel' button did not become a focus owner.");
++ }
++ }
++
++ private static void doTest() throws Exception {
++ final SunToolkit toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
++ final Robot robot = new Robot();
++ robot.setAutoDelay(50);
++
++ try {
++ frame = new Frame("Frame of NPEInKFMOnButtonClickInDialogTest");
++ frame.setSize(100, 100);
++ frame.setVisible(true);
++ toolkit.realSync();
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ dialog = new JDialog(frame,
++ "Dialog of NPEInKFMOnButtonClickInDialogTest", false);
++ Container content = dialog.getContentPane();
++ content.setLayout(new FlowLayout());
++ content.add(new JButton("Run"));
++ content.add(cancelBtn = new JButton("Cancel"));
++ dialog.pack();
++ dialog.setVisible(true);
++ }
++ });
++ toolkit.realSync();
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ Point p = cancelBtn.getLocationOnScreen();
++ clickPoint = new Point(p.x + cancelBtn.getWidth() / 2,
++ p.y + cancelBtn.getHeight() / 2);
++ }
++ });
++ robot.mouseMove(clickPoint.x, clickPoint.y);
++ robot.mousePress(InputEvent.BUTTON1_MASK);
++ robot.mouseRelease(InputEvent.BUTTON1_MASK);
++ toolkit.realSync();
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ cancelBtnIsFocused = cancelBtn.isFocusOwner();
++ }
++ });
++ } finally {
++ if (dialog != null) {
++ dialog.dispose();
++ }
++ if (frame != null) {
++ frame.dispose();
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Focus/SortingFPT/JDK8048887.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,132 @@
++/*
++ * 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 8048887
++ @summary Tests SortingFTP for an exception caused by the tim-sort algo.
++ @author anton.tarasov: area=awt.focus
++ @run main JDK8040632
++*/
++
++import javax.swing.JFrame;
++import javax.swing.JPanel;
++import javax.swing.SwingUtilities;
++import java.awt.Dimension;
++import java.awt.Color;
++import java.awt.GridBagLayout;
++import java.awt.GridBagConstraints;
++import java.awt.event.WindowAdapter;
++import java.awt.event.WindowEvent;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
++
++public class JDK8048887 {
++
++ static volatile boolean passed = true;
++
++ public static void main(String[] args) {
++ JDK8048887 app = new JDK8048887();
++ app.start();
++ }
++
++ public void start() {
++ final CountDownLatch latch = new CountDownLatch(1);
++
++ SwingUtilities.invokeLater(() -> {
++ // Catch the original exception which sounds like:
++ // java.lang.IllegalArgumentException: Comparison method violates its general contract!
++ Thread.currentThread().setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
++ public void uncaughtException(Thread t, Throwable e) {
++ e.printStackTrace();
++ if (e instanceof IllegalArgumentException) {
++ passed = false;
++ latch.countDown();
++ }
++ }
++ });
++
++ TestDialog d = new TestDialog();
++ // It's expected that the dialog is focused on start.
++ // The listener is called after the FTP completes processing and the bug is reproduced or not.
++ d.addWindowFocusListener(new WindowAdapter() {
++ public void windowGainedFocus(WindowEvent e) {
++ latch.countDown();
++ }
++ });
++ d.setVisible(true);
++ });
++
++ try {
++ latch.await(5, TimeUnit.SECONDS);
++ } catch (InterruptedException e) {
++ e.printStackTrace();
++ }
++
++ if (passed)
++ System.out.println("Test passed.");
++ else
++ throw new RuntimeException("Test failed!");
++ }
++}
++
++class TestDialog extends JFrame {
++
++ // The layout of the components reproduces the transitivity issue
++ // with SortingFocusTraversalPolicy relying on the tim-sort algo.
++
++ private static int[] Xs = new int[] {71, 23, 62, 4, 79, 39, 34, 9, 84, 58, 30, 34, 38, 15, 69, 10, 44, 95, 70, 54,
++ 44, 62, 77, 64, 70, 83, 31, 48, 96, 54, 40, 3, 60, 58, 3, 20, 94, 54, 26, 19, 48, 47, 12, 70, 86, 43, 71, 97, 19,
++ 69, 90, 22, 43, 76, 10, 60, 29, 49, 9, 9, 15, 73, 85, 80, 81, 35, 87, 43, 17, 57, 38, 44, 29, 86, 96, 15, 57, 26,
++ 27, 78, 26, 87, 43, 6, 4, 16, 57, 99, 32, 86, 96, 5, 50, 69, 12, 4, 36, 84, 71, 60, 22, 46, 11, 44, 87, 3, 23, 14,
++ 43, 25, 32, 44, 11, 18, 77, 2, 51, 87, 88, 53, 69, 37, 14, 10, 25, 73, 39, 33, 91, 51, 96, 9, 74, 66, 70, 42, 72,
++ 7, 82, 40, 91, 33, 83, 54, 33, 50, 83, 1, 81, 32, 66, 11, 75, 56, 53, 45, 1, 69, 46, 31, 79, 58, 12, 20, 92, 49,
++ 50, 90, 33, 8, 43, 93, 72, 78, 9, 56, 84, 60, 30, 39, 33, 88, 84, 56, 49, 47, 4, 90, 57, 6, 23, 96, 37, 88, 22, 79,
++ 35, 80, 45, 55};
++
++ public TestDialog() {
++ JPanel panel = new JPanel(new GridBagLayout());
++ GridBagConstraints gbc = new GridBagConstraints();
++ for (int i=0; i < Xs.length; i++) {
++ gbc.gridx = Xs[i];
++ gbc.gridy = 100 - gbc.gridx;
++ panel.add(new MyComponent(), gbc);
++ }
++ getRootPane().getContentPane().add(panel);
++ pack();
++ }
++
++ public static class MyComponent extends JPanel {
++ private final static Dimension SIZE = new Dimension(1,1);
++
++ public MyComponent() {
++ setBackground(Color.BLACK);
++ setOpaque(true);
++ }
++
++ @Override
++ public Dimension getPreferredSize() {
++ return SIZE;
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/List/ListGarbageCollectionTest/AwtListGarbageCollectionTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,72 @@
++/*
++ * 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 8040076
++ * @summary AwtList not garbage collected
++ * @run main/othervm -Xmx100m AwtListGarbageCollectionTest
++ */
++
++import java.awt.*;
++import java.awt.event.WindowAdapter;
++import java.awt.event.WindowEvent;
++import java.lang.ref.WeakReference;
++
++public class AwtListGarbageCollectionTest {
++ public static void main(String[] args) {
++ Frame frame = new Frame("List leak test");
++ try {
++ test(frame);
++ } finally {
++ frame.dispose();
++ }
++ }
++
++ private static void test(Frame frame) {
++ WeakReference<List> weakListRef = null;
++ try {
++ frame.setSize(300, 200);
++ frame.setVisible(true);
++
++ List strongListRef = new List();
++ frame.add(strongListRef);
++ strongListRef.setMultipleMode(true);
++ frame.remove(strongListRef);
++ weakListRef = new WeakReference<List>(strongListRef);
++ strongListRef = null;
++
++ //make out of memory to force gc
++ String veryLongString = new String(new char[100]);
++ while (true) {
++ veryLongString += veryLongString;
++ }
++ } catch (OutOfMemoryError e) {
++ if (weakListRef == null) {
++ throw new RuntimeException("Weak list ref wasn't created");
++ } else if (weakListRef.get() != null) {
++ throw new RuntimeException("List wasn't garbage collected");
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,138 @@
++/*
++ * 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 8032872
++ * @summary Tests JComboBox selection via the mouse
++ * @author Dmitry Markov
++ */
++import sun.awt.SunToolkit;
++
++import javax.swing.*;
++import javax.swing.plaf.basic.BasicComboPopup;
++import javax.swing.plaf.basic.ComboPopup;
++import javax.swing.plaf.metal.MetalComboBoxUI;
++import javax.swing.plaf.metal.MetalLookAndFeel;
++import java.awt.*;
++import java.awt.event.InputEvent;
++import java.awt.event.KeyEvent;
++
++public class MouseComboBoxTest {
++ private static final String[] items = {"One", "Two", "Three", "Four", "Five"};
++
++ private static SunToolkit toolkit = null;
++ private static Robot robot = null;
++ private static JFrame frame = null;
++ private static JComboBox comboBox = null;
++ private static MyComboBoxUI comboBoxUI = null;
++
++ public static void main(String[] args) throws Exception {
++ toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ robot = new Robot();
++ robot.setAutoDelay(50);
++
++ UIManager.setLookAndFeel(new MetalLookAndFeel());
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++ toolkit.realSync();
++
++ for (int i = 0; i < items.length; i++) {
++ // Open popup
++ robot.keyPress(KeyEvent.VK_DOWN);
++ robot.keyRelease(KeyEvent.VK_DOWN);
++ toolkit.realSync();
++
++ Point point = getItemPointToClick(i);
++ robot.mouseMove(point.x, point.y);
++ robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
++ robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
++ toolkit.realSync();
++
++ if (i != getSelectedIndex()) {
++ throw new RuntimeException("Test Failed! Incorrect value of selected index = " + getSelectedIndex() +
++ ", expected value = " + i);
++ }
++ }
++ }
++
++ private static Point getItemPointToClick(final int item) throws Exception {
++ final Point[] result = new Point[1];
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ BasicComboPopup popup = (BasicComboPopup)comboBoxUI.getComboPopup();
++ Point point = popup.getLocationOnScreen();
++ Dimension size = popup.getSize();
++
++ int step = size.height / items.length;
++ point.x += size.width / 2;
++ point.y += step / 2 + step * item;
++ result[0] = point;
++ }
++ });
++ return result[0];
++ }
++
++ private static int getSelectedIndex() throws Exception {
++ final int[] result = new int[1];
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ result[0] = comboBox.getSelectedIndex();
++ }
++ });
++ return result[0];
++ }
++
++ private static void createAndShowGUI() {
++ frame = new JFrame("MouseComboBoxTest");
++
++ comboBox = new JComboBox(items);
++ comboBox.setEditable(true);
++ comboBoxUI = new MyComboBoxUI();
++ comboBox.setUI(comboBoxUI);
++
++ frame.pack();
++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++ frame.setVisible(true);
++
++ JWindow window = new JWindow(frame);
++ window.add(comboBox);
++ window.pack();
++ window.setVisible(true);
++ }
++
++ private static class MyComboBoxUI extends MetalComboBoxUI {
++ public ComboPopup getComboPopup() {
++ return popup;
++ }
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,84 @@
++/*
++ * 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.AWTException;
++import java.awt.Color;
++import java.awt.Frame;
++import java.awt.Graphics;
++import java.awt.Point;
++import java.awt.Robot;
++import java.awt.Toolkit;
++import java.awt.Window;
++
++import sun.awt.SunToolkit;
++
++/**
++ * @test
++ * @bug 8001472
++ * @summary Background of the window should not depend from the paint()/update()
++ * @author Sergey Bylokhov
++ */
++public final class BackgroundIsNotUpdated extends Window {
++
++ public BackgroundIsNotUpdated(final Frame owner) {
++ super(owner);
++ }
++
++ @Override
++ public void paint(final Graphics ignored) {
++ // Intentionally left blank
++ }
++
++ @Override
++ public void update(final Graphics ignored) {
++ // Intentionally left blank
++ }
++
++ public static void main(final String[] args) throws AWTException {
++ final Window window = new BackgroundIsNotUpdated(null);
++ window.setSize(300, 300);
++ window.setLocationRelativeTo(null);
++ window.setVisible(true);
++ sleep();
++ window.setBackground(Color.GREEN);
++ sleep();
++ final Robot robot = new Robot();
++ robot.setAutoDelay(200);
++ Point point = window.getLocationOnScreen();
++ Color color = robot.getPixelColor(point.x + window.getWidth() / 2,
++ point.y + window.getHeight() / 2);
++ window.dispose();
++ if (!color.equals(Color.GREEN)) {
++ throw new RuntimeException(
++ "Expected: " + Color.GREEN + " , Actual: " + color);
++ }
++ }
++
++ private static void sleep() {
++ try {
++ ((SunToolkit) Toolkit.getDefaultToolkit()).realSync();
++ Thread.sleep(1000);
++ } catch (InterruptedException ignored) {
++ }
++ }
++}
+--- ./jdk/test/java/awt/Window/Grab/GrabTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/awt/Window/Grab/GrabTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+@@ -40,7 +40,10 @@
+ public class GrabTest {
+ private static Frame f;
+ private static Frame f1;
++ private static Frame frame;
+ private static Window w;
++ private static Window window1;
++ private static Window window2;
+ private static Button b;
+
+ private static Robot robot;
+@@ -98,6 +101,15 @@
+ f.setVisible(true);
+ w.setVisible(true);
+
++ frame = new Frame();
++ window1 = new Window(frame);
++ window1.setBounds(0, 0, 100, 100);
++ window1.setBackground(Color.blue);
++
++ window2 = new Window(window1);
++ window2.setBounds(0, 0, 50, 50);
++ window2.setBackground(Color.green);
++
+ tk = (sun.awt.SunToolkit)Toolkit.getDefaultToolkit();
+
+ try {
+@@ -175,7 +187,7 @@
+
+ // 6. Check that press on the outside area causes ungrab
+ Point loc = f.getLocationOnScreen();
+- robot.mouseMove(loc.x + 100, loc.y + f.getSize().height + 1);
++ robot.mouseMove(loc.x + 100, loc.y + f.getSize().height + 10);
+ Util.waitForIdle(robot);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.delay(50);
+@@ -196,6 +208,24 @@
+ passed = false;
+ System.err.println("Failure: [7] Window disposal didn't cause ungrab");
+ }
++ ungrabbed = false;
++
++
++ // 8. Check that mouse click on subwindow does not cause ungrab
++ frame.setVisible(true);
++ window1.setVisible(true);
++ window2.setVisible(true);
++ Util.waitForIdle(robot);
++
++ tk.grab(window1);
++
++ Util.clickOnComp(window2, robot);
++ Util.waitForIdle(robot);
++
++ if (ungrabbed) {
++ passed = false;
++ System.err.println("Failure: [8] Press on the subwindow caused ungrab");
++ }
+
+ if (passed) {
+ System.out.println("Test passed.");
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,132 @@
++/*
++ * 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 sun.awt.SunToolkit;
++
++import java.awt.*;
++import java.awt.event.AWTEventListener;
++import java.awt.event.InputEvent;
++import java.awt.event.KeyEvent;
++import java.awt.event.MouseEvent;
++
++/*
++ * @test
++ * @bug 8046495
++ * @summary Verifies that mouse/key events has always increasing 'when' timestamps
++ * @author Anton Nashatyrev
++ * @run main EventWhenTest
++ */
++public class EventWhenTest {
++
++ private static volatile int eventsCount = 0;
++ private static volatile boolean failed = false;
++
++ static {
++ Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
++ long lastWhen = 0;
++
++ @Override
++ public void eventDispatched(AWTEvent event) {
++ long curWhen;
++ if (event instanceof KeyEvent) {
++ curWhen = ((KeyEvent) event).getWhen();
++ } else if (event instanceof MouseEvent) {
++ curWhen = ((MouseEvent) event).getWhen();
++ } else {
++ return;
++ }
++
++ eventsCount++;
++
++ if (curWhen < lastWhen) {
++ System.err.println("FAILED: " + curWhen + " < " + lastWhen +
++ " for " + event);
++ failed = true;
++ } else {
++ lastWhen = curWhen;
++ }
++ }
++ }, AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK);
++ }
++
++ public static void main(String[] args) throws Exception {
++
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ Frame frame = new Frame();
++
++ try {
++ Button b = new Button("Button");
++ frame.setBounds(300, 300, 300, 300);
++ frame.add(b);
++ frame.setVisible(true);
++ toolkit.realSync();
++
++ Robot robot = new Robot();
++ robot.mouseMove((int)frame.getLocationOnScreen().getX() + 150,
++ (int)frame.getLocationOnScreen().getY() + 150);
++
++ eventsCount = 0;
++ System.out.println("Clicking mouse...");
++ for (int i = 0; i < 300 && !failed; i++) {
++ robot.mousePress(InputEvent.BUTTON1_MASK);
++ robot.mouseRelease(InputEvent.BUTTON1_MASK);
++ Thread.sleep(10);
++ b.setLabel("Click: " + i);
++ }
++
++ if (eventsCount == 0) {
++ throw new RuntimeException("No events were received");
++ }
++
++ if (failed) {
++ throw new RuntimeException("Test failed.");
++ }
++ System.out.println("Clicking mouse done: " + eventsCount + " events.");
++
++ b.requestFocusInWindow();
++ toolkit.realSync();
++
++ eventsCount = 0;
++ System.out.println("Typing a key...");
++ for (int i = 0; i < 300 && !failed; i++) {
++ robot.keyPress(KeyEvent.VK_A);
++ robot.keyRelease(KeyEvent.VK_A);
++ Thread.sleep(10);
++ b.setLabel("Type: " + i);
++ }
++ System.out.println("Key typing done: " + eventsCount + " events.");
++
++ if (eventsCount == 0) {
++ throw new RuntimeException("No events were received");
++ }
++
++ if (failed) {
++ throw new RuntimeException("Test failed.");
++ }
++
++ System.out.println("Success!");
++ } finally {
++ frame.dispose();
++ }
++ }
++}
+--- ./jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+@@ -23,7 +23,7 @@
+
+ /*
+ @test
+- @bug 7154072
++ @bug 7154072 7161320
+ @summary Tests that key events with modifiers are not swallowed.
+ @author anton.tarasov: area=awt.focus
+ @library ../../../regtesthelpers
+@@ -49,6 +49,11 @@
+ static Robot r;
+
+ public static void main(String[] args) {
++ if (sun.awt.OSInfo.getOSType() == sun.awt.OSInfo.OSType.WINDOWS) {
++ System.out.println("Skipped. Test not for MS Windows.");
++ return;
++ }
++
+ f.add(t);
+ f.pack();
+ f.setVisible(true);
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/awt/im/8041990/bug8041990.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,120 @@
++/*
++ * 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 8041990
++ @summary Language specific keys does not work in applets when opened outside the browser
++ @author Petr Pchelko
++*/
++
++import sun.awt.SunToolkit;
++
++import javax.swing.*;
++import java.awt.*;
++import java.awt.event.InputMethodEvent;
++import java.awt.font.TextHitInfo;
++import java.text.AttributedString;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.atomic.AtomicReference;
++
++public class bug8041990 {
++ private static JFrame frame;
++ private static JComponent component;
++
++ public static void main(String[] args) throws Exception {
++ ThreadGroup stubTG = new ThreadGroup(getRootThreadGroup(), "Stub Thread Group");
++ ThreadGroup swingTG = new ThreadGroup(getRootThreadGroup(), "SwingTG");
++ try {
++ Thread stubThread = new Thread(stubTG, new Runnable() {
++ public void run() {
++ SunToolkit.createNewAppContext();
++ }
++ });
++ stubThread.start();
++ stubThread.join();
++
++ final CountDownLatch startSwingLatch = new CountDownLatch(1);
++ new Thread(swingTG, new Runnable() {
++ public void run() {
++ SunToolkit.createNewAppContext();
++ SwingUtilities.invokeLater(new Runnable() {
++ public void run() {
++ frame = new JFrame();
++ component = new JLabel("Test Text");
++ frame.add(component);
++ frame.setBounds(100, 100, 100, 100);
++ frame.setVisible(true);
++ startSwingLatch.countDown();
++ }
++ });
++ }
++ }).start();
++ startSwingLatch.await();
++
++ final AtomicReference<Exception> caughtException = new AtomicReference<>();
++ Thread checkThread = new Thread(getRootThreadGroup(), new Runnable() {
++ public void run() {
++ try {
++ // If the bug is present this will throw exception
++ new InputMethodEvent(component,
++ InputMethodEvent.CARET_POSITION_CHANGED,
++ TextHitInfo.leading(0),
++ TextHitInfo.trailing(0));
++ } catch (Exception e) {
++ caughtException.set(e);
++ }
++ }
++ });
++ checkThread.start();
++ checkThread.join();
++
++ if (caughtException.get() != null) {
++ throw new RuntimeException("Failed. Caught exception!", caughtException.get());
++ }
++ } finally {
++ new Thread(swingTG, new Runnable() {
++ public void run() {
++ SwingUtilities.invokeLater(new Runnable() {
++ public void run() {
++ if (frame != null) {
++ frame.dispose();
++ }
++ }
++ });
++ }
++ }).start();
++ }
++ }
++
++ private static ThreadGroup getRootThreadGroup() {
++ ThreadGroup currentTG = Thread.currentThread().getThreadGroup();
++ ThreadGroup parentTG = currentTG.getParent();
++ while (parentTG != null) {
++ currentTG = parentTG;
++ parentTG = currentTG.getParent();
++ }
++ return currentTG;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/beans/Introspector/Test7172865.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,162 @@
++/*
++ * 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.beans.IndexedPropertyDescriptor;
++import java.beans.MethodDescriptor;
++import java.beans.PropertyDescriptor;
++
++/*
++ * @test
++ * @bug 7172854 7172865
++ * @summary Tests that cached methods are not lost
++ * @author Sergey Malenkov
++ */
++
++public class Test7172865 {
++ public static void main(String[] args) throws Exception {
++ int errors = 0;
++
++ MethodDescriptor md = new MethodDescriptor(Test7172865.class.getMethod("getGood"));
++
++ errors += test(PropertyDescriptor.class, "good", true);
++ PropertyDescriptor pdGoodString = new PropertyDescriptor("good", Test7172865.class, "getGood", "setGood");
++ PropertyDescriptor pdGoodMethod = new PropertyDescriptor("good",
++ Test7172865.class.getMethod("getGood"),
++ Test7172865.class.getMethod("setGood", args.getClass()));
++
++ errors += test(PropertyDescriptor.class, "bad", false);
++ PropertyDescriptor pdBadString = new PropertyDescriptor("bad", Test7172865.class, "getBad", null);
++ PropertyDescriptor pdBadMethod = new PropertyDescriptor("bad",
++ Test7172865.class.getMethod("getBad"),
++ Test7172865.class.getMethod("setBad", args.getClass()));
++
++ errors += test(IndexedPropertyDescriptor.class, "good", true);
++ IndexedPropertyDescriptor ipdGoodString = new IndexedPropertyDescriptor("good", Test7172865.class, "getGood", "setGood", "getGood", "setGood");
++ IndexedPropertyDescriptor ipdGoodMethod = new IndexedPropertyDescriptor("good",
++ Test7172865.class.getMethod("getGood"),
++ Test7172865.class.getMethod("setGood", args.getClass()),
++ Test7172865.class.getMethod("getGood", Integer.TYPE),
++ Test7172865.class.getMethod("setGood", Integer.TYPE, String.class));
++
++ errors += test(IndexedPropertyDescriptor.class, "bad", false);
++ IndexedPropertyDescriptor ipdBadString = new IndexedPropertyDescriptor("bad", Test7172865.class, "getBad", null, "getBad", null);
++ IndexedPropertyDescriptor ipdBadMethod = new IndexedPropertyDescriptor("bad",
++ Test7172865.class.getMethod("getBad"),
++ Test7172865.class.getMethod("setBad", args.getClass()),
++ Test7172865.class.getMethod("getBad", Integer.TYPE),
++ Test7172865.class.getMethod("setBad", Integer.TYPE, String.class));
++
++ for (int i = 1; i <= 2; i++) {
++ System.out.println("STEP: " + i);
++ errors += test("md", null != md.getMethod());
++
++ errors += test("pdGoodString", pdGoodString, true, true);
++ errors += test("pdGoodMethod", pdGoodMethod, true, true);
++
++ errors += test("pdBadString", pdBadString, true, false);
++ errors += test("pdBadMethod", pdBadMethod, true, true);
++
++ errors += test("ipdGoodString", ipdGoodString, true, true, true, true);
++ errors += test("ipdGoodMethod", ipdGoodMethod, true, true, true, true);
++
++ errors += test("ipdBadString", ipdBadString, true, false, true, false);
++ errors += test("ipdBadMethod", ipdBadMethod, true, true, true, true);
++
++ try {
++ int[] array = new int[1024];
++ while (true) {
++ array = new int[array.length << 1];
++ }
++ }
++ catch (OutOfMemoryError error) {
++ System.gc();
++ }
++ }
++ if (errors > 0) {
++ throw new Error("found " + errors + " errors");
++ }
++ }
++
++ private static int test(Class<?> type, String property, boolean value) {
++ String message = type.getSimpleName() + "(" + property + ") ";
++ try {
++ type.getConstructor(String.class, Class.class).newInstance(property, Test7172865.class);
++ message += "passed";
++ }
++ catch (Exception exception) {
++ message += "failed";
++ value = !value;
++ }
++ if (value) {
++ message += " as expected";
++ }
++ System.out.println(message);
++ return value ? 0 : 1;
++ }
++
++ private static int test(String message, boolean value) {
++ System.out.println(message + ": " + (value ? "passed" : "failed"));
++ return value ? 0 : 1;
++ }
++
++ private static int test(String message, PropertyDescriptor pd, boolean rm, boolean wm) {
++ return test(message + ".Read", rm == (null != pd.getReadMethod()))
++ + test(message + ".Write", wm == (null != pd.getWriteMethod()));
++ }
++
++ private static int test(String message, IndexedPropertyDescriptor ipd, boolean rm, boolean wm, boolean irm, boolean iwm) {
++ return test(message, ipd, rm, wm)
++ + test(message + ".IndexedRead", irm == (null != ipd.getIndexedReadMethod()))
++ + test(message + ".IndexedWrite", iwm == (null != ipd.getIndexedWriteMethod()));
++ }
++
++ public String[] getGood() {
++ return null;
++ }
++
++ public String getGood(int index) {
++ return null;
++ }
++
++ public void setGood(String[] good) {
++ }
++
++ public void setGood(int index, String value) {
++ }
++
++ public String[] getBad() {
++ return null;
++ }
++
++ public String getBad(int index) {
++ return null;
++ }
++
++ public Test7172865 setBad(String[] bad) {
++ return null;
++ }
++
++ public Test7172865 setBad(int index, String value) {
++ return null;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/beans/XMLEncoder/Test8016545.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,106 @@
++/*
++ * 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 8016545
++ * @summary Tests beans with predefined fields
++ * @author Sergey Malenkov
++ */
++
++public class Test8016545 extends AbstractTest {
++ public static void main(String[] args) {
++ new Test8016545().test(true);
++ }
++
++ @Override
++ protected Object getObject() {
++ Bean bean = new Bean();
++ bean.setUndefined(Boolean.FALSE);
++ Info info = new Info();
++ info.setEnabled(Boolean.TRUE);
++ info.setID(1);
++ bean.setInfo(info);
++ return bean;
++ }
++
++ @Override
++ protected Object getAnotherObject() {
++ Bean bean = new Bean();
++ bean.setUndefined(Boolean.TRUE);
++ bean.getInfo().setEnabled(Boolean.FALSE);
++ bean.getInfo().setID(2);
++ return bean;
++ }
++
++ public static class Bean {
++ private Info info = new Info(); // predefined
++ private Boolean defined = Boolean.TRUE;
++ private Boolean undefined;
++
++ public Info getInfo() {
++ return this.info;
++ }
++
++ public void setInfo(Info info) {
++ this.info = info;
++ }
++
++ public Boolean getDefined() {
++ return this.defined;
++ }
++
++ public void setDefined(Boolean defined) {
++ this.defined = defined;
++ }
++
++ public Boolean getUndefined() {
++ return this.undefined;
++ }
++
++ public void setUndefined(Boolean undefined) {
++ this.undefined = undefined;
++ }
++ }
++
++ public static class Info {
++ private Integer id;
++ private Boolean enabled;
++
++ public Integer getID() {
++ return this.id;
++ }
++
++ public void setID(Integer id) {
++ this.id = id;
++ }
++
++ public Boolean getEnabled() {
++ return this.enabled;
++ }
++
++ public void setEnabled(Boolean enabled) {
++ this.enabled = enabled;
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/io/ByteArrayOutputStream/MaxCapacity.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,65 @@
++/*
++ * Copyright (c) 2014 Google Inc. All rights reserved.
++ * 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
++ * @ignore This test has huge memory requirements
++ * @run main/timeout=1800/othervm -Xmx8g MaxCapacity
++ * @bug 8055949
++ * @summary Check that we can write (almost) Integer.MAX_VALUE bytes
++ * to a ByteArrayOutputStream.
++ * @author Martin Buchholz
++ */
++import java.io.ByteArrayOutputStream;
++
++public class MaxCapacity {
++ public static void main(String[] args) {
++ long maxHeap = Runtime.getRuntime().maxMemory();
++ if (maxHeap < 3L * Integer.MAX_VALUE) {
++ System.out.printf("Skipping test; max memory %sM too small%n",
++ maxHeap/(1024*1024));
++ return;
++ }
++ ByteArrayOutputStream baos = new ByteArrayOutputStream();
++ for (long n = 0; ; n++) {
++ try {
++ baos.write((byte)'x');
++ } catch (Throwable t) {
++ // check data integrity while we're here
++ byte[] bytes = baos.toByteArray();
++ if (bytes.length != n)
++ throw new AssertionError("wrong length");
++ if (bytes[0] != 'x' ||
++ bytes[bytes.length - 1] != 'x')
++ throw new AssertionError("wrong contents");
++
++ long gap = Integer.MAX_VALUE - n;
++ System.out.printf("gap=%dM %d%n", gap/(1024*1024), gap);
++ if (gap > 1024)
++ throw t;
++ // t.printStackTrace();
++ break;
++ }
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/io/File/CheckPermission.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,379 @@
++/*
++ * 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 8017212
++ * @summary Examine methods in File.java that access the file system do the
++ * right permission check when a security manager exists.
++ * @author Dan Xu
++ */
++
++import java.io.File;
++import java.io.FilenameFilter;
++import java.io.FileFilter;
++import java.io.IOException;
++import java.security.Permission;
++import java.util.ArrayList;
++import java.util.EnumMap;
++import java.util.EnumSet;
++import java.util.HashSet;
++import java.util.List;
++import java.util.Map;
++import java.util.Set;
++
++public class CheckPermission {
++
++ private static final String CHECK_PERMISSION_TEST = "CheckPermissionTest";
++
++ public enum FileOperation {
++ READ, WRITE, DELETE, EXEC
++ }
++
++ static class Checks {
++ private List<Permission> permissionsChecked = new ArrayList<>();
++ private Set<String> propertiesChecked = new HashSet<>();
++
++ private Map<FileOperation, List<String>> fileOperationChecked =
++ new EnumMap<>(FileOperation.class);
++
++ List<Permission> permissionsChecked() {
++ return permissionsChecked;
++ }
++
++ Set<String> propertiesChecked() {
++ return propertiesChecked;
++ }
++
++ List<String> fileOperationChecked(FileOperation op) {
++ return fileOperationChecked.get(op);
++ }
++
++ void addFileOperation(FileOperation op, String file) {
++ List<String> opList = fileOperationChecked.get(op);
++ if (opList == null) {
++ opList = new ArrayList<>();
++ fileOperationChecked.put(op, opList);
++ }
++ opList.add(file);
++ }
++ }
++
++ static ThreadLocal<Checks> myChecks = new ThreadLocal<>();
++
++ static void prepare() {
++ myChecks.set(new Checks());
++ }
++
++ static class LoggingSecurityManager extends SecurityManager {
++ static void install() {
++ System.setSecurityManager(new LoggingSecurityManager());
++ }
++
++ private void checkFileOperation(FileOperation op, String file) {
++ Checks checks = myChecks.get();
++ if (checks != null)
++ checks.addFileOperation(op, file);
++ }
++
++ @Override
++ public void checkRead(String file) {
++ checkFileOperation(FileOperation.READ, file);
++ }
++
++ @Override
++ public void checkWrite(String file) {
++ checkFileOperation(FileOperation.WRITE, file);
++ }
++
++ @Override
++ public void checkDelete(String file) {
++ checkFileOperation(FileOperation.DELETE, file);
++ }
++
++ @Override
++ public void checkExec(String file) {
++ checkFileOperation(FileOperation.EXEC, file);
++ }
++
++ @Override
++ public void checkPermission(Permission perm) {
++ Checks checks = myChecks.get();
++ if (checks != null)
++ checks.permissionsChecked().add(perm);
++ }
++
++ @Override
++ public void checkPropertyAccess(String key) {
++ Checks checks = myChecks.get();
++ if (checks != null)
++ checks.propertiesChecked().add(key);
++ }
++ }
++
++ static void assertCheckPermission(Class<? extends Permission> type,
++ String name)
++ {
++ for (Permission perm : myChecks.get().permissionsChecked()) {
++ if (type.isInstance(perm) && perm.getName().equals(name))
++ return;
++ }
++ throw new RuntimeException(type.getName() + "(\"" + name
++ + "\") not checked");
++ }
++
++ static void assertCheckPropertyAccess(String key) {
++ if (!myChecks.get().propertiesChecked().contains(key))
++ throw new RuntimeException("Property " + key + " not checked");
++ }
++
++ static void assertChecked(File file, List<String> list) {
++ if (list != null && !list.isEmpty()) {
++ for (String path : list) {
++ if (path.equals(file.getPath()))
++ return;
++ }
++ }
++ throw new RuntimeException("Access not checked");
++ }
++
++ static void assertNotChecked(File file, List<String> list) {
++ if (list != null && !list.isEmpty()) {
++ for (String path : list) {
++ if (path.equals(file.getPath()))
++ throw new RuntimeException("Access checked");
++ }
++ }
++ }
++
++ static void assertCheckOperation(File file, Set<FileOperation> ops) {
++ for (FileOperation op : ops)
++ assertChecked(file, myChecks.get().fileOperationChecked(op));
++ }
++
++ static void assertNotCheckOperation(File file, Set<FileOperation> ops) {
++ for (FileOperation op : ops)
++ assertNotChecked(file, myChecks.get().fileOperationChecked(op));
++ }
++
++ static void assertOnlyCheckOperation(File file,
++ EnumSet<FileOperation> ops)
++ {
++ assertCheckOperation(file, ops);
++ assertNotCheckOperation(file, EnumSet.complementOf(ops));
++ }
++
++ static File testFile, another;
++
++ static void setup() {
++ testFile = new File(CHECK_PERMISSION_TEST + System.currentTimeMillis());
++ if (testFile.exists()) {
++ testFile.delete();
++ }
++
++ another = new File(CHECK_PERMISSION_TEST + "Another"
++ + System.currentTimeMillis());
++ if (another.exists()) {
++ another.delete();
++ }
++
++ LoggingSecurityManager.install();
++ }
++
++ public static void main(String[] args) throws IOException {
++ setup();
++
++ prepare();
++ testFile.canRead();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.canWrite();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.exists();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.isDirectory();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.isFile();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.isHidden();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.lastModified();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.length();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.createNewFile();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.list();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.list(new FilenameFilter() {
++ @Override
++ public boolean accept(File dir, String name) {
++ return false;
++ }
++ });
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.listFiles();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.listFiles(new FilenameFilter() {
++ @Override
++ public boolean accept(File dir, String name) {
++ return false;
++ }
++ });
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.listFiles(new FileFilter() {
++ @Override
++ public boolean accept(File file) {
++ return false;
++ }
++ });
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++
++ prepare();
++ testFile.mkdir();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ if (testFile.exists()) {
++ prepare();
++ testFile.mkdirs();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++ }
++
++ if (!another.exists()) {
++ prepare();
++ another.mkdirs();
++ assertOnlyCheckOperation(another,
++ EnumSet.of(FileOperation.READ, FileOperation.WRITE));
++ }
++
++ prepare();
++ another.delete();
++ assertOnlyCheckOperation(another, EnumSet.of(FileOperation.DELETE));
++
++ prepare();
++ boolean renRst = testFile.renameTo(another);
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++ assertOnlyCheckOperation(another, EnumSet.of(FileOperation.WRITE));
++
++ if (renRst) {
++ if (testFile.exists())
++ throw new RuntimeException(testFile + " is already renamed to "
++ + another);
++ testFile = another;
++ }
++
++ prepare();
++ testFile.setLastModified(0);
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.setReadOnly();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.setWritable(true, true);
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.setWritable(true);
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.setReadable(true, true);
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.setReadable(true);
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.setExecutable(true, true);
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.setExecutable(true);
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.WRITE));
++
++ prepare();
++ testFile.canExecute();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.EXEC));
++
++ prepare();
++ testFile.getTotalSpace();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++ assertCheckPermission(RuntimePermission.class,
++ "getFileSystemAttributes");
++
++ prepare();
++ testFile.getFreeSpace();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++ assertCheckPermission(RuntimePermission.class,
++ "getFileSystemAttributes");
++
++ prepare();
++ testFile.getUsableSpace();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.READ));
++ assertCheckPermission(RuntimePermission.class,
++ "getFileSystemAttributes");
++
++ prepare();
++ File tmpFile = File.createTempFile(CHECK_PERMISSION_TEST, null);
++ assertOnlyCheckOperation(tmpFile, EnumSet.of(FileOperation.WRITE));
++ tmpFile.delete();
++ assertCheckOperation(tmpFile, EnumSet.of(FileOperation.DELETE));
++
++ prepare();
++ tmpFile = File.createTempFile(CHECK_PERMISSION_TEST, null, null);
++ assertOnlyCheckOperation(tmpFile, EnumSet.of(FileOperation.WRITE));
++ tmpFile.delete();
++ assertCheckOperation(tmpFile, EnumSet.of(FileOperation.DELETE));
++
++ prepare();
++ testFile.deleteOnExit();
++ assertOnlyCheckOperation(testFile, EnumSet.of(FileOperation.DELETE));
++ }
++}
+--- ./jdk/test/java/io/File/NulFile.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/io/File/NulFile.java Mon Jan 05 11:57:27 2015 -0800
+@@ -612,8 +612,13 @@
+ try {
+ File.createTempFile(prefix, suffix, directory);
+ } catch (IOException ex) {
+- if (ExceptionMsg.equals(ex.getMessage()))
++ String err = "Unable to create temporary file";
++ if (err.equals(ex.getMessage()))
+ exceptionThrown = true;
++ else {
++ throw new RuntimeException("Get IOException with message, "
++ + ex.getMessage() + ", expect message, "+ err);
++ }
+ }
+ }
+ if (!exceptionThrown) {
+--- ./jdk/test/java/io/File/createTempFile/SpecialTempFile.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/io/File/createTempFile/SpecialTempFile.java Mon Jan 05 11:57:27 2015 -0800
+@@ -23,9 +23,8 @@
+
+ /*
+ * @test
+- * @bug 8013827 8011950 8025128
++ * @bug 8013827 8011950 8017212 8025128
+ * @summary Check whether File.createTempFile can handle special parameters
+- * on Windows platforms
+ * @author Dan Xu
+ */
+
+@@ -35,7 +34,7 @@
+ public class SpecialTempFile {
+
+ private static void test(String name, String[] prefix, String[] suffix,
+- boolean expectedException) throws IOException
++ boolean exceptionExpected) throws IOException
+ {
+ if (prefix == null || suffix == null
+ || prefix.length != suffix.length)
+@@ -44,14 +43,13 @@
+ }
+
+ final String exceptionMsg = "Unable to create temporary file";
++ String[] dirs = { null, "." };
+
+ for (int i = 0; i < prefix.length; i++) {
+ boolean exceptionThrown = false;
+ File f = null;
+
+- String[] dirs = { null, "." };
+-
+- for (String dir : dirs ) {
++ for (String dir: dirs) {
+ System.out.println("In test " + name +
+ ", creating temp file with prefix, " +
+ prefix[i] + ", suffix, " + suffix[i] +
+@@ -63,7 +61,7 @@
+ else
+ f = File.createTempFile(prefix[i], suffix[i], new File(dir));
+ } catch (IOException e) {
+- if (expectedException) {
++ if (exceptionExpected) {
+ if (e.getMessage().startsWith(exceptionMsg))
+ exceptionThrown = true;
+ else
+@@ -74,13 +72,23 @@
+ }
+ }
+
+- if (expectedException && (!exceptionThrown || f != null))
++ if (exceptionExpected && (!exceptionThrown || f != null))
+ throw new RuntimeException("IOException is expected");
+ }
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
++ // Common test
++ final String name = "SpecialTempFile";
++ File f = new File(System.getProperty("java.io.tmpdir"), name);
++ if (!f.exists()) {
++ f.createNewFile();
++ }
++ String[] nulPre = { name + "\u0000" };
++ String[] nulSuf = { ".test" };
++ test("NulName", nulPre, nulSuf, true);
++
+ // Test JDK-8025128
+ String[] goodPre = { "///..///", "/foo" };
+ String[] goodSuf = { ".temp", ".tmp" };
+@@ -91,6 +99,7 @@
+ String[] slashSuf = { "///..///..", "///..///..", "///..///.." };
+ test("SlashedName", slashPre, slashSuf, true);
+
++ // Windows tests
+ if (!System.getProperty("os.name").startsWith("Windows"))
+ return;
+
+--- ./jdk/test/java/lang/ClassLoader/Assert.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/lang/ClassLoader/Assert.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -23,6 +23,21 @@
+
+ #
+
++OS=`uname -s`
++case "$OS" in
++ SunOS | Linux | Darwin )
++ FS="/"
++ CHMOD="${FS}bin${FS}chmod"
++ ;;
++ Windows* | CYGWIN* )
++ CHMOD="chmod"
++ ;;
++ * )
++ echo "Unrecognized system!"
++ exit 1;
++ ;;
++esac
++
+ if [ "${TESTSRC}" = "" ]
+ then
+ echo "TESTSRC not set. Test cannot execute. Failed."
+@@ -46,6 +61,7 @@
+ cp ${TESTSRC}/Assert.java .
+ cp -R ${TESTSRC}/package1 .
+ cp -R ${TESTSRC}/package2 .
++${CHMOD} -R u+w *
+
+ ${TESTJAVA}/bin/javac Assert.java
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/ProcessBuilder/CloseRace.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,182 @@
++/*
++ * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * 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 8024521
++ * @summary Closing ProcessPipeInputStream at the time the process exits is racy
++ * and leads to data corruption. Run this test manually (as
++ * an ordinary java program) with -Xmx8M to repro bug 8024521.
++ * @run main/othervm -Xmx8M -Dtest.duration=2 CloseRace
++ */
++
++import java.io.*;
++import java.util.ArrayList;
++import java.util.List;
++import java.util.Map;
++import java.util.concurrent.CountDownLatch;
++
++public class CloseRace {
++ private static final String BIG_FILE = "bigfile";
++
++ private static final int[] procFDs = new int[6];
++
++ /** default value sufficient to repro bug 8024521. */
++ private static final int testDurationSeconds
++ = Integer.getInteger("test.duration", 600);
++
++ private static final CountDownLatch threadsStarted
++ = new CountDownLatch(2);
++
++ static boolean fdInUse(int i) {
++ return new File("/proc/self/fd/" + i).exists();
++ }
++
++ static boolean[] procFDsInUse() {
++ boolean[] inUse = new boolean[procFDs.length];
++ for (int i = 0; i < procFDs.length; i++)
++ inUse[i] = fdInUse(procFDs[i]);
++ return inUse;
++ }
++
++ static int count(boolean[] bits) {
++ int count = 0;
++ for (int i = 0; i < bits.length; i++)
++ count += bits[i] ? 1 : 0;
++ return count;
++ }
++
++ static void dumpAllStacks() {
++ System.err.println("Start of dump");
++ final Map<Thread, StackTraceElement[]> allStackTraces
++ = Thread.getAllStackTraces();
++ for (Thread thread : allStackTraces.keySet()) {
++ System.err.println("Thread " + thread.getName());
++ for (StackTraceElement element : allStackTraces.get(thread))
++ System.err.println("\t" + element);
++ }
++ System.err.println("End of dump");
++ }
++
++ public static void main(String args[]) throws Exception {
++ if (!(new File("/proc/self/fd").isDirectory()))
++ return;
++
++ // Catch Errors from process reaper
++ Thread.setDefaultUncaughtExceptionHandler(
++ new Thread.UncaughtExceptionHandler() {
++ @Override
++ public void uncaughtException(Thread t, Throwable e) {
++ e.printStackTrace();
++ System.exit(1);
++ }
++ });
++
++ try (RandomAccessFile f = new RandomAccessFile(BIG_FILE, "rw")) {
++ f.setLength(Runtime.getRuntime().maxMemory()); // provoke OOME
++ }
++
++ for (int i = 0, j = 0; j < procFDs.length; i++)
++ if (!fdInUse(i))
++ procFDs[j++] = i;
++
++ Thread[] threads = {
++ new Thread(new OpenLoop()),
++ new Thread(new ExecLoop()),
++ };
++ for (Thread thread : threads)
++ thread.start();
++
++ threadsStarted.await();
++ Thread.sleep(testDurationSeconds * 1000);
++
++ for (Thread thread : threads)
++ thread.interrupt();
++ for (Thread thread : threads) {
++ thread.join(10_000);
++ if (thread.isAlive()) {
++ dumpAllStacks();
++ throw new Error("At least one child thread ("
++ + thread.getName()
++ + ") failed to finish gracefully");
++ }
++ }
++ }
++
++ static class OpenLoop implements Runnable {
++ public void run() {
++ threadsStarted.countDown();
++ while (!Thread.interrupted()) {
++ try {
++ // wait for ExecLoop to finish creating process
++ do {
++ if (Thread.interrupted())
++ return;
++ } while (count(procFDsInUse()) != 3);
++ List<InputStream> iss = new ArrayList<>(4);
++
++ // eat up three "holes" (closed ends of pipe fd pairs)
++ for (int i = 0; i < 3; i++)
++ iss.add(new FileInputStream(BIG_FILE));
++ do {
++ if (Thread.interrupted())
++ return;
++ } while (count(procFDsInUse()) == procFDs.length);
++ // hopefully this will racily occupy empty fd slot
++ iss.add(new FileInputStream(BIG_FILE));
++ Thread.sleep(1); // Widen race window
++ for (InputStream is : iss)
++ is.close();
++ } catch (InterruptedException e) {
++ break;
++ } catch (Exception e) {
++ throw new Error(e);
++ }
++ }
++ }
++ }
++
++ static class ExecLoop implements Runnable {
++ public void run() {
++ threadsStarted.countDown();
++ ProcessBuilder builder = new ProcessBuilder("/bin/true");
++ while (!Thread.interrupted()) {
++ try {
++ // wait for OpenLoop to finish
++ do {
++ if (Thread.interrupted())
++ return;
++ } while (count(procFDsInUse()) > 0);
++ Process process = builder.start();
++ InputStream is = process.getInputStream();
++ process.waitFor();
++ is.close();
++ } catch (InterruptedException e) {
++ break;
++ } catch (Exception e) {
++ throw new Error(e);
++ }
++ }
++ }
++ }
++}
+--- ./jdk/test/java/lang/Runtime/exec/CloseRace.java Mon Sep 08 12:16:34 2014 -0700
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,146 +0,0 @@
+-/*
+- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation.
+- *
+- * 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 8024521
+- * @summary Closing ProcessPipeInputStream at the time the process exits is racy
+- * and leads to the data corruption.
+- * @library /lib/testlibrary
+- * @run main/othervm/timeout=80 CloseRace
+- */
+-
+-/**
+- * This test has a little chance to catch the race during the given default
+- * time gap of 20 seconds. To increase the time gap, set the system property
+- * CloseRaceTimeGap=N to the number of seconds.
+- * Jtreg's timeoutFactor should also be set appropriately.
+- *
+- * For example, to run the test for 10 minutes:
+- * > jtreg \
+- * -testjdk:$(PATH_TO_TESTED_JDK) \
+- * -timeoutFactor:10 \
+- * -DCloseRaceTimeGap=600 \
+- * $(PATH_TO_TESTED_JDK_SOURCE)/test/java/lang/Runtime/exec/CloseRace.java
+- */
+-
+-import java.io.*;
+-import java.nio.file.Files;
+-import java.nio.file.Path;
+-import java.nio.file.Paths;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.LinkedList;
+-import java.util.List;
+-import jdk.testlibrary.OutputAnalyzer;
+-import static jdk.testlibrary.ProcessTools.*;
+-
+-public class CloseRace {
+-
+- public static void main(String args[]) throws Exception {
+- ProcessBuilder pb = createJavaProcessBuilder("-Xmx64M", "CloseRace$Child",
+- System.getProperty("CloseRaceTimeGap", "20"));
+- OutputAnalyzer oa = new OutputAnalyzer(pb.start());
+- oa.stderrShouldNotContain("java.lang.OutOfMemoryError");
+- }
+-
+- public static class Child {
+- private static final String BIG_FILE = "bigfile";
+- private static final String SMALL_FILE = "smallfile";
+- private static int timeGap = 20; // seconds
+-
+- public static void main(String args[]) throws Exception {
+- if (args.length > 0) {
+- try {
+- timeGap = Integer.parseInt(args[0]);
+- timeGap = Math.max(timeGap, 10);
+- timeGap = Math.min(timeGap, 10 * 60 * 60); // no more than 10 hours
+- } catch (NumberFormatException ignore) {}
+- }
+- try (RandomAccessFile f = new RandomAccessFile(BIG_FILE, "rw")) {
+- f.setLength(1024 * 1024 * 1024); // 1 Gb, greater than max heap size
+- }
+- try (FileOutputStream fs = new FileOutputStream(SMALL_FILE);
+- PrintStream ps = new PrintStream(fs)) {
+- for (int i = 0; i < 128; ++i)
+- ps.println("line of text");
+- }
+-
+- List<Thread> threads = new LinkedList<>();
+- for (int i = 0; i < 99; ++i) {
+- Thread t = new Thread (new OpenLoop());
+- t.start();
+- threads.add(t);
+- }
+- Thread t2 = new Thread (new ExecLoop());
+- t2.start();
+- threads.add(t2);
+-
+- Thread.sleep(timeGap);
+-
+- for (Thread t : threads) {
+- t.interrupt();
+- t.join();
+- }
+- }
+-
+- private static class OpenLoop implements Runnable {
+- public void run() {
+- final Path bigFilePath = Paths.get(BIG_FILE);
+- while (!Thread.interrupted()) {
+- try (InputStream in = Files.newInputStream(bigFilePath)) {
+- // Widen the race window by sleeping 1ms
+- Thread.sleep(1);
+- } catch (InterruptedException e) {
+- break;
+- } catch (Exception e) {
+- System.err.println(e);
+- }
+- }
+- }
+- }
+-
+- private static class ExecLoop implements Runnable {
+- public void run() {
+- List<String> command = new ArrayList<>(
+- Arrays.asList("/bin/cat", SMALL_FILE));
+- while (!Thread.interrupted()) {
+- try {
+- ProcessBuilder builder = new ProcessBuilder(command);
+- final Process process = builder.start();
+- InputStream is = process.getInputStream();
+- InputStreamReader isr = new InputStreamReader(is);
+- BufferedReader br = new BufferedReader(isr);
+- while (br.readLine() != null) {}
+- process.waitFor();
+- isr.close();
+- } catch (InterruptedException e) {
+- break;
+- } catch (Exception e) {
+- System.err.println(e);
+- }
+- }
+- }
+- }
+- }
+-}
+--- ./jdk/test/java/lang/String/ToLowerCase.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/lang/String/ToLowerCase.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 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
+@@ -23,7 +23,7 @@
+
+ /*
+ @test
+- @bug 4217441 4533872 4900935 8020037
++ @bug 4217441 4533872 4900935 8020037 8041791
+ @summary toLowerCase should lower-case Greek Sigma correctly depending
+ on the context (final/non-final). Also it should handle
+ Locale specific (lt, tr, and az) lowercasings and supplementary
+@@ -72,8 +72,10 @@
+ // I-dot tests
+ test("\u0130", turkish, "i");
+ test("\u0130", az, "i");
+- test("\u0130", lt, "i");
+- test("\u0130", Locale.US, "i");
++ test("\u0130", lt, "\u0069\u0307");
++ test("\u0130", Locale.US, "\u0069\u0307");
++ test("\u0130", Locale.JAPAN, "\u0069\u0307");
++ test("\u0130", Locale.ROOT, "\u0069\u0307");
+
+ // Remove dot_above in the sequence I + dot_above (Turkish and Azeri)
+ test("I\u0307", turkish, "i");
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/instrument/DaemonThread/DummyAgent.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,46 @@
++/*
++ * Copyright 2014 Goldman Sachs.
++ * 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.lang.instrument.ClassFileTransformer;
++import java.lang.instrument.IllegalClassFormatException;
++import java.lang.instrument.Instrumentation;
++import java.security.ProtectionDomain;
++
++public class DummyAgent implements ClassFileTransformer {
++ @Override
++ public byte[] transform(ClassLoader loader, String className,
++ Class<?> classBeingRedefined, ProtectionDomain protectionDomain,
++ byte[] classfileBuffer) throws IllegalClassFormatException {
++
++ /* The Daemon Thread bug is timing dependent and you want the transform method
++ * to return ASAP - so just return the buffer will be fine
++ */
++ return classfileBuffer;
++ }
++
++ public static void premain(String agentArgs, Instrumentation inst) {
++ inst.addTransformer(new DummyAgent(), false);
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/instrument/DaemonThread/DummyClass.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,27 @@
++/*
++ * Copyright 2014 Goldman Sachs.
++ * 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.
++ */
++
++/* Just a dummy class for loading */
++public class DummyClass {
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/instrument/DaemonThread/TestDaemonThread.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,72 @@
++/*
++ * Copyright 2014 Goldman Sachs.
++ * 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 7142035
++ * @summary Assert in java.lang.instrument agents during shutdown when classloading occurs after shutdown
++ * @library /lib/testlibrary
++ *
++ * @build DummyAgent DummyClass TestDaemonThreadLauncher TestDaemonThread
++ * @run shell ../MakeJAR3.sh DummyAgent
++ * @run main TestDaemonThreadLauncher /timeout=240
++ *
++ */
++import java.io.File;
++import java.net.URL;
++import java.net.URLClassLoader;
++
++public class TestDaemonThread implements Runnable{
++ File classpath;
++
++ public TestDaemonThread(File classpath) {
++ this.classpath = classpath;
++ }
++
++ @Override
++ public void run() {
++
++
++ try {
++ URL u = this.getClass().getClassLoader().getResource("DummyClass.class");
++ String path = u.getPath();
++ String parent = u.getPath().substring(0, path.lastIndexOf('/')+1);
++ URL parentURL = new URL(u, parent);
++ System.out.println(parentURL);
++ /* Load lots of class by creating multiple classloaders */
++ for(;;) {
++ ClassLoader cl = new URLClassLoader(new URL[] {parentURL}, null);
++ cl.loadClass("DummyClass");
++ }
++ } catch (Exception e) {
++ e.printStackTrace();
++ }
++ }
++
++ public static void main(String[] args) throws Exception {
++ Thread t = new Thread(new TestDaemonThread(new File(args[0])));
++ /* The important part of the bug is that a Daemon thread can continue to load classes after shutdown */
++ t.setDaemon(true);
++ t.start();
++ Thread.sleep(200);
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/lang/instrument/DaemonThread/TestDaemonThreadLauncher.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,44 @@
++/*
++ * Copyright 2014 Goldman Sachs.
++ * 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 jdk.testlibrary.JDKToolLauncher;
++import jdk.testlibrary.OutputAnalyzer;
++import jdk.testlibrary.ProcessTools;
++
++import java.io.IOException;
++import java.nio.file.Path;
++
++public class TestDaemonThreadLauncher {
++
++ private static ProcessBuilder processBuilder = new ProcessBuilder();
++
++ public static void main(String args[]) throws Exception {
++ for(int i=0; i<50; i++) {
++ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-javaagent:DummyAgent.jar", "TestDaemonThread", ".");
++ OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
++ analyzer.shouldNotContain("ASSERTION FAILED");
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,125 @@
++/*
++ * 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 6458027
++ * @summary Disabling IPv6 on a specific network interface causes problems.
++ *
++ */
++
++import java.io.IOException;
++import java.net.InetAddress;
++import java.net.MulticastSocket;
++import java.net.NetworkInterface;
++import java.net.SocketException;
++import java.util.Arrays;
++import java.util.Enumeration;
++
++
++public class SetGetNetworkInterfaceTest {
++
++ public static void main(String[] args) throws Exception {
++
++ boolean passed = true;
++ try {
++ MulticastSocket ms = new MulticastSocket();
++ Enumeration<NetworkInterface> networkInterfaces = NetworkInterface
++ .getNetworkInterfaces();
++ while (networkInterfaces.hasMoreElements()) {
++ NetworkInterface netIf = networkInterfaces.nextElement();
++ if (isNetworkInterfaceTestable(netIf)) {
++ printNetIfDetails(netIf);
++ ms.setNetworkInterface(netIf);
++ NetworkInterface msNetIf = ms.getNetworkInterface();
++ if (netIf.equals(msNetIf)) {
++ System.out.println(" OK");
++ } else {
++ System.out.println("FAILED!!!");
++ printNetIfDetails(msNetIf);
++ passed = false;
++ }
++ System.out.println("------------------");
++ }
++ }
++ } catch (IOException e) {
++ e.printStackTrace();
++ passed = false;
++ }
++ if (!passed) {
++ throw new RuntimeException("Test Fail");
++ }
++ System.out.println("Test passed ");
++ }
++
++ private static boolean isNetworkInterfaceTestable(NetworkInterface netIf) throws Exception {
++ System.out.println("checking netif == " + netIf.getName());
++ return (netIf.isUp() && netIf.supportsMulticast() && isIpAddrAvailable(netIf));
++ }
++
++ private static boolean isIpAddrAvailable (NetworkInterface netIf) {
++ boolean ipAddrAvailable = false;
++ byte[] nullIpAddr = {'0', '0', '0', '0'};
++ byte[] testIpAddr = null;
++
++ Enumeration<InetAddress> ipAddresses = netIf.getInetAddresses();
++ while (ipAddresses.hasMoreElements()) {
++ InetAddress testAddr = ipAddresses.nextElement();
++ testIpAddr = testAddr.getAddress();
++ if ((testIpAddr != null) && (!Arrays.equals(testIpAddr, nullIpAddr))) {
++ ipAddrAvailable = true;
++ break;
++ } else {
++ System.out.println("ignore netif " + netIf.getName());
++ }
++ }
++ return ipAddrAvailable;
++ }
++
++ private static void printNetIfDetails(NetworkInterface ni)
++ throws SocketException {
++ System.out.println("Name " + ni.getName() + " index " + ni.getIndex());
++ Enumeration<InetAddress> en = ni.getInetAddresses();
++ while (en.hasMoreElements()) {
++ System.out.println(" InetAdress: " + en.nextElement());
++ }
++ System.out.println("HardwareAddress: " + createMacAddrString(ni));
++ System.out.println("loopback: " + ni.isLoopback() + "; pointToPoint: "
++ + ni.isPointToPoint() + "; virtual: " + ni.isVirtual()
++ + "; MTU: " + ni.getMTU());
++ }
++
++ private static String createMacAddrString(NetworkInterface netIf)
++ throws SocketException {
++ byte[] macAddr = netIf.getHardwareAddress();
++ StringBuilder sb = new StringBuilder();
++ if (macAddr != null) {
++ for (int i = 0; i < macAddr.length; i++) {
++ sb.append(String.format("%02X%s", macAddr[i],
++ (i < macAddr.length - 1) ? "-" : ""));
++ }
++ }
++ return sb.toString();
++ }
++}
+--- ./jdk/test/java/net/NetworkInterface/UniqueMacAddressesTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/net/NetworkInterface/UniqueMacAddressesTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -118,11 +118,14 @@
+ NetworkInterface netIf = null;
+ while (nis.hasMoreElements()) {
+ netIf = (NetworkInterface) nis.nextElement();
+- macAddr = netIf.getHardwareAddress();
+- if (macAddr != null) {
+- System.out
+- .println("Adding NetworkInterface " + netIf.getName());
+- networkInterfaceList.add(netIf);
++ if (netIf.isUp()) {
++ macAddr = netIf.getHardwareAddress();
++ if (macAddr != null) {
++ System.out.println("Adding NetworkInterface "
++ + netIf.getName() + " with mac address "
++ + createMacAddressString(netIf));
++ networkInterfaceList.add(netIf);
++ }
+ }
+ }
+ }
+--- ./jdk/test/java/net/ipv6tests/BadIPv6Addresses.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/net/ipv6tests/BadIPv6Addresses.java Mon Jan 05 11:57:27 2015 -0800
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 4742177
++ * @bug 4742177 8019834
+ * @summary Re-test IPv6 (and specifically MulticastSocket) with latest Linux & USAGI code
+ */
+ import java.net.*;
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -36,7 +36,7 @@
+ case "$OS" in
+ SunOS | Linux | Darwin ) ;;
+ # Skip locale test for Windows
+- Windows* )
++ Windows* | CYGWIN* )
+ echo "Passed"; exit 0 ;;
+ * ) echo "Unrecognized system!" ; exit 1 ;;
+ esac
+--- ./jdk/test/java/nio/file/Path/PathOps.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/nio/file/Path/PathOps.java Mon Jan 05 11:57:27 2015 -0800
+@@ -22,7 +22,7 @@
+ */
+
+ /* @test
+- * @bug 4313887 6838333 6925932 7006126
++ * @bug 4313887 6838333 6925932 7006126 8037945
+ * @summary Unit test for java.nio.file.Path path operations
+ */
+
+@@ -899,6 +899,8 @@
+ .normalize("foo");
+ test("/foo")
+ .normalize("/foo");
++ test("")
++ .normalize("");
+ test(".")
+ .normalize("");
+ test("..")
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -37,11 +37,13 @@
+ SunOS | Linux | Darwin )
+ PS=":"
+ FS="/"
++ CHMOD="${FS}bin${FS}chmod"
+ FILEURL="file:"
+ ;;
+ Windows* )
+ PS=";"
+ FS="\\"
++ CHMOD="chmod"
+ FILEURL="file:/"
+ if [ "$VER" -eq "5" ]; then
+ ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
+@@ -51,6 +53,7 @@
+ CYGWIN* )
+ PS=";"
+ FS="/"
++ CHMOD="chmod"
+ FILEURL="file:/"
+ if [ "${VER}" -eq "5" ]; then
+ ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
+@@ -65,6 +68,7 @@
+
+ TEST_CLASSPATH=.$PS${TESTCLASSPATH:-$TESTCLASSES}
+ cp -r ${TESTSRC}${FS}* .
++${CHMOD} -R u+w *
+ ${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java
+ ${TESTJAVA}${FS}bin${FS}javac -cp $TEST_CLASSPATH readTest.java
+
+--- ./jdk/test/java/util/Currency/ValidateISO4217.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/util/Currency/ValidateISO4217.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -22,7 +22,7 @@
+ */
+ /*
+ * @test
+- * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203
++ * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
+ * @summary Validate ISO 4217 data for Currency class.
+ */
+
+@@ -92,7 +92,7 @@
+
+ /* Codes that are obsolete, do not have related country */
+ static final String otherCodes =
+- "ADP-AFA-ATS-AYM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-NLG-PTE-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZWD-ZWN-ZWR";
++ "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-CLF-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-PTE-ROL-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-USN-USS-VEB-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZMK-ZWD-ZWN-ZWR";
+
+ static boolean err = false;
+
+--- ./jdk/test/java/util/Currency/tablea1.txt Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/util/Currency/tablea1.txt Mon Jan 05 11:57:27 2015 -0800
+@@ -1,12 +1,12 @@
+ #
+ #
+-# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA151.doc
+-# (As of 7 April 2011)
++# Amendments up until ISO 4217 AMENDMENT NUMBER 159
++# (As of 15 August 2014)
+ #
+
+ # Version
+ FILEVERSION=1
+-DATAVERSION=151
++DATAVERSION=159
+
+ # ISO 4217 currency data
+ AF AFN 971 2
+@@ -23,7 +23,7 @@
+ AU AUD 36 2
+ AT EUR 978 2
+ # MA 129
+-AZ AZM 31 2 2005-12-31-20-00-00 AZN 944 2
++AZ AZN 944 2
+ BS BSD 44 2
+ BH BHD 48 3
+ BD BDT 50 2
+@@ -96,7 +96,7 @@
+ GM GMD 270 2
+ GE GEL 981 2
+ DE EUR 978 2
+-GH GHC 288 2 2007-07-01-00-00-00 GHS 936 2
++GH GHS 936 2
+ GI GIP 292 2
+ GR EUR 978 2
+ GL DKK 208 2
+@@ -135,14 +135,14 @@
+ KW KWD 414 3
+ KG KGS 417 2
+ LA LAK 418 2
+-LV LVL 428 2
++LV LVL 428 2 2013-12-31-22-00-00 EUR 978 2
+ LB LBP 422 2
+ #LS ZAR 710 2
+ LS LSL 426 2
+ LR LRD 430 2
+ LY LYD 434 3
+ LI CHF 756 2
+-LT LTL 440 2
++LT LTL 440 2 2014-12-31-22-00-00 EUR 978 2
+ LU EUR 978 2
+ MO MOP 446 2
+ MK MKD 807 2
+@@ -166,7 +166,7 @@
+ MS XCD 951 2
+ MA MAD 504 2
+ # MA 130
+-MZ MZM 508 2 2006-06-30-22-00-00 MZN 943 2
++MZ MZN 943 2
+ MM MMK 104 2
+ # MA 134
+ ME EUR 978 2
+@@ -200,7 +200,7 @@
+ PR USD 840 2
+ QA QAR 634 2
+ RE EUR 978 2
+-RO ROL 946 2 2005-06-30-21-00-00 RON 946 2
++RO RON 946 2
+ RU RUB 643 2
+ RW RWF 646 0
+ SH SHP 654 2
+@@ -227,6 +227,7 @@
+ SB SBD 90 2
+ SO SOS 706 2
+ ZA ZAR 710 2
++SS SSP 728 2
+ ES EUR 978 2
+ LK LKR 144 2
+ SD SDG 938 2
+@@ -255,7 +256,7 @@
+ TM TMT 934 2
+ TC USD 840 2
+ TV AUD 36 2
+-UG UGX 800 2
++UG UGX 800 0
+ UA UAH 980 2
+ AE AED 784 2
+ GB GBP 826 2
+@@ -266,14 +267,14 @@
+ UY UYU 858 2
+ UZ UZS 860 2
+ VU VUV 548 0
+-VE VEB 862 2 2008-01-01-04-00-00 VEF 937 2
+-VN VND 704 2
++VE VEF 937 2
++VN VND 704 0
+ VG USD 840 2
+ VI USD 840 2
+ WF XPF 953 0
+ EH MAD 504 2
+ YE YER 886 2
+-ZM ZMK 894 2
++ZM ZMW 967 2
+ ZW ZWL 932 2
+ #XAU XAU 959
+ #XBA XBA 955
+--- ./jdk/test/java/util/Locale/LocaleTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/util/Locale/LocaleTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -25,7 +25,7 @@
+ * @bug 4052404 4052440 4084688 4092475 4101316 4105828 4107014 4107953 4110613
+ * 4118587 4118595 4122371 4126371 4126880 4135316 4135752 4139504 4139940 4143951
+ * 4147315 4147317 4147552 4335196 4778440 4940539 5010672 6475525 6544471 6627549
+- * 6786276 7066203
++ * 6786276 7066203 7085757
+ * @summary test Locales
+ */
+ /*
+@@ -440,8 +440,8 @@
+ String[] spotCheck2 = { "US", "CA", "GB", "FR", "DE", "IT", "JP", "KR", "CN", "TW", "TH" };
+
+
+- if (test.length != 249)
+- errln("Expected getISOCountries to return 249 countries; it returned " + test.length);
++ if (test.length != 250)
++ errln("Expected getISOCountries to return 250 countries; it returned " + test.length);
+ else {
+ for (int i = 0; i < spotCheck2.length; i++) {
+ int j;
+--- ./jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -36,6 +36,7 @@
+ ${TESTJAVA}/bin/keytool -genkeypair -alias testcert \
+ -keystore ${TESTCLASSES}/timezonedatetest.store \
+ -storepass testpass -validity 360 \
++ -keyalg rsa \
+ -dname "cn=Mark Wildebeest, ou=FreeSoft, o=Red Hat, c=NL" \
+ -keypass testpass
+
+--- ./jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java Mon Jan 05 11:57:27 2015 -0800
+@@ -49,7 +49,7 @@
+ new File("ks").delete();
+ sun.security.tools.KeyTool.main(
+ ("-keystore ks -storepass changeit -keypass changeit " +
+- "-alias a -dname CN=A -genkeypair").split(" "));
++ "-keyalg rsa -alias a -dname CN=A -genkeypair").split(" "));
+ sun.security.tools.JarSigner.main(
+ "-keystore ks -storepass changeit x.jar a".split(" "));
+
+--- ./jdk/test/java/util/logging/ParentLoggersTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/util/logging/ParentLoggersTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -40,7 +40,9 @@
+ static final String LOGGER_NAME_1 = PARENT_NAME_1 + ".myLogger";
+ static final String LOGGER_NAME_2 = PARENT_NAME_2 + ".myBar.myLogger";
+
+- static final List<String> initialLoggerNames = new ArrayList<String>();
++ static final List<String> initialLoggerNames = new ArrayList<>();
++ static final List<Logger> createdLoggers = new ArrayList<>();
++
+ public static void main(String args[]) throws Exception {
+ // cache the initial set of loggers before this test begins
+ // to add any loggers
+@@ -51,7 +53,7 @@
+ if (!defaultLoggers.contains(logger)) {
+ initialLoggerNames.add(logger);
+ }
+- };
++ }
+
+ String tstSrc = System.getProperty(TST_SRC_PROP);
+ File fname = new File(tstSrc, LM_PROP_FNAME);
+@@ -69,7 +71,7 @@
+ }
+
+ public static List<String> getDefaultLoggerNames() {
+- List<String> expectedLoggerNames = new ArrayList<String>();
++ List<String> expectedLoggerNames = new ArrayList<>();
+
+ // LogManager always creates two loggers:
+ expectedLoggerNames.add(""); // root logger: ""
+@@ -83,56 +85,41 @@
+ */
+ public static boolean checkLoggers() {
+ String failMsg = "# checkLoggers: getLoggerNames() returned unexpected loggers";
+- Vector<String> expectedLoggerNames = new Vector<String>(getDefaultLoggerNames());
++ List<String> expectedLoggerNames = new ArrayList<>(getDefaultLoggerNames());
+
+ // Create the logger LOGGER_NAME_1
+- Logger logger1 = Logger.getLogger(LOGGER_NAME_1);
+- expectedLoggerNames.addElement(PARENT_NAME_1);
+- expectedLoggerNames.addElement(LOGGER_NAME_1);
++ createdLoggers.add(Logger.getLogger(LOGGER_NAME_1));
++ expectedLoggerNames.add(PARENT_NAME_1);
++ expectedLoggerNames.add(LOGGER_NAME_1);
+
+ // Create the logger LOGGER_NAME_2
+- Logger logger2 = Logger.getLogger(LOGGER_NAME_2);
+- expectedLoggerNames.addElement(PARENT_NAME_2);
+- expectedLoggerNames.addElement(LOGGER_NAME_2);
++ createdLoggers.add(Logger.getLogger(LOGGER_NAME_2));
++ expectedLoggerNames.add(PARENT_NAME_2);
++ expectedLoggerNames.add(LOGGER_NAME_2);
+
+ Enumeration<String> returnedLoggersEnum = logMgr.getLoggerNames();
+- Vector<String> returnedLoggerNames = new Vector<String>(0);
++ List<String> returnedLoggerNames = new ArrayList<>(0);
+ while (returnedLoggersEnum.hasMoreElements()) {
+ String logger = returnedLoggersEnum.nextElement();
+ if (!initialLoggerNames.contains(logger)) {
+ // filter out the loggers that have been added before this test runs
+- returnedLoggerNames.addElement(logger);
++ returnedLoggerNames.add(logger);
+ }
+-
+- };
+-
++ }
++ System.out.println(returnedLoggerNames);
+ return checkNames(expectedLoggerNames, returnedLoggerNames, failMsg);
+ }
+
+ // Returns boolean values: PASSED or FAILED
+- private static boolean checkNames(Vector<String> expNames,
+- Vector<String> retNames,
++ private static boolean checkNames(List<String> expNames,
++ List<String> retNames,
+ String failMsg) {
+ boolean status = PASSED;
+
+ if (expNames.size() != retNames.size()) {
+ status = FAILED;
+- } else {
+- boolean checked[] = new boolean[retNames.size()];
+- for (int i = 0; i < expNames.size(); i++) {
+- int j = 0;
+- for (; j < retNames.size(); j++) {
+- if (!checked[j] &&
+- expNames.elementAt(i).equals(retNames.elementAt(j))) {
+- checked[j] = true;
+- break;
+- }
+- }
+- if (j >= retNames.size()) {
+- status = FAILED;
+- break;
+- }
+- }
++ } else if (!new HashSet<>(expNames).equals(new HashSet<>(retNames))) {
++ status = FAILED;
+ }
+ if (!status) {
+ printFailMsg(expNames, retNames, failMsg);
+@@ -140,25 +127,25 @@
+ return status;
+ }
+
+- private static void printFailMsg(Vector<String> expNames,
+- Vector<String> retNames,
++ private static void printFailMsg(List<String> expNames,
++ List<String> retNames,
+ String failMsg) {
+ out.println();
+ out.println(failMsg);
+- if (expNames.size() == 0) {
++ if (expNames.isEmpty()) {
+ out.println("# there are NO expected logger names");
+ } else {
+ out.println("# expected logger names (" + expNames.size() + "):");
+ for (int i = 0; i < expNames.size(); i++) {
+- out.println(" expNames[" + i + "] = " + expNames.elementAt(i));
++ out.println(" expNames[" + i + "] = " + expNames.get(i));
+ }
+ }
+- if (retNames.size() == 0) {
++ if (retNames.isEmpty()) {
+ out.println("# there are NO returned logger names");
+ } else {
+ out.println("# returned logger names (" + retNames.size() + "):");
+ for (int i = 0; i < retNames.size(); i++) {
+- out.println(" retNames[" + i + "] = " + retNames.elementAt(i));
++ out.println(" retNames[" + i + "] = " + retNames.get(i));
+ }
+ }
+ }
+--- ./jdk/test/java/util/logging/TestLoggerBundleSync.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/util/logging/TestLoggerBundleSync.java Mon Jan 05 11:57:27 2015 -0800
+@@ -190,8 +190,10 @@
+ final static class MyHandler extends Handler {
+ volatile ResourceBundle rb;
+ volatile String rbName;
++ volatile int count = 0;
+ @Override
+ public synchronized void publish(LogRecord record) {
++ count++;
+ rb = record.getResourceBundle();
+ rbName = record.getResourceBundleName();
+ }
+@@ -227,23 +229,51 @@
+ Logger ll = Logger.getLogger(l.getName()+".bie.bye");
+ ResourceBundle hrb;
+ String hrbName;
++ if (handler.getLevel() != Level.FINEST) {
++ throw new RuntimeException("Handler level is not finest: "
++ + handler.getLevel());
++ }
++ final int countBefore = handler.count;
+ ll.setLevel(Level.FINEST);
+ ll.addHandler(handler);
+ ll.fine("dummy");
+ ll.removeHandler(handler);
++ final int countAfter = handler.count;
++ if (countBefore == countAfter) {
++ throw new RuntimeException("Handler not called for "
++ + ll.getName() + "("+ countAfter +")");
++ }
+ hrb = handler.rb;
+ hrbName = handler.rbName;
+ if (name != null) {
++ // if name is not null, then it implies that it
++ // won't change, since setResourceBundle() cannot
++ // replace a non null name.
++ // Since we never set the resource bundle on 'll',
++ // then ll must inherit its resource bundle [name]
++ // from l - and therefor we should find it in
++ // handler.rb/handler.rbName
+ if (!name.equals(hrbName)) {
+ throw new RuntimeException("Unexpected bundle name: "
+- +hrb.getClass().getName());
++ +hrbName);
+ }
++ // here we know that hrbName is not null so hrb
++ // should not be null either.
+ if (!name.equals(hrb.getClass().getName())) {
+ throw new RuntimeException("Unexpected bundle name: "
+ +hrb.getClass().getName());
+ }
+ }
+
++ // Make sure to refer to 'l' explicitly in order to
++ // prevent eager garbage collecting before the end of
++ // the test (JDK-8030192)
++ if (!ll.getName().startsWith(l.getName())) {
++ throw new RuntimeException("Logger " + ll.getName()
++ + "does not start with expected prefix "
++ + l.getName());
++ }
++
+ getRBcount.incrementAndGet();
+ if (!goOn) break;
+ Thread.sleep(1);
+--- ./jdk/test/java/util/zip/ZipFile/ReadZip.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/java/util/zip/ZipFile/ReadZip.java Mon Jan 05 11:57:27 2015 -0800
+@@ -63,6 +63,8 @@
+ Files.copy(Paths.get(System.getProperty("test.src", ""), "input.zip"),
+ newZip.toPath(), StandardCopyOption.REPLACE_EXISTING);
+
++ newZip.setWritable(true);
++
+ // pad some bytes
+ try (OutputStream os = Files.newOutputStream(newZip.toPath(),
+ StandardOpenOption.APPEND)) {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/imageio/plugins/png/PngDitDepthTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,74 @@
++/*
++ * 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 4991647
++* @summary PNGMetadata.getAsTree() sets bitDepth to invalid value
++* @run main PngDitDepthTest
++*/
++
++import org.w3c.dom.Node;
++
++import javax.imageio.ImageIO;
++import javax.imageio.ImageTypeSpecifier;
++import javax.imageio.ImageWriter;
++import javax.imageio.metadata.IIOInvalidTreeException;
++import javax.imageio.metadata.IIOMetadata;
++import java.awt.image.ColorModel;
++import java.awt.image.SampleModel;
++import java.util.Iterator;
++
++public class PngDitDepthTest {
++
++ public static void main(String[] args) throws IIOInvalidTreeException {
++
++ // getting the writer for the png format
++ Iterator iter = ImageIO.getImageWritersByFormatName("png");
++ ImageWriter writer = (ImageWriter) iter.next();
++
++ // creating a color model
++ ColorModel colorModel = ColorModel.getRGBdefault();
++
++ // creating a sample model
++ SampleModel sampleModel = colorModel.createCompatibleSampleModel(640, 480);
++
++ // creating a default metadata object
++ IIOMetadata metaData = writer.getDefaultImageMetadata(new ImageTypeSpecifier(colorModel, sampleModel), null);
++ String formatName = metaData.getNativeMetadataFormatName();
++
++ // first call
++ Node metaDataNode = metaData.getAsTree(formatName);
++ try {
++ metaData.setFromTree(formatName, metaDataNode);
++ } catch (Exception ex) {
++ ex.printStackTrace();
++ }
++
++ // second call (bitdepht is already set to an invalid value)
++ metaDataNode = metaData.getAsTree(formatName);
++
++ metaData.setFromTree(formatName, metaDataNode);
++
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JComboBox/8032878/bug8032878.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,136 @@
++/*
++ * 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 8032878
++ * @summary Checks that JComboBox as JTable cell editor processes key events
++ * even where setSurrendersFocusOnKeystroke flag in JTable is false and
++ * that it does not lose the first key press where the flag is true.
++ * @library ../../regtesthelpers
++ * @build Util
++ * @author Alexey Ivanov
++ */
++
++import java.awt.*;
++import java.awt.event.KeyEvent;
++import javax.swing.*;
++import javax.swing.text.JTextComponent;
++
++import sun.awt.SunToolkit;
++
++public class bug8032878 implements Runnable {
++ private static final String ONE = "one";
++ private static final String TWO = "two";
++ private static final String THREE = "three";
++
++ private static final String EXPECTED = "one123";
++
++ private final Robot robot;
++
++ private JFrame frame;
++ private JComboBox cb;
++
++ private volatile boolean surrender;
++ private volatile String text;
++
++ public static void main(String[] args) throws Exception {
++ final bug8032878 test = new bug8032878();
++
++ test.test(false);
++ test.test(true);
++ }
++
++ public bug8032878() throws AWTException {
++ robot = new Robot();
++ robot.setAutoDelay(100);
++ }
++
++ private void setupUI() {
++ frame = new JFrame();
++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++
++ JTable table = new JTable(new String[][] {{ONE}, {TWO}, {THREE}},
++ new String[] { "#"});
++ table.setSurrendersFocusOnKeystroke(surrender);
++
++ cb = new JComboBox(new String[]{ONE, TWO, THREE});
++ cb.setEditable(true);
++ DefaultCellEditor comboEditor = new DefaultCellEditor(cb);
++ comboEditor.setClickCountToStart(1);
++ table.getColumnModel().getColumn(0).setCellEditor(comboEditor);
++ frame.add(table);
++
++ frame.pack();
++ frame.setVisible(true);
++ }
++
++ private void test(final boolean flag) throws Exception {
++ try {
++ surrender = flag;
++ SwingUtilities.invokeAndWait(this);
++
++ runTest();
++ checkResult();
++ } finally {
++ if (frame != null) {
++ frame.dispose();
++ }
++ }
++ }
++
++ private void runTest() throws Exception {
++ realSync();
++ // Select 'one'
++ Util.hitKeys(robot, KeyEvent.VK_TAB);
++ realSync();
++ Util.hitKeys(robot, KeyEvent.VK_1);
++ Util.hitKeys(robot, KeyEvent.VK_2);
++ Util.hitKeys(robot, KeyEvent.VK_3);
++ Util.hitKeys(robot, KeyEvent.VK_ENTER);
++ realSync();
++ }
++
++ private void checkResult() throws Exception {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ text = ((JTextComponent) cb.getEditor().getEditorComponent()).getText();
++ }
++ });
++ if (text.equals(EXPECTED)) {
++ System.out.println("Test with surrender = " + surrender + " passed");
++ } else {
++ System.out.println("Test with surrender = " + surrender + " failed");
++ throw new RuntimeException("Expected value in JComboBox editor '" +
++ EXPECTED + "' but found '" + text + "'.");
++ }
++ }
++
++ private static void realSync() {
++ ((SunToolkit) (Toolkit.getDefaultToolkit())).realSync();
++ }
++
++ @Override
++ public void run() {
++ setupUI();
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JComponent/8043610/bug8043610.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,122 @@
++/*
++ * 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 8043610
++ @summary Tests that JComponent invalidate, revalidate and repaint methods could
++ be called from any thread
++ @author Petr Pchelko
++*/
++
++import sun.awt.SunToolkit;
++
++import javax.swing.*;
++import java.awt.*;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.atomic.AtomicReference;
++
++public class bug8043610 {
++ private static volatile JFrame frame;
++ private static volatile JComponent component;
++
++ public static void main(String[] args) throws Exception {
++ ThreadGroup stubTG = new ThreadGroup(getRootThreadGroup(), "Stub Thread Group");
++ ThreadGroup swingTG = new ThreadGroup(getRootThreadGroup(), "SwingTG");
++ try {
++ Thread stubThread = new Thread(stubTG, new Runnable() {
++ @Override
++ public void run() {
++ SunToolkit.createNewAppContext();
++ }
++ });
++ stubThread.start();
++ stubThread.join();
++
++ final CountDownLatch startSwingLatch = new CountDownLatch(1);
++ new Thread(swingTG, new Runnable() {
++ @Override
++ public void run() {
++ SunToolkit.createNewAppContext();
++ SwingUtilities.invokeLater(new Runnable() {
++ @Override
++ public void run() {
++ frame = new JFrame();
++ component = new JLabel("Test Text");
++ frame.add(component);
++ frame.setBounds(100, 100, 100, 100);
++ frame.setVisible(true);
++ startSwingLatch.countDown();
++ }
++ });
++ }
++ }).start();
++ startSwingLatch.await();
++
++ final AtomicReference<Exception> caughtException = new AtomicReference<>();
++ Thread checkThread = new Thread(getRootThreadGroup(), new Runnable() {
++ @Override
++ public void run() {
++ try {
++ component.invalidate();
++ component.revalidate();
++ component.repaint(new Rectangle(0, 0, 0, 0));
++ } catch (Exception e) {
++ caughtException.set(e);
++ }
++ }
++ });
++ checkThread.start();
++ checkThread.join();
++
++ if (caughtException.get() != null) {
++ throw new RuntimeException("Failed. Caught exception!", caughtException.get());
++ }
++ } finally {
++ new Thread(swingTG, new Runnable() {
++ @Override
++ public void run() {
++ SwingUtilities.invokeLater(new Runnable() {
++ @Override
++ public void run() {
++ if (frame != null) {
++ frame.dispose();
++ }
++ }
++ });
++ }
++ }).start();
++ }
++ }
++
++ private static ThreadGroup getRootThreadGroup() {
++ ThreadGroup currentTG = Thread.currentThread().getThreadGroup();
++ ThreadGroup parentTG = currentTG.getParent();
++ while (parentTG != null) {
++ currentTG = parentTG;
++ parentTG = currentTG.getParent();
++ }
++ return currentTG;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,63 @@
++/*
++ * 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 8046391
++ * @summary JFileChooser hangs if displayed in Windows L&F
++ * @author Alexey Ivanov
++ * @run main/othervm/timeout=10 bug8046391
++*/
++
++import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
++import sun.awt.OSInfo;
++import sun.awt.OSInfo.OSType;
++
++import javax.swing.JFileChooser;
++import javax.swing.SwingUtilities;
++import javax.swing.UIManager;
++import javax.swing.UnsupportedLookAndFeelException;
++
++public class bug8046391 {
++
++ public static void main(String[] args) throws Exception {
++ OSType type = OSInfo.getOSType();
++ if (type != OSType.WINDOWS) {
++ System.out.println("This test is for Windows only... skipping!");
++ return;
++ }
++
++ SwingUtilities.invokeAndWait(() -> {
++ try {
++ UIManager.setLookAndFeel(new WindowsLookAndFeel());
++ } catch (UnsupportedLookAndFeelException e) {
++ e.printStackTrace();
++ }
++ System.out.println("Creating JFileChooser...");
++ JFileChooser fileChooser = new JFileChooser();
++ System.out.println("Test passed: chooser = " + fileChooser);
++ });
++ // Test fails if creating JFileChooser hangs
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JFileChooser/8062561/bug8062561.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,213 @@
++/*
++ * 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.awt.Robot;
++import java.awt.event.KeyEvent;
++import java.io.File;
++import java.io.IOException;
++import java.io.InputStream;
++import java.io.PrintWriter;
++import java.util.concurrent.TimeUnit;
++import javax.swing.JFileChooser;
++import javax.swing.SwingUtilities;
++import javax.swing.filechooser.FileSystemView;
++
++/**
++ * @test
++ * @bug 8062561
++ * @summary File system view returns null default directory
++ * @run main/othervm bug8062561 GENERATE_POLICY
++ * @run main/othervm/policy=security.policy bug8062561 CHECK_DEFAULT_DIR run
++ */
++public class bug8062561 {
++
++ private static final String POLICY_FILE = "security2.policy";
++ private static volatile boolean fileChooserIsShown = false;
++
++ public static void main(String[] args) throws Exception {
++
++ String test = args[0];
++
++ if ("GENERATE_POLICY".equals(test)) {
++ generatePolicyFile();
++ } else if ("CHECK_DEFAULT_DIR".equals(test)) {
++ checkDefaultDirectory();
++ } else if ("CHECK_FILE_CHOOSER".equals(test)) {
++ checkFileChooser();
++ } else {
++ throw new RuntimeException("Wrong argument!");
++ }
++ }
++
++ private static void checkDefaultDirectory() {
++ if (System.getSecurityManager() == null) {
++ throw new RuntimeException("Security manager is not set!");
++ }
++
++ File defaultDirectory = FileSystemView.getFileSystemView().
++ getDefaultDirectory();
++ if (defaultDirectory != null) {
++ throw new RuntimeException("File system default directory is null!");
++ }
++ }
++ private static volatile JFileChooser fileChooser;
++
++ private static void checkFileChooser() throws Exception {
++ if (System.getSecurityManager() == null) {
++ throw new RuntimeException("Security manager is not set!");
++ }
++
++ Robot robot = new Robot();
++ robot.setAutoDelay(50);
++
++ SwingUtilities.invokeLater(new Runnable() {
++
++ public void run() {
++ fileChooser = new JFileChooser();
++ fileChooser.showOpenDialog(null);
++ fileChooserIsShown = true;
++ System.out.println("Start file chooser: " + fileChooserIsShown);
++ }
++ });
++
++ long time = System.currentTimeMillis();
++ while (fileChooser == null) {
++ if (System.currentTimeMillis() - time >= 5000) {
++ System.exit(1);
++ }
++ Thread.sleep(500);
++ }
++
++ Thread.sleep(500);
++ robot.keyPress(KeyEvent.VK_ESCAPE);
++ robot.keyRelease(KeyEvent.VK_ESCAPE);
++ System.exit(0);
++ }
++
++ private static void generatePolicyFile() throws Exception {
++ if (System.getSecurityManager() != null) {
++ throw new RuntimeException("Security manager should be null!");
++ }
++
++ String osName = System.getProperty("os.name");
++ System.out.println("os name: " + osName);
++ if (!osName.startsWith("Windows")) {
++ return;
++ }
++ System.out.println("after OS Check!");
++
++ File defaultDirectory = FileSystemView.getFileSystemView().
++ getDefaultDirectory();
++
++ if (defaultDirectory == null) {
++ throw new RuntimeException("Default directory is null!");
++ }
++
++ File policyFile = new File(POLICY_FILE);
++ if (!policyFile.exists()) {
++ policyFile.createNewFile();
++ }
++
++ PrintWriter writer = new PrintWriter(policyFile, "UTF-8");
++ writer.println("grant {");
++ String documents = defaultDirectory.getCanonicalPath();
++ documents = documents.replace('\\', '/');
++ // user.dir permission
++ writer.print(" permission java.util.PropertyPermission");
++ writer.print(" \"user.dir\",");
++ writer.println(" \"read\";");
++ // Documents permission
++ writer.print(" permission java.io.FilePermission");
++ writer.print(" \"" + documents + "\",");
++ writer.println(" \"read\";");
++ // Desktop permission
++ writer.print(" permission java.io.FilePermission");
++ writer.print(" \"" + documents.replace("Documents", "Desktop") + "\",");
++ writer.println(" \"read\";");
++ // robot permission // "java.awt.AWTPermission" "createRobot"
++ writer.print(" permission java.awt.AWTPermission");
++ writer.println(" \"createRobot\";");
++ writer.println("};");
++ writer.close();
++
++ performTest();
++ }
++
++ private static void performTest() throws Exception {
++ String javaPath = System.getProperty("java.home", "");
++ String command = javaPath + File.separator + "bin" + File.separator + "java"
++ + " -Djava.security.manager -Djava.security.policy=" + POLICY_FILE
++ + " bug8062561 CHECK_FILE_CHOOSER";
++ System.out.println(command);
++ int processExit = 0;
++
++ Process process = Runtime.getRuntime().exec(command);
++
++ try {
++ processExit = process.waitFor();
++ } catch (IllegalThreadStateException e) {
++ throw new RuntimeException(e);
++ }
++ System.out.println("[RESULT] : "
++ + "The sub process has cleanly exited : PASS");
++
++ InputStream errorStream = process.getErrorStream();
++ System.out.println("========= Child process stderr ========");
++ boolean exception = dumpStream(errorStream);
++ if (exception) {
++ throw new RuntimeException("[RESULT] :"
++ + " Exception in child process : FAIL");
++ }
++ System.out.println("=======================================");
++
++ InputStream processInputStream = process.getInputStream();
++ System.out.println("========= Child process output ========");
++ dumpStream(processInputStream);
++ System.out.println("=======================================");
++
++ if (processExit != 0) {
++ System.out.println("process exit: " + processExit);
++ process.destroy();
++ throw new RuntimeException("[RESULT] : "
++ + "The sub process has not exited : FAIL");
++ }
++ }
++
++ public static boolean dumpStream(InputStream in) throws IOException {
++ String tempString;
++ int count = in.available();
++ boolean exception = false;
++ while (count > 0) {
++ byte[] b = new byte[count];
++ in.read(b);
++ tempString = new String(b);
++ if (!exception) {
++ exception = tempString.indexOf("Exception") != -1;
++ }
++ System.out.println(tempString);
++ count = in.available();
++ }
++
++ return exception;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JFileChooser/8062561/security.policy Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,5 @@
++grant {
++
++ permission java.util.PropertyPermission "user.home", "read";
++ permission java.util.PropertyPermission "user.dir", "read";
++};
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JFileChooser/8062561/security2.policy Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,1 @@
++// Autogenerated file
+\ No newline at end of file
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.html Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,30 @@
++<!--
++ 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.
++-->
++
++<html>
++<body>
++<applet code="bug7160604.class" width=400 height=100></applet>
++Click on the top-bar and combo-box more than once.
++Make sure popup menu and drop-down list have a border and their items are drawn properly.
++</body>
++</html>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JPopupMenu/7160604/bug7160604.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,90 @@
++/*
++ * 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 7160604
++ @summary Using non-opaque windows - popups are initially not painted correctly
++ @author Oleg Pekhovskiy
++ @run applet/manual=yesno bug7160604.html
++*/
++
++import javax.swing.AbstractAction;
++import javax.swing.BorderFactory;
++import javax.swing.JApplet;
++import javax.swing.JComboBox;
++import javax.swing.JLabel;
++import javax.swing.JMenuItem;
++import javax.swing.JPanel;
++import javax.swing.JPopupMenu;
++import javax.swing.JWindow;
++import javax.swing.SwingUtilities;
++import java.awt.BorderLayout;
++import java.awt.Color;
++import java.awt.event.ActionEvent;
++import java.awt.event.MouseAdapter;
++import java.awt.event.MouseEvent;
++
++public class bug7160604 extends JApplet {
++
++ public void init() {
++ SwingUtilities.invokeLater(new Runnable() {
++ @Override
++ public void run() {
++ final JWindow window = new JWindow();
++ window.setLocation(200, 200);
++ window.setSize(300, 300);
++
++ final JLabel label = new JLabel("...click to invoke JPopupMenu");
++ label.setOpaque(true);
++ final JPanel contentPane = new JPanel(new BorderLayout());
++ contentPane.setBorder(BorderFactory.createLineBorder(Color.RED));
++ window.setContentPane(contentPane);
++ contentPane.add(label, BorderLayout.NORTH);
++
++ final JComboBox comboBox = new JComboBox(new Object[]{"1", "2", "3", "4"});
++ contentPane.add(comboBox, BorderLayout.SOUTH);
++
++ final JPopupMenu jPopupMenu = new JPopupMenu();
++
++ jPopupMenu.add("string");
++ jPopupMenu.add(new AbstractAction("action") {
++ @Override
++ public void actionPerformed(final ActionEvent e) {
++ }
++ });
++ jPopupMenu.add(new JLabel("label"));
++ jPopupMenu.add(new JMenuItem("MenuItem"));
++ label.addMouseListener(new MouseAdapter() {
++ @Override
++ public void mouseReleased(final MouseEvent e) {
++ jPopupMenu.show(label, 0, 0);
++ }
++ });
++
++ window.setBackground(new Color(0, 0, 0, 0));
++
++ window.setVisible(true);
++ }
++ });
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JTable/8032874/bug8032874.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,145 @@
++/*
++ * 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 8032874
++ * @summary Test whether ArrayIndexOutOfBoundsException is thrown or not,
++ * once selected row is removed from JTable with Sorter and Filter
++ * @author Dmitry Markov
++ * @run main bug8032874
++ */
++
++import java.awt.*;
++import java.util.ArrayList;
++import java.util.List;
++
++import javax.swing.*;
++import javax.swing.table.AbstractTableModel;
++import javax.swing.table.TableRowSorter;
++
++import sun.awt.SunToolkit;
++
++public class bug8032874 {
++ private static final int ROW_COUNT = 5;
++ private static JTable table;
++ private static TestTableModel tableModel;
++
++ public static void main(String args[]) throws Exception {
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ createAndShowUI();
++ }
++ });
++ toolkit.realSync();
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ table.getRowSorter().toggleSortOrder(0);
++ table.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
++ table.setRowSelectionInterval(1, 2);
++ }
++ });
++ toolkit.realSync();
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ for (int i = 0; i < ROW_COUNT; i++) {
++ tableModel.remove(0);
++ table.getRowSorter().toggleSortOrder(0);
++ }
++ }
++ });
++ }
++
++ public static void createAndShowUI() {
++ try {
++ UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
++ } catch (Exception e) {
++ throw new RuntimeException(e);
++ }
++
++ JFrame frame = new JFrame("bug8032874");
++ frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
++
++ JPanel panel = new JPanel();
++ panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
++
++ tableModel = new TestTableModel();
++ table = new JTable(tableModel);
++ table.setSurrendersFocusOnKeystroke(true);
++
++ final TableRowSorter<TestTableModel> rowSorter = new TableRowSorter<TestTableModel>(tableModel);
++ rowSorter.setRowFilter(new RowFilter<TestTableModel, Integer>() {
++ @Override
++ public boolean include(Entry<? extends TestTableModel, ? extends Integer> entry) {
++ return entry.getIdentifier() % 2 == 0;
++ }
++ });
++ table.setRowSorter(rowSorter);
++
++ JScrollPane jScrollPane = new JScrollPane(table);
++ panel.add(jScrollPane);
++
++ frame.setContentPane(panel);
++ frame.setSize(new Dimension(800, 600));
++ frame.setVisible(true);
++ }
++
++ private static class TestTableModel extends AbstractTableModel {
++ private final List<Integer> data;
++
++ public TestTableModel() {
++ data = new ArrayList<Integer>();
++
++ for (int i = 0; i < ROW_COUNT; i++) {
++ data.add(i);
++ }
++ }
++
++ @Override
++ public int getRowCount() {
++ return data.size();
++ }
++
++ @Override
++ public int getColumnCount() {
++ return 1;
++ }
++
++ @Override
++ public Object getValueAt(int rowIndex, int columnIndex) {
++ return data.get(rowIndex);
++ }
++
++ public void remove(int row) {
++ data.remove(row);
++ fireTableRowsDeleted(row, row);
++ }
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/JTextField/8036819/bug8036819.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,132 @@
++/*
++ * 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
++ * @library ../../regtesthelpers
++ * @build Util
++ * @bug 8036819
++ * @summary JAB: mnemonics not read for textboxes
++ * @author Vivi An
++ * @run main bug8036819
++ */
++
++import javax.swing.*;
++import javax.swing.event.*;
++import java.awt.event.*;
++import java.awt.*;
++import sun.awt.SunToolkit;
++import javax.accessibility.*;
++
++public class bug8036819 {
++
++ public static volatile Boolean passed = false;
++
++ public static void main(String args[]) throws Throwable {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ toolkit.realSync();
++
++ Robot robo = new Robot();
++ robo.setAutoDelay(300);
++
++ // Using mnemonic key to focus on the textfield
++ Util.hitMnemonics(robo, KeyEvent.VK_P);
++ toolkit.realSync();
++
++ if (!passed){
++ throw new RuntimeException("Test failed.");
++ }
++ }
++
++ private static void createAndShowGUI() {
++ JFrame mainFrame = new JFrame("bug 8036819");
++
++ JLabel usernameLabel = new JLabel("Username: ");
++ JTextField usernameField = new JTextField(20);
++ usernameLabel.setDisplayedMnemonic(KeyEvent.VK_U);
++ usernameLabel.setLabelFor(usernameField);
++
++ JLabel pwdLabel = new JLabel("Password: ");
++ final JTextField pwdField = new JTextField(20);
++ pwdLabel.setDisplayedMnemonic(KeyEvent.VK_P);
++ pwdLabel.setLabelFor(pwdField);
++
++ pwdField.addKeyListener(
++ new KeyListener(){
++ @Override
++ public void keyPressed(KeyEvent keyEvent) {
++ }
++
++ @Override
++ public void keyTyped(KeyEvent keyEvent) {
++ }
++
++ @Override
++ public void keyReleased(KeyEvent keyEvent){
++ JComponent comp = (JComponent) pwdField;
++ AccessibleContext ac = comp.getAccessibleContext();
++ AccessibleExtendedComponent aec = (AccessibleExtendedComponent)ac.getAccessibleComponent();
++ AccessibleKeyBinding akb = aec.getAccessibleKeyBinding();
++ if (akb != null){
++ int count = akb.getAccessibleKeyBindingCount();
++ if (count != 1){
++ passed = false;
++ return;
++ }
++
++ // there is 1 accessible key for the text field
++ System.out.println("Retrieved AccessibleKeyBinding for textfield " + count);
++
++ // the key code is KeyEvent.VK_P
++ Object o = akb.getAccessibleKeyBinding(0);
++ if (o instanceof KeyStroke){
++ javax.swing.KeyStroke key = (javax.swing.KeyStroke)o;
++ System.out.println("keystroke is " + key.getKeyCode());
++ if (key.getKeyCode() == KeyEvent.VK_P)
++ passed = true;
++ }
++ }
++ }
++ }
++ );
++
++ mainFrame.getContentPane().add(usernameLabel);
++ mainFrame.getContentPane().add(usernameField);
++ mainFrame.getContentPane().add(pwdLabel);
++ mainFrame.getContentPane().add(pwdField);
++
++ mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++ mainFrame.setLayout(new FlowLayout(FlowLayout.LEFT));
++
++ mainFrame.setSize(200, 200);
++ mainFrame.setLocation(200, 200);
++ mainFrame.setVisible(true);
++ mainFrame.toFront();
++ }
++ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,65 @@
++/*
++ * 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 8048506
++ * @summary Tests that popup with null-owner does not throw NPE
++ * @author Dmitry Markov
++ */
++
++import javax.swing.*;
++import javax.swing.plaf.metal.MetalLookAndFeel;
++
++public class bug8048506 {
++
++ public static void main(String[] args) throws Exception {
++ UIManager.setLookAndFeel(new MetalLookAndFeel());
++
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ createAndShowGUI();
++ }
++ });
++ System.out.println("The test passed");
++ }
++
++ private static void createAndShowGUI() {
++ JFrame frame = new JFrame("bug8048506");
++ frame.setSize(400, 400);
++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
++ frame.setVisible(true);
++
++ PopupFactory factory = PopupFactory.getSharedInstance();
++
++ // Create and show popup with owner
++ Popup popup1 = factory.getPopup(frame, new JLabel("Popup with owner"), 100, 100);
++ popup1.show();
++
++ //Create and show popup without owner
++ Popup popup2 = factory.getPopup(null, new JLabel("Popup without owner"), 200, 200);
++ popup2.show();
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,82 @@
++/*
++ * 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 8041725
++ @summary JList selection colors are not UIResource instances in Nimbus L&F
++ @author Anton Litvinov
++*/
++
++import java.awt.*;
++import javax.swing.*;
++import javax.swing.plaf.*;
++import javax.swing.plaf.nimbus.*;
++
++public class bug8041725 {
++ public static void main(String[] args) throws Exception {
++ UIManager.setLookAndFeel(new NimbusLookAndFeel());
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ JFrame frame = new JFrame("bug8041725");
++ frame.setSize(200, 200);
++ JList list = new JList(new String[]{"Item1", "Item2", "Item3"});
++ frame.getContentPane().add(list);
++ frame.pack();
++ frame.setVisible(true);
++
++ System.err.println("Test #1: No items are selected, list is enabled.");
++ testSelectionColors(list);
++
++ System.err.println("Test #2: No items are selected, list is disabled.");
++ list.setEnabled(false);
++ testSelectionColors(list);
++
++ System.err.println("Test #3: One item is selected, list is disabled.");
++ list.setSelectedIndex(0);
++ testSelectionColors(list);
++
++ System.err.println("Test #4: One item is selected, list is enabled.");
++ list.setEnabled(true);
++ testSelectionColors(list);
++
++ frame.dispose();
++ }
++ });
++ }
++
++ private static void testSelectionColors(JList list) {
++ Color selBackColor = list.getSelectionBackground();
++ if (!(selBackColor instanceof UIResource)) {
++ throw new RuntimeException(String.format(
++ "JList.getSelectionBackground() returned instance of '%s' instead of UIResource.",
++ selBackColor.getClass()));
++ }
++ Color selForeColor = list.getSelectionForeground();
++ if (!(selForeColor instanceof UIResource)) {
++ throw new RuntimeException(String.format(
++ "JList.getSelectionForeground() returned instance of '%s' instead of UIResource.",
++ selForeColor.getClass()));
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/text/GlyphView/4984669/bug4984669.html Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,30 @@
++<html>
++<!--
++ 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.
++-->
++<body>
++<applet code="bug4984669.class" width=300 height=300></applet>
++The four lines printed above in a bold typeface should all be underlined.
++It is a bug if any of these lines is underlined only partially.
++The very first line should not be underlined at all.
++</body>
++</html>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/text/GlyphView/4984669/bug4984669.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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.
++ *
++ * 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 4984669 8002148
++ @summary Tests HTML underlining
++ @author Peter Zhelezniakov
++ @run applet/manual=yesno bug4984669.html
++*/
++import javax.swing.*;
++import javax.swing.text.*;
++
++public class bug4984669 extends JApplet
++{
++ public void init() {
++ JEditorPane pane = new JEditorPane();
++ this.getContentPane().add(new JScrollPane(pane));
++ pane.setEditorKit(new StyledEditorKit());
++
++ try {
++ pane.getDocument().insertString(0,"12 \n",null);
++ MutableAttributeSet attrs = new SimpleAttributeSet();
++
++ StyleConstants.setFontSize(attrs, 36);
++ StyleConstants.setBold(attrs, true);
++ StyleConstants.setUnderline(attrs, true);
++ pane.getDocument().insertString(6, "aa\n", attrs);
++ pane.getDocument().insertString(9, "bbb\n", attrs);
++ pane.getDocument().insertString(13, "cccc\n", attrs);
++ pane.getDocument().insertString(18, "ddddd\n", attrs);
++ } catch (Exception e) {
++ throw new Error("Failed: Unexpected Exception", e);
++ }
++ }
++}
+--- ./jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java Mon Jan 05 11:57:27 2015 -0800
+@@ -190,9 +190,9 @@
+ // not too wide
+ assertTrue(out3.getWidth() * 0.8 < out2.getWidth());
+ // not too low
+- assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) < 3);
++ assertTrue(out3.getY() - (out1.getY() + out2.getHeight() - 1) < 4);
+ // not too high
+- assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) > 0);
++ assertTrue(out3.getY() - (out1.getY() + out2.getHeight() - 1) > 0);
+ }
+
+ void testStrikthrough() {
+@@ -217,7 +217,7 @@
+ // not too wide
+ assertTrue(out3.getWidth() * 0.8 < out2.getWidth());
+ // not too low
+- assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) < 0);
++ assertTrue(out3.getY() - (out1.getY() + out2.getHeight() - 1) < 0);
+ // not too high
+ assertTrue(out3.getY() - out1.getY() > 1);
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/swing/text/html/parser/Parser/8028616/bug8028616.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,77 @@
++/*
++ * 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 8028616
++ * @summary Tests correct parsing of the text with leading slash (/)
++ * @author Dmitry Markov
++ */
++
++import javax.swing.text.html.HTMLDocument;
++import javax.swing.text.html.HTMLEditorKit;
++import java.io.StringReader;
++
++public class bug8028616 {
++ private static final String text = "/ at start is bad";
++ private static Object lock = new Object();
++ private static boolean isCallbackInvoked = false;
++ private static Exception exception = null;
++
++ public static void main(String[] args) throws Exception {
++ ParserCB cb = new ParserCB();
++ HTMLEditorKit htmlKit = new HTMLEditorKit();
++ HTMLDocument htmlDoc = (HTMLDocument) htmlKit.createDefaultDocument();
++
++ htmlDoc.getParser().parse(new StringReader(text), cb, true);
++
++ synchronized (lock) {
++ if (!isCallbackInvoked) {
++ lock.wait(5000);
++ }
++ }
++
++ if (!isCallbackInvoked) {
++ throw new RuntimeException("Test Failed: ParserCallback.handleText() is not invoked for text - " + text);
++ }
++
++ if (exception != null) {
++ throw exception;
++ }
++ }
++
++ private static class ParserCB extends HTMLEditorKit.ParserCallback {
++ @Override
++ public void handleText(char[] data, int pos) {
++ synchronized (lock) {
++ if (!text.equals(new String(data)) || pos != 0) {
++ exception = new RuntimeException(
++ "Test Failed: the data passed to ParserCallback.handleText() does not meet the expectation");
++ }
++ isCallbackInvoked = true;
++ lock.notifyAll();
++ }
++ }
++ }
++}
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/bind/marshal/8036981/Good.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,94 @@
++/*
++ * 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.
++ */
++
++package testjaxbcontext;
++
++import org.w3c.dom.Element;
++import javax.xml.bind.annotation.XmlAccessType;
++import javax.xml.bind.annotation.XmlAccessorType;
++import javax.xml.bind.annotation.XmlAnyElement;
++import javax.xml.bind.annotation.XmlType;
++import java.util.ArrayList;
++import java.util.List;
++
++/**
++ * <p>
++ * Java class for Good complex type.
++ *
++ * <p>
++ * The following schema fragment specifies the expected content contained within
++ * this class.
++ *
++ * <pre>
++ * &lt;complexType name="Good">
++ * &lt;complexContent>
++ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
++ * &lt;sequence>
++ * &lt;any processContents='skip' maxOccurs="70"/>
++ * &lt;/sequence>
++ * &lt;/restriction>
++ * &lt;/complexContent>
++ * &lt;/complexType>
++ * </pre>
++ *
++ *
++ */
++@XmlAccessorType(XmlAccessType.FIELD)
++@XmlType(name = "Good", propOrder = {
++ "any"
++})
++public class Good {
++
++ @XmlAnyElement
++ protected List<Element> any;
++
++ /**
++ * Gets the value of the any property.
++ *
++ * <p>
++ * This accessor method returns a reference to the live list, not a
++ * snapshot. Therefore any modification you make to the returned list will
++ * be present inside the JAXB object. This is why there is not a
++ * <CODE>set</CODE> method for the any property.
++ *
++ * <p>
++ * For example, to add a new item, do as follows:
++ * <pre>
++ * getAny().add(newItem);
++ * </pre>
++ *
++ *
++ * <p>
++ * Objects of the following type(s) are allowed in the list
++ * {@link org.w3c.dom.Element }
++ *
++ *
++ */
++ public List<Element> getAny() {
++ if (any == null) {
++ any = new ArrayList<Element>();
++ }
++ return this.any;
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/bind/marshal/8036981/Main.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,104 @@
++/*
++ * 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.
++ */
++
++package testjaxbcontext;
++
++import javax.xml.bind.annotation.*;
++
++/**
++ * <p>
++ * Java class for main complex type.
++ *
++ * <p>
++ * The following schema fragment specifies the expected content contained within
++ * this class.
++ *
++ * <pre>
++ * &lt;complexType name="main">
++ * &lt;complexContent>
++ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
++ * &lt;sequence>
++ * &lt;element name="Root" type="{}Root"/>
++ * &lt;element name="Good" type="{}Good"/>
++ * &lt;/sequence>
++ * &lt;/restriction>
++ * &lt;/complexContent>
++ * &lt;/complexType>
++ * </pre>
++ *
++ *
++ */
++@XmlAccessorType(XmlAccessType.FIELD)
++@XmlType(name = "main", propOrder = {
++ "root",
++ "good"
++})
++@XmlRootElement
++public class Main {
++
++ @XmlElement(name = "Root", required = true)
++ protected Root root;
++ @XmlElement(name = "Good", required = true)
++ protected Good good;
++
++ /**
++ * Gets the value of the root property.
++ *
++ * @return possible object is {@link Root }
++ *
++ */
++ public Root getRoot() {
++ return root;
++ }
++
++ /**
++ * Sets the value of the root property.
++ *
++ * @param value allowed object is {@link Root }
++ *
++ */
++ public void setRoot(Root value) {
++ this.root = value;
++ }
++
++ /**
++ * Gets the value of the good property.
++ *
++ * @return possible object is {@link Good }
++ *
++ */
++ public Good getGood() {
++ return good;
++ }
++
++ /**
++ * Sets the value of the good property.
++ *
++ * @param value allowed object is {@link Good }
++ *
++ */
++ public void setGood(Good value) {
++ this.good = value;
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/bind/marshal/8036981/ObjectFactory.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,74 @@
++/*
++ * 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.
++ */
++
++package testjaxbcontext;
++
++import javax.xml.bind.annotation.XmlRegistry;
++
++/**
++ * This object contains factory methods for each Java content interface and Java
++ * element interface generated in the generated package.
++ * <p>
++ * An ObjectFactory allows you to programatically construct new instances of the
++ * Java representation for XML content. The Java representation of XML content
++ * can consist of schema derived interfaces and classes representing the binding
++ * of schema type definitions, element declarations and model groups. Factory
++ * methods for each of these are provided in this class.
++ *
++ */
++@XmlRegistry
++public class ObjectFactory {
++
++ /**
++ * Create a new ObjectFactory that can be used to create new instances of
++ * schema derived classes for package: generated
++ *
++ */
++ public ObjectFactory() {
++ }
++
++ /**
++ * Create an instance of {@link Root }
++ *
++ */
++ public Root createRoot() {
++ return new Root();
++ }
++
++ /**
++ * Create an instance of {@link Good }
++ *
++ */
++ public Good createGood() {
++ return new Good();
++ }
++
++ /**
++ * Create an instance of {@link Main }
++ *
++ */
++ public Main createMain() {
++ return new Main();
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/bind/marshal/8036981/Root.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,91 @@
++/*
++ * 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.
++ */
++
++package testjaxbcontext;
++
++import javax.xml.bind.annotation.*;
++import java.util.ArrayList;
++import java.util.List;
++
++/**
++ * <p>
++ * Java class for Root complex type.
++ *
++ * <p>
++ * The following schema fragment specifies the expected content contained within
++ * this class.
++ *
++ * <pre>
++ * &lt;complexType name="Root">
++ * &lt;complexContent>
++ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
++ * &lt;sequence>
++ * &lt;any processContents='skip' maxOccurs="70"/>
++ * &lt;/sequence>
++ * &lt;/restriction>
++ * &lt;/complexContent>
++ * &lt;/complexType>
++ * </pre>
++ *
++ *
++ */
++@XmlAccessorType(XmlAccessType.FIELD)
++@XmlType(name = "Root", propOrder = {
++ "content"
++})
++public class Root {
++
++ @XmlMixed
++ @XmlAnyElement
++ protected List<Object> content;
++
++ /**
++ * Gets the value of the content property.
++ *
++ * <p>
++ * This accessor method returns a reference to the live list, not a
++ * snapshot. Therefore any modification you make to the returned list will
++ * be present inside the JAXB object. This is why there is not a
++ * <CODE>set</CODE> method for the content property.
++ *
++ * <p>
++ * For example, to add a new item, do as follows:
++ * <pre>
++ * getContent().add(newItem);
++ * </pre>
++ *
++ *
++ * <p>
++ * Objects of the following type(s) are allowed in the list {@link org.w3c.dom.Element }
++ * {@link String }
++ *
++ *
++ */
++ public List<Object> getContent() {
++ if (content == null) {
++ content = new ArrayList<Object>();
++ }
++ return this.content;
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/bind/marshal/8036981/Test.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,67 @@
++/*
++ * 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 Test.java
++ * @bug 8036981
++ * @summary JAXB not preserving formatting during unmarshalling/marshalling
++ * @compile Good.java Main.java ObjectFactory.java Root.java
++ * @run main/othervm Test
++ */
++
++import javax.xml.bind.JAXBContext;
++import javax.xml.bind.Marshaller;
++import javax.xml.bind.Unmarshaller;
++import java.io.File;
++import java.io.StringWriter;
++
++/**
++ * Test for marshalling and unmarshalling mixed and unmixed content
++ */
++public class Test {
++
++ private static final String EXPECTED = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><main><Root>\n" +
++ " <SomeTag>\n" +
++ " <AChildTag>\n" +
++ " <AnotherChildTag/>\n" +
++ " <AnotherChildTag/>\n" +
++ " </AChildTag>\n" +
++ " </SomeTag>\n" +
++ " </Root><Good><VeryGood><TheBest><MegaSuper/><MegaSuper/>\n" +
++ " </TheBest>\n" +
++ " </VeryGood></Good></main>";
++
++ public static void main(String[] args) throws Exception {
++ JAXBContext jc = JAXBContext.newInstance("testjaxbcontext");
++ Unmarshaller u = jc.createUnmarshaller();
++ Object result = u.unmarshal(new File(System.getProperty("test.src", ".") + "/test.xml"));
++ StringWriter sw = new StringWriter();
++ Marshaller m = jc.createMarshaller();
++ m.marshal(result, sw);
++ System.out.println("Expected:" + EXPECTED);
++ System.out.println("Observed:" + sw.toString());
++ if (!EXPECTED.equals(sw.toString())) {
++ throw new Exception("Unmarshal/Marshal generates different content");
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/bind/marshal/8036981/test.xml Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,19 @@
++<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
++<main>
++ <Root>
++ <SomeTag>
++ <AChildTag>
++ <AnotherChildTag/>
++ <AnotherChildTag/>
++ </AChildTag>
++ </SomeTag>
++ </Root>
++ <Good>
++ <VeryGood>
++ <TheBest>
++ <MegaSuper/>
++ <MegaSuper/>
++ </TheBest>
++ </VeryGood>
++ </Good>
++</main>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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.
++ */
++
++/*
++ * @test
++ * @bug 8029837
++ * @summary Test simulates the partial call to xjc ant task that fails with
++ * NullPointer exception
++ * @run main/othervm PreParseGrammarTest
++ */
++
++import com.sun.org.apache.xerces.internal.parsers.XMLGrammarPreparser;
++import com.sun.org.apache.xerces.internal.xni.XNIException;
++import com.sun.org.apache.xerces.internal.xni.grammars.Grammar;
++import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarDescription;
++import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
++import java.io.BufferedInputStream;
++import java.io.File;
++import java.io.FileInputStream;
++import java.io.FileNotFoundException;
++import java.io.IOException;
++import java.io.InputStream;
++
++public class PreParseGrammarTest {
++
++ public static void main(String[] args) throws FileNotFoundException, XNIException, IOException {
++ File xsdf = new File(System.getProperty("test.src", ".") + "/test.xsd");
++ InputStream is = new BufferedInputStream(new FileInputStream(xsdf));
++ XMLInputSource xis = new XMLInputSource(null, null, null, is, null);
++ XMLGrammarPreparser gp = new XMLGrammarPreparser();
++ gp.registerPreparser(XMLGrammarDescription.XML_SCHEMA, null);
++ //The NullPointerException is observed on next call during ant task
++ // execution
++ Grammar res = gp.preparseGrammar(XMLGrammarDescription.XML_SCHEMA, xis);
++ System.out.println("Grammar preparsed successfully:" + res);
++ return;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/bind/xjc/8029837/test.xsd Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,4 @@
++<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
++ <xsd:element name="root">
++ </xsd:element>
++</xsd:schema>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/common/8032908/TestFunc.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,33 @@
++/*
++ * 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 org.w3c.dom.Node;
++
++public class TestFunc {
++
++ public static String test(Node node) {
++ String s = node.getTextContent();
++ return s;
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/common/8032908/XSLT.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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.
++ *
++ * 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 8032908
++ * @summary Test if Node.getTextContent() function correctly returns children
++ * content
++ * @compile TestFunc.java XSLT.java
++ * @run main/othervm XSLT
++ */
++import java.io.ByteArrayOutputStream;
++import javax.xml.transform.Transformer;
++import javax.xml.transform.TransformerException;
++import javax.xml.transform.TransformerFactory;
++import javax.xml.transform.stream.StreamResult;
++import javax.xml.transform.stream.StreamSource;
++
++public class XSLT {
++
++ static final String XMLTOTRANSFORM = "/in.xml";
++ static final String XSLTRANSFORMER = "/test.xsl";
++ static final String EXPECTEDRESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>ABCDEFG";
++
++ public static void main(String[] args) throws TransformerException {
++ ByteArrayOutputStream resStream = new ByteArrayOutputStream();
++ TransformerFactory trf = TransformerFactory.newInstance();
++ Transformer tr = trf.newTransformer(new StreamSource(System.getProperty("test.src", ".") + XSLTRANSFORMER));
++ tr.transform(new StreamSource(System.getProperty("test.src", ".") + XMLTOTRANSFORM), new StreamResult(resStream));
++ System.out.println("Transformation completed. Result:" + resStream.toString());
++ if (!resStream.toString().equals(EXPECTEDRESULT)) {
++ throw new RuntimeException("Incorrect transformation result");
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/common/8032908/in.xml Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,2 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<root><elem><level2_0>ABCD</level2_0><level2_1>EFG</level2_1></elem></root>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/common/8032908/test.xsl Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,8 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<xsl:transform exclude-result-prefixes="cscdt_ufunc" version="1.0"
++ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++ xmlns:cscdt_ufunc="http://xml.apache.org/xalan/java">
++ <xsl:template match="elem">
++ <xsl:value-of select="cscdt_ufunc:TestFunc.test(.)" />
++ </xsl:template>
++</xsl:transform>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/testng/TEST.properties Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,3 @@
++# This file identifies root(s) of the test-ng hierarchy.
++
++TestNG.dirs = .
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/testng/parse/XMLEntityScannerLoad.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,75 @@
++/*
++ * 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.
++ */
++
++package parse;
++
++import java.io.ByteArrayInputStream;
++import java.io.IOException;
++import javax.xml.parsers.DocumentBuilderFactory;
++import javax.xml.parsers.ParserConfigurationException;
++
++import static org.testng.Assert.assertEquals;
++import org.testng.annotations.DataProvider;
++import org.testng.annotations.Test;
++import org.w3c.dom.Document;
++import org.xml.sax.SAXException;
++
++/**
++ * JDK-8059327: XML parser returns corrupt attribute value
++ * https://bugs.openjdk.java.net/browse/JDK-8059327
++ *
++ * Also:
++ * JDK-8061550: XMLEntityScanner can corrupt corrupt content during parsing
++ * https://bugs.openjdk.java.net/browse/JDK-8061550
++ *
++ * @Summary: verify that the character cache in XMLEntityScanner is reset properly
++ */
++
++public class XMLEntityScannerLoad {
++
++ @Test(dataProvider = "xmls")
++ public void test(String xml) throws SAXException, IOException, ParserConfigurationException {
++ Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ChunkInputStream(xml));
++ String value = d.getDocumentElement().getAttribute("a1");
++ assertEquals(value, "w");
++ }
++
++ static class ChunkInputStream extends ByteArrayInputStream {
++ ChunkInputStream(String xml) {
++ super(xml.getBytes());
++ }
++
++ @Override
++ public synchronized int read(byte[] b, int off, int len) {
++ return super.read(b, off, 7);
++ }
++ }
++
++ @DataProvider(name = "xmls")
++ private Object[][] xmls() {
++ return new Object[][] {
++ {"<?xml version=\"1.0\"?><element a1=\"w\" a2=\"&quot;&quot;\"/>"},
++ {"<?xml version=\"1.1\"?><element a1=\"w\" a2=\"&quot;&quot;\"/>"}
++ };
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/jaxp/validation/8049514/FeaturePropagationTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,71 @@
++/*
++ * 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 8049514
++ * @summary verifies that feature set on the factory is propagated properly
++ * to the validator
++ * @run main/othervm FeaturePropagationTest
++ */
++
++
++import java.io.ByteArrayInputStream;
++import java.io.InputStreamReader;
++import javax.xml.XMLConstants;
++import javax.xml.transform.stream.StreamSource;
++import javax.xml.validation.*;
++
++/**
++ * JDK-8049514
++ *
++ * FEATURE_SECURE_PROCESSING can not be turned off on a validator through
++ * SchemaFactory
++ */
++public class FeaturePropagationTest {
++
++ static String xsd = "<?xml version='1.0'?>\n" + "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n"
++ + " xmlns:test='jaxp13_test'\n"
++ + " targetNamespace='jaxp13_test'\n"
++ + " elementFormDefault='qualified'>\n"
++ + " <element name='test' type='string'/>\n"
++ + "</schema>\n";
++
++ public static void main(String[] args) throws Exception {
++ InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream(xsd.getBytes()));
++ StreamSource xsdSource = new StreamSource(reader);
++
++ SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
++ schemaFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false);
++ Schema schema = null;
++ schema = schemaFactory.newSchema(xsdSource);
++
++ Validator validator = schema.newValidator();
++
++ if (validator.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING)) {
++ throw new RuntimeException("Feature set on the factory is not inherited!");
++ }
++
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/8033113/Organization_List.wsdl Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,99 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++ 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.
++-->
++<wsdl:definitions targetNamespace="urn:Organization_List" xmlns:s0="urn:Organization_List" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
++ <wsdl:types>
++ <xsd:schema elementFormDefault="qualified" targetNamespace="urn:Organization_List">
++ <xsd:element name="OpGetList" type="s0:GetListInputMap"/>
++ <xsd:complexType name="GetListInputMap">
++ <xsd:sequence>
++ <xsd:element name="Qualification" type="xsd:string"/>
++ </xsd:sequence>
++ </xsd:complexType>
++ <xsd:element name="OpGetListResponse" type="s0:GetListOutputMap"/>
++ <xsd:complexType name="GetListOutputMap">
++ <xsd:sequence>
++ <xsd:element maxOccurs="unbounded" name="getListValues">
++ <xsd:complexType>
++ <xsd:sequence>
++ <xsd:element name="Organization_Name" type="xsd:string"/>
++ </xsd:sequence>
++ </xsd:complexType>
++ </xsd:element>
++ </xsd:sequence>
++ </xsd:complexType>
++ <xsd:element name="AuthenticationInfo" type="s0:AuthenticationInfo"/>
++ <xsd:complexType name="AuthenticationInfo">
++ <xsd:sequence>
++ <xsd:element name="userName" type="xsd:string"/>
++ <xsd:element name="password" type="xsd:string"/>
++ <xsd:element minOccurs="0" name="authentication" type="xsd:string"/>
++ <xsd:element minOccurs="0" name="locale" type="xsd:string"/>
++ <xsd:element minOccurs="0" name="timeZone" type="xsd:string"/>
++ </xsd:sequence>
++ </xsd:complexType>
++ </xsd:schema>
++ </wsdl:types>
++
++ <wsdl:message name="ARAuthenticate">
++ <wsdl:part element="s0:AuthenticationInfo" name="param"/>
++ </wsdl:message>
++
++ <wsdl:message name="OpGetListSoapIn">
++ <wsdl:part element="s0:OpGetList" name="param"/>
++ </wsdl:message>
++
++ <wsdl:message name="OpGetListSoapOut">
++ <wsdl:part element="s0:OpGetListResponse" name="param"/>
++ </wsdl:message>
++
++ <wsdl:portType name="Organization_ListPortType">
++ <wsdl:operation name="OpGetList">
++ <wsdl:input message="s0:OpGetListSoapIn"/>
++ <wsdl:output message="s0:OpGetListSoapOut"/>
++ </wsdl:operation>
++ </wsdl:portType>
++
++ <wsdl:binding name="Organization_ListSoapBinding" type="s0:Organization_ListPortType">
++ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
++ <wsdl:operation name="OpGetList">
++ <soap:operation soapAction="urn:Organization_List/OpGetList" style="document"/>
++ <wsdl:input>
++ <soap:header message="s0:ARAuthenticate" part="param" use="literal">
++ </soap:header>
++ <soap:body use="literal"/>
++ </wsdl:input>
++ <wsdl:output>
++ <soap:body use="literal"/>
++ </wsdl:output>
++ </wsdl:operation>
++ </wsdl:binding>
++
++ <wsdl:service name="Organization_ListService">
++ <wsdl:port binding="s0:Organization_ListSoapBinding" name="Organization_ListSoap">
++ <soap:address location="http://bogus:9080/URL"/>
++ </wsdl:port>
++ </wsdl:service>
++
++</wsdl:definitions>
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/8033113/WsImportTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,152 @@
++/*
++ * 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 8033113
++ * @summary wsimport fails on WSDL:header parameter name customization
++ * @run main/othervm WsImportTest
++ */
++
++import java.io.InputStreamReader;
++import java.io.IOException;
++import java.io.BufferedReader;
++import java.io.File;
++import java.nio.file.Files;
++import java.nio.file.FileVisitResult;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++import java.nio.file.SimpleFileVisitor;
++import java.nio.file.attribute.BasicFileAttributes;
++
++import static java.nio.file.FileVisitResult.*;
++
++public class WsImportTest {
++
++ public static void main(String[] args) throws IOException {
++
++ String wsimport = getWsImport();
++ String customization = getWSDLFilePath("customization.xml");
++ String wsdl = getWSDLFilePath("Organization_List.wsdl");
++
++ try {
++ log("Importing wsdl: " + wsdl);
++ String[] wsargs = {
++ wsimport,
++ "-keep",
++ "-verbose",
++ "-extension",
++ "-XadditionalHeaders",
++ "-Xdebug",
++ "-b",
++ customization,
++ wsdl
++ };
++
++ ProcessBuilder pb = new ProcessBuilder(wsargs);
++ pb.redirectErrorStream(true);
++ Process p = pb.start();
++ logOutput(p);
++ int result = p.waitFor();
++ p.destroy();
++
++ if (result != 0) {
++ fail("WsImport failed. TEST FAILED.");
++ } else {
++ log("Test PASSED.");
++ }
++
++ } catch (Exception e) {
++ e.printStackTrace();
++ fail(e.getMessage());
++ } finally {
++ deleteGeneratedFiles();
++ }
++ }
++
++ private static void fail(String message) {
++ throw new RuntimeException(message);
++ }
++
++ private static void log(String msg) {
++ System.out.println(msg);
++ }
++
++ private static void logOutput(Process p) throws IOException {
++ BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream()));
++ String s = r.readLine();
++ while (s != null) {
++ log(s.trim());
++ s = r.readLine();
++ }
++ }
++
++ private static void deleteGeneratedFiles() {
++ Path p = Paths.get("generated");
++ if (Files.exists(p)) {
++ try {
++ Files.walkFileTree(p, new SimpleFileVisitor<Path>() {
++ @Override
++ public FileVisitResult visitFile(Path file,
++ BasicFileAttributes attrs) throws IOException {
++
++ Files.delete(file);
++ return CONTINUE;
++ }
++
++ @Override
++ public FileVisitResult postVisitDirectory(Path dir,
++ IOException exc) throws IOException {
++
++ if (exc == null) {
++ Files.delete(dir);
++ return CONTINUE;
++ } else {
++ throw exc;
++ }
++ }
++ });
++ } catch (IOException ioe) {
++ ioe.printStackTrace();
++ }
++ }
++ }
++
++ private static String getWSDLFilePath(String filename) {
++ String testSrc = System.getProperty("test.src");
++ if (testSrc == null) testSrc = ".";
++ return Paths.get(testSrc).resolve(filename).toString();
++ }
++
++ private static String getWsImport() {
++ String javaHome = System.getProperty("java.home");
++ if (javaHome.endsWith("jre")) {
++ javaHome = new File(javaHome).getParent();
++ }
++ String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport";
++ if (System.getProperty("os.name").startsWith("Windows")) {
++ wsimport = wsimport.concat(".exe");
++ }
++ return wsimport;
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/8033113/customization.xml Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,45 @@
++<!--
++ 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.
++-->
++<jaxws:bindings wsdlLocation="./Organization_List.wsdl" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
++ <jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
++ <jaxws:bindings node="wsdl:definitions/wsdl:binding[@name='Organization_ListSoapBinding']/wsdl:operation[@name='OpGetList']">
++ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='ARAuthenticate']/wsdl:part[@name='param']" name="authParam"/>
++ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='OpGetListSoapIn']/wsdl:part[@name='param']" name="inParam"/>
++ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='OpGetListSoapOut']/wsdl:part[@name='param']" name="outParam"/>
++ </jaxws:bindings>
++</jaxws:bindings>
++
++<!--wsdl:message definitions from WSDL whose part names we are trying to override...
++
++ <wsdl:message name="ARAuthenticate">
++ <wsdl:part element="s0:AuthenticationInfo" name="param"/>
++ </wsdl:message>
++
++ <wsdl:message name="OpGetListSoapIn">
++ <wsdl:part element="s0:OpGetList" name="param"/>
++ </wsdl:message>
++
++ <wsdl:message name="OpGetListSoapOut">
++ <wsdl:part element="s0:OpGetListResponse" name="param"/>
++ </wsdl:message>
++-->
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/8043129/MailTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,148 @@
++/*
++ * 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 8043129
++ * @summary JAF initialisation in SAAJ clashing with the one in javax.mail
++ * @author mkos
++ * @library javax.mail.jar
++ * @build MailTest
++ * @run main MailTest
++ */
++
++import javax.activation.CommandMap;
++import javax.activation.MailcapCommandMap;
++import javax.mail.BodyPart;
++import javax.mail.Message;
++import javax.mail.MessagingException;
++import javax.mail.Multipart;
++import javax.mail.Session;
++import javax.mail.internet.InternetAddress;
++import javax.mail.internet.MimeBodyPart;
++import javax.mail.internet.MimeMessage;
++import javax.mail.internet.MimeMultipart;
++import javax.xml.soap.AttachmentPart;
++import javax.xml.soap.MessageFactory;
++import javax.xml.soap.SOAPException;
++import javax.xml.soap.SOAPMessage;
++import java.io.ByteArrayOutputStream;
++import java.io.IOException;
++import java.util.Properties;
++
++public class MailTest {
++
++ String host = null;
++ String user = "";
++ String password = null;
++ String from = null;
++ String to = null;
++
++ public static void main(String[] args) {
++ MailTest t = new MailTest();
++
++ t.user = "somebody@somewhere.com";
++ t.from = "somebody@somewhere.com";
++ t.to = "somebody@somewhere.com";
++
++ t.user = "somebody@somewhere.com";
++ t.password = "somepassword";
++ t.host = "somehost";
++
++ t.sendMail(); //this works
++
++ t.addSoapAttachement();
++ t.sendMail(); //after addAttachmentPart to soapmessage it do not work
++
++ // workaroundJAFSetup();
++ // t.sendMail(); //after workaround works again
++ }
++
++ void addSoapAttachement() {
++ try {
++ MessageFactory messageFactory = MessageFactory.newInstance();
++ SOAPMessage message = messageFactory.createMessage();
++ AttachmentPart a = message.createAttachmentPart();
++ a.setContentType("binary/octet-stream");
++ message.addAttachmentPart(a);
++ } catch (SOAPException e) {
++ e.printStackTrace();
++ }
++ }
++
++ void sendMail() {
++
++ try {
++ Properties props = new Properties();
++ props.put("mail.smtp.host", host);
++ props.put("mail.smtp.auth", "true");
++
++ Session session = Session.getInstance(props);
++ session.setDebug(true);
++
++ // Define message
++ MimeMessage message = new MimeMessage(session);
++ message.setFrom(new InternetAddress(from));
++ message.addRecipients(Message.RecipientType.TO, to);
++ message.setSubject("this is a multipart test");
++
++ Multipart multipart = new MimeMultipart();
++
++ BodyPart messageBodyPart1 = new MimeBodyPart();
++ messageBodyPart1.setText("please send also this Content\n ciao!");
++ multipart.addBodyPart(messageBodyPart1);
++
++ BodyPart messageBodyPart2 = new MimeBodyPart();
++ messageBodyPart2.setContent("<b>please</b> send also this Content <br>ciao!", "text/html; charset=UTF-8");
++ multipart.addBodyPart(messageBodyPart2);
++
++ message.setContent(multipart);
++
++ /*
++ Transport tr = session.getTransport("smtp");
++ tr.connect(host,user, password);
++ tr.sendMessage(message,InternetAddress.parse(to));
++ tr.close();
++ */
++
++ ByteArrayOutputStream baos = new ByteArrayOutputStream();
++ message.writeTo(baos);
++ String output = baos.toString();
++ System.out.println("output = " + output);
++ if (output.contains("also this Content")) {
++ System.out.println("Test PASSED.");
++ } else {
++ System.out.println("Test FAILED, missing content.");
++ throw new IllegalStateException("Test FAILED, missing content.");
++ }
++ } catch (MessagingException ignored) {
++ } catch (IOException ignored) {
++ }
++ }
++
++ // this is how the error can be worked around ...
++ static void workaroundJAFSetup() {
++ MailcapCommandMap mailMap = (MailcapCommandMap) CommandMap.getDefaultCommandMap();
++ mailMap.addMailcap("multipart/mixed;;x-java-content-handler=com.sun.mail.handlers.multipart_mixed");
++ }
++}
+Binary file test/javax/xml/ws/8043129/javax.mail.jar has changed
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/xsanymixed/CopyingResponse.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,35 @@
++/*
++ * 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 org.somewhere.ws.EchoRequest;
++import org.somewhere.ws.EchoResponse;
++
++public class CopyingResponse extends EchoResponse {
++
++ public CopyingResponse() {}
++
++ public CopyingResponse(EchoRequest request) {
++ content = request.getContent();
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/xsanymixed/ServiceImpl.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,54 @@
++/*
++ * 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 org.somewhere.ws.EchoRequest;
++import org.somewhere.ws.EchoResponse;
++import org.somewhere.ws.TestPort;
++
++import java.util.ArrayList;
++
++import javax.jws.WebService;
++import javax.xml.namespace.QName;
++
++
++/**
++ * Simple Webservice implementation just copying xml part as is
++ * from incoming request into outgoing response
++ */
++@WebService(
++ endpointInterface = "org.somewhere.ws.TestPort",
++ targetNamespace = "http://ws.somewhere.org/",
++ serviceName = "TestService",
++ portName = "TestPort")
++public class ServiceImpl implements TestPort {
++
++ public static final QName PORT_NAME = new QName("http://ws.somewhere.org/", "TestPort");
++ public static final QName SERVICE_NAME = new QName("http://ws.somewhere.org/", "TestService");
++
++ @Override
++ public EchoResponse echo(EchoRequest request) {
++ System.err.println( "request.getContent="+(ArrayList)(request.getContent()));
++ return new CopyingResponse(request);
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/xsanymixed/Test.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,197 @@
++/*
++ * 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 8036981 8038966 8051441
++ * @summary the content of xs:any content:mixed should remain as is,
++ * no white space changes and no changes to namespace prefixes
++ * @run shell compile-wsdl.sh
++ * @run main/othervm Test
++ */
++
++import com.sun.net.httpserver.HttpServer;
++import java.io.IOException;
++import java.io.StringReader;
++import java.io.StringWriter;
++import java.net.InetSocketAddress;
++import java.net.URL;
++import java.nio.file.FileVisitResult;
++import static java.nio.file.FileVisitResult.CONTINUE;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++import java.nio.file.SimpleFileVisitor;
++import java.nio.file.attribute.BasicFileAttributes;
++import javax.xml.transform.Source;
++import javax.xml.transform.Transformer;
++import javax.xml.transform.TransformerException;
++import javax.xml.transform.TransformerFactory;
++import javax.xml.transform.stream.StreamResult;
++import javax.xml.transform.stream.StreamSource;
++import javax.xml.ws.Dispatch;
++import javax.xml.ws.Endpoint;
++import javax.xml.ws.Service;
++
++public class Test {
++
++ private static HttpServer httpServer;
++ private static Endpoint endpoint;
++ private static final String NL = System.getProperty("line.separator");
++
++ private static final String XS_ANY_MIXED_PART =
++ "<AppHdr xmlns=\"urn:head.001\">" + NL +
++ " <Fr>" + NL + NL +
++ "<FIId xmlns=\"urn:head.009\">" + NL + NL +
++ " any" + NL +
++ " white" + NL +
++ " space" + NL + NL +
++ " <FinInstnId>... and" + NL + NL +
++ " NO namespace prefixes!!!" + NL + NL +
++ " </FinInstnId>" + NL + NL +
++ " </FIId>" + NL +
++ "</Fr>" + NL +
++ "</AppHdr>";
++
++ private static final String XML_REQUEST = "<soap:Envelope " +
++ "xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
++ "xmlns:ws=\"http://ws.somewhere.org/\">" +
++ "<soap:Header/><soap:Body>" +
++ "<ws:echoRequest>" + NL +
++ XS_ANY_MIXED_PART + NL +
++ "</ws:echoRequest>" +
++ "</soap:Body></soap:Envelope>";
++
++ private static String deployWebservice() throws IOException {
++ // Manually create HttpServer here using ephemeral address for port
++ // so as to not end up with attempt to bind to an in-use port
++ httpServer = HttpServer.create(new InetSocketAddress(0), 0);
++ httpServer.start();
++
++ endpoint = Endpoint.create(new ServiceImpl());
++ endpoint.publish(httpServer.createContext("/wservice"));
++
++ String wsdlAddress = "http://localhost:" + httpServer.getAddress().getPort() + "/wservice?wsdl";
++ log("address = " + wsdlAddress);
++ return wsdlAddress;
++ }
++
++ private static void stopWebservice() {
++ if (endpoint != null && endpoint.isPublished()) {
++ endpoint.stop();
++ }
++ if (httpServer != null) {
++ httpServer.stop(0);
++ }
++ }
++
++ public static void main(String[] args) throws IOException, TransformerException {
++
++ try {
++ String address = deployWebservice();
++ Service service = Service.create(new URL(address), ServiceImpl.SERVICE_NAME);
++
++ log( "PORT="+ServiceImpl.PORT_NAME+" service="+service);
++ Dispatch<Source> d = service.createDispatch(ServiceImpl.PORT_NAME, Source.class, Service.Mode.MESSAGE);
++ Source response = d.invoke(new StreamSource(new StringReader(XML_REQUEST)));
++
++ log( "reponse="+response );
++ String resultXml = toString(response);
++
++ log("= request ======== \n");
++ log(XML_REQUEST);
++ log("= result ========= \n");
++ log(resultXml);
++ log("\n==================");
++
++ boolean xsAnyMixedPartSame = resultXml.contains(XS_ANY_MIXED_PART);
++ log("resultXml.contains(XS_ANY_PART) = " + xsAnyMixedPartSame);
++ if (!xsAnyMixedPartSame) {
++ fail("The xs:any content=mixed part is supposed to be same in request and response.");
++ throw new RuntimeException();
++ }
++
++ log("TEST PASSED");
++ } finally {
++ stopWebservice();
++
++ // if you need to debug or explore wsdl generation result
++ // comment this line out:
++ deleteGeneratedFiles();
++ }
++ }
++
++ private static String toString(Source response) throws TransformerException, IOException {
++ TransformerFactory transformerFactory = TransformerFactory.newInstance();
++ Transformer transformer = transformerFactory.newTransformer();
++ StreamResult xmlOutput = new StreamResult(new StringWriter());
++ transformer.transform(response, xmlOutput);
++ return xmlOutput.getWriter().toString();
++ }
++
++ private static void fail(String message) {
++ log("TEST FAILED.");
++ throw new RuntimeException(message);
++ }
++
++ private static void log(String msg) {
++ System.out.println(msg);
++ }
++
++ private static void deleteGeneratedFiles() {
++ Path p = Paths.get("..", "classes", "javax", "xml", "ws", "xsanymixed", "org");
++ System.out.println("performing cleanup, deleting wsdl compilation result: " + p.toFile().getAbsolutePath());
++ if (Files.exists(p)) {
++ try {
++ Files.walkFileTree(p, new SimpleFileVisitor<Path>() {
++ @Override
++ public FileVisitResult visitFile(
++ Path file,
++ BasicFileAttributes attrs) throws IOException {
++
++ System.out.println("deleting file [" + file.toFile().getAbsoluteFile() + "]");
++ Files.delete(file);
++ return CONTINUE;
++ }
++
++ @Override
++ public FileVisitResult postVisitDirectory(
++ Path dir,
++ IOException exc) throws IOException {
++
++ System.out.println("deleting dir [" + dir.toFile().getAbsoluteFile() + "]");
++ if (exc == null) {
++ Files.delete(dir);
++ return CONTINUE;
++ } else {
++ throw exc;
++ }
++ }
++ });
++ } catch (IOException ioe) {
++ ioe.printStackTrace();
++ }
++ }
++ }
++
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/xsanymixed/compile-wsdl.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,36 @@
++#! /bin/sh
++
++#
++# 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.
++#
++
++#
++
++if [ "x$TESTJAVA" = x ]; then
++ TESTJAVA=$1; shift
++ TESTCLASSES=.
++fi
++
++echo "compiling [test-service.wsdl] wsdl ..."
++$TESTJAVA/bin/wsimport -keep -d ${TESTCLASSES} ${TESTSRC}/service.wsdl
++
++echo "WSDL compiled. Main test class Test.java can be compiled now."
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/javax/xml/ws/xsanymixed/service.wsdl Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,87 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!--
++ 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.
++-->
++<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
++ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
++ xmlns:tns="http://ws.somewhere.org/"
++ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
++ xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
++ name="TestService"
++ targetNamespace="http://ws.somewhere.org/">
++
++ <types>
++ <xsd:schema targetNamespace="http://ws.somewhere.org/" version="1.0"
++ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://ws.somewhere.org/">
++
++ <xsd:element type="tns:echoRequest" name="echoRequest"/>
++ <xsd:element type="tns:echoResponse" name="echoResponse"/>
++
++ <xsd:complexType name="echoRequest" mixed="true">
++ <xsd:sequence>
++ <xsd:any namespace="##any" processContents="skip" minOccurs="1" maxOccurs="10"/>
++ </xsd:sequence>
++ </xsd:complexType>
++
++ <xsd:complexType name="echoResponse" mixed="true">
++ <xsd:sequence>
++ <xsd:any namespace="##any" processContents="skip" minOccurs="1" maxOccurs="10"/>
++ </xsd:sequence>
++ </xsd:complexType>
++ </xsd:schema>
++ </types>
++
++ <message name="echoRequest">
++ <part element="tns:echoRequest" name="parameters"/>
++ </message>
++ <message name="echoResponse">
++ <part element="tns:echoResponse" name="parameters"/>
++ </message>
++
++ <portType name="TestPort">
++ <operation name="echo">
++ <input message="tns:echoRequest" wsam:Action="http://ws.somewhere.org/tester/echoRequest"/>
++ <output message="tns:echoResponse" wsam:Action="http://ws.somewhere.org/tester/echoResponse"/>
++ </operation>
++ </portType>
++
++ <binding name="TestServicePortBinding" type="tns:TestPort">
++ <soap:binding style="document"
++ transport="http://schemas.xmlsoap.org/soap/http"/>
++
++ <operation name="echo">
++ <soap:operation soapAction=""/>
++ <input>
++ <soap:body use="literal"/>
++ </input>
++ <output>
++ <soap:body use="literal"/>
++ </output>
++ </operation>
++ </binding>
++
++ <service name="TestService">
++ <port binding="tns:TestServicePortBinding" name="TestPort">
++ <soap:address location="http://localhost/ws/tester"/>
++ </port>
++ </service>
++</definitions>
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,100 @@
++/*
++ * 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 8019623
++ * @summary Tests that AppContext.getAppContext() works correctly in multi-threads scenario.
++ * @author Leonid Romanov
++ */
++
++import sun.awt.AppContext;
++
++public class MultiThreadTest {
++ private static final int NUM_THREADS = 2;
++
++ private static AppContextGetter[] getters = new AppContextGetter[NUM_THREADS];
++
++ public static void main(String[] args) {
++ createAndStartThreads();
++ compareAppContexts();
++ }
++
++ private static void createAndStartThreads() {
++ ThreadGroup systemGroup = getSystemThreadGroup();
++ for (int i = 0; i < NUM_THREADS; ++i) {
++ ThreadGroup tg = new ThreadGroup(systemGroup, "AppContextGetter" + i);
++ getters[i] = new AppContextGetter(tg);
++ }
++
++ for (int i = 0; i < NUM_THREADS; ++i) {
++ getters[i].start();
++ }
++
++ for (int i = 0; i < NUM_THREADS; ++i) {
++ try {
++ getters[i].join();
++ } catch (InterruptedException e) {
++ // ignore
++ }
++ }
++ }
++
++ private static ThreadGroup getSystemThreadGroup() {
++ ThreadGroup currentThreadGroup =
++ Thread.currentThread().getThreadGroup();
++ ThreadGroup parentThreadGroup = currentThreadGroup.getParent();
++ while (parentThreadGroup != null) {
++ currentThreadGroup = parentThreadGroup;
++ parentThreadGroup = currentThreadGroup.getParent();
++ }
++
++ return currentThreadGroup;
++ }
++
++ private static void compareAppContexts() {
++ AppContext ctx = getters[0].getAppContext();
++ for (int i = 1; i < NUM_THREADS; ++i) {
++ if (!ctx.equals(getters[i].getAppContext())) {
++ throw new RuntimeException("Unexpected AppContexts difference, could be a race condition");
++ }
++ }
++ }
++
++ private static class AppContextGetter extends Thread {
++ private AppContext appContext;
++
++ public AppContextGetter(ThreadGroup tg) {
++ super(tg, tg.getName());
++ }
++
++ AppContext getAppContext() {
++ return appContext;
++ }
++
++ @Override
++ public void run() {
++ appContext = AppContext.getAppContext();
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,357 @@
++/*
++ * 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 8024061
++ * @summary Checks that no exception is thrown if dragGestureRecognized
++ * takes a while to complete.
++ */
++import sun.awt.OSInfo;
++import sun.awt.OSInfo.OSType;
++import sun.awt.SunToolkit;
++
++import java.awt.*;
++import java.awt.datatransfer.DataFlavor;
++import java.awt.datatransfer.Transferable;
++import java.awt.datatransfer.UnsupportedFlavorException;
++import java.awt.dnd.DnDConstants;
++import java.awt.dnd.DragGestureEvent;
++import java.awt.dnd.DragGestureListener;
++import java.awt.dnd.DragSource;
++import java.awt.dnd.DragSourceDragEvent;
++import java.awt.dnd.DragSourceDropEvent;
++import java.awt.dnd.DragSourceEvent;
++import java.awt.dnd.DragSourceListener;
++import java.awt.dnd.DropTarget;
++import java.awt.dnd.DropTargetDragEvent;
++import java.awt.dnd.DropTargetDropEvent;
++import java.awt.dnd.DropTargetEvent;
++import java.awt.dnd.DropTargetListener;
++import java.awt.event.InputEvent;
++
++import java.io.IOException;
++import java.lang.reflect.InvocationTargetException;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
++
++import javax.swing.*;
++
++/**
++ * If dragGestureRecognized() takes a while to complete and if user performs a drag quickly,
++ * an exception is thrown from DropTargetListener.dragEnter when it calls
++ * DropTargetDragEvent.getTransferable().
++ * <p>
++ * This class introduces a delay in dragGestureRecognized() to cause the exception.
++ */
++public class bug8024061 {
++ private static final DataFlavor DropObjectFlavor;
++ private static final int DELAY = 1000;
++
++ private final DnDPanel panel1 = new DnDPanel(Color.yellow);
++ private final DnDPanel panel2 = new DnDPanel(Color.pink);
++ private final JFrame frame;
++
++ private static final CountDownLatch lock = new CountDownLatch(1);
++ private static volatile Exception dragEnterException = null;
++
++ static {
++ DataFlavor flavor = null;
++ try {
++ flavor = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType);
++ } catch (ClassNotFoundException e) {
++ e.printStackTrace();
++ }
++ DropObjectFlavor = flavor;
++ }
++
++ bug8024061() {
++ frame = new JFrame("DnDWithRobot");
++ frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
++
++ Dimension d = new Dimension(100, 100);
++
++ panel1.setPreferredSize(d);
++ panel2.setPreferredSize(d);
++
++ Container content = frame.getContentPane();
++ content.setLayout(new GridLayout(1, 2, 5, 5));
++ content.add(panel1);
++ content.add(panel2);
++
++ frame.pack();
++
++ DropObject drop = new DropObject();
++ drop.place(panel1, new Point(10, 10));
++ frame.setVisible(true);
++ }
++
++ public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException {
++ OSType type = OSInfo.getOSType();
++ if (type != OSType.LINUX && type != OSType.SOLARIS) {
++ System.out.println("This test is for Linux and Solaris only... " +
++ "skipping!");
++ return;
++ }
++
++ final bug8024061[] dnd = {null};
++ SwingUtilities.invokeAndWait(new Runnable() {
++ @Override
++ public void run() {
++ dnd[0] = new bug8024061();
++ }
++ });
++ final Robot robot = new Robot();
++ robot.setAutoDelay(10);
++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
++ toolkit.realSync();
++
++ JFrame frame = dnd[0].frame;
++ Point point = frame.getLocationOnScreen();
++ Point here = new Point(point.x + 35, point.y + 45);
++ Point there = new Point(point.x + 120, point.y + 45);
++ here.x += 25;
++ robot.mouseMove(here.x, here.y);
++ robot.mousePress(InputEvent.BUTTON1_MASK);
++ while (here.x < there.x) {
++ here.x += 20;
++ robot.mouseMove(here.x, here.y);
++ System.out.println("x = " + here.x);
++ }
++ robot.mouseRelease(InputEvent.BUTTON1_MASK);
++ toolkit.realSync();
++ robot.mousePress(InputEvent.BUTTON1_MASK);
++ robot.mouseRelease(InputEvent.BUTTON1_MASK);
++ System.out.println("finished");
++
++ try {
++ if (lock.await(5, TimeUnit.SECONDS)) {
++ if (dragEnterException == null) {
++ System.out.println("Test passed.");
++ } else {
++ System.out.println("Test failed.");
++ dragEnterException.printStackTrace();
++ throw new RuntimeException(dragEnterException);
++ }
++ } else {
++ System.out.println("Test failed. Timeout reached");
++ throw new RuntimeException("Timed out waiting for dragEnter()");
++ }
++ } finally {
++ frame.dispose();
++ }
++ }
++
++ class DropObject implements Transferable {
++ DnDPanel panel;
++ Color color = Color.CYAN;
++ int width = 50;
++ int height = 50;
++ int x;
++ int y;
++
++ void draw(Graphics2D g) {
++ Color savedColor = g.getColor();
++ g.setColor(color);
++ g.fillRect(x, y, width, height);
++ g.setColor(Color.lightGray);
++ g.drawRect(x, y, width, height);
++ g.setColor(savedColor);
++ }
++
++ boolean contains(int x, int y) {
++ return (x > this.x && x < this.x + width)
++ && (y > this.y && y < this.y + height);
++ }
++
++ @Override
++ public DataFlavor[] getTransferDataFlavors() {
++ return new DataFlavor[]{DropObjectFlavor};
++ }
++
++ void place(DnDPanel panel, Point location) {
++ if (panel != this.panel) {
++ x = location.x;
++ y = location.y;
++ if (this.panel != null) {
++ this.panel.setDropObject(null);
++ this.panel.repaint();
++ }
++ this.panel = panel;
++ this.panel.setDropObject(this);
++ this.panel.repaint();
++ }
++ }
++
++ @Override
++ public boolean isDataFlavorSupported(DataFlavor flavor) {
++ return DropObjectFlavor.equals(flavor);
++ }
++
++ @Override
++ public Object getTransferData(DataFlavor flavor)
++ throws UnsupportedFlavorException, IOException {
++ if (isDataFlavorSupported(flavor)) {
++ return this;
++ } else {
++ throw new UnsupportedFlavorException(flavor);
++ }
++ }
++ }
++
++ class DnDPanel extends JPanel {
++ DropObject dropObject;
++ final DragSource dragSource;
++ final DropTarget dropTarget;
++ final Color color;
++ final DragGestureListener dgListener;
++ final DragSourceListener dsListener;
++ final DropTargetListener dtListener;
++
++ DnDPanel(Color color) {
++ this.color = color;
++ this.dragSource = DragSource.getDefaultDragSource();
++ dgListener = new DragGestureListener() {
++ @Override
++ public void dragGestureRecognized(DragGestureEvent dge) {
++ Point location = dge.getDragOrigin();
++ if (dropObject != null && dropObject.contains(location.x, location.y)) {
++ dragSource.startDrag(dge, DragSource.DefaultCopyNoDrop, dropObject, dsListener);
++ try {
++ Thread.sleep(DELAY);
++ } catch (InterruptedException e) {
++ }
++ }
++ }
++ };
++
++ dsListener = new DragSourceListener() {
++ @Override
++ public void dragEnter(DragSourceDragEvent dsde) {
++ }
++
++ @Override
++ public void dragOver(DragSourceDragEvent dsde) {
++ }
++
++ @Override
++ public void dropActionChanged(DragSourceDragEvent dsde) {
++ }
++
++ @Override
++ public void dragExit(DragSourceEvent dse) {
++ }
++
++ @Override
++ public void dragDropEnd(DragSourceDropEvent dsde) {
++ }
++ };
++
++ dtListener = new DropTargetListener() {
++ @Override
++ public void dragEnter(DropTargetDragEvent dtde) {
++ if (dropObject != null) {
++ dtde.rejectDrag();
++ return;
++ }
++ dtde.acceptDrag(DnDConstants.ACTION_MOVE);
++ try {
++ Transferable t = dtde.getTransferable();
++ Object data = t.getTransferData(DropObjectFlavor);
++ if (data != null) {
++ throw new Exception("getTransferData returned non-null");
++ }
++ } catch (Exception e) {
++ dragEnterException = e;
++ e.printStackTrace();
++ } finally {
++ lock.countDown();
++ }
++ }
++
++ @Override
++ public void dragOver(DropTargetDragEvent dtde) {
++ if (dropObject != null) {
++ dtde.rejectDrag();
++ return;
++ }
++ dtde.acceptDrag(DnDConstants.ACTION_MOVE);
++ }
++
++ @Override
++ public void dropActionChanged(DropTargetDragEvent dtde) {
++ }
++
++ @Override
++ public void dragExit(DropTargetEvent dte) {
++ }
++
++ @Override
++ public void drop(DropTargetDropEvent dtde) {
++ if (dropObject != null) {
++ dtde.rejectDrop();
++ return;
++ }
++ try {
++ dtde.acceptDrop(DnDConstants.ACTION_MOVE);
++ Transferable t = dtde.getTransferable();
++ DropObject dropObject = (DropObject) t.getTransferData(DropObjectFlavor);
++ Point location = dtde.getLocation();
++ dropObject.place(DnDPanel.this, location);
++ dtde.dropComplete(true);
++ } catch (Exception e) {
++ e.printStackTrace();
++ }
++
++ }
++ };
++
++ dragSource.createDefaultDragGestureRecognizer(this,
++ DnDConstants.ACTION_MOVE, dgListener);
++
++ dropTarget = new DropTarget(this, DnDConstants.ACTION_MOVE, dtListener, true);
++
++ }
++
++ public void paintComponent(Graphics g) {
++ super.paintComponent(g);
++ Color savedColor = g.getColor();
++ g.setColor(color);
++ g.fillRect(0, 0, getWidth(), getHeight());
++ g.setColor(savedColor);
++ if (dropObject != null) {
++ dropObject.draw((Graphics2D) g);
++ }
++ }
++
++ void setDropObject(DropObject dropObject) {
++ this.dropObject = dropObject;
++ }
++
++ DropObject findDropObject(int x, int y) {
++ if (dropObject != null && dropObject.contains(x, y)) {
++ return dropObject;
++ }
++ return null;
++ }
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/java2d/DrawXORModeTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,110 @@
++/*
++ * 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 8036022
++ * @summary Test verifies that drawing shapes with XOR composite
++ * does not trigger an InternalError in GDI surface data.
++ * @run main/othervm -Dsun.java2d.d3d=True DrawXORModeTest
++ */
++import java.awt.BasicStroke;
++import java.awt.Color;
++import java.awt.Component;
++import java.awt.Dimension;
++import java.awt.Frame;
++import java.awt.Graphics;
++import java.awt.Graphics2D;
++import java.awt.Stroke;
++import java.awt.geom.Line2D;
++import java.util.concurrent.CountDownLatch;
++
++public class DrawXORModeTest extends Component {
++
++ public static void main(String[] args) {
++ final DrawXORModeTest c = new DrawXORModeTest();
++
++ final Frame f = new Frame("XOR mode test");
++ f.add(c);
++ f.pack();
++
++ f.setVisible(true);
++
++ try {
++ c.checkResult();
++ } finally {
++ f.dispose();
++ }
++ }
++
++ @Override
++ public void paint(Graphics g) {
++ if (g == null || !(g instanceof Graphics2D)) {
++ return;
++ }
++ g.setColor(Color.white);
++ g.setXORMode(Color.black);
++ Graphics2D dg = (Graphics2D) g;
++ Stroke stroke = new BasicStroke(1, BasicStroke.CAP_BUTT,
++ BasicStroke.JOIN_MITER,
++ 10.0f,
++ new float[]{1.0f, 1.0f},
++ 0.0f);
++ dg.setStroke(stroke);
++ try {
++ dg.draw(new Line2D.Float(10, 10, 20, 20));
++ } catch (Throwable e) {
++ synchronized (this) {
++ theError = e;
++ }
++ } finally {
++ didDraw.countDown();
++ }
++ }
++
++ @Override
++ public Dimension getPreferredSize() {
++ return new Dimension(400, 100);
++ }
++
++ public void checkResult() {
++ try {
++ didDraw.await();
++ } catch (InterruptedException e) {
++ }
++
++ synchronized (this) {
++ if (theError != null) {
++ System.out.println("Error: " + theError);
++
++ throw new RuntimeException("Test FAILED.");
++ }
++ }
++ System.out.println("Test PASSED.");
++
++ }
++
++ private Throwable theError = null;
++
++ private final CountDownLatch didDraw = new CountDownLatch(1);
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/java2d/OpenGL/DrawHugeImageTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,108 @@
++/*
++ * 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 8040617
++ * @summary Test verifies that an attempt to get an accelerated copy of
++ * a huge buffered image does not result in an OOME.
++ *
++ * @run main DrawHugeImageTest
++ */
++
++import java.awt.Color;
++import java.awt.Graphics2D;
++import java.awt.GraphicsConfiguration;
++import java.awt.GraphicsEnvironment;
++import java.awt.image.BufferedImage;
++import java.awt.image.VolatileImage;
++
++public class DrawHugeImageTest {
++ // we have to render the BI source several times in order
++ // to get an accelerated copy to be used.
++ static {
++ System.setProperty("sun.java2d.accthreshold", "1");
++ }
++ private static final int max_rendering_count = 5;
++
++ private static final Color srcColor = Color.red;
++ private static final Color dstColor = Color.blue;
++
++ public static void main(String[] args) {
++ BufferedImage src = createSrc();
++
++ VolatileImage dst = createDst();
++ System.out.println("Dst: " + dst);
++ boolean status;
++ int count = max_rendering_count;
++
++ do {
++ System.out.println("render image: " + (max_rendering_count - count));
++ status = render(src, dst);
++
++ } while (status && count-- > 0);
++
++ if (!status || count > 0) {
++ throw new RuntimeException("Test failed: " + count);
++ }
++ }
++
++ private static boolean render(BufferedImage src, VolatileImage dst) {
++ int cnt = 5;
++ do {
++ Graphics2D g = dst.createGraphics();
++ g.setColor(dstColor);
++ g.fillRect(0, 0, dst.getWidth(), dst.getHeight());
++ g.drawImage(src, 0, 0, null);
++ g.dispose();
++ } while (dst.contentsLost() && (--cnt > 0));
++
++ if (cnt == 0) {
++ System.err.println("Test failed: unable to render to volatile destination");
++ return false;
++ }
++
++ BufferedImage s = dst.getSnapshot();
++
++ return s.getRGB(1,1) == srcColor.getRGB();
++ }
++
++ private static BufferedImage createSrc() {
++ final int w = 20000;
++ final int h = 5;
++
++ BufferedImage img = new BufferedImage(w, h, BufferedImage.TYPE_3BYTE_BGR);
++ Graphics2D g = img.createGraphics();
++ g.setColor(srcColor);
++ g.fillRect(0, 0, w, h);
++ g.dispose();
++
++ return img;
++ }
++
++ private static VolatileImage createDst() {
++ GraphicsConfiguration gc =
++ GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration();
++
++ return gc.createCompatibleVolatileImage(200, 200);
++ }
++}
+--- ./jdk/test/sun/net/ftp/FtpURL.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/net/ftp/FtpURL.java Mon Jan 05 11:57:27 2015 -0800
+@@ -483,7 +483,7 @@
+
+ // Now let's check the URL handler
+
+- url = new URL("ftp://user2:@localhost:" + port + "/%2Fusr/bin;type=d");
++ url = new URL("ftp://user2@localhost:" + port + "/%2Fusr/bin;type=d");
+ con = url.openConnection();
+ in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ do {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/net/www/http/HttpClient/B8025710.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,409 @@
++/*
++ * 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.*;
++import java.net.*;
++import java.security.*;
++import java.security.cert.X509Certificate;
++import java.util.ArrayList;
++import java.util.concurrent.atomic.AtomicBoolean;
++import java.util.regex.Matcher;
++import java.util.regex.Pattern;
++import javax.net.ServerSocketFactory;
++import javax.net.SocketFactory;
++import javax.net.ssl.*;
++
++/**
++ * @test
++ * @bug 8025710
++ * @summary Proxied https connection reuse by HttpClient can send CONNECT to the server
++ */
++public class B8025710 {
++
++ private final static AtomicBoolean connectInServer = new AtomicBoolean();
++ private static final String keystorefile =
++ System.getProperty("test.src", "./")
++ + "/../../../../../sun/security/ssl/etc/keystore";
++ private static final String passphrase = "passphrase";
++
++ public static void main(String[] args) throws Exception {
++ new B8025710().runTest();
++
++ if (connectInServer.get())
++ throw new RuntimeException("TEST FAILED: server got proxy header");
++ else
++ System.out.println("TEST PASSED");
++ }
++
++ private void runTest() throws Exception {
++ ProxyServer proxyServer = new ProxyServer();
++ HttpServer httpServer = new HttpServer();
++ httpServer.start();
++ proxyServer.start();
++
++ URL url = new URL("https", InetAddress.getLocalHost().getHostName(),
++ httpServer.getPort(), "/");
++
++ Proxy proxy = new Proxy(Proxy.Type.HTTP, proxyServer.getAddress());
++
++ HttpsURLConnection.setDefaultSSLSocketFactory(createTestSSLSocketFactory());
++
++ // Make two connections. The bug occurs when the second request is made
++ for (int i = 0; i < 2; i++) {
++ System.out.println("Client: Requesting " + url.toExternalForm()
++ + " via " + proxy.toString()
++ + " (attempt " + (i + 1) + " of 2)");
++
++ HttpsURLConnection connection =
++ (HttpsURLConnection) url.openConnection(proxy);
++
++ connection.setRequestMethod("POST");
++ connection.setDoInput(true);
++ connection.setDoOutput(true);
++ connection.setRequestProperty("User-Agent", "Test/1.0");
++ connection.getOutputStream().write("Hello, world!".getBytes("UTF-8"));
++
++ if (connection.getResponseCode() != 200) {
++ System.err.println("Client: Unexpected response code "
++ + connection.getResponseCode());
++ break;
++ }
++
++ String response = readLine(connection.getInputStream());
++ if (!"Hi!".equals(response)) {
++ System.err.println("Client: Unexpected response body: "
++ + response);
++ }
++ }
++ httpServer.close();
++ proxyServer.close();
++ httpServer.join();
++ proxyServer.join();
++ }
++
++ class ProxyServer extends Thread implements Closeable {
++
++ private final ServerSocket proxySocket;
++ private final Pattern connectLinePattern =
++ Pattern.compile("^CONNECT ([^: ]+):([0-9]+) HTTP/[0-9.]+$");
++ private final String PROXY_RESPONSE =
++ "HTTP/1.0 200 Connection Established\r\n"
++ + "Proxy-Agent: TestProxy/1.0\r\n"
++ + "\r\n";
++
++ ProxyServer() throws Exception {
++ super("ProxyServer Thread");
++
++ // Create the http proxy server socket
++ proxySocket = ServerSocketFactory.getDefault().createServerSocket();
++ proxySocket.bind(new InetSocketAddress(InetAddress.getLocalHost(), 0));
++ }
++
++ public SocketAddress getAddress() { return proxySocket.getLocalSocketAddress(); }
++
++ @Override
++ public void close() throws IOException {
++ proxySocket.close();
++ }
++
++ @Override
++ public void run() {
++ ArrayList<Thread> threads = new ArrayList<>();
++ int connectionCount = 0;
++ try {
++ while (connectionCount++ < 2) {
++ final Socket clientSocket = proxySocket.accept();
++ final int proxyConnectionCount = connectionCount;
++ System.out.println("Proxy: NEW CONNECTION "
++ + proxyConnectionCount);
++
++ Thread t = new Thread("ProxySocket" + proxyConnectionCount) {
++ @Override
++ public void run() {
++ try {
++ String firstLine =
++ readHeader(clientSocket.getInputStream());
++
++ Matcher connectLineMatcher =
++ connectLinePattern.matcher(firstLine);
++ if (!connectLineMatcher.matches()) {
++ System.out.println("Proxy: Unexpected"
++ + " request to the proxy: "
++ + firstLine);
++ return;
++ }
++
++ String host = connectLineMatcher.group(1);
++ String portStr = connectLineMatcher.group(2);
++ int port = Integer.parseInt(portStr);
++
++ Socket serverSocket = SocketFactory.getDefault()
++ .createSocket(host, port);
++
++ clientSocket.getOutputStream()
++ .write(PROXY_RESPONSE.getBytes("UTF-8"));
++
++ ProxyTunnel copyToClient =
++ new ProxyTunnel(serverSocket, clientSocket);
++ ProxyTunnel copyToServer =
++ new ProxyTunnel(clientSocket, serverSocket);
++
++ copyToClient.start();
++ copyToServer.start();
++
++ copyToClient.join();
++ // here copyToClient.close() would not provoke the
++ // bug ( since it would trigger the retry logic in
++ // HttpURLConnction.writeRequests ), so close only
++ // the output to get the connection in this state.
++ clientSocket.shutdownOutput();
++
++ try {
++ Thread.sleep(3000);
++ } catch (InterruptedException ignored) { }
++
++ // now close all connections to finish the test
++ copyToServer.close();
++ copyToClient.close();
++ } catch (IOException | NumberFormatException
++ | InterruptedException e) {
++ e.printStackTrace();
++ }
++ }
++ };
++ threads.add(t);
++ t.start();
++ }
++ for (Thread t: threads)
++ t.join();
++ } catch (IOException | InterruptedException e) {
++ e.printStackTrace();
++ }
++ }
++ }
++
++ /**
++ * This inner class provides unidirectional data flow through the sockets
++ * by continuously copying bytes from the input socket onto the output
++ * socket, until both sockets are open and EOF has not been received.
++ */
++ class ProxyTunnel extends Thread {
++ private final Socket sockIn;
++ private final Socket sockOut;
++ private final InputStream input;
++ private final OutputStream output;
++
++ public ProxyTunnel(Socket sockIn, Socket sockOut) throws IOException {
++ super("ProxyTunnel");
++ this.sockIn = sockIn;
++ this.sockOut = sockOut;
++ input = sockIn.getInputStream();
++ output = sockOut.getOutputStream();
++ }
++
++ public void run() {
++ byte[] buf = new byte[8192];
++ int bytesRead;
++
++ try {
++ while ((bytesRead = input.read(buf)) >= 0) {
++ output.write(buf, 0, bytesRead);
++ output.flush();
++ }
++ } catch (IOException ignored) {
++ close();
++ }
++ }
++
++ public void close() {
++ try {
++ if (!sockIn.isClosed())
++ sockIn.close();
++ if (!sockOut.isClosed())
++ sockOut.close();
++ } catch (IOException ignored) { }
++ }
++ }
++
++ /**
++ * the server thread
++ */
++ class HttpServer extends Thread implements Closeable {
++
++ private final ServerSocket serverSocket;
++ private final SSLSocketFactory sslSocketFactory;
++ private final String serverResponse =
++ "HTTP/1.1 200 OK\r\n"
++ + "Content-Type: text/plain\r\n"
++ + "Content-Length: 3\r\n"
++ + "\r\n"
++ + "Hi!";
++ private int connectionCount = 0;
++
++ HttpServer() throws Exception {
++ super("HttpServer Thread");
++
++ KeyStore ks = KeyStore.getInstance("JKS");
++ ks.load(new FileInputStream(keystorefile), passphrase.toCharArray());
++ KeyManagerFactory factory = KeyManagerFactory.getInstance("SunX509");
++ factory.init(ks, passphrase.toCharArray());
++ SSLContext ctx = SSLContext.getInstance("TLS");
++ ctx.init(factory.getKeyManagers(), null, null);
++
++ sslSocketFactory = ctx.getSocketFactory();
++
++ // Create the server that the test wants to connect to via the proxy
++ serverSocket = ServerSocketFactory.getDefault().createServerSocket();
++ serverSocket.bind(new InetSocketAddress(InetAddress.getLocalHost(), 0));
++ }
++
++ public int getPort() { return serverSocket.getLocalPort(); }
++
++ @Override
++ public void close() throws IOException { serverSocket.close(); }
++
++ @Override
++ public void run() {
++ try {
++ while (connectionCount++ < 2) {
++ Socket socket = serverSocket.accept();
++ System.out.println("Server: NEW CONNECTION "
++ + connectionCount);
++
++ SSLSocket sslSocket = (SSLSocket) sslSocketFactory
++ .createSocket(socket,null, getPort(), false);
++ sslSocket.setUseClientMode(false);
++ sslSocket.startHandshake();
++
++ String firstLine = readHeader(sslSocket.getInputStream());
++ if (firstLine != null && firstLine.contains("CONNECT")) {
++ System.out.println("Server: BUG! HTTP CONNECT"
++ + " encountered: " + firstLine);
++ connectInServer.set(true);
++ }
++
++ // write the success response, the request body is not read.
++ // close only output and keep input open.
++ OutputStream out = sslSocket.getOutputStream();
++ out.write(serverResponse.getBytes("UTF-8"));
++ socket.shutdownOutput();
++ }
++ } catch (IOException e) {
++ e.printStackTrace();
++ }
++ }
++ }
++
++ /**
++ * read the header and return only the first line.
++ *
++ * @param inputStream the stream to read from
++ * @return the first line of the stream
++ * @throws IOException if reading failed
++ */
++ private static String readHeader(InputStream inputStream)
++ throws IOException {
++ String line;
++ String firstLine = null;
++ while ((line = readLine(inputStream)) != null && line.length() > 0) {
++ if (firstLine == null) {
++ firstLine = line;
++ }
++ }
++
++ return firstLine;
++ }
++
++ /**
++ * read a line from stream.
++ *
++ * @param inputStream the stream to read from
++ * @return the line
++ * @throws IOException if reading failed
++ */
++ private static String readLine(InputStream inputStream)
++ throws IOException {
++ final StringBuilder line = new StringBuilder();
++ int ch;
++ while ((ch = inputStream.read()) != -1) {
++ if (ch == '\r') {
++ continue;
++ }
++
++ if (ch == '\n') {
++ break;
++ }
++
++ line.append((char) ch);
++ }
++
++ return line.toString();
++ }
++
++ private SSLSocketFactory createTestSSLSocketFactory() {
++
++ HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
++ @Override
++ public boolean verify(String hostname, SSLSession sslSession) {
++ // ignore the cert's CN; it's not important to this test
++ return true;
++ }
++ });
++
++ // Set up the socket factory to use a trust manager that trusts all
++ // certs, since trust validation isn't important to this test
++ final TrustManager[] trustAllCertChains = new TrustManager[] {
++ new X509TrustManager() {
++ @Override
++ public X509Certificate[] getAcceptedIssuers() {
++ return null;
++ }
++
++ @Override
++ public void checkClientTrusted(X509Certificate[] certs,
++ String authType) {
++ }
++
++ @Override
++ public void checkServerTrusted(X509Certificate[] certs,
++ String authType) {
++ }
++ }
++ };
++
++ final SSLContext sc;
++ try {
++ sc = SSLContext.getInstance("TLS");
++ } catch (NoSuchAlgorithmException e) {
++ throw new RuntimeException(e);
++ }
++
++ try {
++ sc.init(null, trustAllCertChains, new java.security.SecureRandom());
++ } catch (KeyManagementException e) {
++ throw new RuntimeException(e);
++ }
++
++ return sc.getSocketFactory();
++ }
++}
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -34,14 +34,17 @@
+ SunOS | Linux | Darwin )
+ PS=":"
+ FS="/"
++ CHMOD="${FS}bin${FS}chmod"
+ ;;
+ Windows* )
+ PS=";"
+ FS="\\"
++ CHMOD="chmod"
+ ;;
+ CYGWIN* )
+ PS=";"
+ FS="/"
++ CHMOD="chmod"
+ #
+ # javac does not like /cygdrive produced by `pwd`.
+ #
+@@ -59,6 +62,7 @@
+ mkdir -p ${DEST}${FS}jar1
+ cd ${TESTSRC}${FS}etc${FS}jar1
+ cp -r . ${DEST}${FS}jar1
++${CHMOD} -R u+w ${DEST}${FS}jar1
+ ${TESTJAVA}${FS}bin${FS}javac -d ${DEST}${FS}jar1 \
+ ${TESTSRC}${FS}src${FS}jar1${FS}LoadResourceBundle.java
+ ${TESTJAVA}${FS}bin${FS}javac -d ${DEST}${FS}jar1 \
+--- ./jdk/test/sun/security/ec/TestEC.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/ec/TestEC.java Mon Jan 05 11:57:27 2015 -0800
+@@ -30,7 +30,7 @@
+ * @library ../pkcs11/sslecc
+ * @library ../../../java/security/testlibrary
+ * @compile -XDignore.symbol.file TestEC.java
+- * @run main TestEC
++ * @run main/othervm TestEC
+ */
+
+ import java.security.Provider;
+@@ -53,6 +53,10 @@
+ public class TestEC {
+
+ public static void main(String[] args) throws Exception {
++ // reset the security property to make sure that the algorithms
++ // and keys used in this test are not disabled.
++ Security.setProperty("jdk.tls.disabledAlgorithms", "");
++
+ ProvidersSnapshot snapshot = ProvidersSnapshot.create();
+ try {
+ main0(args);
+--- ./jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Mon Jan 05 11:57:27 2015 -0800
+@@ -28,6 +28,7 @@
+ * @author Andreas Sterbenz
+ * @library ..
+ * @library ../../../../java/security/testlibrary
++ * @run main/othervm ClientJSSEServerJSSE
+ */
+
+ import java.security.*;
+@@ -37,6 +38,10 @@
+ private static String[] cmdArgs;
+
+ public static void main(String[] args) throws Exception {
++ // reset the security property to make sure that the algorithms
++ // and keys used in this test are not disabled.
++ Security.setProperty("jdk.tls.disabledAlgorithms", "");
++
+ cmdArgs = args;
+ main(new ClientJSSEServerJSSE());
+ }
+--- ./jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java Mon Jan 05 11:57:27 2015 -0800
+@@ -59,7 +59,7 @@
+ for (int i=0; i<SIZE; i++) {
+ System.err.print(".");
+ String cmd = "-keystore " + JKSFILE
+- + " -storepass changeit -keypass changeit "
++ + " -storepass changeit -keypass changeit -keyalg rsa "
+ + "-genkeypair -alias p" + i + " -dname CN=" + i;
+ KeyTool.main(cmd.split(" "));
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/provider/certpath/PKIXCertPathValidator/Validity.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,134 @@
++/*
++ * 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 8021804
++ * @summary CertPath should validate even if the validity period of the
++ * root cert does not include the validity period of a subordinate
++ * cert.
++ */
++
++import java.io.ByteArrayInputStream;
++import java.security.cert.*;
++import java.util.ArrayList;
++import java.util.Date;
++import java.util.HashSet;
++import java.util.Set;
++
++public class Validity {
++
++ /*
++ * Subject: OU=TestOrg, CN=TestCA
++ * Issuer: OU=TestOrg, CN=TestCA
++ * Validity
++ * Not Before: Feb 26 21:33:55 2014 GMT
++ Not After : Feb 26 21:33:55 2024 GMT
++ * Version 1
++ */
++ static String CACertStr =
++ "-----BEGIN CERTIFICATE-----\n" +
++ "MIIBvTCCASYCCQCQRiTo4lBCFjANBgkqhkiG9w0BAQUFADAjMRAwDgYDVQQLDAdU\n" +
++ "ZXN0T3JnMQ8wDQYDVQQDDAZUZXN0Q0EwHhcNMTQwMjI2MjEzMzU1WhcNMjQwMjI2\n" +
++ "MjEzMzU1WjAjMRAwDgYDVQQLDAdUZXN0T3JnMQ8wDQYDVQQDDAZUZXN0Q0EwgZ8w\n" +
++ "DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOtKS4ZrsM3ansd61ZxitcrN0w184I+A\n" +
++ "z0kyrSP1eMtlam+cC2U91NpTz11FYV4XUfBhqqxaXW043AWTUer8pS90Pt4sCrUX\n" +
++ "COx1+QA1M3ZhbZ4sTM7XQ90JbGaBJ/sEza9mlQP7hQ2yQO/hATKbP6J5qvgG2sT2\n" +
++ "S2WYjEgwNwmFAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAQ/CXEpnx2WY4LJtv4jwE\n" +
++ "4jIVirur3pdzV5oBhPyqqHMsyhQBkukCfX7uD7L5wN1+xuM81DfANpIxlnUfybp5\n" +
++ "CpjcmktLpmyK4kJ6XnSd2blbLOIpsr9x6FqxPxpVDlyw/ySHYrIG/GZdsLHgmzGn\n" +
++ "B06jeYzH8OLf879VxAxSsPc=\n" +
++ "-----END CERTIFICATE-----";
++
++ /*
++ * Subject: OU=TestOrg, CN=TestEE0
++ * Issuer: OU=TestOrg, CN=TestCA
++ * Validity
++ * Not Before: Feb 26 22:55:12 2014 GMT
++ * Not After : Feb 25 22:55:12 2025 GMT
++ * Version 1
++ */
++ static String EECertStr =
++ "-----BEGIN CERTIFICATE-----\n" +
++ "MIIBtjCCAR8CAQQwDQYJKoZIhvcNAQEFBQAwIzEQMA4GA1UECwwHVGVzdE9yZzEP\n" +
++ "MA0GA1UEAwwGVGVzdENBMB4XDTE0MDIyNjIyNTUxMloXDTI1MDIyNTIyNTUxMlow\n" +
++ "JDEQMA4GA1UECwwHVGVzdE9yZzEQMA4GA1UEAwwHVGVzdEVFMDCBnzANBgkqhkiG\n" +
++ "9w0BAQEFAAOBjQAwgYkCgYEAt8xz9W3ruCTHjSOtTX6cxsUZ0nRP6EavEfzgcOYh\n" +
++ "CXGA0gr+viSHq3c2vQBxiRny2hm5rLcqpPo+2OxZtw/ajxfyrV6d/r8YyQLBvyl3\n" +
++ "xdCZdOkG1DCM1oFAQDaSRt9wN5Zm5kyg7uMig5Y4L45fP9Yee4x6Xyh36qYbsR89\n" +
++ "rFMCAwEAATANBgkqhkiG9w0BAQUFAAOBgQDZrPqSo08va1m9TOWOztTuWilGdjK/\n" +
++ "2Ed2WXg8utIpy6uAV+NaOYtHQ7ULQBVRNmwg9nKghbVbh+E/xpoihjl1x7OXass4\n" +
++ "TbwXA5GKFIFpNtDvATQ/QQZoCuCzw1FW/mH0Q7UEQ/9/iJdDad6ebkapeMwtj/8B\n" +
++ "s2IZV7s85CEOXw==\n" +
++ "-----END CERTIFICATE-----";
++
++ public static void main(String[] args) throws Exception {
++
++ String[] certStrs = {EECertStr};
++ String[] trustedCertStrs = {CACertStr};
++ runTest(certStrs, trustedCertStrs);
++
++ System.out.println("Test passed.");
++ }
++
++ private static void runTest(String[] certStrs,
++ String[] trustedCertStrs)
++ throws Exception {
++
++ CertificateFactory cf = CertificateFactory.getInstance("X509");
++
++ // Generate the CertPath from the certs named in certStrs
++ ArrayList<X509Certificate> certs = new ArrayList<>();
++ for (String certStr : certStrs) {
++ certs.add(generateCert(certStr, cf));
++ }
++ CertPath cp = cf.generateCertPath(certs);
++
++ // Generate the set of Trust Anchors from the certs named in
++ // trustedCertStrs
++ Set<TrustAnchor> trustAnchors = new HashSet<>();
++ for (String trustedCertStr : trustedCertStrs) {
++ TrustAnchor ta = new TrustAnchor(generateCert(trustedCertStr, cf),
++ null);
++ trustAnchors.add(ta);
++ }
++ PKIXParameters params = new PKIXParameters(trustAnchors);
++ params.setDate(new Date(114, 3, 1)); // 2014-03-01
++ params.setRevocationEnabled(false);
++
++ // Attempt to validate the CertPath. If no exception thrown, successful.
++ CertPathValidator cpv = CertPathValidator.getInstance("PKIX");
++ cpv.validate(cp, params);
++ System.out.println("CertPath validation successful.");
++ }
++
++ private static X509Certificate generateCert(String certStr,
++ CertificateFactory cf)
++ throws Exception {
++ ByteArrayInputStream stream
++ = new ByteArrayInputStream(certStr.getBytes());
++ return (X509Certificate) cf.generateCertificate(stream);
++
++ }
++}
+--- ./jdk/test/sun/security/smartcardio/TestAll.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/smartcardio/TestAll.java Mon Jan 05 11:57:27 2015 -0800
+@@ -40,6 +40,7 @@
+ TestMultiplePresent.class,
+ TestPresent.class,
+ TestTransmit.class,
++ TestDirect.class,
+ };
+
+ public static void main(String[] args) throws Exception {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/smartcardio/TestDirect.java Mon Jan 05 11:57:27 2015 -0800
+@@ -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.
++ *
++ * 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 8046343
++ * @summary Make sure that direct protocol is available
++ * @run main/manual TestDirect
++ */
++
++// This test requires special hardware.
++
++import javax.smartcardio.Card;
++import javax.smartcardio.CardTerminal;
++import javax.smartcardio.CardTerminals;
++import javax.smartcardio.TerminalFactory;
++
++public class TestDirect {
++ public static void main(String[] args) throws Exception {
++ TerminalFactory terminalFactory = TerminalFactory.getDefault();
++ CardTerminals cardTerminals = terminalFactory.terminals();
++ CardTerminal cardTerminal = cardTerminals.list().get(0);
++ Card card = cardTerminal.connect("DIRECT");
++ card.disconnect(true);
++
++ System.out.println("OK.");
++ }
++}
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java Mon Jan 05 11:57:27 2015 -0800
+@@ -32,6 +32,7 @@
+ import java.io.*;
+ import java.net.*;
+ import javax.net.ssl.*;
++import java.security.Security;
+
+ public class HttpsProtocols implements HostnameVerifier {
+
+@@ -177,6 +178,10 @@
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
++ // reset the security property to make sure that the algorithms
++ // and keys used in this test are not disabled.
++ Security.setProperty("jdk.tls.disabledAlgorithms", "");
++
+ String keyFilename =
+ System.getProperty("test.src", "./") + "/" + pathToStores +
+ "/" + keyStoreFile;
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java Mon Jan 05 11:57:27 2015 -0800
+@@ -25,7 +25,7 @@
+ * @test
+ * @bug 4969459
+ * @summary Delegated tasks are not reflecting the subclasses of SSLException
+- *
++ * @run main/othervm DelegatedTaskWrongException
+ */
+
+ import javax.net.ssl.*;
+@@ -110,6 +110,9 @@
+ }
+
+ public static void main(String args[]) throws Exception {
++ // reset the security property to make sure that the algorithms
++ // and keys used in this test are not disabled.
++ Security.setProperty("jdk.tls.disabledAlgorithms", "");
+
+ DelegatedTaskWrongException test;
+
+--- ./jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java Mon Jan 05 11:57:27 2015 -0800
+@@ -122,6 +122,10 @@
+ volatile Exception clientException = null;
+
+ public static void main(String[] args) throws Exception {
++ // reset the security property to make sure that the algorithms
++ // and keys used in this test are not disabled.
++ Security.setProperty("jdk.tls.disabledAlgorithms", "");
++
+ String keyFilename =
+ System.getProperty("test.src", "./") + "/" + pathToStores +
+ "/" + keyStoreFile;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOldOrder.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,236 @@
++/*
++ * Copyright (c) 2012, 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 7174244 8043200 8050158
++ * @summary NPE in Krb5ProxyImpl.getServerKeys()
++ *
++ * SunJSSE does not support dynamic system properties, no way to re-use
++ * system properties in samevm/agentvm mode.
++ * @run main/othervm -Djdk.tls.preserveRC4CipherSuites=true CipherSuitesInOldOrder
++ */
++
++import java.util.*;
++import javax.net.ssl.*;
++
++public class CipherSuitesInOldOrder {
++
++ // supported ciphersuites
++ private final static List<String> supportedCipherSuites =
++ Arrays.<String>asList(
++ "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
++ "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
++ "TLS_RSA_WITH_AES_256_CBC_SHA256",
++ "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384",
++ "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384",
++ "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256",
++ "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256",
++ "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA",
++ "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
++ "TLS_RSA_WITH_AES_256_CBC_SHA",
++ "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA",
++ "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA",
++ "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
++ "TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
++ "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
++ "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
++ "TLS_RSA_WITH_AES_128_CBC_SHA256",
++ "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256",
++ "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256",
++ "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
++ "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256",
++ "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
++ "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
++ "TLS_RSA_WITH_AES_128_CBC_SHA",
++ "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA",
++ "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
++ "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
++ "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
++ "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
++ "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
++ "SSL_RSA_WITH_RC4_128_SHA",
++ "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
++ "TLS_ECDH_RSA_WITH_RC4_128_SHA",
++ "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
++ "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
++ "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
++ "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",
++ "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
++ "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
++ "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
++ "SSL_RSA_WITH_RC4_128_MD5",
++
++ "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
++
++ "TLS_DH_anon_WITH_AES_256_CBC_SHA256",
++ "TLS_ECDH_anon_WITH_AES_256_CBC_SHA",
++ "TLS_DH_anon_WITH_AES_256_CBC_SHA",
++ "TLS_DH_anon_WITH_AES_128_CBC_SHA256",
++ "TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
++ "TLS_DH_anon_WITH_AES_128_CBC_SHA",
++ "TLS_ECDH_anon_WITH_RC4_128_SHA",
++ "SSL_DH_anon_WITH_RC4_128_MD5",
++ "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
++ "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
++ "TLS_RSA_WITH_NULL_SHA256",
++ "TLS_ECDHE_ECDSA_WITH_NULL_SHA",
++ "TLS_ECDHE_RSA_WITH_NULL_SHA",
++ "SSL_RSA_WITH_NULL_SHA",
++ "TLS_ECDH_ECDSA_WITH_NULL_SHA",
++ "TLS_ECDH_RSA_WITH_NULL_SHA",
++ "TLS_ECDH_anon_WITH_NULL_SHA",
++ "SSL_RSA_WITH_NULL_MD5",
++ "SSL_RSA_WITH_DES_CBC_SHA",
++ "SSL_DHE_RSA_WITH_DES_CBC_SHA",
++ "SSL_DHE_DSS_WITH_DES_CBC_SHA",
++ "SSL_DH_anon_WITH_DES_CBC_SHA",
++ "SSL_RSA_EXPORT_WITH_RC4_40_MD5",
++ "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
++ "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
++ "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
++ "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
++ "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
++ "TLS_KRB5_WITH_RC4_128_SHA",
++ "TLS_KRB5_WITH_RC4_128_MD5",
++ "TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
++ "TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
++ "TLS_KRB5_WITH_DES_CBC_SHA",
++ "TLS_KRB5_WITH_DES_CBC_MD5",
++ "TLS_KRB5_EXPORT_WITH_RC4_40_SHA",
++ "TLS_KRB5_EXPORT_WITH_RC4_40_MD5",
++ "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
++ "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"
++ );
++
++ private final static String[] protocols = {
++ "", "SSL", "TLS", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"
++ };
++
++
++ public static void main(String[] args) throws Exception {
++ // show all of the supported cipher suites
++ showSuites(supportedCipherSuites.toArray(new String[0]),
++ "All supported cipher suites");
++
++ for (String protocol : protocols) {
++ System.out.println("//");
++ System.out.println("// " +
++ "Testing for SSLContext of " + protocol);
++ System.out.println("//");
++ checkForProtocols(protocol);
++ }
++ }
++
++ public static void checkForProtocols(String protocol) throws Exception {
++ SSLContext context;
++ if (protocol.isEmpty()) {
++ context = SSLContext.getDefault();
++ } else {
++ context = SSLContext.getInstance(protocol);
++ context.init(null, null, null);
++ }
++
++ // check the order of default cipher suites of SSLContext
++ SSLParameters parameters = context.getDefaultSSLParameters();
++ checkSuites(parameters.getCipherSuites(),
++ "Default cipher suites in SSLContext");
++
++ // check the order of supported cipher suites of SSLContext
++ parameters = context.getSupportedSSLParameters();
++ checkSuites(parameters.getCipherSuites(),
++ "Supported cipher suites in SSLContext");
++
++
++ //
++ // Check the cipher suites order of SSLEngine
++ //
++ SSLEngine engine = context.createSSLEngine();
++
++ // check the order of endabled cipher suites
++ String[] ciphers = engine.getEnabledCipherSuites();
++ checkSuites(ciphers,
++ "Enabled cipher suites in SSLEngine");
++
++ // check the order of supported cipher suites
++ ciphers = engine.getSupportedCipherSuites();
++ checkSuites(ciphers,
++ "Supported cipher suites in SSLEngine");
++
++ //
++ // Check the cipher suites order of SSLSocket
++ //
++ SSLSocketFactory factory = context.getSocketFactory();
++ try (SSLSocket socket = (SSLSocket)factory.createSocket()) {
++
++ // check the order of endabled cipher suites
++ ciphers = socket.getEnabledCipherSuites();
++ checkSuites(ciphers,
++ "Enabled cipher suites in SSLSocket");
++
++ // check the order of supported cipher suites
++ ciphers = socket.getSupportedCipherSuites();
++ checkSuites(ciphers,
++ "Supported cipher suites in SSLSocket");
++ }
++
++ //
++ // Check the cipher suites order of SSLServerSocket
++ //
++ SSLServerSocketFactory serverFactory = context.getServerSocketFactory();
++ try (SSLServerSocket serverSocket =
++ (SSLServerSocket)serverFactory.createServerSocket()) {
++ // check the order of endabled cipher suites
++ ciphers = serverSocket.getEnabledCipherSuites();
++ checkSuites(ciphers,
++ "Enabled cipher suites in SSLServerSocket");
++
++ // check the order of supported cipher suites
++ ciphers = serverSocket.getSupportedCipherSuites();
++ checkSuites(ciphers,
++ "Supported cipher suites in SSLServerSocket");
++ }
++ }
++
++ private static void checkSuites(String[] suites, String title) {
++ showSuites(suites, title);
++
++ int loc = -1;
++ int index = 0;
++ for (String suite : suites) {
++ index = supportedCipherSuites.indexOf(suite);
++ if (index <= loc) {
++ throw new RuntimeException(suite + " is not in order");
++ }
++
++ loc = index;
++ }
++ }
++
++ private static void showSuites(String[] suites, String title) {
++ System.out.println(title + "[" + suites.length + "]:");
++ for (String suite : suites) {
++ System.out.println(" " + suite);
++ }
++ }
++}
+--- ./jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java Mon Jan 05 11:57:27 2015 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 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
+@@ -23,7 +23,7 @@
+
+ /*
+ * @test
+- * @bug 7174244
++ * @bug 7174244 8043200
+ * @summary NPE in Krb5ProxyImpl.getServerKeys()
+ *
+ * SunJSSE does not support dynamic system properties, no way to re-use
+@@ -67,11 +67,6 @@
+ "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
+ "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
+ "TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
+- "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
+- "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
+- "SSL_RSA_WITH_RC4_128_SHA",
+- "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
+- "TLS_ECDH_RSA_WITH_RC4_128_SHA",
+ "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
+ "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+ "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
+@@ -79,6 +74,11 @@
+ "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
+ "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
+ "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
++ "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
++ "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
++ "SSL_RSA_WITH_RC4_128_SHA",
++ "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
++ "TLS_ECDH_RSA_WITH_RC4_128_SHA",
+ "SSL_RSA_WITH_RC4_128_MD5",
+
+ "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
+@@ -89,18 +89,10 @@
+ "TLS_DH_anon_WITH_AES_128_CBC_SHA256",
+ "TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
+ "TLS_DH_anon_WITH_AES_128_CBC_SHA",
++ "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
++ "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
+ "TLS_ECDH_anon_WITH_RC4_128_SHA",
+ "SSL_DH_anon_WITH_RC4_128_MD5",
+- "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
+- "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
+- "TLS_RSA_WITH_NULL_SHA256",
+- "TLS_ECDHE_ECDSA_WITH_NULL_SHA",
+- "TLS_ECDHE_RSA_WITH_NULL_SHA",
+- "SSL_RSA_WITH_NULL_SHA",
+- "TLS_ECDH_ECDSA_WITH_NULL_SHA",
+- "TLS_ECDH_RSA_WITH_NULL_SHA",
+- "TLS_ECDH_anon_WITH_NULL_SHA",
+- "SSL_RSA_WITH_NULL_MD5",
+ "SSL_RSA_WITH_DES_CBC_SHA",
+ "SSL_DHE_RSA_WITH_DES_CBC_SHA",
+ "SSL_DHE_DSS_WITH_DES_CBC_SHA",
+@@ -111,16 +103,24 @@
+ "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
+ "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
+ "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
++ "TLS_RSA_WITH_NULL_SHA256",
++ "TLS_ECDHE_ECDSA_WITH_NULL_SHA",
++ "TLS_ECDHE_RSA_WITH_NULL_SHA",
++ "SSL_RSA_WITH_NULL_SHA",
++ "TLS_ECDH_ECDSA_WITH_NULL_SHA",
++ "TLS_ECDH_RSA_WITH_NULL_SHA",
++ "TLS_ECDH_anon_WITH_NULL_SHA",
++ "SSL_RSA_WITH_NULL_MD5",
++ "TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
++ "TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
+ "TLS_KRB5_WITH_RC4_128_SHA",
+ "TLS_KRB5_WITH_RC4_128_MD5",
+- "TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
+- "TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
+ "TLS_KRB5_WITH_DES_CBC_SHA",
+ "TLS_KRB5_WITH_DES_CBC_MD5",
++ "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
++ "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
+ "TLS_KRB5_EXPORT_WITH_RC4_40_SHA",
+- "TLS_KRB5_EXPORT_WITH_RC4_40_MD5",
+- "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
+- "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"
++ "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"
+ );
+
+ private final static String[] protocols = {
+--- ./jdk/test/sun/security/ssl/sanity/interop/CipherTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/ssl/sanity/interop/CipherTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -394,6 +394,10 @@
+
+ public static void main(PeerFactory peerFactory, String[] args)
+ throws Exception {
++ // reset the security property to make sure that the algorithms
++ // and keys used in this test are not disabled.
++ Security.setProperty("jdk.tls.disabledAlgorithms", "");
++
+ long time = System.currentTimeMillis();
+ String relPath;
+ if ((args != null) && (args.length > 0) && args[0].equals("sh")) {
+--- ./jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java Mon Jan 05 11:57:27 2015 -0800
+@@ -29,9 +29,15 @@
+ * @run main/othervm/timeout=300 ClientJSSEServerJSSE
+ */
+
++import java.security.Security;
++
+ public class ClientJSSEServerJSSE {
+
+ public static void main(String[] args) throws Exception {
++ // reset the security property to make sure that the algorithms
++ // and keys used in this test are not disabled.
++ Security.setProperty("jdk.tls.disabledAlgorithms", "");
++
+ CipherTest.main(new JSSEFactory(), args);
+ }
+
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/tools/jarsigner/TimestampAlg.java Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,156 @@
++/*
++ * 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 8049480
++ * @summary Current versions of Java can't verify jars signed and timestamped with Java 9
++ */
++
++import java.io.InputStream;
++import java.nio.file.Files;
++import java.nio.file.Paths;
++import java.util.jar.JarEntry;
++import java.util.jar.JarFile;
++
++public class TimestampAlg {
++
++ public static void main(String[] args) throws Exception {
++ // This is a very simple jar file signed by JDK 9 with a timestamp
++ // using the SHA-256 message digest algorithm.
++ String var =
++ "504b0304140008080800c28ee844000000000000000000000000140000004d45" +
++ "54412d494e462f4d414e49464553542e4d4615cd4d0b82301c80f1fb60df61c7" +
++ "42666a9928749846f4aa8924745cf9d716b6c59c48df3ebd3e87df73e152d4d0" +
++ "195a82ee849211716d07a344033750d1f83785d076e830b8be1fb80e15d28096" +
++ "bca535ef4c058fbe21b34cf3670b2451faab3437a333c708a3947f20220ca362" +
++ "cfa8e7afe95634e32b22af821df2d6786d5ff637cf3abfe3f05e4190a42779b5" +
++ "76470532cbd56a798105db4cd01f504b07082c3740c69c000000a6000000504b" +
++ "0304140008080800c28ee8440000000000000000000000000f0000004d455441" +
++ "2d494e462f4f4c442e534675cf416f823018c6f13b09dfa1c7ed50575014493c" +
++ "80bae8a6a091383db6f082955a595b86ecd34fb3db92dd9ed32fff67c74b494d" +
++ "a300ef41697e9501727ac4b6768b10bbde10cf7809dae03595bcf81d5ce2d018" +
++ "c5596340072872bdecd02554f17c70f16fc730cfb4a8c6b0ad934fdfb6d0e854" +
++ "fbb794ecd52eeecbe5e45f394071bd9ef30c34131f87a3e956c561efb0938e56" +
++ "b7573d5c6cd3599bbe2ddd28acfafe9d992aa006721c758fe2718fe0b6753c6f" +
++ "e410cca50125a9c005d52607d694e82951341380a657555f1535f7a3cfb6655b" +
++ "31bd4080c2bf55016a98a8f2512948f7e5968dfbbe495fcca6383bdfe753a467" +
++ "90ca41a297861544cd270fe807504b0708521a35550201000048010000504b03" +
++ "04140008080800c28ee844000000000000000000000000100000004d4554412d" +
++ "494e462f4f4c442e52534185947b38d37d1fc7fdb61923530eb39e688622a77e" +
++ "5b666ab9939c9544c831ee39d42c9511e576d8c8b9876745b5743b5414268718" +
++ "b969548e95d61c2224b47423a648393d73dd5d4fe5b9afe7f9f3f3b9deefeff5" +
++ "bd3e9ff7e7053210ba708476bc55fc6719400292c340a8800cc4460800e06441" +
++ "1938c23bde0af083c22080b81828fd5d08e430200f4006a41664003772a01000" +
++ "028145a66e3cba6af9a601a44516246e1d2805873ac1a0f2d093545f70b3920c" +
++ "ce00248246e04ec20e02e8262a09200e6ff0adfc2f3d0350fbf149d12fa00c40" +
++ "564cd497823000406cb4ef6571fdec06c95a370fde860e89425861e16e0b19a1" +
++ "4c6c4f52d6102dd3a6bf45e740d9a0bed342ee5e832885fa1a979dc7e6161253" +
++ "4c2cda0362e5ec02ae440e44e80c56bffc4ab4f349f3b1f6bddae8c2979fca4b" +
++ "5e7e46ac2fa529481dd8d750a26dcd7d74deb8dde7fc70c072465af0a1e359af" +
++ "4cf4b1aaa14fc4238cee096ca3133575d52179a7e7da8990f6ed5da71ca84c37" +
++ "2d3117c356b1ac2cdde3c8600ead44f8878b2f8f10831f4d5d590a28d95b316c" +
++ "cf456277a83533e12ea42a14c8fc05da6b2483b74ab7c4e70a2dd60f417d2f97" +
++ "3359bb233e3d6b5ab60202e7bd7b4fd7f228febd1f0403b0c62f4190b69264bf" +
++ "72426589ab516d00040a880137b0200654114d4d050943c11490e82d88b38ecd" +
++ "26a42c027cd749ffe67955e7d9357b81aece4e877d49ee62b8afeed7a755fa9e" +
++ "786d6edc5d7e5ae3603e5d6e39d0cbc74300c35eb354282842a183159763c67a" +
++ "35b0b1ac1929e7b8ad510da5aa454d5eb3034cf11d27f594326384873f7c8949" +
++ "1a7f4a3cfccb892faf873c621292bd597072cdcd732d1ee7490e611ec28c90f9" +
++ "81bbd71ef0e4b50c4e93869c9af8c9d3d154169bbf8dff7aa706ebac1f6d2589" +
++ "8078532a9867e31d7f576365bc0c6c132fb7719b58d88ebcf438715768aea361" +
++ "f7017f614acfaf465e6d794b84e317b2937d66a8f5cea13666d541cce02705a8" +
++ "cef2d6d2f69b96ac88fec9998228a7c1d96d09c315b29797ecda02250dc7383a" +
++ "6f2bf75b0f17d48c07afa48c640d3478dd3ad18963c0712003ae27ca3a885a9b" +
++ "bcef71fef1027e8e228c01885dede0446717674996f8f413f59a5c3f91a001c0" +
++ "b632f78891424ce58a58df39727a6cc492ea4c94d5f23f6ad1276561d6eb057f" +
++ "befab3e5baff5dec50224a891fb49c29ab6cd6cab3f7731d097fc3d65e949b33" +
++ "b7a578f0b379e47a98c0a91b5fb0ce685952a78afc5cfa0e373df4a035c15132" +
++ "bb62a6387ad8caaadab680b8a169805e49b69e5ad8409de9b7079b6def2af45a" +
++ "dada5e7cdee4b5359892d1803dfc765dd18849fd0bf44b64866ed654fc117ea6" +
++ "5e6b1922eff99b73f0c77257e994d307defc9a29cedd1ac7be68a626d6edf96e" +
++ "c692bdf22ee792369dd535a0dfa7d711396996f692895df223eaaa5f47414f45" +
++ "b2c3b39d65772575c5cf4a437319b00990011b834b7f1b0c623d048963c07a44" +
++ "4dfe4f60813d12b5b87f0b16ea0f6e0096e30973075d454238d411260ee2d6a8" +
++ "61aa68a6bb3119ab837aaa39abd612eab39f9da4665c977e0cff019201a19384" +
++ "d3222b5a160ffe07340620c10d220998e65d3431411e13916b4e44ae191143fa" +
++ "be91cb1605ff6d2db96470d220e2af3c40f6ed5d032ee2cfe022bafd240fa1fd" +
++ "5f6e3567dd9071543e381b57bdd80cb1575a376abcc947495167e61e6e32a1ae" +
++ "93d416c8bc197b6bda347e6bcc6553839ed0a78d7ac28d57f2f7f8cd857d14e4" +
++ "497caa1cd34e1829aa7574aa3984ad39934e765598bdf0356c31a8f5c4a316d6" +
++ "c6beedf3add584c5769a6901a7836d3b32e3a03c58c739a6969e0260a002f463" +
++ "2773e84174c7faa41086e0d5d0ceaefc4df5a443d4e8af8a462dd67181ce11be" +
++ "a6ef64ce907252a0d0e6f03ef467e6763c244c48574856017d294607d3f87d5b" +
++ "0eb9eba2c60dc6c70dddfb837914babf172574ef99a4bb1e361353de4d95c576" +
++ "c494e1e9bce62d4fd08ad5e731691d1895636525bb79d76b2f1ce07d1604aa95" +
++ "8d9dfc8b5b6ee01110b3ca2d75181a44c528300ede3c612715c04d7baf786a18" +
++ "87b5f95861180fa256055b006005b67aa0923a70405c5c022af903f0187b3458" +
++ "748cc0bdfeac15adcb7029a17883d0f5ef80573caa61574bb66747bc61aae3ca" +
++ "0c3fe8bcd223d54fd7f5a2270843f9559a99f76aff45d965ba91374fa05a706f" +
++ "479416999389d4e29eb74a1984a30face935fd2118a580a3cd5a6567c2e21e92" +
++ "bb358c54822aaa049a8f47712889ee4507ae4ffd150ba50f444f99701c49fa97" +
++ "72edc44e69cfcda9cffc9f75c49fdb6b28b9699a2567289979dfd42664626232" +
++ "75b682be2baf3856623e37bb47c15e3e8e084771e4f3e7b53265efbc48e616cd" +
++ "ed18c4a546de3f5bd793857c9c7a99615161b7cdcca53fa1d4c119a33bb150a4" +
++ "6e4996450724eed76ae3d2dbc02f147228353241beba27e585a3dd556b8e5c2e" +
++ "5f4a3328fd214663223ec27d4fb134873a85630026a204ee5e059ee29a807f3f" +
++ "82ffcd3b2437cc1bf95a6813dec5195b38cd227002c6f5f53dcd1212f7182038" +
++ "9877b7ddf1ff2c0c65993b9524d3b41eca82ded2b951471c871b741fddd9fdc7" +
++ "70a79bb91c3d91f3a9aa8f880ec22099418c65654a7e3a25c4d8925e98e1e390" +
++ "1437e8767c9debf521e5c93ad5026ab8e5ef9696983ba6d0335e17de6ba65747" +
++ "91a0fb6ecdf20bde55874082a7f19b4332ddbba24d4eb98a9b0e55e4294f37be" +
++ "edd62a3e3ebccf8ded49f3a029fa76becf3389a386d2d62faca4f85cbb643489" +
++ "2e2abfd66dbe727f4fe28d8f8d551e0f8f4c8eda346c66d1bc6fa7a68eabdfb7" +
++ "0d0a34e65910bba73413ad8680dfaa473753ae9e2fd032d8f6cc66d19c57e679" +
++ "7fcc33cce8df504b0708267c480f1b08000030090000504b0304140008080800" +
++ "b78ee844000000000000000000000000090004004d4554412d494e462ffeca00" +
++ "000300504b0708000000000200000000000000504b0304140008080800b78ee8" +
++ "440000000000000000000000000100000041f3cb2fc9c8cc4be70200504b0708" +
++ "3c0a34d30a00000008000000504b01021400140008080800c28ee8442c3740c6" +
++ "9c000000a60000001400000000000000000000000000000000004d4554412d49" +
++ "4e462f4d414e49464553542e4d46504b01021400140008080800c28ee844521a" +
++ "355502010000480100000f00000000000000000000000000de0000004d455441" +
++ "2d494e462f4f4c442e5346504b01021400140008080800c28ee844267c480f1b" +
++ "0800003009000010000000000000000000000000001d0200004d4554412d494e" +
++ "462f4f4c442e525341504b01021400140008080800b78ee84400000000020000" +
++ "00000000000900040000000000000000000000760a00004d4554412d494e462f" +
++ "feca0000504b01021400140008080800b78ee8443c0a34d30a00000008000000" +
++ "0100000000000000000000000000b30a000041504b0506000000000500050027" +
++ "010000ec0a00000000";
++ byte[] data = new byte[var.length()/2];
++ for (int i=0; i<data.length; i++) {
++ data[i] = Integer.valueOf(var.substring(2*i,2*i+2), 16).byteValue();
++ }
++ Files.write(Paths.get("x.jar"), data);
++
++ try (JarFile jf = new JarFile("x.jar")) {
++ JarEntry je = jf.getJarEntry("A");
++ try (InputStream is = jf.getInputStream(je)) {
++ is.read(new byte[10]);
++ }
++ if (je.getCertificates().length != 1) {
++ throw new Exception();
++ }
++ }
++ }
++}
+--- ./jdk/test/sun/security/tools/jarsigner/TimestampCheck.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/TimestampCheck.java Mon Jan 05 11:57:27 2015 -0800
+@@ -188,7 +188,7 @@
+ DerOutputStream tstInfo2 = new DerOutputStream();
+ tstInfo2.putOctetString(tstInfo.toByteArray());
+
+- Signature sig = Signature.getInstance("SHA1withDSA");
++ Signature sig = Signature.getInstance("SHA1withRSA");
+ sig.initSign((PrivateKey)(ks.getKey(
+ alias, "changeit".toCharArray())));
+ sig.update(tstInfo.toByteArray());
+@@ -205,7 +205,7 @@
+ SignerInfo signerInfo = new SignerInfo(
+ new X500Name(signer.getIssuerX500Principal().getName()),
+ signer.getSerialNumber(),
+- aid, AlgorithmId.get("DSA"), sig.sign());
++ aid, AlgorithmId.get("RSA"), sig.sign());
+
+ SignerInfo[] signerInfos = {signerInfo};
+ PKCS7 p7 =
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/security/tools/jarsigner/certpolicy.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -0,0 +1,79 @@
++#
++# 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 8036709
++# @summary Java 7 jarsigner displays warning about cert policy tree
++#
++# @run shell certpolicy.sh
++#
++
++if [ "${TESTJAVA}" = "" ] ; then
++ JAVAC_CMD=`which javac`
++ TESTJAVA=`dirname $JAVAC_CMD`/..
++fi
++
++KT="$TESTJAVA/bin/keytool $TESTTOOLVMOPTS \
++ -keypass changeit -storepass changeit -keystore ks -keyalg rsa"
++JS="$TESTJAVA/bin/jarsigner $TESTTOOLVMOPTS -storepass changeit -keystore ks"
++JAR="$TESTJAVA/bin/jar $TESTTOOLVMOPTS"
++
++rm ks 2> /dev/null
++$KT -genkeypair -alias ca -dname CN=CA -ext bc
++$KT -genkeypair -alias int -dname CN=Int
++$KT -genkeypair -alias ee -dname CN=EE
++
++# CertificatePolicies [[PolicyId: [1.2.3]], [PolicyId: [1.2.4]]]
++# PolicyConstraints: [Require: 0; Inhibit: unspecified]
++$KT -certreq -alias int | \
++ $KT -gencert -rfc -alias ca \
++ -ext 2.5.29.32="30 0C 30 04 06 02 2A 03 30 04 06 02 2A 04" \
++ -ext "2.5.29.36=30 03 80 01 00" -ext bc | \
++ $KT -import -alias int
++
++# CertificatePolicies [[PolicyId: [1.2.3]]]
++$KT -certreq -alias ee | \
++ $KT -gencert -rfc -alias int \
++ -ext 2.5.29.32="30 06 30 04 06 02 2A 03" | \
++ $KT -import -alias ee
++
++$KT -export -alias ee -rfc > cc
++$KT -export -alias int -rfc >> cc
++$KT -export -alias ca -rfc >> cc
++
++$KT -delete -alias int
++
++ERR=''
++$JAR cvf a.jar cc
++
++# Make sure the certchain in the signed jar contains all 3 certs
++$JS -strict -certchain cc a.jar ee -debug || ERR="sign"
++$JS -strict -verify a.jar -debug || ERR="$ERR verify"
++
++if [ "$ERR" = "" ]; then
++ echo "Success"
++ exit 0
++else
++ echo "Failed: $ERR"
++ exit 1
++fi
+--- ./jdk/test/sun/security/tools/jarsigner/checkusage.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/checkusage.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -45,7 +45,7 @@
+ ;;
+ esac
+
+-KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit"
++KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keyalg rsa"
+ JAR=$TESTJAVA${FS}bin${FS}jar
+ JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner"
+
+--- ./jdk/test/sun/security/tools/jarsigner/crl.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/crl.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -45,7 +45,7 @@
+
+ KS=crl.jks
+
+-KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS"
++KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS -keyalg rsa"
+
+ rm $KS 2> /dev/null
+
+--- ./jdk/test/sun/security/tools/jarsigner/jvindex.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/jvindex.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -47,7 +47,7 @@
+ JFILE=jvindex.jar
+
+ KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit \
+- -keystore $KS"
++ -keystore $KS -keyalg rsa"
+ JAR=$TESTJAVA${FS}bin${FS}jar
+ JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner -keystore $KS -storepass changeit"
+
+--- ./jdk/test/sun/security/tools/jarsigner/newsize7.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/newsize7.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -51,7 +51,7 @@
+
+ KSFILE=ns7.jks
+
+-KT="${TESTJAVA}${FS}bin${FS}keytool -keystore ns7.jks -storepass changeit -keypass changeit"
++KT="${TESTJAVA}${FS}bin${FS}keytool -keystore ns7.jks -storepass changeit -keypass changeit -keyalg rsa"
+ JAR="${TESTJAVA}${FS}bin${FS}jar"
+ JS="${TESTJAVA}${FS}bin${FS}jarsigner -keystore ns7.jks -storepass changeit"
+
+--- ./jdk/test/sun/security/tools/jarsigner/onlymanifest.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/onlymanifest.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -46,7 +46,7 @@
+ JFILE=onlymanifest.jar
+
+ KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit \
+- -keystore $KS"
++ -keystore $KS -keyalg rsa"
+ JAR=$TESTJAVA${FS}bin${FS}jar
+ JARSIGNER=$TESTJAVA${FS}bin${FS}jarsigner
+
+--- ./jdk/test/sun/security/tools/jarsigner/passtype.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/passtype.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -45,7 +45,7 @@
+ KS=pt.jks
+ JFILE=pt.jar
+
+-KT="$TESTJAVA${FS}bin${FS}keytool -keystore $KS -validity 300"
++KT="$TESTJAVA${FS}bin${FS}keytool -keystore $KS -validity 300 -keyalg rsa"
+ JAR=$TESTJAVA${FS}bin${FS}jar
+ JARSIGNER=$TESTJAVA${FS}bin${FS}jarsigner
+
+--- ./jdk/test/sun/security/tools/jarsigner/samename.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/samename.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -47,7 +47,7 @@
+ KS=samename.jks
+ JFILE=em.jar
+
+-KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS"
++KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS -keyalg rsa"
+ JAR=$TESTJAVA${FS}bin${FS}jar
+ JARSIGNER=$TESTJAVA${FS}bin${FS}jarsigner
+
+--- ./jdk/test/sun/security/tools/jarsigner/ts.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/ts.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -53,7 +53,7 @@
+ JAR="${TESTJAVA}${FS}bin${FS}jar"
+ JAVA="${TESTJAVA}${FS}bin${FS}java"
+ JAVAC="${TESTJAVA}${FS}bin${FS}javac"
+-KT="${TESTJAVA}${FS}bin${FS}keytool -keystore tsks -storepass changeit -keypass changeit -validity 200"
++KT="${TESTJAVA}${FS}bin${FS}keytool -keystore tsks -storepass changeit -keypass changeit -keyalg rsa -validity 200"
+
+ rm tsks
+ echo Nothing > A
+--- ./jdk/test/sun/security/tools/keytool/CloseFile.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/keytool/CloseFile.java Mon Jan 05 11:57:27 2015 -0800
+@@ -58,7 +58,7 @@
+ }
+
+ static void run(String s) throws Exception {
+- KeyTool.main((s+" -debug").split(" "));
++ KeyTool.main((s+" -debug -keyalg rsa").split(" "));
+ }
+ static void remove(String filename, boolean check) {
+ new File(filename).delete();
+--- ./jdk/test/sun/security/tools/keytool/ListKeychainStore.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/keytool/ListKeychainStore.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -71,6 +71,7 @@
+ -storetype PKCS12 \
+ -keystore $TEMPORARY_P12 \
+ -storepass $PWD \
++ -keyalg rsa \
+ -dname "CN=$i,OU=$i,O=$i,ST=$i,C=US" \
+ -alias 7133495-$i
+
+--- ./jdk/test/sun/security/tools/keytool/StartDateTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/keytool/StartDateTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -48,7 +48,7 @@
+ new File("jks").delete();
+
+ run("-keystore jks -storetype jks -storepass changeit -keypass changeit -alias me " +
+- "-genkeypair -dname CN=Haha -startdate +1y");
++ "-keyalg rsa -genkeypair -dname CN=Haha -startdate +1y");
+ cal.setTime(getIssueDate());
+ System.out.println(cal);
+ if (cal.get(Calendar.YEAR) != year + 1) {
+--- ./jdk/test/sun/security/tools/keytool/emptysubject.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/keytool/emptysubject.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -45,7 +45,7 @@
+ esac
+
+ KS=emptysubject.jks
+-KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS"
++KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS -keyalg rsa"
+
+ rm $KS
+
+--- ./jdk/test/sun/security/tools/keytool/importreadall.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/keytool/importreadall.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -49,7 +49,7 @@
+ ;;
+ esac
+
+-KEYTOOL="${TESTJAVA}${FS}bin${FS}keytool -keystore importreadall.jks -storepass changeit -keypass changeit"
++KEYTOOL="${TESTJAVA}${FS}bin${FS}keytool -keystore importreadall.jks -storepass changeit -keypass changeit -keyalg rsa"
+
+ # In case the test is run twice in the same directory
+
+--- ./jdk/test/sun/security/tools/keytool/readjar.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/keytool/readjar.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -45,7 +45,7 @@
+ KS=readjar.jks
+ rm $KS
+ $TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS \
+- -alias x -dname CN=X -genkeypair
++ -keyalg rsa -alias x -dname CN=X -genkeypair
+ $TESTJAVA${FS}bin${FS}jar cvf readjar.jar $KS
+ $TESTJAVA${FS}bin${FS}jarsigner -storepass changeit -keystore $KS readjar.jar x
+
+--- ./jdk/test/sun/security/tools/keytool/selfissued.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/keytool/selfissued.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -45,7 +45,7 @@
+ esac
+
+ KS=selfsigned.jks
+-KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS"
++KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS -keyalg rsa"
+
+ rm $KS
+
+--- ./jdk/test/sun/security/tools/keytool/trystore.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/tools/keytool/trystore.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -43,7 +43,7 @@
+
+ rm trystore.jks 2> /dev/null
+
+-KEYTOOL="${TESTJAVA}${FS}bin${FS}keytool -storetype jks -keystore trystore.jks"
++KEYTOOL="${TESTJAVA}${FS}bin${FS}keytool -storetype jks -keystore trystore.jks -keyalg rsa"
+ $KEYTOOL -genkeypair -alias a -dname CN=A -storepass changeit -keypass changeit
+ $KEYTOOL -genkeypair -alias b -dname CN=B -storepass changeit -keypass changeit
+
+--- ./jdk/test/sun/security/validator/samedn.sh Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/security/validator/samedn.sh Mon Jan 05 11:57:27 2015 -0800
+@@ -47,7 +47,7 @@
+ esac
+
+ KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit \
+- -keypass changeit -keystore samedn.jks"
++ -keypass changeit -keystore samedn.jks -keyalg rsa"
+ JAVAC=$TESTJAVA${FS}bin${FS}javac
+ JAVA=$TESTJAVA${FS}bin${FS}java
+
+--- ./jdk/test/sun/text/resources/LocaleData Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/text/resources/LocaleData Mon Jan 05 11:57:27 2015 -0800
+@@ -574,7 +574,6 @@
+ FormatData/es_PA/NumberElements/0=.
+ FormatData/es_PA/NumberElements/1=,
+ FormatData/es_PA/NumberElements/2=;
+-CurrencyNames/es_PE/PEN=S/
+ FormatData/es_PE/NumberPatterns/0=#,##0.###;-#,##0.###
+ # FormatData/es_PE/NumberPatterns/1=S/#,##0.00;S/-#,##0.00 # Changed; see bug 4122840
+ FormatData/es_PE/NumberPatterns/2=#,##0%
+@@ -7012,3 +7011,19 @@
+ FormatData/sl/DateTimePatterns/4=EEEE, dd. MMMM y
+ FormatData/sl/DateTimePatterns/5=dd. MMMM y
+
++# bug 7085757
++CurrencyNames//SSP=SSP
++CurrencyNames//ssp=South Sudanese Pound
++CurrencyNames//xsu=Sucre
++CurrencyNames//xua=ADB Unit of Account
++LocaleNames//SS=South Sudan
++LocaleNames/en/SS=South Sudan
++
++# bug 7028073
++CurrencyNames/es_PE/PEN=S/.
++
++# bug 7195759
++CurrencyNames//ZMW=ZMW
++
++# bug 8021121
++CurrencyNames/lv_LV/EUR=\u20AC
+--- ./jdk/test/sun/text/resources/LocaleDataTest.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/text/resources/LocaleDataTest.java Mon Jan 05 11:57:27 2015 -0800
+@@ -34,7 +34,7 @@
+ * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
+ * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
+ * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7189611
+- * 7171028 8013836
++ * 7171028 8013836 7028073 7195759 7085757
+ * @summary Verify locale data
+ *
+ */
+--- ./jdk/test/sun/tools/jcmd/help_help.out Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/tools/jcmd/help_help.out Mon Jan 05 11:57:27 2015 -0800
+@@ -1,7 +1,7 @@
+ help
+ For more information about a specific command use 'help <command>'. With no argument this will show a list of available commands. 'help all' will show help for all commands.
+
+-Impact: Low:
++Impact: Low
+
+ Syntax : help [options] [<command name>]
+
+--- ./jdk/test/sun/util/resources/TimeZone/Bug6317929.java Mon Sep 08 12:16:34 2014 -0700
++++ ./jdk/test/sun/util/resources/TimeZone/Bug6317929.java Mon Jan 05 11:57:27 2015 -0800
+@@ -122,20 +122,20 @@
+ TimeZone Currie = TimeZone.getTimeZone("Australia/Currie");
+ tzLocale = locales2Test[0];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+- ("Eastern Standard Time (New South Wales)"))
++ ("Australian Eastern Standard Time (New South Wales)"))
+ throw new RuntimeException("\n" + tzLocale + ": LONG, " +
+ "non-daylight saving name for " +
+ "Australia/Currie should be " +
+- "\"Eastern Standard Time " +
++ "\"Australian Eastern Standard Time " +
+ "(New South Wales)\"");
+ tzLocale = locales2Test[1];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+- ("Eastern Normalzeit (Neus\u00fcdwales)"))
++ ("\u00D6stliche Normalzeit (New South Wales)"))
+ throw new RuntimeException("\n" + tzLocale + ": LONG, " +
+ "non-daylight saving name for " +
+ "Australia/Currie should be " +
+- "\"Eastern Normalzeit " +
+- "(Neus\u00fcdwales)\"");
++ "\"\u00D6stliche Normalzeit " +
++ "(New South Wales)\"");
+ tzLocale = locales2Test[2];
+ if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
+ ("Hora est\u00e1ndar Oriental (Nueva Gales del Sur)"))
+--- ./langtools/.hgtags Mon Sep 08 12:17:52 2014 -0700
++++ ./langtools/.hgtags Mon Jan 05 12:00:55 2015 -0800
+@@ -472,11 +472,19 @@
+ 0f809f893588548a3b5c8441e28c9e0a62bc13ef jdk7u65-b18
+ eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b19
+ afc940d62b49059f565f87c83343fa3d28df883b jdk7u65-b32
++772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u80-b00
++6c307a0b7a94e002d8a2532ffd8146d6c53f42d3 jdk7u80-b01
++5bd6f3adf690dc2de8881b6f9f48336db4af7865 jdk7u80-b02
+ 114c4fc53777e4067a26f6510fe72fa770a9253c jdk7u65-b20
+ 8a09cca8f12027ba59df4bb18d49e855c4db4811 jdk7u67-b01
+ eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b40
+ 5e4cc118e2d1f7a8eefca5dd7146d46a1b0ca911 jdk7u65-b31
+ 59575d1928f98d1e26ea548ff4d5e2415dfe9b57 jdk7u65-b33
++8a09cca8f12027ba59df4bb18d49e855c4db4811 jdk7u67-b01
++e3b604d29f9177ac0c1344cdb7af8f5ccdc1db42 jdk7u67-b31
++e6bf55d457016764b4dd785b61ae79a125ba869b jdk7u67-b32
++624c54795faaf1a92bc1eb8c369dc18c1704c812 jdk7u67-b33
++18077957a8b802d9ce8724856e8b5f3fcde38b9e jdk7u67-b34
+ 684f0285b699d304d1efff487b550ff2e1679e98 jdk7u66-b00
+ a927daae851fa81d0470d2b67f52e8156e4d423c jdk7u66-b01
+ 6f229fda19bdabf7a3d1caad9d809dd713cce65d jdk7u66-b09
+@@ -502,3 +510,51 @@
+ df957022bc94fc84c3d9e6f1f23af29b6afeb63d jdk7u71-b11
+ a8fd0637a601ee2747e785bd5e9e2a0262acf280 jdk7u71-b12
+ 1cefc4b498a60ebc86b76eb2e9e861dbb072bd85 jdk7u71-b13
++6fe93bd5d4ac9d65a3f97cc16286ed2278150d7c jdk7u71-b14
++5b207c2ea9d20c5de58a7a7e618cc9b86ac7fe76 jdk7u72-b01
++1f1c94334f194aa980b7787fd5f2286405991e23 jdk7u72-b02
++6e5faa9ed5f317369eacfedbf57fc0745c1e940b jdk7u72-b03
++960f87b4d55681f19880385f9d11e227ea36f2df jdk7u72-b04
++adf88de8b627ede9e8819d94b00ad9ec7eed3077 jdk7u72-b05
++7efda07275d14dbd0fd96d304b7d682579cb6410 jdk7u72-b06
++bfaa78bab4784c6bb494393dad0c330616cb7256 jdk7u72-b07
++073486551f0c07f44c93e8dcdb31785a3f4526eb jdk7u72-b08
++0e25c3ae773a27dba34ec05ea28dbcd44ea6f933 jdk7u72-b09
++b63b6992ddd27688e276100be436bcf52e0525bc jdk7u72-b10
++65c68241236ab792fe72119a0b4c29effd048904 jdk7u72-b11
++cc58d9704b4017efe9ebe4391d73d82c0caf6d1c jdk7u72-b12
++cade57461d3b90a59ec62c06d77068b1b73f05b2 jdk7u72-b13
++6106b56a874e19e603660a09d506fe8afcde9e14 jdk7u72-b14
++7a09f7596c8bb17d3b25b4506dd76425f6efb15e jdk7u72-b30
++de0088aaf97fa861be8c17e97b57139287068c86 jdk7u72-b31
++0138c5f55af0c700882deeac4411fbd9118b4d6e jdk7u75-b00
++7ecfdbf693cfc14d648ebdf2cc87716068569e8d jdk7u75-b01
++688a304d3215af8104336ecce50b7f4edfb88d36 jdk7u75-b02
++105ad2d2417515b2b595c151e2a5d8ae0fe729eb jdk7u75-b03
++bdbe862f8846558c83f8bc15518446ab0495a173 jdk7u75-b04
++1895dc97d832950fe13a16428b797c952c9e4f4a jdk7u75-b05
++5fcea7a0e4f1e3fa52bd6010e685098731966933 jdk7u75-b06
++2e1c7e887c37dd702b2d09a00dacbafd79604e8c jdk7u75-b07
++fe8e75540f0990c6ad9d060c2343ef896cb5bc19 jdk7u75-b08
++512d77cd143798615266314c72c00ee32500661c jdk7u75-b09
++d77d44ecfb980610de2c90446fab13910ed2c8d7 jdk7u75-b10
++b5554ad39fa33c17033931a4ef5564a9b9d88f05 jdk7u75-b11
++6f369f5322618b48225eebcde52ab9dfa552e286 jdk7u75-b12
++7eb2663b7feb537ca765747e7bd0128245812c64 jdk7u75-b13
++059a87205fda11b19d25ace75698a854aa8edbf3 jdk7u75-b30
++591a7e4cabb5c5efc3ec65128181b38b1fa44a96 jdk7u75-b31
++e77dbc24fcdb5c55f414459798e4c65ed75bf570 jdk7u76-b00
++17aaafb2d1ecb6e2dac5e05cb3198703737e623a jdk7u76-b01
++da47e39ce6680458be011936b89f0946b9587042 jdk7u76-b02
++19a2140056ce1bfa3b6b332d168ad1208bfed1ae jdk7u76-b03
++76969bec514e11903a321f556f38c3be4c2320cf jdk7u76-b04
++ae19a85e5b3864b49b123f54b72de93d13722439 jdk7u76-b05
++b981c087098c8c18f5d2632c02a680ef036217c4 jdk7u76-b06
++b09339e2ca2ac75e5ca29e980eac2e7866e463aa jdk7u76-b07
++23a0bb20d74919861201d0d73cd612cabfd8f1f2 jdk7u76-b08
++853bb5d480cab85c9f9f67ff86f8cb95c31e4885 jdk7u76-b09
++11ca0f4b0c56817f6ad302022e6414aa52582f16 jdk7u76-b10
++63c1f23bddcfc45835f224376525ec621ac73a96 jdk7u76-b11
++f0a6f4f62959a43e21d377436e3e60f6431ee5b4 jdk7u76-b12
++d9e79541170f453dda964319f268fdad80dce9d7 jdk7u76-b13
++24f0420bb212b05d572689bae8ec2d232b9ac5a0 jdk7u76-b30
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Mon Sep 08 12:17:52 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Mon Jan 05 12:00:55 2015 -0800
+@@ -426,7 +426,7 @@
+ head.addContent(headComment);
+ }
+ if (configuration.charset.length() > 0) {
+- Content meta = HtmlTree.META("Content-Type", "text/html",
++ Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
+ configuration.charset);
+ head.addContent(meta);
+ }
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java Mon Sep 08 12:17:52 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java Mon Jan 05 12:00:55 2015 -0800
+@@ -35,7 +35,6 @@
+ BORDER,
+ CELLPADDING,
+ CELLSPACING,
+- CHARSET,
+ CLASS,
+ CLEAR,
+ COLS,
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Mon Sep 08 12:17:52 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Mon Jan 05 12:00:55 2015 -0800
+@@ -44,6 +44,8 @@
+ */
+ public abstract class HtmlDocWriter extends HtmlWriter {
+
++ public static final String CONTENT_TYPE = "text/html";
++
+ /**
+ * Constructor. Initializes the destination file name through the super
+ * class HtmlWriter.
+@@ -330,7 +332,7 @@
+ head.addContent(headComment);
+ }
+ if (configuration.charset.length() > 0) {
+- Content meta = HtmlTree.META("Content-Type", "text/html",
++ Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
+ configuration.charset);
+ head.addContent(meta);
+ }
+--- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Mon Sep 08 12:17:52 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Mon Jan 05 12:00:55 2015 -0800
+@@ -471,9 +471,9 @@
+ */
+ public static HtmlTree META(String httpEquiv, String content, String charSet) {
+ HtmlTree htmltree = new HtmlTree(HtmlTag.META);
++ String contentCharset = content + "; charset=" + charSet;
+ htmltree.addAttr(HtmlAttr.HTTP_EQUIV, nullCheck(httpEquiv));
+- htmltree.addAttr(HtmlAttr.CONTENT, nullCheck(content));
+- htmltree.addAttr(HtmlAttr.CHARSET, nullCheck(charSet));
++ htmltree.addAttr(HtmlAttr.CONTENT, contentCharset);
+ return htmltree;
+ }
+
+--- ./langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Mon Sep 08 12:17:52 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Mon Jan 05 12:00:55 2015 -0800
+@@ -1067,7 +1067,7 @@
+ boolean testFirst) {
+ Env<GenContext> loopEnv = env.dup(loop, new GenContext());
+ int startpc = code.entryPoint();
+- if (testFirst) {
++ if (testFirst) { //while or for loop
+ CondItem c;
+ if (cond != null) {
+ code.statBegin(cond.pos);
+@@ -1097,6 +1097,9 @@
+ code.resolve(c.falseJumps);
+ }
+ code.resolve(loopEnv.info.exit);
++ if (loopEnv.info.exit != null) {
++ loopEnv.info.exit.state.defined.excludeFrom(code.nextreg);
++ }
+ }
+
+ public void visitForeachLoop(JCEnhancedForLoop tree) {
+--- ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Mon Sep 08 12:17:52 2014 -0700
++++ ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties Mon Jan 05 12:00:55 2015 -0800
+@@ -37,7 +37,7 @@
+ javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B
+ javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
+ javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+-javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
++javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+ javac.opt.processorpath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
+ javac.opt.processor=\u5B9F\u884C\u3059\u308B\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u540D\u524D\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u691C\u51FA\u51E6\u7406\u3092\u30D0\u30A4\u30D1\u30B9
+ javac.opt.proc.none.only=\u6CE8\u91C8\u51E6\u7406\u3084\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/test/com/sun/javadoc/testCharset/TestCharset.java Mon Jan 05 12:00:55 2015 -0800
+@@ -0,0 +1,82 @@
++/*
++ * 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 7052170
++ * @summary Run a test on -charset to make sure the charset gets generated as a
++ * part of the meta tag.
++ * @author Bhavesh Patel
++ * @library ../lib/
++ * @build JavadocTester TestCharset
++ * @run main TestCharset
++ */
++
++public class TestCharset extends JavadocTester {
++
++ //Test information.
++ private static final String BUG_ID = "7052170";
++
++ //Javadoc arguments.
++ private static final String[] ARGS = new String[] {
++ "-d", BUG_ID, "-charset", "UTF-8", "-sourcepath", SRC_DIR, "pkg"
++ };
++
++ private static final String[][] TEST = {
++ {BUG_ID + FS + "index.html",
++ "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"},
++ {BUG_ID + FS + "pkg" + FS + "Foo.html",
++ "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"}
++ };
++
++ private static final String[][] NEGATED_TEST = {
++ {BUG_ID + FS + "index.html",
++ "<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"UTF-8\">"},
++ {BUG_ID + FS + "pkg" + FS + "Foo.html",
++ "<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"UTF-8\">"}
++ };
++
++ /**
++ * The entry point of the test.
++ * @param args the array of command line arguments.
++ */
++ public static void main(String[] args) {
++ TestCharset tester = new TestCharset();
++ run(tester, ARGS, TEST, NEGATED_TEST);
++ tester.printSummary();
++ }
++
++ /**
++ * {@inheritDoc}
++ */
++ public String getBugId() {
++ return BUG_ID;
++ }
++
++ /**
++ * {@inheritDoc}
++ */
++ public String getBugName() {
++ return getClass().getName();
++ }
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/test/com/sun/javadoc/testCharset/pkg/Foo.java Mon Jan 05 12:00:55 2015 -0800
+@@ -0,0 +1,26 @@
++/*
++ * 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.
++ */
++
++package pkg;
++
++public class Foo {}
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh Mon Sep 08 12:17:52 2014 -0700
++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh Mon Jan 05 12:00:55 2015 -0800
+@@ -56,11 +56,17 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | Darwin )
+ FS="/"
++ CHMOD="${FS}bin${FS}chmod"
+ ;;
+ Windows* )
+ FS="\\"
++ CHMOD="chmod"
++ ;;
++ CYGWIN* )
++ FS="/"
++ CHMOD="chmod"
+ ;;
+ * )
+ echo "Unrecognized system!"
+@@ -73,6 +79,7 @@
+ cleanup() {
+ rm -f *.class pkg${FS}*.class foo${FS}pkg${FS}*.class bar${FS}pkg${FS}*.class
+ cp -rf $TESTSRC${FS}* .
++ ${CHMOD} -R u+w *
+ }
+
+ fail() {
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/test/tools/javac/T8050386/WrongStackframeGenerationTest1.java Mon Jan 05 12:00:55 2015 -0800
+@@ -0,0 +1,47 @@
++/*
++ * 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 8050386
++ * @summary Verification error due to a bad stackmap frame generated by javac
++ */
++
++public class WrongStackframeGenerationTest1 {
++ public static void main(String[] args) {}
++
++ static void foo(){
++ while (true) {
++ int i = 0;
++ break;
++ }
++ switch (1) {
++ case 1:
++ int j = 0;
++ case 2:
++ bar();
++ }
++ }
++
++ static void bar() {}
++}
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./langtools/test/tools/javac/T8050386/WrongStackframeGenerationTest2.java Mon Jan 05 12:00:55 2015 -0800
+@@ -0,0 +1,50 @@
++/*
++ * 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 8050386
++ * @summary Verification error due to a bad stackmap frame generated by javac
++ */
++
++public class WrongStackframeGenerationTest2 {
++ public static void main(String[] args) {}
++
++ static void foo() {
++ int len;
++ for (;;) {
++ try {
++ len = 1;
++ break;
++ } catch (Exception e) {
++ }
++ }
++
++ try {
++ if (len == -1) {
++ len = 0;
++ }
++ } finally {
++ }
++ }
++}
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh Mon Sep 08 12:17:52 2014 -0700
++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh Mon Jan 05 12:00:55 2015 -0800
+@@ -71,3 +71,4 @@
+ "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . -sourcepath src src/x/B.java src/x/C.java src/y/Main.java
+ rm y/R3.class
+ "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . -sourcepath src src/y/Main.java
++rm -fr src
diff --git a/java/openjdk7/files/patch-bsd b/java/openjdk7/files/patch-bsd
new file mode 100644
index 000000000000..4725ec6455cc
--- /dev/null
+++ b/java/openjdk7/files/patch-bsd
@@ -0,0 +1,48109 @@
+--- ./.hgtags Thu Dec 18 14:04:37 2014 -0800
++++ ./.hgtags Sat Jan 24 11:28:38 2015 -0800
+@@ -123,6 +123,7 @@
+ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
+ 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
+ d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
++00b623147f23ef8a92a25c4c28ef8681dc1d1b52 7u0
+ 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
+ bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
+ f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
+@@ -552,3 +554,4 @@
+ fc18a1bf57b62578466a4de68314bba79721c8fd jdk7u76-b10
+ 4f5b251f1daa41a9143636a9b8aaf0cf4ce00f26 jdk7u76-b11
+ 01d1d34f82f30de97a61f8b0048c61aa17d0dd12 jdk7u76-b12
++a9728fbea214dbf6f58567e729fdc5276f3c704f jdk7u76-b13
+--- ./corba/.hgtags Thu Dec 18 14:05:07 2014 -0800
++++ ./corba/.hgtags Sat Jan 24 11:28:39 2015 -0800
+@@ -123,6 +123,7 @@
+ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
+ 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
+ 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
++578c4d2c534cc761f5f5cc0d8360471bb8d5f94f 7u0
+ 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
+ dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
+ eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
+@@ -554,3 +556,4 @@
+ b10583d82c01a621beb89a4a8e0f4830cdda703b jdk7u76-b10
+ c947bf709139b13476a1df4ca8a92583fb1de5a4 jdk7u76-b11
+ 14f0846f4d1b8373e3e3cce10901f37341bf6980 jdk7u76-b12
++0db41b697138ce89f15c49eef1dc670f94a27d89 jdk7u76-b13
+--- ./hotspot/.hgtags Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/.hgtags Sun Jan 25 08:30:35 2015 -0800
+@@ -182,6 +182,7 @@
+ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
+ 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
+ 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17
++f1a18ada5853af49fce54d43dd5a5b67dc291470 7u0
+ 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
+ 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
+ 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
+@@ -779,3 +781,4 @@
+ 82b681cadc354b08b0aa2858d9b7f78576a8c1a4 jdk7u76-b10
+ fd16bf65cfed7208af5740977a6699d18ac103b2 jdk7u76-b11
+ e375023d196199ffb263cb15739f7218e1621be6 jdk7u76-b12
++a395c29532e5322657c542d54dd957940cf2f523 jdk7u76-b13
+--- ./hotspot/agent/src/os/bsd/ps_proc.c Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/agent/src/os/bsd/ps_proc.c Sun Jan 25 08:30:35 2015 -0800
+@@ -131,7 +131,7 @@
+
+ static bool ptrace_continue(pid_t pid, int signal) {
+ // pass the signal to the process so we don't swallow it
+- if (ptrace(PTRACE_CONT, pid, NULL, signal) < 0) {
++ if (ptrace(PT_CONTINUE, pid, NULL, signal) < 0) {
+ print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid);
+ return false;
+ }
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sun Jan 25 08:30:35 2015 -0800
+@@ -33,6 +33,7 @@
+ import sun.jvm.hotspot.debugger.remote.*;
+ import sun.jvm.hotspot.debugger.windbg.*;
+ import sun.jvm.hotspot.debugger.linux.*;
++import sun.jvm.hotspot.debugger.bsd.*;
+ import sun.jvm.hotspot.memory.*;
+ import sun.jvm.hotspot.oops.*;
+ import sun.jvm.hotspot.runtime.*;
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Sun Jan 25 08:30:35 2015 -0800
+@@ -35,6 +35,7 @@
+ import sun.jvm.hotspot.debugger.windbg.*;
+ import sun.jvm.hotspot.debugger.linux.*;
+ import sun.jvm.hotspot.debugger.sparc.*;
++import sun.jvm.hotspot.debugger.bsd.*;
+ import sun.jvm.hotspot.debugger.remote.*;
+ import sun.jvm.hotspot.livejvm.*;
+ import sun.jvm.hotspot.memory.*;
+--- ./hotspot/make/bsd/Makefile Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/bsd/Makefile Sun Jan 25 08:30:35 2015 -0800
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -211,6 +211,8 @@
+ BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) LIBRARY_SUFFIX=$(LIBRARY_SUFFIX)
+ BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
+
++BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
++
+ BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
+
+ #-------------------------------------------------------------------------------
+@@ -337,9 +339,11 @@
+
+ # Doc target. This is the same for all build options.
+ # Hence create a docs directory beside ...$(ARCH)_[...]
++# We specify 'BUILD_FLAVOR=product' so that the proper
++# ENABLE_FULL_DEBUG_SYMBOLS value is used.
+ docs: checks
+ $(QUIETLY) mkdir -p $(SUBDIR_DOCS)
+- $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs
++ $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
+
+ # Synonyms for win32-like targets.
+ compiler2: jvmg product
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sun Jan 25 08:30:35 2015 -0800
+@@ -1,12 +1,28 @@
+ #!/bin/sh
+
+ # If we're cross compiling use that path for nm
+-if [ "$CROSS_COMPILE_ARCH" != "" ]; then
+-NM=$ALT_COMPILER_PATH/nm
++if [ "$CROSS_COMPILE_ARCH" != "" ]; then
++ NM=$ALT_COMPILER_PATH/nm
+ else
+-NM=nm
++ NM=nm
+ fi
+
+-$NM -Uj $* | awk '
+- { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 }
+- '
++case "$(uname -s)" in
++Darwin )
++ $NM -Uj $@ | awk '{
++ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3
++ }' ;;
++OpenBSD )
++ $NM $@ | awk '{
++ if ($2 == "U") next
++ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";"
++ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";"
++ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
++ }' | sort -u ;;
++* )
++ $NM --defined-only $@ | awk '{
++ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";"
++ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";"
++ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
++ }' | sort -u ;;
++esac
+--- ./hotspot/make/bsd/makefiles/buildtree.make Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/bsd/makefiles/buildtree.make Sun Jan 25 08:30:35 2015 -0800
+@@ -255,6 +255,16 @@
+ echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
+ [ -n "$(CFLAGS_BROWSE)" ] && \
+ echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \
++ [ -n "$(ENABLE_FULL_DEBUG_SYMBOLS)" ] && \
++ echo && echo "ENABLE_FULL_DEBUG_SYMBOLS = $(ENABLE_FULL_DEBUG_SYMBOLS)"; \
++ [ -n "$(OBJCOPY)" ] && \
++ echo && echo "OBJCOPY = $(OBJCOPY)"; \
++ [ -n "$(STRIP_POLICY)" ] && \
++ echo && echo "STRIP_POLICY = $(STRIP_POLICY)"; \
++ [ -n "$(ZIP_DEBUGINFO_FILES)" ] && \
++ echo && echo "ZIP_DEBUGINFO_FILES = $(ZIP_DEBUGINFO_FILES)"; \
++ [ -n "$(ZIPEXE)" ] && \
++ echo && echo "ZIPEXE = $(ZIPEXE)"; \
+ [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
+ echo && \
+ echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
+@@ -384,7 +394,7 @@
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo "JDK=${JAVA_HOME}"; \
+- ) > $@
++ ) > $@
+
+ .dbxrc: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+--- ./hotspot/make/bsd/makefiles/gcc.make Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/bsd/makefiles/gcc.make Sun Jan 25 08:30:35 2015 -0800
+@@ -117,7 +117,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"
+@@ -215,7 +218,11 @@
+
+ # Flags for generating make dependency flags.
+ ifneq ("${CC_VER_MAJOR}", "2")
+-DEPFLAGS = -fpch-deps -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
++DEPFLAGS =
++ifeq (,$(findstring clang,$(shell $(CC) -v 2>&1)))
++DEPFLAGS += -fpch-deps
++endif
++DEPFLAGS += -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
+ endif
+
+ # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
+--- ./hotspot/make/bsd/makefiles/jsig.make Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/bsd/makefiles/jsig.make Sun Jan 25 08:30:35 2015 -0800
+@@ -36,9 +36,16 @@
+ LIBJSIG_G = lib$(JSIG_G).so
+ endif
+
++LIBJSIG_DEBUGINFO = lib$(JSIG).debuginfo
++LIBJSIG_DIZ = lib$(JSIG).diz
++LIBJSIG_G_DEBUGINFO = lib$(JSIG_G).debuginfo
++LIBJSIG_G_DIZ = lib$(JSIG_G).diz
++
+ JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
+
+ DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG)
++DEST_JSIG_DEBUGINFO = $(JDK_LIBDIR)/$(LIBJSIG_DEBUGINFO)
++DEST_JSIG_DIZ = $(JDK_LIBDIR)/$(LIBJSIG_DIZ)
+
+ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
+
+@@ -57,11 +64,33 @@
+ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
+ @echo Making signal interposition lib...
+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
++ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
+ $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
++ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
++ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
++ ifeq ($(STRIP_POLICY),all_strip)
++ $(QUIETLY) $(STRIP) $@
++ else
++ ifeq ($(STRIP_POLICY),min_strip)
++ $(QUIETLY) $(STRIP) -S $@
++ # implied else here is no stripping at all
++ endif
++ endif
++ [ -f $(LIBJSIG_G_DEBUGINFO) ] || { ln -s $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO); }
++ ifeq ($(ZIP_DEBUGINFO_FILES),1)
++ $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO)
++ $(RM) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO)
++ [ -f $(LIBJSIG_G_DIZ) ] || { ln -s $(LIBJSIG_DIZ) $(LIBJSIG_G_DIZ); }
++ endif
++endif
+
+ install_jsig: $(LIBJSIG)
+ @echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
++ $(QUIETLY) test -f $(LIBJSIG_DEBUGINFO) && \
++ cp -f $(LIBJSIG_DEBUGINFO) $(DEST_JSIG_DEBUGINFO)
++ $(QUIETLY) test -f $(LIBJSIG_DIZ) && \
++ cp -f $(LIBJSIG_DIZ) $(DEST_JSIG_DIZ)
+ $(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
+
+ .PHONY: install_jsig
+--- ./hotspot/make/bsd/makefiles/launcher.make Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/bsd/makefiles/launcher.make Sun Jan 25 08:30:35 2015 -0800
+@@ -50,7 +50,7 @@
+ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
+ else
+ LAUNCHER.o = launcher.o
+- LFLAGS_LAUNCHER += -L`pwd`
++ LFLAGS_LAUNCHER += -L`pwd`
+
+ # 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 Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sun Jan 25 08:30:35 2015 -0800
+@@ -19,237 +19,248 @@
+ # 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.
++#
+ #
+-#
+-# Only used for OSX/Darwin builds
+
+ # Define public interface.
+- # _JNI
+- _JNI_CreateJavaVM
+- _JNI_GetCreatedJavaVMs
+- _JNI_GetDefaultJavaVMInitArgs
+
+- # _JVM
+- _JVM_Accept
+- _JVM_ActiveProcessorCount
+- _JVM_AllocateNewArray
+- _JVM_AllocateNewObject
+- _JVM_ArrayCopy
+- _JVM_AssertionStatusDirectives
+- _JVM_Available
+- _JVM_Bind
+- _JVM_ClassDepth
+- _JVM_ClassLoaderDepth
+- _JVM_Clone
+- _JVM_Close
+- _JVM_CX8Field
+- _JVM_CompileClass
+- _JVM_CompileClasses
+- _JVM_CompilerCommand
+- _JVM_Connect
+- _JVM_ConstantPoolGetClassAt
+- _JVM_ConstantPoolGetClassAtIfLoaded
+- _JVM_ConstantPoolGetDoubleAt
+- _JVM_ConstantPoolGetFieldAt
+- _JVM_ConstantPoolGetFieldAtIfLoaded
+- _JVM_ConstantPoolGetFloatAt
+- _JVM_ConstantPoolGetIntAt
+- _JVM_ConstantPoolGetLongAt
+- _JVM_ConstantPoolGetMethodAt
+- _JVM_ConstantPoolGetMethodAtIfLoaded
+- _JVM_ConstantPoolGetMemberRefInfoAt
+- _JVM_ConstantPoolGetSize
+- _JVM_ConstantPoolGetStringAt
+- _JVM_ConstantPoolGetUTF8At
+- _JVM_CountStackFrames
+- _JVM_CurrentClassLoader
+- _JVM_CurrentLoadedClass
+- _JVM_CurrentThread
+- _JVM_CurrentTimeMillis
+- _JVM_DefineClass
+- _JVM_DefineClassWithSource
+- _JVM_DefineClassWithSourceCond
+- _JVM_DesiredAssertionStatus
+- _JVM_DisableCompiler
+- _JVM_DoPrivileged
+- _JVM_DTraceGetVersion
+- _JVM_DTraceActivate
+- _JVM_DTraceIsProbeEnabled
+- _JVM_DTraceIsSupported
+- _JVM_DTraceDispose
+- _JVM_DumpAllStacks
+- _JVM_DumpThreads
+- _JVM_EnableCompiler
+- _JVM_Exit
+- _JVM_FillInStackTrace
+- _JVM_FindClassFromCaller
+- _JVM_FindClassFromClass
+- _JVM_FindClassFromClassLoader
+- _JVM_FindClassFromBootLoader
+- _JVM_FindLibraryEntry
+- _JVM_FindLoadedClass
+- _JVM_FindPrimitiveClass
+- _JVM_FindSignal
+- _JVM_FreeMemory
+- _JVM_GC
+- _JVM_GetAllThreads
+- _JVM_GetArrayElement
+- _JVM_GetArrayLength
+- _JVM_GetCPClassNameUTF
+- _JVM_GetCPFieldClassNameUTF
+- _JVM_GetCPFieldModifiers
+- _JVM_GetCPFieldNameUTF
+- _JVM_GetCPFieldSignatureUTF
+- _JVM_GetCPMethodClassNameUTF
+- _JVM_GetCPMethodModifiers
+- _JVM_GetCPMethodNameUTF
+- _JVM_GetCPMethodSignatureUTF
+- _JVM_GetCallerClass
+- _JVM_GetClassAccessFlags
+- _JVM_GetClassAnnotations
+- _JVM_GetClassCPEntriesCount
+- _JVM_GetClassCPTypes
+- _JVM_GetClassConstantPool
+- _JVM_GetClassContext
+- _JVM_GetClassDeclaredConstructors
+- _JVM_GetClassDeclaredFields
+- _JVM_GetClassDeclaredMethods
+- _JVM_GetClassFieldsCount
+- _JVM_GetClassInterfaces
+- _JVM_GetClassLoader
+- _JVM_GetClassMethodsCount
+- _JVM_GetClassModifiers
+- _JVM_GetClassName
+- _JVM_GetClassNameUTF
+- _JVM_GetClassSignature
+- _JVM_GetClassSigners
+- _JVM_GetComponentType
+- _JVM_GetDeclaredClasses
+- _JVM_GetDeclaringClass
+- _JVM_GetEnclosingMethodInfo
+- _JVM_GetFieldAnnotations
+- _JVM_GetFieldIxModifiers
+- _JVM_GetHostName
+- _JVM_GetInheritedAccessControlContext
+- _JVM_GetInterfaceVersion
+- _JVM_GetLastErrorString
+- _JVM_GetManagement
+- _JVM_GetMethodAnnotations
+- _JVM_GetMethodDefaultAnnotationValue
+- _JVM_GetMethodIxArgsSize
+- _JVM_GetMethodIxByteCode
+- _JVM_GetMethodIxByteCodeLength
+- _JVM_GetMethodIxExceptionIndexes
+- _JVM_GetMethodIxExceptionTableEntry
+- _JVM_GetMethodIxExceptionTableLength
+- _JVM_GetMethodIxExceptionsCount
+- _JVM_GetMethodIxLocalsCount
+- _JVM_GetMethodIxMaxStack
+- _JVM_GetMethodIxModifiers
+- _JVM_GetMethodIxNameUTF
+- _JVM_GetMethodIxSignatureUTF
+- _JVM_GetMethodParameterAnnotations
+- _JVM_GetPrimitiveArrayElement
+- _JVM_GetProtectionDomain
+- _JVM_GetSockName
+- _JVM_GetSockOpt
+- _JVM_GetStackAccessControlContext
+- _JVM_GetStackTraceDepth
+- _JVM_GetStackTraceElement
+- _JVM_GetSystemPackage
+- _JVM_GetSystemPackages
+- _JVM_GetTemporaryDirectory
+- _JVM_GetThreadStateNames
+- _JVM_GetThreadStateValues
+- _JVM_GetVersionInfo
+- _JVM_Halt
+- _JVM_HoldsLock
+- _JVM_IHashCode
+- _JVM_InitAgentProperties
+- _JVM_InitProperties
+- _JVM_InitializeCompiler
+- _JVM_InitializeSocketLibrary
+- _JVM_InternString
+- _JVM_Interrupt
+- _JVM_InvokeMethod
+- _JVM_IsArrayClass
+- _JVM_IsConstructorIx
+- _JVM_IsInterface
+- _JVM_IsInterrupted
+- _JVM_IsNaN
+- _JVM_IsPrimitiveClass
+- _JVM_IsSameClassPackage
+- _JVM_IsSilentCompiler
+- _JVM_IsSupportedJNIVersion
+- _JVM_IsThreadAlive
+- _JVM_LatestUserDefinedLoader
+- _JVM_Listen
+- _JVM_LoadClass0
+- _JVM_LoadLibrary
+- _JVM_Lseek
+- _JVM_MaxObjectInspectionAge
+- _JVM_MaxMemory
+- _JVM_MonitorNotify
+- _JVM_MonitorNotifyAll
+- _JVM_MonitorWait
+- _JVM_NanoTime
+- _JVM_NativePath
+- _JVM_NewArray
+- _JVM_NewInstanceFromConstructor
+- _JVM_NewMultiArray
+- _JVM_OnExit
+- _JVM_Open
+- _JVM_PrintStackTrace
+- _JVM_RaiseSignal
+- _JVM_RawMonitorCreate
+- _JVM_RawMonitorDestroy
+- _JVM_RawMonitorEnter
+- _JVM_RawMonitorExit
+- _JVM_Read
+- _JVM_Recv
+- _JVM_RecvFrom
+- _JVM_RegisterSignal
+- _JVM_ReleaseUTF
+- _JVM_ResolveClass
+- _JVM_ResumeThread
+- _JVM_Send
+- _JVM_SendTo
+- _JVM_SetArrayElement
+- _JVM_SetClassSigners
+- _JVM_SetLength
+- _JVM_SetNativeThreadName
+- _JVM_SetPrimitiveArrayElement
+- _JVM_SetProtectionDomain
+- _JVM_SetSockOpt
+- _JVM_SetThreadPriority
+- _JVM_Sleep
+- _JVM_Socket
+- _JVM_SocketAvailable
+- _JVM_SocketClose
+- _JVM_SocketShutdown
+- _JVM_StartThread
+- _JVM_StopThread
+- _JVM_SuspendThread
+- _JVM_SupportsCX8
+- _JVM_Sync
+- _JVM_Timeout
+- _JVM_TotalMemory
+- _JVM_TraceInstructions
+- _JVM_TraceMethodCalls
+- _JVM_UnloadLibrary
+- _JVM_Write
+- _JVM_Yield
+- _JVM_handle_bsd_signal
++SUNWprivate_1.1 {
++ global:
++ # JNI
++ JNI_CreateJavaVM;
++ JNI_GetCreatedJavaVMs;
++ JNI_GetDefaultJavaVMInitArgs;
++
++ # JVM
++ JVM_Accept;
++ JVM_ActiveProcessorCount;
++ JVM_AllocateNewArray;
++ JVM_AllocateNewObject;
++ JVM_ArrayCopy;
++ JVM_AssertionStatusDirectives;
++ JVM_Available;
++ JVM_Bind;
++ JVM_ClassDepth;
++ JVM_ClassLoaderDepth;
++ JVM_Clone;
++ JVM_Close;
++ JVM_CX8Field;
++ JVM_CompileClass;
++ JVM_CompileClasses;
++ JVM_CompilerCommand;
++ JVM_Connect;
++ JVM_ConstantPoolGetClassAt;
++ JVM_ConstantPoolGetClassAtIfLoaded;
++ JVM_ConstantPoolGetDoubleAt;
++ JVM_ConstantPoolGetFieldAt;
++ JVM_ConstantPoolGetFieldAtIfLoaded;
++ JVM_ConstantPoolGetFloatAt;
++ JVM_ConstantPoolGetIntAt;
++ JVM_ConstantPoolGetLongAt;
++ JVM_ConstantPoolGetMethodAt;
++ JVM_ConstantPoolGetMethodAtIfLoaded;
++ JVM_ConstantPoolGetMemberRefInfoAt;
++ JVM_ConstantPoolGetSize;
++ JVM_ConstantPoolGetStringAt;
++ JVM_ConstantPoolGetUTF8At;
++ JVM_CountStackFrames;
++ JVM_CurrentClassLoader;
++ JVM_CurrentLoadedClass;
++ JVM_CurrentThread;
++ JVM_CurrentTimeMillis;
++ JVM_DefineClass;
++ JVM_DefineClassWithSource;
++ JVM_DefineClassWithSourceCond;
++ JVM_DesiredAssertionStatus;
++ JVM_DisableCompiler;
++ JVM_DoPrivileged;
++ JVM_DTraceGetVersion;
++ JVM_DTraceActivate;
++ JVM_DTraceIsProbeEnabled;
++ JVM_DTraceIsSupported;
++ JVM_DTraceDispose;
++ JVM_DumpAllStacks;
++ JVM_DumpThreads;
++ JVM_EnableCompiler;
++ JVM_Exit;
++ JVM_FillInStackTrace;
++ JVM_FindClassFromCaller;
++ JVM_FindClassFromClass;
++ JVM_FindClassFromClassLoader;
++ JVM_FindClassFromBootLoader;
++ JVM_FindLibraryEntry;
++ JVM_FindLoadedClass;
++ JVM_FindPrimitiveClass;
++ JVM_FindSignal;
++ JVM_FreeMemory;
++ JVM_GC;
++ JVM_GetAllThreads;
++ JVM_GetArrayElement;
++ JVM_GetArrayLength;
++ JVM_GetCPClassNameUTF;
++ JVM_GetCPFieldClassNameUTF;
++ JVM_GetCPFieldModifiers;
++ JVM_GetCPFieldNameUTF;
++ JVM_GetCPFieldSignatureUTF;
++ JVM_GetCPMethodClassNameUTF;
++ JVM_GetCPMethodModifiers;
++ JVM_GetCPMethodNameUTF;
++ JVM_GetCPMethodSignatureUTF;
++ JVM_GetCallerClass;
++ JVM_GetClassAccessFlags;
++ JVM_GetClassAnnotations;
++ JVM_GetClassCPEntriesCount;
++ JVM_GetClassCPTypes;
++ JVM_GetClassConstantPool;
++ JVM_GetClassContext;
++ JVM_GetClassDeclaredConstructors;
++ JVM_GetClassDeclaredFields;
++ JVM_GetClassDeclaredMethods;
++ JVM_GetClassFieldsCount;
++ JVM_GetClassInterfaces;
++ JVM_GetClassLoader;
++ JVM_GetClassMethodsCount;
++ JVM_GetClassModifiers;
++ JVM_GetClassName;
++ JVM_GetClassNameUTF;
++ JVM_GetClassSignature;
++ JVM_GetClassSigners;
++ JVM_GetComponentType;
++ JVM_GetDeclaredClasses;
++ JVM_GetDeclaringClass;
++ JVM_GetEnclosingMethodInfo;
++ JVM_GetFieldAnnotations;
++ JVM_GetFieldIxModifiers;
++ JVM_GetHostName;
++ JVM_GetInheritedAccessControlContext;
++ JVM_GetInterfaceVersion;
++ JVM_GetLastErrorString;
++ JVM_GetManagement;
++ JVM_GetMethodAnnotations;
++ JVM_GetMethodDefaultAnnotationValue;
++ JVM_GetMethodIxArgsSize;
++ JVM_GetMethodIxByteCode;
++ JVM_GetMethodIxByteCodeLength;
++ JVM_GetMethodIxExceptionIndexes;
++ JVM_GetMethodIxExceptionTableEntry;
++ JVM_GetMethodIxExceptionTableLength;
++ JVM_GetMethodIxExceptionsCount;
++ JVM_GetMethodIxLocalsCount;
++ JVM_GetMethodIxMaxStack;
++ JVM_GetMethodIxModifiers;
++ JVM_GetMethodIxNameUTF;
++ JVM_GetMethodIxSignatureUTF;
++ JVM_GetMethodParameterAnnotations;
++ JVM_GetPrimitiveArrayElement;
++ JVM_GetProtectionDomain;
++ JVM_GetSockName;
++ JVM_GetSockOpt;
++ JVM_GetStackAccessControlContext;
++ JVM_GetStackTraceDepth;
++ JVM_GetStackTraceElement;
++ JVM_GetSystemPackage;
++ JVM_GetSystemPackages;
++ JVM_GetTemporaryDirectory;
++ JVM_GetThreadStateNames;
++ JVM_GetThreadStateValues;
++ JVM_GetVersionInfo;
++ JVM_Halt;
++ JVM_HoldsLock;
++ JVM_IHashCode;
++ JVM_InitAgentProperties;
++ JVM_InitProperties;
++ JVM_InitializeCompiler;
++ JVM_InitializeSocketLibrary;
++ JVM_InternString;
++ JVM_Interrupt;
++ JVM_InvokeMethod;
++ JVM_IsArrayClass;
++ JVM_IsConstructorIx;
++ JVM_IsInterface;
++ JVM_IsInterrupted;
++ JVM_IsNaN;
++ JVM_IsPrimitiveClass;
++ JVM_IsSameClassPackage;
++ JVM_IsSilentCompiler;
++ JVM_IsSupportedJNIVersion;
++ JVM_IsThreadAlive;
++ JVM_LatestUserDefinedLoader;
++ JVM_Listen;
++ JVM_LoadClass0;
++ JVM_LoadLibrary;
++ JVM_Lseek;
++ JVM_MaxObjectInspectionAge;
++ JVM_MaxMemory;
++ JVM_MonitorNotify;
++ JVM_MonitorNotifyAll;
++ JVM_MonitorWait;
++ JVM_NanoTime;
++ JVM_NativePath;
++ JVM_NewArray;
++ JVM_NewInstanceFromConstructor;
++ JVM_NewMultiArray;
++ JVM_OnExit;
++ JVM_Open;
++ JVM_PrintStackTrace;
++ JVM_RaiseSignal;
++ JVM_RawMonitorCreate;
++ JVM_RawMonitorDestroy;
++ JVM_RawMonitorEnter;
++ JVM_RawMonitorExit;
++ JVM_Read;
++ JVM_Recv;
++ JVM_RecvFrom;
++ JVM_RegisterSignal;
++ JVM_ReleaseUTF;
++ JVM_ResolveClass;
++ JVM_ResumeThread;
++ JVM_Send;
++ JVM_SendTo;
++ JVM_SetArrayElement;
++ JVM_SetClassSigners;
++ JVM_SetLength;
++ JVM_SetNativeThreadName;
++ JVM_SetPrimitiveArrayElement;
++ JVM_SetProtectionDomain;
++ JVM_SetSockOpt;
++ JVM_SetThreadPriority;
++ JVM_Sleep;
++ JVM_Socket;
++ JVM_SocketAvailable;
++ JVM_SocketClose;
++ JVM_SocketShutdown;
++ JVM_StartThread;
++ JVM_StopThread;
++ JVM_SuspendThread;
++ JVM_SupportsCX8;
++ JVM_Sync;
++ JVM_Timeout;
++ JVM_TotalMemory;
++ JVM_TraceInstructions;
++ JVM_TraceMethodCalls;
++ JVM_UnloadLibrary;
++ JVM_Write;
++ JVM_Yield;
++ JVM_handle_bsd_signal;
+
+ # miscellaneous functions
+- _jio_fprintf
+- _jio_printf
+- _jio_snprintf
+- _jio_vfprintf
+- _jio_vsnprintf
++ jio_fprintf;
++ jio_printf;
++ jio_snprintf;
++ jio_vfprintf;
++ jio_vsnprintf;
++ fork1;
++ numa_warn;
++ numa_error;
++
++ # Needed because there is no JVM interface for this.
++ sysThreadAvailableStackWithSlack;
+
+ # This is for Forte Analyzer profiling support.
+- _AsyncGetCallTrace
++ AsyncGetCallTrace;
+
+- # INSERT VTABLE SYMBOLS HERE
++ # INSERT VTABLE SYMBOLS HERE
+
++ local:
++ *;
++};
+--- ./hotspot/make/bsd/makefiles/ppc.make Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/bsd/makefiles/ppc.make Sun Jan 25 08:30:35 2015 -0800
+@@ -28,3 +28,6 @@
+ # Must also specify if CPU is big endian
+ CFLAGS += -DVM_BIG_ENDIAN
+
++ifdef E500V2
++ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1
++endif
+--- ./hotspot/make/bsd/makefiles/saproc.make Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/bsd/makefiles/saproc.make Sun Jan 25 08:30:35 2015 -0800
+@@ -36,6 +36,11 @@
+ LIBSAPROC_G = lib$(SAPROC_G).so
+ endif
+
++LIBSAPROC_DEBUGINFO = lib$(SAPROC).debuginfo
++LIBSAPROC_DIZ = lib$(SAPROC).diz
++LIBSAPROC_G_DEBUGINFO = lib$(SAPROC_G).debuginfo
++LIBSAPROC_G_DIZ = lib$(SAPROC_G).diz
++
+ AGENT_DIR = $(GAMMADIR)/agent
+
+ SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
+@@ -66,7 +71,9 @@
+
+ SAMAPFILE = $(SASRCDIR)/mapfile
+
+-DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
++DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
++DEST_SAPROC_DEBUGINFO = $(JDK_LIBDIR)/$(LIBSAPROC_DEBUGINFO)
++DEST_SAPROC_DIZ = $(JDK_LIBDIR)/$(LIBSAPROC_DIZ)
+
+ # DEBUG_BINARIES overrides everything, use full -g debug information
+ ifeq ($(DEBUG_BINARIES), true)
+@@ -114,10 +121,32 @@
+ -o $@ \
+ $(SALIBS)
+ $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
++ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
++ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
++ ifeq ($(STRIP_POLICY),all_strip)
++ $(QUIETLY) $(STRIP) $@
++ else
++ ifeq ($(STRIP_POLICY),min_strip)
++ $(QUIETLY) $(STRIP) -S $@
++ # implied else here is no stripping at all
++ endif
++ endif
++ [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); }
++ ifeq ($(ZIP_DEBUGINFO_FILES),1)
++ $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO)
++ $(RM) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO)
++ [ -f $(LIBSAPROC_G_DIZ) ] || { ln -s $(LIBSAPROC_DIZ) $(LIBSAPROC_G_DIZ); }
++ endif
++endif
+
+ install_saproc: $(BUILDLIBSAPROC)
+ $(QUIETLY) if [ -e $(LIBSAPROC) ] ; then \
+ echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"; \
++ test -f $(LIBSAPROC_DEBUGINFO) && \
++ cp -f $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO); \
++ test -f $(LIBSAPROC_DIZ) && \
++ cp -f $(LIBSAPROC_DIZ) $(DEST_SAPROC_DIZ); \
+ cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
+ fi
+
+--- ./hotspot/make/solaris/makefiles/defs.make Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/make/solaris/makefiles/defs.make Sun Jan 25 08:30:35 2015 -0800
+@@ -221,8 +221,8 @@
+ endif
+ ifeq ($(JVM_VARIANT_CLIENT),true)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
+- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ ifeq ($(ARCH_DATA_MODEL),32)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Sun Jan 25 08:30:35 2015 -0800
+@@ -71,7 +71,11 @@
+ define_pd_global(bool, RewriteBytecodes, true);
+ define_pd_global(bool, RewriteFrequentPairs, true);
+
++#ifdef _ALLBSD_SOURCE
++define_pd_global(bool, UseMembar, true);
++#else
+ define_pd_global(bool, UseMembar, false);
++#endif
+
+ // GC Ergo Flags
+ define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -0,0 +1,46 @@
++/*
++ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * 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.
++ *
++ */
++
++#include "prims/jvm.h"
++#include "utilities/decoder_elf.hpp"
++
++#include <cxxabi.h>
++
++bool ElfDecoder::demangle(const char* symbol, char *buf, int buflen) {
++ int status;
++ char* result;
++ size_t size = (size_t)buflen;
++
++ // Don't pass buf to __cxa_demangle. In case of the 'buf' is too small,
++ // __cxa_demangle will call system "realloc" for additional memory, which
++ // may use different malloc/realloc mechanism that allocates 'buf'.
++ if ((result = abi::__cxa_demangle(symbol, NULL, NULL, &status)) != NULL) {
++ jio_snprintf(buf, buflen, "%s", result);
++ // call c library's free
++ ::free(result);
++ return true;
++ }
++ return false;
++}
++
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -187,6 +187,8 @@
+ static int SR_signum = SIGUSR2;
+ sigset_t SR_sigset;
+
++// Declarations
++static void unpackTime(timespec* absTime, bool isAbsolute, jlong time);
+
+ ////////////////////////////////////////////////////////////////////////////////
+ // utility functions
+@@ -355,7 +357,13 @@
+ * since it returns a 64 bit value)
+ */
+ mib[0] = CTL_HW;
++#ifdef HW_MEMSIZE
+ mib[1] = HW_MEMSIZE;
++#elif defined (HW_USERMEM64)
++ mib[1] = HW_USERMEM64;
++#else
++ mib[1] = HW_USERMEM;
++#endif
+ len = sizeof(mem_val);
+ if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) {
+ assert(len == sizeof(mem_val), "unexpected data size");
+@@ -2401,14 +2409,14 @@
+ }
+
+ void os::print_os_info_brief(outputStream* st) {
+- st->print("Bsd");
++ st->print("BSD");
+
+ os::Posix::print_uname_info(st);
+ }
+
+ void os::print_os_info(outputStream* st) {
+ st->print("OS:");
+- st->print("Bsd");
++ st->print("BSD");
+
+ os::Posix::print_uname_info(st);
+
+@@ -2417,10 +2425,6 @@
+ os::Posix::print_load_average(st);
+ }
+
+-void os::pd_print_cpu_info(outputStream* st) {
+- // Nothing to do for now.
+-}
+-
+ void os::print_memory_info(outputStream* st) {
+
+ st->print("Memory:");
+@@ -2437,6 +2441,7 @@
+ st->print("(" UINT64_FORMAT "k free)",
+ os::available_memory() >> 10);
+ #ifndef _ALLBSD_SOURCE
++ // FIXME: Make this work for *BSD
+ st->print(", swap " UINT64_FORMAT "k",
+ ((jlong)si.totalswap * si.mem_unit) >> 10);
+ st->print("(" UINT64_FORMAT "k free)",
+@@ -2444,12 +2449,22 @@
+ #endif
+ st->cr();
+
++ // FIXME: Make this work for *BSD
+ // meminfo
+ st->print("\n/proc/meminfo:\n");
+ _print_ascii_file("/proc/meminfo", st);
+ st->cr();
+ }
+
++void os::pd_print_cpu_info(outputStream* st) {
++ // FIXME: Make this work for *BSD
++ st->print("\n/proc/cpuinfo:\n");
++ if (!_print_ascii_file("/proc/cpuinfo", st)) {
++ st->print(" <Not Available>");
++ }
++ st->cr();
++}
++
+ // Taken from /usr/include/bits/siginfo.h Supposed to be architecture specific
+ // but they're the same for all the bsd arch that we support
+ // and they're the same for solaris but there's no common place to put this.
+@@ -2596,6 +2611,25 @@
+ assert(len < buflen, "Ran out of buffer space");
+ jrelib_p = buf + len;
+
++#ifndef __APPLE__
++ snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
++ if (0 != access(buf, F_OK)) {
++ snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch);
++ }
++
++ if (0 == access(buf, F_OK)) {
++ // Use current module name "libjvm[_g].so" instead of
++ // "libjvm"debug_only("_g")".so" since for fastdebug version
++ // we should have "libjvm.so" but debug_only("_g") adds "_g"!
++ len = strlen(buf);
++ snprintf(buf + len, buflen-len, "/hotspot/libjvm%s.so", p);
++ } else {
++ // Go back to path of .so
++ rp = realpath(dli_fname, buf);
++ if (rp == NULL)
++ return;
++ }
++#else
+ // Add the appropriate library subdir
+ snprintf(jrelib_p, buflen-len, "/jre/lib");
+ if (0 != access(buf, F_OK)) {
+@@ -2625,6 +2659,7 @@
+ if (rp == NULL)
+ return;
+ }
++#endif
+ }
+ }
+ }
+@@ -2728,10 +2763,14 @@
+ bool timedwait(unsigned int sec, int nsec);
+ private:
+ jlong currenttime() const;
+- semaphore_t _semaphore;
++ os_semaphore_t _semaphore;
+ };
+
++#if defined(__FreeBSD__) && __FreeBSD__ > 8
++Semaphore::Semaphore() : _semaphore() {
++#else
+ Semaphore::Semaphore() : _semaphore(0) {
++#endif
+ SEM_INIT(_semaphore, 0);
+ }
+
+@@ -2796,7 +2835,7 @@
+
+ bool Semaphore::timedwait(unsigned int sec, int nsec) {
+ struct timespec ts;
+- jlong endtime = unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec);
++ unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec);
+
+ while (1) {
+ int result = sem_timedwait(&_semaphore, &ts);
+@@ -3017,7 +3056,11 @@
+ }
+
+ void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
++ commit_memory(addr, bytes, alignment_hint, false);
++#else
+ ::madvise(addr, bytes, MADV_DONTNEED);
++#endif
+ }
+
+ void os::numa_make_global(char *addr, size_t bytes) {
+@@ -3852,6 +3895,7 @@
+ return OS_OK;
+ #elif defined(__FreeBSD__)
+ int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
++ return (ret == 0) ? OS_OK : OS_ERR;
+ #elif defined(__APPLE__) || defined(__NetBSD__)
+ struct sched_param sp;
+ int policy;
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sun Jan 25 08:30:35 2015 -0800
+@@ -103,6 +103,12 @@
+
+ static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
+
++ static void print_full_memory_info(outputStream* st);
++#ifndef _ALLBSD_SOURCE
++ static void print_distro_info(outputStream* st);
++ static void print_libversion_info(outputStream* st);
++#endif
++
+ public:
+
+ static void init_thread_fpu_state();
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Sun Jan 25 08:30:35 2015 -0800
+@@ -31,10 +31,22 @@
+ # include "atomic_bsd_x86.inline.hpp"
+ # include "orderAccess_bsd_x86.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_sparc
++# include "atomic_bsd_sparc.inline.hpp"
++# include "orderAccess_bsd_sparc.inline.hpp"
++#endif
+ #ifdef TARGET_OS_ARCH_bsd_zero
+ # include "atomic_bsd_zero.inline.hpp"
+ # include "orderAccess_bsd_zero.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_arm
++# include "atomic_bsd_arm.inline.hpp"
++# include "orderAccess_bsd_arm.inline.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_ppc
++# include "atomic_bsd_ppc.inline.hpp"
++# include "orderAccess_bsd_ppc.inline.hpp"
++#endif
+
+ // System includes
+
+--- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Sun Jan 25 08:30:35 2015 -0800
+@@ -34,11 +34,26 @@
+ # include "orderAccess_bsd_x86.inline.hpp"
+ # include "prefetch_bsd_x86.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_sparc
++# include "atomic_bsd_sparc.inline.hpp"
++# include "orderAccess_bsd_sparc.inline.hpp"
++# include "prefetch_bsd_sparc.inline.hpp"
++#endif
+ #ifdef TARGET_OS_ARCH_bsd_zero
+ # include "atomic_bsd_zero.inline.hpp"
+ # include "orderAccess_bsd_zero.inline.hpp"
+ # include "prefetch_bsd_zero.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_arm
++# include "atomic_bsd_arm.inline.hpp"
++# include "orderAccess_bsd_arm.inline.hpp"
++# include "prefetch_bsd_arm.inline.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_ppc
++# include "atomic_bsd_ppc.inline.hpp"
++# include "orderAccess_bsd_ppc.inline.hpp"
++# include "prefetch_bsd_ppc.inline.hpp"
++#endif
+
+ // Contains inlined functions for class Thread and ThreadLocalStorage
+
+--- ./hotspot/src/os/posix/vm/os_posix.cpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/os/posix/vm/os_posix.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -175,11 +175,19 @@
+ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+ else st->print("%d", rlim.rlim_cur);
+
++#ifdef __OpenBSD__
++ st->print(", DATA ");
++ getrlimit(RLIMIT_DATA, &rlim);
++ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
++ else st->print("%uk", rlim.rlim_cur >> 10);
++ st->cr();
++#else
+ st->print(", AS ");
+ getrlimit(RLIMIT_AS, &rlim);
+ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+ else st->print("%uk", rlim.rlim_cur >> 10);
+ st->cr();
++#endif
+ }
+
+ void os::Posix::print_uname_info(outputStream* st) {
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -945,7 +945,7 @@
+ if (rslt != 0)
+ fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
+
+- *bottom = (address)((char *)ss.ss_sp - ss.ss_size);
++ *bottom = (address)(align_size_up((intptr_t)ss.ss_sp, os::vm_page_size()) - ss.ss_size);
+ *size = ss.ss_size;
+ #elif defined(_ALLBSD_SOURCE)
+ pthread_attr_t attr;
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -24,7 +24,7 @@
+ */
+
+ #if defined(_ALLBSD_SOURCE) && !defined(__APPLE__) && !defined(__NetBSD__)
+-#include <pthread.h>
++# include <pthread.h>
+ # include <pthread_np.h> /* For pthread_attr_get_np */
+ #endif
+
+--- ./hotspot/src/share/vm/code/relocInfo.hpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/share/vm/code/relocInfo.hpp Sun Jan 25 08:30:35 2015 -0800
+@@ -371,7 +371,7 @@
+ // "immediate" in the prefix header word itself. This optimization
+ // is invisible outside this module.)
+
+- inline friend relocInfo prefix_relocInfo(int datalen = 0);
++ inline friend relocInfo prefix_relocInfo(int datalen);
+
+ protected:
+ // an immediate relocInfo optimizes a prefix with one 10-bit unsigned value
+@@ -466,7 +466,7 @@
+ return relocInfo(relocInfo::none, relocInfo::offset_limit() - relocInfo::offset_unit);
+ }
+
+-inline relocInfo prefix_relocInfo(int datalen) {
++inline relocInfo prefix_relocInfo(int datalen = 0) {
+ assert(relocInfo::fits_into_immediate(datalen), "datalen in limits");
+ return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen);
+ }
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -111,7 +111,7 @@
+ if (e.should_commit()) {
+ e.set_gcId(_shared_gc_info.id());
+ e.set_data(to_trace_struct(pf_info));
+- e.set_thread(pf_info.thread()->thread_id());
++ e.set_thread((uint64_t) pf_info.thread()->thread_id());
+ e.commit();
+ }
+ }
+--- ./hotspot/src/share/vm/runtime/atomic.cpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/share/vm/runtime/atomic.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -54,6 +54,12 @@
+ #ifdef TARGET_OS_ARCH_windows_x86
+ # include "atomic_windows_x86.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "atomic_bsd_x86.inline.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "atomic_bsd_zero.inline.hpp"
++#endif
+ #ifdef TARGET_OS_ARCH_linux_arm
+ # include "atomic_linux_arm.inline.hpp"
+ #endif
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -1716,7 +1716,7 @@
+ }
+ iterator->_notified = 1 ;
+ Thread * Self = THREAD;
+- iterator->_notifier_tid = Self->osthread()->thread_id();
++ iterator->_notifier_tid = (jlong) Self->osthread()->thread_id();
+
+ ObjectWaiter * List = _EntryList ;
+ if (List != NULL) {
+@@ -1842,7 +1842,7 @@
+ guarantee (iterator->_notified == 0, "invariant") ;
+ iterator->_notified = 1 ;
+ Thread * Self = THREAD;
+- iterator->_notifier_tid = Self->osthread()->thread_id();
++ iterator->_notifier_tid = (jlong) Self->osthread()->thread_id();
+ if (Policy != 4) {
+ iterator->TState = ObjectWaiter::TS_ENTER ;
+ }
+--- ./hotspot/src/share/vm/runtime/os.cpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/share/vm/runtime/os.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -399,13 +399,6 @@
+ if (_native_java_library == NULL) {
+ vm_exit_during_initialization("Unable to load native library", ebuf);
+ }
+-
+-#if defined(__OpenBSD__)
+- // Work-around OpenBSD's lack of $ORIGIN support by pre-loading libnet.so
+- // ignore errors
+- dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "net");
+- dll_load(buffer, ebuf, sizeof(ebuf));
+-#endif
+ }
+ static jboolean onLoaded = JNI_FALSE;
+ if (onLoaded) {
+--- ./hotspot/src/share/vm/runtime/os.hpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/share/vm/runtime/os.hpp Sun Jan 25 08:30:35 2015 -0800
+@@ -30,6 +30,9 @@
+ #include "runtime/extendedPC.hpp"
+ #include "runtime/handles.hpp"
+ #include "utilities/top.hpp"
++#ifdef TARGET_OS_FAMILY_bsd
++# include "jvm_bsd.h"
++#endif
+ #ifdef TARGET_OS_FAMILY_linux
+ # include "jvm_linux.h"
+ # include <setjmp.h>
+@@ -752,8 +755,8 @@
+ # include "os_windows.hpp"
+ #endif
+ #ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.hpp"
+ # include "os_posix.hpp"
+-# include "os_bsd.hpp"
+ #endif
+ #ifdef TARGET_OS_ARCH_linux_x86
+ # include "os_linux_x86.hpp"
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp Sun Jan 25 08:30:35 2015 -0800
+@@ -393,7 +393,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.
+ // This is because the caller thread could have exited already.
+- event.set_caller(is_concurrent ? 0 : op->calling_thread()->osthread()->thread_id());
++ event.set_caller(is_concurrent ? 0 : (uint64_t) op->calling_thread()->osthread()->thread_id());
+ event.commit();
+ }
+
+--- ./hotspot/src/share/vm/trace/tracetypes.xml Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/src/share/vm/trace/tracetypes.xml Sun Jan 25 08:30:35 2015 -0800
+@@ -60,7 +60,7 @@
+ <types>
+ <content_types>
+ <content_type id="Thread" hr_name="Thread"
+- type="U4" builtin_type="OSTHREAD">
++ type="thread_id_t" builtin_type="OSTHREAD">
+ <value type="UTF8" field="name" label="Thread name"/>
+ </content_type>
+
+@@ -294,8 +294,8 @@
+ type="u8" sizeop="sizeof(u8)"/>
+
+ <!-- OS Thread ID -->
+- <primary_type symbol="OSTHREAD" datatype="U4" contenttype="OSTHREAD"
+- type="u4" sizeop="sizeof(u4)"/>
++ <primary_type symbol="OSTHREAD" datatype="U8" contenttype="OSTHREAD"
++ type="u8" sizeop="sizeof(u8)"/>
+
+ <!-- VM Thread ID Note: changed from U2 to U8 for hotspot -->
+ <primary_type symbol="VMTHREAD" datatype="U8" contenttype="VMTHREAD"
+--- ./hotspot/test/compiler/5091921/Test7005594.sh Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/test/compiler/5091921/Test7005594.sh Sun Jan 25 08:30:35 2015 -0800
+@@ -60,6 +60,9 @@
+ # Windows/MKS
+ MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
+ MEM="$(($machine_memory / 1024))"
++elif [ -n `sysctl -n hw.physmem64 2> /dev/null` -o -n `sysctl -n hw.physmem 2> /dev/null` ];
++ # BSD
++ MEM=`sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }'`
+ else
+ echo "Unable to determine amount of physical memory on the machine"
+ fi
+--- ./hotspot/test/runtime/7110720/Test7110720.sh Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/test/runtime/7110720/Test7110720.sh Sun Jan 25 08:30:35 2015 -0800
+@@ -28,7 +28,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | Darwin | *BSD )
+ FS="/"
+ RM=/bin/rm
+ CP=/bin/cp
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./hotspot/test/runtime/7158800/Test7158800.sh Sun Jan 25 08:30:35 2015 -0800
+@@ -0,0 +1,91 @@
++#!/bin/sh
++#
++# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++#
++# Run test for InternTest.java
++#
++
++if [ "${TESTSRC}" = "" ]
++then TESTSRC=.
++fi
++
++if [ "${TESTJAVA}" = "" ]
++then
++ PARENT=`dirname \`which java\``
++ TESTJAVA=`dirname ${PARENT}`
++ echo "TESTJAVA not set, selecting " ${TESTJAVA}
++ echo "If this is incorrect, try setting the variable manually."
++fi
++
++if [ "${TESTCLASSES}" = "" ]
++then
++ echo "TESTCLASSES not set. Test cannot execute. Failed."
++ exit 1
++fi
++
++# set platform-dependent variables
++OS=`uname -s`
++case "$OS" in
++ SunOS | Linux | *BSD )
++ NULL=/dev/null
++ PS=":"
++ FS="/"
++ ;;
++ Windows_* )
++ NULL=NUL
++ PS=";"
++ FS="\\"
++ ;;
++ * )
++ echo "Unrecognized system!"
++ exit 1;
++ ;;
++esac
++
++JEMMYPATH=${CPAPPEND}
++CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
++
++THIS_DIR=`pwd`
++
++${TESTJAVA}${FS}bin${FS}java -fullversion
++
++${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}InternTest.java
++
++cp ${TESTSRC}${FS}badstrings.txt .
++
++${TESTJAVA}${FS}bin${FS}java -XX:+PrintStringTableStatistics -XX:+TraceSafepointCleanupTime InternTest bad > test.out 2>&1 &
++C_PID=$!
++
++sleep 60
++
++ps | grep ${C_PID} | grep -v grep
++
++if [ $? = 0 ]
++then
++ kill -9 ${C_PID}
++ echo "Test Failed"
++ exit 1
++else
++ echo "Test Passed"
++ exit 0
++fi
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Thu Dec 18 14:06:49 2014 -0800
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sun Jan 25 08:30:35 2015 -0800
+@@ -36,8 +36,8 @@
+ public static void main(String args[]) throws Throwable {
+
+ System.out.println("Regression test for bugs 7051189 and 8023393");
+- if (!Platform.isSolaris() && !Platform.isLinux() && !Platform.isOSX()) {
+- System.out.println("Test only applicable on Solaris, Linux, and Mac OSX, skipping");
++ if (!Platform.isSolaris() && !Platform.isLinux() && !Platform.isOSX() && !Platform.isBSD()) {
++ System.out.println("Test only applicable on Solaris, Linux, BSD, and Mac OSX, skipping");
+ return;
+ }
+
+--- ./jaxp/.hgtags Thu Dec 18 14:10:07 2014 -0800
++++ ./jaxp/.hgtags Sat Jan 24 11:28:40 2015 -0800
+@@ -123,6 +123,7 @@
+ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
+ 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
+ fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
++3170972bd3928a331c4c64a5c0c9632077fb399a 7u0
+ 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
+ 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
+ 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
+@@ -555,3 +557,4 @@
+ 62e1b60c3adfd3133e3fe9f8d5194512f503c540 jdk7u76-b10
+ 33040bd2deb5371a85fe7d7a9442cdf649919b39 jdk7u76-b11
+ 7167fcf821b00424c0464086f4047a7209dc9e59 jdk7u76-b12
++6262c3d41bb13f58338c4bc7946468ba70825046 jdk7u76-b13
+--- ./jaxws/.hgtags Thu Dec 18 14:10:40 2014 -0800
++++ ./jaxws/.hgtags Sat Jan 24 11:28:42 2015 -0800
+@@ -123,6 +123,7 @@
+ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
+ c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
+ d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
++ce6378e3c791c56b98cbf161804a07d0225b41c0 7u0
+ 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
+ 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
+ 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
+@@ -554,3 +556,4 @@
+ c84694b00c547056b8da98ae4c0c7c9feb06863b jdk7u76-b10
+ df2786b1daffc450d7e7e43c9d63aaf72a5cd2f0 jdk7u76-b11
+ dc818936e1050f0058d35a7a27946e4e2bfb27ee jdk7u76-b12
++a986e4b755f388532378d595831bebece7bf72c4 jdk7u76-b13
+--- ./jdk/.hgtags Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/.hgtags Sun Jan 25 08:34:16 2015 -0800
+@@ -123,6 +123,7 @@
+ 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
+ 69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
+ f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
++0870207843e2a74816dff1e33a717ffaf6f0a919 7u0
+ 2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
+ a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
+ b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
+@@ -542,3 +544,4 @@
+ c67a0b63cc6971ced2e233b63ebbdec063ad81d2 jdk7u76-b10
+ e0e3c03502518c460d51d8c517b081cbd712a9c1 jdk7u76-b11
+ 9af83882ca9e628f9e35634b930081271a91d561 jdk7u76-b12
++1af0023da23e23482947b715fbf3bdfdee0d2813 jdk7u76-b13
+--- ./jdk/make/com/sun/security/auth/module/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/com/sun/security/auth/module/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -67,7 +67,7 @@
+ include FILES_c_solaris.gmk
+ endif # solaris
+
+-ifneq (,$(findstring $(PLATFORM), linux macosx))
++ifneq (,$(findstring $(PLATFORM), linux bsd macosx))
+ LIBRARY = jaas_unix
+ include FILES_export_unix.gmk
+ include FILES_c_unix.gmk
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -43,7 +43,7 @@
+ sun/tools/attach/LinuxVirtualMachine.java
+ endif
+
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+ endif
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -39,7 +39,7 @@
+ LinuxVirtualMachine.c
+ endif
+
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ FILES_c = \
+ BsdVirtualMachine.c
+ endif
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -43,7 +43,7 @@
+ sun/tools/attach/LinuxAttachProvider.java
+ endif
+
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ FILES_java += \
+ sun/tools/attach/BsdAttachProvider.java
+ endif
+--- ./jdk/make/com/sun/tools/attach/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/com/sun/tools/attach/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -38,7 +38,7 @@
+ ifeq ($(PLATFORM), linux)
+ FILES_m = mapfile-linux
+ endif
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ FILES_m = mapfile-bsd
+ endif
+ include $(BUILDDIR)/common/Mapfile-vers.gmk
+@@ -57,7 +57,7 @@
+ EXTRA_LIBS += psapi.lib
+ endif
+
+-ifeq ($PLATFORM), macosx)
++ifeq ($(PLATFORM), macosx)
+ vpath %.c $(call NativeSrcDirList,,native/sun/tools/attach)
+ else
+ vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd Sun Jan 25 08:34:16 2015 -0800
+@@ -30,6 +30,7 @@
+ Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
+ Java_sun_tools_attach_BsdVirtualMachine_close;
+ Java_sun_tools_attach_BsdVirtualMachine_connect;
++ Java_sun_tools_attach_BsdVirtualMachine_getTempDir;
+ Java_sun_tools_attach_BsdVirtualMachine_open;
+ Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
+ Java_sun_tools_attach_BsdVirtualMachine_socket;
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/make/common/Defs-bsd.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -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.
++#
++# 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.
++#
++
++#
++# Makefile to specify compiler flags for programs and libraries
++# targeted to BSD. Should not contain any rules.
++#
++# WARNING: This file is shared with other workspaces.
++# So when it includes other files, it must use JDK_TOPDIR.
++#
++
++# Warning: the following variables are overriden by Defs.gmk. Set
++# values will be silently ignored:
++# CFLAGS (set $(OTHER_CFLAGS) instead)
++# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
++# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
++# LDFLAGS (set $(OTHER_LDFAGS) instead)
++# LDLIBS (set $(EXTRA_LIBS) instead)
++# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
++
++# Get shared JDK settings
++include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
++
++# Part of INCREMENTAL_BUILD mechanism.
++# Compiler emits things like: path/file.o: file.h
++# We want something like: relative_path/file.o relative_path/file.d: file.h
++CC_DEPEND = -MM
++CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
++
++ifndef PLATFORM_SRC
++ PLATFORM_SRC = $(BUILDDIR)/../src/solaris
++endif # PLATFORM_SRC
++
++# Location of the various .properties files specific to BSD platform
++ifndef PLATFORM_PROPERTIES
++ PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib
++endif # PLATFORM_SRC
++
++# BSD build pulls its platform sources from the solaris tree.
++JAVA_SRCDIR_LIST = src/macosx src/solaris src/share
++NATIVE_SRCDIR_LIST = src/macosx src/solaris src/share
++
++# Platform specific closed sources
++ifndef OPENJDK
++ ifndef CLOSED_PLATFORM_SRC
++ CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
++ endif
++endif
++
++# platform specific include files
++PLATFORM_INCLUDE_NAME = $(OS_NAME)
++PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
++
++# suffix used for make dependencies files.
++DEPEND_SUFFIX = d
++# The suffix applied to the library name for FDLIBM
++FDDLIBM_SUFFIX = a
++# The suffix applied to scripts (.bat for windows, nothing for unix)
++SCRIPT_SUFFIX =
++# CC compiler object code output directive flag value
++CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
++CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
++
++# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
++# enabled with debug info files ZIP'ed to save space. For VARIANT !=
++# OPT builds, FDS is always enabled, after all a debug build without
++# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
++# meaning when FDS is enabled.
++#
++# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
++# disabled for a VARIANT == OPT build.
++#
++# Note: Use of a different variable name for the FDS override option
++# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
++# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
++# in options via environment variables, use of distinct variables
++# prevents strange behaviours. For example, in a VARIANT != OPT build,
++# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
++# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
++# variable name is used, then different values can be picked up by
++# different parts of the build. Just to be clear, we only need two
++# variable names because the incoming option value can be overridden
++# in some situations, e.g., a VARIANT != OPT build.
++
++ifeq ($(VARIANT), OPT)
++ FULL_DEBUG_SYMBOLS ?= 1
++ ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
++else
++ # debug variants always get Full Debug Symbols (if available)
++ ENABLE_FULL_DEBUG_SYMBOLS = 1
++endif
++_JUNK_ := $(shell \
++ echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
++# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
++
++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
++ # Default OBJCOPY comes from GNU Binutils on BSD:
++ DEF_OBJCOPY=/usr/bin/objcopy
++ ifdef CROSS_COMPILE_ARCH
++ # don't try to generate .debuginfo files when cross compiling
++ _JUNK_ := $(shell \
++ echo >&2 "INFO: cross compiling for ARCH $(CROSS_COMPILE_ARCH)," \
++ "skipping .debuginfo generation.")
++ OBJCOPY=
++ else
++ OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
++ ifneq ($(ALT_OBJCOPY),)
++ _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
++ # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
++ OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
++ endif
++ endif
++
++ # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
++ # JDK build to import .debuginfo or .diz files from the HotSpot build.
++ # However, adding FDS support to the JDK build will occur in phases
++ # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
++ # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
++ # particular library or program supports FDS.
++
++ ifeq ($(OBJCOPY),)
++ _JUNK_ := $(shell \
++ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
++ ENABLE_FULL_DEBUG_SYMBOLS=0
++ else
++ _JUNK_ := $(shell \
++ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
++
++ # Library stripping policies for .debuginfo configs:
++ # all_strip - strips everything from the library
++ # min_strip - strips most stuff from the library; leaves minimum symbols
++ # no_strip - does not strip the library at all
++ #
++ # Oracle security policy requires "all_strip". A waiver was granted on
++ # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
++ #
++ # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
++ STRIP_POLICY ?= min_strip
++
++ _JUNK_ := $(shell \
++ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
++
++ ZIP_DEBUGINFO_FILES ?= 1
++
++ _JUNK_ := $(shell \
++ echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
++ endif
++endif
++
++#
++# Default optimization
++#
++
++ifndef OPTIMIZATION_LEVEL
++ ifeq ($(PRODUCT), java)
++ OPTIMIZATION_LEVEL = HIGHER
++ else
++ OPTIMIZATION_LEVEL = LOWER
++ endif
++endif
++ifndef FASTDEBUG_OPTIMIZATION_LEVEL
++ FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
++endif
++
++CC_OPT/NONE =
++CC_OPT/LOWER = -O2
++CC_OPT/HIGHER = -O3
++CC_OPT/HIGHEST = -O3
++
++CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
++
++# For all platforms, do not omit the frame pointer register usage.
++# We need this frame pointer to make it easy to walk the stacks.
++# This should be the default on X86, but ia64 and amd64 may not have this
++# as the default.
++CFLAGS_REQUIRED_amd64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++LDFLAGS_COMMON_amd64 += -m64
++CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++LDFLAGS_COMMON_i586 += -m32
++CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
++LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
++CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
++LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
++CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN
++ifeq ($(ZERO_BUILD), true)
++ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
++ ifeq ($(ZERO_ENDIANNESS), little)
++ CFLAGS_REQUIRED += -D_LITTLE_ENDIAN
++ endif
++ LDFLAGS_COMMON += $(ZERO_ARCHFLAG)
++else
++ CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
++ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
++endif
++
++#
++# Selection of warning messages
++#
++GCC_INHIBIT = -Wno-unused -Wno-parentheses
++GCC_STYLE =
++GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
++
++#
++# Treat compiler warnings as errors, if warnings not allowed
++#
++ifeq ($(COMPILER_WARNINGS_FATAL),true)
++ GCC_WARNINGS += -Werror
++endif
++
++#
++# Misc compiler options
++#
++ifneq ($(ARCH),ppc)
++ CFLAGS_COMMON = -fno-strict-aliasing
++endif
++PIC_CODE_LARGE = -fPIC
++PIC_CODE_SMALL = -fpic
++GLOBAL_KPIC = $(PIC_CODE_LARGE)
++CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
++ifeq ($(ARCH), amd64)
++ CFLAGS_COMMON += -pipe
++endif
++
++# BSD 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1
++DEBUG_FLAG = -g
++ifeq ($(FASTDEBUG), true)
++ ifeq ($(ARCH_DATA_MODEL), 64)
++ DEBUG_FLAG = -g1
++ endif
++endif
++
++# DEBUG_BINARIES overrides everything, use full -g debug information
++ifeq ($(DEBUG_BINARIES), true)
++ DEBUG_FLAG = -g
++ CFLAGS_REQUIRED += $(DEBUG_FLAG)
++endif
++
++# If Full Debug Symbols is enabled, then we want the same debug and
++# optimization flags as used by FASTDEBUG.
++#
++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
++ ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
++ ifeq ($(VARIANT), OPT)
++ CC_OPT = $(DEBUG_FLAG) $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
++ endif
++ endif
++endif
++
++CFLAGS_OPT = $(CC_OPT)
++CFLAGS_DBG = $(DEBUG_FLAG)
++CFLAGS_COMMON += $(CFLAGS_REQUIRED)
++
++CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
++CXXFLAGS_OPT = $(CC_OPT)
++CXXFLAGS_DBG = $(DEBUG_FLAG)
++CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
++
++# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
++ifeq ($(FASTDEBUG), true)
++ CFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
++ CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
++endif
++
++CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
++
++# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
++ifneq ($(ARCH),alpha)
++ CPP_ARCH_FLAGS += -D$(ARCH)
++else
++ CPP_ARCH_FLAGS += -D_$(ARCH)_
++endif
++
++CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D_ALLBSD_SOURCE $(VERSION_DEFINES) \
++ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
++
++ifeq ($(ARCH_DATA_MODEL), 64)
++CPPFLAGS_COMMON += -D_LP64=1
++endif
++
++CPPFLAGS_OPT = -DNDEBUG
++CPPFLAGS_DBG = -DDEBUG
++ifneq ($(PRODUCT), java)
++ CPPFLAGS_DBG += -DLOGGING
++endif
++
++# Libraries need to locate other libraries at runtime, and you can tell
++# a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
++# buried inside the .so. The $ORIGIN says to look relative to where
++# the library itself is and it can be followed with relative paths from
++# that. By default we always look in $ORIGIN, optionally we add relative
++# paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths.
++# On BSD we add a flag -z origin, not sure if this is necessary, but
++# doesn't seem to hurt.
++# The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
++# Try: 'readelf -d lib*.so' to see these settings in a library.
++#
++Z_ORIGIN_FLAG/sparc = -Xlinker -z -Xlinker origin
++Z_ORIGIN_FLAG/i586 = -Xlinker -z -Xlinker origin
++Z_ORIGIN_FLAG/amd64 = -Xlinker -z -Xlinker origin
++Z_ORIGIN_FLAG/ia64 = -Xlinker -z -Xlinker origin
++Z_ORIGIN_FLAG/arm =
++Z_ORIGIN_FLAG/ppc =
++Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlinker origin
++
++LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
++
++LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
++LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
++
++#
++# -L paths for finding and -ljava
++#
++LDFLAGS_OPT = -Xlinker -O1
++LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
++LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
++
++#
++# -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
++# statically link libgcc but will print a warning with the flag. We don't
++# want the warning, so check gcc version first.
++#
++ifeq ($(CC_MAJORVER),3)
++ OTHER_LDFLAGS += -static-libgcc
++endif
++
++# Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
++# (See Rules.gmk) The gcc 5 compiler might have an option for this?
++AUTOMATIC_PCH_OPTION =
++
++#
++# Post Processing of libraries/executables
++#
++ifeq ($(VARIANT), OPT)
++ ifneq ($(NO_STRIP), true)
++ ifneq ($(DEBUG_BINARIES), true)
++ # Debug 'strip -S' leaves local function Elf symbols (better stack
++ # traces)
++ POST_STRIP_PROCESS = $(STRIP) -S
++ endif
++ endif
++endif
++
++#
++# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o
++#
++LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
++
++#
++# Support for Quantify.
++#
++ifdef QUANTIFY
++QUANTIFY_CMD = quantify
++QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
++LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
++endif
++
++# Using map files currently break compilation on FreeBSD during shared library
++# checks for some of the AWT native libraries.
++ifeq ($(OS_VENDOR), FreeBSD)
++LDNOMAP=true
++endif
++
++#
++# Path and option to link against the VM, if you have to. Note that
++# there are libraries that link against only -ljava, but they do get
++# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
++# the library itself should not.
++#
++VM_NAME = server
++JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
++JAVALIB = -ljava $(JVMLIB)
++
++#
++# We want to privatize JVM symbols on Solaris. This is so the user can
++# write a function called FindClass and this should not override the
++# FindClass that is inside the JVM. At this point in time we are not
++# concerned with other JNI libraries because we hope that there will
++# not be as many clashes there.
++#
++PRIVATIZE_JVM_SYMBOLS = false
++
++USE_PTHREADS = true
++override ALT_CODESET_KEY = _NL_CTYPE_CODESET_NAME
++override AWT_RUNPATH =
++override HAVE_ALTZONE = false
++override HAVE_FILIOH = false
++override HAVE_GETHRTIME = false
++override HAVE_GETHRVTIME = false
++override LEX_LIBRARY = -lfl
++ifeq ($(STATIC_CXX),true)
++override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
++else
++override LIBCXX = -lstdc++
++endif
++override LIBPOSIX4 =
++override LIBSOCKET =
++override LIBNSL =
++override LIBSCF =
++override LIBTHREAD =
++override LIBDL =
++override MOOT_PRIORITIES = true
++override NO_INTERRUPTIBLE_IO = true
++override OPENWIN_HOME = $(X11_PATH)
++override OPENWIN_LIB = $(OPENWIN_HOME)/lib
++override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
++override SUN_CMM_SUBDIR =
++override THREADS_FLAG = native
++override USE_GNU_M4 = true
++override USING_GNU_TAR = true
++override WRITE_LIBVERSION = false
++
++# USE_EXECNAME forces the launcher to look up argv[0] on $PATH, and put the
++# resulting resolved absolute name of the executable in the environment
++# variable EXECNAME. That executable name is then used that to locate the
++# installation area.
++override USE_EXECNAME = true
++
++# If your platform has DPS, it will have Type1 fonts too, in which case
++# it is best to enable DPS support until such time as 2D's rasteriser
++# can fully handle Type1 fonts in all cases. Default is "yes".
++# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
++# DPS (Displayable PostScript) is available on Solaris machines
++HAVE_DPS = no
++
++ifeq ($(OS_VENDOR), FreeBSD)
++ SYSTEM_ZLIB = true
++endif
++
++ifeq ($(OS_VENDOR), OpenBSD)
++ SYSTEM_ZLIB = true
++endif
++
++#
++# Japanese manpages
++#
++JA_SOURCE_ENCODING = eucJP
++JA_TARGET_ENCODINGS = UTF-8
++
++# Settings for the JDI - Serviceability Agent binding.
++HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
++SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
++SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.debuginfo
++SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz
++
++# The JDI - Serviceability Agent binding is not currently supported
++# on ia64.
++ifeq ($(ARCH), ia64)
++ INCLUDE_SA = false
++else
++ INCLUDE_SA = true
++endif
++
++ifdef CROSS_COMPILE_ARCH
++ # X11 headers are not under /usr/include
++ OTHER_CFLAGS += -I$(OPENWIN_HOME)/include
++ OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
++ OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
++endif
+--- ./jdk/make/common/Defs-linux.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/Defs-linux.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -426,6 +426,7 @@
+ override LIBDL = -ldl
+ override MOOT_PRIORITIES = true
+ override NO_INTERRUPTIBLE_IO = true
++override OPENWIN_HOME = $(X11_PATH)
+ ifeq ($(ARCH), amd64)
+ override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
+ else
+--- ./jdk/make/common/Defs-solaris.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/Defs-solaris.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -753,6 +753,9 @@
+ # Network Services library
+ LIBNSL = -lnsl
+
++# Dynamic Loading library
++LIBDL = -ldl
++
+ # service configuration facility library
+ LIBSCF = -lscf
+
+--- ./jdk/make/common/Defs.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/Defs.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -179,15 +179,15 @@
+
+ ifdef ALT_FREETYPE_LIB_PATH
+ FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
+- ifeq ($(PLATFORM), macosx)
++ ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ USING_SYSTEM_FT_LIB=true
+ endif
+ else
+ ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
+ FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
+ else
+- ifeq ($(PLATFORM), macosx)
+- FREETYPE_LIB_PATH = /usr/X11R6/lib
++ ifneq (,$(findstring $(PLATFORM), bsd macosx))
++ FREETYPE_LIB_PATH = $(X11_PATH)/lib
+ else
+ FREETYPE_LIB_PATH = /usr/lib
+ endif
+@@ -201,8 +201,8 @@
+ ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
+ FREETYPE_HEADERS_PATH = $(DEVTOOLS_FT_DIR)/include
+ else
+- ifeq ($(PLATFORM), macosx)
+- FREETYPE_HEADERS_PATH = /usr/X11R6/include
++ ifneq (,$(findstring $(PLATFORM), bsd macosx))
++ FREETYPE_HEADERS_PATH = $(X11_PATH)/include
+ else
+ FREETYPE_HEADERS_PATH = /usr/include
+ endif
+@@ -258,6 +258,10 @@
+ LDLIBS_COMMON = -pthread
+ endif
+
++ ifeq ($(PLATFORM), bsd)
++ LDLIBS_COMMON = -pthread
++ endif
++
+ endif # PROGRAM
+
+ LDLIBS_COMMON += $(EXTRA_LIBS)
+@@ -400,7 +404,7 @@
+ # We define an intermediate variable for Java files because
+ # we use its value later to help define $SOURCEPATH
+
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ VPATH0.java = $(subst $(ONESPACE),:,$(GENSRCDIR) $(call JavaSrcDirList,,classes))
+ else
+ VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
+--- ./jdk/make/common/Library.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/Library.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -299,8 +299,12 @@
+ ifeq ($(PLATFORM), solaris)
+ $(STRIP) -x $@
+ else
+- # assume Linux
+- $(STRIP) -g $@
++ ifeq ($(PLATFORM), linux)
++ $(STRIP) -g $@
++ else
++ # assume BSD
++ $(STRIP) -S $@
++ endif
+ endif
+ # implied else here is no stripping at all
+ endif
+--- ./jdk/make/common/Mapfile-vers.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/Mapfile-vers.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -76,7 +76,7 @@
+
+ endif # PLATFORM
+
+-ifeq ($(PLATFORM), linux)
++ifneq (,$(findstring $(PLATFORM), linux bsd))
+
+ ifeq ($(VARIANT), OPT)
+ # OPT build MUST have a mapfile?
+--- ./jdk/make/common/Program.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/Program.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -95,6 +95,17 @@
+ endif # SYSTEM_ZLIB
+ endif # PLATFORM
+
++ifeq ($(PLATFORM), bsd)
++ LDFLAGS += -Wl,--whole-archive
++ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
++ LDFLAGS += -Wl,--no-whole-archive
++# Work-around an dlsym(RTLD_DEFAULT) bug in at least FreeBSD & OpenBSD
++ LDFLAGS += -Wl,--export-dynamic
++ ifeq ($(SYSTEM_ZLIB),true)
++ OTHER_LDLIBS += -lz
++ endif
++endif #PLATFORM
++
+ ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems
+ LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
+ OTHER_LDLIBS += -ljli
+@@ -223,6 +234,11 @@
+ INFO_PLIST_FILE=
+ endif # MACOSX
+
++ ifeq ($(PLATFORM), bsd)
++ THREADLIBS = -pthread
++ OTHER_CPPFLAGS += -DPACKAGE_PATH='"$(PACKAGE_PATH)"'
++ endif
++
+ #
+ # This rule only applies on unix. It supports quantify and its ilk.
+ #
+@@ -277,8 +293,12 @@
+ ifeq ($(PLATFORM), solaris)
+ $(STRIP) -x $@
+ else
+- # assume Linux
+- $(STRIP) -g $@
++ ifeq ($(PLATFORM), linux)
++ $(STRIP) -g $@
++ else
++ # assume BSD
++ $(STRIP) -S $@
++ endif
+ endif
+ # implied else here is no stripping at all
+ endif
+@@ -346,7 +366,9 @@
+
+
+ ifneq ($(PLATFORM), windows)
+- HAVE_GETHRTIME=true
++ ifneq ($(PLATFORM), bsd)
++ HAVE_GETHRTIME=true
++ endif
+ endif #PLATFORM
+
+ ifeq ($(HAVE_GETHRTIME),true)
+@@ -356,12 +378,10 @@
+ OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
+ ifeq ($(PLATFORM), macosx)
+ OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)/bin
+- ifneq ($(SYSTEM_ZLIB), true)
+- OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+- endif # SYSTEM_ZLIB
+-else # PLATFORM !MACOSX
++endif # PLATFORM
++ifneq ($(SYSTEM_ZLIB), true)
+ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-endif
++endif # SYSTEM_ZLIB
+
+ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
+ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
+--- ./jdk/make/common/Release.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/Release.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -180,6 +180,12 @@
+ JA_DIRNAME=ja_JP.UTF-8
+ endif # linux
+
++ifeq ($(PLATFORM), bsd)
++ MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
++ MAN1SUBDIR=man
++ JA_DIRNAME=ja_JP.UTF-8
++endif # linux
++
+ define copy-man-pages
+ $(MKDIR) -p $1/man/man1
+ for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
+@@ -1010,6 +1016,12 @@
+ FILES_launcher = $(wildcard $(SHARE_SRC)/bin/*) \
+ $(wildcard $(PLATFORM_SRC)/bin/java_md*)
+
++ifeq ($(OS_VENDOR), OpenBSD)
++ FILES_FROM_ARG=-I
++else
++ FILES_FROM_ARG=-T
++endif
++
+ # Standard jdk image
+ initial-image-jdk:: initial-image-jdk-setup \
+ initial-image-jdk-db \
+@@ -1097,7 +1109,7 @@
+ @# So for Linux, make use of the -T option (like Solaris' -I option) of
+ @# obtaining the list of files from a file. MKS tar has no such option.
+
+- ifneq (,$(findstring $(PLATFORM), linux macosx))
++ ifneq (,$(findstring $(PLATFORM), linux macosx bsd))
+ for d in $(SOURCE_DIRS); do \
+ $(RM) $(ABS_TEMPDIR)/src-files.list; \
+ ($(CD) $$d && \
+@@ -1110,7 +1122,7 @@
+ done ; \
+ ) ; \
+ if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \
+- ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
++ ($(CD) $$d && $(TAR) cf - $(FILES_FROM_ARG) $(ABS_TEMPDIR)/src-files.list ) \
+ | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
+ fi; \
+ done
+--- ./jdk/make/common/Rules.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/Rules.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -51,7 +51,7 @@
+ #
+ # All source tree areas for java/properties files (a few may be closed)
+ #
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ ifdef OPENJDK
+ ALL_CLASSES_SRC = $(call JavaSrcDirList,,classes)
+ else
+@@ -212,7 +212,7 @@
+ $(CLASSDESTDIR)/%.class: $(GENSRCDIR)/%.java
+ @$(add-java-file)
+
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ # TODO(cpc): need to document why this is necessary...
+ $(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java
+ @$(add-java-file)
+--- ./jdk/make/common/shared/Compiler-gcc.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/shared/Compiler-gcc.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -72,6 +72,21 @@
+
+ endif
+
++ifeq ($(PLATFORM), bsd)
++
++ # Settings specific to BSD
++ CC = $(COMPILER_PATH)gcc
++ CPP = $(COMPILER_PATH)gcc -E
++ CXX = $(COMPILER_PATH)g++
++
++ # Option used to create a shared library
++ ifeq ($(OS_VENDOR), Apple)
++ SHARED_LIBRARY_FLAG = -dynamiclib
++ else
++ SHARED_LIBRARY_FLAG = -shared
++ endif
++endif
++
+ ifeq ($(PLATFORM), solaris)
+
+ # Settings specific to Solaris
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/make/common/shared/Defs-bsd.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -0,0 +1,267 @@
++#
++# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++
++#
++# Definitions for BSD.
++#
++
++# Default for COMPILER_WARNINGS_FATAL on BSD (C & C++ compiler warnings)
++ifndef COMPILER_WARNINGS_FATAL
++ COMPILER_WARNINGS_FATAL=false
++endif
++
++# BSD should use parallel compilation for best build times
++ifndef COMPILE_APPROACH
++ COMPILE_APPROACH = parallel
++endif
++
++# Indication that we are doing an incremental build.
++# This may trigger the creation of make depend files.
++ifndef INCREMENTAL_BUILD
++ INCREMENTAL_BUILD = false
++endif
++
++# FullPath just makes sure it never ends with a / and no duplicates
++define FullPath
++$(shell cd $1 2> $(DEV_NULL) && pwd)
++endef
++
++# OptFullPath: Absolute path name of a dir that might not initially exist.
++define OptFullPath
++$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
++endef
++
++ifdef ALT_X11_PATH
++ X11_PATH = $(ALT_X11_PATH)
++else
++ ifeq ($(OS_VENDOR), NetBSD)
++ X11_PATH = /usr/X11R7
++ else
++ ifeq ($(OS_VENDOR), FreeBSD)
++ X11_PATH = /usr/local
++ else
++ X11_PATH = /usr/X11R6
++ endif
++ endif
++endif
++
++ifdef ALT_PACKAGE_PATH
++ PACKAGE_PATH = $(ALT_PACKAGE_PATH)
++else
++ ifeq ($(OS_VENDOR), NetBSD)
++ PACKAGE_PATH = /usr/pkg
++ else
++ PACKAGE_PATH = /usr/local
++ endif
++endif
++
++# ALSA
++ifdef ALT_ALSA_LIB_PATH
++ ALSA_LIB_PATH = $(ALT_ALSA_LIB_PATH)
++else
++ ALSA_LIB_PATH = $(PACKAGE_PATH)/lib
++endif
++
++ifdef ALT_ALSA_HEADERS_PATH
++ ALSA_HEADERS_PATH = $(ALT_ALSA_HEADERS_PATH)
++else
++ ALSA_HEADERS_PATH = $(PACKAGE_PATH)/include
++endif
++
++# Location on system where jdk installs might be
++USRJDKINSTANCES_PATH = $(PACKAGE_PATH)
++
++# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
++# NOTE: Must end with / so that it could be empty, allowing PATH usage.
++ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
++ UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
++else
++ UNIXCOMMAND_PATH = /bin/
++endif
++
++# USRBIN_PATH: path to where the most common Unix commands are.
++# NOTE: Must end with / so that it could be empty, allowing PATH usage.
++ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
++ USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
++else
++ USRBIN_PATH = /usr/bin/
++endif
++
++# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
++# NOTE: Must end with / so that it could be empty, allowing PATH usage.
++ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
++ UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
++else
++ UNIXCCS_PATH = /usr/ccs/bin/
++endif
++
++# SLASH_JAVA: location of all network accessable files
++ifdef ALT_SLASH_JAVA
++ SLASH_JAVA :=$(ALT_SLASH_JAVA)
++else
++ SLASH_JAVA := $(call DirExists,/java,/java,/NOT-SET)
++endif
++
++# JDK_DEVTOOLS_DIR: common path for all the java devtools
++ifdef ALT_JDK_DEVTOOLS_DIR
++ JDK_DEVTOOLS_DIR =$(ALT_JDK_DEVTOOLS_DIR)
++else
++ JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
++endif
++
++# COMPILER_PATH: path to where the compiler and tools are installed.
++# NOTE: Must end with / so that it could be empty, allowing PATH usage.
++ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
++ COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
++else
++ COMPILER_PATH =/usr/bin/
++endif
++
++# OPENWIN_HOME: path to where the X11 environment is installed.
++# NOTE: Must end with / so that it could be empty, allowing PATH usage.
++ifneq ($(ALT_OPENWIN_HOME),)
++ OPENWIN_HOME :=$(call PrefixPath,$(ALT_OPENWIN_HOME))
++else
++ OPENWIN_HOME =$(X11_PATH)
++endif
++
++# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
++# NOTE: Must end with / so that it could be empty, allowing PATH usage.
++ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
++ DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
++else
++ DEVTOOLS_PATH =$(PACKAGE_PATH)/bin/
++endif
++
++# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
++# _BOOTDIR2: Second choice
++ifndef ALT_BOOTDIR
++ _BOOTDIR1 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
++ _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
++endif
++
++# Always build headless on BSD
++BUILD_HEADLESS = true
++LIBM=-lm
++
++# Set ZLIB_LIBS if not already set
++ifeq ("$(ZLIB_LIBS)", "")
++ ZLIB_LIBS=-lz
++endif
++
++_CUPS_HEADERS_PATH=$(PACKAGE_PATH)/include
++
++# Import JDK images allow for partial builds, components not built are
++# imported (or copied from) these import areas when needed.
++
++# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
++# multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
++ifdef ALT_BUILD_JDK_IMPORT_PATH
++ BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
++else
++ BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
++endif
++BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
++
++# JDK_IMPORT_PATH: location of JDK install tree (this version) to import
++ifdef ALT_JDK_IMPORT_PATH
++ JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
++else
++ JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
++endif
++JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
++
++# HOTSPOT_IMPORT_PATH: location of hotspot pre-built files
++ifdef ALT_HOTSPOT_IMPORT_PATH
++ HOTSPOT_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_IMPORT_PATH))
++else
++ HOTSPOT_IMPORT_PATH =$(JDK_IMPORT_PATH)
++endif
++HOTSPOT_IMPORT_PATH:=$(call AltCheckValue,HOTSPOT_IMPORT_PATH)
++
++# HOTSPOT_CLIENT_PATH: location of client jvm library file.
++ifeq ($(ARCH_DATA_MODEL), 32)
++ ifdef ALT_HOTSPOT_CLIENT_PATH
++ HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
++ else
++ HOTSPOT_CLIENT_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
++ endif
++ HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
++endif
++
++# HOTSPOT_SERVER_PATH: location of server jvm library file.
++ifdef ALT_HOTSPOT_SERVER_PATH
++ HOTSPOT_SERVER_PATH :=$(call FullPath,$(ALT_HOTSPOT_SERVER_PATH))
++else
++ HOTSPOT_SERVER_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/server
++endif
++HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
++
++# Special define for checking the binaries
++
++# Debug builds should downgrade warnings to just info
++MAPFILE_WARNING-DBG=INFO
++MAPFILE_WARNING-OPT=WARNING
++MAPFILE_WARNING-=WARNING
++MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))
++
++# Macro to check it's input file for banned dependencies and verify the
++# binary built properly. Relies on process exit code.
++ifndef CROSS_COMPILE_ARCH
++ifeq ($(OS_VENDOR), OpenBSD)
++define binary_file_verification # binary_file
++( \
++ $(ECHO) "Checking for mapfile use in: $1" && \
++ if [ "`$(OBJDUMP) -T $1 | $(EGREP) '[0-9a-f]* g *DF \.text.*SUNWprivate'`" = "" ] ; then \
++ $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
++ fi && \
++ $(ECHO) "Library loads for: $1" && \
++ $(LDD) $1 && \
++ $(ECHO) "RUNPATH for: $1" && \
++ ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
++) || true
++endef
++else
++define binary_file_verification # binary_file
++( \
++ $(ECHO) "Checking for mapfile use in: $1" && \
++ if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
++ $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
++ fi && \
++ $(ECHO) "Library loads for: $1" && \
++ $(LDD) $1 && \
++ $(ECHO) "RUNPATH for: $1" && \
++ ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
++)
++endef
++endif
++else
++define binary_file_verification
++( \
++ $(ECHO) "Skipping binary file verification for cross-compile build" \
++)
++endef
++endif
++
+--- ./jdk/make/common/shared/Defs-utils.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/shared/Defs-utils.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -74,6 +74,13 @@
+ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
+ endif
+
++ifeq ($(PLATFORM),bsd)
++ UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
++ UTILS_USR_BIN_PATH=$(USRBIN_PATH)
++ UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
++ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
++endif
++
+ # Utilities
+ ifdef CROSS_COMPILE_ARCH
+ AR = $(COMPILER_PATH)ar
+@@ -251,3 +258,35 @@
+ # Builtin shell command, no -e option needed
+ ECHO = echo
+ endif
++
++# BSD specific
++ifeq ($(PLATFORM),bsd)
++ BASENAME = $(UTILS_USR_BIN_PATH)basename
++ EGREP = $(UTILS_USR_BIN_PATH)egrep
++ EXPR = $(UTILS_COMMAND_PATH)expr
++ FMT = $(UTILS_USR_BIN_PATH)fmt
++ GREP = $(UTILS_USR_BIN_PATH)grep
++ GUNZIP = $(UTILS_USR_BIN_PATH)gunzip
++ ID = $(UTILS_USR_BIN_PATH)id
++ MSGFMT = $(UTILS_DEVTOOL_PATH)msgfmt
++ SED = $(UTILS_USR_BIN_PATH)sed
++ SORT = $(UTILS_USR_BIN_PATH)sort
++ TEST = $(UTILS_COMMAND_PATH)test
++ TOUCH = $(UTILS_USR_BIN_PATH)touch
++ TRUE = $(UTILS_USR_BIN_PATH)true
++ UNAME = $(UTILS_USR_BIN_PATH)uname
++ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
++ # BSD OS_VENDOR specific
++ ifeq ($(OS_VENDOR), OpenBSD)
++ NAWK = $(UTILS_USR_BIN_PATH)awk
++ OBJDUMP = $(UTILS_USR_BIN_PATH)objdump
++ else
++ CPIO = $(UTILS_USR_BIN_PATH)cpio
++ TAR = $(UTILS_USR_BIN_PATH)tar
++ endif
++ ifeq ($(OS_VENDOR), NetBSD)
++ NAWK = $(UTILS_USR_BIN_PATH)awk
++ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
++ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
++ endif
++endif
+--- ./jdk/make/common/shared/Defs-versions.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/shared/Defs-versions.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -44,6 +44,11 @@
+ override CC_VERSION = gcc
+ endif
+
++# BSD uses GNU compilers by default
++ifeq ($(PLATFORM), bsd)
++ override CC_VERSION = gcc
++endif
++
+ # Mac OS X uses LLVM by default
+ ifeq ($(PLATFORM), macosx)
+ override CC_VERSION = llvm
+@@ -169,6 +174,13 @@
+ endif
+ endif
+
++# BSD specific
++ifeq ($(PLATFORM), macosx)
++ REQUIRED_COMPILER_NAME = GCC4
++ REQUIRED_COMPILER_VERSION = GCC4
++ REQUIRED_CC_VER = 4.2.1
++endif
++
+ # Mac specific
+ ifeq ($(PLATFORM), macosx)
+ REQUIRED_OS_NAME = Darwin
+--- ./jdk/make/common/shared/Defs.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/shared/Defs.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -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
+ # macosx trees, depending on the component.
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ define JavaSrcDirList
+ $(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
+ endef
+--- ./jdk/make/common/shared/Platform.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/common/shared/Platform.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -298,6 +298,85 @@
+ # How much RAM does this machine have:
+ endif
+
++ifeq ($(SYSTEM_UNAME), FreeBSD)
++ PLATFORM = bsd
++ OS_NAME = freebsd
++ OS_VENDOR = FreeBSD
++ REQUIRED_OS_VERSION = 6.0
++endif
++
++ifeq ($(SYSTEM_UNAME), NetBSD)
++ PLATFORM = bsd
++ OS_NAME = netbsd
++ OS_VENDOR = NetBSD
++ REQUIRED_OS_VERSION = 3.0
++endif
++
++ifeq ($(SYSTEM_UNAME), OpenBSD)
++ PLATFORM = bsd
++ OS_NAME = openbsd
++ OS_VENDOR = OpenBSD
++ REQUIRED_OS_VERSION = 4.9
++endif
++
++# Platform settings specific to BSD
++ifeq ($(PLATFORM), bsd)
++ OS_VERSION := $(shell uname -r)
++ # Arch and OS name/version
++ mach := $(shell uname -m)
++ archExpr = case "$(mach)" in \
++ i[3-9]86) \
++ echo i586 \
++ ;; \
++ sparc64) \
++ echo sparcv9 \
++ ;; \
++ sparc*) \
++ echo sparc \
++ ;; \
++ x86_64) \
++ echo amd64 \
++ ;; \
++ "Power Macintosh") \
++ echo ppc \
++ ;; \
++ *) \
++ echo $(mach) \
++ ;; \
++ esac
++ ARCH := $(shell $(archExpr) )
++ ARCH_FAMILY := $(ARCH)
++
++ # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
++ ifneq (,$(findstring $(ARCH), i586 sparc ppc))
++ ARCH_DATA_MODEL=32
++ else
++ ARCH_DATA_MODEL=64
++ endif
++
++ # Need to maintain the jre/lib/i386 location for 32-bit Intel
++ ifeq ($(ARCH), i586)
++ LIBARCH = i386
++ else
++ LIBARCH = $(ARCH)
++ endif
++
++ # Value of Java os.arch property
++ ARCHPROP = $(LIBARCH)
++
++ # Suffix for file bundles used in previous release
++ BUNDLE_FILE_SUFFIX=.tar.gz
++ # Minimum disk space needed as determined by running 'du -sk' on
++ # a fully built workspace.
++ REQUIRED_FREE_SPACE=1500000
++ # How much RAM does this machine have:
++ ifeq ($(OS_VENDOR), OpenBSD)
++ MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' )
++ else
++ MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' )
++ endif
++endif
++
+ # Windows with and without CYGWIN will be slightly different
+ ifeq ($(SYSTEM_UNAME), Windows_NT)
+ PLATFORM = windows
+--- ./jdk/make/java/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -53,7 +53,7 @@
+ endif
+ endif # PLATFORM
+
+-ifeq ($(PLATFORM), linux)
++ifneq (,$(findstring $(PLATFORM), linux bsd))
+ SUBDIRS += jexec
+ endif # PLATFORM
+
+--- ./jdk/make/java/instrument/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/instrument/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -104,12 +104,24 @@
+ # equivalent of strcasecmp is stricmp on Windows
+ CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
+ else
+-ifneq (,$(findstring $(PLATFORM), macosx))
+- ifneq ($(ARCH), universal)
+- LDFLAGS += -Wl,-all_load
++ifneq (,$(findstring $(PLATFORM), macosx bsd))
++ ifeq ($(OS_VENDOR), Apple)
++ ifneq ($(ARCH), universal)
++ LDFLAGS += -Wl,-all_load
++ endif
++ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
++ OTHER_LDLIBS += -liconv
++ else
++ LDFLAGS += -Wl,--whole-archive
++ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
++ LDFLAGS += -Wl,--no-whole-archive
++ ifneq ($(OS_NAME), netbsd)
++# Use CPPFLAGS instead of OTHER_INCLUDES to force this last
++ CPPFLAGS += -I$(PACKAGE_PATH)/include
++ OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
++ endif
+ endif
+- LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
+- OTHER_LDLIBS += -liconv
++
+ ifeq ($(SYSTEM_ZLIB), true)
+ OTHER_LDLIBS += -lz
+ endif
+--- ./jdk/make/java/java/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/java/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -177,9 +177,11 @@
+ #
+ ifneq ($(PLATFORM), windows)
+ ifneq ($(PLATFORM), macosx)
++ifneq ($(PLATFORM), bsd)
+ HAVE_ALTZONE=true
+ endif
+ endif
++endif
+
+ ifeq ($(HAVE_ALTZONE),true)
+ OTHER_CPPFLAGS += -DHAVE_ALTZONE
+@@ -464,6 +466,9 @@
+ HELPER_EXE = $(LIBDIR)/jspawnhelper
+ BUILDHELPER = 1
+ endif
++ifeq ($(PLATFORM), bsd)
++ BUILDHELPER = 1
++endif
+
+ ARCHFLAG =
+ ifeq ($(ARCH_DATA_MODEL), 64)
+--- ./jdk/make/java/java/genlocales.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/java/genlocales.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -93,17 +93,65 @@
+
+ else
+
++ifeq ($(PLATFORM), bsd)
++
+ $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
+ @$(prep-target)
+- @$(ECHO) $(subst .properties,'\n',$(Euro_Resources_properties)) > $@.tmp.euro;
+- @$(ECHO) $(subst .java,'\n',$(Euro_Resources_java)) >> $@.tmp.euro;
+- @$(ECHO) $(subst .properties,'\n',$(NonEuro_Resources_properties)) > $@.tmp.noneuro;
+- @$(ECHO) $(subst .java,'\n',$(NonEuro_Resources_java)) >> $@.tmp.noneuro;
++ @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\
++'@g > $@.tmp.euro;
++ @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\
++'@g >> $@.tmp.euro;
++ @$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\
++'@g > $@.tmp.noneuro;
++ @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\
++'@g >> $@.tmp.noneuro;
+ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
+ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
+ $@.tmp.noneuro $< $@
+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
++
++else
++
++ifeq ($(PLATFORM), bsd)
++
++$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
++ @$(RM) $@.tmp.euro $@.tmp.noneuro;
++ @$(prep-target)
++ @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\
++'@g > $@.tmp.euro;
++ @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\
++'@g >> $@.tmp.euro;
++ @$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\
++'@g > $@.tmp.noneuro;
++ @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\
++'@g >> $@.tmp.noneuro;
++ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
++ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
++ $@.tmp.noneuro $< $@
++ @$(RM) $@.tmp.euro $@.tmp.noneuro;
++
++else
++
++$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
++ @$(RM) $@.tmp.euro $@.tmp.noneuro;
++ @$(prep-target)
++ @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\
++'@g > $@.tmp.euro;
++ @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\
++'@g >> $@.tmp.euro;
++ @$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\
++'@g > $@.tmp.noneuro;
++ @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\
++'@g >> $@.tmp.noneuro;
++ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
++ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
++ $@.tmp.noneuro $< $@
++ @$(RM) $@.tmp.euro $@.tmp.noneuro;
++endif
++
++endif
++
+ endif
+
+ genlocales : $(LocaleDataMetaInfo_Dest)
+--- ./jdk/make/java/jli/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/jli/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -119,9 +119,9 @@
+ LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
+ endif # PLATFORM
+
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), macosx bsd))
+ OTHER_CPPFLAGS += $(LIBARCH_DEFINES) -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+-else # ! MACOSX
++else # ! MACOSX || BSD
+ OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
+ endif #PLATFORM
+
+@@ -134,7 +134,7 @@
+ # Note: it is important to keep this order, meaning -lc as the
+ # last library, otherwise it could cause compatibility issues
+ # by pulling in SUNW_private symbols from libc
+- LDLIBS = -ldl -lc
++ LDLIBS = $(LIBDL) -lc
+ ifeq ($(USE_PTHREADS),true)
+ LDLIBS += -lpthread
+ endif # USE_PTHREADS
+--- ./jdk/make/java/net/FILES_c.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/net/FILES_c.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -49,6 +49,10 @@
+ FILES_c += bsd_close.c
+ endif
+
++ifeq ($(OS_VENDOR), FreeBSD)
++ FILES_c += bsd_close.c
++endif
++
+ ifeq ($(PLATFORM), windows)
+ FILES_c += TwoStacksPlainSocketImpl.c
+ FILES_c += DualStackPlainSocketImpl.c
+--- ./jdk/make/java/net/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/net/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -93,7 +93,7 @@
+
+ include $(BUILDDIR)/common/Library.gmk
+
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), macosx bsd))
+ ifdef DONT_ENABLE_IPV6
+ OTHER_CFLAGS += -DDONT_ENABLE_IPV6
+ endif
+--- ./jdk/make/java/nio/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/nio/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -263,13 +263,89 @@
+ sun/nio/fs/UnixConstants.java
+ endif # PLATFORM = linux
+
++ifeq ($(PLATFORM), bsd)
++FILES_java += \
++ sun/nio/ch/AbstractPollSelectorImpl.java \
++ sun/nio/ch/BsdAsynchronousChannelProvider.java \
++ sun/nio/ch/InheritedChannel.java \
++ sun/nio/ch/KQueue.java \
++ sun/nio/ch/KQueueArrayWrapper.java \
++ sun/nio/ch/KQueuePort.java \
++ sun/nio/ch/KQueueSelectorProvider.java \
++ sun/nio/ch/KQueueSelectorImpl.java \
++ sun/nio/ch/PollSelectorProvider.java \
++ sun/nio/ch/PollSelectorImpl.java \
++ sun/nio/ch/Port.java \
++ sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
++ sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
++ sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
++ \
++ sun/nio/fs/BsdFileStore.java \
++ sun/nio/fs/BsdFileSystem.java \
++ sun/nio/fs/BsdFileSystemProvider.java \
++ sun/nio/fs/BsdNativeDispatcher.java \
++ sun/nio/fs/PollingWatchService.java \
++ sun/nio/fs/UnixChannelFactory.java \
++ sun/nio/fs/UnixCopyFile.java \
++ sun/nio/fs/UnixDirectoryStream.java \
++ sun/nio/fs/UnixException.java \
++ sun/nio/fs/UnixFileAttributeViews.java \
++ sun/nio/fs/UnixFileAttributes.java \
++ sun/nio/fs/UnixFileKey.java \
++ sun/nio/fs/UnixFileModeAttribute.java \
++ sun/nio/fs/UnixFileStore.java \
++ sun/nio/fs/UnixFileStoreAttributes.java \
++ sun/nio/fs/UnixFileSystem.java \
++ sun/nio/fs/UnixFileSystemProvider.java \
++ sun/nio/fs/UnixMountEntry.java \
++ sun/nio/fs/UnixNativeDispatcher.java \
++ sun/nio/fs/UnixPath.java \
++ sun/nio/fs/UnixSecureDirectoryStream.java \
++ sun/nio/fs/UnixUriUtils.java \
++ sun/nio/fs/UnixUserPrincipals.java
++
++FILES_c += \
++ InheritedChannel.c \
++ NativeThread.c \
++ PollArrayWrapper.c \
++ UnixAsynchronousServerSocketChannelImpl.c \
++ UnixAsynchronousSocketChannelImpl.c \
++ \
++ BsdNativeDispatcher.c \
++ UnixCopyFile.c \
++ UnixNativeDispatcher.c \
++ \
++ KQueue.c \
++ KQueueArrayWrapper.c \
++ KQueuePort.c
++
++FILES_export += \
++ sun/nio/ch/InheritedChannel.java \
++ sun/nio/ch/KQueue.java \
++ sun/nio/ch/KQueuePort.java \
++ sun/nio/ch/NativeThread.java \
++ sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
++ sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
++ \
++ sun/nio/fs/BsdNativeDispatcher.java \
++ sun/nio/fs/UnixCopyFile.java \
++ sun/nio/fs/UnixNativeDispatcher.java
++
++FILES_gen += \
++ sun/nio/fs/UnixConstants.java
++
++endif # PLATFORM = bsd
++
+ ifeq ($(PLATFORM), macosx)
+ FILES_java += \
+ sun/nio/ch/AbstractPollSelectorImpl.java \
+ sun/nio/ch/BsdAsynchronousChannelProvider.java \
+ sun/nio/ch/InheritedChannel.java \
+ sun/nio/ch/KQueue.java \
++ sun/nio/ch/KQueueArrayWrapper.java
+ sun/nio/ch/KQueuePort.java \
++ sun/nio/ch/KQueueSelectorProvider.java \
++ sun/nio/ch/KQueueSelectorImpl.java \
+ sun/nio/ch/PollSelectorProvider.java \
+ sun/nio/ch/PollSelectorImpl.java \
+ sun/nio/ch/Port.java \
+@@ -317,6 +393,7 @@
+ UnixNativeDispatcher.c \
+ \
+ KQueue.c \
++ KQueueArrayWrapper.c \
+ KQueuePort.c
+
+ FILES_export += \
+@@ -330,19 +407,13 @@
+ sun/nio/fs/BsdNativeDispatcher.java \
+ sun/nio/fs/UnixCopyFile.java \
+ sun/nio/fs/UnixNativeDispatcher.java
+-
++
+ FILES_gen += \
+ sun/nio/fs/UnixConstants.java
+-endif # PLATFORM = bsd, macosx
+
+-ifeq ($(PLATFORM), macosx)
+-FILES_java += \
+- sun/nio/ch/KQueueSelectorProvider.java \
+- sun/nio/ch/KQueueSelectorImpl.java \
+- sun/nio/ch/KQueueArrayWrapper.java
++endif # PLATFORM = macosx
+
+-FILES_c += \
+- KQueueArrayWrapper.c
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+
+ vpath %.c $(call NativeSrcDirList,,native/sun/nio/fs)
+ vpath %.c $(call NativeSrcDirList,,native/sun/nio/ch)
+@@ -388,6 +459,9 @@
+ ifeq ($(PLATFORM), macosx)
+ OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread -framework CoreFoundation
+ endif
++ifeq ($(PLATFORM), bsd)
++OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread
++endif
+ ifeq ($(PLATFORM), solaris)
+ OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
+ -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
+@@ -410,7 +484,7 @@
+ ifeq ($(PLATFORM), linux)
+ FILES_m = mapfile-linux
+ endif
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ FILES_m = mapfile-bsd
+ endif
+ include $(BUILDDIR)/common/Mapfile-vers.gmk
+--- ./jdk/make/java/nio/mapfile-bsd Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/nio/mapfile-bsd Sun Jan 25 08:34:16 2015 -0800
+@@ -70,6 +70,7 @@
+ Java_sun_nio_ch_IOUtil_drain;
+ Java_sun_nio_ch_IOUtil_fdVal;
+ Java_sun_nio_ch_IOUtil_initIDs;
++ Java_sun_nio_ch_IOUtil_iovMax;
+ Java_sun_nio_ch_IOUtil_makePipe;
+ Java_sun_nio_ch_IOUtil_randomBytes;
+ Java_sun_nio_ch_IOUtil_setfdVal;
+@@ -80,6 +81,11 @@
+ Java_sun_nio_ch_KQueue_identOffset;
+ Java_sun_nio_ch_KQueue_filterOffset;
+ Java_sun_nio_ch_KQueue_flagsOffset;
++ Java_sun_nio_ch_KQueueArrayWrapper_initStructSizes;
++ Java_sun_nio_ch_KQueueArrayWrapper_init;
++ Java_sun_nio_ch_KQueueArrayWrapper_register0;
++ Java_sun_nio_ch_KQueueArrayWrapper_kevent0;
++ Java_sun_nio_ch_KQueueArrayWrapper_interrupt;
+ Java_sun_nio_ch_KQueuePort_socketpair;
+ Java_sun_nio_ch_KQueuePort_interrupt;
+ Java_sun_nio_ch_KQueuePort_drain1;
+--- ./jdk/make/java/npt/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/npt/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -74,6 +74,14 @@
+ OTHER_LDLIBS += -liconv
+ endif
+
++# Add location of iconv headers
++ifeq ($(PLATFORM), bsd)
++ ifneq ($(OS_NAME), netbsd)
++ CPPFLAGS += -I$(PACKAGE_PATH)/include
++ OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
++ endif
++endif
++
+ #
+ # Add to ambient vpath so we pick up the library files
+ #
+--- ./jdk/make/java/redist/fonts/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/java/redist/fonts/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -42,7 +42,7 @@
+ $(LIBDIR)/fonts/LucidaSansRegular.ttf \
+ $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
+
+-ifeq ($(PLATFORM), linux)
++ifneq (,$(findstring $(PLATFORM), linux bsd))
+
+ # The oblique versions of the font are derived from the base versions
+ # and since 2D can do this derivation on the fly at run time there is no
+@@ -82,7 +82,7 @@
+ $(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
+ $(install-file)
+
+-ifeq ($(PLATFORM), linux)
++ifneq (,$(findstring $(PLATFORM), linux bsd))
+
+ # The oblique fonts are only needed/wanted on Linux.
+
+@@ -96,7 +96,7 @@
+ $(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
+ $(install-file)
+
+-endif # linux
++endif # linux || bsd
+
+ all build : $(INTERNAL_IMPORT_LIST)
+
+--- ./jdk/make/javax/sound/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/javax/sound/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -111,6 +111,21 @@
+ #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
+ endif # PLATFORM linux
+
++ifeq ($(PLATFORM), bsd)
++ifeq ($(OS_VENDOR), FreeBSD)
++ # ALSA handles directaudio, ports, and MIDI
++ SUBDIRS += jsoundalsa
++ EXTRA_SOUND_JNI_LIBS += jsoundalsa
++else
++ # build with empty MIDI i/o
++ INCLUDE_MIDI = TRUE
++ # build with empty ports
++ INCLUDE_PORTS = TRUE
++ # build with empty direct audio
++ INCLUDE_DAUDIO = TRUE
++endif
++endif # PLATFORM bsd
++
+ ifeq ($(PLATFORM), macosx)
+ CPPFLAGS += -DUSE_PORTS=TRUE \
+ -DUSE_DAUDIO=TRUE \
+--- ./jdk/make/javax/sound/SoundDefs.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/javax/sound/SoundDefs.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -40,6 +40,10 @@
+ CPPFLAGS += -DX_PLATFORM=X_LINUX
+ endif # PLATFORM linux
+
++ifeq ($(PLATFORM), bsd)
++ CPPFLAGS += -DX_PLATFORM=X_BSD
++endif # PLATFORM bsd
++
+ ifeq ($(PLATFORM), macosx)
+ CPPFLAGS += -DX_PLATFORM=X_MACOSX
+ endif # PLATFORM macosx
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/javax/sound/jsoundalsa/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -51,6 +51,7 @@
+ $(PORTFILES_c)
+
+ # platform dependent files
++ifeq ($(PLATFORM), linux)
+ FILES_c += \
+ PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_PCM.c \
+@@ -60,19 +61,37 @@
+ PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_Ports.c
+
++MIDI_CPPFLAGS= \
++ -DUSE_PLATFORM_MIDI_OUT=TRUE \
++ -DUSE_PLATFORM_MIDI_IN=TRUE
++endif
++
++ifeq ($(PLATFORM), bsd)
++FILES_c += \
++ PLATFORM_API_BsdOS_ALSA_CommonUtils.c \
++ PLATFORM_API_BsdOS_ALSA_PCM.c \
++ PLATFORM_API_BsdOS_ALSA_PCMUtils.c \
++ PLATFORM_API_BsdOS_ALSA_MidiIn.c \
++ PLATFORM_API_BsdOS_ALSA_MidiOut.c \
++ PLATFORM_API_BsdOS_ALSA_MidiUtils.c \
++ PLATFORM_API_BsdOS_ALSA_Ports.c
++
++MIDI_CPPFLAGS=
++endif
++
+ FILES_export = \
+ $(DAUDIOFILES_export) \
+ $(MIDIFILES_export) \
+ $(PORTFILES_export)
+
+-OTHER_LDLIBS += -lasound
++OTHER_LDLIBS += -L$(ALSA_LIB_PATH) -lasound
+
+ CPPFLAGS += \
+ -DUSE_DAUDIO=TRUE \
+ -DUSE_PORTS=TRUE \
+- -DUSE_PLATFORM_MIDI_OUT=TRUE \
+- -DUSE_PLATFORM_MIDI_IN=TRUE \
+- -I$(SHARE_SRC)/native/com/sun/media/sound
++ $(MIDI_CPPFLAGS) \
++ -I$(SHARE_SRC)/native/com/sun/media/sound \
++ -I$(ALSA_HEADERS_PATH)
+
+ #
+ # Add to the ambient VPATH.
+--- ./jdk/make/jpda/transport/socket/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/jpda/transport/socket/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -38,6 +38,11 @@
+
+ include $(BUILDDIR)/common/Defs.gmk
+
++ifeq ($(PLATFORM), bsd))
++ LIBSOCKET =
++ OTHER_LDLIBS += -pthread
++endif
++
+ ifeq ($(PLATFORM), linux)
+ OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
+ endif
+--- ./jdk/make/sun/awt/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/sun/awt/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -127,7 +127,12 @@
+ OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
+ endif
+
+-FILES_c += initIDs.c
++ifeq ($(PLATFORM), bsd)
++FILES_c = $(FILES_2D_c)
++FILES_c += awt_LoadLibrary.c
++OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
++OTHER_LDLIBS = $(JVMLIB) $(LIBM)
++endif
+
+ ifeq ($(PLATFORM), macosx)
+ FILES_c = $(FILES_2D_c)
+@@ -136,6 +141,8 @@
+ OTHER_LDLIBS = $(JVMLIB) $(LIBM)
+ endif
+
++FILES_c += initIDs.c
++
+ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
+ endif # PLATFORM
+
+@@ -504,6 +511,17 @@
+ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
+ endif # PLATFORM
+
++ifeq ($(PLATFORM), bsd)
++# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv BSD
++
++FONTCONFIGS_SRC = $(PLATFORM_SRC)/classes/sun/awt/fontconfigs
++_FONTCONFIGS = \
++ fontconfig.properties
++
++FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
++
++# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ BSD
++endif # PLATFORM
+
+ ifeq ($(PLATFORM), macosx)
+ # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X
+@@ -609,6 +627,9 @@
+ -I$(OPENWIN_HOME)/include/X11/extensions \
+ -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
+ endif
++ifeq ($(PLATFORM), bsd)
++CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
++endif
+ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+ -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
+ -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
+@@ -630,7 +651,13 @@
+ -I$(PLATFORM_SRC)/native/$(PKGDIR) \
+ $(EVENT_MODEL)
+
+-ifeq ($(PLATFORM), linux)
++# include these last so we don't pick up unintentional includes
++ifeq ($(PLATFORM), bsd)
++CPPFLAGS += -I$(OPENWIN_HOME)/include \
++ -I$(OPENWIN_HOME)/include/X11/extensions
++endif
++
++ifneq (,$(findstring $(PLATFORM), linux bsd))
+ LDFLAGS += -L$(OPENWIN_LIB)
+ endif
+
+--- ./jdk/make/sun/awt/mawt.gmk Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/sun/awt/mawt.gmk Sun Jan 25 08:34:16 2015 -0800
+@@ -169,7 +169,7 @@
+ OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
+ endif
+
+-ifneq (,$(findstring $(PLATFORM), linux macosx))
++ifneq (,$(findstring $(PLATFORM), bsd linux macosx))
+ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
+ # XXX what is this define below? Isn't it motif-related?
+ OTHER_CFLAGS += -DXMSTRINGDEFINES=1
+@@ -193,6 +193,7 @@
+ #
+ # Other extra flags needed for compiling.
+ #
++ifneq ($(PLATFORM), bsd))
+ CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+
+ ifndef HEADLESS
+@@ -200,6 +201,7 @@
+ LDFLAGS += -L$(OPENWIN_LIB)
+
+ endif # !HEADLESS
++endif # !PLATFORM
+
+ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+ -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
+@@ -223,13 +225,16 @@
+ -I$(PLATFORM_SRC)/native/$(PKGDIR) \
+ $(EVENT_MODEL)
+
+-ifeq ($(PLATFORM), macosx)
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+
+ ifndef HEADLESS
+ CPPFLAGS += -I$(MOTIF_DIR)/include \
+ -I$(OPENWIN_HOME)/include
+ LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
++ifeq ($(OS_NAME), netbsd)
++LDFLAGS += -Wl,-R$(OPENWIN_LIB)
++endif
+
+ endif # !HEADLESS
+ endif # PLATFORM
+@@ -240,6 +245,12 @@
+ $(wildcard /usr/include/X11/extensions))
+ endif
+
++ifeq ($(PLATFORM), bsd))
++ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
++ -I$(OPENWIN_HOME)/include \
++ -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
++endif
++
+ ifeq ($(PLATFORM), macosx))
+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
+ -I$(OPENWIN_HOME)/include
+--- ./jdk/make/sun/font/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/sun/font/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -95,7 +95,7 @@
+ endif # PLATFORM
+
+ # Turn off aliasing with GCC for ExtensionSubtables.cpp
+-ifeq ($(PLATFORM), linux)
++ifneq (,$(findstring $(PLATFORM), bsd linux))
+ CXXFLAGS += $(CXXFLAGS_$(@F))
+ CXXFLAGS_ExtensionSubtables.o = -fno-strict-aliasing
+ endif
+@@ -182,7 +182,7 @@
+ # Libraries to link, and other C flags.
+ #
+
+-ifeq ($(PLATFORM), macosx))
++ifneq (,$(findstring $(PLATFORM), bsd macosx))
+ OTHER_INCLUDES += -I$(X11_PATH)/include
+ OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
+ ifeq ($(OS_VENDOR),Apple)
+--- ./jdk/make/sun/jawt/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/sun/jawt/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -99,8 +99,7 @@
+ #
+ # Other extra flags needed for compiling.
+ #
+-CPPFLAGS += -I$(OPENWIN_HOME)/include \
+- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+ -I$(SHARE_SRC)/native/$(PKGDIR)/image \
+ -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
+ -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
+@@ -114,6 +113,7 @@
+ -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
+ -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
+ -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
++ -I$(OPENWIN_HOME)/include \
+ $(EVENT_MODEL)
+
+ #
+@@ -127,7 +127,7 @@
+ endif
+ endif # PLATFORM
+
+-ifeq ($(PLATFORM), linux)
++ifneq (,$(findstring $(PLATFORM), linux bsd))
+ ifndef BUILD_HEADLESS_ONLY
+ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
+ else
+--- ./jdk/make/sun/rmi/rmi/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/sun/rmi/rmi/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -71,6 +71,9 @@
+ BUILD_TARGETS += bin
+ endif
+ endif
++ifeq ($(PLATFORM), bsd)
++ BUILD_TARGETS += bin
++endif
+
+ build: $(BUILD_TARGETS)
+
+--- ./jdk/make/sun/splashscreen/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/sun/splashscreen/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -61,6 +61,12 @@
+
+ CFLAGS += -DSPLASHSCREEN
+
++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
++ifneq ($(SYSTEM_ZLIB),true)
++ CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
++endif
++
+ ifeq ($(PLATFORM), macosx)
+ CFLAGS += -DWITH_MACOSX
+
+@@ -83,15 +89,16 @@
+ -framework JavaNativeFoundation
+ else ifneq ($(PLATFORM), windows)
+ CFLAGS += -DWITH_X11
+- ifeq ($(PLATFORM), macosx))
+- OTHER_LDLIBS += -liconv
+- CPPFLAGS += -I$(OPENWIN_HOME)/include \
+- -I$(OPENWIN_HOME)/include/X11/extensions
+- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -pthread
+- else
+- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
++ ifeq ($(PLATFORM), bsd))
++ ifeq ($(OS_NAME), netbsd)
++ OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB)
++ else
++ CPPFLAGS += -I$(PACKAGE_PATH)/include
++ OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
++ endif
+ endif
++ CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
++ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
+ else # PLATFORM
+ CFLAGS += -DWITH_WIN32
+ OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll
+@@ -121,11 +128,7 @@
+ CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen)
+ CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp)
+ endif
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+-ifneq ($(SYSTEM_ZLIB),true)
+- CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+-else
++ifeq ($(SYSTEM_ZLIB),true)
+ OTHER_CFLAGS += $(ZLIB_CFLAGS)
+ OTHER_LDLIBS += $(ZLIB_LIBS)
+ endif
+--- ./jdk/make/sun/xawt/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/sun/xawt/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -52,6 +52,9 @@
+ AUTO_JAVA_PRUNE = WrapperGenerator.java
+
+ LDFLAGS += -L$(OPENWIN_LIB)
++ifeq ($(OS_NAME), netbsd)
++LDFLAGS += -Wl,-R$(OPENWIN_LIB)
++endif
+
+ # For Xrender extension.
+ ifeq ($(PLATFORM), solaris)
+@@ -63,6 +66,11 @@
+ dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
+ endif
+
++ifeq ($(PLATFORM), bsd)
++LDFLAGS += -pthread
++dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
++endif
++
+ ifeq ($(PLATFORM), macosx))
+ LDFLAGS += -pthread
+ dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
+@@ -110,8 +118,6 @@
+ dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
+ endif
+
+-CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+-
+ CPPFLAGS += -DXAWT -DXAWT_HACK \
+ -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
+ -I$(PLATFORM_SRC)/native/sun/awt \
+@@ -138,6 +144,8 @@
+ -I$(SHARE_SRC)/native/sun/awt \
+ -I$(PLATFORM_SRC)/native/sun/awt
+
++CPPFLAGS += -I$(CUPS_HEADERS_PATH)
++
+ ifeq ($(PLATFORM), linux)
+ ifndef CROSS_COMPILE_ARCH
+ # Allows for builds on Debian GNU Linux, X11 is in a different place
+@@ -173,6 +181,11 @@
+ endif
+ endif
+
++ifeq ($(PLATFORM), bsd)
++ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(OPENWIN_HOME)/include
++ CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
++endif
++
+ ifeq ($(PLATFORM), macosx)
+ CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+ endif
+--- ./jdk/make/tools/freetypecheck/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/make/tools/freetypecheck/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -52,8 +52,15 @@
+ else
+ ifeq ($(PLATFORM), macosx)
+ FT_LD_OPTIONS += -lfreetype -lz
+- else # linux
+- FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
++ else
++ ifeq ($(PLATFORM), bsd)
++ ifeq ($(OS_NAME), netbsd)
++ FT_LD_OPTIONS += -Wl,-R$(FREETYPE_LIB_PATH)
++ endif
++ FT_LD_OPTIONS += -lfreetype -lz
++ else # linux
++ FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
++ endif
+ endif
+ endif
+ endif
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/make/tools/sharing/classlist.bsd Sun Jan 25 08:34:16 2015 -0800
+@@ -0,0 +1,2327 @@
++java/lang/Object
++java/lang/String
++java/io/Serializable
++java/lang/Comparable
++java/lang/CharSequence
++java/lang/Class
++java/lang/reflect/GenericDeclaration
++java/lang/reflect/Type
++java/lang/reflect/AnnotatedElement
++java/lang/Cloneable
++java/lang/ClassLoader
++java/lang/System
++java/lang/Throwable
++java/lang/Error
++java/lang/ThreadDeath
++java/lang/Exception
++java/lang/RuntimeException
++java/security/ProtectionDomain
++java/security/AccessControlContext
++java/lang/ClassNotFoundException
++java/lang/NoClassDefFoundError
++java/lang/LinkageError
++java/lang/ClassCastException
++java/lang/ArrayStoreException
++java/lang/VirtualMachineError
++java/lang/OutOfMemoryError
++java/lang/StackOverflowError
++java/lang/IllegalMonitorStateException
++java/lang/ref/Reference
++java/lang/ref/SoftReference
++java/lang/ref/WeakReference
++java/lang/ref/FinalReference
++java/lang/ref/PhantomReference
++java/lang/ref/Finalizer
++java/lang/Thread
++java/lang/Runnable
++java/lang/ThreadGroup
++java/lang/Thread$UncaughtExceptionHandler
++java/util/Properties
++java/util/Hashtable
++java/util/Map
++java/util/Dictionary
++java/lang/reflect/AccessibleObject
++java/lang/reflect/Field
++java/lang/reflect/Member
++java/lang/reflect/Method
++java/lang/reflect/Constructor
++sun/reflect/MagicAccessorImpl
++sun/reflect/MethodAccessorImpl
++sun/reflect/MethodAccessor
++sun/reflect/ConstructorAccessorImpl
++sun/reflect/ConstructorAccessor
++sun/reflect/DelegatingClassLoader
++sun/reflect/ConstantPool
++sun/reflect/UnsafeStaticFieldAccessorImpl
++sun/reflect/UnsafeFieldAccessorImpl
++sun/reflect/FieldAccessorImpl
++sun/reflect/FieldAccessor
++java/util/Vector
++java/util/List
++java/util/Collection
++java/lang/Iterable
++java/util/RandomAccess
++java/util/AbstractList
++java/util/AbstractCollection
++java/lang/StringBuffer
++java/lang/AbstractStringBuilder
++java/lang/Appendable
++java/lang/StackTraceElement
++java/nio/Buffer
++java/lang/Boolean
++java/lang/Character
++java/lang/Float
++java/lang/Number
++java/lang/Double
++java/lang/Byte
++java/lang/Short
++java/lang/Integer
++java/lang/Long
++java/lang/NullPointerException
++java/lang/ArithmeticException
++java/io/ObjectStreamField
++java/lang/String$CaseInsensitiveComparator
++java/util/Comparator
++java/lang/RuntimePermission
++java/security/BasicPermission
++java/security/Permission
++java/security/Guard
++sun/misc/SoftCache
++java/util/AbstractMap
++java/lang/ref/ReferenceQueue
++java/lang/ref/ReferenceQueue$Null
++java/lang/ref/ReferenceQueue$Lock
++java/util/HashMap
++java/lang/annotation/Annotation
++java/util/HashMap$Entry
++java/util/Map$Entry
++java/security/AccessController
++java/lang/reflect/ReflectPermission
++sun/reflect/ReflectionFactory$GetReflectionFactoryAction
++java/security/PrivilegedAction
++java/util/Stack
++sun/reflect/ReflectionFactory
++java/lang/ref/Reference$Lock
++java/lang/ref/Reference$ReferenceHandler
++java/lang/ref/Finalizer$FinalizerThread
++java/util/Enumeration
++java/util/Iterator
++java/util/Hashtable$Entry
++java/nio/charset/Charset
++sun/nio/cs/StandardCharsets
++sun/nio/cs/FastCharsetProvider
++java/nio/charset/spi/CharsetProvider
++sun/nio/cs/StandardCharsets$Aliases
++sun/util/PreHashedMap
++sun/nio/cs/StandardCharsets$Classes
++sun/nio/cs/StandardCharsets$Cache
++java/lang/ThreadLocal
++java/util/concurrent/atomic/AtomicInteger
++sun/misc/Unsafe
++java/lang/NoSuchMethodError
++java/lang/IncompatibleClassChangeError
++sun/reflect/Reflection
++java/util/Collections
++java/util/Collections$EmptySet
++java/util/AbstractSet
++java/util/Set
++java/util/Collections$EmptyList
++java/util/Collections$EmptyMap
++java/util/Collections$ReverseComparator
++java/util/Collections$SynchronizedMap
++java/lang/Class$3
++java/lang/reflect/Modifier
++java/lang/reflect/ReflectAccess
++sun/reflect/LangReflectAccess
++java/util/Arrays
++java/lang/Math
++sun/nio/cs/US_ASCII
++sun/nio/cs/HistoricallyNamedCharset
++sun/misc/VM
++java/lang/StringCoding
++java/lang/ThreadLocal$ThreadLocalMap
++java/lang/ThreadLocal$ThreadLocalMap$Entry
++java/lang/StringCoding$StringDecoder
++sun/nio/cs/US_ASCII$Decoder
++java/nio/charset/CharsetDecoder
++java/nio/charset/CodingErrorAction
++java/nio/ByteBuffer
++java/nio/HeapByteBuffer
++java/nio/Bits
++java/nio/ByteOrder
++java/nio/CharBuffer
++java/lang/Readable
++java/nio/HeapCharBuffer
++java/nio/charset/CoderResult
++java/nio/charset/CoderResult$1
++java/nio/charset/CoderResult$Cache
++java/nio/charset/CoderResult$2
++sun/misc/Version
++java/io/FileInputStream
++java/io/InputStream
++java/io/Closeable
++java/io/FileDescriptor
++java/io/FileOutputStream
++java/io/OutputStream
++java/io/Flushable
++java/io/BufferedInputStream
++java/io/FilterInputStream
++java/util/concurrent/atomic/AtomicReferenceFieldUpdater
++java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl
++sun/reflect/misc/ReflectUtil
++java/io/PrintStream
++java/io/FilterOutputStream
++java/io/BufferedOutputStream
++java/io/OutputStreamWriter
++java/io/Writer
++sun/nio/cs/StreamEncoder
++sun/security/action/GetPropertyAction
++sun/nio/cs/US_ASCII$Encoder
++java/nio/charset/CharsetEncoder
++sun/nio/cs/Surrogate$Parser
++sun/nio/cs/Surrogate
++java/io/BufferedWriter
++java/lang/Runtime
++java/io/File
++java/io/FileSystem
++java/io/UnixFileSystem
++java/io/ExpiringCache
++java/io/ExpiringCache$1
++java/util/LinkedHashMap
++java/util/LinkedHashMap$Entry
++java/lang/StringBuilder
++sun/misc/SharedSecrets
++java/lang/ClassLoader$3
++java/lang/StringCoding$StringEncoder
++java/io/ExpiringCache$Entry
++java/lang/ClassLoader$NativeLibrary
++java/lang/Terminator
++java/lang/Terminator$1
++sun/misc/SignalHandler
++sun/misc/Signal
++sun/misc/NativeSignalHandler
++java/io/Console
++java/io/Console$1
++sun/misc/JavaIOAccess
++java/lang/Shutdown
++java/util/ArrayList
++java/lang/Shutdown$Lock
++java/lang/ApplicationShutdownHooks
++java/util/IdentityHashMap
++sun/misc/OSEnvironment
++java/lang/System$2
++sun/misc/JavaLangAccess
++java/lang/Compiler
++java/lang/Compiler$1
++sun/misc/Launcher
++sun/misc/Launcher$Factory
++java/net/URLStreamHandlerFactory
++sun/misc/Launcher$ExtClassLoader
++java/net/URLClassLoader
++java/security/SecureClassLoader
++sun/security/util/Debug
++java/net/URLClassLoader$7
++sun/misc/JavaNetAccess
++java/util/StringTokenizer
++sun/misc/Launcher$ExtClassLoader$1
++java/security/PrivilegedExceptionAction
++sun/misc/MetaIndex
++java/io/BufferedReader
++java/io/Reader
++java/io/FileReader
++java/io/InputStreamReader
++sun/nio/cs/StreamDecoder
++java/lang/reflect/Array
++sun/net/www/ParseUtil
++java/util/BitSet
++java/io/ObjectStreamClass
++java/net/URL
++java/util/Locale
++java/util/concurrent/ConcurrentHashMap
++java/util/concurrent/ConcurrentMap
++java/util/concurrent/ConcurrentHashMap$Segment
++java/util/concurrent/locks/ReentrantLock
++java/util/concurrent/locks/Lock
++java/util/concurrent/locks/ReentrantLock$NonfairSync
++java/util/concurrent/locks/ReentrantLock$Sync
++java/util/concurrent/locks/AbstractQueuedSynchronizer
++java/util/concurrent/locks/AbstractOwnableSynchronizer
++java/util/concurrent/locks/AbstractQueuedSynchronizer$Node
++java/util/concurrent/ConcurrentHashMap$HashEntry
++java/lang/CharacterDataLatin1
++java/net/Parts
++sun/net/www/protocol/file/Handler
++java/net/URLStreamHandler
++java/lang/Class$1
++sun/reflect/ReflectionFactory$1
++sun/reflect/NativeConstructorAccessorImpl
++sun/reflect/DelegatingConstructorAccessorImpl
++java/util/HashSet
++sun/misc/URLClassPath
++sun/net/www/protocol/jar/Handler
++sun/misc/Launcher$AppClassLoader
++sun/misc/Launcher$AppClassLoader$1
++java/lang/SystemClassLoaderAction
++java/net/URLClassLoader$1
++sun/misc/URLClassPath$3
++sun/misc/URLClassPath$JarLoader
++sun/misc/URLClassPath$Loader
++java/security/PrivilegedActionException
++sun/misc/URLClassPath$FileLoader
++sun/misc/URLClassPath$FileLoader$1
++sun/misc/Resource
++sun/nio/ByteBuffered
++java/security/CodeSource
++java/security/Permissions
++java/security/PermissionCollection
++sun/net/www/protocol/file/FileURLConnection
++sun/net/www/URLConnection
++java/net/URLConnection
++java/net/UnknownContentHandler
++java/net/ContentHandler
++sun/net/www/MessageHeader
++java/io/FilePermission
++java/io/FilePermission$1
++sun/security/provider/PolicyFile
++java/security/Policy
++java/security/Policy$UnsupportedEmptyCollection
++java/io/FilePermissionCollection
++java/security/AllPermission
++java/security/UnresolvedPermission
++java/security/BasicPermissionCollection
++java/security/Principal
++java/security/cert/Certificate
++java/util/AbstractList$Itr
++java/util/IdentityHashMap$KeySet
++java/util/IdentityHashMap$KeyIterator
++java/util/IdentityHashMap$IdentityHashMapIterator
++java/io/DeleteOnExitHook
++java/util/LinkedHashSet
++java/util/HashMap$KeySet
++java/util/LinkedHashMap$KeyIterator
++java/util/LinkedHashMap$LinkedHashIterator
++java/awt/Frame
++java/awt/MenuContainer
++java/awt/Window
++javax/accessibility/Accessible
++java/awt/Container
++java/awt/Component
++java/awt/image/ImageObserver
++java/lang/InterruptedException
++java/awt/Label
++java/util/logging/Logger
++java/util/logging/Handler
++java/util/logging/Level
++java/util/logging/LogManager
++java/util/logging/LogManager$1
++java/beans/PropertyChangeSupport
++java/util/logging/LogManager$LogNode
++java/util/logging/LoggingPermission
++java/util/logging/LogManager$Cleaner
++java/util/logging/LogManager$RootLogger
++java/util/logging/LogManager$2
++java/util/Properties$LineReader
++java/util/Hashtable$Enumerator
++java/beans/PropertyChangeEvent
++java/util/EventObject
++java/awt/Component$AWTTreeLock
++sun/awt/NativeLibLoader
++sun/security/action/LoadLibraryAction
++java/awt/GraphicsEnvironment
++java/awt/GraphicsEnvironment$1
++java/lang/ProcessEnvironment
++java/lang/ProcessEnvironment$Variable
++java/lang/ProcessEnvironment$ExternalData
++java/lang/ProcessEnvironment$Value
++java/lang/ProcessEnvironment$StringEnvironment
++java/util/Collections$UnmodifiableMap
++java/awt/Toolkit
++java/awt/Toolkit$3
++sun/util/CoreResourceBundleControl
++java/util/ResourceBundle$Control
++java/util/Arrays$ArrayList
++java/util/Collections$UnmodifiableRandomAccessList
++java/util/Collections$UnmodifiableList
++java/util/Collections$UnmodifiableCollection
++java/util/ResourceBundle
++java/util/ResourceBundle$1
++java/util/ResourceBundle$RBClassLoader
++java/util/ResourceBundle$RBClassLoader$1
++java/util/ResourceBundle$CacheKey
++java/util/ResourceBundle$LoaderReference
++java/util/ResourceBundle$CacheKeyReference
++java/util/ResourceBundle$SingleFormatControl
++sun/awt/resources/awt
++java/util/ListResourceBundle
++java/awt/Toolkit$1
++java/io/FileNotFoundException
++java/io/IOException
++java/awt/event/KeyEvent
++java/awt/event/InputEvent
++java/awt/event/ComponentEvent
++java/awt/AWTEvent
++java/awt/event/NativeLibLoader
++java/util/WeakHashMap
++java/util/WeakHashMap$Entry
++java/awt/Component$DummyRequestFocusController
++sun/awt/RequestFocusController
++java/awt/LayoutManager
++java/awt/LightweightDispatcher
++java/awt/event/AWTEventListener
++java/util/EventListener
++java/awt/Dimension
++java/awt/geom/Dimension2D
++java/util/concurrent/atomic/AtomicBoolean
++java/awt/ComponentOrientation
++java/awt/Component$2
++java/lang/NoSuchMethodException
++sun/awt/AppContext
++sun/awt/AppContext$1
++sun/awt/AppContext$2
++sun/awt/MostRecentKeyValue
++java/awt/Cursor
++sun/awt/X11GraphicsEnvironment
++sun/java2d/SunGraphicsEnvironment
++sun/java2d/FontSupport
++sun/awt/DisplayChangedListener
++java/io/FilenameFilter
++sun/awt/X11GraphicsEnvironment$1
++sun/awt/SunToolkit
++sun/awt/WindowClosingSupport
++sun/awt/WindowClosingListener
++sun/awt/ComponentFactory
++sun/awt/InputMethodSupport
++java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject
++java/util/concurrent/locks/Condition
++sun/awt/AWTAutoShutdown
++sun/awt/SunToolkit$6
++java/awt/Dialog$ModalExclusionType
++java/lang/Enum
++java/awt/Dialog
++java/awt/Dialog$ModalityType
++java/awt/ModalEventFilter
++java/awt/EventFilter
++sun/reflect/UnsafeFieldAccessorFactory
++sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl
++sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl
++sun/awt/SunDisplayChanger
++sun/java2d/SunGraphicsEnvironment$1
++java/io/StreamTokenizer
++sun/font/FontManager
++sun/font/FileFont
++sun/font/PhysicalFont
++sun/font/Font2D
++sun/font/CompositeFont
++java/util/HashMap$Values
++java/util/HashMap$ValueIterator
++java/util/HashMap$HashIterator
++java/awt/Font
++java/awt/geom/AffineTransform
++sun/font/AttributeValues
++sun/font/EAttribute
++java/text/AttributedCharacterIterator$Attribute
++java/lang/Class$4
++sun/reflect/NativeMethodAccessorImpl
++sun/reflect/DelegatingMethodAccessorImpl
++java/awt/font/TextAttribute
++java/lang/Integer$IntegerCache
++sun/font/TrueTypeFont
++java/awt/font/FontRenderContext
++java/awt/RenderingHints
++sun/awt/SunHints
++sun/awt/SunHints$Key
++java/awt/RenderingHints$Key
++sun/awt/SunHints$Value
++sun/awt/SunHints$LCDContrastKey
++sun/font/Type1Font
++java/awt/geom/Point2D$Float
++java/awt/geom/Point2D
++sun/font/StrikeMetrics
++java/awt/geom/Rectangle2D$Float
++java/awt/geom/Rectangle2D
++java/awt/geom/RectangularShape
++java/awt/Shape
++java/awt/geom/GeneralPath
++java/awt/geom/Path2D$Float
++java/awt/geom/Path2D
++sun/font/CharToGlyphMapper
++sun/font/PhysicalStrike
++sun/font/FontStrike
++sun/font/GlyphList
++sun/font/StrikeCache
++sun/java2d/Disposer
++sun/java2d/Disposer$1
++sun/font/StrikeCache$1
++sun/awt/motif/MFontConfiguration
++sun/awt/FontConfiguration
++sun/awt/FontDescriptor
++java/util/Scanner
++java/util/regex/Pattern
++java/util/regex/Pattern$Node
++java/util/regex/Pattern$LastNode
++java/util/regex/Pattern$GroupHead
++java/util/regex/Pattern$CharPropertyNames
++java/util/regex/Pattern$CharPropertyNames$1
++java/util/regex/Pattern$CharPropertyNames$CharPropertyFactory
++java/util/regex/Pattern$CharPropertyNames$2
++java/util/regex/Pattern$CharPropertyNames$5
++java/util/regex/Pattern$CharPropertyNames$3
++java/util/regex/Pattern$CharPropertyNames$6
++java/util/regex/Pattern$CharPropertyNames$CloneableProperty
++java/util/regex/Pattern$CharProperty
++java/util/regex/Pattern$CharPropertyNames$4
++java/util/regex/Pattern$CharPropertyNames$7
++java/util/regex/Pattern$CharPropertyNames$8
++java/util/regex/Pattern$CharPropertyNames$9
++java/util/regex/Pattern$CharPropertyNames$10
++java/util/regex/Pattern$CharPropertyNames$11
++java/util/regex/Pattern$CharPropertyNames$12
++java/util/regex/Pattern$CharPropertyNames$13
++java/util/regex/Pattern$CharPropertyNames$14
++java/util/regex/Pattern$CharPropertyNames$15
++java/util/regex/Pattern$CharPropertyNames$16
++java/util/regex/Pattern$CharPropertyNames$17
++java/util/regex/Pattern$CharPropertyNames$18
++java/util/regex/Pattern$CharPropertyNames$19
++java/util/regex/Pattern$CharPropertyNames$20
++java/util/regex/Pattern$CharPropertyNames$21
++java/util/regex/Pattern$Curly
++java/util/regex/Pattern$Slice
++java/util/regex/Pattern$Begin
++java/util/regex/Pattern$First
++java/util/regex/Pattern$Start
++java/util/regex/Pattern$TreeInfo
++java/util/regex/Pattern$All
++java/util/regex/Pattern$BitClass
++java/util/regex/Pattern$BmpCharProperty
++java/util/regex/Pattern$6
++java/util/regex/Pattern$CharProperty$1
++sun/nio/ch/FileChannelImpl
++java/nio/channels/FileChannel
++java/nio/channels/ByteChannel
++java/nio/channels/ReadableByteChannel
++java/nio/channels/Channel
++java/nio/channels/WritableByteChannel
++java/nio/channels/GatheringByteChannel
++java/nio/channels/ScatteringByteChannel
++java/nio/channels/spi/AbstractInterruptibleChannel
++java/nio/channels/InterruptibleChannel
++sun/nio/ch/Util
++sun/nio/ch/IOUtil
++sun/nio/ch/FileDispatcher
++sun/nio/ch/NativeDispatcher
++sun/nio/ch/Reflect
++java/nio/MappedByteBuffer
++sun/nio/ch/Reflect$1
++sun/nio/ch/NativeThreadSet
++java/nio/channels/Channels
++java/util/Scanner$1
++sun/misc/LRUCache
++java/util/regex/Matcher
++java/util/regex/MatchResult
++java/text/NumberFormat
++java/text/Format
++java/text/spi/NumberFormatProvider
++java/util/spi/LocaleServiceProvider
++sun/util/LocaleServiceProviderPool
++sun/util/LocaleServiceProviderPool$1
++java/util/ServiceLoader
++java/util/ServiceLoader$LazyIterator
++java/util/ServiceLoader$1
++java/util/HashMap$EntrySet
++java/util/LinkedHashMap$EntryIterator
++sun/misc/Launcher$1
++sun/misc/URLClassPath$2
++java/lang/ClassLoader$2
++sun/misc/URLClassPath$1
++java/net/URLClassLoader$3
++sun/misc/CompoundEnumeration
++sun/misc/URLClassPath$JarLoader$1
++sun/misc/FileURLMapper
++java/net/URLClassLoader$3$1
++sun/util/resources/LocaleData
++sun/util/resources/LocaleData$1
++sun/util/resources/LocaleData$LocaleDataResourceBundleControl
++sun/util/LocaleDataMetaInfo
++sun/text/resources/FormatData
++java/util/ResourceBundle$BundleReference
++sun/text/resources/FormatData_en
++sun/text/resources/FormatData_en_US
++java/text/DecimalFormatSymbols
++java/text/spi/DecimalFormatSymbolsProvider
++java/util/Currency
++java/util/Currency$1
++java/util/spi/CurrencyNameProvider
++sun/util/resources/CurrencyNames
++sun/util/resources/LocaleNamesBundle
++sun/util/resources/OpenListResourceBundle
++sun/util/resources/CurrencyNames_en_US
++java/text/DecimalFormat
++java/text/FieldPosition
++java/text/DigitList
++java/math/RoundingMode
++java/util/regex/Pattern$GroupTail
++java/util/regex/Pattern$Ctype
++java/util/regex/Pattern$Ques
++java/util/regex/Pattern$GroupCurly
++java/util/regex/Pattern$5
++java/util/regex/Pattern$Loop
++java/util/regex/Pattern$Prolog
++java/util/regex/Pattern$BranchConn
++java/util/regex/Pattern$Branch
++java/nio/channels/spi/AbstractInterruptibleChannel$1
++sun/nio/ch/Interruptible
++sun/nio/ch/NativeThread
++sun/nio/ch/DirectBuffer
++java/nio/DirectByteBuffer
++java/nio/DirectByteBuffer$Deallocator
++sun/misc/Cleaner
++sun/nio/ch/IOStatus
++java/util/regex/ASCII
++java/io/DataInputStream
++java/io/DataInput
++java/lang/Short$ShortCache
++java/util/HashMap$KeyIterator
++sun/font/CompositeFontDescriptor
++sun/font/Font2DHandle
++sun/font/FontFamily
++java/awt/GraphicsDevice
++sun/awt/X11GraphicsDevice
++sun/awt/X11GraphicsConfig
++java/awt/GraphicsConfiguration
++java/awt/ImageCapabilities
++sun/java2d/x11/X11SurfaceData
++sun/java2d/SurfaceData
++java/awt/Transparency
++sun/java2d/DisposerTarget
++sun/java2d/InvalidPipeException
++java/lang/IllegalStateException
++sun/java2d/NullSurfaceData
++sun/java2d/loops/SurfaceType
++sun/awt/image/PixelConverter
++sun/awt/image/PixelConverter$Xrgb
++sun/awt/image/PixelConverter$Argb
++sun/awt/image/PixelConverter$ArgbPre
++sun/awt/image/PixelConverter$Xbgr
++sun/awt/image/PixelConverter$Rgba
++sun/awt/image/PixelConverter$RgbaPre
++sun/awt/image/PixelConverter$Ushort565Rgb
++sun/awt/image/PixelConverter$Ushort555Rgb
++sun/awt/image/PixelConverter$Ushort555Rgbx
++sun/awt/image/PixelConverter$Ushort4444Argb
++sun/awt/image/PixelConverter$ByteGray
++sun/awt/image/PixelConverter$UshortGray
++sun/awt/image/PixelConverter$Rgbx
++sun/awt/image/PixelConverter$Bgrx
++sun/awt/image/PixelConverter$ArgbBm
++java/awt/image/ColorModel
++java/awt/image/DirectColorModel
++java/awt/image/PackedColorModel
++java/awt/color/ColorSpace
++java/awt/color/ICC_Profile
++java/awt/color/ICC_ProfileRGB
++java/awt/color/ICC_Profile$1
++java/awt/color/ICC_ColorSpace
++sun/java2d/pipe/NullPipe
++sun/java2d/pipe/PixelDrawPipe
++sun/java2d/pipe/PixelFillPipe
++sun/java2d/pipe/ShapeDrawPipe
++sun/java2d/pipe/TextPipe
++sun/java2d/pipe/DrawImagePipe
++java/awt/image/IndexColorModel
++sun/java2d/pipe/LoopPipe
++sun/java2d/pipe/OutlineTextRenderer
++sun/java2d/pipe/SolidTextRenderer
++sun/java2d/pipe/GlyphListLoopPipe
++sun/java2d/pipe/GlyphListPipe
++sun/java2d/pipe/AATextRenderer
++sun/java2d/pipe/LCDTextRenderer
++sun/java2d/pipe/AlphaColorPipe
++sun/java2d/pipe/CompositePipe
++sun/java2d/pipe/PixelToShapeConverter
++sun/java2d/pipe/TextRenderer
++sun/java2d/pipe/SpanClipRenderer
++sun/java2d/pipe/Region
++sun/java2d/pipe/RegionIterator
++sun/java2d/pipe/AlphaPaintPipe
++sun/java2d/pipe/SpanShapeRenderer$Composite
++sun/java2d/pipe/SpanShapeRenderer
++sun/java2d/pipe/GeneralCompositePipe
++sun/java2d/pipe/DrawImage
++sun/java2d/loops/RenderCache
++sun/java2d/loops/RenderCache$Entry
++sun/java2d/loops/XORComposite
++java/awt/Composite
++sun/font/X11TextRenderer
++sun/java2d/loops/GraphicsPrimitive
++sun/java2d/x11/X11PMBlitLoops
++sun/java2d/loops/Blit
++sun/java2d/loops/GraphicsPrimitiveMgr
++sun/java2d/loops/CompositeType
++sun/java2d/SunGraphics2D
++sun/awt/ConstrainableGraphics
++java/awt/Graphics2D
++java/awt/Graphics
++java/awt/Color
++java/awt/Paint
++java/awt/AlphaComposite
++sun/java2d/loops/BlitBg
++sun/java2d/loops/ScaledBlit
++sun/java2d/loops/FillRect
++sun/java2d/loops/FillSpans
++sun/java2d/loops/DrawLine
++sun/java2d/loops/DrawRect
++sun/java2d/loops/DrawPolygons
++sun/java2d/loops/DrawPath
++sun/java2d/loops/FillPath
++sun/java2d/loops/MaskBlit
++sun/java2d/loops/MaskFill
++sun/java2d/loops/DrawGlyphList
++sun/java2d/loops/DrawGlyphListAA
++sun/java2d/loops/DrawGlyphListLCD
++sun/java2d/loops/TransformHelper
++java/awt/BasicStroke
++java/awt/Stroke
++sun/misc/PerformanceLogger
++sun/misc/PerformanceLogger$TimeData
++sun/java2d/pipe/ValidatePipe
++sun/java2d/loops/CustomComponent
++sun/java2d/loops/GraphicsPrimitiveProxy
++sun/java2d/loops/GeneralRenderer
++sun/java2d/loops/GraphicsPrimitiveMgr$1
++sun/java2d/loops/GraphicsPrimitiveMgr$2
++sun/java2d/x11/X11PMBlitLoops$DelegateBlitLoop
++sun/java2d/x11/X11PMBlitBgLoops
++sun/java2d/x11/X11SurfaceData$LazyPipe
++sun/awt/X11GraphicsConfig$X11GCDisposerRecord
++sun/java2d/DisposerRecord
++java/awt/BorderLayout
++java/awt/LayoutManager2
++java/awt/Rectangle
++java/awt/Toolkit$2
++sun/awt/X11/XToolkit
++sun/awt/X11/XConstants
++sun/awt/UNIXToolkit
++java/util/TreeMap
++java/util/NavigableMap
++java/util/SortedMap
++sun/awt/X11/XlibWrapper
++sun/awt/X11/XUtilConstants
++sun/awt/X11/XProtocolConstants
++sun/awt/X11/XCursorFontConstants
++sun/awt/X11/XlibWrapper$1
++sun/awt/X11/XToolkit$4
++sun/awt/X11/XModifierKeymap
++sun/awt/X11/XWrapperBase
++sun/awt/X11/Native
++sun/awt/X11/Native$1
++java/awt/EventQueue
++java/util/EmptyStackException
++java/lang/reflect/InvocationTargetException
++java/awt/EventDispatchThread
++java/awt/event/PaintEvent
++java/awt/event/MouseEvent
++sun/awt/PeerEvent
++java/awt/event/InvocationEvent
++java/awt/ActiveEvent
++sun/awt/X11/XToolkit$1
++sun/awt/X11/XEventDispatcher
++sun/awt/SunToolkit$ModalityListenerList
++sun/awt/ModalityListener
++sun/awt/SunToolkit$1
++java/util/MissingResourceException
++java/awt/Queue
++sun/awt/PostEventQueue
++java/util/LinkedList
++java/util/Deque
++java/util/Queue
++java/util/AbstractSequentialList
++sun/awt/X11/AwtScreenData
++sun/awt/X11/XWM
++sun/awt/X11/MWMConstants
++sun/awt/X11/XAtom
++java/awt/Insets
++sun/awt/X11/XWM$1
++sun/awt/X11/XSetWindowAttributes
++sun/awt/X11/XErrorEvent
++sun/awt/X11/XNETProtocol
++sun/awt/X11/XStateProtocol
++sun/awt/X11/XLayerProtocol
++sun/awt/X11/XProtocol
++sun/awt/X11/WindowPropertyGetter
++sun/awt/X11/UnsafeXDisposerRecord
++sun/awt/X11/XPropertyCache
++sun/awt/X11/XWINProtocol
++sun/awt/X11/XAtomList
++sun/awt/X11/XToolkit$3
++sun/awt/X11/XAnyEvent
++java/awt/Window$WindowDisposerRecord
++java/awt/KeyboardFocusManager
++java/awt/KeyEventDispatcher
++java/awt/KeyEventPostProcessor
++java/awt/AWTKeyStroke
++java/awt/AWTKeyStroke$1
++java/awt/DefaultKeyboardFocusManager
++java/awt/DefaultFocusTraversalPolicy
++java/awt/ContainerOrderFocusTraversalPolicy
++java/awt/FocusTraversalPolicy
++java/util/Collections$UnmodifiableSet
++sun/awt/HeadlessToolkit
++sun/awt/X11/XKeyboardFocusManagerPeer
++java/awt/peer/KeyboardFocusManagerPeer
++sun/awt/X11/XKeyboardFocusManagerPeer$1
++sun/awt/X11/XFramePeer
++java/awt/peer/FramePeer
++java/awt/peer/WindowPeer
++java/awt/peer/ContainerPeer
++java/awt/peer/ComponentPeer
++sun/awt/X11/XDecoratedPeer
++sun/awt/X11/XWindowPeer
++sun/awt/X11/XPanelPeer
++java/awt/peer/PanelPeer
++sun/awt/X11/XCanvasPeer
++java/awt/peer/CanvasPeer
++sun/awt/X11/XComponentPeer
++java/awt/dnd/peer/DropTargetPeer
++sun/awt/X11/XWindow
++sun/awt/X11ComponentPeer
++sun/awt/X11/XBaseWindow
++sun/awt/X11/XCreateWindowParams
++java/lang/Long$LongCache
++sun/awt/X11/XBaseWindow$InitialiseState
++sun/awt/X11/XBaseWindow$StateLock
++sun/awt/X11/AwtGraphicsConfigData
++sun/awt/X11/XVisualInfo
++java/awt/SystemColor
++sun/awt/X11/MotifColorUtilities
++java/lang/StrictMath
++sun/awt/X11/XRepaintArea
++sun/awt/RepaintArea
++sun/awt/X11/XWindowAttributesData
++java/util/concurrent/locks/LockSupport
++sun/awt/X11/WindowDimensions
++java/awt/Point
++java/util/TreeMap$Entry
++sun/nio/cs/UTF_8
++sun/nio/cs/Unicode
++sun/nio/cs/UTF_8$Encoder
++sun/nio/cs/UTF_8$Decoder
++sun/nio/cs/Surrogate$Generator
++sun/awt/X11/XPropertyEvent
++sun/awt/X11/XDropTargetEventProcessor
++sun/awt/X11/XDragSourceContextPeer
++sun/awt/X11/XDragSourceProtocolListener
++sun/awt/dnd/SunDragSourceContextPeer
++java/awt/dnd/peer/DragSourceContextPeer
++sun/awt/X11/XAwtState
++sun/awt/X11/XBaseWindow$1
++sun/awt/X11/XRootWindow
++sun/nio/cs/ISO_8859_1
++sun/nio/cs/ISO_8859_1$Encoder
++sun/nio/cs/ISO_8859_1$Decoder
++sun/java2d/x11/X11SurfaceData$X11WindowSurfaceData
++sun/java2d/loops/RenderLoops
++sun/java2d/loops/GraphicsPrimitiveMgr$PrimitiveSpec
++sun/java2d/DefaultDisposerRecord
++sun/java2d/x11/X11Renderer
++sun/awt/X11/XGlobalCursorManager
++sun/awt/GlobalCursorManager
++java/awt/Cursor$CursorDisposer
++java/awt/AWTException
++java/awt/HeadlessException
++java/lang/UnsupportedOperationException
++sun/reflect/UnsafeLongFieldAccessorImpl
++sun/reflect/UnsafeIntegerFieldAccessorImpl
++sun/awt/X11/XClientMessageEvent
++sun/awt/X11/XIconInfo
++sun/awt/X11/XAWTIcon32_java_icon16_png
++sun/awt/X11/XAWTIcon32_java_icon24_png
++sun/awt/X11/XAWTIcon32_java_icon32_png
++sun/awt/X11/XAWTIcon32_java_icon48_png
++sun/awt/X11/XSizeHints
++sun/awt/X11/XContentWindow
++sun/awt/X11/XFocusProxyWindow
++sun/awt/X11/XWMHints
++java/util/LinkedList$ListItr
++java/util/ListIterator
++sun/awt/SunToolkit$2
++java/awt/image/BufferStrategy
++java/awt/dnd/DropTarget
++java/awt/dnd/DropTargetListener
++java/awt/event/ComponentListener
++java/awt/event/FocusListener
++java/awt/event/HierarchyListener
++java/awt/event/HierarchyBoundsListener
++java/awt/event/KeyListener
++java/awt/event/MouseListener
++java/awt/event/MouseMotionListener
++java/awt/event/MouseWheelListener
++java/awt/event/InputMethodListener
++java/awt/event/ContainerListener
++javax/accessibility/AccessibleContext
++sun/reflect/UnsafeObjectFieldAccessorImpl
++java/awt/peer/LightweightPeer
++sun/awt/X11/XLabelPeer
++java/awt/peer/LabelPeer
++sun/awt/X11/XMapEvent
++sun/awt/X11/XQueryTree
++sun/awt/X11/XConfigureEvent
++sun/awt/X11/PropMwmHints
++sun/awt/GlobalCursorManager$NativeUpdater
++javax/swing/JFrame
++javax/swing/WindowConstants
++javax/swing/RootPaneContainer
++javax/swing/TransferHandler$HasGetTransferHandler
++javax/swing/JLabel
++javax/swing/SwingConstants
++javax/swing/JComponent
++javax/swing/JComponent$1
++javax/swing/SwingUtilities
++javax/swing/JRootPane
++sun/security/action/GetBooleanAction
++javax/swing/event/EventListenerList
++javax/swing/JPanel
++java/awt/FlowLayout
++javax/swing/UIManager
++javax/swing/UIManager$LookAndFeelInfo
++sun/swing/SwingUtilities2
++sun/swing/SwingUtilities2$LSBCacheEntry
++javax/swing/UIManager$LAFState
++javax/swing/UIDefaults
++javax/swing/MultiUIDefaults
++javax/swing/UIManager$1
++javax/swing/plaf/metal/MetalLookAndFeel
++javax/swing/plaf/basic/BasicLookAndFeel
++javax/swing/LookAndFeel
++sun/swing/DefaultLookup
++javax/swing/plaf/metal/OceanTheme
++javax/swing/plaf/metal/DefaultMetalTheme
++javax/swing/plaf/metal/MetalTheme
++javax/swing/plaf/ColorUIResource
++javax/swing/plaf/UIResource
++sun/swing/PrintColorUIResource
++javax/swing/plaf/metal/DefaultMetalTheme$FontDelegate
++javax/swing/plaf/FontUIResource
++sun/swing/SwingLazyValue
++javax/swing/UIDefaults$LazyValue
++javax/swing/UIDefaults$ActiveValue
++javax/swing/plaf/InsetsUIResource
++sun/swing/SwingUtilities2$2
++javax/swing/plaf/basic/BasicLookAndFeel$2
++javax/swing/plaf/DimensionUIResource
++javax/swing/UIDefaults$LazyInputMap
++java/lang/Character$CharacterCache
++javax/swing/plaf/metal/MetalLookAndFeel$MetalLazyValue
++javax/swing/plaf/metal/MetalLookAndFeel$FontActiveValue
++java/awt/print/PrinterJob
++sun/swing/SwingUtilities2$AATextInfo
++sun/awt/X11/XAWTXSettings
++sun/awt/X11/XMSelectionListener
++sun/awt/XSettings
++sun/awt/X11/XMSelection
++sun/awt/X11/XMSelection$1
++javax/swing/plaf/metal/MetalLookAndFeel$AATextListener
++java/beans/PropertyChangeListener
++java/beans/PropertyChangeListenerProxy
++java/util/EventListenerProxy
++sun/awt/EventListenerAggregate
++javax/swing/UIDefaults$ProxyLazyValue
++javax/swing/plaf/metal/OceanTheme$1
++javax/swing/plaf/metal/OceanTheme$2
++javax/swing/plaf/metal/OceanTheme$3
++javax/swing/plaf/metal/OceanTheme$4
++javax/swing/plaf/metal/OceanTheme$5
++javax/swing/plaf/metal/OceanTheme$6
++javax/swing/RepaintManager
++javax/swing/RepaintManager$DisplayChangedHandler
++javax/swing/SwingPaintEventDispatcher
++sun/awt/PaintEventDispatcher
++javax/swing/UIManager$2
++java/awt/PopupMenu
++java/awt/Menu
++java/awt/MenuItem
++java/awt/MenuComponent
++java/io/ObjectOutputStream
++java/io/ObjectOutput
++java/io/DataOutput
++java/io/ObjectStreamConstants
++java/io/PrintWriter
++java/io/ObjectInputStream
++java/io/ObjectInput
++java/awt/Event
++java/awt/im/InputContext
++java/awt/event/MouseWheelEvent
++java/awt/BufferCapabilities
++sun/awt/CausedFocusEvent$Cause
++java/awt/PointerInfo
++java/awt/Component$BaselineResizeBehavior
++java/awt/FontMetrics
++java/awt/Image
++java/awt/image/ImageProducer
++java/awt/image/VolatileImage
++java/awt/im/InputMethodRequests
++java/awt/event/FocusEvent
++java/awt/event/InputMethodEvent
++java/awt/event/HierarchyEvent
++javax/accessibility/AccessibleStateSet
++com/sun/swing/internal/plaf/metal/resources/metal
++sun/util/ResourceBundleEnumeration
++com/sun/swing/internal/plaf/basic/resources/basic
++javax/swing/plaf/basic/BasicPanelUI
++javax/swing/plaf/PanelUI
++javax/swing/plaf/ComponentUI
++sun/reflect/misc/MethodUtil
++sun/reflect/misc/MethodUtil$1
++java/util/jar/JarFile
++java/util/zip/ZipFile
++java/util/zip/ZipConstants
++java/util/jar/JavaUtilJarAccessImpl
++sun/misc/JavaUtilJarAccess
++sun/misc/JarIndex
++java/util/zip/ZipEntry
++java/util/jar/JarFile$JarFileEntry
++java/util/jar/JarEntry
++sun/misc/URLClassPath$JarLoader$2
++sun/net/www/protocol/jar/JarURLConnection
++java/net/JarURLConnection
++sun/net/www/protocol/jar/JarFileFactory
++sun/net/www/protocol/jar/URLJarFile$URLJarFileCloseController
++java/net/HttpURLConnection
++sun/net/www/protocol/jar/URLJarFile
++sun/net/www/protocol/jar/URLJarFile$URLJarFileEntry
++sun/net/www/protocol/jar/JarURLConnection$JarURLInputStream
++java/util/zip/ZipFile$ZipFileInputStream
++java/security/AllPermissionCollection
++java/lang/IllegalAccessException
++javax/swing/JPasswordField
++javax/swing/JTextField
++javax/swing/text/JTextComponent
++javax/swing/Scrollable
++javax/swing/JLayeredPane
++javax/swing/JRootPane$1
++javax/swing/ArrayTable
++javax/swing/JInternalFrame
++javax/swing/JRootPane$RootLayout
++javax/swing/BufferStrategyPaintManager
++javax/swing/RepaintManager$PaintManager
++javax/swing/plaf/metal/MetalRootPaneUI
++javax/swing/plaf/basic/BasicRootPaneUI
++javax/swing/plaf/RootPaneUI
++javax/swing/plaf/basic/BasicRootPaneUI$RootPaneInputMap
++javax/swing/plaf/ComponentInputMapUIResource
++javax/swing/ComponentInputMap
++javax/swing/InputMap
++javax/swing/plaf/InputMapUIResource
++javax/swing/KeyStroke
++java/awt/VKCollection
++sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl
++javax/swing/plaf/basic/LazyActionMap
++javax/swing/plaf/ActionMapUIResource
++javax/swing/ActionMap
++javax/swing/LayoutFocusTraversalPolicy
++javax/swing/SortingFocusTraversalPolicy
++javax/swing/InternalFrameFocusTraversalPolicy
++javax/swing/SwingContainerOrderFocusTraversalPolicy
++javax/swing/SwingDefaultFocusTraversalPolicy
++javax/swing/LayoutComparator
++javax/swing/plaf/metal/MetalLabelUI
++javax/swing/plaf/basic/BasicLabelUI
++javax/swing/plaf/LabelUI
++javax/swing/plaf/metal/DefaultMetalTheme$FontDelegate$1
++javax/swing/plaf/basic/BasicHTML
++sun/awt/NullComponentPeer
++java/awt/event/WindowEvent
++java/awt/EventQueue$1
++java/awt/EventDispatchThread$1
++java/awt/Conditional
++java/awt/EventDispatchThread$HierarchyEventFilter
++java/awt/EventFilter$FilterAction
++sun/awt/dnd/SunDropTargetEvent
++java/awt/event/ActionEvent
++java/util/jar/Manifest
++java/io/ByteArrayInputStream
++java/util/jar/Attributes
++java/util/jar/Manifest$FastInputStream
++java/util/jar/Attributes$Name
++sun/misc/ASCIICaseInsensitiveComparator
++java/util/jar/JarVerifier
++java/io/ByteArrayOutputStream
++sun/misc/ExtensionDependency
++java/lang/Package
++sun/security/util/ManifestEntryVerifier
++java/security/Provider
++java/security/Provider$ServiceKey
++java/security/Provider$EngineDescription
++java/security/Security
++java/security/Security$1
++sun/misc/FloatingDecimal
++sun/misc/FloatingDecimal$1
++sun/security/provider/NativePRNG
++java/security/SecureRandomSpi
++sun/security/provider/NativePRNG$1
++sun/security/provider/NativePRNG$RandomIO
++sun/misc/BASE64Decoder
++sun/misc/CharacterDecoder
++sun/security/util/SignatureFileVerifier
++java/awt/event/KeyAdapter
++java/lang/NumberFormatException
++java/lang/IllegalArgumentException
++java/io/FileWriter
++java/net/Authenticator
++java/net/MalformedURLException
++javax/swing/text/Element
++javax/swing/text/Document
++javax/swing/text/PlainDocument
++javax/swing/text/AbstractDocument
++javax/swing/text/GapContent
++javax/swing/text/AbstractDocument$Content
++javax/swing/text/GapVector
++javax/swing/text/GapContent$MarkVector
++javax/swing/text/GapContent$MarkData
++javax/swing/text/StyleContext
++javax/swing/text/AbstractDocument$AttributeContext
++javax/swing/text/StyleConstants
++javax/swing/text/StyleConstants$CharacterConstants
++javax/swing/text/AttributeSet$CharacterAttribute
++javax/swing/text/StyleConstants$FontConstants
++javax/swing/text/AttributeSet$FontAttribute
++javax/swing/text/StyleConstants$ColorConstants
++javax/swing/text/AttributeSet$ColorAttribute
++javax/swing/text/StyleConstants$ParagraphConstants
++javax/swing/text/AttributeSet$ParagraphAttribute
++javax/swing/text/StyleContext$FontKey
++javax/swing/text/SimpleAttributeSet
++javax/swing/text/MutableAttributeSet
++javax/swing/text/AttributeSet
++javax/swing/text/SimpleAttributeSet$EmptyAttributeSet
++javax/swing/text/StyleContext$NamedStyle
++javax/swing/text/Style
++javax/swing/text/StyleContext$SmallAttributeSet
++javax/swing/text/AbstractDocument$BidiRootElement
++javax/swing/text/AbstractDocument$BranchElement
++javax/swing/text/AbstractDocument$AbstractElement
++javax/swing/tree/TreeNode
++javax/swing/text/AbstractDocument$1
++javax/swing/text/AbstractDocument$BidiElement
++javax/swing/text/AbstractDocument$LeafElement
++javax/swing/text/GapContent$StickyPosition
++javax/swing/text/Position
++javax/swing/text/StyleContext$KeyEnumeration
++javax/swing/text/GapContent$InsertUndo
++javax/swing/undo/AbstractUndoableEdit
++javax/swing/undo/UndoableEdit
++javax/swing/text/AbstractDocument$DefaultDocumentEvent
++javax/swing/event/DocumentEvent
++javax/swing/undo/CompoundEdit
++javax/swing/event/DocumentEvent$EventType
++javax/swing/text/Segment
++java/text/CharacterIterator
++javax/swing/text/Utilities
++javax/swing/text/SegmentCache
++javax/swing/text/SegmentCache$CachedSegment
++javax/swing/event/UndoableEditEvent
++javax/swing/text/AbstractDocument$ElementEdit
++javax/swing/event/DocumentEvent$ElementChange
++java/net/Socket
++java/net/InetAddress
++java/net/InetAddress$Cache
++java/net/InetAddress$Cache$Type
++java/net/InetAddressImplFactory
++java/net/Inet4AddressImpl
++java/net/InetAddressImpl
++java/net/InetAddress$1
++sun/net/spi/nameservice/NameService
++sun/net/util/IPAddressUtil
++java/util/RandomAccessSubList
++java/util/SubList
++java/util/SubList$1
++java/util/AbstractList$ListItr
++java/net/Inet4Address
++java/net/InetSocketAddress
++java/net/SocketAddress
++java/net/SocksSocketImpl
++java/net/SocksConsts
++java/net/PlainSocketImpl
++java/net/SocketImpl
++java/net/SocketOptions
++java/net/SocketException
++java/net/SocksSocketImpl$5
++java/net/ProxySelector
++sun/net/spi/DefaultProxySelector
++sun/net/spi/DefaultProxySelector$1
++sun/net/NetProperties
++sun/net/NetProperties$1
++sun/net/spi/DefaultProxySelector$NonProxyInfo
++java/net/Inet6Address
++java/net/URI
++java/net/URI$Parser
++java/net/Proxy
++java/net/Proxy$Type
++java/net/ConnectException
++javax/swing/JMenu
++javax/swing/MenuElement
++javax/swing/JMenuItem
++javax/swing/AbstractButton
++java/awt/ItemSelectable
++javax/swing/event/MenuListener
++javax/swing/JCheckBoxMenuItem
++javax/swing/Icon
++javax/swing/JButton
++java/awt/event/WindowListener
++java/net/URLClassLoader$2
++javax/swing/ImageIcon
++javax/swing/ImageIcon$1
++java/awt/MediaTracker
++sun/misc/SoftCache$ValueCell
++sun/awt/image/URLImageSource
++sun/awt/image/InputStreamImageSource
++sun/awt/image/ImageFetchable
++sun/awt/image/ToolkitImage
++java/awt/Image$1
++sun/awt/image/SurfaceManager$ImageAccessor
++sun/awt/image/SurfaceManager
++sun/awt/image/NativeLibLoader
++java/awt/ImageMediaEntry
++java/awt/MediaEntry
++sun/awt/image/ImageRepresentation
++java/awt/image/ImageConsumer
++sun/awt/image/ImageWatched
++sun/awt/image/ImageWatched$Link
++sun/awt/image/ImageWatched$WeakLink
++sun/awt/image/ImageConsumerQueue
++sun/awt/image/ImageFetcher
++sun/awt/image/FetcherInfo
++sun/awt/image/ImageFetcher$1
++sun/awt/image/GifImageDecoder
++sun/awt/image/ImageDecoder
++sun/awt/image/GifFrame
++java/awt/image/Raster
++java/awt/image/DataBufferByte
++java/awt/image/DataBuffer
++java/awt/image/PixelInterleavedSampleModel
++java/awt/image/ComponentSampleModel
++java/awt/image/SampleModel
++sun/awt/image/ByteInterleavedRaster
++sun/awt/image/ByteComponentRaster
++sun/awt/image/SunWritableRaster
++java/awt/image/WritableRaster
++java/awt/image/BufferedImage
++java/awt/image/WritableRenderedImage
++java/awt/image/RenderedImage
++sun/awt/image/IntegerComponentRaster
++sun/awt/image/BytePackedRaster
++java/awt/Canvas
++sun/font/FontDesignMetrics
++sun/font/FontStrikeDesc
++sun/font/CompositeStrike
++sun/font/FontStrikeDisposer
++sun/font/StrikeCache$SoftDisposerRef
++sun/font/StrikeCache$DisposableStrike
++sun/font/TrueTypeFont$TTDisposerRecord
++sun/font/TrueTypeFont$1
++java/io/RandomAccessFile
++java/nio/ByteBufferAsIntBufferB
++java/nio/IntBuffer
++sun/font/TrueTypeFont$DirectoryEntry
++java/nio/ByteBufferAsShortBufferB
++java/nio/ShortBuffer
++sun/nio/cs/UTF_16
++sun/nio/cs/UTF_16$Decoder
++sun/nio/cs/UnicodeDecoder
++sun/font/FileFontStrike
++sun/font/TrueTypeGlyphMapper
++sun/font/CMap
++sun/font/CMap$NullCMapClass
++sun/font/CMap$CMapFormat4
++java/nio/ByteBufferAsCharBufferB
++sun/font/FontDesignMetrics$KeyReference
++sun/awt/image/PNGImageDecoder
++sun/awt/image/PNGFilterInputStream
++java/util/zip/InflaterInputStream
++java/util/zip/Inflater
++sun/awt/EventQueueItem
++sun/awt/SunToolkit$3
++sun/awt/X11/XExposeEvent
++sun/reflect/UnsafeBooleanFieldAccessorImpl
++sun/awt/event/IgnorePaintEvent
++java/awt/image/DataBufferInt
++java/awt/image/SinglePixelPackedSampleModel
++sun/awt/image/IntegerInterleavedRaster
++sun/awt/image/OffScreenImage
++sun/awt/image/BufImgSurfaceData
++sun/java2d/opengl/GLXGraphicsConfig
++sun/java2d/opengl/OGLGraphicsConfig
++sun/java2d/x11/X11SurfaceData$X11PixmapSurfaceData
++sun/awt/image/WritableRasterNative
++sun/awt/image/DataBufferNative
++sun/java2d/SurfaceManagerFactory
++sun/java2d/opengl/GLXSurfaceData
++sun/java2d/opengl/OGLSurfaceData
++sun/font/CompositeGlyphMapper
++sun/java2d/loops/FontInfo
++java/util/Date
++sun/util/calendar/CalendarSystem
++sun/util/calendar/Gregorian
++sun/util/calendar/BaseCalendar
++sun/util/calendar/AbstractCalendar
++java/util/TimeZone
++java/lang/InheritableThreadLocal
++sun/util/calendar/ZoneInfo
++sun/util/calendar/ZoneInfoFile
++sun/util/calendar/ZoneInfoFile$1
++java/util/TimeZone$1
++sun/util/calendar/Gregorian$Date
++sun/util/calendar/BaseCalendar$Date
++sun/util/calendar/CalendarDate
++sun/util/calendar/CalendarUtils
++java/util/TimeZone$DisplayNames
++sun/util/TimeZoneNameUtility
++sun/util/resources/TimeZoneNames
++sun/util/resources/TimeZoneNamesBundle
++sun/util/resources/TimeZoneNames_en
++java/util/spi/TimeZoneNameProvider
++java/lang/ProcessBuilder
++java/lang/ProcessImpl
++java/lang/UNIXProcess
++java/lang/Process
++java/lang/UNIXProcess$1
++java/net/ServerSocket
++java/util/Random
++java/util/concurrent/atomic/AtomicLong
++java/lang/InternalError
++java/io/StringReader
++java/lang/SecurityException
++java/io/FilterReader
++java/lang/reflect/Proxy
++java/lang/reflect/InvocationHandler
++java/lang/NoSuchFieldException
++java/lang/InstantiationException
++java/lang/ArrayIndexOutOfBoundsException
++java/lang/IndexOutOfBoundsException
++javax/swing/JDialog
++sun/awt/X11/XClipboard
++sun/awt/datatransfer/SunClipboard
++java/awt/datatransfer/Clipboard
++java/awt/datatransfer/SystemFlavorMap
++java/awt/datatransfer/FlavorMap
++java/awt/datatransfer/FlavorTable
++java/awt/datatransfer/SystemFlavorMap$1
++sun/net/ProgressMonitor
++sun/net/DefaultProgressMeteringPolicy
++sun/net/ProgressMeteringPolicy
++java/awt/datatransfer/SystemFlavorMap$2
++java/awt/datatransfer/MimeType
++java/io/Externalizable
++java/awt/datatransfer/MimeTypeParameterList
++sun/awt/datatransfer/DataTransferer
++java/util/Collections$SynchronizedSet
++java/util/Collections$SynchronizedCollection
++java/awt/datatransfer/DataFlavor
++java/awt/datatransfer/DataFlavor$1
++sun/awt/datatransfer/DataTransferer$CharsetComparator
++sun/awt/datatransfer/DataTransferer$IndexedComparator
++sun/nio/cs/UTF_16LE
++sun/nio/cs/UTF_16BE
++sun/awt/datatransfer/DataTransferer$DataFlavorComparator
++java/rmi/Remote
++sun/awt/datatransfer/DataTransferer$1
++sun/awt/X11/XDataTransferer
++sun/awt/datatransfer/ToolkitThreadBlockedHandler
++javax/imageio/ImageTypeSpecifier
++sun/awt/X11/XSelection
++sun/security/action/GetIntegerAction
++sun/awt/X11/XSelection$IncrementalTransferHandler
++sun/awt/X11/XSelection$SelectionEventHandler
++java/awt/datatransfer/Transferable
++java/io/EOFException
++java/util/Vector$1
++java/util/zip/ZipFile$1
++java/util/zip/ZipFile$2
++java/util/jar/JarFile$1
++java/util/PropertyResourceBundle
++java/util/ResourceBundle$Control$1
++java/util/Hashtable$EntrySet
++java/lang/IllegalAccessError
++java/text/MessageFormat
++java/text/MessageFormat$Field
++java/text/Format$Field
++java/lang/CloneNotSupportedException
++sun/reflect/MethodAccessorGenerator
++sun/reflect/AccessorGenerator
++sun/reflect/ClassFileConstants
++java/lang/Void
++sun/reflect/ByteVectorFactory
++sun/reflect/ByteVectorImpl
++sun/reflect/ByteVector
++sun/reflect/ClassFileAssembler
++sun/reflect/UTF8
++sun/reflect/Label
++sun/reflect/Label$PatchInfo
++sun/reflect/MethodAccessorGenerator$1
++sun/reflect/ClassDefiner
++sun/reflect/ClassDefiner$1
++sun/reflect/BootstrapConstructorAccessorImpl
++java/awt/event/ActionListener
++javax/swing/Timer
++javax/swing/Timer$DoPostEvent
++javax/swing/TimerQueue
++javax/swing/TimerQueue$1
++javax/swing/ToolTipManager
++java/awt/event/MouseAdapter
++javax/swing/ToolTipManager$insideTimerAction
++javax/swing/ToolTipManager$outsideTimerAction
++javax/swing/ToolTipManager$stillInsideTimerAction
++sun/swing/UIAction
++javax/swing/Action
++javax/swing/ToolTipManager$MoveBeforeEnterListener
++java/awt/event/MouseMotionAdapter
++java/util/Hashtable$ValueCollection
++javax/swing/event/CaretListener
++javax/swing/JToolBar
++javax/swing/JSplitPane
++javax/swing/border/Border
++javax/swing/JToggleButton
++javax/swing/border/EmptyBorder
++javax/swing/border/AbstractBorder
++javax/swing/DefaultButtonModel
++javax/swing/ButtonModel
++javax/swing/AbstractButton$Handler
++javax/swing/event/ChangeListener
++java/awt/event/ItemListener
++javax/swing/plaf/metal/MetalButtonUI
++javax/swing/plaf/basic/BasicButtonUI
++javax/swing/plaf/ButtonUI
++javax/swing/plaf/metal/MetalBorders
++javax/swing/plaf/BorderUIResource$CompoundBorderUIResource
++javax/swing/border/CompoundBorder
++javax/swing/plaf/metal/MetalBorders$ButtonBorder
++javax/swing/plaf/basic/BasicBorders$MarginBorder
++javax/swing/plaf/basic/BasicButtonListener
++java/awt/AWTEventMulticaster
++java/awt/event/WindowFocusListener
++java/awt/event/WindowStateListener
++java/awt/event/AdjustmentListener
++java/awt/event/TextListener
++javax/swing/event/AncestorListener
++java/beans/VetoableChangeListener
++javax/swing/ButtonGroup
++javax/swing/JToggleButton$ToggleButtonModel
++javax/swing/plaf/metal/MetalToggleButtonUI
++javax/swing/plaf/basic/BasicToggleButtonUI
++javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder
++java/awt/CardLayout
++javax/swing/Box
++javax/swing/plaf/metal/MetalBorders$TextFieldBorder
++javax/swing/plaf/metal/MetalBorders$Flush3DBorder
++javax/swing/BoxLayout
++javax/swing/JMenuBar
++javax/swing/DefaultSingleSelectionModel
++javax/swing/SingleSelectionModel
++javax/swing/plaf/basic/BasicMenuBarUI
++javax/swing/plaf/MenuBarUI
++javax/swing/plaf/basic/DefaultMenuLayout
++javax/swing/plaf/metal/MetalBorders$MenuBarBorder
++javax/swing/plaf/basic/BasicMenuBarUI$Handler
++javax/swing/KeyboardManager
++javax/swing/event/MenuEvent
++javax/swing/JMenu$MenuChangeListener
++javax/swing/JMenuItem$MenuItemFocusListener
++javax/swing/plaf/basic/BasicMenuUI
++javax/swing/plaf/basic/BasicMenuItemUI
++javax/swing/plaf/MenuItemUI
++javax/swing/plaf/metal/MetalBorders$MenuItemBorder
++javax/swing/plaf/metal/MetalIconFactory
++javax/swing/plaf/metal/MetalIconFactory$MenuArrowIcon
++javax/swing/plaf/basic/BasicMenuUI$Handler
++javax/swing/event/MenuKeyListener
++javax/swing/plaf/basic/BasicMenuItemUI$Handler
++javax/swing/event/MenuDragMouseListener
++javax/swing/event/MouseInputListener
++javax/swing/event/ChangeEvent
++java/awt/event/ContainerEvent
++javax/swing/plaf/metal/MetalIconFactory$MenuItemArrowIcon
++javax/swing/JPopupMenu
++javax/swing/plaf/basic/BasicPopupMenuUI
++javax/swing/plaf/PopupMenuUI
++javax/swing/plaf/basic/BasicLookAndFeel$AWTEventHelper
++java/awt/event/AWTEventListenerProxy
++java/awt/Toolkit$SelectiveAWTEventListener
++java/awt/Toolkit$ToolkitEventMulticaster
++javax/swing/plaf/basic/BasicLookAndFeel$1
++javax/swing/plaf/metal/MetalBorders$PopupMenuBorder
++javax/swing/plaf/basic/BasicPopupMenuUI$BasicPopupMenuListener
++javax/swing/event/PopupMenuListener
++javax/swing/plaf/basic/BasicPopupMenuUI$BasicMenuKeyListener
++javax/swing/plaf/basic/BasicPopupMenuUI$MouseGrabber
++javax/swing/MenuSelectionManager
++javax/swing/plaf/basic/BasicPopupMenuUI$MenuKeyboardHelper
++javax/swing/plaf/basic/BasicPopupMenuUI$MenuKeyboardHelper$1
++java/awt/event/FocusAdapter
++javax/swing/JMenu$WinListener
++java/awt/event/WindowAdapter
++javax/swing/JPopupMenu$Separator
++javax/swing/JSeparator
++javax/swing/plaf/metal/MetalPopupMenuSeparatorUI
++javax/swing/plaf/metal/MetalSeparatorUI
++javax/swing/plaf/basic/BasicSeparatorUI
++javax/swing/plaf/SeparatorUI
++javax/swing/JComboBox
++javax/swing/event/ListDataListener
++javax/swing/event/CaretEvent
++javax/swing/text/TabExpander
++javax/swing/JScrollBar
++java/awt/Adjustable
++javax/swing/event/MouseInputAdapter
++javax/swing/JScrollBar$ModelListener
++javax/swing/DefaultBoundedRangeModel
++javax/swing/BoundedRangeModel
++javax/swing/plaf/metal/MetalScrollBarUI
++javax/swing/plaf/basic/BasicScrollBarUI
++javax/swing/plaf/ScrollBarUI
++javax/swing/plaf/metal/MetalBumps
++javax/swing/plaf/metal/MetalScrollButton
++javax/swing/plaf/basic/BasicArrowButton
++javax/swing/plaf/basic/BasicScrollBarUI$TrackListener
++javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener
++javax/swing/plaf/basic/BasicScrollBarUI$ModelListener
++javax/swing/plaf/metal/MetalScrollBarUI$ScrollBarListener
++javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler
++javax/swing/plaf/basic/BasicScrollBarUI$Handler
++javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener
++javax/swing/CellRendererPane
++java/util/HashMap$EntryIterator
++javax/swing/border/MatteBorder
++sun/font/StandardGlyphVector
++java/awt/font/GlyphVector
++sun/font/StandardGlyphVector$GlyphStrike
++sun/font/CoreMetrics
++sun/font/FontLineMetrics
++java/awt/font/LineMetrics
++javax/swing/ComboBoxModel
++javax/swing/ListModel
++javax/swing/ListCellRenderer
++javax/swing/DefaultComboBoxModel
++javax/swing/MutableComboBoxModel
++javax/swing/AbstractListModel
++javax/swing/JComboBox$1
++javax/swing/AncestorNotifier
++javax/swing/plaf/metal/MetalComboBoxUI
++javax/swing/plaf/basic/BasicComboBoxUI
++javax/swing/plaf/ComboBoxUI
++javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager
++javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager
++javax/swing/plaf/basic/BasicComboPopup
++javax/swing/plaf/basic/ComboPopup
++javax/swing/plaf/basic/BasicComboPopup$EmptyListModelClass
++javax/swing/border/LineBorder
++javax/swing/plaf/basic/BasicComboPopup$1
++javax/swing/JList
++javax/swing/DropMode
++javax/swing/DefaultListSelectionModel
++javax/swing/ListSelectionModel
++javax/swing/plaf/basic/BasicListUI
++javax/swing/plaf/ListUI
++javax/swing/plaf/basic/BasicListUI$ListTransferHandler
++javax/swing/TransferHandler
++javax/swing/TransferHandler$TransferAction
++javax/swing/DefaultListCellRenderer$UIResource
++javax/swing/DefaultListCellRenderer
++javax/swing/TransferHandler$SwingDropTarget
++java/awt/dnd/DropTargetContext
++javax/swing/TransferHandler$DropHandler
++javax/swing/TransferHandler$TransferSupport
++javax/swing/plaf/basic/BasicListUI$Handler
++javax/swing/event/ListSelectionListener
++javax/swing/plaf/basic/DragRecognitionSupport$BeforeDrag
++javax/swing/plaf/basic/BasicComboPopup$Handler
++javax/swing/JScrollPane
++javax/swing/ScrollPaneConstants
++javax/swing/ScrollPaneLayout$UIResource
++javax/swing/ScrollPaneLayout
++javax/swing/JViewport
++javax/swing/ViewportLayout
++javax/swing/plaf/basic/BasicViewportUI
++javax/swing/plaf/ViewportUI
++javax/swing/JScrollPane$ScrollBar
++javax/swing/JViewport$ViewListener
++java/awt/event/ComponentAdapter
++javax/swing/plaf/metal/MetalScrollPaneUI
++javax/swing/plaf/basic/BasicScrollPaneUI
++javax/swing/plaf/ScrollPaneUI
++javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder
++javax/swing/plaf/basic/BasicScrollPaneUI$Handler
++javax/swing/plaf/metal/MetalScrollPaneUI$1
++javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource
++javax/swing/plaf/basic/BasicComboBoxRenderer
++javax/swing/plaf/metal/MetalComboBoxEditor$UIResource
++javax/swing/plaf/metal/MetalComboBoxEditor
++javax/swing/plaf/basic/BasicComboBoxEditor
++javax/swing/ComboBoxEditor
++javax/swing/plaf/basic/BasicComboBoxEditor$BorderlessTextField
++javax/swing/JTextField$NotifyAction
++javax/swing/text/TextAction
++javax/swing/AbstractAction
++javax/swing/text/JTextComponent$MutableCaretEvent
++javax/swing/plaf/metal/MetalTextFieldUI
++javax/swing/plaf/basic/BasicTextFieldUI
++javax/swing/plaf/basic/BasicTextUI
++javax/swing/text/ViewFactory
++javax/swing/plaf/TextUI
++javax/swing/plaf/basic/BasicTextUI$BasicCursor
++javax/swing/text/DefaultEditorKit
++javax/swing/text/EditorKit
++javax/swing/text/DefaultEditorKit$InsertContentAction
++javax/swing/text/DefaultEditorKit$DeletePrevCharAction
++javax/swing/text/DefaultEditorKit$DeleteNextCharAction
++javax/swing/text/DefaultEditorKit$ReadOnlyAction
++javax/swing/text/DefaultEditorKit$DeleteWordAction
++javax/swing/text/DefaultEditorKit$WritableAction
++javax/swing/text/DefaultEditorKit$CutAction
++javax/swing/text/DefaultEditorKit$CopyAction
++javax/swing/text/DefaultEditorKit$PasteAction
++javax/swing/text/DefaultEditorKit$VerticalPageAction
++javax/swing/text/DefaultEditorKit$PageAction
++javax/swing/text/DefaultEditorKit$InsertBreakAction
++javax/swing/text/DefaultEditorKit$BeepAction
++javax/swing/text/DefaultEditorKit$NextVisualPositionAction
++javax/swing/text/DefaultEditorKit$BeginWordAction
++javax/swing/text/DefaultEditorKit$EndWordAction
++javax/swing/text/DefaultEditorKit$PreviousWordAction
++javax/swing/text/DefaultEditorKit$NextWordAction
++javax/swing/text/DefaultEditorKit$BeginLineAction
++javax/swing/text/DefaultEditorKit$EndLineAction
++javax/swing/text/DefaultEditorKit$BeginParagraphAction
++javax/swing/text/DefaultEditorKit$EndParagraphAction
++javax/swing/text/DefaultEditorKit$BeginAction
++javax/swing/text/DefaultEditorKit$EndAction
++javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction
++javax/swing/text/DefaultEditorKit$InsertTabAction
++javax/swing/text/DefaultEditorKit$SelectWordAction
++javax/swing/text/DefaultEditorKit$SelectLineAction
++javax/swing/text/DefaultEditorKit$SelectParagraphAction
++javax/swing/text/DefaultEditorKit$SelectAllAction
++javax/swing/text/DefaultEditorKit$UnselectAction
++javax/swing/text/DefaultEditorKit$ToggleComponentOrientationAction
++javax/swing/text/DefaultEditorKit$DumpModelAction
++javax/swing/plaf/basic/BasicTextUI$TextTransferHandler
++javax/swing/text/Position$Bias
++javax/swing/plaf/basic/BasicTextUI$RootView
++javax/swing/text/View
++javax/swing/plaf/basic/BasicTextUI$UpdateHandler
++javax/swing/event/DocumentListener
++javax/swing/plaf/basic/BasicTextUI$DragListener
++javax/swing/plaf/basic/BasicComboBoxEditor$UIResource
++javax/swing/plaf/basic/BasicTextUI$BasicCaret
++javax/swing/text/DefaultCaret
++javax/swing/text/Caret
++javax/swing/text/DefaultCaret$Handler
++java/awt/datatransfer/ClipboardOwner
++javax/swing/plaf/basic/BasicTextUI$BasicHighlighter
++javax/swing/text/DefaultHighlighter
++javax/swing/text/LayeredHighlighter
++javax/swing/text/Highlighter
++javax/swing/text/Highlighter$Highlight
++javax/swing/text/DefaultHighlighter$DefaultHighlightPainter
++javax/swing/text/LayeredHighlighter$LayerPainter
++javax/swing/text/Highlighter$HighlightPainter
++javax/swing/text/DefaultHighlighter$SafeDamager
++javax/swing/text/FieldView
++javax/swing/text/PlainView
++javax/swing/text/JTextComponent$DefaultKeymap
++javax/swing/text/Keymap
++javax/swing/text/JTextComponent$KeymapWrapper
++javax/swing/text/JTextComponent$KeymapActionMap
++javax/swing/plaf/basic/BasicTextUI$FocusAction
++javax/swing/plaf/basic/BasicTextUI$TextActionWrapper
++javax/swing/JTextArea
++javax/swing/JEditorPane
++javax/swing/JTextField$ScrollRepainter
++javax/swing/plaf/metal/MetalComboBoxEditor$1
++javax/swing/plaf/metal/MetalComboBoxEditor$EditorBorder
++javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener
++javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler
++javax/swing/plaf/basic/BasicComboBoxUI$Handler
++javax/swing/plaf/metal/MetalComboBoxButton
++javax/swing/plaf/metal/MetalComboBoxIcon
++javax/swing/plaf/metal/MetalComboBoxButton$1
++javax/swing/plaf/basic/BasicComboBoxUI$DefaultKeySelectionManager
++javax/swing/JComboBox$KeySelectionManager
++javax/swing/JToolBar$DefaultToolBarLayout
++javax/swing/plaf/metal/MetalToolBarUI
++javax/swing/plaf/basic/BasicToolBarUI
++javax/swing/plaf/ToolBarUI
++javax/swing/plaf/metal/MetalBorders$ToolBarBorder
++javax/swing/plaf/metal/MetalLookAndFeel$MetalLazyValue$1
++javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder
++javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder
++javax/swing/plaf/basic/BasicBorders$RadioButtonBorder
++javax/swing/plaf/basic/BasicBorders$ButtonBorder
++javax/swing/plaf/basic/BasicBorders$RolloverMarginBorder
++javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener
++javax/swing/plaf/basic/BasicToolBarUI$DockingListener
++javax/swing/plaf/basic/BasicToolBarUI$Handler
++javax/swing/border/EtchedBorder
++javax/swing/JToolBar$Separator
++javax/swing/plaf/basic/BasicToolBarSeparatorUI
++java/applet/Applet
++java/awt/Panel
++com/sun/awt/AWTUtilities
++javax/swing/KeyboardManager$ComponentKeyStrokePair
++sun/awt/EmbeddedFrame
++sun/awt/im/InputMethodContext
++java/awt/im/spi/InputMethodContext
++sun/awt/im/InputContext
++sun/awt/im/InputMethodManager
++sun/awt/im/ExecutableInputMethodManager
++sun/awt/X11/XInputMethodDescriptor
++sun/awt/X11InputMethodDescriptor
++java/awt/im/spi/InputMethodDescriptor
++sun/awt/im/InputMethodLocator
++sun/awt/im/ExecutableInputMethodManager$2
++sun/misc/Service
++sun/misc/Service$LazyIterator
++java/util/TreeSet
++java/util/NavigableSet
++java/util/SortedSet
++javax/swing/SizeRequirements
++javax/swing/plaf/basic/BasicGraphicsUtils
++java/awt/event/AdjustmentEvent
++java/awt/MenuBar
++sun/awt/X11/XComponentPeer$2
++java/awt/SequencedEvent
++java/beans/PropertyVetoException
++java/awt/DefaultKeyboardFocusManager$TypeAheadMarker
++java/awt/KeyboardFocusManager$HeavyweightFocusRequest
++java/awt/KeyboardFocusManager$LightweightFocusRequest
++sun/awt/KeyboardFocusManagerPeerImpl
++sun/awt/SunToolkit$7
++java/awt/Window$1DisposeAction
++java/awt/LightweightDispatcher$2
++sun/awt/X11/XReparentEvent
++sun/awt/X11/XWindowAttributes
++sun/awt/X11/XFocusChangeEvent
++sun/awt/X11/XComponentPeer$1
++sun/awt/X11/XUnmapEvent
++java/io/StringWriter
++javax/swing/JWindow
++java/io/UnsupportedEncodingException
++java/net/UnknownHostException
++java/nio/channels/SocketChannel
++java/nio/channels/spi/AbstractSelectableChannel
++java/nio/channels/SelectableChannel
++java/net/SocketImplFactory
++javax/swing/UnsupportedLookAndFeelException
++java/lang/UnsatisfiedLinkError
++javax/swing/Box$Filler
++javax/swing/JComponent$2
++sun/net/www/MimeTable
++java/net/FileNameMap
++sun/net/www/MimeTable$1
++sun/net/www/MimeEntry
++java/net/URLConnection$1
++java/text/SimpleDateFormat
++java/text/DateFormat
++java/text/DateFormat$Field
++java/util/Calendar
++java/util/GregorianCalendar
++sun/util/resources/CalendarData
++sun/util/resources/CalendarData_en
++java/text/DateFormatSymbols
++java/text/spi/DateFormatSymbolsProvider
++java/text/DontCareFieldPosition
++java/text/DontCareFieldPosition$1
++java/text/Format$FieldDelegate
++javax/swing/plaf/BorderUIResource
++javax/swing/BorderFactory
++javax/swing/border/BevelBorder
++javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon
++javax/swing/plaf/metal/MetalIconFactory$FolderIcon16
++java/util/zip/ZipInputStream
++java/io/PushbackInputStream
++java/util/zip/CRC32
++java/util/zip/Checksum
++java/lang/Thread$State
++javax/swing/SwingUtilities$SharedOwnerFrame
++javax/swing/JTable
++javax/swing/event/TableModelListener
++javax/swing/event/TableColumnModelListener
++javax/swing/event/CellEditorListener
++javax/swing/event/RowSorterListener
++javax/swing/BufferStrategyPaintManager$BufferInfo
++java/awt/Component$BltSubRegionBufferStrategy
++sun/awt/SubRegionShowable
++java/awt/Component$BltBufferStrategy
++sun/awt/image/SunVolatileImage
++sun/awt/image/BufferedImageGraphicsConfig
++sun/print/PrinterGraphicsConfig
++sun/java2d/x11/X11VolatileSurfaceManager
++sun/awt/image/VolatileSurfaceManager
++java/awt/print/PrinterGraphics
++java/awt/PrintGraphics
++java/awt/GraphicsCallback$PaintCallback
++java/awt/GraphicsCallback
++sun/awt/SunGraphicsCallback
++javax/swing/JRadioButton
++java/lang/ClassFormatError
++javax/swing/JTabbedPane
++javax/swing/JTabbedPane$ModelListener
++javax/swing/plaf/metal/MetalTabbedPaneUI
++javax/swing/plaf/basic/BasicTabbedPaneUI
++javax/swing/plaf/TabbedPaneUI
++javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout
++javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout
++javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout
++javax/swing/plaf/basic/BasicTabbedPaneUI$Handler
++sun/swing/ImageIconUIResource
++javax/swing/GrayFilter
++java/awt/image/RGBImageFilter
++java/awt/image/ImageFilter
++java/awt/image/FilteredImageSource
++org/w3c/dom/Node
++org/xml/sax/SAXException
++javax/xml/parsers/ParserConfigurationException
++org/xml/sax/EntityResolver
++java/security/NoSuchAlgorithmException
++java/security/GeneralSecurityException
++java/util/zip/GZIPInputStream
++java/util/zip/DeflaterOutputStream
++org/xml/sax/InputSource
++javax/xml/parsers/DocumentBuilderFactory
++javax/xml/parsers/FactoryFinder
++javax/xml/parsers/SecuritySupport
++javax/xml/parsers/SecuritySupport$2
++javax/xml/parsers/SecuritySupport$5
++javax/xml/parsers/SecuritySupport$1
++javax/xml/parsers/SecuritySupport$4
++javax/xml/parsers/DocumentBuilder
++org/w3c/dom/Document
++org/xml/sax/helpers/DefaultHandler
++org/xml/sax/DTDHandler
++org/xml/sax/ContentHandler
++org/xml/sax/ErrorHandler
++org/xml/sax/SAXNotSupportedException
++org/xml/sax/Locator
++org/xml/sax/SAXNotRecognizedException
++org/xml/sax/SAXParseException
++org/w3c/dom/NodeList
++org/w3c/dom/events/EventTarget
++org/w3c/dom/traversal/DocumentTraversal
++org/w3c/dom/events/DocumentEvent
++org/w3c/dom/ranges/DocumentRange
++org/w3c/dom/Entity
++org/w3c/dom/Element
++org/w3c/dom/CharacterData
++org/w3c/dom/CDATASection
++org/w3c/dom/Text
++org/xml/sax/AttributeList
++org/w3c/dom/DOMException
++org/w3c/dom/Notation
++org/w3c/dom/DocumentType
++org/w3c/dom/Attr
++org/w3c/dom/EntityReference
++org/w3c/dom/ProcessingInstruction
++org/w3c/dom/Comment
++org/w3c/dom/DocumentFragment
++org/w3c/dom/events/Event
++org/w3c/dom/events/MutationEvent
++org/w3c/dom/traversal/TreeWalker
++org/w3c/dom/ranges/Range
++org/w3c/dom/traversal/NodeIterator
++org/w3c/dom/events/EventException
++org/w3c/dom/NamedNodeMap
++java/lang/StringIndexOutOfBoundsException
++java/awt/GridLayout
++javax/swing/plaf/metal/MetalRadioButtonUI
++javax/swing/plaf/basic/BasicRadioButtonUI
++javax/swing/plaf/basic/BasicBorders
++javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon
++java/awt/event/ItemEvent
++java/awt/CardLayout$Card
++javax/swing/JCheckBox
++javax/swing/event/ListSelectionEvent
++javax/swing/plaf/metal/MetalCheckBoxUI
++javax/swing/plaf/metal/MetalIconFactory$CheckBoxIcon
++java/lang/ExceptionInInitializerError
++com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI
++javax/swing/JProgressBar
++javax/swing/JProgressBar$ModelListener
++javax/swing/plaf/metal/MetalProgressBarUI
++javax/swing/plaf/basic/BasicProgressBarUI
++javax/swing/plaf/ProgressBarUI
++javax/swing/plaf/BorderUIResource$LineBorderUIResource
++javax/swing/plaf/basic/BasicProgressBarUI$Handler
++javax/swing/tree/TreeModel
++javax/swing/table/TableCellRenderer
++javax/swing/table/JTableHeader
++javax/swing/event/TreeExpansionListener
++javax/swing/table/AbstractTableModel
++javax/swing/table/TableModel
++javax/swing/table/DefaultTableCellRenderer
++javax/swing/JTree
++javax/swing/tree/TreeSelectionModel
++javax/swing/tree/DefaultTreeCellRenderer
++javax/swing/tree/TreeCellRenderer
++javax/swing/table/TableCellEditor
++javax/swing/CellEditor
++javax/swing/JToolTip
++javax/swing/table/TableColumn
++javax/swing/table/DefaultTableColumnModel
++javax/swing/table/TableColumnModel
++javax/swing/table/DefaultTableModel
++javax/swing/event/TableModelEvent
++sun/swing/table/DefaultTableCellHeaderRenderer
++javax/swing/plaf/basic/BasicTableHeaderUI
++javax/swing/plaf/TableHeaderUI
++javax/swing/plaf/basic/BasicTableHeaderUI$1
++javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler
++javax/swing/DefaultCellEditor
++javax/swing/tree/TreeCellEditor
++javax/swing/AbstractCellEditor
++javax/swing/plaf/basic/BasicTableUI
++javax/swing/plaf/TableUI
++javax/swing/plaf/basic/BasicTableUI$TableTransferHandler
++javax/swing/plaf/basic/BasicTableUI$Handler
++javax/swing/tree/DefaultTreeSelectionModel
++javax/swing/tree/TreePath
++javax/swing/plaf/metal/MetalTreeUI
++javax/swing/plaf/basic/BasicTreeUI
++javax/swing/plaf/TreeUI
++javax/swing/plaf/basic/BasicTreeUI$Actions
++javax/swing/plaf/basic/BasicTreeUI$TreeTransferHandler
++javax/swing/plaf/metal/MetalTreeUI$LineListener
++javax/swing/plaf/basic/BasicTreeUI$Handler
++javax/swing/event/TreeModelListener
++javax/swing/event/TreeSelectionListener
++javax/swing/event/SwingPropertyChangeSupport
++javax/swing/tree/VariableHeightLayoutCache
++javax/swing/tree/AbstractLayoutCache
++javax/swing/tree/RowMapper
++javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler
++javax/swing/tree/AbstractLayoutCache$NodeDimensions
++javax/swing/JTree$TreeModelHandler
++javax/swing/tree/VariableHeightLayoutCache$TreeStateNode
++javax/swing/tree/DefaultMutableTreeNode
++javax/swing/tree/MutableTreeNode
++javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration
++javax/swing/event/TableColumnModelEvent
++java/text/ParseException
++java/text/NumberFormat$Field
++javax/swing/event/UndoableEditListener
++javax/swing/filechooser/FileFilter
++javax/swing/tree/DefaultTreeModel
++javax/swing/tree/DefaultTreeCellEditor
++javax/swing/tree/DefaultTreeCellEditor$1
++javax/swing/tree/DefaultTreeCellEditor$DefaultTextField
++javax/swing/DefaultCellEditor$1
++javax/swing/DefaultCellEditor$EditorDelegate
++javax/swing/tree/DefaultTreeCellEditor$EditorContainer
++javax/swing/JTree$TreeSelectionRedirector
++javax/swing/event/TreeModelEvent
++javax/swing/plaf/metal/MetalSplitPaneUI
++javax/swing/plaf/basic/BasicSplitPaneUI
++javax/swing/plaf/SplitPaneUI
++javax/swing/plaf/basic/BasicSplitPaneDivider
++javax/swing/plaf/basic/BasicBorders$SplitPaneBorder
++javax/swing/plaf/metal/MetalSplitPaneDivider
++javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout
++javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler
++javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder
++javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager
++javax/swing/plaf/basic/BasicSplitPaneUI$1
++javax/swing/plaf/basic/BasicSplitPaneUI$Handler
++javax/swing/plaf/metal/MetalSplitPaneDivider$1
++javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchActionHandler
++javax/swing/plaf/metal/MetalSplitPaneDivider$2
++javax/swing/border/TitledBorder
++javax/swing/plaf/basic/BasicTextAreaUI
++java/util/Collections$UnmodifiableCollection$1
++java/io/InterruptedIOException
++java/net/NoRouteToHostException
++java/net/BindException
++javax/swing/tree/PathPlaceHolder
++javax/swing/event/TreeSelectionEvent
++javax/swing/JList$3
++javax/swing/JList$ListSelectionHandler
++javax/swing/JSlider
++javax/swing/JSlider$ModelListener
++javax/swing/plaf/metal/MetalSliderUI
++javax/swing/plaf/basic/BasicSliderUI
++javax/swing/plaf/SliderUI
++javax/swing/plaf/basic/BasicSliderUI$Actions
++javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon
++javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon
++javax/swing/plaf/basic/BasicSliderUI$TrackListener
++javax/swing/plaf/basic/BasicSliderUI$Handler
++javax/swing/plaf/basic/BasicSliderUI$ScrollListener
++javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener
++javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler
++sun/java2d/HeadlessGraphicsEnvironment
++java/util/Hashtable$KeySet
++java/awt/FontFormatException
++sun/font/Type1Font$1
++java/nio/channels/FileChannel$MapMode
++sun/nio/ch/FileChannelImpl$Unmapper
++sun/nio/ch/Util$3
++java/nio/DirectByteBufferR
++java/nio/charset/Charset$3
++sun/nio/cs/AbstractCharsetProvider
++sun/nio/cs/SingleByteDecoder
++java/lang/CharacterData00
++javax/swing/DefaultListModel
++javax/swing/event/ListDataEvent
++javax/sound/sampled/DataLine
++javax/sound/sampled/Line
++javax/sound/sampled/Line$Info
++javax/sound/sampled/DataLine$Info
++javax/sound/sampled/Control$Type
++javax/sound/sampled/FloatControl$Type
++javax/sound/sampled/LineUnavailableException
++javax/sound/sampled/UnsupportedAudioFileException
++javax/swing/JRadioButtonMenuItem
++javax/swing/JMenuItem$AccessibleJMenuItem
++javax/swing/AbstractButton$AccessibleAbstractButton
++javax/accessibility/AccessibleAction
++javax/accessibility/AccessibleValue
++javax/accessibility/AccessibleText
++javax/accessibility/AccessibleExtendedComponent
++javax/accessibility/AccessibleComponent
++javax/swing/JComponent$AccessibleJComponent
++java/awt/Container$AccessibleAWTContainer
++java/awt/Component$AccessibleAWTComponent
++javax/accessibility/AccessibleRelationSet
++javax/accessibility/AccessibleState
++javax/accessibility/AccessibleBundle
++javax/swing/plaf/basic/BasicCheckBoxMenuItemUI
++javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon
++javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem
++javax/swing/plaf/basic/BasicRadioButtonMenuItemUI
++javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon
++sun/awt/image/ImageDecoder$1
++javax/swing/JTabbedPane$Page
++java/net/DatagramSocket
++java/net/MulticastSocket
++java/net/DatagramPacket
++sun/net/InetAddressCachePolicy
++sun/net/InetAddressCachePolicy$1
++sun/net/InetAddressCachePolicy$2
++java/net/InetAddress$CacheEntry
++java/net/PlainDatagramSocketImpl
++java/net/DatagramSocketImpl
++java/net/NetworkInterface
++java/net/InterfaceAddress
++java/text/Collator
++java/text/spi/CollatorProvider
++sun/text/resources/CollationData
++sun/text/resources/CollationData_en
++sun/util/EmptyListResourceBundle
++java/text/RuleBasedCollator
++java/text/CollationRules
++java/text/RBCollationTables
++java/text/RBTableBuilder
++java/text/RBCollationTables$BuildAPI
++sun/text/IntHashtable
++sun/text/UCompactIntArray
++sun/text/normalizer/NormalizerImpl
++sun/text/normalizer/ICUData
++sun/text/normalizer/NormalizerDataReader
++sun/text/normalizer/ICUBinary$Authenticate
++sun/text/normalizer/ICUBinary
++sun/text/normalizer/NormalizerImpl$FCDTrieImpl
++sun/text/normalizer/Trie$DataManipulate
++sun/text/normalizer/NormalizerImpl$NormTrieImpl
++sun/text/normalizer/NormalizerImpl$AuxTrieImpl
++sun/text/normalizer/IntTrie
++sun/text/normalizer/Trie
++sun/text/normalizer/CharTrie
++sun/text/normalizer/CharTrie$FriendAgent
++sun/text/normalizer/UnicodeSet
++sun/text/normalizer/UnicodeMatcher
++sun/text/normalizer/NormalizerImpl$DecomposeArgs
++java/text/MergeCollation
++java/text/PatternEntry$Parser
++java/text/PatternEntry
++java/text/EntryPair
++sun/text/ComposedCharIter
++sun/text/normalizer/UTF16
++sun/net/www/protocol/http/Handler
++java/io/ObjectInputStream$BlockDataInputStream
++java/io/ObjectInputStream$PeekInputStream
++java/io/ObjectInputStream$HandleTable
++java/io/ObjectInputStream$ValidationList
++java/io/Bits
++java/io/ObjectStreamClass$Caches
++java/io/ObjectStreamClass$WeakClassKey
++java/io/ObjectStreamClass$EntryFuture
++java/io/ObjectStreamClass$2
++sun/reflect/SerializationConstructorAccessorImpl
++java/io/ObjectStreamClass$FieldReflectorKey
++java/io/ObjectStreamClass$FieldReflector
++java/io/ObjectStreamClass$1
++java/io/DataOutputStream
++java/io/ObjectStreamClass$MemberSignature
++java/io/ObjectStreamClass$3
++java/io/ObjectStreamClass$4
++java/io/ObjectStreamClass$5
++java/security/MessageDigest
++java/security/MessageDigestSpi
++sun/security/jca/GetInstance
++sun/security/jca/Providers
++sun/security/jca/ProviderList
++sun/security/jca/ProviderConfig
++sun/security/jca/ProviderList$3
++sun/security/jca/ProviderList$1
++sun/security/jca/ProviderList$2
++sun/security/jca/ProviderConfig$1
++sun/security/jca/ProviderConfig$3
++java/security/Provider$Service
++java/security/Provider$UString
++sun/security/provider/SHA
++sun/security/provider/DigestBase
++sun/security/jca/GetInstance$Instance
++java/security/MessageDigest$Delegate
++sun/security/provider/ByteArrayAccess
++java/io/ObjectStreamClass$ClassDataSlot
++sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl
++java/security/SignatureException
++java/security/InvalidKeyException
++java/security/KeyException
++java/security/Signature
++java/security/SignatureSpi
++java/io/ObjectOutputStream$BlockDataOutputStream
++sun/security/provider/DSAPublicKey
++java/security/interfaces/DSAPublicKey
++java/security/interfaces/DSAKey
++java/security/PublicKey
++java/security/Key
++sun/security/x509/X509Key
++java/io/ObjectOutputStream$HandleTable
++java/io/ObjectOutputStream$ReplaceTable
++sun/security/x509/AlgorithmId
++sun/security/util/DerEncoder
++sun/security/util/BitArray
++sun/security/util/DerOutputStream
++sun/security/util/DerValue
++java/math/BigInteger
++java/security/interfaces/DSAParams
++sun/security/util/DerInputStream
++sun/security/util/DerInputBuffer
++sun/security/util/ObjectIdentifier
++java/security/AlgorithmParameters
++java/security/AlgorithmParametersSpi
++sun/security/provider/DSAParameters
++sun/security/util/ByteArrayLexOrder
++sun/security/util/ByteArrayTagOrder
++sun/security/util/DerIndefLenConverter
++java/io/InvalidClassException
++java/io/ObjectStreamException
++java/io/ObjectInputStream$GetFieldImpl
++java/io/ObjectInputStream$GetField
++sun/security/jca/ServiceId
++sun/security/jca/ProviderList$ServiceList
++sun/security/jca/ProviderList$ServiceList$1
++java/security/Signature$Delegate
++java/security/interfaces/DSAPrivateKey
++java/security/PrivateKey
++sun/security/provider/DSA$SHA1withDSA
++sun/security/provider/DSA
++java/security/spec/DSAParameterSpec
++java/security/spec/AlgorithmParameterSpec
++java/math/MutableBigInteger
++java/math/SignedMutableBigInteger
++java/awt/EventQueue$1AWTInvocationLock
++java/awt/Component$FlipBufferStrategy
++java/awt/SentEvent
++sun/awt/X11/XDestroyWindowEvent
++sun/awt/X11/XDropTargetRegistry
++sun/awt/X11/XEmbeddedFramePeer
++sun/awt/X11/XDragAndDropProtocols
++sun/awt/X11/XDropTargetContextPeer
++sun/awt/dnd/SunDropTargetContextPeer
++java/awt/dnd/peer/DropTargetContextPeer
++sun/awt/X11/XDropTargetContextPeer$XDropTargetProtocolListenerImpl
++sun/awt/X11/XDropTargetProtocolListener
++sun/awt/X11/XDnDDragSourceProtocol
++sun/awt/X11/XDragSourceProtocol
++sun/awt/X11/MotifDnDDragSourceProtocol
++sun/awt/X11/XDnDDropTargetProtocol
++sun/awt/X11/XDropTargetProtocol
++sun/awt/X11/MotifDnDDropTargetProtocol
++sun/awt/X11/XDnDConstants
++sun/awt/X11/MotifDnDConstants
++javax/swing/JTable$2
++javax/swing/JTable$Resizable3
++javax/swing/JTable$Resizable2
++javax/swing/JTable$5
++javax/swing/event/AncestorEvent
++sun/font/FontDesignMetrics$MetricsKey
++java/awt/geom/Line2D$Float
++java/awt/geom/Line2D
++com/sun/java/swing/plaf/gtk/GTKLookAndFeel
++javax/swing/plaf/synth/SynthLookAndFeel
++javax/swing/plaf/synth/DefaultSynthStyleFactory
++javax/swing/plaf/synth/SynthStyleFactory
++sun/swing/BakedArrayList
++javax/swing/plaf/synth/SynthLookAndFeel$Handler
++javax/swing/plaf/synth/SynthDefaultLookup
++com/sun/java/swing/plaf/gtk/GTKEngine
++com/sun/java/swing/plaf/gtk/GTKEngine$Settings
++com/sun/java/swing/plaf/gtk/GTKStyleFactory
++com/sun/java/swing/plaf/gtk/PangoFonts
++com/sun/java/swing/plaf/gtk/GTKLookAndFeel$WeakPCL
++javax/swing/plaf/synth/Region
++javax/swing/plaf/synth/SynthLookAndFeel$AATextListener
++com/sun/java/swing/plaf/gtk/GTKRegion
++com/sun/java/swing/plaf/gtk/GTKStyle
++com/sun/java/swing/plaf/gtk/GTKConstants
++javax/swing/plaf/synth/SynthStyle
++javax/swing/plaf/synth/SynthGraphicsUtils
++com/sun/java/swing/plaf/gtk/GTKGraphicsUtils
++com/sun/java/swing/plaf/gtk/GTKStyle$GTKStockIcon
++sun/swing/plaf/synth/SynthIcon
++com/sun/java/swing/plaf/gtk/GTKColorType
++javax/swing/plaf/synth/ColorType
++com/sun/java/swing/plaf/gtk/resources/gtk
++com/sun/swing/internal/plaf/synth/resources/synth
++com/sun/java/swing/plaf/gtk/GTKStyle$GTKLazyValue
++com/sun/java/swing/plaf/gtk/GTKLookAndFeel$1FontLazyValue
++com/sun/java/swing/plaf/gtk/GTKLookAndFeel$2
++com/sun/java/swing/plaf/gtk/GTKLookAndFeel$3
++javax/swing/plaf/synth/SynthPanelUI
++javax/swing/plaf/synth/SynthConstants
++javax/swing/plaf/synth/SynthContext
++javax/swing/plaf/synth/SynthBorder
++javax/swing/plaf/synth/SynthRootPaneUI
++javax/swing/plaf/synth/SynthLabelUI
++javax/swing/plaf/synth/SynthButtonUI
++javax/swing/plaf/synth/SynthToggleButtonUI
++javax/swing/plaf/basic/BasicBorders$FieldBorder
++javax/swing/plaf/synth/SynthMenuBarUI
++javax/swing/plaf/synth/SynthMenuUI
++javax/swing/plaf/synth/SynthUI
++com/sun/java/swing/plaf/gtk/GTKIconFactory
++com/sun/java/swing/plaf/gtk/GTKIconFactory$MenuArrowIcon
++com/sun/java/swing/plaf/gtk/GTKIconFactory$DelegatingIcon
++com/sun/java/swing/plaf/gtk/GTKConstants$ArrowType
++javax/swing/plaf/basic/BasicIconFactory
++javax/swing/plaf/basic/BasicIconFactory$MenuItemCheckIcon
++javax/swing/plaf/synth/SynthMenuItemUI
++javax/swing/plaf/synth/SynthPopupMenuUI
++javax/swing/plaf/synth/SynthSeparatorUI
++javax/swing/plaf/synth/SynthScrollBarUI
++javax/swing/plaf/synth/SynthArrowButton
++javax/swing/plaf/synth/SynthArrowButton$SynthArrowButtonUI
++javax/swing/plaf/synth/SynthComboBoxUI
++javax/swing/plaf/synth/SynthComboPopup
++javax/swing/plaf/synth/SynthListUI
++javax/swing/plaf/synth/SynthListUI$SynthListCellRenderer
++javax/swing/plaf/synth/SynthViewportUI
++javax/swing/plaf/synth/SynthScrollPaneUI
++javax/swing/plaf/synth/SynthScrollPaneUI$ViewportBorder
++javax/swing/plaf/synth/SynthComboBoxUI$SynthComboBoxRenderer
++javax/swing/plaf/synth/SynthComboBoxUI$SynthComboBoxEditor
++javax/swing/plaf/synth/SynthTextFieldUI
++javax/swing/plaf/synth/SynthToolBarUI
++javax/swing/plaf/synth/SynthToolBarUI$SynthToolBarLayoutManager
++com/sun/java/swing/plaf/gtk/GTKIconFactory$ToolBarHandleIcon
++com/sun/java/swing/plaf/gtk/GTKConstants$Orientation
++sun/awt/X11/XTranslateCoordinates
++com/sun/java/swing/plaf/gtk/GTKPainter
++javax/swing/plaf/synth/SynthPainter
++javax/swing/plaf/synth/SynthPainter$1
++com/sun/java/swing/plaf/gtk/GTKConstants$PositionType
++com/sun/java/swing/plaf/gtk/GTKConstants$ShadowType
++java/io/ObjectInputStream$HandleTable$HandleList
++sun/java2d/pipe/ShapeSpanIterator
++sun/java2d/pipe/SpanIterator
++sun/dc/path/PathConsumer
++sun/dc/pr/PathStroker
++sun/dc/pr/PathDasher
++java/awt/geom/LineIterator
++java/awt/geom/PathIterator
++sun/applet/Main
++sun/applet/AppletMessageHandler
++sun/applet/resources/MsgAppletViewer
++sun/applet/AppletSecurity
++sun/awt/AWTSecurityManager
++java/lang/SecurityManager
++java/security/DomainCombiner
++sun/applet/AppletSecurity$1
++java/lang/SecurityManager$1
++java/security/SecurityPermission
++java/util/PropertyPermission
++sun/applet/AppletViewer
++java/applet/AppletContext
++java/awt/print/Printable
++sun/security/util/SecurityConstants
++java/awt/AWTPermission
++java/net/NetPermission
++java/net/SocketPermission
++javax/security/auth/AuthPermission
++java/lang/Thread$1
++java/util/logging/LogManager$5
++sun/applet/StdAppletViewerFactory
++sun/applet/AppletViewerFactory
++sun/applet/AppletViewer$UserActionListener
++sun/applet/AppletViewerPanel
++sun/applet/AppletPanel
++java/applet/AppletStub
++sun/misc/MessageUtils
++sun/applet/AppletPanel$10
++java/security/Policy$1
++sun/security/provider/PolicyFile$1
++sun/security/provider/PolicyFile$3
++sun/security/util/PropertyExpander
++sun/security/provider/PolicyParser
++sun/security/util/PolicyUtil
++sun/security/provider/PolicyParser$GrantEntry
++sun/security/provider/PolicyParser$PermissionEntry
++sun/security/provider/PolicyFile$PolicyEntry
++sun/security/provider/PolicyFile$6
++sun/security/provider/PolicyFile$7
++java/net/SocketPermissionCollection
++java/util/PropertyPermissionCollection
++sun/applet/AppletPanel$9
++sun/applet/AppletClassLoader
++sun/applet/AppletThreadGroup
++sun/applet/AppContextCreator
++sun/applet/AppletPanel$1
++sun/awt/X11/XMenuBarPeer
++java/awt/peer/MenuBarPeer
++java/awt/peer/MenuComponentPeer
++sun/awt/X11/XBaseMenuWindow
++sun/awt/X11/XMenuPeer
++java/awt/peer/MenuPeer
++java/awt/peer/MenuItemPeer
++sun/awt/X11/XMenuItemPeer
++java/awt/MenuShortcut
++sun/awt/X11/XMenuWindow
++sun/awt/X11/XMenuItemPeer$TextMetrics
++sun/awt/AppContext$3
++sun/awt/X11/XMenuBarPeer$MappingData
++sun/awt/X11/XBaseMenuWindow$MappingData
++sun/applet/AppletViewer$1
++sun/applet/AppletViewer$1AppletEventListener
++sun/applet/AppletListener
++sun/applet/AppletEventMulticaster
++sun/misc/Queue
++sun/misc/QueueElement
++sun/applet/AppletEvent
++sun/applet/AppletClassLoader$1
++sun/awt/X11/XBaseMenuWindow$3
++java/awt/DefaultKeyboardFocusManager$DefaultKeyboardFocusManagerSentEvent
++sun/awt/CausedFocusEvent
++sun/awt/X11/XWindow$1
++java/net/URLClassLoader$4
++sun/applet/AppletClassLoader$2
++javax/swing/JApplet
++java/lang/ClassLoader$1
++sun/security/provider/PolicyFile$5
++java/security/PermissionsEnumerator
++java/util/Collections$1
++sun/applet/AppletPanel$11
++sun/applet/AppletPanel$8
++sun/applet/AppletPanel$2
++sun/applet/AppletPanel$3
++sun/applet/AppletPanel$6
++javax/swing/BufferStrategyPaintManager$1
++# f3ac8b467e7f8c49
+--- ./jdk/src/bsd/doc/man/appletviewer.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/appletviewer.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/apt.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/extcheck.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/idlj.1 Sun Jan 25 08:34:16 2015 -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/ja/appletviewer.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/appletviewer.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,51 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH appletviewer 1 "07 May 2011"
++.TH appletviewer 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++appletviewer \- Java¥¢¥×¥ì¥Ã¥È¡¦¥Ó¥å¡¼¥¢
++.LP
++.LP
++\f3appletviewer\fP¥³¥Þ¥ó¥É¤Ç¤Ï¡¢Web¥Ö¥é¥¦¥¶¤Î³°¤Ç¥¢¥×¥ì¥Ã¥È¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.LP
++\f4appletviewer\fP \f2[\fP \f2options\fP \f2] \fP\f2urls\fP ...
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3appletviewer\fP¥³¥Þ¥ó¥É¤Ï\f2urls\fP¤Ë»ØÄꤵ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤¢¤ë¤¤¤Ï¥ê¥½¡¼¥¹¤ÈÀܳ¤·¤Æ¡¢¤½¤Î¥É¥­¥å¥á¥ó¥È¤¬»²¾È¤¹¤ë¤½¤ì¤¾¤ì¤Î¥¢¥×¥ì¥Ã¥È¤òÆȼ«¤Î¥¦¥£¥ó¥É¥¦¤Çɽ¼¨¤·¤Þ¤¹¡£Ãí°Õ: \f2urls\fP¤Ë¤è¤Ã¤Æ»²¾È¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤¬¡¢\f2OBJECT\fP¡¢\f2EMBED\fP¡¢¤Þ¤¿¤Ï\f2APPLET\fP¥¿¥°¤Ç¤É¤Î¥¢¥×¥ì¥Ã¥È¤â»²¾È¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢\f3appletviewer\fP¤Ï²¿¤â¹Ô¤¤¤Þ¤»¤ó¡£\f3appletviewer\fP¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤ëHTML¥¿¥°¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2¥¢¥×¥ì¥Ã¥È¡¦¥Ó¥å¡¼¥¢¤Î¥¿¥°\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++\f3Ãí°Õ:\fP \f3appletviewer\fP¤Ï³«È¯ÀìÍѤǤ¹¡£¾ÜºÙ¤Ï¡¢¥µ¥ó¥×¥ë/¥Æ¥¹¥È¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥³¡¼¥É¤Ë¤Ä¤¤¤Æ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++\f3Ãí°Õ:\fP \f3appletviewer\fP¤Ï¡¢RFC2396¤ÇÄêµÁ¤µ¤ì¤¿¥¨¥¹¥±¡¼¥×¡¦¥á¥«¥Ë¥º¥à¤Ë½¾¤Ã¤Æ¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿URL¤òɬÍפȤ·¤Þ¤¹¡£¥µ¥Ý¡¼¥È¤µ¤ì¤ë¤Î¤Ï¡¢¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿URL¤Î¤ß¤Ç¤¹¡£¤¿¤À¤·¡¢¥Õ¥¡¥¤¥ë̾¤Ë¤Ä¤¤¤Æ¤Ï¡¢RFC2396¤Î»ÅÍͤ˽¾¤Ã¤Æ¥¨¥ó¥³¡¼¥É¤ò²ò½ü¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-debug
++Java¥Ç¥Ð¥Ã¥¬jdb(1)¤Ç¥¢¥×¥ì¥Ã¥È¡¦¥Ó¥å¡¼¥¢¤ò³«»Ï¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥É¥­¥å¥á¥ó¥ÈÃæ¤Î¥¢¥×¥ì¥Ã¥È¤ò¥Ç¥Ð¥Ã¥°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.TP 3
++\-encoding \ \ encoding name
++ÆþÎÏHTML¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤ò»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-Jjavaoption
++ʸ»úÎó\f2javaoption\fP¤Ï¡¢appletviewer¤ò¼Â¹Ô¤¹¤ëJava¥¤¥ó¥¿¥×¥ê¥¿¤Ë1¤Ä¤Î°ú¿ô¤È¤·¤ÆÅϤµ¤ì¤Þ¤¹¡£°ú¿ô¤Ë¥¹¥Ú¡¼¥¹¤ò´Þ¤á¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£Ê£¿ô¤Î°ú¿ô¤Ï¡¢³Æ°ú¿ô¤Î¤¹¤Ù¤Æ¤òÀÜƬ¼­\f3\-J\fP¤Ç»Ï¤á¤ë¤³¤È¤Ë¤è¤ê¶èʬ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Î¼Â¹Ô´Ä¶­¤Þ¤¿¤Ï¥á¥â¥ê¡¼»ÈÍѤÎÄ´À°¤ËÍ­¸ú¤Ç¤¹¡£
++.RE
++
++.LP
++.LP
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/apt.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/apt.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,9 +19,135 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH apt 1 "07 May 2011"
++.TH apt 1 "05 Jul 2012"
+
+ .LP
+-.SH "NAME"
++.SH "̾Á°"
+ .LP
+ .LP
++\f2apt\fP \- Ãí¼á½èÍý¥Ä¡¼¥ë
++.LP
++.SH "·Á¼°"
++.LP
++.LP
++\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files]
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.LP
++¥ª¥×¥·¥ç¥ó¤Î»ØÄê½ç½ø¤Ë·è¤Þ¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¡£ÆÃÄê¤Î¥ª¥×¥·¥ç¥ó¤ËŬÍѤµ¤ì¤ë¥Ñ¥é¥á¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢²¼µ­¤Î¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.RS 3
++.TP 3
++sourcefiles
++¥¼¥í¡¢1¤Ä¡¢¤Þ¤¿¤ÏÊ£¿ô¤Î½èÍýÂоݤΥ½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë
++.TP 3
++@files
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¾¤Î¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë1¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥Õ¥¡¥¤¥ë
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3Ãí°Õ\fP: \f2apt\fP¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸\f2com.sun.mirror\fP¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿API¤Ï¡¢JDK 7°Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK¤Î¼¡¤Î¥á¥¸¥ã¡¼¡¦¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸\f2javax.annotation.processing\fP¤ª¤è¤Ó\f2javax.lang.model\fP¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ëAPI¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++Ãí¼á½èÍý¥Ä¡¼¥ë\f2apt\fP¤Ï¡¢¥ê¥Õ¥ì¥¯¥ÈAPI¤È¥µ¥Ý¡¼¥È¡¦¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤«¤é¹½À®¤µ¤ì¡¢¥×¥í¥°¥é¥àÃí¼á¤ò½èÍý¤·¤Þ¤¹¡£\f2apt\fP¥ê¥Õ¥ì¥¯¥ÈAPI¤Ï¡¢¹½ÃÛ»þ¤Î¥½¡¼¥¹¡¦¥Ù¡¼¥¹¤Ç¡¢¥×¥í¥°¥é¥à¹½Â¤¤Ë´Ø¤¹¤ëÆɼè¤êÀìÍѥӥ塼¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ê¥Õ¥ì¥¯¥ÈAPI¤Ï¡¢Áí¾Î¤òÄɲä·¤¿¸å¤Ë¡¢Java(tm)¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î·¿¥·¥¹¥Æ¥à¤òÀµ¤·¤¯¥â¥Ç¥ë²½¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Ë¡¢\f2apt\fP¤Ï¡¢¿·¤·¤¤¥½¡¼¥¹¡¦¥³¡¼¥É¤È¾¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¼¡¤Ë¡¢\f2apt\fP¤Ï¡¢¸µ¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤·¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¡¢³«È¯¤¬³Ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ä¡¼¥ë¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë»ÈÍѤµ¤ì¤ë¥ê¥Õ¥ì¥¯¥ÈAPI¤Ê¤É¤ÎAPI¤Ï¡¢\f2com.sun.mirror\fP¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£
++.LP
++.LP
++¥Ä¡¼¥ë¤Îµ¡Ç½¤Ë´Ø¤¹¤ë¾ÜºÙ¤ª¤è¤Ó\f2apt\fP¤ò»ÈÍѤ·¤¿³«È¯¼ê½ç¤Ï¡¢
++.na
++\f4apt\fP\f3¥¹¥¿¡¼¥È¡¦¥¬¥¤¥É\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.SS
++apt¸ÇÍ­¤Î¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-s dir
++¥×¥í¥»¥Ã¥µ¤ÎÀ¸À®¤¹¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¥Ç¥£¥ì¥¯¥È¥ê¡¦¥ë¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î̾Á°¶õ´Ö¤Ë´ð¤Å¤¤¤Æ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ¤¹¡£
++.TP 3
++\-nocompile
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤»¤ó¡£
++.TP 3
++\-print
++»ØÄꤷ¤¿¥¿¥¤¥×¤Î¥Æ¥­¥¹¥Èɽ¸½¤ò½ÐÎϤ·¤Þ¤¹¡£Ãí¼á½èÍý¤Þ¤¿¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ï¹Ô¤¤¤Þ¤»¤ó¡£
++.TP 3
++\-A[key[=val]]
++Ãí¼á¥×¥í¥»¥Ã¥µ¤ØÅϤ¹¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2apt\fP¤¬Ä¾Àܲò¼á¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢¤½¤ì¤¾¤ì¤Î¥×¥í¥»¥Ã¥µ¤Ç»ÈÍѤǤ­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++\-factorypath path
++Ãí¼á¥×¥í¥»¥Ã¥µ¡¦¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷\f2¤µ¤ì¤Þ¤»¤ó\fP¡£
++.TP 3
++\-factory classname
++»ÈÍѤ¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¡¦¥Õ¥¡¥¯¥È¥ê¤Î̾Á°¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î¸¡½Ð¥×¥í¥»¥¹¤ò¾Êά¤·¤Þ¤¹¡£
++.TP 3
++\-version
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-X
++Èóɸ½à¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++javac¤È¶¦ÍѤ¹¤ë¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-d dir
++¥×¥í¥»¥Ã¥µ¤ÈjavacÀ¸À®¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-cppath¤Þ¤¿¤Ï\-classpathpath
++¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÈÃí¼á¥×¥í¥»¥Ã¥µ¡¦¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£\f2\-factorypath\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£
++.RE
++
++.LP
++.LP
++\f2javac\fP¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï¡¢javac(1)¤Î¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SS
++Èóɸ½à¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-XListAnnotationTypes
++¸¡½Ð¤µ¤ì¤¿Ãí¼á¤Î·¿¤ò¥ê¥¹¥È¤·¤Þ¤¹¡£
++.TP 3
++\-XListDeclarations
++»ØÄꤪ¤è¤Ó¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤ëÀë¸À¤ò¥ê¥¹¥È¤·¤Þ¤¹¡£
++.TP 3
++\-XPrintAptRounds
++½é´ü¤ª¤è¤ÓºÆµ¢Åª¤Ê\f2apt\fP¥é¥¦¥ó¥É¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-XPrintFactoryInfo
++¥Õ¥¡¥¯¥È¥ê¤Ë½èÍý¤ò¥ê¥¯¥¨¥¹¥È¤¹¤ëÃí¼á¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-XclassesAsDecls
++¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¡¢½èÍýÂоݤÎÀë¸À¤È¤·¤Æ½èÍý¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++\f3Ãí°Õ\fP: ¤³¤ì¤é¤ÏÈóɸ½à¥ª¥×¥·¥ç¥ó¤Ê¤Î¤Ç¡¢Í½¹ð¤Ê¤¯Êѹ¹¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "Ãí°Õ"
++.LP
++.LP
++\f2apt\fP¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸\f2com.sun.mirror\fP¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿API¤Ï¡¢JDK 7°Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK¤Î¼¡¤Î¥á¥¸¥ã¡¼¡¦¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸\f2javax.annotation.processing\fP¤ª¤è¤Ó\f2javax.lang.model\fP¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ëAPI¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++javac(1)¡¢java(1)
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/extcheck.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/extcheck.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,55 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH extcheck 1 "07 May 2011"
++.TH extcheck 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++extcheck \- jar¤Î¶¥¹ç¸¡½Ð¥æ¡¼¥Æ¥£¥ê¥Æ¥£
++.LP
++.LP
++\f3extcheck\fP¤Ï¡¢¥¿¡¼¥²¥Ã¥È¤Îjar¥Õ¥¡¥¤¥ë¤È¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë³ÈÄ¥µ¡Ç½¤Îjar¥Õ¥¡¥¤¥ë´Ö¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¶¥¹ç¤ò¸¡½Ð¤·¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++extcheck [ \-verbose ] targetfile.jar
++.fl
++\fP
++.fi
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3extcheck\fP¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢»ØÄꤵ¤ì¤¿Jar¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥È¥ë¤ª¤è¤Ó¥Ð¡¼¥¸¥ç¥ó¤¬Java(tm) SDK¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë³ÈÄ¥µ¡Ç½¤È¶¥¹ç¤·¤Æ¤¤¤Ê¤¤¤«¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£³ÈÄ¥µ¡Ç½¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë¡¢¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»ÈÍѤ·¤Æ¡¢Æ±¤¸¥Ð¡¼¥¸¥ç¥ó¤Þ¤¿¤Ï¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î³ÈÄ¥µ¡Ç½¤¬¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤É¤¦¤«¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f3extcheck\fP¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢\f2targetfile.jar\fP¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥ÈÆâ¤Î¥Ø¥Ã¥À¡¼\f2Specification\-title\fP¤ª¤è¤Ó\f2Specification\-version\fP¤ò¡¢³ÈÄ¥µ¡Ç½¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤ÎJar¥Õ¥¡¥¤¥ëÆâ¤ÎÂбþ¤¹¤ë¥Ø¥Ã¥À¡¼¤ÈÈæ³Ó¤·¤Þ¤¹¡£(¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢³ÈÄ¥µ¡Ç½¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢\f2jre/lib/ext\fP¤Ç¤¹¡£)\f3extcheck\fP¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢\f2java.lang.Package.isCompatibleWith\fP¥á¥½¥Ã¥É¤ÈƱÍͤÎÊýË¡¤Ç¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÈæ³Ó¤·¤Þ¤¹¡£
++.LP
++.LP
++¶¥¹ç¤¬¸¡½Ð¤µ¤ì¤Ê¤¤¾ì¹ç¤Î¥ê¥¿¡¼¥ó¡¦¥³¡¼¥É¤Ï\f20\fP¤Ç¤¹¡£
++.LP
++.LP
++³ÈÄ¥µ¡Ç½¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¤¤º¤ì¤«¤Îjar¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¤Ë¡¢Æ±°ì¤Î\f2Specification\-title\fP¡¢¤ª¤è¤ÓƱ°ì¤Þ¤¿¤Ï¤è¤ê¿·¤·¤¤\f2Specification\-version\fPÈֹ椬¤¢¤ë¾ì¹ç¤Ï¡¢¥¼¥í¤Ç¤Ê¤¤¥¨¥é¡¼¡¦¥³¡¼¥É¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£\f2targetfile.jar\fP¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¤Ë\f2Specification\-title\fP¤Þ¤¿¤Ï\f2Specification\-version\fP°À­¤¬¤Ê¤¤¾ì¹ç¤â¡¢¥¼¥í¤Ç¤Ê¤¤¥¨¥é¡¼¡¦¥³¡¼¥É¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-verbose
++³ÈÄ¥µ¡Ç½¥Ç¥£¥ì¥¯¥È¥êÆâ¤ÎJar¥Õ¥¡¥¤¥ë¤ò¡¢¥Á¥§¥Ã¥¯»þ¤Ë°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£¤Þ¤¿¡¢¥¿¡¼¥²¥Ã¥Èjar¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¤Î°À­¡¢¤ª¤è¤Ó¶¥¹ç¤¹¤ëjar¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¤âÊó¹ð¤·¤Þ¤¹¡£
++.TP 3
++\-Joption
++Java²¾ÁÛ¥Þ¥·¥ó¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£\f2option\fP¤Ë¤Ï¡¢java(1)¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò1¤Ä»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.LP
++jar(1)
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/idlj.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/idlj.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,720 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH idlj 1 "07 May 2011"
++.TH idlj 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++idlj \- IDL\-to\-Java¥³¥ó¥Ñ¥¤¥é
++.LP
++\f3idlj\fP¤Ï¡¢»ØÄꤵ¤ì¤¿IDL¥Õ¥¡¥¤¥ë¤«¤éJava¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÀ¸À®¤·¤Þ¤¹¡£
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++idlj [ \fP\f3options\fP\f3 ] \fP\f4idl\-file\fP\f3
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f2idl\-file\fP¤Ï¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹ÄêµÁ¸À¸ì(IDL)¤Ë¤è¤ëÄêµÁ¤¬Æþ¤Ã¤¿¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡£\f2options\fP¤Î½çÈÖ¤ÏǤ°Õ¤Ç¤¹¤¬¡¢\f2idl\-file\fP¤è¤ê¤âÁ°¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++IDL\-to\-Java¥³¥ó¥Ñ¥¤¥é¤Ï¡¢»ØÄꤵ¤ì¤¿IDL¥Õ¥¡¥¤¥ë¤ËÂФ·¤ÆJava¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÀ¸À®¤·¤Þ¤¹¡£¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2OMG IDL to Java Language Mapping Specification\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£IDL\-to\-Java¥³¥ó¥Ñ¥¤¥é¤Î°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤ÎÃæ¤Ë¤Ï¡¢\f2idltojava\fP¤È¤¤¤¦Ì¾Á°¤À¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SS
++¥¯¥é¥¤¥¢¥ó¥È¡¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ª¤è¤Ó¥µ¡¼¥Ð¡¼¡¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Îȯ¹Ô
++.LP
++.LP
++My.idl¤È¤¤¤¦Ì¾Á°¤ÎIDL¥Õ¥¡¥¤¥ë¤ËÂФ·¤ÆJava¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj My.idl
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤ì¤Ë¤è¤ê¡¢¥¯¥é¥¤¥¢¥ó¥È¦¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ÈÅù²Á¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-fclient\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++¥¯¥é¥¤¥¢¥ó¥È¦¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ë¤Ï¡¢¥µ¡¼¥Ð¡¼Â¦¤Î¥¹¥±¥ë¥È¥ó¤ÏÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ËÂФ·¤Æ¥µ¡¼¥Ð¡¼Â¦¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-fserver\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++¥µ¡¼¥Ð¡¼Â¦¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ë¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¦¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Î¾¤Ë¡¢¥¹¥±¥ë¥È¥ó¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤é¤Ï¤¹¤Ù¤Æ¡¢\f2POA\fP(¤Ä¤Þ¤ê·Ñ¾µ¥â¥Ç¥ë)¥¯¥é¥¹¤Ç¤¹¡£¥¯¥é¥¤¥¢¥ó¥È¦¤È¥µ¡¼¥Ð¡¼Â¦¤ÎξÊý¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÀ¸À®¤¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É(¤É¤ì¤âÅù²Á)¤Î¤¦¤Á¤Î1¤Ä¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-fclient \-fserver\fP My.idl
++.fl
++idlj \f3\-fall\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++¥µ¡¼¥Ð¡¼Â¦¤Ç²Äǽ¤Ê¥â¥Ç¥ë¤Ï2¤Ä¤¢¤ê¤Þ¤¹¡£·Ñ¾µ¥â¥Ç¥ë¤ÈTie°Ñ¾ù¥â¥Ç¥ë¤Ç¤¹¡£
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Î¥µ¡¼¥Ð¡¼Â¦¤Î¥â¥Ç¥ë¤Ï¡¢\f2°Ü¿£²Äǽ¥µ¡¼¥Ð¥ó¥È·Ñ¾µ¥â¥Ç¥ë\fP¤Ç¤¹¡£\f2My.idl\fPÆâ¤Ç\f2My\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢\f2MyPOA.java\fP¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¤³¤Î¼ÂÁõ¤Ï\f2My\fP¤ËÄ󶡤·¡¢\f2MyPOA\fP¤ò·Ñ¾µ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f2MyPOA.java\fP¤Ï
++.na
++\f2org.omg.PortableServer.Servant\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html¤ò³ÈÄ¥¤¹¤ë¥¹¥È¥ê¡¼¥à¥Ù¡¼¥¹¤Î¥¹¥±¥ë¥È¥ó¤Ç¡¢¥¹¥±¥ë¥È¥ó¤¬¼ÂÁõ¤¹¤ëIDL¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ë\f2InvokeHandler\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÈÁàºî¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò¼ÂÁõ¤·¤Þ¤¹¡£
++.LP
++.LP
++.na
++\f2Portable Object Adapter(POA)\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/POA.html¤Î\f2PortableServer\fP¥â¥¸¥å¡¼¥ë¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¤Î\f2Servant\fP·¿¤òÄêµÁ¤·¤Þ¤¹¡£Java¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Ç¤Ï¡¢\f2Servant\fP·¿¤ÏJava¤Î\f2org.omg.PortableServer.Servant\fP¥¯¥é¥¹¤Ë¥Þ¥Ã¥×¤µ¤ì¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¤Ï¡¢¤¹¤Ù¤Æ¤ÎPOA¥µ¡¼¥Ð¥ó¥È¼ÂÁõ¤Î¥Ù¡¼¥¹¡¦¥¯¥é¥¹¤È¤·¤Æµ¡Ç½¤·¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥×¥í¥°¥é¥Þ¤¬¸Æ¤Ó½Ð¤¹¤³¤È¤Î¤Ç¤­¤ë¤¤¤¯¤Ä¤«¤Î¥á¥½¥Ã¥É¤Î¾¤Ë¡¢POA¤½¤Î¤â¤Î¤Ë¤è¤Ã¤Æ¸Æ¤Ó½Ð¤µ¤ì¡¢¥µ¡¼¥Ð¥ó¥È¤ÎÆ°ºî¤òÀ©¸æ¤¹¤ë¤¿¤á¤Ë¥æ¡¼¥¶¡¼¤¬¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Ç¤­¤ë¥á¥½¥Ã¥É¤âÄ󶡤·¤Þ¤¹¡£
++.LP
++.LP
++·Ñ¾µ¥â¥Ç¥ë¤Î¤â¤¦1¤Ä¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2\-oldImplBase\fP¥Õ¥é¥°¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢J2SE 1.4¤è¤êÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎJava¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤È¸ß´¹À­¤Î¤¢¤ë¥µ¡¼¥Ð¡¼Â¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÀ¸À®¤¹¤ë¤³¤È¤Ç¤¹¡£¤¿¤À¤·¡¢\f2\-oldImplBase\fP¥Õ¥é¥°¤ò»ÈÍѤ¹¤ë¤Î¤Ï¡¢É¸½àŪ¤Ê¼êË¡¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤ì¤é¤ÎAPI¤Ïº£¸åÈó¿ä¾©¤Ë¤Ê¤ëͽÄê¤Ç¤¹¡£¤³¤Î¥Õ¥é¥°¤ò»ÈÍѤ¹¤ë¤Î¤Ï¡¢J2SE 1.3¤Çµ­½Ò¤µ¤ì¤¿´û¸¤Î¥µ¡¼¥Ð¡¼¤È¤Î¸ß´¹À­¤¬É¬Íפʾì¹ç¤Î¤ß¤Ç¤¹¡£¤½¤Î¾ì¹ç¤Ë¤Ï´û¸¤ÎMAKEFILE¤òÊѹ¹¤·¡¢\f2idlj\fP¥³¥ó¥Ñ¥¤¥é¤Ë\f2\-oldImplBase\fP¥Õ¥é¥°¤òÄɲ乤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤·¤Ê¤¤¤È¡¢POA¥Ù¡¼¥¹¤Î¥µ¡¼¥Ð¡¼Â¦¥Þ¥Ã¥Ô¥ó¥°¤¬À¸À®¤µ¤ì¤Þ¤¹¡£²¼°Ì¸ß´¹À­¤Î¤¢¤ë¥µ¡¼¥Ð¡¼Â¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-fclient \-fserver\fP \f3\-oldImplBase\fP My.idl
++.fl
++idlj \f3\-fall\fP \f3\-oldImplBase\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++\f2My.idl\fPÆâ¤Ç\f2My\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢\f2_MyImplBase.java\fP¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¡£\f2My\fP¤ËÂФ·¤Æ¤½¤Î¼ÂÁõ¤òÄ󶡤·¡¢¤³¤Î¼ÂÁõ¤Ï\f2_MyImplBase\fP¤«¤é·Ñ¾µ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++¤â¤¦1¤Ä¤Î¥µ¡¼¥Ð¡¼Â¦¥â¥Ç¥ë¤Ï¡¢Tie¥â¥Ç¥ë¤È¸Æ¤Ð¤ì¤ë¤â¤Î¤Ç¤¹¡£¤³¤Î¥µ¡¼¥Ð¡¼Â¦¥â¥Ç¥ë¤Ï¡¢°Ñ¾ù¥â¥Ç¥ë¤Ç¤¹¡£Tie¤È¥¹¥±¥ë¥È¥ó¤òƱ»þ¤ËÀ¸À®¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¤¿¤á¡¢¤½¤ì¤é¤ÏÊÌ¡¹¤ËÀ¸À®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ¡¢Tie¥â¥Ç¥ëÍѤΥХ¤¥ó¥Ç¥£¥ó¥°¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-fall\fP My.idl
++.fl
++idlj \f3\-fallTIE\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++\f2My\fP¤È¤¤¤¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¾ì¹ç¡¢¾åµ­¤Î2ÈÖÌܤΥ³¥Þ¥ó¥É¤Ë¤è¤ê¡¢\f2MyPOATie.java\fP¤¬À¸À®¤µ¤ì¤Þ¤¹¡£\f2MyPOATie\fP¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¤Ï¡¢\f2delegate\fP¤ò¼è¤ê¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤ÎPOA¥â¥Ç¥ë¤ò»ÈÍѤ·¤Æ¤¤¤ë¤¿¤á¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¤Ë¤â\f2poa\fP¤¬É¬ÍפǤ¹¡£\f2delegate\fP¤ËÂФ·¤Æ¼ÂÁõ¤òÄ󶡤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¤³¤Î¼ÂÁõ¤Ï\f2MyOperations\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤«¤é·Ñ¾µ¤¹¤ëɬÍפ¬¤¢¤ë¤Î¤ß¤Ç¡¢¤½¤Î¾¤Î¥¯¥é¥¹¤«¤é·Ñ¾µ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£¤·¤«¤·¡¢¤³¤Î¼ÂÁõ¤òORB¤È°ì½ï¤Ë»ÈÍѤ¹¤ë¤Ë¤Ï¡¢\f2MyPOATie\fPÆâ¤Ç¼ÂÁõ¤ò¥é¥Ã¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ ORB orb = ORB.init(args, System.getProperties());
++.fl
++
++.fl
++ // Get reference to rootpoa & activate the POAManager
++.fl
++ POA rootpoa = (POA)orb.resolve_initial_references("RootPOA");
++.fl
++ rootpoa.the_POAManager().activate();
++.fl
++
++.fl
++ // create servant and register it with the ORB
++.fl
++ MyServant myDelegate = new MyServant();
++.fl
++ myDelegate.setORB(orb);
++.fl
++
++.fl
++ // create a tie, with servant being the delegate.
++.fl
++ MyPOATie tie = new MyPOATie(myDelegate, rootpoa);
++.fl
++
++.fl
++ // obtain the objectRef for the tie
++.fl
++ My ref = tie._this(orb);
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¾¤Î¼ÂÁõ¤«¤é·Ñ¾µ¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¡¢É¸½à¤Î·Ñ¾µ¥â¥Ç¥ë¤Ç¤Ï¤Ê¤¯Tie¥â¥Ç¥ë¤ò»ÈÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£Java¤Î¾ì¹ç¤Ï¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î·Ñ¾µ¤Î¸Ä¿ô¤ËÀ©¸Â¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢¥¯¥é¥¹¤Î·Ñ¾µ¤Ë»ÈÍѤǤ­¤ë¥¹¥í¥Ã¥È¤Ï1¤Ä¤Î¤ß¤Ç¤¹¡£·Ñ¾µ¥â¥Ç¥ë¤ò»ÈÍѤ·¤¿¾ì¹ç¤Ï¡¢¤½¤Î¥¹¥í¥Ã¥È¤¬ÀêÍ­¤µ¤ì¤Þ¤¹¡£Tie¥â¥Ç¥ë¤ò»ÈÍѤ·¤¿¾ì¹ç¤Ï¡¢¤½¤Î¥¹¥í¥Ã¥È¤¬»ÈÍѤµ¤ì¤º¡¢¥æ¡¼¥¶¡¼¤¬Æȼ«¤ÎÌÜŪ¤Ç»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢¤³¤ÎÊýË¡¤Ë¤Ï¡¢´ÖÀÜÀ­¤Î¥ì¥Ù¥ë¤¬1¤ÄƳÆþ¤µ¤ì¤ë¤È¤¤¤¦·çÅÀ¤¬¤¢¤ê¤Þ¤¹¡£¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤È¤­¤Ë¡¢Í¾Ê¬¤Ê¥á¥½¥Ã¥É¸Æ½Ð¤·¤¬1²óȯÀ¸¤·¤Þ¤¹¡£
++.LP
++.LP
++J2SE 1.4¤è¤êÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎJava¸À¸ì¤Ë¥Þ¥Ã¥Ô¥ó¥°¤¹¤ëIDL¤Î¥Ð¡¼¥¸¥ç¥ó¤È¸ß´¹À­¤Î¤¢¤ë¡¢¥µ¡¼¥Ð¡¼Â¦¤ÎTie¥â¥Ç¥ë¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÀ¸À®¤¹¤ëÊýË¡¤Ï¡¢¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-oldImplBase\fP \f3\-fall\fP My.idl
++.fl
++idlj \f3\-oldImplBase\fP \f3\-fallTIE\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++\f2My\fP¤È¤¤¤¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¾ì¹ç¡¢¤³¤ì¤Ë¤è¤ê\f2My_Tie.java\fP¤¬À¸À®¤µ¤ì¤Þ¤¹¡£\f2My_Tie\fP¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¤Ï¡¢\f2impl\fP¤ò¼è¤ê¤Þ¤¹¡£\f2impl\fP¤ËÂФ·¤Æ¼ÂÁõ¤òÄ󶡤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¤½¤Î¼ÂÁõ¤Ï\f2HelloOperations\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤«¤é·Ñ¾µ¤¹¤ëɬÍפ¬¤¢¤ë¤Î¤ß¤Ç¡¢¤½¤Î¾¤Î¥¯¥é¥¹¤«¤é·Ñ¾µ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£¤·¤«¤·¡¢¤³¤Î¼ÂÁõ¤òORB¤È°ì½ï¤Ë»ÈÍѤ¹¤ë¤Ë¤Ï¡¢\f2My_Tie\fPÆâ¤Ç¼ÂÁõ¤ò¥é¥Ã¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ ORB orb = ORB.init(args, System.getProperties());
++.fl
++
++.fl
++ // create servant and register it with the ORB
++.fl
++ MyServant myDelegate = new MyServant();
++.fl
++ myDelegate.setORB(orb);
++.fl
++
++.fl
++ // create a tie, with servant being the delegate.
++.fl
++ MyPOATie tie = new MyPOATie(myDelegate);
++.fl
++
++.fl
++ // obtain the objectRef for the tie
++.fl
++ My ref = tie._this(orb);
++.fl
++\fP
++.fi
++
++.LP
++.SS
++ȯ¹Ô¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÎÂåÂØ°ÌÃ֤λØÄê
++.LP
++.LP
++ȯ¹Ô¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê°Ê³°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¯¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤Ç¥³¥ó¥Ñ¥¤¥é¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-td /altdir\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++\f2My\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¾ì¹ç¡¢¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ï¡¢\f2./My.java\fP¤Ç¤Ï¤Ê¤¯¡¢\f2/altdir/My.java\fP¤Ê¤É¤Ëȯ¹Ô¤µ¤ì¤Þ¤¹¡£
++.LP
++.SS
++¥¤¥ó¥¯¥ë¡¼¥É¡¦¥Õ¥¡¥¤¥ë¤ÎÂåÂØ°ÌÃ֤λØÄê
++.LP
++.LP
++\f2My.idl\fP¤Ë¤â¤¦1¤Ä¤ÎIDL¥Õ¥¡¥¤¥ë\f2MyOther.idl\fP¤¬¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¥í¡¼¥«¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë\f2MyOther.idl\fP¤¬¤¢¤ë¤â¤Î¤ÈÁÛÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤¬\f2/includes\fP¤Ë¤¢¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤Ç¥³¥ó¥Ñ¥¤¥é¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-i /includes\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢\f2/moreIncludes\fP¤Ë¤¢¤ë\f2Another.idl\fP¤â\f2My.idl\fP¤Ë¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤Ç¥³¥ó¥Ñ¥¤¥é¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-i /includes \-i /moreIncludes\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++¤³¤Î¤è¤¦¤Ê·Á¼°¤Ç¥¤¥ó¥¯¥ë¡¼¥É¤ò»ØÄꤹ¤ë¤È¡¢¥³¥Þ¥ó¥É¤¬Ä¹¤¯¤ÆÊ£»¨¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤³¤Ç¡¢¥¤¥ó¥¯¥ë¡¼¥É¡¦¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò¥³¥ó¥Ñ¥¤¥é¤Ë»Ø¼¨¤¹¤ë¤¿¤á¤ÎÊ̤ÎÊýË¡¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ÎÊýË¡¤Ï¡¢´Ä¶­ÊÑ¿ô¤Î¹Í¤¨Êý¤È»÷¤Æ¤¤¤Þ¤¹¡£CLASSPATH¤Ë¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë\f2idl.config\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£¤½¤Î\f2idl.config\fP¤ÎÃæ¤Ë¡¢¼¡¤Î¤è¤¦¤Ê·Á¼°¤Î¹Ô¤òÆþ¤ì¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++includes=/includes;/moreIncludes
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·¡¢¥¤¥ó¥¯¥ë¡¼¥É¡¦¥ê¥¹¥È¤òÆɤ߹þ¤ß¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Î´Ö¤Î¶èÀÚ¤êʸ»ú¤Ï¥»¥ß¥³¥í¥ó(;)¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤Î¶èÀÚ¤êʸ»ú¤Ï¡¢¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Windows¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¥»¥ß¥³¥í¥ó¤Ç¤¹¤¬¡¢Unix¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¥³¥í¥ó¤Ç¤¹¡£\f2includes\fP¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2¥¯¥é¥¹¡¦¥Ñ¥¹¤ÎÀßÄê\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SS
++¥¤¥ó¥¯¥ë¡¼¥É¡¦¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Îȯ¹Ô
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤷ¤¿IDL¥Õ¥¡¥¤¥ë¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ä¹½Â¤ÂΤʤɤˤĤ¤¤Æ¤Î¤ß¡¢Java¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë·¿¤Ë¤Ä¤¤¤Æ¤ÏÀ¸À®¤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î2¤Ä¤ÎIDL¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¹Í¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£
++.LP
++
++.LP
++.LP
++\f4My.idl\fP
++.LP
++.nf
++\f3
++.fl
++#include <MyOther.idl>
++.fl
++interface My
++.fl
++{
++.fl
++};
++.fl
++\fP
++.fi
++
++.LP
++
++.LP
++.LP
++\f4MyOther.idl\fP
++.LP
++.nf
++\f3
++.fl
++interface MyOther
++.fl
++{
++.fl
++};
++.fl
++\fP
++.fi
++
++.LP
++
++.LP
++.LP
++¼¡¤Î¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\f2My\fP¤ËÂФ¹¤ëJava¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Î¤ß¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj My.idl
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f2My.idl\fP¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë·¿¤È¡¢\f2My.idl\fP¤Ë¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë(¤³¤ÎÎã¤Ç¤Ï\f2MyOther.idl\fP)¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë·¿¤¹¤Ù¤Æ¤Ë¤Ä¤¤¤ÆÀ¸À®¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-emitAll\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++¤³¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥ë¡¼¥ë¤Ë´Ø¤·¤ÆÃí°Õ¤¬É¬ÍפÊÅÀ¤¬¤¢¤ê¤Þ¤¹¡£¥°¥í¡¼¥Ð¥ë¡¦¥¹¥³¡¼¥×¤Ë»ØÄꤷ¤¿\f2#include\fPʸ¤Ï¡¢Á°½Ò¤Î¤È¤ª¤ê¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£¤³¤ì¤é¤Î\f2#include\fPʸ¤Ï¡¢¥¤¥ó¥Ý¡¼¥Èʸ¤È¸«¤Ê¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤½¤ì¤ËÂФ·¤Æ¡¢Â¾¤ÎÄêµÁ¤Ë°Ï¤Þ¤ì¤¿¥¹¥³¡¼¥×Æâ¤Ë»ØÄꤷ¤¿\f2#include\fPʸ¤Ï¡¢ËÜÅö¤Î°ÕÌ£¤Ç¤Î\f2#include\fPʸ¤È¤·¤Æ½èÍý¤µ¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¥³¡¼¥É¤¬¡¢¸µ¤Î¥Õ¥¡¥¤¥ë¤Ë¤½¤Î¤Þ¤Þ»ØÄꤵ¤ì¤Æ¤¤¤ë¤«¤Î¤è¤¦¤Ë½èÍý¤µ¤ì¡¢¤½¤ì¤ËÂФ·¤ÆJava¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤¬È¯¹Ô¤µ¤ì¤Þ¤¹¡£¼¡¤Ï¤½¤ÎÎã¤Ç¤¹¡£
++.LP
++
++.LP
++.LP
++\f4My.idl\fP
++.LP
++.nf
++\f3
++.fl
++#include <MyOther.idl>
++.fl
++interface My
++.fl
++{
++.fl
++ #include <Embedded.idl>
++.fl
++};
++.fl
++\fP
++.fi
++
++.LP
++
++.LP
++.LP
++\f4MyOther.idl\fP
++.LP
++.nf
++\f3
++.fl
++interface MyOther
++.fl
++{
++.fl
++};
++.fl
++\fP
++.fi
++
++.LP
++
++.LP
++.LP
++\f4Embedded.idl\fP
++.LP
++.nf
++\f3
++.fl
++enum E {one, two, three};
++.fl
++\fP
++.fi
++
++.LP
++
++.LP
++.LP
++¤³¤Î¤È¤­¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢
++.LP
++.nf
++\f3
++.fl
++idlj My.idl
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¼¡¤Î¤è¤¦¤Ê°ìÏ¢¤ÎJava¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++./MyHolder.java
++.fl
++./MyHelper.java
++.fl
++./_MyStub.java
++.fl
++./MyPackage
++.fl
++./MyPackage/EHolder.java
++.fl
++./MyPackage/EHelper.java
++.fl
++./MyPackage/E.java
++.fl
++./My.java
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥¤¥ó¥Ý¡¼¥Èʸ¤È¸«¤Ê¤µ¤ì¤ë\f2#include\fP¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤¿¤¿¤á¡¢\f2MyOther.java\fP¤ÏÀ¸À®¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£¤¿¤À¤·¡¢ËÜÅö¤Î°ÕÌ£¤Ç¤Î\f2#include\fP¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤¿¤¿¤á¡¢\f2E.java\fP¤ÏÀ¸À®\f2¤µ¤ì¤Þ¤·¤¿\fP¡£¤µ¤é¤Ë¡¢\f2Embedded.idl\fP¤¬\f2My\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥¹¥³¡¼¥×Æâ¤Ë¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤Æ¤¤¤¿¤¿¤á¡¢\f2My\fP¤Î¥¹¥³¡¼¥×Æâ(¤Ä¤Þ¤ê¡¢\f2MyPackage\fPÆâ)¤ËÀ¸À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++.LP
++¾åµ­¤ÎÎã¤Ç\f2\-emitAll\fP¥Õ¥é¥°¤ò»ÈÍѤ¹¤ì¤Ð¡¢¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î·¿¤¬È¯¹Ô¤µ¤ì¤Þ¤¹¡£
++.LP
++.SS
++¥Ñ¥Ã¥±¡¼¥¸¤ÎÀÜƬ¼­¤ÎÁÞÆþ
++.LP
++.LP
++ABC¤È¤¤¤¦Ì¾Á°¤Î²ñ¼Ò¤Î¤¿¤á¤Ëºî¶È¤·¤Æ¤¤¤Æ¡¢¼¡¤Î¤è¤¦¤ÊIDL¥Õ¥¡¥¤¥ë¤ò¹½ÃÛ¤·¤¿¤È¤·¤Þ¤·¤ç¤¦¡£
++.LP
++
++.LP
++.LP
++\f4Widgets.idl\fP
++.LP
++.nf
++\f3
++.fl
++module Widgets
++.fl
++{
++.fl
++ interface W1 {...};
++.fl
++ interface W2 {...};
++.fl
++};
++.fl
++\fP
++.fi
++
++.LP
++
++.LP
++.LP
++¤³¤Î¥Õ¥¡¥¤¥ë¤ËÂФ·¤ÆIDL\-to\-Java¥³¥ó¥Ñ¥¤¥é¤ò¼Â¹Ô¤¹¤ë¤È¡¢\f2W1\fP¤ª¤è¤Ó\f2W2\fP¤ËÂФ¹¤ëJava¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤¬\f2Widgets\fP¥Ñ¥Ã¥±¡¼¥¸Æâ¤ËÀ¸À®¤µ¤ì¤Þ¤¹¡£¤·¤«¤·¡¢¶È³¦¤Î´·Îã¤Ë¤è¤ë¤È¡¢²ñ¼Ò¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢\f2com.<company name>\fP¤È¤¤¤¦Ì¾Á°¤Î¥Ñ¥Ã¥±¡¼¥¸Æâ¤ËÃÖ¤¯¤³¤È¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤½¤Î¤¿¤á¡¢\f2Widgets\fP¥Ñ¥Ã¥±¡¼¥¸¤Ç¤ÏÉÔ½½Ê¬¤Ç¤¹¡£´·Îã¤Ë½¾¤¦¤Ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò\f2com.abc.Widgets\fP¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥Ñ¥Ã¥±¡¼¥¸ÀÜƬ¼­¤ò\f2Widgets\fP¥â¥¸¥å¡¼¥ë¤ËÉղ乤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-pkgPrefix Widgets com.abc\fP Widgets.idl
++.fl
++.fi
++
++.LP
++.LP
++\f2Widgets.idl\fP¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ¤¤¤ëIDL¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥³¥Þ¥ó¥É¤Ë¤â\f2\-pkgPrefix\fP¥Õ¥é¥°¤¬É¬ÍפǤ¹¡£¤³¤Î¥Õ¥é¥°¤ò»ØÄꤷ¤Ê¤¤¤È¡¢¤½¤ÎIDL¥Õ¥¡¥¤¥ë¤Ï¡¢\f2com.abc.Widgets\fP¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤Ê¤¯¡¢\f2Widgets\fP¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡º÷¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++ÀÜƬ¼­¤¬É¬Íפʥѥ屡¼¥¸¤¬¤¤¤¯¤Ä¤â¤¢¤ë¾ì¹ç¤Ï¡¢Á°½Ò¤Î\f2idl.config\fP¥Õ¥¡¥¤¥ë¤ÇÀÜƬ¼­¤ò»ØÄꤹ¤ë¤Î¤¬´Êñ¤Ç¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¤ÎÀÜƬ¼­¤ò»ØÄꤹ¤ë¹Ô¤Ï¡¢¤½¤ì¤¾¤ì¼¡¤Î·Á¼°¤Çµ­½Ò¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++PkgPrefix.<type>=<prefix>
++.fl
++\fP
++.fi
++
++.LP
++¤·¤¿¤¬¤Ã¤Æ¡¢¾åµ­¤ÎÎã¤Î¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ëµ­½Ò¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++PkgPrefix.Widgets=com.abc
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤â¡¢¥ê¥Ý¥¸¥È¥êID¤Ï±Æ¶Á¤ò¼õ¤±¤Þ¤»¤ó¡£
++.LP
++.SS
++¥³¥ó¥Ñ¥¤¥ëÁ°¤Î¥·¥ó¥Ü¥ë¤ÎÄêµÁ
++.LP
++.LP
++¥³¥ó¥Ñ¥¤¥ëÍѤΥ·¥ó¥Ü¥ë¤¬IDL¥Õ¥¡¥¤¥ëÆâ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¤½¤Î¥·¥ó¥Ü¥ë¤òÄêµÁ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢¤¿¤È¤¨¤Ð¡¢¥Ð¥¤¥ó¥Ç¥£¥ó¥°Æâ¤Ë¥Ç¥Ð¥Ã¥°¡¦¥³¡¼¥É¤òÁȤßÆþ¤ì¤ë¤È¤­¤Ë»ÈÍѤ·¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-d\fP MYDEF My.idl
++.fl
++.fi
++
++.LP
++.LP
++\f2My.idl\fPÆâ¤Ë\f2#define MYDEF\fP¤È¤¤¤¦¹Ô¤ò»ØÄꤷ¤¿¾ì¹ç¤ÈÅù²Á¤Ç¤¹¡£
++.LP
++.SS
++´û¸¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ÎÊÝ»ý
++.LP
++.LP
++Java¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤¬¤¹¤Ç¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ï¡¢\f2\-keep\fP¥Õ¥é¥°¤ò»ØÄꤹ¤ë¤È¡¢¥³¥ó¥Ñ¥¤¥é¤Ë¤è¤ë¾å½ñ¤­¤ò²óÈò¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¤¹¤Ç¤Ë¸ºß¤¹¤ë¤«¤É¤¦¤«¤Ë¤«¤«¤ï¤é¤º¡¢¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¾ì¹ç(¤¿¤À¤·¡¢¤½¤ì¤é¤ÎÆâÍƤ¬Àµ³Î¤Ç¤¢¤ë¤È¤­°Ê³°¤Ï¥«¥¹¥¿¥Þ¥¤¥º¤ÏÈò¤±¤ë)¡¢\f2\-keep\fP¥ª¥×¥·¥ç¥ó¤ÏÍ­ÍѤǤ¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-keep\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++¥¯¥é¥¤¥¢¥ó¥È¦¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ç¡¢¤Þ¤À¸ºß¤·¤Ê¤¤¤â¤Î¤ò¤¹¤Ù¤Æȯ¹Ô¤·¤Þ¤¹¡£
++.LP
++.SS
++¥³¥ó¥Ñ¥¤¥ë¤Î¿ÊĽ¾õ¶·¤Îɽ¼¨
++.LP
++.LP
++IDL\-to\-Java¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¼Â¹Ô¤Î³ÆÃʳ¬¤Ç¾õÂÖ¥á¥Ã¥»¡¼¥¸¤òÀ¸À®¤·¤Þ¤¹¡£¡Ö¾éĹ¡×¥â¡¼¥É¤ò¥¢¥¯¥Æ¥£¥Ö²½¤¹¤ë¤Ë¤Ï¡¢\f2\-v\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \fP\f3\-v\fP My.idl
++.fl
++.fi
++
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¾éĹ¥â¡¼¥É¤Ç¤Ï¼Â¹Ô¤µ¤ì¤Þ¤»¤ó¡£
++.LP
++.SS
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Îɽ¼¨
++.LP
++.LP
++IDL\-to\-Java¥³¥ó¥Ñ¥¤¥é¤Î¥Ó¥ë¥É¡¦¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2\-version\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++idlj \-version
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤¿¥Ð¥¤¥ó¥Ç¥£¥ó¥°Æâ¤Ë¤â½ñ¤­¹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤹ¤ë¤È¡¢¤½¤ì°Ê³°¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¤â¡¢¤¹¤Ù¤Æ̵»ë¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-d symbol
++¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢IDL¥Õ¥¡¥¤¥ë¤Ë¼¡¤Î¤è¤¦¤Ê¹Ô¤òÄɲä·¤¿¾ì¹ç¤ÈÅù²Á¤Ç¤¹¡£
++.nf
++\f3
++.fl
++#define \fP\f4symbol\fP\f3
++.fl
++\fP
++.fi
++.TP 3
++\-emitAll
++\f2#include\fP¥Õ¥¡¥¤¥ëÆâ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤â´Þ¤á¤Æ¡¢¤¹¤Ù¤Æ¤Î·¿¤òȯ¹Ô¤·¤Þ¤¹¡£
++.TP 3
++\-fside
++ȯ¹Ô¤¹¤ë¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÄêµÁ¤·¤Þ¤¹¡£\f2side\fP¤Ï\f2client\fP¡¢\f2server\fP¡¢\f2serverTIE\fP¡¢\f2all\fP¡¢\f2allTIE\fP¤Î¤¤¤º¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£\f2\-fserverTIE\fP¤Þ¤¿¤Ï\f2\-fallTIE\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢°Ñ¾ù¥â¥Ç¥ë¡¦¥¹¥±¥ë¥È¥ó¤¬È¯¹Ô¤µ¤ì¤Þ¤¹¡£¤³¤Î¥Õ¥é¥°¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢\f2\-fclient\fP¤¬»ØÄꤵ¤ì¤¿¤â¤Î¤È¸«¤Ê¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-i include\-path
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥¤¥ó¥¯¥ë¡¼¥É¡¦¥Õ¥¡¥¤¥ë¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¸¡º÷¤µ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢Â¾¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲäǤ­¤Þ¤¹¡£
++.TP 3
++\-keep
++À¸À®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤¬¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤¬¾å½ñ¤­¤µ¤ì¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-noWarn
++·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.TP 3
++\-oldImplBase
++1.4¤è¤êÁ°¤ÎJDK ORB¤È¸ß´¹À­¤Î¤¢¤ë¥¹¥±¥ë¥È¥ó¤òÀ¸À®¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢POA·Ñ¾µ¥â¥Ç¥ë¤Î¥µ¡¼¥Ð¡¼Â¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢\f2ImplBase\fP·Ñ¾µ¥â¥Ç¥ë¤Î¥¯¥é¥¹¤Ç¤¢¤ë¥µ¡¼¥Ð¡¼Â¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤¬À¸À®¤µ¤ì¤ë¤Î¤Ç¡¢¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤ÎJava¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤È¤Î²¼°Ì¸ß´¹À­¤¬ÆÀ¤é¤ì¤Þ¤¹¡£
++.TP 3
++\-pkgPrefix type prefix
++\f2type\fP¤¬¥Õ¥¡¥¤¥ë¡¦¥¹¥³¡¼¥×¤Ç¸¡½Ð¤µ¤ì¤¿¾ì¹ç¤Ï¡¢¤½¤Î·¿¤ËÂФ·¤ÆÀ¸À®¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¡¢À¸À®¤µ¤ì¤ëJava¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë\f2prefix\fP¤È¤¤¤¦ÀÜƬ¼­¤¬Éղ䵤ì¤Þ¤¹¡£\f2type\fP¤Ï¡¢¥È¥Ã¥×¥ì¥Ù¥ë¡¦¥â¥¸¥å¡¼¥ë¤Îñ½ã̾¤«¡¢¤É¤Î¥â¥¸¥å¡¼¥ë¤è¤ê¤â³°Â¦¤ÇÄêµÁ¤µ¤ì¤¿IDL·¿¤Îñ½ã̾¤Î¤É¤Á¤é¤«¤Ç¤¹¡£
++.TP 3
++\-pkgTranslate type package
++¼±Ê̻ҤÎÃæ¤Ë¥â¥¸¥å¡¼¥ë̾\f2type\fP¤¬¸¡½Ð¤µ¤ì¤ë¤È¡¢À¸À®¤µ¤ì¤ëJava¥Ñ¥Ã¥±¡¼¥¸Æâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¡¢¼±Ê̻ҤÎÃæ¤Î¤½¤Î̾Á°¤¬\f2package\fP¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹¡£ºÇ½é¤Ë\f2pkgPrefix\fP¤ÎÊѹ¹¤¬¹Ô¤ï¤ì¤Þ¤¹¡£\f2type\fP¤Ï¡¢¥È¥Ã¥×¥ì¥Ù¥ë¤Î¥â¥¸¥å¡¼¥ë¤Îñ½ã̾¡¢¤Þ¤¿¤Ï¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤Î³°Éô¤ÇÄêµÁ¤µ¤ì¤¿IDL·¿¤Îñ½ã̾¤Ç¡¢´°Á´¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÀµ³Î¤Ë°ìÃפ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++1¤Ä¤Î¼±Ê̻ҤÎÃæ¤ÇÊ£¿ô¤ÎÊÑ´¹¤¬¥Þ¥Ã¥Á¤¹¤ë¾ì¹ç¤Ï¡¢ºÇ¤âŤ¤¥Þ¥Ã¥Á¤¬Áª¤Ð¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ê°ú¿ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
++.nf
++\f3
++.fl
++ \-pkgTranslate foo bar \-pkgTranslate foo.baz buzz.fizz
++.fl
++\fP
++.fi
++¼¡¤Î¤è¤¦¤ÊÊÑ´¹¤¬¼Â»Ü¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++foo => bar
++.fl
++foo.boo => bar.boo
++.fl
++foo.baz => buzz.fizz
++.fl
++foo.baz.bar => buzz.fizz.bar
++.fl
++\fP
++.fi
++¼¡¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÊÑ´¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
++.RS 3
++.TP 2
++o
++\f2org\fP
++.TP 2
++o
++\f2org.omg\fP¡¢¤Þ¤¿¤Ï\f2org.omg\fP¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸
++.RE
++¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÊÑ´¹¤·¤è¤¦¤È¤¹¤ë¤È¡¢¸ß´¹À­¤Î¤Ê¤¤¥³¡¼¥É¤¬À¸À®¤µ¤ì¡¢\f2\-pkgTranslate\fP¤Î¸å¤ÎºÇ½é¤Î°ú¿ô¤È¤·¤Æ¤½¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¤È¡¢¥¨¥é¡¼¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
++.TP 3
++\-skeletonName xxx%yyy
++\f2xxx%yyy\fP¤¬¡¢¥¹¥±¥ë¥È¥ó¤Ë̾Á°¤òÉÕ¤±¤ë¥Ñ¥¿¡¼¥ó¤È¤·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.RS 3
++.TP 2
++o
++\f2POA\fP¥Ù¡¼¥¹¡¦¥¯¥é¥¹¤Î¾ì¹ç¤Ï%POA (\f2\-fserver\fP¤Þ¤¿¤Ï\f2\-fall\fP)
++.TP 2
++o
++\f2oldImplBase\fP¥¯¥é¥¹¤Î¾ì¹ç¤Ï_%ImplBase (\f2\-oldImplBase\fP¤«¤Ä(\f2\-fserver\fP¤Þ¤¿¤Ï\f2\-fall\fP))
++.RE
++.TP 3
++\-td dir
++½ÐÎϥǥ£¥ì¥¯¥È¥ê¤È¤·¤Æ¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¯¡¢\f2dir\fP¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-tieName xxx%yyy
++¤³¤Î¥Ñ¥¿¡¼¥ó¤Ë½¾¤Ã¤ÆTie¤Ë̾Á°¤¬ÉÕ¤±¤é¤ì¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.RS 3
++.TP 2
++o
++\f2POA\fP Tie¥Ù¡¼¥¹¡¦¥¯¥é¥¹¤Î¾ì¹ç¤Ï%POATie (\f2\-fserverTie\fP¤Þ¤¿¤Ï\f2\-fallTie\fP)
++.TP 2
++o
++\f2oldImplBase\fP Tie¥¯¥é¥¹¤Î¾ì¹ç¤Ï%_Tie (\f2\-oldImplBase\fP¤«¤Ä(\f2\-fserverTie\fP¤Þ¤¿¤Ï\f2\-fallTie\fP))
++.RE
++.TP 3
++\-nowarn¡¢\-verbose
++¾éĹ¥â¡¼¥É¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++\-version
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++³Æ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï¡¢ÀâÌÀ¤Î¥»¥¯¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "À©Ìó"
++.LP
++.RS 3
++.TP 2
++o
++¥°¥í¡¼¥Ð¥ë¡¦¥¹¥³¡¼¥×Æâ¤Î¥¨¥¹¥±¡¼¥×¤µ¤ì¤¿¼±Ê̻Ҥϡ¢IDL¥×¥ê¥ß¥Æ¥£¥Ö·¿¤Î\f2Object\fP¤Þ¤¿¤Ï\f2ValueBase\fP¤ÈƱ¤¸ÄÖ¤ê¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤³¤ì¤é¤Î¼±Ê̻ҤˤĤ¤¤Æ¤Ï¡¢¥·¥ó¥Ü¥ëɽ¤¬»öÁ°¤Ë¥í¡¼¥É¤µ¤ì¤Æ¤ª¤ê¡¢¤³¤ì¤é¤Î¼±Ê̻ҤκÆÄêµÁ¤òµö²Ä¤¹¤ë¤È¸µ¤ÎÄêµÁ¤¬¾å½ñ¤­¤µ¤ì¤Æ¤·¤Þ¤¦¤¿¤á¤Ç¤¹¡£(¤³¤ì¤Ï¡¢¤ª¤½¤é¤¯¹±µ×Ū¤ÊÀ©Ìó¤Ç¤¹¡£)
++.TP 2
++o
++\f2fixed\fP¤È¤¤¤¦IDL·¿¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
++.RE
++
++.LP
++.SH "´ûÃΤÎÌäÂêÅÀ"
++.LP
++.RS 3
++.TP 2
++o
++¥°¥í¡¼¥Ð¥ë¼±Ê̻ҤˤĤ¤¤Æ¥¤¥ó¥Ý¡¼¥È¤¬À¸À®¤µ¤ì¤Þ¤»¤ó¡£Í½´ü¤µ¤ì¤Ê¤¤¥í¡¼¥«¥ëimpl¤ò¸Æ¤Ó½Ð¤¹¤È¡¢Îã³°¤ò¼õ¤±¼è¤ê¤Þ¤¹¡£¤·¤«¤·¡¢¤½¤Î¸¶°ø¤Ï¡¢\f2ServerDelegate\fP DSI¥³¡¼¥ÉÆâ¤Î\f2NullPointerException\fP¤Ë¤¢¤ë¤è¤¦¤Ç¤¹¡£
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jar.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jar.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,583 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jar 1 "07 May 2011"
++.TH jar 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jar \- Java ARchive¥Ä¡¼¥ë
++.LP
++\f3jar\fP¤ÏÊ£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò1¤Ä¤ÎJAR¥¢¡¼¥«¥¤¥Ö¡¦¥Õ¥¡¥¤¥ë¤Ë·ë¹ç¤·¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¥Õ¥¡¥¤¥ë
++.TP 2
++o
++Îã
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.RS 3
++.TP 3
++JAR¥Õ¥¡¥¤¥ë¤ÎºîÀ®
++\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
++JAR¥Õ¥¡¥¤¥ë¤Î¹¹¿·
++\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
++JAR¥Õ¥¡¥¤¥ë¤ÎÃê½Ð
++\f4jar x\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP
++.TP 3
++JAR¥Õ¥¡¥¤¥ë¤ÎÌܼ¡É½¼¨
++\f4jar t\fP\f2[vf] [\fP\f2jarfile\fP\f2] [\fP\f2inputfiles\fP\f2] [\-J\fP\f2option\fP\f2]\fP
++.TP 3
++JAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎÄɲÃ
++\f4jar i\fP \f2jarfile\fP \f2[\-J\fP\f2option\fP\f2]\fP
++.RE
++
++.LP
++.LP
++ÀâÌÀ
++.LP
++.RS 3
++.TP 3
++cuxtiv0Mmfe
++\f2jar\fP¥³¥Þ¥ó¥É¤òÀ©¸æ¤¹¤ë¥ª¥×¥·¥ç¥ó
++.TP 3
++jarfile
++ºîÀ®(\f2c\fP)¡¢¹¹¿·(\f2u\fP)¡¢Ãê½Ð(\f2x\fP)¤Þ¤¿¤ÏÌܼ¡É½¼¨(\f2t\fP)¤ÎÂоݤȤʤëJAR¥Õ¥¡¥¤¥ë¡£\f2f\fP¥ª¥×¥·¥ç¥ó¤È¥Õ¥¡¥¤¥ë̾\f2jarfile\fP¤È¤¬¥Ú¥¢¤Ë¤Ê¤ê¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢ÊÒÊý¤òµ­½Ò¤¹¤ì¤Ð¡¢¤â¤¦°ìÊý¤âµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2f\fP¤È\f2jarfile\fP¤ò¾Êά¤¹¤ë¤È¡¢É¸½àÆþÎϤ«¤é¡ÖJAR¥Õ¥¡¥¤¥ë¡×¤¬¼èÆÀ¤µ¤ì¤ë¤«(x¤ª¤è¤Ót¤Î¾ì¹ç)¡¢É¸½à½ÐÎϤءÖJAR¥Õ¥¡¥¤¥ë¡×¤¬Á÷¿®¤µ¤ì¤Þ¤¹(c¤ª¤è¤Óu¤Î¾ì¹ç)¡£
++.TP 3
++inputfiles
++\f2jarfile\fP¤Ë·ë¹ç¤µ¤ì¤ë¤«(c¤ª¤è¤Óu¤Î¾ì¹ç)¡¢\f2jarfile\fP¤«¤éÃê½Ð(x¤Î¾ì¹ç)¤Þ¤¿¤Ï°ìÍ÷ɽ¼¨(t¤Î¾ì¹ç)¤µ¤ì¤ë¡¢¶õÇò¤Ç¶èÀÚ¤é¤ì¤¿¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥£¥ì¥¯¥È¥ê¡£¤¹¤Ù¤Æ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ÏºÆµ¢Åª¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥ª¥×¥·¥ç¥ó\f20\fP(¥¼¥í)¤ò»ÈÍѤ·¤Ê¤¤¤«¤®¤ê°µ½Ì¤µ¤ì¤Þ¤¹¡£
++.TP 3
++manifest
++JAR¥Õ¥¡¥¤¥ë¤ÎMANIFEST.MFÆâ¤Ë´Þ¤á¤ë\f2name\fP\f2:\fP\f2value\fP¤Î¥Ú¥¢¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë´û¸¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¡£\f2m\fP¥ª¥×¥·¥ç¥ó¤È¥Õ¥¡¥¤¥ë̾\f2manifest\fP¤È¤¬¥Ú¥¢¤Ë¤Ê¤ê¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢ÊÒÊý¤òµ­½Ò¤¹¤ì¤Ð¡¢¤â¤¦°ìÊý¤âµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f3m\fP¡¢\f3f\fP¤ª¤è¤Ó\f3e\fP¤Î½Ð¸½½ç½ø¤Ï¡¢\f2manifest\fP¡¢\f2jarfile\fP¡¢\f2entrypoint\fP¤Î½Ð¸½½ç½ø¤È°ìÃפ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++entrypoint
++¼Â¹Ô²ÄǽJAR¥Õ¥¡¥¤¥ëÆâ¤Ë¥Ð¥ó¥É¥ë¤µ¤ì¤¿¥¹¥¿¥ó¥É¥¢¥í¥ó¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥¨¥ó¥È¥ê¡¦¥Ý¥¤¥ó¥È¤È¤·¤ÆÀßÄꤹ¤ë¥¯¥é¥¹¤Î̾Á°¡£\f2e\fP¥ª¥×¥·¥ç¥ó¤Èentrypoint¤ÏÂФˤʤäƤ¤¤Þ¤¹¡£¤É¤Á¤é¤«¤ò»ØÄꤹ¤ë¾ì¹ç¤ÏξÊý¤È¤â»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f3m\fP¡¢\f3f\fP¤ª¤è¤Ó\f3e\fP¤Î½Ð¸½½ç½ø¤Ï¡¢\f2manifest\fP¡¢\f2jarfile\fP¡¢\f2entrypoint\fP¤Î½Ð¸½½ç½ø¤È°ìÃפ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-C\ dir
++¤³¤ì¤Ë³¤¯\f2inputfiles\fP°ú¿ô¤ò½èÍý¤¹¤ë´Ö¡¢¥Ç¥£¥ì¥¯¥È¥ê¤ò\f2dir\fP¤Ø°ì»þŪ¤ËÊѹ¹¤·¤Þ¤¹¡£\f2\-C\ \fP\f2dir\fP \f2inputfiles\fP¤Î¥»¥Ã¥È¤ÏÊ£¿ô»ÈÍѤǤ­¤Þ¤¹¡£
++.TP 3
++\-Joption
++Java¼Â¹Ô´Ä¶­¤ØÅϤµ¤ì¤ë¥ª¥×¥·¥ç¥ó¡£(\f2\-J\fP¤È\f2option\fP¤Î´Ö¤Ë¤Ï¶õÇò¤òÆþ¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£)
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++\f3jar\fP¥Ä¡¼¥ë¤ÏÊ£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò1¤Ä¤ÎJAR¥¢¡¼¥«¥¤¥Ö¡¦¥Õ¥¡¥¤¥ë¤Ë·ë¹ç¤·¤Þ¤¹¡£\f3jar\fP¤Ï¡¢ZIP¤ª¤è¤Ó
++.na
++\f2ZLIB\fP @
++.fi
++http://www.gzip.org/zlib/°µ½Ì·Á¼°¤Ë´ð¤Å¤¯ÈÆÍѤΥ¢¡¼¥«¥¤¥Ö¤ª¤è¤Ó°µ½Ì¥Ä¡¼¥ë¤Ç¤¹¡£¤¿¤À¤·\f3jar\fP¥Ä¡¼¥ë¤Î¼ç¤ÊÌÜŪ¤Ï¡¢¤¤¤¯¤Ä¤«¤ÎJava¥¢¥×¥ì¥Ã¥È¤ä¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò1¸Ä¤Î¥¢¡¼¥«¥¤¥Ö¤ËÅý¹ç¤¹¤ë¤³¤È¤Ç¤¹¡£¥¢¥×¥ì¥Ã¥È¤ä¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È(¥Õ¥¡¥¤¥ë¡¢¥¤¥á¡¼¥¸¡¢¤ª¤è¤Ó¥µ¥¦¥ó¥É)¤¬1¤Ä¤Î¥¢¡¼¥«¥¤¥Ö¤Ë·ë¹ç¤µ¤ì¤Æ¤¤¤ë¤È¡¢Java¥¨¡¼¥¸¥§¥ó¥È(¥Ö¥é¥¦¥¶¤Ê¤É)¤Ï¡¢¤½¤ì¤é¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò1²ó¤ÎHTTP¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤Ç¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢¥³¥ó¥Ý¡¼¥Í¥ó¥È¤´¤È¤Ë¿·¤·¤¤Àܳ¤¬ÉÔÍפˤʤê¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥À¥¦¥ó¥í¡¼¥É»þ´Ö¤¬ÂçÉý¤Ëû½Ì¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢\f3jar\fP¤Ï¥Õ¥¡¥¤¥ë¤Î°µ½Ì¤â¹Ô¤¦¤Î¤Ç¡¢¥À¥¦¥ó¥í¡¼¥É»þ´Ö¤¬¤µ¤é¤Ëû½Ì¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢¥Õ¥¡¥¤¥ëÆâ¤Î¸Ä¡¹¤Î¥¨¥ó¥È¥ê¤Ë¥¢¥×¥ì¥Ã¥ÈºîÀ®¼Ô¤Ë¤è¤ë½ð̾¤ò½ñ¤­¹þ¤á¤ë¤Î¤Ç¡¢ÇÛÉÛ¸µ¤Îǧ¾Ú¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£jar¥Ä¡¼¥ë¤Î¹½Ê¸¤Ï¡¢\f2tar\fP¥³¥Þ¥ó¥É¤Î¹½Ê¸¤È¤Û¤ÜƱ¤¸¤Ç¤¹¡£\f3JAR\fP¥¢¡¼¥«¥¤¥Ö¤Ï¡¢°µ½Ì¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë¤«¤«¤ï¤é¤º¡¢¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¥¨¥ó¥È¥ê¤È¤·¤Æ»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤òJAR¥Õ¥¡¥¤¥ë¤Ø·ë¹ç¤¹¤ë°ìÈÌŪ¤Ê»ÈÍÑÊýË¡¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% jar cf myFile.jar *.class
++.fl
++\fP
++.fi
++
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬\f2myFile.jar\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£jar¥Ä¡¼¥ë¤Ï¼«Æ°Åª¤Ë¡¢\f2META\-INF/MANIFEST.MF\fP¤È¤¤¤¦Ì¾Á°¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¡¦¥¨¥ó¥È¥ê¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤ì¤Ï¾ï¤Ë¡¢JAR¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤Î¥¨¥ó¥È¥ê¤Ë¤Ê¤ê¤Þ¤¹¡£¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢¥¢¡¼¥«¥¤¥Ö¤Ë´Ø¤¹¤ë¥á¥¿¾ðÊó¤òÀë¸À¤·¡¢¤½¤Î¥Ç¡¼¥¿¤ò\f2name\ :\ value\fP¤Î¥Ú¥¢¤È¤·¤Æ³ÊǼ¤·¤Þ¤¹¡£jar¥Ä¡¼¥ë¤¬¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë¥á¥¿¾ðÊó¤ò³ÊǼ¤¹¤ëÊýË¡¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2JAR¥Õ¥¡¥¤¥ë¤Î»ÅÍÍ\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++´û¸¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë³ÊǼ¤µ¤ì¤¿\f2name\ :\ value\fP¤Î¥Ú¥¢¤òJAR¥Õ¥¡¥¤¥ë¤Ë´Þ¤á¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë\f2\-m\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% jar cmf myManifestFile myFile.jar *.class
++.fl
++\fP
++.fi
++
++.LP
++´û¸¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ï²þ¹Ôʸ»ú¤Ç½ª¤ï¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤¬²þ¹Ôʸ»ú¤Ç½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤¤È¡¢\f3jar\fP¤Ï¤½¤ÎºÇ½ª¹Ô¤ò²òÀϤ·¤Þ¤»¤ó¡£
++.br
++
++.LP
++.br
++
++.LP
++\f3Ãí°Õ:\ \fP¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë\f2cmf\fP¤Ç¤Ï¤Ê¤¯\f2cfm\fP¤¬»ØÄꤵ¤ì¤¿(m¤È\-f¥ª¥×¥·¥ç¥ó¤Î½çÈÖ¤òµÕ¤Ë¤·¤¿)jar¥³¥Þ¥ó¥É¤Î¾ì¹ç¡¢\f3jar\fP¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤Þ¤ºJAR¥¢¡¼¥«¥¤¥Ö¤Î̾Á°¤ò»ØÄꤷ¡¢Â³¤¤¤Æ¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++% jar cfm myFile.jar myManifestFile *.class
++.fl
++\fP
++.fi
++
++.LP
++¥Þ¥Ë¥Õ¥§¥¹¥È¤Ï¡¢RFC822 ASCII·Á¼°¤Çµ¬Äꤵ¤ì¤¿¥Æ¥­¥¹¥È·Á¼°¤Ç¤¢¤ë¤¿¤á¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ÎÆâÍƤò´Êñ¤Ëɽ¼¨¤ª¤è¤Ó½èÍý¤Ç¤­¤Þ¤¹¡£
++.LP
++JAR¥Õ¥¡¥¤¥ë¤«¤é¥Õ¥¡¥¤¥ë¤òÃê½Ð¤¹¤ë¾ì¹ç¤Ï¡¢\f2x\fP¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% jar xf myFile.jar
++.fl
++\fP
++.fi
++
++.LP
++.LP
++jar¥Õ¥¡¥¤¥ë¤«¤é¸ÄÊ̤Υե¡¥¤¥ë¤òÃê½Ð¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% jar xf myFile.jar foo bar
++.fl
++\fP
++.fi
++
++.LP
++.LP
++JDK¤Î¥Ð¡¼¥¸¥ç¥ó1.3°Ê¹ß¤«¤é¡¢\f2jar\fP¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç
++.na
++\f2JarIndex\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£JarIndex¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤ÇJAR¥Õ¥¡¥¤¥ë¤«¤é¥¯¥é¥¹¤¬¥í¡¼¥É¤µ¤ì¤ë¤È¤­¤Î¸úΨ¤¬¸þ¾å¤·¤Þ¤¹¡£¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Þ¤¿¤Ï¥¢¥×¥ì¥Ã¥È¤¬Ê£¿ô¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¥Ð¥ó¥É¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢É¬ÍפÊJAR¥Õ¥¡¥¤¥ë¤Î¤ß¤¬¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤Æ³«¤«¤ì¡¢¥¯¥é¥¹¤¬¥í¡¼¥É¤µ¤ì¤Þ¤¹¡£¤³¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ÎºÇŬ²½¤Ï¡¢\f2\-i\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ\f2jar\fP¤ò¼Â¹Ô¤¹¤ë¤ÈÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢»ØÄꤷ¤¿JAR¥á¥¤¥ó¡¦¥Õ¥¡¥¤¥ë¤È¡¢¤½¤Î¥á¥¤¥ó¡¦¥Õ¥¡¥¤¥ë¤¬°Í¸¤·¤Æ¤¤¤ë¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¡¢¥Ñ¥Ã¥±¡¼¥¸°ÌÃÖ¾ðÊó¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¥á¥¤¥ó¡¦¥Õ¥¡¥¤¥ë¤¬°Í¸¤·¤Æ¤¤¤ëJAR¥Õ¥¡¥¤¥ë¤Ï¡¢JAR¥á¥¤¥ó¡¦¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¤Î\f2Class\-Path\fP°À­¤Ë»ØÄꤷ¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% jar i main.jar
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢\f2INDEX.LIST\fP¥Õ¥¡¥¤¥ë¤¬\f2main.jar\fP¤Î\f2META\-INF\fP¥Ç¥£¥ì¥¯¥È¥êÆâ¤ËÁÞÆþ¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤Ï¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë¾ðÊó¤ò»ÈÍѤ·¤Æ¡¢¸úΨŪ¤Ë¥¯¥é¥¹¤ò¥í¡¼¥É¤·¤Þ¤¹¡£¥¤¥ó¥Ç¥Ã¥¯¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë°ÌÃÖ¾ðÊó¤ò³ÊǼ¤¹¤ëÊýË¡¤Î¾ÜºÙ¤Ï¡¢\f2JarIndex\fP»ÅÍͤò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++¥Ç¥£¥ì¥¯¥È¥ê¤ò¥³¥Ô¡¼¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º\f2dir1\fPÆâ¤Î¥Õ¥¡¥¤¥ë¤ò°µ½Ì¤·¤Æ\f2stdout\fP¤Ë½ÐÎϤ·¡¢Â³¤¤¤Æ\f2stdin\fP¤«¤éÃê½Ð¤·¤Æ\f2dir2\fP¤Ë½ÐÎϤ·¤Þ¤¹(\f2\-f\fP¥ª¥×¥·¥ç¥ó¤Ï¤É¤Á¤é¤Î\f2jar\fP¥³¥Þ¥ó¥É¤Ç¤â¾Êά¤·¤Þ¤¹)¡£
++.LP
++.nf
++\f3
++.fl
++% (cd dir1; jar c .) | (cd dir2; jar x)
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f2jar\fP¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤äJAR¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤òÁàºî¤¹¤ë¥µ¥ó¥×¥ë¡¦¥³¥Þ¥ó¥É¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢¼¡¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢
++.na
++\f2Java¥Á¥å¡¼¥È¥ê¥¢¥ë\fP @
++.fi
++http://docs.oracle.com/javase/tutorial/deployment/jar/¤ÎJAR¥È¥é¥¤¥¢¥ë¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++c
++\f2jarfile\fP¤È¤¤¤¦Ì¾Á°¤Î¿·¤·¤¤¥¢¡¼¥«¥¤¥Ö¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë(\f2f\fP¤¬»ØÄꤵ¤ì¤¿¾ì¹ç)¤«¡¢É¸½à½ÐÎϤ˽ÐÎϤ·¤Þ¤¹(\f2f\fP¤È\f2jarfile\fP¤¬¾Êά¤µ¤ì¤¿¾ì¹ç)¡£\f2inputfiles\fP¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤ò¡¢¤³¤Î¥¢¡¼¥«¥¤¥Ö¤ËÄɲä·¤Þ¤¹¡£
++.TP 3
++u
++\f2inputfiles\fP¤Ë»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲ䷤ơ¢´û¸¥Õ¥¡¥¤¥ë\f2jarfile\fP¤ò¹¹¿·¤·¤Þ¤¹(\f2f\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç)¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++jar uf foo.jar foo.class
++.fl
++\fP
++.fi
++¾å¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥Õ¥¡¥¤¥ë\f2foo.class\fP¤ò´û¸¤ÎJAR¥Õ¥¡¥¤¥ë\f2foo.jar\fP¤ËÄɲä·¤Þ¤¹¡£¼¡¤ÎÎã¤Ë¼¨¤¹¤è¤¦¤Ë¡¢\f2\-u\fP¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥¨¥ó¥È¥ê¤â¹¹¿·¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++jar umf manifest foo.jar
++.fl
++\fP
++.fi
++¾å¤Î¥³¥Þ¥ó¥É¤Ï¡¢\f2foo.jar\fP¥Þ¥Ë¥Õ¥§¥¹¥È¤ò\f2manifest\fPÆâ¤Î\f2name : value\fP¤Î¥Ú¥¢¤Ç¹¹¿·¤·¤Þ¤¹¡£
++.TP 3
++x
++\f2jarfile\fP¤«¤é¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤òÃê½Ð¤·¤Þ¤¹(\f2f\fP¤¬»ØÄꤵ¤ì¤¿¾ì¹ç)¡¢¤Þ¤¿¤Ïɸ½àÆþÎϤ«¤é¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤òÃê½Ð¤·¤Þ¤¹(\f2f\fP¤È\f2jarfile\fP¤¬¾Êά¤µ¤ì¤¿¾ì¹ç)¡£\f2inputfiles\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Î¤ß¤¬Ãê½Ð¤µ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤¬Ãê½Ð¤µ¤ì¤Þ¤¹¡£Ãê½Ð¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÎÆü»þ¤Ï¡¢¥¢¡¼¥«¥¤¥ÖÆâ¤ÇÀßÄꤵ¤ì¤¿¤â¤Î¤Ç¤¹¡£
++.TP 3
++t
++\f2jarfile\fP¤«¤éÌܼ¡¤òɽ¼¨¤·¤Þ¤¹(\f2f\fP¤¬»ØÄꤵ¤ì¤¿¾ì¹ç)¡¢¤Þ¤¿¤Ïɸ½àÆþÎϤ«¤éÌܼ¡¤òɽ¼¨¤·¤Þ¤¹(\f2f\fP¤È\f2jarfile\fP¤¬¾Êά¤µ¤ì¤¿¾ì¹ç)¡£\f2inputfiles\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Î¤ß¤¬°ìÍ÷ɽ¼¨¤µ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤¬°ìÍ÷ɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.TP 3
++i
++»ØÄꤵ¤ì¤¿\f2jarfile\fP¤È¡¢¤½¤ì¤Ë°Í¸¤¹¤ëJAR¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹¾ðÊó¤òÀ¸À®¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++jar i foo.jar
++.fl
++\fP
++.fi
++.LP
++¾å¤Î¥³¥Þ¥ó¥É¤Ï¡¢\f2foo.jar\fPÆâ¤Ë\f2INDEX.LIST\fP¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢\f2foo.jar\fP¡¢¤ª¤è¤Ó\f2foo.jar\fP¤Î\f2Class\-Path\fP°À­¤Ë»ØÄꤵ¤ì¤¿¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤ËÆþ¤Ã¤Æ¤¤¤ë³Æ¥Ñ¥Ã¥±¡¼¥¸¤Î°ÌÃÖ¾ðÊ󤬳ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++f
++ºîÀ®(\f2c\fP)¡¢¹¹¿·(\f2u\fP)¡¢Ãê½Ð(\f2x\fP)¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹ÄɲÃ(\f2i\fP)¤Þ¤¿¤Ïɽ¼¨(\f2t\fP)¤Î³Æ½èÍý¤ÎÂоݤȤʤë¥Õ¥¡¥¤¥ë\f2jarfile\fP¤ò»ØÄꤷ¤Þ¤¹¡£\f2f\fP¥ª¥×¥·¥ç¥ó¤È¥Õ¥¡¥¤¥ë̾\f2jarfile\fP¤È¤¬¥Ú¥¢¤Ë¤Ê¤ê¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢ÊÒÊý¤òµ­½Ò¤¹¤ì¤Ð¡¢¤â¤¦°ìÊý¤âµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2f\fP¤È\f2jarfile\fP¤ò¾Êά¤¹¤ë¤È¡¢\f2stdin\fP¤«¤éJAR¥Õ¥¡¥¤¥ë̾¤¬¼èÆÀ¤µ¤ì¤ë(x¤ª¤è¤Ót¤Î¾ì¹ç)¤«¡¢\f2stdout\fP¤ËJAR¥Õ¥¡¥¤¥ë¤¬½ÐÎϤµ¤ì¤Þ¤¹(c¤ª¤è¤Óu¤Î¾ì¹ç)¡£
++.TP 3
++v
++¾ÜºÙ¤Ê½ÐÎϤòɸ½à½ÐÎϤËÀ¸À®¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.TP 3
++0
++(¥¼¥í)ZIP¤Ë¤è¤ë°µ½Ì¤ò»ÈÍѤ»¤º¤Ë¡¢Êݸ¤·¤Þ¤¹¡£
++.TP 3
++M
++¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¡¦¥¨¥ó¥È¥ê¤òºîÀ®¤·¤Þ¤»¤ó(c¤ª¤è¤Óu¤Î¾ì¹ç)¡£¤Þ¤¿¤Ï¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¡¦¥¨¥ó¥È¥ê¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ïºï½ü¤·¤Þ¤¹(u¤Î¾ì¹ç)¡£
++.TP 3
++m
++\f2META\-INF/MANIFEST.MF\fP¤Î¥Õ¥¡¥¤¥ë¤Ç»ØÄꤷ¤¿¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë\f2manifest\fP¤Î\f2name : value\fP¤Î°À­¥Ú¥¢¤òÁȤ߹þ¤ß¤Þ¤¹¡£\f2jar\fP¤Ï¡¢¤¹¤Ç¤ËƱ¤¸Ì¾Á°¤Ç¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¡¢¤½¤Î\f2name\ :\ value\fP¥Ú¥¢¤òÄɲä·¤Þ¤¹¡£Æ±¤¸Ì¾Á°¤Ç¸ºß¤¹¤ë¾ì¹ç¡¢\f2jar\fP¤Ï¤½¤ÎÃͤò¹¹¿·¤·¤Þ¤¹¡£
++.br
++.br
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¡¢\f3m\fP¤È\f3f\fP¤Îʸ»ú¤Ï¡¢\f2manifest\fP¤È\f2jarfile\fP¤ÎÆþÎϽç½ø¤ÈƱ¤¸½ç½ø¤Çµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++jar cmf myManifestFile myFile.jar *.class
++.fl
++\fP
++.fi
++¥Ç¥Õ¥©¥ë¥È¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¤Ë¤Ï´Þ¤Þ¤ì¤Ê¤¤¥Þ¥Ë¥Õ¥§¥¹¥È¤Ë¡¢ÆÃÊ̤ÊÌÜŪ¤Î\f2name\ :\ value\fP¤Î°À­¥Ú¥¢¤òÄɲäǤ­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥Ù¥ó¥À¡¼¾ðÊ󡢥С¼¥¸¥ç¥ó¾ðÊ󡢥ѥ屡¼¥¸¡¦¥·¡¼¥ê¥ó¥°¡¢¤Þ¤¿¤ÏJAR¤Ë¥Ð¥ó¥É¥ë¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô²Äǽ¤Ë¤¹¤ë¤¿¤á¤Î°À­¤òÄɲäǤ­¤Þ¤¹¡£\f4\-m\fP¥ª¥×¥·¥ç¥ó¤Î»ÈÍÑÎã¤Ï¡¢Java¥Á¥å¡¼¥È¥ê¥¢¥ë¤Î
++.na
++\f2JAR¥Õ¥¡¥¤¥ë¤Ç¤Î¥×¥í¥°¥é¥à¤Î¥Ñ¥Ã¥±¡¼¥¸²½\fP @
++.fi
++http://docs.oracle.com/javase/tutorial/deployment/jar/¤Î¥ì¥Ã¥¹¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++e
++¼Â¹Ô²ÄǽJAR¥Õ¥¡¥¤¥ëÆâ¤Ë¥Ð¥ó¥É¥ë¤µ¤ì¤¿¥¹¥¿¥ó¥É¥¢¥í¥ó¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥¨¥ó¥È¥ê¡¦¥Ý¥¤¥ó¥È¤È¤·¤Æ¡¢\f2entrypoint\fP¤òÀßÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ëÆâ¤Î\f2Main\-Class\fP°À­Ãͤ¬ºîÀ®¤Þ¤¿¤Ï¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤ÎºîÀ®Ãæ¤Þ¤¿¤Ï¹¹¿·Ãæ¤Ë»ÈÍѤǤ­¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ì¤Ð¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤Þ¤¿¤ÏºîÀ®¤¹¤ë¤³¤È¤Ê¤·¤Ë¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¨¥ó¥È¥ê¡¦¥Ý¥¤¥ó¥È¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.br
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ç¤Ï\f2Main.jar\fP¤¬ºîÀ®¤µ¤ì¤Þ¤¹¤¬¡¢¤½¤ÎºÝ¡¢¥Þ¥Ë¥Õ¥§¥¹¥ÈÆâ¤Î\f2Main\-Class\fP°À­ÃͤÏ\f2Main\fP¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++jar cfe Main.jar Main Main.class
++.fl
++\fP
++.fi
++¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤Èjava¥é¥ó¥¿¥¤¥à¤«¤éľÀܤ³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òµ¯Æ°¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++java \-jar Main.jar
++.fl
++\fP
++.fi
++¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸Æâ¤Ë¥¨¥ó¥È¥ê¡¦¥Ý¥¤¥ó¥È¤Î¥¯¥é¥¹Ì¾¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥É¥Ã¥È(¡Ö.¡×)¡¢¥¹¥é¥Ã¥·¥å(¡Ö/¡×)¤Î¤¤¤º¤ì¤«¤Îʸ»ú¤ò¤½¤Î¶èÀÚ¤êʸ»ú¤È¤·¤Æ»ÈÍѤǤ­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2Main.class\fP¤¬\f2foo\fP¤È¤¤¤¦Ì¾Á°¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¨¥ó¥È¥ê¡¦¥Ý¥¤¥ó¥È¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ»ØÄê¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++jar \-cfe Main.jar foo/Main foo/Main.class
++.fl
++\fP
++.fi
++¤Þ¤¿¤Ï
++.nf
++\f3
++.fl
++jar \-cfe Main.jar foo.Main foo/Main.class
++.fl
++\fP
++.fi
++\f3Ãí°Õ:\fP \f2\-m\fP¥ª¥×¥·¥ç¥ó¤È\f2\-e\fP¥ª¥×¥·¥ç¥ó¤ÎξÊý¤òƱ»þ¤Ë»ØÄꤷ¤¿¾ì¹ç¡¢»ØÄꤷ¤¿¥Þ¥Ë¥Õ¥§¥¹¥È¤Ë¤â\f2Main\-Class\fP°À­¤¬´Þ¤Þ¤ì¤Æ¤¤¤ì¤Ð¡¢\f2Main.class\fP¤Î»ØÄ꤬¤¢¤¤¤Þ¤¤¤Ë¤Ê¤Ã¤Æ¥¨¥é¡¼¤äȯÀ¸¤·¡¢JAR¤ÎºîÀ®½èÍý¤ä¹¹¿·½èÍý¤¬°Û¾ï½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-C\ dir
++\f2jar\fP¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¸å³¤Î\f2inputfiles\fP°ú¿ô¤ò½èÍý¤¹¤ë¤È¤­¤Ë¡¢°ì»þŪ¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤·¤Þ¤¹(\f2cd\fP\ \f2dir\fP)¡£¤³¤Î½èÍý¤Ï¡¢UNIX¤Î\f2tar\fP¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Î\f2\-C\fP¥ª¥×¥·¥ç¥ó¤Îµ¡Ç½¤ËÎà»÷¤·¤Æ¤¤¤Þ¤¹¡£
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢\f2classes\fP¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é\f2bar.class\fP¤ò\f2foo.jar\fP¤ËÄɲä·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++jar uf foo.jar \-C classes bar.class
++.fl
++\fP
++.fi
++¼¡¤Î¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\f2classes\fP¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¡¢\f2classes\fP¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò\f2foo.jar\fP¤ËÄɲä·¤Þ¤¹(jar¥Õ¥¡¥¤¥ë¤Ë¤Ïclasses¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤»¤ó)¡£¼¡¤Ë¸µ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÌá¤Ã¤Æ¤«¤é¡¢\f2bin\fP¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¡¢\f2xyz.class\fP¤ò\f2foo.jar\fP¤ËÄɲä·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++jar uf foo.jar \-C classes . \-C bin xyz.class
++.fl
++\fP
++.fi
++\f2classes\fP¤Ë¥Õ¥¡¥¤¥ë\f2bar1\fP¤È\f2bar2\fP¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¡¢\f2jar tf foo.jar\fP»ÈÍѤ·¤¿¤È¤­¤ÎJAR¥Õ¥¡¥¤¥ë¤ÎÃæ¿È¤ò¡¢¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++META\-INF/
++.fl
++META\-INF/MANIFEST.MF
++.fl
++bar1
++.fl
++bar2
++.fl
++xyz.class
++.fl
++\fP
++.fi
++.LP
++.TP 3
++\-Joption
++Java¼Â¹Ô´Ä¶­¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£\f2option\fP¤Ë¤Ï¡¢Java¥¢¥×¥ê¥±¡¼¥·¥ç¥óµ¯Æ°¥Ä¡¼¥ë¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò1¤Ä»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f4\-J\-Xmx48M\fP¤È»ØÄꤹ¤ë¤È¡¢ºÇÂç¥á¥â¥ê¡¼¤¬48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f2\-J\fP¤ò»ÈÍѤ·¤ÆÇظå¤Î¼Â¹Ô´Ä¶­¤Ë¥ª¥×¥·¥ç¥ó¤òÅϤ¹¤³¤È¤Ï¤è¤¯¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¥Õ¥¡¥¤¥ë"
++.LP
++jar¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤òû¤¯¤·¤¿¤ê´Ê·é¤Ë¤·¤¿¤ê¤¹¤ë¤¿¤á¤Ë¡¢\f2jar\fP¥³¥Þ¥ó¥É¤ËÂФ¹¤ë°ú¿ô(\f2\-J\fP¥ª¥×¥·¥ç¥ó¤ò½ü¤¯)¤ò´Þ¤à1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢Ç¤°Õ¤ÎŤµ¤Îjar¥³¥Þ¥ó¥É¤òºîÀ®¤Ç¤­¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¤Ë¤è¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÎÀ©¸Â¤«¤é²òÊü¤µ¤ì¤Þ¤¹¡£
++.LP
++°ú¿ô¥Õ¥¡¥¤¥ë¤Ë¤Ï¥ª¥×¥·¥ç¥ó¤È¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Õ¥¡¥¤¥ëÆâ¤Î³Æ°ú¿ô¤Ï¡¢¥¹¥Ú¡¼¥¹¤Þ¤¿¤Ï²þ¹Ô¤Ç¶èÀÚ¤ê¤Þ¤¹¡£°ú¿ô¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë̾¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¸«¤¿ÁêÂХѥ¹¤Ë¤Ê¤ê¤Þ¤¹¡£°ú¿ô¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤«¤é¸«¤¿ÁêÂХѥ¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£Ä̾ï¤Ï¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¡¦¥·¥§¥ë¤Ë¤è¤Ã¤ÆŸ³«¤µ¤ì¤ë¥ï¥¤¥ë¥É¥«¡¼¥É(*)¤ÏŸ³«¤µ¤ì¤Þ¤»¤ó¡£\f2@\fPʸ»ú¤ò»ÈÍѤ·¤Æ¡¢¥Õ¥¡¥¤¥ë¤òºÆµ¢Åª¤Ë²ò¼á¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£\f2\-J\fP¥ª¥×¥·¥ç¥ó¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ïµ¯Æ°¥Ä¡¼¥ë¤ËÅϤµ¤ì¤Þ¤¹¤¬¡¢µ¯Æ°¥Ä¡¼¥ë¤Ç¤Ï°ú¿ô¥Õ¥¡¥¤¥ë¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¹¡£
++.LP
++.LP
++\f2jar\fP¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¡¢³Æ°ú¿ô¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤È̾Á°¤ÎÀèƬ¤Ë\f2@\fPʸ»ú¤òÉÕ¤±¤ÆÅϤ·¤Þ¤¹¡£\f2jar\fP¤Ï¡¢\f2@\fPʸ»ú¤Ç»Ï¤Þ¤ë°ú¿ô¤ò¸«¤Ä¤±¤ë¤È¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòŸ³«¤·¤Æ°ú¿ô¥ê¥¹¥È¤ËÁÞÆþ¤·¤Þ¤¹¡£
++.br
++.br
++¼¡¤ÎÎã¤Ç¡¢\f2classes.list\fP¤Ë¤Ï¡¢\f2find\fP¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ½ÐÎϤµ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î̾Á°¤¬³ÊǼ¤µ¤ì¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% find \fP\f3.\fP \-name '*.class' \-print > classes.list
++.fl
++.fi
++
++.LP
++.LP
++¼¡¤Ë¡¢°ú¿ô¥Õ¥¡¥¤¥ë¹½Ê¸¤ò»ÈÍѤ·¤Æ\f2Classes.list\fP¤ò\f2jar\fP¤ËÅϤ¹¤³¤È¤Ç¡¢¤½¤Î¥ê¥¹¥È¤ËÂФ·¤Æ\f2jar\fP¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% jar cf my.jar @classes.list
++.fl
++\fP
++.fi
++
++.LP
++°ú¿ô¥Õ¥¡¥¤¥ë¤Ï¥Ñ¥¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¤¬¡¢ÁêÂХѥ¹¤¬µ­½Ò¤µ¤ì¤¿°ú¿ô¥Õ¥¡¥¤¥ëÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë̾¤Ï¡¢ÅϤµ¤ì¤¿¥Ñ¥¹¤ËÂФ·¤ÆÁêÂÐŪ¤Ç¤Ï¤Ê¤¯¡¢¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤ËÁêÂÐŪ¤È¤Ê¤ê¤Þ¤¹¡£¼¡¤Ï¤½¤ÎÎã¤Ç¤¹¡£
++.nf
++\f3
++.fl
++% jar @path1/classes.list
++.fl
++\fP
++.fi
++
++.LP
++.LP
++
++.LP
++.SH "Îã"
++.LP
++ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤ËÄɲ乤ë(¤½¤Î¥¢¡¼¥«¥¤¥Ö¤¬¤¹¤Ç¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤ÎÆâÍƤò¾å½ñ¤­¤¹¤ë)¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£\f2\-v\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¾ðÊó¤ò¾ÜºÙ¤ËÎóµó¤¹¤ë¤è¤¦¤Ë»ØÄꤹ¤ë¤È¡¢¥µ¥¤¥º¤äºÇ¿·¤Î¹¹¿·Æü¤Ê¤É¡¢¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¾ðÊó¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++% ls
++.fl
++1.au Animator.class monkey.jpg
++.fl
++2.au Wave.class spacemusic.au
++.fl
++3.au at_work.gif
++.fl
++
++.fl
++% jar cvf bundle.jar *
++.fl
++added manifest
++.fl
++adding: 1.au(in = 2324) (out= 67)(deflated 97%)
++.fl
++adding: 2.au(in = 6970) (out= 90)(deflated 98%)
++.fl
++adding: 3.au(in = 11616) (out= 108)(deflated 99%)
++.fl
++adding: Animator.class(in = 2266) (out= 66)(deflated 97%)
++.fl
++adding: Wave.class(in = 3778) (out= 81)(deflated 97%)
++.fl
++adding: at_work.gif(in = 6621) (out= 89)(deflated 98%)
++.fl
++adding: monkey.jpg(in = 7667) (out= 91)(deflated 98%)
++.fl
++adding: spacemusic.au(in = 3079) (out= 73)(deflated 97%)
++.fl
++\fP
++.fi
++
++.LP
++¤¹¤Ç¤Ë²èÁü¡¢¥ª¡¼¥Ç¥£¥ª¡¦¥Õ¥¡¥¤¥ë¡¢¤ª¤è¤Ó¥¯¥é¥¹ÍѤΥµ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ëʬ¤±¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤³¤ì¤é¤òñ°ì¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë·ë¹ç¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++% ls \-F
++.fl
++audio/ classes/ images/
++.fl
++
++.fl
++% jar cvf bundle.jar audio classes images
++.fl
++added manifest
++.fl
++adding: audio/(in = 0) (out= 0)(stored 0%)
++.fl
++adding: audio/1.au(in = 2324) (out= 67)(deflated 97%)
++.fl
++adding: audio/2.au(in = 6970) (out= 90)(deflated 98%)
++.fl
++adding: audio/3.au(in = 11616) (out= 108)(deflated 99%)
++.fl
++adding: audio/spacemusic.au(in = 3079) (out= 73)(deflated 97%)
++.fl
++adding: classes/(in = 0) (out= 0)(stored 0%)
++.fl
++adding: classes/Animator.class(in = 2266) (out= 66)(deflated 97%)
++.fl
++adding: classes/Wave.class(in = 3778) (out= 81)(deflated 97%)
++.fl
++adding: images/(in = 0) (out= 0)(stored 0%)
++.fl
++adding: images/monkey.jpg(in = 7667) (out= 91)(deflated 98%)
++.fl
++adding: images/at_work.gif(in = 6621) (out= 89)(deflated 98%)
++.fl
++
++.fl
++% ls \-F
++.fl
++audio/ bundle.jar classes/ images/
++.fl
++\fP
++.fi
++
++.LP
++JAR¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥È¥ê̾¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢\f2t\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++% jar tf bundle.jar
++.fl
++META\-INF/
++.fl
++META\-INF/MANIFEST.MF
++.fl
++audio/1.au
++.fl
++audio/2.au
++.fl
++audio/3.au
++.fl
++audio/spacemusic.au
++.fl
++classes/Animator.class
++.fl
++classes/Wave.class
++.fl
++images/monkey.jpg
++.fl
++images/at_work.gif
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥¯¥é¥¹¡¦¥í¡¼¥É¤ò¹â®¤Ë¤¹¤ë¤¿¤á¤Ë¥¤¥ó¥Ç¥Ã¥¯¥¹¡¦¥Õ¥¡¥¤¥ë¤òJAR¥Õ¥¡¥¤¥ë¤ËÄɲ乤ë¤Ë¤Ï¡¢\f2i\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.br
++.br
++Îã:
++.br
++
++.LP
++¤¿¤È¤¨¤Ð¡¢³ô¼è°ú¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÁê¸ß°Í¸¤·¤Æ¤¤¤ë¥¯¥é¥¹¤ò¡¢\f2main.jar\fP¡¢\f2buy.jar\fP¤ª¤è¤Ó\f2sell.jar\fP¤È¤¤¤¦3¤Ä¤ÎJAR¥Õ¥¡¥¤¥ë¤Ëʬ³ä¤·¤¿¤È¤·¤Þ¤¹¡£
++.br
++
++.LP
++.br
++
++.LP
++\f2main.jar\fP¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¤Î\f2Class\-path\fP°À­¤Ë¼¡¤Î¤è¤¦¤Ë»ØÄꤷ¤¿¾ì¹ç¡¢
++.nf
++\f3
++.fl
++Class\-Path: buy.jar sell.jar
++.fl
++\fP
++.fi
++
++.LP
++\f2\-i\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ì¤Ð¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¯¥é¥¹¤ÎÆɹþ¤ß¤ò¹â®²½¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++% jar i main.jar
++.fl
++\fP
++.fi
++
++.LP
++\f2INDEX.LIST\fP¥Õ¥¡¥¤¥ë¤¬\f2META\-INF\fP¥Ç¥£¥ì¥¯¥È¥ê¤ËÁÞÆþ¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤Ë¤è¤Ã¤Æ¥¯¥é¥¹¤Þ¤¿¤Ï¥ê¥½¡¼¥¹¤Î¸¡º÷¤¬¹Ô¤ï¤ì¤ë¤È¤­¤Ë¡¢Å¬ÀÚ¤Êjar¥Õ¥¡¥¤¥ë¤¬¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.LP
++.na
++\f2JAR¥Õ¥¡¥¤¥ë¤Î³µÍ×\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
++.LP
++.LP
++.na
++\f2JAR¥Õ¥¡¥¤¥ë¤Î»ÅÍÍ\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
++.LP
++.LP
++.na
++\f2JarIndex¤Î»ÅÍÍ\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
++.LP
++.LP
++.na
++\f2JAR¥Á¥å¡¼¥È¥ê¥¢¥ë\fP @
++.fi
++http://docs.oracle.com/javase/tutorial/deployment/jar//index.html
++.LP
++.LP
++pack200(1)
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jarsigner.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jarsigner.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,1655 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jarsigner 1 "07 May 2011"
++.TH jarsigner 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jarsigner \- JAR½ð̾¤ª¤è¤Ó¸¡¾Ú¥Ä¡¼¥ë
++.LP
++.LP
++Java ARchive(JAR)¥Õ¥¡¥¤¥ë¤Î½ð̾¤òÀ¸À®¤·¡¢½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.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
++.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
++.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
++.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¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.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
++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
++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
++ \-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
++ \-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¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++\-altsignerpath /home/user/lib/authsigner.jar
++.fl
++\fP
++.fi
++JAR¥Õ¥¡¥¤¥ë̾¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤àJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
++.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¤Ä¤Î¥¨¥ó¥È¥ê(¤ª¤è¤Ó¤½¤ì°Ê¾å)¡×¤È¤·¤ÆÍ×Ì󤵤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢Îã¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.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
++ 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
++ 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
++ 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 @
++.fi
++http://docs.oracle.com/javase/tutorial/security/index.html¤ò»²¾È
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/java.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/java.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -1,4 +1,4 @@
+-." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
++." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+ ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ ."
+ ." This code is free software; you can redistribute it and/or modify it
+@@ -19,6 +19,632 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH java 1 "07 May 2011"
++.TH java 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++java \- Java¥¢¥×¥ê¥±¡¼¥·¥ç¥óµ¯Æ°¥Ä¡¼¥ë
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++ \fP\f3java\fP [ options ] class [ argument ... ]
++.fl
++ \f3java\fP [ options ] \f3\-jar\fP file.jar [ argument ... ]
++.fl
++.fi
++
++.LP
++.RS 3
++.TP 3
++options
++¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¡£
++.TP 3
++class
++¸Æ¤Ó½Ð¤µ¤ì¤ë¥¯¥é¥¹¤Î̾Á°¡£
++.TP 3
++file.jar
++¸Æ¤Ó½Ð¤µ¤ì¤ëJAR¥Õ¥¡¥¤¥ë¤Î̾Á°¡£\f2\-jar\fP¤È¤È¤â¤Ë¤Î¤ß»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++argument
++\f3main\fP´Ø¿ô¤ËÅϤµ¤ì¤ë°ú¿ô¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3java\fP¥Ä¡¼¥ë¤Ï¡¢Java¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òµ¯Æ°¤·¤Þ¤¹¡£java¥Ä¡¼¥ë¤Ï¡¢Java Runtime Environment¤òµ¯Æ°¤·¤¿¸å¡¢»ØÄꤵ¤ì¤¿¥¯¥é¥¹¤ò¥í¡¼¥É¤·¡¢¤½¤Î¥¯¥é¥¹¤Î\f3main\fP¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤Ë¤è¤ê¡¢Java¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òµ¯Æ°¤·¤Þ¤¹¡£
++.LP
++.LP
++¤³¤Î¥á¥½¥Ã¥É¤Ï¡¢public¤ª¤è¤Óstatic¤È¤·¤ÆÀë¸À¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤Þ¤¿¡¢ÃͤÏÊÖ¤»¤Þ¤»¤ó¡£¤µ¤é¤Ë¡¢\f2String\fPÇÛÎó¤ò¥Ñ¥é¥á¡¼¥¿¤È¤·¤Æ»ØÄê¤Ç¤­¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥á¥½¥Ã¥É¤ÎÀë¸À¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++public static void main(String args[])
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó°Ê³°¤ÎºÇ½é¤Î°ú¿ô¤¬¡¢¸Æ¤Ó½Ð¤µ¤ì¤ë¥¯¥é¥¹¤Î̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Î̾Á°¤Ë¤Ï¡¢´°Á´½¤¾þ¥¯¥é¥¹Ì¾¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f3\-jar\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó°Ê³°¤ÎºÇ½é¤Î°ú¿ô¤¬¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥ê¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤à\f3JAR\fP¥¢¡¼¥«¥¤¥Ö¤Î̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¥Þ¥Ë¥Õ¥§¥¹¥È¤Î\f3Main\-Class\fP¥Ø¥Ã¥À¡¼¤Ç»ØÄꤵ¤ì¤¿¥¯¥é¥¹¤¬µ¯Æ°¥¯¥é¥¹¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++Java Runtime¤Ï¡¢¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¡¢¥¤¥ó¥¹¥È¡¼¥ëºÑ³ÈÄ¥µ¡Ç½¤ª¤è¤Ó¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Î3²Õ½ê¤«¤éµ¯Æ°¥¯¥é¥¹¤È¾¤Î»ÈÍѤµ¤ì¤Æ¤¤¤ë¥¯¥é¥¹¤ò¸¡º÷¤·¤Þ¤¹¡£
++.LP
++.LP
++¥¯¥é¥¹Ì¾¤Þ¤¿¤ÏJAR¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë¤¢¤ë¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó°Ê³°¤Î°ú¿ô¤Ï¡¢\f3main\fP´Ø¿ô¤ËÅϤµ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++µ¯Æ°¥Ä¡¼¥ë¤Ë¤Ï¡¢¸½ºß¤Î¼Â¹Ô´Ä¶­¤ª¤è¤Ó¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤ëɸ½à¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£¤Þ¤¿¡¢²¾ÁÛ¥Þ¥·¥ó¤Î¸½ºß¤Î¼ÂÁõ¤Ç¤Ï¡¢Èóɸ½à¥ª¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¤â¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢¾­Íè¤Î¥ê¥ê¡¼¥¹¤ÇÊѹ¹¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "ɸ½à¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-client
++Java HotSpot Client VM¤òÁªÂò¤·¤Þ¤¹¡£64¥Ó¥Ã¥ÈÂбþJDK¤Ï¸½»þÅÀ¤Ç¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò̵»ë¤·¡¢¤«¤ï¤ê¤ËJava Hotspot Server VM¤ò»ÈÍѤ·¤Þ¤¹¡£
++.br
++.br
++¥Ç¥Õ¥©¥ë¥È¤ÎVM¤ÎÁªÂò¤Ë¤Ä¤¤¤Æ¤Ï¡¢
++.na
++\f2¥µ¡¼¥Ð¡¼ \- ¥¯¥é¥¹¡¦¥Þ¥·¥ó¤Î¸¡½Ð\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-server
++Java HotSpot Server VM¤òÁªÂò¤·¤Þ¤¹¡£64¥Ó¥Ã¥ÈÂбþJDK¾å¤Ç¤Ï¡¢¥µ¥Ý¡¼¥È¤µ¤ì¤ë¤Î¤ÏJava Hotspot Server VM¤Î¤ß¤Ç¤¢¤ë¤¿¤á¡¢\-server¥ª¥×¥·¥ç¥ó¤¬°ÅÌÛŪ¤ËÁªÂò¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++¥Ç¥Õ¥©¥ë¥È¤ÎVM¤ÎÁªÂò¤Ë¤Ä¤¤¤Æ¤Ï¡¢
++.na
++\f2¥µ¡¼¥Ð¡¼ \- ¥¯¥é¥¹¡¦¥Þ¥·¥ó¤Î¸¡½Ð\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-agentlib:libname[=options]
++¥Í¥¤¥Æ¥£¥Ö¡¦¥¨¡¼¥¸¥§¥ó¥È¡¦¥é¥¤¥Ö¥é¥ê\f2libname\fP¤ò¥í¡¼¥É¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¼¡¤Î¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
++.br
++.br
++\-agentlib:hprof
++.br
++.br
++\-agentlib:jdwp=help
++.br
++.br
++\-agentlib:hprof=help
++.br
++.br
++¾ÜºÙ¤Ï¡¢
++.na
++\f2JVMTI¥¨¡¼¥¸¥§¥ó¥È¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-agentpath:pathname[=options]
++¥Õ¥ë¥Ñ¥¹Ì¾¤ò»ÈÍѤ·¤Æ¡¢¥Í¡¼¥Æ¥£¥Ö¡¦¥¨¡¼¥¸¥§¥ó¥È¡¦¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤·¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2JVMTI¥¨¡¼¥¸¥§¥ó¥È¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-classpath classpath
++.TP 3
++\-cp classpath
++¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¡¢JAR¥¢¡¼¥«¥¤¥Ö¤ª¤è¤ÓZIP¥¢¡¼¥«¥¤¥Ö¤Î¥ê¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Ñ¥¹¤Î³Æ¥¨¥ó¥È¥ê¤Ï¥³¥í¥ó(\f3:\fP)¤Ç¶èÀÚ¤ê¤Þ¤¹¡£\f3\-classpath\fP¤Þ¤¿¤Ï\f3\-cp\fP¤ò»ØÄꤹ¤ë¤È¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÎÃͤˤè¤Ã¤Æ\f3CLASSPATH\fP´Ä¶­ÊÑ¿ô¤ÎÀßÄ꤬¥ª¡¼¥Ð¡¼¥é¥¤¥É¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++\f3\-classpath\fP¤â\f3\-cp\fP¤â»ÈÍѤµ¤ì¤º¡¢\f3CLASSPATH\fP¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê(\f4.\fP)¤Ë¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++Êص¹¾å¡¢\f2*\fP¤Î¥Ù¡¼¥¹Ì¾¤ò´Þ¤à¥¯¥é¥¹¡¦¥Ñ¥¹Í×ÁǤϡ¢\f2.jar\fP¤Þ¤¿¤Ï\f2.JAR\fP¤ò³ÈÄ¥»Ò¤Ë»ý¤Ä¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ò»ØÄꤹ¤ë¤Î¤ÈƱÅù¤È¤ß¤Ê¤µ¤ì¤Þ¤¹(java¥×¥í¥°¥é¥à¤Ï¤³¤Î2¤Ä¤Î¸Æ½Ð¤·¤ò¶èÊ̤Ǥ­¤Þ¤»¤ó)¡£
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢¥Ç¥£¥ì¥¯¥È¥ê\f2foo\fP¤Ë\f2a.jar\fP¤È\f2b.JAR\fP¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¡¦¥Ñ¥¹Í×ÁÇ\f2foo/*\fP¤Ï\f2A.jar:b.JAR\fP¤ËŸ³«¤µ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢JAR¥Õ¥¡¥¤¥ë¤Î½çÈÖ¤Ï̤»ØÄê¤È¤Ê¤ê¤Þ¤¹¡£¤³¤Î¥ê¥¹¥È¤Ë¤Ï¡¢±£¤·¥Õ¥¡¥¤¥ë¤â´Þ¤á¡¢»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£\f2*\fP¤Î¤ß¤«¤é¤Ê¤ë¥¯¥é¥¹¡¦¥Ñ¥¹¡¦¥¨¥ó¥È¥ê¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ËŸ³«¤µ¤ì¤Þ¤¹¡£\f2CLASSPATH\fP´Ä¶­ÊÑ¿ô¤â¡¢ÄêµÁ»þ¤Ë¤ÏƱÍͤËŸ³«¤µ¤ì¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¥ï¥¤¥ë¥É¥«¡¼¥ÉŸ³«¤Ïɬ¤º¡¢Java²¾ÁÛ¥Þ¥·¥ó¤Îµ¯Æ°Á°¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢´Ä¶­¤ËÌä¹ç¤»¤ò¹Ô¤ï¤Ê¤¤¸Â¤ê¡¢Java¥×¥í¥°¥é¥à¤¬Å¸³«¤µ¤ì¤Æ¤¤¤Ê¤¤¥ï¥¤¥ë¥É¥«¡¼¥É¤òǧ¼±¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\f2System.getenv(\\"CLASSPATH\\")\fP¸Æ½Ð¤·¤¬¤½¤ÎÎã¤Ç¤¹¡£
++.br
++.br
++¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2¥¯¥é¥¹¡¦¥Ñ¥¹¤ÎÀßÄê\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-Dproperty=value
++¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤ÎÃͤòÀßÄꤷ¤Þ¤¹¡£
++.TP 3
++\-d32
++.TP 3
++\-d64
++¤½¤ì¤¾¤ì32¥Ó¥Ã¥È´Ä¶­¡¢64¥Ó¥Ã¥È´Ä¶­¤Ç¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¤³¤È¤ò¥ê¥¯¥¨¥¹¥È¤·¤Þ¤¹¡£¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿´Ä¶­¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥¨¥é¡¼¤¬Êó¹ð¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++¸½ºß¤Î¤È¤³¤í¡¢Java HotSpot Server VM¤Î¤ß¤¬64¥Ó¥Ã¥È¤ÎÁàºî¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤¿¤á¡¢\-d64»ÈÍÑ»þ¤Ë¤Ï\-server¥ª¥×¥·¥ç¥ó¤¬°ÅÌÛŪ¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\-d64»ÈÍÑ»þ¤Ë¤Ï¡Ö\-client¡×¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£¤³¤Î»ÅÍͤϡ¢¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¤ÏÊѹ¹¤Ë¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++\f3\-d32\fP¤È\f3\-d64\fP¤¬¤É¤Á¤é¤â»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤È¤·¤Æ¡¢32¥Ó¥Ã¥È´Ä¶­¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤³¤Î»ÅÍͤϡ¢¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¤ÏÊѹ¹¤Ë¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-enableassertions[:<package name>"..." | :<class name> ]
++.TP 3
++\-ea[:<package name>"..." | :<class name> ]
++.TP 3
++\-disableassertions[:<package name>"..." | :<class name> ]
++.TP 3
++\-da[:<package name>"..." | :<class name> ]
++¥¢¥µ¡¼¥·¥ç¥ó¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£
++.br
++.br
++°ú¿ô¤Ê¤·¤Î\f3disableassertions\fP¤Þ¤¿¤Ï\f3\-da\fP¤ò»ØÄꤹ¤ë¤È¡¢¥¢¥µ¡¼¥·¥ç¥ó¤¬Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¡Ö\f2...\fP¡×¤Ç½ª¤ï¤ë°ú¿ô¤ò1¤Ä»ØÄꤹ¤ë¤È¡¢»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤È¤½¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸Æâ¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤¬Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£°ú¿ô¤È¤·¤Æ¡Ö\f2...\fP¡×¤Î¤ß¤ò»ØÄꤹ¤ë¤È¡¢¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë̾Á°¤Î¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸Æâ¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤¬Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¡Ö\f2...\fP¡×¤Ç½ª¤ï¤é¤Ê¤¤°ú¿ô¤ò1¤Ä»ØÄꤹ¤ë¤È¡¢»ØÄꤷ¤¿¥¯¥é¥¹Æâ¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤¬Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++¥Ñ¥Ã¥±¡¼¥¸\f2com.wombat.fruitbat\fPÆâ¤Ç¤Ï¥¢¥µ¡¼¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¡¢¥¯¥é¥¹\f2com.wombat.fruitbat.Brickbat\fPÆâ¤Ç¤Ï¥¢¥µ¡¼¥·¥ç¥ó¤ò̵¸ú¤Ë¤·¤¿¤¦¤¨¤Ç¡¢¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++java \-ea:com.wombat.fruitbat... \-da:com.wombat.fruitbat.Brickbat \fP\f4<Main Class>\fP\f3
++.fl
++\fP
++.fi
++\f3\-disableassertions\fP¤ª¤è¤Ó\f3\-da\fP¥¹¥¤¥Ã¥Á¤Ï¡¢\f2¤¹¤Ù¤Æ¤Î\fP¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤ª¤è¤Ó¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹¤ËŬÍѤµ¤ì¤Þ¤¹¡£¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹¤Ë¤Ï¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¤³¤Î¥ë¡¼¥ë¤Ë¤Ï1¤ÄÎã³°¤¬¤¢¤ê¤Þ¤¹¡£¤½¤ì¤Ï¡¢°ú¿ô¤Ê¤·¤Î·Á¼°¤Ç¤³¤Î¥¹¥¤¥Ã¥Á¤ò»ØÄꤹ¤ë¤È¡¢¤½¤Î»ØÄ꤬¥·¥¹¥Æ¥à¤ËŬÍÑ\f2¤µ¤ì¤Ê¤¤\fP¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¤³¤ÎÎã³°¤òÍøÍѤ¹¤ì¤Ð¡¢¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹¤ò½ü¤¯¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤ò´Êñ¤ËÍ­¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤ò̵¸ú¤Ë¤¹¤ë¤¿¤á¤Ë¡¢Ê̤Υ¹¥¤¥Ã¥Á¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¸å¤Î\f3\-disablesystemassertions\fP¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++¥¢¥µ¡¼¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¥¢¥µ¡¼¥·¥ç¥ó¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
++.br
++.br
++°ú¿ô¤Ê¤·¤Î\f3enableassertions\fP¤Þ¤¿¤Ï\f3\-ea\fP¤ò»ØÄꤹ¤ë¤È¡¢¥¢¥µ¡¼¥·¥ç¥ó¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¡Ö\f2...\fP¡×¤Ç½ª¤ï¤ë°ú¿ô¤ò1¤Ä»ØÄꤹ¤ë¤È¡¢»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤È¤½¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸Æâ¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£°ú¿ô¤È¤·¤Æ¡Ö\f2...\fP¡×¤Î¤ß¤ò»ØÄꤹ¤ë¤È¡¢¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë̾Á°¤Î¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸Æâ¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¡Ö\f2...\fP¡×¤Ç½ª¤ï¤é¤Ê¤¤°ú¿ô¤ò1¤Ä»ØÄꤹ¤ë¤È¡¢»ØÄꤷ¤¿¥¯¥é¥¹Æâ¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++ñ°ì¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤³¤ì¤é¤Î¥¹¥¤¥Ã¥Á¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òÊ£¿ô»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢»ØÄꤷ¤¿¥¹¥¤¥Ã¥Á¤¬½çÈ֤˽èÍý¤µ¤ì¤Æ¤«¤é¥¯¥é¥¹¤¬¥í¡¼¥É¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¤¿¤È¤¨¤Ð¡¢¥Ñ¥Ã¥±¡¼¥¸\f2com.wombat.fruitbat\fP(¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤ò´Þ¤à)Æâ¤Ç¤Î¤ß¥¢¥µ¡¼¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Æ¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++java \-ea:com.wombat.fruitbat... <Main Class>
++.fl
++\fP
++.fi
++\f3\-enableassertions\fP¤ª¤è¤Ó\f3\-ea\fP¥¹¥¤¥Ã¥Á¤Ï¡¢\f2¤¹¤Ù¤Æ¤Î\fP¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤ª¤è¤Ó¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹¤ËŬÍѤµ¤ì¤Þ¤¹¡£¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹¤Ë¤Ï¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¤³¤Î¥ë¡¼¥ë¤Ë¤Ï1¤ÄÎã³°¤¬¤¢¤ê¤Þ¤¹¡£¤½¤ì¤Ï¡¢°ú¿ô¤Ê¤·¤Î·Á¼°¤Ç¤³¤Î¥¹¥¤¥Ã¥Á¤ò»ØÄꤹ¤ë¤È¡¢¤½¤Î»ØÄ꤬¥·¥¹¥Æ¥à¤ËŬÍÑ\f2¤µ¤ì¤Ê¤¤\fP¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¤³¤ÎÎã³°¤òÍøÍѤ¹¤ì¤Ð¡¢¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹¤ò½ü¤¯¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤ò´Êñ¤ËÍ­¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤ò̵¸ú¤Ë¤¹¤ë¤¿¤á¤Ë¡¢Ê̤Υ¹¥¤¥Ã¥Á¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¸å¤Î\f3\-enablesystemassertions\fP¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-enablesystemassertions
++.TP 3
++\-esa
++¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹Æâ¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹¤Ë¤Ä¤¤¤Æ\f2¥¢¥µ¡¼¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥¹¥Æ¡¼¥¿¥¹\fP¤ò\f2true\fP¤ËÀßÄꤷ¤Þ¤¹¡£
++.TP 3
++\-disablesystemassertions
++.TP 3
++\-dsa
++¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¡¦¥¯¥é¥¹Æâ¤Ç¥¢¥µ¡¼¥·¥ç¥ó¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
++.TP 3
++\-help¤Þ¤¿¤Ï\-?
++»ÈÍÑÊýË¡¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-jar
++JAR¥Õ¥¡¥¤¥ë¤Ë¥«¥×¥»¥ë²½¤µ¤ì¤¿¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤·¤Þ¤¹¡£ºÇ½é¤Î°ú¿ô¤Ï¡¢µ¯Æ°¥¯¥é¥¹¤Î̾Á°¤Ç¤Ï¤Ê¤¯¡¢JAR¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬µ¡Ç½¤¹¤ë¤Ë¤Ï¡¢JAR¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¤Ë\f3¡ÖMain\-Class:\fP\f4classname\fP\f3¡×\fP¤È¤¤¤¦·Á¼°¤Î¹Ô¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2classname\fP¤Ë¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î³«»Ï°ÌÃ֤Ȥ·¤Æµ¡Ç½¤¹¤ë\f2public\ static\ void\ main(String[]\ args)\fP¥á¥½¥Ã¥É¤ò´Þ¤à¥¯¥é¥¹¤ò»ØÄꤷ¤Þ¤¹¡£JAR¥Õ¥¡¥¤¥ë¤È¤½¤Î¥Þ¥Ë¥Õ¥§¥¹¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢jar(1)¤È¡¢
++.na
++\f2Java¥Á¥å¡¼¥È¥ê¥¢¥ë\fP @
++.fi
++http://docs.oracle.com/javase/tutorial/deployment/jar/¤Î¡ÖTrail: Jar Files¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\
++.br
++.br
++¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢»ØÄꤷ¤¿JAR¥Õ¥¡¥¤¥ë¤¬¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¤Î¥½¡¼¥¹¤Ë¤Ê¤ê¡¢¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¾¤ÎÀßÄê¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++¡Öjava \-jar¡×¥ª¥×¥·¥ç¥ó¤Ç¼Â¹Ô¤Ç¤­¤ëJAR¥Õ¥¡¥¤¥ë¤Ï¡¢¼Â¹Ô¸¢¸Â¤Î¥»¥Ã¥È¤òÊÝ»ý¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢¡Öjava \-jar¡×¤ò»ÈÍѤ·¤Ê¤¤¤Ç¼Â¹Ô¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
++.na
++\f2Java Archive(JAR)¥Õ¥¡¥¤¥ë\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/jar/index.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-javaagent:jarpath[=options]
++Java¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¥¨¡¼¥¸¥§¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹¡£
++.na
++\f2java.lang.instrument\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-jre\-restrict\-search
++¥æ¡¼¥¶¡¼¡¦¥×¥é¥¤¥Ù¡¼¥È¤ÊJRE¤ò¥Ð¡¼¥¸¥ç¥ó¸¡º÷¤Ë´Þ¤á¤Þ¤¹¡£
++.TP 3
++\-no\-jre\-restrict\-search
++¥æ¡¼¥¶¡¼¡¦¥×¥é¥¤¥Ù¡¼¥È¤ÊJRE¤ò¥Ð¡¼¥¸¥ç¥ó¸¡º÷¤«¤é½ü³°¤·¤Þ¤¹¡£
++.TP 3
++\-showversion
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ³¹Ô¤·¤Þ¤¹¡£(´ØÏ¢¹àÌÜ: \f3\-version\fP¡£)
++.TP 3
++\-splash:imagepath
++\f2imagepath\fP¤Ë»ØÄꤵ¤ì¤¿²èÁü¤ò´Þ¤à¥¹¥×¥é¥Ã¥·¥å²èÌ̤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-verbose
++.TP 3
++\-verbose:class
++¥¯¥é¥¹¤¬¥í¡¼¥É¤µ¤ì¤ë¤¿¤Ó¤Ë¥¯¥é¥¹¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-verbose:gc
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¡¦¥¤¥Ù¥ó¥È¤¬È¯À¸¤¹¤ë¤¿¤Ó¤ËÊó¹ð¤·¤Þ¤¹¡£
++.TP 3
++\-verbose:jni
++¥Í¥¤¥Æ¥£¥Ö¡¦¥á¥½¥Ã¥É¤Î»ÈÍѤª¤è¤Ó¤½¤Î¾¤ÎJava Native Interface(JNI)¥¢¥¯¥Æ¥£¥Ó¥Æ¥£¤Ë´Ø¤¹¤ë¾ðÊó¤òÊó¹ð¤·¤Þ¤¹¡£
++.TP 3
++\-version
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£(´ØÏ¢¹àÌÜ: \f3\-showversion\fP¡£)
++.TP 3
++\-version:release
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤵ¤ì¤¿¥¯¥é¥¹¤Þ¤¿¤ÏJAR¥Õ¥¡¥¤¥ë¤¬¡¢\f2release\fP¤Ç»ØÄꤵ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤òɬÍפȤ·¤Æ¤¤¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£µ¯Æ°¤µ¤ì¤¿java¥³¥Þ¥ó¥É¤Î¥Ð¡¼¥¸¥ç¥ó¤¬¤³¤Î»ØÄêÆâÍƤòËþ¤¿¤µ¤º¡¢¤«¤ÄŬÀڤʼÂÁõ¤¬¥·¥¹¥Æ¥à¾å¤Ç¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢¤½¤ÎŬÀڤʼÂÁõ¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
++.br
++.br
++\f2release\fP¤Ç¤Ï¡¢ÆÃÄê¤Î¥Ð¡¼¥¸¥ç¥ó¤ò»ØÄê¤Ç¤­¤ë¤Î¤ß¤Ç¤Ê¤¯¡¢¥Ð¡¼¥¸¥ç¥óʸ»úÎó¤È¸Æ¤Ð¤ì¤ë¥Ð¡¼¥¸¥ç¥ó¤Î¥ê¥¹¥È¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¥Ð¡¼¥¸¥ç¥óʸ»úÎó¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¥Ð¡¼¥¸¥ç¥óÈϰϤò¶õÇò¤Ç¶èÀڤä¿·Á¼°¤Î½ç½øÉÕ¤­¥ê¥¹¥È¤Ç¤¹¡£¥Ð¡¼¥¸¥ç¥óÈϰϤϡ¢¥Ð¡¼¥¸¥ç¥óID¡¢¥Ð¡¼¥¸¥ç¥óID¤Î¸å¤Ë¥¢¥¹¥¿¥ê¥¹¥¯(*)¤òÉղä·¤¿¤â¤Î¡¢¥Ð¡¼¥¸¥ç¥óID¤Î¸å¤Ë¥×¥é¥¹µ­¹æ(+)¤òÉղä·¤¿¤â¤Î¡¢2¤Ä¤Î¥Ð¡¼¥¸¥ç¥óÈϰϤò¥¢¥ó¥Ñ¥µ¥ó¥É(&)¤Ç·ë¹ç¤·¤¿¤â¤Î¡¢¤Î¤¤¤º¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯¤Ï¥×¥ì¥Õ¥£¥Ã¥¯¥¹°ìÃפò¡¢¥×¥é¥¹µ­¹æ¤Ï»ØÄꤵ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó°Ê¾å¤ò¡¢¥¢¥ó¥Ñ¥µ¥ó¥É¤Ï2¤Ä¤Î¥Ð¡¼¥¸¥ç¥óÈϰϤÎÏÀÍýÀѤò¡¢¤½¤ì¤¾¤ì°ÕÌ£¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++\-version:"1.6.0_13 1.6*&1.6.0_10+"
++.fl
++\fP
++.fi
++¾åµ­¤Î°ÕÌ£¤Ï¡¢¥Ð¡¼¥¸¥ç¥ó1.6.0_13¡¢1.6¤ò¥Ð¡¼¥¸¥ç¥óID¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ë»ý¤Ä1.6.0_10°Ê¾å¤Î¥Ð¡¼¥¸¥ç¥ó¡¢¤Î¤¤¤º¤ì¤«¤ò¥¯¥é¥¹¤Þ¤¿¤ÏJAR¥Õ¥¡¥¤¥ë¤¬É¬ÍפȤ·¤Æ¤¤¤ë¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¥Ð¡¼¥¸¥ç¥óʸ»úÎó¤Î¸·Ì©¤Ê¹½Ê¸¤äÄêµÁ¤Ë¤Ä¤¤¤Æ¤Ï¡¢¡ÖJava Network Launching Protocol&API Specification(JSR\-56)¡×¤Î¡ÖAppendix A¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++JAR¥Õ¥¡¥¤¥ë¤Î¾ì¹ç¤ÏÄ̾¥Ð¡¼¥¸¥ç¥óÍ×·ï¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤹ¤ë¤è¤ê¤â¡¢JAR¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ë¥Õ¥§¥¹¥ÈÆâ¤Ë»ØÄꤹ¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.br
++.br
++¤³¤Î¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤ˴ؤ¹¤ë½ÅÍפʥݥꥷ¡¼¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢¸å½Ò¤ÎÃí°Õ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++
++.LP
++.SS
++Èóɸ½à¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-X
++Èóɸ½à¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-Xint
++¥¤¥ó¥¿¥×¥ê¥¿ÀìÍѥ⡼¥É¤ÇÆ°ºî¤·¤Þ¤¹¡£¥Í¥¤¥Æ¥£¥Ö¡¦¥³¡¼¥É¤Ø¤Î¥³¥ó¥Ñ¥¤¥ë¤Ï̵¸ú¤Ë¤Ê¤ê¡¢¤¹¤Ù¤Æ¤Î¥Ð¥¤¥È¥³¡¼¥É¤¬¥¤¥ó¥¿¥×¥ê¥¿¤Ë¤è¤Ã¤Æ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£Java HotSpot VM¤ËÂбþ¤¹¤ë¥³¥ó¥Ñ¥¤¥é¤¬Ä󶡤¹¤ë¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¾å¤ÎÍøÅÀ¤Ï¡¢¤³¤Î¥â¡¼¥É¤Ç¤Ï¼Â¸½¤µ¤ì¤Þ¤»¤ó¡£
++.TP 3
++\-Xbatch
++¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¡¦¥³¥ó¥Ñ¥¤¥ë¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£Ä̾VM¤Ç¤Ï¡¢¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¡¦¥³¥ó¥Ñ¥¤¥ë¤¬½ªÎ»¤¹¤ë¤Þ¤Ç¡¢¥á¥½¥Ã¥É¤ò¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¡¦¥¿¥¹¥¯¤È¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤·¡¢¥¤¥ó¥¿¥×¥ê¥¿¡¦¥â¡¼¥É¤Ç¥á¥½¥Ã¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£\f2\-Xbatch\fP¥Õ¥é¥°¤ò»ØÄꤹ¤ë¤È¡¢¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¡¦¥³¥ó¥Ñ¥¤¥ë¤¬Ìµ¸ú¤Ë¤Ê¤ê¡¢¤¹¤Ù¤Æ¤Î¥á¥½¥Ã¥É¤Î¥³¥ó¥Ñ¥¤¥ë¤¬´°Î»¤¹¤ë¤Þ¤Ç¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¡¦¥¿¥¹¥¯¤È¤·¤Æ½èÍý¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-Xbootclasspath:bootclasspath
++¥Ö¡¼¥È¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¡¢JAR¥¢¡¼¥«¥¤¥Ö¤ª¤è¤ÓZIP¥¢¡¼¥«¥¤¥Ö¤Î¥ê¥¹¥È¤ò¥³¥í¥ó¤Ç¶èÀڤäƻØÄꤷ¤Þ¤¹¡£»ØÄꤷ¤¿¥Ñ¥¹¤Ë¸ºß¤¹¤ë¥Ö¡¼¥È¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬¡¢Java¥×¥é¥Ã¥È¥Õ¥©¡¼¥àJDK¤Ë´Þ¤Þ¤ì¤ë¥Ö¡¼¥È¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¤«¤ï¤ê¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£\f2Ãí°Õ: rt.jarÆâ¤Î¥¯¥é¥¹¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤¹¤ëÌÜŪ¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢¥·¥¹¥Æ¥à¤ËÇÛÃÖ¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£Java Runtime Environment¥Ð¥¤¥Ê¥ê¡¦¥³¡¼¥É¡¦¥é¥¤¥»¥ó¥¹°ãÈ¿¤Ë¤Ê¤ê¤Þ¤¹¡£\fP
++.TP 3
++\-Xbootclasspath/a:path
++¥Ç¥£¥ì¥¯¥È¥ê¡¢JAR¥¢¡¼¥«¥¤¥Ö¤ª¤è¤ÓZIP¥¢¡¼¥«¥¤¥Ö¤Î¥Ñ¥¹¤ò¥³¥í¥ó¤Ç¶èÀڤäƻØÄꤷ¤Þ¤¹¡£¥Ñ¥¹¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¸å¤ËÄɲ䵤ì¤Þ¤¹¡£
++.TP 3
++\-Xbootclasspath/p:path
++¥Ç¥£¥ì¥¯¥È¥ê¡¢JAR¥¢¡¼¥«¥¤¥Ö¤ª¤è¤ÓZIP¥¢¡¼¥«¥¤¥Ö¤Î¥Ñ¥¹¤ò¥³¥í¥ó¤Ç¶èÀڤäƻØÄꤷ¤Þ¤¹¡£¥Ñ¥¹¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤ÎÁ°¤ËÄɲ䵤ì¤Þ¤¹¡£\f2Ãí°Õ: rt.jarÆâ¤Î¥¯¥é¥¹¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤¹¤ëÌÜŪ¤Ç¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢¥·¥¹¥Æ¥à¤ËÇÛÃÖ¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£Java Runtime Environment¥Ð¥¤¥Ê¥ê¡¦¥³¡¼¥É¡¦¥é¥¤¥»¥ó¥¹°ãÈ¿¤Ë¤Ê¤ê¤Þ¤¹¡£\fP
++.TP 3
++\-Xcheck:jni
++Java Native Interface(JNI)µ¡Ç½¤ËÂФ·¤ÆÄɲåÁ¥§¥Ã¥¯¤ò¹Ô¤¤¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢Java²¾ÁÛ¥Þ¥·¥ó¤ÏJNI¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤¹¤ëÁ°¤Ë¡¢JNI´Ø¿ô¤ËÅϤµ¤ì¤ë¥Ñ¥é¥á¡¼¥¿¤È¡¢¼Â¹Ô´Ä¶­¤Î¥Ç¡¼¥¿¤ò¸¡¾Ú¤·¤Þ¤¹¡£Ìµ¸ú¤Ê¥Ç¡¼¥¿¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¡¦¥³¡¼¥É¤ËÌäÂ꤬¤¢¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤ë¤¿¤á¡¢Java²¾ÁÛ¥Þ¥·¥ó¤ÏÃ×̿Ū¥¨¥é¡¼¤òȯÀ¸¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹Äã²¼¤¬Í½ÁÛ¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-Xfuture
++¥¯¥é¥¹¤È¥Õ¥¡¥¤¥ë¤Î·Á¼°¤ò¸·Ì©¤Ë¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£²¼°Ì¸ß´¹À­¤òÊݤĤ¿¤á¡¢JDK¤Î²¾ÁÛ¥Þ¥·¥ó¤¬¼Â¹Ô¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î·Á¼°¥Á¥§¥Ã¥¯¤Ï¡¢JDK¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ð¡¼¥¸¥ç¥ó1.1.x¤¬¼Â¹Ô¤¹¤ë¥Á¥§¥Ã¥¯¤ÈƱÄøÅ٤θ·Ì©¤µ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\f3\-Xfuture\fP¥Õ¥é¥°¤ò»ØÄꤹ¤ë¤È¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë·Á¼°¤Î»ÅÍͤؤνàµò¤ò¶¯²½¤¹¤ë¤¿¤á¤Î¤è¤ê¸·Ì©¤Ê¥Á¥§¥Ã¥¯¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£Java¥¢¥×¥ê¥±¡¼¥·¥ç¥óµ¯Æ°¥Ä¡¼¥ë¤Î¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢¤è¤ê¸·Ì©¤Ê¥Á¥§¥Ã¥¯¤¬¥Ç¥Õ¥©¥ë¥È¤Ë¤Ê¤ë¤¿¤á¡¢¿·¤·¤¤¥³¡¼¥É¤ò³«È¯¤¹¤ë¤È¤­¤Ë¤Ï¤³¤Î¥Õ¥é¥°¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.TP 3
++\-Xnoclassgc
++¥¯¥é¥¹¤Î¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¥í¡¼¥ÉºÑ¥¯¥é¥¹¤«¤é¥á¥â¥ê¡¼¤¬²óÉü¤µ¤ì¤ë¤³¤È¤¬¤Ê¤¯¤Ê¤ë¤¿¤á¡¢Á´ÂÎŪ¤Ê¥á¥â¥ê¡¼»ÈÍÑÎ̤¬ÁýÂ礷¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¤ÏOutOfMemoryError¤¬¥¹¥í¡¼¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-Xincgc
++¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¡¦¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥¿¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¡¦¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥¿¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£Í­¸ú¤Ë¤¹¤ë¤È¡¢¥×¥í¥°¥é¥à¤Î¼Â¹ÔÃæ¤Ë¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¤Ë¤è¤ë°ì»þÄä»ß¤¬È¯À¸¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¡¦¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥¿¤Ï¡¢¥×¥í¥°¥é¥à¤ÈƱ»þ¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤¬¤¢¤ê¡¢¤³¤Î¾ì¹ç¡¢¥×¥í¥°¥é¥à¤ÎÍøÍѤǤ­¤ë¥×¥í¥»¥Ã¥µÇ½ÎϤ¬Äã²¼¤·¤Þ¤¹¡£
++.TP 3
++\-Xloggc:file
++\-verbose:gc¤ÈƱÍͤ˥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¡¦¥¤¥Ù¥ó¥È¤¬È¯À¸¤¹¤ë¤¿¤Ó¤ËÊó¹ð¤·¤Þ¤¹¤¬¡¢¤½¤Î¥Ç¡¼¥¿¤ò\f2file\fP¤Ëµ­Ï¿¤·¤Þ¤¹¡£\f2\-verbose:gc\fP¤ò»ØÄꤷ¤¿¤È¤­¤ËÊó¹ð¤µ¤ì¤ë¾ðÊó¤Î¾¤Ë¡¢Êó¹ð¤µ¤ì¤ë³Æ¥¤¥Ù¥ó¥È¤ÎÀèƬ¤Ë¡¢ºÇ½é¤Î¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¡¦¥¤¥Ù¥ó¥È¤«¤é¤Î·Ð²á»þ´Ö(ÉÃñ°Ì)¤¬ÉÕ¤±²Ã¤¨¤é¤ì¤Þ¤¹¡£
++.br
++.br
++¥Í¥Ã¥È¥ï¡¼¥¯¤Î¥ì¥¹¥Ý¥ó¥¹»þ´Ö¤Ë¤è¤Ã¤ÆJVM¤Î¼Â¹Ô®ÅÙ¤¬Äã²¼¤¹¤ë¤Î¤òÈò¤±¤ë¤¿¤á¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤Î³ÊǼÀè¤Ï¡¢¾ï¤Ë¥í¡¼¥«¥ë¡¦¥Õ¥¡¥¤¥ë¡¦¥·¥¹¥Æ¥à¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£¥Õ¥¡¥¤¥ë¡¦¥·¥¹¥Æ¥à¤¬ËþÇդˤʤë¤È¡¢¥Õ¥¡¥¤¥ë¤ÏÀÚ¤êµÍ¤á¤é¤ì¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤Ë¥Ç¡¼¥¿¤¬°ú³¤­µ­Ï¿¤µ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤È\f2\-verbose:gc\fP¤ÎξÊý¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤¬Í¥À褵¤ì¤Þ¤¹¡£
++.TP 3
++\-Xmnsize¤Þ¤¿¤Ï\-XX:NewSize
++¼ã¤¤À¤Âå(¥Ê¡¼¥µ¥ê)¤Î¥µ¥¤¥º¤òÀßÄꤷ¤Þ¤¹¡£
++.TP 3
++\-Xmsn
++¥á¥â¥ê¡¼³äÅö¥×¡¼¥ë¤Î½é´ü¥µ¥¤¥º¤ò¥Ð¥¤¥È¿ô¤Ç»ØÄꤷ¤Þ¤¹¡£»ØÄꤹ¤ëÃͤϡ¢1MB¤è¤êÂ礭¤¤1024¤ÎÇÜ¿ô¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥­¥í¥Ð¥¤¥È¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢Ê¸»ú\f2k\fP¤Þ¤¿¤Ï\f2K\fP¤òÉÕ¤±¤Þ¤¹¡£¥á¥¬¥Ð¥¤¥È¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢Ê¸»ú\f2m\fP¤Þ¤¿¤Ï\f2M\fP¤òÉÕ¤±¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢¼Â¹Ô»þ¤Ë¥·¥¹¥Æ¥à¹½À®¤Ë´ð¤Å¤¤¤ÆÁªÂò¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2HotSpot Ergonomics\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++Îã:
++.nf
++\f3
++.fl
++ \-Xms6291456
++.fl
++ \-Xms6144k
++.fl
++ \-Xms6m
++.fl
++
++.fl
++\fP
++.fi
++.TP 3
++\-Xmxn
++¥á¥â¥ê¡¼³äÅö¥×¡¼¥ë¤ÎºÇÂ祵¥¤¥º¤ò¥Ð¥¤¥È¿ô¤Ç»ØÄꤷ¤Þ¤¹¡£»ØÄꤹ¤ëÃͤϡ¢2MB¤è¤êÂ礭¤¤1024¤ÎÇÜ¿ô¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥­¥í¥Ð¥¤¥È¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢Ê¸»ú\f2k\fP¤Þ¤¿¤Ï\f2K\fP¤òÉÕ¤±¤Þ¤¹¡£¥á¥¬¥Ð¥¤¥È¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢Ê¸»ú\f2m\fP¤Þ¤¿¤Ï\f2M\fP¤òÉÕ¤±¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢¼Â¹Ô»þ¤Ë¥·¥¹¥Æ¥à¹½À®¤Ë´ð¤Å¤¤¤ÆÁªÂò¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2HotSpot Ergonomics\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++Îã:
++.nf
++\f3
++.fl
++ \-Xmx83886080
++.fl
++ \-Xmx81920k
++.fl
++ \-Xmx80m
++.fl
++
++.fl
++\fP
++.fi
++Solaris 7¤ª¤è¤ÓSolaris 8 SPARC¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¾ì¹ç¤Î¤³¤ÎÃͤξå¸Â¤Ï¡¢¤ª¤è¤½4000m¤«¤é¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤ÎÎ̤ò°ú¤¤¤¿¤â¤Î¤Ç¤¹¡£Solaris 2.6¤ª¤è¤Óx86¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¾ì¹ç¤Î¾å¸Â¤Ï¡¢¤ª¤è¤½2000m¤«¤é¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤ÎÎ̤ò°ú¤¤¤¿¤â¤Î¤Ç¤¹¡£Linux¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¾ì¹ç¤Î¾å¸Â¤Ï¡¢¤ª¤è¤½2000m¤«¤é¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤ÎÎ̤ò°ú¤¤¤¿¤â¤Î¤Ç¤¹¡£
++.TP 3
++\-Xprof
++¼Â¹ÔÃæ¤Î¥×¥í¥°¥é¥à¤Î¥×¥í¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¡¢¥×¥í¥Õ¥¡¥¤¥ë¡¦¥Ç¡¼¥¿¤òɸ½à½ÐÎϤ˽ÐÎϤ·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥×¥í¥°¥é¥à³«È¯ÍѤΥ桼¥Æ¥£¥ê¥Æ¥£¤È¤·¤ÆÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£ËÜÈÖ²ÔƯ¥·¥¹¥Æ¥à¤Ç¤Î»ÈÍѤòÌÜŪ¤È¤·¤¿¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
++.TP 3
++\-Xrs
++Java²¾ÁÛ¥Þ¥·¥ó(JVM)¤Ë¤è¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¡¦¥·¥°¥Ê¥ë¤Î»ÈÍѤò¸º¤é¤·¤Þ¤¹¡£
++.br
++.br
++°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢Java¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÃá½øÀµ¤·¤¯¥·¥ã¥Ã¥È¥À¥¦¥ó¤¹¤ë¤¿¤á¤Î¥·¥ã¥Ã¥È¥À¥¦¥ó¡¦¥Õ¥Ã¥¯µ¡Ç½¤¬Äɲ䵤ì¤Þ¤·¤¿¡£¤³¤Îµ¡Ç½¤Ë¤è¤ê¡¢JVM¤¬ÆÍÁ³½ªÎ»¤·¤¿¾ì¹ç¤Ç¤â¡¢¥·¥ã¥Ã¥È¥À¥¦¥ó»þ¤Ë¥æ¡¼¥¶¡¼¡¦¥¯¥ê¡¼¥ó¡¦¥¢¥Ã¥×¥³¡¼¥É(¥Ç¡¼¥¿¥Ù¡¼¥¹Àܳ¤Î¥¯¥í¡¼¥º¤Ê¤É)¤ò¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
++.br
++.br
++Sun¼Ò¤ÎJVM¤Ï¡¢¥·¥°¥Ê¥ë¤ò¥­¥ã¥Ã¥Á¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢JVM¤Î°Û¾ï½ªÎ»¤Î¤¿¤á¤Î¥·¥ã¥Ã¥È¥À¥¦¥ó¡¦¥Õ¥Ã¥¯¤ò¼ÂÁõ¤·¤Þ¤¹¡£JVM¤Ï¡¢SIGHUP¡¢SIGINT¤ª¤è¤ÓSIGTERM¤ò»ÈÍѤ·¤Æ¡¢¥·¥ã¥Ã¥È¥À¥¦¥ó¡¦¥Õ¥Ã¥¯¤Î¼Â¹Ô¤ò³«»Ï¤·¤Þ¤¹¡£
++.br
++.br
++JVM¤Ï¡¢¥Ç¥Ð¥Ã¥°¤ÎÌÜŪ¤Ç¥¹¥ì¥Ã¥É¡¦¥¹¥¿¥Ã¥¯¤ò¥À¥ó¥×¤¹¤ë¤È¤¤¤¦¡¢1.2¤è¤êÁ°¤«¤é¤¢¤ëµ¡Ç½¤ò¼Â¸½¤¹¤ë¤¿¤á¤Ë¤â¡¢Æ±Íͤε¡¹½¤ò»ÈÍѤ·¤Þ¤¹¡£Sun¼Ò¤ÎJVM¤Ï¡¢¥¹¥ì¥Ã¥É¡¦¥À¥ó¥×¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤ËSIGQUIT¤ò»ÈÍѤ·¤Þ¤¹¡£
++.br
++.br
++JVM¤òËä¤á¹þ¤ó¤Ç¤¤¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬SIGINT¤äSIGTERM¤Ê¤É¤Î¥·¥°¥Ê¥ë¤òÉÑÈˤ˥ȥé¥Ã¥×¤¹¤ëɬÍפ¬¤¢¤ë¤È¡¢JVM¤½¤Î¤â¤Î¤Î¥·¥°¥Ê¥ë¡¦¥Ï¥ó¥É¥é¤Î½èÍý¤Ë»Ù¾ã¤¬½Ð¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\f3\-Xrs\fP¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¤³¤ÎÌäÂê¤ËÂнè¤Ç¤­¤Þ¤¹¡£Sun¼Ò¤ÎJVM¤ËÂФ·¤Æ\f3\-Xrs\fP¤ò»ÈÍѤ¹¤ë¤È¡¢SIGINT¡¢SIGTERM¡¢SIGHUP¤ª¤è¤ÓSIGQUIT¤ËÂФ¹¤ë¥·¥°¥Ê¥ë¡¦¥Þ¥¹¥¯¤ÏJVM¤Ë¤è¤Ã¤ÆÊѹ¹¤µ¤ì¤º¡¢¤³¤ì¤é¤Î¥·¥°¥Ê¥ë¤ËÂФ¹¤ë¥·¥°¥Ê¥ë¡¦¥Ï¥ó¥É¥é¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤»¤ó¡£
++.br
++.br
++\f3\-Xrs\fP¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¼¡¤Î2¤Ä¤Î±Æ¶Á¤¬¤¢¤ê¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++SIGQUIT¤Ë¤è¤ë¥¹¥ì¥Ã¥É¡¦¥À¥ó¥×¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£
++.TP 2
++o
++¥·¥ã¥Ã¥È¥À¥¦¥ó¡¦¥Õ¥Ã¥¯½èÍý¤Î¼Â¹Ô¤Ï¡¢JVM¤¬½ªÎ»¤·¤è¤¦¤È¤·¤Æ¤¤¤ë»þÅÀ¤ÇSystem.exit()¤ò¸Æ¤Ó½Ð¤¹¤Ê¤É¤·¤Æ¡¢¥æ¡¼¥¶¡¼¡¦¥³¡¼¥É¦¤Ç¹Ô¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
++.RE
++.TP 3
++\-Xssn
++¥¹¥ì¥Ã¥É¤Î¥¹¥¿¥Ã¥¯¡¦¥µ¥¤¥º¤òÀßÄꤷ¤Þ¤¹¡£
++.TP 3
++\-XX:AllocationPrefetchStyle=n
++³äÅöÃæ¤Ë»ÈÍѤµ¤ì¤ë¥×¥ê¥Õ¥§¥Ã¥Á¤Î¥¹¥¿¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï2¤Ç¤¹¡£
++.br
++.TP 3
++\-XX:+AggressiveOpts
++ÀѶËŪ¤ÊºÇŬ²½¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£
++.br
++.TP 3
++\-XX:+|\-DisableAttachMechanism
++¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Ä¡¼¥ë(\f2jmap\fP¤ª¤è¤Ó\f2jconsole\fP¤Ê¤É)¤¬JVM¤ËÀܳ¤Ç¤­¤ë¤«¤É¤¦¤«¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¤³¤Îµ¡Ç½¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢Àܳ¤ÏÍ­¸ú¤Ç¤¹¡£»ÈÍÑÎã:
++.nf
++\f3
++.fl
++ java \-XX:+DisableAttachMechanism
++.fl
++\fP
++.fi
++.TP 3
++\-XXLargePageSizeInBytes=n
++¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥é¡¼¥¸¡¦¥Ú¡¼¥¸¤ÎºÇÂ祵¥¤¥º¤ò»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-XX:MaxGCPauseMillis=n
++ºÇÂçGCµÙ»ß»þ´Ö¤Î¥¿¡¼¥²¥Ã¥È¤òÀßÄꤷ¤Þ¤¹¡£
++.br
++¤³¤ì¤Ï¥½¥Õ¥È¡¦¥´¡¼¥ë¤Î¤¿¤á¡¢JVM¤Ï¼Â¸½¤Î¤¿¤á¤ËºÇÁ±¤ÎÅØÎϤò¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤ÇÀßÄꤵ¤ì¤Æ¤¤¤ëºÇÂçÃͤϤ¢¤ê¤Þ¤»¤ó¡£
++.TP 3
++\-XX:NewSize
++¼ã¤¤À¤Âå(¥Ê¡¼¥µ¥ê)¤Î¥µ¥¤¥º¤òÀßÄꤷ¤Þ¤¹¡£\f3\-Xmn\fP\f4size\fP¤ÈƱ¤¸¤Ç¤¹¡£
++.TP 3
++\-XX:ParallelGCThreads=n
++¥Ñ¥é¥ì¥ë¡¦¥³¥ì¥¯¥¿Æâ¤ÎGC¥¹¥ì¥Ã¥É¤Î¿ô¤òÀßÄꤷ¤Þ¤¹¡£
++.br
++.TP 3
++\-XX:PredictedClassLoadCount=n
++¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢ºÇ½é¤Ë\f3UnlockExperimentalVMOptions\fP¥Õ¥é¥°¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬Â¿¿ô¤Î¥¯¥é¥¹¤ò¥í¡¼¥É¤¹¤ë¾ì¹ç¤Ç¡¢ÆäË\f3class.forName()\fP¤¬ÉÑÈˤ˻ÈÍѤµ¤ì¤ë¾ì¹ç¤Ï\f3PredictedClassLoadCount\fP¥Õ¥é¥°¤ò»ÈÍѤ·¤Þ¤¹¡£¿ä¾©Ãͤϡ¢\f3\-verbose:class\fP¤«¤é¤Î½ÐÎϤ˼¨¤µ¤ì¤Æ¤¤¤ë¥í¡¼¥ÉºÑ¥¯¥é¥¹¤Î¿ô¤Ç¤¹¡£
++.br
++»ÈÍÑÎã:
++.nf
++\f3
++.fl
++ java \-XX:+UnlockExperimentalVMOptions \-XX:PredictedClassLoadCount=60013
++.fl
++\fP
++.fi
++.TP 3
++\-XX:+PrintCompilation
++HotSpot¥À¥¤¥Ê¥ß¥Ã¥¯¡¦¥é¥ó¥¿¥¤¥à¡¦¥³¥ó¥Ñ¥¤¥é¤«¤é¤Î¾ÜºÙ½ÐÎϤò°õºþ¤·¤Þ¤¹¡£
++.br
++.TP 3
++\-XX:+PrintGCDetails \-XX:+PrintGCTimeStamps
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó½ÐÎϤò¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¤È¤â¤Ë°õºþ¤·¤Þ¤¹¡£
++.br
++.TP 3
++\-XX:SoftRefLRUPolicyMSPerMB=0
++¤³¤Î¥Õ¥é¥°¤Ï¡¢¥½¥Õ¥È¥¦¥§¥¢»²¾È¤ÎÀѶËŪ½èÍý¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥Õ¥é¥°¤Ï¡¢HotSpot GC¤¬¥½¥Õ¥È¥¦¥§¥¢»²¾È¥«¥¦¥ó¥È¤Î±Æ¶Á¤ò¼õ¤±¤ë¾ì¹ç¤Ë»ÈÍѤ·¤Þ¤¹¡£
++.TP 3
++\-XX:TLABSize=n
++¥¹¥ì¥Ã¥É¡¦¥í¡¼¥«¥ë³äÅö¥Ð¥Ã¥Õ¥¡(TLAB)¤¬HotSpot¤Ç¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£HotSpot¤Ç¤Ï¡¢TLAB¤Î¥µ¥¤¥º¤ò³äÅö¥Ñ¥¿¡¼¥ó¤Ë´ð¤Å¤¤¤Æ¼«Æ°Åª¤Ë·èÄꤷ¤Þ¤¹¡£\f3\-XX:TLABSize\fP¥ª¥×¥·¥ç¥ó¤ÇTLAB¤Î¥µ¥¤¥º¤òÈùÄ´À°¤Ç¤­¤Þ¤¹¡£
++.br
++.TP 3
++\-XX:+UnlockCommercialFeatures
++¤³¤Î¥Õ¥é¥°¤Ï¡¢¾¦Íѵ¡Ç½¤Î»ÈÍѤòǽưŪ¤Ë¥í¥Ã¥¯²ò½ü¤¹¤ë¾ì¹ç¤Ë»ÈÍѤ·¤Þ¤¹¡£¾¦Íѵ¡Ç½¤È¤Ï¡¢
++.na
++\f2Oracle Java SE Products Web¥Ú¡¼¥¸\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/terms/products/index.html¤Çµ¬Äꤵ¤ì¤ëÀ½ÉÊ"Oracle Java SE Advanced"¤Þ¤¿¤Ï"Oracle Java SE Suite"¤Ç¤¹¡£
++.br
++¤³¤Î¥Õ¥é¥°¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤ÏJava²¾ÁÛ¥Þ¥·¥ó¤ò»ÈÍѲÄǽ¤Ê¾¦Íѵ¡Ç½¤Ê¤·¤Ç¼Â¹Ô¤¹¤ë¤³¤È¤Ç¤¹¡£¤¤¤Ã¤¿¤ó¾¦Íѵ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢¼Â¹Ô»þ¤Ë¤½¤Î»ÈÍѤò̵¸ú¤Ë¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
++.TP 3
++\-XX:+UseAltSigs
++VM¤Ç¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç\f2SIGUSR1\fP¤ª¤è¤Ó\f2SIGUSR2\fP¤ò»ÈÍѤ·¤Þ¤¹¤¬¡¢\f2SIGUSR1\fP¤ª¤è¤Ó\f2SIGUSR2\fP¤ò¥·¥°¥Ê¥ëÏ¢º¿¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¶¥¹ç¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£\f2\-XX:+UseAltSigs\fP¥ª¥×¥·¥ç¥ó¤Ï¡¢VM¤Ë¥Ç¥Õ¥©¥ë¥È¤È¤·¤Æ\f2SIGUSR1\fP¤È\f2SIGUSR2\fP°Ê³°¤Î¥·¥°¥Ê¥ë¤ò»ÈÍѤµ¤»¤Þ¤¹¡£
++.TP 3
++\-XX:+|\-UseCompressedOops
++64¥Ó¥Ã¥ÈJVM¤Ç°µ½Ì»²¾È¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£
++.br
++¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥Õ¥©¥ë¥È¤Çtrue¤Ç¤¹¡£
++.br
++.TP 3
++\-XX:+UseConcMarkSweepGC¤Þ¤¿¤Ï\-XX:+UseG1GC
++¤³¤ì¤é¤Î¥Õ¥é¥°¤ÏConcurrent Mark Sweep (CMS)¤Þ¤¿¤ÏG1¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£
++.br
++.TP 3
++\-XX:+|\-UseLargePages
++¤³¤Î¥Õ¥é¥°¤Ï¡¢¥é¡¼¥¸¡¦¥Ú¡¼¥¸¡¦¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë¾ì¹ç¤Ë»ÈÍѤ·¤Þ¤¹¡£¥é¡¼¥¸¡¦¥Ú¡¼¥¸¤Ï¡¢Solaris¤Ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
++.br
++.TP 3
++\-XX:+UseParallelOldGC
++¥Ñ¥é¥ì¥ë¡¦¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥¿¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ï¥¹¥ë¡¼¥×¥Ã¥È¤ª¤è¤ÓÊ¿¶Ñ¥ì¥¹¥Ý¥ó¥¹»þ´Ö¤ËÂФ·¤ÆºÇŬ²½¤µ¤ì¤Þ¤¹¡£
++.br
++.RE
++
++.LP
++.SH "Ãí°Õ"
++.LP
++.LP
++\f3\-version:\fP\f2release\fP¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢¥ê¥ê¡¼¥¹»ØÄê¤ÎÊ£»¨¤µ¤ËÀ©¸Â¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢²Äǽ¤Ê¥ê¥ê¡¼¥¹»ØÄê¤Î¸Â¤é¤ì¤¿¥µ¥Ö¥»¥Ã¥È¤Î¤ß¤¬Å¬Àڤʥµ¥¦¥ó¥É¡¦¥Ý¥ê¥·¡¼¤òɽ¸½¤Ç¤­¡¢¤½¤ì¤é¤Î¤ß¤¬´°Á´¤Ë¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤¹¡£¤½¤ì¤é¤Î¥Ý¥ê¥·¡¼¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++1.
++Ǥ°Õ¤Î¥Ð¡¼¥¸¥ç¥ó¡£¤³¤ì¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Ê¤¤¤³¤È¤Çɽ¸½¤Ç¤­¤Þ¤¹¡£
++.TP 3
++2.
++¤¢¤ëÆÃÄê¤Î¥Ð¡¼¥¸¥ç¥óID¤è¤ê¤âÂ礭¤¤Ç¤°Õ¤Î¥Ð¡¼¥¸¥ç¥ó¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++"1.6.0_10+"
++.fl
++\fP
++.fi
++¤³¤Î¾ì¹ç¡¢\f21.6.0_10\fP¤è¤ê¤âÂ礭¤¤Ç¤°Õ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤ÇÆÃÄê¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬Æ³Æþ¤µ¤ì¤¿(¤¢¤ë¤¤¤Ï¤½¤Î¥Ð¥°¤¬½¤Àµ¤µ¤ì¤¿)¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£
++.TP 3
++3.
++¤¢¤ëÆÃÄê¤Î¥Ð¡¼¥¸¥ç¥óID¤è¤ê¤âÂ礭¤¤¥Ð¡¼¥¸¥ç¥ó¤Ç¡¢¤½¤Î¥ê¥ê¡¼¥¹¡¦¥Õ¥¡¥ß¥ê¤Î¾å¸Â¤Ë¤è¤Ã¤ÆÀ©¸Â¤µ¤ì¤ë¤â¤Î¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++"1.6.0_10+&1.6*"
++.fl
++\fP
++.fi
++.TP 3
++4.
++¾å¤Î¹àÌÜ2¤È¹àÌÜ3¤Î¡ÖOR¡×¼°¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++"1.6.0_10+&1.6* 1.7+"
++.fl
++\fP
++.fi
++¤³¤ì¤Ï¹àÌÜ2¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢¤¢¤ëÊѹ¹¤¬ÆÃÄê¤Î¥ê¥ê¡¼¥¹(1.7)¤ÇƳÆþ¤µ¤ì¤¿¤¬¡¢¤½¤ÎƱ¤¸Êѹ¹¤¬°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤âÍøÍѲÄǽ¤Ë¤Ê¤Ã¤¿¡¢¤È¤¤¤¦¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£
++.RE
++
++.LP
++.SH "¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¡¦¥Á¥å¡¼¥Ë¥ó¥°¤ÎÎã"
++.LP
++.LP
++¥¹¥ë¡¼¥×¥Ã¥È¤Þ¤¿¤Ï¥ì¥¹¥Ý¥ó¥¹»þ´Ö¤Î¹â®²½¤Î¤É¤Á¤é¤«¤òºÇŬ²½¤¹¤ë¤¿¤á¤Î¡¢»î¸³Åª¤Ê¥Á¥å¡¼¥Ë¥ó¥°¡¦¥Õ¥é¥°¤Î»ÈÍÑÎã¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.LP
++.SS
++¥¹¥ë¡¼¥×¥Ã¥È¤ò¸þ¾å¤¹¤ë¤¿¤á¤Î¥Á¥å¡¼¥Ë¥ó¥°
++.LP
++.nf
++\f3
++.fl
++ java \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g \-Xms26g \-Xmx26g
++.fl
++\fP
++.fi
++
++.LP
++.SS
++¥ì¥¹¥Ý¥ó¥¹»þ´Ö¤ò®¤¯¤¹¤ë¤¿¤á¤Î¥Á¥å¡¼¥Ë¥ó¥°
++.LP
++.nf
++\f3
++.fl
++ java \-d64 \-XX:+UseG1GC \-Xms26g Xmx26g \-XX:MaxGCPauseMillis=500 \-XX:+PrintGCTimeStamps
++.fl
++\fP
++.fi
++
++.LP
++.SH "½ªÎ»¥¹¥Æ¡¼¥¿¥¹"
++.LP
++.LP
++°ìÈ̤ˡ¢¼¡¤Î½ªÎ»Ãͤ¬µ¯Æ°¥Ä¡¼¥ë¤«¤éÊÖ¤µ¤ì¤ë¤Î¤ÏÄ̾µ¯Æ°¸µ¤¬ÉÔÀµ¤Ê°ú¿ô¤Ç¸Æ¤Ó½Ð¤µ¤ì¤¿¤«¡¢¿¼¹ï¤Ê¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤«¡¢¤¢¤ë¤¤¤ÏJava²¾ÁÛ¥Þ¥·¥ó¤«¤éÎã³°¤¬¥¹¥í¡¼¤µ¤ì¤¿¾ì¹ç¤Ç¤¹¡£¤¿¤À¤·Java¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢API¸Æ½Ð¤·\f2System.exit(exitValue)\fP¤ò»ÈÍѤ·¤ÆǤ°Õ¤ÎÃͤòÊÖ¤¹¤³¤È¤òÁªÂò¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++\f20\fP: Àµ¾ï½ªÎ»
++.TP 2
++o
++\f2>0\fP: ¥¨¥é¡¼È¯À¸
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++javac(1)
++.TP 2
++o
++jdb(1)
++.TP 2
++o
++javah(1)
++.TP 2
++o
++jar(1)
++.TP 2
++o
++.na
++\f2Java³ÈÄ¥µ¡Ç½¥Õ¥ì¡¼¥à¥ï¡¼¥¯\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html
++.TP 2
++o
++.na
++\f2¥»¥­¥å¥ê¥Æ¥£\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/index.html
++.TP 2
++o
++.na
++\f2HotSpot VM Specific Options\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/tech/vmoptions\-jsp\-140102.html
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/javac.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/javac.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,1222 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH javac 1 "07 May 2011"
++.TH javac 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++javac \- Java¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¥³¥ó¥Ñ¥¤¥é
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¥Õ¥¡¥¤¥ë
++.TP 2
++o
++Ãí¼á½èÍý
++.TP 2
++o
++·¿¤Î¸¡º÷
++.TP 2
++o
++¥×¥í¥°¥é¥Þ¥Æ¥£¥Ã¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹
++.TP 2
++o
++Îã
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++ \fP\f3javac\fP [ options ] [ sourcefiles ] [ classes ] [ @argfiles ]
++.fl
++
++.fl
++.fi
++
++.LP
++.LP
++°ú¿ô¤Ï½çÉÔƱ¤Ç¤¹¡£
++.LP
++.RS 3
++.TP 3
++options
++¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¡£
++.TP 3
++sourcefiles
++¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë1¤Ä°Ê¾å¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë(MyClass.java¤Ê¤É)¡£
++.TP 3
++classes
++Ãí¼á¤Î½èÍýÂоݤȤʤë1¤Ä°Ê¾å¤Î¥¯¥é¥¹(MyPackage.MyClass¤Ê¤É)¡£
++.TP 3
++@argfiles
++¥ª¥×¥·¥ç¥ó¤È¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤¿1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¡£¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç¤Ï\f2\-J\fP¥ª¥×¥·¥ç¥ó¤Ï»ØÄê¤Ç¤­¤Þ¤»¤ó¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3javac\fP¥Ä¡¼¥ë¤Ï¡¢Java¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Çµ­½Ò¤µ¤ì¤¿¥¯¥é¥¹¤È¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎÄêµÁ¤òÆɤ߼è¤ê¡¢¥Ð¥¤¥È¥³¡¼¥É¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£¤Þ¤¿¡¢Java¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥¯¥é¥¹Æâ¤ÎÃí¼á¤Î½èÍý¤â¹Ô¤¤¤Þ¤¹¡£
++.LP
++.LP
++¥½¡¼¥¹¡¦¥³¡¼¥É¤Î¥Õ¥¡¥¤¥ë̾¤ò\f3javac\fP¤ËÅϤ¹¤Ë¤Ï¡¢¼¡¤Î2¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¿ô¤¬¾¯¤Ê¤¤¾ì¹ç¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇľÀÜ»ØÄꤷ¤Þ¤¹¡£
++.TP 2
++o
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¿ô¤¬Â¿¤¤¾ì¹ç¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤ò¶õÇò¤Þ¤¿¤Ï²þ¹Ô¤Ç¶èÀڤäơ¢1¤Ä¤Î¥Õ¥¡¥¤¥ë¤ËÎóµó¤·¤Þ¤¹¡£¼¡¤Ë¡¢¤³¤Î¥ê¥¹¥È¡¦¥Õ¥¡¥¤¥ë̾¤ÎÀèƬ¤Ë\f3@\fP¤òÉÕ¤±¤Æ¡¢\f3javac\fP¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++¥½¡¼¥¹¡¦¥³¡¼¥É¤Î¥Õ¥¡¥¤¥ë̾¤Ï\f2.java\fP³ÈÄ¥»Ò¤ò¡¢¥¯¥é¥¹¤Î¥Õ¥¡¥¤¥ë̾¤Ï\f2.class\fP³ÈÄ¥»Ò¤ò»ý¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤Þ¤¿¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¤É¤Á¤é¤â¡¢³ºÅö¤¹¤ë¥¯¥é¥¹¤ËÂбþ¤¹¤ë¥ë¡¼¥È̾¤ò»ý¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2MyClass\fP¤È¤¤¤¦Ì¾Á°¤Î¥¯¥é¥¹¤Ï¡¢\f2MyClass.java\fP¤È¤¤¤¦Ì¾Á°¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ëµ­½Ò¤µ¤ì¤Þ¤¹¡£¤³¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢\f2MyClass.class\fP¤È¤¤¤¦Ì¾Á°¤Î¥Ð¥¤¥È¥³¡¼¥É¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++ÆâÉô¥¯¥é¥¹¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤È¡¢ÄɲäΥ¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¤³¤ì¤é¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡¢\f2MyClass$MyInnerClass.class\fP¤Î¤è¤¦¤Ë¡¢³°Éô¥¯¥é¥¹Ì¾¤ÈÆâÉô¥¯¥é¥¹Ì¾¤òÁȤ߹礻¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ä¥ê¡¼¤òÈ¿±Ç¤·¤¿¥Ç¥£¥ì¥¯¥È¥ê¡¦¥Ä¥ê¡¼¤ËÇÛÃÖ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò\f3/workspace\fP¤ËÃÖ¤¤¤Æ¤¤¤ë¾ì¹ç¡¢\f2com.mysoft.mypack.MyClass\fP¤Î¥½¡¼¥¹¡¦¥³¡¼¥É¤Ï\f3/workspace/com/mysoft/mypack/MyClass.java\fP¤Ë¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¡¢³Æ¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òÂбþ¤¹¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤·¤Þ¤¹¡£Ê̤νÐÎÏÀè¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢\f3\-d\fP¤ò»ÈÍѤ·¤Þ¤¹(¤³¤Î¸å¤Î¥ª¥×¥·¥ç¥ó¤ò»²¾È)¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++¥³¥ó¥Ñ¥¤¥é¤Ë¤Ï¡¢¸½ºß¤Î³«È¯´Ä¶­¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤ª¤ê¡¢¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¤â¥µ¥Ý¡¼¥È¤µ¤ì¤ëɸ½à¥ª¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì°Ê³°¤ÎÈóɸ½à¥ª¥×¥·¥ç¥ó¤Ï¡¢¸½ºß¤Î²¾ÁÛ¥Þ¥·¥ó¤ª¤è¤Ó¥³¥ó¥Ñ¥¤¥é¤Î¼ÂÁõ¤Ë¸ÇÍ­¤Î¥ª¥×¥·¥ç¥ó¤Ç¡¢¾­Íè¤ËÊѹ¹¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£Èóɸ½à¥ª¥×¥·¥ç¥ó¤Ï¡¢\f3\-X\fP¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£
++.LP
++.SS
++ɸ½à¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-Akey[=value]
++Ãí¼á¥×¥í¥»¥Ã¥µ¤ËÅϤµ¤ì¤ë¥ª¥×¥·¥ç¥ó¡£¤³¤ì¤é¤Ï¡¢javac¤Ë¤è¤Ã¤ÆľÀܲò¼á¤µ¤ì¤º¡¢¸Ä¡¹¤Î¥×¥í¥»¥Ã¥µ¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£\f2key\fP¤Ë¤Ï¡¢1¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¼±Ê̻Ҥò¡Ö.¡×¤Ç¶èÀڤ俤â¤Î¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-cppath¤Þ¤¿¤Ï\-classpathpath
++¥æ¡¼¥¶¡¼¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó(¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï)Ãí¼á¥×¥í¥»¥Ã¥µ¤ä¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¸¡º÷¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¡¦¥Ñ¥¹¤Ï\f3CLASSPATH\fP´Ä¶­ÊÑ¿ô¤Î¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£\f3CLASSPATH\fP¡¢\f3\-cp\fP¡¢\f3\-classpath\fP¤Î¤¤¤º¤ì¤â»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ê¤ê¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢¥¯¥é¥¹¡¦¥Ñ¥¹¤ÎÀßÄê¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++\f3\-sourcepath\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤â¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤«¤é¸¡º÷¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++\f3\-processorpath\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢Ãí¼á¥×¥í¥»¥Ã¥µ¤â¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤«¤é¸¡º÷¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-Djava.ext.dirs=directories
++¥¤¥ó¥¹¥È¡¼¥ëºÑ³ÈÄ¥µ¡Ç½¤Î°ÌÃÖ¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
++.TP 3
++\-Djava.endorsed.dirs=directories
++¾µÇ§¤µ¤ì¤¿É¸½à¥Ñ¥¹¤Î°ÌÃÖ¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
++.TP 3
++\-d directory
++¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¥Ç¥£¥ì¥¯¥È¥ê¤òÀßÄꤷ¤Þ¤¹¡£¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f3javac\fP¤Ç¤ÏºîÀ®¤µ¤ì¤Þ¤»¤ó¡£¥¯¥é¥¹¤¬¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÉô¤Ç¤¢¤ë¾ì¹ç¡¢\f3javac\fP¤Ï¡¢É¬Íפ˱þ¤¸¤Æ¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÈ¿±Ç¤·¤¿¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-d/home/myclasses\fP¤È»ØÄꤷ¡¢¥¯¥é¥¹¤Î̾Á°¤¬\f2com.mypackage.MyClass\fP¤Ç¤¢¤ë¾ì¹ç¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï\f2/home/myclasses/com/mypackage/MyClass.class\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++\f3\-d\fP¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\f3javac\fP¤Ï³Æ¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¡¢¤½¤ÎÀ¸À®¸µ¤È¤Ê¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë³ÊǼ¤·¤Þ¤¹¡£
++.br
++.br
++\f3Ãí°Õ:\fP \f3\-d\fP¤Ç»ØÄꤷ¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Ë¼«Æ°Åª¤Ë¤ÏÄɲ䵤ì¤Þ¤»¤ó¡£
++.TP 3
++\-deprecation
++¿ä¾©¤µ¤ì¤Ê¤¤¥á¥ó¥Ð¡¼¤ä¥¯¥é¥¹¤¬¡¢»ÈÍѤޤ¿¤Ï¥ª¡¼¥Ð¡¼¥é¥¤¥É¤µ¤ì¤ë¤¿¤Ó¤ËÀâÌÀ¤òɽ¼¨¤·¤Þ¤¹¡£\f3\-deprecation\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢\f3javac\fP¤Ï¡¢¿ä¾©¤µ¤ì¤Ê¤¤¥á¥ó¥Ð¡¼¤ä¥¯¥é¥¹¤ò»ÈÍѤޤ¿¤Ï¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Æ¤¤¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎÍ×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£\f3\-deprecation\fP¤Ï\f3\-Xlint:deprecation\fP¤Î¾Êάɽµ­¤Ç¤¹¡£
++.TP 3
++\-encoding encoding
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾(\f2EUC\-JP¤äUTF\-8\fP¤Ê¤É)¤ò»ØÄꤷ¤Þ¤¹¡£\f3\-encoding\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥³¥ó¥Ð¡¼¥¿¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-endorseddirs directories
++¾µÇ§¤µ¤ì¤¿É¸½à¥Ñ¥¹¤Î°ÌÃÖ¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
++.TP 3
++\-extdirs directories
++\f2ext\fP¥Ç¥£¥ì¥¯¥È¥ê¤Î°ÌÃÖ¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£\f2directories\fPÊÑ¿ô¤Ë¤Ï¡¢¥³¥í¥ó¤Ç¶èÀڤ俥ǥ£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£»ØÄꤷ¤¿¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î³ÆJAR¥¢¡¼¥«¥¤¥Ö¤«¤é¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬¸¡º÷¤µ¤ì¤Þ¤¹¡£¸«¤Ä¤«¤Ã¤¿¤¹¤Ù¤Æ¤ÎJAR¥¢¡¼¥«¥¤¥Ö¤Ï¼«Æ°Åª¤Ë¥¯¥é¥¹¡¦¥Ñ¥¹¤Î°ìÉô¤Ë¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë(°Û¤Ê¤ëJava¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¼ÂÁõ¤µ¤ì¤¿¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤ä³ÈÄ¥µ¡Ç½¥¯¥é¥¹¤ËÂФ·¤Æ¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤¦)¤ò¼Â¹Ô¤¹¤ë¾ì¹ç¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï³ÈÄ¥µ¡Ç½¥¯¥é¥¹¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë¡¦¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-g
++¥í¡¼¥«¥ëÊÑ¿ô¤ò´Þ¤à¤¹¤Ù¤Æ¤Î¥Ç¥Ð¥Ã¥°¾ðÊó¤òÀ¸À®¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¹ÔÈֹ椪¤è¤Ó¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¾ðÊó¤Î¤ß¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-g:none
++¥Ç¥Ð¥Ã¥°¾ðÊó¤òÀ¸À®¤·¤Þ¤»¤ó¡£
++.TP 3
++\-g:{keyword list}
++¥«¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤¿¥­¡¼¥ï¡¼¥É¡¦¥ê¥¹¥È¤Ë¤è¤ê»ØÄꤵ¤ì¤¿¡¢ÆÃÄê¤Î¼ïÎà¤Î¥Ç¥Ð¥Ã¥°¾ðÊó¤Î¤ß¤òÀ¸À®¤·¤Þ¤¹¡£¼¡¤Î¥­¡¼¥ï¡¼¥É¤¬Í­¸ú¤Ç¤¹¡£
++.RS 3
++.TP 3
++source
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Ç¥Ð¥Ã¥°¾ðÊó
++.TP 3
++lines
++¹ÔÈÖ¹æ¤Î¥Ç¥Ð¥Ã¥°¾ðÊó
++.TP 3
++vars
++¥í¡¼¥«¥ëÊÑ¿ô¤Î¥Ç¥Ð¥Ã¥°¾ðÊó
++.RE
++.TP 3
++\-help
++ɸ½à¥ª¥×¥·¥ç¥ó¤Î·Á¼°¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-implicit:{class,none}
++°ÅÌÛŪ¤Ë¥í¡¼¥É¤µ¤ì¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¤òÀ©¸æ¤·¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¼«Æ°À¸À®¤¹¤ë¤Ë¤Ï¡¢\f3\-implicit:class\fP¤ò»ÈÍѤ·¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎÀ¸À®¤òÍÞÀ©¤¹¤ë¤Ë¤Ï¡¢\f3\-implicit:none\fP¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¤Î¥Ç¥Õ¥©¥ë¥ÈÆ°ºî¤Ï¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¼«Æ°À¸À®¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤Î¾ì¹ç¡¢¤½¤Î¤è¤¦¤Ê¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤¿»þ¤ËÃí¼á½èÍý¤â¼Â¹Ô¤µ¤ì¤ë¤È¡¢¥³¥ó¥Ñ¥¤¥é¤«¤é·Ù¹ð¤¬È¯¹Ô¤µ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬ÌÀ¼¨Åª¤ËÀßÄꤵ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢·Ù¹ð¤Ïȯ¹Ô¤µ¤ì¤Þ¤»¤ó¡£·¿¤Î¸¡º÷¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-Joption
++\f3javac\fP¤¬¸Æ¤Ó½Ð¤¹\f3java\fPµ¯Æ°¥Ä¡¼¥ë¤Ë¡¢\f2option\fP¤òÅϤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f3\-J\fP¤ò»ÈÍѤ·¤Æ¡¢Java¤Çµ­½Ò¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ëÇظå¤ÎVM¤Ë¥ª¥×¥·¥ç¥ó¤òÅϤ¹¤³¤È¤Ï¡¢¤è¤¯¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
++.br
++.br
++\f3Ãí°Õ:\fP \f3CLASSPATH\fP¡¢\f3\-classpath\fP¡¢\f3\-bootclasspath\fP¤ª¤è¤Ó\f3\-extdirs\fP¤Ï¡¢\f3javac\fP¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¥¯¥é¥¹¤ò»ØÄꤹ¤ë¤â¤Î¤Ç¤Ï\f2¤¢¤ê¤Þ¤»¤ó\fP¡£¤³¤Î¤è¤¦¤ÊÊýË¡¤Ç¥³¥ó¥Ñ¥¤¥é¤Î¼ÂÁõ¤òÁàºî¤¹¤ë¤³¤È¤Ï¡¢Ä̾ï¤Ï̵°ÕÌ£¤Ç¤¢¤ê¡¢¾ï¤Ë´í¸±¤òȼ¤¤¤Þ¤¹¡£¤³¤Î¤è¤¦¤ÊÊýË¡¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢\f3\-J\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢É¬Íפʥª¥×¥·¥ç¥ó¤òÇظå¤Î\f3java\fPµ¯Æ°¥Ä¡¼¥ë¤ËÅϤ·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-nowarn
++·Ù¹ð¥á¥Ã¥»¡¼¥¸¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ï\f3\-Xlint:none\fP¤ÈƱ¤¸°ÕÌ£¤Ç¤¹¡£
++.TP 3
++\-proc: {none,only}
++Ãí¼á½èÍý¡¢¥³¥ó¥Ñ¥¤¥ë¡¢¤½¤ÎξÊý¡¢¤Î¤¤¤º¤ì¤ò¼Â¹Ô¤¹¤ë¤«¤òÀ©¸æ¤·¤Þ¤¹¡£\f3\-proc:none\fP¤Ï¡¢Ãí¼á½èÍý¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤¬¼Â¹Ô¤µ¤ì¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£\f3\-proc:only\fP¤Ï¡¢Ãí¼á½èÍý¤Î¤ß¤¬¼Â¹Ô¤µ¤ì¡¢¸å³¤Î¥³¥ó¥Ñ¥¤¥ë¤Ï¤Þ¤Ã¤¿¤¯¼Â¹Ô¤µ¤ì¤Ê¤¤¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
++.TP 3
++\-processor class1[,class2,class3...]
++¼Â¹Ô¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤Î̾Á°¡£¤³¤ì¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Î¸¡º÷½èÍý¤Ï¾Êά¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-processorpath path
++Ãí¼á¥×¥í¥»¥Ã¥µ¤Î¸¡º÷¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¥¯¥é¥¹¡¦¥Ñ¥¹Æâ¤Ç¥×¥í¥»¥Ã¥µ¤Î¸¡º÷¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
++.TP 3
++\-s dir
++À¸À®¤µ¤ì¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î³ÊǼÀè¤È¤Ê¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f3javac\fP¤Ç¤ÏºîÀ®¤µ¤ì¤Þ¤»¤ó¡£¥¯¥é¥¹¤¬¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÉô¤Ë¤Ê¤Ã¤Æ¤¤¤¿¾ì¹ç¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¤½¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÈ¿±Ç¤·¤¿¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë³ÊǼ¤·¤Þ¤¹¡£¤½¤ÎºÝ¡¢É¬Íפ˱þ¤¸¤Æ¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥æ¡¼¥¶¡¼¤¬\f3\-s/home/mysrc\fP¤È»ØÄꤷ¡¢¥¯¥é¥¹¤Î̾Á°¤¬\f2com.mypackage.MyClass\fP¤Ç¤¢¤Ã¤¿¾ì¹ç¡¢¤½¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï\f2/home/mysrc/com/mypackage/MyClass.java\fPÆâ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-source release
++¼õ¤±ÉÕ¤±¤ë¥½¡¼¥¹¡¦¥³¡¼¥É¤Î¥Ð¡¼¥¸¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£\f2release\fP¤Ë¤Ï¼¡¤ÎÃͤò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.RS 3
++.TP 3
++1.3
++¤³¤Î¥³¥ó¥Ñ¥¤¥é¤Ç¤Ï¡¢Java SE 1.3°Ê¹ß¤ËƳÆþ¤µ¤ì¤¿¥¢¥µ¡¼¥·¥ç¥ó¡¢Áí¾Î¤Þ¤¿¤Ï¾¤Î¸À¸ìµ¡Ç½¤ò¥µ¥Ý¡¼¥È\f2¤·¤Þ¤»¤ó\fP¡£
++.TP 3
++1.4
++Java SE 1.4¤ÇƳÆþ¤µ¤ì¤¿¡¢¥¢¥µ¡¼¥·¥ç¥ó¤ò´Þ¤à¥³¡¼¥É¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£
++.TP 3
++1.5
++Java SE 5¤ÇƳÆþ¤µ¤ì¤¿Áí¾Î¤ª¤è¤Ó¾¤Î¸À¸ìµ¡Ç½¤ò´Þ¤ó¤À¥³¡¼¥É¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£
++.TP 3
++5
++1.5¤ÈƱµÁ¤Ç¤¹¡£
++.TP 3
++1.6
++Java SE 6¤Ç¤Ï¸À¸ì¤ËÂФ¹¤ëÊѹ¹¤ÏƳÆþ¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£¤·¤«¤·¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¡¦¥¨¥é¡¼¤¬¡¢Java SE°ÊÁ°¤Î¤è¤¦¤Ê¡Ö·Ù¹ð¡×¤Ç¤Ï¤Ê¤¯¡¢¡Ö¥¨¥é¡¼¡×¤È¤·¤ÆÊó¹ð¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
++.TP 3
++6
++1.6¤ÈƱµÁ¤Ç¤¹¡£
++.TP 3
++1.7
++¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥ÈÃͤǤ¹¡£Java SE 7¤ÇƳÆþ¤µ¤ì¤¿µ¡Ç½¤ò´Þ¤à¥³¡¼¥É¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£
++.TP 3
++7
++1.7¤ÈƱµÁ¤Ç¤¹¡£
++.RE
++.TP 3
++\-sourcepath sourcepath
++¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎÄêµÁ¤ò¸¡º÷¤¹¤ë¥½¡¼¥¹¡¦¥³¡¼¥É¡¦¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤ÈƱÍͤˡ¢¥½¡¼¥¹¡¦¥Ñ¥¹¤ÎÊ£¿ô¤Î¥¨¥ó¥È¥ê¤Ï¥³¥í¥ó(\f3:\fP)¤Ç¶èÀÚ¤ê¤Þ¤¹¡£¥½¡¼¥¹¡¦¥Ñ¥¹¤Î¥¨¥ó¥È¥ê¤Ë¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¡¢JAR¥¢¡¼¥«¥¤¥Ö¤Þ¤¿¤ÏZIP¥¢¡¼¥«¥¤¥Ö¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Þ¤¿¤Ï¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥í¡¼¥«¥ë¡¦¥Ñ¥¹Ì¾¤¬¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÈ¿±Ç¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++\f3Ãí°Õ:\fP ¥¯¥é¥¹¡¦¥Ñ¥¹¤«¤é¥¯¥é¥¹¤Î¤ß¤Ç¤Ê¤¯¤½¤Î¥½¡¼¥¹¤â¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢¤½¤Î¥¯¥é¥¹¤Ï¼«Æ°ºÆ¥³¥ó¥Ñ¥¤¥ë¤ÎÂоݤˤʤ뤳¤È¤¬¤¢¤ê¤Þ¤¹¡£·¿¤Î¸¡º÷¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-verbose
++¾ÜºÙ¤Ê½ÐÎϤòɽ¼¨¤·¤Þ¤¹¡£¥í¡¼¥É¤µ¤ì¤ë¥¯¥é¥¹¤ª¤è¤Ó¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤´¤È¤Î¾ðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-version
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-Werror
++·Ù¹ð¤¬È¯À¸¤·¤¿¾ì¹ç¤Ë¥³¥ó¥Ñ¥¤¥ë¤ò½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-X
++Èóɸ½à¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë¡¦¥ª¥×¥·¥ç¥ó
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ï¡¢\f3javac\fP¤¬ÅºÉÕ¤µ¤ì¤Æ¤¤¤ë¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤ª¤è¤Ó³ÈÄ¥µ¡Ç½¥¯¥é¥¹¤ËÂФ·¤Æ¹Ô¤ï¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢\f3javac\fP¤Ï¡¢°Û¤Ê¤ëJava¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¼ÂÁõ¤µ¤ì¤¿¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤ª¤è¤Ó³ÈÄ¥µ¡Ç½¥¯¥é¥¹¤ËÂФ·¤Æ¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤¦¡Ö\f2¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë\fP¡×¤â¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤¦¾ì¹ç¤Ï¡¢\f3\-bootclasspath\fP¤ª¤è¤Ó\f3\-extdirs\fP¤ò»ÈÍѤ¹¤ë¤³¤È¤¬½ÅÍפǤ¹¡£¤³¤Î¸å¤Î¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.RS 3
++.TP 3
++\-target version
++»ØÄꤵ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎVM¤ò¥¿¡¼¥²¥Ã¥È¤Ë¤·¤¿¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿¥¿¡¼¥²¥Ã¥È°Ê¹ß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÆ°ºî¤·¤Þ¤¹¤¬¡¢¤½¤ì¤è¤êÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎVM¤Ç¤ÏÆ°ºî¤·¤Þ¤»¤ó¡£Í­¸ú¤Ê¥¿¡¼¥²¥Ã¥È¤Ï¡¢\f31.1\fP¡¢\f31.2\fP¡¢\f31.3\fP¡¢\f31.4\fP¡¢\f31.5\fP(\f35\fP¤â²Ä)¡¢\f31.6\fP(\f36\fP¤â²Ä)¤ª¤è¤Ó\f31.7\fP(\f37\fP¤â²Ä)¤Ç¤¹¡£
++.LP
++\f3\-target\fP¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢¼¡¤Î¤è¤¦¤Ë\f3\-source\fP¤ÎÃͤˤè¤Ã¤Æ·è¤Þ¤ê¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\-source¤¬\f3»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿\fP¾ì¹ç¡¢\-target¤ÎÃͤÏ\f31.7\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++\-source¤¬\f31.2\fP¤Î¾ì¹ç¡¢\-target¤ÎÃͤÏ\f31.4\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++\-source¤¬\f31.3\fP¤Î¾ì¹ç¡¢\-target¤ÎÃͤÏ\f31.4\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++\-source¤¬\f31.5\fP¤Î¾ì¹ç¡¢\-target¤ÎÃͤÏ\f31.7\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++\-source¤¬\f31.6\fP¤Î¾ì¹ç¡¢\-target¤ÎÃͤÏ\f31.7\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++\-source¤¬\f3¤½¤ì°Ê³°¤ÎÃͤξì¹ç¤Ï¤¹¤Ù¤Æ\fP¡¢\f3\-target\fP¤ÎÃͤÏ\f3\-source\fP¤ÎÃͤˤʤê¤Þ¤¹¡£
++.RE
++.TP 3
++\-bootclasspath bootclasspath
++»ØÄꤵ¤ì¤¿°ìÏ¢¤Î¥Ö¡¼¥È¡¦¥¯¥é¥¹¤ËÂФ·¤Æ¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤¤¤Þ¤¹¡£¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤ÈƱÍͤˡ¢¥Ö¡¼¥È¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤ÎÊ£¿ô¤Î¥¨¥ó¥È¥ê¤Ï¥³¥í¥ó(\f3:\fP)¤Ç¶èÀÚ¤ê¤Þ¤¹¡£¥Ö¡¼¥È¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¥¨¥ó¥È¥ê¤Ë¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¡¢JAR¥¢¡¼¥«¥¤¥Ö¤Þ¤¿¤ÏZIP¥¢¡¼¥«¥¤¥Ö¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++Èóɸ½à¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-Xbootclasspath/p:path
++¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤ÎÁ°¤ËÄɲä·¤Þ¤¹¡£
++.TP 3
++\-Xbootclasspath/a:path
++¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¸å¤ËÄɲä·¤Þ¤¹¡£
++.TP 3
++\-Xbootclasspath/:path
++¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
++.TP 3
++\-Xlint
++¿ä¾©¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î·Ù¹ð¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î·Ù¹ð¤òÍ­¸ú¤Ë¤¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.TP 3
++\-Xlint:all
++¿ä¾©¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î·Ù¹ð¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î·Ù¹ð¤òÍ­¸ú¤Ë¤¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.TP 3
++\-Xlint:none
++¤¹¤Ù¤Æ¤Î·Ù¹ð¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
++.TP 3
++\-Xlint:name
++·Ù¹ð\f2name\fP¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ÇÍ­¸ú¤Ë¤Ç¤­¤ë·Ù¹ð¤Î¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢\-Xlint¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤ÆÍ­¸ú¤Þ¤¿¤Ï̵¸ú¤Ë¤Ç¤­¤ë·Ù¹ð¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-Xlint:\-name
++·Ù¹ð\f2name\fP¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç̵¸ú¤Ë¤Ç¤­¤ë·Ù¹ð¤Î¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢\-Xlint¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤ÆÍ­¸ú¤Þ¤¿¤Ï̵¸ú¤Ë¤Ç¤­¤ë·Ù¹ð¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-Xmaxerrs number
++°õºþ¤¹¤ë¥¨¥é¡¼¤ÎºÇÂç¿ô¤òÀßÄꤷ¤Þ¤¹¡£
++.TP 3
++\-Xmaxwarns number
++°õºþ¤¹¤ë·Ù¹ð¤ÎºÇÂç¿ô¤òÀßÄꤷ¤Þ¤¹¡£
++.TP 3
++\-Xstdout filename
++¥³¥ó¥Ñ¥¤¥é¤Î¥á¥Ã¥»¡¼¥¸¤ò¡¢»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤ËÁ÷¤ê¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Î¥á¥Ã¥»¡¼¥¸¤Ï\f2System.err\fP¤ËÁ÷¤é¤ì¤Þ¤¹¡£
++.TP 3
++\-Xprefer:{newer,source}
++¤¢¤ë·¿¤ËÂФ·¤Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎξÊý¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢¤½¤Î¤É¤Á¤é¤Î¥Õ¥¡¥¤¥ë¤òÆɤ߼è¤ë¤«¤ò»ØÄꤷ¤Þ¤¹(·¿¤Î¸¡º÷¤ò»²¾È)¡£\f2\-Xprefer:newer\fP¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢¤¢¤ë·¿¤ËÂФ¹¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¿·¤·¤¤Êý¤¬Æɤ߼è¤é¤ì¤Þ¤¹(¥Ç¥Õ¥©¥ë¥È)¡£\f2\-Xprefer:source\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬Æɤ߼è¤é¤ì¤Þ¤¹¡£\f2SOURCE\fP¤ÎÊݸ¥Ý¥ê¥·¡¼¤ò»ÈÍѤ·¤ÆÀë¸À¤µ¤ì¤¿Ãí¼á¤ËǤ°Õ¤ÎÃí¼á¥×¥í¥»¥Ã¥µ¤¬¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¾ì¹ç¤Ï¡¢\f2\-Xprefer:source\fP¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-Xpkginfo:{always,legacy,nonempty}
++¥Ñ¥Ã¥±¡¼¥¸¾ðÊó¥Õ¥¡¥¤¥ë¤Î½èÍý¤ò»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-Xprint
++»ØÄꤵ¤ì¤¿·¿¤Î¥Æ¥­¥¹¥Èɽ¸½¤ò¥Ç¥Ð¥Ã¥°ÌÜŪ¤Ç½ÐÎϤ·¤Þ¤¹¡£Ãí¼á½èÍý¡¢¥³¥ó¥Ñ¥¤¥ë¤Î¤É¤Á¤é¤â¼Â¹Ô¤·¤Þ¤»¤ó¡£½ÐÎÏ·Á¼°¤ÏÊѹ¹¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-XprintProcessorInfo
++¤¢¤ëÆÃÄê¤Î¥×¥í¥»¥Ã¥µ¤¬½èÍý¤ò°ÍÍꤵ¤ì¤Æ¤¤¤ëÃí¼á¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-XprintRounds
++½é²ó¤ª¤è¤Ó¸å³¤ÎÃí¼á½èÍý¥é¥¦¥ó¥É¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++\-Xlint¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤ÆÍ­¸ú¤Þ¤¿¤Ï̵¸ú¤Ë¤Ç¤­¤ë·Ù¹ð
++.LP
++.LP
++\f3\-Xlint:\fP\f2name\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ·Ù¹ð\f2name\fP¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¤¿¤À¤·¡¢\f2name\fP¤Ï¼¡¤Î·Ù¹ð̾¤Î¤¤¤º¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£Æ±Íͤˡ¢\f3\-Xlint:\-\fP\f2name\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ·Ù¹ð\f2name\fP¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++cast
++ÉÔÍפǾéĹ¤Ê¥­¥ã¥¹¥È¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++String s = (String)"Hello!"
++.fl
++\fP
++.fi
++.TP 3
++classfile
++¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎÆâÍƤ˴ØÏ¢¤·¤¿ÌäÂê¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£
++.TP 3
++deprecation
++Èó¿ä¾©¹àÌܤλÈÍѤˤĤ¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ java.util.Date myDate = new java.util.Date();
++.fl
++ int currentDay = myDate.getDay();
++.fl
++\fP
++.fi
++¥á¥½¥Ã¥É\f2java.util.Date.getDay\fP¤ÏJDK 1.1°Ê¹ß¤Ï¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
++.TP 3
++dep\-ann
++\f2@deprecated\fP Javadoc¥³¥á¥ó¥È¤Ç¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤Æ¤¤¤ë¤¬¡¢\f2@Deprecated\fPÃí¼á¤¬ÉÕ¤¤¤Æ¤¤¤Ê¤¤¹àÌܤˤĤ¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ /**
++.fl
++ * @deprecated As of Java SE 7, replaced by {@link #newMethod()}
++.fl
++ */
++.fl
++
++.fl
++ public static void deprecatedMethood() { }
++.fl
++
++.fl
++ public static void newMethod() { }
++.fl
++\fP
++.fi
++.TP 3
++divzero
++ÄêÀ°¿ô0¤Ç½ü»»¤µ¤ì¤ë¤³¤È¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ int divideByZero = 42 / 0;
++.fl
++\fP
++.fi
++.TP 3
++empty
++\f2if\fPʸ°Ê¹ß¤¬¶õ¤Îʸ¤Ç¤¢¤ë¤³¤È¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++class E {
++.fl
++ void m() {
++.fl
++ if (true) ;
++.fl
++ }
++.fl
++}
++.fl
++\fP
++.fi
++.TP 3
++fallthrough
++fall\-through¥±¡¼¥¹¤Î\f2switch\fP¥Ö¥í¥Ã¥¯¤ò¥Á¥§¥Ã¥¯¤·¡¢¸¡½Ð¤µ¤ì¤¿¤â¤Î¤ËÂФ·¤Æ·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹¡£Fall\-through¥±¡¼¥¹¤Ï¡¢\f2switch\fP¥Ö¥í¥Ã¥¯Æâ¤ÎºÇ¸å¤Î¥±¡¼¥¹¤ò½ü¤¯¥±¡¼¥¹¤Ç¤¹¡£¤³¤Î¥³¡¼¥É¤Ë¤Ï\f2break\fPʸ¤Ï´Þ¤Þ¤ì¤Þ¤»¤ó¡£¥³¡¼¥É¤Î¼Â¹Ô¤ò¤½¤Î¥±¡¼¥¹¤«¤é¼¡¤Î¥±¡¼¥¹¤Ø°ÜÆ°¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¤³¤Î\f2switch\fP¥Ö¥í¥Ã¥¯Æâ¤Î\f2case 1\fP¥é¥Ù¥ë¤Ë³¤¯¥³¡¼¥É¤Ï¡¢\f2break\fPʸ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó¡£
++.nf
++\f3
++.fl
++switch (x) {
++.fl
++case 1:
++.fl
++ System.out.println("1");
++.fl
++ // No break statement here.
++.fl
++case 2:
++.fl
++ System.out.println("2");
++.fl
++}
++.fl
++\fP
++.fi
++¤³¤Î¥³¡¼¥É¤Î¥³¥ó¥Ñ¥¤¥ë»þ¤Ë\f2\-Xlint:fallthrough\fP¥Õ¥é¥°¤¬»ÈÍѤµ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢¥³¥ó¥Ñ¥¤¥é¤ÏÅö³º¥±¡¼¥¹¤Î¹ÔÈÖ¹æ¤È¤È¤â¤Ë¡¢fall\-through¥±¡¼¥¹¤Î²ÄǽÀ­¤¬¤¢¤ë¤³¤È¤ò¼¨¤¹·Ù¹ð¤òȯ¹Ô¤·¤Þ¤¹¡£
++.TP 3
++finally
++Àµ¾ï¤Ë´°Î»¤Ç¤­¤Ê¤¤\f2finally\fPÀá¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ public static int m() {
++.fl
++ try {
++.fl
++ throw new NullPointerException();
++.fl
++ } catch (NullPointerException e) {
++.fl
++ System.err.println("Caught NullPointerException.");
++.fl
++ return 1;
++.fl
++ } finally {
++.fl
++ return 0;
++.fl
++ }
++.fl
++ }
++.fl
++\fP
++.fi
++¤³¤ÎÎã¤Ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Ï\f2finally\fP¥Ö¥í¥Ã¥¯¤Ë´Ø¤¹¤ë·Ù¹ð¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥á¥½¥Ã¥É¤¬¸Æ¤Ó½Ð¤µ¤ì¤ë¤È¡¢ÃÍ\f21\fP¤Ç¤Ï¤Ê¤¯\f20\fP¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£\f2finally\fP¥Ö¥í¥Ã¥¯¤Ï¡¢\f2try\fP¥Ö¥í¥Ã¥¯¤¬½ªÎ»¤¹¤ë¤Èɬ¤º¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢À©¸æ¤¬\f2catch\fP¤Ë°Ü¤µ¤ì¤¿¾ì¹ç¡¢¥á¥½¥Ã¥É¤Ï½ªÎ»¤·¤Þ¤¹¡£¤¿¤À¤·¡¢\f2finally\fP¥Ö¥í¥Ã¥¯¤Ï¼Â¹Ô¤µ¤ì¤ëɬÍפ¬¤¢¤ë¤¿¤á¡¢À©¸æ¤¬¤¹¤Ç¤Ë¤³¤Î¥á¥½¥Ã¥É¤Î³°Éô¤Ë°Ü¤µ¤ì¤Æ¤¤¤Æ¤â¡¢¤³¤Î¥Ö¥í¥Ã¥¯¤Ï¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
++.TP 3
++options
++¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤ˴ؤ¹¤ëÌäÂê¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¤³¤Î¼ï¤Î·Ù¹ð¤ÎÎã¤Ë¤Ä¤¤¤Æ¤Ï¡¢¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++overrides
++¥á¥½¥Ã¥É¤Î¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Ë´Ø¤¹¤ëÌäÂê¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î2¤Ä¤Î¥¯¥é¥¹¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++public class ClassWithVarargsMethod {
++.fl
++ void varargsMethod(String... s) { }
++.fl
++}
++.fl
++\fP
++.fi
++.nf
++\f3
++.fl
++public class ClassWithOverridingMethod extends ClassWithVarargsMethod {
++.fl
++ @Override
++.fl
++ void varargsMethod(String[] s) { }
++.fl
++}
++.fl
++\fP
++.fi
++¥³¥ó¥Ñ¥¤¥é¤Ï¼¡¤Î¤è¤¦¤Ê·Ù¹ð¤òÀ¸À®¤·¤Þ¤¹¡£
++.br
++.br
++\f2warning: [override] varargsMethod(String[]) in ClassWithOverridingMethod overrides varargsMethod(String...) in ClassWithVarargsMethod; overriding method is missing '...'\fP
++.br
++.br
++¥³¥ó¥Ñ¥¤¥é¤Ï¡¢varargs¥á¥½¥Ã¥É¤ò¸¡½Ð¤¹¤ë¤È¡¢varargs¤Î²¾¥Ñ¥é¥á¡¼¥¿¤òÇÛÎó¤ËÊÑ´¹¤·¤Þ¤¹¡£¥á¥½¥Ã¥É\f2ClassWithVarargsMethod.varargsMethod\fP¤Ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Ïvarargs¤Î²¾¥Ñ¥é¥á¡¼¥¿\f2String... s\fP¤ò²¾¥Ñ¥é¥á¡¼¥¿\f2String[] s\fP¤ËÊÑ´¹¤·¤Þ¤¹¡£String[] s¤Ï¡¢¥á¥½¥Ã¥É\f2ClassWithOverridingMethod.varargsMethod\fP¤Î²¾¥Ñ¥é¥á¡¼¥¿¤ËÂбþ¤¹¤ëÇÛÎó¤Ç¤¹¡£¤½¤Î·ë²Ì¡¢¤³¤ÎÎã¤Ç¤Ï¥³¥ó¥Ñ¥¤¥ë¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
++.TP 3
++path
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤Î̵¸ú¤Ê¥Ñ¥¹Í×ÁǤȸºß¤·¤Ê¤¤¥Ñ¥¹¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹(¥¯¥é¥¹¡¦¥Ñ¥¹¡¢¥½¡¼¥¹¡¦¥Ñ¥¹¤Ê¤É¤Î¥Ñ¥¹´ØÏ¢)¡£¤³¤Î¤è¤¦¤Ê·Ù¹ð¤ò\f2@SuppressWarnings\fPÃí¼á¤ÇÍÞÀ©¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++javac \-Xlint:path \-classpath /nonexistentpath Example.java
++.fl
++\fP
++.fi
++.TP 3
++processing
++Ãí¼á½èÍý¤Ë´Ø¤¹¤ëÌäÂê¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¥³¥ó¥Ñ¥¤¥é¤¬¤³¤Î·Ù¹ð¤òÀ¸À®¤¹¤ë¤Î¤Ï¡¢Ãí¼á¤ò´Þ¤à¥¯¥é¥¹¤¬¤¢¤ë¤È¤­¤Ë¡¢»ÈÍѤ·¤Æ¤¤¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤Ç¤½¤Î¥¿¥¤¥×¤ÎÎã³°¤ò½èÍý¤Ç¤­¤Ê¤¤¾ì¹ç¤Ç¤¹¡£Ã±½ã¤ÊÃí¼á¥×¥í¥»¥Ã¥µ¤ÎÎã¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.br
++.br
++\f3¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë\fP\f4AnnoProc.java\fP:
++.nf
++\f3
++.fl
++import java.util.*;
++.fl
++import javax.annotation.processing.*;
++.fl
++import javax.lang.model.*;
++.fl
++import javax.lang.model.element.*;
++.fl
++
++.fl
++@SupportedAnnotationTypes("NotAnno")
++.fl
++public class AnnoProc extends AbstractProcessor {
++.fl
++ public boolean process(Set<? extends TypeElement> elems, RoundEnvironment renv) {
++.fl
++ return true;
++.fl
++ }
++.fl
++
++.fl
++ public SourceVersion getSupportedSourceVersion() {
++.fl
++ return SourceVersion.latest();
++.fl
++ }
++.fl
++}
++.fl
++\fP
++.fi
++\f3¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë\fP\f4AnnosWithoutProcessors.java\fP\f3:\fP
++.nf
++\f3
++.fl
++@interface Anno { }
++.fl
++
++.fl
++@Anno
++.fl
++class AnnosWithoutProcessors { }
++.fl
++\fP
++.fi
++¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ãí¼á¥×¥í¥»¥Ã¥µ\f2AnnoProc\fP¤ò¥³¥ó¥Ñ¥¤¥ë¤·¡¢¤³¤ÎÃí¼á¥×¥í¥»¥Ã¥µ¤ò¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë\f2AnnosWithoutProcessors.java\fP¤ËÂФ·¤Æ¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++% \fP\f3javac AnnoProc.java\fP
++.fl
++% \f3javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java\fP
++.fl
++.fi
++¥³¥ó¥Ñ¥¤¥é¤¬¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë\f2AnnosWithoutProcessors.java\fP¤ËÂФ·¤ÆÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤¹¤ë¤È¡¢¼¡¤Î·Ù¹ð¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++\f2warning: [processing] No processor claimed any of these annotations: Anno\fP
++.br
++.br
++¤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤Ë¤Ï¡¢¥¯¥é¥¹\f2AnnosWithoutProcessors\fP¤ÇÄêµÁ¤ª¤è¤Ó»ÈÍѤµ¤ì¤ëÃí¼á¤Î̾Á°¤ò\f2Anno\fP¤«¤é\f2NotAnno\fP¤ËÊѹ¹¤·¤Þ¤¹¡£
++.TP 3
++rawtypes
++raw·¿¤ËÂФ¹¤ë̤¸¡ººÁàºî¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤Îʸ¤Ç¤Ï¡¢\f2rawtypes\fP·Ù¹ð¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++void countElements(List l) { ... }
++.fl
++\fP
++.fi
++¼¡¤Îʸ¤Ç¤Ï¡¢\f2rawtypes\fP·Ù¹ð¤ÏÀ¸À®¤µ¤ì¤Þ¤»¤ó¡£
++.nf
++\f3
++.fl
++void countElements(List<?> l) { ... }
++.fl
++\fP
++.fi
++\f2List\fP¤Ïraw·¿¤Ç¤¹¡£¤¿¤À¤·¡¢\f2List<?>\fP¤Ï¥¢¥ó¥Ð¥¦¥ó¥É·Á¼°¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤Î¥Ñ¥é¥á¡¼¥¿²½¤µ¤ì¤¿·¿¤Ç¤¹¡£\f2List\fP¤Ï¥Ñ¥é¥á¡¼¥¿²½¤µ¤ì¤¿¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ê¤Î¤Ç¡¢É¬¤º¤½¤Î·¿°ú¿ô¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢\f2List\fP¤Î²¾°ú¿ô¤Ï¥¢¥ó¥Ð¥¦¥ó¥É·Á¼°¤Î¥ï¥¤¥ë¥É¥«¡¼¥É(\f2?\fP)¤ò»ÈÍѤ·¤Æ¤½¤Î²¾·¿¥Ñ¥é¥á¡¼¥¿¤È¤·¤Æ»ØÄꤵ¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢\f2countElements\fP¥á¥½¥Ã¥É¤Ï\f2List\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¤É¤Î¥¤¥ó¥¹¥¿¥ó¥¹²½¤â¼õ¤±ÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.TP 3
++serial
++ľÎó²½²Äǽ¥¯¥é¥¹¤Ë\f2serialVersionUID\fPÄêµÁ¤¬¤Ê¤¤¤³¤È¤ò·Ù¹ð¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++public class PersistentTime implements Serializable
++.fl
++{
++.fl
++ private Date time;
++.fl
++
++.fl
++ public PersistentTime() {
++.fl
++ time = Calendar.getInstance().getTime();
++.fl
++ }
++.fl
++
++.fl
++ public Date getTime() {
++.fl
++ return time;
++.fl
++ }
++.fl
++}
++.fl
++\fP
++.fi
++¥³¥ó¥Ñ¥¤¥é¤Ï¼¡¤Î·Ù¹ð¤òÀ¸À®¤·¤Þ¤¹¡£
++.br
++.br
++\f2warning: [serial] serializable class PersistentTime has no definition of serialVersionUID\fP
++.br
++.br
++ľÎó²½²Äǽ¥¯¥é¥¹¤¬\f2serialVersionUID\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥£¡¼¥ë¥É¤òÌÀ¼¨Åª¤ËÀë¸À¤·¤Ê¤¤¾ì¹ç¡¢Ä¾Îó²½¥é¥ó¥¿¥¤¥à¤Ï¡ÖJava¥ª¥Ö¥¸¥§¥¯¥ÈľÎó²½»ÅÍ͡פÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢¥¯¥é¥¹¤ÎÍÍ¡¹¤Ê¦Ì̤˴ð¤Å¤¤¤Æ¡¢¥¯¥é¥¹¤Î\f2serialVersionUID\fP¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò·×»»¤·¤Þ¤¹¡£¤¿¤À¤·¡¢¤¹¤Ù¤Æ¤ÎľÎó²½²Äǽ¥¯¥é¥¹¤¬\f2serialVersionUID\fPÃͤòÌÀ¼¨Åª¤ËÀë¸À¤¹¤ë¤³¤È¤ò¶¯¤¯¤ªÁ¦¤á¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢\f2serialVersionUID\fPÃͤò·×»»¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î¥×¥í¥»¥¹¤¬¡¢¥³¥ó¥Ñ¥¤¥é¤Î¼ÂÁõ¤Ë¤è¤Ã¤Æ°Û¤Ê¤ë²ÄǽÀ­¤Î¤¢¤ë¥¯¥é¥¹¤Î¾ÜºÙ¤Ë¤­¤ï¤á¤Æ±Æ¶Á¤ò¼õ¤±¤ä¤¹¤¯¡¢Ä¾Îó²½Éü¸µÃæ¤Ëͽ´ü¤·¤Ê¤¤\f2InvalidClassExceptions\fP¤¬È¯À¸¤¹¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¤Ç¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢Java¥³¥ó¥Ñ¥¤¥é¤Î¼ÂÁõ¤¬°Û¤Ê¤Ã¤Æ¤â\f2serialVersionUID\fPÃͤΰì´ÓÀ­¤ò³ÎÊݤˤ¹¤ë¤Ë¤Ï¡¢Ä¾Îó²½²Äǽ¥¯¥é¥¹¤¬\f2serialVersionUID\fPÃͤòÌÀ¼¨Åª¤ËÀë¸À¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++static
++static¤Î»ÈÍѤ˴ؤ¹¤ëÌäÂê¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++class XLintStatic {
++.fl
++ static void m1() { }
++.fl
++ void m2() { this.m1(); }
++.fl
++}
++.fl
++\fP
++.fi
++¥³¥ó¥Ñ¥¤¥é¤Ï¼¡¤Î·Ù¹ð¤òÀ¸À®¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++warning: [static] static method should be qualified by type name, XLintStatic, instead of by an expression
++.fl
++\fP
++.fi
++¤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë¡¢¼¡¤Î¤è¤¦¤Ëstatic¥á¥½¥Ã¥É\f2m1\fP¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++XLintStatic.m1();
++.fl
++\fP
++.fi
++¤¢¤ë¤¤¤Ï¡¢\f2static\fP¥­¡¼¥ï¡¼¥É¤ò¥á¥½¥Ã¥É\f2m1\fP¤ÎÀë¸À¤«¤éºï½ü¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.TP 3
++try
++try\-with\-resourcesʸ¤ò´Þ¤à¡¢\f2try\fP¥Ö¥í¥Ã¥¯¤Î»ÈÍѤ˴ؤ¹¤ëÌäÂê¤Ë¤Ä¤¤¤Æ·Ù¹ð¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2try\fPʸ¤ÇÀë¸À¤µ¤ì¤¿¥ê¥½¡¼¥¹\f2ac\fP¤¬»ÈÍѤµ¤ì¤Ê¤¤¤¿¤á¤Ë¡¢¼¡¤Îʸ¤ËÂФ·¤Æ·Ù¹ð¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++try ( AutoCloseable ac = getResource() ) {
++.fl
++ // do nothing
++.fl
++}
++.fl
++\fP
++.fi
++.TP 3
++unchecked
++Java¸À¸ì»ÅÍͤǻØÄꤵ¤ì¤Æ¤¤¤ë̤¸¡ººÊÑ´¹·Ù¹ð¤Î¾ÜºÙ¤ò¼¨¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ List l = new ArrayList<Number>();
++.fl
++ List<String> ls = l; // unchecked warning
++.fl
++\fP
++.fi
++·¿¤Î¾ÃµîÃæ¤Ë¡¢·¿\f2ArrayList<Number>\fP¤ª¤è¤Ó\f2List<String>\fP¤Ï¤½¤ì¤¾¤ì\f2ArrayList\fP¤ª¤è¤Ó\f2List\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++ÊÑ¿ô\f2ls\fP¤Ë¤Ï¥Ñ¥é¥á¡¼¥¿²½¤µ¤ì¤¿·¿\f2List<String>\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£\f2l\fP¤Ë¤è¤Ã¤Æ»²¾È¤µ¤ì¤ë\f2List\fP¤¬\f2ls\fP¤ËÂåÆþ¤µ¤ì¤ë¤È¡¢¥³¥ó¥Ñ¥¤¥é¤Ï̤¸¡ºº·Ù¹ð¤òÀ¸À®¤·¤Þ¤¹¡£¥³¥ó¥Ñ¥¤¥é¤Ï\f2l\fP¤¬\f2List<String>\fP·¿¤ò»²¾È¤¹¤ë¤«¤É¤¦¤«¤ò¥³¥ó¥Ñ¥¤¥ë»þ¤ËȽÃǤǤ­¤Þ¤»¤ó¡£¤Þ¤¿¡¢JVM¤¬¼Â¹Ô»þ¤Ë¤½¤ì¤òȽÃǤǤ­¤Ê¤¤¤³¤È¤âǧ¼±¤·¤Æ¤¤¤Þ¤¹¡£l¤ÏList<String>·¿¤ò»²¾È¤·¤Þ¤»¤ó¡£¤½¤Î·ë²Ì¡¢¥Ò¡¼¥×±øÀ÷¤¬È¯À¸¤·¤Þ¤¹¡£
++.br
++.br
++¾Ü¤·¤¯ÀâÌÀ¤¹¤ë¤È¡¢¥Ò¡¼¥×±øÀ÷¾õÂÖ¤¬È¯À¸¤¹¤ë¤Î¤Ï¡¢\f2List\fP¥ª¥Ö¥¸¥§¥¯¥È\f2l\fP(¤½¤Îstatic·¿¤Ï\f2List<Number>\fP)¤¬Ê̤Î\f2List\fP¥ª¥Ö¥¸¥§¥¯¥È\f2ls\fP(°Û¤Ê¤ëstatic·¿\f2List<String>\fP¤ò»ý¤Ä)¤ËÂåÆþ¤µ¤ì¤ë¾ì¹ç¤Ç¤¹¡£¤·¤«¤·¡¢¥³¥ó¥Ñ¥¤¥é¤Ç¤Ï¤³¤ÎÂåÆþ¤ò¤¤¤Þ¤À¤Ëµö²Ä¤·¤Æ¤¤¤Þ¤¹¡£Áí¾Î¤ò¥µ¥Ý¡¼¥È¤·¤Ê¤¤Java SE¤Î¥Ð¡¼¥¸¥ç¥ó¤È¤Î²¼°Ì¸ß´¹À­¤ò³ÎÊݤ¹¤ë¤¿¤á¤Ë¡¢¤³¤ÎÂåÆþ¤òµö²Ä¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£·¿¾Ãµî¤Î¤¿¤á¤Ë¡¢\f2List<Number>\fP¤È\f2List<String>\fP¤Ï\f2List\fP¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤Î·ë²Ì¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¥ª¥Ö¥¸¥§¥¯¥È\f2l\fP(\f2List\fP¤È¤¤¤¦raw·¿¤ò»ý¤Ä)¤ò¥ª¥Ö¥¸¥§¥¯¥È\f2ls\fP¤ËÂåÆþ¤¹¤ë¤³¤È¤òµö²Ä¤·¤Þ¤¹¡£
++.TP 3
++varargs
++²ÄÊÑ°ú¿ô(varargs)¥á¥½¥Ã¥É¡¢ÆäËÈó¶ñ¾Ý²½²Äǽ°ú¿ô¤ò´Þ¤à¤â¤Î¤Î»ÈÍѤ¬°ÂÁ´¤Ç¤Ê¤¤¤³¤È¤ò·Ù¹ð¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++public class ArrayBuilder {
++.fl
++ public static <T> void addToList (List<T> listArg, T... elements) {
++.fl
++ for (T x : elements) {
++.fl
++ listArg.add(x);
++.fl
++ }
++.fl
++ }
++.fl
++}
++.fl
++\fP
++.fi
++¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¥á¥½¥Ã¥É\f2ArrayBuilder.addToList\fP¤ÎÄêµÁ¤Ë´Ø¤¹¤ë¼¡¤Î·Ù¹ð¤òÀ¸À®¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++warning: [varargs] Possible heap pollution from parameterized vararg type T
++.fl
++\fP
++.fi
++¥³¥ó¥Ñ¥¤¥é¤Ï¡¢varargs¥á¥½¥Ã¥É¤ò¸¡½Ð¤¹¤ë¤È¡¢varargs¤Î²¾¥Ñ¥é¥á¡¼¥¿¤òÇÛÎó¤ËÊÑ´¹¤·¤Þ¤¹¡£¤·¤«¤·¡¢Java¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Ç¤Ï¡¢¥Ñ¥é¥á¡¼¥¿²½¤µ¤ì¤¿·¿¤ÎÇÛÎó¤ÎºîÀ®¤òµö²Ä¤·¤Æ¤¤¤Þ¤»¤ó¡£¥á¥½¥Ã¥É\f2ArrayBuilder.addToList\fP¤Ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Ïvarargs¤Î²¾¥Ñ¥é¥á¡¼¥¿\f2T... elements\fP¤ò²¾¥Ñ¥é¥á¡¼¥¿\f2T[] elements\fP(ÇÛÎó)¤ËÊÑ´¹¤·¤Þ¤¹¡£¤·¤«¤·¡¢·¿¾Ãµî¤Î¤¿¤á¤Ë¡¢¥³¥ó¥Ñ¥¤¥é¤Ïvarargs¤Î²¾¥Ñ¥é¥á¡¼¥¿¤ò\f2Object[] elements\fP¤ËÊÑ´¹¤·¤Þ¤¹¡£¤½¤Î·ë²Ì¡¢¥Ò¡¼¥×±øÀ÷¤¬È¯À¸¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¥Õ¥¡¥¤¥ë"
++.LP
++.LP
++javac¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤òû¤¯¤·¤¿¤ê´Ê·é¤Ë¤·¤¿¤ê¤¹¤ë¤¿¤á¤Ë¡¢\f2javac\fP¥³¥Þ¥ó¥É¤ËÂФ¹¤ë°ú¿ô(\f2\-J\fP¥ª¥×¥·¥ç¥ó¤ò½ü¤¯)¤ò´Þ¤à1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ÎÊýË¡¤ò»ÈÍѤ¹¤ë¤È¡¢¤É¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¾å¤Ç¤â¡¢Ç¤°Õ¤ÎŤµ¤Îjavac¥³¥Þ¥ó¥É¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++°ú¿ô¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢javac¤Î¥ª¥×¥·¥ç¥ó¤È¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò¼«Í³¤ËÁȤ߹礻¤Æµ­½Ò¤Ç¤­¤Þ¤¹¡£¥Õ¥¡¥¤¥ëÆâ¤Î³Æ°ú¿ô¤Ï¡¢¥¹¥Ú¡¼¥¹¤Þ¤¿¤Ï²þ¹Ô¤Ç¶èÀÚ¤ê¤Þ¤¹¡£¥Õ¥¡¥¤¥ë̾¤Ë¶õÇò¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë̾Á´ÂΤòÆó½Å°úÍÑÉä¤Ç°Ï¤ß¤Þ¤¹¡£
++.LP
++.LP
++°ú¿ô¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë̾¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¸«¤¿ÁêÂХѥ¹¤Ë¤Ê¤ê¤Þ¤¹¡£°ú¿ô¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤«¤é¸«¤¿ÁêÂХѥ¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£°ú¿ô¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë̾¥ê¥¹¥È¤Ç¤Ï¡¢¥ï¥¤¥ë¥É¥«¡¼¥É(*)¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\f2*.java\fP¤È¤Ï»ØÄê¤Ç¤­¤Þ¤»¤ó¡£°ú¿ô¥Õ¥¡¥¤¥ëÆâ¤Î°ú¿ô¤Ç\f2@\fPʸ»ú¤ò»ÈÍѤ·¤Æ¡¢Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤òºÆµ¢Åª¤Ë²ò¼á¤¹¤ë¤³¤È¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¤Þ¤¿¡¢\f2\-J\fP¥ª¥×¥·¥ç¥ó¤â¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ïµ¯Æ°¥Ä¡¼¥ë¤ËÅϤµ¤ì¤Þ¤¹¤¬¡¢µ¯Æ°¥Ä¡¼¥ë¤Ç¤Ï°ú¿ô¥Õ¥¡¥¤¥ë¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¹¡£
++.LP
++.LP
++javac¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¡¢³Æ°ú¿ô¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤È¥Õ¥¡¥¤¥ë̾¤ÎÀèƬ¤Ë\f2@\fPʸ»ú¤òÉÕ¤±¤ÆÅϤ·¤Þ¤¹¡£javac¤Ï¡¢\f2@\fPʸ»ú¤Ç»Ï¤Þ¤ë°ú¿ô¤ò¸«¤Ä¤±¤ë¤È¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòŸ³«¤·¤Æ°ú¿ô¥ê¥¹¥È¤ËÁÞÆþ¤·¤Þ¤¹¡£
++.LP
++.SS
++°ú¿ô¥Õ¥¡¥¤¥ë¤ò1¤Ä»ØÄꤹ¤ëÎã
++.LP
++.LP
++¡Ö\f2argfile\fP¡×¤È¤¤¤¦Ì¾Á°¤Î°ú¿ô¥Õ¥¡¥¤¥ë¤Ë¤¹¤Ù¤Æ¤Îjavac°ú¿ô¤ò³ÊǼ¤¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3javac @argfile\fP
++.fl
++.fi
++
++.LP
++.LP
++¤³¤Î°ú¿ô¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¼¡¤ÎÎã¤Ç¼¨¤µ¤ì¤Æ¤¤¤ë2¤Ä¤Î¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòξÊý¤È¤âÆþ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++.SS
++°ú¿ô¥Õ¥¡¥¤¥ë¤ò2¤Ä»ØÄꤹ¤ëÎã
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢javac¥ª¥×¥·¥ç¥óÍѤË1¥Õ¥¡¥¤¥ë¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾ÍѤË1¥Õ¥¡¥¤¥ë¤È¤¤¤¦¤è¤¦¤Ë¡¢2¤Ä¤Î°ú¿ô¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤Ê¤ª¡¢¤³¤Î¸å¤Î¥ê¥¹¥È¤Ç¤Ï¡¢¹Ô¤Î·Ñ³ʸ»ú¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤»¤ó¡£
++.LP
++.LP
++¼¡¤ÎÆâÍƤò´Þ¤à¡¢¡Ö\f2options\fP¡×¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ \-d classes
++.fl
++ \-g
++.fl
++ \-sourcepath /java/pubs/ws/1.3/src/share/classes
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¼¡¤ÎÆâÍƤò´Þ¤à\f2classes\fP¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ MyClass1.java
++.fl
++ MyClass2.java
++.fl
++ MyClass3.java
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ\f3javac\fP¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ % \fP\f3javac @options @classes\fP
++.fl
++
++.fl
++.fi
++
++.LP
++.SS
++¥Ñ¥¹ÉÕ¤­¤Î°ú¿ô¥Õ¥¡¥¤¥ë¤ÎÎã
++.LP
++.LP
++°ú¿ô¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Ñ¥¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢¤½¤Î¥Õ¥¡¥¤¥ëÆâ¤Ë»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ï¡¢¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¸«¤¿ÁêÂХѥ¹¤Ë¤Ê¤ê¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢²¼¤ÎÎã¤Î¾ì¹ç¤Ï¡¢\f2path1\fP¤ä\f2path2\fP¤«¤é¸«¤¿ÁêÂХѥ¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3javac @path1/options @path2/classes\fP
++.fl
++.fi
++
++.LP
++.SH "Ãí¼á½èÍý"
++.LP
++.LP
++\f3javac\fP¤¬Ãí¼á½èÍý¤òľÀÜ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤¿¤á¡¢ÆÈΩ¤·¤¿Ãí¼á½èÍý¥Ä¡¼¥ë¤Ç¤¢¤ë\f3apt\fP¤ò»ÈÍѤ¹¤ëɬÍפ¬¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£
++.LP
++.LP
++Ãí¼á½èÍý¤ÎAPI¤Ï¡¢\f2javax.annotation.processing\fP¤ª¤è¤Ó\f2javax.lang.model\fP¥Ñ¥Ã¥±¡¼¥¸¤È¤½¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸Æâ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++.SS
++Ãí¼á½èÍý¤Î³µÍ×
++.LP
++.LP
++\f3\-proc:none\fP¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÃí¼á½èÍý¤¬Ìµ¸ú²½¤µ¤ì¤Ê¤¤¸Â¤ê¡¢¥³¥ó¥Ñ¥¤¥é¤Ï»ÈÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤ÎÃí¼á¥×¥í¥»¥Ã¥µ¤ò¸¡º÷¤·¤Þ¤¹¡£¸¡º÷¥Ñ¥¹¤Ï\f3\-processorpath\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ»ØÄê¤Ç¤­¤Þ¤¹¡£¸¡º÷¥Ñ¥¹¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¥×¥í¥»¥Ã¥µ¤Î¸¡º÷¤Ï¡¢¸¡º÷¥Ñ¥¹¾å¤Î\f2META\-INF/services/javax.annotation.processing.Processor\fP¤È¤¤¤¦Ì¾Á°¤Î¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¹½À®¥Õ¥¡¥¤¥ë¤Ë´ð¤Å¤¤¤Æ¹Ô¤ï¤ì¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢»ÈÍѤ¹¤ë¤¹¤Ù¤Æ¤ÎÃí¼á¥×¥í¥»¥Ã¥µ¤Î̾Á°¤ò¡¢1¹Ô¤Ë1¤Ä¤º¤Ä´Þ¤á¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢Ê̤ÎÊýË¡¤È¤·¤Æ¡¢\f3\-processor\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥×¥í¥»¥Ã¥µ¤òÌÀ¼¨Åª¤Ë»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ä¥¯¥é¥¹¤òÁöºº¤¹¤ë¤³¤È¤Ç¡¢¤É¤Î¤è¤¦¤ÊÃí¼á¤¬Â¸ºß¤·¤Æ¤¤¤ë¤«¤ò³Îǧ¤·½ª¤ï¤ë¤È¡¢¥×¥í¥»¥Ã¥µ¤ËÂФ·¤ÆÌä¹ç¤»¤ò¹Ô¤¤¡¢¤½¤ì¤é¤Î¥×¥í¥»¥Ã¥µ¤¬¤É¤ÎÃí¼á¤ò½èÍý¤Ç¤­¤ë¤Î¤«¤ò³Îǧ¤·¤Þ¤¹¡£°ìÃפ¹¤ë¤â¤Î¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢¤½¤Î¥×¥í¥»¥Ã¥µ¤¬¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹¡£³Æ¥×¥í¥»¥Ã¥µ¤Ï¡¢¼«¿È¤¬½èÍý¤¹¤ëÃí¼á¤ò¡ÖÍ×µá¡×¤Ç¤­¤Þ¤¹¡£¤½¤Î¾ì¹ç¡¢¤½¤ì¤é¤ÎÃí¼á¤ËÂФ¹¤ëÊÌ¤Î¥×¥í¥»¥Ã¥µ¤ò¸«¤Ä¤±¤ë»î¤ß¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡£¤¹¤Ù¤Æ¤ÎÃí¼á¤¬Í׵ᤵ¤ì¤Æ¤·¤Þ¤¦¤È¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¤½¤ì°Ê¾å¥×¥í¥»¥Ã¥µ¤Î¸¡º÷¤ò¹Ô¤¤¤Þ¤»¤ó¡£
++.LP
++.LP
++¤¤¤º¤ì¤«¤Î¥×¥í¥»¥Ã¥µ¤Ë¤è¤Ã¤Æ¿·¤·¤¤¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤ë¤È¡¢Ãí¼á½èÍý¤Î2²óÌܤΥ饦¥ó¥É¤¬³«»Ï¤µ¤ì¤Þ¤¹¡£¿·¤·¤¯À¸À®¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬Áöºº¤µ¤ì¡¢Á°²ó¤ÈƱÍͤËÃí¼á¤¬½èÍý¤µ¤ì¤Þ¤¹¡£°ÊÁ°¤Î¥é¥¦¥ó¥É¤Ç¸Æ¤Ó½Ð¤µ¤ì¤¿¥×¥í¥»¥Ã¥µ¤Ï¤¹¤Ù¤Æ¡¢¸å³¤Î¤É¤Î¥é¥¦¥ó¥É¤Ç¤â¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹¡£¤³¤ì¤¬¡¢¿·¤·¤¤¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Ê¤¯¤Ê¤ë¤Þ¤Ç³¤­¤Þ¤¹¡£
++.LP
++.LP
++¤¢¤ë¥é¥¦¥ó¥É¤Ç¿·¤·¤¤¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢Ãí¼á¥×¥í¥»¥Ã¥µ¤¬¤¢¤È1²ó¤Î¤ß¸Æ¤Ó½Ð¤µ¤ì¡¢É¬ÍפʽèÍý¤ò¼Â¹Ô¤¹¤ëµ¡²ñ¤¬Í¿¤¨¤é¤ì¤Þ¤¹¡£ºÇ¸å¤Ë¡¢\f3\-proc:only\fP¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤµ¤ì¤Ê¤¤¸Â¤ê¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¸µ¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
++.LP
++.SS
++°ÅÌÛŪ¤Ë¥í¡¼¥É¤µ¤ì¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë
++.LP
++.LP
++¥³¥ó¥Ñ¥¤¥é¤Ï¡¢°ìÏ¢¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ëºÝ¤Ë¡¢Ê̤Υ½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò°ÅÌÛŪ¤Ë¥í¡¼¥É¤¹¤ë¤³¤È¤¬É¬Íפʾì¹ç¤¬¤¢¤ê¤Þ¤¹¡£(·¿¤Î¸¡º÷¤ò»²¾È)¡£¤½¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤Ï¡¢¸½»þÅÀ¤Ç¤ÏÃí¼á½èÍý¤ÎÂоݤˤʤê¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢Ãí¼á½èÍý¤¬¼Â¹Ô¤µ¤ì¡¢¤«¤Ä°ÅÌÛŪ¤Ë¥í¡¼¥É¤µ¤ì¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬1¤Ä¤Ç¤â¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¾ì¹ç¤Ë¥³¥ó¥Ñ¥¤¥é¤Ï·Ù¹ð¤òȯ¹Ô¤·¤Þ¤¹¡£¤³¤Î·Ù¹ð¤òÍÞÀ©¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢\-implicit¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "·¿¤Î¸¡º÷"
++.LP
++.LP
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë·¿¤ÎÄêµÁ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤È¤­¡¢¥³¥ó¥Ñ¥¤¥é¤ÏÄ̾¤½¤Î·¿¤Ë´Ø¤¹¤ë¾ðÊó¤òɬÍפȤ·¤Þ¤¹¡£¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ç»ÈÍѤµ¤ì¤Æ¤¤¤ë¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢³ÈÄ¥¤µ¤ì¤Æ¤¤¤ë¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¤¢¤ë¤¤¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¹¤Ù¤Æ¤Ë¤Ä¤¤¤Æ¡¢·¿¤Î¾ðÊó¤òɬÍפȤ·¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÇÌÀ¼¨Åª¤Ë¤Ï¸ÀµÚ¤µ¤ì¤Æ¤¤¤Ê¤¯¤Æ¤â¡¢·Ñ¾µ¤òÄ̤¸¤Æ¾ðÊó¤òÄ󶡤¹¤ë¥¯¥é¥¹¤È¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤â´Þ¤Þ¤ì¤Þ¤¹¡£
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢\f3java.applet.Applet\fP¤ò¥µ¥Ö¥¯¥é¥¹¤Ë¤·¤¿¾ì¹ç¡¢\f3¥¢¥×¥ì¥Ã¥È¤Î\fPÁÄÀè¤Î¥¯¥é¥¹(\f3java.awt.Panel\fP¡¢\f3java.awt.Container\fP¡¢\f3java.awt.Component\fP¡¢\f3java.lang.Object\fP)¤ò»ÈÍѤ·¤Æ¤¤¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++¥³¥ó¥Ñ¥¤¥é¤Ï¡¢·¿¤Î¾ðÊó¤¬É¬Íפˤʤë¤È¡¢¤½¤Î·¿¤òÄêµÁ¤·¤Æ¤¤¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òõ¤·¤Þ¤¹¡£¤Þ¤º¡¢¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤È³ÈÄ¥µ¡Ç½¥¯¥é¥¹¤ò¸¡º÷¤·¡¢Â³¤¤¤Æ¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹(¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê)¤ò¸¡º÷¤·¤Þ¤¹¡£¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Ï¡¢\f3CLASSPATH\fP´Ä¶­ÊÑ¿ô¤òÀßÄꤷ¤ÆÄêµÁ¤¹¤ë¤«¡¢¤Þ¤¿¤Ï\f3\-classpath\fP¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤ÆÀßÄꤷ¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢¥¯¥é¥¹¡¦¥Ñ¥¹¤ÎÀßÄê¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++\-sourcepath¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ñ¥¹¤«¤é¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤«¤é¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¸¡º÷¤·¤Þ¤¹¡£
++.LP
++.LP
++\f3\-bootclasspath\fP¥ª¥×¥·¥ç¥ó¤È\f3\-extdirs\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢Ê̤Υ֡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤ä³ÈÄ¥µ¡Ç½¥¯¥é¥¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤³¤Î¸å¤Î¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë¡¦¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++·¿¤Î¸¡º÷¤ËÀ®¸ù¤·¤¿¤È¤­¤ËÆÀ¤é¤ì¤ë·ë²Ì¤Ï¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤Ï¤½¤ÎξÊý¤Ç¤¢¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£Î¾Êý¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢¤½¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤ò\-Xprefer¥ª¥×¥·¥ç¥ó¤Ç¥³¥ó¥Ñ¥¤¥é¤Ë»Ø¼¨¤Ç¤­¤Þ¤¹¡£\f3newer\fP¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¥³¥ó¥Ñ¥¤¥é¤Ï2¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¿·¤·¤¤Êý¤ò»ÈÍѤ·¤Þ¤¹¡£\f3source\fP¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï\f3newer\fP¤Ç¤¹¡£
++.LP
++.LP
++·¿¤Î¸¡º÷¼«ÂΤˤè¤Ã¤Æ¡¢¤Þ¤¿¤Ï\f3\-Xprefer\fP¤¬ÀßÄꤵ¤ì¤¿·ë²Ì¤È¤·¤ÆɬÍפʷ¿¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¤½¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤òÆɤ߼è¤ê¡¢É¬ÍפʾðÊó¤ò¼èÆÀ¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¡¢¤½¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥³¥ó¥Ñ¥¤¥ë¤â¹Ô¤¤¤Þ¤¹¡£\-implicit¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤½¤ÎÆ°ºî¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\f3none\fP¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¤½¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÏÀ¸À®¤µ¤ì¤Þ¤»¤ó¡£\f3class\fP¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¤½¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++¥³¥ó¥Ñ¥¤¥é¤Ï¡¢Ãí¼á½èÍý¤Î´°Î»¸å¤Ë¡¢¤¢¤ë·¿¾ðÊó¤ÎɬÍ×À­¤òǧ¼±¤·¤Ê¤¤¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤½¤Î·¿¾ðÊ󤬤¢¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë¸«¤Ä¤«¤ê¡¢¤«¤Ä\f3\-implicit\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤¬Ãí¼á½èÍý¤ÎÂоݤȤʤ餺¤Ë¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¤³¤È¤ò¡¢¥³¥ó¥Ñ¥¤¥é¤¬¥æ¡¼¥¶¡¼¤Ë·Ù¹ð¤·¤Þ¤¹¡£¤³¤Î·Ù¹ð¤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢(¤½¤Î¥Õ¥¡¥¤¥ë¤¬Ãí¼á½èÍý¤ÎÂоݤȤʤë¤è¤¦¤Ë)¤½¤Î¥Õ¥¡¥¤¥ë¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤹ¤ë¤«¡¢¤¢¤ë¤¤¤Ï¤½¤Î¤è¤¦¤Ê¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ëɬÍפ¬¤¢¤ë¤«¤É¤¦¤«¤ò\f3\-implicit\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ»ØÄꤷ¤Þ¤¹¡£
++.LP
++.SH "¥×¥í¥°¥é¥Þ¥Æ¥£¥Ã¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
++.LP
++.LP
++\f3javac\fP¤Ï¡¢\f2javax.tools\fP¥Ñ¥Ã¥±¡¼¥¸Æâ¤Î¥¯¥é¥¹¤È¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤ë¿·¤·¤¤Java Compiler API¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
++.LP
++.SS
++Îã
++.LP
++.LP
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é»ØÄꤵ¤ì¤¿°ú¿ô¤ò»ÈÍѤ·¤Æ¥³¥ó¥Ñ¥¤¥ë¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¡¼¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
++.fl
++int rc = javac.run(null, null, null, args);
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤Î¾ì¹ç¡¢É¸½à½ÐÎÏ¥¹¥È¥ê¡¼¥à¤Ë¤¹¤Ù¤Æ¤Î¿ÇÃÇ¥á¥Ã¥»¡¼¥¸¤¬½ñ¤­½Ð¤µ¤ì¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¸Æ¤Ó½Ð¤µ¤ì¤¿\f3javac\fP¤¬ÊÖ¤¹¤Î¤ÈƱ¤¸½ªÎ»¥³¡¼¥É¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f2javax.tools.JavaCompiler\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¾å¤Î¾¤Î¥á¥½¥Ã¥É¤ò»ÈÍѤ¹¤ë¤È¡¢¿ÇÃÇ¥á¥Ã¥»¡¼¥¸¤Î½èÍý¤ä¥Õ¥¡¥¤¥ë¤ÎÆɼè¤ê¸µ/½ñ¹þ¤ßÀè¤ÎÀ©¸æ¤Ê¤É¤ò¹Ô¤¨¤Þ¤¹¡£
++.LP
++.SS
++µì¼°¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹
++.LP
++.LP
++\f3Ãí°Õ:\fP ¤³¤ÎAPI¤Ï¡¢²¼°Ì¸ß´¹À­¤ò³ÎÊݤ¹¤ë¤¿¤á¤Ë¤Î¤ß»Ä¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¿·¤·¤¤¥³¡¼¥É¤Ç¤Ï¡¢É¬¤ºÁ°½Ò¤ÎJava Compiler API¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++\f2com.sun.tools.javac.Main\fP¥¯¥é¥¹¤Ë¤Ï¡¢¥×¥í¥°¥é¥àÆ⤫¤é¥³¥ó¥Ñ¥¤¥é¤ò¸Æ¤Ó½Ð¤¹¤¿¤á¤Îstatic¥á¥½¥Ã¥É¤¬2¤ÄÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤½¤ì¤é¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++public static int compile(String[] args);
++.fl
++public static int compile(String[] args, PrintWriter out);
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f2args\fP¥Ñ¥é¥á¡¼¥¿¤Ï¡¢javac¥×¥í¥°¥é¥à¤ËÄ̾ïÅϤµ¤ì¤ëǤ°Õ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤òɽ¤·¤Æ¤¤¤Þ¤¹¡£¤½¤Î³µÍפˤĤ¤¤Æ¤Ï¡¢Á°½Ð¤Î·Á¼°¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++\f2out\fP¥Ñ¥é¥á¡¼¥¿¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Î¿ÇÃÇ¥á¥Ã¥»¡¼¥¸¤Î½ÐÎÏÀè¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++.LP
++Ìá¤êÃͤϡ¢\f3javac\fP¤Î½ªÎ»ÃͤÈƱ¤¸¤Ç¤¹¡£
++.LP
++.LP
++̾Á°¤¬\f2com.sun.tools.javac\fP¤Ç»Ï¤Þ¤ë¥Ñ¥Ã¥±¡¼¥¸(Èó¸ø¼°¤Ë¤Ï\f2com.sun.tools.javac\fP¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤È¤·¤ÆÃΤé¤ì¤ë)¤Ë´Þ¤Þ¤ì¤ë¤½¤Î¾¤Î¥¯¥é¥¹¤ä¥á¥½¥Ã¥É¤Ï¡¢¤É¤ì¤â´°Á´¤ËÆâÉôÍѤǤ¢¤ê¡¢¤¤¤Ä¤Ç¤âÊѹ¹¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "Îã"
++.LP
++.SS
++´Êñ¤Ê¥×¥í¥°¥é¥à¤Î¥³¥ó¥Ñ¥¤¥ë
++.LP
++.LP
++\f2Hello.java\fP¤È¤¤¤¦¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ç¡¢\f3greetings.Hello\fP¤È¤¤¤¦Ì¾Á°¤Î¥¯¥é¥¹¤òÄêµÁ¤·¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£\f2greetings\fP¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎξÊý¤¬¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ç¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¤¹¤°²¼¤Ë¤¢¤ê¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢¤³¤ÎÎã¤Ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤ò»ÈÍѤǤ­¤Þ¤¹¡£¤Þ¤¿¡¢\f3\-d\fP¤ò»ÈÍѤ·¤ÆÊ̤νÐÎÏÀè¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤹ¤ëɬÍפ⤢¤ê¤Þ¤»¤ó¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3ls\fP
++.fl
++greetings/
++.fl
++% \f3ls greetings\fP
++.fl
++Hello.java
++.fl
++% \f3cat greetings/Hello.java\fP
++.fl
++package greetings;
++.fl
++
++.fl
++public class Hello {
++.fl
++ public static void main(String[] args) {
++.fl
++ for (int i=0; i < args.length; i++) {
++.fl
++ System.out.println("Hello " + args[i]);
++.fl
++ }
++.fl
++ }
++.fl
++}
++.fl
++% \f3javac greetings/Hello.java\fP
++.fl
++% \f3ls greetings\fP
++.fl
++Hello.class Hello.java
++.fl
++% \f3java greetings.Hello World Universe Everyone\fP
++.fl
++Hello World
++.fl
++Hello Universe
++.fl
++Hello Everyone
++.fl
++.fi
++
++.LP
++.SS
++Ê£¿ô¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥³¥ó¥Ñ¥¤¥ë
++.LP
++.LP
++¼¡¤ÎÎã¤Ç¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸\f2greetings\fPÆâ¤Î¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3ls\fP
++.fl
++greetings/
++.fl
++% \f3ls greetings\fP
++.fl
++Aloha.java GutenTag.java Hello.java Hi.java
++.fl
++% \f3javac greetings/*.java\fP
++.fl
++% \f3ls greetings\fP
++.fl
++Aloha.class GutenTag.class Hello.class Hi.class
++.fl
++Aloha.java GutenTag.java Hello.java Hi.java
++.fl
++.fi
++
++.LP
++.SS
++¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Î»ØÄê
++.LP
++.LP
++¾å¤ÎÎã¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¤¦¤Á1¤Ä¤òÊѹ¹¤·¡¢Êѹ¹¸å¤Î¥Õ¥¡¥¤¥ë¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤È¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3pwd\fP
++.fl
++/examples
++.fl
++% \f3javac greetings/Hi.java\fP
++.fl
++.fi
++
++.LP
++.LP
++\f2greetings.Hi\fP¤Ï¡¢\f2greetings\fP¥Ñ¥Ã¥±¡¼¥¸Æâ¤Î¾¤Î¥¯¥é¥¹¤ò»²¾È¤·¤Æ¤¤¤ë¤¿¤á¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¤³¤ì¤é¤Î¥¯¥é¥¹¤òõ¤¹É¬Íפ¬¤¢¤ê¤Þ¤¹¡£¾å¤ÎÎã¤Ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤¬¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ç¥£¥ì¥¯¥È¥ê¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ÈƱ¤¸¤Ç¤¢¤ë¤¿¤á¡¢¥³¥ó¥Ñ¥¤¥ë¤ÏÀµ¾ï¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤·¤«¤·¡¢¸½ºß¤É¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¤¤ë¤«¤Ë´Ø·¸¤Ê¤¯¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤ò¹Í¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£¤½¤Î¤è¤¦¤Ê¾ì¹ç¤Ï¡¢¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Ë\f2/examples\fP¤òÄɲ乤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Ë¥¨¥ó¥È¥ê¤òÄɲ乤ë¤Ë¤Ï¡¢\f3CLASSPATH\fP¤òÀßÄꤹ¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¤¬¡¢¤³¤³¤Ç¤Ï\f3\-classpath\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3javac \-classpath /examples /examples/greetings/Hi.java\fP
++.fl
++.fi
++
++.LP
++.LP
++ºÆÅÙ\f2greetings.Hi\fP¤òÊѹ¹¤·¤Æ¥Ð¥Ê¡¼¡¦¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤¿¾ì¹ç¤Ï¡¢¤³¤Î¥Ð¥Ê¡¼¡¦¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤â¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤òÄ̤¸¤Æ¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3javac \-classpath /examples:/lib/Banners.jar \\
++.fl
++ /examples/greetings/Hi.java\fP
++.fl
++.fi
++
++.LP
++.LP
++\f2greetings\fPÆâ¤Î¥¯¥é¥¹¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢\f2greetings\fP¤È¡¢¤½¤ì¤¬»ÈÍѤ¹¤ë¥¯¥é¥¹¤ÎξÊý¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3java \-classpath /examples:/lib/Banners.jar greetings.Hi\fP
++.fl
++.fi
++
++.LP
++.SS
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎʬΥ
++.LP
++.LP
++ÆäËÂ絬ÌÏ¥×¥í¥¸¥§¥¯¥È¤Î¾ì¹ç¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òÊÌ¡¹¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¯¤ÈÊØÍø¤Ê¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÊ̤˻ØÄꤹ¤ë¤Ë¤Ï¡¢\f3\-d\fP¤ò»ÈÍѤ·¤Þ¤¹¡£¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¡¦¥Ñ¥¹¤Ë¤Ï¤Ê¤¤¤Î¤Ç¡¢\f3\-sourcepath\fP¤ò»ÈÍѤ·¤Æ¡¢¥³¥ó¥Ñ¥¤¥é¤¬¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3ls\fP
++.fl
++classes/ lib/ src/
++.fl
++% \f3ls src\fP
++.fl
++farewells/
++.fl
++% \f3ls src/farewells\fP
++.fl
++Base.java GoodBye.java
++.fl
++% \f3ls lib\fP
++.fl
++Banners.jar
++.fl
++% \f3ls classes\fP
++.fl
++% \f3javac \-sourcepath src \-classpath classes:lib/Banners.jar \\
++.fl
++ src/farewells/GoodBye.java \-d classes\fP
++.fl
++% \f3ls classes\fP
++.fl
++farewells/
++.fl
++% \f3ls classes/farewells\fP
++.fl
++Base.class GoodBye.class
++.fl
++.fi
++
++.LP
++.LP
++\f3Ãí°Õ:\fP ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤Ï\f2src/farewells/Base.java\fP¤ò»ØÄꤷ¤Æ¤¤¤Þ¤»¤ó¤¬¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤â¥³¥ó¥Ñ¥¤¥é¤Ë¤è¤Ã¤Æ¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¼«Æ°¥³¥ó¥Ñ¥¤¥ë¤ò´Æ»ë¤¹¤ë¤Ë¤Ï¡¢\f3\-verbose\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.SS
++¥¯¥í¥¹¥³¥ó¥Ñ¥¤¥ë¤ÎÎã
++.LP
++.LP
++¼¡¤ÎÎã¤Ï¡¢1.6 VM¾å¤ÇÆ°ºî¤¹¤ë¥³¡¼¥É¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¤Ë\f3javac\fP¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3javac \-source 1.6 \-target 1.6 \-bootclasspath jdk1.6.0/lib/rt.jar \\
++.fl
++ \-extdirs "" OldCode.java\fP
++.fl
++.fi
++
++.LP
++.LP
++\f2\-source 1.6\fP¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢\f2OldCode.java\fP¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¤Ï¥Ð¡¼¥¸¥ç¥ó1.6(¤Þ¤¿¤Ï6)¤ÎJava¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£\f3\-target 1.6\fP¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢1.6 VM¤È¸ß´¹À­¤Î¤¢¤ë¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¤Û¤È¤ó¤É¤Î¾ì¹ç¡¢\f3\-target\fP¥ª¥×¥·¥ç¥ó¤ÎÃͤÏ\f3\-source\fP¥ª¥×¥·¥ç¥ó¤ÎÃͤˤʤê¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢\f3\-target\fP¥ª¥×¥·¥ç¥ó¤ò¾Êά¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f3\-bootclasspath\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢Å¬ÀڤʥС¼¥¸¥ç¥ó¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹(\f2rt.jar\fP¥é¥¤¥Ö¥é¥ê)¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥é¤Ë¤è¤Ã¤Æ¼¡¤Î·Ù¹ð¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++% \fP\f3javac \-source 1.6 OldCode.java\fP
++.fl
++warning: [options] bootstrap class path not set in conjunction with \-source 1.6
++.fl
++.fi
++
++.LP
++.LP
++ŬÀڤʥС¼¥¸¥ç¥ó¤Î¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢¥³¥ó¥Ñ¥¤¥é¤Ï¸Å¤¤¸À¸ì»ÅÍÍ(¤³¤ÎÎã¤Ç¤Ï¡¢¥Ð¡¼¥¸¥ç¥ó1.6¤ÎJava¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì)¤ò¿·¤·¤¤¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤ÈÁȤ߹礻¤Æ»ÈÍѤ·¤Þ¤¹¡£¤½¤Î·ë²Ì¡¢Â¸ºß¤·¤Ê¤¤¥á¥½¥Ã¥É¤Ø¤Î»²¾È¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤¬¤¢¤ë¤¿¤á¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬¸Å¤¤¥×¥é¥Ã¥È¥Õ¥©¡¼¥à(¤³¤Î¾ì¹ç¤ÏJava SE 6)¤ÇÆ°ºî¤·¤Ê¤¤²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++.na
++\f2javac¥¬¥¤¥É\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javac/index.html
++.TP 2
++o
++java(1) \- Java¥¢¥×¥ê¥±¡¼¥·¥ç¥óµ¯Æ°¥Ä¡¼¥ë
++.TP 2
++o
++jdb(1) \- Java¥Ç¥Ð¥Ã¥¬
++.TP 2
++o
++javah(1) \- C¥Ø¥Ã¥À¡¼¤È¥¹¥¿¥Ö¡¦¥Õ¥¡¥¤¥ë¡¦¥¸¥§¥Í¥ì¡¼¥¿
++.TP 2
++o
++javap(1) \- ¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ëµÕ¥¢¥»¥ó¥Ö¥é
++.TP 2
++o
++javadoc(1) \- API¥É¥­¥å¥á¥ó¥È¡¦¥¸¥§¥Í¥ì¡¼¥¿
++.TP 2
++o
++jar(1) \- JAR¥¢¡¼¥«¥¤¥Ö¡¦¥Ä¡¼¥ë
++.TP 2
++o
++.na
++\f2Java³ÈÄ¥µ¡Ç½¥Õ¥ì¡¼¥à¥ï¡¼¥¯\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/javadoc.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/javadoc.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,4 +19,4179 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH javadoc 1 "07 May 2011"
++.TH javadoc 1 "05 Jul 2012"
++.SH "̾Á°"
++javadoc \- Java API¥É¥­¥å¥á¥ó¥È¡¦¥¸¥§¥Í¥ì¡¼¥¿
++.LP
++Java¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤«¤é¡¢API¥É¥­¥å¥á¥ó¥È¤ÎHTML¥Ú¡¼¥¸¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ç¾Ò²ð¤µ¤ì¤Æ¤¤¤ëJavadoc¤ÎÎã¤Ï¡¢Solaris¤ò»ÈÍѤ·¤¿¾ì¹ç¤Î¤â¤Î¤Ç¤¹¡£
++.SH "·Á¼°"
++.LP
++\f4javadoc\fP\f2\ [\ \fP\f2options\fP\f2\ ]\ [\ packagenames\ ]\ [\ sourcefilenames\ ]\ [\ \-subpackages\fP\ \f2pkg1:pkg2:...\fP\f2\ ]\ [\ \fP\f2@argfiles\fP\f2\ ]\fP
++.LP
++°ú¿ô¤ò»ØÄꤹ¤ë½ç½ø¤ÏǤ°Õ¤Ç¤¹¡£Javadoc¥Ä¡¼¥ë¤Ç¤Î¡¢½èÍýÂоݤÎ\f2.java\fP¥Õ¥¡¥¤¥ë¤ò·èÄꤹ¤ëÊýË¡¤Î¾ÜºÙ¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î½èÍý¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RS 3
++.TP 3
++options
++¤³¤Î¥É¥­¥å¥á¥ó¥È¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£Javadoc¥ª¥×¥·¥ç¥ó¤Îɸ½àŪ¤Ê»ÈÍÑÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢»ÈÍÑÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++packagenames
++¶õÇòʸ»ú¤Ç¶èÀÚ¤é¤ì¤¿°ìÏ¢¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2java.lang\ java.lang.reflect\ java.awt\fP¤Î¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¸ÄÊ̤˻ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥ï¥¤¥ë¥É¥«¡¼¥É¤Ï»ÈÍÑÉԲĤǤ¹¡£ºÆµ¢Åª½èÍý¤Î¤¿¤á¤Ë¤Ï¡¢\-subpackages¤ò»ÈÍѤ·¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢\f2\-sourcepath\fP¤ò»ÈÍѤ·¤Æ¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò¸¡º÷¤·¤Þ¤¹¡£Îã \- 1¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥­¥å¥á¥ó¥È²½¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++sourcefilenames
++¶õÇòʸ»ú¤Ç¶èÀÚ¤é¤ì¤¿°ìÏ¢¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£³Æ¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥¹¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯(*)¤Ê¤É¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤¬¡Ö.java¡×¤È¤¤¤¦³ÈÄ¥»Ò¤Ç½ª¤ï¤ê¡¢¤½¤Î³ÈÄ¥»Ò¤ò½ü¤¤¤¿Ì¾Á°¤¬¼ÂºÝ¤ËÍ­¸ú¤Ê¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹(Java¸À¸ì»ÅÍͤò»²¾È)¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Ï¥¤¥Õ¥ó¤ò´Þ¤à̾Á°(\f2X\-Buffer\fP¤Ê¤É)¤ä¡¢¤½¤Î¾¤Î̵¸ú¤Êʸ»ú¤ò´Þ¤à̾Á°¤òÉÕ¤±¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¥É¥­¥å¥á¥ó¥È²½¤ÎÂоݤ«¤é½ü³°¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ä¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤Î¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ÎÁ°¤Ë»ØÄꤷ¤¿¥Ñ¥¹¤Ë¤è¤Ã¤Æ¡¢javadoc¤¬¤½¤Î¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¾ì½ê¤¬·è¤Þ¤ê¤Þ¤¹¡£(Javadoc¥Ä¡¼¥ë¤Ï¡¢¤³¤ì¤é¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò¸¡º÷¤¹¤ë¤È¤­¤Ë\f2\-sourcepath\fP¤ò»ÈÍÑ\f2¤·¤Þ¤»¤ó\fP¡£)ÁêÂХѥ¹¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òµ¯ÅÀ¤È¤¹¤ë¤¿¤á¡¢\f2Button.java\fP¤òÅϤ¹¤³¤È¤Ï¡¢\f2./Button.java\fP¤òÅϤ¹¤³¤È¤ÈƱ¤¸¤Ç¤¹¡£¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò¥ï¥¤¥ë¥É¥«¡¼¥É¤ò´Þ¤à¥Õ¥ë¥Ñ¥¹¤Ç»ØÄꤹ¤ë¤È¡¢\f2/home/src/java/awt/Graphics*.java\fP¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£Îã \- 1¤Ä°Ê¾å¤Î¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥È²½¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢Îã \- ¥Ñ¥Ã¥±¡¼¥¸¤È¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥È²½¤Î¤è¤¦¤Ë¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤òº®ºß¤µ¤»¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.TP 3
++\-subpackages pkg1:pkg2:...
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤«¤é»ØÄꤵ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ª¤è¤Ó¤½¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸Æâ¤ËºÆµ¢Åª¤Ë¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Þ¤¿¤Ï¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
++.TP 3
++@argfiles
++Javadoc¥ª¥×¥·¥ç¥ó¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¡¢¤ª¤è¤Ó¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤òǤ°Õ¤Î½ç½ø¤Çʤ٤¿¥ê¥¹¥È¤¬´Þ¤Þ¤ì¤ë1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç¤Ï¡¢¥ï¥¤¥ë¥É¥«¡¼¥É(*)¤ª¤è¤Ó\f2\-J\fP¥ª¥×¥·¥ç¥ó¤Ï»ØÄê¤Ç¤­¤Þ¤»¤ó¡£
++.RE
++.SH "ÀâÌÀ"
++.LP
++\f3Javadoc\fP¥Ä¡¼¥ë¤Ï¡¢°ìÏ¢¤ÎJava¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë¤¢¤ëÀë¸À¤ª¤è¤Ó¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò²òÀϤ·¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ïpublic¥¯¥é¥¹¡¢protected¥¯¥é¥¹¡¢¥Í¥¹¥È¤µ¤ì¤¿¥¯¥é¥¹(ƿ̾¤ÎÆâÉô¥¯¥é¥¹¤Ï½ü¤¯)¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¤ª¤è¤Ó¥Õ¥£¡¼¥ë¥É¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤¿°ìÏ¢¤ÎHTML¥Ú¡¼¥¸¤òÀ¸À®¤·¤Þ¤¹¡£¤Þ¤¿¡¢API(¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥×¥í¥°¥é¥ß¥ó¥°¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹)¥É¥­¥å¥á¥ó¥È¤ÎÀ¸À®¤ä¡¢°ìÏ¢¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¼ÂÁõ¥É¥­¥å¥á¥ó¥È¤ÎÀ¸À®¤Ë»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸Á´ÂΡ¢¸Ä¡¹¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¡¢¤Þ¤¿¤Ï¤½¤ÎξÊý¤ËÂФ·¤Æ¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸Á´ÂΤΥɥ­¥å¥á¥ó¥È²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\f2\-subpackages\fP¤ò»ÈÍѤ·¤ÆºÇ¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¤«¤é²¼Êý¤ËºÆµ¢Åª¤Ë¤¿¤É¤ë¤«¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÎÌÀ¼¨Åª¤Ê¥ê¥¹¥È¤òÅϤ·¤Þ¤¹¡£¸Ä¡¹¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥É¥­¥å¥á¥ó¥È²½¤ò¹Ô¤¦¤Ë¤Ï¡¢¥½¡¼¥¹(.\f2.java\fP)¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È¤òÅϤ·¤Þ¤¹¡£¶ñÂÎŪ¤ÊÎã¤Ï¡¢¤³¤Î¥É¥­¥å¥á¥ó¥È¤ÎºÇ¸å¤Ë¾Ò²ð¤·¤Þ¤¹¡£¼¡¤Ë¡¢Javadoc¤Ë¤è¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î½èÍý¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
++.SS
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î½èÍý
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢ËöÈø¤¬¡Ö\f2.java\fP¡×¤Î¥Õ¥¡¥¤¥ë°Ê³°¤Ë¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Çµ­½Ò¤µ¤ì¤Æ¤¤¤ë¾¤Î¥Õ¥¡¥¤¥ë¤â½èÍý¤·¤Þ¤¹¡£¸Ä¡¹¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤òÌÀ¼¨Åª¤ËÅϤ·¤ÆJavadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¾ì¹ç¡¢¤É¤Î\f2.java\fP¥Õ¥¡¥¤¥ë¤ò½èÍý¤¹¤ë¤«¤òÀµ³Î¤Ë»ØÄê¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢Â¿¤¯¤Î³«È¯¼Ô¤Ï¤³¤ÎÊýË¡¤Ç¤Ïºî¶È¤·¤Þ¤»¤ó¡£¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÅϤ¹¤Û¤¦¤¬´Êñ¤À¤«¤é¤Ç¤¹¡£¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤òÌÀ¼¨Åª¤Ë»ØÄꤷ¤Ê¤¯¤Æ¤â¡¢Javadoc¥Ä¡¼¥ë¤Ï3¤Ä¤ÎÊýË¡¤Ç¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¤½¤ì¤Ï¡¢(1)¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÅϤ¹¡¢(2)\f2\-subpackages\fP¤ò»ÈÍѤ¹¤ë¡¢(3)¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Ç¥ï¥¤¥ë¥É¥«¡¼¥É¤ò»ÈÍѤ¹¤ë(\f2*.java\fP)¡¢¤È¤¤¤¦ÊýË¡¤Ç¤¹¡£¤³¤ì¤é¤Î¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤¬\f2.java\fP¥Õ¥¡¥¤¥ë¤Î½èÍý¤ò¹Ô¤¦¤Î¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤¬¼¡¤Î¤¹¤Ù¤Æ¤ÎÍ×·ï¤òËþ¤¿¤¹¾ì¹ç¤Î¤ß¤Ç¤¹¡£
++.RS 3
++.TP 2
++o
++ÀÜÈø¼­¡Ö\f2.java\fP¡×¤ò½ü¤¤¤¿Ì¾Á°¤¬¼ÂºÝ¤ËÍ­¸ú¤Ê¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¾ì¹ç(Í­¸ú¤Êʸ»ú¤Ë¤Ä¤¤¤Æ¤Ï¡¢Java¸À¸ì»ÅÍͤò»²¾È)
++.TP 2
++o
++¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤Î¥ë¡¼¥È¤«¤éÁêÂÐŪ¤Ê¥Ç¥£¥ì¥¯¥È¥ê¡¦¥Ñ¥¹¤¬¡¢¶èÀÚ¤êʸ»ú¤ò¥É¥Ã¥È¤ËÊÑ´¹¤¹¤ë¤È¡¢¼ÂºÝ¤ËÍ­¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤¢¤ë¾ì¹ç
++.TP 2
++o
++packageʸ¤ËÍ­¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾(Á°²Õ¾ò½ñ¤­¤Ç»ØÄê)¤¬´Þ¤Þ¤ì¤ë¾ì¹ç
++.RE
++.LP
++\f3¥ê¥ó¥¯¤Î½èÍý\fP \- Javadoc¥Ä¡¼¥ë¤Ï¡¢½èÍý¤Î¼Â¹ÔÃæ¤Ë¡¢¤½¤Î¼Â¹Ô¤Ç¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤ª¤è¤Ó¥á¥ó¥Ð¡¼¤Î̾Á°¤ËÂФ·¤Æ¡¢¼«Æ°Åª¤ËÁê¸ß»²¾È¥ê¥ó¥¯¤òÄɲä·¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê¥ê¥ó¥¯¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¾ì½ê¤ËÄɲ䵤ì¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++Àë¸À(Ìá¤êÃͤη¿¡¢°ú¿ô¤Î·¿¡¢¥Õ¥£¡¼¥ë¥É¤Î·¿)
++.TP 2
++o
++\f2@see\fP¥¿¥°¤«¤éÀ¸À®¤µ¤ì¤¿¡Ö´ØÏ¢¹àÌܡץ»¥¯¥·¥ç¥ó
++.TP 2
++o
++\f2{@link}\fP¥¿¥°¤«¤éÀ¸À®¤µ¤ì¤¿¥¤¥ó¥é¥¤¥ó¡¦¥Æ¥­¥¹¥È
++.TP 2
++o
++\f2@throws\fP¥¿¥°¤«¤éÀ¸À®¤µ¤ì¤¿Îã³°¤Î̾Á°
++.TP 2
++o
++¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥á¥ó¥Ð¡¼¤ËÂФ¹¤ë¡ÖÄêµÁ¡×¥ê¥ó¥¯¤È¡¢¥¯¥é¥¹¤Î¥á¥ó¥Ð¡¼¤ËÂФ¹¤ë¡Ö¥ª¡¼¥Ð¡¼¥é¥¤¥É¡×¥ê¥ó¥¯
++.TP 2
++o
++¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤ª¤è¤Ó¥á¥ó¥Ð¡¼¤ò¥ê¥¹¥È¤·¤Æ¤¤¤ë³µÍ×ɽ
++.TP 2
++o
++¥Ñ¥Ã¥±¡¼¥¸¤ª¤è¤Ó¥¯¥é¥¹¤Î·Ñ¾µ¥Ä¥ê¡¼
++.TP 2
++o
++º÷°ú
++.RE
++.LP
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤«¤Ã¤¿¥¯¥é¥¹¤Ë¤Ä¤¤¤Æ¤Î´û¸¤Î¥Æ¥­¥¹¥È(Ê̤ËÀ¸À®¤·¤¿¥Æ¥­¥¹¥È)¤ËÂФ·¤Æ¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤òÄɲ乤ë¤Ë¤Ï¡¢\f2\-link\fP¤ª¤è¤Ó\f2\-linkoffline\fP¥ª¥×¥·¥ç¥ó¤òÍøÍѤǤ­¤Þ¤¹¡£
++.LP
++\f3¤½¤Î¾¤Î½èÍý¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ\fP \- Javadoc¥Ä¡¼¥ë¤Ï¡¢¼Â¹Ô¤¹¤ë¤¿¤Ó¤Ë1¤Ä¤Î´°Á´¤Ê¥É¥­¥å¥á¥ó¥È¤òºîÀ®¤·¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥È¤òÄɲÃÀ¸À®¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤Ä¤Þ¤ê¡¢Javadoc¥Ä¡¼¥ë¤Î°ÊÁ°¤Î¼Â¹Ô·ë²Ì¤ò½¤Àµ¤·¤¿¤ê¡¢¤½¤ÎÆâÍƤò\f2ľÀÜ\fPÁȤßÆþ¤ì¤¿¤ê¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤¿¤À¤·¡¢Á°½Ò¤Î¤è¤¦¤Ë¡¢Â¾¤Î¼Â¹Ô·ë²Ì¤Ë¥ê¥ó¥¯¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤¹¡£
++.LP
++¼ÂÁõ¾å¤ÎÍýͳ¤«¤é¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¥¸¥ç¥Ö¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Ëjava¥³¥ó¥Ñ¥¤¥é¤òɬÍפȤ·¡¢java¥³¥ó¥Ñ¥¤¥é¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢\f2javac\fP¤Î°ìÉô¤ò¸Æ¤Ó½Ð¤·¤ÆÀë¸À¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¤¬¡¢¥á¥ó¥Ð¡¼¤Î¼ÂÁõ¤Ï̵»ë¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥¯¥é¥¹³¬Áؤò´Þ¤à¥¯¥é¥¹¤ÎË­ÉÙ¤ÊÆâÉôɽ¸½¤È¥¯¥é¥¹¤Î¡Ö»ÈÍѡ״ط¸¤ò¹½ÃÛ¤·¡¢¤½¤Î¾ðÊ󤫤éHTML¤òÀ¸À®¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¥½¡¼¥¹¡¦¥³¡¼¥É¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤«¤é¡¢¥æ¡¼¥¶¡¼¤ÎÄ󶡤·¤¿¥É¥­¥å¥á¥ó¥È¤â¼èÆÀ¤·¤Þ¤¹¡£
++.LP
++¼ÂºÝ¤Ë¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¥á¥½¥Ã¥ÉËÜÂΤò»ý¤¿¤Ê¤¤½ã¿è¤Ê¥¹¥¿¥Ö¡¦¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë\f2.java\fP¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤â¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢API¤ÎºîÀ®»þ¤Ë¤Ï¡¢¼ÂÁõ¤òµ­½Ò¤¹¤ëÁ°¤ÎÀ߷פÎÁᤤÃʳ¬¤Ç¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤òµ­½Ò¤·¤Æjavadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
++.LP
++¥³¥ó¥Ñ¥¤¥é¤Ë°Í¸¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢HTML½ÐÎϤϡ¢¼ÂºÝ¤Î¼ÂÁõ¤ËÀµ³Î¤ËÂбþ¤·¤Þ¤¹¡£¼ÂºÝ¤Î¼ÂÁõ¤Ï¡¢ÌÀ¼¨Åª¤Ê¥½¡¼¥¹¡¦¥³¡¼¥É¤Ë¤Ç¤Ï¤Ê¤¯¡¢°ÅÌۤΥ½¡¼¥¹¡¦¥³¡¼¥É¤Ë°Í¸¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢\f2.class\fP¥Õ¥¡¥¤¥ë¤Ë¤Ï¸ºß¤¹¤ë¤¬¥½¡¼¥¹¡¦¥³¡¼¥É¤Ë¤Ï¸ºß¤·¤Ê¤¤¥Ç¥Õ¥©¥ë¥È¡¦¥³¥ó¥¹¥È¥é¥¯¥¿(Java¸À¸ì»ÅÍͤò»²¾È)¤ò¥É¥­¥å¥á¥ó¥È²½¤·¤Þ¤¹¡£
++.LP
++Ä̾Javadoc¥Ä¡¼¥ë¤Ç¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥³¡¼¥É¤¬ÉÔ´°Á´¤Þ¤¿¤Ï¥¨¥é¡¼¤ò´Þ¤ó¤Ç¤¤¤ë¾ì¹ç¤Ç¤â¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤Ç¤­¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢¥Ç¥Ð¥Ã¥°¤ä¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¤ò´°Î»¤¹¤ëÁ°¤Ë¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2Java¸À¸ì»ÅÍÍ\fP¤Ë¤è¤ë¤È¡¢Ãê¾Ý¥á¥½¥Ã¥É¤ò´Þ¤à¥¯¥é¥¹¤Ï¡¢¤½¤ì¼«ÂΤòÃê¾Ý¤È¤·¤ÆÀë¸À¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£javac¥³¥ó¥Ñ¥¤¥é¤Ï¤³¤Î¥¨¥é¡¼¤ò¸¡½Ð¤¹¤ë¤ÈÄä»ß¤·¤Þ¤¹¤¬¡¢Javadoc¥Ä¡¼¥ë¤Ï¤³¤Î¥Á¥§¥Ã¥¯¤ò¹Ô¤ï¤º¡¢·Ù¹ð¤ò½Ð¤µ¤º¤Ë½èÍý¤ò³¹Ô¤·¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î´ðËÜŪ¤Ê¥Á¥§¥Ã¥¯¤ò¹Ô¤¤¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò¤è¤ê¾Ü¤·¤¯¥Á¥§¥Ã¥¯¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢DocCheck¥É¥Ã¥¯¥ì¥Ã¥È¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤ÎÆâÉô¹½Â¤¤ò¹½ÃÛ¤¹¤ëºÝ¡¢»²¾È¥¯¥é¥¹¤ò¤¹¤Ù¤Æ¥í¡¼¥É¤·¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¡¢³ÈÄ¥µ¡Ç½¡¢¤Þ¤¿¤Ï¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¤Ë¤«¤«¤ï¤é¤º¡¢¤¹¤Ù¤Æ¤Î»²¾È¥¯¥é¥¹¤ò¸¡º÷¤Ç¤­¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2¥¯¥é¥¹¤Î¸¡º÷ÊýË¡\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£Ä̾ºîÀ®¤¹¤ë¥¯¥é¥¹¤Ï¡¢³ÈÄ¥µ¡Ç½¤È¤·¤Æ¥í¡¼¥É¤¹¤ë¤«¡¢Javadoc¥Ä¡¼¥ë¤Î¥¯¥é¥¹¡¦¥Ñ¥¹Æâ¤ËÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
++.SS
++Javadoc¤Î¥É¥Ã¥¯¥ì¥Ã¥È
++.LP
++Javadoc¥Ä¡¼¥ë¤Î½ÐÎϤÎÆâÍƤȷÁ¼°¤Ï¡¢¥É¥Ã¥¯¥ì¥Ã¥È¤ò»ÈÍѤ·¤Æ¥«¥¹¥¿¥Þ¥¤¥º¤Ç¤­¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ë¤Ï¡¢É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤È¸Æ¤Ð¤ì¤ë¥Ç¥Õ¥©¥ë¥È¤Î¡ÖÁȹþ¤ß¡×¥É¥Ã¥¯¥ì¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¡£É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤Ï¡¢HTML·Á¼°¤ÎAPI¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤ò½¤Àµ¤Þ¤¿¤Ï¥µ¥Ö¥¯¥é¥¹²½¤¹¤ë¤³¤È¤ä¡¢HTML¡¢XML¡¢MIF¡¢RTF¤Ê¤É¤Î¹¥¤ß¤Î½ÐÎÏ·Á¼°¤òÀ¸À®¤¹¤ëÆȼ«¤Î¥É¥Ã¥¯¥ì¥Ã¥È¤òµ­½Ò¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¥É¥Ã¥¯¥ì¥Ã¥È¤È¤½¤Î»ÈÍÑÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢¼¡¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RS 3
++.TP 2
++o
++.na
++\f2Javadoc¤Î¥É¥Ã¥¯¥ì¥Ã¥È\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html
++.TP 2
++o
++\f2\-doclet\fP¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó
++.RE
++.LP
++\f2\-doclet\fP¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ç¥«¥¹¥¿¥à¡¦¥É¥Ã¥¯¥ì¥Ã¥È¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Îɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤ò»ÈÍѤ·¤Þ¤¹¡£javadoc¥Ä¡¼¥ë¤Ë¤Ï¡¢»ÈÍѤµ¤ì¤Æ¤¤¤ë¥É¥Ã¥¯¥ì¥Ã¥È¤Ë´Ø·¸¤Ê¤¯»ÈÍѤǤ­¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤Ç¤Ï¡¢¤³¤ì¤é¤Î¾¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤¬Äɲ䵤ì¤Þ¤¹¡£¤É¤Á¤é¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤â¡¢¸å½Ò¤Î¥ª¥×¥·¥ç¥ó¤ÇÀâÌÀ¤·¤Þ¤¹¡£
++.SS
++´ØÏ¢¥É¥­¥å¥á¥ó¥È¤ª¤è¤Ó¥É¥Ã¥¯¥ì¥Ã¥È
++.RS 3
++.TP 2
++o
++.na
++\f2Javadoc¤Ë»Ü¤µ¤ì¤¿³ÈÄ¥µ¡Ç½\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html \- Javadoc¤ÇÄɲ䵤줿²þÎÉÅÀ¤Î¾ÜºÙ¡£
++.TP 2
++o
++.na
++\f2Javadoc FAQ\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137483.html \- ÉÑÈˤ˴󤻤é¤ì¤ë¼ÁÌä¤ËÂФ¹¤ë²óÅú¡¢Javadoc´ØÏ¢¤Î¥Ä¡¼¥ë¤Ë¤Ä¤¤¤Æ¤Î¾ðÊ󡢤ª¤è¤Ó¥Ð¥°¤Î²óÈòÊýË¡¡£
++.TP 2
++o
++.na
++\f2How to Write Doc Comments for Javadoc\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html \- ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Îµ­½ÒÊýË¡¤Ë´Ø¤¹¤ëSun¤Îµ¬Ìó¡£
++.TP 2
++o
++.na
++\f2API»ÅÍͤòµ­½Ò¤¹¤ë¤¿¤á¤ÎÍ×·ï\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-142372.html \- Java SE¥×¥é¥Ã¥È¥Õ¥©¡¼¥à»ÅÍͤòµ­½Ò¤¹¤ëºÝ¤Ë»ÈÍѤµ¤ì¤¿É¸½àÍ×·ï¡£¤³¤Î¾ðÊó¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È·Á¼°¤ÇAPI»ÅÍͤòµ­½Ò¤¹¤ë¾ì¹ç¤Ë¤â¡¢¤½¤Î¾¤Î·Á¼°¤Çµ­½Ò¤¹¤ë¾ì¹ç¤Ë¤âÌòΩ¤Á¤Þ¤¹¡£¸¡¾Ú²Äǽ¤Ê¥¢¥µ¡¼¥·¥ç¥ó¤òËþ¤¿¤¹¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥Õ¥£¡¼¥ë¥É¡¢¤ª¤è¤Ó¥á¥½¥Ã¥É¤Ë¤Ä¤¤¤Æ¤ÎÍ×·ï¤òÄê¤á¤Æ¤¤¤Þ¤¹¡£
++.TP 2
++o
++.na
++\f2¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î»ÅÍÍ\fP @
++.fi
++http://docs.oracle.com/javase/specs/ \- ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î¥ª¥ê¥¸¥Ê¥ë»ÅÍͤˤĤ¤¤Æ¤Ï¡¢\f2Java Language Specification\fP (James Gosling¡¢Bill Joy¡¢Guy Steele¶¦Ãø)¤Î½éÈǤÎÂè18¾Ï¡¢Documentation Comments¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£(¤³¤Î¾Ï¤Ï¡¢Âè2ÈǤǤϺï½ü¤µ¤ì¤Þ¤·¤¿¡£)
++.TP 2
++o
++.na
++\f2DocCheck¥É¥Ã¥¯¥ì¥Ã¥È\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-141437.html \- ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò¥Á¥§¥Ã¥¯¤·¡¢¸¡½Ð¤µ¤ì¤¿¥¨¥é¡¼¤äÉÔÀµ¤Î¥ì¥Ý¡¼¥È¤òÀ¸À®¤·¤Þ¤¹¡£Doc Check¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Î°ìÉô¤Ç¤¹¡£
++.RE
++.SS
++ÍѸì
++.LP
++\f2¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È\fP¡¢\f2doc¥³¥á¥ó¥È\fP¡¢\f2¼çÀâÌÀ\fP¡¢\f2¥¿¥°\fP¡¢\f2¥Ö¥í¥Ã¥¯¡¦¥¿¥°\fP¡¢¤ª¤è¤Ó\f2¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°\fP¤ÎÍѸì¤Ë¤Ä¤¤¤Æ¤Ï¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ÇÀâÌÀ¤·¤Þ¤¹¡£¼¡¤Î¤½¤Î¾¤ÎÍѸì¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Î¥³¥ó¥Æ¥­¥¹¥È¤ÇÆÃÄê¤Î°ÕÌ£¤ò»ý¤Á¤Þ¤¹¡£
++.RS 3
++.TP 3
++À¸À®¥É¥­¥å¥á¥ó¥È(generated document)
++Javadoc¥Ä¡¼¥ë¤¬Java¥½¡¼¥¹¡¦¥³¡¼¥ÉÆâ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤«¤éÀ¸À®¤·¤¿¥É¥­¥å¥á¥ó¥È¤Î¤³¤È¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤ÎÀ¸À®¥É¥­¥å¥á¥ó¥È¤ÏHTML·Á¼°¤Ç¡¢É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤Þ¤¹¡£
++.LP
++.TP 3
++̾Á°(name)
++Java¸À¸ì¤Ç½ñ¤«¤ì¤¿¥×¥í¥°¥é¥àÍ×ÁǤÎ̾Á°¡¢¤Ä¤Þ¤ê¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥Õ¥£¡¼¥ë¥É¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¤Þ¤¿¤Ï¥á¥½¥Ã¥É¤Î̾Á°¤Î¤³¤È¤Ç¤¹¡£Ì¾Á°¤Ï¡¢\f2java.lang.String.equals(java.lang.Object)\fP¤Î¤è¤¦¤Ê´°Á´½¤¾þ̾¤Ë¤¹¤ë¤³¤È¤â¡¢\f2equals(Object)\fP¤Î¤è¤¦¤ÊÉôʬ½¤¾þ̾¤Ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.LP
++.TP 3
++¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹(documented classes)
++Javadoc¤Î¼Â¹Ô¤Ë¤è¤Ã¤Æ¾ÜºÙ¤Ê¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¤ë¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¤³¤È¤Ç¤¹¡£¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¤Ë¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬»ÈÍѲÄǽ¤Ç¤¢¤ê¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òjavadoc¥³¥Þ¥ó¥É¤ËÅϤ¹É¬Íפ¬¤¢¤ê¡¢¥¢¥¯¥»¥¹½¤¾þ»Ò(public¡¢protected¡¢package\-private¤Þ¤¿¤Ïprivate)¤Ë¤è¤Ã¤Æ¥Õ¥£¥ë¥¿½èÍý¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤Ï¡¢javadoc¥Ä¡¼¥ë¤Î½ÐÎϤËÁȤ߹þ¤Þ¤ì¤ë¥¯¥é¥¹¡¢¤Ä¤Þ¤ê\f2Êñ´Þ¥¯¥é¥¹\fP¤È¤â¸Æ¤Ð¤ì¤Þ¤¹¡£
++.LP
++.TP 3
++Êñ´Þ¥¯¥é¥¹(included classes)
++Javadoc¥Ä¡¼¥ë¤Î¼Â¹Ô¤Ë¤è¤Ã¤Æ¾ÜºÙ¤Ê¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¤ë¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¤³¤È¤Ç¤¹¡£\f2¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹\fP¤ÈƱ¤¸¤Ç¤¹¡£
++.LP
++.TP 3
++½ü³°¥¯¥é¥¹(excluded classes)
++Javadoc¥Ä¡¼¥ë¤Î¼Â¹Ô¤Ë¤è¤Ã¤Æ¾ÜºÙ¤Ê¥É¥­¥å¥á¥ó¥È¤¬À¸À®\f2¤µ¤ì¤Ê¤¤\fP¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¤³¤È¤Ç¤¹¡£
++.LP
++.TP 3
++»²¾È¥¯¥é¥¹(referenced classes)
++¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎÄêµÁ(¼ÂÁõ)¤Þ¤¿¤Ï¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ÎÃæ¤ÇÌÀ¼¨Åª¤Ë»²¾È¤µ¤ì¤Æ¤¤¤ë¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¤³¤È¤Ç¤¹¡£»²¾È¤ÎÎã¤È¤·¤Æ¤Ï¡¢Ìá¤êÃͤη¿¡¢¥Ñ¥é¥á¡¼¥¿¤Î·¿¡¢¥­¥ã¥¹¥È¤Î·¿¡¢³ÈÄ¥¤µ¤ì¤¿¥¯¥é¥¹¡¢¼ÂÁõ¤µ¤ì¤¿¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¥¯¥é¥¹¡¢¥á¥½¥Ã¥ÉËÜÂΤǻÈÍѤµ¤ì¤ë¥¯¥é¥¹¡¢@see¡¢{@link}¡¢{@linkplain}¡¢{@inheritDoc}¥¿¥°¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£(¤³¤ÎÄêµÁ¤Ï
++.na
++\f21.3\fP @
++.fi
++http://docs.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses¤«¤éÊѹ¹¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£)Javadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ï¡¢Javadoc¤Î¥Ö¡¼¥È¡¦¥¯¥é¥¹¥Ñ¥¹¤ª¤è¤Ó¥¯¥é¥¹¥Ñ¥¹Æâ¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î»²¾È¥¯¥é¥¹¤ò¥á¥â¥ê¡¼¤Ë¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£(»²¾È¥¯¥é¥¹¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¡Ö¥¯¥é¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡×¤È¤¤¤¦·Ù¹ð¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£)Javadoc¥Ä¡¼¥ë¤Ï¡¢¥¯¥é¥¹¤Î¸ºß¤È¤½¤Î¥á¥ó¥Ð¡¼¤Î´°Á´½¤¾þ̾¤òȽÊ̤¹¤ë¤Î¤ËɬÍ×½½Ê¬¤Ê¾ðÊó¤ò¡¢.class¥Õ¥¡¥¤¥ë¤«¤é°ú¤­½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++.TP 3
++³°Éô»²¾È¥¯¥é¥¹(external referenced classes)
++»²¾È¥¯¥é¥¹¤Î¤¦¤Á¡¢Javadoc¤Î¼Â¹ÔÃæ¤Ë¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¤Ê¤¤¥¯¥é¥¹¤Î¤³¤È¤Ç¤¹¡£¤Ä¤Þ¤ê¡¢¤³¤ì¤é¤Î¥¯¥é¥¹¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇJavadoc¥Ä¡¼¥ë¤ËÅϤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£À¸À®¥É¥­¥å¥á¥ó¥ÈÆâ¤Ç¤³¤ì¤é¤Î¥¯¥é¥¹¤Ë¥ê¥ó¥¯¤·¤Æ¤¤¤ë²Õ½ê¤Ï¡¢\f2³°Éô»²¾È\fP¤Þ¤¿¤Ï\f2³°Éô¥ê¥ó¥¯\fP¤È¸Æ¤Ð¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2java.awt\fP¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¤Æ¤Î¤ßJavadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤·¤¿¾ì¹ç¡¢\f2Object\fP¤Ê¤É¤Î\f2java.lang\fPÆâ¤Î¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤¬³°Éô»²¾È¥¯¥é¥¹¤Ë¤Ê¤ê¤Þ¤¹¡£³°Éô»²¾È¥¯¥é¥¹¤Ë¥ê¥ó¥¯¤¹¤ë¤Ë¤Ï¡¢\f2\-link\fP¤ª¤è¤Ó\f2\-linkoffline\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£³°Éô»²¾È¥¯¥é¥¹¤Ë¤Ï¡¢Ä̾綠¤Î¥½¡¼¥¹¡¦¥³¥á¥ó¥È¤òJavadoc¥Ä¡¼¥ë¤Î¼Â¹Ô¤ÇÍøÍѤǤ­¤Ê¤¤¤È¤¤¤¦½ÅÍפÊÆÃħ¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¤½¤ì¤é¤Î¥³¥á¥ó¥È¤ò·Ñ¾µ¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
++.RE
++.SH "¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë"
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢4¤Ä¤Î¥¿¥¤¥×¤Î°Û¤Ê¤ë¡Ö¥½¡¼¥¹¡×¥Õ¥¡¥¤¥ë¤«¤é½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡£¤½¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥¯¥é¥¹¤ÎJava¸À¸ì¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë(\f2.java\fP)¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¡¢³µÍ×¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¡¢¤ª¤è¤Ó¤½¤Î¾¤Î̤½èÍý¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹¡£¤³¤³¤Ç¤Ï¡¢¥É¥­¥å¥á¥ó¥È²½¤·¤Ê¤¤¤¬¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤Ë¸ºß¤¹¤ë¾ì¹ç¤¬¤¢¤ë¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ä¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¤âÀâÌÀ¤·¤Þ¤¹¡£
++.SS
++¥¯¥é¥¹¡¦¥½¡¼¥¹¡¦¥³¡¼¥É¡¦¥Õ¥¡¥¤¥ë
++.LP
++¤½¤ì¤¾¤ì¤Î¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¤ª¤è¤Ó¤½¤Î¥á¥ó¥Ð¡¼¤Ï¡¢Æȼ«¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò»ý¤Ä¤³¤È¤¬¤Ç¤­¡¢¤½¤ì¤ò\f2.java\fP¥Õ¥¡¥¤¥ëÆâ¤ËÊÝ»ý¤·¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î¾ÜºÙ¤Ï¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.SS
++¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë
++.LP
++¤½¤ì¤¾¤ì¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢Æȼ«¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò»ý¤Ä¤³¤È¤¬¤Ç¤­¡¢¤½¤ì¤òÀìÍѤΡ֥½¡¼¥¹¡×¥Õ¥¡¥¤¥ë¤ËÊÝ»ý¤·¤Þ¤¹¡£¤½¤ÎÆâÍƤϡ¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î³µÍ×¥Ú¡¼¥¸¤ËÁȤ߹þ¤Þ¤ì¤Þ¤¹¡£¤³¤Î¥³¥á¥ó¥È¤Ë¤Ï¡¢Ä̾¤½¤Î¥Ñ¥Ã¥±¡¼¥¸Á´ÂΤËÅö¤Æ¤Ï¤Þ¤ë¥É¥­¥å¥á¥ó¥È¤òµ­½Ò¤·¤Þ¤¹¡£
++.LP
++¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¾ì¹ç¡¢¥³¥á¥ó¥È¤Î³ÊǼÀè¤È¤·¤Æ¡¢¼¡¤Î2¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¤¤¤º¤ì¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f2package\-info.java\fP \- ¥Ñ¥Ã¥±¡¼¥¸Àë¸À¡¢¥Ñ¥Ã¥±¡¼¥¸Ãí¼á¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¢¤ª¤è¤ÓJavadoc¥¿¥°¤ò³ÊǼ¤Ç¤­¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï°ìÈ̤ˡ¢package.html¤è¤ê¤â¿ä¾©¤µ¤ì¤Þ¤¹¡£
++.TP 2
++o
++\f2package.html\fP \- ³ÊǼ¤Ç¤­¤ë¤Î¤Ï¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¤ÈJavadoc¥¿¥°¤Î¤ß¤Ç¤¹¡£¥Ñ¥Ã¥±¡¼¥¸Ãí¼á¤Ï³ÊǼ¤Ç¤­¤Þ¤»¤ó¡£
++.RE
++.LP
++³Æ¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢\f2package.html\fP¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï\f2package\-info.java\fP¥Õ¥¡¥¤¥ë¤Î¤¤¤º¤ì¤«¤ò1¤Ä»ý¤Ä¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢¤½¤ÎξÊý¤ò»ý¤Ä¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤Î¤É¤Á¤é¤«¤Î¥Õ¥¡¥¤¥ë¤ò\f2.java\fP¥Õ¥¡¥¤¥ë¤È¤È¤â¤Ë¡¢¥½¡¼¥¹¡¦¥Ä¥ê¡¼Æâ¤Î¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤ËÇÛÃÖ¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++\f4package\-info.java\fP \- ¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¼¡¤Î¹½Â¤¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¤ò³ÊǼ¤Ç¤­¤Þ¤¹¡£¥³¥á¥ó¥È¤Ï¥Ñ¥Ã¥±¡¼¥¸Àë¸À¤ÎÁ°¤ËÇÛÃÖ¤·¤Þ¤¹¡£
++.LP
++¥Õ¥¡¥¤¥ë: \f2java/applet/package\-info.java\fP
++.nf
++\f3
++.fl
++/**
++.fl
++ * Provides the classes necessary to create an
++.fl
++ * applet and the classes an applet uses
++.fl
++ * to communicate with its applet context.
++.fl
++ * <p>
++.fl
++ * The applet framework involves two entities:
++.fl
++ * the applet and the applet context.
++.fl
++ * An applet is an embeddable window (see the
++.fl
++ * {@link java.awt.Panel} class) with a few extra
++.fl
++ * methods that the applet context can use to
++.fl
++ * initialize, start, and stop the applet.
++.fl
++ *
++.fl
++ * @since 1.0
++.fl
++ * @see java.awt
++.fl
++ */
++.fl
++package java.lang.applet;
++.fl
++\fP
++.fi
++.LP
++¥³¥á¥ó¥È¶èÀÚ¤êʸ»ú¤Î\f2/**\fP¤È\f2*/\fP¤Ï¸ºß¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢Ãæ´Ö¹Ô¤Î¹ÔƬ¤Î¥¢¥¹¥¿¥ê¥¹¥¯¤Ï¾Êά¤·¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£
++.LP
++\f4package.html\fP \- ¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¼¡¤Î¹½Â¤¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¤ò³ÊǼ¤Ç¤­¤Þ¤¹¡£¥³¥á¥ó¥È¤Ï\f2<body>\fPÍ×ÁÇÆâ¤ËÇÛÃÖ¤·¤Þ¤¹¡£
++.LP
++¥Õ¥¡¥¤¥ë: \f2java/applet/package.html\fP
++.nf
++\f3
++.fl
++<HTML>
++.fl
++<BODY>
++.fl
++Provides the classes necessary to create an applet and the
++.fl
++classes an applet uses to communicate with its applet context.
++.fl
++<p>
++.fl
++The applet framework involves two entities: the applet
++.fl
++and the applet context. An applet is an embeddable
++.fl
++window (see the {@link java.awt.Panel} class) with a
++.fl
++few extra methods that the applet context can use to
++.fl
++initialize, start, and stop the applet.
++.fl
++
++.fl
++@since 1.0
++.fl
++@see java.awt
++.fl
++</BODY>
++.fl
++</HTML>
++.fl
++\fP
++.fi
++.LP
++¤³¤ì¤Ïñ¤Ê¤ëÄ̾ï¤ÎHTML¥Õ¥¡¥¤¥ë¤Ç¤¢¤ê¡¢¥Ñ¥Ã¥±¡¼¥¸Àë¸À¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤ÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤ÎÆâÍƤϡ¢Â¾¤Î¤¹¤Ù¤Æ¤Î¥³¥á¥ó¥È¤ÈƱÍͤËHTML¤Çµ­½Ò¤·¤Þ¤¹¤¬¡¢Îã³°¤¬1¤Ä¤¢¤ê¤Þ¤¹¡£¤½¤ì¤Ï¡¢¤³¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ë¤Ï¡¢¥³¥á¥ó¥È¶èÀÚ¤êʸ»ú¤Ç¤¢¤ë\f2/**\fP¤È\f2*/\fP¡¢¤Þ¤¿¤Ï¹ÔƬ¤Î¥¢¥¹¥¿¥ê¥¹¥¯¤ò´Þ¤á¤Ê¤¤¡¢¤È¤¤¤¦ÅÀ¤Ç¤¹¡£¥³¥á¥ó¥È¤ò½ñ¤¯¾ì¹ç¤Ï¡¢ºÇ½é¤Îʸ¤ò¥Ñ¥Ã¥±¡¼¥¸¤Î³µÍפȤ·¡¢\f2<body>\fP¤ÈºÇ½é¤Îʸ¤Î´Ö¤Ë¥¿¥¤¥È¥ë¤ä¤½¤Î¾¤Î¥Æ¥­¥¹¥È¤ò´Þ¤á¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¡¦¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤¹¤¬¡¢Â¾¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ÈƱÍÍ¡¢¤¹¤Ù¤Æ¤Î¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤Ï¡¢¼çÀâÌÀ¤Î¸å¤ËÇÛÃÖ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2@see\fP¥¿¥°¤ò¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤ËÄɲ乤ë¾ì¹ç¤Ë¤Ï¡¢´°Á´½¤¾þ̾¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2package.html\fP¤ÎÎã @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#packagecomments¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++\f3¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤Î½èÍý\fP \- Javadoc¥Ä¡¼¥ë¤Ï¡¢¼Â¹Ô»þ¤Ë¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤ò¼«Æ°Åª¤Ë¸¡º÷¤·¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë¤È¼¡¤Î½èÍý¤ò¹Ô¤¤¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++½èÍý¤Ç¤­¤ë¤è¤¦¤Ë¥³¥á¥ó¥È¤ò¥³¥Ô¡¼¤·¤Þ¤¹¡£(\f2package.html\fP¤Î¾ì¹ç¤Ç¤¢¤ì¤Ð¡¢\f2<body>\fP¤È\f2</body>\fP HTML¥¿¥°¤Î´Ö¤Ë¤¢¤ëÆâÍƤò¤¹¤Ù¤Æ¥³¥Ô¡¼¤·¤Þ¤¹¡£\f2<head>\fP¥»¥¯¥·¥ç¥ó¤ò´Þ¤á¡¢¤½¤³¤Ë\f2<title>\fP¤ä¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎÃøºî¸¢µ­½Ò¤Ê¤É¤Î¾ðÊó¤òÇÛÃÖ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤¬¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¤Ï¤½¤ì¤é¤Ï°ìÀÚɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£)
++.TP 2
++o
++¥Ñ¥Ã¥±¡¼¥¸¡¦¥¿¥°¤¬¤¢¤ì¤Ð¡¢¤¹¤Ù¤Æ½èÍý¤·¤Þ¤¹¡£
++.TP 2
++o
++À¸À®¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î³µÍ×¥Ú¡¼¥¸¤ÎºÇ¸å¤Ë¡¢½èÍý¤·¤¿¥Æ¥­¥¹¥È¤òÁÞÆþ¤·¤Þ¤¹(
++.na
++\f2¥Ñ¥Ã¥±¡¼¥¸¤Î³µÍ×\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/java/applet/package\-summary.html¤ò»²¾È)¡£
++.TP 2
++o
++¥Ñ¥Ã¥±¡¼¥¸¤Î³µÍ×¥Ú¡¼¥¸¤ÎÀèƬ¤Ë¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¤ÎºÇ½é¤Îʸ¤ò¥³¥Ô¡¼¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢³µÍ×¥Ú¡¼¥¸¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥ê¥¹¥È¤Ë¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¤ÎºÇ½é¤Îʸ¤òÄɲä·¤Þ¤¹(
++.na
++\f2³µÍפÎÍ×Ìó\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/overview\-summary.html¤ò»²¾È)¡£Ê¸¤Î½ª¤ï¤ê¤Ï¡¢¥¯¥é¥¹¤ä¥á¥ó¥Ð¡¼¤Î¼çÀâÌÀ¤ÎºÇ½é¤Îʸ¤Î½ª¤ï¤ê¤ÈƱ¤¸¥ë¡¼¥ë¤Ë¤è¤Ã¤ÆȽÃǤµ¤ì¤Þ¤¹¡£
++.RE
++.SS
++³µÍ×¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë
++.LP
++¥É¥­¥å¥á¥ó¥È²½¤¹¤ë³Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¡¦¥»¥Ã¥È¤Ï¡¢Æȼ«¤Î³µÍץɥ­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò»ý¤Ä¤³¤È¤¬¤Ç¤­¡¢¤½¤ì¤ÏÀìÍѤΡ֥½¡¼¥¹¡×¥Õ¥¡¥¤¥ë¤ËÊÝ»ý¤µ¤ì¤Þ¤¹¡£¤½¤ÎÆâÍƤϡ¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤ë³µÍ×¥Ú¡¼¥¸¤ËÁȤ߹þ¤Þ¤ì¤Þ¤¹¡£¤³¤Î¥³¥á¥ó¥È¤Ë¤Ï¡¢Ä̾¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¡¦¥»¥Ã¥ÈÁ´ÂΤËÅö¤Æ¤Ï¤Þ¤ë¥É¥­¥å¥á¥ó¥È¤òµ­½Ò¤·¤Þ¤¹¡£
++.LP
++³µÍ×¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë¤ËǤ°Õ¤Î̾Á°(Ä̾ï¤Ï\f4overview.html\fP)¤òÉÕ¤±¡¢Ç¤°Õ¤Î¾ì½ê(Ä̾ï¤Ï¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤ÎºÇ¾å°Ì¥ì¥Ù¥ë)¤ËÇÛÃ֤Ǥ­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2java.applet\fP¥Ñ¥Ã¥±¡¼¥¸¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬\f2/home/user/src/java/applet\fP¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢³µÍ×¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤Ï\f2/home/user/src/overview.html\fP¤ËºîÀ®¤Ç¤­¤Þ¤¹¡£
++.LP
++°Û¤Ê¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥»¥Ã¥È¤ËÂФ·¤ÆJavadoc¤òÊ£¿ô²ó¼Â¹Ô¤¹¤ë¾ì¹ç¤Ï¡¢Æ±¤¸1¤Ä¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥»¥Ã¥È¤ËÂФ·¤ÆÊ£¿ô¤Î³µÍ×¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢ÆâÉô¥É¥­¥å¥á¥ó¥ÈÍѤË\-private¤ò»ØÄꤷ¤ÆJavadoc¤ò1²ó¼Â¹Ô¤·¤¿¸å¡¢¸ø³«¥É¥­¥å¥á¥ó¥ÈÍѤˤ½¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤ÇºÆÅټ¹Ԥ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢³Æ³µÍ×¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤Î1ʸÌܤǡ¢¤½¤Î¥É¥­¥å¥á¥ó¥È¤ò¸ø³«ÍѤޤ¿¤ÏÆâÉôÍѤȤ·¤Æµ­½Ò¤Ç¤­¤Þ¤¹¡£
++.LP
++³µÍ×¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤ÎÆâÍƤϡ¢Á°½Ò¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤ÈƱÍÍ¡¢HTML¤Çµ­½Ò¤µ¤ì¤¿1¤Ä¤ÎÂ礭¤Ê¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç¤¹¡£¾ÜºÙ¤Ï¡¢Á°½Ò¤ÎÀâÌÀ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£Í×ÅÀ¤ò·«¤êÊÖ¤¹¤È¡¢¥³¥á¥ó¥È¤ò½ñ¤¯¾ì¹ç¤Ï¡¢ºÇ½é¤Îʸ¤ò¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¡¦¥»¥Ã¥È¤Î³µÍפȤ·¡¢\f2<body>\fP¤ÈºÇ½é¤Îʸ¤Î´Ö¤Ë¥¿¥¤¥È¥ë¤ä¤½¤Î¾¤Î¥Æ¥­¥¹¥È¤ò´Þ¤á¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£³µÍ×¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Â¾¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ÈƱ¤¸¤¯¡¢\f2{@link}\fP¤Ê¤É¤Î¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°¤ò½ü¤¯¤¹¤Ù¤Æ¤Î¥¿¥°¤Ï¡¢¼çÀâÌÀ¤Î¸å¤ËÇÛÃÖ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2@see\fP¥¿¥°¤òÄɲ乤ë¾ì¹ç¤Ë¤Ï¡¢´°Á´½¤¾þ̾¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++Javadoc¥Ä¡¼¥ë¤Î¼Â¹Ô»þ¤Ë¡¢\-overview¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ³µÍ×¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤è¤¦¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f2<body>\fP¤È\f2</body>\fP¥¿¥°¤Î´Ö¤Ë¤¢¤ëÆâÍƤò¤¹¤Ù¤Æ½èÍýÂоݤȤ·¤Æ¥³¥Ô¡¼¤·¤Þ¤¹¡£
++.TP 2
++o
++³µÍ×¥¿¥°¤¬¤¢¤ì¤Ð¡¢¤¹¤Ù¤Æ½èÍý¤·¤Þ¤¹¡£
++.TP 2
++o
++À¸À®¤·¤¿³µÍ×¥Ú¡¼¥¸¤ÎºÇ¸å¤Ë¡¢½èÍý¤·¤¿¥Æ¥­¥¹¥È¤òÁÞÆþ¤·¤Þ¤¹(
++.na
++\f2³µÍפÎÍ×Ìó\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/overview\-summary.html¤ò»²¾È)¡£
++.TP 2
++o
++³µÍ×¥Ú¡¼¥¸¤ÎÀèƬ¤Ë¡¢³µÍ×¥³¥á¥ó¥È¤ÎºÇ½é¤Îʸ¤ò¥³¥Ô¡¼¤·¤Þ¤¹¡£
++.RE
++.SS
++¤½¤Î¾¤Î̤½èÍý¤Î¥Õ¥¡¥¤¥ë
++.LP
++¥½¡¼¥¹¤Ë¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ°¸Àè¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤µ¤ì¤ë¡¢¤½¤Î¾¤ÎǤ°Õ¤Î¥Õ¥¡¥¤¥ë¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£°ìÈ̤ˡ¢¤³¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥°¥é¥Õ¥£¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¡¢¥µ¥ó¥×¥ë¤ÎJava¥½¡¼¥¹(.java)¤ª¤è¤Ó¥¯¥é¥¹(.class)¥Õ¥¡¥¤¥ë¡¢ÆâÍƤ¬Ä̾ï¤ÎJava¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î±Æ¶Á¤ò¼õ¤±¤Ê¤¤ÆÈΩ¤·¤¿HTML¥Õ¥¡¥¤¥ë¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++̤½èÍý¤Î¥Õ¥¡¥¤¥ë¤ò´Þ¤á¤ë¤Ë¤Ï¡¢¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò\f4doc\-files\fP¤È¤¤¤¦Ì¾Á°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤­¤Þ¤¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬³ÊǼ¤µ¤ì¤¿Ç¤°Õ¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£¤³¤Î¤è¤¦¤Ê¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Ë1¤ÄÍѰդǤ­¤Þ¤¹¡£¥¤¥á¡¼¥¸¡¢¥µ¥ó¥×¥ë¡¦¥³¡¼¥É¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¡¢.class¥Õ¥¡¥¤¥ë¡¢¥¢¥×¥ì¥Ã¥È¡¢¤ª¤è¤ÓHTML¥Õ¥¡¥¤¥ë¤ò¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥Ü¥¿¥ó¤Î¥¤¥á¡¼¥¸\f2button.gif\fP¤ò\f2java.awt.Button\fP¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥È¤Ë´Þ¤á¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤ò\f2/home/user/src/java/awt/doc\-files/\fP¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤­¤Þ¤¹¡£¤Ê¤ª¡¢\f2doc\-files\fP¥Ç¥£¥ì¥¯¥È¥ê¤ò\f2/home/user/src/java/doc\-files\fP¤ËÃÖ¤¯¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢\f2java\fP¤¬¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤Ê¤¤¤«¤é¤Ç¤¹¡£¤Ä¤Þ¤ê¡¢java¤½¤Î¤â¤Î¤Ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬1¤Ä¤â³ÊǼ¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¹¡£
++.LP
++¤³¤ì¤é¤Î̤½èÍý¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥ê¥ó¥¯¤Ï¡¢¤¹¤Ù¤Æ¥Ï¡¼¥É¥³¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢Javadoc¥Ä¡¼¥ë¤¬¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¸«¤º¤Ë¡¢¥Ç¥£¥ì¥¯¥È¥ê¤È¤½¤ÎÆâÍƤò°¸Àè¤Ë¤½¤Î¤Þ¤Þ¥³¥Ô¡¼¤¹¤ë¤«¤é¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2Button.java\fP¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤Î¥ê¥ó¥¯¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ /**
++.fl
++ * This button looks like this:
++.fl
++ * <img src="doc\-files/Button.gif">
++.fl
++ */
++.fl
++\fP
++.fi
++.SS
++¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë
++.LP
++°ìÉô¤Î³«È¯¼Ô¤«¤é¡¢¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤òÂбþ¤¹¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¶á¤¯¤Î¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤ËÊݸ¤·¤¿¤¤¤È¤¤¤¦Í×˾¤¬¤¢¤ê¤Þ¤·¤¿¡£¤Ä¤Þ¤ê¡¢¤³¤ì¤é¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¥Ç¥£¥ì¥¯¥È¥ê¤Þ¤¿¤Ï¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤·¤¿¤¤¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
++.LP
++¸Ä¡¹¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ÇÌÀ¼¨Åª¤ËÅϤ·¤ÆJavadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¾ì¹ç¡¢¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤ò°Õ¿ÞŪ¤Ë½ü³°¤·¤Æ¡¢½èÍý¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Þ¤¿¤Ï¥ï¥¤¥ë¥É¥«¡¼¥É¤ÇÅϤ¹¾ì¹ç¤Ï¡¢ÆÃÄê¤Î¥ë¡¼¥ë¤Ë½¾¤Ã¤Æ¡¢¤³¤ì¤é¤Î¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤¬½èÍý¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤È¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤Ï¡¢¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢Í­¸ú¤Ç¥³¥ó¥Ñ¥¤¥ë²Äǽ¤Ê¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë¤Î¤ËÂФ·¤Æ¡¢¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢¤½¤¦¤Ç¤Ï¤Ê¤¤¤È¤¤¤¦ÅÀ¤Ç¤¹¡£¤¿¤À¤·¡¢¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤â¡Ö.java¡×¤Ç½ª¤ï¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++\f3¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë\fP \- ³«È¯¼Ô¤Î¿¤¯¤Ï¡¢¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥³¥ó¥Ñ¥¤¥ë²Äǽ¤Ç¼Â¹Ô²Äǽ¤Ê¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤ò¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È\f2Ʊ¤¸\fP¥Ç¥£¥ì¥¯¥È¥ê¤ËÇÛÃÖ¤·¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤Þ¤¹¡£¤·¤«¤·¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢Ì¾Á°¤Ê¤·¥Ñ¥Ã¥±¡¼¥¸¤Ê¤É¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¡¦¥Ñ¥Ã¥±¡¼¥¸¤È¤ÏÊ̤Υѥ屡¼¥¸¤Ë°¤µ¤»¤¿¤¤¤È¤â¹Í¤¨¤Æ¤¤¤Þ¤¹(¤½¤Î¤¿¤á¡¢¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ë¤Ïpackageʸ¤¬¤Ê¤¤¤«¡¢¤Þ¤¿¤Ï¥½¡¼¥¹¤È¤ÏÊ̤Îpackageʸ¤¬¤¢¤ê¤Þ¤¹)¡£¤³¤Î¤è¤¦¤Ê¾õ¶·¤Ç¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë¥½¡¼¥¹¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤷ¤Æ¤½¤Î¥½¡¼¥¹¤¬¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Ë¡¢¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ï·Ù¹ð¤Þ¤¿¤Ï¥¨¥é¡¼¤ò°ú¤­µ¯¤³¤·¤Þ¤¹¡£¤½¤Î¤è¤¦¤Ê¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ï¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÇÛÃÖ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2com.package1\fPÆâ¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤òÄɲ乤ë¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¥Ï¥¤¥Õ¥ó¤ò´Þ¤ó¤Ç¤¤¤ë¤¿¤á¤Ë¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¤·¤Æ¤Ï̵¸ú¤Ê̾Á°¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥êÆâ¤ËÇÛÃÖ¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ com/package1/test\-files/
++.fl
++\fP
++.fi
++.LP
++¤³¤ì¤Ç¡¢Javadoc¥Ä¡¼¥ë¤Ï·Ù¹ð¤Ê¤·¤Çtest¥Ç¥£¥ì¥¯¥È¥ê¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹¡£
++.LP
++¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ë¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Î¸ÄÊ̤μ¹Ԥǡ¢¥ï¥¤¥ë¥É¥«¡¼¥É¤ò´Þ¤ó¤À¥Æ¥¹¥È¡¦¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾(\f2com/package1/test\-files/*.java\fP¤Ê¤É)¤ÇÅϤ·¤Æ¥Æ¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤¹¤ë¤è¤¦¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++\f3¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È\fP \- ¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï¡Ö.java¡×¤Ç½ª¤ï¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¤¬¡¢¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Þ¤»¤ó¡£¥½¡¼¥¹¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤ËÊÝ»ý¤·¤¿¤¤¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È¤¬¤¢¤ë¾ì¹ç¤Ï¡¢\f2Buffer\-Template.java\fP¤Î¤è¤¦¤Ë¥Ï¥¤¥Õ¥ó¤ä¤½¤Î¾¤Î̵¸ú¤ÊJavaʸ»ú¤ò̾Á°¤Ë´Þ¤á¤ë¤³¤È¤Ç¡¢¥Æ¥ó¥×¥ì¡¼¥È¤¬½èÍý¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢Javadoc¥Ä¡¼¥ë¤¬½èÍý¤¹¤ë¤Î¤Ï¡¢¡Ö.java¡×ÀÜÈø¼­¤ò½ü¤¤¤¿Ì¾Á°¤¬Í­¸ú¤Ê¥¯¥é¥¹Ì¾¤Ç¤¢¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¤ß¤Ç¤¢¤ë¤¿¤á¤Ç¤¹(Java¸À¸ì»ÅÍͤμ±Ê̻Ҥ˴ؤ¹¤ë¾ðÊó¤ò»²¾È)¡£
++.SH "À¸À®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë"
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢Javadoc¤Ï¡¢HTML·Á¼°¤Î¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤¹¤ëɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¥É¥Ã¥¯¥ì¥Ã¥È¤Ï¡¢¼¡¤Î¥¿¥¤¥×¤Î¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£(¤½¤ì¤¾¤ì¤ÎHTML¥Ú¡¼¥¸¤Ï¡¢Ê̸ĤΥե¡¥¤¥ë¤ËÁêÅö¤·¤Þ¤¹¡£)Javadoc¤¬À¸À®¤¹¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ë¤Ï¡¢¥¯¥é¥¹¤ä¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î̾Á°¤Ë¤Á¤Ê¤ó¤À¤â¤Î¤È¡¢¤½¤¦¤Ç¤Ê¤¤¤â¤Î(\f2package\-summary.html¤Ê¤É\fP)¤Î2¤Ä¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹¡£¸å¼Ô¤Î¥°¥ë¡¼¥×¤Î¥Õ¥¡¥¤¥ë̾¤Ë¤Ï¡¢Á°¼Ô¤Î¥°¥ë¡¼¥×¤È¥Õ¥¡¥¤¥ë̾¤¬¶¥¹ç¤·¤Ê¤¤¤è¤¦¤Ë¡¢¥Ï¥¤¥Õ¥ó¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++\f3´ðËÜÆâÍÆ¥Ú¡¼¥¸\fP
++.RS 3
++.TP 2
++o
++¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤´¤È¤Ë1¤Ä¤Î\f3¥¯¥é¥¹¡¦¥Ú¡¼¥¸¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥Ú¡¼¥¸\fP(\f2¥¯¥é¥¹Ì¾\fP\f2.html\fP)
++.TP 2
++o
++¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Ë1¤Ä¤Î\f3¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ú¡¼¥¸\fP(\f2package\-summary.html\fP)¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¤¢¤ë\f2package.html\fP¤Þ¤¿¤Ï\f2package\-info.java\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ëÆâ¤ÎHTML¥Æ¥­¥¹¥È¤ò¤¹¤Ù¤ÆÁȤßÆþ¤ì¤Þ¤¹¡£
++.TP 2
++o
++¥Ñ¥Ã¥±¡¼¥¸¤Î¥»¥Ã¥ÈÁ´ÂΤËÂФ·¤Æ1¤Ä¤Î\f3³µÍ×¥Ú¡¼¥¸\fP(\f2overview\-summary.html\fP)¡£¤³¤ì¤Ï¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤ÎÀèƬ¥Ú¡¼¥¸¤Ë¤Ê¤ê¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢\f2\-overview\fP¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ëÆâ¤ÎHTML¥Æ¥­¥¹¥È¤ò¤¹¤Ù¤ÆÁȤßÆþ¤ì¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢Javadoc¤ËÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÅϤ·¤¿¾ì¹ç¤Ë¤Î¤ßºîÀ®¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢HTML¥Õ¥ì¡¼¥à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++.LP
++\f3Áê¸ß»²¾È¥Ú¡¼¥¸\fP
++.RS 3
++.TP 2
++o
++\f3¥Ñ¥Ã¥±¡¼¥¸¤Î¥»¥Ã¥ÈÁ´ÂΤËÂФ·¤Æ1¤Ä¤Î¥¯¥é¥¹³¬ÁØ¥Ú¡¼¥¸\fP(\f2overview\-tree.html\fP)¡£¤³¤Î¥Ú¡¼¥¸¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Î¡Ö³µÍספò¥¯¥ê¥Ã¥¯¤·¤Æ¤«¤é¡¢¡Ö³¬Áإĥ꡼¡×¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£
++.TP 2
++o
++\f3¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Ë1¤Ä¤Î¥¯¥é¥¹³¬ÁØ¥Ú¡¼¥¸\fP(\f2package\-tree.html\fP)¡£¤³¤Î¥Ú¡¼¥¸¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢ÆÃÄê¤Î¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥Ú¡¼¥¸¤Ë°ÜÆ°¤·¡¢¡Ö³¬Áإĥ꡼¡×¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î³¬Áؤòɽ¼¨¤·¤Þ¤¹¡£
++.TP 2
++o
++\f3¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Ë1¤Ä¤Î¡Ö»ÈÍѡץڡ¼¥¸\fP(\f2package\-use.html\fP)¤È¡¢¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤´¤È¤Ë1¤Ä¤º¤Ä¤Î¡Ö»ÈÍѡץڡ¼¥¸(\f2class\-use/\fP\f2¥¯¥é¥¹Ì¾\fP\f2.html\fP)¡£¤³¤Î¥Ú¡¼¥¸¤Ë¤Ï¡¢ÆÃÄê¤Î¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÉô¤ò»ÈÍѤ·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥á¥½¥Ã¥É¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¤ª¤è¤Ó¥Õ¥£¡¼¥ë¥É¤Ë¤Ä¤¤¤Æµ­½Ò¤µ¤ì¤Þ¤¹¡£¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹A¤òÎã¤Ë¤·¤Æ¹Í¤¨¤ë¤È¡¢¤½¤Î¡Ö»ÈÍѡץڡ¼¥¸¤Ë¤Ï¡¢A¤Î¥µ¥Ö¥¯¥é¥¹¡¢A¤È¤·¤ÆÀë¸À¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¡¢A¤òÊÖ¤¹¥á¥½¥Ã¥É¡¢A·¿¤Î¥Ñ¥é¥á¡¼¥¿¤ò»ý¤Ä¥á¥½¥Ã¥É¤ª¤è¤Ó¥³¥ó¥¹¥È¥é¥¯¥¿¤¬ÁȤ߹þ¤Þ¤ì¤Þ¤¹¡£¤³¤Î¥Ú¡¼¥¸¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º¡¢¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë°ÜÆ°¤·¤Æ¤«¤é¡¢¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Î¡Ö»ÈÍѡץê¥ó¥¯¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£
++.TP 2
++o
++\f3Èó¿ä¾©API¥Ú¡¼¥¸\fP(\f2deprecated\-list.html\fP)¡£¿ä¾©¤µ¤ì¤Ê¤¤Ì¾Á°¤¬¤¹¤Ù¤Æ¥ê¥¹¥È¤µ¤ì¤Þ¤¹¡£(Èó¿ä¾©Ì¾¤Ï¡¢°ìÈ̤˲þÎɤµ¤ì¤¿¤¿¤á¤Ë»ÈÍѤ¬¿ä¾©¤µ¤ì¤Æ¤¤¤Ê¤¤API¤Î̾Á°¤Ç¤¢¤ê¡¢Ä̾¤½¤ì¤ËÃÖ¤­´¹¤ï¤ë̾Á°¤¬Ä󼨤µ¤ì¤Æ¤¤¤Þ¤¹¡£Èó¿ä¾©API¤Ï¡¢¾­Íè¤Î¼ÂÁõ¤Ç¤Ïºï½ü¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£)
++.TP 2
++o
++\f3Äê¿ô¥Õ¥£¡¼¥ë¥ÉÃÍ¥Ú¡¼¥¸\fP(\f2constant\-values.html\fP)¡£static¥Õ¥£¡¼¥ë¥É¤ÎÃÍÍѤǤ¹¡£
++.TP 2
++o
++\f3ľÎ󲽤µ¤ì¤¿·Á¼°¥Ú¡¼¥¸\fP(\f2serialized\-form.html\fP)¡£Ä¾Îó²½²Äǽ¤«¤Ä³°Éô²½²Äǽ¤Ê¥¯¥é¥¹¤Ë´Ø¤¹¤ë¾ðÊóÍѤΥڡ¼¥¸¤Ç¤¹¡£¤³¤ì¤é¤Î³Æ¥¯¥é¥¹¤Ë¤Ï¡¢Ä¾Îó²½¥Õ¥£¡¼¥ë¥É¤ª¤è¤Ó¥á¥½¥Ã¥É¤Ë´Ø¤¹¤ëµ­½Ò¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤Î¾ðÊó¤Ï¡¢API¤ò»ÈÍѤ¹¤ë³«È¯¼Ô¤Ç¤Ï¤Ê¤¯¡¢ºÆ¼ÂÁõ¼Ô¤ËɬÍפʾðÊó¤Ç¤¹¡£¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Ë¤³¤Î¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢Ä¾Î󲽤µ¤ì¤¿¥¯¥é¥¹¤Ë°ÜÆ°¤·¤Æ¡¢¤½¤Î¥¯¥é¥¹¡¦¥³¥á¥ó¥È¤Ë¤¢¤ë¡Ö´ØÏ¢¹àÌܡץ»¥¯¥·¥ç¥ó¤Ç¡ÖľÎ󲽤µ¤ì¤¿·Á¼°¡×¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤³¤Î¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤¹¡£É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤ÏľÎ󲽤µ¤ì¤¿·Á¼°¥Ú¡¼¥¸¤ò¼«Æ°À¸À®¤·¤Þ¤¹¡£¤³¤Î¥Ú¡¼¥¸¤Ë¤Ï¡¢Serializable¤ò¼ÂÁõ¤¹¤ë¤¹¤Ù¤Æ¤Î¥¯¥é¥¹(public¤Þ¤¿¤ÏÈópublic)¤¬ÁȤ߹þ¤Þ¤ì¤ë¾¡¢\f2readObject\fP¥á¥½¥Ã¥É¤ä\f2writeObject\fP¥á¥½¥Ã¥É¡¢Ä¾Î󲽤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¡¢¤ª¤è¤Ó\f2@serial\fP¡¢\f2@serialField\fP¡¢\f2@serialData\fP¥¿¥°¤«¤é¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤âÁȤ߹þ¤Þ¤ì¤Þ¤¹¡£Ä¾Îó²½²Äǽ¤Êpublic¥¯¥é¥¹¤ò½ü³°¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¥¯¥é¥¹(¤Þ¤¿¤Ï¤½¤Î¥¯¥é¥¹¤¬Â°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸)¤ò\f2@serial exclude\fP¤Ç¥Þ¡¼¥¯¤·¤Þ¤¹¡£Ä¾Îó²½²Äǽ¤Êpackage\-private¥¯¥é¥¹¤ò´Þ¤á¤ë¤Ë¤Ï¡¢¤½¤Î¥¯¥é¥¹(¤Þ¤¿¤Ï¤½¤Î¥¯¥é¥¹¤¬Â°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸)¤ò\f2@serial include\fP¤Ç¥Þ¡¼¥¯¤·¤Þ¤¹¡£¥Ð¡¼¥¸¥ç¥ó1.4¤Ç¤Ï¡¢\f2\-private\fP¥ª¥×¥·¥ç¥ó¤Î»ØÄê\f2¤Ê¤·\fP¤ÇJavadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢public¥¯¥é¥¹¤ª¤è¤Óprivate¥¯¥é¥¹¤Î´°Á´¤ËľÎ󲽤µ¤ì¤¿·Á¼°¤òÀ¸À®¤Ç¤­¤Þ¤¹¡£
++.TP 2
++o
++\f3º÷°ú\fP(\f2index\-*.html\fP)¡£¤¹¤Ù¤Æ¤Î¥¯¥é¥¹Ì¾¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹Ì¾¡¢¥³¥ó¥¹¥È¥é¥¯¥¿Ì¾¡¢¥Õ¥£¡¼¥ë¥É̾¡¢¤ª¤è¤Ó¥á¥½¥Ã¥É̾¤¬¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ëʤó¤Ç¤¤¤Þ¤¹¡£º÷°ú¤Ï¡¢Unicode¤ò°·¤¨¤ë¤è¤¦¤Ë¹ñºÝ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£1¤Ä¤Î¥Õ¥¡¥¤¥ë¤È¤·¤ÆÀ¸À®¤¹¤ë¤³¤È¤â¡¢ÀèƬʸ»ú(±Ñ¸ì¤Î¾ì¹çA\-Z)¤´¤È¤ËÊÌ¡¹¤Î¥Õ¥¡¥¤¥ë¤È¤·¤ÆÀ¸À®¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.RE
++.LP
++\f3¥µ¥Ý¡¼¥È¡¦¥Õ¥¡¥¤¥ë\fP
++.RS 3
++.TP 2
++o
++\f3¥Ø¥ë¥×¡¦¥Ú¡¼¥¸\fP(\f2help\-doc.html\fP)¡£¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤äÁ°½Ò¤Î³Æ¥Ú¡¼¥¸¤Ë´Ø¤¹¤ëÀâÌÀ¤¬µ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\f2\-helpfile\fP¤ò»ÈÍѤ¹¤ë¤È¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥Ø¥ë¥×¡¦¥Õ¥¡¥¤¥ë¤ËÂå¤ï¤ëÆȼ«¤Î¥«¥¹¥¿¥à¡¦¥Ø¥ë¥×¡¦¥Õ¥¡¥¤¥ë¤òÄ󶡤Ǥ­¤Þ¤¹¡£
++.TP 2
++o
++ɽ¼¨ÍѤÎHTML¥Õ¥ì¡¼¥à¤òºîÀ®¤¹¤ë1¤Ä¤Î\f3index.html¥Õ¥¡¥¤¥ë\fP¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥Õ¥ì¡¼¥àÉÕ¤­¤ÎÀèƬ¥Ú¡¼¥¸¤òɽ¼¨¤¹¤ë¾ì¹ç¤Ë¥í¡¼¥É¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¼«ÂΤˤϡ¢¥Æ¥­¥¹¥È¡¦¥³¥ó¥Æ¥ó¥Ä¤Ï´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
++.TP 2
++o
++Ê£¿ô¤Î\f3¥Õ¥ì¡¼¥à¡¦¥Õ¥¡¥¤¥ë\fP(\f2*\-frame.html\fP)¡£¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥ê¥¹¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£HTML¥Õ¥ì¡¼¥à¤òɽ¼¨¤¹¤ë¤È¤­¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 2
++o
++\f3¥Ñ¥Ã¥±¡¼¥¸¡¦¥ê¥¹¥È\fP¥Õ¥¡¥¤¥ë(\f2package\-list\fP)¡£\f2\-link\fP¤ª¤è¤Ó\f2\-linkoffline\fP¥ª¥×¥·¥ç¥ó¤Ç»ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢HTML¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¯¥Æ¥­¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ç¤¢¤ê¡¢¤É¤Î¥ê¥ó¥¯¤«¤é¤â¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£
++.TP 2
++o
++\f3¥¹¥¿¥¤¥ë¥·¡¼¥È\fP¡¦¥Õ¥¡¥¤¥ë(\f2stylesheet.css\fP)¡£À¸À®¤µ¤ì¤ë¥Ú¡¼¥¸¤Î°ìÉô¤ÎÍ×ÁǤˤĤ¤¤Æ¿§¡¢¥Õ¥©¥ó¥È¡¦¥Õ¥¡¥ß¥ê¡¢¥Õ¥©¥ó¥È¡¦¥µ¥¤¥º¡¢¥Õ¥©¥ó¥È¡¦¥¹¥¿¥¤¥ë¡¢¤ª¤è¤ÓÇÛÃÖ¤òÀ©¸æ¤·¤Þ¤¹¡£
++.TP 2
++o
++\f3doc\-files\fP¥Ç¥£¥ì¥¯¥È¥ê¡£°¸Àè¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤¹¤ë¥¤¥á¡¼¥¸¡¢¥µ¥ó¥×¥ë¡¦¥³¡¼¥É¡¢¥½¡¼¥¹¡¦¥³¡¼¥É¤Ê¤É¤Î¥Õ¥¡¥¤¥ë¤¬¤¹¤Ù¤Æ³ÊǼ¤µ¤ì¤Þ¤¹¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¤¤¤«¤Ê¤ëÊýË¡¤Ç¤âJavadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ½èÍý¤µ¤ì¤Þ¤»¤ó¡£¤Ä¤Þ¤ê¡¢¥Õ¥¡¥¤¥ëÆâ¤Ëjavadoc¥¿¥°¤¬¤¢¤Ã¤Æ¤â̵»ë¤µ¤ì¤Þ¤¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤ÎÃæ¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ë¤Î¤ßÀ¸À®¤µ¤ì¤Þ¤¹¡£
++.RE
++.LP
++\f3HTML¥Õ¥ì¡¼¥à\fP
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢²¼¤Î¿Þ¤Ë¼¨¤¹¤è¤¦¤Ë¡¢2¡¢3¸Ä¤ÎHTML¥Õ¥ì¡¼¥à¤òÀ¸À®¤·¤Þ¤¹¡£1¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤·¤«¤Ê¤¤¾ì¹ç(¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¤¬¤Ê¤¤¾ì¹ç)¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥ê¥¹¥È¤ò¾Êά¤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆºÇÄã¸ÂɬÍפʿô¤Î¥Õ¥ì¡¼¥à¤òºîÀ®¤·¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢Ã±°ì¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë°¤¹¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë(*.java)¤Þ¤¿¤Ïñ°ì¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò°ú¿ô¤È¤·¤Æjavadoc¥³¥Þ¥ó¥É¤ËÅϤ¹¾ì¹ç¤Ï¡¢º¸Â¦¤ÎÎó¤Ë¥¯¥é¥¹¤Î¥ê¥¹¥È¤òɽ¼¨¤¹¤ë¥Õ¥ì¡¼¥à(C)¤¬1¤Ä¤Î¤ßºîÀ®¤µ¤ì¤Þ¤¹¡£Javadoc¤ËÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÅϤ·¤¿¾ì¹ç¤Ï¡¢³µÍ×¥Ú¡¼¥¸(Detail)¤Ë²Ã¤¨¤Æ¡¢¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥ê¥¹¥È¤¹¤ëÂè3¤Î¥Õ¥ì¡¼¥à(P)¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£¤³¤Î³µÍ×¥Ú¡¼¥¸¤Î¥Õ¥¡¥¤¥ë̾¤Ï¡¢\f2overview\-summary.html\fP¤Ç¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢Ê£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÅϤ·¤¿¾ì¹ç¤Ë¤Î¤ßºîÀ®¤µ¤ì¤Þ¤¹¡£¡Ö¥Õ¥ì¡¼¥à¤Ê¤·¡×¥ê¥ó¥¯¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤«¡¢overview\-summary.html¤òºÇ½é¤Ëɽ¼¨¤¹¤ë¤È¡¢¥Õ¥ì¡¼¥à¤ò¾Êά¤Ç¤­¤Þ¤¹¡£
++.LP
++HTML¥Õ¥ì¡¼¥à¤Ë´·¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢ÆÃÄê¤Î¥Õ¥ì¡¼¥à¤ò°õºþ¤ª¤è¤Ó¥¹¥¯¥í¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¥Õ¥ì¡¼¥à¤Ë\f2¥Õ¥©¡¼¥«¥¹\fP¤¬É¬ÍפǤ¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¥Õ¥ì¡¼¥à¤Ë¥Õ¥©¡¼¥«¥¹¤òÍ¿¤¨¤ë¤Ë¤Ï¡¢¤½¤Î¥Õ¥ì¡¼¥à¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£¤³¤ì¤Ç¡¢Â¿¤¯¤Î¥Ö¥é¥¦¥¶¤Ç¤Ï¡¢Ìð°õ¥­¡¼¤ä¥Ú¡¼¥¸¡¦¥­¡¼¤ò»ÈÍѤ·¤Æ¤½¤Î¥Õ¥ì¡¼¥à¤ò¥¹¥¯¥í¡¼¥ë¤·¤¿¤ê¡¢¡Ö°õºþ¡×¥á¥Ë¥å¡¼¡¦¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¤½¤Î¥Õ¥ì¡¼¥à¤ò°õºþ¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£
++.LP
++HTML¥Õ¥ì¡¼¥à¤¬É¬Íפ«¤É¤¦¤«¤Ë¤è¤Ã¤Æ¡¢¼¡¤Î¤¤¤º¤ì¤«¤Î¥Õ¥¡¥¤¥ë¤ò³«»Ï¥Ú¡¼¥¸¤È¤·¤Æ¥í¡¼¥É¤·¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f2index.html\fP(¥Õ¥ì¡¼¥à¤¢¤ê)
++.TP 2
++o
++\f2overview\-summary.html\fP(¥Õ¥ì¡¼¥à¤Ê¤·)
++.RE
++.LP
++\f3À¸À®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î¹½Â¤\fP
++.LP
++À¸À®¤µ¤ì¤ë¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢Java¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¥Ç¥£¥ì¥¯¥È¥ê³¬ÁؤËÊÔÀ®¤µ¤ì¤Þ¤¹¡£1¤Ä¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤­1¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¢¤È¤¤¤¦¹½Â¤¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++¤¿¤È¤¨¤Ð¡¢\f2java.applet.Applet\fP¥¯¥é¥¹ÍѤËÀ¸À®¤µ¤ì¤ë¥É¥­¥å¥á¥ó¥È¤Ï¡¢\f2java/applet/Applet.html\fP¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£À¸À®Àè¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤¬\f2apidocs\fP¤À¤È¤¹¤ë¤È¡¢java.applet¥Ñ¥Ã¥±¡¼¥¸¤Î¥Õ¥¡¥¤¥ë¤Î¹½Â¤¤Ï¡¢¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£Á°½Ò¤Î¤è¤¦¤Ë¡¢¡Öframe¡×¤È¤¤¤¦¸ì¤ò̾Á°¤Ë´Þ¤à¥Õ¥¡¥¤¥ë¤Ï¡¢¤¹¤Ù¤Æº¸¾å¤Þ¤¿¤Ïº¸²¼¤Î¥Õ¥ì¡¼¥à¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤ÎHTML¥Õ¥¡¥¤¥ë¤Ï¡¢¤¹¤Ù¤Æ±¦Â¦¤Î¥Õ¥ì¡¼¥à¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++Ãí°Õ \- ¥Ç¥£¥ì¥¯¥È¥ê¤Ï\f3ÂÀ»ú\fP¤Ç¼¨¤·¤Æ¤¤¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯(\f2*\fP)¤Ï¡¢Javadoc¤Ø¤Î°ú¿ô¤¬¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤Ï¤Ê¤¯¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾(*.java)¤Ç¤¢¤ë¾ì¹ç¤Ë\f2¾Êά¤µ¤ì¤ë\fP¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Ç¥£¥ì¥¯¥È¥ê¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢°ú¿ô¤¬¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤Î¾ì¹ç¡¢\f2package\-list\fP¤ÏºîÀ®¤µ¤ì¤Þ¤¹¤¬¡¢¤½¤ÎÃæ¿È¤Ï¶õ¤Ç¤¹¡£doc\-files¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¥½¡¼¥¹¡¦¥Ä¥ê¡¼Æâ¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ë¤Î¤ß¡¢À¸À®Àè¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++
++.fl
++\fP\f3apidocs\fP Top directory
++.fl
++ index.html Initial page that sets up HTML frames
++.fl
++ * overview\-summary.html Lists all packages with first sentence summaries
++.fl
++ overview\-tree.html Lists class hierarchy for all packages
++.fl
++ deprecated\-list.html Lists deprecated API for all packages
++.fl
++ constant\-values.html Lists values of static fields for all packages
++.fl
++ serialized\-form.html Lists serialized form for all packages
++.fl
++ * overview\-frame.html Lists all packages, used in upper\-left frame
++.fl
++ allclasses\-frame.html Lists all classes for all packages, used in lower\-left frame
++.fl
++ help\-doc.html Lists user help for how these pages are organized
++.fl
++ index\-all.html Default index created without \-splitindex option
++.fl
++ \f3index\-files\fP Directory created with \-splitindex option
++.fl
++ index\-<number>.html Index files created with \-splitindex option
++.fl
++ package\-list Lists package names, used only for resolving external refs
++.fl
++ stylesheet.css HTML style sheet for defining fonts, colors and positions
++.fl
++ \f3java\fP Package directory
++.fl
++ \f3applet\fP Subpackage directory
++.fl
++ Applet.html Page for Applet class
++.fl
++ AppletContext.html Page for AppletContext interface
++.fl
++ AppletStub.html Page for AppletStub interface
++.fl
++ AudioClip.html Page for AudioClip interface
++.fl
++ * package\-summary.html Lists classes with first sentence summaries for this package
++.fl
++ * package\-frame.html Lists classes in this package, used in lower left\-hand frame
++.fl
++ * package\-tree.html Lists class hierarchy for this package
++.fl
++ package\-use Lists where this package is used
++.fl
++ \f3doc\-files\fP Directory holding image and example files
++.fl
++ \f3class\-use\fP Directory holding pages API is used
++.fl
++ Applet.html Page for uses of Applet class
++.fl
++ AppletContext.html Page for uses of AppletContext interface
++.fl
++ AppletStub.html Page for uses of AppletStub interface
++.fl
++ AudioClip.html Page for uses of AudioClip interface
++.fl
++ \f3src\-html\fP Source code directory
++.fl
++ \f3java\fP Package directory
++.fl
++ \f3applet\fP Subpackage directory
++.fl
++ Applet.html Page for Applet source code
++.fl
++ AppletContext.html Page for AppletContext source code
++.fl
++ AppletStub.html Page for AppletStub source code
++.fl
++ AudioClip.html Page for AudioClip source code
++.fl
++.fi
++.SS
++À¸À®¤µ¤ì¤ëAPIÀë¸À
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥Õ¥£¡¼¥ë¥É¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¤ª¤è¤Ó¥á¥½¥Ã¥É¤Îµ­½Ò¤ÎºÇ½é¤Ë¡¢¤½¤ÎAPIÍѤÎÀë¸À¤òÀ¸À®¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2Boolean\fP¥¯¥é¥¹¤ÎÀë¸À¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++\f2public final class Boolean\fP
++.br
++\f2extends Object\fP
++.br
++\f2implements Serializable\fP
++.LP
++¤Þ¤¿¡¢\f2Boolean.valueOf\fP¥á¥½¥Ã¥É¤ÎÀë¸À¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++\f2public static Boolean valueOf(String s)\fP
++.LP
++Javadoc¥Ä¡¼¥ë¤Ç¤Ï¡¢½¤¾þ»Ò\f2public\fP¡¢\f2protected\fP¡¢\f2private\fP¡¢\f2abstract\fP¡¢\f2final\fP¡¢\f2static\fP¡¢\f2transient\fP¡¢¤ª¤è¤Ó\f2volatile\fP¤òÁȤ߹þ¤à¤³¤È¤Ï¤Ç¤­¤Þ¤¹¤¬¡¢\f2synchronized\fP¤È\f2native\fP¤òÁȤ߹þ¤à¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤ì¤é¸å¼Ô¤Î2¤Ä¤Î½¤¾þ»Ò¤Ï¡¢¼ÂÁõ¤Î¾ÜºÙ¤È¸«¤Ê¤µ¤ì¤Æ¤¤¤ë¤¿¤á¡¢API»ÅÍͤˤϴޤޤì¤Þ¤»¤ó¡£
++.LP
++API¤Ç¤Ï¡¢Ê¹ÔÀ­¥»¥Þ¥ó¥Æ¥£¥¯¥¹¤Ë¤Ä¤¤¤Æ¡¢¥­¡¼¥ï¡¼¥É\f2synchronized\fP¤Ë°Í¸¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢¥³¥á¥ó¥È¤Î¼çÀâÌÀ¤È¤·¤Æ¥É¥­¥å¥á¥ó¥È²½¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¡Ö1¤Ä¤Î\f2Enumeration\fP¤òÊ£¿ô¤Î¥¹¥ì¥Ã¥É¤«¤éʹԤ·¤Æ»ÈÍѤ¹¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¡×¤Î¤è¤¦¤Ëµ­½Ò¤·¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥È¤Ë¤Ï¡¢¤³¤ì¤é¤Î¥»¥Þ¥ó¥Æ¥£¥¯¥¹¤ò¼Â¸½¤¹¤ëÊýË¡¤òµ­½Ò¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤¿¤È¤¨¤Ð¡¢\f2Hashtable\fP¤Ï¥¹¥ì¥Ã¥É¥»¡¼¥Õ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¡Ö¥¨¥¯¥¹¥Ý¡¼¥È¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥á¥½¥Ã¥É¤òƱ´ü²½¤·¤Æ¤½¤ì¤ò¼Â¸½¤¹¤ë¡×¤Î¤è¤¦¤Ë»ØÄꤹ¤ëº¬µò¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥Ð¥±¥Ã¥È¡¦¥ì¥Ù¥ë¤ÇÆâÉôŪ¤ËƱ´ü²½¤¹¤ë¸¢¸Â¤òÊÝÍ­¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤¹¤ì¤Ð¡¢¤è¤ê¹âÅÙ¤ÊʹÔÀ­¤¬Ä󶡤µ¤ì¤Þ¤¹¡£
++.SH "¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È"
++.LP
++¥ª¥ê¥¸¥Ê¥ë¤Î¡Ö¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î»ÅÍ͡פϡ¢´ØÏ¢¹àÌܤò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.SS
++¥½¡¼¥¹¡¦¥³¡¼¥É¤Ø¤Î¥³¥á¥ó¥È¤ÎÁÞÆþ
++.LP
++¥½¡¼¥¹¡¦¥³¡¼¥É¤ÎǤ°Õ¤Î¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥á¥½¥Ã¥É¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¤Þ¤¿¤Ï¥Õ¥£¡¼¥ë¥É¤ÎÀë¸À¤ÎÁ°¤Ë¡¢\f2¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È\fP("doc comments")¤òµ­½Ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£³Æ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤òºîÀ®¤Ç¤­¤Þ¤¹¡£¹½Ê¸¤Ï¼ã´³°Û¤Ê¤ê¤Þ¤¹¤¬¡¢³µÍפˤâ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤òºîÀ®¤Ç¤­¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ï¡¢Èó¸ø¼°¤Ë¡ÖJavadoc¥³¥á¥ó¥È¡×¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹(¤³¤ÎÍѸì¤Ï¾¦É¸´ØÏ¢¤Î»ÈÍÑÊýË¡¤Ë°ãÈ¿)¡£¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ï¡¢¥³¥á¥ó¥È¤ò»Ï¤Þ¤ê¤ò¼¨¤¹Ê¸»úÎó\f2/**\fP¤È¡¢¥³¥á¥ó¥È¤ò½ª¤ï¤ê¤ò¼¨¤¹Ê¸»úÎó\f2*/\fP¤Î´Ö¤Ë¤¢¤ëʸ»ú¤«¤é¹½À®¤µ¤ì¤Þ¤¹¡£¹ÔƬ¤Î¥¢¥¹¥¿¥ê¥¹¥¯¤Ï¡¢³Æ¹Ô¤Ëµ­½Ò¤Ç¤­¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢¸å½Ò¤·¤Þ¤¹¡£¥³¥á¥ó¥È¤Î¥Æ¥­¥¹¥È¤Ï¡¢Ê£¿ô¹Ô¤Ë¤ï¤¿¤Ã¤Æµ­½Ò¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++/**
++.fl
++ * This is the typical format of a simple documentation comment
++.fl
++ * that spans two lines.
++.fl
++ */
++.fl
++\fP
++.fi
++.LP
++¥¹¥Ú¡¼¥¹¤òÀáÌ󤹤ë¤Ë¤Ï¡¢¥³¥á¥ó¥È¤ò1¹Ô¤ËÆþ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++/** This comment takes up only one line. */
++.fl
++\fP
++.fi
++.LP
++\f3¥³¥á¥ó¥È¤ÎÇÛÃÖ\fP \- ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ï¡¢¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¤Þ¤¿¤Ï¥Õ¥£¡¼¥ë¥É¤ÎÀë¸À¤ÎľÁ°¤ËÃÖ¤«¤ì¤Æ¤¤¤ë¤È¤­¤Ë¤Î¤ßǧ¼±¤µ¤ì¤Þ¤¹¡£¥¯¥é¥¹¤ÎÎã¡¢¥á¥½¥Ã¥É¤ÎÎã¡¢¤ª¤è¤Ó¥Õ¥£¡¼¥ë¥É¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¥á¥½¥Ã¥É¤ÎËÜÂΤËÃÖ¤«¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ç¤Ï¡¢1¤Ä¤ÎÀë¸Àʸ¤Ë¤Ä¤­1¤Ä¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î¤ß¤¬Ç§¼±¤µ¤ì¤Þ¤¹¡£
++.LP
++¤è¤¯¤¢¤ë´Ö°ã¤¤¤Ï¡¢¥¯¥é¥¹¡¦¥³¥á¥ó¥È¤È¥¯¥é¥¹Àë¸À¤Î´Ö¤Ë\f2import\fPʸ¤òÃÖ¤¤¤Æ¤·¤Þ¤¦¤³¤È¤Ç¤¹¡£¤³¤Î¤è¤¦¤Êµ­½Ò¤Ï¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤³¤Î¤è¤¦¤Ê¥¯¥é¥¹¡¦¥³¥á¥ó¥È¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ /**
++.fl
++ * This is the class comment for the class Whatever.
++.fl
++ */
++.fl
++
++.fl
++ import com.sun; // MISTAKE \- Important not to put import statement here
++.fl
++
++.fl
++ public class Whatever {
++.fl
++ }
++.fl
++\fP
++.fi
++.LP
++\f3¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ï\fP\f4¼çÀâÌÀ\fP\f3¤Î¸å¤Ë\fP\f4¥¿¥°¡¦¥»¥¯¥·¥ç¥ó\fP\f3¤¬Â³¤¯\fP \- ³«»Ï¶èÀÚ¤êʸ»ú¤Ç¤¢¤ë\f2/**\fP¤Î¸å¤«¤é¥¿¥°¡¦¥»¥¯¥·¥ç¥ó¤Þ¤Ç¤¬\f2¼çÀâÌÀ\fP¤Ë¤Ê¤ê¤Þ¤¹¡£\f2¥¿¥°¡¦¥»¥¯¥·¥ç¥ó\fP¤Ï¡¢ÀèƬʸ»ú¤¬\f2@\fP¤Î¹Ô¤ÇÄêµÁ¤µ¤ì¤ëºÇ½é¤Î¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤«¤é»Ï¤Þ¤ê¤Þ¤¹(ÀèƬ¤Î¥¢¥¹¥¿¥ê¥¹¥¯¡¢¶õÇòʸ»ú¡¢ÀèƬ¤Î¶èÀÚ¤êʸ»ú\f2/**\fP¤Ï½ü¤¯)¡£¼çÀâÌÀ¤òµ­½Ò¤»¤º¡¢¥¿¥°¡¦¥»¥¯¥·¥ç¥ó¤Î¤ß¤Î¥³¥á¥ó¥È¤òµ­½Ò¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¼çÀâÌÀ¤Ï¡¢¥¿¥°¡¦¥»¥¯¥·¥ç¥ó°Ê¹ß¤Ë³¤±¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¥¿¥°¤Î°ú¿ô¤Ï¡¢Ê£¿ô¹Ô¤Ë¤ï¤¿¤Ã¤Æµ­½Ò¤Ç¤­¤Þ¤¹¡£¥¿¥°¤Î¿ô¤ËÀ©¸Â¤Ï¤¢¤ê¤Þ¤»¤ó¡£²¿²ó¤âµ­½Ò¤Ç¤­¤ë¥¿¥°¤È¡¢1²ó¤·¤«µ­½Ò¤Ç¤­¤Ê¤¤¥¿¥°¤¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î\f2@see\fP¤«¤é¥¿¥°¡¦¥»¥¯¥·¥ç¥ó¤Ï»Ï¤Þ¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++/**
++.fl
++ * This sentence would hold the main description for this doc comment.
++.fl
++ * @see java.lang.Object
++.fl
++ */
++.fl
++\fP
++.fi
++.LP
++\f3¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤È¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°\fP \- \f2¥¿¥°\fP¤Ï¡¢Javadoc¥Ä¡¼¥ë¤¬½èÍý¤Ç¤­¤ë¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤ÎÆÃÊ̤ʥ­¡¼¥ï¡¼¥É¤Ç¤¹¡£¥¿¥°¤Ë¤Ï2¤Ä¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹¡£1¤Ä¤Ï\f2@tag\fP¤Î¤è¤¦¤Ëɽµ­¤µ¤ì¤ë¥Ö¥í¥Ã¥¯¡¦¥¿¥°(¡Ö¥¹¥¿¥ó¥É¥¢¥í¥ó¡¦¥¿¥°¡×¤È¤â¸Æ¤Ð¤ì¤ë)¡¢¤â¤¦1¤Ä¤Ï\f2{@tag}\fP¤Î¤è¤¦¤ËÃæ³ç¸Ì¤Ç°Ï¤ó¤Çɽµ­¤µ¤ì¤ë¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°¤Ç¤¹¡£¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤¬²ò¼á¤µ¤ì¤ë¤Ë¤Ï¡¢¹ÔƬ¤Î¥¢¥¹¥¿¥ê¥¹¥¯¡¢¶õÇòʸ»ú¡¢¶èÀÚ¤êʸ»ú(\f2/**\fP)¤ò½ü¤¤¤Æ¡¢¹Ô¤ÎÀèƬ¤ËÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢\f2@\fPʸ»ú¤ò¥Æ¥­¥¹¥ÈÆâ¤ÎÊ̤ξì½ê¤Ç»ÈÍѤ·¤Æ¤â¡¢¥¿¥°¤Î³«»Ï¤È¤·¤Æ²ò¼á¤µ¤ì¤Ê¤¤¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£\f2@\fPʸ»ú¤ò»ÈÍѤ·¤Æ¹Ô¤ò³«»Ï¤·¤Æ¤â¡¢¤½¤ì¤¬²ò¼á¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢HTML¥¨¥ó¥Æ¥£¥Æ¥£\f2&#064;\fP¤ò»ÈÍѤ·¤Þ¤¹¡£¤½¤ì¤¾¤ì¤Î¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤Ë¤Ï¡¢´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥Æ¥­¥¹¥È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥Æ¥­¥¹¥È¤Ï¡¢¥¿¥°¤Î¸å¤«¤é¡¢¼¡¤Î¥¿¥°¤ÎÁ°¡¢¤Þ¤¿¤Ï¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ÎºÇ¸å¤Þ¤Ç¤Î´Ö¤Ëµ­½Ò¤µ¤ì¤¿¥Æ¥­¥¹¥È¤Ç¤¹(¥¿¥°¤Þ¤¿¤Ï¥³¥á¥ó¥È¶èÀÚ¤êʸ»ú¤ò½ü¤¯)¡£¤³¤Î´ØÏ¢¥Æ¥­¥¹¥È¤Ï¡¢Ê£¿ô¹Ô¤Ë¤ï¤¿¤Ã¤Æµ­½Ò¤Ç¤­¤Þ¤¹¡£¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°¤Ï¡¢¥Æ¥­¥¹¥È¤òµ­½Ò¤Ç¤­¤ë¾ì½ê¤Ç¤¢¤ì¤Ð¤É¤³¤Ë¤Ç¤âÃÖ¤¯¤³¤È¤¬¤Ç¤­¡¢²ò¼á¤µ¤ì¤Þ¤¹¡£¼¡¤ÎÎã¤Ë¤Ï¥Ö¥í¥Ã¥¯¡¦¥¿¥°\f2@deprecated\fP¤È¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°\f2{@link}\fP¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
++.nf
++\f3
++.fl
++/**
++.fl
++ * @deprecated As of JDK 1.1, replaced by {@link #setBounds(int,int,int,int)}
++.fl
++ */
++.fl
++\fP
++.fi
++.LP
++\f3¥³¥á¥ó¥È¤ÏHTML¤Çµ­½Ò¤¹¤ë\fP \- ¥Æ¥­¥¹¥È¤ÏHTML¤Çµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢HTML¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ë¤³¤È¡¢¤ª¤è¤ÓHTML¥¿¥°¤ò»ÈÍѤǤ­¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£HTML¤Î¥Ð¡¼¥¸¥ç¥ó¤È¤·¤Æ¤Ï¡¢»ÈÍѤ¹¤ë¥Ö¥é¥¦¥¶¤¬¥µ¥Ý¡¼¥È¤¹¤ëǤ°Õ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò»ÈÍѤǤ­¤Þ¤¹¡£É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤Ï¡¢¥«¥¹¥±¡¼¥Ç¥£¥ó¥°¡¦¥¹¥¿¥¤¥ë¡¦¥·¡¼¥È¤ª¤è¤Ó¥Õ¥ì¡¼¥à¤ò´Þ¤á¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È°Ê³°¤ÎÉôʬ¤ÇHTML 3.2¤Ë½àµò¤·¤¿¥³¡¼¥É¤òÀ¸À®¤¹¤ë¤è¤¦¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£(¤¿¤À¤·¡¢¥Õ¥ì¡¼¥à¡¦¥»¥Ã¥ÈÂбþ¤Î¤¿¤á¡¢À¸À®¤µ¤ì¤ë³Æ¥Õ¥¡¥¤¥ë¤Ë¤Ï¡ÖHTML 4.0¡×¤ÈÀèƬ¤Ëµ­½Ò¤µ¤ì¤Þ¤¹¡£)
++.LP
++¤¿¤È¤¨¤Ð¡¢¤è¤ê¾®¤µ¤¤(\f2<\fP)µ­¹æ¤ª¤è¤Ó¤è¤êÂ礭¤¤(\f2>\fP)µ­¹æ¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢\f2<\fP¤ª¤è¤Ó\f2>\fP¤Èµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Æ±Íͤˡ¢¥¢¥ó¥Ñ¥µ¥ó¥É(\f2&\fP)¤Ï\f2&\fP¤Èµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤ÎÎã¤Ç¤Ï¡¢ÂÀ»ú¤ÎHTML¥¿¥°\f2<b>\fP¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£
++.LP
++¼¡¤Ë¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++/**
++.fl
++ * This is a <b>doc</b> comment.
++.fl
++ * @see java.lang.Object
++.fl
++ */
++.fl
++\fP
++.fi
++.LP
++\f3¹ÔƬ¤Î¥¢¥¹¥¿¥ê¥¹¥¯\fP \- Javadoc¤Ë¤è¤ë¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î²òÀÏ»þ¤Ë¡¢³Æ¹Ô¤ÎÀèƬ¤Ë¤¢¤ë¥¢¥¹¥¿¥ê¥¹¥¯(\f2*\fP)ʸ»ú¤ÏÇË´þ¤µ¤ì¤Þ¤¹¡£ºÇ½é¤Î¥¢¥¹¥¿¥ê¥¹¥¯(\f2*\fP)ʸ»ú¤è¤êÁ°¤Ë¤¢¤ë¶õÇò¤ä¥¿¥Ö¤âÇË´þ¤µ¤ì¤Þ¤¹¡£¥Ð¡¼¥¸¥ç¥ó1.4¤«¤é¤Ï¡¢¹Ô¤ÎÀèƬ¤Î¥¢¥¹¥¿¥ê¥¹¥¯¤ò¾Êά¤·¤Æ¤â¡¢ÀèƬ¤Î¶õÇòʸ»ú¤Ïºï½ü¤µ¤ì¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£¤³¤Î¤¿¤á¡¢¥³¡¼¥ÉÎã¤òľÀܥɥ­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î\f2<PRE>\fP¥¿¥°Æâ¤ËÄ¥¤êÉÕ¤±¤Æ¤â¡¢¥¤¥ó¥Ç¥ó¥È¤¬ÊÝ»ý¤µ¤ì¤Þ¤¹¡£Ä̾¥Ö¥é¥¦¥¶¤Ï¡¢¶õÇòʸ»ú¤ò¥¿¥Ö¤è¤ê¤â°ìΧ¤Ë²ò¼á¤·¤Þ¤¹¡£¥¤¥ó¥Ç¥ó¥È¤Îµ¯ÅÀ¤Ï(¶èÀÚ¤êʸ»ú\f2/**\fP¤Þ¤¿¤Ï\f2<PRE>\fP¥¿¥°¤Ç¤Ï¤Ê¤¯)º¸¥Þ¡¼¥¸¥ó¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++\f3ºÇ½é¤Îʸ\fP \- ³Æ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ÎºÇ½é¤Îʸ¤Ï¡¢Àë¸À¤µ¤ì¤Æ¤¤¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤Ë´Ø¤¹¤ë´Ê·é¤«¤Ä´°Á´¤ÊÍ×Ìóʸ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Îʸ¤Ï¡¢¶õÇò¡¢¥¿¥Ö¡¢¤Þ¤¿¤Ï¹Ô½ªÎ»Ê¸»ú¤¬Â³¤¯ºÇ½é¤Î¥Ô¥ê¥ª¥É¡¢¤Þ¤¿¤ÏºÇ½é¤Î¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤¬¤¢¤ë°ÌÃ֤ǽª¤ï¤ê¤Þ¤¹¡£ºÇ½é¤Îʸ¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤ÆHTML¥Ú¡¼¥¸¤ÎÀèƬ¤Ë¤¢¤ë¥á¥ó¥Ð¡¼¤Î³µÍפÎÉôʬ¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
++.LP
++\f3Ê£¿ô¥Õ¥£¡¼¥ë¥É¤ÎÀë¸À\fP \- Java¤Ç¤Ï¡¢1¤Ä¤Îʸ¤ÇÊ£¿ô¤Î¥Õ¥£¡¼¥ë¥É¤òÀë¸À¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢¤³¤Îʸ¤Ë¤Ï¡¢1¤Ä¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤·¤«µ­½Ò¤Ç¤­¤Þ¤»¤ó¡£¤½¤Î¥³¥á¥ó¥È¤¬¡¢¤¹¤Ù¤Æ¤Î¥Õ¥£¡¼¥ë¥É¤ËÂФ·¤Æ¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Õ¥£¡¼¥ë¥É¤´¤È¤Ë¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤òµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢³Æ¥Õ¥£¡¼¥ë¥É¤òÊÌ¡¹¤Îʸ¤ÇÀë¸À¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ï¡¢1¤Ä¤ÎÀë¸À¤È¤·¤Æµ­½Ò¤¹¤ë¤ÈÉÔŬÀڤǤ¹¡£¤³¤Î¾ì¹ç¤Ï¡¢Àë¸À¤ò2¤Ä¤Ëʬ¤±¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++/**
++.fl
++ * The horizontal and vertical distances of point (x,y)
++.fl
++ */
++.fl
++public int x, y; // Avoid this
++.fl
++\fP
++.fi
++.LP
++¾å¤Î¥³¡¼¥É¤«¤é¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++public int \fP\f3x\fP
++.fl
++.fi
++.RS 3
++The horizontal and vertical distances of point (x,y)
++.RE
++.nf
++\f3
++.fl
++public int \fP\f3y\fP
++.fl
++.fi
++.RS 3
++The horizontal and vertical distances of point (x,y)
++.RE
++.LP
++\f3¸«½Ð¤·¥¿¥°¤Î»ÈÍѤˤÏÍ×Ãí°Õ\fP \- ¥á¥ó¥Ð¡¼¤ËÂФ·¤Æ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤òµ­½Ò¤¹¤ë¤È¤­¤Ë¤Ï¡¢<H1>¤ä<H2>¤Ê¤É¤ÎHTML¸«½Ð¤·¥¿¥°¤ò»ÈÍѤ·¤Ê¤¤¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢´°Á´¤Ê¹½Â¤²½¥É¥­¥å¥á¥ó¥È¤òºîÀ®¤¹¤ë¤Î¤Ç¡¢¤³¤Î¤è¤¦¤Ê¹½Â¤²½¥¿¥°¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¤È¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤Î·Á¼°¤¬°­±Æ¶Á¤ò¼õ¤±¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤¿¤À¤·¡¢¥¯¥é¥¹¤ä¥Ñ¥Ã¥±¡¼¥¸¤Î¥³¥á¥ó¥È¤Ç¤Ï¡¢¤³¤ì¤é¤Î¸«½Ð¤·¤ò»ÈÍѤ·¤ÆÆȼ«¤Î¹½Â¤¤ò»ØÄꤷ¤Æ¤«¤Þ¤¤¤Þ¤»¤ó¡£
++.SS
++¥á¥½¥Ã¥É¡¦¥³¥á¥ó¥È¤Î¼«Æ°¥³¥Ô¡¼
++.LP
++Javadoc¥Ä¡¼¥ë¤Ë¤Ï¡¢¼¡¤Î2¤Ä¤Î¾ì¹ç¤Ë¡¢¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥á¥½¥Ã¥É¡¦¥³¥á¥ó¥È¤ò¥³¥Ô¡¼¤Þ¤¿¤Ï¡Ö·Ñ¾µ¡×¤¹¤ëµ¡Ç½¤¬¤¢¤ê¤Þ¤¹¡£¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥Õ¥£¡¼¥ë¥É¡¢¤ª¤è¤Ó¥Í¥¹¥È¤µ¤ì¤¿¥¯¥é¥¹¤Ï¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò·Ñ¾µ¤·¤Þ¤»¤ó¡£
++.RS 3
++.TP 2
++o
++\f3¼«Æ°Åª¤Ë¥³¥á¥ó¥È¤ò·Ñ¾µ¤·¤Æ¸«¤Ä¤«¤é¤Ê¤¤¥Æ¥­¥¹¥È¤òËä¤á¤ë\fP \- ¼çÀâÌÀ¡¢\f2@return\fP¥¿¥°¡¢\f2@param\fP¥¿¥°¡¢¤Þ¤¿¤Ï\f2@throws\fP ¥¿¥°¤¬¥á¥½¥Ã¥É¡¦¥³¥á¥ó¥È¤Ë¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¥á¥½¥Ã¥É¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Þ¤¿¤Ï¼ÂÁõ¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¤½¤Î¥á¥½¥Ã¥É¤«¤é¡¢Âбþ¤¹¤ë¼çÀâÌÀ¤Þ¤¿¤Ï¥¿¥°¡¦¥³¥á¥ó¥È¤ò¡¢¼¡¤Î¥¢¥ë¥´¥ê¥º¥à¤Ë½¾¤Ã¤Æ¥³¥Ô¡¼¤·¤Þ¤¹¡£
++.LP
++¸·Ì©¤Ë¤Ï¡¢ÆÃÄê¤Î¥Ñ¥é¥á¡¼¥¿¤Î\f2@param\fP¥¿¥°¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¡¢¤½¤Î¥Ñ¥é¥á¡¼¥¿¤Î¥³¥á¥ó¥È¤¬¡¢¾å°Ì¤Î·Ñ¾µ³¬ÁؤΥ᥽¥Ã¥É¤«¤é¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£ÆÃÄê¤ÎÎã³°¤Î\f2@throws\fP¥¿¥°¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¡¢¤½¤ÎÎã³°¤¬Àë¸À¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë\f2¤«¤®¤ê\fP¡¢\f2@throws\fP¥¿¥°¤¬¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
++.LP
++¤³¤ÎÆ°ºî¤Ï¥Ð¡¼¥¸¥ç¥ó1.3°ÊÁ°¤ÎÆ°ºî¤È¤ÏÂоÈŪ¤Ç¤¹¡£¤³¤ì¤Þ¤Ç¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢¼çÀâÌÀ¤Þ¤¿¤Ï¥¿¥°¤¬Â¸ºß¤¹¤ì¤Ð¡¢¥³¥á¥ó¥È¤Ï°ìÀڷѾµ¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£
++.TP 2
++o
++\f3{@inheritDoc}¥¿¥°¤ò´Þ¤à¥³¥á¥ó¥È¤òÌÀ¼¨Åª¤Ë·Ñ¾µ¤¹¤ë\fP \- ¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°\f2{@inheritDoc}\fP¤ò¡¢¥á¥½¥Ã¥É¤Î¼çÀâÌÀÆâ¤Þ¤¿¤Ï\f2@return\fP¥¿¥°¡¢\f2@param\fP¥¿¥°¡¢¤Þ¤¿¤Ï\f2@throws\fP¤Î¤¤¤º¤ì¤«¤Î¥¿¥°¡¦¥³¥á¥ó¥ÈÆâ¤ËÁÞÆþ¤·¤Þ¤¹¡£Âбþ¤¹¤ë·Ñ¾µ¤µ¤ì¤¿¼çÀâÌÀ¤Þ¤¿¤Ï¥¿¥°¡¦¥³¥á¥ó¥È¤¬¤½¤Î°ÌÃ֤˥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
++.RE
++.LP
++¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò¼ÂºÝ¤Ë¥³¥Ô¡¼¤ËÍøÍѤ¹¤ë¤Ë¤Ï¡¢·Ñ¾µ¤·¤¿¥á¥½¥Ã¥É¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬\-sourcepath¤Ç»ØÄꤷ¤¿¥Ñ¥¹¤Î¤ß¤ËÃÖ¤«¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¡¢¥¯¥é¥¹¤â¥Ñ¥Ã¥±¡¼¥¸¤âÅϤ¹É¬ÍפϤ¢¤ê¤Þ¤»¤ó¡£¤³¤ÎÅÀ¤Ï¡¢¥¯¥é¥¹¤¬¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤Ç¤¢¤ë¤³¤È¤¬É¬ÍפÀ¤Ã¤¿1.3.x°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤È°Û¤Ê¤ê¤Þ¤¹¡£
++.LP
++\f3¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤«¤é¤Î·Ñ¾µ\fP \- ¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤«¤é·Ñ¾µ¤¹¤ë¼¡¤Î3¤Ä¤Î¾ì¹ç¤Ë¡¢¥³¥á¥ó¥È¤Î·Ñ¾µ¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++¥¯¥é¥¹¤Î¥á¥½¥Ã¥É¤¬¥¹¡¼¥Ñ¡¼¥¯¥é¥¹¤Î¥á¥½¥Ã¥É¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Æ¤¤¤ë¾ì¹ç
++.TP 2
++o
++¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥á¥½¥Ã¥É¤¬¥¹¡¼¥Ñ¡¼¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥á¥½¥Ã¥É¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Æ¤¤¤ë¾ì¹ç
++.TP 2
++o
++¥¯¥é¥¹¤Î¥á¥½¥Ã¥É¤¬¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥á¥½¥Ã¥É¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¾ì¹ç
++.RE
++.LP
++ºÇ½é¤Î2¤Ä¤Î¥±¡¼¥¹(¥á¥½¥Ã¥É¤¬¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Æ¤¤¤ë¾ì¹ç)¤Ç¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¤½¤Î¥³¥á¥ó¥È¤¬·Ñ¾µ¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë¤«¤«¤ï¤é¤º¡¢¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Æ¤¤¤ë¥á¥½¥Ã¥É¤Î¥É¥­¥å¥á¥ó¥ÈÆâ¤Ë¡Ö¥ª¡¼¥Ð¡¼¥é¥¤¥É¡×¤È¤¤¤¦¾®¸«½Ð¤·¤òÀ¸À®¤·¡¢¥ª¡¼¥Ð¡¼¥é¥¤¥É¤µ¤ì¤Æ¤¤¤ë¥á¥½¥Ã¥É¤Ø¤Î¥ê¥ó¥¯¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£
++.LP
++3¤ÄÌܤΥ±¡¼¥¹(ÆÃÄê¤Î¥¯¥é¥¹¤Î¥á¥½¥Ã¥É¤¬¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥á¥½¥Ã¥É¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¾ì¹ç)¤Ç¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Æ¤¤¤ë¥á¥½¥Ã¥É¤Î¥É¥­¥å¥á¥ó¥ÈÆâ¤Ë¡ÖÄêµÁ¡×¤È¤¤¤¦¾®¸«½Ð¤·¤òÀ¸À®¤·¡¢¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¥á¥½¥Ã¥É¤Ø¤Î¥ê¥ó¥¯¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥³¥á¥ó¥È¤¬·Ñ¾µ¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ë¤«¤«¤ï¤ê¤Þ¤»¤ó¡£
++.LP
++\f3¥á¥½¥Ã¥É¡¦¥³¥á¥ó¥È¤¬·Ñ¾µ¤µ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à\fP \- ¤¢¤ë¥á¥½¥Ã¥É¤Ë¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤¬µ­½Ò¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï{@inheritDoc}¥¿¥°¤¬¤¢¤ë¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¼¡¤Î¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤ÆŬÀڤʥ³¥á¥ó¥È¤ò¸¡º÷¤·¤Þ¤¹¡£¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢ºÇ¤â¸·Ì©¤ËŬÀڤʥɥ­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò¸¡º÷¤Ç¤­¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤ª¤ê¡¢¥¹¡¼¥Ñ¡¼¥¯¥é¥¹¤è¤ê¤â¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬Í¥À褵¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
++.RS 3
++.TP 3
++1.
++ľÀܤ˼ÂÁõ¤µ¤ì¤Æ¤¤¤ë(¤Þ¤¿¤Ï¡¢³ÈÄ¥¤µ¤ì¤Æ¤¤¤ë)¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò¡¢¥á¥½¥Ã¥É¤ÎÀë¸À¤Ç¡Öimplements¡×(¤Þ¤¿¤Ï¡Öextends¡×)¤È¤¤¤¦¸ì¤Î¸å¤Ë½Ð¸½¤¹¤ë½ç½ø¤Ç¡¢1¤Ä¤º¤ÄÄ´¤Ù¤Þ¤¹¡£¤³¤Î¥á¥½¥Ã¥É¤Ë¤Ä¤¤¤ÆºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤òºÎÍѤ·¤Þ¤¹¡£
++.TP 3
++2.
++¼ê½ç1¤Ç¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢Ä¾ÀܼÂÁõ¤µ¤ì¤Æ¤¤¤ë(¤Þ¤¿¤Ï¡¢³ÈÄ¥¤µ¤ì¤Æ¤¤¤ë)¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¤½¤ì¤¾¤ì¤ËÂФ·¤Æ¡¢¤³¤Î¥¢¥ë¥´¥ê¥º¥àÁ´ÂΤòºÆµ¢Åª¤ËŬÍѤ·¤Þ¤¹(¤½¤ÎºÝ¤Î½ç½ø¤Ï¡¢¼ê½ç1¤Ç¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ´¤Ù¤¿¤È¤­¤Î½ç½ø¤ÈƱ¤¸)¡£
++.TP 3
++3.
++¼ê½ç2¤Ç¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¤Ç¡¢¤³¤Î¥¯¥é¥¹¤¬Object°Ê³°¤Î¥¯¥é¥¹¤Ç¤¢¤ë(¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤Ï¤Ê¤¤)¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë½èÍý¤·¤Þ¤¹¡£
++.RS 3
++.TP 3
++a.
++¥¹¡¼¥Ñ¡¼¥¯¥é¥¹¤Ë¤³¤Î¥á¥½¥Ã¥É¤Ë¤Ä¤¤¤Æ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤¬µ­½Ò¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥³¥á¥ó¥È¤òºÎÍѤ·¤Þ¤¹¡£
++.TP 3
++b.
++¼ê½ç3a¤Ç¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¥¹¡¼¥Ñ¡¼¥¯¥é¥¹¤ËÂФ·¤Æ¡¢¤³¤Î¥¢¥ë¥´¥ê¥º¥àÁ´ÂΤòºÆµ¢Åª¤ËŬÍѤ·¤Þ¤¹¡£
++.RE
++.RE
++.SH "javadoc¥¿¥°"
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢Java¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤ËËä¤á¹þ¤Þ¤ì¤¿ÆÃÊ̤ʥ¿¥°¤ò²òÀϤ·¤Þ¤¹¡£¤³¤ì¤é¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥¿¥°¤ò»ÈÍѤ¹¤ë¤È¡¢´°Á´¤ÊÀ°·Á¼°¤ÎAPI¤ò¥½¡¼¥¹¡¦¥³¡¼¥É¤«¤é¼«Æ°Åª¤ËÀ¸À®¤Ç¤­¤Þ¤¹¡£¥¿¥°¤Ï¡Ö¥¢¥Ã¥È¥Þ¡¼¥¯¡×µ­¹æ(\f2@\fP)¤Ç»Ï¤Þ¤ê¡¢Âçʸ»ú¤È¾®Ê¸»ú¤¬¶èÊ̤µ¤ì¤Þ¤¹¡£¤³¤ì¤é¤Î¥¿¥°¤Ï¡¢É½¼¨¤µ¤ì¤Æ¤¤¤ë¤È¤ª¤ê¤ËÂçʸ»ú¤È¾®Ê¸»ú¤ò»ÈÍѤ·¤ÆÆþÎϤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥¿¥°¤Ï¡¢¹Ô¤ÎÀèƬ(ÀèƬ¤Î¶õÇòʸ»ú¤È¾Êά²Äǽ¤Ê¥¢¥¹¥¿¥ê¥¹¥¯¤Î¸å)¤ËÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤·¤Ê¤¤¤È¡¢Ä̾ï¤Î¥Æ¥­¥¹¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£´·Îã¤È¤·¤Æ¡¢Æ±¤¸Ì¾Á°¤Î¥¿¥°¤Ï1²Õ½ê¤Ë¤Þ¤È¤á¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2@see\fP¥¿¥°¤¬Ê£¿ô¤¢¤ë¾ì¹ç¤Ï¡¢¤¹¤Ù¤ÆƱ¤¸¾ì½ê¤Ë¤Þ¤È¤á¤ÆÇÛÃÖ¤·¤Þ¤¹¡£
++.LP
++¥¿¥°¤Ë¤Ï¼¡¤Î2¤Ä¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f3¥Ö¥í¥Ã¥¯¡¦¥¿¥°\fP \- ¼çÀâÌÀ¤Ë³¤¯¥¿¥°¡¦¥»¥¯¥·¥ç¥óÆâ¤Ë¤Î¤ßµ­½Ò²Äǽ¡£¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤Ï¡¢\f2@tag\fP¤Î·Á¼°¤ò¤È¤ê¤Þ¤¹¡£
++.TP 2
++o
++\f3¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°\fP \- ¼çÀâÌÀÆâ¡¢¤Þ¤¿¤Ï¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤Î¥³¥á¥ó¥ÈÆâ¤Ëµ­½Ò²Äǽ¡£¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°¤Ï¡¢\f2{@tag}\fP¤Î¤è¤¦¤ËÃæ³ç¸Ì¤Ç°Ï¤ß¤Þ¤¹¡£
++.RE
++.LP
++¸½»þÅÀ¤ÇÍ­¸ú¤Ê¥¿¥°¤Ï¡¢¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.LP
++.TS
++.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
++.de 35
++.ps \n(.s
++.vs \n(.vu
++.in \n(.iu
++.if \n(.u .fi
++.if \n(.j .ad
++.if \n(.j=0 .na
++..
++.nf
++.nr #~ 0
++.if n .nr #~ 0.6n
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.fc
++.nr 33 \n(.s
++.rm 80 81
++.nr 80 0
++.nr 38 \w\f3¥¿¥°\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@author\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2{@code}\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2{@docRoot}\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@deprecated\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@exception\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2{@inheritDoc}\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2{@link}\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2{@linkplain}\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2{@literal}\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@param\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@return\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@see\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@serial\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@serialData\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@serialField\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@since\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@throws\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2{@value}\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f2@version\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ƳÆþ¤µ¤ì¤¿JDK/SDK\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.0
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.5
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.3
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.0
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.0
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.4
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.2
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.4
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.5
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.0
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.0
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.0
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.2
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.2
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.2
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.1
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.2
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.4
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w1.0
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 861 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3¥¿¥°\fP\h'|\n(41u'\f3ƳÆþ¤µ¤ì¤¿JDK/SDK\fP
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2{@code}\fP\h'|\n(41u'1.5
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2@deprecated\fP\h'|\n(41u'1.0
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2{@inheritDoc}\fP\h'|\n(41u'1.4
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2{@linkplain}\fP\h'|\n(41u'1.4
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2@param\fP\h'|\n(41u'1.0
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2@see\fP\h'|\n(41u'1.0
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2@serialData\fP\h'|\n(41u'1.2
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2@since\fP\h'|\n(41u'1.1
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2{@value}\fP\h'|\n(41u'1.4
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f2@version\fP\h'|\n(41u'1.0
++.fc
++.nr T. 1
++.T# 1
++.35
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-42
++.LP
++¥«¥¹¥¿¥à¡¦¥¿¥°¤Ë¤Ä¤¤¤Æ¤Ï¡¢\-tag¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RS 3
++.TP 3
++@author\ name\-text
++\-author¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¡ÖºîÀ®¼Ô¡×¥¨¥ó¥È¥ê¤òÄɲ䷤ơ¢»ØÄꤵ¤ì¤¿\f2name\-text\fP¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£1¤Ä¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ËÊ£¿ô¤Î\f2@author\fP¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£1¤Ä¤Î\f2@author\fP¥¿¥°¤Ë1¤Ä¤Î̾Á°¤ò»ØÄꤹ¤ë¤³¤È¤â¡¢Ê£¿ô¤Î̾Á°¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£Á°¼Ô¤Î¾ì¹ç¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ̾Á°¤È̾Á°¤Î´Ö¤Ë¥«¥ó¥Þ(\f2,\fP)¤È¶õÇòʸ»ú¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹¡£¸å¼Ô¤Î¾ì¹ç¤Ï¡¢¥Æ¥­¥¹¥ÈÁ´ÂΤ¬¡¢²òÀϤµ¤ì¤ë¤³¤È¤Ê¤¯¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¤½¤Î¤Þ¤Þ¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥«¥ó¥Þ¤Ç¤Ï¤Ê¤¯¡¢³Æ¸À¸ì¤ËÂбþ¤·¤¿Ì¾Á°¶èÀÚ¤êʸ»ú¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ë¤È¤­¤Ï¡¢1¤Ä¤Î¥¿¥°¤ËÊ£¿ô¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++.LP
++¾ÜºÙ¤Ï¡¢¥¿¥°¤ò»ÈÍѤǤ­¤ë¾ì½ê¤ª¤è¤Ó
++.na
++\f2@author¥¿¥°¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@author¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.RS 3
++.TP 3
++@deprecated\ deprecated\-text Ãí°Õ: @DeprecatedÃí¼á¤ò»ÈÍѤ·¤Æ¡¢¥×¥í¥°¥é¥àÍ×ÁǤòÈó¿ä¾©¤Ë¤Ç¤­¤Þ¤¹¡£
++.RE
++.LP
++¤³¤ÎAPI¤ÏÆ°ºî¤·Â³¤±¤Þ¤¹¤¬¡¢¤³¤ÎAPI¤ò»ÈÍѤ·¤Ê¤¤¤³¤È¤òÁ¦¤á¤ë¥³¥á¥ó¥È¤òÄɲä·¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢\f2deprecated\-text\fP¤ò¼çÀâÌÀ¤ÎÁ°¤Ë°ÜÆ°¤·¤Æ¥¤¥¿¥ê¥Ã¥¯¤Ë¤·¡¢¤½¤ÎÁ°¤ËÂÀ»ú¤Î·Ù¹ð¡Ö¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¡×¤òÄɲä·¤Þ¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¡¢¤Ä¤Þ¤ê³µÍס¢¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¤ª¤è¤Ó¥Õ¥£¡¼¥ë¥É¤ÇÍ­¸ú¤Ç¤¹¡£
++.LP
++\f2deprecated\-text\fP¤ÎºÇ½é¤Îʸ¤Ç¤Ï¡¢¾¯¤Ê¤¯¤È¤â¡¢¤½¤ÎAPI¤¬¿ä¾©¤µ¤ì¤Ê¤¯¤Ê¤Ã¤¿»þ´ü¤È¡¢ÂåÂؤȤ·¤Æ»ÈÍѤ¹¤ëAPI¤ò¥æ¡¼¥¶¡¼¤ËÄ󼨤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢¤³¤ÎºÇ½é¤Îʸ¤Î¤ß¤ò¡¢³µÍ×¥»¥¯¥·¥ç¥ó¤Èº÷°ú¤Ë¥³¥Ô¡¼¤·¤Þ¤¹¡£¤½¤Î¸å¤Îʸ¤Ç¤Ï¡¢¿ä¾©¤µ¤ì¤Ê¤¤Íýͳ¤òÀâÌÀ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤«¤ï¤ê¤ÎAPI¤ò»Ø¤·¼¨¤¹\f2{@link}\fP¥¿¥°(Javadoc 1.2°Ê¹ß¤Î¾ì¹ç)¤ò´Þ¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++¾ÜºÙ¤Ï¡¢
++.na
++\f2@deprecated¥¿¥°¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@deprecated¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RS 3
++.TP 2
++o
++Javadoc 1.2°Ê¹ß¤Ç¤Ï¡¢\f2{@link}\fP¥¿¥°¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢É¬Íפʾì½ê¤Ë¥¤¥ó¥é¥¤¥ó¤Ç¥ê¥ó¥¯¤òºîÀ®¤Ç¤­¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++/**
++.fl
++ * @deprecated As of JDK 1.1, replaced by {@link #setBounds(int,int,int,int)}
++.fl
++ */
++.fl
++
++.fl
++\fP
++.fi
++.TP 2
++o
++Javadoc 1.1¤Ç¤Ï¡¢\f2@see\fP¥¿¥°(¥¤¥ó¥é¥¤¥ó¤ÏÉÔ²Ä)¤ò\f2@deprecated\fP¥¿¥°¤´¤È¤ËºîÀ®¤¹¤ë¤Î¤¬É¸½à¤Î·Á¼°¤Ç¤¹¡£
++.RE
++.LP
++¿ä¾©¤µ¤ì¤Ê¤¤¥¿¥°¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2@deprecated¥¿¥°\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html¤Î¥É¥­¥å¥á¥ó¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.RS 3
++.TP 3
++{@code\ text}
++\f2<code>{@literal}</code>\fP¤ÈƱÅù¤Ç¤¹¡£
++.LP
++¥Æ¥­¥¹¥È¤òHTML¥Þ¡¼¥¯¥¢¥Ã¥×¤Þ¤¿¤Ï¥Í¥¹¥È¤µ¤ì¤¿javadoc¥¿¥°¤È¤·¤Æ²ò¼á¤»¤º¤Ë¡¢\f2text\fP¤ò\f2¥³¡¼¥É\fP¡¦¥Õ¥©¥ó¥È¤Çɽ¼¨¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç¤Ï¡¢¥Ñ¥é¥á¡¼¥¿¤Î·¿(\f2<Object>\fP)¡¢ÉÔÅù¹æ(\f23 < 4\fP)¡¢Ìð°õ(\f2<\-\fP)¤Ê¤É¤Ç¡¢Ä̾ï¤Î»³³ç¸Ì(\f2<\fP¤ª¤è¤Ó\f2>\fP)¤òHTML¥¨¥ó¥Æ¥£¥Æ¥£(\f2<\fP¤ª¤è¤Ó\f2>\fP)¤Î¤«¤ï¤ê¤Ë»ÈÍѤǤ­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È
++.nf
++\f3
++.fl
++ \fP\f4{@code A<B>C}\fP\f3
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¤Ï¡¢À¸À®¤µ¤ì¤¿HTML¥Ú¡¼¥¸¤Ç¡¢¼¡¤Î¤è¤¦¤Ë¤½¤Î¤Þ¤Þɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \fP\f4A<B>C\fP\f3
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¤³¤³¤ÇÃíÌܤËÃͤ¹¤ë¤Î¤Ï¡¢\f2<B>\fP¤¬ÂÀ»ú¤È¤·¤Æ²ò¼á¤µ¤ì¤º¡¢¤½¤Î¥Õ¥©¥ó¥È¤Ï¥³¡¼¥É¡¦¥Õ¥©¥ó¥È¤Ë¤Ê¤ë¡¢¤È¤¤¤¦ÅÀ¤Ç¤¹¡£
++.LP
++¥³¡¼¥É¡¦¥Õ¥©¥ó¥È¤Ê¤·¤ÇƱ¤¸µ¡Ç½¤ò¼Â¸½¤¹¤ë¤Ë¤Ï¡¢\f2{@literal}\fP¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.TP 3
++{@docRoot}
++À¸À®¤µ¤ì¤ë¥Ú¡¼¥¸¤«¤é¤Î¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤Î(À¸À®Àè)¥ë¡¼¥È¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÁêÂХѥ¹¤òɽ¤·¤Þ¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢Ãøºî¸¢¤Î¥Ú¡¼¥¸¤ä²ñ¼Ò¤Î¥í¥´¤Ê¤É¡¢À¸À®¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥Ú¡¼¥¸¤«¤é»²¾È¤¹¤ë¥Õ¥¡¥¤¥ë¤òÁȤ߹þ¤à¤È¤­¤ËÊØÍø¤Ç¤¹¡£Ä̾ï¤Ï¡¢³Æ¥Ú¡¼¥¸¤ÎºÇ²¼Éô¤«¤éÃøºî¸¢¤Î¥Ú¡¼¥¸¤Ë¥ê¥ó¥¯¤·¤Þ¤¹¡£
++.LP
++¤³¤Î\f2{@docRoot}\fP¥¿¥°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤â¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤Ç¤â»ÈÍѤǤ­¤Þ¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢@return¡¢@param¡¢@deprecated¤Ê¤É¤ÎǤ°Õ¤Î¥¿¥°¤Î¥Æ¥­¥¹¥ÈÉôʬ¤ò´Þ¤à¡¢¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¡¢¤Ä¤Þ¤ê³µÍס¢¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¤ª¤è¤Ó¥Õ¥£¡¼¥ë¥É¤ÇÍ­¸ú¤Ç¤¹¡£
++.RS 3
++.TP 3
++1.
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤Ï¡¢¥Ø¥Ã¥À¡¼¡¢¥Õ¥Ã¥¿¡¼¡¢¤Þ¤¿¤Ï¥Ü¥È¥à¤Ï¼¡¤Î¤è¤¦¤ËÄêµÁ¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ javadoc \-bottom '<a href="{@docRoot}/copyright.html">Copyright</a>'
++.fl
++
++.fl
++\fP
++.fi
++.LP
++Ãí°Õ \- \f2{@docRoot}\fP¤òMakefileÆâ¤Ç¤³¤Î¤è¤¦¤ËÍøÍѤ¹¤ë¾ì¹ç¡¢°ìÉô¤ÎMakefile¥×¥í¥°¥é¥à¤Ç¤Ï¡¢Ãæ³ç¸Ì{ }ʸ»ú¤òÆÃÊ̤˥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Inprise MAKE¥Ð¡¼¥¸¥ç¥ó5.2¤òWindows¾å¤Ç¼Â¹Ô¤¹¤ë¾ì¹ç¤Ï¡¢\f2{{@docRoot}}\fP¤Î¤è¤¦¤Ë¡¢Ãæ³ç¸Ì¤òÆó½Å¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤µ¤é¤Ë¡¢\f2\-bottom\fP¤Ê¤É¤Î¥ª¥×¥·¥ç¥ó¤ËÂФ¹¤ë°ú¿ô¤ò¡¢°ì½Å°úÍÑÉä¤Ç¤Ï¤Ê¤¯Æó½Å°úÍÑÉä¤Ç°Ï¤àɬÍפ⤢¤ê¤Þ¤¹(\f2href\fP°ú¿ô¤ò°Ï¤à°úÍÑÉä¤Ï¾Êά)¡£
++.TP 3
++2.
++¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ÎÃæ¤Ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ /**
++.fl
++ * See the <a href="{@docRoot}/copyright.html">Copyright</a>.
++.fl
++ */
++.fl
++
++.fl
++\fP
++.fi
++.RE
++.LP
++¤³¤Î¥¿¥°¤¬É¬ÍפÊÍýͳ¤Ï¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤¬¡¢¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤ÈƱ¤¸¿¼¤µ¤ò»ý¤Ä³¬Áع½Â¤¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤ë¤«¤é¤Ç¤¹¡£¼°
++.nf
++\f3
++.fl
++ <a href="{@docRoot}/copyright.html">
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¤Ï¡¢¼¡¤Î¤è¤¦¤Ë²ò·è¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ <a href="../../copyright.html"> for java/lang/Object.java
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¤ª¤è¤Ó
++.nf
++\f3
++.fl
++ <a href="../../../copyright.html"> for java/lang/ref/Reference.java
++.fl
++
++.fl
++\fP
++.fi
++.LP
++.TP 3
++@exception\ class\-name\ description
++\f2@exception\fP¥¿¥°¤Ï¡¢\f2@throws\fP¤ÈƱµÁ¤Ç¤¹¡£
++.LP
++.TP 3
++{@inheritDoc}\
++ºÇ¤â¶á¤¤·Ñ¾µ²Äǽ¤Ê¥¯¥é¥¹¤Þ¤¿¤Ï¼ÂÁõ²Äǽ¤Ê¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤«¤é¡¢¤³¤Î¥¿¥°¤Î°ÌÃ֤ˤ¢¤ë¸½ºß¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ë¡¢¥É¥­¥å¥á¥ó¥È¤ò·Ñ¾µ(¥³¥Ô¡¼)¤·¤Þ¤¹¡£¤³¤Îµ¡Ç½¤Ë¤è¤ê¡¢¤è¤êÈÆÍÑŪ¤Ê¥³¥á¥ó¥È¤ò·Ñ¾µ¥Ä¥ê¡¼¤Î¾å°Ì¤Ëµ­½Ò¤·¡¢¥³¥Ô¡¼¤·¤¿¥Æ¥­¥¹¥È¤ò»ÈÍѤ·¤Æµ­½Ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++¤³¤Î¥¿¥°¤Ï¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î¼¡¤Î°ÌÃ֤ǤΤßÍ­¸ú¤Ç¤¹¡£
++.RS 3
++.TP 2
++o
++¥á¥½¥Ã¥É¤Î¼çÀâÌÀ¥Ö¥í¥Ã¥¯Æâ¡£¤³¤Î¾ì¹ç¡¢¼çÀâÌÀ¤Ï¡¢¾å°Ì³¬ÁؤΥ¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤«¤é¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
++.TP 2
++o
++¥á¥½¥Ã¥É¤Î@return¡¢@param¡¢@throws¥¿¥°¤Î¥Æ¥­¥¹¥È°ú¿ôÆâ¡£¤³¤Î¾ì¹ç¡¢¥¿¥°¡¦¥Æ¥­¥¹¥È¤Ï¡¢¾å°Ì³¬ÁؤÎÂбþ¤¹¤ë¥¿¥°¤«¤é¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
++.RE
++.LP
++·Ñ¾µ³¬Áؤǥ³¥á¥ó¥È¤ò¸«¤Ä¤±¤ëÊýË¡¤Ë´Ø¤¹¤ëÀµ³Î¤ÊÀâÌÀ¤Ï¡¢¥á¥½¥Ã¥É¡¦¥³¥á¥ó¥È¤Î¼«Æ°¥³¥Ô¡¼¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥¿¥°¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¡¢¥³¥á¥ó¥È¤Ï¡¢¤³¤Î¹à¤ÇÀâÌÀ¤¹¤ë¥ë¡¼¥ë¤Ë±þ¤¸¤Æ¡¢¼«Æ°Åª¤Ë·Ñ¾µ¤µ¤ì¤ë¤«¤É¤¦¤«¤¬·è¤Þ¤ê¤Þ¤¹¡£
++.LP
++.TP 3
++{@link\ package.class#member\ label}
++ɽ¼¨¥Æ¥­¥¹¥È\f2label\fP¤È¤È¤â¤Ë¥¤¥ó¥é¥¤¥ó¡¦¥ê¥ó¥¯¤òÁÞÆþ¤·¤Þ¤¹¡£label¤Ï¡¢»²¾È¥¯¥é¥¹¤Î»ØÄꤵ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤Þ¤¿¤Ï¥á¥ó¥Ð¡¼¤Î̾Á°¤Î¥É¥­¥å¥á¥ó¥È¤ò»Ø¤·¼¨¤·¤Þ¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢@return¡¢@param¡¢@deprecated¤Ê¤É¤ÎǤ°Õ¤Î¥¿¥°¤Î¥Æ¥­¥¹¥ÈÉôʬ¤ò´Þ¤à¡¢¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¡¢¤Ä¤Þ¤ê³µÍס¢¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¤ª¤è¤Ó¥Õ¥£¡¼¥ë¥É¤ÇÍ­¸ú¤Ç¤¹¡£
++.LP
++¤³¤Î¥¿¥°¤Ï\f2@see\fP¤ÈÈó¾ï¤Ë¤è¤¯»÷¤Æ¤¤¤Þ¤¹¡£¤É¤Á¤é¤â¡¢\f2package.class\fP\f2#\fP\f2member\fP¤È\f2label\fP¤Î»²¾ÈÊýË¡¤¬Æ±¤¸¤Ç¡¢Í­¸ú¤Ê¹½Ê¸¤â¤Þ¤Ã¤¿¤¯Æ±¤¸¤Ç¤¹¡£¼ç¤Ê°ã¤¤¤Ï¡¢\f2{@link}\fP¤Ç¤Ï¡¢¡Ö´ØÏ¢¹àÌܡץ»¥¯¥·¥ç¥ó¤Ë¥ê¥ó¥¯¤¬ÇÛÃÖ¤µ¤ì¤ë¤«¤ï¤ê¤Ë¡¢¥¤¥ó¥é¥¤¥ó¡¦¥ê¥ó¥¯¤¬À¸À®¤µ¤ì¤ë¤È¤¤¤¦ÅÀ¤Ç¤¹¡£¤Þ¤¿¡¢¥¤¥ó¥é¥¤¥ó¡¦¥Æ¥­¥¹¥È¤Î¾¤ÎÉôʬ¤È¶èÊ̤¹¤ë¤¿¤á¤Ë¡¢\f2{@link}\fP¥¿¥°¤ÎºÇ½é¤ÈºÇ¸å¤ËÃæ³ç¸Ì¤òµ­½Ò¤·¤Þ¤¹¡£¥é¥Ù¥ë¤ÎÃæ¤Ç¡Ö}¡×¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢HTML¥¨¥ó¥Æ¥£¥Æ¥£É½µ­Ë¡¤Î¡Ö&#125;¡×¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++1¤Äʸ¤ÎÃæ¤Ç»ÈÍѤǤ­¤ë\f2{@link}\fP¥¿¥°¤Î¿ô¤ËÀ©¸Â¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥¿¥°¤Ï¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î¼çÀâÌÀÉôʬ¡¢¤Þ¤¿¤Ï@deprecated¡¢@return¡¢@param¤Ê¤É¤ÎǤ°Õ¤Î¥¿¥°¤Î¥Æ¥­¥¹¥ÈÉôʬ¤Ç»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥á¥ó¥È¤Ç¤Ï\f2getComponentAt(int,int)\fP¥á¥½¥Ã¥É¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¡£
++.nf
++\f3
++.fl
++Use the {@link #getComponentAt(int, int) getComponentAt} method.
++.fl
++
++.fl
++\fP
++.fi
++.LP
++ɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤Ç¤Ï¡¢¾å¤Î¥³¥á¥ó¥È¤«¤é¼¡¤ÎHTML¤¬À¸À®¤µ¤ì¤Þ¤¹(¤³¤Î¥³¥á¥ó¥È¤¬Æ±¤¸¥Ñ¥Ã¥±¡¼¥¸¤ÎÊ̤Υ¯¥é¥¹¤ò»²¾È¤·¤Æ¤¤¤ë¾ì¹ç)¡£
++.nf
++\f3
++.fl
++Use the <a href="Component.html#getComponentAt(int, int)">getComponentAt</a> method.
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¤³¤ì¤Ï¡¢Web¥Ú¡¼¥¸¾å¤Ç¤Ï¼¡¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++Use the getComponentAt method.
++.fl
++
++.fl
++\fP
++.fi
++.LP
++\f2{@link}\fP¤ò³ÈÄ¥¤·¤Æ¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤Ê¤¤¥¯¥é¥¹¤Ë¥ê¥ó¥¯¤¹¤ë¤Ë¤Ï¡¢\f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++¾ÜºÙ¤Ï¡¢
++.na
++\f2{@link}¥¿¥°¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#{@link}¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.TP 3
++{@linkplain\ package.class#member\ label}
++¥ê¥ó¥¯¤Î¥é¥Ù¥ë¤¬¥³¡¼¥É¡¦¥Õ¥©¥ó¥È¤Ç¤Ï¤Ê¤¯¥×¥ì¡¼¥ó¡¦¥Æ¥­¥¹¥È¤Çɽ¼¨¤µ¤ì¤ëÅÀ°Ê³°¤Ï\f2{@link}\fP¤ÈƱ¤¸¤Ç¤¹¡£¥é¥Ù¥ë¤¬¥×¥ì¡¼¥ó¡¦¥Æ¥­¥¹¥È¤Çµ­½Ò¤µ¤ì¤Æ¤¤¤ë¤ÈÊØÍø¤Ç¤¹¡£Îã:
++.nf
++\f3
++.fl
++ Refer to {@linkplain add() the overridden method}.
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¤³¤ì¤Ï¼¡¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++Refer to the overridden method.
++.LP
++.TP 3
++{@literal\ text}
++¥Æ¥­¥¹¥È¤òHTML¥Þ¡¼¥¯¥¢¥Ã¥×¤Þ¤¿¤Ï¥Í¥¹¥È¤µ¤ì¤¿javadoc¥¿¥°¤È¤·¤Æ²ò¼á¤»¤º¤Ë¡¢\f2text\fP¤òɽ¼¨¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç¤Ï¡¢¥Ñ¥é¥á¡¼¥¿¤Î·¿(\f2<Object>\fP)¡¢ÉÔÅù¹æ(\f23 < 4\fP)¡¢Ìð°õ(\f2<\-\fP)¤Ê¤É¤Ç¡¢Ä̾ï¤Î»³³ç¸Ì(\f2<\fP¤ª¤è¤Ó\f2>\fP)¤òHTML¥¨¥ó¥Æ¥£¥Æ¥£(\f2<\fP¤ª¤è¤Ó\f2>\fP)¤Î¤«¤ï¤ê¤Ë»ÈÍѤǤ­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È
++.nf
++\f3
++.fl
++ \fP\f4{@literal A<B>C}\fP\f3
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¤Ï¡¢¥Ö¥é¥¦¥¶¤ÇÀ¸À®¤µ¤ì¤¿HTML¥Ú¡¼¥¸¤Ë¼¡¤Î¤è¤¦¤Ë¤½¤Î¤Þ¤Þɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++\f2\ \ \ \ \ \fPA<B>C
++.LP
++¤³¤³¤ÇÃíÌܤËÃͤ¹¤ë¤Î¤Ï¡¢\f2<B>\fP¤¬ÂÀ»ú¤È¤·¤Æ²ò¼á¤µ¤ì¤º¡¢¤½¤Î¥Õ¥©¥ó¥È¤Ï¥³¡¼¥É¡¦¥Õ¥©¥ó¥È¤Ë¤Ê¤é¤Ê¤¤¡¢¤È¤¤¤¦ÅÀ¤Ç¤¹¡£
++.LP
++¥³¡¼¥É¡¦¥Õ¥©¥ó¥È¤ÇƱ¤¸µ¡Ç½¤ò¼Â¸½¤¹¤ë¤Ë¤Ï¡¢\f2{@code}\fP¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.TP 3
++@param\ parameter\-name description
++¡Ö¥Ñ¥é¥á¡¼¥¿¡×¥»¥¯¥·¥ç¥ó¤Ë¡¢»ØÄꤵ¤ì¤¿\f2parameter\-name\fP¤Î¸å¤Ë»ØÄꤵ¤ì¤¿\f2description\fP¤ò³¤±¤Æ¥Ñ¥é¥á¡¼¥¿¤òÄɲä·¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤òµ­½Ò¤¹¤ë¤È¤­¤Ë¤Ï¡¢\f2description\fP¤òÊ£¿ô¹Ô¤Ë¤ï¤¿¤Ã¤Æµ­½Ò¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢¥á¥½¥Ã¥É¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¤Þ¤¿¤Ï¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤Ç¤Î¤ßÍ­¸ú¤Ç¤¹¡£
++.LP
++\f2parameter\-name\fP¤Ï¡¢¥á¥½¥Ã¥É¤Þ¤¿¤Ï¥³¥ó¥¹¥È¥é¥¯¥¿¤Ç¤Î¥Ñ¥é¥á¡¼¥¿¤Î̾Á°¤«¡¢¥¯¥é¥¹¡¢¥á¥½¥Ã¥É¤Þ¤¿¤Ï¥³¥ó¥¹¥È¥é¥¯¥¿¤Î·¿¥Ñ¥é¥á¡¼¥¿¤Î̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£»³³ç¸Ì¤Ç¤³¤Î¥Ñ¥é¥á¡¼¥¿Ì¾¤ò°Ï¤ß¡¢·¿¥Ñ¥é¥á¡¼¥¿¤ò»ÈÍѤ¹¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++¥¯¥é¥¹¤Î·¿¥Ñ¥é¥á¡¼¥¿¤ÎÎã:
++.nf
++\f3
++.fl
++ /**
++.fl
++ * @param <E> Type of element stored in a list
++.fl
++ */
++.fl
++ public interface List<E> extends Collection<E> {
++.fl
++ }
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¥á¥½¥Ã¥É¤Î·¿¥Ñ¥é¥á¡¼¥¿¤ÎÎã:
++.nf
++\f3
++.fl
++ /**
++.fl
++ * @param string the string to be converted
++.fl
++ * @param type the type to convert the string to
++.fl
++ * @param <T> the type of the element
++.fl
++ * @param <V> the value of the element
++.fl
++ */
++.fl
++ <T, V extends T> V convert(String string, Class<T> type) {
++.fl
++ }
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¾ÜºÙ¤Ï¡¢
++.na
++\f2@param¥¿¥°¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@param¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.TP 3
++@return\ description
++¡ÖÌá¤êÃ͡ץ»¥¯¥·¥ç¥ó¤òÄɲ䷤ơ¢\f2description\fP¤Î¥Æ¥­¥¹¥È¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£¤³¤Î¥Æ¥­¥¹¥È¤Ç¤Ï¡¢Ìá¤êÃͤη¿¤È¡¢¼è¤êÆÀ¤ëÃͤÎÈϰϤˤĤ¤¤Æµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢¥á¥½¥Ã¥É¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç¤Î¤ßÍ­¸ú¤Ç¤¹¡£
++.LP
++¾ÜºÙ¤Ï¡¢
++.na
++\f2@return¥¿¥°¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@return¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.TP 3
++@see\ reference
++¡Ö´ØÏ¢¹àÌܡ׸«½Ð¤·¤òÄɲ䷤ơ¢\f2reference\fP¤ò»Ø¤¹¥ê¥ó¥¯¡¢¤Þ¤¿¤Ï¥Æ¥­¥¹¥È¡¦¥¨¥ó¥È¥ê¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£1¤Ä¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ë¤ÏǤ°Õ¤Î¿ô¤Î\f2@see\fP¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢¤½¤ì¤é¤Ï¤¹¤Ù¤ÆƱ¤¸¸«½Ð¤·¤Î²¼¤Ë¥°¥ë¡¼¥×²½¤µ¤ì¤Þ¤¹¡£\f2@see\fP¥¿¥°¤Ë¤Ï¡¢¼¡¤Î3¤Ä¤Î¥¿¥¤¥×¤Î·Á¼°¤¬¤¢¤ê¤Þ¤¹¡£ºÇ¤â¤è¤¯»ÈÍѤµ¤ì¤ë¤Î¤Ï¡¢3ÈÖÌܤηÁ¼°¤Ç¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¡¢¤Ä¤Þ¤ê³µÍס¢¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¤Þ¤¿¤Ï¥Õ¥£¡¼¥ë¥É¤ÇÍ­¸ú¤Ç¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤Þ¤¿¤Ï¥á¥ó¥Ð¡¼¤ËÂФ¹¤ë¥¤¥ó¥é¥¤¥ó¡¦¥ê¥ó¥¯¤òʸÃæ¤ËÁÞÆþ¤¹¤ëÊýË¡¤Ï¡¢\f2{@link}\fP¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RS 3
++.TP 3
++@see "string"
++\f2string\fP¤Î¥Æ¥­¥¹¥È¡¦¥¨¥ó¥È¥ê¤òÄɲä·¤Þ¤¹¡£¥ê¥ó¥¯¤ÏÀ¸À®¤µ¤ì¤Þ¤»¤ó¡£\f2string\fP¤Ï¡¢½ñÀÒ¤Þ¤¿¤ÏURL¤Ç¤Ï¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¾ðÊó¤Î»²¾ÈÀè¤Ç¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢ºÇ½é¤Îʸ»ú¤¬Æó½Å°úÍÑÉä(\f2"\fP)¤«¤É¤¦¤«¤òÄ´¤Ù¤Æ¡¢¤³¤Î·Á¼°¤òÁ°½Ò¤Î·Á¼°¤È¶èÊ̤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ @see "The Java Programming Language"
++.fl
++
++.fl
++\fP
++.fi
++.LP
++¤³¤ì¤Ï¼¡¤Î¤è¤¦¤Ê¥Æ¥­¥¹¥È¤òÀ¸À®¤·¤Þ¤¹¡£
++.RE
++.RE
++.RS 3
++.RS 3
++.RS 3
++.RS 3
++.TP 3
++´ØÏ¢¹àÌÜ:
++"The Java Programming Language"
++.RE
++.RE
++.TP 3
++@see <a href="URL#value">label</a>
++\f2URL\fP#\f2value\fP¤ÇÄêµÁ¤µ¤ì¤¿¤È¤ª¤ê¤Ë¥ê¥ó¥¯¤òÄɲä·¤Þ¤¹¡£\f2URL\fP#\f2value\fP¤Ï¡¢ÁêÂÐURL¤Þ¤¿¤ÏÀäÂÐURL¤Ç¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢ºÇ½é¤Îʸ»ú¤¬¡Ö¤è¤ê¾®¤µ¤¤¡×µ­¹æ(\f2<\fP)¤«¤É¤¦¤«¤òÄ´¤Ù¤Æ¡¢¤³¤Î·Á¼°¤ò¾¤Î·Á¼°¤È¶èÊ̤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ @see <a href="spec.html#section">Java Spec</a>
++.fl
++\fP
++.fi
++¤³¤ì¤Ï¼¡¤Î¤è¤¦¤Ê¥ê¥ó¥¯¤òÀ¸À®¤·¤Þ¤¹¡£
++.RS 3
++.TP 3
++´ØÏ¢¹àÌÜ:
++Java Spec
++.RE
++.TP 3
++@see\ package.class#member\ label
++ɽ¼¨¥Æ¥­¥¹¥È\f2label\fP¤È¤È¤â¤Ë¥ê¥ó¥¯¤òÄɲä·¤Þ¤¹¡£¤³¤Î¥ê¥ó¥¯¤Ï¡¢»ØÄꤵ¤ì¤¿Ì¾Á°¤ò»ý¤Ä¡¢»²¾È¤µ¤ì¤Æ¤¤¤ëJava¸À¸ì¤Î¥á¥ó¥Ð¡¼¤Î¥É¥­¥å¥á¥ó¥È¤ò»Ø¤·¤Þ¤¹¡£\f2label\fP¤Ï¾Êά²Äǽ¤Ç¤¹¡£label¤ò¾Êά¤¹¤ë¤È¡¢Ì¾Á°¤¬¤«¤ï¤ê¤Ëɽ¼¨¥Æ¥­¥¹¥È¤È¤·¤ÆŬÀÚ¤Ëû½Ì¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£Ì¾Á°¤¬É½¼¨¤µ¤ì¤ëÊýË¡¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\-noqualifier¤ò»ÈÍѤ¹¤ë¤È¡¢¤³¤Îɽ¼¨¥Æ¥­¥¹¥È¤«¤é¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬Á´ÂÎŪ¤Ëºï½ü¤µ¤ì¤Þ¤¹¡£¥é¥Ù¥ë¤Ï¡¢¼«Æ°À¸À®¤µ¤ì¤ëɽ¼¨¥Æ¥­¥¹¥È¤È¤Ï°Û¤Ê¤ëɽ¼¨¥Æ¥­¥¹¥È¤Ë¤¹¤ë¾ì¹ç¤Ë»ÈÍѤ·¤Þ¤¹¡£
++.LP
++¥Ð¡¼¥¸¥ç¥ó1.2¤Î¤ß¤Ï¡¢¥é¥Ù¥ë¤Ç¤Ï¤Ê¤¯¡¢Ì¾Á°¤¬<code> HTML¥¿¥°Æâ¤Ë¼«Æ°Åª¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£1.2.2¤«¤é¤Ï¡¢¥é¥Ù¥ë¤ò»ÈÍѤ¹¤ë¤«¤·¤Ê¤¤¤«¤Ë¤«¤«¤ï¤é¤º¡¢<code>¤Ï¾ï¤Ëɽ¼¨¥Æ¥­¥¹¥È¤ò°Ï¤à¤«¤¿¤Á¤Ç¡¢´Þ¤Þ¤ì¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++\f4package.class\fP\f4#\fP\f4member\fP¤Ë¤Ï¡¢»²¾È¤µ¤ì¤Æ¤¤¤ëǤ°Õ¤ÎÍ­¸ú¤Ê¥×¥í¥°¥é¥àÍ×ÁǤÎ̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¤Þ¤¿¤Ï¥Õ¥£¡¼¥ë¥É¤Î̾Á°¤Ç¤¹¡£¤¿¤À¤·¡¢¥á¥ó¥Ð¡¼Ì¾¤ÎÁ°¤Îʸ»ú¤Ï¡¢¥·¥ã¡¼¥×µ­¹æ(\f2#\fP)¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2class\fP¤Ï¡¢Ç¤°Õ¤Î¥È¥Ã¥×¥ì¥Ù¥ë¤Þ¤¿¤Ï¥Í¥¹¥È¤µ¤ì¤¿¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òɽ¤·¤Þ¤¹¡£\f2member\fP¤Ï¡¢Ç¤°Õ¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¤Þ¤¿¤Ï¥Õ¥£¡¼¥ë¥É¤òɽ¤·¤Þ¤¹(¥Í¥¹¥È¤µ¤ì¤¿¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)¡£¤³¤Î̾Á°¤¬¡¢¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¤½¤Î̾Á°¤Ø¤Î¥ê¥ó¥¯¤ò¼«Æ°Åª¤ËºîÀ®¤·¤Þ¤¹¡£³°Éô»²¾È¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢\f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤Ë°¤·¤Æ¤¤¤Ê¤¤Ì¾Á°¤Î¥É¥­¥å¥á¥ó¥È¤ò»²¾È¤¹¤ë¤Ë¤Ï¡¢Â¾¤Î2¤Ä¤Î\f2@see\fP·Á¼°¤Î¤É¤Á¤é¤«¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤Î°ú¿ô¤Ë¤Ä¤¤¤Æ¤Ï¡¢¸å½Ò¤Î̾Á°¤Î»ØÄê¤Ç¾Ü¤·¤¯ÀâÌÀ¤·¤Þ¤¹¡£
++.TP 2
++o
++\f4label\fP¤Ï¡¢¾Êά²Äǽ¤Ê¥Æ¥­¥¹¥È¤Ç¡¢¥ê¥ó¥¯¤Î¥é¥Ù¥ë¤È¤·¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£\f2label\fP¤Ë¤Ï¶õÇò¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\f2label\fP¤ò¾Êά¤¹¤ë¤È¡¢\f2package.class.member\fP¤¬¡¢¸½ºß¤Î¥¯¥é¥¹¤ª¤è¤Ó¥Ñ¥Ã¥±¡¼¥¸¤Ë±þ¤¸¤ÆŬÀÚ¤Ëû½Ì¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£Ì¾Á°¤¬É½¼¨¤µ¤ì¤ëÊýË¡¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 2
++o
++¶õÇòʸ»ú¤¬¡¢\f2package.class\fP\f2#\fP\f2member\fP¤È\f2label\fP¤Î´Ö¤Î¶èÀÚ¤êʸ»ú¤Ë¤Ê¤ê¤Þ¤¹¡£³ç¸Ì¤ÎÆ⦤ζõÇòʸ»ú¤Ï¥é¥Ù¥ë¤ÎÀèƬ¤È¤Ï²ò¼á¤µ¤ì¤Ê¤¤¤¿¤á¡¢¥á¥½¥Ã¥É¤Î¥Ñ¥é¥á¡¼¥¿´Ö¤Ë¶õÇòʸ»ú¤òÆþ¤ì¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£
++.RE
++.LP
++\f3Îã\fP \- ¤³¤ÎÎã¤Ç¤Ï¡¢\f2@see\fP¥¿¥°(\f2Character\fP¥¯¥é¥¹Æâ)¤¬¡¢\f2String\fP¥¯¥é¥¹¤Î\f2equals\fP¥á¥½¥Ã¥É¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¡£¥¿¥°¤Ë¤Ï¡¢Ì¾Á°¡Ö\f2String#equals(Object)\fP¡×¤È¥é¥Ù¥ë¡Ö\f2equals\fP¡×¤ÎξÊý¤Î°ú¿ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ /**
++.fl
++ * @see String#equals(Object) equals
++.fl
++ */
++.fl
++\fP
++.fi
++ɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤Ï¡¢¼¡¤Î¤è¤¦¤ÊHTML¤òÀ¸À®¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++<dl>
++.fl
++<dt><b>See Also:</b>
++.fl
++<dd><a href="../../java/lang/String#equals(java.lang.Object)"><code>equals<code></a>
++.fl
++</dl>
++.fl
++\fP
++.fi
++¤³¤ì¤Ï¡¢¥Ö¥é¥¦¥¶¤Ç¤Ï¼¡¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¡¢¥é¥Ù¥ë¤¬É½¼¨¥ê¥ó¥¯¡¦¥Æ¥­¥¹¥È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.RS 3
++.TP 3
++´ØÏ¢¹àÌÜ:
++equals
++.RE
++.LP
++\f3̾Á°¤Î»ØÄê\fP \- ¤³¤Î\f2package.class\fP\f2#\fP\f2member\fP¤È¤¤¤¦Ì¾Á°¤Ï¡¢\f2java.lang.String#toUpperCase()\fP¤Î¤è¤¦¤Ê´°Á´½¤¾þ̾¤Ë¤¹¤ë¤³¤È¤â¡¢\f2String#toUpperCase()\fP¤ä\f2#toUpperCase()\fP¤Î¤è¤¦¤ÊÈó´°Á´½¤¾þ̾¤Ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£Ì¾Á°¤¬´°Á´¤Ë¤Ï½¤¾þ¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢Java¥³¥ó¥Ñ¥¤¥é¤ÎÄ̾ï¤Î¸¡º÷½ç½ø¤Ç¤½¤Î̾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢¸å½Ò¤Î@see¤Î¸¡º÷½ç½ø¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£Ì¾Á°¤Ë¤Ï¡¢¥á¥½¥Ã¥É¤ÎÊ£¿ô¤Î°ú¿ô¤Î´Ö¤Ê¤É¡¢³ç¸Ì¤ÎÆ⦤Ǥ¢¤ì¤Ð¶õÇò¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++¡ÖÉôʬŪ¤Ë½¤¾þ¡×¤·¤¿Ã»¤¤Ì¾Á°¤ò»ØÄꤹ¤ë¤³¤È¤ÎÍøÅÀ¤Ï¡¢ÆþÎϤ¹¤ëʸ»ú¿ô¤¬¸º¤ë¤³¤È¤ä¡¢¥½¡¼¥¹¡¦¥³¡¼¥É¤¬Æɤߤ䤹¤¯¤Ê¤ë¤³¤È¤Ç¤¹¡£¼¡¤Îɽ¤Ë¡¢ÍÍ¡¹¤Ê·Á¼°¤Î̾Á°¤ò¼¨¤·¤Þ¤¹¡£¤³¤³¤Ç¡¢\f2Class\fP¤Ë¤Ï¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò¡¢\f2Type\fP¤Ë¤Ï¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢ÇÛÎ󡢤ޤ¿¤Ï¥×¥ê¥ß¥Æ¥£¥Ö¤ò¡¢\f2method\fP¤Ë¤Ï¥á¥½¥Ã¥É¤Þ¤¿¤Ï¥³¥ó¥¹¥È¥é¥¯¥¿¤ò¡¢¤½¤ì¤¾¤ì»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++.TS
++.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
++.de 35
++.ps \n(.s
++.vs \n(.vu
++.in \n(.iu
++.if \n(.u .fi
++.if \n(.j .ad
++.if \n(.j=0 .na
++..
++.nf
++.nr #~ 0
++.if n .nr #~ 0.6n
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.fc
++.nr 33 \n(.s
++.rm 80
++.nr 34 \n(.lu
++.eo
++.am 80
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/2u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f4@see\fP\f3\ \fP\f4package.class#member\fP\f3¤Î°ìÈÌŪ¤Ê·Á¼°\fP
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/2u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f3¸½ºß¤Î¥¯¥é¥¹¤Î¥á¥ó¥Ð¡¼¤ò»²¾È¤¹¤ë\ \ \ \ \ \ \fP
++.br
++\f2@see\fP\ \f2#\fP\f2field\fP
++.br
++\f2@see\fP\ \f2#\fP\f2method(Type,\ Type,...)\fP
++.br
++\f2@see\fP\ \f2#\fP\f2method(Type\ argname,\ Type\ argname,...)\fP
++.br
++\f2@see\fP\ \f2#\fP\f2constructor(Type,\ Type,...)\fP
++.br
++\f2@see\fP\ \f2#\fP\f2constructor(Type\ argname,\ Type\ argname,...)\fP
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/2u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f3¸½ºß¤Î¡¢¤Þ¤¿¤Ï¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ÎÊ̤Υ¯¥é¥¹¤ò»²¾È¤¹¤ë\ \ \ \ \ \ \ \ \fP
++.br
++\f2@see\fP\ \f2Class\fP\f2#\fP\f2field\fP
++.br
++\f2@see\fP\ \f2Class\fP\f2#\fP\f2method(Type,\ Type,...)\fP
++.br
++\f2@see\fP\ \f2Class\fP\f2#\fP\f2method(Type\ argname,\ Type\ argname,...)\fP
++.br
++\f2@see\fP\ \f2Class\fP\f2#\fP\f2constructor(Type,\ Type,...)\fP
++.br
++\f2@see\fP\ \f2Class\fP\f2#\fP\f2constructor(Type\ argname,\ Type\ argname,...)\fP
++.br
++\f2@see\fP\ \f2Class.NestedClass\fP
++.br
++\f2@see\fP\ \f2Class\fP
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/2u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f3Ê̤Υѥ屡¼¥¸¤ÎÍ×ÁǤò»²¾È¤¹¤ë\fP\ (´°Á´½¤¾þ)\ \ \ \ .br
++\f2@see\fP\ \f2package.Class\fP\f2#\fP\f2field\fP
++.br
++\f2@see\fP\ \f2package.Class\fP\f2#\fP\f2method(Type,\ Type,...)\fP
++.br
++\f2@see\fP\ \f2package.Class\fP\f2#\fP\f2method(Type\ argname,\ Type\ argname,...)\fP
++.br
++\f2@see\fP\ \f2package.Class\fP\f2#\fP\f2constructor(Type,\ Type,...)\fP
++.br
++\f2@see\fP\ \f2package.Class\fP\f2#\fP\f2constructor(Type\ argname,\ Type\ argname,...)\fP
++.br
++\f2@see\fP\ \f2package.Class.NestedClass\fP
++.br
++\f2@see\fP\ \f2package.Class\fP
++.br
++\f2@see\fP\ \f2package\fP
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.80
++.rm 80
++.nr 38 \n(a-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(b-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(c-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(d-
++.if \n(80<\n(38 .nr 80 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr TW \n(80
++.if t .if \n(TW>\n(.li .tm Table at line 1352 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.d+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-58
++.LP
++¾å¤Îɽ¤ËÂФ¹¤ëÊä­»ö¹à¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++ºÇ½é¤Î¥¿¥¤¥×¤Î·Á¼°(¥Ñ¥Ã¥±¡¼¥¸¤È¥¯¥é¥¹¤ò¾Êά)¤Î¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¸½ºß¤Î¥¯¥é¥¹¤Î³¬ÁؤΤߤò¸¡º÷¤·¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¸½ºß¤Î¥¯¥é¥¹¤«¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¤½¤Î¥¹¡¼¥Ñ¡¼¥¯¥é¥¹¤«¥¹¡¼¥Ñ¡¼¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¤Þ¤¿¤Ï¤½¤Î³°Â¦¤ò°Ï¤ó¤Ç¤¤¤ë¥¯¥é¥¹¤«¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤«¤é¥á¥ó¥Ð¡¼¤ò¸¡º÷¤·¤Þ¤¹(¸¡º÷¼ê½ç1\-3)¡£¸½ºß¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¾¤ÎÉôʬ¤ä¡¢Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¸¡º÷¤·¤Þ¤»¤ó(¸¡º÷¼ê½ç4\-5)¡£
++.TP 2
++o
++¥á¥½¥Ã¥É¤Þ¤¿¤Ï¥³¥ó¥¹¥È¥é¥¯¥¿¤ÎÆþÎÏ»þ¤Ë¡¢\f2getValue\fP¤Î¤è¤¦¤Ë³ç¸Ì¤Ê¤·¤Î̾Á°¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢Æ±¤¸Ì¾Á°¤Î¥Õ¥£¡¼¥ë¥É¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢Javadoc¥Ä¡¼¥ë¤Ï¤½¤Î̾Á°¤Ø¤Î¥ê¥ó¥¯¤òÀµ¤·¤¯ºîÀ®¤·¤Þ¤¹¤¬¡¢³ç¸Ì¤È°ú¿ô¤ÎÄɲäòÂ¥¤¹·Ù¹ð¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤Î¥á¥½¥Ã¥É¤¬¥ª¡¼¥Ð¡¼¥í¡¼¥É¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¸¡º÷¤ÇºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¥á¥½¥Ã¥É¤Ë¥ê¥ó¥¯¤·¤Þ¤¹¡£·ë²Ì¤ÏÁ°¤â¤Ã¤ÆÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£
++.TP 2
++o
++¥Í¥¹¥È¤µ¤ì¤¿¥¯¥é¥¹¤Ï¡¢¤¹¤Ù¤Æ¤Î·Á¼°¤Ë¤Ä¤¤¤Æ¡¢\f2outer\fP\f2.\fP\f2inner\fP¤È¤·¤Æ»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Ã±½ã¤Ë\f2inner\fP¤È¤Ï¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
++.TP 2
++o
++¤¹¤Ç¤Ë½Ò¤Ù¤¿¤è¤¦¤Ë¡¢¥¯¥é¥¹¤È¥á¥ó¥Ð¡¼¤È¤Î´Ö¤Î¶èÀÚ¤êʸ»ú¤È¤·¤Æ¤Ï¡¢¥É¥Ã¥È(\f2.\fP)¤Ç¤Ï¤Ê¤¯¥·¥ã¡¼¥×ʸ»ú(\f2#\fP)¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ë»ØÄꤹ¤ë¤È¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¤¢¤¤¤Þ¤¤¤µ¤ò²ò·è¤Ç¤­¤Þ¤¹¡£¥É¥Ã¥È¤Ï¡¢¥¯¥é¥¹¡¢¥Í¥¹¥È¤µ¤ì¤¿¥¯¥é¥¹¡¢¥Ñ¥Ã¥±¡¼¥¸¡¢¤ª¤è¤Ó¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤ò¶èÀڤ뤿¤á¤Ë¤â»ÈÍѤµ¤ì¤ë¤«¤é¤Ç¤¹¡£¤¿¤À¤·¡¢Javadoc¥Ä¡¼¥ë¤Ç¤Ï°ìÈ̤˵öÍÆÈϰϤ¬¹­¤¯¡¢¤¢¤¤¤Þ¤¤¤µ¤¬¤Ê¤±¤ì¤Ð¥É¥Ã¥È¤ÏÀµ¤·¤¯²òÀϤµ¤ì¤Þ¤¹¡£¤½¤Î¾ì¹ç¤Ç¤â¡¢·Ù¹ð¤Ïɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.RE
++.LP
++\f3@see¤Î¸¡º÷½ç½ø\fP \- Javadoc¥Ä¡¼¥ë¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë(.java)¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥Õ¥¡¥¤¥ë(package.html¤Þ¤¿¤Ïpackage\-info.java)¤Þ¤¿¤Ï³µÍ×¥Õ¥¡¥¤¥ë(overview.html)¤Ë´Þ¤Þ¤ì¤ë\f2@see\fP¥¿¥°¤ò½èÍý¤·¤Þ¤¹¡£¸å¼Ô¤Î2¤Ä¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢´°Á´½¤¾þ¤Î̾Á°¤ò\f2@see\fP¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢´°Á´½¤¾þ¤Î̾Á°¡¢¤Þ¤¿¤ÏÉôʬ½¤¾þ¤Î̾Á°¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢´°Á´½¤¾þ\f2¤Ç¤Ê¤¤\fP̾Á°¤¬µ­½Ò¤µ¤ì¤¿\f2@see\fP¥¿¥°¤ò\f2.java\fP¥Õ¥¡¥¤¥ëÆâ¤Ç¸«¤Ä¤±¤ë¤È¡¢Java¥³¥ó¥Ñ¥¤¥é¤ÈƱ¤¸½ç½ø¤Ç»ØÄꤵ¤ì¤¿Ì¾Á°¤ò¸¡º÷¤·¤Þ¤¹(¤¿¤À¤·¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢ÆÃÄê¤Î̾Á°¶õ´Ö¤Î¤¢¤¤¤Þ¤¤¤µ¤ò¸¡½Ð¤·¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢¥½¡¼¥¹¡¦¥³¡¼¥É¤Ë¤³¤ì¤é¤Î¥¨¥é¡¼¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤ë¤¿¤á¤Ç¤¹)¡£¤³¤Î¸¡º÷½ç½ø¤Ï¡¢\f2Java¸À¸ì»ÅÍÍ\fP¤ÇÀµ¼°¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢´ØÏ¢¤¹¤ë¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¡¢¤ª¤è¤Ó¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¥¯¥é¥¹¤È¥Ñ¥Ã¥±¡¼¥¸¤Î¤¹¤Ù¤Æ¤«¤é¤½¤Î̾Á°¤ò¸¡º÷¤·¤Þ¤¹¡£¶ñÂÎŪ¤Ë¤Ï¡¢¼¡¤Î½ç½ø¤Ç¸¡º÷¤·¤Þ¤¹¡£
++.RS 3
++.TP 3
++1.
++¸½ºß¤Î¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹
++.TP 3
++2.
++³°Â¦¤ò°Ï¤ó¤Ç¤¤¤ë¥¯¥é¥¹¤È¥¤¥ó¥¿¥Õ¥§¡¼¥¹(ºÇ¤â¶á¤¤¤â¤Î¤«¤é¸¡º÷)
++.TP 3
++3.
++¥¹¡¼¥Ñ¡¼¥¯¥é¥¹¤È¥¹¡¼¥Ñ¡¼¥¤¥ó¥¿¥Õ¥§¡¼¥¹(ºÇ¤â¶á¤¤¤â¤Î¤«¤é¸¡º÷)
++.TP 3
++4.
++¸½ºß¤Î¥Ñ¥Ã¥±¡¼¥¸
++.TP 3
++5.
++¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹(importʸ¤Î½ç½ø¤Ë½¾¤Ã¤Æ¸¡º÷)
++.RE
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢³Æ¥¯¥é¥¹¤Ë¤Ä¤¤¤Æ¼ê½ç1\-3¤òºÆµ¢Åª¤ËŬÍѤ·¤Ê¤¬¤é¡¢°ìÃפ¹¤ë̾Á°¤¬¸«¤Ä¤«¤ë¤Þ¤Ç¸¡º÷¤ò³¤±¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¤Þ¤º¸½ºß¤Î¥¯¥é¥¹¤ò¸¡º÷¤·¡¢¼¡¤Ë¤½¤Î³°Â¦¤ò°Ï¤ó¤Ç¤¤¤ë¥¯¥é¥¹E¤ò¸¡º÷¤·¤¿¸å¡¢E¤Î¥¹¡¼¥Ñ¡¼¥¯¥é¥¹¤ò¸¡º÷¤·¤Æ¤«¤é¡¢E¤ò°Ï¤ó¤Ç¤¤¤ë¥¯¥é¥¹¤ò¸¡º÷¤·¤Þ¤¹¡£ ¼ê½ç4¤È5¤Ç¤Ï¡¢1¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Æâ¤Î¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò¸¡º÷¤¹¤ë½ç½ø¤Ï·è¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó(¤½¤Î½ç½ø¤Ï¡¢¸Ä¡¹¤Î¥³¥ó¥Ñ¥¤¥é¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹)¡£¼ê½ç5¤Ç¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢java.lang¤ò¸¡º÷¤·¤Þ¤¹¡£¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢¤¹¤Ù¤Æ¤Î¥×¥í¥°¥é¥à¤Ë¼«Æ°Åª¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤ë¤«¤é¤Ç¤¹¡£
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢É¬¤º¤·¤â¥µ¥Ö¥¯¥é¥¹¤ò¸¡º÷¤¹¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£¤Þ¤¿¡¢Javadoc¤Î¼Â¹ÔÃæ¤Ë¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¤ë¾ì¹ç¤Ç¤â¡¢Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡º÷¤·¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\f2@see\fP¥¿¥°¤¬\f2java.awt.event.KeyEvent\fP¥¯¥é¥¹Æâ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Æ¡¢\f2java.awt\fP¥Ñ¥Ã¥±¡¼¥¸Æâ¤Î¤¢¤ë̾Á°¤ò»²¾È¤·¤Æ¤¤¤Æ¤â¡¢¤½¤Î¥¯¥é¥¹¤¬¥¤¥ó¥Ý¡¼¥È¤·¤Ê¤¤¤«¤®¤êJavadoc¤Ï¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡º÷¤·¤Þ¤»¤ó¡£
++.LP
++\f3̾Á°¤¬É½¼¨¤µ¤ì¤ëÊýË¡\fP \- \f2label\fP¤ò¾Êά¤¹¤ë¤È¡¢\f2package.class.member\fP¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£°ìÈ̤ˡ¢¤³¤ì¤Ï¸½ºß¤Î¥¯¥é¥¹¤ª¤è¤Ó¥Ñ¥Ã¥±¡¼¥¸¤Ë±þ¤¸¤ÆŬÀÚ¤Ëû½Ì¤µ¤ì¤Þ¤¹¡£¡Öû½Ì¤µ¤ì¤ë¡×¤È¤Ï¡¢É¬Í׺Ǿ®¸Â¤Î̾Á°¤Î¤ß¤¬É½¼¨¤µ¤ì¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2String.toUpperCase()\fP¥á¥½¥Ã¥É¤Ë¡¢Æ±¤¸¥¯¥é¥¹¤Î¥á¥ó¥Ð¡¼¤Ø¤Î»²¾È¤È¾¤Î¥¯¥é¥¹¤Î¥á¥ó¥Ð¡¼¤Ø¤Î»²¾È¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹Ì¾¤¬É½¼¨¤µ¤ì¤ë¤Î¤Ï¸å¼Ô¤Î¥±¡¼¥¹¤Î¤ß¤Ç¤¹(¼¡¤Îɽ¤ò»²¾È)¡£
++.LP
++¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÁ´ÂÎŪ¤Ëºï½ü¤¹¤ë¤Ë¤Ï¡¢\-noqualifier¤ò»ÈÍѤ·¤Þ¤¹¡£
++.br
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/4u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++\f4String.toUpperCase()\fP\f3¤Ç¤ÎÎã\fP
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/4u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f2@see\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/4u
++.if \n(.l<\n(82 .ll \n(82u
++.in 0
++\f2toLowerCase()\fP(¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¥¯¥é¥¹Ì¾¤Ï¾Êά)
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/4u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f2@see\fP¥¿¥°¤¬°Û¤Ê¤ë¥¯¥é¥¹¡¢Æ±¤¸¥Ñ¥Ã¥±¡¼¥¸¤Î¥á¥ó¥Ð¡¼¤ò»²¾È¤·¤Æ¤¤¤ë
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/4u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++\f2@see Character#toLowerCase(char)\fP
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 82
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/4u
++.if \n(.l<\n(82 .ll \n(82u
++.in 0
++\f2Character.toLowerCase(char)\fP(¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ï¾Êά¤·¡¢¥¯¥é¥¹Ì¾¤ò´Þ¤à)
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/4u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f2@see\fP¥¿¥°¤¬°Û¤Ê¤ë¥¯¥é¥¹¡¢°Û¤Ê¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥á¥ó¥Ð¡¼¤ò»²¾È¤·¤Æ¤¤¤ë
++.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/4u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++\f2@see java.io.File#exists()\fP
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 82
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/4u
++.if \n(.l<\n(82 .ll \n(82u
++.in 0
++\f2java.io.File.exists()\fP(¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¥¯¥é¥¹Ì¾¤ò´Þ¤à)
++.br
++.di
++.nr i| \n(dn
++.nr i- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w\f3»²¾È¤Î¥¿¥¤¥×\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 38 \n(b-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(d-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(g-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 81 0
++.nr 38 \w\f2@see String#toLowerCase()\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(h-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 82 0
++.nr 38 \w\f3ɽ¼¨¤µ¤ì¤ë̾Á°\fP
++.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 38 \n(f-
++.if \n(82<\n(38 .nr 82 \n(38
++.nr 38 \n(i-
++.if \n(82<\n(38 .nr 82 \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 TW \n(82
++.if t .if \n(TW>\n(.li .tm Table at line 1428 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u \n(82u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3»²¾È¤Î¥¿¥¤¥×\fP\h'|\n(41u'\h'|\n(42u'\f3ɽ¼¨¤µ¤ì¤ë̾Á°\fP
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'\f2@see String#toLowerCase()\fP\h'|\n(42u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.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(31u
++.ne \n(d|u+\n(.Vu
++.ne \n(e|u+\n(.Vu
++.ne \n(f|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)
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u \n(82u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'\h'|\n(42u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.d+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(##u-1v
++.nr 37 \n(42u
++.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
++.ne \n(h|u+\n(.Vu
++.ne \n(i|u+\n(.Vu
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'\h'|\n(42u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.g+
++.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
++.h+
++.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
++.i+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.rm g+
++.rm h+
++.rm i+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-28
++.LP
++\f3@see¤ÎÎã\fP
++.br
++±¦Â¦¤Î¥³¥á¥ó¥È¤Ï¡¢\f2@see\fP¥¿¥°¤¬\f2java.applet.Applet\fP¤Ê¤É¤ÎÊ̤Υѥ屡¼¥¸¤Î¥¯¥é¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ë¡¢Ì¾Á°¤¬¤É¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ See also:
++.fl
++@see java.lang.String // String \fP\f3
++.fl
++@see java.lang.String The String class // The String class \fP\f3
++.fl
++@see String // String \fP\f3
++.fl
++@see String#equals(Object) // String.equals(Object) \fP\f3
++.fl
++@see String#equals // String.equals(java.lang.Object) \fP\f3
++.fl
++@see java.lang.Object#wait(long) // java.lang.Object.wait(long) \fP\f3
++.fl
++@see Character#MAX_RADIX // Character.MAX_RADIX \fP\f3
++.fl
++@see <a href="spec.html">Java Spec</a> // Java Spec \fP\f3
++.fl
++@see "The Java Programming Language" // "The Java Programming Language" \fP\f3
++.fl
++\fP
++.fi
++\f2@see\fP¤ò³ÈÄ¥¤·¤Æ¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤Ê¤¤¥¯¥é¥¹¤Ë¥ê¥ó¥¯¤¹¤ë¤Ë¤Ï¡¢\f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++¾ÜºÙ¤Ï¡¢
++.na
++\f2@see¥¿¥°¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@see¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++.RE
++.LP
++.RS 3
++.TP 3
++@serial\ field\-description | include | exclude
++¥Ç¥Õ¥©¥ë¥È¤ÎľÎó²½²Äǽ¥Õ¥£¡¼¥ë¥É¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç»ÈÍѤ·¤Þ¤¹¡£
++.LP
++\f2field\-description\fP(¾Êά²Äǽ)¤Ç¤Ï¡¢¥Õ¥£¡¼¥ë¥É¤Î°ÕÌ£¤òÀâÌÀ¤·¡¢¼è¤êÆÀ¤ëÃͤΥꥹ¥È¤ò¼¨¤¹É¬Íפ¬¤¢¤ê¤Þ¤¹¡£É¬Íפ˱þ¤¸¤Æ¡¢Ê£¿ô¤Î¹Ô¤ËÅϤäÆÀâÌÀ¤òµ­½Ò¤Ç¤­¤Þ¤¹¡£É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤Ï¡¢¤³¤Î¾ðÊó¤ò¡¢Ä¾Î󲽤µ¤ì¤¿·Á¼°¥Ú¡¼¥¸¤ËÄɲä·¤Þ¤¹¡£
++.LP
++¥¯¥é¥¹¤òľÎ󲽤·¤¿¸å¤·¤Ð¤é¤¯¤·¤Æ¤«¤éľÎó²½²Äǽ¥Õ¥£¡¼¥ë¥É¤ò¥¯¥é¥¹¤ËÄɲä·¤¿¾ì¹ç¡¢¼çÀâÌÀ¤Ë¡¢Äɲä·¤¿¥Ð¡¼¥¸¥ç¥ó¤ò¼±Ê̤¹¤ëʸ¤òÄɲ乤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++\f2include\fP¤ª¤è¤Ó\f2exclude\fP°ú¿ô¤Ï¡¢Ä¾Î󲽤µ¤ì¤¿·Á¼°¥Ú¡¼¥¸¤Ë¥¯¥é¥¹¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¤ò´Þ¤á¤ë¤«½ü³°¤¹¤ë¤«¤ò¼¨¤·¤Þ¤¹¡£¼¡¤Î¤è¤¦¤Ëµ¡Ç½¤·¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f2Serializable\fP¤ò¼ÂÁõ¤·¤Æ¤¤¤ëpublic¤Þ¤¿¤Ïprotected¥¯¥é¥¹¤Ï¡¢¤½¤Î¥¯¥é¥¹(¤Þ¤¿¤Ï¤½¤Î¥¯¥é¥¹¤¬Â°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸)¤¬\f2@serial exclude\fP¤È¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤®¤ê¡¢\f2´Þ¤á¤é¤ì¤Þ¤¹\fP¡£
++.TP 2
++o
++\f2Serializable\fP¤ò¼ÂÁõ¤·¤Æ¤¤¤ëprivate¤Þ¤¿¤Ïpackage\-private¥¯¥é¥¹¤Ï¡¢¤½¤Î¥¯¥é¥¹(¤Þ¤¿¤Ï¤½¤Î¥¯¥é¥¹¤¬Â°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸)¤¬\f2@serial include\fP¤È¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤®¤ê¡¢\f2½ü³°¤µ¤ì¤Þ¤¹\fP¡£
++.RE
++.LP
++Îã: \f2javax.swing\fP¥Ñ¥Ã¥±¡¼¥¸¤Ï(\f2package.html\fP¤Þ¤¿¤Ï\f2package\-info.java\fPÆâ¤Ç)\f2@serial exclude\fP¤È¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£public¥¯¥é¥¹\f2java.security.BasicPermission\fP¤Ï\f2@serial exclude\fP¤È¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£package\-private¥¯¥é¥¹\f2java.util.PropertyPermissionCollection\fP¤Ï\f2@serial include\fP¤È¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++¥¯¥é¥¹¡¦¥ì¥Ù¥ë¤Ç»ØÄꤵ¤ì¤¿@serial¥¿¥°¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥ì¥Ù¥ë¤Ç»ØÄꤵ¤ì¤¿@serial¥¿¥°¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
++.LP
++¤³¤ì¤é¤Î¥¿¥°¤Î»ÈÍÑÊýË¡¤Î¾ÜºÙ¤È»ÈÍÑÎã¤Ï¡¢\f2Java¥ª¥Ö¥¸¥§¥¯¥ÈľÎó²½»ÅÍÍ\fP¤ÎÂè1.6¹à
++.na
++\f2¥¯¥é¥¹¤ÎľÎó²½²Äǽ¤Ê¥Õ¥£¡¼¥ë¥É¤ª¤è¤Ó¥Ç¡¼¥¿¤Îʸ½ñ²½\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢
++.na
++\f2ľÎ󲽤ÎFAQ\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/tech/serializationfaq\-jsp\-136699.html#javadoc_warn_missing¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ÎFAQ¤Ë¤Ï¡¢¡Ö\-private¥¹¥¤¥Ã¥Á¤ò»ØÄꤷ¤Ê¤¤¤Çjavadoc¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¤Î¤Ëprivate¥Õ¥£¡¼¥ë¥É¤Î@serial¥¿¥°¤¬¸«¤Ä¤«¤é¤Ê¤¤¤È¤¤¤¦javadoc¤Î·Ù¹ð¤¬É½¼¨¤µ¤ì¤ë¡×¤Ê¤É¤Î°ìÈÌŪ¤Ê¼ÁÌä¤Ø¤Î²óÅú¤¬µ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Ä¾Î󲽤µ¤ì¤¿·Á¼°¤Î»ÅÍͤ˥¯¥é¥¹¤ò´Þ¤á¤ë¾ì¹ç¤Ë¤Ï¡¢
++.na
++\f2Oracle¤Î´ð½à\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/serialized\-criteria\-137781.html¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.TP 3
++@serialField\ field\-name\ field\-type\ field\-description
++\f2Serializable\fP¥¯¥é¥¹¤Î\f2serialPersistentFields\fP¥á¥ó¥Ð¡¼¤Î\f2ObjectStreamField\fP¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò¥É¥­¥å¥á¥ó¥È²½¤·¤Þ¤¹¡£³Æ\f2ObjectStreamField\fP¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ËÂФ·¤Æ1¤Ä¤Î\f2@serialField\fP¥¿¥°¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.TP 3
++@serialData\ data\-description
++\f2data\-description\fP¤Ï¡¢Ä¾Î󲽤µ¤ì¤¿·Á¼°¤Ç¤Î¥Ç¡¼¥¿¤Î·¿¤È½ç½ø¤òÀâÌÀ¤¹¤ë¥Æ¥­¥¹¥È¤Ç¤¹¡£¶ñÂÎŪ¤Ë¸À¤¦¤È¡¢¤³¤Î¥Ç¡¼¥¿¤Ë¤Ï¡¢\f2writeObject\fP¥á¥½¥Ã¥É¤Ë¤è¤Ã¤Æ½ñ¤­¹þ¤Þ¤ì¤ë¾Êά²Äǽ¤Ê¥Ç¡¼¥¿¡¢¤ª¤è¤Ó\f2Externalizable.writeExternal\fP¥á¥½¥Ã¥É¤Ë¤è¤Ã¤Æ½ñ¤­¹þ¤Þ¤ì¤ë¤¹¤Ù¤Æ¤Î¥Ç¡¼¥¿(¥Ù¡¼¥¹¡¦¥¯¥é¥¹¤ò´Þ¤à)¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
++.LP
++\f2@serialData\fP¥¿¥°¤Ï¡¢\f2writeObject\fP¡¢\f2readObject\fP¡¢\f2writeExternal\fP¡¢\f2readExternal\fP¡¢\f2writeReplace\fP¡¢¤ª¤è¤Ó\f2readResolve\fP¥á¥½¥Ã¥É¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤Ç»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++.TP 3
++@since\ since\-text
++À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¡ÖƳÆþ¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¡×¸«½Ð¤·¤òÄɲ䷤ơ¢»ØÄꤵ¤ì¤¿\f2since\-text\fP¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£¤³¤Î¥Æ¥­¥¹¥È¤Ë¤Ï¡¢ÆÃÊ̤ÊÆâÉô¹½Â¤¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥¿¥°¤Ï¡¢¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¡¢¤Ä¤Þ¤ê³µÍס¢¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¤Þ¤¿¤Ï¥Õ¥£¡¼¥ë¥É¤ÇÍ­¸ú¤Ç¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢ÆÃÄê¤ÎÊѹ¹¤Þ¤¿¤Ïµ¡Ç½¤¬¡¢\f2since\-text\fP¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤¿¥½¥Õ¥È¥¦¥§¥¢¡¦¥ê¥ê¡¼¥¹°Ê¹ß¡¢Â¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ @since 1.5
++.fl
++
++.fl
++\fP
++.fi
++.LP
++Java¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¥½¡¼¥¹¡¦¥³¡¼¥É¤Î¾ì¹ç¡¢¤³¤Î¥¿¥°¤Ï¡¢Java¥×¥é¥Ã¥È¥Õ¥©¡¼¥àAPI»ÅÍͤΥС¼¥¸¥ç¥ó¤ò¼¨¤·¤Þ¤¹(¥ê¥Õ¥¡¥ì¥ó¥¹¼ÂÁõ¤ËÄɲ䵤줿»þ´ü¤ò¼¨¤¹¤È¤Ï¸Â¤ê¤Þ¤»¤ó)¡£Ê£¿ô¤Î@since¥¿¥°¤ò»ÈÍѤǤ­¡¢Ê£¿ô¤Î@author¥¿¥°¤Î¤è¤¦¤Ë°·¤ï¤ì¤Þ¤¹¡£¥×¥í¥°¥é¥àÍ×ÁǤ¬Ê£¿ô¤ÎAPI¤Ç»ÈÍѤµ¤ì¤ë¾ì¹ç¡¢Ê£¿ô¤Î¥¿¥°¤ò»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++.TP 3
++@throws\ class\-name\ description
++\f2@throws\fP¥¿¥°¤È\f2@exception\fP¥¿¥°¤ÏƱµÁ¤Ç¤¹¡£À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¡Ö¥¹¥í¡¼¡×¾®¸«½Ð¤·¤òÄɲ䷤ơ¢\f2class\-name\fP¤ª¤è¤Ó\f2description\fP¤Î¥Æ¥­¥¹¥È¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£\f2class\-name\fP¤Ï¡¢¤½¤Î¥á¥½¥Ã¥É¤«¤é¥¹¥í¡¼¤µ¤ì¤ë²ÄǽÀ­¤Î¤¢¤ëÎã³°¤Î̾Á°¤Ç¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢¥á¥½¥Ã¥É¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤Ç¤Î¤ßÍ­¸ú¤Ç¤¹¡£¤³¤Î¥¯¥é¥¹¤¬´°Á´»ØÄê¤Î̾Á°¤Çµ­½Ò¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¸¡º÷½ç½ø¤Ë½¾¤Ã¤Æ¥¯¥é¥¹¤òõ¤·¤Þ¤¹¡£Æ±¤¸¤Þ¤¿¤Ï°Û¤Ê¤ëÎã³°¤ÎÆÃÄê¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç¡¢Ê£¿ô¤Î\f2@throws\fP¥¿¥°¤ò»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++¤¹¤Ù¤Æ¤Î¥Á¥§¥Ã¥¯ºÑ¤ßÎã³°¤¬¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¡¢\f2@throws\fP¥¿¥°¤¬throwsÀáÆâ¤ÎÎã³°ÍѤ˸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¡¢@throws¥¿¥°¤Ç¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤¿¤«¤Î¤è¤¦¤Ë¡¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤ÆÎã³°¤¬HTML½ÐÎϤËÀâÌÀ¤Ê¤·¤Ç¼«Æ°Åª¤ËÄɲ䵤ì¤Þ¤¹¡£
++.LP
++¥ª¡¼¥Ð¡¼¥é¥¤¥É¤µ¤ì¤ë¥á¥½¥Ã¥ÉÆâ¤ÇÎã³°¤¬ÌÀ¼¨Åª¤ËÀë¸À¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Î¤ß¡¢\f2@throws\fP¤Î¥É¥­¥å¥á¥ó¥È¤¬¤½¤Î¥á¥½¥Ã¥É¤«¤é¥µ¥Ö¥¯¥é¥¹¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥á¥½¥Ã¥É¤«¤é¼ÂÁõ¥á¥½¥Ã¥É¤Ë¥³¥Ô¡¼¤µ¤ì¤ë¾ì¹ç¤âƱÍͤǤ¹¡£@throws¤Ë¥É¥­¥å¥á¥ó¥È¤ò·Ñ¾µ¤µ¤»¤ë¤Ë¤Ï¡¢{@inheritDoc}¤ò»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++¾ÜºÙ¤Ï¡¢
++.na
++\f2@throws¥¿¥°¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@exception¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.TP 3
++{@value\ package.class#field}
++\f2{@value}\fP¤¬ÀÅŪ¥Õ¥£¡¼¥ë¥É¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç°ú¿ô¤Ê¤·¤Ç»ÈÍѤµ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¤½¤ÎÄê¿ô¤ÎÃͤ¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ /**
++.fl
++ * The value of this constant is {@value}.
++.fl
++ */
++.fl
++ public static final String SCRIPT_START = "<script>"
++.fl
++
++.fl
++\fP
++.fi
++.LP
++Ǥ°Õ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤Ç°ú¿ô\f2package.class#field\fP¤¢¤ê¤Ç»ÈÍѤµ¤ì¤¿¾ì¹ç¤Ï¡¢¤½¤Î»ØÄꤵ¤ì¤¿Äê¿ô¤ÎÃͤ¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ /**
++.fl
++ * Evaluates the script starting with {@value #SCRIPT_START}.
++.fl
++ */
++.fl
++ public String evalScript(String script) {
++.fl
++ }
++.fl
++
++.fl
++\fP
++.fi
++.LP
++°ú¿ô\f2package.class#field\fP¤Ï¡¢@see°ú¿ô¤ÈƱ°ì¤Î·Á¼°¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤À¤·¡¢¥á¥ó¥Ð¡¼¤ÏÀÅŪ¥Õ¥£¡¼¥ë¥É¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++¤³¤ì¤é¤ÎÄê¿ô¤Ç¤ÎÃͤϡ¢
++.na
++\f2Äê¿ô¥Õ¥£¡¼¥ë¥ÉÃÍ\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/constant\-values.html¥Ú¡¼¥¸¤Ë¤âɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++.TP 3
++@version\ version\-text
++\-version¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¡Ö¥Ð¡¼¥¸¥ç¥ó¡×¾®¸«½Ð¤·¤òÄɲ䷤ơ¢»ØÄꤵ¤ì¤¿\f2version\-text\fP¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£¤³¤Î¥¿¥°¤Ï¡¢¤³¤Î¥³¡¼¥É¤¬´Þ¤Þ¤ì¤ë¥½¥Õ¥È¥¦¥§¥¢¤Î¸½ºß¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÊÝ»ý¤¹¤ë¤è¤¦¤Ë°Õ¿Þ¤µ¤ì¤Æ¤¤¤Þ¤¹(¤³¤ì¤ËÂФ·¡¢@since¤Ï¡¢¤³¤Î¥³¡¼¥É¤¬Æ³Æþ¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÊÝ»ý¤·¤Þ¤¹)¡£\f2version\-text\fP¤Ë¤Ï¡¢ÆÃÊ̤ÊÆâÉô¹½Â¤¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥Ð¡¼¥¸¥ç¥ó¡¦¥¿¥°¤ò»ÈÍѤǤ­¤ë¾ì½ê¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢¥¿¥°¤ò»ÈÍѤǤ­¤ë¾ì½ê¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++1¤Ä¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ËÊ£¿ô¤Î\f2@version\fP¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£É¬Íפ˱þ¤¸¤Æ¡¢1¤Ä¤Î\f2@version\fP¥¿¥°¤Ë1¤Ä¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¡¢Ê£¿ô¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£Á°¼Ô¤Î¾ì¹ç¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ̾Á°¤È̾Á°¤Î´Ö¤Ë¥«¥ó¥Þ(\f2,\fP)¤È¶õÇòʸ»ú¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹¡£¸å¼Ô¤Î¾ì¹ç¤Ï¡¢¥Æ¥­¥¹¥ÈÁ´ÂΤ¬¡¢²òÀϤµ¤ì¤ë¤³¤È¤Ê¤¯¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¤½¤Î¤Þ¤Þ¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥«¥ó¥Þ¤Ç¤Ï¤Ê¤¯¡¢³Æ¸À¸ì¤ËÂбþ¤·¤¿Ì¾Á°¶èÀÚ¤êʸ»ú¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ë¤È¤­¤Ï¡¢1¤Ä¤Î¥¿¥°¤ËÊ£¿ô¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++¾ÜºÙ¤Ï¡¢
++.na
++\f2@version¥¿¥°¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#@version¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++.SS
++¥¿¥°¤ò»ÈÍѤǤ­¤ë¾ì½ê
++.LP
++¤³¤³¤Ç¤Ï¡¢¥¿¥°¤ò»ÈÍѤǤ­¤ë¾ì½ê¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£\f2@see\fP¡¢\f2@since\fP¡¢\f2@deprecated\fP¡¢\f2{@link}\fP¡¢\f2{@linkplain}\fP¡¢¤ª¤è¤Ó\f2{@docroot}\fP¤Ï¡¢¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç»ÈÍѤǤ­¤Þ¤¹¡£
++.SS
++³µÍפΥɥ­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥¿¥°
++.LP
++³µÍ×¥¿¥°¤Ï¡¢³µÍ×¥Ú¡¼¥¸¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç»ÈÍѤǤ­¤ë¥¿¥°¤Ç¤¹(¤³¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ï¡¢Ä̾ï\f2overview.html\fP¤È¤¤¤¦Ì¾Á°¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë¤¢¤ê¤Þ¤¹)¡£Â¾¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î¾ì¹ç¤ÈƱÍͤˡ¢¤³¤ì¤é¤Î¥¿¥°¤Ï¡¢¼çÀâÌÀ¤Î¸å¤Ç»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++\f3Ãí°Õ\fP \- ¥Ð¡¼¥¸¥ç¥ó1.2¤Ç¤Ï¡¢³µÍץɥ­¥å¥á¥ó¥ÈÆâ¤Î\f2{@link}\fP¥¿¥°¤Ë¥Ð¥°¤¬¤¢¤ê¤Þ¤¹¡£¥Æ¥­¥¹¥È¤ÏÀµ¤·¤¯É½¼¨¤µ¤ì¤Þ¤¹¤¬¡¢¥ê¥ó¥¯¤¬ÀßÄꤵ¤ì¤Þ¤»¤ó¡£¸½ºß¤Î¤È¤³¤í¡¢\f2{@docRoot}\fP¥¿¥°¤Ï¡¢³µÍץɥ­¥å¥á¥ó¥ÈÆâ¤Ç¤Ïµ¡Ç½¤·¤Þ¤»¤ó¡£
++.LP
++\f3³µÍ×¥¿¥°\fP
++.RS 3
++.TP 2
++o
++\f2@see\fP
++.TP 2
++o
++\f2@since\fP
++.TP 2
++o
++\f2@author\fP
++.TP 2
++o
++\f2@version\fP
++.TP 2
++o
++\f2{@link}\fP
++.TP 2
++o
++\f2{@linkplain}\fP
++.TP 2
++o
++\f2{@docRoot}\fP
++.RE
++.SS
++¥Ñ¥Ã¥±¡¼¥¸¡¦¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥¿¥°
++.LP
++¥Ñ¥Ã¥±¡¼¥¸¡¦¥¿¥°¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç»ÈÍѤǤ­¤ë¥¿¥°¤Ç¤¹(¤³¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ï\f2package.html\fP¤Þ¤¿¤Ï\f2package\-info.java\fP¤È¤¤¤¦Ì¾Á°¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë¤¢¤ê¤Þ¤¹)¡£¤³¤³¤Ç»ÈÍѤǤ­¤ë\f2@serial\fP¥¿¥°¤Ï¡¢\f2include\fP¤Þ¤¿¤Ï\f2exclude\fP°ú¿ô¤ò»ØÄꤷ¤¿¤â¤Î¤Î¤ß¤Ç¤¹¡£
++.LP
++\f3¥Ñ¥Ã¥±¡¼¥¸¡¦¥¿¥°\fP
++.RS 3
++.TP 2
++o
++\f2@see\fP
++.TP 2
++o
++\f2@since\fP
++.TP 2
++o
++\f2@serial\fP
++.TP 2
++o
++\f2@author\fP
++.TP 2
++o
++\f2@version\fP
++.TP 2
++o
++\f2{@link}\fP
++.TP 2
++o
++\f2{@linkplain}\fP
++.TP 2
++o
++\f2{@docRoot}\fP
++.RE
++.SS
++¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥¿¥°
++.LP
++¼¡¤Ë¡¢¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç»ÈÍѤǤ­¤ë¥¿¥°¤ò¼¨¤·¤Þ¤¹¡£¤³¤³¤Ç»ÈÍѤǤ­¤ë\f2@serial\fP¥¿¥°¤Ï¡¢\f2include\fP¤Þ¤¿¤Ï\f2exclude\fP°ú¿ô¤ò»ØÄꤷ¤¿¤â¤Î¤Î¤ß¤Ç¤¹¡£
++.LP
++\f3¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥¿¥°\fP
++.RS 3
++.TP 2
++o
++\f2@see\fP
++.TP 2
++o
++\f2@since\fP
++.TP 2
++o
++\f2@deprecated\fP
++.TP 2
++o
++\f2@serial\fP
++.TP 2
++o
++\f2@author\fP
++.TP 2
++o
++\f2@version\fP
++.TP 2
++o
++\f2{@link}\fP
++.TP 2
++o
++\f2{@linkplain}\fP
++.TP 2
++o
++\f2{@docRoot}\fP
++.RE
++\f3¥¯¥é¥¹¡¦¥³¥á¥ó¥È¤ÎÎã:\fP
++.nf
++\f3
++.fl
++/**
++.fl
++ * A class representing a window on the screen.
++.fl
++ * For example:
++.fl
++ * <pre>
++.fl
++ * Window win = new Window(parent);
++.fl
++ * win.show();
++.fl
++ * </pre>
++.fl
++ *
++.fl
++ * @author Sami Shaio
++.fl
++ * @version 1.13, 06/08/06
++.fl
++ * @see java.awt.BaseWindow
++.fl
++ * @see java.awt.Button
++.fl
++ */
++.fl
++class Window extends BaseWindow {
++.fl
++ ...
++.fl
++}
++.fl
++\fP
++.fi
++.SS
++¥Õ¥£¡¼¥ë¥É¡¦¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥¿¥°
++.LP
++¼¡¤Ë¡¢¥Õ¥£¡¼¥ë¥É¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç»ÈÍѤǤ­¤ë¥¿¥°¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++\f3¥Õ¥£¡¼¥ë¥É¡¦¥¿¥°\fP
++.RS 3
++.TP 2
++o
++\f2@see\fP
++.TP 2
++o
++\f2@since\fP
++.TP 2
++o
++\f2@deprecated\fP
++.TP 2
++o
++\f2@serial\fP
++.TP 2
++o
++\f2@serialField\fP
++.TP 2
++o
++\f2{@link}\fP
++.TP 2
++o
++\f2{@linkplain}\fP
++.TP 2
++o
++\f2{@docRoot}\fP
++.TP 2
++o
++\f2{@value}\fP
++.RE
++\f3¥Õ¥£¡¼¥ë¥É¡¦¥³¥á¥ó¥È¤ÎÎã:\fP
++.nf
++\f3
++.fl
++ /**
++.fl
++ * The X\-coordinate of the component.
++.fl
++ *
++.fl
++ * @see #getLocation()
++.fl
++ */
++.fl
++ int x = 1263732;
++.fl
++\fP
++.fi
++.SS
++¥³¥ó¥¹¥È¥é¥¯¥¿¤ª¤è¤Ó¥á¥½¥Ã¥É¡¦¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥¿¥°
++.LP
++¼¡¤Ë¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¤Þ¤¿¤Ï¥á¥½¥Ã¥É¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç»ÈÍѤǤ­¤ë¥¿¥°¤ò¼¨¤·¤Þ¤¹¡£¤¿¤À¤·¡¢\f2@return\fP¤Ï¥³¥ó¥¹¥È¥é¥¯¥¿¤Ç¤Ï»ÈÍѤǤ­¤º¡¢\f2{@inheritDoc}\fP¤Ë¤ÏÆÃÄê¤ÎÀ©¸Â¤¬¤¢¤ê¤Þ¤¹¡£\f2@serialData\fP¥¿¥°¤ÏÆÃÄê¤ÎľÎ󲽥᥽¥Ã¥É¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Ç¤Î¤ß»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++\f3¥á¥½¥Ã¥É¤ª¤è¤Ó¥³¥ó¥¹¥È¥é¥¯¥¿¡¦¥¿¥°\fP
++.RS 3
++.TP 2
++o
++\f2@see\fP
++.TP 2
++o
++\f2@since\fP
++.TP 2
++o
++\f2@deprecated\fP
++.TP 2
++o
++\f2@param\fP
++.TP 2
++o
++\f2@return\fP
++.TP 2
++o
++\f2@throws\fP¤È\f2@exception\fP
++.TP 2
++o
++\f2@serialData\fP
++.TP 2
++o
++\f2{@link}\fP
++.TP 2
++o
++\f2{@linkplain}\fP
++.TP 2
++o
++\f2{@inheritDoc}\fP
++.TP 2
++o
++\f2{@docRoot}\fP
++.RE
++\f3¥á¥½¥Ã¥É¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ÎÎã:\fP
++.nf
++\f3
++.fl
++ /**
++.fl
++ * Returns the character at the specified index. An index
++.fl
++ * ranges from <code>0</code> to <code>length() \- 1</code>.
++.fl
++ *
++.fl
++ * @param index the index of the desired character.
++.fl
++ * @return the desired character.
++.fl
++ * @exception StringIndexOutOfRangeException
++.fl
++ * if the index is not in the range <code>0</code>
++.fl
++ * to <code>length()\-1</code>.
++.fl
++ * @see java.lang.Character#charValue()
++.fl
++ */
++.fl
++ public char charAt(int index) {
++.fl
++ ...
++.fl
++ }
++.fl
++\fP
++.fi
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++Javadoc¥Ä¡¼¥ë¤Ï¡¢¥É¥Ã¥¯¥ì¥Ã¥È¤ò»ÈÍѤ·¤Æ½ÐÎϤò·èÄꤷ¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢\-doclet¥ª¥×¥·¥ç¥ó¤Ç¥«¥¹¥¿¥à¡¦¥É¥Ã¥¯¥ì¥Ã¥È¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç°Ê³°¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Îɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤ò»ÈÍѤ·¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ë¤Ï¡¢Ç¤°Õ¤Î¥É¥Ã¥¯¥ì¥Ã¥È¤È¤È¤â¤Ë»ÈÍѤǤ­¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢¸å½Ò¤ÎJavadoc¥ª¥×¥·¥ç¥ó¤ÇÀâÌÀ¤·¤Þ¤¹¡£É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤Ç¤Ï¡¢¤³¤Î¾¤Ë¡¢¤¤¤¯¤Ä¤«¤ÎÄɲäΥ³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤¬Ä󶡤µ¤ì¤Þ¤¹¡£¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢¸å½Ò¤Îɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤¬Ä󶡤¹¤ë¥ª¥×¥·¥ç¥ó¤ÇÀâÌÀ¤·¤Þ¤¹¡£¤É¤Î¥ª¥×¥·¥ç¥ó̾¤â¡¢Âçʸ»ú¤È¾®Ê¸»ú¤¬¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤¬¶èÊ̤µ¤ì¤Þ¤¹¡£
++.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
++.nr 34 \n(.lu
++.eo
++.am 80
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/4u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\-\f21.1\fP
++.br
++\-author
++.br
++\-\f2bootclasspath\fP
++.br
++\-bottom
++.br
++\-\f2breakiterator\fP
++.br
++\-charset
++.br
++\-\f2classpath\fP
++.br
++\-d
++.br
++\-docencoding
++.br
++\-docfilessubdirs
++.br
++\-\f2doclet\fP
++.br
++\-\f2docletpath\fP
++.br
++\-doctitle
++.br
++\-\f2encoding\fP
++.br
++\-\f2exclude\fP
++.br
++\-excludedocfilessubdir
++.br
++\-\f2extdirs\fP
++.br
++\-footer
++.br
++\-group
++.br
++.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/4u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++\-header
++.br
++\-\f2help\fP
++.br
++\-helpfile
++.br
++\-\f2J\fP
++.br
++\-keywords
++.br
++\-link
++.br
++\-linkoffline
++.br
++\-linksource
++.br
++\-\f2locale\fP
++.br
++\-nocomment
++.br
++\-nodeprecated
++.br
++\-nodeprecatedlist
++.br
++\-nohelp
++.br
++\-noindex
++.br
++\-nonavbar
++.br
++\-noqualifier
++.br
++\-nosince
++.br
++\-notimestamp
++.br
++\-notree
++.br
++\-\f2overview\fP
++.br
++\-\f2package\fP
++.br
++.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/4u
++.if \n(.l<\n(82 .ll \n(82u
++.in 0
++\-\f2private\fP
++.br
++\-\f2protected\fP
++.br
++\-\f2public\fP
++.br
++\-\f2quiet\fP
++.br
++\-serialwarn
++.br
++\-\f2source\fP
++.br
++\-\f2sourcepath\fP
++.br
++\-sourcetab
++.br
++\-splitindex
++.br
++\-stylesheetfile
++.br
++\-\f2subpackages\fP
++.br
++\-tag
++.br
++\-taglet
++.br
++\-tagletpath
++.br
++\-top
++.br
++\-title
++.br
++\-use
++.br
++\-\f2verbose\fP
++.br
++\-version
++.br
++\-windowtitle
++.br
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.80
++.rm 80
++.nr 38 \n(a-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 81 0
++.81
++.rm 81
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 82 0
++.82
++.rm 82
++.nr 38 \n(c-
++.if \n(82<\n(38 .nr 82 \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 TW \n(82
++.if t .if \n(TW>\n(.li .tm Table at line 2003 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
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'\h'|\n(42u'
++.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(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-127
++.LP
++\f2¥¤¥¿¥ê¥Ã¥¯\fP¤Ç¼¨¤µ¤ì¤¿¥ª¥×¥·¥ç¥ó¤Ï¡¢Javadoc¤Î´ðËÜ¥ª¥×¥·¥ç¥ó¤Ç¤¢¤ê¡¢Javadoc¥Ä¡¼¥ë¤Î¥Õ¥í¥ó¥È¥¨¥ó¥É¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¡¢¤¹¤Ù¤Æ¤Î¥É¥Ã¥¯¥ì¥Ã¥È¤Ç»ÈÍѤǤ­¤Þ¤¹¡£É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¼«ÂΤϡ¢¥¤¥¿¥ê¥Ã¥¯¤Ç¤Ê¤¤¥ª¥×¥·¥ç¥ó¤òÄ󶡤·¤Þ¤¹¡£
++.SS
++Javadoc¥ª¥×¥·¥ç¥ó
++.RS 3
++.TP 3
++\-overview \ path/filename
++Javadoc¤ËÂФ·¤Æ¡¢\f2path/filename\fP¤Ç»ØÄꤵ¤ì¤¿¡Ö¥½¡¼¥¹¡×¥Õ¥¡¥¤¥ë¤«¤é³µÍץɥ­¥å¥á¥ó¥ÈÍѤΥƥ­¥¹¥È¤ò¼èÆÀ¤·¡¢¤½¤Î¥Æ¥­¥¹¥È¤ò³µÍ×¥Ú¡¼¥¸(\f2overview\-summary.html\fP)¤ËÇÛÃÖ¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£\f2path/filename\fP¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤Ç¤¹¡£
++.br
++.br
++\f2filename\fP¤ÇǤ°Õ¤Î̾Á°¤ò»ÈÍѤ·¡¢\f2path\fP¤ÇǤ°Õ¤ÎÇÛÃÖÀè¤ò»ØÄê¤Ç¤­¤Þ¤¹¤¬¡¢Ä̾ï¤Ï\f2overview.html\fP¤È¤¤¤¦Ì¾Á°¤òÉÕ¤±¡¢¥½¡¼¥¹¡¦¥Ä¥ê¡¼Æâ¤ÎºÇ¾å°Ì¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ç¥£¥ì¥¯¥È¥ê¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ËÇÛÃÖ¤·¤Þ¤¹¡£¤³¤Î¾ì½ê¤ËÇÛÃÖ¤¹¤ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¤È¤­¤Ë\f2path\fP¤ò»ØÄꤹ¤ëɬÍפ¬¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢\f2\-sourcepath\fP¤Ë¤è¤Ã¤Æ¤³¤Î¥Õ¥¡¥¤¥ë¤¬»Ø¤·¼¨¤µ¤ì¤ë¤«¤é¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2java.lang\fP¥Ñ¥Ã¥±¡¼¥¸¤Î¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤¬\f2/src/classes/java/lang/\fP¤Î¾ì¹ç¡¢³µÍ×¥Õ¥¡¥¤¥ë¤ò\f2/src/classes/overview.html\fP¤ËÇÛÃ֤Ǥ­¤Þ¤¹¡£»ÈÍÑÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++\f2path/filename\fP¤Ç»ØÄꤹ¤ë¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¤Ï¡¢³µÍ×¥³¥á¥ó¥È¡¦¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++³µÍ×¥Ú¡¼¥¸¤¬ºîÀ®¤µ¤ì¤ë¤Î¤Ï¡¢Javadoc¤ËÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÅϤ·¤¿¾ì¹ç¤Î¤ß¤Ç¤¹¡£¾ÜºÙ¤Ï¡¢HTML¥Õ¥ì¡¼¥à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++³µÍ×¥Ú¡¼¥¸¤Î¥¿¥¤¥È¥ë¤Ï¡¢\f2\-doctitle\fP¤Ë¤è¤Ã¤ÆÀßÄꤵ¤ì¤Þ¤¹¡£
++.TP 3
++\-public
++public¥¯¥é¥¹¤ª¤è¤Ó¥á¥ó¥Ð¡¼¤Î¤ß¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-protected
++protected¤ª¤è¤Ópublic¤Î¥¯¥é¥¹¤È¥á¥ó¥Ð¡¼¤Î¤ß¤òɽ¼¨¤·¤Þ¤¹¡£¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£
++.TP 3
++\-package
++package¡¢protected¡¢¤ª¤è¤Ópublic¤Î¥¯¥é¥¹¤È¥á¥ó¥Ð¡¼¤Î¤ß¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-private
++¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤È¥á¥ó¥Ð¡¼¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-help
++¥ª¥ó¥é¥¤¥ó¡¦¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹¡£Javadoc¤È¥É¥Ã¥¯¥ì¥Ã¥È¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤¬¥ê¥¹¥È¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-doclet\ class
++¥É¥­¥å¥á¥ó¥È¤ÎÀ¸À®¤Ë»ÈÍѤ¹¤ë¥É¥Ã¥¯¥ì¥Ã¥È¤òµ¯Æ°¤¹¤ë¤¿¤á¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£´°Á´½¤¾þ̾¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥É¥Ã¥¯¥ì¥Ã¥È¤Ë¤è¤ê¡¢½ÐÎϤÎÆâÍƤȷÁ¼°¤¬ÄêµÁ¤µ¤ì¤Þ¤¹¡£\f4\-doclet\fP¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤµ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢Javadoc¤Ï¡¢É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤ò»ÈÍѤ·¤Æ¥Ç¥Õ¥©¥ë¥È¤ÎHTML·Á¼°¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¤Ë¤Ï\f2start(Root)\fP¥á¥½¥Ã¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Îµ¯Æ°¥¯¥é¥¹¤Ø¤Î¥Ñ¥¹¤Ï\f2\-docletpath\fP¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++¾ÜºÙ¤Ï¡¢
++.na
++\f2¥É¥Ã¥¯¥ì¥Ã¥È¤Î³µÍ×\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/doclet/overview.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-docletpath\ classpathlist
++\f2\-doclet\fP¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥É¥Ã¥¯¥ì¥Ã¥È³«»Ï¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¡¢¤ª¤è¤Ó¤½¤Î¥¯¥é¥¹¤¬°Í¸¤¹¤ë¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£³«»Ï¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤¬jar¥Õ¥¡¥¤¥ëÆâ¤Ë¤¢¤ë¾ì¹ç¡¢¼¡¤ÎÎã¤Î¤è¤¦¤Ëjar¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤¬»ØÄꤵ¤ì¤Þ¤¹¡£ÀäÂХѥ¹¤Þ¤¿¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\f2classpathlist\fP¤ËÊ£¿ô¤Î¥Ñ¥¹¤äJAR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤ì¤é¤òSolaris¤Î¾ì¹ç¤Ï¥³¥í¥ó(:)¤Ç¡¢Windows¤Î¾ì¹ç¤Ï¥»¥ß¥³¥í¥ó(;)¤Ç¤½¤ì¤¾¤ì¶èÀÚ¤ê¤Þ¤¹¡£ÌÜŪ¤Î¥É¥Ã¥¯¥ì¥Ã¥È³«»Ï¥¯¥é¥¹¤¬¤¹¤Ç¤Ë¸¡º÷¥Ñ¥¹Æâ¤Ë¤¢¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÉÔÍפǤ¹¡£
++.br
++.br
++¾ÜºÙ¤Ï¡¢
++.na
++\f2¥É¥Ã¥¯¥ì¥Ã¥È¤Î³µÍ×\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/doclet/overview.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-1.1
++\f2¤³¤Îµ¡Ç½¤ÏJavadoc 1.4¤«¤éºï½ü¤µ¤ì¤Þ¤·¤¿¡£ÂåÂص¡Ç½¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢Javadoc 1.1¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤ë¤Î¤ÈƱ¤¸³°¸«¤Èµ¡Ç½¤ò»ý¤Ä¥É¥­¥å¥á¥ó¥È¤òºîÀ®¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤·¤¿(¥Í¥¹¥È¤µ¤ì¤¿¥¯¥é¥¹¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó)¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬É¬Íפʾì¹ç¤Ï¡¢Javadoc 1.2¤Þ¤¿¤Ï1.3¤ò¤«¤ï¤ê¤Ë»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£\fP
++.TP 3
++\-source release
++¼õ¤±ÉÕ¤±¤ë¥½¡¼¥¹¡¦¥³¡¼¥É¤Î¥Ð¡¼¥¸¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£\f2release\fP¤Ë¤Ï¼¡¤ÎÃͤò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f31.5\fP \- Javadoc¤Ï¡¢JDK 1.5¤ÇƳÆþ¤µ¤ì¤¿Áí¾Î¤ª¤è¤Ó¾¤Î¸À¸ìµ¡Ç½¤ò´Þ¤à¥³¡¼¥É¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£\f3\-source\fP¥Õ¥é¥°¤¬»ÈÍѤµ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¤Î¥³¥ó¥Ñ¥¤¥é¤Î¥Ç¥Õ¥©¥ë¥ÈÆ°ºî¤Ï¡¢1.5¤Î¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++\f31.4\fP \- Javadoc¤Ï¡¢JDK 1.4¤ÇƳÆþ¤µ¤ì¤¿¥¢¥µ¡¼¥·¥ç¥ó¤ò´Þ¤à¥³¡¼¥É¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£
++.TP 2
++o
++\f31.3\fP \- Javadoc¤Ï¡¢JDK 1.3°Ê¹ß¤ËƳÆþ¤µ¤ì¤¿¥¢¥µ¡¼¥·¥ç¥ó¡¢Áí¾Î¡¢¤Þ¤¿¤Ï¾¤Î¸À¸ìµ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó¡£
++.RE
++javac¤Ç¥³¡¼¥É¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤È¤­¤Ë»ÈÍѤ·¤¿ÃͤËÂбþ¤¹¤ë\f2release\fP¤ÎÃͤò»ÈÍѤ·¤Þ¤¹¡£
++.TP 3
++\-sourcepath\ sourcepathlist
++¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Þ¤¿¤Ï\f2\-subpackages\fP¤ò\f2javadoc\fP¥³¥Þ¥ó¥É¤ËÅϤ¹¤È¤­¤Ë¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë(.\f2.java\fP)¤ò¸«¤Ä¤±¤ë¤¿¤á¤Î¸¡º÷¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£\f2sourcepathlist\fP¤Ë¤Ï¡¢¥³¥í¥ó(\f2:\fP)¤Ç¶èÀڤäÆÊ£¿ô¤Î¥Ñ¥¹¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ñ¥¹°Ê²¼¤Î¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¸¡º÷¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î°ÌÃ֤ΤߤǤʤ¯¡¢¤½¤ì¼«ÂΤϥɥ­¥å¥á¥ó¥È²½¤µ¤ì¤Ê¤¤¤¬¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤«¤é·Ñ¾µ¤µ¤ì¤¿¥³¥á¥ó¥È¤ò»ý¤Ä¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤â³Îǧ¤Ç¤­¤Þ¤¹¡£
++.br
++.br
++\f2\-sourcepath\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤǤ­¤ë¤Î¤Ï¡¢javadoc¥³¥Þ¥ó¥É¤Ë¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÅϤ¹¾ì¹ç¤Î¤ß¤Ç¤¹¡£¤³¤Î¥Ñ¥¹¤«¤é¤Ï¡¢\f2javadoc\fP¥³¥Þ¥ó¥É¤ËÅϤµ¤ì¤ë\f2.java\fP¥Õ¥¡¥¤¥ë¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£(\f2.java\fP¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ëcd¤Ë¤è¤Ã¤Æ°ÜÆ°¤¹¤ë¤«¡¢¤Þ¤¿¤Ï³Æ¥Õ¥¡¥¤¥ë¤ÎÀèƬ¤Ë¥Ñ¥¹¤ò´Þ¤á¤Þ¤¹(1¤Ä°Ê¾å¤Î¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥È²½¤ò»²¾È)¡£)\f2\-sourcepath\fP¤¬¾Êά¤µ¤ì¤¿¾ì¹ç¡¢Javadoc¤Ï¡¢¥¯¥é¥¹¡¦¥Ñ¥¹¤ò»ÈÍѤ·¤Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·¤Þ¤¹(\-classpath¤ò»²¾È)¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Ç¥Õ¥©¥ë¥È¤Î\-sourcepath¤Ï¡¢¥¯¥é¥¹¡¦¥Ñ¥¹¤ÎÃͤǤ¹¡£\-classpath¤ò¾Êά¤·¤Æ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òJavadoc¤ËÅϤ¹¤È¡¢Javadoc¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê(¤ª¤è¤Ó¤½¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê)¤«¤é¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·¤Þ¤¹¡£
++.br
++.br
++\f2sourcepathlist\fP¤Ë¤Ï¡¢¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤Î¥ë¡¼¥È¡¦¥Ç¥£¥ì¥¯¥È¥ê¤òÀßÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2com.mypackage\fP¤È¤¤¤¦Ì¾Á°¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¾ì¹ç¤Ë¡¢¤½¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬¼¡¤Î¾ì½ê¤Ë¤¢¤ë¤È¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ /home/user/src/com/mypackage/*.java
++.fl
++\fP
++.fi
++¤³¤Î¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Æ\f2sourcepath\fP¤ò¡¢\f2com/mypackage\fP¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¢¤ë\f2/home/user/src\fP¤Ë»ØÄꤷ¤Æ¤«¤é¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾\f2com.mypackage\fP¤ò»ØÄꤷ¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-sourcepath /home/user/src/ com.mypackage\fP
++.fl
++.fi
++¤³¤ÎÊýË¡¤Ï¡¢¥½¡¼¥¹¡¦¥Ñ¥¹¤ÎÃͤȥѥ屡¼¥¸Ì¾¤òÏ¢·ë¤·¤Æ¡¢¥É¥Ã¥È¤ò¥¹¥é¥Ã¥·¥å¡Ö/¡×¤ËÊѹ¹¤¹¤ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥Õ¥ë¥Ñ¥¹\f2/home/user/src/com/mypackage\fP¤Ë¤Ê¤ë¤³¤È¤Ëµ¤ÉÕ¤¯¤È³Ð¤¨¤ä¤¹¤¤¤Ç¤¹¡£
++.br
++.br
++2¤Ä¤Î¥½¡¼¥¹¡¦¥Ñ¥¹¤òÀßÄꤹ¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-sourcepath /home/user1/src:/home/user2/src com.mypackage\fP
++.fl
++.fi
++.TP 3
++\-classpath\ classpathlist
++Javadoc¤¬»²¾È¥¯¥é¥¹(\f2.class\fP¥Õ¥¡¥¤¥ë)¤Î¸¡º÷¤ò¹Ô¤¦¤È¤­¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£»²¾È¥¯¥é¥¹¤È¤Ï¡¢¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤È¡¢¤½¤ì¤é¤Î¥¯¥é¥¹¤Ë¤è¤Ã¤Æ»²¾È¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤Î¤³¤È¤Ç¤¹¡£\f2classpathlist\fP¤Ë¤Ï¡¢¥³¥í¥ó(\f2:\fP)¤Ç¶èÀڤäÆÊ£¿ô¤Î¥Ñ¥¹¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ñ¥¹°Ê²¼¤Î¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¸¡º÷¤·¤Þ¤¹¡£\f2classpathlist\fP¤ò»ØÄꤹ¤ë¤È¤­¤Ï¡¢
++.na
++\f2¥¯¥é¥¹¡¦¥Ñ¥¹\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general¤Î¥É¥­¥å¥á¥ó¥È¤Ë¤¢¤ë»Ø¼¨¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++\f2\-sourcepath\fP¤¬¾Êά¤µ¤ì¤¿¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¤È¤­¤Î¤ß¤Ç¤Ê¤¯¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¤È¤­¤Ë¤â\f2\-classpath\fP¤ò»ÈÍѤ·¤Þ¤¹(²¼°Ì¸ß´¹À­¤Î¤¿¤á)¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òÊÌ¡¹¤Î¥Ñ¥¹¤«¤é¸¡º÷¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢\f2\-sourcepath\fP¤È\f2\-classpath\fP¤ÎξÊý¤ò»ÈÍѤ·¤Þ¤¹¡£
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢\f2com.mypackage\fP¤ò¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¾ì¹ç¤Ë¡¢¤½¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬¥Ç¥£¥ì¥¯¥È¥ê\f2/home/user/src/com/mypackage\fP¤Ë¤¢¤ê¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬\f2/home/user/lib\fPÆâ¤Î¥é¥¤¥Ö¥é¥ê¤Ë°Í¸¤·¤Æ¤¤¤ë¤È¤­¡¢¼¡¤Î¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-classpath /home/user/lib \-sourcepath /home/user/src com.mypackage\fP
++.fl
++.fi
++¾¤Î¥Ä¡¼¥ë¤ÈƱÍͤˡ¢\f2\-classpath\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢CLASSPATH´Ä¶­ÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢Javadoc¥Ä¡¼¥ë¤Ï¤½¤Î´Ä¶­ÊÑ¿ô¤ò»ÈÍѤ·¤Þ¤¹¡£¤É¤Á¤é¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¥¯¥é¥¹¤ò¸¡º÷¤·¤Þ¤¹¡£
++.br
++.br
++Javadoc¥Ä¡¼¥ë¤¬\f2\-classpath\fP¤ò»ÈÍѤ·¤Æ¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¤ò¸¡º÷¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Î¡¢³ÈÄ¥µ¡Ç½¥¯¥é¥¹¤ä¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤Ë´ØÏ¢¤·¤¿¾ÜºÙ¤Ï¡¢
++.na
++\f2¥¯¥é¥¹¤Î¸¡º÷ÊýË¡\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++Êص¹¾å¡¢\f2*\fP¤Î¥Ù¡¼¥¹Ì¾¤ò´Þ¤à¥¯¥é¥¹¡¦¥Ñ¥¹Í×ÁǤϡ¢\f2.jar\fP¤Þ¤¿¤Ï\f2.JAR\fP¤ò³ÈÄ¥»Ò¤Ë»ý¤Ä¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ò»ØÄꤹ¤ë¤Î¤ÈƱÅù¤È¤ß¤Ê¤µ¤ì¤Þ¤¹(Java¥×¥í¥°¥é¥à¤Ï¤³¤Î2¤Ä¤Î¸Æ½Ð¤·¤ò¶èÊ̤Ǥ­¤Þ¤»¤ó)¡£
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢¥Ç¥£¥ì¥¯¥È¥ê\f2foo\fP¤Ë\f2a.jar\fP¤È\f2b.JAR\fP¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¡¦¥Ñ¥¹Í×ÁÇ\f2foo/*\fP¤Ï\f2A.jar:b.JAR\fP¤ËŸ³«¤µ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢JAR¥Õ¥¡¥¤¥ë¤Î½çÈÖ¤Ï̤»ØÄê¤È¤Ê¤ê¤Þ¤¹¡£¤³¤Î¥ê¥¹¥È¤Ë¤Ï¡¢±£¤·¥Õ¥¡¥¤¥ë¤â´Þ¤á¡¢»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£\f2*\fP¤Î¤ß¤«¤é¤Ê¤ë¥¯¥é¥¹¡¦¥Ñ¥¹¡¦¥¨¥ó¥È¥ê¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ËŸ³«¤µ¤ì¤Þ¤¹¡£\f2CLASSPATH\fP´Ä¶­ÊÑ¿ô¤â¡¢ÄêµÁ»þ¤Ë¤ÏƱÍͤËŸ³«¤µ¤ì¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¥ï¥¤¥ë¥É¥«¡¼¥ÉŸ³«¤Ïɬ¤º¡¢Java²¾ÁÛ¥Þ¥·¥ó¤Îµ¯Æ°Á°¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢´Ä¶­¤ËÌä¹ç¤»¤ò¹Ô¤ï¤Ê¤¤¸Â¤ê¡¢Java¥×¥í¥°¥é¥à¤¬Å¸³«¤µ¤ì¤Æ¤¤¤Ê¤¤¥ï¥¤¥ë¥É¥«¡¼¥É¤òǧ¼±¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\f2System.getenv(\\"CLASSPATH\\")\fP¸Æ½Ð¤·¤¬¤½¤ÎÎã¤Ç¤¹¡£
++.TP 3
++\-subpackages\ \ package1:package2:...
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤«¤é»ØÄꤵ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ª¤è¤Ó¤½¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸Æâ¤ËºÆµ¢Åª¤Ë¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥½¡¼¥¹¡¦¥³¡¼¥É¤Ë¿·¤·¤¤¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤òÄɲ乤ëºÝ¤ËÊØÍø¤Ç¤¹¡£¿·¤·¤¤¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤¬¼«Æ°Åª¤ËÁȤ߹þ¤Þ¤ì¤ë¤«¤é¤Ç¤¹¡£³Æ\f2package\fP°ú¿ô¤Ï¡¢Ç¤°Õ¤ÎºÇ¾å°Ì¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸(\f2java\fP¤Ê¤É)¤Þ¤¿¤Ï´°Á´½¤¾þ¥Ñ¥Ã¥±¡¼¥¸(\f2javax.swing\fP¤Ê¤É)¤Ë¤Ê¤ê¤Þ¤¹¡£¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤á¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£°ú¿ô¤Ï¡¢¥³¥í¥ó¤Ç¶èÀÚ¤é¤ì¤Þ¤¹(¤¹¤Ù¤Æ¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à)¡£¥ï¥¤¥ë¥É¥«¡¼¥É¤ÏÉÔÍ×(»ÈÍÑÉÔ²Ä)¤Ç¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¤Î¸¡º÷¾ì½ê¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢\f2\-sourcepath\fP¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î½èÍý¤ÇÀâÌÀ¤·¤¿¤È¤ª¤ê¡¢¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤Ë¤¢¤ë¤¬¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï°¤·¤Æ¤¤¤Ê¤¤¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò½èÍý¤·¤Ê¤¤¤Î¤ÇÌòΩ¤Á¤Þ¤¹¡£
++.br
++.br
++Îã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-d docs \-sourcepath /home/user/src \-subpackages java:javax.swing\fP
++.fl
++.fi
++¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¡Öjava¡×¤ª¤è¤Ó¡Öjavax.swing¡×¤È¤¤¤¦Ì¾Á°¤Î¥Ñ¥Ã¥±¡¼¥¸¤È¤³¤ì¤é¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸Á´Éô¤Î¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£
++.br
++.br
++\f2\-subpackages\fP¤ò\f2\-exclude\fP¤ÈÁȤ߹礻¤Æ»ÈÍѤ¹¤ë¤È¡¢ÆÃÄê¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò½ü³°¤Ç¤­¤Þ¤¹¡£
++.TP 3
++\-exclude\ \ packagename1:packagename2:...
++»ØÄꤵ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤È¤½¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤ò\f2\-subpackages\fP¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿¥ê¥¹¥È¤«¤é̵¾ò·ï¤Ë½ü³°¤·¤Þ¤¹¡£²áµî¤Þ¤¿¤Ï¾­Íè¤Î\f2\-subpackages\fP¥ª¥×¥·¥ç¥ó¤Î»ØÄê¤Ë¤è¤Ã¤ÆÁȤ߹þ¤Þ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤â½ü³°¤ÎÂоݤȤʤê¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-sourcepath /home/user/src \-subpackages java \-exclude java.net:java.lang\fP
++.fl
++.fi
++¤³¤Î¾ì¹ç¡¢\f2java.io\fP¡¢\f2java.util\fP¡¢\f2java.math\fP¤Ê¤É¤ÏÁȤ߹þ¤Þ¤ì¤Þ¤¹¤¬¡¢\f2java.net\fP¤È\f2java.lang\fP¤ò¥ë¡¼¥È¤Ë»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¤Ï½ü³°¤µ¤ì¤Þ¤¹¡£\f2java.lang\fP¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¢¤ë\f2java.lang.ref\fP¤¬½ü³°¤µ¤ì¤ëÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-bootclasspath\ classpathlist
++¥Ö¡¼¥È¡¦¥¯¥é¥¹¤¬Â¸ºß¤¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ö¡¼¥È¡¦¥¯¥é¥¹¤È¤Ï¡¢Ä̾Java¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¡¦¥¯¥é¥¹¤Î¤³¤È¤Ç¤¹¡£¥Ö¡¼¥È¡¦¥¯¥é¥¹¥Ñ¥¹¤Ï¡¢Javadoc¥Ä¡¼¥ë¤¬¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òõ¤¹¤È¤­¤Ë»ÈÍѤ¹¤ë¸¡º÷¥Ñ¥¹¤Î°ìÉô¤Ç¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2¥¯¥é¥¹¤Î¸¡º÷ÊýË¡\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\f2classpathlist\fPÆâ¤ÎÊ£¿ô¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¥³¥í¥ó(:)¤Ç¶èÀÚ¤ê¤Þ¤¹¡£
++.TP 3
++\-extdirs\ dirlist
++³ÈÄ¥µ¡Ç½¥¯¥é¥¹¤¬Â¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£³ÈÄ¥µ¡Ç½¥¯¥é¥¹¤È¤Ï¡¢Java³ÈÄ¥µ¡Ç½µ¡¹½¤ò»ÈÍѤ¹¤ë¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤Ç¤¹¡£extdirs¤Ï¡¢Javadoc¥Ä¡¼¥ë¤¬¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òõ¤¹¤È¤­¤Ë»ÈÍѤ¹¤ë¸¡º÷¥Ñ¥¹¤Î°ìÉô¤Ç¤¹¡£¾ÜºÙ¤Ï¡¢Á°½Ò¤Î\f2\-classpath\fP¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\f2dirlist\fPÆâ¤ÎÊ£¿ô¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¥³¥í¥ó(:)¤Ç¶èÀÚ¤ê¤Þ¤¹¡£
++.TP 3
++\-verbose
++Javadoc¤Î¼Â¹ÔÃæ¤Ë¾ÜºÙ¤Ê¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹¡£verbose¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤È¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥í¡¼¥É»þ¡¢¥É¥­¥å¥á¥ó¥È¤ÎÀ¸À®»þ(¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤´¤È¤Ë1¤Ä¤Î¥á¥Ã¥»¡¼¥¸)¡¢¤ª¤è¤Ó¥½¡¼¥È»þ¤Ë¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£verbose¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢³ÆJava¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î²òÀϤËÍפ·¤¿»þ´Ö(¥ß¥êÉÃñ°Ì)¤ò¼¨¤¹ÄɲäΥá¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-quiet
++¥¨¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸¤Þ¤¿¤Ï·Ù¹ð¥á¥Ã¥»¡¼¥¸°Ê³°¤Î¥á¥Ã¥»¡¼¥¸¤òÍÞÀ©¤·¡¢·Ù¹ð¤È¥¨¥é¡¼¤Î¤ß¤¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤·¤Æ¡¢¤³¤ì¤é¤ò³Îǧ¤·¤ä¤¹¤¯¤·¤Þ¤¹¡£¥Ð¡¼¥¸¥ç¥óʸ»úÎó¤âÍÞÀ©¤·¤Þ¤¹¡£
++.TP 3
++\-breakiterator\
++±Ñʸ¤ÎºÇ½é¤Îʸ¤Î½ª¤ï¤ê¤òȽÃǤ¹¤ëºÝ¤Ë¡¢±Ñ¸ì¸À¸ì¤È¤¤¤¦¥í¥±¡¼¥ë¸ÇÍ­¤Î¥¢¥ë¥´¥ê¥º¥à¤Ç¤Ï¤Ê¤¯¡¢
++.na
++\f2java.text.BreakIterator\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/java/text/BreakIterator.html¤Î¹ñºÝ²½¤µ¤ì¤¿Ê¸¶­³¦¤ò»ÈÍѤ·¤Þ¤¹(¾¤Î¤¹¤Ù¤Æ¤Î¥í¥±¡¼¥ë¤Ï¤¹¤Ç¤Ë\f2BreakIterator\fP¤ò»ÈÍÑ)¡£\f2ºÇ½é¤Îʸ\fP¤È¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤Þ¤¿¤Ï¥á¥ó¥Ð¡¼¤Î¼çÀâÌÀ¤Ç¤ÎºÇ½é¤Îʸ¤Î¤³¤È¤Ç¤¹¡£¤³¤Îʸ¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¤Þ¤¿¤Ï¥á¥ó¥Ð¡¼¤ÎÍ×Ìó¤Ë¥³¥Ô¡¼¤µ¤ì¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Îº÷°ú¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++JDK 1.2°Ê¹ß¡¢BreakIterator¥¯¥é¥¹¤Ï¡¢±Ñ¸ì¤ò½ü¤¯¤¹¤Ù¤Æ¤Î¸À¸ì¤Îʸ¤Î½ª¤ï¤ê¤òȽÃǤ¹¤ë¤¿¤á¤Ë¡¢¤¹¤Ç¤Ë»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2\-breakiterator\fP¥ª¥×¥·¥ç¥ó¤Ï¡¢1.2°Ê¹ß¤Ç¤Ï±Ñʸ°Ê³°¤Ë¤Ï¸ú²Ì¤¬¤¢¤ê¤Þ¤»¤ó¡£±Ñʸ¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ÊÆȼ«¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥ë¥´¥ê¥º¥à¤¬¤¢¤ê¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++±Ñʸ¤Î¥Ç¥Õ¥©¥ë¥È¤Îʸ¶èÀڤꥢ¥ë¥´¥ê¥º¥à \- ¶õÇòʸ»ú¤Þ¤¿¤ÏHTML¥Ö¥í¥Ã¥¯¡¦¥¿¥°(\f2<P>\fP¤Ê¤É)¤¬Â³¤¯¥Ô¥ê¥ª¥É¤ÇÄä»ß¤·¤Þ¤¹¡£
++.TP 2
++o
++breakiteratorʸ¶èÀڤꥢ¥ë¥´¥ê¥º¥à \- °ìÈ̤ˡ¢¼¡¤Î¸ì¤¬Âçʸ»ú¤Ç»Ï¤Þ¤ë¾ì¹ç¡¢¶õÇòʸ»ú¤¬Â³¤¯¥Ô¥ê¥ª¥É¡¢µ¿ÌäÉä¡¢¤Þ¤¿¤Ï´¶Ã²Éä¤ÇÄä»ß¤·¤Þ¤¹¡£¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Ç¤Ï¡ÖThe serial no. is valid¡×¤Ê¤É¡¢¤Û¤È¤ó¤É¤Î¾Êάɽµ­¤¬½èÍý¤µ¤ì¤Þ¤¹¤¬¡¢¡ÖMr.Smith¡×¤Ï½èÍý¤µ¤ì¤Þ¤»¤ó¡£HTML¥¿¥°¤ä¡¢¿ô»ú¤Þ¤¿¤Ïµ­¹æ¤Ç»Ï¤Þ¤ëʸ¤Ç¤ÏÄä»ß¤·¤Þ¤»¤ó¡£HTML¥¿¥°¤ËËä¤á¹þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ç¤â¡¢¡Ö../filename¡×¤ÎºÇ¸å¤Î¥Ô¥ê¥ª¥É¤ÇÄä»ß¤·¤Þ¤¹¡£
++.RE
++Ãí°Õ: 1.5.0¤«¤é¤Ï¡¢1.4.x¤ËÀߤ±¤é¤ì¤Æ¤¤¤¿breakiterator·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¡¢¥Ç¥Õ¥©¥ë¥È¤Îʸ¶èÀڤꥢ¥ë¥´¥ê¥º¥à¤òÊѹ¹¤·¤Æ¤¤¤Þ¤»¤ó¡£¤Ä¤Þ¤ê¡¢\-breakiterator¥ª¥×¥·¥ç¥ó¤Ï¡¢1.5.0¤Ç¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¤Ê¤¯¤Ê¤ê¡¢¤Þ¤¿¥Ç¥Õ¥©¥ë¥È¤Ë¤¹¤ë¤Ä¤â¤ê¤â¤¢¤ê¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢¡Ö¼¡¤Î¥á¥¸¥ã¡¼¡¦¥ê¥ê¡¼¥¹¡×(1.5.0)¤Ç¥Ç¥Õ¥©¥ë¥È¤òÊѹ¹¤¹¤ë¤È¤¤¤¦¡¢°ÊÁ°¤ÎÌÜŪ¤È¤ÏµÕ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥½¡¼¥¹¡¦¥³¡¼¥É¤òÊѹ¹¤»¤º¡¢1.4.x¤Ç¤Îbreakiterator·Ù¹ð¤ò½üµî¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤â¡¢1.5.0¤«¤é¤Ï²¿¤â¤¹¤ëɬÍפ¬¤Ê¤¯¡¢·Ù¹ð¤Ï¾ÃÌǤ·¤Æ¤¤¤Þ¤¹¡£¤³¤ÎµÕÌá¤ê¤ÎÍýͳ¤Ï¡¢breakiterator¤ò¥Ç¥Õ¥©¥ë¥È¤Ë¤¹¤ë¥á¥ê¥Ã¥È¤è¤ê¤â¡¢¥Ç¥Õ¥©¥ë¥È¤Ë¤¹¤ë¤¿¤á¤ËɬÍפȤʤ롢¸ß´¹À­¤Î¤Ê¤¤¥½¡¼¥¹¤ÎÊѹ¹¤ÎÊý¤¬Ééô¤¬Â礭¤«¤Ã¤¿¤¿¤á¤Ç¤¹¡£¤³¤Î·ï¤Ç³§ÍͤË;ʬ¤Î¼ê´Ö¤ò¤ª¤«¤±¤·¡¢º®Íð¤ò¾·¤¤¤¿¤³¤È¤ò¤ªÏͤӤ¤¤¿¤·¤Þ¤¹¡£
++.TP 3
++\-locale\ language_country_variant
++\f3½ÅÍ×\fP \- \f2\-locale\fP¥ª¥×¥·¥ç¥ó¤Ï¡¢É¸½à¥É¥Ã¥¯¥ì¥Ã¥È¤¬Ä󶡤¹¤ë¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¡¢¤Þ¤¿¤Ï¤½¤Î¾¤ÎǤ°Õ¤Î¥É¥Ã¥¯¥ì¥Ã¥È¤¬Ä󶡤¹¤ë¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤è¤ê\f2Á°\fP(º¸Â¦)¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤·¤Ê¤¤¤È¡¢¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤¬±Ñ¸ì¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤Î¤ß¡¢»ØÄꤹ¤ë½ç½ø¤Ë°Í¸¤·¤Þ¤¹¡£
++.br
++.br
++Javadoc¤¬¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤¹¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥í¥±¡¼¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î°ú¿ô¤Ï¡¢java.util.Locale¤Î¥É¥­¥å¥á¥ó¥È¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¥í¥±¡¼¥ë¤Î̾Á°¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2en_US\fP (±Ñ¸ì¡¢Êƹñ)¤Þ¤¿¤Ï\f2en_US_WIN\fP (Windows¤Ç»ÈÍѤµ¤ì¤ë±Ñ¸ì)¤Ê¤É¤Ç¤¹¡£
++.br
++.br
++¥í¥±¡¼¥ë¤ò»ØÄꤹ¤ë¤È¡¢»ØÄꤷ¤¿¥í¥±¡¼¥ë¤Î¥ê¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬Javadoc¤Ë¤è¤Ã¤ÆÁªÂò¤µ¤ì¤Æ¡¢¥á¥Ã¥»¡¼¥¸(¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¡¢¥ê¥¹¥È¤Èɽ¤Î¸«½Ð¤·¡¢¥Ø¥ë¥×¡¦¥Õ¥¡¥¤¥ë¤ÎÌܼ¡¡¢stylesheet.css¤Î¥³¥á¥ó¥È¤Ê¤É¤Îʸ»úÎó)¤Î¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ë¥½¡¼¥È¤µ¤ì¤ë¥ê¥¹¥È¤Î¥½¡¼¥È½ç¡¢¤ª¤è¤ÓºÇ½é¤Îʸ¤Î½ª¤ï¤ê¤òȽÃǤ¹¤ë¤¿¤á¤Îʸ¤Î¶èÀÚ¤êʸ»ú¤â¡¢»ØÄꤷ¤¿¥í¥±¡¼¥ë¤Ë¤è¤Ã¤Æ·è¤Þ¤ê¤Þ¤¹¡£¤¿¤À¤·¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ëÆâ¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤Î¥Æ¥­¥¹¥È¤Î¥í¥±¡¼¥ë¤ò·èÄꤹ¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
++.TP 3
++\-encoding\ name
++¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î̾Á°(\f2EUCJIS/SJIS\fP¤Ê¤É)¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥³¥ó¥Ð¡¼¥¿¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
++.br
++.br
++\-docencoding¤ª¤è¤Ó\-charset¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-Jflag
++Javadoc¤ò¼Â¹Ô¤¹¤ë¼Â¹Ô»þ¥·¥¹¥Æ¥àjava¤Ë¡¢\f2flag\fP¤òľÀÜÅϤ·¤Þ¤¹¡£\f2J\fP¤È\f2flag\fP¤Î´Ö¤Ë¶õÇòʸ»ú¤òÆþ¤ì¤Ê¤¤¤è¤¦¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤¿¤È¤¨¤Ð¡¢À¸À®¥É¥­¥å¥á¥ó¥È¤ò½èÍý¤¹¤ë¤¿¤á¤Ë¥·¥¹¥Æ¥à¤Ç32MB¤Î¥á¥â¥ê¡¼¤ò³ÎÊݤ·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ë¾ì¹ç¤Ï¡¢Java¤Î\f2\-Xmx\fP¥ª¥×¥·¥ç¥ó¤ò¼¡¤Î¤è¤¦¤Ë¸Æ¤Ó½Ð¤·¤Þ¤¹(\f2\-Xms\fP¤Ï¾Êά²Äǽ¤Ç¤¹¡£¤³¤ì¤Ï¡¢½é´ü¥á¥â¥ê¡¼¤Î¥µ¥¤¥º¤òÀßÄꤹ¤ë¤Î¤ß¤Î¥ª¥×¥·¥ç¥ó¤Ç¡¢É¬Íפʥá¥â¥ê¡¼¤ÎºÇ¾®Î̤¬¤ï¤«¤Ã¤Æ¤¤¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹)¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-J\-Xmx32m \-J\-Xms32m\fP \f3com.mypackage\fP
++.fl
++.fi
++»ÈÍѤ·¤Æ¤¤¤ëJavadoc¤Î¥Ð¡¼¥¸¥ç¥ó¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ËJava¤Î¡Ö\f2\-version\fP¡×¥ª¥×¥·¥ç¥ó¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-J\-version\fP
++.fl
++ java version "1.2"
++.fl
++ Classic VM (build JDK\-1.2\-V, green threads, sunwjit)
++.fl
++.fi
++(½ÐÎÏ¥¹¥È¥ê¡¼¥à¤Ë¤Ïɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤Î¥Ð¡¼¥¸¥ç¥óÈֹ椬´Þ¤Þ¤ì¤Þ¤¹¡£)
++.RE
++.SS
++ɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤¬Ä󶡤¹¤ë¥ª¥×¥·¥ç¥ó
++.RS 3
++.TP 3
++\-d\ directory
++À¸À®¤µ¤ì¤¿HTML¥Õ¥¡¥¤¥ë¤òÊݸ¤¹¤ëÀ¸À®Àè¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£(¡Öd¡×¤Ï¡ÖÀ¸À®Àè(destination)¡×¤Î°ÕÌ£¡£)¤³¤Î¥ª¥×¥·¥ç¥ó¤ò¾Êά¤¹¤ë¤È¡¢¥Õ¥¡¥¤¥ë¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤µ¤ì¤Þ¤¹¡£ÃÍ\f2directory\fP¤Ë¤Ï¡¢ÀäÂХǥ£¥ì¥¯¥È¥ê¡¢¤Þ¤¿¤Ï¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХǥ£¥ì¥¯¥È¥ê¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥Ð¡¼¥¸¥ç¥ó1.4¤Ç¤Ï¡¢Javadoc¤ò¼Â¹Ô¤¹¤ë¤ÈÀ¸À®Àè¥Ç¥£¥ì¥¯¥È¥ê¤¬¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢¼¡¤ÎÎã¤Ç¤Ï¡¢\f2com.mypackage\fP¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¡¢¤½¤Î·ë²Ì¤¬\f2/home/user/doc/\fP¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-d /home/user/doc com.mypackage\fP
++.fl
++.fi
++.TP 3
++\-use
++¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥¯¥é¥¹¤ª¤è¤Ó¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Ë1¤Ä¤Î»ÈÍÑ¥Ú¡¼¥¸¤òÁȤ߹þ¤ß¤Þ¤¹¡£¤³¤Î¥Ú¡¼¥¸¤Ë¤Ï¡¢¤½¤ÎÆÃÄê¤Î¥¯¥é¥¹¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¤ÎAPI¤ò»ÈÍѤ·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¡¢¥¯¥é¥¹¡¢¥á¥½¥Ã¥É¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¤ª¤è¤Ó¥Õ¥£¡¼¥ë¥É¤¬µ­½Ò¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥¯¥é¥¹C¤òÎã¤Ë¤È¤ë¤È¡¢¥¯¥é¥¹C¤ò»ÈÍѤ·¤Æ¤¤¤ë¤â¤Î¤È¤·¤Æ¤Ï¡¢C¤Î¥µ¥Ö¥¯¥é¥¹¡¢C¤È¤·¤ÆÀë¸À¤µ¤ì¤Æ¤¤¤ë¥Õ¥£¡¼¥ë¥É¡¢C¤òÊÖ¤¹¥á¥½¥Ã¥É¡¢¤ª¤è¤Ó·¿C¤Î¥Ñ¥é¥á¡¼¥¿¤ò»ý¤Ä¥á¥½¥Ã¥É¤È¥³¥ó¥¹¥È¥é¥¯¥¿¤¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢String¤Î»ÈÍÑ¥Ú¡¼¥¸¤Ë²¿¤¬É½¼¨¤µ¤ì¤ë¤«¤ò¸«¤Æ¤ß¤Þ¤·¤ç¤¦¡£\f2java.awt.Font\fP¥¯¥é¥¹¤Î\f2getName()\fP¥á¥½¥Ã¥É¤Ï¡¢\f2String\fP·¿¤ÎÃͤòÊÖ¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2getName()\fP¤Ï\f2String\fP¤ò»ÈÍѤ·¤Æ¤¤¤ë¤Î¤Ç¡¢\f2String\fP¤Î»ÈÍÑ¥Ú¡¼¥¸¤Ë¤³¤Î¥á¥½¥Ã¥É¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++¤¿¤À¤·¡¢¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¤Î¤ÏAPI¤Î»ÈÍѤΤߤǡ¢¼ÂÁõ¤Ï¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤Þ¤»¤ó¡£¤¢¤ë¥á¥½¥Ã¥É¤¬¡¢¤½¤Î¼ÂÁõ¤ÎÃæ¤Ç\f2String\fP¤ò»ÈÍѤ·¤Æ¤¤¤Æ¤â¡¢°ú¿ô¤È¤·¤Æʸ»úÎó¤ò¤È¤Ã¤¿¤ê¡¢Ê¸»úÎó¤òÊÖ¤·¤¿¤ê¤·¤Ê¤¤¾ì¹ç¤Ï¡¢\f2String\fP¤Î¡Ö»ÈÍѡפȤϤߤʤµ¤ì¤Þ¤»¤ó¡£
++.br
++.br
++À¸À®¤µ¤ì¤¿»ÈÍÑ¥Ú¡¼¥¸¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¡¢¤Þ¤ºÌÜŪ¤Î¥¯¥é¥¹¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë°ÜÆ°¤·¡¢¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Î¡Ö»ÈÍѡץê¥ó¥¯¤ò¥¯¥ê¥Ã¥¯¤·¤Þ¤¹¡£
++.TP 3
++\-version
++À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¡¢@version¤Î¥Æ¥­¥¹¥È¤òÁȤ߹þ¤ß¤Þ¤¹¡£¤³¤Î¥Æ¥­¥¹¥È¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¾Êά¤µ¤ì¤Þ¤¹¡£»ÈÍѤ·¤Æ¤¤¤ëJavadoc¥Ä¡¼¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¤ò³Îǧ¤¹¤ë¤Ë¤Ï\f2\-J\-version\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.TP 3
++\-author
++À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¡¢@author¤Î¥Æ¥­¥¹¥È¤òÁȤ߹þ¤ß¤Þ¤¹¡£
++.TP 3
++\-splitindex
++º÷°ú¥Õ¥¡¥¤¥ë¤ò¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤´¤È¤ËÊ£¿ô¤Î¥Õ¥¡¥¤¥ë¤Ëʬ³ä¤·¡¢Ê¸»ú¤´¤È¤Ë1¤Ä¤Î¥Õ¥¡¥¤¥ë¤È¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È°Ê³°¤Îʸ»ú¤Ç»Ï¤Þ¤ëº÷°ú¥¨¥ó¥È¥êÍѤË1¤Ä¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£
++.TP 3
++\-windowtitle\ title
++HTML¤Î<title>¥¿¥°¤ËÇÛÃÖ¤¹¤ë¥¿¥¤¥È¥ë¤ò»ØÄꤷ¤Þ¤¹¡£»ØÄꤷ¤¿¥¿¥¤¥È¥ë¤Ï¡¢¥¦¥£¥ó¥É¥¦¤Î¥¿¥¤¥È¥ë¤ä¡¢¤³¤Î¥Ú¡¼¥¸¤ËÂФ·¤ÆºîÀ®¤µ¤ì¤¿¥Ö¥é¥¦¥¶¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯(¤ªµ¤¤ËÆþ¤ê)¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¤³¤Î¥¿¥¤¥È¥ë¤Ë¤ÏHTML¥¿¥°¤ò´Þ¤á¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¥¿¥¤¥È¥ë¤ËHTML¥¿¥°¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤È¡¢¥Ö¥é¥¦¥¶¤¬¥¿¥°¤òÀµ¤·¤¯²ò¼á¤Ç¤­¤Þ¤»¤ó¡£\f2title\fP¤ÎÃæ¤Ç°úÍÑÉä¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢°úÍÑÉä¤ò¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\-windowtitle¤¬¾Êά¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¤«¤ï¤ê¤Ë\-doctitle¤ÎÃͤò»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-windowtitle "Java SE Platform" com.mypackage\fP
++.fl
++.fi
++.TP 3
++\-doctitle\ title
++³µÍ×¥Õ¥¡¥¤¥ë¤ÎºÇ¾åÉô¤Î¶á¤¯¤ËÇÛÃÖ¤¹¤ë¥¿¥¤¥È¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¥¿¥¤¥È¥ë¤ÏÃæ±û·¤¨¤Ë¤Ê¤ê¡¢¥ì¥Ù¥ë1¤Î¸«½Ð¤·¤È¤·¤Æ¡¢¾åÉô¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Î¤¹¤°²¼¤ËÃÖ¤«¤ì¤Þ¤¹¡£\f2title\fP¤Ë¤Ï¡¢HTML¥¿¥°¤È¶õÇò¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢¤³¤ì¤é¤ò´Þ¤á¤ë¾ì¹ç¤Ï¡¢Á´ÂΤò°úÍÑÉä¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2title\fP¤ÎÃæ¤Ç°úÍÑÉä¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢°úÍÑÉä¤ò¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-doctitle "Java(TM)" com.mypackage\fP
++.fl
++.fi
++.TP 3
++\-title\ title
++\f3¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¸½ºß¤Ï¸ºß¤·¤Æ¤¤¤Þ¤»¤ó¡£\fPJavadoc 1.2¤Î¥Ù¡¼¥¿ÈǤˤ·¤«Â¸ºß¤·¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2\-doctitle\fP¤È¤¤¤¦Ì¾Á°¤ËÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£Ì¾Á°¤òÊѹ¹¤·¤¿Íýͳ¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤¬¡¢¥¦¥£¥ó¥É¥¦¤Î¥¿¥¤¥È¥ë¤Ç¤Ï¤Ê¤¯¥É¥­¥å¥á¥ó¥È¤Î¥¿¥¤¥È¥ë¤òÄêµÁ¤¹¤ë¤³¤È¤òÌÀ³Î¤Ë¤¹¤ë¤¿¤á¤Ç¤¹¡£
++.TP 3
++\-header\ header
++³Æ½ÐÎÏ¥Õ¥¡¥¤¥ë¤ÎºÇ¾åÉô¤ËÇÛÃÖ¤¹¤ë¥Ø¥Ã¥À¡¼¡¦¥Æ¥­¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤Ï¡¢¾åÉô¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Î±¦Â¦¤ËÇÛÃÖ¤µ¤ì¤Þ¤¹¡£\f2header\fP¤Ë¤Ï¡¢HTML¥¿¥°¤È¶õÇò¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢¤³¤ì¤é¤ò´Þ¤á¤ë¾ì¹ç¤Ï¡¢Á´ÂΤò°úÍÑÉä¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2header\fP¤ÎÃæ¤Ç°úÍÑÉä¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢°úÍÑÉä¤ò¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-header "<b>Java 2 Platform </b><br>v1.4" com.mypackage\fP
++.fl
++.fi
++.TP 3
++\-footer\ footer
++³Æ½ÐÎÏ¥Õ¥¡¥¤¥ë¤ÎºÇ²¼Éô¤ËÇÛÃÖ¤¹¤ë¥Õ¥Ã¥¿¡¼¡¦¥Æ¥­¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£¥Õ¥Ã¥¿¡¼¤Ï¡¢²¼Éô¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Î±¦Â¦¤ËÇÛÃÖ¤µ¤ì¤Þ¤¹¡£\f2footer\fP¤Ë¤Ï¡¢HTML¥¿¥°¤È¶õÇò¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢¤³¤ì¤é¤ò´Þ¤á¤ë¾ì¹ç¤Ï¡¢Á´ÂΤò°úÍÑÉä¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2footer\fP¤ÎÃæ¤Ç°úÍÑÉä¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢°úÍÑÉä¤ò¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-top
++³Æ½ÐÎÏ¥Õ¥¡¥¤¥ë¤ÎºÇ¾åÉô¤ËÇÛÃÖ¤¹¤ë¥Æ¥­¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-bottom\ text
++³Æ½ÐÎÏ¥Õ¥¡¥¤¥ë¤ÎºÇ²¼Éô¤ËÇÛÃÖ¤¹¤ë¥Æ¥­¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥Æ¥­¥¹¥È¤Ï¡¢²¼Éô¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤è¤ê²¼¤Î¡¢¥Ú¡¼¥¸¤ÎºÇ²¼Éô¤ËÇÛÃÖ¤µ¤ì¤Þ¤¹¡£\f2text\fP¤Ë¤Ï¡¢HTML¥¿¥°¤È¶õÇò¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢¤³¤ì¤é¤ò´Þ¤á¤ë¾ì¹ç¤Ï¡¢Á´ÂΤò°úÍÑÉä¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2text\fP¤ÎÃæ¤Ç°úÍÑÉä¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢°úÍÑÉä¤ò¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-link\ extdocURL
++´û¸¤ÎJavadoc¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿³°Éô»²¾È¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥È¤Ø¤Î¥ê¥ó¥¯¤òºîÀ®¤·¤Þ¤¹¡£°ú¿ô¤ò1¤Ä¤È¤ê¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f4extdocURL\fP¤Ï¡¢¥ê¥ó¥¯Àè¤È¤·¤Æ»ØÄꤹ¤ë¡¢Javadoc¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿³°Éô¥É¥­¥å¥á¥ó¥È¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ÎÀäÂÐURL¤Þ¤¿¤ÏÁêÂÐURL¤Ç¤¹¡£¸å¤ÇÎã¤ò¼¨¤·¤Þ¤¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ëpackage\-list¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹(¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¡¢\f2\-linkoffline\fP¤ò»ÈÍѤ·¤Þ¤¹)¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢\f2package\-list\fP¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÆɤ߼è¤Ã¤¿¸å¡¢¤½¤ÎURL¤Ç¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¥ê¥ó¥¯¤·¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Î¼Â¹Ô»þ¤Ë¡¢\f2extdocURL\fP¤ÎÃͤ¬¤½¤Î¤Þ¤Þ¡¢ºîÀ®¤µ¤ì¤¿\f2<A HREF>\fP¥ê¥ó¥¯Æâ¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2extdocURL\fP¤Ï¥Õ¥¡¥¤¥ë¤Ø¤ÎURL¤Ç¤Ï¤Ê¤¯¡¢\f2¥Ç¥£¥ì¥¯¥È¥ê\fP¤Ø¤ÎURL¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++\f2extdocURL\fP¤ËÀäÂÐ¥ê¥ó¥¯¤ò»ÈÍѤ¹¤ë¤È¡¢¥æ¡¼¥¶¡¼¤Î¥É¥­¥å¥á¥ó¥È¤òǤ°Õ¤ÎWeb¥µ¥¤¥È¾å¤Î¥É¥­¥å¥á¥ó¥È¤Ë¥ê¥ó¥¯¤Ç¤­¤Þ¤¹¡£ÁêÂаÌÃ֤إê¥ó¥¯¤¹¤ë¤Î¤ß¤Î¾ì¹ç¤ÏÁêÂÐ¥ê¥ó¥¯¤ò»ÈÍѤǤ­¤Þ¤¹¡£ÁêÂÐ¥ê¥ó¥¯¤Î¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤¬ÅϤ¹Ãͤϡ¢À¸À®Àè¥Ç¥£¥ì¥¯¥È¥ê(\f2\-d\fP¤Ç»ØÄê)¤«¤é¥ê¥ó¥¯Àè¤È¤Ê¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÁêÂХѥ¹¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++Ä̾ÀäÂÐ¥ê¥ó¥¯¤ò»ØÄꤹ¤ë¾ì¹ç¤Ï¡¢\f2http:\fP¥ê¥ó¥¯¤ò»ÈÍѤ·¤Þ¤¹¡£Web¥µ¡¼¥Ð¡¼¤ò»ý¤¿¤Ê¤¤¥Õ¥¡¥¤¥ë¡¦¥·¥¹¥Æ¥à¤Ë¥ê¥ó¥¯¤¹¤ë¾ì¹ç¤Ï¡¢\f2file:\fP¥ê¥ó¥¯¤ò»ÈÍѤǤ­¤Þ¤¹¡£¤¿¤À¤·¡¢¤³¤ÎÊýË¡¤Ï¡¢Æ±¤¸¥Õ¥¡¥¤¥ë¡¦¥·¥¹¥Æ¥à¤ò¶¦Í­¤¹¤ëÀ¸À®¥É¥­¥å¥á¥ó¥È¤Ë¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¡¼¤¬¥¢¥¯¥»¥¹¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç°Ê³°¤Ï»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
++.br
++.br
++¤¹¤Ù¤Æ¤Î¾ì¹ç¡¢¤¹¤Ù¤Æ¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¤Ç¡¢ÀäÂÐURL¤ÈÁêÂÐURL¡¢¡Öhttp:¡×¥Ù¡¼¥¹¤È¡Öfile:¡×¥Ù¡¼¥¹¤Ë¤«¤«¤ï¤é¤º¡¢¥¹¥é¥Ã¥·¥å¤ò¶èÀÚ¤êʸ»ú¤È¤·¤Æ»ÈÍѤ·¤Þ¤¹(
++.na
++\f2URL¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://www.ietf.org/rfc/rfc1738.txt¤Ç»ØÄê)¡£
++.RS 3
++.TP 3
++http: ¥Ù¡¼¥¹¤ÎÀäÂÐ¥ê¥ó¥¯:
++\f2\-link http://<host>/<directory>/<directory>/.../<name>\fP
++.TP 3
++file: ¥Ù¡¼¥¹¤ÎÀäÂÐ¥ê¥ó¥¯:
++\f2\-link file://<host>/<directory>/<directory>/.../<name>\fP
++.TP 3
++ÁêÂÐ¥ê¥ó¥¯:
++\f2\-link <directory>/<directory>/.../<name>\fP
++.RE
++.RE
++1²ó¤ÎJavadoc¤Î¼Â¹Ô¤Ç¡¢Ê£¿ô¤Î\f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤ÆÊ£¿ô¤Î¥É¥­¥å¥á¥ó¥È¤Ø¤Î¥ê¥ó¥¯¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
++.br
++.br
++\f3\-linkoffline¤Þ¤¿¤Ï\-link¤ÎÁªÂò\fP:
++.br
++.br
++\f2\-link\fP¤ò»ÈÍѤ¹¤ë¾ì¹ç:
++.RS 3
++.TP 2
++o
++³°ÉôAPI¥É¥­¥å¥á¥ó¥È¤Ø¤ÎÁêÂХѥ¹¤ò»ÈÍѤ¹¤ë¾ì¹ç
++.TP 2
++o
++³°ÉôAPI¥É¥­¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐURL¤ò»ÈÍѤ¹¤ë¾ì¹ç(¥×¥í¥°¥é¥à¤¬¤½¤ÎURL¤ËÀܳ¤·¡¢Æɼè¤ê¤ò¹Ô¤¦¤³¤È¤¬¥·¥§¥ë¤Ë¤è¤Ã¤Æµö²Ä¤µ¤ì¤Æ¤¤¤ë¾ì¹ç)
++.RE
++\f2\-linkoffline\fP¤ò»ÈÍѤ¹¤ë¾ì¹ç:
++.RS 3
++.TP 2
++o
++³°ÉôAPI¥É¥­¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐURL¤ò»ÈÍѤ¹¤ë¾ì¹ç(¥×¥í¥°¥é¥à¤¬¤½¤ÎURL¤ËÀܳ¤·¡¢Æɼè¤ê¤ò¹Ô¤¦¤³¤È¤¬¥·¥§¥ë¤Ë¤è¤Ã¤Æ\f2µö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤\fP¾ì¹ç)¤³¤Î¤è¤¦¤Ê¾õ¶·¤Ï¡¢¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ÎÆ⦤«¤é¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Î³°Â¦¤Ë¤¢¤ë¥É¥­¥å¥á¥ó¥È¤Ë¥ê¥ó¥¯¤·¤è¤¦¤È¤¹¤ë¾ì¹ç¤ËȯÀ¸¤·¤Þ¤¹¡£
++.RE
++.br
++.br
++\f3³°Éô¥É¥­¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \-
++.na
++\f2http://docs.oracle.com/javase/7/docs/api/\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/Æâ¤Î\f2java.lang\fP¡¢\f2java.io\fP¡¢¤½¤Î¾¤ÎJava¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¡¦¥Ñ¥Ã¥±¡¼¥¸¤Ë¥ê¥ó¥¯¤·¤¿¤¤¤È¤·¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¡¦¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯»ý¤Ä\f2com.mypackage\fP¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¡¦¥Ä¥ê¡¼Æâ¤Î\f2Object\fP¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£(\f2\-sourcepath\fP¤ä\f2\-d\fP¤Ê¤É¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£)
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-link http://docs.oracle.com/javase/7/docs/api/ com.mypackage\fP
++.fl
++.fi
++\f3³°Éô¥É¥­¥å¥á¥ó¥È¤Ø¤ÎÁêÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- 2¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¡¢¤½¤Î¥É¥­¥å¥á¥ó¥È¤¬Javadoc¥Ä¡¼¥ë¤òÊ£¿ô²ó¼Â¹Ô¤·¤¿·ë²ÌÀ¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¤È¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢¤³¤ì¤é¤Î¥É¥­¥å¥á¥ó¥È¤¬ÁêÂХѥ¹¤Çʬ³ä¤µ¤ì¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£¤³¤ÎÎã¤Î¾ì¹ç¡¢¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢API¤Ç¤¢¤ë\f2com.apipackage\fP¤È¡¢SPI(¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹)¤Ç¤¢¤ë\f2com.spipackage\fP¤Ç¤¹¡£¥É¥­¥å¥á¥ó¥È¤Î³ÊǼÀè¤Ï¡¢\f2docs/api/com/apipackage\fP¤È\f2docs/spi/com/spipackage\fP¤Ç¤¹¡£API¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥­¥å¥á¥ó¥È¤Ï¤¹¤Ç¤ËÀ¸À®¤µ¤ì¤Æ¤¤¤Æ¡¢\f2docs\fP¤¬¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¢¤ë¾ì¹ç¡¢API¥É¥­¥å¥á¥ó¥È¤Ø¤Î¥ê¥ó¥¯¤ò»ý¤ÄSPI¥Ñ¥Ã¥±¡¼¥¸¤ò¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-d ./spi \-link ../api com.spipackage\fP
++.fl
++.fi
++\f2\-link\fP¤Î°ú¿ô¤Ï¡¢°¸Àè¥Ç¥£¥ì¥¯¥È¥ê(\f2docs/spi\fP)¤«¤é¤ÎÁêÂХѥ¹¤Ç¤¹¡£
++.br
++.br
++\f3¾ÜºÙ\fP \- \f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¥³¡¼¥É¤«¤é¤Ï»²¾È¤µ¤ì¤Æ¤¤¤Æ¤â¡¢º£²ó¤ÎJavadoc¤Î¼Â¹Ô¤Ç¤Ï¥É¥­¥å¥á¥ó¥È²½\f2¤µ¤ì¤Ê¤¤\fP¤È¤¤¤¦¥¯¥é¥¹¤Ë¥ê¥ó¥¯¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¥ê¥ó¥¯¤«¤éÍ­¸ú¤Ê¥Ú¡¼¥¸¤Ë°ÜÆ°¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢¤½¤ì¤é¤ÎHTML¥Ú¡¼¥¸¤¬¤¢¤ë¾ì½ê¤òÄ´¤Ù¡¢¤½¤Î¾ì½ê¤ò\f2extdocURL\fP¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¤¿¤È¤¨¤Ð¡¢¥µ¡¼¥É¡¦¥Ñ¡¼¥Æ¥£¤Î¥É¥­¥å¥á¥ó¥È¤«¤é\f2http://docs.oracle.com\fP¾å¤Î\f2java.*\fP¤Î¥É¥­¥å¥á¥ó¥È¤Ë¥ê¥ó¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.br
++.br
++º£²ó¤Î¼Â¹Ô¤ÇJavadoc¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤ë¥É¥­¥å¥á¥ó¥ÈÆâ¤ÎAPI¤Î¤ß¤òÂоݤ˥ê¥ó¥¯¤òºîÀ®¤¹¤ë¾ì¹ç¤Ï¡¢\f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò¾Êά¤·¤Þ¤¹¡£(\f2\-link\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢³°Éô»²¾È¤Î¥É¥­¥å¥á¥ó¥È¤Ø¤Î¥ê¥ó¥¯¤òºîÀ®¤·¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢¤½¤Î¥É¥­¥å¥á¥ó¥È¤¬Â¸ºß¤¹¤ë¤«¤É¤¦¤«¡¢¤ª¤è¤Ó¸ºß¤¹¤ë¾ì¹ç¤Ï¤½¤Î¾ì½ê¤¬¤ï¤«¤é¤Ê¤¤¤«¤é¤Ç¤¹¡£)
++.br
++.br
++¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢À¸À®¥É¥­¥å¥á¥ó¥ÈÆâ¤ÎÊ£¿ô¤Î¾ì½ê¤Ë¥ê¥ó¥¯¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
++.br
++.br
++¤â¤¦1¤Ä¤ÎÍÑÅӤϡ¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥»¥Ã¥È¤Î´Ö¤Ë¥¯¥í¥¹¥ê¥ó¥¯¤òºîÀ®¤¹¤ë¤³¤È¤Ç¤¹¡£°ìÊý¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥»¥Ã¥È¤ËÂФ·¤ÆJavadoc¤ò¼Â¹Ô¤·¤¿¸å¡¢Â¾Êý¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥»¥Ã¥È¤ËÂФ·¤ÆJavadoc¤òºÆÅټ¹Ԥ¹¤ë¤È¡¢Î¾¥»¥Ã¥È´Ö¤ËÁÐÊý¸þ¤Î¥ê¥ó¥¯¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
++.br
++.br
++\f3¥¯¥é¥¹¤Î»²¾ÈÊýË¡\fP \- ³°Éô»²¾È¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤ò¡¢¥Æ¥­¥¹¥È¡¦¥é¥Ù¥ë¤Î¤ß¤Ç¤Ï¤Ê¤¯¼ÂºÝ¤Ëɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¼¡¤ÎÊýË¡¤Ç¥¯¥é¥¹¤ò»²¾È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥á¥½¥Ã¥É¤ÎËÜÂΤǥ¯¥é¥¹¤ò»²¾È¤¹¤ë¤Î¤ß¤Ç¤Ï½½Ê¬¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\f2import\fPʸ¡¢Àë¸À¤Î¤¤¤º¤ì¤«¤Ç»²¾È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤Ë¡¢¥¯¥é¥¹\f2java.io.File\fP¤ò»²¾È¤¹¤ëÊýË¡¤ÎÎã¤ò¼¨¤·¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++¤¹¤Ù¤Æ¤Î¥¿¥¤¥×¤Î\f2import\fPʸ¤Î¾ì¹ç: ¥ï¥¤¥ë¥É¥«¡¼¥É¤Ë¤è¤ë¥¤¥ó¥Ý¡¼¥È¡¢Ì¾Á°¤Ë¤è¤ëÌÀ¼¨Åª¤Ê¥¤¥ó¥Ý¡¼¥È¡¢¤Þ¤¿¤Ï\f2java.lang.*\fP¤ËÂФ¹¤ë¼«Æ°¥¤¥ó¥Ý¡¼¥È¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤¹¤ì¤Ð½½Ê¬¤Ç¤¹¡£
++.br
++\f2import java.io.*;\fP
++.br
++1.3.x¤ª¤è¤Ó1.2.x¤Ç¤Ï¡¢Ì¾Á°¤Ë¤è¤ëÌÀ¼¨Åª¤Ê¥¤¥ó¥Ý¡¼¥È¤Î¤ßµ¡Ç½¤·¤Þ¤¹¡£¥ï¥¤¥ë¥É¥«¡¼¥É¤Ë¤è¤ë¥¤¥ó¥Ý¡¼¥Èʸ¤â¡¢\f2java.lang.*\fP¤Î¼«Æ°¥¤¥ó¥Ý¡¼¥È¤âµ¡Ç½¤·¤Þ¤»¤ó¡£
++.TP 2
++o
++Àë¸À¤Î¾ì¹ç:
++.br
++\f2void foo(File f){}\fP
++.br
++¤³¤Î»²¾È¤ò»ÈÍѤ·¡¢¥á¥½¥Ã¥É¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥Õ¥£¡¼¥ë¥É¡¢¥¯¥é¥¹¡¢¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎÌá¤êÃͤη¿¤Þ¤¿¤Ï¥Ñ¥é¥á¡¼¥¿¤Î·¿¤ËÃÖ¤¯¤«¡¢\f2implements\fP¡¢\f2extends\fP¡¢¤Þ¤¿¤Ï\f2throws\fPʸ¤ËÃÖ¤­¤Þ¤¹¡£
++.RE
++½ÅÍפʷë²Ì¤È¤·¤Æ¡¢\f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤â¡¢¤³¤ÎÀ©¸Â¤Î¤¿¤á¤Ë¸í¤Ã¤Æɽ¼¨¤µ¤ì¤Ê¤¤¥ê¥ó¥¯¤¬Â¿¿ôȯÀ¸¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£(¥Æ¥­¥¹¥È¤Ï¥Ï¥¤¥Ñ¡¼¥Æ¥­¥¹¥È¡¦¥ê¥ó¥¯¤¬ÉÕ¤±¤é¤ì¤º¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£)¥ê¥ó¥¯¤¬É½¼¨¤¹¤ë·Ù¹ð¤«¤é¡¢¤³¤ì¤é¤Î¥ê¥ó¥¯¤òǧ¼±¤Ç¤­¤Þ¤¹¡£¥¯¥é¥¹¤òÀµ¤·¤¯»²¾È¤·¡¢¤½¤ì¤Ë¤è¤Ã¤Æ¥ê¥ó¥¯¤òÄɲ乤뤿¤á¤ÎºÇ¤â°ÂÁ´¤ÊÊýË¡¤ÏÁ°½Ò¤·¤¿¤È¤ª¤ê¡¢¤½¤Î¥¯¥é¥¹¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤³¤È¤Ç¤¹¡£
++.br
++.br
++\f3¥Ñ¥Ã¥±¡¼¥¸¡¦¥ê¥¹¥È\fP \- \f2\-link\fP¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤ë\f2package\-list\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤¬¡¢\f2\-link\fP¤Ë»ØÄꤷ¤¿URL¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤¬É¬ÍפǤ¹¡£\f2package\-list\fP¥Õ¥¡¥¤¥ë¤Ï¡¢¤½¤Î¾ì½ê¤Ë¤¢¤ë¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î̾Á°¤Î¥ê¥¹¥È¤¬Æþ¤Ã¤¿Ã±½ã¤Ê¥Æ¥­¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ç¤¹¡£Á°¤ÎÎã¤Ç¤Ï¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿URL¤Ç\f2package\-list\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤òõ¤·¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÆɤ߹þ¤ó¤À¸å¡¢¤½¤ÎURL¤Ë¤¢¤ë¤½¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤òºîÀ®¤·¤Þ¤·¤¿¡£
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢Java SE 6 API¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥ê¥¹¥È¤Ï
++.na
++\f2http://docs.oracle.com/javase/7/docs/api/package\-list\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/package\-list¤Ë¤¢¤ê¡¢¼¡¤Î¤è¤¦¤ÊÆâÍƤǻϤޤäƤ¤¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ java.applet
++.fl
++ java.awt
++.fl
++ java.awt.color
++.fl
++ java.awt.datatransfer
++.fl
++ java.awt.dnd
++.fl
++ java.awt.event
++.fl
++ java.awt.font
++.fl
++ etc.
++.fl
++\fP
++.fi
++\f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤻ¤º¤ËJavadoc¤ò¼Â¹Ô¤·¤¿¾ì¹ç¡¢Javadoc¤Ï³°Éô»²¾È¥¯¥é¥¹¤Ë°¤¹¤ë̾Á°¤ò¸«¤Ä¤±¤ë¤È¡¢¤½¤Î̾Á°¤ò¥ê¥ó¥¯¤Ê¤·¤Ç½ÐÎϤ·¤Þ¤¹¡£°ìÊý¡¢\f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿\f2extdocURL\fP¤Î¾ì½ê¤Ë¤¢¤ë\f2package\-list\fP¥Õ¥¡¥¤¥ë¤Ç¤½¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò¸¡º÷¤·¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬¸«¤Ä¤«¤ë¤È¡¢\f2extdocURL\fP¤¬Ì¾Á°¤ÎÁ°¤ËÉղ䵤ì¤Þ¤¹¡£
++.br
++.br
++¤¹¤Ù¤Æ¤Î¥ê¥ó¥¯¤¬Àµ¤·¤¯µ¡Ç½¤¹¤ë¤¿¤á¤Ë¤Ï¡¢³°Éô»²¾È¤Î¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤¬¡¢»ØÄꤷ¤¿URL¤Ë¸ºß¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿package\-list¤¬Â¸ºß¤¹¤ë¤«¤É¤¦¤«¤Î¤ß¤ò¥Á¥§¥Ã¥¯¤·¡¢¤³¤ì¤é¤Î¥Ú¡¼¥¸¤¬Â¸ºß¤¹¤ë¤«¤É¤¦¤«¤Ï¥Á¥§¥Ã¥¯¤·¤Þ¤»¤ó¡£
++.br
++.br
++\f3Ê£¿ô¤Î¥ê¥ó¥¯\fP \- Ê£¿ô¤Î\f2\-link\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢Ç¤°Õ¤Î¿ô¤Î³°ÉôÀ¸À®¥É¥­¥å¥á¥ó¥È¤Ø¤Î¥ê¥ó¥¯¤òºîÀ®¤Ç¤­¤Þ¤¹¡£\ Javadoc 1.2¤Ë¤Ï¡¢Ê£¿ô¤Î\f2\-link\fP¥³¥Þ¥ó¥É¤ò»ØÄê¤Ç¤­¤Ê¤¤¤È¤¤¤¦´ûÃΤΥХ°¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï1.2.2¤Ç½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
++.br
++.br
++¥ê¥ó¥¯¤¹¤ë³°Éô¥É¥­¥å¥á¥ó¥È¤´¤È¤Ë¡¢¼¡¤Î¤è¤¦¤ËÊÌ¡¹¤Î¥ê¥ó¥¯¡¦¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
++.br
++.br
++\ \ \f2% \fP\f4javadoc \-link\fP \f2extdocURL1\fP \f4\-link\fP \f2extdocURL2\fP \f2... \fP\f4\-link\fP \f2extdocURLn\fP \f4com.mypackage\fP
++.br
++.br
++\f2extdocURL1\fP¡¢\ \f2extdocURL2\fP¡¢\ ... \f2extdocURLn\fP¤Ï¡¢¤½¤ì¤¾¤ì³°Éô¥É¥­¥å¥á¥ó¥È¤Î¥ë¡¼¥È¤ò»Ø¤·¡¢³Æ¥ë¡¼¥È¤Ë¤Ï¡¢\f2package\-list\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£
++.br
++.br
++\f3¥¯¥í¥¹¥ê¥ó¥¯\fP \- ¤Þ¤ÀÀ¸À®¤µ¤ì¤Æ¤¤¤Ê¤¤2¤Ä°Ê¾å¤Î¥É¥­¥å¥á¥ó¥È¤ò¥¯¥í¥¹¥ê¥ó¥¯¤¹¤ë¾ì¹ç¤Ï¡¢¡Ö¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡×¤¬É¬Íפˤʤê¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¤É¤Î¥É¥­¥å¥á¥ó¥È¤Ë¤Ä¤¤¤Æ¤â\f2package\-list\fP¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇ½é¤Î¥É¥­¥å¥á¥ó¥È¤ËÂФ·¤ÆJavadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë»þÅÀ¤Ç¡¢2ÈÖÌܤΥɥ­¥å¥á¥ó¥È¤Î\f2package\-list\fP¤Ï¤Þ¤À¸ºß¤·¤Æ¤¤¤Þ¤»¤ó¡£¤·¤¿¤¬¤Ã¤Æ¡¢³°Éô¥ê¥ó¥¯¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢2ÈÖÌܤΥɥ­¥å¥á¥ó¥È¤òÀ¸À®¤·¤¿¸å¤Ç¡¢ºÇ½é¤Î¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤·Ä¾¤¹É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++¤³¤Î¾ì¹ç¡¢ºÇ½é¤Î¥É¥­¥å¥á¥ó¥ÈÀ¸À®¤ÎÌÜŪ¤Ï¡¢\f2package\-list\fP¤òºîÀ®¤¹¤ë¤³¤È¤Ç¤¹(¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÇÄ°®¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¼êÆ°¤ÇºîÀ®¤·¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó)¡£¼¡¤Ë¡¢2ÈÖÌܤΥɥ­¥å¥á¥ó¥È¤È¤½¤Î³°Éô¥ê¥ó¥¯¤òÀ¸À®¤·¤Þ¤¹¡£É¬Íפʳ°Éô¤Î\f2package\-list\fP¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¡¢Javadoc¥Ä¡¼¥ë¤«¤é·Ù¹ð¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-linkoffline\ extdocURL\ packagelistLoc
++¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï\f2\-link\fP¤Î¥Ð¥ê¥¨¡¼¥·¥ç¥ó¤Î1¤Ä¤Ç¤¹¡£¤É¤Á¤é¤â¡¢Javadoc¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿³°Éô»²¾È¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥È¤Ø¤Î¥ê¥ó¥¯¤òºîÀ®¤·¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¼«ÂΤ¬¡Ö¥ª¥Õ¥é¥¤¥ó¡×¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¤­(WebÀܳ¤ò»ÈÍѤ·¤Æ¥É¥­¥å¥á¥ó¥È¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¤È¤­)¡¢Web¾å¤Î¥É¥­¥å¥á¥ó¥È¤Ë¥ê¥ó¥¯¤¹¤ë¤Ë¤Ï¡¢\f2\-linkoffline\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.br
++.br
++¸·Ì©¤Ë¤Ï¡¢³°Éô¥É¥­¥å¥á¥ó¥È¤Î\f2package\-list\fP¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¤È¤­¡¢¤Þ¤¿¤Ï¤³¤Î¥Õ¥¡¥¤¥ë¤¬\f2extdocURL\fP¤Ç»ØÄꤵ¤ì¤¿¾ì½ê¤Ë¤Ï¸ºß¤»¤º¡¢\f2packageListLoc\fP¤Ç»ØÄê¤Ç¤­¤ëÊ̤ξì½ê(Ä̾ï¥í¡¼¥«¥ë)¤Ë¸ºß¤¹¤ë¤È¤­¡¢\f2\-linkoffline\fP¤ò»ÈÍѤ·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2extdocURL\fP¤ËWWW¾å¤Ç¤·¤«¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢\f2\-linkoffline\fP¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤ê¡¢¥É¥­¥å¥á¥ó¥È¤ÎÀ¸À®»þ¤ËJavadoc¥Ä¡¼¥ë¤¬Web¤ËÀܳ¤Ç¤­¤ëɬÍפ¬¤¢¤ë¤È¤¤¤¦À©Ì󤬤ʤ¯¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++¤â¤¦1¤Ä¤ÎÍÑÅӤϡ¢¥É¥­¥å¥á¥ó¥È¤ò¹¹¿·¤¹¤ë¤¿¤á¤Î¡Ö¥Ï¥Ã¥­¥ó¥°¡×¤È¤·¤Æ»ÈÍѤ¹¤ë¤³¤È¤Ç¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¤Î¥»¥Ã¥ÈÁ´ÂΤËÂФ·¤ÆJavadoc¤ò¼Â¹Ô¤·¤¿¸å¡¢Êѹ¹¤·¤¿°ìÉô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¤Æ¤Î¤ßJavadoc¤òºÆÅټ¹Ԥ·¤Æ¡¢¹¹¿·¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¡¢¥ª¥ê¥¸¥Ê¥ë¤Î¥»¥Ã¥È¤ËÁÞÆþ¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£¸å¤ÇÎã¤ò¼¨¤·¤Þ¤¹¡£
++.br
++.br
++\f2\-linkoffline\fP¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤ò2¤Ä¼è¤ê¤Þ¤¹¡£Âè1°ú¿ô¤Ï\f2<a href>\fP¥ê¥ó¥¯¤ËÁȤ߹þ¤Þ¤ì¤ëʸ»úÎó¤ò»ØÄꤹ¤ë°ú¿ô¡¢Âè2°ú¿ô¤Ï\f2package\-list\fP¤Î¸¡º÷¾ì½ê¤ò»ØÄꤹ¤ë°ú¿ô¤Ç¤¹¡£
++.RS 3
++.TP 2
++o
++\f4extdocURL\fP¤Ï¡¢¥ê¥ó¥¯Àè¤È¤·¤Æ»ØÄꤹ¤ë¡¢Javadoc¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿³°Éô¥É¥­¥å¥á¥ó¥È¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ÎÀäÂÐURL¤Þ¤¿¤ÏÁêÂÐURL¤Ç¤¹¡£ÁêÂÐURL¤Î¾ì¹ç¡¢Ãͤϡ¢À¸À®Àè¥Ç¥£¥ì¥¯¥È¥ê(\f2\-d\fP¤Ç»ØÄê)¤«¤é¥ê¥ó¥¯Àè¤È¤Ê¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥ë¡¼¥È¤Ø¤ÎÁêÂХѥ¹¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢\f2\-link\fP¥ª¥×¥·¥ç¥ó¤Î\f2extdocURL\fP¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 2
++o
++\f4packagelistLoc\fP¤Ï¡¢³°Éô¥É¥­¥å¥á¥ó¥È¤Î\f2package\-list\fP¥Õ¥¡¥¤¥ë¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥Ñ¥¹¤Þ¤¿¤ÏURL¤Ç¤¹¡£¤³¤ì¤Ï¡¢URL (http:¤Þ¤¿¤Ïfile:)¤Ç¤â¥Õ¥¡¥¤¥ë¡¦¥Ñ¥¹¤Ç¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£¤Þ¤¿¡¢ÀäÂХѥ¹¤ÈÁêÂХѥ¹¤Î¤É¤Á¤é¤Ç¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£ÁêÂХѥ¹¤Î¾ì¹ç¤Ï¡¢javadoc¤¬¼Â¹Ô¤µ¤ì¤ë\f2¸½ºß¤Î\fP¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ»ØÄꤷ¤Þ¤¹¡£¥Õ¥¡¥¤¥ë̾¤Î\f2package\-list\fP¤Ï´Þ¤á¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
++.RE
++1²ó¤ÎJavadoc¤Î¼Â¹Ô¤Ç¡¢Ê£¿ô¤Î\f2\-linkoffline\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£(1.2.2¤è¤êÁ°¤Ï¡¢1¤Ä¤Î¥ª¥×¥·¥ç¥ó¤·¤«»ØÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£)
++.br
++.br
++\f3³°Éô¥É¥­¥å¥á¥ó¥È¤Ø¤ÎÀäÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- \f2http://docs.oracle.com/javase/7/docs/api/\fPÆâ¤Î\f2java.lang\fP¡¢\f2java.io\fP¡¢¤½¤Î¾¤ÎJava SE¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¡¦¥Ñ¥Ã¥±¡¼¥¸¤Ë¥ê¥ó¥¯¤·¤¿¤¤¤¬¡¢Web¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¤È¤·¤Þ¤¹¡£¥Ö¥é¥¦¥¶¤Ç¡¢
++.na
++\f2http://docs.oracle.com/javase/7/docs/api/package\-list\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/package\-list¤Ë¤¢¤ë\f2package\-list\fP¥Õ¥¡¥¤¥ë¤ò³«¤­¡¢¤½¤ì¤ò¥í¡¼¥«¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤·¡¢Âè2°ú¿ô\f2packagelistLoc\fP¤Ç¤³¤Î¥í¡¼¥«¥ë¡¦¥³¥Ô¡¼¤Î¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥ê¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Ï¥«¥ì¥ó¥È¡¦¥Ç¥£¥ì¥¯¥È¥ê¡Ö\f2.\fP¡×¤ËÊݸ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢Java SE¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¡¦¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥ê¥ó¥¯»ý¤Ä\f2com.mypackage\fP¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¥É¥­¥å¥á¥ó¥È¤Ë¤Ï¡¢¤¿¤È¤¨¤Ð¥¯¥é¥¹¡¦¥Ä¥ê¡¼Æâ¤Î\f2Object\fP¥¯¥é¥¹¤Ø¤Î¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£(\f2\-sourcepath\fP¤Ê¤É¡¢Â¾¤ÎɬÍפʥª¥×¥·¥ç¥ó¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£)
++.nf
++\f3
++.fl
++% \fP\f3javadoc \-linkoffline http://docs.oracle.com/javase/7/docs/api/ . com.mypackage\fP
++.fl
++.fi
++\f3³°Éô¥É¥­¥å¥á¥ó¥È¤Ø¤ÎÁêÂÐ¥ê¥ó¥¯¤Î»ÈÍÑÎã\fP \- \f2\-linkoffline\fP¤òÁêÂХѥ¹¤È¤È¤â¤Ë»ÈÍѤ¹¤ë¤³¤È¤Ï¤¢¤Þ¤ê¤¢¤ê¤Þ¤»¤ó¡£Íýͳ¤Ïñ½ã¤Ç¡¢Ä̾ï¤Ï\f2\-link\fP¤Ç´Ö¤Ë¹ç¤¦¤«¤é¤Ç¤¹¡£\f2\-linkoffline\fP¤ò»ÈÍѤ¹¤ëºÝ¡¢\f2package\-list\fP¤Ë¤ÏÄ̾ï¥í¡¼¥«¥ë¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ÁêÂÐ¥ê¥ó¥¯¤ò»ÈÍѤ¹¤ëºÝ¤â¡¢¥ê¥ó¥¯Àè¤Î¥Õ¥¡¥¤¥ë¤Ë¤ÏÄ̾ï¥í¡¼¥«¥ë¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2\-linkoffline\fP¤Î2¤Ä¤Î°ú¿ô¤ËÊÌ¡¹¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ëɬÍפÏÄ̾濫¤ê¤Þ¤»¤ó¡£2¤Ä¤Î°ú¿ô¤¬Æ±°ì¤Ç¤¢¤ë¾ì¹ç¤Ï¡¢\f2\-link\fP¤ò»ÈÍѤǤ­¤Þ¤¹¡£\f2\-link\fP¤ÎÁêÂÐ¥ê¥ó¥¯¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++\f4package\-list\fP\f3¥Õ¥¡¥¤¥ë¤ò¼êÆ°¤ÇºîÀ®\fP \- \f2package\-list\fP¥Õ¥¡¥¤¥ë¤¬¤Þ¤À¸ºß¤·¤Ê¤¯¤Æ¤â¡¢¥É¥­¥å¥á¥ó¥È¤Î¥ê¥ó¥¯Àè¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬¤ï¤«¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤ò¼êÆ°¤ÇºîÀ®¤·¡¢\f2packagelistLoc\fP¤Ç¤½¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\f2com.apipackage\fP¤¬ºÇ½é¤ËÀ¸À®¤µ¤ì¤¿»þÅÀ¤Ç\f2com.spipackage\fP¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥ê¥¹¥È¤¬Â¸ºß¤·¤Ê¤¤¤È¤¤¤¦Á°½Ð¤Î¥±¡¼¥¹¤¬°ìÎã¤È¤·¤Æµó¤²¤é¤ì¤Þ¤¹¡£¤³¤ÎÊýË¡¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ï¤ï¤«¤Ã¤Æ¤¤¤ë¤â¤Î¤Î¡¢¤Þ¤À¸ø³«¤µ¤ì¤Æ¤¤¤Ê¤¤¡¢¿·¤·¤¤³°Éô¥É¥­¥å¥á¥ó¥È¤Ë¥ê¥ó¥¯¤¹¤ë¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¤Þ¤¿¡¢\f2package\-list\fP¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Ê¤¤Javadoc 1.0¤Þ¤¿¤Ï1.1¤ÇÀ¸À®¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸ÍѤË\f2package\-list\fP¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¾ì¹ç¤Ë¤â¡¢¤³¤ÎÊýË¡¤¬»ÈÍѤǤ­¤Þ¤¹¡£Æ±Íͤˡ¢2¤Ä¤Î´ë¶È¤¬Ì¤¸ø³«¤Î\f2package\-list\fP¥Õ¥¡¥¤¥ë¤ò¶¦Í­¤Ç¤­¤ë¤¿¤á¡¢¥¯¥í¥¹¥ê¥ó¥¯¤òÀßÄꤷ¤¿¥É¥­¥å¥á¥ó¥È¤òƱ»þ¤Ë¥ê¥ê¡¼¥¹¤¹¤ë¤³¤È¤â²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++\f3Ê£¿ô¤Î¥É¥­¥å¥á¥ó¥È¤Ø¤Î¥ê¥ó¥¯\fP \- »²¾ÈÀè¤È¤Ê¤ëÀ¸À®¥É¥­¥å¥á¥ó¥È¤´¤È¤Ë\f2\-linkoffline\fP¤ò1¤Ä¤º¤Ä´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹(¤ï¤«¤ê¤ä¤¹¤¯¤¹¤ë¤¿¤á¤Ë¡¢¥ª¥×¥·¥ç¥ó¤´¤È¤Ë²þ¹Ô¤·¤Æ¼¨¤·¤Æ¤¤¤Þ¤¹)¡£
++.br
++.br
++\f2% \fP\f4javadoc \-linkoffline\fP \f2extdocURL1\fP \f2packagelistLoc1\fP \f2\\\fP
++.br
++\f2\ \ \ \ \ \ \ \ \ \ \fP\f4\-linkoffline\fP \f2extdocURL2\fP \f2packagelistLoc2\fP \f2\\\fP
++.br
++\f2\ \ \ \ \ \ \ \ \ \ ...\fP
++.br
++.br
++\f3¥É¥­¥å¥á¥ó¥È¤Î¹¹¿·\fP \- \f2\-linkoffline\fP¥ª¥×¥·¥ç¥ó¤Î¤â¤¦1¤Ä¤ÎÍÑÅӤϡ¢¥×¥í¥¸¥§¥¯¥È¤ËÂçÎ̤Υѥ屡¼¥¸¤¬´Þ¤Þ¤ì¤Æ¤¤¤Æ¡¢¤¹¤Ç¤Ë¥Ä¥ê¡¼Á´ÂΤËÂФ·¤ÆJavadoc¤Î¼Â¹Ô¤¬´°Î»¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¡¢¼¡¤Î¼Â¹Ô¤Ç¤Ï¡¢¾¯Î̤ÎÊѹ¹¤ò¼êÁ᤯²Ã¤¨¤¿¸å¡¢¥½¡¼¥¹¡¦¥Ä¥ê¡¼¤Î¤´¤¯°ìÉô¤ËÂФ·¤Æ¤Î¤ßJavadoc¤òºÆ¼Â¹Ô¤¹¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ËÂФ·¤Æ¤Î¤ßÊѹ¹¤ò²Ã¤¨¡¢Àë¸À¤ÏÊѹ¹¤·¤Ê¤¤¾ì¹ç¤Ë¤Î¤ßÀµ¤·¤¯½èÍý¤µ¤ì¤ë¤Î¤Ç¡¢¥Ï¥Ã¥­¥ó¥°¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£¥½¡¼¥¹¡¦¥³¡¼¥É¤ËÂФ·¤ÆÀë¸À¤òÄɲᢺï½ü¡¢¤Þ¤¿¤ÏÊѹ¹¤·¤¿¾ì¹ç¤Ï¡¢º÷°ú¡¢¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ä¥ê¡¼¡¢·Ñ¾µ¤µ¤ì¤ë¥á¥ó¥Ð¡¼¤Î¥ê¥¹¥È¡¢»ÈÍÑ¥Ú¡¼¥¸¤Ê¤É¤Î¾ì½ê¤Ç¡¢¥ê¥ó¥¯¤¬²õ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++¤Þ¤º¡¢¤³¤Î¿·¤·¤¤¾®µ¬ÌϤʼ¹ԤǻÈÍѤ¹¤ë¡¢¿·¤·¤¤À¸À®Àè¥Ç¥£¥ì¥¯¥È¥ê(\f2update\fP)¤òºîÀ®¤·¤Þ¤¹¡£¸µ¤ÎÀ¸À®Àè¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤¬\f2html\fP¤À¤Ã¤¿¤È¤·¤Þ¤¹¡£ºÇ¤âñ½ã¤ÊÎã¤Ç¤Ï¡¢\f2html\fP¥Ç¥£¥ì¥¯¥È¥ê¤Î¿Æ¤Ëcd¤Ë¤è¤Ã¤Æ°ÜÆ°¤·¤Þ¤¹¡£\f2\-linkoffline\fP¤ÎÂè1°ú¿ô¤Ë¥«¥ì¥ó¥È¡¦¥Ç¥£¥ì¥¯¥È¥ê¡Ö.¡×¤òÀßÄꤷ¡¢Âè2°ú¿ô¤Ë\f2package\-list\fP¤¬¸¡º÷¤µ¤ì¤ë\f2html\fP¤Ø¤ÎÁêÂХѥ¹¤òÀßÄꤷ¤Þ¤¹¡£¹¹¿·¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¤ß¤òÅϤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-d update \-linkoffline . html com.mypackage\fP
++.fl
++.fi
++Javadoc¥Ä¡¼¥ë¤Î½ªÎ»¸å¡¢\f2update/com/package\fPÆâ¤ÎÀ¸À®¤µ¤ì¤¿¥¯¥é¥¹¤Î¥Ú¡¼¥¸¤ò¥³¥Ô¡¼¤·(³µÍפäº÷°ú¤Ï½ü¤¯)¡¢\f2html/com/package\fPÆâ¤Î¸µ¤Î¥Õ¥¡¥¤¥ë¤Ë¾å½ñ¤­¤·¤Þ¤¹¡£
++.TP 3
++\-linksource\
++³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë(¹ÔÈÖ¹æÉÕ¤­)¤ÎHTML¥Ð¡¼¥¸¥ç¥ó¤òºîÀ®¤·¡¢É¸½àHTML¥É¥­¥å¥á¥ó¥È¤«¤é¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ø¤Î¥ê¥ó¥¯¤òÄɲä·¤Þ¤¹¡£¥ê¥ó¥¯¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ëÆâ¤ËÀë¸À¤µ¤ì¤Æ¤¤¤ë¥¯¥é¥¹¡¢¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¥Õ¥£¡¼¥ë¥É¤ËÂФ·¤ÆºîÀ®¤µ¤ì¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¡¦¥³¥ó¥¹¥È¥é¥¯¥¿¡¢À¸À®¤µ¤ì¤¿¥¯¥é¥¹¤Ê¤É¤ËÂФ·¤Æ¤ÏºîÀ®¤µ¤ì¤Þ¤»¤ó¡£
++.br
++.br
++\f3¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\fP\f4\-public\fP\f3¡¢\fP\f4\-package\fP\f3¡¢\fP\f4\-protected\fP\f3¡¢\fP\f4\-private\fP\f3¤Î³Æ¥ª¥×¥·¥ç¥ó¤È¤Ï´Ø·¸¤Ê¤¯\fP\f3¡¢Èó¸ø³«¤Î¥¯¥é¥¹¡¢¥Õ¥£¡¼¥ë¥É¡¢Èó¸ø³«¤Î¥á¥½¥Ã¥É¤ÎËÜÂΤò¤Ï¤¸¤á¤È¤¹¤ëÁȤ߹þ¤Þ¤ì¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ëÆâ¤Î\fP\f4¤¹¤Ù¤Æ¤Î\fP\f3Èó¸ø³«¼ÂÁõ¤Î¾ÜºÙ¤ò¸ø³«¤·¤Þ¤¹¡£\fP\f2\-private\fP¥ª¥×¥·¥ç¥ó¤âÊ»¤»¤Æ»ØÄꤷ¤Ê¤¤¤«¤®¤ê¡¢Èó¸ø³«¤Î¥¯¥é¥¹¤ä¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î°ìÉô¤Ë¤Ï¡¢¥ê¥ó¥¯¤ò²ð¤·¤Æ¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++³Æ¥ê¥ó¥¯¤Ï¡¢¤½¤ÎÀë¸ÀÆâ¤Î¼±ÊÌ»Ò̾¤Î¾å¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2Button\fP¥¯¥é¥¹¤Î¥½¡¼¥¹¡¦¥³¡¼¥É¤Ø¤Î¥ê¥ó¥¯¤Ï¡¢¡ÖButton¡×¤È¤¤¤¦¸ì¤Î¾å¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ public class Button
++.fl
++ extends Component
++.fl
++ implements Accessible
++.fl
++\fP
++.fi
++¤Þ¤¿¡¢Button¥¯¥é¥¹¤Î\f2getLabel()\fP¥á¥½¥Ã¥É¤Î¥½¡¼¥¹¡¦¥³¡¼¥É¤Ø¤Î¥ê¥ó¥¯¤Ï¡¢¡ÖgetLabel¡×¤È¤¤¤¦¸ì¤Î¾å¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ public String getLabel()
++.fl
++\fP
++.fi
++.TP 3
++\-group\ groupheading\ packagepattern:packagepattern:...
++³µÍ×¥Ú¡¼¥¸¤ÎÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢»ØÄꤷ¤¿¥°¥ë¡¼¥×¤Ëʬ¤±¤Æ¡¢¥°¥ë¡¼¥×¤´¤È¤Ëɽ¤òºîÀ®¤·¤Þ¤¹¡£³Æ¥°¥ë¡¼¥×¤Ï¡¢¤½¤ì¤¾¤ìÊ̤Î\f2\-group\fP¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤é¤Î¥°¥ë¡¼¥×¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤¿½ç½ø¤Ç¥Ú¡¼¥¸¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£³Æ¥°¥ë¡¼¥×Æâ¤Ç¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤¬¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ëʤ٤é¤ì¤Þ¤¹¡£1¤Ä¤Î\f2\-group\fP¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢\f2packagepattern\fP¼°¤Î¥ê¥¹¥È¤Ë°ìÃפ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢¸«½Ð¤·¤È¤·¤Æ\f2groupheading\fP¤ò»ý¤Ä1¤Ä¤Îɽ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f4groupheading\fP¤Ë¤Ï¡¢Ç¤°Õ¤Î¥Æ¥­¥¹¥È¤ò»ØÄê¤Ç¤­¡¢¶õÇò¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£»ØÄꤷ¤¿¥Æ¥­¥¹¥È¤Ï¡¢¥°¥ë¡¼¥×¤Îɽ¸«½Ð¤·¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++\f4packagepattern\fP¤Ë¤Ï¡¢Ç¤°Õ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¡¢¤Þ¤¿¤ÏǤ°Õ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÎÀèƬÉôʬ¤È¤½¤ì¤Ë³¤¯1¤Ä¤Î¥¢¥¹¥¿¥ê¥¹¥¯(\f2*\fP)¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯¤Ï¡¢¡ÖǤ°Õ¤Îʸ»ú¤Ë°ìÃפ¹¤ë¡×¤È¤¤¤¦°ÕÌ£¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤Ç¤¹¡£¥ï¥¤¥ë¥É¥«¡¼¥É¤È¤·¤Æ»ØÄê¤Ç¤­¤ë¤Î¤Ï¡¢¥¢¥¹¥¿¥ê¥¹¥¯¤Î¤ß¤Ç¤¹¡£1¤Ä¤Î¥°¥ë¡¼¥×¤Ë¤Ï¡¢¥³¥í¥ó(\f2:\fP)¤Ç¶èÀڤäÆÊ£¿ô¤Î¥Ñ¥¿¡¼¥ó¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.RE
++\f3Ãí°Õ: ¥Ñ¥¿¡¼¥ó¤ä¥Ñ¥¿¡¼¥ó¡¦¥ê¥¹¥ÈÆâ¤Ç¥¢¥¹¥¿¥ê¥¹¥¯¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢\fP\f4"java.lang*:java.util"\fP\f3¤Î¤è¤¦¤Ë¡¢¥Ñ¥¿¡¼¥ó¡¦¥ê¥¹¥È¤ò°úÍÑÉä¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£\fP
++.br
++.br
++\f2\-group\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢¡Ö¥Ñ¥Ã¥±¡¼¥¸¡×¤È¤¤¤¦¸«½Ð¤·¤Î1¤Ä¤Î¥°¥ë¡¼¥×¤ËÆþ¤ì¤é¤ì¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÃæ¤Ë¡¢¤É¤Î¥°¥ë¡¼¥×¤Ë¤âÆþ¤é¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¾ì¹ç¡¢¤³¤Î¤è¤¦¤Ê¥Ñ¥Ã¥±¡¼¥¸¤Ï¡Ö¤½¤Î¾¤Î¥Ñ¥Ã¥±¡¼¥¸¡×¤È¤¤¤¦¸«½Ð¤·¤ò»ý¤ÄÆÈΩ¤·¤¿¥°¥ë¡¼¥×¤ËÆþ¤ì¤é¤ì¤Þ¤¹¡£
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤ë5¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢¥³¥¢¡¦¥Ñ¥Ã¥±¡¼¥¸¡¢³ÈÄ¥µ¡Ç½¥Ñ¥Ã¥±¡¼¥¸¡¢¤ª¤è¤Ó¤½¤Î¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ëʬ¤±¤é¤ì¤Þ¤¹¡£¡Öjava.lang*¡×¤Ç¤Ï¡¢ºÇ¸å¤Î¥É¥Ã¥È¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¤³¤È¤ËÃíÌܤ·¤Æ¤¯¤À¤µ¤¤¡£¡Öjava.lang.*¡×¤Î¤è¤¦¤Ë¥É¥Ã¥È¤òÆþ¤ì¤ë¤È¡¢java.lang¥Ñ¥Ã¥±¡¼¥¸¤Ï½ü³°¤µ¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-group "Core Packages" "java.lang*:java.util"
++.fl
++ \-group "Extension Packages" "javax.*"
++.fl
++ java.lang java.lang.reflect java.util javax.servlet java.new\fP
++.fl
++.fi
++¤³¤Î·ë²Ì¡¢¼¡¤Î¤è¤¦¤Ê¥°¥ë¡¼¥×²½¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
++.RS 3
++.TP 3
++¥³¥¢¡¦¥Ñ¥Ã¥±¡¼¥¸
++\f2java.lang\fP
++\f2java.lang.reflect\fP
++\f2java.util\fP
++.TP 3
++³ÈÄ¥µ¡Ç½¥Ñ¥Ã¥±¡¼¥¸
++\f2javax.servlet\fP
++.TP 3
++¤½¤Î¾¤Î¥Ñ¥Ã¥±¡¼¥¸
++\f2java.new\fP
++.RE
++.TP 3
++\-nodeprecated
++¿ä¾©¤µ¤ì¤Ê¤¤API¤ò¥É¥­¥å¥á¥ó¥È¤ËÀ¸À®¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢\-nodeprecatedlist¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤ÈƱ¤¸¸ú²Ì¤¬¤¢¤ë¤³¤È¤Ë²Ã¤¨¤Æ¡¢¥É¥­¥å¥á¥ó¥È¤Î¾¤ÎÉôʬÁ´ÂΤǤ⡢¿ä¾©¤µ¤ì¤Ê¤¤API¤¬À¸À®¤µ¤ì¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥³¡¼¥É¤òµ­½Ò¤·¤Æ¤¤¤ë¤È¤­¡¢¿ä¾©¤µ¤ì¤Ê¤¤¥³¡¼¥É¤Ë¤è¤Ã¤Æµ¤¤ò»¶¤é¤µ¤ì¤¿¤¯¤Ê¤¤¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£
++.TP 3
++\-nodeprecatedlist
++¿ä¾©¤µ¤ì¤Ê¤¤API¤Î¥ê¥¹¥È¤ò´Þ¤à¥Õ¥¡¥¤¥ë(deprecated\-list.html)¡¢¤ª¤è¤Ó¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Î¤½¤Î¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤¬À¸À®¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£(¤¿¤À¤·¡¢¥É¥­¥å¥á¥ó¥È¤Î¾¤ÎÉôʬ¤Ç¤Ï¡¢¿ä¾©¤µ¤ì¤Ê¤¤API¤¬À¸À®¤µ¤ì¤Þ¤¹¡£)¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¿ä¾©¤µ¤ì¤Ê¤¤API¤¬¥½¡¼¥¹¡¦¥³¡¼¥É¤Ë´Þ¤Þ¤ì¤Æ¤ª¤é¤º¡¢¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤ò¤¹¤Ã¤­¤ê¤È¸«¤»¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£
++.TP 3
++\-nosince
++À¸À®¥É¥­¥å¥á¥ó¥È¤«¤é¡¢@since¥¿¥°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¡ÖƳÆþ¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¡×¥»¥¯¥·¥ç¥ó¤ò¾Êά¤·¤Þ¤¹¡£
++.TP 3
++\-notree
++À¸À®¥É¥­¥å¥á¥ó¥È¤«¤é¡¢¥¯¥é¥¹¤ª¤è¤Ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î³¬ÁØ¥Ú¡¼¥¸¤ò¾Êά¤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥Ú¡¼¥¸¤Ë¤Ï¡¢¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Î¡Ö³¬Áإĥ꡼¡×¥Ü¥¿¥ó¤«¤é¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢³¬Áؤ¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-noindex
++À¸À®¥É¥­¥å¥á¥ó¥È¤«¤é¡¢º÷°ú¤ò¾Êά¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢º÷°ú¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-nohelp
++½ÐÎϤγƥڡ¼¥¸¤ÎºÇ¾åÉô¤ÈºÇ²¼Éô¤Ë¤¢¤ë¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤«¤é¡Ö¥Ø¥ë¥×¡×¥ê¥ó¥¯¤ò¾Êά¤·¤Þ¤¹¡£
++.TP 3
++\-nonavbar
++À¸À®¤µ¤ì¤ë¥Ú¡¼¥¸¤ÎºÇ¾åÉô¤ÈºÇ²¼Éô¤Ëɽ¼¨¤µ¤ì¤ë¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¡¢¥Ø¥Ã¥À¡¼¡¢¤ª¤è¤Ó¥Õ¥Ã¥¿¡¼¤òÀ¸À®¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢bottom¥ª¥×¥·¥ç¥ó¤Ë¤Ï±Æ¶Á¤òÍ¿¤¨¤Þ¤»¤ó¡£\f2\-nonavbar\fP¥ª¥×¥·¥ç¥ó¤Ï¡¢°õºþ¤¹¤ë¤¿¤á¤Ë¤Î¤ß¥Õ¥¡¥¤¥ë¤òPostScript¤äPDF¤ËÊÑ´¹¤¹¤ë¾ì¹ç¤Ê¤É¡¢ÆâÍƤΤߤ¬½ÅÍפǡ¢¥Ê¥Ó¥²¡¼¥·¥ç¥ó¤ÎɬÍפ¬¤Ê¤¤¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£
++.TP 3
++\-helpfile\ path/filename
++ºÇ¾åÉô¤ª¤è¤ÓºÇ²¼Éô¤Î¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼¤Î¡Ö¥Ø¥ë¥×¡×¥ê¥ó¥¯¤Î¥ê¥ó¥¯Àè¤È¤Ê¤ëÂåÂإإë¥×¡¦¥Õ¥¡¥¤¥ë\f2path/filename\fP¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¥Ä¡¼¥ëÆâ¤Ç¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ë¥Ø¥ë¥×¡¦¥Õ¥¡¥¤¥ë\f2help\-doc.html\fP¤ò¼«Æ°ºîÀ®¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¤½¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Ç¤­¤Þ¤¹¡£\f2filename\fP¤Ë¤Ï¤É¤ó¤Ê¥Õ¥¡¥¤¥ë̾¤Ç¤â»ØÄê¤Ç¤­¡¢\f2help\-doc.html\fP¤Ë¸ÂÄꤵ¤ì¤Þ¤»¤ó¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢¥Ê¥Ó¥²¡¼¥·¥ç¥ó¡¦¥Ð¡¼Æâ¤Î¥ê¥ó¥¯¤òɬÍפ˱þ¤¸¤ÆÄ´À°¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-helpfile /home/user/myhelp.html java.awt\fP
++.fl
++.fi
++.TP 3
++\-stylesheetfile\ path/filename
++ÂåÂØHTML¥¹¥¿¥¤¥ë¥·¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¥Ä¡¼¥ëÆâ¤Ç¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ë¥¹¥¿¥¤¥ë¥·¡¼¥È¡¦¥Õ¥¡¥¤¥ë\f2stylesheet.css\fP¤ò¼«Æ°ºîÀ®¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¤½¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Ç¤­¤Þ¤¹¡£\f2filename\fP¤Ë¤Ï¤É¤ó¤Ê¥Õ¥¡¥¤¥ë̾¤Ç¤â»ØÄê¤Ç¤­¡¢\f2stylesheet.css\fP¤Ë¸ÂÄꤵ¤ì¤Þ¤»¤ó¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-stylesheetfile /home/user/mystylesheet.css com.mypackage\fP
++.fl
++.fi
++.TP 3
++\-serialwarn
++@serial¥¿¥°¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥ë»þ¤Ë·Ù¹ð¤òÀ¸À®¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢Javadoc 1.2.2 (°Ê¹ß)¤Ç¤Ï¡¢Ä¾Î󲽤ηٹð¤ÏÀ¸À®¤µ¤ì¤Þ¤»¤ó¡£(°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤È¤ÏµÕ¤ÎÆ°ºî¤Ç¤¹¡£)¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢Ä¾Î󲽤ηٹð¤¬É½¼¨¤µ¤ì¤ë¤Î¤Ç¡¢¥Ç¥Õ¥©¥ë¥È¤ÎľÎó²½²Äǽ¥Õ¥£¡¼¥ë¥É¤È\f2writeExternal\fP¥á¥½¥Ã¥É¤òŬÀڤ˥ɥ­¥å¥á¥ó¥È²½¤¹¤ë¤Î¤ËÌòΩ¤Á¤Þ¤¹¡£
++.TP 3
++\-charset\ name
++¤³¤Î¥É¥­¥å¥á¥ó¥ÈÍѤÎHTMLʸ»ú¥»¥Ã¥È¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î̾Á°¤Ï¡¢
++.na
++\f2IANA¥ì¥¸¥¹¥È¥ê\fP @
++.fi
++http://www.iana.org/assignments/character\-sets¤Ç»ØÄꤵ¤ì¤¿¡¢¿ä¾©¤µ¤ì¤ëMIME̾¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-charset "iso\-8859\-1" mypackage\fP
++.fl
++.fi
++À¸À®¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥Ú¡¼¥¸¤ÎÀèƬ¤Ë¡¢¼¡¤Î¹Ô¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ <META http\-equiv="Content\-Type" content="text/html; charset=ISO\-8859\-1">
++.fl
++\fP
++.fi
++¤³¤ÎMETA¥¿¥°¤Ë¤Ä¤¤¤Æ¤Ï¡¢
++.na
++\f2HTMLµ¬³Ê\fP @
++.fi
++http://www.w3.org/TR/REC\-html40/charset.html#h\-5.2.2(4197265¤ª¤è¤Ó4137321)¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++\-encoding¤ª¤è¤Ó\-docencoding¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-docencoding\ name
++À¸À®¤µ¤ì¤ëHTML¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î̾Á°¤Ï¡¢
++.na
++\f2IANA¥ì¥¸¥¹¥È¥ê\fP @
++.fi
++http://www.iana.org/assignments/character\-sets¤Ç»ØÄꤵ¤ì¤¿¡¢¿ä¾©¤µ¤ì¤ëMIME̾¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò¾Êά¤·¤Ê¤¬¤é\-encoding¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢À¸À®¤µ¤ì¤ëHTML¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥É¤Ï¡¢\-encoding¤Ë¤è¤Ã¤Æ·è¤á¤é¤ì¤Þ¤¹¡£Îã:
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-docencoding "ISO\-8859\-1" mypackage\fP
++.fl
++.fi
++\-encoding¤ª¤è¤Ó\-charset¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-keywords
++HTML¥á¥¿¡¦¥­¡¼¥ï¡¼¥É¡¦¥¿¥°¤ò¡¢¥¯¥é¥¹¤´¤È¤ËÀ¸À®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤ËÄɲä·¤Þ¤¹¡£¤³¤ì¤é¤Î¥¿¥°¤Ï¡¢¥á¥¿¥¿¥°¤ò¸¡º÷¤¹¤ë¥µ¡¼¥Á¡¦¥¨¥ó¥¸¥ó¤¬¥Ú¡¼¥¸¤ò¸«¤Ä¤±¤ë¾ì¹ç¤ËÌòΩ¤Á¤Þ¤¹¡£(¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÁ´ÂΤò¸¡º÷¤¹¤ë¿¤¯¤Î¥µ¡¼¥Á¡¦¥¨¥ó¥¸¥ó¤Ï¡¢¥Ú¡¼¥¸¤¬¥á¥¿¥¿¥°¤ò¸íÍѤ·¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢¥á¥¿¥¿¥°¤òÄ´¤Ù¤Þ¤»¤ó¡£°ìÊý¡¢¸¡º÷¤ò¼«¿È¤ÎWeb¥µ¥¤¥È¤Ë¸ÂÄꤷ¤Æ¤¤¤ë´ë¶È¤¬Ä󶡤¹¤ë¥µ¡¼¥Á¡¦¥¨¥ó¥¸¥ó¤Ï¡¢¥á¥¿¥¿¥°¤òÄ´¤Ù¤ë¤³¤È¤Ë¤è¤Ã¤Æ¥á¥ê¥Ã¥È¤òÆÀ¤é¤ì¤Þ¤¹¡£)
++.br
++.br
++¥á¥¿¥¿¥°¤Ë¤Ï¡¢¥¯¥é¥¹¤Î´°Á´½¤¾þ̾¤È¡¢¥Õ¥£¡¼¥ë¥É¤ª¤è¤Ó¥á¥½¥Ã¥É¤Î½¤¾þ¤µ¤ì¤Æ¤¤¤Ê¤¤Ì¾Á°¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¥³¥ó¥¹¥È¥é¥¯¥¿¤Ï¡¢¥¯¥é¥¹Ì¾¤ÈƱ¤¸¤Ç¤¢¤ë¤¿¤á´Þ¤Þ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢¥¯¥é¥¹String¤Ï¼¡¤Î¥­¡¼¥ï¡¼¥É¤Ç³«»Ï¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ <META NAME="keywords" CONTENT="java.lang.String class">
++.fl
++ <META NAME="keywords" CONTENT="CASE_INSENSITIVE_ORDER">
++.fl
++ <META NAME="keywords" CONTENT="length()">
++.fl
++ <META NAME="keywords" CONTENT="charAt()">
++.fl
++\fP
++.fi
++.TP 3
++\-tag\ \ tagname:Xaoptcmf:"taghead"
++Javadoc¥Ä¡¼¥ë¤¬¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤Î°ú¿ô¤ò1¤Ä¼è¤ëñ½ã¤Ê¥«¥¹¥¿¥à¥Ö¥í¥Ã¥¯¡¦¥¿¥°\f2@\fP\f2tagname\fP¤ò²ò¼á¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢Javadoc¥Ä¡¼¥ë¤Ï¥¿¥°Ì¾¤Î¡Ö¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¡×¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¡¢¥½¡¼¥¹¡¦¥³¡¼¥ÉÆâ¤Ë¸ºß¤¹¤ë¤¹¤Ù¤Æ¤Î¥«¥¹¥¿¥à¡¦¥¿¥°¤Ë¤Ä¤¤¤Æ¡¢\f2\-tag\fP¥ª¥×¥·¥ç¥ó¤òÁȤ߹þ¤à¤³¤È¤¬½ÅÍפǤ¹¡£º£²ó¤Î¼Â¹Ô¤Ç¤Ï½ÐÎϤµ¤ì¤Ê¤¤¥¿¥°¤Ï¡¢\f2X\fP¤òÉÕ¤±¤Æ̵¸ú¤Ë¤·¤Þ¤¹¡£
++.br
++.br
++¥³¥í¥ó(\f4:\fP)¤¬¾ï¤Ë¶èÀÚ¤êʸ»ú¤Ë¤Ê¤ê¤Þ¤¹¡£\f2tagname\fP¤Ç¥³¥í¥ó¤ò»ÈÍѤ¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢¥¿¥°Ì¾¤Ç¤Î¥³¥í¥ó¤Î»ÈÍѤò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++\f2\-tag\fP¥ª¥×¥·¥ç¥ó¤Ï¡¢¥¿¥°¤Î¸«½Ð¤·\f2taghead\fP¤òÂÀ»ú¤Ç½ÐÎϤ·¤Þ¤¹¡£¤½¤Î¼¡¤Î¹Ô¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ç»ØÄꤷ¤¿¥Æ¥­¥¹¥È¤¬Â³¤­¤Þ¤¹(²¼¤ÎÎã¤ò»²¾È)¡£¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤ÈƱÍÍ¡¢¤³¤Î°ú¿ô¤Î¥Æ¥­¥¹¥È¤Ë¤Ï¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°¤â²ò¼á¤µ¤ì¤Þ¤¹¡£½ÐÎϤϡ¢°ú¿ô¤ò1¤Ä¼è¤ëɸ½à¤Î¥¿¥°(\f2@return\fP¤ä\f2@author\fP¤Ê¤É)¤Î½ÐÎϤȤ褯»÷¤Æ¤¤¤Þ¤¹¡£\f2taghead\fP¤ò¾Êά¤¹¤ë¤È¡¢\f2tagname\fP¤¬¸«½Ð¤·¤È¤·¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++\f3¥¿¥°¤ÎÇÛÃÖ\fP \- °ú¿ô¤Î\f4Xaoptcmf\fPÉôʬ¤Ï¡¢¥½¡¼¥¹¡¦¥³¡¼¥ÉÆâ¤Î¥¿¥°¤òÇÛÃ֤Ǥ­¤ë°ÌÃ֤ȡ¢¥¿¥°¤ò(\f2X\fP¤ò»ÈÍѤ·¤Æ)̵¸ú¤Ë¤Ç¤­¤ë¤«¤É¤¦¤«¤ò·èÄꤷ¤Þ¤¹¡£¥¿¥°¤ÎÇÛÃÖ°ÌÃÖ¤òÀ©¸Â¤·¤Ê¤¤¾ì¹ç¤Ï\f4a\fP¤ò»ØÄꤷ¤Þ¤¹¡£¤½¤ì°Ê³°¤Îʸ»ú¤ÎÁȹ礻¤â²Äǽ¤Ç¤¹¡£
++.br
++.br
++\f4X\fP (¥¿¥°¤Î̵¸ú²½)
++.br
++\f4a\fP (¤¹¤Ù¤Æ)
++.br
++\f4o\fP (³µÍ×)
++.br
++\f4p\fP (¥Ñ¥Ã¥±¡¼¥¸)
++.br
++\f4t\fP (·¿¡¢¤Ä¤Þ¤ê¥¯¥é¥¹¤È¥¤¥ó¥¿¥Õ¥§¡¼¥¹)
++.br
++\f4c\fP (¥³¥ó¥¹¥È¥é¥¯¥¿)
++.br
++\f4m\fP (¥á¥½¥Ã¥É)
++.br
++\f4f\fP (¥Õ¥£¡¼¥ë¥É)
++.br
++.br
++\f3¥·¥ó¥°¥ë¡¦¥¿¥°¤ÎÎã\fP \- ¥½¡¼¥¹¡¦¥³¡¼¥ÉÆâ¤ÎǤ°Õ¤Î°ÌÃ֤ǻÈÍѤǤ­¤ë¥¿¥°¤Î¥¿¥°¡¦¥ª¥×¥·¥ç¥ó¤ÎÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-tag todo:a:"To Do:"
++.fl
++\fP
++.fi
++@todo¤ò¥³¥ó¥¹¥È¥é¥¯¥¿¡¢¥á¥½¥Ã¥É¡¢¥Õ¥£¡¼¥ë¥É¤Î¤ß¤Ç»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-tag todo:cmf:"To Do:"
++.fl
++\fP
++.fi
++¾å¤ÎÎã¤ÎºÇ¸å¤Î¥³¥í¥ó(\f2:\fP)¤Ï¡¢¥Ñ¥é¥á¡¼¥¿¶èÀÚ¤êʸ»ú¤Ç¤Ï¤Ê¤¯¡¢¸«½Ð¤·¥Æ¥­¥¹¥È¤Î°ìÉô¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹(²¼¤ÎÎã¤ò»²¾È)¡£¼¡¤ÎÎã¤Î¤è¤¦¤Ë¡¢\f2@todo\fP¥¿¥°¤ò´Þ¤à¥½¡¼¥¹¡¦¥³¡¼¥É¤Ç¤Ï¡¢¤¤¤º¤ì¤«¤Î¥¿¥°¡¦¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ @todo The documentation for this method needs work.
++.fl
++\fP
++.fi
++\f3¥¿¥°Ì¾¤Ç¤Î¥³¥í¥ó¤Î»ÈÍÑ\fP \- ¥³¥í¥ó(:)¤ò¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ç¥¨¥¹¥±¡¼¥×¤¹¤ë¤È¡¢¥³¥í¥ó¤ò¥¿¥°Ì¾¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ÎÃæ¤Ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ /**
++.fl
++ * @ejb:bean
++.fl
++ */
++.fl
++\fP
++.fi
++¤³¤Î¥¿¥°¡¦¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-tag ejb\\\\:bean:a:"EJB Bean:"
++.fl
++\fP
++.fi
++\f3¥¿¥°Ì¾¤Î¥¹¥Ú¥ë¥Á¥§¥Ã¥¯(¥¿¥°¤Î̵¸ú²½)\fP \- °ìÉô¤Î³«È¯¼Ô¤¬É¬¤º¤·¤â½ÐÎϤ·¤Ê¤¤¥«¥¹¥¿¥à¡¦¥¿¥°¤ò¥½¡¼¥¹¡¦¥³¡¼¥ÉÆâ¤ËÇÛÃÖ¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¥½¡¼¥¹¡¦¥³¡¼¥ÉÆâ¤Ë¸ºß¤¹¤ë¤¹¤Ù¤Æ¤Î¥¿¥°¤ò¥ê¥¹¥È¤·¡¢½ÐÎϤ¹¤ë¥¿¥°¤òÍ­¸ú¤Ë¤·¡¢½ÐÎϤ·¤Ê¤¤¥¿¥°¤ò̵¸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\f2X\fP¤ò»ØÄꤹ¤ë¤È¥¿¥°¤Ï̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£»ØÄꤷ¤Ê¤¤¤È¡¢¥¿¥°¤ÏÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢Javadoc¥Ä¡¼¥ë¤Ï¡¢¸¡½Ð¤·¤¿¥¿¥°¤¬ÆþÎϥߥ¹¤Ê¤É¤Ë¤è¤ëÉÔÌÀ¥¿¥°¤Ç¤¢¤ë¤«¤É¤¦¤«¤òÆÃÄê¤Ç¤­¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï·Ù¹ð¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.br
++.br
++¤¹¤Ç¤ËÇÛÃÖ¤µ¤ì¤Æ¤¤¤ëÃͤË\f2X\fP¤òÄɲäǤ­¤Þ¤¹¡£¤³¤¦¤·¤Æ¤ª¤±¤Ð¡¢\f2X\fP¤òºï½ü¤¹¤ë¤Î¤ß¤Ç¥¿¥°¤òÍ­¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢@todo¥¿¥°¤Î½ÐÎϤòÍÞÀ©¤¹¤ë¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-tag todo:Xcmf:"To Do:"
++.fl
++\fP
++.fi
++¤µ¤é¤Ëñ½ã¤Ê»ØÄêÊýË¡¤â¤¢¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-tag todo:X
++.fl
++\fP
++.fi
++¹½Ê¸\f2\-tag todo:X\fP¤Ï¡¢\f2@todo\fP¤¬¥¿¥°¥ì¥Ã¥È¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Æ¤âµ¡Ç½¤·¤Þ¤¹¡£
++.br
++.br
++\f3¥¿¥°¤Î½ç½ø\fP \- \f2\-tag\fP (¤ª¤è¤Ó\f2\-taglet\fP)¥ª¥×¥·¥ç¥ó¤Î½ç½ø¤Ë¤è¤Ã¤Æ¡¢¥¿¥°¤Î½ÐÎϽ礬·è¤Þ¤ê¤Þ¤¹¡£¥«¥¹¥¿¥à¡¦¥¿¥°¤Èɸ½à¥¿¥°¤òÁȤ߹礻¤Æ»ÈÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£É¸½à¥¿¥°¤Î¥¿¥°¡¦¥ª¥×¥·¥ç¥ó¤Ï¡¢½ç½ø¤ò·èÄꤹ¤ë¤¿¤á¤Î¤ß¤Î¥×¥ì¡¼¥¹¥Û¥ë¥À¤Ç¤¹¡£¤³¤ì¤é¤Ïɸ½à¥¿¥°Ì¾¤Î¤ß¤ò»ÈÍѤ·¤Þ¤¹¡£(ɸ½à¥¿¥°¤Î¾®¸«½Ð¤·¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£)¤³¤ì¤Ë¤Ä¤¤¤Æ¤Ï¡¢²¼¤ÎÎã¤ÇÀâÌÀ¤·¤Þ¤¹¡£
++.br
++.br
++\f2\-tag\fP¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢\f2\-taglet\fP¤Î°ÌÃ֤ˤè¤Ã¤Æ¤½¤Î½ç½ø¤¬·è¤Þ¤ê¤Þ¤¹¡£¥¿¥°¤¬Î¾Êý¤È¤â¸ºß¤¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÎºÇ¸å¤Ë¤¢¤ëÊý¤¬¤½¤Î½ç½ø¤ò·èÄꤷ¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥¿¥°¤ä¥¿¥°¥ì¥Ã¥È¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤵ¤ì¤¿½çÈ֤˽èÍý¤µ¤ì¤ë¤¿¤á¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2\-taglet\fP¤È\f2\-tag\fP¤ÎξÊý¤¬¡Ötodo¡×¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÎºÇ¸å¤Ë¤¢¤ëÊý¤¬½ç½ø¤ò·èÄꤷ¤Þ¤¹¡£
++.br
++.br
++\f3¥¿¥°¤Î´°Á´¥»¥Ã¥È¤ÎÎã\fP \- ¤³¤ÎÎã¤Ç¤Ï¡¢½ÐÎϤΡÖParameters¡×¤È¡ÖThrows¡×¤Î´Ö¤Ë¡ÖTo Do¡×¤òÁÞÆþ¤·¤Þ¤¹¡£¡ÖX¡×¤ò»ÈÍѤ·¤Æ¡¢@example¤¬¡¢¥½¡¼¥¹¡¦¥³¡¼¥ÉÆâ¤Îº£²ó¤Î¼Â¹Ô¤Ç¤Ï½ÐÎϤµ¤ì¤Ê¤¤¥¿¥°¤Ç¤¢¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£@argfile¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¡¢°ú¿ô¥Õ¥¡¥¤¥ëÆâ¤ÎÊÌ¡¹¤Î¹Ô¤Ë¥¿¥°¤òÇÛÃ֤Ǥ­¤Þ¤¹(¹Ô¤Î·Ñ³¤ò¼¨¤¹Ê¸»ú¤ÏÉÔÍ×)¡£
++.nf
++\f3
++.fl
++ \-tag param
++.fl
++ \-tag return
++.fl
++ \-tag todo:a:"To Do:"
++.fl
++ \-tag throws
++.fl
++ \-tag see
++.fl
++ \-tag example:X
++.fl
++\fP
++.fi
++Javadoc¤¬¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥È¤ò²òÀϤ¹¤ëºÝ¤Ë¸¡º÷¤µ¤ì¤¿¥¿¥°¤Î¤¦¤Á¡¢É¸½à¥¿¥°¤Ç¤â¡¢\f2\-tag\fP¤ä\f2\-taglet\fP¤ÇÅϤµ¤ì¤¿¥¿¥°¤Ç¤â¤Ê¤¤¤â¤Î¤Ï¤¹¤Ù¤ÆÉÔÌÀ¥¿¥°¤È¤ß¤Ê¤µ¤ì¡¢·Ù¹ð¤¬¥¹¥í¡¼¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++ɸ½à¥¿¥°¤Ï¡¢ºÇ½é¡¢¥Ç¥Õ¥©¥ë¥È¤Î½ç½ø¤Ç¥ê¥¹¥ÈÆâ¤ËÆâÉôŪ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£\f2\-tag\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¤³¤Î¥ê¥¹¥È¤ËÄɲ䵤ì¤ë¥¿¥°¡¢¤¹¤Ê¤ï¤Áɸ½à¥¿¥°¤¬¥Ç¥Õ¥©¥ë¥È¤Î°ÌÃÖ¤«¤é°ÜÆ°¤·¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢É¸½à¥¿¥°¤Î\f2\-tag\fP¥ª¥×¥·¥ç¥ó¤ò¾Êά¤¹¤ë¤È¡¢¤³¤ì¤é¤Ï¥Ç¥Õ¥©¥ë¥È¤Î°ÌÃÖ¤ËÇÛÃÖ¤µ¤ì¤¿¤Þ¤Þ¤Ë¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++\f3¶¥¹ç¤Î²óÈò\fP \- ¸ÇÍ­¤Î̾Á°¶õ´Ö¤òºÙ¤«¤¯Ê¬¤±¤ë¤Ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Ë»ÈÍѤµ¤ì¤Æ¤¤¤ë\f2com.mycompany.todo\fP¤È¤¤¤¦Ì¾Á°¤Î¤è¤¦¤Ë¡¢¥É¥Ã¥È(.)¤Ç¶èÀÚ¤é¤ì¤¿Ì¾Á°¤ò»ÈÍѤ·¤Þ¤¹¡£Oracle¤Ï¡¢º£¸å¤â̾Á°¤Ë¥É¥Ã¥È¤ò´Þ¤Þ¤Ê¤¤É¸½à¥¿¥°¤òºîÀ®¤·¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤¬ºîÀ®¤·¤¿¥¿¥°¤Ï¡¢Oracle¤¬ÄêµÁ¤¹¤ëƱ¤¸Ì¾Á°¤Î¥¿¥°¤ÎÆ°ºî¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢\f2@todo\fP¤È¤¤¤¦Ì¾Á°¤Î¥¿¥°¤Þ¤¿¤Ï¥¿¥°¥ì¥Ã¥È¤ò¥æ¡¼¥¶¡¼¤¬ºîÀ®¤·¤¿¾ì¹ç¡¢¤½¤Î¸å¤ËOracle¤¬Æ±¤¸Ì¾Á°¤Îɸ½à¥¿¥°¤òºîÀ®¤·¤Æ¤â¡¢¤½¤Î¥¿¥°¤Þ¤¿¤Ï¥¿¥°¥ì¥Ã¥È¤Ï¾ï¤Ë¥æ¡¼¥¶¡¼¤¬ÄêµÁ¤·¤¿¤Î¤ÈƱ¤¸Æ°ºî¤òÊÝ»ý¤·¤Þ¤¹¡£
++.br
++.br
++\f3Ãí¼ávs. Javadoc¥¿¥°\fP \- °ìÈ̤ˡ¢Äɲ乤ëɬÍפΤ¢¤ë¥Þ¡¼¥¯¥¢¥Ã¥×¤¬¡¢¥É¥­¥å¥á¥ó¥È¤Ë±Æ¶Á¤òÍ¿¤¨¤¿¤ê¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤·¤¿¤ê¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¢¤ë¾ì¹ç¡¢¤½¤Î¥Þ¡¼¥¯¥¢¥Ã¥×¤ÏJavadoc¥¿¥°¤Ë¤·¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤ÏÃí¼á¤Ë¤·¤Þ¤¹¡£
++.na
++\f2Ãí¼á¤ÈJavadoc¥¿¥°¤ÎÈæ³Ó\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137868.html#annotations¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++\-taglet¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¤è¤êÊ£»¨¤Ê¥Ö¥í¥Ã¥¯¡¦¥¿¥°¤ä¥«¥¹¥¿¥à¡¦¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°¤òºîÀ®¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.TP 3
++\-taglet\ \ class
++¤½¤Î¥¿¥°¤Î¥É¥­¥å¥á¥ó¥È¤ÎÀ¸À®¤Ë»ÈÍѤ¹¤ë¥É¥Ã¥¯¥ì¥Ã¥È¤òµ¯Æ°¤¹¤ë¤¿¤á¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£\f2¥¯¥é¥¹\fP¤Î´°Á´½¤¾þ̾¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥¿¥°¥ì¥Ã¥È¤Ï¡¢¥«¥¹¥¿¥à¡¦¥¿¥°¤Î¥Æ¥­¥¹¥È°ú¿ô¤Î¿ô¤âÄêµÁ¤·¤Þ¤¹¡£¥¿¥°¥ì¥Ã¥È¤Ï¡¢¤³¤ì¤é¤Î°ú¿ô¤ò¼õ¤±ÉÕ¤±¡¢½èÍý¤·¡¢½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡£³°Éô¥É¥­¥å¥á¥ó¥È¤È¥µ¥ó¥×¥ë¡¦¥¿¥°¥ì¥Ã¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢¼¡¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RS 3
++.TP 2
++o
++.na
++\f2¥¿¥°¥ì¥Ã¥È¤Î³µÍ×\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html
++.RE
++¥¿¥°¥ì¥Ã¥È¤Ï¡¢¥Ö¥í¥Ã¥¯¥¿¥°¤Þ¤¿¤Ï¥¤¥ó¥é¥¤¥ó¡¦¥¿¥°¤ÇÊØÍø¤Ç¤¹¡£¥¿¥°¥ì¥Ã¥È¤ÏǤ°Õ¤Î¿ô¤Î°ú¿ô¤ò¤È¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢¥Æ¥­¥¹¥È¤òÂÀ»ú¤Ë¤¹¤ë¡¢²Õ¾ò½ñ¤­¤òºîÀ®¤¹¤ë¡¢¥Æ¥­¥¹¥È¤ò¥Õ¥¡¥¤¥ë¤Ë½ñ¤­½Ð¤¹¡¢¤½¤Î¾¤Î¥×¥í¥»¥¹¤ò³«»Ï¤¹¤ë¤Ê¤É¤Î¥«¥¹¥¿¥àÆ°ºî¤ò¼ÂÁõ¤Ç¤­¤Þ¤¹¡£
++.br
++.br
++¥¿¥°¥ì¥Ã¥È¤Ç»ØÄê¤Ç¤­¤ë¤Î¤Ï¡¢¥¿¥°¤ÎÇÛÃÖ¾ì½ê¤ÈÇÛÃÖ·Á¼°¤Î¤ß¤Ç¤¹¡£¤½¤Î¾¤Î¤¹¤Ù¤Æ¤Î·èÄê¤Ï¡¢¥É¥Ã¥¯¥ì¥Ã¥È¤Ë¤è¤Ã¤Æ¹Ô¤ï¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥¿¥°¥ì¥Ã¥È¤ò»ÈÍѤ·¤Æ¤â¡¢Êñ´Þ¥¯¥é¥¹¤Î¥ê¥¹¥È¤«¤é¥¯¥é¥¹Ì¾¤òºï½ü¤¹¤ë¤Ê¤É¤Î½èÍý¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¥¿¥°¤Î¥Æ¥­¥¹¥È¤ò¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ·¤¿¤ê¡¢ÊÌ¤Î¥×¥í¥»¥¹¤ò¥È¥ê¥¬¡¼¤¹¤ë¤Ê¤É¤ÎÉûºîÍѤÏÆÀ¤é¤ì¤Þ¤¹¡£
++.br
++.br
++¥¿¥°¥ì¥Ã¥È¤Ø¤Î¥Ñ¥¹¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢\f2\-tagletpath\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£¼¡¤Ë¡¢À¸À®¤µ¤ì¤ë¥Ú¡¼¥¸¤Î¡ÖParameters¡×¤È¡ÖThrows¡×¤Î´Ö¤Ë¡ÖTo Do¡×¥¿¥°¥ì¥Ã¥È¤òÁÞÆþ¤¹¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-taglet com.sun.tools.doclets.ToDoTaglet
++.fl
++ \-tagletpath /home/taglets
++.fl
++ \-tag return
++.fl
++ \-tag param
++.fl
++ \-tag todo
++.fl
++ \-tag throws
++.fl
++ \-tag see
++.fl
++\fP
++.fi
++¤Þ¤¿¡¢\f2\-taglet\fP¥ª¥×¥·¥ç¥ó¤ò\f2\-tag\fP¥ª¥×¥·¥ç¥ó¤Î¤«¤ï¤ê¤Ë»ÈÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤¬¡¢Æɤߤˤ¯¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-tagletpath\ \ tagletpathlist
++taglet¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë(.class)¤ò¸¡º÷¤¹¤ë¤¿¤á¤Î¸¡º÷¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£\f2tagletpathlist\fP¤Ë¤Ï¡¢¥³¥í¥ó(\f2:\fP)¤Ç¶èÀڤäÆÊ£¿ô¤Î¥Ñ¥¹¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Javadoc¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ñ¥¹°Ê²¼¤Î¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¸¡º÷¤·¤Þ¤¹¡£
++.TP 3
++\-docfilessubdirs\
++¡Ö\f2doc\-files\fP¡×¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Ç¥£¡¼¥×¡¦¥³¥Ô¡¼¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢°¸Àè¤Ë¤Ï¡¢¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤È¤½¤Î¤¹¤Ù¤ÆÆâÍƤ¬ºÆµ¢Åª¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥Ç¥£¥ì¥¯¥È¥ê\f2doc\-files/example/images\fP¤È¤½¤ÎÆâÍƤ¬¤¹¤Ù¤Æ¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£¤³¤³¤Ç¤â¡¢¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°¤¹¤ë»ØÄ꤬²Äǽ¤Ç¤¹¡£
++.TP 3
++\-excludedocfilessubdir\ \ name1:name2...
++»ØÄꤵ¤ì¤¿Ì¾Á°¤Î¡Ö\f2doc\-files\fP¡×¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¤¹¤Ù¤Æ½ü³°¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢SCCS¤È¤½¤Î¾¤Î¥½¡¼¥¹¡¦¥³¡¼¥ÉÀ©¸æ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Î¥³¥Ô¡¼¤òËɤ®¤Þ¤¹¡£
++.TP 3
++\-noqualifier\ \ all\ | \ packagename1:packagename2:...
++½ÐÎϤµ¤ì¤ë¥¯¥é¥¹Ì¾¤ÎÀèƬ¤«¤é¥Ñ¥Ã¥±¡¼¥¸Ì¾(¥Ñ¥Ã¥±¡¼¥¸½¤¾þ»Ò)¤ò¾Êά¤·¤Þ¤¹¡£\f2\-noqualifier\fP¤Î°ú¿ô¤Ï¡¢¡Ö\f2all\fP¡×(¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸½¤¾þ»Ò¤ò¾Êά)¡¢½¤¾þ»Ò¤È¤·¤Æºï½ü¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥³¥í¥ó¶èÀÚ¤ê¥ê¥¹¥È(¥ï¥¤¥ë¥É¥«¡¼¥É¤â²Ä)¡¢¤Î¤¤¤º¤ì¤«¤È¤Ê¤ê¤Þ¤¹¡£¥¯¥é¥¹¤Þ¤¿¤Ï¥¤¥ó¥¿¥Õ¥§¡¼¥¹Ì¾¤¬É½¼¨¤µ¤ì¤ë°ÌÃÖ¤«¤é¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬ºï½ü¤µ¤ì¤Þ¤¹¡£
++.br
++.br
++¼¡¤ÎÎã¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸½¤¾þ»Ò¤ò¾Êά¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-noqualifier all
++.fl
++\fP
++.fi
++¼¡¤ÎÎã¤Ç¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸½¤¾þ»Ò¡Öjava.lang¡×¤ª¤è¤Ó¡Öjava.io¡×¤ò¾Êά¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-noqualifier java.lang:java.io
++.fl
++\fP
++.fi
++¼¡¤ÎÎã¤Ç¤Ï¡¢¡Öjava¡×¤Ç»Ï¤Þ¤ë¥Ñ¥Ã¥±¡¼¥¸½¤¾þ»Ò¤È¡Öcom.sun¡×¤È¤¤¤¦¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸(¡Öjavax¡×¤Ç¤Ï¤Ê¤¤)¤ò¾Êά¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-noqualifier java.*:com.sun.*
++.fl
++\fP
++.fi
++¥Ñ¥Ã¥±¡¼¥¸½¤¾þ»Ò¤¬Á°½Ò¤ÎÆ°ºî¤Ë½¾¤Ã¤Æɽ¼¨¤µ¤ì¤ë¾ì¹ç¡¢Ì¾Á°¤ÏŬÀÚ¤Ëû½Ì¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢Ì¾Á°¤¬É½¼¨¤µ¤ì¤ëÊýË¡¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥ë¡¼¥ë¤Ï¡¢\f2\-noqualifier\fP¤ò»ÈÍѤ¹¤ë¤«¤É¤¦¤«¤Ë¤«¤«¤ï¤é¤ºÍ­¸ú¤Ç¤¹¡£
++.TP 3
++\-notimestamp\
++¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬ÍÞÀ©¤µ¤ì¤Þ¤¹¡£³Æ¥Ú¡¼¥¸¤ÎÀèƬ¶á¤¯¤Ë¤¢¤ë¡¢À¸À®¤µ¤ì¤¿HTMLÆâ¤ÎHTML¥³¥á¥ó¥È¤Ç¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬±£¤µ¤ì¤Þ¤¹¡£Javadoc¤ò2¤Ä¤Î¥½¡¼¥¹¡¦¥Ù¡¼¥¹¤Ç¼Â¹Ô¤·¡¢¤½¤ì¤é¤ËÂФ·¤Ædiff¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ë¤è¤Ã¤Ædiff¤¬È¯À¸¤·¤Ê¤¯¤Ê¤ë¤Î¤ÇÊØÍø¤Ç¤¹(¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Ê¤¤¤È¡¢³Æ¥Ú¡¼¥¸¤Çdiff¤Ë¤Ê¤ê¤Þ¤¹)¡£¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ë¤ÏJavadoc¤Î¥Ð¡¼¥¸¥ç¥óÈֹ椬´Þ¤Þ¤ì¤Æ¤ª¤ê¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ <!\-\- Generated by javadoc (build 1.5.0_01) on Thu Apr 02 14:04:52 IST 2009 \-\->
++.fl
++\fP
++.fi
++.TP 3
++\-nocomment\
++¼çÀâÌÀ¤ª¤è¤Ó¤¹¤Ù¤Æ¤Î¥¿¥°¤ò´Þ¤à¥³¥á¥ó¥ÈËÜʸÁ´ÂΤòÍÞÀ©¤·¡¢Àë¸À¤Î¤ß¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢¸µ¤Ï°Û¤Ê¤ëÌÜŪ¤Î¤¿¤á¤À¤Ã¤¿¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤òºÆÍøÍѤ·¡¢¿·¤·¤¤¥×¥í¥¸¥§¥¯¥È¤ÎÁᤤÃʳ¬¤Ç¥¹¥±¥ë¥È¥óHTML¥É¥­¥å¥á¥ó¥È¤òºîÀ®¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++\-sourcetab tabLength
++¥½¡¼¥¹Æâ¤Î³Æ¥¿¥Ö¤¬¼è¤ë¶õÇòʸ»ú¤Î¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
++.RE
++.SH "¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¥Õ¥¡¥¤¥ë"
++.LP
++Javadoc¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤òû¤¯¤·¤¿¤ê´Ê·é¤Ë¤·¤¿¤ê¤¹¤ë¤¿¤á¤Ë¡¢\f2javadoc\fP¥³¥Þ¥ó¥É¤ËÂФ¹¤ë°ú¿ô(\f2\-J\fP¥ª¥×¥·¥ç¥ó¤ò½ü¤¯)¤¬Æþ¤Ã¤¿1¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¤³¤È¤òÍøÍѤ¹¤ì¤Ð¡¢¤É¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¾å¤Ç¤â¡¢Ç¤°Õ¤ÎŤµ¤Îjavadoc¥³¥Þ¥ó¥É¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
++.LP
++°ú¿ô¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢javac¤Î¥ª¥×¥·¥ç¥ó¤È¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾¤ò¼«Í³¤ËÁȤ߹礻¤Æµ­½Ò¤Ç¤­¤Þ¤¹¡£¥Õ¥¡¥¤¥ëÆâ¤Î³Æ°ú¿ô¤Ï¡¢¥¹¥Ú¡¼¥¹¤Þ¤¿¤Ï²þ¹Ô¤Ç¶èÀÚ¤ê¤Þ¤¹¡£¥Õ¥¡¥¤¥ë̾¤Ë¶õÇò¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë̾Á´ÂΤòÆó½Å°úÍÑÉä¤Ç°Ï¤ß¤Þ¤¹¡£
++.LP
++°ú¿ô¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë̾¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¸«¤¿ÁêÂХѥ¹¤Ë¤Ê¤ê¤Þ¤¹¡£°ú¿ô¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤«¤é¸«¤¿ÁêÂХѥ¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£°ú¿ô¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë̾¥ê¥¹¥È¤Ç¤Ï¡¢¥ï¥¤¥ë¥É¥«¡¼¥É(*)¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\f2*.java\fP¤È¤Ï»ØÄê¤Ç¤­¤Þ¤»¤ó¡£°ú¿ô¥Õ¥¡¥¤¥ëÆâ¤Î°ú¿ô¤Ç\f2@\fPʸ»ú¤ò»ÈÍѤ·¤Æ¡¢Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤òºÆµ¢Åª¤Ë²ò¼á¤¹¤ë¤³¤È¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¤Þ¤¿¡¢\f2\-J\fP¥ª¥×¥·¥ç¥ó¤â¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ïµ¯Æ°¥Ä¡¼¥ë¤ËÅϤµ¤ì¤Þ¤¹¤¬¡¢µ¯Æ°¥Ä¡¼¥ë¤Ç¤Ï°ú¿ô¥Õ¥¡¥¤¥ë¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¹¡£
++.LP
++Javadoc¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¡¢³Æ°ú¿ô¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤È¥Õ¥¡¥¤¥ë̾¤ÎÀèƬ¤Ë\f2@\fPʸ»ú¤òÉÕ¤±¤ÆÅϤ·¤Þ¤¹¡£Javadoc¤Ï¡¢\f2@\fPʸ»ú¤Ç»Ï¤Þ¤ë°ú¿ô¤ò¸«¤Ä¤±¤ë¤È¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòŸ³«¤·¤Æ°ú¿ô¥ê¥¹¥È¤ËÁÞÆþ¤·¤Þ¤¹¡£
++.SS
++°ú¿ô¥Õ¥¡¥¤¥ë¤ò1¤Ä»ØÄꤹ¤ëÎã
++.LP
++¼¡¤Î¤è¤¦¤Ë¤·¤Æ¡¢¡Ö\f2argfile\fP¡×¤È¤¤¤¦Ì¾Á°¤Îñ°ì¤Î°ú¿ô¥Õ¥¡¥¤¥ë¤Ë¡¢¤¹¤Ù¤Æ¤ÎJavadoc°ú¿ô¤ò³ÊǼ¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc @argfile\fP
++.fl
++.fi
++.LP
++¤³¤Î°ú¿ô¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¼¡¤ÎÎã¤Ç¼¨¤µ¤ì¤Æ¤¤¤ë2¤Ä¤Î¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòξÊý¤È¤âÆþ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.SS
++°ú¿ô¥Õ¥¡¥¤¥ë¤ò2¤Ä»ØÄꤹ¤ëÎã
++.LP
++¼¡¤Î¤è¤¦¤Ë¤·¤Æ¡¢Javadoc¥ª¥×¥·¥ç¥óÍѤË1¤Ä¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Þ¤¿¤Ï¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë̾ÍѤË1¤Ä¤È¤¤¤¦¤è¤¦¤Ë¡¢2¤Ä¤Î°ú¿ô¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹(¤Ê¤ª¡¢¼¡¤Î¥ê¥¹¥È¤Ç¤Ï¹Ô·Ñ³ʸ»ú¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤»¤ó)¡£
++.LP
++¼¡¤ÎÆâÍƤò´Þ¤à¡¢¡Ö\f2options\fP¡×¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-d docs\-filelist
++.fl
++ \-use
++.fl
++ \-splitindex
++.fl
++ \-windowtitle 'Java SE 7 API Specification'
++.fl
++ \-doctitle 'Java SE 7 API Specification'
++.fl
++ \-header '<b>Java(TM) SE 7</b>'
++.fl
++ \-bottom 'Copyright &copy; 1993\-2011 Oracle and/or its affiliates. All rights reserved.'
++.fl
++ \-group "Core Packages" "java.*"
++.fl
++ \-overview /java/pubs/ws/1.7.0/src/share/classes/overview\-core.html
++.fl
++ \-sourcepath /java/pubs/ws/1.7.0/src/share/classes
++.fl
++\fP
++.fi
++.LP
++¼¡¤ÎÆâÍƤò´Þ¤à¡¢¡Ö\f2packages\fP¡×¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ com.mypackage1
++.fl
++ com.mypackage2
++.fl
++ com.mypackage3
++.fl
++\fP
++.fi
++.LP
++¤½¤Î¸å¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤ÆJavadoc¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc @options @packages\fP
++.fl
++.fi
++.SS
++¥Ñ¥¹ÉÕ¤­¤Î°ú¿ô¥Õ¥¡¥¤¥ë¤ÎÎã
++.LP
++°ú¿ô¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Ñ¥¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢¤½¤Î¥Õ¥¡¥¤¥ëÆâ¤Ë»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ï¡¢¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¸«¤¿ÁêÂХѥ¹¤Ë¤Ê¤ê¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢²¼¤ÎÎã¤Î¾ì¹ç¤Ï¡¢\f2path1\fP¤ä\f2path2\fP¤«¤é¸«¤¿ÁêÂХѥ¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc @path1/options @path2/packages\fP
++.fl
++.fi
++.SS
++¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤ÎÎã
++.LP
++¼¡¤Ë¡¢Javadoc¥ª¥×¥·¥ç¥ó¤ËÂФ¹¤ë°ú¿ô¤Î¤ß¤ò°ú¿ô¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤¹¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£¤³¤³¤Ç¤Ï\f2\-bottom\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£¤½¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢Ä¹¤¤°ú¿ô¤ò»ØÄê¤Ç¤­¤ë¤«¤é¤Ç¤¹¡£¼¡¤Î¤è¤¦¤Ê¥Æ¥­¥¹¥È°ú¿ô¤ò´Þ¤à¡¢¡Ö\f2bottom\fP¡×¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++<font size="\-1">
++.fl
++ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
++.fl
++ Copyright &copy; 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
++.fl
++ Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
++.fl
++ Other names may be trademarks of their respective owners.</font>
++.fl
++\fP
++.fi
++.LP
++¤½¤Î¸å¡¢¼¡¤Î¤è¤¦¤Ë¤·¤ÆJavadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-bottom @bottom @packages\fP
++.fl
++.fi
++.LP
++¤¢¤ë¤¤¤Ï¡¢°ú¿ô¥Õ¥¡¥¤¥ë¤ÎÀèƬ¤Ë\f2\-bottom\fP¥ª¥×¥·¥ç¥ó¤òÁȤ߹þ¤ó¤À¸å¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc @bottom @packages\fP
++.fl
++.fi
++.SH "̾Á°"
++¼Â¹Ô
++.SH "Javadoc¤Î¼Â¹Ô"
++.LP
++\f3¥Ð¡¼¥¸¥ç¥óÈÖ¹æ\fP \- Javadoc¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òȽÊ̤¹¤ë¤Ë¤Ï¡¢\f3javadoc \-J\-version\fP¤ò»ÈÍѤ·¤Þ¤¹¡£½ÐÎÏ¥¹¥È¥ê¡¼¥à¤Ë¤Ïɸ½à¥É¥Ã¥¯¥ì¥Ã¥È¤Î¥Ð¡¼¥¸¥ç¥óÈֹ椬´Þ¤Þ¤ì¤Þ¤¹¡£\f2\-quiet\fP¤Ç̵¸ú¤Ë¤Ç¤­¤Þ¤¹¡£
++.LP
++\f3¸ø³«¥×¥í¥°¥é¥à¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹\fP \- Java¸À¸ì¤Çµ­½Ò¤µ¤ì¤¿¥×¥í¥°¥é¥à¤«¤éJavadoc¥Ä¡¼¥ë¤òµ¯Æ°¤¹¤ë¤È¤­»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï\f2com.sun.tools.javadoc.Main\fP¤Ë¤¢¤ê¤Þ¤¹(Javadoc¤ÏºÆÆþ²Äǽ)¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2ɸ½à¥É¥Ã¥¯¥ì¥Ã¥È\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++\f3¥É¥Ã¥¯¥ì¥Ã¥È¤Î¼Â¹Ô\fP \- ²¼¤ÎÀâÌÀ¤Ï¡¢É¸½àHTML¥É¥Ã¥¯¥ì¥Ã¥È¤ò¸Æ¤Ó½Ð¤¹¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£¥«¥¹¥¿¥à¡¦¥É¥Ã¥¯¥ì¥Ã¥È¤ò¸Æ¤Ó½Ð¤¹¤Ë¤Ï¡¢\-doclet¤ª¤è¤Ó\-docletpath¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2¥É¥Ã¥¯¥ì¥Ã¥È¤Î³µÍ×\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/doclet/overview.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.SH "´Êñ¤ÊÎã"
++.LP
++Javadoc¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸Á´ÂΤËÂФ·¤Æ¼Â¹Ô¤¹¤ë¤³¤È¤â¡¢¸Ä¡¹¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¼Â¹Ô¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£³Æ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÂбþ¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê̾¤ò»ý¤Á¤Þ¤¹¡£¼¡¤ÎÎã¤Ç¤Ï¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï\f2/home/src/java/awt/*.java\fP¤Ë¤¢¤ê¤Þ¤¹¡£À¸À®Àè¥Ç¥£¥ì¥¯¥È¥ê¤Ï\f2/home/html\fP¤Ç¤¹¡£
++.SS
++1¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥É¥­¥å¥á¥ó¥È²½
++.LP
++¥Ñ¥Ã¥±¡¼¥¸¤ò¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë(\f2*.java\fP)¤ò¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÈƱ¤¸Ì¾Á°¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë³ÊǼ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬(\f2java.awt.color\fP¤Î¤è¤¦¤Ë¥É¥Ã¥È¤Ç¶èÀÚ¤é¤ì¤¿)Ê£¿ô¤Î¼±Ê̻Ҥ«¤é¹½À®¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¸å³¤Î³Æ¼±Ê̻Ҥ¬²¼°Ì¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê(\f2java/awt/color\fP¤Ê¤É)¤ËÂбþ¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£1¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤¿¤á¤ÎÊ£¿ô¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¡¢°Û¤Ê¤ë¾ì½ê¤Ë¤¢¤ë¤½¤Î¤è¤¦¤Ê2¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¦¥Ä¥ê¡¼¤Ëʬ¤±¤Æ³ÊǼ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹(\f2src1/java/awt/color\fP¤ä\f2src2/java/awt/color\fP¤Ê¤É)¡£¤¿¤À¤·¡¢¤½¤Î¾ì¹ç¤Ï\f2\-sourcepath\fP¤Ë¤è¤Ã¤Æ¤½¤ÎξÊý¤Î¾ì½ê¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++Javadoc¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢\f2cd\fP¤ò»ÈÍѤ·¤Æ¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤¹¤ë¤«¡¢\f2\-sourcepath\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£¼¡¤ÎÎã¤Ç¤Ï¡¢Î¾Êý¤ÎÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f3¥±¡¼¥¹1 \- 1¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤«¤é¤Îµ¯Æ°¤òºÆµ¢Åª¤Ë¼Â¹Ô\fP \- ¤³¤ÎÎã¤Ç¤ÏJavadoc¤¬Ç¤°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¡¢\-sourcepath¤ò»ÈÍѤ·¡¢ºÆµ¢Åª½èÍý¤Î¤¿¤á¤Ë\-subpackages(1.4¤Î¿·¥ª¥×¥·¥ç¥ó)¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ï¡¢\f2java\fP¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤ò¤¿¤É¤ê¤Þ¤¹¤¬¡¢\f2java.net\fP¤È\f2java.lang\fP¤ò¥ë¡¼¥È¤Ë»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¤Ï½ü³°¤µ¤ì¤Þ¤¹¡£\f2java.lang\fP¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¢¤ë\f2java.lang.ref\fP¤¬½ü³°¤µ¤ì¤ëÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \fP\f3\-d\fP\f3 /home/html \fP\f3\-sourcepath\fP\f3 /home/src \fP\f3\-subpackages\fP\f3 java \fP\f3\-exclude\fP\f3 java.net:java.lang\fP
++.fl
++.fi
++.LP
++¤Þ¤¿¡¢Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¡¦¥Ä¥ê¡¼¤ò²¼Êý¤Ë¤¿¤É¤ë¤Ë¤Ï¡¢\f2java:javax:org.xml.sax\fP¤Î¤è¤¦¤Ë¡¢¤½¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î̾Á°¤ò\f2\-subpackages\fP¤Î°ú¿ô¤ËÄɲä·¤Þ¤¹¡£
++.TP 2
++o
++\f3¥±¡¼¥¹2 \- ¥ë¡¼¥È¡¦¥½¡¼¥¹¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë°Ü¤Ã¤Æ¤«¤éÌÀ¼¨Åª¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¤Æ¼Â¹Ô\fP \- ´°Á´½¤¾þ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤Ë°Ü¤ê¤Þ¤¹¡£¼¡¤Ë¡¢¥É¥­¥å¥á¥ó¥È²½¤¹¤ë1¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î̾Á°¤ò»ØÄꤷ¤ÆJavadoc¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3cd /home/src/\fP
++.fl
++ % \f3javadoc \-d /home/html java.awt java.awt.event\fP
++.fl
++.fi
++.TP 2
++o
++\f3¥±¡¼¥¹3 \- 1¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¦¥Ä¥ê¡¼Æâ¤Ë¤¢¤ëÌÀ¼¨Åª¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¤ÆǤ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¼Â¹Ô\fP \- ¤³¤Î¥±¡¼¥¹¤Ç¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤É¤³¤Ç¤¢¤Ã¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£ºÇ¾å°Ì¥Ñ¥Ã¥±¡¼¥¸¤Î¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤ò\f2\-sourcepath\fP¤Ë»ØÄꤷ¡¢¥É¥­¥å¥á¥ó¥È²½¤¹¤ë1¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤷ¤ÆJavadoc¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-d /home/html \-sourcepath /home/src java.awt java.awt.event\fP
++.fl
++.fi
++.TP 2
++o
++\f3¥±¡¼¥¹4 \- Ê£¿ô¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¦¥Ä¥ê¡¼Æâ¤Ë¤¢¤ëÌÀ¼¨Åª¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¤ÆǤ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¼Â¹Ô\fP \- ¤³¤ì¤Ï¥±¡¼¥¹3¤È»÷¤Æ¤¤¤Þ¤¹¤¬¡¢¥Ñ¥Ã¥±¡¼¥¸¤¬Ê£¿ô¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¦¥Ä¥ê¡¼¤Ë¸ºß¤·¤Þ¤¹¡£¤½¤ì¤¾¤ì¤Î¥Ä¥ê¡¼¤Î¥ë¡¼¥È¤Ø¤Î¥Ñ¥¹¤ò\f2\-sourcepath\fP¤Ë»ØÄꤷ(¥³¥í¥ó¤Ç¶èÀÚ¤ë)¡¢¥É¥­¥å¥á¥ó¥È²½¤¹¤ë1¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤷ¤ÆJavadoc¤ò¼Â¹Ô¤·¤Þ¤¹¡£1¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬¡¢1¤Ä¤Î¥ë¡¼¥È¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Ë¸ºß¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£¥½¡¼¥¹¡¦¥Ñ¥¹¤È¤·¤Æ»ØÄꤵ¤ì¤¿¾ì½ê¤Î¤É¤³¤«¤Ç¸«¤Ä¤«¤ì¤Ð½½Ê¬¤Ç¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-d /home/html \-sourcepath /home/src1:/home/src2 java.awt java.awt.event\fP
++.fl
++.fi
++.RE
++.LP
++·ë²Ì: ¤¹¤Ù¤Æ¤Î¥±¡¼¥¹¤Ç\f2java.awt\fP¤ª¤è¤Ó\f2java.awt.event\fP¥Ñ¥Ã¥±¡¼¥¸Æâ¤Îpublic¤ª¤è¤Óprotected¥¯¥é¥¹¤È¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë¤Ä¤¤¤Æ¡¢HTML·Á¼°¤Î¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¡¢»ØÄꤵ¤ì¤¿À¸À®Àè¥Ç¥£¥ì¥¯¥È¥ê(\f2/home/html\fP)¤ËHTML¥Õ¥¡¥¤¥ë¤¬Êݸ¤µ¤ì¤Þ¤¹¡£2¤Ä°Ê¾å¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬À¸À®¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥É¥­¥å¥á¥ó¥È¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥ê¥¹¥È¡¢¥¯¥é¥¹¤Î¥ê¥¹¥È¡¢¤ª¤è¤Ó¥á¥¤¥ó¤Î¥¯¥é¥¹¡¦¥Ú¡¼¥¸¤È¤¤¤¦3¤Ä¤ÎHTML¥Õ¥ì¡¼¥à¤ò»ý¤Ä¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.SS
++1¤Ä°Ê¾å¤Î¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥È²½
++.LP
++¤Þ¤¿¡¢1¤Ä°Ê¾å¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë(\f2.java\fP)¤òÅϤ·¤Æ¡¢Javadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£Javadoc¤Ï¡¢¼¡¤Î2¤Ä¤ÎÊýË¡¤Î¤¤¤º¤ì¤«¤Ç¼Â¹Ô¤Ç¤­¤Þ¤¹¡£1¤Ä¤Ï\f2cd\fP¤ò»ÈÍѤ·¤Æ¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤¹¤ëÊýË¡¡¢¤â¤¦1¤Ä¤Ï\f2.java\fP¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò´°Á´¤Ë»ØÄꤹ¤ëÊýË¡¤Ç¤¹¡£ÁêÂХѥ¹¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òµ¯ÅÀ¤È¤·¤Þ¤¹¡£¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤òÅϤ¹¤È¤­¤Ï¡¢\f2\-sourcepath\fP¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯(*)¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ï¥¤¥ë¥É¥«¡¼¥É¤ò»ÈÍѤ¹¤ë¤È¡¢¥¯¥é¥¹¤Î¥°¥ë¡¼¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f3¥±¡¼¥¹1 \- ¥½¡¼¥¹¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë°Ü¤ë\fP \- \f2.java\fP¥Õ¥¡¥¤¥ë¤Î¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë°Ü¤ê¤Þ¤¹¡£¼¡¤Ë¡¢¥É¥­¥å¥á¥ó¥È²½¤¹¤ë1¤Ä°Ê¾å¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤷ¤ÆJavadoc¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3cd /home/src/java/awt\fP
++.fl
++ % \f3javadoc \-d /home/html Button.java Canvas.java Graphics*.java\fP
++.fl
++.fi
++¤³¤ÎÎã¤Ç¤Ï¡¢\f2Button\fP¥¯¥é¥¹¤È\f2Canvas\fP¥¯¥é¥¹¡¢¤ª¤è¤Ó̾Á°¤¬\f2Graphics\fP¤Ç»Ï¤Þ¤ë¥¯¥é¥¹¤Ë¤Ä¤¤¤Æ¡¢HTML·Á¼°¤Î¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤Ï¤Ê¤¯¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤¬Javadoc¤Ë°ú¿ô¤È¤·¤ÆÅϤµ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥É¥­¥å¥á¥ó¥È¤Ï¡¢¥¯¥é¥¹¤Î¥ê¥¹¥È¤È¥á¥¤¥ó¡¦¥Ú¡¼¥¸¤È¤¤¤¦2¤Ä¤Î¥Õ¥ì¡¼¥à¤ò»ý¤Ä¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++\f3¥±¡¼¥¹2 \- ¥Ñ¥Ã¥±¡¼¥¸¤Î¥ë¡¼¥È¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë°Ü¤ë\fP \- ¤³¤ì¤Ï¡¢Æ±¤¸¥ë¡¼¥ÈÆâ¤Ë¤¢¤ëÊ£¿ô¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Î¸Ä¡¹¤Î¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¤Î¥ë¡¼¥È¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë°Ü¤ê¡¢³Æ¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¡¢¥ë¡¼¥È¤«¤é¤Î¥Ñ¥¹¤È¤È¤â¤Ë»ØÄꤷ¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3cd /home/src/\fP
++.fl
++ % \f3javadoc \-d /home/html java/awt/Button.java java/applet/Applet.java\fP
++.fl
++.fi
++¤³¤ÎÎã¤Ç¤Ï¡¢\f2Button\fP¥¯¥é¥¹¤ª¤è¤Ó\f2Applet\fP¥¯¥é¥¹¤Ë¤Ä¤¤¤Æ¡¢HTML·Á¼°¤Î¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.TP 2
++o
++\f3¥±¡¼¥¹3 \- Ǥ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é\fP \- ¤³¤Î¥±¡¼¥¹¤Ç¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤É¤³¤Ç¤¢¤Ã¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£¥É¥­¥å¥á¥ó¥È²½¤¹¤ë\f2.java\fP¥Õ¥¡¥¤¥ë¤Ø¤ÎÀäÂХѥ¹(¤Þ¤¿¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹)¤ò»ØÄꤷ¤ÆJavadoc¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-d /home/html /home/src/java/awt/Button.java /home/src/java/awt/Graphics*.java\fP
++.fl
++.fi
++¤³¤ÎÎã¤Ç¤Ï¡¢\f2Button\fP¥¯¥é¥¹¡¢¤ª¤è¤Ó̾Á°¤¬\f2Graphics\fP¤Ç»Ï¤Þ¤ë¥¯¥é¥¹¤Ë¤Ä¤¤¤Æ¡¢HTML·Á¼°¤Î¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.RE
++.SS
++¥Ñ¥Ã¥±¡¼¥¸¤È¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥È²½
++.LP
++¥Ñ¥Ã¥±¡¼¥¸Á´ÂΤȸġ¹¤Î¥¯¥é¥¹¤òƱ»þ¤Ë»ØÄꤷ¤Æ¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¼¡¤Ë¡¢Á°½Ò¤Î2¤Ä¤ÎÎã¤òÁȤ߹礻¤¿Îã¤ò¼¨¤·¤Þ¤¹¡£\f2\-sourcepath\fP¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥Ñ¥¹¤ËÂФ·¤Æ¤Ï»ÈÍѤǤ­¤Þ¤¹¤¬¡¢¸Ä¡¹¤Î¥¯¥é¥¹¤Ø¤Î¥Ñ¥¹¤ËÂФ·¤Æ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£
++.nf
++\f3
++.fl
++ % \fP\f3javadoc \-d /home/html \-sourcepath /home/src java.awt /home/src/java/applet/Applet.java\fP
++.fl
++.fi
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢\f2java.awt\fP¥Ñ¥Ã¥±¡¼¥¸¤ª¤è¤Ó\f2Applet\fP¥¯¥é¥¹¤Ë¤Ä¤¤¤Æ¡¢HTML·Á¼°¤Î¥É¥­¥å¥á¥ó¥È¤¬À¸À®¤µ¤ì¤Þ¤¹¡£(Javadoc¥Ä¡¼¥ë¤Ï¡¢\f2Applet.java\fP¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë¥Ñ¥Ã¥±¡¼¥¸Àë¸À¤¬¤¢¤ì¤Ð¡¢¤½¤ÎÀë¸À¤Ë´ð¤Å¤¤¤Æ\f2Applet\fP¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òȽÊ̤·¤Þ¤¹¡£)
++.SH "»ÈÍÑÎã"
++.LP
++Javadoc¥Ä¡¼¥ë¤Ë¤Ï¿¤¯¤ÎÊØÍø¤Ê¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¡¢¤½¤ÎÃæ¤Ë¤Ï¾¤Î¥ª¥×¥·¥ç¥ó¤è¤ê¤âÉÑÈˤ˻ÈÍѤµ¤ì¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£¤³¤³¤Ç¾Ò²ð¤¹¤ë¤Î¤Ï¡¢Java¥×¥é¥Ã¥È¥Õ¥©¡¼¥àAPI¤ËÂФ·¤ÆJavadoc¥Ä¡¼¥ë¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¼ÂºÝ¤Î¥³¥Þ¥ó¥É¤Ç¤¹¡£Java SE Platform, Standard Edition, v1.2¤Ë¸ºß¤¹¤ë¡¢Ìó1500¸Ä¤Îpublic¤ª¤è¤Óprotected¥¯¥é¥¹¤Î¥É¥­¥å¥á¥ó¥È¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë¡¢180MB¤Î¥á¥â¥ê¡¼¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++Ʊ¤¸Îã¤ò2²ó·ÇºÜ¤·¤Þ¤¹¡£ºÇ½é¤ÎÎã¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¼Â¹Ô¤¹¤ë¤â¤Î¤Ç¡¢2ÈÖÌܤÎÎã¤ÏMakefile¤«¤é¼Â¹Ô¤¹¤ë¤â¤Î¤Ç¤¹¡£¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤ÇÀäÂХѥ¹¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¤¿¤á¡¢Ç¤°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤éƱ¤¸\f2javadoc\fP¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
++.SS
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÎÎã
++.LP
++¼¡¤ÎÎã¤Ï¡¢DOS¤Ê¤É¤Î°ìÉô¤Î¥·¥§¥ë¤Ë¤ÏŤ¹¤®¤Þ¤¹¡£¤³¤ÎÀ©¸Â¤ò²óÈò¤¹¤ë¤Ë¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Þ¤¹¡£¤Þ¤¿¤Ï¡¢¥·¥§¥ë¡¦¥¹¥¯¥ê¥×¥È¤òµ­½Ò¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++% javadoc \-sourcepath /java/jdk/src/share/classes \\
++.fl
++ \-overview /java/jdk/src/share/classes/overview.html \\
++.fl
++ \-d /java/jdk/build/api \\
++.fl
++ \-use \\
++.fl
++ \-splitIndex \\
++.fl
++ \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\
++.fl
++ \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\
++.fl
++ \-header '<b>Java(TM) SE 7</b>' \\
++.fl
++ \-bottom '<font size="\-1">
++.fl
++ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
++.fl
++ Copyright &copy; 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
++.fl
++ Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
++.fl
++ Other names may be trademarks of their respective owners.</font>' \\
++.fl
++ \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\
++.fl
++ \-group "Extension Packages" "javax.*" \\
++.fl
++ \-J\-Xmx180m \\
++.fl
++ @packages
++.fl
++\fP
++.fi
++.LP
++¤³¤³¤Ç¡¢\f2packages\fP¤Ï¡¢½èÍýÂоݤΥѥ屡¼¥¸Ì¾(\f2java.applet java.lang\fP¤Ê¤É)¤¬Æþ¤Ã¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡£³Æ¥ª¥×¥·¥ç¥ó¤Î¡¢°ì½Å°úÍÑÉä¤Ç°Ï¤Þ¤ì¤¿°ú¿ô¤ÎÆ⦤ˤϡ¢²þ¹Ôʸ»ú¤òÁÞÆþ¤Ç¤­¤Þ¤»¤ó¡£(¤¿¤È¤¨¤Ð¡¢¤³¤ÎÎã¤ò¥³¥Ô¡¼&¥Ú¡¼¥¹¥È¤¹¤ë¾ì¹ç¤Ï¡¢\f2\-bottom\fP¥ª¥×¥·¥ç¥ó¤«¤é²þ¹Ôʸ»ú¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£)¤µ¤é¤Ë¡¢²¼¤Î¡ÖÃí°Õ¡×¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.SS
++Makefile¤ÎÎã
++.LP
++¤³¤³¤Ç¤Ï¡¢GNU Makefile¤ÎÎã¤ò¼¨¤·¤Þ¤¹¡£Windows¤ÎMakefile¤ÎÎã¤Ë¤Ä¤¤¤Æ¤Ï¡¢
++.na
++\f2Windows¤ÎMakefile¤ÎºîÀ®ÊýË¡\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137483.html#makefiles¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.nf
++\f3
++.fl
++javadoc \-\fP\f3sourcepath\fP\f3 $(SRCDIR) \\ /* Sets path for source files */
++.fl
++ \-\fP\f3overview\fP\f3 $(SRCDIR)/overview.html \\ /* Sets file for overview text */
++.fl
++ \-\fP\f3d\fP\f3 /java/jdk/build/api \\ /* Sets destination directory */
++.fl
++ \-\fP\f3use\fP\f3 \\ /* Adds "Use" files */
++.fl
++ \-\fP\f3splitIndex\fP\f3 \\ /* Splits index A\-Z */
++.fl
++ \-\fP\f3windowtitle\fP\f3 $(WINDOWTITLE) \\ /* Adds a window title */
++.fl
++ \-\fP\f3doctitle\fP\f3 $(DOCTITLE) \\ /* Adds a doc title */
++.fl
++ \-\fP\f3header\fP\f3 $(HEADER) \\ /* Adds running header text */
++.fl
++ \-\fP\f3bottom\fP\f3 $(BOTTOM) \\ /* Adds text at bottom */
++.fl
++ \-\fP\f3group\fP\f3 $(GROUPCORE) \\ /* 1st subhead on overview page */
++.fl
++ \-\fP\f3group\fP\f3 $(GROUPEXT) \\ /* 2nd subhead on overview page */
++.fl
++ \-\fP\f3J\fP\f3\-Xmx180m \\ /* Sets memory to 180MB */
++.fl
++ java.lang java.lang.reflect \\ /* Sets packages to document */
++.fl
++ java.util java.io java.net \\
++.fl
++ java.applet
++.fl
++
++.fl
++WINDOWTITLE = 'Java(TM) SE 7 API Specification'
++.fl
++DOCTITLE = 'Java(TM) Platform Standard Edition 7 API Specification'
++.fl
++HEADER = '<b>Java(TM) SE 7</font>'
++.fl
++BOTTOM = '<font size="\-1">
++.fl
++ <a href="http://bugreport.sun.com/bugreport/">Submit a bug or feature</a><br/>
++.fl
++ Copyright &copy; 1993, 2011, Oracle and/or its affiliates. All rights reserved.<br/>
++.fl
++ Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
++.fl
++ Other names may be trademarks of their respective owners.</font>'
++.fl
++GROUPCORE = '"Core Packages" "java.*:com.sun.java.*:org.omg.*"'
++.fl
++GROUPEXT = '"Extension Packages" "javax.*"'
++.fl
++SRCDIR = '/java/jdk/1.7.0/src/share/classes'
++.fl
++\fP
++.fi
++.LP
++Makefile¤Î°ú¿ô¤Ï¡¢°ì½Å°úÍÑÉä¤Ç°Ï¤ß¤Þ¤¹¡£
++.LP
++\f3Ãí°Õ\fP
++.RS 3
++.TP 2
++o
++\f2\-windowtitle\fP¥ª¥×¥·¥ç¥ó¤ò¾Êά¤¹¤ë¤È¡¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ¥É¥­¥å¥á¥ó¥È¡¦¥¿¥¤¥È¥ë¤¬¥¦¥£¥ó¥É¥¦¡¦¥¿¥¤¥È¥ë¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£\f2\-windowtitle\fP¤Î¥Æ¥­¥¹¥È¤Ï¡¢´ðËÜŪ¤Ë\f2\-doctitle\fP¤ÈƱ¤¸¤Ç¤¹¡£¤¿¤À¤·¡¢HTML¥¿¥°¤Ï´Þ¤Þ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢HTML¥¿¥°¤¬¡¢¥¦¥£¥ó¥É¥¦¡¦¥¿¥¤¥È¥ëÆâ¤Ë¤½¤Î¤Þ¤Þ¤Î¥Æ¥­¥¹¥È¤È¤·¤Æɽ¼¨¤µ¤ì¤ë¤Î¤òËɤ°¤¿¤á¤Ç¤¹¡£.
++.TP 2
++o
++¤³¤ÎÎã¤Î¤è¤¦¤Ë\f2\-footer\fP¥ª¥×¥·¥ç¥ó¤ò¾Êά¤¹¤ë¤È¡¢Javadoc¥Ä¡¼¥ë¤Ë¤è¤Ã¤Æ¥Ø¥Ã¥À¡¼¡¦¥Æ¥­¥¹¥È¤¬¥Õ¥Ã¥¿¡¼¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
++.TP 2
++o
++¤³¤ÎÎã¤Ç¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¤¬¡¢\f2\-classpath\fP¤È\f2\-link\fP¤â½ÅÍפʥª¥×¥·¥ç¥ó¤Ç¤¹¡£
++.RE
++.SH "¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°"
++.SS
++°ìÈÌŪ¤Ê¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°
++.RS 3
++.TP 2
++o
++\f3Javadoc¤ÎFAQ\fP \- °ìÈÌŪ¤Ê¥Ð¥°¤ª¤è¤Ó¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¤Î¥Ò¥ó¥È¤Ï¡¢
++.na
++\f2Javadoc¤ÎFAQ\fP @
++.fi
++http://www.oracle.com/technetwork/java/javase/documentation/index\-137483.html¤Ç»²¾È¤Ç¤­¤Þ¤¹¡£
++.TP 2
++o
++\f3¥Ð¥°¤ª¤è¤ÓÀ©¸Â»ö¹à\fP \- ¥Ð¥°¤Î°ìÉô¤Ï¡¢¥Ð¥°½¤Àµ¤ª¤è¤ÓÊѹ¹¤Î¥¤¥ó¥Ý¡¼¥È¤Ç¤â»²¾È¤Ç¤­¤Þ¤¹¡£
++.TP 2
++o
++\f3¥Ð¡¼¥¸¥ç¥óÈÖ¹æ\fP \- ¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 2
++o
++\f3Í­¸ú¤Ê¥¯¥é¥¹¤Î¤ß¤ò¥É¥­¥å¥á¥ó¥È²½\fP \- ¥Ñ¥Ã¥±¡¼¥¸¤ò¥É¥­¥å¥á¥ó¥È²½¤¹¤ë¤È¤­¡¢Javadoc¤Ï¡¢Ì¾Á°¤¬Í­¸ú¤Ê¥¯¥é¥¹Ì¾¤Ç¹½À®¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¤ß¤òÆɤ߹þ¤ß¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥Õ¥¡¥¤¥ë̾¤Ë¥Ï¥¤¥Õ¥ó¡Ö\-¡×¤ò´Þ¤á¤ë¤³¤È¤Ç¡¢Javadoc¤Ë¤è¤ë¥Õ¥¡¥¤¥ë¤Î²òÀϤòËɤ°¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.RE
++.SS
++¥¨¥é¡¼¤È·Ù¹ð
++.LP
++¥¨¥é¡¼¤ª¤è¤Ó·Ù¹ð¥á¥Ã¥»¡¼¥¸¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤ÈÀë¸À¹Ô(¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¡¦¥³¥á¥ó¥ÈÆâ¤ÎÆÃÄê¤Î¹Ô¤Ç¤Ï¤Ê¤¤)¤Î¹ÔÈֹ椬´Þ¤Þ¤ì¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++¡Ö\f2¥¨¥é¡¼: Class1.java¤òÆɤ߹þ¤á¤Þ¤»¤ó\fP¡×: Javadoc¥Ä¡¼¥ë¤Ï¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËClass1.java¥¯¥é¥¹¤ò¥í¡¼¥É¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£ÀäÂХѥ¹¤Þ¤¿¤ÏÁêÂХѥ¹¤È¤È¤â¤Ëɽ¼¨¤µ¤ì¤ë¥¯¥é¥¹Ì¾¤Ï¡¢¤³¤ÎÎã¤Î¾ì¹ç\f2./Class1.java\fP¤ÈƱ¤¸¤Ç¤¹¡£
++.RE
++.SH "´Ä¶­"
++.RS 3
++.TP 3
++CLASSPATH
++Javadoc¤¬¥æ¡¼¥¶¡¼¡¦¥¯¥é¥¹¤Î¥Õ¥¡¥¤¥ë¤òõ¤¹¤È¤­¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤹ¤ë´Ä¶­ÊÑ¿ô¤Ç¤¹¡£¤³¤Î´Ä¶­ÊÑ¿ô¤Ï¡¢\f2\-classpath\fP¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¥ª¡¼¥Ð¡¼¥é¥¤¥É¤µ¤ì¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¥³¥í¥ó¤Ç¶èÀÚ¤ê¤Þ¤¹¡£
++.:/home/classes:/usr/local/java/classes
++.RE
++.SH "´ØÏ¢¹àÌÜ"
++.RS 3
++.TP 2
++o
++javac(1)
++.TP 2
++o
++java(1)
++.TP 2
++o
++jdb(1)
++.TP 2
++o
++javah(1)
++.TP 2
++o
++javap(1)
++.TP 2
++o
++.na
++\f2Javadoc¤Î¥Û¡¼¥à¡¦¥Ú¡¼¥¸\fP @
++.fi
++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
++.TP 2
++o
++.na
++\f2¥¯¥é¥¹¡¦¥Ñ¥¹¤ÎÀßÄê\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general
++.TP 2
++o
++.na
++\f2javac¤Èjavadoc¤¬¥¯¥é¥¹¤ò¸¡º÷¤¹¤ëÊýË¡\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles(tools.jar)
++.RE
++
+--- ./jdk/src/bsd/doc/man/ja/javah.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/javah.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,120 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH javah 1 "07 May 2011"
++.TH javah 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++javah \- C¥Ø¥Ã¥À¡¼¤È¥¹¥¿¥Ö¡¦¥Õ¥¡¥¤¥ë¡¦¥¸¥§¥Í¥ì¡¼¥¿
++.LP
++.LP
++\f3javah\fP¤Ï¡¢Java¥¯¥é¥¹¤«¤éC¥Ø¥Ã¥À¡¼¡¦¥Õ¥¡¥¤¥ë¤ÈC¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢Java¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Ç½ñ¤«¤ì¤¿¥³¡¼¥É¤È¡¢C¤Ê¤É¤Î¤½¤Î¾¤Î¸À¸ì¤Ç½ñ¤«¤ì¤¿¥³¡¼¥É¤òÀܳ¤·¡¢¥³¡¼¥É¤¬Áê¸ß¤ËºîÍѤ¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++javah [ \fP\f3options\fP\f3 ] fully\-qualified\-classname. . .
++.fl
++\fP
++.fi
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3javah\fP¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¡¦¥á¥½¥Ã¥É¤ò¼ÂÁõ¤¹¤ë¤¿¤á¤ËɬÍפÊC¥Ø¥Ã¥À¡¼¤È¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ºîÀ®¤µ¤ì¤¿¥Ø¥Ã¥À¡¼¤È¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¡¦¥½¡¼¥¹¡¦¥³¡¼¥É¤«¤é¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô¤ò»²¾È¤¹¤ë¤¿¤á¤ËC¥×¥í¥°¥é¥à¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£.h¥Õ¥¡¥¤¥ë¤Ï¡¢Âбþ¤¹¤ë¥¯¥é¥¹¤È°ìÃפ¹¤ëÇÛÃÖ¤ò»ý¤Ä¹½Â¤ÂÎÄêµÁ¤ò´Þ¤ß¤Þ¤¹¡£¹½Â¤ÂΤΥե£¡¼¥ë¥É¤Ï¡¢¥¯¥é¥¹¤Î¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô¤ËÂбþ¤·¤Þ¤¹¡£
++.LP
++.LP
++¥Ø¥Ã¥À¡¼¡¦¥Õ¥¡¥¤¥ë¤È¤½¤ÎÃæ¤ÇÀë¸À¤µ¤ì¤ë¹½Â¤ÂΤÎ̾Á°¤Ï¥¯¥é¥¹¤Î̾Á°¤«¤éÇÉÀ¸¤·¤Þ¤¹¡£\f3javah\fP¤ËÅϤµ¤ì¤ë¥¯¥é¥¹¤¬¥Ñ¥Ã¥±¡¼¥¸¤ÎÃæ¤Ë¤¢¤ë¾ì¹ç¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ï¥Ø¥Ã¥À¡¼¡¦¥Õ¥¡¥¤¥ë̾¤È¹½Â¤ÂÎ̾¤ÎξÊý¤ËÉղ䵤ì¤Þ¤¹¡£²¼Àþ(_)¤¬Ì¾Á°¤Î¶èÀÚ¤êʸ»ú¤È¤·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\f3javah\fP¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¥ê¥¹¥È¤µ¤ì¤ë³Æ¥¯¥é¥¹¤Î¥Ø¥Ã¥À¡¼¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Õ¥¡¥¤¥ë¤òÃÖ¤­¤Þ¤¹¡£¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢\f2\-stubs\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£1¤Ä¤Î¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë¡¢¥ê¥¹¥È¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤Î·ë²Ì¤òÏ¢·ë¤¹¤ë¤Ë¤Ï¡¢\f2\-o\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++¿·¤·¤¤¥Í¥¤¥Æ¥£¥Ö¡¦¥á¥½¥Ã¥É¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤¢¤ëJava Native Interface(JNI)¤Ï¡¢¥Ø¥Ã¥À¡¼¾ðÊó¤Þ¤¿¤Ï¥¹¥¿¥Ö¡¦¥Õ¥¡¥¤¥ë¤òɬÍפȤ·¤Þ¤»¤ó¡£¸½ºß¤Ç¤Ï¡¢\f3javah\fP¤Ï¡¢JNI·Á¼°¤Î¥Í¥¤¥Æ¥£¥Ö¡¦¥á¥½¥Ã¥É¤ËɬÍפʥͥ¤¥Æ¥£¥Ö¡¦¥á¥½¥Ã¥Éµ¡Ç½¥×¥í¥È¥¿¥¤¥×¤òÀ¸À®¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢\f3javah\fP¤ÏJNI·Á¼°¤Ç½ÐÎϤµ¤ì¡¢¤½¤Î·ë²Ì¤Ï .h¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-o outputfile
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¥ê¥¹¥È¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤ËÂФ·¤Æ¡¢·ë²Ì¤Î¥Ø¥Ã¥À¡¼¤Þ¤¿¤Ï¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤òÏ¢·ë¤·¤Æ\f2outputfile\fP¤Ë³ÊǼ¤·¤Þ¤¹¡£\f3\-o\fP¤Þ¤¿¤Ï\f3\-d\fP¤Î¤É¤Á¤é¤«°ìÊý¤Î¤ß»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-ddirectory
++\f3javah\fP¤¬¥Ø¥Ã¥À¡¼¡¦¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥¹¥¿¥Ö¡¦¥Õ¥¡¥¤¥ë¤òÊݸ¤¹¤ë¡¢¥Ç¥£¥ì¥¯¥È¥ê¤òÀßÄꤷ¤Þ¤¹¡£\f3\-d\fP¤Þ¤¿¤Ï\f3\-o\fP¤Î¤É¤Á¤é¤«°ìÊý¤Î¤ß»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-stubs
++\f3javah\fP¤¬¡¢Java¥ª¥Ö¥¸¥§¥¯¥È¡¦¥Õ¥¡¥¤¥ë¤«¤éCÀë¸À¤òÀ¸À®¤·¤Þ¤¹¡£
++.TP 3
++\-verbose
++¾ÜºÙ½ÐÎϤò»ØÄꤷ¡¢ºîÀ®¥Õ¥¡¥¤¥ë¤Î¾õÂ֤˴ؤ¹¤ë¥á¥Ã¥»¡¼¥¸¤ò¡¢\f3javah\fP¤¬É¸½à½ÐÎϤ˽ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-help
++\f3javah\fP¤Î»ÈÍÑÊýË¡¤Ë¤Ä¤¤¤Æ¤Î¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-version
++\f3javah\fP¤Î¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-jni
++JNI·Á¼°¤Î¥Í¥¤¥Æ¥£¥Ö¡¦¥Õ¥¡¥¤¥ëµ¡Ç½¥×¥í¥È¥¿¥¤¥×¤ò´Þ¤à½ÐÎÏ¥Õ¥¡¥¤¥ë¤ò¡¢\f3javah\fP¤¬ºîÀ®¤·¤Þ¤¹¡£¤³¤ì¤Ïɸ½à½ÐÎϤǤ¢¤ë¤¿¤á¡¢\f3\-jni\fP¤Î»ÈÍѤϥª¥×¥·¥ç¥ó¤Ç¤¹¡£
++.TP 3
++\-classpath path
++¥¯¥é¥¹¤òõ¤¹¤¿¤á¤Ë\f3javah\fP¤¬»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Þ¤¿¤ÏCLASSPATH´Ä¶­ÊÑ¿ôÀßÄê¤ò¾å½ñ¤­¤·¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥³¥í¥ó¤Çʬ³ä¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2path\fP¤Î°ìÈÌ·Á¼°¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ .:<your_path>
++.fl
++\fP
++.fi
++¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ .:/home/avh/classes:/usr/local/java/classes
++.fl
++\fP
++.fi
++Êص¹¾å¡¢\f2*\fP¤Î¥Ù¡¼¥¹Ì¾¤ò´Þ¤à¥¯¥é¥¹¡¦¥Ñ¥¹Í×ÁǤϡ¢\f2.jar\fP¤Þ¤¿¤Ï\f2.JAR\fP¤ò³ÈÄ¥»Ò¤Ë»ý¤Ä¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ò»ØÄꤹ¤ë¤Î¤ÈƱÅù¤È¤ß¤Ê¤µ¤ì¤Þ¤¹(java¥×¥í¥°¥é¥à¤Ï¤³¤Î2¤Ä¤Î¸Æ½Ð¤·¤ò¶èÊ̤Ǥ­¤Ê¤¤)¡£
++.br
++.br
++¤¿¤È¤¨¤Ð¡¢¥Ç¥£¥ì¥¯¥È¥ê\f2foo\fP¤Ë\f2a.jar\fP¤È\f2b.JAR\fP¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¡¦¥Ñ¥¹Í×ÁÇ\f2foo/*\fP¤Ï\f2A.jar:b.JAR\fP¤ËŸ³«¤µ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢JAR¥Õ¥¡¥¤¥ë¤Î½çÈÖ¤Ï̤»ØÄê¤È¤Ê¤ê¤Þ¤¹¡£¤³¤Î¥ê¥¹¥È¤Ë¤Ï¡¢±£¤·¥Õ¥¡¥¤¥ë¤â´Þ¤á¡¢»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Þ¤¹¡£\f2*\fP¤Î¤ß¤«¤é¤Ê¤ë¥¯¥é¥¹¡¦¥Ñ¥¹¡¦¥¨¥ó¥È¥ê¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤ÎJAR¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ËŸ³«¤µ¤ì¤Þ¤¹¡£\f2CLASSPATH\fP´Ä¶­ÊÑ¿ô¤â¡¢ÄêµÁ»þ¤Ë¤ÏƱÍͤËŸ³«¤µ¤ì¤Þ¤¹¡£¥¯¥é¥¹¡¦¥Ñ¥¹¤Î¥ï¥¤¥ë¥É¥«¡¼¥ÉŸ³«¤Ïɬ¤º¡¢Java²¾ÁÛ¥Þ¥·¥ó¤Îµ¯Æ°Á°¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢´Ä¶­¤ËÌä¹ç¤»¤ò¹Ô¤ï¤Ê¤¤¸Â¤ê¡¢Java¥×¥í¥°¥é¥à¤¬Å¸³«¤µ¤ì¤Æ¤¤¤Ê¤¤¥ï¥¤¥ë¥É¥«¡¼¥É¤òǧ¼±¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢\f2System.getenv(\\"CLASSPATH\\")\fP¸Æ½Ð¤·¤¬¤½¤ÎÎã¤Ç¤¹¡£
++.TP 3
++\-bootclasspath path
++¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤ò¥í¡¼¥É¤¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\f2jre/lib/rt.jar\fP¤ª¤è¤Ó¾¤Î¤¤¤¯¤Ä¤«¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¡¢¥³¥¢Java 2¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ò¼ÂÁõ¤¹¤ë¥¯¥é¥¹¤Ç¤¹¡£
++.TP 3
++\-old
++¸Å¤¤JDK1.0·Á¼°¤Î¥Ø¥Ã¥À¡¼¡¦¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-force
++½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬¾ï¤Ë½ñ¤­¹þ¤Þ¤ì¤ë¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-Joption
++Java²¾ÁÛ¥Þ¥·¥ó¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£\f2option\fP¤Ë¤Ï¡¢java(1)¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò1¤Ä»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´Ä¶­ÊÑ¿ô"
++.LP
++.RS 3
++.TP 3
++CLASSPATH
++¥æ¡¼¥¶¡¼ÄêµÁ¥¯¥é¥¹¤Ø¤Î¥Ñ¥¹¤ò¥·¥¹¥Æ¥à¤Ë»ØÄꤷ¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥³¥í¥ó¤Çʬ³ä¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.nf
++\f3
++.fl
++.:/home/avh/classes:/usr/local/java/classes
++.fl
++\fP
++.fi
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.LP
++javac(1)¡¢java(1)¡¢jdb(1)¡¢javap(1)¡¢javadoc(1)
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/javap.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/javap.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,299 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH javap 1 "07 May 2011"
++.TH javap 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++javap \- Java¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ëµÕ¥¢¥»¥ó¥Ö¥é
++.LP
++.LP
++¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òµÕ¥¢¥»¥ó¥Ö¥ë¤·¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++javap [ \fP\f3options\fP\f3 ] classes
++.fl
++\fP
++.fi
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3javap\fP¥³¥Þ¥ó¥É¤Ï¡¢1¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òµÕ¥¢¥»¥ó¥Ö¥ë¤·¤Þ¤¹¡£¤½¤Î½ÐÎϤϻØÄꤹ¤ë¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê°Û¤Ê¤ê¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\f3javap\fP¤Ï¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¡¢ÅϤµ¤ì¤¿¥¯¥é¥¹¤Îprotected¤ª¤è¤Ópublic¤Î¥Õ¥£¡¼¥ë¥É¤È¥á¥½¥Ã¥É¤ò½ÐÎϤ·¤Þ¤¹¡£\f3javap\fP¤Ï¤½¤Î½ÐÎϤòɸ½à½ÐÎϤËɽ¼¨¤·¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++options
++¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¡£
++.TP 3
++classes
++Ãí¼á¤Î½èÍýÂоݤȤʤë1¤Ä°Ê¾å¤Î¥¯¥é¥¹\f2DocFooter.class\fP¤Ê¤É¤Î¥ê¥¹¥È(¶õÇò¶èÀÚ¤ê)¡£¥¯¥é¥¹¡¦¥Ñ¥¹¤Ç¸«¤Ä¤«¤ë¥¯¥é¥¹¤Ï¡¢¥Õ¥¡¥¤¥ë̾(\f2/home/user/myproject/src/DocFooter.class\fP¤Ê¤É)¤Þ¤¿¤ÏURL(\f2file:///home/user/myproject/src/DocFooter.class\fP¤Ê¤É)¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥¯¥é¥¹Àë¸À¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤È¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++import java.awt.*;
++.fl
++import java.applet.*;
++.fl
++
++.fl
++public class DocFooter extends Applet {
++.fl
++ String date;
++.fl
++ String email;
++.fl
++
++.fl
++ public void init() {
++.fl
++ resize(500,100);
++.fl
++ date = getParameter("LAST_UPDATED");
++.fl
++ email = getParameter("EMAIL");
++.fl
++ }
++.fl
++
++.fl
++ public void paint(Graphics g) {
++.fl
++ g.drawString(date + " by ",100, 15);
++.fl
++ g.drawString(email,290,15);
++.fl
++ }
++.fl
++}
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f3javap DocFooter.class\fP¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++Compiled from "DocFooter.java"
++.fl
++public class DocFooter extends java.applet.Applet {
++.fl
++ java.lang.String date;
++.fl
++ java.lang.String email;
++.fl
++ public DocFooter();
++.fl
++ public void init();
++.fl
++ public void paint(java.awt.Graphics);
++.fl
++}
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f3javap \-c DocFooter.class\fP¤¬¤â¤¿¤é¤¹½ÐÎϤϼ¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++Compiled from "DocFooter.java"
++.fl
++public class DocFooter extends java.applet.Applet {
++.fl
++ java.lang.String date;
++.fl
++
++.fl
++ java.lang.String email;
++.fl
++
++.fl
++ public DocFooter();
++.fl
++ Code:
++.fl
++ 0: aload_0
++.fl
++ 1: invokespecial #1 // Method java/applet/Applet."<init>":()V
++.fl
++ 4: return
++.fl
++
++.fl
++ public void init();
++.fl
++ Code:
++.fl
++ 0: aload_0
++.fl
++ 1: sipush 500
++.fl
++ 4: bipush 100
++.fl
++ 6: invokevirtual #2 // Method resize:(II)V
++.fl
++ 9: aload_0
++.fl
++ 10: aload_0
++.fl
++ 11: ldc #3 // String LAST_UPDATED
++.fl
++ 13: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
++.fl
++ 16: putfield #5 // Field date:Ljava/lang/String;
++.fl
++ 19: aload_0
++.fl
++ 20: aload_0
++.fl
++ 21: ldc #6 // String EMAIL
++.fl
++ 23: invokevirtual #4 // Method getParameter:(Ljava/lang/String;)Ljava/lang/String;
++.fl
++ 26: putfield #7 // Field email:Ljava/lang/String;
++.fl
++ 29: return
++.fl
++
++.fl
++ public void paint(java.awt.Graphics);
++.fl
++ Code:
++.fl
++ 0: aload_1
++.fl
++ 1: new #8 // class java/lang/StringBuilder
++.fl
++ 4: dup
++.fl
++ 5: invokespecial #9 // Method java/lang/StringBuilder."<init>":()V
++.fl
++ 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
++.fl
++ 17: invokevirtual #10 // Method java/lang/StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
++.fl
++ 20: invokevirtual #12 // Method java/lang/StringBuilder.toString:()Ljava/lang/String;
++.fl
++ 23: bipush 100
++.fl
++ 25: bipush 15
++.fl
++ 27: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
++.fl
++ 30: aload_1
++.fl
++ 31: aload_0
++.fl
++ 32: getfield #7 // Field email:Ljava/lang/String;
++.fl
++ 35: sipush 290
++.fl
++ 38: bipush 15
++.fl
++ 40: invokevirtual #13 // Method java/awt/Graphics.drawString:(Ljava/lang/String;II)V
++.fl
++ 43: return
++.fl
++}
++.fl
++\fP
++.fi
++
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-help \-\-help \-?
++\f3javap\fP¤Î¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-version
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-l
++¹ÔÈÖ¹æ¤È¥í¡¼¥«¥ëÊÑ¿ôɽ¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-public
++public¥¯¥é¥¹¤ª¤è¤Ó¥á¥ó¥Ð¡¼¤Î¤ßɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-protected
++protected¤ª¤è¤Ópublic¤Î¥¯¥é¥¹¤È¥á¥ó¥Ð¡¼¤Î¤ß¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-package
++package¡¢protected¡¢¤ª¤è¤Ópublic¤Î¥¯¥é¥¹¤È¥á¥ó¥Ð¡¼¤Î¤ßɽ¼¨¤·¤Þ¤¹¡£¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£
++.TP 3
++\-private \-p
++¤¹¤Ù¤Æ¤Î¥¯¥é¥¹¤È¥á¥ó¥Ð¡¼¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-Jflag
++¥é¥ó¥¿¥¤¥à¡¦¥·¥¹¥Æ¥à¤ËľÀÜ\f2flag\fP¤òÅϤ·¤Þ¤¹¡£»ÈÍÑÎã¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++javap \-J\-version
++.fl
++javap \-J\-Djava.security.manager \-J\-Djava.security.policy=MyPolicy MyClassName
++.fl
++\fP
++.fi
++.TP 3
++\-s
++ÆâÉô¤Î·¿¥·¥°¥Ë¥Á¥ã¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-sysinfo
++½èÍýÃæ¤Î¥¯¥é¥¹¤Î¥·¥¹¥Æ¥à¾ðÊó(¥Ñ¥¹¡¢¥µ¥¤¥º¡¢ÆüÉÕ¡¢MD5¥Ï¥Ã¥·¥å)¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-constants
++static finalÄê¿ô¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-c
++¥¯¥é¥¹¤Î³Æ¥á¥½¥Ã¥É¤Î¤¿¤á¤ËµÕ¥¢¥»¥ó¥Ö¥ë¤µ¤ì¤ë¥³¡¼¥É¡¢¤¹¤Ê¤ï¤ÁJava¥Ð¥¤¥È¥³¡¼¥É¤«¤é¤Ê¤ëÌ¿Îá¤òɽ¼¨¤·¤Þ¤¹¡£¤³¤ì¤é¤Ï
++.na
++\f2Java Virtual Machine Specification\fP @
++.fi
++http://docs.oracle.com/javase/specs/¤Ë¥É¥­¥å¥á¥ó¥È²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.TP 3
++\-verbose
++¥á¥½¥Ã¥É¤Î¥¹¥¿¥Ã¥¯¡¦¥µ¥¤¥º¡¢¤ª¤è¤Ó\f2locals\fP¤È\f2args\fP¤Î¿ô¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-classpath path
++\f3javap\fP¤¬¥¯¥é¥¹¤òõ¤¹¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Þ¤¿¤ÏCLASSPATH´Ä¶­ÊÑ¿ôÀßÄê¤ò¾å½ñ¤­¤·¤Þ¤¹¡£
++.TP 3
++\-bootclasspath path
++¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤ò¥í¡¼¥É¤¹¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\f2jre/lib/rt.jar\fP¤ª¤è¤Ó¾¤Î¤¤¤¯¤Ä¤«¤ÎJAR¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¡¢¥³¥¢Java¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ò¼ÂÁõ¤¹¤ë¥¯¥é¥¹¤Ç¤¹¡£
++.TP 3
++\-extdirs dirs
++¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿³ÈÄ¥µ¡Ç½¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£³ÈÄ¥µ¡Ç½¤Î¥Ç¥Õ¥©¥ë¥È°ÌÃÖ¤Ï\f2java.ext.dirs\fP¤Ç¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.LP
++javac(1)¡¢java(1)¡¢jdb(1)¡¢javah(1)¡¢javadoc(1)
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/javaws.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/javaws.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,204 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH javaws 1 "07 May 2011"
++.TH javaws 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++\f2javaws\fP¥³¥Þ¥ó¥É¥é¥¤¥ó
++.LP
++.SH "̾Á°"
++.LP
++.LP
++\f2javaws\fP \- Java Web Startµ¯Æ°¥³¥Þ¥ó¥É
++.LP
++.SH "·Á¼°"
++.LP
++.LP
++\f2javaws [run\-options] <jnlp>\fP
++.LP
++.LP
++\f2javaws [control\-options]\fP
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.LP
++\f2[run\-options]\fP
++.LP
++.LP
++¥³¥Þ¥ó¥É¥é¥¤¥ó¼Â¹Ô¥ª¥×¥·¥ç¥ó¡£¼Â¹Ô¥ª¥×¥·¥ç¥ó¤ÏǤ°Õ¤Î½ç½ø¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£³Æ¼ï¼Â¹Ô¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï¡¢¼¡¤Î¼Â¹Ô¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++\f2<jnlp>\fP
++.LP
++.LP
++JNLP(Java Network Launching Protocol)¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤Þ¤¿¤ÏURL(Uniform Resource Locator)¤Î¤É¤Á¤é¤«¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f2[control\-options]\fP
++.LP
++.LP
++¥³¥Þ¥ó¥É¥é¥¤¥óÀ©¸æ¥ª¥×¥·¥ç¥ó¡£À©¸æ¥ª¥×¥·¥ç¥ó¤ÏǤ°Õ¤Î½ç½ø¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£³Æ¼ïÀ©¸æ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï¡¢¼¡¤ÎÀ©¸æ¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f2javaws\fP¥³¥Þ¥ó¥É¤Ï¡¢JNLP(Java Network Launching Protocol)¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¼ÂÁõ¤Ç¤¢¤ëJava Web Start¤òµ¯Æ°¤·¤Þ¤¹¡£Java Web Start¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤ÇÆ°ºî¤¹¤ëJava¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Þ¤¿¤Ï¥¢¥×¥ì¥Ã¥È¤òµ¯Æ°¤·¤Þ¤¹¡£
++.LP
++.LP
++JNLP¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢\f2javaws\fP¤Ï¡¢¤½¤ÎJNLP¥Õ¥¡¥¤¥ë¤Ç»ØÄꤵ¤ì¤¿Java¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥¢¥×¥ì¥Ã¥È¤òµ¯Æ°¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2javaws\fPµ¯Æ°¥Ä¡¼¥ë¤Ë¤Ï¡¢¸½ºß¤Î¥ê¥ê¡¼¥¹¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë1ÁȤΥª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£¤¿¤À¤·¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¤Ïºï½ü¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "¼Â¹Ô¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++\f2\-offline\fP
++.LP
++.LP
++Java Web Start¤ò¥ª¥Õ¥é¥¤¥ó¡¦¥â¡¼¥É¤Ç¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-Xnosplash\fP
++.LP
++.LP
++½é´ü¥¹¥×¥é¥Ã¥·¥å²èÌ̤òɽ¼¨¤·¤Þ¤»¤ó¡£
++.LP
++.LP
++\f2\-open <arguments>\fP
++.LP
++.LP
++¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢JNLP¥Õ¥¡¥¤¥ëÆâ¤Î°ú¿ô¤¬\f2\-open<arguments>\fP¤ËÃÖ¤­´¹¤ï¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f2\-print <arguments>\fP
++.LP
++.LP
++¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢JNLP¥Õ¥¡¥¤¥ëÆâ¤Î°ú¿ô¤¬\f2\-print<arguments>\fP¤ËÃÖ¤­´¹¤ï¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f2\-online\fP
++.LP
++.LP
++¥ª¥ó¥é¥¤¥ó¡¦¥â¡¼¥É¤ò»ÈÍѤ·¤Þ¤¹(¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî)¡£
++.LP
++.LP
++\f2\-wait\fP
++.LP
++.LP
++¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢\f2javaws\fP¥×¥í¥»¥¹¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬½ªÎ»¤¹¤ë¤Þ¤Ç½ªÎ»¤·¤Þ¤»¤ó¡£Windows¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¾å¤Ç¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÀâÌÀ¤·¤¿¤È¤ª¤ê¤Ëµ¡Ç½¤·¤Þ¤»¤ó¡£
++.LP
++.LP
++\f2\-verbose\fP
++.LP
++.LP
++ÄɲäνÐÎϤòɽ¼¨¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-J<option>\fP
++.LP
++.LP
++VM¤ËÂФ¹¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++\f2\-system\fP
++.LP
++.LP
++¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥·¥¹¥Æ¥à¡¦¥­¥ã¥Ã¥·¥å¤Î¤ß¤«¤é¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.SH "À©¸æ¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++\f2\-viewer\fP
++.LP
++.LP
++Java¥³¥ó¥È¥í¡¼¥ë¡¦¥Ñ¥Í¥ë¤Ç¥­¥ã¥Ã¥·¥å¡¦¥Ó¥å¡¼¥¢¤òɽ¼¨¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-clearcache\fP
++.LP
++.LP
++¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤¹¤Ù¤Æ¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-userConfig <property name>\fP
++.LP
++.LP
++»ØÄꤵ¤ì¤¿¥Ç¥×¥í¥¤¥á¥ó¥È¡¦¥×¥í¥Ñ¥Æ¥£¤ò¥¯¥ê¥¢¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-userConfig <property name> <property value>\fP
++.LP
++.LP
++»ØÄꤵ¤ì¤¿¥Ç¥×¥í¥¤¥á¥ó¥È¡¦¥×¥í¥Ñ¥Æ¥£¤ò»ØÄꤵ¤ì¤¿ÃͤËÀßÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++\f2\-uninstall\fP
++.LP
++.LP
++¥­¥ã¥Ã¥·¥å¤«¤é¤¹¤Ù¤Æ¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òºï½ü¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-uninstall <jnlp>\fP
++.LP
++.LP
++¥­¥ã¥Ã¥·¥å¤«¤é¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òºï½ü¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-import [import\-options] <jnlp>\fP
++.LP
++.LP
++¥­¥ã¥Ã¥·¥å¤Ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¡£
++.LP
++.SH "¥¤¥ó¥Ý¡¼¥È¡¦¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++\f2\-silent\fP
++.LP
++.LP
++¥µ¥¤¥ì¥ó¥È¡¦¥â¡¼¥É¤Ç¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹(¥æ¡¼¥¶¡¼¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó)¡£
++.LP
++.LP
++\f2\-system\fP
++.LP
++.LP
++¥·¥¹¥Æ¥à¡¦¥­¥ã¥Ã¥·¥å¤Ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-codebase <url>\fP
++.LP
++.LP
++»ØÄꤷ¤¿codebase¤«¤é¥ê¥½¡¼¥¹¤ò¼èÆÀ¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-shortcut\fP
++.LP
++.LP
++¥æ¡¼¥¶¡¼¤¬¥×¥í¥ó¥×¥È¤Çµö²Ä¤·¤¿¾ì¹ç¤Î¤è¤¦¤Ë¥·¥ç¡¼¥È¥«¥Ã¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2\-silent\fP¥ª¥×¥·¥ç¥ó¤â»ÈÍѤ·¤Ê¤¤¤È¸ú²Ì¤¬¤¢¤ê¤Þ¤»¤ó¡£
++.LP
++.LP
++\f2\-association\fP
++.LP
++.LP
++¥æ¡¼¥¶¡¼¤¬¥×¥í¥ó¥×¥È¤Çµö²Ä¤·¤¿¾ì¹ç¤Î¤è¤¦¤Ë¥¢¥½¥·¥¨¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2\-silent\fP¥ª¥×¥·¥ç¥ó¤â»ÈÍѤ·¤Ê¤¤¤È¸ú²Ì¤¬¤¢¤ê¤Þ¤»¤ó¡£
++.LP
++.SH "¥Õ¥¡¥¤¥ë"
++.LP
++.LP
++¥æ¡¼¥¶¡¼¡¦¥­¥ã¥Ã¥·¥å¡¢¥·¥¹¥Æ¥à¡¦¥­¥ã¥Ã¥·¥å¤ª¤è¤Ódeployment.properties¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¤Ï¡¢
++.na
++\f2¥·¥¹¥Æ¥à¡¦¥ì¥Ù¥ë¤ª¤è¤Ó¥æ¡¼¥¶¡¼¡¦¥ì¥Ù¥ë¤Î¥×¥í¥Ñ¥Æ¥£\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "¾ÜºÙ¾ðÊó"
++.LP
++.LP
++Java Web Start¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2Java Web Start\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/index.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/src/bsd/doc/man/ja/jcmd.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -0,0 +1,118 @@
++." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
++." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++."
++." This code is free software; you can redistribute it and/or modify it
++." under the terms of the GNU General Public License version 2 only, as
++." published by the Free Software Foundation.
++."
++." This code is distributed in the hope that it will be useful, but WITHOUT
++." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++." version 2 for more details (a copy is included in the LICENSE file that
++." accompanied this code).
++."
++." You should have received a copy of the GNU General Public License version
++." 2 along with this work; if not, write to the Free Software Foundation,
++." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++."
++." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++." or visit www.oracle.com if you need additional information or have any
++." questions.
++."
++.TH jcmd 1 "05 Jul 2012"
++
++.LP
++.SH "̾Á°"
++jcmd \- ¿ÇÃÇ¥³¥Þ¥ó¥É
++.LP
++.LP
++\f3jcmd\fP¤Ï¡¢¼Â¹ÔÃæ¤ÎJava²¾ÁÛ¥Þ¥·¥ó¤Ë¿ÇÃÇ¥³¥Þ¥ó¥É¡¦¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®¤¹¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++ \fP\f3jcmd\fP [ option ]
++.fl
++ \f3jcmd\fP <\f2pid\fP | \f2main class\fP> PerfCounter.print
++.fl
++ \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \f2command\fP [\f2arguments\fP]
++.fl
++ \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \-f \f2file\fP
++.fl
++.fi
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jcmd\fP¤Ï¡¢¤³¤Îµ¡Ç½¤ò¥µ¥Ý¡¼¥È¤¹¤ëJava²¾ÁÛ¥Þ¥·¥ó¤Ë¿ÇÃÇ¥³¥Þ¥ó¥É¡¦¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®¤¹¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹¡£
++.LP
++.LP
++°ú¿ô¤Ê¤·¤Þ¤¿¤Ï\-l¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æjcmd¤ò»ÈÍѤ¹¤ë¤È¡¢¼Â¹ÔÃæ¤ÎJava¥×¥í¥»¥¹¤¬¥×¥í¥»¥¹ID¡¢¥á¥¤¥ó¡¦¥¯¥é¥¹¤ª¤è¤Ó¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤È¤È¤â¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++¥×¥í¥»¥¹ID¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤹ¤ë¤È¡¢jcmd¤Ç¤Ï¡¢¤³¤ÎID¤Î¥×¥í¥»¥¹¤Ë¿ÇÃÇ¥³¥Þ¥ó¥É¡¦¥ê¥¯¥¨¥¹¥È¤¬Á÷¿®¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++¥á¥¤¥ó¡¦¥¯¥é¥¹¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤹ¤ë¤È¡¢jcmd¤Ç¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤¬Java¥×¥í¥»¥¹¤Î¥á¥¤¥ó¡¦¥¯¥é¥¹¤ÎÉôʬʸ»úÎó¤Ç¤¢¤ë¤¹¤Ù¤Æ¤ÎJava¥×¥í¥»¥¹¤Ë¿ÇÃÇ¥³¥Þ¥ó¥É¡¦¥ê¥¯¥¨¥¹¥È¤¬Á÷¿®¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++PerfCounter.print°ú¿ô¤ò»ØÄꤹ¤ë¤È¡¢jcmd¤Ç¤Ï¡¢¥¿¡¼¥²¥Ã¥È¤ÎJava¥×¥í¥»¥¹¤Ç»ÈÍѲÄǽ¤Ê¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¡¦¥«¥¦¥ó¥¿¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\-f ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢jcmd¤Ç¤Ï¡¢\f2file\fP¤ËÊݸ¤µ¤ì¤Æ¤¤¤ë¿ÇÃÇ¥³¥Þ¥ó¥É¤¬¥¿¡¼¥²¥Ã¥È¤ÎJava¥×¥í¥»¥¹¤ËÁ÷¿®¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++³Æ¥ª¥×¥·¥ç¥ó¤Ï¸ß¤¤¤ËÇÓ¾Ū¤Ç¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É̾¤Îľ¸å¤Ëµ­½Ò¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.RS 3
++.TP 3
++\-l
++¼Â¹ÔÃæ¤ÎJava¥×¥í¥»¥¹¤Î°ìÍ÷¤¬¥×¥í¥»¥¹ID¡¢¥á¥¤¥ó¡¦¥¯¥é¥¹¤ª¤è¤Ó¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤È¤È¤â¤Ë½ÐÎϤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-h
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-help
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++pid
++¿ÇÃÇ¥³¥Þ¥ó¥É¡¦¥ê¥¯¥¨¥¹¥È¤ò¼õ¿®¤¹¤ë¥×¥í¥»¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥×¥í¥»¥¹¤ÏJava¥×¥í¥»¥¹¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Þ¥·¥ó¾å¤Ç¼Â¹Ô¤·¤Æ¤¤¤ëJava¥×¥í¥»¥¹¤Î°ìÍ÷¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¡¢jps(1)¤Þ¤¿¤Ïjcmd(1)¤ò»ÈÍѤ·¤Þ¤¹¡£
++.TP 3
++main class
++¿ÇÃÇ¥³¥Þ¥ó¥É¡¦¥ê¥¯¥¨¥¹¥È¤ò¼õ¿®¤¹¤ë¥×¥í¥»¥¹¤Î¥á¥¤¥ó¡¦¥¯¥é¥¹¤Ç¤¹¡£¥×¥í¥»¥¹¤ò¾È¹ç¤¹¤ëºÝ¤Ë¤Ï¡¢»ØÄꤵ¤ì¤¿Ê¸»úÎ󤬥ᥤ¥ó¡¦¥¯¥é¥¹Ì¾¤ËÉôʬʸ»úÎó¤È¤·¤Æ´Þ¤Þ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥»¥¹¤¬°ìÃפ·¤¿¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£¤¤¤¯¤Ä¤«¤Î¼Â¹ÔÃæ¤ÎJava¥×¥í¥»¥¹¤¬¤³¤Î¥á¥¤¥ó¡¦¥¯¥é¥¹¤ò¶¦Í­¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤ì¤é¤¹¤Ù¤Æ¤Î¥×¥í¥»¥¹¤Ë¿ÇÃÇ¥³¥Þ¥ó¥É¡¦¥ê¥¯¥¨¥¹¥È¤¬Á÷¿®¤µ¤ì¤Þ¤¹¡£¥Þ¥·¥ó¾å¤Ç¼Â¹Ô¤·¤Æ¤¤¤ëJava¥×¥í¥»¥¹¤Î°ìÍ÷¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¡¢jps(1)¤Þ¤¿¤Ïjcmd(1)¤ò»ÈÍѤ·¤Þ¤¹¡£
++.TP 3
++command [arguments]
++\f2command\fP¤È¤¤¤¦Ì¾Á°¤Î¿ÇÃÇ¥³¥Þ¥ó¥É¤ò¥¿¡¼¥²¥Ã¥È¤ÎJava¥×¥í¥»¥¹¤ËÂФ·¤Æµ¯Æ°¤·¤Þ¤¹¡£»ØÄꤷ¤¿¥×¥í¥»¥¹¤Ç»ÈÍѤǤ­¤ë¿ÇÃÇ¥³¥Þ¥ó¥É¤Î¥ê¥¹¥È¤Ï¡¢¤³¤Î¥×¥í¥»¥¹¤ËÂФ·¤Æ\f3help\fP¥³¥Þ¥ó¥É¤ò¸Æ¤Ó½Ð¤»¤Ðɽ¼¨¤µ¤ì¤Þ¤¹¡£³Æ¿ÇÃÇ¥³¥Þ¥ó¥É¤Ë¤ÏÆȼ«¤Î\f2arguments\fP¤Î¥»¥Ã¥È¤¬¤¢¤ê¡¢¥³¥Þ¥ó¥É̾¤Î¸å¤Ë\f3help\fP¤ò»ØÄꤷ¤Æ¸Æ¤Ó½Ð¤»¤Ðɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.TP 3
++PerfCounter.print
++¥¿¡¼¥²¥Ã¥È¤ÎJava¥×¥í¥»¥¹¤Ç»ÈÍѲÄǽ¤Ê¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¡¦¥«¥¦¥ó¥¿¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¡¦¥«¥¦¥ó¥¿¤Î¥ê¥¹¥È¤ÏJava¥×¥í¥»¥¹¤Ë¤è¤Ã¤Æ°Û¤Ê¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-f file
++\f2file\fP¤«¤é¥³¥Þ¥ó¥É¤òÆɤ߼è¤Ã¤Æ¡¢¥¿¡¼¥²¥Ã¥È¤ÎJava¥×¥í¥»¥¹¤Ç¸Æ¤Ó½Ð¤·¤Þ¤¹¡£\f2file\fP¤Ç¤Ï¡¢³Æ¥³¥Þ¥ó¥É¤ò1¹Ô¤Ëµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£#¤Ç»Ï¤Þ¤ë¹Ô¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¹Ô¤¬¸Æ¤Ó½Ð¤µ¤ì¤ë¤«¡¢\f3stop\fP¥­¡¼¥ï¡¼¥É¤ò´Þ¤à¹Ô¤¬Æɤ߼è¤é¤ì¤ë¤È¡¢\f2file\fP¤Î½èÍý¤¬½ªÎ»¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++jps(1)
++.RE
++
++.LP
++.LP
++jps(1)
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jconsole.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jconsole.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,138 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jconsole 1 "07 May 2011"
++.TH jconsole 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jconsole \- Java´Æ»ë¤ª¤è¤Ó´ÉÍý¥³¥ó¥½¡¼¥ë
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jconsole\fP [ \f2options\fP ] [ connection ... ]
++.fl
++
++.fl
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++options
++¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É̾¤Îľ¸å¤Ëµ­½Ò¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++connection = pid | host:port | jmxUrl
++.RS 3
++.TP 2
++o
++\f2pid\fP¥í¡¼¥«¥ë¤ÎJava VM¤Î¥×¥í¥»¥¹ID¡£Java VM¤Ï¡¢jconsole¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥æ¡¼¥¶¡¼ID¤ÈƱ¤¸¥æ¡¼¥¶¡¼ID¤ò»ÈÍѤ·¤Æ¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2JMX¤Î´Æ»ë¤ª¤è¤Ó´ÉÍý\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 2
++o
++\f2host\fP:\f2port\fP: Java VM¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥Û¥¹¥È¡¦¥·¥¹¥Æ¥à¤Î̾Á°¤È¡¢Java VM¤òµ¯Æ°¤·¤¿¤È¤­¤Ë¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£\f2com.sun.management.jmxremote.port\fP¤Ç»ØÄꤷ¤¿¥Ý¡¼¥ÈÈֹ档¾ÜºÙ¤Ï¡¢
++.na
++\f2JMX¤Î´Æ»ë¤ª¤è¤Ó´ÉÍý\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 2
++o
++\f2jmxUrl\fP:
++.na
++\f2JMXServiceURL\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤ëÀܳÀè¤ÎJMX¥¨¡¼¥¸¥§¥ó¥È¤Î¥¢¥É¥ì¥¹¡£
++.RE
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jconsole\fP¥³¥Þ¥ó¥É¤Ï¡¢¥í¡¼¥«¥ë¡¦¥Þ¥·¥ó¤Þ¤¿¤Ï¥ê¥â¡¼¥È¡¦¥Þ¥·¥ó¾å¤ÎJava¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È²¾ÁÛ¥Þ¥·¥ó¤Î´Æ»ë¤È´ÉÍý¤ò¹Ô¤¦¥°¥é¥Õ¥£¥«¥ë¡¦¥³¥ó¥½¡¼¥ë¡¦¥Ä¡¼¥ë¤òµ¯Æ°¤·¤Þ¤¹¡£
++.LP
++.LP
++Windows¾å¤Ç¤Ï¡¢\f3jconsole\fP¤Ï¥³¥ó¥½¡¼¥ë¡¦¥¦¥£¥ó¥É¥¦¤È´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤»¤ó¡£¤¿¤À¤·¡¢¤Ê¤ó¤é¤«¤ÎÍýͳ¤Ç\f3jconsole\fP¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤¹¤ë¤È¡¢¥¨¥é¡¼¾ðÊó¤ò¼¨¤¹¥À¥¤¥¢¥í¥°¡¦¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-interval=n
++¹¹¿·´Ö³Ö¤ò\f2n\fPÉäËÀßÄꤷ¤Þ¤¹(¥Ç¥Õ¥©¥ë¥È¤Ï4ÉÃ)¡£
++.TP 3
++\-notile
++ºÇ½é¤Ë¥¦¥£¥ó¥É¥¦¤ò¥¿¥¤¥ê¥ó¥°¤·¤Þ¤»¤ó(Ê£¿ôÀܳ¤Î¾ì¹ç)¡£
++.TP 3
++\-pluginpath plugins
++JConsole¥×¥é¥°¥¤¥ó¤Î¸¡º÷Àè¤È¤Ê¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Þ¤¿¤ÏJAR¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£\f2plugins\fP¥Ñ¥¹¤Ë¤Ï¡¢¼¡¤Î̾Á°¤Î¥×¥í¥Ð¥¤¥À¹½À®¥Õ¥¡¥¤¥ë¤ò´Þ¤á¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.nf
++\f3
++.fl
++ META\-INF/services/com.sun.tools.jconsole.JConsolePlugin
++.fl
++\fP
++.fi
++¤³¤ì¤Ë¤Ï¡¢
++.na
++\f2com.sun.tools.jconsole.JConsolePlugin\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html¥¯¥é¥¹¤ò¼ÂÁõ¤¹¤ë¥¯¥é¥¹¤Î´°Á´½¤¾þ¥¯¥é¥¹Ì¾¤ò»ØÄꤹ¤ë¹Ô¤¬¡¢¥×¥é¥°¥¤¥ó¤´¤È¤Ë1¹Ô¤º¤Ä´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
++.TP 3
++\-version
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-help
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-J<flag>
++jconsole¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ëJava²¾ÁÛ¥Þ¥·¥ó¤Ë<flag>¤òÅϤ·¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++.na
++\f2JConsole¤Î»ÈÍÑ\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html
++.TP 2
++o
++.na
++\f2Java¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î´Æ»ë¤ª¤è¤Ó´ÉÍý\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/management/index.html
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jdb.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jdb.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,312 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jdb 1 "07 May 2011"
++.TH jdb 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jdb \- Java¥Ç¥Ð¥Ã¥¬
++.LP
++.LP
++\f3jdb\fP¤Ï¡¢Java¸À¸ì¥×¥í¥°¥é¥à¤Î¥Ð¥°¤ò¸«¤Ä¤±¤Æ½¤Àµ¤¹¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ä¡¼¥ë¤Ç¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jdb\fP [ options ] [ class ] [ arguments ]
++.fl
++.fi
++
++.LP
++.RS 3
++.TP 3
++options
++¼¡¤Ë¼¨¤¹¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó
++.TP 3
++class
++¥Ç¥Ð¥Ã¥°¤ò³«»Ï¤¹¤ë¥¯¥é¥¹¤Î̾Á°
++.TP 3
++arguments
++\f2class\fP¤Î\f2main()\fP¥á¥½¥Ã¥É¤ËÅϤ¹°ú¿ô
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++Java¥Ç¥Ð¥Ã¥¬\f3jdb\fP¤Ï¡¢Java¥¯¥é¥¹ÍѤδÊñ¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Ç¥Ð¥Ã¥¬¤Ç¤¹¡£
++.na
++\f2Java Platform Debugger Architecture\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/index.html¤ò»ë³ÐŪ¤Ë¼Â¹Ô¤·¡¢¥í¡¼¥«¥ë¤Þ¤¿¤Ï¥ê¥â¡¼¥È¤ÎJava Virtual Machine¤Î¸¡ºº¤È¥Ç¥Ð¥Ã¥°¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++.SS
++jdb¥»¥Ã¥·¥ç¥ó¤Î³«»Ï
++.LP
++.LP
++jdb¥»¥Ã¥·¥ç¥ó¤ò³«»Ï¤¹¤ë¤Ë¤ÏÍÍ¡¹¤ÊÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£ºÇ¤âÉÑÈˤ˻ÈÍѤµ¤ì¤ë¤Î¤Ï¡¢¥Ç¥Ð¥Ã¥°¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥á¥¤¥ó¡¦¥¯¥é¥¹¤ò»ÈÍѤ·¤Æ¡¢\f3jdb\fP¤«¤é¿·¤·¤¤Java²¾ÁÛ¥Þ¥·¥ó(VM)¤òµ¯Æ°¤¹¤ëÊýË¡¤Ç¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¡¢\f3java\fP¤Î¤«¤ï¤ê¤Ë\f3jdb\fP¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥á¥¤¥ó¡¦¥¯¥é¥¹¤¬MyClass¤Î¾ì¹ç¤Ï¡¢JDB´Ä¶­¤Ç¥Ç¥Ð¥Ã¥°¤¹¤ë¤È¤­¤Ë¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ % jdb MyClass
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤ÎÊýË¡¤Çµ¯Æ°¤¹¤ë¤È¡¢\f3jdb\fP¤Ï¡¢»ØÄꤵ¤ì¤¿¥Ñ¥é¥á¡¼¥¿¤ò»ÈÍѤ·¤Æ2¤ÄÌܤÎJava VM¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹¡£¼¡¤Ë¡¢»ØÄꤵ¤ì¤¿¥¯¥é¥¹¤ò¥í¡¼¥É¤·¤Æ¡¢¥¯¥é¥¹¤ÎºÇ½é¤ÎÌ¿Îá¤ò¼Â¹Ô¤¹¤ëÁ°¤ËVM¤òÄä»ß¤µ¤»¤Þ¤¹¡£
++.LP
++.LP
++\f3jdb\fP¤Î¤â¤¦1¤Ä¤Î»ÈÍÑÊýË¡¤Ï¡¢¤¹¤Ç¤Ë¼Â¹ÔÃæ¤ÎJava VM¤Ëjdb¤òÀܳ¤¹¤ë¤³¤È¤Ç¤¹¡£jdb¤¬Àܳ¤¹¤ëVM¤ò¡¢¤½¤Î¼Â¹ÔÃæ¤Ëµ¯Æ°¤¹¤ë¤¿¤á¤Î¹½Ê¸¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥¤¥ó¥×¥í¥»¥¹¡¦¥Ç¥Ð¥Ã¥°Íѥ饤¥Ö¥é¥ê¤ò¥í¡¼¥É¤·¡¢Àܳ¤Î¼ïÎà¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\-agentlib:jdwp=transport=dt_socket,server=y,suspend=n
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢MyClass¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤·¤Æ¡¢\f3jdb\fP¤¬¤¢¤È¤Ç¤½¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ËÀܳ¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ % java \-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n MyClass
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢\f3jdb\fP¤òVM¤ËÀܳ¤Ç¤­¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ % jdb \-attach 8000
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤Î¾ì¹ç¡¢\f3jdb\fP¤Ï¿·¤·¤¤VM¤òµ¯Æ°¤¹¤ë¤«¤ï¤ê¤Ë´û¸¤ÎVM¤ËÀܳ¤µ¤ì¤ë¤¿¤á¡¢\f3jdb\fP¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤Ï¡ÖMyClass¡×¤Ï»ØÄꤷ¤Þ¤»¤ó¡£
++.LP
++.LP
++¥Ç¥Ð¥Ã¥¬¤òVM¤ËÀܳ¤¹¤ë¤Ë¤Ï¾¤Ë¤âÍÍ¡¹¤ÊÊýË¡¤¬¤¢¤ê¡¢¤¹¤Ù¤Æ\f3jdb\fP¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Àܳ¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢Java Platform Debugger Architecture¤Î
++.na
++\f2¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\f3jdb\fP¤Ç»ÈÍѤ¹¤ë¤¿¤á¤ËJ2SE 1.4.2°ÊÁ°¤ÎVM¤òµ¯Æ°¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
++.na
++\f21.4.2¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://docs.oracle.com/javase/1.4.2/docs/guide/jpda/conninv.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SS
++´ðËÜjdb¥³¥Þ¥ó¥É
++.LP
++.LP
++´ðËÜŪ¤Ê\f3jdb\fP¥³¥Þ¥ó¥É¤Î°ìÍ÷¤ò¼¨¤·¤Þ¤¹¡£Java¥Ç¥Ð¥Ã¥¬¤¬¥µ¥Ý¡¼¥È¤¹¤ë¥³¥Þ¥ó¥É¤Ï¤³¤ì°Ê³°¤Ë¤â¤¢¤ê¡¢¤½¤ì¤é¤Ï\f3jdb\fP¤Î\f2help\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æɽ¼¨¤Ç¤­¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++help¤Þ¤¿¤Ï?
++ºÇ¤â½ÅÍפÊ\f3jdb\fP¥³¥Þ¥ó¥É\f2help\fP¤Ï¡¢Ç§¼±¤µ¤ì¤¿¥³¥Þ¥ó¥É¤Î¥ê¥¹¥È¤Ë´Ê·é¤ÊÀâÌÀ¤òÉÕ¤±¤Æɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++run
++\f3jdb\fP¤òµ¯Æ°¤·¤ÆɬÍפʥ֥졼¥¯¥Ý¥¤¥ó¥È¤òÀßÄꤷ¤¿¤¢¤È¤Ë¡¢¤³¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢¥Ç¥Ð¥Ã¥°¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¼Â¹Ô¤ò³«»Ï¤Ç¤­¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢´û¸¤ÎVM¤ËÀܳ¤·¤Æ¤¤¤ë¾ì¹ç¤È¤Ï°Û¤Ê¤ê¡¢¥Ç¥Ð¥Ã¥°¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬\f3jdb\fP¤«¤éµ¯Æ°¤·¤¿¤È¤­¤Ë¤Î¤ß»ÈÍѤǤ­¤Þ¤¹¡£
++.TP 3
++cont
++¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¡¢Îã³°¡¢¤Þ¤¿¤Ï¥¹¥Æ¥Ã¥×¼Â¹Ô¤Î¸å¤Ç¡¢¥Ç¥Ð¥Ã¥°¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¼Â¹Ô¤ò·Ñ³¤·¤Þ¤¹¡£
++.TP 3
++print
++Java¥ª¥Ö¥¸¥§¥¯¥È¤ª¤è¤Ó¥×¥ê¥ß¥Æ¥£¥ÖÃͤòɽ¼¨¤·¤Þ¤¹¡£¥×¥ê¥ß¥Æ¥£¥Ö·¿¤ÎÊÑ¿ô¤Þ¤¿¤Ï¥Õ¥£¡¼¥ë¥É¤Î¾ì¹ç¤Ë¤Ï¡¢¼ÂºÝ¤ÎÃͤ¬½ÐÎϤµ¤ì¤Þ¤¹¡£¥ª¥Ö¥¸¥§¥¯¥È¤Î¾ì¹ç¤Ë¤Ï¡¢Ã»¤¤ÀâÌÀ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¥ª¥Ö¥¸¥§¥¯¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢°Ê¹ß¤Î\f2dump\fP¥³¥Þ¥ó¥É¤ÎÀâÌÀ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++\f2Ãí°Õ: ¥í¡¼¥«¥ëÊÑ¿ô¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¤½¤ÎÊÑ¿ô¤ò´Þ¤à¥¯¥é¥¹¤¬\fP\f2javac(1)\fP\f2 \fP\f2\-g\fP¥ª¥×¥·¥ç¥ó¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++\f2print\fP¤Ç¤Ï¡¢¥á¥½¥Ã¥É¤Î¸Æ½Ð¤·¤ò´Þ¤à¿¿ô¤Î´Êñ¤ÊJava¼°¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f2print MyClass.myStaticField\fP
++.TP 2
++o
++\f2print myObj.myInstanceField\fP
++.TP 2
++o
++\f2print i+j+k\fP \f2(i¡¢j¡¢¤ª¤è¤Ók¤Ï¥×¥ê¥ß¥Æ¥£¥Ö¤Ç¤¢¤ê¡¢¥Õ¥£¡¼¥ë¥É¤Þ¤¿¤Ï¥í¡¼¥«¥ëÊÑ¿ô¤Î¤¤¤º¤ì¤«)\fP
++.TP 2
++o
++\f2print myObj.myMethod()\fP \f2(myMethod¤¬null°Ê³°¤òÊÖ¤¹¾ì¹ç)\fP
++.TP 2
++o
++\f2print new java.lang.String("Hello").length()\fP
++.RE
++.TP 3
++dump
++¥×¥ê¥ß¥Æ¥£¥ÖÃͤξì¹ç¤Ë¤Ï¡¢¤³¤Î¥³¥Þ¥ó¥É¤Ï\f2print\fP¤ÈƱ¤¸¤Ç¤¹¡£¥ª¥Ö¥¸¥§¥¯¥È¤Î¾ì¹ç¤Ë¤Ï¡¢¥ª¥Ö¥¸¥§¥¯¥ÈÆâ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤ë³Æ¥Õ¥£¡¼¥ë¥É¤Î¸½ºß¤ÎÃͤ¬½ÐÎϤµ¤ì¤Þ¤¹¡£static¥Õ¥£¡¼¥ë¥É¤Èinstance¥Õ¥£¡¼¥ë¥É¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.br
++.br
++\f2dump\fP¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\f2print\fP¥³¥Þ¥ó¥É¤ÈƱ¤¸¼°¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤¹¡£
++.TP 3
++threads
++¸½ºß¼Â¹ÔÃæ¤Î¥¹¥ì¥Ã¥É¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£¥¹¥ì¥Ã¥É¤´¤È¤Ë¡¢Ì¾Á°¤È¸½ºß¤Î¾õÂÖ¡¢¤ª¤è¤Ó¾¤Î¥³¥Þ¥ó¥É¤Ë»ÈÍѤǤ­¤ë¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++4. (java.lang.Thread)0x1 main running
++.fl
++\fP
++.fi
++¤³¤ÎÎã¤Ç¤Ï¡¢¥¹¥ì¥Ã¥É¡¦¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ï4¤Ç¤¢¤ê¡¢¥¹¥ì¥Ã¥É¤Ïjava.lang.Thread¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ç¤¹¡£¥¹¥ì¥Ã¥É¤Î̾Á°¤Ï¡Ömain¡×¤Ç¤¢¤ê¡¢¸½ºß¼Â¹ÔÃæ¤Ç¤¹¡£
++.TP 3
++thread
++¸½ºß¤Î¥¹¥ì¥Ã¥É¤Ë¤¹¤ë¥¹¥ì¥Ã¥É¤òÁªÂò¤·¤Þ¤¹¡£Â¿¤¯¤Î\f3jdb\fP¥³¥Þ¥ó¥É¤Ï¡¢¸½ºß¤Î¥¹¥ì¥Ã¥É¤ÎÀßÄê¤Ë´ð¤Å¤¤¤Æ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¥¹¥ì¥Ã¥É¤Ï¡¢\f2threads\fP¥³¥Þ¥ó¥É¤ÇÀâÌÀ¤·¤¿¥¹¥ì¥Ã¥É¡¦¥¤¥ó¥Ç¥Ã¥¯¥¹¤È¤È¤â¤Ë»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++where
++°ú¿ô¤ò»ØÄꤷ¤Ê¤¤¤Ç\f2where\fP¤ò¼Â¹Ô¤¹¤ë¤È¡¢¸½ºß¤Î¥¹¥ì¥Ã¥É¤Î¥¹¥¿¥Ã¥¯¤¬¥À¥ó¥×¤µ¤ì¤Þ¤¹¡£\f2where all\fP¥³¥Þ¥ó¥É¤Ï¡¢¸½ºß¤Î¥¹¥ì¥Ã¥É¡¦¥°¥ë¡¼¥×¤Ë¤¢¤ë¥¹¥ì¥Ã¥É¤Î¥¹¥¿¥Ã¥¯¤ò¤¹¤Ù¤Æ¥À¥ó¥×¤·¤Þ¤¹¡£\f2where\fP \f2threadindex\fP¤Ï¡¢»ØÄꤵ¤ì¤¿¥¹¥ì¥Ã¥É¤Î¥¹¥¿¥Ã¥¯¤ò¥À¥ó¥×¤·¤Þ¤¹¡£
++.br
++.br
++¸½ºß¤Î¥¹¥ì¥Ã¥É¤¬(¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤«\f2suspend\fP¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ)ÃæÃǤ·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥í¡¼¥«¥ëÊÑ¿ô¤È¥Õ¥£¡¼¥ë¥É¤Ï\f2print\fP¥³¥Þ¥ó¥É¤È\f2dump\fP¥³¥Þ¥ó¥É¤Çɽ¼¨¤Ç¤­¤Þ¤¹¡£\f2up\fP¥³¥Þ¥ó¥É¤È\f2down\fP¥³¥Þ¥ó¥É¤Ç¡¢¤É¤Î¥¹¥¿¥Ã¥¯¡¦¥Õ¥ì¡¼¥à¤ò¥«¥ì¥ó¥È¤Ë¤¹¤ë¤«¤òÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È
++.LP
++.LP
++¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤Ï¡¢¹ÔÈÖ¹æ¤Þ¤¿¤Ï¥á¥½¥Ã¥É¤ÎºÇ½é¤ÎÌ¿Îá¤Ç\f3jdb\fP¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++\f2stop at MyClass:22\fP \f2(MyClass¤¬´Þ¤Þ¤ì¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î22¹ÔÌܤκǽé¤ÎÌ¿Îá¤Ë¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤òÀßÄê)\fP
++.TP 2
++o
++\f2stop in java.lang.String.length\fP \f2(\fP\f2java.lang.String.length\fP¥á¥½¥Ã¥É¤ÎºÇ½é¤Ë¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤òÀßÄê)
++.TP 2
++o
++\f2stop in MyClass.<init>\fP \f2(<init>¤ÏMyClass¥³¥ó¥¹¥È¥é¥¯¥¿¤ò¼±ÊÌ)\fP
++.TP 2
++o
++\f2stop in MyClass.<clinit>\fP \f2(<clinit>¤ÏMyClass¤ÎÀÅŪ½é´ü²½¥³¡¼¥É¤ò¼±ÊÌ)\fP
++.RE
++
++.LP
++.LP
++¥á¥½¥Ã¥É¤¬¥ª¡¼¥Ð¡¼¥í¡¼¥É¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¥á¥½¥Ã¥É¤Î°ú¿ô¤Î·¿¤â»ØÄꤷ¤Æ¡¢¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤ËÂФ·¤ÆŬÀڤʥ᥽¥Ã¥É¤¬ÁªÂò¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¡Ö\f2MyClass.myMethod(int,java.lang.String)\fP¡×¤Þ¤¿¤Ï¡Ö\f2MyClass.myMethod()\fP¡×¤È»ØÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++\f2clear\fP¥³¥Þ¥ó¥É¤Ï¡¢¡Ö\f2clear\ MyClass:45\fP¡×¤Î¤è¤¦¤Ê¹½Ê¸¤ò»ÈÍѤ·¤Æ¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤òºï½ü¤·¤Þ¤¹¡£\f2clear\fP¤ò»ÈÍѤ¹¤ë¤«¡¢°ú¿ô¤ò»ØÄꤷ¤Ê¤¤¤Ç¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤È¡¢¸½ºßÀßÄꤵ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\f2cont\fP¥³¥Þ¥ó¥É¤Ï¼Â¹Ô¤ò·Ñ³¤·¤Þ¤¹¡£
++.LP
++.SS
++¥¹¥Æ¥Ã¥×¼Â¹Ô
++.LP
++.LP
++\f2step\fP¥³¥Þ¥ó¥É¤Ï¡¢¸½ºß¤Î¥¹¥¿¥Ã¥¯¡¦¥Õ¥ì¡¼¥à¤Þ¤¿¤Ï¸Æ¤Ó½Ð¤µ¤ì¤¿¥á¥½¥Ã¥ÉÆâ¤Ç¡¢¼¡¤Î¹Ô¤ò¼Â¹Ô¤·¤Þ¤¹¡£\f2next\fP¥³¥Þ¥ó¥É¤Ï¡¢¸½ºß¤Î¥¹¥¿¥Ã¥¯¡¦¥Õ¥ì¡¼¥à¤Î¼¡¤Î¹Ô¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.SS
++Îã³°
++.LP
++.LP
++¥¹¥í¡¼¤·¤Æ¤¤¤ë¥¹¥ì¥Ã¥É¤Î¸Æ½Ð¤·¥¹¥¿¥Ã¥¯¾å¤Î¤É¤³¤Ë¤âcatchʸ¤¬¤Ê¤¤¾ì¹ç¤ËÎã³°¤¬È¯À¸¤¹¤ë¤È¡¢VM¤ÏÄ̾Îã³°¥È¥ì¡¼¥¹¤ò½ÐÎϤ·¤Æ½ªÎ»¤·¤Þ¤¹¡£¤¿¤À¤·¡¢\f3jdb\fP´Ä¶­¤Ç¼Â¹Ô¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢°ãÈ¿¤Î¥¹¥í¡¼»þ¤Ë\f3jdb\fP¤ËÀ©¸æ¤¬Ìá¤ê¤Þ¤¹¡£¼¡¤Ë¡¢\f3jdb\fP¤ò»ÈÍѤ·¤ÆÎã³°¤Î¸¶°ø¤ò¿ÇÃǤ·¤Þ¤¹¡£
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢¡Ö\f2catch java.io.FileNotFoundException\fP¡×¤Þ¤¿¤Ï¡Ö\f2catch mypackage.BigTroubleException\fP¡×¤Î¤è¤¦¤Ë\f2catch\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤È¡¢¥Ç¥Ð¥Ã¥°¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢Â¾¤ÎÎã³°¤¬¥¹¥í¡¼¤µ¤ì¤¿¤È¤­¤ËÄä»ß¤·¤Þ¤¹¡£Îã³°¤¬ÆÃÄê¤Î¥¯¥é¥¹(¤Þ¤¿¤Ï¥µ¥Ö¥¯¥é¥¹)¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Î¾ì¹ç¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÏÎã³°¤¬¥¹¥í¡¼¤µ¤ì¤¿¾ì½ê¤ÇÄä»ß¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2ignore\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤È¡¢°ÊÁ°¤Î\f2catch\fP¥³¥Þ¥ó¥É¤Î¸ú²Ì¤¬Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f2Ãí°Õ: \fP\f2ignore\fP¥³¥Þ¥ó¥É¤Ç¤Ï¡¢¥Ç¥Ð¥Ã¥°¤µ¤ì¤ëVM¤ÏÎã³°¤ò̵»ë¤»¤º¡¢¥Ç¥Ð¥Ã¥¬¤Î¤ß¤¬Îã³°¤ò̵»ë¤·¤Þ¤¹¡£
++.LP
++.SH "¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇJava¥¢¥×¥ê¥±¡¼¥·¥ç¥óµ¯Æ°¥Ä¡¼¥ë¤Î¤«¤ï¤ê¤Ë\f3jdb\fP¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢\f3jdb\fP¤Ï¡¢\f2\-D\fP¡¢\f2\-classpath\fP¡¢\f2\-X<option>\fP¤Ê¤É¡¢java¥³¥Þ¥ó¥É¤ÈƱ¤¸¿ô¤Î¥ª¥×¥·¥ç¥ó¤ò¼õ¤±Æþ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f3jdb\fP¤Ï¡¢¤½¤Î¾¤Ë¼¡¤Î¥ª¥×¥·¥ç¥ó¤ò¼õ¤±Æþ¤ì¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++\-help
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-sourcepath <dir1:dir2:...>
++»ØÄꤵ¤ì¤¿¥Ñ¥¹¤ò»ÈÍѤ·¤Æ¡¢¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥Ñ¥¹¤Î¡Ö.¡×¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-attach <address>
++¥Ç¥Õ¥©¥ë¥È¤ÎÀܳµ¡¹½¤ò»ÈÍѤ·¤Æ¡¢¤¹¤Ç¤Ë¼Â¹ÔÃæ¤ÎVM¤Ë¥Ç¥Ð¥Ã¥¬¤òÀܳ¤·¤Þ¤¹¡£
++.TP 3
++\-listen <address>
++¼Â¹ÔÃæ¤ÎVM¤¬É¸½à¤Î¥³¥Í¥¯¥¿¤ò»ÈÍѤ·¤Æ»ØÄꤵ¤ì¤¿¥¢¥É¥ì¥¹¤ËÀܳ¤¹¤ë¤Î¤òÂÔµ¡¤·¤Þ¤¹¡£
++.TP 3
++\-listenany
++¼Â¹ÔÃæ¤ÎVM¤¬É¸½à¤Î¥³¥Í¥¯¥¿¤ò»ÈÍѤ·¤ÆÍøÍѲÄǽ¤ÊǤ°Õ¤Î¥¢¥É¥ì¥¹¤ËÀܳ¤¹¤ë¤Î¤òÂÔµ¡¤·¤Þ¤¹¡£
++.TP 3
++\-launch
++¥Ç¥Ð¥Ã¥°¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òjdb¤Îµ¯Æ°¸å¤¿¤À¤Á¤Ëµ¯Æ°¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢\f2run\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ëɬÍפ¬¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£¥Ç¥Ð¥Ã¥°¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢µ¯Æ°¸å¡¢½é´ü¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥¯¥é¥¹¤¬¥í¡¼¥É¤µ¤ì¤ëľÁ°¤ËÄä»ß¤·¤Þ¤¹¡£¤½¤Î»þÅÀ¤Ç¡¢É¬Íפʥ֥졼¥¯¥Ý¥¤¥ó¥È¤òÀßÄꤷ¡¢\f2cont\fP¤ò»ÈÍѤ·¤Æ¼Â¹Ô¤ò·Ñ³¤Ç¤­¤Þ¤¹¡£
++.TP 3
++\-listconnectors
++¤³¤ÎVM¤ÇÍøÍѤǤ­¤ë¥³¥Í¥¯¥¿¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-connect <connector\-name>:<name1>=<value1>,...
++°ìÍ÷ɽ¼¨¤µ¤ì¤¿°ú¿ô¤ÎÃͤȻØÄê¤Î¥³¥Í¥¯¥¿¤ò»ÈÍѤ·¤Æ¥¿¡¼¥²¥Ã¥ÈVM¤ËÀܳ¤·¤Þ¤¹¡£
++.TP 3
++\-dbgtrace [flags]
++jdb¤Î¥Ç¥Ð¥Ã¥°¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-tclient
++Java HotSpot(tm) VM(¥¯¥é¥¤¥¢¥ó¥È)Æâ¤Ç¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.TP 3
++\-tserver
++Java HotSpot(tm) VM(¥µ¡¼¥Ð¡¼)Æâ¤Ç¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.TP 3
++\-Joption
++jdb¤Î¼Â¹Ô¤Ë»ÈÍѤµ¤ì¤ëJava²¾ÁÛ¥Þ¥·¥ó¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£(¥¢¥×¥ê¥±¡¼¥·¥ç¥óJava²¾ÁÛ¥Þ¥·¥ó¤ËÂФ¹¤ë¥ª¥×¥·¥ç¥ó¤Ï¡¢\f3run\fP¥³¥Þ¥ó¥É¤ËÅϤµ¤ì¤ë)¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++¥Ç¥Ð¥Ã¥¬¤È¥Ç¥Ð¥Ã¥°¤ò¹Ô¤¦VM¤òÀܳ¤¹¤ë¤¿¤á¤ÎÂåÂص¡¹½¤ËÂФ·¤Æ¡¢¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤½¤Î¾¤ÎÀܳ¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢Java Platform Debugger Architecture¤Î
++.na
++\f2¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SS
++¥Ç¥Ð¥Ã¥°ÂÐ¾Ý¤Î¥×¥í¥»¥¹¤ËžÁ÷¤µ¤ì¤ë¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-v \-verbose[:class|gc|jni]
++¾éĹ¥â¡¼¥É¤Ë¤·¤Þ¤¹¡£
++.TP 3
++\-D<name>=<value>
++¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤òÀßÄꤷ¤Þ¤¹¡£
++.TP 3
++\-classpath <directories separated by ":">
++¥¯¥é¥¹¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-X<option>
++Èóɸ½à¥¿¡¼¥²¥Ã¥ÈVM¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.LP
++javac(1)¡¢java(1)¡¢javah(1)¡¢javap(1)¡¢javadoc(1)
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jhat.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jhat.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,135 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jhat 1 "07 May 2011"
++.TH jhat 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jhat \- Java¥Ò¡¼¥×²òÀϥġ¼¥ë
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jhat\fP [ \f2options\fP ] <heap\-dump\-file>
++.fl
++
++.fl
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++options
++¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É̾¤Îľ¸å¤Ëµ­½Ò¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++heap\-dump\-file
++¥Ö¥é¥¦¥ºÂоݤȤʤëJava¥Ð¥¤¥Ê¥ê¡¦¥Ò¡¼¥×¡¦¥À¥ó¥×¡¦¥Õ¥¡¥¤¥ë¡£Ê£¿ô¤Î¥Ò¡¼¥×¡¦¥À¥ó¥×¤ò´Þ¤à¥À¥ó¥×¡¦¥Õ¥¡¥¤¥ë¤Î¾ì¹ç¡¢¡Öfoo.hprof#3¡×¤Î¤è¤¦¤Ë¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë¡Ö#<number>¡×¤òÉղ乤뤳¤È¤Ç¡¢¥Õ¥¡¥¤¥ëÆâ¤ÎÆÃÄê¤Î¥À¥ó¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jhat\fP¥³¥Þ¥ó¥É¤Ï¡¢java¥Ò¡¼¥×¡¦¥À¥ó¥×¡¦¥Õ¥¡¥¤¥ë¤ò²òÀϤ·¡¢Web¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤·¤Þ¤¹¡£jhat¤ò»ÈÍѤ¹¤ì¤Ð¡¢»È¤¤´·¤ì¤¿Web¥Ö¥é¥¦¥¶¤ò»ÈÍѤ·¤Æ¥Ò¡¼¥×¡¦¥À¥ó¥×¤ò¥Ö¥é¥¦¥º¤Ç¤­¤Þ¤¹¡£jhat¤Ï¡¢¡Ö´ûÃΤΥ¯¥é¥¹¡ÖFoo¡×¤Î¤¹¤Ù¤Æ¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òɽ¼¨¤¹¤ë¡×¤È¤¤¤Ã¤¿¡¢»öÁ°¤ËÀ߷פµ¤ì¤¿¥¯¥¨¥ê¡¼¤Î¾¡¢¥Ò¡¼¥×¡¦¥À¥ó¥×¤ò¥¯¥¨¥ê¡¼¤¹¤ëSQL¤Ë»÷¤¿¥¯¥¨¥ê¡¼¸À¸ì¤Ç¤¢¤ë\f3OQL\fP(\f3O\fPbject\f3Q\fPuery\f3L\fPanguage)¤â¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£OQL¤Î¥Ø¥ë¥×¤Ë¤Ï¡¢jhat¤Ë¤è¤Ã¤Æɽ¼¨¤µ¤ì¤ëOQL¥Ø¥ë¥×¡¦¥Ú¡¼¥¸¤«¤é¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¡¦¥Ý¡¼¥È¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢OQL¤Î¥Ø¥ë¥×¤Ïhttp://localhost:7000/oqlhelp/¤ÇÍøÍѲÄǽ¤Ç¤¹¡£
++.LP
++.LP
++Java¤Î¥Ò¡¼¥×¡¦¥À¥ó¥×¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤¤¤¯¤Ä¤«¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++jmap(1)¤Î\-dump¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¼Â¹Ô»þ¤Ë¥Ò¡¼¥×¡¦¥À¥ó¥×¤ò¼èÆÀ¤¹¤ëÊýË¡
++.TP 2
++o
++jconsole(1)¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ
++.na
++\f2HotSpotDiagnosticMXBean\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html·Ðͳ¤Ç¼Â¹Ô»þ¤Ë¥Ò¡¼¥×¡¦¥À¥ó¥×¤ò¼èÆÀ¤¹¤ëÊýË¡
++.TP 2
++o
++\-XX:+HeapDumpOnOutOfMemoryError VM¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¡¢OutOfMemoryError¤Î¥¹¥í¡¼»þ¤Ë¥Ò¡¼¥×¡¦¥À¥ó¥×¤òÀ¸À®¤¹¤ëÊýË¡
++.TP 2
++o
++hprof¤ò»ÈÍѤ¹¤ëÊýË¡
++.RE
++
++.LP
++.LP
++\f3Ãí°Õ:\fP ¤³¤Î¥Ä¡¼¥ë¤Ï\f3»î¸³Åª¤Ê¤â¤Î\fP¤Ç¤¢¤ê¡¢¾­Íè¤ÎJDK¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÍøÍÑ\f3¤Ç¤­¤Ê¤¯¤Ê¤ë\fP²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-stack false/true
++¥ª¥Ö¥¸¥§¥¯¥È³äÅö¸Æ½Ð¤·¥¹¥¿¥Ã¥¯¤ÎÄÉÀפò̵¸ú¤Ë¤·¤Þ¤¹¡£¥Ò¡¼¥×¡¦¥À¥ó¥×Æâ¤Ç³äÅö¥µ¥¤¥È¾ðÊ󤬻ÈÍѤǤ­¤Ê¤¤¾ì¹ç¡¢¤³¤Î¥Õ¥é¥°¤òfalse¤ËÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ïtrue¤Ç¤¹¡£
++.TP 3
++\-refs false/true
++¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î»²¾È¤ÎÄÉÀפò̵¸ú¤Ë¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ïtrue¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥Ò¡¼¥×Æâ¤Î¤¹¤Ù¤Æ¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ë¤Ä¤¤¤Æ¡¢¥Ð¥Ã¥¯¥Ý¥¤¥ó¥¿(»ØÄꤵ¤ì¤¿¥ª¥Ö¥¸¥§¥¯¥È¤ò¥Ý¥¤¥ó¥È¤·¤Æ¤¤¤ë¥ª¥Ö¥¸¥§¥¯¥È¡£»²¾È¼Ô¤Þ¤¿¤Ï¼õ¿®»²¾È¤È¤â¸Æ¤Ð¤ì¤ë)¤¬·×»»¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-port port\-number
++jhat¤ÎHTTP¥µ¡¼¥Ð¡¼¤Î¥Ý¡¼¥È¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï7000¤Ç¤¹¡£
++.TP 3
++\-exclude exclude\-file
++¡ÖÅþã²Äǽ¤Ê¥ª¥Ö¥¸¥§¥¯¥È¡×¤Î¥¯¥¨¥ê¡¼¤«¤é½ü³°¤¹¤ëɬÍפ¬¤¢¤ë¥Ç¡¼¥¿¡¦¥á¥ó¥Ð¡¼¤Î°ìÍ÷¤ò´Þ¤à¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤Ë\f2java.lang.String.value\fP¤¬´Þ¤Þ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢ÆÃÄê¤Î¥ª¥Ö¥¸¥§¥¯¥È¡Öo¡×¤«¤éÅþã²Äǽ¤Ê¥ª¥Ö¥¸¥§¥¯¥È¤Î¥ê¥¹¥È¤ò·×»»¤¹¤ëºÝ¤Ë¡¢\f2java.lang.String.value\fP¥Õ¥£¡¼¥ë¥É¤Ë´ØÏ¢¤¹¤ë»²¾È¥Ñ¥¹¤¬¹Í褵¤ì¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++\-baseline baseline\-dump\-file
++¥Ù¡¼¥¹¥é¥¤¥ó¤È¤Ê¤ë¥Ò¡¼¥×¡¦¥À¥ó¥×¤ò»ØÄꤷ¤Þ¤¹¡£Î¾Êý¤Î¥Ò¡¼¥×¡¦¥À¥ó¥×Æâ¤ÇƱ¤¸¥ª¥Ö¥¸¥§¥¯¥ÈID¤ò»ý¤Ä¥ª¥Ö¥¸¥§¥¯¥È¤Ï¡Ö¿·µ¬¤Ç¤Ï¤Ê¤¤¡×¤È¤·¤Æ¥Þ¡¼¥¯¤µ¤ì¤Þ¤¹¡£¤½¤Î¾¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¡Ö¿·µ¬¡×¤È¤·¤Æ¥Þ¡¼¥¯¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢°Û¤Ê¤ë2¤Ä¤Î¥Ò¡¼¥×¡¦¥À¥ó¥×¤òÈæ³Ó¤¹¤ëºÝ¤ËÌòΩ¤Á¤Þ¤¹¡£
++.TP 3
++\-debug int
++¤³¤Î¥Ä¡¼¥ë¤Î¥Ç¥Ð¥Ã¥°¡¦¥ì¥Ù¥ë¤òÀßÄꤷ¤Þ¤¹¡£0¤Ï¡Ö¥Ç¥Ð¥Ã¥°½ÐÎϤʤ·¡×¤ò°ÕÌ£¤·¤Þ¤¹¡£¤è¤êÂ礭¤ÊÃͤòÀßÄꤹ¤ë¤È¡¢¤è¤ê¾éĹ¤Ê¥â¡¼¥É¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++\-version
++¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÊó¹ð¤·¤¿¤¢¤È¡¢½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-h
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-help
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-J<flag>
++jhat¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ëJava²¾ÁÛ¥Þ¥·¥ó¤Ë<flag>¤òÅϤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢512M¥Ð¥¤¥È¤ÎºÇÂç¥Ò¡¼¥×¡¦¥µ¥¤¥º¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢\-J\-Xmx512m¤È¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++jmap(1)
++.TP 2
++o
++jconsole(1)
++.TP 2
++o
++hprof \- ¥Ò¡¼¥×¤ª¤è¤ÓCPU¥×¥í¥Õ¥¡¥¤¥ê¥ó¥°¡¦¥Ä¡¼¥ë
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jinfo.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jinfo.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,148 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jinfo 1 "07 May 2011"
++.TH jinfo 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jinfo \- ¹½À®¾ðÊó
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jinfo\fP [ option ] pid
++.fl
++\f3jinfo\fP [ option ] executable core
++.fl
++\f3jinfo\fP [ option ] [server\-id@]remote\-hostname\-or\-IP
++.fl
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++option
++³Æ¥ª¥×¥·¥ç¥ó¤Ï¸ß¤¤¤ËÇÓ¾Ū¤Ç¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É̾¤Îľ¸å¤Ëµ­½Ò¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.RS 3
++.TP 3
++pid
++½ÐÎϤ¹¤ë¹½À®¾ðÊó¤Î¥×¥í¥»¥¹ID¡£¥×¥í¥»¥¹¤ÏJava¥×¥í¥»¥¹¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Þ¥·¥ó¾å¤Ç¼Â¹Ô¤·¤Æ¤¤¤ëJava¥×¥í¥»¥¹¤Î°ìÍ÷¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¡¢jps(1)¤ò»ÈÍѤ·¤Þ¤¹¡£
++.RE
++
++.LP
++.RS 3
++.TP 3
++executable
++¥³¥¢¡¦¥À¥ó¥×¤ÎºîÀ®¸µ¤ÎJava¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë¡£
++.RE
++
++.LP
++.RS 3
++.TP 3
++core
++½ÐÎϤ¹¤ë¹½À®¾ðÊó¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¡£
++.RE
++
++.LP
++.RS 3
++.TP 3
++remote\-hostname\-or\-IP
++¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼(jsadebugd(1)¤ò»²¾È)¤Î¥Û¥¹¥È̾¤Þ¤¿¤ÏIP¥¢¥É¥ì¥¹¡£
++.RE
++
++.LP
++.RS 3
++.TP 3
++server\-id
++Ê£¿ô¤Î¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤¬Æ±°ì¤Î¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¤Ç¼Â¹Ô¤·¤Æ¤¤¤ë¾ì¹ç¤Î¡¢¥ª¥×¥·¥ç¥ó¸ÇÍ­¤ÎID¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jinfo\fP¤Ï¡¢»ØÄꤵ¤ì¤¿Java¥×¥í¥»¥¹¤ä¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤ÎJava¹½À®¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£¹½À®¾ðÊó¤Ë¤Ï¡¢Java¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤ÈJava²¾ÁÛ¥Þ¥·¥ó¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Õ¥é¥°¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥×¥í¥»¥¹¤¬64¥Ó¥Ã¥ÈVM¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f2\-J\-d64\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.br
++jinfo \-J\-d64 \-sysprops pid
++.LP
++.LP
++\f3Ãí°Õ \- ¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¥µ¥Ý¡¼¥ÈÂоݳ°¤Ç¤¢¤ê¡¢¾­Íè¤ÎJDK¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÍøÍѤǤ­¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£dbgeng.dll¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤Windows¥·¥¹¥Æ¥à¤Ç¤Ï¡¢¡ÖDebugging Tools For Windows¡×¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¤¤È¤³¤ì¤é¤Î¥Ä¡¼¥ë¤¬Àµ¾ï¤ËÆ°ºî¤·¤Þ¤»¤ó¡£¤Þ¤¿¡¢\fP\f4PATH\fP\f3´Ä¶­ÊÑ¿ô¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥×¥í¥»¥¹¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤ë\fP\f4jvm.dll\fP\f3¤Î¾ì½ê¡¢¤Þ¤¿¤Ï¥¯¥é¥Ã¥·¥å¡¦¥À¥ó¥×¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤¿¾ì½ê¤¬´Þ¤Þ¤ì¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\fP
++.LP
++.LP
++\f3¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£\fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++<¥ª¥×¥·¥ç¥ó¤Ê¤·>
++¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Õ¥é¥°¤ò¡¢¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£Ì¾¤ÈÃͤΥڥ¢¤È¤È¤â¤Ë½ÐÎϤ·¤Þ¤¹¡£
++.br
++.TP 3
++\-flag name
++»ØÄꤵ¤ì¤¿¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Õ¥é¥°¤Î̾Á°¤ÈÃͤò½ÐÎϤ·¤Þ¤¹¡£
++.br
++.TP 3
++\-flag [+|\-]name
++»ØÄꤵ¤ì¤¿¥Ö¡¼¥ë·¿¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Õ¥é¥°¤òÍ­¸ú¤Þ¤¿¤Ï̵¸ú¤Ë¤·¤Þ¤¹¡£
++.br
++.TP 3
++\-flag name=value
++»ØÄꤵ¤ì¤¿¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Õ¥é¥°¤ò»ØÄꤵ¤ì¤¿ÃͤËÀßÄꤷ¤Þ¤¹¡£
++.br
++.TP 3
++\-flags
++JVM¤ËÅϤµ¤ì¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Õ¥é¥°¤ò¥Ú¥¢¤Ç½ÐÎϤ·¤Þ¤¹¡£
++.br
++.TP 3
++\-sysprops
++Java¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤ò̾Á°¤ÈÃͤΥڥ¢¤È¤·¤Æ½ÐÎϤ·¤Þ¤¹¡£
++.br
++.TP 3
++\-h
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-help
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++jps(1)
++.TP 2
++o
++jsadebugd(1)
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jmap.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jmap.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,161 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jmap 1 "07 May 2011"
++.TH jmap 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jmap \- ¥á¥â¥ê¡¼¡¦¥Þ¥Ã¥×
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jmap\fP [ option ] pid
++.fl
++\f3jmap\fP [ option ] executable core
++.fl
++\f3jmap\fP [ option ] [server\-id@]remote\-hostname\-or\-IP
++.fl
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++option
++³Æ¥ª¥×¥·¥ç¥ó¤Ï¸ß¤¤¤ËÇÓ¾Ū¤Ç¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É̾¤Îľ¸å¤Ëµ­½Ò¤·¤Þ¤¹¡£
++.TP 3
++pid
++½ÐÎϤ¹¤ë¥á¥â¥ê¡¼¡¦¥Þ¥Ã¥×¤Î¥×¥í¥»¥¹ID¡£¥×¥í¥»¥¹¤ÏJava¥×¥í¥»¥¹¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Þ¥·¥ó¾å¤Ç¼Â¹Ô¤·¤Æ¤¤¤ëJava¥×¥í¥»¥¹¤Î°ìÍ÷¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¡¢jps(1)¤ò»ÈÍѤ·¤Þ¤¹¡£
++.br
++.TP 3
++executable
++¥³¥¢¡¦¥À¥ó¥×¤ÎºîÀ®¸µ¤ÎJava¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë¡£
++.br
++.TP 3
++core
++½ÐÎϤ¹¤ë¥á¥â¥ê¡¼¡¦¥Þ¥Ã¥×¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¡£
++.br
++.TP 3
++remote\-hostname\-or\-IP
++¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼(jsadebugd(1)¤ò»²¾È)¤Î¥Û¥¹¥È̾¤Þ¤¿¤ÏIP¥¢¥É¥ì¥¹¡£
++.br
++.TP 3
++server\-id
++Ê£¿ô¤Î¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤¬Æ±°ì¤Î¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¤ÇÆ°ºî¤·¤Æ¤¤¤ë¾ì¹ç¤Î¡¢¥ª¥×¥·¥ç¥ó¸ÇÍ­¤ÎID¤Ç¤¹¡£
++.br
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jmap\fP¤Ï¡¢»ØÄꤵ¤ì¤¿¥×¥í¥»¥¹¤ä¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤Î¡¢¶¦ÍÑ¥ª¥Ö¥¸¥§¥¯¥È¡¦¥á¥â¥ê¡¼¡¦¥Þ¥Ã¥×¤Þ¤¿¤Ï¥Ò¡¼¥×¡¦¥á¥â¥ê¡¼¤Î¾ÜºÙ¤ò½ÐÎϤ·¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥×¥í¥»¥¹¤¬64¥Ó¥Ã¥ÈVM¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f2\-J\-d64\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++jmap \-J\-d64 \-heap pid
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f3Ãí°Õ: ¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¥µ¥Ý¡¼¥ÈÂоݳ°¤Ç¤¢¤ê¡¢¾­Íè¤ÎJDK¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÍøÍѤǤ­¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£dbgeng.dll¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤Windows¥·¥¹¥Æ¥à¤Ç¤Ï¡¢¡ÖDebugging Tools For Windows¡×¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¤¤È¤³¤ì¤é¤Î¥Ä¡¼¥ë¤¬Àµ¾ï¤ËÆ°ºî¤·¤Þ¤»¤ó¡£¤Þ¤¿¡¢\fP\f4PATH\fP\f3´Ä¶­ÊÑ¿ô¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥×¥í¥»¥¹¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤ë\fP\f4jvm.dll\fP\f3¤Î¾ì½ê¡¢¤Þ¤¿¤Ï¥¯¥é¥Ã¥·¥å¡¦¥À¥ó¥×¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤¿¾ì½ê¤¬´Þ¤Þ¤ì¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\fP
++.LP
++.LP
++\f3¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£\fP\f4set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
++.LP
++.br
++
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++<¥ª¥×¥·¥ç¥ó¤Ê¤·>
++¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Ê¤¤¾ì¹ç¡¢jmap¤Ï¶¦ÍÑ¥ª¥Ö¥¸¥§¥¯¥È¡¦¥Þ¥Ã¥Ô¥ó¥°¤ò½ÐÎϤ·¤Þ¤¹¡£¥¿¡¼¥²¥Ã¥ÈVM¤Ë¥í¡¼¥É¤µ¤ì¤¿¶¦ÍÑ¥ª¥Ö¥¸¥§¥¯¥È¤´¤È¤Ë¡¢³«»Ï¥¢¥É¥ì¥¹¡¢¥Þ¥Ã¥Ô¥ó¥°¤Î¥µ¥¤¥º¤ª¤è¤Ó¶¦ÍÑ¥ª¥Ö¥¸¥§¥¯¥È¡¦¥Õ¥¡¥¤¥ë¤Î¥Õ¥ë¥Ñ¥¹¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢Solaris \f3pmap\fP¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ÈÎà»÷¤·¤Æ¤¤¤Þ¤¹¡£
++.br
++.TP 3
++\-dump:[live,]format=b,file=<filename>
++Java¥Ò¡¼¥×¤òhprof¥Ð¥¤¥Ê¥ê·Á¼°¤Çfilename¤Ë¥À¥ó¥×¤·¤Þ¤¹¡£\f2live\fP¥µ¥Ö¥ª¥×¥·¥ç¥ó¤Ï¾Êά²Äǽ¤Ç¤¹¡£¤³¤ì¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¥Ò¡¼¥×Æâ¤ÇÀ¸Â¸Ãæ¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Î¤ß¤¬¥À¥ó¥×¤µ¤ì¤Þ¤¹¡£¥Ò¡¼¥×¡¦¥À¥ó¥×¤ò»²¾È¤¹¤ë¤Ë¤Ï¡¢À¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òjhat(1) (Java Heap Analysis Tool)¤ò»ÈÍѤ·¤ÆÆɤ߼è¤ê¤Þ¤¹¡£
++.br
++.TP 3
++\-finalizerinfo
++¥Õ¥¡¥¤¥Ê¥é¥¤¥º¤òÂԤäƤ¤¤ë¥ª¥Ö¥¸¥§¥¯¥È¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.br
++.TP 3
++\-heap
++¥Ò¡¼¥×¡¦¥µ¥Þ¥ê¡¼¤ò½ÐÎϤ·¤Þ¤¹¡£»ÈÍѤµ¤ì¤ëGC¥¢¥ë¥´¥ê¥º¥à¡¢¥Ò¡¼¥×¹½À®¤ª¤è¤ÓÀ¤Â头¤È¤Î¥Ò¡¼¥×»ÈÍÑΨ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.br
++.TP 3
++\-histo[:live]
++¥Ò¡¼¥×¤Î¥Ò¥¹¥È¥°¥é¥à¤ò½ÐÎϤ·¤Þ¤¹¡£Java¥¯¥é¥¹¤´¤È¤Ë¡¢¥ª¥Ö¥¸¥§¥¯¥È¤Î¿ô¡¢¥Ð¥¤¥Èñ°Ì¤Ç¤Î¥á¥â¥ê¡¼¡¦¥µ¥¤¥º¡¢¤ª¤è¤Ó´°Á´½¤¾þ¥¯¥é¥¹Ì¾¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£VMÆâÉô¥¯¥é¥¹Ì¾¤Ï¡¢¡Ö*¡×¤ÎÀÜƬ¼­¤òÉÕ¤±¤Æ½ÐÎϤµ¤ì¤Þ¤¹¡£\f2live\fP¥µ¥Ö¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢À¸Â¸Ãæ¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Î¤ß¤¬¥«¥¦¥ó¥È¤µ¤ì¤Þ¤¹¡£
++.br
++.TP 3
++\-permstat
++PermanentÀ¤Âå¤ÎJava¥Ò¡¼¥×¤Î¡¢¥¯¥é¥¹¡¦¥í¡¼¥À¡¼´ØÏ¢¤ÎÅý·×¥Ç¡¼¥¿¤ò½ÐÎϤ·¤Þ¤¹¡£¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤´¤È¤Ë¡¢¤½¤Î̾Á°¡¢¾õÂÖ¡¢¥¢¥É¥ì¥¹¡¢¿Æ¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¡¢¤ª¤è¤Ó¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤¬¥í¡¼¥É¤·¤¿¥¯¥é¥¹¤Î¿ô¤È¥µ¥¤¥º¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¤µ¤é¤Ë¡¢intern¤µ¤ì¤¿Ê¸»úÎó¤Î¿ô¤È¥µ¥¤¥º¤â½ÐÎϤµ¤ì¤Þ¤¹¡£
++.br
++.TP 3
++\-F
++¶¯À©(Force)¡£pid¤¬±þÅú¤·¤Ê¤¤¾ì¹ç¤Ë¡¢jmap \-dump¤Þ¤¿¤Ïjmap \-histo¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¥â¡¼¥É¤Ç¤Ï¡¢\f2live\fP¥µ¥Ö¥ª¥×¥·¥ç¥ó¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó¡£
++.br
++.TP 3
++\-h
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.br
++.br
++.TP 3
++\-help
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.br
++.br
++.TP 3
++\-J<flag>
++jmap¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ëJava²¾ÁÛ¥Þ¥·¥ó¤Ë<flag>¤òÅϤ·¤Þ¤¹¡£
++.br
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++pmap(1)
++.TP 2
++o
++jhat(1)
++.TP 2
++o
++jps(1)
++.TP 2
++o
++jsadebugd(1)
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jps.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jps.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,260 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jps 1 "07 May 2011"
++.TH jps 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jps \- Java²¾ÁÛ¥Þ¥·¥ó¡¦¥×¥í¥»¥¹¡¦¥¹¥Æ¡¼¥¿¥¹¡¦¥Ä¡¼¥ë
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++¥Û¥¹¥È¼±ÊÌ»Ò
++.TP 2
++o
++½ÐÎÏ·Á¼°
++.TP 2
++o
++Îã
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jps\fP [ \f2options\fP ] [ \f2hostid\fP ]
++.br
++
++.fl
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++options
++¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¡£
++.TP 3
++hostid
++¥×¥í¥»¥¹¡¦¥ì¥Ý¡¼¥È¤òÀ¸À®¤¹¤ë¥Û¥¹¥È¤Î¥Û¥¹¥È¼±Ê̻ҡ£\f2hostid\fP¤Ë¤Ï¡¢ÄÌ¿®¥×¥í¥È¥³¥ë¡¢¥Ý¡¼¥ÈÈֹ桢¼ÂÁõ¤Ë¸ÇÍ­¤Ê¾¤Î¥Ç¡¼¥¿¤ò»ØÄꤷ¤¿¥ª¥×¥·¥ç¥ó¡¦¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jps\fP¥Ä¡¼¥ë¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥·¥¹¥Æ¥à¾å¤Ç·×¬¤µ¤ì¤¿HotSpot Java²¾ÁÛ¥Þ¥·¥ó(JVM)¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Çɽ¼¨¤Ç¤­¤ë¥ì¥Ý¡¼¥È¾ðÊó¤Ï¡¢¥¢¥¯¥»¥¹¸¢¤ò»ý¤Ã¤¿JVM¤Ë´Ø¤¹¤ë¤â¤Î¤Ë¸ÂÄꤵ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f2hostid\fP¤ò»ØÄꤻ¤º¤Ë\f3jps\fP¤ò¼Â¹Ô¤·¤¿¾ì¹ç¡¢¥í¡¼¥«¥ë¡¦¥Û¥¹¥È¤Ç·×¬¤µ¤ì¤¿JVM¤¬¸¡º÷¤µ¤ì¤Þ¤¹¡£\f2hostid\fP¤ò»ØÄꤷ¤Æµ¯Æ°¤·¤¿¾ì¹ç¡¢»ØÄꤵ¤ì¤¿¥×¥í¥È¥³¥ë¤È¥Ý¡¼¥È¤ò»ÈÍѤ·¤Æ¡¢»ØÄꤵ¤ì¤¿¥Û¥¹¥È¾å¤ÎJVM¤ò¸¡º÷¤·¤Þ¤¹¡£\f3jstatd\fP¥×¥í¥»¥¹¤¬¥¿¡¼¥²¥Ã¥È¡¦¥Û¥¹¥È¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤ÈÁÛÄꤵ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f3jps\fP¥³¥Þ¥ó¥É¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥·¥¹¥Æ¥à¤Ç·×¬¤µ¤ì¤¿³ÆJVM¤Ë¤Ä¤¤¤Æ¡¢¥í¡¼¥«¥ëVM¼±Ê̻ҡ¢¤Ä¤Þ¤ê\f2lvmid\fP¤ò¥ì¥Ý¡¼¥È¤·¤Þ¤¹¡£\f3lvmid\fP¤Ï¡¢°ìÈÌŪ¤Ë¤ÏJVM¥×¥í¥»¥¹¤ËÂФ¹¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¤Î¥×¥í¥»¥¹¼±Ê̻ҤǤ¹¤¬¡¢É¬¤º¤·¤â¤½¤¦¤Ç¤¢¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\f3jps\fP¤Ë¤è¤Ã¤Æ¡¢³ÆJava¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î\f2lvmid\fP¤¬°ìÍ÷ɽ¼¨¤µ¤ì¡¢¤½¤ì¤¾¤ì¤Ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¯¥é¥¹Ì¾¤Þ¤¿¤ÏJAR¥Õ¥¡¥¤¥ë̾¤¬´Êñ¤Ê·Á¼°¤Ç¼¨¤µ¤ì¤Þ¤¹¡£¤³¤Î´Êñ¤Ê·Á¼°¤Î¥¯¥é¥¹Ì¾¤ÈJAR¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¡¢¥¯¥é¥¹¤Î¥Ñ¥Ã¥±¡¼¥¸¾ðÊó¤Þ¤¿¤ÏJAR¥Õ¥¡¥¤¥ë¡¦¥Ñ¥¹¾ðÊ󤬾Êά¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++.LP
++\f3jps\fP¥³¥Þ¥ó¥É¤Ï¡¢\f3Java\fPµ¯Æ°¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ\f2main\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤ë¥¯¥é¥¹Ì¾¤È°ú¿ô¤ò¸¡º÷¤·¤Þ¤¹¡£Æȼ«¤Îµ¯Æ°¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¥¿¡¼¥²¥Ã¥ÈJVM¤òµ¯Æ°¤·¤¿¾ì¹ç¤Ï¡¢\f2main\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤ë¥¯¥é¥¹Ì¾(¤Þ¤¿¤ÏJAR¥Õ¥¡¥¤¥ë̾)¤È°ú¿ô¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£¤³¤Î¾ì¹ç¡¢\f3jps\fP¥³¥Þ¥ó¥É¤Ï¡¢main¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤ë¥¯¥é¥¹Ì¾(¤Þ¤¿¤ÏJAR¥Õ¥¡¥¤¥ë̾)¤È°ú¿ô¤ËÂФ·¤Æ¡¢Ê¸»úÎó\f2Unknown\fP¤ò½ÐÎϤ·¤Þ¤¹¡£
++.LP
++.LP
++\f3jps\fP¥³¥Þ¥ó¥É¤ÇÀ¸À®¤µ¤ì¤ëJVM¤Î¥ê¥¹¥È¤Ï¡¢¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¥×¥ê¥ó¥·¥Ñ¥ë¤ËÍ¿¤¨¤é¤ì¤¿¥¢¥¯¥»¥¹¸¢¤Ë´ð¤Å¤­¡¢À©¸Â¤µ¤ì¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥àÆȼ«¤Î¥¢¥¯¥»¥¹À©¸æµ¡¹½¤Ë¤è¤ë·èÄê¤Ë´ð¤Å¤¤¤Æ¡¢¥×¥ê¥ó¥·¥Ñ¥ë¤Ë¥¢¥¯¥»¥¹¸¢¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤ëJVM¤Î¤ß¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
++.LP
++.LP
++\f3Ãí°Õ:\fP ¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¥µ¥Ý¡¼¥ÈÂоݳ°¤Ç¤¢¤ê¡¢¾­Íè¤ÎJDK¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÍøÍѤǤ­¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¸½ºß¡¢Windows 98¤ª¤è¤ÓWindows ME¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++\f3jps\fP¥³¥Þ¥ó¥É¤Ç¤Ï¡¢¥³¥Þ¥ó¥É¤Î½ÐÎϤòÊѹ¹¤¹¤ë¥ª¥×¥·¥ç¥ó¤¬Â¿¿ô¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¾­Íè¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢Êѹ¹¤Þ¤¿¤ÏÇѻߤµ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++\-q
++¥¯¥é¥¹Ì¾¡¢JAR¥Õ¥¡¥¤¥ë̾¡¢¤ª¤è¤Ó\f2main\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤¿°ú¿ô¤Î½ÐÎϤòÍÞÀ©¤·¡¢¥í¡¼¥«¥ëVM¼±Ê̻ҤΰìÍ÷¤Î¤ß¤òÀ¸À®¤·¤Þ¤¹¡£
++.TP 3
++\-m
++main¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤ë°ú¿ô¤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤Î½ÐÎϤϡ¢ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ëJVM¤ËÂФ·¤Ænull¤Ë¤Ê¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-l
++¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥á¥¤¥ó¡¦¥¯¥é¥¹¤Î¥Õ¥ë¡¦¥Ñ¥Ã¥±¡¼¥¸Ì¾¡¢¤Þ¤¿¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎJAR¥Õ¥¡¥¤¥ë¤Ø¤Î¥Õ¥ë¥Ñ¥¹Ì¾¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-v
++JVM¤ËÅϤµ¤ì¤ë°ú¿ô¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-V
++¥Õ¥é¥°¡¦¥Õ¥¡¥¤¥ë(.hotspotrc¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï\-XX:Flags=<\f2filename\fP>¤Î°ú¿ô¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë)¤òÄ̤¸¤ÆJVM¤ËÅϤµ¤ì¤ë°ú¿ô¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-Joption
++\f3jps\fP¤¬¸Æ¤Ó½Ð¤¹\f3java\fPµ¯Æ°¥Ä¡¼¥ë¤Ë¡¢\f2option\fP¤òÅϤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f3\-J\fP¤ò»ÈÍѤ·¤Æ¡¢Java¤Çµ­½Ò¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ëÇظå¤ÎVM¤Ë¥ª¥×¥·¥ç¥ó¤òÅϤ¹¤³¤È¤Ï¡¢¤è¤¯¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++¥Û¥¹¥È¼±ÊÌ»Ò
++.LP
++.LP
++¥Û¥¹¥È¼±Ê̻ҡ¢¤Ä¤Þ¤ê\f2hostid\fP¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥·¥¹¥Æ¥à¤ò¼¨¤¹Ê¸»úÎó¤Ç¤¹¡£\f2hostid\fPʸ»úÎó¤Î¹½Ê¸¤ÎÂçÉôʬ¤Ï¡¢URI¤Î¹½Ê¸¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++[\fP\f4protocol\fP\f3:][[//]\fP\f4hostname\fP\f3][:\fP\f4port\fP\f3][/\fP\f4servername\fP\f3]\fP
++.br
++\f3
++.fl
++\fP
++.fi
++
++.LP
++.RS 3
++.TP 3
++protocol
++ÄÌ¿®¥×¥í¥È¥³¥ë¤Ç¤¹¡£\f2protocol\fP¤¬¾Êά¤µ¤ì¡¢\f2hostname\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥×¥í¥È¥³¥ë¤¬¡¢¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¸ÇÍ­¤ÎºÇŬ²½¤µ¤ì¤¿¥í¡¼¥«¥ë¡¦¥×¥í¥È¥³¥ë¤Ë¤Ê¤ê¤Þ¤¹¡£\f2protocol\fP¤¬¾Êά¤µ¤ì¡¢\f2hostname\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥×¥í¥È¥³¥ë¤Ï\f3rmi\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++hostname
++¥¿¡¼¥²¥Ã¥È¡¦¥Û¥¹¥È¤ò¼¨¤¹¥Û¥¹¥È̾¤Þ¤¿¤ÏIP¥¢¥É¥ì¥¹¤Ç¤¹¡£\f2hostname\fP¤¬¾Êά¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥Û¥¹¥È¤Ï¥í¡¼¥«¥ë¡¦¥Û¥¹¥È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++port
++¥ê¥â¡¼¥È¡¦¥µ¡¼¥Ð¡¼¤ÈÄÌ¿®¤¹¤ë¤¿¤á¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥Ý¡¼¥È¤Ç¤¹¡£\f2hostname\fP¤¬¾Êά¤µ¤ì¤Æ¤¤¤ë¤«¡¢ºÇŬ²½¤µ¤ì¤¿¥í¡¼¥«¥ë¡¦¥×¥í¥È¥³¥ë¤¬\f2protocol\fP¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f2port\fP¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢\f2port\fP¥Ñ¥é¥á¡¼¥¿¤Î°·¤¤¤Ï¡¢¼ÂÁõ¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î\f3rmi\fP¥×¥í¥È¥³¥ë¤Î¾ì¹ç¡¢\f2port\fP¤Ï¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¾å¤Îrmiregistry¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò¼¨¤·¤Þ¤¹¡£\f2port\fP¤¬¾Êά¤µ¤ì¡¢\f2protocol\fP¤Ç\f3rmi\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Îrmiregistry¥Ý¡¼¥È(1099)¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++servername
++¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Î°·¤¤¤Ï¡¢¼ÂÁõ¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£ºÇŬ²½¤µ¤ì¤¿¥í¡¼¥«¥ë¡¦¥×¥í¥È¥³¥ë¤Î¾ì¹ç¡¢¤³¤Î¥Õ¥£¡¼¥ë¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£\f3rmi\fP¥×¥í¥È¥³¥ë¤Î¾ì¹ç¡¢¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Ï¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¾å¤ÎRMI¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î̾Á°¤ò¼¨¤¹Ê¸»úÎó¤Ë¤Ê¤ê¤Þ¤¹¡£jstatd(1)¥³¥Þ¥ó¥É¤Î\f3\-n\fP¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++
++.LP
++.SH "½ÐÎÏ·Á¼°"
++.LP
++.LP
++\f3jps\fP¥³¥Þ¥ó¥É¤Î½ÐÎϤϡ¢¼¡¤Î¥Ñ¥¿¡¼¥ó¤Ë½¾¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\fP\f4lvmid\fP\f3 [ [ \fP\f4classname\fP\f3 | \fP\f4JARfilename\fP\f3 | "Unknown"] [ \fP\f4arg\fP\f3* ] [ \fP\f4jvmarg\fP\f3* ] ]\fP
++.br
++\f3
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤¹¤Ù¤Æ¤Î½ÐÎϥȡ¼¥¯¥ó¤Ï¶õÇò¤Ç¶èÀÚ¤ê¤Þ¤¹¡£\f2arg\fP¤ÎÃæ¤Ç¶õÇò¤ò»ÈÍѤ¹¤ë¤È¡¢¼ÂºÝ¤ÎÄê°ÌÃ֥ѥé¥á¡¼¥¿¤Ë°ú¿ô¤ò¥Þ¥Ã¥Ô¥ó¥°¤·¤è¤¦¤È¤¹¤ë¤È¤­¤Ë¡¢¤¢¤¤¤Þ¤¤¤Ë¤Ê¤ê¤Þ¤¹¡£
++.br
++.br
++\f3Ãí°Õ\fP: ¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¤³¤Î·Á¼°¤ÏÊѹ¹¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢\f3jps\fP¤Î½ÐÎϤò²òÀϤ¹¤ë¥¹¥¯¥ê¥×¥È¤ÏºîÀ®¤·¤Ê¤¤¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£\f3jps\fP½ÐÎϤò²òÀϤ¹¤ë¥¹¥¯¥ê¥×¥È¤òºîÀ®¤¹¤ë¤È¡¢¤³¤Î¥Ä¡¼¥ë¤Î¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¡¢ºîÀ®¤·¤¿¥¹¥¯¥ê¥×¥È¤ÎÊѹ¹¤¬É¬Íפˤʤë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.br
++
++.LP
++.SH "Îã"
++.LP
++.LP
++¤³¤Î¹à¤Ç¤Ï¡¢\f3jps\fP¥³¥Þ¥ó¥É¤ÎÎã¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++.LP
++¥í¡¼¥«¥ë¡¦¥Û¥¹¥È¾å¤Ç·×¬¤µ¤ì¤¿JVM¤ò°ìÍ÷ɽ¼¨¤¹¤ë¾ì¹ç:
++.LP
++.nf
++\f3
++.fl
++\fP\f3jps\fP
++.br
++
++.fl
++18027 Java2Demo.JAR
++.br
++
++.fl
++18032 jps
++.br
++
++.fl
++18005 jstat
++.br
++
++.fl
++.fi
++
++.LP
++.LP
++¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¾å¤Ç·×¬¤µ¤ì¤¿JVM¤ò°ìÍ÷ɽ¼¨¤¹¤ë¾ì¹ç:
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢\f3jstat\fP¥µ¡¼¥Ð¡¼¤È¡¢¤½¤ÎÆâÉôRMI¥ì¥¸¥¹¥È¥ê¤Þ¤¿¤ÏÊ̤γ°Éô\f3rmiregistry\fP¥×¥í¥»¥¹¤Î¤¤¤º¤ì¤«¤¬¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥Ý¡¼¥È(¥Ý¡¼¥È1099)¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤ÈÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢¥í¡¼¥«¥ë¡¦¥Û¥¹¥È¤¬¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¤Ø¤ÎÍ­¸ú¤Ê¥¢¥¯¥»¥¹¸¢¤ò»ý¤Ã¤Æ¤¤¤ë¤³¤È¤âÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£¤³¤ÎÎã¤Ë¤Ï¡¢\f2\-l\fP¥ª¥×¥·¥ç¥ó¤â´Þ¤Þ¤ì¡¢¥¯¥é¥¹Ì¾¤Þ¤¿¤ÏJAR¥Õ¥¡¥¤¥ë̾¤ò¾ÜºÙ¤Ê·Á¼°¤Ç½ÐÎϤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\fP\f3jps \-l remote.domain\fP
++.br
++
++.fl
++3002 /opt/jdk1.7.0/demo/jfc/Java2D/Java2Demo.JAR
++.br
++
++.fl
++2857 sun.tools.jstatd.jstatd
++.br
++
++.fl
++.fi
++
++.LP
++.LP
++RMI¥ì¥¸¥¹¥È¥ê¤Ë¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¤Ê¤¤¥Ý¡¼¥È¤ò»ÈÍѤ·¤Æ¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¾å¤Ç·×¬¤µ¤ì¤¿JVM¤ò°ìÍ÷ɽ¼¨¤¹¤ë¾ì¹ç:
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢ÆâÉôRMI¥ì¥¸¥¹¥È¥ê¤¬¥Ý¡¼¥È2002¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤¿\f3jstatd\fP¥µ¡¼¥Ð¡¼¤¬¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤ÈÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢\f2\-m\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢°ìÍ÷ɽ¼¨¤µ¤ì¤¿¤½¤ì¤¾¤ì¤ÎJava¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î\f2main\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤ë°ú¿ô¤òÁȤ߹þ¤ó¤Ç¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\fP\f3jps \-m remote.domain:2002\fP
++.br
++
++.fl
++3002 /opt/jdk1.7.0/demo/jfc/Java2D/Java2Demo.JAR
++.br
++
++.fl
++3102 sun.tools.jstatd.jstatd \-p 2002
++.fl
++.fi
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++java(1) \- Java¥¢¥×¥ê¥±¡¼¥·¥ç¥óµ¯Æ°¥Ä¡¼¥ë
++.TP 2
++o
++jstat(1) \- Java²¾ÁÛ¥Þ¥·¥óÅý·×¥Ç¡¼¥¿´Æ»ë¥Ä¡¼¥ë
++.TP 2
++o
++jstatd(1) \- jstat¥Ç¡¼¥â¥ó
++.TP 2
++o
++rmiregistry(1) \- Java¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¡¦¥ì¥¸¥¹¥È¥ê
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jrunscript.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jrunscript.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,194 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jrunscript 1 "07 May 2011"
++.TH jrunscript 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jrunscript \- ¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¹¥¯¥ê¥×¥È¡¦¥·¥§¥ë
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++°ú¿ô
++.TP 2
++o
++Îã
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jrunscript\fP [ \f2options\fP ] [ arguments... ]
++.fl
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++options
++¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É̾¤Îľ¸å¤Ëµ­½Ò¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++arguments
++°ú¿ô¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥ª¥×¥·¥ç¥ó¤Þ¤¿¤Ï¥³¥Þ¥ó¥É̾¤Îľ¸å¤Ëµ­½Ò¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jrunscript\fP¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¹¥¯¥ê¥×¥È¡¦¥·¥§¥ë¤Ç¤¹¡£jrunscript¤Ï¡¢ÂÐÏ÷¿(Æɼè¤ê\-ɾ²Á\-½ÐÎÏ)¥â¡¼¥É¤È¥Ð¥Ã¥Á(\-f¥ª¥×¥·¥ç¥ó)¥â¡¼¥É¤ÎξÊý¤Î¥¹¥¯¥ê¥×¥È¼Â¹Ô¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤³¤ì¤Ï¥¹¥¯¥ê¥×¥È¸À¸ì¤Ë°Í¸¤·¤Ê¤¤¥·¥§¥ë¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î»ÈÍѸÀ¸ì¤ÏJavaScript¤Ç¤¹¤¬¡¢\-l¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ì¤Ð¾¤Î¸À¸ì¤â»ØÄê¤Ç¤­¤Þ¤¹¡£jrunscript¤Ï¡¢Java¤È¥¹¥¯¥ê¥×¥È¸À¸ì¤È¤ÎÄÌ¿®¤Ë¤è¤Ã¤Æ¡ÖõµáŪ¤Ê¥×¥í¥°¥é¥ß¥ó¥°¡×¥¹¥¿¥¤¥ë¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
++.LP
++.LP
++\f3Ãí°Õ:\fP ¤³¤Î¥Ä¡¼¥ë¤Ï\f3»î¸³Åª¤Ê¤â¤Î\fP¤Ç¤¢¤ê¡¢¾­Íè¤ÎJDK¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÍøÍÑ\f3¤Ç¤­¤Ê¤¯¤Ê¤ë\fP²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-classpath path
++¥¹¥¯¥ê¥×¥È¤«¤é¤Î¥¢¥¯¥»¥¹ÂоݤȤʤë¥æ¡¼¥¶¡¼¤Î .class¥Õ¥¡¥¤¥ë¤Î¸¡º÷¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-cp path
++\-classpath\f2path\fP¤ÈƱµÁ¤Ç¤¹¡£
++.TP 3
++\-Dname=value
++Java¤Î¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤òÀßÄꤷ¤Þ¤¹¡£
++.TP 3
++\-J<flag>
++jrunscript¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ëJava²¾ÁÛ¥Þ¥·¥ó¤Ë<flag>¤òľÀÜÅϤ·¤Þ¤¹¡£
++.TP 3
++\-l language
++»ØÄꤵ¤ì¤¿¥¹¥¯¥ê¥×¥È¸À¸ì¤ò»ÈÍѤ·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏJavaScript¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£Â¾¤Î¥¹¥¯¥ê¥×¥È¸À¸ì¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢\-cp¤Þ¤¿¤Ï\-classpath¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢Âбþ¤¹¤ë¥¹¥¯¥ê¥×¥È¡¦¥¨¥ó¥¸¥ó¤ÎJAR¥Õ¥¡¥¤¥ë¤â»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-e script
++»ØÄꤵ¤ì¤¿¥¹¥¯¥ê¥×¥È¤òɾ²Á¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ì¤Ð¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤¹¤Ù¤Æ¤¬»ØÄꤵ¤ì¤¿¡Ö1¹Ô¡×¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
++.TP 3
++\-encoding encoding
++¥¹¥¯¥ê¥×¥È¡¦¥Õ¥¡¥¤¥ë¤ÎÆɼè¤ê»þ¤Ë»ÈÍѤ¹¤ëʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-f script\-file
++»ØÄꤵ¤ì¤¿¥¹¥¯¥ê¥×¥È¡¦¥Õ¥¡¥¤¥ë¤òɾ²Á¤·¤Þ¤¹(¥Ð¥Ã¥Á¡¦¥â¡¼¥É)¡£
++.TP 3
++\-f \-
++ɸ½àÆþÎϤ«¤é¥¹¥¯¥ê¥×¥È¤òÆɼè¤ê¡¢¤½¤ì¤òɾ²Á¤·¤Þ¤¹(ÂÐÏ÷¿¥â¡¼¥É)¡£
++.TP 3
++\-help\
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-?\
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.TP 3
++\-q\
++ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¥¹¥¯¥ê¥×¥È¡¦¥¨¥ó¥¸¥ó¤ò°ìÍ÷ɽ¼¨¤·¤¿¤¢¤È¡¢½ªÎ»¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "°ú¿ô"
++.LP
++.LP
++[arguments...]¤¬Â¸ºß¤·¤Æ¤¤¤Æ¡¢¤«¤Ä\f3\-e\fP¡¢\f3\-f\fP¤Î¤¤¤º¤ì¤Î¥ª¥×¥·¥ç¥ó¤â»ÈÍѤµ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ºÇ½é¤Î°ú¿ô¤¬¥¹¥¯¥ê¥×¥È¡¦¥Õ¥¡¥¤¥ë¤È¤Ê¤ê¡¢Â¾¤Î°ú¿ô¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¥¹¥¯¥ê¥×¥È°ú¿ô¤È¤·¤ÆÅϤµ¤ì¤Þ¤¹¡£[arguments..]¤È¡¢\f3\-e\fP¤Þ¤¿¤Ï\f3\-f\fP¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¤¹¤Ù¤Æ¤Î[arguments..]¤¬¥¹¥¯¥ê¥×¥È°ú¿ô¤È¤·¤ÆÅϤµ¤ì¤Þ¤¹¡£[arguments..]¡¢\f3\-e\fP¡¢\f3\-f\fP¤¬¤É¤ì¤â¸ºß¤·¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢ÂÐÏ÷¿¥â¡¼¥É¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¥¹¥¯¥ê¥×¥È¤«¤é¥¹¥¯¥ê¥×¥È°ú¿ô¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¡Öarguments¡×¤È¤¤¤¦Ì¾Á°¤ÎStringÇÛÎ󷿤Υ¨¥ó¥¸¥óÊÑ¿ô¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.SH "Îã"
++.LP
++.SS
++¥¤¥ó¥é¥¤¥ó¡¦¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô
++.LP
++.nf
++\f3
++.fl
++jrunscript \-e "print('hello world')"
++.fl
++jrunscript \-e "cat('http://www.example.com')"
++.fl
++\fP
++.fi
++
++.LP
++.SS
++»ØÄꤵ¤ì¤¿¸À¸ì¤Î»ÈÍѤª¤è¤Ó»ØÄꤵ¤ì¤¿¥¹¥¯¥ê¥×¥È¡¦¥Õ¥¡¥¤¥ë¤Îɾ²Á
++.LP
++.nf
++\f3
++.fl
++jrunscript \-l js \-f test.js
++.fl
++\fP
++.fi
++
++.LP
++.SS
++ÂÐÏ÷¿¥â¡¼¥É
++.LP
++.nf
++\f3
++.fl
++jrunscript
++.fl
++js> print('Hello World\\n');
++.fl
++Hello World
++.fl
++js> 34 + 55
++.fl
++89.0
++.fl
++js> t = new java.lang.Thread(function() { print('Hello World\\n'); })
++.fl
++Thread[Thread\-0,5,main]
++.fl
++js> t.start()
++.fl
++js> Hello World
++.fl
++
++.fl
++js>
++.fl
++\fP
++.fi
++
++.LP
++.SS
++¥¹¥¯¥ê¥×¥È°ú¿ô¤ò»ØÄꤷ¤¿¥¹¥¯¥ê¥×¥È¡¦¥Õ¥¡¥¤¥ë¤Î¼Â¹Ô
++.LP
++.nf
++\f3
++.fl
++jrunscript test.js arg1 arg2 arg3
++.fl
++\fP
++.fi
++
++.LP
++test.js¤¬¼Â¹ÔÂоݤȤʤ륹¥¯¥ê¥×¥È¡¦¥Õ¥¡¥¤¥ë¤Ç¤¢¤ê¡¢arg1¡¢arg2¤ª¤è¤Óarg3¤Ï¥¹¥¯¥ê¥×¥È°ú¿ô¤È¤·¤Æ¥¹¥¯¥ê¥×¥È¤ËÅϤµ¤ì¤Þ¤¹¡£¥¹¥¯¥ê¥×¥È¤Ï¡Öarguments¡×ÇÛÎó¤ò»ÈÍѤ·¤Æ¤³¤ì¤é¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.LP
++JavaScript¤¬»ÈÍѤµ¤ì¤ë¾ì¹ç¡¢jrunscript¤Ï¡¢ºÇ½é¤Î¥æ¡¼¥¶¡¼ÄêµÁ¥¹¥¯¥ê¥×¥È¤òɾ²Á¤¹¤ëÁ°¤Ë¡¢¤¤¤¯¤Ä¤«¤ÎÁȹþ¤ß´Ø¿ô¤äÁȹþ¤ß¥ª¥Ö¥¸¥§¥¯¥È¤ò½é´ü²½¤·¤Þ¤¹¡£¤³¤ì¤é¤ÎJavaScriptÁȹþ¤ßµ¡Ç½¤Ë¤Ä¤¤¤Æ¤Ï¡¢
++.na
++\f2jsdocs\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jsadebugd.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jsadebugd.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,107 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jsadebugd 1 "07 May 2011"
++.TH jsadebugd 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jsadebugd \- ¥µ¡¼¥Ó¥¹¥¢¥Ó¥ê¥Æ¥£¡¦¥¨¡¼¥¸¥§¥ó¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥Ç¡¼¥â¥ó
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jsadebugd\fP pid [ server\-id ]
++.fl
++\f3jsadebugd\fP executable core [ server\-id ]
++.fl
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++pid
++¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤¬Àܳ¤¹¤ë¥×¥í¥»¥¹¤Î¥×¥í¥»¥¹ID¤Ç¤¹¡£¥×¥í¥»¥¹¤ÏJava¥×¥í¥»¥¹¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Þ¥·¥ó¾å¤Ç¼Â¹Ô¤·¤Æ¤¤¤ëJava¥×¥í¥»¥¹¤Î°ìÍ÷¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¡¢jps(1)¤ò»ÈÍѤ·¤Þ¤¹¡£Ã±°ì¤Î¥×¥í¥»¥¹¤ËÀܳ¤Ç¤­¤ë¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ï¡¢1¤Ä¤ËÀ©¸Â¤µ¤ì¤Þ¤¹¡£
++.TP 3
++executable
++¥³¥¢¡¦¥À¥ó¥×¤ÎºîÀ®¸µ¤ÎJava¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë¡£
++.TP 3
++core
++¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤òÀܳ¤¹¤ë¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤Ç¤¹¡£
++.TP 3
++server\-id
++Ê£¿ô¤Î¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤¬Æ±°ì¤Î¥Þ¥·¥ó¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤ËɬÍפˤʤ롢¥ª¥×¥·¥ç¥ó¤Î°ì°Õ¤ÎID¤Ç¤¹¡£¤³¤ÎID¤Ï¡¢¥ê¥â¡¼¥È¡¦¥¯¥é¥¤¥¢¥ó¥È¤¬¡¢ÀܳÀè¤Î¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤òÆÃÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ÎID¤Ï¡¢Ã±°ì¤Î¥Þ¥·¥óÆâ¤Ç°ì°Õ¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jsadebugd\fP¤Ï¡¢Java¥×¥í¥»¥¹¤Þ¤¿¤Ï¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤ËÀܳ¤·¡¢¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤È¤·¤Æµ¡Ç½¤·¤Þ¤¹¡£jstack(1)¡¢jmap(1)¤ª¤è¤Ójinfo(1)¤Ê¤É¤Î¥ê¥â¡¼¥È¡¦¥¯¥é¥¤¥¢¥ó¥È¤Ï¡¢Java Remote Method Invocation(RMI)¤ò»ÈÍѤ·¤Æ¤¤¤ë¥µ¡¼¥Ð¡¼¤ËÀܳ¤Ç¤­¤Þ¤¹¡£\f2jsadebugd\fP¤òµ¯Æ°¤¹¤ëÁ°¤Ë¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Æ
++.na
++\f2rmiregistry\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi¤òµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\fP\f4rmiregistry \-J\-Xbootclasspath/p:$JAVA_HOME/lib/sajdi.jar\fP\f3
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤³¤Ç¡¢\f2$JAVA_HOME\fP¤ÏJDK¥¤¥ó¥¹¥È¡¼¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£rmiregistry¤¬µ¯Æ°¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢jsadebugd¤Ïɸ½à(1099)¥Ý¡¼¥È¤Îrmiregistry¤òÆâÉô¤Çµ¯Æ°¤·¤Þ¤¹¡£¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤Ï¡¢SIGINT¤òÁ÷¿®¤¹¤ë([Ctrl]+[C]¤ò²¡¤¹)¤³¤È¤Ë¤è¤êÄä»ß¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f3Ãí°Õ\fP \- ¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¥µ¥Ý¡¼¥ÈÂоݳ°¤Ç¤¢¤ê¡¢¾­Íè¤ÎJDK¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÍøÍѤǤ­¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£dbgeng.dll¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤Windows¥·¥¹¥Æ¥à¤Ç¤Ï¡¢¡ÖDebugging Tools For Windows¡×¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¤¤È¤³¤ì¤é¤Î¥Ä¡¼¥ë¤¬Àµ¾ï¤ËÆ°ºî¤·¤Þ¤»¤ó¡£¤Þ¤¿¡¢\f2PATH\fP´Ä¶­ÊÑ¿ô¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥×¥í¥»¥¹¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤ë\f2jvm.dll\fP¤Î¾ì½ê¡¢¤Þ¤¿¤Ï¥¯¥é¥Ã¥·¥å¡¦¥À¥ó¥×¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤¿¾ì½ê¤¬´Þ¤Þ¤ì¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£\f2set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++jinfo(1)
++.TP 2
++o
++jmap(1)
++.TP 2
++o
++jps(1)
++.TP 2
++o
++jstack(1)
++.TP 2
++o
++.na
++\f2rmiregistry\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jstack.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jstack.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,154 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jstack 1 "07 May 2011"
++.TH jstack 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jstack \- ¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹
++.br
++
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.br
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.TP 2
++o
++´ûÃΤΥХ°
++.br
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jstack\fP [ option ] pid
++.fl
++\f3jstack\fP [ option ] executable core
++.fl
++\f3jstack\fP [ option ] [server\-id@]remote\-hostname\-or\-IP
++.fl
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.LP
++³Æ¥ª¥×¥·¥ç¥ó¤Ï¸ß¤¤¤ËÇÓ¾Ū¤Ç¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É̾¤Îľ¸å¤Ëµ­½Ò¤·¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.RS 3
++.TP 3
++pid
++½ÐÎϤ¹¤ë¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹¤Î¥×¥í¥»¥¹ID¤Ç¤¹¡£¥×¥í¥»¥¹¤ÏJava¥×¥í¥»¥¹¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Þ¥·¥ó¾å¤Ç¼Â¹Ô¤·¤Æ¤¤¤ëJava¥×¥í¥»¥¹¤Î°ìÍ÷¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¡¢jps(1)¤ò»ÈÍѤ·¤Þ¤¹¡£
++.RE
++
++.LP
++.RS 3
++.TP 3
++executable
++¥³¥¢¡¦¥À¥ó¥×¤ÎºîÀ®¸µ¤ÎJava¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë¡£
++.br
++.TP 3
++core
++½ÐÎϤ¹¤ë¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤Ç¤¹¡£
++.br
++.TP 3
++remote\-hostname\-or\-IP
++¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼(jsadebugd(1)¤ò»²¾È)¤Î¥Û¥¹¥È̾¤Þ¤¿¤ÏIP¥¢¥É¥ì¥¹¡£
++.br
++.TP 3
++server\-id
++Ê£¿ô¤Î¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤¬Æ±°ì¤Î¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¤Ç¼Â¹Ô¤·¤Æ¤¤¤ë¾ì¹ç¤Î¡¢¥ª¥×¥·¥ç¥ó¸ÇÍ­¤ÎID¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jstack\fP¤Ï¡¢»ØÄꤵ¤ì¤¿Java¥×¥í¥»¥¹¤ä¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤ËÂФ¹¤ëJava¥¹¥ì¥Ã¥É¤ÎJava¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹¤ò½ÐÎϤ·¤Þ¤¹¡£Java¥Õ¥ì¡¼¥à¤´¤È¤Ë¡¢¥Õ¥ë¥¯¥é¥¹Ì¾¡¢¥á¥½¥Ã¥É̾¡¢¡Öbci¡×(¥Ð¥¤¥È¥³¡¼¥É¡¦¥¤¥ó¥Ç¥Ã¥¯¥¹)¡¢¤ª¤è¤Ó¹ÔÈÖ¹æ(ÍøÍѲÄǽ¤Ê¾ì¹ç)¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£\-m¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢jstack¤Ï¡¢¤¹¤Ù¤Æ¤Î¥¹¥ì¥Ã¥É¤ÎJava¥Õ¥ì¡¼¥à¤È¥Í¥¤¥Æ¥£¥Ö¡¦¥Õ¥ì¡¼¥à¤ÎξÊý¤ò¡¢¡Öpc¡×(¥×¥í¥°¥é¥à¡¦¥«¥¦¥ó¥¿)¤È¤È¤â¤Ë½ÐÎϤ·¤Þ¤¹¡£¥Í¥¤¥Æ¥£¥Ö¡¦¥Õ¥ì¡¼¥à¤´¤È¤Ë¡¢¡Öpc¡×¤ËºÇ¤â¶á¤¤¥Í¥¤¥Æ¥£¥Ö¡¦¥·¥ó¥Ü¥ë(ÍøÍѲÄǽ¤Ê¾ì¹ç)¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£C++ʬ²ò̾¤Ïʬ²ò²ò½ü¤µ¤ì¤Þ¤»¤ó¡£C++̾¤òʬ²ò²ò½ü¤¹¤ë¤Ë¤Ï¡¢¤³¤Î¥³¥Þ¥ó¥É¤Î½ÐÎϤò\f3c++filt\fP¤Ë¥Ñ¥¤¥×¤·¤Þ¤¹¡£»ØÄꤵ¤ì¤¿¥×¥í¥»¥¹¤¬64¥Ó¥Ã¥ÈVM¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f2\-J\-d64\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.br
++
++.LP
++.nf
++\f3
++.fl
++jstack \-J\-d64 \-m pid
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f3Ãí°Õ\fP \- ¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¥µ¥Ý¡¼¥ÈÂоݳ°¤Ç¤¢¤ê¡¢¾­Íè¤ÎJDK¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÍøÍѤǤ­¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£dbgeng.dll¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤¤Windows¥·¥¹¥Æ¥à¤Ç¤Ï¡¢¡ÖDebugging Tools For Windows¡×¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¤¤È¤³¤ì¤é¤Î¥Ä¡¼¥ë¤¬Àµ¾ï¤ËÆ°ºî¤·¤Þ¤»¤ó¡£¤Þ¤¿¡¢\f2PATH\fP´Ä¶­ÊÑ¿ô¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥×¥í¥»¥¹¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤ë\f2jvm.dll\fP¤Î¾ì½ê¡¢¤Þ¤¿¤Ï¥¯¥é¥Ã¥·¥å¡¦¥À¥ó¥×¡¦¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤¿¾ì½ê¤¬´Þ¤Þ¤ì¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£\f2set PATH=<jdk>\\jre\\bin\\client;%PATH%\fP
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-F
++¡Öjstack [\-l] pid¡×¤¬±þÅú¤·¤Ê¤¤¾ì¹ç¤Ë¥¹¥¿¥Ã¥¯¡¦¥À¥ó¥×¤ò¶¯À©¤·¤Þ¤¹¡£
++.TP 3
++\-l
++Ĺ·Á¼°¤Î¥ê¥¹¥È¡£½êÍ­java.util.concurrent¤Î
++.na
++\f2½êÍ­¤Ç¤­¤ë¥·¥ó¥¯¥í¥Ê¥¤¥¶\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html¤Î°ìÍ÷¤Ê¤É¡¢¥í¥Ã¥¯¤Ë¤Ä¤¤¤Æ¤ÎÄɲþðÊó¤ò°õºþ¤·¤Þ¤¹¡£
++.TP 3
++\-m
++º®¹ç¥â¡¼¥É(Java¤ª¤è¤Ó¥Í¥¤¥Æ¥£¥ÖC/C++¥Õ¥ì¡¼¥à¤ÎξÊý)¤Î¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹¤ò½ÐÎϤ·¤Þ¤¹¡£
++.TP 3
++\-h
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£
++.br
++.br
++.TP 3
++\-help
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£
++.br
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++pstack(1)
++.TP 2
++o
++c++filt(1)
++.TP 2
++o
++jps(1)
++.TP 2
++o
++jsadebugd(1)
++.RE
++
++.LP
++.SH "´ûÃΤΥХ°"
++.LP
++.LP
++º®¹ç¥â¡¼¥É¤Î¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹(\-m¥ª¥×¥·¥ç¥ó»ÈÍÑ)¤Ï¡¢¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤Ç¤Ïµ¡Ç½¤·¤Þ¤»¤ó¡£
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jstat.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jstat.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,5370 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jstat 1 "07 May 2011"
++.TH jstat 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jstat \- Java²¾ÁÛ¥Þ¥·¥óÅý·×¥Ç¡¼¥¿´Æ»ë¥Ä¡¼¥ë
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++²¾ÁÛ¥Þ¥·¥ó¼±ÊÌ»Ò
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.RS 3
++.TP 2
++*
++°ìÈÌŪ¤Ê¥ª¥×¥·¥ç¥ó
++.TP 2
++*
++½ÐÎÏ¥ª¥×¥·¥ç¥ó
++.RE
++.TP 2
++o
++Îã
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3jstat\fP [ \f2generalOption\fP | \f2outputOptions\fP \f2vmid\fP [\f2interval\fP[s|ms] [\f2count\fP]] ]
++.fl
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++generalOption
++ñÆȤǻÈÍѤ¹¤ë°ìÈÌŪ¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹(\-help¡¢\-options¤Þ¤¿¤Ï\-version)¡£
++.TP 3
++outputOptions
++ñ°ì¤Î\f2statOption\fP¤È¡¢\-t¡¢\-h¤ª¤è¤Ó\-J¥ª¥×¥·¥ç¥ó¤Î¤¤¤º¤ì¤«¤òÁȤ߹礻¤¿¡¢1¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î½ÐÎÏ¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£
++.TP 3
++vmid
++¥¿¡¼¥²¥Ã¥È¤ÎJava²¾ÁÛ¥Þ¥·¥ó(JVM)¤ò¼¨¤¹Ê¸»úÎó¤Ç¤¢¤ë²¾ÁÛ¥Þ¥·¥ó¼±Ê̻ҤǤ¹¡£°ìÈÌŪ¤Ê¹½Ê¸¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++[\fP\f4protocol\fP\f3:][//]\fP\f4lvmid\fP[@\f2hostname\fP[:\f2port\fP]/\f2servername\fP]
++.fl
++.fi
++vmidʸ»úÎó¤Î¹½Ê¸¤ÎÂçÉôʬ¤Ï¡¢URI¤Î¹½Ê¸¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£\f2vmid\fP¤Ï¡¢¥í¡¼¥«¥ëJVM¤òɽ¤¹Ã±½ã¤ÊÀ°¿ô¤«¤é¡¢ÄÌ¿®¥×¥í¥È¥³¥ë¡¢¥Ý¡¼¥ÈÈֹ桢¤ª¤è¤Ó¾¤Î¼ÂÁõ¸ÇÍ­¤ÎÃͤò¼¨¤¹Ê£»¨¤Ê¹½Â¤¤Þ¤Ç¡¢ÍÍ¡¹¤Ë°Û¤Ê¤ê¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢²¾ÁÛ¥Þ¥·¥ó¼±Ê̻Ҥò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++interval[s|ms]
++ÉÃ(s)¤Þ¤¿¤Ï¥ß¥êÉÃ(ms)¤Î¤¦¤Á»ØÄꤷ¤¿Ã±°Ì¤Ç¤Î¥µ¥ó¥×¥ê¥ó¥°´Ö³Ö¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Îñ°Ì¤Ï¥ß¥êÉäǤ¹¡£Àµ¤ÎÀ°¿ô¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢\f3jstat\fP¤Ïinterval¤´¤È¤Ë½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡£
++.TP 3
++count
++ɽ¼¨¤¹¤ë¥µ¥ó¥×¥ë¿ô¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥ÈÃͤÏ̵¸Â¤Ç¤¹¡£¤Ä¤Þ¤ê¡¢\f3jstat\fP¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈJVM¤¬½ªÎ»¤¹¤ë¤Þ¤Ç¡¢¤Þ¤¿¤Ï\f3jstat\fP¥³¥Þ¥ó¥É¤¬½ªÎ»¤¹¤ë¤Þ¤Ç¡¢Åý·×¥Ç¡¼¥¿¤òɽ¼¨¤·¤Þ¤¹¡£Àµ¤ÎÀ°¿ô¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jstat\fP¥Ä¡¼¥ë¤Ï¡¢ÀßÃÖ¤µ¤ì¤Æ¤¤¤ëHotSpot Java²¾ÁÛ¥Þ¥·¥ó(JVM)¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹Åý·×¥Ç¡¼¥¿¤òɽ¼¨¤·¤Þ¤¹¡£¥¿¡¼¥²¥Ã¥ÈJVM¤Ï¡¢²¾ÁÛ¥Þ¥·¥ó¼±Ê̻ҡ¢¤Ä¤Þ¤ê²¼µ­¤Î\f2vmid\fP¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¼±Ê̤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f3Ãí°Õ\fP: ¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¥µ¥Ý¡¼¥ÈÂоݳ°¤Ç¤¢¤ê¡¢¾­Íè¤ÎJDK¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÍøÍѤǤ­¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¸½ºß¡¢Windows 98¤ª¤è¤ÓWindows ME¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£
++.br
++
++.LP
++.SS
++²¾ÁÛ¥Þ¥·¥ó¼±ÊÌ»Ò
++.LP
++.LP
++\f2vmid\fPʸ»úÎó¤Î¹½Ê¸¤ÎÂçÉôʬ¤Ï¡¢URI¤Î¹½Ê¸¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++[\fP\f4protocol\fP\f3:][//]\fP\f4lvmid\fP[@\f2hostname\fP][:\f2port\fP][/\f2servername\fP]
++.fl
++.fi
++
++.LP
++.RS 3
++.TP 3
++protocol
++ÄÌ¿®¥×¥í¥È¥³¥ë¤Ç¤¹¡£\f2protocol\fP¤¬¾Êά¤µ¤ì¡¢\f2hostname\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥×¥í¥È¥³¥ë¤¬¡¢¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¸ÇÍ­¤ÎºÇŬ²½¤µ¤ì¤¿¥í¡¼¥«¥ë¡¦¥×¥í¥È¥³¥ë¤Ë¤Ê¤ê¤Þ¤¹¡£\f2protocol\fP¤¬¾Êά¤µ¤ì¡¢\f2hostname\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥×¥í¥È¥³¥ë¤Ï\f3rmi\fP¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++lvmid
++¥¿¡¼¥²¥Ã¥ÈJVM¤Î¥í¡¼¥«¥ë²¾ÁÛ¥Þ¥·¥ó¼±Ê̻ҤǤ¹¡£\f2lvmid\fP¤Ï¡¢¥·¥¹¥Æ¥à¾å¤ÎJVM¤ò°ì°Õ¤Ë¼±Ê̤¹¤ë¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¸ÇÍ­¤ÎÃͤǤ¹¡£\f2lvmid\fP¤Ï¡¢²¾ÁÛ¥Þ¥·¥ó¼±Ê̻ҤÎÍ£°ì¤Îɬ¿ÜÍ×ÁǤǤ¹¡£\f2lvmid\fP¤Ï¡¢°ìÈÌŪ¤Ë¤Ï¥¿¡¼¥²¥Ã¥ÈJVM¥×¥í¥»¥¹¤ËÂФ¹¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¤Î¥×¥í¥»¥¹¼±Ê̻ҤǤ¹¤¬¡¢É¬¤º¤·¤â¤½¤¦¤Ç¤¢¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£jps(1)¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢\f2lvmid\fP¤òÆÃÄê¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢Unix¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï\f3ps\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢Windows¤Ç¤ÏWindows¥¿¥¹¥¯¡¦¥Þ¥Í¡¼¥¸¥ã¤ò»ÈÍѤ·¤Æ¡¢\f2lvmid\fP¤òÆÃÄê¤Ç¤­¤Þ¤¹¡£
++.TP 3
++hostname
++¥¿¡¼¥²¥Ã¥È¡¦¥Û¥¹¥È¤ò¼¨¤¹¥Û¥¹¥È̾¤Þ¤¿¤ÏIP¥¢¥É¥ì¥¹¤Ç¤¹¡£\f2hostname\fP¤¬¾Êά¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥Û¥¹¥È¤Ï¥í¡¼¥«¥ë¡¦¥Û¥¹¥È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++port
++¥ê¥â¡¼¥È¡¦¥µ¡¼¥Ð¡¼¤ÈÄÌ¿®¤¹¤ë¤¿¤á¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥Ý¡¼¥È¤Ç¤¹¡£\f2hostname\fP¤¬¾Êά¤µ¤ì¤Æ¤¤¤ë¤«¡¢ºÇŬ²½¤µ¤ì¤¿¥í¡¼¥«¥ë¡¦¥×¥í¥È¥³¥ë¤¬\f2protocol\fP¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f2port\fP¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢\f2port\fP¥Ñ¥é¥á¡¼¥¿¤Î°·¤¤¤Ï¡¢¼ÂÁõ¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î\f3rmi\fP¥×¥í¥È¥³¥ë¤Î¾ì¹ç¡¢\f2port\fP¤Ï¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¾å¤Îrmiregistry¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò¼¨¤·¤Þ¤¹¡£\f2port\fP¤¬¾Êά¤µ¤ì¡¢\f2protocol\fP¤Ç\f3rmi\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Îrmiregistry¥Ý¡¼¥È(1099)¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++servername
++¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Î°·¤¤¤Ï¡¢¼ÂÁõ¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£ºÇŬ²½¤µ¤ì¤¿¥í¡¼¥«¥ë¡¦¥×¥í¥È¥³¥ë¤Î¾ì¹ç¡¢¤³¤Î¥Õ¥£¡¼¥ë¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£\f3rmi\fP¥×¥í¥È¥³¥ë¤Î¾ì¹ç¡¢¤³¤ì¤Ï¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¾å¤ÎRMI¥ê¥½¡¼¥¹¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î̾Á°¤òɽ¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++\f3jstat\fP¥³¥Þ¥ó¥É¤Ï¡¢°ìÈÌŪ¤Ê¥ª¥×¥·¥ç¥ó¤È½ÐÎÏ¥ª¥×¥·¥ç¥ó¤Î2¤Ä¤Î¥¿¥¤¥×¤Î¥ª¥×¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£°ìÈÌŪ¤Ê¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢\f3jstat\fP¤Ï´Êñ¤Ê»ÈÍÑΨ¤ª¤è¤Ó¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£½ÐÎÏ¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢Åý·×¥Ç¡¼¥¿½ÐÎϤÎÆâÍƤȷÁ¼°¤¬·è¤Þ¤ê¤Þ¤¹¡£
++.br
++
++.LP
++.LP
++\f3Ãí°Õ\fP: ¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤È¤½¤Îµ¡Ç½¤Ï¡¢¾­Íè¤Î¥ê¥ê¡¼¥¹¤ÇÊѹ¹¤Þ¤¿¤ÏÇѻߤµ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SS
++°ìÈÌŪ¤Ê¥ª¥×¥·¥ç¥ó
++.LP
++.LP
++¤¤¤º¤ì¤«¤Î°ìÈÌŪ¤Ê¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢Â¾¤Î¥ª¥×¥·¥ç¥ó¤Þ¤¿¤Ï¥Ñ¥é¥á¡¼¥¿¤Ï°ìÀÚ»ØÄê¤Ç¤­¤Þ¤»¤ó¡£
++.LP
++.RS 3
++.TP 3
++\-help
++¥Ø¥ë¥×¡¦¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-version
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-options
++Åý·×¥Ç¡¼¥¿¡¦¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£²¼µ­¤Î½ÐÎÏ¥ª¥×¥·¥ç¥ó¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++
++.LP
++.SS
++½ÐÎÏ¥ª¥×¥·¥ç¥ó
++.LP
++.LP
++°ìÈÌŪ¤Ê¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ë¡¢½ÐÎÏ¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£½ÐÎÏ¥ª¥×¥·¥ç¥ó¤Ï¡¢\f3jstat\fP¤Î½ÐÎϤÎÆâÍƤª¤è¤Ó·Á¼°¤ò·èÄꤷ¡¢Ã±°ì¤Î\f2statOption\fP¤È¡¢Â¾¤Î¤¤¤º¤ì¤«¤Î½ÐÎÏ¥ª¥×¥·¥ç¥ó(\-h¡¢\-t¤ª¤è¤Ó\-J)¤Ç¹½À®¤µ¤ì¤Þ¤¹¡£\f2statOption\fP¤ÏºÇ½é¤Ëµ­½Ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++½ÐÎϤϡ¢³ÆÎ󤬶õÇò¤Ç¶èÀÚ¤é¤ì¤¿É½¤Î·Á¼°¤Ë¤Ê¤ê¤Þ¤¹¡£¥¿¥¤¥È¥ë¤ò´Þ¤à¥Ø¥Ã¥À¡¼¹Ô¤Ë¤è¤Ã¤Æ¡¢³ÆÎó¤Î°ÕÌ£¤¬¤ï¤«¤ê¤Þ¤¹¡£¥Ø¥Ã¥À¡¼¤Îɽ¼¨ÉÑÅÙ¤òÀßÄꤹ¤ë¤Ë¤Ï¡¢\f3\-h\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£Îó¤Î¥Ø¥Ã¥À¡¼Ì¾¤Ï¡¢ÍÍ¡¹¤Ê¥ª¥×¥·¥ç¥ó´Ö¤Ç¤ª¤ª¤à¤Í°ì´ÓÀ­¤¬Êݤ¿¤ì¤Æ¤¤¤Þ¤¹¡£°ìÈ̤ˡ¢2¤Ä¤Î¥ª¥×¥·¥ç¥ó¤ÇƱ¤¸Ì¾Á°¤ÎÎ󤬻ÈÍѤµ¤ì¤Æ¤¤¤ì¤Ð¡¢2¤Ä¤ÎÎó¤Î¥Ç¡¼¥¿¡¦¥½¡¼¥¹¤ÏƱ¤¸¤Ç¤¹¡£
++.LP
++.LP
++\f3\-t\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢\f2Timestamp\fP¤È¤¤¤¦¥é¥Ù¥ë¤ÎÉÕ¤¤¤¿¥¿¥¤¥à¥¹¥¿¥ó¥×¤ÎÎ󤬡¢½ÐÎϤκǽé¤ÎÎó¤È¤·¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£\f2Timestamp\fPÎó¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈJVM¤Îµ¯Æ°¤«¤é¤Î·Ð²á»þ´Ö¤¬¡¢ÉÃñ°Ì¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£¥¿¥¤¥à¥¹¥¿¥ó¥×¤ÎÀºÅ٤ϡ¢ÍÍ¡¹¤ÊÍ×°ø¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¡¢ÂçÎ̤ÎÉé²Ù¤Î¤«¤«¤Ã¤¿¥·¥¹¥Æ¥à¤Ç¤Î¥¹¥ì¥Ã¥É¡¦¥¹¥±¥¸¥å¡¼¥ë¤ÎÃÙ±ä¤Ë¤è¤êÊÑÆ°¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2interval\fP¤ª¤è¤Ó\f2count\fP¥Ñ¥é¥á¡¼¥¿¤ò»ÈÍѤ·¤Æ¡¢\f3jstat\fP¤¬¤½¤Î½ÐÎϤòɽ¼¨¤¹¤ëÉÑÅ٤Ȳó¿ô¤ò¤½¤ì¤¾¤ì»ØÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++\f3Ãí°Õ\fP: ¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¤³¤Î·Á¼°¤ÏÊѹ¹¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢\f3jstat\fP¤Î½ÐÎϤò²òÀϤ¹¤ë¥¹¥¯¥ê¥×¥È¤ÏºîÀ®¤·¤Ê¤¤¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£\f3jstat\fP½ÐÎϤò²òÀϤ¹¤ë¥¹¥¯¥ê¥×¥È¤òºîÀ®¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥Ä¡¼¥ë¤Î¾­Íè¤Î¥ê¥ê¡¼¥¹¤Ç¡¢¤½¤Î¥¹¥¯¥ê¥×¥È¤òÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ë¤³¤È¤Ëα°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.RS 3
++.TP 3
++\-statOption
++\f3jstat\fP¤¬É½¼¨¤¹¤ëÅý·×¥Ç¡¼¥¿¾ðÊó¤ò»ØÄꤷ¤Þ¤¹¡£¼¡¤Îɽ¤Ë¡¢ÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤Î°ìÍ÷¤ò¼¨¤·¤Þ¤¹¡£ÆÃÄê¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¡¦¥¤¥ó¥¹¥È¡¼¥ë¤Î¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë¤Ë¤Ï¡¢°ìÈÌŪ¤Ê¥ª¥×¥·¥ç¥ó¤Î\f3\-options\fP¤ò»ÈÍѤ·¤Þ¤¹¡£
++.br
++.br
++.LP
++.TS
++.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
++.de 35
++.ps \n(.s
++.vs \n(.vu
++.in \n(.iu
++.if \n(.u .fi
++.if \n(.j .ad
++.if \n(.j=0 .na
++..
++.nf
++.nr #~ 0
++.if n .nr #~ 0.6n
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.fc
++.nr 33 \n(.s
++.rm 80 81
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤ÎÆ°ºî¤Ë´Ø¤¹¤ëÅý·×¥Ç¡¼¥¿
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++HotSpot Just\-in\-Time¥³¥ó¥Ñ¥¤¥é¤ÎÆ°ºî¤Ë´Ø¤¹¤ëÅý·×¥Ç¡¼¥¿
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥È¤µ¤ì¤¿¥Ò¡¼¥×¤ÎÆ°ºî¤Ë´Ø¤¹¤ëÅý·×¥Ç¡¼¥¿
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++À¤Â头¤È¤ÎÍÆÎ̤ÈÂбþ¤¹¤ëÎΰè¤Ë´Ø¤¹¤ëÅý·×¥Ç¡¼¥¿
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÅý·×¥Ç¡¼¥¿¤Î³µÍ×(\f3\-gcutil\fP¤ÈƱ¤¸)¤È¡¢Ä¾Á°¤ª¤è¤Ó¸½ºß(ŬÍѲÄǽ¤Ê¾ì¹ç)¤Î¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¡¦¥¤¥Ù¥ó¥È¤Î¸¶°ø
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++NewÀ¤Âå¤ÎÆ°ºî¤Ë´Ø¤¹¤ëÅý·×¥Ç¡¼¥¿
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++NewÀ¤Âå¤Î¥µ¥¤¥º¤ÈÂбþ¤¹¤ëÎΰè¤Ë´Ø¤¹¤ëÅý·×¥Ç¡¼¥¿
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÀ¤Â太¤è¤ÓPermanentÀ¤Âå¤ÎÆ°ºî¤Ë´Ø¤¹¤ëÅý·×¥Ç¡¼¥¿
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÀ¤Âå¤Î¥µ¥¤¥º¤Ë´Ø¤¹¤ëÅý·×¥Ç¡¼¥¿
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÀ¤Âå¤Î¥µ¥¤¥º¤Ë´Ø¤¹¤ëÅý·×¥Ç¡¼¥¿
++.br
++.di
++.nr j| \n(dn
++.nr j- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di k+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÅý·×¥Ç¡¼¥¿¤Î³µÍ×
++.br
++.di
++.nr k| \n(dn
++.nr k- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di l+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++HotSpot¥³¥ó¥Ñ¥¤¥ëÊýË¡¤ÎÅý·×¥Ç¡¼¥¿
++.br
++.di
++.nr l| \n(dn
++.nr l- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w\f3¥ª¥×¥·¥ç¥ó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wclass
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wcompiler
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wgc
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wgccapacity
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wgccause
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wgcnew
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wgcnewcapacity
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wgcold
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wgcoldcapacity
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wgcpermcapacity
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wgcutil
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wprintcompilation
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ɽ¼¨ÆâÍÆ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.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(i-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(j-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(k-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(l-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 248 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3¥ª¥×¥·¥ç¥ó\fP\h'|\n(41u'\f3ɽ¼¨ÆâÍÆ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'class\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'compiler\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'gc\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'gccapacity\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'gccause\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'gcnew\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'gcnewcapacity\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'gcold\h'|\n(41u'
++.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(31u
++.ne \n(i|u+\n(.Vu
++.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'gcoldcapacity\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'gcpermcapacity\h'|\n(41u'
++.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(31u
++.ne \n(k|u+\n(.Vu
++.if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'gcutil\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'printcompilation\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.l+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.rm g+
++.rm h+
++.rm i+
++.rm j+
++.rm k+
++.rm l+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-52
++.TP 3
++\-h n
++\f2n\fP¥µ¥ó¥×¥ë(½ÐÎϹÔ)¤´¤È¤ËÎó¥Ø¥Ã¥À¡¼¤òɽ¼¨¤·¤Þ¤¹¡£¤³¤³¤Ç¡¢\f2n\fP¤ÏÀµ¤ÎÀ°¿ôÃͤǤ¹¡£¥Ç¥Õ¥©¥ë¥ÈÃͤÏ0¤Ç¤¹¡£¤³¤Î¾ì¹ç¡¢¥Ç¡¼¥¿¤ÎºÇ½é¤Î¹Ô¤Î¾å¤ËÎó¥Ø¥Ã¥À¡¼¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-t n
++¥¿¥¤¥à¥¹¥¿¥ó¥×Îó¤ò½ÐÎϤκǽé¤ÎÎó¤È¤·¤Æɽ¼¨¤·¤Þ¤¹¡£¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈJVM¤Îµ¯Æ°»þ¤«¤é¤Î·Ð²á»þ´Ö¤Ç¤¹¡£
++.TP 3
++\-JjavaOption
++\f2javaOption\fP¤ò\f3java\fP¥¢¥×¥ê¥±¡¼¥·¥ç¥óµ¯Æ°¥Ä¡¼¥ë¤ËÅϤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤Î´°Á´¤Ê¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢java(1)¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++
++.LP
++.SS
++statOption¤È½ÐÎÏ
++.LP
++.LP
++°Ê¹ß¤Îɽ¤Ç¤Ï¡¢\f3jstat\fP¤¬\f2statOption\fP¤´¤È¤Ë½ÐÎϤ¹¤ëÎó¤Ë¤Ä¤¤¤Æ³µÍפò¼¨¤·¤Þ¤¹¡£
++.br
++
++.LP
++.SS
++\-class¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥í¡¼¥É¤µ¤ì¤¿¥¯¥é¥¹¤Î¿ô
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¢¥ó¥í¡¼¥É¤µ¤ì¤¿¥¯¥é¥¹¤Î¿ô
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¢¥ó¥í¡¼¥É¤µ¤ì¤¿KB¿ô
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¯¥é¥¹¤Î¥í¡¼¥É¤ä¥¢¥ó¥í¡¼¥É½èÍý¤ËÍפ·¤¿»þ´Ö
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤ÎÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wLoaded
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wBytes
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wUnloaded
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wBytes
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wTime
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w¥í¡¼¥É¤µ¤ì¤¿KB¿ô
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 296 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤ÎÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Loaded\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Bytes\h'|\n(41u'¥í¡¼¥É¤µ¤ì¤¿KB¿ô
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Unloaded\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Bytes\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Time\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.d+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-23
++
++.LP
++.SS
++\-compiler¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼Â¹Ô¤µ¤ì¤¿¥³¥ó¥Ñ¥¤¥ë¡¦¥¿¥¹¥¯¤Î¿ô
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ºÇÔ¤·¤¿¥³¥ó¥Ñ¥¤¥ë¡¦¥¿¥¹¥¯¤Î¿ô
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++̵¸ú¤Ë¤µ¤ì¤¿¥³¥ó¥Ñ¥¤¥ë¡¦¥¿¥¹¥¯¤Î¿ô
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥³¥ó¥Ñ¥¤¥ë¡¦¥¿¥¹¥¯¤Î¼Â¹Ô¤ËÍפ·¤¿»þ´Ö
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++ºÇ¸å¤Ë¼ºÇÔ¤·¤¿¥³¥ó¥Ñ¥¤¥ë¤Î¥³¥ó¥Ñ¥¤¥ë¡¦¥¿¥¤¥×
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++ºÇ¸å¤Ë¼ºÇÔ¤·¤¿¥³¥ó¥Ñ¥¤¥ë¤Î¥¯¥é¥¹Ì¾¤È¥á¥½¥Ã¥É
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \wHotSpot Just\-In\-Time¥³¥ó¥Ñ¥¤¥é¤ÎÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wCompiled
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFailed
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wInvalid
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wTime
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFailedType
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFailedMethod
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 332 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'HotSpot Just\-In\-Time¥³¥ó¥Ñ¥¤¥é¤ÎÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Compiled\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Failed\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Invalid\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Time\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FailedType\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FailedMethod\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-29
++
++.LP
++.SS
++\-gc¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè0¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè1¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè0¤Î»ÈÍÑΨ(KB)
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè1¤Î»ÈÍÑΨ(KB)
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++EdenÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++EdenÎΰè¤Î»ÈÍÑΨ(KB)
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÎΰè¤Î»ÈÍÑΨ(KB)
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤ÎGC¥¤¥Ù¥ó¥È¿ô
++.br
++.di
++.nr j| \n(dn
++.nr j- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di k+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤Î¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó»þ´Ö
++.br
++.di
++.nr k| \n(dn
++.nr k- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di l+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Õ¥ë¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó»þ´Ö
++.br
++.di
++.nr l| \n(dn
++.nr l- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di m+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÁí»þ´Ö
++.br
++.di
++.nr m| \n(dn
++.nr m- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥È¤µ¤ì¤¿¥Ò¡¼¥×¤ÎÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS0C
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS1C
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS0U
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS1U
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wEC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wEU
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOU
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPU
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \wOldÎΰè¤Î»ÈÍÑΨ(KB)
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.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(i-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(j-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(k-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(l-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(m-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 400 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥È¤µ¤ì¤¿¥Ò¡¼¥×¤ÎÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S0C\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S1C\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S0U\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S1U\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'EC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'EU\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.g+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OU\h'|\n(41u'OldÎΰè¤Î»ÈÍÑΨ(KB)
++.ne \n(h|u+\n(.Vu
++.if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PC\h'|\n(41u'
++.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(31u
++.ne \n(i|u+\n(.Vu
++.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PU\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGC\h'|\n(41u'
++.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(31u
++.ne \n(k|u+\n(.Vu
++.if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.k+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGC\h'|\n(41u'¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.ne \n(l|u+\n(.Vu
++.if (\n(l|+\n(#^-1v)>\n(#- .nr #- +(\n(l|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'GCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.m+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.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.-61
++
++.LP
++.SS
++\-gccapacity¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++NewÀ¤Âå¤ÎºÇ¾®ÍÆÎÌ(KB)
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++NewÀ¤Âå¤ÎºÇÂçÍÆÎÌ(KB)
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++NewÀ¤Âå¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè0¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè1¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++EdenÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÀ¤Âå¤ÎºÇ¾®ÍÆÎÌ(KB)
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÀ¤Âå¤ÎºÇÂçÍÆÎÌ(KB)
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÀ¤Âå¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr j| \n(dn
++.nr j- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di k+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÀ¤Âå¤ÎºÇ¾®ÍÆÎÌ(KB)
++.br
++.di
++.nr k| \n(dn
++.nr k- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di l+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÀ¤Âå¤ÎºÇÂçÍÆÎÌ(KB)
++.br
++.di
++.nr l| \n(dn
++.nr l- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di m+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÀ¤Âå¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr m| \n(dn
++.nr m- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di n+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr n| \n(dn
++.nr n- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di o+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤ÎGC¥¤¥Ù¥ó¥È¿ô
++.br
++.di
++.nr o| \n(dn
++.nr o- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w¥á¥â¥ê¡¼¡¦¥×¡¼¥ëÀ¤Â太¤è¤ÓÎΰèÍÆÎÌ
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wNGCMN
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wNGCMX
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wNGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS0C
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS1C
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wEC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOGCMN
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOGCMX
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPGCMN
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPGCMX
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGC
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.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(i-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(j-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(k-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(l-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(m-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(n-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(o-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 474 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'¥á¥â¥ê¡¼¡¦¥×¡¼¥ëÀ¤Â太¤è¤ÓÎΰèÍÆÎÌ\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'NGCMN\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'NGCMX\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'NGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S0C\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S1C\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'EC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OGCMN\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OGCMX\h'|\n(41u'
++.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(31u
++.ne \n(i|u+\n(.Vu
++.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OC\h'|\n(41u'
++.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(31u
++.ne \n(k|u+\n(.Vu
++.if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PGCMN\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PGCMX\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.m+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.n+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.o+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGC\h'|\n(41u'¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.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+
++.rm n+
++.rm o+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-67
++
++.LP
++.SS
++\-gccause¥ª¥×¥·¥ç¥ó
++.LP
++.LP
++¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f3\-gcutil\fP¥ª¥×¥·¥ç¥ó¤ÈƱ¤¸¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÅý·×¥Ç¡¼¥¿¤Î³µÍפòɽ¼¨¤·¤Þ¤¹¤¬¡¢ºÇ¸å¤Î¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¡¦¥¤¥Ù¥ó¥È¤È(ŬÍѲÄǽ¤Ê¾ì¹ç¤Ï)¸½ºß¤Î¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¡¦¥¤¥Ù¥ó¥È¤Î¸¶°ø¤¬´Þ¤Þ¤ì¤Þ¤¹¡£\f3\-gcutil\fP¤Ç°ìÍ÷ɽ¼¨¤µ¤ì¤ëÎó¤Î¤Û¤«¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¼¡¤ÎÎó¤¬Äɲ䵤ì¤Þ¤¹¡£
++.LP
++.LP
++.TS
++.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
++.de 35
++.ps \n(.s
++.vs \n(.vu
++.in \n(.iu
++.if \n(.u .fi
++.if \n(.j .ad
++.if \n(.j=0 .na
++..
++.nf
++.nr #~ 0
++.if n .nr #~ 0.6n
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.fc
++.nr 33 \n(.s
++.rm 80 81
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++ºÇ¸å¤Î¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¤Î¸¶°ø
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¸½ºß¤Î¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó¤Î¸¶°ø
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \wGC¥¤¥Ù¥ó¥È¤ò´Þ¤à¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wLGCC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wGCC
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 497 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'GC¥¤¥Ù¥ó¥È¤ò´Þ¤à¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'LGCC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'GCC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-13
++
++.LP
++.SS
++\-gcnew¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè0¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè1¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè0¤Î»ÈÍÑΨ(KB)
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè1¤Î»ÈÍÑΨ(KB)
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++ºÇÂçÅÂƲÆþ¤ê¤·¤­¤¤ÃÍ
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++ŬÀÚ¤ÊSurvivor¥µ¥¤¥º(KB)
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++EdenÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++EdenÎΰè¤Î»ÈÍÑΨ(KB)
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤ÎGC¥¤¥Ù¥ó¥È¿ô
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤Î¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó»þ´Ö
++.br
++.di
++.nr j| \n(dn
++.nr j- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \wNewÀ¤Âå¤ÎÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS0C
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS1C
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS0U
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS1U
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wTT
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wMTT
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wDSS
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wEC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wEU
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.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(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.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(i-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(j-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 551 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'NewÀ¤Âå¤ÎÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S0C\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S1C\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S0U\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S1U\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.d+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'TT\h'|\n(41u'ÅÂƲÆþ¤ê¤·¤­¤¤ÃÍ
++.ne \n(e|u+\n(.Vu
++.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'MTT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'DSS\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'EC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'EU\h'|\n(41u'
++.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(31u
++.ne \n(i|u+\n(.Vu
++.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGCT\h'|\n(41u'
++.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(31u
++.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+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-47
++
++.LP
++.SS
++\-gcnewcapacity¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++NewÀ¤Âå¤ÎºÇ¾®ÍÆÎÌ(KB)
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++NewÀ¤Âå¤ÎºÇÂçÍÆÎÌ(KB)
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++NewÀ¤Âå¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè0¤ÎºÇÂçÍÆÎÌ(KB)
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè0¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè1¤ÎºÇÂçÍÆÎÌ(KB)
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè1¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++EdenÎΰè¤ÎºÇÂçÍÆÎÌ(KB)
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++EdenÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤ÎGC¥¤¥Ù¥ó¥È¿ô
++.br
++.di
++.nr j| \n(dn
++.nr j- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \wNewÀ¤ÂåÎΰ襵¥¤¥º¤ÎÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wNGCMN
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wNGCMX
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wNGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS0CMX
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS0C
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS1CMX
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS1C
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wECMX
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wEC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGC
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.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(i-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(j-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 605 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'NewÀ¤ÂåÎΰ襵¥¤¥º¤ÎÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'NGCMN\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'NGCMX\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'NGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S0CMX\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S0C\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S1CMX\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S1C\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'ECMX\h'|\n(41u'
++.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(31u
++.ne \n(i|u+\n(.Vu
++.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'EC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGC\h'|\n(41u'
++.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(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGC\h'|\n(41u'¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.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+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-47
++
++.LP
++.SS
++\-gcold¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÎΰè¤Î»ÈÍÑΨ(KB)
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤ÎGC¥¤¥Ù¥ó¥È¿ô
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Õ¥ë¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó»þ´Ö
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÁí»þ´Ö
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \wOld¤ª¤è¤ÓPermanentÀ¤Âå¤ÎÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPU
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOU
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \wOldÎΰè¤Î»ÈÍÑΨ(KB)
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 645 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Old¤ª¤è¤ÓPermanentÀ¤Âå¤ÎÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PU\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OU\h'|\n(41u'OldÎΰè¤Î»ÈÍÑΨ(KB)
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.d+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGC\h'|\n(41u'¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.ne \n(e|u+\n(.Vu
++.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'GCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-33
++
++.LP
++.SS
++\-gcoldcapacity¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÀ¤Âå¤ÎºÇ¾®ÍÆÎÌ(KB)
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÀ¤Âå¤ÎºÇÂçÍÆÎÌ(KB)
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÀ¤Âå¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤ÎGC¥¤¥Ù¥ó¥È¿ô
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Õ¥ë¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó»þ´Ö
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÁí»þ´Ö
++.br
++.di
++.nr g| \n(dn
++.nr g- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \wOldÀ¤Âå¤ÎÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOGCMN
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOGCMX
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wOC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 687 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OldÀ¤Âå¤ÎÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OGCMN\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OGCMX\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'OC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGC\h'|\n(41u'¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'GCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.g+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.rm g+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-35
++
++.LP
++.SS
++\-gcpermcapacity¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÀ¤Âå¤ÎºÇ¾®ÍÆÎÌ(KB)
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÀ¤Âå¤ÎºÇÂçÍÆÎÌ(KB)
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÀ¤Âå¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÎΰè¤Î¸½ºß¤ÎÍÆÎÌ(KB)
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤ÎGC¥¤¥Ù¥ó¥È¿ô
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Õ¥ë¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó»þ´Ö
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÁí»þ´Ö
++.br
++.di
++.nr g| \n(dn
++.nr g- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \wPermanentÀ¤Âå¤ÎÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPGCMN
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPGCMX
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wPC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 729 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PermanentÀ¤Âå¤ÎÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PGCMN\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PGCMX\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'PC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGC\h'|\n(41u'¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'GCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.g+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.rm g+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-35
++
++.LP
++.SS
++\-gcutil¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè0¤Î»ÈÍÑΨ(¸½ºß¤ÎÍÆÎ̤ËÂФ¹¤ë¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸)
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SurvivorÎΰè1¤Î»ÈÍÑΨ(¸½ºß¤ÎÍÆÎ̤ËÂФ¹¤ë¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸)
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++EdenÎΰè¤Î»ÈÍÑΨ(¸½ºß¤ÎÍÆÎ̤ËÂФ¹¤ë¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸)
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++OldÎΰè¤Î»ÈÍÑΨ(¸½ºß¤ÎÍÆÎ̤ËÂФ¹¤ë¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸)
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++PermanentÎΰè¤Î»ÈÍÑΨ(¸½ºß¤ÎÍÆÎ̤ËÂФ¹¤ë¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸)
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼ã¤¤À¤Âå¤ÎGC¥¤¥Ù¥ó¥È¿ô
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Õ¥ë¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥ó»þ´Ö
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÁí»þ´Ö
++.br
++.di
++.nr i| \n(dn
++.nr i- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÅý·×¥Ç¡¼¥¿¤Î³µÍ×
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS0
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wS1
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wE
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wO
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wYGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGC
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wFGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wGCT
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \w¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.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(i-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 779 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'¥¬¥Ù¡¼¥¸¡¦¥³¥ì¥¯¥·¥ç¥óÅý·×¥Ç¡¼¥¿¤Î³µÍ×\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S0\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'S1\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'E\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'O\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'P\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGC\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'YGCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.g+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGC\h'|\n(41u'¥Õ¥ëGC¥¤¥Ù¥ó¥È¿ô
++.ne \n(h|u+\n(.Vu
++.if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'FGCT\h'|\n(41u'
++.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(31u
++.ne \n(i|u+\n(.Vu
++.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'GCT\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.i+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.rm g+
++.rm h+
++.rm i+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-43
++
++.LP
++.SS
++\-printcompilation¥ª¥×¥·¥ç¥ó
++.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
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¼Â¹Ô¤µ¤ì¤¿¥³¥ó¥Ñ¥¤¥ë¡¦¥¿¥¹¥¯¤Î¿ô
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥á¥½¥Ã¥É¤Î¥Ð¥¤¥È¥³¡¼¥É¤Î¥Ð¥¤¥È¿ô
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥³¥ó¥Ñ¥¤¥ë¡¦¥¿¥¤¥×
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥³¥ó¥Ñ¥¤¥ëÊýË¡¤òÆÃÄꤹ¤ë¥¯¥é¥¹Ì¾¤È¥á¥½¥Ã¥É̾¡£¥¯¥é¥¹Ì¾¤Ç¤Ï¡¢Ì¾Á°¶õ´Ö¤Î¶èÀÚ¤êʸ»ú¤È¤·¤Æ¡¢¡Ö.¡×¤Î¤«¤ï¤ê¤Ë¡Ö/¡×¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¥á¥½¥Ã¥É̾¤Ï¡¢»ØÄꤵ¤ì¤¿¥¯¥é¥¹Æâ¤Î¥á¥½¥Ã¥É¤Ç¤¹¡£¤³¤ì¤é¤Î2¤Ä¤Î¥Õ¥£¡¼¥ë¥É¤Î·Á¼°¤Ï¡¢HotSpot \- \f3XX:+PrintComplation\fP¥ª¥×¥·¥ç¥ó¤ÈÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \wHotSpot¥³¥ó¥Ñ¥¤¥ëÊýË¡¤ÎÅý·×¥Ç¡¼¥¿
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3Îó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wCompiled
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wSize
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wType
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wMethod
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 807 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'HotSpot¥³¥ó¥Ñ¥¤¥ëÊýË¡¤ÎÅý·×¥Ç¡¼¥¿\h'|\n(41u'
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3Îó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Compiled\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Size\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Type\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'Method\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.d+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-21
++
++.LP
++.SH "Îã"
++.LP
++.LP
++¤³¤Î¹à¤Ç¤Ï¡¢21891¤Î\f2lvmid\fP¤ò»ý¤Ä¥í¡¼¥«¥ëJVM¤ò´Æ»ë¤¹¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++.SS
++gcutil¥ª¥×¥·¥ç¥ó¤Î»ÈÍÑ
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢\f2lvmid\fP 21891¤ËÀܳ¤·¤Æ¡¢250¥ß¥êÉôֳ֤Ç7¤Ä¤Î¥µ¥ó¥×¥ë¤ò¼èÆÀ¤·¡¢\f3\-gcutil\fP¥ª¥×¥·¥ç¥ó¤Ç¤Î»ØÄê¤Ë½¾¤Ã¤Æ½ÐÎϤòɽ¼¨¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\fP\f3jstat \-gcutil 21891 250 7\fP
++.br
++
++.fl
++ S0 S1 E O P YGC YGCT FGC FGCT GCT
++.br
++
++.fl
++ 12.44 0.00 27.20 9.49 96.70 78 0.176 5 0.495 0.672
++.br
++
++.fl
++ 12.44 0.00 62.16 9.49 96.70 78 0.176 5 0.495 0.672
++.br
++
++.fl
++ 12.44 0.00 83.97 9.49 96.70 78 0.176 5 0.495 0.672
++.br
++
++.fl
++ 0.00 7.74 0.00 9.51 96.70 79 0.177 5 0.495 0.673
++.br
++
++.fl
++ 0.00 7.74 23.37 9.51 96.70 79 0.177 5 0.495 0.673
++.br
++
++.fl
++ 0.00 7.74 43.82 9.51 96.70 79 0.177 5 0.495 0.673
++.br
++
++.fl
++ 0.00 7.74 58.11 9.51 96.71 79 0.177 5 0.495 0.673
++.br
++
++.fl
++.fi
++
++.LP
++.LP
++¤³¤ÎÎã¤Î½ÐÎϤϡ¢¼ã¤¤À¤Âå¤Î¥³¥ì¥¯¥·¥ç¥ó¤¬3ÈÖÌܤÈ4ÈÖÌܤΥµ¥ó¥×¥ë´Ö¤Ç¹Ô¤ï¤ì¤¿¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£¥³¥ì¥¯¥·¥ç¥ó¤Ë¤Ï0.001É䫤«¤Ã¤Æ¤ª¤ê¡¢¥ª¥Ö¥¸¥§¥¯¥È¤¬EdenÎΰè(E)¤«¤éOldÎΰè(O)¤Ë¾º³Ê¤·¤¿¤¿¤á¡¢OldÎΰè¤Î»ÈÍÑΨ¤Ï9.49%¤«¤é9.51%¤ËÁý²Ã¤·¤Æ¤¤¤Þ¤¹¡£SurvivorÎΰè¤Ï¡¢¥³¥ì¥¯¥·¥ç¥óÁ°¤Ï12.44%¤¬»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤·¤¿¤¬¡¢¥³¥ì¥¯¥·¥ç¥ó¸å¤Î»ÈÍѤÏ7.74%¤Î¤ß¤Ç¤¹¡£
++.LP
++.SS
++Îó¥Ø¥Ã¥À¡¼Ê¸»úÎó¤Î·«¤êÊÖ¤·
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢\f2lvmid\fP 21891¤ËÀܳ¤·¤Æ¡¢250¥ß¥êÉôֳ֤ǥµ¥ó¥×¥ë¤ò¼èÆÀ¤·¡¢\f3\-gcutil\fP¥ª¥×¥·¥ç¥ó¤Ç¤Î»ØÄê¤Ë½¾¤Ã¤Æ½ÐÎϤòɽ¼¨¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢\f3\-h3\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¥Ç¡¼¥¿¤¬3¹Ôɽ¼¨¤µ¤ì¤ë¤´¤È¤ËÎó¥Ø¥Ã¥À¡¼¤ò½ÐÎϤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\fP\f3jstat \-gcnew \-h3 21891 250\fP
++.br
++
++.fl
++ S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT
++.br
++
++.fl
++ 64.0 64.0 0.0 31.7 31 31 32.0 512.0 178.6 249 0.203
++.br
++
++.fl
++ 64.0 64.0 0.0 31.7 31 31 32.0 512.0 355.5 249 0.203
++.br
++
++.fl
++ 64.0 64.0 35.4 0.0 2 31 32.0 512.0 21.9 250 0.204
++.br
++
++.fl
++ S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT
++.br
++
++.fl
++ 64.0 64.0 35.4 0.0 2 31 32.0 512.0 245.9 250 0.204
++.br
++
++.fl
++ 64.0 64.0 35.4 0.0 2 31 32.0 512.0 421.1 250 0.204
++.br
++
++.fl
++ 64.0 64.0 0.0 19.0 31 31 32.0 512.0 84.4 251 0.204
++.br
++
++.fl
++ S0C S1C S0U S1U TT MTT DSS EC EU YGC YGCT
++.br
++
++.fl
++ 64.0 64.0 0.0 19.0 31 31 32.0 512.0 306.7 251 0.204
++.br
++
++.fl
++.fi
++
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢¥Ø¥Ã¥À¡¼Ê¸»úÎó¤Î·«ÊÖ¤·¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¤Û¤«¡¢2ÈÖÌܤÈ3ÈÖÌܤΥµ¥ó¥×¥ë´Ö¤ÇYoung GC¤¬¹Ô¤ï¤ì¤¿¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£¤³¤Î·Ñ³»þ´Ö¤Ï0.001ÉäǤ·¤¿¡£¤³¤Î¥³¥ì¥¯¥·¥ç¥ó¤Ç¤Ï¡¢SurvivorÎΰè0¤Î»ÈÍÑΨ(S0U)¤¬Å¬ÀÚ¤ÊSurvivor¥µ¥¤¥º(DSS)¤òĶ²á¤¹¤ë¤³¤È¤Ë¤Ê¤ë¥é¥¤¥Ö¡¦¥Ç¡¼¥¿¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿¡£¤³¤Î·ë²Ì¡¢¥ª¥Ö¥¸¥§¥¯¥È¤Ï¡¢OldÀ¤Âå(¤³¤Î½ÐÎϤˤÏÈóɽ¼¨)¤Ø¾º³Ê¤µ¤ì¡¢ÅÂƲÆþ¤ê¤·¤­¤¤ÃÍ(TT)¤¬¡¢31¤«¤é2¤Ø¹ß³Ê¤µ¤ì¤Þ¤·¤¿¡£
++.LP
++.LP
++Ê̤Υ³¥ì¥¯¥·¥ç¥ó¤¬¡¢5ÈÖÌܤÈ6ÈÖÌܤΥµ¥ó¥×¥ë´Ö¤Ç¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥³¥ì¥¯¥·¥ç¥ó¤Ç¤Ï¡¢Survivor¤¬¤Û¤È¤ó¤É¸«¤é¤ì¤º¡¢ÅÂƲÆþ¤ê¤·¤­¤¤Ãͤò31¤ËÌᤷ¤Þ¤·¤¿¡£
++.LP
++.SS
++¥µ¥ó¥×¥ë¤´¤È¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤ÎÁÞÆþ
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢\f2lvmid\fP 21891¤ØÀܳ¤·¡¢250¥ß¥êÉôֳ֤Ç3¤Ä¤Î¥µ¥ó¥×¥ë¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹¡£\f3\-t\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢ºÇ½é¤ÎÎó¤Ë¥µ¥ó¥×¥ë¤´¤È¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤òɽ¼¨¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\fP\f3jstat \-gcoldcapacity \-t 21891 250 3\fP
++.br
++
++.fl
++Timestamp OGCMN OGCMX OGC OC YGC FGC FGCT GCT
++.br
++
++.fl
++ 150.1 1408.0 60544.0 11696.0 11696.0 194 80 2.874 3.799
++.br
++
++.fl
++ 150.4 1408.0 60544.0 13820.0 13820.0 194 81 2.938 3.863
++.br
++
++.fl
++ 150.7 1408.0 60544.0 13820.0 13820.0 194 81 2.938 3.863
++.br
++
++.fl
++.fi
++
++.LP
++.LP
++\f2Timestamp\fPÎó¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈJVM¤Îµ¯Æ°»þ¤«¤é¤Î·Ð²á»þ´Ö¤¬¡¢ÉÃñ°Ì¤Ç¥ì¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤µ¤é¤Ë¡¢\f3\-gcoldcapacity\fP½ÐÎϤǤϡ¢³äÅö¥ê¥¯¥¨¥¹¥È¤Þ¤¿¤Ï¾º³Ê¥ê¥¯¥¨¥¹¥È¤¢¤ë¤¤¤Ï¤½¤ÎξÊý¤òËþ¤¿¤¹¤¿¤á¤Ë¥Ò¡¼¥×¤¬³ÈÄ¥¤¹¤ë¤¿¤Ó¤Ë¡¢OldÀ¤Âå¤ÎÍÆÎÌ(OGC)¤ÈOldÎΰè¤ÎÍÆÎÌ(OC)¤È¤¬Áý²Ã¤·¤Æ¤¤¤ë¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£OldÀ¤Âå¤ÎÍÆÎÌ(OGC)¤Ï¡¢81ÈÖÌܤΥեëGC(FGC)¸å¤Ë¡¢11696 KB¤«¤é13820 KB¤ØÁý²Ã¤·¤Æ¤¤¤Þ¤¹¡£¤³¤ÎÀ¤Âå(¤ª¤è¤ÓÎΰè)¤ÎºÇÂçÍÆÎ̤ϡ¢60544 KB(OGCMX)¤Ê¤Î¤Ç¡¢¤Þ¤À³ÈÄ¥¤Ç¤­¤ë;͵¤¬»Ä¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++.SS
++¥ê¥â¡¼¥ÈJVM¤Î¥¤¥ó¥¹¥È¥¥¥ë¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î´Æ»ë
++.LP
++.LP
++¤³¤ÎÎã¤Ï¡¢\f3\-gcutil\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢\f2remote.domain\fP¤È¤¤¤¦¥·¥¹¥Æ¥à¾å¤Î\f2lvmid\fP 40496¤ËÀܳ¤·¡¢¥µ¥ó¥×¥ë¤òÉÃñ°Ì¤Ç̵´ü¸Â¤Ë¼èÆÀ¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\fP\f3jstat \-gcutil 40496@remote.domain 1000\fP
++.br
++
++.fl
++... \f2output omitted\fP
++.br
++
++.fl
++.fi
++
++.LP
++.LP
++\f2lvmid\fP¤Ï¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¤Î̾Á°¤È·ë¹ç¤µ¤ì¤Æ¡¢\f240496@remote.domain\fP¤Î\f2vmid\fP¤ò¹½À®¤·¤Æ¤¤¤Þ¤¹¡£·ë²Ì¤È¤·¤Æ¡¢¤³¤Î\f2vmid\fP¤Ï¡¢\f3rmi\fP¥×¥í¥È¥³¥ë¤ò»ÈÍѤ·¤Æ¡¢¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¾å¤Î¥Ç¥Õ¥©¥ë¥È¤Î\f3jstatd\fP¥µ¡¼¥Ð¡¼¤ÈÄÌ¿®¤·¤Þ¤¹¡£\f3jstatd\fP¥µ¡¼¥Ð¡¼¤Ï¡¢\f3rmiregistry\fP¤ò»ÈÍѤ·¤Æ¡¢¥Ç¥Õ¥©¥ë¥È¤Î\f3rmiregistry\fP¥Ý¡¼¥È(¥Ý¡¼¥È1099)¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤¿\f2remote.domain\fP¤ËÇÛÃÖ¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++java(1) \- Java¥¢¥×¥ê¥±¡¼¥·¥ç¥óµ¯Æ°¥Ä¡¼¥ë
++.TP 2
++o
++jps(1) \- Java²¾ÁÛ¥Þ¥·¥ó¡¦¥×¥í¥»¥¹¡¦¥¹¥Æ¡¼¥¿¥¹¡¦¥Ä¡¼¥ë
++.TP 2
++o
++jstatd(1) \- jvmstat¥Ç¡¼¥â¥ó
++.TP 2
++o
++rmiregistry(1) \- Java¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¡¦¥ì¥¸¥¹¥È¥ê
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/jstatd.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/jstatd.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,267 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH jstatd 1 "07 May 2011"
++.TH jstatd 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++jstatd \- ²¾ÁÛ¥Þ¥·¥ójstat¥Ç¡¼¥â¥ó
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++¥Ñ¥é¥á¡¼¥¿
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++¥»¥­¥å¥ê¥Æ¥£
++.TP 2
++o
++¥ê¥â¡¼¥È¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹
++.TP 2
++o
++Îã
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++jstatd [ \fP\f4options\fP\f3 ]\fP
++.br
++\f3
++.fl
++\fP
++.fi
++
++.LP
++.SH "¥Ñ¥é¥á¡¼¥¿"
++.LP
++.RS 3
++.TP 3
++options
++¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¡£¥ª¥×¥·¥ç¥ó¤ÏǤ°Õ¤Î½ç½ø¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£½ÅÊ£¤Þ¤¿¤ÏÌ·½â¤¹¤ë¥ª¥×¥·¥ç¥ó¤¬¤¢¤ë¾ì¹ç¡¢ºÇ¸å¤Ë»ØÄꤷ¤¿¥ª¥×¥·¥ç¥ó¤¬Í¥À褵¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3jstatd\fP¥Ä¡¼¥ë¤Ï¡¢·×¬¤µ¤ì¤¿HotSpot Java²¾ÁÛ¥Þ¥·¥ó(JVM)¤ÎºîÀ®¤È½ªÎ»¤ò´Æ»ë¤·¡¢¥í¡¼¥«¥ë¡¦¥·¥¹¥Æ¥à¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ëJava²¾ÁÛ¥Þ¥·¥ó¤Ë¡¢¥ê¥â¡¼¥È´Æ»ë¥Ä¡¼¥ë¤¬Àܳ¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤¹¤ëRMI¥µ¡¼¥Ð¡¼¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤¹¡£
++.LP
++.LP
++\f3jstatd\fP¥µ¡¼¥Ð¡¼¤Ç¤Ï¡¢¥í¡¼¥«¥ë¡¦¥Û¥¹¥È¤ËRMI¥ì¥¸¥¹¥È¥ê¤¬Â¸ºß¤¹¤ë¤³¤È¤¬É¬Íפˤʤê¤Þ¤¹¡£\f3jstatd\fP¥µ¡¼¥Ð¡¼¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥Ý¡¼¥È¤Þ¤¿¤Ï\f2\-p port\fP¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Ý¡¼¥È¾å¤ÎRMI¥ì¥¸¥¹¥È¥ê¤ËÀܳ¤·¤è¤¦¤È¤·¤Þ¤¹¡£RMI¥ì¥¸¥¹¥È¥ê¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¡¢\f2\-p port\fP¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Ý¡¼¥È¡¢¤Þ¤¿¤Ï\f2\-p port\fP¤¬¾Êά¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥ÈRMI¥ì¥¸¥¹¥È¥ê¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤¿\f3jstatd\fP¥¢¥×¥ê¥±¡¼¥·¥ç¥óÆâ¤Ë¡¢1¤Ä¤ÎRMI¥ì¥¸¥¹¥È¥ê¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£ÆâÉôRMI¥ì¥¸¥¹¥È¥ê¤ÎºîÀ®¤Ï¡¢\f2\-nr\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ¶Ø»ß¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f3Ãí°Õ:\fP¤³¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¥µ¥Ý¡¼¥ÈÂоݳ°¤Ç¤¢¤ê¡¢¾­Íè¤ÎJDK¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÍøÍѤǤ­¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¸½ºß¡¢Windows 98¤ª¤è¤ÓWindows ME¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++\f3jstatd\fP¥³¥Þ¥ó¥É¤Ï¼¡¤Î¥ª¥×¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++\-nr
++´û¸¤ÎRMI¥ì¥¸¥¹¥È¥ê¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¡¢\f2jstatd\fP¥×¥í¥»¥¹Æâ¤ËÆâÉôRMI¥ì¥¸¥¹¥È¥ê¤òºîÀ®¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.TP 3
++\-p\ port
++RMI¥ì¥¸¥¹¥È¥ê¤¬¤¢¤ë¤ÈͽÁÛ¤µ¤ì¤ë¥Ý¡¼¥ÈÈÖ¹æ¤Ç¤¹¡£¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢\f2\-nr\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤ÐºîÀ®¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-n\ rminame
++RMI¥ì¥¸¥¹¥È¥ê¤Ë¤ª¤¤¤Æ¡¢¥ê¥â¡¼¥ÈRMI¥ª¥Ö¥¸¥§¥¯¥È¤¬¥Ð¥¤¥ó¥É¤µ¤ì¤ë̾Á°¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È̾¤Ï\f2JStatRemoteHost\fP¤Ç¤¹¡£Ê£¿ô¤Î\f3jstatd\fP¥µ¡¼¥Ð¡¼¤¬Æ±¤¸¥Û¥¹¥È¾å¤Çµ¯Æ°¤·¤Æ¤¤¤ë¾ì¹ç¡¢³Æ¥µ¡¼¥Ð¡¼¤Î¥¨¥¯¥¹¥Ý¡¼¥È¤·¤¿RMI¥ª¥Ö¥¸¥§¥¯¥È¤Î̾Á°¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢°ì°Õ¤Î̾Á°¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢´Æ»ë¥¯¥é¥¤¥¢¥ó¥È¤Î\f2hostid\fP¤ª¤è¤Ó\f2vmid\fPʸ»úÎó¤Ë¡¢¤½¤Î°ì°Õ¤Î¥µ¡¼¥Ð¡¼Ì¾¤ò´Þ¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-Joption
++\f3javac\fP¤¬¸Æ¤Ó½Ð¤¹\f3java\fPµ¯Æ°¥Ä¡¼¥ë¤Ë¡¢\f2option\fP¤òÅϤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f3\-J\fP¤ò»ÈÍѤ·¤Æ¡¢Java¤Çµ­½Ò¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ëÇظå¤ÎVM¤Ë¥ª¥×¥·¥ç¥ó¤òÅϤ¹¤³¤È¤Ï¡¢¤è¤¯¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "¥»¥­¥å¥ê¥Æ¥£"
++.LP
++.LP
++\f3jstatd\fP¥µ¡¼¥Ð¡¼¤Ï¡¢Å¬Àڤʥͥ¤¥Æ¥£¥Ö¡¦¥¢¥¯¥»¥¹¸¢¤ò»ý¤ÄJVM¤Î¤ß¤ò´Æ»ë¤Ç¤­¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f3jstatd\fP¥×¥í¥»¥¹¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈJVM¤ÈƱ¤¸¥æ¡¼¥¶¡¼»ñ³Ê¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£UNIX(tm)¥Ù¡¼¥¹¤Î¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë\f2root\fP¥æ¡¼¥¶¡¼¤Ê¤É¤Î°ìÉô¤Î¥æ¡¼¥¶¡¼»ñ³Ê¤Ï¡¢¥·¥¹¥Æ¥à¾å¤ÎǤ°Õ¤ÎJVM¤Ë¤è¤Ã¤Æ¥¨¥¯¥¹¥Ý¡¼¥È¤µ¤ì¤¿¥¤¥ó¥¹¥È¥¥¥ë¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Ø¤Î¥¢¥¯¥»¥¹¸¢¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê»ñ³Ê¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë\f3jstatd\fP¥×¥í¥»¥¹¤Ï¡¢¥·¥¹¥Æ¥à¾å¤Î¤¹¤Ù¤Æ¤ÎJVM¤ò´Æ»ë¤Ç¤­¤Þ¤¹¤¬¡¢¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÊ̤ÎÌäÂ꤬µ¯¤³¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f3jstatd\fP¥µ¡¼¥Ð¡¼¤Ë¤Ï¡¢¥ê¥â¡¼¥È¡¦¥¯¥é¥¤¥¢¥ó¥È¤Îǧ¾Úµ¡Ç½¤¬¤¢¤ê¤Þ¤»¤ó¡£¤½¤Î¤¿¤á¡¢\f3jstatd\fP¥µ¡¼¥Ð¡¼¡¦¥×¥í¥»¥¹¤ò¼Â¹Ô¤¹¤ë¤È¡¢\f3jstatd\fP¥×¥í¥»¥¹¤¬¥¢¥¯¥»¥¹¸¢¤ò»ý¤Ä¤¹¤Ù¤Æ¤ÎJVM¤Ë¤è¤ë¥¤¥ó¥¹¥È¥¥¥ë¥á¥ó¥Æ¡¼¥·¥ç¥ó¤Î¥¨¥¯¥¹¥Ý¡¼¥È¤ò¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¡¼¤Ë¸ø³«¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Î̵ËÉÈ÷¤Ê¾õÂ֤ϡ¢´Ä¶­¤Ë¤è¤Ã¤Æ¤Ï˾¤Þ¤·¤¯¤Ê¤¤¾ì¹ç¤¬¤¢¤ë¤Î¤Ç¡¢Æä˼²ÔƯ´Ä¶­¤Þ¤¿¤Ï°ÂÁ´¤Ç¤Ê¤¤¥Í¥Ã¥È¥ï¡¼¥¯¤Ç¤Ï¡¢\f3jstatd\fP¥×¥í¥»¥¹¤òµ¯Æ°¤¹¤ëÁ°¤Ë¡¢¥í¡¼¥«¥ë¡¦¥»¥­¥å¥ê¥Æ¥£¡¦¥Ý¥ê¥·¡¼¤ò¸¡Æ¤¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f3jstatd\fP¥µ¡¼¥Ð¡¼¤Ï¡¢Â¾¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥Þ¥Í¡¼¥¸¥ã¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢RMISecurityPolicy¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£¤½¤Î¤¿¤á¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥Ý¥ê¥·¡¼¼ÂÁõ¤Î
++.na
++\f2¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Î¹½Ê¸\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html¤Ë½àµò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++¼¡¤Î¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£Îã³°¤òȯÀ¸¤»¤º¤Ë\f3jstatd\fP¥µ¡¼¥Ð¡¼¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¤³¤Î¥Ý¥ê¥·¡¼¤Ï¡¢¤¹¤Ù¤Æ¤Î¥³¡¼¥É¥Ù¡¼¥¹¤Ø¤Î¤¢¤é¤æ¤ë¥¢¥¯¥»¥¹¸¢¤òǧ¤á¤ë¥Ý¥ê¥·¡¼¤è¤ê¤â¼«Í³ÅÙ¤¬Ä㤤¤Ç¤¹¤¬¡¢\f3jstatd\fP¥µ¡¼¥Ð¡¼¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤ËºÇÄã¸ÂɬÍפʥ¢¥¯¥»¥¹¸¢¤Î¤ß¤òǧ¤á¤ë¥Ý¥ê¥·¡¼¤è¤ê¤â¼«Í³ÅÙ¤¬¹â¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++grant codebase "file:${java.home}/../lib/tools.jar" {\fP
++.br
++\f3
++.fl
++ permission java.security.AllPermission;\fP
++.br
++\f3
++.fl
++};\fP
++.br
++\f3
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤Î¥Ý¥ê¥·¡¼¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¤³¤Î¥Æ¥­¥¹¥È¤ò\f2jstatd.all.policy\fP¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤Ë¥³¥Ô¡¼¤·¡¢¼¡¤Î¤è¤¦¤Ë\f3jstatd\fP¥µ¡¼¥Ð¡¼¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++jstatd \-J\-Djava.security.policy=jstatd.all.policy\fP
++.br
++\f3
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤è¤ê¸·¤·¤¤¥»¥­¥å¥ê¥Æ¥£¤ò¼Â»Ü¤¹¤ë¥µ¥¤¥È¤Î¾ì¹ç¡¢¥«¥¹¥¿¥à¡¦¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¡¢ÆÃÄê¤Î¿®Íê¤Ç¤­¤ë¥Û¥¹¥È¤Þ¤¿¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¥¢¥¯¥»¥¹¤òÀ©¸Â¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢¤³¤Î¤è¤¦¤ÊÊýË¡¤Ï¡¢IP¥¢¥É¥ì¥¹¤ÎÅðÄ°¹¶·â¤ò¼õ¤±¤ä¤¹¤¯¤Ê¤ê¤Þ¤¹¡£¥»¥­¥å¥ê¥Æ¥£¤ÎÌäÂê¤Ë¤Ä¤¤¤Æ¡¢¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ç¤âÂнè¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢\f3jstatd\fP¥µ¡¼¥Ð¡¼¤ò¼Â¹Ô¤»¤º¤Ë¡¢\f3jstat\fP¤È\f3jps\fP¥Ä¡¼¥ë¤ò¥í¡¼¥«¥ë¤Ç»ÈÍѤ¹¤ë¤³¤È¤¬ºÇ¤â°ÂÁ´¤ÊÊýË¡¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.SH "¥ê¥â¡¼¥È¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
++.LP
++.LP
++\f3jstatd\fP¥×¥í¥»¥¹¤¬¥¨¥¯¥¹¥Ý¡¼¥È¤¹¤ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¡¢Æȼ«¤Ë³«È¯¤·¤¿¤â¤Î¤Ç¤¢¤êÊѹ¹¤µ¤ì¤ëͽÄê¤Ç¤¹¡£¥æ¡¼¥¶¡¼¤ª¤è¤Ó³«È¯¼Ô¤Ï¡¢¤³¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ø¤Î½ñ¹þ¤ß¤ò¹Ô¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
++.LP
++.SH "Îã"
++.LP
++.LP
++¼¡¤Ë\f3jstatd\fP¤òµ¯Æ°¤¹¤ëÎã¤ò¾Ò²ð¤·¤Þ¤¹¡£\f3jstatd\fP¥¹¥¯¥ê¥×¥È¤Ë¤è¤Ã¤Æ¡¢¥µ¡¼¥Ð¡¼¤Ï¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ç¼«Æ°Åª¤Ëµ¯Æ°¤·¤Þ¤¹¡£
++.LP
++.SS
++ÆâÉôRMI¥ì¥¸¥¹¥È¥ê¤Î»ÈÍÑ
++.LP
++.LP
++¤³¤ÎÎã¤Ï¡¢ÆâÉôRMI¥ì¥¸¥¹¥È¥ê¤ò»ÈÍѤ·¤¿\f3jstatd\fP¤Îµ¯Æ°¤òɽ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤ÎRMI¥ì¥¸¥¹¥È¥ê¡¦¥Ý¡¼¥È(¥Ý¡¼¥È1099)¤Ë¤Ï¡¢Â¾¤Î¥µ¡¼¥Ð¡¼¤Ï¥Ð¥¤¥ó¥É¤µ¤ì¤Æ¤¤¤Ê¤¤¤ÈÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++jstatd \-J\-Djava.security.policy=all.policy
++.fl
++\fP
++.fi
++
++.LP
++.SS
++³°ÉôRMI¥ì¥¸¥¹¥È¥ê¤Î»ÈÍÑ
++.LP
++.LP
++¤³¤ÎÎã¤Ï¡¢³°ÉôRMI¥ì¥¸¥¹¥È¥ê¤ò»ÈÍѤ·¤¿\f3jstatd\fP¤Îµ¯Æ°¤òɽ¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++rmiregistry&
++.fl
++jstatd \-J\-Djava.security.policy=all.policy
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤ÎÎã¤Ï¡¢¥Ý¡¼¥È2020¤Î³°ÉôRMI¥ì¥¸¥¹¥È¥ê¤ò»ÈÍѤ·¤¿\f3jstatd\fP¤Îµ¯Æ°¤òɽ¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++rmiregistry 2020&
++.fl
++jstatd \-J\-Djava.security.policy=all.policy \-p 2020
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤ÎÎã¤Ï¡¢AlternateJstatdServerName¤Î̾Á°¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤¿¡¢¥Ý¡¼¥È2020¤Î³°ÉôRMI¥ì¥¸¥¹¥È¥ê¤ò»ÈÍѤ·¤¿\f3jstatd\fP¤Îµ¯Æ°¤òɽ¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++rmiregistry 2020&
++.fl
++jstatd \-J\-Djava.security.policy=all.policy \-p 2020 \-n AlternateJstatdServerName
++.fl
++\fP
++.fi
++
++.LP
++.SS
++¥¤¥ó¥×¥í¥»¥¹RMI¥ì¥¸¥¹¥È¥ê¤ÎºîÀ®¤Î¶Ø»ß
++.LP
++.LP
++¤³¤ÎÎã¤Ï¡¢RMI¥ì¥¸¥¹¥È¥ê¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤ËRMI¥ì¥¸¥¹¥È¥ê¤òºîÀ®¤·¤Ê¤¤\f3jstatd\fP¤Îµ¯Æ°¤òɽ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï¡¢RMI¥ì¥¸¥¹¥È¥ê¤¬¤¹¤Ç¤Ë¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤ÈÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£¼Â¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢Å¬Àڤʥ¨¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++jstatd \-J\-Djava.security.policy=all.policy \-nr
++.fl
++\fP
++.fi
++
++.LP
++.SS
++RMI¥í¥°µ¡Ç½¤ÎÍ­¸ú²½
++.LP
++.LP
++¤³¤ÎÎã¤Ï¡¢RMI¥í¥°µ¡Ç½¤òÍ­¸ú¤Ë¤·¤¿\f3jstatd\fP¤Îµ¯Æ°¤òɽ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤ÎÊýË¡¤Ï¡¢¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¤Þ¤¿¤Ï¥µ¡¼¥Ð¡¼³èÆ°¤Î´Æ»ë¤ËÌòΩ¤Á¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++jstatd \-J\-Djava.security.policy=all.policy \-J\-Djava.rmi.server.logCalls=true
++.fl
++\fP
++.fi
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++java(1) \- Java¥¢¥×¥ê¥±¡¼¥·¥ç¥óµ¯Æ°¥Ä¡¼¥ë
++.TP 2
++o
++jps(1) \- Java²¾ÁÛ¥Þ¥·¥ó¡¦¥×¥í¥»¥¹¡¦¥¹¥Æ¡¼¥¿¥¹¡¦¥Ä¡¼¥ë
++.TP 2
++o
++jstat(1) \- Java²¾ÁÛ¥Þ¥·¥óÅý·×¥Ç¡¼¥¿´Æ»ë¥Ä¡¼¥ë
++.TP 2
++o
++.na
++\f2rmiregistry\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- Java¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¡¦¥ì¥¸¥¹¥È¥ê
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/keytool.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/keytool.1 Sun Jan 25 08:34:16 2015 -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,6 +19,1827 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH keytool 1 "07 May 2011"
++.TH keytool 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++keytool \- ¸°¤È¾ÚÌÀ½ñ¤Î´ÉÍý¥Ä¡¼¥ë
++.LP
++.LP
++°Å¹æ²½¸°¡¢X.509¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ª¤è¤Ó¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤ò´Þ¤à¥­¡¼¥¹¥È¥¢(¥Ç¡¼¥¿¥Ù¡¼¥¹)¤ò´ÉÍý¤·¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3keytool\fP [ commands ]
++.fl
++.fi
++
++.LP
++.LP
++Java SE 6¤Çkeytool¤Î¥³¥Þ¥ó¥É¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£¾ÜºÙ¤Ï¡¢Êѹ¹ÅÀ¤Î¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£°ÊÁ°¤ËÄêµÁ¤µ¤ì¤¿¥³¥Þ¥ó¥É¤â°ú³¤­¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++.SH "ÀâÌÀ"
++.LP
++\f3keytool\fP¤Ï¡¢¸°¤È¾ÚÌÀ½ñ¤ò´ÉÍý¤¹¤ë¤¿¤á¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥æ¡¼¥¶¡¼¤Ï¼«Ê¬¤Î¸ø³«¸°¤ÈÈëÌ©¸°¤Î¥Ú¥¢¤ª¤è¤Ó´ØÏ¢¤¹¤ë¾ÚÌÀ½ñ¤ò´ÉÍý¤·¡¢¥Ç¥¸¥¿¥ë½ð̾¤ò»ÈÍѤ·¤¿¼«¸Êǧ¾Ú(¾¤Î¥æ¡¼¥¶¡¼¤Þ¤¿¤Ï¥µ¡¼¥Ó¥¹¤ËÂФ·¤Æ¼«Ê¬¼«¿È¤òǧ¾Ú¤¹¤ë¤³¤È)¤ä¡¢¥Ç¡¼¥¿¤ÎÀ°¹çÀ­¤È¾ÚÌÀ½ñ¤Ë´Ø¤¹¤ë¥µ¡¼¥Ó¥¹¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢ÄÌ¿®Áê¼ê¤Î¸ø³«¸°¤ò(¾ÚÌÀ½ñ¤Î·Á¤Ç)¥­¥ã¥Ã¥·¥å¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.LP
++¡Ö\f2¾ÚÌÀ½ñ\fP¡×¤È¤Ï¡¢¤¢¤ë¥¨¥ó¥Æ¥£¥Æ¥£(¿Íʪ¡¢²ñ¼Ò¤Ê¤É)¤«¤é¤Î¥Ç¥¸¥¿¥ë½ð̾ÉÕ¤­¤Îʸ½ñ¤Î¤³¤È¤Ç¤¹¡£¾ÚÌÀ½ñ¤Ë¤Ï¡¢Â¾¤Î¤¢¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤Î¸ø³«¸°(¤ª¤è¤Ó¤½¤Î¾¤Î¾ðÊó)¤¬ÆÃÊ̤ÊÃͤò»ý¤Ã¤Æ¤¤¤ë¤³¤È¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£(¾ÚÌÀ½ñ¤ò»²¾È¡£)¥Ç¡¼¥¿¤Ë¥Ç¥¸¥¿¥ë½ð̾¤¬ÉÕ¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥Ç¥¸¥¿¥ë½ð̾¤ò¸¡¾Ú¤¹¤ë¤³¤È¤Ç¡¢¥Ç¡¼¥¿¤ÎÀ°¹çÀ­¤ª¤è¤Ó¥Ç¡¼¥¿¤¬ËÜʪ¤Ç¤¢¤ë¤³¤È¤ò¥Á¥§¥Ã¥¯¤Ç¤­¤Þ¤¹¡£¥Ç¡¼¥¿¤Î¡Ö\f2À°¹çÀ­\fP¡×¤È¤Ï¡¢¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿¤ê¡¢²þÊѤµ¤ì¤¿¤ê¤·¤Æ¤¤¤Ê¤¤¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£¤Þ¤¿¡¢¥Ç¡¼¥¿¤¬¡Ö\f2ËÜʪ¤Ç¤¢¤ë\fP¡×¤È¤Ï¡¢¤½¤Î¥Ç¡¼¥¿¤¬¡¢¥Ç¡¼¥¿¤òºîÀ®¤·¤Æ½ð̾¤·¤¿¤È¾Î¤¹¤ë¿Íʪ¤«¤é¼ÂºÝ¤ËÅϤµ¤ì¤¿¥Ç¡¼¥¿¤Ç¤¢¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
++.LP
++.LP
++¤Þ¤¿¡¢\f3keytool\fP¤ò»ÈÍѤ¹¤ì¤Ð¡¢DES¤Ê¤É¤ÎÂоΰŹ沽/Éü¹æ²½¤Ç»ÈÍѤµ¤ì¤ëÈëÌ©¸°¤ò´ÉÍý¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f3keytool\fP¤Ï¡¢¸°¤È¾ÚÌÀ½ñ¤ò\f2¥­¡¼¥¹¥È¥¢\fP¤Ë³ÊǼ¤·¤Þ¤¹¡£
++.LP
++.SH "¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ëÃí°Õ"
++.LP
++.LP
++ÍÍ¡¹¤Ê¥³¥Þ¥ó¥É¤È¤½¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¡¢²¼µ­¤ÇÀâÌÀ¤·¤Þ¤¹¡£Ãí°Õ:
++.LP
++.RS 3
++.TP 2
++o
++¤É¤Î¥³¥Þ¥ó¥É̾¤ª¤è¤Ó¥ª¥×¥·¥ç¥ó̾¤Ë¤âÀèƬ¤Ë¥Þ¥¤¥Ê¥¹µ­¹æ(\-)¤¬ÉÕ¤­¤Þ¤¹¡£
++.TP 2
++o
++³Æ¥³¥Þ¥ó¥É¤Î¥ª¥×¥·¥ç¥ó¤ÏǤ°Õ¤Î½ç½ø¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
++.TP 2
++o
++¥¤¥¿¥ê¥Ã¥¯ÂΤˤʤäƤ¤¤Ê¤¤¤¹¤Ù¤Æ¤Î¹àÌÜ¡¢¤Þ¤¿¤ÏÃæ³ç¸Ì¤«³Ñ³ç¸Ì¤Ç°Ï¤Þ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¹àÌܤϡ¢¤½¤Î¤È¤ª¤ê¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó¤ò°Ï¤àÃæ³ç¸Ì¤Ï¡¢°ìÈ̤ˡ¢¤½¤Î¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¡¢¥Ç¥Õ¥©¥ë¥ÈÃͤ¬»ÈÍѤµ¤ì¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£Ãæ³ç¸Ì¤Ï¡¢\f2\-v\fP¡¢\f2\-rfc\fP¤ª¤è¤Ó\f2\-J\fP¥ª¥×¥·¥ç¥ó¤ò°Ï¤à¤¿¤á¤Ë¤â»ÈÍѤµ¤ì¤Þ¤¹¤¬¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿¾ì¹ç¤Ë¤Î¤ß°ÕÌ£¤ò»ý¤Á¤Þ¤¹(¤Ä¤Þ¤ê¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¥ª¥×¥·¥ç¥ó¼«ÂΤò»ØÄꤷ¤Ê¤¤¤³¤È°Ê³°¤Ë¡Ö¥Ç¥Õ¥©¥ë¥È¡×Ãͤϸºß¤·¤Þ¤»¤ó)¡£
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó¤ò°Ï¤à³Ñ³ç¸Ì¤Ï¡¢¤½¤Î¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¡¢ÃͤÎÆþÎϤòµá¤á¤é¤ì¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£(\f2\-keypass\fP¥ª¥×¥·¥ç¥ó¤Î¾ì¹ç¡¢¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢\f3keytool\fP¤¬¤Þ¤º¥­¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤«¤éÈó¸ø³«/ÈëÌ©¸°¤ÎÉü¸µ¤ò»î¤ß¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤Ï¡¢¤³¤Î»î¤ß¤¬¼ºÇÔ¤·¤¿¾ì¹ç¤ËÈó¸ø³«/ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£)
++.TP 2
++o
++¥¤¥¿¥ê¥Ã¥¯ÂΤιàÌܤμºݤÎÃÍ(¥ª¥×¥·¥ç¥ó¤ÎÃÍ)¤Ï¡¢»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2\-printcert\fP¥³¥Þ¥ó¥É¤Î·Á¼°¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.nf
++\f3
++.fl
++ keytool \-printcert {\-file \fP\f4cert_file\fP\f3} {\-v}
++.fl
++\fP
++.fi
++.LP
++\f2\-printcert\fP¥³¥Þ¥ó¥É¤ò»ØÄꤹ¤ë¤È¤­¤Ï¡¢\f2cert_file\fP¤Î¤«¤ï¤ê¤Ë¼ÂºÝ¤Î¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ keytool \-printcert \-file VScert.cer
++.fl
++\fP
++.fi
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó¤ÎÃͤ˶õÇò(¥¹¥Ú¡¼¥¹)¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢Ãͤò°úÍÑÉä¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 2
++o
++\f2\-help\fP¥³¥Þ¥ó¥É¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥³¥Þ¥ó¥É¤Ç¤¹¡£¤½¤Î¤¿¤á¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó
++.nf
++\f3
++.fl
++ keytool
++.fl
++\fP
++.fi
++.LP
++¤Ï¡¢¼¡¤ÈƱ¤¸¤Ç¤¹¡£
++.nf
++\f3
++.fl
++ keytool \-help
++.fl
++\fP
++.fi
++.RE
++
++.LP
++.SS
++¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ
++.LP
++.LP
++¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++\-alias "mykey"
++.fl
++
++.fl
++\-keyalg
++.fl
++ "DSA" (when using \fP\f3\-genkeypair\fP\f3)
++.fl
++ "DES" (when using \fP\f3\-genseckey\fP\f3)
++.fl
++
++.fl
++\-keysize
++.fl
++ 2048 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "RSA")
++.fl
++ 1024 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "DSA")
++.fl
++ 256 (when using \fP\f3\-genkeypair\fP\f3 and \-keyalg is "EC")
++.fl
++ 56 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DES")
++.fl
++ 168 (when using \fP\f3\-genseckey\fP\f3 and \-keyalg is "DESede")
++.fl
++
++.fl
++
++.fl
++\-validity 90
++.fl
++
++.fl
++\-keystore the file named \fP\f4.keystore\fP\f3 in the user's home directory
++.fl
++
++.fl
++\-storetype the value of the "keystore.type" property in the security properties file,
++.fl
++ which is returned by the static \fP\f4getDefaultType\fP\f3 method in
++.fl
++ \fP\f4java.security.KeyStore\fP\f3
++.fl
++
++.fl
++\-file stdin if reading, stdout if writing
++.fl
++
++.fl
++\-protected false
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¸ø³«/ÈëÌ©¸°¥Ú¥¢¤ÎÀ¸À®¤Ë¤ª¤¤¤Æ¡¢½ð̾¥¢¥ë¥´¥ê¥º¥à(\f2\-sigalg\fP¥ª¥×¥·¥ç¥ó)¤Ï¡¢´ð¤Ë¤Ê¤ëÈëÌ©¸°¤Î¥¢¥ë¥´¥ê¥º¥à¤«¤éÇÉÀ¸¤·¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++´ð¤Ë¤Ê¤ëÈëÌ©¸°¤¬DSA¥¿¥¤¥×¤Ç¤¢¤ë¾ì¹ç¤Ï¡¢\f2\-sigalg\fP¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤÏSHA1withDSA¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++´ð¤Ë¤Ê¤ëÈëÌ©¸°¤¬RSA¥¿¥¤¥×¤Ç¤¢¤ë¾ì¹ç¤Ï¡¢\f2\-sigalg\fP¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤÏSHA256withRSA¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 2
++o
++´ð¤Ë¤Ê¤ëÈëÌ©¸°¤¬EC¥¿¥¤¥×¤Ç¤¢¤ë¾ì¹ç¤Ï¡¢\f2\-sigalg\fP¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤÏSHA256withECDSA¤Ë¤Ê¤ê¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++ÁªÂò²Äǽ¤Ê\f2\-keyalg\fP¤ª¤è¤Ó\f2\-sigalg\fP¤Î´°Á´¤Ê°ìÍ÷¤Ë¤Ä¤¤¤Æ¤Ï¡¢
++.na
++\f2Java Cryptography Architecture API Specification & Reference\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SS
++°ìÈÌ¥ª¥×¥·¥ç¥ó
++.LP
++.LP
++\f2\-v\fP¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2\-help\fP¥³¥Þ¥ó¥É¤ò½ü¤¯¤¹¤Ù¤Æ¤Î¥³¥Þ¥ó¥É¤Ç»ÈÍѤǤ­¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥³¥Þ¥ó¥É¤Ï¡Ö¾éĹ¡×¥â¡¼¥É¤Ç¼Â¹Ô¤µ¤ì¡¢¾ÜºÙ¤Ê¾ÚÌÀ½ñ¾ðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£
++.LP
++.LP
++¤Þ¤¿¡¢\f2\-J\fP\f2javaoption\fP¥ª¥×¥·¥ç¥ó¤â¡¢Ç¤°Õ¤Î¥³¥Þ¥ó¥É¤Ç»ÈÍѤǤ­¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢»ØÄꤵ¤ì¤¿\f2javaoption\fPʸ»úÎó¤¬Java¥¤¥ó¥¿¥×¥ê¥¿¤ËľÀÜÅϤµ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¶õÇò¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¼Â¹Ô´Ä¶­¤Þ¤¿¤Ï¥á¥â¥ê¡¼»ÈÍѤòÄ´À°¤¹¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£»ØÄê¤Ç¤­¤ë¥¤¥ó¥¿¥×¥ê¥¿¡¦¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2java \-h\fP¤Þ¤¿¤Ï\f2java \-X\fP¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++¼¡¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥­¡¼¥¹¥È¥¢¤ËÂФ¹¤ëÁàºî¤ò¹Ô¤¦¤¹¤Ù¤Æ¤Î¥³¥Þ¥ó¥É¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++\-storetype storetype
++.LP
++¤³¤Î½¤¾þ»Ò¤Ï¡¢¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤¹¤ë¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-keystore keystore
++.LP
++¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++ÆÃÄê¤Î\f3keytool\fP¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ëºÝ¤Ë¡¢JKS¥¹¥È¥¢¥¿¥¤¥×¤¬»ÈÍѤµ¤ì¡¢¤«¤Ä¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¿·¤·¤¤¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2keytool \-genkeypair\fP¤Î¼Â¹Ô»þ¤Ë\f2\-keystore\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\f2.keystore\fP¤È¤¤¤¦Ì¾Á°¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¥æ¡¼¥¶¡¼¤Î¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¤½¤³¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£Æ±Íͤˡ¢\f2\-keystore \fP\f2ks_file\fP¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤â¤½¤Î\f2ks_file\fP¤¬Â¸ºß¤·¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
++.LP
++\f2\-keystore\fP¥ª¥×¥·¥ç¥ó¤«¤é¤ÎÆþÎÏ¥¹¥È¥ê¡¼¥à¤Ï¡¢\f2KeyStore.load\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£URL¤È¤·¤Æ\f2NONE\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢null¤Î¥¹¥È¥ê¡¼¥à¤¬\f2KeyStore.load\fP¥á¥½¥Ã¥É¤ËÅϤµ¤ì¤Þ¤¹¡£\f2NONE\fP¤Ï¡¢\f2KeyStore\fP¤¬¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Ç¤Ï¤Ê¤¯¡¢¤¿¤È¤¨¤Ð¡¢¥Ï¡¼¥É¥¦¥§¥¢¡¦¥È¡¼¥¯¥ó¡¦¥Ç¥Ð¥¤¥¹¤ËÃÖ¤«¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-storepass[:env|:file] argument
++.LP
++¥­¡¼¥¹¥È¥¢¤ÎÀ°¹çÀ­¤òÊݸ¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++½¤¾þ»Ò\f2env\fP¤Þ¤¿¤Ï\f2file\fP¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÃͤÏ\f2argument\fP¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ÎÃͤϡ¢6ʸ»ú°Ê¾å¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ñ¥¹¥ï¡¼¥É¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¼èÆÀ¤µ¤ì¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f2env\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î´Ä¶­ÊÑ¿ô¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
++.TP 2
++o
++\f2file\fP: \f2argument\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ò¼èÆÀ¤·¤Þ¤¹¡£
++.RE
++.LP
++\f3Ãí°Õ\fP: \f2\-keypass\fP¡¢\f2\-srckeypass\fP¡¢\f2\-destkeypass\fP¡¢\f2\-srcstorepass\fP¡¢\f2\-deststorepass\fP¤Ê¤É¤Î¥Ñ¥¹¥ï¡¼¥É¤òɬÍפȤ¹¤ë¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ï¤¹¤Ù¤Æ¡¢\f2env\fP¤È\f2file\fP½¤¾þ»Ò¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£¥Ñ¥¹¥ï¡¼¥É¡¦¥ª¥×¥·¥ç¥ó¤È½¤¾þ»Ò¤Ï¡¢É¬¤º¥³¥í¥ó(\f2:\fP)¤Ç¶èÀڤäƤ¯¤À¤µ¤¤¡£
++.LP
++¥Ñ¥¹¥ï¡¼¥É¤Ï¡¢¥­¡¼¥¹¥È¥¢¤ÎÆâÍƤ˥¢¥¯¥»¥¹¤¹¤ë¤¹¤Ù¤Æ¤Î¥³¥Þ¥ó¥É¤Ç»ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤Î¼ï¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2\-storepass\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.LP
++¥­¡¼¥¹¥È¥¢¤«¤é¾ðÊó¤ò¼è¤ê½Ð¤¹¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ò¾Êά¤Ç¤­¤Þ¤¹¡£¥Ñ¥¹¥ï¡¼¥É¤ò¾Êά¤¹¤ë¤È¡¢¼è¤ê½Ð¤¹¾ðÊó¤ÎÀ°¹çÀ­¤ò¥Á¥§¥Ã¥¯¤Ç¤­¤Ê¤¤¤Î¤Ç¡¢·Ù¹ð¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-providerName provider_name
++.LP
++¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Ë´Þ¤Þ¤ì¤ë°Å¹æ²½¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À̾¤òÆÃÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-providerClass provider_class_name
++.LP
++°Å¹æ²½¥µ¡¼¥Ó¥¹¡¦¥×¥í¥Ð¥¤¥À¤¬¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ë»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï¡¢¤½¤Î¥Þ¥¹¥¿¡¼¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤹ¤ë¤È¤­¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-providerArg provider_arg
++.LP
++\f2\-providerClass\fP¤ÈÁȤ߹礻¤Æ»ÈÍѤ·¤Þ¤¹¡£\f2provider_class_name\fP¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¤ËÂФ¹¤ë¾Êά²Äǽ¤Êʸ»úÎóÆþÎÏ°ú¿ô¤òɽ¤·¤Þ¤¹¡£
++.TP 3
++\-protected
++.LP
++\f2true\fP¤Þ¤¿¤Ï\f2false\fP¤Î¤¤¤º¤ì¤«¡£ÀìÍÑPIN¥ê¡¼¥À¡¼¤Ê¤É¤ÎÊݸ¤ì¤¿Ç§¾Ú¥Ñ¥¹¤ò²ð¤·¤Æ¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¤³¤ÎÃͤË\f2true\fP¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++Ãí°Õ: \f2\-importkeystore\fP¥³¥Þ¥ó¥É¤Ë¤Ï2¤Ä¤Î¥­¡¼¥¹¥È¥¢¤¬´Ø·¸¤·¤Æ¤¤¤ë¤¿¤á¡¢2¤Ä¤Î¥ª¥×¥·¥ç¥ó¡¢¤Ä¤Þ¤ê\f2\-srcprotected\fP¤È\f2\-destprotected\fP¤¬¥½¡¼¥¹¡¦¥­¡¼¥¹¥È¥¢¤È¥¿¡¼¥²¥Ã¥È¡¦¥­¡¼¥¹¥È¥¢¤Ë¤½¤ì¤¾¤ì»ØÄꤵ¤ì¤Þ¤¹¡£
++.TP 3
++\-ext {name{:critical}{=value}}
++.LP
++X.509¾ÚÌÀ½ñ¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤ò¼¨¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò\-genkeypair¤ª¤è¤Ó\-gencert¤Ç»ÈÍѤ·¤Æ¡¢À¸À®¤µ¤ì¤ë¾ÚÌÀ½ñ¤Þ¤¿¤Ï\f2\-certreq\fP¤Ë¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤òËä¤á¹þ¤ß¡¢¾ÚÌÀ½ñ¥ê¥¯¥¨¥¹¥È¤Ç¥ê¥¯¥¨¥¹¥È¤µ¤ì¤ë¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤ò¼¨¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢Ê£¿ô²ó»ÈÍѤǤ­¤Þ¤¹¡£name¤Ë¤Ï¡¢¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó̾(²¼µ­¤ò»²¾È)¤Þ¤¿¤ÏǤ°Õ¤ÎOIDÈÖ¹æ¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£value¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Î¥Ñ¥é¥á¡¼¥¿¤ò¼¨¤·¤Þ¤¹¡£¾Êά¤·¤¿¾ì¹ç¤Ï¡¢¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ(ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç)¤ò¼¨¤¹¤«¡¢¤Þ¤¿¤Ï¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Ë¥Ñ¥é¥á¡¼¥¿¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£\f2:critical\fP½¤¾þ»Ò¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤ÎisCritical°À­¤¬true¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ïfalse¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£\f2:critical\fP¤Î¤«¤ï¤ê¤Ë\f2:c\fP¤ò»ÈÍѤǤ­¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++¸½ºß¡¢keytool¤Ï¼¡¤Î̾Á°¤Î¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹(Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó)¡£
++.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
++.nr 34 \n(.lu
++.eo
++.am 80
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++BC¤Þ¤¿¤ÏBasicConstraints
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++´°Á´¤Ê·Á¤Ï¡Öca:{true|false}[,pathlen:<len>]¡×¤Ç¡¢<len>¤Ï¡Öca:true,pathlen:<len>¡×¤Î¾Êάɽµ­¤Ç¤¹¡£
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++usage(,usage)*¡£usage¤Ë¤Ï¡¢digitalSignature¡¢ nonRepudiation (contentCommitment)¡¢keyEncipherment¡¢dataEncipherment¡¢keyAgreement¡¢keyCertSign¡¢cRLSign¡¢encipherOnly¡¢decipherOnly¤Î¤¤¤º¤ì¤«¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£Usage¤Ï¡¢¤¢¤¤¤Þ¤¤¤µ¤¬¤Ê¤±¤ì¤Ð¡¢ºÇ½é¤Î¿ôʸ»ú(¤¿¤È¤¨¤Ð¡¢digitalSignature¤òdig¤Ë)¤Þ¤¿¤Ï¥­¥ã¥á¥ë¥±¡¼¥¹¡¦¥¹¥¿¥¤¥ë¤Ë(¤¿¤È¤¨¤Ð¡¢ û½Ì¤Ç¤­¤Þ¤¹¡£Usage¤ÎÂçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++EKU¤Þ¤¿¤ÏExtendedkeyUsage
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++usage(,usage)*¡£usage¤Ë¤Ï¡¢anyExtendedKeyUsage¡¢ serverAuth¡¢clientAuth¡¢codeSigning¡¢emailProtection¡¢ timeStamping¡¢OCSPSigning¡¢¤Þ¤¿¤ÏǤ°Õ¤ÎOIDʸ»úÎó¤Î¤¤¤º¤ì¤«¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£ ̾Á°ÉÕ¤­¤Îusage¤Ï¡¢¤¢¤¤¤Þ¤¤¤µ¤¬¤Ê¤±¤ì¤Ð¡¢ ºÇ½é¤Î¿ôʸ»ú¤Þ¤¿¤Ï¥­¥ã¥á¥ë¥±¡¼¥¹¡¦¥¹¥¿¥¤¥ë¤Ë û½Ì¤Ç¤­¤Þ¤¹¡£Usage¤ÎÂçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++SAN¤Þ¤¿¤ÏSubjectAlternativeName
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++type:value(,type:value)*¡£type¤Ë¤Ï¡¢EMAIL¡¢URI¡¢DNS¡¢IP¤Þ¤¿¤ÏOID¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£value¤Ï¡¢type¤Îʸ»úÎó·Á¼°¤ÎÃͤǤ¹¡£
++.br
++.di
++.nr g| \n(dn
++.nr g- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di h+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++IAN¤Þ¤¿¤ÏIssuerAlternativeName
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SubjectAlternativeName¤ÈƱ¤¸¤Ç¤¹
++.br
++.di
++.nr i| \n(dn
++.nr i- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di j+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++SIA¤Þ¤¿¤ÏSubjectInfoAccess
++.br
++.di
++.nr j| \n(dn
++.nr j- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di k+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++method:location\-type:location\-value (,method:location\-type:location\-value)*¡£ method¤Ë¤Ï¡¢¡ÖtimeStamping¡×¡¢¡ÖcaRepository¡×¡¢¤Þ¤¿¤ÏǤ°Õ¤ÎOID¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£location\-type¤ª¤è¤Ólocation\-value¤Ë¤Ï¡¢SubjectAlternativeName¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤ëǤ°Õ¤Îtype:value¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.br
++.di
++.nr k| \n(dn
++.nr k- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di l+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++AIA¤Þ¤¿¤ÏAuthorityInfoAccess
++.br
++.di
++.nr l| \n(dn
++.nr l- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di m+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++SubjectInfoAccess¤ÈƱ¤¸¤Ç¤¹¡£method¤Ë¤Ï¡¢¡Öocsp¡×¡¢¡ÖcaIssuers¡×¡¢¤Þ¤¿¤ÏǤ°Õ¤ÎOID¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.br
++.di
++.nr m| \n(dn
++.nr m- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w\f3̾Á°\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \wKU¤Þ¤¿¤ÏKeyUsage
++.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 38 \n(d-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(f-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(h-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(j-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(l-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 81 0
++.nr 38 \w\f3ÃÍ\fP
++.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(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(i-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(k-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(m-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 325 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3̾Á°\fP\h'|\n(41u'\f3ÃÍ\fP
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.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(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'KU¤Þ¤¿¤ÏKeyUsage\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.ne \n(e|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.d+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.f+
++.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
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.h+
++.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
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.j+
++.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
++.k+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(l|u+\n(.Vu
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.l+
++.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
++.m+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.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.-44
++
++.LP
++.LP
++OID̾¤Î¾ì¹ç¡¢OCTET STRING¥¿¥¤¥×¤ÈŤµ¤Î¥Ð¥¤¥È¤ò½ü³°¤·¤¿¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢ÃͤÏextnValue¤ÎHEX¥À¥ó¥×¤ÎDER¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤¹¡£HEXʸ»úÎó¤Ç¤Ï¡¢É¸½à¤ÎHEX¿ô(0\-9¡¢a\-f¡¢A\-F)°Ê³°¤Îʸ»ú¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2¡Ö01:02:03:04¡×\fP¤È\f2¡Ö01020304¡×\fP¤ÎξÊý¤È¤âƱ°ì¤ÎÃͤȤ·¤Æ¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤¹¡£Ãͤ¬¤Ê¤¤¾ì¹ç¡¢¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤ÎÃÍ¥Õ¥£¡¼¥ë¥É¤Ï¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f2\-gencert\fP¤Ç¤Î¤ß»ÈÍѤ¹¤ë\f2¡Öhonored¡×\fP¤È¤¤¤¦ÆÃÊ̤Ê̾Á°¤Ï¡¢¾ÚÌÀ½ñ¥ê¥¯¥¨¥¹¥È¤Ë´Þ¤Þ¤ì¤ë¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤òÍ¥À褹¤ëÊýË¡¤ò¼¨¤·¤Þ¤¹¡£¤³¤Î̾Á°¤ÎÃͤϡ¢\f2¡Öall¡×\fP(¥ê¥¯¥¨¥¹¥È¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤¬Í¥À褵¤ì¤ë)¡¢\f2¡Öname{:[critical|non\-critical]}¡×\fP(̾Á°ÉÕ¤­¤Î¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤¬Í¥À褵¤ì¤ë¤¬¡¢Ê̤ÎisCritical°À­¤ò»ÈÍѤ¹¤ë)¡¢¤ª¤è¤Ó\f2¡Ö\-name¡×\fP(¡Öall¡×¤È¤È¤â¤Ë»ÈÍѤ·¡¢Îã³°¤ò¼¨¤¹)¤Î¥«¥ó¥Þ¶èÀÚ¤ê¥ê¥¹¥È¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤µ¤ì¤ë¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤ÏÍ¥À褵¤ì¤Þ¤»¤ó¡£
++.LP
++.LP
++\-extÍ¥Àè¤Î¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¡¢Ê̤Î̾Á°¤Î¡¢¤Þ¤¿¤ÏOID \-ext¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¤³¤Î¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤¬¡¢¤¹¤Ç¤ËÍ¥À褵¤ì¤Æ¤¤¤ë¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤ËÄɲ䵤ì¤Þ¤¹¡£¤¿¤À¤·¡¢¤³¤Î̾Á°(¤Þ¤¿¤ÏOID)¤òÍ¥À褵¤ì¤ëÃͤǤâ»ÈÍѤ·¤¿¾ì¹ç¤Ï¡¢¤½¤ÎÃͤȽÅÍ×À­¤¬¥ê¥¯¥¨¥¹¥È¤Ë´Þ¤Þ¤ì¤ë¤â¤Î¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
++.LP
++.LP
++subjectKeyIdentifier¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Ï¾ï¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£¼«¸Ê½ð̾¤Ç¤Ê¤¤¾ÚÌÀ½ñ¤Î¾ì¹ç¤Ï¡¢authorityKeyIdentifier¤¬¾ï¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f3Ãí°Õ:\fP ¥æ¡¼¥¶¡¼¤Ï¡¢¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó(¤ª¤è¤Ó¾ÚÌÀ½ñ¤Î¾¤Î¥Õ¥£¡¼¥ë¥É)¤ÎÁȹ礻¤Ë¤è¤Ã¤Æ¤Ï¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Îɸ½à¤Ë½àµò¤·¤Ê¤¤¾ì¹ç¤¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¾ÜºÙ¤Ï¡¢¾ÚÌÀ½ñ¤Î½àµò¤Ë´Ø¤¹¤ëÃí°Õ»ö¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "¥³¥Þ¥ó¥É"
++.LP
++.SS
++¥­¡¼¥¹¥È¥¢¤Ø¤Î¥Ç¡¼¥¿¤ÎºîÀ®¤Þ¤¿¤ÏÄɲÃ
++.LP
++.RS 3
++.TP 3
++\-gencert {\-rfc} {\-infile infile} {\-outfile outfile} {\-alias alias} {\-sigalg sigalg} {\-dname dname} {\-startdate startdate {\-ext ext}* {\-validity valDays} [\-keypass keypass] {\-keystore keystore} [\-storepass storepass] {\-storetype storetype} {\-providername provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
++.LP
++¾ÚÌÀ½ñ¥ê¥¯¥¨¥¹¥È¡¦¥Õ¥¡¥¤¥ë(\f2keytool \-certreq\fP¥³¥Þ¥ó¥É¤ÇºîÀ®²Äǽ)¤ËÂФ¹¤ë¥ì¥¹¥Ý¥ó¥¹¤È¤·¤Æ¾ÚÌÀ½ñ¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢\f2infile\fP¤«¤é(¾Êά¤·¤¿¾ì¹ç¤Ï¡¢É¸½àÆþÎϤ«¤é)¥ê¥¯¥¨¥¹¥È¤òÆɤ߹þ¤ß¡¢ÊÌ̾¤ÎÈëÌ©¸°¤ò»ÈÍѤ·¤Æ¤½¤Î¥ê¥¯¥¨¥¹¥È¤Ë½ð̾¤·¤Æ¡¢X.509¾ÚÌÀ½ñ¤ò\f2outfile\fP¤Ë(¾Êά¤·¤¿¾ì¹ç¤Ï¡¢É¸½à½ÐÎϤË)½ÐÎϤ·¤Þ¤¹¡£\f2\-rfc\fP¤ò»ØÄꤷ¤¿¾ì¹ç¡¢½ÐÎÏ·Á¼°¤ÏBASE64Éä¹æ²½¤ÎPEM¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢¥Ð¥¤¥Ê¥êDER¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
++.LP
++\f2sigalg\fP¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤ò»ØÄꤷ¤Þ¤¹¡£\f2startdate\fP¤Ï¡¢¾ÚÌÀ½ñ¤¬Í­¸ú¤Ë¤Ê¤ë³«»Ï»þ¹ï/ÆüÉդǤ¹¡£\f2valDays\fP¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤ÎÍ­¸úÆü¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++\f2dname\fP¤ò»ØÄꤹ¤ë¤È¡¢À¸À®¤µ¤ì¤ë¾ÚÌÀ½ñ¤Î¼çÂΤȤ·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢¾ÚÌÀ½ñ¥ê¥¯¥¨¥¹¥È¤«¤é¤Î̾Á°¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
++.LP
++\f2ext\fP¤Ï¡¢¾ÚÌÀ½ñ¤ËËä¤á¹þ¤Þ¤ì¤ëX.509¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤ò¼¨¤·¤Þ¤¹¡£\f2\-ext\fP¤Î¹½Ê¸¤Ë¤Ä¤¤¤Æ¤Ï¡¢°ìÈÌ¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++\f2\-gencert\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤È¡¢¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤òºîÀ®¤Ç¤­¤Þ¤¹¡£¼¡¤ÎÎã¤Ç¤Ï¡¢\f2e1\fP¤È¤¤¤¦¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¡£¤³¤Î¾ÚÌÀ½ñ¤Î¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Ë¤Ï¡¢3¤Ä¤Î¾ÚÌÀ½ñ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢\f2ca\fP¡¢\f2ca1\fP¡¢\f2ca2\fP¤ª¤è¤Ó\f2e1\fP¤Î4¤Ä¤Î¸°¥Ú¥¢¤òºîÀ®¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++keytool \-alias ca \-dname CN=CA \-genkeypair
++.fl
++keytool \-alias ca1 \-dname CN=CA \-genkeypair
++.fl
++keytool \-alias ca2 \-dname CN=CA \-genkeypair
++.fl
++keytool \-alias e1 \-dname CN=E1 \-genkeypair
++.fl
++\fP
++.fi
++.LP
++¼¡¤Î2¤Ä¤Î¥³¥Þ¥ó¥É¤Ï¡¢½ð̾ÉÕ¤­¾ÚÌÀ½ñ¤Î¥Á¥§¡¼¥ó¤òºîÀ®¤·¤Þ¤¹¡£\f2ca\fP¤Ïca1¤Ë½ð̾¤·¡¢\f2ca1\fP¤Ïca2¤Ë½ð̾¤·¤Þ¤¹¡£¤¹¤Ù¤Æ¼«¸Êȯ¹Ô¤Ç¤¹¡£
++.nf
++\f3
++.fl
++keytool \-alias ca1 \-certreq | keytool \-alias ca \-gencert \-ext san=dns:ca1 | keytool \-alias ca1 \-importcert
++.fl
++keytool \-alias ca2 \-certreq | $KT \-alias ca1 \-gencert \-ext san=dns:ca2 | $KT \-alias ca2 \-importcert
++.fl
++\fP
++.fi
++.LP
++¼¡¤Î¥³¥Þ¥ó¥É¤Ï¡¢¾ÚÌÀ½ñ\f2e1\fP¤òºîÀ®¤·¤Æ¥Õ¥¡¥¤¥ë\f2e1.cert\fP¤Ë³ÊǼ¤·¤Þ¤¹¡£¤³¤Î¾ÚÌÀ½ñ¤Ï\f2ca2\fP¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤Þ¤¹¡£¤½¤Î·ë²Ì¡¢\f2e1\fP¤Î¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Ë¤Ï\f2ca\fP¡¢\f2ca1\fP¤ª¤è¤Ó\f2ca2\fP¤¬´Þ¤Þ¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++keytool \-alias e1 \-certreq | keytool \-alias ca2 \-gencert > e1.cert
++.fl
++\fP
++.fi
++.TP 3
++\-genkeypair {\-alias alias} {\-keyalg keyalg} {\-keysize keysize} {\-sigalg sigalg} [\-dname dname] [\-keypass keypass] {\-startdate value} {\-ext ext}* {\-validity valDays} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
++.LP
++¸°¤Î¥Ú¥¢(¸ø³«¸°¤ª¤è¤Ó´ØÏ¢¤¹¤ëÈëÌ©¸°)¤òÀ¸À®¤·¤Þ¤¹¡£¸ø³«¸°¤ÏX.509 v3¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Ç¥é¥Ã¥×¤µ¤ì¤Þ¤¹¡£¾ÚÌÀ½ñ¤Ï¡¢Ã±°ì¤ÎÍ×ÁǤò»ý¤Ä¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤È¤·¤Æ³ÊǼ¤µ¤ì¤Þ¤¹¡£¤³¤Î¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ÈÈëÌ©¸°¤Ï¡¢\f2alias\fP¤ÇÆÃÄꤵ¤ì¤ë¿·¤·¤¤¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£
++.LP
++\f2keyalg\fP¤Ï¸°¤Î¥Ú¥¢¤ÎÀ¸À®¤Ë»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤ò¡¢\f2keysize\fP¤ÏÀ¸À®¤¹¤ë³Æ¸°¤Î¥µ¥¤¥º¤ò¡¢¤½¤ì¤¾¤ì»ØÄꤷ¤Þ¤¹¡£\f2sigalg\fP¤Ë¤Ï¡¢¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢\f2keyalg\fP¤È¸ß´¹¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++\f2dname\fP¤Ë¤Ï¡¢\f2alias\fP¤Ë´ØÏ¢ÉÕ¤±¡¢¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Î\f2issuer\fP¥Õ¥£¡¼¥ë¥É¤È\f2subject\fP¥Õ¥£¡¼¥ë¥É¤È¤·¤Æ»ÈÍѤ¹¤ëX.500 ¼±ÊÌ̾¤ò»ØÄꤷ¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¼±ÊÌ̾¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¼±ÊÌ̾¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.LP
++\f2keypass\fP¤Ë¤Ï¡¢À¸À®¤µ¤ì¤ë¸°¤Î¥Ú¥¢¤Î¤¦¤Á¡¢ÈëÌ©¸°¤òÊݸ¤ë¤Î¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£¤³¤Î¤È¤­¡¢[Return]¥­¡¼¤ò²¡¤¹¤È¡¢¥­¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ÈƱ¤¸¥Ñ¥¹¥ï¡¼¥É¤¬¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f2keypass\fP¤Ï¡¢6ʸ»ú°Ê¾å¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++\f2startdate\fP¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤Îȯ¹Ô»þ¹ï¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤ì¤Ï¡¢X.509¾ÚÌÀ½ñ¤Î¡ÖValidity¡×¥Õ¥£¡¼¥ë¥É¤Î¡ÖNot Before¡×ÃͤȤâ¸Æ¤Ð¤ì¤Þ¤¹¡£
++.LP
++¥ª¥×¥·¥ç¥ó¤ÎÃͤϡ¢¼¡¤Î2¤Ä¤Î·Á¼°¤Î¤¤¤º¤ì¤«¤ÇÀßÄê¤Ç¤­¤Þ¤¹¡£
++.RS 3
++.TP 3
++1.
++([+\-]\f2nnn\fP[ymdHMS])+
++.TP 3
++2.
++[yyyy/mm/dd] [HH:MM:SS]
++.RE
++.LP
++ºÇ½é¤Î·Á¼°¤Ç¤Ï¡¢È¯¹Ô»þ¹ï¤Ï¡¢»ØÄꤵ¤ì¤ëÃͤÎʬ¡¢¸½ºß¤Î»þ¹ï¤«¤é°Ü¤ê¤Þ¤¹¡£»ØÄꤵ¤ì¤ëÃͤϡ¢°ìÏ¢¤Î²¼°Ì¤ÎÃͤòÏ¢·ë¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£²¼°Ì¤Î³ÆÃͤǡ¢¥×¥é¥¹µ­¹æ(¡Ö+¡×)¤Ï»þ´Ö¤¬¿Ê¤à¤³¤È¤ò¡¢¥Þ¥¤¥Ê¥¹µ­¹æ(¡Ö\-¡×)¤Ï»þ´Ö¤¬Ìá¤ë¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£°Ü¤ë»þ´Ö¤Ï\f2nnn\fP¤Ç¡¢Ã±°Ì¤Ïǯ¡¢·î¡¢Æü¡¢»þ´Ö¡¢Ê¬¤Þ¤¿¤ÏÉäǤ¹(¤½¤ì¤¾¤ì¡¢1ʸ»ú¤Î¡Öy¡×¡¢¡Öm¡×¡¢¡Öd¡×¡¢¡ÖH¡×¡¢¡ÖM¡×¤Þ¤¿¤Ï¡ÖS¡×¤Ç¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹)¡£²¼°Ì¤Î³ÆÃͤÇ\f2java.util.GregorianCalendar.add(int field,int amount)\fP¥á¥½¥Ã¥É¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢È¯¹Ô»þ¹ï¤ÎÄɲäÎÃͤ¬º¸¤«¤é±¦¤Ø·×»»¤µ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2¡Ö\-startdate \-1y+1m\-1d¡×\fP¤È»ØÄꤹ¤ë¤È¡¢³«»Ï»þ¹ï¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ Calendar c = new GregorianCalendar();
++.fl
++ c.add(Calendar.YEAR, \-1);
++.fl
++ c.add(Calendar.MONTH, 1);
++.fl
++ c.add(Calendar.DATE, \-1);
++.fl
++ return c.getTime()
++.fl
++\fP
++.fi
++.LP
++2ÈÖÌܤηÁ¼°¤Ç¤Ï¡¢¥æ¡¼¥¶¡¼¤Ï¡¢Ç¯/·î/Æü¤È»þ´Ö:ʬ:ÉäÎ2¤Ä¤ÎÉôʬ¤Ç¸·Ì©¤Ê³«»Ï»þ¹ï¤òÀßÄꤷ¤Þ¤¹(Ãϸµ¤Î»þ´ÖÂÓ¤ò»ÈÍÑ)¡£¥æ¡¼¥¶¡¼¤Ï¡¢1¤Ä¤ÎÉôʬ¤Î¤ß¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ï¡¢¤â¤¦1¤Ä¤ÎÉôʬ¤Ï¸½ºß¤ÎÆüÉÕ(¤Þ¤¿¤Ï»þ¹ï)¤ÈƱ¤¸¤Ë¤Ê¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¥æ¡¼¥¶¡¼¤Ï¡¢·Á¼°¤ÎÄêµÁ¤Ë¼¨¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢·å¿ô¤ò¸·Ì©¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹(û¤¤¾ì¹ç¤Ï0¤ÇËä¤á¤Þ¤¹)¡£ÆüÉդȻþ¹ï¤ÎξÊý¤¬»ØÄꤵ¤ì¤¿¾õÂ֤ǡ¢2¤Ä¤ÎÉôʬ¤Î´Ö¤Ë¶õÇòʸ»ú¤¬1¤Ä(1¤Ä¤Î¤ß)¤¢¤ê¤Þ¤¹¡£»þ´Ö¤Ï¾ï¤Ë24»þ´Ö·Á¼°¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤È¡¢³«»ÏÆüÉդϸ½ºß¤Î»þ¹ï¤Ë¤Ê¤ê¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤Ï¡¢ºÇÂç¤Ç1²ó»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++\f2valDays\fP¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤ÎÍ­¸úÆü¿ô¤ò»ØÄꤷ¤Þ¤¹(\f2\-startdate\fP¤Ç»ØÄꤵ¤ì¤¿ÆüÉÕ¡¢¤Þ¤¿¤Ï\f2\-startdate\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¸½ºß¤ÎÆüÉÕ¤«¤é»Ï¤Þ¤ê¤Þ¤¹)¡£
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï\f2\-genkey\fP¤È¤¤¤¦Ì¾Á°¤Ç¤·¤¿¡£¤³¤Î¸Å¤¤Ì¾Á°¤Ï¡¢¤³¤Î¥ê¥ê¡¼¥¹¤Ç¤â°ú³¤­¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤ª¤ê¡¢º£¸å¤Î¥ê¥ê¡¼¥¹¤Ç¤â¥µ¥Ý¡¼¥È¤µ¤ì¤ëͽÄê¤Ç¤¹¡£¤¿¤À¤·¡¢º£¸å¤Ï¤ï¤«¤ê¤ä¤¹¤¤¤è¤¦¤Ë¡¢¿·¤·¤¤Ì¾Á°\f2\-genkeypair\fP¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.TP 3
++\-genseckey {\-aliasalias} {\-keyalgkeyalg} {\-keysizekeysize} [\-keypasskeypass] {\-storetypestoretype} {\-keystorekeystore} [\-storepassstorepass] {\-providerClassprovider_class_name {\-providerArgprovider_arg}} {\-v} {\-protected} {\-Jjavaoption}
++.LP
++ÈëÌ©¸°¤òÀ¸À®¤·¡¢¤½¤ì¤ò¿·¤·¤¤\f2KeyStore.SecretKeyEntry\fP(\f2alias\fP¤ÇÆÃÄꤵ¤ì¤ë)Æâ¤Ë³ÊǼ¤·¤Þ¤¹¡£
++.LP
++\f2keyalg\fP¤ÏÈëÌ©¸°¤ÎÀ¸À®¤Ë»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤ò¡¢\f2keysize\fP¤ÏÀ¸À®¤¹¤ë¸°¤Î¥µ¥¤¥º¤ò¡¢¤½¤ì¤¾¤ì»ØÄꤷ¤Þ¤¹¡£\f2keypass\fP¤ÏÈëÌ©¸°¤ÎÊݸî¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤Ç¤¹¡£¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£¤³¤Î¤È¤­¡¢[Return]¥­¡¼¤ò²¡¤¹¤È¡¢¥­¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ÈƱ¤¸¥Ñ¥¹¥ï¡¼¥É¤¬¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f2keypass\fP¤Ï¡¢6ʸ»ú°Ê¾å¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.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}
++.LP
++¥Õ¥¡¥¤¥ë\f2cert_file\fP¤«¤é¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó(¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Î¾ì¹ç¤Ï¡¢PKCS#7·Á¼°¤Î±þÅú¤Þ¤¿¤Ï°ìÏ¢¤ÎX.509¾ÚÌÀ½ñ¤ÇÄ󶡤µ¤ì¤ë¤â¤Î)¤òÆɤ߹þ¤ß¡¢\f2alias\fP¤Ë¤è¤Ã¤ÆÆÃÄꤵ¤ì¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤Ë³ÊǼ¤·¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢É¸½àÆþÎϤ«¤é¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤òÆɤ߹þ¤ß¤Þ¤¹¡£
++.LP
++\f3keytool\fP¤Ç¤Ï¡¢X.509 v1¡¢v2¡¢v3¤Î¾ÚÌÀ½ñ¡¢¤ª¤è¤ÓPKCS#7·Á¼°¤Î¾ÚÌÀ½ñ¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤ëPKCS#7·Á¼°¤Î¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤Þ¤¹¡£¥¤¥ó¥Ý¡¼¥È¤¹¤ë¥Ç¡¼¥¿¤Ï¡¢¥Ð¥¤¥Ê¥êÉä¹æ²½Êý¼°¡¢¤Þ¤¿¤Ï½ÐÎϲÄǽÉä¹æ²½Êý¼°(Base64Éä¹æ²½¤È¤â¸Æ¤Ð¤ì¤ë)¤Î¤É¤Á¤é¤«¤ÇÄ󶡤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£½ÐÎϲÄǽÉä¹æ²½Êý¼°¤Ï¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈRFC 1421¾ÚÌÀ½ñÉä¹æ²½µ¬³Ê¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ÎÉä¹æ²½Êý¼°¤Î¾ì¹ç¡¢¾ÚÌÀ½ñ¤Ï¡Ö\-\-\-\-\-BEGIN¡×¤Ç»Ï¤Þ¤ëʸ»úÎó¤Ç³«»Ï¤µ¤ì¡¢¡Ö\-\-\-\-\-END¡×¤Ç»Ï¤Þ¤ëʸ»úÎó¤Ç½ªÎ»¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++¾ÚÌÀ½ñ¤Î¥¤¥ó¥Ý¡¼¥È¤Ë¤Ï¡¢¼¡¤Î2¤Ä¤ÎÌÜŪ¤¬¤¢¤ê¤Þ¤¹¡£
++.RS 3
++.TP 3
++1.
++¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¾ÚÌÀ½ñ¤òÄɲä·¤Þ¤¹¡£
++.TP 3
++2.
++CA¤Ë¾ÚÌÀ½ñ½ð̾¥ê¥¯¥¨¥¹¥È(\-certreq¥³¥Þ¥ó¥É¤ò»²¾È)¤òÁ÷¿®¤·¤¿·ë²Ì¤È¤·¤Æ¡¢CA¤«¤é¼õ¤±¼è¤Ã¤¿¾ÚÌÀ±þÅú¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¡£
++.RE
++.LP
++¤É¤Á¤é¤Î¥¿¥¤¥×¤Î¥¤¥ó¥Ý¡¼¥È¤ò¹Ô¤¦¤«¤Ï¡¢\f2\-alias\fP¥ª¥×¥·¥ç¥ó¤ÎÃͤˤè¤Ã¤Æ»ØÄꤷ¤Þ¤¹¡£
++.RS 3
++.TP 3
++1.
++\f3ÊÌ̾¤¬¥­¡¼¡¦¥¨¥ó¥È¥ê¤ò¥Ý¥¤¥ó¥È¤·¤Ê¤¤¾ì¹ç\fP¡¢\f3keytool\fP¤Ï¥æ¡¼¥¶¡¼¤¬¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¥¨¥ó¥È¥ê¤òÄɲ䷤褦¤È¤·¤Æ¤¤¤ë¤â¤Î¤È¸«¤Ê¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢ÊÌ̾¤¬¥­¡¼¥¹¥È¥¢Æâ¤Ë¸ºß¤·¤Æ¤¤¤Ê¤¤¤³¤È¤¬É¬ÍפǤ¹¡£ÊÌ̾¤¬¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤ë¾ì¹ç¡¢¤½¤ÎÊÌ̾¤Î¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤¬¤¹¤Ç¤Ë¸ºß¤¹¤ë¤³¤È¤Ë¤Ê¤ë¤Î¤Ç¡¢\f3keytool\fP¤Ï¥¨¥é¡¼¤ò½ÐÎϤ·¡¢¾ÚÌÀ½ñ¤Î¥¤¥ó¥Ý¡¼¥È¤ò¹Ô¤¤¤Þ¤»¤ó¡£
++.TP 3
++2.
++\f3ÊÌ̾¤¬¥­¡¼¡¦¥¨¥ó¥È¥ê¤ò¥Ý¥¤¥ó¥È¤¹¤ë¾ì¹ç\fP¡¢\f3keytool\fP¤Ï¥æ¡¼¥¶¡¼¤¬¾ÚÌÀ½ñ±þÅú¤ò¥¤¥ó¥Ý¡¼¥È¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤â¤Î¤È¸«¤Ê¤·¤Þ¤¹¡£
++.RE
++\f3¿·¤·¤¤¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤Î¥¤¥ó¥Ý¡¼¥È\fP
++.LP
++\f3keytool\fP¤Ï¡¢¥­¡¼¥¹¥È¥¢¤Ë¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë¡¢¥­¡¼¥¹¥È¥¢Æâ¤Ë¤¹¤Ç¤Ë¸ºß¤¹¤ë¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤ò»ÈÍѤ·¤Æ¡¢¥¤¥ó¥Ý¡¼¥È¤¹¤ë¾ÚÌÀ½ñ¤«¤é(¥ë¡¼¥ÈCA¤Î)¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Ë»ê¤ë¤Þ¤Ç¤Î¿®Íê¤Î¥Á¥§¡¼¥ó¤Î¹½ÃÛ¤ò»î¤ß¤Þ¤¹¡£
++.LP
++\f2\-trustcacerts\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢ÄɲäξÚÌÀ½ñ¤Ï¿®Íê¤Ç¤­¤ë¤¹¤Ê¤ï¤Ácacerts¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ë¾ÚÌÀ½ñ¤Î¥Á¥§¡¼¥ó¤È¸«¤Ê¤µ¤ì¤Þ¤¹¡£
++.LP
++\f3keytool\fP¤¬¡¢¥¤¥ó¥Ý¡¼¥È¤¹¤ë¾ÚÌÀ½ñ¤«¤é¼«¸Ê½ð̾¾ÚÌÀ½ñ(¥­¡¼¥¹¥È¥¢¤Þ¤¿¤Ïcacerts¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¼«¸Ê½ð̾¾ÚÌÀ½ñ)¤Ë»ê¤ë¤Þ¤Ç¤Î¿®Íê¤Î¥Ñ¥¹¤Î¹½Ãۤ˼ºÇÔ¤·¤¿¾ì¹ç¤Ï¡¢¥¤¥ó¥Ý¡¼¥È¤¹¤ë¾ÚÌÀ½ñ¤Î¾ðÊó¤òɽ¼¨¤·¡¢¥æ¡¼¥¶¡¼¤Ë³Îǧ¤òµá¤á¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï¡¢É½¼¨¤µ¤ì¤¿¾ÚÌÀ½ñ¤Î¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¡¢Â¾¤Î¤Ê¤ó¤é¤«¤Î(¿®Íê¤Ç¤­¤ë)¾ðÊó¸»(¾ÚÌÀ½ñ¤Î½êÍ­¼ÔËܿͤʤÉ)¤«¤éÆþ¼ê¤·¤¿¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¤òÈæ³Ó¤·¤Þ¤¹¡£¡Ö¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¡×¤È¤·¤Æ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤È¤­¤Ï¡¢¾ÚÌÀ½ñ¤¬Í­¸ú¤Ç¤¢¤ë¤³¤È¤ò¿µ½Å¤Ë³Îǧ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤Î¥¤¥ó¥Ý¡¼¥È¤Ë´Ø¤¹¤ëÃí°Õ»ö¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¥¤¥ó¥Ý¡¼¥ÈÁàºî¤Ï¡¢¾ÚÌÀ½ñ¤ò³Îǧ¤¹¤ë»þÅÀ¤ÇÃæ»ß¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢\f2\-noprompt\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤È¤ÎÂÐÏäϹԤï¤ì¤Þ¤»¤ó¡£
++\f3¾ÚÌÀ½ñ±þÅú¤Î¥¤¥ó¥Ý¡¼¥È\fP
++.LP
++¡Ö¾ÚÌÀ±þÅú¡×¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤È¤­¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¡¢¤ª¤è¤Ó(\f2\-trustcacerts\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï)cacerts¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë¤Ç¹½À®¤µ¤ì¤¿¾ÚÌÀ½ñ¤ò»ÈÍѤ·¤Æ¾ÚÌÀ±þÅú¤¬¸¡ºº¤µ¤ì¤Þ¤¹¡£
++.LP
++¾ÚÌÀ½ñ±þÅú¤¬¿®Íê¤Ç¤­¤ë¤«¤É¤¦¤«¤ò·èÄꤹ¤ëÊýË¡¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.RS 3
++.TP 2
++o
++\f3¾ÚÌÀ±þÅú¤¬Ã±°ì¤ÎX.509¾ÚÌÀ½ñ¤Ç¤¢¤ë¾ì¹ç\fP¡¢\f3keytool\fP¤Ï¡¢¾ÚÌÀ±þÅú¤«¤é(¥ë¡¼¥ÈCA¤Î)¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Ë»ê¤ë¤Þ¤Ç¤Î¿®Íê¥Á¥§¡¼¥ó¤Î³ÎΩ¤ò»î¤ß¤Þ¤¹¡£¾ÚÌÀ±þÅú¤È¡¢¾ÚÌÀ±þÅú¤Îǧ¾Ú¤Ë»ÈÍѤµ¤ì¤ë¾ÚÌÀ½ñ¤Î³¬Áع½Â¤¤Ï¡¢\f2alias\fP¤Î¿·¤·¤¤¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò·ÁÀ®¤·¤Þ¤¹¡£¿®Íê¥Á¥§¡¼¥ó¤¬³ÎΩ¤µ¤ì¤Ê¤¤¾ì¹ç¡¢¾ÚÌÀ±þÅú¤Ï¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó¡£¤³¤Î¾ì¹ç¡¢\f3keytool\fP¤Ï¾ÚÌÀ½ñ¤ò½ÐÎϤ»¤º¡¢¥æ¡¼¥¶¡¼¤Ë¸¡¾Ú¤òµá¤á¤ë¥×¥í¥ó¥×¥È¤òɽ¼¨¤·¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤¬¾ÚÌÀ±þÅú¤Î¿®ÍêÀ­¤òȽÃǤ¹¤ë¤Î¤Ï¡¢ÉÔ²Äǽ¤Ç¤Ï¤Ê¤¯¤Æ¤âÈó¾ï¤Ëº¤Æñ¤À¤«¤é¤Ç¤¹¡£
++.TP 2
++o
++\f3¾ÚÌÀ±þÅú¤¬PKCS#7·Á¼°¤Î¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Þ¤¿¤Ï°ìÏ¢¤ÎX.509¾ÚÌÀ½ñ¤Ç¤¢¤ë¾ì¹ç\fP¡¢¥Á¥§¡¼¥ó¤Ï¡¢¥æ¡¼¥¶¡¼¤Î¾ÚÌÀ½ñ¤¬ºÇ½é¤Ë¡¢0°Ê¾å¤ÎCA¾ÚÌÀ½ñ¤¬¤½¤Î¼¡¤Ë¤¯¤ë¤è¤¦¤Ëʤ٤é¤ì¤Þ¤¹¡£¥Á¥§¡¼¥ó¤¬¼«¸Ê½ð̾¤Î¥ë¡¼¥ÈCA¾ÚÌÀ½ñ¤Ç½ª¤ï¤ê¡¢\f2\-trustcacerts\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f3keytool\fP¤Ï¡¢¤½¤Î¾ÚÌÀ½ñ¤È¡¢¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¡Öcacerts¡×¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¿®Íê¤Ç¤­¤ë¤¹¤Ù¤Æ¤Î¾ÚÌÀ½ñ¤ò¾È¹ç¤·¤è¤¦¤È¤·¤Þ¤¹¡£¥Á¥§¡¼¥ó¤¬¼«¸Ê½ð̾¤Î¥ë¡¼¥ÈCA¾ÚÌÀ½ñ¤Ç½ª¤ï¤Ã¤Æ¤ª¤é¤º¡¢\f2\-trustcacerts\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢\f3keytool\fP¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ï¡Öcacerts¡×¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤«¤é¼«¸Ê½ð̾¤Î¥ë¡¼¥ÈCA¾ÚÌÀ½ñ¤ò¸«¤Ä¤±¤Æ¤½¤ì¤ò¥Á¥§¡¼¥ó¤ÎËöÈø¤ËÄɲ䷤褦¤È¤·¤Þ¤¹¡£¤½¤Î¾ÚÌÀ½ñ¤¬¸«¤Ä¤«¤é¤º¡¢\f2\-noprompt\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥Á¥§¡¼¥óÆâ¤ÎºÇ¸å¤Î¾ÚÌÀ½ñ¤Î¾ðÊ󤬽ÐÎϤµ¤ì¡¢¥æ¡¼¥¶¡¼¤Ï³Îǧ¤òµá¤á¤é¤ì¤Þ¤¹¡£
++.RE
++.LP
++¾ÚÌÀ½ñ±þÅúÆâ¤Î¸ø³«¸°¤¬\f2alias\fP¤Î²¼¤Ë¤¹¤Ç¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë¥æ¡¼¥¶¡¼¤Î¸ø³«¸°¤Ë°ìÃפ·¤¿¾ì¹ç¡¢¸Å¤¤¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤¬±þÅúÆâ¤Î¿·¤·¤¤¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹¡£°ÊÁ°¤Î¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò¿·¤·¤¤¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ÇÃÖ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ï¡¢Í­¸ú¤Ê\f2keypass\fP¡¢¤Ä¤Þ¤ê³ºÅö¤¹¤ë¥¨¥ó¥È¥ê¤ÎÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤¿¾ì¹ç¤Î¤ß¤Ç¤¹¡£¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Æ¤ª¤é¤º¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤¬¥­¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤È°Û¤Ê¤ë¾ì¹ç¤Ï¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï\f2\-import\fP¤È¤¤¤¦Ì¾Á°¤Ç¤·¤¿¡£¤³¤Î¸Å¤¤Ì¾Á°¤Ï¡¢¤³¤Î¥ê¥ê¡¼¥¹¤Ç¤â°ú³¤­¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤ª¤ê¡¢º£¸å¤Î¥ê¥ê¡¼¥¹¤Ç¤â¥µ¥Ý¡¼¥È¤µ¤ì¤ëͽÄê¤Ç¤¹¡£¤¿¤À¤·¡¢º£¸å¤Ï¤ï¤«¤ê¤ä¤¹¤¤¤è¤¦¤Ë¡¢¿·¤·¤¤Ì¾Á°\f2\-importcert\fP¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.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}
++.LP
++¥½¡¼¥¹¡¦¥­¡¼¥¹¥È¥¢¤«¤é¥¿¡¼¥²¥Ã¥È¡¦¥­¡¼¥¹¥È¥¢¤Ø¡¢Ã±°ì¤Î¥¨¥ó¥È¥ê¤Þ¤¿¤Ï¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¡£
++.LP
++\f2srcalias\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¤½¤ÎÊÌ̾¤ÇÆÃÄꤵ¤ì¤ëñ°ì¤Î¥¨¥ó¥È¥ê¤ò¥¿¡¼¥²¥Ã¥È¡¦¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¡£\f2destalias\fP·Ðͳ¤Ç¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\f2srcalias\fP¤¬¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤È¤·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£¥½¡¼¥¹¤Î¥¨¥ó¥È¥ê¤¬¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢\f2srckeypass\fP¤ò»ÈÍѤ·¤Æ¤½¤Î¥¨¥ó¥È¥ê¤¬²óÉü¤µ¤ì¤Þ¤¹¡£\f2srckeypass\fP¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\f3keytool\fP¤Ï\f2srcstorepass\fP¤ò»ÈÍѤ·¤Æ¤½¤Î¥¨¥ó¥È¥ê¤ò²óÉü¤·¤è¤¦¤È¤·¤Þ¤¹¡£\f2srcstorepass\fP¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¤«Àµ¤·¤¯¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£¥¿¡¼¥²¥Ã¥È¡¦¥¨¥ó¥È¥ê¤Ï\f2destkeypass\fP¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Þ¤¹¡£\f2destkeypass\fP¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¥¿¡¼¥²¥Ã¥È¡¦¥¨¥ó¥È¥ê¤Ï¥½¡¼¥¹¡¦¥¨¥ó¥È¥ê¤Î¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Þ¤¹¡£
++.LP
++\f2srcalias\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¥½¡¼¥¹¡¦¥­¡¼¥¹¥È¥¢Æâ¤Î¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê¤¬¥¿¡¼¥²¥Ã¥È¡¦¥­¡¼¥¹¥È¥¢Æâ¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤Þ¤¹¡£³Æ¥¿¡¼¥²¥Ã¥È¡¦¥¨¥ó¥È¥ê¤ÏÂбþ¤¹¤ë¥½¡¼¥¹¡¦¥¨¥ó¥È¥ê¤ÎÊÌ̾¤Î²¼¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£¥½¡¼¥¹¤Î¥¨¥ó¥È¥ê¤¬¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢\f2srcstorepass\fP¤ò»ÈÍѤ·¤Æ¤½¤Î¥¨¥ó¥È¥ê¤¬²óÉü¤µ¤ì¤Þ¤¹¡£\f2srcstorepass\fP¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¤«Àµ¤·¤¯¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£¥½¡¼¥¹¡¦¥­¡¼¥¹¥È¥¢Æâ¤Î¤¢¤ë¥¨¥ó¥È¥ê¡¦¥¿¥¤¥×¤¬¥¿¡¼¥²¥Ã¥È¡¦¥­¡¼¥¹¥È¥¢¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤ä¡¢¤¢¤ë¥¨¥ó¥È¥ê¤ò¥¿¡¼¥²¥Ã¥È¡¦¥­¡¼¥¹¥È¥¢¤Ë³ÊǼ¤¹¤ëºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤Ï¤½¤Î¥¨¥ó¥È¥ê¤ò¥¹¥­¥Ã¥×¤·¤Æ½èÍý¤ò³¹Ô¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï½èÍý¤òÃæÃǤ¹¤ë¤«¤ÎÁªÂò¤òµá¤á¤é¤ì¤Þ¤¹¡£¥¿¡¼¥²¥Ã¥È¡¦¥¨¥ó¥È¥ê¤Ï¥½¡¼¥¹¡¦¥¨¥ó¥È¥ê¤Î¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Þ¤¹¡£
++.LP
++¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤¬¥¿¡¼¥²¥Ã¥È¡¦¥­¡¼¥¹¥È¥¢Æâ¤Ë¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤¿¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤Ï¡¢¤½¤Î¥¨¥ó¥È¥ê¤ò¾å½ñ¤­¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï°Û¤Ê¤ëÊÌ̾¤Î²¼¤Ç¿·¤·¤¤¥¨¥ó¥È¥ê¤òºîÀ®¤¹¤ë¤«¤ÎÁªÂò¤òµá¤á¤é¤ì¤Þ¤¹¡£
++.LP
++\f2\-noprompt\fP¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤Ï¿·¤·¤¤¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤»¤ó¡£´û¸¤Î¥¨¥ó¥È¥ê¤Ï¤½¤Î¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤Ç¼«Æ°Åª¤Ë¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£ºÇ¸å¤Ë¡¢¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤Ê¤¤¥¨¥ó¥È¥ê¤Ï¼«Æ°Åª¤Ë¥¹¥­¥Ã¥×¤µ¤ì¡¢·Ù¹ð¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.TP 3
++\-printcertreq {\-file file}
++.LP
++PKCS#10·Á¼°¤Î¾ÚÌÀ½ñ¥ê¥¯¥¨¥¹¥È¤ÎÆâÍƤò½ÐÎϤ·¤Þ¤¹¡£¤³¤Î¥ê¥¯¥¨¥¹¥È¤Ï¡¢keytool \-certreq¥³¥Þ¥ó¥É¤ÇÀ¸À®¤Ç¤­¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢file¤«¤é¥ê¥¯¥¨¥¹¥È¤òÆɤ߹þ¤ß¤Þ¤¹¡£file¤¬¾Êά¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢É¸½àÆþÎϤ«¤éÆɤ߹þ¤ß¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++¥Ç¡¼¥¿¤Î¥¨¥¯¥¹¥Ý¡¼¥È
++.LP
++.RS 3
++.TP 3
++\-certreq {\-alias alias} {\-dname dname} {\-sigalg sigalg} {\-file certreq_file} [\-keypass keypass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
++.LP
++PKCS#10·Á¼°¤ò»ÈÍѤ·¤Æ¾ÚÌÀ½ñ½ð̾¥ê¥¯¥¨¥¹¥È(CSR)¤òÀ¸À®¤·¤Þ¤¹¡£
++.LP
++CSR¤Ï¡¢¾ÚÌÀ½ñȯ¹Ô¶É(CA)¤ËÁ÷¿®¤¹¤ë¤³¤È¤òÌÜŪ¤È¤·¤¿¤â¤Î¤Ç¤¹¡£CA¤Ï¡¢¾ÚÌÀ½ñÍ×µá¼Ô¤ò(Ä̾ï¤Ï¥ª¥Õ¥é¥¤¥ó¤Ç)ǧ¾Ú¤·¡¢¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤òÁ÷¤êÊÖ¤·¤Þ¤¹¡£¤³¤Î¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î´û¸¤Î¾ÚÌÀ½ñ¥Á¥§¡¼¥ó(ºÇ½é¤Ï1¤Ä¤Î¼«¸Ê½ð̾¾ÚÌÀ½ñ¤«¤é¹½À®¤µ¤ì¤ë)¤ËÃÖ¤­´¹¤¨¤Æ»ÈÍѤ·¤Þ¤¹¡£
++.LP
++\f2alias\fP¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿ÈëÌ©¸°¤Ï¡¢PKCS#10¾ÚÌÀ½ñ¥ê¥¯¥¨¥¹¥È¤òºîÀ®¤¹¤ë¤Î¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£ÈëÌ©¸°¤Ï¥­¡¼¥¹¥È¥¢Æâ¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢ÈëÌ©¸°¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¡¢Å¬Àڤʥѥ¹¥ï¡¼¥É¤òÄ󶡤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2keypass\fP¤ò»ØÄꤷ¤Æ¤ª¤é¤º¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤¬¥­¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤È°Û¤Ê¤ë¾ì¹ç¤Ï¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£dname¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤ì¤¬CSR¤Ç¼çÂΤȤ·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢ÊÌ̾¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿X.500¼±ÊÌ̾¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
++.LP
++\f2sigalg\fP¤Ë¤Ï¡¢CSR¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++CSR¤Ï¡¢¥Õ¥¡¥¤¥ë\f2certreq_file\fP¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢É¸½à½ÐÎϤËCSR¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.LP
++CA¤«¤é¤Î¥ì¥¹¥Ý¥ó¥¹¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤Ë¤Ï¡¢\f2importcert\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
++.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}
++.LP
++\f2alias\fP¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¾ÚÌÀ½ñ¤ò(¥­¡¼¥¹¥È¥¢¤«¤é)Æɤ߹þ¤ß¡¢¥Õ¥¡¥¤¥ë\f2cert_file\fP¤Ë³ÊǼ¤·¤Þ¤¹¡£
++.LP
++¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢É¸½à½ÐÎϤ˾ÚÌÀ½ñ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥Ð¥¤¥Ê¥êÉä¹æ²½Êý¼°¤Î¾ÚÌÀ½ñ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢\f2\-rfc\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢½ÐÎϲÄǽÉä¹æ²½Êý¼°¤Î¾ÚÌÀ½ñ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£½ÐÎϲÄǽÉä¹æ²½Êý¼°¤Ï¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈRFC 1421¾ÚÌÀ½ñÉä¹æ²½µ¬³Ê¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++\f2alias\fP¤¬¡¢¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤ò»²¾È¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ë¾ÚÌÀ½ñ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢\f2alias\fP¤Ï¡¢´ØÏ¢ÉÕ¤±¤é¤ì¤¿¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò»ý¤Ä¸°¥¨¥ó¥È¥ê¤ò»²¾È¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï¡¢¥Á¥§¡¼¥óÆâ¤ÎºÇ½é¤Î¾ÚÌÀ½ñ¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£¤³¤Î¾ÚÌÀ½ñ¤Ï¡¢\f2alias\fP¤Ë¤è¤Ã¤Æɽ¤µ¤ì¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ¤Ç¤¹¡£
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï\f2\-export\fP¤È¤¤¤¦Ì¾Á°¤Ç¤·¤¿¡£¤³¤Î¸Å¤¤Ì¾Á°¤Ï¡¢¤³¤Î¥ê¥ê¡¼¥¹¤Ç¤â°ú³¤­¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤ª¤ê¡¢º£¸å¤Î¥ê¥ê¡¼¥¹¤Ç¤â¥µ¥Ý¡¼¥È¤µ¤ì¤ëͽÄê¤Ç¤¹¡£¤¿¤À¤·¡¢º£¸å¤Ï¤ï¤«¤ê¤ä¤¹¤¤¤è¤¦¤Ë¡¢¿·¤·¤¤Ì¾Á°\f2\-exportcert\fP¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++¥Ç¡¼¥¿¤Îɽ¼¨
++.LP
++.RS 3
++.TP 3
++\-list {\-alias alias} {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v | \-rfc} {\-protected} {\-Jjavaoption}
++.LP
++\f2alias\fP¤ÇÆÃÄꤵ¤ì¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ÎÆâÍƤò(ɸ½à½ÐÎϤË)½ÐÎϤ·¤Þ¤¹¡£ÊÌ̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥­¡¼¥¹¥È¥¢Á´ÂΤÎÆâÍƤ¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¾ÚÌÀ½ñ¤ÎSHA1¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤òɽ¼¨¤·¤Þ¤¹¡£\f2\-v\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢½êÍ­¼Ô¡¢È¯¹Ô¼Ô¡¢¥·¥ê¥¢¥ëÈֹ桢³ÈÄ¥µ¡Ç½¤Ê¤É¤ÎÉÕ²ÃŪ¤Ê¾ðÊó¤È¤È¤â¤Ë¡¢¿Í´Ö¤¬Æɤळ¤È¤Î¤Ç¤­¤ë·Á¼°¤Ç¾ÚÌÀ½ñ¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\f2\-rfc\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢½ÐÎϲÄǽÉä¹æ²½Êý¼°¤Ç¾ÚÌÀ½ñ¤ÎÆâÍƤ¬É½¼¨¤µ¤ì¤Þ¤¹¡£½ÐÎϲÄǽÉä¹æ²½Êý¼°¤Ï¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈRFC 1421¾ÚÌÀ½ñÉä¹æ²½µ¬³Ê¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++\f2\-v\fP¥ª¥×¥·¥ç¥ó¤È\f2\-rfc\fP¥ª¥×¥·¥ç¥ó¤òƱ»þ¤Ë»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
++.TP 3
++\-printcert {\-file cert_file | \-sslserver host[:port]} {\-jarfile JAR_file {\-rfc} {\-v} {\-Jjavaoption}
++.LP
++¥Õ¥¡¥¤¥ë\f2cert_file\fP¡¢\f2host:port\fP¤Ë¤¢¤ëSSL¥µ¡¼¥Ð¡¼¡¢¤Þ¤¿¤Ï½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë\f2JAR_file\fP(\f2\-jarfile\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄê)¤«¤é¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¡¢¿Í´Ö¤¬Æɤळ¤È¤Î¤Ç¤­¤ë·Á¼°¤Ç¾ÚÌÀ½ñ¤ÎÆâÍƤòɽ¼¨¤·¤Þ¤¹¡£¥Ý¡¼¥È¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢É¸½à¤ÎHTTPS¥Ý¡¼¥È443¤¬ÁÛÄꤵ¤ì¤Þ¤¹¡£\f2\-sslserver\fP¤ª¤è¤Ó\f2\-file\fP¥ª¥×¥·¥ç¥ó¤òƱ»þ¤Ë»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£Æ±»þ¤Ë»ØÄꤹ¤ë¤È¡¢¥¨¥é¡¼¤¬Êó¹ð¤µ¤ì¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢É¸½àÆþÎϤ«¤é¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤¹¡£
++.LP
++\f2\-rfc\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢keytool¤Ï¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈRFC 1421ɸ½à¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢PEM¥â¡¼¥É¤Ç¾ÚÌÀ½ñ¤ò½ÐÎϤ·¤Þ¤¹¡£
++.LP
++¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤ«¤é¾ÚÌÀ½ñ¤òÆɤ߹þ¤à¾ì¹ç¡¢¤½¤Î¾ÚÌÀ½ñ¤Ï¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈRFC 1421ɸ½à¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢¥Ð¥¤¥Ê¥êÉä¹æ²½Êý¼°¤Þ¤¿¤Ï½ÐÎϲÄǽÉä¹æ²½Êý¼°¤Çɽ¼¨¤Ç¤­¤Þ¤¹¡£
++.LP
++SSL¥µ¡¼¥Ð¡¼¤¬¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ÎÇظå¤Ë¤¢¤ë¾ì¹ç¤Ï¡¢\f2\-J\-Dhttps.proxyHost=proxyhost\fP¤È\f2\-J\-Dhttps.proxyPort=proxyport\fP¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Æ¡¢¥×¥í¥­¥·¡¦¥È¥ó¥Í¥ê¥ó¥°¤ò»ÈÍѤǤ­¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2JSSE¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥¬¥¤¥É\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++\f3Ãí°Õ\fP: ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥­¡¼¥¹¥È¥¢¤È¤Ï´Ø·¸¤Ê¤¯»ÈÍѤǤ­¤Þ¤¹¡£
++.TP 3
++\-printcrl \-file crl_ {\-v}
++.LP
++¥Õ¥¡¥¤¥ë\f2crl_file\fP¤«¤é¾ÚÌÀ½ñ¤Î¼è¾Ã¤·¥ê¥¹¥È(CRL)¤òÆɤ߹þ¤ß¤Þ¤¹¡£
++.LP
++¾ÚÌÀ½ñ¤Î¼è¾Ã¤·¥ê¥¹¥È(CRL)¤Ï¡¢¥Ç¥¸¥¿¥ë¾ÚÌÀ½ñ¤òȯ¹Ô¤·¤¿¾ÚÌÀ½ñȯ¹Ô¶É(CA)¤Ë¤è¤Ã¤Æ¼è¤ê¾Ã¤µ¤ì¤¿¥Ç¥¸¥¿¥ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ç¤¹¡£CA¤Ï¡¢\f2crl_file\fP¤òÀ¸À®¤·¤Þ¤¹¡£
++.LP
++\f3Ãí°Õ\fP: ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥­¡¼¥¹¥È¥¢¤È¤Ï´Ø·¸¤Ê¤¯»ÈÍѤǤ­¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++¥­¡¼¥¹¥È¥¢¤Î´ÉÍý
++.LP
++.RS 3
++.TP 3
++\-storepasswd [\-new new_storepass] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-Jjavaoption}
++.LP
++¥­¡¼¥¹¥È¥¢¤ÎÆâÍƤÎÀ°¹çÀ­¤òÊݸ¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤·¤Þ¤¹¡£\f2new_storepass\fP¤Ë¤Ï¡¢¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£new_storepass¤Ï¡¢6ʸ»ú°Ê¾å¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.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}
++.LP
++\f2alias\fP¤Ë¤è¤Ã¤ÆÆÃÄꤵ¤ì¤ëÈó¸ø³«/ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Î¥Ñ¥¹¥ï¡¼¥É¤ò¡¢\f2old_keypass\fP¤«¤é\f2new_keypass\fP¤ËÊѹ¹¤·¤Þ¤¹¡£new_keypass¤Ï¡¢6ʸ»ú°Ê¾å¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2\-keypass\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¤ª¤é¤º¡¢¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤¬¥­¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤È°Û¤Ê¤ë¾ì¹ç¤Ï¡¢¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.LP
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2\-new\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.TP 3
++\-delete [\-alias alias] {\-storetype storetype} {\-keystore keystore} [\-storepass storepass] {\-providerName provider_name} {\-providerClass provider_class_name {\-providerArg provider_arg}} {\-v} {\-protected} {\-Jjavaoption}
++.LP
++\f2alias\fP¤Ë¤è¤Ã¤ÆÆÃÄꤵ¤ì¤ë¥¨¥ó¥È¥ê¤ò¥­¡¼¥¹¥È¥¢¤«¤éºï½ü¤·¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÊÌ̾¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢ÊÌ̾¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.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}
++.LP
++»ØÄꤵ¤ì¤¿\f2alias\fP¤«¤é¿·¤·¤¤ÊÌ̾\f2destalias\fP¤Ø¡¢´û¸¤Î¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤ò°ÜÆ°¤·¤Þ¤¹¡£¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¤³¤Î¥³¥Þ¥ó¥É¤Ï¤½¤ÎÆþÎϤòµá¤á¤Þ¤¹¡£¸µ¤Î¥¨¥ó¥È¥ê¤¬¥¨¥ó¥È¥ê¡¦¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢¡Ö\-keypass¡×¥ª¥×¥·¥ç¥ó·Ðͳ¤Ç¤½¤Î¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¸°¥Ñ¥¹¥ï¡¼¥É¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\f2storepass\fP(»ØÄꤵ¤ì¤¿¾ì¹ç)¤¬¤Þ¤º»î¤ß¤é¤ì¤Þ¤¹¡£¤½¤Î»î¤ß¤¬¼ºÇÔ¤¹¤ë¤È¡¢¥æ¡¼¥¶¡¼¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++¥Ø¥ë¥×¤Îɽ¼¨
++.LP
++.RS 3
++.TP 3
++\-help
++.LP
++´ðËÜŪ¤Ê¥³¥Þ¥ó¥É¤È¤½¤Î¥ª¥×¥·¥ç¥ó¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£
++.LP
++ÆÃÄê¤Î¥³¥Þ¥ó¥É¤Î¾ÜºÙ¤ò»²¾È¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\f2command_name\fP¤Ï¥³¥Þ¥ó¥É¤Î̾Á°¤Ç¤¹¡£
++.nf
++\f3
++.fl
++ keytool \-\fP\f4command_name\fP\f3 \-help
++.fl
++\fP
++.fi
++.RE
++
++.LP
++.SH "Îã"
++.LP
++.LP
++¤³¤³¤Ç¤Ï¡¢¼«Ê¬¤Î¸°¤Î¥Ú¥¢¤ª¤è¤Ó¿®Íê¤Ç¤­¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤«¤é¤Î¾ÚÌÀ½ñ¤ò´ÉÍý¤¹¤ë¤¿¤á¤Î¥­¡¼¥¹¥È¥¢¤òºîÀ®¤¹¤ë¾ì¹ç¤òÎã¤È¤·¤Æ¼¨¤·¤Þ¤¹¡£
++.LP
++.SS
++¸°¤Î¥Ú¥¢¤ÎÀ¸À®
++.LP
++.LP
++¤Þ¤º¡¢¥­¡¼¥¹¥È¥¢¤òºîÀ®¤·¤Æ¸°¤Î¥Ú¥¢¤òÀ¸À®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤Ë¼¨¤¹¤Î¤Ï¡¢¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤ÎÎã¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ keytool \-genkeypair \-dname "cn=Mark Jones, ou=Java, o=Oracle, c=US"
++.fl
++ \-alias business \-keypass \fP\f4<new password for private key>\fP\f3 \-keystore /working/mykeystore
++.fl
++ \-storepass \fP\f4<new password for keystore>\fP\f3 \-validity 180
++.fl
++\fP
++.fi
++
++.LP
++.LP
++Ãí°Õ: ¤³¤Î¥³¥Þ¥ó¥É¤Ï1¹Ô¤ËÆþÎϤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Îã¤ÇÊ£¿ô¹Ô¤ËÆþÎϤ·¤Æ¤¤¤ë¤Î¤ÏÆɤߤ䤹¤¯¤¹¤ë¤¿¤á¤Ç¤¹¡£
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢working¥Ç¥£¥ì¥¯¥È¥ê¤Ëmykeystore¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢¤òºîÀ®¤·(¥­¡¼¥¹¥È¥¢¤Ï¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤¤¤È²¾Äê)¡¢ºîÀ®¤·¤¿¥­¡¼¥¹¥È¥¢¤Ë¡¢\f2<new password for keystore>\fP¤Ç»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥É¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£À¸À®¤¹¤ë¸ø³«¸°¤ÈÈëÌ©¸°¤Î¥Ú¥¢¤ËÂбþ¤¹¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤Î¡Ö¼±ÊÌ̾¡×¤Ï¡¢Ä̾Τ¬¡ÖMark Jones¡×¡¢ÁÈ¿¥Ã±°Ì¤¬¡ÖJava¡×¡¢ÁÈ¿¥¤¬¡ÖOracle¡×¡¢2ʸ»ú¤Î¹ñÈֹ椬¡ÖUS¡×¤Ç¤¹¡£¸ø³«¸°¤ÈÈëÌ©¸°¤Î¥µ¥¤¥º¤Ï¤É¤Á¤é¤â1024¥Ó¥Ã¥È¤Ç¡¢¸°¤ÎºîÀ®¤Ë¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎDSA¸°À¸À®¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¸ø³«¸°¤È¼±ÊÌ̾¾ðÊó¤ò´Þ¤à¼«¸Ê½ð̾¾ÚÌÀ½ñ(¥Ç¥Õ¥©¥ë¥È¤ÎSHA1withDSA½ð̾¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ)¤òºîÀ®¤·¤Þ¤¹¡£¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´Ö¤Ï180Æü¤Ç¤¹¡£¾ÚÌÀ½ñ¤Ï¡¢ÊÌ̾¡Öbusiness¡×¤ÇÆÃÄꤵ¤ì¤ë¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥êÆâ¤ÎÈëÌ©¸°¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Þ¤¹¡£ÈëÌ©¸°¤Ë¤Ï¡¢\f2<new password for private key>\fP¤Ç»ØÄꤷ¤¿¥Ñ¥¹¥ï¡¼¥É¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£
++.LP
++.LP
++¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢¾å¤Ë¼¨¤·¤¿¥³¥Þ¥ó¥É¤òÂçÉý¤Ëû¤¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¼ÂºÝ¤Ë¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò1¤Ä¤â»ØÄꤻ¤º¤Ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥ÈÃͤò»ý¤Ä¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¥Ç¥Õ¥©¥ë¥ÈÃͤ¬»ÈÍѤµ¤ì¡¢É¬ÍפÊÃͤˤĤ¤¤Æ¤ÏÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Ã±¤Ë¼¡¤Î¤è¤¦¤ËÆþÎϤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ keytool \-genkeypair
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤Î¾ì¹ç¤Ï¡¢mykey¤È¤¤¤¦ÊÌ̾¤Ç¥­¡¼¥¹¥È¥¢¡¦¥¨¥ó¥È¥ê¤¬ºîÀ®¤µ¤ì¡¢¿·¤·¤¯À¸À®¤µ¤ì¤¿¸°¤Î¥Ú¥¢¡¢¤ª¤è¤Ó90Æü´ÖÍ­¸ú¤Ê¾ÚÌÀ½ñ¤¬¤³¤Î¥¨¥ó¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£¤³¤Î¥¨¥ó¥È¥ê¤Ï¡¢¥Û¡¼¥à¡¦¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î .keystore¤È¤¤¤¦Ì¾Á°¤Î¥­¡¼¥¹¥È¥¢¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤³¤Î¥­¡¼¥¹¥È¥¢¤¬¤Þ¤À¸ºß¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢ºîÀ®¤µ¤ì¤Þ¤¹¡£¼±ÊÌ̾¾ðÊó¡¢¥­¡¼¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤ª¤è¤ÓÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤Ë¤Ä¤¤¤Æ¤Ï¡¢ÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.LP
++.LP
++°Ê¹ß¤Ç¤Ï¡¢¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç\f2\-genkeypair\fP¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¤â¤Î¤È¤·¤ÆÎã¤ò¼¨¤·¤Þ¤¹¡£¾ðÊó¤ÎÆþÎϤòµá¤á¤é¤ì¤¿¾ì¹ç¤Ï¡¢ºÇ½é¤Ë¼¨¤·¤¿\f2\-genkeypair\fP¥³¥Þ¥ó¥É¤ÎÃͤòÆþÎϤ·¤¿¤â¤Î¤È¤·¤Þ¤¹(¤¿¤È¤¨¤Ð¡¢¼±ÊÌ̾¤Ë¤Ïcn=Mark Jones,ou=Java,o=Oracle,c=US¤È»ØÄê)¡£
++.LP
++.SS
++¾ÚÌÀ½ñȯ¹Ô¶É¤ËÂФ¹¤ë½ð̾ÉÕ¤­¾ÚÌÀ½ñ¤Î¥ê¥¯¥¨¥¹¥È
++.LP
++.LP
++¸½»þÅÀ¤Ç¼ê¸µ¤Ë¤¢¤ë¤Î¤Ï¡¢1Ä̤μ«¸Ê½ð̾¾ÚÌÀ½ñ¤Î¤ß¤Ç¤¹¡£¾ÚÌÀ½ñ¤Ë¾ÚÌÀ½ñȯ¹Ô¶É(CA)¤Î½ð̾¤¬ÉÕ¤¤¤Æ¤¤¤ì¤Ð¡¢Â¾¤Î¥æ¡¼¥¶¡¼¤«¤é¾ÚÌÀ½ñ¤¬¿®Íꤵ¤ì¤ë²ÄǽÀ­¤â¹â¤¯¤Ê¤ê¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê½ð̾¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¡¢¤Þ¤º¡¢¾ÚÌÀ½ñ½ð̾¥ê¥¯¥¨¥¹¥È(CSR)¤òÀ¸À®¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ keytool \-certreq \-file MarkJ.csr
++.fl
++\fP
++.fi
++
++.LP
++.LP
++CSR(¥Ç¥Õ¥©¥ë¥ÈÊÌ̾¡Ömykey¡×¤Ë¤è¤Ã¤ÆÆÃÄꤵ¤ì¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤ÎCSR)¤¬ºîÀ®¤µ¤ì¡¢MarkJ.csr¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢VeriSign¤Ê¤É¤ÎCA¤ËÄó½Ð¤·¤Þ¤¹¡£CA¤ÏÍ×µá¼Ô¤ò(Ä̾ï¤Ï¥ª¥Õ¥é¥¤¥ó¤Ç)ǧ¾Ú¤·¡¢Í×µá¼Ô¤Î¸ø³«¸°¤òǧ¾Ú¤·¤¿½ð̾ÉÕ¤­¤Î¾ÚÌÀ½ñ¤òÁ÷¤êÊÖ¤·¤Þ¤¹¡£¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¡¢CA¤¬¾ÚÌÀ½ñ¤Î¥Á¥§¡¼¥ó¤òÊÖ¤¹¤³¤È¤â¤¢¤ê¤Þ¤¹¡£¾ÚÌÀ½ñ¤Î¥Á¥§¡¼¥ó¤Ç¤Ï¡¢³Æ¾ÚÌÀ½ñ¤¬¥Á¥§¡¼¥óÆâ¤Î¤½¤ÎÁ°¤Î½ð̾¼Ô¤Î¸ø³«¸°¤òǧ¾Ú¤·¤Þ¤¹¡£
++.LP
++.SS
++CA¤«¤é¤Î¾ÚÌÀ½ñ¤Î¥¤¥ó¥Ý¡¼¥È
++.LP
++.LP
++ºîÀ®¤·¤¿¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Ï¡¢¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ÇÃÖ¤­´¹¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Ç¤Ï¡¢³Æ¾ÚÌÀ½ñ¤¬¡¢¡Ö¥ë¡¼¥È¡×CA¤òµ¯ÅÀ¤È¤¹¤ë¥Á¥§¡¼¥óÆâ¤Î¼¡¤Î¾ÚÌÀ½ñ¤Î½ð̾¼Ô¤Î¸ø³«¸°¤òǧ¾Ú¤·¤Þ¤¹¡£
++.LP
++.LP
++CA¤«¤é¤Î¾ÚÌÀ±þÅú¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤Ë¤Ï¡¢¥­¡¼¥¹¥È¥¢¤«¡¢\f2cacerts\fP¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë(importcert¥³¥Þ¥ó¥É¤ÇÀâÌÀ)Æâ¤Ë1¤Ä°Ê¾å¤Î¡Ö¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¡×¤¬¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++¾ÚÌÀ±þÅú¤¬¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Î¾ì¹ç¤Ï¡¢¥Á¥§¡¼¥ó¤Î¥È¥Ã¥×¤Î¾ÚÌÀ½ñ(¤½¤ÎCA¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¡Ö¥ë¡¼¥È¡×CA¤Î¾ÚÌÀ½ñ)¤Î¤ß¤¬É¬ÍפǤ¹¡£
++.TP 2
++o
++¾ÚÌÀ±þÅú¤¬Ã±°ì¤Î¾ÚÌÀ½ñ¤Î¾ì¹ç¤Ï¡¢¾ÚÌÀ½ñ¤Ë½ð̾¤·¤¿CA¤Îȯ¹ÔÍѤξÚÌÀ½ñ¤¬É¬Íפǡ¢¤½¤Î¾ÚÌÀ½ñ¤¬¼«¸Ê½ð̾¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¡¢¤µ¤é¤Ë¤½¤Î¾ÚÌÀ½ñ¤Î½ð̾¼ÔÍѤξÚÌÀ½ñ¤¬É¬ÍפǤ¹¡£¤³¤Î¤è¤¦¤Ë¤·¤Æ¼«¸Ê½ð̾¤µ¤ì¤ë¡Ö¥ë¡¼¥È¡×CA¤Î¾ÚÌÀ½ñ¤Þ¤Ç¡¢¤½¤ì¤¾¤ì¾ÚÌÀ½ñ¤¬É¬ÍפǤ¹¡£
++.RE
++
++.LP
++.LP
++cacerts¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢¤¤¤¯¤Ä¤«¤ÎVeriSign¥ë¡¼¥ÈCA¾ÚÌÀ½ñ¤ò´Þ¤ó¤À¾õÂ֤ǽв٤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢VeriSign¤Î¾ÚÌÀ½ñ¤ò¡¢¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤È¤·¤Æ¥­¡¼¥¹¥È¥¢Æâ¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ëɬÍפϤʤ¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤¿¤À¤·¡¢Â¾¤ÎCA¤ËÂФ·¤Æ½ð̾ÉÕ¤­¾ÚÌÀ½ñ¤ò¥ê¥¯¥¨¥¹¥È¤·¤Æ¤¤¤Æ¡¢¤³¤ÎCA¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ¤¬¡¢cacerts¤Ë¤Þ¤ÀÄɲ䵤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ëCA¤«¤é¤Î¾ÚÌÀ½ñ¤ò¡¢¡Ö¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¡×¤È¤·¤Æ¥¤¥ó¥Ý¡¼¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++Ä̾CA¤«¤é¤Î¾ÚÌÀ½ñ¤Ï¡¢¼«¸Ê½ð̾¾ÚÌÀ½ñ¡¢¤Þ¤¿¤Ï¾¤ÎCA¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤¿¾ÚÌÀ½ñ¤Ç¤¹(¸å¼Ô¤Î¾ì¹ç¤Ï¡¢³ºÅö¤¹¤ë¾¤ÎCA¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ¤âɬÍ×)¡£¤¿¤È¤¨¤Ð¡¢ABC¤È¤¤¤¦´ë¶È¤¬CA¤À¤È¤·¤Þ¤¹¡£¤³¤Î¤È¤­¡¢¤³¤ÎCA¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¼«¸Ê½ð̾¾ÚÌÀ½ñ¤È¹Í¤¨¤é¤ì¤ë¡ÖABCCA.cer¡×¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤ò¡¢ABC¤«¤éÆþ¼ê¤·¤¿¤È¤·¤Þ¤¹¡£
++.LP
++.LP
++¡Ö¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¡×¤È¤·¤Æ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤È¤­¤Ï¡¢¾ÚÌÀ½ñ¤¬Í­¸ú¤Ç¤¢¤ë¤³¤È¤ò¿µ½Å¤Ë³Îǧ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤Þ¤º¡¢¾ÚÌÀ½ñ¤ÎÆâÍƤòɽ¼¨¤·(\f3keytool\fP \f2\-printcert\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤«¡¢¤Þ¤¿¤Ï\f2\-noprompt\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç\f3keytool\fP \f2\-importcert\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¡¢É½¼¨¤µ¤ì¤¿¾ÚÌÀ½ñ¤Î¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬¡¢´üÂÔ¤µ¤ì¤ë¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Þ¤¹¡£¾ÚÌÀ½ñ¤òÁ÷¿®¤·¤¿¿Íʪ¤ËÏ¢Íí¤·¡¢¤³¤Î¿Íʪ¤¬Ä󼨤·¤¿(¤Þ¤¿¤Ï°ÂÁ´¤Ê¸ø³«¸°¤Î¥ê¥Ý¥¸¥È¥ê¤Ë¤è¤Ã¤ÆÄ󼨤µ¤ì¤ë)¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¡¢¾å¤Î¥³¥Þ¥ó¥É¤Çɽ¼¨¤µ¤ì¤¿¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¤òÈæ³Ó¤·¤Þ¤¹¡£¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬°ìÃפ¹¤ì¤Ð¡¢Á÷¿®ÅÓÃæ¤Ç¾¤Î²¿¼Ô¤«(¹¶·â¼Ô¤Ê¤É)¤Ë¤è¤ë¾ÚÌÀ½ñ¤Î¤¹¤êÂؤ¨¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£Á÷¿®ÅÓÃæ¤Ç¤³¤Î¼ï¤Î¹¶·â¤¬¹Ô¤ï¤ì¤Æ¤¤¤¿¾ì¹ç¡¢¥Á¥§¥Ã¥¯¤ò¹Ô¤ï¤º¤Ë¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤È¡¢¹¶·â¼Ô¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¤â¤Î¤ò¿®Íꤹ¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++¤³¤Î¾ÚÌÀ½ñ¤òÍ­¸ú¤Ê¤â¤Î¤È¤·¤Æ¿®Íꤹ¤ë¾ì¹ç¤Ï¡¢¾ÚÌÀ½ñ¤ò¥­¡¼¥¹¥È¥¢¤ËÄɲäǤ­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ keytool \-importcert \-alias abc \-file ABCCA.cer
++.fl
++\fP
++.fi
++
++.LP
++.LP
++ABCCA.cer¥Õ¥¡¥¤¥ë¤Î¥Ç¡¼¥¿¤ò´Þ¤à¡Ö¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¡×¤Î¥¨¥ó¥È¥ê¤¬¥­¡¼¥¹¥È¥¢Æâ¤ËºîÀ®¤µ¤ì¡¢³ºÅö¤¹¤ë¥¨¥ó¥È¥ê¤Ëabc¤È¤¤¤¦ÊÌ̾¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£
++.LP
++.SS
++CA¤«¤é¤Î¾ÚÌÀ½ñ±þÅú¤Î¥¤¥ó¥Ý¡¼¥È
++.LP
++.LP
++¾ÚÌÀ½ñ½ð̾¥ê¥¯¥¨¥¹¥È¤ÎÄó½ÐÀè¤ÎCA¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤·¤¿¸å¤Ï(¤Þ¤¿¤ÏƱ¼ï¤Î¾ÚÌÀ½ñ¤¬¤¹¤Ç¤Ëcacerts¥Õ¥¡¥¤¥ëÆâ¤Ë¸ºß¤·¤Æ¤¤¤ë¾ì¹ç¤Ï)¡¢¾ÚÌÀ±þÅú¤ò¥¤¥ó¥Ý¡¼¥È¤·¡¢¼«¸Ê½ð̾¾ÚÌÀ½ñ¤ò¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ÇÃÖ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥Á¥§¡¼¥ó¤Ï¡¢CA¤Î±þÅú¤¬¥Á¥§¡¼¥ó¤Î¾ì¹ç¤Ë¡¢¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë¥ì¥¹¥Ý¥ó¥¹¤È¤·¤ÆCA¤«¤éÁ÷¤êÊÖ¤µ¤ì¤¿¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Ç¤¹¡£¤Þ¤¿¡¢CA¤Î±þÅú¤¬Ã±°ì¤Î¾ÚÌÀ½ñ¤Î¾ì¹ç¤Ï¡¢¤³¤Î¾ÚÌÀ±þÅú¤È¡¢¥¤¥ó¥Ý¡¼¥ÈÀè¤Î¥­¡¼¥¹¥È¥¢Æâ¤Þ¤¿¤Ïcacerts¥­¡¼¥¹¥È¥¢¥Õ¥¡¥¤¥ëÆâ¤Ë¤¹¤Ç¤Ë¸ºß¤¹¤ë¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤È¤ò»ÈÍѤ·¤Æ¹½ÃÛ¤·¤¿¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Ç¤¹¡£
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢¾ÚÌÀ½ñ½ð̾¥ê¥¯¥¨¥¹¥È¤òVeriSign¤ËÁ÷¿®¤·¤¿¤È¤·¤Þ¤¹¡£Á÷¤êÊÖ¤µ¤ì¤¿¾ÚÌÀ½ñ¤Î̾Á°¤¬VSMarkJ.cer¤À¤È¤¹¤ë¤È¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Æ±þÅú¤ò¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ keytool \-importcert \-trustcacerts \-file VSMarkJ.cer
++.fl
++\fP
++.fi
++
++.LP
++.SS
++¸ø³«¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ¤Î¥¨¥¯¥¹¥Ý¡¼¥È
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢jarsigner(1)¥Ä¡¼¥ë¤ò»ÈÍѤ·¤ÆJava ARchive(JAR)¥Õ¥¡¥¤¥ë¤Ë½ð̾¤òÉÕ¤±¤¿¤È¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤Þ¤¹¤¬¡¢¥¯¥é¥¤¥¢¥ó¥È¦¤Ç¤Ï½ð̾¤òǧ¾Ú¤·¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤Þ¤¹¡£
++.LP
++.LP
++¥¯¥é¥¤¥¢¥ó¥È¤¬½ð̾¤òǧ¾Ú¤¹¤ëÊýË¡¤Î1¤Ä¤Ë¡¢¤Þ¤º¼«Ê¬¤Î¸ø³«¸°¤Î¾ÚÌÀ½ñ¤ò¡Ö¿®Íê¤Ç¤­¤ë¡×¥¨¥ó¥È¥ê¤È¤·¤Æ¥¯¥é¥¤¥¢¥ó¥È¤Î¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ëÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£¤½¤Î¤¿¤á¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤ò¥¨¥¯¥¹¥Ý¡¼¥È¤·¤Æ¡¢¥¯¥é¥¤¥¢¥ó¥È¤ËÄ󶡤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Æ¡¢¾ÚÌÀ½ñ¤ò\f2MJ.cer\fP¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤Ë¥³¥Ô¡¼¤·¤Þ¤¹¡£¤³¤Î¥¨¥ó¥È¥ê¤Ë¤Ï¡Ömykey¡×¤È¤¤¤¦ÊÌ̾¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ keytool \-exportcert \-alias mykey \-file MJ.cer
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¾ÚÌÀ½ñ¤È½ð̾ÉÕ¤­JAR¥Õ¥¡¥¤¥ë¤òÆþ¼ê¤·¤¿¥¯¥é¥¤¥¢¥ó¥È¤Ï¡¢\f3jarsigner\fP¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ½ð̾¤òǧ¾Ú¤Ç¤­¤Þ¤¹¡£
++.LP
++.SS
++¥­¡¼¥¹¥È¥¢¤Î¥¤¥ó¥Ý¡¼¥È
++.LP
++.LP
++¥³¥Þ¥ó¥É¡Öimportkeystore¡×¤ò»ÈÍѤ¹¤ì¤Ð¡¢¤¢¤ë¥­¡¼¥¹¥È¥¢¤ÎÁ´ÂΤòÊ̤Υ­¡¼¥¹¥È¥¢Æâ¤Ë¥¤¥ó¥Ý¡¼¥È¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ï¡¢¸°¤ä¾ÚÌÀ½ñ¤È¤¤¤Ã¤¿¥½¡¼¥¹¥­¡¼¥¹¥È¥¢Æâ¤Î¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê¤¬¡¢Ã±°ì¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¥¿¡¼¥²¥Ã¥È¥­¡¼¥¹¥È¥¢Æâ¤Ë¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ì¤Ð¡¢°Û¤Ê¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢Æâ¤Ë´Þ¤Þ¤ì¤ë¥¨¥ó¥È¥ê¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥¤¥ó¥Ý¡¼¥È»þ¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥È¡¦¥­¡¼¥¹¥È¥¢Æâ¤Î¿·¤·¤¤¥¨¥ó¥È¥ê¤Ï¤¹¤Ù¤Æ¡¢¸µ¤ÈƱ¤¸ÊÌ̾¤ª¤è¤Ó(ÈëÌ©¸°¤äÈëÌ©¸°¤Î¾ì¹ç¤Ï)ÊݸîÍѥѥ¹¥ï¡¼¥É¤ò»ý¤Á¤Þ¤¹¡£¥½¡¼¥¹¥­¡¼¥¹¥È¥¢Æâ¤ÎÈëÌ©¸°¤äÈëÌ©¸°¤Î²óÉü»þ¤ËÌäÂ꤬ȯÀ¸¤·¤¿¾ì¹ç¡¢\f3keytool\fP¤Ï¥æ¡¼¥¶¡¼¤Ë¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢ÊÌ̾¤Î½ÅÊ£¤ò¸¡½Ð¤¹¤ë¤È¡¢¥æ¡¼¥¶¡¼¤Ë¿·¤·¤¤ÊÌ̾¤ÎÆþÎϤòµá¤á¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤Ï¡¢¿·¤·¤¤ÊÌ̾¤ò»ØÄꤹ¤ë¤³¤È¤â¡¢Ã±½ã¤Ë´û¸¤ÎÊÌ̾¤Î¾å½ñ¤­¤ò\f3keytool\fP¤Ëµö²Ä¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢Ä̾ï¤ÎJKS¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢key.jksÆâ¤Î¥¨¥ó¥È¥ê¤òPKCS#11¥¿¥¤¥×¤Î¥Ï¡¼¥É¥¦¥§¥¢¡¦¥Ù¡¼¥¹¤Î¥­¡¼¥¹¥È¥¢Æâ¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ keytool \-importkeystore
++.fl
++ \-srckeystore key.jks \-destkeystore NONE
++.fl
++ \-srcstoretype JKS \-deststoretype PKCS11
++.fl
++ \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤Þ¤¿¡¢importkeystore¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ì¤Ð¡¢¤¢¤ë¥½¡¼¥¹¡¦¥­¡¼¥¹¥È¥¢Æâ¤Îñ°ì¤Î¥¨¥ó¥È¥ê¤ò¥¿¡¼¥²¥Ã¥È¡¦¥­¡¼¥¹¥È¥¢¤Ë¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¾åµ­¤ÎÎã¤Ç¼¨¤·¤¿¥ª¥×¥·¥ç¥ó¤Ë²Ã¤¨¡¢¥¤¥ó¥Ý¡¼¥ÈÂоݤȤʤëÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£srcalias¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¾ì¹ç¤Ë¤Ï¡¢¥¿¡¼¥²¥Ã¥ÈÊÌ̾¤â¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é»ØÄê¤Ç¤­¤ë¤Û¤«¡¢ÈëÌ©/ÈëÌ©¸°¤ÎÊݸîÍѥѥ¹¥ï¡¼¥É¤ä¥¿¡¼¥²¥Ã¥ÈÊݸîÍѥѥ¹¥ï¡¼¥É¤â»ØÄê¤Ç¤­¤Þ¤¹¡£¤½¤ÎÊýË¡¤ò¼¨¤¹¥³¥Þ¥ó¥É¤ò¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ keytool \-importkeystore
++.fl
++ \-srckeystore key.jks \-destkeystore NONE
++.fl
++ \-srcstoretype JKS \-deststoretype PKCS11
++.fl
++ \-srcstorepass \fP\f4<source keystore password>\fP\f3 \-deststorepass \fP\f4<destination keystore password>\fP\f3
++.fl
++ \-srcalias myprivatekey \-destalias myoldprivatekey
++.fl
++ \-srckeypass \fP\f4<source entry password>\fP\f3 \-destkeypass \fP\f4<destination entry password>\fP\f3
++.fl
++ \-noprompt
++.fl
++\fP
++.fi
++
++.LP
++.SS
++°ìÈÌŪ¤ÊSSL¥µ¡¼¥Ð¡¼ÍѤξÚÌÀ½ñ¤ÎÀ¸À®
++.LP
++.LP
++¼¡¤Ë¡¢3¤Ä¤Î¥¨¥ó¥Æ¥£¥Æ¥£¡¢¤Ä¤Þ¤ê¥ë¡¼¥ÈCA(root)¡¢Ãæ´ÖCA(ca)¤ª¤è¤ÓSSL¥µ¡¼¥Ð¡¼(server)ÍѤθ°¥Ú¥¢¤È¾ÚÌÀ½ñ¤òÀ¸À®¤¹¤ëkeytool¥³¥Þ¥ó¥É¤ò¼¨¤·¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¾ÚÌÀ½ñ¤òƱ¤¸¥­¡¼¥¹¥È¥¢¤Ë³ÊǼ¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤é¤ÎÎã¤Ç¤Ï¡¢¸°¤Î¥¢¥ë¥´¥ê¥º¥à¤È¤·¤ÆRSA¤ò»ØÄꤹ¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++keytool \-genkeypair \-keystore root.jks \-alias root \-ext bc:c
++.fl
++keytool \-genkeypair \-keystore ca.jks \-alias ca \-ext bc:c
++.fl
++keytool \-genkeypair \-keystore server.jks \-alias server
++.fl
++
++.fl
++keytool \-keystore root.jks \-alias root \-exportcert \-rfc > root.pem
++.fl
++
++.fl
++keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-certreq \-alias ca | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore root.jks \-gencert \-alias root \-ext BC=0 \-rfc > ca.pem
++.fl
++keytool \-keystore ca.jks \-importcert \-alias ca \-file ca.pem
++.fl
++
++.fl
++keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore server.jks \-certreq \-alias server | keytool \-storepass \fP\f4<storepass>\fP\f3 \-keystore ca.jks \-gencert \-alias ca \-ext ku:c=dig,kE \-rfc > server.pem
++.fl
++cat root.pem ca.pem server.pem | keytool \-keystore server.jks \-importcert \-alias server
++.fl
++\fP
++.fi
++
++.LP
++.SH "ÍѸì¤È·Ù¹ð"
++.LP
++.SS
++¥­¡¼¥¹¥È¥¢
++.LP
++.LP
++¥­¡¼¥¹¥È¥¢¤Ï¡¢°Å¹æ²½¤Î¸°¤È¾ÚÌÀ½ñ¤ò³ÊǼ¤¹¤ë¤¿¤á¤Îµ¡Ç½¤Ç¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++\f3¥­¡¼¥¹¥È¥¢¤Î¥¨¥ó¥È¥ê\fP
++.LP
++¥­¡¼¥¹¥È¥¢¤Ë¤Ï°Û¤Ê¤ë¥¿¥¤¥×¤Î¥¨¥ó¥È¥ê¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\f3keytool\fP¤ÇºÇ¤âŬÍÑÈϰϤι­¤¤¥¨¥ó¥È¥ê¡¦¥¿¥¤¥×¤Ï¡¢¼¡¤Î2¤Ä¤Ç¤¹¡£
++.RS 3
++.TP 3
++1.
++\f3¸°¤Î¥¨¥ó¥È¥ê\fP \- ³Æ¥¨¥ó¥È¥ê¤Ï¡¢Èó¾ï¤Ë½ÅÍפʰŹ沽¤Î¸°¤Î¾ðÊó¤òÊÝ»ý¤·¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ï¡¢µö²Ä¤·¤Æ¤¤¤Ê¤¤¥¢¥¯¥»¥¹¤òËɤ°¤¿¤á¤Ë¡¢Êݸ¤ì¤¿·Á¤Ç³ÊǼ¤µ¤ì¤Þ¤¹¡£°ìÈ̤ˡ¢¤³¤Î¼ï¤Î¥¨¥ó¥È¥ê¤È¤·¤Æ³ÊǼ¤µ¤ì¤ë¸°¤Ï¡¢ÈëÌ©¸°¤«¡¢Âбþ¤¹¤ë¸ø³«¸°¤Î¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤òȼ¤¦ÈëÌ©¸°¤Ç¤¹¡£\f3keytool\fP¤¬¤³¤ÎξÊý¤Î¥¿¥¤¥×¤Î¥¨¥ó¥È¥ê¤ò½èÍý¤Ç¤­¤ë¤Î¤ËÂФ·¡¢\f3jarsigner\fP¥Ä¡¼¥ë¤Ï¸å¼Ô¤Î¥¿¥¤¥×¤Î¥¨¥ó¥È¥ê¡¢¤Ä¤Þ¤êÈëÌ©¸°¤È¤½¤ì¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Î¤ß¤ò½èÍý¤·¤Þ¤¹¡£
++.TP 3
++2.
++\f3¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤Î¥¨¥ó¥È¥ê\fP \- ³Æ¥¨¥ó¥È¥ê¤Ï¡¢Âè»°¼Ô¤«¤é¤Î¸ø³«¸°¾ÚÌÀ½ñ¤ò1¤Ä´Þ¤ó¤Ç¤¤¤Þ¤¹¡£¤³¤Î¾ÚÌÀ½ñ¤Ï¡¢¡Ö¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¡×¤È¸Æ¤Ð¤ì¤Þ¤¹¡£¤½¤ì¤Ï¡¢¾ÚÌÀ½ñÆâ¤Î¸ø³«¸°¤¬¡¢¾ÚÌÀ½ñ¤Î¡ÖSubject¡×(½êÍ­¼Ô)¤Ë¤è¤Ã¤ÆÆÃÄꤵ¤ì¤ë¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤ËͳÍ褹¤ë¤â¤Î¤Ç¤¢¤ë¤³¤È¤ò¡¢¥­¡¼¥¹¥È¥¢¤Î½êÍ­¼Ô¤¬¿®Íꤹ¤ë¤«¤é¤Ç¤¹¡£¾ÚÌÀ½ñ¤Îȯ¹Ô¼Ô¤Ï¡¢¾ÚÌÀ½ñ¤Ë½ð̾¤òÉÕ¤±¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤½¤ÎÆâÍƤòÊݾڤ·¤Þ¤¹¡£
++.RE
++.TP 2
++o
++\f3¥­¡¼¥¹¥È¥¢¤ÎÊÌ̾\fP
++.LP
++¥­¡¼¥¹¥È¥¢¤Î¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê(¸°¤ª¤è¤Ó¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ)¤Ï¡¢°ì°Õ¤Î\f2ÊÌ̾\fP¤ò²ð¤·¤Æ¥¢¥¯¥»¥¹¤µ¤ì¤Þ¤¹¡£
++.LP
++ÊÌ̾¤ò»ØÄꤹ¤ë¤Î¤Ï¡¢\-genseckey¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤ÆÈëÌ©¸°¤òÀ¸À®¤·¤¿¤ê¡¢\-genkeypair¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¸°¥Ú¥¢(¸ø³«¸°¤ÈÈëÌ©¸°)¤òÀ¸À®¤·¤¿¤ê¡¢\-importcert¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¾ÚÌÀ½ñ¤Þ¤¿¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤ËÄɲ乤ë¤Ê¤É¡¢ÆÃÄê¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤ò¥­¡¼¥¹¥È¥¢¤ËÄɲ乤ë¾ì¹ç¤Ç¤¹¡£¤³¤ì°Ê¸å¡¢\f3keytool\fP¥³¥Þ¥ó¥É¤Ç¥¨¥ó¥Æ¥£¥Æ¥£¤ò»²¾È¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¤È¤­¤Ë»ØÄꤷ¤¿ÊÌ̾¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++¤¿¤È¤¨¤Ð¡¢\f2duke\fP¤È¤¤¤¦ÊÌ̾¤ò»ÈÍѤ·¤Æ¿·¤·¤¤¸ø³«¸°¤ÈÈëÌ©¸°¤Î¥Ú¥¢¤òÀ¸À®¤·¡¢¸ø³«¸°¤ò¼«¸Ê½ð̾¾ÚÌÀ½ñ(¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò»²¾È)¤Ç¥é¥Ã¥×¤¹¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ keytool \-genkeypair \-alias duke \-keypass dukekeypasswd
++.fl
++\fP
++.fi
++.LP
++¤³¤³¤Ç¤Ï¡¢½é´ü¥Ñ¥¹¥ï¡¼¥É¤È¤·¤Ædukekeypasswd¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹¡£°Ê¸å¡¢ÊÌ̾\f2duke\fP¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿ÈëÌ©¸°¤Ë¥¢¥¯¥»¥¹¤¹¤ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ï¡¢¤³¤Î¥Ñ¥¹¥ï¡¼¥É¤¬É¬Íפˤʤê¤Þ¤¹¡£duke¤ÎÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤ò¤¢¤È¤«¤éÊѹ¹¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ keytool \-keypasswd \-alias duke \-keypass dukekeypasswd \-new newpass
++.fl
++\fP
++.fi
++.LP
++¥Ñ¥¹¥ï¡¼¥É¤¬¡¢dukekeypasswd¤«¤énewpass¤ËÊѹ¹¤µ¤ì¤Þ¤¹¡£
++.LP
++Ãí°Õ: ¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¡¢¤Þ¤¿¤Ï°ÂÁ´¤Ç¤¢¤ë¤³¤È¤¬¤ï¤«¤Ã¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¼Â¹Ô¤¹¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£É¬Íפʥѥ¹¥ï¡¼¥É¤Î¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.TP 2
++o
++\f3¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ\fP
++.LP
++\f2java.security\fP¥Ñ¥Ã¥±¡¼¥¸¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë\f2KeyStore\fP¥¯¥é¥¹¤Ï¡¢¥­¡¼¥¹¥È¥¢Æâ¤Î¾ðÊó¤Ø¤Î¥¢¥¯¥»¥¹¤ª¤è¤Ó¾ðÊó¤ÎÊѹ¹¤ò¹Ô¤¦¤¿¤á¤Î¡¢ÌÀ³Î¤ËÄêµÁ¤µ¤ì¤¿¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¸ÇÄê¼ÂÁõ¤È¤·¤Æ¤Ï¡¢¤½¤ì¤¾¤ì¤¬ÆÃÄê¤Î\f2¥¿¥¤¥×\fP¤Î¥­¡¼¥¹¥È¥¢¤òÂоݤȤ¹¤ëÊ£¿ô¤Î°Û¤Ê¤ë¼ÂÁõ¤¬Â¸ºß²Äǽ¤Ç¤¹¡£
++.LP
++¸½ºß¡¢\f3keytool\fP¤È\f3jarsigner\fP¤Î2¤Ä¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Ä¡¼¥ë¤È¡¢\f3Policy Tool\fP¤È¤¤¤¦Ì¾Á°¤ÎGUI¥Ù¡¼¥¹¤Î¥Ä¡¼¥ë¤¬¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£\f2KeyStore\fP¤Ïpublic¤È¤·¤Æ»ÈÍѲÄǽ¤Ê¤Î¤Ç¡¢¥æ¡¼¥¶¡¼¤ÏKeyStore¤ò»ÈÍѤ·¤¿Â¾¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤âºîÀ®¤Ç¤­¤Þ¤¹¡£
++.LP
++¥­¡¼¥¹¥È¥¢¤Ë¤Ï¡¢Oracle¤¬Ä󶡤¹¤ëÁȹþ¤ß¤Î¥Ç¥Õ¥©¥ë¥È¤Î¼ÂÁõ¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢JKS¤È¤¤¤¦Ì¾Á°¤ÎÆȼ«¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×(·Á¼°)¤òÍøÍѤ¹¤ë¤â¤Î¤Ç¡¢¥­¡¼¥¹¥È¥¢¤ò¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¼ÂÁõ¤Ç¤Ï¡¢¸Ä¡¹¤ÎÈëÌ©¸°¤Ï¸ÄÊ̤Υѥ¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¡¢¥­¡¼¥¹¥È¥¢Á´ÂΤÎÀ°¹çÀ­¤â(ÈëÌ©¸°¤È¤ÏÊ̤Î)¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤Ã¤ÆÊݸ¤ì¤Þ¤¹¡£
++.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
++¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¡¢\f2KeyStore\fP¥¯¥é¥¹¤¬Ä󶡤¹¤ëgetInstance¥Õ¥¡¥¯¥È¥ê¡¦¥á¥½¥Ã¥É¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢ÍÍ¡¹¤Ê¥×¥í¥Ð¥¤¥À¤«¤é°Û¤Ê¤ë\f2¥¿¥¤¥×\fP¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÁªÂò¤Ç¤­¤Þ¤¹¡£¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Ï¡¢¥­¡¼¥¹¥È¥¢¾ðÊó¤Î³ÊǼ·Á¼°¤È¥Ç¡¼¥¿·Á¼°¤òÄêµÁ¤¹¤ë¤È¤È¤â¤Ë¡¢¥­¡¼¥¹¥È¥¢Æâ¤ÎÈó¸ø³«/ÈëÌ©¸°¤È¥­¡¼¥¹¥È¥¢¼«ÂΤÎÀ°¹çÀ­¤òÊݸ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë¥¢¥ë¥´¥ê¥º¥à¤òÄêµÁ¤·¤Þ¤¹¡£°Û¤Ê¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤Ë¤Ï¡¢¸ß´¹À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£
++.LP
++\f3keytool\fP¤Ï¡¢Ç¤°Õ¤Î¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Î¥­¡¼¥¹¥È¥¢¼ÂÁõ¤ÇÆ°ºî¤·¤Þ¤¹¡£(¤³¤ì¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤éÅϤµ¤ì¤¿¥­¡¼¥¹¥È¥¢¤Î¾ì½ê¤ò¥Õ¥¡¥¤¥ë̾¤È¤·¤Æ°·¤¤¡¢¤³¤ì¤òFileInputStream¤ËÊÑ´¹¤·¤Æ¡¢FileInputStream¤«¤é¥­¡¼¥¹¥È¥¢¤Î¾ðÊó¤ò¥í¡¼¥É¤·¤Þ¤¹¡£)°ìÊý¡¢\f3jarsigner\fP¥Ä¡¼¥ë¤È\f3policytool\fP¥Ä¡¼¥ë¤Ï¡¢URL¤Ç»ØÄê²Äǽ¤ÊǤ°Õ¤Î¾ì½ê¤«¤é¥­¡¼¥¹¥È¥¢¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++\f3keytool\fP¤È\f3jarsigner\fP¤Î¾ì¹ç¡¢\f2\-storetype\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£\f3Policy Tool\fP¤Î¾ì¹ç¤Ï¡¢¡Ö¥­¡¼¥¹¥È¥¢¡×¥á¥Ë¥å¡¼¤Ë¤è¤Ã¤Æ¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++¥æ¡¼¥¶¡¼¤¬¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤òÌÀ¼¨Åª¤Ë»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢Ã±½ã¤Ë¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ç»ØÄꤵ¤ì¤¿\f2keystore.type\fP¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ˴ð¤Å¤¤¤Æ¡¢¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤¬ÁªÂò¤µ¤ì¤Þ¤¹¡£¤³¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤Ï\f2java.security\fP¤È¸Æ¤Ð¤ì¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Ç¥£¥ì¥¯¥È¥ê\f2java.home\fP/lib/securityÆâ¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡£¤³¤³¤Ç¡¢\f2java.home\fP¤Ï¼Â¹Ô»þ´Ä¶­¤Î¥Ç¥£¥ì¥¯¥È¥ê(SDK¤Î\f2jre\fP¥Ç¥£¥ì¥¯¥È¥ê¤Þ¤¿¤ÏJava 2 Runtime Environment¤Î¥È¥Ã¥×¥ì¥Ù¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê)¤Ç¤¹¡£
++.LP
++³Æ¥Ä¡¼¥ë¤Ï¡¢\f2keystore.type\fP¤ÎÃͤò¼èÆÀ¤·¡¢¤³¤ÎÃͤǻØÄꤵ¤ì¤¿¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤Þ¤Ç¡¢¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥Ð¥¤¥À¤òÄ´¤Ù¤Þ¤¹¡£ÌÜŪ¤Î¥×¥í¥Ð¥¤¥À¤¬¸«¤Ä¤«¤ë¤È¡¢¤½¤Î¥×¥í¥Ð¥¤¥À¤«¤é¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++\f2KeyStore\fP¥¯¥é¥¹¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤ëstatic¥á¥½¥Ã¥É\f2getDefaultType\fP¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ä¥¢¥×¥ì¥Ã¥È¤«¤é\f2keystore.type\fP¥×¥í¥Ñ¥Æ¥£¤ÎÃͤò¼èÆÀ¤Ç¤­¤Þ¤¹¡£¼¡¤Î¥³¡¼¥É¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×(\f2keystore.type\fP¥×¥í¥Ñ¥Æ¥£¤Ç»ØÄꤵ¤ì¤¿¥¿¥¤¥×)¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
++.fl
++\fP
++.fi
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤ÏJKS(Oracle¤¬Ä󶡤¹¤ëÆȼ«¤Î¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ)¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ëÆâ¤Î¼¡¤Î¹Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ keystore.type=jks
++.fl
++\fP
++.fi
++.LP
++³Æ¥Ä¡¼¥ë¤Ç¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤òÊѹ¹¤·¤ÆÊ̤Υ­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++¤¿¤È¤¨¤Ð¡¢pkcs12¤È¸Æ¤Ð¤ì¤ë¥¿¥¤¥×¤Î¥­¡¼¥¹¥È¥¢¤Î¼ÂÁõ¤òÄ󶡤·¤Æ¤¤¤ë¥×¥í¥Ð¥¤¥À¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Î¹Ô¤ò¼¡¤Î¤è¤¦¤ËÊѹ¹¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ keystore.type=pkcs12
++.fl
++\fP
++.fi
++.LP
++Ãí°Õ: ¥­¡¼¥¹¥È¥¢¤Î¥¿¥¤¥×¤Î»ØÄê¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢JKS¤Èjks¤ÏƱ¤¸¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++¾ÚÌÀ½ñ
++.LP
++\f3¾ÚÌÀ½ñ\fP(\f3¸ø³«¸°¾ÚÌÀ½ñ\fP¤È¤â¸Æ¤Ð¤ì¤Þ¤¹)¤È¤Ï¡¢¤¢¤ë¥¨¥ó¥Æ¥£¥Æ¥£(\f2ȯ¹Ô¼Ô\fP)¤«¤é¤Î¥Ç¥¸¥¿¥ë½ð̾ÉÕ¤­¤Îʸ½ñ¤Î¤³¤È¤Ç¤¹¡£¾ÚÌÀ½ñ¤Ë¤Ï¡¢Â¾¤Î¤¢¤ë¥¨¥ó¥Æ¥£¥Æ¥£(\f2½ð̾¼Ô\fP)¤Î¸ø³«¸°(¤ª¤è¤Ó¤½¤Î¾¤Î¾ðÊó)¤¬ÆÃÊ̤ÊÃͤò»ý¤Ã¤Æ¤¤¤ë¤³¤È¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++\f3¾ÚÌÀ½ñ¤ÎÍѸì\fP
++.RS 3
++.TP 3
++¸ø³«¸°
++.LP
++¸ø³«¸°¤Ï¡¢ÆÃÄê¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¿ô¤Ç¤¹¡£¸ø³«¸°¤Ï¡¢³ºÅö¤¹¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤È¤Î´Ö¤Ë¿®Íê¤Ç¤­¤ë´Ø·¸¤ò»ý¤ÄɬÍפ¬¤¢¤ë¤¹¤Ù¤Æ¤Î¿Í¤ËÂФ·¤Æ¸ø³«¤¹¤ë¤³¤È¤ò°Õ¿Þ¤·¤¿¤â¤Î¤Ç¤¹¡£¸ø³«¸°¤Ï¡¢½ð̾¤ò¸¡¾Ú¤¹¤ë¤Î¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++¥Ç¥¸¥¿¥ë½ð̾
++.LP
++¥Ç¡¼¥¿¤¬¡Ö\f2¥Ç¥¸¥¿¥ë½ð̾\fP¡×¤µ¤ì¤ë¤È¡¢¤½¤Î¥Ç¡¼¥¿¤Ï¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤Î¡Ö¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¡×¤È¡¢¤½¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤¬¥Ç¡¼¥¿¤ÎÆâÍƤˤĤ¤¤ÆÃΤäƤ¤¤ë¤³¤È¤ò¾ÚÌÀ½ñ¤¹¤ë½ð̾¤È¤È¤â¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£¥¨¥ó¥Æ¥£¥Æ¥£¤ÎÈëÌ©¸°¤ò»ÈÍѤ·¤Æ¥Ç¡¼¥¿¤Ë½ð̾¤òÉÕ¤±¤ë¤È¡¢¥Ç¡¼¥¿¤Îµ¶Â¤¤ÏÉÔ²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£
++.LP
++¥¨¥ó¥Æ¥£¥Æ¥£¤òÆÃÄꤹ¤ë¤¿¤á¤Î´ûÃΤÎÊýË¡¤Ç¤¹¡£¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ¤Ï¡¢¸ø³«¸°¤ò¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Ë¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£¸ø³«¸°¤Î¾¤Ë¤â¡¢Unix UID¤äÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¡¢X.509¼±ÊÌ̾¤Ê¤É¡¢ÍÍ¡¹¤Ê¤â¤Î¤ò¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.TP 3
++½ð̾
++.LP
++½ð̾¤Ï¡¢¤Ê¤ó¤é¤«¤Î¥Ç¡¼¥¿¤ò´ð¤Ë¥¨¥ó¥Æ¥£¥Æ¥£(\f2½ð̾¼Ô\fP¡£¾ÚÌÀ½ñ¤Ë´Ø¤·¤Æ¤Ï\f2ȯ¹Ô¼Ô\fP¤È¤â¸Æ¤Ð¤ì¤Þ¤¹)¤ÎÈëÌ©¸°¤ò»ÈÍѤ·¤Æ·×»»¤µ¤ì¤Þ¤¹¡£
++.TP 3
++ÈëÌ©¸°
++.LP
++ÈëÌ©¸°¤ÏÆÃÄê¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Î¤ß¤¬ÃΤäƤ¤¤ë¿ô¤Î¤³¤È¤Ç¡¢¤³¤Î¿ô¤Î¤³¤È¤ò¡¢¤½¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤ÎÈëÌ©¸°¤È¤¤¤¤¤Þ¤¹¡£ÈëÌ©¸°¤Ï¡¢Â¾¤ËÃΤé¤ì¤Ê¤¤¤è¤¦¤ËÈëÌ©¤Ë¤·¤Æ¤ª¤¯¤³¤È¤¬Á°Äó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ÈëÌ©¸°¤È¸ø³«¸°¤Ï¡¢¤¹¤Ù¤Æ¤Î¸ø³«¸°°Å¹æ²½¥·¥¹¥Æ¥à¤ÇÂФˤʤäƸºß¤·¤Æ¤¤¤Þ¤¹¡£DSA¤Ê¤É¤Îŵ·¿Åª¤Ê¸ø³«¸°°Å¹æ²½¥·¥¹¥Æ¥à¤Î¾ì¹ç¡¢1¤Ä¤ÎÈëÌ©¸°¤ÏÀµ³Î¤Ë1¤Ä¤Î¸ø³«¸°¤ËÂбþ¤·¤Þ¤¹¡£ÈëÌ©¸°¤Ï¡¢½ð̾¤ò·×»»¤¹¤ë¤Î¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
++.TP 3
++¥¨¥ó¥Æ¥£¥Æ¥£
++.LP
++¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢¿Í¡¢ÁÈ¿¥¡¢¥×¥í¥°¥é¥à¡¢¥³¥ó¥Ô¥å¡¼¥¿¡¢´ë¶È¡¢¶ä¹Ô¤Ê¤É¡¢°ìÄê¤ÎÅٹ礤¤Ç¿®Íê¤ÎÂоݤȤʤëÍÍ¡¹¤Ê¤â¤Î¤ò»Ø¤·¤Þ¤¹¡£
++.RE
++.LP
++¸ø³«¸°°Å¹æ²½¤Ç¤Ï¡¢¤½¤ÎÀ­¼Á¾å¡¢¥æ¡¼¥¶¡¼¤Î¸ø³«¸°¤Ë¥¢¥¯¥»¥¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Â絬ÌϤʥͥåȥ¥¯´Ä¶­¤Ç¤Ï¡¢¸ß¤¤¤ËÄÌ¿®¤·¤Æ¤¤¤ë¥¨¥ó¥Æ¥£¥Æ¥£´Ö¤Ç°ÊÁ°¤Î´Ø·¸¤¬°ú³¤­³ÎΩ¤µ¤ì¤Æ¤¤¤ë¤È²¾Äꤷ¤¿¤ê¡¢»ÈÍѤµ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¸ø³«¸°¤ò¼ý¤á¤¿¿®Íê¤Ç¤­¤ë¥ê¥Ý¥¸¥È¥ê¤¬Â¸ºß¤¹¤ë¤È²¾Äꤷ¤¿¤ê¤¹¤ë¤³¤È¤ÏÉÔ²Äǽ¤Ç¤¹¡£¤³¤Î¤è¤¦¤Ê¸ø³«¸°¤ÎÇÛÉۤ˴ؤ¹¤ëÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë¾ÚÌÀ½ñ¤¬¹Í°Æ¤µ¤ì¤Þ¤·¤¿¡£¸½ºß¤Ç¤Ï¡¢\f2¾ÚÌÀ½ñȯ¹Ô¶É\fP(CA)¤¬¿®Íê¤Ç¤­¤ëÂè»°¼Ô¤È¤·¤Æµ¡Ç½¤·¤Þ¤¹¡£CA¤Ï¡¢Â¾¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Î¾ÚÌÀ½ñ¤Ë½ð̾¤¹¤ë(ȯ¹Ô¤¹¤ë)¹Ô°Ù¤ò¡¢¿®Íꤷ¤ÆǤ¤µ¤ì¤Æ¤¤¤ë¥¨¥ó¥Æ¥£¥Æ¥£(´ë¶È¤Ê¤É)¤Ç¤¹¡£CA¤ÏˡΧ¾å¤Î·ÀÌó¤Ë¹´Â«¤µ¤ì¤ë¤Î¤Ç¡¢Í­¸ú¤«¤Ä¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤Î¤ß¤òºîÀ®¤¹¤ë¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
++.na
++\f2VeriSign\fP @
++.fi
++http://www.verisign.com/¡¢
++.na
++\f2Thawte\fP @
++.fi
++http://www.thawte.com/¡¢
++.na
++\f2Entrust\fP @
++.fi
++http://www.entrust.com/¤ò¤Ï¤¸¤á¡¢Â¿¤¯¤Î¸øŪ¤Ê¾ÚÌÀ½ñȯ¹Ô¶É¤¬Â¸ºß¤·¤Þ¤¹¡£Microsoft¤Îǧ¾Ú¥µ¡¼¥Ð¡¼¡¢Entrust¤ÎCAÀ½Éʤʤɤò½ê°ÁÈ¿¥Æâ¤ÇÍøÍѤ¹¤ì¤Ð¡¢Æȼ«¤Î¾ÚÌÀ½ñȯ¹Ô¶É¤ò±¿±Ä¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
++.LP
++\f3keytool\fP¤ò»ÈÍѤ¹¤ë¤È¡¢¾ÚÌÀ½ñ¤Îɽ¼¨¡¢¥¤¥ó¥Ý¡¼¥È¤ª¤è¤Ó¥¨¥¯¥¹¥Ý¡¼¥È¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢¼«¸Ê½ð̾¾ÚÌÀ½ñ¤òÀ¸À®¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.LP
++¸½ºß¡¢\f3keytool\fP¤ÏX.509¾ÚÌÀ½ñ¤òÂоݤˤ·¤Æ¤¤¤Þ¤¹¡£
++.TP 2
++o
++\f3X.509¾ÚÌÀ½ñ\fP
++.LP
++X.509µ¬³Ê¤Ç¤Ï¡¢¾ÚÌÀ½ñ¤Ë´Þ¤á¤ë¾ðÊó¤¬ÄêµÁ¤µ¤ì¤Æ¤ª¤ê¡¢¤³¤Î¾ðÊó¤ò¾ÚÌÀ½ñ¤Ë½ñ¤­¹þ¤àÊýË¡(¥Ç¡¼¥¿·Á¼°)¤Ë¤Ä¤¤¤Æ¤âµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¾ÚÌÀ½ñ¤Î¤¹¤Ù¤Æ¤Î¥Ç¡¼¥¿¤Ï¡¢ASN.1/DER¤È¸Æ¤Ð¤ì¤ë2¤Ä¤Î´ØÏ¢µ¬³Ê¤ò»ÈÍѤ·¤ÆÉä¹æ²½¤µ¤ì¤Þ¤¹¡£\f2Abstract Syntax Notation 1\fP¤Ï¥Ç¡¼¥¿¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤Æ¤¤¤Þ¤¹¡£\f2Definite Encoding Rules\fP¤Ï¡¢¥Ç¡¼¥¿¤ÎÊݸ¤ª¤è¤ÓžÁ÷¤ÎÊýË¡¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++¤¹¤Ù¤Æ¤ÎX.509¾ÚÌÀ½ñ¤Ï¡¢½ð̾¤Î¾¤Ë¼¡¤Î¥Ç¡¼¥¿¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
++.RS 3
++.TP 3
++¥Ð¡¼¥¸¥ç¥ó
++.LP
++¾ÚÌÀ½ñ¤ËŬÍѤµ¤ì¤ëX.509µ¬³Ê¤Î¥Ð¡¼¥¸¥ç¥ó¤òÆÃÄꤷ¤Þ¤¹¡£¾ÚÌÀ½ñ¤Ë»ØÄê¤Ç¤­¤ë¾ðÊó¤Ï¡¢¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤Þ¤Ç¤Ë¡¢3¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\f3keytool\fP¤Ç¤Ï¡¢v1¡¢v2¤ª¤è¤Óv3¤Î¾ÚÌÀ½ñ¤Î¥¤¥ó¥Ý¡¼¥È¤È¥¨¥¯¥¹¥Ý¡¼¥È¤¬²Äǽ¤Ç¤¹¡£v3¤Î¾ÚÌÀ½ñ¤òÀ¸À®¤·¤Þ¤¹¡£
++.LP
++\f2X.509 Version 1\fP¤Ï¡¢1988ǯ¤«¤éÍøÍѤµ¤ì¤Æ¹­¤¯ÉáµÚ¤·¤Æ¤ª¤ê¡¢ºÇ¤â°ìÈÌŪ¤Ç¤¹¡£
++.LP
++\f2X.509 Version 2\fP¤Ç¤Ï¡¢Subject¤äȯ¹Ô¼Ô¤Î̾Á°¤ò¤¢¤È¤ÇºÆÍøÍѤǤ­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¡¢Subject¤Èȯ¹Ô¼Ô¤Î°ì°Õ¼±Ê̻ҤγµÇ°¤¬Æ³Æþ¤µ¤ì¤Þ¤·¤¿¡£¤Û¤È¤ó¤É¤Î¾ÚÌÀ½ñ¥×¥í¥Õ¥¡¥¤¥ëʸ½ñ¤Ç¤Ï¡¢Ì¾Á°¤òºÆ»ÈÍѤ·¤Ê¤¤¤³¤È¤È¡¢¾ÚÌÀ½ñ¤Ç°ì°Õ¤Î¼±Ê̻Ҥò»ÈÍѤ·¤Ê¤¤¤³¤È¤¬¡¢¶¯¤¯¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Version 2¤Î¾ÚÌÀ½ñ¤Ï¡¢¹­¤¯¤Ï»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
++.LP
++\f2X.509 Version 3\fP¤ÏºÇ¤â¿·¤·¤¤(1996ǯ)µ¬³Ê¤Ç¡¢¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Î³µÇ°¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Ïï¤Ç¤âÄêµÁ¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢¾ÚÌÀ½ñ¤Ë´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¸½ºß»ÈÍѤµ¤ì¤Æ¤¤¤ë°ìÈÌŪ¤Ê¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤È¤·¤Æ¤Ï¡¢\f2KeyUsage\fP(¡Ö½ð̾ÀìÍѡפʤɡ¢¸°¤Î»ÈÍѤòÆÃÄê¤ÎÌÜŪ¤ËÀ©¸Â¤¹¤ë)¡¢\f2AlternativeNames\fP(DNS̾¡¢ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¡¢IP¥¢¥É¥ì¥¹¤Ê¤É¡¢Â¾¤Î¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤ò¸ø³«¸°¤Ë´ØÏ¢ÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤ë)¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Ë¤Ï¡¢\f2critical\fP¤È¤¤¤¦¥Þ¡¼¥¯¤òÉÕ¤±¤Æ¡¢¤½¤Î¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Î¥Á¥§¥Ã¥¯¤È»ÈÍѤòµÁ̳¤Å¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢critical¤È¥Þ¡¼¥¯¤µ¤ì¡¢KeyCertSign¤¬ÀßÄꤵ¤ì¤¿KeyUsage¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤¬¾ÚÌÀ½ñ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¤³¤Î¾ÚÌÀ½ñ¤òSSLÄÌ¿®Ãæ¤ËÄ󼨤¹¤ë¤È¡¢¾ÚÌÀ½ñ¤¬µñÈݤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢¾ÚÌÀ½ñ¤Î¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢´ØÏ¢¤¹¤ëÈëÌ©¸°¤¬¾ÚÌÀ½ñ¤Î½ð̾ÀìÍѤȤ·¤Æ»ØÄꤵ¤ì¤Æ¤ª¤ê¡¢SSL¤Ç¤Ï»ÈÍѤǤ­¤Ê¤¤¤¿¤á¤Ç¤¹¡£
++.TP 3
++¥·¥ê¥¢¥ëÈÖ¹æ
++.LP
++¾ÚÌÀ½ñ¤òºîÀ®¤·¤¿¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢¤½¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤¬È¯¹Ô¤¹¤ë¾¤Î¾ÚÌÀ½ñ¤È¶èÊ̤¹¤ë¤¿¤á¤Ë¡¢¾ÚÌÀ½ñ¤Ë¥·¥ê¥¢¥ëÈÖ¹æ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ï¡¢ÍÍ¡¹¤ÊÊýË¡¤Ç»ÈÍѤµ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¾ÚÌÀ½ñ¤¬¼è¤ê¾Ã¤µ¤ì¤ë¤È¡¢¥·¥ê¥¢¥ëÈֹ椬¾ÚÌÀ½ñ¤Î¼è¾Ã¤·¥ê¥¹¥È(CRL)¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£
++.TP 3
++½ð̾¥¢¥ë¥´¥ê¥º¥à¼±ÊÌ»Ò
++.LP
++¾ÚÌÀ½ñ¤Ë½ð̾¤òÉÕ¤±¤ë¤È¤­¤ËCA¤¬»ÈÍѤ·¤¿¥¢¥ë¥´¥ê¥º¥à¤òÆÃÄꤷ¤Þ¤¹¡£
++.TP 3
++ȯ¹Ô¼Ô̾
++.LP
++¾ÚÌÀ½ñ¤Ë½ð̾¤òÉÕ¤±¤¿¥¨¥ó¥Æ¥£¥Æ¥£¤ÎX.500¼±ÊÌ̾¤Ç¤¹¡£¥¨¥ó¥Æ¥£¥Æ¥£¤Ï¡¢Ä̾ï¤ÏCA¤Ç¤¹¡£¤³¤Î¾ÚÌÀ½ñ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ï¡¢¾ÚÌÀ½ñ¤Ë½ð̾¤òÉÕ¤±¤¿¥¨¥ó¥Æ¥£¥Æ¥£¤ò¿®Íꤹ¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£\f2¥ë¡¼¥È¤Ä¤Þ¤ê¥È¥Ã¥×¥ì¥Ù¥ë\fP¤ÎCA¤Î¾ÚÌÀ½ñ¤Ê¤É¡¢¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ïȯ¹Ô¼Ô¤¬¼«¿È¤Î¾ÚÌÀ½ñ¤Ë½ð̾¤òÉÕ¤±¤ë¤³¤È¤¬¤¢¤ëÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++Í­¸ú´ü´Ö
++.LP
++³Æ¾ÚÌÀ½ñ¤Ï¡¢¸Â¤é¤ì¤¿´ü´Ö¤Î¤ßÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Î´ü´Ö¤Ï³«»Ï¤ÎÆü»þ¤È½ªÎ»¤ÎÆü»þ¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¡¢¿ôÉäÎû¤¤´ü´Ö¤«¤é100ǯ¤È¤¤¤¦Ä¹´ü¤Ë¤ï¤¿¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£ÁªÂò¤µ¤ì¤ëÍ­¸ú´ü´Ö¤Ï¡¢¾ÚÌÀ½ñ¤Ø¤Î½ð̾¤Ë»ÈÍѤµ¤ì¤ëÈëÌ©¸°¤Î¶¯ÅÙ¤ä¾ÚÌÀ½ñ¤Ë»Ùʧ¤¦¶â³Û¤Ê¤É¡¢ÍÍ¡¹¤ÊÍ×°ø¤Ç°Û¤Ê¤ê¤Þ¤¹¡£Í­¸ú´ü´Ö¤Ï¡¢´ØÏ¢¤¹¤ëÈëÌ©¸°¤¬Â»¤Ê¤ï¤ì¤Ê¤¤¾ì¹ç¤Ë¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤¬¸ø³«¸°¤ò¿®Íê¤Ç¤­¤ë¤È´üÂÔ¤µ¤ì¤ë´ü´Ö¤Ç¤¹¡£
++.TP 3
++Subject̾
++.LP
++¾ÚÌÀ½ñ¤Ç¸ø³«¸°¤¬¼±Ê̤µ¤ì¤Æ¤¤¤ë¥¨¥ó¥Æ¥£¥Æ¥£¤Î̾Á°¤Ç¤¹¡£¤³¤Î̾Á°¤ÏX.500ɸ½à¤ò»ÈÍѤ¹¤ë¤Î¤Ç¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÁ´ÂΤǰì°Õ¤Ê¤â¤Î¤ÈÁÛÄꤵ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤ÎX.500¼±ÊÌ̾(DN)¤Ç¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ CN=Java Duke, OU=Java Software Division, O=Oracle Corporation, C=US
++.fl
++\fP
++.fi
++.LP
++¤³¤ì¤é¤Ï¤½¤ì¤¾¤ì¼çÂΤÎÄ̾Ρ¢ÁÈ¿¥Ã±°Ì¡¢ÁÈ¿¥¡¢¹ñ¤òɽ¤·¤Þ¤¹¡£
++.TP 3
++Subject¤Î¸ø³«¸°¾ðÊó
++.LP
++̾Á°¤òÉÕ¤±¤é¤ì¤¿¥¨¥ó¥Æ¥£¥Æ¥£¤Î¸ø³«¸°¤È¥¢¥ë¥´¥ê¥º¥à¼±Ê̻ҤǤ¹¡£¥¢¥ë¥´¥ê¥º¥à¼±Ê̻ҤǤϡ¢¸ø³«¸°¤ËÂФ·¤Æ»ÈÍѤµ¤ì¤Æ¤¤¤ë¸ø³«¸°°Å¹æ²½¥·¥¹¥Æ¥à¤ª¤è¤Ó´ØÏ¢¤¹¤ë¸°¥Ñ¥é¥á¡¼¥¿¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
++.RE
++.TP 2
++o
++\f3¾ÚÌÀ½ñ¥Á¥§¡¼¥ó\fP
++.LP
++\f3keytool\fP¤Ç¤Ï¡¢ÈëÌ©¸°¤ª¤è¤Ó´ØÏ¢¤¹¤ë¾ÚÌÀ½ñ¡Ö¥Á¥§¡¼¥ó¡×¤ò´Þ¤à¥­¡¼¥¹¥È¥¢¤Î¡Ö¸°¡×¥¨¥ó¥È¥ê¤òºîÀ®¤·¡¢´ÉÍý¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê¥¨¥ó¥È¥ê¤Ç¤Ï¡¢ÈëÌ©¸°¤ËÂбþ¤¹¤ë¸ø³«¸°¤Ï¡¢¥Á¥§¡¼¥ó¤ÎºÇ½é¤Î¾ÚÌÀ½ñ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++¸°¤ò½é¤á¤ÆºîÀ®¤¹¤ë¤È(\-genkeypair¥³¥Þ¥ó¥É¤ò»²¾È)¡¢¡Ö\f2¼«¸Ê½ð̾¾ÚÌÀ½ñ\fP¡×¤È¤¤¤¦1¤Ä¤ÎÍ×ÁǤΤߤò´Þ¤à¥Á¥§¡¼¥ó¤¬³«»Ï¤µ¤ì¤Þ¤¹¡£¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Ï¡¢È¯¹Ô¼Ô(½ð̾¼Ô)¤¬¼çÂÎ(¾ÚÌÀ½ñ¤Çǧ¾Ú¤µ¤ì¤Æ¤¤¤ë¸ø³«¸°¤Î»ý¤Á¼ç)¤ÈƱ¤¸¤Ç¤¢¤ë¾ÚÌÀ½ñ¤Î¤³¤È¤Ç¤¹¡£\f2\-genkeypair\fP¥³¥Þ¥ó¥É¤ò¸Æ¤Ó½Ð¤·¤Æ¿·¤·¤¤¸ø³«¸°¤ÈÈëÌ©¸°¤Î¥Ú¥¢¤òºîÀ®¤¹¤ë¤È¡¢¸ø³«¸°¤Ï¾ï¤Ë¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Ç¥é¥Ã¥×¤µ¤ì¤Þ¤¹¡£
++.LP
++¤³¤Î¸å¡¢¾ÚÌÀ½ñ½ð̾¥ê¥¯¥¨¥¹¥È(CSR)¤¬À¸À®¤µ¤ì¤Æ(\-certreq¥³¥Þ¥ó¥É¤ò»²¾È)¡¢CSR¤¬¾ÚÌÀ½ñȯ¹Ô¶É(CA)¤ËÁ÷¿®¤µ¤ì¤ë¤È¡¢CA¤«¤é¤Î¥ì¥¹¥Ý¥ó¥¹¤¬¥¤¥ó¥Ý¡¼¥È¤µ¤ì(\-importcert¥³¥Þ¥ó¥É¤ò»²¾È)¡¢¸µ¤Î¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Ï¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Ë¤è¤Ã¤ÆÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹¡£¥Á¥§¡¼¥ó¤ÎºÇ¸å¤Ë¤¢¤ë¤Î¤Ï¡¢Subject¤Î¸ø³«¸°¤òǧ¾Ú¤·¤¿CA¤¬È¯¹Ô¤·¤¿¾ÚÌÀ½ñ(±þÅú)¤Ç¤¹¡£¥Á¥§¡¼¥óÆâ¤Î¤½¤ÎÁ°¤Î¾ÚÌÀ½ñ¤Ï¡¢\f2CA\fP¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ¤Ç¤¹¡£
++.LP
++CA¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ¤Ï¡¢Â¿¤¯¤Î¾ì¹ç¡¢¼«¸Ê½ð̾¾ÚÌÀ½ñ(¤Ä¤Þ¤êCA¤¬¼«¿È¤Î¸ø³«¸°¤òǧ¾Ú¤·¤¿¾ÚÌÀ½ñ)¤Ç¤¢¤ê¡¢¤³¤ì¤Ï¥Á¥§¡¼¥ó¤ÎºÇ½é¤Î¾ÚÌÀ½ñ¤Ë¤Ê¤ê¤Þ¤¹¡£¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¡¢CA¤¬¾ÚÌÀ½ñ¤Î¥Á¥§¡¼¥ó¤òÊÖ¤¹¤³¤È¤â¤¢¤ê¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¥Á¥§¡¼¥óÆâ¤ÎºÇ¸å¤Î¾ÚÌÀ½ñ(CA¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¡¢¸°¥¨¥ó¥È¥ê¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ)¤ËÊѤï¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢¥Á¥§¡¼¥óÆâ¤Î¤½¤ÎÁ°¤Î¾ÚÌÀ½ñ¤Ï¡¢CSR¤ÎÁ÷¿®Àè¤ÎCA¤È¤Ï\f2Ê̤Î\fPCA¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¡¢CSR¤ÎÁ÷¿®Àè¤ÎCA¤Î¸ø³«¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ¤Ë¤Ê¤ê¤Þ¤¹¡£¤µ¤é¤Ë¡¢¥Á¥§¡¼¥óÆâ¤Î¤½¤ÎÁ°¤Î¾ÚÌÀ½ñ¤Ï¡¢¼¡¤ÎCA¤Î¸°¤òǧ¾Ú¤¹¤ë¾ÚÌÀ½ñ¤Ë¤Ê¤ê¤Þ¤¹¡£°Ê²¼Æ±Íͤˡ¢¼«¸Ê½ð̾¤µ¤ì¤¿¡Ö¥ë¡¼¥È¡×¾ÚÌÀ½ñ¤Ë㤹¤ë¤Þ¤Ç¥Á¥§¡¼¥ó¤¬Â³¤­¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥Á¥§¡¼¥óÆâ¤Î(ºÇ½é¤Î¾ÚÌÀ½ñ°Ê¸å¤Î)³Æ¾ÚÌÀ½ñ¤Ç¤Ï¡¢¥Á¥§¡¼¥óÆâ¤Î¼¡¤Î¾ÚÌÀ½ñ¤Î½ð̾¼Ô¤Î¸ø³«¸°¤¬Ç§¾Ú¤µ¤ì¤Æ¤¤¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++¿¤¯¤ÎCA¤Ï¡¢¥Á¥§¡¼¥ó¤ò¥µ¥Ý¡¼¥È¤»¤º¤Ëȯ¹ÔºÑ¤ß¤Î¾ÚÌÀ½ñ¤Î¤ß¤òÊÖ¤·¤Þ¤¹¡£Æäˡ¢Ãæ´Ö¤ÎCA¤¬Â¸ºß¤·¤Ê¤¤¥Õ¥é¥Ã¥È¤Ê³¬Áع½Â¤¤Î¾ì¹ç¤Ï¡¢¤½¤Î·¹¸þ¤¬¸²Ãø¤Ç¤¹¡£¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Ï¡¢¥­¡¼¥¹¥È¥¢¤Ë¤¹¤Ç¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¾ðÊ󤫤顢¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤ò³ÎΩ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++Ê̤αþÅú·Á¼°(PKCS#7¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë·Á¼°)¤Ç¤â¡¢È¯¹ÔºÑ¤ß¾ÚÌÀ½ñ¤Ë²Ã¤¨¡¢¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤Î¥µ¥Ý¡¼¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£\f3keytool\fP¤Ç¤Ï¡¢¤É¤Á¤é¤Î±þÅú·Á¼°¤â°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++¥È¥Ã¥×¥ì¥Ù¥ë(¥ë¡¼¥È)CA¤Î¾ÚÌÀ½ñ¤Ï¡¢¼«¸Ê½ð̾¾ÚÌÀ½ñ¤Ç¤¹¡£¤¿¤À¤·¡¢¥ë¡¼¥È¤Î¸ø³«¸°¤ËÂФ¹¤ë¿®Íê¤Ï¡¢¥ë¡¼¥È¤Î¾ÚÌÀ½ñ¼«ÂΤ«¤éƳ¤­½Ð¤µ¤ì¤ë¤â¤Î¤Ç¤Ï¤Ê¤¯(¤¿¤È¤¨¤Ð¡¢VeriSign¥ë¡¼¥ÈCA¤Î¤è¤¦¤Êͭ̾¤Ê¼±ÊÌ̾¤ò»ÈÍѤ·¤¿¼«¸Ê½ð̾¾ÚÌÀ½ñ¤òºîÀ®¤¹¤ë¤³¤È¼«ÂΤÏï¤Ç¤â²Äǽ)¡¢¿·Ê¹¤Ê¤É¤Î¾¤Î¾ðÊ󸻤ËͳÍ褹¤ë¤â¤Î¤Ç¤¹¡£¥ë¡¼¥ÈCA¤Î¸ø³«¸°¤Ï¹­¤¯ÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£¥ë¡¼¥ÈCA¤Î¸ø³«¸°¤ò¾ÚÌÀ½ñ¤Ë³ÊǼ¤¹¤ëÍýͳ¤Ï¡¢¾ÚÌÀ½ñ¤È¤¤¤¦·Á¼°¤Ë¤¹¤ë¤³¤È¤Ç¿¤¯¤Î¥Ä¡¼¥ë¤«¤éÍøÍѤǤ­¤ë¤è¤¦¤Ë¤Ê¤ë¤«¤é¤Ë¤¹¤®¤Þ¤»¤ó¡£¤Ä¤Þ¤ê¡¢¾ÚÌÀ½ñ¤Ï¡¢¥ë¡¼¥ÈCA¤Î¸ø³«¸°¤ò±¿¤Ö¡ÖÇÞÂΡפȤ·¤ÆÍøÍѤµ¤ì¤ë¤Î¤ß¤Ç¤¹¡£¥ë¡¼¥ÈCA¤Î¾ÚÌÀ½ñ¤ò¥­¡¼¥¹¥È¥¢¤ËÄɲ乤ë¤È¤­¤Ï¡¢¤½¤ÎÁ°¤Ë¾ÚÌÀ½ñ¤ÎÆâÍƤòɽ¼¨¤·(\f2\-printcert\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍÑ)¡¢É½¼¨¤µ¤ì¤¿¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¡¢¿·Ê¹¤ä¥ë¡¼¥ÈCA¤ÎWeb¥Ú¡¼¥¸¤Ê¤É¤«¤éÆþ¼ê¤·¤¿´ûÃΤΥե£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¤òÈæ³Ó¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 2
++o
++\f3cacerts¾ÚÌÀ½ñ¥Õ¥¡¥¤¥ë\fP
++.LP
++\f3cacerts\fP¤È¤¤¤¦Ì¾Á°¤Î¾ÚÌÀ½ñ¥Õ¥¡¥¤¥ë¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥×¥í¥Ñ¥Æ¥£¡¦¥Ç¥£¥ì¥¯¥È¥ê\f2java.home\fP/lib/security¤ËÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡£\f2java.home\fP¤Ï¡¢¼Â¹Ô´Ä¶­¤Î¥Ç¥£¥ì¥¯¥È¥ê(SDK¤Î\f2jre\fP¥Ç¥£¥ì¥¯¥È¥ê¤Þ¤¿¤ÏJava 2 Runtime Environment¤ÎºÇ¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê)¤Ç¤¹¡£
++.LP
++cacerts¥Õ¥¡¥¤¥ë¤Ï¡¢CA¤Î¾ÚÌÀ½ñ¤ò´Þ¤à¡¢¥·¥¹¥Æ¥àÁ´ÂΤΥ­¡¼¥¹¥È¥¢¤Ç¤¹¡£¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ï¡¢¥­¡¼¥¹¥È¥¢¡¦¥¿¥¤¥×¤Ëjks¤ò»ØÄꤹ¤ë¤³¤È¤Ç¡¢\f3keytool\fP¤ò»ÈÍѤ·¤Æ¤³¤Î¥Õ¥¡¥¤¥ë¤Î¹½À®¤È´ÉÍý¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£cacerts¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢¥ë¡¼¥ÈCA¾ÚÌÀ½ñ¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥»¥Ã¥È¤ò´Þ¤ó¤À¾õÂ֤ǽв٤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤½¤ì¤é¤Î¾ÚÌÀ½ñ¤ò°ìÍ÷ɽ¼¨¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++keytool \-list \-keystore \fP\f4java.home\fP\f3/lib/security/cacerts
++.fl
++\fP
++.fi
++.LP
++cacerts¥­¡¼¥¹¥È¥¢¡¦¥Õ¥¡¥¤¥ë¤Î½é´ü¥Ñ¥¹¥ï¡¼¥É¤Ï¡¢changeit¤Ç¤¹¡£¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ï¡¢SDK¤Î¥¤¥ó¥¹¥È¡¼¥ë¸å¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¥ï¡¼¥É¤È¥Ç¥Õ¥©¥ë¥È¡¦¥¢¥¯¥»¥¹¸¢¤òÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++\f3½ÅÍ×: \fP\f4cacerts\fP\f3¥Õ¥¡¥¤¥ë¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤\fP: \f2cacerts\fP¥Õ¥¡¥¤¥ëÆâ¤ÎCA¤Ï¡¢½ð̾¤ª¤è¤Ó¾¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ø¤Î¾ÚÌÀ½ñȯ¹Ô¤Î¤¿¤á¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤È¤·¤Æ¿®Íꤵ¤ì¤ë¤¿¤á¡¢\f2cacerts\fP¥Õ¥¡¥¤¥ë¤Î´ÉÍý¤Ï¿µ½Å¤Ë¹Ô¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£\f2cacerts\fP¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¿®Íꤹ¤ëCA¤Î¾ÚÌÀ½ñ¤Î¤ß¤¬´Þ¤Þ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤Ï¡¢¼«¿È¤ÎÀÕǤ¤Ë¤ª¤¤¤Æ¡¢\f2cacerts\fP¥Õ¥¡¥¤¥ë¤Ë¥Ð¥ó¥É¥ë¤µ¤ì¤Æ¤¤¤ë¿®Íê¤Ç¤­¤ë¥ë¡¼¥ÈCA¾ÚÌÀ½ñ¤ò¸¡¾Ú¤·¡¢¿®ÍêÀ­¤Ë´Ø¤¹¤ëÆȼ«¤Î·èÄê¤ò¹Ô¤¤¤Þ¤¹¡£¿®Íê¤Ç¤­¤Ê¤¤CA¾ÚÌÀ½ñ¤ò\f2cacerts\fP¥Õ¥¡¥¤¥ë¤«¤éºï½ü¤¹¤ë¤Ë¤Ï¡¢\f2keytool\fP¥³¥Þ¥ó¥É¤Îºï½ü¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£\f2cacerts\fP¥Õ¥¡¥¤¥ë¤ÏJRE¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ë¥¢¥¯¥»¥¹¸¢¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢¥·¥¹¥Æ¥à´ÉÍý¼Ô¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 2
++o
++\f3¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈRFC 1421¾ÚÌÀ½ñÉä¹æ²½µ¬³Ê\fP
++.LP
++¿¤¯¤Î¾ì¹ç¡¢¾ÚÌÀ½ñ¤Ï¡¢¥Ð¥¤¥Ê¥êÉä¹æ²½¤Ç¤Ï¤Ê¤¯¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈRFC 1421µ¬³Ê¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë½ÐÎϲÄǽÉä¹æ²½Êý¼°¤ò»ÈÍѤ·¤Æ³ÊǼ¤µ¤ì¤Þ¤¹¡£¡ÖBase 64Éä¹æ²½¡×¤È¤â¸Æ¤Ð¤ì¤ë¤³¤Î¾ÚÌÀ½ñ·Á¼°¤Ç¤Ï¡¢ÅŻҥ᡼¥ë¤ä¤½¤Î¾¤Îµ¡¹½¤òÄ̤¸¤Æ¡¢Â¾¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¾ÚÌÀ½ñ¤òÍưפ˥¨¥¯¥¹¥Ý¡¼¥È¤Ç¤­¤Þ¤¹¡£
++.LP
++\f2\-importcert\fP¤È\f2\-printcert\fP¥³¥Þ¥ó¥É¤Ç¤Ï¡¢¤³¤Î·Á¼°¤Î¾ÚÌÀ½ñ¤È¥Ð¥¤¥Ê¥êÉä¹æ²½¤Î¾ÚÌÀ½ñ¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++\f2\-exportcert\fP¥³¥Þ¥ó¥É¤Ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¥Ð¥¤¥Ê¥êÉä¹æ²½¤Î¾ÚÌÀ½ñ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢\f2\-rfc\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢½ÐÎϲÄǽÉä¹æ²½Êý¼°¤Î¾ÚÌÀ½ñ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.LP
++\f2\-list\fP¥³¥Þ¥ó¥É¤Ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¾ÚÌÀ½ñ¤ÎSHA1¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£\f2\-v\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢¿Í´Ö¤¬Æɤळ¤È¤Î¤Ç¤­¤ë·Á¼°¤Ç¾ÚÌÀ½ñ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£°ìÊý¡¢\f2\-rfc\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢½ÐÎϲÄǽÉä¹æ²½Êý¼°¤Ç¾ÚÌÀ½ñ¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.LP
++½ÐÎϲÄǽÉä¹æ²½Êý¼°¤ÇÉä¹æ²½¤µ¤ì¤¿¾ÚÌÀ½ñ¤Ï¡¢¼¡¤Î¹Ô¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
++.fl
++\fP
++.fi
++.LP
++ºÇ¸å¤Ï¡¢¼¡¤Î¹Ô¤Ç½ª¤ï¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++\-\-\-\-\-END CERTIFICATE\-\-\-\-\-
++.fl
++\fP
++.fi
++.RE
++
++.LP
++.SS
++X.500¼±ÊÌ̾
++.LP
++.LP
++X.500¼±ÊÌ̾¤Ï¡¢¥¨¥ó¥Æ¥£¥Æ¥£¤òÆÃÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢X.509¾ÚÌÀ½ñ¤Î\f2subject\fP¥Õ¥£¡¼¥ë¥É¤È\f2issuer\fP(½ð̾¼Ô)¥Õ¥£¡¼¥ë¥É¤Ç»ØÄꤵ¤ì¤ë̾Á°¤Ï¡¢X.500¼±ÊÌ̾¤Ç¤¹¡£\f3keytool\fP¤Ï¡¢¼¡¤Î¥µ¥Ö¥Ñ¡¼¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++\f2commonName\fP \- ¿Í¤ÎÄ̾Ρ£¡ÖSusan Jones¡×¤Ê¤É
++.TP 2
++o
++\f2organizationUnit\fP \- ¾®¤µ¤ÊÁÈ¿¥(Éô¡¢²Ý¤Ê¤É)¤Î̾¾Î¡£¡ÖPurchasing¡×¤Ê¤É
++.TP 2
++o
++\f2organizationName\fP \- Â礭¤ÊÁÈ¿¥¤Î̾¾Î¡£¡ÖABCSystems,Inc.¡×¤Ê¤É
++.TP 2
++o
++\f2localityName\fP \- ÃÏ°è(ÅÔ»Ô)̾¡£¡ÖPalo Alto¡×¤Ê¤É
++.TP 2
++o
++\f2stateName\fP \- ½£Ì¾¤Þ¤¿¤ÏÃÏÊý̾¡£¡ÖCalifornia¡×¤Ê¤É
++.TP 2
++o
++\f2country\fP \- 2ʸ»ú¤Î¹ñÈֹ档¡ÖCH¡×¤Ê¤É
++.RE
++
++.LP
++.LP
++¼±ÊÌ̾ʸ»úÎó¤ò\f2\-dname\fP¥ª¥×¥·¥ç¥ó¤ÎÃͤȤ·¤Æ»ØÄꤹ¤ë¾ì¹ç¤Ï(\f2\-genkeypair\fP ¥³¥Þ¥ó¥É)¡¢¼¡¤Î·Á¼°¤Ç»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++CN=\fP\f4cName\fP\f3, OU=\fP\f4orgUnit\fP\f3, O=\fP\f4org\fP\f3, L=\fP\f4city\fP\f3, S=\fP\f4state\fP\f3, C=\fP\f4countryCode\fP\f3
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥¤¥¿¥ê¥Ã¥¯ÂΤιàÌܤϡ¢¼ÂºÝ¤Ë»ØÄꤹ¤ëÃͤòɽ¤·¤Þ¤¹¡£Ã»½Ì·Á¤Î¥­¡¼¥ï¡¼¥É¤Î°ÕÌ£¤Ï¡¢¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ CN=commonName
++.fl
++ OU=organizationUnit
++.fl
++ O=organizationName
++.fl
++ L=localityName
++.fl
++ S=stateName
++.fl
++ C=country
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¼¡¤Ë¼¨¤¹¤Î¤Ï¡¢¼±ÊÌ̾ʸ»úÎó¤ÎÎã¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino, S=California, C=US
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¼¡¤Ï¡¢¤³¤Îʸ»úÎó¤ò»ÈÍѤ·¤¿¥³¥Þ¥ó¥É¤ÎÎã¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++keytool \-genkeypair \-dname "CN=Mark Smith, OU=Java, O=Oracle, L=Cupertino,
++.fl
++S=California, C=US" \-alias mark
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥­¡¼¥ï¡¼¥É¤Îû½Ì·Á¤Ç¤Ï¡¢Âçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢CN¡¢cn¤ª¤è¤ÓCn¤Ï¡¢¤É¤ì¤âƱ¤¸¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
++.LP
++.LP
++°ìÊý¡¢¥­¡¼¥ï¡¼¥É¤Î»ØÄê½ç½ø¤Ë¤Ï°ÕÌ£¤¬¤¢¤ê¡¢³Æ¥µ¥Ö¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Ï¾å¤Ë¼¨¤·¤¿½ç½ø¤Ç»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤À¤·¡¢¥µ¥Ö¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò¤¹¤Ù¤Æ»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë°ìÉô¤Î¥µ¥Ö¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¤ß¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++CN=Steve Meier, OU=Java, O=Oracle, C=US
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¼±ÊÌ̾ʸ»úÎó¤ÎÃͤ˥«¥ó¥Þ¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¤Ë¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Çʸ»úÎó¤ò»ØÄꤹ¤ë¤È¤­¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¥«¥ó¥Þ¤òʸ»ú¡Ö\\¡×¤Ç¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ cn=Peter Schuster, ou=Java\\, Product Development, o=Oracle, c=US
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¼±ÊÌ̾ʸ»úÎó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£¼±ÊÌ̾¤òɬÍפȤ¹¤ë¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¼±ÊÌ̾¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢³Æ¥µ¥Ö¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï¡¢¥«¥ó¥Þ¤ò¡Ö\\¡×¤Ç¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
++.LP
++.SS
++¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤Î¥¤¥ó¥Ý¡¼¥È¤Ë´Ø¤¹¤ëÃí°Õ»ö¹à
++.LP
++.LP
++½ÅÍ×: ¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤È¤·¤Æ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëÁ°¤Ë¡¢¾ÚÌÀ½ñ¤ÎÆâÍƤò¿µ½Å¤ËÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++¤Þ¤º¡¢¾ÚÌÀ½ñ¤ÎÆâÍƤòɽ¼¨¤·(\f2\-printcert\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤«¡¢¤Þ¤¿¤Ï\f2\-noprompt\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç\f2\-importcert\fP¥³¥Þ¥ó¥É¤ò»ÈÍÑ)¡¢É½¼¨¤µ¤ì¤¿¾ÚÌÀ½ñ¤Î¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬¡¢´üÂÔ¤µ¤ì¤ë¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¤¢¤ë¥æ¡¼¥¶¡¼¤«¤é¾ÚÌÀ½ñ¤¬Á÷¤é¤ì¤Æ¤­¤Æ¡¢¤³¤Î¾ÚÌÀ½ñ¤ò\f2/tmp/cert\fP¤È¤¤¤¦Ì¾Á°¤Ç¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤·¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï¡¢¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¤³¤Î¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë¡¢\f2\-printcert\fP¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤òɽ¼¨¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ keytool \-printcert \-file /tmp/cert
++.fl
++ Owner: CN=ll, OU=ll, O=ll, L=ll, S=ll, C=ll
++.fl
++ Issuer: CN=ll, OU=ll, O=ll, L=ll, S=ll, C=ll
++.fl
++ Serial Number: 59092b34
++.fl
++ Valid from: Thu Sep 25 18:01:13 PDT 1997 until: Wed Dec 24 17:01:13 PST 1997
++.fl
++ Certificate Fingerprints:
++.fl
++ MD5: 11:81:AD:92:C8:E5:0E:A2:01:2E:D4:7A:D7:5F:07:6F
++.fl
++ SHA1: 20:B6:17:FA:EF:E5:55:8A:D0:71:1F:E8:D6:9D:C0:37:13:0E:5E:FE
++.fl
++ SHA256: 90:7B:70:0A:EA:DC:16:79:92:99:41:FF:8A:FE:EB:90:
++.fl
++ 17:75:E0:90:B2:24:4D:3A:2A:16:A6:E4:11:0F:67:A4
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¼¡¤Ë¡¢¾ÚÌÀ½ñ¤òÁ÷¿®¤·¤¿¿Íʪ¤ËÏ¢Íí¤·¡¢¤³¤Î¿Íʪ¤¬Ä󼨤·¤¿¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¡¢¾å¤Î¥³¥Þ¥ó¥É¤Çɽ¼¨¤µ¤ì¤¿¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤È¤òÈæ³Ó¤·¤Þ¤¹¡£¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤¬°ìÃפ¹¤ì¤Ð¡¢Á÷¿®ÅÓÃæ¤Ç¾¤Î²¿¼Ô¤«(¹¶·â¼Ô¤Ê¤É)¤Ë¤è¤ë¾ÚÌÀ½ñ¤Î¤¹¤êÂؤ¨¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£Á÷¿®ÅÓÃæ¤Ç¤³¤Î¼ï¤Î¹¶·â¤¬¹Ô¤ï¤ì¤Æ¤¤¤¿¾ì¹ç¡¢¥Á¥§¥Ã¥¯¤ò¹Ô¤ï¤º¤Ë¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤È¡¢¹¶·â¼Ô¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¤â¤Î(¹¶·âŪ°Õ¿Þ¤ò»ý¤Ä¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤ÀJAR¥Õ¥¡¥¤¥ë¤Ê¤É)¤ò¿®Íꤹ¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++Ãí°Õ: ¾ÚÌÀ½ñ¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëÁ°¤Ë\f2\-printcert\fP¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£¥­¡¼¥¹¥È¥¢Æâ¤Î¿®Íê¤Ç¤­¤ë¾ÚÌÀ½ñ¤Î¥ê¥¹¥È¤Ë¾ÚÌÀ½ñ¤òÄɲ乤ëÁ°¤Ë\f2\-importcert\fP¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢¾ÚÌÀ½ñ¤Î¾ðÊó¤¬É½¼¨¤µ¤ì¡¢³Îǧ¤òµá¤á¤ë¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£¥¤¥ó¥Ý¡¼¥ÈÁàºî¤Ï¡¢¤³¤Î»þÅÀ¤ÇÃæ»ß¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢³Îǧ¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤ë¤Î¤Ï¡¢\f2\-importcert\fP¥³¥Þ¥ó¥É¤ò\f2\-noprompt\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤻ¤º¤Ë¼Â¹Ô¤·¤¿¾ì¹ç¤Î¤ß¤Ç¤¹¡£¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¡¢\f2\-noprompt\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥æ¡¼¥¶¡¼¤È¤ÎÂÐÏäϹԤï¤ì¤Þ¤»¤ó¡£
++.LP
++.SS
++¥Ñ¥¹¥ï¡¼¥É¤Ë´Ø¤¹¤ëÃí°Õ»ö¹à
++.LP
++.LP
++¥­¡¼¥¹¥È¥¢¤ËÂФ¹¤ëÁàºî¤ò¹Ô¤¦¤Û¤È¤ó¤É¤Î¥³¥Þ¥ó¥É¤Ç¤Ï¡¢¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹¡£¤Þ¤¿¡¢°ìÉô¤Î¥³¥Þ¥ó¥É¤Ç¤Ï¡¢Èó¸ø³«/ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤¬É¬Íפˤʤ뤳¤È¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++¥Ñ¥¹¥ï¡¼¥É¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄê¤Ç¤­¤Þ¤¹(¥¹¥È¥¢¤Î¥Ñ¥¹¥ï¡¼¥É¤Ë¤Ï\f2\-storepass\fP¥ª¥×¥·¥ç¥ó¡¢ÈëÌ©¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤Ë¤Ï\f2\-keypass\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍÑ)¡£¤¿¤À¤·¡¢¥Æ¥¹¥È¤òÌÜŪ¤È¤¹¤ë¾ì¹ç¡¢¤Þ¤¿¤Ï°ÂÁ´¤Ç¤¢¤ë¤³¤È¤¬¤ï¤«¤Ã¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¼Â¹Ô¤¹¤ë¾ì¹ç°Ê³°¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ä¥¹¥¯¥ê¥×¥È¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++ɬÍפʥѥ¹¥ï¡¼¥É¤Î¥ª¥×¥·¥ç¥ó¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.LP
++.SS
++¾ÚÌÀ½ñ¤Î½àµò¤Ë´Ø¤¹¤ëÃí°Õ»ö¹à
++.LP
++.LP
++¥¤¥ó¥¿¡¼¥Í¥Ã¥Èɸ½à¤Î
++.na
++\f2RFC 5280\fP @
++.fi
++http://tools.ietf.org/rfc/rfc5280.txt¤Ç¤Ï¡¢X.509¾ÚÌÀ½ñ¤¬½àµò¤¹¤ë¥×¥í¥Õ¥¡¥¤¥ë¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥×¥í¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤Î¥Õ¥£¡¼¥ë¥É¤ä¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¤ÇÍ­¸ú¤ÊÃͤäÃͤÎÁȹ礻¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£\f3keytool\fP¤Ç¤Ï¡¢¤³¤ì¤é¤Î¤¹¤Ù¤Æ¤Îµ¬Â§¤¬Å¬ÍѤµ¤ì¤Æ¤¤¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢É¸½à¤Ë½àµò¤·¤Ê¤¤¾ÚÌÀ½ñ¤¬À¸À®¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¡¢¤½¤Î¤è¤¦¤Ê¾ÚÌÀ½ñ¤ÏJRE¤ä¾¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÇµñÈݤµ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤Ï¡¢\f2\-dname\fP¤ä\f2\-ext\fP¤Ê¤É¤ÇŬÀµ¤Ê¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++jar(1)¥Ä¡¼¥ë¤Î¥É¥­¥å¥á¥ó¥È
++.TP 2
++o
++jarsigner(1)¥Ä¡¼¥ë¤Î¥É¥­¥å¥á¥ó¥È
++.TP 2
++o
++\f3keytool\fP¤Î»ÈÍÑÎã¤Ë¤Ä¤¤¤Æ¤Ï¡¢
++.na
++\f4Java¥Á¥å¡¼¥È¥ê¥¢¥ë\fP @
++.fi
++http://docs.oracle.com/javase/tutorial/¤Î
++.na
++\f4¥»¥­¥å¥ê¥Æ¥£\fP @
++.fi
++http://docs.oracle.com/javase/tutorial/security/index.html¤ò»²¾È
++.RE
++
++.LP
++.SH "Êѹ¹ÅÀ"
++.LP
++.LP
++Java SE 6¤Çkeytool¤Î¥³¥Þ¥ó¥É¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£
++.LP
++.LP
++\f3keytool\fP¤Ï¡¢¥æ¡¼¥¶¡¼¤¬¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ¹¤ëºÝ¤Ë¤½¤ÎÆþÎÏÆâÍƤòɽ¼¨¤·¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£¥æ¡¼¥¶¡¼¤Ï¥Ñ¥¹¥ï¡¼¥ÉÆþÎÏ»þ¤Ë¤½¤ÎÆþÎÏÆâÍƤò³Îǧ¤Ç¤­¤Ê¤¯¤Ê¤Ã¤¿¤¿¤á¡¢½é´ü¥­¡¼¥¹¥È¥¢¡¦¥Ñ¥¹¥ï¡¼¥É¤òÀßÄꤷ¤¿¤ê¸°¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤·¤¿¤ê¤¹¤ë¤Ê¤É¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÀßÄê¤äÊѹ¹¤ò¹Ô¤¦¤¿¤Ó¤Ë¥Ñ¥¹¥ï¡¼¥É¤ÎºÆÆþÎϤòµá¤á¤é¤ì¤Þ¤¹¡£
++.LP
++.LP
++Êѹ¹¤µ¤ì¤¿¥³¥Þ¥ó¥É¤ÎÃæ¤Ë¤Ï¡¢Ì¾Á°¤Î¤ß¤¬Êѹ¹¤µ¤ì¤¿¤â¤Î¤â¤¢¤ì¤Ð¡¢Çѻߤµ¤ì¤Æ¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ëµ­ºÜ¤µ¤ì¤Ê¤¯¤Ê¤Ã¤¿¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£°ÊÁ°¤Î¤¹¤Ù¤Æ¤Î¥³¥Þ¥ó¥É(̾Á°¤¬Êѹ¹¤µ¤ì¤¿¤â¤Î¤ÈÇѻߤµ¤ì¤¿¤â¤Î¤ÎξÊý)¤Ï¡¢¤³¤Î¥ê¥ê¡¼¥¹¤Ç¤â°ú³¤­¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤ª¤ê¡¢º£¸å¤Î¥ê¥ê¡¼¥¹¤Ç¤â¥µ¥Ý¡¼¥È¤µ¤ì¤ëͽÄê¤Ç¤¹¡£keytool¤Î¥³¥Þ¥ó¥É¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹ÅÀ¤Î³µÍפò¡¢¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.LP
++.LP
++̾Á°¤¬Êѹ¹¤µ¤ì¤¿¥³¥Þ¥ó¥É:
++.LP
++.RS 3
++.TP 2
++o
++\f2\-export\fP¤Î̾Á°¤¬\f2\-exportcert\fP¤ËÊѹ¹
++.TP 2
++o
++\f2\-genkey\fP¤Î̾Á°¤¬\f2\-genkeypair\fP¤ËÊѹ¹
++.TP 2
++o
++\f2\-import\fP¤Î̾Á°¤¬\f2\-importcert\fP¤ËÊѹ¹
++.RE
++
++.LP
++.LP
++Çѻߤµ¤ì¤Æ¥É¥­¥å¥á¥ó¥È¤Ëµ­ºÜ¤µ¤ì¤Ê¤¯¤Ê¤Ã¤¿¥³¥Þ¥ó¥É:
++.LP
++.RS 3
++.TP 2
++o
++.na
++\f2\-keyclone\fP @
++.fi
++http://docs.oracle.com/javase/1.5.0/docs/tooldocs/windows/keytool.html#keycloneCmd
++.TP 2
++o
++.na
++\f2\-identitydb\fP @
++.fi
++http://docs.oracle.com/javase/1.5.0/docs/tooldocs/windows/keytool.html#identitydbCmd
++.TP 2
++o
++.na
++\f2\-selfcert\fP @
++.fi
++http://docs.oracle.com/javase/1.5.0/docs/tooldocs/windows/keytool.html#selfcertCmd
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/native2ascii.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/native2ascii.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,54 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH native2ascii 1 "07 May 2011"
++.TH native2ascii 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++native2ascii \- ¥Í¥¤¥Æ¥£¥Ö \- ASCII¥³¥ó¥Ð¡¼¥¿
++.LP
++.LP
++¥µ¥Ý¡¼¥È¤µ¤ì¤ëʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Îʸ»ú¤Î¥Õ¥¡¥¤¥ë¤òASCII¤Þ¤¿¤ÏUnicode¥¨¥¹¥±¡¼¥×¤¢¤ë¤¤¤Ï¤½¤ÎξÊý¤Î¥Õ¥¡¥¤¥ë¤ËÊÑ´¹¤·¤Þ¤¹¡£¤½¤ÎµÕ¤ÎÊÑ´¹¤â¹Ô¤¤¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f4native2ascii\fP\f2 [options] [inputfile [outputfile]]\fP
++.fl
++.fi
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f2native2ascii\fP Java¼Â¹Ô´Ä¶­¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤ëʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ë¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¡¢ASCII¤Ç¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ËÊÑ´¹¤·¤Þ¤¹¡£ASCIIʸ»ú¥»¥Ã¥È¤Î°ìÉô¤Ç¤Ê¤¤¤¹¤Ù¤Æ¤Îʸ»ú¤ÇUnicode¥¨¥¹¥±¡¼¥×(¡Ö\\uxxxx¡×¤Îɽµ­)¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¥×¥í¥»¥¹¤Ï¡¢ISO\-8859\-1ʸ»ú¥»¥Ã¥È¤Ë´Þ¤Þ¤ì¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥×¥í¥Ñ¥Æ¥£¡¦¥Õ¥¡¥¤¥ë¤ÇɬÍפǤ¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï¡¢¤½¤ÎµÕ¤ÎÊÑ´¹¤ò¼Â¹Ô¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f2outputfile\fP¤ò¾Êά¤·¤¿¾ì¹ç¡¢É¸½à½ÐÎϤ˽ÐÎϤµ¤ì¤Þ¤¹¡£¤µ¤é¤Ë¡¢\f2inputfile\fP¤ò¾Êά¤·¤¿¾ì¹ç¡¢É¸½àÆþÎϤ«¤éÆþÎϤµ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-reverse
++µÕ¤Î½èÍý¤ò¹Ô¤¤¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢ISO\-8859\-1¤ÇUnicode¥¨¥¹¥±¡¼¥×¤ò»ÈÍѤ·¤Æ¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¡¢Java¼Â¹Ô´Ä¶­¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤ëʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¥Õ¥¡¥¤¥ë¤ËÊÑ´¹¤·¤Þ¤¹¡£
++.br
++.br
++.TP 3
++\-encoding encoding_name
++ÊÑ´¹½èÍý¤Ç»ÈÍѤ¹¤ëʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Îʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°(\f2java.nio.charset.Charset.defaultCharset\fP¥á¥½¥Ã¥É¤ÇÄêµÁ¤µ¤ì¤ë)¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£\f2encoding_name\fPʸ»úÎó¤Ï¡¢
++.na
++\f4¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ëʸ»úÎ󥨥󥳡¼¥Ç¥£¥ó¥°\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html¡¦¥É¥­¥å¥á¥ó¥È¤Ë¼¨¤µ¤ì¤Æ¤¤¤ë¡¢Java¼Â¹Ô´Ä¶­¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤ëʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î̾Á°¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.br
++.br
++.TP 3
++\-Joption
++Java²¾ÁÛ¥Þ¥·¥ó¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£\f2option\fP¤Ë¤Ï¡¢java(1)¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò1¤Ä»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/orbd.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/orbd.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,350 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH orbd 1 "07 May 2011"
++.TH orbd 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++orbd \- The Object Request Broker Daemon
++.LP
++.LP
++\f3orbd\fP¤Ï¡¢CORBA´Ä¶­¤Î¥µ¡¼¥Ð¡¼¤Ë¤¢¤ë±Ê³¥ª¥Ö¥¸¥§¥¯¥È¤ò¥¯¥é¥¤¥¢¥ó¥È¤«¤éÆ©²áŪ¤Ë¸¡º÷¤·¤Æ¸Æ¤Ó½Ð¤»¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.LP
++\f3´ØÏ¢¹àÌÜ:\fP
++.na
++\f2¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++orbd <\fP\f3options\fP\f3>
++.fl
++\fP
++.fi
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3orbd\fP¥Ä¡¼¥ë¤Ë´Þ¤Þ¤ì¤ë¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã¤ò»ÈÍѤ¹¤ë¤È¡¢¥¯¥é¥¤¥¢¥ó¥È¤ÏCORBA´Ä¶­¤Ç¥µ¡¼¥Ð¡¼¾å¤Ë¤¢¤ë±Ê³¥ª¥Ö¥¸¥§¥¯¥È¤òÆ©²áŪ¤Ë¸¡º÷¤·¤Æ¸Æ¤Ó½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£±Ê³¥µ¡¼¥Ð¡¼¤Ï¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ë±Ê³¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤òȯ¹Ô¤¹¤ëºÝ¡¢¥µ¡¼¥Ð¡¼¤Î¥Ý¡¼¥ÈÈÖ¹æ¤Î¤«¤ï¤ê¤ËORBD¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤Ë´Þ¤á¤Þ¤¹¡£±Ê³¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤Î¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤ËORBD¥Ý¡¼¥ÈÈÖ¹æ¤ò´Þ¤á¤ë¤³¤È¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ÊÍøÅÀ¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ë¤¢¤ë¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤¬¡¢¥µ¡¼¥Ð¡¼¤Î¥é¥¤¥Õ¡¦¥µ¥¤¥¯¥ë¤È̵´Ø·¸¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤Ï¡¢½é¤á¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¤È¤­¤Ï¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Î¥µ¡¼¥Ð¡¼¤Ë¤è¤Ã¤Æ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ëȯ¹Ô¤µ¤ì¤Þ¤¹¤¬¡¢¤½¤Î¸å¤Ï¡¢¥µ¡¼¥Ð¡¼¤Î³«»Ï¤Þ¤¿¤Ï¥·¥ã¥Ã¥È¥À¥¦¥ó¤Î²ó¿ô¤Ë¤«¤«¤ï¤é¤º¡¢¸Æ¤Ó½Ð¤·¤¿¥¯¥é¥¤¥¢¥ó¥È¤ËORBD¤¬¤¤¤Ä¤Ç¤âÀµ¤·¤¤¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤òÊÖ¤·¤Þ¤¹¡£
++.TP 2
++o
++¥¯¥é¥¤¥¢¥ó¥È¤Ï°ìÅ٤Τߥ͡¼¥ß¥ó¥°¡¦¥µ¡¼¥Ó¥¹¤Î¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤ò¥ë¥Ã¥¯¥¢¥Ã¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¤½¤Î¸å¤Ï¥µ¡¼¥Ð¡¼¤Î¥é¥¤¥Õ¡¦¥µ¥¤¥¯¥ë¤Ë¤è¤ëÊѹ¹¤È¤Ï̵´Ø·¸¤Ë¤³¤Î»²¾È¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++ORBD¤Î¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¡¢servertool(1)¤ò»ÈÍѤ·¤Æ¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£servertool¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥×¥í¥°¥é¥Þ¤¬¡¢±Ê³¥µ¡¼¥Ð¡¼¤ÎÅÐÏ¿¡¢ÅÐÏ¿²ò½ü¡¢µ¯Æ°¤ª¤è¤Ó¥·¥ã¥Ã¥È¥À¥¦¥ó¤ò¹Ô¤¦¤¿¤á¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤¹¡£¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã¤Î¾ÜºÙ¤Ï¡¢¤³¤Î¥É¥­¥å¥á¥ó¥È¤Î\f2¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã\fP¤È¤¤¤¦¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++\f2orbd\fP¤òµ¯Æ°¤¹¤ë¤È¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤âµ¯Æ°¤µ¤ì¤Þ¤¹¡£¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.SS
++ɬ¿Ü¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-ORBInitialPort nameserverport
++¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤¹¤ë¥Ý¡¼¥È¤ÎÈÖ¹æ¤ò»ØÄꤷ¤Þ¤¹¡£\f2orbd\fP¤Ï¡¢µ¯Æ°¤µ¤ì¤ë¤È¡¢¤³¤Î¥Ý¡¼¥È¾å¤ÇÃå¿®¥ê¥¯¥¨¥¹¥È¤òÂÔµ¡¤·¤Þ¤¹¡£Solaris¥½¥Õ¥È¥¦¥§¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢1024¤è¤ê¾®¤µ¤¤¥Ý¡¼¥È¾å¤Ç¥×¥í¥»¥¹¤ò³«»Ï¤¹¤ë¤Ë¤Ï¡¢root¥æ¡¼¥¶¡¼¤Ë¤Ê¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢1024°Ê¾å¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£(ɬ¿Ü)
++.RE
++
++.LP
++.LP
++
++.LP
++.SS
++¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-port port
++ORBD¤òµ¯Æ°¤¹¤ë¥Ý¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥Ý¡¼¥È¤Ç¡¢±Ê³¥ª¥Ö¥¸¥§¥¯¥È¤ËÂФ¹¤ë¥ê¥¯¥¨¥¹¥È¤òORBD¤¬¼õ¤±¼è¤ê¤Þ¤¹¡£¤³¤Î¥Ý¡¼¥È¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤÏ1049¤Ç¤¹¡£¤³¤Î¥Ý¡¼¥ÈÈÖ¹æ¤Ï¡¢±Ê³Interoperable Object References(IOR)¤Î¥Ý¡¼¥È¡¦¥Õ¥£¡¼¥ë¥É¤ËÄɲ䵤ì¤Þ¤¹¡£(¾Êά²Ä)
++.RE
++
++.LP
++.RS 3
++.TP 3
++\-defaultdb directory
++ORBD±Ê³³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê\f2orb.db\fP¤¬ºîÀ®¤µ¤ì¤ë¥Ù¡¼¥¹¡¦¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥ÈÃͤϡÖ./orb.db¡×¤Ë¤Ê¤ê¤Þ¤¹¡£(¾Êά²Ä)
++.RE
++
++.LP
++.RS 3
++.TP 3
++\-serverPollingTime milliseconds
++\f2servertool\fP¤ò»ÈÍѤ·¤ÆÅÐÏ¿¤µ¤ì¤¿±Ê³¥µ¡¼¥Ð¡¼¤¬Àµ¾ï¤ËÆ°ºî¤·¤Æ¤¤¤ë¤³¤È¤òORBD¤¬³Îǧ¤¹¤ë²ó¿ô¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥ÈÃͤÏ1,000¥ß¥êÉäǤ¹¡£\f2milliseconds\fP¤Ë»ØÄꤹ¤ëÃͤϡ¢Í­¸ú¤ÊÀµ¤ÎÀ°¿ô¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£(¾Êά²Ä)
++.RE
++
++.LP
++.RS 3
++.TP 3
++\-serverStartupDelay milliseconds
++\f2servertool\fP¤ò»ÈÍѤ·¤ÆÅÐÏ¿¤µ¤ì¤¿±Ê³¥µ¡¼¥Ð¡¼¤òºÆµ¯Æ°¤·¤Æ¤«¤é¡¢°ÌÃÖžÁ÷¤ÎÎã³°¤òÁ÷¿®¤¹¤ë¤Þ¤Ç¤ÎORBD¤ÎÂÔµ¡»þ´Ö¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥ÈÃͤÏ1,000¥ß¥êÉäǤ¹¡£\f2milliseconds\fP¤Ë»ØÄꤹ¤ëÃͤϡ¢Í­¸ú¤ÊÀµ¤ÎÀ°¿ô¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£(¾Êά²Ä)
++.RE
++
++.LP
++.RS 3
++.TP 3
++\-Joption
++Java²¾ÁÛ¥Þ¥·¥ó¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£\f2option\fP¤Ë¤Ï¡¢java(1)¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò1¤Ä»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f3\-J\fP¤ò»ÈÍѤ·¤ÆÇظå¤Î²¾ÁÛ¥Þ¥·¥ó¤Ë¥ª¥×¥·¥ç¥ó¤òÅϤ¹¤³¤È¤Ï¤è¤¯¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
++.TP 3
++
++.RE
++
++.LP
++.SH "¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Îµ¯Æ°¤ÈÄä»ß"
++.LP
++.LP
++¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ï¡¢
++.na
++\f2CORBA¥ª¥Ö¥¸¥§¥¯¥È\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object¤Ë¥Í¡¼¥ß¥ó¥°¤ò²Äǽ¤Ë¤¹¤ëCORBA¥µ¡¼¥Ó¥¹¤Ç¤¹¡£¥Í¡¼¥ß¥ó¥°¤Ï̾Á°¤ò¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤Ë¥Ð¥¤¥ó¥É¤¹¤ë¤³¤È¤Ë¤è¤ê²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£
++.na
++\f2¥Í¡¼¥à¡¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding¤ò¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ë³ÊǼ¤¹¤ì¤Ð¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬Ì¾Á°¤ò»ØÄꤷ¤ÆÌÜŪ¤Î¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤ò¼èÆÀ¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++ORBD¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Þ¤¿¤Ï¥µ¡¼¥Ð¡¼¤ò¼Â¹Ô¤¹¤ëÁ°¤Ëµ¯Æ°¤·¤Þ¤¹¡£ORBD¤Ë¤Ï¡¢±Ê³¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ª¤è¤Ó°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤é¤Ï¤É¤Á¤é¤âCOS¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Î¼ÂÁõ¤Ç¤¹¡£
++.LP
++.LP
++\f4±Ê³\fP\f3¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹\fP¤Ï¡¢¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤ËÂФ·¤Æ±Ê³À­¤òÄ󶡤·¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¤³¤Î¾ðÊó¤Ï¡¢¥µ¡¼¥Ó¥¹¤ÎÄä»ß¤äµ¯Æ°¸å¤Ë¤â°Ý»ý¤µ¤ì¡¢¥µ¡¼¥Ó¥¹¤Ë¾ã³²¤¬È¯À¸¤·¤¿¾ì¹ç¤Ç¤â²óÉü¤Ç¤­¤Þ¤¹¡£ORBD¤òºÆµ¯Æ°¤¹¤ë¤È¡¢±Ê³¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ï¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤Î¥°¥é¥Õ¤òÉü¸µ¤·¡¢¤¹¤Ù¤Æ¤Î¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡¼¤Î̾Á°¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤¬¤½¤Î¤Þ¤Þ(±Ê³Ū¤Ë)ÊÝ»ý¤µ¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.LP
++\
++.LP
++.LP
++²¼°Ì¸ß´¹À­¤Î¤¿¤á¡¢µì¥Ð¡¼¥¸¥ç¥ó¤ÎJDK¤ËƱº­¤µ¤ì¤Æ¤¤¤¿\f4°ì»þ\fP\f3¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹\fP\f2tnameserv\fP¤¬¡¢º£²ó¤Î¥ê¥ê¡¼¥¹¤ÎJ2SE¤Ë¤âƱº­¤µ¤ì¤Æ¤¤¤Þ¤¹¡£°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ç¤Ï¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Î¼Â¹ÔÃæ¤Ë¤Î¤ß¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤¬ÊÝ»ý¤µ¤ì¤Þ¤¹¡£¥µ¡¼¥Ó¥¹¤¬ÃæÃǤµ¤ì¤ë¤È¡¢¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¡¦¥°¥é¥Õ¤Ï¼º¤ï¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f2\-ORBInitialPort\fP°ú¿ô¤Ï¡¢\f2orbd\fP¤Îɬ¿Ü¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤Ç¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤¬¼Â¹Ô¤µ¤ì¤ë¥Ý¡¼¥È¤ÎÈÖ¹æ¤òÀßÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£¼¡¤Î¼ê½ç¤Ç¤Ï¡¢Java\ IDL Object Request Broker DaemonÍѤ˥ݡ¼¥È1050¤ò»ÈÍѤǤ­¤ë¤³¤È¤òÁ°Äó¤È¤·¤Æ¤¤¤Þ¤¹¡£Solaris¥½¥Õ¥È¥¦¥§¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢1024¤è¤ê¾®¤µ¤¤¥Ý¡¼¥È¾å¤Ç¥×¥í¥»¥¹¤ò³«»Ï¤¹¤ë¤Ë¤Ï¡¢root¥æ¡¼¥¶¡¼¤Ë¤Ê¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢1024°Ê¾å¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£É¬ÍפǤ¢¤ì¤ÐÊ̤Υݡ¼¥È¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++UNIX¥³¥Þ¥ó¥É¡¦¥·¥§¥ë¤Ç\f2orbd\fP¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ orbd \-ORBInitialPort 1050&
++.fl
++\fP
++.fi
++
++.LP
++.LP
++Windows¤ÎMS\-DOS¥·¥¹¥Æ¥à¡¦¥×¥í¥ó¥×¥È¤Ç¤Ï¡¢¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ start orbd \-ORBInitialPort 1050
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤ì¤ÇORBD¤¬¼Â¹Ô¤µ¤ì¡¢¥µ¡¼¥Ð¡¼¤È¥¯¥é¥¤¥¢¥ó¥È¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡¼¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢¼Â¹Ô»þ¤Ë¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥Ý¡¼¥È¤ÎÈÖ¹æ(ɬÍפʾì¹ç¤Ï¤µ¤é¤Ë¥Þ¥·¥ó̾)¤òǧ¼±¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤ò¼Â¸½¤¹¤ë1¤Ä¤ÎÊýË¡¤Ï¡¢¼¡¤Î¥³¡¼¥É¤ò¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ËÄɲ乤뤳¤È¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ Properties props = new Properties();
++.fl
++ props.put("org.omg.CORBA.ORBInitialPort", "1050");
++.fl
++ props.put("org.omg.CORBA.ORBInitialHost", "MyHost");
++.fl
++ ORB orb = ORB.init(args, props);
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ï¡¢¥Û¥¹¥ÈMyHost¤Î¥Ý¡¼¥È1050¾å¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£Ê̤ÎÊýË¡¤È¤·¤Æ¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¥µ¡¼¥Ð¡¼¤Þ¤¿¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¡¢¥Ý¡¼¥ÈÈÖ¹æ¤Þ¤¿¤Ï¥Þ¥·¥ó̾¤¢¤ë¤¤¤Ï¤½¤ÎξÊý¤ò»ØÄꤹ¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢¡ÖHelloApplication¡×¤òµ¯Æ°¤Ç¤­¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ java HelloApplication \-ORBInitialPort 1050 \-ORBInitialHost MyHost
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤òÄä»ß¤¹¤ë¤Ë¤Ï¡¢Å¬Àڤʥª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¡¦¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢Solaris¾å¤Ç\f2pkill orbd\fP¤ò¼Â¹Ô¤·¤¿¤ê¡¢\f2orbd\fP¤¬Æ°ºîÃæ¤ÎDOS¥¦¥£¥ó¥É¥¦¤Ç\f2[Ctrl]+[C]\fP¥­¡¼¤ò²¡¤·¤Þ¤¹¡£°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Î¾ì¹ç¤Ï¡¢¥µ¡¼¥Ó¥¹¤¬½ªÎ»¤µ¤ì¤ë¤È¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ËÅÐÏ¿¤µ¤ì¤¿Ì¾Á°¤¬¾Ãµî¤µ¤ì¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£Java IDL¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ï¡¢ÌÀ¼¨Åª¤ËÄä»ß¤µ¤ì¤ë¤Þ¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++ORBD¤Ë´Þ¤Þ¤ì¤ë¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã"
++.LP
++.LP
++ORBD¤Î¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã¤Ë¥¢¥¯¥»¥¹¤·¤Æ¡¢±Ê³¥µ¡¼¥Ð¡¼¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢servertool(1)¤ò»ÈÍѤ·¤Æ¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£servertool¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥×¥í¥°¥é¥Þ¤¬¡¢±Ê³¥µ¡¼¥Ð¡¼¤ÎÅÐÏ¿¡¢ÅÐÏ¿²ò½ü¡¢µ¯Æ°¤ª¤è¤Ó¥·¥ã¥Ã¥È¥À¥¦¥ó¤ò¹Ô¤¦¤¿¤á¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤¹¡£\f2servertool\fP¤ò»ÈÍѤ·¤Æ¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤¹¤ë¾ì¹ç¤Ï¡¢\f2orbd\fP¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¾ì½ê¤ÈƱ¤¸¥Ý¡¼¥È¤È¥Û¥¹¥È¤Çµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥µ¡¼¥Ð¡¼¤ò°Û¤Ê¤ë¥Ý¡¼¥È¤Ç¼Â¹Ô¤¹¤ë¤È¡¢¥í¡¼¥«¥ë¡¦¥³¥ó¥Æ¥­¥¹¥ÈÍѤ˥ǡ¼¥¿¥Ù¡¼¥¹¤ËÊݸ¤µ¤ì¤Æ¤¤¤ë¾ðÊó¤¬Ìµ¸ú¤Ë¤Ê¤ê¡¢¥µ¡¼¥Ó¥¹¤¬Àµ¤·¤¯Æ°ºî¤·¤Þ¤»¤ó¡£
++.LP
++.SS
++¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã: Îã
++.LP
++.LP
++¥Ç¥âÍѤÎ
++.na
++\f2¥µ¥ó¥×¥ë¡¦¥Á¥å¡¼¥È¥ê¥¢¥ë\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html¤ò»ÈÍѤ·¡¢¥Á¥å¡¼¥È¥ê¥¢¥ë¤Î¼ê½ç¤Ë½¾¤Ã¤Æ¡¢\f2idlj\fP¥³¥ó¥Ñ¥¤¥é¤È\f2javac\fP¥³¥ó¥Ñ¥¤¥é¤ò¼Â¹Ô¤·¤Þ¤¹¡£¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¼ê½ç¤Ë½¾¤Ã¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2orbd\fP¤òµ¯Æ°¤·¤Þ¤¹¡£
++.LP
++.LP
++UNIX¥³¥Þ¥ó¥É¡¦¥·¥§¥ë¤Ç\f2orbd\fP¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Þ¤¹¡£
++.LP
++.LP
++\
++.LP
++.nf
++\f3
++.fl
++ orbd \-ORBInitialPort 1050
++.fl
++\fP
++.fi
++
++.LP
++.LP
++Windows¤ÎMS\-DOS¥·¥¹¥Æ¥à¡¦¥×¥í¥ó¥×¥È¤Ç¤Ï¡¢¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ start orbd \-ORBInitialPort 1050
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f21050\fP¤Ï¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤ò¼Â¹Ô¤¹¤ë¥Ý¡¼¥È¤Ç¤¹¡£\f2\-ORBInitialPort\fP¤ÏɬÍפʥ³¥Þ¥ó¥É¥é¥¤¥ó¤Î°ú¿ô¤Ç¤¹¡£Solaris¥½¥Õ¥È¥¦¥§¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢1024¤è¤ê¾®¤µ¤¤¥Ý¡¼¥È¾å¤Ç¥×¥í¥»¥¹¤ò³«»Ï¤¹¤ë¤Ë¤Ï¡¢root¥æ¡¼¥¶¡¼¤Ë¤Ê¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢1024°Ê¾å¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2servertool\fP¤òµ¯Æ°¤·¤Þ¤¹¡£
++.LP
++.LP
++Hello¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ servertool \-ORBInitialPort 1050
++.fl
++\fP
++.fi
++
++.LP
++.LP
++Á°²ó¤Î¼ê½ç¤È¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼(\f2orbd\fP)¤Î¥Ý¡¼¥È¤¬Æ±¤¸¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð\f2\-ORBInitialPort 1050\fP¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£\f2servertool\fP¤Ï¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤ÈƱ¤¸¥Ý¡¼¥È¾å¤Çµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f2servertool\fP¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++
++.LP
++.LP
++\f2servertool\fP¥×¥í¥ó¥×¥È¤«¤éHello¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ servertool > register \-server HelloServer \-classpath . \-applicationName
++.fl
++ HelloServerApName
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f2servertool\fP¤Ë¤è¤Ã¤Æ¥µ¡¼¥Ð¡¼¤¬ÅÐÏ¿¤µ¤ì¤Æ¡¢¡ÖHelloServerApName¡×¤È¤¤¤¦Ì¾Á°¤¬¥µ¡¼¥Ð¡¼¤Ë³ä¤êÅö¤Æ¤é¤ì¡¢ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥µ¡¼¥Ð¡¼°ìÍ÷¤È¤È¤â¤Ë¥µ¡¼¥Ð¡¼ID¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++
++.LP
++.LP
++Ê̤ÎüËö¥¦¥£¥ó¥É¥¦¤Þ¤¿¤Ï¥×¥í¥ó¥×¥È¤«¤é¥¯¥é¥¤¥¢¥ó¥È¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.LP
++\
++.LP
++.nf
++\f3
++.fl
++ java HelloClient \-ORBInitialPort 1050 \-ORBInitialHost localhost
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤ÎÎã¤Î\f2\-ORBInitialHost localhost\fP¤Ï¾Êά¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤¬Hello¥¯¥é¥¤¥¢¥ó¥È¤È¤·¤ÆƱ°ì¥Û¥¹¥È¾å¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤«¤é¤Ç¤¹¡£¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤¬Ê̤Υۥ¹¥È¤ÇÆ°ºî¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢IDL¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤¬Æ°ºî¤·¤Æ¤¤¤ë¥Û¥¹¥È¤ò\f2\-ORBInitialHost\fP \f2nameserverhost\fP¤Ç»ØÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++Á°²ó¤Î¼ê½ç¤ÈƱÍͤ˥͡¼¥à¡¦¥µ¡¼¥Ð¡¼(\f2orbd\fP)¤Î¥Ý¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð\f2\-ORBInitialPort 1050\fP¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++\
++.LP
++.LP
++\
++.LP
++.LP
++¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã¤ÎÁàºî¤¬½ªÎ»¤·¤¿¤é¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼(\f2orbd\fP)¤È\f2servertool\fP¤òÄä»ß¤¹¤ë¤«½ªÎ»¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++DOS¥×¥í¥ó¥×¥È¤Ç\f2orbd\fP¤ò¥·¥ã¥Ã¥È¥À¥¦¥ó¤¹¤ë¤Ë¤Ï¡¢¥µ¡¼¥Ð¡¼¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥¦¥£¥ó¥É¥¦¤òÁªÂò¤·¤Æ\f2[Ctrl]+[C]\fP¥­¡¼¤ò²¡¤·¤Þ¤¹¡£UNIX¥·¥§¥ë¤Ç\f2orbd\fP¤ò¥·¥ã¥Ã¥È¥À¥¦¥ó¤¹¤ë¤Ë¤Ï¡¢¥×¥í¥»¥¹¤ò¸¡½Ð¤·¤Æ½ªÎ»(kill)¤·¤Þ¤¹¡£¥µ¡¼¥Ð¡¼¤òÌÀ¼¨Åª¤ËÄä»ß¤¹¤ë¤Þ¤Ç¤Ï¡¢¸Æ½Ð¤·ÂÔµ¡¾õÂÖ¤¬Â³¤­¤Þ¤¹¡£
++.LP
++.LP
++\f2servertool\fP¤ò¥·¥ã¥Ã¥È¥À¥¦¥ó¤¹¤ë¤Ë¤Ï¡¢\f2quit\fP¤ÈÆþÎϤ·¤Æ¥­¡¼¥Ü¡¼¥É¤Î\f2[Enter]\fP¥­¡¼¤ò²¡¤·¤Þ¤¹¡£
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++.na
++\f2¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
++.br
++.TP 2
++o
++servertool(1)
++.RE
++
++.LP
++.br
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/pack200.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/pack200.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,344 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH pack200 1 "07 May 2011"
++.TH pack200 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++pack200 \- JAR¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++½ªÎ»¥¹¥Æ¡¼¥¿¥¹
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.TP 2
++o
++Ãí°Õ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.LP
++\f4pack200\fP\f2 [ \fP\f2options\fP ] \f2output\-file\fP \f2JAR\-file\fP
++.LP
++.LP
++¥ª¥×¥·¥ç¥ó¤Î»ØÄê½ç½ø¤Ë·è¤Þ¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Þ¤¿¤Ïproperties¥Õ¥¡¥¤¥ë¤Ë»ØÄꤵ¤ì¤¿ºÇ¸å¤Î¥ª¥×¥·¥ç¥ó¤¬¡¢¤½¤ì°ÊÁ°¤Ë»ØÄꤵ¤ì¤¿¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤è¤êÍ¥À褵¤ì¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++options
++¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¡£
++.TP 3
++output\-file
++½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î̾Á°¡£
++.TP 3
++JAR\-file
++ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î̾Á°¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f2pack200\fP¥Ä¡¼¥ë¤Ï¡¢Java \f2gzip\fP°µ½Ì¥×¥í¥°¥é¥à¤ò»ÈÍѤ·¤ÆJAR¥Õ¥¡¥¤¥ë¤ò\f2pack200\fP°µ½Ì¥Õ¥¡¥¤¥ë¤ËÊÑ´¹¤¹¤ëJava¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤¹¡£\f2pack200\fP¥Õ¥¡¥¤¥ë¤Ï¹â°µ½Ì¤Î¥Õ¥¡¥¤¥ë¤Ç¡¢ÂÓ°èÉý¤ÎÀáÌó¤ä¥À¥¦¥ó¥í¡¼¥É»þ´Ö¤Îû½Ì¤äľÀÜ¥Ç¥×¥í¥¤¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f2pack200\fP¥Ä¡¼¥ë¤Ë¤Ï¡¢°µ½Ì¥¨¥ó¥¸¥ó¤ÎÀßÄê¤äÈùÄ´À°¤ò¹Ô¤¦¥ª¥×¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++.SS
++°ìÈÌŪ¤Ê»ÈÍÑÊýË¡:
++.LP
++.LP
++\f2% pack200 myarchive.pack.gz myarchive.jar\fP
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î\f2pack200\fPÀßÄê¤ò»ÈÍѤ·¤Æ\f2myarchive.pack.gz\fP¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++\f4\-r \-\-repack\fP
++.LP
++.LP
++¥Õ¥¡¥¤¥ë\f2myarchive.jar\fP¤ò¥Ñ¥Ã¥¯¤·¤¿¸å¥¢¥ó¥Ñ¥Ã¥¯¤¹¤ë¤³¤È¤Ç¡¢JAR¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï\f2jarsigner(1)\fP¥Ä¡¼¥ë¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍѤǤ­¤Þ¤¹¡£
++.LP
++.LP
++\f2% pack200 \-\-repack myarchive\-packer.jar myarchive.jar\fP
++.LP
++.LP
++\f2% pack200 \-\-repack myarchive.jar\fP
++.LP
++.LP
++\f4\-g \-\-no\-gzip\fP
++.LP
++.LP
++\f2pack200\fP¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¤­¤Ï¡¢Å¬Àڤʰµ½Ì¥Ä¡¼¥ë¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤Þ¤¿¡¢¥¿¡¼¥²¥Ã¥È¡¦¥·¥¹¥Æ¥à¤Ç¤Ï¡¢Âбþ¤¹¤ë°µ½Ì²ò½ü¥Ä¡¼¥ë¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f2% pack200 \-\-no\-gzip myarchive.pack myarchive.jar\fP
++.LP
++.LP
++\f4\-G \-\-strip\-debug\fP
++.LP
++.LP
++½ÐÎϤ«¤é¥Ç¥Ð¥Ã¥°ÍѤΰÀ­¤òºï½ü¤·¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¡¢\f2SourceFile\fP¡¢\f2LineNumberTable\fP¡¢\f2LocalVariableTable\fP¡¢\f2LocalVariableTypeTable\fP¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¤³¤ì¤é¤Î°À­¤òºï½ü¤¹¤ì¤Ð¡¢¥À¥¦¥ó¥í¡¼¥É¤È¥¤¥ó¥¹¥È¡¼¥ë¤Î¥µ¥¤¥º¤Ï¾®¤µ¤¯¤Ê¤ê¤Þ¤¹¤¬¡¢¥Ç¥Ð¥Ã¥¬¤Îµ¡Ç½¤ÏÀ©¸Â¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f4\-\-keep\-file\-order\fP
++.LP
++.LP
++ÆþÎÏ¥Õ¥¡¥¤¥ëÆâ¤Î¥Õ¥¡¥¤¥ë¤Î½ç½ø¤ò°Ý»ý¤·¤Þ¤¹¡£¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ç¤¹¡£
++.LP
++.LP
++\f4\-O \-\-no\-keep\-file\-order\fP
++.LP
++.LP
++¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë¤Ï¡¢¤¹¤Ù¤Æ¤ÎÍ×ÁǤòʤÙÂؤ¨¤ÆžÁ÷¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢JAR¥Ç¥£¥ì¥¯¥È¥ê̾¤¬ºï½ü¤µ¤ì¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢¥À¥¦¥ó¥í¡¼¥É¤Î¥µ¥¤¥º¤Ï¾®¤µ¤¯¤Ê¤ê¤Þ¤¹¤¬¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹¤ò¤Ï¤¸¤á¤È¤¹¤ëJAR¥Õ¥¡¥¤¥ë¤ÎºÇŬ²½µ¡Ç½¤ÏÀµ¾ï¤ËÆ°ºî¤·¤Ê¤¯¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f4\-Svalue \-\-segment\-limit=\fP\f2value\fP
++.LP
++.LP
++¤³¤ÎÃͤϡ¢³Æ¥¢¡¼¥«¥¤¥Ö¡¦¥»¥°¥á¥ó¥È¤ÎͽÁÛ¥¿¡¼¥²¥Ã¥È¡¦¥µ¥¤¥ºN(¥Ð¥¤¥Èñ°Ì)¤Ç¤¹¡£Ã±°ì¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤ÎɬÍ×¥µ¥¤¥º¤¬
++.br
++N¥Ð¥¤¥È¤òĶ¤¨¤ë¤È¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤Ë¤ÏÆÈΩ¤·¤¿¥¢¡¼¥«¥¤¥Ö¡¦¥»¥°¥á¥ó¥È¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£Æüì¤Ê¥±¡¼¥¹¤È¤·¤Æ¡¢Ãͤ¬\f2\-1\fP¤Î¾ì¹ç¤Ï¡¢¤¹¤Ù¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤ò´Þ¤àÂ礭¤Êñ°ì¤Î¥»¥°¥á¥ó¥È¤¬À¸À®¤µ¤ì¡¢Ãͤ¬\f20\fP¤Î¾ì¹ç¤Ï¡¢¥¯¥é¥¹¤´¤È¤Ë¥»¥°¥á¥ó¥È¤¬1¤Ä¤º¤ÄÀ¸À®¤µ¤ì¤Þ¤¹¡£¥¢¡¼¥«¥¤¥Ö¡¦¥»¥°¥á¥ó¥È¤¬Â礭¤¯¤Ê¤ë¤È¡¢ÃÇÊÒ²½¤¬¾¯¤Ê¤¯¤Ê¤ê°µ½ÌΨ¤¬¹â¤¯¤Ê¤ê¤Þ¤¹¤¬¡¢¤½¤Î½èÍý¤Ë¤Ï¿¤¯¤Î¥á¥â¥ê¡¼¤¬É¬ÍפǤ¹¡£
++.LP
++.LP
++³Æ¥»¥°¥á¥ó¥È¤Î¥µ¥¤¥º¤Ï¡¢¥»¥°¥á¥ó¥È¤ËÊÑ´¹¤µ¤ì¤ë¤½¤ì¤¾¤ì¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤Î¤Û¤«¡¢¤½¤Î̾Á°¤È¾¤ÎÁ÷¿®¤µ¤ì¤ë¥×¥í¥Ñ¥Æ¥£¤Î¥µ¥¤¥º¤ò·×»»¤·¤Æ¿ä¬¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ï \-1¤Ç¤¹¡£¤Ä¤Þ¤ê¡¢¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë¤Ï¾ï¤Ëñ°ì¤Î¥»¥°¥á¥ó¥È½ÐÎÏ¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£¶Ëü¤ËÂ礭¤Ê½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤ë¾ì¹ç¤Ë¤Ï¡¢ÆþÎÏ¥Õ¥¡¥¤¥ë¤ò¥»¥°¥á¥ó¥È²½(ʬ³ä)¤·¤Æ¤è¤ê¾®¤µ¤ÊJAR¤Ë¤¹¤ë¤³¤È¤ò¶¯¤¯¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.LP
++.LP
++¤³¤ÎÀ©¸Â¤¬²Ý¤µ¤ì¤Æ¤¤¤Ê¤¤10MB¤ÎJAR¥Ñ¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤ÏÄ̾Ìó10%¾®¤µ¤¯¥Ñ¥Ã¥¯¤µ¤ì¤Þ¤¹¡£¤·¤«¤·¡¢¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë¤Ç¤è¤êÂ礭¤ÊJava¥Ò¡¼¥×(¥»¥°¥á¥ó¥È¤ÎÀ©¸Â¤ÎÌó10ÇÜ)¤òɬÍפȤ¹¤ë¾ì¹ç¤â¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f4\-Evalue \-\-effort=\fP\f2value\fP
++.LP
++.LP
++ñ°ì¤Î10¿Ê¿ôÃͤò»ØÄꤷ¤¿¾ì¹ç¡¢¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë¤Ï¡¢»ØÄꤵ¤ì¤¿°µ½ÌΨ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò°µ½Ì¤·¤Þ¤¹¡£¥ì¥Ù¥ë\f21\fP¤Î¾ì¹ç¤Ï¡¢Èæ³ÓŪû¤¤°µ½Ì»þ´Ö¤Ç¤ä¤äÂ礭¤á¤Î¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¤¬¡¢¥ì¥Ù¥ë\f29\fP¤Î¾ì¹ç¤Ï¡¢Èó¾ï¤ËŤ¤»þ´Ö¤¬¤«¤«¤ë¤â¤Î¤Î¡¢¤è¤ê°µ½ÌΨ¤Î¹â¤¤¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¡£Æüì¤ÊÃÍ\f20\fP¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¸µ¤ÎJAR¥Õ¥¡¥¤¥ë¤ò°µ½Ì¤Ê¤·¤ÇľÀÜ¥³¥Ô¡¼¤·¤Þ¤¹¡£JSR 200ɸ½à¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Î²òÅà¥×¥í¥°¥é¥à¤¬¡¢¤³¤ÎÆÃÊ̤ʾì¹ç¤ò¥¢¡¼¥«¥¤¥ÖÁ´ÂΤΥѥ¹¥¹¥ë¡¼¤È²ò¼á¤¹¤ë¤è¤¦¤Ëµ¬Äꤷ¤Æ¤¤¤Þ¤¹¡£
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ï\f25\fP¤Ç¤¹¡£¤³¤Î¾ì¹ç¡¢É¸½àŪ¤Ê»þ´Ö¤ÇŬÀڤʰµ½Ì¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP
++.LP
++.LP
++ÆþÎϾðÊó¤òÊݸ¤¹¤ë¤È¤¤¤¦¥Ç¥Õ¥©¥ë¥ÈÃͤò¾å½ñ¤­¤·¤Þ¤¹¡£Å¾Á÷¤µ¤ì¤ë¥¢¡¼¥«¥¤¥Ö¤Î¥µ¥¤¥º¤ÏÂ礭¤¯¤Ê¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¼¡¤ÎÃͤò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++true
++.TP 3
++false
++¤É¤Á¤é¤Î¾ì¹ç¤Ç¤â¡¢»ØÄê¤Ë½¾¤Ã¤Æ¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë¤¬¥Ç¥Õ¥ì¡¼¥·¥ç¥ó¡¦¥Ò¥ó¥È¤ò½ÐÎÏ¥¢¡¼¥«¥¤¥Ö¤ËÀßÄꤷ¤Þ¤¹¡£¥¢¡¼¥«¥¤¥ÖÍ×ÁǤθġ¹¤Î¥Ç¥Õ¥ì¡¼¥·¥ç¥ó¡¦¥Ò¥ó¥È¤ÏžÁ÷¤µ¤ì¤Þ¤»¤ó¡£
++.RE
++
++.LP
++.RS 3
++.TP 3
++keep
++ÆþÎÏJAR.Æâ¤Ç¸«¤Ä¤«¤Ã¤¿¥Ç¥Õ¥ì¡¼¥·¥ç¥ó¡¦¥Ò¥ó¥È¤ò°Ý»ý¤·¤Þ¤¹¡£(¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£)
++.RE
++
++.LP
++.LP
++\f4\-mvalue \-\-modification\-time=\fP\f2value\fP
++.LP
++.LP
++¼¡¤ÎÃͤò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++latest
++¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë¤Ï¡¢¸µ¤Î¥¢¡¼¥«¥¤¥Ö¤Î»ÈÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê¤Î¤¦¤Á¤ÎºÇ½ª¹¹¿·»þ¹ï¤«¡¢¤½¤Î¥»¥°¥á¥ó¥È¤Î»ÈÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê¤ÎºÇ½ª¹¹¿·»þ¹ï¤òÆÃÄꤷ¤è¤¦¤È¤·¤Þ¤¹¡£¤³¤Îñ°ì¤ÎÃͤϥ»¥°¥á¥ó¥È¤Î°ìÉô¤È¤·¤ÆžÁ÷¤µ¤ì¡¢³Æ¥»¥°¥á¥ó¥È¤ÎÁ´¥¨¥ó¥È¥ê¤ËŬÍѤµ¤ì¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¤¹¤Ù¤Æ¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¦¥Õ¥¡¥¤¥ë¤Ëñ°ì¤ÎÆüÉÕ¤¬ÀßÄꤵ¤ì¤ë¤È¤¤¤¦ÌäÂê¤Ï¤¢¤ê¤Þ¤¹¤¬¡¢¥¢¡¼¥«¥¤¥Ö¤ÎžÁ÷¥µ¥¤¥º¤ò¾¯¤·¾®¤µ¤¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.TP 3
++keep
++ÆþÎÏJARÆâ¤Ç¸«¤Ä¤«¤Ã¤¿Êѹ¹»þ¹ï¤ò°Ý»ý¤·¤Þ¤¹¡£(¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£)
++.RE
++
++.LP
++.LP
++\f4\-Pfile \-\-pass\-file=\fP\f2file\fP
++.LP
++.LP
++¥Õ¥¡¥¤¥ë¤ò°µ½Ì¤»¤º¡¢¥Ð¥¤¥Èñ°Ì¤ÇžÁ÷¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò·«ÊÖ¤·»ÈÍѤ·¤Æ¡¢Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥·¥¹¥Æ¥à¡¦¥Õ¥¡¥¤¥ë¡¦¥»¥Ñ¥ì¡¼¥¿¤¬JAR¥Õ¥¡¥¤¥ë¥»¥Ñ¥ì¡¼¥¿¡Ö\f2/\fP¡×¤ËÃÖ¤­´¹¤¨¤é¤ì¤ëÅÀ¤ò½ü¤­¡¢¥Ñ¥¹Ì¾¤ÎÊÑ´¹¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡£·ë²Ì¤È¤·¤ÆÆÀ¤é¤ì¤ë¥Õ¥¡¥¤¥ë̾¤Ï¡¢Ê¸»úÎó¤È¤·¤ÆÀµ³Î¤ËJAR¥Õ¥¡¥¤¥ë¤Ç¤Î½Ð¸½¤È°ìÃפ·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£file¤Ë¥Ç¥£¥ì¥¯¥È¥ê̾¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬Å¾Á÷¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f4\-Uaction \-\-unknown\-attribute=\fP\f2action\fP
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢ÉÔÌÀ¤Ê°À­¤ò´Þ¤à¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤¿¥¢¥¯¥·¥ç¥ó¤ÇžÁ÷¤·¤Þ¤¹¡£¥¢¥¯¥·¥ç¥ó¤È¤·¤Æ»ØÄê²Äǽ¤ÊÃͤϼ¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.LP
++.RS 3
++.TP 3
++error
++\f2pack200\fP¤ÎÁàºîÁ´ÂΤ˼ºÇÔ¤·¡¢Å¬ÀڤʲòÀ⤬ɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.TP 3
++strip
++°À­¤¬¥É¥í¥Ã¥×¤µ¤ì¤Þ¤¹¡£Ãí°Õ: VMɬ¿Ü°À­¤òºï½ü¤¹¤ë¤È¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤Î¾ã³²¤¬È¯À¸¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++pass
++¤³¤Î°À­¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¡¢¥¯¥é¥¹Á´ÂΤ¬1¤Ä¤Î¥ê¥½¡¼¥¹¤È¤·¤ÆžÁ÷¤µ¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++\f4\-Cattribute\-name=\fP\f2layout\fP \f3\-\-class\-attribute=\fP\f2attribute\-name=action\fP
++.br
++\f4\-Fattribute\-name=\fP\f2layout\fP \f3\-\-field\-attribute=\fP\f2attribute\-name=action\fP
++.br
++\f4\-Mattribute\-name=\fP\f2layout\fP \f3\-\-method\-attribute=\fP\f2attribute\-name=action\fP
++.br
++\f4\-Dattribute\-name=\fP\f2layout\fP \f3\-\-code\-attribute=\fP\f2attribute\-name=action\fP
++.LP
++.LP
++¤³¤ì¤é4¤Ä¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢¥¯¥é¥¹¡¦¥¨¥ó¥Æ¥£¥Æ¥£¤ËClass°À­¡¢Field°À­¡¢Method°À­¡¢Code°À­¤Ê¤É¤Î°À­¤Î¥ì¥¤¥¢¥¦¥È¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£attribute\-name¤Ë¤Ï¡¢¤³¤ì¤«¤é¥ì¥¤¥¢¥¦¥È¤Þ¤¿¤Ï¥¢¥¯¥·¥ç¥ó¤òÄêµÁ¤¹¤ë°À­¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£¥¢¥¯¥·¥ç¥ó¤È¤·¤Æ»ØÄê²Äǽ¤ÊÃͤϼ¡¤Î¤È¤ª¤ê¤Ç¤¹¡£
++.LP
++.RS 3
++.TP 3
++some\-layout\-string
++¥ì¥¤¥¢¥¦¥È¸À¸ì¤Ï¡¢JSR 200»ÅÍͤËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++Îã: \f2\-\-class\-attribute=SourceFile=RUH\fP
++.TP 3
++error
++¤³¤Î°À­¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¡¢pack200¤ÎÁàºî¤Ë¼ºÇÔ¤·¡¢Å¬ÀڤʲòÀ⤬ɽ¼¨¤µ¤ì¤Þ¤¹¡£
++.TP 3
++strip
++¤³¤Î°À­¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¡¢Â°À­¤Ï½ÐÎϤ«¤éºï½ü¤µ¤ì¤Þ¤¹¡£Ãí°Õ: VMɬ¿Ü°À­¤òºï½ü¤¹¤ë¤È¥¯¥é¥¹¡¦¥í¡¼¥À¡¼¤Î¾ã³²¤¬È¯À¸¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
++.RE
++
++.LP
++.LP
++Îã: \f2\-\-class\-attribute=CompilationID=pass\fP¤È¤¤¤¦¤³¤Î°À­¤ò´Þ¤à¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤òžÁ÷¤·¤Þ¤¹¡£¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë¤Ï¡¢¤½¤Î¾¤Î¥¢¥¯¥·¥ç¥ó¤ò¹Ô¤¤¤Þ¤»¤ó¡£
++.LP
++.LP
++\f4\-f\fP\f2 \fP\f2pack.properties\fP \f3\-\-config\-file=\fP\f2pack.properties\fP
++.LP
++.LP
++¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¡¢¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë¤ò½é´ü²½¤¹¤ë¤¿¤á¤ÎJava¥×¥í¥Ñ¥Æ¥£¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¹½À®¥Õ¥¡¥¤¥ë¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f2% pack200 \-f pack.properties myarchive.pack.gz myarchive.jar\fP
++.br
++\f2% more pack.properties\fP
++.br
++\f2# Generic properties for the packer.\fP
++.br
++\f2modification.time=latest\fP
++.br
++\f2deflate.hint=false\fP
++.br
++\f2keep.file.order=false\fP
++.br
++\f2# This option will cause the files bearing new attributes to\fP
++.br
++\f2# be reported as an error rather than passed uncompressed.\fP
++.br
++\f2unknown.attribute=error\fP
++.br
++\f2# Change the segment limit to be unlimited.\fP
++.br
++\f2segment.limit=\-1\fP
++.LP
++.LP
++\f4\-v \-\-verbose\fP
++.LP
++.LP
++ºÇ¾®¸Â¤Î¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤òÊ£¿ô»ØÄꤹ¤ë¤È¡¢¤è¤êŤ¤¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f4\-q \-\-quiet\fP
++.LP
++.LP
++¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤»¤º¤ËÆ°ºî¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++\f4\-lfilename \-\-log\-file=\fP\f2filename\fP
++.LP
++.LP
++½ÐÎÏ¥á¥Ã¥»¡¼¥¸¤Î¥í¥°¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++\f4\-? \-h \-\-help\fP
++.LP
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ë´Ø¤¹¤ë¥Ø¥ë¥×¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.LP
++.LP
++\f4\-V \-\-version\fP
++.LP
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ë´Ø¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.LP
++.LP
++\f4\-J\fP\f2option\fP
++.LP
++.LP
++\f2option\fP¤ò¡¢\f2pack200\fP¤«¤é¸Æ¤Ó½Ð¤µ¤ì¤¿Javaµ¯Æ°¥Ä¡¼¥ë¤ËÅϤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤¬48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï\f2\-X\fP¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó¤¬¡¢\f2pack200\fP¤Îɸ½à¥ª¥×¥·¥ç¥ó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\f2\-J\fP¤ò»ÈÍѤ·¤Æ¡¢Java¤Çµ­½Ò¤µ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ëÇظå¤ÎVM¤Ë¥ª¥×¥·¥ç¥óÅϤ¹¤³¤È¤Ï¡¢¤è¤¯¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++.SH "½ªÎ»¥¹¥Æ¡¼¥¿¥¹"
++.LP
++.LP
++¼¡¤Î½ªÎ»Ãͤ¬ÊÖ¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f2\ 0\fPÀµ¾ï½ªÎ»¤·¤¿¾ì¹ç
++.LP
++.LP
++\f2>0\fP¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++unpack200(1)
++.TP 2
++o
++.na
++\f2Java SE¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/index.html
++.TP 2
++o
++.na
++\f2Java¥Ç¥×¥í¥¤¥á¥ó¥È¡¦¥¬¥¤¥É \- Pack200\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
++.TP 2
++o
++jar(1) \- Java Archive¥Ä¡¼¥ë
++.TP 2
++o
++jarsigner(1) \- JAR½ð̾¥Ä¡¼¥ë
++.TP 2
++o
++\f2attributes(5)\fP¤Î¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸
++.RE
++
++.LP
++.SH "Ãí°Õ"
++.LP
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤È\f2pack(1)\fP¤òº®Æ±¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤³¤ì¤é¤ÏÊÌÀ½ÉʤǤ¹¡£
++.LP
++.LP
++JDK¤ËÉÕ°¤¹¤ëJava SE API»ÅÍͤȤÎÁê°ã¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢»ÅÍͤòÍ¥À褷¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/policytool.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/policytool.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,102 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH policytool 1 "07 May 2011"
++.TH policytool 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++policytool \- PolicyTool´ÉÍýGUI¥æ¡¼¥Æ¥£¥ê¥Æ¥£
++.LP
++\f3policytool\fP¤Ï¡¢¥æ¡¼¥Æ¥£¥ê¥Æ¥£GUI·Ðͳ¤Ç¼èÆÀ¤·¤¿¥æ¡¼¥¶¡¼ÆþÎϤ˴ð¤Å¤¤¤Æ¡¢¥×¥ì¡¼¥ó¡¦¥Æ¥­¥¹¥È¤Î¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤òÆɤ߽ñ¤­¤·¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.LP
++policytool´ÉÍý¼Ô¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò¼Â¹Ô¤·¤Þ¤¹
++.LP
++.LP
++\f4policytool\fP
++.LP
++.LP
++policytool¤ò¼Â¹Ô¤·¡¢»ØÄꤵ¤ì¤¿¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹
++.LP
++.LP
++\f4policytool\fP\f2[\-file\ \fP\f2filename\fP\f2]\fP
++.LP
++.LP
++ÀâÌÀ
++.LP
++.RS 3
++.TP 3
++file
++¥í¡¼¥«¥ë¡¦¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤è¤¦¤Ë\f2policytool\fP¤Ë»Ø¼¨¤·¤Þ¤¹
++.TP 3
++filename
++¥Õ¥¡¥¤¥ë̾
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3policytool\fP¤Ï¡¢¥æ¡¼¥¶¡¼¤¬¥í¡¼¥«¥ë¡¦¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ÎÆâÍƤò´ÉÍý¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ëGUI¤Ç¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ëºîÀ®¤ª¤è¤Ó´ÉÍý¥Ä¡¼¥ë\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++file
++\f2filename\fP¤òÆɤ߹þ¤ß¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.na
++\f2¥Ç¥Õ¥©¥ë¥È¤Î¥Ý¥ê¥·¡¼¼ÂÁõ¤ª¤è¤Ó¹½Ê¸\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html
++.br
++
++.LP
++.na
++\f2¥Ý¥ê¥·¡¼¡¦¥Ä¡¼¥ë¡¦¥æ¡¼¥¶¡¼¥º¡¦¥¬¥¤¥É\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html
++.br
++
++.LP
++.na
++\f2¥»¥­¥å¥ê¥Æ¥£¸¢¸Â\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/permissions.html
++.br
++
++.LP
++.na
++\f2¥»¥­¥å¥ê¥Æ¥£¤Î³µÍ×\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html
++.br
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/rmic.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/rmic.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,209 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH rmic 1 "07 May 2011"
++.TH rmic 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++rmic \- Java RMI¥³¥ó¥Ñ¥¤¥é
++.LP
++.LP
++\f3rmic\fP¤Ë¤è¤Ã¤Æ¡¢JRMP¤Þ¤¿¤ÏIIOP¥×¥í¥È¥³¥ë¤ò»ÈÍѤ¹¤ë¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¹¥¿¥Ö¡¢¥¹¥±¥ë¥È¥ó¡¢¤ª¤è¤ÓTie¥¯¥é¥¹¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢OMG IDL¤âÀ¸À®¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++rmic [ \fP\f3options\fP\f3 ] \fP\f4package\-qualified\-class\-name(s)\fP\f3
++.fl
++\fP
++.fi
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3rmic\fP¥³¥ó¥Ñ¥¤¥é¤Ë¤è¤Ã¤Æ¡¢¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î¡¢¥¹¥¿¥Ö¡¢¥¹¥±¥ë¥È¥ó¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë(JRMP¥×¥í¥È¥³¥ë)¡¢¤ª¤è¤Ó¥¹¥¿¥Ö¤ÈTie¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤ÎÁȹ礻(IIOP¥×¥í¥È¥³¥ë)¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î¼ÂÁõ¥¯¥é¥¹¤Ç¤¢¤ë¤³¤ì¤é¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ï¡¢Java¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î¥¯¥é¥¹¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤¿¤È¤­¤ËÀ¸À®¤µ¤ì¤Þ¤¹¡£¥ê¥â¡¼¥È¼ÂÁõ¥¯¥é¥¹¤Ï¡¢\f2java.rmi.Remote\fP¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò¼ÂÁõ¤¹¤ë¥¯¥é¥¹¤Ç¤¹¡£\f3rmic\fP¥³¥Þ¥ó¥É¤Ç¤Î¥¯¥é¥¹Ì¾¤Ï¡¢¤½¤Î¥¯¥é¥¹¤¬\f3javac\fP¥³¥Þ¥ó¥É¤Ç¥³¥ó¥Ñ¥¤¥ë¤¬À®¸ù¤·¤Æ¤¤¤Æ¡¢¤«¤Ä´°Á´½¤¾þ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë̾\f2HelloImpl\fP¤Ç\f3rmic\fP¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++rmic hello.HelloImpl
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f2HelloImpl_Stub.class\fP¥Õ¥¡¥¤¥ë¤¬¡¢¥¯¥é¥¹¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬ÉÕ¤¤¤¿\f2hello\fP¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î\f2¥¹¥±¥ë¥È¥ó\fP¤ÏJRMP¥×¥í¥È¥³¥ë¡¦¥µ¡¼¥Ð¡¼Â¦¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ç¡¢¼ÂºÝ¤Î¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¼ÂÁõ¤ò¸Æ¤Ó½Ð¤¹¥á¥½¥Ã¥É¤ò´Þ¤ß¤Þ¤¹¡£
++.LP
++.LP
++¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î\f2Tie\fP¤Ï¡¢¥¹¥±¥ë¥È¥ó¤ÈƱÍͤ˥µ¡¼¥Ð¡¼Â¦¤Î¥¨¥ó¥Æ¥£¥Æ¥£¤Ç¤¹¤¬¡¢IIOP¥×¥í¥È¥³¥ë¤ò»ÈÍѤ·¤Æ¥¯¥é¥¤¥¢¥ó¥È¤ÈÄÌ¿®¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2¥¹¥¿¥Ö\fP¤È¤Ï¡¢¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¯¥é¥¤¥¢¥ó¥È¦¤Ç¤ÎÂåÍý¤Ç¤¹¡£¥¹¥¿¥Ö¤Ï¡¢¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î¥á¥½¥Ã¥É¸Æ½Ð¤·¤ò¡¢¼Âʪ¤Î¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤¬¾ïÃ󤹤륵¡¼¥Ð¡¼¤ÈÄÌ¿®¤¹¤ëÌò³ä¤ò»ý¤Á¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î»²¾È¤Ï¡¢¼ÂºÝ¤Ï¥í¡¼¥«¥ë¡¦¥¹¥¿¥Ö¤Ø¤Î»²¾È¤È¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Ç\f3rmic\fP¤Ç¤Ï¡¢1.2 JRMP¥¹¥¿¥Ö¡¦¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó¤Î¤ß¤ò»ÈÍѤ¹¤ë¥¹¥¿¥Ö¡¦¥¯¥é¥¹¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢\f2\-v1.2\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤ÈƱ¤¸Æ°ºî¤Ç¤¹¡£(5.0°ÊÁ°¤Ç¤Ï\f2\-vcompat\fP¥ª¥×¥·¥ç¥ó¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¢¤Ã¤¿¤³¤È¤ËÃí°Õ¡£)IIOP¥×¥í¥È¥³¥ëÍѤΥ¹¥¿¥Ö¤ª¤è¤ÓTie¥¯¥é¥¹¤òÀ¸À®¤¹¤ë¤Ë¤Ï\f2\-iiop\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.LP
++¥¹¥¿¥Ö¤Ï¥ê¥â¡¼¥È¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¤ß¤ò¼ÂÁõ¤·¡¢¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤¬¼ÂÁõ¤¹¤ë¥í¡¼¥«¥ë¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó¡£JRMP¥¹¥¿¥Ö¤Ï¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¼«ÂΤ¬¼ÂÁõ¤¹¤ë¥ê¥â¡¼¥È¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÈƱ¤¸¤â¤Î¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¤Î¤Ç¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï¡¢¥­¥ã¥¹¥È¤ä·¿¥Á¥§¥Ã¥¯¤ËJava¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤ËÁȤ߹þ¤Þ¤ì¤¿±é»»»Ò¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£IIOP¤Î¾ì¹ç¤Ï¡¢\f2PortableRemoteObject.narrow\fP¥á¥½¥Ã¥É¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-bootclasspath path
++¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
++.TP 3
++\-classpath path
++\f3rmic\fP¤¬¥¯¥é¥¹¤òõ¤¹¤¿¤á¤Î¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤äCLASSPATH´Ä¶­ÊÑ¿ôÀßÄê¤ò¾å½ñ¤­¤·¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥³¥í¥ó¤Çʬ³ä¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢\f2path\fP¤Î°ìÈÌ·Á¼°¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.nf
++\f3
++.fl
++.:<your_path>
++.fl
++\fP
++.fi
++¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++.:/usr/local/java/classes
++.fl
++\fP
++.fi
++.TP 3
++\-d directory
++À¸À®¤µ¤ì¤¿¥¯¥é¥¹³¬ÁؤνÐÎÏÀè¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ë¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¥¹¥¿¥Ö¡¢¥¹¥±¥ë¥È¥ó¡¢¤ª¤è¤ÓTie¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë»ÈÍѤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++% rmic \-d /java/classes foo.MyClass
++.fl
++\fP
++.fi
++\f2MyClass\fP¤«¤é¼èÆÀ¤·¤¿¥¹¥¿¥Ö¤È¥¹¥±¥ë¥È¥ó¡¦¥¯¥é¥¹¤ò\f2/java/classes/foo\fP¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤­¤Þ¤¹¡£\f2\-d\fP¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢\f2¡Ö\-d\ .¡×\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¸«¤Ê¤µ¤ì¤Þ¤¹¡£¥¿¡¼¥²¥Ã¥È¡¦¥¯¥é¥¹¤Î¥Ñ¥Ã¥±¡¼¥¸³¬Áؤ¬¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËºîÀ®¤µ¤ì¡¢¥¹¥¿¥Ö¡¢Tie¡¢¤ª¤è¤Ó¥¹¥±¥ë¥È¥ó¡¦¥Õ¥¡¥¤¥ë¤¬¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£(°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Î\f3rmic\fP¤Ç¤Ï¡¢\f2\-d\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸³¬ÁؤϺîÀ®\f2¤µ¤ì¤º\fP¡¢½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ï¤¹¤Ù¤Æ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËľÀܳÊǼ¤µ¤ì¤Æ¤¤¤¿¡£)
++.br
++\
++.TP 3
++\-extdirs path
++¥¤¥ó¥¹¥È¡¼¥ë·¿³ÈÄ¥µ¡Ç½¤Î°ÌÃÖ¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
++.TP 3
++\-g
++¥í¡¼¥«¥ëÊÑ¿ô¤ò´Þ¤à¤¹¤Ù¤Æ¤Î¥Ç¥Ð¥Ã¥°¾ðÊó¤òÀ¸À®¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¹ÔÈÖ¹æ¾ðÊó¤Î¤ßÀ¸À®¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-idl
++\f2rmic\fP¤Ë¤è¤Ã¤Æ¡¢»ØÄꤷ¤¿¥¯¥é¥¹¤ª¤è¤Ó»²¾È¤µ¤ì¤¿¥¯¥é¥¹¤ÎOMG IDL¤¬À¸À®¤µ¤ì¤Þ¤¹¡£IDL¤Ç¤Ï¡¢¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Ë°Í¸¤»¤º¤Ë¡¢Àë¸À¤¹¤ë¤À¤±¤Ç¥ª¥Ö¥¸¥§¥¯¥È¤ÎAPI¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£IDL¤Ï¡¢¥á¥½¥Ã¥É¤ª¤è¤Ó¥Ç¡¼¥¿¤Î»ÅÍͤȤ·¤Æ»ÈÍѤ·¤Þ¤¹¡£CORBA¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÄ󶡤¹¤ëǤ°Õ¤Î¸À¸ì¤Ç¡¢¥á¥½¥Ã¥É¤ª¤è¤Ó¥Ç¡¼¥¿¤ÎºîÀ®¤ª¤è¤Ó¸Æ½Ð¤·¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤é¤Î¸À¸ì¤Ë¤Ï¡¢Java¤ª¤è¤ÓC++¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2Java ¸À¸ì¤ÈIDL¤Î¥Þ¥Ã¥Ô¥ó¥°\fP @
++.fi
++http://www.omg.org/technology/documents/formal/java_language_mapping_to_omg_idl.htm(OMG)¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.br
++\f2\-idl\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¤­¤Ë¤Ï¡¢Â¾¤Î¥ª¥×¥·¥ç¥ó¤â»ØÄê¤Ç¤­¤Þ¤¹¡£
++.RS 3
++.TP 3
++\-always¤Þ¤¿¤Ï\-alwaysgenerate
++´û¸¤Î¥¹¥¿¥Ö¡¢Tie¡¢¤ª¤è¤ÓIDL¤¬ÆþÎÏ¥¯¥é¥¹¤è¤ê¿·¤·¤¤¤È¤­¤Ç¤â¡¢¶¯À©Åª¤ËÀ¸À®¤·Ä¾¤·¤Þ¤¹¡£
++.TP 3
++\-factory
++À¸À®¤µ¤ì¤¿IDL¤Çfactory¥­¡¼¥ï¡¼¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
++.TP 3
++\-idlModule\ fromJavaPackage[.class]\ toIDLModule
++IDLEntity¥Ñ¥Ã¥±¡¼¥¸¤Î¥Þ¥Ã¥×¤ò»ØÄꤷ¤Þ¤¹¡£Îã¤ò¼¨¤·¤Þ¤¹¡£\ \f2\-idlModule foo.bar my::real::idlmod\fP
++.TP 3
++\-idlFile\ fromJavaPackage[.class]\ toIDLFile
++IDLEntity¥Õ¥¡¥¤¥ë¤Î¥Þ¥Ã¥×¤ò»ØÄꤷ¤Þ¤¹¡£Îã¤ò¼¨¤·¤Þ¤¹¡£\ \f2\-idlFile test.pkg.X TEST16.idl\fP\
++.RE
++.TP 3
++\-iiop
++\f2rmic\fP¤Ë¤è¤Ã¤Æ¡¢JRMP¤Î¥¹¥¿¥Ö¤È¥¹¥±¥ë¥È¥ó¡¦¥¯¥é¥¹¤Î¤«¤ï¤ê¤Ë¡¢IIOP¤Î¥¹¥¿¥Ö¤ÈTie¥¯¥é¥¹¤¬À¸À®¤µ¤ì¤Þ¤¹¡£¥¹¥¿¥Ö¡¦¥¯¥é¥¹¤Ï¡¢¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î¥í¡¼¥«¥ë¡¦¥×¥í¥­¥·¤Ç¡¢¥¯¥é¥¤¥¢¥ó¥È¤«¤é¥µ¡¼¥Ð¡¼¤Ë¸Æ½Ð¤·¤òÁ÷¿®¤¹¤ë¤È¤­¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£³Æ¥ê¥â¡¼¥È¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë¤Ï¥¹¥¿¥Ö¡¦¥¯¥é¥¹¤¬É¬ÍפǤ¹¡£¥¹¥¿¥Ö¡¦¥¯¥é¥¹¤Ë¤è¤Ã¤Æ¥ê¥â¡¼¥È¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬¼ÂÁõ¤µ¤ì¤Þ¤¹¡£¥¯¥é¥¤¥¢¥ó¥È¤Ç¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤ò»²¾È¤¹¤ë¤È¤­¤Ï¡¢¼ÂºÝ¤Ë¤Ï¥¹¥¿¥Ö¤ò»²¾È¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£¥¿¥¤¡¦¥¯¥é¥¹¤Ï¡¢¥µ¡¼¥Ð¡¼Â¦¤ÇÃå¸Æ¤ò½èÍý¤·¡¢¤½¤Î¸Æ½Ð¤·¤òŬÀڤʼÂÁõ¥¯¥é¥¹¤Ë¥Ç¥£¥¹¥Ñ¥Ã¥Á¤¹¤ë¤È¤­¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£³Æ¼ÂÁõ¥¯¥é¥¹¤Ë¤Ï¡¢¥¿¥¤¡¦¥¯¥é¥¹¤¬É¬ÍפǤ¹¡£
++.br
++.br
++\f2\-iiop\fP¤ò»ÈÍѤ·¤Æ\f2rmic\fP¤ò¸Æ¤Ó½Ð¤¹¤È¡¢¼¡¤Î̿̾µ¬Ìó¤Ë½àµò¤·¤¿¥¹¥¿¥Ö¤ÈTie¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++_<implementationName>_stub.class
++.fl
++_<interfaceName>_tie.class
++.fl
++\fP
++.fi
++\f2\-iiop\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¤­¤Ë¤Ï¡¢Â¾¤Î¥ª¥×¥·¥ç¥ó¤â»ØÄê¤Ç¤­¤Þ¤¹¡£
++.RS 3
++.TP 3
++\-always¤Þ¤¿¤Ï\-alwaysgenerate
++´û¸¤Î¥¹¥¿¥Ö¡¢Tie¡¢¤ª¤è¤ÓIDL¤¬ÆþÎÏ¥¯¥é¥¹¤è¤ê¿·¤·¤¤¤È¤­¤Ç¤â¡¢¶¯À©Åª¤ËÀ¸À®¤·Ä¾¤·¤Þ¤¹¡£
++.TP 3
++\-nolocalstubs
++Ʊ¤¸¥×¥í¥»¥¹¤Î¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡¼¤ËÂФ·¤ÆºÇŬ²½¤µ¤ì¤¿¥¹¥¿¥Ö¤òºîÀ®¤·¤Þ¤»¤ó¡£
++.TP 3
++\-noValueMethods
++¤³¤ì¤Ï\f2\-idl\fP¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£È¯¹Ô¤µ¤ì¤¿IDL¤Ë¡¢\f2valuetype\fP¥á¥½¥Ã¥É¤ª¤è¤Ó½é´ü²½»Ò¤òÄɲä·¤Þ¤»¤ó¡£¤³¤Î¥á¥½¥Ã¥É¤ª¤è¤Ó½é´ü²½»Ò¤Ï¡¢\f2valuetype\fP¤Î¾ì¹ç¤Ï¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\f2\-idl\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¤­¤Ë¡¢\f2\-noValueMethods\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¸Â¤êÀ¸À®¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-poa
++·Ñ¾µ¤¬\f2org.omg.CORBA_2_3.portable.ObjectImpl\fP¤«¤é\f2org.omg.PortableServer.Servant\fP¤ËÊѤï¤ê¤Þ¤¹¡£
++.na
++\f2Portable Object Adapter\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/POA.html(POA)¤Î\f2PortableServer\fP¥â¥¸¥å¡¼¥ë¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¤Î\f2Servant\fP·¿¤òÄêµÁ¤·¤Þ¤¹¡£Java¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Ç¤Ï¡¢\f2Servant\fP·¿¤ÏJava¤Î\f2org.omg.PortableServer.Servant\fP¥¯¥é¥¹¤Ë¥Þ¥Ã¥×¤µ¤ì¤Þ¤¹¡£¤³¤Î¥¯¥é¥¹¤Ï¡¢¤¹¤Ù¤Æ¤ÎPOA¥µ¡¼¥Ð¥ó¥È¼ÂÁõ¤Î¥Ù¡¼¥¹¡¦¥¯¥é¥¹¤È¤·¤Æµ¡Ç½¤·¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥×¥í¥°¥é¥Þ¤¬¸Æ¤Ó½Ð¤¹¤³¤È¤Î¤Ç¤­¤ë¤¤¤¯¤Ä¤«¤Î¥á¥½¥Ã¥É¤Î¾¤Ë¡¢POA¤½¤Î¤â¤Î¤Ë¤è¤Ã¤Æ¸Æ¤Ó½Ð¤µ¤ì¡¢¥µ¡¼¥Ð¥ó¥È¤ÎÆ°ºî¤òÀ©¸æ¤¹¤ë¤¿¤á¤Ë¥æ¡¼¥¶¡¼¤¬¥ª¡¼¥Ð¡¼¥é¥¤¥É¤Ç¤­¤ë¥á¥½¥Ã¥É¤âÄ󶡤·¤Þ¤¹¡£OMG IDL to Java Language Mapping Specification¡¢CORBA V 2.3.1 ptc/00\-01\-08.pdf¤Ë½àµò¤·¤Æ¤¤¤Þ¤¹¡£
++.RE
++.TP 3
++\-J
++\f2\-J\fP¤Î¸å¤í¤Ë³¤¯¥ª¥×¥·¥ç¥ó¤ò\f2java\fP¥¤¥ó¥¿¥×¥ê¥¿¤Ë°ú¤­ÅϤ·¤Þ¤¹¡£\f2java\fP¥ª¥×¥·¥ç¥ó¤ÈÁȤ߹礻¤Æ»ÈÍѤ·¤Þ¤¹(\-J¤Èjava¥ª¥×¥·¥ç¥ó¤Î´Ö¤Ë¥¹¥Ú¡¼¥¹¤ÏÆþ¤ì¤Ê¤¤)¡£
++.TP 3
++\-keep¤Þ¤¿¤Ï\-keepgenerated
++¥¹¥¿¥Ö¡¢¥¹¥±¥ë¥È¥ó¡¢¤Þ¤¿¤ÏTie¥¯¥é¥¹¤Î¤¿¤á¤Î\f2.java\fP¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò\f2.class\fP¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¥Ç¥£¥ì¥¯¥È¥ê¤Ë»Ä¤·¤Þ¤¹¡£
++.TP 3
++\-nowarn
++·Ù¹ð¤ò¥ª¥Õ¤Ë¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢¥³¥ó¥Ñ¥¤¥é¤Ï·Ù¹ð¤òɽ¼¨¤·¤Þ¤»¤ó¡£
++.TP 3
++\-nowrite
++¥³¥ó¥Ñ¥¤¥ë¤·¤¿¥¯¥é¥¹¤ò¥Õ¥¡¥¤¥ë¡¦¥·¥¹¥Æ¥à¤Ë½ñ¤­¹þ¤ß¤Þ¤»¤ó¡£
++.TP 3
++\-vcompat
++1.1¤È1.2¤ÎξÊý¤ÎJRMP¥¹¥¿¥Ö¡¦¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó¤È¸ß´¹À­¤Î¤¢¤ë¥¹¥¿¥Ö¤ª¤è¤Ó¥¹¥±¥ë¥È¥ó¡¦¥¯¥é¥¹¤òºîÀ®¤·¤Þ¤¹¡£(5.0°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥Õ¥©¥ë¥È¡£)À¸À®¤µ¤ì¤¿¥¹¥¿¥Ö¡¦¥¯¥é¥¹¤Ï¡¢JDK 1.1²¾ÁÛ¥Þ¥·¥ó¤Ë¥í¡¼¥É¤µ¤ì¤ë¤È1.1¥¹¥¿¥Ö¡¦¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó¤ò»ÈÍѤ·¡¢JDK 1.2°Ê¹ß¤Î²¾ÁÛ¥Þ¥·¥ó¤Ë¥í¡¼¥É¤µ¤ì¤ë¤È1.2¥¹¥¿¥Ö¡¦¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥¹¥±¥ë¥È¥ó¡¦¥¯¥é¥¹¤Ç¤Ï¡¢1.1¤È1.2¤ÎξÊý¤Î¥¹¥¿¥Ö¡¦¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤¿¥¯¥é¥¹¤ÏξÊý¤ÎÁàºî¥â¡¼¥É¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤¿¤á¤Ë¡¢¥µ¥¤¥º¤¬Â礭¤¯¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++\-verbose
++¥³¥ó¥Ñ¥¤¥é¤ä¥ê¥ó¥«¡¼¤¬¡¢¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤ë¥¯¥é¥¹¤ä¥í¡¼¥É¤µ¤ì¤Æ¤¤¤ë¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
++.TP 3
++\-v1.1
++1.1 JRMP¥¹¥¿¥Ö¡¦¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó¤Î¤ß¤Î¥¹¥¿¥Ö¤ª¤è¤Ó¥¹¥±¥ë¥È¥ó¡¦¥¯¥é¥¹¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ÈÍѤǤ­¤ë¤Î¤Ï¡¢JDK 1.1¤«¤é\f3rmic\fP¥Ä¡¼¥ë¤ÇÀ¸À®¤µ¤ì¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Ê¤¤(¤µ¤é¤Ë¥À¥¤¥Ê¥ß¥Ã¥¯¡¦¥¯¥é¥¹¡¦¥í¡¼¥Ç¥£¥ó¥°¤ò»ÈÍѤ·¤Æ¤¤¤Ê¤¤)¡¢´û¸¤ÎÀÅŪ¥Ç¥×¥í¥¤¤µ¤ì¤¿¥¹¥¿¥Ö¡¦¥¯¥é¥¹¤ËÂФ·¡¢Ä¾Î󲽸ߴ¹À­¤Î¤¢¤ë¥¹¥¿¥Ö¡¦¥¯¥é¥¹¤òÀ¸À®¤¹¤ë¾ì¹ç¤Î¤ß¤Ç¤¹¡£
++.TP 3
++\-v1.2
++(¥Ç¥Õ¥©¥ë¥È)1.2 JRMP¥¹¥¿¥Ö¡¦¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó¤Î¤ß¤Î¥¹¥¿¥Ö¡¦¥¯¥é¥¹¤òÀ¸À®¤·¤Þ¤¹¡£¥¹¥±¥ë¥È¥ó¡¦¥¯¥é¥¹¤Ï1.2¥¹¥¿¥Ö¡¦¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó¤Ç»ÈÍѤǤ­¤Ê¤¤¤¿¤á¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¥¹¥±¥ë¥È¥ó¡¦¥¯¥é¥¹¤ÏÀ¸À®¤µ¤ì¤Þ¤»¤ó¡£À¸À®¤µ¤ì¤¿¥¹¥¿¥Ö¡¦¥¯¥é¥¹¤Ï¡¢JDK 1.1²¾ÁÛ¥Þ¥·¥ó¤Ë¥í¡¼¥É¤µ¤ì¤Æ¤âÆ°ºî¤·¤Þ¤»¤ó¡£
++.RE
++
++.LP
++.SH "´Ä¶­ÊÑ¿ô"
++.LP
++.RS 3
++.TP 3
++CLASSPATH
++¥æ¡¼¥¶¡¼ÄêµÁ¥¯¥é¥¹¤Ø¤Î¥Ñ¥¹¤ò¥·¥¹¥Æ¥à¤Ë»ØÄꤷ¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥³¥í¥ó¤Çʬ³ä¤·¤Þ¤¹¡£¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++.:/usr/local/java/classes
++.fl
++\fP
++.fi
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.LP
++java(1)¡¢javac(1)¡¢
++.na
++\f2CLASSPATH\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/rmid.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/rmid.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,310 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH rmid 1 "07 May 2011"
++.TH rmid 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++rmid \- Java RMIµ¯Æ°¥·¥¹¥Æ¥à¡¦¥Ç¡¼¥â¥ó
++.LP
++.LP
++\f3rmid\fP¤Ç¥¢¥¯¥Æ¥£¥Ö²½¤¹¤ë¥·¥¹¥Æ¥à¡¦¥Ç¡¼¥â¥ó¤ò³«»Ï¤¹¤ë¤È¡¢¥ª¥Ö¥¸¥§¥¯¥È¤ò²¾ÁÛ¥Þ¥·¥ó(VM)¤ËÅÐÏ¿¤·¤Æ¥¢¥¯¥Æ¥£¥Ö²½¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++rmid [options]
++.fl
++\fP
++.fi
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3rmid\fP¥Ä¡¼¥ë¤Ï¡¢µ¯Æ°¥·¥¹¥Æ¥à¡¦¥Ç¡¼¥â¥ó¤ò³«»Ï¤·¤Þ¤¹¡£¥¢¥¯¥Æ¥£¥Ö²½¥·¥¹¥Æ¥à¡¦¥Ç¡¼¥â¥ó¤ò³«»Ï¤·¤Æ¤«¤é¤Ç¤Ê¤¤¤È¡¢¥¢¥¯¥Æ¥£¥Ö²½²Äǽ¥ª¥Ö¥¸¥§¥¯¥È¤ò¥¢¥¯¥Æ¥£¥Ö²½¥·¥¹¥Æ¥à¤ËÅÐÏ¿¤·¤¿¤ê¡¢VMÆâ¤Ç¥¢¥¯¥Æ¥£¥Ö²½¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£µ¯Æ°²Äǽ¤Ê¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤ò»ÈÍѤ·¤¿¥×¥í¥°¥é¥à¤ÎºîÀ®ÊýË¡¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2Java RMI»ÅÍÍ\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html¤ª¤è¤Ó
++.na
++\f2µ¯Æ°¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++¥Ç¡¼¥â¥ó¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ\f2rmid\fP¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ rmid \-J\-Djava.security.policy=rmid.policy
++.fl
++\fP
++.fi
++
++.LP
++.LP
++\f3Ãí°Õ:\fP \f2rmid\fP¤ÎSun¤Î¼ÂÁõ¤ò¼Â¹Ô¤¹¤ë¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤ì¤Ï¡¢\f2rmid\fP¤¬µ¯Æ°¥°¥ë¡¼¥×ÍѤËVM¤òµ¯Æ°¤¹¤ë¤¿¤á¤Ë³Æ\f2ActivationGroupDesc\fPÆâ¤Î¾ðÊó¤ò»ÈÍѤǤ­¤ë¤«¤É¤¦¤«¤ò¸¡¾Ú¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ç¤¹¡£Æäˡ¢\f2ActivationGroupDesc\fP¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¤ËÅϤµ¤ì¤ë\f2CommandEnvironment\fP¤äǤ°Õ¤Î\f2Properties\fP¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤ë¥³¥Þ¥ó¥É¤ª¤è¤Ó¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2rmid\fP¤Î¥»¥­¥å¥ê¥Æ¥£¡¦¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ÎÃæ¤ÇÌÀ¼¨Åª¤Ëµö²Ä¤¹¤ë¤³¤È¤¬É¬Íפˤʤê¤Þ¤·¤¿¡£\f2sun.rmi.activation.execPolicy\fP¥×¥í¥Ñ¥Æ¥£¤ÎÃͤϡ¢µ¯Æ°¥°¥ë¡¼¥×ÍѤËVM¤òµ¯Æ°¤¹¤ë¤¿¤á¤Ë\f2ActivationGroupDesc\fPÆâ¤Î¾ðÊó¤ò»ÈÍѤǤ­¤ë¤«¤É¤¦¤«¤òȽÃǤ¹¤ë¤È¤­¤Ë\f2rmid\fP¤¬»ÈÍѤ¹¤ë¥Ý¥ê¥·¡¼¤ò·èÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++\f2rmid\fP¤ò¥Ç¥Õ¥©¥ë¥ÈÀßÄê¤Ç¼Â¹Ô¤¹¤ë¤È¡¢¼¡¤Î¤è¤¦¤Ê½èÍý¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++¥¢¥¯¥Æ¥£¥Ù¡¼¥¿¤òµ¯Æ°¤·¡¢¥Ç¥Õ¥©¥ë¥È¡¦¥Ý¡¼¥È1098¤ÇÆâÉô¥ì¥¸¥¹¥È¥ê¤òµ¯Æ°¤¹¤ë
++.TP 2
++o
++¤³¤ÎÆâÉô¥ì¥¸¥¹¥È¥ê¤ÎÃæ¤Ç¡¢\f2ActivationSystem\fP¤ò\f2java.rmi.activation.ActivationSystem¤È¤¤¤¦Ì¾Á°¤Ë\fP¥Ð¥¤¥ó¥É¤¹¤ë
++.RE
++
++.LP
++.LP
++¥ì¥¸¥¹¥È¥ê¤Ë¾¤Î¥Ý¡¼¥È¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢\f2rmid\fP¤Îµ¯Æ°»þ¤Ë\f2\-port\fP¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ rmid \-J\-Djava.security.policy=rmid.policy \-port 1099
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢µ¯Æ°¥·¥¹¥Æ¥à¡¦¥Ç¡¼¥â¥ó¤ò³«»Ï¤·¡¢¥ì¥¸¥¹¥È¥ê¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥Ý¡¼¥È1099¤Ç¥ì¥¸¥¹¥È¥ê¤ò³«»Ï¤·¤Þ¤¹¡£
++.LP
++.SS
++rmid¤òinetd/xinetd¤«¤é³«»Ï¤¹¤ë
++.LP
++.LP
++\f2rmid\fP¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é³«»Ï¤¹¤ë¤Ë¤Ï¡¢\f2inetd\fP(Solaris¤Î¾ì¹ç)¡¢¤Þ¤¿¤Ï\f2xinetd\fP(Linux¤Î¾ì¹ç)¤ò¹½À®¤·¤Æ\f2rmid\fP¤òɬÍפ˱þ¤¸¤Æ³«»Ï¤¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£
++.LP
++.LP
++\f2rmid\fP¤ò³«»Ï¤¹¤ë¤È¡¢\f2System.inheritedChannel\fP¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤·¤Æ¡¢·Ñ¾µ¤µ¤ì¤¿¥Á¥ã¥ó¥Í¥ë(\f2inetd\fP/\f2xinetd\fP¤«¤é·Ñ¾µ)¤ò¼èÆÀ¤·¤è¤¦¤È¤·¤Þ¤¹¡£·Ñ¾µ¤µ¤ì¤¿¥Á¥ã¥ó¥Í¥ë¤¬\f2null\fP¤Ç¤¢¤ë¤«¡¢\f2java.nio.channels.ServerSocketChannel\fP¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ç¤Ê¤«¤Ã¤¿¾ì¹ç¡¢\f2rmid\fP¤Ï¤½¤Î¥Á¥ã¥ó¥Í¥ë¤Ï\f2inetd\fP/\f2xinetd\fP¤Ë¤è¤Ã¤Æµ¯Æ°¤µ¤ì¤¿¤â¤Î¤Ç¤Ï¤Ê¤¤¤ÈȽÃǤ·¡¢Á°½Ò¤Î¤è¤¦¤Ëµ¯Æ°¤·¤Þ¤¹¡£
++.LP
++.LP
++·Ñ¾µ¤µ¤ì¤¿¥Á¥ã¥ó¥Í¥ë¤¬\f2ServerSocketChannel\fP¥¤¥ó¥¹¥¿¥ó¥¹¤Ç¤¢¤ë¾ì¹ç¤Ï¡¢\f2rmid\fP¤Ï¥¨¥¯¥¹¥Ý¡¼¥È¤¹¤ë¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¡¢¤Ä¤Þ¤ê\f2java.rmi.activation.ActivationSystem\fP¤¬¥Ð¥¤¥ó¥É¤µ¤ì¤Æ¤¤¤ë¥ì¥¸¥¹¥È¥ê¤È\f2java.rmi.activation.Activator\fP¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤ËÂФ¹¤ë¥ê¥¯¥¨¥¹¥È¤ò¼õ¿®¤¹¤ë¥µ¡¼¥Ð¡¼¡¦¥½¥±¥Ã¥È¤È¤·¤Æ¡¢\f2ServerSocketChannel\fP¤«¤é¼èÆÀ¤·¤¿\f2java.net.ServerSocket\fP¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¥â¡¼¥É¤Ç¤Ï¡¢\f2rmid\fP¤ÎÆ°ºî¤Ï¡¢\f2¼¡¤Î¤³¤È¤ò½ü¤¤¤Æ\fP¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤éµ¯Æ°¤·¤¿¾ì¹ç¤ÈƱ¤¸¤Ç¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++\f2System.err\fP¤ËÂФ¹¤ë½ÐÎϤϡ¢¥Õ¥¡¥¤¥ë¤Ë¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤ë¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï\f2java.io.tmpdir\fP¥·¥¹¥Æ¥à¡¦¥×¥í¥Ñ¥Æ¥£¤Ç»ØÄꤵ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê(Ä̾ï¤Ï\f2/var/tmp\fP¤Þ¤¿¤Ï\f2/tmp\fP)¤Ë¤¢¤ë¡£¥Õ¥¡¥¤¥ë̾¤ÎÀÜƬ¼­¤Ï\f2"rmid\-err"\fP¤Ç¡¢ÀÜÈø¼­¤Ï\f2"tmp"\fP¤Ç¤¢¤ë¡£
++.TP 2
++o
++\f2\-port\fP¥ª¥×¥·¥ç¥ó¤ÏµñÈݤµ¤ì¤ë¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢\f2rmid\fP¤Ï¥¨¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸¤ò½Ð¤·¤Æ½ªÎ»¤¹¤ë¡£
++.TP 2
++o
++\f2\-log\fP¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤È¡¢\f2rmid\fP¤Ï¥¨¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸¤ò½Ð¤·¤Æ½ªÎ»¤¹¤ë¡£
++.RE
++
++.LP
++.LP
++ɬÍפ˱þ¤¸¤Æ¥µ¡¼¥Ó¥¹¤ò³«»Ï¤¹¤ë¤è¤¦¤Ë¹½À®¤¹¤ëÊýË¡¤Î¾ÜºÙ¤Ï¡¢\f2inetd\fP(Solaris¤Î¾ì¹ç)¡¢¤Þ¤¿¤Ï\f2xinetd\fP(Linux)¤Î¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-C<someCommandLineOption>
++\f2rmid\fP¤Î»Ò¥×¥í¥»¥¹(µ¯Æ°¥°¥ë¡¼¥×)¤¬ºîÀ®¤µ¤ì¤¿¤È¤­¤Ë¡¢¤½¤ì¤¾¤ì¤Î»Ò¥×¥í¥»¥¹¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤È¤·¤ÆÅϤµ¤ì¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë»ØÄꤹ¤ë¤È¡¢µ¯Æ°¥·¥¹¥Æ¥à¡¦¥Ç¡¼¥â¥ó¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤ë³Æ²¾ÁÛ¥Þ¥·¥ó¤Ë¥×¥í¥Ñ¥Æ¥£¤òÅϤ¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ rmid \-C\-Dsome.property=value
++.fl
++\fP
++.fi
++¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤ò»Ò¥×¥í¥»¥¹¤ËÅϤ¹µ¡Ç½¤Ï¡¢¥Ç¥Ð¥Ã¥°¤ò¹Ô¤¦¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ rmid \-C\-Djava.rmi.server.logCalls=true
++.fl
++\fP
++.fi
++¤³¤Î¥³¥Þ¥ó¥É¤Ë¤è¤ê¡¢¤¹¤Ù¤Æ¤Î»ÒVM¤Ç¥µ¡¼¥Ð¡¼¸Æ½Ð¤·¤Î¥í¥°¤¬ºîÀ®¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++.TP 3
++\-J<someCommandLineOption>
++\f2rmid\fP¤ò¼Â¹Ô¤·¤Æ¤¤¤ë\f2java\fP¥¤¥ó¥¿¥×¥ê¥¿¤ËÅϤ¹¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f2rmid\fP¤¬\f2rmid.policy\fP¤È¤¤¤¦Ì¾Á°¤Î¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë»ØÄꤹ¤ë¤Ë¤Ï¡¢\f2rmid\fP¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2\-J\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢\f2java.security.policy\fP¥×¥í¥Ñ¥Æ¥£¤òÄêµÁ¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ rmid \-J\-Djava.security.policy=rmid.policy
++.fl
++\fP
++.fi
++.TP 3
++\-J\-Dsun.rmi.activation.execPolicy=<policy>
++µ¯Æ°¥°¥ë¡¼¥×¤¬¼Â¹Ô¤µ¤ì¤ë¤³¤È¤Ë¤Ê¤ëVM¤Îµ¯Æ°¤Ë»ÈÍѤ¹¤ë¥³¥Þ¥ó¥É¤ª¤è¤Ó¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤¿¤á¤Ë¡¢\f2rmid\fP¤¬ºÎÍѤ¹¤ë¥Ý¥ê¥·¡¼¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢Java RMIµ¯Æ°¥Ç¡¼¥â¥ó¤ÎSun¤Î¼ÂÁõ¤Î¤ß¤Ë¸ºß¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤³¤Î¥×¥í¥Ñ¥Æ¥£¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢·ë²Ì¤Ï\f2\-J\-Dsun.rmi.activation.execPolicy=default\fP¤ò»ØÄꤷ¤¿¾ì¹ç¤ÈƱ¤¸¤Ë¤Ê¤ê¤Þ¤¹¡£\f2<policy>\fP¤Ë»ØÄê²Äǽ¤ÊÃͤϡ¢\f2default\fP¡¢\f2<policyClassName>\fP¡¢¤Þ¤¿¤Ï\f2none\fP¤Ç¤¹¡£
++.RS 3
++.TP 2
++o
++\f3default(¤Þ¤¿¤Ï¡¢¤³¤Î¥×¥í¥Ñ¥Æ¥£¤¬\fP\f4»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤\fP\f3¾ì¹ç)\fP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤Î\f2execPolicy\fP¤Î¾ì¹ç¡¢\f2rmid\fP¤¬¼Â¹Ô¤Ç¤­¤ë¤Î¤Ï¡¢\f2rmid\fP¤¬»ÈÍѤ¹¤ë¥»¥­¥å¥ê¥Æ¥£¡¦¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç¡¢¼Â¹Ô¤¹¤ë¸¢¸Â¤¬\f2rmid\fP¤ËÍ¿¤¨¤é¤ì¤Æ¤¤¤ë¥³¥Þ¥ó¥É¤ª¤è¤Ó¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤Î¤ß¤Ç¤¹¡£\f2¥Ç¥Õ¥©¥ë¥È\fP¤Î¼Â¹Ô¥Ý¥ê¥·¡¼¤Ç»ÈÍѤǤ­¤ë¤Î¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Îµ¯Æ°¥°¥ë¡¼¥×¼ÂÁõ¤Î¤ß¤Ç¤¹¡£
++.LP
++\f2rmid\fP¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×ÍѤÎVM¤òµ¯Æ°¤¹¤ë¤È¤­¤Ë¡¢¤½¤Î¥°¥ë¡¼¥×¤Ë¤Ä¤¤¤ÆÅÐÏ¿¤µ¤ì¤¿µ¯Æ°¥°¥ë¡¼¥×µ­½Ò»Ò¤Ç¤¢¤ë\f2ActivationGroupDesc\fPÆâ¤Î¾ðÊó¤ò»ÈÍѤ·¤Þ¤¹¡£¥°¥ë¡¼¥×µ­½Ò»Ò¤Ï¡¢\f2ActivationGroupDesc.CommandEnvironment\fP¤ò»ØÄꤷ¤Þ¤¹(¾Êά²Äǽ)¡£¤³¤ì¤Ë¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤ò³«»Ï¤¹¤ë\f2¥³¥Þ¥ó¥É\fP¤È¡¢¤½¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤ËÄɲäǤ­¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦\f2¥ª¥×¥·¥ç¥ó\fP¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢\f2rmid\fP¤Ï\f2java.home\fP¤Ë¤¢¤ë\f2java\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£¥°¥ë¡¼¥×µ­½Ò»Ò¤Ë¤Ï¡¢¥ª¥×¥·¥ç¥ó¤È¤·¤Æ¥³¥Þ¥ó¥É¥é¥¤¥ó¤ËÄɲ䵤ì¤ë\f2¥×¥í¥Ñ¥Æ¥£\fP¡¦¥ª¡¼¥Ð¡¼¥é¥¤¥É¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥×¥í¥Ñ¥Æ¥£¤Ï¡¢¼¡¤Î¤è¤¦¤ËÄêµÁ¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ \-D\fP\f4<property>\fP\f3=\fP\f4<value>\fP\f3
++.fl
++\fP
++.fi
++.LP
++¥¢¥¯¥»¥¹¸¢\f2com.sun.rmi.rmid.ExecPermission\fP¤ò»ÈÍѤ¹¤ë¤È¡¢\f2rmid\fP¤ËÂФ·¤Æ¡¢¥°¥ë¡¼¥×µ­½Ò»Ò¤Î\f2CommandEnvironment\fP¤Ç»ØÄꤵ¤ì¤¿¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æµ¯Æ°¥°¥ë¡¼¥×¤ò³«»Ï¤¹¤ë¸¢¸Â¤òµö²Ä¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥¢¥¯¥»¥¹¸¢\f2com.sun.rmi.rmid.ExecOptionPermission\fP¤ò»ÈÍѤ¹¤ë¤È¡¢¥°¥ë¡¼¥×µ­½Ò»Ò¤Ç¥×¥í¥Ñ¥Æ¥£¡¦¥ª¡¼¥Ð¡¼¥é¥¤¥É¤È¤·¤Æ»ØÄꤵ¤ì¤¿¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¡¢¤Þ¤¿¤Ï\f2CommandEnvironment\fP¤Ç¥ª¥×¥·¥ç¥ó¤È¤·¤Æ»ØÄꤵ¤ì¤¿¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤ò¡¢µ¯Æ°¥°¥ë¡¼¥×¤ò³«»Ï¤¹¤ë¤È¤­¤Ë\f2rmid\fP¤¬»ÈÍѤǤ­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.LP
++\f2rmid¤Ë\fPÍÍ¡¹¤Ê¥³¥Þ¥ó¥É¤ª¤è¤Ó¥ª¥×¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ë¸¢¸Â¤òµö²Ä¤¹¤ë¾ì¹ç¤Ï¡¢¥¢¥¯¥»¥¹¸¢\f2ExecPermission\fP¤ª¤è¤Ó\f2ExecOptionPermission\fP¤òÈÆÍÑŪ¤Ëµö²Ä¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¤¹¤Ù¤Æ¤Î¥³¡¼¥É¡¦¥½¡¼¥¹¤ËÂФ·¤Æµö²Ä¤·¤Þ¤¹¡£
++.RS 3
++.TP 3
++ExecPermission
++\f2ExecPermission\fP¥¯¥é¥¹¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤ò³«»Ï¤¹¤ë¤¿¤á¤Ë\f2rmid¤¬\fPÆÃÄê¤Î\f2¥³¥Þ¥ó¥É\fP¤ò¼Â¹Ô¤¹¤ë¸¢¸Â¤òɽ¤·¤Þ¤¹¡£
++.LP
++\f3¹½Ê¸\fP
++.br
++\f2ExecPermission\fP¤Î\f2̾Á°\fP¤Ï¡¢\f2rmid\fP¤Ë¼Â¹Ô¤òµö²Ä¤¹¤ë¥³¥Þ¥ó¥É¤Î¥Ñ¥¹Ì¾¤Ç¤¹¡£¡Ö/*¡×(¡Ö/¡×¤Ï¥Õ¥¡¥¤¥ë¶èÀÚ¤êʸ»ú\f2File.separatorChar\fP)¤Ç½ª¤ï¤ë¥Ñ¥¹Ì¾¤Ï¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Þ¤Þ¤ì¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¼¨¤·¤Þ¤¹¡£¡Ö/\-¡×¤Ç½ª¤ï¤ë¥Ñ¥¹Ì¾¤Ï¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Þ¤Þ¤ì¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤È¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê(ºÆµ¢Åª¤Ë)¤ò¼¨¤·¤Þ¤¹¡£¥Ñ¥¹Ì¾¤ËÆÃÊ̤ʥȡ¼¥¯¥ó¡Ö<<ALL FILES>>¡×¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢\f3Ǥ°Õ¤Î\fP¥Õ¥¡¥¤¥ë¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++\f3Ãí°Õ:\fP ¡Ö*¡×¤ò1¤Ä¤Î¤ß»ØÄꤷ¤¿¥Ñ¥¹Ì¾¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤òɽ¤·¤Þ¤¹¡£¤Þ¤¿¡¢¡Ö\-¡×¤ò1¤Ä¤Î¤ß»ØÄꤷ¤¿¥Ñ¥¹Ì¾¤Ï¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤È¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Þ¤Þ¤ì¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤È¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê(ºÆµ¢Åª¤Ë)¤òɽ¤·¤Þ¤¹¡£
++.TP 3
++ExecOptionPermission
++\f2ExecOptionPermission\fP¥¯¥é¥¹¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤ò³«»Ï¤¹¤ë¤È¤­¤Ë\f2rmid\fP¤ÇÆÃÄê¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦\f2¥ª¥×¥·¥ç¥ó\fP¤ò»ÈÍѤǤ­¤ë¸¢¸Â¤òɽ¤·¤Þ¤¹¡£\f2ExecOptionPermission\fP¤Î\f2̾Á°\fP¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤ÎÃͤǤ¹¡£
++.LP
++\f3¹½Ê¸\fP
++.br
++¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢¥ï¥¤¥ë¥É¥«¡¼¥É¤¬¸ÂÄêŪ¤Ë¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯¤Ï¡¢¥ï¥¤¥ë¥É¥«¡¼¥É¡¦¥Þ¥Ã¥Á¤òɽ¤·¤Þ¤¹¡£¥¢¥¹¥¿¥ê¥¹¥¯¤Ï¡¢¥ª¥×¥·¥ç¥ó̾¤½¤Î¤â¤Î¤È¤·¤Æ»ÈÍѤǤ­¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢Ç¤°Õ¤Î¥ª¥×¥·¥ç¥ó¤òɽ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢¥ª¥×¥·¥ç¥ó̾¤ÎËöÈø¤Ë»ÈÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¢¡Ö.¡×¤«¡Ö=¡×¤Îľ¸å¤Ë¥¢¥¹¥¿¥ê¥¹¥¯¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.LP
++Îã¤ò¼¨¤·¤Þ¤¹¡£¡Ö*¡×¡¢¡Ö\-Dfoo.*¡×¡¢¡Ö\-Da.b.c=*¡×¤ÏÍ­¸ú¤Ç¤¹¤¬¡¢¡Ö*foo¡×¡¢¡Ö\-Da*b¡×¡¢¡Öab*¡×¤Ï̵¸ú¤Ç¤¹¡£
++.TP 3
++rmid¤Î¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë
++\f2rmid¤Ë\fPÍÍ¡¹¤Ê¥³¥Þ¥ó¥É¤ª¤è¤Ó¥ª¥×¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ë¸¢¸Â¤òµö²Ä¤¹¤ë¾ì¹ç¤Ï¡¢¥¢¥¯¥»¥¹¸¢\f2ExecPermission\fP¤ª¤è¤Ó\f2ExecOptionPermission\fP¤òÈÆÍÑŪ¤Ëµö²Ä¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¤¹¤Ù¤Æ¤Î¥³¡¼¥É¡¦¥½¡¼¥¹¤ËÂФ·¤Æµö²Ä¤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥¢¥¯¥»¥¹¸¢¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤Î¤Ï\f2rmid\fP¤Î¤ß¤Ê¤Î¤Ç¡¢¤³¤ì¤é¤Î¥¢¥¯¥»¥¹¸¢¤òÈÆÍÑŪ¤Ëµö²Ä¤·¤Æ¤â°ÂÁ´¤Ç¤¹¡£
++.LP
++\f2rmid\fP¤Ë³Æ¼ï¤Î¼Â¹Ô¸¢¸Â¤òµö²Ä¤¹¤ë¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ÎÎã¤ò¡¢¼¡¤Ë¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++grant {
++.fl
++ permission com.sun.rmi.rmid.ExecPermission
++.fl
++ "/files/apps/java/jdk1.7.0/solaris/bin/java";
++.fl
++
++.fl
++ permission com.sun.rmi.rmid.ExecPermission
++.fl
++ "/files/apps/rmidcmds/*";
++.fl
++
++.fl
++ permission com.sun.rmi.rmid.ExecOptionPermission
++.fl
++ "\-Djava.security.policy=/files/policies/group.policy";
++.fl
++
++.fl
++ permission com.sun.rmi.rmid.ExecOptionPermission
++.fl
++ "\-Djava.security.debug=*";
++.fl
++
++.fl
++ permission com.sun.rmi.rmid.ExecOptionPermission
++.fl
++ "\-Dsun.rmi.*";
++.fl
++};
++.fl
++\fP
++.fi
++ºÇ½é¤ËÉÕÍ¿¤µ¤ì¤Æ¤¤¤ë¥¢¥¯¥»¥¹¸¢¤Ï¡¢\f2rmid\fP¤ËÂФ·¡¢¥Ñ¥¹Ì¾¤Ë¤è¤êÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤ë\f2java\fP¥³¥Þ¥ó¥É¤Î1.7.0¥Ð¡¼¥¸¥ç¥ó¤Î¼Â¹Ô¤òµö²Ä¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢\f2java.home\fP¤Ë¤¢¤ë¥Ð¡¼¥¸¥ç¥ó¤Î\f2java\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£\f2rmid\fP¤¬»ÈÍѤ¹¤ë¤Î¤ÈƱ¤¸¥Ð¡¼¥¸¥ç¥ó¤¬»ÈÍѤµ¤ì¤ë¤¿¤á¡¢¤½¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤Ç»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£2ÈÖÌܤΥ¢¥¯¥»¥¹¸¢¤Ï¡¢\f2rmid\fP¤ËÂФ·¤Æ¡¢¥Ç¥£¥ì¥¯¥È¥ê\f2/files/apps/rmidcmds\fPÆâ¤ÎǤ°Õ¤Î¥³¥Þ¥ó¥É¤Î¼Â¹Ô¸¢¸Â¤òµö²Ä¤·¤Þ¤¹¡£
++.LP
++3ÈÖÌܤËÉÕÍ¿¤µ¤ì¤Æ¤¤¤ë¥¢¥¯¥»¥¹¸¢\f2ExecOptionPermission\fP¤Ï¡¢\f2rmid\fP¤ËÂФ·¤Æ¡¢¥»¥­¥å¥ê¥Æ¥£¡¦¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ò\f2/files/policies/group.policy\fP¤È¤·¤ÆÄêµÁ¤·¤Æ¤¤¤ëµ¯Æ°¥°¥ë¡¼¥×¤Î³«»Ï¤òµö²Ä¤·¤Þ¤¹¡£¼¡¤Î¥¢¥¯¥»¥¹¸¢¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤¬\f2java.security.debug\fP¥×¥í¥Ñ¥Æ¥£¤ò»ÈÍѤ¹¤ë¤³¤È¤òµö²Ä¤·¤Æ¤¤¤Þ¤¹¡£ºÇ¸å¤Î¥¢¥¯¥»¥¹¸¢¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤¬\f2sun.rmi\fP¤È¤¤¤¦¥×¥í¥Ñ¥Æ¥£Ì¾¤Î³¬ÁØÆâ¤ÎǤ°Õ¤Î¥×¥í¥Ñ¥Æ¥£¤ò»ÈÍѤ¹¤ë¤³¤È¤òµö²Ä¤·¤Æ¤¤¤Þ¤¹¡£
++.LP
++¥Ý¥ê¥·¡¼¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ\f2rmid\fP¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢\f2rmid\fP¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç\f2java.security.policy\fP¥×¥í¥Ñ¥Æ¥£¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++\f2rmid \-J\-Djava.security.policy=rmid.policy\fP
++.RE
++.TP 2
++o
++\f4<policyClassName>\fP
++.LP
++¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ç¤Ï½½Ê¬¤Ê½ÀÆðÀ­¤¬ÆÀ¤é¤ì¤Ê¤¤¾ì¹ç¡¢´ÉÍý¼Ô¤Ï¡¢\f2rmid\fP¤Îµ¯Æ°»þ¤Ë¡¢\f2checkExecCommand\fP¥á¥½¥Ã¥É¤¬½ê°¤¹¤ë¥¯¥é¥¹¤Î̾Á°¤ò»ØÄꤷ¤Æ¡¢rmid¤¬¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
++.LP
++\f2policyClassName\fP¤Ë¤Ï¡¢°ú¿ô¤Ê¤·¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¤ò»ý¤Á¡¢¼¡¤Î¤è¤¦¤Ê\f2checkExecCommand\fP¥á¥½¥Ã¥É¤ò¼ÂÁõ¤·¤Æ¤¤¤ëpublic¥¯¥é¥¹¤ò»ØÄꤷ¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ public void checkExecCommand(ActivationGroupDesc desc,
++.fl
++ String[] command)
++.fl
++ throws SecurityException;
++.fl
++\fP
++.fi
++¥¢¥¯¥Æ¥£¥Ö²½¥°¥ë¡¼¥×¤ò³«»Ï¤¹¤ëÁ°¤Ë¡¢\f2rmid\fP¤Ï¡¢¥Ý¥ê¥·¡¼¤Î\f2checkExecCommand\fP¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹¡£¤³¤Î¤È¤­¡¢¥¢¥¯¥Æ¥£¥Ö²½¥°¥ë¡¼¥×¤Îµ­½Ò»Ò¤È¡¢¥¢¥¯¥Æ¥£¥Ö²½¥°¥ë¡¼¥×¤ò³«»Ï¤¹¤ë¤¿¤á¤Î´°Á´¤Ê¥³¥Þ¥ó¥É¤ò´Þ¤àÇÛÎó¤ò¤½¤Î¥á¥½¥Ã¥É¤ËÅϤ·¤Þ¤¹¡£\f2checkExecCommand\fP¤¬\f2SecurityException\fP¤ò¥¹¥í¡¼¤¹¤ë¤È¡¢\f2rmid\fP¤Ï¤½¤Î¥¢¥¯¥Æ¥£¥Ö²½¥°¥ë¡¼¥×¤ò³«»Ï¤»¤º¡¢¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¢¥¯¥Æ¥£¥Ö²½¤ò»î¹Ô¤·¤Æ¤¤¤ë¸Æ½Ð¤·Â¦¤Ë¤Ï\f2ActivationException\fP¤¬¥¹¥í¡¼¤µ¤ì¤Þ¤¹¡£
++.TP 2
++o
++\f3none\fP
++.LP
++\f2sun.rmi.activation.execPolicy\fP¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬¡Önone¡×¤Î¾ì¹ç¡¢\f2rmid\fP¤Ï¡¢µ¯Æ°¥°¥ë¡¼¥×¤ò³«»Ï¤¹¤ë¥³¥Þ¥ó¥É¤ò¤Þ¤Ã¤¿¤¯¸¡¾Ú¤·¤Þ¤»¤ó¡£
++.RE
++.LP
++.TP 3
++\-log dir
++µ¯Æ°¥·¥¹¥Æ¥à¡¦¥Ç¡¼¥â¥ó¤¬¥Ç¡¼¥¿¥Ù¡¼¥¹¤ª¤è¤Ó´ØÏ¢¾ðÊó¤ò½ñ¤­¹þ¤à¤Î¤Ë»ÈÍѤ¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢\f2rmid\fP¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë¡¢\f2log\fP¤È¤¤¤¦¥í¥°¡¦¥Ç¥£¥ì¥¯¥È¥ê¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
++.LP
++.TP 3
++\-port port
++\f2rmid\fP¤Î¥ì¥¸¥¹¥È¥ê¤¬»ÈÍѤ¹¤ë¥Ý¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£µ¯Æ°¥·¥¹¥Æ¥à¡¦¥Ç¡¼¥â¥ó¤Ï¡¢¤³¤Î¥ì¥¸¥¹¥È¥ê¤ÎÃæ¤Ç¡¢\f2java.rmi.activation.ActivationSystem\fP¤È¤¤¤¦Ì¾Á°¤Ç\f2ActivationSystem\fP¤ò¥Ð¥¤¥ó¥É¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¥í¡¼¥«¥ë¡¦¥Þ¥·¥ó¾å¤Î\f2ActivationSystem\fP¤Ï¡¢¼¡¤Î¤è¤¦¤Ë\f2Naming.lookup\fP¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤Ë¤è¤Ã¤Æ¼èÆÀ¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ import java.rmi.*;
++.fl
++ import java.rmi.activation.*;
++.fl
++
++.fl
++ ActivationSystem system; system = (ActivationSystem)
++.fl
++ Naming.lookup("//:\fP\f4port\fP/java.rmi.activation.ActivationSystem");
++.fl
++.fi
++.TP 3
++\-stop
++\f2\-port\fP¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤¿¥Ý¡¼¥È¤Î¡¢¸½ºß¤Î\f2rmid\fP¸Æ½Ð¤·¤òÄä»ß¤·¤Þ¤¹¡£¥Ý¡¼¥È¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ý¡¼¥È1098¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë\f2rmid\fP¤òÄä»ß¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´Ä¶­ÊÑ¿ô"
++.LP
++.RS 3
++.TP 3
++CLASSPATH
++¥æ¡¼¥¶¡¼ÄêµÁ¥¯¥é¥¹¤Ø¤Î¥Ñ¥¹¤ò¥·¥¹¥Æ¥à¤Ë»ØÄꤷ¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥³¥í¥ó¤Çʬ³ä¤·¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ .:/usr/local/java/classes
++.fl
++\fP
++.fi
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.LP
++rmic(1)¡¢
++.na
++\f2CLASSPATH\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath¡¢java(1)
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/rmiregistry.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/rmiregistry.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,65 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH rmiregistry 1 "07 May 2011"
++.TH rmiregistry 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++rmiregistry \- Java¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¡¦¥ì¥¸¥¹¥È¥ê
++.LP
++.RS 3
++\f3rmiregistry\fP¥³¥Þ¥ó¥É¤Ï¡¢¸½ºß¤Î¥Û¥¹¥È¤Î»ØÄꤷ¤¿¥Ý¡¼¥È¾å¤Ë¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¡¦¥ì¥¸¥¹¥È¥ê¤ò³«»Ï¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++rmiregistry [\fP\f4port\fP\f3]
++.fl
++\fP
++.fi
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3rmiregistry\fP¥³¥Þ¥ó¥É¤Ï¡¢¸½ºß¤Î¥Û¥¹¥È¤Î»ØÄê\f2port\fP¾å¤Ë¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¡¦¥ì¥¸¥¹¥È¥ê¤òºîÀ®¤·¡¢³«»Ï¤·¤Þ¤¹¡£\f2port\fP¤Î»ØÄê¤ò¾Êά¤·¤¿¾ì¹ç¡¢¥ì¥¸¥¹¥È¥ê¤Ï¥Ý¡¼¥È1099¤Ç³«»Ï¤·¤Þ¤¹¡£\f3rmiregistry\fP¥³¥Þ¥ó¥É¤Ë¡¢½ÐÎϵ¡Ç½¤Ï¤¢¤ê¤Þ¤»¤ó¡£Ä̾¤³¤ì¤Ï¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2rmiregistry &\fP
++.LP
++.LP
++¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¡¦¥ì¥¸¥¹¥È¥ê¤Ï¡¢¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¤Î¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ç¤¹¡£Æ±°ì¥Û¥¹¥È¤ÎRMI¥µ¡¼¥Ð¡¼¤¬¡¢¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤ò̾Á°¤Ë¥Ð¥¤¥ó¥É¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£¼¡¤Ë¡¢¥í¡¼¥«¥ë¤ª¤è¤Ó¥ê¥â¡¼¥È¡¦¥Û¥¹¥È¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ï¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤ò¸¡º÷¤·¡¢¥ê¥â¡¼¥È¡¦¥á¥½¥Ã¥É¤Î¸Æ½Ð¤·¤ò¹Ô¤¤¤Þ¤¹¡£
++.LP
++.LP
++¥ì¥¸¥¹¥È¥ê¤Ï¡¢°ìÈÌŪ¤Ë¡¢ºÇ½é¤Î¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î°ÌÃÖ¤ò»ØÄꤷ¤Þ¤¹¡£¤½¤³¤Ç¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹É¬Íפ¬¤¢¤ê¤Þ¤¹¡£¤«¤ï¤Ã¤Æ¡¢¤½¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó»ØÄê¤Î¥µ¥Ý¡¼¥È¤òÄ󶡤·¡¢Â¾¤Î¥ª¥Ö¥¸¥§¥¯¥È¤òõ¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2java.rmi.registry.LocateRegistry\fP¥¯¥é¥¹¤Î¥á¥½¥Ã¥É¤Ï¡¢¥í¡¼¥«¥ë¡¦¥Û¥¹¥È¡¢¤Þ¤¿¤Ï¥í¡¼¥«¥ë¡¦¥Û¥¹¥È¤È¥Ý¡¼¥È¤ÇÆ°ºî¤¹¤ë¥ì¥¸¥¹¥È¥ê¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f2java.rmi.Naming\fP¥¯¥é¥¹¤ÎURL¥Ù¡¼¥¹¤Î¥á¥½¥Ã¥É¤Ï¡¢¥ì¥¸¥¹¥È¥ê¤ÇÆ°ºî¤·¡¢Ç¤°Õ¤Î¥Û¥¹¥È¤ª¤è¤Ó¥í¡¼¥«¥ë¡¦¥Û¥¹¥È¾å¤Î¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Î¸¡º÷¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤Ëñ½ã¤Ê(ʸ»úÎó)̾Á°¤ò¥Ð¥¤¥ó¥É¤·¤¿¤ê¡¢¿·¤·¤¤Ì¾Á°¤ò¥ê¥Ð¥¤¥ó¥É(¸Å¤¤¥Ð¥¤¥ó¥É¤Ë¥ª¡¼¥Ð¡¼¥é¥¤¥É)¤·¤Þ¤¹¡£¤Þ¤¿¥ê¥â¡¼¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤ò¥¢¥ó¥Ð¥¤¥ó¥É¤·¤¿¤ê¡¢¥ì¥¸¥¹¥È¥ê¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤¿URL¤ò½ÐÎϤ·¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-J
++\f2\-J\fP¤Î¸å¤í¤Ë³¤¯¥ª¥×¥·¥ç¥ó¤ò\f2java\fP¥¤¥ó¥¿¥×¥ê¥¿¤Ë°ú¤­ÅϤ·¤Þ¤¹¡£\f2java\fP¥ª¥×¥·¥ç¥ó¤ÈÁȤ߹礻¤Æ»ÈÍѤ·¤Þ¤¹(\-J¤Èjava¥ª¥×¥·¥ç¥ó¤Î´Ö¤Ë¥¹¥Ú¡¼¥¹¤ÏÆþ¤ì¤Ê¤¤)¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++java(1)¡¢
++.na
++\f2java.rmi.registry.LocateRegistry\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html¤ª¤è¤Ó
++.na
++\f2java.rmi.Naming\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html
+--- ./jdk/src/bsd/doc/man/ja/schemagen.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/schemagen.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,109 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH schemagen 1 "07 May 2011"
++.TH schemagen 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++schemagen \- XML¥Ð¥¤¥ó¥É¤Î¤¿¤á¤ÎJava(tm)¥¢¡¼¥­¥Æ¥¯¥Á¥ã¡¦¥¹¥­¡¼¥Þ¡¦¥¸¥§¥Í¥ì¡¼¥¿
++.LP
++.LP
++\f3»ÅÍͥС¼¥¸¥ç¥ó:\fP 2.1
++.br
++\f3¼ÂÁõ¥Ð¡¼¥¸¥ç¥ó:\fP 2.1.3
++.LP
++.SH "schemagen¤Îµ¯Æ°"
++.LP
++.LP
++¥¹¥­¡¼¥Þ¡¦¥¸¥§¥Í¥ì¡¼¥¿¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢¥æ¡¼¥¶¡¼¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î\f2bin\fP¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¤¢¤ëŬÀÚ¤Ê\f2schemagen\fP¥·¥§¥ë¡¦¥¹¥¯¥ê¥×¥È¤ò»ÈÍѤ·¤Þ¤¹¡£
++.LP
++.LP
++¸½ºß¤Î¥¹¥­¡¼¥Þ¡¦¥¸¥§¥Í¥ì¡¼¥¿¤Ï¡¢Java¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤È¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¤¤¤º¤ì¤â½èÍý¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++¤Þ¤¿¡¢¥¹¥­¡¼¥Þ¡¦¥¸¥§¥Í¥ì¡¼¥¿¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤ÎAnt¥¿¥¹¥¯¤âÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.na
++\f2schemagen¤òAnt¤È¤È¤â¤Ë»ÈÍѤ¹¤ë\fP @
++.fi
++https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html¤¿¤á¤Î¼ê½ç¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.nf
++\f3
++.fl
++% schemagen.sh Foo.java Bar.java ...
++.fl
++Note: Writing schema1.xsd
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥æ¡¼¥¶¡¼¤ÎJava¥½¡¼¥¹/¥¯¥é¥¹¤¬Â¾¤Î¥¯¥é¥¹¤ò»²¾È¤·¤Æ¤¤¤ë¾ì¹ç¡¢¥·¥¹¥Æ¥à¤ÎCLASSPATH´Ä¶­ÊÑ¿ô¤Ç¤½¤ì¤é¤Î¥¯¥é¥¹¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¡¢\f2\-classpath\fP/\f2\-cp\fP¤ò»ÈÍѤ·¤Æ¤½¤ì¤é¤Î¥¯¥é¥¹¤ò¥Ä¡¼¥ë¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤¦¤·¤Ê¤¤¤È¡¢¥¹¥­¡¼¥Þ¤ÎÀ¸À®»þ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤¹¡£
++.LP
++.SS
++¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó
++.LP
++.nf
++\f3
++.fl
++Usage: schemagen [\-options ...] <java files>
++.fl
++
++.fl
++Options:
++.fl
++ \-d <path> : specify where to place processor and javac generated class files
++.fl
++ \-cp <path> : specify where to find user specified files
++.fl
++ \-classpath <path> : specify where to find user specified files
++.fl
++ \-encoding <encoding> : specify encoding to be used for apt/javac invocation
++.fl
++
++.fl
++ \-episode <file> : generate episode file for separate compilation
++.fl
++ \-version : display version information
++.fl
++ \-help : display this usage message
++.fl
++\fP
++.fi
++
++.LP
++.SH "À¸À®¤µ¤ì¤ë¥ê¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë"
++.LP
++.LP
++¸½ºß¤Î¥¹¥­¡¼¥Þ¡¦¥¸¥§¥Í¥ì¡¼¥¿¤Ïñ½ã¤Ë¡¢Java¥¯¥é¥¹Æâ¤Ç»²¾È¤µ¤ì¤Æ¤¤¤ë̾Á°¶õ´Ö¤´¤È¤Ë1¤Ä¤Î¥¹¥­¡¼¥Þ¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£À¸À®¤µ¤ì¤ë¥¹¥­¡¼¥Þ¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀ©¸æ¤¹¤ëÊýË¡¤Ï¡¢¸½»þÅÀ¤Ç¤Ï¸ºß¤·¤Þ¤»¤ó¡£¤½¤¦¤·¤¿ÌÜŪ¤Ë¤Ï¡¢
++.na
++\f2¥¹¥­¡¼¥Þ¡¦¥¸¥§¥Í¥ì¡¼¥¿¤Îant¥¿¥¹¥¯\fP @
++.fi
++https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "̾Á°"
++´ØÏ¢¹àÌÜ
++.LP
++.RS 3
++.TP 2
++o
++¥¹¥­¡¼¥Þ¡¦¥¸¥§¥Í¥ì¡¼¥¿¤Î¼Â¹Ô(schemagen): [
++.na
++\f2¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÎÌ¿Îá\fP @
++.fi
++https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagen.html¡¢
++.na
++\f2SchemaGen¤ÎAnt¥¿¥¹¥¯¤Î»ÈÍÑ\fP @
++.fi
++https://jaxb.dev.java.net/nonav/2.1.3/docs/schemagenTask.html]
++.TP 2
++o
++.na
++\f2XML¥Ð¥¤¥ó¥É¤Î¤¿¤á¤ÎJava¥¢¡¼¥­¥Æ¥¯¥Á¥ã(JAXB)\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/serialver.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/serialver.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,79 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH serialver 1 "07 May 2011"
++.TH serialver 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++serialver \- ¥·¥ê¥¢¥ë¡¦¥Ð¡¼¥¸¥ç¥ó¡¦¥³¥Þ¥ó¥É
++.LP
++.LP
++\f3serialver\fP¥³¥Þ¥ó¥É¤Ï\f2serialVersionUID\fP¤òÊÖ¤·¤Þ¤¹¡£
++.LP
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++\fP\f3serialver\fP [ options ] [ classnames ]
++.fl
++.fi
++
++.LP
++.RS 3
++.TP 3
++options
++¤³¤Î¥É¥­¥å¥á¥ó¥È¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£
++.TP 3
++classnames
++1¤Ä°Ê¾å¤Î¥¯¥é¥¹Ì¾¤Ç¤¹¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f3serialver\fP¤Ï¡¢1¤Ä°Ê¾å¤Î¥¯¥é¥¹¤Î\f2serialVersionUID\fP¤ò¡¢Å¸³«¤·¤Æ¤¤¤ë¥¯¥é¥¹¤Ø¥³¥Ô¡¼¤¹¤ë¤Î¤ËŬ¤·¤¿·Á¼°¤ÇÊÖ¤·¤Þ¤¹¡£°ú¿ô¤ò»ØÄꤷ¤Ê¤¤¤Ç¸Æ¤Ó½Ð¤¹¤È¡¢»ÈÍÑÊýË¡¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-classpath<: ¤Ç¶èÀÚ¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Èzip¤äjar¥Õ¥¡¥¤¥ë>
++¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¯¥é¥¹¤ª¤è¤Ó¥ê¥½¡¼¥¹¤Î¸¡º÷¥Ñ¥¹¤òÀßÄꤷ¤Þ¤¹¡£
++.RE
++
++.LP
++.RS 3
++.TP 3
++\-show
++´Êñ¤Ê¥æ¡¼¥¶¡¼¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òɽ¼¨¤·¤Þ¤¹¡£´°Á´»ØÄê¤Î¥¯¥é¥¹Ì¾¤òÆþÎϤ·¤Æ¡¢Enter¥­¡¼¤«¡ÖShow¡×¥Ü¥¿¥ó¤ò²¡¤·¡¢¥·¥ê¥¢¥ë¡¦¥Ð¡¼¥¸¥ç¥óUID¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-Joption
++Java²¾ÁÛ¥Þ¥·¥ó¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£\f2option\fP¤Ë¤Ï¡¢java(1)¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò1¤Ä»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "Ãí°Õ"
++.LP
++.LP
++\f3serialver\fP¥³¥Þ¥ó¥É¤Ï¡¢»ØÄꤵ¤ì¤¿¥¯¥é¥¹¤ò¤½¤Î²¾ÁÛ¥Þ¥·¥óÆâ¤ËÆɤ߹þ¤ó¤Ç½é´ü²½¤·¤Þ¤¹¤¬¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥»¥­¥å¥ê¥Æ¥£¡¦¥Þ¥Í¡¼¥¸¥ã¤ÎÀßÄê¤Ï¹Ô¤¤¤Þ¤»¤ó¡£¿®Íê¤Ç¤­¤Ê¤¤¥¯¥é¥¹¤È¤È¤â¤Ë\f3serialver\fP¤ò¼Â¹Ô¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢¼¡¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥»¥­¥å¥ê¥Æ¥£¡¦¥Þ¥Í¡¼¥¸¥ã¤òÀßÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f2\-J\-Djava.security.manager\fP
++.LP
++.LP
++¤Þ¤¿¡¢É¬ÍפǤ¢¤ì¤Ð¡¢¼¡¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥»¥­¥å¥ê¥Æ¥£¡¦¥Ý¥ê¥·¡¼¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
++.LP
++.LP
++\f2\-J\-Djava.security.policy=<policy file>\fP
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.LP
++.na
++\f2java.io.ObjectStreamClass\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/servertool.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/servertool.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,95 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH servertool 1 "07 May 2011"
++.TH servertool 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++servertool \- Java(tm)IDL¥µ¡¼¥Ð¡¼¡¦¥Ä¡¼¥ë
++.LP
++\f3servertool\fP¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥×¥í¥°¥é¥Þ¤¬¡¢±Ê³¥µ¡¼¥Ð¡¼¤ÎÅÐÏ¿¡¢ÅÐÏ¿²ò½ü¡¢µ¯Æ°¤ª¤è¤ÓÄä»ß¤ò¹Ô¤¦¤¿¤á¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Þ¤¹¡£
++.SH "·Á¼°"
++.LP
++.nf
++\f3
++.fl
++servertool \-ORBInitialPort \fP\f4nameserverport\fP\f3 \fP\f3options\fP\f3 [ \fP\f3commands\fP\f3 ]
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Ê¤¤¤Ç\f2servertool\fP¤òµ¯Æ°¤¹¤ë¤È¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥Ä¡¼¥ë¤È¤·¤Æ\f2servertool >\fP¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\f2servertool >\fP¥×¥í¥ó¥×¥È¤Ë¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£
++.LP
++.LP
++¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ\f2servertool\fP¤òµ¯Æ°¤¹¤ë¤È¡¢Java IDL¥µ¡¼¥Ð¡¼¡¦¥Ä¡¼¥ë¤¬µ¯Æ°¤·¡¢¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
++.LP
++.LP
++\f2\-ORBInitialPort\fP \f2nameserverport\fP¥ª¥×¥·¥ç¥ó¤Ï\f3ɬ¿Ü\fP¤Ç¤¹¡£\f2nameserverport\fP¤ÎÃͤˤϡ¢\f2orbd\fP¤¬¼Â¹Ô¤µ¤ì¡¢Ãå¿®¥ê¥¯¥¨¥¹¥È¤òÂÔµ¡¤·¤Æ¤¤¤ë¥Ý¡¼¥È¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Solaris¥½¥Õ¥È¥¦¥§¥¢¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢1024¤è¤ê¾®¤µ¤¤¥Ý¡¼¥È¾å¤Ç¥×¥í¥»¥¹¤ò³«»Ï¤¹¤ë¤Ë¤Ï¡¢root¥æ¡¼¥¶¡¼¤Ë¤Ê¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢\f2nameserverport\fP¤È¤·¤Æ1024°Ê¾å¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f2servertool\fP¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥×¥í¥°¥é¥Þ¤¬¡¢±Ê³¥µ¡¼¥Ð¡¼¤ÎÅÐÏ¿¡¢ÅÐÏ¿²ò½ü¡¢µ¯Æ°¤ª¤è¤ÓÄä»ß¤ò¹Ô¤¦¤¿¤á¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Þ¤¹¡£¤½¤Î¾¤Ë¡¢¥µ¡¼¥Ð¡¼¤Ë´Ø¤¹¤ëÍÍ¡¹¤ÊÅý·×¾ðÊó¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Î¥³¥Þ¥ó¥É¤âÄ󶡤·¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-ORBInitialHost nameserverhost
++¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤¬¡¢¼Â¹Ô¤µ¤ì¡¢Ãå¿®¥ê¥¯¥¨¥¹¥È¤òÂÔµ¡¤·¤Æ¤¤¤ë¥Û¥¹¥È¡¦¥Þ¥·¥ó¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢\f2nameserverhost\fP¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç\f2localhost\fP¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f2orbd\fP¤È\f2servertool\fP¤¬°Û¤Ê¤ë¥Þ¥·¥ó¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢\f2orbd\fP¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥Û¥¹¥È¤Î̾Á°¤ÈIP¥¢¥É¥ì¥¹¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-Joption
++Java²¾ÁÛ¥Þ¥·¥ó¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£\f2option\fP¤Ë¤Ï¡¢java(1)¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò1¤Ä»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f3\-J\fP¤ò»ÈÍѤ·¤ÆÇظå¤Î²¾ÁÛ¥Þ¥·¥ó¤Ë¥ª¥×¥·¥ç¥ó¤òÅϤ¹¤³¤È¤Ï¤è¤¯¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "¥³¥Þ¥ó¥É"
++.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> \ ]
++Object Request Broker Daemon(ORBD)¤Ë¿·µ¬±Ê³¥µ¡¼¥Ð¡¼¤òÅÐÏ¿¤·¤Þ¤¹¡£¥µ¡¼¥Ð¡¼¤¬Ì¤ÅÐÏ¿¤Î¾ì¹ç¡¢ÅÐÏ¿¤·¤Æ¥¢¥¯¥Æ¥£¥Ö²½¤·¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ¡¢\f2\-server\fP¥ª¥×¥·¥ç¥ó¤Ç¼±Ê̤µ¤ì¤ë¥µ¡¼¥Ð¡¼¤Î¥á¥¤¥ó¡¦¥¯¥é¥¹Æâ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¡¦¥á¥½¥Ã¥É¤¬¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹¡£¤³¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¦¥á¥½¥Ã¥É¤Ï¡¢\f2public static void install(org.omg.CORBA.ORB)\fP¤Ë¤Ê¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥¤¥ó¥¹¥È¡¼¥ë¡¦¥á¥½¥Ã¥É¤Ï¡¢¥ª¥×¥·¥ç¥ó¤Ç¤¢¤ê¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹¡¦¥¹¥­¡¼¥Þ¤ÎºîÀ®¤Ê¤É¤ÎÆȼ«¤Î¥µ¡¼¥Ð¡¼¡¦¥¤¥ó¥¹¥È¡¼¥ëÆ°ºî¤ò³«È¯¼Ô¤¬»ØÄê¤Ç¤­¤Þ¤¹¡£
++.TP 3
++unregister \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
++¥µ¡¼¥Ð¡¼ID¤Þ¤¿¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó̾¤ò»ÈÍѤ·¤Æ¡¢ORBD¤Î¥µ¡¼¥Ð¡¼¤ÎÅÐÏ¿¤ò²ò½ü¤·¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ¡¢\f2\-server\fP¥ª¥×¥·¥ç¥ó¤Ç¼±Ê̤µ¤ì¤ë¥µ¡¼¥Ð¡¼¤Î¥á¥¤¥ó¡¦¥¯¥é¥¹Æâ¤Ç¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¡¦¥á¥½¥Ã¥É¤¬¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹¡£¤³¤Î¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¡¦¥á¥½¥Ã¥É¤Ï¡¢\f2public static void uninstall(org.omg.CORBA.ORB)\fP¤Ë¤Ê¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¡¦¥á¥½¥Ã¥É¤Ï¡¢¥ª¥×¥·¥ç¥ó¤Ç¤¢¤ê¡¢¥¤¥ó¥¹¥È¡¼¥ë¡¦¥á¥½¥Ã¥É¤ÎÆ°ºî¤Î¼è¤ê¾Ã¤·¤Ê¤É¤ÎÆȼ«¤Î¥µ¡¼¥Ð¡¼¡¦¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ëÆ°ºî¤ò³«È¯¼Ô¤¬»ØÄê¤Ç¤­¤Þ¤¹¡£
++.TP 3
++getserverid \-applicationName\ <application\ name>
++¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¥µ¡¼¥Ð¡¼ID¤òÊÖ¤·¤Þ¤¹¡£
++.TP 3
++list
++ORBD¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î±Ê³¥µ¡¼¥Ð¡¼¤Ë´Ø¤¹¤ë¾ðÊó¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++listappnames
++¸½ºßORBD¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥µ¡¼¥Ð¡¼¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó̾¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++listactive
++ORBD¤Ë¤è¤Ã¤Æµ¯Æ°¤µ¤ì¡¢¸½ºß¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î±Ê³¥µ¡¼¥Ð¡¼¤Ë´Ø¤¹¤ë¾ðÊó¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++locate \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-endpointType\ <endpointType>\ ]
++ÅÐÏ¿¤µ¤ì¤¿¥µ¡¼¥Ð¡¼¤ÇºîÀ®¤·¤¿¤¹¤Ù¤Æ¤ÎORB¤ÎÆÃÄê¤Î¥¿¥¤¥×¤Ë¤Ä¤¤¤Æ¥¨¥ó¥É¥Ý¥¤¥ó¥È(¥Ý¡¼¥È)¤ò¸¡½Ð¤·¤Þ¤¹¡£¥µ¡¼¥Ð¡¼¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥¢¥¯¥Æ¥£¥Ö²½¤µ¤ì¤Þ¤¹¡£¥¨¥ó¥É¥Ý¥¤¥ó¥È¡¦¥¿¥¤¥×¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥µ¡¼¥Ð¡¼¤ÎORB¤´¤È¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ëplain¥¿¥¤¥×¤Þ¤¿¤Ïnon\-protected¥¿¥¤¥×¤Î¥¨¥ó¥É¥Ý¥¤¥ó¥È¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
++.TP 3
++locateperorb \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name> [\-orbid\ <ORB\ name>\ ]
++ÅÐÏ¿¤µ¤ì¤¿¥µ¡¼¥Ð¡¼¤ÎÆÃÄê¤ÎORB¤ÇÅÐÏ¿¤µ¤ì¤¿¥¨¥ó¥É¥Ý¥¤¥ó¥È(¥Ý¡¼¥È)¤ò¸¡½Ð¤·¤Þ¤¹¡£¥µ¡¼¥Ð¡¼¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥¢¥¯¥Æ¥£¥Ö²½¤µ¤ì¤Þ¤¹¡£\f2orbid\fP¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥ÈÃͤΡÖ""¡×¤¬\f2orbid\fP¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£ORB¤¬¶õʸ»úÎó¤Î\f2orbid\fP¤ÇºîÀ®¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢ÅÐÏ¿¤·¤¿¥Ý¡¼¥È¤¬¤¹¤Ù¤ÆÊÖ¤µ¤ì¤Þ¤¹¡£
++.TP 3
++orblist \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
++¥µ¡¼¥Ð¡¼¾å¤ËÄêµÁ¤µ¤ì¤¿ORB¤ÎORBId¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£ORBId¤Ï¥µ¡¼¥Ð¡¼¤ÇºîÀ®¤µ¤ì¤¿ORB¤Îʸ»úÎó̾¤Ç¤¹¡£¥µ¡¼¥Ð¡¼¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥¢¥¯¥Æ¥£¥Ö²½¤µ¤ì¤Þ¤¹¡£
++.TP 3
++shutdown \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
++ORBD¤ËÅÐÏ¿¤µ¤ì¤¿¥¢¥¯¥Æ¥£¥Ö¤Ê¥µ¡¼¥Ð¡¼¤òÄä»ß¤·¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¡¢\f2\-serverid\fP¥Ñ¥é¥á¡¼¥¿¤Þ¤¿¤Ï\f2\-applicationName\fP¥Ñ¥é¥á¡¼¥¿¤Ç»ØÄꤵ¤ì¤¿¥¯¥é¥¹Æâ¤ËÄêµÁ¤µ¤ì¤¿\f2shutdown()\fP¥á¥½¥Ã¥É¤â¸Æ¤Ó½Ð¤µ¤ì¤Æ¥µ¡¼¥Ð¡¼¡¦¥×¥í¥»¥¹¤òÀµ¤·¤¯Ää»ß¤·¤Þ¤¹¡£
++.TP 3
++startup \-serverid\ <server\ id\ >\ | \-applicationName\ <application\ name>
++ORBD¤ËÅÐÏ¿¤µ¤ì¤¿¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤·¤Þ¤¹¡£¥µ¡¼¥Ð¡¼¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¤³¤Î¥³¥Þ¥ó¥É¤Ç¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤·¤Þ¤¹¡£¥µ¡¼¥Ð¡¼¤¬¤¹¤Ç¤Ë¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥æ¡¼¥¶¡¼¤Ë¥¨¥é¡¼¡¦¥á¥Ã¥»¡¼¥¸¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
++.TP 3
++help
++¥µ¡¼¥Ð¡¼¤¬¥µ¡¼¥Ð¡¼¡¦¥Ä¡¼¥ë¤Ç»ÈÍѤǤ­¤ë¤¹¤Ù¤Æ¤Î¥³¥Þ¥ó¥É¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++quit
++¥µ¡¼¥Ð¡¼¡¦¥Ä¡¼¥ë¤ò½ªÎ»¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++orbd(1)
+--- ./jdk/src/bsd/doc/man/ja/tnameserv.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/tnameserv.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,476 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH tnameserv 1 "07 May 2011"
++.TH tnameserv 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++Java IDL: °ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹ \- \f2tnameserv\fP
++.LP
++.LP
++¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¡¢Java IDL°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹\f2tnameserv\fP¤Î»ÈÍÑÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£Java IDL¤Ë¤Ï¡¢Object Request Broker Daemon(ORBD)¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ORBD¤Ï¡¢¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥µ¡¼¥Ó¥¹¡¢°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¡¢\f3±Ê³\fP¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ª¤è¤Ó¥µ¡¼¥Ð¡¼¡¦¥Þ¥Í¡¼¥¸¥ã¤ò´Þ¤à¥Ç¡¼¥â¥ó¡¦¥×¥í¥»¥¹¤Ç¤¹¡£Java IDL¤Î¤¹¤Ù¤Æ¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤Ç¤ÏORBD¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¤¬¡¢°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ò»ÈÍѤ¹¤ëÎã¤Ç¤Ï¡¢\f2orbd\fP¤Î¤«¤ï¤ê¤Ë\f2tnameserv\fP¤ò»ÈÍѤǤ­¤Þ¤¹¡£\f2orbd\fP¥Ä¡¼¥ë¤Î¾ÜºÙ¤Ï¡¢orbd¤Îorbd(1)¤Þ¤¿¤Ï
++.na
++\f2ORBD¤Ë´Þ¤Þ¤ì¤ëJava IDL¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html¤Ë´Ø¤¹¤ë¥È¥Ô¥Ã¥¯¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++¤³¤³¤Ç¤Ï¡¢°Ê²¼¤Î¹àÌܤˤĤ¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++Java\ IDL°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹
++.TP 2
++o
++Java\ IDL°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Îµ¯Æ°
++.TP 2
++o
++Java\ IDL°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ÎÄä»ß
++.TP 2
++o
++¥µ¥ó¥×¥ë¡¦¥¯¥é¥¤¥¢¥ó¥È: ̾Á°¶õ´Ö¤Ø¤Î¥ª¥Ö¥¸¥§¥¯¥È¤ÎÄɲÃ
++.TP 2
++o
++¥µ¥ó¥×¥ë¡¦¥¯¥é¥¤¥¢¥ó¥È: ̾Á°¶õ´Ö¤Î¥Ö¥é¥¦¥º
++.RE
++
++.LP
++.SH "Java IDL°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹"
++.LP
++.LP
++CORBA¤ÎCOS(Common Object Services)¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ï¡¢¥Õ¥¡¥¤¥ë¡¦¥·¥¹¥Æ¥à¤¬¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¥Ç¥£¥ì¥¯¥È¥ê¹½Â¤¤òÄ󶡤·¤Æ¤¤¤ë¤Î¤ÈƱ¤¸¤è¤¦¤Ë¡¢¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤ËÂФ·¤Æ¥Ä¥ê¡¼¹½Â¤¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÄ󶡤·¤Þ¤¹¡£Java IDL¤Î°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ç¤¢¤ë\f2tnameserv\fP¤Ï¡¢COS¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Î»ÅÍͤòñ½ã¤Ê·Á¤Ç¼ÂÁõ¤·¤¿¤â¤Î¤Ç¤¹¡£
++.LP
++.LP
++¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤Ï̾Á°¶õ´Ö¤Ë̾Á°¤Ç³ÊǼ¤µ¤ì¡¢¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤È̾Á°¤Î¥Ú¥¢¤Ï¡¢¤½¤ì¤¾¤ì¥Í¡¼¥à¡¦\f2¥Ð¥¤¥ó¥Ç¥£¥ó¥°\fP¤È¸Æ¤Ð¤ì¤Þ¤¹¡£¥Í¡¼¥à¡¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ï\f2¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È\fP¤ËÁȤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤Ï¤½¤ì¼«ÂΤ¬¥Í¡¼¥à¡¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ç¤¢¤ê¡¢¥Õ¥¡¥¤¥ë¡¦¥·¥¹¥Æ¥à¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ÈƱ¤¸ÊÔÀ®µ¡Ç½¤ò»ý¤Á¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ï\f2½é´ü¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È\fP¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£Ì¾Á°¶õ´Ö¤Ë¤ª¤¤¤Æ¡¢½é´ü¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤ÏÍ£°ì¤Î±Ê³Ū¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ç¤¹¡£¤½¤ì°Ê³°¤Î¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤Ï¡¢Java IDL¤Î¥Í¡¼¥ß¥ó¥°¡¦¥µ¡¼¥Ó¥¹¡¦¥×¥í¥»¥¹¤¬Ää»ß¤·¡¢ºÆµ¯Æ°¤µ¤ì¤ë¤È¼º¤ï¤ì¤Þ¤¹¡£
++.LP
++.LP
++¥¢¥×¥ì¥Ã¥È¤Þ¤¿¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤éCOS¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢¤½¤ÎORB¤¬¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤¬Æ°ºî¤·¤Æ¤¤¤ë¥Û¥¹¥È¤Î¥Ý¡¼¥È¤òÃΤäƤ¤¤ë¤«¡¢¤½¤Î¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Îʸ»úÎ󲽤µ¤ì¤¿½é´ü¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ï¡¢Java IDL¤Î¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ç¤â¤½¤Î¾¤ÎCOS½àµò¤Î¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ç¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£
++.LP
++.SH "Java IDL°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Îµ¯Æ°"
++.LP
++.LP
++Java IDL¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ï¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ò»ÈÍѤ¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Þ¤¿¤Ï¥¢¥×¥ì¥Ã¥È¤è¤êÁ°¤Ëµ¯Æ°¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£Java\ IDLÀ½Éʤò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¡¢Java\ IDL¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤òµ¯Æ°¤¹¤ë¥¹¥¯¥ê¥×¥È(Solaris: \f2tnameserv\fP)¤Þ¤¿¤Ï¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë(Windows NT: \f2tnameserv.exe\fP)¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤ÇÆ°ºî¤¹¤ë¤è¤¦¤Ë¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++Æä˻ØÄꤷ¤Ê¤¤¾ì¹ç¡¢Java IDL¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Ï¡¢ORB¤Î\f2resolve_initial_references()\fP¥á¥½¥Ã¥É¤È\f2list_initial_references()\fP¥á¥½¥Ã¥É¤Î¼ÂÁõ¤Ë»ÈÍѤ¹¤ë¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¡¦¥×¥í¥È¥³¥ë¤ËÂФ·¤Æ¥Ý¡¼¥È900¤ÇÂÔµ¡¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ tnameserv \-ORBInitialPort \fP\f4nameserverport\fP\f3&
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥È¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¥Ý¡¼¥È900¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£Solaris¥½¥Õ¥È¥¦¥§¥¢¤Î¼Â¹Ô»þ¤Ï¡¢1024¤è¤ê¾®¤µ¤¤¥Ý¡¼¥È¤Ç¥×¥í¥»¥¹¤ò³«»Ï¤¹¤ë¾ì¹ç¡¢root¥æ¡¼¥¶¡¼¤Ë¤Ê¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢1024°Ê¾å¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ªÁ¦¤á¤·¤Þ¤¹¡£1050¤Î¤è¤¦¤ËÊ̤Υݡ¼¥È¤ò»ØÄꤷ¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ò¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ç¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢UNIX¥³¥Þ¥ó¥É¡¦¥·¥§¥ë¤Ç¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ tnameserv \-ORBInitialPort 1050&
++.fl
++\fP
++.fi
++
++.LP
++.LP
++Windows¤ÎMS\-DOS¥·¥¹¥Æ¥à¡¦¥×¥í¥ó¥×¥È¤Ç¤Ï¡¢¼¡¤Î¤è¤¦¤ËÆþÎϤ·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++ start tnameserv \-ORBInitialPort 1050
++.fl
++\fP
++.fi
++
++.LP
++.LP
++¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ë¤Ï¡¢¿·¤·¤¤¥Ý¡¼¥ÈÈÖ¹æ¤òÃΤ餻¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤ò¹Ô¤¦¤Ë¤Ï¡¢ORB¥ª¥Ö¥¸¥§¥¯¥È¤ÎºîÀ®»þ¤Ë\f2org.omg.CORBA.ORBInitialPort\fP¥×¥í¥Ñ¥Æ¥£¤Ë¿·¤·¤¤¥Ý¡¼¥ÈÈÖ¹æ¤òÀßÄꤷ¤Þ¤¹¡£
++.LP
++.SS
++°Û¤Ê¤ë¥Þ¥·¥ó¾å¤Ç¤Î¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡¼¤Î¼Â¹Ô
++.LP
++.LP
++Java IDL¤ÈRMI\-IIOP¤Î¤Û¤È¤ó¤É¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤Ç¤Ï¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¡¢¥µ¡¼¥Ð¡¼¤ª¤è¤Ó¥¯¥é¥¤¥¢¥ó¥È¤Ï¤¹¤Ù¤Æ³«È¯ÍѤΥޥ·¥ó¾å¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¼ÂºÝ¤Ë¥Ç¥×¥í¥¤¥á¥ó¥È¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡¼¤ò¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤È¤Ï°Û¤Ê¤ë¥Û¥¹¥È¾å¤Ç¼Â¹Ô¤¹¤ë¤³¤È¤¬Â¿¤¯¤Ê¤ê¤Þ¤¹¡£
++.LP
++.LP
++¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡¼¤¬¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ò¸«¤Ä¤±¤ë¤Ë¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡¼¤¬¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥Ý¡¼¥È¤ÎÈÖ¹æ¤È¥Û¥¹¥È¤òǧ¼±¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤Î¤¿¤á¤Ë¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡¼¤Î¥Õ¥¡¥¤¥ëÆâ¤Î\f2org.omg.CORBA.ORBInitialPort\fP¥×¥í¥Ñ¥Æ¥£¤È\f2org.omg.CORBA.ORBInitialHost\fP¥×¥í¥Ñ¥Æ¥£¤ò¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥Ý¡¼¥È¤ÎÈÖ¹æ¤È¥Þ¥·¥ó¤Î̾Á°¤ËÀßÄꤷ¤Þ¤¹¡£¤³¤ÎÎã¤Ï¡¢
++.na
++\f2RMI\-IIOP¤ò»ÈÍѤ·¤¿Hello World¤ÎÎã\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html¤Ë¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó\f2\-ORBInitialPort\fP \f2nameserverport#\fP¤È\f2\-ORBInitialHost\fP \f2nameserverhostname\fP¤ò»ÈÍѤ·¤Æ¡¢¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¡¼¤ËÂФ·¤Æ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤òõ¤¹¾ì½ê¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
++.na
++\f2Java IDL: 2Âæ¤Î¥Þ¥·¥ó¾å¤Ç¼Â¹Ô¤¹¤ëHello World¥×¥í¥°¥é¥à\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html¤Ë¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ»ØÄꤹ¤ëÊýË¡¤¬¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.LP
++.LP
++¤¿¤È¤¨¤Ð¡¢°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹\f2tnameserv\fP¤¬¡¢¥Û¥¹¥È\f2nameserverhost\fP¤Î¥Ý¡¼¥È1050¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬¥Û¥¹¥È\f2clienthost\fP¾å¤Ç¼Â¹Ô¤µ¤ì¡¢¥µ¡¼¥Ð¡¼¤Ï¥Û¥¹¥È\f2serverhost\fP¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++¼¡¤Î¤è¤¦¤Ë¡¢¥Û¥¹¥È\f2nameserverhost\fP¾å¤Ç\f2tnameserv\fP¤òµ¯Æ°¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ tnameserv \-ORBInitialPort 1050
++.fl
++
++.fl
++\fP
++.fi
++.TP 2
++o
++¼¡¤Î¤è¤¦¤Ë¡¢\f2serverhost\fP¾å¤Ç¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ java Server \-ORBInitialPort 1050 \-ORBInitialHost nameserverhost
++.fl
++\fP
++.fi
++.TP 2
++o
++¼¡¤Î¤è¤¦¤Ë¡¢\f2clienthost\fP¾å¤Ç¥¯¥é¥¤¥¢¥ó¥È¤òµ¯Æ°¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ java Client \-ORBInitialPort 1050 \-ORBInitialHost nameserverhost
++.fl
++\fP
++.fi
++.RE
++
++.LP
++.SS
++\-J¥ª¥×¥·¥ç¥ó
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2tnameserve\fP¤È¤È¤â¤Ë»ÈÍѤǤ­¤Þ¤¹¡£
++.RS 3
++.TP 3
++\-Joption
++Java²¾ÁÛ¥Þ¥·¥ó¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£\f2option\fP¤Ë¤Ï¡¢java(1)¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¡¦¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤ò1¤Ä»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢\f3\-J\-Xms48m\fP¤È»ØÄꤹ¤ë¤È¡¢¥¹¥¿¡¼¥È¥¢¥Ã¥×¡¦¥á¥â¥ê¡¼¤Ï48M¥Ð¥¤¥È¤ËÀßÄꤵ¤ì¤Þ¤¹¡£\f3\-J\fP¤ò»ÈÍѤ·¤ÆÇظå¤Î²¾ÁÛ¥Þ¥·¥ó¤Ë¥ª¥×¥·¥ç¥ó¤òÅϤ¹¤³¤È¤Ï¤è¤¯¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "Java IDL°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ÎÄä»ß"
++.LP
++.LP
++Java IDL¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤òÄä»ß¤¹¤ë¤Ë¤Ï¡¢Unix¤Î¾ì¹ç¤Ï¡¢\f2kill\fP¤Ê¤É¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¡¦¥·¥¹¥Æ¥à¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¡¢Windows¤Î¾ì¹ç¤Ï¡¢\f2[Ctrl]+[C]\fP¥­¡¼¤ò»ÈÍѤ·¤Þ¤¹¡£¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤òÌÀ¼¨Åª¤ËÄä»ß¤¹¤ë¤Þ¤Ç¤Ï¡¢¸Æ½Ð¤·ÂÔµ¡¾õÂÖ¤¬Â³¤­¤Þ¤¹¡£¥µ¡¼¥Ó¥¹¤ò½ªÎ»¤µ¤»¤ë¤È¡¢Java IDL¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë̾Á°¤Ï¼º¤ï¤ì¤Þ¤¹¡£
++.LP
++.SH "¥µ¥ó¥×¥ë¡¦¥¯¥é¥¤¥¢¥ó¥È: ̾Á°¶õ´Ö¤Ø¤Î¥ª¥Ö¥¸¥§¥¯¥È¤ÎÄɲÃ"
++.LP
++.LP
++¼¡¤Ë¼¨¤¹¥µ¥ó¥×¥ë¡¦¥×¥í¥°¥é¥à¤Ï¡¢Ì¾Á°¤ò̾Á°¶õ´Ö¤ËÄɲ乤ëÊýË¡¤ò¼¨¤¹¤â¤Î¤Ç¤¹¡£¤³¤Î¥µ¥ó¥×¥ë¡¦¥×¥í¥°¥é¥à¤Ï¡¢¤³¤Î¤Þ¤Þ¤Î¾õÂ֤Ǵ°Á´¤ËÆ°ºî¤¹¤ë°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¡¦¥¯¥é¥¤¥¢¥ó¥È¤Ç¡¢¼¡¤Î¤è¤¦¤Êñ½ã¤Ê¥Ä¥ê¡¼¤òºîÀ®¤¹¤ë¤â¤Î¤Ç¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++\f4½é´ü¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È\fP
++.RS 3
++.TP 2
++*
++\f3plans\fP
++.TP 2
++*
++\f4Personal\fP
++.RS 3
++.TP 2
++-
++\f3calendar\fP
++.TP 2
++-
++\f3schedule\fP
++.RE
++.RE
++.RE
++
++.LP
++.LP
++¤³¤ÎÎã¤Ç¡¢\f3plans\fP¤Ï¥ª¥Ö¥¸¥§¥¯¥È»²¾È¡¢\f3Personal\fP¤Ï\f3calendar\fP¤È\f3schedule\fP¤Î2¤Ä¤Î¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤ò´Þ¤à¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤Ç¤¹¡£
++.LP
++.nf
++\f3
++.fl
++import java.util.Properties;
++.fl
++import org.omg.CORBA.*;
++.fl
++import org.omg.CosNaming.*;
++.fl
++
++.fl
++public class NameClient
++.fl
++{
++.fl
++ public static void main(String args[])
++.fl
++ {
++.fl
++ try {
++.fl
++\fP
++.fi
++
++.LP
++Á°½Ò¤ÎJava IDL°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Îµ¯Æ°¤Ç¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤Ï¥Ý¡¼¥È1050¤ò»ÈÍѤ·¤Æµ¯Æ°¤·¤Þ¤·¤¿¡£¼¡¤Î¥³¡¼¥É¤Ç¡¢¤³¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò¥¯¥é¥¤¥¢¥ó¥È¡¦¥·¥¹¥Æ¥à¤ËÃΤ餻¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ Properties props = new Properties();
++.fl
++ props.put("org.omg.CORBA.ORBInitialPort", "1050");
++.fl
++ ORB orb = ORB.init(args, props);
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++¼¡¤Î¥³¡¼¥É¤Ç¤Ï¡¢½é´ü¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤ò¼èÆÀ¤·¡¢¤½¤ì¤ò\f3ctx\fP¤ËÂåÆþ¤·¤Þ¤¹¡£2¹ÔÌܤǤϡ¢\f3ctx\fP¤ò¥À¥ß¡¼¤Î¥ª¥Ö¥¸¥§¥¯¥È»²¾È\f3objref\fP¤Ë¥³¥Ô¡¼¤·¤Þ¤¹¡£¤³¤Îobjref¤Ë¤Ï¡¢¤¢¤È¤ÇÍÍ¡¹¤Ê̾Á°¤ò³ä¤êÅö¤Æ¤Æ̾Á°¶õ´Ö¤ËÄɲä·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ NamingContext ctx =
++.fl
++NamingContextHelper.narrow(orb.resolve_initial_references("NameService"));
++.fl
++ NamingContext objref = ctx;
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++¼¡¤Î¥³¡¼¥É¤Ç¤Ï¡¢text¥¿¥¤¥×¤Î̾Á°plans¤òºîÀ®¤·¡¢¤½¤ì¤ò¥À¥ß¡¼¤Î¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤Ë¥Ð¥¤¥ó¥É¤·¤Þ¤¹¡£¤½¤Î¸å¡¢\f2rebind\fP¤ò»ÈÍѤ·¤Æ½é´ü¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤Î²¼¤Ëplans¤òÄɲ䷤Ƥ¤¤Þ¤¹¡£\f2rebind\fP¥á¥½¥Ã¥É¤ò»ÈÍѤ¹¤ì¤Ð¡¢\f2bind\fP¤ò»ÈÍѤ·¤¿¾ì¹ç¤ËȯÀ¸¤¹¤ëÎã³°¤òȯÀ¸¤µ¤»¤º¤Ë¡¢¤³¤Î¥×¥í¥°¥é¥à¤ò²¿Å٤ⷫÊÖ¤·¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ NameComponent nc1 = new NameComponent("plans", "text");
++.fl
++ NameComponent[] name1 = {nc1};
++.fl
++ ctx.rebind(name1, objref);
++.fl
++ System.out.println("plans rebind successful!");
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++¼¡¤Î¥³¡¼¥É¤Ç¤Ï¡¢directory¥¿¥¤¥×¤ÎPersonal¤È¤¤¤¦¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤òºîÀ®¤·¤Þ¤¹¡£¤½¤Î·ë²ÌÆÀ¤é¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È»²¾È\f3ctx2\fP¤ò¤³¤Î̾Á°¤Ë¥Ð¥¤¥ó¥É¤·¡¢½é´ü¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤ËÄɲä·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ NameComponent nc2 = new NameComponent("Personal", "directory");
++.fl
++ NameComponent[] name2 = {nc2};
++.fl
++ NamingContext ctx2 = ctx.bind_new_context(name2);
++.fl
++ System.out.println("new naming context added..");
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++»Ä¤ê¤Î¥³¡¼¥É¤Ç¤Ï¡¢¥À¥ß¡¼¤Î¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤òschedule¤Ècalendar¤È¤¤¤¦Ì¾Á°¤Ç¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¡ÖPersonal¡×(\f3ctx2\fP)¤Ë¥Ð¥¤¥ó¥É¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ NameComponent nc3 = new NameComponent("schedule", "text");
++.fl
++ NameComponent[] name3 = {nc3};
++.fl
++ ctx2.rebind(name3, objref);
++.fl
++ System.out.println("schedule rebind successful!");
++.fl
++
++.fl
++ NameComponent nc4 = new NameComponent("calender", "text");
++.fl
++ NameComponent[] name4 = {nc4};
++.fl
++ ctx2.rebind(name4, objref);
++.fl
++ System.out.println("calender rebind successful!");
++.fl
++
++.fl
++
++.fl
++ } catch (Exception e) {
++.fl
++ e.printStackTrace(System.err);
++.fl
++ }
++.fl
++ }
++.fl
++}
++.fl
++\fP
++.fi
++
++.LP
++.SH "¥µ¥ó¥×¥ë¡¦¥¯¥é¥¤¥¢¥ó¥È: ̾Á°¶õ´Ö¤Î¥Ö¥é¥¦¥º"
++.LP
++.LP
++¼¡¤Î¥µ¥ó¥×¥ë¡¦¥×¥í¥°¥é¥à¤Ç¤Ï¡¢Ì¾Á°¶õ´Ö¤ò¥Ö¥é¥¦¥º¤¹¤ëÊýË¡¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++.nf
++\f3
++.fl
++import java.util.Properties;
++.fl
++import org.omg.CORBA.*;
++.fl
++import org.omg.CosNaming.*;
++.fl
++
++.fl
++public class NameClientList
++.fl
++{
++.fl
++ public static void main(String args[])
++.fl
++ {
++.fl
++ try {
++.fl
++\fP
++.fi
++
++.LP
++Á°½Ò¤ÎJava IDL°ì»þ¥Í¡¼¥à¡¦¥µ¡¼¥Ó¥¹¤Îµ¯Æ°¤Ç¡¢¥Í¡¼¥à¡¦¥µ¡¼¥Ð¡¼¤Ï¥Ý¡¼¥È1050¤ò»ÈÍѤ·¤Æµ¯Æ°¤·¤Þ¤·¤¿¡£¼¡¤Î¥³¡¼¥É¤Ç¡¢¤³¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò¥¯¥é¥¤¥¢¥ó¥È¡¦¥·¥¹¥Æ¥à¤ËÃΤ餻¤Þ¤¹¡£
++.nf
++\f3
++.fl
++
++.fl
++ Properties props = new Properties();
++.fl
++ props.put("org.omg.CORBA.ORBInitialPort", "1050");
++.fl
++ ORB orb = ORB.init(args, props);
++.fl
++
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++¼¡¤Î¥³¡¼¥É¤Ç¤Ï¡¢½é´ü¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ NamingContext nc =
++.fl
++NamingContextHelper.narrow(orb.resolve_initial_references("NameService"));
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++\f2list\fP¥á¥½¥Ã¥É¤Ï¡¢¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ò¥ê¥¹¥È¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢ºÇÂç1000¸Ä¤Þ¤Ç¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤¬½é´ü¥Í¡¼¥ß¥ó¥°¡¦¥³¥ó¥Æ¥­¥¹¥È¤«¤éBindingListHolder¤ËÊÖ¤µ¤ì¤Þ¤¹¡£»Ä¤ê¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ï¡¢BindingIteratorHolder¤ËÊÖ¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ BindingListHolder bl = new BindingListHolder();
++.fl
++ BindingIteratorHolder blIt= new BindingIteratorHolder();
++.fl
++ nc.list(1000, bl, blIt);
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++¼¡¤Î¥³¡¼¥É¤Ç¤Ï¡¢ÊÖ¤µ¤ì¤¿BindingListHolder¤«¤é¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ÎÇÛÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢¥×¥í¥°¥é¥à¤¬½ªÎ»¤·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ Binding bindings[] = bl.value;
++.fl
++ if (bindings.length == 0) return;
++.fl
++
++.fl
++\fP
++.fi
++
++.LP
++»Ä¤ê¤Î¥³¡¼¥É¤Ç¤Ï¡¢¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ËÂФ·¤Æ¥ë¡¼¥×½èÍý¤ò¹Ô¤¤¡¢Ì¾Á°¤ò½ÐÎϤ·¤Þ¤¹¡£
++.nf
++\f3
++.fl
++ for (int i=0; i < bindings.length; i++) {
++.fl
++
++.fl
++ // get the object reference for each binding
++.fl
++ org.omg.CORBA.Object obj = nc.resolve(bindings[i].binding_name);
++.fl
++ String objStr = orb.object_to_string(obj);
++.fl
++ int lastIx = bindings[i].binding_name.length\-1;
++.fl
++
++.fl
++ // check to see if this is a naming context
++.fl
++ if (bindings[i].binding_type == BindingType.ncontext) {
++.fl
++ System.out.println( "Context: " +
++.fl
++bindings[i].binding_name[lastIx].id);
++.fl
++ } else {
++.fl
++ System.out.println("Object: " +
++.fl
++bindings[i].binding_name[lastIx].id);
++.fl
++ }
++.fl
++ }
++.fl
++
++.fl
++ } catch (Exception e) {
++.fl
++ e.printStackTrace(System.err);
++.fl
++ }
++.fl
++ }
++.fl
++}
++.fl
++\fP
++.fi
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/unpack200.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/unpack200.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,6 +19,160 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH unpack200 1 "07 May 2011"
++.TH unpack200 1 "05 Jul 2012"
+
+ .LP
++.SH "̾Á°"
++unpack200 \- JAR¥¢¥ó¥Ñ¥Ã¥¯¡¦¥Ä¡¼¥ë
++.LP
++.RS 3
++.TP 2
++o
++·Á¼°
++.TP 2
++o
++ÀâÌÀ
++.TP 2
++o
++¥ª¥×¥·¥ç¥ó
++.TP 2
++o
++½ªÎ»¥¹¥Æ¡¼¥¿¥¹
++.TP 2
++o
++´ØÏ¢¹àÌÜ
++.TP 2
++o
++Ãí°Õ
++.RE
++
++.LP
++.SH "·Á¼°"
++.LP
++.LP
++\f4unpack200\fP\f2 [ \fP\f2options\fP ] \f2input\-file\fP \f2JAR\-file\fP
++.LP
++.LP
++¥ª¥×¥·¥ç¥ó¤Î»ØÄê½ç½ø¤Ë·è¤Þ¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤵ¤ì¤¿ºÇ¸å¤Î¥ª¥×¥·¥ç¥ó¤¬¡¢¤½¤ì°ÊÁ°¤Ë»ØÄꤵ¤ì¤¿¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤è¤êÍ¥À褵¤ì¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 3
++input\-file
++ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î̾Á°¡£pack200 gzip¥Õ¥¡¥¤¥ë¤«pack200¥Õ¥¡¥¤¥ë¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤³¤Î¾¤Ë¡¢0¤òÀßÄꤹ¤ì¤Ðpack200(1)¤«¤éºîÀ®¤µ¤ì¤¿JAR¥Õ¥¡¥¤¥ë¤âÆþÎϤȤ·¤Æ»ÈÍѤǤ­¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢ÆþÎÏ¥Õ¥¡¥¤¥ë¤ÎÆâÍƤ¬Pack200¥Þ¡¼¥«¡¼¤È¤È¤â¤Ë½ÐÎÏJAR¥Õ¥¡¥¤¥ë¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
++.TP 3
++JAR\-file
++½ÐÎÏJAR¥Õ¥¡¥¤¥ë̾¡£
++.RE
++
++.LP
++.SH "ÀâÌÀ"
++.LP
++.LP
++\f2unpack200\fP¤Ï¡¢\f2pack200\fP(1)¤ÇºîÀ®¤µ¤ì¤¿¥Ñ¥Ã¥¯¡¦¥Õ¥¡¥¤¥ë¤òJAR¥Õ¥¡¥¤¥ë¤ËÊÑ´¹¤¹¤ë¥Í¥¤¥Æ¥£¥Ö¼ÂÁõ¤Ç¤¹¡£°ìÈÌŪ¤Ê»ÈÍÑÊýË¡:
++.LP
++.LP
++\f2% unpack200 myarchive.pack.gz myarchive.jar\fP
++.LP
++.LP
++¤³¤ÎÎã¤Ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î\f2unpack200\fP¤ÎÀßÄê¤Ç¡¢\f2myarchive.pack.gz\fP¤«¤é\f2myarchive.jar\fP¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.LP
++\f4\-Hvalue \-\-deflate\-hint=\fP\f2value\fP
++.LP
++.LP
++JAR¥Õ¥¡¥¤¥ëÆâ¤Î¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê¤Ë\f2true\fP¡¢\f2false\fP¤Þ¤¿¤Ï\f2keep\fP¤Î¥Ç¥Õ¥ì¡¼¥·¥ç¥ó¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¡¦¥â¡¼¥É¤Ï\f2keep\fP¤Ç¤¹¡£\f2true\fP¤Þ¤¿¤Ï\f2false\fP¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Æ¡¢½ÐÎÏJAR¥Õ¥¡¥¤¥ëÆâ¤Î¤¹¤Ù¤Æ¤Î¥¨¥ó¥È¥ê¤Î¥Ç¥Õ¥ì¡¼¥·¥ç¥ó¡¦¥â¡¼¥É¤¬ÀßÄꤵ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f4\-r \-\-remove\-pack\-file\fP
++.LP
++.LP
++ÆþÎϥѥ寡¦¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹¡£
++.LP
++.LP
++\f4\-v \-\-verbose\fP
++.LP
++.LP
++ºÇ¾®¸Â¤Î¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤òÊ£¿ô»ØÄꤹ¤ë¤È¡¢¤è¤êŤ¤¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f4\-q \-\-quiet\fP
++.LP
++.LP
++¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤»¤º¤ËÆ°ºî¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++\f4\-lfilename \-\-log\-file=\fP\f2filename\fP
++.LP
++.LP
++½ÐÎÏ¥á¥Ã¥»¡¼¥¸¤Î¥í¥°¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
++.LP
++.LP
++\f4\-? \-h \-\-help\fP
++.LP
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ë´Ø¤¹¤ë¥Ø¥ë¥×¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.LP
++.LP
++\f4\-V \-\-version\fP
++.LP
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤Ë´Ø¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
++.LP
++.LP
++\f4\-J\fP\f2option\fP
++.LP
++.LP
++\f2unpack200\fP¤Ë¤è¤Ã¤Æ¸Æ¤Ó½Ð¤µ¤ì¤ëJavaµ¯Æ°¥Ä¡¼¥ë¤Ë\f2option\fP¤òÅϤ·¤Þ¤¹¡£
++.LP
++.SH "½ªÎ»¥¹¥Æ¡¼¥¿¥¹"
++.LP
++.LP
++¼¡¤Î½ªÎ»Ãͤ¬ÊÖ¤µ¤ì¤Þ¤¹¡£
++.LP
++.LP
++\f2\ 0\fP: Àµ¾ï½ªÎ»¤·¤¿¾ì¹ç
++.LP
++.LP
++\f2>0\fP: ¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++pack200(1)
++.TP 2
++o
++.na
++\f2Java SE¤Î¥É¥­¥å¥á¥ó¥È\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/index.html
++.TP 2
++o
++.na
++\f2Java¥Ç¥×¥í¥¤¥á¥ó¥È¡¦¥¬¥¤¥É \- Pack200\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html
++.TP 2
++o
++jar(1) \- Java Archive¥Ä¡¼¥ë
++.TP 2
++o
++jarsigner(1) \- JAR½ð̾¥Ä¡¼¥ë
++.TP 2
++o
++\f2attributes(5)\fP¤Î¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸
++.RE
++
++.LP
++.SH "Ãí°Õ"
++.LP
++.LP
++¤³¤Î¥³¥Þ¥ó¥É¤È\f2unpack(1)\fP¤òº®Æ±¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤³¤ì¤é¤ÏÊÌÀ½ÉʤǤ¹¡£
++.LP
++.LP
++JDK¤ËÉÕ°¤¹¤ëJava SE API»ÅÍͤȤÎÁê°ã¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢»ÅÍͤòÍ¥À褷¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++
+--- ./jdk/src/bsd/doc/man/ja/wsgen.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/wsgen.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,4 +19,638 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH wsgen 1 "07 May 2011"
++.TH wsgen 1 "05 Jul 2012"
++.SH "̾Á°"
++wsgen \- XML Web Services(JAX\-WS)2.0¤Î¤¿¤á¤ÎJava(tm)API
++.LP
++\f3»ÅÍͥС¼¥¸¥ç¥ó:\fP 2.1
++.br
++\f3¼ÂÁõ¥Ð¡¼¥¸¥ç¥ó:\fP 2.1.1
++.LP
++\f2wsgen\fP¥Ä¡¼¥ë¤Ï¡¢JAX\-WS Web¥µ¡¼¥Ó¥¹¤Ç»ÈÍѤµ¤ì¤ëJAX\-WS¥Ý¡¼¥¿¥Ö¥ë¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï¡¢Web¥µ¡¼¥Ó¥¹¤Î¥¨¥ó¥É¥Ý¥¤¥ó¥È¼ÂÁõ¥¯¥é¥¹(SEI)¤òÆɼè¤ê¡¢Web¥µ¡¼¥Ó¥¹¤Î¥Ç¥×¥í¥¤¥á¥ó¥È¤È¸Æ½Ð¤·¤ËɬÍפʤ¹¤Ù¤Æ¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¤Þ¤¹¡£
++.SH "³µÍ×"
++.LP
++\f2wsgen\fP¥Ä¡¼¥ë¤Ï¡¢JAX\-WS Web¥µ¡¼¥Ó¥¹¤Ç»ÈÍѤµ¤ì¤ëJAX\-WS¥Ý¡¼¥¿¥Ö¥ë¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï¡¢Web¥µ¡¼¥Ó¥¹¤Î¥¨¥ó¥É¥Ý¥¤¥ó¥È¡¦¥¯¥é¥¹¤òÆɼè¤ê¡¢Web¥µ¡¼¥Ó¥¹¤Î¥Ç¥×¥í¥¤¥á¥ó¥È¤È¸Æ½Ð¤·¤ËɬÍפʤ¹¤Ù¤Æ¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¤Þ¤¹¡£JAXWS 2.1.1 RI¤Ë¤Ïwsgen Ant¥¿¥¹¥¯¤âÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢
++.na
++\f2Wsgen Ant¥¿¥¹¥¯\fP @
++.fi
++https://jax\-ws.dev.java.net/nonav/2.1.1/docs/wsgenant.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.SH "wsgen¤Îµ¯Æ°"
++.RS 3
++.TP 2
++o
++\f3Solaris/Linux\fP
++.RS 3
++.TP 2
++*
++\f2export JAXWS_HOME=/pathto/jaxws\-ri\fP
++.TP 2
++*
++\f2$JAXWS_HOME/bin/wsgen.sh \-help\fP
++.RE
++.TP 2
++o
++\f3Windows\fP
++.RS 3
++.TP 2
++*
++\f2set JAXWS_HOME=c:\\pathto\\jaxws\-ri\fP
++.TP 2
++*
++\f2%JAXWS_HOME%\\bin\\wsgen.bat \-help\fP
++.RE
++.RE
++
++.LP
++.SH "¹½Ê¸"
++.nf
++\f3
++.fl
++wsgen [options] <SEI>\fP
++.br
++\f3
++.fl
++\fP
++.fi
++.LP
++¼¡¤Îɽ¤Ë¡¢\f2wsgen\fP¤Î¥ª¥×¥·¥ç¥ó¤ò¼¨¤·¤Þ¤¹¡£
++.br
++.LP
++.TS
++.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
++.de 35
++.ps \n(.s
++.vs \n(.vu
++.in \n(.iu
++.if \n(.u .fi
++.if \n(.j .ad
++.if \n(.j=0 .na
++..
++.nf
++.nr #~ 0
++.if n .nr #~ 0.6n
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.fc
++.nr 33 \n(.s
++.rm 80 81
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++ÆþÎÏ¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¸¡º÷¾ì½ê¤ò»ØÄꤷ¤Þ¤¹
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++\f2\-classpath<path>\fP¤ÈƱ¤¸¤Ç¤¹
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++À¸À®¤µ¤ì¤ë½ÐÎÏ¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Ù¥ó¥À¡¼³ÈÄ¥(»ÅÍͤǵ¬Äꤵ¤ì¤Æ¤¤¤Ê¤¤µ¡Ç½)¤òµö²Ä¤·¤Þ¤¹¡£³ÈÄ¥¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°Ü¿¢À­¤¬¼º¤ï¤ì¤¿¤ê¡¢Â¾¤Î¼ÂÁõ¤È¤ÎÁê¸ß±¿ÍѤ¬¹Ô¤¨¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++À¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òÊÝ»ý¤·¤Þ¤¹
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¾ï¤Ë \-wsdl¥ª¥×¥·¥ç¥ó¤ÈÁȤ߹ç¤ï¤Æ»ÈÍѤ·¤Þ¤¹¡£WSDL¤Ê¤É¤ÎÀ¸À®¤µ¤ì¤¿¥ê¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Î³ÊǼ¾ì½ê¤ò»ØÄꤷ¤Þ¤¹
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++À¸À®¤µ¤ì¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥³¥ó¥Ñ¥¤¥é¤¬¼Â¹Ô¤·¤Æ¤¤¤ë½èÍý¤Ë´Ø¤¹¤ë¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Î¤ß¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£Ä̾ï¤Î½èÍý¤Ï¼Â¹Ô¤µ¤ì¤Þ¤»¤ó¡£
++.br
++.di
++.nr j| \n(dn
++.nr j- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di k+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\f2wsgen\fP¤ÏWSDL¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤»¤ó¡£¤³¤Î¥Õ¥é¥°¤Ï¾Êά²Äǽ¤Ç¤¹¤¬¡¢»ØÄꤷ¤¿¾ì¹ç¤Ï\f2wsgen\fP¤¬WSDL¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Î¥Õ¥é¥°¤ÏÄ̾¥¨¥ó¥É¥Ý¥¤¥ó¥È¤Î¥Ç¥×¥í¥¤Á°¤Ë³«È¯¼Ô¤¬WSDL¤ò»²¾È¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¤Î¤ß»ÈÍѤ·¤Þ¤¹¡£\f2protocol\fP¤Ï¾Êά²Äǽ¤Ç¤¢¤ê¡¢\f2wsdl:binding\fP¤Ç»ÈÍѤ¹¤ë¥×¥í¥È¥³¥ë¤ò»ØÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£Í­¸ú¤Ê¥×¥í¥È¥³¥ë¤Ï\f2soap1.1\fP¤ª¤è¤Ó\f2Xsoap1.2\fP¤Ê¤É¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï\f2soap1.1\fP¤Ç¤¹¡£\f2Xsoap1.2\fP¤Ïɸ½à¤Ç¤Ï¤Ê¤¤¤¿¤á¡¢\f2\-extension\fP¥ª¥×¥·¥ç¥ó¤ÈÁȤ߹礻¤Ê¤¤¤È»ÈÍѤǤ­¤Þ¤»¤ó¡£
++.br
++.di
++.nr k| \n(dn
++.nr k- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di l+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¾ï¤Ë\f2\-wsdl\fP¥ª¥×¥·¥ç¥ó¤ÈÁȤ߹礻¤Æ»ÈÍѤ·¤Þ¤¹¡£WSDLÆâ¤ÇÀ¸À®¤µ¤ì¤ë\f2wsdl:service\fP¤Î̾Á°¤ò»ØÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£Îã: \f2\-servicename "{http://mynamespace/}MyService"\fP
++.br
++.di
++.nr l| \n(dn
++.nr l- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di m+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¾ï¤Ë\f2\-wsdl\fP¥ª¥×¥·¥ç¥ó¤ÈÁȤ߹礻¤Æ»ÈÍѤ·¤Þ¤¹¡£WSDLÆâ¤ÇÀ¸À®¤µ¤ì¤ë\f2wsdl:port\fP¤Î̾Á°¤ò»ØÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£Îã: \f2\-portname "{http://mynamespace/}MyPort"\fP
++.br
++.br
++.di
++.nr m| \n(dn
++.nr m- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w\f3¥ª¥×¥·¥ç¥ó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-classpath <path>\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-cp <path>\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-d <directory>\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-extension\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-help\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-keep\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-r <directory>\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-s <directory>\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-verbose\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-version\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-wsdl[:protocol]\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-servicename <name>\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f4\-portname <name>\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(g-
++.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(i-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(j-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(k-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(l-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(m-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 137 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3¥ª¥×¥·¥ç¥ó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-classpath <path>\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-cp <path>\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-d <directory>\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-extension\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-help\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-keep\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-r <directory>\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-s <directory>\fP\h'|\n(41u'
++.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(31u
++.ne \n(i|u+\n(.Vu
++.if (\n(i|+\n(#^-1v)>\n(#- .nr #- +(\n(i|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-verbose\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-version\fP\h'|\n(41u'
++.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(31u
++.ne \n(k|u+\n(.Vu
++.if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-wsdl[:protocol]\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-servicename <name>\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f4\-portname <name>\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.m+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.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.-57
++
++.LP
++.SH "Îã"
++.nf
++\f3
++.fl
++\fP\f3wsgen \-d stock \-cp myclasspath stock.StockService\fP
++.fl
++.fi
++.LP
++\f3stock\fP¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë@WebServiceÃí¼á¤¬ÉÕ¤±¤é¤ì¤¿¡¢StockService¤ËɬÍפʥé¥Ã¥Ñ¡¼¡¦¥¯¥é¥¹¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++\fP\f3wsgen \-wsdl \-d stock \-cp myclasspath stock.StockService\fP
++.fl
++.fi
++.LP
++SOAP 1.1 WSDL¤È¡¢@WebServiceÃí¼á¤¬ÉÕ¤±¤é¤ì¤¿Java¥¯¥é¥¹stock.StockService¤Î¥¹¥­¡¼¥Þ¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.nf
++\f3
++.fl
++\fP\f3wsgen \-wsdl:Xsoap1.2 \-d stock \-cp myclasspath stock.StockService\fP
++.fl
++.fi
++.LP
++SOAP 1.2 WSDL¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
++.LP
++¥µ¡¼¥Ó¥¹¤ò¥Ç¥×¥í¥¤¤¹¤ë¤È¤­¤ËJAXWS¥é¥ó¥¿¥¤¥à¤Ë¤è¤Ã¤Æ¼«Æ°Åª¤ËWSDL¤¬À¸À®¤µ¤ì¤ë¤¿¤á¡¢³«È¯»þ¤ËWSDL¤òÀ¸À®¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
+--- ./jdk/src/bsd/doc/man/ja/wsimport.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/wsimport.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,4 +19,1048 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH wsimport 1 "07 May 2011"
++.TH wsimport 1 "05 Jul 2012"
++.SH "̾Á°"
++wsimport \- XML Web Services(JAX\-WS)2.0¤Î¤¿¤á¤ÎJava(tm)API
++.LP
++\f3»ÅÍͥС¼¥¸¥ç¥ó:\fP 2.1
++.br
++\f3¼ÂÁõ¥Ð¡¼¥¸¥ç¥ó:\fP 2.1.1
++.br
++.SH "³µÍ×"
++.LP
++\f2wsimport\fP¥Ä¡¼¥ë¤Ï¡¢¼¡¤Î¤è¤¦¤ÊJAX\-WS¥Ý¡¼¥¿¥Ö¥ë¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¤Þ¤¹¡£
++.RS 3
++.TP 2
++o
++¥µ¡¼¥Ó¥¹¡¦¥¨¥ó¥É¥Ý¥¤¥ó¥È¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹(SEI)
++.TP 2
++o
++¥µ¡¼¥Ó¥¹
++.TP 2
++o
++wsdl:fault¤«¤é¥Þ¥Ã¥×¤µ¤ì¤ëÎã³°¥¯¥é¥¹(¸ºß¤¹¤ë¾ì¹ç)
++.TP 2
++o
++¥ì¥¹¥Ý¥ó¥¹wsdl:message¤«¤éÇÉÀ¸¤¹¤ëÈóƱ´ü¥ì¥¹¥Ý¥ó¥¹Bean(¸ºß¤¹¤ë¾ì¹ç)
++.TP 2
++o
++JAXB¤¬À¸À®¤¹¤ëÃÍ¥¿¥¤¥×(¥¹¥­¡¼¥Þ¤Î¥¿¥¤¥×¤«¤é¥Þ¥Ã¥×¤µ¤ì¤¿Java¥¯¥é¥¹)
++.RE
++.LP
++¤³¤ì¤é¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Ï¡¢WSDL¥É¥­¥å¥á¥ó¥È¡¢¥¹¥­¡¼¥Þ¡¦¥É¥­¥å¥á¥ó¥È¡¢¤ª¤è¤Ó¥¨¥ó¥É¥Ý¥¤¥ó¥È¼ÂÁõ¤È¤È¤â¤ËWAR¥Õ¥¡¥¤¥ëÆâ¤Ë¥Ñ¥Ã¥±¡¼¥¸²½¤·¤Æ¥Ç¥×¥í¥¤¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢wsimport Ant¥¿¥¹¥¯¤âÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.na
++\f2wsimport Ant¥¿¥¹¥¯\fP @
++.fi
++https://jax\-ws.dev.java.net/nonav/2.1.1/docs/wsimportant.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++
++.LP
++.SH "wsimport¤Îµ¯Æ°"
++.RS 3
++.TP 2
++o
++\f3Solaris/Linux\fP
++.RS 3
++.TP 2
++*
++\f2/bin/wsimport.sh \-help\fP
++.RE
++.TP 2
++o
++\f3Windows\fP
++.RS 3
++.TP 2
++*
++\f2\\bin\\wsimport.bat \-help\fP
++.RE
++.RE
++
++.LP
++.SH "¹½Ê¸"
++.nf
++\f3
++.fl
++wsimport [options] <wsdl>
++.fl
++\fP
++.fi
++.LP
++¼¡¤Îɽ¤Ë¡¢\f2wsimport\fP¤Î¥ª¥×¥·¥ç¥ó¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++.TS
++.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
++.de 35
++.ps \n(.s
++.vs \n(.vu
++.in \n(.iu
++.if \n(.u .fi
++.if \n(.j .ad
++.if \n(.j=0 .na
++..
++.nf
++.nr #~ 0
++.if n .nr #~ 0.6n
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.fc
++.nr 33 \n(.s
++.rm 80 81
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++À¸À®¤µ¤ì¤ë½ÐÎÏ¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++³°Éô¤ÎJAX\-WS¤Þ¤¿¤ÏJAXB¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹(\f2<file>\fP¤´¤È¤Ë\f2\-b\fP¤¬É¬Íפˤʤê¤Þ¤¹)
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¤³¤Î¥ª¥×¥·¥ç¥ó¤òJAXB¥¹¥­¡¼¥Þ¡¦¥³¥ó¥Ñ¥¤¥é¤ËÅϤ·¤Þ¤¹
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++³°Éô¥¨¥ó¥Æ¥£¥Æ¥£»²¾È¤ò²ò·è¤¹¤ë¤¿¤á¤Î¥«¥¿¥í¥°¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£TR9401¡¢XCatalog¡¢OASIS XML Catalog¤Î³Æ·Á¼°¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.na
++\f2¥«¥¿¥í¥°\fP @
++.fi
++https://jax\-ws.dev.java.net/nonav/2.1.1/docs/catalog\-support.html¤Î¥É¥­¥å¥á¥ó¥È¤òÆɤó¤Ç¡¢\f3¥«¥¿¥í¥°\fP¤Î¥µ¥ó¥×¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Ù¥ó¥À¡¼³ÈÄ¥(»ÅÍͤǵ¬Äꤵ¤ì¤Æ¤¤¤Ê¤¤µ¡Ç½)¤òµö²Ä¤·¤Þ¤¹¡£³ÈÄ¥¤ò»ÈÍѤ¹¤ë¤È¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°Ü¿¢À­¤¬¼º¤ï¤ì¤¿¤ê¡¢Â¾¤Î¼ÂÁõ¤È¤ÎÁê¸ß±¿ÍѤ¬¹Ô¤¨¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di g+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f3\-httpproxy:<host>:<port> \fP
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++HTTP¥×¥í¥­¥·¡¦¥µ¡¼¥Ð¡¼¤ò»ØÄꤷ¤Þ¤¹(¥Ç¥Õ¥©¥ë¥È¤Î¥Ý¡¼¥È¤Ï8080¤Ç¤¹)
++.br
++.di
++.nr h| \n(dn
++.nr h- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di i+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++À¸À®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òÊÝ»ý¤·¤Þ¤¹
++.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/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¤³¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó·Ðͳ¤Ç¥¿¡¼¥²¥Ã¥È¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÂФ¹¤ë¤¹¤Ù¤Æ¤ÎWSDL/¥¹¥­¡¼¥Þ¡¦¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Î¥«¥¹¥¿¥Þ¥¤¥º¤ä¡¢»ÅÍͤǵ¬Äꤵ¤ì¤Æ¤¤¤ë¥Ç¥Õ¥©¥ë¥È¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¥¢¥ë¥´¥ê¥º¥à¤è¤ê¤â¡¢¤½¤Î»ØÄ꤬ͥÀ褵¤ì¤Þ¤¹
++.br
++.di
++.nr j| \n(dn
++.nr j- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di k+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++À¸À®¤µ¤ì¤ë¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹
++.br
++.di
++.nr k| \n(dn
++.nr k- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di l+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥³¥ó¥Ñ¥¤¥é¤¬¼Â¹Ô¤·¤Æ¤¤¤ë½èÍý¤Ë´Ø¤¹¤ë¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹
++.br
++.di
++.nr l| \n(dn
++.nr l- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di m+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹
++.br
++.di
++.nr m| \n(dn
++.nr m- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di n+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f3\-wsdllocation <location>\fP
++.br
++.di
++.nr n| \n(dn
++.nr n- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di o+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++\f2@WebServiceClient.wsdlLocation\fPÃÍ
++.br
++.di
++.nr o| \n(dn
++.nr o- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di p+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++»ØÄꤵ¤ì¤¿JAX\-WS»ÅÍͥС¼¥¸¥ç¥ó¤Ë½¾¤Ã¤Æ¥³¡¼¥É¤òÀ¸À®¤·¤Þ¤¹¡£¥Ð¡¼¥¸¥ç¥ó2.0¤Ç¤Ï¡¢JAX\-WS 2.0»ÅÍͤ˽àµò¤·¤¿¥³¡¼¥É¤¬À¸À®¤µ¤ì¤Þ¤¹
++.br
++.di
++.nr p| \n(dn
++.nr p- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di q+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++wsimport½ÐÎϤòÍÞÀ©¤·¤Þ¤¹
++.br
++.di
++.nr q| \n(dn
++.nr q- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w\f3¥ª¥×¥·¥ç¥ó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-d <directory> \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-b <path> \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-B <jaxbOption>\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-catalog\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-extension \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-help \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-keep \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-p \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-s <directory> \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-verbose \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-version \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-target \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-quiet \fP
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 38 \n(g-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \n(n-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(d-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(h-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(i-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(j-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(k-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(l-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(m-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(o-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(p-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(q-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 163 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3¥ª¥×¥·¥ç¥ó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-d <directory> \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-b <path> \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-B <jaxbOption>\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-catalog\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-extension \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-help \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(g|u+\n(.Vu
++.ne \n(h|u+\n(.Vu
++.if (\n(g|+\n(#^-1v)>\n(#- .nr #- +(\n(g|+\n(#^-\n(#--1v)
++.if (\n(h|+\n(#^-1v)>\n(#- .nr #- +(\n(h|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.g+
++.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
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-keep \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.if (\n(j|+\n(#^-1v)>\n(#- .nr #- +(\n(j|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-p \fP\h'|\n(41u'
++.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(31u
++.ne \n(k|u+\n(.Vu
++.if (\n(k|+\n(#^-1v)>\n(#- .nr #- +(\n(k|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-s <directory> \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-verbose \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.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
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-version \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.m+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(n|u+\n(.Vu
++.ne \n(o|u+\n(.Vu
++.if (\n(n|+\n(#^-1v)>\n(#- .nr #- +(\n(n|+\n(#^-\n(#--1v)
++.if (\n(o|+\n(#^-1v)>\n(#- .nr #- +(\n(o|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.n+
++.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
++.o+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(p|u+\n(.Vu
++.if (\n(p|+\n(#^-1v)>\n(#- .nr #- +(\n(p|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-target \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.p+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(q|u+\n(.Vu
++.if (\n(q|+\n(#^-1v)>\n(#- .nr #- +(\n(q|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-quiet \fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.q+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.rm g+
++.rm h+
++.rm i+
++.rm j+
++.rm k+
++.rm l+
++.rm m+
++.rm n+
++.rm o+
++.rm p+
++.rm q+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-72
++.LP
++\f2\-b\fP¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¡¢Ê£¿ô¤ÎJAX\-WS¤ª¤è¤ÓJAXB¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤äBean̾¤Ê¤É¡¢ÍÍ¡¹¤Ê¤â¤Î¤ò¥«¥¹¥¿¥Þ¥¤¥º¤Ç¤­¤Þ¤¹¡£JAX\-WS¤ª¤è¤ÓJAXB¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤Î¾ÜºÙ¤Ï¡¢
++.na
++\f2¥«¥¹¥¿¥Þ¥¤¥º¡¦¥Þ¥Ë¥å¥¢¥ë\fP @
++.fi
++https://jax\-ws.dev.java.net/nonav/2.1.1/docs/customizations.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++¼¡¤Îɽ¤Ë¡¢\f2wsimport\fP¤ÎÈóɸ½à¥ª¥×¥·¥ç¥ó¤ò¼¨¤·¤Þ¤¹¡£
++.LP
++.TS
++.if \n+(b.=1 .nr d. \n(.c-\n(c.-1
++.de 35
++.ps \n(.s
++.vs \n(.vu
++.in \n(.iu
++.if \n(.u .fi
++.if \n(.j .ad
++.if \n(.j=0 .na
++..
++.nf
++.nr #~ 0
++.if n .nr #~ 0.6n
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.fc
++.nr 33 \n(.s
++.rm 80 81
++.nr 34 \n(.lu
++.eo
++.am 81
++.br
++.di a+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥ê¥¯¥¨¥¹¥È¤Þ¤¿¤Ï¥ì¥¹¥Ý¥ó¥¹¡¦¥á¥Ã¥»¡¼¥¸¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤Ê¤¤¥Ø¥Ã¥À¡¼¤òJava¥á¥½¥Ã¥É¤Î¥Ñ¥é¥á¡¼¥¿¤Ë¥Þ¥Ã¥×¤·¤Þ¤¹
++.br
++.di
++.nr a| \n(dn
++.nr a- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di b+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++ǧ¾Ú¾ðÊó¤ò´Þ¤à¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ëWSDL URI¤Ç¤¹¡£¤³¤ÎURI¤Î·Á¼°¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹ http://\f2<user name>\fP:\f2<password>\fP@\f2<host name>\fP/\f2<Web service name>\fP?wsdl
++.br
++.di
++.nr b| \n(dn
++.nr b- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di c+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++¥Ç¥Ð¥Ã¥°¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹
++.br
++.di
++.nr c| \n(dn
++.nr c- \n(dl
++..
++.ec \
++.eo
++.am 80
++.br
++.di d+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(80 .ll \n(80u
++.in 0
++\f3\-Xno\-addressing\-databinding\fP
++.br
++.di
++.nr d| \n(dn
++.nr d- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di e+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++W3C \f2EndpointReferenceType\fP¤ÈJava¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤òÍ­¸ú¤Ë¤·¤Þ¤¹
++.br
++.di
++.nr e| \n(dn
++.nr e- \n(dl
++..
++.ec \
++.eo
++.am 81
++.br
++.di f+
++.35
++.ft \n(.f
++.ll \n(34u*1u/3u
++.if \n(.l<\n(81 .ll \n(81u
++.in 0
++À¸À®¤µ¤ì¤¿Java¥Õ¥¡¥¤¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤»¤ó
++.br
++.di
++.nr f| \n(dn
++.nr f- \n(dl
++..
++.ec \
++.35
++.nf
++.ll \n(34u
++.nr 80 0
++.nr 38 \w\f3¥ª¥×¥·¥ç¥ó\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-XadditionalHeaders\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-Xauthfile <file>\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-Xdebug\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 38 \w\f3\-Xnocompile\fP
++.if \n(80<\n(38 .nr 80 \n(38
++.80
++.rm 80
++.nr 38 \n(d-
++.if \n(80<\n(38 .nr 80 \n(38
++.nr 81 0
++.nr 38 \w\f3ÀâÌÀ\fP
++.if \n(81<\n(38 .nr 81 \n(38
++.81
++.rm 81
++.nr 38 \n(a-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(b-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(c-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(e-
++.if \n(81<\n(38 .nr 81 \n(38
++.nr 38 \n(f-
++.if \n(81<\n(38 .nr 81 \n(38
++.35
++.nf
++.ll \n(34u
++.nr 38 1n
++.nr 79 0
++.nr 40 \n(79+(0*\n(38)
++.nr 80 +\n(40
++.nr 41 \n(80+(3*\n(38)
++.nr 81 +\n(41
++.nr TW \n(81
++.if t .if \n(TW>\n(.li .tm Table at line 199 file Input is too wide - \n(TW units
++.fc  
++.nr #T 0-1
++.nr #a 0-1
++.eo
++.de T#
++.ds #d .d
++.if \(ts\n(.z\(ts\(ts .ds #d nl
++.mk ##
++.nr ## -1v
++.ls 1
++.ls
++..
++.ec
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3¥ª¥×¥·¥ç¥ó\fP\h'|\n(41u'\f3ÀâÌÀ\fP
++.ne \n(a|u+\n(.Vu
++.if (\n(a|+\n(#^-1v)>\n(#- .nr #- +(\n(a|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-XadditionalHeaders\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.a+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(b|u+\n(.Vu
++.if (\n(b|+\n(#^-1v)>\n(#- .nr #- +(\n(b|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-Xauthfile <file>\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.b+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(c|u+\n(.Vu
++.if (\n(c|+\n(#^-1v)>\n(#- .nr #- +(\n(c|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-Xdebug\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.c+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(d|u+\n(.Vu
++.ne \n(e|u+\n(.Vu
++.if (\n(d|+\n(#^-1v)>\n(#- .nr #- +(\n(d|+\n(#^-\n(#--1v)
++.if (\n(e|+\n(#^-1v)>\n(#- .nr #- +(\n(e|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(40u
++.in +\n(37u
++.d+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.e+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.ne \n(f|u+\n(.Vu
++.if (\n(f|+\n(#^-1v)>\n(#- .nr #- +(\n(f|+\n(#^-\n(#--1v)
++.ta \n(80u \n(81u
++.nr 31 \n(.f
++.nr 35 1m
++\&\h'|\n(40u'\f3\-Xnocompile\fP\h'|\n(41u'
++.mk ##
++.nr 31 \n(##
++.sp |\n(##u-1v
++.nr 37 \n(41u
++.in +\n(37u
++.f+
++.in -\n(37u
++.mk 32
++.if \n(32>\n(31 .nr 31 \n(32
++.sp |\n(31u
++.fc
++.nr T. 1
++.T# 1
++.35
++.rm a+
++.rm b+
++.rm c+
++.rm d+
++.rm e+
++.rm f+
++.TE
++.if \n-(b.=0 .nr c. \n(.c-\n(d.-26
++
++.LP
++.SH "Îã"
++.nf
++\f3
++.fl
++\fP\f3wsimport \-p stockquote http://stockquote.example.com/quote?wsdl\fP
++.fl
++.fi
++.LP
++Java¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¡¢\f2http://stockquote.example.com/quote?wsdl\fP¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Æ¤½¤ÎJava¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹
++.br
++
+--- ./jdk/src/bsd/doc/man/ja/xjc.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/ja/xjc.1 Sun Jan 25 08:34:16 2015 -0800
+@@ -19,7 +19,279 @@
+ ." or visit www.oracle.com if you need additional information or have any
+ ." questions.
+ ."
+-.TH xjc 1 "07 May 2011"
++.TH xjc 1 "05 Jul 2012"
+
+ .LP
+-.ad c
++.SH "̾Á°"
++xjc \- XML¥Ð¥¤¥ó¥É¤Î¤¿¤á¤ÎJava(tm)¥¢¡¼¥­¥Æ¥¯¥Á¥ã
++.br
++¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é
++.LP
++.LP
++\f3»ÅÍͥС¼¥¸¥ç¥ó:\fP 2.1
++.br
++\f3¥ê¥Õ¥¡¥ì¥ó¥¹¼ÂÁõ(RI)¥Ð¡¼¥¸¥ç¥ó:\fP 2.1.3
++.LP
++.SH "xjc¤Îµ¯Æ°"
++.LP
++.LP
++¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢»ÈÍѤ¹¤ë¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë±þ¤¸¤¿\f2bin\fP¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î\f2xjc\fP¥·¥§¥ë¡¦¥¹¥¯¥ê¥×¥È¤ò»ÈÍѤ·¤Þ¤¹¡£¤Þ¤¿¡¢¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤ÎAnt¥¿¥¹¥¯¤âÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.na
++\f2XJC Ant¥¿¥¹¥¯¤Î»ÈÍÑ\fP @
++.fi
++https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html¤Î¼ê½ç¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
++.LP
++.LP
++\f2% xjc \-help\fP
++.LP
++.SS
++½ÐÎÏ
++.LP
++.nf
++\f3
++.fl
++Usage: xjc [\-options ...] <schema file/URL/dir/jar> ... [\-b <bindinfo>] ...
++.fl
++If dir is specified, all schema files in it will be compiled.
++.fl
++If jar is specified, /META\-INF/sun\-jaxb.episode binding file will be compiled.
++.fl
++Options:
++.fl
++ \-nv : do not perform strict validation of the input schema(s)
++.fl
++ \-extension : allow vendor extensions \- do not strictly follow the Compatibility Rules and App E.2 from the JAXB Spec
++.fl
++ \-b <file/dir> : specify external bindings files (each <file> must have its own \-b); if a directory is given, **/*.xjb is searched
++.fl
++ \-d <dir> : generated files will go into this directory
++.fl
++ \-p <pkg> : specifies the target package
++.fl
++ \-httpproxy <proxy> : set HTTP/HTTPS proxy; format is [user[:password]@]proxyHost:proxyPort
++.fl
++ \-httpproxyfile <f> : works like \-httpproxy but takes the argument in a file to protect password
++.fl
++ \-classpath <arg> : specify where to find user class files
++.fl
++ \-catalog <file> : specify catalog files to resolve external entity references; support TR9401, XCatalog, and OASIS XML Catalog format
++.fl
++ \-readOnly : generated files will be in read\-only mode
++.fl
++ \-npa : suppress generation of package level annotations (**/package\-info.java)
++.fl
++ \-no\-header : suppress generation of a file header with timestamp
++.fl
++ \-target 2.0 : behave like XJC 2.0 and generate code that doesnt use any 2.1 features
++.fl
++ \-xmlschema : treat input as W3C XML Schema (default)
++.fl
++ \-relaxng : treat input as RELAX NG (experimental,unsupported)
++.fl
++ \-relaxng\-compact : treat input as RELAX NG compact syntax (experimental,unsupported)
++.fl
++ \-dtd : treat input as XML DTD (experimental,unsupported)
++.fl
++ \-wsdl : treat input as WSDL and compile schemas inside it (experimental,unsupported)
++.fl
++ \-verbose : be extra verbose
++.fl
++ \-quiet : suppress compiler output
++.fl
++ \-help : display this help message
++.fl
++ \-version : display version information
++.fl
++
++.fl
++
++.fl
++Extensions:
++.fl
++ \-Xlocator : enable source location support for generated code
++.fl
++ \-Xsync\-methods : generate accessor methods with the 'synchronized' keyword
++.fl
++ \-mark\-generated : mark the generated code as @javax.annotation.Generated
++.fl
++ \-episode <FILE> : generate the episode file for separate compilation
++.fl
++\fP
++.fi
++
++.LP
++.SH "¥ª¥×¥·¥ç¥ó"
++.LP
++.RS 3
++.TP 3
++\-nv
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢XJC¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¥½¡¼¥¹¡¦¥¹¥­¡¼¥Þ¤ò½èÍý¤¹¤ëÁ°¤Ë¸·Ì©¤Ê¸¡¾Ú¤ò¼Â¹Ô¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢¸·Ì©¤Ê¥¹¥­¡¼¥Þ¸¡¾Ú¤«Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤¬¸¡¾Ú¤ò°ìÀڼ¹Ԥ·¤Ê¤¤¤È¤¤¤¦¤³¤È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤è¤ê¸·Ì©¤Ç¤Ê¤¤¸¡¾Ú¤ò¼Â¹Ô¤¹¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
++.TP 3
++\-extension
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢XJC¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤Ï¡¢JAXB»ÅÍͤÎCompatibility¤Î¾Ï¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¥ë¡¼¥ë¤ò¸·Ì©¤Ë¶¯À©¤·¤Þ¤¹¡£ÉÕÏ¿E.2¤Ë¤Ï¡¢JAXB v1.0¤Ç´°Á´¤Ë¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤°ìÏ¢¤ÎW3C XML¥¹¥­¡¼¥Þµ¡Ç½¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¡¢¤³¤Î¥¹¥¤¥Ã¥Á¤ÇÍ­¸ú¤Ë¤Ê¤ë¡Ö\-extension¡×¥â¡¼¥É¤Ç¤½¤ì¤é¤Îµ¡Ç½¤¬»ÈÍѤǤ­¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤Þ¤¿¡¢¥Ç¥Õ¥©¥ë¥È¤Î¸·Ì©¤Ê¥â¡¼¥É¤Ç¤Ï¡¢»ÅÍͤËÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥«¥¹¥¿¥Þ¥¤¥º¤Î¤ß¤¬»ÈÍѤǤ­¤Þ¤¹¡£¡Ö\-extension¡×¥¹¥¤¥Ã¥Á¤ò»ØÄꤹ¤ì¤Ð¡¢JAXB Vendor Extension¤ò»ÈÍѤǤ­¤Þ¤¹¡£
++.TP 3
++\-b <file>
++½èÍý¤¹¤ë³°Éô¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤ò1¤Ä¤Þ¤¿¤ÏÊ£¿ô»ØÄꤷ¤Þ¤¹¡£(¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤´¤È¤Ë\f2¡Ö\-b¡×\fP¥¹¥¤¥Ã¥Á¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£)³°Éô¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤Î¹½Ê¸¤ÏÈó¾ï¤Ë½ÀÆð¤Ç¤¹¡£Ê£¿ô¤Î¥¹¥­¡¼¥Þ¤Î¥«¥¹¥¿¥Þ¥¤¥º¤¬´Þ¤Þ¤ì¤ë1¤Ä¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤¿¤ê¡¢¤½¤ì¤é¤Î¥«¥¹¥¿¥Þ¥¤¥º¤òÊ£¿ô¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤Ëʬ³ä¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£\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¤Þ¤¿¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¥¹¥­¡¼¥Þ¡¦¥Õ¥¡¥¤¥ë¤È¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë½çÈÖ¤ÏǤ°Õ¤Ç¤¹¡£
++.TP 3
++\-d <dir>
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢XJC¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤Ï¡¢Java¥³¥ó¥Æ¥ó¥Ä¡¦¥¯¥é¥¹¤ò¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÀ¸À®¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢ÂåÂؽÐÎϥǥ£¥ì¥¯¥È¥ê¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£½ÐÎϥǥ£¥ì¥¯¥È¥ê¤Ï¤¢¤é¤«¤¸¤á¸ºß¤·¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£XJC¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¼«Æ°Åª¤ËºîÀ®¤·¤Þ¤»¤ó¡£
++.TP 3
++\-p <pkg>
++¤³¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó·Ðͳ¤Ç¥¿¡¼¥²¥Ã¥È¡¦¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¤½¤Î»ØÄêÆâÍƤϡ¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÂФ¹¤ë¤¹¤Ù¤Æ¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥«¥¹¥¿¥Þ¥¤¥º¤ä¡¢»ÅÍͤǵ¬Äꤵ¤ì¤Æ¤¤¤ë¥Ç¥Õ¥©¥ë¥È¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¥¢¥ë¥´¥ê¥º¥à¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹¡£
++.TP 3
++\-httpproxy <proxy>
++HTTP/HTTPS¥×¥í¥­¥·¤ò»ØÄꤷ¤Þ¤¹¡£·Á¼°¤Ï[user[:password]@]proxyHost[:proxyPort]¤Ç¤¹¡£½¾Íè¤Î\f2\-host\fP¤ª¤è¤Ó\f2\-port\fP¤Ï¡¢²¼°Ì¸ß´¹À­¤Î¤¿¤á¤Ë¥ê¥Õ¥¡¥ì¥ó¥¹¼ÂÁõ(RI)¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¿ä¾©¤µ¤ì¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤Ï¡¢\f2top\fP¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¥æ¡¼¥¶¡¼¤Ê¤É¡¢Â¾¤Î¥æ¡¼¥¶¡¼¤¬É½¼¨¤Ç¤­¤ë°ú¿ô¤Ç¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¥»¥­¥å¥ê¥Æ¥£¤ò¹â¤á¤ë¤Ë¤Ï¡¢¼¡¤Î\f2\-httpproxyfile\fP¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-httpproxyfile <file>
++HTTP/HTTPS¥×¥í¥­¥·¤ò¥Õ¥¡¥¤¥ë·Ðͳ¤Ç»ØÄꤷ¤Þ¤¹¡£·Á¼°¤ÏÁ°½Ò¤Î¤â¤Î¤ÈƱ¤¸¤Ç¤¹¤¬¡¢¤³¤Î¥Õ¥¡¥¤¥ëÆâ¤Ë»ØÄꤵ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤ò¾¤Î¥æ¡¼¥¶¡¼¤¬É½¼¨¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
++.TP 3
++\-classpath <arg>
++\f2<jxb:javaType>\fP¤ª¤è¤Ó\f2<xjc:superClass>\fP¥«¥¹¥¿¥Þ¥¤¥º¤¬»ÈÍѤ¹¤ë¥¯¥é¥¤¥¢¥ó¥È¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¯¥é¥¹¡¦¥Õ¥¡¥¤¥ë¤Î¸¡º÷¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£
++.TP 3
++\-catalog <file>
++³°Éô¥¨¥ó¥Æ¥£¥Æ¥£»²¾È¤ò²ò·è¤¹¤ë¥«¥¿¥í¥°¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£TR9401¡¢XCatalog¤ª¤è¤ÓOASIS XML Catalog·Á¼°¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï¡¢XML Entity and URI Resolvers¤Î¥É¥­¥å¥á¥ó¥È¤ò»²¾È¤¹¤ë¤«¡¢\f2catalog\-resolver\fP¥µ¥ó¥×¥ë¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£
++.TP 3
++\-readOnly
++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢XJC¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤Ï¡¢À¸À®¤¹¤ëJava¥½¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò½ñ¹þ¤ß¤«¤éÊݸ¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤È¡¢XJC¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤ÏÀ¸À®¤µ¤ì¤ëJava¥½¡¼¥¹¤ò¶¯À©Åª¤ËÆɼè¤êÀìÍѤˤ·¤Þ¤¹¡£
++.TP 3
++\-npa
++¥Ñ¥Ã¥±¡¼¥¸¡¦¥ì¥Ù¥ë¤ÎÃí¼á¤ò**/package\-info.java¤ËÀ¸À®¤¹¤ë¤³¤È¤òÍÞÀ©¤·¤Þ¤¹¡£¤³¤Î¥¹¥¤¥Ã¥Á¤ò»ÈÍѤ·¤ÆÀ¸À®¤¹¤ë¥³¡¼¥É¤Ç¤Ï¡¢¤³¤ì¤é¤ÎÃí¼á¤¬Â¾¤ÎÀ¸À®ºÑ¤ß¥¯¥é¥¹¤ËÆâÉô²½¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-no\-header
++¿¾¯¤Î¥á¥â¤È¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò´Þ¤à¥Õ¥¡¥¤¥ë¡¦¥Ø¥Ã¥À¡¼¡¦¥³¥á¥ó¥È¤ÎÀ¸À®¤òÍÞÀ©¤·¤Þ¤¹¡£¤³¤ì¤ò»ÈÍѤ¹¤ë¤È¡¢À¸À®¤µ¤ì¤¿¥³¡¼¥É¤Çdiff¤ò»ÈÍѤ·¤ä¤¹¤¯¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++\-target 2.0
++JAXB 2.1µ¡Ç½¤Ë°Í¸¤¹¤ë¥³¡¼¥É¤òÀ¸À®¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢À¸À®¤µ¤ì¤¿¥³¡¼¥É¤òJAXB 2.0¥é¥ó¥¿¥¤¥à(JavaSE 6¤Ê¤É)¤Ç¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++\-xmlschema
++ÆþÎÏ¥¹¥­¡¼¥Þ¤òW3C XML¥¹¥­¡¼¥Þ¤È¤·¤Æ°·¤¤¤Þ¤¹(¥Ç¥Õ¥©¥ë¥È)¡£¤³¤Î¥¹¥¤¥Ã¥Á¤ò»ØÄꤷ¤Ê¤¯¤Æ¤â¡¢ÆþÎÏ¥¹¥­¡¼¥Þ¤ÏW3C XML¥¹¥­¡¼¥Þ¤È¸«¤Ê¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-relaxng
++ÆþÎÏ¥¹¥­¡¼¥Þ¤òRELAX NG¤È¤·¤Æ°·¤¤¤Þ¤¹(»î¸³Åª¡¢Ì¤¥µ¥Ý¡¼¥È)¡£RELAX NG¥¹¥­¡¼¥Þ¤Î¥µ¥Ý¡¼¥È¤ÏJAXB Vendor Extension¤È¤·¤ÆÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.TP 3
++\-relaxng\-compact
++ÆþÎÏ¥¹¥­¡¼¥Þ¤òRELAX NG°µ½Ì¹½Ê¸¤È¤·¤Æ½èÍý¤·¤Þ¤¹(»î¸³Åª¡¢Ì¤¥µ¥Ý¡¼¥È)¡£RELAX NG¥¹¥­¡¼¥Þ¤Î¥µ¥Ý¡¼¥È¤ÏJAXB Vendor Extension¤È¤·¤ÆÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.TP 3
++\-dtd
++ÆþÎÏ¥¹¥­¡¼¥Þ¤òXML DTD¤È¤·¤Æ°·¤¤¤Þ¤¹(»î¸³Åª¡¢Ì¤¥µ¥Ý¡¼¥È)¡£RELAX NG¥¹¥­¡¼¥Þ¤Î¥µ¥Ý¡¼¥È¤ÏJAXB Vendor Extension¤È¤·¤ÆÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£
++.TP 3
++\-wsdl
++ÆþÎϤòWSDL¤È¤·¤Æ°·¤¤¡¢¤½¤ÎÆâÉô¤Î¥¹¥­¡¼¥Þ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹(»î¸³Åª¡¢Ì¤¥µ¥Ý¡¼¥È)¡£
++.TP 3
++\-quiet
++¿ÊĽ¾ðÊó¤ä·Ù¹ð¤Ê¤É¡¢¥³¥ó¥Ñ¥¤¥é¤Î½ÐÎϤòÍÞÀ©¤·¤Þ¤¹¡£
++.TP 3
++\-verbose
++¾ðÊó¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤¿¤êÆÃÄê¤Î¥¨¥é¡¼È¯À¸»þ¤Ë¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹¤òɽ¼¨¤·¤¿¤ê¤¹¤ë¤Ê¤É¡¢¤­¤ï¤á¤Æ¾éĹ¤Ë¤Ê¤ê¤Þ¤¹¡£
++.TP 3
++\-help
++¥³¥ó¥Ñ¥¤¥é¡¦¥¹¥¤¥Ã¥Á¤Î³µÍפòɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++\-version
++¥³¥ó¥Ñ¥¤¥é¤Î¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
++.TP 3
++<schema file/URL/dir>
++¥³¥ó¥Ñ¥¤¥ëÂоݤȤʤë1¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥¹¥­¡¼¥Þ¡¦¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤¬¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤¿¾ì¹ç¡¢xjc¤Ï¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÁöºº¤·¡¢¤½¤³¤Ç¸«¤Ä¤«¤Ã¤¿¤¹¤Ù¤Æ¤Î¥¹¥­¡¼¥Þ¡¦¥Õ¥¡¥¤¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++Èóɸ½à¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-Xlocator
++À¸À®¤µ¤ì¤¿¥³¡¼¥É¤Ç¤Ï¡¢ÈóÀ°Î󲽤θå¤ËJava Bean¥¤¥ó¥¹¥¿¥ó¥¹¤Ë´Þ¤Þ¤ì¤ë¥½¡¼¥¹XML¤Ë´Ø¤¹¤ëSAX Locator¾ðÊ󤬸ø³«¤µ¤ì¤Þ¤¹¡£
++.TP 3
++\-Xsync\-methods
++À¸À®¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î¥á¥½¥Ã¥É¡¦¥·¥°¥Ë¥Á¥ã¤Ë\f2synchronized\fP¥­¡¼¥ï¡¼¥É¤¬´Þ¤á¤é¤ì¤Þ¤¹¡£
++.TP 3
++\-mark\-generated
++À¸À®¤µ¤ì¤¿¥³¡¼¥É¤ËÃí¼á\f2@javax.annotation.Generated\fP¤òÉÕ¤±¤Þ¤¹¡£
++.TP 3
++\-episode <file>
++¥³¥ó¥Ñ¥¤¥ë¤´¤È¤Ë»ØÄꤵ¤ì¤¿¥¨¥Ô¥½¡¼¥É¡¦¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£
++.RE
++
++.LP
++.SS
++Èó¿ä¾©¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤ª¤è¤Óºï½ü¤µ¤ì¤¿¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó
++.LP
++.RS 3
++.TP 3
++\-host & \-port
++¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤ÏÈó¿ä¾©¤È¤Ê¤ê¡¢\f3\-httpproxy\fP¥ª¥×¥·¥ç¥ó¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Þ¤·¤¿¡£¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢²¼°Ì¸ß´¹À­¤ò³ÎÊݤ¹¤ëÌÜŪ¤Ç°ú³¤­¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤¹¤¬¡¢¥É¥­¥å¥á¥ó¥È¤Ë¤Ïµ­ºÜ¤µ¤ì¤º¡¢¾­Íè¤Î¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ë²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡£
++.TP 3
++\-use\-runtime
++JAXB 2.0»ÅÍͤǤϡ¢°Ü¿¢À­¤Î¤¢¤ë¥é¥ó¥¿¥¤¥à¤¬ÄêµÁ¤µ¤ì¤¿¤¿¤á¡¢JAXB RI¤¬**/impl/runtime¥Ñ¥Ã¥±¡¼¥¸¤òÀ¸À®¤¹¤ëɬÍפ¬¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£¤³¤Î¤¿¤á¡¢¤³¤Î¥¹¥¤¥Ã¥Á¤ÏÉÔÍפȤʤꡢºï½ü¤µ¤ì¤Þ¤·¤¿¡£
++.TP 3
++\-source
++\-source¸ß´¹À­¥¹¥¤¥Ã¥Á¤Ï¡¢JAXB 2.0¤ÎºÇ½é¤ÎEarly AccessÈǤÇƳÆþ¤µ¤ì¤Þ¤·¤¿¡£¤³¤Î¥¹¥¤¥Ã¥Á¤Ï¡¢JAXB 2.0¤Îº£¸å¤Î¥ê¥ê¡¼¥¹¤«¤éºï½ü¤µ¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤·¤¿¡£1.0.x¥³¡¼¥É¤òÀ¸À®¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢1.0.x¥³¡¼¥É¥Ù¡¼¥¹¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
++.RE
++
++.LP
++.SS
++¥³¥ó¥Ñ¥¤¥é¤ÎÀ©¸Â
++.LP
++.LP
++Ä̾ï¤Ï¡¢´ØÏ¢¤¹¤ë¤¹¤Ù¤Æ¤Î¥¹¥­¡¼¥Þ¤ò¡¢Æ±¤¸¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¡¦¥¹¥¤¥Ã¥Á¤ò»ØÄꤷ¤Æ1¤Ä¤Îñ°Ì¤È¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤Î¤¬ºÇ¤â°ÂÁ´¤Ç¤¹¡£
++.LP
++.LP
++xjc¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ï¡¢¼¡¤Ë¼¨¤¹À©¸Â¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤é¤ÎÌäÂê¤Î¤Û¤È¤ó¤É¤Ï¡¢xjc¤ò²¿ÅÙ¤«¸Æ¤Ó½Ð¤·¤ÆÊ£¿ô¤Î¥¹¥­¡¼¥Þ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Ë¤Î¤ßÅö¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£
++.LP
++.RS 3
++.TP 2
++o
++Ê£¿ô¤Î¥¹¥­¡¼¥Þ¤òƱ»þ¤Ë¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Ï¡¢¥¿¡¼¥²¥Ã¥È¤ÎJava¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë¼¡¤ÎÍ¥Àè½ç°Ì¤Î¥ë¡¼¥ë¤¬Å¬ÍѤµ¤ì¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
++.RS 3
++.TP 3
++1.
++¡Ö\f2\-p\fP¡×¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¤¬ºÇ¤âÍ¥À褵¤ì¤Þ¤¹¡£
++.TP 3
++2.
++<\f2jaxb:package\fP>¤Î¥«¥¹¥¿¥Þ¥¤¥º
++.TP 3
++3.
++\f2targetNamespace\fP¤¬Àë¸À¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢»ÅÍͤËÄêµÁ¤µ¤ì¤Æ¤¤¤ë\f2targetNamespace\fP \-> Java¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¥¢¥ë¥´¥ê¥º¥à¤òŬÍѤ·¤Þ¤¹¡£
++.TP 3
++4.
++\f2targetNamespace\fP¤¬Àë¸À¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢¡Ögenerated¡×¤È¤¤¤¦Ì¾Á°¤Î¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ·¤Þ¤¹¡£
++.RE
++.TP 2
++o
++̾Á°¶õ´Ö¤´¤È¤ËÊ£¿ô¤Î<\f2jaxb:schemaBindings\fP>¤ò»ý¤Ä¤³¤È¤ÏÉÔÀµ¤Ç¤¹¡£¤³¤Î¤¿¤á¡¢1¤Ä¤Î¥¿¡¼¥²¥Ã¥È̾Á°¶õ´ÖÆâ¤Î2¤Ä¤Î¥¹¥­¡¼¥Þ¤ò°Û¤Ê¤ëJava¥Ñ¥Ã¥±¡¼¥¸¤Ë¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
++.TP 2
++o
++1¤Ä¤ÎJava¥Ñ¥Ã¥±¡¼¥¸¤Ë¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥¹¥­¡¼¥Þ¤Ï¡¢XJC¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é¤ËƱ»þ¤ËÁ÷¿®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¸ÄÊ̤˥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤³¤È¤Ï¤Ç¤­¤º¡¢Í½´ü¤·¤¿¤È¤ª¤ê¤ËÆ°ºî¤·¤Þ¤»¤ó¡£
++.TP 2
++o
++Ê£¿ô¤Î¥¹¥­¡¼¥Þ¡¦¥Õ¥¡¥¤¥ë¤Ë¤Þ¤¿¤¬¤ëÍ×ÁÇÃÖ´¹¥°¥ë¡¼¥×¤Ï¡¢Æ±»þ¤Ë¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
++.RE
++
++.LP
++.SH "´ØÏ¢¹àÌÜ"
++.LP
++.RS 3
++.TP 2
++o
++¥Ð¥¤¥ó¥Ç¥£¥ó¥°¡¦¥³¥ó¥Ñ¥¤¥é(XJC)¤Î¼Â¹Ô: [
++.na
++\f2¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÎÌ¿Îá\fP @
++.fi
++https://jaxb.dev.java.net/nonav/2.1.3/docs/xjc.html¡¢
++.na
++\f2XJC Ant¥¿¥¹¥¯¤Î»ÈÍÑ\fP @
++.fi
++https://jaxb.dev.java.net/nonav/2.1.3/docs/xjcTask.html]
++.TP 2
++o
++.na
++\f2XML¥Ð¥¤¥ó¥É¤Î¤¿¤á¤ÎJava¥¢¡¼¥­¥Æ¥¯¥Á¥ã(JAXB)\fP @
++.fi
++http://docs.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html
++.RE
++
++.LP
++
+--- ./jdk/src/bsd/doc/man/jar.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jar.1 Sun Jan 25 08:34:16 2015 -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/javac.1 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/javac.1 Sun Jan 25 08:34:16 2015 -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
++If \-source is \f31.2\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.3\fP, the value of \-target is \f31.4\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.5\fP, the value of \-target is \f31.7\fP
++.TP 2
++o
++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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/javadoc.1 Sun Jan 25 08:34:16 2015 -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
+-.fl
+- * applet and the classes an applet uses
++ * Provides the classes necessary to create an
++.fl
++ * 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:
+-.fl
+-@see java.lang.String // String \fP\f3
+-.fl
+-@see java.lang.String The String class // The String class \fP\f3
+-.fl
+-@see String // String \fP\f3
+-.fl
+-@see String#equals(Object) // String.equals(Object) \fP\f3
+-.fl
+-@see String#equals // String.equals(java.lang.Object) \fP\f3
+-.fl
+-@see java.lang.Object#wait(long) // java.lang.Object.wait(long) \fP\f3
+-.fl
+-@see Character#MAX_RADIX // Character.MAX_RADIX \fP\f3
+-.fl
+-@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 also:
++.fl
++@see java.lang.String // String \fP\f3
++.fl
++@see java.lang.String The String class // The String class \fP\f3
++.fl
++@see String // String \fP\f3
++.fl
++@see String#equals(Object) // String.equals(Object) \fP\f3
++.fl
++@see String#equals // String.equals(java.lang.Object) \fP\f3
++.fl
++@see java.lang.Object#wait(long) // java.lang.Object.wait(long) \fP\f3
++.fl
++@see Character#MAX_RADIX // Character.MAX_RADIX \fP\f3
++.fl
++@see <a href="spec.html">Java Spec</a> // Java Spec \fP\f3
++.fl
++@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
+-.fl
+- * if the index is not in the range <code>0</code>
++ * @exception StringIndexOutOfRangeException
++.fl
++ * 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.
+-.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:
++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:
+ .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)
+-.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:
++\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:
+ .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
+-.fl
+- \-use
++ \-d docs\-filelist
++.fl
++ \-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 \\
+-.fl
+- \-overview /java/jdk/src/share/classes/overview.html \\
+-.fl
+- \-d /java/jdk/build/api \\
+-.fl
+- \-use \\
+-.fl
+- \-splitIndex \\
+-.fl
+- \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\
+-.fl
+- \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\
+-.fl
+- \-header '<b>Java(TM) SE 7</b>' \\
++% javadoc \-sourcepath /java/jdk/src/share/classes \\
++.fl
++ \-overview /java/jdk/src/share/classes/overview.html \\
++.fl
++ \-d /java/jdk/build/api \\
++.fl
++ \-use \\
++.fl
++ \-splitIndex \\
++.fl
++ \-windowtitle 'Java Platform, Standard Edition 7 API Specification' \\
++.fl
++ \-doctitle 'Java Platform, Standard Edition 7 API Specification' \\
++.fl
++ \-header '<b>Java(TM) SE 7</b>' \\
+ .fl
+ \-bottom '<font size="\-1">
+ .fl
+@@ -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>' \\
+-.fl
+- \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\
+-.fl
+- \-group "Extension Packages" "javax.*" \\
+-.fl
+- \-J\-Xmx180m \\
++ Other names may be trademarks of their respective owners.</font>' \\
++.fl
++ \-group "Core Packages" "java.*:com.sun.java.*:org.omg.*" \\
++.fl
++ \-group "Extension Packages" "javax.*" \\
++.fl
++ \-J\-Xmx180m \\
+ .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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/javah.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/javap.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/javaws.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jconsole.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jdb.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jhat.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jinfo.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jmap.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jps.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jrunscript.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jsadebugd.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jstack.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jstat.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/jstatd.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/keytool.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/native2ascii.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/orbd.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/pack200.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/policytool.1 Sun Jan 25 08:34:16 2015 -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
++.LP
++Run the policytool Administrator's utility
++.LP
++.LP
++\f4policytool\fP
++.LP
++.LP
++Run policytool and load the specified policy file
++.LP
++.LP
++\f4policytool\fP\f2[\-file\ \fP\f2filename\fP\f2]\fP
++.LP
++.LP
++where:
++.LP
+ .RS 3
+ .TP 3
+-\
++file
++directs \f2policytool\fP to load a local policy file
+ .TP 3
+-Run the policytool Administrator's utility
+-\f4policytool\fP
+-.TP 3
+-Run policytool and load the specified policy file
+-\f4policytool\fP\f2[\-file\ \fP\f2filename\fP\f2]\fP
+-.TP 3
+-\
+-.TP 3
+-where:
+-.RS 3
+-.TP 3
+-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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/rmic.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/rmid.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/rmiregistry.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/schemagen.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/serialver.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/servertool.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/tnameserv.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/unpack200.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/wsgen.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/wsimport.1 Sun Jan 25 08:34:16 2015 -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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/bsd/doc/man/xjc.1 Sun Jan 25 08:34:16 2015 -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/share/classes/java/util/TimeZone.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/java/util/TimeZone.java Sun Jan 25 08:34:16 2015 -0800
+@@ -917,15 +917,13 @@
+ }
+ int gmtOffset = (hours * 60 + num) * 60 * 1000;
+
++ zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
+ if (gmtOffset == 0) {
+- zi = ZoneInfoFile.getZoneInfo(GMT_ID);
+ if (negative) {
+ zi.setID("GMT-00:00");
+ } else {
+ zi.setID("GMT+00:00");
+ }
+- } else {
+- zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
+ }
+ return zi;
+ }
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sun Jan 25 08:34:16 2015 -0800
+@@ -1146,7 +1146,7 @@
+ */
+ HashMap<String, Boolean> existsMap;
+ public boolean needToSearchForFile(String fileName) {
+- if (!FontUtilities.isLinux) {
++ if (!FontUtilities.isLinux && !FontUtilities.isBSD) {
+ return false;
+ } else if (existsMap == null) {
+ existsMap = new HashMap<String, Boolean>();
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sun Jan 25 08:34:16 2015 -0800
+@@ -39,6 +39,7 @@
+ WINDOWS,
+ LINUX,
+ SOLARIS,
++ BSD,
+ MACOSX,
+ UNKNOWN
+ }
+@@ -101,6 +102,10 @@
+ return SOLARIS;
+ }
+
++ if (osName.contains("BSD")) {
++ return BSD;
++ }
++
+ if (osName.contains("OS X")) {
+ return MACOSX;
+ }
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sun Jan 25 08:34:16 2015 -0800
+@@ -48,6 +48,8 @@
+
+ public static boolean isLinux;
+
++ public static boolean isBSD;
++
+ public static boolean isMacOSX;
+
+ public static boolean isSolaris8;
+@@ -78,6 +80,11 @@
+
+ isLinux = osName.startsWith("Linux");
+
++
++ isBSD = (osName.startsWith("FreeBSD") ||
++ osName.startsWith("NetBSD") ||
++ osName.startsWith("OpenBSD"));
++
+ isMacOSX = osName.contains("OS X"); // TODO: MacOSX
+
+ String t2kStr = System.getProperty("sun.java2d.font.scaler");
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sun Jan 25 08:34:16 2015 -0800
+@@ -418,7 +418,7 @@
+ * registerFonts method as on-screen these JRE fonts
+ * always go through the T2K rasteriser.
+ */
+- if (FontUtilities.isLinux) {
++ if (FontUtilities.isLinux || FontUtilities.isBSD) {
+ /* Linux font configuration uses these fonts */
+ registerFontDir(jreFontDirName);
+ }
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sun Jan 25 08:34:16 2015 -0800
+@@ -1568,7 +1568,7 @@
+ }
+
+ String osname = System.getProperty("os.name");
+- if (osname.equals("Linux") || osname.contains("OS X")) {
++ if (osname.equals("Linux") || osname.equals("FreeBSD") || osname.equals("NetBSD") || osname.equals("OpenBSD") || osname.equals("OS X")) {
+ execCmd = new String[ncomps];
+ execCmd[n++] = "/usr/bin/lpr";
+ if ((pFlags & PRINTER) != 0) {
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sun Jan 25 08:34:16 2015 -0800
+@@ -83,7 +83,8 @@
+ String osname = System.getProperty("os.name");
+ if (osname.startsWith("SunOS")) {
+ gssLibs = new String[]{ "libgss.so" };
+- } else if (osname.startsWith("Linux")) {
++ } else if (osname.startsWith("Linux") ||
++ osname.endsWith("BSD")) {
+ gssLibs = new String[]{
+ "libgssapi.so",
+ "libgssapi_krb5.so",
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sun Jan 25 08:34:16 2015 -0800
+@@ -30,4 +30,5 @@
+ #[solaris]sun.tools.attach.SolarisAttachProvider
+ #[windows]sun.tools.attach.WindowsAttachProvider
+ #[linux]sun.tools.attach.LinuxAttachProvider
++#[bsd]sun.tools.attach.BsdAttachProvider
+ #[macosx]sun.tools.attach.BsdAttachProvider
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/sun/tools/jar/Main.java Sun Jan 25 08:34:16 2015 -0800
+@@ -51,6 +51,7 @@
+ String zname = "";
+ String[] files;
+ String rootjar = null;
++ String cwd;
+
+ // An entryName(path)->File map generated during "expand", it helps to
+ // decide whether or not an existing entry in a jar file needs to be
+@@ -867,6 +868,19 @@
+ * Extracts specified entries from JAR file.
+ */
+ void extract(InputStream in, String files[]) throws IOException {
++ // Current working directory
++
++ cwd = System.getProperty("user.dir");
++ if (cwd == null) {
++ fatalError(getMsg("error.no.cwd"));
++ }
++ cwd = (new File(cwd)).getCanonicalPath();
++ if (!cwd.endsWith(File.separator)) {
++ cwd += File.separator;
++ }
++
++ // Extract the files
++
+ ZipInputStream zis = new ZipInputStream(in);
+ ZipEntry e;
+ // Set of all directory entries specified in archive. Disallows
+@@ -897,6 +911,19 @@
+ * Extracts specified entries from JAR file, via ZipFile.
+ */
+ void extract(String fname, String files[]) throws IOException {
++ // Current working directory
++
++ cwd = System.getProperty("user.dir");
++ if (cwd == null) {
++ fatalError(getMsg("error.no.cwd"));
++ }
++ cwd = (new File(cwd)).getCanonicalPath();
++ if (!cwd.endsWith(File.separator)) {
++ cwd += File.separator;
++ }
++
++ // Extract the files
++
+ ZipFile zf = new ZipFile(fname);
+ Set<ZipEntry> dirs = newDirSet();
+ Enumeration<? extends ZipEntry> zes = zf.entries();
+@@ -928,6 +955,10 @@
+ ZipEntry rc = null;
+ String name = e.getName();
+ File f = new File(e.getName().replace('/', File.separatorChar));
++ if (!f.getCanonicalPath().startsWith(cwd)) {
++ output(formatMsg("out.ignore.entry", name));
++ return null;
++ }
+ if (e.isDirectory()) {
+ if (f.exists()) {
+ if (!f.isDirectory()) {
+@@ -949,6 +980,10 @@
+ } else {
+ if (f.getParent() != null) {
+ File d = new File(f.getParent());
++ if (!d.getCanonicalPath().startsWith(cwd)) {
++ output(formatMsg("out.ignore.entry", name));
++ return null;
++ }
+ if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
+ throw new IOException(formatMsg(
+ "error.create.dir", d.getPath()));
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties Sun Jan 25 08:34:16 2015 -0800
+@@ -44,6 +44,8 @@
+ {0} : could not create directory
+ error.incorrect.length=\
+ incorrect length while processing: {0}
++error.no.cwd=\
++ {0} : could not determine current working directory
+ out.added.manifest=\
+ added manifest
+ out.update.manifest=\
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt Sun Jan 25 08:34:16 2015 -0800
+@@ -38,6 +38,7 @@
+ # gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
+ # gnumake JDK=<java_home> OSNAME=linux [OPT=true]
+ # gnumake JDK=<java_home> OSNAME=win32 [OPT=true]
++# gnumake JDK=<java_home> OSNAME=bsd [OPT=true]
+ #
+ ########################################################################
+
+@@ -120,6 +121,29 @@
+ LINK_SHARED=link -dll -out:$@
+ endif
+
++# BSD GNU C Compiler
++ifeq ($(OSNAME), bsd)
++ # GNU Compiler options needed to build it
++ COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer
++ # Options that help find errors
++ COMMON_FLAGS+= -W -Wall -Wno-unused -Wno-parentheses
++ ifeq ($(OPT), true)
++ CFLAGS=-O2 $(COMMON_FLAGS)
++ else
++ CFLAGS=-g $(COMMON_FLAGS)
++ endif
++ # Object files needed to create library
++ OBJECTS=$(SOURCES:%.c=%.o)
++ # Library name and options needed to build it
++ # XXX: Needs to be fixed for MacOS X
++ LIBRARY=lib$(LIBNAME).so
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ # Libraries we are dependent on
++ LIBRARIES=-lc
++ # Building a shared library
++ LINK_SHARED=$(LINK.c) -shared -o $@
++endif
++
+ # Common -I options
+ CFLAGS += -I.
+ CFLAGS += -I../agent_util
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sun Jan 25 08:34:16 2015 -0800
+@@ -33,6 +33,10 @@
+
+ #include <stdlib.h>
+
++#ifdef _ALLBSD_SOURCE
++#include <machine/endian.h>
++#endif
++
+ #ifndef _MSC_VER
+ #include <strings.h>
+ #endif
+@@ -62,7 +66,7 @@
+
+ #endif // End of ZLIB
+
+-#ifdef _BIG_ENDIAN
++#if (BYTE_ORDER == BIG_ENDIAN)
+ #define SWAP_BYTES(a) \
+ ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
+ #else
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h Sun Jan 25 08:34:16 2015 -0800
+@@ -64,7 +64,7 @@
+
+
+ // following is needed for _LP64
+-#if ((X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) || (X_PLATFORM == X_MACOSX))
++#if ((X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) || (X_PLATFORM == X_BSD) || (X_PLATFORM == X_MACOSX))
+ #include <sys/types.h>
+ #endif
+
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sun Jan 25 08:34:16 2015 -0800
+@@ -24,6 +24,9 @@
+ * questions.
+ */
+
++#ifdef __OpenBSD__
++#include <sys/types.h>
++#endif
+ #ifdef _ALLBSD_SOURCE
+ #include <machine/endian.h>
+ #elif __linux__
+@@ -32,6 +35,12 @@
+ #endif
+ #include "jfdlibm.h"
+
++/* BSD's always define both _LITTLE_ENDIAN && _BIG_ENDIAN */
++#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) && \
++ _BYTE_ORDER == _BIG_ENDIAN
++#undef _LITTLE_ENDIAN
++#endif
++
+ #ifdef __NEWVALID /* special setup for Sun test regime */
+ #if defined(i386) || defined(i486) || \
+ defined(intel) || defined(x86) || defined(arm) || \
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sun Jan 25 08:34:16 2015 -0800
+@@ -86,7 +86,7 @@
+ #endif /* MLIB_USE_FTOI_CLAMPING */
+
+ /***************************************************************/
+-#if defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG)
++#if (BYTE_ORDER == LITTLE_ENDIAN) && !defined(_NO_LONGLONG)
+
+ /* NB: Explicit cast to DTYPE is necessary to avoid warning from Microsoft VC compiler.
+ And we need to explicitly define cast behavior if source exceeds destination range.
+@@ -103,7 +103,7 @@
+ dp[0 ] = (DTYPE) ((res0) & DTYPE_MASK); \
+ dp[chan1] = (DTYPE) ((res1) & DTYPE_MASK)
+
+-#endif /* defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG) */
++#endif /* (BYTE_ORDER == LITTLE_ENDIAN) && !defined(_NO_LONGLONG) */
+
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -114,17 +114,17 @@
+
+ #else /* _NO_LONGLONG */
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | ((mlib_s64)sp[0] & 0xffffffff)
+
+-#else /* _LITTLE_ENDIAN */
++#else
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | ((mlib_s64)sp[chan1] & 0xffffffff)
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ #endif /* _NO_LONGLONG */
+
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sun Jan 25 08:34:16 2015 -0800
+@@ -126,7 +126,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define STORE2(res0, res1) \
+ dp[0 ] = res1; \
+@@ -138,7 +138,7 @@
+ dp[0 ] = res0; \
+ dp[chan1] = res1
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -149,17 +149,17 @@
+
+ #else /* _NO_LONGLONG */
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+
+-#else /* _LITTLE_ENDIAN */
++#else
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+
+ /***************************************************************/
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sun Jan 25 08:34:16 2015 -0800
+@@ -94,7 +94,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define STORE2(res0, res1) \
+ dp[0 ] = res1; \
+@@ -106,7 +106,7 @@
+ dp[0 ] = res0; \
+ dp[chan1] = res1
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -117,17 +117,17 @@
+
+ #else /* _NO_LONGLONG */
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+
+-#else /* _LITTLE_ENDIAN */
++#else
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+
+ /***************************************************************/
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sun Jan 25 08:34:16 2015 -0800
+@@ -126,7 +126,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define STORE2(res0, res1) \
+ dp[0 ] = res1; \
+@@ -138,7 +138,7 @@
+ dp[0 ] = res0; \
+ dp[chan1] = res1
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -149,17 +149,17 @@
+
+ #else /* _NO_LONGLONG */
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+
+-#else /* _LITTLE_ENDIAN */
++#else
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+
+ /***************************************************************/
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sun Jan 25 08:34:16 2015 -0800
+@@ -95,7 +95,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define STORE2(res0, res1) \
+ dp[0 ] = res1; \
+@@ -107,7 +107,7 @@
+ dp[0 ] = res0; \
+ dp[chan1] = res1
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -118,17 +118,17 @@
+
+ #else /* _NO_LONGLONG */
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+
+-#else /* _LITTLE_ENDIAN */
++#else
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+
+ /***************************************************************/
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sun Jan 25 08:34:16 2015 -0800
+@@ -126,7 +126,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define STORE2(res0, res1) \
+ dp[0 ] = res1; \
+@@ -138,7 +138,7 @@
+ dp[0 ] = res0; \
+ dp[chan1] = res1
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -149,17 +149,17 @@
+
+ #else /* _NO_LONGLONG */
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+
+-#else /* _LITTLE_ENDIAN */
++#else
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+
+ /***************************************************************/
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sun Jan 25 08:34:16 2015 -0800
+@@ -94,7 +94,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define STORE2(res0, res1) \
+ dp[0 ] = res1; \
+@@ -106,7 +106,7 @@
+ dp[0 ] = res0; \
+ dp[chan1] = res1
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -117,17 +117,17 @@
+
+ #else /* _NO_LONGLONG */
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+
+-#else /* _LITTLE_ENDIAN */
++#else
+
+ #define LOAD_BUFF(buff) \
+ *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+
+ /***************************************************************/
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sun Jan 25 08:34:16 2015 -0800
+@@ -95,7 +95,7 @@
+ dst = dp[0];
+ if (ld_offset + size < 32) {
+ dmask = (mask0 << (32 - size)) >> ld_offset;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+ src = (src0 >> (ld_offset - ls_offset));
+ dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -104,12 +104,12 @@
+ #else
+ src = (src0 >> (ld_offset - ls_offset));
+ dp[0] = (dst & (~dmask)) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ return;
+ }
+
+ dmask = mask0 >> ld_offset;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+ src = (src0 >> (ld_offset - ls_offset));
+ dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -118,7 +118,7 @@
+ #else
+ src = (src0 >> (ld_offset - ls_offset));
+ dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ j = 32 - ld_offset;
+ dp++;
+ ls_offset += j;
+@@ -131,7 +131,7 @@
+
+ if (ld_offset + size < 32) {
+ dmask = (mask0 << (32 - size)) >> ld_offset;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+ src = (src0 << shift) | (src1 >> (32 - shift));
+@@ -141,12 +141,12 @@
+ #else
+ src = (src0 << shift) | (src1 >> (32 - shift));
+ dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ return;
+ }
+
+ dmask = mask0 >> ld_offset;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+ src = (src0 << shift) | (src1 >> (32 - shift));
+@@ -156,7 +156,7 @@
+ #else
+ src = (src0 << shift) | (src1 >> (32 - shift));
+ dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ j = 32 - ld_offset;
+ dp++;
+ sp++;
+@@ -164,19 +164,19 @@
+ }
+
+ if (j < size) src1 = sp[0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ for (; j <= size - 32; j += 32) {
+ src0 = src1;
+ src1 = sp[1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+ src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
+ dp[0] = (src << 24) | ((src & 0xFF00) << 8) | ((src >> 8) & 0xFF00) | (src >> 24);
+ #else
+ dp[0] = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ sp++;
+ dp++;
+ }
+@@ -187,7 +187,7 @@
+ if (ls_offset + j > 32) src1 = sp[1];
+ dst = dp[0];
+ dmask = mask0 << (32 - j);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+ src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
+ dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -196,7 +196,7 @@
+ #else
+ src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
+ dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ }
+
+ #else /* _LONGLONG */
+@@ -315,7 +315,7 @@
+ dst = dp[0];
+ if (ld_offset >= size) {
+ dmask = (lmask0 << (32 - size)) >> (ld_offset - size);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+ src = (src0 << (ls_offset - ld_offset));
+ dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -324,12 +324,12 @@
+ #else
+ src = (src0 << (ls_offset - ld_offset));
+ dp[0] = (dst & (~dmask)) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ return;
+ }
+
+ dmask = lmask0 << (32 - ld_offset);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+ src = (src0 << (ls_offset - ld_offset));
+ dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -338,7 +338,7 @@
+ #else
+ src = (src0 << (ls_offset - ld_offset));
+ dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ j = ld_offset;
+ dp--;
+ ls_offset -= j;
+@@ -351,7 +351,7 @@
+
+ if (ld_offset >= size) {
+ dmask = (lmask0 << (32 - size)) >> (ld_offset - size);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+ src = (src0 >> shift) | (src1 << (32 - shift));
+@@ -361,12 +361,12 @@
+ #else
+ src = (src0 >> shift) | (src1 << (32 - shift));
+ dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ return;
+ }
+
+ dmask = lmask0 << (32 - ld_offset);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+ src = (src0 >> shift) | (src1 << (32 - shift));
+@@ -376,7 +376,7 @@
+ #else
+ src = (src0 >> shift) | (src1 << (32 - shift));
+ dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ j = ld_offset;
+ dp--;
+ sp--;
+@@ -384,22 +384,22 @@
+ }
+
+ if (j < size) src1 = sp[0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ #ifdef __SUNPRO_C
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+ for (; j <= size - 32; j += 32) {
+ src0 = src1;
+ src1 = sp[-1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+ src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
+ dp[0] = (src << 24) | ((src & 0xFF00) << 8) | ((src >> 8) & 0xFF00) | (src >> 24);
+ #else
+ dp[0] = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ sp--;
+ dp--;
+ }
+@@ -410,7 +410,7 @@
+ if (ls_offset < j) src1 = sp[-1];
+ dst = dp[0];
+ dmask = lmask0 >> (32 - j);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+ src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
+ dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -419,7 +419,7 @@
+ #else
+ src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
+ dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ }
+
+ #else /* _LONGLONG */
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sun Jan 25 08:34:16 2015 -0800
+@@ -168,7 +168,7 @@
+ }
+
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #define READ_U8_D64(table0, table1, table2, table3) \
+ t0 = *(mlib_d64*)((mlib_u8*)table0 + ((s0 << 3) & 0x7F8)); \
+@@ -184,7 +184,7 @@
+ t2 = *(mlib_d64*)((mlib_u8*)table2 + ((s0 >> 5) & 0x7F8)); \
+ t3 = *(mlib_d64*)((mlib_u8*)table3 + ((s0 << 3) & 0x7F8))
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /***************************************************************/
+ void mlib_ImageLookUp_U8_D64(const mlib_u8 *src,
+@@ -613,7 +613,7 @@
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+ for (i = 0; i < size - 7; i += 4, dp += 8, sa++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
+@@ -623,12 +623,12 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
+@@ -638,7 +638,7 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ dp[4] = t0;
+ dp[5] = t1;
+@@ -646,7 +646,7 @@
+ dp[7] = t3;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
+@@ -656,12 +656,12 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
+@@ -671,7 +671,7 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[4] = t0;
+ dp[5] = t1;
+ dp[6] = t2;
+@@ -719,7 +719,7 @@
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+ for (i = 0; i < size - 7; i += 4, dp += 12, sa++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
+@@ -733,14 +733,14 @@
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+ dp[4] = t4;
+ dp[5] = t5;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
+@@ -754,7 +754,7 @@
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ dp[6] = t0;
+ dp[7] = t1;
+@@ -764,7 +764,7 @@
+ dp[11] = t5;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
+@@ -778,14 +778,14 @@
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+ dp[4] = t4;
+ dp[5] = t5;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
+@@ -799,7 +799,7 @@
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[6] = t0;
+ dp[7] = t1;
+ dp[8] = t2;
+@@ -852,7 +852,7 @@
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+ for (i = 0; i < size - 7; i += 4, dp += 16, sa++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
+@@ -862,12 +862,12 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
+@@ -877,12 +877,12 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[4] = t0;
+ dp[5] = t1;
+ dp[6] = t2;
+ dp[7] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
+@@ -892,12 +892,12 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[8] = t0;
+ dp[9] = t1;
+ dp[10] = t2;
+ dp[11] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
+@@ -907,7 +907,7 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ dp[12] = t0;
+ dp[13] = t1;
+@@ -915,7 +915,7 @@
+ dp[15] = t3;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
+@@ -925,12 +925,12 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
+@@ -940,12 +940,12 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[4] = t0;
+ dp[5] = t1;
+ dp[6] = t2;
+ dp[7] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
+@@ -955,12 +955,12 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[8] = t0;
+ dp[9] = t1;
+ dp[10] = t2;
+ dp[11] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
+@@ -970,7 +970,7 @@
+ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+ t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
+ t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[12] = t0;
+ dp[13] = t1;
+ dp[14] = t2;
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sun Jan 25 08:34:16 2015 -0800
+@@ -88,7 +88,7 @@
+ } d64_2_f32;
+
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ static const mlib_u32 mlib_bit_mask[16] = {
+ 0x00000000u, 0xFF000000u, 0x00FF0000u, 0xFFFF0000u,
+@@ -126,7 +126,7 @@
+ 0x00000000u, 0x00FFFFFFu, 0xFF000000u, 0xFFFFFFFFu
+ };
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /***************************************************************/
+ mlib_status mlib_ImageLookUp_Bit_U8_1(const mlib_u8 *src,
+@@ -228,13 +228,13 @@
+ #endif /* __SUNPRO_C */
+ for (; i <= (size - 16); i += 16) {
+ s0 = *(mlib_u16*)sa;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *da++ = dd_array[s0 & 0xFF];
+ *da++ = dd_array[s0 >> 8];
+ #else
+ *da++ = dd_array[s0 >> 8];
+ *da++ = dd_array[s0 & 0xFF];
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ sa += 2;
+ }
+
+@@ -258,20 +258,20 @@
+ val1 = p_dd[2*val0+1];
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8);
+ #else
+ emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ ((mlib_u32*)da)[0] = (val1 & emask) | (((mlib_u32*)da)[0] &~ emask);
+
+ #else /* _NO_LONGLONG */
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ mlib_u64 emask = (mlib_u64)((mlib_s64)(-1)) >> ((8 - (size - i)) * 8);
+ #else
+ mlib_u64 emask = (mlib_s64)(-1) << ((8 - (size - i)) * 8);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ ((mlib_u64*)da)[0] = (((mlib_u64*)dd_array)[sa[0]] & emask) | (((mlib_u64*)da)[0] &~ emask);
+
+@@ -323,13 +323,13 @@
+
+ val0 = table[0][0];
+ val1 = table[0][1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ val0 = val0 | (table[1][0] << 8);
+ val1 = val1 | (table[1][1] << 8);
+ #else
+ val0 = (val0 << 8) | table[1][0];
+ val1 = (val1 << 8) | table[1][1];
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ val0 |= (val0 << 16);
+ val1 |= (val1 << 16);
+
+@@ -394,11 +394,11 @@
+ dd1 = dd2;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8);
+ #else
+ emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ ((mlib_u32*)da)[0] = (dd1 & emask) | (((mlib_u32*)da)[0] &~ emask);
+
+ #else /* _NO_LONGLONG */
+@@ -412,11 +412,11 @@
+ dd = ((mlib_u64*)dd_array)[s0 & 0xf];
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ emask = (mlib_u64)((mlib_s64)(-1)) >> ((8 - (size - i)) * 8);
+ #else
+ emask = (mlib_s64)(-1) << ((8 - (size - i)) * 8);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ ((mlib_u64*)da)[0] = (dd & emask) | (((mlib_u64*)da)[0] &~ emask);
+
+ #endif /* _NO_LONGLONG */
+@@ -462,7 +462,7 @@
+
+ buffs = buff + size;
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ l0 = (table[0][0] << 24) | (table[2][0] << 16) | (table[1][0] << 8) | (table[0][0]);
+ h0 = (table[0][1] << 24) | (table[2][1] << 16) | (table[1][1] << 8) | (table[0][1]);
+ l1 = (l0 >> 8); l1 |= (l1 << 24);
+@@ -476,7 +476,7 @@
+ h1 = (h0 << 8); h1 |= (h1 >> 24);
+ l2 = (l1 << 8); l2 |= (l2 >> 24);
+ h2 = (h1 << 8); h2 |= (h2 >> 24);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /* calculate lookup table */
+ #ifdef __SUNPRO_C
+@@ -564,11 +564,11 @@
+ dd = ((mlib_u32*)(d_array12 + (s0 & 0xF)))[1];
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8);
+ #else
+ emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = (dd & emask) | (da[0] &~ emask);
+ }
+
+@@ -611,13 +611,13 @@
+
+ buffs = buff + size;
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ l = (table[3][0] << 24) | (table[2][0] << 16) | (table[1][0] << 8) | (table[0][0]);
+ h = (table[3][1] << 24) | (table[2][1] << 16) | (table[1][1] << 8) | (table[0][1]);
+ #else
+ l = (table[0][0] << 24) | (table[1][0] << 16) | (table[2][0] << 8) | (table[3][0]);
+ h = (table[0][1] << 24) | (table[1][1] << 16) | (table[2][1] << 8) | (table[3][1]);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ ((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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sun Jan 25 08:34:16 2015 -0800
+@@ -30,7 +30,7 @@
+ typedef union {
+ mlib_d64 db;
+ struct {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ mlib_s32 int1, int0;
+ #else
+ mlib_s32 int0, int1;
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sun Jan 25 08:34:16 2015 -0800
+@@ -275,11 +275,11 @@
+ for (i = 0; j <= (b_size - 4); j += 4, i++) {
+ src0 = src1;
+ src1 = pws[i + 1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ pwd[i] = (src0 >> lshift) | (src1 << rshift);
+ #else
+ pwd[i] = (src0 << lshift) | (src1 >> rshift);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ }
+
+ sa += i << 2;
+@@ -381,11 +381,11 @@
+ for (; j <= (src_width - 4); j += 4) {
+ src0 = src1;
+ src1 = ps[1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *((mlib_s32 *) (pdst_row + j)) = (src0 >> shl) | (src1 << shr);
+ #else
+ *((mlib_s32 *) (pdst_row + j)) = (src0 << shl) | (src1 >> shr);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ ps++;
+ }
+ }
+@@ -414,11 +414,11 @@
+ for (; j <= (src_width - 8); j += 8) {
+ src0 = src1;
+ src1 = ps[1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *((mlib_s64 *) (pdst_row + j)) = (src0 >> shl) | (src1 << shr);
+ #else
+ *((mlib_s64 *) (pdst_row + j)) = (src0 << shl) | (src1 >> shr);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ ps++;
+ }
+ }
+@@ -484,11 +484,11 @@
+ for (; j <= (src_width - 2); j += 2) {
+ src0 = src1;
+ src1 = ps[1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *((mlib_s32 *) (pdst_row + j)) = (src0 >> 16) | (src1 << 16);
+ #else
+ *((mlib_s32 *) (pdst_row + j)) = (src0 << 16) | (src1 >> 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ ps++;
+ }
+ }
+@@ -516,11 +516,11 @@
+ for (; j <= (src_width - 4); j += 4) {
+ src0 = src1;
+ src1 = ps[1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *((mlib_s64 *) (pdst_row + j)) = (src0 >> shl) | (src1 << shr);
+ #else
+ *((mlib_s64 *) (pdst_row + j)) = (src0 << shl) | (src1 >> shr);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ ps++;
+ }
+ }
+@@ -585,11 +585,11 @@
+ for (; j <= (src_width - 2); j += 2) {
+ src0 = src1;
+ src1 = ps[1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *((mlib_s64 *) (pdst_row + j)) = (src0 >> 32) | (src1 << 32);
+ #else
+ *((mlib_s64 *) (pdst_row + j)) = (src0 << 32) | (src1 >> 32);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ ps++;
+ }
+ }
+@@ -687,11 +687,11 @@
+ #endif /* __SUNPRO_C */
+ for (; n > SIZE; n -= SIZE) {
+ s1 = *tmp++;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *(TYPE *) dp = (s0 >> shl) | (s1 << shr);
+ #else
+ *(TYPE *) dp = (s0 << shl) | (s1 >> shr);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = s1;
+ dp += SIZE;
+ sp += SIZE;
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sun Jan 25 08:34:16 2015 -0800
+@@ -120,7 +120,7 @@
+ } \
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ /***************************************************************/
+ #define READ_U8_U8_ALIGN(table0, table1, table2, table3) \
+@@ -163,7 +163,7 @@
+ t2 = *(mlib_u32*)((mlib_u8*)table2 + ((s0 >> 14) & 0x3FC)); \
+ t3 = *(mlib_u32*)((mlib_u8*)table3 + ((s0 >> 22) & 0x3FC))
+
+-#else /* _LITTLE_ENDIAN */
++#else /* BYTE_ORDER == ... */
+
+ /***********/
+ #define READ_U8_U8_ALIGN(table0, table1, table2, table3) \
+@@ -206,7 +206,7 @@
+ t2 = *(mlib_u32*)((mlib_u8*)table2 + ((s0 >> 6) & 0x3FC)); \
+ t3 = *(mlib_u32*)((mlib_u8*)table3 + ((s0 << 2) & 0x3FC))
+
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ /***************************************************************/
+ void mlib_c_ImageLookUp_U8_U8(const mlib_u8 *src,
+@@ -297,11 +297,11 @@
+ da[0] = t;
+ da++;
+ dp = (mlib_u8 *) da;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *dp++ = tab[s2 >> 8];
+ #else
+ *dp++ = tab[s2 & 0xFF];
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ sp = (mlib_u8 *) sa;
+ i += 5;
+ for (; i < size; i++, dp++, sp++)
+@@ -403,11 +403,11 @@
+ da[0] = t;
+ da++;
+ dp = (mlib_u8 *) da;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *dp++ = tab0[s2 >> 8];
+ #else
+ *dp++ = tab0[s2 & 0xFF];
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ sp = (mlib_u8 *) sa;
+ i += 5;
+
+@@ -544,11 +544,11 @@
+ da[0] = t;
+ da++;
+ dp = (mlib_u8 *) da;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *dp++ = tab1[s2 >> 8];
+ #else
+ *dp++ = tab1[s2 & 0xFF];
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ sp = (mlib_u8 *) sa;
+ i += 5;
+
+@@ -694,11 +694,11 @@
+ da[0] = t;
+ da++;
+ dp = (mlib_u8 *) da;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *dp++ = tab0[s2 >> 8];
+ #else
+ *dp++ = tab0[s2 & 0xFF];
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ sp = (mlib_u8 *) sa;
+ i += 5;
+
+@@ -1852,21 +1852,21 @@
+ s0 = tab0[0];
+ s1 = tab1[0];
+ for (i = 1; i < 256; i++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s2 = (s1 << 8) + s0;
+ #else
+ s2 = (s0 << 8) + s1;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = tab0[i];
+ s1 = tab1[i];
+ tab[i - 1] = (mlib_u16) s2;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s2 = (s1 << 8) + s0;
+ #else
+ s2 = (s0 << 8) + s1;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ tab[255] = (mlib_u16) s2;
+
+ for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
+@@ -1897,11 +1897,11 @@
+ for (i = 0; i < size - 3; i += 2, da++, sa += 2) {
+ t0 = tab[s0];
+ t1 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t = (t1 << 16) + t0;
+ #else
+ t = (t0 << 16) + t1;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ s1 = sa[1];
+ da[0] = t;
+@@ -1909,11 +1909,11 @@
+
+ t0 = tab[s0];
+ t1 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t = (t1 << 16) + t0;
+ #else
+ t = (t0 << 16) + t1;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = t;
+ da++;
+
+@@ -1927,13 +1927,13 @@
+
+ if (off > 1) {
+ t0 = tab[sa[0]];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ dp[1] = (t0 >> 8);
+ dp[0] = t0;
+ #else
+ dp[0] = (t0 >> 8);
+ dp[1] = t0;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ sa++;
+ size--;
+ dp += 2;
+@@ -1941,11 +1941,11 @@
+
+ t0 = tab[sa[0]];
+ sa++;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *dp++ = t0;
+ #else
+ *dp++ = (t0 >> 8);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ da = (mlib_s32 *) dp;
+
+@@ -1959,11 +1959,11 @@
+ for (i = 0; i < size - 4; i += 2, da++, sa += 2) {
+ t1 = tab[s0];
+ t2 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t = (t0 >> 8) + (t1 << 8) + (t2 << 24);
+ #else
+ t = (t0 << 24) + (t1 << 8) + (t2 >> 8);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ t0 = t2;
+ s0 = sa[0];
+ s1 = sa[1];
+@@ -1972,29 +1972,29 @@
+
+ t1 = tab[s0];
+ t2 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t = (t0 >> 8) + (t1 << 8) + (t2 << 24);
+ #else
+ t = (t0 << 24) + (t1 << 8) + (t2 >> 8);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = t;
+ da++;
+ dp = (mlib_u8 *) da;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ dp[0] = (t2 >> 8);
+ #else
+ dp[0] = t2;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ if ((size & 1) == 0) {
+ t0 = tab[sa[0]];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ dp[2] = (t0 >> 8);
+ dp[1] = t0;
+ #else
+ dp[1] = (t0 >> 8);
+ dp[2] = t0;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ }
+ }
+ }
+@@ -2012,22 +2012,22 @@
+ s1 = tab1[0];
+ s2 = tab2[0];
+ for (i = 1; i < 256; i++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s3 = (s2 << 24) + (s1 << 16) + (s0 << 8);
+ #else
+ s3 = (s0 << 16) + (s1 << 8) + s2;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = tab0[i];
+ s1 = tab1[i];
+ s2 = tab2[i];
+ tab[i - 1] = s3;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s3 = (s2 << 24) + (s1 << 16) + (s0 << 8);
+ #else
+ s3 = (s0 << 16) + (s1 << 8) + s2;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ tab[255] = s3;
+
+ for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
+@@ -2064,24 +2064,24 @@
+ for (i = 0; i < size - 7; i += 4, da += 3, sa += 4) {
+ t0 = tab[s0];
+ t1 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ da[0] = (t0 >> 8) + (t1 << 16);
+ res2 = (t1 >> 16);
+ #else
+ da[0] = (t0 << 8) + (t1 >> 16);
+ res2 = (t1 << 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ s1 = sa[1];
+ t0 = tab[s0];
+ t1 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 += (t0 << 8);
+ res1 = (t0 >> 24) + t1;
+ #else
+ res2 += (t0 >> 8);
+ res1 = (t0 << 24) + t1;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[2];
+ s1 = sa[3];
+ da[1] = res2;
+@@ -2090,24 +2090,24 @@
+
+ t0 = tab[s0];
+ t1 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ da[0] = (t0 >> 8) + (t1 << 16);
+ res2 = (t1 >> 16);
+ #else
+ da[0] = (t0 << 8) + (t1 >> 16);
+ res2 = (t1 << 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ s1 = sa[1];
+ t0 = tab[s0];
+ t1 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 += (t0 << 8);
+ res1 = (t0 >> 24) + t1;
+ #else
+ res2 += (t0 >> 8);
+ res1 = (t0 << 24) + t1;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[1] = res2;
+ da[2] = res1;
+ da += 3;
+@@ -2143,11 +2143,11 @@
+ s2 = tab2[0];
+ s3 = tab3[0];
+ for (i = 1; i < 256; i++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s4 = (s3 << 24) + (s2 << 16) + (s1 << 8) + s0;
+ #else
+ s4 = (s0 << 24) + (s1 << 16) + (s2 << 8) + s3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = tab0[i];
+ s1 = tab1[i];
+ s2 = tab2[i];
+@@ -2155,11 +2155,11 @@
+ tab[i - 1] = s4;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s4 = (s3 << 24) + (s2 << 16) + (s1 << 8) + s0;
+ #else
+ s4 = (s0 << 24) + (s1 << 16) + (s2 << 8) + s3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ tab[255] = s4;
+
+ for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
+@@ -2225,13 +2225,13 @@
+ for (i = 0; i < size - 4; i += 2, da += 2, sa += 2) {
+ t1 = tab[s0];
+ t2 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t0 >> shift) + (t1 << shift1);
+ res2 = (t1 >> shift) + (t2 << shift1);
+ #else
+ res1 = (t0 << shift) + (t1 >> shift1);
+ res2 = (t1 << shift) + (t2 >> shift1);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ t0 = t2;
+ s0 = sa[0];
+ s1 = sa[1];
+@@ -2241,28 +2241,28 @@
+
+ t1 = tab[s0];
+ t2 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t0 >> shift) + (t1 << shift1);
+ res2 = (t1 >> shift) + (t2 << shift1);
+ #else
+ res1 = (t0 << shift) + (t1 >> shift1);
+ res2 = (t1 << shift) + (t2 >> shift1);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = res1;
+ da[1] = res2;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = (da[2] >> shift1);
+ da[2] = (t2 >> shift) + (t0 << shift1);
+ #else
+ t0 = (da[2] << shift1);
+ da[2] = (t2 << shift) + (t0 >> shift1);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da += 2;
+ dp = (mlib_u8 *) da + (4 - off);
+
+ if ((size & 1) == 0) {
+ t0 = tab[sa[0]];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ dp[3] = (mlib_u8) (t0 >> 24);
+ dp[2] = (mlib_u8) (t0 >> 16);
+ dp[1] = (mlib_u8) (t0 >> 8);
+@@ -2272,7 +2272,7 @@
+ dp[1] = (mlib_u8) (t0 >> 16);
+ dp[2] = (mlib_u8) (t0 >> 8);
+ dp[3] = (mlib_u8) t0;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ }
+ }
+ }
+@@ -2348,13 +2348,13 @@
+ t3 = tab0[s1];
+ t4 = tab1[s1];
+ t5 = tab2[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ res2 = (t5 << 8) + t4;
+ #else
+ da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+ res2 = (t4 << 24) + (t5 << 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ s1 = sa[1];
+ t0 = tab0[s0];
+@@ -2363,13 +2363,13 @@
+ t3 = tab0[s1];
+ t4 = tab1[s1];
+ t5 = tab2[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 += ((t1 << 24) + (t0 << 16));
+ res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2;
+ #else
+ res2 += ((t0 << 8) + t1);
+ res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[2];
+ s1 = sa[3];
+ da[1] = res2;
+@@ -2382,13 +2382,13 @@
+ t3 = tab0[s1];
+ t4 = tab1[s1];
+ t5 = tab2[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ res2 = (t5 << 8) + t4;
+ #else
+ da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+ res2 = (t4 << 24) + (t5 << 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ s1 = sa[1];
+ t0 = tab0[s0];
+@@ -2397,13 +2397,13 @@
+ t3 = tab0[s1];
+ t4 = tab1[s1];
+ t5 = tab2[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 += ((t1 << 24) + (t0 << 16));
+ res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2;
+ #else
+ res2 += ((t0 << 8) + t1);
+ res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[1] = res2;
+ da[2] = res1;
+ da += 3;
+@@ -2455,11 +2455,11 @@
+ t1 = tab1[s0];
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ #else
+ res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ da[0] = res;
+ }
+@@ -2468,11 +2468,11 @@
+ t1 = tab1[s0];
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ #else
+ res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = res;
+
+ }
+@@ -2496,11 +2496,11 @@
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ #else
+ res1 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ s0 = sa[0];
+ sa++;
+@@ -2513,13 +2513,13 @@
+ t1 = tab1[s0];
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ res = (res1 >> shift) + (res2 << shift1);
+ #else
+ res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+ res = (res1 << shift) + (res2 >> shift1);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ res1 = res2;
+ s0 = sa[0];
+ da[0] = res;
+@@ -2529,21 +2529,21 @@
+ t1 = tab1[s0];
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ res = (res1 >> shift) + (res2 << shift1);
+ #else
+ res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+ res = (res1 << shift) + (res2 >> shift1);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = res;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (da[1] >> shift1);
+ da[1] = (res2 >> shift) + (res1 << shift1);
+ #else
+ res1 = (da[1] << shift1);
+ da[1] = (res2 << shift) + (res1 >> shift1);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ }
+ }
+ }
+@@ -2617,13 +2617,13 @@
+ t3 = tab0[s1];
+ t4 = tab1[s1];
+ t5 = tab2[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ res2 = (t5 << 8) + t4;
+ #else
+ da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+ res2 = (t4 << 24) + (t5 << 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ s1 = sa[1];
+ t0 = tab0[s0];
+@@ -2632,13 +2632,13 @@
+ t3 = tab0[s1];
+ t4 = tab1[s1];
+ t5 = tab2[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 += ((t1 << 24) + (t0 << 16));
+ res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2;
+ #else
+ res2 += ((t0 << 8) + t1);
+ res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[2];
+ s1 = sa[3];
+ da[1] = res2;
+@@ -2651,13 +2651,13 @@
+ t3 = tab0[s1];
+ t4 = tab1[s1];
+ t5 = tab2[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ res2 = (t5 << 8) + t4;
+ #else
+ da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+ res2 = (t4 << 24) + (t5 << 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ s1 = sa[1];
+ t0 = tab0[s0];
+@@ -2666,13 +2666,13 @@
+ t3 = tab0[s1];
+ t4 = tab1[s1];
+ t5 = tab2[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 += ((t1 << 24) + (t0 << 16));
+ res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2;
+ #else
+ res2 += ((t0 << 8) + t1);
+ res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[1] = res2;
+ da[2] = res1;
+ da += 3;
+@@ -2724,11 +2724,11 @@
+ t1 = tab1[s0];
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ #else
+ res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ da[0] = res;
+ }
+@@ -2737,11 +2737,11 @@
+ t1 = tab1[s0];
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ #else
+ res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = res;
+
+ }
+@@ -2765,11 +2765,11 @@
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ #else
+ res1 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ s0 = sa[0];
+ sa++;
+@@ -2782,13 +2782,13 @@
+ t1 = tab1[s0];
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ res = (res1 >> shift) + (res2 << shift1);
+ #else
+ res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+ res = (res1 << shift) + (res2 >> shift1);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ res1 = res2;
+ s0 = sa[0];
+ da[0] = res;
+@@ -2798,21 +2798,21 @@
+ t1 = tab1[s0];
+ t2 = tab2[s0];
+ t3 = tab3[s0];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
+ res = (res1 >> shift) + (res2 << shift1);
+ #else
+ res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
+ res = (res1 << shift) + (res2 >> shift1);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = res;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (da[1] >> shift1);
+ da[1] = (res2 >> shift) + (res1 << shift1);
+ #else
+ res1 = (da[1] << shift1);
+ da[1] = (res2 << shift) + (res1 >> shift1);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ }
+ }
+ }
+@@ -2863,21 +2863,21 @@
+ s0 = tab0[0];
+ s1 = tab1[0];
+ for (i = 1; i < 256; i++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s2 = (s1 << 16) + s0;
+ #else
+ s2 = (s0 << 16) + s1;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = tab0[i];
+ s1 = tab1[i];
+ tab[i - 1] = s2;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s2 = (s1 << 16) + s0;
+ #else
+ s2 = (s0 << 16) + s1;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ tab[255] = s2;
+
+ for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
+@@ -2919,11 +2919,11 @@
+ else {
+
+ t0 = tab[*sa++];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *dp++ = (mlib_u16) (t0);
+ #else
+ *dp++ = (mlib_u16) (t0 >> 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da = (mlib_u32 *) dp;
+ s0 = sa[0];
+ s1 = sa[1];
+@@ -2935,13 +2935,13 @@
+ for (i = 0; i < size - 4; i += 2, da += 2, sa += 2) {
+ t1 = tab[s0];
+ t2 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t0 >> 16) + (t1 << 16);
+ res2 = (t1 >> 16) + (t2 << 16);
+ #else
+ res1 = (t0 << 16) + (t1 >> 16);
+ res2 = (t1 << 16) + (t2 >> 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ t0 = t2;
+ s0 = sa[0];
+ s1 = sa[1];
+@@ -2951,32 +2951,32 @@
+
+ t1 = tab[s0];
+ t2 = tab[s1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t0 >> 16) + (t1 << 16);
+ res2 = (t1 >> 16) + (t2 << 16);
+ #else
+ res1 = (t0 << 16) + (t1 >> 16);
+ res2 = (t1 << 16) + (t2 >> 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = res1;
+ da[1] = res2;
+ da += 2;
+ dp = (mlib_u16 *) da;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ dp[0] = (mlib_u16) (t2 >> 16);
+ #else
+ dp[0] = (mlib_u16) t2;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ if ((size & 1) == 0) {
+ t0 = tab[sa[0]];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ dp[2] = (mlib_u16) (t0 >> 16);
+ dp[1] = (mlib_u16) t0;
+ #else
+ dp[1] = (mlib_u16) (t0 >> 16);
+ dp[2] = (mlib_u16) t0;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ }
+ }
+ }
+@@ -2994,13 +2994,13 @@
+ s1 = tab1[0];
+ s2 = tab2[0];
+ for (i = 1; i < 256; i++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s3 = (s0 << 16);
+ s4 = (s2 << 16) + s1;
+ #else
+ s3 = s0;
+ s4 = (s1 << 16) + s2;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = tab0[i];
+ s1 = tab1[i];
+ s2 = tab2[i];
+@@ -3008,13 +3008,13 @@
+ tab[2 * i - 1] = s4;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s4 = (s2 << 16) + s1;
+ tab[510] = s0 << 16;
+ #else
+ s4 = (s1 << 16) + s2;
+ tab[510] = s0;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ tab[511] = s4;
+
+ for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
+@@ -3050,13 +3050,13 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t0 >> 16) + (t1 << 16);
+ res2 = (t1 >> 16) + t2;
+ #else
+ res1 = (t0 << 16) + (t1 >> 16);
+ res2 = (t1 << 16) + t2;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0] << 3;
+ s1 = sa[1] << 3;
+ da[0] = res1;
+@@ -3068,13 +3068,13 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t0 >> 16) + (t1 << 16);
+ res2 = (t1 >> 16) + t2;
+ #else
+ res1 = (t0 << 16) + (t1 >> 16);
+ res2 = (t1 << 16) + t2;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = res1;
+ da[1] = res2;
+ da[2] = t3;
+@@ -3105,13 +3105,13 @@
+ s2 = tab2[0];
+ s3 = tab3[0];
+ for (i = 1; i < 256; i++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s4 = (s1 << 16) + s0;
+ s5 = (s3 << 16) + s2;
+ #else
+ s4 = (s0 << 16) + s1;
+ s5 = (s2 << 16) + s3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = tab0[i];
+ s1 = tab1[i];
+ s2 = tab2[i];
+@@ -3120,13 +3120,13 @@
+ tab[2 * i - 1] = s5;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ s4 = (s1 << 16) + s0;
+ s5 = (s3 << 16) + s2;
+ #else
+ s4 = (s0 << 16) + s1;
+ s5 = (s2 << 16) + s3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ tab[510] = s4;
+ tab[511] = s5;
+
+@@ -3181,18 +3181,18 @@
+
+ t4 = tab[2 * sa[0]];
+ t5 = tab[2 * sa[0] + 1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *dp++ = (mlib_u16) (t4);
+ #else
+ *dp++ = (mlib_u16) (t4 >> 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ sa++;
+ da = (mlib_u32 *) dp;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ *da++ = (t4 >> 16) + (t5 << 16);
+ #else
+ *da++ = (t4 << 16) + (t5 >> 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0] << 3;
+ s1 = sa[1] << 3;
+ sa += 2;
+@@ -3205,7 +3205,7 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t5 >> 16) + (t0 << 16);
+ res2 = (t0 >> 16) + (t1 << 16);
+ res3 = (t1 >> 16) + (t2 << 16);
+@@ -3215,7 +3215,7 @@
+ res2 = (t0 << 16) + (t1 >> 16);
+ res3 = (t1 << 16) + (t2 >> 16);
+ res4 = (t2 << 16) + (t3 >> 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0] << 3;
+ s1 = sa[1] << 3;
+ da[0] = res1;
+@@ -3229,7 +3229,7 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ res1 = (t5 >> 16) + (t0 << 16);
+ res2 = (t0 >> 16) + (t1 << 16);
+ res3 = (t1 >> 16) + (t2 << 16);
+@@ -3239,36 +3239,36 @@
+ res2 = (t0 << 16) + (t1 >> 16);
+ res3 = (t1 << 16) + (t2 >> 16);
+ res4 = (t2 << 16) + (t3 >> 16);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ da[0] = res1;
+ da[1] = res2;
+ da[2] = res3;
+ da[3] = res4;
+ da += 4;
+ dp = (mlib_u16 *) da;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ dp[0] = (mlib_u16) (t3 >> 16);
+ #else
+ dp[0] = (mlib_u16) t3;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+ if ((size & 1) == 0) {
+ t0 = tab[2 * sa[0]];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ dp[2] = (mlib_u16) (t0 >> 16);
+ dp[1] = (mlib_u16) t0;
+ #else
+ dp[1] = (mlib_u16) (t0 >> 16);
+ dp[2] = (mlib_u16) t0;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ t0 = tab[2 * sa[0] + 1];
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ dp[4] = (mlib_u16) (t0 >> 16);
+ dp[3] = (mlib_u16) t0;
+ #else
+ dp[3] = (mlib_u16) (t0 >> 16);
+ dp[4] = (mlib_u16) t0;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ }
+ }
+ }
+@@ -3439,7 +3439,7 @@
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+ for (i = 0; i < size - 7; i += 4, dp += 8, sa++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
+@@ -3449,12 +3449,12 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
+@@ -3464,7 +3464,7 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ dp[4] = t0;
+ dp[5] = t1;
+@@ -3472,7 +3472,7 @@
+ dp[7] = t3;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
+@@ -3482,12 +3482,12 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
+@@ -3497,7 +3497,7 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[4] = t0;
+ dp[5] = t1;
+ dp[6] = t2;
+@@ -3545,7 +3545,7 @@
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+ for (i = 0; i < size - 7; i += 4, dp += 12, sa++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
+@@ -3559,14 +3559,14 @@
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+ dp[4] = t4;
+ dp[5] = t5;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
+@@ -3580,7 +3580,7 @@
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ dp[6] = t0;
+ dp[7] = t1;
+@@ -3590,7 +3590,7 @@
+ dp[11] = t5;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
+@@ -3604,14 +3604,14 @@
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+ dp[4] = t4;
+ dp[5] = t5;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
+@@ -3625,7 +3625,7 @@
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[6] = t0;
+ dp[7] = t1;
+ dp[8] = t2;
+@@ -3678,7 +3678,7 @@
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+ for (i = 0; i < size - 7; i += 4, dp += 16, sa++) {
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
+@@ -3688,12 +3688,12 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 22) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
+@@ -3703,12 +3703,12 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 14) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[4] = t0;
+ dp[5] = t1;
+ dp[6] = t2;
+ dp[7] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
+@@ -3718,12 +3718,12 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 6) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[8] = t0;
+ dp[9] = t1;
+ dp[10] = t2;
+ dp[11] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
+@@ -3733,7 +3733,7 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 << 2) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ s0 = sa[0];
+ dp[12] = t0;
+ dp[13] = t1;
+@@ -3741,7 +3741,7 @@
+ dp[15] = t3;
+ }
+
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
+@@ -3751,12 +3751,12 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 22) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[0] = t0;
+ dp[1] = t1;
+ dp[2] = t2;
+ dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
+@@ -3766,12 +3766,12 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 14) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[4] = t0;
+ dp[5] = t1;
+ dp[6] = t2;
+ dp[7] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
+@@ -3781,12 +3781,12 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 6) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[8] = t0;
+ dp[9] = t1;
+ dp[10] = t2;
+ dp[11] = t3;
+-#ifdef _LITTLE_ENDIAN
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+ t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
+@@ -3796,7 +3796,7 @@
+ t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
+ t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
+ t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 << 2) & 0x3FC));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+ dp[12] = t0;
+ dp[13] = t1;
+ dp[14] = t2;
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sun Jan 25 08:34:16 2015 -0800
+@@ -27,9 +27,21 @@
+ #ifndef MLIB_IMAGE_H
+ #define MLIB_IMAGE_H
+
+-#ifdef MACOSX
++#ifdef __OpenBSD__
++#include <sys/types.h>
++#endif
++
++#ifdef _ALLBSD_SOURCE
+ #include <machine/endian.h>
++
++/* BSD's always define both _LITTLE_ENDIAN && _BIG_ENDIAN */
++#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) && \
++ _BYTE_ORDER == _BIG_ENDIAN
++#undef _LITTLE_ENDIAN
+ #endif
++
++#endif /* _ALLBSD_SOURCE */
++
+ #include <mlib_types.h>
+ #include <mlib_status.h>
+ #include <mlib_sys.h>
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sun Jan 25 08:34:16 2015 -0800
+@@ -26,7 +26,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
+-#ifdef MACOSX
++#ifdef _ALLBSD_SOURCE
+ #include <unistd.h>
+ #include <sys/param.h>
+ #endif
+@@ -90,7 +90,10 @@
+ * alignment. -- from stdlib.h of MS VC++5.0.
+ */
+ return (void *) malloc(size);
+-#elif defined(MACOSX)
++#elif defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
++ void *ret;
++ return posix_memalign(&ret, 8, size) ? NULL : ret;
++#elif defined(_ALLBSD_SOURCE)
+ return valloc(size);
+ #else
+ return (void *) memalign(8, size);
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h Sun Jan 25 08:34:16 2015 -0800
+@@ -59,7 +59,7 @@
+
+ #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
+
+-#if defined(MACOSX)
++#if defined(_ALLBSD_SOURCE)
+ #include <stddef.h> /* for ptrdiff_t */
+ #include <stdint.h> /* for uintptr_t */
+ #elif defined(__linux__)
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h Sun Jan 25 08:34:16 2015 -0800
+@@ -26,7 +26,7 @@
+ #ifndef OGLFuncs_h_Included
+ #define OGLFuncs_h_Included
+
+-#ifdef MACOSX
++#ifdef _ALLBSD_SOURCE
+ #include <dlfcn.h>
+ #endif
+ #include "jni.h"
+--- ./jdk/src/solaris/back/util_md.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/back/util_md.h Sun Jan 25 08:34:16 2015 -0800
+@@ -51,7 +51,7 @@
+
+ /* On little endian machines, convert java big endian numbers. */
+
+-#if defined(_LITTLE_ENDIAN)
++#if (BYTE_ORDER == LITTLE_ENDIAN)
+
+ #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 Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/bin/ergo.c Sun Jan 25 08:34:16 2015 -0800
+@@ -100,6 +100,27 @@
+ /* Compute physical memory by asking the OS */
+ uint64_t
+ physical_memory(void) {
++#if !defined(MACOSX) && defined(_ALLBSD_SOURCE)
++ uint64_t result;
++#ifdef HW_PHYSMEM64
++ int64_t physmem;
++ int name[2] = { CTL_HW, HW_PHYSMEM64 };
++#else
++ unsigned long physmem;
++ int name[2] = { CTL_HW, HW_PHYSMEM };
++#endif
++ size_t physmem_len = sizeof(physmem);
++# define UINT64_FORMAT "%" PRIu64
++
++ if (sysctl(name, 2, &physmem, &physmem_len, NULL, 0) == -1)
++ physmem = 256 * MB;
++
++ result = (uint64_t)physmem;
++
++ JLI_TraceLauncher("physical memory: " UINT64_FORMAT " (%.3fGB)\n",
++ result, result / (double) GB);
++ return result;
++#else /* !_ALLBSD_SOURCE */
+ const uint64_t pages = (uint64_t) sysconf(_SC_PHYS_PAGES);
+ const uint64_t page_size = (uint64_t) sysconf(_SC_PAGESIZE);
+ const uint64_t result = pages * page_size;
+@@ -110,4 +131,5 @@
+ " physical memory: " UINT64_FORMAT " (%.3fGB)\n",
+ pages, page_size, result, result / (double) GB);
+ return result;
++#endif
+ }
+--- ./jdk/src/solaris/bin/ergo.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/bin/ergo.h Sun Jan 25 08:34:16 2015 -0800
+@@ -33,6 +33,10 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#ifdef _ALLBSD_SOURCE
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#endif
+
+ #include "java.h"
+
+--- ./jdk/src/solaris/bin/ergo_i586.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/bin/ergo_i586.c Sun Jan 25 08:34:16 2015 -0800
+@@ -106,7 +106,7 @@
+
+ #endif /* __solaris__ */
+
+-#ifdef __linux__
++#if !defined(MACOSX) && (defined(__linux__) || defined(_ALLBSD_SOURCE))
+
+ /*
+ * A utility method for asking the CPU about itself.
+@@ -171,6 +171,12 @@
+ #endif /* _LP64 */
+ }
+
++#ifdef __linux__
++#define OSNAMEPREFIX "linux_"
++#else
++#define OSNAMEPREFIX "bsd_"
++#endif
++
+ /* The definition of a server-class machine for linux-i586 */
+ jboolean
+ ServerClassMachineImpl(void) {
+@@ -193,11 +199,11 @@
+ result = JNI_TRUE;
+ }
+ }
+- JLI_TraceLauncher("linux_" LIBARCHNAME "_ServerClassMachine: %s\n",
++ JLI_TraceLauncher(OSNAMEPREFIX LIBARCHNAME "_ServerClassMachine: %s\n",
+ (result == JNI_TRUE ? "true" : "false"));
+ return result;
+ }
+-#endif /* __linux__ */
++#endif /* !MACOSX && (__linux__ || _ALLBSD_SOURCE) */
+
+ /*
+ * Routines shared by solaris-i586 and linux-i586.
+@@ -308,6 +314,15 @@
+ /* Compute the number of physical processors, not logical processors */
+ static unsigned long
+ physical_processors(void) {
++#if !defined(MACOSX) && defined(_ALLBSD_SOURCE)
++ unsigned long result;
++ int name[2] = { CTL_HW, HW_NCPU };
++ size_t rlen = sizeof(result);
++
++ if (sysctl(name, 2, &result, &rlen, NULL, 0) == -1)
++ result = 1;
++ return result;
++#else
+ const long sys_processors = sysconf(_SC_NPROCESSORS_CONF);
+ unsigned long result = sys_processors;
+
+@@ -320,4 +335,5 @@
+ }
+ JLI_TraceLauncher("physical processors: %lu\n", result);
+ return result;
++#endif
+ }
+--- ./jdk/src/solaris/bin/java_md_solinux.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/bin/java_md_solinux.c Sun Jan 25 08:34:16 2015 -0800
+@@ -899,8 +899,9 @@
+ * onwards the filename returned in DL_info structure from dladdr is
+ * an absolute pathname so technically realpath isn't required.
+ * On Linux we read the executable name from /proc/self/exe.
+- * As a fallback, and for platforms other than Solaris and Linux,
+- * we use FindExecName to compute the executable name.
++ * On *BSD we read the executable name from /proc/curproc/file.
++ * As a fallback, and for platforms other than Solaris, Linux, and
++ * *BSD, we use FindExecName to compute the executable name.
+ */
+ const char*
+ SetExecname(char **argv)
+@@ -927,9 +928,13 @@
+ }
+ }
+ }
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(_ALLBSD_SOURCE)
+ {
++#if defined(_ALLBSD_SOURCE)
++ const char* self = "/proc/curproc/file";
++#else
+ const char* self = "/proc/self/exe";
++#endif
+ char buf[PATH_MAX+1];
+ int len = readlink(self, buf, PATH_MAX);
+ if (len >= 0) {
+@@ -937,7 +942,7 @@
+ exec_path = JLI_StringDup(buf);
+ }
+ }
+-#else /* !__solaris__ && !__linux__ */
++#else /* !__solaris__ && !__linux__ && !_ALLBSD_SOURCE */
+ {
+ /* Not implemented */
+ }
+@@ -950,6 +955,19 @@
+ return exec_path;
+ }
+
++#if !defined(MACOSX) && defined(_ALLBSD_SOURCE)
++/*
++ * BSD's implementation of CounterGet()
++ */
++int64_t
++CounterGet()
++{
++ struct timeval tv;
++ gettimeofday(&tv, NULL);
++ return (tv.tv_sec * 1000) + tv.tv_usec;
++}
++#endif
++
+ /* --- Splash Screen shared library support --- */
+ static const char* SPLASHSCREEN_SO = JNI_LIB_NAME("splashscreen");
+ static void* hSplashLib = NULL;
+--- ./jdk/src/solaris/bin/java_md_solinux.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/bin/java_md_solinux.h Sun Jan 25 08:34:16 2015 -0800
+@@ -33,6 +33,10 @@
+ #include <sys/time.h>
+ #define CounterGet() (gethrtime()/1000)
+ #define Counter2Micros(counts) (counts)
++#elif !defined(MACOSX) && defined(_ALLBSD_SOURCE)
++/* CounterGet() is implemented in java_md_solinux.c */
++int64_t CounterGet(void);
++#define Counter2Micros(counts) (counts)
+ #else /* ! HAVE_GETHRTIME */
+ #define CounterGet() (0)
+ #define Counter2Micros(counts) (1)
+@@ -48,6 +52,9 @@
+ #ifdef __linux__
+ static const char *system_dir = "/usr/java";
+ static const char *user_dir = "/java";
++#elif !defined(MACOSX) && defined(_ALLBSD_SOURCE)
++static const char *system_dir = PACKAGE_PATH "/openjdk7";
++static const char *user_dir = "/java";
+ #else /* Solaris */
+ static const char *system_dir = "/usr/jdk";
+ static const char *user_dir = "/jdk";
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Sun Jan 25 08:34:16 2015 -0800
+@@ -94,7 +94,14 @@
+ public LaunchMechanism run() {
+ String javahome = System.getProperty("java.home");
+
+- helperpath = toCString(javahome + "/lib/jspawnhelper");
++ String osname = System.getProperty("os.name");
++ if (osname.endsWith("BSD")) {
++ String osArch = System.getProperty("os.arch");
++ helperpath = toCString(javahome + "/lib/" + osArch + "/jspawnhelper");
++ } else {
++ helperpath = toCString(javahome + "/lib/jspawnhelper");
++ }
++
+ String s = System.getProperty(
+ "jdk.lang.Process.launchMechanism", "posix_spawn");
+
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sun Jan 25 08:34:16 2015 -0800
+@@ -213,7 +213,7 @@
+ if (fontID != null) {
+ fileName = (String)fontNameMap.get(fontID);
+ /* On Linux check for the Lucida Oblique fonts */
+- if (fileName == null && FontUtilities.isLinux && !isOpenJDK()) {
++ if (fileName == null && (FontUtilities.isLinux || FontUtilities.isBSD) && !isOpenJDK()) {
+ if (oblmap == null) {
+ initObliqueLucidaFontMap();
+ }
+@@ -712,7 +712,7 @@
+ if (fontConfigDirs == null) {
+ return;
+ }
+- if (FontUtilities.isLinux) {
++ if (FontUtilities.isLinux || FontUtilities.isBSD) {
+ fontConfigDirs.add(jreLibDirName+File.separator+"oblique-fonts");
+ }
+ fontdirs = (String[])fontConfigDirs.toArray(new String[0]);
+@@ -740,7 +740,7 @@
+ */
+ FontConfiguration mFontConfig = new MFontConfiguration(this);
+ if (FontUtilities.isOpenSolaris ||
+- (FontUtilities.isLinux &&
++ ((FontUtilities.isLinux || FontUtilities.isBSD) &&
+ (!mFontConfig.foundOsSpecificFile() ||
+ !mFontConfig.fontFilesArePresent()) ||
+ (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
+--- ./jdk/src/solaris/classes/sun/net/PortConfig.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sun Jan 25 08:34:16 2015 -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 {
+--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sun Jan 25 08:34:16 2015 -0800
+@@ -50,7 +50,7 @@
+ return new SolarisAsynchronousChannelProvider();
+ if (osname.equals("Linux"))
+ return new LinuxAsynchronousChannelProvider();
+- if (osname.contains("OS X"))
++ if (osname.contains("OS X") || osname.endsWith("BSD"))
+ return new BsdAsynchronousChannelProvider();
+ throw new InternalError("platform not recognized");
+ }
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sun Jan 25 08:34:16 2015 -0800
+@@ -70,6 +70,8 @@
+ return createProvider("sun.nio.fs.LinuxFileSystemProvider");
+ if (osname.equals("Darwin") || osname.contains("OS X"))
+ return createProvider("sun.nio.fs.MacOSXFileSystemProvider");
++ if (osname.endsWith("BSD"))
++ return createProvider("sun.nio.fs.BsdFileSystemProvider");
+ throw new AssertionError("Platform not recognized");
+ }
+ }
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sun Jan 25 08:34:16 2015 -0800
+@@ -129,6 +129,7 @@
+
+ static boolean isBSD() {
+ return (osname.equals("Linux") ||
++ osname.endsWith("BSD") ||
+ osname.contains("OS X"));
+ }
+
+--- ./jdk/src/solaris/javavm/export/jvm_md.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/javavm/export/jvm_md.h Sun Jan 25 08:34:16 2015 -0800
+@@ -75,7 +75,11 @@
+ #define JVM_O_O_APPEND O_APPEND
+ #define JVM_O_EXCL O_EXCL
+ #define JVM_O_CREAT O_CREAT
++#if !defined(__APPLE__) && defined(_ALLBSD_SOURCE)
++#define JVM_O_DELETE 0x10000000
++#else
+ #define JVM_O_DELETE 0x10000
++#endif
+
+ /* Signals */
+
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c Sun Jan 25 08:34:16 2015 -0800
+@@ -168,6 +168,9 @@
+ /*
+ * XXXBSD: there's no way available to get swap info in
+ * FreeBSD. Usage of libkvm is not an option here
++ *
++ * XXX: Investigate how swapinfo(8) does this.
++ * Total swap is in vm.swap_total
+ */
+ // throw_internal_error(env, "Unimplemented in FreeBSD");
+ return (0);
+@@ -242,6 +245,8 @@
+ #else /* _ALLBSD_SOURCE */
+ /*
+ * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
++ *
++ * XXX: Determine how linprocfs gets this.
+ */
+ // throw_internal_error(env, "Unimplemented in FreeBSD");
+ return (64 * MB);
+@@ -323,6 +328,8 @@
+ #elif defined(_ALLBSD_SOURCE)
+ /*
+ * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
++ *
++ * XXX: Investigate how top(8) gets this on FreeBSD.
+ */
+ // throw_internal_error(env, "Unimplemented in FreeBSD");
+ return (128 * MB);
+@@ -342,7 +349,11 @@
+ size_t rlen;
+
+ mib[0] = CTL_HW;
++#ifdef __APPLE__
+ mib[1] = HW_MEMSIZE;
++#else
++ mib[1] = HW_PHYSMEM;
++#endif
+ rlen = sizeof(result);
+ if (sysctl(mib, 2, &result, &rlen, NULL, 0) != 0) {
+ throw_internal_error(env, "sysctl failed");
+@@ -408,6 +419,8 @@
+ #elif defined(_ALLBSD_SOURCE)
+ /*
+ * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
++ *
++ * XXX: Investigate getting this on FreeBSD. Look at lsof.
+ */
+ // throw_internal_error(env, "Unimplemented in FreeBSD");
+ return (100);
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c Sun Jan 25 08:34:16 2015 -0800
+@@ -151,7 +151,6 @@
+ return rv;
+ }
+
+-
+ JNIEXPORT jboolean JNICALL
+ Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
+ jobject file,
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c Sun Jan 25 08:34:16 2015 -0800
+@@ -56,7 +56,7 @@
+
+ for (i = 0; environ[i]; i++) {
+ /* Ignore corrupted environment variables */
+- if (strchr(environ[i], '=') != NULL)
++ if (strchr(environ[i], '=') != NULL && *environ[i] != '=')
+ count++;
+ }
+
+@@ -66,7 +66,7 @@
+ for (i = 0, j = 0; environ[i]; i++) {
+ const char * varEnd = strchr(environ[i], '=');
+ /* Ignore corrupted environment variables */
+- if (varEnd != NULL) {
++ if (varEnd != NULL && varEnd != environ[i]) {
+ jbyteArray var, val;
+ const char * valBeg = varEnd + 1;
+ jsize varLength = varEnd - environ[i];
+--- ./jdk/src/solaris/native/java/lang/childproc.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/lang/childproc.c Sun Jan 25 08:34:16 2015 -0800
+@@ -62,6 +62,16 @@
+ return c >= '0' && c <= '9';
+ }
+
++#if defined(__OpenBSD__)
++int
++closeDescriptors(void)
++{
++ int err;
++ RESTARTABLE(closefrom(FAIL_FILENO + 1), err);
++ return err;
++}
++#else
++
+ #ifdef _ALLBSD_SOURCE
+ #define FD_DIR "/dev/fd"
+ #define dirent64 dirent
+@@ -104,6 +114,7 @@
+
+ return 1;
+ }
++#endif
+
+ int
+ moveDescriptor(int fd_from, int fd_to)
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sun Jan 25 08:34:16 2015 -0800
+@@ -151,7 +151,7 @@
+ lc = setlocale(cat, NULL);
+ #endif
+
+-#ifndef __linux__
++#if !defined(__linux__) && !defined(__OpenBSD__)
+ if (lc == NULL) {
+ return 0;
+ }
+@@ -503,12 +503,19 @@
+ &(sprops.format_country),
+ &(sprops.format_variant),
+ &(sprops.encoding))) {
++#ifdef __OpenBSD__
++ sprops.language = sprops.format_language;
++ sprops.script = sprops.format_script;
++ sprops.country = sprops.format_country;
++ sprops.variant = sprops.format_variant;
++#else
+ ParseLocale(LC_MESSAGES,
+ &(sprops.language),
+ &(sprops.script),
+ &(sprops.country),
+ &(sprops.variant),
+ NULL);
++#endif
+ } else {
+ sprops.language = "en";
+ sprops.encoding = "ISO8859-1";
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sun Jan 25 08:34:16 2015 -0800
+@@ -60,14 +60,19 @@
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+ #include <sys/sockio.h>
+-#if defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <net/ethernet.h>
+ #include <net/if_var.h>
++#elif defined(__OpenBSD__)
++#include <netinet/if_ether.h>
++#include <netinet6/in6_var.h>
++#elif defined(__NetBSD__)
++#include <net/if_ether.h>
++#endif
+ #include <net/if_dl.h>
+ #include <netinet/in_var.h>
+ #include <ifaddrs.h>
+ #endif
+-#endif
+
+ #include "jvm.h"
+ #include "jni_util.h"
+@@ -1299,11 +1304,15 @@
+ return -1;
+ }
+
++#ifdef __FreeBSD__
++ *flags = ((if2.ifr_flags & 0xffff) | (if2.ifr_flagshigh << 16));
++#else
+ if (sizeof(if2.ifr_flags) == sizeof(short)) {
+ *flags = (if2.ifr_flags & 0xffff);
+ } else {
+ *flags = if2.ifr_flags;
+ }
++#endif
+ return 0;
+ }
+
+@@ -1995,11 +2004,15 @@
+ return -1;
+ }
+
++#ifdef __FreeBSD__
++ *flags = ((if2.ifr_flags & 0xffff) | (if2.ifr_flagshigh << 16));
++#else
+ if (sizeof(if2.ifr_flags) == sizeof(short)) {
+ *flags = (if2.ifr_flags & 0xffff);
+ } else {
+ *flags = if2.ifr_flags;
+ }
++#endif
+ return 0;
+ }
+
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sun Jan 25 08:34:16 2015 -0800
+@@ -23,12 +23,12 @@
+ * questions.
+ */
+
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <errno.h>
+ #include <netinet/in.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/types.h>
+-#include <sys/socket.h>
+
+ #ifdef __solaris__
+ #include <fcntl.h>
+@@ -357,13 +357,21 @@
+ #ifdef AF_INET6
+ if (ipv6_available()) {
+ struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&addr;
++#ifdef __FreeBSD__
++ him6->sin6_family = AF_INET6;
++#else
+ him6->sin6_family = AF_UNSPEC;
++#endif
+ len = sizeof(struct sockaddr_in6);
+ } else
+ #endif
+ {
+ struct sockaddr_in *him4 = (struct sockaddr_in*)&addr;
++#ifdef __FreeBSD__
++ him4->sin_family = AF_INET;
++#else
+ him4->sin_family = AF_UNSPEC;
++#endif
+ len = sizeof(struct sockaddr_in);
+ }
+ JVM_Connect(fd, (struct sockaddr *)&addr, len);
+--- ./jdk/src/solaris/native/java/net/bsd_close.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/net/bsd_close.c Sun Jan 25 08:34:16 2015 -0800
+@@ -345,6 +345,76 @@
+ * signal other than our wakeup signal.
+ */
+ int NET_Timeout(int s, long timeout) {
++/*
++ * On MacOS X, poll(2) is not working correctly, so a select(2) based
++ * implementation is preferred. See
++ *
++ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7131399
++ *
++ * However, on FreeBSD, the select(2) based implementation can cause
++ * crashes under load and poll(2) is preferred. See
++ *
++ * http://docs.freebsd.org/cgi/getmsg.cgi?fetch=215525+0+current/freebsd-java
++ *
++ * Other *BSD will use poll(2) for now, but please adjust as appropriate.
++ */
++#ifndef __APPLE__
++ long prevtime = 0, newtime;
++ struct timeval t;
++ fdEntry_t *fdEntry = getFdEntry(s);
++
++ /*
++ * Check that fd hasn't been closed.
++ */
++ if (fdEntry == NULL) {
++ errno = EBADF;
++ return -1;
++ }
++
++ /*
++ * Pick up current time as may need to adjust timeout
++ */
++ if (timeout > 0) {
++ gettimeofday(&t, NULL);
++ prevtime = t.tv_sec * 1000 + t.tv_usec / 1000;
++ }
++
++ for(;;) {
++ struct pollfd pfd;
++ int rv;
++ threadEntry_t self;
++
++ /*
++ * Poll the fd. If interrupted by our wakeup signal
++ * errno will be set to EBADF.
++ */
++ pfd.fd = s;
++ pfd.events = POLLIN | POLLERR;
++
++ startOp(fdEntry, &self);
++ rv = poll(&pfd, 1, timeout);
++ endOp(fdEntry, &self);
++
++ /*
++ * If interrupted then adjust timeout. If timeout
++ * has expired return 0 (indicating timeout expired).
++ */
++ if (rv < 0 && errno == EINTR) {
++ if (timeout > 0) {
++ gettimeofday(&t, NULL);
++ newtime = t.tv_sec * 1000 + t.tv_usec / 1000;
++ timeout -= newtime - prevtime;
++ if (timeout <= 0) {
++ return 0;
++ }
++ prevtime = newtime;
++ }
++ } else {
++ return rv;
++ }
++
++ }
++#else
+ long prevtime = 0, newtime;
+ struct timeval t, *tp = &t;
+ fd_set fds;
+@@ -431,4 +501,5 @@
+ }
+
+ }
++#endif
+ }
+--- ./jdk/src/solaris/native/java/net/net_util_md.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/net/net_util_md.c Sun Jan 25 08:34:16 2015 -0800
+@@ -45,6 +45,10 @@
+ #endif
+ #endif
+
++#ifdef __OpenBSD__
++#include <sys/socketvar.h>
++#endif
++
+ #ifdef __solaris__
+ #include <sys/sockio.h>
+ #include <stropts.h>
+@@ -1512,7 +1516,22 @@
+ }
+ }
+
+-#endif
++#ifndef __APPLE__
++ /*
++ * Don't allow SO_LINGER value to be too big.
++ * Current max value (240) is empiric value based on tcp_timer.h's
++ * constant TCP_LINGERTIME, which was doubled.
++ *
++ * XXXBSD: maybe we should step it down to 120 ?
++ */
++ if (level == SOL_SOCKET && opt == SO_LINGER) {
++ ling = (struct linger *)arg;
++ if (ling->l_linger > 240 || ling->l_linger < 0) {
++ ling->l_linger = 240;
++ }
++ }
++#endif __APPLE__
++#endif _ALLBSD_SOURCE
+
+ return setsockopt(fd, level, opt, arg, len);
+ }
+--- ./jdk/src/solaris/native/java/net/net_util_md.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/net/net_util_md.h Sun Jan 25 08:34:16 2015 -0800
+@@ -37,7 +37,7 @@
+ #endif
+
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX)
+ extern int NET_Timeout(int s, long timeout);
+ extern int NET_Read(int s, void* buf, size_t len);
+ extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sun Jan 25 08:34:16 2015 -0800
+@@ -123,7 +123,7 @@
+ return NULL;
+ }
+
+-#if defined(__linux__) || defined(MACOSX) || (defined(__solaris__) \
++#if defined(__linux__) || defined(_ALLBSD_SOURCE) || (defined(__solaris__) \
+ && (defined(_POSIX_PTHREAD_SEMANTICS) || defined(_LP64)))
+ while (readdir_r(dirp, entry, &dp) == 0 && dp != NULL) {
+ #else
+@@ -211,7 +211,7 @@
+ return tz;
+ }
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+
+ /*
+ * Performs Linux specific mapping and returns a zone ID
+@@ -677,7 +677,7 @@
+ * Returns a GMT-offset-based zone ID. (e.g., "GMT-08:00")
+ */
+
+-#ifdef MACOSX
++#ifdef _ALLBSD_SOURCE
+
+ char *
+ getGMTOffsetID()
+@@ -737,4 +737,4 @@
+ sign, (int)(offset/3600), (int)((offset%3600)/60));
+ return strdup(buf);
+ }
+-#endif /* MACOSX */
++#endif /* _ALLBSD_SOURCE */
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sun Jan 25 08:34:16 2015 -0800
+@@ -334,7 +334,7 @@
+ if (strcmp(style, "regular") == 0) {
+ altstyle = "roman";
+ }
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ if (!strcmp(family, "lucidasans")) {
+ family = "lucida";
+ }
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sun Jan 25 08:34:16 2015 -0800
+@@ -123,7 +123,7 @@
+ */
+
+ #define MAXFRAMEBUFFERS 16
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ typedef struct {
+ int screen_number;
+ short x_org;
+@@ -652,7 +652,7 @@
+ #endif /* HEADLESS */
+
+ #ifndef HEADLESS
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ static void xinerama_init_linux()
+ {
+ void* libHandle = NULL;
+@@ -703,7 +703,7 @@
+ }
+ }
+ #endif
+-#if !defined(__linux__) && !defined(MACOSX) /* Solaris */
++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) /* Solaris */
+ static void xinerama_init_solaris()
+ {
+ void* libHandle = NULL;
+@@ -763,11 +763,11 @@
+ }
+
+ DTRACE_PRINTLN("Xinerama extension is available");
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ xinerama_init_linux();
+ #else /* Solaris */
+ xinerama_init_solaris();
+-#endif /* __linux__ || MACOSX */
++#endif /* __linux__ || _ALLBSD_SOURCE */
+ }
+ #endif /* HEADLESS */
+
+@@ -1644,7 +1644,7 @@
+ {
+ jobject point = NULL;
+ #ifndef HEADLESS /* return NULL in HEADLESS, Linux */
+-#if !defined(__linux__) && !defined(MACOSX)
++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
+ int x,y;
+
+ AWT_LOCK();
+@@ -1657,7 +1657,7 @@
+ DTRACE_PRINTLN("unable to call XineramaSolarisCenterFunc: symbol is null");
+ }
+ AWT_FLUSH_UNLOCK();
+-#endif /* __linux __ || MACOSX */
++#endif /* __linux __ || _ALLBSD_SOURCE */
+ #endif /* HEADLESS */
+ return point;
+ }
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sun Jan 25 08:34:16 2015 -0800
+@@ -67,7 +67,7 @@
+ XIMPreeditDrawCallbackStruct *);
+ static void PreeditCaretCallback(XIC, XPointer,
+ XIMPreeditCaretCallbackStruct *);
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ static void StatusStartCallback(XIC, XPointer, XPointer);
+ static void StatusDoneCallback(XIC, XPointer, XPointer);
+ static void StatusDrawCallback(XIC, XPointer,
+@@ -81,7 +81,7 @@
+ #define PreeditDoneIndex 1
+ #define PreeditDrawIndex 2
+ #define PreeditCaretIndex 3
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ #define StatusStartIndex 4
+ #define StatusDoneIndex 5
+ #define StatusDrawIndex 6
+@@ -99,14 +99,14 @@
+ (XIMProc)PreeditDoneCallback,
+ (XIMProc)PreeditDrawCallback,
+ (XIMProc)PreeditCaretCallback,
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ (XIMProc)StatusStartCallback,
+ (XIMProc)StatusDoneCallback,
+ (XIMProc)StatusDrawCallback,
+ #endif
+ };
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ #define MAX_STATUS_LEN 100
+ typedef struct {
+ Window w; /*status window id */
+@@ -146,7 +146,7 @@
+ #endif /* XAWT */
+ jobject x11inputmethod; /* global ref to X11InputMethod instance */
+ /* associated with the XIC */
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ StatusWindow *statusWindow; /* our own status window */
+ #else
+ #ifndef XAWT
+@@ -425,7 +425,7 @@
+ static void
+ freeX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData)
+ {
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ if (pX11IMData->statusWindow != NULL){
+ StatusWindow *sw = pX11IMData->statusWindow;
+ XFreeGC(awt_display, sw->lightGC);
+@@ -531,7 +531,7 @@
+ pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance);
+
+ if (pX11IMData == NULL) {
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ return False;
+ #else
+ return result;
+@@ -539,7 +539,7 @@
+ }
+
+ if ((ic = pX11IMData->current_ic) == (XIC)0){
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ return False;
+ #else
+ return result;
+@@ -648,7 +648,7 @@
+ return result;
+ }
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ static StatusWindow *createStatusWindow(
+ #ifdef XAWT
+ Window parent) {
+@@ -993,7 +993,7 @@
+ }
+ }
+ }
+-#endif /* __linux__ || MACOSX */
++#endif /* __linux__ || _ALLBSD_SOURCE */
+ /*
+ * Creates two XICs, one for active clients and the other for passive
+ * clients. All information on those XICs are stored in the
+@@ -1050,7 +1050,7 @@
+ return FALSE ;
+ }
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ on_the_spot_styles |= XIMStatusNothing;
+
+ /*kinput does not support XIMPreeditCallbacks and XIMStatusArea
+@@ -1063,7 +1063,7 @@
+ break;
+ }
+ }
+-#else /*! __linux__ && !MACOSX */
++#else /*! __linux__ && !_ALLBSD_SOURCE */
+ #ifdef XAWT
+ on_the_spot_styles |= XIMStatusNothing;
+ #else /* !XAWT */
+@@ -1086,7 +1086,7 @@
+ on_the_spot_styles |= XIMStatusNothing;
+
+ #endif /* XAWT */
+-#endif /* __linux__ || MACOSX */
++#endif /* __linux__ || _ALLBSD_SOURCE */
+
+ for (i = 0; i < im_styles->count_styles; i++) {
+ active_styles |= im_styles->supported_styles[i] & on_the_spot_styles;
+@@ -1134,7 +1134,7 @@
+ NULL);
+ if (preedit == (XVaNestedList)NULL)
+ goto err;
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ /*always try XIMStatusCallbacks for active client...*/
+ {
+ status = (XVaNestedList)XVaCreateNestedList(0,
+@@ -1156,7 +1156,7 @@
+ XFree((void *)status);
+ XFree((void *)preedit);
+ }
+-#else /* !__linux__ && !MACOSX */
++#else /* !__linux__ && !_ALLBSD_SOURCE */
+ #ifndef XAWT
+ if (on_the_spot_styles & XIMStatusArea) {
+ Widget parent;
+@@ -1184,7 +1184,7 @@
+ }
+ #endif /* XAWT */
+ XFree((void *)preedit);
+-#endif /* __linux__ || MACOSX */
++#endif /* __linux__ || _ALLBSD_SOURCE */
+ pX11IMData->ic_passive = XCreateIC(X11im,
+ XNClientWindow, w,
+ XNFocusWindow, w,
+@@ -1343,7 +1343,7 @@
+
+ }
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ static void
+ StatusStartCallback(XIC ic, XPointer client_data, XPointer call_data)
+ {
+@@ -1411,7 +1411,7 @@
+ finally:
+ AWT_UNLOCK();
+ }
+-#endif /* __linux__ || MACOSX */
++#endif /* __linux__ || _ALLBSD_SOURCE */
+
+ static void CommitStringCallback(XIC ic, XPointer client_data, XPointer call_data) {
+ JNIEnv *env = GetJNIEnv();
+@@ -1517,14 +1517,14 @@
+ /* Use IMInstantiate call back only on Linux, as there is a bug in Solaris
+ (4768335)
+ */
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ registered = XRegisterIMInstantiateCallback(dpy, NULL, NULL,
+ NULL, (XIDProc)OpenXIMCallback, NULL);
+ if (!registered) {
+ /* directly call openXIM callback */
+ #endif
+ OpenXIMCallback(dpy, NULL, NULL);
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ }
+ #endif
+
+@@ -1588,13 +1588,13 @@
+ #endif /* XAWT */
+ globalRef = (*env)->NewGlobalRef(env, this);
+ pX11IMData->x11inputmethod = globalRef;
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ pX11IMData->statusWindow = NULL;
+-#else /* !__linux__ && !MACOSX */
++#else /* !__linux__ && !_ALLBSD_SOURCE */
+ #ifndef XAWT
+ pX11IMData->statusWidget = (Widget) NULL;
+ #endif /* XAWT */
+-#endif /* __linux__ || MACOSX */
++#endif /* __linux__ || _ALLBSD_SOURCE */
+
+ pX11IMData->lookup_buf = 0;
+ pX11IMData->lookup_buf_len = 0;
+@@ -1741,14 +1741,14 @@
+ setXICFocus(pX11IMData->current_ic, req);
+ currentX11InputMethodInstance = pX11IMData->x11inputmethod;
+ currentFocusWindow = w;
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ if (active && pX11IMData->statusWindow && pX11IMData->statusWindow->on)
+ onoffStatusWindow(pX11IMData, w, True);
+ #endif
+ } else {
+ currentX11InputMethodInstance = NULL;
+ currentFocusWindow = 0;
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ onoffStatusWindow(pX11IMData, 0, False);
+ if (pX11IMData->current_ic != NULL)
+ #endif
+@@ -1765,7 +1765,7 @@
+ Java_sun_awt_X11InputMethod_turnoffStatusWindow(JNIEnv *env,
+ jobject this)
+ {
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ X11InputMethodData *pX11IMData;
+ StatusWindow *statusWindow;
+
+@@ -1862,7 +1862,7 @@
+ X11InputMethodData *pX11IMData;
+ XVaNestedList status;
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ /*do nothing for linux? */
+ #else
+ AWT_LOCK();
+@@ -1968,7 +1968,7 @@
+ JNIEXPORT void JNICALL Java_sun_awt_X11_XInputMethod_adjustStatusWindow
+ (JNIEnv *env, jobject this, jlong window)
+ {
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ AWT_LOCK();
+ adjustStatusWindow(window);
+ AWT_UNLOCK();
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ #include "wsutils.h"
+ #include "list.h"
+ #include "multiVis.h"
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ #include <sys/socket.h>
+ #endif
+
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_util.h Sun Jan 25 08:34:16 2015 -0800
+@@ -185,7 +185,7 @@
+ #ifdef __solaris__
+ extern Widget awt_util_getXICStatusAreaWindow(Widget w);
+ #else
+-#if defined(MACOSX)
++#if defined(_ALLBSD_SOURCE)
+ int32_t awt_util_getIMStatusHeight(Widget vw);
+ Widget awt_util_getXICStatusAreaWindow(Widget w);
+ #else
+@@ -198,7 +198,7 @@
+
+
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ typedef struct _XmImRefRec {
+ Cardinal num_refs; /* Number of referencing widgets. */
+ Cardinal max_refs; /* Maximum length of refs array. */
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c Sun Jan 25 08:34:16 2015 -0800
+@@ -121,12 +121,19 @@
+ static Atom XA_KWM_WIN_MAXIMIZED;
+
+ /* OpenLook */
++static Atom _XA_OL_DECOR_ADD;
+ static Atom _XA_OL_DECOR_DEL;
+ static Atom _XA_OL_DECOR_HEADER;
+ static Atom _XA_OL_DECOR_RESIZE;
+ static Atom _XA_OL_DECOR_PIN;
+ static Atom _XA_OL_DECOR_CLOSE;
+
++/* AfterStep */
++static Atom _XA_AS_STYLE;
++
++/* WindowMaker */
++static Atom _XA_WINDOWMAKER_STATE;
++
+ /* For _NET_WM_STATE ClientMessage requests */
+ #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */
+ #define _NET_WM_STATE_ADD 1 /* add/set property */
+@@ -193,7 +200,12 @@
+ { &_XA_OL_DECOR_HEADER, "_OL_DECOR_HEADER" },
+ { &_XA_OL_DECOR_RESIZE, "_OL_DECOR_RESIZE" },
+ { &_XA_OL_DECOR_PIN, "_OL_DECOR_PIN" },
+- { &_XA_OL_DECOR_CLOSE, "_OL_DECOR_CLOSE" }
++ { &_XA_OL_DECOR_CLOSE, "_OL_DECOR_CLOSE" },
++ { &_XA_OL_DECOR_ADD, "_OL_DECOR_ADD" },
++
++ { &_XA_AS_STYLE, "_XA_AS_STYLE" },
++
++ { &_XA_WINDOWMAKER_STATE, "_XA_WINDOWMAKER_STATE" }
+ };
+ #define ATOM_LIST_LENGTH (sizeof(atom_list)/sizeof(atom_list[0]))
+
+@@ -938,6 +950,39 @@
+ return True;
+ }
+
++/*
++ * Window Maker.
++ */
++static Boolean
++awt_wm_isWindowmaker()
++{
++ if (awt_wm_atomInterned(&_XA_WINDOWMAKER_STATE, "_WINDOWMAKER_STATE"))
++ return True;
++ return False;
++}
++
++/*
++ * Afterstep.
++ */
++static Boolean
++awt_wm_isAfterstep()
++{
++ if (awt_wm_atomInterned(&_XA_AS_STYLE, "_AS_STYLE"))
++ return True;
++ return False;
++}
++
++/*
++ * FVWM 2.
++ */
++static Boolean
++awt_wm_isFvwm2()
++{
++ if (awt_wm_atomInterned(&_XA_OL_DECOR_ADD, "_OL_DECOR_ADD")
++ && !awt_wm_atomInterned(&_XA_OL_DECOR_PIN, "_OL_DECOR_PIN"))
++ return True;
++ return False;
++}
+
+ static Boolean
+ awt_wm_isNetWMName(char *name)
+@@ -1264,6 +1309,12 @@
+ else if (awt_wm_isKDE2()) {
+ awt_wmgr = KDE2_WM;
+ }
++ else if (awt_wm_isWindowmaker()) {
++ awt_wmgr = WINDOWMAKER_WM;
++ }
++ else if (awt_wm_isAfterstep()) {
++ awt_wmgr = AFTERSTEP_WM;
++ }
+ /*
+ * We don't check for legacy WM when we already know that WM
+ * supports WIN or _NET wm spec.
+@@ -1286,6 +1337,9 @@
+ awt_wmgr = MOTIF_WM;
+ }
+ else if (awt_wm_isOpenLook()) {
++ awt_wmgr = OPENLOOK_WM;
++ }
++ else if (awt_wm_isFvwm2()) {
+ awt_wmgr = OPENLOOK_WM;
+ }
+ else {
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h Sun Jan 25 08:34:16 2015 -0800
+@@ -45,7 +45,10 @@
+ KDE2_WM,
+ SAWFISH_WM,
+ ICE_WM,
+- METACITY_WM
++ METACITY_WM,
++ AFTERSTEP_WM,
++ WINDOWMAKER_WM,
++ FVWM2_WM
+ };
+
+ extern void awt_wm_init(void);
+--- ./jdk/src/solaris/native/sun/awt/extutil.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/extutil.h Sun Jan 25 08:34:16 2015 -0800
+@@ -58,7 +58,7 @@
+ */
+ /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+
+ #ifndef _EXTUTIL_H_
+ #define _EXTUTIL_H_
+@@ -248,4 +248,4 @@
+ char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)
+ #endif
+
+-#endif /* __linux__ || MACOSX */
++#endif /* __linux__ || _ALLBSD_SOURCE */
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sun Jan 25 08:34:16 2015 -0800
+@@ -23,7 +23,7 @@
+ * questions.
+ */
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ #include <string.h>
+ #endif /* __linux__ */
+ #include <stdio.h>
+@@ -79,7 +79,7 @@
+
+ #define MAXFDIRS 512 /* Max number of directories that contain fonts */
+
+-#if !defined(__linux__) && !defined(MACOSX)
++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
+ /*
+ * This can be set in the makefile to "/usr/X11" if so desired.
+ */
+@@ -145,6 +145,22 @@
+ PACKAGE_PATH "/share/fonts/Type1",
+ NULL, /* terminates the list */
+ };
++#elif _ALLBSD_SOURCE
++static char *fullBSDFontPath[] = {
++ X11_PATH "/lib/X11/fonts/TrueType",
++ X11_PATH "/lib/X11/fonts/truetype",
++ X11_PATH "/lib/X11/fonts/tt",
++ X11_PATH "/lib/X11/fonts/TTF",
++ X11_PATH "/lib/X11/fonts/OTF",
++ PACKAGE_PATH "/share/fonts/TrueType",
++ PACKAGE_PATH "/share/fonts/truetype",
++ PACKAGE_PATH "/share/fonts/tt",
++ PACKAGE_PATH "/share/fonts/TTF",
++ PACKAGE_PATH "/share/fonts/OTF",
++ X11_PATH "/lib/X11/fonts/Type1",
++ PACKAGE_PATH "/share/fonts/Type1",
++ NULL, /* terminates the list */
++};
+ #else /* __linux */
+ /* All the known interesting locations we have discovered on
+ * various flavors of Linux
+@@ -401,7 +417,7 @@
+
+ #endif /* !HEADLESS */
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ /* from awt_LoadLibrary.c */
+ JNIEXPORT jboolean JNICALL AWTIsHeadless();
+ #endif
+@@ -530,6 +546,8 @@
+ knowndirs = fullLinuxFontPath;
+ #elif defined(MACOSX)
+ knowndirs = full_MACOSX_X11FontPath;
++#elif defined(_ALLBSD_SOURCE)
++ knowndirs = fullBSDFontPath;
+ #else /* IF SOLARIS */
+ knowndirs = fullSolarisFontPath;
+ #endif
+@@ -540,7 +558,7 @@
+ * be initialised.
+ */
+ #ifndef HEADLESS
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ /* There's no headless build on linux ... */
+ if (!AWTIsHeadless()) { /* .. so need to call a function to check */
+ #endif
+@@ -556,7 +574,7 @@
+ x11dirs = getX11FontPath();
+ }
+ AWT_UNLOCK();
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ }
+ #endif
+ #endif /* !HEADLESS */
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/awt/robot_common.c Sun Jan 25 08:34:16 2015 -0800
+@@ -27,7 +27,7 @@
+ #error This file should not be included in headless library
+ #endif
+
+-#ifdef MACOSX
++#ifdef _ALLBSD_SOURCE
+ #include <stdlib.h>
+ #endif
+
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sun Jan 25 08:34:16 2015 -0800
+@@ -28,9 +28,9 @@
+ #include <sys/types.h>
+
+ /*
+- * Linux and MACOSX's version of <sys/types.h> does not define intptr_t
++ * Linux and BSD's's version of <sys/types.h> does not define intptr_t
+ */
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ #include <stdint.h>
+ #endif /* __linux__ || MACOSX */
+
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sun Jan 25 08:34:16 2015 -0800
+@@ -804,7 +804,7 @@
+ static int initialized;
+ static int usevis = JNI_TRUE;
+
+-#if defined(__linux__) || defined(MACOSX)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ # define ULTRA_CHIP "sparc64"
+ #else
+ # define ULTRA_CHIP "sun4u"
+--- ./jdk/src/solaris/native/sun/net/portconfig.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/net/portconfig.c Sun Jan 25 08:34:16 2015 -0800
+@@ -66,6 +66,24 @@
+ range->higher = net_getParam("/dev/tcp", "tcp_largest_anon_port");
+ return 0;
+ }
++#elif defined(__OpenBSD__)
++ {
++ int mib[3];
++ mib[0] = CTL_NET;
++ mib[1] = PF_INET;
++
++ mib[2] = IPCTL_IPPORT_HIFIRSTAUTO;
++ size_t rlen = sizeof(range->lower);
++ if (sysctl(mib, 3, &range->lower, &rlen, NULL, 0) == -1)
++ return -1;
++
++ mib[2] = IPCTL_IPPORT_HILASTAUTO;
++ rlen = sizeof(range->higher);
++ if (sysctl(mib, 3, &range->higher, &rlen, NULL, 0) == -1)
++ return -1;
++
++ return 0;
++ }
+ #elif defined(_ALLBSD_SOURCE)
+ {
+ int ret;
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c Sun Jan 25 08:34:16 2015 -0800
+@@ -201,7 +201,7 @@
+ return IOS_THROWN;
+ }
+ return result;
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ off_t numBytes;
+ int result;
+
+@@ -209,6 +209,8 @@
+
+ #ifdef __APPLE__
+ result = sendfile(srcFD, dstFD, position, &numBytes, NULL, 0);
++#elif defined(__FreeBSD__)
++ result = sendfile(srcFD, dstFD, position, count, NULL, &numBytes, 0);
+ #endif
+
+ if (numBytes > 0)
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c Sun Jan 25 08:34:16 2015 -0800
+@@ -227,6 +227,21 @@
+ fl.l_start = (off64_t)pos;
+ fl.l_type = F_UNLCK;
+ lockResult = fcntl(fd, cmd, &fl);
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
++ /* XXXFREEBSD: While doing of preClose0() we're closing actual fd which
++ was locked, so here we'll get an error which need to be ignored to
++ satisfy TCK FileLock test */
++ if (lockResult < 0 && errno == EBADF)
++ lockResult = errno = 0;
++#endif
++#if defined(__NetBSD__)
++ /* XXXNETBSD: The dup2 in preClose0 is being done onto 1 end of a
++ socketpair which isn't a valid target for F_UNLCK. No good way to see
++ this vs. a bad lock setup so just return errno = 0 there
++ to pass JCK (lock will get removed once all fd's close anyways) */
++ if (lockResult < 0 && errno == EINVAL)
++ lockResult = errno = 0;
++#endif
+ if (lockResult < 0) {
+ JNU_ThrowIOExceptionWithLastError(env, "Release failed");
+ }
+--- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c Sun Jan 25 08:34:16 2015 -0800
+@@ -33,12 +33,19 @@
+ #include "nio_util.h"
+
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ #include <pthread.h>
++#if defined(__linux__)
+ #include <sys/signal.h>
+
+ /* Also defined in src/solaris/native/java/net/linux_close.c */
+ #define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
++#else
++#include <signal.h>
++
++/* Also defined in src/solaris/native/java/net/bsd_close.c */
++#define INTERRUPT_SIGNAL SIGIO
++#endif
+
+ static void
+ nullHandler(int sig)
+@@ -51,7 +58,7 @@
+ JNIEXPORT void JNICALL
+ Java_sun_nio_ch_NativeThread_init(JNIEnv *env, jclass cl)
+ {
+-#ifdef __linux__
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+
+ /* Install the null handler for INTERRUPT_SIGNAL. This might overwrite the
+ * handler previously installed by java/net/linux_close.c, but that's okay
+@@ -74,7 +81,7 @@
+ JNIEXPORT jlong JNICALL
+ Java_sun_nio_ch_NativeThread_current(JNIEnv *env, jclass cl)
+ {
+-#ifdef __linux__
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ return (long)pthread_self();
+ #else
+ return -1;
+@@ -84,7 +91,7 @@
+ JNIEXPORT void JNICALL
+ Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
+ {
+-#ifdef __linux__
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL))
+ JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
+ #endif
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h Sun Jan 25 08:34:16 2015 -0800
+@@ -320,8 +320,20 @@
+ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
+
+
++#elif defined(__FreeBSD__) && __FreeBSD__ >= 7
++
++#include <stdint.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/sctp.h>
++#include <netinet/sctp_peeloff.h>
++#include <netinet/sctp_uio.h>
++#include "jni.h"
++
+ #endif /* __linux__ */
+
++#if !defined(__FreeBSD__) || __FreeBSD__ < 7
++
+ sctp_getladdrs_func* nio_sctp_getladdrs;
+ sctp_freeladdrs_func* nio_sctp_freeladdrs;
+ sctp_getpaddrs_func* nio_sctp_getpaddrs;
+@@ -329,6 +341,17 @@
+ sctp_bindx_func* nio_sctp_bindx;
+ sctp_peeloff_func* nio_sctp_peeloff;
+
++#else
++
++#define nio_sctp_getladdrs sctp_getladdrs
++#define nio_sctp_freeladdrs sctp_freeladdrs
++#define nio_sctp_getpaddrs sctp_getpaddrs
++#define nio_sctp_freepaddrs sctp_freepaddrs
++#define nio_sctp_bindx sctp_bindx
++#define nio_sctp_peeloff sctp_peeloff
++
++#endif
++
+ jboolean loadSocketExtensionFuncs(JNIEnv* env);
+
+ #endif /* !SUN_NIO_CH_SCTP_H */
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c Sun Jan 25 08:34:16 2015 -0800
+@@ -58,6 +58,7 @@
+ */
+ jboolean loadSocketExtensionFuncs
+ (JNIEnv* env) {
++#if !defined(__FreeBSD__) || __FreeBSD__ < 7 /* On FreeBSD 7.x these functions are in libc */
+ if (dlopen(nativeSctpLib, RTLD_GLOBAL | RTLD_LAZY) == NULL) {
+ JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
+ dlerror());
+@@ -105,6 +106,7 @@
+ dlerror());
+ return JNI_FALSE;
+ }
++#endif /* __FreeBSD__ */
+
+ funcsLoaded = JNI_TRUE;
+ return JNI_TRUE;
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sun Jan 25 08:34:16 2015 -0800
+@@ -33,6 +33,11 @@
+
+ #include "j2secmod.h"
+
++#ifndef RTLD_NOLOAD
++/* A gross hack that will work if the NSS library is only opened once */
++static void *nssLibHandle = NULL;
++#endif
++
+ void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
+ void *hModule = (void*)jHandle;
+ void *fAddress = dlsym(hModule, functionName);
+@@ -50,7 +55,11 @@
+ {
+ const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
+ // look up existing handle only, do not load
++#ifdef RTLD_NOLOAD
+ void *hModule = dlopen(libName, RTLD_NOLOAD);
++#else
++ void *hModule = nssLibHandle;
++#endif
+ dprintf2("-handle for %s: %u\n", libName, hModule);
+ (*env)->ReleaseStringUTFChars(env, jLibName, libName);
+ return (jlong)hModule;
+@@ -64,6 +73,9 @@
+
+ dprintf1("-lib %s\n", libName);
+ hModule = dlopen(libName, RTLD_LAZY);
++#ifndef RTLD_NOLOAD
++ nssLibHandle = hModule;
++#endif
+ (*env)->ReleaseStringUTFChars(env, jLibName, libName);
+ dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
+
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sun Jan 25 08:34:16 2015 -0800
+@@ -867,7 +867,7 @@
+ {
+ KeySym originalKeysym = *keysym;
+
+-#if !defined(__linux__) && !defined(MACOSX)
++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
+ /* 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/test/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -79,6 +79,11 @@
+ endif
+ OS_VERSION := $(shell $(UNAME) -r)
+ endif
++ifeq ($(findstring BSD,$(UNAME_S)), BSD)
++ OS_NAME = bsd
++ OS_ARCH := $(shell $(UNAME) -m)
++ OS_VERSION := $(shell $(UNAME) -r)
++endif
+ ifeq ($(UNAME_S), Darwin)
+ OS_NAME = macosx
+ OS_ARCH := $(shell $(UNAME) -m)
+--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -48,7 +48,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | Darwin | *BSD )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -56,7 +56,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ ;;
+
+--- ./jdk/test/com/sun/jdi/JITDebug.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/jdi/JITDebug.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -63,7 +63,7 @@
+ OS=`uname -s`
+ export TRANSPORT_METHOD
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ TRANSPORT_METHOD=dt_socket
+ ;;
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -123,7 +123,7 @@
+ esac
+ libloc=${jreloc}/lib/${libarch}
+ ;;
+- Linux)
++ Linux | *BSD)
+ xx=`find ${jreloc}/lib -name libdt_socket.so`
+ libloc=`dirname ${xx}`
+ ;;
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -293,7 +293,7 @@
+ psCmd=ps
+ jstack=jstack.exe
+ ;;
+- SunOS | Linux | Darwin)
++ SunOS | Linux | *BSD | Darwin)
+ transport=dt_socket
+ address=
+ devnull=/dev/null
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -112,7 +112,7 @@
+ fi
+ ;;
+
+- Linux | Darwin )
++ Linux | *BSD | Darwin )
+ pass "This test always passes on $OS"
+ ;;
+
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -45,7 +45,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ ;;
+ Windows* | CYGWIN*)
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -72,6 +72,16 @@
+ done
+ }
+
++bsd_swap_size()
++{
++ total_swap=0
++ for i in `/usr/sbin/swapinfo -k | awk '{print $2}' | grep -v blocks`
++ do
++ # swapinfo -k returns size in kilobytes.
++ total_swap=`expr $i \* 1024 + $total_swap`
++ done
++}
++
+ # Test GetTotalSwapSpaceSize if we are running on Unix
+ total_swap=0
+ case `uname -s` in
+@@ -83,6 +93,9 @@
+ total_swap=`free -b | grep -i swap | awk '{print $2}'`
+ runOne GetTotalSwapSpaceSize $total_swap
+ ;;
++ *BSD )
++ bsd_swap_size
++ runOne GetTotalSwapSpaceSize $total_swap
+ Darwin )
+ # $ sysctl -n vm.swapusage
+ # total = 8192.00M used = 7471.11M free = 720.89M (encrypted)
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -48,7 +48,7 @@
+
+ # Test GetMaxFileDescriptorCount if we are running on Unix
+ case `uname -s` in
+- SunOS | Linux )
++ SunOS | Linux | *BSD | Darwin )
+ runOne GetMaxFileDescriptorCount
+ ;;
+ * )
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -48,7 +48,7 @@
+
+ # Test GetOpenFileDescriptorCount if we are running on Unix
+ case `uname -s` in
+- SunOS | Linux )
++ SunOS | Linux | *BSD | Darwin )
+ runOne GetOpenFileDescriptorCount
+ ;;
+ * )
+--- ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java Sun Jan 25 08:34:16 2015 -0800
+@@ -50,8 +50,8 @@
+
+ public static void main(String[] args) {
+ OSInfo.OSType osType = OSInfo.getOSType();
+- if ((osType != OSInfo.OSType.LINUX) && (osType != OSInfo.OSType.SOLARIS)) {
+- System.out.println("This test is only for Linux OS and Solaris OS.");
++ if ((osType != OSInfo.OSType.LINUX) && (osType != OSInfo.OSType.SOLARIS) && (osType != OSInfo.OSType.BSD)) {
++ System.out.println("This test is only for BSD, Linux, and Solaris.");
+ return;
+ }
+
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -25,10 +25,11 @@
+ fi
+
+
+-if [ $OS = SunOS -o $OS = Linux ]
+-then
+- exit 0
+-fi
++case "${OS}" in
++ SunOS | Linux | *BSD | Darwin )
++ exit 0
++ ;;
++esac
+ # Windows
+
+ if [ -z "${TESTJAVA}" ] ; then
+--- ./jdk/test/java/io/File/GetXSpace.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/io/File/GetXSpace.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -26,7 +26,7 @@
+ # set platform-dependent variable
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux ) TMP=/tmp ;;
++ SunOS | Linux | *BSD | Darwin ) TMP=/tmp ;;
+ Windows_98 ) return ;;
+ Windows* ) SID=`sid`; TMP="c:/temp" ;;
+ * )
+--- ./jdk/test/java/io/FileOutputStream/ManyFiles.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java Sun Jan 25 08:34:16 2015 -0800
+@@ -43,7 +43,7 @@
+ // Windows capability it is much simpler to only run it
+ // on that platform.
+ String osName = System.getProperty("os.name");
+- if (osName.startsWith("Linux")||osName.startsWith("SunOS"))
++ if (osName.startsWith("Linux")||osName.startsWith("SunOS")||osName.endsWith("BSD")||osName.contains("OS X"))
+ return;
+
+ for (int n = 0; n < NUM_FILES; n++) {
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -41,7 +41,7 @@
+ # Need to determine the classpath separator and filepath separator based on the
+ # operating system.
+ case "$OS" in
+-SunOS | Linux | Darwin )
++SunOS | Linux | *BSD | Darwin )
+ PS=":" ;;
+ Windows* | CYGWIN* )
+ PS=";" ;;
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":" ;;
+ Windows* | CYGWIN* )
+ PS=";" ;;
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":" ;;
+ Windows* | CYGWIN* )
+ PS=";" ;;
+--- ./jdk/test/java/lang/ClassLoader/Assert.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/lang/ClassLoader/Assert.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -25,7 +25,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | Darwin | *BSD )
+ FS="/"
+ CHMOD="${FS}bin${FS}chmod"
+ ;;
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -45,13 +45,7 @@
+ # set platform-specific variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- FS="/"
+- ;;
+- Linux )
+- FS="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ ;;
+ Windows*)
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -49,13 +49,7 @@
+ # set platform-specific variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- FS="/"
+- ;;
+- Linux )
+- FS="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ ;;
+ Windows* | CYGWIN* )
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -30,7 +30,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin) ;;
++ SunOS | Linux | *BSD | Darwin) ;;
+ Windows* | CYGWIN* )
+ echo "Passed"; exit 0 ;;
+ * ) echo "Unrecognized system!" ; exit 1 ;;
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -44,7 +44,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin)
++ SunOS | Linux | *BSD | Darwin)
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -49,7 +49,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ ;;
+
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -35,15 +35,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PS=":"
+- FS="/"
+- ;;
+- Linux )
+- PS=":"
+- FS="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -61,7 +61,7 @@
+ while true; do
+ echo "Run $i: TestSystemLoadAvg"
+ case `uname -s` in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ runOne GetSystemLoadAverage
+ ;;
+ * )
+--- ./jdk/test/java/net/Authenticator/B4933582.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/net/Authenticator/B4933582.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -26,7 +26,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sun Jan 25 08:34:16 2015 -0800
+@@ -45,6 +45,8 @@
+ return (true);
+ if (p.getProperty ("os.name").equals ("Linux"))
+ return (true);
++ if (p.getProperty ("os.name").endsWith ("BSD"))
++ return (true);
+ if (p.getProperty ("os.name").startsWith ("Mac OS"))
+ return (true);
+ // Check for specific Solaris version from here
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -27,11 +27,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Darwin )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Linux )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -28,7 +28,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/java/net/URL/B5086147.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/net/URL/B5086147.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -26,7 +26,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ exit 0
+ ;;
+ CYGWIN* )
+--- ./jdk/test/java/net/URL/runconstructor.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/net/URL/runconstructor.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -27,7 +27,7 @@
+ #
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -34,11 +34,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Darwin )
+- PS=":"
+- FS="/"
+- ;;
+- Linux )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -27,11 +27,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Darwin )
+- PS=":"
+- FS="/"
+- ;;
+- Linux )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/net/URLConnection/6212146/test.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -33,11 +33,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Darwin )
+- PS=":"
+- FS="/"
+- ;;
+- Linux )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile Sun Jan 25 08:34:16 2015 -0800
+@@ -71,6 +71,48 @@
+ EXTRA_LIBS = -lc
+ endif
+
++ifeq ($(uname), Darwin)
++ PLATFORM = bsd
++ archExpr = case "`$(UNAME) -m`" in \
++ i[3-6]86) \
++ $(ECHO) i586 \
++ ;; \
++ sparc*) \
++ $(ECHO) sparc \
++ ;; \
++ *) \
++ $(UNAME) -m \
++ ;; \
++ esac
++ ARCH := $(shell $(archExpr) )
++ CC = gcc
++ CFLAGS = -fno-strict-aliasing -fPIC -W -Wall
++ LD = ld
++ LDFLAGS_COMMON = -shared
++ EXTRA_LIBS = -lc
++endif
++
++ifeq ($(findstring BSD,$(uname)), BSD)
++ PLATFORM = bsd
++ archExpr = case "`$(UNAME) -m`" in \
++ i[3-6]86) \
++ $(ECHO) i586 \
++ ;; \
++ sparc*) \
++ $(ECHO) sparc \
++ ;; \
++ *) \
++ $(UNAME) -m \
++ ;; \
++ esac
++ ARCH := $(shell $(archExpr) )
++ CC = gcc
++ CFLAGS = -fno-strict-aliasing -fPIC -W -Wall
++ LD = ld
++ LDFLAGS_COMMON = -shared
++ EXTRA_LIBS = -lc
++endif
++
+ LIBDIR=lib/$(PLATFORM)-$(ARCH)
+ LAUNCHERLIB=$(LIBDIR)/libLauncher.so
+
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -33,11 +33,14 @@
+ # @run shell run_tests.sh
+
+ os=`uname -s`
+-
+-if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
+- echo "Test not designed to run on this operating system, skipping..."
+- exit 0
+-fi
++case "${os}" in
++ SunOS | Linux | *BSD | Darwin )
++ ;;
++ * )
++ echo "Test not designed to run on this operating system, skipping..."
++ exit 0
++ ;;
++esac
+
+
+ # if TESTJAVA isn't set then we assume an interactive run. So that it's
+@@ -67,7 +70,8 @@
+ # On Solaris we assume 64-bit if java -d64 works.
+
+ DFLAG=
+-if [ "$os" = "SunOS" ]; then
++case "${os}" in
++ SunOS )
+ PLATFORM=solaris
+ case "`uname -p`" in
+ i[3-9]86)
+@@ -84,9 +88,9 @@
+ fi
+ ;;
+ esac
+-fi
++ ;;
+
+-if [ "$os" = "Linux" ]; then
++ Linux )
+ PLATFORM=linux
+ ARCH=unknown
+ case "`uname -m`" in
+@@ -100,7 +104,24 @@
+ ARCH=amd64
+ ;;
+ esac
+-fi
++ ;;
++
++ *BSD | Darwin )
++ PLATFORM=bsd
++ ARCH=unknown
++ case "`uname -m`" in
++ i[3-6]86)
++ ARCH=i586
++ ;;
++ ia64)
++ ARCH=ia64
++ ;;
++ x86_64)
++ ARCH=amd64
++ ;;
++ esac
++ ;;
++esac
+
+ LIBDIR=lib/${PLATFORM}-${ARCH}
+ LAUNCHERLIB=${LIBDIR}/libLauncher.so
+--- ./jdk/test/java/nio/charset/Charset/default.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/nio/charset/Charset/default.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -41,10 +41,14 @@
+ fi
+
+ s="`uname -s`"
+-if [ "$s" != Linux -a "$s" != SunOS ]; then
+- echo "$s: locale command not supported on this system, skipping..."
+- exit 0
+-fi
++case "$s" in
++ Linux|SunOS|*BSD|Darwin)
++ ;;
++ *)
++ echo "$s: locale command not supported on this system, skipping..."
++ exit 0
++ ;;
++esac
+
+ JAVA=$TESTJAVA/bin/java
+
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -34,7 +34,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin ) ;;
++ SunOS | Linux | *BSD | Darwin ) ;;
+ # Skip locale test for Windows
+ Windows* | CYGWIN* )
+ echo "Passed"; exit 0 ;;
+--- ./jdk/test/java/nio/charset/spi/basic.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/nio/charset/spi/basic.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -70,10 +70,14 @@
+ L="$1"
+ shift
+ s=`uname -s`
+- if [ $s != Linux -a $s != SunOS -a $s != Darwin ]; then
+- echo "$L: Locales not supported on this system, skipping..."
+- exit 0
+- fi
++ case "$s" in
++ Linux|SunOS|*BSD|Darwin)
++ ;;
++ *)
++ echo "$L: Locales not supported on this system, skipping..."
++ exit 0
++ ;;
++ esac
+ if [ "x`locale -a | grep $L`" != "x$L" ]; then
+ echo "$L: Locale not supported, skipping..."
+ exit 0
+@@ -85,7 +89,7 @@
+ cd $TMP
+
+ case `uname` in
+- SunOS | Linux | Darwin ) CPS=':' ;;
++ SunOS | Linux | *BSD | Darwin ) CPS=':' ;;
+ Windows* ) CPS=';' ;;
+ *) echo "Unknown platform: `uname`"; exit 1 ;;
+ esac
+--- ./jdk/test/java/nio/file/FileSystem/Basic.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/nio/file/FileSystem/Basic.java Sun Jan 25 08:34:16 2015 -0800
+@@ -76,6 +76,8 @@
+ checkSupported(fs, "posix", "unix", "owner", "acl", "user");
+ if (os.equals("Linux"))
+ checkSupported(fs, "posix", "unix", "owner", "dos", "user");
++ if (os.endsWith("BSD"))
++ checkSupported(fs, "posix", "unix", "owner");
+ if (os.contains("OS X"))
+ checkSupported(fs, "posix", "unix", "owner");
+ if (os.equals("Windows"))
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Sun Jan 25 08:34:16 2015 -0800
+@@ -634,7 +634,7 @@
+
+ // check POSIX attributes are copied
+ String os = System.getProperty("os.name");
+- if (os.equals("SunOS") || os.equals("Linux")) {
++ if (os.equals("SunOS") || os.equals("Linux") || os.endsWith("BSD")) {
+ checkPosixAttributes(
+ readAttributes(source, PosixFileAttributes.class, linkOptions),
+ readAttributes(target, PosixFileAttributes.class, linkOptions));
+@@ -1136,7 +1136,7 @@
+ static void randomizeAttributes(Path file) throws IOException {
+ String os = System.getProperty("os.name");
+ boolean isWindows = os.startsWith("Windows");
+- boolean isUnix = os.equals("SunOS") || os.equals("Linux");
++ boolean isUnix = os.equals("SunOS") || os.equals("Linux") || os.endsWith("BSD");
+ boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
+
+ if (isUnix) {
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -34,7 +34,7 @@
+ REGARGS=""
+
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ CHMOD="${FS}bin${FS}chmod"
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh Sun Jan 25 08:34:16 2015 -0800
+@@ -84,14 +84,12 @@
+
+
+ # set platform-dependent variables
+-if [ `uname` = "SunOS" ] ; then
++case `uname` in
++ SunOS | Linux | *BSD | Darwin )
+ PATH_SEP=":"
+-
+-elif [ `uname` = "Linux" ] ; then
+- PATH_SEP=":"
+-else
++ * )
+ PATH_SEP=";"
+-fi
++esac
+
+ export PATH_SEP
+ mainpid=$$
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,15 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Linux )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -34,15 +34,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Linux )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -50,19 +50,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Linux )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- CYGWIN* )
+- PATHSEP=";"
+- FILESEP="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,15 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Linux )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/security/Security/signedfirst/Static.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,15 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Linux )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/util/Currency/PropertiesTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -30,7 +30,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -58,7 +58,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -31,7 +31,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -72,10 +72,10 @@
+ Windows* | CYGWIN* )
+ DEL=";"
+ ;;
+-SunOS | Darwin)
++SunOS | Darwin )
+ DEL=":"
+ ;;
+-Linux)
++Linux | *BSD )
+ DEL=":"
+ HAS_S=YES
+ ;;
+--- ./jdk/test/java/util/ServiceLoader/basic.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/java/util/ServiceLoader/basic.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -42,9 +42,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Darwin )
+- SEP=':' ;;
+- Linux )
++ SunOS | Linux | *BSD | Darwin )
+ SEP=':' ;;
+ * )
+ SEP='\;' ;;
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -51,7 +51,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -84,7 +84,7 @@
+ TMP="/tmp"
+ ;;
+
+- Linux )
++ Linux | *BSD | Darwin )
+ VAR="A different value for Linux"
+ DEFAULT_JDK=/
+ FILESEP="/"
+@@ -92,14 +92,6 @@
+ TMP="/tmp"
+ ;;
+
+- Darwin )
+- VAR="A different value for MacOSX"
+- DEFAULT_JDK=/usr
+- FILESEP="/"
+- PATHSEP=":"
+- TMP="/tmp"
+- ;;
+-
+ Windows* )
+ VAR="A different value for Win32"
+ DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
+--- ./jdk/test/javax/script/CommonSetup.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/javax/script/CommonSetup.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -36,7 +36,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -33,17 +33,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PS=":"
+- FS="/"
+- RM="/bin/rm -f"
+- ;;
+- Linux )
+- PS=":"
+- FS="/"
+- RM="/bin/rm -f"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ RM="/bin/rm -f"
+--- ./jdk/test/jprt.config Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/jprt.config Sun Jan 25 08:34:16 2015 -0800
+@@ -71,8 +71,8 @@
+
+ # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
+ osname=`uname -s`
+-if [ "${osname}" = SunOS ] ; then
+-
++case "${osname}" in
++ SunOS )
+ # SOLARIS: Sparc or X86
+ osarch=`uname -p`
+ if [ "${osarch}" = sparc ] ; then
+@@ -96,9 +96,9 @@
+
+ # File creation mask
+ umask 002
++ ;;
+
+-elif [ "${osname}" = Linux ] ; then
+-
++ Linux | Darwin )
+ # Add basic paths
+ path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
+
+@@ -107,8 +107,31 @@
+ fileMustExist "${make}" make
+
+ umask 002
++ ;;
+
+-else
++ FreeBSD | OpenBSD )
++ # Add basic paths
++ path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
++
++ # Find GNU make
++ make=/usr/local/bin/gmake
++ fileMustExist "${make}" make
++
++ umask 002
++ ;;
++
++ NetBSD )
++ # Add basic paths
++ path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
++
++ # Find GNU make
++ make=/usr/pkg/bin/gmake
++ fileMustExist "${make}" make
++
++ umask 002
++ ;;
++
++ * )
+
+ # Windows: Differs on CYGWIN vs. MKS.
+
+@@ -150,8 +173,8 @@
+ if [ "${unix_toolset}" = CYGWIN ] ; then
+ path4sdk="`/usr/bin/cygpath -p ${path4sdk}`"
+ fi
+-
+-fi
++ ;;
++esac
+
+ # Export PATH setting
+ PATH="${path4sdk}"
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -50,7 +50,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sun Jan 25 08:34:16 2015 -0800
+@@ -53,8 +53,13 @@
+ return isOs("linux");
+ }
+
++ public static boolean isBSD() {
++ return isOs("bsd");
++ }
++
+ private static boolean isOs(String osname) {
+- return osName.toLowerCase().startsWith(osname.toLowerCase());
++ return (osName.toLowerCase().startsWith(osname.toLowerCase()) ||
++ osName.toLowerCase().endsWith(osname.toLowerCase()));
+ }
+
+ public static String getOsName() {
+--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sun Jan 25 08:34:16 2015 -0800
+@@ -107,8 +107,8 @@
+
+ public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException {
+ OSType type = OSInfo.getOSType();
+- if (type != OSType.LINUX && type != OSType.SOLARIS) {
+- System.out.println("This test is for Linux and Solaris only... " +
++ if (type != OSType.LINUX && type != OSType.SOLARIS && type != OSType.BSD) {
++ System.out.println("This test is for BSD, Linux and Solaris only... " +
+ "skipping!");
+ return;
+ }
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -45,37 +45,53 @@
+ # has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
+ #{
+ OS=`uname -s`
+-if [ "$OS" != "Linux" -a "$OS" != "SunOS" ]; then
+- echo "Test not designed to run on this operating system, skipping..."
+- exit 0
+-fi
++case "${OS}" in
++ Windows* | CYGWIN* )
++ echo "Test not designed to run on this operating system, skipping..."
++ exit 0
++ ;;
++esac
+
+ #
+ # Locate the custom launcher for this platform
+ #
+ PLATFORM=unknown
+ ARCH=unknown
+-if [ "$OS" = "SunOS" ]; then
+- PLATFORM=solaris
+- case "`uname -p`" in
+- i[3-9]86)
+- ARCH=i586
+- ;;
+- sparc)
+- ARCH=sparc
+- ;;
+- esac
+-else
+- PLATFORM=linux
+- case "`uname -m`" in
+- i[3-6]86)
+- ARCH=i586
+- ;;
+- x86_64)
+- ARCH=amd64
+- ;;
+- esac
+-fi
++case "${OS}" in
++ SunOS )
++ PLATFORM=solaris
++ case "`uname -p`" in
++ i[3-9]86)
++ ARCH=i586
++ ;;
++ sparc)
++ ARCH=sparc
++ ;;
++ esac
++ ;;
++ Linux )
++ PLATFORM=linux
++ case "`uname -m`" in
++ i[3-6]86)
++ ARCH=i586
++ ;;
++ x86_64)
++ ARCH=amd64
++ ;;
++ esac
++ ;;
++ *BSD | Darwin )
++ PLATFORM=bsd
++ case "`uname -m`" in
++ i[3-6]86)
++ ARCH=i586
++ ;;
++ x86_64)
++ ARCH=amd64
++ ;;
++ esac
++ ;;
++esac
+
+
+ #
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -35,7 +35,7 @@
+ UMASK=`umask`
+
+ case $OS in
+-SunOS | Linux | Darwin)
++SunOS | Linux | *BSD | Darwin)
+ PATHSEP=":"
+ FILESEP="/"
+ DFILESEP=$FILESEP
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -86,10 +86,12 @@
+ # on Windows 98.
+
+ os=`uname -s`
+-if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
+- echo "Test not designed to run on this operating system, skipping..."
+- exit 0
+-fi
++case "${os}" in
++ Windows* | CYGWIN* )
++ echo "Test not designed to run on this operating system, skipping..."
++ exit 0
++ ;;
++esac
+
+ JAVA=${TESTJAVA}/bin/java
+ CLASSPATH=${TESTCLASSES}
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -70,10 +70,12 @@
+ # security the password file.
+
+ os=`uname -s`
+-if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
+- echo "Test not designed to run on this operating system, skipping..."
+- exit 0
+-fi
++case "${os}" in
++ Windows* | CYGWIN* )
++ echo "Test not designed to run on this operating system, skipping..."
++ exit 0
++ ;;
++esac
+
+
+ # Create configuration file and dummy password file
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -69,10 +69,12 @@
+ # security the password file.
+
+ os=`uname -s`
+-if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
+- echo "Test not designed to run on this operating system, skipping..."
+- exit 0
+-fi
++case "${os}" in
++ Windows* | CYGWIN* )
++ echo "Test not designed to run on this operating system, skipping..."
++ exit 0
++ ;;
++esac
+
+ # Create management and SSL configuration files
+
+--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -36,7 +36,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/sun/net/www/MarkResetTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/net/www/MarkResetTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -28,7 +28,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -28,7 +28,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -31,7 +31,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -31,7 +31,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ CHMOD="${FS}bin${FS}chmod"
+--- ./jdk/test/sun/nio/ch/SelProvider.java Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/nio/ch/SelProvider.java Sun Jan 25 08:34:16 2015 -0800
+@@ -39,7 +39,7 @@
+ expected = "sun.nio.ch.DevPollSelectorProvider";
+ } else if ("Linux".equals(osname)) {
+ expected = "sun.nio.ch.EPollSelectorProvider";
+- } else if (osname.contains("OS X")) {
++ } else if (osname.contains("OS X") || osname.endsWith("BSD")) {
+ expected = "sun.nio.ch.KQueueSelectorProvider";
+ } else {
+ return;
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/krb5/runNameEquals.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -48,15 +48,11 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux )
++ SunOS | Linux | Darwin | *BSD )
+ PATHSEP=":"
+ FILESEP="/"
+ NATIVE=true
+ ;;
+- Darwin )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+ CYGWIN* )
+ PATHSEP=";"
+ FILESEP="/"
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -131,6 +131,27 @@
+ ;;
+ esac
+ ;;
++ *BSD | Darwin )
++ ARCH=`uname -m`
++ case "$ARCH" in
++ i[3-6]86 )
++ FS="/"
++ PS=":"
++ CP="${FS}bin${FS}cp"
++ CHMOD="${FS}bin${FS}chmod"
++ ;;
++ amd64* | x86_64 )
++ FS="/"
++ PS=":"
++ CP="${FS}bin${FS}cp"
++ CHMOD="${FS}bin${FS}chmod"
++ ;;
++ * )
++ echo "Unsupported System: ${OS} ${ARCH}"
++ exit 0;
++ ;;
++ esac
++ ;;
+ Windows* )
+ FS="\\"
+ PS=";"
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -93,6 +93,27 @@
+ ;;
+ esac
+ ;;
++ *BSD | Darwin )
++ ARCH=`uname -m`
++ case "$ARCH" in
++ i[3-6]86 )
++ FS="/"
++ PS=":"
++ CP="${FS}bin${FS}cp"
++ CHMOD="${FS}bin${FS}chmod"
++ ;;
++ amd64* | x86_64 )
++ FS="/"
++ PS=":"
++ CP="${FS}bin${FS}cp"
++ CHMOD="${FS}bin${FS}chmod"
++ ;;
++ * )
++ echo "Unsupported System: ${OS} ${ARCH}"
++ exit 0;
++ ;;
++ esac
++ ;;
+ Windows* )
+ FS="\\"
+ PS=";"
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -50,19 +50,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- FS="/"
+- PS=":"
+- CP="${FS}bin${FS}cp"
+- CHMOD="${FS}bin${FS}chmod"
+- ;;
+- Linux )
+- FS="/"
+- PS=":"
+- CP="${FS}bin${FS}cp"
+- CHMOD="${FS}bin${FS}chmod"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ PS=":"
+ CP="${FS}bin${FS}cp"
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -51,19 +51,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- FS="/"
+- PS=":"
+- CP="${FS}bin${FS}cp"
+- CHMOD="${FS}bin${FS}chmod"
+- ;;
+- Linux )
+- FS="/"
+- PS=":"
+- CP="${FS}bin${FS}cp"
+- CHMOD="${FS}bin${FS}chmod"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ PS=":"
+ CP="${FS}bin${FS}cp"
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -44,11 +44,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Linux )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -47,15 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PS=":"
+- FS="/"
+- ;;
+- Linux )
+- PS=":"
+- FS="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -33,7 +33,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -42,7 +42,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FILESEP="/"
+ PATHSEP=":"
+ ;;
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -32,7 +32,7 @@
+ HOSTNAME=`uname -n`
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -32,7 +32,7 @@
+ HOSTNAME=`uname -n`
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -41,7 +41,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -42,7 +42,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -47,15 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Linux )
+- PATHSEP=":"
+- FILESEP="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
+--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -42,13 +42,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS )
+- FILESEP="/"
+- ;;
+- Linux )
+- FILESEP="/"
+- ;;
+- Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FILESEP="/"
+ ;;
+ CYGWIN* )
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -45,7 +45,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/autotest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -72,6 +72,27 @@
+ ;;
+ esac
+ ;;
++ *BSD | Darwin )
++ case "${OS}" in
++ *BSD )
++ LIBNAME=libsoftokn3.so
++ ;;
++ Darwin )
++ LIBNAME=libsoftokn3.dylib
++ ;;
++ esac
++ ARCH=`uname -m`
++ FS="/"
++ case "$ARCH" in
++ i[3-6]86 )
++ PF="bsd-i586"
++ ;;
++ * )
++ echo "Will not run test on: ${OS} ${ARCH}"
++ exit 0;
++ ;;
++ esac
++ ;;
+ * )
+ echo "Will not run test on: ${OS}"
+ exit 0;
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/i18n.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/printssl.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -37,7 +37,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ ;;
+ CYGWIN* )
+--- ./jdk/test/sun/security/tools/keytool/resource.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/resource.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -43,7 +43,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ FS="/"
+ ;;
+--- ./jdk/test/sun/security/tools/keytool/standard.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/keytool/standard.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -44,7 +44,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | *BSD | Darwin | CYGWIN* )
+ FS="/"
+ ;;
+ Windows_* )
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/policytool/Alias.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/security/tools/policytool/i18n.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -46,7 +46,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -0,0 +1,111 @@
++#
++# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
++# 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 6287579
++# @summary SubClasses of ListResourceBundle should fix getContents()
++#
++# @run shell ImmutableResourceTest.sh
++
++# Beginning of subroutines:
++status=1
++
++#Call this from anywhere to fail the test with an error message
++# usage: fail "reason why the test failed"
++fail()
++ { echo "The test failed :-("
++ echo "$*" 1>&2
++ echo "exit status was $status"
++ exit $status
++ } #end of fail()
++
++#Call this from anywhere to pass the test with a message
++# usage: pass "reason why the test passed if applicable"
++pass()
++ { echo "The test passed!!!"
++ echo "$*" 1>&2
++ exit 0
++ } #end of pass()
++
++# end of subroutines
++
++# The beginning of the script proper
++
++OS=`uname -s`
++case "$OS" in
++ SunOS | Linux | *BSD | Darwin )
++ PATHSEP=":"
++ ;;
++
++ Windows* | CYGWIN*)
++ PATHSEP=";"
++ ;;
++
++ # catch all other OSs
++ * )
++ echo "Unrecognized system! $OS"
++ fail "Unrecognized system! $OS"
++ ;;
++esac
++
++TARGETCLASS="ImmutableResourceTest"
++if [ -z "${TESTJAVA}" ] ; then
++ # TESTJAVA is not set, so the test is running stand-alone.
++ # TESTJAVA holds the path to the root directory of the build of the JDK
++ # to be tested. That is, any java files run explicitly in this shell
++ # should use TESTJAVA in the path to the java interpreter.
++ # So, we'll set this to the JDK spec'd on the command line. If none
++ # is given on the command line, tell the user that and use a default.
++ # THIS IS THE JDK BEING TESTED.
++ if [ -n "$1" ] ; then
++ TESTJAVA=$1
++ else
++ TESTJAVA=$JAVA_HOME
++ fi
++ TESTSRC=.
++ TESTCLASSES=.
++ #Deal with .class files:
++fi
++#
++echo "JDK under test is: $TESTJAVA"
++#
++CP="-classpath ${TESTCLASSES}${PATHSEP}${TESTJAVA}/lib/jconsole.jar"
++# Compile the test class using the classpath we need:
++#
++env
++#
++set -vx
++#
++#Compile. jconsole.jar is required on the classpath.
++${TESTJAVA}/bin/javac -d "${TESTCLASSES}" ${CP} -g \
++ "${TESTSRC}"/"${TARGETCLASS}".java
++#
++#Run the test class, again with the classpath we need:
++${TESTJAVA}/bin/java ${CP} ${TARGETCLASS}
++status=$?
++echo "test status was: $status"
++if [ $status -eq "0" ];
++ then pass ""
++
++ else fail "unspecified test failure"
++fi
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -54,7 +54,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ ;;
+
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -33,7 +33,7 @@
+
+ case `uname -s` in
+ Windows* | CYGWIN*) OS=Windows;;
+- SunOS|Linux) OS=Unix;;
++ SunOS|Linux|*BSD|Darwin) OS=Unix;;
+ esac
+
+ N2A=$TESTJAVA/bin/native2ascii
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Thu Dec 18 14:05:58 2014 -0800
++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sun Jan 25 08:34:16 2015 -0800
+@@ -56,7 +56,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PATHSEP=":"
+ ;;
+
+--- ./langtools/.hgtags Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/.hgtags Sat Jan 24 12:35:01 2015 -0800
+@@ -123,6 +123,7 @@
+ 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
+ d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
+ 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
++23aadf169f085b180803bcdc53baad4ae870f75b 7u0
+ cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
+ 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
+ baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
+@@ -554,3 +556,4 @@
+ 11ca0f4b0c56817f6ad302022e6414aa52582f16 jdk7u76-b10
+ 63c1f23bddcfc45835f224376525ec621ac73a96 jdk7u76-b11
+ f0a6f4f62959a43e21d377436e3e60f6431ee5b4 jdk7u76-b12
++d9e79541170f453dda964319f268fdad80dce9d7 jdk7u76-b13
+--- ./langtools/test/Makefile Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/Makefile Sat Jan 24 12:35:01 2015 -0800
+@@ -42,6 +42,14 @@
+ ARCH=i586
+ endif
+ endif
++ifeq ($(findstring BSD,$(OSNAME)), BSD)
++ PLATFORM = bsd
++ JT_PLATFORM = linux
++ ARCH = $(shell uname -m)
++ ifeq ($(ARCH), i386)
++ ARCH=i586
++ endif
++endif
+ ifeq ($(OSNAME), Windows_NT)
+ PLATFORM = windows
+ JT_PLATFORM = win32
+@@ -101,7 +109,7 @@
+ ifdef JPRT_JAVA_HOME
+ JT_JAVA = $(JPRT_JAVA_HOME)
+ else
+- JT_JAVA = $(SLASH_JAVA)/re/jdk/1.6.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
++ JT_JAVA = $(TEST_ROOT)/../../build/$(PLATFORM)-$(ARCH)
+ endif
+
+ # Default JDK to test
+@@ -196,7 +204,9 @@
+
+ # The test directories to run
+ DEFAULT_TESTDIRS = .
+-TESTDIRS = $(DEFAULT_TESTDIRS)
++ifndef TESTDIRS
++ TESTDIRS = $(DEFAULT_TESTDIRS)
++endif
+
+ # Root of all test results
+ TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
+--- ./langtools/test/tools/javac/4846262/Test.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/4846262/Test.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -44,7 +44,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ ;;
+ CYGWIN* )
+--- ./langtools/test/tools/javac/6302184/T6302184.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/6302184/T6302184.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -41,7 +41,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ ;;
+ CYGWIN* )
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -56,7 +56,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ CHMOD="${FS}bin${FS}chmod"
+ ;;
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -54,7 +54,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./langtools/test/tools/javac/MissingInclude.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/MissingInclude.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | *BSD | Darwin | CYGWIN* )
+ FS="/"
+ ;;
+ Windows* )
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -52,7 +52,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./langtools/test/tools/javac/T5090006/compiler.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/T5090006/compiler.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | *BSD | Darwin | CYGWIN* )
+ FS="/"
+ ;;
+ Windows* )
+--- ./langtools/test/tools/javac/apt.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/apt.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -38,7 +38,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -48,7 +48,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ ;;
+ CYGWIN* )
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -53,7 +53,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | *BSD | Darwin | CYGWIN* )
+ FS="/"
+ ;;
+ Windows* )
+--- ./langtools/test/tools/javac/javazip/Test.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/javazip/Test.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -41,7 +41,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ FS="/"
+ SCR=`pwd`
+ ;;
+--- ./langtools/test/tools/javac/links/links.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/links/links.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -53,7 +53,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./langtools/test/tools/javac/newlines/Newlines.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/newlines/Newlines.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -50,7 +50,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | *BSD | Darwin | CYGWIN* )
+ FS="/"
+ ;;
+ Windows* )
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/stackmap/T4955930.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -41,7 +41,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | *BSD | Darwin | CYGWIN* )
+ FS="/"
+ ;;
+ Windows_95 | Windows_98 | Windows_NT )
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -55,7 +55,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | Darwin | *BSD )
+ if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ]
+ then
+ ENV="env LANG=en_US.UTF-8"
+--- ./langtools/test/tools/javah/6257087/foo.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javah/6257087/foo.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -41,7 +41,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./langtools/test/tools/javah/ConstMacroTest.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javah/ConstMacroTest.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -56,7 +56,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin )
++ SunOS | Linux | *BSD | Darwin )
+ PS=":"
+ FS="/"
+ ;;
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javah/MissingParamClassTest.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -58,7 +58,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | *BSD | Darwin | CYGWIN* )
+ PS=":"
+ FS="/"
+ ;;
+--- ./langtools/test/tools/javah/ReadOldClass.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javah/ReadOldClass.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -43,7 +43,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | *BSD | Darwin | CYGWIN* )
+ PS=":"
+ FS="/"
+ ;;
+--- ./langtools/test/tools/javap/pathsep.sh Thu Dec 18 14:10:51 2014 -0800
++++ ./langtools/test/tools/javap/pathsep.sh Sat Jan 24 12:35:01 2015 -0800
+@@ -40,7 +40,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux | Darwin | CYGWIN* )
++ SunOS | Linux | *BSD | Darwin | CYGWIN* )
+ FS="/"
+ ;;
+ Windows* )
diff --git a/java/openjdk7/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties b/java/openjdk7/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties
deleted file mode 100644
index 9769ccad42b0..000000000000
--- a/java/openjdk7/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties
+++ /dev/null
@@ -1,11 +0,0 @@
---- jdk/src/share/classes/java/util/CurrencyData.properties.orig 2013-09-06 18:28:15 UTC
-+++ jdk/src/share/classes/java/util/CurrencyData.properties
-@@ -532,7 +532,7 @@ TT=TTD
- # TUNISIA
- TN=TND
- # TURKEY
--TR=TRL;2004-12-31-22-00-00;TRY
-+TR=TRY
- # TURKMENISTAN
- TM=TMT
- # TURKS AND CAICOS ISLANDS
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set
deleted file mode 100644
index 6542a4431183..000000000000
--- a/java/openjdk7/files/patch-set
+++ /dev/null
@@ -1,136786 +0,0 @@
---- ./.hgtags 2013-09-06 11:20:33.000000000 -0700
-+++ ./.hgtags 2014-10-28 20:19:29.000000000 -0700
-@@ -123,6 +123,7 @@
- 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
- 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
- d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
-+00b623147f23ef8a92a25c4c28ef8681dc1d1b52 7u0
- 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
- bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
- f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
-@@ -300,6 +301,22 @@
- 84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09
- aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10
- 039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11
-+210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16
-+f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17
-+9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18
-+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
-+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
-+b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
-+f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
-+41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
-+3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
-+8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
-+5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24
-+f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
-+4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26
-+75167199239375d05b68668023c885c2776fd548 jdk7u40-b27
-+ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
-+dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
- 2d02518960053d2b1dcb9aabacd709788e92c549 jdk7u25-b12
- 37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13
- 9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14
-@@ -327,7 +344,7 @@
- ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
- dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
- 1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30
--58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31
-+e51f24701c608e57ba7ae69ba28bbc2daab02c4c jdk7u45-b01
- da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
- 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
- a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
-@@ -341,3 +358,146 @@
- 3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
- 1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
- dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
-+11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00
-+6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61
-+a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62
-+07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
-+23c983c352a170d7a5fb7d703081daf1816d257a jdk7u45-b03
-+1018a8ab686da6c1be22bec3ab9d01b2dc206333 jdk7u45-b04
-+22e0ca1fa645d0518b514159afafe34335699c11 jdk7u45-b05
-+61343f60f25a1d0deddc1468b2eb948df5275641 jdk7u45-b06
-+24088aaf3f6834e46b486b706fbc6ce1f18814e5 jdk7u45-b07
-+036425509e31070700a3956aaca7c33d583b7a5e jdk7u45-b08
-+b6af2c522a633de1c7b66204fac7104b410ce23c jdk7u45-b09
-+3fedb8c609a0f43bc8084edbecb0435e19dcb9a2 jdk7u45-b10
-+142403d9f1167b8559b49627c7199c84623307da jdk7u45-b11
-+a14018a5fa18092dcca5084656abb797bdb7b5ff jdk7u45-b12
-+4d38e9adeb81df9c24550070df1f358aa9c17477 jdk7u45-b13
-+bab0456ba0520f73ee20814ddf7ea0d596e49abd jdk7u45-b14
-+b4b2584649027b622c188db7a6c3f9cff0e20130 jdk7u45-b15
-+f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u45-b16
-+6fd67e0287a9893ea1f0090fe127f18a7e235148 jdk7u45-b17
-+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
-+dafd6c301c979ece6493dfb52e09e46bc81b7285 jdk7u51-b03
-+8bc2f477bba4ccecaf46a52877e429342ab9c5bc jdk7u51-b04
-+1604b330bf9629da5cac02af8582717dd431032e jdk7u51-b05
-+15c531ebb19c21a5b565ce887c790d3855b461ef jdk7u51-b06
-+75f0610e93bf6f51b3674fbbbe16f648ceb34d29 jdk7u51-b07
-+467fc49c32dd8e3dd940ad0e5934a65fc7fb60ec jdk7u51-b08
-+73ebe4e4f20e1d5db72c5cd673c65ffa09259982 jdk7u51-b09
-+9868efbea4290f4359a6a54d722f2cb79ef634a9 jdk7u51-b10
-+573c4cfca7dda548463bb84330bddfd07fe1183f jdk7u51-b11
-+df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u51-b12
-+6c778574d87336a2e55156544af92ce2de799696 jdk7u51-b13
-+d2eeac0235eda77d0a6c72c7235a6e96bc9ad4fb jdk7u51-b30
-+626e76f127a44ba0118a545d37410f80000db8fb jdk7u51-b31
-+472d67871307433bf3e2687c48237c48ffbf068e jdk7u51-b33
-+503f1d094a1bbbd94386f5c3342130dc5f4ba6ee jdk7u51-b34
-+df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u55-b00
-+15bc13cd7f5d0bb06ab59935e25944fa7cb15bc8 jdk7u55-b01
-+b829c5947c6cd473f42cadfe2c61399fb67c2da6 jdk7u55-b02
-+a72b902cdd39d9f2f2d353d5ad629e543cbc01ae jdk7u55-b03
-+6a8ee38075621564dd276e8ed7be576d637acf79 jdk7u55-b04
-+92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u65-b00
-+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
-+997ab3897d6ede80b0decdda94b569e57dd7dd90 jdk7u55-b14
-+744f7b17de89527bf639d5bff3533a9ce72dfa84 jdk7u55-b15
-+1f52edec29fd44c8bacce11ba7440287b37d04d1 jdk7u55-b31
-+5b15555172019b3c92484abff7c92f066e162d29 jdk7u55-b32
-+fa5ead8cb7d2de49cd138d93fb86fa5a10b07037 jdk7u55-b33
-+6041c68893932ee16a272a8d5a42069e217d888c jdk7u55-b34
-+8733fb47b3338e9285870b09eb326e758cf69771 jdk7u55-b35
-+b9c954604ecaaf8d8a1568ababd9508ff09b742e jdk7u55-b36
-+11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00
-+88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01
-+6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02
-+87f2193da40d3a2eedca95108ae78403c7bdcd49 jdk7u60-b03
-+d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u60-b04
-+ea798405286d97f643ef809abcb1e13024b4f951 jdk7u60-b05
-+b0940b205cab942512b5bca1338ab96a45a67832 jdk7u60-b06
-+cae7bacaa13bb8c42a42fa35b156a7660874e907 jdk7u60-b07
-+1af0560611469ad2a068a03774ecd0d7790db7b7 jdk7u60-b08
-+662dc3b6467488b8c175a4423ba7a4991ad87d94 jdk7u60-b09
-+023f8eb40d371d5cb761f7e60ba7b396b3fdf886 jdk7u60-b10
-+798468b91bcbb81684aea8620dbb31eaceb24c6c jdk7u60-b11
-+e40360c10b2ce5b24b1eea63160b78e112aa5d3f jdk7u60-b12
-+5e540a4d55916519f5604a422bfbb7a0967d0594 jdk7u60-b13
-+1ca6a368aec38ee91a41dc03899d7dc1037de44d jdk7u60-b14
-+a95b821a2627295b90fb4ae8f3b8bc2ff9c64acc jdk7u60-b15
-+19a3f6f48c541a8cf144eedffa0e52e108052e82 jdk7u60-b16
-+472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b17
-+472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b18
-+b9264ea7e0887d511318bf7b53d12f944760bbbb jdk7u65-b01
-+2a7a5e774023944f291ee27ca5b3ad89e0e62aaf jdk7u60-b19
-+ac5183999ba532c6b89f24fe01f6f0eb96799719 jdk7u60-b30
-+7e9c1a4c2d50e10ccc6d81b8dc0786e82128a676 jdk7u60-b31
-+f792c1446b57932f5cd661afa72bcf41cfe6d1a6 jdk7u60-b32
-+870408bbbfa50a6f44997a844c6c31c0cb0cbc40 jdk7u60-b33
-+3a683f1730a148bcc1ca6eb9137116db427093f6 jdk7u65-b02
-+c154a8de7d34128ab75f46a2b6a909796f63b6e3 jdk7u65-b03
-+62e22dbc36410d76716bfa5e9fd679fcb4b1d845 jdk7u65-b04
-+4cab26e4e27f8ff382b8d6487224af59dc7c1fa1 jdk7u65-b05
-+b2cd3babc4ca1fb48b6073665e627f8bfb65d547 jdk7u65-b06
-+bc5e69657c0f6d58775ac7441033bbcbbaee3268 jdk7u65-b07
-+48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u65-b08
-+2e7881991d5294061023f8862b702e4730f2860d jdk7u65-b09
-+db03cbff389500c7ccfd4b476ab78319f6e24d2d jdk7u65-b10
-+9f629f70ec6c4249baadaadd05b0f32c9129ad05 jdk7u65-b11
-+71cd7866ca68b333e36330e179ab1d69d721aaee jdk7u65-b12
-+49dbfea9d3a4b709f3230d581a09d960c2de5109 jdk7u65-b13
-+0cfadcb9f8006ac5601bb0ce8b74211d6b223c11 jdk7u65-b14
-+3cce3737be368dc3d304508cd0d6e354f8a19f55 jdk7u65-b15
-+2c8b05ed9802cf4e5f61439a6d6286e7f7cd444e jdk7u65-b16
-+927d8d3db13c5221237b51efe45206054ee6e3f3 jdk7u65-b17
-+b51ccd32894662064192857007ef41175d433901 jdk7u65-b30
-+fa242615607fa5f6cdd1ae93bc2fb9cc2100c179 jdk7u65-b18
-+64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b19
-+90f56be6f9d90f66e558c4e08084e2b169738fba jdk7u65-b32
-+b6da128e8a7957f139933a48580e201e938c4684 jdk7u65-b20
-+d6a1d32534d188e73f7962d40d21584c44e65acd jdk7u67-b01
-+64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b40
-+9dfdf107c6971cd30c7e1f656cddc6b8d495c290 jdk7u65-b31
-+fe700de0735dc4e8ce5a50971ad3ea3dc052d21d jdk7u65-b33
-+48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u66-b00
-+4fb9423d086d86d212257afd6fc79957f737af5b jdk7u66-b01
-+964663d4303723fbcb16cf05e857576c08c237ae jdk7u66-b09
-+6bf8128234ad7ffae0cfe53ba19202559743de97 jdk7u66-b10
-+0d8c4e40851835989386c1b1db4041b6f18b037e jdk7u66-b11
-+422f828e10beb3ca9e14b10774e624ec0c4fc84d jdk7u66-b12
-+236545aa997a99b397e73dc9b13353231f20ea1e jdk7u66-b13
-+d06bbfe19d6cefe62e359c2fd8bf9243a148a337 jdk7u66-b14
-+df30693e9a66897ba0dced205bbaefc57dca7704 jdk7u66-b15
-+6dc5eb9b70071b43cb0e287f30afd0348ae20ae1 jdk7u66-b16
-+4f4905b6d3e837c50654bc432956a4a100246d4e jdk7u66-b17
-+c779fbb7b87ec014a3371b0dd1e9317ba1280469 jdk7u71-b00
-+4f0a225f8d383d22a890575b1206f916277c0a07 jdk7u71-b01
-+94e1109f4cb79ba1c5369d93d0cdf300f1434a3a jdk7u71-b02
-+91df9e49ab7d35ee61f88eedd4289aa33163287d jdk7u71-b03
-+47c30fe92b9dad64f99d7aa72a2258bc3558f0a1 jdk7u71-b04
-+d534e7f2caadd145b30dfda8b913c9a5fdb62553 jdk7u71-b05
-+8821211202a58c0086e7cd57960a3f33e5c3d4a1 jdk7u71-b06
-+6955561791886ef36236799794e4be79d0a65007 jdk7u71-b07
-+fac69efbf4eb609e860c8c4a056dbe02b3679b87 jdk7u71-b08
-+ac4596f9cdeb084af75884825e04dbcf1fd3d407 jdk7u71-b09
-+38f4eee9c9387d3f683b86657fd6e3d4a90e5b0f jdk7u71-b10
-+e9663e434024cb6e011013e774445a056417bb3b jdk7u71-b11
-+78aa78b55b843697a630ed886962ab07d1b76358 jdk7u71-b12
-+9fc5aeb0e0a8c97b1cd263a55f3aeb030cbcdf89 jdk7u71-b13
---- ./Makefile 2013-09-06 11:20:33.000000000 -0700
-+++ ./Makefile 2014-07-15 21:45:52.000000000 -0700
-@@ -264,7 +264,7 @@
- DEBUG_NAME=$(DEBUG_NAME) \
- GENERATE_DOCS=false \
- $(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \
-- CREATE_DEBUGINFO_BUNDLES=false \
-+ CREATE_DEBUGINFO_BUNDLES=true \
- $(BOOT_CYCLE_DEBUG_SETTINGS) \
- generic_build_repo_series
-
---- ./corba/.hgtags 2013-09-06 11:20:46.000000000 -0700
-+++ ./corba/.hgtags 2014-10-28 20:19:30.000000000 -0700
-@@ -123,6 +123,7 @@
- 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
- 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
- 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
-+578c4d2c534cc761f5f5cc0d8360471bb8d5f94f 7u0
- 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
- dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
- eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
-@@ -302,6 +303,22 @@
- 161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09
- c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10
- 109386df5b8e259d0af802217769a3c448404e49 jdk7u25-b11
-+38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16
-+8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17
-+862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18
-+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
-+bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
-+a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
-+54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
-+fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
-+e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
-+d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
-+d3ab3b19caa02ee85359cfe07b6e0b74eb7b3d74 jdk7u40-b24
-+abfc54516d0b7f9aed34ef175f6bbb93fda4cbb3 jdk7u40-b25
-+be9099c54a35c00d0dfe6beeed8ea5d4ab3cd3fe jdk7u40-b26
-+f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27
-+c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
-+1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
- ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12
- eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
- 577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
-@@ -343,3 +360,146 @@
- b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
- e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
- 08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
-+504acad3372298a79c231696d805f00f3beb2362 jdk7u40-b61
-+c9c225fb19c3aa6e1242c051833ecc69d00b7aa1 jdk7u40-b62
-+4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01
-+1a1a1dedf437c50797a49c21a12161a79c761757 jdk7u45-b02
-+3a2cca8c2f209b533af6c1201cc8aee43628e578 jdk7u45-b03
-+4f4f7869bd6585042ad9596426dd1aa0829b8e98 jdk7u45-b04
-+faee62d13040eae3d081f0383843a391ceef1edd jdk7u45-b05
-+435dd0e1ab9ec9cbc83dc5ed260886f6becbef25 jdk7u45-b06
-+2e19615f6045c3f39e39c56c485f7bc1df97e2ce jdk7u45-b07
-+771c5c869d16d2da5668e412f505ad75f8f610c1 jdk7u45-b08
-+a89d69bef3614f618843f5e9a495b12d13597851 jdk7u45-b09
-+fd8a2041b75c4f712f2b08d627388d44a0cf2ee7 jdk7u45-b10
-+55e0d3d9514343f380336b68aa8691a89b2e710b jdk7u45-b11
-+336566c2905a49fc9a6f90f5ecd30517cfcaefff jdk7u45-b12
-+6cadc3dd82a423f6c24460bb1997c0f39159dd93 jdk7u45-b13
-+43e22471d0c29451f282b162864c2d3e494d5871 jdk7u45-b14
-+3d7a52de59f03589d7a9334a6895063ff3331bfc jdk7u45-b15
-+b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u45-b16
-+8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
-+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
-+3c186a6d2b86ec4c6cfb093969d5f4e4a6ef6a98 jdk7u51-b03
-+6969598640b2a4731634669eb1402a6af5772b44 jdk7u51-b04
-+b18c17608d944028724858e1f768fb0a59dc8220 jdk7u51-b05
-+863d69d3dee00e7958ed1014e7600cc08f2655e7 jdk7u51-b06
-+3f6dfcad33acb0251c60facb6b5e8dbff41a4114 jdk7u51-b07
-+00c7d4007a2f22deb05753bbd2d36f0ce43ac786 jdk7u51-b08
-+bb45667f58f57f96c00551db26ab281bd101e892 jdk7u51-b09
-+eecfc296009b81934a329e7ce42a53484093f611 jdk7u51-b10
-+a26d0e8ab1027e70ae1ded8ede0086a0a4a10256 jdk7u51-b11
-+55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u51-b12
-+e2f0036f712aa636cfd55334ac21ea7ca2587a7b jdk7u51-b13
-+6563d12c48c92af39a27ca46b4515fad8e994667 jdk7u51-b30
-+0ad990211737fe1b1e2737a3498ab266146d2c53 jdk7u51-b31
-+ee7d9f5d18fb67564e88a10f1bd682660db60aa2 jdk7u51-b33
-+65ef96a075a43e9201866d1c9b8ee3138ebcc424 jdk7u51-b34
-+55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u55-b00
-+aabfdc799c0799837dcbbf9ea8d6df1511978b1f jdk7u55-b01
-+db2e6d87bade9d2061646ff9a6b39b5159fba0ec jdk7u55-b02
-+02ff18f156bd3382fe22e4758b138370f5238e97 jdk7u55-b03
-+6a88a170331fb38af5046e54bf75f38176af5c41 jdk7u55-b04
-+a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u65-b00
-+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
-+a0bfd0e80ae0ae6e3a29bf527b5911c83163b3f5 jdk7u55-b14
-+ae8120f628c237b18fa5c2610898659b49a60075 jdk7u55-b15
-+55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31
-+fba15e177b15873e3c63b0efc7c0f5647a243a79 jdk7u55-b32
-+6503115cbedda9216083fc1798e2fa5a2775f68a jdk7u55-b33
-+c8614d56bc1c5c60431f938a0c33d8fc42e7aef0 jdk7u55-b34
-+be587f9142bcb694b647642fbbb05dbaa7b1b1b3 jdk7u55-b35
-+05ea23fd127a217965eb304932e8c0ce5933f04b jdk7u55-b36
-+c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00
-+a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01
-+d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02
-+d7e98ed925a3885380226f8375fe109a9a25397f jdk7u60-b03
-+1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u60-b04
-+753698a910167cc29c01490648a2adbcea1314cc jdk7u60-b05
-+9852efe6d6b992b73fdbf59e36fb3547a9535051 jdk7u60-b06
-+84a18429f247774fc7f1bc81de271da20b40845b jdk7u60-b07
-+8469bc00ddca4de366b20b32d42548c882656cd8 jdk7u60-b08
-+7abca119f9543489280d560dc11256d439004f0f jdk7u60-b09
-+1861f1f599728c4f15a85a5980edef916552747b jdk7u60-b10
-+a429ff635395688ded6c52cd21c0b4ce75e62168 jdk7u60-b11
-+d581875525aaf618afe901da31d679195ee35f4b jdk7u60-b12
-+2c8ba5f9487b0ac085874afd38f4c10a4127f62c jdk7u60-b13
-+02bdeb33754315f589bd650dde656d2c9947976d jdk7u60-b14
-+e5946b2cf82bdea3a4b85917e903168e65a543a7 jdk7u60-b15
-+e424fb8452851b56db202488a4e9a283934c4887 jdk7u60-b16
-+b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17
-+b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18
-+550ae238459e0f59d9a85d183bc2b4520adac05b jdk7u65-b01
-+5d1b39fe68944cff6380db56fbe2fbaa28091bf6 jdk7u60-b19
-+39734d26e279098fae06cee5a127e126090ddec9 jdk7u60-b30
-+8939f268abb8c153de653f2659fff6716e5f83f8 jdk7u60-b31
-+9665790000e22370daefddbf56dd81e89e07b7c4 jdk7u60-b32
-+437b4b2aed4811af16efcafca7995684493d205b jdk7u60-b33
-+6a89d959cbade46fcd281f421ac40a804d098f0b jdk7u65-b02
-+afed3d62e8051fe65f431abe87dad50cbeba3800 jdk7u65-b03
-+38fabf72970ae509350f57ffad99f6ac8fc6fdad jdk7u65-b04
-+12c1621ce88defa65ebc1bdffb7141bd7d0089a6 jdk7u65-b05
-+5041c713522c0fc68239fc91f7fb9498dd7edebb jdk7u65-b06
-+144887a766dc17a139524dd43f1a0bc8f2a2a3a2 jdk7u65-b07
-+5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u65-b08
-+1f7156e0a46129dbaf5b248802371564d92630a3 jdk7u65-b09
-+be3cbbea3ec1e14b6492acbbd5c08222c24a5061 jdk7u65-b10
-+fd7e4972cfefa174ce3d6dcb7f4b409df11a745b jdk7u65-b11
-+792ef0370bf7bcf83c9404d2b44f08722dcd73aa jdk7u65-b12
-+b95f46ae5207853a89d52b0453a2fb99fffee817 jdk7u65-b13
-+6efadedfe3295dbf2af4a350d813524af029b116 jdk7u65-b14
-+78966cf34d868ef18b8a3fa7edec368e1cc4739d jdk7u65-b15
-+d765ed30bd5ed2bdd71fda56c056333e1b4b0d7d jdk7u65-b16
-+cd642d59aca29ff2b56e7ed016be758828f199cd jdk7u65-b17
-+8740dc71b1ceb49c76470b46205c28c1302e864d jdk7u65-b30
-+b7f66b9f9e8e099428ed7640a184f6135b77e40d jdk7u65-b18
-+50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b19
-+dae3f20d2306622e39606d0dc967147de174afce jdk7u65-b32
-+ac05dfedf008e83c2044666a70635cf82e932e41 jdk7u65-b20
-+244756837ab4b214decd0e6f26b0071a483f143f jdk7u67-b01
-+50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b40
-+d2f7358b01d3d8b877b2ec2ca2989bd1daf17472 jdk7u65-b31
-+2067d7202adcedb80fa676dacb22a0b73d5e8548 jdk7u65-b33
-+5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u66-b00
-+9f0f0bdd4cfb01a5d64f9528b7ffda3974171120 jdk7u66-b01
-+596d979a5d4deb9d10b068479276cd4b2a12432e jdk7u66-b09
-+fec514d46b860920690707e9d0538ad76ca3f886 jdk7u66-b10
-+09655f16930ece8e7a8342f335726fe9ea327812 jdk7u66-b11
-+dca36b02c6e10fa303023a62f51ea4bf0497ae94 jdk7u66-b12
-+d0d039a1eca081bc05e833dfc027df1aa1bd018a jdk7u66-b13
-+1e46e65dd58db00180f1ccaaae93ae7946b22d29 jdk7u66-b14
-+f2c867d52b393e661216057f0b559ef3fd122530 jdk7u66-b15
-+3039f266eef2ba54ec2869d87adac6e395c82fe9 jdk7u66-b16
-+0b46b93a61966e8d2332f1d3899d7c858a653d91 jdk7u66-b17
-+fd1c9030a08d513b5a477f82a46855bb6a9cacac jdk7u71-b00
-+50e4090a8583a88875ab7323fc2e5b6ba2f1de7f jdk7u71-b01
-+5bd7482913f6a498c2b2b6c80478b2af93dee805 jdk7u71-b02
-+557d335eb4a358ffe7a8114685f11831da5d4510 jdk7u71-b03
-+ccf59458d69f7fd0d6b119ee1ef16a2b131f84b8 jdk7u71-b04
-+92d099fedc269d61dd10bba0f79a224c1bf40c25 jdk7u71-b05
-+19de752151f6abfb477c72a92e59993a6c3c3f99 jdk7u71-b06
-+36d628e53ebf7f6251395e6eb409239b473a7f16 jdk7u71-b07
-+2fdf855f6d9fe27bcf102e64c120375f331ee75d jdk7u71-b08
-+1655475001d914bc105959d94c24e0671591e845 jdk7u71-b09
-+9508dd229246b82201fb7075ebfe2c913f89a196 jdk7u71-b10
-+3e804dc3cea9ff145f375a50a161f3e173e8d3f6 jdk7u71-b11
-+cc3072067ae8ac685d400ced4c0f144d6a1d9f1e jdk7u71-b12
-+1616089899e25679d6cf70c77023f2a37ff85ad1 jdk7u71-b13
---- ./corba/make/Makefile 2013-09-06 11:20:46.000000000 -0700
-+++ ./corba/make/Makefile 2014-07-15 21:45:53.000000000 -0700
-@@ -160,7 +160,7 @@
- #
- # CORBA
- #
--SUBDIRS = tools javax org sun com
-+SUBDIRS = tools sun/rmi javax org sun com
-
- build:
- $(SUBDIRS-loop)
---- ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaInputStream.sjava 2013-09-06 11:20:47.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaInputStream.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,528 +0,0 @@
--/*
-- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--package com.sun.corba.se.impl.encoding;
--
--import java.io.IOException;
--import java.io.Serializable;
--import java.math.BigDecimal;
--import java.nio.ByteBuffer;
--
--import org.omg.CORBA.TypeCode;
--import org.omg.CORBA.Principal;
--import org.omg.CORBA.Any;
--
--import com.sun.org.omg.SendingContext.CodeBase;
--
--import com.sun.corba.se.pept.protocol.MessageMediator;
--
--import com.sun.corba.se.spi.logging.CORBALogDomains;
--import com.sun.corba.se.spi.orb.ORB;
--import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
--import com.sun.corba.se.spi.protocol.CorbaMessageMediator;
--
--import com.sun.corba.se.impl.logging.ORBUtilSystemException;
--import com.sun.corba.se.impl.encoding.CodeSetConversion;
--import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry;
--
--/**
-- * This is delegates to the real implementation.
-- *
-- * NOTE:
-- *
-- * Before using the stream for valuetype unmarshaling, one must call
-- * performORBVersionSpecificInit().
-- */
--public abstract class CDRInputStream
-- extends org.omg.CORBA_2_3.portable.InputStream
-- implements com.sun.corba.se.impl.encoding.MarshalInputStream,
-- org.omg.CORBA.DataInputStream, org.omg.CORBA.portable.ValueInputStream
--{
-- protected CorbaMessageMediator messageMediator;
-- private CDRInputStreamBase impl;
--
-- // We can move this out somewhere later. For now, it serves its purpose
-- // to create a concrete CDR delegate based on the GIOP version.
-- private static class InputStreamFactory {
--
-- public static CDRInputStreamBase newInputStream(ORB orb, GIOPVersion version)
-- {
-- switch(version.intValue()) {
-- case GIOPVersion.VERSION_1_0:
-- return new CDRInputStream_1_0();
-- case GIOPVersion.VERSION_1_1:
-- return new CDRInputStream_1_1();
-- case GIOPVersion.VERSION_1_2:
-- return new CDRInputStream_1_2();
-- default:
-- ORBUtilSystemException wrapper = ORBUtilSystemException.get( orb,
-- CORBALogDomains.RPC_ENCODING ) ;
-- throw wrapper.unsupportedGiopVersion( version ) ;
-- }
-- }
-- }
--
-- // Required for the case when a ClientResponseImpl is
-- // created with a SystemException due to a dead server/closed
-- // connection with no warning. Note that the stream will
-- // not be initialized in this case.
-- //
-- // Probably also required by ServerRequestImpl.
-- //
-- // REVISIT.
-- public CDRInputStream() {
-- }
--
-- public CDRInputStream(CDRInputStream is) {
-- impl = is.impl.dup();
-- impl.setParent(this);
-- }
--
-- public CDRInputStream(org.omg.CORBA.ORB orb,
-- ByteBuffer byteBuffer,
-- int size,
-- boolean littleEndian,
-- GIOPVersion version,
-- BufferManagerRead bufMgr)
-- {
-- impl = InputStreamFactory.newInputStream( (ORB)orb, version);
--
-- impl.init(orb, byteBuffer, size, littleEndian, bufMgr);
--
-- impl.setParent(this);
-- }
--
-- // org.omg.CORBA.portable.InputStream
-- public final boolean read_boolean() {
-- return impl.read_boolean();
-- }
--
-- public final char read_char() {
-- return impl.read_char();
-- }
--
-- public final char read_wchar() {
-- return impl.read_wchar();
-- }
--
-- public final byte read_octet() {
-- return impl.read_octet();
-- }
--
-- public final short read_short() {
-- return impl.read_short();
-- }
--
-- public final short read_ushort() {
-- return impl.read_ushort();
-- }
--
-- public final int read_long() {
-- return impl.read_long();
-- }
--
-- public final int read_ulong() {
-- return impl.read_ulong();
-- }
--
-- public final long read_longlong() {
-- return impl.read_longlong();
-- }
--
-- public final long read_ulonglong() {
-- return impl.read_ulonglong();
-- }
--
-- public final float read_float() {
-- return impl.read_float();
-- }
--
-- public final double read_double() {
-- return impl.read_double();
-- }
--
-- public final String read_string() {
-- return impl.read_string();
-- }
--
-- public final String read_wstring() {
-- return impl.read_wstring();
-- }
--
-- public final void read_boolean_array(boolean[] value, int offset, int length) {
-- impl.read_boolean_array(value, offset, length);
-- }
--
-- public final void read_char_array(char[] value, int offset, int length) {
-- impl.read_char_array(value, offset, length);
-- }
--
-- public final void read_wchar_array(char[] value, int offset, int length) {
-- impl.read_wchar_array(value, offset, length);
-- }
--
-- public final void read_octet_array(byte[] value, int offset, int length) {
-- impl.read_octet_array(value, offset, length);
-- }
--
-- public final void read_short_array(short[] value, int offset, int length) {
-- impl.read_short_array(value, offset, length);
-- }
--
-- public final void read_ushort_array(short[] value, int offset, int length) {
-- impl.read_ushort_array(value, offset, length);
-- }
--
-- public final void read_long_array(int[] value, int offset, int length) {
-- impl.read_long_array(value, offset, length);
-- }
--
-- public final void read_ulong_array(int[] value, int offset, int length) {
-- impl.read_ulong_array(value, offset, length);
-- }
--
-- public final void read_longlong_array(long[] value, int offset, int length) {
-- impl.read_longlong_array(value, offset, length);
-- }
--
-- public final void read_ulonglong_array(long[] value, int offset, int length) {
-- impl.read_ulonglong_array(value, offset, length);
-- }
--
-- public final void read_float_array(float[] value, int offset, int length) {
-- impl.read_float_array(value, offset, length);
-- }
--
-- public final void read_double_array(double[] value, int offset, int length) {
-- impl.read_double_array(value, offset, length);
-- }
--
-- public final org.omg.CORBA.Object read_Object() {
-- return impl.read_Object();
-- }
--
-- public final TypeCode read_TypeCode() {
-- return impl.read_TypeCode();
-- }
-- public final Any read_any() {
-- return impl.read_any();
-- }
--
-- public final Principal read_Principal() {
-- return impl.read_Principal();
-- }
--
-- public final int read() throws java.io.IOException {
-- return impl.read();
-- }
--
-- public final java.math.BigDecimal read_fixed() {
-- return impl.read_fixed();
-- }
--
-- public final org.omg.CORBA.Context read_Context() {
-- return impl.read_Context();
-- }
--
-- public final org.omg.CORBA.Object read_Object(java.lang.Class clz) {
-- return impl.read_Object(clz);
-- }
--
-- public final org.omg.CORBA.ORB orb() {
-- return impl.orb();
-- }
--
-- // org.omg.CORBA_2_3.portable.InputStream
-- public final java.io.Serializable read_value() {
-- return impl.read_value();
-- }
--
-- public final java.io.Serializable read_value(java.lang.Class clz) {
-- return impl.read_value(clz);
-- }
--
-- public final java.io.Serializable read_value(org.omg.CORBA.portable.BoxedValueHelper factory) {
-- return impl.read_value(factory);
-- }
--
-- public final java.io.Serializable read_value(java.lang.String rep_id) {
-- return impl.read_value(rep_id);
-- }
--
-- public final java.io.Serializable read_value(java.io.Serializable value) {
-- return impl.read_value(value);
-- }
--
-- public final java.lang.Object read_abstract_interface() {
-- return impl.read_abstract_interface();
-- }
--
-- public final java.lang.Object read_abstract_interface(java.lang.Class clz) {
-- return impl.read_abstract_interface(clz);
-- }
-- // com.sun.corba.se.impl.encoding.MarshalInputStream
--
-- public final void consumeEndian() {
-- impl.consumeEndian();
-- }
--
-- public final int getPosition() {
-- return impl.getPosition();
-- }
--
-- // org.omg.CORBA.DataInputStream
--
-- public final java.lang.Object read_Abstract () {
-- return impl.read_Abstract();
-- }
--
-- public final java.io.Serializable read_Value () {
-- return impl.read_Value();
-- }
--
-- public final void read_any_array (org.omg.CORBA.AnySeqHolder seq, int offset, int length) {
-- impl.read_any_array(seq, offset, length);
-- }
--
-- public final void read_boolean_array (org.omg.CORBA.BooleanSeqHolder seq, int offset, int length) {
-- impl.read_boolean_array(seq, offset, length);
-- }
--
-- public final void read_char_array (org.omg.CORBA.CharSeqHolder seq, int offset, int length) {
-- impl.read_char_array(seq, offset, length);
-- }
--
-- public final void read_wchar_array (org.omg.CORBA.WCharSeqHolder seq, int offset, int length) {
-- impl.read_wchar_array(seq, offset, length);
-- }
--
-- public final void read_octet_array (org.omg.CORBA.OctetSeqHolder seq, int offset, int length) {
-- impl.read_octet_array(seq, offset, length);
-- }
--
-- public final void read_short_array (org.omg.CORBA.ShortSeqHolder seq, int offset, int length) {
-- impl.read_short_array(seq, offset, length);
-- }
--
-- public final void read_ushort_array (org.omg.CORBA.UShortSeqHolder seq, int offset, int length) {
-- impl.read_ushort_array(seq, offset, length);
-- }
--
-- public final void read_long_array (org.omg.CORBA.LongSeqHolder seq, int offset, int length) {
-- impl.read_long_array(seq, offset, length);
-- }
--
-- public final void read_ulong_array (org.omg.CORBA.ULongSeqHolder seq, int offset, int length) {
-- impl.read_ulong_array(seq, offset, length);
-- }
--
-- public final void read_ulonglong_array (org.omg.CORBA.ULongLongSeqHolder seq, int offset, int length) {
-- impl.read_ulonglong_array(seq, offset, length);
-- }
--
-- public final void read_longlong_array (org.omg.CORBA.LongLongSeqHolder seq, int offset, int length) {
-- impl.read_longlong_array(seq, offset, length);
-- }
--
-- public final void read_float_array (org.omg.CORBA.FloatSeqHolder seq, int offset, int length) {
-- impl.read_float_array(seq, offset, length);
-- }
--
-- public final void read_double_array (org.omg.CORBA.DoubleSeqHolder seq, int offset, int length) {
-- impl.read_double_array(seq, offset, length);
-- }
--
-- // org.omg.CORBA.portable.ValueBase
-- public final String[] _truncatable_ids() {
-- return impl._truncatable_ids();
-- }
--
-- // java.io.InputStream
-- public final int read(byte b[]) throws IOException {
-- return impl.read(b);
-- }
--
-- public final int read(byte b[], int off, int len) throws IOException {
-- return impl.read(b, off, len);
-- }
--
-- public final long skip(long n) throws IOException {
-- return impl.skip(n);
-- }
--
-- public final int available() throws IOException {
-- return impl.available();
-- }
--
-- public final void close() throws IOException {
-- impl.close();
-- }
--
-- public final void mark(int readlimit) {
-- impl.mark(readlimit);
-- }
--
-- public final void reset() {
-- impl.reset();
-- }
--
-- public final boolean markSupported() {
-- return impl.markSupported();
-- }
--
-- public abstract CDRInputStream dup();
--
-- // Needed by TCUtility
-- public final java.math.BigDecimal read_fixed(short digits, short scale) {
-- return impl.read_fixed(digits, scale);
-- }
--
-- public final boolean isLittleEndian() {
-- return impl.isLittleEndian();
-- }
--
-- protected final ByteBuffer getByteBuffer() {
-- return impl.getByteBuffer();
-- }
--
-- protected final void setByteBuffer(ByteBuffer byteBuffer) {
-- impl.setByteBuffer(byteBuffer);
-- }
--
-- protected final void setByteBufferWithInfo(ByteBufferWithInfo bbwi) {
-- impl.setByteBufferWithInfo(bbwi);
-- }
--
-- public final int getBufferLength() {
-- return impl.getBufferLength();
-- }
--
-- protected final void setBufferLength(int value) {
-- impl.setBufferLength(value);
-- }
--
-- protected final int getIndex() {
-- return impl.getIndex();
-- }
--
-- protected final void setIndex(int value) {
-- impl.setIndex(value);
-- }
--
-- public final void orb(org.omg.CORBA.ORB orb) {
-- impl.orb(orb);
-- }
--
-- public final GIOPVersion getGIOPVersion() {
-- return impl.getGIOPVersion();
-- }
--
-- public final BufferManagerRead getBufferManager() {
-- return impl.getBufferManager();
-- }
--
-- // This should be overridden by any stream (ex: IIOPInputStream)
-- // which wants to read values. Thus, TypeCodeInputStream doesn't
-- // have to do this.
-- public CodeBase getCodeBase() {
-- return null;
-- }
--
-- // Use Latin-1 for GIOP 1.0 or when code set negotiation was not
-- // performed.
-- protected CodeSetConversion.BTCConverter createCharBTCConverter() {
-- return CodeSetConversion.impl().getBTCConverter(OSFCodeSetRegistry.ISO_8859_1,
-- impl.isLittleEndian());
-- }
--
-- // Subclasses must decide what to do here. It's inconvenient to
-- // make the class and this method abstract because of dup().
-- protected abstract CodeSetConversion.BTCConverter createWCharBTCConverter();
--
-- // Prints the current buffer in a human readable form
-- void printBuffer() {
-- impl.printBuffer();
-- }
--
-- /**
-- * Aligns the current position on the given octet boundary
-- * if there are enough bytes available to do so. Otherwise,
-- * it just returns. This is used for some (but not all)
-- * GIOP 1.2 message headers.
-- */
-- public void alignOnBoundary(int octetBoundary) {
-- impl.alignOnBoundary(octetBoundary);
-- }
--
-- // Needed by request and reply messages for GIOP versions >= 1.2 only.
-- public void setHeaderPadding(boolean headerPadding) {
-- impl.setHeaderPadding(headerPadding);
-- }
--
-- /**
-- * This must be called after determining the proper ORB version,
-- * and setting it on the stream's ORB instance. It can be called
-- * after reading the service contexts, since that is the only place
-- * we can get the ORB version info.
-- *
-- * Trying to unmarshal things requiring repository IDs before calling
-- * this will result in NullPtrExceptions.
-- */
-- public void performORBVersionSpecificInit() {
-- // In the case of SystemExceptions, a stream is created
-- // with its default constructor (and thus no impl is set).
-- if (impl != null)
-- impl.performORBVersionSpecificInit();
-- }
--
-- /**
-- * Resets any internal references to code set converters.
-- * This is useful for forcing the CDR stream to reacquire
-- * converters (probably from its subclasses) when state
-- * has changed.
-- */
-- public void resetCodeSetConverters() {
-- impl.resetCodeSetConverters();
-- }
--
-- public void setMessageMediator(MessageMediator messageMediator)
-- {
-- this.messageMediator = (CorbaMessageMediator) messageMediator;
-- }
--
-- public MessageMediator getMessageMediator()
-- {
-- return messageMediator;
-- }
--
-- // ValueInputStream -----------------------------
--
-- public void start_value() {
-- impl.start_value();
-- }
--
-- public void end_value() {
-- impl.end_value();
-- }
--}
---- ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaOutputStream.sjava 2013-09-06 11:20:47.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaOutputStream.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,435 +0,0 @@
--/*
-- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--package com.sun.corba.se.impl.encoding;
--
--import java.io.IOException;
--import java.io.Serializable;
--import java.math.BigDecimal;
--import java.nio.ByteBuffer;
--
--import org.omg.CORBA.TypeCode;
--import org.omg.CORBA.Principal;
--import org.omg.CORBA.Any;
--
--import com.sun.corba.se.pept.protocol.MessageMediator;
--
--import com.sun.corba.se.spi.orb.ORB;
--import com.sun.corba.se.spi.logging.CORBALogDomains;
--import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
--import com.sun.corba.se.spi.protocol.CorbaMessageMediator;
--
--import com.sun.corba.se.impl.encoding.CodeSetConversion;
--import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry;
--import com.sun.corba.se.impl.orbutil.ORBConstants;
--import com.sun.corba.se.impl.logging.ORBUtilSystemException;
--
--/**
-- * This is delegates to the real implementation.
-- */
--public abstract class CDROutputStream
-- extends org.omg.CORBA_2_3.portable.OutputStream
-- implements com.sun.corba.se.impl.encoding.MarshalOutputStream,
-- org.omg.CORBA.DataOutputStream, org.omg.CORBA.portable.ValueOutputStream
--{
--/*
-- private CDROutputStreamBase impl;
-- protected ORB orb ;
-- protected ORBUtilSystemException wrapper ;
-- protected CorbaMessageMediator corbaMessageMediator;
--
--
-- // We can move this out somewhere later. For now, it serves its purpose
-- // to create a concrete CDR delegate based on the GIOP version.
-- private static class OutputStreamFactory {
--
-- public static CDROutputStreamBase newOutputStream(ORB orb, GIOPVersion version)
-- {
-- switch(version.intValue()) {
-- case GIOPVersion.VERSION_1_0:
-- return new CDROutputStream_1_0();
-- case GIOPVersion.VERSION_1_1:
-- return new CDROutputStream_1_1();
-- case GIOPVersion.VERSION_1_2:
-- return new CDROutputStream_1_2();
-- default:
-- ORBUtilSystemException wrapper = ORBUtilSystemException.get( orb,
-- CORBALogDomains.RPC_ENCODING ) ;
-- // REVISIT - what is appropriate? INTERNAL exceptions
-- // are really hard to track later.
-- throw wrapper.unsupportedGiopVersion( version ) ;
-- }
-- }
-- }
--
-- // REVISIT - These two constructors should be re-factored to better hide
-- // the fact that someone extending this class 'can' construct a CDROutputStream
-- // that does not use pooled ByteBuffers. Right now, only EncapsOutputStream
-- // does _not_ use pooled ByteBuffers, see EncapsOutputStream.
--
-- // NOTE: When a stream is constructed for non-channel-backed sockets
-- // it notifies the constructor not to use pooled (i.e, direct)
-- // ByteBuffers.
--
-- public CDROutputStream(ORB orb,
-- GIOPVersion version,
-- boolean littleEndian,
-- BufferManagerWrite bufferManager,
-- byte streamFormatVersion,
-- boolean usePooledByteBuffers)
-- {
-- impl = OutputStreamFactory.newOutputStream(orb, version);
-- impl.init(orb, littleEndian, bufferManager, streamFormatVersion, usePooledByteBuffers);
--
-- impl.setParent(this);
-- this.orb = orb ;
-- this.wrapper = ORBUtilSystemException.get( orb,
-- CORBALogDomains.RPC_ENCODING ) ;
-- }
--
-- public CDROutputStream(ORB orb,
-- GIOPVersion version,
-- boolean littleEndian,
-- BufferManagerWrite bufferManager,
-- byte streamFormatVersion)
-- {
-- this(orb, version, littleEndian, bufferManager, streamFormatVersion, true);
-- }
--*/
--
-- private ByteArrayOutputStream bos ;
-- private ObjectOutputStream oos ;
--
-- public JavaOutputStream()
-- {
-- bos = new ByteArrayOutputStream() ;
-- oos = new ObjectOutputStream( bos ) ;
-- }
--
-- // Provided by IIOPOutputStream and EncapsOutputStream
-- public org.omg.CORBA.portable.InputStream create_input_stream()
-- {
-- ObjectInputStream ois = new ByteArrayInputStream( bos.toByteArray() ) ;
--
-- return new JavaInputStream( ois ) ;
-- }
--
-- public final void write_boolean(boolean value) {
-- impl.write_boolean(value);
-- }
-- public final void write_char(char value) {
-- impl.write_char(value);
-- }
-- public final void write_wchar(char value) {
-- impl.write_wchar(value);
-- }
-- public final void write_octet(byte value) {
-- impl.write_octet(value);
-- }
-- public final void write_short(short value) {
-- impl.write_short(value);
-- }
-- public final void write_ushort(short value) {
-- impl.write_ushort(value);
-- }
-- public final void write_long(int value) {
-- impl.write_long(value);
-- }
-- public final void write_ulong(int value) {
-- impl.write_ulong(value);
-- }
-- public final void write_longlong(long value) {
-- impl.write_longlong(value);
-- }
-- public final void write_ulonglong(long value) {
-- impl.write_ulonglong(value);
-- }
-- public final void write_float(float value) {
-- impl.write_float(value);
-- }
-- public final void write_double(double value) {
-- impl.write_double(value);
-- }
-- public final void write_string(String value) {
-- impl.write_string(value);
-- }
-- public final void write_wstring(String value) {
-- impl.write_wstring(value);
-- }
--
-- public final void write_boolean_array(boolean[] value, int offset, int length) {
-- impl.write_boolean_array(value, offset, length);
-- }
-- public final void write_char_array(char[] value, int offset, int length) {
-- impl.write_char_array(value, offset, length);
-- }
-- public final void write_wchar_array(char[] value, int offset, int length) {
-- impl.write_wchar_array(value, offset, length);
-- }
-- public final void write_octet_array(byte[] value, int offset, int length) {
-- impl.write_octet_array(value, offset, length);
-- }
-- public final void write_short_array(short[] value, int offset, int length) {
-- impl.write_short_array(value, offset, length);
-- }
-- public final void write_ushort_array(short[] value, int offset, int length){
-- impl.write_ushort_array(value, offset, length);
-- }
-- public final void write_long_array(int[] value, int offset, int length) {
-- impl.write_long_array(value, offset, length);
-- }
-- public final void write_ulong_array(int[] value, int offset, int length) {
-- impl.write_ulong_array(value, offset, length);
-- }
-- public final void write_longlong_array(long[] value, int offset, int length) {
-- impl.write_longlong_array(value, offset, length);
-- }
-- public final void write_ulonglong_array(long[] value, int offset,int length) {
-- impl.write_ulonglong_array(value, offset, length);
-- }
-- public final void write_float_array(float[] value, int offset, int length) {
-- impl.write_float_array(value, offset, length);
-- }
-- public final void write_double_array(double[] value, int offset, int length) {
-- impl.write_double_array(value, offset, length);
-- }
-- public final void write_Object(org.omg.CORBA.Object value) {
-- impl.write_Object(value);
-- }
-- public final void write_TypeCode(TypeCode value) {
-- impl.write_TypeCode(value);
-- }
-- public final void write_any(Any value) {
-- impl.write_any(value);
-- }
--
-- public final void write_Principal(Principal value) {
-- impl.write_Principal(value);
-- }
--
-- public final void write(int b) throws java.io.IOException {
-- impl.write(b);
-- }
--
-- public final void write_fixed(java.math.BigDecimal value) {
-- impl.write_fixed(value);
-- }
--
-- public final void write_Context(org.omg.CORBA.Context ctx,
-- org.omg.CORBA.ContextList contexts) {
-- impl.write_Context(ctx, contexts);
-- }
--
-- public final org.omg.CORBA.ORB orb() {
-- return impl.orb();
-- }
--
-- // org.omg.CORBA_2_3.portable.OutputStream
-- public final void write_value(java.io.Serializable value) {
-- impl.write_value(value);
-- }
--
-- public final void write_value(java.io.Serializable value, java.lang.Class clz) {
-- impl.write_value(value, clz);
-- }
--
-- public final void write_value(java.io.Serializable value, String repository_id) {
-- impl.write_value(value, repository_id);
-- }
--
-- public final void write_value(java.io.Serializable value,
-- org.omg.CORBA.portable.BoxedValueHelper factory) {
-- impl.write_value(value, factory);
-- }
--
-- public final void write_abstract_interface(java.lang.Object obj) {
-- impl.write_abstract_interface(obj);
-- }
--
-- // java.io.OutputStream
-- public final void write(byte b[]) throws IOException {
-- impl.write(b);
-- }
--
-- public final void write(byte b[], int off, int len) throws IOException {
-- impl.write(b, off, len);
-- }
--
-- public final void flush() throws IOException {
-- impl.flush();
-- }
--
-- public final void close() throws IOException {
-- impl.close();
-- }
--
-- // com.sun.corba.se.impl.encoding.MarshalOutputStream
-- public final void start_block() {
-- impl.start_block();
-- }
--
-- public final void end_block() {
-- impl.end_block();
-- }
--
-- public final void putEndian() {
-- impl.putEndian();
-- }
--
-- public void writeTo(java.io.OutputStream s)
-- throws IOException
-- {
-- impl.writeTo(s);
-- }
--
-- public final byte[] toByteArray() {
-- return impl.toByteArray();
-- }
--
-- // org.omg.CORBA.DataOutputStream
-- public final void write_Abstract (java.lang.Object value) {
-- impl.write_Abstract(value);
-- }
--
-- public final void write_Value (java.io.Serializable value) {
-- impl.write_Value(value);
-- }
--
-- public final void write_any_array(org.omg.CORBA.Any[] seq, int offset, int length) {
-- impl.write_any_array(seq, offset, length);
-- }
--
-- public void setMessageMediator(MessageMediator messageMediator)
-- {
-- this.corbaMessageMediator = (CorbaMessageMediator) messageMediator;
-- }
--
-- public MessageMediator getMessageMediator()
-- {
-- return corbaMessageMediator;
-- }
--
-- // org.omg.CORBA.portable.ValueBase
-- public final String[] _truncatable_ids() {
-- return impl._truncatable_ids();
-- }
--
-- // Other
-- protected final int getSize() {
-- return impl.getSize();
-- }
--
-- protected final int getIndex() {
-- return impl.getIndex();
-- }
--
-- protected int getRealIndex(int index) {
-- // Used in indirections. Overridden by TypeCodeOutputStream.
-- return index;
-- }
--
-- protected final void setIndex(int value) {
-- impl.setIndex(value);
-- }
--
-- protected final ByteBuffer getByteBuffer() {
-- return impl.getByteBuffer();
-- }
--
-- protected final void setByteBuffer(ByteBuffer byteBuffer) {
-- impl.setByteBuffer(byteBuffer);
-- }
--
-- public final boolean isLittleEndian() {
-- return impl.isLittleEndian();
-- }
--
-- // XREVISIT - return to final if possible
-- // REVISIT - was protected - need access from msgtypes test.
-- public ByteBufferWithInfo getByteBufferWithInfo() {
-- return impl.getByteBufferWithInfo();
-- }
--
-- protected void setByteBufferWithInfo(ByteBufferWithInfo bbwi) {
-- impl.setByteBufferWithInfo(bbwi);
-- }
--
-- // REVISIT: was protected - but need to access from xgiop.
-- public final BufferManagerWrite getBufferManager() {
-- return impl.getBufferManager();
-- }
--
-- public final void write_fixed(java.math.BigDecimal bigDecimal, short digits, short scale) {
-- impl.write_fixed(bigDecimal, digits, scale);
-- }
--
-- public final void writeOctetSequenceTo(org.omg.CORBA.portable.OutputStream s) {
-- impl.writeOctetSequenceTo(s);
-- }
--
-- public final GIOPVersion getGIOPVersion() {
-- return impl.getGIOPVersion();
-- }
--
-- public final void writeIndirection(int tag, int posIndirectedTo) {
-- impl.writeIndirection(tag, posIndirectedTo);
-- }
--
-- // Use Latin-1 for GIOP 1.0 or when code set negotiation was not
-- // performed.
-- protected CodeSetConversion.CTBConverter createCharCTBConverter() {
-- return CodeSetConversion.impl().getCTBConverter(OSFCodeSetRegistry.ISO_8859_1);
-- }
--
-- // Subclasses must decide what to do here. It's inconvenient to
-- // make the class and this method abstract because of dup().
-- protected abstract CodeSetConversion.CTBConverter createWCharCTBConverter();
--
-- protected final void freeInternalCaches() {
-- impl.freeInternalCaches();
-- }
--
-- void printBuffer() {
-- impl.printBuffer();
-- }
--
-- public void alignOnBoundary(int octetBoundary) {
-- impl.alignOnBoundary(octetBoundary);
-- }
--
-- // Needed by request and reply messages for GIOP versions >= 1.2 only.
-- public void setHeaderPadding(boolean headerPadding) {
-- impl.setHeaderPadding(headerPadding);
-- }
--
-- // ValueOutputStream -----------------------------
--
-- public void start_value(String rep_id) {
-- impl.start_value(rep_id);
-- }
--
-- public void end_value() {
-- impl.end_value();
-- }
--}
---- ./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-07-15 21:45:53.000000000 -0700
-@@ -82,11 +82,18 @@
- super((ORB)orb);
- }
-
-- public org.omg.CORBA.portable.InputStream create_input_stream()
-- {
-- return new AnyInputStream(
-- (com.sun.corba.se.impl.encoding.EncapsInputStream)
-- super.create_input_stream());
-+ public org.omg.CORBA.portable.InputStream create_input_stream() {
-+ final org.omg.CORBA.portable.InputStream is = super
-+ .create_input_stream();
-+ AnyInputStream aIS = AccessController
-+ .doPrivileged(new PrivilegedAction<AnyInputStream>() {
-+ @Override
-+ public AnyInputStream run() {
-+ return new AnyInputStream(
-+ (com.sun.corba.se.impl.encoding.EncapsInputStream) is);
-+ }
-+ });
-+ return aIS;
- }
- }
-
---- ./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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2001, 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,11 +36,10 @@
- import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
-
- import com.sun.corba.se.spi.orb.ORB;
--
- import com.sun.corba.se.spi.logging.CORBALogDomains;
--
- import com.sun.corba.se.impl.logging.ORBUtilSystemException;
-
-+import sun.corba.EncapsInputStreamFactory;
- /**
- * Encapsulations are supposed to explicitly define their
- * code sets and GIOP version. The original resolution to issue 2784
-@@ -148,7 +147,7 @@
- }
-
- public CDRInputStream dup() {
-- return new EncapsInputStream(this);
-+ return EncapsInputStreamFactory.newEncapsInputStream(this);
- }
-
- 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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2001, 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,8 @@
- import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
- import com.sun.corba.se.impl.orbutil.ORBConstants;
-
-+import sun.corba.EncapsInputStreamFactory;
-+
- /**
- * Encapsulations are supposed to explicitly define their
- * code sets and GIOP version. The original resolution to issue 2784
-@@ -107,11 +109,11 @@
- public org.omg.CORBA.portable.InputStream create_input_stream() {
- freeInternalCaches();
-
-- return new EncapsInputStream(orb(),
-- getByteBuffer(),
-- getSize(),
-- isLittleEndian(),
-- getGIOPVersion());
-+ return EncapsInputStreamFactory.newEncapsInputStream(orb(),
-+ getByteBuffer(),
-+ getSize(),
-+ isLittleEndian(),
-+ getGIOPVersion());
- }
-
- 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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 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
-@@ -64,6 +64,8 @@
- import com.sun.corba.se.impl.encoding.CDROutputStream;
- import com.sun.corba.se.impl.encoding.MarshalInputStream;
-
-+import sun.corba.EncapsInputStreamFactory;
-+
- public class TypeCodeInputStream extends EncapsInputStream implements TypeCodeReader
- {
- private Map typeMap = null;
-@@ -157,11 +159,13 @@
-
- // create an encapsulation using the marshal buffer
- if (is instanceof CDRInputStream) {
-- encap = new TypeCodeInputStream((ORB)_orb, encapBuffer, encapBuffer.length,
-- ((CDRInputStream)is).isLittleEndian(),
-- ((CDRInputStream)is).getGIOPVersion());
-+ encap = EncapsInputStreamFactory.newTypeCodeInputStream((ORB) _orb,
-+ encapBuffer, encapBuffer.length,
-+ ((CDRInputStream) is).isLittleEndian(),
-+ ((CDRInputStream) is).getGIOPVersion());
- } else {
-- encap = new TypeCodeInputStream((ORB)_orb, encapBuffer, encapBuffer.length);
-+ encap = EncapsInputStreamFactory.newTypeCodeInputStream((ORB) _orb,
-+ encapBuffer, encapBuffer.length);
- }
- 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-07-15 21:45:53.000000000 -0700
-@@ -61,6 +61,8 @@
- import java.math.BigInteger;
- import java.nio.ByteBuffer;
-
-+import sun.corba.EncapsInputStreamFactory;
-+
- public final class TypeCodeOutputStream extends EncapsOutputStream
- {
- private OutputStream enclosure = null;
-@@ -77,9 +79,9 @@
-
- public org.omg.CORBA.portable.InputStream create_input_stream()
- {
-- //return new TypeCodeInputStream((ORB)orb(), getByteBuffer(), getIndex(), isLittleEndian());
-- TypeCodeInputStream tcis
-- = new TypeCodeInputStream((ORB)orb(), getByteBuffer(), getIndex(), isLittleEndian(), getGIOPVersion());
-+ TypeCodeInputStream tcis = EncapsInputStreamFactory
-+ .newTypeCodeInputStream((ORB) orb(), getByteBuffer(),
-+ getIndex(), isLittleEndian(), getGIOPVersion());
- //if (TypeCodeImpl.debug) {
- //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-07-15 21:45:53.000000000 -0700
-@@ -33,6 +33,8 @@
- import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
- import com.sun.corba.se.spi.logging.CORBALogDomains;
-
-+import sun.corba.EncapsInputStreamFactory;
-+
- import com.sun.corba.se.impl.corba.AnyImpl;
- import com.sun.corba.se.impl.encoding.EncapsInputStream;
- import com.sun.corba.se.impl.encoding.EncapsOutputStream;
-@@ -193,8 +195,9 @@
- // it is turned into a FormatMismatch exception.
-
- try {
-- EncapsInputStream cdrIn = new EncapsInputStream( orb, data,
-- data.length, giopVersion );
-+ EncapsInputStream cdrIn = EncapsInputStreamFactory.newEncapsInputStream( orb, data,
-+ data.length, giopVersion );
-+
-
- cdrIn.consumeEndian();
-
---- ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/ThreadCurrentStack.sjava 2013-09-06 11:20:48.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/ThreadCurrentStack.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,164 +0,0 @@
--/*
-- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
-- * 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.corba.se.impl.interceptors;
--
--import com.sun.corba.se.impl.corba.AnyImpl;
--import org.omg.PortableInterceptor.Current;
--import org.omg.PortableInterceptor.InvalidSlot;
--
--import com.sun.corba.se.impl.util.MinorCodes;
--import com.sun.corba.se.impl.core.ORB;
--
--/**
-- * ThreadCurrentStack is the container of PICurrent instances for each thread
-- */
--public class ThreadCurrentStack
--{
-- // PICurrentPool is the container for reusable PICurrents
-- private class PICurrentPool {
--
-- // Contains a list of reusable PICurrents
-- private java.util.ArrayList pool;
--
-- // High water mark for the pool
-- // If the pool size reaches this limit then putPICurrent will
-- // not put PICurrent to the pool.
-- private static final int HIGH_WATER_MARK = 5;
--
-- // currentIndex points to the last PICurrent in the list
-- private int currentIndex;
--
-- PICurrentPool( ) {
-- pool = new java.util.ArrayList( HIGH_WATER_MARK );
-- currentIndex = 0;
-- }
--
-- /**
-- * Puts PICurrent to the re-usable pool.
-- */
-- void putPICurrent( PICurrent current ) {
-- // If there are enough PICurrents in the pool, then don't add
-- // this current to the pool.
-- if( currentIndex >= HIGH_WATER_MARK ) {
-- return;
-- }
-- pool.add(currentIndex , current);
-- currentIndex++;
-- }
--
-- /**
-- * Gets PICurrent from the re-usable pool.
-- */
-- PICurrent getPICurrent( ) {
-- // If there are no entries in the pool then return null
-- if( currentIndex == 0 ) {
-- return null;
-- }
-- // Works like a stack, Gets the last one added first
-- currentIndex--;
-- return (PICurrent) pool.get(currentIndex);
-- }
-- }
--
-- // Contains all the active PICurrents for each thread.
-- // The ArrayList is made to behave like a stack.
-- private java.util.ArrayList currentContainer;
--
-- // Keeps track of number of PICurrents in the stack.
-- private int currentIndex;
--
-- // For Every Thread there will be a pool of re-usable ThreadCurrent's
-- // stored in PICurrentPool
-- private PICurrentPool currentPool;
--
-- // The orb associated with this ThreadCurrentStack
-- private ORB piOrb;
--
-- /**
-- * Constructs the stack and and PICurrentPool
-- */
-- ThreadCurrentStack( ORB piOrb, PICurrent current ) {
-- this.piOrb = piOrb;
-- currentIndex = 0;
-- currentContainer = new java.util.ArrayList( );
-- currentPool = new PICurrentPool( );
-- currentContainer.add( currentIndex, current );
-- currentIndex++;
-- }
--
--
-- /**
-- * pushPICurrent goes through the following steps
-- * 1: Checks to see if there is any PICurrent in PICurrentPool
-- * If present then use that instance to push into the ThreadCurrentStack
-- *
-- * 2:If there is no PICurrent in the pool, then creates a new one and pushes
-- * that into the ThreadCurrentStack
-- */
-- void pushPICurrent( ) {
-- PICurrent current = currentPool.getPICurrent( );
-- if( current == null ) {
-- // get an existing PICurrent to get the slotSize
-- PICurrent currentTemp = peekPICurrent();
-- current = new PICurrent( piOrb, currentTemp.getSlotSize( ));
-- }
-- currentContainer.add( currentIndex, current );
-- currentIndex++;
-- }
--
-- /**
-- * popPICurrent does the following
-- * 1: pops the top PICurrent in the ThreadCurrentStack
-- *
-- * 2: resets the slots in the PICurrent which resets the slotvalues to
-- * null if there are any previous sets.
-- *
-- * 3: pushes the reset PICurrent into the PICurrentPool to reuse
-- */
-- void popPICurrent( ) {
-- // Do not pop the PICurrent, If there is only one.
-- // This should not happen, But an extra check for safety.
-- if( currentIndex <= 1 ) {
-- throw new org.omg.CORBA.INTERNAL(
-- "Cannot pop the only PICurrent in the stack",
-- MinorCodes.CANT_POP_ONLY_CURRENT_2,
-- CompletionStatus.COMPLETED_NO );
-- }
-- currentIndex--;
-- PICurrent current = (PICurrent)currentContainer.get( currentIndex );
-- current.resetSlots( );
-- currentPool.putPICurrent( current );
-- }
--
-- /**
-- * peekPICurrent gets the top PICurrent in the ThreadCurrentStack without
-- * popping.
-- */
-- PICurrent peekPICurrent( ) {
-- return (PICurrent) currentContainer.get( currentIndex - 1);
-- }
--
--}
---- ./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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -370,7 +370,7 @@
- * @exception IOException Any of the usual Input/Output related exceptions.
- * @since JDK1.1
- */
-- public final Object readObjectDelegate() throws IOException
-+ public final synchronized Object readObjectDelegate() throws IOException
- {
- try {
-
-@@ -389,7 +389,7 @@
- }
- }
-
-- final Object simpleReadObject(Class clz,
-+ final synchronized Object simpleReadObject(Class clz,
- String repositoryID,
- com.sun.org.omg.SendingContext.CodeBase sender,
- int offset)
-@@ -461,7 +461,7 @@
- return obj;
- }
-
-- public final void simpleSkipObject(String repositoryID,
-+ public final synchronized void simpleSkipObject(String repositoryID,
- com.sun.org.omg.SendingContext.CodeBase sender)
- /* throws OptionalDataException, ClassNotFoundException, IOException */
- {
-@@ -559,7 +559,7 @@
- * objects.
- * @since JDK1.1
- */
-- public final void defaultReadObjectDelegate()
-+ final synchronized void defaultReadObjectDelegate()
- /* throws IOException, ClassNotFoundException, NotActiveException */
- {
- try {
-@@ -988,7 +988,7 @@
- }
- }
-
-- private Object inputObject(Class clz,
-+ private synchronized Object inputObject(Class clz,
- String repositoryID,
- com.sun.org.omg.SendingContext.CodeBase sender,
- int offset)
-@@ -1317,7 +1317,7 @@
- * a form of custom marshaling.
- *
- */
-- private Object inputObjectUsingFVD(Class clz,
-+ private synchronized Object inputObjectUsingFVD(Class clz,
- String repositoryID,
- 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-07-15 21:45:53.000000000 -0700
-@@ -201,7 +201,7 @@
- readObjectState.endDefaultReadObject(this);
- }
-
-- public abstract void defaultReadObjectDelegate();
-+ abstract void defaultReadObjectDelegate();
-
- 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-07-15 21:45:53.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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -47,6 +47,8 @@
- import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
- import com.sun.corba.se.impl.encoding.EncapsInputStream ;
-
-+import sun.corba.EncapsInputStreamFactory;
-+
- /**
- * This static utility class contains various utility methods for reading and
- * writing CDR encapsulations.
-@@ -108,8 +110,8 @@
- static public InputStream getEncapsulationStream( InputStream is )
- {
- byte[] data = readOctets( is ) ;
-- EncapsInputStream result = new EncapsInputStream( is.orb(), data,
-- data.length ) ;
-+ EncapsInputStream result = EncapsInputStreamFactory.newEncapsInputStream( is.orb(), data,
-+ data.length ) ;
- result.consumeEndian() ;
- 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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -49,6 +49,8 @@
- import com.sun.corba.se.impl.logging.IORSystemException ;
-
- import com.sun.corba.se.impl.encoding.EncapsInputStream ;
-+import sun.corba.EncapsInputStreamFactory;
-+
-
- /** Based on the magic and scid, return the appropriate
- * ObjectKeyTemplate. Expects to be called with a valid
-@@ -217,7 +219,7 @@
- public ObjectKey create( byte[] key )
- {
- OctetSeqHolder osh = new OctetSeqHolder() ;
-- EncapsInputStream is = new EncapsInputStream( orb, key, key.length ) ;
-+ EncapsInputStream is = EncapsInputStreamFactory.newEncapsInputStream( orb, key, key.length );
-
- 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-07-15 21:45:53.000000000 -0700
-@@ -70,6 +70,8 @@
- import com.sun.corba.se.impl.encoding.EncapsInputStream ;
- import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
-
-+import sun.corba.EncapsInputStreamFactory;
-+
- import com.sun.corba.se.impl.util.JDKBridge;
-
- import com.sun.corba.se.impl.logging.IORSystemException;
-@@ -170,8 +172,8 @@
- throw wrapper.invalidTaggedProfile() ;
- }
-
-- EncapsInputStream istr = new EncapsInputStream((ORB)orb, profile.profile_data,
-- profile.profile_data.length);
-+ EncapsInputStream istr = EncapsInputStreamFactory.newEncapsInputStream((ORB)orb, profile.profile_data,
-+ profile.profile_data.length);
- istr.consumeEndian();
- init( istr ) ;
- }
---- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/DefineWrapper.sjava 2013-09-06 11:20:49.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/DefineWrapper.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,120 +0,0 @@
--package com.sun.corba.se.impl.orbutil ;
--
--import java.lang.reflect.Method;
--import java.lang.reflect.Modifier;
--
--/** This class provides just a main method. Its purpose is to allow -D arguments to
--* set up the system properties when starting programs with tools like OptimizeIt that
--* make this difficult or impossible.
--*
--* Invocation: {java launcher of some kind} DefineClass -Dxxx=yyy -Dxxx=yyy ... {class name} arg0, arg1, ...
--* Result: updates system properties with -D args, then uses reflection to invoke {class name}.main with the args
--*/
--
--class DefineWrapper {
-- public static void main( String[] args )
-- {
-- int numberDefines = args.length ;
-- String className = null ;
--
-- for (int ctr=0; ctr<args.length; ctr++ ) {
-- String arg = args[ctr] ;
--
-- if ((arg.charAt(0) == '-') && (arg.charAt(1) == 'D')) {
-- int eqIndex = arg.indexOf( '=' ) ;
-- if (eqIndex < 0)
-- throw new Exception( arg + " is not a valid property assignment" ) ;
--
-- final String key = arg.subString( 2, eqIndex ) ;
-- final String value = arg.subStrung( eqIndex + 1 ) ;
--
-- AccessController.doPrivileged( new PrivilegedAction() {
-- public Object run() {
-- System.setProperty( key, value ) ;
-- return null ;
-- }
-- } ) ;
-- } else {
-- numberDefines = ctr ;
-- className = arg ;
-- break ;
-- }
-- }
--
-- if (numberDefines < args.length) {
-- Class cls = getMainClass( className ) ;
-- Method mainMethod = getMainMethod( cls ) ;
--
-- String[] newArgs = new String[ args.length - numberDefines ] ;
-- for (int ctr = numberDefines+1; ctr<args.length; ctr++ ) {
-- newArgs[ ctr-numberDefines-1 ] = args[ ctr ] ;
-- }
--
-- // build args to the main and call it
-- Object params [] = new Object [1];
-- params[0] = newArgs;
-- mainMethod.invoke(null, params);
-- } else {
-- throw new Exception( "No class name given" ) ;
-- }
-- }
--
-- private static Class getMainClass( String name )
-- {
-- // determine the class loader to be used for loading the class
-- // since ServerMain is going to be in JDK and we need to have this
-- // class to load application classes, this is required here.
-- ClassLoader cl = Thread.currentThread().getContextClassLoader();
--
-- if (cl == null)
-- cl = ClassLoader.getSystemClassLoader();
--
-- try {
-- // determine the main class, try loading with current class loader
-- cls = Class.forName( className ) ;
-- } catch (ClassNotFoundException ex) {
-- // eat the exception and try to load using SystemClassLoader
-- cls = Class.forName( className, true, cl);
-- }
-- }
--
-- private static Method getMainMethod( Class serverClass )
-- {
-- Class argTypes[] = new Class[] { String[].class } ;
-- Method method = null ;
--
-- try {
-- method = serverClass.getDeclaredMethod( "main", argTypes ) ;
-- } catch (Exception exc) {
-- throw new Exception( "Could not get main() method: " + exc ) ;
-- }
--
-- if (!isPublicStaticVoid( method ))
-- throw new Exception( "Main method is not public static void" ) ;
--
-- return method ;
-- }
--
-- private static boolean isPublicStaticVoid( Method method )
-- {
-- // check modifiers: public static
-- int modifiers = method.getModifiers ();
-- if (!Modifier.isPublic (modifiers) || !Modifier.isStatic (modifiers)) {
-- logError( method.getName() + " is not public static" ) ;
-- return false ;
-- }
--
-- // check return type and exceptions
-- if (method.getExceptionTypes ().length != 0) {
-- logError( method.getName() + " declares exceptions" ) ;
-- return false ;
-- }
--
-- if (!method.getReturnType().equals (Void.TYPE)) {
-- logError( method.getName() + " does not have a void return type" ) ;
-- return false ;
-- }
--
-- return true ;
-- }
--}
---- ./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-07-15 21:45:53.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-07-15 21:45:53.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/orbutil/resources/sunorb_ja.properties 2013-09-06 11:20:49.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties 2014-10-28 20:19:30.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
-@@ -95,7 +95,7 @@
- bootstrap.exception=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4FDD\u5B58\u4E2D\u306B\u4F8B\u5916\u3092\u6355\u6349\u3057\u307E\u3057\u305F: \u4F8B\u5916{1}
-
- tnameserv.exception=\u30DD\u30FC\u30C8{0}\u3067\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30B5\u30FC\u30D3\u30B9\u3092\u8D77\u52D5\u4E2D\u306B\u4F8B\u5916\u3092\u6355\u6349\u3057\u307E\u3057\u305F
--tnameserv.usage=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570-ORBInitialPort<portno>\u3092\u4F7F\u7528\u3057\u3066\u5225\u306E\u30DD\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-+tnameserv.usage=\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570-ORBInitialPort<portno>\u3092\u4F7F\u7528\u3057\u3066\u5225\u306E\u30DD\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
- tnameserv.invalidhostoption=ORBInitialHost\u306FNameService\u306B\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093
- tnameserv.orbinitialport0=ORBInitialPort 0\u306FNameService\u306B\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093
- tnameserv.hs1=\u521D\u671F\u30CD\u30FC\u30DF\u30F3\u30B0\u30FB\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8:\n{0}
---- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties 2013-09-06 11:20:49.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties 2014-07-15 21:45:53.000000000 -0700
-@@ -23,7 +23,7 @@
- # questions.
- #
-
--orbd.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -port porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, default 1049 (opcional)\n -defaultdb diret\u00F3rio dos arquivos ORBD, default "./orb.db" (opcional)\n -serverid id do servidor para ORBD, default 1 (opcional)\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
-+orbd.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -port porta de ativa\u00E7\u00E3o na qual o ORBD deve ser iniciado, padr\u00E3o 1049 (opcional)\n -defaultdb diret\u00F3rio dos arquivos ORBD, padr\u00E3o "./orb.db" (opcional)\n -serverid id do servidor para ORBD, padr\u00E3o 1 (opcional)\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
-
- servertool.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n
- servertool.banner=\n\nBem-vindo \u00E0 Ferramenta de Servidor IDL Java \ninsira os comandos no prompt \n
---- ./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 2014-07-15 21:45:53.000000000 -0700
-@@ -905,28 +905,4 @@
-
- return contents.toString();
- }
--
-- public static void main(String[] args) {
--
-- Class remoteInterface = java.rmi.Remote.class;
--
-- if( args.length > 0 ) {
-- String className = args[0];
-- try {
-- remoteInterface = Class.forName(className);
-- } catch(Exception e) {
-- e.printStackTrace();
-- System.exit(-1);
-- }
-- }
--
-- System.out.println("Building name translation for " + remoteInterface);
-- try {
-- IDLNameTranslator nameTranslator =
-- IDLNameTranslatorImpl.get(remoteInterface);
-- System.out.println(nameTranslator);
-- } catch(IllegalStateException ise) {
-- ise.printStackTrace();
-- }
-- }
- }
---- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl_save.sjava 2013-09-06 11:20:49.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl_save.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,909 +0,0 @@
--/*
-- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--package com.sun.corba.se.impl.presentation.rmi ;
--
--import java.lang.reflect.Method;
--
--import java.math.BigInteger;
--
--import java.util.Map;
--import java.util.Set;
--import java.util.HashSet;
--import java.util.Iterator;
--import java.util.HashMap;
--import java.util.StringTokenizer;
--
--import com.sun.corba.se.spi.presentation.rmi.IDLNameTranslator ;
--
--import com.sun.corba.se.impl.presentation.rmi.IDLType ;
--import com.sun.corba.se.impl.presentation.rmi.IDLTypeException ;
--import com.sun.corba.se.impl.presentation.rmi.IDLTypesUtil ;
--import com.sun.corba.se.impl.orbutil.ObjectUtility ;
--
--/**
-- * Bidirectional translator between RMI-IIOP interface methods and
-- * and IDL Names.
-- */
--public class IDLNameTranslatorImpl implements IDLNameTranslator {
--
-- // From CORBA Spec, Table 6 Keywords.
-- // Note that since all IDL identifiers are case
-- // insensitive, java identifier comparisons to these
-- // will be case insensitive also.
-- private static String[] IDL_KEYWORDS = {
--
-- "abstract", "any", "attribute", "boolean", "case", "char",
-- "const", "context", "custom", "default", "double", "enum",
-- "exception", "factory", "FALSE", "fixed", "float", "in", "inout",
-- "interface", "long", "module", "native", "Object", "octet",
-- "oneway", "out", "private", "public", "raises", "readonly", "sequence",
-- "short", "string", "struct", "supports", "switch", "TRUE", "truncatable",
-- "typedef", "unsigned", "union", "ValueBase", "valuetype", "void",
-- "wchar", "wstring"
--
-- };
--
-- private static char[] HEX_DIGITS = {
-- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-- 'A', 'B', 'C', 'D', 'E', 'F'
-- };
--
-- private static final String UNDERSCORE = "_";
--
-- // used to mangle java inner class names
-- private static final String INNER_CLASS_SEPARATOR =
-- UNDERSCORE + UNDERSCORE;
--
-- // used to form IDL array type names
-- private static final String[] BASE_IDL_ARRAY_MODULE_TYPE=
-- new String[] { "org", "omg", "boxedRMI" } ;
--
-- private static final String BASE_IDL_ARRAY_ELEMENT_TYPE = "seq";
--
-- // used to mangling java identifiers that have a leading underscore
-- private static final String LEADING_UNDERSCORE_CHAR = "J";
-- private static final String ID_CONTAINER_CLASH_CHAR = UNDERSCORE;
--
-- // separator used between types in a mangled overloaded method name
-- private static final String OVERLOADED_TYPE_SEPARATOR =
-- UNDERSCORE + UNDERSCORE;
--
-- // string appended to attribute if it clashes with a method name
-- private static final String ATTRIBUTE_METHOD_CLASH_MANGLE_CHARS =
-- UNDERSCORE + UNDERSCORE;
--
-- private static Set idlKeywords_;
--
-- static {
--
-- idlKeywords_ = new HashSet();
-- for(int i = 0; i < IDL_KEYWORDS.length; i++) {
-- String next = (String) IDL_KEYWORDS[i];
-- // Convert keyword to all caps to ease equality
-- // check.
-- String keywordAllCaps = next.toUpperCase();
-- idlKeywords_.add(keywordAllCaps);
-- }
--
-- }
--
-- //
-- // Instance state
-- //
--
-- // Remote interface for name translation.
-- private Class[] interf_;
--
-- // Maps used to hold name translations. These do not need to be
-- // synchronized since the translation is never modified after
-- // initialization.
-- private Map methodToIDLNameMap_;
-- private Map IDLNameToMethodMap_;
-- private Method[] methods_;
--
-- /**
-- * Return an IDLNameTranslator for the given interface.
-- *
-- * @throws IllegalStateException if given class is not a valid
-- * RMI/IIOP Remote Interface
-- */
-- public static IDLNameTranslator get( Class interf )
-- {
--
-- return new IDLNameTranslatorImpl(new Class[] { interf } );
--
-- }
--
-- /**
-- * Return an IDLNameTranslator for the given interfacex.
-- *
-- * @throws IllegalStateException if given classes are not valid
-- * RMI/IIOP Remote Interfaces
-- */
-- public static IDLNameTranslator get( Class[] interfaces )
-- {
--
-- return new IDLNameTranslatorImpl(interfaces );
--
-- }
--
-- public static String getExceptionId( Class cls )
-- {
-- // Requirements for this method:
-- // 1. cls must be an exception but not a RemoteException.
-- // 2. If cls has an IDL keyword name, an underscore is prepended (1.3.2.2).
-- // 3. If cls jas a leading underscore, J is prepended (1.3.2.3).
-- // 4. If cls has an illegal IDL ident char, it is mapped to UXXXX where
-- // XXXX is the unicode value in hex of the char (1.3.2.4).
-- // 5. double underscore for inner class (1.3.2.5).
-- // 6. The ID is "IDL:" + name with / separators + ":1.0".
-- IDLType itype = classToIDLType( cls ) ;
-- return itype.getExceptionName() ;
-- }
--
-- public Class[] getInterfaces()
-- {
-- return interf_;
-- }
--
-- public Method[] getMethods()
-- {
-- return methods_ ;
-- }
--
-- public Method getMethod( String idlName )
-- {
-- return (Method) IDLNameToMethodMap_.get(idlName);
-- }
--
-- public String getIDLName( Method method )
-- {
-- return (String) methodToIDLNameMap_.get(method);
-- }
--
-- /**
-- * Initialize an IDLNameTranslator for the given interface.
-- *
-- * @throws IllegalStateException if given class is not a valid
-- * RMI/IIOP Remote Interface
-- */
-- private IDLNameTranslatorImpl(Class[] interfaces)
-- {
--
-- try {
-- IDLTypesUtil idlTypesUtil = new IDLTypesUtil();
-- for (int ctr=0; ctr<interfaces.length; ctr++)
-- idlTypesUtil.validateRemoteInterface(interfaces[ctr]);
-- interf_ = interfaces;
-- buildNameTranslation();
-- } catch( IDLTypeException ite) {
-- String msg = ite.getMessage();
-- IllegalStateException ise = new IllegalStateException(msg);
-- ise.initCause(ite);
-- throw ise;
-- }
-- }
--
-- private void buildNameTranslation()
-- {
-- // holds method info, keyed by method
-- Map allMethodInfo = new HashMap() ;
--
-- for (int ctr=0; ctr<interf_.length; ctr++) {
-- Class interf = interf_[ctr] ;
--
-- IDLTypesUtil idlTypesUtil = new IDLTypesUtil();
-- Method[] methods = interf.getMethods();
--
-- // Take an initial pass through all the methods and create some
-- // information that will be used to track the IDL name
-- // transformation.
-- for(int i = 0; i < methods.length; i++) {
--
-- Method nextMethod = methods[i];
--
-- IDLMethodInfo methodInfo = new IDLMethodInfo();
--
-- methodInfo.method = nextMethod;
--
-- methodInfo.propertyType =
-- idlTypesUtil.propertyAccessorMethodType(
-- nextMethod, interf ) ;
--
-- if (methodInfo.propertyType != null) {
-- String attributeName = idlTypesUtil.
-- getAttributeNameForProperty(nextMethod.getName());
-- methodInfo.originalName = attributeName;
-- methodInfo.mangledName = attributeName;
-- } else {
-- methodInfo.originalName = nextMethod.getName();
-- methodInfo.mangledName = nextMethod.getName();
-- }
--
-- allMethodInfo.put(nextMethod, methodInfo);
-- }
-- }
--
-- // Check for having both is<NAME> and get<NAME> methods.
--
--
-- //
-- // Perform case sensitivity test first. This applies to all
-- // method names AND attributes. Compare each method name and
-- // attribute to all other method names and attributes. If names
-- // differ only in case, apply mangling as defined in section 1.3.2.7
-- // of Java2IDL spec. Note that we compare using the original names.
-- //
-- for(Iterator outerIter=allMethodInfo.values().iterator();
-- outerIter.hasNext();) {
-- IDLMethodInfo outer = (IDLMethodInfo) outerIter.next();
-- for(Iterator innerIter = allMethodInfo.values().iterator();
-- innerIter.hasNext();) {
-- IDLMethodInfo inner = (IDLMethodInfo) innerIter.next();
--
-- if( (outer != inner) &&
-- (!outer.originalName.equals(inner.originalName)) &&
-- outer.originalName.equalsIgnoreCase(inner.originalName) ) {
-- outer.mangledName =
-- mangleCaseSensitiveCollision(outer.originalName);
-- break;
-- }
--
-- }
-- }
--
-- for(Iterator iter = allMethodInfo.values().iterator();
-- iter.hasNext();) {
-- IDLMethodInfo next = (IDLMethodcurrentInfo) iter.next();
-- next.mangledName =
-- mangleIdentifier(next.mangledName,
-- next.propertyType != null);
-- }
--
-- //
-- // Now check for overloaded method names and apply 1.3.2.6.
-- //
-- for(Iterator outerIter=allMethodInfo.values().iterator();
-- outerIter.hasNext();) {
-- IDLMethodInfo outer = (IDLMethodInfo) outerIter.next();
-- if (outer.propertyType != null) {
-- continue;
-- }
-- for(Iterator innerIter = allMethodInfo.values().iterator();
-- innerIter.hasNext();) {
-- IDLMethodInfo inner = (IDLMethodInfo) innerIter.next();
--
-- if( (outer != inner) &&
-- (inner.propertyType == null) &&
-- outer.originalName.equals(inner.originalName) ) {
-- outer.mangledName = mangleOverloadedMethod
-- (outer.mangledName, outer.method);
-- break;
-- }
-- }
-- }
--
-- //
-- // Now mangle any properties that clash with method names.
-- //
-- for(Iterator outerIter=allMethodInfo.values().iterator();
-- outerIter.hasNext();) {
-- IDLMethodInfo outer = (IDLMethodInfo) outerIter.next();
-- if(outer.propertyType == null) {
-- continue;
-- }
-- for(Iterator innerIter = allMethodInfo.values().iterator();
-- innerIter.hasNext();) {
-- IDLMethodInfo inner = (IDLMethodInfo) innerIter.next();
-- if( (outer != inner) &&
-- (inner.propertyType == null) &&
-- outer.mangledName.equals(inner.mangledName) ) {
-- outer.mangledName = outer.mangledName +
-- ATTRIBUTE_METHOD_CLASH_MANGLE_CHARS;
-- break;
-- }
-- }
-- }
--
-- //
-- // Ensure that no mapped method names clash with mapped name
-- // of container(1.3.2.9). This is a case insensitive comparison.
-- //
-- for (int ctr=0; ctr<interf_.length; ctr++ ) {
-- Class interf = interf_[ctr] ;
-- String mappedContainerName = getMappedContainerName(interf);
-- for(Iterator iter = allMethodInfo.values().iterator();
-- iter.hasNext();) {
-- IDLMethodInfo next = (IDLMethodInfo) iter.next();
-- if( (next.propertyType == null) &&
-- identifierClashesWithContainer(mappedContainerName,
-- next.mangledName)) {
-- next.mangledName = mangleContainerClash(next.mangledName);
-- }
-- }
-- }
--
-- //
-- // Populate name translation maps.
-- //
-- methodToIDLNameMap_ = new HashMap();
-- IDLNameToMethodMap_ = new HashMap();
-- methods_ = (Method[])allMethodInfo.keySet().toArray(
-- new Method[0] ) ;
--
-- for(Iterator iter = allMethodInfo.values().iterator();
-- iter.hasNext();) {
-- IDLMethodInfo next = (IDLMethodInfo) iter.next();
-- String idlName = next.mangledName;
-- if (next.propertyType != null) {
-- idlName = javaPropertyPrefixToIDL( next.propertyType ) +
-- next.mangledName ;
-- }
--
-- methodToIDLNameMap_.put(next.method, idlName);
--
-- // Final check to see if there are any clashes after all the
-- // manglings have been applied. If so, this is treated as an
-- // invalid interface. Currently, we do a CASE-SENSITIVE
-- // comparison since that matches the rmic behavior.
-- // @@@ Shouldn't this be a case-insensitive check?
-- // If there is a collision between is<TYPE> and get<TYPE>,
-- // map only is<TYPE> to an attribute, and leave the
-- // get<TYPE> method alone.
-- if( IDLNameToMethodMap_.containsKey(idlName) ) {
-- // @@@ I18N
-- Method clash = (Method) IDLNameToMethodMap_.get(idlName);
-- MethodInfo clashMethodInfo =
-- (MethodInfo)allMethodInfo.get( clash ) ;
-- if (clashMethodInfo.isBooleanProperty() &&
-- next.isReadProperty()) {
-- // fix idlName
-- } else if (clashMethodInfo.isReadProperty() &&
-- next.isBooleanProperty()) {
-- // Remove entry under idlName
-- // put entry into table under correct name
-- } else {
-- throw new IllegalStateException("Error : methods " +
-- clash + " and " + next.method +
-- " both result in IDL name '" + idlName + "'");
-- }
-- }
--
-- IDLNameToMethodMap_.put(idlName, next.method);
-- }
--
-- return;
--
-- }
--
--
-- /**
-- * Perform all necessary stand-alone identifier mangling operations
-- * on a java identifier that is being transformed into an IDL name.
-- * That is, mangling operations that don't require looking at anything
-- * else but the identifier itself. This covers sections 1.3.2.2, 1.3.2.3,
-- * and 1.3.2.4 of the Java2IDL spec. Method overloading and
-- * case-sensitivity checks are handled elsewhere.
-- */
--
-- private static String mangleIdentifier(String identifier) {
-- return mangleIdentifier(identifier, false);
-- }
--
-- private static String mangleIdentifier(String identifier, boolean attribute) {
--
-- String mangledName = identifier;
--
-- //
-- // Apply leading underscore test (1.3.2.3)
-- // This should be done before IDL Keyword clash test, since clashing
-- // IDL keywords are mangled by adding a leading underscore.
-- //
-- if( hasLeadingUnderscore(mangledName) ) {
-- mangledName = mangleLeadingUnderscore(mangledName);
-- }
--
-- //
-- // Apply IDL keyword clash test (1.3.2.2).
-- // This is not needed for attributes since when the full property
-- // name is composed it cannot clash with an IDL keyword.
-- // (Also, rmic doesn't do it.)
-- //
--
-- if( !attribute && isIDLKeyword(mangledName) ) {
-- mangledName = mangleIDLKeywordClash(mangledName);
-- }
--
-- //
-- // Replace illegal IDL identifier characters (1.3.2.4)
-- // for all method names and attributes.
-- //
-- if( !isIDLIdentifier(mangledName) ) {
-- mangledName = mangleUnicodeChars(mangledName);
-- }
--
-- return mangledName;
-- }
--
-- /**
-- * Checks whether a java identifier clashes with an
-- * IDL keyword. Note that this is a case-insensitive
-- * comparison.
-- *
-- * Used to implement section 1.3.2.2 of Java2IDL spec.
-- */
-- private static boolean isIDLKeyword(String identifier) {
--
-- String identifierAllCaps = identifier.toUpperCase();
--
-- return idlKeywords_.contains(identifierAllCaps);
-- }
--
-- private static String mangleIDLKeywordClash(String identifier) {
-- return UNDERSCORE + identifier;
-- }
--
-- private static String mangleLeadingUnderscore(String identifier) {
-- return LEADING_UNDERSCORE_CHAR + identifier;
-- }
--
-- /**
-- * Checks whether a java identifier starts with an underscore.
-- * Used to implement section 1.3.2.3 of Java2IDL spec.
-- */
-- private static boolean hasLeadingUnderscore(String identifier) {
-- return identifier.startsWith(UNDERSCORE);
-- }
--
-- /**
-- * Implements Section 1.3.2.4 of Java2IDL Mapping.
-- * All non-IDL identifier characters must be replaced
-- * with their Unicode representation.
-- */
-- static String mangleUnicodeChars(String identifier) {
-- StringBuffer mangledIdentifier = new StringBuffer();
--
-- for(int i = 0; i < identifier.length(); i++) {
-- char nextChar = identifier.charAt(i);
-- if( isIDLIdentifierChar(nextChar) ) {
-- mangledIdentifier.append(nextChar);
-- } else {
-- String unicode = charToUnicodeRepresentation(nextChar);
-- mangledIdentifier.append(unicode);
-- }
-- }
--
-- return mangledIdentifier.toString();
-- }
--
-- /**
-- * Implements mangling portion of Section 1.3.2.7 of Java2IDL spec.
-- * This method only deals with the actual mangling. Decision about
-- * whether case-sensitive collision mangling is required is made
-- * elsewhere.
-- *
-- *
-- * "...a mangled name is generated consisting of the original name
-- * followed by an underscore separated list of decimal indices
-- * into the string, where the indices identify all the upper case
-- * characters in the original string. Indices are zero based."
-- *
-- */
-- String mangleCaseSensitiveCollision(String identifier) {
--
-- StringBuffer mangledIdentifier = new StringBuffer(identifier);
--
-- // There is always at least one trailing underscore, whether or
-- // not the identifier has uppercase letters.
-- mangledIdentifier.append(UNDERSCORE);
--
-- boolean needUnderscore = false;
-- for(int i = 0; i < identifier.length(); i++) {
-- char next = identifier.charAt(i);
-- if( Character.isUpperCase(next) ) {
-- // This bit of logic is needed to ensure that we have
-- // an underscore separated list of indices but no
-- // trailing underscores. Basically, after we have at least
-- // one uppercase letter, we always put an undercore before
-- // printing the next one.
-- if( needUnderscore ) {
-- mangledIdentifier.append(UNDERSCORE);
-- }
-- mangledIdentifier.append(i);
-- needUnderscore = true;
-- }
-- }
--
-- return mangledIdentifier.toString();
-- }
--
-- private static String mangleContainerClash(String identifier) {
-- return identifier + ID_CONTAINER_CLASH_CHAR;
-- }
--
-- /**
-- * Implements Section 1.3.2.9 of Java2IDL Mapping. Container in this
-- * context means the name of the java Class(excluding package) in which
-- * the identifier is defined. Comparison is case-insensitive.
-- */
-- private static boolean identifierClashesWithContainer
-- (String mappedContainerName, String identifier) {
--
-- return identifier.equalsIgnoreCase(mappedContainerName);
-- }
--
-- /**
-- * Returns Unicode mangling as defined in Section 1.3.2.4 of
-- * Java2IDL spec.
-- *
-- * "For Java identifiers that contain illegal OMG IDL identifier
-- * characters such as '$' or Unicode characters outside of ISO Latin 1,
-- * any such illegal characters are replaced by "U" followed by the
-- * 4 hexadecimal characters(in upper case) representing the Unicode
-- * value. So, the Java name a$b is mapped to aU0024b and
-- * x\u03bCy is mapped to xU03BCy."
-- */
-- public static String charToUnicodeRepresentation(char c) {
--
-- int orig = (int) c;
-- StringBuffer hexString = new StringBuffer();
--
-- int value = orig;
--
-- while( value > 0 ) {
-- int div = value / 16;
-- int mod = value % 16;
-- hexString.insert(0, HEX_DIGITS[mod]);
-- value = div;
-- }
--
-- int numZerosToAdd = 4 - hexString.length();
-- for(int i = 0; i < numZerosToAdd; i++) {
-- hexString.insert(0, "0");
-- }
--
-- hexString.insert(0, "U");
-- return hexString.toString();
-- }
--
-- private static boolean isIDLIdentifier(String identifier) {
--
-- boolean isIdentifier = true;
--
-- for(int i = 0; i < identifier.length(); i++) {
-- char nextChar = identifier.charAt(i);
-- // 1st char must be alphbetic.
-- isIdentifier = (i == 0) ?
-- isIDLAlphabeticChar(nextChar) :
-- isIDLIdentifierChar(nextChar);
-- if( !isIdentifier ) {
-- break;
-- }
-- }
--
-- return isIdentifier;
--
-- }
--
-- private static boolean isIDLIdentifierChar(char c) {
-- return (isIDLAlphabeticChar(c) ||
-- isIDLDecimalDigit(c) ||
-- isUnderscore(c));
-- }
--
-- /**
-- * True if character is one of 114 Alphabetic characters as
-- * specified in Table 2 of Chapter 3 in CORBA spec.
-- */
-- private static boolean isIDLAlphabeticChar(char c) {
--
-- // NOTE that we can't use the java.lang.Character
-- // isUpperCase, isLowerCase, etc. methods since they
-- // include many characters other than the Alphabetic list in
-- // the CORBA spec. Instead, we test for inclusion in the
-- // Unicode value ranges for the corresponding legal characters.
--
-- boolean alphaChar =
-- (
-- // A - Z
-- ((c >= 0x0041) && (c <= 0x005A))
--
-- ||
--
-- // a - z
-- ((c >= 0x0061) && (c <= 0x007A))
--
-- ||
--
-- // other letter uppercase, other letter lowercase, which is
-- // the entire upper half of C1 Controls except X and /
-- ((c >= 0x00C0) && (c <= 0x00FF)
-- && (c != 0x00D7) && (c != 0x00F7)));
--
-- return alphaChar;
-- }
--
-- /**
-- * True if character is one of 10 Decimal Digits
-- * specified in Table 3 of Chapter 3 in CORBA spec.
-- */
-- private static boolean isIDLDecimalDigit(char c) {
-- return ( (c >= 0x0030) && (c <= 0x0039) );
-- }
--
-- private static boolean isUnderscore(char c) {
-- return ( c == 0x005F );
-- }
--
-- /**
-- * Mangle an overloaded method name as defined in Section 1.3.2.6 of
-- * Java2IDL spec. Current value of method name is passed in as argument.
-- * We can't start from original method name since the name might have
-- * been partially mangled as a result of the other rules.
-- */
-- private static String mangleOverloadedMethod(String mangledName, Method m) {
--
-- IDLTypesUtil idlTypesUtil = new IDLTypesUtil();
--
-- // Start by appending the separator string
-- String newMangledName = mangledName + OVERLOADED_TYPE_SEPARATOR;
--
-- Class[] parameterTypes = m.getParameterTypes();
--
-- for(int i = 0; i < parameterTypes.length; i++) {
-- Class nextParamType = parameterTypes[i];
--
-- if( i > 0 ) {
-- newMangledName = newMangledName + OVERLOADED_TYPE_SEPARATOR;
-- }
-- IDLType idlType = classToIDLType(nextParamType);
--
-- String moduleName = idlType.getModuleName();
-- String memberName = idlType.getMemberName();
--
-- String typeName = (moduleName.length() > 0) ?
-- moduleName + UNDERSCORE + memberName : memberName;
--
-- if( !idlTypesUtil.isPrimitive(nextParamType) &&
-- (idlTypesUtil.getSpecialCaseIDLTypeMapping(nextParamType)
-- == null) &&
-- isIDLKeyword(typeName) ) {
-- typeName = mangleIDLKeywordClash(typeName);
-- }
--
-- typeName = mangleUnicodeChars(typeName);
--
-- newMangledName = newMangledName + typeName;
-- }
--
-- return newMangledName;
-- }
--
--
-- private static IDLType classToIDLType(Class c) {
--
-- IDLType idlType = null;
-- IDLTypesUtil idlTypesUtil = new IDLTypesUtil();
--
-- if( idlTypesUtil.isPrimitive(c) ) {
--
-- idlType = idlTypesUtil.getPrimitiveIDLTypeMapping(c);
--
-- } else if( c.isArray() ) {
--
-- // Calculate array depth, as well as base element type.
-- Class componentType = c.getComponentType();
-- int numArrayDimensions = 1;
-- while(componentType.isArray()) {
-- componentType = componentType.getComponentType();
-- numArrayDimensions++;
-- }
-- IDLType componentIdlType = classToIDLType(componentType);
--
-- String[] modules = BASE_IDL_ARRAY_MODULE_TYPE;
-- if( componentIdlType.hasModule() ) {
-- modules = (String[])ObjectUtility.concatenateArrays( modules,
-- componentIdlType.getModules() ) ;
-- }
--
-- String memberName = BASE_IDL_ARRAY_ELEMENT_TYPE +
-- numArrayDimensions + UNDERSCORE +
-- componentIdlType.getMemberName();
--
-- idlType = new IDLType(c, modules, memberName);
--
-- } else {
-- idlType = idlTypesUtil.getSpecialCaseIDLTypeMapping(c);
--
-- if (idlType == null) {
-- // Section 1.3.2.5 of Java2IDL spec defines mangling rules for
-- // inner classes.
-- String memberName = getUnmappedContainerName(c);
--
-- // replace inner class separator with double underscore
-- memberName = memberName.replaceAll("\\$",
-- INNER_CLASS_SEPARATOR);
--
-- if( hasLeadingUnderscore(memberName) ) {
-- memberName = mangleLeadingUnderscore(memberName);
-- }
--
-- // Get raw package name. If there is a package, it
-- // will still have the "." separators and none of the
-- // mangling rules will have been applied.
-- String packageName = getPackageName(c);
--
-- if (packageName == null) {
-- idlType = new IDLType( c, memberName ) ;
-- } else {
-- // If this is a generated IDL Entity Type we need to
-- // prepend org_omg_boxedIDL per sections 1.3.5 and 1.3.9
-- if (idlTypesUtil.isEntity(c)) {
-- packageName = "org.omg.boxedIDL." + packageName ;
-- }
--
-- // Section 1.3.2.1 and 1.3.2.6 of Java2IDL spec defines
-- // rules for mapping java packages to IDL modules and for
-- // mangling module name portion of type name. NOTE that
-- // of the individual identifier mangling rules,
-- // only the leading underscore test is done here.
-- // The other two(IDL Keyword, Illegal Unicode chars) are
-- // done in mangleOverloadedMethodName.
-- StringTokenizer tokenizer =
-- new StringTokenizer(packageName, ".");
--
-- String[] modules = new String[ tokenizer.countTokens() ] ;
-- int index = 0 ;
-- while (tokenizer.hasMoreElements()) {
-- String next = tokenizer.nextToken();
-- String nextMangled = hasLeadingUnderscore(next) ?
-- mangleLeadingUnderscore(next) : next;
--
-- modules[index++] = nextMangled ;
-- }
--
-- idlType = new IDLType(c, modules, memberName);
-- }
-- }
-- }
--
-- return idlType;
-- }
--
-- /**
-- * Return Class' package name or null if there is no package.
-- */
-- private static String getPackageName(Class c) {
-- Package thePackage = c.getPackage();
-- String packageName = null;
--
-- // Try to get package name by introspection. Some classloaders might
-- // not provide this information, so check for null.
-- if( thePackage != null ) {
-- packageName = thePackage.getName();
-- } else {
-- // brute force method
-- String fullyQualifiedClassName = c.getName();
-- int lastDot = fullyQualifiedClassName.indexOf('.');
-- packageName = (lastDot == -1) ? null :
-- fullyQualifiedClassName.substring(0, lastDot);
-- }
-- return packageName;
-- }
--
-- private static String getMappedContainerName(Class c) {
-- String unmappedName = getUnmappedContainerName(c);
--
-- return mangleIdentifier(unmappedName);
-- }
--
-- /**
-- * Return portion of class name excluding package name.
-- */
-- private static String getUnmappedContainerName(Class c) {
--
-- String memberName = null;
-- String packageName = getPackageName(c);
--
-- String fullyQualifiedClassName = c.getName();
--
-- if( packageName != null ) {
-- int packageLength = packageName.length();
-- memberName = fullyQualifiedClassName.substring(packageLength + 1);
-- } else {
-- memberName = fullyQualifiedClassName;
--
-- }
--
-- return memberName;
-- }
--
-- /**
-- * Internal helper class for tracking information related to each
-- * interface method while we're building the name translation table.
-- */
-- private static class IDLMethodInfo
-- {
-- public Method method;
-- public String propertyType;
--
-- // If this is a property, originalName holds the original
-- // attribute name. Otherwise, it holds the original method name.
-- public String originalName;
--
-- // If this is a property, mangledName holds the mangled attribute
-- // name. Otherwise, it holds the mangled method name.
-- public String mangledName;
--
-- }
--
-- public String toString() {
--
-- StringBuffer contents = new StringBuffer();
-- contents.append("IDLNameTranslator[" );
-- for( int ctr=0; ctr<interf_.length; ctr++) {
-- if (ctr != 0)
-- contents.append( " " ) ;
-- contents.append( interf_[ctr].getName() ) ;
-- }
-- contents.append("]\n");
-- for(Iterator iter = methodToIDLNameMap_.keySet().iterator();
-- iter.hasNext();) {
--
-- Method method = (Method) iter.next();
-- String idlName = (String) methodToIDLNameMap_.get(method);
--
-- contents.append(idlName + ":" + method + "\n");
--
-- }
--
-- return contents.toString();
-- }
--
-- public static void main(String[] args) {
--
-- Class remoteInterface = java.rmi.Remote.class;
--
-- if( args.length > 0 ) {
-- String className = args[0];
-- try {
-- remoteInterface = Class.forName(className);
-- } catch(Exception e) {
-- e.printStackTrace();
-- System.exit(-1);
-- }
-- }
--
-- System.out.println("Building name translation for " + remoteInterface);
-- try {
-- IDLNameTranslator nameTranslator =
-- IDLNameTranslatorImpl.get(remoteInterface);
-- System.out.println(nameTranslator);
-- } catch(IllegalStateException ise) {
-- ise.printStackTrace();
-- }
-- }
--}
---- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava 2013-09-06 11:20:50.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,520 +0,0 @@
--
--package com.sun.corba.se.impl.presentation.rmi ;
--
--import java.lang.reflect.Method;
--import java.lang.reflect.Field;
--import java.util.Set;
--import java.util.HashSet;
--import java.util.Iterator;
--
--/**
-- * Utility class for testing RMI/IDL Types as defined in
-- * Section 1.2 of The Java Language to IDL Mapping. Note that
-- * these are static checks only. Runtime checks, such as those
-- * described in Section 1.2.3, #3, are not covered.
-- */
--public class IDLTypesUtil {
--
-- public static final String JAVA_GET_PROPERTY_PREFIX = "get";
-- public static final String JAVA_SET_PROPERTY_PREFIX = "set";
-- public static final String JAVA_IS_PROPERTY_PREFIX = "is";
--
-- public static final int VALID_TYPE = 0;
-- public static final int INVALID_TYPE = 1;
--
-- /**
-- * Validate a class to ensure it conforms to the rules for a
-- * Java RMI/IIOP interface.
-- *
-- * @throws IDLTypeException if not a valid RMI/IIOP interface.
-- */
-- public void validateRemoteInterface(Class c) throws IDLTypeException
-- {
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- if( !c.isInterface() ) {
-- String msg = "Class " + c + " must be a java interface.";
-- throw new IDLTypeException(msg);
-- }
--
-- if( !java.rmi.Remote.class.isAssignableFrom(c) ) {
-- String msg = "Class " + c + " must extend java.rmi.Remote, " +
-- "either directly or indirectly.";
-- throw new IDLTypeException(msg);
-- }
--
-- // Get all methods, including super-interface methods.
-- Method[] methods = c.getMethods();
--
-- for(int i = 0; i < methods.length; i++) {
-- Method next = methods[i];
-- validateExceptions(next);
-- }
--
-- // Removed because of bug 4989053
-- // validateDirectInterfaces(c);
-- validateConstants(c);
--
-- return;
-- }
--
-- public boolean isRemoteInterface(Class c)
-- {
-- boolean remoteInterface = true;
-- try {
-- validateRemoteInterface(c);
-- } catch(IDLTypeException ite) {
-- remoteInterface = false;
-- }
--
-- return remoteInterface;
-- }
--
-- /**
-- * Section 1.2.2 Primitive Types
-- */
-- public boolean isPrimitive(Class c)
-- {
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- return c.isPrimitive();
-- }
--
-- /**
-- * Section 1.2.4
-- */
-- public boolean isValue(Class c)
-- {
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- return
-- (!c.isInterface() &&
-- java.io.Serializable.class.isAssignableFrom(c) &&
-- !java.rmi.Remote.class.isAssignableFrom(c));
-- }
--
-- /**
-- * Section 1.2.5
-- */
-- public boolean isArray(Class c)
-- {
-- boolean arrayType = false;
--
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- if( c.isArray() ) {
-- Class componentType = c.getComponentType();
-- arrayType =
-- (isPrimitive(componentType) || isRemoteInterface(componentType) ||
-- isEntity(componentType) || isException(componentType) ||
-- isValue(componentType) || isObjectReference(componentType) );
-- }
--
-- return arrayType;
-- }
--
-- /**
-- * Section 1.2.6
-- */
-- public boolean isException(Class c)
-- {
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- // Must be a checked exception, not including RemoteException or
-- // its subclasses.
-- return isCheckedException(c) && !isRemoteException(c) && isValue(c);
-- }
--
-- public boolean isRemoteException(Class c)
-- {
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- return java.rmi.RemoteException.class.isAssignableFrom(c) ;
-- }
--
-- public boolean isCheckedException(Class c)
-- {
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- return Throwable.class.isAssignableFrom(c) &&
-- !RuntimeException.class.isAssignableFrom(c) &&
-- !Error.class.isAssignableFrom(c) ;
-- }
--
-- /**
-- * Section 1.2.7
-- */
-- public boolean isObjectReference(Class c)
-- {
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- return (c.isInterface() &&
-- org.omg.CORBA.Object.class.isAssignableFrom(c));
-- }
--
-- /**
-- * Section 1.2.8
-- */
-- public boolean isEntity(Class c)
-- {
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- Class superClass = c.getSuperclass();
-- return (!c.isInterface() &&
-- (superClass != null) &&
-- (org.omg.CORBA.portable.IDLEntity.class.isAssignableFrom(c)));
-- }
--
-- public String javaPropertyPrefixToIDL( String javaPrefix )
-- {
-- return "_" + javaPrefix + "_" ;
-- }
--
-- /**
-- * Return the property type if given method is legal property accessor as defined in
-- * Section 1.3.4.3 of Java2IDL spec. Result is one of: JAVA_GET_PROPERTY_PREFIX,
-- * JAVA_SET_PROPERTY_PREFIX, JAVA_IS_PROPERTY_PREFIX.
-- */
-- public String propertyAccessorMethodType(Method m, Class c) {
--
-- String methodName = m.getName();
-- Class returnType = m.getReturnType();
-- Class[] parameters = m.getParameterTypes();
-- Class[] exceptionTypes = m.getExceptionTypes();
-- String propertyType = null;
--
-- if( methodName.startsWith(JAVA_GET_PROPERTY_PREFIX) ) {
--
-- if((parameters.length == 0) && (returnType != Void.TYPE) &&
-- !hasCorrespondingReadProperty(m, c, JAVA_IS_PROPERTY_PREFIX) {
-- propertyType = JAVA_GET_PROPERTY_PREFIX;
-- }
--
-- } else if( methodName.startsWith(JAVA_SET_PROPERTY_PREFIX) ) {
--
-- if((returnType == Void.TYPE) && (parameters.length == 1)) {
-- if (hasCorrespondingReadProperty(m, c, JAVA_GET_PROPERTY_PREFIX) ||
-- hasCorrespondingReadProperty(m, c, JAVA_IS_PROPERTY_PREFIX)) {
-- propertyType = JAVA_SET_PROPERTY_PREFIX;
-- }
-- }
--
-- } else if( methodName.startsWith(JAVA_IS_PROPERTY_PREFIX) ) {
-- if((parameters.length == 0) && (returnType == Boolean.TYPE)) {
-- propertyType = JAVA_IS_PROPERTY_PREFIX;
-- }
-- }
--
-- // Some final checks that apply to all properties.
-- if( propertyType != null ) {
-- if(!validPropertyExceptions(m) ||
-- (methodName.length() <= propertyType.length())) {
-- propertyType = null;
-- }
-- }
--
-- return propertyType ;
-- }
--
-- private boolean hasCorrespondingReadProperty
-- (Method writeProperty, Class c, String readPropertyPrefix) {
--
-- String writePropertyMethodName = writeProperty.getName();
-- Class[] writePropertyParameters = writeProperty.getParameterTypes();
-- boolean foundReadProperty = false;
--
-- try {
-- // Look for a valid corresponding Read property
-- String readPropertyMethodName =
-- writePropertyMethodName.replaceFirst
-- (JAVA_SET_PROPERTY_PREFIX, readPropertyPrefix);
-- Method readPropertyMethod = c.getMethod(readPropertyMethodName,
-- new Class[] {});
-- foundReadProperty =
-- ((propertyAccessorMethodType(readPropertyMethod, c) != null) &&
-- (readPropertyMethod.getReturnType() ==
-- writePropertyParameters[0]));
-- } catch(Exception e) {
-- // ignore. this means we didn't find a corresponding get property.
-- }
--
-- return foundReadProperty;
-- }
--
-- public String getAttributeNameForProperty(String propertyName) {
-- String attributeName = null;
-- String prefix = null;
--
-- if( propertyName.startsWith(JAVA_GET_PROPERTY_PREFIX) ) {
-- prefix = JAVA_GET_PROPERTY_PREFIX;
-- } else if( propertyName.startsWith(JAVA_SET_PROPERTY_PREFIX) ) {
-- prefix = JAVA_SET_PROPERTY_PREFIX;
-- } else if( propertyName.startsWith(JAVA_IS_PROPERTY_PREFIX) ) {
-- prefix = JAVA_IS_PROPERTY_PREFIX;
-- }
--
-- if( (prefix != null) && (prefix.length() < propertyName.length()) ) {
-- String remainder = propertyName.substring(prefix.length());
-- if( (remainder.length() >= 2) &&
-- Character.isUpperCase(remainder.charAt(0)) &&
-- Character.isUpperCase(remainder.charAt(1)) ) {
-- // don't set the first letter to lower-case if the
-- // first two are upper-case
-- attributeName = remainder;
-- } else {
-- attributeName = Character.toLowerCase(remainder.charAt(0)) +
-- remainder.substring(1);
-- }
-- }
--
-- return attributeName;
-- }
--
-- /**
-- * Return IDL Type name for primitive types as defined in
-- * Section 1.3.3 of Java2IDL spec or null if not a primitive type.
-- */
-- public IDLType getPrimitiveIDLTypeMapping(Class c) {
--
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- if( c.isPrimitive() ) {
-- if( c == Void.TYPE ) {
-- return new IDLType( c, "void" ) ;
-- } else if( c == Boolean.TYPE ) {
-- return new IDLType( c, "boolean" ) ;
-- } else if( c == Character.TYPE ) {
-- return new IDLType( c, "wchar" ) ;
-- } else if( c == Byte.TYPE ) {
-- return new IDLType( c, "octet" ) ;
-- } else if( c == Short.TYPE ) {
-- return new IDLType( c, "short" ) ;
-- } else if( c == Integer.TYPE ) {
-- return new IDLType( c, "long" ) ;
-- } else if( c == Long.TYPE ) {
-- return new IDLType( c, "long_long" ) ;
-- } else if( c == Float.TYPE ) {
-- return new IDLType( c, "float" ) ;
-- } else if( c == Double.TYPE ) {
-- return new IDLType( c, "double" ) ;
-- }
-- }
--
-- return null;
-- }
--
-- /**
-- * Return IDL Type name for special case type mappings as defined in
-- * Table 1-1 of Java2IDL spec or null if given class is not a special
-- * type.
-- */
-- public IDLType getSpecialCaseIDLTypeMapping(Class c) {
--
-- if( c == null ) {
-- throw new IllegalArgumentException();
-- }
--
-- if( c == java.lang.Object.class ) {
-- return new IDLType( c, new String[] { "java", "lang" },
-- "Object" ) ;
-- } else if( c == java.lang.String.class ) {
-- return new IDLType( c, new String[] { "CORBA" },
-- "WStringValue" ) ;
-- } else if( c == java.lang.Class.class ) {
-- return new IDLType( c, new String[] { "javax", "rmi", "CORBA" },
-- "ClassDesc" ) ;
-- } else if( c == java.io.Serializable.class ) {
-- return new IDLType( c, new String[] { "java", "io" },
-- "Serializable" ) ;
-- } else if( c == java.io.Externalizable.class ) {
-- return new IDLType( c, new String[] { "java", "io" },
-- "Externalizable" ) ;
-- } else if( c == java.rmi.Remote.class ) {
-- return new IDLType( c, new String[] { "java", "rmi" },
-- "Remote" ) ;
-- } else if( c == org.omg.CORBA.Object.class ) {
-- return new IDLType( c, "Object" ) ;
-- } else {
-- return null;
-- }
-- }
--
-- /**
-- * Implements 1.2.3 #2 and #4
-- */
-- private void validateExceptions(Method method) throws IDLTypeException {
--
-- Class[] exceptions = method.getExceptionTypes();
--
-- boolean declaresRemoteExceptionOrSuperClass = false;
--
-- // Section 1.2.3, #2
-- for(int eIndex = 0; eIndex < exceptions.length; eIndex++) {
-- Class exception = exceptions[eIndex];
-- if( isRemoteExceptionOrSuperClass(exception) ) {
-- declaresRemoteExceptionOrSuperClass = true;
-- break;
-- }
-- }
--
-- if( !declaresRemoteExceptionOrSuperClass ) {
-- String msg = "Method '" + method + "' must throw at least one " +
-- "exception of type java.rmi.RemoteException or one of its " +
-- "super-classes";
-- throw new IDLTypeException(msg);
-- }
--
-- // Section 1.2.3, #4
-- // See also bug 4972402
-- // For all exceptions E in exceptions,
-- // (isCheckedException(E) => (isValue(E) || RemoteException.isAssignableFrom( E ) )
-- for(int eIndex = 0; eIndex < exceptions.length; eIndex++) {
-- Class exception = exceptions[eIndex];
--
-- if (isCheckedException(exception) && !isValue(exception) &&
-- !isRemoteException(exception))
-- {
-- String msg = "Exception '" + exception + "' on method '" +
-- method + "' is not a allowed RMI/IIOP exception type";
-- throw new IDLTypeException(msg);
-- }
-- }
--
-- return;
-- }
--
-- /**
-- * Returns true if the method's throw clause conforms to the exception
-- * restrictions for properties as defined in Section 1.3.4.3 of
-- * Java2IDL spec. This means that for all exceptions E declared on the
-- * method, E isChecked => RemoteException.isAssignableFrom( E ).
-- */
-- private boolean validPropertyExceptions(Method method)
-- {
-- Class[] exceptions = method.getExceptionTypes();
--
-- for(int eIndex = 0; eIndex < exceptions.length; eIndex++) {
-- Class exception = exceptions[eIndex];
--
-- if (isCheckedException(exception) && !isRemoteException(exception))
-- return false ;
-- }
--
-- return true;
-- }
--
-- /**
-- * Implements Section 1.2.3, #2.
-- */
-- private boolean isRemoteExceptionOrSuperClass(Class c) {
-- return
-- ((c == java.rmi.RemoteException.class) ||
-- (c == java.io.IOException.class) ||
-- (c == java.lang.Exception.class) ||
-- (c == java.lang.Throwable.class));
-- }
--
-- /**
-- * Implements Section 1.2.3, #5.
-- */
-- private void validateDirectInterfaces(Class c) throws IDLTypeException {
--
-- Class[] directInterfaces = c.getInterfaces();
--
-- if( directInterfaces.length < 2 ) {
-- return;
-- }
--
-- Set allMethodNames = new HashSet();
-- Set currentMethodNames = new HashSet();
--
-- for(int i = 0; i < directInterfaces.length; i++) {
-- Class next = directInterfaces[i];
-- Method[] methods = next.getMethods();
--
-- // Comparison is based on method names only. First collect
-- // all methods from current interface, eliminating duplicate
-- // names.
-- currentMethodNames.clear();
-- for(int m = 0; m < methods.length; m++) {
-- currentMethodNames.add(methods[m].getName());
-- }
--
-- // Now check each method against list of all unique method
-- // names processed so far.
-- for(Iterator iter=currentMethodNames.iterator(); iter.hasNext();) {
-- String methodName = (String) iter.next();
-- if( allMethodNames.contains(methodName) ) {
-- String msg = "Class " + c + " inherits method " +
-- methodName + " from multiple direct interfaces.";
-- throw new IDLTypeException(msg);
-- } else {
-- allMethodNames.add(methodName);
-- }
-- }
-- }
--
-- return;
-- }
--
-- /**
-- * Implements 1.2.3 #6
-- */
-- private void validateConstants(final Class c)
-- throws IDLTypeException {
--
-- Field[] fields = null;
--
-- try {
-- fields = (Field[])
-- java.security.AccessController.doPrivileged
-- (new java.security.PrivilegedExceptionAction() {
-- public java.lang.Object run() throws Exception {
-- return c.getFields();
-- }
-- });
-- } catch(java.security.PrivilegedActionException pae) {
-- IDLTypeException ite = new IDLTypeException();
-- ite.initCause(pae);
-- throw ite;
-- }
--
-- for(int i = 0; i < fields.length; i++) {
-- Field next = fields[i];
-- Class fieldType = next.getType();
-- if( (fieldType != java.lang.String.class) &&
-- !isPrimitive(fieldType) ) {
-- String msg = "Constant field '" + next.getName() +
-- "' in class '" + next.getDeclaringClass().getName() +
-- "' has invalid type' " + next.getType() + "'. Constants" +
-- " in RMI/IIOP interfaces can only have primitive" +
-- " types and java.lang.String types.";
-- throw new IDLTypeException(msg);
-- }
-- }
--
--
-- return;
-- }
--
--}
---- ./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 2014-07-15 21:45:53.000000000 -0700
-@@ -43,6 +43,8 @@
- import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ;
- import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ;
- import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl ;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-
- public class InvocationHandlerFactoryImpl implements InvocationHandlerFactory
- {
-@@ -114,24 +116,32 @@
- // which extends org.omg.CORBA.Object. This handler delegates all
- // calls directly to a DynamicStubImpl, which extends
- // org.omg.CORBA.portable.ObjectImpl.
-- InvocationHandler dynamicStubHandler =
-+ final InvocationHandler dynamicStubHandler =
- DelegateInvocationHandlerImpl.create( stub ) ;
-
- // Create an invocation handler that handles any remote interface
- // methods.
-- InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
-+ final InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl(
- pm, classData, stub ) ;
-
- // Create a composite handler that handles the DynamicStub interface
- // as well as the remote interfaces.
- final CompositeInvocationHandler handler =
- new CustomCompositeInvocationHandlerImpl( stub ) ;
-+
-+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
-+ @Override
-+ public Void run() {
- handler.addInvocationHandler( DynamicStub.class,
- dynamicStubHandler ) ;
- handler.addInvocationHandler( org.omg.CORBA.Object.class,
- dynamicStubHandler ) ;
- handler.addInvocationHandler( Object.class,
- dynamicStubHandler ) ;
-+ return null;
-+ }
-+ });
-+
-
- // 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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -25,6 +25,7 @@
-
- package com.sun.corba.se.impl.presentation.rmi ;
-
-+import java.io.SerializablePermission;
- import java.lang.reflect.InvocationHandler ;
- import java.lang.reflect.Proxy ;
-
-@@ -38,11 +39,18 @@
- {
- protected final ClassLoader loader ;
-
-- public StubFactoryDynamicBase( PresentationManager.ClassData classData,
-- ClassLoader loader )
-- {
-- super( classData ) ;
-+ private static Void checkPermission() {
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ sm.checkPermission(new SerializablePermission(
-+ "enableSubclassImplementation"));
-+ }
-+ return null;
-+ }
-
-+ private StubFactoryDynamicBase(Void unused,
-+ PresentationManager.ClassData classData, ClassLoader loader) {
-+ super(classData);
- // this.loader must not be null, or the newProxyInstance call
- // will fail.
- if (loader == null) {
-@@ -55,5 +63,11 @@
- }
- }
-
-+ public StubFactoryDynamicBase( PresentationManager.ClassData classData,
-+ ClassLoader loader )
-+ {
-+ this (checkPermission(), classData, loader);
-+ }
-+
- 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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -25,14 +25,23 @@
-
- package com.sun.corba.se.impl.presentation.rmi;
-
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+
- import com.sun.corba.se.spi.presentation.rmi.PresentationManager ;
-
- public class StubFactoryFactoryProxyImpl extends StubFactoryFactoryDynamicBase
- {
- public PresentationManager.StubFactory makeDynamicStubFactory(
-- PresentationManager pm, PresentationManager.ClassData classData,
-- ClassLoader classLoader )
-+ PresentationManager pm, final PresentationManager.ClassData classData,
-+ final ClassLoader classLoader )
- {
-- return new StubFactoryProxyImpl( classData, classLoader ) ;
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<StubFactoryProxyImpl>() {
-+ @Override
-+ public StubFactoryProxyImpl run() {
-+ return new StubFactoryProxyImpl(classData, classLoader);
-+ }
-+ });
- }
- }
---- ./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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2001, 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
-@@ -115,6 +115,7 @@
-
- import java.util.concurrent.ConcurrentMap;
- import java.util.concurrent.ConcurrentHashMap;
-+import sun.corba.EncapsInputStreamFactory;
-
- /**
- * ClientDelegate is the RMI client-side subcontract or representation
-@@ -847,8 +848,8 @@
- }
- byte[] data = ((UnknownServiceContext)sc).getData();
- EncapsInputStream in =
-- new EncapsInputStream((ORB)messageMediator.getBroker(),
-- data, data.length);
-+ EncapsInputStreamFactory.newEncapsInputStream((ORB)messageMediator.getBroker(),
-+ data, data.length);
- in.consumeEndian();
-
- 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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2004, 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
-@@ -36,7 +36,8 @@
- import java.util.Iterator;
- import java.rmi.RemoteException;
- import java.nio.ByteBuffer;
--
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
- import javax.rmi.CORBA.Util;
- import javax.rmi.CORBA.Tie;
-
-@@ -111,6 +112,7 @@
- import com.sun.corba.se.impl.protocol.giopmsgheaders.ProfileAddr;
- import com.sun.corba.se.impl.protocol.giopmsgheaders.ReferenceAddr;
- import com.sun.corba.se.impl.transport.CorbaContactInfoListIteratorImpl;
-+import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
- import com.sun.corba.se.impl.util.JDKBridge;
-
- /**
-@@ -156,10 +158,17 @@
-
- ByteBufferWithInfo bbwi = cdrOutputObject.getByteBufferWithInfo();
- cdrOutputObject.getMessageHeader().setSize(bbwi.byteBuffer, bbwi.getSize());
--
-- CDRInputObject cdrInputObject =
-- new CDRInputObject(orb, null, bbwi.byteBuffer,
-- cdrOutputObject.getMessageHeader());
-+ final ORB inOrb = orb;
-+ final ByteBuffer inBuffer = bbwi.byteBuffer;
-+ final Message inMsg = cdrOutputObject.getMessageHeader();
-+ CDRInputObject cdrInputObject = AccessController
-+ .doPrivileged(new PrivilegedAction<CDRInputObject>() {
-+ @Override
-+ public CDRInputObject run() {
-+ return new CDRInputObject(inOrb, null, inBuffer,
-+ inMsg);
-+ }
-+ });
- messageMediator.setInputObject(cdrInputObject);
- cdrInputObject.setMessageMediator(messageMediator);
-
-@@ -192,9 +201,17 @@
- cdrOutputObject = (CDROutputObject) messageMediator.getOutputObject();
- bbwi = cdrOutputObject.getByteBufferWithInfo();
- cdrOutputObject.getMessageHeader().setSize(bbwi.byteBuffer, bbwi.getSize());
-- cdrInputObject =
-- new CDRInputObject(orb, null, bbwi.byteBuffer,
-- cdrOutputObject.getMessageHeader());
-+ final ORB inOrb2 = orb;
-+ final ByteBuffer inBuffer2 = bbwi.byteBuffer;
-+ final Message inMsg2 = cdrOutputObject.getMessageHeader();
-+ cdrInputObject = AccessController
-+ .doPrivileged(new PrivilegedAction<CDRInputObject>() {
-+ @Override
-+ public CDRInputObject run() {
-+ return new CDRInputObject(inOrb2, null, inBuffer2,
-+ inMsg2);
-+ }
-+ });
- messageMediator.setInputObject(cdrInputObject);
- cdrInputObject.setMessageMediator(messageMediator);
-
---- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalClientRequestImpl.sjava 2013-09-06 11:20:50.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalClientRequestImpl.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,138 +0,0 @@
--/*
-- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. 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.corba.se.impl.iiop;
--
--import com.sun.corba.se.impl.protocol.Request;
--import com.sun.corba.se.impl.core.ClientRequest;
--import com.sun.corba.se.impl.core.ServiceContext;
--import com.sun.corba.se.impl.core.ServiceContexts;
--import com.sun.corba.se.impl.core.ClientResponse;
--import com.sun.corba.se.impl.core.ServerRequest;
--import com.sun.corba.se.impl.core.ServerResponse;
--import com.sun.corba.se.impl.corba.IOR;
--import com.sun.corba.se.impl.corba.GIOPVersion;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.MessageBase;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage;
--import com.sun.corba.se.impl.orbutil.ORBConstants;
--import com.sun.corba.se.impl.core.ORBVersion;
--import com.sun.corba.se.impl.core.ORB;
--import com.sun.corba.se.impl.orbutil.ORBUtility;
--import com.sun.corba.se.impl.ior.ObjectKeyFactory ;
--import com.sun.corba.se.impl.ior.ObjectKey ;
--import com.sun.corba.se.impl.ior.ObjectKeyTemplate ;
--import com.sun.corba.se.impl.ior.IIOPProfile;
--
--public class LocalClientRequestImpl extends IIOPOutputStream
-- implements ClientRequest
--{
-- public LocalClientRequestImpl( GIOPVersion gv,
-- ORB orb, IOR ior, short addrDisposition,
-- String operationName, boolean oneway, ServiceContexts svc,
-- int requestId, byte streamFormatVersion)
-- {
-- super(gv,
-- orb,
-- null,
-- BufferManagerFactory.newBufferManagerWrite(BufferManagerFactory.GROW),
-- streamFormatVersion);
--
-- this.isOneway = oneway;
-- boolean responseExpected = !isOneway;
--
-- IIOPProfile iop = ior.getProfile();
-- ObjectKey okey = iop.getObjectKey();
-- ObjectKeyTemplate oktemp = okey.getTemplate() ;
-- ORBVersion version = oktemp.getORBVersion() ;
-- orb.setORBVersion( version ) ;
--
-- this.request = MessageBase.createRequest(orb, gv, requestId,
-- responseExpected, ior, addrDisposition, operationName, svc, null);
-- setMessage(request);
-- request.write(this);
--
-- // mark beginning of msg body for possible later use
-- bodyBegin = getSize();
-- }
--
-- public int getRequestId() {
-- return request.getRequestId();
-- }
--
-- public boolean isOneWay() {
-- return isOneway;
-- }
--
-- public ServiceContexts getServiceContexts() {
-- return request.getServiceContexts();
-- }
--
-- public String getOperationName() {
-- return request.getOperation();
-- }
--
-- public ObjectKey getObjectKey() {
-- return request.getObjectKey();
-- }
--
-- public ServerRequest getServerRequest()
-- {
-- // Set the size of the marshalled data in the message header.
-- getMessage().setSize( getByteBuffer(), getSize() ) ;
--
-- // Construct a new ServerRequest out of the buffer in this ClientRequest
-- LocalServerRequestImpl serverRequest = new LocalServerRequestImpl(
-- (ORB)orb(), toByteArray(), request ) ;
--
-- // Skip over all of the GIOP header information. This positions
-- // the offset in the buffer so that the skeleton can correctly read
-- // the marshalled arguments.
-- serverRequest.setIndex( bodyBegin ) ;
--
-- return serverRequest ;
-- }
--
-- public ClientResponse invoke()
-- {
-- ORB myORB = (ORB)orb() ;
--
-- ServerResponse serverResponse = myORB.process( getServerRequest() ) ;
--
-- LocalServerResponseImpl lsr = (LocalServerResponseImpl)serverResponse ;
--
-- return lsr.getClientResponse() ;
-- }
--
-- /**
-- * Check to see if the request is local.
-- */
-- public boolean isLocal(){
-- return true;
-- }
--
-- private RequestMessage request;
-- private int bodyBegin;
-- private boolean isOneway;
--}
---- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalClientResponseImpl.sjava 2013-09-06 11:20:50.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalClientResponseImpl.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,162 +0,0 @@
--/*
-- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. 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.corba.se.impl.iiop;
--
--import java.io.IOException;
--
--import org.omg.CORBA.SystemException;
--import org.omg.CORBA.CompletionStatus;
--
--import com.sun.corba.se.impl.core.Response;
--import com.sun.corba.se.impl.core.ClientResponse;
--import com.sun.corba.se.impl.corba.IOR;
--import com.sun.corba.se.impl.core.ORB;
--import com.sun.corba.se.impl.core.ServiceContext;
--import com.sun.corba.se.impl.core.ServiceContexts;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.ReplyMessage;
--import com.sun.corba.se.impl.orbutil.MinorCodes;
--
--class LocalClientResponseImpl extends IIOPInputStream implements ClientResponse
--{
-- LocalClientResponseImpl(ORB orb, byte[] buf, ReplyMessage header)
-- {
-- super(orb, buf, header.getSize(), header.isLittleEndian(), header, null);
--
-- this.reply = header;
--
-- // NOTE (Ram J) (06/02/2000) if we set result.setIndex(bodyBegin)
-- // in LocalServerResponse.getClientResponse(), then we do not need
-- // to read the headers (done below) anymore.
-- // This will be an optimisation which is can be done to speed up the
-- // local invocation by avoiding reading the headers in the local cases.
--
-- // BUGFIX(Ram Jeyaraman) This has been moved from
-- // LocalServerResponse.getClientResponse()
-- // Skip over all of the GIOP header information. This positions
-- // the offset in the buffer so that the skeleton can correctly read
-- // the marshalled arguments.
-- this.setIndex(Message.GIOPMessageHeaderLength);
--
-- // BUGFIX(Ram Jeyaraman) For local invocations, the reply mesg fields
-- // needs to be set, by reading the response buffer contents
-- // to correctly set the exception type and other info.
-- this.reply.read(this);
-- }
--
-- LocalClientResponseImpl(SystemException ex)
-- {
-- this.systemException = ex;
-- }
--
-- public boolean isSystemException() {
-- if ( reply != null )
-- return reply.getReplyStatus() == ReplyMessage.SYSTEM_EXCEPTION;
-- else
-- return (systemException != null);
-- }
--
-- public boolean isUserException() {
-- if ( reply != null )
-- return reply.getReplyStatus() == ReplyMessage.USER_EXCEPTION;
-- else
-- return false;
-- }
--
-- public boolean isLocationForward() {
-- if ( reply != null ) {
-- return ( (reply.getReplyStatus() == ReplyMessage.LOCATION_FORWARD) ||
-- (reply.getReplyStatus() == ReplyMessage.LOCATION_FORWARD_PERM) );
-- //return reply.getReplyStatus() == ReplyMessage.LOCATION_FORWARD;
-- } else {
-- return false;
-- }
-- }
--
-- public boolean isDifferentAddrDispositionRequested() {
-- if (reply != null) {
-- return reply.getReplyStatus() == ReplyMessage.NEEDS_ADDRESSING_MODE;
-- }
--
-- return false;
-- }
--
-- public short getAddrDisposition() {
-- if (reply != null) {
-- return reply.getAddrDisposition();
-- }
--
-- throw new org.omg.CORBA.INTERNAL(
-- "Null reply in getAddrDisposition",
-- MinorCodes.NULL_REPLY_IN_GET_ADDR_DISPOSITION,
-- CompletionStatus.COMPLETED_MAYBE);
-- }
--
-- public IOR getForwardedIOR() {
-- if ( reply != null )
-- return reply.getIOR();
-- else
-- return null;
-- }
--
-- public int getRequestId() {
-- if ( reply != null )
-- return reply.getRequestId();
-- else
-- throw new org.omg.CORBA.INTERNAL("Error in getRequestId");
-- }
--
-- public ServiceContexts getServiceContexts() {
-- if ( reply != null )
-- return reply.getServiceContexts();
-- else
-- return null;
-- }
--
-- public SystemException getSystemException() {
-- if ( reply != null )
-- return reply.getSystemException();
-- else
-- return systemException;
-- }
--
-- public java.lang.String peekUserExceptionId() {
-- mark(Integer.MAX_VALUE);
-- String result = read_string();
-- reset();
-- return result;
-- }
--
-- /**
-- * Check to see if the response is local.
-- */
-- public boolean isLocal(){
-- return true;
-- }
--
-- private ReplyMessage reply;
-- private SystemException systemException;
--}
---- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalServerRequestImpl.sjava 2013-09-06 11:20:50.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalServerRequestImpl.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,208 +0,0 @@
--/*
-- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. 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.corba.se.impl.iiop;
--
--import org.omg.CORBA.SystemException;
--
--import com.sun.corba.se.impl.core.ServerRequest;
--import com.sun.corba.se.impl.core.ServiceContext;
--import com.sun.corba.se.impl.core.DuplicateServiceContext;
--import com.sun.corba.se.impl.core.UEInfoServiceContext;
--import com.sun.corba.se.impl.core.ServiceContexts;
--import com.sun.corba.se.impl.core.ServerResponse;
--import com.sun.corba.se.impl.corba.IOR;
--import com.sun.corba.se.impl.core.ORB;
--import com.sun.corba.se.impl.orbutil.ORBUtility; //d11638
--import org.omg.CORBA.portable.UnknownException;
--import org.omg.CORBA.UNKNOWN;
--import org.omg.CORBA.CompletionStatus;
--import com.sun.corba.se.impl.ior.ObjectKey;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.MessageBase;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.ReplyMessage;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage;
--
--class LocalServerRequestImpl extends IIOPInputStream implements ServerRequest {
-- org.omg.CORBA.portable.OutputStream replyStream;
-- org.omg.CORBA.portable.OutputStream exceptionReplyStream;
--
-- LocalServerRequestImpl(ORB orb, byte[] buf, RequestMessage header)
-- {
-- super(orb, buf, header.getSize(), header.isLittleEndian(), header, null );
--
-- this.request = header;
-- }
--
-- public int getRequestId() {
-- return request.getRequestId();
-- }
--
-- public boolean isOneWay() {
-- return !request.isResponseExpected();
-- }
--
-- public ServiceContexts getServiceContexts() {
-- return request.getServiceContexts();
-- }
--
-- public String getOperationName() {
-- return request.getOperation();
-- }
--
-- public ObjectKey getObjectKey() {
-- return request.getObjectKey();
-- }
--
-- public ServerResponse createResponse(ServiceContexts svc)
-- {
-- return new LocalServerResponseImpl(this, svc);
-- }
--
-- public org.omg.CORBA.portable.OutputStream createReply() {
-- if (replyStream == null) {
-- replyStream = (org.omg.CORBA.portable.OutputStream)
-- createResponse(null);
-- }
-- return replyStream;
-- }
--
-- public org.omg.CORBA.portable.OutputStream createExceptionReply() {
-- if (exceptionReplyStream == null) {
-- exceptionReplyStream = (org.omg.CORBA.portable.OutputStream)
-- createUserExceptionResponse(null);
-- }
-- return exceptionReplyStream;
-- }
--
-- public ServerResponse createUserExceptionResponse(
-- ServiceContexts svc)
-- {
-- return new LocalServerResponseImpl(this, svc, true);
-- }
--
-- public ServerResponse createUnknownExceptionResponse(
-- UnknownException ex) {
-- ServiceContexts contexts = null;
-- SystemException sys = new UNKNOWN( 0,
-- CompletionStatus.COMPLETED_MAYBE);
--
-- try {
-- contexts = new ServiceContexts( (ORB)orb() );
-- UEInfoServiceContext uei = new UEInfoServiceContext(sys);
-- contexts.put(uei) ;
-- } catch (DuplicateServiceContext d) {
-- // can't happen
-- }
--
-- return createSystemExceptionResponse(sys,contexts);
-- }
--
-- public ServerResponse createSystemExceptionResponse(
-- SystemException ex, ServiceContexts svc) {
--
-- // Only do this if interceptors have been initialized on this request
-- // and have not completed their lifecycle (otherwise the info stack
-- // may be empty or have a different request's entry on top).
-- if (executePIInResponseConstructor()) {
-- // Inform Portable Interceptors of the SystemException. This is
-- // required to be done here because the ending interception point
-- // is called in the ServerResponseImpl constructor called below
-- // but we do not currently write the SystemException into the
-- // response until after the ending point is called.
-- ORB orb = (ORB)orb();
-- orb.getPIHandler().setServerPIInfo( ex );
-- }
--
-- if (orb() != null && ((ORB)orb()).subcontractDebugFlag && ex != null)
-- ORBUtility.dprint(this, "Sending SystemException:", ex);
--
-- LocalServerResponseImpl response =
-- new LocalServerResponseImpl(this, svc, false);
-- ORBUtility.writeSystemException(ex, response);
-- return response;
-- }
--
-- public ServerResponse createLocationForward(
-- IOR ior, ServiceContexts svc) {
-- ReplyMessage reply = MessageBase.createReply( (ORB)orb(),
-- request.getGIOPVersion(), request.getRequestId(),
-- ReplyMessage.LOCATION_FORWARD, svc, ior);
-- LocalServerResponseImpl response =
-- new LocalServerResponseImpl(this, reply, ior);
--
-- return response;
-- }
--
-- private RequestMessage request;
--
-- /**
-- * Check to see if the request is local.
-- */
-- public boolean isLocal(){
-- return true;
-- }
--
-- private boolean _executeReturnServantInResponseConstructor = false;
--
-- public boolean executeReturnServantInResponseConstructor()
-- {
-- return _executeReturnServantInResponseConstructor;
-- }
--
-- public void setExecuteReturnServantInResponseConstructor(boolean b)
-- {
-- _executeReturnServantInResponseConstructor = b;
-- }
--
--
-- private boolean _executeRemoveThreadInfoInResponseConstructor = false;
--
-- public boolean executeRemoveThreadInfoInResponseConstructor()
-- {
-- return _executeRemoveThreadInfoInResponseConstructor;
-- }
--
-- public void setExecuteRemoveThreadInfoInResponseConstructor(boolean b)
-- {
-- _executeRemoveThreadInfoInResponseConstructor = b;
-- }
--
--
-- private boolean _executePIInResponseConstructor = false;
--
-- public boolean executePIInResponseConstructor() {
-- return _executePIInResponseConstructor;
-- }
--
-- public void setExecutePIInResponseConstructor( boolean b ) {
-- _executePIInResponseConstructor = b;
-- }
--
-- // We know that we're talking to the same ValueHandler, so
-- // use the maximum version it supports.
-- public byte getStreamFormatVersionForReply() {
-- return ORBUtility.getMaxStreamFormatVersion();
-- }
--}
---- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalServerResponseImpl.sjava 2013-09-06 11:20:50.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/oldlocal/LocalServerResponseImpl.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,192 +0,0 @@
--/*
-- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. 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.corba.se.impl.iiop;
--
--import org.omg.CORBA.SystemException;
--
--import com.sun.corba.se.impl.core.ServerResponse;
--import com.sun.corba.se.impl.core.ORB;
--import com.sun.corba.se.impl.corba.IOR;
--import com.sun.corba.se.impl.core.ServiceContext;
--import com.sun.corba.se.impl.core.ServiceContexts;
--import com.sun.corba.se.impl.core.ClientResponse;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.MessageBase;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.ReplyMessage;
--
--class LocalServerResponseImpl
-- extends IIOPOutputStream
-- implements ServerResponse
--{
-- LocalServerResponseImpl(LocalServerRequestImpl request, ServiceContexts svc)
-- {
-- this(request,
-- MessageBase.createReply(
-- (ORB)request.orb(),
-- request.getGIOPVersion(),
-- request.getRequestId(), ReplyMessage.NO_EXCEPTION,
-- svc, null),
-- null);
-- }
--
-- LocalServerResponseImpl(LocalServerRequestImpl request, ServiceContexts svc,
-- boolean user)
-- {
-- this(request,
-- MessageBase.createReply(
-- (ORB)request.orb(),
-- request.getGIOPVersion(), request.getRequestId(),
-- user ? ReplyMessage.USER_EXCEPTION :
-- ReplyMessage.SYSTEM_EXCEPTION,
-- svc, null),
-- null);
-- }
--
-- LocalServerResponseImpl( LocalServerRequestImpl request, ReplyMessage reply,
-- IOR ior)
-- {
-- super(request.getGIOPVersion(),
-- (ORB)request.orb(),
-- null,
-- BufferManagerFactory.newBufferManagerWrite(BufferManagerFactory.GROW),
-- request.getStreamFormatVersionForReply());
--
-- setMessage(reply);
--
-- ORB orb = (ORB)request.orb();
--
-- ServerResponseImpl.runServantPostInvoke(orb, request);
--
-- if( request.executePIInResponseConstructor() ) {
-- // Invoke server request ending interception points (send_*):
-- // Note: this may end up with a SystemException or an internal
-- // Runtime ForwardRequest.
-- orb.getPIHandler().invokeServerPIEndingPoint( reply );
--
-- // Note this will be executed even if a ForwardRequest or
-- // SystemException is thrown by a Portable Interceptors ending
-- // point since we end up in this constructor again anyway.
-- orb.getPIHandler().cleanupServerPIRequest();
--
-- // See (Local)ServerRequestImpl.createSystemExceptionResponse
-- // for why this is necesary.
-- request.setExecutePIInResponseConstructor(false);
-- }
--
-- // Once you get here then the final reply is available (i.e.,
-- // postinvoke and interceptors have completed.
-- if (request.executeRemoveThreadInfoInResponseConstructor()) {
-- ServerResponseImpl.removeThreadInfo(orb, request);
-- }
--
-- reply.write(this);
-- if (reply.getIOR() != null)
-- reply.getIOR().write(this);
--
-- this.reply = reply;
-- this.ior = reply.getIOR();
-- }
--
-- public boolean isSystemException() {
-- if (reply != null)
-- return reply.getReplyStatus() == ReplyMessage.SYSTEM_EXCEPTION;
-- return false;
-- }
--
-- public boolean isUserException() {
-- if (reply != null)
-- return reply.getReplyStatus() == ReplyMessage.USER_EXCEPTION;
-- return false;
-- }
--
-- public boolean isLocationForward() {
-- if (ior != null)
-- return true;
-- return false;
-- }
--
-- public IOR getForwardedIOR() {
-- return ior;
-- }
--
-- public int getRequestId() {
-- if (reply != null)
-- return reply.getRequestId();
-- return -1;
-- }
--
-- public ServiceContexts getServiceContexts() {
-- if (reply != null)
-- return reply.getServiceContexts();
-- return null;
-- }
--
-- public SystemException getSystemException() {
-- if (reply != null)
-- return reply.getSystemException();
-- return null;
-- }
--
-- public ReplyMessage getReply()
-- {
-- return reply ;
-- }
--
-- public ClientResponse getClientResponse()
-- {
-- // set the size of the marshalled data in the message header
-- getMessage().setSize(getByteBuffer(), getSize());
--
-- // Construct a new ClientResponse out of the buffer in this ClientRequest
-- LocalClientResponseImpl result =
-- new LocalClientResponseImpl( (ORB)orb(), toByteArray(), reply);
--
-- // NOTE (Ram J) (06/02/2000) if we set result.setIndex(bodyBegin) here
-- // then the LocalClientResponse does not need to read the headers anymore.
-- // This will be an optimisation which is can be done to speed up the
-- // local invocation by avoiding reading the headers in the local cases.
--
-- // BUGFIX(Ram Jeyaraman) result.setOffset is now done in
-- // LocalClientResponseImpl constructor.
-- /*
-- // Skip over all of the GIOP header information. This positions
-- // the offset in the buffer so that the skeleton can correctly read
-- // the marshalled arguments.
-- result.setOffset( bodyBegin ) ;
-- */
--
-- return result ;
-- }
--
-- /**
-- * Check to see if the response is local.
-- */
-- public boolean isLocal(){
-- return true;
-- }
--
-- private ReplyMessage reply;
-- private IOR ior; // forwarded IOR
--}
---- ./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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -36,6 +36,8 @@
- import org.omg.CosNaming.NamingContextExt ;
- import org.omg.CosNaming.NamingContextExtHelper ;
-
-+import sun.corba.EncapsInputStreamFactory;
-+
- import com.sun.corba.se.spi.ior.IOR;
- import com.sun.corba.se.spi.ior.IORTemplate;
- import com.sun.corba.se.spi.ior.ObjectKey;
-@@ -114,8 +116,8 @@
- buf[j] = (byte)((ORBUtility.hexOf(str.charAt(i)) << UN_SHIFT) & 0xF0);
- buf[j] |= (byte)(ORBUtility.hexOf(str.charAt(i+1)) & 0x0F);
- }
-- EncapsInputStream s = new EncapsInputStream(orb, buf, buf.length,
-- orb.getORBData().getGIOPVersion());
-+ EncapsInputStream s = EncapsInputStreamFactory.newEncapsInputStream(orb, buf, buf.length,
-+ orb.getORBData().getGIOPVersion());
- s.consumeEndian();
- return s.read_Object() ;
- }
---- ./corba/src/share/classes/com/sun/corba/se/impl/transport/BufferConnectionImpl.sjava 2013-09-06 11:20:50.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/BufferConnectionImpl.sjava 1969-12-31 16:00:00.000000000 -0800
-@@ -1,710 +0,0 @@
--/*
-- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--package com.sun.corba.se.impl.transport;
--
--import java.io.IOException;
--import java.net.InetSocketAddress;
--import java.net.Socket;
--import java.nio.ByteBuffer;
--import java.nio.channels.SelectableChannel;
--import java.nio.channels.SelectionKey;
--import java.nio.channels.SocketChannel;
--import java.security.AccessController;
--import java.security.PrivilegedAction;
--import java.util.Collections;
--import java.util.Hashtable;
--import java.util.HashMap;
--import java.util.Map;
--
--import org.omg.CORBA.COMM_FAILURE;
--import org.omg.CORBA.CompletionStatus;
--import org.omg.CORBA.DATA_CONVERSION;
--import org.omg.CORBA.INTERNAL;
--import org.omg.CORBA.MARSHAL;
--import org.omg.CORBA.OBJECT_NOT_EXIST;
--import org.omg.CORBA.SystemException;
--
--import com.sun.org.omg.SendingContext.CodeBase;
--
--import com.sun.corba.se.pept.broker.Broker;
--import com.sun.corba.se.pept.encoding.InputObject;
--import com.sun.corba.se.pept.encoding.OutputObject;
--import com.sun.corba.se.pept.protocol.MessageMediator;
--import com.sun.corba.se.pept.transport.Acceptor;
--import com.sun.corba.se.pept.transport.Connection;
--import com.sun.corba.se.pept.transport.ConnectionCache;
--import com.sun.corba.se.pept.transport.ContactInfo;
--import com.sun.corba.se.pept.transport.EventHandler;
--import com.sun.corba.se.pept.transport.InboundConnectionCache;
--import com.sun.corba.se.pept.transport.OutboundConnectionCache;
--import com.sun.corba.se.pept.transport.ResponseWaitingRoom;
--import com.sun.corba.se.pept.transport.Selector;
--
--import com.sun.corba.se.spi.ior.IOR;
--import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
--import com.sun.corba.se.spi.logging.CORBALogDomains;
--import com.sun.corba.se.spi.orb.ORB ;
--import com.sun.corba.se.spi.orbutil.threadpool.Work;
--import com.sun.corba.se.spi.protocol.CorbaMessageMediator;
--import com.sun.corba.se.spi.transport.CorbaContactInfo;
--import com.sun.corba.se.spi.transport.CorbaConnection;
--import com.sun.corba.se.spi.transport.CorbaResponseWaitingRoom;
--
--import com.sun.corba.se.impl.encoding.CachedCodeBase;
--import com.sun.corba.se.impl.encoding.CDRInputStream_1_0;
--import com.sun.corba.se.impl.encoding.CDROutputObject;
--import com.sun.corba.se.impl.encoding.CDROutputStream_1_0;
--import com.sun.corba.se.impl.encoding.CodeSetComponentInfo;
--import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry;
--import com.sun.corba.se.impl.logging.ORBUtilSystemException;
--import com.sun.corba.se.impl.orbutil.ORBConstants;
--import com.sun.corba.se.impl.orbutil.ORBUtility;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
--import com.sun.corba.se.impl.protocol.giopmsgheaders.MessageBase;
--import com.sun.corba.se.impl.transport.CorbaResponseWaitingRoomImpl;
--
--/**
-- * @author Ken Cavanaugh
-- */
--public class BufferConnectionImpl
-- extends
-- EventHandlerBase
-- implements
-- CorbaConnection,
-- Work
--{
-- //
-- // New transport.
-- //
--
-- protected long enqueueTime;
--
-- public SocketChannel getSocketChannel()
-- {
-- return null;
-- }
--
-- // REVISIT:
-- // protected for test: genericRPCMSGFramework.IIOPConnection constructor.
--
-- //
-- // From iiop.Connection.java
-- //
--
-- protected long timeStamp = 0;
-- protected boolean isServer = false;
--
-- // Start at some value other than zero since this is a magic
-- // value in some protocols.
-- protected int requestId = 5;
-- protected CorbaResponseWaitingRoom responseWaitingRoom;
-- protected int state;
-- protected java.lang.Object stateEvent = new java.lang.Object();
-- protected java.lang.Object writeEvent = new java.lang.Object();
-- protected boolean writeLocked;
-- protected int serverRequestCount = 0;
--
-- // Server request map: used on the server side of Connection
-- // Maps request ID to IIOPInputStream.
-- Map serverRequestMap = new HashMap() ;
--
-- // This is a flag associated per connection telling us if the
-- // initial set of sending contexts were sent to the receiver
-- // already...
-- protected boolean postInitialContexts = false;
--
-- // Remote reference to CodeBase server (supplies
-- // FullValueDescription, among other things)
-- protected IOR codeBaseServerIOR;
--
-- // CodeBase cache for this connection. This will cache remote operations,
-- // handle connecting, and ensure we don't do any remote operations until
-- // necessary.
-- protected CachedCodeBase cachedCodeBase = new CachedCodeBase(this);
--
-- protected ORBUtilSystemException wrapper ;
--
-- List buffers ;
--
-- public BufferConnectionImpl(ORB orb, byte[][] data )
-- {
-- this.orb = orb;
-- wrapper = ORBUtilSystemException.get( orb,
-- CORBALogDomains.RPC_TRANSPORT ) ;
-- buffers = new ArrayList() ;
-- }
--
-- ////////////////////////////////////////////////////
-- //
-- // framework.transport.Connection
-- //
--
-- public boolean shouldRegisterReadEvent()
-- {
-- return false;
-- }
--
-- public boolean shouldRegisterServerReadEvent()
-- {
-- return false;
-- }
--
-- public boolean read()
-- {
-- return true ;
-- }
--
-- protected CorbaMessageMediator readBits()
-- {
-- return null ;
-- }
--
-- protected boolean dispatch(CorbaMessageMediator messageMediator)
-- {
-- }
--
-- public boolean shouldUseDirectByteBuffers()
-- {
-- return false ;
-- }
--
-- // Only called from readGIOPMessage with (12, 0, 12) as arguments
-- // size is size of buffer to create
-- // offset is offset from start of message in buffer
-- // length is length to read
-- public ByteBuffer read(int size, int offset, int length)
-- throws IOException
-- {
-- byte[] buf = new byte[size];
-- readFully( buf, offset, length);
-- ByteBuffer byteBuffer = ByteBuffer.wrap(buf);
-- byteBuffer.limit(size);
-- return byteBuffer;
-- }
--
-- // Only called as read( buf, 12, msgsize-12 ) in readGIOPMessage
-- // We can ignore the byteBuffer parameter
-- // offset is the starting position to place data in the result
-- // length is the length of the data to read
-- public ByteBuffer read(ByteBuffer byteBuffer, int offset, int length)
-- throws IOException
-- {
-- int size = offset + length;
-- byte[] buf = new byte[size];
-- readFully(buf, offset, length);
-- return ByteBuffer.wrap(buf);
-- }
--
-- // Read size bytes from buffer list and place the data
-- // starting at offset in buf.
-- public void readFully(byte[] buf, int offset, int size)
-- throws IOException
-- {
-- int remaining = size ;
-- int position = offset ;
-- while (remaining > 0) {
-- ByteBuffer buff = (ByteBuffer)buffers.get(0) ;
-- int dataSize = buff.remaining() ;
-- int xferSize = dataSize ;
-- if (dataSize >= remaining) :
-- xferSize = remaining ;
-- buffers.remove(0) ;
-- }
--
-- buff.get( buf, offset, xferSize ) ;
--
-- offset += xferSize ;
-- remaining -= xferSize ;
-- }
-- }
--
-- public void write(ByteBuffer byteBuffer)
-- throws IOException
-- {
-- buffers.add( byteBuffer ) ;
-- }
--
-- /**
-- * Note:it is possible for this to be called more than once
-- */
-- public synchronized void close()
-- {
-- }
--
-- public Acceptor getAcceptor()
-- {
-- return null;
-- }
--
-- public ContactInfo getContactInfo()
-- {
-- return null;
-- }
--
-- public EventHandler getEventHandler()
-- {
-- return this;
-- }
--
-- public OutputObject createOutputObject(MessageMediator messageMediator)
-- {
-- // REVISIT - remove this method from Connection and all it subclasses.
-- throw new RuntimeException("*****SocketOrChannelConnectionImpl.createOutputObject - should not be called.");
-- }
--
-- // This is used by the GIOPOutputObject in order to
-- // throw the correct error when handling code sets.
-- // Can we determine if we are on the server side by
-- // other means? XREVISIT
-- public boolean isServer()
-- {
-- return isServer;
-- }
--
-- public boolean isBusy()
-- {
-- return false ;
-- }
--
-- public long getTimeStamp()
-- {
-- return timeStamp;
-- }
--
-- public void setTimeStamp(long time)
-- {
-- timeStamp = time;
-- }
--
-- public void setState(String stateString)
-- {
-- synchronized (stateEvent) {
-- if (stateString.equals("ESTABLISHED")) {
-- state = ESTABLISHED;
-- stateEvent.notifyAll();
-- } else {
-- // REVISIT: ASSERT
-- }
-- }
-- }
--
-- public void writeLock()
-- {
-- }
--
-- public void writeUnlock()
-- {
-- }
--
-- public void sendWithoutLock(OutputObject outputObject)
-- {
-- }
--
-- public void registerWaiter(MessageMediator messageMediator)
-- {
-- }
--
-- public void unregisterWaiter(MessageMediator messageMediator)
-- {
-- }
--
-- public InputObject waitForResponse(MessageMediator messageMediator)
-- {
-- return null ;
-- }
--
-- public void setConnectionCache(ConnectionCache connectionCache)
-- {
-- }
--
-- public ConnectionCache getConnectionCache()
-- {
-- return null;
-- }
--
-- ////////////////////////////////////////////////////
-- //
-- // EventHandler methods
-- //
--
-- public SelectableChannel getChannel()
-- {
-- return null;
-- }
--
-- public int getInterestOps()
-- {
-- return null;
-- }
--
-- // public Acceptor getAcceptor() - already defined above.
--
-- public Connection getConnection()
-- {
-- return this;
-- }
--
-- ////////////////////////////////////////////////////
-- //
-- // Work methods.
-- //
--
-- public String getName()
-- {
-- return this.toString();
-- }
--
-- public void doWork()
-- {
-- }
--
-- public void setEnqueueTime(long timeInMillis)
-- {
-- enqueueTime = timeInMillis;
-- }
--
-- public long getEnqueueTime()
-- {
-- return enqueueTime;
-- }
--
-- ////////////////////////////////////////////////////
-- //
-- // spi.transport.CorbaConnection.
-- //
--
-- public ResponseWaitingRoom getResponseWaitingRoom()
-- {
-- return null ;
-- }
--
-- // REVISIT - inteface defines isServer but already defined in
-- // higher interface.
--
--
-- public void serverRequestMapPut(int requestId,
-- CorbaMessageMediator messageMediator)
-- {
-- serverRequestMap.put(new Integer(requestId), messageMediator);
-- }
--
-- public CorbaMessageMediator serverRequestMapGet(int requestId)
-- {
-- return (CorbaMessageMediator)
-- serverRequestMap.get(new Integer(requestId));
-- }
--
-- public void serverRequestMapRemove(int requestId)
-- {
-- serverRequestMap.remove(new Integer(requestId));
-- }
--
--
-- // REVISIT: this is also defined in:
-- // com.sun.corba.se.spi.legacy.connection.Connection
-- public java.net.Socket getSocket()
-- {
-- return null;
-- }
--
-- /** It is possible for a Close Connection to have been
-- ** sent here, but we will not check for this. A "lazy"
-- ** Exception will be thrown in the Worker thread after the
-- ** incoming request has been processed even though the connection
-- ** is closed before the request is processed. This is o.k because
-- ** it is a boundary condition. To prevent it we would have to add
-- ** more locks which would reduce performance in the normal case.
-- **/
-- public synchronized void serverRequestProcessingBegins()
-- {
-- serverRequestCount++;
-- }
--
-- public synchronized void serverRequestProcessingEnds()
-- {
-- serverRequestCount--;
-- }
--
-- //
-- //
-- //
--
-- public synchronized int getNextRequestId()
-- {
-- return requestId++;
-- }
--
-- // Negotiated code sets for char and wchar data
-- protected CodeSetComponentInfo.CodeSetContext codeSetContext = null;
--
-- public ORB getBroker()
-- {
-- return orb;
-- }
--
-- public CodeSetComponentInfo.CodeSetContext getCodeSetContext()
-- {
-- // Needs to be synchronized for the following case when the client
-- // doesn't send the code set context twice, and we have two threads
-- // in ServerRequestDispatcher processCodeSetContext.
-- //
-- // Thread A checks to see if there is a context, there is none, so
-- // it calls setCodeSetContext, getting the synch lock.
-- // Thread B checks to see if there is a context. If we didn't synch,
-- // it might decide to outlaw wchar/wstring.
-- if (codeSetContext == null) {
-- synchronized(this) {
-- return codeSetContext;
-- }
-- }
--
-- return codeSetContext;
-- }
--
-- public synchronized void setCodeSetContext(CodeSetComponentInfo.CodeSetContext csc) {
-- // Double check whether or not we need to do this
-- if (codeSetContext == null) {
--
-- if (OSFCodeSetRegistry.lookupEntry(csc.getCharCodeSet()) == null ||
-- OSFCodeSetRegistry.lookupEntry(csc.getWCharCodeSet()) == null) {
-- // If the client says it's negotiated a code set that
-- // isn't a fallback and we never said we support, then
-- // it has a bug.
-- throw wrapper.badCodesetsFromClient() ;
-- }
--
-- codeSetContext = csc;
-- }
-- }
--
-- //
-- // from iiop.IIOPConnection.java
-- //
--
-- // Map request ID to an InputObject.
-- // This is so the client thread can start unmarshaling
-- // the reply and remove it from the out_calls map while the
-- // ReaderThread can still obtain the input stream to give
-- // new fragments. Only the ReaderThread touches the clientReplyMap,
-- // so it doesn't incur synchronization overhead.
--
-- public MessageMediator clientRequestMapGet(int requestId)
-- {
-- return null ;
-- }
--
-- protected MessageMediator clientReply_1_1;
--
-- public void clientReply_1_1_Put(MessageMediator x)
-- {
-- clientReply_1_1 = x;
-- }
--
-- public MessageMediator clientReply_1_1_Get()
-- {
-- return clientReply_1_1;
-- }
--
-- public void clientReply_1_1_Remove()
-- {
-- clientReply_1_1 = null;
-- }
--
-- protected MessageMediator serverRequest_1_1;
--
-- public void serverRequest_1_1_Put(MessageMediator x)
-- {
-- serverRequest_1_1 = x;
-- }
--
-- public MessageMediator serverRequest_1_1_Get()
-- {
-- return serverRequest_1_1;
-- }
--
-- public void serverRequest_1_1_Remove()
-- {
-- serverRequest_1_1 = null;
-- }
--
-- protected String getStateString( int state )
-- {
-- synchronized ( stateEvent ){
-- switch (state) {
-- case OPENING : return "OPENING" ;
-- case ESTABLISHED : return "ESTABLISHED" ;
-- case CLOSE_SENT : return "CLOSE_SENT" ;
-- case CLOSE_RECVD : return "CLOSE_RECVD" ;
-- case ABORT : return "ABORT" ;
-- default : return "???" ;
-- }
-- }
-- }
--
-- public synchronized boolean isPostInitialContexts() {
-- return postInitialContexts;
-- }
--
-- // Can never be unset...
-- public synchronized void setPostInitialContexts(){
-- postInitialContexts = true;
-- }
--
-- /**
-- * Wake up the outstanding requests on the connection, and hand them
-- * COMM_FAILURE exception with a given minor code.
-- *
-- * Also, delete connection from connection table and
-- * stop the reader thread.
--
-- * Note that this should only ever be called by the Reader thread for
-- * this connection.
-- *
-- * @param minor_code The minor code for the COMM_FAILURE major code.
-- * @param die Kill the reader thread (this thread) before exiting.
-- */
-- public void purgeCalls(SystemException systemException,
-- boolean die, boolean lockHeld)
-- {
-- }
--
-- /*************************************************************************
-- * The following methods are for dealing with Connection cleaning for
-- * better scalability of servers in high network load conditions.
-- **************************************************************************/
--
-- public void sendCloseConnection(GIOPVersion giopVersion)
-- throws IOException
-- {
-- Message msg = MessageBase.createCloseConnection(giopVersion);
-- sendHelper(giopVersion, msg);
-- }
--
-- public void sendMessageError(GIOPVersion giopVersion)
-- throws IOException
-- {
-- Message msg = MessageBase.createMessageError(giopVersion);
-- sendHelper(giopVersion, msg);
-- }
--
-- /**
-- * Send a CancelRequest message. This does not lock the connection, so the
-- * caller needs to ensure this method is called appropriately.
-- * @exception IOException - could be due to abortive connection closure.
-- */
-- public void sendCancelRequest(GIOPVersion giopVersion, int requestId)
-- throws IOException
-- {
--
-- Message msg = MessageBase.createCancelRequest(giopVersion, requestId);
-- sendHelper(giopVersion, msg);
-- }
--
-- protected void sendHelper(GIOPVersion giopVersion, Message msg)
-- throws IOException
-- {
-- // REVISIT: See comments in CDROutputObject constructor.
-- CDROutputObject outputObject =
-- new CDROutputObject((ORB)orb, null, giopVersion, this, msg,
-- ORBConstants.STREAM_FORMAT_VERSION_1);
-- msg.write(outputObject);
--
-- outputObject.writeTo(this);
-- }
--
-- public void sendCancelRequestWithLock(GIOPVersion giopVersion,
-- int requestId)
-- throws IOException
-- {
-- writeLock();
-- try {
-- sendCancelRequest(giopVersion, requestId);
-- } finally {
-- writeUnlock();
-- }
-- }
--
-- // Begin Code Base methods ---------------------------------------
-- //
-- // Set this connection's code base IOR. The IOR comes from the
-- // SendingContext. This is an optional service context, but all
-- // JavaSoft ORBs send it.
-- //
-- // The set and get methods don't need to be synchronized since the
-- // first possible get would occur during reading a valuetype, and
-- // that would be after the set.
--
-- // Sets this connection's code base IOR. This is done after
-- // getting the IOR out of the SendingContext service context.
-- // Our ORBs always send this, but it's optional in CORBA.
--
-- public final void setCodeBaseIOR(IOR ior) {
-- codeBaseServerIOR = ior;
-- }
--
-- public final IOR getCodeBaseIOR() {
-- return codeBaseServerIOR;
-- }
--
-- // Get a CodeBase stub to use in unmarshaling. The CachedCodeBase
-- // won't connect to the remote codebase unless it's necessary.
-- public final CodeBase getCodeBase() {
-- return cachedCodeBase;
-- }
--
-- // End Code Base methods -----------------------------------------
--
-- // Can be overridden in subclass for different options.
-- protected void setSocketOptions(Socket socket)
-- {
-- }
--
-- public String toString()
-- {
-- synchronized ( stateEvent ){
-- return
-- "BufferConnectionImpl[" + " "
-- + getStateString( state ) + " "
-- + shouldUseSelectThreadToWait() + " "
-- + shouldUseWorkerThreadForEvent()
-- + "]" ;
-- }
-- }
--
-- // Must be public - used in encoding.
-- public void dprint(String msg)
-- {
-- ORBUtility.dprint("SocketOrChannelConnectionImpl", msg);
-- }
--
-- protected void dprint(String msg, Throwable t)
-- {
-- dprint(msg);
-- t.printStackTrace(System.out);
-- }
--}
--
--// End of file.
---- ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2013-09-06 11:20:50.000000000 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2014-07-15 21:45:53.000000000 -0700
-@@ -32,6 +32,7 @@
- import java.net.ServerSocket;
- import java.nio.channels.SocketChannel;
- import java.nio.channels.ServerSocketChannel;
-+import java.security.PrivilegedAction;
-
- import com.sun.corba.se.pept.transport.Acceptor;
-
-@@ -44,6 +45,22 @@
- implements ORBSocketFactory
- {
- private ORB orb;
-+ private static final boolean keepAlive;
-+
-+ static {
-+ keepAlive = java.security.AccessController.doPrivileged(
-+ new PrivilegedAction<Boolean>() {
-+ @Override
-+ public Boolean run () {
-+ String value =
-+ System.getProperty("com.sun.CORBA.transport.enableTcpKeepAlive");
-+ if (value != null)
-+ return new Boolean(!"false".equalsIgnoreCase(value));
-+
-+ return Boolean.FALSE;
-+ }
-+ });
-+ }
-
- public void setORB(ORB orb)
- {
-@@ -85,6 +102,9 @@
- // Disable Nagle's algorithm (i.e., always send immediately).
- socket.setTcpNoDelay(true);
-
-+ if (keepAlive)
-+ socket.setKeepAlive(true);
-+
- return socket;
- }
-
-@@ -95,6 +115,8 @@
- {
- // Disable Nagle's algorithm (i.e., always send immediately).
- socket.setTcpNoDelay(true);
-+ if (keepAlive)
-+ socket.setKeepAlive(true);
- }
- }
-
---- ./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 2014-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, 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
-@@ -55,7 +55,7 @@
- /**
- * @author Harold Carr
- */
--public class SelectorImpl
-+class SelectorImpl
- 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-07-15 21:45:53.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-07-15 21:45:53.000000000 -0700
-@@ -36,6 +36,7 @@
-
- import com.sun.corba.se.spi.logging.CORBALogDomains ;
- import com.sun.corba.se.impl.logging.ORBUtilSystemException ;
-+import com.sun.corba.se.impl.presentation.rmi.DynamicAccessPermission;
-
- public class CompositeInvocationHandlerImpl implements
- CompositeInvocationHandler
-@@ -46,11 +47,13 @@
- public void addInvocationHandler( Class interf,
- InvocationHandler handler )
- {
-+ checkAccess();
- classToInvocationHandler.put( interf, handler ) ;
- }
-
- public void setDefaultHandler( InvocationHandler handler )
- {
-+ checkAccess();
- defaultHandler = handler ;
- }
-
-@@ -78,4 +81,14 @@
-
- return handler.invoke( proxy, method, args ) ;
- }
-+
-+ private static final DynamicAccessPermission perm = new DynamicAccessPermission("access");
-+ private void checkAccess() {
-+ final SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ sm.checkPermission(perm);
-+}
-+ }
-+
-+ 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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 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
-@@ -58,6 +58,9 @@
- import com.sun.corba.se.impl.util.Utility ;
- import com.sun.corba.se.impl.logging.ORBUtilSystemException ;
-
-+import sun.corba.EncapsInputStreamFactory;
-+
-+
- public class ServiceContexts {
- private static boolean isDebugging( OutputStream os )
- {
-@@ -198,11 +201,11 @@
- // Note: As of Jan 2001, no standard OMG or Sun service contexts
- // ship wchar data or are defined as using anything but GIOP 1.0 CDR.
- EncapsInputStream eis
-- = new EncapsInputStream(orb,
-- data,
-- data.length,
-- giopVersion,
-- codeBase);
-+ = EncapsInputStreamFactory.newEncapsInputStream(orb,
-+ data,
-+ data.length,
-+ giopVersion,
-+ codeBase);
- eis.consumeEndian();
-
- // 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-07-15 21:45:53.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
- ParseException.badRepIDForm=%0 (\u884C%1): \u30EA\u30DD\u30B8\u30C8\u30EAID '%2'\u306E\u5F62\u5F0F\u306F'<format>:<string>'\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n%3\n%4
--ParseException.badRepIDPrefix=%0 (\u884C%1): \u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9%2\u306B\u306F\u3001'%4'\u3067\u306F\u306A\u304F\u30EA\u30DD\u30B8\u30C8\u30EAID\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9`%3'\u304C\u5FC5\u8981\u3067\u3059\u3002\n%5\n%6
-+ParseException.badRepIDPrefix=%0 (\u884C%1): \u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9%2\u306B\u306F\u3001'%4'\u3067\u306F\u306A\u304F\u30EA\u30DD\u30B8\u30C8\u30EAID\u63A5\u982D\u8F9E`%3'\u304C\u5FC5\u8981\u3067\u3059\u3002\n%5\n%6
- ParseException.badState=%0 (\u884C%1): %2\u306F\u30B9\u30C6\u30FC\u30C8\u30D5\u30EB\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u3067\u304D\u307E\u305B\u3093\u3002\u8907\u6570\u306E\u30B9\u30C6\u30FC\u30C8\u30D5\u30EB\u89AA\u304C\u3042\u308A\u307E\u3059\u3002\n%3\n%4
- 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-07-15 21:45:53.000000000 -0700
-@@ -61,13 +61,11 @@
- private transient StubDelegate stubDelegate = null;
- private static Class stubDelegateClass = null;
- private static final String StubClassKey = "javax.rmi.CORBA.StubClass";
-- private static final String defaultStubImplName = "com.sun.corba.se.impl.javax.rmi.CORBA.StubDelegateImpl";
-
- static {
-- Object stubDelegateInstance = (Object) createDelegateIfSpecified(StubClassKey, defaultStubImplName);
-+ Object stubDelegateInstance = createDelegate(StubClassKey);
- if (stubDelegateInstance != null)
- stubDelegateClass = stubDelegateInstance.getClass();
--
- }
-
-
-@@ -207,7 +205,7 @@
- // are in different packages and the visibility needs to be package for
- // security reasons. If you know a better solution how to share this code
- // then remove it from PortableRemoteObject. Also in Util.java
-- private static Object createDelegateIfSpecified(String classKey, String defaultClassName) {
-+ private static Object createDelegate(String classKey) {
- String className = (String)
- AccessController.doPrivileged(new GetPropertyAction(classKey));
- if (className == null) {
-@@ -218,7 +216,7 @@
- }
-
- if (className == null) {
-- className = defaultClassName;
-+ return new com.sun.corba.se.impl.javax.rmi.CORBA.StubDelegateImpl();
- }
-
- 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-07-15 21:45:53.000000000 -0700
-@@ -60,14 +60,11 @@
- public class Util {
-
- // This can only be set at static initialization time (no sync necessary).
-- private static javax.rmi.CORBA.UtilDelegate utilDelegate = null;
-+ private static final javax.rmi.CORBA.UtilDelegate utilDelegate;
- private static final String UtilClassKey = "javax.rmi.CORBA.UtilClass";
-- private static final String defaultUtilImplName =
--"com.sun.corba.se.impl.javax.rmi.CORBA.Util";
-
- static {
-- utilDelegate = (javax.rmi.CORBA.UtilDelegate)
-- createDelegateIfSpecified(UtilClassKey, defaultUtilImplName);
-+ utilDelegate = (javax.rmi.CORBA.UtilDelegate)createDelegate(UtilClassKey);
- }
-
- private Util(){}
-@@ -338,9 +335,7 @@
- // are in different packages and the visibility needs to be package for
- // security reasons. If you know a better solution how to share this code
- // then remove it from PortableRemoteObject. Also in Stub.java
-- private static Object createDelegateIfSpecified(String classKey,
-- String defaultClassName)
-- {
-+ private static Object createDelegate(String classKey) {
- String className = (String)
- AccessController.doPrivileged(new GetPropertyAction(classKey));
- if (className == null) {
-@@ -351,7 +346,7 @@
- }
-
- if (className == null) {
-- className = defaultClassName;
-+ return new com.sun.corba.se.impl.javax.rmi.CORBA.Util();
- }
-
- 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-07-15 21:45:53.000000000 -0700
-@@ -65,17 +65,14 @@
- */
- public class PortableRemoteObject {
-
-- private static javax.rmi.CORBA.PortableRemoteObjectDelegate proDelegate = null;
-+ private static final javax.rmi.CORBA.PortableRemoteObjectDelegate proDelegate;
-
- private static final String PortableRemoteObjectClassKey =
- "javax.rmi.CORBA.PortableRemoteObjectClass";
-
-- private static final String defaultPortableRemoteObjectImplName =
-- "com.sun.corba.se.impl.javax.rmi.PortableRemoteObject";
--
- static {
- proDelegate = (javax.rmi.CORBA.PortableRemoteObjectDelegate)
-- createDelegateIfSpecified(PortableRemoteObjectClassKey);
-+ createDelegate(PortableRemoteObjectClassKey);
- }
-
- /**
-@@ -181,7 +178,7 @@
- // are in different packages and the visibility needs to be package for
- // security reasons. If you know a better solution how to share this code
- // then remove it from here.
-- private static Object createDelegateIfSpecified(String classKey) {
-+ private static Object createDelegate(String classKey) {
- String className = (String)
- AccessController.doPrivileged(new GetPropertyAction(classKey));
- if (className == null) {
-@@ -191,7 +188,7 @@
- }
- }
- if (className == null) {
-- className = defaultPortableRemoteObjectImplName;
-+ return new com.sun.corba.se.impl.javax.rmi.PortableRemoteObject();
- }
-
- 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-07-15 21:54:35.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1995, 2010, 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
-@@ -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";
-
- //
-- // The last resort fallback ORB implementation classes in case
-- // no ORB implementation class is dynamically configured through
-- // properties or applet parameters. Change these values to
-- // vendor-specific class names.
-- //
-- private static final String defaultORB = "com.sun.corba.se.impl.orb.ORBImpl";
-- private static final String defaultORBSingleton = "com.sun.corba.se.impl.orb.ORBSingleton";
--
-- //
- // 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,22 +287,26 @@
- String className = getSystemProperty(ORBSingletonClassKey);
- if (className == null)
- className = getPropertyFromFile(ORBSingletonClassKey);
-- if (className == null)
-- className = defaultORBSingleton;
--
-- singleton = create_impl(className);
-+ if ((className == null) ||
-+ (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
-+ singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
-+ } else {
-+ singleton = create_impl(className);
-+ }
- }
- return singleton;
- }
-
- 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 +344,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.set_parameters(args, props);
- return orb;
- }
-@@ -375,10 +374,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.set_parameters(app, props);
- return orb;
- }
-@@ -574,7 +575,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 +585,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-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -31,6 +31,10 @@
-
- package org.omg.CORBA_2_3.portable;
-
-+import java.io.SerializablePermission;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+
- /**
- * InputStream provides for the reading of all of the mapped IDL types
- * from the stream. It extends org.omg.CORBA.portable.InputStream. This
-@@ -43,6 +47,43 @@
-
- public abstract class InputStream extends org.omg.CORBA.portable.InputStream {
-
-+
-+ private static final String ALLOW_SUBCLASS_PROP = "jdk.corba.allowInputStreamSubclass";
-+
-+ private static final boolean allowSubclass = AccessController.doPrivileged(
-+ new PrivilegedAction<Boolean>() {
-+ @Override
-+ public Boolean run() {
-+ String prop = System.getProperty(ALLOW_SUBCLASS_PROP);
-+ return prop == null ? false :
-+ (prop.equalsIgnoreCase("false") ? false : true);
-+ }
-+ });
-+
-+ private static Void checkPermission() {
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ if (!allowSubclass)
-+ sm.checkPermission(new
-+ SerializablePermission("enableSubclassImplementation"));
-+ }
-+ return null;
-+ }
-+
-+ private InputStream(Void ignore) { }
-+
-+ /**
-+ * Create a new instance of this class.
-+ *
-+ * throw SecurityException if SecurityManager is installed and
-+ * enableSubclassImplementation SerializablePermission
-+ * is not granted or jdk.corba.allowOutputStreamSubclass system
-+ * property is either not set or is set to 'false'
-+ */
-+ public InputStream() {
-+ this(checkPermission());
-+ }
-+
- /**
- * 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-07-15 21:45:53.000000000 -0700
-@@ -0,0 +1,153 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+package sun.corba;
-+
-+import java.nio.ByteBuffer;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+
-+
-+import com.sun.corba.se.impl.encoding.EncapsInputStream;
-+import com.sun.corba.se.impl.encoding.TypeCodeInputStream;
-+import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
-+import com.sun.corba.se.pept.protocol.MessageMediator;
-+import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
-+import com.sun.corba.se.spi.orb.ORB;
-+import com.sun.org.omg.SendingContext.CodeBase;
-+
-+public class EncapsInputStreamFactory {
-+
-+ public static EncapsInputStream newEncapsInputStream(
-+ final org.omg.CORBA.ORB orb, final byte[] buf, final int size,
-+ final boolean littleEndian, final GIOPVersion version) {
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
-+ @Override
-+ public EncapsInputStream run() {
-+ return new EncapsInputStream(orb, buf, size,
-+ littleEndian, version);
-+ }
-+ });
-+ }
-+
-+ public static EncapsInputStream newEncapsInputStream(
-+ final org.omg.CORBA.ORB orb, final ByteBuffer byteBuffer,
-+ final int size, final boolean littleEndian,
-+ final GIOPVersion version) {
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
-+ @Override
-+ public EncapsInputStream run() {
-+ return new EncapsInputStream(orb, byteBuffer, size,
-+ littleEndian, version);
-+ }
-+ });
-+ }
-+
-+ public static EncapsInputStream newEncapsInputStream(
-+ final org.omg.CORBA.ORB orb, final byte[] data, final int size) {
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
-+ @Override
-+ public EncapsInputStream run() {
-+ return new EncapsInputStream(orb, data, size);
-+ }
-+ });
-+ }
-+
-+ public static EncapsInputStream newEncapsInputStream(
-+ final EncapsInputStream eis) {
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
-+ @Override
-+ public EncapsInputStream run() {
-+ return new EncapsInputStream(eis);
-+ }
-+ });
-+ }
-+
-+ public static EncapsInputStream newEncapsInputStream(
-+ final org.omg.CORBA.ORB orb, final byte[] data, final int size,
-+ final GIOPVersion version) {
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
-+ @Override
-+ public EncapsInputStream run() {
-+ return new EncapsInputStream(orb, data, size, version);
-+ }
-+ });
-+ }
-+
-+ public static EncapsInputStream newEncapsInputStream(
-+ final org.omg.CORBA.ORB orb, final byte[] data, final int size,
-+ final GIOPVersion version, final CodeBase codeBase) {
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<EncapsInputStream>() {
-+ @Override
-+ public EncapsInputStream run() {
-+ return new EncapsInputStream(orb, data, size, version,
-+ codeBase);
-+ }
-+ });
-+ }
-+
-+ public static TypeCodeInputStream newTypeCodeInputStream(
-+ final org.omg.CORBA.ORB orb, final byte[] buf, final int size,
-+ final boolean littleEndian, final GIOPVersion version) {
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<TypeCodeInputStream>() {
-+ @Override
-+ public TypeCodeInputStream run() {
-+ return new TypeCodeInputStream(orb, buf, size,
-+ littleEndian, version);
-+ }
-+ });
-+ }
-+
-+ public static TypeCodeInputStream newTypeCodeInputStream(
-+ final org.omg.CORBA.ORB orb, final ByteBuffer byteBuffer,
-+ final int size, final boolean littleEndian,
-+ final GIOPVersion version) {
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<TypeCodeInputStream>() {
-+ @Override
-+ public TypeCodeInputStream run() {
-+ return new TypeCodeInputStream(orb, byteBuffer, size,
-+ littleEndian, version);
-+ }
-+ });
-+ }
-+
-+ public static TypeCodeInputStream newTypeCodeInputStream(
-+ final org.omg.CORBA.ORB orb, final byte[] data, final int size) {
-+ return AccessController
-+ .doPrivileged(new PrivilegedAction<TypeCodeInputStream>() {
-+ @Override
-+ public TypeCodeInputStream run() {
-+ return new TypeCodeInputStream(orb, data, size);
-+ }
-+ });
-+ }
-+}
---- ./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 2014-07-15 21:45:53.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -34,6 +34,9 @@
-
- import java.io.File;
- import java.io.IOException;
-+import java.io.SerializablePermission;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
- import java.util.Vector;
- import java.util.Hashtable;
- import java.util.Enumeration;
-@@ -49,6 +52,7 @@
- import com.sun.corba.se.impl.util.PackagePrefixChecker;
- import sun.rmi.rmic.Main;
-
-+
- /**
- * An IIOP stub/tie generator for rmic.
- *
-@@ -78,6 +82,7 @@
- protected boolean castArray = false;
- protected Hashtable transactionalObjects = new Hashtable() ;
- protected boolean POATie = false ;
-+ protected boolean emitPermissionCheck = false;
-
- /**
- * Default constructor for Main to use.
-@@ -193,6 +198,9 @@
- } else if (argv[i].equals("-standardPackage")) {
- standardPackage = true;
- argv[i] = null;
-+ } else if (argv[i].equals("-emitPermissionCheck")) {
-+ emitPermissionCheck = true;
-+ argv[i] = null;
- } else if (arg.equals("-xstubbase")) {
- argv[i] = null;
- if (++i < argv.length && argv[i] != null && !argv[i].startsWith("-")) {
-@@ -390,9 +398,22 @@
-
- writePackageAndImports(p);
-
-+// generate
-+// import java.security.AccessController;
-+// import java.security.PrivilegedAction;
-+// import java.io.SerializablePermission;
-+ if (emitPermissionCheck) {
-+ p.pln("import java.security.AccessController;");
-+ p.pln("import java.security.PrivilegedAction;");
-+ p.pln("import java.io.SerializablePermission;");
-+ p.pln();
-+ p.pln();
-+ }
-+
- // Declare the stub class; implement all remote interfaces.
-
- p.p("public class " + currentClass);
-+
- p.p(" extends " + getName(stubBaseClass));
- p.p(" implements ");
- if (remoteInterfaces.length > 0) {
-@@ -422,6 +443,56 @@
- writeIds( p, theType, false );
- p.pln();
-
-+ if (emitPermissionCheck) {
-+
-+ // produce the following generated code
-+ // private static Void checkPermission() {
-+ // SecurityManager sm = System.getSecurityManager();
-+ // if (sm != null) {
-+ // sm.checkPermission(new SerializablePermission(
-+ // "enableSubclassImplementation")); // testing
-+ // }
-+ // return null;
-+ // }
-+ //
-+ // private _XXXXXX_Stub(Void ignore) {
-+ // }
-+ //
-+ // public _XXXXXX_Stub() {
-+ // this(checkPermission());
-+ // }
-+ // where XXXXXX is the name of the remote interface
-+
-+ p.pln();
-+ p.plnI("private static Void checkPermission() {");
-+ p.plnI("SecurityManager sm = System.getSecurityManager();");
-+ p.pln("if (sm != null) {");
-+ p.pI();
-+ p.plnI("sm.checkPermission(new SerializablePermission(");
-+ p.plnI("\"enableSubclassImplementation\"));");
-+ p.pO();
-+ p.pO();
-+ p.pOln("}");
-+ p.pln("return null;");
-+ p.pO();
-+ p.pOln("}");
-+ p.pln();
-+ p.pO();
-+
-+ p.pI();
-+ p.pln("private " + currentClass + "(Void ignore) { }");
-+ p.pln();
-+
-+ p.plnI("public " + currentClass + "() { ");
-+ p.pln("this(checkPermission());");
-+ p.pOln("}");
-+ p.pln();
-+ }
-+
-+ if (!emitPermissionCheck) {
-+ p.pI();
-+ }
-+
- // Write the _ids() method...
-
- p.plnI("public String[] _ids() { ");
-@@ -815,7 +886,6 @@
- CompoundType theType) throws IOException {
-
- // Wtite the method declaration and opening brace...
--
- String methodName = method.getName();
- String methodIDLName = method.getIDLName();
-
-@@ -1631,7 +1701,7 @@
-
- // Write data members...
- p.pln();
-- p.pln("private " + getName(theType) + " target = null;");
-+ p.pln("volatile private " + getName(theType) + " target = null;");
- p.pln();
-
- // Write the ids...
-@@ -1695,6 +1765,10 @@
-
- if (remoteMethods.length > 0) {
- p.plnI("try {");
-+ p.pln(getName(theType) + " target = this.target;");
-+ p.plnI("if (target == null) {");
-+ p.pln("throw new java.io.IOException();");
-+ p.pOln("}");
- p.plnI(idExtInputStream + " "+in+" = ");
- p.pln("(" + idExtInputStream + ") "+_in+";");
- p.pO();
---- ./hotspot/.hgtags 2013-09-06 11:21:49.000000000 -0700
-+++ ./hotspot/.hgtags 2014-10-28 20:19:39.000000000 -0700
-@@ -182,6 +182,7 @@
- 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
- 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
- 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17
-+f1a18ada5853af49fce54d43dd5a5b67dc291470 7u0
- 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
- 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
- 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
-@@ -476,6 +477,24 @@
- 8386245b59c3e82b7c728b7d3832ea342c62615d jdk7u21-b50
- c5e4585a045fe165d067ec0e98af42eace20c5f8 jdk7u21-b12
- 00dbf9fa12ec6b1ba15d9a9a12495f50e10837bf jdk7u21-b31
-+bf2d84c5103d98db1697b50071a649ea23c4e33d jdk7u25-b01
-+07119340f80f77dfcb03fa568641e80b43d4be74 jdk7u25-b02
-+655bea6843fb7beabd8d9eeda59572c0c7055b85 jdk7u25-b03
-+96a4e612195c0d753be24cf38fea0ee8ce30edcf jdk7u25-b04
-+7151c26b838828a20cb28595ef1f70403d1868cf jdk7u25-b05
-+fbb5f6083dd00ca7417e4a45311f33918bb2a5f0 jdk7u25-b06
-+83abf4b2fc8a5bb7226177c5e4334bd0bfd7a8df jdk7u25-b07
-+525252cd9fca4869c3fd81bc61299a85e73ff9c7 jdk7u25-b08
-+706a255a8404b7e41579cea278df6bb87c314567 jdk7u25-b09
-+402184622f60a2ba35479bdf124a8d4694835406 jdk7u25-b10
-+cca49a35bf83664456af112482ffb3a7465d21fa jdk7u25-b11
-+7ca68c0674df72fdd784de337c049404d2b5b0c3 jdk7u25-b12
-+3e145a686fedd9eefdcb6b714241200ed236b41d jdk7u25-b13
-+4fafaf293aa5666e8c9f5ca1d96c3f752305f586 jdk7u25-b14
-+40acb370626fbc439e4cfed8854960a83a376fba jdk7u25-b15
-+97a3ebd62052410e0709035f40032d3f2113ed86 jdk7u25-b30
-+b80a290e6e3011097273525c4f352c70b9857464 jdk7u25-b16
-+273e8afccd6ef9e10e9fe121f7b323755191f3cc jdk7u25-b32
- e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14
- 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34
- 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15
-@@ -550,3 +569,155 @@
- b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56
- eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43
- af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
-+efaa26fb6de2ecb8506fb8b785a429d040e96768 jdk7u40-b61
-+df6f37a7311d35072a07c1425a7aadee469a09b6 jdk7u40-b62
-+5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
-+f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02
-+d6fd3f84a30ce82a37fc39b6e5e9d73bd8054ab2 jdk7u45-b03
-+7f16aa9067386aeb3668336aa6cd63ef3dc4f44a jdk7u45-b04
-+b4fe146b820b47d8b59bbb9dc9d43221436ed0ae jdk7u45-b05
-+63efa616e54dd3545e16a5aa1917662548b18ee5 jdk7u45-b06
-+f6748e6123b6745497d69addffdff38e224a77c5 jdk7u45-b07
-+06bcab9ef18355dccc87401fc24dbd5f15615db0 jdk7u45-b08
-+996b6863b3b2468cece20d7a6f571f9ec1b7830c jdk7u45-b09
-+bcaf889eea9e64d30f8c3aefdcdc2c2ee29406f2 jdk7u45-b10
-+7ca907428850dc2aa99ee4a906446e479dbeb392 jdk7u45-b11
-+ed1505510ea0e94b17f968cdb3e8aba13c99d543 jdk7u45-b12
-+89f99af7a7bbdadb5b8cf781c7d899c22df64b71 jdk7u45-b13
-+718d1e9223dd0359d9ccef81fb82c32215702fe8 jdk7u45-b14
-+9ad76a08e5edfe24e95eef84e15fef261bff1abf jdk7u45-b15
-+429884602206fcf5314c8b953c06d54d337558ca jdk7u45-b16
-+0c0dc384915cafd9bfaa2fe5792a629a22d1b990 jdk7u45-b17
-+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
-+4138fb11955a528e5ee5448d9c6c8e88e0e268b2 jdk7u51-b03
-+683458c333ced92d515daa1b9bcdb5be679e535a jdk7u51-b04
-+ed2db7a82229e7adbfe8a8166bf98f3ef4a09be5 jdk7u51-b05
-+fec027762cf37d033d82d5b3725020f40c771690 jdk7u51-b06
-+f673c581ebf91073b5bbdbdc5e4d4407910fa006 jdk7u51-b07
-+b0a355aae00427e74cc0b89697c7c7f6fb520176 jdk7u51-b08
-+4f56f2e206fd878809f70ca06f4bc21563a7c530 jdk7u51-b09
-+1b7aaef3df78970c9a5ef5cc353ca927241555ee jdk7u51-b10
-+1f11dff734af98f5bf11d4fceeda221ab1416971 jdk7u51-b11
-+dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u51-b12
-+6c6a2299029ad02fa2820b8ff8c61c2bbcae799c jdk7u51-b13
-+a398ddc79d2310ad37b131cc3794b3cf574f088e jdk7u51-b30
-+cf4110c35afb10456d8264c47b7cde1c20150cab jdk7u51-b31
-+208419914859dd77abdb5ec755b32c237ee6e4eb jdk7u51-b33
-+f8457a75bdb5052f1d8c547027a926f9b755b808 jdk7u51-b34
-+dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u55-b00
-+ac0063b4452bc724e8648e64f4b2d495054bb308 jdk7u55-b01
-+408028d410e316a99495c42df0031018890c22fe jdk7u55-b02
-+50fb91504dd8cdf410eb956075442daf3aacf1db jdk7u55-b03
-+3be3b8a032a5508646c1c5620cee18d3e69fc708 jdk7u55-b04
-+b86119fa2748bd91ae4984ff2264da92b6626f8c jdk7u65-b00
-+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
-+dff9147a781672f20bb0577a94233264ea4a95d1 jdk7u55-b14
-+4e73c6403b44f86d579b1ba03ea636c52c4b559b jdk7u55-b15
-+8175599864880938d68d0a515fa561043d7d5fd0 jdk7u55-b31
-+ba9270b8fb1f4852ff1d9dab15571eb9e0714495 jdk7u55-b32
-+0901a8cf66a0494b55bf104c9666d4e3c6ff93f0 jdk7u55-b33
-+278d7e230b297a4632b94ddc07d591e74736e039 jdk7u55-b34
-+db88943dba0b7672a09e22974934022fbe8ba8dd jdk7u55-b35
-+b3e388601b0fc0922b311e2cc68b9417cedd16ef jdk7u55-b36
-+ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00
-+af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
-+cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01
-+b7d44793cd267b22352c688b0185466741bb7a89 hs24.60-b02
-+90cfd4ad3c9263886d876792d72cb24ac0e03a85 hs24.60-b03
-+8fd0e931efa57d1579fb1bc8a68ba3924244b99e jdk7u60-b01
-+99e96aaac8afc14ce6f9f3d92ef7004cf505b35d hs24.60-b04
-+0025a2a965c8f21376278245c2493d8861386fba jdk7u60-b02
-+fa59add77d1a8f601a695f137248462fdc68cc2f hs24.60-b05
-+a59134ccb1b704b2cd05e157970d425af43e5437 hs24.60-b06
-+2c971ed884cec0a9293ccff3def696da81823225 jdk7u60-b03
-+1afbeb8cb558429156d432f35e7582716053a9cb hs24.60-b07
-+05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u60-b04
-+f52b5452d424545e3b101d808e6d7da763d6f0f3 hs24.60-b08
-+462db155547e9bdd7ba26bead42808deb0b10d44 jdk7u60-b05
-+0cc4550bd9c57ba3be343bfbfcaf46b9060d5e7d jdk7u60-b06
-+2d053c4fd767155b2ac5e3e0a60b08a1bcc73cab jdk7u60-b07
-+a198787e7b9bc7b831ad210b67732cdb2be9e46e jdk7u60-b08
-+22cae361773d14b467328e8f90cf893550d1d610 jdk7u60-b09
-+6f74afd8577eb4b6a0e6f7b25cfef7d6f7d92e5f jdk7u60-b10
-+a2ac67a2c1cc867a8d6b525ab1df17204186e636 jdk7u60-b11
-+cae50351dcece6e5bf215eabf958c5d669ffff1f jdk7u60-b12
-+5853131ba4b448c5d89a3f0aa501fdf07f3b473c jdk7u60-b13
-+b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14
-+2871f345b7e5585e20dc7aa91035967fe774cfba jdk7u60-b15
-+ec76bacbb5b90efc7988dee5345c656126b97561 jdk7u60-b16
-+617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b17
-+617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b18
-+4a9635c98a917cfcef506ca5d034c733a33c53f3 jdk7u65-b01
-+361493c7cdb5f75b28efc63389d6cebaaaa43a2c jdk7u60-b19
-+13f561930b3e80a94e2baddc51dfc6c43c5ca601 jdk7u60-b30
-+35b2dbe7f7c69ea0f2feb1e66fe8651511a5fb6d jdk7u60-b31
-+f166d2e391993f1b12b4ad1685baf999c78e6372 jdk7u60-b32
-+cc1fea28c886ef100632247a708eac0c83640914 jdk7u60-b33
-+eb797fab50d3b440b17b3e7c5d83f42bfa73655e jdk7u65-b02
-+bb00df28ecdbd0da89ab4ed81f6f2b732fa512da jdk7u65-b03
-+848481af9003067546c7f34c166bb8d745b95d5f jdk7u65-b04
-+98a884fa64a9ef1753a28691106efe10942b9d70 jdk7u65-b05
-+6f1dddf9c632bfb14121c9521d17b64bd0be0cd2 jdk7u65-b06
-+a053d3d805355ffcd85c17e653182e17d4456bd5 jdk7u65-b07
-+6f03dfb50363d26599fcf726586ea3f6d0e0347d jdk7u65-b08
-+b4930eb1ea7630b4d8609e2efe6f000d3dc83235 jdk7u65-b09
-+4736382ac9d999044b05eb26932ab6fc59dbb159 jdk7u65-b10
-+7345c7bf20fd8c91492240a95082af9a201b3a96 jdk7u65-b11
-+28b81694b89f88541e28bbc767d78e77ec66cce6 jdk7u65-b12
-+f4ed018b4c51dae699da835617b19e8a49c124a4 jdk7u65-b13
-+7ec585caae47f7202fb5357607f9ad058b03870e jdk7u65-b14
-+7058f0d30de6826b6866ce2d146c63e943be33af jdk7u65-b15
-+f1b2970a2564c3360db420431cfbba215da6ae43 jdk7u65-b16
-+4c6df9a369cb9d54fe2d898452883a22b8ec6640 jdk7u65-b17
-+aca05127f95b5704ee3a34104a8f86e36326f0c0 jdk7u65-b30
-+d006213be74730453cf5c3ce31f1d1d505334419 jdk7u65-b18
-+1d8226b3e9896656451801393eb3ae394faeb638 jdk7u65-b19
-+c43b0b843f897a4d8cf0a3566b017b87230dd3b4 jdk7u65-b32
-+d3c9265e12fa115052f18d1e3d379143b56bbf63 jdk7u65-b20
-+39776d90970221dd260187acb4c37631e41a66a9 jdk7u67-b01
-+1d8226b3e9896656451801393eb3ae394faeb638 jdk7u65-b40
-+cf8b3a090e597e59177c5f67d44cdec12309777f jdk7u65-b31
-+df855c3f4d31dd7db081d68e3054518380127893 jdk7u65-b33
-+6b37a189944aaa09e81d97d394496464d16bee42 jdk7u66-b00
-+121dc94194d9234e2b13c867d875e23e1bdd6abd jdk7u66-b01
-+f28ea516eb0b9e99f1e342954ab4642456af4da1 jdk7u66-b09
-+3dc6ae1972a45ba563518cc0e51f09885258f69d jdk7u66-b10
-+8d2b3f7d5b3001d019832476d684679ca6be0c8d jdk7u66-b11
-+5ee19b64ef208daaef91f063d800aa162427f8f6 jdk7u66-b12
-+a1e6f9c4c1f47be1b0edef6bd92399f8f07b7d15 jdk7u66-b13
-+b44baba406f2de6eeccc57dbfae653cf124b527b jdk7u66-b14
-+d20b495c96d3f8899a64657aba0fc72799773cb3 jdk7u66-b15
-+3bbfed065c601187449d319fd70bba6ae1ebb707 jdk7u66-b16
-+4abb71ff14b2e6cf932e5c61900f480d5e1afedb jdk7u66-b17
-+4ceb9c03fe8ee6b93d22854780ef8c737edd14b2 jdk7u71-b00
-+f95d6d32e08006209f1798f82b60d7d05767a3e8 jdk7u71-b01
-+1c760efe2d0795f4ce8260ec655b8870bfd77ca1 jdk7u71-b02
-+0cb0b5abd0b5aa25fc8bd5920c8d61c5b85a10c6 jdk7u71-b03
-+a491e5e52998c23502ebb1340955e3e726d44ad6 jdk7u71-b04
-+c93efe6377ffd7484c50cba9a88a37bebf525114 jdk7u71-b05
-+f95fa655cc119659686ba68c7242497fd209f9e1 jdk7u71-b06
-+7f32b65fde34db41bf951ed81374240840ef88f4 jdk7u71-b07
-+4e17bd4fb2304d068023d9d805e86d6b592d4230 jdk7u71-b08
-+1ffc702334d960aa4015e5cc6f4fb9e971952b54 jdk7u71-b09
-+9a17c184bcb99f13dc6ab714ad98976410429637 jdk7u71-b10
-+d6cb97651f0bd8d61f4d22aa7550145bbe6fb051 jdk7u71-b11
-+959b4e5d2e3111920c198187f3bc66eba3e457f1 jdk7u71-b12
-+608f470d22689bab17bab0ea1dbee3e1a0802d5b jdk7u71-b13
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -131,7 +131,7 @@
-
- static bool ptrace_continue(pid_t pid, int signal) {
- // pass the signal to the process so we don't swallow it
-- if (ptrace(PTRACE_CONT, pid, NULL, signal) < 0) {
-+ if (ptrace(PT_CONTINUE, pid, NULL, signal) < 0) {
- print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid);
- return false;
- }
---- ./hotspot/agent/src/os/linux/ps_core.c 2013-09-06 11:21:50.000000000 -0700
-+++ ./hotspot/agent/src/os/linux/ps_core.c 2014-07-15 21:48:34.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
-@@ -700,29 +700,61 @@
-
- // read segments of a shared object
- static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* lib_ehdr, uintptr_t lib_base) {
-- int i = 0;
-- ELF_PHDR* phbuf;
-- ELF_PHDR* lib_php = NULL;
-+ int i = 0;
-+ ELF_PHDR* phbuf;
-+ ELF_PHDR* lib_php = NULL;
-
-- if ((phbuf = read_program_header_table(lib_fd, lib_ehdr)) == NULL)
-- return false;
-+ int page_size = sysconf(_SC_PAGE_SIZE);
-+
-+ if ((phbuf = read_program_header_table(lib_fd, lib_ehdr)) == NULL) {
-+ return false;
-+ }
-
-- // we want to process only PT_LOAD segments that are not writable.
-- // i.e., text segments. The read/write/exec (data) segments would
-- // have been already added from core file segments.
-- for (lib_php = phbuf, i = 0; i < lib_ehdr->e_phnum; i++) {
-- if ((lib_php->p_type == PT_LOAD) && !(lib_php->p_flags & PF_W) && (lib_php->p_filesz != 0)) {
-- if (add_map_info(ph, lib_fd, lib_php->p_offset, lib_php->p_vaddr + lib_base, lib_php->p_filesz) == NULL)
-- goto err;
-+ // we want to process only PT_LOAD segments that are not writable.
-+ // i.e., text segments. The read/write/exec (data) segments would
-+ // have been already added from core file segments.
-+ for (lib_php = phbuf, i = 0; i < lib_ehdr->e_phnum; i++) {
-+ if ((lib_php->p_type == PT_LOAD) && !(lib_php->p_flags & PF_W) && (lib_php->p_filesz != 0)) {
-+
-+ uintptr_t target_vaddr = lib_php->p_vaddr + lib_base;
-+ map_info *existing_map = core_lookup(ph, target_vaddr);
-+
-+ if (existing_map == NULL){
-+ if (add_map_info(ph, lib_fd, lib_php->p_offset,
-+ target_vaddr, lib_php->p_memsz) == NULL) {
-+ goto err;
-+ }
-+ } else {
-+ // Coredump stores value of p_memsz elf field
-+ // rounded up to page boundary.
-+
-+ if ((existing_map->memsz != page_size) &&
-+ (existing_map->fd != lib_fd) &&
-+ (ROUNDUP(existing_map->memsz, page_size) != ROUNDUP(lib_php->p_memsz, page_size))) {
-+
-+ print_debug("address conflict @ 0x%lx (existing map size = %ld, size = %ld, flags = %d)\n",
-+ target_vaddr, existing_map->memsz, lib_php->p_memsz, lib_php->p_flags);
-+ goto err;
-+ }
-+
-+ /* replace PT_LOAD segment with library segment */
-+ print_debug("overwrote with new address mapping (memsz %ld -> %ld)\n",
-+ existing_map->memsz, ROUNDUP(lib_php->p_memsz, page_size));
-+
-+ existing_map->fd = lib_fd;
-+ existing_map->offset = lib_php->p_offset;
-+ existing_map->memsz = ROUNDUP(lib_php->p_memsz, page_size);
- }
-- lib_php++;
-- }
-+ }
-
-- free(phbuf);
-- return true;
-+ lib_php++;
-+ }
-+
-+ free(phbuf);
-+ return true;
- err:
-- free(phbuf);
-- return false;
-+ free(phbuf);
-+ return false;
- }
-
- // process segments from interpreter (ld.so or ld-linux.so)
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -33,6 +33,7 @@
- import sun.jvm.hotspot.debugger.remote.*;
- import sun.jvm.hotspot.debugger.windbg.*;
- import sun.jvm.hotspot.debugger.linux.*;
-+import sun.jvm.hotspot.debugger.bsd.*;
- import sun.jvm.hotspot.memory.*;
- 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-10-28 20:19:39.000000000 -0700
-@@ -35,6 +35,7 @@
- import sun.jvm.hotspot.debugger.windbg.*;
- import sun.jvm.hotspot.debugger.linux.*;
- import sun.jvm.hotspot.debugger.sparc.*;
-+import sun.jvm.hotspot.debugger.bsd.*;
- import sun.jvm.hotspot.debugger.remote.*;
- import sun.jvm.hotspot.livejvm.*;
- import sun.jvm.hotspot.memory.*;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java 2013-09-06 11:21:55.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2010, 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
-@@ -272,9 +272,10 @@
- public static final int _fast_aldc = 229;
- public static final int _fast_aldc_w = 230;
- public static final int _return_register_finalizer = 231;
-- public static final int _shouldnotreachhere = 232; // For debugging
-+ public static final int _invokehandle = 232;
-+ public static final int _shouldnotreachhere = 233; // For debugging
-
-- public static final int number_of_codes = 233;
-+ public static final int number_of_codes = 234;
-
- // Flag bits derived from format strings, can_trap, can_rewrite, etc.:
- // semantic flags:
-@@ -798,6 +799,9 @@
-
- def(_return_register_finalizer, "return_register_finalizer", "b" , null , BasicType.getTVoid() , 0, true, _return );
-
-+ def(_invokehandle , "invokehandle" , "bJJ" , null , BasicType.getTIllegal(), -1, true, _invokevirtual );
-+
-+
- def(_fast_aldc , "fast_aldc" , "bj" , null , BasicType.getTObject(), 1, true, _ldc );
- def(_fast_aldc_w , "fast_aldc_w" , "bJJ" , null , BasicType.getTObject(), 1, true, _ldc_w );
-
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java 2013-09-06 11:21:56.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2013 Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -29,11 +29,10 @@
- public static final int JVMTI_THREAD_STATE_ALIVE = 0x0001;
- public static final int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
- public static final int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
-- public static final int JVMTI_THREAD_STATE_WAITING = 0x0008;
-+ public static final int JVMTI_THREAD_STATE_WAITING = 0x0080;
- public static final int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
- public static final int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
- public static final int JVMTI_THREAD_STATE_SLEEPING = 0x0040;
-- public static final int JVMTI_THREAD_STATE_WAITING_FOR_NOTIFICATION = 0x0080;
- public static final int JVMTI_THREAD_STATE_IN_OBJECT_WAIT = 0x0100;
- public static final int JVMTI_THREAD_STATE_PARKED = 0x0200;
- public static final int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java 2013-09-06 11:21:57.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java 2014-07-15 21:48:34.000000000 -0700
-@@ -32,7 +32,7 @@
- // to the sys_thread_t structure of the classic JVM implementation.
- public class OSThread extends VMObject {
- private static JIntField interruptedField;
-- private static JIntField threadIdField;
-+ private static Field threadIdField;
- static {
- VM.registerVMInitializedObserver(new Observer() {
- public void update(Observable o, Object data) {
-@@ -44,7 +44,7 @@
- private static synchronized void initialize(TypeDataBase db) {
- Type type = db.lookupType("OSThread");
- interruptedField = type.getJIntField("_interrupted");
-- threadIdField = type.getJIntField("_thread_id");
-+ threadIdField = type.getField("_thread_id");
- }
-
- public OSThread(Address addr) {
-@@ -56,7 +56,7 @@
- }
-
- public int threadId() {
-- return (int)threadIdField.getValue(addr);
-+ return threadIdField.getJInt(addr);
- }
-
- }
---- ./hotspot/make/bsd/Makefile 2013-09-06 11:21:59.000000000 -0700
-+++ ./hotspot/make/bsd/Makefile 2014-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -211,6 +211,8 @@
- BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) LIBRARY_SUFFIX=$(LIBRARY_SUFFIX)
- BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
-
-+BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
-+
- BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
-
- #-------------------------------------------------------------------------------
-@@ -337,9 +339,11 @@
-
- # Doc target. This is the same for all build options.
- # Hence create a docs directory beside ...$(ARCH)_[...]
-+# We specify 'BUILD_FLAVOR=product' so that the proper
-+# ENABLE_FULL_DEBUG_SYMBOLS value is used.
- docs: checks
- $(QUIETLY) mkdir -p $(SUBDIR_DOCS)
-- $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs
-+ $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
-
- # 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-10-28 20:19:39.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/build_vm_def.sh 2013-09-06 14:21:59.000000000 -0400
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2014-11-19 15:32:05.000000000 -0500
-@@ -1,12 +1,28 @@
- #!/bin/sh
-
- # If we're cross compiling use that path for nm
--if [ "$CROSS_COMPILE_ARCH" != "" ]; then
--NM=$ALT_COMPILER_PATH/nm
-+if [ "$CROSS_COMPILE_ARCH" != "" ]; then
-+ NM=$ALT_COMPILER_PATH/nm
- else
--NM=nm
-+ NM=nm
- fi
-
--$NM -Uj $* | awk '
-- { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 }
-- '
-+case "$(uname -s)" in
-+Darwin )
-+ $NM -Uj $@ | awk '{
-+ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3
-+ }' ;;
-+OpenBSD )
-+ $NM $@ | awk '{
-+ if ($2 == "U") next
-+ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";"
-+ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";"
-+ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
-+ }' | sort -u ;;
-+* )
-+ $NM --defined-only $@ | awk '{
-+ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";"
-+ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";"
-+ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
-+ }' | sort -u ;;
-+esac
---- ./hotspot/make/bsd/makefiles/buildtree.make 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/buildtree.make 2014-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,6 @@
- #
- # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2013 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -59,7 +60,7 @@
- # needs to be set here since this Makefile doesn't include defs.make
- OS_VENDOR:=$(shell uname -s)
-
---include $(SPEC)
-+include $(GAMMADIR)/make/defs.make
- include $(GAMMADIR)/make/scm.make
- include $(GAMMADIR)/make/altsrc.make
-
-@@ -215,6 +216,7 @@
- echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
- echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
- echo "OPENJDK = $(OPENJDK)"; \
-+ echo "ZERO_BUILD = $(ZERO_BUILD)"; \
- echo; \
- echo "# Used for platform dispatching"; \
- echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
-@@ -253,6 +255,16 @@
- echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
- [ -n "$(CFLAGS_BROWSE)" ] && \
- echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \
-+ [ -n "$(ENABLE_FULL_DEBUG_SYMBOLS)" ] && \
-+ echo && echo "ENABLE_FULL_DEBUG_SYMBOLS = $(ENABLE_FULL_DEBUG_SYMBOLS)"; \
-+ [ -n "$(OBJCOPY)" ] && \
-+ echo && echo "OBJCOPY = $(OBJCOPY)"; \
-+ [ -n "$(STRIP_POLICY)" ] && \
-+ echo && echo "STRIP_POLICY = $(STRIP_POLICY)"; \
-+ [ -n "$(ZIP_DEBUGINFO_FILES)" ] && \
-+ echo && echo "ZIP_DEBUGINFO_FILES = $(ZIP_DEBUGINFO_FILES)"; \
-+ [ -n "$(ZIPEXE)" ] && \
-+ echo && echo "ZIPEXE = $(ZIPEXE)"; \
- [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
- echo && \
- echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
-@@ -382,7 +394,7 @@
- $(QUIETLY) ( \
- $(BUILDTREE_COMMENT); \
- echo "JDK=${JAVA_HOME}"; \
-- ) > $@
-+ ) > $@
-
- .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-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,6 @@
- #
- # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2013 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -105,10 +106,10 @@
- VM_PICFLAG/AOUT =
- VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
-
--ifeq ($(JVM_VARIANT_ZERO), true)
-+ifeq ($(TYPE),ZERO)
- CFLAGS += $(LIBFFI_CFLAGS)
- endif
--ifeq ($(JVM_VARIANT_ZEROSHARK), true)
-+ifeq ($(TYPE),SHARK)
- CFLAGS += $(LIBFFI_CFLAGS)
- CFLAGS += $(LLVM_CFLAGS)
- endif
-@@ -116,7 +117,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"
-@@ -214,7 +218,11 @@
-
- # Flags for generating make dependency flags.
- ifneq ("${CC_VER_MAJOR}", "2")
--DEPFLAGS = -fpch-deps -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
-+DEPFLAGS =
-+ifeq (,$(findstring clang,$(shell $(CC) -v 2>&1)))
-+DEPFLAGS += -fpch-deps
-+endif
-+DEPFLAGS += -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
- endif
-
- # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
---- ./hotspot/make/bsd/makefiles/jsig.make 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/jsig.make 2014-10-28 20:19:39.000000000 -0700
-@@ -36,9 +36,16 @@
- LIBJSIG_G = lib$(JSIG_G).so
- endif
-
-+LIBJSIG_DEBUGINFO = lib$(JSIG).debuginfo
-+LIBJSIG_DIZ = lib$(JSIG).diz
-+LIBJSIG_G_DEBUGINFO = lib$(JSIG_G).debuginfo
-+LIBJSIG_G_DIZ = lib$(JSIG_G).diz
-+
- JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
-
- DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG)
-+DEST_JSIG_DEBUGINFO = $(JDK_LIBDIR)/$(LIBJSIG_DEBUGINFO)
-+DEST_JSIG_DIZ = $(JDK_LIBDIR)/$(LIBJSIG_DIZ)
-
- LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
-
-@@ -57,11 +64,33 @@
- $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
- @echo Making signal interposition lib...
- $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
-- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
-+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
- $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
-+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
-+ ifeq ($(STRIP_POLICY),all_strip)
-+ $(QUIETLY) $(STRIP) $@
-+ else
-+ ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(STRIP) -S $@
-+ # implied else here is no stripping at all
-+ endif
-+ endif
-+ [ -f $(LIBJSIG_G_DEBUGINFO) ] || { ln -s $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO); }
-+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
-+ $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO)
-+ $(RM) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO)
-+ [ -f $(LIBJSIG_G_DIZ) ] || { ln -s $(LIBJSIG_DIZ) $(LIBJSIG_G_DIZ); }
-+ endif
-+endif
-
- install_jsig: $(LIBJSIG)
- @echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
-+ $(QUIETLY) test -f $(LIBJSIG_DEBUGINFO) && \
-+ cp -f $(LIBJSIG_DEBUGINFO) $(DEST_JSIG_DEBUGINFO)
-+ $(QUIETLY) test -f $(LIBJSIG_DIZ) && \
-+ cp -f $(LIBJSIG_DIZ) $(DEST_JSIG_DIZ)
- $(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
-
- .PHONY: install_jsig
---- ./hotspot/make/bsd/makefiles/launcher.make 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/launcher.make 2014-10-28 20:19:39.000000000 -0700
-@@ -50,7 +50,7 @@
- LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
- else
- LAUNCHER.o = launcher.o
-- LFLAGS_LAUNCHER += -L`pwd`
-+ LFLAGS_LAUNCHER += -L`pwd`
-
- # 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-debug 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug 2014-10-28 20:19:39.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
-@@ -82,6 +82,7 @@
- _JVM_EnableCompiler
- _JVM_Exit
- _JVM_FillInStackTrace
-+ _JVM_FindClassFromCaller
- _JVM_FindClassFromClass
- _JVM_FindClassFromClassLoader
- _JVM_FindClassFromBootLoader
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product 2014-10-28 20:58:55.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
-@@ -19,235 +19,247 @@
- # 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.
-+#
- #
--#
--# Only used for OSX/Darwin builds
-
- # Define public interface.
-- # _JNI
-- _JNI_CreateJavaVM
-- _JNI_GetCreatedJavaVMs
-- _JNI_GetDefaultJavaVMInitArgs
--
-- # _JVM
-- _JVM_Accept
-- _JVM_ActiveProcessorCount
-- _JVM_AllocateNewArray
-- _JVM_AllocateNewObject
-- _JVM_ArrayCopy
-- _JVM_AssertionStatusDirectives
-- _JVM_Available
-- _JVM_Bind
-- _JVM_ClassDepth
-- _JVM_ClassLoaderDepth
-- _JVM_Clone
-- _JVM_Close
-- _JVM_CX8Field
-- _JVM_CompileClass
-- _JVM_CompileClasses
-- _JVM_CompilerCommand
-- _JVM_Connect
-- _JVM_ConstantPoolGetClassAt
-- _JVM_ConstantPoolGetClassAtIfLoaded
-- _JVM_ConstantPoolGetDoubleAt
-- _JVM_ConstantPoolGetFieldAt
-- _JVM_ConstantPoolGetFieldAtIfLoaded
-- _JVM_ConstantPoolGetFloatAt
-- _JVM_ConstantPoolGetIntAt
-- _JVM_ConstantPoolGetLongAt
-- _JVM_ConstantPoolGetMethodAt
-- _JVM_ConstantPoolGetMethodAtIfLoaded
-- _JVM_ConstantPoolGetMemberRefInfoAt
-- _JVM_ConstantPoolGetSize
-- _JVM_ConstantPoolGetStringAt
-- _JVM_ConstantPoolGetUTF8At
-- _JVM_CountStackFrames
-- _JVM_CurrentClassLoader
-- _JVM_CurrentLoadedClass
-- _JVM_CurrentThread
-- _JVM_CurrentTimeMillis
-- _JVM_DefineClass
-- _JVM_DefineClassWithSource
-- _JVM_DefineClassWithSourceCond
-- _JVM_DesiredAssertionStatus
-- _JVM_DisableCompiler
-- _JVM_DoPrivileged
-- _JVM_DTraceGetVersion
-- _JVM_DTraceActivate
-- _JVM_DTraceIsProbeEnabled
-- _JVM_DTraceIsSupported
-- _JVM_DTraceDispose
-- _JVM_DumpAllStacks
-- _JVM_DumpThreads
-- _JVM_EnableCompiler
-- _JVM_Exit
-- _JVM_FillInStackTrace
-- _JVM_FindClassFromClass
-- _JVM_FindClassFromClassLoader
-- _JVM_FindClassFromBootLoader
-- _JVM_FindLibraryEntry
-- _JVM_FindLoadedClass
-- _JVM_FindPrimitiveClass
-- _JVM_FindSignal
-- _JVM_FreeMemory
-- _JVM_GC
-- _JVM_GetAllThreads
-- _JVM_GetArrayElement
-- _JVM_GetArrayLength
-- _JVM_GetCPClassNameUTF
-- _JVM_GetCPFieldClassNameUTF
-- _JVM_GetCPFieldModifiers
-- _JVM_GetCPFieldNameUTF
-- _JVM_GetCPFieldSignatureUTF
-- _JVM_GetCPMethodClassNameUTF
-- _JVM_GetCPMethodModifiers
-- _JVM_GetCPMethodNameUTF
-- _JVM_GetCPMethodSignatureUTF
-- _JVM_GetCallerClass
-- _JVM_GetClassAccessFlags
-- _JVM_GetClassAnnotations
-- _JVM_GetClassCPEntriesCount
-- _JVM_GetClassCPTypes
-- _JVM_GetClassConstantPool
-- _JVM_GetClassContext
-- _JVM_GetClassDeclaredConstructors
-- _JVM_GetClassDeclaredFields
-- _JVM_GetClassDeclaredMethods
-- _JVM_GetClassFieldsCount
-- _JVM_GetClassInterfaces
-- _JVM_GetClassLoader
-- _JVM_GetClassMethodsCount
-- _JVM_GetClassModifiers
-- _JVM_GetClassName
-- _JVM_GetClassNameUTF
-- _JVM_GetClassSignature
-- _JVM_GetClassSigners
-- _JVM_GetComponentType
-- _JVM_GetDeclaredClasses
-- _JVM_GetDeclaringClass
-- _JVM_GetEnclosingMethodInfo
-- _JVM_GetFieldAnnotations
-- _JVM_GetFieldIxModifiers
-- _JVM_GetHostName
-- _JVM_GetInheritedAccessControlContext
-- _JVM_GetInterfaceVersion
-- _JVM_GetLastErrorString
-- _JVM_GetManagement
-- _JVM_GetMethodAnnotations
-- _JVM_GetMethodDefaultAnnotationValue
-- _JVM_GetMethodIxArgsSize
-- _JVM_GetMethodIxByteCode
-- _JVM_GetMethodIxByteCodeLength
-- _JVM_GetMethodIxExceptionIndexes
-- _JVM_GetMethodIxExceptionTableEntry
-- _JVM_GetMethodIxExceptionTableLength
-- _JVM_GetMethodIxExceptionsCount
-- _JVM_GetMethodIxLocalsCount
-- _JVM_GetMethodIxMaxStack
-- _JVM_GetMethodIxModifiers
-- _JVM_GetMethodIxNameUTF
-- _JVM_GetMethodIxSignatureUTF
-- _JVM_GetMethodParameterAnnotations
-- _JVM_GetPrimitiveArrayElement
-- _JVM_GetProtectionDomain
-- _JVM_GetSockName
-- _JVM_GetSockOpt
-- _JVM_GetStackAccessControlContext
-- _JVM_GetStackTraceDepth
-- _JVM_GetStackTraceElement
-- _JVM_GetSystemPackage
-- _JVM_GetSystemPackages
-- _JVM_GetThreadStateNames
-- _JVM_GetThreadStateValues
-- _JVM_GetVersionInfo
-- _JVM_Halt
-- _JVM_HoldsLock
-- _JVM_IHashCode
-- _JVM_InitAgentProperties
-- _JVM_InitProperties
-- _JVM_InitializeCompiler
-- _JVM_InitializeSocketLibrary
-- _JVM_InternString
-- _JVM_Interrupt
-- _JVM_InvokeMethod
-- _JVM_IsArrayClass
-- _JVM_IsConstructorIx
-- _JVM_IsInterface
-- _JVM_IsInterrupted
-- _JVM_IsNaN
-- _JVM_IsPrimitiveClass
-- _JVM_IsSameClassPackage
-- _JVM_IsSilentCompiler
-- _JVM_IsSupportedJNIVersion
-- _JVM_IsThreadAlive
-- _JVM_LatestUserDefinedLoader
-- _JVM_Listen
-- _JVM_LoadClass0
-- _JVM_LoadLibrary
-- _JVM_Lseek
-- _JVM_MaxObjectInspectionAge
-- _JVM_MaxMemory
-- _JVM_MonitorNotify
-- _JVM_MonitorNotifyAll
-- _JVM_MonitorWait
-- _JVM_NanoTime
-- _JVM_NativePath
-- _JVM_NewArray
-- _JVM_NewInstanceFromConstructor
-- _JVM_NewMultiArray
-- _JVM_OnExit
-- _JVM_Open
-- _JVM_PrintStackTrace
-- _JVM_RaiseSignal
-- _JVM_RawMonitorCreate
-- _JVM_RawMonitorDestroy
-- _JVM_RawMonitorEnter
-- _JVM_RawMonitorExit
-- _JVM_Read
-- _JVM_Recv
-- _JVM_RecvFrom
-- _JVM_RegisterSignal
-- _JVM_ReleaseUTF
-- _JVM_ResolveClass
-- _JVM_ResumeThread
-- _JVM_Send
-- _JVM_SendTo
-- _JVM_SetArrayElement
-- _JVM_SetClassSigners
-- _JVM_SetLength
-- _JVM_SetNativeThreadName
-- _JVM_SetPrimitiveArrayElement
-- _JVM_SetProtectionDomain
-- _JVM_SetSockOpt
-- _JVM_SetThreadPriority
-- _JVM_Sleep
-- _JVM_Socket
-- _JVM_SocketAvailable
-- _JVM_SocketClose
-- _JVM_SocketShutdown
-- _JVM_StartThread
-- _JVM_StopThread
-- _JVM_SuspendThread
-- _JVM_SupportsCX8
-- _JVM_Sync
-- _JVM_Timeout
-- _JVM_TotalMemory
-- _JVM_TraceInstructions
-- _JVM_TraceMethodCalls
-- _JVM_UnloadLibrary
-- _JVM_Write
-- _JVM_Yield
-- _JVM_handle_bsd_signal
-+
-+SUNWprivate_1.1 {
-+ global:
-+ # JNI
-+ JNI_CreateJavaVM;
-+ JNI_GetCreatedJavaVMs;
-+ JNI_GetDefaultJavaVMInitArgs;
-+
-+ # JVM
-+ JVM_Accept;
-+ JVM_ActiveProcessorCount;
-+ JVM_AllocateNewArray;
-+ JVM_AllocateNewObject;
-+ JVM_ArrayCopy;
-+ JVM_AssertionStatusDirectives;
-+ JVM_Available;
-+ JVM_Bind;
-+ JVM_ClassDepth;
-+ JVM_ClassLoaderDepth;
-+ JVM_Clone;
-+ JVM_Close;
-+ JVM_CX8Field;
-+ JVM_CompileClass;
-+ JVM_CompileClasses;
-+ JVM_CompilerCommand;
-+ JVM_Connect;
-+ JVM_ConstantPoolGetClassAt;
-+ JVM_ConstantPoolGetClassAtIfLoaded;
-+ JVM_ConstantPoolGetDoubleAt;
-+ JVM_ConstantPoolGetFieldAt;
-+ JVM_ConstantPoolGetFieldAtIfLoaded;
-+ JVM_ConstantPoolGetFloatAt;
-+ JVM_ConstantPoolGetIntAt;
-+ JVM_ConstantPoolGetLongAt;
-+ JVM_ConstantPoolGetMethodAt;
-+ JVM_ConstantPoolGetMethodAtIfLoaded;
-+ JVM_ConstantPoolGetMemberRefInfoAt;
-+ JVM_ConstantPoolGetSize;
-+ JVM_ConstantPoolGetStringAt;
-+ JVM_ConstantPoolGetUTF8At;
-+ JVM_CountStackFrames;
-+ JVM_CurrentClassLoader;
-+ JVM_CurrentLoadedClass;
-+ JVM_CurrentThread;
-+ JVM_CurrentTimeMillis;
-+ JVM_DefineClass;
-+ JVM_DefineClassWithSource;
-+ JVM_DefineClassWithSourceCond;
-+ JVM_DesiredAssertionStatus;
-+ JVM_DisableCompiler;
-+ JVM_DoPrivileged;
-+ JVM_DTraceGetVersion;
-+ JVM_DTraceActivate;
-+ JVM_DTraceIsProbeEnabled;
-+ JVM_DTraceIsSupported;
-+ JVM_DTraceDispose;
-+ JVM_DumpAllStacks;
-+ JVM_DumpThreads;
-+ JVM_EnableCompiler;
-+ JVM_Exit;
-+ JVM_FillInStackTrace;
-+ JVM_FindClassFromCaller;
-+ JVM_FindClassFromClass;
-+ JVM_FindClassFromClassLoader;
-+ JVM_FindClassFromBootLoader;
-+ JVM_FindLibraryEntry;
-+ JVM_FindLoadedClass;
-+ JVM_FindPrimitiveClass;
-+ JVM_FindSignal;
-+ JVM_FreeMemory;
-+ JVM_GC;
-+ JVM_GetAllThreads;
-+ JVM_GetArrayElement;
-+ JVM_GetArrayLength;
-+ JVM_GetCPClassNameUTF;
-+ JVM_GetCPFieldClassNameUTF;
-+ JVM_GetCPFieldModifiers;
-+ JVM_GetCPFieldNameUTF;
-+ JVM_GetCPFieldSignatureUTF;
-+ JVM_GetCPMethodClassNameUTF;
-+ JVM_GetCPMethodModifiers;
-+ JVM_GetCPMethodNameUTF;
-+ JVM_GetCPMethodSignatureUTF;
-+ JVM_GetCallerClass;
-+ JVM_GetClassAccessFlags;
-+ JVM_GetClassAnnotations;
-+ JVM_GetClassCPEntriesCount;
-+ JVM_GetClassCPTypes;
-+ JVM_GetClassConstantPool;
-+ JVM_GetClassContext;
-+ JVM_GetClassDeclaredConstructors;
-+ JVM_GetClassDeclaredFields;
-+ JVM_GetClassDeclaredMethods;
-+ JVM_GetClassFieldsCount;
-+ JVM_GetClassInterfaces;
-+ JVM_GetClassLoader;
-+ JVM_GetClassMethodsCount;
-+ JVM_GetClassModifiers;
-+ JVM_GetClassName;
-+ JVM_GetClassNameUTF;
-+ JVM_GetClassSignature;
-+ JVM_GetClassSigners;
-+ JVM_GetComponentType;
-+ JVM_GetDeclaredClasses;
-+ JVM_GetDeclaringClass;
-+ JVM_GetEnclosingMethodInfo;
-+ JVM_GetFieldAnnotations;
-+ JVM_GetFieldIxModifiers;
-+ JVM_GetHostName;
-+ JVM_GetInheritedAccessControlContext;
-+ JVM_GetInterfaceVersion;
-+ JVM_GetLastErrorString;
-+ JVM_GetManagement;
-+ JVM_GetMethodAnnotations;
-+ JVM_GetMethodDefaultAnnotationValue;
-+ JVM_GetMethodIxArgsSize;
-+ JVM_GetMethodIxByteCode;
-+ JVM_GetMethodIxByteCodeLength;
-+ JVM_GetMethodIxExceptionIndexes;
-+ JVM_GetMethodIxExceptionTableEntry;
-+ JVM_GetMethodIxExceptionTableLength;
-+ JVM_GetMethodIxExceptionsCount;
-+ JVM_GetMethodIxLocalsCount;
-+ JVM_GetMethodIxMaxStack;
-+ JVM_GetMethodIxModifiers;
-+ JVM_GetMethodIxNameUTF;
-+ JVM_GetMethodIxSignatureUTF;
-+ JVM_GetMethodParameterAnnotations;
-+ JVM_GetPrimitiveArrayElement;
-+ JVM_GetProtectionDomain;
-+ JVM_GetSockName;
-+ JVM_GetSockOpt;
-+ JVM_GetStackAccessControlContext;
-+ JVM_GetStackTraceDepth;
-+ JVM_GetStackTraceElement;
-+ JVM_GetSystemPackage;
-+ JVM_GetSystemPackages;
-+ JVM_GetThreadStateNames;
-+ JVM_GetThreadStateValues;
-+ JVM_GetVersionInfo;
-+ JVM_Halt;
-+ JVM_HoldsLock;
-+ JVM_IHashCode;
-+ JVM_InitAgentProperties;
-+ JVM_InitProperties;
-+ JVM_InitializeCompiler;
-+ JVM_InitializeSocketLibrary;
-+ JVM_InternString;
-+ JVM_Interrupt;
-+ JVM_InvokeMethod;
-+ JVM_IsArrayClass;
-+ JVM_IsConstructorIx;
-+ JVM_IsInterface;
-+ JVM_IsInterrupted;
-+ JVM_IsNaN;
-+ JVM_IsPrimitiveClass;
-+ JVM_IsSameClassPackage;
-+ JVM_IsSilentCompiler;
-+ JVM_IsSupportedJNIVersion;
-+ JVM_IsThreadAlive;
-+ JVM_LatestUserDefinedLoader;
-+ JVM_Listen;
-+ JVM_LoadClass0;
-+ JVM_LoadLibrary;
-+ JVM_Lseek;
-+ JVM_MaxObjectInspectionAge;
-+ JVM_MaxMemory;
-+ JVM_MonitorNotify;
-+ JVM_MonitorNotifyAll;
-+ JVM_MonitorWait;
-+ JVM_NanoTime;
-+ JVM_NativePath;
-+ JVM_NewArray;
-+ JVM_NewInstanceFromConstructor;
-+ JVM_NewMultiArray;
-+ JVM_OnExit;
-+ JVM_Open;
-+ JVM_PrintStackTrace;
-+ JVM_RaiseSignal;
-+ JVM_RawMonitorCreate;
-+ JVM_RawMonitorDestroy;
-+ JVM_RawMonitorEnter;
-+ JVM_RawMonitorExit;
-+ JVM_Read;
-+ JVM_Recv;
-+ JVM_RecvFrom;
-+ JVM_RegisterSignal;
-+ JVM_ReleaseUTF;
-+ JVM_ResolveClass;
-+ JVM_ResumeThread;
-+ JVM_Send;
-+ JVM_SendTo;
-+ JVM_SetArrayElement;
-+ JVM_SetClassSigners;
-+ JVM_SetLength;
-+ JVM_SetNativeThreadName;
-+ JVM_SetPrimitiveArrayElement;
-+ JVM_SetProtectionDomain;
-+ JVM_SetSockOpt;
-+ JVM_SetThreadPriority;
-+ JVM_Sleep;
-+ JVM_Socket;
-+ JVM_SocketAvailable;
-+ JVM_SocketClose;
-+ JVM_SocketShutdown;
-+ JVM_StartThread;
-+ JVM_StopThread;
-+ JVM_SuspendThread;
-+ JVM_SupportsCX8;
-+ JVM_Sync;
-+ JVM_Timeout;
-+ JVM_TotalMemory;
-+ JVM_TraceInstructions;
-+ JVM_TraceMethodCalls;
-+ JVM_UnloadLibrary;
-+ JVM_Write;
-+ JVM_Yield;
-+ JVM_handle_bsd_signal;
-
- # miscellaneous functions
-- _jio_fprintf
-- _jio_printf
-- _jio_snprintf
-- _jio_vfprintf
-- _jio_vsnprintf
-+ jio_fprintf;
-+ jio_printf;
-+ jio_snprintf;
-+ jio_vfprintf;
-+ jio_vsnprintf;
-+ fork1;
-+ numa_warn;
-+ numa_error;
-+
-+ # Needed because there is no JVM interface for this.
-+ sysThreadAvailableStackWithSlack;
-
- # This is for Forte Analyzer profiling support.
-- _AsyncGetCallTrace
-+ AsyncGetCallTrace;
-
-- # INSERT VTABLE SYMBOLS HERE
-+ # INSERT VTABLE SYMBOLS HERE
-
-+ local:
-+ *;
-+};
---- ./hotspot/make/bsd/makefiles/ppc.make 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/ppc.make 2014-10-28 20:19:39.000000000 -0700
-@@ -28,3 +28,6 @@
- # Must also specify if CPU is big endian
- CFLAGS += -DVM_BIG_ENDIAN
-
-+ifdef E500V2
-+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-10-28 20:19:39.000000000 -0700
-@@ -36,6 +36,11 @@
- LIBSAPROC_G = lib$(SAPROC_G).so
- endif
-
-+LIBSAPROC_DEBUGINFO = lib$(SAPROC).debuginfo
-+LIBSAPROC_DIZ = lib$(SAPROC).diz
-+LIBSAPROC_G_DEBUGINFO = lib$(SAPROC_G).debuginfo
-+LIBSAPROC_G_DIZ = lib$(SAPROC_G).diz
-+
- AGENT_DIR = $(GAMMADIR)/agent
-
- SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
-@@ -66,7 +71,9 @@
-
- SAMAPFILE = $(SASRCDIR)/mapfile
-
--DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
-+DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
-+DEST_SAPROC_DEBUGINFO = $(JDK_LIBDIR)/$(LIBSAPROC_DEBUGINFO)
-+DEST_SAPROC_DIZ = $(JDK_LIBDIR)/$(LIBSAPROC_DIZ)
-
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-@@ -114,10 +121,32 @@
- -o $@ \
- $(SALIBS)
- $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
-+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
-+ ifeq ($(STRIP_POLICY),all_strip)
-+ $(QUIETLY) $(STRIP) $@
-+ else
-+ ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(STRIP) -S $@
-+ # implied else here is no stripping at all
-+ endif
-+ endif
-+ [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); }
-+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
-+ $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO)
-+ $(RM) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO)
-+ [ -f $(LIBSAPROC_G_DIZ) ] || { ln -s $(LIBSAPROC_DIZ) $(LIBSAPROC_G_DIZ); }
-+ endif
-+endif
-
- install_saproc: $(BUILDLIBSAPROC)
- $(QUIETLY) if [ -e $(LIBSAPROC) ] ; then \
- echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"; \
-+ test -f $(LIBSAPROC_DEBUGINFO) && \
-+ cp -f $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO); \
-+ test -f $(LIBSAPROC_DIZ) && \
-+ cp -f $(LIBSAPROC_DIZ) $(DEST_SAPROC_DIZ); \
- cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
- fi
-
---- ./hotspot/make/bsd/makefiles/vm.make 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/vm.make 2014-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,6 @@
- #
- # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2013 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -42,7 +43,9 @@
- -include $(DEP_DIR)/*.d
-
- # read machine-specific adjustments (%%% should do this via buildtree.make?)
--ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
-+ifeq ($(TYPE),ZERO)
-+ include $(MAKEFILES_DIR)/zeroshark.make
-+else ifeq ($(TYPE),SHARK)
- include $(MAKEFILES_DIR)/zeroshark.make
- else
- include $(MAKEFILES_DIR)/$(BUILDARCH).make
-@@ -271,10 +274,10 @@
-
- LIBS_VM += $(LIBS)
- endif
--ifeq ($(JVM_VARIANT_ZERO), true)
-+ifeq ($(TYPE),ZERO)
- LIBS_VM += $(LIBFFI_LIBS)
- endif
--ifeq ($(JVM_VARIANT_ZEROSHARK), true)
-+ifeq ($(TYPE),SHARK)
- LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS)
- LFLAGS_VM += $(LLVM_LDFLAGS)
- endif
---- ./hotspot/make/hotspot_version 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/hotspot_version 2014-10-28 20:19:38.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=71
-+HS_BUILD_NUMBER=01
-
- 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-07-15 21:48:34.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/linux/makefiles/buildtree.make 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/linux/makefiles/buildtree.make 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,6 @@
- #
- # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2013 Red Hat, Inc.
- # 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,7 +57,7 @@
- # The makefiles are split this way so that "make foo" will run faster by not
- # having to read the dependency files for the vm.
-
---include $(SPEC)
-+include $(GAMMADIR)/make/defs.make
- include $(GAMMADIR)/make/scm.make
- include $(GAMMADIR)/make/altsrc.make
-
-@@ -208,6 +209,7 @@
- echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
- echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
- echo "OPENJDK = $(OPENJDK)"; \
-+ echo "ZERO_BUILD = $(ZERO_BUILD)"; \
- echo; \
- echo "# Used for platform dispatching"; \
- echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
---- ./hotspot/make/linux/makefiles/gcc.make 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/linux/makefiles/gcc.make 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,6 @@
- #
- # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2013 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -72,10 +73,10 @@
- VM_PICFLAG/AOUT =
- VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
-
--ifeq ($(JVM_VARIANT_ZERO), true)
-+ifeq ($(TYPE),ZERO)
- CFLAGS += $(LIBFFI_CFLAGS)
- endif
--ifeq ($(JVM_VARIANT_ZEROSHARK), true)
-+ifeq ($(TYPE),SHARK)
- CFLAGS += $(LIBFFI_CFLAGS)
- CFLAGS += $(LLVM_CFLAGS)
- endif
---- ./hotspot/make/linux/makefiles/mapfile-vers-debug 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/linux/makefiles/mapfile-vers-debug 2014-10-28 20:19:38.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
-@@ -84,6 +84,7 @@
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
-+ JVM_FindClassFromCaller;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindClassFromBootLoader;
---- ./hotspot/make/linux/makefiles/mapfile-vers-product 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/linux/makefiles/mapfile-vers-product 2014-10-28 20:19:38.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
-@@ -84,6 +84,7 @@
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
-+ JVM_FindClassFromCaller;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindClassFromBootLoader;
---- ./hotspot/make/linux/makefiles/vm.make 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/linux/makefiles/vm.make 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,6 @@
- #
- # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2013 Red Hat, Inc.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -42,7 +43,9 @@
- -include $(DEP_DIR)/*.d
-
- # read machine-specific adjustments (%%% should do this via buildtree.make?)
--ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
-+ifeq ($(TYPE),ZERO)
-+ include $(MAKEFILES_DIR)/zeroshark.make
-+else ifeq ($(TYPE),SHARK)
- include $(MAKEFILES_DIR)/zeroshark.make
- else
- include $(MAKEFILES_DIR)/$(BUILDARCH).make
-@@ -244,7 +247,7 @@
- vm.def: $(Res_Files) $(Obj_Files)
- sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
-
--ifeq ($(JVM_VARIANT_ZEROSHARK), true)
-+ifeq ($(TYPE),SHARK)
- STATIC_CXX = false
- else
- ifeq ($(ZERO_LIBARCH), ppc64)
-@@ -276,10 +279,10 @@
-
- LIBS_VM += $(LIBS)
- endif
--ifeq ($(JVM_VARIANT_ZERO), true)
-+ifeq ($(TYPE),ZERO)
- LIBS_VM += $(LIBFFI_LIBS)
- endif
--ifeq ($(JVM_VARIANT_ZEROSHARK), true)
-+ifeq ($(TYPE),SHARK)
- LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS)
- LFLAGS_VM += $(LLVM_LDFLAGS)
- endif
---- ./hotspot/make/solaris/makefiles/defs.make 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/solaris/makefiles/defs.make 2014-10-28 20:19:39.000000000 -0700
-@@ -221,8 +221,8 @@
- endif
- ifeq ($(JVM_VARIANT_CLIENT),true)
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
-- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
-+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
-+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
- ifeq ($(ARCH_DATA_MODEL),32)
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
---- ./hotspot/make/solaris/makefiles/mapfile-vers 2013-09-06 11:22:00.000000000 -0700
-+++ ./hotspot/make/solaris/makefiles/mapfile-vers 2014-10-28 20:19:38.000000000 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2000, 2011, 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
-@@ -84,6 +84,7 @@
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
-+ JVM_FindClassFromCaller;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindClassFromBootLoader;
---- ./hotspot/make/windows/makefiles/compile.make 2013-09-06 11:22:01.000000000 -0700
-+++ ./hotspot/make/windows/makefiles/compile.make 2014-07-15 21:48:34.000000000 -0700
-@@ -172,6 +172,7 @@
- PRODUCT_OPT_OPTION = /O2 /Oy-
- FASTDEBUG_OPT_OPTION = /O2 /Oy-
- DEBUG_OPT_OPTION = /Od
-+SAFESEH_FLAG = /SAFESEH
- !endif
-
- !if "$(COMPILER_NAME)" == "VS2005"
-@@ -190,6 +191,7 @@
- !if "x$(MT)" == "x"
- MT=mt.exe
- !endif
-+SAFESEH_FLAG = /SAFESEH
- !endif
-
- !if "$(COMPILER_NAME)" == "VS2008"
-@@ -203,6 +205,7 @@
- !if "x$(MT)" == "x"
- MT=mt.exe
- !endif
-+SAFESEH_FLAG = /SAFESEH
- !endif
-
- !if "$(COMPILER_NAME)" == "VS2010"
-@@ -216,9 +219,11 @@
- !if "x$(MT)" == "x"
- MT=mt.exe
- !endif
--!if "$(BUILDARCH)" == "i486"
--LD_FLAGS = /SAFESEH $(LD_FLAGS)
-+SAFESEH_FLAG = /SAFESEH
- !endif
-+
-+!if "$(BUILDARCH)" == "i486"
-+LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
- !endif
-
- # 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 2014-07-15 21:48:34.000000000 -0700
-@@ -107,6 +107,9 @@
- !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
- SA_LFLAGS = $(SA_LFLAGS) -map -debug
- !endif
-+!if "$(BUILDARCH)" == "i486"
-+SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
-+!endif
-
- # 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/make/windows/makefiles/trace.make 2013-09-06 11:22:01.000000000 -0700
-+++ ./hotspot/make/windows/makefiles/trace.make 2014-10-28 20:19:38.000000000 -0700
-@@ -40,8 +40,7 @@
- traceEventIds.hpp \
- traceTypes.hpp
-
--
--!if "$(OPENJDK)" != "true"
-+!if EXISTS($(TraceAltSrcDir))
- TraceGeneratedNames = $(TraceGeneratedNames) \
- traceRequestables.hpp \
- traceEventControl.hpp \
-@@ -56,7 +55,7 @@
- $(TraceOutDir)/traceEventIds.hpp \
- $(TraceOutDir)/traceTypes.hpp
-
--!if "$(OPENJDK)" != "true"
-+!if EXISTS($(TraceAltSrcDir))
- TraceGeneratedFiles = $(TraceGeneratedFiles) \
- $(TraceOutDir)/traceRequestables.hpp \
- $(TraceOutDir)/traceEventControl.hpp \
-@@ -68,7 +67,7 @@
- XML_DEPS = $(TraceSrcDir)/trace.xml $(TraceSrcDir)/tracetypes.xml \
- $(TraceSrcDir)/trace.dtd $(TraceSrcDir)/xinclude.mod
-
--!if "$(OPENJDK)" != "true"
-+!if EXISTS($(TraceAltSrcDir))
- XML_DEPS = $(XML_DEPS) $(TraceAltSrcDir)/traceevents.xml
- !endif
-
-@@ -87,7 +86,7 @@
- @echo Generating $@
- @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceTypes.xsl -OUT $(TraceOutDir)/traceTypes.hpp
-
--!if "$(OPENJDK)" == "true"
-+!if !EXISTS($(TraceAltSrcDir))
-
- $(TraceOutDir)/traceEventClasses.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceEventClasses.xsl $(XML_DEPS)
- @echo Generating $@
---- ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp 2013-09-06 11:22:01.000000000 -0700
-+++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -4512,7 +4512,7 @@
- #define __ masm.
- address start = __ pc();
-
-- Label not_already_dirty, restart, refill;
-+ Label not_already_dirty, restart, refill, young_card;
-
- #ifdef _LP64
- __ srlx(O0, CardTableModRefBS::card_shift, O0);
-@@ -4523,9 +4523,15 @@
- __ set(addrlit, O1); // O1 := <card table base>
- __ ldub(O0, O1, O2); // O2 := [O0 + O1]
-
-+ __ cmp_and_br_short(O2, G1SATBCardTableModRefBS::g1_young_card_val(), Assembler::equal, Assembler::pt, young_card);
-+
-+ __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
-+ __ ldub(O0, O1, O2); // O2 := [O0 + O1]
-+
- assert(CardTableModRefBS::dirty_card_val() == 0, "otherwise check this code");
- __ cmp_and_br_short(O2, G0, Assembler::notEqual, Assembler::pt, not_already_dirty);
-
-+ __ bind(young_card);
- // We didn't take the branch, so we're already dirty: return.
- // Use return-from-leaf
- __ retl();
---- ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2013-09-06 11:22:01.000000000 -0700
-+++ ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -36,6 +36,9 @@
- #include "runtime/signature.hpp"
- #include "runtime/vframeArray.hpp"
- #include "vmreg_sparc.inline.hpp"
-+#ifndef SERIALGC
-+#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-+#endif
-
- // Implementation of StubAssembler
-
-@@ -898,7 +901,7 @@
- Register tmp2 = G3_scratch;
- jbyte* byte_map_base = ((CardTableModRefBS*)bs)->byte_map_base;
-
-- Label not_already_dirty, restart, refill;
-+ Label not_already_dirty, restart, refill, young_card;
-
- #ifdef _LP64
- __ srlx(addr, CardTableModRefBS::card_shift, addr);
-@@ -910,9 +913,15 @@
- __ set(rs, cardtable); // cardtable := <card table base>
- __ ldub(addr, cardtable, tmp); // tmp := [addr + cardtable]
-
-+ __ cmp_and_br_short(tmp, G1SATBCardTableModRefBS::g1_young_card_val(), Assembler::equal, Assembler::pt, young_card);
-+
-+ __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
-+ __ ldub(addr, cardtable, tmp); // tmp := [addr + cardtable]
-+
- assert(CardTableModRefBS::dirty_card_val() == 0, "otherwise check this code");
- __ cmp_and_br_short(tmp, G0, Assembler::notEqual, Assembler::pt, not_already_dirty);
-
-+ __ bind(young_card);
- // We didn't take the branch, so we're already dirty: return.
- // Use return-from-leaf
- __ retl();
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -71,7 +71,11 @@
- define_pd_global(bool, RewriteBytecodes, true);
- define_pd_global(bool, RewriteFrequentPairs, true);
-
-+#ifdef _ALLBSD_SOURCE
-+define_pd_global(bool, UseMembar, true);
-+#else
- define_pd_global(bool, UseMembar, false);
-+#endif
-
- // GC Ergo Flags
- define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
---- ./hotspot/src/cpu/sparc/vm/sparc.ad 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/sparc/vm/sparc.ad 2014-07-15 21:48:34.000000000 -0700
-@@ -3399,8 +3399,8 @@
- interface(CONST_INTER);
- %}
-
--// Unsigned (positive) Integer Immediate: 13-bit
--operand immU13() %{
-+// Unsigned Integer Immediate: 12-bit (non-negative that fits in simm13)
-+operand immU12() %{
- predicate((0 <= n->get_int()) && Assembler::is_simm13(n->get_int()));
- match(ConI);
- op_cost(0);
-@@ -3436,6 +3436,17 @@
- interface(CONST_INTER);
- %}
-
-+// Int Immediate non-negative
-+operand immU31()
-+%{
-+ predicate(n->get_int() >= 0);
-+ match(ConI);
-+
-+ op_cost(0);
-+ format %{ %}
-+ interface(CONST_INTER);
-+%}
-+
- // Integer Immediate: 0-bit
- operand immI0() %{
- predicate(n->get_int() == 0);
-@@ -5732,7 +5743,6 @@
- effect(TEMP dst, TEMP tmp);
- ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST);
-
-- size((3+1)*4); // set may use two instructions.
- format %{ "LDUH $mem,$dst\t! ushort/char & 16-bit mask -> long\n\t"
- "SET $mask,$tmp\n\t"
- "AND $dst,$tmp,$dst" %}
-@@ -5854,13 +5864,13 @@
- ins_pipe(iload_mem);
- %}
-
--// Load Integer with a 13-bit mask into a Long Register
--instruct loadI2L_immI13(iRegL dst, memory mem, immI13 mask) %{
-+// Load Integer with a 12-bit mask into a Long Register
-+instruct loadI2L_immU12(iRegL dst, memory mem, immU12 mask) %{
- match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
- ins_cost(MEMORY_REF_COST + DEFAULT_COST);
-
- size(2*4);
-- format %{ "LDUW $mem,$dst\t! int & 13-bit mask -> long\n\t"
-+ format %{ "LDUW $mem,$dst\t! int & 12-bit mask -> long\n\t"
- "AND $dst,$mask,$dst" %}
- ins_encode %{
- Register Rdst = $dst$$Register;
-@@ -5870,14 +5880,13 @@
- ins_pipe(iload_mem);
- %}
-
--// Load Integer with a 32-bit mask into a Long Register
--instruct loadI2L_immI(iRegL dst, memory mem, immI mask, iRegL tmp) %{
-+// Load Integer with a 31-bit mask into a Long Register
-+instruct loadI2L_immU31(iRegL dst, memory mem, immU31 mask, iRegL tmp) %{
- match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
- effect(TEMP dst, TEMP tmp);
- ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST);
-
-- size((3+1)*4); // set may use two instructions.
-- format %{ "LDUW $mem,$dst\t! int & 32-bit mask -> long\n\t"
-+ format %{ "LDUW $mem,$dst\t! int & 31-bit mask -> long\n\t"
- "SET $mask,$tmp\n\t"
- "AND $dst,$tmp,$dst" %}
- ins_encode %{
-@@ -8919,7 +8928,7 @@
- ins_pipe(ialu_cconly_reg_reg);
- %}
-
--instruct compU_iReg_imm13(flagsRegU icc, iRegI op1, immU13 op2 ) %{
-+instruct compU_iReg_imm13(flagsRegU icc, iRegI op1, immU12 op2 ) %{
- match(Set icc (CmpU op1 op2));
-
- size(4);
---- ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2014-07-15 21:48:34.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
-@@ -1873,6 +1873,25 @@
- if (ProfileInterpreter) {
- __ set_method_data_pointer_for_bcp();
- }
-+
-+ if (EnableInvokeDynamic) {
-+ Label L_done;
-+
-+ __ ldub(Address(Lbcp, 0), G1_scratch); // Load current bytecode
-+ __ cmp_and_br_short(G1_scratch, Bytecodes::_invokestatic, Assembler::notEqual, Assembler::pn, L_done);
-+
-+ // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call.
-+ // Detect such a case in the InterpreterRuntime function and return the member name argument, or NULL.
-+
-+ __ call_VM(G1_scratch, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null), I0, Lmethod, Lbcp);
-+
-+ __ br_null(G1_scratch, false, Assembler::pn, L_done);
-+ __ delayed()->nop();
-+
-+ __ st_ptr(G1_scratch, Lesp, wordSize);
-+ __ bind(L_done);
-+ }
-+
- // Resume bytecode interpretation at the current bcp
- __ dispatch_next(vtos);
- // end of JVMTI PopFrame support
---- ./hotspot/src/cpu/x86/vm/assembler_x86.cpp 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/assembler_x86.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -8754,13 +8754,18 @@
- const Register card_addr = tmp;
- lea(card_addr, as_Address(ArrayAddress(cardtable, index)));
- #endif
-- cmpb(Address(card_addr, 0), 0);
-+ cmpb(Address(card_addr, 0), (int)G1SATBCardTableModRefBS::g1_young_card_val());
- jcc(Assembler::equal, done);
-
-+ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
-+ cmpb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
-+ jcc(Assembler::equal, done);
-+
-+
- // storing a region crossing, non-NULL oop, card is clean.
- // dirty card and log.
-
-- movb(Address(card_addr, 0), 0);
-+ movb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
-
- cmpl(queue_index, 0);
- jcc(Assembler::equal, runtime);
---- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -1686,14 +1686,6 @@
- }
-
- assert_different_registers(obj, k_RInfo, klass_RInfo);
-- if (!k->is_loaded()) {
-- jobject2reg_with_patching(k_RInfo, op->info_for_patch());
-- } else {
--#ifdef _LP64
-- __ movoop(k_RInfo, k->constant_encoding());
--#endif // _LP64
-- }
-- assert(obj != k_RInfo, "must be different");
-
- __ cmpptr(obj, (int32_t)NULL_WORD);
- if (op->should_profile()) {
-@@ -1710,6 +1702,14 @@
- } else {
- __ jcc(Assembler::equal, *obj_is_null);
- }
-+
-+ if (!k->is_loaded()) {
-+ jobject2reg_with_patching(k_RInfo, op->info_for_patch());
-+ } else {
-+#ifdef _LP64
-+ __ movoop(k_RInfo, k->constant_encoding());
-+#endif // _LP64
-+ }
- __ verify_oop(obj);
-
- if (op->fast_check()) {
---- ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1395,19 +1395,18 @@
- addr = new LIR_Address(src.result(), offset, type);
- }
-
-- if (data != dst) {
-- __ move(data, dst);
-- data = dst;
-- }
-+ // Because we want a 2-arg form of xchg and xadd
-+ __ move(data, dst);
-+
- if (x->is_add()) {
-- __ xadd(LIR_OprFact::address(addr), data, dst, LIR_OprFact::illegalOpr);
-+ __ xadd(LIR_OprFact::address(addr), dst, dst, LIR_OprFact::illegalOpr);
- } else {
- if (is_obj) {
- // Do the pre-write barrier, if any.
- pre_barrier(LIR_OprFact::address(addr), LIR_OprFact::illegalOpr /* pre_val */,
- true /* do_load */, false /* patch */, NULL);
- }
-- __ xchg(LIR_OprFact::address(addr), data, dst, LIR_OprFact::illegalOpr);
-+ __ xchg(LIR_OprFact::address(addr), dst, dst, LIR_OprFact::illegalOpr);
- if (is_obj) {
- // Seems to be a precise address
- post_barrier(LIR_OprFact::address(addr), data);
---- ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -37,6 +37,9 @@
- #include "runtime/signature.hpp"
- #include "runtime/vframeArray.hpp"
- #include "vmreg_x86.inline.hpp"
-+#ifndef SERIALGC
-+#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-+#endif
-
-
- // Implementation of StubAssembler
-@@ -1743,13 +1746,17 @@
- __ leal(card_addr, __ as_Address(ArrayAddress(cardtable, index)));
- #endif
-
-- __ cmpb(Address(card_addr, 0), 0);
-+ __ cmpb(Address(card_addr, 0), (int)G1SATBCardTableModRefBS::g1_young_card_val());
-+ __ jcc(Assembler::equal, done);
-+
-+ __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
-+ __ cmpb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
- __ jcc(Assembler::equal, done);
-
- // storing region crossing non-NULL, card is clean.
- // dirty card and log.
-
-- __ movb(Address(card_addr, 0), 0);
-+ __ movb(Address(card_addr, 0), (int)CardTableModRefBS::dirty_card_val());
-
- __ cmpl(queue_index, 0);
- __ jcc(Assembler::equal, runtime);
---- ./hotspot/src/cpu/x86/vm/frame_x86.cpp 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/frame_x86.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -94,12 +94,6 @@
- // other generic buffer blobs are more problematic so we just assume they are
- // ok. adapter blobs never have a frame complete and are never ok.
-
-- // check for a valid frame_size, otherwise we are unlikely to get a valid sender_pc
--
-- if (!Interpreter::contains(_pc) && _cb->frame_size() <= 0) {
-- return false;
-- }
--
- if (!_cb->is_frame_complete_at(_pc)) {
- if (_cb->is_nmethod() || _cb->is_adapter_blob() || _cb->is_runtime_stub()) {
- return false;
-@@ -139,6 +133,11 @@
- // must be some sort of compiled/runtime frame
- // fp does not have to be safe (although it could be check for c1?)
-
-+ // check for a valid frame_size, otherwise we are unlikely to get a valid sender_pc
-+ if (_cb->frame_size() <= 0) {
-+ return false;
-+ }
-+
- sender_sp = _unextended_sp + _cb->frame_size();
- // On Intel the return_address is always the word on the stack
- sender_pc = (address) *(sender_sp-1);
---- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2014-10-28 20:19:39.000000000 -0700
-@@ -62,7 +62,7 @@
- // due to lack of optimization caused by C++ compiler bugs
- define_pd_global(intx, StackShadowPages, NOT_WIN64(20) WIN64_ONLY(6) DEBUG_ONLY(+2));
- #else
--define_pd_global(intx, StackShadowPages, 4 DEBUG_ONLY(+5));
-+define_pd_global(intx, StackShadowPages, 6 DEBUG_ONLY(+5));
- #endif // AMD64
-
- define_pd_global(intx, PreInflateSpin, 10);
---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2014-07-15 21:48:35.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
-@@ -1789,6 +1789,27 @@
- __ get_thread(thread);
- __ movl(Address(thread, JavaThread::popframe_condition_offset()), JavaThread::popframe_inactive);
-
-+ if (EnableInvokeDynamic) {
-+ Label L_done;
-+ const Register local0 = rdi;
-+
-+ __ cmpb(Address(rsi, 0), Bytecodes::_invokestatic);
-+ __ jcc(Assembler::notEqual, L_done);
-+
-+ // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call.
-+ // Detect such a case in the InterpreterRuntime function and return the member name argument, or NULL.
-+
-+ __ get_method(rdx);
-+ __ movptr(rax, Address(local0, 0));
-+ __ call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null), rax, rdx, rsi);
-+
-+ __ testptr(rax, rax);
-+ __ jcc(Assembler::zero, L_done);
-+
-+ __ movptr(Address(rbx, 0), rax);
-+ __ bind(L_done);
-+ }
-+
- __ dispatch_next(vtos);
- // end of PopFrame support
-
---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2013-09-06 11:22:02.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, 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
-@@ -1815,6 +1815,27 @@
- __ movl(Address(r15_thread, JavaThread::popframe_condition_offset()),
- JavaThread::popframe_inactive);
-
-+ if (EnableInvokeDynamic) {
-+ Label L_done;
-+ const Register local0 = r14;
-+
-+ __ cmpb(Address(r13, 0), Bytecodes::_invokestatic);
-+ __ jcc(Assembler::notEqual, L_done);
-+
-+ // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call.
-+ // Detect such a case in the InterpreterRuntime function and return the member name argument, or NULL.
-+
-+ __ get_method(rdx);
-+ __ movptr(rax, Address(local0, 0));
-+ __ call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null), rax, rdx, r13);
-+
-+ __ testptr(rax, rax);
-+ __ jcc(Assembler::zero, L_done);
-+
-+ __ movptr(Address(rbx, 0), rax);
-+ __ bind(L_done);
-+ }
-+
- __ dispatch_next(vtos);
- // end of PopFrame support
-
---- ./hotspot/src/cpu/x86/vm/x86_32.ad 2013-09-06 11:22:03.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/x86_32.ad 2014-07-15 21:48:35.000000000 -0700
-@@ -3919,6 +3919,17 @@
- interface(CONST_INTER);
- %}
-
-+// Int Immediate non-negative
-+operand immU31()
-+%{
-+ predicate(n->get_int() >= 0);
-+ match(ConI);
-+
-+ op_cost(0);
-+ format %{ %}
-+ interface(CONST_INTER);
-+%}
-+
- // Constant for long shifts
- operand immI_32() %{
- predicate( n->get_int() == 32 );
-@@ -6135,12 +6146,12 @@
- ins_pipe(ialu_reg_mem);
- %}
-
--// Load Integer with 32-bit mask into Long Register
--instruct loadI2L_immI(eRegL dst, memory mem, immI mask, eFlagsReg cr) %{
-+// Load Integer with 31-bit mask into Long Register
-+instruct loadI2L_immU31(eRegL dst, memory mem, immU31 mask, eFlagsReg cr) %{
- match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
- effect(KILL cr);
-
-- format %{ "MOV $dst.lo,$mem\t# int & 32-bit mask -> long\n\t"
-+ format %{ "MOV $dst.lo,$mem\t# int & 31-bit mask -> long\n\t"
- "XOR $dst.hi,$dst.hi\n\t"
- "AND $dst.lo,$mask" %}
- ins_encode %{
---- ./hotspot/src/cpu/x86/vm/x86_64.ad 2013-09-06 11:22:03.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/x86_64.ad 2014-07-15 21:48:35.000000000 -0700
-@@ -3142,6 +3142,17 @@
- interface(CONST_INTER);
- %}
-
-+// Int Immediate non-negative
-+operand immU31()
-+%{
-+ predicate(n->get_int() >= 0);
-+ match(ConI);
-+
-+ op_cost(0);
-+ format %{ %}
-+ interface(CONST_INTER);
-+%}
-+
- // Constant for long shifts
- operand immI_32()
- %{
-@@ -5083,12 +5094,12 @@
- ins_pipe(ialu_reg_mem);
- %}
-
--// Load Integer with a 32-bit mask into Long Register
--instruct loadI2L_immI(rRegL dst, memory mem, immI mask, rFlagsReg cr) %{
-+// Load Integer with a 31-bit mask into Long Register
-+instruct loadI2L_immU31(rRegL dst, memory mem, immU31 mask, rFlagsReg cr) %{
- match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
- effect(KILL cr);
-
-- format %{ "movl $dst, $mem\t# int & 32-bit mask -> long\n\t"
-+ format %{ "movl $dst, $mem\t# int & 31-bit mask -> long\n\t"
- "andl $dst, $mask" %}
- ins_encode %{
- Register Rdst = $dst$$Register;
---- ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp 2013-09-06 11:22:03.000000000 -0700
-+++ ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2008, 2010 Red Hat, Inc.
-+ * Copyright (c) 2013 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -58,8 +58,8 @@
- JavaCallWrapper* call_wrapper,
- TRAPS);
- public:
-- JavaCallWrapper *call_wrapper() const {
-- return (JavaCallWrapper *) value_of_word(call_wrapper_off);
-+ JavaCallWrapper **call_wrapper() const {
-+ return (JavaCallWrapper **) addr_of_word(call_wrapper_off);
- }
-
- public:
---- ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2013-09-06 11:22:03.000000000 -0700
-+++ ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-- * Copyright (c) 2007, 2013, Red Hat, Inc.
-+ * Copyright (c) 2013 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -132,7 +132,7 @@
- return fp();
- }
-
--inline JavaCallWrapper* frame::entry_frame_call_wrapper() const {
-+inline JavaCallWrapper** frame::entry_frame_call_wrapper_addr() const {
- return zero_entryframe()->call_wrapper();
- }
-
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -460,14 +460,14 @@
-
- void AttachListener::vm_start() {
- char fn[UNIX_PATH_MAX];
-- struct stat64 st;
-+ struct stat st;
- int ret;
-
- int n = snprintf(fn, UNIX_PATH_MAX, "%s/.java_pid%d",
- os::get_temp_directory(), os::current_process_id());
- assert(n < (int)UNIX_PATH_MAX, "java_pid file name buffer overflow");
-
-- RESTARTABLE(::stat64(fn, &st), ret);
-+ RESTARTABLE(::stat(fn, &st), ret);
- if (ret == 0) {
- 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-10-28 20:19:39.000000000 -0700
-@@ -0,0 +1,46 @@
-+/*
-+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * 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.
-+ *
-+ */
-+
-+#include "prims/jvm.h"
-+#include "utilities/decoder_elf.hpp"
-+
-+#include <cxxabi.h>
-+
-+bool ElfDecoder::demangle(const char* symbol, char *buf, int buflen) {
-+ int status;
-+ char* result;
-+ size_t size = (size_t)buflen;
-+
-+ // Don't pass buf to __cxa_demangle. In case of the 'buf' is too small,
-+ // __cxa_demangle will call system "realloc" for additional memory, which
-+ // may use different malloc/realloc mechanism that allocates 'buf'.
-+ if ((result = abi::__cxa_demangle(symbol, NULL, NULL, &status)) != NULL) {
-+ jio_snprintf(buf, buflen, "%s", result);
-+ // call c library's free
-+ ::free(result);
-+ return true;
-+ }
-+ return false;
-+}
-+
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2013, 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
-@@ -187,6 +187,8 @@
- static int SR_signum = SIGUSR2;
- sigset_t SR_sigset;
-
-+// Declarations
-+static void unpackTime(timespec* absTime, bool isAbsolute, jlong time);
-
- ////////////////////////////////////////////////////////////////////////////////
- // utility functions
-@@ -355,7 +357,13 @@
- * since it returns a 64 bit value)
- */
- mib[0] = CTL_HW;
-+#ifdef HW_MEMSIZE
- mib[1] = HW_MEMSIZE;
-+#elif defined (HW_USERMEM64)
-+ mib[1] = HW_USERMEM64;
-+#else
-+ mib[1] = HW_USERMEM;
-+#endif
- len = sizeof(mem_val);
- if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) {
- assert(len == sizeof(mem_val), "unexpected data size");
-@@ -971,13 +979,14 @@
- #endif
-
- #ifdef __APPLE__
--static uint64_t locate_unique_thread_id() {
-+static uint64_t locate_unique_thread_id(mach_port_t mach_thread_port) {
- // Additional thread_id used to correlate threads in SA
- thread_identifier_info_data_t m_ident_info;
- mach_msg_type_number_t count = THREAD_IDENTIFIER_INFO_COUNT;
-
-- thread_info(::mach_thread_self(), THREAD_IDENTIFIER_INFO,
-+ thread_info(mach_thread_port, THREAD_IDENTIFIER_INFO,
- (thread_info_t) &m_ident_info, &count);
-+
- return m_ident_info.thread_id;
- }
- #endif
-@@ -1009,9 +1018,14 @@
-
- #ifdef _ALLBSD_SOURCE
- #ifdef __APPLE__
-- // thread_id is mach thread on macos
-- osthread->set_thread_id(::mach_thread_self());
-- osthread->set_unique_thread_id(locate_unique_thread_id());
-+ // thread_id is mach thread on macos, which pthreads graciously caches and provides for us
-+ mach_port_t thread_id = ::pthread_mach_thread_np(::pthread_self());
-+ guarantee(thread_id != 0, "thread id missing from pthreads");
-+ osthread->set_thread_id(thread_id);
-+
-+ uint64_t unique_thread_id = locate_unique_thread_id(thread_id);
-+ guarantee(unique_thread_id != 0, "unique thread id was not found");
-+ osthread->set_unique_thread_id(unique_thread_id);
- #else
- // thread_id is pthread_id on BSD
- osthread->set_thread_id(::pthread_self());
-@@ -1207,8 +1221,14 @@
- // Store pthread info into the OSThread
- #ifdef _ALLBSD_SOURCE
- #ifdef __APPLE__
-- osthread->set_thread_id(::mach_thread_self());
-- osthread->set_unique_thread_id(locate_unique_thread_id());
-+ // thread_id is mach thread on macos, which pthreads graciously caches and provides for us
-+ mach_port_t thread_id = ::pthread_mach_thread_np(::pthread_self());
-+ guarantee(thread_id != 0, "just checking");
-+ osthread->set_thread_id(thread_id);
-+
-+ uint64_t unique_thread_id = locate_unique_thread_id(thread_id);
-+ guarantee(unique_thread_id != 0, "just checking");
-+ osthread->set_unique_thread_id(unique_thread_id);
- #else
- osthread->set_thread_id(::pthread_self());
- #endif
-@@ -1570,10 +1590,10 @@
- return (1000 * 1000);
- }
-
--// XXX: For now, code this as if BSD does not support vtime.
--bool os::supports_vtime() { return false; }
-+bool os::supports_vtime() { return true; }
- bool os::enable_vtime() { return false; }
- bool os::vtime_enabled() { return false; }
-+
- double os::elapsedVTime() {
- // better than nothing, but not much
- return elapsedTime();
-@@ -1807,9 +1827,6 @@
- ::abort();
- }
-
--// unused on bsd for now.
--void os::set_error_file(const char *logfile) {}
--
-
- // This method is a copy of JDK's sysGetLastErrorString
- // from src/solaris/hpi/src/system_md.c
-@@ -1830,7 +1847,7 @@
-
- intx os::current_thread_id() {
- #ifdef __APPLE__
-- return (intx)::mach_thread_self();
-+ return (intx)::pthread_mach_thread_np(::pthread_self());
- #else
- return (intx)::pthread_self();
- #endif
-@@ -2381,14 +2398,14 @@
- }
-
- void os::print_os_info_brief(outputStream* st) {
-- st->print("Bsd");
-+ st->print("BSD");
-
- os::Posix::print_uname_info(st);
- }
-
- void os::print_os_info(outputStream* st) {
- st->print("OS:");
-- st->print("Bsd");
-+ st->print("BSD");
-
- os::Posix::print_uname_info(st);
-
-@@ -2397,10 +2414,6 @@
- os::Posix::print_load_average(st);
- }
-
--void os::pd_print_cpu_info(outputStream* st) {
-- // Nothing to do for now.
--}
--
- void os::print_memory_info(outputStream* st) {
-
- st->print("Memory:");
-@@ -2417,6 +2430,7 @@
- st->print("(" UINT64_FORMAT "k free)",
- os::available_memory() >> 10);
- #ifndef _ALLBSD_SOURCE
-+ // FIXME: Make this work for *BSD
- st->print(", swap " UINT64_FORMAT "k",
- ((jlong)si.totalswap * si.mem_unit) >> 10);
- st->print("(" UINT64_FORMAT "k free)",
-@@ -2424,12 +2438,22 @@
- #endif
- st->cr();
-
-+ // FIXME: Make this work for *BSD
- // meminfo
- st->print("\n/proc/meminfo:\n");
- _print_ascii_file("/proc/meminfo", st);
- st->cr();
- }
-
-+void os::pd_print_cpu_info(outputStream* st) {
-+ // FIXME: Make this work for *BSD
-+ st->print("\n/proc/cpuinfo:\n");
-+ if (!_print_ascii_file("/proc/cpuinfo", st)) {
-+ st->print(" <Not Available>");
-+ }
-+ st->cr();
-+}
-+
- // Taken from /usr/include/bits/siginfo.h Supposed to be architecture specific
- // but they're the same for all the bsd arch that we support
- // and they're the same for solaris but there's no common place to put this.
-@@ -2573,8 +2597,28 @@
- // determine if this is a legacy image or modules image
- // modules image doesn't have "jre" subdirectory
- len = strlen(buf);
-+ assert(len < buflen, "Ran out of buffer space");
- jrelib_p = buf + len;
-
-+#ifndef __APPLE__
-+ snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
-+ if (0 != access(buf, F_OK)) {
-+ snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch);
-+ }
-+
-+ if (0 == access(buf, F_OK)) {
-+ // Use current module name "libjvm[_g].so" instead of
-+ // "libjvm"debug_only("_g")".so" since for fastdebug version
-+ // we should have "libjvm.so" but debug_only("_g") adds "_g"!
-+ len = strlen(buf);
-+ snprintf(buf + len, buflen-len, "/hotspot/libjvm%s.so", p);
-+ } else {
-+ // Go back to path of .so
-+ rp = realpath(dli_fname, buf);
-+ if (rp == NULL)
-+ return;
-+ }
-+#else
- // Add the appropriate library subdir
- snprintf(jrelib_p, buflen-len, "/jre/lib");
- if (0 != access(buf, F_OK)) {
-@@ -2604,11 +2648,12 @@
- if (rp == NULL)
- return;
- }
-+#endif
- }
- }
- }
-
-- strcpy(saved_jvm_path, buf);
-+ strncpy(saved_jvm_path, buf, MAXPATHLEN);
- }
-
- void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
-@@ -2707,10 +2752,14 @@
- bool timedwait(unsigned int sec, int nsec);
- private:
- jlong currenttime() const;
-- semaphore_t _semaphore;
-+ os_semaphore_t _semaphore;
- };
-
-+#if defined(__FreeBSD__) && __FreeBSD__ > 8
-+Semaphore::Semaphore() : _semaphore() {
-+#else
- Semaphore::Semaphore() : _semaphore(0) {
-+#endif
- SEM_INIT(_semaphore, 0);
- }
-
-@@ -2775,7 +2824,7 @@
-
- bool Semaphore::timedwait(unsigned int sec, int nsec) {
- struct timespec ts;
-- jlong endtime = unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec);
-+ unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec);
-
- while (1) {
- int result = sem_timedwait(&_semaphore, &ts);
-@@ -2996,7 +3045,11 @@
- }
-
- void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-+ commit_memory(addr, bytes, alignment_hint, false);
-+#else
- ::madvise(addr, bytes, MADV_DONTNEED);
-+#endif
- }
-
- void os::numa_make_global(char *addr, size_t bytes) {
-@@ -3422,7 +3475,9 @@
- #endif
- #endif
-
--char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
-+char* os::reserve_memory_special(size_t bytes, size_t alignment, char* req_addr, bool exec) {
-+ fatal("This code is not used or maintained.");
-+
- // "exec" is passed in but not used. Creating the shared image for
- // the code cache doesn't have an SHM_X executable permission to check.
- assert(UseLargePages && UseSHM, "only for SHM large pages");
-@@ -3829,6 +3884,7 @@
- return OS_OK;
- #elif defined(__FreeBSD__)
- int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
-+ return (ret == 0) ? OS_OK : OS_ERR;
- #elif defined(__APPLE__) || defined(__NetBSD__)
- struct sched_param sp;
- int policy;
-@@ -6093,3 +6149,9 @@
- return n;
- }
-
-+#ifndef PRODUCT
-+void TestReserveMemorySpecial_test() {
-+ // No tests available for this platform
-+}
-+#endif
-+
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -103,6 +103,12 @@
-
- static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
-
-+ static void print_full_memory_info(outputStream* st);
-+#ifndef _ALLBSD_SOURCE
-+ static void print_distro_info(outputStream* st);
-+ static void print_libversion_info(outputStream* st);
-+#endif
-+
- public:
-
- 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-10-28 20:19:39.000000000 -0700
-@@ -31,10 +31,22 @@
- # include "atomic_bsd_x86.inline.hpp"
- # include "orderAccess_bsd_x86.inline.hpp"
- #endif
-+#ifdef TARGET_OS_ARCH_bsd_sparc
-+# include "atomic_bsd_sparc.inline.hpp"
-+# include "orderAccess_bsd_sparc.inline.hpp"
-+#endif
- #ifdef TARGET_OS_ARCH_bsd_zero
- # include "atomic_bsd_zero.inline.hpp"
- # include "orderAccess_bsd_zero.inline.hpp"
- #endif
-+#ifdef TARGET_OS_ARCH_bsd_arm
-+# include "atomic_bsd_arm.inline.hpp"
-+# include "orderAccess_bsd_arm.inline.hpp"
-+#endif
-+#ifdef TARGET_OS_ARCH_bsd_ppc
-+# include "atomic_bsd_ppc.inline.hpp"
-+# include "orderAccess_bsd_ppc.inline.hpp"
-+#endif
-
- // 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-10-28 20:19:39.000000000 -0700
-@@ -34,11 +34,26 @@
- # include "orderAccess_bsd_x86.inline.hpp"
- # include "prefetch_bsd_x86.inline.hpp"
- #endif
-+#ifdef TARGET_OS_ARCH_bsd_sparc
-+# include "atomic_bsd_sparc.inline.hpp"
-+# include "orderAccess_bsd_sparc.inline.hpp"
-+# include "prefetch_bsd_sparc.inline.hpp"
-+#endif
- #ifdef TARGET_OS_ARCH_bsd_zero
- # include "atomic_bsd_zero.inline.hpp"
- # include "orderAccess_bsd_zero.inline.hpp"
- # include "prefetch_bsd_zero.inline.hpp"
- #endif
-+#ifdef TARGET_OS_ARCH_bsd_arm
-+# include "atomic_bsd_arm.inline.hpp"
-+# include "orderAccess_bsd_arm.inline.hpp"
-+# include "prefetch_bsd_arm.inline.hpp"
-+#endif
-+#ifdef TARGET_OS_ARCH_bsd_ppc
-+# include "atomic_bsd_ppc.inline.hpp"
-+# include "orderAccess_bsd_ppc.inline.hpp"
-+# include "prefetch_bsd_ppc.inline.hpp"
-+#endif
-
- // Contains inlined functions for class Thread and ThreadLocalStorage
-
---- ./hotspot/src/os/linux/vm/globals_linux.hpp 2013-09-06 11:22:03.000000000 -0700
-+++ ./hotspot/src/os/linux/vm/globals_linux.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -40,6 +40,9 @@
- product(bool, UseHugeTLBFS, false, \
- "Use MAP_HUGETLB for large pages") \
- \
-+ product(bool, UseTransparentHugePages, false, \
-+ "Use MADV_HUGEPAGE for large pages") \
-+ \
- product(bool, LoadExecStackDllInVMThread, true, \
- "Load DLLs with executable-stack attribute in the VM Thread") \
- \
-@@ -50,7 +53,7 @@
- // Defines Linux-specific default values. The flags are available on all
- // platforms, but they may have different default values on other platforms.
- //
--define_pd_global(bool, UseLargePages, true);
-+define_pd_global(bool, UseLargePages, false);
- define_pd_global(bool, UseLargePagesIndividualAllocation, false);
- define_pd_global(bool, UseOSErrorReporting, false);
- define_pd_global(bool, UseThreadPriorities, true) ;
---- ./hotspot/src/os/linux/vm/jsig.c 2013-09-06 11:22:03.000000000 -0700
-+++ ./hotspot/src/os/linux/vm/jsig.c 2014-07-15 21:48:35.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2001, 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
-@@ -107,7 +107,7 @@
-
- signal_lock();
-
-- sigused = (MASK(sig) & jvmsigs) != 0;
-+ sigused = (sig < MAXSIGNUM) && ((MASK(sig) & jvmsigs) != 0);
- if (jvm_signal_installed && sigused) {
- /* jvm has installed its signal handler for this signal. */
- /* Save the handler. Don't really install it. */
-@@ -116,7 +116,7 @@
-
- signal_unlock();
- return oldhandler;
-- } else if (jvm_signal_installing) {
-+ } else if (sig < MAXSIGNUM && jvm_signal_installing) {
- /* jvm is installing its signal handlers. Install the new
- * handlers and save the old ones. jvm uses sigaction().
- * Leave the piece here just in case. */
-@@ -165,7 +165,7 @@
-
- signal_lock();
-
-- sigused = (MASK(sig) & jvmsigs) != 0;
-+ sigused = (sig < MAXSIGNUM) && ((MASK(sig) & jvmsigs) != 0);
- if (jvm_signal_installed && sigused) {
- /* jvm has installed its signal handler for this signal. */
- /* Save the handler. Don't really install it. */
-@@ -178,7 +178,7 @@
-
- signal_unlock();
- return 0;
-- } else if (jvm_signal_installing) {
-+ } else if (sig < MAXSIGNUM && jvm_signal_installing) {
- /* jvm is installing its signal handlers. Install the new
- * handlers and save the old ones. */
- res = call_os_sigaction(sig, act, &oldAct);
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2013, 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
-@@ -120,8 +120,16 @@
- # include <inttypes.h>
- # include <sys/ioctl.h>
-
-+// if RUSAGE_THREAD for getrusage() has not been defined, do it here. The code calling
-+// getrusage() is prepared to handle the associated failure.
-+#ifndef RUSAGE_THREAD
-+#define RUSAGE_THREAD (1) /* only the calling thread */
-+#endif
-+
- #define MAX_PATH (2 * K)
-
-+#define MAX_SECS 100000000
-+
- // for timer info max values which include all bits
- #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
-
-@@ -144,6 +152,7 @@
- bool os::Linux::_supports_fast_thread_cpu_time = false;
- const char * os::Linux::_glibc_version = NULL;
- const char * os::Linux::_libpthread_version = NULL;
-+pthread_condattr_t os::Linux::_condattr[1];
-
- static jlong initial_time_count=0;
-
-@@ -1377,15 +1386,19 @@
- return (1000 * 1000);
- }
-
--// For now, we say that linux does not support vtime. I have no idea
--// whether it can actually be made to (DLD, 9/13/05).
--
--bool os::supports_vtime() { return false; }
-+bool os::supports_vtime() { return true; }
- bool os::enable_vtime() { return false; }
- bool os::vtime_enabled() { return false; }
-+
- double os::elapsedVTime() {
-- // better than nothing, but not much
-- return elapsedTime();
-+ struct rusage usage;
-+ int retval = getrusage(RUSAGE_THREAD, &usage);
-+ if (retval == 0) {
-+ return (double) (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) + (double) (usage.ru_utime.tv_usec + usage.ru_stime.tv_usec) / (1000 * 1000);
-+ } else {
-+ // better than nothing, but not much
-+ return elapsedTime();
-+ }
- }
-
- jlong os::javaTimeMillis() {
-@@ -1427,12 +1440,15 @@
- clock_gettime_func(CLOCK_MONOTONIC, &tp) == 0) {
- // yes, monotonic clock is supported
- _clock_gettime = clock_gettime_func;
-+ return;
- } else {
- // close librt if there is no monotonic clock
- dlclose(handle);
- }
- }
- }
-+ warning("No monotonic clock was available - timed services may " \
-+ "be adversely affected if the time-of-day clock changes");
- }
-
- #ifndef SYS_clock_getres
-@@ -1598,9 +1614,6 @@
- ::abort();
- }
-
--// unused on linux for now.
--void os::set_error_file(const char *logfile) {}
--
-
- // This method is a copy of JDK's sysGetLastErrorString
- // from src/solaris/hpi/src/system_md.c
-@@ -2397,6 +2410,7 @@
- // determine if this is a legacy image or modules image
- // modules image doesn't have "jre" subdirectory
- len = strlen(buf);
-+ assert(len < buflen, "Ran out of buffer room");
- jrelib_p = buf + len;
- snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
- if (0 != access(buf, F_OK)) {
-@@ -2419,7 +2433,7 @@
- }
- }
-
-- strcpy(saved_jvm_path, buf);
-+ strncpy(saved_jvm_path, buf, MAXPATHLEN);
- }
-
- void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
-@@ -2468,7 +2482,6 @@
- sem_t _semaphore;
- };
-
--
- Semaphore::Semaphore() {
- sem_init(&_semaphore, 0, 0);
- }
-@@ -2490,8 +2503,22 @@
- }
-
- bool Semaphore::timedwait(unsigned int sec, int nsec) {
-+
- struct timespec ts;
-- unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec);
-+ // Semaphore's are always associated with CLOCK_REALTIME
-+ os::Linux::clock_gettime(CLOCK_REALTIME, &ts);
-+ // see unpackTime for discussion on overflow checking
-+ if (sec >= MAX_SECS) {
-+ ts.tv_sec += MAX_SECS;
-+ ts.tv_nsec = 0;
-+ } else {
-+ ts.tv_sec += sec;
-+ ts.tv_nsec += nsec;
-+ if (ts.tv_nsec >= NANOSECS_PER_SEC) {
-+ ts.tv_nsec -= NANOSECS_PER_SEC;
-+ ++ts.tv_sec; // note: this must be <= max_secs
-+ }
-+ }
-
- while (1) {
- int result = sem_timedwait(&_semaphore, &ts);
-@@ -2748,35 +2775,7 @@
-
- int os::Linux::commit_memory_impl(char* addr, size_t size,
- size_t alignment_hint, bool exec) {
-- int err;
-- if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
-- int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
-- uintptr_t res =
-- (uintptr_t) ::mmap(addr, size, prot,
-- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB,
-- -1, 0);
-- if (res != (uintptr_t) MAP_FAILED) {
-- if (UseNUMAInterleaving) {
-- numa_make_global(addr, size);
-- }
-- return 0;
-- }
--
-- err = errno; // save errno from mmap() call above
--
-- if (!recoverable_mmap_error(err)) {
-- // However, it is not clear that this loss of our reserved mapping
-- // happens with large pages on Linux or that we cannot recover
-- // from the loss. For now, we just issue a warning and we don't
-- // call vm_exit_out_of_memory(). This issue is being tracked by
-- // JBS-8007074.
-- warn_fail_commit_memory(addr, size, alignment_hint, exec, err);
--// vm_exit_out_of_memory(size, "committing reserved memory.");
-- }
-- // Fall through and try to use small pages
-- }
--
-- err = os::Linux::commit_memory_impl(addr, size, exec);
-+ int err = os::Linux::commit_memory_impl(addr, size, exec);
- if (err == 0) {
- realign_memory(addr, size, alignment_hint);
- }
-@@ -2801,7 +2800,7 @@
- }
-
- void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
-- if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
-+ if (UseTransparentHugePages && alignment_hint > (size_t)vm_page_size()) {
- // We don't check the return value: madvise(MADV_HUGEPAGE) may not
- // be supported or the memory may already be backed by huge pages.
- ::madvise(addr, bytes, MADV_HUGEPAGE);
-@@ -2814,7 +2813,7 @@
- // uncommitted at all. We don't do anything in this case to avoid creating a segment with
- // small pages on top of the SHM segment. This method always works for small pages, so we
- // allow that in any case.
-- if (alignment_hint <= (size_t)os::vm_page_size() || !UseSHM) {
-+ if (alignment_hint <= (size_t)os::vm_page_size() || can_commit_large_page_memory()) {
- commit_memory(addr, bytes, alignment_hint, !ExecMem);
- }
- }
-@@ -3183,11 +3182,31 @@
- return linux_mprotect(addr, size, PROT_READ|PROT_WRITE);
- }
-
-+bool os::Linux::transparent_huge_pages_sanity_check(bool warn, size_t page_size) {
-+ bool result = false;
-+ void *p = mmap(NULL, page_size * 2, PROT_READ|PROT_WRITE,
-+ MAP_ANONYMOUS|MAP_PRIVATE,
-+ -1, 0);
-+ if (p != MAP_FAILED) {
-+ void *aligned_p = align_ptr_up(p, page_size);
-+
-+ result = madvise(aligned_p, page_size, MADV_HUGEPAGE) == 0;
-+
-+ munmap(p, page_size * 2);
-+ }
-+
-+ if (warn && !result) {
-+ warning("TransparentHugePages is not supported by the operating system.");
-+ }
-+
-+ return result;
-+}
-+
- bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) {
- bool result = false;
-- void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE,
-- MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB,
-- -1, 0);
-+ void *p = mmap(NULL, page_size, PROT_READ|PROT_WRITE,
-+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB,
-+ -1, 0);
-
- if (p != MAP_FAILED) {
- // We don't know if this really is a huge page or not.
-@@ -3208,12 +3227,10 @@
- }
- fclose(fp);
- }
-- munmap (p, page_size);
-- if (result)
-- return true;
-+ munmap(p, page_size);
- }
-
-- if (warn) {
-+ if (warn && !result) {
- warning("HugeTLBFS is not supported by the operating system.");
- }
-
-@@ -3261,82 +3278,126 @@
-
- static size_t _large_page_size = 0;
-
--void os::large_page_init() {
-- if (!UseLargePages) {
-- UseHugeTLBFS = false;
-- UseSHM = false;
-- return;
-- }
--
-- if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) {
-- // If UseLargePages is specified on the command line try both methods,
-- // if it's default, then try only HugeTLBFS.
-- if (FLAG_IS_DEFAULT(UseLargePages)) {
-- UseHugeTLBFS = true;
-- } else {
-- UseHugeTLBFS = UseSHM = true;
-- }
-- }
-+size_t os::Linux::find_large_page_size() {
-+ size_t large_page_size = 0;
-
-- if (LargePageSizeInBytes) {
-- _large_page_size = LargePageSizeInBytes;
-- } else {
-- // large_page_size on Linux is used to round up heap size. x86 uses either
-- // 2M or 4M page, depending on whether PAE (Physical Address Extensions)
-- // mode is enabled. AMD64/EM64T uses 2M page in 64bit mode. IA64 can use
-- // page as large as 256M.
-- //
-- // Here we try to figure out page size by parsing /proc/meminfo and looking
-- // for a line with the following format:
-- // Hugepagesize: 2048 kB
-- //
-- // If we can't determine the value (e.g. /proc is not mounted, or the text
-- // format has been changed), we'll use the largest page size supported by
-- // the processor.
-+ // large_page_size on Linux is used to round up heap size. x86 uses either
-+ // 2M or 4M page, depending on whether PAE (Physical Address Extensions)
-+ // mode is enabled. AMD64/EM64T uses 2M page in 64bit mode. IA64 can use
-+ // page as large as 256M.
-+ //
-+ // Here we try to figure out page size by parsing /proc/meminfo and looking
-+ // for a line with the following format:
-+ // Hugepagesize: 2048 kB
-+ //
-+ // If we can't determine the value (e.g. /proc is not mounted, or the text
-+ // format has been changed), we'll use the largest page size supported by
-+ // the processor.
-
- #ifndef ZERO
-- _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M)
-- ARM_ONLY(2 * M) PPC_ONLY(4 * M);
-+ large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M)
-+ ARM_ONLY(2 * M) PPC_ONLY(4 * M);
- #endif // ZERO
-
-- FILE *fp = fopen("/proc/meminfo", "r");
-- if (fp) {
-- while (!feof(fp)) {
-- int x = 0;
-- char buf[16];
-- if (fscanf(fp, "Hugepagesize: %d", &x) == 1) {
-- if (x && fgets(buf, sizeof(buf), fp) && strcmp(buf, " kB\n") == 0) {
-- _large_page_size = x * K;
-- break;
-- }
-- } else {
-- // skip to next line
-- for (;;) {
-- int ch = fgetc(fp);
-- if (ch == EOF || ch == (int)'\n') break;
-- }
-+ FILE *fp = fopen("/proc/meminfo", "r");
-+ if (fp) {
-+ while (!feof(fp)) {
-+ int x = 0;
-+ char buf[16];
-+ if (fscanf(fp, "Hugepagesize: %d", &x) == 1) {
-+ if (x && fgets(buf, sizeof(buf), fp) && strcmp(buf, " kB\n") == 0) {
-+ large_page_size = x * K;
-+ break;
-+ }
-+ } else {
-+ // skip to next line
-+ for (;;) {
-+ int ch = fgetc(fp);
-+ if (ch == EOF || ch == (int)'\n') break;
- }
- }
-- fclose(fp);
- }
-+ fclose(fp);
-+ }
-+
-+ if (!FLAG_IS_DEFAULT(LargePageSizeInBytes) && LargePageSizeInBytes != large_page_size) {
-+ warning("Setting LargePageSizeInBytes has no effect on this OS. Large page size is "
-+ SIZE_FORMAT "%s.", byte_size_in_proper_unit(large_page_size),
-+ proper_unit_for_byte_size(large_page_size));
- }
-
-- // print a warning if any large page related flag is specified on command line
-- bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS);
-+ return large_page_size;
-+}
-
-+size_t os::Linux::setup_large_page_size() {
-+ _large_page_size = Linux::find_large_page_size();
- const size_t default_page_size = (size_t)Linux::page_size();
- if (_large_page_size > default_page_size) {
- _page_sizes[0] = _large_page_size;
- _page_sizes[1] = default_page_size;
- _page_sizes[2] = 0;
- }
-- UseHugeTLBFS = UseHugeTLBFS &&
-- Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size);
-
-- if (UseHugeTLBFS)
-+ return _large_page_size;
-+}
-+
-+bool os::Linux::setup_large_page_type(size_t page_size) {
-+ if (FLAG_IS_DEFAULT(UseHugeTLBFS) &&
-+ FLAG_IS_DEFAULT(UseSHM) &&
-+ FLAG_IS_DEFAULT(UseTransparentHugePages)) {
-+
-+ // The type of large pages has not been specified by the user.
-+
-+ // Try UseHugeTLBFS and then UseSHM.
-+ UseHugeTLBFS = UseSHM = true;
-+
-+ // Don't try UseTransparentHugePages since there are known
-+ // performance issues with it turned on. This might change in the future.
-+ UseTransparentHugePages = false;
-+ }
-+
-+ if (UseTransparentHugePages) {
-+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseTransparentHugePages);
-+ if (transparent_huge_pages_sanity_check(warn_on_failure, page_size)) {
-+ UseHugeTLBFS = false;
-+ UseSHM = false;
-+ return true;
-+ }
-+ UseTransparentHugePages = false;
-+ }
-+
-+ if (UseHugeTLBFS) {
-+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS);
-+ if (hugetlbfs_sanity_check(warn_on_failure, page_size)) {
-+ UseSHM = false;
-+ return true;
-+ }
-+ UseHugeTLBFS = false;
-+ }
-+
-+ return UseSHM;
-+}
-+
-+void os::large_page_init() {
-+ if (!UseLargePages &&
-+ !UseTransparentHugePages &&
-+ !UseHugeTLBFS &&
-+ !UseSHM) {
-+ // Not using large pages.
-+ return;
-+ }
-+
-+ if (!FLAG_IS_DEFAULT(UseLargePages) && !UseLargePages) {
-+ // The user explicitly turned off large pages.
-+ // Ignore the rest of the large pages flags.
-+ UseTransparentHugePages = false;
-+ UseHugeTLBFS = false;
- UseSHM = false;
-+ return;
-+ }
-
-- UseLargePages = UseHugeTLBFS || UseSHM;
-+ size_t large_page_size = Linux::setup_large_page_size();
-+ UseLargePages = Linux::setup_large_page_type(large_page_size);
-
- set_coredump_filter();
- }
-@@ -3345,16 +3406,22 @@
- #define SHM_HUGETLB 04000
- #endif
-
--char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
-+char* os::Linux::reserve_memory_special_shm(size_t bytes, size_t alignment, char* req_addr, bool exec) {
- // "exec" is passed in but not used. Creating the shared image for
- // the code cache doesn't have an SHM_X executable permission to check.
- assert(UseLargePages && UseSHM, "only for SHM large pages");
-+ assert(is_ptr_aligned(req_addr, os::large_page_size()), "Unaligned address");
-+
-+ if (!is_size_aligned(bytes, os::large_page_size()) || alignment > os::large_page_size()) {
-+ return NULL; // Fallback to small pages.
-+ }
-
- key_t key = IPC_PRIVATE;
- char *addr;
-
- bool warn_on_failure = UseLargePages &&
- (!FLAG_IS_DEFAULT(UseLargePages) ||
-+ !FLAG_IS_DEFAULT(UseSHM) ||
- !FLAG_IS_DEFAULT(LargePageSizeInBytes)
- );
- char msg[128];
-@@ -3402,42 +3469,220 @@
- return NULL;
- }
-
-- if ((addr != NULL) && UseNUMAInterleaving) {
-- numa_make_global(addr, bytes);
-+ return addr;
-+}
-+
-+static void warn_on_large_pages_failure(char* req_addr, size_t bytes, int error) {
-+ assert(error == ENOMEM, "Only expect to fail if no memory is available");
-+
-+ bool warn_on_failure = UseLargePages &&
-+ (!FLAG_IS_DEFAULT(UseLargePages) ||
-+ !FLAG_IS_DEFAULT(UseHugeTLBFS) ||
-+ !FLAG_IS_DEFAULT(LargePageSizeInBytes));
-+
-+ if (warn_on_failure) {
-+ char msg[128];
-+ jio_snprintf(msg, sizeof(msg), "Failed to reserve large pages memory req_addr: "
-+ PTR_FORMAT " bytes: " SIZE_FORMAT " (errno = %d).", req_addr, bytes, error);
-+ warning(msg);
-+ }
-+}
-+
-+char* os::Linux::reserve_memory_special_huge_tlbfs_only(size_t bytes, char* req_addr, bool exec) {
-+ assert(UseLargePages && UseHugeTLBFS, "only for Huge TLBFS large pages");
-+ assert(is_size_aligned(bytes, os::large_page_size()), "Unaligned size");
-+ assert(is_ptr_aligned(req_addr, os::large_page_size()), "Unaligned address");
-+
-+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
-+ char* addr = (char*)::mmap(req_addr, bytes, prot,
-+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_HUGETLB,
-+ -1, 0);
-+
-+ if (addr == MAP_FAILED) {
-+ warn_on_large_pages_failure(req_addr, bytes, errno);
-+ return NULL;
-+ }
-+
-+ assert(is_ptr_aligned(addr, os::large_page_size()), "Must be");
-+
-+ return addr;
-+}
-+
-+char* os::Linux::reserve_memory_special_huge_tlbfs_mixed(size_t bytes, size_t alignment, char* req_addr, bool exec) {
-+ size_t large_page_size = os::large_page_size();
-+
-+ assert(bytes >= large_page_size, "Shouldn't allocate large pages for small sizes");
-+
-+ // Allocate small pages.
-+
-+ char* start;
-+ if (req_addr != NULL) {
-+ assert(is_ptr_aligned(req_addr, alignment), "Must be");
-+ assert(is_size_aligned(bytes, alignment), "Must be");
-+ start = os::reserve_memory(bytes, req_addr);
-+ assert(start == NULL || start == req_addr, "Must be");
-+ } else {
-+ start = os::reserve_memory_aligned(bytes, alignment);
-+ }
-+
-+ if (start == NULL) {
-+ return NULL;
-+ }
-+
-+ assert(is_ptr_aligned(start, alignment), "Must be");
-+
-+ // os::reserve_memory_special will record this memory area.
-+ // Need to release it here to prevent overlapping reservations.
-+ MemTracker::record_virtual_memory_release((address)start, bytes);
-+
-+ char* end = start + bytes;
-+
-+ // Find the regions of the allocated chunk that can be promoted to large pages.
-+ char* lp_start = (char*)align_ptr_up(start, large_page_size);
-+ char* lp_end = (char*)align_ptr_down(end, large_page_size);
-+
-+ size_t lp_bytes = lp_end - lp_start;
-+
-+ assert(is_size_aligned(lp_bytes, large_page_size), "Must be");
-+
-+ if (lp_bytes == 0) {
-+ // The mapped region doesn't even span the start and the end of a large page.
-+ // Fall back to allocate a non-special area.
-+ ::munmap(start, end - start);
-+ return NULL;
-+ }
-+
-+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
-+
-+
-+ void* result;
-+
-+ if (start != lp_start) {
-+ result = ::mmap(start, lp_start - start, prot,
-+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED,
-+ -1, 0);
-+ if (result == MAP_FAILED) {
-+ ::munmap(lp_start, end - lp_start);
-+ return NULL;
-+ }
-+ }
-+
-+ result = ::mmap(lp_start, lp_bytes, prot,
-+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_HUGETLB,
-+ -1, 0);
-+ if (result == MAP_FAILED) {
-+ warn_on_large_pages_failure(req_addr, bytes, errno);
-+ // If the mmap above fails, the large pages region will be unmapped and we
-+ // have regions before and after with small pages. Release these regions.
-+ //
-+ // | mapped | unmapped | mapped |
-+ // ^ ^ ^ ^
-+ // start lp_start lp_end end
-+ //
-+ ::munmap(start, lp_start - start);
-+ ::munmap(lp_end, end - lp_end);
-+ return NULL;
-+ }
-+
-+ if (lp_end != end) {
-+ result = ::mmap(lp_end, end - lp_end, prot,
-+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED,
-+ -1, 0);
-+ if (result == MAP_FAILED) {
-+ ::munmap(start, lp_end - start);
-+ return NULL;
-+ }
-+ }
-+
-+ return start;
-+}
-+
-+char* os::Linux::reserve_memory_special_huge_tlbfs(size_t bytes, size_t alignment, char* req_addr, bool exec) {
-+ assert(UseLargePages && UseHugeTLBFS, "only for Huge TLBFS large pages");
-+ assert(is_ptr_aligned(req_addr, alignment), "Must be");
-+ assert(is_power_of_2(alignment), "Must be");
-+ assert(is_power_of_2(os::large_page_size()), "Must be");
-+ assert(bytes >= os::large_page_size(), "Shouldn't allocate large pages for small sizes");
-+
-+ if (is_size_aligned(bytes, os::large_page_size()) && alignment <= os::large_page_size()) {
-+ return reserve_memory_special_huge_tlbfs_only(bytes, req_addr, exec);
-+ } else {
-+ return reserve_memory_special_huge_tlbfs_mixed(bytes, alignment, req_addr, exec);
-+ }
-+}
-+
-+char* os::reserve_memory_special(size_t bytes, size_t alignment, char* req_addr, bool exec) {
-+ assert(UseLargePages, "only for large pages");
-+
-+ char* addr;
-+ if (UseSHM) {
-+ addr = os::Linux::reserve_memory_special_shm(bytes, alignment, req_addr, exec);
-+ } else {
-+ assert(UseHugeTLBFS, "must be");
-+ addr = os::Linux::reserve_memory_special_huge_tlbfs(bytes, alignment, req_addr, exec);
- }
-
-- // The memory is committed
-- MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC);
-+ if (addr != NULL) {
-+ if (UseNUMAInterleaving) {
-+ numa_make_global(addr, bytes);
-+ }
-+
-+ // The memory is committed
-+ MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC);
-+ }
-
- return addr;
- }
-
-+bool os::Linux::release_memory_special_shm(char* base, size_t bytes) {
-+ // detaching the SHM segment will also delete it, see reserve_memory_special_shm()
-+ return shmdt(base) == 0;
-+}
-+
-+bool os::Linux::release_memory_special_huge_tlbfs(char* base, size_t bytes) {
-+ return pd_release_memory(base, bytes);
-+}
-+
- bool os::release_memory_special(char* base, size_t bytes) {
-+ assert(UseLargePages, "only for large pages");
-+
- MemTracker::Tracker tkr = MemTracker::get_virtual_memory_release_tracker();
-- // detaching the SHM segment will also delete it, see reserve_memory_special()
-- int rslt = shmdt(base);
-- if (rslt == 0) {
-+
-+ bool res;
-+ if (UseSHM) {
-+ res = os::Linux::release_memory_special_shm(base, bytes);
-+ } else {
-+ assert(UseHugeTLBFS, "must be");
-+ res = os::Linux::release_memory_special_huge_tlbfs(base, bytes);
-+ }
-+
-+ if (res) {
- tkr.record((address)base, bytes);
-- return true;
- } else {
- tkr.discard();
-- return false;
- }
-+
-+ return res;
- }
-
-+
- size_t os::large_page_size() {
- return _large_page_size;
- }
-
--// HugeTLBFS allows application to commit large page memory on demand;
--// with SysV SHM the entire memory region must be allocated as shared
-+// With SysV SHM the entire memory region must be allocated as shared
- // memory.
-+// HugeTLBFS allows application to commit large page memory on demand.
-+// However, when committing memory with HugeTLBFS fails, the region
-+// that was supposed to be committed will lose the old reservation
-+// and allow other threads to steal that memory region. Because of this
-+// behavior we can't commit HugeTLBFS memory.
- bool os::can_commit_large_page_memory() {
-- return UseHugeTLBFS;
-+ return UseTransparentHugePages;
- }
-
- bool os::can_execute_large_page_memory() {
-- return UseHugeTLBFS;
-+ return UseTransparentHugePages || UseHugeTLBFS;
- }
-
- // Reserve memory at an arbitrary address, only if that area is
-@@ -4493,6 +4738,26 @@
-
- Linux::clock_init();
- initial_time_count = os::elapsed_counter();
-+
-+ // pthread_condattr initialization for monotonic clock
-+ int status;
-+ pthread_condattr_t* _condattr = os::Linux::condAttr();
-+ if ((status = pthread_condattr_init(_condattr)) != 0) {
-+ fatal(err_msg("pthread_condattr_init: %s", strerror(status)));
-+ }
-+ // Only set the clock if CLOCK_MONOTONIC is available
-+ if (Linux::supports_monotonic_clock()) {
-+ if ((status = pthread_condattr_setclock(_condattr, CLOCK_MONOTONIC)) != 0) {
-+ if (status == EINVAL) {
-+ warning("Unable to use monotonic clock with relative timed-waits" \
-+ " - changes to the time-of-day clock may have adverse affects");
-+ } else {
-+ fatal(err_msg("pthread_condattr_setclock: %s", strerror(status)));
-+ }
-+ }
-+ }
-+ // else it defaults to CLOCK_REALTIME
-+
- pthread_mutex_init(&dl_mutex, NULL);
-
- // If the pagesize of the VM is greater than 8K determine the appropriate
-@@ -4575,6 +4840,10 @@
-
- Linux::capture_initial_stack(JavaThread::stack_size_at_create());
-
-+#if defined(IA32)
-+ workaround_expand_exec_shield_cs_limit();
-+#endif
-+
- Linux::libpthread_init();
- if (PrintMiscellaneous && (Verbose || WizardMode)) {
- tty->print_cr("[HotSpot is running with %s, %s(%s)]\n",
-@@ -4591,21 +4860,23 @@
- UseNUMA = false;
- }
- }
-- // With SHM large pages we cannot uncommit a page, so there's not way
-+ // With SHM and HugeTLBFS large pages we cannot uncommit a page, so there's no way
- // we can make the adaptive lgrp chunk resizing work. If the user specified
-- // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and
-+ // both UseNUMA and UseLargePages (or UseSHM/UseHugeTLBFS) on the command line - warn and
- // disable adaptive resizing.
-- if (UseNUMA && UseLargePages && UseSHM) {
-- if (!FLAG_IS_DEFAULT(UseNUMA)) {
-- if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) {
-+ if (UseNUMA && UseLargePages && !can_commit_large_page_memory()) {
-+ if (FLAG_IS_DEFAULT(UseNUMA)) {
-+ UseNUMA = false;
-+ } else {
-+ if (FLAG_IS_DEFAULT(UseLargePages) &&
-+ FLAG_IS_DEFAULT(UseSHM) &&
-+ FLAG_IS_DEFAULT(UseHugeTLBFS)) {
- UseLargePages = false;
- } else {
-- warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing");
-+ warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, disabling adaptive resizing");
- UseAdaptiveSizePolicy = false;
- UseAdaptiveNUMAChunkSizing = false;
- }
-- } else {
-- UseNUMA = false;
- }
- }
- if (!UseNUMA && ForceNUMA) {
-@@ -5339,21 +5610,36 @@
-
- static struct timespec* compute_abstime(timespec* abstime, jlong millis) {
- if (millis < 0) millis = 0;
-- struct timeval now;
-- int status = gettimeofday(&now, NULL);
-- assert(status == 0, "gettimeofday");
-+
- jlong seconds = millis / 1000;
- millis %= 1000;
- if (seconds > 50000000) { // see man cond_timedwait(3T)
- seconds = 50000000;
- }
-- abstime->tv_sec = now.tv_sec + seconds;
-- long usec = now.tv_usec + millis * 1000;
-- if (usec >= 1000000) {
-- abstime->tv_sec += 1;
-- usec -= 1000000;
-+
-+ if (os::Linux::supports_monotonic_clock()) {
-+ struct timespec now;
-+ int status = os::Linux::clock_gettime(CLOCK_MONOTONIC, &now);
-+ assert_status(status == 0, status, "clock_gettime");
-+ abstime->tv_sec = now.tv_sec + seconds;
-+ long nanos = now.tv_nsec + millis * NANOSECS_PER_MILLISEC;
-+ if (nanos >= NANOSECS_PER_SEC) {
-+ abstime->tv_sec += 1;
-+ nanos -= NANOSECS_PER_SEC;
-+ }
-+ abstime->tv_nsec = nanos;
-+ } else {
-+ struct timeval now;
-+ int status = gettimeofday(&now, NULL);
-+ assert(status == 0, "gettimeofday");
-+ abstime->tv_sec = now.tv_sec + seconds;
-+ long usec = now.tv_usec + millis * 1000;
-+ if (usec >= 1000000) {
-+ abstime->tv_sec += 1;
-+ usec -= 1000000;
-+ }
-+ abstime->tv_nsec = usec * 1000;
- }
-- abstime->tv_nsec = usec * 1000;
- return abstime;
- }
-
-@@ -5445,7 +5731,7 @@
- status = os::Linux::safe_cond_timedwait(_cond, _mutex, &abst);
- if (status != 0 && WorkAroundNPTLTimedWaitHang) {
- pthread_cond_destroy (_cond);
-- pthread_cond_init (_cond, NULL) ;
-+ pthread_cond_init (_cond, os::Linux::condAttr()) ;
- }
- assert_status(status == 0 || status == EINTR ||
- status == ETIME || status == ETIMEDOUT,
-@@ -5524,7 +5810,6 @@
- * is no need to track notifications.
- */
-
--#define MAX_SECS 100000000
- /*
- * This code is common to linux and solaris and will be moved to a
- * common place in dolphin.
-@@ -5546,32 +5831,50 @@
-
- static void unpackTime(timespec* absTime, bool isAbsolute, jlong time) {
- assert (time > 0, "convertTime");
-+ time_t max_secs = 0;
-
-- struct timeval now;
-- int status = gettimeofday(&now, NULL);
-- assert(status == 0, "gettimeofday");
--
-- time_t max_secs = now.tv_sec + MAX_SECS;
--
-- if (isAbsolute) {
-- jlong secs = time / 1000;
-- if (secs > max_secs) {
-- absTime->tv_sec = max_secs;
-- }
-- else {
-- absTime->tv_sec = secs;
-+ if (!os::Linux::supports_monotonic_clock() || isAbsolute) {
-+ struct timeval now;
-+ int status = gettimeofday(&now, NULL);
-+ assert(status == 0, "gettimeofday");
-+
-+ max_secs = now.tv_sec + MAX_SECS;
-+
-+ if (isAbsolute) {
-+ jlong secs = time / 1000;
-+ if (secs > max_secs) {
-+ absTime->tv_sec = max_secs;
-+ } else {
-+ absTime->tv_sec = secs;
-+ }
-+ absTime->tv_nsec = (time % 1000) * NANOSECS_PER_MILLISEC;
-+ } else {
-+ jlong secs = time / NANOSECS_PER_SEC;
-+ if (secs >= MAX_SECS) {
-+ absTime->tv_sec = max_secs;
-+ absTime->tv_nsec = 0;
-+ } else {
-+ absTime->tv_sec = now.tv_sec + secs;
-+ absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_usec*1000;
-+ if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
-+ absTime->tv_nsec -= NANOSECS_PER_SEC;
-+ ++absTime->tv_sec; // note: this must be <= max_secs
-+ }
-+ }
- }
-- absTime->tv_nsec = (time % 1000) * NANOSECS_PER_MILLISEC;
-- }
-- else {
-+ } else {
-+ // must be relative using monotonic clock
-+ struct timespec now;
-+ int status = os::Linux::clock_gettime(CLOCK_MONOTONIC, &now);
-+ assert_status(status == 0, status, "clock_gettime");
-+ max_secs = now.tv_sec + MAX_SECS;
- jlong secs = time / NANOSECS_PER_SEC;
- if (secs >= MAX_SECS) {
- absTime->tv_sec = max_secs;
- absTime->tv_nsec = 0;
-- }
-- else {
-+ } else {
- absTime->tv_sec = now.tv_sec + secs;
-- absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_usec*1000;
-+ absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_nsec;
- if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
- absTime->tv_nsec -= NANOSECS_PER_SEC;
- ++absTime->tv_sec; // note: this must be <= max_secs
-@@ -5650,16 +5953,20 @@
- OSThreadWaitState osts(thread->osthread(), false /* not Object.wait() */);
- jt->set_suspend_equivalent();
- // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
--
-+ assert(_cur_index == -1, "invariant");
- if (time == 0) {
-- status = pthread_cond_wait (_cond, _mutex) ;
-+ _cur_index = REL_INDEX; // arbitrary choice when not timed
-+ status = pthread_cond_wait (&_cond[_cur_index], _mutex) ;
- } else {
-- status = os::Linux::safe_cond_timedwait (_cond, _mutex, &absTime) ;
-+ _cur_index = isAbsolute ? ABS_INDEX : REL_INDEX;
-+ status = os::Linux::safe_cond_timedwait (&_cond[_cur_index], _mutex, &absTime) ;
- if (status != 0 && WorkAroundNPTLTimedWaitHang) {
-- pthread_cond_destroy (_cond) ;
-- pthread_cond_init (_cond, NULL);
-+ pthread_cond_destroy (&_cond[_cur_index]) ;
-+ pthread_cond_init (&_cond[_cur_index], isAbsolute ? NULL : os::Linux::condAttr());
- }
- }
-+ _cur_index = -1;
-+
- assert_status(status == 0 || status == EINTR ||
- status == ETIME || status == ETIMEDOUT,
- status, "cond_timedwait");
-@@ -5688,17 +5995,24 @@
- s = _counter;
- _counter = 1;
- if (s < 1) {
-- if (WorkAroundNPTLTimedWaitHang) {
-- status = pthread_cond_signal (_cond) ;
-- assert (status == 0, "invariant") ;
-+ // thread might be parked
-+ if (_cur_index != -1) {
-+ // thread is definitely parked
-+ if (WorkAroundNPTLTimedWaitHang) {
-+ status = pthread_cond_signal (&_cond[_cur_index]);
-+ assert (status == 0, "invariant");
- status = pthread_mutex_unlock(_mutex);
-- assert (status == 0, "invariant") ;
-- } else {
-+ assert (status == 0, "invariant");
-+ } else {
- status = pthread_mutex_unlock(_mutex);
-- assert (status == 0, "invariant") ;
-- status = pthread_cond_signal (_cond) ;
-- assert (status == 0, "invariant") ;
-- }
-+ assert (status == 0, "invariant");
-+ status = pthread_cond_signal (&_cond[_cur_index]);
-+ assert (status == 0, "invariant");
-+ }
-+ } else {
-+ pthread_mutex_unlock(_mutex);
-+ assert (status == 0, "invariant") ;
-+ }
- } else {
- pthread_mutex_unlock(_mutex);
- assert (status == 0, "invariant") ;
-@@ -5914,3 +6228,149 @@
- }
-
- #endif // JAVASE_EMBEDDED
-+
-+
-+/////////////// Unit tests ///////////////
-+
-+#ifndef PRODUCT
-+
-+#define test_log(...) \
-+ do {\
-+ if (VerboseInternalVMTests) { \
-+ tty->print_cr(__VA_ARGS__); \
-+ tty->flush(); \
-+ }\
-+ } while (false)
-+
-+class TestReserveMemorySpecial : AllStatic {
-+ public:
-+ static void small_page_write(void* addr, size_t size) {
-+ size_t page_size = os::vm_page_size();
-+
-+ char* end = (char*)addr + size;
-+ for (char* p = (char*)addr; p < end; p += page_size) {
-+ *p = 1;
-+ }
-+ }
-+
-+ static void test_reserve_memory_special_huge_tlbfs_only(size_t size) {
-+ if (!UseHugeTLBFS) {
-+ return;
-+ }
-+
-+ test_log("test_reserve_memory_special_huge_tlbfs_only(" SIZE_FORMAT ")", size);
-+
-+ char* addr = os::Linux::reserve_memory_special_huge_tlbfs_only(size, NULL, false);
-+
-+ if (addr != NULL) {
-+ small_page_write(addr, size);
-+
-+ os::Linux::release_memory_special_huge_tlbfs(addr, size);
-+ }
-+ }
-+
-+ static void test_reserve_memory_special_huge_tlbfs_only() {
-+ if (!UseHugeTLBFS) {
-+ return;
-+ }
-+
-+ size_t lp = os::large_page_size();
-+
-+ for (size_t size = lp; size <= lp * 10; size += lp) {
-+ test_reserve_memory_special_huge_tlbfs_only(size);
-+ }
-+ }
-+
-+ static void test_reserve_memory_special_huge_tlbfs_mixed(size_t size, size_t alignment) {
-+ if (!UseHugeTLBFS) {
-+ return;
-+ }
-+
-+ test_log("test_reserve_memory_special_huge_tlbfs_mixed(" SIZE_FORMAT ", " SIZE_FORMAT ")",
-+ size, alignment);
-+
-+ assert(size >= os::large_page_size(), "Incorrect input to test");
-+
-+ char* addr = os::Linux::reserve_memory_special_huge_tlbfs_mixed(size, alignment, NULL, false);
-+
-+ if (addr != NULL) {
-+ small_page_write(addr, size);
-+
-+ os::Linux::release_memory_special_huge_tlbfs(addr, size);
-+ }
-+ }
-+
-+ static void test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(size_t size) {
-+ size_t lp = os::large_page_size();
-+ size_t ag = os::vm_allocation_granularity();
-+
-+ for (size_t alignment = ag; is_size_aligned(size, alignment); alignment *= 2) {
-+ test_reserve_memory_special_huge_tlbfs_mixed(size, alignment);
-+ }
-+ }
-+
-+ static void test_reserve_memory_special_huge_tlbfs_mixed() {
-+ size_t lp = os::large_page_size();
-+ size_t ag = os::vm_allocation_granularity();
-+
-+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp);
-+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp + ag);
-+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp + lp / 2);
-+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2);
-+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2 + ag);
-+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2 - ag);
-+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 2 + lp / 2);
-+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 10);
-+ test_reserve_memory_special_huge_tlbfs_mixed_all_alignments(lp * 10 + lp / 2);
-+ }
-+
-+ static void test_reserve_memory_special_huge_tlbfs() {
-+ if (!UseHugeTLBFS) {
-+ return;
-+ }
-+
-+ test_reserve_memory_special_huge_tlbfs_only();
-+ test_reserve_memory_special_huge_tlbfs_mixed();
-+ }
-+
-+ static void test_reserve_memory_special_shm(size_t size, size_t alignment) {
-+ if (!UseSHM) {
-+ return;
-+ }
-+
-+ test_log("test_reserve_memory_special_shm(" SIZE_FORMAT ", " SIZE_FORMAT ")", size, alignment);
-+
-+ char* addr = os::Linux::reserve_memory_special_shm(size, alignment, NULL, false);
-+
-+ if (addr != NULL) {
-+ assert(is_ptr_aligned(addr, alignment), "Check");
-+ assert(is_ptr_aligned(addr, os::large_page_size()), "Check");
-+
-+ small_page_write(addr, size);
-+
-+ os::Linux::release_memory_special_shm(addr, size);
-+ }
-+ }
-+
-+ static void test_reserve_memory_special_shm() {
-+ size_t lp = os::large_page_size();
-+ size_t ag = os::vm_allocation_granularity();
-+
-+ for (size_t size = ag; size < lp * 3; size += ag) {
-+ for (size_t alignment = ag; is_size_aligned(size, alignment); alignment *= 2) {
-+ test_reserve_memory_special_shm(size, alignment);
-+ }
-+ }
-+ }
-+
-+ static void test() {
-+ test_reserve_memory_special_huge_tlbfs();
-+ test_reserve_memory_special_shm();
-+ }
-+};
-+
-+void TestReserveMemorySpecial_test() {
-+ TestReserveMemorySpecial::test();
-+}
-+
-+#endif
---- ./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-07-15 21:48:35.000000000 -0700
-@@ -32,6 +32,7 @@
-
- class Linux {
- friend class os;
-+ friend class TestReserveMemorySpecial;
-
- // For signal-chaining
- #define MAXSIGNUM 32
-@@ -92,8 +93,21 @@
- static void rebuild_cpu_to_node_map();
- static GrowableArray<int>* cpu_to_node() { return _cpu_to_node; }
-
-+ static size_t find_large_page_size();
-+ static size_t setup_large_page_size();
-+
-+ static bool setup_large_page_type(size_t page_size);
-+ static bool transparent_huge_pages_sanity_check(bool warn, size_t pages_size);
- static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
-
-+ static char* reserve_memory_special_shm(size_t bytes, size_t alignment, char* req_addr, bool exec);
-+ static char* reserve_memory_special_huge_tlbfs(size_t bytes, size_t alignment, char* req_addr, bool exec);
-+ static char* reserve_memory_special_huge_tlbfs_only(size_t bytes, char* req_addr, bool exec);
-+ static char* reserve_memory_special_huge_tlbfs_mixed(size_t bytes, size_t alignment, char* req_addr, bool exec);
-+
-+ static bool release_memory_special_shm(char* base, size_t bytes);
-+ static bool release_memory_special_huge_tlbfs(char* base, size_t bytes);
-+
- static void print_full_memory_info(outputStream* st);
- static void print_distro_info(outputStream* st);
- static void print_libversion_info(outputStream* st);
-@@ -207,6 +221,13 @@
-
- static jlong fast_thread_cpu_time(clockid_t clockid);
-
-+ // pthread_cond clock suppport
-+ private:
-+ static pthread_condattr_t _condattr[1];
-+
-+ public:
-+ static pthread_condattr_t* condAttr() { return _condattr; }
-+
- // Stack repair handling
-
- // none present
-@@ -273,7 +294,7 @@
- public:
- PlatformEvent() {
- int status;
-- status = pthread_cond_init (_cond, NULL);
-+ status = pthread_cond_init (_cond, os::Linux::condAttr());
- assert_status(status == 0, status, "cond_init");
- status = pthread_mutex_init (_mutex, NULL);
- assert_status(status == 0, status, "mutex_init");
-@@ -288,14 +309,19 @@
- void park () ;
- void unpark () ;
- int TryPark () ;
-- int park (jlong millis) ;
-+ int park (jlong millis) ; // relative timed-wait only
- void SetAssociation (Thread * a) { _Assoc = a ; }
- } ;
-
- class PlatformParker : public CHeapObj<mtInternal> {
- protected:
-+ enum {
-+ REL_INDEX = 0,
-+ ABS_INDEX = 1
-+ };
-+ int _cur_index; // which cond is in use: -1, 0, 1
- pthread_mutex_t _mutex [1] ;
-- pthread_cond_t _cond [1] ;
-+ pthread_cond_t _cond [2] ; // one for relative times and one for abs.
-
- public: // TODO-FIXME: make dtor private
- ~PlatformParker() { guarantee (0, "invariant") ; }
-@@ -303,10 +329,13 @@
- public:
- PlatformParker() {
- int status;
-- status = pthread_cond_init (_cond, NULL);
-- assert_status(status == 0, status, "cond_init");
-+ status = pthread_cond_init (&_cond[REL_INDEX], os::Linux::condAttr());
-+ assert_status(status == 0, status, "cond_init rel");
-+ status = pthread_cond_init (&_cond[ABS_INDEX], NULL);
-+ assert_status(status == 0, status, "cond_init abs");
- status = pthread_mutex_init (_mutex, NULL);
- assert_status(status == 0, status, "mutex_init");
-+ _cur_index = -1; // mark as unused
- }
- };
-
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
--* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-+* Copyright (c) 1999, 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,8 @@
- #include <unistd.h>
- #include <sys/resource.h>
- #include <sys/utsname.h>
-+#include <pthread.h>
-+#include <signal.h>
-
-
- // Check core dump limit and report possible place where core can be found
-@@ -173,11 +175,19 @@
- if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
- else st->print("%d", rlim.rlim_cur);
-
-+#ifdef __OpenBSD__
-+ st->print(", DATA ");
-+ getrlimit(RLIMIT_DATA, &rlim);
-+ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
-+ else st->print("%uk", rlim.rlim_cur >> 10);
-+ st->cr();
-+#else
- st->print(", AS ");
- getrlimit(RLIMIT_AS, &rlim);
- if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
- else st->print("%uk", rlim.rlim_cur >> 10);
- st->cr();
-+#endif
- }
-
- void os::Posix::print_uname_info(outputStream* st) {
-@@ -203,11 +213,17 @@
- * The callback is supposed to provide the method that should be protected.
- */
- bool os::WatcherThreadCrashProtection::call(os::CrashProtectionCallback& cb) {
-+ sigset_t saved_sig_mask;
-+
- assert(Thread::current()->is_Watcher_thread(), "Only for WatcherThread");
- assert(!WatcherThread::watcher_thread()->has_crash_protection(),
- "crash_protection already set?");
-
-- if (sigsetjmp(_jmpbuf, 1) == 0) {
-+ // we cannot rely on sigsetjmp/siglongjmp to save/restore the signal mask
-+ // since on at least some systems (OS X) siglongjmp will restore the mask
-+ // for the process, not the thread
-+ pthread_sigmask(0, NULL, &saved_sig_mask);
-+ if (sigsetjmp(_jmpbuf, 0) == 0) {
- // make sure we can see in the signal handler that we have crash protection
- // installed
- WatcherThread::watcher_thread()->set_crash_protection(this);
-@@ -217,6 +233,7 @@
- return true;
- }
- // this happens when we siglongjmp() back
-+ pthread_sigmask(SIG_SETMASK, &saved_sig_mask, NULL);
- WatcherThread::watcher_thread()->set_crash_protection(NULL);
- return false;
- }
---- ./hotspot/src/os/solaris/vm/os_solaris.cpp 2013-09-06 11:22:04.000000000 -0700
-+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp 2014-07-15 21:54:40.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
-@@ -1877,9 +1877,6 @@
- ::abort(); // dump core (for debugging)
- }
-
--// unused
--void os::set_error_file(const char *logfile) {}
--
- // DLL functions
-
- const char* os::dll_file_extension() { return ".so"; }
-@@ -2561,6 +2558,7 @@
- // determine if this is a legacy image or modules image
- // modules image doesn't have "jre" subdirectory
- len = strlen(buf);
-+ assert(len < buflen, "Ran out of buffer space");
- jrelib_p = buf + len;
- snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
- if (0 != access(buf, F_OK)) {
-@@ -2581,7 +2579,7 @@
- }
- }
-
-- strcpy(saved_jvm_path, buf);
-+ strncpy(saved_jvm_path, buf, MAXPATHLEN);
- }
-
-
-@@ -3530,11 +3528,15 @@
- return true;
- }
-
--char* os::reserve_memory_special(size_t size, char* addr, bool exec) {
-+char* os::reserve_memory_special(size_t size, size_t alignment, char* addr, bool exec) {
- // "exec" is passed in but not used. Creating the shared image for
- // the code cache doesn't have an SHM_X executable permission to check.
- assert(UseLargePages && UseISM, "only for ISM large pages");
-
-+ if (!is_size_aligned(size, os::large_page_size()) || alignment > os::large_page_size()) {
-+ return NULL; // Fallback to small pages.
-+ }
-+
- char* retAddr = NULL;
- int shmid;
- key_t ismKey;
-@@ -6862,3 +6864,9 @@
-
- return strlen(buffer);
- }
-+
-+#ifndef PRODUCT
-+void TestReserveMemorySpecial_test() {
-+ // No tests available for this platform
-+}
-+#endif
---- ./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-07-15 21:54:40.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
-@@ -800,15 +800,21 @@
- return result;
- }
-
--// For now, we say that Windows does not support vtime. I have no idea
--// whether it can actually be made to (DLD, 9/13/05).
--
--bool os::supports_vtime() { return false; }
-+bool os::supports_vtime() { return true; }
- bool os::enable_vtime() { return false; }
- bool os::vtime_enabled() { return false; }
-+
- double os::elapsedVTime() {
-- // better than nothing, but not much
-- return elapsedTime();
-+ FILETIME created;
-+ FILETIME exited;
-+ FILETIME kernel;
-+ FILETIME user;
-+ if (GetThreadTimes(GetCurrentThread(), &created, &exited, &kernel, &user) != 0) {
-+ // the resolution of windows_to_java_time() should be sufficient (ms)
-+ return (double) (windows_to_java_time(kernel) + windows_to_java_time(user)) / MILLIUNITS;
-+ } else {
-+ return elapsedTime();
-+ }
- }
-
- jlong os::javaTimeMillis() {
-@@ -1591,6 +1597,7 @@
-
- void os::win32::print_windows_version(outputStream* st) {
- OSVERSIONINFOEX osvi;
-+ SYSTEM_INFO si;
- ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-
-@@ -1600,6 +1607,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 +1626,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 +1679,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();
-@@ -1758,27 +1773,28 @@
- // libjvm.so is installed there (append a fake suffix
- // hotspot/libjvm.so).
- char* java_home_var = ::getenv("JAVA_HOME");
-- if (java_home_var != NULL && java_home_var[0] != 0) {
-+ if (java_home_var != NULL && java_home_var[0] != 0 &&
-+ strlen(java_home_var) < (size_t)buflen) {
-
-- strncpy(buf, java_home_var, buflen);
-+ strncpy(buf, java_home_var, buflen);
-
-- // determine if this is a legacy image or modules image
-- // modules image doesn't have "jre" subdirectory
-- size_t len = strlen(buf);
-- char* jrebin_p = buf + len;
-- jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\");
-- if (0 != _access(buf, 0)) {
-- jio_snprintf(jrebin_p, buflen-len, "\\bin\\");
-- }
-- len = strlen(buf);
-- jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll");
-+ // determine if this is a legacy image or modules image
-+ // modules image doesn't have "jre" subdirectory
-+ size_t len = strlen(buf);
-+ char* jrebin_p = buf + len;
-+ jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\");
-+ if (0 != _access(buf, 0)) {
-+ jio_snprintf(jrebin_p, buflen-len, "\\bin\\");
-+ }
-+ len = strlen(buf);
-+ jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll");
- }
- }
-
- if(buf[0] == '\0') {
-- GetModuleFileName(vm_lib_handle, buf, buflen);
-+ GetModuleFileName(vm_lib_handle, buf, buflen);
- }
-- strcpy(saved_jvm_path, buf);
-+ strncpy(saved_jvm_path, buf, MAX_PATH);
- }
-
-
-@@ -2203,17 +2219,6 @@
- #endif //_WIN64
-
-
--// Fatal error reporting is single threaded so we can make this a
--// static and preallocated. If it's more than MAX_PATH silently ignore
--// it.
--static char saved_error_file[MAX_PATH] = {0};
--
--void os::set_error_file(const char *logfile) {
-- if (strlen(logfile) <= MAX_PATH) {
-- strncpy(saved_error_file, logfile, MAX_PATH);
-- }
--}
--
- static inline void report_error(Thread* t, DWORD exception_code,
- address addr, void* siginfo, void* context) {
- VMError err(t, exception_code, addr, siginfo, context);
-@@ -3079,7 +3084,12 @@
- return true;
- }
-
--char* os::reserve_memory_special(size_t bytes, char* addr, bool exec) {
-+char* os::reserve_memory_special(size_t bytes, size_t alignment, char* addr, bool exec) {
-+ assert(UseLargePages, "only for large pages");
-+
-+ if (!is_size_aligned(bytes, os::large_page_size()) || alignment > os::large_page_size()) {
-+ return NULL; // Fallback to small pages.
-+ }
-
- const DWORD prot = exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
- const DWORD flags = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
-@@ -5584,3 +5594,9 @@
- }
-
- #endif
-+
-+#ifndef PRODUCT
-+void TestReserveMemorySpecial_test() {
-+ // No tests available for this platform
-+}
-+#endif
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2013-09-06 11:22:04.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -945,7 +945,7 @@
- if (rslt != 0)
- fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
-
-- *bottom = (address)((char *)ss.ss_sp - ss.ss_size);
-+ *bottom = (address)(align_size_up((intptr_t)ss.ss_sp, os::vm_page_size()) - ss.ss_size);
- *size = ss.ss_size;
- #elif defined(_ALLBSD_SOURCE)
- pthread_attr_t attr;
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -24,7 +24,7 @@
- */
-
- #if defined(_ALLBSD_SOURCE) && !defined(__APPLE__) && !defined(__NetBSD__)
--#include <pthread.h>
-+# include <pthread.h>
- # include <pthread_np.h> /* For pthread_attr_get_np */
- #endif
-
---- ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2013-09-06 11:22:04.000000000 -0700
-+++ ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2014-07-15 21:48:36.000000000 -0700
-@@ -873,3 +873,46 @@
- #endif
- }
- #endif
-+
-+
-+/*
-+ * IA32 only: execute code at a high address in case buggy NX emulation is present. I.e. avoid CS limit
-+ * updates (JDK-8023956).
-+ */
-+void os::workaround_expand_exec_shield_cs_limit() {
-+#if defined(IA32)
-+ size_t page_size = os::vm_page_size();
-+ /*
-+ * Take the highest VA the OS will give us and exec
-+ *
-+ * Although using -(pagesz) as mmap hint works on newer kernel as you would
-+ * think, older variants affected by this work-around don't (search forward only).
-+ *
-+ * On the affected distributions, we understand the memory layout to be:
-+ *
-+ * TASK_LIMIT= 3G, main stack base close to TASK_LIMT.
-+ *
-+ * A few pages south main stack will do it.
-+ *
-+ * If we are embedded in an app other than launcher (initial != main stack),
-+ * we don't have much control or understanding of the address space, just let it slide.
-+ */
-+ char* hint = (char*) (Linux::initial_thread_stack_bottom() -
-+ ((StackYellowPages + StackRedPages + 1) * page_size));
-+ char* codebuf = os::reserve_memory(page_size, hint);
-+ if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
-+ return; // No matter, we tried, best effort.
-+ }
-+ if (PrintMiscellaneous && (Verbose || WizardMode)) {
-+ tty->print_cr("[CS limit NX emulation work-around, exec code at: %p]", codebuf);
-+ }
-+
-+ // Some code to exec: the 'ret' instruction
-+ codebuf[0] = 0xC3;
-+
-+ // Call the code in the codebuf
-+ __asm__ volatile("call *%0" : : "r"(codebuf));
-+
-+ // keep the page mapped so CS limit isn't reduced.
-+#endif
-+}
---- ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.hpp 2013-09-06 11:22:04.000000000 -0700
-+++ ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.hpp 2014-07-15 21:48:36.000000000 -0700
-@@ -36,4 +36,17 @@
- // Note: Currently only used in 64 bit Windows implementations
- static bool register_code_area(char *low, char *high) { return true; }
-
-+ /*
-+ * Work-around for broken NX emulation using CS limit, Red Hat patch "Exec-Shield"
-+ * (IA32 only).
-+ *
-+ * Map and execute at a high VA to prevent CS lazy updates race with SMP MM
-+ * invalidation.Further code generation by the JVM will no longer cause CS limit
-+ * updates.
-+ *
-+ * Affects IA32: RHEL 5 & 6, Ubuntu 10.04 (LTS), 10.10, 11.04, 11.10, 12.04.
-+ * @see JDK-8023956
-+ */
-+ static void workaround_expand_exec_shield_cs_limit();
-+
- #endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP
---- ./hotspot/src/share/vm/adlc/formssel.cpp 2013-09-06 11:22:09.000000000 -0700
-+++ ./hotspot/src/share/vm/adlc/formssel.cpp 2014-10-28 20:19:38.000000000 -0700
-@@ -536,12 +536,6 @@
- if( data_type != Form::none )
- rematerialize = true;
-
-- // Ugly: until a better fix is implemented, disable rematerialization for
-- // negD nodes because they are proved to be problematic.
-- if (is_ideal_negD()) {
-- return false;
-- }
--
- // Constants
- if( _components.count() == 1 && _components[0]->is(Component::USE_DEF) )
- rematerialize = true;
---- ./hotspot/src/share/vm/c1/c1_GraphBuilder.cpp 2013-09-06 11:22:09.000000000 -0700
-+++ ./hotspot/src/share/vm/c1/c1_GraphBuilder.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -4178,7 +4178,9 @@
- }
- }
-
-- if (!PrintInlining) return;
-+ if (!PrintInlining && !compilation()->method()->has_option("PrintInlining")) {
-+ return;
-+ }
- CompileTask::print_inlining(callee, scope()->level(), bci(), msg);
- if (success && CIPrintMethodCodes) {
- callee->print_codes();
---- ./hotspot/src/share/vm/c1/c1_LIR.hpp 2013-09-06 11:22:09.000000000 -0700
-+++ ./hotspot/src/share/vm/c1/c1_LIR.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -2221,7 +2221,7 @@
- typedef enum { inputMode, firstMode = inputMode, tempMode, outputMode, numModes, invalidMode = -1 } OprMode;
-
- enum {
-- maxNumberOfOperands = 16,
-+ maxNumberOfOperands = 20,
- maxNumberOfInfos = 4
- };
-
---- ./hotspot/src/share/vm/c1/c1_LinearScan.cpp 2013-09-06 11:22:09.000000000 -0700
-+++ ./hotspot/src/share/vm/c1/c1_LinearScan.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1138,8 +1138,10 @@
- }
- }
- }
--
-- } else if (opr_type != T_LONG) {
-+ // We want to sometimes use logical operations on pointers, in particular in GC barriers.
-+ // Since 64bit logical operations do not current support operands on stack, we have to make sure
-+ // T_OBJECT doesn't get spilled along with T_LONG.
-+ } else if (opr_type != T_LONG LP64_ONLY(&& opr_type != T_OBJECT)) {
- // integer instruction (note: long operands must always be in register)
- switch (op->code()) {
- case lir_cmp:
---- ./hotspot/src/share/vm/c1/c1_Runtime1.cpp 2013-09-06 11:22:09.000000000 -0700
-+++ ./hotspot/src/share/vm/c1/c1_Runtime1.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -911,16 +911,6 @@
- // Return to the now deoptimized frame.
- }
-
-- // If we are patching in a non-perm oop, make sure the nmethod
-- // is on the right list.
-- if (ScavengeRootsInCode && load_klass.not_null() && load_klass->is_scavengable()) {
-- MutexLockerEx ml_code (CodeCache_lock, Mutex::_no_safepoint_check_flag);
-- nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
-- guarantee(nm != NULL, "only nmethods can contain non-perm oops");
-- if (!nm->on_scavenge_root_list())
-- CodeCache::add_scavenge_root_nmethod(nm);
-- }
--
- // Now copy code back
-
- {
-@@ -1096,6 +1086,22 @@
- }
- }
- }
-+
-+
-+ // If we are patching in a non-perm oop, make sure the nmethod
-+ // is on the right list.
-+ if (ScavengeRootsInCode && load_klass.not_null() && load_klass->is_scavengable()) {
-+ MutexLockerEx ml_code (CodeCache_lock, Mutex::_no_safepoint_check_flag);
-+ nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
-+ guarantee(nm != NULL, "only nmethods can contain non-perm oops");
-+ if (!nm->on_scavenge_root_list()) {
-+ CodeCache::add_scavenge_root_nmethod(nm);
-+ }
-+
-+ // Since we've patched some oops in the nmethod,
-+ // (re)register it with the heap.
-+ Universe::heap()->register_nmethod(nm);
-+ }
- JRT_END
-
- //
---- ./hotspot/src/share/vm/classfile/classFileParser.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/classFileParser.cpp 2014-10-28 20:19:38.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
-@@ -961,7 +961,7 @@
- "Wrong size %u for field's Signature attribute in class file %s",
- attribute_length, CHECK);
- }
-- generic_signature_index = cfs->get_u2(CHECK);
-+ generic_signature_index = parse_generic_signature_attribute(cp, CHECK);
- } else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
- runtime_visible_annotations_length = attribute_length;
- runtime_visible_annotations = cfs->get_u1_buffer();
-@@ -1698,7 +1698,8 @@
- }
-
- // Sift through annotations, looking for those significant to the VM:
--void ClassFileParser::parse_annotations(u1* buffer, int limit,
-+void ClassFileParser::parse_annotations(Handle class_loader,
-+ u1* buffer, int limit,
- constantPoolHandle cp,
- ClassFileParser::AnnotationCollector* coll,
- TRAPS) {
-@@ -1736,7 +1737,7 @@
- }
-
- // Here is where parsing particular annotations will take place.
-- AnnotationCollector::ID id = coll->annotation_index(aname);
-+ AnnotationCollector::ID id = coll->annotation_index(class_loader, is_anonymous(), aname);
- if (id == AnnotationCollector::_unknown) continue;
- coll->set_annotation(id);
- // If there are no values, just set the bit and move on:
-@@ -1765,20 +1766,30 @@
- }
- }
-
--ClassFileParser::AnnotationCollector::ID ClassFileParser::AnnotationCollector::annotation_index(Symbol* name) {
-+ClassFileParser::AnnotationCollector::ID ClassFileParser::AnnotationCollector::annotation_index(Handle class_loader,
-+ bool is_anonymous,
-+ Symbol* name) {
- vmSymbols::SID sid = vmSymbols::find_sid(name);
-+ // Privileged code can use all annotations. Other code silently drops some.
-+ const bool privileged = class_loader.is_null() || is_anonymous ||
-+ class_loader()->klass()->klass_part()->name() ==
-+ vmSymbols::sun_misc_Launcher_ExtClassLoader();
- switch (sid) {
- case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature):
- if (_location != _in_method) break; // only allow for methods
-+ if (!privileged) break; // only allow in privileged code
- return _method_ForceInline;
- case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature):
- if (_location != _in_method) break; // only allow for methods
-+ if (!privileged) break; // only allow in privileged code
- return _method_DontInline;
- case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature):
- if (_location != _in_method) break; // only allow for methods
-+ if (!privileged) break; // only allow in privileged code
- return _method_LambdaForm_Compiled;
- case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature):
- if (_location != _in_method) break; // only allow for methods
-+ if (!privileged) break; // only allow in privileged code
- return _method_LambdaForm_Hidden;
- default: break;
- }
-@@ -1818,8 +1829,8 @@
- // from the method back up to the containing klass. These flag values
- // are added to klass's access_flags.
-
--methodHandle ClassFileParser::parse_method(constantPoolHandle cp, bool is_interface,
-- AccessFlags *promoted_flags,
-+methodHandle ClassFileParser::parse_method(Handle class_loader, constantPoolHandle cp,
-+ bool is_interface, AccessFlags *promoted_flags,
- typeArrayHandle* method_annotations,
- typeArrayHandle* method_parameter_annotations,
- typeArrayHandle* method_default_annotations,
-@@ -2028,8 +2039,8 @@
- }
- if (lvt_cnt == max_lvt_cnt) {
- max_lvt_cnt <<= 1;
-- REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
-- REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
-+ localvariable_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_table_length, lvt_cnt, max_lvt_cnt);
-+ localvariable_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_table_start, lvt_cnt, max_lvt_cnt);
- }
- localvariable_table_start[lvt_cnt] =
- parse_localvariable_table(code_length,
-@@ -2058,8 +2069,8 @@
- // Parse local variable type table
- if (lvtt_cnt == max_lvtt_cnt) {
- max_lvtt_cnt <<= 1;
-- REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
-- REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
-+ localvariable_type_table_length = REALLOC_RESOURCE_ARRAY(u2, localvariable_type_table_length, lvtt_cnt, max_lvtt_cnt);
-+ localvariable_type_table_start = REALLOC_RESOURCE_ARRAY(u2*, localvariable_type_table_start, lvtt_cnt, max_lvtt_cnt);
- }
- localvariable_type_table_start[lvtt_cnt] =
- parse_localvariable_table(code_length,
-@@ -2122,13 +2133,12 @@
- "Invalid Signature attribute length %u in class file %s",
- method_attribute_length, CHECK_(nullHandle));
- }
-- cfs->guarantee_more(2, CHECK_(nullHandle)); // generic_signature_index
-- generic_signature_index = cfs->get_u2_fast();
-+ generic_signature_index = parse_generic_signature_attribute(cp, CHECK_(nullHandle));
- } else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) {
- runtime_visible_annotations_length = method_attribute_length;
- runtime_visible_annotations = cfs->get_u1_buffer();
- assert(runtime_visible_annotations != NULL, "null visible annotations");
-- parse_annotations(runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle));
-+ parse_annotations(class_loader, runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle));
- cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle));
- } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
- runtime_invisible_annotations_length = method_attribute_length;
-@@ -2357,8 +2367,8 @@
- // from the methods back up to the containing klass. These flag values
- // are added to klass's access_flags.
-
--objArrayHandle ClassFileParser::parse_methods(constantPoolHandle cp, bool is_interface,
-- AccessFlags* promoted_flags,
-+objArrayHandle ClassFileParser::parse_methods(Handle class_loader, constantPoolHandle cp,
-+ bool is_interface, AccessFlags* promoted_flags,
- bool* has_final_method,
- objArrayOop* methods_annotations_oop,
- objArrayOop* methods_parameter_annotations_oop,
-@@ -2381,7 +2391,8 @@
- objArrayHandle methods_parameter_annotations;
- objArrayHandle methods_default_annotations;
- for (int index = 0; index < length; index++) {
-- methodHandle method = parse_method(cp, is_interface,
-+ methodHandle method = parse_method(class_loader, cp,
-+ is_interface,
- promoted_flags,
- &method_annotations,
- &method_parameter_annotations,
-@@ -2490,6 +2501,17 @@
- }
- }
-
-+// Parse generic_signature attribute for methods and fields
-+u2 ClassFileParser::parse_generic_signature_attribute(constantPoolHandle cp, TRAPS) {
-+ ClassFileStream* cfs = stream();
-+ cfs->guarantee_more(2, CHECK_0); // generic_signature_index
-+ u2 generic_signature_index = cfs->get_u2_fast();
-+ check_property(
-+ valid_symbol_at(cp, generic_signature_index),
-+ "Invalid Signature attribute at constant pool index %u in class file %s",
-+ generic_signature_index, CHECK_0);
-+ return generic_signature_index;
-+}
-
- void ClassFileParser::parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS) {
- ClassFileStream* cfs = stream();
-@@ -2654,7 +2676,13 @@
- ClassFileStream* cfs = stream();
- u1* current_start = cfs->current();
-
-- cfs->guarantee_more(2, CHECK); // length
-+ guarantee_property(attribute_byte_length > sizeof(u2),
-+ "Invalid BootstrapMethods attribute length %u in class file %s",
-+ attribute_byte_length,
-+ CHECK);
-+
-+ cfs->guarantee_more(attribute_byte_length, CHECK);
-+
- int attribute_array_length = cfs->get_u2_fast();
-
- guarantee_property(_max_bootstrap_specifier_index < attribute_array_length,
-@@ -2693,6 +2721,11 @@
- "bootstrap_method_index %u has bad constant type in class file %s",
- bootstrap_method_index,
- CHECK);
-+
-+ guarantee_property((operand_fill_index + 1 + argument_count) < operands->length(),
-+ "Invalid BootstrapMethods num_bootstrap_methods or num_bootstrap_arguments value in class file %s",
-+ CHECK);
-+
- operands->short_at_put(operand_fill_index++, bootstrap_method_index);
- operands->short_at_put(operand_fill_index++, argument_count);
-
-@@ -2710,7 +2743,6 @@
- }
-
- assert(operand_fill_index == operands()->length(), "exact fill");
-- assert(constantPoolOopDesc::operand_array_length(operands()) == attribute_array_length, "correct decode");
-
- u1* current_end = cfs->current();
- guarantee_property(current_end == current_start + attribute_byte_length,
-@@ -2721,7 +2753,8 @@
- }
-
-
--void ClassFileParser::parse_classfile_attributes(constantPoolHandle cp,
-+void ClassFileParser::parse_classfile_attributes(Handle class_loader,
-+ constantPoolHandle cp,
- ClassFileParser::ClassAnnotationCollector* parsed_annotations,
- TRAPS) {
- ClassFileStream* cfs = stream();
-@@ -2804,7 +2837,8 @@
- runtime_visible_annotations_length = attribute_length;
- runtime_visible_annotations = cfs->get_u1_buffer();
- assert(runtime_visible_annotations != NULL, "null visible annotations");
-- parse_annotations(runtime_visible_annotations,
-+ parse_annotations(class_loader,
-+ runtime_visible_annotations,
- runtime_visible_annotations_length,
- cp,
- parsed_annotations,
-@@ -3167,7 +3201,8 @@
- objArrayOop methods_annotations_oop = NULL;
- objArrayOop methods_parameter_annotations_oop = NULL;
- objArrayOop methods_default_annotations_oop = NULL;
-- objArrayHandle methods = parse_methods(cp, access_flags.is_interface(),
-+ objArrayHandle methods = parse_methods(class_loader, cp,
-+ access_flags.is_interface(),
- &promoted_flags,
- &has_final_method,
- &methods_annotations_oop,
-@@ -3181,7 +3216,7 @@
-
- // Additional attributes
- ClassAnnotationCollector parsed_annotations;
-- parse_classfile_attributes(cp, &parsed_annotations, CHECK_(nullHandle));
-+ parse_classfile_attributes(class_loader, cp, &parsed_annotations, CHECK_(nullHandle));
-
- // Make sure this is the end of class file stream
- guarantee_property(cfs->at_eos(), "Extra bytes at the end of class file %s", CHECK_(nullHandle));
-@@ -4051,9 +4086,8 @@
- for (int index = 0; index < num_methods; index++) {
- methodOop m = (methodOop)methods->obj_at(index);
-
-- // skip private, static and <init> methods
-- if ((!m->is_private()) &&
-- (!m->is_static()) &&
-+ // skip private, static, and <init> methods
-+ if ((!m->is_private() && !m->is_static()) &&
- (m->name() != vmSymbols::object_initializer_name())) {
-
- Symbol* name = m->name();
---- ./hotspot/src/share/vm/classfile/classFileParser.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/classFileParser.hpp 2014-07-15 21:54:40.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
-@@ -102,7 +102,7 @@
- assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, "");
- }
- // If this annotation name has an ID, report it (or _none).
-- ID annotation_index(Symbol* name);
-+ ID annotation_index(Handle class_loader, bool is_anonymous, Symbol* name);
- // Set the annotation name:
- void set_annotation(ID id) {
- assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob");
-@@ -169,14 +169,14 @@
- u2* java_fields_count_ptr, TRAPS);
-
- // Method parsing
-- methodHandle parse_method(constantPoolHandle cp, bool is_interface,
-- AccessFlags* promoted_flags,
-+ methodHandle parse_method(Handle class_loader, constantPoolHandle cp,
-+ bool is_interface, AccessFlags* promoted_flags,
- typeArrayHandle* method_annotations,
- typeArrayHandle* method_parameter_annotations,
- typeArrayHandle* method_default_annotations,
- TRAPS);
-- objArrayHandle parse_methods (constantPoolHandle cp, bool is_interface,
-- AccessFlags* promoted_flags,
-+ objArrayHandle parse_methods (Handle class_loader, constantPoolHandle cp,
-+ bool is_interface, AccessFlags* promoted_flags,
- bool* has_final_method,
- objArrayOop* methods_annotations_oop,
- objArrayOop* methods_parameter_annotations_oop,
-@@ -202,6 +202,7 @@
- typeArrayOop parse_stackmap_table(u4 code_attribute_length, TRAPS);
-
- // Classfile attribute parsing
-+ u2 parse_generic_signature_attribute(constantPoolHandle cp, TRAPS);
- void parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS);
- void parse_classfile_source_debug_extension_attribute(constantPoolHandle cp, int length, TRAPS);
- u2 parse_classfile_inner_classes_attribute(u1* inner_classes_attribute_start,
-@@ -210,7 +211,8 @@
- u2 enclosing_method_method_index,
- constantPoolHandle cp,
- TRAPS);
-- void parse_classfile_attributes(constantPoolHandle cp,
-+ void parse_classfile_attributes(Handle class_loader,
-+ constantPoolHandle cp,
- ClassAnnotationCollector* parsed_annotations,
- TRAPS);
- void parse_classfile_synthetic_attribute(constantPoolHandle cp, TRAPS);
-@@ -224,7 +226,7 @@
- int runtime_invisible_annotations_length, TRAPS);
- int skip_annotation(u1* buffer, int limit, int index);
- int skip_annotation_value(u1* buffer, int limit, int index);
-- void parse_annotations(u1* buffer, int limit, constantPoolHandle cp,
-+ void parse_annotations(Handle class_loader, u1* buffer, int limit, constantPoolHandle cp,
- /* Results (currently, only one result is supported): */
- AnnotationCollector* result,
- TRAPS);
-@@ -335,6 +337,12 @@
- : cp->tag_at(index).is_klass_reference());
- }
-
-+ // Checks that the cpool index is in range and is a utf8
-+ bool valid_symbol_at(constantPoolHandle cp, int cpool_index) {
-+ return (cp->is_within_bounds(cpool_index) &&
-+ cp->tag_at(cpool_index).is_utf8());
-+ }
-+
- public:
- // Constructor
- ClassFileParser(ClassFileStream* st) { set_stream(st); }
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2014-10-28 20:19:39.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
-@@ -2388,6 +2388,26 @@
- *offset = value;
- }
-
-+// Support for java_lang_invoke_DirectMethodHandle
-+
-+int java_lang_invoke_DirectMethodHandle::_member_offset;
-+
-+oop java_lang_invoke_DirectMethodHandle::member(oop dmh) {
-+ oop member_name = NULL;
-+ bool is_dmh = dmh->is_oop() && java_lang_invoke_DirectMethodHandle::is_instance(dmh);
-+ assert(is_dmh, "a DirectMethodHandle oop is expected");
-+ if (is_dmh) {
-+ member_name = dmh->obj_field(member_offset_in_bytes());
-+ }
-+ return member_name;
-+}
-+
-+void java_lang_invoke_DirectMethodHandle::compute_offsets() {
-+ klassOop klass_oop = SystemDictionary::DirectMethodHandle_klass();
-+ if (klass_oop != NULL && EnableInvokeDynamic) {
-+ compute_offset(_member_offset, klass_oop, vmSymbols::member_name(), vmSymbols::java_lang_invoke_MemberName_signature());
-+ }
-+}
-
- // Support for java_lang_invoke_MethodHandle
-
-@@ -2497,6 +2517,13 @@
- return mname->obj_field(_vmtarget_offset);
- }
-
-+// Can be executed on VM thread only
-+void java_lang_invoke_MemberName::adjust_vmtarget(oop mname, oop ref) {
-+ assert((is_instance(mname) && (flags(mname) & (MN_IS_METHOD | MN_IS_CONSTRUCTOR)) > 0), "wrong type");
-+ assert(Thread::current()->is_VM_thread(), "not VM thread");
-+ mname->address_field_put(_vmtarget_offset, (address)ref);
-+}
-+
- void java_lang_invoke_MemberName::set_vmtarget(oop mname, oop ref) {
- assert(is_instance(mname), "wrong type");
- #ifdef ASSERT
-@@ -3000,6 +3027,7 @@
- java_lang_ThreadGroup::compute_offsets();
- if (EnableInvokeDynamic) {
- java_lang_invoke_MethodHandle::compute_offsets();
-+ java_lang_invoke_DirectMethodHandle::compute_offsets();
- java_lang_invoke_MemberName::compute_offsets();
- java_lang_invoke_LambdaForm::compute_offsets();
- java_lang_invoke_MethodType::compute_offsets();
---- ./hotspot/src/share/vm/classfile/javaClasses.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/javaClasses.hpp 2014-07-15 21:48:34.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
-@@ -915,6 +915,32 @@
- static int form_offset_in_bytes() { return _form_offset; }
- };
-
-+// Interface to java.lang.invoke.DirectMethodHandle objects
-+
-+class java_lang_invoke_DirectMethodHandle: AllStatic {
-+ friend class JavaClasses;
-+
-+ private:
-+ static int _member_offset; // the MemberName of this DMH
-+
-+ static void compute_offsets();
-+
-+ public:
-+ // Accessors
-+ static oop member(oop mh);
-+
-+ // Testers
-+ static bool is_subclass(klassOop klass) {
-+ return Klass::cast(klass)->is_subclass_of(SystemDictionary::DirectMethodHandle_klass());
-+ }
-+ static bool is_instance(oop obj) {
-+ return obj != NULL && is_subclass(obj->klass());
-+ }
-+
-+ // Accessors for code generation:
-+ static int member_offset_in_bytes() { return _member_offset; }
-+};
-+
- // Interface to java.lang.invoke.LambdaForm objects
- // (These are a private interface for managing adapter code generation.)
-
-@@ -988,6 +1014,7 @@
-
- static oop vmtarget(oop mname);
- static void set_vmtarget(oop mname, oop target);
-+ static void adjust_vmtarget(oop mname, oop target);
-
- static intptr_t vmindex(oop mname);
- static void set_vmindex(oop mname, intptr_t index);
---- ./hotspot/src/share/vm/classfile/stackMapTable.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/stackMapTable.cpp 2014-07-15 21:54:40.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, 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
-@@ -134,6 +134,7 @@
- }
- // check if uninitialized objects exist on backward branches
- check_new_object(frame, target, CHECK_VERIFY(frame->verifier()));
-+ frame->verifier()->update_furthest_jump(target);
- }
-
- void StackMapTable::check_new_object(
---- ./hotspot/src/share/vm/classfile/symbolTable.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/symbolTable.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -39,6 +39,9 @@
-
- // --------------------------------------------------------------------------
-
-+// the number of buckets a thread claims
-+const int ClaimChunkSize = 32;
-+
- SymbolTable* SymbolTable::_the_table = NULL;
- // Static arena for symbols that are not deallocated
- Arena* SymbolTable::_arena = NULL;
-@@ -81,16 +84,12 @@
- }
- }
-
--int SymbolTable::symbols_removed = 0;
--int SymbolTable::symbols_counted = 0;
-+int SymbolTable::_symbols_removed = 0;
-+int SymbolTable::_symbols_counted = 0;
-+volatile int SymbolTable::_parallel_claimed_idx = 0;
-
--// Remove unreferenced symbols from the symbol table
--// This is done late during GC.
--void SymbolTable::unlink() {
-- int removed = 0;
-- int total = 0;
-- size_t memory_total = 0;
-- for (int i = 0; i < the_table()->table_size(); ++i) {
-+void SymbolTable::buckets_unlink(int start_idx, int end_idx, int* processed, int* removed, size_t* memory_total) {
-+ for (int i = start_idx; i < end_idx; ++i) {
- HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i);
- HashtableEntry<Symbol*, mtSymbol>* entry = the_table()->bucket(i);
- while (entry != NULL) {
-@@ -102,14 +101,14 @@
- break;
- }
- Symbol* s = entry->literal();
-- memory_total += s->object_size();
-- total++;
-+ (*memory_total) += s->object_size();
-+ (*processed)++;
- assert(s != NULL, "just checking");
- // If reference count is zero, remove.
- if (s->refcount() == 0) {
- assert(!entry->is_shared(), "shared entries should be kept live");
- delete s;
-- removed++;
-+ (*removed)++;
- *p = entry->next();
- the_table()->free_entry(entry);
- } else {
-@@ -119,12 +118,45 @@
- entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p);
- }
- }
-- symbols_removed += removed;
-- symbols_counted += total;
-+}
-+
-+// Remove unreferenced symbols from the symbol table
-+// This is done late during GC.
-+void SymbolTable::unlink(int* processed, int* removed) {
-+ size_t memory_total = 0;
-+ buckets_unlink(0, the_table()->table_size(), processed, removed, &memory_total);
-+ _symbols_removed += *removed;
-+ _symbols_counted += *processed;
-+ // Exclude printing for normal PrintGCDetails because people parse
-+ // this output.
-+ if (PrintGCDetails && Verbose && WizardMode) {
-+ gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", *processed,
-+ (memory_total*HeapWordSize)/1024);
-+ }
-+}
-+
-+void SymbolTable::possibly_parallel_unlink(int* processed, int* removed) {
-+ const int limit = the_table()->table_size();
-+
-+ size_t memory_total = 0;
-+
-+ for (;;) {
-+ // Grab next set of buckets to scan
-+ int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize;
-+ if (start_idx >= limit) {
-+ // End of table
-+ break;
-+ }
-+
-+ int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
-+ buckets_unlink(start_idx, end_idx, processed, removed, &memory_total);
-+ }
-+ Atomic::add(*processed, &_symbols_counted);
-+ Atomic::add(*removed, &_symbols_removed);
- // Exclude printing for normal PrintGCDetails because people parse
- // this output.
- if (PrintGCDetails && Verbose && WizardMode) {
-- gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", total,
-+ gclog_or_tty->print(" [Symbols: scanned=%d removed=%d size=" SIZE_FORMAT "K] ", *processed, *removed,
- (memory_total*HeapWordSize)/1024);
- }
- }
-@@ -503,21 +535,21 @@
- }
- }
- tty->print_cr("Symbol Table:");
-- tty->print_cr("Total number of symbols %5d", count);
-- tty->print_cr("Total size in memory %5dK",
-+ tty->print_cr("Total number of symbols "INT32_FORMAT, count);
-+ tty->print_cr("Total size in memory "INT32_FORMAT"K",
- (memory_total*HeapWordSize)/1024);
-- tty->print_cr("Total counted %5d", symbols_counted);
-- tty->print_cr("Total removed %5d", symbols_removed);
-- if (symbols_counted > 0) {
-+ tty->print_cr("Total counted "INT32_FORMAT, _symbols_counted);
-+ tty->print_cr("Total removed "INT32_FORMAT, _symbols_removed);
-+ if (_symbols_counted > 0) {
- tty->print_cr("Percent removed %3.2f",
-- ((float)symbols_removed/(float)symbols_counted)* 100);
-+ ((float)_symbols_removed/(float)_symbols_counted)* 100);
- }
-- tty->print_cr("Reference counts %5d", Symbol::_total_count);
-- tty->print_cr("Symbol arena size %5d used %5d",
-+ tty->print_cr("Reference counts "INT32_FORMAT, Symbol::_total_count);
-+ tty->print_cr("Symbol arena size "SIZE_FORMAT" used "SIZE_FORMAT,
- arena()->size_in_bytes(), arena()->used());
- tty->print_cr("Histogram of symbol length:");
-- tty->print_cr("%8s %5d", "Total ", total);
-- tty->print_cr("%8s %5d", "Maximum", max_symbols);
-+ tty->print_cr("%8s "INT32_FORMAT, "Total ", total);
-+ tty->print_cr("%8s "INT32_FORMAT, "Maximum", max_symbols);
- tty->print_cr("%8s %3.2f", "Average",
- ((float) total / (float) the_table()->table_size()));
- tty->print_cr("%s", "Histogram:");
-@@ -746,11 +778,41 @@
- return result;
- }
-
--void StringTable::unlink(BoolObjectClosure* is_alive) {
-+void StringTable::unlink(BoolObjectClosure* is_alive, int* processed, int* removed) {
-+ buckets_unlink(is_alive, 0, the_table()->table_size(), processed, removed);
-+}
-+
-+void StringTable::possibly_parallel_unlink(BoolObjectClosure* is_alive, int* processed, int* removed) {
- // Readers of the table are unlocked, so we should only be removing
- // entries at a safepoint.
- assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
-- for (int i = 0; i < the_table()->table_size(); ++i) {
-+ const int limit = the_table()->table_size();
-+
-+ for (;;) {
-+ // Grab next set of buckets to scan
-+ int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize;
-+ if (start_idx >= limit) {
-+ // End of table
-+ break;
-+ }
-+
-+ int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
-+ buckets_unlink(is_alive, start_idx, end_idx, processed, removed);
-+ }
-+}
-+
-+void StringTable::buckets_unlink(BoolObjectClosure* is_alive, int start_idx, int end_idx, int* processed, int* removed) {
-+ const int limit = the_table()->table_size();
-+
-+ assert(0 <= start_idx && start_idx <= limit,
-+ err_msg("start_idx (" INT32_FORMAT ") is out of bounds", start_idx));
-+ assert(0 <= end_idx && end_idx <= limit,
-+ err_msg("end_idx (" INT32_FORMAT ") is out of bounds", end_idx));
-+ assert(start_idx <= end_idx,
-+ err_msg("Index ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT,
-+ start_idx, end_idx));
-+
-+ for (int i = start_idx; i < end_idx; ++i) {
- HashtableEntry<oop, mtSymbol>** p = the_table()->bucket_addr(i);
- HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i);
- while (entry != NULL) {
-@@ -767,24 +829,26 @@
- } else {
- *p = entry->next();
- the_table()->free_entry(entry);
-+ (*removed)++;
- }
-+ (*processed)++;
- entry = (HashtableEntry<oop, mtSymbol>*)HashtableEntry<oop, mtSymbol>::make_ptr(*p);
- }
- }
- }
-
--void StringTable::buckets_do(OopClosure* f, int start_idx, int end_idx) {
-+void StringTable::buckets_oops_do(OopClosure* f, int start_idx, int end_idx) {
- const int limit = the_table()->table_size();
-
- assert(0 <= start_idx && start_idx <= limit,
-- err_msg("start_idx (" INT32_FORMAT ") oob?", start_idx));
-+ err_msg("start_idx (" INT32_FORMAT ") is out of bounds", start_idx));
- assert(0 <= end_idx && end_idx <= limit,
-- err_msg("end_idx (" INT32_FORMAT ") oob?", end_idx));
-+ err_msg("end_idx (" INT32_FORMAT ") is out of bounds", end_idx));
- assert(start_idx <= end_idx,
-- err_msg("Ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT,
-+ err_msg("Index ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT,
- start_idx, end_idx));
-
-- for (int i = start_idx; i < end_idx; i += 1) {
-+ for (int i = start_idx; i < end_idx; i++) {
- HashtableEntry<oop, mtSymbol>** p = the_table()->bucket_addr(i);
- HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i);
- while (entry != NULL) {
-@@ -804,11 +868,10 @@
- }
-
- void StringTable::oops_do(OopClosure* f) {
-- buckets_do(f, 0, the_table()->table_size());
-+ buckets_oops_do(f, 0, the_table()->table_size());
- }
-
- void StringTable::possibly_parallel_oops_do(OopClosure* f) {
-- const int ClaimChunkSize = 32;
- const int limit = the_table()->table_size();
-
- for (;;) {
-@@ -820,7 +883,7 @@
- }
-
- int end_idx = MIN2(limit, start_idx + ClaimChunkSize);
-- buckets_do(f, start_idx, end_idx);
-+ buckets_oops_do(f, start_idx, end_idx);
- }
- }
-
---- ./hotspot/src/share/vm/classfile/symbolTable.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/symbolTable.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -86,8 +86,8 @@
- static bool _needs_rehashing;
-
- // For statistics
-- static int symbols_removed;
-- static int symbols_counted;
-+ static int _symbols_removed;
-+ static int _symbols_counted;
-
- Symbol* allocate_symbol(const u1* name, int len, bool c_heap, TRAPS); // Assumes no characters larger than 0x7F
-
-@@ -126,6 +126,11 @@
- static Arena* arena() { return _arena; } // called for statistics
-
- static void initialize_symbols(int arena_alloc_size = 0);
-+
-+ static volatile int _parallel_claimed_idx;
-+
-+ // Release any dead symbols
-+ static void buckets_unlink(int start_idx, int end_idx, int* processed, int* removed, size_t* memory_total);
- public:
- enum {
- symbol_alloc_batch_size = 8,
-@@ -175,7 +180,19 @@
- unsigned int* hashValues, TRAPS);
-
- // Release any dead symbols
-- static void unlink();
-+ static void unlink() {
-+ int processed = 0;
-+ int removed = 0;
-+ unlink(&processed, &removed);
-+ }
-+ static void unlink(int* processed, int* removed);
-+ // Release any dead symbols, possibly parallel version
-+ static void possibly_parallel_unlink() {
-+ int processed = 0;
-+ int removed = 0;
-+ possibly_parallel_unlink(&processed, &removed);
-+ }
-+ static void possibly_parallel_unlink(int* processed, int* removed);
-
- // iterate over symbols
- static void symbols_do(SymbolClosure *cl);
-@@ -233,6 +250,9 @@
- // Rehash the symbol table if it gets out of balance
- static void rehash_table();
- static bool needs_rehashing() { return _needs_rehashing; }
-+ // Parallel chunked scanning
-+ static void clear_parallel_claimed_index() { _parallel_claimed_idx = 0; }
-+ static int parallel_claimed_index() { return _parallel_claimed_idx; }
- };
-
- class StringTable : public Hashtable<oop, mtSymbol> {
-@@ -256,7 +276,9 @@
-
- // Apply the give oop closure to the entries to the buckets
- // in the range [start_idx, end_idx).
-- static void buckets_do(OopClosure* f, int start_idx, int end_idx);
-+ static void buckets_oops_do(OopClosure* f, int start_idx, int end_idx);
-+ // Unlink the entries to the buckets in the range [start_idx, end_idx).
-+ static void buckets_unlink(BoolObjectClosure* is_alive, int start_idx, int end_idx, int* processed, int* removed);
-
- StringTable() : Hashtable<oop, mtSymbol>((int)StringTableSize,
- sizeof (HashtableEntry<oop, mtSymbol>)) {}
-@@ -283,7 +305,13 @@
-
- // GC support
- // Delete pointers to otherwise-unreachable objects.
-- static void unlink(BoolObjectClosure* cl);
-+ static void unlink(BoolObjectClosure* cl) {
-+ int processed = 0;
-+ int removed = 0;
-+ unlink(cl, &processed, &removed);
-+ }
-+
-+ static void unlink(BoolObjectClosure* cl, int* processed, int* removed);
-
- // Serially invoke "f->do_oop" on the locations of all oops in the table.
- static void oops_do(OopClosure* f);
-@@ -291,6 +319,8 @@
- // Possibly parallel version of the above
- static void possibly_parallel_oops_do(OopClosure* f);
-
-+ static void possibly_parallel_unlink(BoolObjectClosure* cl, int* processed, int* removed);
-+
- // Hashing algorithm, used as the hash value used by the
- // StringTable for bucket selection and comparison (stored in the
- // HashtableEntry structures). This is used in the String.intern() method.
-@@ -328,5 +358,6 @@
-
- // Parallel chunked scanning
- static void clear_parallel_claimed_index() { _parallel_claimed_idx = 0; }
-+ static int parallel_claimed_index() { return _parallel_claimed_idx; }
- };
- #endif // SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP
---- ./hotspot/src/share/vm/classfile/systemDictionary.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/systemDictionary.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -585,7 +585,7 @@
- assert(name != NULL && !FieldType::is_array(name) &&
- !FieldType::is_obj(name), "invalid class name");
-
-- TracingTime class_load_start_time = Tracing::time();
-+ const Ticks class_load_start_time = Ticks::now();
-
- // UseNewReflection
- // Fix for 4474172; see evaluation for more details
-@@ -946,7 +946,7 @@
- TRAPS) {
- TempNewSymbol parsed_name = NULL;
-
-- TracingTime class_load_start_time = Tracing::time();
-+ const Ticks class_load_start_time = Ticks::now();
-
- // Parse the stream. Note that we do this even though this klass might
- // already be present in the SystemDictionary, otherwise we would not
-@@ -1572,9 +1572,10 @@
- // Used for assertions and verification only
- klassOop SystemDictionary::find_class(Symbol* class_name, Handle class_loader) {
- #ifndef ASSERT
-- guarantee(VerifyBeforeGC ||
-- VerifyDuringGC ||
-- VerifyBeforeExit ||
-+ guarantee(VerifyBeforeGC ||
-+ VerifyDuringGC ||
-+ VerifyBeforeExit ||
-+ VerifyDuringStartup ||
- VerifyAfterGC, "too expensive");
- #endif
- assert_locked_or_safepoint(SystemDictionary_lock);
-@@ -2314,6 +2315,11 @@
- objArrayHandle appendix_box = oopFactory::new_objArray(SystemDictionary::Object_klass(), 1, CHECK_(empty));
- assert(appendix_box->obj_at(0) == NULL, "");
-
-+ // This should not happen. JDK code should take care of that.
-+ if (accessing_klass.is_null() || method_type.is_null()) {
-+ THROW_MSG_(vmSymbols::java_lang_InternalError(), "bad invokehandle", empty);
-+ }
-+
- // call java.lang.invoke.MethodHandleNatives::linkMethod(... String, MethodType) -> MemberName
- JavaCallArguments args;
- args.push_oop(accessing_klass()->java_mirror());
-@@ -2439,6 +2445,9 @@
- Handle type;
- if (signature->utf8_length() > 0 && signature->byte_at(0) == '(') {
- type = find_method_handle_type(signature, caller, CHECK_(empty));
-+ } else if (caller.is_null()) {
-+ // This should not happen. JDK code should take care of that.
-+ THROW_MSG_(vmSymbols::java_lang_InternalError(), "bad MH constant", empty);
- } else {
- ResourceMark rm(THREAD);
- SignatureStream ss(signature, false);
-@@ -2502,6 +2511,11 @@
- Handle method_name = java_lang_String::create_from_symbol(name, CHECK_(empty));
- Handle method_type = find_method_handle_type(type, caller, CHECK_(empty));
-
-+ // This should not happen. JDK code should take care of that.
-+ if (caller.is_null() || method_type.is_null()) {
-+ THROW_MSG_(vmSymbols::java_lang_InternalError(), "bad invokedynamic", empty);
-+ }
-+
- objArrayHandle appendix_box = oopFactory::new_objArray(SystemDictionary::Object_klass(), 1, CHECK_(empty));
- assert(appendix_box->obj_at(0) == NULL, "");
-
-@@ -2607,13 +2621,12 @@
- }
-
- // utility function for posting class load event
--void SystemDictionary::post_class_load_event(TracingTime start_time,
-+void SystemDictionary::post_class_load_event(const Ticks& start_time,
- instanceKlassHandle k,
- Handle initiating_loader) {
- #if INCLUDE_TRACE
- EventClassLoad event(UNTIMED);
- if (event.should_commit()) {
-- event.set_endtime(Tracing::time());
- event.set_starttime(start_time);
- event.set_loadedClass(k());
- oop defining_class_loader = k->class_loader();
-@@ -2632,7 +2645,7 @@
- assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
- if (Tracing::enabled()) {
- _should_write_unload_events = Tracing::is_event_enabled(TraceClassUnloadEvent);
-- _class_unload_time = Tracing::time();
-+ _class_unload_time = Ticks::now();
- _is_alive = is_alive;
- classes_do(&class_unload_event);
-
-@@ -2648,7 +2661,7 @@
-
- #if INCLUDE_TRACE
-
--TracingTime SystemDictionary::_class_unload_time;
-+Ticks SystemDictionary::_class_unload_time;
- BoolObjectClosure* SystemDictionary::_is_alive = NULL;
- int SystemDictionary::_no_of_classes_unloading = 0;
- bool SystemDictionary::_should_write_unload_events = false;
---- ./hotspot/src/share/vm/classfile/systemDictionary.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/systemDictionary.hpp 2014-07-15 21:48:34.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
-@@ -33,7 +33,7 @@
- #include "runtime/reflectionUtils.hpp"
- #include "utilities/hashtable.hpp"
- #include "utilities/hashtable.inline.hpp"
--#include "trace/traceTime.hpp"
-+#include "utilities/ticks.hpp"
-
- // The system dictionary stores all loaded classes and maps:
- //
-@@ -151,6 +151,7 @@
- do_klass(MemberName_klass, java_lang_invoke_MemberName, Pre_JSR292 ) \
- do_klass(MethodHandleNatives_klass, java_lang_invoke_MethodHandleNatives, Pre_JSR292 ) \
- do_klass(LambdaForm_klass, java_lang_invoke_LambdaForm, Opt ) \
-+ do_klass(DirectMethodHandle_klass, java_lang_invoke_DirectMethodHandle, Opt ) \
- do_klass(MethodType_klass, java_lang_invoke_MethodType, Pre_JSR292 ) \
- do_klass(BootstrapMethodError_klass, java_lang_BootstrapMethodError, Pre_JSR292 ) \
- do_klass(CallSite_klass, java_lang_invoke_CallSite, Pre_JSR292 ) \
-@@ -616,7 +617,7 @@
- static void add_to_hierarchy(instanceKlassHandle k, TRAPS);
-
- // event based tracing
-- static void post_class_load_event(TracingTime start_time, instanceKlassHandle k,
-+ static void post_class_load_event(const Ticks& start_time, instanceKlassHandle k,
- Handle initiating_loader);
- static void post_class_unload_events(BoolObjectClosure* is_alive);
-
-@@ -678,7 +679,7 @@
- static bool _has_checkPackageAccess;
-
- #if INCLUDE_TRACE
-- static TracingTime _class_unload_time;
-+ static Ticks _class_unload_time;
- static BoolObjectClosure* _is_alive;
- static int _no_of_classes_unloading;
- static bool _should_write_unload_events;
---- ./hotspot/src/share/vm/classfile/verifier.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/verifier.cpp 2014-10-28 20:19:38.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
-@@ -629,6 +629,9 @@
- bool no_control_flow = false; // Set to true when there is no direct control
- // flow from current instruction to the next
- // instruction in sequence
-+
-+ set_furthest_jump(0);
-+
- Bytecodes::Code opcode;
- while (!bcs.is_last_bytecode()) {
- // Check for recursive re-verification before each bytecode.
-@@ -2221,6 +2224,181 @@
- }
- }
-
-+// Look at the method's handlers. If the bci is in the handler's try block
-+// then check if the handler_pc is already on the stack. If not, push it.
-+void ClassVerifier::push_handlers(ExceptionTable* exhandlers,
-+ GrowableArray<u4>* handler_stack,
-+ u4 bci) {
-+ int exlength = exhandlers->length();
-+ for(int x = 0; x < exlength; x++) {
-+ if (bci >= exhandlers->start_pc(x) && bci < exhandlers->end_pc(x)) {
-+ handler_stack->append_if_missing(exhandlers->handler_pc(x));
-+ }
-+ }
-+}
-+
-+// Return TRUE if all code paths starting with start_bc_offset end in
-+// bytecode athrow or loop.
-+bool ClassVerifier::ends_in_athrow(u4 start_bc_offset) {
-+ ResourceMark rm;
-+ // Create bytecode stream.
-+ RawBytecodeStream bcs(method());
-+ u4 code_length = method()->code_size();
-+ bcs.set_start(start_bc_offset);
-+ u4 target;
-+ // Create stack for storing bytecode start offsets for if* and *switch.
-+ GrowableArray<u4>* bci_stack = new GrowableArray<u4>(30);
-+ // Create stack for handlers for try blocks containing this handler.
-+ GrowableArray<u4>* handler_stack = new GrowableArray<u4>(30);
-+ // Create list of visited branch opcodes (goto* and if*).
-+ GrowableArray<u4>* visited_branches = new GrowableArray<u4>(30);
-+ ExceptionTable exhandlers(_method());
-+
-+ while (true) {
-+ if (bcs.is_last_bytecode()) {
-+ // if no more starting offsets to parse or if at the end of the
-+ // method then return false.
-+ if ((bci_stack->is_empty()) || ((u4)bcs.end_bci() == code_length))
-+ return false;
-+ // Pop a bytecode starting offset and scan from there.
-+ bcs.set_start(bci_stack->pop());
-+ }
-+ Bytecodes::Code opcode = bcs.raw_next();
-+ u4 bci = bcs.bci();
-+
-+ // If the bytecode is in a TRY block, push its handlers so they
-+ // will get parsed.
-+ push_handlers(&exhandlers, handler_stack, bci);
-+
-+ switch (opcode) {
-+ case Bytecodes::_if_icmpeq:
-+ case Bytecodes::_if_icmpne:
-+ case Bytecodes::_if_icmplt:
-+ case Bytecodes::_if_icmpge:
-+ case Bytecodes::_if_icmpgt:
-+ case Bytecodes::_if_icmple:
-+ case Bytecodes::_ifeq:
-+ case Bytecodes::_ifne:
-+ case Bytecodes::_iflt:
-+ case Bytecodes::_ifge:
-+ case Bytecodes::_ifgt:
-+ case Bytecodes::_ifle:
-+ case Bytecodes::_if_acmpeq:
-+ case Bytecodes::_if_acmpne:
-+ case Bytecodes::_ifnull:
-+ case Bytecodes::_ifnonnull:
-+ target = bcs.dest();
-+ if (visited_branches->contains(bci)) {
-+ if (bci_stack->is_empty()) return true;
-+ // Pop a bytecode starting offset and scan from there.
-+ bcs.set_start(bci_stack->pop());
-+ } else {
-+ if (target > bci) { // forward branch
-+ if (target >= code_length) return false;
-+ // Push the branch target onto the stack.
-+ bci_stack->push(target);
-+ // then, scan bytecodes starting with next.
-+ bcs.set_start(bcs.next_bci());
-+ } else { // backward branch
-+ // Push bytecode offset following backward branch onto the stack.
-+ bci_stack->push(bcs.next_bci());
-+ // Check bytecodes starting with branch target.
-+ bcs.set_start(target);
-+ }
-+ // Record target so we don't branch here again.
-+ visited_branches->append(bci);
-+ }
-+ break;
-+
-+ case Bytecodes::_goto:
-+ case Bytecodes::_goto_w:
-+ target = (opcode == Bytecodes::_goto ? bcs.dest() : bcs.dest_w());
-+ if (visited_branches->contains(bci)) {
-+ if (bci_stack->is_empty()) return true;
-+ // Been here before, pop new starting offset from stack.
-+ bcs.set_start(bci_stack->pop());
-+ } else {
-+ if (target >= code_length) return false;
-+ // Continue scanning from the target onward.
-+ bcs.set_start(target);
-+ // Record target so we don't branch here again.
-+ visited_branches->append(bci);
-+ }
-+ break;
-+
-+ // Check that all switch alternatives end in 'athrow' bytecodes. Since it
-+ // is difficult to determine where each switch alternative ends, parse
-+ // each switch alternative until either hit a 'return', 'athrow', or reach
-+ // the end of the method's bytecodes. This is gross but should be okay
-+ // because:
-+ // 1. tableswitch and lookupswitch byte codes in handlers for ctor explicit
-+ // constructor invocations should be rare.
-+ // 2. if each switch alternative ends in an athrow then the parsing should be
-+ // short. If there is no athrow then it is bogus code, anyway.
-+ case Bytecodes::_lookupswitch:
-+ case Bytecodes::_tableswitch:
-+ {
-+ address aligned_bcp = (address) round_to((intptr_t)(bcs.bcp() + 1), jintSize);
-+ u4 default_offset = Bytes::get_Java_u4(aligned_bcp) + bci;
-+ int keys, delta;
-+ if (opcode == Bytecodes::_tableswitch) {
-+ jint low = (jint)Bytes::get_Java_u4(aligned_bcp + jintSize);
-+ jint high = (jint)Bytes::get_Java_u4(aligned_bcp + 2*jintSize);
-+ // This is invalid, but let the regular bytecode verifier
-+ // report this because the user will get a better error message.
-+ if (low > high) return true;
-+ keys = high - low + 1;
-+ delta = 1;
-+ } else {
-+ keys = (int)Bytes::get_Java_u4(aligned_bcp + jintSize);
-+ delta = 2;
-+ }
-+ // Invalid, let the regular bytecode verifier deal with it.
-+ if (keys < 0) return true;
-+
-+ // Push the offset of the next bytecode onto the stack.
-+ bci_stack->push(bcs.next_bci());
-+
-+ // Push the switch alternatives onto the stack.
-+ for (int i = 0; i < keys; i++) {
-+ u4 target = bci + (jint)Bytes::get_Java_u4(aligned_bcp+(3+i*delta)*jintSize);
-+ if (target > code_length) return false;
-+ bci_stack->push(target);
-+ }
-+
-+ // Start bytecode parsing for the switch at the default alternative.
-+ if (default_offset > code_length) return false;
-+ bcs.set_start(default_offset);
-+ break;
-+ }
-+
-+ case Bytecodes::_return:
-+ return false;
-+
-+ case Bytecodes::_athrow:
-+ {
-+ if (bci_stack->is_empty()) {
-+ if (handler_stack->is_empty()) {
-+ return true;
-+ } else {
-+ // Parse the catch handlers for try blocks containing athrow.
-+ bcs.set_start(handler_stack->pop());
-+ }
-+ } else {
-+ // Pop a bytecode offset and starting scanning from there.
-+ bcs.set_start(bci_stack->pop());
-+ }
-+ }
-+ break;
-+
-+ default:
-+ ;
-+ } // end switch
-+ } // end while loop
-+
-+ return false;
-+}
-+
- void ClassVerifier::verify_invoke_init(
- RawBytecodeStream* bcs, u2 ref_class_index, VerificationType ref_class_type,
- StackMapFrame* current_frame, u4 code_length, bool *this_uninit,
-@@ -2239,6 +2417,37 @@
- "Bad <init> method call");
- return;
- }
-+
-+ // Make sure that this call is not jumped over.
-+ if (bci < furthest_jump()) {
-+ verify_error(ErrorContext::bad_code(bci),
-+ "Bad <init> method call from inside of a branch");
-+ return;
-+ }
-+
-+ // Check if this call is done from inside of a TRY block. If so, make
-+ // sure that all catch clause paths end in a throw. Otherwise, this
-+ // can result in returning an incomplete object.
-+ ExceptionTable exhandlers(_method());
-+ int exlength = exhandlers.length();
-+ for(int i = 0; i < exlength; i++) {
-+ u2 start_pc = exhandlers.start_pc(i);
-+ u2 end_pc = exhandlers.end_pc(i);
-+
-+ if (bci >= start_pc && bci < end_pc) {
-+ if (!ends_in_athrow(exhandlers.handler_pc(i))) {
-+ verify_error(ErrorContext::bad_code(bci),
-+ "Bad <init> method call from after the start of a try block");
-+ return;
-+ } else if (VerboseVerification) {
-+ ResourceMark rm;
-+ tty->print_cr(
-+ "Survived call to ends_in_athrow(): %s",
-+ current_class()->name()->as_C_string());
-+ }
-+ }
-+ }
-+
- current_frame->initialize_object(type, current_type());
- *this_uninit = true;
- } else if (type.is_uninitialized()) {
-@@ -2275,6 +2484,11 @@
- methodOop m = instanceKlass::cast(ref_klass)->uncached_lookup_method(
- vmSymbols::object_initializer_name(),
- cp->signature_ref_at(bcs->get_index_u2()));
-+ if (m == NULL) {
-+ verify_error(ErrorContext::bad_code(bci),
-+ "Call to missing <init> method");
-+ return;
-+ }
- instanceKlassHandle mh(THREAD, m->method_holder());
- if (m->is_protected() && !mh->is_same_class_package(_klass())) {
- bool assignable = current_type().is_assignable_from(
---- ./hotspot/src/share/vm/classfile/verifier.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/verifier.hpp 2014-10-28 20:19:38.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
-@@ -30,6 +30,7 @@
- #include "oops/klass.hpp"
- #include "oops/methodOop.hpp"
- #include "runtime/handles.hpp"
-+#include "utilities/growableArray.hpp"
- #include "utilities/exceptions.hpp"
-
- // The verifier class
-@@ -256,6 +257,9 @@
-
- ErrorContext _error_context; // contains information about an error
-
-+ // Used to detect illegal jumps over calls to super() and this() in ctors.
-+ int32_t _furthest_jump;
-+
- void verify_method(methodHandle method, TRAPS);
- char* generate_code_data(methodHandle m, u4 code_length, TRAPS);
- void verify_exception_handler_table(u4 code_length, char* code_data,
-@@ -301,6 +305,16 @@
- StackMapFrame* current_frame, u4 code_length, bool* this_uninit,
- constantPoolHandle cp, TRAPS);
-
-+ // Used by ends_in_athrow() to push all handlers that contain bci onto
-+ // the handler_stack, if the handler is not already on the stack.
-+ void push_handlers(ExceptionTable* exhandlers,
-+ GrowableArray<u4>* handler_stack,
-+ u4 bci);
-+
-+ // Returns true if all paths starting with start_bc_offset end in athrow
-+ // bytecode or loop.
-+ bool ends_in_athrow(u4 start_bc_offset);
-+
- void verify_invoke_instructions(
- RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame,
- bool* this_uninit, VerificationType return_type,
-@@ -398,6 +412,20 @@
- Symbol* create_temporary_symbol(const char *s, int length, TRAPS);
-
- TypeOrigin ref_ctx(const char* str, TRAPS);
-+
-+ // Keep track of the furthest branch done in a method to make sure that
-+ // there are no branches over calls to super() or this() from inside of
-+ // a constructor.
-+ int32_t furthest_jump() { return _furthest_jump; }
-+
-+ void set_furthest_jump(int32_t target) {
-+ _furthest_jump = target;
-+ }
-+
-+ void update_furthest_jump(int32_t target) {
-+ if (target > _furthest_jump) _furthest_jump = target;
-+ }
-+
- };
-
- inline int ClassVerifier::change_sig_to_verificationType(
---- ./hotspot/src/share/vm/classfile/vmSymbols.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/vmSymbols.hpp 2014-07-15 21:48:34.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
-@@ -243,6 +243,7 @@
- /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \
- template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \
- template(java_lang_invoke_ConstantCallSite, "java/lang/invoke/ConstantCallSite") \
-+ template(java_lang_invoke_DirectMethodHandle, "java/lang/invoke/DirectMethodHandle") \
- template(java_lang_invoke_MutableCallSite, "java/lang/invoke/MutableCallSite") \
- template(java_lang_invoke_VolatileCallSite, "java/lang/invoke/VolatileCallSite") \
- template(java_lang_invoke_MethodHandle, "java/lang/invoke/MethodHandle") \
-@@ -338,6 +339,7 @@
- template(thread_id_name, "tid") \
- template(newInstance0_name, "newInstance0") \
- template(limit_name, "limit") \
-+ template(member_name, "member") \
- template(forName_name, "forName") \
- template(forName0_name, "forName0") \
- template(isJavaIdentifierStart_name, "isJavaIdentifierStart") \
---- ./hotspot/src/share/vm/code/nmethod.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/code/nmethod.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -676,6 +676,7 @@
- code_buffer->copy_oops_to(this);
- if (ScavengeRootsInCode && detect_scavenge_root_oops()) {
- CodeCache::add_scavenge_root_nmethod(this);
-+ Universe::heap()->register_nmethod(this);
- }
- debug_only(verify_scavenge_root_oops());
- CodeCache::commit(this);
-@@ -869,6 +870,7 @@
- dependencies->copy_to(this);
- if (ScavengeRootsInCode && detect_scavenge_root_oops()) {
- CodeCache::add_scavenge_root_nmethod(this);
-+ Universe::heap()->register_nmethod(this);
- }
- debug_only(verify_scavenge_root_oops());
-
-@@ -1282,6 +1284,13 @@
- methodHandle the_method(method());
- No_Safepoint_Verifier nsv;
-
-+ // during patching, depending on the nmethod state we must notify the GC that
-+ // code has been unloaded, unregistering it. We cannot do this right while
-+ // holding the Patching_lock because we need to use the CodeCache_lock. This
-+ // would be prone to deadlocks.
-+ // This flag is used to remember whether we need to later lock and unregister.
-+ bool nmethod_needs_unregister = false;
-+
- {
- // invalidate osr nmethod before acquiring the patching lock since
- // they both acquire leaf locks and we don't want a deadlock.
-@@ -1314,6 +1323,13 @@
- inc_decompile_count();
- }
-
-+ // If the state is becoming a zombie, signal to unregister the nmethod with
-+ // the heap.
-+ // This nmethod may have already been unloaded during a full GC.
-+ if ((state == zombie) && !is_unloaded()) {
-+ nmethod_needs_unregister = true;
-+ }
-+
- // Change state
- _state = state;
-
-@@ -1349,6 +1365,9 @@
- // safepoint can sneak in, otherwise the oops used by the
- // dependency logic could have become stale.
- MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-+ if (nmethod_needs_unregister) {
-+ Universe::heap()->unregister_nmethod(this);
-+ }
- flush_dependencies(NULL);
- }
-
-@@ -1696,20 +1715,10 @@
- #endif // !PRODUCT
- }
-
--// This method is called twice during GC -- once while
--// tracing the "active" nmethods on thread stacks during
--// the (strong) marking phase, and then again when walking
--// the code cache contents during the weak roots processing
--// phase. The two uses are distinguished by means of the
--// 'do_strong_roots_only' flag, which is true in the first
--// case. We want to walk the weak roots in the nmethod
--// only in the second case. The weak roots in the nmethod
--// are the oops in the ExceptionCache and the InlineCache
--// oops.
--void nmethod::oops_do(OopClosure* f, bool do_strong_roots_only) {
-- // make sure the oops ready to receive visitors
-- assert(!is_zombie() && !is_unloaded(),
-- "should not call follow on zombie or unloaded nmethod");
-+void nmethod::oops_do(OopClosure* f, bool do_strong_roots_only, bool allow_zombie) {
-+ // make sure the oops ready to receive visitors
-+ assert(allow_zombie || !is_zombie(), "should not call follow on zombie nmethod");
-+ assert(!is_unloaded(), "should not call follow on unloaded nmethod");
-
- // If the method is not entrant or zombie then a JMP is plastered over the
- // first few bytes. If an oop in the old code was there, that oop
---- ./hotspot/src/share/vm/code/nmethod.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/code/nmethod.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -548,8 +548,8 @@
-
- void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map,
- OopClosure* f);
-- void oops_do(OopClosure* f) { oops_do(f, false); }
-- void oops_do(OopClosure* f, bool do_strong_roots_only);
-+ void oops_do(OopClosure* f) { oops_do(f, false, false); }
-+ void oops_do(OopClosure* f, bool do_strong_roots_only, bool allow_zombie);
- bool detect_scavenge_root_oops();
- void verify_scavenge_root_oops() PRODUCT_RETURN;
-
---- ./hotspot/src/share/vm/code/relocInfo.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/code/relocInfo.hpp 2014-10-28 20:19:39.000000000 -0700
-@@ -371,7 +371,7 @@
- // "immediate" in the prefix header word itself. This optimization
- // is invisible outside this module.)
-
-- inline friend relocInfo prefix_relocInfo(int datalen = 0);
-+ inline friend relocInfo prefix_relocInfo(int datalen);
-
- protected:
- // an immediate relocInfo optimizes a prefix with one 10-bit unsigned value
-@@ -466,7 +466,7 @@
- return relocInfo(relocInfo::none, relocInfo::offset_limit() - relocInfo::offset_unit);
- }
-
--inline relocInfo prefix_relocInfo(int datalen) {
-+inline relocInfo prefix_relocInfo(int datalen = 0) {
- assert(relocInfo::fits_into_immediate(datalen), "datalen in limits");
- return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen);
- }
---- ./hotspot/src/share/vm/compiler/compileBroker.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/compiler/compileBroker.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2012, 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
-@@ -1921,6 +1921,7 @@
- ResourceMark rm;
- char* method_name = method->name()->as_C_string();
- strncpy(_last_method_compiled, method_name, CompileBroker::name_buffer_length);
-+ _last_method_compiled[CompileBroker::name_buffer_length - 1] = '\0'; // ensure null terminated
- char current_method[CompilerCounters::cmname_buffer_length];
- size_t maxLen = CompilerCounters::cmname_buffer_length;
-
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -58,8 +58,22 @@
- MarkRefsIntoClosure(MemRegion span, CMSBitMap* bitMap);
- virtual void do_oop(oop* p);
- virtual void do_oop(narrowOop* p);
-- inline void do_oop_nv(oop* p) { MarkRefsIntoClosure::do_oop_work(p); }
-- inline void do_oop_nv(narrowOop* p) { MarkRefsIntoClosure::do_oop_work(p); }
-+
-+ Prefetch::style prefetch_style() {
-+ return Prefetch::do_read;
-+ }
-+};
-+
-+class Par_MarkRefsIntoClosure: public OopsInGenClosure {
-+ private:
-+ const MemRegion _span;
-+ CMSBitMap* _bitMap;
-+ protected:
-+ DO_OOP_WORK_DEFN
-+ public:
-+ Par_MarkRefsIntoClosure(MemRegion span, CMSBitMap* bitMap);
-+ virtual void do_oop(oop* p);
-+ virtual void do_oop(narrowOop* p);
- bool do_header() { return true; }
- Prefetch::style prefetch_style() {
- return Prefetch::do_read;
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -575,6 +575,7 @@
- _restart_addr(NULL),
- _overflow_list(NULL),
- _stats(cmsGen),
-+ _eden_chunk_lock(new Mutex(Mutex::leaf + 1, "CMS_eden_chunk_lock", true)),
- _eden_chunk_array(NULL), // may be set in ctor body
- _eden_chunk_capacity(0), // -- ditto --
- _eden_chunk_index(0), // -- ditto --
-@@ -754,7 +755,7 @@
- assert(_eden_chunk_array != NULL || _eden_chunk_capacity == 0, "Error");
-
- // Support for parallelizing survivor space rescan
-- if (CMSParallelRemarkEnabled && CMSParallelSurvivorRemarkEnabled) {
-+ if ((CMSParallelRemarkEnabled && CMSParallelSurvivorRemarkEnabled) || CMSParallelInitialMarkEnabled) {
- const size_t max_plab_samples =
- ((DefNewGeneration*)_young_gen)->max_survivor_size()/MinTLABSize;
-
-@@ -1997,7 +1998,7 @@
- GenCollectedHeap* gch = GenCollectedHeap::heap();
-
- STWGCTimer* gc_timer = GenMarkSweep::gc_timer();
-- gc_timer->register_gc_start(os::elapsed_counter());
-+ gc_timer->register_gc_start();
-
- SerialOldTracer* gc_tracer = GenMarkSweep::gc_tracer();
- gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
-@@ -2094,7 +2095,7 @@
- size_policy()->msc_collection_end(gch->gc_cause());
- }
-
-- gc_timer->register_gc_end(os::elapsed_counter());
-+ gc_timer->register_gc_end();
-
- gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
-
-@@ -2136,6 +2137,39 @@
- }
-
-
-+void CMSCollector::print_eden_and_survivor_chunk_arrays() {
-+ DefNewGeneration* dng = _young_gen->as_DefNewGeneration();
-+ EdenSpace* eden_space = dng->eden();
-+ ContiguousSpace* from_space = dng->from();
-+ ContiguousSpace* to_space = dng->to();
-+ // Eden
-+ if (_eden_chunk_array != NULL) {
-+ gclog_or_tty->print_cr("eden " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")",
-+ eden_space->bottom(), eden_space->top(),
-+ eden_space->end(), eden_space->capacity());
-+ gclog_or_tty->print_cr("_eden_chunk_index=" SIZE_FORMAT ", "
-+ "_eden_chunk_capacity=" SIZE_FORMAT,
-+ _eden_chunk_index, _eden_chunk_capacity);
-+ for (size_t i = 0; i < _eden_chunk_index; i++) {
-+ gclog_or_tty->print_cr("_eden_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT,
-+ i, _eden_chunk_array[i]);
-+ }
-+ }
-+ // Survivor
-+ if (_survivor_chunk_array != NULL) {
-+ gclog_or_tty->print_cr("survivor " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")",
-+ from_space->bottom(), from_space->top(),
-+ from_space->end(), from_space->capacity());
-+ gclog_or_tty->print_cr("_survivor_chunk_index=" SIZE_FORMAT ", "
-+ "_survivor_chunk_capacity=" SIZE_FORMAT,
-+ _survivor_chunk_index, _survivor_chunk_capacity);
-+ for (size_t i = 0; i < _survivor_chunk_index; i++) {
-+ gclog_or_tty->print_cr("_survivor_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT,
-+ i, _survivor_chunk_array[i]);
-+ }
-+ }
-+}
-+
- void CMSCollector::getFreelistLocks() const {
- // Get locks for all free lists in all generations that this
- // collector is responsible for
-@@ -2443,7 +2477,7 @@
-
- void CMSCollector::register_gc_start(GCCause::Cause cause) {
- _cms_start_registered = true;
-- _gc_timer_cm->register_gc_start(os::elapsed_counter());
-+ _gc_timer_cm->register_gc_start();
- _gc_tracer_cm->report_gc_start(cause, _gc_timer_cm->gc_start());
- }
-
-@@ -2451,7 +2485,7 @@
- if (_cms_start_registered) {
- report_heap_summary(GCWhen::AfterGC);
-
-- _gc_timer_cm->register_gc_end(os::elapsed_counter());
-+ _gc_timer_cm->register_gc_end();
- _gc_tracer_cm->report_gc_end(_gc_timer_cm->gc_end(), _gc_timer_cm->time_partitions());
- _cms_start_registered = false;
- }
-@@ -2510,8 +2544,7 @@
- // initial marking in checkpointRootsInitialWork has been completed
- if (VerifyDuringGC &&
- GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
-- gclog_or_tty->print("Verify before initial mark: ");
-- Universe::verify();
-+ Universe::verify("Verify before initial mark: ");
- }
- {
- bool res = markFromRoots(false);
-@@ -2522,8 +2555,7 @@
- case FinalMarking:
- if (VerifyDuringGC &&
- GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
-- gclog_or_tty->print("Verify before re-mark: ");
-- Universe::verify();
-+ Universe::verify("Verify before re-mark: ");
- }
- checkpointRootsFinal(false, clear_all_soft_refs,
- init_mark_was_synchronous);
-@@ -2534,8 +2566,7 @@
- // final marking in checkpointRootsFinal has been completed
- if (VerifyDuringGC &&
- GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
-- gclog_or_tty->print("Verify before sweep: ");
-- Universe::verify();
-+ Universe::verify("Verify before sweep: ");
- }
- sweep(false);
- assert(_collectorState == Resizing, "Incorrect state");
-@@ -2550,8 +2581,7 @@
- // The heap has been resized.
- if (VerifyDuringGC &&
- GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
-- gclog_or_tty->print("Verify before reset: ");
-- Universe::verify();
-+ Universe::verify("Verify before reset: ");
- }
- save_heap_summary();
- reset(false);
-@@ -2890,8 +2920,8 @@
- bool failed() { return _failed; }
- };
-
--bool CMSCollector::verify_after_remark() {
-- gclog_or_tty->print(" [Verifying CMS Marking... ");
-+bool CMSCollector::verify_after_remark(bool silent) {
-+ if (!silent) gclog_or_tty->print(" [Verifying CMS Marking... ");
- MutexLockerEx ml(verification_mark_bm()->lock(), Mutex::_no_safepoint_check_flag);
- static bool init = false;
-
-@@ -2952,7 +2982,7 @@
- warning("Unrecognized value %d for CMSRemarkVerifyVariant",
- CMSRemarkVerifyVariant);
- }
-- gclog_or_tty->print(" done] ");
-+ if (!silent) gclog_or_tty->print(" done] ");
- return true;
- }
-
-@@ -3530,6 +3560,31 @@
-
- // CMS work
-
-+// The common parts of CMSParInitialMarkTask and CMSParRemarkTask.
-+class CMSParMarkTask : public AbstractGangTask {
-+ protected:
-+ CMSCollector* _collector;
-+ int _n_workers;
-+ CMSParMarkTask(const char* name, CMSCollector* collector, int n_workers) :
-+ AbstractGangTask(name),
-+ _collector(collector),
-+ _n_workers(n_workers) {}
-+ // Work method in support of parallel rescan ... of young gen spaces
-+ void do_young_space_rescan(uint worker_id, OopsInGenClosure* cl,
-+ ContiguousSpace* space,
-+ HeapWord** chunk_array, size_t chunk_top);
-+ void work_on_young_gen_roots(uint worker_id, OopsInGenClosure* cl);
-+};
-+
-+// Parallel initial mark task
-+class CMSParInitialMarkTask: public CMSParMarkTask {
-+ public:
-+ CMSParInitialMarkTask(CMSCollector* collector, int n_workers) :
-+ CMSParMarkTask("Scan roots and young gen for initial mark in parallel",
-+ collector, n_workers) {}
-+ void work(uint worker_id);
-+};
-+
- // Checkpoint the roots into this generation from outside
- // this generation. [Note this initial checkpoint need only
- // be approximate -- we'll do a catch up phase subsequently.]
-@@ -3619,20 +3674,42 @@
- // weak reference processing has not started yet.
- ref_processor()->set_enqueuing_is_done(false);
-
-+ if (CMSPrintEdenSurvivorChunks) {
-+ print_eden_and_survivor_chunk_arrays();
-+ }
-+
- {
- // This is not needed. DEBUG_ONLY(RememberKlassesChecker imx(true);)
- COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
-- gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
-- gch->gen_process_strong_roots(_cmsGen->level(),
-- true, // younger gens are roots
-- true, // activate StrongRootsScope
-- true, // collecting perm gen
-- SharedHeap::ScanningOption(roots_scanning_options()),
-- &notOlder,
-- true, // walk all of code cache if (so & SO_CodeCache)
-- NULL);
-+ if (CMSParallelInitialMarkEnabled && CollectedHeap::use_parallel_gc_threads()) {
-+ // The parallel version.
-+ FlexibleWorkGang* workers = gch->workers();
-+ assert(workers != NULL, "Need parallel worker threads.");
-+ int n_workers = workers->active_workers();
-+ CMSParInitialMarkTask tsk(this, n_workers);
-+ gch->set_par_threads(n_workers);
-+ initialize_sequential_subtasks_for_young_gen_rescan(n_workers);
-+ if (n_workers > 1) {
-+ GenCollectedHeap::StrongRootsScope srs(gch);
-+ workers->run_task(&tsk);
-+ } else {
-+ GenCollectedHeap::StrongRootsScope srs(gch);
-+ tsk.work(0);
-+ }
-+ gch->set_par_threads(0);
-+ } else {
-+ // The serial version.
-+ gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
-+ gch->gen_process_strong_roots(_cmsGen->level(),
-+ true, // younger gens are roots
-+ true, // activate StrongRootsScope
-+ true, // collecting perm gen
-+ SharedHeap::ScanningOption(roots_scanning_options()),
-+ &notOlder,
-+ true, // walk all of code cache if (so & SO_CodeCache)
-+ NULL);
-+ }
- }
--
- // Clear mod-union table; it will be dirtied in the prologue of
- // CMS generation per each younger generation collection.
-
-@@ -4414,7 +4491,9 @@
- verify_overflow_empty();
- _abort_preclean = false;
- if (CMSPrecleaningEnabled) {
-- _eden_chunk_index = 0;
-+ if (!CMSEdenChunksRecordAlways) {
-+ _eden_chunk_index = 0;
-+ }
- size_t used = get_eden_used();
- size_t capacity = get_eden_capacity();
- // Don't start sampling unless we will get sufficiently
-@@ -4523,7 +4602,9 @@
- if (!_start_sampling) {
- return;
- }
-- if (_eden_chunk_array) {
-+ // When CMSEdenChunksRecordAlways is true, the eden chunk array
-+ // is populated by the young generation.
-+ if (_eden_chunk_array != NULL && !CMSEdenChunksRecordAlways) {
- if (_eden_chunk_index < _eden_chunk_capacity) {
- _eden_chunk_array[_eden_chunk_index] = *_top_addr; // take sample
- assert(_eden_chunk_array[_eden_chunk_index] <= *_end_addr,
-@@ -5000,6 +5081,10 @@
- // Update the saved marks which may affect the root scans.
- gch->save_marks();
-
-+ if (CMSPrintEdenSurvivorChunks) {
-+ print_eden_and_survivor_chunk_arrays();
-+ }
-+
- {
- COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
-
-@@ -5107,10 +5192,51 @@
- }
- }
-
-+void CMSParInitialMarkTask::work(uint worker_id) {
-+ elapsedTimer _timer;
-+ ResourceMark rm;
-+ HandleMark hm;
-+
-+ // ---------- scan from roots --------------
-+ _timer.start();
-+ GenCollectedHeap* gch = GenCollectedHeap::heap();
-+ Par_MarkRefsIntoClosure par_mri_cl(_collector->_span, &(_collector->_markBitMap));
-+
-+ // ---------- young gen roots --------------
-+ {
-+ work_on_young_gen_roots(worker_id, &par_mri_cl);
-+ _timer.stop();
-+ if (PrintCMSStatistics != 0) {
-+ gclog_or_tty->print_cr(
-+ "Finished young gen initial mark scan work in %dth thread: %3.3f sec",
-+ worker_id, _timer.seconds());
-+ }
-+ }
-+
-+ // ---------- remaining roots --------------
-+ _timer.reset();
-+ _timer.start();
-+ gch->gen_process_strong_roots(_collector->_cmsGen->level(),
-+ false, // yg was scanned above
-+ false, // this is parallel code
-+ true, // collecting perm gen
-+ SharedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
-+ &par_mri_cl,
-+ true, // walk all of code cache if (so & SO_CodeCache)
-+ NULL);
-+ assert(_collector->should_unload_classes()
-+ || (_collector->CMSCollector::roots_scanning_options() & SharedHeap::SO_CodeCache),
-+ "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
-+ _timer.stop();
-+ if (PrintCMSStatistics != 0) {
-+ gclog_or_tty->print_cr(
-+ "Finished remaining root initial mark scan work in %dth thread: %3.3f sec",
-+ worker_id, _timer.seconds());
-+ }
-+}
-+
- // Parallel remark task
--class CMSParRemarkTask: public AbstractGangTask {
-- CMSCollector* _collector;
-- int _n_workers;
-+class CMSParRemarkTask: public CMSParMarkTask {
- CompactibleFreeListSpace* _cms_space;
- CompactibleFreeListSpace* _perm_space;
-
-@@ -5126,10 +5252,9 @@
- CompactibleFreeListSpace* perm_space,
- int n_workers, FlexibleWorkGang* workers,
- OopTaskQueueSet* task_queues):
-- AbstractGangTask("Rescan roots and grey objects in parallel"),
-- _collector(collector),
-+ CMSParMarkTask("Rescan roots and grey objects in parallel",
-+ collector, n_workers),
- _cms_space(cms_space), _perm_space(perm_space),
-- _n_workers(n_workers),
- _task_queues(task_queues),
- _term(n_workers, task_queues) { }
-
-@@ -5143,11 +5268,6 @@
- void work(uint worker_id);
-
- private:
-- // Work method in support of parallel rescan ... of young gen spaces
-- void do_young_space_rescan(int i, Par_MarkRefsIntoAndScanClosure* cl,
-- ContiguousSpace* space,
-- HeapWord** chunk_array, size_t chunk_top);
--
- // ... of dirty cards in old space
- void do_dirty_card_rescan_tasks(CompactibleFreeListSpace* sp, int i,
- Par_MarkRefsIntoAndScanClosure* cl);
-@@ -5156,6 +5276,25 @@
- void do_work_steal(int i, Par_MarkRefsIntoAndScanClosure* cl, int* seed);
- };
-
-+void CMSParMarkTask::work_on_young_gen_roots(uint worker_id, OopsInGenClosure* cl) {
-+ DefNewGeneration* dng = _collector->_young_gen->as_DefNewGeneration();
-+ EdenSpace* eden_space = dng->eden();
-+ ContiguousSpace* from_space = dng->from();
-+ ContiguousSpace* to_space = dng->to();
-+
-+ HeapWord** eca = _collector->_eden_chunk_array;
-+ size_t ect = _collector->_eden_chunk_index;
-+ HeapWord** sca = _collector->_survivor_chunk_array;
-+ size_t sct = _collector->_survivor_chunk_index;
-+
-+ assert(ect <= _collector->_eden_chunk_capacity, "out of bounds");
-+ assert(sct <= _collector->_survivor_chunk_capacity, "out of bounds");
-+
-+ do_young_space_rescan(worker_id, cl, to_space, NULL, 0);
-+ do_young_space_rescan(worker_id, cl, from_space, sca, sct);
-+ do_young_space_rescan(worker_id, cl, eden_space, eca, ect);
-+}
-+
- // work_queue(i) is passed to the closure
- // Par_MarkRefsIntoAndScanClosure. The "i" parameter
- // also is passed to do_dirty_card_rescan_tasks() and to
-@@ -5180,23 +5319,7 @@
- // work first.
- // ---------- young gen roots --------------
- {
-- DefNewGeneration* dng = _collector->_young_gen->as_DefNewGeneration();
-- EdenSpace* eden_space = dng->eden();
-- ContiguousSpace* from_space = dng->from();
-- ContiguousSpace* to_space = dng->to();
--
-- HeapWord** eca = _collector->_eden_chunk_array;
-- size_t ect = _collector->_eden_chunk_index;
-- HeapWord** sca = _collector->_survivor_chunk_array;
-- size_t sct = _collector->_survivor_chunk_index;
--
-- assert(ect <= _collector->_eden_chunk_capacity, "out of bounds");
-- assert(sct <= _collector->_survivor_chunk_capacity, "out of bounds");
--
-- do_young_space_rescan(worker_id, &par_mrias_cl, to_space, NULL, 0);
-- do_young_space_rescan(worker_id, &par_mrias_cl, from_space, sca, sct);
-- do_young_space_rescan(worker_id, &par_mrias_cl, eden_space, eca, ect);
--
-+ work_on_young_gen_roots(worker_id, &par_mrias_cl);
- _timer.stop();
- if (PrintCMSStatistics != 0) {
- gclog_or_tty->print_cr(
-@@ -5257,8 +5380,8 @@
-
- // Note that parameter "i" is not used.
- void
--CMSParRemarkTask::do_young_space_rescan(int i,
-- Par_MarkRefsIntoAndScanClosure* cl, ContiguousSpace* space,
-+CMSParMarkTask::do_young_space_rescan(uint worker_id,
-+ OopsInGenClosure* cl, ContiguousSpace* space,
- HeapWord** chunk_array, size_t chunk_top) {
- // Until all tasks completed:
- // . claim an unclaimed task
-@@ -5454,6 +5577,32 @@
- "Else our work is not yet done");
- }
-
-+// Record object boundaries in _eden_chunk_array by sampling the eden
-+// top in the slow-path eden object allocation code path and record
-+// the boundaries, if CMSEdenChunksRecordAlways is true. If
-+// CMSEdenChunksRecordAlways is false, we use the other asynchronous
-+// sampling in sample_eden() that activates during the part of the
-+// preclean phase.
-+void CMSCollector::sample_eden_chunk() {
-+ if (CMSEdenChunksRecordAlways && _eden_chunk_array != NULL) {
-+ if (_eden_chunk_lock->try_lock()) {
-+ // Record a sample. This is the critical section. The contents
-+ // of the _eden_chunk_array have to be non-decreasing in the
-+ // address order.
-+ _eden_chunk_array[_eden_chunk_index] = *_top_addr;
-+ assert(_eden_chunk_array[_eden_chunk_index] <= *_end_addr,
-+ "Unexpected state of Eden");
-+ if (_eden_chunk_index == 0 ||
-+ ((_eden_chunk_array[_eden_chunk_index] > _eden_chunk_array[_eden_chunk_index-1]) &&
-+ (pointer_delta(_eden_chunk_array[_eden_chunk_index],
-+ _eden_chunk_array[_eden_chunk_index-1]) >= CMSSamplingGrain))) {
-+ _eden_chunk_index++; // commit sample
-+ }
-+ _eden_chunk_lock->unlock();
-+ }
-+ }
-+}
-+
- // Return a thread-local PLAB recording array, as appropriate.
- void* CMSCollector::get_data_recorder(int thr_num) {
- if (_survivor_plab_array != NULL &&
-@@ -5477,12 +5626,13 @@
-
- // Merge the per-thread plab arrays into the global survivor chunk
- // array which will provide the partitioning of the survivor space
--// for CMS rescan.
-+// for CMS initial scan and rescan.
- void CMSCollector::merge_survivor_plab_arrays(ContiguousSpace* surv,
- int no_of_gc_threads) {
- assert(_survivor_plab_array != NULL, "Error");
- assert(_survivor_chunk_array != NULL, "Error");
-- assert(_collectorState == FinalMarking, "Error");
-+ assert(_collectorState == FinalMarking ||
-+ (CMSParallelInitialMarkEnabled && _collectorState == InitialMarking), "Error");
- for (int j = 0; j < no_of_gc_threads; j++) {
- _cursor[j] = 0;
- }
-@@ -5545,7 +5695,7 @@
- }
-
- // Set up the space's par_seq_tasks structure for work claiming
--// for parallel rescan of young gen.
-+// for parallel initial scan and rescan of young gen.
- // See ParRescanTask where this is currently used.
- void
- CMSCollector::
-@@ -6695,6 +6845,28 @@
- void MarkRefsIntoClosure::do_oop(oop* p) { MarkRefsIntoClosure::do_oop_work(p); }
- void MarkRefsIntoClosure::do_oop(narrowOop* p) { MarkRefsIntoClosure::do_oop_work(p); }
-
-+Par_MarkRefsIntoClosure::Par_MarkRefsIntoClosure(
-+ MemRegion span, CMSBitMap* bitMap):
-+ _span(span),
-+ _bitMap(bitMap)
-+{
-+ assert(_ref_processor == NULL, "deliberately left NULL");
-+ assert(_bitMap->covers(_span), "_bitMap/_span mismatch");
-+}
-+
-+void Par_MarkRefsIntoClosure::do_oop(oop obj) {
-+ // if p points into _span, then mark corresponding bit in _markBitMap
-+ assert(obj->is_oop(), "expected an oop");
-+ HeapWord* addr = (HeapWord*)obj;
-+ if (_span.contains(addr)) {
-+ // this should be made more efficient
-+ _bitMap->par_mark(addr);
-+ }
-+}
-+
-+void Par_MarkRefsIntoClosure::do_oop(oop* p) { Par_MarkRefsIntoClosure::do_oop_work(p); }
-+void Par_MarkRefsIntoClosure::do_oop(narrowOop* p) { Par_MarkRefsIntoClosure::do_oop_work(p); }
-+
- // A variant of the above, used for CMS marking verification.
- MarkRefsIntoVerifyClosure::MarkRefsIntoVerifyClosure(
- MemRegion span, CMSBitMap* verification_bm, CMSBitMap* cms_bm):
-@@ -9360,7 +9532,6 @@
- return;
- }
- }
--
- // Transfer some number of overflown objects to usual marking
- // stack. Return true if some objects were transferred.
- bool MarkRefsIntoAndScanClosure::take_from_overflow_list() {
-@@ -9432,4 +9603,3 @@
- ShouldNotReachHere();
- }
- }
--
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -516,6 +516,8 @@
- friend class ConcurrentMarkSweepThread;
- friend class ConcurrentMarkSweepGeneration;
- friend class CompactibleFreeListSpace;
-+ friend class CMSParMarkTask;
-+ friend class CMSParInitialMarkTask;
- friend class CMSParRemarkTask;
- friend class CMSConcMarkingTask;
- friend class CMSRefProcTaskProxy;
-@@ -752,6 +754,7 @@
- Generation* _young_gen; // the younger gen
- HeapWord** _top_addr; // ... Top of Eden
- HeapWord** _end_addr; // ... End of Eden
-+ Mutex* _eden_chunk_lock;
- HeapWord** _eden_chunk_array; // ... Eden partitioning array
- size_t _eden_chunk_index; // ... top (exclusive) of array
- size_t _eden_chunk_capacity; // ... max entries in array
-@@ -953,6 +956,7 @@
-
- // Support for parallel remark of survivor space
- void* get_data_recorder(int thr_num);
-+ void sample_eden_chunk();
-
- CMSBitMap* markBitMap() { return &_markBitMap; }
- void directAllocated(HeapWord* start, size_t size);
-@@ -1013,7 +1017,7 @@
-
- // debugging
- void verify();
-- bool verify_after_remark();
-+ bool verify_after_remark(bool silent = VerifySilently);
- void verify_ok_to_terminate() const PRODUCT_RETURN;
- void verify_work_stacks_empty() const PRODUCT_RETURN;
- void verify_overflow_empty() const PRODUCT_RETURN;
-@@ -1031,6 +1035,8 @@
-
- // Initialization errors
- bool completed_initialization() { return _completed_initialization; }
-+
-+ void print_eden_and_survivor_chunk_arrays();
- };
-
- class CMSExpansionCause : public AllStatic {
-@@ -1317,6 +1323,10 @@
- //Delegate to collector
- return collector()->get_data_recorder(thr_num);
- }
-+ void sample_eden_chunk() {
-+ //Delegate to collector
-+ return collector()->sample_eden_chunk();
-+ }
-
- // Printing
- const char* name() const;
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2011, 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
-@@ -145,7 +145,7 @@
- );
- #endif /* USDT2 */
-
-- _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark", os::elapsed_counter());
-+ _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark");
-
- GenCollectedHeap* gch = GenCollectedHeap::heap();
- GCCauseSetter gccs(gch, GCCause::_cms_initial_mark);
-@@ -157,7 +157,7 @@
-
- VM_CMS_Operation::verify_after_gc();
-
-- _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
-+ _collector->_gc_timer_cm->register_gc_pause_end();
-
- #ifndef USDT2
- HS_DTRACE_PROBE(hs_private, cms__initmark__end);
-@@ -182,7 +182,7 @@
- );
- #endif /* USDT2 */
-
-- _collector->_gc_timer_cm->register_gc_pause_start("Final Mark", os::elapsed_counter());
-+ _collector->_gc_timer_cm->register_gc_pause_start("Final Mark");
-
- GenCollectedHeap* gch = GenCollectedHeap::heap();
- GCCauseSetter gccs(gch, GCCause::_cms_final_remark);
-@@ -195,7 +195,7 @@
- VM_CMS_Operation::verify_after_gc();
-
- _collector->save_heap_summary();
-- _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
-+ _collector->_gc_timer_cm->register_gc_pause_end();
-
- #ifndef USDT2
- HS_DTRACE_PROBE(hs_private, cms__remark__end);
---- ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -114,6 +114,14 @@
- }
- }
-
-+void ConcurrentG1Refine::worker_threads_do(ThreadClosure * tc) {
-+ if (_threads != NULL) {
-+ for (int i = 0; i < worker_thread_num(); i++) {
-+ tc->do_thread(_threads[i]);
-+ }
-+ }
-+}
-+
- int ConcurrentG1Refine::thread_num() {
- int n_threads = (G1ConcRefinementThreads > 0) ? G1ConcRefinementThreads
- : ParallelGCThreads;
-@@ -126,3 +134,7 @@
- st->cr();
- }
- }
-+
-+ConcurrentG1RefineThread * ConcurrentG1Refine::sampling_thread() const {
-+ return _threads[worker_thread_num()];
-+}
---- ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -35,6 +35,7 @@
- class G1CollectedHeap;
- class G1HotCardCache;
- class G1RemSet;
-+class DirtyCardQueue;
-
- class ConcurrentG1Refine: public CHeapObj<mtGC> {
- ConcurrentG1RefineThread** _threads;
-@@ -78,9 +79,15 @@
-
- void reinitialize_threads();
-
-- // Iterate over the conc refine threads
-+ // Iterate over all concurrent refinement threads
- void threads_do(ThreadClosure *tc);
-
-+ // Iterate over all worker refinement threads
-+ void worker_threads_do(ThreadClosure * tc);
-+
-+ // The RS sampling thread
-+ ConcurrentG1RefineThread * sampling_thread() const;
-+
- static int thread_num();
-
- void print_worker_threads_on(outputStream* st) const;
---- ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1154,10 +1154,9 @@
-
- if (VerifyDuringGC) {
- HandleMark hm; // handle scope
-- gclog_or_tty->print(" VerifyDuringGC:(before)");
- Universe::heap()->prepare_for_verify();
-- Universe::verify(/* silent */ false,
-- /* option */ VerifyOption_G1UsePrevMarking);
-+ Universe::verify(VerifyOption_G1UsePrevMarking,
-+ " VerifyDuringGC:(before)");
- }
-
- G1CollectorPolicy* g1p = g1h->g1_policy();
-@@ -1181,10 +1180,9 @@
- // Verify the heap w.r.t. the previous marking bitmap.
- if (VerifyDuringGC) {
- HandleMark hm; // handle scope
-- gclog_or_tty->print(" VerifyDuringGC:(overflow)");
- Universe::heap()->prepare_for_verify();
-- Universe::verify(/* silent */ false,
-- /* option */ VerifyOption_G1UsePrevMarking);
-+ Universe::verify(VerifyOption_G1UsePrevMarking,
-+ " VerifyDuringGC:(overflow)");
- }
-
- // Clear the marking state because we will be restarting
-@@ -1204,10 +1202,9 @@
-
- if (VerifyDuringGC) {
- HandleMark hm; // handle scope
-- gclog_or_tty->print(" VerifyDuringGC:(after)");
- Universe::heap()->prepare_for_verify();
-- Universe::verify(/* silent */ false,
-- /* option */ VerifyOption_G1UseNextMarking);
-+ Universe::verify(VerifyOption_G1UseNextMarking,
-+ " VerifyDuringGC:(after)");
- }
- assert(!restart_for_overflow(), "sanity");
- // Completely reset the marking state since marking completed
-@@ -1498,7 +1495,6 @@
- }
- };
-
--
- class G1ParVerifyFinalCountTask: public AbstractGangTask {
- protected:
- G1CollectedHeap* _g1h;
-@@ -1856,10 +1852,9 @@
-
- if (VerifyDuringGC) {
- HandleMark hm; // handle scope
-- gclog_or_tty->print(" VerifyDuringGC:(before)");
- Universe::heap()->prepare_for_verify();
-- Universe::verify(/* silent */ false,
-- /* option */ VerifyOption_G1UsePrevMarking);
-+ Universe::verify(VerifyOption_G1UsePrevMarking,
-+ " VerifyDuringGC:(before)");
- }
-
- G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
-@@ -2011,10 +2006,9 @@
-
- if (VerifyDuringGC) {
- HandleMark hm; // handle scope
-- gclog_or_tty->print(" VerifyDuringGC:(after)");
- Universe::heap()->prepare_for_verify();
-- Universe::verify(/* silent */ false,
-- /* option */ VerifyOption_G1UsePrevMarking);
-+ Universe::verify(VerifyOption_G1UsePrevMarking,
-+ " VerifyDuringGC:(after)");
- }
-
- g1h->verify_region_sets_optional();
-@@ -2412,10 +2406,9 @@
- assert(!rp->discovery_enabled(), "Post condition");
- }
-
-- // Now clean up stale oops in StringTable
-- StringTable::unlink(&g1_is_alive);
-- // Clean up unreferenced symbols in symbol table.
-- SymbolTable::unlink();
-+ g1h->unlink_string_and_symbol_table(&g1_is_alive,
-+ /* process_strings */ false, // currently strings are always roots
-+ /* process_symbols */ true);
- }
-
- void ConcurrentMark::swapMarkBitMaps() {
-@@ -4396,7 +4389,8 @@
- _total_used_bytes(0), _total_capacity_bytes(0),
- _total_prev_live_bytes(0), _total_next_live_bytes(0),
- _hum_used_bytes(0), _hum_capacity_bytes(0),
-- _hum_prev_live_bytes(0), _hum_next_live_bytes(0) {
-+ _hum_prev_live_bytes(0), _hum_next_live_bytes(0),
-+ _total_remset_bytes(0), _total_strong_code_roots_bytes(0) {
- G1CollectedHeap* g1h = G1CollectedHeap::heap();
- MemRegion g1_committed = g1h->g1_committed();
- MemRegion g1_reserved = g1h->g1_reserved();
-@@ -4414,23 +4408,29 @@
- HeapRegion::GrainBytes);
- _out->print_cr(G1PPRL_LINE_PREFIX);
- _out->print_cr(G1PPRL_LINE_PREFIX
-- G1PPRL_TYPE_H_FORMAT
-- G1PPRL_ADDR_BASE_H_FORMAT
-- G1PPRL_BYTE_H_FORMAT
-- G1PPRL_BYTE_H_FORMAT
-- G1PPRL_BYTE_H_FORMAT
-- G1PPRL_DOUBLE_H_FORMAT,
-- "type", "address-range",
-- "used", "prev-live", "next-live", "gc-eff");
-+ G1PPRL_TYPE_H_FORMAT
-+ G1PPRL_ADDR_BASE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT
-+ G1PPRL_DOUBLE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT,
-+ "type", "address-range",
-+ "used", "prev-live", "next-live", "gc-eff",
-+ "remset", "code-roots");
- _out->print_cr(G1PPRL_LINE_PREFIX
-- G1PPRL_TYPE_H_FORMAT
-- G1PPRL_ADDR_BASE_H_FORMAT
-- G1PPRL_BYTE_H_FORMAT
-- G1PPRL_BYTE_H_FORMAT
-- G1PPRL_BYTE_H_FORMAT
-- G1PPRL_DOUBLE_H_FORMAT,
-- "", "",
-- "(bytes)", "(bytes)", "(bytes)", "(bytes/ms)");
-+ G1PPRL_TYPE_H_FORMAT
-+ G1PPRL_ADDR_BASE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT
-+ G1PPRL_DOUBLE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT
-+ G1PPRL_BYTE_H_FORMAT,
-+ "", "",
-+ "(bytes)", "(bytes)", "(bytes)", "(bytes/ms)",
-+ "(bytes)", "(bytes)");
- }
-
- // It takes as a parameter a reference to one of the _hum_* fields, it
-@@ -4472,6 +4472,9 @@
- size_t prev_live_bytes = r->live_bytes();
- size_t next_live_bytes = r->next_live_bytes();
- double gc_eff = r->gc_efficiency();
-+ size_t remset_bytes = r->rem_set()->mem_size();
-+ size_t strong_code_roots_bytes = r->rem_set()->strong_code_roots_mem_size();
-+
- if (r->used() == 0) {
- type = "FREE";
- } else if (r->is_survivor()) {
-@@ -4505,6 +4508,8 @@
- _total_capacity_bytes += capacity_bytes;
- _total_prev_live_bytes += prev_live_bytes;
- _total_next_live_bytes += next_live_bytes;
-+ _total_remset_bytes += remset_bytes;
-+ _total_strong_code_roots_bytes += strong_code_roots_bytes;
-
- // Print a line for this particular region.
- _out->print_cr(G1PPRL_LINE_PREFIX
-@@ -4513,14 +4518,19 @@
- G1PPRL_BYTE_FORMAT
- G1PPRL_BYTE_FORMAT
- G1PPRL_BYTE_FORMAT
-- G1PPRL_DOUBLE_FORMAT,
-+ G1PPRL_DOUBLE_FORMAT
-+ G1PPRL_BYTE_FORMAT
-+ G1PPRL_BYTE_FORMAT,
- type, bottom, end,
-- used_bytes, prev_live_bytes, next_live_bytes, gc_eff);
-+ used_bytes, prev_live_bytes, next_live_bytes, gc_eff,
-+ remset_bytes, strong_code_roots_bytes);
-
- return false;
- }
-
- G1PrintRegionLivenessInfoClosure::~G1PrintRegionLivenessInfoClosure() {
-+ // add static memory usages to remembered set sizes
-+ _total_remset_bytes += HeapRegionRemSet::fl_mem_size() + HeapRegionRemSet::static_mem_size();
- // Print the footer of the output.
- _out->print_cr(G1PPRL_LINE_PREFIX);
- _out->print_cr(G1PPRL_LINE_PREFIX
-@@ -4528,13 +4538,17 @@
- G1PPRL_SUM_MB_FORMAT("capacity")
- G1PPRL_SUM_MB_PERC_FORMAT("used")
- G1PPRL_SUM_MB_PERC_FORMAT("prev-live")
-- G1PPRL_SUM_MB_PERC_FORMAT("next-live"),
-+ G1PPRL_SUM_MB_PERC_FORMAT("next-live")
-+ G1PPRL_SUM_MB_FORMAT("remset")
-+ G1PPRL_SUM_MB_FORMAT("code-roots"),
- bytes_to_mb(_total_capacity_bytes),
- bytes_to_mb(_total_used_bytes),
- perc(_total_used_bytes, _total_capacity_bytes),
- bytes_to_mb(_total_prev_live_bytes),
- perc(_total_prev_live_bytes, _total_capacity_bytes),
- bytes_to_mb(_total_next_live_bytes),
-- perc(_total_next_live_bytes, _total_capacity_bytes));
-+ perc(_total_next_live_bytes, _total_capacity_bytes),
-+ bytes_to_mb(_total_remset_bytes),
-+ bytes_to_mb(_total_strong_code_roots_bytes));
- _out->cr();
- }
---- ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1224,6 +1224,12 @@
- size_t _hum_prev_live_bytes;
- size_t _hum_next_live_bytes;
-
-+ // Accumulator for the remembered set size
-+ size_t _total_remset_bytes;
-+
-+ // Accumulator for strong code roots memory size
-+ size_t _total_strong_code_roots_bytes;
-+
- static double perc(size_t val, size_t total) {
- if (total == 0) {
- return 0.0;
---- ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2013-09-06 11:22:10.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -81,7 +81,7 @@
- size_t* marked_bytes_array,
- BitMap* task_card_bm) {
- G1CollectedHeap* g1h = _g1h;
-- CardTableModRefBS* ct_bs = (CardTableModRefBS*) (g1h->barrier_set());
-+ CardTableModRefBS* ct_bs = g1h->g1_barrier_set();
-
- HeapWord* start = mr.start();
- HeapWord* end = mr.end();
---- ./hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -65,9 +65,7 @@
- // threshold limit is no more than this.
- guarantee(G1ConcRSHotCardLimit <= max_jubyte, "sanity");
-
-- ModRefBarrierSet* bs = _g1h->mr_bs();
-- guarantee(bs->is_a(BarrierSet::CardTableModRef), "Precondition");
-- _ct_bs = (CardTableModRefBS*)bs;
-+ _ct_bs = _g1h->g1_barrier_set();
- _ct_bot = _ct_bs->byte_for_const(_g1h->reserved_region().start());
-
- // Allocate/Reserve the counts table
---- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -23,6 +23,7 @@
- */
-
- #include "precompiled.hpp"
-+#include "code/codeCache.hpp"
- #include "code/icBuffer.hpp"
- #include "gc_implementation/g1/bufferingOopClosure.hpp"
- #include "gc_implementation/g1/concurrentG1Refine.hpp"
-@@ -56,6 +57,7 @@
- #include "oops/oop.pcgc.inline.hpp"
- #include "runtime/aprofiler.hpp"
- #include "runtime/vmThread.hpp"
-+#include "utilities/ticks.hpp"
-
- size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0;
-
-@@ -125,10 +127,8 @@
- int _histo[256];
- public:
- ClearLoggedCardTableEntryClosure() :
-- _calls(0)
-+ _calls(0), _g1h(G1CollectedHeap::heap()), _ctbs(_g1h->g1_barrier_set())
- {
-- _g1h = G1CollectedHeap::heap();
-- _ctbs = (CardTableModRefBS*)_g1h->barrier_set();
- for (int i = 0; i < 256; i++) _histo[i] = 0;
- }
- bool do_card_ptr(jbyte* card_ptr, int worker_i) {
-@@ -158,11 +158,8 @@
- CardTableModRefBS* _ctbs;
- public:
- RedirtyLoggedCardTableEntryClosure() :
-- _calls(0)
-- {
-- _g1h = G1CollectedHeap::heap();
-- _ctbs = (CardTableModRefBS*)_g1h->barrier_set();
-- }
-+ _calls(0), _g1h(G1CollectedHeap::heap()), _ctbs(_g1h->g1_barrier_set()) {}
-+
- bool do_card_ptr(jbyte* card_ptr, int worker_i) {
- if (_g1h->is_in_reserved(_ctbs->addr_for(card_ptr))) {
- _calls++;
-@@ -477,7 +474,7 @@
-
- void G1CollectedHeap::check_ct_logs_at_safepoint() {
- DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
-- CardTableModRefBS* ct_bs = (CardTableModRefBS*)barrier_set();
-+ CardTableModRefBS* ct_bs = g1_barrier_set();
-
- // Count the dirty cards at the start.
- CountNonCleanMemRegionClosure count1(this);
-@@ -1158,26 +1155,33 @@
- ModRefBarrierSet* _mr_bs;
- public:
- PostMCRemSetClearClosure(G1CollectedHeap* g1h, ModRefBarrierSet* mr_bs) :
-- _g1h(g1h), _mr_bs(mr_bs) { }
-+ _g1h(g1h), _mr_bs(mr_bs) {}
-+
- bool doHeapRegion(HeapRegion* r) {
-+ HeapRegionRemSet* hrrs = r->rem_set();
-+
- if (r->continuesHumongous()) {
-+ // We'll assert that the strong code root list and RSet is empty
-+ assert(hrrs->strong_code_roots_list_length() == 0, "sanity");
-+ assert(hrrs->occupied() == 0, "RSet should be empty");
- return false;
- }
-+
- _g1h->reset_gc_time_stamps(r);
-- HeapRegionRemSet* hrrs = r->rem_set();
-- if (hrrs != NULL) hrrs->clear();
-+ hrrs->clear();
- // You might think here that we could clear just the cards
- // corresponding to the used region. But no: if we leave a dirty card
- // in a region we might allocate into, then it would prevent that card
- // from being enqueued, and cause it to be missed.
- // Re: the performance cost: we shouldn't be doing full GC anyway!
- _mr_bs->clear(MemRegion(r->bottom(), r->end()));
-+
- return false;
- }
- };
-
- void G1CollectedHeap::clear_rsets_post_compaction() {
-- PostMCRemSetClearClosure rs_clear(this, mr_bs());
-+ PostMCRemSetClearClosure rs_clear(this, g1_barrier_set());
- heap_region_iterate(&rs_clear);
- }
-
-@@ -1251,31 +1255,6 @@
- heap_region_iterate(&cl);
- }
-
--double G1CollectedHeap::verify(bool guard, const char* msg) {
-- double verify_time_ms = 0.0;
--
-- if (guard && total_collections() >= VerifyGCStartAt) {
-- double verify_start = os::elapsedTime();
-- HandleMark hm; // Discard invalid handles created during verification
-- gclog_or_tty->print(msg);
-- prepare_for_verify();
-- Universe::verify(false /* silent */, VerifyOption_G1UsePrevMarking);
-- verify_time_ms = (os::elapsedTime() - verify_start) * 1000;
-- }
--
-- return verify_time_ms;
--}
--
--void G1CollectedHeap::verify_before_gc() {
-- double verify_time_ms = verify(VerifyBeforeGC, " VerifyBeforeGC:");
-- g1_policy()->phase_times()->record_verify_before_time_ms(verify_time_ms);
--}
--
--void G1CollectedHeap::verify_after_gc() {
-- double verify_time_ms = verify(VerifyAfterGC, " VerifyAfterGC:");
-- g1_policy()->phase_times()->record_verify_after_time_ms(verify_time_ms);
--}
--
- bool G1CollectedHeap::do_collection(bool explicit_gc,
- bool clear_all_soft_refs,
- size_t word_size) {
-@@ -1286,7 +1265,7 @@
- }
-
- STWGCTimer* gc_timer = G1MarkSweep::gc_timer();
-- gc_timer->register_gc_start(os::elapsed_counter());
-+ gc_timer->register_gc_start();
-
- SerialOldTracer* gc_tracer = G1MarkSweep::gc_tracer();
- gc_tracer->report_gc_start(gc_cause(), gc_timer->gc_start());
-@@ -1408,8 +1387,6 @@
-
- MemoryService::track_memory_usage();
-
-- verify_after_gc();
--
- assert(!ref_processor_stw()->discovery_enabled(), "Postcondition");
- ref_processor_stw()->verify_no_references_recorded();
-
-@@ -1482,6 +1459,9 @@
- heap_region_iterate(&rebuild_rs);
- }
-
-+ // Rebuild the strong code root lists for each region
-+ rebuild_strong_code_roots();
-+
- if (true) { // FIXME
- // Ask the permanent generation to adjust size for full collections
- perm()->compute_new_size();
-@@ -1509,6 +1489,8 @@
- _hrs.verify_optional();
- verify_region_sets_optional();
-
-+ verify_after_gc();
-+
- // Start a new incremental collection set for the next pause
- assert(g1_policy()->collection_set() == NULL, "must be");
- g1_policy()->start_incremental_cset_building();
-@@ -1546,8 +1528,7 @@
- post_full_gc_dump(gc_timer);
- }
-
-- gc_timer->register_gc_end(os::elapsed_counter());
--
-+ gc_timer->register_gc_end();
- gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
-
- return true;
-@@ -1568,8 +1549,6 @@
- void
- G1CollectedHeap::
- resize_if_necessary_after_full_collection(size_t word_size) {
-- assert(MinHeapFreeRatio <= MaxHeapFreeRatio, "sanity check");
--
- // Include the current allocation, if any, and bytes that will be
- // pre-allocated to support collections, as "used".
- const size_t used_after_gc = used();
-@@ -2002,10 +1981,12 @@
-
- size_t init_byte_size = collector_policy()->initial_heap_byte_size();
- size_t max_byte_size = collector_policy()->max_heap_byte_size();
-+ size_t heap_alignment = collector_policy()->max_alignment();
-
- // Ensure that the sizes are properly aligned.
- Universe::check_alignment(init_byte_size, HeapRegion::GrainBytes, "g1 heap");
- Universe::check_alignment(max_byte_size, HeapRegion::GrainBytes, "g1 heap");
-+ Universe::check_alignment(max_byte_size, heap_alignment, "g1 heap");
-
- _cg1r = new ConcurrentG1Refine(this);
-
-@@ -2029,14 +2010,14 @@
- size_t total_reserved = 0;
-
- total_reserved = add_and_check_overflow(total_reserved, max_byte_size);
-- size_t pg_max_size = (size_t) align_size_up(pgs->max_size(), HeapRegion::GrainBytes);
-+ size_t pg_max_size = (size_t) align_size_up(pgs->max_size(), heap_alignment);
- total_reserved = add_and_check_overflow(total_reserved, pg_max_size);
-
- Universe::check_alignment(total_reserved, HeapRegion::GrainBytes, "g1 heap and perm");
-
-- char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
-+ char* addr = Universe::preferred_heap_base(total_reserved, heap_alignment, Universe::UnscaledNarrowOop);
-
-- ReservedHeapSpace heap_rs(total_reserved, HeapRegion::GrainBytes,
-+ ReservedHeapSpace heap_rs(total_reserved, heap_alignment,
- UseLargePages, addr);
-
- if (UseCompressedOops) {
-@@ -2044,17 +2025,17 @@
- // Failed to reserve at specified address - the requested memory
- // region is taken already, for example, by 'java' launcher.
- // Try again to reserver heap higher.
-- addr = Universe::preferred_heap_base(total_reserved, Universe::ZeroBasedNarrowOop);
-+ addr = Universe::preferred_heap_base(total_reserved, heap_alignment, Universe::ZeroBasedNarrowOop);
-
-- ReservedHeapSpace heap_rs0(total_reserved, HeapRegion::GrainBytes,
-+ ReservedHeapSpace heap_rs0(total_reserved, heap_alignment,
- UseLargePages, addr);
-
- if (addr != NULL && !heap_rs0.is_reserved()) {
- // Failed to reserve at specified address again - give up.
-- addr = Universe::preferred_heap_base(total_reserved, Universe::HeapBasedNarrowOop);
-+ addr = Universe::preferred_heap_base(total_reserved, heap_alignment, Universe::HeapBasedNarrowOop);
- assert(addr == NULL, "");
-
-- ReservedHeapSpace heap_rs1(total_reserved, HeapRegion::GrainBytes,
-+ ReservedHeapSpace heap_rs1(total_reserved, heap_alignment,
- UseLargePages, addr);
- heap_rs = heap_rs1;
- } else {
-@@ -2080,20 +2061,13 @@
- // Create the gen rem set (and barrier set) for the entire reserved region.
- _rem_set = collector_policy()->create_rem_set(_reserved, 2);
- set_barrier_set(rem_set()->bs());
-- if (barrier_set()->is_a(BarrierSet::ModRef)) {
-- _mr_bs = (ModRefBarrierSet*)_barrier_set;
-- } else {
-- vm_exit_during_initialization("G1 requires a mod ref bs.");
-+ if (!barrier_set()->is_a(BarrierSet::G1SATBCTLogging)) {
-+ vm_exit_during_initialization("G1 requires a G1SATBLoggingCardTableModRefBS");
- return JNI_ENOMEM;
- }
-
- // Also create a G1 rem set.
-- if (mr_bs()->is_a(BarrierSet::CardTableModRef)) {
-- _g1_rem_set = new G1RemSet(this, (CardTableModRefBS*)mr_bs());
-- } else {
-- vm_exit_during_initialization("G1 requires a cardtable mod ref bs.");
-- return JNI_ENOMEM;
-- }
-+ _g1_rem_set = new G1RemSet(this, g1_barrier_set());
-
- // Carve out the G1 part of the heap.
-
-@@ -2517,7 +2491,7 @@
- FullGCCount_lock->notify_all();
- }
-
--void G1CollectedHeap::register_concurrent_cycle_start(jlong start_time) {
-+void G1CollectedHeap::register_concurrent_cycle_start(const Ticks& start_time) {
- _concurrent_cycle_started = true;
- _gc_timer_cm->register_gc_start(start_time);
-
-@@ -2527,7 +2501,7 @@
-
- void G1CollectedHeap::register_concurrent_cycle_end() {
- if (_concurrent_cycle_started) {
-- _gc_timer_cm->register_gc_end(os::elapsed_counter());
-+ _gc_timer_cm->register_gc_end();
-
- if (_cm->has_aborted()) {
- _gc_tracer_cm->report_concurrent_mode_failure();
-@@ -3161,6 +3135,119 @@
- return NULL; // keep some compilers happy
- }
-
-+// TODO: VerifyRootsClosure extends OopsInGenClosure so that we can
-+// pass it as the perm_blk to SharedHeap::process_strong_roots.
-+// When process_strong_roots stop calling perm_blk->younger_refs_iterate
-+// we can change this closure to extend the simpler OopClosure.
-+class VerifyRootsClosure: public OopsInGenClosure {
-+private:
-+ G1CollectedHeap* _g1h;
-+ VerifyOption _vo;
-+ bool _failures;
-+public:
-+ // _vo == UsePrevMarking -> use "prev" marking information,
-+ // _vo == UseNextMarking -> use "next" marking information,
-+ // _vo == UseMarkWord -> use mark word from object header.
-+ VerifyRootsClosure(VerifyOption vo) :
-+ _g1h(G1CollectedHeap::heap()),
-+ _vo(vo),
-+ _failures(false) { }
-+
-+ bool failures() { return _failures; }
-+
-+ template <class T> void do_oop_nv(T* p) {
-+ T heap_oop = oopDesc::load_heap_oop(p);
-+ if (!oopDesc::is_null(heap_oop)) {
-+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-+ if (_g1h->is_obj_dead_cond(obj, _vo)) {
-+ gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
-+ "points to dead obj "PTR_FORMAT, p, (void*) obj);
-+ if (_vo == VerifyOption_G1UseMarkWord) {
-+ gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark()));
-+ }
-+ obj->print_on(gclog_or_tty);
-+ _failures = true;
-+ }
-+ }
-+ }
-+
-+ void do_oop(oop* p) { do_oop_nv(p); }
-+ void do_oop(narrowOop* p) { do_oop_nv(p); }
-+};
-+
-+class G1VerifyCodeRootOopClosure: public OopsInGenClosure {
-+ G1CollectedHeap* _g1h;
-+ OopClosure* _root_cl;
-+ nmethod* _nm;
-+ VerifyOption _vo;
-+ bool _failures;
-+
-+ template <class T> void do_oop_work(T* p) {
-+ // First verify that this root is live
-+ _root_cl->do_oop(p);
-+
-+ if (!G1VerifyHeapRegionCodeRoots) {
-+ // We're not verifying the code roots attached to heap region.
-+ return;
-+ }
-+
-+ // Don't check the code roots during marking verification in a full GC
-+ if (_vo == VerifyOption_G1UseMarkWord) {
-+ return;
-+ }
-+
-+ // Now verify that the current nmethod (which contains p) is
-+ // in the code root list of the heap region containing the
-+ // object referenced by p.
-+
-+ T heap_oop = oopDesc::load_heap_oop(p);
-+ if (!oopDesc::is_null(heap_oop)) {
-+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-+
-+ if (_g1h->is_in_g1_reserved(obj)) {
-+ // Now fetch the region containing the object
-+ HeapRegion* hr = _g1h->heap_region_containing(obj);
-+ HeapRegionRemSet* hrrs = hr->rem_set();
-+ // Verify that the strong code root list for this region
-+ // contains the nmethod
-+ if (!hrrs->strong_code_roots_list_contains(_nm)) {
-+ gclog_or_tty->print_cr("Code root location "PTR_FORMAT" "
-+ "from nmethod "PTR_FORMAT" not in strong "
-+ "code roots for region ["PTR_FORMAT","PTR_FORMAT")",
-+ p, _nm, hr->bottom(), hr->end());
-+ _failures = true;
-+ }
-+ }
-+ }
-+ }
-+
-+public:
-+ G1VerifyCodeRootOopClosure(G1CollectedHeap* g1h, OopClosure* root_cl, VerifyOption vo):
-+ _g1h(g1h), _root_cl(root_cl), _vo(vo), _nm(NULL), _failures(false) {}
-+
-+ void do_oop(oop* p) { do_oop_work(p); }
-+ void do_oop(narrowOop* p) { do_oop_work(p); }
-+
-+ void set_nmethod(nmethod* nm) { _nm = nm; }
-+ bool failures() { return _failures; }
-+};
-+
-+class G1VerifyCodeRootBlobClosure: public CodeBlobClosure {
-+ G1VerifyCodeRootOopClosure* _oop_cl;
-+
-+public:
-+ G1VerifyCodeRootBlobClosure(G1VerifyCodeRootOopClosure* oop_cl):
-+ _oop_cl(oop_cl) {}
-+
-+ void do_code_blob(CodeBlob* cb) {
-+ nmethod* nm = cb->as_nmethod_or_null();
-+ if (nm != NULL) {
-+ _oop_cl->set_nmethod(nm);
-+ nm->oops_do(_oop_cl);
-+ }
-+ }
-+};
-+
- class VerifyLivenessOopClosure: public OopClosure {
- G1CollectedHeap* _g1h;
- VerifyOption _vo;
-@@ -3294,42 +3381,6 @@
- }
- };
-
--class VerifyRootsClosure: public OopsInGenClosure {
--private:
-- G1CollectedHeap* _g1h;
-- VerifyOption _vo;
-- bool _failures;
--public:
-- // _vo == UsePrevMarking -> use "prev" marking information,
-- // _vo == UseNextMarking -> use "next" marking information,
-- // _vo == UseMarkWord -> use mark word from object header.
-- VerifyRootsClosure(VerifyOption vo) :
-- _g1h(G1CollectedHeap::heap()),
-- _vo(vo),
-- _failures(false) { }
--
-- bool failures() { return _failures; }
--
-- template <class T> void do_oop_nv(T* p) {
-- T heap_oop = oopDesc::load_heap_oop(p);
-- if (!oopDesc::is_null(heap_oop)) {
-- oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-- if (_g1h->is_obj_dead_cond(obj, _vo)) {
-- gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
-- "points to dead obj "PTR_FORMAT, p, (void*) obj);
-- if (_vo == VerifyOption_G1UseMarkWord) {
-- gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark()));
-- }
-- obj->print_on(gclog_or_tty);
-- _failures = true;
-- }
-- }
-- }
--
-- void do_oop(oop* p) { do_oop_nv(p); }
-- void do_oop(narrowOop* p) { do_oop_nv(p); }
--};
--
- // This is the task used for parallel heap verification.
-
- class G1ParVerifyTask: public AbstractGangTask {
-@@ -3364,21 +3415,16 @@
- }
- };
-
--void G1CollectedHeap::verify(bool silent) {
-- verify(silent, VerifyOption_G1UsePrevMarking);
--}
--
--void G1CollectedHeap::verify(bool silent,
-- VerifyOption vo) {
-+void G1CollectedHeap::verify(bool silent, VerifyOption vo) {
- if (SafepointSynchronize::is_at_safepoint()) {
-- if (!silent) { gclog_or_tty->print("Roots (excluding permgen) "); }
-- VerifyRootsClosure rootsCl(vo);
--
- assert(Thread::current()->is_VM_thread(),
- "Expected to be executed serially by the VM thread at this point");
-
-- CodeBlobToOopClosure blobsCl(&rootsCl, /*do_marking=*/ false);
-+ if (!silent) { gclog_or_tty->print("Roots (excluding permgen) "); }
-+ VerifyRootsClosure rootsCl(vo);
-
-+ G1VerifyCodeRootOopClosure codeRootsCl(this, &rootsCl, vo);
-+ G1VerifyCodeRootBlobClosure blobsCl(&codeRootsCl);
- // We apply the relevant closures to all the oops in the
- // system dictionary, the string table and the code cache.
- const int so = SO_AllClasses | SO_Strings | SO_CodeCache;
-@@ -3473,6 +3519,34 @@
- }
- }
-
-+void G1CollectedHeap::verify(bool silent) {
-+ verify(silent, VerifyOption_G1UsePrevMarking);
-+}
-+
-+double G1CollectedHeap::verify(bool guard, const char* msg) {
-+ double verify_time_ms = 0.0;
-+
-+ if (guard && total_collections() >= VerifyGCStartAt) {
-+ double verify_start = os::elapsedTime();
-+ HandleMark hm; // Discard invalid handles created during verification
-+ prepare_for_verify();
-+ Universe::verify(VerifyOption_G1UsePrevMarking, msg);
-+ verify_time_ms = (os::elapsedTime() - verify_start) * 1000;
-+ }
-+
-+ return verify_time_ms;
-+}
-+
-+void G1CollectedHeap::verify_before_gc() {
-+ double verify_time_ms = verify(VerifyBeforeGC, " VerifyBeforeGC:");
-+ g1_policy()->phase_times()->record_verify_before_time_ms(verify_time_ms);
-+}
-+
-+void G1CollectedHeap::verify_after_gc() {
-+ double verify_time_ms = verify(VerifyAfterGC, " VerifyAfterGC:");
-+ g1_policy()->phase_times()->record_verify_after_time_ms(verify_time_ms);
-+}
-+
- class PrintRegionClosure: public HeapRegionClosure {
- outputStream* _st;
- public:
-@@ -3616,9 +3690,22 @@
- AllocationProfiler::iterate_since_last_gc();
- // Fill TLAB's and such
- ensure_parsability(true);
-+
-+ if (G1SummarizeRSetStats && (G1SummarizeRSetStatsPeriod > 0) &&
-+ (total_collections() % G1SummarizeRSetStatsPeriod == 0)) {
-+ g1_rem_set()->print_periodic_summary_info("Before GC RS summary");
-+ }
- }
-
- void G1CollectedHeap::gc_epilogue(bool full /* Ignored */) {
-+
-+ if (G1SummarizeRSetStats &&
-+ (G1SummarizeRSetStatsPeriod > 0) &&
-+ // we are at the end of the GC. Total collections has already been increased.
-+ ((total_collections() - 1) % G1SummarizeRSetStatsPeriod == 0)) {
-+ g1_rem_set()->print_periodic_summary_info("After GC RS summary");
-+ }
-+
- // FIXME: what is this about?
- // I'm ignoring the "fill_newgen()" call if "alloc_event_enabled"
- // is set.
-@@ -3815,7 +3902,7 @@
- return false;
- }
-
-- _gc_timer_stw->register_gc_start(os::elapsed_counter());
-+ _gc_timer_stw->register_gc_start();
-
- _gc_tracer_stw->report_gc_start(gc_cause(), _gc_timer_stw->gc_start());
-
-@@ -3880,8 +3967,9 @@
- append_secondary_free_list_if_not_empty_with_lock();
- }
-
-- assert(check_young_list_well_formed(),
-- "young list should be well formed");
-+ assert(check_young_list_well_formed(), "young list should be well formed");
-+ assert(check_heap_region_claim_values(HeapRegion::InitialClaimValue),
-+ "sanity check");
-
- // Don't dynamically change the number of GC threads this early. A value of
- // 0 is used to indicate serial work. When parallel work is done,
-@@ -4193,15 +4281,10 @@
-
- _gc_tracer_stw->report_evacuation_info(&evacuation_info);
- _gc_tracer_stw->report_tenuring_threshold(_g1_policy->tenuring_threshold());
-- _gc_timer_stw->register_gc_end(os::elapsed_counter());
-+ _gc_timer_stw->register_gc_end();
- _gc_tracer_stw->report_gc_end(_gc_timer_stw->gc_end(), _gc_timer_stw->time_partitions());
- }
-
-- if (G1SummarizeRSetStats &&
-- (G1SummarizeRSetStatsPeriod > 0) &&
-- (total_collections() % G1SummarizeRSetStatsPeriod == 0)) {
-- g1_rem_set()->print_summary_info();
-- }
- // It should now be safe to tell the concurrent mark thread to start
- // without its logging output interfering with the logging output
- // that came from the pause.
-@@ -4482,7 +4565,7 @@
- : _g1h(g1h),
- _refs(g1h->task_queue(queue_num)),
- _dcq(&g1h->dirty_card_queue_set()),
-- _ct_bs((CardTableModRefBS*)_g1h->barrier_set()),
-+ _ct_bs(g1h->g1_barrier_set()),
- _g1_rem(g1h->g1_rem_set()),
- _hash_seed(17), _queue_num(queue_num),
- _term_attempts(0),
-@@ -4975,7 +5058,8 @@
- scan_root_cl,
- &push_heap_rs_cl,
- scan_perm_cl,
-- worker_id);
-+ worker_id,
-+ /* manages_code_roots */ true);
- pss.end_strong_roots();
-
- {
-@@ -5009,67 +5093,6 @@
-
- // *** Common G1 Evacuation Stuff
-
--// Closures that support the filtering of CodeBlobs scanned during
--// external root scanning.
--
--// Closure applied to reference fields in code blobs (specifically nmethods)
--// to determine whether an nmethod contains references that point into
--// the collection set. Used as a predicate when walking code roots so
--// that only nmethods that point into the collection set are added to the
--// 'marked' list.
--
--class G1FilteredCodeBlobToOopClosure : public CodeBlobToOopClosure {
--
-- class G1PointsIntoCSOopClosure : public OopClosure {
-- G1CollectedHeap* _g1;
-- bool _points_into_cs;
-- public:
-- G1PointsIntoCSOopClosure(G1CollectedHeap* g1) :
-- _g1(g1), _points_into_cs(false) { }
--
-- bool points_into_cs() const { return _points_into_cs; }
--
-- template <class T>
-- void do_oop_nv(T* p) {
-- if (!_points_into_cs) {
-- T heap_oop = oopDesc::load_heap_oop(p);
-- if (!oopDesc::is_null(heap_oop) &&
-- _g1->in_cset_fast_test(oopDesc::decode_heap_oop_not_null(heap_oop))) {
-- _points_into_cs = true;
-- }
-- }
-- }
--
-- virtual void do_oop(oop* p) { do_oop_nv(p); }
-- virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
-- };
--
-- G1CollectedHeap* _g1;
--
--public:
-- G1FilteredCodeBlobToOopClosure(G1CollectedHeap* g1, OopClosure* cl) :
-- CodeBlobToOopClosure(cl, true), _g1(g1) { }
--
-- virtual void do_code_blob(CodeBlob* cb) {
-- nmethod* nm = cb->as_nmethod_or_null();
-- if (nm != NULL && !(nm->test_oops_do_mark())) {
-- G1PointsIntoCSOopClosure predicate_cl(_g1);
-- nm->oops_do(&predicate_cl);
--
-- if (predicate_cl.points_into_cs()) {
-- // At least one of the reference fields or the oop relocations
-- // in the nmethod points into the collection set. We have to
-- // 'mark' this nmethod.
-- // Note: Revisit the following if CodeBlobToOopClosure::do_code_blob()
-- // or MarkingCodeBlobClosure::do_code_blob() change.
-- if (!nm->test_set_oops_do_mark()) {
-- do_newly_marked_nmethod(nm);
-- }
-- }
-- }
-- }
--};
--
- // This method is run in a GC worker.
-
- void
-@@ -5079,7 +5102,8 @@
- OopClosure* scan_non_heap_roots,
- OopsInHeapRegionClosure* scan_rs,
- OopsInGenClosure* scan_perm,
-- int worker_i) {
-+ int worker_i,
-+ bool manages_code_roots) {
-
- // First scan the strong roots, including the perm gen.
- double ext_roots_start = os::elapsedTime();
-@@ -5089,15 +5113,17 @@
- BufferingOopsInGenClosure buf_scan_perm(scan_perm);
- buf_scan_perm.set_generation(perm_gen());
-
-- // Walk the code cache w/o buffering, because StarTask cannot handle
-- // unaligned oop locations.
-- G1FilteredCodeBlobToOopClosure eager_scan_code_roots(this, scan_non_heap_roots);
-+ assert(so & SO_CodeCache || scan_rs != NULL, "must scan code roots somehow");
-+ // Walk the code cache/strong code roots w/o buffering, because StarTask
-+ // cannot handle unaligned oop locations.
-+ CodeBlobToOopClosure eager_scan_code_roots(scan_non_heap_roots, true /* do_marking */);
-
- process_strong_roots(false, // no scoping; this is parallel code
- collecting_perm_gen, so,
- &buf_scan_non_heap_roots,
- &eager_scan_code_roots,
-- &buf_scan_perm);
-+ &buf_scan_perm,
-+ manages_code_roots);
-
- // Now the CM ref_processor roots.
- if (!_process_strong_tasks->is_task_claimed(G1H_PS_refProcessor_oops_do)) {
-@@ -5136,9 +5162,22 @@
- }
- g1_policy()->phase_times()->record_satb_filtering_time(worker_i, satb_filtering_ms);
-
-+ // If this is an initial mark pause, and we're not scanning
-+ // the entire code cache, we need to mark the oops in the
-+ // strong code root lists for the regions that are not in
-+ // the collection set.
-+ // Note all threads participate in this set of root tasks.
-+ double mark_strong_code_roots_ms = 0.0;
-+ if (g1_policy()->during_initial_mark_pause() && !(so & SO_CodeCache)) {
-+ double mark_strong_roots_start = os::elapsedTime();
-+ mark_strong_code_roots(worker_i);
-+ mark_strong_code_roots_ms = (os::elapsedTime() - mark_strong_roots_start) * 1000.0;
-+ }
-+ g1_policy()->phase_times()->record_strong_code_root_mark_time(worker_i, mark_strong_code_roots_ms);
-+
- // Now scan the complement of the collection set.
- if (scan_rs != NULL) {
-- g1_rem_set()->oops_into_collection_set_do(scan_rs, worker_i);
-+ g1_rem_set()->oops_into_collection_set_do(scan_rs, &eager_scan_code_roots, worker_i);
- }
-
- _process_strong_tasks->all_tasks_completed();
-@@ -5151,6 +5190,102 @@
- SharedHeap::process_weak_roots(root_closure, &roots_in_blobs, non_root_closure);
- }
-
-+class G1StringSymbolTableUnlinkTask : public AbstractGangTask {
-+private:
-+ BoolObjectClosure* _is_alive;
-+ int _initial_string_table_size;
-+ int _initial_symbol_table_size;
-+
-+ bool _process_strings;
-+ int _strings_processed;
-+ int _strings_removed;
-+
-+ bool _process_symbols;
-+ int _symbols_processed;
-+ int _symbols_removed;
-+
-+ bool _do_in_parallel;
-+public:
-+ G1StringSymbolTableUnlinkTask(BoolObjectClosure* is_alive, bool process_strings, bool process_symbols) :
-+ AbstractGangTask("Par String/Symbol table unlink"), _is_alive(is_alive),
-+ _do_in_parallel(G1CollectedHeap::use_parallel_gc_threads()),
-+ _process_strings(process_strings), _strings_processed(0), _strings_removed(0),
-+ _process_symbols(process_symbols), _symbols_processed(0), _symbols_removed(0) {
-+
-+ _initial_string_table_size = StringTable::the_table()->table_size();
-+ _initial_symbol_table_size = SymbolTable::the_table()->table_size();
-+ if (process_strings) {
-+ StringTable::clear_parallel_claimed_index();
-+ }
-+ if (process_symbols) {
-+ SymbolTable::clear_parallel_claimed_index();
-+ }
-+ }
-+
-+ ~G1StringSymbolTableUnlinkTask() {
-+ guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size,
-+ err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT,
-+ StringTable::parallel_claimed_index(), _initial_string_table_size));
-+ guarantee(!_process_symbols || !_do_in_parallel || SymbolTable::parallel_claimed_index() >= _initial_symbol_table_size,
-+ err_msg("claim value "INT32_FORMAT" after unlink less than initial symbol table size "INT32_FORMAT,
-+ SymbolTable::parallel_claimed_index(), _initial_symbol_table_size));
-+ }
-+
-+ void work(uint worker_id) {
-+ if (_do_in_parallel) {
-+ int strings_processed = 0;
-+ int strings_removed = 0;
-+ int symbols_processed = 0;
-+ int symbols_removed = 0;
-+ if (_process_strings) {
-+ StringTable::possibly_parallel_unlink(_is_alive, &strings_processed, &strings_removed);
-+ Atomic::add(strings_processed, &_strings_processed);
-+ Atomic::add(strings_removed, &_strings_removed);
-+ }
-+ if (_process_symbols) {
-+ SymbolTable::possibly_parallel_unlink(&symbols_processed, &symbols_removed);
-+ Atomic::add(symbols_processed, &_symbols_processed);
-+ Atomic::add(symbols_removed, &_symbols_removed);
-+ }
-+ } else {
-+ if (_process_strings) {
-+ StringTable::unlink(_is_alive, &_strings_processed, &_strings_removed);
-+ }
-+ if (_process_symbols) {
-+ SymbolTable::unlink(&_symbols_processed, &_symbols_removed);
-+ }
-+ }
-+ }
-+
-+ size_t strings_processed() const { return (size_t)_strings_processed; }
-+ size_t strings_removed() const { return (size_t)_strings_removed; }
-+
-+ size_t symbols_processed() const { return (size_t)_symbols_processed; }
-+ size_t symbols_removed() const { return (size_t)_symbols_removed; }
-+};
-+
-+void G1CollectedHeap::unlink_string_and_symbol_table(BoolObjectClosure* is_alive,
-+ bool process_strings, bool process_symbols) {
-+ uint n_workers = (G1CollectedHeap::use_parallel_gc_threads() ?
-+ _g1h->workers()->active_workers() : 1);
-+
-+ G1StringSymbolTableUnlinkTask g1_unlink_task(is_alive, process_strings, process_symbols);
-+ if (G1CollectedHeap::use_parallel_gc_threads()) {
-+ set_par_threads(n_workers);
-+ workers()->run_task(&g1_unlink_task);
-+ set_par_threads(0);
-+ } else {
-+ g1_unlink_task.work(0);
-+ }
-+ if (G1TraceStringSymbolTableScrubbing) {
-+ gclog_or_tty->print_cr("Cleaned string and symbol table, "
-+ "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, "
-+ "symbols: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed",
-+ g1_unlink_task.strings_processed(), g1_unlink_task.strings_removed(),
-+ g1_unlink_task.symbols_processed(), g1_unlink_task.symbols_removed());
-+ }
-+}
-+
- // Weak Reference Processing support
-
- // An always "is_alive" closure that is used to preserve referents.
-@@ -5761,9 +5896,6 @@
- process_discovered_references(n_workers);
-
- // Weak root processing.
-- // Note: when JSR 292 is enabled and code blobs can contain
-- // non-perm oops then we will need to process the code blobs
-- // here too.
- {
- G1STWIsAliveClosure is_alive(this);
- G1KeepAliveClosure keep_alive(this);
-@@ -5779,6 +5911,17 @@
- hot_card_cache->reset_hot_cache();
- hot_card_cache->set_use_cache(true);
-
-+ // Migrate the strong code roots attached to each region in
-+ // the collection set. Ideally we would like to do this
-+ // after we have finished the scanning/evacuation of the
-+ // strong code roots for a particular heap region.
-+ migrate_strong_code_roots();
-+
-+ if (g1_policy()->during_initial_mark_pause()) {
-+ // Reset the claim values set during marking the strong code roots
-+ reset_heap_region_claim_values();
-+ }
-+
- finalize_for_evac_failure();
-
- if (evacuation_failed()) {
-@@ -5912,11 +6055,11 @@
- }
-
- class G1ParCleanupCTTask : public AbstractGangTask {
-- CardTableModRefBS* _ct_bs;
-+ G1SATBCardTableModRefBS* _ct_bs;
- G1CollectedHeap* _g1h;
- HeapRegion* volatile _su_head;
- public:
-- G1ParCleanupCTTask(CardTableModRefBS* ct_bs,
-+ G1ParCleanupCTTask(G1SATBCardTableModRefBS* ct_bs,
- G1CollectedHeap* g1h) :
- AbstractGangTask("G1 Par Cleanup CT Task"),
- _ct_bs(ct_bs), _g1h(g1h) { }
-@@ -5939,9 +6082,9 @@
- #ifndef PRODUCT
- class G1VerifyCardTableCleanup: public HeapRegionClosure {
- G1CollectedHeap* _g1h;
-- CardTableModRefBS* _ct_bs;
-+ G1SATBCardTableModRefBS* _ct_bs;
- public:
-- G1VerifyCardTableCleanup(G1CollectedHeap* g1h, CardTableModRefBS* ct_bs)
-+ G1VerifyCardTableCleanup(G1CollectedHeap* g1h, G1SATBCardTableModRefBS* ct_bs)
- : _g1h(g1h), _ct_bs(ct_bs) { }
- virtual bool doHeapRegion(HeapRegion* r) {
- if (r->is_survivor()) {
-@@ -5955,7 +6098,7 @@
-
- void G1CollectedHeap::verify_not_dirty_region(HeapRegion* hr) {
- // All of the region should be clean.
-- CardTableModRefBS* ct_bs = (CardTableModRefBS*)barrier_set();
-+ G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
- MemRegion mr(hr->bottom(), hr->end());
- ct_bs->verify_not_dirty_region(mr);
- }
-@@ -5968,13 +6111,17 @@
- // not dirty that area (one less thing to have to do while holding
- // a lock). So we can only verify that [bottom(),pre_dummy_top()]
- // is dirty.
-- CardTableModRefBS* ct_bs = (CardTableModRefBS*) barrier_set();
-+ G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
- MemRegion mr(hr->bottom(), hr->pre_dummy_top());
-- ct_bs->verify_dirty_region(mr);
-+ if (hr->is_young()) {
-+ ct_bs->verify_g1_young_region(mr);
-+ } else {
-+ ct_bs->verify_dirty_region(mr);
-+ }
- }
-
- void G1CollectedHeap::verify_dirty_young_list(HeapRegion* head) {
-- CardTableModRefBS* ct_bs = (CardTableModRefBS*) barrier_set();
-+ G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
- for (HeapRegion* hr = head; hr != NULL; hr = hr->get_next_young_region()) {
- verify_dirty_region(hr);
- }
-@@ -5986,7 +6133,7 @@
- #endif
-
- void G1CollectedHeap::cleanUpCardTable() {
-- CardTableModRefBS* ct_bs = (CardTableModRefBS*) (barrier_set());
-+ G1SATBCardTableModRefBS* ct_bs = g1_barrier_set();
- double start = os::elapsedTime();
-
- {
-@@ -6575,3 +6722,234 @@
- _humongous_set.verify_end();
- _free_list.verify_end();
- }
-+
-+// Optimized nmethod scanning
-+
-+class RegisterNMethodOopClosure: public OopClosure {
-+ G1CollectedHeap* _g1h;
-+ nmethod* _nm;
-+
-+ template <class T> void do_oop_work(T* p) {
-+ T heap_oop = oopDesc::load_heap_oop(p);
-+ if (!oopDesc::is_null(heap_oop)) {
-+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-+ HeapRegion* hr = _g1h->heap_region_containing(obj);
-+ if (hr == NULL) {
-+ // reference into perm gen - ignore.
-+ assert(_g1h->is_in_permanent(obj), "must be a reference into perm gen");
-+ return;
-+ }
-+ assert(!hr->continuesHumongous(),
-+ err_msg("trying to add code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT
-+ " starting at "HR_FORMAT,
-+ _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
-+
-+ // HeapRegion::add_strong_code_root() avoids adding duplicate
-+ // entries but having duplicates is OK since we "mark" nmethods
-+ // as visited when we scan the strong code root lists during the GC.
-+ hr->add_strong_code_root(_nm);
-+ assert(hr->rem_set()->strong_code_roots_list_contains(_nm),
-+ err_msg("failed to add code root "PTR_FORMAT" to remembered set of region "HR_FORMAT,
-+ _nm, HR_FORMAT_PARAMS(hr)));
-+ }
-+ }
-+
-+public:
-+ RegisterNMethodOopClosure(G1CollectedHeap* g1h, nmethod* nm) :
-+ _g1h(g1h), _nm(nm) {}
-+
-+ void do_oop(oop* p) { do_oop_work(p); }
-+ void do_oop(narrowOop* p) { do_oop_work(p); }
-+};
-+
-+class UnregisterNMethodOopClosure: public OopClosure {
-+ G1CollectedHeap* _g1h;
-+ nmethod* _nm;
-+
-+ template <class T> void do_oop_work(T* p) {
-+ T heap_oop = oopDesc::load_heap_oop(p);
-+ if (!oopDesc::is_null(heap_oop)) {
-+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-+ HeapRegion* hr = _g1h->heap_region_containing(obj);
-+ if (hr == NULL) {
-+ // reference into perm gen - ignore.
-+ assert(_g1h->is_in_permanent(obj), "must be a reference into perm gen");
-+ return;
-+ }
-+ assert(!hr->continuesHumongous(),
-+ err_msg("trying to remove code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT
-+ " starting at "HR_FORMAT,
-+ _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
-+
-+ hr->remove_strong_code_root(_nm);
-+ assert(!hr->rem_set()->strong_code_roots_list_contains(_nm),
-+ err_msg("failed to remove code root "PTR_FORMAT" of region "HR_FORMAT,
-+ _nm, HR_FORMAT_PARAMS(hr))); }
-+ }
-+
-+public:
-+ UnregisterNMethodOopClosure(G1CollectedHeap* g1h, nmethod* nm) :
-+ _g1h(g1h), _nm(nm) {}
-+
-+ void do_oop(oop* p) { do_oop_work(p); }
-+ void do_oop(narrowOop* p) { do_oop_work(p); }
-+};
-+
-+void G1CollectedHeap::register_nmethod(nmethod* nm) {
-+ CollectedHeap::register_nmethod(nm);
-+
-+ guarantee(nm != NULL, "sanity");
-+ RegisterNMethodOopClosure reg_cl(this, nm);
-+ nm->oops_do(&reg_cl);
-+}
-+
-+void G1CollectedHeap::unregister_nmethod(nmethod* nm) {
-+ CollectedHeap::unregister_nmethod(nm);
-+
-+ guarantee(nm != NULL, "sanity");
-+ UnregisterNMethodOopClosure reg_cl(this, nm);
-+ nm->oops_do(&reg_cl, false, true);
-+}
-+
-+class MigrateCodeRootsHeapRegionClosure: public HeapRegionClosure {
-+public:
-+ bool doHeapRegion(HeapRegion *hr) {
-+ assert(!hr->isHumongous(),
-+ err_msg("humongous region "HR_FORMAT" should not have been added to collection set",
-+ HR_FORMAT_PARAMS(hr)));
-+ hr->migrate_strong_code_roots();
-+ return false;
-+ }
-+};
-+
-+void G1CollectedHeap::migrate_strong_code_roots() {
-+ MigrateCodeRootsHeapRegionClosure cl;
-+ double migrate_start = os::elapsedTime();
-+ collection_set_iterate(&cl);
-+ double migration_time_ms = (os::elapsedTime() - migrate_start) * 1000.0;
-+ g1_policy()->phase_times()->record_strong_code_root_migration_time(migration_time_ms);
-+}
-+
-+// Mark all the code roots that point into regions *not* in the
-+// collection set.
-+//
-+// Note we do not want to use a "marking" CodeBlobToOopClosure while
-+// walking the the code roots lists of regions not in the collection
-+// set. Suppose we have an nmethod (M) that points to objects in two
-+// separate regions - one in the collection set (R1) and one not (R2).
-+// Using a "marking" CodeBlobToOopClosure here would result in "marking"
-+// nmethod M when walking the code roots for R1. When we come to scan
-+// the code roots for R2, we would see that M is already marked and it
-+// would be skipped and the objects in R2 that are referenced from M
-+// would not be evacuated.
-+
-+class MarkStrongCodeRootCodeBlobClosure: public CodeBlobClosure {
-+
-+ class MarkStrongCodeRootOopClosure: public OopClosure {
-+ ConcurrentMark* _cm;
-+ HeapRegion* _hr;
-+ uint _worker_id;
-+
-+ template <class T> void do_oop_work(T* p) {
-+ T heap_oop = oopDesc::load_heap_oop(p);
-+ if (!oopDesc::is_null(heap_oop)) {
-+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-+ // Only mark objects in the region (which is assumed
-+ // to be not in the collection set).
-+ if (_hr->is_in(obj)) {
-+ _cm->grayRoot(obj, (size_t) obj->size(), _worker_id);
-+ }
-+ }
-+ }
-+
-+ public:
-+ MarkStrongCodeRootOopClosure(ConcurrentMark* cm, HeapRegion* hr, uint worker_id) :
-+ _cm(cm), _hr(hr), _worker_id(worker_id) {
-+ assert(!_hr->in_collection_set(), "sanity");
-+ }
-+
-+ void do_oop(narrowOop* p) { do_oop_work(p); }
-+ void do_oop(oop* p) { do_oop_work(p); }
-+ };
-+
-+ MarkStrongCodeRootOopClosure _oop_cl;
-+
-+public:
-+ MarkStrongCodeRootCodeBlobClosure(ConcurrentMark* cm, HeapRegion* hr, uint worker_id):
-+ _oop_cl(cm, hr, worker_id) {}
-+
-+ void do_code_blob(CodeBlob* cb) {
-+ nmethod* nm = (cb == NULL) ? NULL : cb->as_nmethod_or_null();
-+ if (nm != NULL) {
-+ nm->oops_do(&_oop_cl);
-+ }
-+ }
-+};
-+
-+class MarkStrongCodeRootsHRClosure: public HeapRegionClosure {
-+ G1CollectedHeap* _g1h;
-+ uint _worker_id;
-+
-+public:
-+ MarkStrongCodeRootsHRClosure(G1CollectedHeap* g1h, uint worker_id) :
-+ _g1h(g1h), _worker_id(worker_id) {}
-+
-+ bool doHeapRegion(HeapRegion *hr) {
-+ HeapRegionRemSet* hrrs = hr->rem_set();
-+ if (hr->continuesHumongous()) {
-+ // Code roots should never be attached to a continuation of a humongous region
-+ assert(hrrs->strong_code_roots_list_length() == 0,
-+ err_msg("code roots should never be attached to continuations of humongous region "HR_FORMAT
-+ " starting at "HR_FORMAT", but has "INT32_FORMAT,
-+ HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()),
-+ hrrs->strong_code_roots_list_length()));
-+ return false;
-+ }
-+
-+ if (hr->in_collection_set()) {
-+ // Don't mark code roots into regions in the collection set here.
-+ // They will be marked when we scan them.
-+ return false;
-+ }
-+
-+ MarkStrongCodeRootCodeBlobClosure cb_cl(_g1h->concurrent_mark(), hr, _worker_id);
-+ hr->strong_code_roots_do(&cb_cl);
-+ return false;
-+ }
-+};
-+
-+void G1CollectedHeap::mark_strong_code_roots(uint worker_id) {
-+ MarkStrongCodeRootsHRClosure cl(this, worker_id);
-+ if (G1CollectedHeap::use_parallel_gc_threads()) {
-+ heap_region_par_iterate_chunked(&cl,
-+ worker_id,
-+ workers()->active_workers(),
-+ HeapRegion::ParMarkRootClaimValue);
-+ } else {
-+ heap_region_iterate(&cl);
-+ }
-+}
-+
-+class RebuildStrongCodeRootClosure: public CodeBlobClosure {
-+ G1CollectedHeap* _g1h;
-+
-+public:
-+ RebuildStrongCodeRootClosure(G1CollectedHeap* g1h) :
-+ _g1h(g1h) {}
-+
-+ void do_code_blob(CodeBlob* cb) {
-+ nmethod* nm = (cb != NULL) ? cb->as_nmethod_or_null() : NULL;
-+ if (nm == NULL) {
-+ return;
-+ }
-+
-+ if (ScavengeRootsInCode && nm->detect_scavenge_root_oops()) {
-+ _g1h->register_nmethod(nm);
-+ }
-+ }
-+};
-+
-+void G1CollectedHeap::rebuild_strong_code_roots() {
-+ RebuildStrongCodeRootClosure blob_cl(this);
-+ CodeCache::blobs_do(&blob_cl);
-+}
---- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -31,6 +31,7 @@
- #include "gc_implementation/g1/g1HRPrinter.hpp"
- #include "gc_implementation/g1/g1MonitoringSupport.hpp"
- #include "gc_implementation/g1/g1RemSet.hpp"
-+#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
- #include "gc_implementation/g1/g1YCTypes.hpp"
- #include "gc_implementation/g1/heapRegionSeq.hpp"
- #include "gc_implementation/g1/heapRegionSets.hpp"
-@@ -46,6 +47,7 @@
- // may combine concurrent marking with parallel, incremental compaction of
- // heap subsets that will yield large amounts of garbage.
-
-+// Forward declarations
- class HeapRegion;
- class HRRSCleanupTask;
- class PermanentGenerationSpec;
-@@ -69,6 +71,8 @@
- class G1NewTracer;
- class G1OldTracer;
- class EvacuationFailedInfo;
-+class nmethod;
-+class Ticks;
-
- typedef OverflowTaskQueue<StarTask, mtGC> RefToScanQueue;
- typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet;
-@@ -163,19 +167,6 @@
- : G1AllocRegion("Mutator Alloc Region", false /* bot_updates */) { }
- };
-
--// The G1 STW is alive closure.
--// An instance is embedded into the G1CH and used as the
--// (optional) _is_alive_non_header closure in the STW
--// reference processor. It is also extensively used during
--// reference processing during STW evacuation pauses.
--class G1STWIsAliveClosure: public BoolObjectClosure {
-- G1CollectedHeap* _g1;
--public:
-- G1STWIsAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
-- void do_object(oop p) { assert(false, "Do not call."); }
-- bool do_object_b(oop p);
--};
--
- class SurvivorGCAllocRegion : public G1AllocRegion {
- protected:
- virtual HeapRegion* allocate_new_region(size_t word_size, bool force);
-@@ -194,6 +185,19 @@
- : G1AllocRegion("Old GC Alloc Region", true /* bot_updates */) { }
- };
-
-+// The G1 STW is alive closure.
-+// An instance is embedded into the G1CH and used as the
-+// (optional) _is_alive_non_header closure in the STW
-+// reference processor. It is also extensively used during
-+// reference processing during STW evacuation pauses.
-+class G1STWIsAliveClosure: public BoolObjectClosure {
-+ G1CollectedHeap* _g1;
-+public:
-+ G1STWIsAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
-+ void do_object(oop p) { assert(false, "Do not call."); }
-+ bool do_object_b(oop p);
-+};
-+
- class RefineCardTableEntryClosure;
-
- class G1CollectedHeap : public SharedHeap {
-@@ -747,7 +751,7 @@
- return _old_marking_cycles_completed;
- }
-
-- void register_concurrent_cycle_start(jlong start_time);
-+ void register_concurrent_cycle_start(const Ticks& start_time);
- void register_concurrent_cycle_end();
- void trace_heap_after_concurrent_cycle();
-
-@@ -792,8 +796,6 @@
-
- // The g1 remembered set of the heap.
- G1RemSet* _g1_rem_set;
-- // And it's mod ref barrier set, used to track updates for the above.
-- ModRefBarrierSet* _mr_bs;
-
- // A set of cards that cover the objects for which the Rsets should be updated
- // concurrently after the collection.
-@@ -835,7 +837,8 @@
- OopClosure* scan_non_heap_roots,
- OopsInHeapRegionClosure* scan_rs,
- OopsInGenClosure* scan_perm,
-- int worker_i);
-+ int worker_i,
-+ bool manages_code_roots = false);
-
- // Apply "blk" to all the weak roots of the system. These include
- // JNI weak roots, the code cache, system dictionary, symbol table,
-@@ -1127,7 +1130,6 @@
-
- // The rem set and barrier set.
- G1RemSet* g1_rem_set() const { return _g1_rem_set; }
-- ModRefBarrierSet* mr_bs() const { return _mr_bs; }
-
- // The rem set iterator.
- HeapRegionRemSetIterator* rem_set_iterator(int i) {
-@@ -1361,6 +1363,10 @@
-
- virtual bool is_in_closed_subset(const void* p) const;
-
-+ G1SATBCardTableModRefBS* g1_barrier_set() {
-+ return (G1SATBCardTableModRefBS*) barrier_set();
-+ }
-+
- // This resets the card table to all zeros. It is used after
- // a collection pause which used the card table to claim cards.
- void cleanUpCardTable();
-@@ -1592,41 +1598,6 @@
-
- virtual jlong millis_since_last_gc();
-
-- // Perform any cleanup actions necessary before allowing a verification.
-- virtual void prepare_for_verify();
--
-- // Perform verification.
--
-- // vo == UsePrevMarking -> use "prev" marking information,
-- // vo == UseNextMarking -> use "next" marking information
-- // vo == UseMarkWord -> use the mark word in the object header
-- //
-- // NOTE: Only the "prev" marking information is guaranteed to be
-- // consistent most of the time, so most calls to this should use
-- // vo == UsePrevMarking.
-- // Currently, there is only one case where this is called with
-- // vo == UseNextMarking, which is to verify the "next" marking
-- // information at the end of remark.
-- // Currently there is only one place where this is called with
-- // vo == UseMarkWord, which is to verify the marking during a
-- // full GC.
-- void verify(bool silent, VerifyOption vo);
--
-- // Override; it uses the "prev" marking information
-- virtual void verify(bool silent);
--
-- virtual void print_on(outputStream* st) const;
-- virtual void print_extended_on(outputStream* st) const;
--
-- virtual void print_gc_threads_on(outputStream* st) const;
-- virtual void gc_threads_do(ThreadClosure* tc) const;
--
-- // Override
-- void print_tracing_info() const;
--
-- // The following two methods are helpful for debugging RSet issues.
-- void print_cset_rsets() PRODUCT_RETURN;
-- void print_all_rsets() PRODUCT_RETURN;
-
- // Convenience function to be used in situations where the heap type can be
- // asserted to be this type.
-@@ -1684,7 +1655,6 @@
- // then call the region version of the same function.
-
- // Added if it is in permanent gen it isn't dead.
-- // Added if it is NULL it isn't dead.
-
- bool is_obj_dead(const oop obj) const {
- const HeapRegion* hr = heap_region_containing(obj);
-@@ -1708,13 +1678,90 @@
- else return is_obj_ill(obj, hr);
- }
-
-+ bool allocated_since_marking(oop obj, HeapRegion* hr, VerifyOption vo);
-+ HeapWord* top_at_mark_start(HeapRegion* hr, VerifyOption vo);
-+ bool is_marked(oop obj, VerifyOption vo);
-+ const char* top_at_mark_start_str(VerifyOption vo);
-+
-+ ConcurrentMark* concurrent_mark() const { return _cm; }
-+
-+ // Refinement
-+
-+ ConcurrentG1Refine* concurrent_g1_refine() const { return _cg1r; }
-+
-+ // The dirty cards region list is used to record a subset of regions
-+ // whose cards need clearing. The list if populated during the
-+ // remembered set scanning and drained during the card table
-+ // cleanup. Although the methods are reentrant, population/draining
-+ // phases must not overlap. For synchronization purposes the last
-+ // element on the list points to itself.
-+ HeapRegion* _dirty_cards_region_list;
-+ void push_dirty_cards_region(HeapRegion* hr);
-+ HeapRegion* pop_dirty_cards_region();
-+
-+ // Optimized nmethod scanning support routines
-+
-+ // Register the given nmethod with the G1 heap
-+ virtual void register_nmethod(nmethod* nm);
-+
-+ // Unregister the given nmethod from the G1 heap
-+ virtual void unregister_nmethod(nmethod* nm);
-+
-+ // Migrate the nmethods in the code root lists of the regions
-+ // in the collection set to regions in to-space. In the event
-+ // of an evacuation failure, nmethods that reference objects
-+ // that were not successfullly evacuated are not migrated.
-+ void migrate_strong_code_roots();
-+
-+ // During an initial mark pause, mark all the code roots that
-+ // point into regions *not* in the collection set.
-+ void mark_strong_code_roots(uint worker_id);
-+
-+ // Rebuild the stong code root lists for each region
-+ // after a full GC
-+ void rebuild_strong_code_roots();
-+
-+ // Delete entries for dead interned string and clean up unreferenced symbols
-+ // in symbol table, possibly in parallel.
-+ void unlink_string_and_symbol_table(BoolObjectClosure* is_alive, bool unlink_strings = true, bool unlink_symbols = true);
-+
-+ // Verification
-+
-+ // The following is just to alert the verification code
-+ // that a full collection has occurred and that the
-+ // remembered sets are no longer up to date.
-+ bool _full_collection;
-+ void set_full_collection() { _full_collection = true;}
-+ void clear_full_collection() {_full_collection = false;}
-+ bool full_collection() {return _full_collection;}
-+
-+ // Perform any cleanup actions necessary before allowing a verification.
-+ virtual void prepare_for_verify();
-+
-+ // Perform verification.
-+
-+ // vo == UsePrevMarking -> use "prev" marking information,
-+ // vo == UseNextMarking -> use "next" marking information
-+ // vo == UseMarkWord -> use the mark word in the object header
-+ //
-+ // NOTE: Only the "prev" marking information is guaranteed to be
-+ // consistent most of the time, so most calls to this should use
-+ // vo == UsePrevMarking.
-+ // Currently, there is only one case where this is called with
-+ // vo == UseNextMarking, which is to verify the "next" marking
-+ // information at the end of remark.
-+ // Currently there is only one place where this is called with
-+ // vo == UseMarkWord, which is to verify the marking during a
-+ // full GC.
-+ void verify(bool silent, VerifyOption vo);
-+
-+ // Override; it uses the "prev" marking information
-+ virtual void verify(bool silent);
-+
- // The methods below are here for convenience and dispatch the
- // appropriate method depending on value of the given VerifyOption
-- // parameter. The options for that parameter are:
-- //
-- // vo == UsePrevMarking -> use "prev" marking information,
-- // vo == UseNextMarking -> use "next" marking information,
-- // vo == UseMarkWord -> use mark word from object header
-+ // parameter. The values for that parameter, and their meanings,
-+ // are the same as those above.
-
- bool is_obj_dead_cond(const oop obj,
- const HeapRegion* hr,
-@@ -1739,31 +1786,20 @@
- return false; // keep some compilers happy
- }
-
-- bool allocated_since_marking(oop obj, HeapRegion* hr, VerifyOption vo);
-- HeapWord* top_at_mark_start(HeapRegion* hr, VerifyOption vo);
-- bool is_marked(oop obj, VerifyOption vo);
-- const char* top_at_mark_start_str(VerifyOption vo);
-+ // Printing
-
-- // The following is just to alert the verification code
-- // that a full collection has occurred and that the
-- // remembered sets are no longer up to date.
-- bool _full_collection;
-- void set_full_collection() { _full_collection = true;}
-- void clear_full_collection() {_full_collection = false;}
-- bool full_collection() {return _full_collection;}
-+ virtual void print_on(outputStream* st) const;
-+ virtual void print_extended_on(outputStream* st) const;
-
-- ConcurrentMark* concurrent_mark() const { return _cm; }
-- ConcurrentG1Refine* concurrent_g1_refine() const { return _cg1r; }
-+ virtual void print_gc_threads_on(outputStream* st) const;
-+ virtual void gc_threads_do(ThreadClosure* tc) const;
-
-- // The dirty cards region list is used to record a subset of regions
-- // whose cards need clearing. The list if populated during the
-- // remembered set scanning and drained during the card table
-- // cleanup. Although the methods are reentrant, population/draining
-- // phases must not overlap. For synchronization purposes the last
-- // element on the list points to itself.
-- HeapRegion* _dirty_cards_region_list;
-- void push_dirty_cards_region(HeapRegion* hr);
-- HeapRegion* pop_dirty_cards_region();
-+ // Override
-+ void print_tracing_info() const;
-+
-+ // The following two methods are helpful for debugging RSet issues.
-+ void print_cset_rsets() PRODUCT_RETURN;
-+ void print_all_rsets() PRODUCT_RETURN;
-
- public:
- void stop_conc_gc_threads();
-@@ -1800,7 +1836,7 @@
- G1CollectedHeap* _g1h;
- RefToScanQueue* _refs;
- DirtyCardQueue _dcq;
-- CardTableModRefBS* _ct_bs;
-+ G1SATBCardTableModRefBS* _ct_bs;
- G1RemSet* _g1_rem;
-
- G1ParGCAllocBuffer _surviving_alloc_buffer;
-@@ -1839,7 +1875,7 @@
- void add_to_undo_waste(size_t waste) { _undo_waste += waste; }
-
- DirtyCardQueue& dirty_card_queue() { return _dcq; }
-- CardTableModRefBS* ctbs() { return _ct_bs; }
-+ G1SATBCardTableModRefBS* ctbs() { return _ct_bs; }
-
- template <class T> void immediate_rs_update(HeapRegion* from, T* p, int tid) {
- if (!from->is_survivor()) {
---- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -29,6 +29,7 @@
- #include "gc_implementation/g1/g1CollectedHeap.hpp"
- #include "gc_implementation/g1/g1AllocRegion.inline.hpp"
- #include "gc_implementation/g1/g1CollectorPolicy.hpp"
-+#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
- #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
- #include "utilities/taskqueue.hpp"
-
-@@ -131,7 +132,7 @@
- assert(containing_hr->is_in(end - 1), "it should also contain end - 1");
-
- MemRegion mr(start, end);
-- ((CardTableModRefBS*)_g1h->barrier_set())->dirty(mr);
-+ g1_barrier_set()->g1_mark_as_young(mr);
- }
-
- inline RefToScanQueue* G1CollectedHeap::task_queue(int i) const {
---- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -310,7 +310,8 @@
- void G1CollectorPolicy::initialize_flags() {
- set_min_alignment(HeapRegion::GrainBytes);
- size_t card_table_alignment = GenRemSet::max_alignment_constraint(rem_set_name());
-- set_max_alignment(MAX2(card_table_alignment, min_alignment()));
-+ size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
-+ set_max_alignment(MAX3(card_table_alignment, min_alignment(), page_size));
- if (SurvivorRatio < 1) {
- vm_exit_during_initialization("Invalid survivor ratio specified");
- }
---- ./hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -41,11 +41,11 @@
- private:
- G1CollectedHeap* _g1;
- DirtyCardQueue *_dcq;
-- CardTableModRefBS* _ct_bs;
-+ G1SATBCardTableModRefBS* _ct_bs;
-
- public:
- UpdateRSetDeferred(G1CollectedHeap* g1, DirtyCardQueue* dcq) :
-- _g1(g1), _ct_bs((CardTableModRefBS*)_g1->barrier_set()), _dcq(dcq) {}
-+ _g1(g1), _ct_bs(_g1->g1_barrier_set()), _dcq(dcq) {}
-
- virtual void do_oop(narrowOop* p) { do_oop_work(p); }
- virtual void do_oop( oop* p) { do_oop_work(p); }
---- ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -161,6 +161,8 @@
- _last_update_rs_times_ms(_max_gc_threads, "%.1lf"),
- _last_update_rs_processed_buffers(_max_gc_threads, "%d"),
- _last_scan_rs_times_ms(_max_gc_threads, "%.1lf"),
-+ _last_strong_code_root_scan_times_ms(_max_gc_threads, "%.1lf"),
-+ _last_strong_code_root_mark_times_ms(_max_gc_threads, "%.1lf"),
- _last_obj_copy_times_ms(_max_gc_threads, "%.1lf"),
- _last_termination_times_ms(_max_gc_threads, "%.1lf"),
- _last_termination_attempts(_max_gc_threads, SIZE_FORMAT),
-@@ -182,6 +184,8 @@
- _last_update_rs_times_ms.reset();
- _last_update_rs_processed_buffers.reset();
- _last_scan_rs_times_ms.reset();
-+ _last_strong_code_root_scan_times_ms.reset();
-+ _last_strong_code_root_mark_times_ms.reset();
- _last_obj_copy_times_ms.reset();
- _last_termination_times_ms.reset();
- _last_termination_attempts.reset();
-@@ -197,6 +201,8 @@
- _last_update_rs_times_ms.verify();
- _last_update_rs_processed_buffers.verify();
- _last_scan_rs_times_ms.verify();
-+ _last_strong_code_root_scan_times_ms.verify();
-+ _last_strong_code_root_mark_times_ms.verify();
- _last_obj_copy_times_ms.verify();
- _last_termination_times_ms.verify();
- _last_termination_attempts.verify();
-@@ -210,6 +216,8 @@
- _last_satb_filtering_times_ms.get(i) +
- _last_update_rs_times_ms.get(i) +
- _last_scan_rs_times_ms.get(i) +
-+ _last_strong_code_root_scan_times_ms.get(i) +
-+ _last_strong_code_root_mark_times_ms.get(i) +
- _last_obj_copy_times_ms.get(i) +
- _last_termination_times_ms.get(i);
-
-@@ -239,6 +247,9 @@
- // Now subtract the time taken to fix up roots in generated code
- misc_time_ms += _cur_collection_code_root_fixup_time_ms;
-
-+ // Strong code root migration time
-+ misc_time_ms += _cur_strong_code_root_migration_time_ms;
-+
- // Subtract the time taken to clean the card table from the
- // current value of "other time"
- misc_time_ms += _cur_clear_ct_time_ms;
-@@ -257,9 +268,13 @@
- if (_last_satb_filtering_times_ms.sum() > 0.0) {
- _last_satb_filtering_times_ms.print(2, "SATB Filtering (ms)");
- }
-+ if (_last_strong_code_root_mark_times_ms.sum() > 0.0) {
-+ _last_strong_code_root_mark_times_ms.print(2, "Code Root Marking (ms)");
-+ }
- _last_update_rs_times_ms.print(2, "Update RS (ms)");
- _last_update_rs_processed_buffers.print(3, "Processed Buffers");
- _last_scan_rs_times_ms.print(2, "Scan RS (ms)");
-+ _last_strong_code_root_scan_times_ms.print(2, "Code Root Scanning (ms)");
- _last_obj_copy_times_ms.print(2, "Object Copy (ms)");
- _last_termination_times_ms.print(2, "Termination (ms)");
- if (G1Log::finest()) {
-@@ -273,12 +288,17 @@
- if (_last_satb_filtering_times_ms.sum() > 0.0) {
- _last_satb_filtering_times_ms.print(1, "SATB Filtering (ms)");
- }
-+ if (_last_strong_code_root_mark_times_ms.sum() > 0.0) {
-+ _last_strong_code_root_mark_times_ms.print(1, "Code Root Marking (ms)");
-+ }
- _last_update_rs_times_ms.print(1, "Update RS (ms)");
- _last_update_rs_processed_buffers.print(2, "Processed Buffers");
- _last_scan_rs_times_ms.print(1, "Scan RS (ms)");
-+ _last_strong_code_root_scan_times_ms.print(1, "Code Root Scanning (ms)");
- _last_obj_copy_times_ms.print(1, "Object Copy (ms)");
- }
- print_stats(1, "Code Root Fixup", _cur_collection_code_root_fixup_time_ms);
-+ print_stats(1, "Code Root Migration", _cur_strong_code_root_migration_time_ms);
- print_stats(1, "Clear CT", _cur_clear_ct_time_ms);
- double misc_time_ms = pause_time_sec * MILLIUNITS - accounted_time_ms();
- print_stats(1, "Other", misc_time_ms);
---- ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -119,6 +119,8 @@
- WorkerDataArray<double> _last_update_rs_times_ms;
- WorkerDataArray<int> _last_update_rs_processed_buffers;
- WorkerDataArray<double> _last_scan_rs_times_ms;
-+ WorkerDataArray<double> _last_strong_code_root_scan_times_ms;
-+ WorkerDataArray<double> _last_strong_code_root_mark_times_ms;
- WorkerDataArray<double> _last_obj_copy_times_ms;
- WorkerDataArray<double> _last_termination_times_ms;
- WorkerDataArray<size_t> _last_termination_attempts;
-@@ -128,6 +130,7 @@
-
- double _cur_collection_par_time_ms;
- double _cur_collection_code_root_fixup_time_ms;
-+ double _cur_strong_code_root_migration_time_ms;
-
- double _cur_clear_ct_time_ms;
- double _cur_ref_proc_time_ms;
-@@ -179,6 +182,14 @@
- _last_scan_rs_times_ms.set(worker_i, ms);
- }
-
-+ void record_strong_code_root_scan_time(uint worker_i, double ms) {
-+ _last_strong_code_root_scan_times_ms.set(worker_i, ms);
-+ }
-+
-+ void record_strong_code_root_mark_time(uint worker_i, double ms) {
-+ _last_strong_code_root_mark_times_ms.set(worker_i, ms);
-+ }
-+
- void record_obj_copy_time(uint worker_i, double ms) {
- _last_obj_copy_times_ms.set(worker_i, ms);
- }
-@@ -208,6 +219,10 @@
- _cur_collection_code_root_fixup_time_ms = ms;
- }
-
-+ void record_strong_code_root_migration_time(double ms) {
-+ _cur_strong_code_root_migration_time_ms = ms;
-+ }
-+
- void record_ref_proc_time(double ms) {
- _cur_ref_proc_time_ms = ms;
- }
-@@ -294,6 +309,14 @@
- return _last_scan_rs_times_ms.average();
- }
-
-+ double average_last_strong_code_root_scan_time(){
-+ return _last_strong_code_root_scan_times_ms.average();
-+ }
-+
-+ double average_last_strong_code_root_mark_time(){
-+ return _last_strong_code_root_mark_times_ms.average();
-+ }
-+
- double average_last_obj_copy_time() {
- return _last_obj_copy_times_ms.average();
- }
---- ./hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -177,10 +177,8 @@
- GenMarkSweep::follow_mdo_weak_refs();
- assert(GenMarkSweep::_marking_stack.is_empty(), "just drained");
-
-- // Visit interned string tables and delete unmarked oops
-- StringTable::unlink(&GenMarkSweep::is_alive);
-- // Clean up unreferenced symbols in symbol table.
-- SymbolTable::unlink();
-+ // Delete entries for dead interned string and clean up unreferenced symbols in symbol table.
-+ G1CollectedHeap::heap()->unlink_string_and_symbol_table(&GenMarkSweep::is_alive);
-
- assert(GenMarkSweep::_marking_stack.is_empty(),
- "stack should be empty by now");
-@@ -188,7 +186,6 @@
- if (VerifyDuringGC) {
- HandleMark hm; // handle scope
- COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact);
-- gclog_or_tty->print(" VerifyDuringGC:(full)[Verifying ");
- Universe::heap()->prepare_for_verify();
- // Note: we can verify only the heap here. When an object is
- // marked, the previous value of the mark word (including
-@@ -200,11 +197,13 @@
- // fail. At the end of the GC, the orginal mark word values
- // (including hash values) are restored to the appropriate
- // objects.
-- Universe::heap()->verify(/* silent */ false,
-- /* option */ VerifyOption_G1UseMarkWord);
--
-- G1CollectedHeap* g1h = G1CollectedHeap::heap();
-- gclog_or_tty->print_cr("]");
-+ if (!VerifySilently) {
-+ gclog_or_tty->print(" VerifyDuringGC:(full)[Verifying ");
-+ }
-+ Universe::heap()->verify(VerifySilently, VerifyOption_G1UseMarkWord);
-+ if (!VerifySilently) {
-+ gclog_or_tty->print_cr("]");
-+ }
- }
-
- gc_tracer()->report_object_count_after_gc(&GenMarkSweep::is_alive);
-@@ -235,7 +234,7 @@
- public:
- G1PrepareCompactClosure(CompactibleSpace* cs)
- : _g1h(G1CollectedHeap::heap()),
-- _mrbs(G1CollectedHeap::heap()->mr_bs()),
-+ _mrbs(_g1h->g1_barrier_set()),
- _cp(NULL, cs, cs->initialize_threshold()),
- _humongous_proxy_set("G1MarkSweep Humongous Proxy Set") { }
-
---- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -34,6 +34,7 @@
- #include "gc_implementation/g1/g1OopClosures.inline.hpp"
- #include "gc_implementation/g1/g1RemSet.inline.hpp"
- #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
-+#include "gc_implementation/g1/heapRegionRemSet.hpp"
- #include "memory/iterator.hpp"
- #include "oops/oop.inline.hpp"
- #include "utilities/intHisto.hpp"
-@@ -73,7 +74,8 @@
- _ct_bs(ct_bs), _g1p(_g1->g1_policy()),
- _cg1r(g1->concurrent_g1_refine()),
- _cset_rs_update_cl(NULL),
-- _cards_scanned(NULL), _total_cards_scanned(0)
-+ _cards_scanned(NULL), _total_cards_scanned(0),
-+ _prev_period_summary()
- {
- _seq_task = new SubTasksDone(NumSeqTasks);
- guarantee(n_workers() > 0, "There should be some workers");
-@@ -81,6 +83,9 @@
- for (uint i = 0; i < n_workers(); i++) {
- _cset_rs_update_cl[i] = NULL;
- }
-+ if (G1SummarizeRSetStats) {
-+ _prev_period_summary.initialize(this);
-+ }
- }
-
- G1RemSet::~G1RemSet() {
-@@ -101,15 +106,25 @@
- class ScanRSClosure : public HeapRegionClosure {
- size_t _cards_done, _cards;
- G1CollectedHeap* _g1h;
-+
- OopsInHeapRegionClosure* _oc;
-+ CodeBlobToOopClosure* _code_root_cl;
-+
- G1BlockOffsetSharedArray* _bot_shared;
-- CardTableModRefBS *_ct_bs;
-- int _worker_i;
-- int _block_size;
-- bool _try_claimed;
-+ G1SATBCardTableModRefBS *_ct_bs;
-+
-+ double _strong_code_root_scan_time_sec;
-+ int _worker_i;
-+ int _block_size;
-+ bool _try_claimed;
-+
- public:
-- ScanRSClosure(OopsInHeapRegionClosure* oc, int worker_i) :
-+ ScanRSClosure(OopsInHeapRegionClosure* oc,
-+ CodeBlobToOopClosure* code_root_cl,
-+ int worker_i) :
- _oc(oc),
-+ _code_root_cl(code_root_cl),
-+ _strong_code_root_scan_time_sec(0.0),
- _cards(0),
- _cards_done(0),
- _worker_i(worker_i),
-@@ -117,7 +132,7 @@
- {
- _g1h = G1CollectedHeap::heap();
- _bot_shared = _g1h->bot_shared();
-- _ct_bs = (CardTableModRefBS*) (_g1h->barrier_set());
-+ _ct_bs = _g1h->g1_barrier_set();
- _block_size = MAX2<int>(G1RSetScanBlockSize, 1);
- }
-
-@@ -157,6 +172,12 @@
- card_start, card_start + G1BlockOffsetSharedArray::N_words);
- }
-
-+ void scan_strong_code_roots(HeapRegion* r) {
-+ double scan_start = os::elapsedTime();
-+ r->strong_code_roots_do(_code_root_cl);
-+ _strong_code_root_scan_time_sec += (os::elapsedTime() - scan_start);
-+ }
-+
- bool doHeapRegion(HeapRegion* r) {
- assert(r->in_collection_set(), "should only be called on elements of CS.");
- HeapRegionRemSet* hrrs = r->rem_set();
-@@ -170,6 +191,7 @@
- // _try_claimed || r->claim_iter()
- // is true: either we're supposed to work on claimed-but-not-complete
- // regions, or we successfully claimed the region.
-+
- HeapRegionRemSetIterator* iter = _g1h->rem_set_iterator(_worker_i);
- hrrs->init_iterator(iter);
- size_t card_index;
-@@ -203,30 +225,43 @@
- }
- }
- if (!_try_claimed) {
-+ // Scan the strong code root list attached to the current region
-+ scan_strong_code_roots(r);
-+
- hrrs->set_iter_complete();
- }
- return false;
- }
-+
-+ double strong_code_root_scan_time_sec() {
-+ return _strong_code_root_scan_time_sec;
-+ }
-+
- size_t cards_done() { return _cards_done;}
- size_t cards_looked_up() { return _cards;}
- };
-
--void G1RemSet::scanRS(OopsInHeapRegionClosure* oc, int worker_i) {
-+void G1RemSet::scanRS(OopsInHeapRegionClosure* oc,
-+ CodeBlobToOopClosure* code_root_cl,
-+ int worker_i) {
- double rs_time_start = os::elapsedTime();
- HeapRegion *startRegion = _g1->start_cset_region_for_worker(worker_i);
-
-- ScanRSClosure scanRScl(oc, worker_i);
-+ ScanRSClosure scanRScl(oc, code_root_cl, worker_i);
-
- _g1->collection_set_iterate_from(startRegion, &scanRScl);
- scanRScl.set_try_claimed();
- _g1->collection_set_iterate_from(startRegion, &scanRScl);
-
-- double scan_rs_time_sec = os::elapsedTime() - rs_time_start;
-+ double scan_rs_time_sec = (os::elapsedTime() - rs_time_start)
-+ - scanRScl.strong_code_root_scan_time_sec();
-
-- assert( _cards_scanned != NULL, "invariant" );
-+ assert(_cards_scanned != NULL, "invariant");
- _cards_scanned[worker_i] = scanRScl.cards_done();
-
- _g1p->phase_times()->record_scan_rs_time(worker_i, scan_rs_time_sec * 1000.0);
-+ _g1p->phase_times()->record_strong_code_root_scan_time(worker_i,
-+ scanRScl.strong_code_root_scan_time_sec() * 1000.0);
- }
-
- // Closure used for updating RSets and recording references that
-@@ -286,7 +321,8 @@
- }
-
- void G1RemSet::oops_into_collection_set_do(OopsInHeapRegionClosure* oc,
-- int worker_i) {
-+ CodeBlobToOopClosure* code_root_cl,
-+ int worker_i) {
- #if CARD_REPEAT_HISTO
- ct_freq_update_histo_and_reset();
- #endif
-@@ -326,7 +362,7 @@
- _g1p->phase_times()->record_update_rs_time(worker_i, 0.0);
- }
- if (G1UseParallelRSetScanning || (worker_i == 0)) {
-- scanRS(oc, worker_i);
-+ scanRS(oc, code_root_cl, worker_i);
- } else {
- _g1p->phase_times()->record_scan_rs_time(worker_i, 0.0);
- }
-@@ -472,12 +508,7 @@
- ScrubRSClosure(BitMap* region_bm, BitMap* card_bm) :
- _g1h(G1CollectedHeap::heap()),
- _region_bm(region_bm), _card_bm(card_bm),
-- _ctbs(NULL)
-- {
-- ModRefBarrierSet* bs = _g1h->mr_bs();
-- guarantee(bs->is_a(BarrierSet::CardTableModRef), "Precondition");
-- _ctbs = (CardTableModRefBS*)bs;
-- }
-+ _ctbs(_g1h->g1_barrier_set()) {}
-
- bool doHeapRegion(HeapRegion* r) {
- if (!r->continuesHumongous()) {
-@@ -700,47 +731,29 @@
- return has_refs_into_cset;
- }
-
--class HRRSStatsIter: public HeapRegionClosure {
-- size_t _occupied;
-- size_t _total_mem_sz;
-- size_t _max_mem_sz;
-- HeapRegion* _max_mem_sz_region;
--public:
-- HRRSStatsIter() :
-- _occupied(0),
-- _total_mem_sz(0),
-- _max_mem_sz(0),
-- _max_mem_sz_region(NULL)
-- {}
-+void G1RemSet::print_periodic_summary_info(const char* header) {
-+ G1RemSetSummary current;
-+ current.initialize(this);
-
-- bool doHeapRegion(HeapRegion* r) {
-- if (r->continuesHumongous()) return false;
-- size_t mem_sz = r->rem_set()->mem_size();
-- if (mem_sz > _max_mem_sz) {
-- _max_mem_sz = mem_sz;
-- _max_mem_sz_region = r;
-- }
-- _total_mem_sz += mem_sz;
-- size_t occ = r->rem_set()->occupied();
-- _occupied += occ;
-- return false;
-- }
-- size_t total_mem_sz() { return _total_mem_sz; }
-- size_t max_mem_sz() { return _max_mem_sz; }
-- size_t occupied() { return _occupied; }
-- HeapRegion* max_mem_sz_region() { return _max_mem_sz_region; }
--};
-+ _prev_period_summary.subtract_from(&current);
-+ print_summary_info(&_prev_period_summary, header);
-
--class PrintRSThreadVTimeClosure : public ThreadClosure {
--public:
-- virtual void do_thread(Thread *t) {
-- ConcurrentG1RefineThread* crt = (ConcurrentG1RefineThread*) t;
-- gclog_or_tty->print(" %5.2f", crt->vtime_accum());
-- }
--};
-+ _prev_period_summary.set(&current);
-+}
-
- void G1RemSet::print_summary_info() {
-- G1CollectedHeap* g1 = G1CollectedHeap::heap();
-+ G1RemSetSummary current;
-+ current.initialize(this);
-+
-+ print_summary_info(&current, " Cumulative RS summary");
-+}
-+
-+void G1RemSet::print_summary_info(G1RemSetSummary * summary, const char * header) {
-+ assert(summary != NULL, "just checking");
-+
-+ if (header != NULL) {
-+ gclog_or_tty->print_cr("%s", header);
-+ }
-
- #if CARD_REPEAT_HISTO
- gclog_or_tty->print_cr("\nG1 card_repeat count histogram: ");
-@@ -748,52 +761,13 @@
- card_repeat_count.print_on(gclog_or_tty);
- #endif
-
-- gclog_or_tty->print_cr("\n Concurrent RS processed %d cards",
-- _conc_refine_cards);
-- DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
-- jint tot_processed_buffers =
-- dcqs.processed_buffers_mut() + dcqs.processed_buffers_rs_thread();
-- gclog_or_tty->print_cr(" Of %d completed buffers:", tot_processed_buffers);
-- gclog_or_tty->print_cr(" %8d (%5.1f%%) by conc RS threads.",
-- dcqs.processed_buffers_rs_thread(),
-- 100.0*(float)dcqs.processed_buffers_rs_thread()/
-- (float)tot_processed_buffers);
-- gclog_or_tty->print_cr(" %8d (%5.1f%%) by mutator threads.",
-- dcqs.processed_buffers_mut(),
-- 100.0*(float)dcqs.processed_buffers_mut()/
-- (float)tot_processed_buffers);
-- gclog_or_tty->print_cr(" Conc RS threads times(s)");
-- PrintRSThreadVTimeClosure p;
-- gclog_or_tty->print(" ");
-- g1->concurrent_g1_refine()->threads_do(&p);
-- gclog_or_tty->print_cr("");
--
-- HRRSStatsIter blk;
-- g1->heap_region_iterate(&blk);
-- gclog_or_tty->print_cr(" Total heap region rem set sizes = "SIZE_FORMAT"K."
-- " Max = "SIZE_FORMAT"K.",
-- blk.total_mem_sz()/K, blk.max_mem_sz()/K);
-- gclog_or_tty->print_cr(" Static structures = "SIZE_FORMAT"K,"
-- " free_lists = "SIZE_FORMAT"K.",
-- HeapRegionRemSet::static_mem_size() / K,
-- HeapRegionRemSet::fl_mem_size() / K);
-- gclog_or_tty->print_cr(" "SIZE_FORMAT" occupied cards represented.",
-- blk.occupied());
-- HeapRegion* max_mem_sz_region = blk.max_mem_sz_region();
-- HeapRegionRemSet* rem_set = max_mem_sz_region->rem_set();
-- gclog_or_tty->print_cr(" Max size region = "HR_FORMAT", "
-- "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
-- HR_FORMAT_PARAMS(max_mem_sz_region),
-- (rem_set->mem_size() + K - 1)/K,
-- (rem_set->occupied() + K - 1)/K);
-- gclog_or_tty->print_cr(" Did %d coarsenings.",
-- HeapRegionRemSet::n_coarsenings());
-+ summary->print_on(gclog_or_tty);
- }
-
- void G1RemSet::prepare_for_verify() {
- if (G1HRRSFlushLogBuffersOnVerify &&
- (VerifyBeforeGC || VerifyAfterGC)
-- && !_g1->full_collection()) {
-+ && (!_g1->full_collection() || G1VerifyRSetsDuringFullGC)) {
- cleanupHRRS();
- _g1->set_refine_cte_cl_concurrency(false);
- if (SafepointSynchronize::is_at_safepoint()) {
---- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -25,6 +25,8 @@
- #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP
- #define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP
-
-+#include "gc_implementation/g1/g1RemSetSummary.hpp"
-+
- // A G1RemSet provides ways of iterating over pointers into a selected
- // collection set.
-
-@@ -37,9 +39,11 @@
- // so that they can be used to update the individual region remsets.
-
- class G1RemSet: public CHeapObj<mtGC> {
-+private:
-+ G1RemSetSummary _prev_period_summary;
- protected:
- G1CollectedHeap* _g1;
-- unsigned _conc_refine_cards;
-+ size_t _conc_refine_cards;
- uint n_workers();
-
- protected:
-@@ -66,6 +70,8 @@
- // references into the collection set.
- OopsInHeapRegionClosure** _cset_rs_update_cl;
-
-+ // Print the given summary info
-+ virtual void print_summary_info(G1RemSetSummary * summary, const char * header = NULL);
- public:
- // This is called to reset dual hash tables after the gc pause
- // is finished and the initial hash table is no longer being
-@@ -75,14 +81,23 @@
- G1RemSet(G1CollectedHeap* g1, CardTableModRefBS* ct_bs);
- ~G1RemSet();
-
-- // Invoke "blk->do_oop" on all pointers into the CS in objects in regions
-- // outside the CS (having invoked "blk->set_region" to set the "from"
-- // region correctly beforehand.) The "worker_i" param is for the
-- // parallel case where the number of the worker thread calling this
-- // function can be helpful in partitioning the work to be done. It
-- // should be the same as the "i" passed to the calling thread's
-- // work(i) function. In the sequential case this param will be ingored.
-- void oops_into_collection_set_do(OopsInHeapRegionClosure* blk, int worker_i);
-+ // Invoke "blk->do_oop" on all pointers into the collection set
-+ // from objects in regions outside the collection set (having
-+ // invoked "blk->set_region" to set the "from" region correctly
-+ // beforehand.)
-+ //
-+ // Invoke code_root_cl->do_code_blob on the unmarked nmethods
-+ // on the strong code roots list for each region in the
-+ // collection set.
-+ //
-+ // The "worker_i" param is for the parallel case where the id
-+ // of the worker thread calling this function can be helpful in
-+ // partitioning the work to be done. It should be the same as
-+ // the "i" passed to the calling thread's work(i) function.
-+ // In the sequential case this param will be ignored.
-+ void oops_into_collection_set_do(OopsInHeapRegionClosure* blk,
-+ CodeBlobToOopClosure* code_root_cl,
-+ int worker_i);
-
- // Prepare for and cleanup after an oops_into_collection_set_do
- // call. Must call each of these once before and after (in sequential
-@@ -92,7 +107,10 @@
- void prepare_for_oops_into_collection_set_do();
- void cleanup_after_oops_into_collection_set_do();
-
-- void scanRS(OopsInHeapRegionClosure* oc, int worker_i);
-+ void scanRS(OopsInHeapRegionClosure* oc,
-+ CodeBlobToOopClosure* code_root_cl,
-+ int worker_i);
-+
- void updateRS(DirtyCardQueue* into_cset_dcq, int worker_i);
-
- CardTableModRefBS* ct_bs() { return _ct_bs; }
-@@ -123,11 +141,18 @@
- int worker_i,
- bool check_for_refs_into_cset);
-
-- // Print any relevant summary info.
-+ // Print accumulated summary info from the start of the VM.
- virtual void print_summary_info();
-
-+ // Print accumulated summary info from the last time called.
-+ virtual void print_periodic_summary_info(const char* header);
-+
- // Prepare remembered set for verification.
- virtual void prepare_for_verify();
-+
-+ size_t conc_refine_cards() const {
-+ return _conc_refine_cards;
-+ }
- };
-
- class CountNonCleanMemRegionClosure: public MemRegionClosure {
---- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,354 @@
-+/*
-+ * 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.
-+ *
-+ */
-+
-+#include "precompiled.hpp"
-+#include "gc_implementation/g1/concurrentG1Refine.hpp"
-+#include "gc_implementation/g1/concurrentG1RefineThread.hpp"
-+#include "gc_implementation/g1/heapRegion.hpp"
-+#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-+#include "gc_implementation/g1/g1RemSet.inline.hpp"
-+#include "gc_implementation/g1/g1RemSetSummary.hpp"
-+#include "gc_implementation/g1/heapRegionRemSet.hpp"
-+#include "runtime/thread.hpp"
-+
-+class GetRSThreadVTimeClosure : public ThreadClosure {
-+private:
-+ G1RemSetSummary* _summary;
-+ uint _counter;
-+
-+public:
-+ GetRSThreadVTimeClosure(G1RemSetSummary * summary) : ThreadClosure(), _summary(summary), _counter(0) {
-+ assert(_summary != NULL, "just checking");
-+ }
-+
-+ virtual void do_thread(Thread* t) {
-+ ConcurrentG1RefineThread* crt = (ConcurrentG1RefineThread*) t;
-+ _summary->set_rs_thread_vtime(_counter, crt->vtime_accum());
-+ _counter++;
-+ }
-+};
-+
-+void G1RemSetSummary::update() {
-+ _num_refined_cards = remset()->conc_refine_cards();
-+ DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
-+ _num_processed_buf_mutator = dcqs.processed_buffers_mut();
-+ _num_processed_buf_rs_threads = dcqs.processed_buffers_rs_thread();
-+
-+ _num_coarsenings = HeapRegionRemSet::n_coarsenings();
-+
-+ ConcurrentG1Refine * cg1r = G1CollectedHeap::heap()->concurrent_g1_refine();
-+ if (_rs_threads_vtimes != NULL) {
-+ GetRSThreadVTimeClosure p(this);
-+ cg1r->worker_threads_do(&p);
-+ }
-+ set_sampling_thread_vtime(cg1r->sampling_thread()->vtime_accum());
-+}
-+
-+void G1RemSetSummary::set_rs_thread_vtime(uint thread, double value) {
-+ assert(_rs_threads_vtimes != NULL, "just checking");
-+ assert(thread < _num_vtimes, "just checking");
-+ _rs_threads_vtimes[thread] = value;
-+}
-+
-+double G1RemSetSummary::rs_thread_vtime(uint thread) const {
-+ assert(_rs_threads_vtimes != NULL, "just checking");
-+ assert(thread < _num_vtimes, "just checking");
-+ return _rs_threads_vtimes[thread];
-+}
-+
-+void G1RemSetSummary::initialize(G1RemSet* remset) {
-+ assert(_rs_threads_vtimes == NULL, "just checking");
-+ assert(remset != NULL, "just checking");
-+
-+ _remset = remset;
-+ _num_vtimes = ConcurrentG1Refine::thread_num();
-+ _rs_threads_vtimes = NEW_C_HEAP_ARRAY(double, _num_vtimes, mtGC);
-+ memset(_rs_threads_vtimes, 0, sizeof(double) * _num_vtimes);
-+
-+ update();
-+}
-+
-+void G1RemSetSummary::set(G1RemSetSummary* other) {
-+ assert(other != NULL, "just checking");
-+ assert(remset() == other->remset(), "just checking");
-+ assert(_num_vtimes == other->_num_vtimes, "just checking");
-+
-+ _num_refined_cards = other->num_concurrent_refined_cards();
-+
-+ _num_processed_buf_mutator = other->num_processed_buf_mutator();
-+ _num_processed_buf_rs_threads = other->num_processed_buf_rs_threads();
-+
-+ _num_coarsenings = other->_num_coarsenings;
-+
-+ memcpy(_rs_threads_vtimes, other->_rs_threads_vtimes, sizeof(double) * _num_vtimes);
-+
-+ set_sampling_thread_vtime(other->sampling_thread_vtime());
-+}
-+
-+void G1RemSetSummary::subtract_from(G1RemSetSummary* other) {
-+ assert(other != NULL, "just checking");
-+ assert(remset() == other->remset(), "just checking");
-+ assert(_num_vtimes == other->_num_vtimes, "just checking");
-+
-+ _num_refined_cards = other->num_concurrent_refined_cards() - _num_refined_cards;
-+
-+ _num_processed_buf_mutator = other->num_processed_buf_mutator() - _num_processed_buf_mutator;
-+ _num_processed_buf_rs_threads = other->num_processed_buf_rs_threads() - _num_processed_buf_rs_threads;
-+
-+ _num_coarsenings = other->num_coarsenings() - _num_coarsenings;
-+
-+ for (uint i = 0; i < _num_vtimes; i++) {
-+ set_rs_thread_vtime(i, other->rs_thread_vtime(i) - rs_thread_vtime(i));
-+ }
-+
-+ _sampling_thread_vtime = other->sampling_thread_vtime() - _sampling_thread_vtime;
-+}
-+
-+static double percent_of(size_t numerator, size_t denominator) {
-+ if (denominator != 0) {
-+ return (double)numerator / denominator * 100.0f;
-+ } else {
-+ return 0.0f;
-+ }
-+}
-+
-+static size_t round_to_K(size_t value) {
-+ return value / K;
-+}
-+
-+class RegionTypeCounter VALUE_OBJ_CLASS_SPEC {
-+private:
-+ const char* _name;
-+
-+ size_t _rs_mem_size;
-+ size_t _cards_occupied;
-+ size_t _amount;
-+
-+ size_t _code_root_mem_size;
-+ size_t _code_root_elems;
-+
-+ double rs_mem_size_percent_of(size_t total) {
-+ return percent_of(_rs_mem_size, total);
-+ }
-+
-+ double cards_occupied_percent_of(size_t total) {
-+ return percent_of(_cards_occupied, total);
-+ }
-+
-+ double code_root_mem_size_percent_of(size_t total) {
-+ return percent_of(_code_root_mem_size, total);
-+ }
-+
-+ double code_root_elems_percent_of(size_t total) {
-+ return percent_of(_code_root_elems, total);
-+ }
-+
-+ size_t amount() const { return _amount; }
-+
-+public:
-+
-+ RegionTypeCounter(const char* name) : _name(name), _rs_mem_size(0), _cards_occupied(0),
-+ _amount(0), _code_root_mem_size(0), _code_root_elems(0) { }
-+
-+ void add(size_t rs_mem_size, size_t cards_occupied, size_t code_root_mem_size,
-+ size_t code_root_elems) {
-+ _rs_mem_size += rs_mem_size;
-+ _cards_occupied += cards_occupied;
-+ _code_root_mem_size += code_root_mem_size;
-+ _code_root_elems += code_root_elems;
-+ _amount++;
-+ }
-+
-+ size_t rs_mem_size() const { return _rs_mem_size; }
-+ size_t cards_occupied() const { return _cards_occupied; }
-+
-+ size_t code_root_mem_size() const { return _code_root_mem_size; }
-+ size_t code_root_elems() const { return _code_root_elems; }
-+
-+ void print_rs_mem_info_on(outputStream * out, size_t total) {
-+ out->print_cr(" "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
-+ round_to_K(rs_mem_size()), rs_mem_size_percent_of(total), amount(), _name);
-+ }
-+
-+ void print_cards_occupied_info_on(outputStream * out, size_t total) {
-+ out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) entries by "SIZE_FORMAT" %s regions",
-+ cards_occupied(), cards_occupied_percent_of(total), amount(), _name);
-+ }
-+
-+ void print_code_root_mem_info_on(outputStream * out, size_t total) {
-+ out->print_cr(" "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
-+ round_to_K(code_root_mem_size()), code_root_mem_size_percent_of(total), amount(), _name);
-+ }
-+
-+ void print_code_root_elems_info_on(outputStream * out, size_t total) {
-+ out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) elements by "SIZE_FORMAT" %s regions",
-+ code_root_elems(), code_root_elems_percent_of(total), amount(), _name);
-+ }
-+};
-+
-+
-+class HRRSStatsIter: public HeapRegionClosure {
-+private:
-+ RegionTypeCounter _young;
-+ RegionTypeCounter _humonguous;
-+ RegionTypeCounter _free;
-+ RegionTypeCounter _old;
-+ RegionTypeCounter _all;
-+
-+ size_t _max_rs_mem_sz;
-+ HeapRegion* _max_rs_mem_sz_region;
-+
-+ size_t total_rs_mem_sz() const { return _all.rs_mem_size(); }
-+ size_t total_cards_occupied() const { return _all.cards_occupied(); }
-+
-+ size_t max_rs_mem_sz() const { return _max_rs_mem_sz; }
-+ HeapRegion* max_rs_mem_sz_region() const { return _max_rs_mem_sz_region; }
-+
-+ size_t _max_code_root_mem_sz;
-+ HeapRegion* _max_code_root_mem_sz_region;
-+
-+ size_t total_code_root_mem_sz() const { return _all.code_root_mem_size(); }
-+ size_t total_code_root_elems() const { return _all.code_root_elems(); }
-+
-+ size_t max_code_root_mem_sz() const { return _max_code_root_mem_sz; }
-+ HeapRegion* max_code_root_mem_sz_region() const { return _max_code_root_mem_sz_region; }
-+
-+public:
-+ HRRSStatsIter() : _all("All"), _young("Young"), _humonguous("Humonguous"),
-+ _free("Free"), _old("Old"), _max_code_root_mem_sz_region(NULL), _max_rs_mem_sz_region(NULL),
-+ _max_rs_mem_sz(0), _max_code_root_mem_sz(0)
-+ {}
-+
-+ bool doHeapRegion(HeapRegion* r) {
-+ HeapRegionRemSet* hrrs = r->rem_set();
-+
-+ // HeapRegionRemSet::mem_size() includes the
-+ // size of the strong code roots
-+ size_t rs_mem_sz = hrrs->mem_size();
-+ if (rs_mem_sz > _max_rs_mem_sz) {
-+ _max_rs_mem_sz = rs_mem_sz;
-+ _max_rs_mem_sz_region = r;
-+ }
-+ size_t occupied_cards = hrrs->occupied();
-+ size_t code_root_mem_sz = hrrs->strong_code_roots_mem_size();
-+ if (code_root_mem_sz > max_code_root_mem_sz()) {
-+ _max_code_root_mem_sz_region = r;
-+ }
-+ size_t code_root_elems = hrrs->strong_code_roots_list_length();
-+
-+ RegionTypeCounter* current = NULL;
-+ if (r->is_young()) {
-+ current = &_young;
-+ } else if (r->isHumongous()) {
-+ current = &_humonguous;
-+ } else if (r->is_empty()) {
-+ current = &_free;
-+ } else {
-+ current = &_old;
-+ }
-+ current->add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems);
-+ _all.add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems);
-+
-+ return false;
-+ }
-+
-+ void print_summary_on(outputStream* out) {
-+ RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL };
-+
-+ out->print_cr("\n Current rem set statistics");
-+ out->print_cr(" Total per region rem sets sizes = "SIZE_FORMAT"K."
-+ " Max = "SIZE_FORMAT"K.",
-+ round_to_K(total_rs_mem_sz()), round_to_K(max_rs_mem_sz()));
-+ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
-+ (*current)->print_rs_mem_info_on(out, total_rs_mem_sz());
-+ }
-+
-+ out->print_cr(" Static structures = "SIZE_FORMAT"K,"
-+ " free_lists = "SIZE_FORMAT"K.",
-+ round_to_K(HeapRegionRemSet::static_mem_size()),
-+ round_to_K(HeapRegionRemSet::fl_mem_size()));
-+
-+ out->print_cr(" "SIZE_FORMAT" occupied cards represented.",
-+ total_cards_occupied());
-+ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
-+ (*current)->print_cards_occupied_info_on(out, total_cards_occupied());
-+ }
-+
-+ // Largest sized rem set region statistics
-+ HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set();
-+ out->print_cr(" Region with largest rem set = "HR_FORMAT", "
-+ "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
-+ HR_FORMAT_PARAMS(max_rs_mem_sz_region()),
-+ round_to_K(rem_set->mem_size()),
-+ round_to_K(rem_set->occupied()));
-+
-+ // Strong code root statistics
-+ HeapRegionRemSet* max_code_root_rem_set = max_code_root_mem_sz_region()->rem_set();
-+ out->print_cr(" Total heap region code root sets sizes = "SIZE_FORMAT"K."
-+ " Max = "SIZE_FORMAT"K.",
-+ round_to_K(total_code_root_mem_sz()),
-+ round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()));
-+ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
-+ (*current)->print_code_root_mem_info_on(out, total_code_root_mem_sz());
-+ }
-+
-+ out->print_cr(" "SIZE_FORMAT" code roots represented.",
-+ total_code_root_elems());
-+ for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
-+ (*current)->print_code_root_elems_info_on(out, total_code_root_elems());
-+ }
-+
-+ out->print_cr(" Region with largest amount of code roots = "HR_FORMAT", "
-+ "size = "SIZE_FORMAT "K, num_elems = "SIZE_FORMAT".",
-+ HR_FORMAT_PARAMS(max_code_root_mem_sz_region()),
-+ round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()),
-+ round_to_K(max_code_root_rem_set->strong_code_roots_list_length()));
-+ }
-+};
-+
-+void G1RemSetSummary::print_on(outputStream* out) {
-+ out->print_cr("\n Recent concurrent refinement statistics");
-+ out->print_cr(" Processed "SIZE_FORMAT" cards",
-+ num_concurrent_refined_cards());
-+ out->print_cr(" Of "SIZE_FORMAT" completed buffers:", num_processed_buf_total());
-+ out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by concurrent RS threads.",
-+ num_processed_buf_total(),
-+ percent_of(num_processed_buf_rs_threads(), num_processed_buf_total()));
-+ out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by mutator threads.",
-+ num_processed_buf_mutator(),
-+ percent_of(num_processed_buf_mutator(), num_processed_buf_total()));
-+ out->print_cr(" Did "SIZE_FORMAT" coarsenings.", num_coarsenings());
-+ out->print_cr(" Concurrent RS threads times (s)");
-+ out->print(" ");
-+ for (uint i = 0; i < _num_vtimes; i++) {
-+ out->print(" %5.2f", rs_thread_vtime(i));
-+ }
-+ out->cr();
-+ out->print_cr(" Concurrent sampling threads times (s)");
-+ out->print_cr(" %5.2f", sampling_thread_vtime());
-+
-+ HRRSStatsIter blk;
-+ G1CollectedHeap::heap()->heap_region_iterate(&blk);
-+ blk.print_summary_on(out);
-+}
---- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,118 @@
-+/*
-+ * 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.
-+ *
-+ */
-+
-+#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP
-+#define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP
-+
-+#include "utilities/ostream.hpp"
-+
-+class G1RemSet;
-+
-+// A G1RemSetSummary manages statistical information about the G1RemSet
-+
-+class G1RemSetSummary VALUE_OBJ_CLASS_SPEC {
-+private:
-+ friend class GetRSThreadVTimeClosure;
-+
-+ G1RemSet* _remset;
-+
-+ G1RemSet* remset() const {
-+ return _remset;
-+ }
-+
-+ size_t _num_refined_cards;
-+ size_t _num_processed_buf_mutator;
-+ size_t _num_processed_buf_rs_threads;
-+
-+ size_t _num_coarsenings;
-+
-+ double* _rs_threads_vtimes;
-+ size_t _num_vtimes;
-+
-+ double _sampling_thread_vtime;
-+
-+ void set_rs_thread_vtime(uint thread, double value);
-+ void set_sampling_thread_vtime(double value) {
-+ _sampling_thread_vtime = value;
-+ }
-+
-+ void free_and_null() {
-+ if (_rs_threads_vtimes) {
-+ FREE_C_HEAP_ARRAY(double, _rs_threads_vtimes, mtGC);
-+ _rs_threads_vtimes = NULL;
-+ _num_vtimes = 0;
-+ }
-+ }
-+
-+ // update this summary with current data from various places
-+ void update();
-+
-+public:
-+ G1RemSetSummary() : _remset(NULL), _num_refined_cards(0),
-+ _num_processed_buf_mutator(0), _num_processed_buf_rs_threads(0), _num_coarsenings(0),
-+ _rs_threads_vtimes(NULL), _num_vtimes(0), _sampling_thread_vtime(0.0f) {
-+ }
-+
-+ ~G1RemSetSummary() {
-+ free_and_null();
-+ }
-+
-+ // set the counters in this summary to the values of the others
-+ void set(G1RemSetSummary* other);
-+ // subtract all counters from the other summary, and set them in the current
-+ void subtract_from(G1RemSetSummary* other);
-+
-+ // initialize and get the first sampling
-+ void initialize(G1RemSet* remset);
-+
-+ void print_on(outputStream* out);
-+
-+ double rs_thread_vtime(uint thread) const;
-+
-+ double sampling_thread_vtime() const {
-+ return _sampling_thread_vtime;
-+ }
-+
-+ size_t num_concurrent_refined_cards() const {
-+ return _num_refined_cards;
-+ }
-+
-+ size_t num_processed_buf_mutator() const {
-+ return _num_processed_buf_mutator;
-+ }
-+
-+ size_t num_processed_buf_rs_threads() const {
-+ return _num_processed_buf_rs_threads;
-+ }
-+
-+ size_t num_processed_buf_total() const {
-+ return num_processed_buf_mutator() + num_processed_buf_rs_threads();
-+ }
-+
-+ size_t num_coarsenings() const {
-+ return _num_coarsenings;
-+ }
-+};
-+
-+#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP
---- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -76,6 +76,46 @@
- }
- }
-
-+bool G1SATBCardTableModRefBS::mark_card_deferred(size_t card_index) {
-+ jbyte val = _byte_map[card_index];
-+ // It's already processed
-+ if ((val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val()) {
-+ return false;
-+ }
-+
-+ if (val == g1_young_gen) {
-+ // the card is for a young gen region. We don't need to keep track of all pointers into young
-+ return false;
-+ }
-+
-+ // Cached bit can be installed either on a clean card or on a claimed card.
-+ jbyte new_val = val;
-+ if (val == clean_card_val()) {
-+ new_val = (jbyte)deferred_card_val();
-+ } else {
-+ if (val & claimed_card_val()) {
-+ new_val = val | (jbyte)deferred_card_val();
-+ }
-+ }
-+ if (new_val != val) {
-+ Atomic::cmpxchg(new_val, &_byte_map[card_index], val);
-+ }
-+ return true;
-+}
-+
-+void G1SATBCardTableModRefBS::g1_mark_as_young(const MemRegion& mr) {
-+ jbyte *const first = byte_for(mr.start());
-+ jbyte *const last = byte_after(mr.last());
-+
-+ memset(first, g1_young_gen, last - first);
-+}
-+
-+#ifndef PRODUCT
-+void G1SATBCardTableModRefBS::verify_g1_young_region(MemRegion mr) {
-+ verify_region(mr, g1_young_gen, true);
-+}
-+#endif
-+
- G1SATBCardTableLoggingModRefBS::
- G1SATBCardTableLoggingModRefBS(MemRegion whole_heap,
- int max_covered_regions) :
-@@ -88,7 +128,11 @@
- void
- G1SATBCardTableLoggingModRefBS::write_ref_field_work(void* field,
- oop new_val) {
-- jbyte* byte = byte_for(field);
-+ volatile jbyte* byte = byte_for(field);
-+ if (*byte == g1_young_gen) {
-+ return;
-+ }
-+ OrderAccess::storeload();
- if (*byte != dirty_card) {
- *byte = dirty_card;
- Thread* thr = Thread::current();
-@@ -120,7 +164,7 @@
-
- void
- G1SATBCardTableLoggingModRefBS::invalidate(MemRegion mr, bool whole_heap) {
-- jbyte* byte = byte_for(mr.start());
-+ volatile jbyte* byte = byte_for(mr.start());
- jbyte* last_byte = byte_for(mr.last());
- Thread* thr = Thread::current();
- if (whole_heap) {
-@@ -129,25 +173,35 @@
- byte++;
- }
- } else {
-- // Enqueue if necessary.
-- if (thr->is_Java_thread()) {
-- JavaThread* jt = (JavaThread*)thr;
-- while (byte <= last_byte) {
-- if (*byte != dirty_card) {
-- *byte = dirty_card;
-- jt->dirty_card_queue().enqueue(byte);
-+ // skip all consecutive young cards
-+ for (; byte <= last_byte && *byte == g1_young_gen; byte++);
-+
-+ if (byte <= last_byte) {
-+ OrderAccess::storeload();
-+ // Enqueue if necessary.
-+ if (thr->is_Java_thread()) {
-+ JavaThread* jt = (JavaThread*)thr;
-+ for (; byte <= last_byte; byte++) {
-+ if (*byte == g1_young_gen) {
-+ continue;
-+ }
-+ if (*byte != dirty_card) {
-+ *byte = dirty_card;
-+ jt->dirty_card_queue().enqueue(byte);
-+ }
- }
-- byte++;
-- }
-- } else {
-- MutexLockerEx x(Shared_DirtyCardQ_lock,
-- Mutex::_no_safepoint_check_flag);
-- while (byte <= last_byte) {
-- if (*byte != dirty_card) {
-- *byte = dirty_card;
-- _dcqs.shared_dirty_card_queue()->enqueue(byte);
-+ } else {
-+ MutexLockerEx x(Shared_DirtyCardQ_lock,
-+ Mutex::_no_safepoint_check_flag);
-+ for (; byte <= last_byte; byte++) {
-+ if (*byte == g1_young_gen) {
-+ continue;
-+ }
-+ if (*byte != dirty_card) {
-+ *byte = dirty_card;
-+ _dcqs.shared_dirty_card_queue()->enqueue(byte);
-+ }
- }
-- byte++;
- }
- }
- }
---- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -37,7 +37,14 @@
- // snapshot-at-the-beginning marking.
-
- class G1SATBCardTableModRefBS: public CardTableModRefBSForCTRS {
-+protected:
-+ enum G1CardValues {
-+ g1_young_gen = CT_MR_BS_last_reserved << 1
-+ };
-+
- public:
-+ static int g1_young_card_val() { return g1_young_gen; }
-+
- // Add "pre_val" to a set of objects that may have been disconnected from the
- // pre-marking object graph.
- static void enqueue(oop pre_val);
-@@ -88,6 +95,45 @@
- write_ref_array_pre_work(dst, count);
- }
- }
-+
-+/*
-+ Claimed and deferred bits are used together in G1 during the evacuation
-+ pause. These bits can have the following state transitions:
-+ 1. The claimed bit can be put over any other card state. Except that
-+ the "dirty -> dirty and claimed" transition is checked for in
-+ G1 code and is not used.
-+ 2. Deferred bit can be set only if the previous state of the card
-+ was either clean or claimed. mark_card_deferred() is wait-free.
-+ We do not care if the operation is be successful because if
-+ it does not it will only result in duplicate entry in the update
-+ buffer because of the "cache-miss". So it's not worth spinning.
-+ */
-+
-+ bool is_card_claimed(size_t card_index) {
-+ jbyte val = _byte_map[card_index];
-+ return (val & (clean_card_mask_val() | claimed_card_val())) == claimed_card_val();
-+ }
-+
-+ void set_card_claimed(size_t card_index) {
-+ jbyte val = _byte_map[card_index];
-+ if (val == clean_card_val()) {
-+ val = (jbyte)claimed_card_val();
-+ } else {
-+ val |= (jbyte)claimed_card_val();
-+ }
-+ _byte_map[card_index] = val;
-+ }
-+
-+ void verify_g1_young_region(MemRegion mr) PRODUCT_RETURN;
-+ void g1_mark_as_young(const MemRegion& mr);
-+
-+ bool mark_card_deferred(size_t card_index);
-+
-+ bool is_card_deferred(size_t card_index) {
-+ jbyte val = _byte_map[card_index];
-+ return (val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val();
-+ }
-+
- };
-
- // Adds card-table logging to the post-barrier.
---- ./hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -71,6 +71,9 @@
- diagnostic(bool, G1TraceConcRefinement, false, \
- "Trace G1 concurrent refinement") \
- \
-+ experimental(bool, G1TraceStringSymbolTableScrubbing, false, \
-+ "Trace information string and symbol table scrubbing.") \
-+ \
- product(double, G1ConcMarkStepDurationMillis, 10.0, \
- "Target duration of individual concurrent marking steps " \
- "in milliseconds.") \
-@@ -332,7 +335,14 @@
- \
- develop(bool, G1EvacuationFailureALotDuringMixedGC, true, \
- "Force use of evacuation failure handling during mixed " \
-- "evacuation pauses")
-+ "evacuation pauses") \
-+ \
-+ diagnostic(bool, G1VerifyRSetsDuringFullGC, false, \
-+ "If true, perform verification of each heap region's " \
-+ "remembered set when verifying the heap during a full GC.") \
-+ \
-+ diagnostic(bool, G1VerifyHeapRegionCodeRoots, false, \
-+ "Verify the code root lists attached to each heap region.")
-
- G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG)
-
---- ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -23,6 +23,7 @@
- */
-
- #include "precompiled.hpp"
-+#include "code/nmethod.hpp"
- #include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
- #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
- #include "gc_implementation/g1/g1OopClosures.inline.hpp"
-@@ -50,144 +51,6 @@
- OopClosure* oc) :
- _r_bottom(r->bottom()), _r_end(r->end()), _oc(oc) { }
-
--class VerifyLiveClosure: public OopClosure {
--private:
-- G1CollectedHeap* _g1h;
-- CardTableModRefBS* _bs;
-- oop _containing_obj;
-- bool _failures;
-- int _n_failures;
-- VerifyOption _vo;
--public:
-- // _vo == UsePrevMarking -> use "prev" marking information,
-- // _vo == UseNextMarking -> use "next" marking information,
-- // _vo == UseMarkWord -> use mark word from object header.
-- VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) :
-- _g1h(g1h), _bs(NULL), _containing_obj(NULL),
-- _failures(false), _n_failures(0), _vo(vo)
-- {
-- BarrierSet* bs = _g1h->barrier_set();
-- if (bs->is_a(BarrierSet::CardTableModRef))
-- _bs = (CardTableModRefBS*)bs;
-- }
--
-- void set_containing_obj(oop obj) {
-- _containing_obj = obj;
-- }
--
-- bool failures() { return _failures; }
-- int n_failures() { return _n_failures; }
--
-- virtual void do_oop(narrowOop* p) { do_oop_work(p); }
-- virtual void do_oop( oop* p) { do_oop_work(p); }
--
-- void print_object(outputStream* out, oop obj) {
--#ifdef PRODUCT
-- klassOop k = obj->klass();
-- const char* class_name = instanceKlass::cast(k)->external_name();
-- out->print_cr("class name %s", class_name);
--#else // PRODUCT
-- obj->print_on(out);
--#endif // PRODUCT
-- }
--
-- template <class T>
-- void do_oop_work(T* p) {
-- assert(_containing_obj != NULL, "Precondition");
-- assert(!_g1h->is_obj_dead_cond(_containing_obj, _vo),
-- "Precondition");
-- T heap_oop = oopDesc::load_heap_oop(p);
-- if (!oopDesc::is_null(heap_oop)) {
-- oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-- bool failed = false;
-- if (!_g1h->is_in_closed_subset(obj) || _g1h->is_obj_dead_cond(obj, _vo)) {
-- MutexLockerEx x(ParGCRareEvent_lock,
-- Mutex::_no_safepoint_check_flag);
--
-- if (!_failures) {
-- gclog_or_tty->print_cr("");
-- gclog_or_tty->print_cr("----------");
-- }
-- if (!_g1h->is_in_closed_subset(obj)) {
-- HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
-- gclog_or_tty->print_cr("Field "PTR_FORMAT
-- " of live obj "PTR_FORMAT" in region "
-- "["PTR_FORMAT", "PTR_FORMAT")",
-- p, (void*) _containing_obj,
-- from->bottom(), from->end());
-- print_object(gclog_or_tty, _containing_obj);
-- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
-- (void*) obj);
-- } else {
-- HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
-- HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
-- gclog_or_tty->print_cr("Field "PTR_FORMAT
-- " of live obj "PTR_FORMAT" in region "
-- "["PTR_FORMAT", "PTR_FORMAT")",
-- p, (void*) _containing_obj,
-- from->bottom(), from->end());
-- print_object(gclog_or_tty, _containing_obj);
-- gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
-- "["PTR_FORMAT", "PTR_FORMAT")",
-- (void*) obj, to->bottom(), to->end());
-- print_object(gclog_or_tty, obj);
-- }
-- gclog_or_tty->print_cr("----------");
-- gclog_or_tty->flush();
-- _failures = true;
-- failed = true;
-- _n_failures++;
-- }
--
-- if (!_g1h->full_collection()) {
-- HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
-- HeapRegion* to = _g1h->heap_region_containing(obj);
-- if (from != NULL && to != NULL &&
-- from != to &&
-- !to->isHumongous()) {
-- jbyte cv_obj = *_bs->byte_for_const(_containing_obj);
-- jbyte cv_field = *_bs->byte_for_const(p);
-- const jbyte dirty = CardTableModRefBS::dirty_card_val();
--
-- bool is_bad = !(from->is_young()
-- || to->rem_set()->contains_reference(p)
-- || !G1HRRSFlushLogBuffersOnVerify && // buffers were not flushed
-- (_containing_obj->is_objArray() ?
-- cv_field == dirty
-- : cv_obj == dirty || cv_field == dirty));
-- if (is_bad) {
-- MutexLockerEx x(ParGCRareEvent_lock,
-- Mutex::_no_safepoint_check_flag);
--
-- if (!_failures) {
-- gclog_or_tty->print_cr("");
-- gclog_or_tty->print_cr("----------");
-- }
-- gclog_or_tty->print_cr("Missing rem set entry:");
-- gclog_or_tty->print_cr("Field "PTR_FORMAT" "
-- "of obj "PTR_FORMAT", "
-- "in region "HR_FORMAT,
-- p, (void*) _containing_obj,
-- HR_FORMAT_PARAMS(from));
-- _containing_obj->print_on(gclog_or_tty);
-- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
-- "in region "HR_FORMAT,
-- (void*) obj,
-- HR_FORMAT_PARAMS(to));
-- obj->print_on(gclog_or_tty);
-- gclog_or_tty->print_cr("Obj head CTE = %d, field CTE = %d.",
-- cv_obj, cv_field);
-- gclog_or_tty->print_cr("----------");
-- gclog_or_tty->flush();
-- _failures = true;
-- if (!failed) _n_failures++;
-- }
-- }
-- }
-- }
-- }
--};
--
- template<class ClosureType>
- HeapWord* walk_mem_region_loop(ClosureType* cl, G1CollectedHeap* g1h,
- HeapRegion* hr,
-@@ -314,6 +177,11 @@
- region_size = MAX_REGION_SIZE;
- }
-
-+ if (region_size != G1HeapRegionSize) {
-+ // Update the flag to make sure that PrintFlagsFinal logs the correct value
-+ FLAG_SET_ERGO(uintx, G1HeapRegionSize, region_size);
-+ }
-+
- // And recalculate the log.
- region_size_log = log2_long((jlong) region_size);
-
-@@ -363,7 +231,7 @@
- if (!par) {
- // If this is parallel, this will be done later.
- HeapRegionRemSet* hrrs = rem_set();
-- if (hrrs != NULL) hrrs->clear();
-+ hrrs->clear();
- _claimed = InitialClaimValue;
- }
- zero_marked_bytes();
-@@ -504,6 +372,7 @@
- _rem_set(NULL), _recorded_rs_length(0), _predicted_elapsed_time_ms(0),
- _predicted_bytes_to_copy(0)
- {
-+ _rem_set = new HeapRegionRemSet(sharedOffsetArray, this);
- _orig_end = mr.end();
- // Note that initialize() will set the start of the unmarked area of the
- // region.
-@@ -511,8 +380,6 @@
- set_top(bottom());
- set_saved_mark();
-
-- _rem_set = new HeapRegionRemSet(sharedOffsetArray, this);
--
- assert(HeapRegionRemSet::num_par_rem_sets() > 0, "Invariant.");
- }
-
-@@ -732,6 +599,161 @@
- return NULL;
- }
-
-+// Code roots support
-+
-+void HeapRegion::add_strong_code_root(nmethod* nm) {
-+ HeapRegionRemSet* hrrs = rem_set();
-+ hrrs->add_strong_code_root(nm);
-+}
-+
-+void HeapRegion::remove_strong_code_root(nmethod* nm) {
-+ HeapRegionRemSet* hrrs = rem_set();
-+ hrrs->remove_strong_code_root(nm);
-+}
-+
-+void HeapRegion::migrate_strong_code_roots() {
-+ assert(in_collection_set(), "only collection set regions");
-+ assert(!isHumongous(),
-+ err_msg("humongous region "HR_FORMAT" should not have been added to collection set",
-+ HR_FORMAT_PARAMS(this)));
-+
-+ HeapRegionRemSet* hrrs = rem_set();
-+ hrrs->migrate_strong_code_roots();
-+}
-+
-+void HeapRegion::strong_code_roots_do(CodeBlobClosure* blk) const {
-+ HeapRegionRemSet* hrrs = rem_set();
-+ hrrs->strong_code_roots_do(blk);
-+}
-+
-+class VerifyStrongCodeRootOopClosure: public OopClosure {
-+ const HeapRegion* _hr;
-+ nmethod* _nm;
-+ bool _failures;
-+ bool _has_oops_in_region;
-+
-+ template <class T> void do_oop_work(T* p) {
-+ T heap_oop = oopDesc::load_heap_oop(p);
-+ if (!oopDesc::is_null(heap_oop)) {
-+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-+
-+ // Note: not all the oops embedded in the nmethod are in the
-+ // current region. We only look at those which are.
-+ if (_hr->is_in(obj)) {
-+ // Object is in the region. Check that its less than top
-+ if (_hr->top() <= (HeapWord*)obj) {
-+ // Object is above top
-+ gclog_or_tty->print_cr("Object "PTR_FORMAT" in region "
-+ "["PTR_FORMAT", "PTR_FORMAT") is above "
-+ "top "PTR_FORMAT,
-+ obj, _hr->bottom(), _hr->end(), _hr->top());
-+ _failures = true;
-+ return;
-+ }
-+ // Nmethod has at least one oop in the current region
-+ _has_oops_in_region = true;
-+ }
-+ }
-+ }
-+
-+public:
-+ VerifyStrongCodeRootOopClosure(const HeapRegion* hr, nmethod* nm):
-+ _hr(hr), _failures(false), _has_oops_in_region(false) {}
-+
-+ void do_oop(narrowOop* p) { do_oop_work(p); }
-+ void do_oop(oop* p) { do_oop_work(p); }
-+
-+ bool failures() { return _failures; }
-+ bool has_oops_in_region() { return _has_oops_in_region; }
-+};
-+
-+class VerifyStrongCodeRootCodeBlobClosure: public CodeBlobClosure {
-+ const HeapRegion* _hr;
-+ bool _failures;
-+public:
-+ VerifyStrongCodeRootCodeBlobClosure(const HeapRegion* hr) :
-+ _hr(hr), _failures(false) {}
-+
-+ void do_code_blob(CodeBlob* cb) {
-+ nmethod* nm = (cb == NULL) ? NULL : cb->as_nmethod_or_null();
-+ if (nm != NULL) {
-+ // Verify that the nemthod is live
-+ if (!nm->is_alive()) {
-+ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod "
-+ PTR_FORMAT" in its strong code roots",
-+ _hr->bottom(), _hr->end(), nm);
-+ _failures = true;
-+ } else {
-+ VerifyStrongCodeRootOopClosure oop_cl(_hr, nm);
-+ nm->oops_do(&oop_cl);
-+ if (!oop_cl.has_oops_in_region()) {
-+ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod "
-+ PTR_FORMAT" in its strong code roots "
-+ "with no pointers into region",
-+ _hr->bottom(), _hr->end(), nm);
-+ _failures = true;
-+ } else if (oop_cl.failures()) {
-+ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other "
-+ "failures for nmethod "PTR_FORMAT,
-+ _hr->bottom(), _hr->end(), nm);
-+ _failures = true;
-+ }
-+ }
-+ }
-+ }
-+
-+ bool failures() { return _failures; }
-+};
-+
-+void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const {
-+ if (!G1VerifyHeapRegionCodeRoots) {
-+ // We're not verifying code roots.
-+ return;
-+ }
-+ if (vo == VerifyOption_G1UseMarkWord) {
-+ // Marking verification during a full GC is performed after class
-+ // unloading, code cache unloading, etc so the strong code roots
-+ // attached to each heap region are in an inconsistent state. They won't
-+ // be consistent until the strong code roots are rebuilt after the
-+ // actual GC. Skip verifying the strong code roots in this particular
-+ // time.
-+ assert(VerifyDuringGC, "only way to get here");
-+ return;
-+ }
-+
-+ HeapRegionRemSet* hrrs = rem_set();
-+ int strong_code_roots_length = hrrs->strong_code_roots_list_length();
-+
-+ // if this region is empty then there should be no entries
-+ // on its strong code root list
-+ if (is_empty()) {
-+ if (strong_code_roots_length > 0) {
-+ gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty "
-+ "but has "INT32_FORMAT" code root entries",
-+ bottom(), end(), strong_code_roots_length);
-+ *failures = true;
-+ }
-+ return;
-+ }
-+
-+ if (continuesHumongous()) {
-+ if (strong_code_roots_length > 0) {
-+ gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous "
-+ "region but has "INT32_FORMAT" code root entries",
-+ HR_FORMAT_PARAMS(this), strong_code_roots_length);
-+ *failures = true;
-+ }
-+ return;
-+ }
-+
-+ VerifyStrongCodeRootCodeBlobClosure cb_cl(this);
-+ strong_code_roots_do(&cb_cl);
-+
-+ if (cb_cl.failures()) {
-+ *failures = true;
-+ }
-+}
-+
- void HeapRegion::print() const { print_on(gclog_or_tty); }
- void HeapRegion::print_on(outputStream* st) const {
- if (isHumongous()) {
-@@ -760,10 +782,143 @@
- G1OffsetTableContigSpace::print_on(st);
- }
-
--void HeapRegion::verify() const {
-- bool dummy = false;
-- verify(VerifyOption_G1UsePrevMarking, /* failures */ &dummy);
--}
-+class VerifyLiveClosure: public OopClosure {
-+private:
-+ G1CollectedHeap* _g1h;
-+ CardTableModRefBS* _bs;
-+ oop _containing_obj;
-+ bool _failures;
-+ int _n_failures;
-+ VerifyOption _vo;
-+public:
-+ // _vo == UsePrevMarking -> use "prev" marking information,
-+ // _vo == UseNextMarking -> use "next" marking information,
-+ // _vo == UseMarkWord -> use mark word from object header.
-+ VerifyLiveClosure(G1CollectedHeap* g1h, VerifyOption vo) :
-+ _g1h(g1h), _bs(NULL), _containing_obj(NULL),
-+ _failures(false), _n_failures(0), _vo(vo)
-+ {
-+ BarrierSet* bs = _g1h->barrier_set();
-+ if (bs->is_a(BarrierSet::CardTableModRef))
-+ _bs = (CardTableModRefBS*)bs;
-+ }
-+
-+ void set_containing_obj(oop obj) {
-+ _containing_obj = obj;
-+ }
-+
-+ bool failures() { return _failures; }
-+ int n_failures() { return _n_failures; }
-+
-+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
-+ virtual void do_oop( oop* p) { do_oop_work(p); }
-+
-+ void print_object(outputStream* out, oop obj) {
-+#ifdef PRODUCT
-+ klassOop k = obj->klass();
-+ const char* class_name = instanceKlass::cast(k)->external_name();
-+ out->print_cr("class name %s", class_name);
-+#else // PRODUCT
-+ obj->print_on(out);
-+#endif // PRODUCT
-+ }
-+
-+ template <class T>
-+ void do_oop_work(T* p) {
-+ assert(_containing_obj != NULL, "Precondition");
-+ assert(!_g1h->is_obj_dead_cond(_containing_obj, _vo),
-+ "Precondition");
-+ T heap_oop = oopDesc::load_heap_oop(p);
-+ if (!oopDesc::is_null(heap_oop)) {
-+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-+ bool failed = false;
-+ if (!_g1h->is_in_closed_subset(obj) || _g1h->is_obj_dead_cond(obj, _vo)) {
-+ MutexLockerEx x(ParGCRareEvent_lock,
-+ Mutex::_no_safepoint_check_flag);
-+
-+ if (!_failures) {
-+ gclog_or_tty->print_cr("");
-+ gclog_or_tty->print_cr("----------");
-+ }
-+ if (!_g1h->is_in_closed_subset(obj)) {
-+ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
-+ gclog_or_tty->print_cr("Field "PTR_FORMAT
-+ " of live obj "PTR_FORMAT" in region "
-+ "["PTR_FORMAT", "PTR_FORMAT")",
-+ p, (void*) _containing_obj,
-+ from->bottom(), from->end());
-+ print_object(gclog_or_tty, _containing_obj);
-+ gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
-+ (void*) obj);
-+ } else {
-+ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
-+ HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
-+ gclog_or_tty->print_cr("Field "PTR_FORMAT
-+ " of live obj "PTR_FORMAT" in region "
-+ "["PTR_FORMAT", "PTR_FORMAT")",
-+ p, (void*) _containing_obj,
-+ from->bottom(), from->end());
-+ print_object(gclog_or_tty, _containing_obj);
-+ gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
-+ "["PTR_FORMAT", "PTR_FORMAT")",
-+ (void*) obj, to->bottom(), to->end());
-+ print_object(gclog_or_tty, obj);
-+ }
-+ gclog_or_tty->print_cr("----------");
-+ gclog_or_tty->flush();
-+ _failures = true;
-+ failed = true;
-+ _n_failures++;
-+ }
-+
-+ if (!_g1h->full_collection() || G1VerifyRSetsDuringFullGC) {
-+ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
-+ HeapRegion* to = _g1h->heap_region_containing(obj);
-+ if (from != NULL && to != NULL &&
-+ from != to &&
-+ !to->isHumongous()) {
-+ jbyte cv_obj = *_bs->byte_for_const(_containing_obj);
-+ jbyte cv_field = *_bs->byte_for_const(p);
-+ const jbyte dirty = CardTableModRefBS::dirty_card_val();
-+
-+ bool is_bad = !(from->is_young()
-+ || to->rem_set()->contains_reference(p)
-+ || !G1HRRSFlushLogBuffersOnVerify && // buffers were not flushed
-+ (_containing_obj->is_objArray() ?
-+ cv_field == dirty
-+ : cv_obj == dirty || cv_field == dirty));
-+ if (is_bad) {
-+ MutexLockerEx x(ParGCRareEvent_lock,
-+ Mutex::_no_safepoint_check_flag);
-+
-+ if (!_failures) {
-+ gclog_or_tty->print_cr("");
-+ gclog_or_tty->print_cr("----------");
-+ }
-+ gclog_or_tty->print_cr("Missing rem set entry:");
-+ gclog_or_tty->print_cr("Field "PTR_FORMAT" "
-+ "of obj "PTR_FORMAT", "
-+ "in region "HR_FORMAT,
-+ p, (void*) _containing_obj,
-+ HR_FORMAT_PARAMS(from));
-+ _containing_obj->print_on(gclog_or_tty);
-+ gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
-+ "in region "HR_FORMAT,
-+ (void*) obj,
-+ HR_FORMAT_PARAMS(to));
-+ obj->print_on(gclog_or_tty);
-+ gclog_or_tty->print_cr("Obj head CTE = %d, field CTE = %d.",
-+ cv_obj, cv_field);
-+ gclog_or_tty->print_cr("----------");
-+ gclog_or_tty->flush();
-+ _failures = true;
-+ if (!failed) _n_failures++;
-+ }
-+ }
-+ }
-+ }
-+ }
-+};
-
- // This really ought to be commoned up into OffsetTableContigSpace somehow.
- // We would need a mechanism to make that code skip dead objects.
-@@ -903,6 +1058,13 @@
- *failures = true;
- return;
- }
-+
-+ verify_strong_code_roots(vo, failures);
-+}
-+
-+void HeapRegion::verify() const {
-+ bool dummy = false;
-+ verify(VerifyOption_G1UsePrevMarking, /* failures */ &dummy);
- }
-
- // G1OffsetTableContigSpace code; copied from space.cpp. Hope this can go
---- ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -51,6 +51,7 @@
- class HeapRegionRemSetIterator;
- class HeapRegion;
- class HeapRegionSetBase;
-+class nmethod;
-
- #define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
- #define HR_FORMAT_PARAMS(_hr_) \
-@@ -374,7 +375,8 @@
- RebuildRSClaimValue = 5,
- ParEvacFailureClaimValue = 6,
- AggregateCountClaimValue = 7,
-- VerifyCountClaimValue = 8
-+ VerifyCountClaimValue = 8,
-+ ParMarkRootClaimValue = 9
- };
-
- inline HeapWord* par_allocate_no_bot_updates(size_t word_size) {
-@@ -801,6 +803,25 @@
-
- virtual void reset_after_compaction();
-
-+ // Routines for managing a list of code roots (attached to the
-+ // this region's RSet) that point into this heap region.
-+ void add_strong_code_root(nmethod* nm);
-+ void remove_strong_code_root(nmethod* nm);
-+
-+ // During a collection, migrate the successfully evacuated
-+ // strong code roots that referenced into this region to the
-+ // new regions that they now point into. Unsuccessfully
-+ // evacuated code roots are not migrated.
-+ void migrate_strong_code_roots();
-+
-+ // Applies blk->do_code_blob() to each of the entries in
-+ // the strong code roots list for this region
-+ void strong_code_roots_do(CodeBlobClosure* blk) const;
-+
-+ // Verify that the entries on the strong code root list for this
-+ // region are live and include at least one pointer into this region.
-+ void verify_strong_code_roots(VerifyOption vo, bool* failures) const;
-+
- void print() const;
- void print_on(outputStream* st) const;
-
---- ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -33,6 +33,7 @@
- #include "oops/oop.inline.hpp"
- #include "utilities/bitMap.inline.hpp"
- #include "utilities/globalDefinitions.hpp"
-+#include "utilities/growableArray.hpp"
-
- class PerRegionTable: public CHeapObj<mtGC> {
- friend class OtherRegionsTable;
-@@ -706,10 +707,11 @@
- // Cast away const in this case.
- MutexLockerEx x((Mutex*)&_m, Mutex::_no_safepoint_check_flag);
- size_t sum = 0;
-- PerRegionTable * cur = _first_all_fine_prts;
-- while (cur != NULL) {
-- sum += cur->mem_size();
-- cur = cur->next();
-+ // all PRTs are of the same size so it is sufficient to query only one of them.
-+ if (_first_all_fine_prts != NULL) {
-+ assert(_last_all_fine_prts != NULL &&
-+ _first_all_fine_prts->mem_size() == _last_all_fine_prts->mem_size(), "check that mem_size() is constant");
-+ sum += _first_all_fine_prts->mem_size() * _n_fine_entries;
- }
- sum += (sizeof(PerRegionTable*) * _max_fine_entries);
- sum += (_coarse_map.size_in_words() * HeapWordSize);
-@@ -845,7 +847,7 @@
-
- HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
- HeapRegion* hr)
-- : _bosa(bosa), _other_regions(hr) {
-+ : _bosa(bosa), _strong_code_roots_list(NULL), _other_regions(hr) {
- reset_for_par_iteration();
- }
-
-@@ -909,6 +911,12 @@
- }
-
- void HeapRegionRemSet::clear() {
-+ if (_strong_code_roots_list != NULL) {
-+ delete _strong_code_roots_list;
-+ }
-+ _strong_code_roots_list = new (ResourceObj::C_HEAP, mtGC)
-+ GrowableArray<nmethod*>(10, 0, NULL, true);
-+
- _other_regions.clear();
- assert(occupied() == 0, "Should be clear.");
- reset_for_par_iteration();
-@@ -926,6 +934,126 @@
- _other_regions.scrub(ctbs, region_bm, card_bm);
- }
-
-+
-+// Code roots support
-+
-+void HeapRegionRemSet::add_strong_code_root(nmethod* nm) {
-+ assert(nm != NULL, "sanity");
-+ // Search for the code blob from the RHS to avoid
-+ // duplicate entries as much as possible
-+ if (_strong_code_roots_list->find_from_end(nm) < 0) {
-+ // Code blob isn't already in the list
-+ _strong_code_roots_list->push(nm);
-+ }
-+}
-+
-+void HeapRegionRemSet::remove_strong_code_root(nmethod* nm) {
-+ assert(nm != NULL, "sanity");
-+ int idx = _strong_code_roots_list->find(nm);
-+ if (idx >= 0) {
-+ _strong_code_roots_list->remove_at(idx);
-+ }
-+ // Check that there were no duplicates
-+ guarantee(_strong_code_roots_list->find(nm) < 0, "duplicate entry found");
-+}
-+
-+class NMethodMigrationOopClosure : public OopClosure {
-+ G1CollectedHeap* _g1h;
-+ HeapRegion* _from;
-+ nmethod* _nm;
-+
-+ uint _num_self_forwarded;
-+
-+ template <class T> void do_oop_work(T* p) {
-+ T heap_oop = oopDesc::load_heap_oop(p);
-+ if (!oopDesc::is_null(heap_oop)) {
-+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
-+ if (obj->is_perm()) {
-+ // reference into perm gen - ignore.
-+ return;
-+ } else if (_from->is_in(obj)) {
-+ // Reference still points into the source region.
-+ // Since roots are immediately evacuated this means that
-+ // we must have self forwarded the object
-+ assert(obj->is_forwarded(),
-+ err_msg("code roots should be immediately evacuated. "
-+ "Ref: "PTR_FORMAT", "
-+ "Obj: "PTR_FORMAT", "
-+ "Region: "HR_FORMAT,
-+ p, (void*) obj, HR_FORMAT_PARAMS(_from)));
-+ assert(obj->forwardee() == obj,
-+ err_msg("not self forwarded? obj = "PTR_FORMAT, (void*)obj));
-+
-+ // The object has been self forwarded.
-+ // Note, if we're during an initial mark pause, there is
-+ // no need to explicitly mark object. It will be marked
-+ // during the regular evacuation failure handling code.
-+ _num_self_forwarded++;
-+ } else {
-+ // The reference points into a promotion or to-space region
-+ HeapRegion* to = _g1h->heap_region_containing(obj);
-+ to->rem_set()->add_strong_code_root(_nm);
-+ }
-+ }
-+ }
-+
-+public:
-+ NMethodMigrationOopClosure(G1CollectedHeap* g1h, HeapRegion* from, nmethod* nm):
-+ _g1h(g1h), _from(from), _nm(nm), _num_self_forwarded(0) {}
-+
-+ void do_oop(narrowOop* p) { do_oop_work(p); }
-+ void do_oop(oop* p) { do_oop_work(p); }
-+
-+ uint retain() { return _num_self_forwarded > 0; }
-+};
-+
-+void HeapRegionRemSet::migrate_strong_code_roots() {
-+ assert(hr()->in_collection_set(), "only collection set regions");
-+ assert(!hr()->isHumongous(),
-+ err_msg("humongous region "HR_FORMAT" should not have been added to the collection set",
-+ HR_FORMAT_PARAMS(hr())));
-+
-+ ResourceMark rm;
-+
-+ // List of code blobs to retain for this region
-+ GrowableArray<nmethod*> to_be_retained(10);
-+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
-+
-+ while (_strong_code_roots_list->is_nonempty()) {
-+ nmethod *nm = _strong_code_roots_list->pop();
-+ if (nm != NULL) {
-+ NMethodMigrationOopClosure oop_cl(g1h, hr(), nm);
-+ nm->oops_do(&oop_cl);
-+ if (oop_cl.retain()) {
-+ to_be_retained.push(nm);
-+ }
-+ }
-+ }
-+
-+ // Now push any code roots we need to retain
-+ assert(to_be_retained.is_empty() || hr()->evacuation_failed(),
-+ "Retained nmethod list must be empty or "
-+ "evacuation of this region failed");
-+
-+ while (to_be_retained.is_nonempty()) {
-+ nmethod* nm = to_be_retained.pop();
-+ assert(nm != NULL, "sanity");
-+ add_strong_code_root(nm);
-+ }
-+}
-+
-+void HeapRegionRemSet::strong_code_roots_do(CodeBlobClosure* blk) const {
-+ for (int i = 0; i < _strong_code_roots_list->length(); i += 1) {
-+ nmethod* nm = _strong_code_roots_list->at(i);
-+ blk->do_code_blob(nm);
-+ }
-+}
-+
-+size_t HeapRegionRemSet::strong_code_roots_mem_size() {
-+ return sizeof(GrowableArray<nmethod*>) +
-+ _strong_code_roots_list->max_length() * sizeof(nmethod*);
-+}
-+
- //-------------------- Iteration --------------------
-
- HeapRegionRemSetIterator::
---- ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -37,6 +37,7 @@
- class HeapRegionRemSetIterator;
- class PerRegionTable;
- class SparsePRT;
-+class nmethod;
-
- // Essentially a wrapper around SparsePRTCleanupTask. See
- // sparsePRT.hpp for more details.
-@@ -191,6 +192,10 @@
- G1BlockOffsetSharedArray* _bosa;
- G1BlockOffsetSharedArray* bosa() const { return _bosa; }
-
-+ // A list of code blobs (nmethods) whose code contains pointers into
-+ // the region that owns this RSet.
-+ GrowableArray<nmethod*>* _strong_code_roots_list;
-+
- OtherRegionsTable _other_regions;
-
- enum ParIterState { Unclaimed, Claimed, Complete };
-@@ -285,11 +290,13 @@
- void init_iterator(HeapRegionRemSetIterator* iter) const;
-
- // The actual # of bytes this hr_remset takes up.
-+ // Note also includes the strong code root set.
- size_t mem_size() {
- return _other_regions.mem_size()
- // This correction is necessary because the above includes the second
- // part.
-- + sizeof(this) - sizeof(OtherRegionsTable);
-+ + (sizeof(this) - sizeof(OtherRegionsTable))
-+ + strong_code_roots_mem_size();
- }
-
- // Returns the memory occupancy of all static data structures associated
-@@ -307,6 +314,37 @@
- bool contains_reference(OopOrNarrowOopStar from) const {
- return _other_regions.contains_reference(from);
- }
-+
-+ // Routines for managing the list of code roots that point into
-+ // the heap region that owns this RSet.
-+ void add_strong_code_root(nmethod* nm);
-+ void remove_strong_code_root(nmethod* nm);
-+
-+ // During a collection, migrate the successfully evacuated strong
-+ // code roots that referenced into the region that owns this RSet
-+ // to the RSets of the new regions that they now point into.
-+ // Unsuccessfully evacuated code roots are not migrated.
-+ void migrate_strong_code_roots();
-+
-+ // Applies blk->do_code_blob() to each of the entries in
-+ // the strong code roots list
-+ void strong_code_roots_do(CodeBlobClosure* blk) const;
-+
-+ // Returns the number of elements in the strong code roots list
-+ int strong_code_roots_list_length() {
-+ return _strong_code_roots_list->length();
-+ }
-+
-+ // Returns true if the strong code roots contains the given
-+ // nmethod.
-+ bool strong_code_roots_list_contains(nmethod* nm) {
-+ return _strong_code_roots_list->contains(nm);
-+ }
-+
-+ // Returns the amount of memory, in bytes, currently
-+ // consumed by the strong code roots.
-+ size_t strong_code_roots_mem_size();
-+
- void print() const;
-
- // Called during a stop-world phase to perform any deferred cleanups.
---- ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -79,6 +79,10 @@
-
- void reset() { if (_buf != NULL) _index = _sz; }
-
-+ void enqueue(volatile void* ptr) {
-+ enqueue((void*)(ptr));
-+ }
-+
- // Enqueues the given "obj".
- void enqueue(void* ptr) {
- if (!_active) return;
---- ./hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -923,7 +923,7 @@
-
- GenCollectedHeap* gch = GenCollectedHeap::heap();
-
-- _gc_timer->register_gc_start(os::elapsed_counter());
-+ _gc_timer->register_gc_start();
-
- assert(gch->kind() == CollectedHeap::GenCollectedHeap,
- "not a CMS generational heap");
-@@ -1100,7 +1100,7 @@
- gch->trace_heap_after_gc(&gc_tracer);
- gc_tracer.report_tenuring_threshold(tenuring_threshold());
-
-- _gc_timer->register_gc_end(os::elapsed_counter());
-+ _gc_timer->register_gc_end();
-
- gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
- }
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -90,14 +90,16 @@
- og_min_size, og_max_size,
- yg_min_size, yg_max_size);
-
-- // The ReservedSpace ctor used below requires that the page size for the perm
-- // gen is <= the page size for the rest of the heap (young + old gens).
- const size_t og_page_sz = os::page_size_for_region(yg_min_size + og_min_size,
- yg_max_size + og_max_size,
- 8);
-- const size_t pg_page_sz = MIN2(os::page_size_for_region(pg_min_size,
-- pg_max_size, 16),
-- og_page_sz);
-+
-+ // Use the same page size for both perm gen and old gen,
-+ // to allow large pages to be allocated when the heap is reserved
-+ // for the implementations that can't 'commit' large pages.
-+ // NEEDS_CLEANUP. ReservedHeapSpace/ReservedSpace that takes both
-+ // a prefix and a suffix alignment can now be removed.
-+ const size_t pg_page_sz = og_page_sz;
-
- const size_t pg_align = set_alignment(_perm_gen_alignment, pg_page_sz);
- const size_t og_align = set_alignment(_old_gen_alignment, og_page_sz);
-@@ -138,12 +140,9 @@
- total_reserved = add_and_check_overflow(total_reserved, og_max_size);
- total_reserved = add_and_check_overflow(total_reserved, yg_max_size);
-
-- char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
-+ assert(is_size_aligned(total_reserved, og_align), "Must be");
-
-- // The main part of the heap (old gen + young gen) can often use a larger page
-- // size than is needed or wanted for the perm gen. Use the "compound
-- // alignment" ReservedSpace ctor to avoid having to use the same page size for
-- // all gens.
-+ char* addr = Universe::preferred_heap_base(total_reserved, og_align, Universe::UnscaledNarrowOop);
-
- ReservedHeapSpace heap_rs(pg_max_size, pg_align, og_max_size + yg_max_size,
- og_align, addr);
-@@ -153,12 +152,12 @@
- // Failed to reserve at specified address - the requested memory
- // region is taken already, for example, by 'java' launcher.
- // Try again to reserver heap higher.
-- addr = Universe::preferred_heap_base(total_reserved, Universe::ZeroBasedNarrowOop);
-+ addr = Universe::preferred_heap_base(total_reserved, og_align, Universe::ZeroBasedNarrowOop);
- ReservedHeapSpace heap_rs0(pg_max_size, pg_align, og_max_size + yg_max_size,
- og_align, addr);
- if (addr != NULL && !heap_rs0.is_reserved()) {
- // Failed to reserve at specified address again - give up.
-- addr = Universe::preferred_heap_base(total_reserved, Universe::HeapBasedNarrowOop);
-+ addr = Universe::preferred_heap_base(total_reserved, og_align, Universe::HeapBasedNarrowOop);
- assert(addr == NULL, "");
- ReservedHeapSpace heap_rs1(pg_max_size, pg_align, og_max_size + yg_max_size,
- og_align, addr);
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -24,6 +24,7 @@
-
- #include "precompiled.hpp"
- #include "gc_implementation/parallelScavenge/generationSizer.hpp"
-+#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
- #include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
- #include "gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.hpp"
-@@ -78,6 +79,38 @@
- _old_gen_policy_is_ready = false;
- }
-
-+size_t PSAdaptiveSizePolicy::calculate_free_based_on_live(size_t live, uintx ratio_as_percentage) {
-+ // We want to calculate how much free memory there can be based on the
-+ // amount of live data currently in the old gen. Using the formula:
-+ // ratio * (free + live) = free
-+ // Some equation solving later we get:
-+ // free = (live * ratio) / (1 - ratio)
-+
-+ const double ratio = ratio_as_percentage / 100.0;
-+ const double ratio_inverse = 1.0 - ratio;
-+ const double tmp = live * ratio;
-+ size_t free = (size_t)(tmp / ratio_inverse);
-+
-+ return free;
-+}
-+
-+size_t PSAdaptiveSizePolicy::calculated_old_free_size_in_bytes() const {
-+ size_t free_size = (size_t)(_promo_size + avg_promoted()->padded_average());
-+ size_t live = ParallelScavengeHeap::heap()->old_gen()->used_in_bytes();
-+
-+ if (MinHeapFreeRatio != 0) {
-+ size_t min_free = calculate_free_based_on_live(live, MinHeapFreeRatio);
-+ free_size = MAX2(free_size, min_free);
-+ }
-+
-+ if (MaxHeapFreeRatio != 100) {
-+ size_t max_free = calculate_free_based_on_live(live, MaxHeapFreeRatio);
-+ free_size = MIN2(max_free, free_size);
-+ }
-+
-+ return free_size;
-+}
-+
- void PSAdaptiveSizePolicy::major_collection_begin() {
- // Update the interval time
- _major_timer.stop();
-@@ -1107,3 +1140,18 @@
- st,
- PSScavenge::tenuring_threshold());
- }
-+
-+#ifndef PRODUCT
-+
-+void TestOldFreeSpaceCalculation_test() {
-+ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(100, 20) == 25, "Calculation of free memory failed");
-+ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(100, 50) == 100, "Calculation of free memory failed");
-+ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(100, 60) == 150, "Calculation of free memory failed");
-+ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(100, 75) == 300, "Calculation of free memory failed");
-+ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(400, 20) == 100, "Calculation of free memory failed");
-+ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(400, 50) == 400, "Calculation of free memory failed");
-+ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(400, 60) == 600, "Calculation of free memory failed");
-+ assert(PSAdaptiveSizePolicy::calculate_free_based_on_live(400, 75) == 1200, "Calculation of free memory failed");
-+}
-+
-+#endif /* !PRODUCT */
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -238,7 +238,6 @@
- void major_collection_begin();
- void major_collection_end(size_t amount_live, GCCause::Cause gc_cause);
-
-- //
- void tenured_allocation(size_t size) {
- _avg_pretenured->sample(size);
- }
-@@ -246,9 +245,9 @@
- // Accessors
- // NEEDS_CLEANUP should use sizes.hpp
-
-- size_t calculated_old_free_size_in_bytes() const {
-- return (size_t)(_promo_size + avg_promoted()->padded_average());
-- }
-+ static size_t calculate_free_based_on_live(size_t live, uintx ratio_as_percentage);
-+
-+ size_t calculated_old_free_size_in_bytes() const;
-
- size_t average_old_live_in_bytes() const {
- return (size_t) avg_old_live()->average();
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -116,7 +116,7 @@
- assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
- GCCause::Cause gc_cause = heap->gc_cause();
-
-- _gc_timer->register_gc_start(os::elapsed_counter());
-+ _gc_timer->register_gc_start();
- _gc_tracer->report_gc_start(gc_cause, _gc_timer->gc_start());
-
- PSAdaptiveSizePolicy* size_policy = heap->size_policy();
-@@ -149,8 +149,7 @@
-
- if (VerifyBeforeGC && heap->total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
-- gclog_or_tty->print(" VerifyBeforeGC:");
-- Universe::verify();
-+ Universe::verify(" VerifyBeforeGC:");
- }
-
- // Verify object start arrays
-@@ -359,8 +358,7 @@
-
- if (VerifyAfterGC && heap->total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
-- gclog_or_tty->print(" VerifyAfterGC:");
-- Universe::verify();
-+ Universe::verify(" VerifyAfterGC:");
- }
-
- // Re-verify object start arrays
-@@ -386,7 +384,7 @@
- ParallelTaskTerminator::print_termination_counts();
- #endif
-
-- _gc_timer->register_gc_end(os::elapsed_counter());
-+ _gc_timer->register_gc_end();
-
- _gc_tracer->report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
-
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2012, 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
-@@ -1034,8 +1034,7 @@
-
- if (VerifyBeforeGC && heap->total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
-- gclog_or_tty->print(" VerifyBeforeGC:");
-- Universe::verify();
-+ Universe::verify(" VerifyBeforeGC:");
- }
-
- // Verify object start arrays
-@@ -2041,7 +2040,7 @@
-
- ParallelScavengeHeap* heap = gc_heap();
-
-- _gc_timer.register_gc_start(os::elapsed_counter());
-+ _gc_timer.register_gc_start();
- _gc_tracer.report_gc_start(heap->gc_cause(), _gc_timer.gc_start());
-
- TimeStamp marking_start;
-@@ -2248,8 +2247,7 @@
-
- if (VerifyAfterGC && heap->total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
-- gclog_or_tty->print(" VerifyAfterGC:");
-- Universe::verify();
-+ Universe::verify(" VerifyAfterGC:");
- }
-
- // Re-verify object start arrays
-@@ -2285,7 +2283,7 @@
- ParallelTaskTerminator::print_termination_counts();
- #endif
-
-- _gc_timer.register_gc_end(os::elapsed_counter());
-+ _gc_timer.register_gc_end();
-
- _gc_tracer.report_dense_prefix(dense_prefix(old_space_id));
- _gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions());
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-09-06 11:22:11.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -266,7 +266,7 @@
- assert(_preserved_mark_stack.is_empty(), "should be empty");
- assert(_preserved_oop_stack.is_empty(), "should be empty");
-
-- _gc_timer.register_gc_start(os::elapsed_counter());
-+ _gc_timer.register_gc_start();
-
- TimeStamp scavenge_entry;
- TimeStamp scavenge_midpoint;
-@@ -325,8 +325,7 @@
-
- if (VerifyBeforeGC && heap->total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
-- gclog_or_tty->print(" VerifyBeforeGC:");
-- Universe::verify();
-+ Universe::verify(" VerifyBeforeGC:");
- }
-
- {
-@@ -536,8 +535,19 @@
- counters->update_survivor_overflowed(_survivor_overflow);
- }
-
-+ size_t max_young_size = young_gen->max_size();
-+
-+ // Deciding a free ratio in the young generation is tricky, so if
-+ // MinHeapFreeRatio or MaxHeapFreeRatio are in use (implicating
-+ // that the old generation size may have been limited because of them) we
-+ // should then limit our young generation size using NewRatio to have it
-+ // follow the old generation size.
-+ if (MinHeapFreeRatio != 0 || MaxHeapFreeRatio != 100) {
-+ max_young_size = MIN2(old_gen->capacity_in_bytes() / NewRatio, young_gen->max_size());
-+ }
-+
- size_t survivor_limit =
-- size_policy->max_survivor_size(young_gen->max_size());
-+ size_policy->max_survivor_size(max_young_size);
- _tenuring_threshold =
- size_policy->compute_survivor_space_size_and_threshold(
- _survivor_overflow,
-@@ -560,8 +570,7 @@
- // Do call at minor collections?
- // Don't check if the size_policy is ready at this
- // level. Let the size_policy check that internally.
-- if (UseAdaptiveSizePolicy &&
-- UseAdaptiveGenerationSizePolicyAtMinorCollection &&
-+ if (UseAdaptiveGenerationSizePolicyAtMinorCollection &&
- ((gc_cause != GCCause::_java_lang_system_gc) ||
- UseAdaptiveSizePolicyWithSystemGC)) {
-
-@@ -570,7 +579,7 @@
- young_gen->from_space()->capacity_in_bytes() +
- young_gen->to_space()->capacity_in_bytes(),
- "Sizes of space in young gen are out-of-bounds");
-- size_t max_eden_size = young_gen->max_size() -
-+ size_t max_eden_size = max_young_size -
- young_gen->from_space()->capacity_in_bytes() -
- young_gen->to_space()->capacity_in_bytes();
- size_policy->compute_generation_free_space(young_gen->used_in_bytes(),
-@@ -661,8 +670,7 @@
-
- if (VerifyAfterGC && heap->total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
-- gclog_or_tty->print(" VerifyAfterGC:");
-- Universe::verify();
-+ Universe::verify(" VerifyAfterGC:");
- }
-
- heap->print_heap_after_gc();
-@@ -689,7 +697,7 @@
- #endif
-
-
-- _gc_timer.register_gc_end(os::elapsed_counter());
-+ _gc_timer.register_gc_end();
-
- _gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions());
-
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 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,52 +25,55 @@
- #include "precompiled.hpp"
- #include "gc_implementation/shared/gcTimer.hpp"
- #include "utilities/growableArray.hpp"
-+#include "utilities/ticks.inline.hpp"
-
--void GCTimer::register_gc_start(jlong time) {
-+// the "time" parameter for most functions
-+// has a default value set by Ticks::now()
-+
-+void GCTimer::register_gc_start(const Ticks& time) {
- _time_partitions.clear();
- _gc_start = time;
- }
-
--void GCTimer::register_gc_end(jlong time) {
-+void GCTimer::register_gc_end(const Ticks& time) {
- assert(!_time_partitions.has_active_phases(),
- "We should have ended all started phases, before ending the GC");
-
- _gc_end = time;
- }
-
--void GCTimer::register_gc_pause_start(const char* name, jlong time) {
-+void GCTimer::register_gc_pause_start(const char* name, const Ticks& time) {
- _time_partitions.report_gc_phase_start(name, time);
- }
-
--void GCTimer::register_gc_pause_end(jlong time) {
-+void GCTimer::register_gc_pause_end(const Ticks& time) {
- _time_partitions.report_gc_phase_end(time);
- }
-
--void GCTimer::register_gc_phase_start(const char* name, jlong time) {
-+void GCTimer::register_gc_phase_start(const char* name, const Ticks& time) {
- _time_partitions.report_gc_phase_start(name, time);
- }
-
--void GCTimer::register_gc_phase_end(jlong time) {
-+void GCTimer::register_gc_phase_end(const Ticks& time) {
- _time_partitions.report_gc_phase_end(time);
- }
-
--
--void STWGCTimer::register_gc_start(jlong time) {
-+void STWGCTimer::register_gc_start(const Ticks& time) {
- GCTimer::register_gc_start(time);
- register_gc_pause_start("GC Pause", time);
- }
-
--void STWGCTimer::register_gc_end(jlong time) {
-+void STWGCTimer::register_gc_end(const Ticks& time) {
- register_gc_pause_end(time);
- GCTimer::register_gc_end(time);
- }
-
--void ConcurrentGCTimer::register_gc_pause_start(const char* name, jlong time) {
-- GCTimer::register_gc_pause_start(name, time);
-+void ConcurrentGCTimer::register_gc_pause_start(const char* name) {
-+ GCTimer::register_gc_pause_start(name);
- }
-
--void ConcurrentGCTimer::register_gc_pause_end(jlong time) {
-- GCTimer::register_gc_pause_end(time);
-+void ConcurrentGCTimer::register_gc_pause_end() {
-+ GCTimer::register_gc_pause_end();
- }
-
- void PhasesStack::clear() {
-@@ -111,11 +114,11 @@
- void TimePartitions::clear() {
- _phases->clear();
- _active_phases.clear();
-- _sum_of_pauses = 0;
-- _longest_pause = 0;
-+ _sum_of_pauses = Tickspan();
-+ _longest_pause = Tickspan();
- }
-
--void TimePartitions::report_gc_phase_start(const char* name, jlong time) {
-+void TimePartitions::report_gc_phase_start(const char* name, const Ticks& time) {
- assert(_phases->length() <= 1000, "Too many recored phases?");
-
- int level = _active_phases.count();
-@@ -133,13 +136,13 @@
- void TimePartitions::update_statistics(GCPhase* phase) {
- // FIXME: This should only be done for pause phases
- if (phase->level() == 0) {
-- jlong pause = phase->end() - phase->start();
-+ const Tickspan pause = phase->end() - phase->start();
- _sum_of_pauses += pause;
- _longest_pause = MAX2(pause, _longest_pause);
- }
- }
-
--void TimePartitions::report_gc_phase_end(jlong time) {
-+void TimePartitions::report_gc_phase_end(const Ticks& time) {
- int phase_index = _active_phases.pop();
- GCPhase* phase = _phases->adr_at(phase_index);
- phase->set_end(time);
-@@ -157,14 +160,6 @@
- return _phases->adr_at(index);
- }
-
--jlong TimePartitions::sum_of_pauses() {
-- return _sum_of_pauses;
--}
--
--jlong TimePartitions::longest_pause() {
-- return _longest_pause;
--}
--
- bool TimePartitions::has_active_phases() {
- return _active_phases.count() > 0;
- }
-@@ -194,7 +189,7 @@
- max_nested_pause_phases();
- }
-
-- static void validate_pause_phase(GCPhase* phase, int level, const char* name, jlong start, jlong end) {
-+ static void validate_pause_phase(GCPhase* phase, int level, const char* name, const Ticks& start, const Ticks& end) {
- assert(phase->level() == level, "Incorrect level");
- assert(strcmp(phase->name(), name) == 0, "Incorrect name");
- assert(phase->start() == start, "Incorrect start");
-@@ -209,8 +204,8 @@
- TimePartitionPhasesIterator iter(&time_partitions);
-
- validate_pause_phase(iter.next(), 0, "PausePhase", 2, 8);
-- assert(time_partitions.sum_of_pauses() == 8-2, "Incorrect");
-- assert(time_partitions.longest_pause() == 8-2, "Incorrect");
-+ assert(time_partitions.sum_of_pauses() == Ticks(8) - Ticks(2), "Incorrect");
-+ assert(time_partitions.longest_pause() == Ticks(8) - Ticks(2), "Incorrect");
-
- assert(!iter.has_next(), "Too many elements");
- }
-@@ -227,8 +222,8 @@
- validate_pause_phase(iter.next(), 0, "PausePhase1", 2, 3);
- validate_pause_phase(iter.next(), 0, "PausePhase2", 4, 6);
-
-- assert(time_partitions.sum_of_pauses() == 3, "Incorrect");
-- assert(time_partitions.longest_pause() == 2, "Incorrect");
-+ assert(time_partitions.sum_of_pauses() == Ticks(3) - Ticks(0), "Incorrect");
-+ assert(time_partitions.longest_pause() == Ticks(2) - Ticks(0), "Incorrect");
-
- assert(!iter.has_next(), "Too many elements");
- }
-@@ -245,8 +240,8 @@
- validate_pause_phase(iter.next(), 0, "PausePhase", 2, 5);
- validate_pause_phase(iter.next(), 1, "SubPhase", 3, 4);
-
-- assert(time_partitions.sum_of_pauses() == 3, "Incorrect");
-- assert(time_partitions.longest_pause() == 3, "Incorrect");
-+ assert(time_partitions.sum_of_pauses() == Ticks(3) - Ticks(0), "Incorrect");
-+ assert(time_partitions.longest_pause() == Ticks(3) - Ticks(0), "Incorrect");
-
- assert(!iter.has_next(), "Too many elements");
- }
-@@ -269,8 +264,8 @@
- validate_pause_phase(iter.next(), 2, "SubPhase2", 4, 7);
- validate_pause_phase(iter.next(), 3, "SubPhase3", 5, 6);
-
-- assert(time_partitions.sum_of_pauses() == 7, "Incorrect");
-- assert(time_partitions.longest_pause() == 7, "Incorrect");
-+ assert(time_partitions.sum_of_pauses() == Ticks(7) - Ticks(0), "Incorrect");
-+ assert(time_partitions.longest_pause() == Ticks(7) - Ticks(0), "Incorrect");
-
- assert(!iter.has_next(), "Too many elements");
- }
-@@ -298,8 +293,8 @@
- validate_pause_phase(iter.next(), 1, "SubPhase3", 7, 8);
- validate_pause_phase(iter.next(), 1, "SubPhase4", 9, 10);
-
-- assert(time_partitions.sum_of_pauses() == 9, "Incorrect");
-- assert(time_partitions.longest_pause() == 9, "Incorrect");
-+ assert(time_partitions.sum_of_pauses() == Ticks(9) - Ticks(0), "Incorrect");
-+ assert(time_partitions.longest_pause() == Ticks(9) - Ticks(0), "Incorrect");
-
- assert(!iter.has_next(), "Too many elements");
- }
-@@ -336,8 +331,8 @@
- validate_pause_phase(iter.next(), 2, "SubPhase22", 12, 13);
- validate_pause_phase(iter.next(), 1, "SubPhase3", 15, 16);
-
-- assert(time_partitions.sum_of_pauses() == 15, "Incorrect");
-- assert(time_partitions.longest_pause() == 15, "Incorrect");
-+ assert(time_partitions.sum_of_pauses() == Ticks(15) - Ticks(0), "Incorrect");
-+ assert(time_partitions.longest_pause() == Ticks(15) - Ticks(0), "Incorrect");
-
- assert(!iter.has_next(), "Too many elements");
- }
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -28,6 +28,7 @@
- #include "memory/allocation.hpp"
- #include "prims/jni_md.h"
- #include "utilities/macros.hpp"
-+#include "utilities/ticks.hpp"
-
- class ConcurrentPhase;
- class GCPhase;
-@@ -45,21 +46,21 @@
- class GCPhase {
- const char* _name;
- int _level;
-- jlong _start;
-- jlong _end;
-+ Ticks _start;
-+ Ticks _end;
-
- public:
- void set_name(const char* name) { _name = name; }
-- const char* name() { return _name; }
-+ const char* name() const { return _name; }
-
-- int level() { return _level; }
-+ int level() const { return _level; }
- void set_level(int level) { _level = level; }
-
-- jlong start() { return _start; }
-- void set_start(jlong time) { _start = time; }
-+ const Ticks start() const { return _start; }
-+ void set_start(const Ticks& time) { _start = time; }
-
-- jlong end() { return _end; }
-- void set_end(jlong time) { _end = time; }
-+ const Ticks end() const { return _end; }
-+ void set_end(const Ticks& time) { _end = time; }
-
- virtual void accept(PhaseVisitor* visitor) = 0;
- };
-@@ -102,22 +103,22 @@
- GrowableArray<PausePhase>* _phases;
- PhasesStack _active_phases;
-
-- jlong _sum_of_pauses;
-- jlong _longest_pause;
-+ Tickspan _sum_of_pauses;
-+ Tickspan _longest_pause;
-
- public:
- TimePartitions();
- ~TimePartitions();
- void clear();
-
-- void report_gc_phase_start(const char* name, jlong time);
-- void report_gc_phase_end(jlong time);
-+ void report_gc_phase_start(const char* name, const Ticks& time);
-+ void report_gc_phase_end(const Ticks& time);
-
- int num_phases() const;
- GCPhase* phase_at(int index) const;
-
-- jlong sum_of_pauses();
-- jlong longest_pause();
-+ const Tickspan sum_of_pauses() const { return _sum_of_pauses; }
-+ const Tickspan longest_pause() const { return _longest_pause; }
-
- bool has_active_phases();
- private:
-@@ -133,40 +134,37 @@
- class GCTimer : public ResourceObj {
- NOT_PRODUCT(friend class GCTimerTest;)
- protected:
-- jlong _gc_start;
-- jlong _gc_end;
-+ Ticks _gc_start;
-+ Ticks _gc_end;
- TimePartitions _time_partitions;
-
- public:
-- virtual void register_gc_start(jlong time);
-- virtual void register_gc_end(jlong time);
-+ virtual void register_gc_start(const Ticks& time = Ticks::now());
-+ virtual void register_gc_end(const Ticks& time = Ticks::now());
-
-- void register_gc_phase_start(const char* name, jlong time);
-- void register_gc_phase_end(jlong time);
-+ void register_gc_phase_start(const char* name, const Ticks& time);
-+ void register_gc_phase_end(const Ticks& time);
-
-- jlong gc_start() { return _gc_start; }
-- jlong gc_end() { return _gc_end; }
-+ const Ticks gc_start() const { return _gc_start; }
-+ const Ticks gc_end() const { return _gc_end; }
-
- TimePartitions* time_partitions() { return &_time_partitions; }
-
-- long longest_pause();
-- long sum_of_pauses();
--
- protected:
-- void register_gc_pause_start(const char* name, jlong time);
-- void register_gc_pause_end(jlong time);
-+ void register_gc_pause_start(const char* name, const Ticks& time = Ticks::now());
-+ void register_gc_pause_end(const Ticks& time = Ticks::now());
- };
-
- class STWGCTimer : public GCTimer {
- public:
-- virtual void register_gc_start(jlong time);
-- virtual void register_gc_end(jlong time);
-+ virtual void register_gc_start(const Ticks& time = Ticks::now());
-+ virtual void register_gc_end(const Ticks& time = Ticks::now());
- };
-
- class ConcurrentGCTimer : public GCTimer {
- public:
-- void register_gc_pause_start(const char* name, jlong time);
-- void register_gc_pause_end(jlong time);
-+ void register_gc_pause_start(const char* name);
-+ void register_gc_pause_end();
- };
-
- class TimePartitionPhasesIterator {
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -33,6 +33,7 @@
- #include "memory/referenceProcessorStats.hpp"
- #include "runtime/os.hpp"
- #include "utilities/globalDefinitions.hpp"
-+#include "utilities/ticks.inline.hpp"
-
- #ifndef SERIALGC
- #include "gc_implementation/g1/evacuationInfo.hpp"
-@@ -46,7 +47,7 @@
- return GCTracer_next_gc_id++;
- }
-
--void GCTracer::report_gc_start_impl(GCCause::Cause cause, jlong timestamp) {
-+void GCTracer::report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp) {
- assert_unset_gc_id();
-
- GCId gc_id = create_new_gc_id();
-@@ -55,7 +56,7 @@
- _shared_gc_info.set_start_timestamp(timestamp);
- }
-
--void GCTracer::report_gc_start(GCCause::Cause cause, jlong timestamp) {
-+void GCTracer::report_gc_start(GCCause::Cause cause, const Ticks& timestamp) {
- assert_unset_gc_id();
-
- report_gc_start_impl(cause, timestamp);
-@@ -65,7 +66,7 @@
- return _shared_gc_info.id() != SharedGCInfo::UNSET_GCID;
- }
-
--void GCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
-+void GCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
- assert_set_gc_id();
-
- _shared_gc_info.set_sum_of_pauses(time_partitions->sum_of_pauses());
-@@ -76,7 +77,7 @@
- send_garbage_collection_event();
- }
-
--void GCTracer::report_gc_end(jlong timestamp, TimePartitions* time_partitions) {
-+void GCTracer::report_gc_end(const Ticks& timestamp, TimePartitions* time_partitions) {
- assert_set_gc_id();
-
- report_gc_end_impl(timestamp, time_partitions);
-@@ -97,10 +98,10 @@
- const GCId _gc_id;
- const double _size_threshold_percentage;
- const size_t _total_size_in_words;
-- const jlong _timestamp;
-+ const Ticks _timestamp;
-
- public:
-- ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words, jlong timestamp) :
-+ ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words, const Ticks& timestamp) :
- _gc_id(gc_id),
- _size_threshold_percentage(ObjectCountCutOffPercent / 100),
- _total_size_in_words(total_size_in_words),
-@@ -154,8 +155,7 @@
- ObjectCountFilter object_filter(is_alive_cl);
- HeapInspection::populate_table(&cit, false, &object_filter);
-
-- jlong timestamp = os::elapsed_counter();
-- ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words(), timestamp);
-+ ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words(), Ticks::now());
- cit.iterate(&event_sender);
- }
- }
-@@ -168,7 +168,7 @@
- send_perm_gen_summary_event(when, perm_gen_summary);
- }
-
--void YoungGCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
-+void YoungGCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
- assert_set_gc_id();
- assert(_tenuring_threshold != UNSET_TENURING_THRESHOLD, "Tenuring threshold has not been reported");
-
-@@ -188,14 +188,14 @@
- _tenuring_threshold = tenuring_threshold;
- }
-
--void OldGCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
-+void OldGCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
- assert_set_gc_id();
-
- GCTracer::report_gc_end_impl(timestamp, time_partitions);
- send_old_gc_event();
- }
-
--void ParallelOldTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
-+void ParallelOldTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
- assert_set_gc_id();
-
- OldGCTracer::report_gc_end_impl(timestamp, time_partitions);
-@@ -221,7 +221,7 @@
- _g1_young_gc_info.set_type(type);
- }
-
--void G1NewTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
-+void G1NewTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
- assert_set_gc_id();
-
- YoungGCTracer::report_gc_end_impl(timestamp, time_partitions);
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -34,6 +34,7 @@
- #ifndef SERIALGC
- #include "gc_implementation/g1/g1YCTypes.hpp"
- #endif
-+#include "utilities/ticks.hpp"
-
- typedef uint GCId;
-
-@@ -46,8 +47,6 @@
- class BoolObjectClosure;
-
- class SharedGCInfo VALUE_OBJ_CLASS_SPEC {
-- static const jlong UNSET_TIMESTAMP = -1;
--
- public:
- static const GCId UNSET_GCID = (GCId)-1;
-
-@@ -55,23 +54,30 @@
- GCId _id;
- GCName _name;
- GCCause::Cause _cause;
-- jlong _start_timestamp;
-- jlong _end_timestamp;
-- jlong _sum_of_pauses;
-- jlong _longest_pause;
-+ Ticks _start_timestamp;
-+ Ticks _end_timestamp;
-+ Tickspan _sum_of_pauses;
-+ Tickspan _longest_pause;
-
- public:
-- SharedGCInfo(GCName name) : _id(UNSET_GCID), _name(name), _cause(GCCause::_last_gc_cause),
-- _start_timestamp(UNSET_TIMESTAMP), _end_timestamp(UNSET_TIMESTAMP), _sum_of_pauses(0), _longest_pause(0) {}
-+ SharedGCInfo(GCName name) :
-+ _id(UNSET_GCID),
-+ _name(name),
-+ _cause(GCCause::_last_gc_cause),
-+ _start_timestamp(),
-+ _end_timestamp(),
-+ _sum_of_pauses(),
-+ _longest_pause() {
-+ }
-
- void set_id(GCId id) { _id = id; }
- GCId id() const { return _id; }
-
-- void set_start_timestamp(jlong timestamp) { _start_timestamp = timestamp; }
-- jlong start_timestamp() const { return _start_timestamp; }
-+ void set_start_timestamp(const Ticks& timestamp) { _start_timestamp = timestamp; }
-+ const Ticks start_timestamp() const { return _start_timestamp; }
-
-- void set_end_timestamp(jlong timestamp) { _end_timestamp = timestamp; }
-- jlong end_timestamp() const { return _end_timestamp; }
-+ void set_end_timestamp(const Ticks& timestamp) { _end_timestamp = timestamp; }
-+ const Ticks end_timestamp() const { return _end_timestamp; }
-
- void set_name(GCName name) { _name = name; }
- GCName name() const { return _name; }
-@@ -79,11 +85,11 @@
- void set_cause(GCCause::Cause cause) { _cause = cause; }
- GCCause::Cause cause() const { return _cause; }
-
-- void set_sum_of_pauses(jlong duration) { _sum_of_pauses = duration; }
-- jlong sum_of_pauses() const { return _sum_of_pauses; }
-+ void set_sum_of_pauses(const Tickspan& duration) { _sum_of_pauses = duration; }
-+ const Tickspan sum_of_pauses() const { return _sum_of_pauses; }
-
-- void set_longest_pause(jlong duration) { _longest_pause = duration; }
-- jlong longest_pause() const { return _longest_pause; }
-+ void set_longest_pause(const Tickspan& duration) { _longest_pause = duration; }
-+ const Tickspan longest_pause() const { return _longest_pause; }
- };
-
- class ParallelOldGCInfo VALUE_OBJ_CLASS_SPEC {
-@@ -115,8 +121,8 @@
- SharedGCInfo _shared_gc_info;
-
- public:
-- void report_gc_start(GCCause::Cause cause, jlong timestamp);
-- void report_gc_end(jlong timestamp, TimePartitions* time_partitions);
-+ void report_gc_start(GCCause::Cause cause, const Ticks& timestamp);
-+ void report_gc_end(const Ticks& timestamp, TimePartitions* time_partitions);
- void report_gc_heap_summary(GCWhen::Type when, const GCHeapSummary& heap_summary, const PermGenSummary& perm_gen_summary) const;
- void report_gc_reference_stats(const ReferenceProcessorStats& rp) const;
- void report_object_count_after_gc(BoolObjectClosure* object_filter);
-@@ -125,8 +131,8 @@
-
- protected:
- GCTracer(GCName name) : _shared_gc_info(name) {}
-- virtual void report_gc_start_impl(GCCause::Cause cause, jlong timestamp);
-- virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
-+ virtual void report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp);
-+ virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
-
- private:
- void send_garbage_collection_event() const;
-@@ -143,7 +149,7 @@
-
- protected:
- YoungGCTracer(GCName name) : GCTracer(name), _tenuring_threshold(UNSET_TENURING_THRESHOLD) {}
-- virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
-+ virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
-
- public:
- void report_promotion_failed(const PromotionFailedInfo& pf_info);
-@@ -157,7 +163,7 @@
- class OldGCTracer : public GCTracer {
- protected:
- OldGCTracer(GCName name) : GCTracer(name) {}
-- virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
-+ virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
-
- public:
- void report_concurrent_mode_failure();
-@@ -175,7 +181,7 @@
- void report_dense_prefix(void* dense_prefix);
-
- protected:
-- void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
-+ void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
-
- private:
- void send_parallel_old_event() const;
-@@ -209,7 +215,7 @@
- G1NewTracer() : YoungGCTracer(G1New) {}
-
- void report_yc_type(G1YCType type);
-- void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
-+ void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
- void report_evacuation_info(EvacuationInfo* info);
- void report_evacuation_failed(EvacuationFailedInfo& ef_info);
-
---- ./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-10-28 20:19:39.000000000 -0700
-@@ -28,8 +28,10 @@
- #include "gc_implementation/shared/gcTrace.hpp"
- #include "gc_implementation/shared/gcWhen.hpp"
- #include "gc_implementation/shared/copyFailedInfo.hpp"
-+#include "runtime/os.hpp"
- #include "trace/traceBackend.hpp"
- #include "trace/tracing.hpp"
-+
- #ifndef SERIALGC
- #include "gc_implementation/g1/evacuationInfo.hpp"
- #include "gc_implementation/g1/g1YCTypes.hpp"
-@@ -109,7 +111,7 @@
- if (e.should_commit()) {
- e.set_gcId(_shared_gc_info.id());
- e.set_data(to_trace_struct(pf_info));
-- e.set_thread(pf_info.thread()->thread_id());
-+ e.set_thread((uint64_t) pf_info.thread()->thread_id());
- e.commit();
- }
- }
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 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
-@@ -43,11 +43,13 @@
- # include "thread_bsd.inline.hpp"
- #endif
-
-+#include "utilities/ticks.inline.hpp"
-+
-
- GCTraceTime::GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer) :
-- _title(title), _doit(doit), _print_cr(print_cr), _timer(timer) {
-+ _title(title), _doit(doit), _print_cr(print_cr), _timer(timer), _start_counter() {
- if (_doit || _timer != NULL) {
-- _start_counter = os::elapsed_counter();
-+ _start_counter.stamp();
- }
-
- if (_timer != NULL) {
-@@ -66,10 +68,10 @@
- }
-
- GCTraceTime::~GCTraceTime() {
-- jlong stop_counter = 0;
-+ Ticks stop_counter;
-
- if (_doit || _timer != NULL) {
-- stop_counter = os::elapsed_counter();
-+ stop_counter.stamp();
- }
-
- if (_timer != NULL) {
-@@ -77,11 +79,12 @@
- }
-
- if (_doit) {
-- double seconds = TimeHelper::counter_to_seconds(stop_counter - _start_counter);
-+ const Tickspan duration = stop_counter - _start_counter;
-+ double duration_in_seconds = TicksToTimeHelper::seconds(duration);
- if (_print_cr) {
-- gclog_or_tty->print_cr(", %3.7f secs]", seconds);
-+ gclog_or_tty->print_cr(", %3.7f secs]", duration_in_seconds);
- } else {
-- gclog_or_tty->print(", %3.7f secs]", seconds);
-+ gclog_or_tty->print(", %3.7f secs]", duration_in_seconds);
- }
- gclog_or_tty->flush();
- }
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -26,6 +26,7 @@
- #define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACETIME_HPP
-
- #include "prims/jni_md.h"
-+#include "utilities/ticks.hpp"
-
- class GCTimer;
-
-@@ -34,7 +35,7 @@
- bool _doit;
- bool _print_cr;
- GCTimer* _timer;
-- jlong _start_counter;
-+ Ticks _start_counter;
-
- public:
- GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer);
---- ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp 2014-07-15 21:48:36.000000000 -0700
-@@ -28,8 +28,10 @@
- #include "memory/heapInspection.hpp"
- #include "trace/tracing.hpp"
- #include "utilities/globalDefinitions.hpp"
-+#include "utilities/ticks.hpp"
-
--void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp) {
-+void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, const Ticks& timestamp) {
-+#if INCLUDE_TRACE
- assert(Tracing::is_event_enabled(EventObjectCountAfterGC::eventId),
- "Only call this method if the event is enabled");
-
-@@ -40,6 +42,8 @@
- event.set_totalSize(entry->words() * BytesPerWord);
- event.set_endtime(timestamp);
- event.commit();
-+
-+#endif
- }
-
- bool ObjectCountEventSender::should_send_event() {
---- ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp 2014-07-15 21:48:36.000000000 -0700
-@@ -29,10 +29,11 @@
- #include "memory/allocation.hpp"
-
- class KlassInfoEntry;
-+class Ticks;
-
- class ObjectCountEventSender : public AllStatic {
- public:
-- static void send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp);
-+ static void send(const KlassInfoEntry* entry, GCId gc_id, const Ticks& timestamp);
- static bool should_send_event();
- };
-
---- ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -121,6 +121,14 @@
- }
- }
-
-+void CollectedHeap::register_nmethod(nmethod* nm) {
-+ assert_locked_or_safepoint(CodeCache_lock);
-+}
-+
-+void CollectedHeap::unregister_nmethod(nmethod* nm) {
-+ assert_locked_or_safepoint(CodeCache_lock);
-+}
-+
- void CollectedHeap::trace_heap(GCWhen::Type when, GCTracer* gc_tracer) {
- const GCHeapSummary& heap_summary = create_heap_summary();
- const PermGenSummary& perm_summary = create_perm_gen_summary();
---- ./hotspot/src/share/vm/gc_interface/collectedHeap.hpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_interface/collectedHeap.hpp 2014-07-15 21:48:36.000000000 -0700
-@@ -49,6 +49,7 @@
- class Thread;
- class ThreadClosure;
- class VirtualSpaceSummary;
-+class nmethod;
-
- class GCMessage : public FormatBuffer<1024> {
- public:
-@@ -667,6 +668,11 @@
- void print_heap_before_gc();
- void print_heap_after_gc();
-
-+ // Registering and unregistering an nmethod (compiled code) with the heap.
-+ // Override with specific mechanism for each specialized heap type.
-+ virtual void register_nmethod(nmethod* nm);
-+ virtual void unregister_nmethod(nmethod* nm);
-+
- void trace_heap_before_gc(GCTracer* gc_tracer);
- void trace_heap_after_gc(GCTracer* gc_tracer);
-
---- ./hotspot/src/share/vm/interpreter/interpreterRuntime.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.cpp 2014-07-15 21:48:33.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
-@@ -1222,3 +1222,24 @@
- size_of_arguments * Interpreter::stackElementSize);
- IRT_END
- #endif
-+
-+// This is a support of the JVMTI PopFrame interface.
-+// Make sure it is an invokestatic of a polymorphic intrinsic that has a member_name argument
-+// and return it as a vm_result so that it can be reloaded in the list of invokestatic parameters.
-+// The dmh argument is a reference to a DirectMethoHandle that has a member name field.
-+IRT_ENTRY(void, InterpreterRuntime::member_name_arg_or_null(JavaThread* thread, address dmh,
-+ methodOopDesc* method, address bcp))
-+ Bytecodes::Code code = Bytecodes::code_at(method, bcp);
-+ if (code != Bytecodes::_invokestatic) {
-+ return;
-+ }
-+ constantPoolOopDesc* cpool = method->constants();
-+ int cp_index = Bytes::get_native_u2(bcp + 1) + constantPoolOopDesc::CPCACHE_INDEX_TAG;
-+ Symbol* cname = cpool->klass_name_at(cpool->klass_ref_index_at(cp_index));
-+ Symbol* mname = cpool->name_ref_at(cp_index);
-+
-+ if (MethodHandles::has_member_arg(cname, mname)) {
-+ oop member_name = java_lang_invoke_DirectMethodHandle::member((oop)dmh);
-+ thread->set_vm_result(member_name);
-+ }
-+IRT_END
---- ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2014-10-28 20:19:39.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
-@@ -106,6 +106,7 @@
- static void create_exception(JavaThread* thread, char* name, char* message);
- static void create_klass_exception(JavaThread* thread, char* name, oopDesc* obj);
- static address exception_handler_for_exception(JavaThread* thread, oopDesc* exception);
-+ static void member_name_arg_or_null(JavaThread* thread, address dmh, methodOopDesc* m, address bcp);
- static void throw_pending_exception(JavaThread* thread);
-
- // Statics & fields
---- ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2014-10-28 20:19:39.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
-@@ -187,6 +187,14 @@
-
- void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
- methodOop result_oop = klass->uncached_lookup_method(name, signature);
-+
-+ //JDK 7 does not support default methods, but this code ported from JDK8 to keep code consistent for all JDK.
-+ if (klass->oop_is_array()) {
-+ // Only consider klass and super klass for arrays
-+ result = methodHandle(THREAD, result_oop);
-+ return;
-+ }
-+
- if (EnableInvokeDynamic && result_oop != NULL) {
- vmIntrinsics::ID iid = result_oop->intrinsic_id();
- if (MethodHandles::is_signature_polymorphic(iid)) {
-@@ -421,7 +429,7 @@
- // 2. lookup method in resolved klass and its super klasses
- lookup_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, CHECK);
-
-- if (resolved_method.is_null()) { // not found in the class hierarchy
-+ if (resolved_method.is_null() && !resolved_klass->oop_is_array()) { // not found in the class hierarchy
- // 3. lookup method in all the interfaces implemented by the resolved klass
- lookup_method_in_interfaces(resolved_method, resolved_klass, method_name, method_signature, CHECK);
-
-@@ -434,16 +442,16 @@
- CLEAR_PENDING_EXCEPTION;
- }
- }
-+ }
-
-- if (resolved_method.is_null()) {
-- // 4. method lookup failed
-- ResourceMark rm(THREAD);
-- THROW_MSG_CAUSE(vmSymbols::java_lang_NoSuchMethodError(),
-- methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
-- method_name,
-- method_signature),
-- nested_exception);
-- }
-+ if (resolved_method.is_null()) {
-+ // 4. method lookup failed
-+ ResourceMark rm(THREAD);
-+ THROW_MSG_CAUSE(vmSymbols::java_lang_NoSuchMethodError(),
-+ methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
-+ method_name,
-+ method_signature),
-+ nested_exception);
- }
-
- // 5. check if method is concrete
-@@ -514,17 +522,18 @@
- // lookup method in this interface or its super, java.lang.Object
- lookup_instance_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, CHECK);
-
-- if (resolved_method.is_null()) {
-+ if (resolved_method.is_null() && !resolved_klass->oop_is_array()) {
- // lookup method in all the super-interfaces
- lookup_method_in_interfaces(resolved_method, resolved_klass, method_name, method_signature, CHECK);
-- if (resolved_method.is_null()) {
-- // no method found
-- ResourceMark rm(THREAD);
-- THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(),
-- methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
-- method_name,
-- method_signature));
-- }
-+ }
-+
-+ if (resolved_method.is_null()) {
-+ // no method found
-+ ResourceMark rm(THREAD);
-+ THROW_MSG(vmSymbols::java_lang_NoSuchMethodError(),
-+ methodOopDesc::name_and_sig_as_C_string(Klass::cast(resolved_klass()),
-+ method_name,
-+ method_signature));
- }
-
- if (check_access) {
-@@ -614,7 +623,7 @@
-
- // Resolve instance field
- fieldDescriptor fd; // find_field initializes fd if found
-- KlassHandle sel_klass(THREAD, instanceKlass::cast(resolved_klass())->find_field(field, sig, &fd));
-+ KlassHandle sel_klass(THREAD, resolved_klass->find_field(field, sig, &fd));
- // check if field exists; i.e., if a klass containing the field def has been selected
- if (sel_klass.is_null()){
- ResourceMark rm(THREAD);
---- ./hotspot/src/share/vm/memory/cardTableModRefBS.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/cardTableModRefBS.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -400,60 +400,6 @@
- inline_write_ref_field(field, newVal);
- }
-
--/*
-- Claimed and deferred bits are used together in G1 during the evacuation
-- pause. These bits can have the following state transitions:
-- 1. The claimed bit can be put over any other card state. Except that
-- the "dirty -> dirty and claimed" transition is checked for in
-- G1 code and is not used.
-- 2. Deferred bit can be set only if the previous state of the card
-- was either clean or claimed. mark_card_deferred() is wait-free.
-- We do not care if the operation is be successful because if
-- it does not it will only result in duplicate entry in the update
-- buffer because of the "cache-miss". So it's not worth spinning.
-- */
--
--
--bool CardTableModRefBS::claim_card(size_t card_index) {
-- jbyte val = _byte_map[card_index];
-- assert(val != dirty_card_val(), "Shouldn't claim a dirty card");
-- while (val == clean_card_val() ||
-- (val & (clean_card_mask_val() | claimed_card_val())) != claimed_card_val()) {
-- jbyte new_val = val;
-- if (val == clean_card_val()) {
-- new_val = (jbyte)claimed_card_val();
-- } else {
-- new_val = val | (jbyte)claimed_card_val();
-- }
-- jbyte res = Atomic::cmpxchg(new_val, &_byte_map[card_index], val);
-- if (res == val) {
-- return true;
-- }
-- val = res;
-- }
-- return false;
--}
--
--bool CardTableModRefBS::mark_card_deferred(size_t card_index) {
-- jbyte val = _byte_map[card_index];
-- // It's already processed
-- if ((val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val()) {
-- return false;
-- }
-- // Cached bit can be installed either on a clean card or on a claimed card.
-- jbyte new_val = val;
-- if (val == clean_card_val()) {
-- new_val = (jbyte)deferred_card_val();
-- } else {
-- if (val & claimed_card_val()) {
-- new_val = val | (jbyte)deferred_card_val();
-- }
-- }
-- if (new_val != val) {
-- Atomic::cmpxchg(new_val, &_byte_map[card_index], val);
-- }
-- return true;
--}
-
- void CardTableModRefBS::non_clean_card_iterate_possibly_parallel(Space* sp,
- MemRegion mr,
---- ./hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -344,34 +344,10 @@
- _byte_map[card_index] = dirty_card_val();
- }
-
-- bool is_card_claimed(size_t card_index) {
-- jbyte val = _byte_map[card_index];
-- return (val & (clean_card_mask_val() | claimed_card_val())) == claimed_card_val();
-- }
--
-- void set_card_claimed(size_t card_index) {
-- jbyte val = _byte_map[card_index];
-- if (val == clean_card_val()) {
-- val = (jbyte)claimed_card_val();
-- } else {
-- val |= (jbyte)claimed_card_val();
-- }
-- _byte_map[card_index] = val;
-- }
--
-- bool claim_card(size_t card_index);
--
- bool is_card_clean(size_t card_index) {
- return _byte_map[card_index] == clean_card_val();
- }
-
-- bool is_card_deferred(size_t card_index) {
-- jbyte val = _byte_map[card_index];
-- return (val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val();
-- }
--
-- bool mark_card_deferred(size_t card_index);
--
- // Card marking array base (adjusted for heap low boundary)
- // This would be the 0th element of _byte_map, if the heap started at 0x0.
- // But since the heap starts at some higher address, this points to somewhere
---- ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -230,6 +230,8 @@
- alignment = lcm(os::large_page_size(), alignment);
- }
-
-+ assert(alignment >= min_alignment(), "Must be");
-+
- return alignment;
- }
-
---- ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-09-06 11:22:12.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2001, 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
-@@ -538,7 +538,7 @@
-
- GenCollectedHeap* gch = GenCollectedHeap::heap();
-
-- _gc_timer->register_gc_start(os::elapsed_counter());
-+ _gc_timer->register_gc_start();
- DefNewTracer gc_tracer;
- gc_tracer.report_gc_start(gch->gc_cause(), _gc_timer->gc_start());
-
-@@ -682,7 +682,7 @@
- gch->trace_heap_after_gc(&gc_tracer);
- gc_tracer.report_tenuring_threshold(tenuring_threshold());
-
-- _gc_timer->register_gc_end(os::elapsed_counter());
-+ _gc_timer->register_gc_end();
-
- gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
- }
-@@ -1004,6 +1004,9 @@
- // have to use it here, as well.
- HeapWord* result = eden()->par_allocate(word_size);
- if (result != NULL) {
-+ if (CMSEdenChunksRecordAlways && _next_gen != NULL) {
-+ _next_gen->sample_eden_chunk();
-+ }
- return result;
- }
- do {
-@@ -1034,13 +1037,19 @@
- // circular dependency at compile time.
- if (result == NULL) {
- result = allocate_from_space(word_size);
-+ } else if (CMSEdenChunksRecordAlways && _next_gen != NULL) {
-+ _next_gen->sample_eden_chunk();
- }
- return result;
- }
-
- HeapWord* DefNewGeneration::par_allocate(size_t word_size,
- bool is_tlab) {
-- return eden()->par_allocate(word_size);
-+ HeapWord* res = eden()->par_allocate(word_size);
-+ if (CMSEdenChunksRecordAlways && _next_gen != NULL) {
-+ _next_gen->sample_eden_chunk();
-+ }
-+ return res;
- }
-
- void DefNewGeneration::gc_prologue(bool full) {
---- ./hotspot/src/share/vm/memory/genCollectedHeap.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/genCollectedHeap.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -99,17 +99,19 @@
- guarantee(HeapWordSize == wordSize, "HeapWordSize must equal wordSize");
-
- // The heap must be at least as aligned as generations.
-- size_t alignment = Generation::GenGrain;
-+ size_t gen_alignment = Generation::GenGrain;
-
- _gen_specs = gen_policy()->generations();
- PermanentGenerationSpec *perm_gen_spec =
- collector_policy()->permanent_generation();
-
-+ size_t heap_alignment = collector_policy()->max_alignment();
-+
- // Make sure the sizes are all aligned.
- for (i = 0; i < _n_gens; i++) {
-- _gen_specs[i]->align(alignment);
-+ _gen_specs[i]->align(gen_alignment);
- }
-- perm_gen_spec->align(alignment);
-+ perm_gen_spec->align(heap_alignment);
-
- // If we are dumping the heap, then allocate a wasted block of address
- // space in order to push the heap to a lower address. This extra
-@@ -130,9 +132,9 @@
- char* heap_address;
- size_t total_reserved = 0;
- int n_covered_regions = 0;
-- ReservedSpace heap_rs(0);
-+ ReservedSpace heap_rs;
-
-- heap_address = allocate(alignment, perm_gen_spec, &total_reserved,
-+ heap_address = allocate(heap_alignment, perm_gen_spec, &total_reserved,
- &n_covered_regions, &heap_rs);
-
- if (UseSharedSpaces) {
-@@ -142,7 +144,7 @@
- }
- FileMapInfo* mapinfo = FileMapInfo::current_info();
- mapinfo->fail_continue("Unable to reserve shared region.");
-- allocate(alignment, perm_gen_spec, &total_reserved, &n_covered_regions,
-+ allocate(heap_alignment, perm_gen_spec, &total_reserved, &n_covered_regions,
- &heap_rs);
- }
- }
-@@ -207,19 +209,21 @@
- const size_t pageSize = UseLargePages ?
- os::large_page_size() : os::vm_page_size();
-
-+ assert(alignment % pageSize == 0, "Must be");
-+
- for (int i = 0; i < _n_gens; i++) {
- total_reserved = add_and_check_overflow(total_reserved, _gen_specs[i]->max_size());
- n_covered_regions += _gen_specs[i]->n_covered_regions();
- }
-
-- assert(total_reserved % pageSize == 0,
-- err_msg("Gen size; total_reserved=" SIZE_FORMAT ", pageSize="
-- SIZE_FORMAT, total_reserved, pageSize));
-+ assert(total_reserved % alignment == 0,
-+ err_msg("Gen size; total_reserved=" SIZE_FORMAT ", alignment="
-+ SIZE_FORMAT, total_reserved, alignment));
- total_reserved = add_and_check_overflow(total_reserved, perm_gen_spec->max_size());
-- assert(total_reserved % pageSize == 0,
-- err_msg("Perm size; total_reserved=" SIZE_FORMAT ", pageSize="
-+ assert(total_reserved % alignment == 0,
-+ err_msg("Perm size; total_reserved=" SIZE_FORMAT ", alignment="
- SIZE_FORMAT ", perm gen max=" SIZE_FORMAT, total_reserved,
-- pageSize, perm_gen_spec->max_size()));
-+ alignment, perm_gen_spec->max_size()));
-
- n_covered_regions += perm_gen_spec->n_covered_regions();
-
-@@ -229,7 +233,9 @@
- total_reserved = add_and_check_overflow(total_reserved, misc);
-
- if (UseLargePages) {
-+ assert(misc == 0, "CDS does not support Large Pages");
- assert(total_reserved != 0, "total_reserved cannot be 0");
-+ assert(is_size_aligned(total_reserved, os::large_page_size()), "Must be");
- total_reserved = round_up_and_check_overflow(total_reserved, os::large_page_size());
- }
-
-@@ -250,7 +256,7 @@
- } else {
- heap_address = NULL; // any address will do.
- if (UseCompressedOops) {
-- heap_address = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
-+ heap_address = Universe::preferred_heap_base(total_reserved, alignment, Universe::UnscaledNarrowOop);
- *_total_reserved = total_reserved;
- *_n_covered_regions = n_covered_regions;
- *heap_rs = ReservedHeapSpace(total_reserved, alignment,
-@@ -260,13 +266,13 @@
- // Failed to reserve at specified address - the requested memory
- // region is taken already, for example, by 'java' launcher.
- // Try again to reserver heap higher.
-- heap_address = Universe::preferred_heap_base(total_reserved, Universe::ZeroBasedNarrowOop);
-+ heap_address = Universe::preferred_heap_base(total_reserved, alignment, Universe::ZeroBasedNarrowOop);
- *heap_rs = ReservedHeapSpace(total_reserved, alignment,
- UseLargePages, heap_address);
-
- if (heap_address != NULL && !heap_rs->is_reserved()) {
- // Failed to reserve at specified address again - give up.
-- heap_address = Universe::preferred_heap_base(total_reserved, Universe::HeapBasedNarrowOop);
-+ heap_address = Universe::preferred_heap_base(total_reserved, alignment, Universe::HeapBasedNarrowOop);
- assert(heap_address == NULL, "");
- *heap_rs = ReservedHeapSpace(total_reserved, alignment,
- UseLargePages, heap_address);
-@@ -538,8 +544,7 @@
- prepare_for_verify();
- prepared_for_verification = true;
- }
-- gclog_or_tty->print(" VerifyBeforeGC:");
-- Universe::verify();
-+ Universe::verify(" VerifyBeforeGC:");
- }
- COMPILER2_PRESENT(DerivedPointerTable::clear());
-
-@@ -610,8 +615,7 @@
- if (VerifyAfterGC && i >= VerifyGCLevel &&
- total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
-- gclog_or_tty->print(" VerifyAfterGC:");
-- Universe::verify();
-+ Universe::verify(" VerifyAfterGC:");
- }
-
- if (PrintGCDetails) {
-@@ -932,12 +936,13 @@
- // Returns "TRUE" iff "p" points into the committed areas of the heap.
- bool GenCollectedHeap::is_in(const void* p) const {
- #ifndef ASSERT
-- guarantee(VerifyBeforeGC ||
-- VerifyDuringGC ||
-- VerifyBeforeExit ||
-- PrintAssembly ||
-- tty->count() != 0 || // already printing
-- VerifyAfterGC ||
-+ guarantee(VerifyBeforeGC ||
-+ VerifyDuringGC ||
-+ VerifyBeforeExit ||
-+ VerifyDuringStartup ||
-+ PrintAssembly ||
-+ tty->count() != 0 || // already printing
-+ VerifyAfterGC ||
- VMError::fatal_error_in_progress(), "too expensive");
-
- #endif
---- ./hotspot/src/share/vm/memory/generation.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/generation.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2012, 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
-@@ -476,16 +476,16 @@
- x(ref_processor(), gch->reserved_region());
-
- STWGCTimer* gc_timer = GenMarkSweep::gc_timer();
-- gc_timer->register_gc_start(os::elapsed_counter());
-+ gc_timer->register_gc_start();
-
- SerialOldTracer* gc_tracer = GenMarkSweep::gc_tracer();
- gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
-
- GenMarkSweep::invoke_at_safepoint(_level, ref_processor(), clear_all_soft_refs);
-
-- gc_timer->register_gc_end(os::elapsed_counter());
-+ gc_timer->register_gc_end();
-
-- gc_tracer->report_gc_end(os::elapsed_counter(), gc_timer->time_partitions());
-+ gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
-
- SpecializationStats::print();
- }
---- ./hotspot/src/share/vm/memory/generation.hpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/generation.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -457,6 +457,7 @@
- // expected to be GC worker thread-local, with the worker index
- // indicated by "thr_num".
- virtual void* get_data_recorder(int thr_num) { return NULL; }
-+ virtual void sample_eden_chunk() {}
-
- // Some generations may require some cleanup actions before allowing
- // a verification.
---- ./hotspot/src/share/vm/memory/iterator.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/iterator.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -70,7 +70,7 @@
- }
-
- void CodeBlobToOopClosure::do_newly_marked_nmethod(nmethod* nm) {
-- nm->oops_do(_cl, /*do_strong_roots_only=*/ true);
-+ nm->oops_do(_cl, /*do_strong_roots_only=*/ true, /*allow_zombie=*/ false);
- }
-
- void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) {
---- ./hotspot/src/share/vm/memory/sharedHeap.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/sharedHeap.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -64,7 +64,8 @@
- }
- _sh = this; // ch is static, should be set only once.
- if ((UseParNewGC ||
-- (UseConcMarkSweepGC && CMSParallelRemarkEnabled) ||
-+ (UseConcMarkSweepGC && (CMSParallelInitialMarkEnabled ||
-+ CMSParallelRemarkEnabled)) ||
- UseG1GC) &&
- ParallelGCThreads > 0) {
- _workers = new FlexibleWorkGang("Parallel GC Threads", ParallelGCThreads,
-@@ -148,7 +149,8 @@
- ScanningOption so,
- OopClosure* roots,
- CodeBlobClosure* code_roots,
-- OopsInGenClosure* perm_blk) {
-+ OopsInGenClosure* perm_blk,
-+ bool manages_code_roots) {
- StrongRootsScope srs(this, activate_scope);
- // General strong roots.
- assert(_strong_roots_parity != 0, "must have called prologue code");
-@@ -216,7 +218,7 @@
- CodeCache::blobs_do(code_roots);
- }
- } else if (so & (SO_SystemClasses|SO_AllClasses)) {
-- if (!collecting_perm_gen) {
-+ if (!manages_code_roots && !collecting_perm_gen) {
- // If we are collecting from class statics, but we are not going to
- // visit all of the CodeCache, collect from the non-perm roots if any.
- // This makes the code cache function temporarily as a source of strong
---- ./hotspot/src/share/vm/memory/sharedHeap.hpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/sharedHeap.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -267,7 +267,8 @@
- ScanningOption so,
- OopClosure* roots,
- CodeBlobClosure* code_roots,
-- OopsInGenClosure* perm_blk);
-+ OopsInGenClosure* perm_blk,
-+ bool manages_code_roots = false);
-
- // Apply "blk" to all the weak roots of the system. These include
- // JNI weak roots, the code cache, system dictionary, symbol table,
---- ./hotspot/src/share/vm/memory/universe.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/universe.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -826,17 +826,23 @@
- // 32Gb
- // OopEncodingHeapMax == NarrowOopHeapMax << LogMinObjAlignmentInBytes;
-
--char* Universe::preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode) {
-+char* Universe::preferred_heap_base(size_t heap_size, size_t alignment, NARROW_OOP_MODE mode) {
-+ assert(is_size_aligned((size_t)OopEncodingHeapMax, alignment), "Must be");
-+ assert(is_size_aligned((size_t)NarrowOopHeapMax, alignment), "Must be");
-+ assert(is_size_aligned(heap_size, alignment), "Must be");
-+
-+ uintx heap_base_min_address_aligned = align_size_up(HeapBaseMinAddress, alignment);
-+
- size_t base = 0;
- #ifdef _LP64
- if (UseCompressedOops) {
- assert(mode == UnscaledNarrowOop ||
- mode == ZeroBasedNarrowOop ||
- mode == HeapBasedNarrowOop, "mode is invalid");
-- const size_t total_size = heap_size + HeapBaseMinAddress;
-+ const size_t total_size = heap_size + heap_base_min_address_aligned;
- // Return specified base for the first request.
- if (!FLAG_IS_DEFAULT(HeapBaseMinAddress) && (mode == UnscaledNarrowOop)) {
-- base = HeapBaseMinAddress;
-+ base = heap_base_min_address_aligned;
- } else if (total_size <= OopEncodingHeapMax && (mode != HeapBasedNarrowOop)) {
- if (total_size <= NarrowOopHeapMax && (mode == UnscaledNarrowOop) &&
- (Universe::narrow_oop_shift() == 0)) {
-@@ -882,6 +888,8 @@
- }
- }
- #endif
-+
-+ assert(is_ptr_aligned((char*)base, alignment), "Must be");
- return (char*)base; // also return NULL (don't care) for 32-bit VM
- }
-
-@@ -1366,7 +1374,7 @@
- st->print_cr("}");
- }
-
--void Universe::verify(bool silent, VerifyOption option) {
-+void Universe::verify(VerifyOption option, const char* prefix, bool silent) {
- if (SharedSkipVerify) {
- return;
- }
-@@ -1387,11 +1395,12 @@
- HandleMark hm; // Handles created during verification can be zapped
- _verify_count++;
-
-+ if (!silent) gclog_or_tty->print(prefix);
- if (!silent) gclog_or_tty->print("[Verifying ");
- if (!silent) gclog_or_tty->print("threads ");
- Threads::verify();
-+ if (!silent) gclog_or_tty->print("heap ");
- heap()->verify(silent, option);
--
- if (!silent) gclog_or_tty->print("syms ");
- SymbolTable::verify();
- if (!silent) gclog_or_tty->print("strs ");
---- ./hotspot/src/share/vm/memory/universe.hpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/universe.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -380,7 +380,7 @@
-
- static NARROW_OOP_MODE narrow_oop_mode();
-
-- static char* preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode);
-+ static char* preferred_heap_base(size_t heap_size, size_t alignment, NARROW_OOP_MODE mode);
-
- // Historic gc information
- static size_t get_heap_capacity_at_last_gc() { return _heap_capacity_at_last_gc; }
-@@ -419,12 +419,12 @@
-
- // Debugging
- static bool verify_in_progress() { return _verify_in_progress; }
-- static void verify(bool silent, VerifyOption option);
-- static void verify(bool silent) {
-- verify(silent, VerifyOption_Default /* option */);
-+ static void verify(VerifyOption option, const char* prefix, bool silent = VerifySilently);
-+ static void verify(const char* prefix, bool silent = VerifySilently) {
-+ verify(VerifyOption_Default, prefix, silent);
- }
-- static void verify() {
-- verify(false /* silent */);
-+ static void verify(bool silent = VerifySilently) {
-+ verify("", silent);
- }
-
- static int verify_count() { return _verify_count; }
---- ./hotspot/src/share/vm/oops/arrayKlass.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/arrayKlass.cpp 2014-10-28 20:19:38.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
-@@ -64,6 +64,13 @@
- return NULL;
- }
-
-+// find field according to JVM spec 5.4.3.2, returns the klass in which the field is defined
-+klassOop arrayKlass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const {
-+ // There are no fields in an array klass but look to the super class (Object)
-+ assert(super(), "super klass must be present");
-+ return Klass::cast(super())->find_field(name, sig, fd);
-+}
-+
- methodOop arrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const {
- // There are no methods in an array klass but the super class (Object) has some
- assert(super(), "super klass must be present");
---- ./hotspot/src/share/vm/oops/arrayKlass.hpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/arrayKlass.hpp 2014-10-28 20:19: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
-@@ -30,6 +30,8 @@
- #include "oops/klassOop.hpp"
- #include "oops/klassVtable.hpp"
-
-+class fieldDescriptor;
-+
- // arrayKlass is the abstract baseclass for all array classes
-
- class arrayKlass: public Klass {
-@@ -83,6 +85,9 @@
- virtual oop multi_allocate(int rank, jint* sizes, TRAPS);
- objArrayOop allocate_arrayArray(int n, int length, TRAPS);
-
-+ // find field according to JVM spec 5.4.3.2, returns the klass in which the field is defined
-+ klassOop find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const;
-+
- // Lookup operations
- methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const;
-
---- ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2012, 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
-@@ -1026,24 +1026,13 @@
-
- case JVM_CONSTANT_InvokeDynamic:
- {
-- int k1 = invoke_dynamic_bootstrap_method_ref_index_at(index1);
-- int k2 = cp2->invoke_dynamic_bootstrap_method_ref_index_at(index2);
-- bool match = compare_entry_to(k1, cp2, k2, CHECK_false);
-- if (!match) return false;
-- k1 = invoke_dynamic_name_and_type_ref_index_at(index1);
-- k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2);
-- match = compare_entry_to(k1, cp2, k2, CHECK_false);
-- if (!match) return false;
-- int argc = invoke_dynamic_argument_count_at(index1);
-- if (argc == cp2->invoke_dynamic_argument_count_at(index2)) {
-- for (int j = 0; j < argc; j++) {
-- k1 = invoke_dynamic_argument_index_at(index1, j);
-- k2 = cp2->invoke_dynamic_argument_index_at(index2, j);
-- match = compare_entry_to(k1, cp2, k2, CHECK_false);
-- if (!match) return false;
-- }
-- return true; // got through loop; all elements equal
-- }
-+ int k1 = invoke_dynamic_name_and_type_ref_index_at(index1);
-+ int k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2);
-+ int i1 = invoke_dynamic_bootstrap_specifier_index(index1);
-+ int i2 = cp2->invoke_dynamic_bootstrap_specifier_index(index2);
-+ bool match = compare_entry_to(k1, cp2, k2, CHECK_false) &&
-+ compare_operand_to(i1, cp2, i2, CHECK_false);
-+ return match;
- } break;
-
- case JVM_CONSTANT_UnresolvedString:
-@@ -1078,32 +1067,77 @@
- } // end compare_entry_to()
-
-
--// Copy this constant pool's entries at start_i to end_i (inclusive)
--// to the constant pool to_cp's entries starting at to_i. A total of
--// (end_i - start_i) + 1 entries are copied.
--void constantPoolOopDesc::copy_cp_to_impl(constantPoolHandle from_cp, int start_i, int end_i,
-- constantPoolHandle to_cp, int to_i, TRAPS) {
-+// Resize the operands array with delta_len and delta_size.
-+// Used in RedefineClasses for CP merge.
-+void constantPoolOopDesc::resize_operands(int delta_len, int delta_size, TRAPS) {
-+ int old_len = operand_array_length(operands());
-+ int new_len = old_len + delta_len;
-+ int min_len = (delta_len > 0) ? old_len : new_len;
-+
-+ int old_size = operands()->length();
-+ int new_size = old_size + delta_size;
-+ int min_size = (delta_size > 0) ? old_size : new_size;
-+
-+ typeArrayHandle new_ops = oopFactory::new_permanent_intArray(new_size, CHECK);
-+
-+ // Set index in the resized array for existing elements only
-+ for (int idx = 0; idx < min_len; idx++) {
-+ int offset = operand_offset_at(idx); // offset in original array
-+ operand_offset_at_put(new_ops(), idx, offset + 2*delta_len); // offset in resized array
-+ }
-+ // Copy the bootstrap specifiers only
-+ Copy::conjoint_memory_atomic(operands()->short_at_addr(2*old_len),
-+ new_ops->short_at_addr(2*new_len),
-+ (min_size - 2*min_len) * sizeof(u2));
-+ // Explicit deallocation of old operands array is not needed for 7u
-+ set_operands(new_ops());
-+} // end resize_operands()
-+
-+
-+// Extend the operands array with the length and size of the ext_cp operands.
-+// Used in RedefineClasses for CP merge.
-+void constantPoolOopDesc::extend_operands(constantPoolHandle ext_cp, TRAPS) {
-+ int delta_len = operand_array_length(ext_cp->operands());
-+ if (delta_len == 0) {
-+ return; // nothing to do
-+ }
-+ int delta_size = ext_cp->operands()->length();
-+
-+ assert(delta_len > 0 && delta_size > 0, "extended operands array must be bigger");
-+
-+ if (operand_array_length(operands()) == 0) {
-+ typeArrayHandle new_ops = oopFactory::new_permanent_intArray(delta_size, CHECK);
-+ // The first element index defines the offset of second part
-+ operand_offset_at_put(new_ops(), 0, 2*delta_len); // offset in new array
-+ set_operands(new_ops());
-+ } else {
-+ resize_operands(delta_len, delta_size, CHECK);
-+ }
-
-- int dest_i = to_i; // leave original alone for debug purposes
-+} // end extend_operands()
-
-- for (int src_i = start_i; src_i <= end_i; /* see loop bottom */ ) {
-- copy_entry_to(from_cp, src_i, to_cp, dest_i, CHECK);
-
-- switch (from_cp->tag_at(src_i).value()) {
-- case JVM_CONSTANT_Double:
-- case JVM_CONSTANT_Long:
-- // double and long take two constant pool entries
-- src_i += 2;
-- dest_i += 2;
-- break;
--
-- default:
-- // all others take one constant pool entry
-- src_i++;
-- dest_i++;
-- break;
-- }
-+// Shrink the operands array to a smaller array with new_len length.
-+// Used in RedefineClasses for CP merge.
-+void constantPoolOopDesc::shrink_operands(int new_len, TRAPS) {
-+ int old_len = operand_array_length(operands());
-+ if (new_len == old_len) {
-+ return; // nothing to do
- }
-+ assert(new_len < old_len, "shrunken operands array must be smaller");
-+
-+ int free_base = operand_next_offset_at(new_len - 1);
-+ int delta_len = new_len - old_len;
-+ int delta_size = 2*delta_len + free_base - operands()->length();
-+
-+ resize_operands(delta_len, delta_size, CHECK);
-+
-+} // end shrink_operands()
-+
-+
-+void constantPoolOopDesc::copy_operands(constantPoolHandle from_cp,
-+ constantPoolHandle to_cp,
-+ TRAPS) {
-
- int from_oplen = operand_array_length(from_cp->operands());
- int old_oplen = operand_array_length(to_cp->operands());
-@@ -1116,7 +1150,7 @@
- int from_len = from_cp->operands()->length();
- int old_off = old_oplen * sizeof(u2);
- int from_off = from_oplen * sizeof(u2);
-- typeArrayHandle new_operands = oopFactory::new_permanent_shortArray(old_len + from_len, CHECK);
-+ typeArrayHandle new_operands = oopFactory::new_permanent_intArray(old_len + from_len, CHECK);
- int fillp = 0, len = 0;
- // first part of dest
- Copy::conjoint_memory_atomic(to_cp->operands()->short_at_addr(0),
-@@ -1124,7 +1158,7 @@
- (len = old_off) * sizeof(u2));
- fillp += len;
- // first part of src
-- Copy::conjoint_memory_atomic(to_cp->operands()->short_at_addr(0),
-+ Copy::conjoint_memory_atomic(from_cp->operands()->short_at_addr(0),
- new_operands->short_at_addr(fillp),
- (len = from_off) * sizeof(u2));
- fillp += len;
-@@ -1134,7 +1168,7 @@
- (len = old_len - old_off) * sizeof(u2));
- fillp += len;
- // second part of src
-- Copy::conjoint_memory_atomic(to_cp->operands()->short_at_addr(from_off),
-+ Copy::conjoint_memory_atomic(from_cp->operands()->short_at_addr(from_off),
- new_operands->short_at_addr(fillp),
- (len = from_len - from_off) * sizeof(u2));
- fillp += len;
-@@ -1152,8 +1186,39 @@
- to_cp->set_operands(new_operands());
- }
- }
-+} // end copy_operands()
-
--} // end copy_cp_to()
-+
-+// Copy this constant pool's entries at start_i to end_i (inclusive)
-+// to the constant pool to_cp's entries starting at to_i. A total of
-+// (end_i - start_i) + 1 entries are copied.
-+void constantPoolOopDesc::copy_cp_to_impl(constantPoolHandle from_cp, int start_i, int end_i,
-+ constantPoolHandle to_cp, int to_i, TRAPS) {
-+
-+
-+ int dest_i = to_i; // leave original alone for debug purposes
-+
-+ for (int src_i = start_i; src_i <= end_i; /* see loop bottom */ ) {
-+ copy_entry_to(from_cp, src_i, to_cp, dest_i, CHECK);
-+
-+ switch (from_cp->tag_at(src_i).value()) {
-+ case JVM_CONSTANT_Double:
-+ case JVM_CONSTANT_Long:
-+ // double and long take two constant pool entries
-+ src_i += 2;
-+ dest_i += 2;
-+ break;
-+
-+ default:
-+ // all others take one constant pool entry
-+ src_i++;
-+ dest_i++;
-+ break;
-+ }
-+ }
-+ copy_operands(from_cp, to_cp, CHECK);
-+
-+} // end copy_cp_to_impl()
-
-
- // Copy this constant pool's entry at from_i to the constant pool
-@@ -1337,6 +1402,46 @@
- } // end find_matching_entry()
-
-
-+// Compare this constant pool's bootstrap specifier at idx1 to the constant pool
-+// cp2's bootstrap specifier at idx2.
-+bool constantPoolOopDesc::compare_operand_to(int idx1, constantPoolHandle cp2, int idx2, TRAPS) {
-+ int k1 = operand_bootstrap_method_ref_index_at(idx1);
-+ int k2 = cp2->operand_bootstrap_method_ref_index_at(idx2);
-+ bool match = compare_entry_to(k1, cp2, k2, CHECK_false);
-+
-+ if (!match) {
-+ return false;
-+ }
-+ int argc = operand_argument_count_at(idx1);
-+ if (argc == cp2->operand_argument_count_at(idx2)) {
-+ for (int j = 0; j < argc; j++) {
-+ k1 = operand_argument_index_at(idx1, j);
-+ k2 = cp2->operand_argument_index_at(idx2, j);
-+ match = compare_entry_to(k1, cp2, k2, CHECK_false);
-+ if (!match) {
-+ return false;
-+ }
-+ }
-+ return true; // got through loop; all elements equal
-+ }
-+ return false;
-+} // end compare_operand_to()
-+
-+// Search constant pool search_cp for a bootstrap specifier that matches
-+// this constant pool's bootstrap specifier at pattern_i index.
-+// Return the index of a matching bootstrap specifier or (-1) if there is no match.
-+int constantPoolOopDesc::find_matching_operand(int pattern_i,
-+ constantPoolHandle search_cp, int search_len, TRAPS) {
-+ for (int i = 0; i < search_len; i++) {
-+ bool found = compare_operand_to(pattern_i, search_cp, i, CHECK_(-1));
-+ if (found) {
-+ return i;
-+ }
-+ }
-+ return -1; // bootstrap specifier not found; return unused index (-1)
-+} // end find_matching_operand()
-+
-+
- #ifndef PRODUCT
-
- const char* constantPoolOopDesc::printable_name_at(int which) {
---- ./hotspot/src/share/vm/oops/constantPoolOop.hpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/constantPoolOop.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -565,6 +565,47 @@
- _indy_argc_offset = 1, // u2 argc
- _indy_argv_offset = 2 // u2 argv[argc]
- };
-+
-+ // These functions are used in RedefineClasses for CP merge
-+
-+ int operand_offset_at(int bootstrap_specifier_index) {
-+ assert(0 <= bootstrap_specifier_index &&
-+ bootstrap_specifier_index < operand_array_length(operands()),
-+ "Corrupted CP operands");
-+ return operand_offset_at(operands(), bootstrap_specifier_index);
-+ }
-+ int operand_bootstrap_method_ref_index_at(int bootstrap_specifier_index) {
-+ int offset = operand_offset_at(bootstrap_specifier_index);
-+ return operands()->short_at(offset + _indy_bsm_offset);
-+ }
-+ int operand_argument_count_at(int bootstrap_specifier_index) {
-+ int offset = operand_offset_at(bootstrap_specifier_index);
-+ int argc = operands()->short_at(offset + _indy_argc_offset);
-+ return argc;
-+ }
-+ int operand_argument_index_at(int bootstrap_specifier_index, int j) {
-+ int offset = operand_offset_at(bootstrap_specifier_index);
-+ return operands()->short_at(offset + _indy_argv_offset + j);
-+ }
-+ int operand_next_offset_at(int bootstrap_specifier_index) {
-+ int offset = operand_offset_at(bootstrap_specifier_index) + _indy_argv_offset
-+ + operand_argument_count_at(bootstrap_specifier_index);
-+ return offset;
-+ }
-+ // Compare a bootsrap specifier in the operands arrays
-+ bool compare_operand_to(int bootstrap_specifier_index1, constantPoolHandle cp2,
-+ int bootstrap_specifier_index2, TRAPS);
-+ // Find a bootsrap specifier in the operands array
-+ int find_matching_operand(int bootstrap_specifier_index, constantPoolHandle search_cp,
-+ int operands_cur_len, TRAPS);
-+ // Resize the operands array with delta_len and delta_size
-+ void resize_operands(int delta_len, int delta_size, TRAPS);
-+ // Extend the operands array with the length and size of the ext_cp operands
-+ void extend_operands(constantPoolHandle ext_cp, TRAPS);
-+ // Shrink the operands array to a smaller array with new_len length
-+ void shrink_operands(int new_len, TRAPS);
-+
-+
- int invoke_dynamic_bootstrap_method_ref_index_at(int which) {
- assert(tag_at(which).is_invoke_dynamic(), "Corrupted constant pool");
- int op_base = invoke_dynamic_operand_base(which);
-@@ -755,6 +796,7 @@
- copy_cp_to_impl(h_this, start_i, end_i, to_cp, to_i, THREAD);
- }
- static void copy_cp_to_impl(constantPoolHandle from_cp, int start_i, int end_i, constantPoolHandle to_cp, int to_i, TRAPS);
-+ static void copy_operands(constantPoolHandle from_cp, constantPoolHandle to_cp, TRAPS);
- static void copy_entry_to(constantPoolHandle from_cp, int from_i, constantPoolHandle to_cp, int to_i, TRAPS);
- int find_matching_entry(int pattern_i, constantPoolHandle search_cp, TRAPS);
- int orig_length() const { return _orig_length; }
---- ./hotspot/src/share/vm/oops/instanceKlass.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/instanceKlass.cpp 2014-10-28 20:19:39.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
-@@ -1901,6 +1901,17 @@
- FreeHeap(jmeths);
- }
-
-+ // Deallocate MemberNameTable
-+ {
-+ Mutex* lock_or_null = SafepointSynchronize::is_at_safepoint() ? NULL : MemberNameTable_lock;
-+ MutexLockerEx ml(lock_or_null, Mutex::_no_safepoint_check_flag);
-+ MemberNameTable* mnt = member_names();
-+ if (mnt != NULL) {
-+ delete mnt;
-+ set_member_names(NULL);
-+ }
-+ }
-+
- int* indices = methods_cached_itable_indices_acquire();
- if (indices != (int*)NULL) {
- release_set_methods_cached_itable_indices(NULL);
-@@ -2333,6 +2344,30 @@
- return NULL;
- }
-
-+void instanceKlass::add_member_name(int index, Handle mem_name) {
-+ jweak mem_name_wref = JNIHandles::make_weak_global(mem_name);
-+ MutexLocker ml(MemberNameTable_lock);
-+ assert(0 <= index && index < idnum_allocated_count(), "index is out of bounds");
-+ DEBUG_ONLY(No_Safepoint_Verifier nsv);
-+
-+ if (_member_names == NULL) {
-+ _member_names = new (ResourceObj::C_HEAP, mtClass) MemberNameTable(idnum_allocated_count());
-+ }
-+ _member_names->add_member_name(index, mem_name_wref);
-+}
-+
-+oop instanceKlass::get_member_name(int index) {
-+ MutexLocker ml(MemberNameTable_lock);
-+ assert(0 <= index && index < idnum_allocated_count(), "index is out of bounds");
-+ DEBUG_ONLY(No_Safepoint_Verifier nsv);
-+
-+ if (_member_names == NULL) {
-+ return NULL;
-+ }
-+ oop mem_name =_member_names->get_member_name(index);
-+ return mem_name;
-+}
-+
- // -----------------------------------------------------------------------------------------------------
- #ifndef PRODUCT
-
---- ./hotspot/src/share/vm/oops/instanceKlass.hpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/instanceKlass.hpp 2014-07-15 21:48:34.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
-@@ -94,6 +94,7 @@
- class nmethodBucket;
- class PreviousVersionNode;
- class JvmtiCachedClassFieldMap;
-+class MemberNameTable;
-
- // This is used in iterators below.
- class FieldClosure: public StackObj {
-@@ -265,6 +266,7 @@
- int _vtable_len; // length of Java vtable (in words)
- int _itable_len; // length of Java itable (in words)
- OopMapCache* volatile _oop_map_cache; // OopMapCache for all methods in the klass (allocated lazily)
-+ MemberNameTable* _member_names; // Member names
- JNIid* _jni_ids; // First JNI identifier for static fields in this class
- jmethodID* _methods_jmethod_ids; // jmethodIDs corresponding to method_idnum, or NULL if none
- int* _methods_cached_itable_indices; // itable_index cache for JNI invoke corresponding to methods idnum, or NULL
-@@ -972,6 +974,12 @@
- // jvm support
- jint compute_modifier_flags(TRAPS) const;
-
-+ // JSR-292 support
-+ MemberNameTable* member_names() { return _member_names; }
-+ void set_member_names(MemberNameTable* member_names) { _member_names = member_names; }
-+ void add_member_name(int index, Handle member_name);
-+ oop get_member_name(int index);
-+
- public:
- // JVMTI support
- jint jvmti_class_status() const;
---- ./hotspot/src/share/vm/oops/klass.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/klass.cpp 2014-10-28 20:19:38.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
-@@ -119,6 +119,15 @@
- return is_subclass_of(k);
- }
-
-+klassOop Klass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const {
-+#ifdef ASSERT
-+ tty->print_cr("Error: find_field called on a klass oop."
-+ " Likely error: reflection method does not correctly"
-+ " wrap return value in a mirror object.");
-+#endif
-+ ShouldNotReachHere();
-+ return NULL;
-+}
-
- methodOop Klass::uncached_lookup_method(Symbol* name, Symbol* signature) const {
- #ifdef ASSERT
---- ./hotspot/src/share/vm/oops/klass.hpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/klass.hpp 2014-10-28 20:19:38.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
-@@ -88,6 +88,7 @@
- class klassVtable;
- class KlassHandle;
- class OrderAccess;
-+class fieldDescriptor;
-
- // Holder (or cage) for the C++ vtable of each kind of Klass.
- // We want to tightly constrain the location of the C++ vtable in the overall layout.
-@@ -514,6 +515,7 @@
- virtual void initialize(TRAPS);
- // lookup operation for MethodLookupCache
- friend class MethodLookupCache;
-+ virtual klassOop find_field(Symbol* name, Symbol* signature, fieldDescriptor* fd) const;
- virtual methodOop uncached_lookup_method(Symbol* name, Symbol* signature) const;
- public:
- methodOop lookup_method(Symbol* name, Symbol* signature) const {
---- ./hotspot/src/share/vm/oops/klassVtable.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/klassVtable.cpp 2014-07-15 21:54:40.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
-@@ -209,6 +209,17 @@
- // For bytecodes not produced by javac together it is possible that a method does not override
- // the superclass's method, but might indirectly override a super-super class's vtable entry
- // If none found, return a null superk, else return the superk of the method this does override
-+// For public and protected methods: if they override a superclass, they will
-+// also be overridden themselves appropriately.
-+// Private methods do not override and are not overridden.
-+// Package Private methods are trickier:
-+// e.g. P1.A, pub m
-+// P2.B extends A, package private m
-+// P1.C extends B, public m
-+// P1.C.m needs to override P1.A.m and can not override P2.B.m
-+// Therefore: all package private methods need their own vtable entries for
-+// them to be the root of an inheritance overriding decision
-+// Package private methods may also override other vtable entries
- instanceKlass* klassVtable::find_transitive_override(instanceKlass* initialsuper, methodHandle target_method,
- int vtable_index, Handle target_loader, Symbol* target_classname, Thread * THREAD) {
- instanceKlass* superk = initialsuper;
-@@ -310,8 +321,12 @@
- ((klass->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION)
- && ((super_klass = find_transitive_override(super_klass, target_method, i, target_loader,
- target_classname, THREAD)) != (instanceKlass*)NULL))) {
-- // overriding, so no new entry
-- allocate_new = false;
-+
-+ // Package private methods always need a new entry to root their own
-+ // overriding. They may also override other methods.
-+ if (!target_method()->is_package_private()) {
-+ allocate_new = false;
-+ }
-
- if (checkconstraints) {
- // Override vtable entry if passes loader constraint check
-@@ -433,6 +448,12 @@
- return true;
- }
-
-+ // Package private methods always need a new entry to root their own
-+ // overriding. This allows transitive overriding to work.
-+ if (target_method()->is_package_private()) {
-+ return true;
-+ }
-+
- // search through the super class hierarchy to see if we need
- // a new entry
- ResourceMark rm;
---- ./hotspot/src/share/vm/oops/objArrayKlass.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/objArrayKlass.cpp 2014-07-15 21:48:34.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/bytecodeInfo.cpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/bytecodeInfo.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -103,7 +103,7 @@
- // Allows targeted inlining
- if(callee_method->should_inline()) {
- *wci_result = *(WarmCallInfo::always_hot());
-- if (PrintInlining && Verbose) {
-+ if (C->print_inlining() && Verbose) {
- CompileTask::print_inline_indent(inline_level());
- tty->print_cr("Inlined method is hot: ");
- }
-@@ -117,7 +117,7 @@
- if(callee_method->interpreter_throwout_count() > InlineThrowCount &&
- size < InlineThrowMaxSize ) {
- wci_result->set_profit(wci_result->profit() * 100);
-- if (PrintInlining && Verbose) {
-+ if (C->print_inlining() && Verbose) {
- CompileTask::print_inline_indent(inline_level());
- tty->print_cr("Inlined method with many throws (throws=%d):", callee_method->interpreter_throwout_count());
- }
-@@ -468,7 +468,7 @@
- C->log()->inline_fail(inline_msg);
- }
- }
-- if (PrintInlining) {
-+ if (C->print_inlining()) {
- C->print_inlining(callee_method, inline_level(), caller_bci, inline_msg);
- if (callee_method == NULL) tty->print(" callee not monotonic or profiled");
- if (Verbose && callee_method) {
-@@ -517,7 +517,7 @@
-
- #ifndef PRODUCT
- if (UseOldInlining && InlineWarmCalls
-- && (PrintOpto || PrintOptoInlining || PrintInlining)) {
-+ && (PrintOpto || C->print_inlining())) {
- bool cold = wci.is_cold();
- bool hot = !cold && wci.is_hot();
- bool old_cold = !success;
-@@ -594,7 +594,7 @@
- callee_method->is_compiled_lambda_form()) {
- max_inline_level_adjust += 1; // don't count method handle calls from java.lang.invoke implem
- }
-- if (max_inline_level_adjust != 0 && PrintInlining && (Verbose || WizardMode)) {
-+ if (max_inline_level_adjust != 0 && C->print_inlining() && (Verbose || WizardMode)) {
- CompileTask::print_inline_indent(inline_level());
- tty->print_cr(" \\-> discounting inline depth");
- }
---- ./hotspot/src/share/vm/opto/c2_globals.hpp 2013-09-06 11:22:13.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/c2_globals.hpp 2014-10-28 20:19:39.000000000 -0700
-@@ -173,6 +173,9 @@
- product_pd(intx, LoopUnrollLimit, \
- "Unroll loop bodies with node count less than this") \
- \
-+ product(intx, LoopMaxUnroll, 16, \
-+ "Maximum number of unrolls for main loop") \
-+ \
- product(intx, LoopUnrollMin, 4, \
- "Minimum number of unroll loop bodies before checking progress" \
- "of rounds of unroll,optimize,..") \
---- ./hotspot/src/share/vm/opto/callGenerator.hpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/callGenerator.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -158,8 +158,9 @@
- virtual void print_inlining_late(const char* msg) { ShouldNotReachHere(); }
-
- static void print_inlining(Compile* C, ciMethod* callee, int inline_level, int bci, const char* msg) {
-- if (PrintInlining)
-+ if (C->print_inlining()) {
- C->print_inlining(callee, inline_level, bci, msg);
-+ }
- }
- };
-
---- ./hotspot/src/share/vm/opto/coalesce.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/coalesce.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -135,20 +135,26 @@
- // After cloning some rematerialized instruction, clone any MachProj's that
- // follow it. Example: Intel zero is XOR, kills flags. Sparc FP constants
- // use G3 as an address temp.
--int PhaseChaitin::clone_projs( Block *b, uint idx, Node *con, Node *copy, uint &maxlrg ) {
-- Block *bcon = _cfg._bbs[con->_idx];
-- uint cindex = bcon->find_node(con);
-- Node *con_next = bcon->_nodes[cindex+1];
-- if( con_next->in(0) != con || !con_next->is_MachProj() )
-- return false; // No MachProj's follow
--
-- // Copy kills after the cloned constant
-- Node *kills = con_next->clone();
-- kills->set_req( 0, copy );
-- b->_nodes.insert( idx, kills );
-- _cfg._bbs.map( kills->_idx, b );
-- new_lrg( kills, maxlrg++ );
-- return true;
-+int PhaseChaitin::clone_projs(Block* b, uint idx, Node* orig, Node* copy, uint& max_lrg_id) {
-+ assert(b->find_node(copy) == (idx - 1), "incorrect insert index for copy kill projections");
-+ DEBUG_ONLY( Block* borig = _cfg._bbs[orig->_idx]; )
-+ int found_projs = 0;
-+ uint cnt = orig->outcnt();
-+ for (uint i = 0; i < cnt; i++) {
-+ Node* proj = orig->raw_out(i);
-+ if (proj->is_MachProj()) {
-+ assert(proj->outcnt() == 0, "only kill projections are expected here");
-+ assert(_cfg._bbs[proj->_idx] == borig, "incorrect block for kill projections");
-+ found_projs++;
-+ // Copy kill projections after the cloned node
-+ Node* kills = proj->clone();
-+ kills->set_req(0, copy);
-+ b->_nodes.insert(idx++, kills);
-+ _cfg._bbs.map(kills->_idx, b);
-+ new_lrg(kills, max_lrg_id++);
-+ }
-+ }
-+ return found_projs;
- }
-
- //------------------------------compact----------------------------------------
-@@ -464,8 +470,7 @@
- copy = m->clone();
- // Insert the copy in the basic block, just before us
- b->_nodes.insert( l++, copy );
-- if( _phc.clone_projs( b, l, m, copy, _phc._maxlrg ) )
-- l++;
-+ l += _phc.clone_projs(b, l, m, copy, _phc._maxlrg);
- } else {
- const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
- copy = new (C) MachSpillCopyNode( m, *rm, *rm );
---- ./hotspot/src/share/vm/opto/compile.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/compile.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -642,7 +642,7 @@
- _inlining_progress(false),
- _inlining_incrementally(false),
- _print_inlining_list(NULL),
-- _print_inlining(0) {
-+ _print_inlining_idx(0) {
- C = this;
-
- CompileWrapper cw(this);
-@@ -667,6 +667,8 @@
- set_print_assembly(print_opto_assembly);
- set_parsed_irreducible_loop(false);
- #endif
-+ set_print_inlining(PrintInlining || method()->has_option("PrintInlining") NOT_PRODUCT( || PrintOptoInlining));
-+ set_print_intrinsics(PrintIntrinsics || method()->has_option("PrintIntrinsics"));
-
- if (ProfileTraps) {
- // Make sure the method being compiled gets its own MDO,
-@@ -698,7 +700,7 @@
- PhaseGVN gvn(node_arena(), estimated_size);
- set_initial_gvn(&gvn);
-
-- if (PrintInlining || PrintIntrinsics NOT_PRODUCT( || PrintOptoInlining)) {
-+ if (print_inlining() || print_intrinsics()) {
- _print_inlining_list = new (comp_arena())GrowableArray<PrintInliningBuffer>(comp_arena(), 1, 1, PrintInliningBuffer());
- }
- { // Scope for timing the parser
-@@ -832,6 +834,7 @@
- }
- #endif
-
-+ NOT_PRODUCT( verify_barriers(); )
- // Now that we know the size of all the monitors we can add a fixed slot
- // for the original deopt pc.
-
-@@ -924,7 +927,7 @@
- _inlining_progress(false),
- _inlining_incrementally(false),
- _print_inlining_list(NULL),
-- _print_inlining(0) {
-+ _print_inlining_idx(0) {
- C = this;
-
- #ifndef PRODUCT
-@@ -3237,6 +3240,72 @@
- }
- }
- }
-+
-+// Verify GC barriers consistency
-+// Currently supported:
-+// - G1 pre-barriers (see GraphKit::g1_write_barrier_pre())
-+void Compile::verify_barriers() {
-+ if (UseG1GC) {
-+ // Verify G1 pre-barriers
-+ const int marking_offset = in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_active());
-+
-+ ResourceArea *area = Thread::current()->resource_area();
-+ Unique_Node_List visited(area);
-+ Node_List worklist(area);
-+ // We're going to walk control flow backwards starting from the Root
-+ worklist.push(_root);
-+ while (worklist.size() > 0) {
-+ Node* x = worklist.pop();
-+ if (x == NULL || x == top()) continue;
-+ if (visited.member(x)) {
-+ continue;
-+ } else {
-+ visited.push(x);
-+ }
-+
-+ if (x->is_Region()) {
-+ for (uint i = 1; i < x->req(); i++) {
-+ worklist.push(x->in(i));
-+ }
-+ } else {
-+ worklist.push(x->in(0));
-+ // We are looking for the pattern:
-+ // /->ThreadLocal
-+ // If->Bool->CmpI->LoadB->AddP->ConL(marking_offset)
-+ // \->ConI(0)
-+ // We want to verify that the If and the LoadB have the same control
-+ // See GraphKit::g1_write_barrier_pre()
-+ if (x->is_If()) {
-+ IfNode *iff = x->as_If();
-+ if (iff->in(1)->is_Bool() && iff->in(1)->in(1)->is_Cmp()) {
-+ CmpNode *cmp = iff->in(1)->in(1)->as_Cmp();
-+ if (cmp->Opcode() == Op_CmpI && cmp->in(2)->is_Con() && cmp->in(2)->bottom_type()->is_int()->get_con() == 0
-+ && cmp->in(1)->is_Load()) {
-+ LoadNode* load = cmp->in(1)->as_Load();
-+ if (load->Opcode() == Op_LoadB && load->in(2)->is_AddP() && load->in(2)->in(2)->Opcode() == Op_ThreadLocal
-+ && load->in(2)->in(3)->is_Con()
-+ && load->in(2)->in(3)->bottom_type()->is_intptr_t()->get_con() == marking_offset) {
-+
-+ Node* if_ctrl = iff->in(0);
-+ Node* load_ctrl = load->in(0);
-+
-+ if (if_ctrl != load_ctrl) {
-+ // Skip possible CProj->NeverBranch in infinite loops
-+ if ((if_ctrl->is_Proj() && if_ctrl->Opcode() == Op_CProj)
-+ && (if_ctrl->in(0)->is_MultiBranch() && if_ctrl->in(0)->Opcode() == Op_NeverBranch)) {
-+ if_ctrl = if_ctrl->in(0)->in(0);
-+ }
-+ }
-+ assert(load_ctrl != NULL && if_ctrl == load_ctrl, "controls must match");
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+}
-+
- #endif
-
- // The Compile object keeps track of failure reasons separately from the ciEnv.
-@@ -3510,7 +3579,7 @@
- }
-
- void Compile::dump_inlining() {
-- if (PrintInlining || PrintIntrinsics NOT_PRODUCT( || PrintOptoInlining)) {
-+ if (print_inlining() || print_intrinsics()) {
- // Print inlining message for candidates that we couldn't inline
- // for lack of space or non constant receiver
- for (int i = 0; i < _late_inlines.length(); i++) {
-@@ -3534,7 +3603,7 @@
- }
- }
- for (int i = 0; i < _print_inlining_list->length(); i++) {
-- tty->print(_print_inlining_list->at(i).ss()->as_string());
-+ tty->print(_print_inlining_list->adr_at(i)->ss()->as_string());
- }
- }
- }
---- ./hotspot/src/share/vm/opto/compile.hpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/compile.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -42,6 +42,7 @@
- #include "runtime/deoptimization.hpp"
- #include "runtime/vmThread.hpp"
- #include "trace/tracing.hpp"
-+#include "utilities/ticks.hpp"
-
- class Block;
- class Bundle;
-@@ -284,6 +285,8 @@
- bool _do_method_data_update; // True if we generate code to update methodDataOops
- int _AliasLevel; // Locally-adjusted version of AliasLevel flag.
- bool _print_assembly; // True if we should dump assembly code for this compilation
-+ bool _print_inlining; // True if we should print inlining for this compilation
-+ bool _print_intrinsics; // True if we should print intrinsics for this compilation
- #ifndef PRODUCT
- bool _trace_opto_output;
- bool _parsed_irreducible_loop; // True if ciTypeFlow detected irreducible loops during parsing
-@@ -384,7 +387,7 @@
- };
-
- GrowableArray<PrintInliningBuffer>* _print_inlining_list;
-- int _print_inlining;
-+ int _print_inlining_idx;
-
- // Only keep nodes in the expensive node list that need to be optimized
- void cleanup_expensive_nodes(PhaseIterGVN &igvn);
-@@ -396,24 +399,24 @@
- public:
-
- outputStream* print_inlining_stream() const {
-- return _print_inlining_list->at(_print_inlining).ss();
-+ return _print_inlining_list->adr_at(_print_inlining_idx)->ss();
- }
-
- void print_inlining_skip(CallGenerator* cg) {
-- if (PrintInlining) {
-- _print_inlining_list->at(_print_inlining).set_cg(cg);
-- _print_inlining++;
-- _print_inlining_list->insert_before(_print_inlining, PrintInliningBuffer());
-+ if (_print_inlining) {
-+ _print_inlining_list->adr_at(_print_inlining_idx)->set_cg(cg);
-+ _print_inlining_idx++;
-+ _print_inlining_list->insert_before(_print_inlining_idx, PrintInliningBuffer());
- }
- }
-
- void print_inlining_insert(CallGenerator* cg) {
-- if (PrintInlining) {
-+ if (_print_inlining) {
- for (int i = 0; i < _print_inlining_list->length(); i++) {
-- if (_print_inlining_list->at(i).cg() == cg) {
-+ if (_print_inlining_list->adr_at(i)->cg() == cg) {
- _print_inlining_list->insert_before(i+1, PrintInliningBuffer());
-- _print_inlining = i+1;
-- _print_inlining_list->at(i).set_cg(NULL);
-+ _print_inlining_idx = i+1;
-+ _print_inlining_list->adr_at(i)->set_cg(NULL);
- return;
- }
- }
-@@ -536,6 +539,10 @@
- int AliasLevel() const { return _AliasLevel; }
- bool print_assembly() const { return _print_assembly; }
- void set_print_assembly(bool z) { _print_assembly = z; }
-+ bool print_inlining() const { return _print_inlining; }
-+ void set_print_inlining(bool z) { _print_inlining = z; }
-+ bool print_intrinsics() const { return _print_intrinsics; }
-+ void set_print_intrinsics(bool z) { _print_intrinsics = z; }
- // check the CompilerOracle for special behaviours for this compile
- bool method_has_option(const char * option) {
- return method() != NULL && method()->has_option(option);
-@@ -550,20 +557,19 @@
- bool has_method_handle_invokes() const { return _has_method_handle_invokes; }
- void set_has_method_handle_invokes(bool z) { _has_method_handle_invokes = z; }
-
-- jlong _latest_stage_start_counter;
-+ Ticks _latest_stage_start_counter;
-
- void begin_method() {
- #ifndef PRODUCT
- if (_printer) _printer->begin_method(this);
- #endif
-- C->_latest_stage_start_counter = os::elapsed_counter();
-+ C->_latest_stage_start_counter.stamp();
- }
-
- void print_method(CompilerPhaseType cpt, int level = 1) {
-- EventCompilerPhase event(UNTIMED);
-+ EventCompilerPhase event;
- if (event.should_commit()) {
- event.set_starttime(C->_latest_stage_start_counter);
-- event.set_endtime(os::elapsed_counter());
- event.set_phase((u1) cpt);
- event.set_compileID(C->_compile_id);
- event.set_phaseLevel(level);
-@@ -574,14 +580,13 @@
- #ifndef PRODUCT
- if (_printer) _printer->print_method(this, CompilerPhaseTypeHelper::to_string(cpt), level);
- #endif
-- C->_latest_stage_start_counter = os::elapsed_counter();
-+ C->_latest_stage_start_counter.stamp();
- }
-
- void end_method(int level = 1) {
-- EventCompilerPhase event(UNTIMED);
-+ EventCompilerPhase event;
- if (event.should_commit()) {
- event.set_starttime(C->_latest_stage_start_counter);
-- event.set_endtime(os::elapsed_counter());
- event.set_phase((u1) PHASE_END);
- event.set_compileID(C->_compile_id);
- event.set_phaseLevel(level);
-@@ -1091,6 +1096,9 @@
- // Print bytecodes, including the scope inlining tree
- void print_codes();
-
-+ // Verify GC barrier patterns
-+ void verify_barriers() PRODUCT_RETURN;
-+
- // End-of-run dumps.
- static void print_statistics() PRODUCT_RETURN;
-
---- ./hotspot/src/share/vm/opto/doCall.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/doCall.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -42,9 +42,9 @@
- #include "runtime/sharedRuntime.hpp"
-
- void trace_type_profile(Compile* C, ciMethod *method, int depth, int bci, ciMethod *prof_method, ciKlass *prof_klass, int site_count, int receiver_count) {
-- if (TraceTypeProfile || PrintInlining NOT_PRODUCT(|| PrintOptoInlining)) {
-+ if (TraceTypeProfile || C->print_inlining()) {
- outputStream* out = tty;
-- if (!PrintInlining) {
-+ if (!C->print_inlining()) {
- if (NOT_PRODUCT(!PrintOpto &&) !PrintCompilation) {
- method->print_short_name();
- tty->cr();
---- ./hotspot/src/share/vm/opto/graphKit.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/graphKit.cpp 2014-10-28 20:19:37.000000000 -0700
-@@ -1120,6 +1120,17 @@
- }
- return _gvn.transform( new (C) ConvI2LNode(offset));
- }
-+
-+Node* GraphKit::ConvI2UL(Node* offset) {
-+ juint offset_con = (juint) find_int_con(offset, Type::OffsetBot);
-+ if (offset_con != (juint) Type::OffsetBot) {
-+ return longcon((julong) offset_con);
-+ }
-+ Node* conv = _gvn.transform( new (C) ConvI2LNode(offset));
-+ Node* mask = _gvn.transform( ConLNode::make(C, (julong) max_juint) );
-+ return _gvn.transform( new (C) AndLNode(conv, mask) );
-+}
-+
- Node* GraphKit::ConvL2I(Node* offset) {
- // short-circuit a common case
- jlong offset_con = find_long_con(offset, (jlong)Type::OffsetBot);
-@@ -3596,7 +3607,7 @@
- Node* marking = __ load(__ ctrl(), marking_adr, TypeInt::INT, active_type, Compile::AliasIdxRaw);
-
- // if (!marking)
-- __ if_then(marking, BoolTest::ne, zero); {
-+ __ if_then(marking, BoolTest::ne, zero, unlikely); {
- BasicType index_bt = TypeX_X->basic_type();
- assert(sizeof(size_t) == type2aelembytes(index_bt), "Loading G1 PtrQueue::_index with wrong size.");
- Node* index = __ load(__ ctrl(), index_adr, TypeX_X, index_bt, Compile::AliasIdxRaw);
-@@ -3604,7 +3615,7 @@
- if (do_load) {
- // load original value
- // alias_idx correct??
-- pre_val = __ load(no_ctrl, adr, val_type, bt, alias_idx);
-+ pre_val = __ load(__ ctrl(), adr, val_type, bt, alias_idx);
- }
-
- // if (pre_val != NULL)
-@@ -3701,7 +3712,8 @@
- Node* no_base = __ top();
- float likely = PROB_LIKELY(0.999);
- float unlikely = PROB_UNLIKELY(0.999);
-- Node* zero = __ ConI(0);
-+ Node* young_card = __ ConI((jint)G1SATBCardTableModRefBS::g1_young_card_val());
-+ Node* dirty_card = __ ConI((jint)CardTableModRefBS::dirty_card_val());
- Node* zeroX = __ ConX(0);
-
- // Get the alias_index for raw card-mark memory
-@@ -3757,8 +3769,16 @@
- // load the original value of the card
- Node* card_val = __ load(__ ctrl(), card_adr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw);
-
-- __ if_then(card_val, BoolTest::ne, zero); {
-- g1_mark_card(ideal, card_adr, oop_store, alias_idx, index, index_adr, buffer, tf);
-+ __ if_then(card_val, BoolTest::ne, young_card); {
-+ sync_kit(ideal);
-+ // Use Op_MemBarVolatile to achieve the effect of a StoreLoad barrier.
-+ insert_mem_bar(Op_MemBarVolatile, oop_store);
-+ __ sync_kit(this);
-+
-+ Node* card_val_reload = __ load(__ ctrl(), card_adr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw);
-+ __ if_then(card_val_reload, BoolTest::ne, dirty_card); {
-+ g1_mark_card(ideal, card_adr, oop_store, alias_idx, index, index_adr, buffer, tf);
-+ } __ end_if();
- } __ end_if();
- } __ end_if();
- } __ end_if();
---- ./hotspot/src/share/vm/opto/graphKit.hpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/graphKit.hpp 2014-10-28 20:19:37.000000000 -0700
-@@ -338,6 +338,7 @@
- // Convert between int and long, and size_t.
- // (See macros ConvI2X, etc., in type.hpp for ConvI2X, etc.)
- Node* ConvI2L(Node* offset);
-+ Node* ConvI2UL(Node* offset);
- Node* ConvL2I(Node* offset);
- // Find out the klass of an object.
- Node* load_object_klass(Node* object);
---- ./hotspot/src/share/vm/opto/library_call.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/library_call.cpp 2014-10-28 20:19:37.000000000 -0700
-@@ -525,7 +525,7 @@
- Compile* C = kit.C;
- int nodes = C->unique();
- #ifndef PRODUCT
-- if ((PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) && Verbose) {
-+ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
- char buf[1000];
- const char* str = vmIntrinsics::short_name_as_C_string(intrinsic_id(), buf, sizeof(buf));
- tty->print_cr("Intrinsic %s", str);
-@@ -536,7 +536,7 @@
-
- // Try to inline the intrinsic.
- if (kit.try_to_inline()) {
-- if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
-+ if (C->print_intrinsics() || C->print_inlining()) {
- C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)");
- }
- C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
-@@ -552,7 +552,7 @@
- }
-
- // The intrinsic bailed out
-- if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
-+ if (C->print_intrinsics() || C->print_inlining()) {
- if (jvms->has_method()) {
- // Not a root compile.
- const char* msg = is_virtual() ? "failed to inline (intrinsic, virtual)" : "failed to inline (intrinsic)";
-@@ -574,7 +574,7 @@
- int nodes = C->unique();
- #ifndef PRODUCT
- assert(is_predicted(), "sanity");
-- if ((PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) && Verbose) {
-+ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
- char buf[1000];
- const char* str = vmIntrinsics::short_name_as_C_string(intrinsic_id(), buf, sizeof(buf));
- tty->print_cr("Predicate for intrinsic %s", str);
-@@ -585,7 +585,7 @@
-
- Node* slow_ctl = kit.try_to_predicate();
- if (!kit.failing()) {
-- if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
-+ if (C->print_intrinsics() || C->print_inlining()) {
- C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)");
- }
- C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
-@@ -599,7 +599,7 @@
- }
-
- // The intrinsic bailed out
-- if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
-+ if (C->print_intrinsics() || C->print_inlining()) {
- if (jvms->has_method()) {
- // Not a root compile.
- const char* msg = "failed to generate predicate for intrinsic";
-@@ -2262,7 +2262,7 @@
- const TypeOopPtr* tjp = TypeOopPtr::make_from_klass(sharpened_klass);
-
- #ifndef PRODUCT
-- if (PrintIntrinsics || PrintInlining || PrintOptoInlining) {
-+ if (C->print_intrinsics() || C->print_inlining()) {
- tty->print(" from base type: "); adr_type->dump();
- tty->print(" sharpened value: "); tjp->dump();
- }
-@@ -2432,7 +2432,7 @@
- case T_ADDRESS:
- // Cast to an int type.
- p = _gvn.transform(new (C) CastP2XNode(NULL, p));
-- p = ConvX2L(p);
-+ p = ConvX2UL(p);
- break;
- default:
- fatal(err_msg_res("unexpected type %d: %s", type, type2name(type)));
-@@ -3158,7 +3158,7 @@
- if (mirror_con == NULL) return false; // cannot happen?
-
- #ifndef PRODUCT
-- if (PrintIntrinsics || PrintInlining || PrintOptoInlining) {
-+ if (C->print_intrinsics() || C->print_inlining()) {
- ciType* k = mirror_con->java_mirror_type();
- if (k) {
- tty->print("Inlining %s on constant Class ", vmIntrinsics::name_at(intrinsic_id()));
-@@ -3846,7 +3846,7 @@
- // Method.invoke() and auxiliary frames.
- bool LibraryCallKit::inline_native_Reflection_getCallerClass() {
- #ifndef PRODUCT
-- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
-+ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
- tty->print_cr("Attempting to inline sun.reflect.Reflection.getCallerClass");
- }
- #endif
-@@ -3858,7 +3858,7 @@
- const TypeInt* caller_depth_type = _gvn.type(caller_depth_node)->isa_int();
- if (caller_depth_type == NULL || !caller_depth_type->is_con()) {
- #ifndef PRODUCT
-- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
-+ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
- tty->print_cr(" Bailing out because caller depth was not a constant");
- }
- #endif
-@@ -3873,7 +3873,7 @@
- int caller_depth = caller_depth_type->get_con() - 1;
- if (caller_depth < 0) {
- #ifndef PRODUCT
-- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
-+ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
- tty->print_cr(" Bailing out because caller depth was %d", caller_depth);
- }
- #endif
-@@ -3882,7 +3882,7 @@
-
- if (!jvms()->has_method()) {
- #ifndef PRODUCT
-- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
-+ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
- tty->print_cr(" Bailing out because intrinsic was inlined at top level");
- }
- #endif
-@@ -3919,7 +3919,7 @@
-
- if (inlining_depth == 0) {
- #ifndef PRODUCT
-- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
-+ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
- tty->print_cr(" Bailing out because caller depth (%d) exceeded inlining depth (%d)", caller_depth_type->get_con(), _depth);
- tty->print_cr(" JVM state at this point:");
- for (int i = _depth; i >= 1; i--) {
-@@ -3939,7 +3939,7 @@
- set_result(makecon(TypeInstPtr::make(caller_mirror)));
-
- #ifndef PRODUCT
-- if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) {
-+ if ((C->print_intrinsics() || C->print_inlining()) && Verbose) {
- tty->print_cr(" Succeeded: caller = %s.%s, caller depth = %d, depth = %d", caller_klass->name()->as_utf8(), caller_jvms->method()->name()->as_utf8(), caller_depth_type->get_con(), _depth);
- tty->print_cr(" JVM state at this point:");
- for (int i = _depth; i >= 1; i--) {
---- ./hotspot/src/share/vm/opto/loopTransform.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/loopTransform.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -623,8 +623,6 @@
- }
-
-
--#define MAX_UNROLL 16 // maximum number of unrolls for main loop
--
- //------------------------------policy_unroll----------------------------------
- // Return TRUE or FALSE if the loop should be unrolled or not. Unroll if
- // the loop is a CountedLoop and the body is small enough.
-@@ -641,7 +639,7 @@
- if (cl->trip_count() <= (uint)(cl->is_normal_loop() ? 2 : 1)) return false;
-
- int future_unroll_ct = cl->unrolled_count() * 2;
-- if (future_unroll_ct > MAX_UNROLL) return false;
-+ if (future_unroll_ct > LoopMaxUnroll) return false;
-
- // Check for initial stride being a small enough constant
- if (abs(cl->stride_con()) > (1<<2)*future_unroll_ct) return false;
-@@ -1956,7 +1954,7 @@
- // Find loads off the surviving projection; remove their control edge
- for (DUIterator_Fast imax, i = dp->fast_outs(imax); i < imax; i++) {
- Node* cd = dp->fast_out(i); // Control-dependent node
-- if( cd->is_Load() ) { // Loads can now float around in the loop
-+ if (cd->is_Load() && cd->depends_only_on_test()) { // Loads can now float around in the loop
- // Allow the load to float around in the loop, or before it
- // but NOT before the pre-loop.
- _igvn.replace_input_of(cd, 0, ctrl); // ctrl, not NULL
---- ./hotspot/src/share/vm/opto/matcher.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/matcher.cpp 2014-07-15 21:48:34.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/memnode.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/memnode.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1957,6 +1957,11 @@
- if (t != NULL) {
- // constant oop => constant klass
- if (offset == java_lang_Class::array_klass_offset_in_bytes()) {
-+ if (t->is_void()) {
-+ // We cannot create a void array. Since void is a primitive type return null
-+ // klass. Users of this result need to do a null check on the returned klass.
-+ return TypePtr::NULL_PTR;
-+ }
- return TypeKlassPtr::make(ciArrayKlass::make(t));
- }
- if (!t->is_klass()) {
---- ./hotspot/src/share/vm/opto/memnode.hpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/memnode.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -204,6 +204,17 @@
- protected:
- const Type* load_array_final_field(const TypeKlassPtr *tkls,
- ciKlass* klass) const;
-+ // depends_only_on_test is almost always true, and needs to be almost always
-+ // true to enable key hoisting & commoning optimizations. However, for the
-+ // special case of RawPtr loads from TLS top & end, and other loads performed by
-+ // GC barriers, the control edge carries the dependence preventing hoisting past
-+ // a Safepoint instead of the memory edge. (An unfortunate consequence of having
-+ // Safepoints not set Raw Memory; itself an unfortunate consequence of having Nodes
-+ // which produce results (new raw memory state) inside of loops preventing all
-+ // manner of other optimizations). Basically, it's ugly but so is the alternative.
-+ // See comment in macro.cpp, around line 125 expand_allocate_common().
-+ virtual bool depends_only_on_test() const { return adr_type() != TypeRawPtr::BOTTOM; }
-+
- };
-
- //------------------------------LoadBNode--------------------------------------
-@@ -370,16 +381,6 @@
- virtual uint ideal_reg() const { return Op_RegP; }
- virtual int store_Opcode() const { return Op_StoreP; }
- virtual BasicType memory_type() const { return T_ADDRESS; }
-- // depends_only_on_test is almost always true, and needs to be almost always
-- // true to enable key hoisting & commoning optimizations. However, for the
-- // special case of RawPtr loads from TLS top & end, the control edge carries
-- // the dependence preventing hoisting past a Safepoint instead of the memory
-- // edge. (An unfortunate consequence of having Safepoints not set Raw
-- // Memory; itself an unfortunate consequence of having Nodes which produce
-- // results (new raw memory state) inside of loops preventing all manner of
-- // other optimizations). Basically, it's ugly but so is the alternative.
-- // See comment in macro.cpp, around line 125 expand_allocate_common().
-- virtual bool depends_only_on_test() const { return adr_type() != TypeRawPtr::BOTTOM; }
- };
-
-
-@@ -393,16 +394,6 @@
- virtual uint ideal_reg() const { return Op_RegN; }
- virtual int store_Opcode() const { return Op_StoreN; }
- virtual BasicType memory_type() const { return T_NARROWOOP; }
-- // depends_only_on_test is almost always true, and needs to be almost always
-- // true to enable key hoisting & commoning optimizations. However, for the
-- // special case of RawPtr loads from TLS top & end, the control edge carries
-- // the dependence preventing hoisting past a Safepoint instead of the memory
-- // edge. (An unfortunate consequence of having Safepoints not set Raw
-- // Memory; itself an unfortunate consequence of having Nodes which produce
-- // results (new raw memory state) inside of loops preventing all manner of
-- // other optimizations). Basically, it's ugly but so is the alternative.
-- // See comment in macro.cpp, around line 125 expand_allocate_common().
-- virtual bool depends_only_on_test() const { return adr_type() != TypeRawPtr::BOTTOM; }
- };
-
- //------------------------------LoadKlassNode----------------------------------
---- ./hotspot/src/share/vm/opto/output.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/output.cpp 2014-07-15 21:48:35.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/opto/reg_split.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/reg_split.cpp 2014-10-28 20:19:37.000000000 -0700
-@@ -51,15 +51,6 @@
-
- static const char out_of_nodes[] = "out of nodes during split";
-
--static bool contains_no_live_range_input(const Node* def) {
-- for (uint i = 1; i < def->req(); ++i) {
-- if (def->in(i) != NULL && def->in_RegMask(i).is_NotEmpty()) {
-- return false;
-- }
-- }
-- return true;
--}
--
- //------------------------------get_spillcopy_wide-----------------------------
- // Get a SpillCopy node with wide-enough masks. Use the 'wide-mask', the
- // wide ideal-register spill-mask if possible. If the 'wide-mask' does
-@@ -326,10 +317,13 @@
- if( def->req() > 1 ) {
- for( uint i = 1; i < def->req(); i++ ) {
- Node *in = def->in(i);
-- // Check for single-def (LRG cannot redefined)
- uint lidx = n2lidx(in);
-- if( lidx >= _maxlrg ) continue; // Value is a recent spill-copy
-- if (lrgs(lidx).is_singledef()) continue;
-+ // We do not need this for live ranges that are only defined once.
-+ // However, this is not true for spill copies that are added in this
-+ // Split() pass, since they might get coalesced later on in this pass.
-+ if (lidx < _maxlrg && lrgs(lidx).is_singledef()) {
-+ continue;
-+ }
-
- Block *b_def = _cfg._bbs[def->_idx];
- int idx_def = b_def->find_node(def);
-@@ -391,10 +385,15 @@
- #endif
- // See if the cloned def kills any flags, and copy those kills as well
- uint i = insidx+1;
-- if( clone_projs( b, i, def, spill, maxlrg ) ) {
-+ int found_projs = clone_projs(b, i, def, spill, maxlrg);
-+ if (found_projs > 0) {
- // Adjust the point where we go hi-pressure
-- if( i <= b->_ihrp_index ) b->_ihrp_index++;
-- if( i <= b->_fhrp_index ) b->_fhrp_index++;
-+ if (i <= b->_ihrp_index) {
-+ b->_ihrp_index += found_projs;
-+ }
-+ if (i <= b->_fhrp_index) {
-+ b->_fhrp_index += found_projs;
-+ }
- }
-
- return spill;
-@@ -1298,7 +1297,7 @@
- Node *def = Reaches[pidx][slidx];
- assert( def, "must have reaching def" );
- // If input up/down sense and reg-pressure DISagree
-- if (def->rematerialize() && contains_no_live_range_input(def)) {
-+ if (def->rematerialize()) {
- // Place the rematerialized node above any MSCs created during
- // phi node splitting. end_idx points at the insertion point
- // so look at the node before it.
---- ./hotspot/src/share/vm/opto/type.hpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/opto/type.hpp 2014-10-28 20:19:37.000000000 -0700
-@@ -1348,6 +1348,7 @@
- #define ConvL2X(x) (x)
- #define ConvX2I(x) ConvL2I(x)
- #define ConvX2L(x) (x)
-+#define ConvX2UL(x) (x)
-
- #else
-
-@@ -1392,6 +1393,7 @@
- #define ConvL2X(x) ConvL2I(x)
- #define ConvX2I(x) (x)
- #define ConvX2L(x) ConvI2L(x)
-+#define ConvX2UL(x) ConvI2UL(x)
-
- #endif
-
---- ./hotspot/src/share/vm/prims/jni.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jni.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -5042,14 +5042,22 @@
- tty->print_cr("Running test: " #unit_test_function_call); \
- unit_test_function_call
-
-+// Forward declaration
-+void TestReservedSpace_test();
-+void TestReserveMemorySpecial_test();
-+void TestOldFreeSpaceCalculation_test();
-+
- void execute_internal_vm_tests() {
- if (ExecuteInternalVMTests) {
- tty->print_cr("Running internal VM tests");
-+ run_unit_test(TestReservedSpace_test());
-+ run_unit_test(TestReserveMemorySpecial_test());
- run_unit_test(GCTimerAllTest::all());
- run_unit_test(arrayOopDesc::test_max_array_length());
- run_unit_test(CollectedHeap::test_is_in());
- run_unit_test(QuickSort::test_quick_sort());
- run_unit_test(AltHashing::test_alt_hash());
-+ run_unit_test(TestOldFreeSpaceCalculation_test());
- tty->print_cr("All internal VM tests passed");
- }
- }
---- ./hotspot/src/share/vm/prims/jvm.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jvm.cpp 2014-10-28 20:19:39.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
-@@ -746,6 +746,7 @@
- return (jclass) JNIHandles::make_local(env, Klass::cast(k)->java_mirror());
- JVM_END
-
-+// Not used; JVM_FindClassFromCaller replaces this.
- JVM_ENTRY(jclass, JVM_FindClassFromClassLoader(JNIEnv* env, const char* name,
- jboolean init, jobject loader,
- jboolean throwError))
-@@ -772,6 +773,42 @@
- return result;
- JVM_END
-
-+// Find a class with this name in this loader, using the caller's protection domain.
-+JVM_ENTRY(jclass, JVM_FindClassFromCaller(JNIEnv* env, const char* name,
-+ jboolean init, jobject loader,
-+ jclass caller))
-+ JVMWrapper2("JVM_FindClassFromCaller %s throws ClassNotFoundException", name);
-+ // Java libraries should ensure that name is never null...
-+ if (name == NULL || (int)strlen(name) > Symbol::max_length()) {
-+ // It's impossible to create this class; the name cannot fit
-+ // into the constant pool.
-+ THROW_MSG_0(vmSymbols::java_lang_ClassNotFoundException(), name);
-+ }
-+
-+ TempNewSymbol h_name = SymbolTable::new_symbol(name, CHECK_NULL);
-+
-+ oop loader_oop = JNIHandles::resolve(loader);
-+ oop from_class = JNIHandles::resolve(caller);
-+ oop protection_domain = NULL;
-+ // If loader is null, shouldn't call ClassLoader.checkPackageAccess; otherwise get
-+ // NPE. Put it in another way, the bootstrap class loader has all permission and
-+ // thus no checkPackageAccess equivalence in the VM class loader.
-+ // The caller is also passed as NULL by the java code if there is no security
-+ // manager to avoid the performance cost of getting the calling class.
-+ if (from_class != NULL && loader_oop != NULL) {
-+ protection_domain = instanceKlass::cast(java_lang_Class::as_klassOop(from_class))->protection_domain();
-+ }
-+
-+ Handle h_loader(THREAD, loader_oop);
-+ Handle h_prot(THREAD, protection_domain);
-+ jclass result = find_class_from_class_loader(env, h_name, init, h_loader,
-+ h_prot, false, THREAD);
-+
-+ if (TraceClassResolution && result != NULL) {
-+ trace_class_resolution(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(result)));
-+ }
-+ return result;
-+JVM_END
-
- JVM_ENTRY(jclass, JVM_FindClassFromClass(JNIEnv *env, const char *name,
- jboolean init, jclass from))
-@@ -4098,10 +4135,15 @@
-
- // Shared JNI/JVM entry points //////////////////////////////////////////////////////////////
-
--jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init, Handle loader, Handle protection_domain, jboolean throwError, TRAPS) {
-+jclass find_class_from_class_loader(JNIEnv* env, Symbol* name, jboolean init,
-+ Handle loader, Handle protection_domain,
-+ jboolean throwError, TRAPS) {
- // Security Note:
- // The Java level wrapper will perform the necessary security check allowing
-- // us to pass the NULL as the initiating class loader.
-+ // us to pass the NULL as the initiating class loader. The VM is responsible for
-+ // the checkPackageAccess relative to the initiating class loader via the
-+ // protection_domain. The protection_domain is passed as NULL by the java code
-+ // if there is no security manager in 3-arg Class.forName().
- klassOop klass = SystemDictionary::resolve_or_fail(name, loader, protection_domain, throwError != 0, CHECK_NULL);
-
- KlassHandle klass_handle(THREAD, klass);
---- ./hotspot/src/share/vm/prims/jvm.h 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jvm.h 2014-10-28 20:19:39.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
-@@ -415,6 +415,19 @@
- JVM_FindClassFromBootLoader(JNIEnv *env, const char *name);
-
- /*
-+ * Find a class from a given class loader. Throws ClassNotFoundException.
-+ * name: name of class
-+ * init: whether initialization is done
-+ * loader: class loader to look up the class. This may not be the same as the caller's
-+ * class loader.
-+ * caller: initiating class. The initiating class may be null when a security
-+ * manager is not installed.
-+ */
-+JNIEXPORT jclass JNICALL
-+JVM_FindClassFromCaller(JNIEnv *env, const char *name, jboolean init,
-+ jobject loader, jclass caller);
-+
-+/*
- * Find a class from a given class.
- */
- JNIEXPORT jclass JNICALL
---- ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp 2013-09-06 11:22:14.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -204,7 +204,7 @@
-
- write_attribute_name_index("Code");
- write_u4(size);
-- write_u2(method->max_stack());
-+ write_u2(method->verifier_max_stack());
- write_u2(method->max_locals());
- write_u4(code_size);
- copy_bytecodes(method, (unsigned char*)writeable_address(code_size));
---- ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2013, 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
-@@ -35,6 +35,7 @@
- #include "prims/jvmtiImpl.hpp"
- #include "prims/jvmtiRedefineClasses.hpp"
- #include "prims/methodComparator.hpp"
-+#include "prims/methodHandles.hpp"
- #include "runtime/deoptimization.hpp"
- #include "runtime/relocator.hpp"
- #include "utilities/bitMap.inline.hpp"
-@@ -262,76 +263,23 @@
- case JVM_CONSTANT_NameAndType:
- {
- int name_ref_i = scratch_cp->name_ref_index_at(scratch_i);
-- int new_name_ref_i = 0;
-- bool match = (name_ref_i < *merge_cp_length_p) &&
-- scratch_cp->compare_entry_to(name_ref_i, *merge_cp_p, name_ref_i,
-- THREAD);
-- if (!match) {
-- // forward reference in *merge_cp_p or not a direct match
--
-- int found_i = scratch_cp->find_matching_entry(name_ref_i, *merge_cp_p,
-- THREAD);
-- if (found_i != 0) {
-- guarantee(found_i != name_ref_i,
-- "compare_entry_to() and find_matching_entry() do not agree");
--
-- // Found a matching entry somewhere else in *merge_cp_p so
-- // just need a mapping entry.
-- new_name_ref_i = found_i;
-- map_index(scratch_cp, name_ref_i, found_i);
-- } else {
-- // no match found so we have to append this entry to *merge_cp_p
-- append_entry(scratch_cp, name_ref_i, merge_cp_p, merge_cp_length_p,
-- THREAD);
-- // The above call to append_entry() can only append one entry
-- // so the post call query of *merge_cp_length_p is only for
-- // the sake of consistency.
-- new_name_ref_i = *merge_cp_length_p - 1;
-- }
-- }
-+ int new_name_ref_i = find_or_append_indirect_entry(scratch_cp, name_ref_i, merge_cp_p,
-+ merge_cp_length_p, THREAD);
-
- int signature_ref_i = scratch_cp->signature_ref_index_at(scratch_i);
-- int new_signature_ref_i = 0;
-- match = (signature_ref_i < *merge_cp_length_p) &&
-- scratch_cp->compare_entry_to(signature_ref_i, *merge_cp_p,
-- signature_ref_i, THREAD);
-- if (!match) {
-- // forward reference in *merge_cp_p or not a direct match
--
-- int found_i = scratch_cp->find_matching_entry(signature_ref_i,
-- *merge_cp_p, THREAD);
-- if (found_i != 0) {
-- guarantee(found_i != signature_ref_i,
-- "compare_entry_to() and find_matching_entry() do not agree");
--
-- // Found a matching entry somewhere else in *merge_cp_p so
-- // just need a mapping entry.
-- new_signature_ref_i = found_i;
-- map_index(scratch_cp, signature_ref_i, found_i);
-- } else {
-- // no match found so we have to append this entry to *merge_cp_p
-- append_entry(scratch_cp, signature_ref_i, merge_cp_p,
-- merge_cp_length_p, THREAD);
-- // The above call to append_entry() can only append one entry
-- // so the post call query of *merge_cp_length_p is only for
-- // the sake of consistency.
-- new_signature_ref_i = *merge_cp_length_p - 1;
-- }
-- }
-+ int new_signature_ref_i = find_or_append_indirect_entry(scratch_cp, signature_ref_i,
-+ merge_cp_p, merge_cp_length_p,
-+ THREAD);
-
- // If the referenced entries already exist in *merge_cp_p, then
- // both new_name_ref_i and new_signature_ref_i will both be 0.
- // In that case, all we are appending is the current entry.
-- if (new_name_ref_i == 0) {
-- new_name_ref_i = name_ref_i;
-- } else {
-+ if (new_name_ref_i != name_ref_i) {
- RC_TRACE(0x00080000,
- ("NameAndType entry@%d name_ref_index change: %d to %d",
- *merge_cp_length_p, name_ref_i, new_name_ref_i));
- }
-- if (new_signature_ref_i == 0) {
-- new_signature_ref_i = signature_ref_i;
-- } else {
-+ if (new_signature_ref_i != signature_ref_i) {
- RC_TRACE(0x00080000,
- ("NameAndType entry@%d signature_ref_index change: %d to %d",
- *merge_cp_length_p, signature_ref_i, new_signature_ref_i));
-@@ -353,76 +301,11 @@
- case JVM_CONSTANT_Methodref:
- {
- int klass_ref_i = scratch_cp->uncached_klass_ref_index_at(scratch_i);
-- int new_klass_ref_i = 0;
-- bool match = (klass_ref_i < *merge_cp_length_p) &&
-- scratch_cp->compare_entry_to(klass_ref_i, *merge_cp_p, klass_ref_i,
-- THREAD);
-- if (!match) {
-- // forward reference in *merge_cp_p or not a direct match
--
-- int found_i = scratch_cp->find_matching_entry(klass_ref_i, *merge_cp_p,
-- THREAD);
-- if (found_i != 0) {
-- guarantee(found_i != klass_ref_i,
-- "compare_entry_to() and find_matching_entry() do not agree");
--
-- // Found a matching entry somewhere else in *merge_cp_p so
-- // just need a mapping entry.
-- new_klass_ref_i = found_i;
-- map_index(scratch_cp, klass_ref_i, found_i);
-- } else {
-- // no match found so we have to append this entry to *merge_cp_p
-- append_entry(scratch_cp, klass_ref_i, merge_cp_p, merge_cp_length_p,
-- THREAD);
-- // The above call to append_entry() can only append one entry
-- // so the post call query of *merge_cp_length_p is only for
-- // the sake of consistency. Without the optimization where we
-- // use JVM_CONSTANT_UnresolvedClass, then up to two entries
-- // could be appended.
-- new_klass_ref_i = *merge_cp_length_p - 1;
-- }
-- }
--
-- int name_and_type_ref_i =
-- scratch_cp->uncached_name_and_type_ref_index_at(scratch_i);
-- int new_name_and_type_ref_i = 0;
-- match = (name_and_type_ref_i < *merge_cp_length_p) &&
-- scratch_cp->compare_entry_to(name_and_type_ref_i, *merge_cp_p,
-- name_and_type_ref_i, THREAD);
-- if (!match) {
-- // forward reference in *merge_cp_p or not a direct match
--
-- int found_i = scratch_cp->find_matching_entry(name_and_type_ref_i,
-- *merge_cp_p, THREAD);
-- if (found_i != 0) {
-- guarantee(found_i != name_and_type_ref_i,
-- "compare_entry_to() and find_matching_entry() do not agree");
--
-- // Found a matching entry somewhere else in *merge_cp_p so
-- // just need a mapping entry.
-- new_name_and_type_ref_i = found_i;
-- map_index(scratch_cp, name_and_type_ref_i, found_i);
-- } else {
-- // no match found so we have to append this entry to *merge_cp_p
-- append_entry(scratch_cp, name_and_type_ref_i, merge_cp_p,
-- merge_cp_length_p, THREAD);
-- // The above call to append_entry() can append more than
-- // one entry so the post call query of *merge_cp_length_p
-- // is required in order to get the right index for the
-- // JVM_CONSTANT_NameAndType entry.
-- new_name_and_type_ref_i = *merge_cp_length_p - 1;
-- }
-- }
--
-- // If the referenced entries already exist in *merge_cp_p, then
-- // both new_klass_ref_i and new_name_and_type_ref_i will both be
-- // 0. In that case, all we are appending is the current entry.
-- if (new_klass_ref_i == 0) {
-- new_klass_ref_i = klass_ref_i;
-- }
-- if (new_name_and_type_ref_i == 0) {
-- new_name_and_type_ref_i = name_and_type_ref_i;
-- }
-+ int new_klass_ref_i = find_or_append_indirect_entry(scratch_cp, klass_ref_i,
-+ merge_cp_p, merge_cp_length_p, THREAD);
-+ int name_and_type_ref_i = scratch_cp->uncached_name_and_type_ref_index_at(scratch_i);
-+ int new_name_and_type_ref_i = find_or_append_indirect_entry(scratch_cp, name_and_type_ref_i,
-+ merge_cp_p, merge_cp_length_p, THREAD);
-
- const char *entry_name;
- switch (scratch_cp->tag_at(scratch_i).value()) {
-@@ -465,7 +348,79 @@
- (*merge_cp_length_p)++;
- } break;
-
-- // At this stage, Class or UnresolvedClass could be here, but not
-+ // this is an indirect CP entry so it needs special handling
-+ case JVM_CONSTANT_MethodType:
-+ {
-+ int ref_i = scratch_cp->method_type_index_at(scratch_i);
-+ int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
-+ merge_cp_length_p, THREAD);
-+ if (new_ref_i != ref_i) {
-+ RC_TRACE(0x00080000,
-+ ("MethodType entry@%d ref_index change: %d to %d",
-+ *merge_cp_length_p, ref_i, new_ref_i));
-+ }
-+ (*merge_cp_p)->method_type_index_at_put(*merge_cp_length_p, new_ref_i);
-+ if (scratch_i != *merge_cp_length_p) {
-+ // The new entry in *merge_cp_p is at a different index than
-+ // the new entry in scratch_cp so we need to map the index values.
-+ map_index(scratch_cp, scratch_i, *merge_cp_length_p);
-+ }
-+ (*merge_cp_length_p)++;
-+ } break;
-+
-+ // this is an indirect CP entry so it needs special handling
-+ case JVM_CONSTANT_MethodHandle:
-+ {
-+ int ref_kind = scratch_cp->method_handle_ref_kind_at(scratch_i);
-+ int ref_i = scratch_cp->method_handle_index_at(scratch_i);
-+ int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
-+ merge_cp_length_p, THREAD);
-+ if (new_ref_i != ref_i) {
-+ RC_TRACE(0x00080000,
-+ ("MethodHandle entry@%d ref_index change: %d to %d",
-+ *merge_cp_length_p, ref_i, new_ref_i));
-+ }
-+ (*merge_cp_p)->method_handle_index_at_put(*merge_cp_length_p, ref_kind, new_ref_i);
-+ if (scratch_i != *merge_cp_length_p) {
-+ // The new entry in *merge_cp_p is at a different index than
-+ // the new entry in scratch_cp so we need to map the index values.
-+ map_index(scratch_cp, scratch_i, *merge_cp_length_p);
-+ }
-+ (*merge_cp_length_p)++;
-+ } break;
-+
-+ // this is an indirect CP entry so it needs special handling
-+ case JVM_CONSTANT_InvokeDynamic:
-+ {
-+ // Index of the bootstrap specifier in the operands array
-+ int old_bs_i = scratch_cp->invoke_dynamic_bootstrap_specifier_index(scratch_i);
-+ int new_bs_i = find_or_append_operand(scratch_cp, old_bs_i, merge_cp_p,
-+ merge_cp_length_p, THREAD);
-+ // The bootstrap method NameAndType_info index
-+ int old_ref_i = scratch_cp->invoke_dynamic_name_and_type_ref_index_at(scratch_i);
-+ int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p,
-+ merge_cp_length_p, THREAD);
-+ if (new_bs_i != old_bs_i) {
-+ RC_TRACE(0x00080000,
-+ ("InvokeDynamic entry@%d bootstrap_method_attr_index change: %d to %d",
-+ *merge_cp_length_p, old_bs_i, new_bs_i));
-+ }
-+ if (new_ref_i != old_ref_i) {
-+ RC_TRACE(0x00080000,
-+ ("InvokeDynamic entry@%d name_and_type_index change: %d to %d",
-+ *merge_cp_length_p, old_ref_i, new_ref_i));
-+ }
-+
-+ (*merge_cp_p)->invoke_dynamic_at_put(*merge_cp_length_p, new_bs_i, new_ref_i);
-+ if (scratch_i != *merge_cp_length_p) {
-+ // The new entry in *merge_cp_p is at a different index than
-+ // the new entry in scratch_cp so we need to map the index values.
-+ map_index(scratch_cp, scratch_i, *merge_cp_length_p);
-+ }
-+ (*merge_cp_length_p)++;
-+ } break;
-+
-+ // At this stage, Class or UnresolvedClass could be here, but not
- // ClassIndex
- case JVM_CONSTANT_ClassIndex: // fall through
-
-@@ -492,6 +447,134 @@
- } // end append_entry()
-
-
-+int VM_RedefineClasses::find_or_append_indirect_entry(constantPoolHandle scratch_cp,
-+ int ref_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
-+
-+ int new_ref_i = ref_i;
-+ bool match = (ref_i < *merge_cp_length_p) &&
-+ scratch_cp->compare_entry_to(ref_i, *merge_cp_p, ref_i, THREAD);
-+
-+ if (!match) {
-+ // forward reference in *merge_cp_p or not a direct match
-+ int found_i = scratch_cp->find_matching_entry(ref_i, *merge_cp_p, THREAD);
-+ if (found_i != 0) {
-+ guarantee(found_i != ref_i, "compare_entry_to() and find_matching_entry() do not agree");
-+ // Found a matching entry somewhere else in *merge_cp_p so just need a mapping entry.
-+ new_ref_i = found_i;
-+ map_index(scratch_cp, ref_i, found_i);
-+ } else {
-+ // no match found so we have to append this entry to *merge_cp_p
-+ append_entry(scratch_cp, ref_i, merge_cp_p, merge_cp_length_p, THREAD);
-+ // The above call to append_entry() can only append one entry
-+ // so the post call query of *merge_cp_length_p is only for
-+ // the sake of consistency.
-+ new_ref_i = *merge_cp_length_p - 1;
-+ }
-+ }
-+
-+ return new_ref_i;
-+} // end find_or_append_indirect_entry()
-+
-+
-+// Append a bootstrap specifier into the merge_cp operands that is semantically equal
-+// to the scratch_cp operands bootstrap specifier passed by the old_bs_i index.
-+// Recursively append new merge_cp entries referenced by the new bootstrap specifier.
-+void VM_RedefineClasses::append_operand(constantPoolHandle scratch_cp, int old_bs_i,
-+ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
-+
-+ int old_ref_i = scratch_cp->operand_bootstrap_method_ref_index_at(old_bs_i);
-+ int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p,
-+ merge_cp_length_p, THREAD);
-+ if (new_ref_i != old_ref_i) {
-+ RC_TRACE(0x00080000,
-+ ("operands entry@%d bootstrap method ref_index change: %d to %d",
-+ _operands_cur_length, old_ref_i, new_ref_i));
-+ }
-+
-+ typeArrayOop merge_ops = (*merge_cp_p)->operands();
-+ int new_bs_i = _operands_cur_length;
-+ // We have _operands_cur_length == 0 when the merge_cp operands is empty yet.
-+ // However, the operand_offset_at(0) was set in the extend_operands() call.
-+ int new_base = (new_bs_i == 0) ? (*merge_cp_p)->operand_offset_at(0)
-+ : (*merge_cp_p)->operand_next_offset_at(new_bs_i - 1);
-+ int argc = scratch_cp->operand_argument_count_at(old_bs_i);
-+
-+ constantPoolOopDesc::operand_offset_at_put(merge_ops, _operands_cur_length, new_base);
-+ merge_ops->short_at_put(new_base++, new_ref_i);
-+ merge_ops->short_at_put(new_base++, argc);
-+
-+ for (int i = 0; i < argc; i++) {
-+ int old_arg_ref_i = scratch_cp->operand_argument_index_at(old_bs_i, i);
-+ int new_arg_ref_i = find_or_append_indirect_entry(scratch_cp, old_arg_ref_i, merge_cp_p,
-+ merge_cp_length_p, THREAD);
-+ merge_ops->short_at_put(new_base++, new_arg_ref_i);
-+ if (new_arg_ref_i != old_arg_ref_i) {
-+ RC_TRACE(0x00080000,
-+ ("operands entry@%d bootstrap method argument ref_index change: %d to %d",
-+ _operands_cur_length, old_arg_ref_i, new_arg_ref_i));
-+ }
-+ }
-+ if (old_bs_i != _operands_cur_length) {
-+ // The bootstrap specifier in *merge_cp_p is at a different index than
-+ // that in scratch_cp so we need to map the index values.
-+ map_operand_index(old_bs_i, new_bs_i);
-+ }
-+ _operands_cur_length++;
-+} // end append_operand()
-+
-+
-+int VM_RedefineClasses::find_or_append_operand(constantPoolHandle scratch_cp,
-+ int old_bs_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
-+
-+ int new_bs_i = old_bs_i; // bootstrap specifier index
-+ bool match = (old_bs_i < _operands_cur_length) &&
-+ scratch_cp->compare_operand_to(old_bs_i, *merge_cp_p, old_bs_i, THREAD);
-+
-+ if (!match) {
-+ // forward reference in *merge_cp_p or not a direct match
-+ int found_i = scratch_cp->find_matching_operand(old_bs_i, *merge_cp_p,
-+ _operands_cur_length, THREAD);
-+ if (found_i != -1) {
-+ guarantee(found_i != old_bs_i, "compare_operand_to() and find_matching_operand() disagree");
-+ // found a matching operand somewhere else in *merge_cp_p so just need a mapping
-+ new_bs_i = found_i;
-+ map_operand_index(old_bs_i, found_i);
-+ } else {
-+ // no match found so we have to append this bootstrap specifier to *merge_cp_p
-+ append_operand(scratch_cp, old_bs_i, merge_cp_p, merge_cp_length_p, THREAD);
-+ new_bs_i = _operands_cur_length - 1;
-+ }
-+ }
-+ return new_bs_i;
-+} // end find_or_append_operand()
-+
-+
-+void VM_RedefineClasses::finalize_operands_merge(constantPoolHandle merge_cp, TRAPS) {
-+ if (merge_cp->operands() == NULL) {
-+ return;
-+ }
-+ // Shrink the merge_cp operands
-+ merge_cp->shrink_operands(_operands_cur_length, CHECK);
-+
-+ if (RC_TRACE_ENABLED(0x00040000)) {
-+ // don't want to loop unless we are tracing
-+ int count = 0;
-+ for (int i = 1; i < _operands_index_map_p->length(); i++) {
-+ int value = _operands_index_map_p->at(i);
-+ if (value != -1) {
-+ RC_TRACE_WITH_THREAD(0x00040000, THREAD,
-+ ("operands_index_map[%d]: old=%d new=%d", count, i, value));
-+ count++;
-+ }
-+ }
-+ }
-+ // Clean-up
-+ _operands_index_map_p = NULL;
-+ _operands_cur_length = 0;
-+ _operands_index_map_count = 0;
-+} // end finalize_operands_merge()
-+
-+
- void VM_RedefineClasses::swap_all_method_annotations(int i, int j, instanceKlassHandle scratch_class) {
- typeArrayOop save;
-
-@@ -777,6 +860,27 @@
- } // end find_new_index()
-
-
-+// Find new bootstrap specifier index value for old bootstrap specifier index
-+// value by seaching the index map. Returns zero (-1) if there is no mapped
-+// value for the old bootstrap specifier index.
-+int VM_RedefineClasses::find_new_operand_index(int old_index) {
-+ if (_operands_index_map_count == 0) {
-+ // map is empty so nothing can be found
-+ return -1;
-+ }
-+
-+ if (old_index == -1 || old_index >= _operands_index_map_p->length()) {
-+ // The old_index is out of range so it is not mapped.
-+ // This should not happen in regular constant pool merging use.
-+ return -1;
-+ }
-+
-+ int value = _operands_index_map_p->at(old_index);
-+
-+ return value;
-+} // end find_new_operand_index()
-+
-+
- // Returns true if the current mismatch is due to a resolved/unresolved
- // class pair. Otherwise, returns false.
- bool VM_RedefineClasses::is_unresolved_class_mismatch(constantPoolHandle cp1,
-@@ -1042,6 +1146,25 @@
- } // end map_index()
-
-
-+// Map old_index to new_index as needed.
-+void VM_RedefineClasses::map_operand_index(int old_index, int new_index) {
-+ if (find_new_operand_index(old_index) != -1) {
-+ // old_index is already mapped
-+ return;
-+ }
-+
-+ if (old_index == new_index) {
-+ // no mapping is needed
-+ return;
-+ }
-+
-+ _operands_index_map_p->at_put(old_index, new_index);
-+ _operands_index_map_count++;
-+
-+ RC_TRACE(0x00040000, ("mapped bootstrap specifier at index %d to %d", old_index, new_index));
-+} // end map_index()
-+
-+
- // Merge old_cp and scratch_cp and return the results of the merge via
- // merge_cp_p. The number of entries in *merge_cp_p is returned via
- // merge_cp_length_p. The entries in old_cp occupy the same locations
-@@ -1113,6 +1236,9 @@
- }
- } // end for each old_cp entry
-
-+ constantPoolOopDesc::copy_operands(old_cp, *merge_cp_p, CHECK_0);
-+ (*merge_cp_p)->extend_operands(scratch_cp, CHECK_0);
-+
- // We don't need to sanity check that *merge_cp_length_p is within
- // *merge_cp_p bounds since we have the minimum on-entry check above.
- (*merge_cp_length_p) = old_i;
-@@ -1235,6 +1361,7 @@
- ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
- *merge_cp_length_p, scratch_i, _index_map_count));
- }
-+ finalize_operands_merge(*merge_cp_p, THREAD);
-
- return true;
- } // end merge_constant_pools()
-@@ -1282,8 +1409,17 @@
- _index_map_count = 0;
- _index_map_p = new intArray(scratch_cp->length(), -1);
-
-+ _operands_cur_length = constantPoolOopDesc::operand_array_length(old_cp->operands());
-+ _operands_index_map_count = 0;
-+ _operands_index_map_p = new intArray(
-+ constantPoolOopDesc::operand_array_length(scratch_cp->operands()), -1);
-+
-+ // reference to the cp holder is needed for copy_operands()
-+ merge_cp->set_pool_holder(scratch_class());
- bool result = merge_constant_pools(old_cp, scratch_cp, &merge_cp,
- &merge_cp_length, THREAD);
-+ merge_cp->set_pool_holder(NULL);
-+
- if (!result) {
- // The merge can fail due to memory allocation failure or due
- // to robustness checks.
-@@ -1326,7 +1462,7 @@
- // Replace the new constant pool with a shrunken copy of the
- // merged constant pool; the previous new constant pool will
- // get GCed.
-- set_new_constant_pool(scratch_class, merge_cp, merge_cp_length, true,
-+ set_new_constant_pool(scratch_class, merge_cp, merge_cp_length,
- THREAD);
- // drop local ref to the merged constant pool
- merge_cp()->set_is_conc_safe(true);
-@@ -1357,7 +1493,7 @@
- // merged constant pool so now the rewritten bytecodes have
- // valid references; the previous new constant pool will get
- // GCed.
-- set_new_constant_pool(scratch_class, merge_cp, merge_cp_length, true,
-+ set_new_constant_pool(scratch_class, merge_cp, merge_cp_length,
- THREAD);
- merge_cp()->set_is_conc_safe(true);
- }
-@@ -1540,6 +1676,7 @@
- case Bytecodes::_getfield : // fall through
- case Bytecodes::_getstatic : // fall through
- case Bytecodes::_instanceof : // fall through
-+ case Bytecodes::_invokedynamic : // fall through
- case Bytecodes::_invokeinterface: // fall through
- case Bytecodes::_invokespecial : // fall through
- case Bytecodes::_invokestatic : // fall through
-@@ -2343,30 +2480,30 @@
- // smaller constant pool is associated with scratch_class.
- void VM_RedefineClasses::set_new_constant_pool(
- instanceKlassHandle scratch_class, constantPoolHandle scratch_cp,
-- int scratch_cp_length, bool shrink, TRAPS) {
-- assert(!shrink || scratch_cp->length() >= scratch_cp_length, "sanity check");
--
-- if (shrink) {
-- // scratch_cp is a merged constant pool and has enough space for a
-- // worst case merge situation. We want to associate the minimum
-- // sized constant pool with the klass to save space.
-- constantPoolHandle smaller_cp(THREAD,
-- oopFactory::new_constantPool(scratch_cp_length,
-- oopDesc::IsUnsafeConc,
-- THREAD));
-- // preserve orig_length() value in the smaller copy
-- int orig_length = scratch_cp->orig_length();
-- assert(orig_length != 0, "sanity check");
-- smaller_cp->set_orig_length(orig_length);
-- scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
-- scratch_cp = smaller_cp;
-- smaller_cp()->set_is_conc_safe(true);
-- }
-+ int scratch_cp_length, TRAPS) {
-+ assert(scratch_cp->length() >= scratch_cp_length, "sanity check");
-
-- // attach new constant pool to klass
-- scratch_cp->set_pool_holder(scratch_class());
-+ // scratch_cp is a merged constant pool and has enough space for a
-+ // worst case merge situation. We want to associate the minimum
-+ // sized constant pool with the klass to save space.
-+ constantPoolHandle smaller_cp(THREAD,
-+ oopFactory::new_constantPool(scratch_cp_length,
-+ oopDesc::IsUnsafeConc,
-+ THREAD));
-+ // preserve orig_length() value in the smaller copy
-+ int orig_length = scratch_cp->orig_length();
-+ assert(orig_length != 0, "sanity check");
-+ smaller_cp->set_orig_length(orig_length);
-
- // attach klass to new constant pool
-+ // reference to the cp holder is needed for copy_operands()
-+ smaller_cp->set_pool_holder(scratch_class());
-+
-+ scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
-+ scratch_cp = smaller_cp;
-+ smaller_cp()->set_is_conc_safe(true);
-+
-+ // attach new constant pool to klass
- scratch_class->set_constants(scratch_cp());
-
- int i; // for portability
-@@ -3310,6 +3447,16 @@
- // that reference methods of the evolved class.
- SystemDictionary::classes_do(adjust_cpool_cache_and_vtable, THREAD);
-
-+ // JSR-292 support
-+ MemberNameTable* mnt = the_class->member_names();
-+ if (mnt != NULL) {
-+ bool trace_name_printed = false;
-+ mnt->adjust_method_entries(_matching_old_methods,
-+ _matching_new_methods,
-+ _matching_methods_length,
-+ &trace_name_printed);
-+ }
-+
- if (the_class->oop_map_cache() != NULL) {
- // Flush references to any obsolete methods from the oop map cache
- // so that obsolete methods are not pinned.
---- ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -370,6 +370,13 @@
- // _index_map_p contains any entries.
- int _index_map_count;
- intArray * _index_map_p;
-+
-+ // _operands_index_map_count is just an optimization for knowing if
-+ // _operands_index_map_p contains any entries.
-+ int _operands_cur_length;
-+ int _operands_index_map_count;
-+ intArray * _operands_index_map_p;
-+
- // ptr to _class_count scratch_classes
- instanceKlassHandle * _scratch_classes;
- jvmtiError _res;
-@@ -431,16 +438,24 @@
- // and in all direct and indirect subclasses.
- void increment_class_counter(instanceKlass *ik, TRAPS);
-
-- // Support for constant pool merging (these routines are in alpha
-- // order):
-+ // Support for constant pool merging (these routines are in alpha order):
- void append_entry(constantPoolHandle scratch_cp, int scratch_i,
- constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
-+ void append_operand(constantPoolHandle scratch_cp, int scratch_bootstrap_spec_index,
-+ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
-+ void finalize_operands_merge(constantPoolHandle merge_cp, TRAPS);
-+ int find_or_append_indirect_entry(constantPoolHandle scratch_cp, int scratch_i,
-+ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
-+ int find_or_append_operand(constantPoolHandle scratch_cp, int scratch_bootstrap_spec_index,
-+ constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
- int find_new_index(int old_index);
-+ int find_new_operand_index(int old_bootstrap_spec_index);
- bool is_unresolved_class_mismatch(constantPoolHandle cp1, int index1,
- constantPoolHandle cp2, int index2);
- bool is_unresolved_string_mismatch(constantPoolHandle cp1, int index1,
- constantPoolHandle cp2, int index2);
- void map_index(constantPoolHandle scratch_cp, int old_index, int new_index);
-+ void map_operand_index(int old_bootstrap_spec_index, int new_bootstrap_spec_index);
- bool merge_constant_pools(constantPoolHandle old_cp,
- constantPoolHandle scratch_cp, constantPoolHandle *merge_cp_p,
- int *merge_cp_length_p, TRAPS);
-@@ -474,7 +489,7 @@
- address& stackmap_addr_ref, address stackmap_end, u2 frame_i,
- u1 frame_size, TRAPS);
- void set_new_constant_pool(instanceKlassHandle scratch_class,
-- constantPoolHandle scratch_cp, int scratch_cp_length, bool shrink, TRAPS);
-+ constantPoolHandle scratch_cp, int scratch_cp_length, TRAPS);
-
- void flush_dependent_code(instanceKlassHandle k_h, TRAPS);
-
---- ./hotspot/src/share/vm/prims/methodHandles.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/methodHandles.cpp 2014-07-15 21:48:35.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
-@@ -29,6 +29,7 @@
- #include "interpreter/oopMapCache.hpp"
- #include "memory/allocation.inline.hpp"
- #include "memory/oopFactory.hpp"
-+#include "prims/jvmtiRedefineClassesTrace.hpp"
- #include "prims/methodHandles.hpp"
- #include "runtime/compilationPolicy.hpp"
- #include "runtime/javaCalls.hpp"
-@@ -123,7 +124,9 @@
- return Handle(THREAD, k->allocate_instance(THREAD));
- }
-
--oop MethodHandles::init_MemberName(oop mname_oop, oop target_oop) {
-+oop MethodHandles::init_MemberName(Handle mname, Handle target) {
-+ Thread* thread = Thread::current();
-+ oop target_oop = target();
- klassOop target_klass = target_oop->klass();
- if (target_klass == SystemDictionary::reflect_Field_klass()) {
- oop clazz = java_lang_reflect_Field::clazz(target_oop); // fd.field_holder()
-@@ -131,24 +134,24 @@
- int mods = java_lang_reflect_Field::modifiers(target_oop);
- oop type = java_lang_reflect_Field::type(target_oop);
- oop name = java_lang_reflect_Field::name(target_oop);
-- klassOop k = java_lang_Class::as_klassOop(clazz);
-- intptr_t offset = instanceKlass::cast(k)->field_offset(slot);
-- return init_field_MemberName(mname_oop, k, accessFlags_from(mods), type, name, offset);
-+ KlassHandle k(thread, java_lang_Class::as_klassOop(clazz));
-+ intptr_t offset = instanceKlass::cast(k())->field_offset(slot);
-+ return init_field_MemberName(mname, k, accessFlags_from(mods), type, name, offset);
- } else if (target_klass == SystemDictionary::reflect_Method_klass()) {
- oop clazz = java_lang_reflect_Method::clazz(target_oop);
- int slot = java_lang_reflect_Method::slot(target_oop);
-- klassOop k = java_lang_Class::as_klassOop(clazz);
-- if (k != NULL && Klass::cast(k)->oop_is_instance()) {
-- methodOop m = instanceKlass::cast(k)->method_with_idnum(slot);
-- return init_method_MemberName(mname_oop, m, true, k);
-+ KlassHandle k(thread, java_lang_Class::as_klassOop(clazz));
-+ if (!k.is_null() && k->oop_is_instance()) {
-+ methodOop m = instanceKlass::cast(k())->method_with_idnum(slot);
-+ return init_method_MemberName(mname, m, true, k);
- }
- } else if (target_klass == SystemDictionary::reflect_Constructor_klass()) {
- oop clazz = java_lang_reflect_Constructor::clazz(target_oop);
- int slot = java_lang_reflect_Constructor::slot(target_oop);
-- klassOop k = java_lang_Class::as_klassOop(clazz);
-- if (k != NULL && Klass::cast(k)->oop_is_instance()) {
-- methodOop m = instanceKlass::cast(k)->method_with_idnum(slot);
-- return init_method_MemberName(mname_oop, m, false, k);
-+ KlassHandle k(thread, java_lang_Class::as_klassOop(clazz));
-+ if (!k.is_null() && k->oop_is_instance()) {
-+ methodOop m = instanceKlass::cast(k())->method_with_idnum(slot);
-+ return init_method_MemberName(mname, m, false, k);
- }
- } else if (target_klass == SystemDictionary::MemberName_klass()) {
- // Note: This only works if the MemberName has already been resolved.
-@@ -156,17 +159,18 @@
- int flags = java_lang_invoke_MemberName::flags(target_oop);
- oop vmtarget = java_lang_invoke_MemberName::vmtarget(target_oop);
- intptr_t vmindex = java_lang_invoke_MemberName::vmindex(target_oop);
-- klassOop k = java_lang_Class::as_klassOop(clazz);
-+ KlassHandle k(thread, java_lang_Class::as_klassOop(clazz));
- int ref_kind = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
- if (vmtarget == NULL) return NULL; // not resolved
- if ((flags & IS_FIELD) != 0) {
- assert(vmtarget->is_klass(), "field vmtarget is klassOop");
- int basic_mods = (ref_kind_is_static(ref_kind) ? JVM_ACC_STATIC : 0);
- // FIXME: how does k (receiver_limit) contribute?
-- return init_field_MemberName(mname_oop, klassOop(vmtarget), accessFlags_from(basic_mods), NULL, NULL, vmindex);
-+ KlassHandle k_vmtarget(thread, klassOop(vmtarget));
-+ return init_field_MemberName(mname, k_vmtarget, accessFlags_from(basic_mods), NULL, NULL, vmindex);
- } else if ((flags & (IS_METHOD | IS_CONSTRUCTOR)) != 0) {
- assert(vmtarget->is_method(), "method or constructor vmtarget is methodOop");
-- return init_method_MemberName(mname_oop, methodOop(vmtarget), ref_kind_does_dispatch(ref_kind), k);
-+ return init_method_MemberName(mname, methodOop(vmtarget), ref_kind_does_dispatch(ref_kind), k);
- } else {
- return NULL;
- }
-@@ -174,31 +178,34 @@
- return NULL;
- }
-
--oop MethodHandles::init_method_MemberName(oop mname_oop, methodOop m, bool do_dispatch,
-- klassOop receiver_limit) {
-+oop MethodHandles::init_method_MemberName(Handle mname, methodOop m, bool do_dispatch,
-+ KlassHandle resolved_klass_h) {
-+ klassOop resolved_klass = resolved_klass_h();
- AccessFlags mods = m->access_flags();
- int flags = (jushort)( mods.as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS );
- int vmindex = methodOopDesc::nonvirtual_vtable_index; // implies never any dispatch
-- klassOop mklass = m->method_holder();
-- if (receiver_limit == NULL)
-- receiver_limit = mklass;
-+ bool is_itable_call = false;
-+ klassOop m_klass = m->method_holder();
-+ // resolved_klass is a copy of CallInfo::resolved_klass, if available
-+ if (resolved_klass == NULL)
-+ resolved_klass = m_klass;
- if (m->is_initializer()) {
- flags |= IS_CONSTRUCTOR | (JVM_REF_invokeSpecial << REFERENCE_KIND_SHIFT);
- } else if (mods.is_static()) {
- flags |= IS_METHOD | (JVM_REF_invokeStatic << REFERENCE_KIND_SHIFT);
-- } else if (receiver_limit != mklass &&
-- !Klass::cast(receiver_limit)->is_subtype_of(mklass)) {
-+ } else if (resolved_klass != m_klass &&
-+ !Klass::cast(resolved_klass)->is_subtype_of(m_klass)) {
- return NULL; // bad receiver limit
-- } else if (Klass::cast(receiver_limit)->is_interface() &&
-- Klass::cast(mklass)->is_interface()) {
-+ } else if (Klass::cast(resolved_klass)->is_interface() &&
-+ Klass::cast(m_klass)->is_interface()) {
- flags |= IS_METHOD | (JVM_REF_invokeInterface << REFERENCE_KIND_SHIFT);
-- receiver_limit = mklass; // ignore passed-in limit; interfaces are interconvertible
- vmindex = klassItable::compute_itable_index(m);
-- } else if (mklass != receiver_limit && Klass::cast(mklass)->is_interface()) {
-+ is_itable_call = true;
-+ } else if (m_klass != resolved_klass && Klass::cast(m_klass)->is_interface()) {
- flags |= IS_METHOD | (JVM_REF_invokeVirtual << REFERENCE_KIND_SHIFT);
- // it is a miranda method, so m->vtable_index is not what we want
- ResourceMark rm;
-- klassVtable* vt = instanceKlass::cast(receiver_limit)->vtable();
-+ klassVtable* vt = instanceKlass::cast(resolved_klass)->vtable();
- vmindex = vt->index_of_miranda(m->name(), m->signature());
- } else if (!do_dispatch || m->can_be_statically_bound()) {
- flags |= IS_METHOD | (JVM_REF_invokeSpecial << REFERENCE_KIND_SHIFT);
-@@ -207,10 +214,37 @@
- vmindex = m->vtable_index();
- }
-
-+ if (vmindex >= 0 && !is_itable_call) {
-+ if (Klass::cast(m_klass)->is_interface()) {
-+ // This is a vtable call to an interface method (abstract "miranda method").
-+ // The vtable index is meaningless without a class (not interface) receiver type, so get one.
-+ // (LinkResolver should help us figure this out.)
-+ KlassHandle m_klass_non_interface = resolved_klass;
-+ if (m_klass_non_interface->is_interface()) {
-+ m_klass_non_interface = SystemDictionary::Object_klass();
-+#ifdef ASSERT
-+ { ResourceMark rm;
-+ methodOop m2 = m_klass_non_interface->vtable()->method_at(vmindex);
-+ assert(m->name() == m2->name() && m->signature() == m2->signature(),
-+ err_msg("at %d, %s != %s", vmindex,
-+ m->name_and_sig_as_C_string(), m2->name_and_sig_as_C_string()));
-+ }
-+#endif //ASSERT
-+ }
-+ if (!m->is_public()) {
-+ assert(m->is_public(), "virtual call must be to public interface method");
-+ return NULL; // elicit an error later in product build
-+ }
-+ assert(Klass::cast(resolved_klass)->is_subtype_of(m_klass_non_interface()), "virtual call must be type-safe");
-+ m_klass = m_klass_non_interface();
-+ }
-+ }
-+
-+ oop mname_oop = mname();
- java_lang_invoke_MemberName::set_flags(mname_oop, flags);
- java_lang_invoke_MemberName::set_vmtarget(mname_oop, m);
- java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex); // vtable/itable index
-- java_lang_invoke_MemberName::set_clazz(mname_oop, Klass::cast(receiver_limit)->java_mirror());
-+ java_lang_invoke_MemberName::set_clazz(mname_oop, Klass::cast(m_klass)->java_mirror());
- // Note: name and type can be lazily computed by resolve_MemberName,
- // if Java code needs them as resolved String and MethodType objects.
- // The clazz must be eagerly stored, because it provides a GC
-@@ -218,11 +252,12 @@
- // If relevant, the vtable or itable value is stored as vmindex.
- // This is done eagerly, since it is readily available without
- // constructing any new objects.
-- // TO DO: maybe intern mname_oop
-- return mname_oop;
-+ instanceKlass::cast(m->method_holder())->add_member_name(m->method_idnum(), mname);
-+
-+ return mname();
- }
-
--Handle MethodHandles::init_method_MemberName(oop mname_oop, CallInfo& info, TRAPS) {
-+Handle MethodHandles::init_method_MemberName(Handle mname, CallInfo& info, TRAPS) {
- Handle empty;
- if (info.resolved_appendix().not_null()) {
- // The resolved MemberName must not be accompanied by an appendix argument,
-@@ -242,23 +277,24 @@
- } else {
- vmindex = info.vtable_index();
- }
-- oop res = init_method_MemberName(mname_oop, m(), (vmindex >= 0), defc());
-+ oop res = init_method_MemberName(mname, m(), (vmindex >= 0), defc());
- assert(res == NULL || (java_lang_invoke_MemberName::vmindex(res) == vmindex), "");
- return Handle(THREAD, res);
- }
-
--oop MethodHandles::init_field_MemberName(oop mname_oop, klassOop field_holder,
-+oop MethodHandles::init_field_MemberName(Handle mname, KlassHandle field_holder,
- AccessFlags mods, oop type, oop name,
- intptr_t offset, bool is_setter) {
- int flags = (jushort)( mods.as_short() & JVM_RECOGNIZED_FIELD_MODIFIERS );
- flags |= IS_FIELD | ((mods.is_static() ? JVM_REF_getStatic : JVM_REF_getField) << REFERENCE_KIND_SHIFT);
- if (is_setter) flags += ((JVM_REF_putField - JVM_REF_getField) << REFERENCE_KIND_SHIFT);
-- oop vmtarget = field_holder;
-+ oop vmtarget = field_holder();
- int vmindex = offset; // determines the field uniquely when combined with static bit
-+ oop mname_oop = mname();
- java_lang_invoke_MemberName::set_flags(mname_oop, flags);
- java_lang_invoke_MemberName::set_vmtarget(mname_oop, vmtarget);
- java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex);
-- java_lang_invoke_MemberName::set_clazz(mname_oop, Klass::cast(field_holder)->java_mirror());
-+ java_lang_invoke_MemberName::set_clazz(mname_oop, field_holder()->java_mirror());
- if (name != NULL)
- java_lang_invoke_MemberName::set_name(mname_oop, name);
- if (type != NULL)
-@@ -270,11 +306,10 @@
- // because they unambiguously identify the field.
- // Although the fieldDescriptor::_index would also identify the field,
- // we do not use it, because it is harder to decode.
-- // TO DO: maybe intern mname_oop
-- return mname_oop;
-+ return mname();
- }
-
--Handle MethodHandles::init_field_MemberName(oop mname_oop, FieldAccessInfo& info, TRAPS) {
-+Handle MethodHandles::init_field_MemberName(Handle mname, FieldAccessInfo& info, TRAPS) {
- return Handle();
- #if 0
- KlassHandle field_holder = info.klass();
-@@ -571,7 +606,7 @@
- // An unresolved member name is a mere symbolic reference.
- // Resolving it plants a vmtarget/vmindex in it,
- // which refers dirctly to JVM internals.
--Handle MethodHandles::resolve_MemberName(Handle mname, TRAPS) {
-+Handle MethodHandles::resolve_MemberName(Handle mname, KlassHandle caller, TRAPS) {
- Handle empty;
- assert(java_lang_invoke_MemberName::is_instance(mname()), "");
-
-@@ -650,21 +685,49 @@
- if (ref_kind == JVM_REF_invokeStatic) {
- //do_dispatch = false; // no need, since statics are never dispatched
- LinkResolver::resolve_static_call(result,
-- defc, name, type, KlassHandle(), false, false, THREAD);
-+ defc, name, type, caller, caller.not_null(), false, THREAD);
- } else if (ref_kind == JVM_REF_invokeInterface) {
- LinkResolver::resolve_interface_call(result, Handle(), defc,
-- defc, name, type, KlassHandle(), false, false, THREAD);
-+ defc, name, type, caller, caller.not_null(), false, THREAD);
- } else if (mh_invoke_id != vmIntrinsics::_none) {
- assert(!is_signature_polymorphic_static(mh_invoke_id), "");
- LinkResolver::resolve_handle_call(result,
-- defc, name, type, KlassHandle(), THREAD);
-+ defc, name, type, caller, THREAD);
- } else if (ref_kind == JVM_REF_invokeSpecial) {
- do_dispatch = false; // force non-virtual linkage
- LinkResolver::resolve_special_call(result,
-- defc, name, type, KlassHandle(), false, THREAD);
-+ defc, name, type, caller, caller.not_null(), THREAD);
-+ // CR 8029533:
-+ // As a corner case, invokespecial can return a method *below* its resolved_klass.
-+ // Since method search *starts* at the resolved_klass, the eventual
-+ // method is almost always in a supertype *above* the resolved_klass.
-+ // This pattern breaks when an invokespecial "over-reaches" beyond an
-+ // immediate super to a method overridden by a super class.
-+ // In that case, the selected method will be below the resolved_klass.
-+ // (This is the behavior enabled by the famous ACC_SUPER classfile flag.)
-+ //
-+ // Downstream of this code, we make assumptions about resolved_klass being below m.
-+ // (See init_method_MemberName, the comment "bad receiver limit".)
-+ // We basically want to patch result._resolved_klass to be m.method_holder().
-+ // The simplest way to get this happier outcome is to re-resolve.
-+ if (!HAS_PENDING_EXCEPTION &&
-+ caller.not_null() &&
-+ result.resolved_method().not_null()) {
-+ // this is the m_klass value that will be checked later:
-+ klassOop m_klass = result.resolved_method()->method_holder();
-+ if (m_klass != result.resolved_klass()() &&
-+ Klass::cast(m_klass)->is_subtype_of(result.resolved_klass()())) {
-+ KlassHandle adjusted_defc(THREAD, m_klass);
-+ LinkResolver::resolve_special_call(result,
-+ adjusted_defc, name, type, caller, caller.not_null(), THREAD);
-+ assert(HAS_PENDING_EXCEPTION // if there is something like an OOM, pass it up to caller
-+ || result.resolved_method()->method_holder() == adjusted_defc(),
-+ "same method, different resolved_klass");
-+ }
-+ }
- } else if (ref_kind == JVM_REF_invokeVirtual) {
- LinkResolver::resolve_virtual_call(result, Handle(), defc,
-- defc, name, type, KlassHandle(), false, false, THREAD);
-+ defc, name, type, caller, caller.not_null(), false, THREAD);
- } else {
- assert(false, err_msg("ref_kind=%d", ref_kind));
- }
-@@ -672,7 +735,7 @@
- return empty;
- }
- }
-- return init_method_MemberName(mname(), result, THREAD);
-+ return init_method_MemberName(mname, result, THREAD);
- }
- case IS_CONSTRUCTOR:
- {
-@@ -681,7 +744,7 @@
- assert(!HAS_PENDING_EXCEPTION, "");
- if (name == vmSymbols::object_initializer_name()) {
- LinkResolver::resolve_special_call(result,
-- defc, name, type, KlassHandle(), false, THREAD);
-+ defc, name, type, caller, caller.not_null(), THREAD);
- } else {
- break; // will throw after end of switch
- }
-@@ -690,7 +753,7 @@
- }
- }
- assert(result.is_statically_bound(), "");
-- return init_method_MemberName(mname(), result, THREAD);
-+ return init_method_MemberName(mname, result, THREAD);
- }
- case IS_FIELD:
- {
-@@ -703,7 +766,7 @@
- oop name = field_name_or_null(fd.name());
- bool is_setter = (ref_kind_is_valid(ref_kind) && ref_kind_is_setter(ref_kind));
- mname = Handle(THREAD,
-- init_field_MemberName(mname(), sel_klass->as_klassOop(),
-+ init_field_MemberName(mname, sel_klass,
- fd.access_flags(), type, name, fd.offset(), is_setter));
- return mname;
- }
-@@ -795,16 +858,16 @@
- THROW_MSG(vmSymbols::java_lang_InternalError(), "unrecognized MemberName format");
- }
-
--int MethodHandles::find_MemberNames(klassOop k,
-+int MethodHandles::find_MemberNames(KlassHandle k,
- Symbol* name, Symbol* sig,
-- int mflags, klassOop caller,
-- int skip, objArrayOop results) {
-- DEBUG_ONLY(No_Safepoint_Verifier nsv);
-- // this code contains no safepoints!
-+ int mflags, KlassHandle caller,
-+ int skip, objArrayHandle results) {
-
- // %%% take caller into account!
-
-- if (k == NULL || !Klass::cast(k)->oop_is_instance()) return -1;
-+ Thread* thread = Thread::current();
-+
-+ if (k.is_null() || !k->oop_is_instance()) return -1;
-
- int rfill = 0, rlimit = results->length(), rskip = skip;
- // overflow measurement:
-@@ -832,7 +895,7 @@
- }
-
- if ((match_flags & IS_FIELD) != 0) {
-- for (FieldStream st(k, local_only, !search_intfc); !st.eos(); st.next()) {
-+ for (FieldStream st(k(), local_only, !search_intfc); !st.eos(); st.next()) {
- if (name != NULL && st.name() != name)
- continue;
- if (sig != NULL && st.signature() != sig)
-@@ -841,15 +904,15 @@
- if (rskip > 0) {
- --rskip;
- } else if (rfill < rlimit) {
-- oop result = results->obj_at(rfill++);
-- if (!java_lang_invoke_MemberName::is_instance(result))
-+ Handle result(thread, results->obj_at(rfill++));
-+ if (!java_lang_invoke_MemberName::is_instance(result()))
- return -99; // caller bug!
- oop type = field_signature_type_or_null(st.signature());
- oop name = field_name_or_null(st.name());
-- oop saved = MethodHandles::init_field_MemberName(result, st.klass()->as_klassOop(),
-+ oop saved = MethodHandles::init_field_MemberName(result, st.klass(),
- st.access_flags(), type, name,
- st.offset());
-- if (saved != result)
-+ if (saved != result())
- results->obj_at_put(rfill-1, saved); // show saved instance to user
- } else if (++overflow >= overflow_limit) {
- match_flags = 0; break; // got tired of looking at overflow
-@@ -882,7 +945,7 @@
- } else {
- // caller will accept either sort; no need to adjust name
- }
-- for (MethodStream st(k, local_only, !search_intfc); !st.eos(); st.next()) {
-+ for (MethodStream st(k(), local_only, !search_intfc); !st.eos(); st.next()) {
- methodOop m = st.method();
- Symbol* m_name = m->name();
- if (m_name == clinit_name)
-@@ -895,11 +958,11 @@
- if (rskip > 0) {
- --rskip;
- } else if (rfill < rlimit) {
-- oop result = results->obj_at(rfill++);
-- if (!java_lang_invoke_MemberName::is_instance(result))
-+ Handle result(thread, results->obj_at(rfill++));
-+ if (!java_lang_invoke_MemberName::is_instance(result()))
- return -99; // caller bug!
-- oop saved = MethodHandles::init_method_MemberName(result, m, true, NULL);
-- if (saved != result)
-+ oop saved = MethodHandles::init_method_MemberName(result, m, true, KlassHandle());
-+ if (saved != result())
- results->obj_at_put(rfill-1, saved); // show saved instance to user
- } else if (++overflow >= overflow_limit) {
- match_flags = 0; break; // got tired of looking at overflow
-@@ -911,6 +974,85 @@
- return rfill + overflow;
- }
-
-+//------------------------------------------------------------------------------
-+// MemberNameTable
-+//
-+
-+MemberNameTable::MemberNameTable(int methods_cnt)
-+ : GrowableArray<jweak>(methods_cnt, true) {
-+ assert_locked_or_safepoint(MemberNameTable_lock);
-+}
-+
-+MemberNameTable::~MemberNameTable() {
-+ assert_locked_or_safepoint(MemberNameTable_lock);
-+ int len = this->length();
-+
-+ for (int idx = 0; idx < len; idx++) {
-+ jweak ref = this->at(idx);
-+ JNIHandles::destroy_weak_global(ref);
-+ }
-+}
-+
-+void MemberNameTable::add_member_name(int index, jweak mem_name_wref) {
-+ assert_locked_or_safepoint(MemberNameTable_lock);
-+ this->at_put_grow(index, mem_name_wref);
-+}
-+
-+// Return a member name oop or NULL.
-+oop MemberNameTable::get_member_name(int index) {
-+ assert_locked_or_safepoint(MemberNameTable_lock);
-+ jweak ref = this->at(index);
-+ oop mem_name = JNIHandles::resolve(ref);
-+ return mem_name;
-+}
-+
-+oop MemberNameTable::find_member_name_by_method(methodOop old_method) {
-+ assert_locked_or_safepoint(MemberNameTable_lock);
-+ oop found = NULL;
-+ int len = this->length();
-+
-+ for (int idx = 0; idx < len; idx++) {
-+ oop mem_name = JNIHandles::resolve(this->at(idx));
-+ if (mem_name == NULL) {
-+ continue;
-+ }
-+ methodOop method = (methodOop)java_lang_invoke_MemberName::vmtarget(mem_name);
-+ if (method == old_method) {
-+ found = mem_name;
-+ break;
-+ }
-+ }
-+ return found;
-+}
-+
-+// It is called at safepoint only
-+void MemberNameTable::adjust_method_entries(methodOop* old_methods, methodOop* new_methods,
-+ int methods_length, bool *trace_name_printed) {
-+ assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
-+ // search the MemberNameTable for uses of either obsolete or EMCP methods
-+ for (int j = 0; j < methods_length; j++) {
-+ methodOop old_method = old_methods[j];
-+ methodOop new_method = new_methods[j];
-+ oop mem_name = find_member_name_by_method(old_method);
-+ if (mem_name != NULL) {
-+ java_lang_invoke_MemberName::adjust_vmtarget(mem_name, new_method);
-+
-+ if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) {
-+ if (!(*trace_name_printed)) {
-+ // RC_TRACE_MESG macro has an embedded ResourceMark
-+ RC_TRACE_MESG(("adjust: name=%s",
-+ Klass::cast(old_method->method_holder())->external_name()));
-+ *trace_name_printed = true;
-+ }
-+ // RC_TRACE macro has an embedded ResourceMark
-+ RC_TRACE(0x00400000, ("MemberName method update: %s(%s)",
-+ new_method->name()->as_C_string(),
-+ new_method->signature()->as_C_string()));
-+ }
-+ }
-+ }
-+}
-+
- //
- // Here are the native methods in java.lang.invoke.MethodHandleNatives
- // They are the private interface between this JVM and the HotSpot-specific
-@@ -1002,8 +1144,8 @@
- if (mname_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "mname is null"); }
- if (target_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "target is null"); }
- Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh));
-- oop target_oop = JNIHandles::resolve_non_null(target_jh);
-- MethodHandles::init_MemberName(mname(), target_oop);
-+ Handle target(THREAD, JNIHandles::resolve_non_null(target_jh));
-+ MethodHandles::init_MemberName(mname, target);
- }
- JVM_END
-
-@@ -1025,7 +1167,12 @@
- if (VerifyMethodHandles && caller_jh != NULL &&
- java_lang_invoke_MemberName::clazz(mname()) != NULL) {
- klassOop reference_klass = java_lang_Class::as_klassOop(java_lang_invoke_MemberName::clazz(mname()));
-- if (reference_klass != NULL) {
-+ if (reference_klass != NULL && Klass::cast(reference_klass)->oop_is_objArray()) {
-+ reference_klass = objArrayKlass::cast(reference_klass)->bottom_klass();
-+ }
-+
-+ // Reflection::verify_class_access can only handle instance classes.
-+ if (reference_klass != NULL && Klass::cast(reference_klass)->oop_is_instance()) {
- // Emulate LinkResolver::check_klass_accessability.
- klassOop caller = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(caller_jh));
- if (!Reflection::verify_class_access(caller,
-@@ -1036,7 +1183,11 @@
- }
- }
-
-- Handle resolved = MethodHandles::resolve_MemberName(mname, CHECK_NULL);
-+ KlassHandle caller(THREAD,
-+ caller_jh == NULL ? (klassOop) NULL :
-+ java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(caller_jh)));
-+ Handle resolved = MethodHandles::resolve_MemberName(mname, caller, CHECK_NULL);
-+
- if (resolved.is_null()) {
- int flags = java_lang_invoke_MemberName::flags(mname());
- int ref_kind = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
-@@ -1109,11 +1260,12 @@
- } else if (vmtarget->is_klass()) {
- x = Klass::cast((klassOop) vmtarget())->java_mirror();
- } else {
-- Handle mname2 = MethodHandles::new_MemberName(CHECK_NULL);
-- if (vmtarget->is_method())
-- x = MethodHandles::init_method_MemberName(mname2(), methodOop(vmtarget()), false, NULL);
-- else
-+ if (vmtarget->is_method()) {
-+ x = mname();
-+ } else {
-+ Handle mname2 = MethodHandles::new_MemberName(CHECK_NULL);
- x = MethodHandles::init_MemberName(mname2(), vmtarget());
-+ }
- }
- result->obj_at_put(1, x);
- return JNIHandles::make_local(env, result());
-@@ -1156,8 +1308,8 @@
- // %%% TO DO
- }
-
-- int res = MethodHandles::find_MemberNames(k(), name, sig, mflags,
-- caller(), skip, results());
-+ int res = MethodHandles::find_MemberNames(k, name, sig, mflags,
-+ caller, skip, results);
- // TO DO: expand at least some of the MemberNames, to avoid massive callbacks
- return res;
- }
---- ./hotspot/src/share/vm/prims/methodHandles.hpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/methodHandles.hpp 2014-07-15 21:48:35.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
-@@ -39,7 +39,6 @@
- // in java.lang.invoke and sun.invoke.
- // See also javaClasses for layouts java_lang_invoke_Method{Handle,Type,Type::Form}.
- public:
-- public:
- static bool enabled() { return _enabled; }
- static void set_enabled(bool z);
-
-@@ -51,21 +50,21 @@
-
- public:
- // working with member names
-- static Handle resolve_MemberName(Handle mname, TRAPS); // compute vmtarget/vmindex from name/type
-+ static Handle resolve_MemberName(Handle mname, KlassHandle caller, TRAPS); // compute vmtarget/vmindex from name/type
- static void expand_MemberName(Handle mname, int suppress, TRAPS); // expand defc/name/type if missing
- static Handle new_MemberName(TRAPS); // must be followed by init_MemberName
-- static oop init_MemberName(oop mname_oop, oop target_oop); // compute vmtarget/vmindex from target
-- static oop init_method_MemberName(oop mname_oop, methodOop m, bool do_dispatch,
-- klassOop receiver_limit);
-- static oop init_field_MemberName(oop mname_oop, klassOop field_holder,
-+ static oop init_MemberName(Handle mname_h, Handle target_h); // compute vmtarget/vmindex from target
-+ static oop init_method_MemberName(Handle mname_h, methodOop m, bool do_dispatch,
-+ KlassHandle resolved_klass_h);
-+ static oop init_field_MemberName(Handle mname_h, KlassHandle field_holder_h,
- AccessFlags mods, oop type, oop name,
- intptr_t offset, bool is_setter = false);
-- static Handle init_method_MemberName(oop mname_oop, CallInfo& info, TRAPS);
-- static Handle init_field_MemberName(oop mname_oop, FieldAccessInfo& info, TRAPS);
-+ static Handle init_method_MemberName(Handle mname_h, CallInfo& info, TRAPS);
-+ static Handle init_field_MemberName(Handle mname_h, FieldAccessInfo& info, TRAPS);
- static int method_ref_kind(methodOop m, bool do_dispatch_if_possible = true);
-- static int find_MemberNames(klassOop k, Symbol* name, Symbol* sig,
-- int mflags, klassOop caller,
-- int skip, objArrayOop results);
-+ static int find_MemberNames(KlassHandle k, Symbol* name, Symbol* sig,
-+ int mflags, KlassHandle caller,
-+ int skip, objArrayHandle results);
- // bit values for suppress argument to expand_MemberName:
- enum { _suppress_defc = 1, _suppress_name = 2, _suppress_type = 4 };
-
-@@ -230,4 +229,26 @@
- void generate();
- };
-
-+//------------------------------------------------------------------------------
-+// MemberNameTable
-+//
-+
-+class MemberNameTable : public GrowableArray<jweak> {
-+ public:
-+ MemberNameTable(int methods_cnt);
-+ ~MemberNameTable();
-+
-+ void add_member_name(int index, jweak mem_name_ref);
-+ oop get_member_name(int index);
-+
-+ public:
-+ // RedefineClasses() API support:
-+ // If a MemberName refers to old_method then update it
-+ // to refer to new_method.
-+ void adjust_method_entries(methodOop* old_methods, methodOop* new_methods,
-+ int methods_length, bool *trace_name_printed);
-+ private:
-+ oop find_member_name_by_method(methodOop old_method);
-+};
-+
- #endif // SHARE_VM_PRIMS_METHODHANDLES_HPP
---- ./hotspot/src/share/vm/prims/whitebox.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/whitebox.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -27,6 +27,8 @@
- #include "memory/universe.hpp"
- #include "oops/oop.inline.hpp"
-
-+#include "code/codeCache.hpp"
-+
- #include "classfile/symbolTable.hpp"
-
- #include "prims/whitebox.hpp"
-@@ -131,6 +133,13 @@
- return MemTracker::wbtest_wait_for_data_merge();
- WB_END
-
-+WB_ENTRY(void, WB_DeoptimizeAll(JNIEnv* env, jobject o))
-+ MutexLockerEx mu(Compile_lock);
-+ CodeCache::mark_all_nmethods_for_deoptimization();
-+ VM_Deoptimize op;
-+ VMThread::execute(&op);
-+WB_END
-+
- //Some convenience methods to deal with objects from java
- int WhiteBox::offset_for_field(const char* field_name, oop object,
- Symbol* signature_symbol) {
-@@ -204,6 +213,7 @@
- {CC"NMTUncommitMemory", CC"(JJ)V", (void*)&WB_NMTUncommitMemory },
- {CC"NMTReleaseMemory", CC"(JJ)V", (void*)&WB_NMTReleaseMemory },
- {CC"NMTWaitForDataMerge", CC"()Z", (void*)&WB_NMTWaitForDataMerge},
-+ {CC"deoptimizeAll", CC"()V", (void*)&WB_DeoptimizeAll },
- };
-
- #undef CC
---- ./hotspot/src/share/vm/runtime/arguments.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/arguments.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -1447,6 +1447,17 @@
- }
- FLAG_SET_DEFAULT(UseParallelGC, true);
-
-+ if (UseAdaptiveSizePolicy) {
-+ // We don't want to limit adaptive heap sizing's freedom to adjust the heap
-+ // unless the user actually sets these flags.
-+ if (FLAG_IS_DEFAULT(MinHeapFreeRatio)) {
-+ FLAG_SET_DEFAULT(MinHeapFreeRatio, 0);
-+ }
-+ if (FLAG_IS_DEFAULT(MaxHeapFreeRatio)) {
-+ FLAG_SET_DEFAULT(MaxHeapFreeRatio, 100);
-+ }
-+ }
-+
- // If no heap maximum was requested explicitly, use some reasonable fraction
- // of the physical memory, up to a maximum of 1GB.
- if (UseParallelGC) {
-@@ -1719,7 +1730,7 @@
- }
-
- bool Arguments::verify_percentage(uintx value, const char* name) {
-- if (value <= 100) {
-+ if (is_percentage(value)) {
- return true;
- }
- jio_fprintf(defaultStream::error_stream(),
-@@ -1768,6 +1779,34 @@
- }
- }
-
-+bool Arguments::verify_MinHeapFreeRatio(FormatBuffer<80>& err_msg, uintx min_heap_free_ratio) {
-+ if (!is_percentage(min_heap_free_ratio)) {
-+ err_msg.print("MinHeapFreeRatio must have a value between 0 and 100");
-+ return false;
-+ }
-+ if (min_heap_free_ratio > MaxHeapFreeRatio) {
-+ err_msg.print("MinHeapFreeRatio (" UINTX_FORMAT ") must be less than or "
-+ "equal to MaxHeapFreeRatio (" UINTX_FORMAT ")", min_heap_free_ratio,
-+ MaxHeapFreeRatio);
-+ return false;
-+ }
-+ return true;
-+}
-+
-+bool Arguments::verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio) {
-+ if (!is_percentage(max_heap_free_ratio)) {
-+ err_msg.print("MaxHeapFreeRatio must have a value between 0 and 100");
-+ return false;
-+ }
-+ if (max_heap_free_ratio < MinHeapFreeRatio) {
-+ err_msg.print("MaxHeapFreeRatio (" UINTX_FORMAT ") must be greater than or "
-+ "equal to MinHeapFreeRatio (" UINTX_FORMAT ")", max_heap_free_ratio,
-+ MinHeapFreeRatio);
-+ return false;
-+ }
-+ return true;
-+}
-+
- // Check consistency of GC selection
- bool Arguments::check_gc_consistency() {
- check_gclog_consistency();
-@@ -1852,15 +1891,19 @@
- "AdaptiveSizePolicyWeight");
- status = status && verify_percentage(AdaptivePermSizeWeight, "AdaptivePermSizeWeight");
- status = status && verify_percentage(ThresholdTolerance, "ThresholdTolerance");
-- status = status && verify_percentage(MinHeapFreeRatio, "MinHeapFreeRatio");
-- status = status && verify_percentage(MaxHeapFreeRatio, "MaxHeapFreeRatio");
-
-- if (MinHeapFreeRatio > MaxHeapFreeRatio) {
-- jio_fprintf(defaultStream::error_stream(),
-- "MinHeapFreeRatio (" UINTX_FORMAT ") must be less than or "
-- "equal to MaxHeapFreeRatio (" UINTX_FORMAT ")\n",
-- MinHeapFreeRatio, MaxHeapFreeRatio);
-- status = false;
-+ {
-+ // Using "else if" below to avoid printing two error messages if min > max.
-+ // This will also prevent us from reporting both min>100 and max>100 at the
-+ // same time, but that is less annoying than printing two identical errors IMHO.
-+ FormatBuffer<80> err_msg("");
-+ if (!verify_MinHeapFreeRatio(err_msg, MinHeapFreeRatio)) {
-+ jio_fprintf(defaultStream::error_stream(), "%s\n", err_msg.buffer());
-+ status = false;
-+ } else if (!verify_MaxHeapFreeRatio(err_msg, MaxHeapFreeRatio)) {
-+ jio_fprintf(defaultStream::error_stream(), "%s\n", err_msg.buffer());
-+ status = false;
-+ }
- }
- // Keeping the heap 100% free is hard ;-) so limit it to 99%.
- MinHeapFreeRatio = MIN2(MinHeapFreeRatio, (uintx) 99);
-@@ -1943,11 +1986,12 @@
- // than just disable the lock verification. This will be fixed under
- // bug 4788986.
- if (UseConcMarkSweepGC && FLSVerifyAllHeapReferences) {
-- if (VerifyGCStartAt == 0) {
-+ if (VerifyDuringStartup) {
- warning("Heap verification at start-up disabled "
- "(due to current incompatibility with FLSVerifyAllHeapReferences)");
-- VerifyGCStartAt = 1; // Disable verification at start-up
-+ VerifyDuringStartup = false; // Disable verification at start-up
- }
-+
- if (VerifyBeforeExit) {
- warning("Heap verification at shutdown disabled "
- "(due to current incompatibility with FLSVerifyAllHeapReferences)");
-@@ -2013,6 +2057,10 @@
- PrintNMTStatistics = false;
- }
-
-+#ifdef COMPILER1
-+ status &= verify_interval(SafepointPollOffset, 0, os::vm_page_size() - BytesPerWord, "SafepointPollOffset");
-+#endif
-+
- return status;
- }
-
-@@ -2549,7 +2597,9 @@
- FLAG_SET_CMDLINE(uintx, MaxNewSize, NewSize);
- }
-
-+#ifndef _ALLBSD_SOURCE // UseLargePages is not yet supported on BSD.
- FLAG_SET_DEFAULT(UseLargePages, true);
-+#endif
-
- // Increase some data structure sizes for efficiency
- FLAG_SET_CMDLINE(uintx, BaseFootPrintEstimate, MaxHeapSize);
-@@ -3111,6 +3161,10 @@
- UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
- #endif
-
-+#ifdef _ALLBSD_SOURCE // UseLargePages is not yet supported on BSD.
-+ UNSUPPORTED_OPTION(UseLargePages, "-XX:+UseLargePages");
-+#endif
-+
- #ifndef PRODUCT
- if (TraceBytecodesAt != 0) {
- TraceBytecodes = true;
---- ./hotspot/src/share/vm/runtime/arguments.hpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/arguments.hpp 2014-07-15 21:48:35.000000000 -0700
-@@ -27,6 +27,7 @@
-
- #include "runtime/java.hpp"
- #include "runtime/perfData.hpp"
-+#include "utilities/debug.hpp"
- #include "utilities/top.hpp"
-
- // Arguments parses the command line and recognizes options
-@@ -350,6 +351,9 @@
- static bool is_bad_option(const JavaVMOption* option, jboolean ignore) {
- return is_bad_option(option, ignore, NULL);
- }
-+ static bool is_percentage(uintx val) {
-+ return val <= 100;
-+ }
- static bool verify_interval(uintx val, uintx min,
- uintx max, const char* name);
- static bool verify_min_value(intx val, intx min, const char* name);
-@@ -411,6 +415,12 @@
- public:
- // Parses the arguments
- static jint parse(const JavaVMInitArgs* args);
-+ // Verifies that the given value will fit as a MinHeapFreeRatio. If not, an error
-+ // message is returned in the provided buffer.
-+ static bool verify_MinHeapFreeRatio(FormatBuffer<80>& err_msg, uintx min_heap_free_ratio);
-+ // Verifies that the given value will fit as a MaxHeapFreeRatio. If not, an error
-+ // message is returned in the provided buffer.
-+ static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio);
- // Check for consistency in the selection of the garbage collector.
- static bool check_gc_consistency();
- // Check consistecy or otherwise of VM argument settings
---- ./hotspot/src/share/vm/runtime/atomic.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/atomic.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -54,6 +54,12 @@
- #ifdef TARGET_OS_ARCH_windows_x86
- # include "atomic_windows_x86.inline.hpp"
- #endif
-+#ifdef TARGET_OS_ARCH_bsd_x86
-+# include "atomic_bsd_x86.inline.hpp"
-+#endif
-+#ifdef TARGET_OS_ARCH_bsd_zero
-+# include "atomic_bsd_zero.inline.hpp"
-+#endif
- #ifdef TARGET_OS_ARCH_linux_arm
- # include "atomic_linux_arm.inline.hpp"
- #endif
---- ./hotspot/src/share/vm/runtime/frame.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/frame.cpp 2014-07-15 21:48:35.000000000 -0700
-@@ -23,6 +23,7 @@
- */
-
- #include "precompiled.hpp"
-+#include "compiler/abstractCompiler.hpp"
- #include "gc_interface/collectedHeap.inline.hpp"
- #include "interpreter/interpreter.hpp"
- #include "interpreter/oopMapCache.hpp"
-@@ -559,7 +560,7 @@
-
- st->print("%s frame (sp=" INTPTR_FORMAT " unextended sp=" INTPTR_FORMAT, print_name(), sp(), unextended_sp());
- if (sp() != NULL)
-- st->print(", fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT, fp(), pc());
-+ st->print(", fp=" INTPTR_FORMAT ", real_fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT, fp(), real_fp(), pc());
-
- if (StubRoutines::contains(pc())) {
- st->print_cr(")");
-@@ -720,10 +721,14 @@
- } else if (_cb->is_buffer_blob()) {
- st->print("v ~BufferBlob::%s", ((BufferBlob *)_cb)->name());
- } else if (_cb->is_nmethod()) {
-- methodOop m = ((nmethod *)_cb)->method();
-+ nmethod* nm = (nmethod*)_cb;
-+ methodOop m = nm->method();
- if (m != NULL) {
- m->name_and_sig_as_C_string(buf, buflen);
-- st->print("J %s", buf);
-+ st->print("J %d%s %s %s (%d bytes) @ " PTR_FORMAT " [" PTR_FORMAT "+0x%x]",
-+ nm->compile_id(), (nm->is_osr_method() ? "%" : ""),
-+ ((nm->compiler() != NULL) ? nm->compiler()->name() : ""),
-+ buf, m->code_size(), _pc, _cb->code_begin(), _pc - _cb->code_begin());
- } else {
- st->print("J " PTR_FORMAT, pc());
- }
---- ./hotspot/src/share/vm/runtime/globals.hpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/globals.hpp 2014-10-28 20:19:39.000000000 -0700
-@@ -1094,9 +1094,11 @@
- "Prevent spurious or premature wakeups from object.wait " \
- "(Solaris only)") \
- \
-- product(intx, NativeMonitorTimeout, -1, "(Unstable)" ) \
-- product(intx, NativeMonitorFlags, 0, "(Unstable)" ) \
-- product(intx, NativeMonitorSpinLimit, 20, "(Unstable)" ) \
-+ experimental(intx, NativeMonitorTimeout, -1, "(Unstable)") \
-+ \
-+ experimental(intx, NativeMonitorFlags, 0, "(Unstable)") \
-+ \
-+ experimental(intx, NativeMonitorSpinLimit, 20, "(Unstable)") \
- \
- develop(bool, UsePthreads, false, \
- "Use pthread-based instead of libthread-based synchronization " \
-@@ -1697,6 +1699,9 @@
- product(bool, CMSAbortSemantics, false, \
- "Whether abort-on-overflow semantics is implemented") \
- \
-+ product(bool, CMSParallelInitialMarkEnabled, false, \
-+ "Use the parallel initial mark.") \
-+ \
- product(bool, CMSParallelRemarkEnabled, true, \
- "Whether parallel remark enabled (only if ParNewGC)") \
- \
-@@ -1708,6 +1713,14 @@
- "Whether to always record survivor space PLAB bdries" \
- " (effective only if CMSParallelSurvivorRemarkEnabled)") \
- \
-+ product(bool, CMSEdenChunksRecordAlways, false, \
-+ "Whether to always record eden chunks used for " \
-+ "the parallel initial mark or remark of eden" ) \
-+ \
-+ product(bool, CMSPrintEdenSurvivorChunks, false, \
-+ "Print the eden and the survivor chunks used for the parallel " \
-+ "initial mark or remark of the eden/survivor spaces") \
-+ \
- product(bool, CMSConcurrentMTEnabled, true, \
- "Whether multi-threaded concurrent work enabled (if ParNewGC)") \
- \
-@@ -1917,6 +1930,9 @@
- notproduct(bool, ExecuteInternalVMTests, false, \
- "Enable execution of internal VM tests.") \
- \
-+ notproduct(bool, VerboseInternalVMTests, false, \
-+ "Turn on logging for internal VM tests.") \
-+ \
- product_pd(bool, UseTLAB, "Use thread-local object allocation") \
- \
- product_pd(bool, ResizeTLAB, \
-@@ -2126,6 +2142,13 @@
- product(intx, PrefetchFieldsAhead, -1, \
- "How many fields ahead to prefetch in oop scan (<= 0 means off)") \
- \
-+ diagnostic(bool, VerifySilently, false, \
-+ "Don't print print the verification progress") \
-+ \
-+ diagnostic(bool, VerifyDuringStartup, false, \
-+ "Verify memory system before executing any Java code " \
-+ "during VM initialization") \
-+ \
- diagnostic(bool, VerifyBeforeExit, trueInDebug, \
- "Verify system before exiting") \
- \
-@@ -3010,10 +3033,10 @@
- product_pd(uintx, MaxPermSize, \
- "Maximum size of permanent generation (in bytes)") \
- \
-- product(uintx, MinHeapFreeRatio, 40, \
-+ manageable(uintx, MinHeapFreeRatio, 40, \
- "Min percentage of heap free after GC to avoid expansion") \
- \
-- product(uintx, MaxHeapFreeRatio, 70, \
-+ manageable(uintx, MaxHeapFreeRatio, 70, \
- "Max percentage of heap free after GC to avoid shrinking") \
- \
- product(intx, SoftRefLRUPolicyMSPerMB, 1000, \
---- ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2013-09-06 11:22:15.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2014-10-28 20:19:39.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
-@@ -57,6 +57,7 @@
- Mutex* JNIGlobalHandle_lock = NULL;
- Mutex* JNIHandleBlockFreeList_lock = NULL;
- Mutex* JNICachedItableIndex_lock = NULL;
-+Mutex* MemberNameTable_lock = NULL;
- Mutex* JmethodIdCreation_lock = NULL;
- Mutex* JfieldIdCreation_lock = NULL;
- Monitor* JNICritical_lock = NULL;
-@@ -133,13 +134,15 @@
-
- Mutex* Management_lock = NULL;
- Monitor* Service_lock = NULL;
--Mutex* Stacktrace_lock = NULL;
-+Monitor* PeriodicTask_lock = NULL;
-
--Monitor* JfrQuery_lock = NULL;
-+#ifdef INCLUDE_TRACE
-+Mutex* JfrStacktrace_lock = NULL;
- Monitor* JfrMsg_lock = NULL;
- Mutex* JfrBuffer_lock = NULL;
- Mutex* JfrStream_lock = NULL;
--Monitor* PeriodicTask_lock = NULL;
-+Mutex* JfrThreadGroups_lock = NULL;
-+#endif
-
- #define MAX_NUM_MUTEX 128
- static Monitor * _mutex_array[MAX_NUM_MUTEX];
-@@ -215,7 +218,6 @@
- def(Patching_lock , Mutex , special, true ); // used for safepointing and code patching.
- def(ObjAllocPost_lock , Monitor, special, false);
- def(Service_lock , Monitor, special, true ); // used for service thread operations
-- def(Stacktrace_lock , Mutex, special, true ); // used for JFR stacktrace database
- def(JmethodIdCreation_lock , Mutex , leaf, true ); // used for creating jmethodIDs.
-
- def(SystemDictionary_lock , Monitor, leaf, true ); // lookups done by VM thread
-@@ -262,6 +264,7 @@
- def(Heap_lock , Monitor, nonleaf+1, false);
- def(JfieldIdCreation_lock , Mutex , nonleaf+1, true ); // jfieldID, Used in VM_Operation
- def(JNICachedItableIndex_lock , Mutex , nonleaf+1, false); // Used to cache an itable index during JNI invoke
-+ def(MemberNameTable_lock , Mutex , nonleaf+1, false); // Used to protect MemberNameTable
-
- def(CompiledIC_lock , Mutex , nonleaf+2, false); // locks VtableStubs_lock, InlineCacheBuffer_lock
- def(CompileTaskAlloc_lock , Mutex , nonleaf+2, true );
-@@ -278,12 +281,17 @@
- def(MethodCompileQueue_lock , Monitor, nonleaf+4, true );
- def(Debug2_lock , Mutex , nonleaf+4, true );
- def(Debug3_lock , Mutex , nonleaf+4, true );
-- def(CompileThread_lock , Monitor, nonleaf+5, false );
-+ def(CompileThread_lock , Monitor, nonleaf+5, false);
-+ def(PeriodicTask_lock , Monitor, nonleaf+5, true);
-
-+#ifdef INCLUDE_TRACE
- def(JfrMsg_lock , Monitor, leaf, true);
- def(JfrBuffer_lock , Mutex, nonleaf+1, true);
-+ def(JfrThreadGroups_lock , Mutex, nonleaf+1, true);
- def(JfrStream_lock , Mutex, nonleaf+2, true);
-- def(PeriodicTask_lock , Monitor, nonleaf+5, true);
-+ def(JfrStacktrace_lock , Mutex, special, true );
-+#endif
-+
- }
-
- 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-10-28 20:19:39.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
-@@ -51,6 +51,7 @@
- extern Mutex* JNIGlobalHandle_lock; // a lock on creating JNI global handles
- extern Mutex* JNIHandleBlockFreeList_lock; // a lock on the JNI handle block free list
- extern Mutex* JNICachedItableIndex_lock; // a lock on caching an itable index during JNI invoke
-+extern Mutex* MemberNameTable_lock; // a lock on the MemberNameTable updates
- extern Mutex* JmethodIdCreation_lock; // a lock on creating JNI method identifiers
- extern Mutex* JfieldIdCreation_lock; // a lock on creating JNI static field identifiers
- extern Monitor* JNICritical_lock; // a lock used while entering and exiting JNI critical regions, allows GC to sometimes get in
-@@ -135,13 +136,15 @@
-
- extern Mutex* Management_lock; // a lock used to serialize JVM management
- extern Monitor* Service_lock; // a lock used for service thread operation
--extern Mutex* Stacktrace_lock; // used to guard access to the stacktrace table
-+extern Monitor* PeriodicTask_lock; // protects the periodic task structure
-
--extern Monitor* JfrQuery_lock; // protects JFR use
-+#ifdef INCLUDE_TRACE
-+extern Mutex* JfrStacktrace_lock; // used to guard access to the JFR stacktrace table
- extern Monitor* JfrMsg_lock; // protects JFR messaging
- extern Mutex* JfrBuffer_lock; // protects JFR buffer operations
- extern Mutex* JfrStream_lock; // protects JFR stream access
--extern Monitor* PeriodicTask_lock; // protects the periodic task structure
-+extern Mutex* JfrThreadGroups_lock; // protects JFR access to Thread Groups
-+#endif
-
- // 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-10-28 20:19:39.000000000 -0700
-@@ -1684,7 +1684,7 @@
- }
- iterator->_notified = 1 ;
- Thread * Self = THREAD;
-- iterator->_notifier_tid = Self->osthread()->thread_id();
-+ iterator->_notifier_tid = (jlong) Self->osthread()->thread_id();
-
- ObjectWaiter * List = _EntryList ;
- if (List != NULL) {
-@@ -1810,7 +1810,7 @@
- guarantee (iterator->_notified == 0, "invariant") ;
- iterator->_notified = 1 ;
- Thread * Self = THREAD;
-- iterator->_notifier_tid = Self->osthread()->thread_id();
-+ iterator->_notifier_tid = (jlong) Self->osthread()->thread_id();
- if (Policy != 4) {
- 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-10-28 20:19:39.000000000 -0700
-@@ -399,13 +399,6 @@
- if (_native_java_library == NULL) {
- vm_exit_during_initialization("Unable to load native library", ebuf);
- }
--
--#if defined(__OpenBSD__)
-- // Work-around OpenBSD's lack of $ORIGIN support by pre-loading libnet.so
-- // ignore errors
-- dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "net");
-- dll_load(buffer, ebuf, sizeof(ebuf));
--#endif
- }
- static jboolean onLoaded = JNI_FALSE;
- if (onLoaded) {
-@@ -1139,9 +1132,6 @@
- "%/lib/jce.jar:"
- "%/lib/charsets.jar:"
- "%/lib/jfr.jar:"
--#ifdef __APPLE__
-- "%/lib/JObjC.jar:"
--#endif
- "%/classes";
- 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-10-28 20:19:39.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
-@@ -30,6 +30,9 @@
- #include "runtime/extendedPC.hpp"
- #include "runtime/handles.hpp"
- #include "utilities/top.hpp"
-+#ifdef TARGET_OS_FAMILY_bsd
-+# include "jvm_bsd.h"
-+#endif
- #ifdef TARGET_OS_FAMILY_linux
- # include "jvm_linux.h"
- # include <setjmp.h>
-@@ -330,8 +333,8 @@
-
- static char* non_memory_address_word();
- // reserve, commit and pin the entire memory region
-- static char* reserve_memory_special(size_t size, char* addr = NULL,
-- bool executable = false);
-+ static char* reserve_memory_special(size_t size, size_t alignment,
-+ char* addr, bool executable);
- static bool release_memory_special(char* addr, size_t bytes);
- static void large_page_init();
- static size_t large_page_size();
-@@ -460,9 +463,6 @@
- // run cmd in a separate process and return its exit code; or -1 on failures
- static int fork_and_exec(char *cmd);
-
-- // Set file to send error reports.
-- static void set_error_file(const char *logfile);
--
- // os::exit() is merged with vm_exit()
- // static void exit(int num);
-
-@@ -755,8 +755,8 @@
- # include "os_windows.hpp"
- #endif
- #ifdef TARGET_OS_FAMILY_bsd
--# include "os_posix.hpp"
- # include "os_bsd.hpp"
-+# include "os_posix.hpp"
- #endif
- #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-07-15 21:48:36.000000000 -0700
-@@ -460,7 +460,7 @@
- // doesn't have a classloader.
- if ((current_class == NULL) ||
- (current_class == new_class) ||
-- (instanceKlass::cast(new_class)->is_public()) ||
-+ (Klass::cast(new_class)->is_public()) ||
- is_same_class_package(current_class, new_class)) {
- return true;
- }
---- ./hotspot/src/share/vm/runtime/sweeper.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/sweeper.cpp 2014-07-15 21:48:33.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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,7 @@
- #include "runtime/vm_operations.hpp"
- #include "trace/tracing.hpp"
- #include "utilities/events.hpp"
-+#include "utilities/ticks.inline.hpp"
- #include "utilities/xmlstream.hpp"
-
- #ifdef ASSERT
-@@ -148,12 +149,12 @@
-
- int NMethodSweeper::_number_of_flushes = 0; // Total of full traversals caused by full cache
- int NMethodSweeper::_total_nof_methods_reclaimed = 0;
--jlong NMethodSweeper::_total_time_sweeping = 0;
--jlong NMethodSweeper::_total_time_this_sweep = 0;
--jlong NMethodSweeper::_peak_sweep_time = 0;
--jlong NMethodSweeper::_peak_sweep_fraction_time = 0;
--jlong NMethodSweeper::_total_disconnect_time = 0;
--jlong NMethodSweeper::_peak_disconnect_time = 0;
-+Tickspan NMethodSweeper::_total_time_sweeping;
-+Tickspan NMethodSweeper::_total_time_this_sweep;
-+Tickspan NMethodSweeper::_peak_sweep_time;
-+Tickspan NMethodSweeper::_peak_sweep_fraction_time;
-+Tickspan NMethodSweeper::_total_disconnect_time;
-+Tickspan NMethodSweeper::_peak_disconnect_time;
-
- class MarkActivationClosure: public CodeBlobClosure {
- public:
-@@ -192,7 +193,7 @@
- _invocations = NmethodSweepFraction;
- _current = CodeCache::first_nmethod();
- _traversals += 1;
-- _total_time_this_sweep = 0;
-+ _total_time_this_sweep = Tickspan();
-
- if (PrintMethodFlushing) {
- tty->print_cr("### Sweep: stack traversal %d", _traversals);
-@@ -256,8 +257,7 @@
- }
-
- void NMethodSweeper::sweep_code_cache() {
--
-- jlong sweep_start_counter = os::elapsed_counter();
-+ Ticks sweep_start_counter = Ticks::now();
-
- _flushed_count = 0;
- _zombified_count = 0;
-@@ -322,8 +322,8 @@
- }
- }
-
-- jlong sweep_end_counter = os::elapsed_counter();
-- jlong sweep_time = sweep_end_counter - sweep_start_counter;
-+ const Ticks sweep_end_counter = Ticks::now();
-+ const Tickspan sweep_time = sweep_end_counter - sweep_start_counter;
- _total_time_sweeping += sweep_time;
- _total_time_this_sweep += sweep_time;
- _peak_sweep_fraction_time = MAX2(sweep_time, _peak_sweep_fraction_time);
-@@ -344,7 +344,7 @@
-
- #ifdef ASSERT
- if(PrintMethodFlushing) {
-- tty->print_cr("### sweeper: sweep time(%d): " INT64_FORMAT, _invocations, (jlong)sweep_time);
-+ tty->print_cr("### sweeper: sweep time(%d): " INT64_FORMAT, _invocations, (jlong)sweep_time.value());
- }
- #endif
-
-@@ -529,7 +529,7 @@
- }
- }
-
-- jlong disconnect_start_counter = os::elapsed_counter();
-+ Ticks disconnect_start_counter = Ticks::now();
-
- // Traverse the code cache trying to dump the oldest nmethods
- uint curr_max_comp_id = CompileBroker::get_compilation_id();
-@@ -577,8 +577,8 @@
- CompileBroker::set_should_compile_new_jobs(CompileBroker::stop_compilation);
- }
-
-- jlong disconnect_end_counter = os::elapsed_counter();
-- jlong disconnect_time = disconnect_end_counter - disconnect_start_counter;
-+ const Ticks disconnect_end_counter = Ticks::now();
-+ const Tickspan disconnect_time = disconnect_end_counter - disconnect_start_counter;
- _total_disconnect_time += disconnect_time;
- _peak_disconnect_time = MAX2(disconnect_time, _peak_disconnect_time);
-
-@@ -597,7 +597,7 @@
- #ifdef ASSERT
-
- if(PrintMethodFlushing && Verbose) {
-- tty->print_cr("### sweeper: unload time: " INT64_FORMAT, (jlong)disconnect_time);
-+ tty->print_cr("### sweeper: unload time: " INT64_FORMAT, (jlong)disconnect_time.value());
- }
- #endif
- }
---- ./hotspot/src/share/vm/runtime/sweeper.hpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/sweeper.hpp 2014-07-15 21:48:33.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
-@@ -25,6 +25,7 @@
- #ifndef SHARE_VM_RUNTIME_SWEEPER_HPP
- #define SHARE_VM_RUNTIME_SWEEPER_HPP
-
-+#include "utilities/ticks.hpp"
- // An NmethodSweeper is an incremental cleaner for:
- // - cleanup inline caches
- // - reclamation of unreferences zombie nmethods
-@@ -56,12 +57,12 @@
- // Stat counters
- static int _number_of_flushes; // Total of full traversals caused by full cache
- static int _total_nof_methods_reclaimed; // Accumulated nof methods flushed
-- static jlong _total_time_sweeping; // Accumulated time sweeping
-- static jlong _total_time_this_sweep; // Total time this sweep
-- static jlong _peak_sweep_time; // Peak time for a full sweep
-- static jlong _peak_sweep_fraction_time; // Peak time sweeping one fraction
-- static jlong _total_disconnect_time; // Total time cleaning code mem
-- static jlong _peak_disconnect_time; // Peak time cleaning code mem
-+ static Tickspan _total_time_sweeping; // Accumulated time sweeping
-+ static Tickspan _total_time_this_sweep; // Total time this sweep
-+ static Tickspan _peak_sweep_time; // Peak time for a full sweep
-+ static Tickspan _peak_sweep_fraction_time; // Peak time sweeping one fraction
-+ static Tickspan _total_disconnect_time; // Total time cleaning code mem
-+ static Tickspan _peak_disconnect_time; // Peak time cleaning code mem
-
- static void process_nmethod(nmethod *nm);
-
-@@ -71,13 +72,14 @@
- static long traversal_count() { return _traversals; }
- static int number_of_flushes() { return _number_of_flushes; }
- static int total_nof_methods_reclaimed() { return _total_nof_methods_reclaimed; }
-- static jlong total_time_sweeping() { return _total_time_sweeping; }
-- static jlong peak_sweep_time() { return _peak_sweep_time; }
-- static jlong peak_sweep_fraction_time() { return _peak_sweep_fraction_time; }
-- static jlong total_disconnect_time() { return _total_disconnect_time; }
-- static jlong peak_disconnect_time() { return _peak_disconnect_time; }
-+ static const Tickspan total_time_sweeping() { return _total_time_sweeping; }
-+ static const Tickspan peak_sweep_time() { return _peak_sweep_time; }
-+ static const Tickspan peak_sweep_fraction_time() { return _peak_sweep_fraction_time; }
-+ static const Tickspan total_disconnect_time() { return _total_disconnect_time; }
-+ static const Tickspan peak_disconnect_time() { return _peak_disconnect_time; }
-
- #ifdef ASSERT
-+ static bool is_sweeping(nmethod* which) { return _current == which; }
- // Keep track of sweeper activity in the ring buffer
- static void record_sweep(nmethod* nm, int line);
- static void report_events(int id, address entry);
---- ./hotspot/src/share/vm/runtime/thread.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/thread.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -3416,9 +3416,10 @@
- }
-
- assert (Universe::is_fully_initialized(), "not initialized");
-- if (VerifyBeforeGC && VerifyGCStartAt == 0) {
-- Universe::heap()->prepare_for_verify();
-- Universe::verify(); // make sure we're starting with a clean slate
-+ if (VerifyDuringStartup) {
-+ // Make sure we're starting with a clean slate.
-+ VM_Verify verify_op;
-+ VMThread::execute(&verify_op);
- }
-
- EXCEPTION_MARK;
-@@ -3504,11 +3505,12 @@
- java_lang_Thread::set_thread_status(thread_object,
- java_lang_Thread::RUNNABLE);
-
-- // The VM preresolve methods to these classes. Make sure that get initialized
-- initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0);
-- initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0);
- // The VM creates & returns objects of this class. Make sure it's initialized.
- initialize_class(vmSymbols::java_lang_Class(), CHECK_0);
-+
-+ // The VM preresolves methods to these classes. Make sure that they get initialized
-+ initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0);
-+ initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0);
- call_initializeSystemClass(CHECK_0);
-
- // get the Java runtime name after java.lang.System is initialized
---- ./hotspot/src/share/vm/runtime/virtualspace.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -42,8 +42,19 @@
-
-
- // ReservedSpace
-+
-+// Dummy constructor
-+ReservedSpace::ReservedSpace() : _base(NULL), _size(0), _noaccess_prefix(0),
-+ _alignment(0), _special(false), _executable(false) {
-+}
-+
- ReservedSpace::ReservedSpace(size_t size) {
-- initialize(size, 0, false, NULL, 0, false);
-+ size_t page_size = os::page_size_for_region(size, size, 1);
-+ bool large_pages = page_size != (size_t)os::vm_page_size();
-+ // Don't force the alignment to be large page aligned,
-+ // since that will waste memory.
-+ size_t alignment = os::vm_allocation_granularity();
-+ initialize(size, alignment, large_pages, NULL, 0, false);
- }
-
- ReservedSpace::ReservedSpace(size_t size, size_t alignment,
-@@ -323,16 +334,18 @@
-
- if (special) {
-
-- base = os::reserve_memory_special(size, requested_address, executable);
-+ base = os::reserve_memory_special(size, alignment, requested_address, executable);
-
- if (base != NULL) {
- if (failed_to_reserve_as_requested(base, requested_address, size, true)) {
- // OS ignored requested address. Try different address.
- return;
- }
-- // Check alignment constraints
-+ // Check alignment constraints.
- assert((uintptr_t) base % alignment == 0,
-- "Large pages returned a non-aligned address");
-+ err_msg("Large pages returned a non-aligned address, base: "
-+ PTR_FORMAT " alignment: " PTR_FORMAT,
-+ base, (void*)(uintptr_t)alignment));
- _special = true;
- } else {
- // failed; try to reserve regular memory below
-@@ -928,4 +941,188 @@
- tty->print_cr(" - [low_b, high_b]: [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", low_boundary(), high_boundary());
- }
-
-+
-+/////////////// Unit tests ///////////////
-+
-+#ifndef PRODUCT
-+
-+#define test_log(...) \
-+ do {\
-+ if (VerboseInternalVMTests) { \
-+ tty->print_cr(__VA_ARGS__); \
-+ tty->flush(); \
-+ }\
-+ } while (false)
-+
-+class TestReservedSpace : AllStatic {
-+ public:
-+ static void small_page_write(void* addr, size_t size) {
-+ size_t page_size = os::vm_page_size();
-+
-+ char* end = (char*)addr + size;
-+ for (char* p = (char*)addr; p < end; p += page_size) {
-+ *p = 1;
-+ }
-+ }
-+
-+ static void release_memory_for_test(ReservedSpace rs) {
-+ if (rs.special()) {
-+ guarantee(os::release_memory_special(rs.base(), rs.size()), "Shouldn't fail");
-+ } else {
-+ guarantee(os::release_memory(rs.base(), rs.size()), "Shouldn't fail");
-+ }
-+ }
-+
-+ static void test_reserved_space1(size_t size, size_t alignment) {
-+ test_log("test_reserved_space1(%p)", (void*) (uintptr_t) size);
-+
-+ assert(is_size_aligned(size, alignment), "Incorrect input parameters");
-+
-+ ReservedSpace rs(size, // size
-+ alignment, // alignment
-+ UseLargePages, // large
-+ NULL, // requested_address
-+ 0); // noacces_prefix
-+
-+ test_log(" rs.special() == %d", rs.special());
-+
-+ assert(rs.base() != NULL, "Must be");
-+ assert(rs.size() == size, "Must be");
-+
-+ assert(is_ptr_aligned(rs.base(), alignment), "aligned sizes should always give aligned addresses");
-+ assert(is_size_aligned(rs.size(), alignment), "aligned sizes should always give aligned addresses");
-+
-+ if (rs.special()) {
-+ small_page_write(rs.base(), size);
-+ }
-+
-+ release_memory_for_test(rs);
-+ }
-+
-+ static void test_reserved_space2(size_t size) {
-+ test_log("test_reserved_space2(%p)", (void*)(uintptr_t)size);
-+
-+ assert(is_size_aligned(size, os::vm_allocation_granularity()), "Must be at least AG aligned");
-+
-+ ReservedSpace rs(size);
-+
-+ test_log(" rs.special() == %d", rs.special());
-+
-+ assert(rs.base() != NULL, "Must be");
-+ assert(rs.size() == size, "Must be");
-+
-+ if (rs.special()) {
-+ small_page_write(rs.base(), size);
-+ }
-+
-+ release_memory_for_test(rs);
-+ }
-+
-+ static void test_reserved_space3(size_t size, size_t alignment, bool maybe_large) {
-+ test_log("test_reserved_space3(%p, %p, %d)",
-+ (void*)(uintptr_t)size, (void*)(uintptr_t)alignment, maybe_large);
-+
-+ assert(is_size_aligned(size, os::vm_allocation_granularity()), "Must be at least AG aligned");
-+ assert(is_size_aligned(size, alignment), "Must be at least aligned against alignment");
-+
-+ bool large = maybe_large && UseLargePages && size >= os::large_page_size();
-+
-+ ReservedSpace rs(size, alignment, large, false);
-+
-+ test_log(" rs.special() == %d", rs.special());
-+
-+ assert(rs.base() != NULL, "Must be");
-+ assert(rs.size() == size, "Must be");
-+
-+ if (rs.special()) {
-+ small_page_write(rs.base(), size);
-+ }
-+
-+ release_memory_for_test(rs);
-+ }
-+
-+
-+ static void test_reserved_space1() {
-+ size_t size = 2 * 1024 * 1024;
-+ size_t ag = os::vm_allocation_granularity();
-+
-+ test_reserved_space1(size, ag);
-+ test_reserved_space1(size * 2, ag);
-+ test_reserved_space1(size * 10, ag);
-+ }
-+
-+ static void test_reserved_space2() {
-+ size_t size = 2 * 1024 * 1024;
-+ size_t ag = os::vm_allocation_granularity();
-+
-+ test_reserved_space2(size * 1);
-+ test_reserved_space2(size * 2);
-+ test_reserved_space2(size * 10);
-+ test_reserved_space2(ag);
-+ test_reserved_space2(size - ag);
-+ test_reserved_space2(size);
-+ test_reserved_space2(size + ag);
-+ test_reserved_space2(size * 2);
-+ test_reserved_space2(size * 2 - ag);
-+ test_reserved_space2(size * 2 + ag);
-+ test_reserved_space2(size * 3);
-+ test_reserved_space2(size * 3 - ag);
-+ test_reserved_space2(size * 3 + ag);
-+ test_reserved_space2(size * 10);
-+ test_reserved_space2(size * 10 + size / 2);
-+ }
-+
-+ static void test_reserved_space3() {
-+ size_t ag = os::vm_allocation_granularity();
-+
-+ test_reserved_space3(ag, ag , false);
-+ test_reserved_space3(ag * 2, ag , false);
-+ test_reserved_space3(ag * 3, ag , false);
-+ test_reserved_space3(ag * 2, ag * 2, false);
-+ test_reserved_space3(ag * 4, ag * 2, false);
-+ test_reserved_space3(ag * 8, ag * 2, false);
-+ test_reserved_space3(ag * 4, ag * 4, false);
-+ test_reserved_space3(ag * 8, ag * 4, false);
-+ test_reserved_space3(ag * 16, ag * 4, false);
-+
-+ if (UseLargePages) {
-+ size_t lp = os::large_page_size();
-+
-+ // Without large pages
-+ test_reserved_space3(lp, ag * 4, false);
-+ test_reserved_space3(lp * 2, ag * 4, false);
-+ test_reserved_space3(lp * 4, ag * 4, false);
-+ test_reserved_space3(lp, lp , false);
-+ test_reserved_space3(lp * 2, lp , false);
-+ test_reserved_space3(lp * 3, lp , false);
-+ test_reserved_space3(lp * 2, lp * 2, false);
-+ test_reserved_space3(lp * 4, lp * 2, false);
-+ test_reserved_space3(lp * 8, lp * 2, false);
-+
-+ // With large pages
-+ test_reserved_space3(lp, ag * 4 , true);
-+ test_reserved_space3(lp * 2, ag * 4, true);
-+ test_reserved_space3(lp * 4, ag * 4, true);
-+ test_reserved_space3(lp, lp , true);
-+ test_reserved_space3(lp * 2, lp , true);
-+ test_reserved_space3(lp * 3, lp , true);
-+ test_reserved_space3(lp * 2, lp * 2, true);
-+ test_reserved_space3(lp * 4, lp * 2, true);
-+ test_reserved_space3(lp * 8, lp * 2, true);
-+ }
-+ }
-+
-+ static void test_reserved_space() {
-+ test_reserved_space1();
-+ test_reserved_space2();
-+ test_reserved_space3();
-+ }
-+};
-+
-+void TestReservedSpace_test() {
-+ TestReservedSpace::test_reserved_space();
-+}
-+
-+#endif // PRODUCT
-+
- #endif
---- ./hotspot/src/share/vm/runtime/virtualspace.hpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/virtualspace.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -90,6 +90,7 @@
-
- public:
- // Constructor
-+ ReservedSpace();
- ReservedSpace(size_t size);
- ReservedSpace(size_t size, size_t alignment, bool large,
- char* requested_address = NULL,
---- ./hotspot/src/share/vm/runtime/vmThread.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/vmThread.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -305,7 +305,7 @@
- os::check_heap();
- // Silent verification so as not to pollute normal output,
- // unless we really asked for it.
-- Universe::verify(!(PrintGCDetails || Verbose));
-+ Universe::verify(!(PrintGCDetails || Verbose) || VerifySilently);
- }
-
- CompileBroker::set_should_block();
-@@ -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.
- // This is because the caller thread could have exited already.
-- event.set_caller(is_concurrent ? 0 : op->calling_thread()->osthread()->thread_id());
-+ event.set_caller(is_concurrent ? 0 : (uint64_t) op->calling_thread()->osthread()->thread_id());
- event.commit();
- }
-
---- ./hotspot/src/share/vm/runtime/vm_operations.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/vm_operations.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -189,7 +189,8 @@
- }
-
- void VM_Verify::doit() {
-- Universe::verify();
-+ Universe::heap()->prepare_for_verify();
-+ Universe::verify(_silent);
- }
-
- bool VM_PrintThreads::doit_prologue() {
---- ./hotspot/src/share/vm/runtime/vm_operations.hpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/vm_operations.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -303,9 +303,9 @@
-
- class VM_Verify: public VM_Operation {
- private:
-- KlassHandle _dependee;
-+ bool _silent;
- public:
-- VM_Verify() {}
-+ VM_Verify(bool silent = VerifySilently) : _silent(silent) {}
- VMOp_Type type() const { return VMOp_Verify; }
- void doit();
- };
---- ./hotspot/src/share/vm/services/attachListener.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/services/attachListener.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -282,6 +282,20 @@
- return JNI_ERR;
- }
- }
-+
-+ if (strncmp(name, "MaxHeapFreeRatio", 17) == 0) {
-+ FormatBuffer<80> err_msg("");
-+ if (!Arguments::verify_MaxHeapFreeRatio(err_msg, value)) {
-+ out->print_cr(err_msg.buffer());
-+ return JNI_ERR;
-+ }
-+ } else if (strncmp(name, "MinHeapFreeRatio", 17) == 0) {
-+ FormatBuffer<80> err_msg("");
-+ if (!Arguments::verify_MinHeapFreeRatio(err_msg, value)) {
-+ out->print_cr(err_msg.buffer());
-+ return JNI_ERR;
-+ }
-+ }
- bool res = CommandLineFlags::uintxAtPut((char*)name, &value, ATTACH_ON_DEMAND);
- if (! res) {
- out->print_cr("setting flag %s failed", name);
-@@ -470,7 +484,17 @@
- vmSymbols::threadgroup_string_void_signature(),
- thread_group,
- string,
-- CHECK);
-+ THREAD);
-+
-+ if (HAS_PENDING_EXCEPTION) {
-+ tty->print_cr("Exception in VM (AttachListener::init) : ");
-+ java_lang_Throwable::print(PENDING_EXCEPTION, tty);
-+ tty->cr();
-+
-+ CLEAR_PENDING_EXCEPTION;
-+
-+ return;
-+ }
-
- KlassHandle group(THREAD, SystemDictionary::ThreadGroup_klass());
- JavaCalls::call_special(&result,
-@@ -479,7 +503,17 @@
- vmSymbols::add_method_name(),
- vmSymbols::thread_void_signature(),
- thread_oop, // ARG 1
-- CHECK);
-+ THREAD);
-+
-+ if (HAS_PENDING_EXCEPTION) {
-+ tty->print_cr("Exception in VM (AttachListener::init) : ");
-+ java_lang_Throwable::print(PENDING_EXCEPTION, tty);
-+ tty->cr();
-+
-+ CLEAR_PENDING_EXCEPTION;
-+
-+ return;
-+ }
-
- { MutexLocker mu(Threads_lock);
- JavaThread* listener_thread = new JavaThread(&attach_listener_thread_entry);
---- ./hotspot/src/share/vm/services/gcNotifier.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/services/gcNotifier.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2011, 2012, 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
-@@ -209,11 +209,11 @@
- GCNotificationRequest *request = getRequest();
- if (request != NULL) {
- NotificationMark nm(request);
-- Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, THREAD);
-+ Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, CHECK);
-
-- Handle objName = java_lang_String::create_from_platform_dependent_str(request->gcManager->name(), CHECK);
-- Handle objAction = java_lang_String::create_from_platform_dependent_str(request->gcAction, CHECK);
-- Handle objCause = java_lang_String::create_from_platform_dependent_str(request->gcCause, CHECK);
-+ Handle objName = java_lang_String::create_from_str(request->gcManager->name(), CHECK);
-+ Handle objAction = java_lang_String::create_from_str(request->gcAction, CHECK);
-+ Handle objCause = java_lang_String::create_from_str(request->gcCause, CHECK);
-
- klassOop k = Management::sun_management_GarbageCollectorImpl_klass(CHECK);
- instanceKlassHandle gc_mbean_klass(THREAD, k);
---- ./hotspot/src/share/vm/services/management.cpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/services/management.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -851,8 +851,6 @@
- total_used += u.used();
- total_committed += u.committed();
-
-- // if any one of the memory pool has undefined init_size or max_size,
-- // set it to -1
- if (u.init_size() == (size_t)-1) {
- has_undefined_init_size = true;
- }
-@@ -869,6 +867,15 @@
- }
- }
-
-+ // if any one of the memory pool has undefined init_size or max_size,
-+ // set it to -1
-+ if (has_undefined_init_size) {
-+ total_init = (size_t)-1;
-+ }
-+ if (has_undefined_max_size) {
-+ total_max = (size_t)-1;
-+ }
-+
- // In our current implementation, we make sure that all non-heap
- // pools have defined init and max sizes. Heap pools do not matter,
- // as we never use total_init and total_max for them.
-@@ -1793,6 +1800,18 @@
- succeed = CommandLineFlags::intxAtPut(name, &ivalue, MANAGEMENT);
- } else if (flag->is_uintx()) {
- uintx uvalue = (uintx)new_value.j;
-+
-+ if (strncmp(name, "MaxHeapFreeRatio", 17) == 0) {
-+ FormatBuffer<80> err_msg("");
-+ if (!Arguments::verify_MaxHeapFreeRatio(err_msg, uvalue)) {
-+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), err_msg.buffer());
-+ }
-+ } else if (strncmp(name, "MinHeapFreeRatio", 17) == 0) {
-+ FormatBuffer<80> err_msg("");
-+ if (!Arguments::verify_MinHeapFreeRatio(err_msg, uvalue)) {
-+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), err_msg.buffer());
-+ }
-+ }
- succeed = CommandLineFlags::uintxAtPut(name, &uvalue, MANAGEMENT);
- } else if (flag->is_uint64_t()) {
- uint64_t uvalue = (uint64_t)new_value.j;
---- ./hotspot/src/share/vm/services/memTracker.hpp 2013-09-06 11:22:16.000000000 -0700
-+++ ./hotspot/src/share/vm/services/memTracker.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -302,6 +302,13 @@
- }
- }
-
-+ static inline void record_virtual_memory_release(address addr, size_t size,
-+ Thread* thread = NULL) {
-+ if (is_on()) {
-+ Tracker tkr(Tracker::Release, thread);
-+ tkr.record(addr, size);
-+ }
-+ }
-
- // record memory type on virtual memory base address
- static inline void record_virtual_memory_type(address base, MEMFLAGS flags,
---- ./hotspot/src/share/vm/trace/noTraceBackend.hpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/noTraceBackend.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -25,9 +25,7 @@
- #define SHARE_VM_TRACE_NOTRACEBACKEND_HPP
-
- #include "prims/jni.h"
--
--typedef jlong TracingTime;
--typedef jlong RelativeTracingTime;
-+#include "trace/traceTime.hpp"
-
- class NoTraceBackend {
- public:
-@@ -44,5 +42,3 @@
- typedef NoTraceBackend Tracing;
-
- #endif
--
--
---- ./hotspot/src/share/vm/trace/trace.xml 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/trace.xml 2014-07-15 21:48:34.000000000 -0700
-@@ -169,8 +169,8 @@
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID" />
- <value type="GCNAME" field="name" label="Name" description="The name of the Garbage Collector" />
- <value type="GCCAUSE" field="cause" label="Cause" description="The reason for triggering this Garbage Collection" />
-- <value type="RELATIVE_TICKS" field="sumOfPauses" label="Sum of Pauses" description="Sum of all the times in which Java execution was paused during the garbage collection" />
-- <value type="RELATIVE_TICKS" field="longestPause" label="Longest Pause" description="Longest individual pause during the garbage collection" />
-+ <value type="TICKSPAN" field="sumOfPauses" label="Sum of Pauses" description="Sum of all the times in which Java execution was paused during the garbage collection" />
-+ <value type="TICKSPAN" field="longestPause" label="Longest Pause" description="Longest individual pause during the garbage collection" />
- </event>
-
- <event id="GCParallelOld" path="vm/gc/collector/parold_garbage_collection" label="Parallel Old Garbage Collection"
---- ./hotspot/src/share/vm/trace/traceBackend.hpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/traceBackend.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -26,10 +26,11 @@
-
- #if INCLUDE_TRACE
-
--#include "trace/traceTime.hpp"
--#include "tracefiles/traceEventIds.hpp"
- #include "runtime/globals.hpp"
- #include "runtime/os.hpp"
-+#include "trace/traceTime.hpp"
-+#include "tracefiles/traceEventIds.hpp"
-+
-
- class TraceBackend {
- public:
-@@ -44,10 +45,6 @@
- return os::elapsed_counter();
- }
-
-- static TracingTime time_adjustment(jlong time) {
-- return time;
-- }
--
- static void on_unloading_classes(BoolObjectClosure* is_alive, int no_of_classes_unloading) {
- }
- };
---- ./hotspot/src/share/vm/trace/traceEvent.hpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/traceEvent.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 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,13 +36,10 @@
- #include "trace/tracing.hpp"
- #include "tracefiles/traceEventIds.hpp"
- #include "tracefiles/traceTypes.hpp"
-+#include "utilities/ticks.hpp"
-
- template<typename T>
- class TraceEvent : public StackObj {
-- protected:
-- jlong _startTime;
-- jlong _endTime;
--
- private:
- bool _started;
- #ifdef ASSERT
-@@ -52,6 +49,18 @@
- bool _ignore_check;
- #endif
-
-+ protected:
-+ jlong _startTime;
-+ jlong _endTime;
-+
-+ void set_starttime(const TracingTime& time) {
-+ _startTime = time;
-+ }
-+
-+ void set_endtime(const TracingTime& time) {
-+ _endTime = time;
-+ }
-+
- public:
- TraceEvent(EventStartTime timing=TIMED) :
- _startTime(0),
-@@ -90,7 +99,7 @@
- return;
- }
- if (_endTime == 0) {
-- static_cast<T *>(this)->set_endtime(Tracing::time());
-+ static_cast<T*>(this)->set_endtime(Tracing::time());
- }
- if (static_cast<T*>(this)->should_write()) {
- static_cast<T*>(this)->writeEvent();
-@@ -98,12 +107,12 @@
- set_commited();
- }
-
-- void set_starttime(jlong time) {
-- _startTime = time;
-+ void set_starttime(const Ticks& time) {
-+ _startTime = time.value();
- }
-
-- void set_endtime(jlong time) {
-- _endTime = time;
-+ void set_endtime(const Ticks& time) {
-+ _endTime = time.value();
- }
-
- TraceEventId id() const {
---- ./hotspot/src/share/vm/trace/traceEventClasses.xsl 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/traceEventClasses.xsl 2014-07-15 21:48:34.000000000 -0700
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <!--
-- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ Copyright (c) 2012, 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
-@@ -23,8 +23,8 @@
- -->
-
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
--<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
- <xsl:import href="xsl_util.xsl"/>
-+<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
-
- <xsl:template match="/">
- <xsl:call-template name="file-header"/>
-@@ -40,6 +40,7 @@
- #include "runtime/handles.inline.hpp"
- #include "tracefiles/traceTypes.hpp"
- #include "trace/traceEvent.hpp"
-+#include "utilities/ticks.hpp"
-
- #if INCLUDE_TRACE
-
-@@ -54,8 +55,8 @@
- class TraceEvent {
- public:
- TraceEvent() {}
-- void set_starttime(jlong time) const {}
-- void set_endtime(jlong time) const {}
-+ void set_starttime(const Ticks&amp; time) {}
-+ void set_endtime(const Ticks&amp; time) {}
- bool should_commit() const { return false; }
- void commit() const {}
- };
-@@ -174,20 +175,21 @@
-
- <xsl:template match="value[@type='TICKS']" mode="write-setters">
- #if INCLUDE_TRACE
-- <xsl:value-of select="concat('void set_', @field, '(jlong time) { _', @field, ' = time; }')"/>
-+<xsl:value-of select="concat(' void set_', @field, '(const Ticks&amp; time) { _', @field, ' = time; }')"/>
- #else
-- <xsl:value-of select="concat('void set_', @field, '(jlong ignore) {}')"/>
-+<xsl:value-of select="concat(' void set_', @field, '(const Ticks&amp; ignore) {}')"/>
- #endif
- </xsl:template>
-
--<xsl:template match="value[@type='RELATIVE_TICKS']" mode="write-setters">
-+<xsl:template match="value[@type='TICKSPAN']" mode="write-setters">
- #if INCLUDE_TRACE
-- <xsl:value-of select="concat('void set_', @field, '(jlong time) { _', @field, ' = time; }')"/>
-+ <xsl:value-of select="concat(' void set_', @field, '(const Tickspan&amp; time) { _', @field, ' = time; }')"/>
- #else
-- <xsl:value-of select="concat('void set_', @field, '(jlong ignore) {}')"/>
-+ <xsl:value-of select="concat(' void set_', @field, '(const Tickspan&amp; ignore) {}')"/>
- #endif
- </xsl:template>
-
-+
- <xsl:template match="value" mode="write-fields">
- <xsl:variable name="type" select="@type"/>
- <xsl:variable name="wt" select="//primary_type[@symbol=$type]/@type"/>
-@@ -227,7 +229,17 @@
- <xsl:template match="value" mode="write-data">
- <xsl:variable name="type" select="@type"/>
- <xsl:variable name="wt" select="//primary_type[@symbol=$type]/@writetype"/>
-- <xsl:value-of select="concat(' ts.print_val(&quot;', @label, '&quot;, _', @field, ');')"/>
-+ <xsl:choose>
-+ <xsl:when test="@type='TICKSPAN'">
-+ <xsl:value-of select="concat(' ts.print_val(&quot;', @label, '&quot;, _', @field, '.value());')"/>
-+ </xsl:when>
-+ <xsl:when test="@type='TICKS'">
-+ <xsl:value-of select="concat(' ts.print_val(&quot;', @label, '&quot;, _', @field, '.value());')"/>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <xsl:value-of select="concat(' ts.print_val(&quot;', @label, '&quot;, _', @field, ');')"/>
-+ </xsl:otherwise>
-+ </xsl:choose>
- <xsl:if test="position() != last()">
- <xsl:text>
- ts.print(", ");
---- ./hotspot/src/share/vm/trace/traceEventIds.xsl 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/traceEventIds.xsl 2014-07-15 21:48:34.000000000 -0700
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <!--
-- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ Copyright (c) 2012, 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
-@@ -23,8 +23,8 @@
- -->
-
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
--<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
- <xsl:import href="xsl_util.xsl"/>
-+<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
-
- <xsl:template match="/">
- <xsl:call-template name="file-header"/>
---- ./hotspot/src/share/vm/trace/traceMacros.hpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/traceMacros.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 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
---- ./hotspot/src/share/vm/trace/traceTime.hpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/traceTime.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 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
-@@ -28,6 +28,5 @@
- #include "prims/jni.h"
-
- typedef jlong TracingTime;
--typedef jlong RelativeTracingTime;
-
--#endif
-+#endif // SHARE_VM_TRACE_TRACETIME_HPP
---- ./hotspot/src/share/vm/trace/traceTypes.xsl 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/traceTypes.xsl 2014-07-15 21:48:34.000000000 -0700
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <!--
-- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ Copyright (c) 2012, 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
-@@ -23,8 +23,8 @@
- -->
-
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
--<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
- <xsl:import href="xsl_util.xsl"/>
-+<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
-
- <xsl:template match="/">
- <xsl:call-template name="file-header"/>
-@@ -32,11 +32,13 @@
- #ifndef TRACEFILES_JFRTYPES_HPP
- #define TRACEFILES_JFRTYPES_HPP
-
--#include "trace/traceDataTypes.hpp"
--#include "utilities/globalDefinitions.hpp"
--#include "oops/symbol.hpp"
-+
- #include "oops/klassOop.hpp"
- #include "oops/methodOop.hpp"
-+#include "oops/symbol.hpp"
-+#include "trace/traceDataTypes.hpp"
-+#include "utilities/globalDefinitions.hpp"
-+#include "utilities/ticks.hpp"
-
- enum JVMContentType {
- _not_a_content_type = (JVM_CONTENT_TYPES_START - 1),
---- ./hotspot/src/share/vm/trace/tracetypes.xml 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/tracetypes.xml 2014-10-28 20:19:39.000000000 -0700
-@@ -60,7 +60,7 @@
- <types>
- <content_types>
- <content_type id="Thread" hr_name="Thread"
-- type="U4" builtin_type="OSTHREAD">
-+ type="thread_id_t" builtin_type="OSTHREAD">
- <value type="UTF8" field="name" label="Thread name"/>
- </content_type>
-
-@@ -249,13 +249,13 @@
- <primary_type symbol="NANOS" datatype="LONG" contenttype="NANOS"
- type="s8" sizeop="sizeof(s8)"/>
-
-- <!-- 64-bit signed integer, SEMANTIC value ABSOLUTE TICKS -->
-+ <!-- 64-bit signed integer, SEMANTIC value TICKS -->
- <primary_type symbol="TICKS" datatype="LONG" contenttype="TICKS"
-- type="s8" sizeop="sizeof(s8)"/>
-+ type="Ticks" sizeop="sizeof(s8)"/>
-
-- <!-- 64-bit signed integer, SEMANTIC value RELATIVE TICKS -->
-- <primary_type symbol="RELATIVE_TICKS" datatype="LONG" contenttype="TICKS"
-- type="s8" sizeop="sizeof(s8)"/>
-+ <!-- 64-bit signed integer, SEMANTIC value TICKS duration -->
-+ <primary_type symbol="TICKSPAN" datatype="LONG" contenttype="TICKS"
-+ type="Tickspan" sizeop="sizeof(s8)"/>
-
- <!-- 64-bit unsigned integer, SEMANTIC value ADDRESS (mem loc) -->
- <primary_type symbol="ADDRESS" datatype="U8" contenttype="ADDRESS"
-@@ -294,8 +294,8 @@
- type="u8" sizeop="sizeof(u8)"/>
-
- <!-- OS Thread ID -->
-- <primary_type symbol="OSTHREAD" datatype="U4" contenttype="OSTHREAD"
-- type="u4" sizeop="sizeof(u4)"/>
-+ <primary_type symbol="OSTHREAD" datatype="U8" contenttype="OSTHREAD"
-+ type="u8" sizeop="sizeof(u8)"/>
-
- <!-- VM Thread ID Note: changed from U2 to U8 for hotspot -->
- <primary_type symbol="VMTHREAD" datatype="U8" contenttype="VMTHREAD"
---- ./hotspot/src/share/vm/trace/tracing.hpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/trace/tracing.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 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
---- ./hotspot/src/share/vm/utilities/events.cpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/events.cpp 2014-07-15 21:54:40.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
-@@ -93,7 +93,7 @@
- va_start(ap, format);
- // Save a copy of begin message and log it.
- _buffer.printv(format, ap);
-- Events::log(NULL, _buffer);
-+ Events::log(NULL, "%s", (const char*)_buffer);
- va_end(ap);
- }
- }
-@@ -102,6 +102,6 @@
- if (LogEvents) {
- // Append " done" to the begin message and log it
- _buffer.append(" done");
-- Events::log(NULL, _buffer);
-+ Events::log(NULL, "%s", (const char*)_buffer);
- }
- }
---- ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2014-10-28 20:19:39.000000000 -0700
-@@ -373,6 +373,14 @@
-
- #define align_size_up_(size, alignment) (((size) + ((alignment) - 1)) & ~((alignment) - 1))
-
-+inline bool is_size_aligned(size_t size, size_t alignment) {
-+ return align_size_up_(size, alignment) == size;
-+}
-+
-+inline bool is_ptr_aligned(void* ptr, size_t alignment) {
-+ return align_size_up_((intptr_t)ptr, (intptr_t)alignment) == (intptr_t)ptr;
-+}
-+
- inline intptr_t align_size_up(intptr_t size, intptr_t alignment) {
- return align_size_up_(size, alignment);
- }
-@@ -383,6 +391,14 @@
- return align_size_down_(size, alignment);
- }
-
-+inline void* align_ptr_up(void* ptr, size_t alignment) {
-+ return (void*)align_size_up((intptr_t)ptr, (intptr_t)alignment);
-+}
-+
-+inline void* align_ptr_down(void* ptr, size_t alignment) {
-+ return (void*)align_size_down((intptr_t)ptr, (intptr_t)alignment);
-+}
-+
- // Align objects by rounding up their size, in HeapWord units.
-
- #define align_object_size_(size) align_size_up_(size, MinObjAlignment)
---- ./hotspot/src/share/vm/utilities/growableArray.hpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/growableArray.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -194,6 +194,7 @@
-
- void clear() { _len = 0; }
- int length() const { return _len; }
-+ int max_length() const { return _max; }
- void trunc_to(int l) { assert(l <= _len,"cannot increase length"); _len = l; }
- bool is_empty() const { return _len == 0; }
- bool is_nonempty() const { return _len != 0; }
-@@ -281,6 +282,13 @@
- return -1;
- }
-
-+ int find_from_end(const E& elem) const {
-+ for (int i = _len-1; i >= 0; i--) {
-+ if (_data[i] == elem) return i;
-+ }
-+ return -1;
-+ }
-+
- int find(void* token, bool f(void*, E)) const {
- for (int i = 0; i < _len; i++) {
- if (f(token, _data[i])) return i;
---- ./hotspot/src/share/vm/utilities/ticks.cpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/ticks.cpp 2014-07-15 21:48:34.000000000 -0700
-@@ -0,0 +1,68 @@
-+/*
-+ * 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.
-+ *
-+ */
-+
-+#include "precompiled.hpp"
-+#include "runtime/os.hpp"
-+#include "utilities/ticks.inline.hpp"
-+
-+#ifdef ASSERT
-+ const jlong Ticks::invalid_time_stamp = -2; // 0xFFFF FFFF`FFFF FFFE
-+#endif
-+
-+void Ticks::stamp() {
-+ _stamp_ticks = os::elapsed_counter();
-+}
-+
-+const Ticks Ticks::now() {
-+ Ticks t;
-+ t.stamp();
-+ return t;
-+}
-+
-+Tickspan::Tickspan(const Ticks& end, const Ticks& start) {
-+ assert(end.value() != Ticks::invalid_time_stamp, "end is unstamped!");
-+ assert(start.value() != Ticks::invalid_time_stamp, "start is unstamped!");
-+
-+ assert(end >= start, "negative time!");
-+
-+ _span_ticks = end.value() - start.value();
-+}
-+
-+template <typename ReturnType>
-+static ReturnType time_conversion(const Tickspan& span, TicksToTimeHelper::Unit unit) {
-+ assert(TicksToTimeHelper::SECONDS == unit ||
-+ TicksToTimeHelper::MILLISECONDS == unit, "invalid unit!");
-+
-+ ReturnType frequency_per_unit = (ReturnType)os::elapsed_frequency() / (ReturnType)unit;
-+
-+ return (ReturnType) ((ReturnType)span.value() / frequency_per_unit);
-+}
-+
-+double TicksToTimeHelper::seconds(const Tickspan& span) {
-+ return time_conversion<double>(span, SECONDS);
-+}
-+
-+jlong TicksToTimeHelper::milliseconds(const Tickspan& span) {
-+ return time_conversion<jlong>(span, MILLISECONDS);
-+}
---- ./hotspot/src/share/vm/utilities/ticks.hpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/ticks.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -0,0 +1,111 @@
-+/*
-+ * 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.
-+ *
-+ */
-+
-+#ifndef SHARE_VM_UTILITIES_TICKS_HPP
-+#define SHARE_VM_UTILITIES_TICKS_HPP
-+
-+#include "memory/allocation.hpp"
-+#include "utilities/globalDefinitions.hpp"
-+
-+class Ticks;
-+
-+class Tickspan VALUE_OBJ_CLASS_SPEC {
-+ friend class Ticks;
-+ friend Tickspan operator-(const Ticks& end, const Ticks& start);
-+
-+ private:
-+ jlong _span_ticks;
-+
-+ Tickspan(const Ticks& end, const Ticks& start);
-+
-+ public:
-+ Tickspan() : _span_ticks(0) {}
-+
-+ Tickspan& operator+=(const Tickspan& rhs) {
-+ _span_ticks += rhs._span_ticks;
-+ return *this;
-+ }
-+
-+ jlong value() const {
-+ return _span_ticks;
-+ }
-+
-+};
-+
-+class Ticks VALUE_OBJ_CLASS_SPEC {
-+ private:
-+ jlong _stamp_ticks;
-+
-+ public:
-+ Ticks() : _stamp_ticks(0) {
-+ assert((_stamp_ticks = invalid_time_stamp) == invalid_time_stamp,
-+ "initial unstamped time value assignment");
-+ }
-+
-+ Ticks& operator+=(const Tickspan& span) {
-+ _stamp_ticks += span.value();
-+ return *this;
-+ }
-+
-+ Ticks& operator-=(const Tickspan& span) {
-+ _stamp_ticks -= span.value();
-+ return *this;
-+ }
-+
-+ void stamp();
-+
-+ jlong value() const {
-+ return _stamp_ticks;
-+ }
-+
-+ static const Ticks now();
-+
-+#ifdef ASSERT
-+ static const jlong invalid_time_stamp;
-+#endif
-+
-+#ifndef PRODUCT
-+ // only for internal use by GC VM tests
-+ friend class TimePartitionPhasesIteratorTest;
-+ friend class GCTimerTest;
-+
-+ private:
-+ // implicit type conversion
-+ Ticks(int ticks) : _stamp_ticks(ticks) {}
-+
-+#endif // !PRODUCT
-+
-+};
-+
-+class TicksToTimeHelper : public AllStatic {
-+ public:
-+ enum Unit {
-+ SECONDS = 1,
-+ MILLISECONDS = 1000
-+ };
-+ static double seconds(const Tickspan& span);
-+ static jlong milliseconds(const Tickspan& span);
-+};
-+
-+#endif // SHARE_VM_UTILITIES_TICKS_HPP
---- ./hotspot/src/share/vm/utilities/ticks.inline.hpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/ticks.inline.hpp 2014-07-15 21:48:34.000000000 -0700
-@@ -0,0 +1,97 @@
-+/*
-+ * 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.
-+ *
-+ */
-+
-+#ifndef SHARE_VM_UTILITIES_TICKS_INLINE_HPP
-+#define SHARE_VM_UTILITIES_TICKS_INLINE_HPP
-+
-+#include "utilities/ticks.hpp"
-+
-+inline Tickspan operator+(Tickspan lhs, const Tickspan& rhs) {
-+ lhs += rhs;
-+ return lhs;
-+}
-+
-+inline bool operator==(const Tickspan& lhs, const Tickspan& rhs) {
-+ return lhs.value() == rhs.value();
-+}
-+
-+inline bool operator!=(const Tickspan& lhs, const Tickspan& rhs) {
-+ return !operator==(lhs,rhs);
-+}
-+
-+inline bool operator<(const Tickspan& lhs, const Tickspan& rhs) {
-+ return lhs.value() < rhs.value();
-+}
-+
-+inline bool operator>(const Tickspan& lhs, const Tickspan& rhs) {
-+ return operator<(rhs,lhs);
-+}
-+
-+inline bool operator<=(const Tickspan& lhs, const Tickspan& rhs) {
-+ return !operator>(lhs,rhs);
-+}
-+
-+inline bool operator>=(const Tickspan& lhs, const Tickspan& rhs) {
-+ return !operator<(lhs,rhs);
-+}
-+
-+inline Ticks operator+(Ticks lhs, const Tickspan& span) {
-+ lhs += span;
-+ return lhs;
-+}
-+
-+inline Ticks operator-(Ticks lhs, const Tickspan& span) {
-+ lhs -= span;
-+ return lhs;
-+}
-+
-+inline Tickspan operator-(const Ticks& end, const Ticks& start) {
-+ return Tickspan(end, start);
-+}
-+
-+inline bool operator==(const Ticks& lhs, const Ticks& rhs) {
-+ return lhs.value() == rhs.value();
-+}
-+
-+inline bool operator!=(const Ticks& lhs, const Ticks& rhs) {
-+ return !operator==(lhs,rhs);
-+}
-+
-+inline bool operator<(const Ticks& lhs, const Ticks& rhs) {
-+ return lhs.value() < rhs.value();
-+}
-+
-+inline bool operator>(const Ticks& lhs, const Ticks& rhs) {
-+ return operator<(rhs,lhs);
-+}
-+
-+inline bool operator<=(const Ticks& lhs, const Ticks& rhs) {
-+ return !operator>(lhs,rhs);
-+}
-+
-+inline bool operator>=(const Ticks& lhs, const Ticks& rhs) {
-+ return !operator<(lhs,rhs);
-+}
-+
-+#endif // SHARE_VM_UTILITIES_TICKS_INLINE_HPP
---- ./hotspot/src/share/vm/utilities/vmError.cpp 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2014-10-28 20:19:39.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, 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
-@@ -583,6 +583,13 @@
- while (count++ < StackPrintLimit) {
- fr.print_on_error(st, buf, sizeof(buf));
- st->cr();
-+ // Compiled code may use EBP register on x86 so it looks like
-+ // non-walkable C frame. Use frame.sender() for java frames.
-+ if (_thread && _thread->is_Java_thread() && fr.is_java_frame()) {
-+ RegisterMap map((JavaThread*)_thread, false); // No update
-+ fr = fr.sender(&map);
-+ continue;
-+ }
- if (os::is_first_C_frame(&fr)) break;
- fr = os::get_sender_for_C_frame(&fr);
- }
-@@ -944,7 +951,6 @@
- if (fd != -1) {
- out.print_raw("# An error report file with more information is saved as:\n# ");
- out.print_raw_cr(buffer);
-- os::set_error_file(buffer);
-
- log.set_fd(fd);
- } else {
---- ./hotspot/test/compiler/5091921/Test7005594.sh 2013-09-06 11:22:17.000000000 -0700
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh 2014-10-28 20:19:39.000000000 -0700
-@@ -60,6 +60,9 @@
- # Windows/MKS
- MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
- MEM="$(($machine_memory / 1024))"
-+elif [ -n `sysctl -n hw.physmem64 2> /dev/null` -o -n `sysctl -n hw.physmem 2> /dev/null` ];
-+ # BSD
-+ MEM=`sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }'`
- else
- echo "Unable to determine amount of physical memory on the machine"
- fi
---- ./hotspot/test/compiler/6653795/UnsafeGetAddressTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/compiler/6653795/UnsafeGetAddressTest.java 2014-10-28 20:19:38.000000000 -0700
-@@ -0,0 +1,68 @@
-+/*
-+ * 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 6653795
-+ * @summary C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
-+ * @run main UnsafeGetAddressTest
-+ *
-+ */
-+
-+import sun.misc.Unsafe;
-+import java.lang.reflect.*;
-+
-+public class UnsafeGetAddressTest {
-+ private static Unsafe unsafe;
-+
-+ public static void main(String[] args) throws Exception {
-+ Class c = UnsafeGetAddressTest.class.getClassLoader().loadClass("sun.misc.Unsafe");
-+ Field f = c.getDeclaredField("theUnsafe");
-+ f.setAccessible(true);
-+ unsafe = (Unsafe)f.get(c);
-+
-+ long address = unsafe.allocateMemory(unsafe.addressSize());
-+ unsafe.putAddress(address, 0x0000000080000000L);
-+ // from sun.misc.Unsafe.getAddress' documentation:
-+ // "If the native pointer is less than 64 bits wide, it is
-+ // extended as an unsigned number to a Java long."
-+ result = unsafe.getAddress(address);
-+ System.out.printf("1: was 0x%x, expected 0x%x\n", result,
-+ 0x0000000080000000L);
-+ for (int i = 0; i < 1000000; i++) {
-+ result = unsafe.getAddress(address);
-+ }
-+
-+ // The code has got compiled, check the result now
-+ System.out.printf("2: was 0x%x, expected 0x%x\n", result,
-+ 0x0000000080000000L);
-+ if (result != 0x0000000080000000L) {
-+ System.out.println("Test Failed");
-+ System.exit(97);
-+ } else {
-+ System.out.println("Test Passed");
-+ }
-+ }
-+ static volatile long result;
-+}
-+
---- ./hotspot/test/compiler/7141637/SpreadNullArg.java 2013-09-06 11:22:19.000000000 -0700
-+++ ./hotspot/test/compiler/7141637/SpreadNullArg.java 2014-10-28 20:19:38.000000000 -0700
-@@ -46,13 +46,17 @@
- mh_spread_target =
- MethodHandles.lookup().findStatic(SpreadNullArg.class, "target_spread_arg", mt_ref_arg);
- result = (int) mh_spreadInvoker.invokeExact(mh_spread_target, (Object[]) null);
-- } catch(NullPointerException e) {
-- // Expected exception - do nothing!
-- } catch(Throwable e) {
-+ throw new Error("Expected IllegalArgumentException was not thrown");
-+ } catch (IllegalArgumentException e) {
-+ System.out.println("Expected exception : " + e);
-+ } catch (Throwable e) {
- throw new Error(e);
- }
-
-- if (result != 42) throw new Error("Expected NullPointerException was not thrown");
-+ if (result != 42) {
-+ throw new Error("result [" + result
-+ + "] != 42 : Expected IllegalArgumentException was not thrown?");
-+ }
- }
-
- public static int target_spread_arg(Integer i1) {
---- ./hotspot/test/compiler/8004051/Test8004051.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/compiler/8004051/Test8004051.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,56 @@
-+/*
-+ * 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 8004051
-+ * @bug 8005722
-+ * @summary assert(_oprs_len[mode] < maxNumberOfOperands) failed: array overflow
-+ *
-+ * @run main/othervm -Xcomp -client Test8004051
-+ */
-+
-+public class Test8004051 {
-+ public static void main(String[] argv) {
-+ Object o = new Object();
-+ fillPrimRect(1.1f, 1.2f, 1.3f, 1.4f,
-+ o, o,
-+ 1.5f, 1.6f, 1.7f, 1.8f,
-+ 2.0f, 2.1f, 2.2f, 2.3f,
-+ 2.4f, 2.5f, 2.6f, 2.7f,
-+ 100, 101);
-+ System.out.println("Test passed, test did not assert");
-+ }
-+
-+ static boolean fillPrimRect(float x, float y, float w, float h,
-+ Object rectTex, Object wrapTex,
-+ float bx, float by, float bw, float bh,
-+ float f1, float f2, float f3, float f4,
-+ float f5, float f6, float f7, float f8,
-+ int i1, int i2 ) {
-+ System.out.println(x + " " + y + " " + w + " " + h + " " +
-+ bx + " " + by + " " + bw + " " + bh);
-+ return true;
-+ }
-+}
---- ./hotspot/test/compiler/codegen/LoadWithMask.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/compiler/codegen/LoadWithMask.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,44 @@
-+/*
-+ * 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 8032207
-+ * @summary Invalid node sizing for loadUS2L_immI16 and loadI2L_immI
-+ * @run main/othervm -server -Xbatch -XX:-TieredCompilation -XX:CompileCommand=compileonly,LoadWithMask.foo LoadWithMask
-+ *
-+ */
-+public class LoadWithMask {
-+ static int x[] = new int[1];
-+ static long foo() {
-+ return x[0] & 0xfff0ffff;
-+ }
-+
-+ public static void main(String[] args) {
-+ x[0] = -1;
-+ long l = 0;
-+ for (int i = 0; i < 100000; ++i) {
-+ l = foo();
-+ }
-+ }
-+}
---- ./hotspot/test/compiler/codegen/LoadWithMask2.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/compiler/codegen/LoadWithMask2.java 2014-07-15 21:48:35.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.
-+ *
-+ * 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 8031743
-+ * @summary loadI2L_immI broken for negative memory values
-+ * @run main/othervm -server -Xbatch -XX:-TieredCompilation -XX:CompileCommand=compileonly,*.foo* LoadWithMask2
-+ *
-+ */
-+public class LoadWithMask2 {
-+ static int x;
-+ static long foo1() {
-+ return x & 0xfffffffe;
-+ }
-+ static long foo2() {
-+ return x & 0xff000000;
-+ }
-+ static long foo3() {
-+ return x & 0x8abcdef1;
-+ }
-+
-+ public static void main(String[] args) {
-+ x = -1;
-+ long l = 0;
-+ for (int i = 0; i < 100000; ++i) {
-+ l = foo1() & foo2() & foo3();
-+ }
-+ if (l > 0) {
-+ System.out.println("FAILED");
-+ System.exit(97);
-+ }
-+ System.out.println("PASSED");
-+ }
-+}
---- ./hotspot/test/compiler/gcbarriers/G1CrashTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/compiler/gcbarriers/G1CrashTest.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,84 @@
-+/*
-+ * 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 8023472
-+ * @summary C2 optimization breaks with G1
-+ *
-+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -Dcount=100000 G1CrashTest
-+ *
-+ * @author pbiswal@palantir.com
-+ */
-+
-+public class G1CrashTest {
-+ static Object[] set = new Object[11];
-+
-+ public static void main(String[] args) throws InterruptedException {
-+ for (int j = 0; j < Integer.getInteger("count"); j++) {
-+ Object key = new Object();
-+ insertKey(key);
-+ if (j > set.length / 2) {
-+ Object[] oldKeys = set;
-+ set = new Object[2 * set.length - 1];
-+ for (Object o : oldKeys) {
-+ if (o != null)
-+ insertKey(o);
-+ }
-+ }
-+ }
-+ }
-+
-+ static void insertKey(Object key) {
-+ int hash = key.hashCode() & 0x7fffffff;
-+ int index = hash % set.length;
-+ Object cur = set[index];
-+ if (cur == null)
-+ set[index] = key;
-+ else
-+ insertKeyRehash(key, index, hash, cur);
-+ }
-+
-+ static void insertKeyRehash(Object key, int index, int hash, Object cur) {
-+ int loopIndex = index;
-+ int firstRemoved = -1;
-+ do {
-+ if (cur == "dead")
-+ firstRemoved = 1;
-+ index--;
-+ if (index < 0)
-+ index += set.length;
-+ cur = set[index];
-+ if (cur == null) {
-+ if (firstRemoved != -1)
-+ set[firstRemoved] = "dead";
-+ else
-+ set[index] = key;
-+ return;
-+ }
-+ } while (index != loopIndex);
-+ if (firstRemoved != -1)
-+ set[firstRemoved] = null;
-+ }
-+}
---- ./hotspot/test/compiler/print/PrintInlining.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/compiler/print/PrintInlining.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,36 @@
-+/*
-+ * 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 8022585
-+ * @summary VM crashes when ran with -XX:+PrintInlining
-+ * @run main/othervm -Xcomp -XX:+PrintInlining PrintInlining
-+ *
-+ */
-+
-+public class PrintInlining {
-+ public static void main(String[] args) {
-+ System.out.println("Passed");
-+ }
-+}
---- ./hotspot/test/compiler/reflection/ArrayNewInstanceOfVoid.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/compiler/reflection/ArrayNewInstanceOfVoid.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,44 @@
-+/*
-+ * 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 8029366
-+ * @summary ShouldNotReachHere error when creating an array with component type of void
-+ */
-+
-+public class ArrayNewInstanceOfVoid {
-+ public static void main(String[] args) {
-+ for (int i = 0; i < 100_000; i++) {
-+ test();
-+ }
-+ }
-+
-+ private static void test() {
-+ try {
-+ java.lang.reflect.Array.newInstance(void.class, 2);
-+ } catch (IllegalArgumentException e) {
-+ // expected
-+ }
-+ }
-+}
---- ./hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,45 @@
-+/*
-+ * 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 8027751
-+ * @summary C1 crashes generating G1 post-barrier in Unsafe.getAndSetObject() intrinsic because of the new value spill
-+ * @run main/othervm -XX:+UseG1GC C1ObjectSpillInLogicOp
-+ *
-+ * G1 barriers use logical operators (xor) on T_OBJECT mixed with T_LONG or T_INT.
-+ * The current implementation of logical operations on x86 in C1 doesn't allow for long operands to be on stack.
-+ * There is a special code in the register allocator that forces long arguments in registers on x86. However T_OBJECT
-+ * can be spilled just fine, and in that case the xor emission will fail.
-+ */
-+
-+import java.util.concurrent.atomic.*;
-+public class C1ObjectSpillInLogicOp {
-+ static public void main(String[] args) {
-+ AtomicReferenceArray<Integer> x = new AtomicReferenceArray(128);
-+ Integer y = new Integer(0);
-+ for (int i = 0; i < 50000; i++) {
-+ x.getAndSet(i % x.length(), y);
-+ }
-+ }
-+}
---- ./hotspot/test/gc/8000311/Test8000311.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/8000311/Test8000311.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,42 @@
-+/*
-+ * 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 Test8000311
-+ * @key gc
-+ * @bug 8000311
-+ * @summary G1: ParallelGCThreads==0 broken
-+ * @run main/othervm -XX:+UseG1GC -XX:ParallelGCThreads=0 -XX:+ResizePLAB -XX:+ExplicitGCInvokesConcurrent Test8000311
-+ * @author filipp.zhinkin@oracle.com
-+ */
-+
-+import java.util.*;
-+
-+public class Test8000311 {
-+ public static void main(String args[]) {
-+ for(int i = 0; i<100; i++) {
-+ byte[] garbage = new byte[1000];
-+ System.gc();
-+ }
-+ }
-+}
---- ./hotspot/test/gc/TestVerifyBeforeGCDuringStartup.java 2013-09-06 11:22:19.000000000 -0700
-+++ ./hotspot/test/gc/TestVerifyBeforeGCDuringStartup.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,45 +0,0 @@
--/*
-- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation.
-- *
-- * 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 TestVerifyBeforeGCDuringStartup.java
-- * @key gc
-- * @bug 8010463
-- * @summary Simple test run with -XX:+VerifyBeforeGC -XX:-UseTLAB to verify 8010463
-- * @library /testlibrary
-- */
--
--import com.oracle.java.testlibrary.OutputAnalyzer;
--import com.oracle.java.testlibrary.ProcessTools;
--
--public class TestVerifyBeforeGCDuringStartup {
-- public static void main(String args[]) throws Exception {
-- ProcessBuilder pb =
-- ProcessTools.createJavaProcessBuilder(System.getProperty("test.vm.opts"),
-- "-XX:-UseTLAB",
-- "-XX:+UnlockDiagnosticVMOptions",
-- "-XX:+VerifyBeforeGC", "-version");
-- OutputAnalyzer output = new OutputAnalyzer(pb.start());
-- output.shouldContain("[Verifying");
-- output.shouldHaveExitValue(0);
-- }
--}
---- ./hotspot/test/gc/TestVerifyDuringStartup.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/TestVerifyDuringStartup.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,45 @@
-+/*
-+ * 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 TestVerifyDuringStartup.java
-+ * @key gc
-+ * @bug 8010463
-+ * @summary Simple test run with -XX:+VerifyDuringStartup -XX:-UseTLAB to verify 8010463
-+ * @library /testlibrary
-+ */
-+
-+import com.oracle.java.testlibrary.OutputAnalyzer;
-+import com.oracle.java.testlibrary.ProcessTools;
-+
-+public class TestVerifyDuringStartup {
-+ public static void main(String args[]) throws Exception {
-+ ProcessBuilder pb =
-+ ProcessTools.createJavaProcessBuilder(System.getProperty("test.vm.opts"),
-+ "-XX:-UseTLAB",
-+ "-XX:+UnlockDiagnosticVMOptions",
-+ "-XX:+VerifyDuringStartup", "-version");
-+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
-+ output.shouldContain("[Verifying");
-+ output.shouldHaveExitValue(0);
-+ }
-+}
---- ./hotspot/test/gc/TestVerifySilently.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/TestVerifySilently.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,84 @@
-+/*
-+ * 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 TestVerifySilently.java
-+ * @key gc
-+ * @bug 8032771
-+ * @summary Test silent verification.
-+ * @library /testlibrary
-+ */
-+
-+import com.oracle.java.testlibrary.OutputAnalyzer;
-+import com.oracle.java.testlibrary.ProcessTools;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+
-+class RunSystemGC {
-+ public static void main(String args[]) throws Exception {
-+ System.gc();
-+ }
-+}
-+
-+
-+public class TestVerifySilently {
-+ private static String[] getTestJavaOpts() {
-+ String testVmOptsStr = System.getProperty("test.java.opts");
-+ if (!testVmOptsStr.isEmpty()) {
-+ return testVmOptsStr.split(" ");
-+ } else {
-+ return new String[] {};
-+ }
-+ }
-+
-+ private static OutputAnalyzer runTest(boolean verifySilently) throws Exception {
-+ ArrayList<String> vmOpts = new ArrayList();
-+
-+ Collections.addAll(vmOpts, getTestJavaOpts());
-+ Collections.addAll(vmOpts, new String[] {"-XX:+UnlockDiagnosticVMOptions",
-+ "-XX:+VerifyDuringStartup",
-+ "-XX:+VerifyBeforeGC",
-+ "-XX:+VerifyAfterGC",
-+ "-XX:" + (verifySilently ? "+":"-") + "VerifySilently",
-+ RunSystemGC.class.getName()});
-+ ProcessBuilder pb =
-+ ProcessTools.createJavaProcessBuilder(vmOpts.toArray(new String[vmOpts.size()]));
-+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
-+
-+ System.out.println("Output:\n" + output.getOutput());
-+ return output;
-+ }
-+
-+
-+ public static void main(String args[]) throws Exception {
-+
-+ OutputAnalyzer output;
-+
-+ output = runTest(false);
-+ output.shouldContain("[Verifying");
-+ output.shouldHaveExitValue(0);
-+
-+ output = runTest(true);
-+ output.shouldNotContain("[Verifying");
-+ output.shouldHaveExitValue(0);
-+ }
-+}
---- ./hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,64 @@
-+/*
-+ * 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 TestDynMaxHeapFreeRatio
-+ * @bug 8028391
-+ * @summary Verify that MaxHeapFreeRatio flag is manageable
-+ * @library /testlibrary
-+ * @run main TestDynMaxHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=0 -XX:MaxHeapFreeRatio=100 TestDynMaxHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 -XX:-UseAdaptiveSizePolicy TestDynMaxHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 TestDynMaxHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=51 -XX:MaxHeapFreeRatio=52 TestDynMaxHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=75 -XX:MaxHeapFreeRatio=100 TestDynMaxHeapFreeRatio
-+ */
-+import com.oracle.java.testlibrary.TestDynamicVMOption;
-+import com.oracle.java.testlibrary.DynamicVMOptionChecker;
-+
-+public class TestDynMaxHeapFreeRatio extends TestDynamicVMOption {
-+
-+ public static final String MinFreeRatioFlagName = "MinHeapFreeRatio";
-+ public static final String MaxFreeRatioFlagName = "MaxHeapFreeRatio";
-+
-+ public TestDynMaxHeapFreeRatio() {
-+ super(MaxFreeRatioFlagName);
-+ }
-+
-+ public void test() {
-+
-+ int minHeapFreeValue = DynamicVMOptionChecker.getIntValue(MinFreeRatioFlagName);
-+ System.out.println(MinFreeRatioFlagName + " = " + minHeapFreeValue);
-+
-+ testPercentageValues();
-+
-+ checkInvalidValue(Integer.toString(minHeapFreeValue - 1));
-+ checkValidValue(Integer.toString(minHeapFreeValue));
-+ checkValidValue("100");
-+ }
-+
-+ public static void main(String args[]) throws Exception {
-+ new TestDynMaxHeapFreeRatio().test();
-+ }
-+
-+}
---- ./hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,62 @@
-+/*
-+ * 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 TestDynMinHeapFreeRatio
-+ * @bug 8028391
-+ * @summary Verify that MinHeapFreeRatio flag is manageable
-+ * @library /testlibrary
-+ * @run main TestDynMinHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=0 -XX:MaxHeapFreeRatio=100 TestDynMinHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 -XX:-UseAdaptiveSizePolicy TestDynMinHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 TestDynMinHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=51 -XX:MaxHeapFreeRatio=52 TestDynMinHeapFreeRatio
-+ * @run main/othervm -XX:MinHeapFreeRatio=75 -XX:MaxHeapFreeRatio=100 TestDynMinHeapFreeRatio
-+ */
-+import com.oracle.java.testlibrary.TestDynamicVMOption;
-+import com.oracle.java.testlibrary.DynamicVMOptionChecker;
-+
-+public class TestDynMinHeapFreeRatio extends TestDynamicVMOption {
-+
-+ public static final String MinFreeRatioFlagName = "MinHeapFreeRatio";
-+ public static final String MaxFreeRatioFlagName = "MaxHeapFreeRatio";
-+
-+ public TestDynMinHeapFreeRatio() {
-+ super(MinFreeRatioFlagName);
-+ }
-+
-+ public void test() {
-+ int maxHeapFreeValue = DynamicVMOptionChecker.getIntValue(MaxFreeRatioFlagName);
-+ System.out.println(MaxFreeRatioFlagName + " = " + maxHeapFreeValue);
-+
-+ testPercentageValues();
-+
-+ checkInvalidValue(Integer.toString(maxHeapFreeValue + 1));
-+ checkValidValue(Integer.toString(maxHeapFreeValue));
-+ checkValidValue("0");
-+ }
-+
-+ public static void main(String args[]) throws Exception {
-+ new TestDynMinHeapFreeRatio().test();
-+ }
-+}
---- ./hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,143 @@
-+/*
-+ * 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
-+ * @key regression
-+ * @key gc
-+ * @bug 8027756
-+ * @library /testlibrary /testlibrary/whitebox
-+ * @build TestHumongousCodeCacheRoots
-+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
-+ * @summary Humongous objects may have references from the code cache
-+ * @run main TestHumongousCodeCacheRoots
-+*/
-+
-+import com.oracle.java.testlibrary.*;
-+import sun.hotspot.WhiteBox;
-+
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+
-+class TestHumongousCodeCacheRootsHelper {
-+
-+ static final int n = 1000000;
-+ static final int[] AA = new int[n];
-+ static final int[] BB = new int[n];
-+
-+ public static void main(String args[]) throws Exception {
-+ // do some work so that the compiler compiles this method, inlining the
-+ // reference to the integer array (which is a humonguous object) into
-+ // the code cache.
-+ for(int i = 0; i < n; i++) {
-+ AA[i] = 0;
-+ BB[i] = 0;
-+ }
-+ // trigger a GC that checks that the verification code allows humongous
-+ // objects with code cache roots; objects should be all live here.
-+ System.gc();
-+
-+ // deoptimize everyhing: this should make all compiled code zombies.
-+ WhiteBox wb = WhiteBox.getWhiteBox();
-+ wb.deoptimizeAll();
-+
-+ // trigger a GC that checks that the verification code allows humongous
-+ // objects with code cache roots; objects should be all live here.
-+ System.gc();
-+
-+ // wait a little for the code cache sweeper to try to clean up zombie nmethods
-+ // and unregister the code roots.
-+ try { Thread.sleep(5000); } catch (InterruptedException ex) { }
-+
-+ // do some work on the arrays to make sure that they need to be live after the GCs
-+ for(int i = 0; i < n; i++) {
-+ AA[i] = 1;
-+ BB[i] = 10;
-+ }
-+
-+ System.out.println();
-+ }
-+}
-+
-+public class TestHumongousCodeCacheRoots {
-+
-+ /**
-+ * Executes a class in a new VM process with the given parameters.
-+ * @param vmargs Arguments to the VM to run
-+ * @param classname Name of the class to run
-+ * @param arguments Arguments to the class
-+ * @param useTestDotJavaDotOpts Use test.java.opts as part of the VM argument string
-+ * @return The OutputAnalyzer with the results for the invocation.
-+ */
-+ public static OutputAnalyzer runWhiteBoxTest(String[] vmargs, String classname, String[] arguments, boolean useTestDotJavaDotOpts) throws Exception {
-+ ArrayList<String> finalargs = new ArrayList<String>();
-+
-+ String[] whiteboxOpts = new String[] {
-+ "-Xbootclasspath/a:.",
-+ "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI",
-+ "-cp", System.getProperty("java.class.path"),
-+ };
-+
-+ if (useTestDotJavaDotOpts) {
-+ // System.getProperty("test.java.opts") is '' if no options is set,
-+ // we need to skip such a result
-+ String[] externalVMOpts = new String[0];
-+ if (System.getProperty("test.java.opts") != null && System.getProperty("test.java.opts").length() != 0) {
-+ externalVMOpts = System.getProperty("test.java.opts").split(" ");
-+ }
-+ finalargs.addAll(Arrays.asList(externalVMOpts));
-+ }
-+
-+ finalargs.addAll(Arrays.asList(vmargs));
-+ finalargs.addAll(Arrays.asList(whiteboxOpts));
-+ finalargs.add(classname);
-+ finalargs.addAll(Arrays.asList(arguments));
-+
-+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(finalargs.toArray(new String[0]));
-+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
-+ output.shouldHaveExitValue(0);
-+
-+ return output;
-+ }
-+
-+ public static void runTest(String compiler, String[] other) throws Exception {
-+ ArrayList<String> joined = new ArrayList<String>();
-+ joined.add(compiler);
-+ joined.addAll(Arrays.asList(other));
-+ runWhiteBoxTest(joined.toArray(new String[0]), TestHumongousCodeCacheRootsHelper.class.getName(),
-+ new String[] {}, false);
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ final String[] baseArguments = new String[] {
-+ "-XX:+UseG1GC", "-XX:G1HeapRegionSize=1M", "-Xmx100M", // make sure we get a humongous region
-+ "-XX:+UnlockDiagnosticVMOptions",
-+ "-XX:InitiatingHeapOccupancyPercent=1", // strong code root marking
-+ "-XX:+G1VerifyHeapRegionCodeRoots", "-XX:+VerifyAfterGC", // make sure that verification is run
-+ "-XX:NmethodSweepFraction=1", "-XX:NmethodSweepCheckInterval=1", // make the code cache sweep more predictable
-+ };
-+ runTest("-client", baseArguments);
-+ runTest("-server", baseArguments);
-+ }
-+}
-+
---- ./hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,92 @@
-+/*
-+ * 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 TestPrintRegionRememberedSetInfo
-+ * @key gc
-+ * @bug 8014240
-+ * @summary Test output of G1PrintRegionRememberedSetInfo
-+ * @library /testlibrary
-+ * @run main TestPrintRegionRememberedSetInfo
-+ * @author thomas.schatzl@oracle.com
-+ */
-+
-+import com.oracle.java.testlibrary.*;
-+import java.lang.Thread;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+
-+class RunAndWaitForMarking {
-+ public static void main(String[] args) {
-+ System.gc();
-+ try {
-+ Thread.sleep(200);
-+ } catch (InterruptedException e) {
-+ }
-+ }
-+}
-+
-+public class TestPrintRegionRememberedSetInfo {
-+
-+ public static String runTest(String arg) throws Exception {
-+ ArrayList<String> finalargs = new ArrayList<String>();
-+ String[] defaultArgs = new String[] {
-+ "-XX:+UseG1GC",
-+ "-Xmx10m",
-+ "-XX:+ExplicitGCInvokesConcurrent",
-+ "-XX:+UnlockDiagnosticVMOptions",
-+ "-XX:+G1PrintRegionLivenessInfo",
-+ "-XX:G1HeapRegionSize=1M",
-+ "-XX:InitiatingHeapOccupancyPercent=0",
-+ };
-+
-+ finalargs.addAll(Arrays.asList(defaultArgs));
-+ finalargs.add(arg);
-+
-+ finalargs.add(RunAndWaitForMarking.class.getName());
-+
-+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-+ finalargs.toArray(new String[0]));
-+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
-+ output.shouldHaveExitValue(0);
-+
-+ String result = output.getStdout();
-+ return result;
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ String result;
-+
-+ result = runTest("-XX:+G1PrintRegionLivenessInfo");
-+ // check that we got region statistics output
-+ if (result.indexOf("PHASE") == -1) {
-+ throw new RuntimeException("Unexpected output from -XX:+PrintRegionLivenessInfo found.");
-+ }
-+
-+ result = runTest("-XX:-G1PrintRegionLivenessInfo");
-+ if (result.indexOf("remset") != -1) {
-+ throw new RuntimeException("Should find remembered set information in output.");
-+ }
-+ }
-+}
-+
---- ./hotspot/test/gc/g1/TestSummarizeRSetStats.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/g1/TestSummarizeRSetStats.java 2014-07-15 21:48:35.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.
-+ */
-+
-+/*
-+ * @test TestSummarizeRSetStats.java
-+ * @bug 8013895
-+ * @library /testlibrary
-+ * @build TestSummarizeRSetStatsTools TestSummarizeRSetStats
-+ * @summary Verify output of -XX:+G1SummarizeRSetStats
-+ * @run main TestSummarizeRSetStats
-+ *
-+ * Test the output of G1SummarizeRSetStats in conjunction with G1SummarizeRSetStatsPeriod.
-+ */
-+
-+public class TestSummarizeRSetStats {
-+
-+ public static void main(String[] args) throws Exception {
-+ String result;
-+
-+ if (!TestSummarizeRSetStatsTools.testingG1GC()) {
-+ return;
-+ }
-+
-+ // no remembered set summary output
-+ result = TestSummarizeRSetStatsTools.runTest(null, 0);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 0, 0);
-+
-+ // no remembered set summary output
-+ result = TestSummarizeRSetStatsTools.runTest(null, 2);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 0, 0);
-+
-+ // no remembered set summary output
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:G1SummarizeRSetStatsPeriod=1" }, 3);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 0, 0);
-+
-+ // single remembered set summary output at the end
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats" }, 0);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 0);
-+
-+ // single remembered set summary output at the end
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats" }, 2);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 0);
-+
-+ // single remembered set summary output
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1" }, 0);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 0);
-+
-+ // two times remembered set summary output
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1" }, 1);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 2);
-+
-+ // four times remembered set summary output
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1" }, 3);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 6);
-+
-+ // three times remembered set summary output
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=2" }, 3);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 4);
-+
-+ // single remembered set summary output
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=100" }, 3);
-+ TestSummarizeRSetStatsTools.expectRSetSummaries(result, 1, 2);
-+ }
-+}
-+
---- ./hotspot/test/gc/g1/TestSummarizeRSetStatsPerRegion.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsPerRegion.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,55 @@
-+/*
-+ * 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 TestSummarizeRSetStatsPerRegion.java
-+ * @bug 8014078
-+ * @library /testlibrary
-+ * @build TestSummarizeRSetStatsTools TestSummarizeRSetStatsPerRegion
-+ * @summary Verify output of -XX:+G1SummarizeRSetStats in regards to per-region type output
-+ * @run main TestSummarizeRSetStatsPerRegion
-+ */
-+
-+import com.oracle.java.testlibrary.*;
-+import java.lang.Thread;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+
-+public class TestSummarizeRSetStatsPerRegion {
-+
-+ public static void main(String[] args) throws Exception {
-+ String result;
-+
-+ if (!TestSummarizeRSetStatsTools.testingG1GC()) {
-+ return;
-+ }
-+
-+ // single remembered set summary output at the end
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats" }, 0);
-+ TestSummarizeRSetStatsTools.expectPerRegionRSetSummaries(result, 1, 0);
-+
-+ // two times remembered set summary output
-+ result = TestSummarizeRSetStatsTools.runTest(new String[] { "-XX:+G1SummarizeRSetStats", "-XX:G1SummarizeRSetStatsPeriod=1" }, 1);
-+ TestSummarizeRSetStatsTools.expectPerRegionRSetSummaries(result, 1, 2);
-+ }
-+}
---- ./hotspot/test/gc/g1/TestSummarizeRSetStatsThreads.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsThreads.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,83 @@
-+/*
-+ * 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 TestSummarizeRSetStatsThreads
-+ * @bug 8025441
-+ * @summary Ensure that various values of worker threads/concurrent
-+ * refinement threads do not crash the VM.
-+ * @key gc
-+ * @library /testlibrary
-+ */
-+
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+
-+import com.oracle.java.testlibrary.ProcessTools;
-+import com.oracle.java.testlibrary.OutputAnalyzer;
-+
-+public class TestSummarizeRSetStatsThreads {
-+
-+ private static void runTest(int refinementThreads, int workerThreads) throws Exception {
-+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
-+ "-XX:+UnlockDiagnosticVMOptions",
-+ "-XX:+G1SummarizeRSetStats",
-+ "-XX:G1ConcRefinementThreads=" + refinementThreads,
-+ "-XX:ParallelGCThreads=" + workerThreads,
-+ "-version");
-+
-+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
-+
-+ // check output to contain the string "Concurrent RS threads times (s)" followed by
-+ // the correct number of values in the next line.
-+
-+ // a zero in refinement thread numbers indicates that the value in ParallelGCThreads should be used.
-+ // Additionally use at least one thread.
-+ int expectedNumRefinementThreads = refinementThreads == 0 ? workerThreads : refinementThreads;
-+ expectedNumRefinementThreads = Math.max(1, expectedNumRefinementThreads);
-+ // create the pattern made up of n copies of a floating point number pattern
-+ String numberPattern = String.format("%0" + expectedNumRefinementThreads + "d", 0)
-+ .replace("0", "\\s+\\d+\\.\\d+");
-+ String pattern = "Concurrent RS threads times \\(s\\)$" + numberPattern + "$";
-+ Matcher m = Pattern.compile(pattern, Pattern.MULTILINE).matcher(output.getStdout());
-+
-+ if (!m.find()) {
-+ throw new Exception("Could not find correct output for concurrent RS threads times in stdout," +
-+ " should match the pattern \"" + pattern + "\", but stdout is \n" + output.getStdout());
-+ }
-+ output.shouldHaveExitValue(0);
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ if (!TestSummarizeRSetStatsTools.testingG1GC()) {
-+ return;
-+ }
-+ // different valid combinations of number of refinement and gc worker threads
-+ runTest(0, 0);
-+ runTest(0, 5);
-+ runTest(5, 0);
-+ runTest(10, 10);
-+ runTest(1, 2);
-+ runTest(4, 3);
-+ }
-+}
---- ./hotspot/test/gc/g1/TestSummarizeRSetStatsTools.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsTools.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,154 @@
-+/*
-+ * 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.
-+ */
-+
-+/*
-+ * Common helpers for TestSummarizeRSetStats* tests
-+ */
-+
-+import sun.management.ManagementFactoryHelper;
-+import com.sun.management.HotSpotDiagnosticMXBean;
-+import com.sun.management.VMOption;
-+
-+import com.oracle.java.testlibrary.*;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+import java.lang.Thread;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+
-+class VerifySummaryOutput {
-+ // 4M size, both are directly allocated into the old gen
-+ static Object[] largeObject1 = new Object[1024 * 1024];
-+ static Object[] largeObject2 = new Object[1024 * 1024];
-+
-+ static int[] temp;
-+
-+ public static void main(String[] args) {
-+ // create some cross-references between these objects
-+ for (int i = 0; i < largeObject1.length; i++) {
-+ largeObject1[i] = largeObject2;
-+ }
-+
-+ for (int i = 0; i < largeObject2.length; i++) {
-+ largeObject2[i] = largeObject1;
-+ }
-+
-+ int numGCs = Integer.parseInt(args[0]);
-+
-+ if (numGCs > 0) {
-+ // try to force a minor collection: the young gen is 4M, the
-+ // amount of data allocated below is roughly that (4*1024*1024 +
-+ // some header data)
-+ for (int i = 0; i < 1024 ; i++) {
-+ temp = new int[1024];
-+ }
-+ }
-+
-+ for (int i = 0; i < numGCs - 1; i++) {
-+ System.gc();
-+ }
-+ }
-+}
-+
-+public class TestSummarizeRSetStatsTools {
-+
-+ // the VM is currently run using G1GC, i.e. trying to test G1 functionality.
-+ public static boolean testingG1GC() {
-+ HotSpotDiagnosticMXBean diagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
-+
-+ VMOption option = diagnostic.getVMOption("UseG1GC");
-+ if (option.getValue().equals("false")) {
-+ System.out.println("Skipping this test. It is only a G1 test.");
-+ return false;
-+ }
-+ return true;
-+ }
-+
-+ public static String runTest(String[] additionalArgs, int numGCs) throws Exception {
-+ ArrayList<String> finalargs = new ArrayList<String>();
-+ String[] defaultArgs = new String[] {
-+ "-XX:+UseG1GC",
-+ "-XX:+UseCompressedOops",
-+ "-Xmn4m",
-+ "-Xmx20m",
-+ "-XX:InitiatingHeapOccupancyPercent=100", // we don't want the additional GCs due to initial marking
-+ "-XX:+PrintGC",
-+ "-XX:+UnlockDiagnosticVMOptions",
-+ "-XX:G1HeapRegionSize=1M",
-+ };
-+
-+ finalargs.addAll(Arrays.asList(defaultArgs));
-+
-+ if (additionalArgs != null) {
-+ finalargs.addAll(Arrays.asList(additionalArgs));
-+ }
-+
-+ finalargs.add(VerifySummaryOutput.class.getName());
-+ finalargs.add(String.valueOf(numGCs));
-+
-+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-+ finalargs.toArray(new String[0]));
-+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
-+
-+ output.shouldHaveExitValue(0);
-+
-+ String result = output.getStdout();
-+ return result;
-+ }
-+
-+ private static void checkCounts(int expected, int actual, String which) throws Exception {
-+ if (expected != actual) {
-+ throw new Exception("RSet summaries mention " + which + " regions an incorrect number of times. Expected " + expected + ", got " + actual);
-+ }
-+ }
-+
-+ public static void expectPerRegionRSetSummaries(String result, int expectedCumulative, int expectedPeriodic) throws Exception {
-+ expectRSetSummaries(result, expectedCumulative, expectedPeriodic);
-+ int actualYoung = result.split("Young regions").length - 1;
-+ int actualHumonguous = result.split("Humonguous regions").length - 1;
-+ int actualFree = result.split("Free regions").length - 1;
-+ int actualOther = result.split("Old regions").length - 1;
-+
-+ // the strings we check for above are printed four times per summary
-+ int expectedPerRegionTypeInfo = (expectedCumulative + expectedPeriodic) * 4;
-+
-+ checkCounts(expectedPerRegionTypeInfo, actualYoung, "Young");
-+ checkCounts(expectedPerRegionTypeInfo, actualHumonguous, "Humonguous");
-+ checkCounts(expectedPerRegionTypeInfo, actualFree, "Free");
-+ checkCounts(expectedPerRegionTypeInfo, actualOther, "Old");
-+ }
-+
-+ public static void expectRSetSummaries(String result, int expectedCumulative, int expectedPeriodic) throws Exception {
-+ int actualTotal = result.split("concurrent refinement").length - 1;
-+ int actualCumulative = result.split("Cumulative RS summary").length - 1;
-+
-+ if (expectedCumulative != actualCumulative) {
-+ throw new Exception("Incorrect amount of RSet summaries at the end. Expected " + expectedCumulative + ", got " + actualCumulative);
-+ }
-+
-+ if (expectedPeriodic != (actualTotal - actualCumulative)) {
-+ throw new Exception("Incorrect amount of per-period RSet summaries at the end. Expected " + expectedPeriodic + ", got " + (actualTotal - actualCumulative));
-+ }
-+ }
-+}
-+
---- ./hotspot/test/runtime/6929067/Test6929067.sh 2013-09-06 11:22:19.000000000 -0700
-+++ ./hotspot/test/runtime/6929067/Test6929067.sh 2014-07-15 21:48:35.000000000 -0700
-@@ -3,6 +3,7 @@
- ##
- ## @test Test6929067.sh
- ## @bug 6929067
-+## @bug 8021296
- ## @summary Stack guard pages should be removed when thread is detached
- ## @compile T.java
- ## @run shell Test6929067.sh
-@@ -21,6 +22,11 @@
- OS=`uname -s`
- case "$OS" in
- Linux)
-+ gcc_cmd=`which gcc`
-+ if [ "x$gcc_cmd" == "x" ]; then
-+ echo "WARNING: gcc not found. Cannot execute test." 2>&1
-+ exit 0;
-+ fi
- NULL=/dev/null
- PS=":"
- FS="/"
-@@ -119,10 +125,10 @@
- # Check to ensure you have a /usr/lib/libpthread.so if you don't please look
- # for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below compilation.
-
--gcc -DLINUX ${COMP_FLAG} -o invoke \
-- -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
-- -L${COMPILEJAVA}/jre/lib/${ARCH}/${VMTYPE} \
-- -ljvm -lpthread invoke.c
-+$gcc_cmd -DLINUX ${COMP_FLAG} -o invoke \
-+ -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
-+ -L${COMPILEJAVA}/jre/lib/${ARCH}/${VMTYPE} \
-+ -ljvm -lpthread invoke.c
-
- ./invoke
- exit $?
---- ./hotspot/test/runtime/7107135/Test7107135.sh 2013-09-06 11:22:19.000000000 -0700
-+++ ./hotspot/test/runtime/7107135/Test7107135.sh 2014-07-15 21:48:35.000000000 -0700
-@@ -27,6 +27,7 @@
- ##
- ## @test Test7107135.sh
- ## @bug 7107135
-+## @bug 8021296
- ## @summary Stack guard pages lost after loading library with executable stack.
- ## @run shell Test7107135.sh
- ##
-@@ -45,6 +46,11 @@
- case "$OS" in
- Linux)
- echo "Testing on Linux"
-+ gcc_cmd=`which gcc`
-+ if [ "x$gcc_cmd" == "x" ]; then
-+ echo "WARNING: gcc not found. Cannot execute test." 2>&1
-+ exit 0;
-+ fi
- ;;
- *)
- NULL=NUL
-@@ -62,7 +68,10 @@
- cp ${TESTSRC}${FS}*.java ${THIS_DIR}
- ${TESTJAVA}${FS}bin${FS}javac *.java
-
--gcc -fPIC -shared -c -o test.o -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux ${TESTSRC}${FS}test.c
-+$gcc_cmd -fPIC -shared -c -o test.o \
-+ -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \
-+ ${TESTSRC}${FS}test.c
-+
- ld -shared -z execstack -o libtest-rwx.so test.o
- ld -shared -z noexecstack -o libtest-rw.so test.o
-
---- ./hotspot/test/runtime/7110720/Test7110720.sh 2013-09-06 11:22:20.000000000 -0700
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh 2014-10-28 20:19:39.000000000 -0700
-@@ -28,7 +28,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | Darwin | *BSD )
- FS="/"
- 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-10-28 20:19:39.000000000 -0700
-@@ -0,0 +1,91 @@
-+#!/bin/sh
-+#
-+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.com if you need additional information or have any
-+# questions.
-+#
-+#
-+# Run test for InternTest.java
-+#
-+
-+if [ "${TESTSRC}" = "" ]
-+then TESTSRC=.
-+fi
-+
-+if [ "${TESTJAVA}" = "" ]
-+then
-+ PARENT=`dirname \`which java\``
-+ TESTJAVA=`dirname ${PARENT}`
-+ echo "TESTJAVA not set, selecting " ${TESTJAVA}
-+ echo "If this is incorrect, try setting the variable manually."
-+fi
-+
-+if [ "${TESTCLASSES}" = "" ]
-+then
-+ echo "TESTCLASSES not set. Test cannot execute. Failed."
-+ exit 1
-+fi
-+
-+# set platform-dependent variables
-+OS=`uname -s`
-+case "$OS" in
-+ SunOS | Linux | *BSD )
-+ NULL=/dev/null
-+ PS=":"
-+ FS="/"
-+ ;;
-+ Windows_* )
-+ NULL=NUL
-+ PS=";"
-+ FS="\\"
-+ ;;
-+ * )
-+ echo "Unrecognized system!"
-+ exit 1;
-+ ;;
-+esac
-+
-+JEMMYPATH=${CPAPPEND}
-+CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
-+
-+THIS_DIR=`pwd`
-+
-+${TESTJAVA}${FS}bin${FS}java -fullversion
-+
-+${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}InternTest.java
-+
-+cp ${TESTSRC}${FS}badstrings.txt .
-+
-+${TESTJAVA}${FS}bin${FS}java -XX:+PrintStringTableStatistics -XX:+TraceSafepointCleanupTime InternTest bad > test.out 2>&1 &
-+C_PID=$!
-+
-+sleep 60
-+
-+ps | grep ${C_PID} | grep -v grep
-+
-+if [ $? = 0 ]
-+then
-+ kill -9 ${C_PID}
-+ echo "Test Failed"
-+ exit 1
-+else
-+ echo "Test Passed"
-+ exit 0
-+fi
---- ./hotspot/test/runtime/jsig/Test8017498.sh 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/runtime/jsig/Test8017498.sh 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,94 @@
-+#!/bin/sh
-+
-+#
-+# 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 Test8017498.sh
-+## @bug 8017498
-+## @bug 8020791
-+## @bug 8021296
-+## @summary sigaction(sig) results in process hang/timed-out if sig is much greater than SIGRTMAX
-+## @run shell/timeout=30 Test8017498.sh
-+##
-+
-+if [ "${TESTSRC}" = "" ]
-+then
-+ TESTSRC=${PWD}
-+ echo "TESTSRC not set. Using "${TESTSRC}" as default"
-+fi
-+echo "TESTSRC=${TESTSRC}"
-+## Adding common setup Variables for running shell tests.
-+. ${TESTSRC}/../../test_env.sh
-+
-+# set platform-dependent variables
-+OS=`uname -s`
-+case "$OS" in
-+ Linux)
-+ echo "Testing on Linux"
-+ gcc_cmd=`which gcc`
-+ if [ "x$gcc_cmd" == "x" ]; then
-+ echo "WARNING: gcc not found. Cannot execute test." 2>&1
-+ exit 0;
-+ fi
-+ if [ "$VM_BITS" = "64" ]
-+ then
-+ MY_LD_PRELOAD=${TESTJAVA}${FS}jre${FS}lib${FS}amd64${FS}libjsig.so
-+ else
-+ MY_LD_PRELOAD=${TESTJAVA}${FS}jre${FS}lib${FS}i386${FS}libjsig.so
-+ fi
-+ echo MY_LD_PRELOAD = ${MY_LD_PRELOAD}
-+ ;;
-+ *)
-+ echo "Test passed; only valid for Linux"
-+ exit 0;
-+ ;;
-+esac
-+
-+THIS_DIR=.
-+
-+cp ${TESTSRC}${FS}*.java ${THIS_DIR}
-+${TESTJAVA}${FS}bin${FS}javac *.java
-+
-+$gcc_cmd -DLINUX -fPIC -shared \
-+ -o ${TESTSRC}${FS}libTestJNI.so \
-+ -I${TESTJAVA}${FS}include \
-+ -I${TESTJAVA}${FS}include${FS}linux \
-+ ${TESTSRC}${FS}TestJNI.c
-+
-+# run the java test in the background
-+cmd="LD_PRELOAD=$MY_LD_PRELOAD \
-+ ${TESTJAVA}${FS}bin${FS}java \
-+ -Djava.library.path=${TESTSRC}${FS} -server TestJNI 100"
-+echo "$cmd > test.out 2>&1"
-+eval $cmd > test.out 2>&1
-+
-+grep "old handler" test.out > ${NULL}
-+if [ $? = 0 ]
-+then
-+ echo "Test Passed"
-+ exit 0
-+fi
-+
-+echo "Test Failed"
-+exit 1
---- ./hotspot/test/runtime/jsig/TestJNI.c 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/runtime/jsig/TestJNI.c 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,55 @@
-+/*
-+ * 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.
-+ */
-+
-+#include <stdio.h>
-+#include <jni.h>
-+#include <signal.h>
-+#include <sys/ucontext.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+void sig_handler(int sig, siginfo_t *info, ucontext_t *context) {
-+
-+ printf( " HANDLER (1) " );
-+}
-+
-+JNIEXPORT void JNICALL Java_TestJNI_doSomething(JNIEnv *env, jclass klass, jint val) {
-+ struct sigaction act;
-+ struct sigaction oact;
-+
-+ act.sa_flags = SA_ONSTACK|SA_RESTART|SA_SIGINFO;
-+ sigfillset(&act.sa_mask);
-+ act.sa_handler = SIG_DFL;
-+ act.sa_sigaction = (void (*)())sig_handler;
-+ sigaction(0x20+val, &act, &oact);
-+
-+ printf( " doSomething(%d) " , val);
-+ printf( " old handler = %p " , oact.sa_handler);
-+}
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
---- ./hotspot/test/runtime/jsig/TestJNI.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/runtime/jsig/TestJNI.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,42 @@
-+/*
-+ * 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.
-+ */
-+
-+public class TestJNI {
-+ static {
-+ System.loadLibrary("TestJNI");
-+ }
-+ public static native void doSomething(int val);
-+ public static void main(String[] args) {
-+ int intArg = 43;
-+ if (args.length > 0) {
-+ try {
-+ intArg = Integer.parseInt(args[0]);
-+ } catch (NumberFormatException e) {
-+ System.err.println("arg " + args[0] + " must be an integer");
-+ System.exit(1);
-+ }
-+ }
-+ TestJNI.doSomething(intArg);
-+ }
-+}
-+
---- ./hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java 2014-07-15 21:48:35.000000000 -0700
-@@ -0,0 +1,389 @@
-+/*
-+ * 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 TestLargePagesFlags
-+ * @summary Tests how large pages are choosen depending on the given large pages flag combinations.
-+ * @library /testlibrary
-+ * @run main TestLargePagesFlags
-+ */
-+
-+import com.oracle.java.testlibrary.OutputAnalyzer;
-+import com.oracle.java.testlibrary.Platform;
-+import com.oracle.java.testlibrary.ProcessTools;
-+import java.util.ArrayList;
-+
-+public class TestLargePagesFlags {
-+
-+ public static void main(String [] args) throws Exception {
-+ if (!Platform.isLinux()) {
-+ System.out.println("Skipping. TestLargePagesFlags has only been implemented for Linux.");
-+ return;
-+ }
-+
-+ testUseTransparentHugePages();
-+ testUseHugeTLBFS();
-+ testUseSHM();
-+ testCombinations();
-+ }
-+
-+ public static void testUseTransparentHugePages() throws Exception {
-+ if (!canUse(UseTransparentHugePages(true))) {
-+ System.out.println("Skipping testUseTransparentHugePages");
-+ return;
-+ }
-+
-+ // -XX:-UseLargePages overrides all other flags.
-+ new FlagTester()
-+ .use(UseLargePages(false),
-+ UseTransparentHugePages(true))
-+ .expect(
-+ UseLargePages(false),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+ // Explicitly turn on UseTransparentHugePages.
-+ new FlagTester()
-+ .use(UseTransparentHugePages(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(true),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseTransparentHugePages(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(true),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+ // Setting a specific large pages flag will turn
-+ // off heuristics to choose large pages type.
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseTransparentHugePages(false))
-+ .expect(
-+ UseLargePages(false),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+ // Don't turn on UseTransparentHugePages
-+ // unless the user explicitly asks for them.
-+ new FlagTester()
-+ .use(UseLargePages(true))
-+ .expect(
-+ UseTransparentHugePages(false));
-+ }
-+
-+ public static void testUseHugeTLBFS() throws Exception {
-+ if (!canUse(UseHugeTLBFS(true))) {
-+ System.out.println("Skipping testUseHugeTLBFS");
-+ return;
-+ }
-+
-+ // -XX:-UseLargePages overrides all other flags.
-+ new FlagTester()
-+ .use(UseLargePages(false),
-+ UseHugeTLBFS(true))
-+ .expect(
-+ UseLargePages(false),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+ // Explicitly turn on UseHugeTLBFS.
-+ new FlagTester()
-+ .use(UseHugeTLBFS(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(true),
-+ UseSHM(false));
-+
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseHugeTLBFS(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(true),
-+ UseSHM(false));
-+
-+ // Setting a specific large pages flag will turn
-+ // off heuristics to choose large pages type.
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseHugeTLBFS(false))
-+ .expect(
-+ UseLargePages(false),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+ // Using UseLargePages will default to UseHugeTLBFS large pages.
-+ new FlagTester()
-+ .use(UseLargePages(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(true),
-+ UseSHM(false));
-+ }
-+
-+ public static void testUseSHM() throws Exception {
-+ if (!canUse(UseSHM(true))) {
-+ System.out.println("Skipping testUseSHM");
-+ return;
-+ }
-+
-+ // -XX:-UseLargePages overrides all other flags.
-+ new FlagTester()
-+ .use(UseLargePages(false),
-+ UseSHM(true))
-+ .expect(
-+ UseLargePages(false),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+ // Explicitly turn on UseSHM.
-+ new FlagTester()
-+ .use(UseSHM(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(true)) ;
-+
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseSHM(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(true)) ;
-+
-+ // Setting a specific large pages flag will turn
-+ // off heuristics to choose large pages type.
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseSHM(false))
-+ .expect(
-+ UseLargePages(false),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+ // Setting UseLargePages can allow the system to choose
-+ // UseHugeTLBFS instead of UseSHM, but never UseTransparentHugePages.
-+ new FlagTester()
-+ .use(UseLargePages(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(false));
-+ }
-+
-+ public static void testCombinations() throws Exception {
-+ if (!canUse(UseSHM(true)) || !canUse(UseHugeTLBFS(true))) {
-+ System.out.println("Skipping testUseHugeTLBFSAndUseSHMCombination");
-+ return;
-+ }
-+
-+ // UseHugeTLBFS takes precedence over SHM.
-+
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseHugeTLBFS(true),
-+ UseSHM(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(true),
-+ UseSHM(false));
-+
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseHugeTLBFS(false),
-+ UseSHM(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(true));
-+
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseHugeTLBFS(true),
-+ UseSHM(false))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(true),
-+ UseSHM(false));
-+
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseHugeTLBFS(false),
-+ UseSHM(false))
-+ .expect(
-+ UseLargePages(false),
-+ UseTransparentHugePages(false),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+
-+ if (!canUse(UseTransparentHugePages(true))) {
-+ return;
-+ }
-+
-+ // UseTransparentHugePages takes precedence.
-+
-+ new FlagTester()
-+ .use(UseLargePages(true),
-+ UseTransparentHugePages(true),
-+ UseHugeTLBFS(true),
-+ UseSHM(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(true),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+
-+ new FlagTester()
-+ .use(UseTransparentHugePages(true),
-+ UseHugeTLBFS(true),
-+ UseSHM(true))
-+ .expect(
-+ UseLargePages(true),
-+ UseTransparentHugePages(true),
-+ UseHugeTLBFS(false),
-+ UseSHM(false));
-+ }
-+
-+ private static class FlagTester {
-+ private Flag [] useFlags;
-+
-+ public FlagTester use(Flag... useFlags) {
-+ this.useFlags = useFlags;
-+ return this;
-+ }
-+
-+ public void expect(Flag... expectedFlags) throws Exception {
-+ if (useFlags == null) {
-+ throw new IllegalStateException("Must run use() before expect()");
-+ }
-+
-+ OutputAnalyzer output = executeNewJVM(useFlags);
-+
-+ for (Flag flag : expectedFlags) {
-+ System.out.println("Looking for: " + flag.flagString());
-+ String strValue = output.firstMatch(".* " + flag.name() + " .* :?= (\\S+).*", 1);
-+
-+ if (strValue == null) {
-+ throw new RuntimeException("Flag " + flag.name() + " couldn't be found");
-+ }
-+
-+ if (!flag.value().equals(strValue)) {
-+ throw new RuntimeException("Wrong value for: " + flag.name()
-+ + " expected: " + flag.value()
-+ + " got: " + strValue);
-+ }
-+ }
-+
-+ output.shouldHaveExitValue(0);
-+ }
-+ }
-+
-+ private static OutputAnalyzer executeNewJVM(Flag... flags) throws Exception {
-+ ArrayList<String> args = new ArrayList<>();
-+ for (Flag flag : flags) {
-+ args.add(flag.flagString());
-+ }
-+ args.add("-XX:+PrintFlagsFinal");
-+ args.add("-version");
-+
-+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args.toArray(new String[args.size()]));
-+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
-+
-+ return output;
-+ }
-+
-+ private static boolean canUse(Flag flag) {
-+ try {
-+ new FlagTester().use(flag).expect(flag);
-+ } catch (Exception e) {
-+ return false;
-+ }
-+
-+ return true;
-+ }
-+
-+ private static Flag UseLargePages(boolean value) {
-+ return new BooleanFlag("UseLargePages", value);
-+ }
-+
-+ private static Flag UseTransparentHugePages(boolean value) {
-+ return new BooleanFlag("UseTransparentHugePages", value);
-+ }
-+
-+ private static Flag UseHugeTLBFS(boolean value) {
-+ return new BooleanFlag("UseHugeTLBFS", value);
-+ }
-+
-+ private static Flag UseSHM(boolean value) {
-+ return new BooleanFlag("UseSHM", value);
-+ }
-+
-+ private static class BooleanFlag implements Flag {
-+ private String name;
-+ private boolean value;
-+
-+ BooleanFlag(String name, boolean value) {
-+ this.name = name;
-+ this.value = value;
-+ }
-+
-+ public String flagString() {
-+ return "-XX:" + (value ? "+" : "-") + name;
-+ }
-+
-+ public String name() {
-+ return name;
-+ }
-+
-+ public String value() {
-+ return Boolean.toString(value);
-+ }
-+ }
-+
-+ private static interface Flag {
-+ public String flagString();
-+ public String name();
-+ public String value();
-+ }
-+}
---- ./hotspot/test/testlibrary/ClassFileInstaller.java 2013-09-06 11:22:20.000000000 -0700
-+++ ./hotspot/test/testlibrary/ClassFileInstaller.java 2014-10-28 20:19:38.000000000 -0700
-@@ -45,7 +45,9 @@
-
- // Create the class file's package directory
- Path p = Paths.get(pathName);
-- Files.createDirectories(p.getParent());
-+ if (pathName.contains("/")) {
-+ Files.createDirectories(p.getParent());
-+ }
- // Create the class file
- Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
- }
---- ./hotspot/test/testlibrary/OutputAnalyzerTest.java 2013-09-06 11:22:20.000000000 -0700
-+++ ./hotspot/test/testlibrary/OutputAnalyzerTest.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,176 +0,0 @@
--/*
-- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation.
-- *
-- * 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 Test the OutputAnalyzer utility class
-- * @library /testlibrary
-- */
--
--import com.oracle.java.testlibrary.OutputAnalyzer;
--
--public class OutputAnalyzerTest {
--
-- public static void main(String args[]) throws Exception {
--
-- String stdout = "aaaaaa";
-- String stderr = "bbbbbb";
--
-- // Regexps used for testing pattern matching of the test input
-- String stdoutPattern = "[a]";
-- String stderrPattern = "[b]";
-- String nonExistingPattern = "[c]";
--
-- OutputAnalyzer output = new OutputAnalyzer(stdout, stderr);
--
-- if (!stdout.equals(output.getStdout())) {
-- throw new Exception("getStdout() returned '" + output.getStdout() + "', expected '" + stdout + "'");
-- }
--
-- if (!stderr.equals(output.getStderr())) {
-- throw new Exception("getStderr() returned '" + output.getStderr() + "', expected '" + stderr + "'");
-- }
--
-- try {
-- output.shouldContain(stdout);
-- output.stdoutShouldContain(stdout);
-- output.shouldContain(stderr);
-- output.stderrShouldContain(stderr);
-- } catch (RuntimeException e) {
-- throw new Exception("shouldContain() failed", e);
-- }
--
-- try {
-- output.shouldContain("cccc");
-- throw new Exception("shouldContain() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- try {
-- output.stdoutShouldContain(stderr);
-- throw new Exception("stdoutShouldContain() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- try {
-- output.stderrShouldContain(stdout);
-- throw new Exception("stdoutShouldContain() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- try {
-- output.shouldNotContain("cccc");
-- output.stdoutShouldNotContain("cccc");
-- output.stderrShouldNotContain("cccc");
-- } catch (RuntimeException e) {
-- throw new Exception("shouldNotContain() failed", e);
-- }
--
-- try {
-- output.shouldNotContain(stdout);
-- throw new Exception("shouldContain() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- try {
-- output.stdoutShouldNotContain(stdout);
-- throw new Exception("shouldContain() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- try {
-- output.stderrShouldNotContain(stderr);
-- throw new Exception("shouldContain() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- // Should match
-- try {
-- output.shouldMatch(stdoutPattern);
-- output.stdoutShouldMatch(stdoutPattern);
-- output.shouldMatch(stderrPattern);
-- output.stderrShouldMatch(stderrPattern);
-- } catch (RuntimeException e) {
-- throw new Exception("shouldMatch() failed", e);
-- }
--
-- try {
-- output.shouldMatch(nonExistingPattern);
-- throw new Exception("shouldMatch() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- try {
-- output.stdoutShouldMatch(stderrPattern);
-- throw new Exception(
-- "stdoutShouldMatch() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- try {
-- output.stderrShouldMatch(stdoutPattern);
-- throw new Exception(
-- "stderrShouldMatch() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- // Should not match
-- try {
-- output.shouldNotMatch(nonExistingPattern);
-- output.stdoutShouldNotMatch(nonExistingPattern);
-- output.stderrShouldNotMatch(nonExistingPattern);
-- } catch (RuntimeException e) {
-- throw new Exception("shouldNotMatch() failed", e);
-- }
--
-- try {
-- output.shouldNotMatch(stdoutPattern);
-- throw new Exception("shouldNotMatch() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- try {
-- output.stdoutShouldNotMatch(stdoutPattern);
-- throw new Exception("shouldNotMatch() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
--
-- try {
-- output.stderrShouldNotMatch(stderrPattern);
-- throw new Exception("shouldNotMatch() failed to throw exception");
-- } catch (RuntimeException e) {
-- // expected
-- }
-- }
--}
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Asserts.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Asserts.java 2014-10-28 20:19:38.000000000 -0700
-@@ -0,0 +1,395 @@
-+/*
-+ * 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.
-+ */
-+
-+package com.oracle.java.testlibrary;
-+
-+/**
-+ * Asserts that can be used for verifying assumptions in tests.
-+ *
-+ * An assertion will throw a {@link RuntimeException} if the assertion isn't
-+ * valid. All the asserts can be imported into a test by using a static
-+ * import:
-+ *
-+ * <pre>
-+ * {@code
-+ * import static com.oracle.java.testlibrary.Asserts.*;
-+ * }
-+ *
-+ * Always provide a message describing the assumption if the line number of the
-+ * failing assertion isn't enough to understand why the assumption failed. For
-+ * example, if the assertion is in a loop or in a method that is called
-+ * multiple times, then the line number won't provide enough context to
-+ * understand the failure.
-+ * </pre>
-+ */
-+public class Asserts {
-+
-+ /**
-+ * Shorthand for {@link #assertLessThan(T, T)}.
-+ *
-+ * @see #assertLessThan(T, T)
-+ */
-+ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs) {
-+ assertLessThan(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertLessThan(T, T, String)}.
-+ *
-+ * @see #assertLessThan(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs, String msg) {
-+ assertLessThan(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertLessThan(T, T, String)} with a default message.
-+ *
-+ * @see #assertLessThan(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertLessThan(T lhs, T rhs) {
-+ String msg = "Expected that " + format(lhs) + " < " + format(rhs);
-+ assertLessThan(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is less than {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static <T extends Comparable<T>>void assertLessThan(T lhs, T rhs, String msg) {
-+ assertTrue(compare(lhs, rhs, msg) < 0, msg);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertLessThanOrEqual(T, T)}.
-+ *
-+ * @see #assertLessThanOrEqual(T, T)
-+ */
-+ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs) {
-+ assertLessThanOrEqual(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertLessThanOrEqual(T, T, String)}.
-+ *
-+ * @see #assertLessThanOrEqual(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs, String msg) {
-+ assertLessThanOrEqual(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertLessThanOrEqual(T, T, String)} with a default message.
-+ *
-+ * @see #assertLessThanOrEqual(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs) {
-+ String msg = "Expected that " + format(lhs) + " <= " + format(rhs);
-+ assertLessThanOrEqual(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is less than or equal to {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs, String msg) {
-+ assertTrue(compare(lhs, rhs, msg) <= 0, msg);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertEquals(T, T)}.
-+ *
-+ * @see #assertEquals(T, T)
-+ */
-+ public static void assertEQ(Object lhs, Object rhs) {
-+ assertEquals(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertEquals(T, T, String)}.
-+ *
-+ * @see #assertEquals(T, T, String)
-+ */
-+ public static void assertEQ(Object lhs, Object rhs, String msg) {
-+ assertEquals(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertEquals(T, T, String)} with a default message.
-+ *
-+ * @see #assertEquals(T, T, String)
-+ */
-+ public static void assertEquals(Object lhs, Object rhs) {
-+ String msg = "Expected " + format(lhs) + " to equal " + format(rhs);
-+ assertEquals(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is equal to {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertEquals(Object lhs, Object rhs, String msg) {
-+ if (lhs == null) {
-+ if (rhs != null) {
-+ error(msg);
-+ }
-+ } else {
-+ assertTrue(lhs.equals(rhs), msg);
-+ }
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertGreaterThanOrEqual(T, T)}.
-+ *
-+ * @see #assertGreaterThanOrEqual(T, T)
-+ */
-+ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs) {
-+ assertGreaterThanOrEqual(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertGreaterThanOrEqual(T, T, String)}.
-+ *
-+ * @see #assertGreaterThanOrEqual(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs, String msg) {
-+ assertGreaterThanOrEqual(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertGreaterThanOrEqual(T, T, String)} with a default message.
-+ *
-+ * @see #assertGreaterThanOrEqual(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs) {
-+ String msg = "Expected that " + format(lhs) + " >= " + format(rhs);
-+ assertGreaterThanOrEqual(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is greater than or equal to {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs, String msg) {
-+ assertTrue(compare(lhs, rhs, msg) >= 0, msg);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertGreaterThan(T, T)}.
-+ *
-+ * @see #assertGreaterThan(T, T)
-+ */
-+ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs) {
-+ assertGreaterThan(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertGreaterThan(T, T, String)}.
-+ *
-+ * @see #assertGreaterThan(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs, String msg) {
-+ assertGreaterThan(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertGreaterThan(T, T, String)} with a default message.
-+ *
-+ * @see #assertGreaterThan(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs) {
-+ String msg = "Expected that " + format(lhs) + " > " + format(rhs);
-+ assertGreaterThan(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is greater than {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, String msg) {
-+ assertTrue(compare(lhs, rhs, msg) > 0, msg);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertNotEquals(T, T)}.
-+ *
-+ * @see #assertNotEquals(T, T)
-+ */
-+ public static void assertNE(Object lhs, Object rhs) {
-+ assertNotEquals(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertNotEquals(T, T, String)}.
-+ *
-+ * @see #assertNotEquals(T, T, String)
-+ */
-+ public static void assertNE(Object lhs, Object rhs, String msg) {
-+ assertNotEquals(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertNotEquals(T, T, String)} with a default message.
-+ *
-+ * @see #assertNotEquals(T, T, String)
-+ */
-+ public static void assertNotEquals(Object lhs, Object rhs) {
-+ String msg = "Expected " + format(lhs) + " to not equal " + format(rhs);
-+ assertNotEquals(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is not equal to {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertNotEquals(Object lhs, Object rhs, String msg) {
-+ if (lhs == null) {
-+ if (rhs == null) {
-+ error(msg);
-+ }
-+ } else {
-+ assertFalse(lhs.equals(rhs), msg);
-+ }
-+ }
-+
-+ /**
-+ * Calls {@link #assertNull(Object, String)} with a default message.
-+ *
-+ * @see #assertNull(Object, String)
-+ */
-+ public static void assertNull(Object o) {
-+ assertNull(o, "Expected " + format(o) + " to be null");
-+ }
-+
-+ /**
-+ * Asserts that {@code o} is null.
-+ *
-+ * @param o The reference assumed to be null.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertNull(Object o, String msg) {
-+ assertEquals(o, null, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertNotNull(Object, String)} with a default message.
-+ *
-+ * @see #assertNotNull(Object, String)
-+ */
-+ public static void assertNotNull(Object o) {
-+ assertNotNull(o, "Expected non null reference");
-+ }
-+
-+ /**
-+ * Asserts that {@code o} is <i>not</i> null.
-+ *
-+ * @param o The reference assumed <i>not</i> to be null,
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertNotNull(Object o, String msg) {
-+ assertNotEquals(o, null, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertFalse(boolean, String)} with a default message.
-+ *
-+ * @see #assertFalse(boolean, String)
-+ */
-+ public static void assertFalse(boolean value) {
-+ assertFalse(value, "Expected value to be false");
-+ }
-+
-+ /**
-+ * Asserts that {@code value} is {@code false}.
-+ *
-+ * @param value The value assumed to be false.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertFalse(boolean value, String msg) {
-+ assertTrue(!value, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertTrue(boolean, String)} with a default message.
-+ *
-+ * @see #assertTrue(boolean, String)
-+ */
-+ public static void assertTrue(boolean value) {
-+ assertTrue(value, "Expected value to be true");
-+ }
-+
-+ /**
-+ * Asserts that {@code value} is {@code true}.
-+ *
-+ * @param value The value assumed to be true.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertTrue(boolean value, String msg) {
-+ if (!value) {
-+ error(msg);
-+ }
-+ }
-+
-+ private static <T extends Comparable<T>> int compare(T lhs, T rhs, String msg) {
-+ assertNotNull(lhs, msg);
-+ assertNotNull(rhs, msg);
-+ return lhs.compareTo(rhs);
-+ }
-+
-+ private static String format(Object o) {
-+ return o == null? "null" : o.toString();
-+ }
-+
-+ private static void error(String msg) {
-+ throw new RuntimeException(msg);
-+ }
-+
-+}
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/ByteCodeLoader.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/ByteCodeLoader.java 2014-10-28 20:19:38.000000000 -0700
-@@ -0,0 +1,74 @@
-+/*
-+ * 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.
-+ */
-+
-+package com.oracle.java.testlibrary;
-+
-+import java.security.SecureClassLoader;
-+
-+/**
-+ * {@code ByteCodeLoader} can be used for easy loading of byte code already
-+ * present in memory.
-+ *
-+ * {@code InMemoryCompiler} can be used for compiling source code in a string
-+ * into byte code, which then can be loaded with {@code ByteCodeLoader}.
-+ *
-+ * @see InMemoryCompiler
-+ */
-+public class ByteCodeLoader extends SecureClassLoader {
-+ private final String className;
-+ private final byte[] byteCode;
-+
-+ /**
-+ * Creates a new {@code ByteCodeLoader} ready to load a class with the
-+ * given name and the given byte code.
-+ *
-+ * @param className The name of the class
-+ * @param byteCode The byte code of the class
-+ */
-+ public ByteCodeLoader(String className, byte[] byteCode) {
-+ this.className = className;
-+ this.byteCode = byteCode;
-+ }
-+
-+ @Override
-+ protected Class<?> findClass(String name) throws ClassNotFoundException {
-+ if (!name.equals(className)) {
-+ throw new ClassNotFoundException(name);
-+ }
-+
-+ return defineClass(name, byteCode, 0, byteCode.length);
-+ }
-+
-+ /**
-+ * Utility method for creating a new {@code ByteCodeLoader} and then
-+ * directly load the given byte code.
-+ *
-+ * @param className The name of the class
-+ * @param byteCode The byte code for the class
-+ * @throws ClassNotFoundException if the class can't be loaded
-+ * @return A {@see Class} object representing the class
-+ */
-+ public static Class<?> load(String className, byte[] byteCode) throws ClassNotFoundException {
-+ return new ByteCodeLoader(className, byteCode).loadClass(className);
-+ }
-+}
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/DynamicVMOptionChecker.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/DynamicVMOptionChecker.java 2014-07-15 21:48:36.000000000 -0700
-@@ -0,0 +1,111 @@
-+/*
-+ * 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.
-+ */
-+package com.oracle.java.testlibrary;
-+
-+import com.sun.management.HotSpotDiagnosticMXBean;
-+import com.sun.management.VMOption;
-+import java.lang.management.ManagementFactory;
-+
-+/**
-+ * Simple class to check writeability, invalid and valid values for VMOption
-+ */
-+public class DynamicVMOptionChecker {
-+
-+ /**
-+ * Reads VM option from PlatformMXBean and parse it to integer value
-+ *
-+ * @param name of option
-+ * @return parsed value
-+ */
-+ public static int getIntValue(String name) {
-+
-+ VMOption option = ManagementFactory.
-+ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
-+ getVMOption(name);
-+
-+ return Integer.parseInt(option.getValue());
-+ }
-+
-+ /**
-+ * Checks that VM option is dynamically writable
-+ *
-+ * @param name
-+ * @throws RuntimeException if option if not writable
-+ * @return always true
-+ */
-+ public static boolean checkIsWritable(String name) {
-+ VMOption option = ManagementFactory.
-+ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
-+ getVMOption(name);
-+
-+ if (!option.isWriteable()) {
-+ throw new RuntimeException(name + " is not writable");
-+ }
-+
-+ return true;
-+ }
-+
-+ /**
-+ * Checks that value cannot be set
-+ *
-+ * @param name of flag
-+ * @param value string representation of value to set
-+ * @throws RuntimeException on error - when expected exception hasn't been thrown
-+ */
-+ public static void checkInvalidValue(String name, String value) {
-+ // should throw
-+ try {
-+ ManagementFactory.
-+ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
-+ setVMOption(name, value);
-+
-+ } catch (IllegalArgumentException e) {
-+ return;
-+ }
-+
-+ throw new RuntimeException("Expected IllegalArgumentException was not thrown, " + name + "= " + value);
-+ }
-+
-+ /**
-+ * Checks that value can be set
-+ *
-+ * @param name of flag to set
-+ * @param value string representation of value to set
-+ * @throws RuntimeException on error - when value in VM is not equal to origin
-+ */
-+ public static void checkValidValue(String name, String value) {
-+ ManagementFactory.
-+ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
-+ setVMOption(name, value);
-+
-+ VMOption option = ManagementFactory.
-+ getPlatformMXBean(HotSpotDiagnosticMXBean.class).
-+ getVMOption(name);
-+
-+ if (!option.getValue().equals(value)) {
-+ throw new RuntimeException("Actual value of " + name + " \"" + option.getValue()
-+ + "\" not equal origin \"" + value + "\"");
-+ }
-+ }
-+
-+}
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/InMemoryJavaCompiler.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/InMemoryJavaCompiler.java 2014-10-28 20:19:38.000000000 -0700
-@@ -0,0 +1,154 @@
-+/*
-+ * 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.
-+ */
-+
-+package com.oracle.java.testlibrary;
-+
-+import java.io.ByteArrayOutputStream;
-+import java.io.IOException;
-+import java.io.OutputStream;
-+
-+import java.net.URI;
-+import java.util.Arrays;
-+
-+import javax.tools.ForwardingJavaFileManager;
-+import javax.tools.ForwardingJavaFileManager;
-+import javax.tools.FileObject;
-+import javax.tools.JavaCompiler;
-+import javax.tools.JavaCompiler.CompilationTask;
-+import javax.tools.JavaFileManager;
-+import javax.tools.JavaFileObject;
-+import javax.tools.JavaFileObject.Kind;
-+import javax.tools.SimpleJavaFileObject;
-+import javax.tools.ToolProvider;
-+
-+/**
-+ * {@code InMemoryJavaCompiler} can be used for compiling a {@link
-+ * CharSequence} to a {@code byte[]}.
-+ *
-+ * The compiler will not use the file system at all, instead using a {@link
-+ * ByteArrayOutputStream} for storing the byte code. For the source code, any
-+ * kind of {@link CharSequence} can be used, e.g. {@link String}, {@link
-+ * StringBuffer} or {@link StringBuilder}.
-+ *
-+ * The {@code InMemoryCompiler} can easily be used together with a {@code
-+ * ByteClassLoader} to easily compile and load source code in a {@link String}:
-+ *
-+ * <pre>
-+ * {@code
-+ * import com.oracle.java.testlibrary.InMemoryJavaCompiler;
-+ * import com.oracle.java.testlibrary.ByteClassLoader;
-+ *
-+ * class Example {
-+ * public static void main(String[] args) {
-+ * String className = "Foo";
-+ * String sourceCode = "public class " + className + " {" +
-+ * " public void bar() {" +
-+ * " System.out.println("Hello from bar!");" +
-+ * " }" +
-+ * "}";
-+ * byte[] byteCode = InMemoryJavaCompiler.compile(className, sourceCode);
-+ * Class fooClass = ByteClassLoader.load(className, byteCode);
-+ * }
-+ * }
-+ * }
-+ * </pre>
-+ */
-+public class InMemoryJavaCompiler {
-+ private static class MemoryJavaFileObject extends SimpleJavaFileObject {
-+ private final String className;
-+ private final CharSequence sourceCode;
-+ private final ByteArrayOutputStream byteCode;
-+
-+ public MemoryJavaFileObject(String className, CharSequence sourceCode) {
-+ super(URI.create("string:///" + className.replace('.','/') + Kind.SOURCE.extension), Kind.SOURCE);
-+ this.className = className;
-+ this.sourceCode = sourceCode;
-+ this.byteCode = new ByteArrayOutputStream();
-+ }
-+
-+ @Override
-+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
-+ return sourceCode;
-+ }
-+
-+ @Override
-+ public OutputStream openOutputStream() throws IOException {
-+ return byteCode;
-+ }
-+
-+ public byte[] getByteCode() {
-+ return byteCode.toByteArray();
-+ }
-+
-+ public String getClassName() {
-+ return className;
-+ }
-+ }
-+
-+ private static class FileManagerWrapper extends ForwardingJavaFileManager {
-+ private MemoryJavaFileObject file;
-+
-+ public FileManagerWrapper(MemoryJavaFileObject file) {
-+ super(getCompiler().getStandardFileManager(null, null, null));
-+ this.file = file;
-+ }
-+
-+ @Override
-+ public JavaFileObject getJavaFileForOutput(Location location, String className,
-+ Kind kind, FileObject sibling)
-+ throws IOException {
-+ if (!file.getClassName().equals(className)) {
-+ throw new IOException("Expected class with name " + file.getClassName() +
-+ ", but got " + className);
-+ }
-+ return file;
-+ }
-+ }
-+
-+ /**
-+ * Compiles the class with the given name and source code.
-+ *
-+ * @param className The name of the class
-+ * @param sourceCode The source code for the class with name {@code className}
-+ * @throws RuntimeException if the compilation did not succeed
-+ * @return The resulting byte code from the compilation
-+ */
-+ public static byte[] compile(String className, CharSequence sourceCode) {
-+ MemoryJavaFileObject file = new MemoryJavaFileObject(className, sourceCode);
-+ CompilationTask task = getCompilationTask(file);
-+
-+ if(!task.call()) {
-+ throw new RuntimeException("Could not compile " + className + " with source code " + sourceCode);
-+ }
-+
-+ return file.getByteCode();
-+ }
-+
-+ private static JavaCompiler getCompiler() {
-+ return ToolProvider.getSystemJavaCompiler();
-+ }
-+
-+ private static CompilationTask getCompilationTask(MemoryJavaFileObject file) {
-+ return getCompiler().getTask(null, new FileManagerWrapper(file), null, null, null, Arrays.asList(file));
-+ }
-+}
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/InputArguments.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/InputArguments.java 2014-10-28 20:19:38.000000000 -0700
-@@ -0,0 +1,76 @@
-+/*
-+ * 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.
-+ */
-+
-+package com.oracle.java.testlibrary;
-+
-+import java.lang.management.RuntimeMXBean;
-+import java.lang.management.ManagementFactory;
-+import java.util.List;
-+
-+/**
-+ * This class provides access to the input arguments to the VM.
-+ */
-+public class InputArguments {
-+ private static final List<String> args;
-+
-+ static {
-+ RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
-+ args = runtimeMxBean.getInputArguments();
-+ }
-+
-+ /**
-+ * Returns true if {@code arg} is an input argument to the VM.
-+ *
-+ * This is useful for checking boolean flags such as -XX:+UseSerialGC or
-+ * -XX:-UsePerfData.
-+ *
-+ * @param arg The name of the argument.
-+ * @return {@code true} if the given argument is an input argument,
-+ * otherwise {@code false}.
-+ */
-+ public static boolean contains(String arg) {
-+ return args.contains(arg);
-+ }
-+
-+ /**
-+ * Returns true if {@code prefix} is the start of an input argument to the
-+ * VM.
-+ *
-+ * This is useful for checking if flags describing a quantity, such as
-+ * -XX:+MaxMetaspaceSize=100m, is set without having to know the quantity.
-+ * To check if the flag -XX:MaxMetaspaceSize is set, use
-+ * {@code InputArguments.containsPrefix("-XX:MaxMetaspaceSize")}.
-+ *
-+ * @param prefix The start of the argument.
-+ * @return {@code true} if the given argument is the start of an input
-+ * argument, otherwise {@code false}.
-+ */
-+ public static boolean containsPrefix(String prefix) {
-+ for (String arg : args) {
-+ if (arg.startsWith(prefix)) {
-+ return true;
-+ }
-+ }
-+ return false;
-+ }
-+}
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java 2013-09-06 11:22:20.000000000 -0700
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java 2014-10-28 20:19:38.000000000 -0700
-@@ -23,28 +23,84 @@
-
- package com.oracle.java.testlibrary;
-
--import java.io.File;
-+import java.io.FileNotFoundException;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-
- public final class JDKToolFinder {
-
-- private JDKToolFinder() {
-- }
-+ private JDKToolFinder() {
-+ }
-+
-+ /**
-+ * Returns the full path to an executable in jdk/bin based on System
-+ * property {@code test.jdk} or {@code compile.jdk} (both are set by the jtreg test suite)
-+ *
-+ * @return Full path to an executable in jdk/bin
-+ */
-+ public static String getJDKTool(String tool) {
-+
-+ // First try to find the executable in test.jdk
-+ try {
-+ return getTool(tool, "test.jdk");
-+ } catch (FileNotFoundException e) {
-+
-+ }
-+
-+ // Now see if it's available in compile.jdk
-+ try {
-+ return getTool(tool, "compile.jdk");
-+ } catch (FileNotFoundException e) {
-+ throw new RuntimeException("Failed to find " + tool +
-+ ", looked in test.jdk (" + System.getProperty("test.jdk") +
-+ ") and compile.jdk (" + System.getProperty("compile.jdk") + ")");
-+ }
-+ }
-
-- /**
-- * Returns the full path to an executable in jdk/bin based on System property
-- * test.jdk (set by jtreg test suite)
-- *
-- * @return Full path to an executable in jdk/bin
-- */
-- public static String getJDKTool(String tool) {
-- String binPath = System.getProperty("test.jdk");
-- if (binPath == null) {
-- throw new RuntimeException("System property 'test.jdk' not set. This property is normally set by jtreg. "
-- + "When running test separately, set this property using '-Dtest.jdk=/path/to/jdk'.");
-+ /**
-+ * Returns the full path to an executable in jdk/bin based on System
-+ * property {@code compile.jdk}
-+ *
-+ * @return Full path to an executable in jdk/bin
-+ */
-+ public static String getCompileJDKTool(String tool) {
-+ try {
-+ return getTool(tool, "compile.jdk");
-+ } catch (FileNotFoundException e) {
-+ throw new RuntimeException(e);
-+ }
- }
-
-- binPath += File.separatorChar + "bin" + File.separatorChar + tool;
-+ /**
-+ * Returns the full path to an executable in jdk/bin based on System
-+ * property {@code test.jdk}
-+ *
-+ * @return Full path to an executable in jdk/bin
-+ */
-+ public static String getTestJDKTool(String tool) {
-+ try {
-+ return getTool(tool, "test.jdk");
-+ } catch (FileNotFoundException e) {
-+ throw new RuntimeException(e);
-+ }
-+ }
-
-- return binPath;
-- }
-+ private static String getTool(String tool, String property) throws FileNotFoundException {
-+ String jdkPath = System.getProperty(property);
-+
-+ if (jdkPath == null) {
-+ throw new RuntimeException(
-+ "System property '" + property + "' not set. This property is normally set by jtreg. "
-+ + "When running test separately, set this property using '-D" + property + "=/path/to/jdk'.");
-+ }
-+
-+ Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : ""));
-+
-+ Path jdkTool = Paths.get(jdkPath, toolName.toString());
-+ if (!jdkTool.toFile().exists()) {
-+ throw new FileNotFoundException("Could not find file " + jdkTool.toAbsolutePath());
-+ }
-+
-+ return jdkTool.toAbsolutePath().toString();
-+ }
- }
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java 2014-10-28 20:19:38.000000000 -0700
-@@ -0,0 +1,134 @@
-+/*
-+ * 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.
-+ */
-+
-+package com.oracle.java.testlibrary;
-+
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.List;
-+
-+/**
-+ * A utility for constructing command lines for starting JDK tool processes.
-+ *
-+ * The JDKToolLauncher can in particular be combined with a
-+ * java.lang.ProcessBuilder to easily run a JDK tool. For example, the following
-+ * code run {@code jmap -heap} against a process with GC logging turned on for
-+ * the {@code jmap} process:
-+ *
-+ * <pre>
-+ * {@code
-+ * JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
-+ * .addVMArg("-XX:+PrintGC");
-+ * .addVMArg("-XX:+PrintGCDetails")
-+ * .addToolArg("-heap")
-+ * .addToolArg(pid);
-+ * ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
-+ * Process p = pb.start();
-+ * }
-+ * </pre>
-+ */
-+public class JDKToolLauncher {
-+ private final String executable;
-+ private final List<String> vmArgs = new ArrayList<String>();
-+ private final List<String> toolArgs = new ArrayList<String>();
-+
-+ private JDKToolLauncher(String tool, boolean useCompilerJDK) {
-+ if (useCompilerJDK) {
-+ executable = JDKToolFinder.getJDKTool(tool);
-+ } else {
-+ executable = JDKToolFinder.getTestJDKTool(tool);
-+ }
-+ vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
-+ }
-+
-+ /**
-+ * Creates a new JDKToolLauncher for the specified tool. Using tools path
-+ * from the compiler JDK.
-+ *
-+ * @param tool
-+ * The name of the tool
-+ * @return A new JDKToolLauncher
-+ */
-+ public static JDKToolLauncher create(String tool) {
-+ return new JDKToolLauncher(tool, true);
-+ }
-+
-+ /**
-+ * Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
-+ *
-+ * @param tool
-+ * The name of the tool
-+ *
-+ * @return A new JDKToolLauncher
-+ */
-+ public static JDKToolLauncher createUsingTestJDK(String tool) {
-+ return new JDKToolLauncher(tool, false);
-+ }
-+
-+ /**
-+ * Adds an argument to the JVM running the tool.
-+ *
-+ * The JVM arguments are passed to the underlying JVM running the tool.
-+ * Arguments will automatically be prepended with "-J".
-+ *
-+ * Any platform specific arguments required for running the tool are
-+ * automatically added.
-+ *
-+ *
-+ * @param arg
-+ * The argument to VM running the tool
-+ * @return The JDKToolLauncher instance
-+ */
-+ public JDKToolLauncher addVMArg(String arg) {
-+ vmArgs.add(arg);
-+ return this;
-+ }
-+
-+ /**
-+ * Adds an argument to the tool.
-+ *
-+ * @param arg
-+ * The argument to the tool
-+ * @return The JDKToolLauncher instance
-+ */
-+ public JDKToolLauncher addToolArg(String arg) {
-+ toolArgs.add(arg);
-+ return this;
-+ }
-+
-+ /**
-+ * Returns the command that can be used for running the tool.
-+ *
-+ * @return An array whose elements are the arguments of the command.
-+ */
-+ public String[] getCommand() {
-+ List<String> command = new ArrayList<String>();
-+ command.add(executable);
-+ // Add -J in front of all vmArgs
-+ for (String arg : vmArgs) {
-+ command.add("-J" + arg);
-+ }
-+ command.addAll(toolArgs);
-+ return command.toArray(new String[command.size()]);
-+ }
-+}
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java 2013-09-06 11:22:20.000000000 -0700
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java 2014-10-28 20:19:38.000000000 -0700
-@@ -76,7 +76,8 @@
- */
- public void shouldContain(String expectedString) {
- if (!stdout.contains(expectedString) && !stderr.contains(expectedString)) {
-- throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr: [" + stdout + stderr + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr \n");
- }
- }
-
-@@ -88,7 +89,8 @@
- */
- public void stdoutShouldContain(String expectedString) {
- if (!stdout.contains(expectedString)) {
-- throw new RuntimeException("'" + expectedString + "' missing from stdout: [" + stdout + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + expectedString + "' missing from stdout \n");
- }
- }
-
-@@ -100,7 +102,8 @@
- */
- public void stderrShouldContain(String expectedString) {
- if (!stderr.contains(expectedString)) {
-- throw new RuntimeException("'" + expectedString + "' missing from stderr: [" + stderr + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + expectedString + "' missing from stderr \n");
- }
- }
-
-@@ -112,10 +115,12 @@
- */
- public void shouldNotContain(String notExpectedString) {
- if (stdout.contains(notExpectedString)) {
-- throw new RuntimeException("'" + notExpectedString + "' found in stdout: [" + stdout + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
- }
- if (stderr.contains(notExpectedString)) {
-- throw new RuntimeException("'" + notExpectedString + "' found in stderr: [" + stderr + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
- }
- }
-
-@@ -127,7 +132,8 @@
- */
- public void stdoutShouldNotContain(String notExpectedString) {
- if (stdout.contains(notExpectedString)) {
-- throw new RuntimeException("'" + notExpectedString + "' found in stdout: [" + stdout + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
- }
- }
-
-@@ -139,7 +145,8 @@
- */
- public void stderrShouldNotContain(String notExpectedString) {
- if (stderr.contains(notExpectedString)) {
-- throw new RuntimeException("'" + notExpectedString + "' found in stderr: [" + stderr + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
- }
- }
-
-@@ -154,9 +161,9 @@
- Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (!stdoutMatcher.find() && !stderrMatcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' missing from stdout/stderr: [" + stdout + stderr
-- + "]\n");
-+ + "' missing from stdout/stderr \n");
- }
- }
-
-@@ -170,8 +177,9 @@
- public void stdoutShouldMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (!matcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' missing from stdout: [" + stdout + "]\n");
-+ + "' missing from stdout \n");
- }
- }
-
-@@ -185,8 +193,9 @@
- public void stderrShouldMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (!matcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' missing from stderr: [" + stderr + "]\n");
-+ + "' missing from stderr \n");
- }
- }
-
-@@ -200,13 +209,15 @@
- public void shouldNotMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (matcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' found in stdout: [" + stdout + "]\n");
-+ + "' found in stdout: '" + matcher.group() + "' \n");
- }
- matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (matcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' found in stderr: [" + stderr + "]\n");
-+ + "' found in stderr: '" + matcher.group() + "' \n");
- }
- }
-
-@@ -220,8 +231,9 @@
- public void stdoutShouldNotMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (matcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' found in stdout: [" + stdout + "]\n");
-+ + "' found in stdout \n");
- }
- }
-
-@@ -235,23 +247,76 @@
- public void stderrShouldNotMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (matcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' found in stderr: [" + stderr + "]\n");
-+ + "' found in stderr \n");
- }
- }
-
- /**
-- * Verifiy the exit value of the process
-+ * Get the captured group of the first string matching the pattern.
-+ * stderr is searched before stdout.
-+ *
-+ * @param pattern The multi-line pattern to match
-+ * @param group The group to capture
-+ * @return The matched string or null if no match was found
-+ */
-+ public String firstMatch(String pattern, int group) {
-+ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
-+ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
-+ if (stderrMatcher.find()) {
-+ return stderrMatcher.group(group);
-+ }
-+ if (stdoutMatcher.find()) {
-+ return stdoutMatcher.group(group);
-+ }
-+ return null;
-+ }
-+
-+ /**
-+ * Get the first string matching the pattern.
-+ * stderr is searched before stdout.
-+ *
-+ * @param pattern The multi-line pattern to match
-+ * @return The matched string or null if no match was found
-+ */
-+ public String firstMatch(String pattern) {
-+ return firstMatch(pattern, 0);
-+ }
-+
-+ /**
-+ * Verify the exit value of the process
- *
- * @param expectedExitValue Expected exit value from process
- * @throws RuntimeException If the exit value from the process did not match the expected value
- */
- public void shouldHaveExitValue(int expectedExitValue) {
- if (getExitValue() != expectedExitValue) {
-- throw new RuntimeException("Exit value " + getExitValue() + " , expected to get " + expectedExitValue);
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("Expected to get exit value of ["
-+ + expectedExitValue + "]\n");
- }
- }
-
-+
-+ /**
-+ * Report summary that will help to diagnose the problem
-+ * Currently includes:
-+ * - standard input produced by the process under test
-+ * - standard output
-+ * - exit code
-+ * Note: the command line is printed by the ProcessTools
-+ */
-+ private void reportDiagnosticSummary() {
-+ String msg =
-+ " stdout: [" + stdout + "];\n" +
-+ " stderr: [" + stderr + "]\n" +
-+ " exitValue = " + getExitValue() + "\n";
-+
-+ System.err.println(msg);
-+ }
-+
-+
- /**
- * Get the contents of the output buffer (stdout and stderr)
- *
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounter.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounter.java 2014-10-28 20:19:38.000000000 -0700
-@@ -0,0 +1,70 @@
-+/*
-+ * 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.
-+ */
-+
-+package com.oracle.java.testlibrary;
-+
-+import sun.jvmstat.monitor.Monitor;
-+
-+/**
-+ * Represents a performance counter in the JVM.
-+ *
-+ * See http://openjdk.java.net/groups/hotspot/docs/Serviceability.html#bjvmstat
-+ * for more details about performance counters.
-+ */
-+public class PerfCounter {
-+ private final Monitor monitor;
-+ private final String name;
-+
-+ PerfCounter(Monitor monitor, String name) {
-+ this.monitor = monitor;
-+ this.name = name;
-+ }
-+
-+ /**
-+ * Returns the value of this performance counter as a long.
-+ *
-+ * @return The long value of this performance counter
-+ * @throws RuntimeException If the value of the performance counter isn't a long
-+ */
-+ public long longValue() {
-+ Object value = monitor.getValue();
-+ if (value instanceof Long) {
-+ return ((Long) value).longValue();
-+ }
-+ throw new RuntimeException("Expected " + monitor.getName() + " to have a long value");
-+ }
-+
-+ /**
-+ * Returns the name of the performance counter.
-+ *
-+ * @return The name of the performance counter.
-+ */
-+ public String getName() {
-+ return name;
-+ }
-+
-+ @Override
-+ public String toString() {
-+ return name;
-+ }
-+}
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounters.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounters.java 2014-10-28 20:19:38.000000000 -0700
-@@ -0,0 +1,69 @@
-+/*
-+ * 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.
-+ */
-+
-+package com.oracle.java.testlibrary;
-+
-+import sun.jvmstat.monitor.Monitor;
-+import sun.jvmstat.monitor.MonitorException;
-+import sun.jvmstat.monitor.MonitoredHost;
-+import sun.jvmstat.monitor.MonitoredVm;
-+import sun.jvmstat.monitor.VmIdentifier;
-+
-+/**
-+ * PerfCounters can be used to get a performance counter from the currently
-+ * executing VM.
-+ *
-+ * Throws a runtime exception if an error occurs while communicating with the
-+ * currently executing VM.
-+ */
-+public class PerfCounters {
-+ private final static MonitoredVm vm;
-+
-+ static {
-+ try {
-+ String pid = Integer.toString(ProcessTools.getProcessId());
-+ VmIdentifier vmId = new VmIdentifier(pid);
-+ MonitoredHost host = MonitoredHost.getMonitoredHost(vmId);
-+ vm = host.getMonitoredVm(vmId);
-+ } catch (Exception e) {
-+ throw new RuntimeException("Could not connect to the VM");
-+ }
-+ }
-+
-+ /**
-+ * Returns the performance counter with the given name.
-+ *
-+ * @param name The name of the performance counter.
-+ * @throws IllegalArgumentException If no counter with the given name exists.
-+ * @throws MonitorException If an error occurs while communicating with the VM.
-+ * @return The performance counter with the given name.
-+ */
-+ public static PerfCounter findByName(String name)
-+ throws MonitorException, IllegalArgumentException {
-+ Monitor m = vm.findByName(name);
-+ if (m == null) {
-+ throw new IllegalArgumentException("Did not find a performance counter with name " + name);
-+ }
-+ return new PerfCounter(m, name);
-+ }
-+}
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java 2013-09-06 11:22:20.000000000 -0700
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java 2014-10-28 20:19:38.000000000 -0700
-@@ -24,39 +24,80 @@
- package com.oracle.java.testlibrary;
-
- public class Platform {
-- private static final String osName = System.getProperty("os.name");
-- private static final String dataModel = System.getProperty("sun.arch.data.model");
-- private static final String vmVersion = System.getProperty("java.vm.version");
--
-- public static boolean is64bit() {
-- return dataModel.equals("64");
-- }
--
-- public static boolean isSolaris() {
-- return osName.toLowerCase().startsWith("sunos");
-- }
--
-- public static boolean isWindows() {
-- return osName.toLowerCase().startsWith("win");
-- }
--
-- public static boolean isOSX() {
-- return osName.toLowerCase().startsWith("mac");
-- }
--
-- public static boolean isLinux() {
-- return osName.toLowerCase().startsWith("linux");
-- }
--
-- public static String getOsName() {
-- return osName;
-- }
--
-- public static boolean isDebugBuild() {
-- return vmVersion.toLowerCase().contains("debug");
-- }
--
-- public static String getVMVersion() {
-- return vmVersion;
-- }
-+ private static final String osName = System.getProperty("os.name");
-+ private static final String dataModel = System.getProperty("sun.arch.data.model");
-+ private static final String vmVersion = System.getProperty("java.vm.version");
-+ private static final String osArch = System.getProperty("os.arch");
-+
-+ public static boolean is32bit() {
-+ return dataModel.equals("32");
-+ }
-+
-+ public static boolean is64bit() {
-+ return dataModel.equals("64");
-+ }
-+
-+ public static boolean isSolaris() {
-+ return isOs("sunos");
-+ }
-+
-+ public static boolean isWindows() {
-+ return isOs("win");
-+ }
-+
-+ public static boolean isOSX() {
-+ return isOs("mac");
-+ }
-+
-+ public static boolean isLinux() {
-+ return isOs("linux");
-+ }
-+
-+ private static boolean isOs(String osname) {
-+ return osName.toLowerCase().startsWith(osname.toLowerCase());
-+ }
-+
-+ public static String getOsName() {
-+ return osName;
-+ }
-+
-+ public static boolean isDebugBuild() {
-+ return vmVersion.toLowerCase().contains("debug");
-+ }
-+
-+ public static String getVMVersion() {
-+ return vmVersion;
-+ }
-+
-+ // Returns true for sparc and sparcv9.
-+ public static boolean isSparc() {
-+ return isArch("sparc");
-+ }
-+
-+ public static boolean isARM() {
-+ return isArch("arm");
-+ }
-+
-+ public static boolean isPPC() {
-+ return isArch("ppc");
-+ }
-+
-+ public static boolean isX86() {
-+ // On Linux it's 'i386', Windows 'x86'
-+ return (isArch("i386") || isArch("x86"));
-+ }
-+
-+ public static boolean isX64() {
-+ // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
-+ return (isArch("amd64") || isArch("x86_64"));
-+ }
-+
-+ private static boolean isArch(String archname) {
-+ return osArch.toLowerCase().startsWith(archname.toLowerCase());
-+ }
-+
-+ public static String getOsArch() {
-+ return osArch;
-+ }
-+
- }
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java 2013-09-06 11:22:20.000000000 -0700
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java 2014-10-28 20:19:38.000000000 -0700
-@@ -31,6 +31,7 @@
- import java.lang.reflect.Method;
- import java.util.ArrayList;
- import java.util.Collections;
-+import java.util.List;
-
- import sun.management.VMManagement;
-
-@@ -107,15 +108,29 @@
- }
-
- /**
-+ * Get the string containing input arguments passed to the VM
-+ *
-+ * @return arguments
-+ */
-+ public static String getVmInputArguments() {
-+ RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
-+
-+ List<String> args = runtime.getInputArguments();
-+ StringBuilder result = new StringBuilder();
-+ for (String arg : args)
-+ result.append(arg).append(' ');
-+
-+ return result.toString();
-+ }
-+
-+ /**
- * Get platform specific VM arguments (e.g. -d64 on 64bit Solaris)
- *
- * @return String[] with platform specific arguments, empty if there are none
- */
- public static String[] getPlatformSpecificVMArgs() {
-- String osName = System.getProperty("os.name");
-- String dataModel = System.getProperty("sun.arch.data.model");
-
-- if (osName.equals("SunOS") && dataModel.equals("64")) {
-+ if (Platform.is64bit() && Platform.isSolaris()) {
- return new String[] { "-d64" };
- }
-
-@@ -134,8 +149,13 @@
- Collections.addAll(args, getPlatformSpecificVMArgs());
- Collections.addAll(args, command);
-
-- return new ProcessBuilder(args.toArray(new String[args.size()]));
-+ // Reporting
-+ StringBuilder cmdLine = new StringBuilder();
-+ for (String cmd : args)
-+ cmdLine.append(cmd).append(' ');
-+ System.out.println("Command line: [" + cmdLine.toString() + "]");
-
-+ return new ProcessBuilder(args.toArray(new String[args.size()]));
- }
-
- }
---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/TestDynamicVMOption.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/TestDynamicVMOption.java 2014-07-15 21:48:36.000000000 -0700
-@@ -0,0 +1,95 @@
-+/*
-+ * 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.
-+ */
-+package com.oracle.java.testlibrary;
-+
-+/**
-+ * Simple class to check writeability, invalid and valid values for concrete VMOption
-+ */
-+public class TestDynamicVMOption {
-+
-+ private final String name;
-+ private final int value;
-+
-+ /**
-+ * Constructor
-+ *
-+ * @param name of VM option to test
-+ */
-+ public TestDynamicVMOption(String name) {
-+ this.name = name;
-+ this.value = DynamicVMOptionChecker.getIntValue(name);
-+ System.out.println(this.name + " = " + this.value);
-+ }
-+
-+ /**
-+ * Checks that this value can accept valid percentage values and cannot accept invalid percentage values
-+ *
-+ * @throws RuntimeException
-+ */
-+ public void testPercentageValues() {
-+ checkInvalidValue(Integer.toString(Integer.MIN_VALUE));
-+ checkInvalidValue(Integer.toString(Integer.MAX_VALUE));
-+ checkInvalidValue("-10");
-+ checkInvalidValue("190");
-+ }
-+
-+ /**
-+ * Reads VM option from PlatformMXBean and parse it to integer value
-+ *
-+ * @return value
-+ */
-+ public int getIntValue() {
-+ return DynamicVMOptionChecker.getIntValue(this.name);
-+ }
-+
-+ /**
-+ * Checks that this VM option is dynamically writable
-+ *
-+ * @throws RuntimeException if option if not writable
-+ * @return true
-+ */
-+ public boolean checkIsWritable() throws RuntimeException {
-+ return DynamicVMOptionChecker.checkIsWritable(this.name);
-+ }
-+
-+ /**
-+ * Checks that value for this VM option cannot be set
-+ *
-+ * @param value to check
-+ * @throws RuntimeException on error - when expected exception hasn't been thrown
-+ */
-+ public void checkInvalidValue(String value) {
-+ DynamicVMOptionChecker.checkInvalidValue(this.name, value);
-+ }
-+
-+ /**
-+ * Checks that value for this VM option can be set
-+ *
-+ * @param value to check
-+ * @throws RuntimeException on error - when value in VM is not equal to origin
-+ */
-+ public void checkValidValue(String value) {
-+ DynamicVMOptionChecker.checkValidValue(this.name, value);
-+ }
-+
-+}
---- ./hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java 2013-09-06 11:22:20.000000000 -0700
-+++ ./hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java 2014-07-15 21:48:36.000000000 -0700
-@@ -78,4 +78,7 @@
- public native void NMTUncommitMemory(long addr, long size);
- public native void NMTReleaseMemory(long addr, long size);
- public native boolean NMTWaitForDataMerge();
-+
-+ // Compiler
-+ public native void deoptimizeAll();
- }
---- ./jaxp/.hgtags 2013-09-06 11:22:52.000000000 -0700
-+++ ./jaxp/.hgtags 2014-10-28 20:19:32.000000000 -0700
-@@ -123,6 +123,7 @@
- bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
- 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
- fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
-+3170972bd3928a331c4c64a5c0c9632077fb399a 7u0
- 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
- 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
- 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
-@@ -302,6 +303,22 @@
- 5952538d55e624132f97400332a50b71880c874c jdk7u25-b09
- aa00dd983dd0f5b07269d0648a0325e9b3e0d957 jdk7u25-b10
- 0fb6d76bcd2e8d54d0a69e1c3d2a85d84b3e17a4 jdk7u25-b11
-+7b47e1a26f7cbb8d8d22ea165f2d7fbbbd354c77 jdk7u14-b16
-+77ac1ef42b2fd47cc87b9800f63efdd4cf2fa05d jdk7u14-b17
-+d47975f80a24b55410fa2e2c5f50f3405d83fe73 jdk7u14-b18
-+331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
-+331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
-+c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19
-+5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20
-+d1c8bb1cbc9183fc994b5fedf26886ceda0d59f9 jdk7u14-b21
-+d1c6afebdfe28eb07eb2d03a6911a0f33b619165 jdk7u14-b22
-+0e4c549d3635122145ac88bad7b98716976ca49e jdk7u40-b23
-+d17acb2ee133811baa8eae3436a8c191fc433da1 jdk7u40-b24
-+52bcce690998b4ad91abddae118847f4358c6110 jdk7u40-b25
-+cd764ada36b50e2096ba35b4c27ca8f83b3db964 jdk7u40-b26
-+7626b3fbc822fd4efd5ba3b5fc18f2fef5749597 jdk7u40-b27
-+9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28
-+740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29
- 5e87aee78c91efa65bd5aeb37bcc1c1c637a7f0c jdk7u25-b12
- 83b80c094befd08cbac4247d9b8f12c6a039f23f jdk7u25-b13
- 68cc0d2a49f09b5c611b2775f2e66de1022bdedc jdk7u25-b14
-@@ -343,3 +360,147 @@
- 66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42
- c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43
- 91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60
-+d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
-+c500d4ec41ff2117eabfa33e640b6df2f21deb3d jdk7u40-b61
-+9e3f8ab9d17be6b1a4a097fcc5bc5412013d3e86 jdk7u40-b62
-+1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01
-+72b314bf2ee171bec2157f737ba3bf77fbdf1118 jdk7u45-b02
-+399c58bf22ad35a3527a286123497615100746b2 jdk7u45-b03
-+e66ea9257ba8a77fc64f6f2924584b183767d82b jdk7u45-b04
-+3a6dce39c05c254aba9f3ae57c035bf3facfe8b9 jdk7u45-b05
-+a7b1dcabdebbdbf40040a1c6f8411d2f8d25bb37 jdk7u45-b06
-+abb39bc40bcc91c7f8ebc2867e98f302d9bc8417 jdk7u45-b07
-+72295e1b27e61751cc323b5e4d6781bf7afae0a4 jdk7u45-b08
-+255d92f5ed98915a025484360963d7d09bd77313 jdk7u45-b09
-+28a18e725bb39d47e920ef910f435321fb891a88 jdk7u45-b10
-+3d3b4da34d583e86a3b90b8f69927a37d40f5b57 jdk7u45-b11
-+2ac5c9749223f205cd081ecd0028b2f3ea13f8f8 jdk7u45-b12
-+18a009fdfba2bbc5036f96cbefffcdefe9580bb1 jdk7u45-b13
-+d577bae705f208661733e09a4875d79255897b7b jdk7u45-b14
-+daadec741c9bc5067897eb8803123d0af6c5ebc3 jdk7u45-b15
-+0a8b95184728548be4b20876e05f76e0262e4195 jdk7u45-b16
-+2586d303503b5bb6fd39dc0ce572d6e858caf41c jdk7u45-b17
-+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
-+0df316a3b3111427500a86f3282293dd566ae936 jdk7u51-b03
-+42be8e6266ab1733a890b21cf6cd6c2e1a48972d jdk7u51-b04
-+0655a95d16094971df14171e1c5f841c3a6bd081 jdk7u51-b05
-+13a15fc9b6bf7ac065958e038648fbe9952fd9fa jdk7u51-b06
-+8e4523e579bf86e514b9c82843b440cb79606b41 jdk7u51-b07
-+783ceae9b7369168216d5344475d92de910351e8 jdk7u51-b08
-+7875c882a7516366147bffcaaea550c4089f2fc7 jdk7u51-b09
-+65798d05674dc9453c5935c018d012b11c8697f8 jdk7u51-b10
-+70b5691c44d2830efd4301856e6223fa43894462 jdk7u51-b11
-+807946db29f42477e8d8390be01c7e27280bc85c jdk7u51-b12
-+114654a331e2f97a048d7ed43d06d7512e20e2c1 jdk7u51-b13
-+3161567adae93d12c64b79592bda3046f0c0a22d jdk7u51-b30
-+e85ee81daec2ea2fa21bf804d03431b0664c6dff jdk7u51-b31
-+1a6c3258ad218bf286c47d65e4cd80eb6763f8df jdk7u51-b33
-+9cdc04d76eb19a871c739625acd801ed1b24bed9 jdk7u51-b34
-+807946db29f42477e8d8390be01c7e27280bc85c jdk7u55-b00
-+bb7779a8fc4d14719e907b8890a2665476cf45ae jdk7u55-b01
-+8275dc4db7f852edb331ae48d663d08b9ab2b5c7 jdk7u55-b02
-+381e73f93a83e8d3bfd7dbf79f4f363a8fd6442f jdk7u55-b03
-+c72c57f71c2ba6362d9ccfbf4743947b9ecefcac jdk7u55-b04
-+5592b0c44617022e3c136eedfa1e98d4f254c964 jdk7u65-b00
-+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
-+26187a65c765b3177f1b7ff0638259bf66f9ec47 jdk7u55-b14
-+b81309c6014182819d752a4517d48b201d91b154 jdk7u55-b15
-+5be97f6c25d9eb3ef0a05fc860964cb3d27134b0 jdk7u55-b31
-+94f3ad704f28d5ec65f7a3b1cbf5cfe7e42151f3 jdk7u55-b32
-+476aad2c130e2b1b7033fa6789754c03151da95c jdk7u55-b33
-+32aa4a5892b0567b19da2bc5b72aa3f3a3398130 jdk7u55-b34
-+1f8449a6e05ee0a495ba89c3b4021b46f641ff40 jdk7u55-b35
-+7767e8740aea3283703e634ffdbfccd0fbebe82d jdk7u55-b36
-+d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
-+ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01
-+050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02
-+359b79d99538d17eeb90927a1e4883fcec31661f jdk7u60-b03
-+7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u60-b04
-+673ea3822e59de18ae5771de7a280c6ae435ef86 jdk7u60-b05
-+fd1cb0040a1d05086ca3bf32f10e1efd43f05116 jdk7u60-b06
-+cd7c8fa7a057e62e094cdde78dd632de54cedb8c jdk7u60-b07
-+b19c0f18b5a508be894aead53617688342690b01 jdk7u60-b08
-+4bfece8a5148947d268611cc1b4485e92960064e jdk7u60-b09
-+28a6c0b3b22580101bf750383c2e48d34dea2124 jdk7u60-b10
-+e57490e0b99917ea8e1da1bb4d0c57fd5b7705f9 jdk7u60-b11
-+a9574b35f0af409fa1665aadd9b2997a0f9878dc jdk7u60-b12
-+92cf0b5c1c3e9b61d36671d8fb5070716e0f016b jdk7u60-b13
-+2814f43a6c73414dcb2b799e1a52d5b44688590d jdk7u60-b14
-+10eed57b66336660f71f7524f2283478bdf373dc jdk7u60-b15
-+fefd2d5c524b0be78876d9b98d926abda2828e79 jdk7u60-b16
-+ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17
-+ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b18
-+dd5a398eedc7031a4fb8682bc423e787db465c9e jdk7u65-b01
-+581752d32aebea959fec84e8ae692e1f63d2c4a8 jdk7u60-b19
-+cef2dec8b5d76555c5b7b2e1a62275206f76a07a jdk7u60-b30
-+bfa8403a1e28bdc1e94ba61d89e170e4ccc7d58b jdk7u60-b31
-+33a8a292a02aa76139d0d04970a0d87cc674f2e3 jdk7u60-b32
-+583c5eeb9f31275121aecca60307b8885a1a80d0 jdk7u60-b33
-+27909f138bdb9ffdd2ab4bded231c7ccc2264046 jdk7u65-b02
-+b3307181bd0f1a2c6e1e2c403b87a76e34452110 jdk7u65-b03
-+efa9425faaf402b7ea9c6226eb08236d8fa1ff2b jdk7u65-b04
-+319df7bff5bf7a9c2d659dd9021b918e729fa56f jdk7u65-b05
-+5fd236e2f1bbc09349858f9c56dd223b6d6f21f6 jdk7u65-b06
-+e1ae0b54e22200f2d67de39f6a16899ad4a1e574 jdk7u65-b07
-+86e93799766d67102a37559b3831abcc825d7e24 jdk7u65-b08
-+e24ee8ca453937c11be2fdbab0b4244aa7ec22bd jdk7u65-b09
-+6c20039a2e0104f30697e22dc06fe83ff7a43d39 jdk7u65-b10
-+50625e7c71b9b1d31bb901aec66366cacc239b3b jdk7u65-b11
-+b56b145c3d85b649188a40a91106005a3ebfcf2b jdk7u65-b12
-+3a8933cb0219594b72c797732768070fa23c491e jdk7u65-b13
-+ddb29a56b839563502b9f80deca5d6064641f1d7 jdk7u65-b14
-+708c636721447ebf679c2c754cb36a503c6177b8 jdk7u65-b15
-+a34a9f6740955e1cd844c5b701d76dbe7290913a jdk7u65-b16
-+178512d1bd9caf56d61811ad0d4b4269475407aa jdk7u65-b17
-+be897d0fd2a0b5f43b0d0e48075e5b070ca584d4 jdk7u65-b30
-+45db678253587755df4a00066e42e2fce04bbb71 jdk7u65-b18
-+4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b19
-+f3b7bb6f1924ab7f635cdd60db7fbab64576cd6d jdk7u65-b32
-+d41f31b707c87675f3467e980b1ceef2e53b3b5d jdk7u65-b20
-+d1f8566d39c56e40516a1afb304ed7c0681355d8 jdk7u67-b01
-+4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b40
-+a5f829d7fa05cf769402dfc82c94b737b8d011b0 jdk7u65-b31
-+f33ea72260ca7480f4a1405d35a3709895b491a2 jdk7u65-b33
-+86e93799766d67102a37559b3831abcc825d7e24 jdk7u66-b00
-+d34839cb2f15dee01cdfb1fd93378849de34d662 jdk7u66-b01
-+19e4e978c8212921104ba16d0db6bf18c6f8d0ab jdk7u66-b09
-+533ecae83034da1e68ee9a414b690c9b6eead293 jdk7u66-b10
-+763f80d4aae130a89efa4c6544ee98fcb7e6a2ca jdk7u66-b11
-+0d91d2f038d19261e0085a76bb8974c3b7609c5d jdk7u66-b12
-+cddc3774bebfe597228c7b3e386859b1fa775387 jdk7u66-b13
-+15206a7046a97d0a0fd824bec8b0e4174a56d8eb jdk7u66-b14
-+af60b8e3b9deb32d50552916e0afd38a30feaef0 jdk7u66-b15
-+36bba6c72f866df5c65ba8678544bf0442a952b3 jdk7u66-b16
-+9a777cc0d6b3b25d13feca1e610584d042565367 jdk7u66-b17
-+174a2f822f4f600f798e9963f0c1496206dce471 jdk7u71-b00
-+df8d93eddfc2de1046b8fb87204bc945c538a282 jdk7u71-b01
-+153724c929075f0a741aacead679af39f03a0a80 jdk7u71-b02
-+9e2007e23f356b7bc5d4d0c6c6350e9b3b3cd56b jdk7u71-b03
-+f58a7f8db6c54cd76621d1f48d17102ffbe93983 jdk7u71-b04
-+edab7f6d9a30feea45bf9185de0c65e11ab3a7b0 jdk7u71-b05
-+ca2992ad734eaf8295e21351b0de329555e9e60a jdk7u71-b06
-+5fbecd4c30c2e566e9b815818d51042e20d3ab83 jdk7u71-b07
-+acf176ea76f904674228745c25af195e460f1240 jdk7u71-b08
-+8a9f55d8d011ad6dc36f307dfac47981b676b379 jdk7u71-b09
-+d82fd2f6c5c8ed03c75828033058b675f9239d4b jdk7u71-b10
-+f7542072016b7972b383075f84df29bc05495d2e jdk7u71-b11
-+109dd4c4a07a8adfaf59e11c29e502277b803c44 jdk7u71-b12
-+df2c7c9a3609f8f4b30b09c29a9cfddc8b4b90ef jdk7u71-b13
---- ./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 2014-07-15 21:54:36.000000000 -0700
-@@ -39,33 +39,150 @@
- //
- // Constants
- //
-- // Oracle Feature:
-+ //Xerces security manager
-+ public static final String SECURITY_MANAGER =
-+ "http://apache.org/xml/properties/security-manager";
-+
-+ //
-+ // Implementation limits: API properties
-+ //
-+ /** Oracle JAXP property prefix ("http://www.oracle.com/xml/jaxp/properties/"). */
-+ public static final String ORACLE_JAXP_PROPERTY_PREFIX =
-+ "http://www.oracle.com/xml/jaxp/properties/";
- /**
-- * <p>Use Service Mechanism</p>
-- *
-- * <ul>
-- * <li>
-+ * JDK entity expansion limit; Note that the existing system property
-+ * "entityExpansionLimit" with no prefix is still observed
-+ */
-+ public static final String JDK_ENTITY_EXPANSION_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "entityExpansionLimit";
-+
-+ /**
-+ * JDK element attribute limit; Note that the existing system property
-+ * "elementAttributeLimit" with no prefix is still observed
-+ */
-+ public static final String JDK_ELEMENT_ATTRIBUTE_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "elementAttributeLimit";
-+
-+ /**
-+ * JDK maxOccur limit; Note that the existing system property
-+ * "maxOccurLimit" with no prefix is still observed
-+ */
-+ public static final String JDK_MAX_OCCUR_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxOccurLimit";
-+
-+ /**
-+ * JDK total entity size limit
-+ */
-+ public static final String JDK_TOTAL_ENTITY_SIZE_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "totalEntitySizeLimit";
-+
-+ /**
-+ * JDK maximum general entity size limit
-+ */
-+ public static final String JDK_GENEAL_ENTITY_SIZE_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
-+ /**
-+ * JDK maximum parameter entity size limit
-+ */
-+ public static final String JDK_PARAMETER_ENTITY_SIZE_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxParameterEntitySizeLimit";
-+ /**
-+ * JDK maximum XML name limit
-+ */
-+ public static final String JDK_XML_NAME_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
-+
-+ /**
-+ * JDK maxElementDepth limit
-+ */
-+ public static final String JDK_MAX_ELEMENT_DEPTH =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxElementDepth";
-+
-+ /**
-+ * JDK property indicating whether the parser shall print out entity
-+ * count information
-+ * Value: a string "yes" means print, "no" or any other string means not.
-+ */
-+ public static final String JDK_ENTITY_COUNT_INFO =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "getEntityCountInfo";
-+
-+ //
-+ // Implementation limits: corresponding System Properties of the above
-+ // API properties
-+ //
-+ /**
-+ * JDK entity expansion limit; Note that the existing system property
-+ * "entityExpansionLimit" with no prefix is still observed
-+ */
-+ public static final String SP_ENTITY_EXPANSION_LIMIT = "jdk.xml.entityExpansionLimit";
-+
-+ /**
-+ * JDK element attribute limit; Note that the existing system property
-+ * "elementAttributeLimit" with no prefix is still observed
-+ */
-+ public static final String SP_ELEMENT_ATTRIBUTE_LIMIT = "jdk.xml.elementAttributeLimit";
-+
-+ /**
-+ * JDK maxOccur limit; Note that the existing system property
-+ * "maxOccurLimit" with no prefix is still observed
-+ */
-+ public static final String SP_MAX_OCCUR_LIMIT = "jdk.xml.maxOccurLimit";
-+
-+ /**
-+ * JDK total entity size limit
-+ */
-+ public static final String SP_TOTAL_ENTITY_SIZE_LIMIT = "jdk.xml.totalEntitySizeLimit";
-+
-+ /**
-+ * JDK maximum general entity size limit
-+ */
-+ public static final String SP_GENEAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
-+ /**
-+ * JDK maximum parameter entity size limit
-+ */
-+ public static final String SP_PARAMETER_ENTITY_SIZE_LIMIT = "jdk.xml.maxParameterEntitySizeLimit";
-+ /**
-+ * JDK maximum XML name limit
-+ */
-+ public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
-+
-+ /**
-+ * JDK maxElementDepth limit
-+ */
-+ public static final String SP_MAX_ELEMENT_DEPTH = "jdk.xml.maxElementDepth";
-+
-+ //legacy System Properties
-+ public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
-+ public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
-+ public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
-+
-+ /**
-+ * A string "yes" that can be used for properties such as getEntityCountInfo
-+ */
-+ public static final String JDK_YES = "yes";
-+
-+ // Oracle Feature:
-+ /**
-+ * <p>Use Service Mechanism</p>
-+ *
-+ * <ul>
-+ * <li>
- * {@code true} instruct an object to use service mechanism to
- * find a service implementation. This is the default behavior.
- * </li>
- * <li>
- * {@code false} instruct an object to skip service mechanism and
- * use the default implementation for that service.
-- * </li>
-- * </ul>
-- */
--
-+ * </li>
-+ * </ul>
-+ */
- public static final String ORACLE_FEATURE_SERVICE_MECHANISM = "http://www.oracle.com/feature/use-service-mechanism";
-
-- /** Oracle JAXP property prefix ("http://www.oracle.com/xml/jaxp/properties/"). */
-- public static final String ORACLE_JAXP_PROPERTY_PREFIX =
-- "http://www.oracle.com/xml/jaxp/properties/";
-
- //System Properties corresponding to ACCESS_EXTERNAL_* properties
- public static final String SP_ACCESS_EXTERNAL_STYLESHEET = "javax.xml.accessExternalStylesheet";
- public static final String SP_ACCESS_EXTERNAL_DTD = "javax.xml.accessExternalDTD";
-
--
- //all access keyword
- public static final String ACCESS_EXTERNAL_ALL = "all";
-
-@@ -83,6 +200,19 @@
- ORACLE_JAXP_PROPERTY_PREFIX + "xmlSecurityPropertyManager";
-
- /**
-+ * Feature enableExtensionFunctions
-+ */
-+ public static final String ORACLE_ENABLE_EXTENSION_FUNCTION =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "enableExtensionFunctions";
-+ public static final String SP_ORACLE_ENABLE_EXTENSION_FUNCTION = "javax.xml.enableExtensionFunctions";
-+
-+ /**
-+ * Values for a feature
-+ */
-+ public static final String FEATURE_TRUE = "true";
-+ public static final String FEATURE_FALSE = "false";
-+
-+ /**
- * Check if we're in jdk8 or above
- */
- public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8);
---- ./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-07-15 21:46:30.000000000 -0700
-@@ -52,6 +52,8 @@
- */
- public class ExsltStrings extends ExsltBase
- {
-+ static final String JDK_DEFAULT_DOM = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
-+
- /**
- * The str:align function aligns a string within another string.
- * <p>
-@@ -225,7 +227,7 @@
- token = str.substring(fromIndex);
- }
-
-- Document doc = DocumentHolder.m_doc;
-+ Document doc = getDocument();
- synchronized (doc)
- {
- Element element = doc.createElement("token");
-@@ -289,7 +291,7 @@
- {
- StringTokenizer lTokenizer = new StringTokenizer(toTokenize, delims);
-
-- Document doc = DocumentHolder.m_doc;
-+ Document doc = getDocument();
- synchronized (doc)
- {
- while (lTokenizer.hasMoreTokens())
-@@ -305,7 +307,7 @@
- else
- {
-
-- Document doc = DocumentHolder.m_doc;
-+ Document doc = getDocument();
- synchronized (doc)
- {
- for (int i = 0; i < toTokenize.length(); i++)
-@@ -327,31 +329,23 @@
- {
- return tokenize(toTokenize, " \t\n\r");
- }
-+
- /**
-- * This class is not loaded until first referenced (see Java Language
-- * Specification by Gosling/Joy/Steele, section 12.4.1)
-- *
-- * The static members are created when this class is first referenced, as a
-- * lazy initialization not needing checking against null or any
-- * synchronization.
-- *
-+ * @return an instance of DOM Document
- */
-- private static class DocumentHolder
-- {
-- // Reuse the Document object to reduce memory usage.
-- private static final Document m_doc;
-- static {
-- try
-- {
-- m_doc =DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-- }
--
-- catch(ParserConfigurationException pce)
-- {
-- throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
-+ private static Document getDocument()
-+ {
-+ try
-+ {
-+ if (System.getSecurityManager() == null) {
-+ return DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-+ } else {
-+ return DocumentBuilderFactory.newInstance(JDK_DEFAULT_DOM, null).newDocumentBuilder().newDocument();
- }
--
-+ }
-+ catch(ParserConfigurationException pce)
-+ {
-+ throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
- }
- }
--
- }
---- ./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-07-15 21:46:30.000000000 -0700
-@@ -56,6 +56,7 @@
- */
- public class Extensions
- {
-+ static final String JDK_DEFAULT_DOM = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl";
- /**
- * Constructor Extensions
- *
-@@ -114,23 +115,14 @@
-
- // This no longer will work right since the DTM.
- // Document myDoc = myProcessor.getContextNode().getOwnerDocument();
-- try
-- {
-- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-- DocumentBuilder db = dbf.newDocumentBuilder();
-- Document myDoc = db.newDocument();
-+ Document myDoc = getDocument();
-
-- Text textNode = myDoc.createTextNode(textNodeValue);
-- DocumentFragment docFrag = myDoc.createDocumentFragment();
-+ Text textNode = myDoc.createTextNode(textNodeValue);
-+ DocumentFragment docFrag = myDoc.createDocumentFragment();
-
-- docFrag.appendChild(textNode);
-+ docFrag.appendChild(textNode);
-
-- return new NodeSet(docFrag);
-- }
-- catch(ParserConfigurationException pce)
-- {
-- throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
-- }
-+ return new NodeSet(docFrag);
- }
- }
-
-@@ -249,8 +241,7 @@
- public static NodeList tokenize(String toTokenize, String delims)
- {
-
-- Document doc = DocumentHolder.m_doc;
--
-+ Document doc = getDocument();
-
- StringTokenizer lTokenizer = new StringTokenizer(toTokenize, delims);
- NodeSet resultSet = new NodeSet();
-@@ -308,17 +299,7 @@
- public static Node checkEnvironment(ExpressionContext myContext)
- {
-
-- Document factoryDocument;
-- try
-- {
-- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-- DocumentBuilder db = dbf.newDocumentBuilder();
-- factoryDocument = db.newDocument();
-- }
-- catch(ParserConfigurationException pce)
-- {
-- throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
-- }
-+ Document factoryDocument = getDocument();
-
- Node resultNode = null;
- try
-@@ -391,30 +372,21 @@
- }
-
- /**
-- * This class is not loaded until first referenced (see Java Language
-- * Specification by Gosling/Joy/Steele, section 12.4.1)
-- *
-- * The static members are created when this class is first referenced, as a
-- * lazy initialization not needing checking against null or any
-- * synchronization.
-- *
-+ * @return an instance of DOM Document
- */
-- private static class DocumentHolder
-- {
-- // Reuse the Document object to reduce memory usage.
-- private static final Document m_doc;
-- static
-+ private static Document getDocument()
-+ {
-+ try
- {
-- try
-- {
-- m_doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-- }
--
-- catch(ParserConfigurationException pce)
-- {
-- throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
-+ if (System.getSecurityManager() == null) {
-+ return DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-+ } else {
-+ return DocumentBuilderFactory.newInstance(JDK_DEFAULT_DOM, null).newDocumentBuilder().newDocument();
- }
--
-+ }
-+ catch(ParserConfigurationException pce)
-+ {
-+ throw new com.sun.org.apache.xml.internal.utils.WrappedRuntimeException(pce);
- }
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java 2014-07-15 21:46:30.000000000 -0700
-@@ -472,7 +472,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1413,13 +1419,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java 2014-07-15 21:46:30.000000000 -0700
-@@ -471,7 +471,13 @@
-
- // Error messages...
-
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -1412,13 +1418,6 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The int to message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- // ================= INFRASTRUCTURE ======================
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java 2014-07-15 21:46:30.000000000 -0700
-@@ -0,0 +1,124 @@
-+/*
-+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.org.apache.xalan.internal.utils;
-+
-+
-+import com.sun.org.apache.xalan.internal.XalanConstants;
-+
-+/**
-+ * This class manages security related properties
-+ *
-+ */
-+public final class FeatureManager extends FeaturePropertyBase {
-+
-+ /**
-+ * States of the settings of a property, in the order: default value, value
-+ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
-+ * properties, and jaxp api properties
-+ */
-+ public static enum State {
-+ //this order reflects the overriding order
-+ DEFAULT, FSP, JAXPDOTPROPERTIES, SYSTEMPROPERTY, APIPROPERTY
-+ }
-+
-+ /**
-+ * Xalan Features
-+ */
-+ public static enum Feature {
-+ ORACLE_ENABLE_EXTENSION_FUNCTION(XalanConstants.ORACLE_ENABLE_EXTENSION_FUNCTION,
-+ "true");
-+
-+ final String name;
-+ final String defaultValue;
-+
-+ Feature(String name, String value) {
-+ this.name = name;
-+ this.defaultValue = value;
-+ }
-+
-+ public boolean equalsName(String propertyName) {
-+ return (propertyName == null) ? false : name.equals(propertyName);
-+ }
-+
-+ String defaultValue() {
-+ return defaultValue;
-+ }
-+ }
-+
-+ /**
-+ * Default constructor. Establishes default values
-+ */
-+ public FeatureManager() {
-+ values = new String[Feature.values().length];
-+ for (Feature feature : Feature.values()) {
-+ values[feature.ordinal()] = feature.defaultValue();
-+ }
-+ //read system properties or jaxp.properties
-+ readSystemProperties();
-+ }
-+
-+
-+ /**
-+ * Check if the feature is enabled
-+ * @param feature name of the feature
-+ * @return true if enabled, false otherwise
-+ */
-+ public boolean isFeatureEnabled(Feature feature) {
-+ return Boolean.parseBoolean(values[feature.ordinal()]);
-+ }
-+
-+ /**
-+ * Check if the feature is enabled
-+ * @param propertyName name of the feature
-+ * @return true if enabled, false otherwise
-+ */
-+ public boolean isFeatureEnabled(String propertyName) {
-+ return Boolean.parseBoolean(values[getIndex(propertyName)]);
-+ }
-+
-+ /**
-+ * Get the index by property name
-+ * @param propertyName property name
-+ * @return the index of the property if found; return -1 if not
-+ */
-+ public int getIndex(String propertyName){
-+ for (Feature feature : Feature.values()) {
-+ if (feature.equalsName(propertyName)) {
-+ return feature.ordinal();
-+ }
-+ }
-+ return -1;
-+ }
-+
-+ /**
-+ * Read from system properties, or those in jaxp.properties
-+ */
-+ private void readSystemProperties() {
-+ getSystemProperty(Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
-+ XalanConstants.SP_ORACLE_ENABLE_EXTENSION_FUNCTION);
-+ }
-+
-+}
---- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java 2014-07-15 21:46:30.000000000 -0700
-@@ -0,0 +1,215 @@
-+/*
-+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.org.apache.xalan.internal.utils;
-+
-+import com.sun.org.apache.xalan.internal.XalanConstants;
-+
-+/**
-+ * This is the base class for features and properties
-+ *
-+ */
-+public abstract class FeaturePropertyBase {
-+
-+ /**
-+ * States of the settings of a property, in the order: default value, value
-+ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
-+ * properties, and jaxp api properties
-+ */
-+ public static enum State {
-+ //this order reflects the overriding order
-+ DEFAULT, FSP, JAXPDOTPROPERTIES, SYSTEMPROPERTY, APIPROPERTY
-+ }
-+
-+
-+ /**
-+ * Values of the properties as defined in enum Properties
-+ */
-+ String[] values = null;
-+ /**
-+ * States of the settings for each property in Properties above
-+ */
-+ State[] states = {State.DEFAULT, State.DEFAULT};
-+
-+
-+ /**
-+ * Set the value for a specific property.
-+ *
-+ * @param property the property
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ */
-+ public void setValue(Enum property, State state, String value) {
-+ //only update if it shall override
-+ if (state.compareTo(states[property.ordinal()]) >= 0) {
-+ values[property.ordinal()] = value;
-+ states[property.ordinal()] = state;
-+ }
-+ }
-+
-+ /**
-+ * Set the value of a property by its index
-+ * @param index the index of the property
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ */
-+ public void setValue(int index, State state, String value) {
-+ //only update if it shall override
-+ if (state.compareTo(states[index]) >= 0) {
-+ values[index] = value;
-+ states[index] = state;
-+ }
-+ }
-+
-+ /**
-+ * Set value by property name and state
-+ * @param propertyName property name
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ * @return true if the property is managed by the security property manager;
-+ * false if otherwise.
-+ */
-+ public boolean setValue(String propertyName, State state, Object value) {
-+ int index = getIndex(propertyName);
-+ if (index > -1) {
-+ setValue(index, state, (String)value);
-+ return true;
-+ }
-+ return false;
-+ }
-+
-+ /**
-+ * Set value by property name and state
-+ * @param propertyName property name
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ * @return true if the property is managed by the security property manager;
-+ * false if otherwise.
-+ */
-+ public boolean setValue(String propertyName, State state, boolean value) {
-+ int index = getIndex(propertyName);
-+ if (index > -1) {
-+ if (value) {
-+ setValue(index, state, XalanConstants.FEATURE_TRUE);
-+ } else {
-+ setValue(index, state, XalanConstants.FEATURE_FALSE);
-+ }
-+ return true;
-+ }
-+ return false;
-+ }
-+
-+ /**
-+ * Return the value of the specified property
-+ *
-+ * @param property the property
-+ * @return the value of the property
-+ */
-+ public String getValue(Enum property) {
-+ return values[property.ordinal()];
-+ }
-+
-+ /**
-+ * Return the value of the specified property
-+ *
-+ * @param property the property
-+ * @return the value of the property
-+ */
-+ public String getValue(String property) {
-+ int index = getIndex(property);
-+ if (index > -1) {
-+ return getValueByIndex(index);
-+ }
-+ return null;
-+ }
-+
-+ /**
-+ * Return the value of the specified property.
-+ *
-+ * @param propertyName the property name
-+ * @return the value of the property as a string. If a property is managed
-+ * by this manager, its value shall not be null.
-+ */
-+ public String getValueAsString(String propertyName) {
-+ int index = getIndex(propertyName);
-+ if (index > -1) {
-+ return getValueByIndex(index);
-+ }
-+
-+ return null;
-+ }
-+
-+ /**
-+ * Return the value of a property by its ordinal
-+ * @param index the index of a property
-+ * @return value of a property
-+ */
-+ public String getValueByIndex(int index) {
-+ return values[index];
-+ }
-+
-+ /**
-+ * Get the index by property name
-+ * @param propertyName property name
-+ * @return the index of the property if found; return -1 if not
-+ */
-+ public abstract int getIndex(String propertyName);
-+
-+ public <E extends Enum<E>> int getIndex(Class<E> property, String propertyName) {
-+ for (Enum<E> enumItem : property.getEnumConstants()) {
-+ if (enumItem.toString().equals(propertyName)) {
-+ //internally, ordinal is used as index
-+ return enumItem.ordinal();
-+ }
-+ }
-+ return -1;
-+ };
-+
-+
-+ /**
-+ * Read from system properties, or those in jaxp.properties
-+ *
-+ * @param property the property
-+ * @param systemProperty the name of the system property
-+ */
-+ void getSystemProperty(Enum property, String systemProperty) {
-+ try {
-+ String value = SecuritySupport.getSystemProperty(systemProperty);
-+ if (value != null) {
-+ values[property.ordinal()] = value;
-+ states[property.ordinal()] = State.SYSTEMPROPERTY;
-+ return;
-+ }
-+
-+ value = SecuritySupport.readJAXPProperty(systemProperty);
-+ if (value != null) {
-+ values[property.ordinal()] = value;
-+ states[property.ordinal()] = State.JAXPDOTPROPERTIES;
-+ }
-+ } catch (NumberFormatException e) {
-+ //invalid setting ignored
-+ }
-+ }
-+}
---- ./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-07-15 21:46:30.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-07-15 21:46:30.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 2014-07-15 21:54:36.000000000 -0700
-@@ -0,0 +1,437 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.org.apache.xalan.internal.utils;
-+
-+import com.sun.org.apache.xalan.internal.XalanConstants;
-+
-+
-+/**
-+ * This class is not the same as that in Xerces. It is used to manage the
-+ * state of corresponding Xerces properties and pass the values over to
-+ * the Xerces Security Manager.
-+ *
-+ * @author Joe Wang Oracle Corp.
-+ *
-+ */
-+public final class XMLSecurityManager {
-+
-+ /**
-+ * States of the settings of a property, in the order: default value, value
-+ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
-+ * properties, and jaxp api properties
-+ */
-+ public static enum State {
-+ //this order reflects the overriding order
-+
-+ DEFAULT("default"), FSP("FEATURE_SECURE_PROCESSING"),
-+ JAXPDOTPROPERTIES("jaxp.properties"), SYSTEMPROPERTY("system property"),
-+ APIPROPERTY("property");
-+
-+ final String literal;
-+ State(String literal) {
-+ this.literal = literal;
-+ }
-+
-+ String literal() {
-+ return literal;
-+ }
-+ }
-+
-+ /**
-+ * Limits managed by the security manager
-+ */
-+ public static enum Limit {
-+
-+ ENTITY_EXPANSION_LIMIT(XalanConstants.JDK_ENTITY_EXPANSION_LIMIT,
-+ XalanConstants.SP_ENTITY_EXPANSION_LIMIT, 0, 64000),
-+ MAX_OCCUR_NODE_LIMIT(XalanConstants.JDK_MAX_OCCUR_LIMIT,
-+ XalanConstants.SP_MAX_OCCUR_LIMIT, 0, 5000),
-+ ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.JDK_ELEMENT_ATTRIBUTE_LIMIT,
-+ XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
-+ TOTAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_TOTAL_ENTITY_SIZE_LIMIT,
-+ XalanConstants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
-+ GENEAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_GENEAL_ENTITY_SIZE_LIMIT,
-+ XalanConstants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
-+ PARAMETER_ENTITY_SIZE_LIMIT(XalanConstants.JDK_PARAMETER_ENTITY_SIZE_LIMIT,
-+ XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000),
-+ MAX_ELEMENT_DEPTH_LIMIT(XalanConstants.JDK_MAX_ELEMENT_DEPTH,
-+ XalanConstants.SP_MAX_ELEMENT_DEPTH, 0, 0);
-+
-+ final String apiProperty;
-+ final String systemProperty;
-+ final int defaultValue;
-+ final int secureValue;
-+
-+ Limit(String apiProperty, String systemProperty, int value, int secureValue) {
-+ this.apiProperty = apiProperty;
-+ this.systemProperty = systemProperty;
-+ this.defaultValue = value;
-+ this.secureValue = secureValue;
-+ }
-+
-+ public boolean equalsAPIPropertyName(String propertyName) {
-+ return (propertyName == null) ? false : apiProperty.equals(propertyName);
-+ }
-+
-+ public boolean equalsSystemPropertyName(String propertyName) {
-+ return (propertyName == null) ? false : systemProperty.equals(propertyName);
-+ }
-+
-+ public String apiProperty() {
-+ return apiProperty;
-+ }
-+
-+ String systemProperty() {
-+ return systemProperty;
-+ }
-+
-+ int defaultValue() {
-+ return defaultValue;
-+ }
-+
-+ int secureValue() {
-+ return secureValue;
-+ }
-+ }
-+
-+ /**
-+ * Map old property names with the new ones
-+ */
-+ public static enum NameMap {
-+
-+ ENTITY_EXPANSION_LIMIT(XalanConstants.SP_ENTITY_EXPANSION_LIMIT,
-+ XalanConstants.ENTITY_EXPANSION_LIMIT),
-+ MAX_OCCUR_NODE_LIMIT(XalanConstants.SP_MAX_OCCUR_LIMIT,
-+ XalanConstants.MAX_OCCUR_LIMIT),
-+ ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT,
-+ XalanConstants.ELEMENT_ATTRIBUTE_LIMIT);
-+ final String newName;
-+ final String oldName;
-+
-+ NameMap(String newName, String oldName) {
-+ this.newName = newName;
-+ this.oldName = oldName;
-+ }
-+
-+ String getOldName(String newName) {
-+ if (newName.equals(this.newName)) {
-+ return oldName;
-+ }
-+ return null;
-+ }
-+ }
-+ /**
-+ * Values of the properties
-+ */
-+ private final int[] values;
-+ /**
-+ * States of the settings for each property
-+ */
-+ private State[] states;
-+ /**
-+ * States that determine if properties are set explicitly
-+ */
-+ private boolean[] isSet;
-+
-+
-+ /**
-+ * Index of the special entityCountInfo property
-+ */
-+ private int indexEntityCountInfo = 10000;
-+ private String printEntityCountInfo = "";
-+
-+ /**
-+ * Default constructor. Establishes default values for known security
-+ * vulnerabilities.
-+ */
-+ public XMLSecurityManager() {
-+ this(false);
-+ }
-+
-+ /**
-+ * Instantiate Security Manager in accordance with the status of
-+ * secure processing
-+ * @param secureProcessing
-+ */
-+ public XMLSecurityManager(boolean secureProcessing) {
-+ values = new int[Limit.values().length];
-+ states = new State[Limit.values().length];
-+ isSet = new boolean[Limit.values().length];
-+ for (Limit limit : Limit.values()) {
-+ if (secureProcessing) {
-+ values[limit.ordinal()] = limit.secureValue();
-+ states[limit.ordinal()] = State.FSP;
-+ } else {
-+ values[limit.ordinal()] = limit.defaultValue();
-+ states[limit.ordinal()] = State.DEFAULT;
-+ }
-+ }
-+ //read system properties or jaxp.properties
-+ readSystemProperties();
-+ }
-+
-+ /**
-+ * Setting FEATURE_SECURE_PROCESSING explicitly
-+ */
-+ public void setSecureProcessing(boolean secure) {
-+ for (Limit limit : Limit.values()) {
-+ if (secure) {
-+ setLimit(limit.ordinal(), State.FSP, limit.secureValue());
-+ } else {
-+ setLimit(limit.ordinal(), State.FSP, limit.defaultValue());
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Set limit by property name and state
-+ * @param propertyName property name
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ * @return true if the property is managed by the security manager; false
-+ * if otherwise.
-+ */
-+ public boolean setLimit(String propertyName, State state, Object value) {
-+ int index = getIndex(propertyName);
-+ if (index > -1) {
-+ setLimit(index, state, value);
-+ return true;
-+ }
-+ return false;
-+ }
-+
-+ /**
-+ * Set the value for a specific limit.
-+ *
-+ * @param limit the limit
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ */
-+ public void setLimit(Limit limit, State state, int value) {
-+ setLimit(limit.ordinal(), state, value);
-+ }
-+
-+ /**
-+ * Set the value of a property by its index
-+ *
-+ * @param index the index of the property
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ */
-+ public void setLimit(int index, State state, Object value) {
-+ if (index == indexEntityCountInfo) {
-+ //if it's explicitly set, it's treated as yes no matter the value
-+ printEntityCountInfo = (String)value;
-+ } else {
-+ int temp = 0;
-+ try {
-+ temp = Integer.parseInt((String) value);
-+ if (temp < 0) {
-+ temp = 0;
-+ }
-+ } catch (NumberFormatException e) {}
-+ setLimit(index, state, temp); }
-+ }
-+
-+ /**
-+ * Set the value of a property by its index
-+ *
-+ * @param index the index of the property
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ */
-+ public void setLimit(int index, State state, int value) {
-+ if (index == indexEntityCountInfo) {
-+ //if it's explicitly set, it's treated as yes no matter the value
-+ printEntityCountInfo = XalanConstants.JDK_YES;
-+ } else {
-+ //only update if it shall override
-+ if (state.compareTo(states[index]) >= 0) {
-+ values[index] = value;
-+ states[index] = state;
-+ isSet[index] = true;
-+ }
-+ }
-+ }
-+
-+
-+ /**
-+ * Return the value of the specified property.
-+ *
-+ * @param propertyName the property name
-+ * @return the value of the property as a string. If a property is managed
-+ * by this manager, its value shall not be null.
-+ */
-+ public String getLimitAsString(String propertyName) {
-+ int index = getIndex(propertyName);
-+ if (index > -1) {
-+ return getLimitValueByIndex(index);
-+ }
-+
-+ return null;
-+ }
-+
-+ /**
-+ * Return the value of a property by its ordinal
-+ *
-+ * @param limit the property
-+ * @return value of a property
-+ */
-+ public String getLimitValueAsString(Limit limit) {
-+ return Integer.toString(values[limit.ordinal()]);
-+ }
-+
-+ /**
-+ * Return the value of the specified property
-+ *
-+ * @param limit the property
-+ * @return the value of the property
-+ */
-+ public int getLimit(Limit limit) {
-+ return values[limit.ordinal()];
-+ }
-+
-+ /**
-+ * Return the value of a property by its ordinal
-+ *
-+ * @param index the index of a property
-+ * @return value of a property
-+ */
-+ public int getLimitByIndex(int index) {
-+ return values[index];
-+ }
-+ /**
-+ * Return the value of a property by its index
-+ *
-+ * @param index the index of a property
-+ * @return limit of a property as a string
-+ */
-+ public String getLimitValueByIndex(int index) {
-+ if (index == indexEntityCountInfo) {
-+ return printEntityCountInfo;
-+ }
-+
-+ return Integer.toString(values[index]);
-+ }
-+ /**
-+ * Return the state of the limit property
-+ *
-+ * @param limit the limit
-+ * @return the state of the limit property
-+ */
-+ public State getState(Limit limit) {
-+ return states[limit.ordinal()];
-+ }
-+
-+ /**
-+ * Return the state of the limit property
-+ *
-+ * @param limit the limit
-+ * @return the state of the limit property
-+ */
-+ public String getStateLiteral(Limit limit) {
-+ return states[limit.ordinal()].literal();
-+ }
-+
-+ /**
-+ * Get the index by property name
-+ *
-+ * @param propertyName property name
-+ * @return the index of the property if found; return -1 if not
-+ */
-+ public int getIndex(String propertyName) {
-+ for (Limit limit : Limit.values()) {
-+ if (limit.equalsAPIPropertyName(propertyName)) {
-+ //internally, ordinal is used as index
-+ return limit.ordinal();
-+ }
-+ }
-+ //special property to return entity count info
-+ if (propertyName.equals(XalanConstants.JDK_ENTITY_COUNT_INFO)) {
-+ return indexEntityCountInfo;
-+ }
-+ return -1;
-+ }
-+
-+ /**
-+ * Indicate if a property is set explicitly
-+ * @param index
-+ * @return
-+ */
-+ public boolean isSet(int index) {
-+ return isSet[index];
-+ }
-+
-+ public boolean printEntityCountInfo() {
-+ return printEntityCountInfo.equals(XalanConstants.JDK_YES);
-+ }
-+ /**
-+ * Read from system properties, or those in jaxp.properties
-+ */
-+ private void readSystemProperties() {
-+
-+ for (Limit limit : Limit.values()) {
-+ if (!getSystemProperty(limit, limit.systemProperty())) {
-+ //if system property is not found, try the older form if any
-+ for (NameMap nameMap : NameMap.values()) {
-+ String oldName = nameMap.getOldName(limit.systemProperty());
-+ if (oldName != null) {
-+ getSystemProperty(limit, oldName);
-+ }
-+ }
-+ }
-+ }
-+
-+ }
-+
-+ /**
-+ * Read from system properties, or those in jaxp.properties
-+ *
-+ * @param property the type of the property
-+ * @param sysPropertyName the name of system property
-+ */
-+ private boolean getSystemProperty(Limit limit, String sysPropertyName) {
-+ try {
-+ String value = SecuritySupport.getSystemProperty(sysPropertyName);
-+ if (value != null && !value.equals("")) {
-+ values[limit.ordinal()] = Integer.parseInt(value);
-+ states[limit.ordinal()] = State.SYSTEMPROPERTY;
-+ return true;
-+ }
-+
-+ value = SecuritySupport.readJAXPProperty(sysPropertyName);
-+ if (value != null && !value.equals("")) {
-+ values[limit.ordinal()] = Integer.parseInt(value);
-+ states[limit.ordinal()] = State.JAXPDOTPROPERTIES;
-+ return true;
-+ }
-+ } catch (NumberFormatException e) {
-+ //invalid setting
-+ throw new NumberFormatException("Invalid setting for system property: " + limit.systemProperty());
-+ }
-+ return false;
-+ }
-+}
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -33,20 +33,10 @@
- * This class manages security related properties
- *
- */
--public final class XMLSecurityPropertyManager {
-+public final class XMLSecurityPropertyManager extends FeaturePropertyBase {
-
- /**
-- * States of the settings of a property, in the order: default value, value
-- * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
-- * properties, and jaxp api properties
-- */
-- public static enum State {
-- //this order reflects the overriding order
-- DEFAULT, FSP, JAXPDOTPROPERTIES, SYSTEMPROPERTY, APIPROPERTY
-- }
--
-- /**
-- * Limits managed by the security manager
-+ * Properties managed by the security property manager
- */
- public static enum Property {
- ACCESS_EXTERNAL_DTD(XMLConstants.ACCESS_EXTERNAL_DTD,
-@@ -73,15 +63,6 @@
-
-
- /**
-- * Values of the properties as defined in enum Properties
-- */
-- private final String[] values;
-- /**
-- * States of the settings for each property in Properties above
-- */
-- private State[] states = {State.DEFAULT, State.DEFAULT};
--
-- /**
- * Default constructor. Establishes default values
- */
- public XMLSecurityPropertyManager() {
-@@ -94,53 +75,6 @@
- }
-
- /**
-- * Set the value for a specific property.
-- *
-- * @param property the property
-- * @param state the state of the property
-- * @param value the value of the property
-- */
-- public void setValue(Property property, State state, String value) {
-- //only update if it shall override
-- if (state.compareTo(states[property.ordinal()]) >= 0) {
-- values[property.ordinal()] = value;
-- states[property.ordinal()] = state;
-- }
-- }
--
-- /**
-- * Set the value of a property by its index
-- * @param index the index of the property
-- * @param state the state of the property
-- * @param value the value of the property
-- */
-- public void setValue(int index, State state, String value) {
-- //only update if it shall override
-- if (state.compareTo(states[index]) >= 0) {
-- values[index] = value;
-- states[index] = state;
-- }
-- }
-- /**
-- * Return the value of the specified property
-- *
-- * @param property the property
-- * @return the value of the property
-- */
-- public String getValue(Property property) {
-- return values[property.ordinal()];
-- }
--
-- /**
-- * Return the value of a property by its ordinal
-- * @param index the index of a property
-- * @return value of a property
-- */
-- public String getValueByIndex(int index) {
-- return values[index];
-- }
--
-- /**
- * Get the index by property name
- * @param propertyName property name
- * @return the index of the property if found; return -1 if not
-@@ -165,28 +99,4 @@
- XalanConstants.SP_ACCESS_EXTERNAL_STYLESHEET);
- }
-
-- /**
-- * Read from system properties, or those in jaxp.properties
-- *
-- * @param property the property
-- * @param systemProperty the name of the system property
-- */
-- private void getSystemProperty(Property property, String systemProperty) {
-- try {
-- String value = SecuritySupport.getSystemProperty(systemProperty);
-- if (value != null) {
-- values[property.ordinal()] = value;
-- states[property.ordinal()] = State.SYSTEMPROPERTY;
-- return;
-- }
--
-- value = SecuritySupport.readJAXPProperty(systemProperty);
-- if (value != null) {
-- values[property.ordinal()] = value;
-- states[property.ordinal()] = State.JAXPDOTPROPERTIES;
-- }
-- } catch (NumberFormatException e) {
-- //invalid setting ignored
-- }
-- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java 2014-07-15 21:46:30.000000000 -0700
-@@ -23,6 +23,7 @@
-
- package com.sun.org.apache.xalan.internal.xsltc.cmdline;
-
-+import com.sun.org.apache.xalan.internal.utils.FeatureManager;
- import java.io.File;
- import java.net.URL;
- import java.util.Vector;
-@@ -77,7 +78,7 @@
- final GetOpt getopt = new GetOpt(args, "o:d:j:p:uxhsinv");
- if (args.length < 1) printUsage();
-
-- final XSLTC xsltc = new XSLTC(true);
-+ final XSLTC xsltc = new XSLTC(true, new FeatureManager());
- xsltc.init();
-
- int c;
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2013-09-06 11:22:55.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2014-07-15 21:46:30.000000000 -0700
-@@ -42,6 +42,7 @@
- import com.sun.org.apache.bcel.internal.generic.LocalVariableGen;
- import com.sun.org.apache.bcel.internal.generic.NEW;
- import com.sun.org.apache.bcel.internal.generic.PUSH;
-+import com.sun.org.apache.xalan.internal.utils.FeatureManager;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.BooleanType;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ClassGenerator;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
-@@ -717,6 +718,8 @@
- final ConstantPoolGen cpg = classGen.getConstantPool();
- final InstructionList il = methodGen.getInstructionList();
- final boolean isSecureProcessing = classGen.getParser().getXSLTC().isSecureProcessing();
-+ final boolean isExtensionFunctionEnabled = classGen.getParser().getXSLTC()
-+ .getFeature(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION);
- int index;
-
- // Translate calls to methods in the BasisLibrary
-@@ -760,7 +763,7 @@
- il.append(new INVOKESTATIC(index));
- }
- else if (_isExtConstructor) {
-- if (isSecureProcessing)
-+ if (isSecureProcessing && !isExtensionFunctionEnabled)
- translateUnallowedExtension(cpg, il);
-
- final String clazz =
-@@ -822,7 +825,7 @@
- }
- // Invoke function calls that are handled in separate classes
- else {
-- if (isSecureProcessing)
-+ if (isSecureProcessing && !isExtensionFunctionEnabled)
- translateUnallowedExtension(cpg, il);
-
- final String clazz = _chosenMethod.getDeclaringClass().getName();
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -86,7 +86,7 @@
- if (input == null) {
- docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc);
- String accessError = SecuritySupport.checkAccess(docToLoad,
-- xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
-+ (String)xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
- XalanConstants.ACCESS_EXTERNAL_ALL);
-
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -87,7 +87,7 @@
- if (input == null) {
- docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc);
- String accessError = SecuritySupport.checkAccess(docToLoad,
-- xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
-+ (String)xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
- XalanConstants.ACCESS_EXTERNAL_ALL);
-
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -28,6 +28,7 @@
- import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
- import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
- import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
-+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.MethodType;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type;
-@@ -487,6 +488,20 @@
- }
-
- final XMLReader reader = parser.getXMLReader();
-+ try {
-+ XMLSecurityManager securityManager =
-+ (XMLSecurityManager)_xsltc.getProperty(XalanConstants.SECURITY_MANAGER);
-+ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
-+ reader.setProperty(limit.apiProperty(), securityManager.getLimitValueAsString(limit));
-+ }
-+ if (securityManager.printEntityCountInfo()) {
-+ parser.setProperty(XalanConstants.JDK_ENTITY_COUNT_INFO, XalanConstants.JDK_YES);
-+ }
-+ } catch (SAXException se) {
-+ System.err.println("Warning: " + reader.getClass().getName() + ": "
-+ + se.getMessage());
-+ }
-+
- return(parse(reader, input));
- }
- catch (ParserConfigurationException e) {
-@@ -565,7 +580,7 @@
- }
- path = SystemIDResolver.getAbsoluteURI(path);
- String accessError = SecuritySupport.checkAccess(path,
-- _xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
-+ (String)_xsltc.getProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET),
- XalanConstants.ACCESS_EXTERNAL_ALL);
- if (accessError != null) {
- ErrorMsg msg = new ErrorMsg(ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java 2014-10-28 20:19:32.000000000 -0700
-@@ -26,7 +26,7 @@
- import java.util.Vector;
-
- import com.sun.org.apache.bcel.internal.generic.ConstantPoolGen;
--import com.sun.org.apache.bcel.internal.generic.INVOKEVIRTUAL;
-+import com.sun.org.apache.bcel.internal.generic.INVOKESTATIC;
- import com.sun.org.apache.bcel.internal.generic.InstructionList;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ClassGenerator;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.MethodGenerator;
-@@ -51,7 +51,8 @@
- il.append(methodGen.loadContextNode());
- Type.Node.translateTo(classGen, methodGen, Type.String);
- }
-- il.append(new INVOKEVIRTUAL(cpg.addMethodref(STRING_CLASS,
-- "length", "()I")));
-+ il.append(new INVOKESTATIC(cpg.addMethodref(BASIS_LIBRARY_CLASS,
-+ "getStringLength",
-+ "(Ljava/lang/String;)I")));
- }
- }
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -43,12 +43,14 @@
-
- import com.sun.org.apache.bcel.internal.classfile.JavaClass;
- import com.sun.org.apache.xalan.internal.XalanConstants;
-+import com.sun.org.apache.xalan.internal.utils.FeatureManager;
-+import com.sun.org.apache.xalan.internal.utils.FeatureManager.Feature;
- import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
-+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Util;
- import com.sun.org.apache.xml.internal.dtm.DTM;
-
--import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
- import org.xml.sax.InputSource;
- import org.xml.sax.XMLReader;
-
-@@ -146,12 +148,16 @@
- */
- private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
-
-+ private XMLSecurityManager _xmlSecurityManager;
-+
-+ private final FeatureManager _featureManager;
-
- /**
- * XSLTC compiler constructor
- */
-- public XSLTC(boolean useServicesMechanism) {
-+ public XSLTC(boolean useServicesMechanism, FeatureManager featureManager) {
- _parser = new Parser(this, useServicesMechanism);
-+ _featureManager = featureManager;
- }
-
- /**
-@@ -181,15 +187,26 @@
- _useServicesMechanism = flag;
- }
-
-+ /**
-+ * Return the value of the specified feature
-+ * @param name name of the feature
-+ * @return true if the feature is enabled, false otherwise
-+ */
-+ public boolean getFeature(Feature name) {
-+ return _featureManager.isFeatureEnabled(name);
-+ }
-+
- /**
- * Return allowed protocols for accessing external stylesheet.
- */
-- public String getProperty(String name) {
-+ public Object getProperty(String name) {
- if (name.equals(XMLConstants.ACCESS_EXTERNAL_STYLESHEET)) {
- return _accessExternalStylesheet;
- }
- else if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
- return _accessExternalDTD;
-+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
-+ return _xmlSecurityManager;
- }
- return null;
- }
-@@ -197,12 +214,14 @@
- /**
- * Set allowed protocols for accessing external stylesheet.
- */
-- public void setProperty(String name, String value) {
-+ public void setProperty(String name, Object value) {
- if (name.equals(XMLConstants.ACCESS_EXTERNAL_STYLESHEET)) {
- _accessExternalStylesheet = (String)value;
- }
- else if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
- _accessExternalDTD = (String)value;
-+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
-+ _xmlSecurityManager = (XMLSecurityManager)value;
- }
- }
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "More than one stylesheet defined in the same file."},
-
-@@ -1012,12 +1018,5 @@
-
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "S'ha definit m\u00e9s d'un full d'estils en el mateix fitxer."},
-
-@@ -853,12 +859,5 @@
- "FEATURE_SECURE_PROCESSING: Cannot set the feature to false when security manager is present."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "V\u00edce ne\u017e jedna p\u0159edloha stylu je definov\u00e1na ve stejn\u00e9m souboru."},
-
-@@ -853,12 +859,5 @@
- "FEATURE_SECURE_PROCESSING: Cannot set the feature to false when security manager is present."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "Mehrere Stylesheets in derselben Datei definiert."},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING: Feature kann nicht auf \"false\" gesetzt werden, wenn Security Manager vorhanden ist."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "Se ha definido m\u00E1s de una hoja de estilo en el mismo archivo."},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING: no se puede definir la funci\u00F3n en false cuando est\u00E1 presente el gestor de seguridad."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "Plusieurs feuilles de style d\u00E9finies dans le m\u00EAme fichier."},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING : impossible de d\u00E9finir la fonctionnalit\u00E9 sur False en pr\u00E9sence du gestionnaire de s\u00E9curit\u00E9."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "Sono stati definiti pi\u00F9 fogli di stile nello stesso file."},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING: impossibile impostare la funzione su false se \u00E8 presente Security Manager."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u306B\u8907\u6570\u306E\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059\u3002"},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING: \u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u304C\u5B58\u5728\u3059\u308B\u3068\u304D\u3001\u6A5F\u80FD\u3092false\u306B\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002"}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "\uB3D9\uC77C\uD55C \uD30C\uC77C\uC5D0 \uC2A4\uD0C0\uC77C\uC2DC\uD2B8\uAC00 \uB450 \uAC1C \uC774\uC0C1 \uC815\uC758\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING: \uBCF4\uC548 \uAD00\uB9AC\uC790\uAC00 \uC788\uC744 \uACBD\uC6B0 \uAE30\uB2A5\uC744 false\uB85C \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "Mais de uma folha de estilos definida no mesmo arquivo."},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING: N\u00E3o \u00E9 poss\u00EDvel definir o recurso como falso quando o gerenciador de seguran\u00E7a est\u00E1 presente."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "Viac ne\u017e jeden \u0161t\u00fdl dokumentu bol definovan\u00fd v rovnakom s\u00fabore."},
-
-@@ -853,12 +859,5 @@
- "FEATURE_SECURE_PROCESSING: Cannot set the feature to false when security manager is present."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "Fler \u00E4n en formatmall har definierats i samma fil."},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING: Funktionen kan inte anges till false om s\u00E4kerhetshanteraren anv\u00E4nds."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "\u540C\u4E00\u6587\u4EF6\u4E2D\u5B9A\u4E49\u4E86\u591A\u4E2A\u6837\u5F0F\u8868\u3002"},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING: \u5B58\u5728 Security Manager \u65F6, \u65E0\u6CD5\u5C06\u6B64\u529F\u80FD\u8BBE\u7F6E\u4E3A\u201C\u5047\u201D\u3002"}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java 2014-07-15 21:46:30.000000000 -0700
-@@ -90,7 +90,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
- {ErrorMsg.MULTIPLE_STYLESHEET_ERR,
- "\u76F8\u540C\u6A94\u6848\u4E2D\u5B9A\u7FA9\u4E86\u8D85\u904E\u4E00\u500B\u6A23\u5F0F\u8868\u3002"},
-
-@@ -913,12 +919,5 @@
- "FEATURE_SECURE_PROCESSING: \u5B89\u5168\u7BA1\u7406\u7A0B\u5F0F\u5B58\u5728\u6642\uFF0C\u7121\u6CD5\u5C07\u529F\u80FD\u8A2D\u70BA\u507D\u3002"}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java 2014-10-28 20:19:32.000000000 -0700
-@@ -955,6 +955,9 @@
- if (Double.isNaN(d) || Double.isInfinite(d))
- return(Double.toString(d));
-
-+ //Convert -0.0 to +0.0 other values remains the same
-+ d = d + 0.0;
-+
- // Use the XPath formatter to ignore locales
- StringBuffer result = threadLocalStringBuffer.get();
- result.setLength(0);
-@@ -1657,5 +1660,14 @@
-
- }
-
-+ /**
-+ * Utility method to calculate string-length as a number of code points,
-+ * to avoid possible errors with string that contains
-+ * complementary characters
-+ */
-+ public static int getStringLength(String str) {
-+ return str.codePointCount(0,str.length());
-+ }
-+
- //-- End utility functions
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "Use of the extension element ''{0}'' is not allowed when the secure processing feature is set to true."},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java 2013-09-06 11:22:56.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java 2014-07-15 21:46:30.000000000 -0700
-@@ -79,7 +79,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -223,13 +229,6 @@
- "No s''ha pogut resoldre la refer\u00e8ncia d''URI ''{0}''."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java 2014-07-15 21:46:30.000000000 -0700
-@@ -79,7 +79,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -223,13 +229,6 @@
- "Nelze p\u0159elo\u017eit odkazy URI ''{0}''."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "Verwendung des Erweiterungselements \"{0}\" ist nicht zul\u00E4ssig, wenn das Feature f\u00FCr die sichere Verarbeitung auf \"true\" gesetzt ist."},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "El uso del elemento de extensi\u00F3n ''{0}'' no est\u00E1 permitido cuando la funci\u00F3n de procesamiento seguro se ha definido en true."},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "L''utilisation de l''\u00E9l\u00E9ment d''extension ''{0}'' n''est pas autoris\u00E9e lorsque la fonctionnalit\u00E9 de traitement s\u00E9curis\u00E9 est d\u00E9finie sur True."},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "Non \u00E8 consentito utilizzare l''elemento di estensione ''{0}'' se la funzione di elaborazione sicura \u00E8 impostata su true."},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "\u30BB\u30AD\u30E5\u30A2\u51E6\u7406\u6A5F\u80FD\u304Ctrue\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u3068\u304D\u3001\u62E1\u5F35\u8981\u7D20''{0}''\u306E\u4F7F\u7528\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\u3002"},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "\uBCF4\uC548 \uCC98\uB9AC \uAE30\uB2A5\uC774 true\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 \uD655\uC7A5 \uC694\uC18C ''{0}''\uC744(\uB97C) \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "O uso do elemento da extens\u00E3o ''{0}'' n\u00E3o ser\u00E1 permitido quando o recurso de processamento seguro for definido como verdadeiro."},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java 2014-07-15 21:46:30.000000000 -0700
-@@ -79,7 +79,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -223,13 +229,6 @@
- "Nebolo mo\u017en\u00e9 rozl\u00ed\u0161i\u0165 referenciu URI ''{0}''."}
- };
-
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "Anv\u00E4ndning av till\u00E4ggselementet ''{0}'' \u00E4r inte till\u00E5tet n\u00E4r s\u00E4ker bearbetning till\u00E4mpas."},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "\u5F53\u5B89\u5168\u5904\u7406\u529F\u80FD\u8BBE\u7F6E\u4E3A\u201C\u771F\u201D\u65F6, \u4E0D\u5141\u8BB8\u4F7F\u7528\u6269\u5C55\u5143\u7D20 ''{0}''\u3002"},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java 2014-07-15 21:46:30.000000000 -0700
-@@ -81,7 +81,13 @@
- */
-
- // These message should be read from a locale-specific resource bundle
-- private static final Object[][] _contents = new Object[][] {
-+ /** Get the lookup table for error messages.
-+ *
-+ * @return The message lookup table.
-+ */
-+ public Object[][] getContents()
-+ {
-+ return new Object[][] {
-
- /*
- * Note to translators: the substitution text in the following message
-@@ -276,13 +282,6 @@
- {BasisLibrary.UNALLOWED_EXTENSION_ELEMENT_ERR,
- "\u7576\u5B89\u5168\u8655\u7406\u529F\u80FD\u8A2D\u70BA\u771F\u6642\uFF0C\u4E0D\u5141\u8A31\u4F7F\u7528\u64F4\u5145\u5957\u4EF6\u5143\u7D20 ''{0}''\u3002"},
- };
-- /** Get the lookup table for error messages.
-- *
-- * @return The message lookup table.
-- */
-- public Object[][] getContents()
-- {
-- return _contents;
- }
-
- }
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -29,7 +29,7 @@
- import javax.xml.transform.TransformerException;
- import javax.xml.transform.URIResolver;
- import javax.xml.transform.sax.TemplatesHandler;
--
-+import com.sun.org.apache.xalan.internal.XalanConstants;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.CompilerException;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.Parser;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.SourceLoader;
-@@ -95,7 +95,7 @@
- _tfactory = tfactory;
-
- // Instantiate XSLTC and get reference to parser object
-- XSLTC xsltc = new XSLTC(tfactory.useServicesMechnism());
-+ XSLTC xsltc = new XSLTC(tfactory.useServicesMechnism(), tfactory.getFeatureManager());
- if (tfactory.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING))
- xsltc.setSecureProcessing(true);
-
-@@ -103,6 +103,8 @@
- (String)tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET));
- xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD,
- (String)tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_DTD));
-+ xsltc.setProperty(XalanConstants.SECURITY_MANAGER,
-+ tfactory.getAttribute(XalanConstants.SECURITY_MANAGER));
-
-
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -23,6 +23,23 @@
-
- package com.sun.org.apache.xalan.internal.xsltc.trax;
-
-+import com.sun.org.apache.xalan.internal.XalanConstants;
-+import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
-+import com.sun.org.apache.xalan.internal.utils.FeatureManager;
-+import com.sun.org.apache.xalan.internal.utils.FeaturePropertyBase;
-+import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
-+import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
-+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
-+import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager;
-+import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.Property;
-+import com.sun.org.apache.xalan.internal.utils.FeaturePropertyBase.State;
-+import com.sun.org.apache.xalan.internal.xsltc.compiler.Constants;
-+import com.sun.org.apache.xalan.internal.xsltc.compiler.SourceLoader;
-+import com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC;
-+import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
-+import com.sun.org.apache.xalan.internal.xsltc.dom.XSLTCDTMManager;
-+import com.sun.org.apache.xml.internal.utils.StopParseException;
-+import com.sun.org.apache.xml.internal.utils.StylesheetPIHandler;
- import java.io.File;
- import java.io.FileInputStream;
- import java.io.FileNotFoundException;
-@@ -37,11 +54,9 @@
- import java.util.Vector;
- import java.util.zip.ZipEntry;
- import java.util.zip.ZipFile;
--
- import javax.xml.XMLConstants;
--import javax.xml.parsers.SAXParserFactory;
- import javax.xml.parsers.SAXParser;
--import javax.xml.parsers.ParserConfigurationException;
-+import javax.xml.parsers.SAXParserFactory;
-
- import javax.xml.transform.ErrorListener;
- import javax.xml.transform.Source;
-@@ -58,26 +73,9 @@
- import javax.xml.transform.sax.SAXTransformerFactory;
- import javax.xml.transform.sax.TemplatesHandler;
- import javax.xml.transform.sax.TransformerHandler;
-+import javax.xml.transform.stax.*;
- import javax.xml.transform.stream.StreamResult;
- import javax.xml.transform.stream.StreamSource;
--import javax.xml.transform.stax.*;
--
--import com.sun.org.apache.xml.internal.utils.StylesheetPIHandler;
--import com.sun.org.apache.xml.internal.utils.StopParseException;
--
--import com.sun.org.apache.xalan.internal.XalanConstants;
--import com.sun.org.apache.xalan.internal.xsltc.compiler.Constants;
--import com.sun.org.apache.xalan.internal.xsltc.compiler.SourceLoader;
--import com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC;
--import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
--import com.sun.org.apache.xalan.internal.xsltc.dom.XSLTCDTMManager;
--import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
--import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
--import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
--import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager;
--import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.Property;
--import com.sun.org.apache.xalan.internal.utils.XMLSecurityPropertyManager.State;
--
- import org.xml.sax.InputSource;
- import org.xml.sax.XMLFilter;
- import org.xml.sax.XMLReader;
-@@ -227,17 +225,19 @@
- */
- private boolean _useServicesMechanism;
-
-- /**
-+ /**
- * protocols allowed for external references set by the stylesheet processing instruction, Import and Include element.
- */
- private String _accessExternalStylesheet = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
--
- /**
- * protocols allowed for external DTD references in source file and/or stylesheet.
- */
- private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
-
- private XMLSecurityPropertyManager _xmlSecurityPropertyMgr;
-+ private XMLSecurityManager _xmlSecurityManager;
-+
-+ private final FeatureManager _featureManager;
-
- /**
- * javax.xml.transform.sax.TransformerFactory implementation.
-@@ -253,10 +253,13 @@
- private TransformerFactoryImpl(boolean useServicesMechanism) {
- this.m_DTMManagerClass = XSLTCDTMManager.getDTMManagerClass(useServicesMechanism);
- this._useServicesMechanism = useServicesMechanism;
-+ _featureManager = new FeatureManager();
-
- if (System.getSecurityManager() != null) {
- _isSecureMode = true;
- _isNotSecureProcessing = false;
-+ _featureManager.setValue(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
-+ FeaturePropertyBase.State.FSP, XalanConstants.FEATURE_FALSE);
- }
-
- _xmlSecurityPropertyMgr = new XMLSecurityPropertyManager();
-@@ -264,6 +267,9 @@
- Property.ACCESS_EXTERNAL_DTD);
- _accessExternalStylesheet = _xmlSecurityPropertyMgr.getValue(
- Property.ACCESS_EXTERNAL_STYLESHEET);
-+
-+ //Parser's security manager
-+ _xmlSecurityManager = new XMLSecurityManager(true);
- }
-
- /**
-@@ -322,11 +328,21 @@
- return Boolean.TRUE;
- else
- return Boolean.FALSE;
-+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
-+ return _xmlSecurityManager;
- }
-
-- int index = _xmlSecurityPropertyMgr.getIndex(name);
-- if (index > -1) {
-- return _xmlSecurityPropertyMgr.getValueByIndex(index);
-+ /** Check to see if the property is managed by the security manager **/
-+ String propertyValue = (_xmlSecurityManager != null) ?
-+ _xmlSecurityManager.getLimitAsString(name) : null;
-+ if (propertyValue != null) {
-+ return propertyValue;
-+ } else {
-+ propertyValue = (_xmlSecurityPropertyMgr != null) ?
-+ _xmlSecurityPropertyMgr.getValue(name) : null;
-+ if (propertyValue != null) {
-+ return propertyValue;
-+ }
- }
-
- // Throw an exception for all other attributes
-@@ -429,10 +445,13 @@
- }
- }
-
-- int index = _xmlSecurityPropertyMgr.getIndex(name);
-- if (index > -1) {
-- _xmlSecurityPropertyMgr.setValue(index,
-- State.APIPROPERTY, (String)value);
-+ if (_xmlSecurityManager != null &&
-+ _xmlSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
-+ return;
-+ }
-+
-+ if (_xmlSecurityPropertyMgr != null &&
-+ _xmlSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
- _accessExternalDTD = _xmlSecurityPropertyMgr.getValue(
- Property.ACCESS_EXTERNAL_DTD);
- _accessExternalStylesheet = _xmlSecurityPropertyMgr.getValue(
-@@ -482,6 +501,7 @@
- throw new TransformerConfigurationException(err.toString());
- }
- _isNotSecureProcessing = !value;
-+ _xmlSecurityManager.setSecureProcessing(value);
-
- // set external access restriction when FSP is explicitly set
- if (value && XalanConstants.IS_JDK8_OR_ABOVE) {
-@@ -495,6 +515,10 @@
- Property.ACCESS_EXTERNAL_STYLESHEET);
- }
-
-+ if (value && _featureManager != null) {
-+ _featureManager.setValue(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
-+ FeaturePropertyBase.State.FSP, XalanConstants.FEATURE_FALSE);
-+ }
- return;
- }
- else if (name.equals(XalanConstants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
-@@ -503,6 +527,11 @@
- _useServicesMechanism = value;
- }
- else {
-+ if (_featureManager != null &&
-+ _featureManager.setValue(name, State.APIPROPERTY, value)) {
-+ return;
-+ }
-+
- // unknown feature
- ErrorMsg err = new ErrorMsg(ErrorMsg.JAXP_UNSUPPORTED_FEATURE, name);
- throw new TransformerConfigurationException(err.toString());
-@@ -551,6 +580,13 @@
- return !_isNotSecureProcessing;
- }
-
-+ /** Check to see if the property is managed by the security manager **/
-+ String propertyValue = (_featureManager != null) ?
-+ _featureManager.getValueAsString(name) : null;
-+ if (propertyValue != null) {
-+ return Boolean.parseBoolean(propertyValue);
-+ }
-+
- // Feature not supported
- return false;
- }
-@@ -561,6 +597,13 @@
- return _useServicesMechanism;
- }
-
-+ /**
-+ * @return the feature manager
-+ */
-+ public FeatureManager getFeatureManager() {
-+ return _featureManager;
-+ }
-+
- /**
- * javax.xml.transform.sax.TransformerFactory implementation.
- * Get the object that is used by default during the transformation to
-@@ -841,7 +884,7 @@
- }
-
- // Create and initialize a stylesheet compiler
-- final XSLTC xsltc = new XSLTC(_useServicesMechanism);
-+ final XSLTC xsltc = new XSLTC(_useServicesMechanism, _featureManager);
- if (_debug) xsltc.setDebug(true);
- if (_enableInlining)
- xsltc.setTemplateInlining(true);
-@@ -851,6 +894,7 @@
- if (!_isNotSecureProcessing) xsltc.setSecureProcessing(true);
- xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, _accessExternalStylesheet);
- xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, _accessExternalDTD);
-+ xsltc.setProperty(XalanConstants.SECURITY_MANAGER, _xmlSecurityManager);
- xsltc.init();
-
- // 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 2014-07-15 21:46:30.000000000 -0700
-@@ -25,6 +25,7 @@
-
- import com.sun.org.apache.xalan.internal.XalanConstants;
- import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
-+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
- import java.io.File;
- import java.io.FileOutputStream;
- import java.io.IOException;
-@@ -218,6 +219,7 @@
- */
- private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
-
-+ private XMLSecurityManager _securityManager;
- /**
- * A hashtable to store parameters for the identity transform. These
- * are not needed during the transformation, but we must keep track of
-@@ -272,8 +274,11 @@
- _useServicesMechanism = _tfactory.useServicesMechnism();
- _accessExternalStylesheet = (String)_tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET);
- _accessExternalDTD = (String)_tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_DTD);
-+ _securityManager = (XMLSecurityManager)_tfactory.getAttribute(XalanConstants.SECURITY_MANAGER);
- _readerManager = XMLReaderManager.getInstance(_useServicesMechanism);
- _readerManager.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, _accessExternalDTD);
-+ _readerManager.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, _isSecureProcessing);
-+ _readerManager.setProperty(XalanConstants.SECURITY_MANAGER, _securityManager);
- //_isIncremental = tfactory._incremental;
- }
-
-@@ -289,6 +294,7 @@
- */
- public void setSecureProcessing(boolean flag) {
- _isSecureProcessing = flag;
-+ _readerManager.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, _isSecureProcessing);
- }
- /**
- * 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 2014-07-15 21:46:30.000000000 -0700
-@@ -23,6 +23,7 @@
-
- package com.sun.org.apache.xalan.internal.xsltc.trax;
-
-+import com.sun.org.apache.xalan.internal.XalanConstants;
- import java.io.InputStream;
- import java.io.Reader;
-
-@@ -43,6 +44,7 @@
- import javax.xml.transform.stream.StreamSource;
-
- import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
-+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC;
- import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
-
-@@ -105,6 +107,13 @@
- if (reader == null) {
- try {
- reader= XMLReaderFactory.createXMLReader();
-+ try {
-+ reader.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
-+ xsltc.isSecureProcessing());
-+ } catch (SAXNotRecognizedException e) {
-+ System.err.println("Warning: " + reader.getClass().getName() + ": "
-+ + e.getMessage());
-+ }
- } catch (Exception e ) {
- try {
-
-@@ -144,6 +153,22 @@
- + e.getMessage());
- }
-
-+ try {
-+ XMLSecurityManager securityManager =
-+ (XMLSecurityManager)xsltc.getProperty(XalanConstants.SECURITY_MANAGER);
-+ if (securityManager != null) {
-+ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
-+ reader.setProperty(limit.apiProperty(),
-+ securityManager.getLimitValueAsString(limit));
-+ }
-+ if (securityManager.printEntityCountInfo()) {
-+ reader.setProperty(XalanConstants.JDK_ENTITY_COUNT_INFO, XalanConstants.JDK_YES);
-+ }
-+ }
-+ } catch (SAXException se) {
-+ System.err.println("Warning: " + reader.getClass().getName() + ": "
-+ + se.getMessage());
-+ }
- xsltc.setXMLReader(reader);
- }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 2014-07-15 21:46:30.000000000 -0700
-@@ -33,6 +33,7 @@
- import com.sun.org.apache.xerces.internal.util.PropertyState;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
- import com.sun.org.apache.xerces.internal.utils.ObjectFactory;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.XMLDTDContentModelHandler;
- import com.sun.org.apache.xerces.internal.xni.XMLDTDHandler;
-@@ -59,6 +60,7 @@
- import org.w3c.dom.ls.LSResourceResolver;
-
-
-+
- /**
- * Xerces implementation of DOMConfiguration that maintains a table of recognized parameters.
- *
-@@ -156,6 +158,9 @@
- protected static final String SCHEMA_DV_FACTORY =
- Constants.XERCES_PROPERTY_PREFIX + Constants.SCHEMA_DV_FACTORY_PROPERTY;
-
-+ /** Property identifier: Security manager. */
-+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
-+
- /** Property identifier: Security property manager. */
- private static final String XML_SECURITY_PROPERTY_MANAGER =
- Constants.XML_SECURITY_PROPERTY_MANAGER;
-@@ -279,6 +284,7 @@
- JAXP_SCHEMA_LANGUAGE,
- DTD_VALIDATOR_FACTORY_PROPERTY,
- SCHEMA_DV_FACTORY,
-+ SECURITY_MANAGER,
- XML_SECURITY_PROPERTY_MANAGER
- };
- addRecognizedProperties(recognizedProperties);
-@@ -313,6 +319,8 @@
- fValidationManager = createValidationManager();
- setProperty(VALIDATION_MANAGER, fValidationManager);
-
-+ setProperty(SECURITY_MANAGER, new XMLSecurityManager(true));
-+
- setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER,
- 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 2014-07-15 21:54:36.000000000 -0700
-@@ -174,8 +174,6 @@
- /** JAXP schemaSource language: when used internally may include DTD namespace (DOM) */
- public static final String SCHEMA_LANGUAGE = "schemaLanguage";
-
-- public static final String SYSTEM_PROPERTY_ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
--
- /** JAXP Standard property prefix ("http://javax.xml.XMLConstants/property/"). */
- public static final String JAXPAPI_PROPERTY_PREFIX =
- "http://javax.xml.XMLConstants/property/";
-@@ -209,6 +207,119 @@
- public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8);
-
- //
-+ // Implementation limits: corresponding System Properties of the above
-+ // API properties
-+ //
-+ /**
-+ * JDK entity expansion limit; Note that the existing system property
-+ * "entityExpansionLimit" with no prefix is still observed
-+ */
-+ public static final String JDK_ENTITY_EXPANSION_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "entityExpansionLimit";
-+
-+ /**
-+ * JDK element attribute limit; Note that the existing system property
-+ * "elementAttributeLimit" with no prefix is still observed
-+ */
-+ public static final String JDK_ELEMENT_ATTRIBUTE_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "elementAttributeLimit";
-+
-+ /**
-+ * JDK maxOccur limit; Note that the existing system property
-+ * "maxOccurLimit" with no prefix is still observed
-+ */
-+ public static final String JDK_MAX_OCCUR_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxOccurLimit";
-+
-+ /**
-+ * JDK total entity size limit
-+ */
-+ public static final String JDK_TOTAL_ENTITY_SIZE_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "totalEntitySizeLimit";
-+
-+ /**
-+ * JDK maximum general entity size limit
-+ */
-+ public static final String JDK_GENEAL_ENTITY_SIZE_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxGeneralEntitySizeLimit";
-+ /**
-+ * JDK maximum parameter entity size limit
-+ */
-+ public static final String JDK_PARAMETER_ENTITY_SIZE_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxParameterEntitySizeLimit";
-+ /**
-+ * JDK maximum XML name limit
-+ */
-+ public static final String JDK_XML_NAME_LIMIT =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit";
-+
-+ /**
-+ * JDK maxElementDepth limit
-+ */
-+ public static final String JDK_MAX_ELEMENT_DEPTH =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "maxElementDepth";
-+
-+ /**
-+ * JDK property to allow printing out information from the limit analyzer
-+ */
-+ public static final String JDK_ENTITY_COUNT_INFO =
-+ ORACLE_JAXP_PROPERTY_PREFIX + "getEntityCountInfo";
-+
-+ //
-+ // Implementation limits: API properties
-+ //
-+ /**
-+ * JDK entity expansion limit; Note that the existing system property
-+ * "entityExpansionLimit" with no prefix is still observed
-+ */
-+ public static final String SP_ENTITY_EXPANSION_LIMIT = "jdk.xml.entityExpansionLimit";
-+
-+ /**
-+ * JDK element attribute limit; Note that the existing system property
-+ * "elementAttributeLimit" with no prefix is still observed
-+ */
-+ public static final String SP_ELEMENT_ATTRIBUTE_LIMIT = "jdk.xml.elementAttributeLimit";
-+
-+ /**
-+ * JDK maxOccur limit; Note that the existing system property
-+ * "maxOccurLimit" with no prefix is still observed
-+ */
-+ public static final String SP_MAX_OCCUR_LIMIT = "jdk.xml.maxOccurLimit";
-+
-+ /**
-+ * JDK total entity size limit
-+ */
-+ public static final String SP_TOTAL_ENTITY_SIZE_LIMIT = "jdk.xml.totalEntitySizeLimit";
-+
-+ /**
-+ * JDK maximum general entity size limit
-+ */
-+ public static final String SP_GENEAL_ENTITY_SIZE_LIMIT = "jdk.xml.maxGeneralEntitySizeLimit";
-+ /**
-+ * JDK maximum parameter entity size limit
-+ */
-+ public static final String SP_PARAMETER_ENTITY_SIZE_LIMIT = "jdk.xml.maxParameterEntitySizeLimit";
-+ /**
-+ * JDK maximum XML name limit
-+ */
-+ public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit";
-+
-+ /**
-+ * JDK maxElementDepth limit
-+ */
-+ public static final String SP_MAX_ELEMENT_DEPTH = "jdk.xml.maxElementDepth";
-+
-+ //legacy System Properties
-+ public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
-+ public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ;
-+ public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
-+
-+ /**
-+ * A string "yes" that can be used for properties such as getEntityCountInfo
-+ */
-+ public static final String JDK_YES = "yes";
-+
-+ //
- // DOM features
- //
-
-@@ -443,7 +554,7 @@
- public static final String LOCALE_PROPERTY = "locale";
-
- /** property identifier: security manager. */
-- protected static final String SECURITY_MANAGER =
-+ public static final String SECURITY_MANAGER =
- Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
-
-
-@@ -511,9 +622,6 @@
- */
- public final static String ATTRIBUTE_DECLARED = "ATTRIBUTE_DECLARED";
-
-- public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit";
--
-- public final static String MAX_OCCUR_LIMIT = "maxOccurLimit";
-
- /**
- * {@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-07-15 21:46:30.000000000 -0700
-@@ -25,6 +25,7 @@
-
- package com.sun.org.apache.xerces.internal.impl;
-
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.xml.internal.stream.StaxEntityResolverWrapper;
- import java.util.HashMap;
-@@ -50,12 +51,16 @@
-
- private static final String STRING_INTERNING = "http://xml.org/sax/features/string-interning";
-
-+ /** Property identifier: Security manager. */
-+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
-+
- /** Property identifier: Security property manager. */
- private static final String XML_SECURITY_PROPERTY_MANAGER =
- Constants.XML_SECURITY_PROPERTY_MANAGER;
-
- HashMap supportedProps = new HashMap();
-
-+ private XMLSecurityManager fSecurityManager;
- private XMLSecurityPropertyManager fSecurityPropertyMgr;
-
- public static final int CONTEXT_READER = 1;
-@@ -82,6 +87,7 @@
-
- HashMap properties = propertyManager.getProperties();
- supportedProps.putAll(properties);
-+ fSecurityManager = (XMLSecurityManager)getProperty(SECURITY_MANAGER);
- fSecurityPropertyMgr = (XMLSecurityPropertyManager)getProperty(XML_SECURITY_PROPERTY_MANAGER);
- }
-
-@@ -124,6 +130,8 @@
- supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_DUPLICATE_ENTITYDEF_FEATURE, new Boolean(false));
- supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_UNDECLARED_ELEMDEF_FEATURE, new Boolean(false));
-
-+ fSecurityManager = new XMLSecurityManager(true);
-+ supportedProps.put(SECURITY_MANAGER, fSecurityManager);
- fSecurityPropertyMgr = new XMLSecurityPropertyManager();
- supportedProps.put(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
- }
-@@ -142,6 +150,7 @@
- */
- public boolean containsProperty(String property){
- return supportedProps.containsKey(property) ||
-+ (fSecurityManager != null && fSecurityManager.getIndex(property) > -1) ||
- (fSecurityPropertyMgr!=null && fSecurityPropertyMgr.getIndex(property) > -1) ;
- }
-
-@@ -169,12 +178,34 @@
- supportedProps.put( Constants.XERCES_PROPERTY_PREFIX + Constants.STAX_ENTITY_RESOLVER_PROPERTY , new StaxEntityResolverWrapper((XMLResolver)value)) ;
- }
-
-- int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(property) : -1;
-- if (index > -1) {
-- fSecurityPropertyMgr.setValue(index,
-- XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
-- } else {
-- supportedProps.put(property, value);
-+ /**
-+ * It's possible for users to set a security manager through the interface.
-+ * If it's the old SecurityManager, convert it to the new XMLSecurityManager
-+ */
-+ if (property.equals(Constants.SECURITY_MANAGER)) {
-+ fSecurityManager = XMLSecurityManager.convert(value, fSecurityManager);
-+ supportedProps.put(Constants.SECURITY_MANAGER, fSecurityManager);
-+ return;
-+ }
-+ if (property.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
-+ if (value == null) {
-+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
-+ } else {
-+ fSecurityPropertyMgr = (XMLSecurityPropertyManager)value;
-+ }
-+ supportedProps.put(Constants.XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
-+ return;
-+ }
-+
-+ //check if the property is managed by security manager
-+ if (fSecurityManager == null ||
-+ !fSecurityManager.setLimit(property, XMLSecurityManager.State.APIPROPERTY, value)) {
-+ //check if the property is managed by security property manager
-+ if (fSecurityPropertyMgr == null ||
-+ !fSecurityPropertyMgr.setValue(property, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
-+ //fall back to the existing property manager
-+ supportedProps.put(property, value);
-+ }
- }
-
- if(equivalentProperty != null){
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java 2014-10-28 20:19:32.000000000 -0700
-@@ -61,14 +61,13 @@
-
- package com.sun.org.apache.xerces.internal.impl;
-
--import java.io.IOException;
--
- import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
--import com.sun.org.apache.xerces.internal.util.XMLChar;
- import com.sun.org.apache.xerces.internal.util.XML11Char;
-+import com.sun.org.apache.xerces.internal.util.XMLChar;
- import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
- import com.sun.org.apache.xerces.internal.xni.QName;
- import com.sun.org.apache.xerces.internal.xni.XMLString;
-+import java.io.IOException;
-
- /**
- * Implements the entity scanner methods in
-@@ -78,6 +77,7 @@
- *
- * @author Michael Glavassevich, IBM
- * @author Neil Graham, IBM
-+ * @version $Id: XML11EntityScanner.java,v 1.5 2010-11-01 04:39:40 joehw Exp $
- */
-
- public class XML11EntityScanner
-@@ -108,7 +108,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
-
- // peek at character
-@@ -136,7 +136,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
-
- // scan character
-@@ -148,7 +148,7 @@
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count) {
- fCurrentEntity.ch[0] = (char)c;
-- load(1, false);
-+ load(1, false, true);
- }
- if (c == '\r' && external) {
- int cc = fCurrentEntity.ch[fCurrentEntity.position++];
-@@ -183,7 +183,7 @@
- public String scanNmtoken() throws IOException {
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
-
- // scan nmtoken
-@@ -194,6 +194,7 @@
- if (XML11Char.isXML11Name(ch)) {
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -206,7 +207,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -214,6 +215,7 @@
- else if (XML11Char.isXML11NameHighSurrogate(ch)) {
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -226,7 +228,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- --fCurrentEntity.startPosition;
- --fCurrentEntity.position;
- break;
-@@ -240,6 +242,7 @@
- }
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -252,7 +255,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -294,7 +297,7 @@
- public String scanName() throws IOException {
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
-
- // scan name
-@@ -305,7 +308,7 @@
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- fCurrentEntity.ch[0] = ch;
- offset = 0;
-- if (load(1, false)) {
-+ if (load(1, false, true)) {
- fCurrentEntity.columnNumber++;
- String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
- return symbol;
-@@ -316,7 +319,7 @@
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- fCurrentEntity.ch[0] = ch;
- offset = 0;
-- if (load(1, false)) {
-+ if (load(1, false, true)) {
- --fCurrentEntity.position;
- --fCurrentEntity.startPosition;
- return null;
-@@ -332,7 +335,7 @@
- fCurrentEntity.ch[0] = ch;
- fCurrentEntity.ch[1] = ch2;
- offset = 0;
-- if (load(2, false)) {
-+ if (load(2, false, true)) {
- fCurrentEntity.columnNumber += 2;
- String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 2);
- return symbol;
-@@ -348,6 +351,7 @@
- if (XML11Char.isXML11Name(ch)) {
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -360,7 +364,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -368,6 +372,7 @@
- else if (XML11Char.isXML11NameHighSurrogate(ch)) {
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -380,7 +385,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- --fCurrentEntity.position;
- --fCurrentEntity.startPosition;
- break;
-@@ -394,6 +399,7 @@
- }
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -406,7 +412,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -449,7 +455,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
-
- // scan name
-@@ -460,7 +466,7 @@
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- fCurrentEntity.ch[0] = ch;
- offset = 0;
-- if (load(1, false)) {
-+ if (load(1, false, true)) {
- fCurrentEntity.columnNumber++;
- String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
- return symbol;
-@@ -471,7 +477,7 @@
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- fCurrentEntity.ch[0] = ch;
- offset = 0;
-- if (load(1, false)) {
-+ if (load(1, false, true)) {
- --fCurrentEntity.position;
- --fCurrentEntity.startPosition;
- return null;
-@@ -487,7 +493,7 @@
- fCurrentEntity.ch[0] = ch;
- fCurrentEntity.ch[1] = ch2;
- offset = 0;
-- if (load(2, false)) {
-+ if (load(2, false, true)) {
- fCurrentEntity.columnNumber += 2;
- String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 2);
- return symbol;
-@@ -503,6 +509,7 @@
- if (XML11Char.isXML11NCName(ch)) {
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -515,7 +522,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -523,6 +530,7 @@
- else if (XML11Char.isXML11NameHighSurrogate(ch)) {
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -535,7 +543,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- --fCurrentEntity.startPosition;
- --fCurrentEntity.position;
- break;
-@@ -549,6 +557,7 @@
- }
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -561,7 +570,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -610,7 +619,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
-
- // scan qualified name
-@@ -621,7 +630,7 @@
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- fCurrentEntity.ch[0] = ch;
- offset = 0;
-- if (load(1, false)) {
-+ if (load(1, false, true)) {
- fCurrentEntity.columnNumber++;
- String name = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
- qname.setValues(null, name, name, null);
-@@ -633,7 +642,7 @@
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- fCurrentEntity.ch[0] = ch;
- offset = 0;
-- if (load(1, false)) {
-+ if (load(1, false, true)) {
- --fCurrentEntity.startPosition;
- --fCurrentEntity.position;
- return false;
-@@ -649,7 +658,7 @@
- fCurrentEntity.ch[0] = ch;
- fCurrentEntity.ch[1] = ch2;
- offset = 0;
-- if (load(2, false)) {
-+ if (load(2, false, true)) {
- fCurrentEntity.columnNumber += 2;
- String name = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 2);
- qname.setValues(null, name, name, null);
-@@ -674,6 +683,7 @@
- }
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -689,7 +699,7 @@
- index = index - offset;
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -697,6 +707,7 @@
- else if (XML11Char.isXML11NameHighSurrogate(ch)) {
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -712,7 +723,7 @@
- index = index - offset;
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- sawIncompleteSurrogatePair = true;
- --fCurrentEntity.startPosition;
- --fCurrentEntity.position;
-@@ -728,6 +739,7 @@
- }
- if (++fCurrentEntity.position == fCurrentEntity.count) {
- int length = fCurrentEntity.position - offset;
-+ invokeListeners(length);
- if (length == fCurrentEntity.ch.length) {
- // bad luck we have to resize our buffer
- char[] tmp = new char[fCurrentEntity.ch.length << 1];
-@@ -743,7 +755,7 @@
- index = index - offset;
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -820,11 +832,11 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
- else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
-- load(1, false);
-+ load(1, false, true);
- fCurrentEntity.position = 0;
- fCurrentEntity.startPosition = 0;
- }
-@@ -846,7 +858,7 @@
- fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
- fCurrentEntity.position = newlines;
- fCurrentEntity.startPosition = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -869,7 +881,7 @@
- fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
- fCurrentEntity.position = newlines;
- fCurrentEntity.startPosition = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -961,11 +973,11 @@
- throws IOException {
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
- else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
-- load(1, false);
-+ load(1, false, true);
- fCurrentEntity.startPosition = 0;
- fCurrentEntity.position = 0;
- }
-@@ -987,7 +999,7 @@
- fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
- fCurrentEntity.position = newlines;
- fCurrentEntity.startPosition = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -1010,7 +1022,7 @@
- fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
- fCurrentEntity.position = newlines;
- fCurrentEntity.startPosition = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -1113,7 +1125,7 @@
- do {
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, false);
- }
-
- boolean bNextEntity = false;
-@@ -1127,7 +1139,7 @@
- 0,
- fCurrentEntity.count - fCurrentEntity.position);
-
-- bNextEntity = load(fCurrentEntity.count - fCurrentEntity.position, false);
-+ bNextEntity = load(fCurrentEntity.count - fCurrentEntity.position, false, false);
- fCurrentEntity.position = 0;
- fCurrentEntity.startPosition = 0;
- }
-@@ -1140,7 +1152,7 @@
- fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
- fCurrentEntity.position = fCurrentEntity.count;
- fCurrentEntity.startPosition = fCurrentEntity.count;
-- load(0,true);
-+ load(0,true, false);
- return false;
- }
-
-@@ -1160,7 +1172,7 @@
- fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
- fCurrentEntity.position = newlines;
- fCurrentEntity.startPosition = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -1184,7 +1196,7 @@
- fCurrentEntity.position = newlines;
- fCurrentEntity.startPosition = newlines;
- fCurrentEntity.count = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -1309,7 +1321,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
-
- // skip character
-@@ -1335,7 +1347,7 @@
- // handle newlines
- if (fCurrentEntity.position == fCurrentEntity.count) {
- fCurrentEntity.ch[0] = (char)cc;
-- load(1, false);
-+ load(1, false, true);
- }
- int ccc = fCurrentEntity.ch[++fCurrentEntity.position];
- if (ccc == '\n' || ccc == 0x85) {
-@@ -1369,7 +1381,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
-
-
-@@ -1397,7 +1409,7 @@
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- fCurrentEntity.ch[0] = (char)c;
-- entityChanged = load(1, true);
-+ entityChanged = load(1, true, true);
- if (!entityChanged) {
- // the load change the position to be 1,
- // need to restore it when entity not changed
-@@ -1424,7 +1436,7 @@
- if (!entityChanged)
- fCurrentEntity.position++;
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
-
- if(fCurrentEntity == null){
- return true ;
-@@ -1445,7 +1457,7 @@
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- fCurrentEntity.ch[0] = (char)c;
-- entityChanged = load(1, true);
-+ entityChanged = load(1, true, true);
- if (!entityChanged) {
- // the load change the position to be 1,
- // need to restore it when entity not changed
-@@ -1463,7 +1475,7 @@
- if (!entityChanged)
- fCurrentEntity.position++;
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
-
- if(fCurrentEntity == null){
- return true ;
-@@ -1496,7 +1508,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, true);
- }
-
- // skip string
-@@ -1508,10 +1520,11 @@
- return false;
- }
- if (i < length - 1 && fCurrentEntity.position == fCurrentEntity.count) {
-+ invokeListeners(0);
- System.arraycopy(fCurrentEntity.ch, fCurrentEntity.count - i - 1, fCurrentEntity.ch, 0, i + 1);
- // REVISIT: Can a string to be skipped cross an
- // entity boundary? -Ac
-- if (load(i + 1, false)) {
-+ if (load(i + 1, false, false)) {
- fCurrentEntity.startPosition -= i + 1;
- fCurrentEntity.position -= i + 1;
- return false;
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -108,6 +108,7 @@
- * @author Elena Litani, IBM
- * @author Michael Glavassevich, IBM
- * @author Sunitha Reddy, Sun Microsystems
-+ * @version $Id: XML11NSDocumentScannerImpl.java,v 1.6 2010-11-01 04:39:40 joehw Exp $
- */
- public class XML11NSDocumentScannerImpl extends XML11DocumentScannerImpl {
-
-@@ -236,7 +237,8 @@
-
- // attributes
- scanAttribute(fAttributes);
-- if (fSecurityManager != null && fAttributes.getLength() > fElementAttributeLimit){
-+ if (fSecurityManager != null && (!fSecurityManager.isNoLimit(fElementAttributeLimit)) &&
-+ fAttributes.getLength() > fElementAttributeLimit){
- fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
- "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-07-15 21:46:30.000000000 -0700
-@@ -44,6 +44,9 @@
- import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
- import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
- import com.sun.org.apache.xerces.internal.impl.Constants;
-+import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
-+import com.sun.xml.internal.stream.Entity;
-
- /**
- * This class is responsible for scanning the declarations found
-@@ -66,7 +69,7 @@
- * @author Glenn Marcy, IBM
- * @author Eric Ye, IBM
- *
-- * @version $Id: XMLDTDScannerImpl.java,v 1.7 2007/09/26 12:52:40 ndw Exp $
-+ * @version $Id: XMLDTDScannerImpl.java,v 1.8 2010-11-01 04:39:41 joehw Exp $
- */
- public class XMLDTDScannerImpl
- extends XMLScanner
-@@ -260,6 +263,11 @@
- fEntityManager.startDTDEntity(inputSource);
- } // setInputSource(XMLInputSource)
-
-+
-+ public void setLimitAnalyzer(XMLLimitAnalyzer limitAnalyzer) {
-+ fLimitAnalyzer = limitAnalyzer;
-+ }
-+
- /**
- * Scans the external subset of the document.
- *
-@@ -1545,7 +1553,7 @@
-
- // internal entity
- if (systemId == null) {
-- scanEntityValue(fLiteral, fLiteral2);
-+ scanEntityValue(name, isPEDecl, fLiteral, fLiteral2);
- // since we need it's value anyway, let's snag it so it doesn't get corrupted
- // if a new load takes place before we store the entity values
- fStringBuffer.clear();
-@@ -1610,7 +1618,7 @@
- * the use of scanCharReferenceValue), and fStringBuffer2, anything in them
- * at the time of calling is lost.
- */
-- protected final void scanEntityValue(XMLString value,
-+ protected final void scanEntityValue(String entityName, boolean isPEDecl, XMLString value,
- XMLString nonNormalizedValue)
- throws IOException, XNIException {
- int quote = fEntityScanner.scanChar();
-@@ -1622,10 +1630,20 @@
-
- XMLString literal = fString;
- XMLString literal2 = fString;
-+ int countChar = 0;
-+ if (fLimitAnalyzer == null ) {
-+ fLimitAnalyzer = new XMLLimitAnalyzer();
-+ }
-+ fLimitAnalyzer.startEntity(entityName);
-+
- if (fEntityScanner.scanLiteral(quote, fString) != quote) {
- fStringBuffer.clear();
- fStringBuffer2.clear();
- do {
-+ if (isPEDecl && fLimitAnalyzer != null) {
-+ checkLimit("%" + entityName, fString.length + countChar);
-+ }
-+ countChar = 0;
- fStringBuffer.append(fString);
- fStringBuffer2.append(fString);
- if (fEntityScanner.skipChar('&')) {
-@@ -1685,6 +1703,7 @@
- }
- }
- else {
-+ countChar++;
- int c = fEntityScanner.peekChar();
- if (XMLChar.isHighSurrogate(c)) {
- scanSurrogates(fStringBuffer2);
-@@ -1708,9 +1727,17 @@
- fStringBuffer2.append(fString);
- literal = fStringBuffer;
- literal2 = fStringBuffer2;
-+ } else {
-+ if (isPEDecl) {
-+ checkLimit("%" + entityName, literal);
-+ }
- }
- value.setValues(literal);
- nonNormalizedValue.setValues(literal2);
-+ if (fLimitAnalyzer != null) {
-+ fLimitAnalyzer.endEntity(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT, entityName);
-+ }
-+
- if (!fEntityScanner.skipChar(quote)) {
- reportFatalError("CloseQuoteMissingInDecl", null);
- }
-@@ -2124,6 +2151,45 @@
- // set starting state
- setScannerState(SCANNER_STATE_TEXT_DECL);
- //new SymbolTable());
-+
-+ fLimitAnalyzer = new XMLLimitAnalyzer();
-+ }
-+
-+ /**
-+ * Add the count of the content buffer and check if the accumulated
-+ * value exceeds the limit
-+ * @param entityName entity name
-+ * @param buffer content buffer
-+ */
-+ private void checkLimit(String entityName, XMLString buffer) {
-+ checkLimit(entityName, buffer.length);
-+ }
-+
-+ /**
-+ * Add the count and check limit
-+ * @param entityName entity name
-+ * @param len length of the buffer
-+ */
-+ private void checkLimit(String entityName, int len) {
-+ if (fLimitAnalyzer == null) {
-+ fLimitAnalyzer = new XMLLimitAnalyzer();
-+ }
-+ fLimitAnalyzer.addValue(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT, entityName, len);
-+ if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT, fLimitAnalyzer)) {
-+ fSecurityManager.debugPrint(fLimitAnalyzer);
-+ reportFatalError("MaxEntitySizeLimit", new Object[]{entityName,
-+ fLimitAnalyzer.getValue(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT),
-+ fSecurityManager.getLimit(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT),
-+ fSecurityManager.getStateLiteral(XMLSecurityManager.Limit.PARAMETER_ENTITY_SIZE_LIMIT)});
-+ }
-+ if (fSecurityManager.isOverLimit(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT, fLimitAnalyzer)) {
-+ fSecurityManager.debugPrint(fLimitAnalyzer);
-+ reportFatalError("TotalEntitySizeLimit",
-+ new Object[]{fLimitAnalyzer.getTotalValue(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT),
-+ fSecurityManager.getLimit(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT),
-+ fSecurityManager.getStateLiteral(XMLSecurityManager.Limit.TOTAL_ENTITY_SIZE_LIMIT)});
-+ }
-+
- }
-
- 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-10-28 20:19:32.000000000 -0700
-@@ -50,12 +50,14 @@
- import com.sun.org.apache.xerces.internal.xni.Augmentations;
- import com.sun.org.apache.xerces.internal.impl.Constants;
- import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
- import com.sun.org.apache.xerces.internal.util.NamespaceSupport;
- import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
-+import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager.Limit;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager.State;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
--import com.sun.xml.internal.stream.Entity;
- import javax.xml.XMLConstants;
- import javax.xml.stream.XMLStreamConstants;
- import javax.xml.stream.events.XMLEvent;
-@@ -165,7 +167,7 @@
-
- /** Feature identifier: standard uri conformant */
- protected static final String STANDARD_URI_CONFORMANT =
-- Constants.XERCES_FEATURE_PREFIX +Constants.STANDARD_URI_CONFORMANT_FEATURE;
-+ Constants.XERCES_FEATURE_PREFIX + Constants.STANDARD_URI_CONFORMANT_FEATURE;
-
- /** Property identifier: Security property manager. */
- private static final String XML_SECURITY_PROPERTY_MANAGER =
-@@ -213,11 +215,8 @@
- };
-
- private static final char [] cdata = {'[','C','D','A','T','A','['};
-- private static final char [] endTag = {'<','/'};
--
-- //this variable is also used by XMLDocumentScannerImpl in the same package
- static final char [] xmlDecl = {'<','?','x','m','l'};
--
-+ private static final char [] endTag = {'<','/'};
- // debugging
-
- /** Debug scanner state. */
-@@ -316,6 +315,7 @@
- protected String fDeclaredEncoding = null;
- /** Xerces Feature: Disallow doctype declaration. */
- protected boolean fDisallowDoctype = false;
-+
- /**
- * comma-delimited list of protocols that are allowed for the purpose
- * of accessing external dtd or entity references
-@@ -384,7 +384,6 @@
-
- protected boolean foundBuiltInRefs = false;
-
-- protected SecurityManager fSecurityManager = null;
-
- //skip element algorithm
- static final short MAX_DEPTH_LIMIT = 5 ;
-@@ -570,46 +569,24 @@
-
- // xerces features
- fReportCdataEvent = componentManager.getFeature(Constants.STAX_REPORT_CDATA_EVENT, true);
--
-- fSecurityManager = (SecurityManager)componentManager.getProperty(Constants.SECURITY_MANAGER, null);
-- fElementAttributeLimit = (fSecurityManager != null)?fSecurityManager.getElementAttrLimit():0;
--
-+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(Constants.SECURITY_MANAGER, null);
- fNotifyBuiltInRefs = componentManager.getFeature(NOTIFY_BUILTIN_REFS, false);
-
- Object resolver = componentManager.getProperty(ENTITY_RESOLVER, null);
- fExternalSubsetResolver = (resolver instanceof ExternalSubsetResolver) ?
- (ExternalSubsetResolver) resolver : null;
-
-- // initialize vars
-- fMarkupDepth = 0;
-- fCurrentElement = null;
-- fElementStack.clear();
-- fHasExternalDTD = false;
-- fStandaloneSet = false;
-- fStandalone = false;
-- fInScanContent = false;
-- //skipping algorithm
-- fShouldSkip = false;
-- fAdd = false;
-- fSkip = false;
--
- //attribute
- fReadingAttributes = false;
- //xxx: external entities are supported in Xerces
- // it would be good to define feature for this case
- fSupportExternalEntities = true;
-- fSupportExternalEntities = true;
-- fSupportExternalEntities = true;
-- fSupportExternalEntities = true;
- fReplaceEntityReferences = true;
- fIsCoalesce = false;
-
- // setup Driver
- setScannerState(SCANNER_STATE_CONTENT);
- setDriver(fContentDriver);
-- fEntityStore = fEntityManager.getEntityStore();
--
-- dtdGrammarUtil = null;
-
- // JAXP 1.5 features and properties
- XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)
-@@ -618,6 +595,7 @@
-
- fStrictURI = componentManager.getFeature(STANDARD_URI_CONFORMANT, false);
-
-+ resetCommon();
- //fEntityManager.test();
- } // reset(XMLComponentManager)
-
-@@ -631,22 +609,12 @@
- fNamespaces = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE)).booleanValue();
- fNotifyBuiltInRefs = false ;
-
-- // initialize vars
-- fMarkupDepth = 0;
-- fCurrentElement = null;
-- fShouldSkip = false;
-- fAdd = false;
-- fSkip = false;
-- fElementStack.clear();
- //fElementStack2.clear();
-- fHasExternalDTD = false;
-- fStandaloneSet = false;
-- fStandalone = false;
- //fReplaceEntityReferences = true;
- //fSupportExternalEntities = true;
-- Boolean bo = (Boolean)propertyManager.getProperty(XMLInputFactoryImpl.IS_REPLACING_ENTITY_REFERENCES);
-+ Boolean bo = (Boolean)propertyManager.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES);
- fReplaceEntityReferences = bo.booleanValue();
-- bo = (Boolean)propertyManager.getProperty(XMLInputFactoryImpl.IS_SUPPORTING_EXTERNAL_ENTITIES);
-+ bo = (Boolean)propertyManager.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES);
- fSupportExternalEntities = bo.booleanValue();
- Boolean cdata = (Boolean)propertyManager.getProperty(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.STAX_REPORT_CDATA_EVENT) ;
- if(cdata != null)
-@@ -662,17 +630,43 @@
- //we dont need to do this -- nb.
- //setScannerState(SCANNER_STATE_CONTENT);
- //setDriver(fContentDriver);
-- fEntityStore = fEntityManager.getEntityStore();
- //fEntityManager.test();
-
-- dtdGrammarUtil = null;
--
-- // JAXP 1.5 features and properties
-+ // JAXP 1.5 features and properties
- XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)
- propertyManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
- fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
-+
-+ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(Constants.SECURITY_MANAGER);
-+ resetCommon();
- } // reset(XMLComponentManager)
-
-+ void resetCommon() {
-+ // initialize vars
-+ fMarkupDepth = 0;
-+ fCurrentElement = null;
-+ fElementStack.clear();
-+ fHasExternalDTD = false;
-+ fStandaloneSet = false;
-+ fStandalone = false;
-+ fInScanContent = false;
-+ //skipping algorithm
-+ fShouldSkip = false;
-+ fAdd = false;
-+ fSkip = false;
-+
-+ fEntityStore = fEntityManager.getEntityStore();
-+ dtdGrammarUtil = null;
-+
-+ if (fSecurityManager != null) {
-+ fElementAttributeLimit = fSecurityManager.getLimit(XMLSecurityManager.Limit.ELEMENT_ATTRIBUTE_LIMIT);
-+ } else {
-+ fElementAttributeLimit = 0;
-+ }
-+ fLimitAnalyzer = new XMLLimitAnalyzer();
-+ fEntityManager.setLimitAnalyzer(fLimitAnalyzer);
-+ }
-+
- /**
- * Returns a list of feature identifiers that are recognized by
- * this component. This method may return null if no features
-@@ -769,10 +763,10 @@
-
- //JAXP 1.5 properties
- if (propertyId.equals(XML_SECURITY_PROPERTY_MANAGER))
-- {
-+ {
- XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)value;
- fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
-- }
-+ }
-
- } // setProperty(String,Object)
-
-@@ -1315,6 +1309,7 @@
-
- fAttributes.removeAllAttributes();
-
-+ checkDepth(rawname);
- if(!seekCloseOfStartTag()){
- fReadingAttributes = true;
- fAttributeCacheUsedCount =0;
-@@ -1322,10 +1317,11 @@
- fAddDefaultAttr = true;
- do {
- scanAttribute(fAttributes);
-- if (fSecurityManager != null && fAttributes.getLength() > fElementAttributeLimit){
-+ if (fSecurityManager != null && !fSecurityManager.isNoLimit(fElementAttributeLimit) &&
-+ fAttributes.getLength() > fElementAttributeLimit){
- fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
- "ElementAttributeLimit",
-- new Object[]{rawname, new Integer(fAttributes.getLength()) },
-+ new Object[]{rawname, fElementAttributeLimit },
- XMLErrorReporter.SEVERITY_FATAL_ERROR );
- }
-
-@@ -1918,6 +1914,21 @@
- // utility methods
-
- /**
-+ * Check if the depth exceeds the maxElementDepth limit
-+ * @param elementName name of the current element
-+ */
-+ void checkDepth(String elementName) {
-+ fLimitAnalyzer.addValue(Limit.MAX_ELEMENT_DEPTH_LIMIT, elementName, fElementStack.fDepth);
-+ if (fSecurityManager.isOverLimit(Limit.MAX_ELEMENT_DEPTH_LIMIT,fLimitAnalyzer)) {
-+ fSecurityManager.debugPrint(fLimitAnalyzer);
-+ reportFatalError("MaxElementDepthLimit", new Object[]{elementName,
-+ fLimitAnalyzer.getTotalValue(Limit.MAX_ELEMENT_DEPTH_LIMIT),
-+ fSecurityManager.getLimit(Limit.MAX_ELEMENT_DEPTH_LIMIT),
-+ "maxElementDepth"});
-+ }
-+ }
-+
-+ /**
- * Calls document handler with a single character resulting from
- * built-in entity resolution.
- *
-@@ -2036,6 +2047,13 @@
-
- } // getDriverName():String
-
-+ /**
-+ * Check the protocol used in the systemId against allowed protocols
-+ *
-+ * @param systemId the Id of the URI
-+ * @param allowedProtocols a list of allowed protocols separated by comma
-+ * @return the name of the protocol if rejected, null otherwise
-+ */
- String checkAccess(String systemId, String allowedProtocols) throws IOException {
- String baseSystemId = fEntityScanner.getBaseSystemId();
- String expandedSystemId = fEntityManager.expandSystemId(systemId, baseSystemId,fStrictURI);
-@@ -2833,6 +2851,8 @@
- if(DEBUG){
- System.out.println("NOT USING THE BUFFER, STRING = " + fTempString.toString());
- }
-+ //check limit before returning event
-+ checkLimit(fContentBuffer);
- if(dtdGrammarUtil!= null && dtdGrammarUtil.isIgnorableWhiteSpace(fContentBuffer)){
- if(DEBUG)System.out.println("Return SPACE EVENT");
- return XMLEvent.SPACE;
-@@ -2931,6 +2951,8 @@
- fLastSectionWasCharacterData = true ;
- continue;
- }else{
-+ //check limit before returning event
-+ checkLimit(fContentBuffer);
- if(dtdGrammarUtil!= null && dtdGrammarUtil.isIgnorableWhiteSpace(fContentBuffer)){
- if(DEBUG)System.out.println("Return SPACE EVENT");
- return XMLEvent.SPACE;
-@@ -3141,6 +3163,30 @@
- } //while loop
- }//next
-
-+ /**
-+ * Add the count of the content buffer and check if the accumulated
-+ * value exceeds the limit
-+ * @param buffer content buffer
-+ */
-+ protected void checkLimit(XMLStringBuffer buffer) {
-+ if (fLimitAnalyzer.isTracking(fCurrentEntityName)) {
-+ fLimitAnalyzer.addValue(Limit.GENEAL_ENTITY_SIZE_LIMIT, fCurrentEntityName, buffer.length);
-+ if (fSecurityManager.isOverLimit(Limit.GENEAL_ENTITY_SIZE_LIMIT, fLimitAnalyzer)) {
-+ fSecurityManager.debugPrint(fLimitAnalyzer);
-+ reportFatalError("MaxEntitySizeLimit", new Object[]{fCurrentEntityName,
-+ fLimitAnalyzer.getValue(Limit.GENEAL_ENTITY_SIZE_LIMIT),
-+ fSecurityManager.getLimit(Limit.GENEAL_ENTITY_SIZE_LIMIT),
-+ fSecurityManager.getStateLiteral(Limit.GENEAL_ENTITY_SIZE_LIMIT)});
-+ }
-+ if (fSecurityManager.isOverLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fLimitAnalyzer)) {
-+ fSecurityManager.debugPrint(fLimitAnalyzer);
-+ reportFatalError("TotalEntitySizeLimit",
-+ new Object[]{fLimitAnalyzer.getTotalValue(Limit.TOTAL_ENTITY_SIZE_LIMIT),
-+ fSecurityManager.getLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT),
-+ fSecurityManager.getStateLiteral(Limit.TOTAL_ENTITY_SIZE_LIMIT)});
-+ }
-+ }
-+ }
-
- //
- // 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-07-15 21:46:30.000000000 -0700
-@@ -1090,6 +1090,8 @@
-
- ((XMLDTDScannerImpl)fDTDScanner).reset(fPropertyManager);
- }
-+
-+ fDTDScanner.setLimitAnalyzer(fLimitAnalyzer);
- do {
- 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-10-28 20:19:32.000000000 -0700
-@@ -18,19 +18,17 @@
- * limitations under the License.
- */
-
--package com.sun.org.apache.xerces.internal.impl ;
-+package com.sun.org.apache.xerces.internal.impl;
-
--import com.sun.org.apache.xerces.internal.impl.Constants;
- import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader;
- import com.sun.org.apache.xerces.internal.impl.io.UCSReader;
- import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader;
- import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
--import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler;
- import com.sun.org.apache.xerces.internal.impl.validation.ValidationManager;
- import com.sun.org.apache.xerces.internal.util.*;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
--import com.sun.org.apache.xerces.internal.util.URI;
- import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
-+import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.Augmentations;
- import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
-@@ -52,6 +50,7 @@
- import java.util.Map;
- import java.util.Stack;
- import javax.xml.XMLConstants;
-+import javax.xml.stream.XMLInputFactory;
-
-
- /**
-@@ -174,7 +173,6 @@
- /** access external dtd: file protocol */
- static final String EXTERNAL_ACCESS_DEFAULT = Constants.EXTERNAL_ACCESS_DEFAULT;
-
--
- // recognized features and properties
-
- /** Recognized features. */
-@@ -305,8 +303,14 @@
- /** Property Manager. This is used from Stax */
- protected PropertyManager fPropertyManager ;
-
-+ /** StAX properties */
-+ boolean fSupportDTD = true;
-+ boolean fReplaceEntityReferences = true;
-+ boolean fSupportExternalEntities = true;
-+
- /** used to restrict external access */
- protected String fAccessExternalDTD = EXTERNAL_ACCESS_DEFAULT;
-+
- // settings
-
- /**
-@@ -324,9 +328,12 @@
- */
- protected int fBufferSize = DEFAULT_BUFFER_SIZE;
-
-- // stores defaults for entity expansion limit if it has
-- // been set on the configuration.
-- protected SecurityManager fSecurityManager = null;
-+ /** Security Manager */
-+ protected XMLSecurityManager fSecurityManager = null;
-+
-+ protected XMLLimitAnalyzer fLimitAnalyzer = null;
-+
-+ protected int entityExpansionIndex;
-
- /**
- * True if the document entity is standalone. This should really
-@@ -352,10 +359,6 @@
- /** XML 1.1 entity scanner. */
- protected XMLEntityScanner fXML11EntityScanner;
-
-- /** entity expansion limit (contains useful data if and only if
-- fSecurityManager is non-null) */
-- protected int fEntityExpansionLimit = 0;
--
- /** count of entities expanded: */
- protected int fEntityExpansionCount = 0;
-
-@@ -833,6 +836,9 @@
- fCurrentEntity.setEncodingExternallySpecified(encodingExternallySpecified);
- fEntityScanner.setCurrentEntity(fCurrentEntity);
- fResourceIdentifier.setValues(publicId, literalSystemId, baseSystemId, expandedSystemId);
-+ if (fLimitAnalyzer != null) {
-+ fLimitAnalyzer.startEntity(name);
-+ }
- return encoding;
- } //setupCurrentEntity(String, XMLInputSource, boolean, boolean): String
-
-@@ -1133,7 +1139,8 @@
- boolean parameter = entityName.startsWith("%");
- boolean general = !parameter;
- if (unparsed || (general && !fExternalGeneralEntities) ||
-- (parameter && !fExternalParameterEntities)) {
-+ (parameter && !fExternalParameterEntities) ||
-+ !fSupportDTD || !fSupportExternalEntities) {
-
- if (fEntityHandler != null) {
- fResourceIdentifier.clear();
-@@ -1294,10 +1301,13 @@
- //expansions exceeds the entity expansion limit, parser will throw fatal error.
- // Note that this represents the nesting level of open entities.
- fEntityExpansionCount++;
-- if( fSecurityManager != null && fEntityExpansionCount > fEntityExpansionLimit ){
-- fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
-- "EntityExpansionLimitExceeded",
-- new Object[]{new Integer(fEntityExpansionLimit) },
-+ if(fLimitAnalyzer != null) {
-+ fLimitAnalyzer.addValue(entityExpansionIndex, name, 1);
-+ }
-+ if( fSecurityManager != null && fSecurityManager.isOverLimit(entityExpansionIndex, fLimitAnalyzer)){
-+ fSecurityManager.debugPrint(fLimitAnalyzer);
-+ fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,"EntityExpansionLimitExceeded",
-+ new Object[]{fSecurityManager.getLimitValueByIndex(entityExpansionIndex)},
- XMLErrorReporter.SEVERITY_FATAL_ERROR );
- // is there anything better to do than reset the counter?
- // at least one can envision debugging applications where this might
-@@ -1361,6 +1371,12 @@
- if(fCurrentEntity != null){
- //close the reader
- try{
-+ if (fLimitAnalyzer != null) {
-+ fLimitAnalyzer.endEntity(XMLSecurityManager.Limit.GENEAL_ENTITY_SIZE_LIMIT, fCurrentEntity.name);
-+ if (fCurrentEntity.name.equals("[xml]")) {
-+ fSecurityManager.debugPrint(fLimitAnalyzer);
-+ }
-+ }
- fCurrentEntity.close();
- }catch(IOException ex){
- throw new XNIException(ex);
-@@ -1419,6 +1435,10 @@
- fStaxEntityResolver = null;
- }
-
-+ fSupportDTD = ((Boolean)propertyManager.getProperty(XMLInputFactory.SUPPORT_DTD)).booleanValue();
-+ fReplaceEntityReferences = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES)).booleanValue();
-+ fSupportExternalEntities = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES)).booleanValue();
-+
- // Zephyr feature ignore-external-dtd is the opposite of Xerces' load-external-dtd
- fLoadExternalDTD = !((Boolean)propertyManager.getProperty(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.IGNORE_EXTERNAL_DTD)).booleanValue();
-
-@@ -1426,6 +1446,8 @@
- XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) propertyManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
- fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
-
-+ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(SECURITY_MANAGER);
-+
- // initialize state
- //fStandalone = false;
- fEntities.clear();
-@@ -1485,7 +1507,13 @@
- fEntityResolver = (XMLEntityResolver)componentManager.getProperty(ENTITY_RESOLVER, null);
- fStaxEntityResolver = (StaxEntityResolverWrapper)componentManager.getProperty(STAX_ENTITY_RESOLVER, null);
- fValidationManager = (ValidationManager)componentManager.getProperty(VALIDATION_MANAGER, null);
-- fSecurityManager = (SecurityManager)componentManager.getProperty(SECURITY_MANAGER, null);
-+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER, null);
-+ entityExpansionIndex = fSecurityManager.getIndex(Constants.JDK_ENTITY_EXPANSION_LIMIT);
-+
-+ //StAX Property
-+ fSupportDTD = true;
-+ fReplaceEntityReferences = true;
-+ fSupportExternalEntities = true;
-
- // JAXP 1.5 feature
- XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER, null);
-@@ -1506,7 +1534,6 @@
- // a class acting as a component manager but not
- // implementing that interface for whatever reason.
- public void reset() {
-- fEntityExpansionLimit = (fSecurityManager != null)?fSecurityManager.getEntityExpansionLimit():0;
-
- // initialize state
- fStandalone = false;
-@@ -1642,17 +1669,20 @@
- }
- if (suffixLength == Constants.SECURITY_MANAGER_PROPERTY.length() &&
- propertyId.endsWith(Constants.SECURITY_MANAGER_PROPERTY)) {
-- fSecurityManager = (SecurityManager)value;
-- fEntityExpansionLimit = (fSecurityManager != null)?fSecurityManager.getEntityExpansionLimit():0;
-+ fSecurityManager = (XMLSecurityManager)value;
- }
- }
-
- //JAXP 1.5 properties
- if (propertyId.equals(XML_SECURITY_PROPERTY_MANAGER))
-- {
-+ {
- XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)value;
- fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
-+ }
- }
-+
-+ public void setLimitAnalyzer(XMLLimitAnalyzer fLimitAnalyzer) {
-+ this.fLimitAnalyzer = fLimitAnalyzer;
- }
-
- /**
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java 2013-09-06 11:22:57.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java 2014-10-28 20:19:32.000000000 -0700
-@@ -20,34 +20,28 @@
-
- package com.sun.org.apache.xerces.internal.impl;
-
--import java.io.EOFException;
--import java.io.IOException;
--import java.util.Locale;
--import java.util.Vector;
--
--import com.sun.xml.internal.stream.Entity;
--import com.sun.xml.internal.stream.XMLBufferListener;
--import java.io.InputStream;
--import java.io.InputStreamReader;
--import java.io.Reader;
-
-
- import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader;
- import com.sun.org.apache.xerces.internal.impl.io.UCSReader;
- import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader;
--
--
- import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
- import com.sun.org.apache.xerces.internal.util.EncodingMap;
--
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
- import com.sun.org.apache.xerces.internal.util.XMLChar;
- import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
--import com.sun.org.apache.xerces.internal.xni.QName;
--import com.sun.org.apache.xerces.internal.xni.XMLString;
-+import com.sun.org.apache.xerces.internal.xni.*;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
--import com.sun.org.apache.xerces.internal.xni.*;
-+import com.sun.xml.internal.stream.Entity;
-+import com.sun.xml.internal.stream.XMLBufferListener;
-+import java.io.EOFException;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.io.InputStreamReader;
-+import java.io.Reader;
-+import java.util.Locale;
-+import java.util.Vector;
-
- /**
- * Implements the entity scanner methods.
-@@ -493,8 +487,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
- }
-
- // peek at character
-@@ -535,8 +528,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
- }
-
- // scan character
-@@ -546,9 +538,8 @@
- fCurrentEntity.lineNumber++;
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(1);
- fCurrentEntity.ch[0] = (char)c;
-- load(1, false);
-+ load(1, false, true);
- }
- if (c == '\r' && isExternal) {
- if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') {
-@@ -593,8 +584,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
- }
-
- // scan nmtoken
-@@ -626,7 +616,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -673,18 +663,16 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
- }
-
- // scan name
- int offset = fCurrentEntity.position;
- if (XMLChar.isNameStart(fCurrentEntity.ch[offset])) {
- if (++fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(1);
- fCurrentEntity.ch[0] = fCurrentEntity.ch[offset];
- offset = 0;
-- if (load(1, false)) {
-+ if (load(1, false, true)) {
- fCurrentEntity.columnNumber++;
- String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch, 0, 1);
-
-@@ -721,7 +709,7 @@
- fCurrentEntity.ch, 0, length);
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -776,8 +764,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
- }
-
- // scan qualified name
-@@ -789,11 +776,10 @@
-
- if (XMLChar.isNameStart(fCurrentEntity.ch[offset])) {
- if (++fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(1);
- fCurrentEntity.ch[0] = fCurrentEntity.ch[offset];
- offset = 0;
-
-- if (load(1, false)) {
-+ if (load(1, false, true)) {
- fCurrentEntity.columnNumber++;
- //adding into symbol table.
- //XXX We are trying to add single character in SymbolTable??????
-@@ -843,7 +829,7 @@
- index = index - offset;
- }
- offset = 0;
-- if (load(length, false)) {
-+ if (load(length, false, false)) {
- break;
- }
- }
-@@ -918,12 +904,10 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
- } else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
-- invokeListeners(0);
- fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
-- load(1, false);
-+ load(1, false, true);
- fCurrentEntity.position = 0;
- }
-
-@@ -945,9 +929,8 @@
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count) {
- offset = 0;
-- invokeListeners(newlines);
- fCurrentEntity.position = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -965,9 +948,8 @@
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count) {
- offset = 0;
-- invokeListeners(newlines);
- fCurrentEntity.position = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -1070,13 +1052,10 @@
- }
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
- } else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
-- invokeListeners(0);
- fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
--
-- load(1, false);
-+ load(1, false, true);
- fCurrentEntity.position = 0;
- }
-
-@@ -1099,10 +1078,9 @@
- fCurrentEntity.lineNumber++;
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(newlines);
- offset = 0;
- fCurrentEntity.position = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -1121,9 +1099,8 @@
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count) {
- offset = 0;
-- invokeListeners(newlines);
- fCurrentEntity.position = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -1249,7 +1226,7 @@
- // load more characters, if needed
-
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, false);
- }
-
- boolean bNextEntity = false;
-@@ -1263,7 +1240,7 @@
- 0,
- fCurrentEntity.count - fCurrentEntity.position);
-
-- bNextEntity = load(fCurrentEntity.count - fCurrentEntity.position, false);
-+ bNextEntity = load(fCurrentEntity.count - fCurrentEntity.position, false, false);
- fCurrentEntity.position = 0;
- fCurrentEntity.startPosition = 0;
- }
-@@ -1276,7 +1253,7 @@
- fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
- fCurrentEntity.position = fCurrentEntity.count;
- fCurrentEntity.startPosition = fCurrentEntity.count;
-- load(0, true);
-+ load(0, true, false);
- return false;
- }
-
-@@ -1298,9 +1275,8 @@
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count) {
- offset = 0;
-- invokeListeners(newlines);
- fCurrentEntity.position = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -1318,10 +1294,9 @@
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count) {
- offset = 0;
-- invokeListeners(newlines);
- fCurrentEntity.position = newlines;
- fCurrentEntity.count = newlines;
-- if (load(newlines, false)) {
-+ if (load(newlines, false, true)) {
- break;
- }
- }
-@@ -1422,8 +1397,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
- }
-
- // skip character
-@@ -1445,9 +1419,8 @@
- } else if (c == '\n' && cc == '\r' && isExternal) {
- // handle newlines
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(1);
- fCurrentEntity.ch[0] = (char)cc;
-- load(1, false);
-+ load(1, false, true);
- }
- fCurrentEntity.position++;
- if (fCurrentEntity.ch[fCurrentEntity.position] == '\n') {
-@@ -1498,8 +1471,7 @@
- //boolean entityChanged = false;
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
- }
-
- //we are doing this check only in skipSpace() because it is called by
-@@ -1522,9 +1494,8 @@
- fCurrentEntity.lineNumber++;
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count - 1) {
-- invokeListeners(0);
- fCurrentEntity.ch[0] = (char)c;
-- entityChanged = load(1, true);
-+ entityChanged = load(1, true, true);
- if (!entityChanged){
- // the load change the position to be 1,
- // need to restore it when entity not changed
-@@ -1549,8 +1520,7 @@
- }
-
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- invokeListeners(0);
-- load(0, true);
-+ load(0, true, true);
-
- //we are doing this check only in skipSpace() because it is called by
- //fMiscDispatcher and we want the parser to exit gracefully when document
-@@ -1626,7 +1596,7 @@
- if((fCurrentEntity.count - fCurrentEntity.position) < length){
- int pos = fCurrentEntity.position;
- invokeListeners(pos);
-- entityChanged = load(fCurrentEntity.count, changeEntity);
-+ entityChanged = load(fCurrentEntity.count, changeEntity, false);
- fCurrentEntity.position = pos;
- if(entityChanged)break;
- }
-@@ -1731,17 +1701,22 @@
- * the current entity in place and the entity
- * boundary will be signaled by the return
- * value.
-+ * @param notify Determine whether to notify listeners of
-+ * the event
- *
- * @returns Returns true if the entity changed as a result of this
- * load operation.
- */
-- final boolean load(int offset, boolean changeEntity)
-+ final boolean load(int offset, boolean changeEntity, boolean notify)
- throws IOException {
- if (DEBUG_BUFFER) {
- System.out.print("(load, "+offset+": ");
- print();
- System.out.println();
- }
-+ if (notify) {
-+ invokeListeners(offset);
-+ }
- //maintaing the count till last load
- fCurrentEntity.fTotalCountTillLastLoad = fCurrentEntity.fTotalCountTillLastLoad + fCurrentEntity.fLastCount ;
- // read characters
-@@ -1778,7 +1753,7 @@
- }
- // handle the trailing edges
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, false);
- }
- }
-
-@@ -2075,7 +2050,7 @@
- *
- * @param loadPos Starting position from which new data is being loaded into scanner buffer.
- */
-- private void invokeListeners(int loadPos){
-+ public void invokeListeners(int loadPos){
- for(int i=0;i<listeners.size();i++){
- XMLBufferListener listener =(XMLBufferListener) listeners.get(i);
- listener.refresh(loadPos);
-@@ -2108,7 +2083,7 @@
-
- // load more characters, if needed
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, false);
- }
-
- // skip spaces
-@@ -2123,7 +2098,7 @@
- fCurrentEntity.columnNumber = 1;
- if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- fCurrentEntity.ch[0] = (char)c;
-- entityChanged = load(1, true);
-+ entityChanged = load(1, true, false);
- if (!entityChanged)
- // the load change the position to be 1,
- // need to restore it when entity not changed
-@@ -2151,7 +2126,7 @@
- if (!entityChanged)
- fCurrentEntity.position++;
- if (fCurrentEntity.position == fCurrentEntity.count) {
-- load(0, true);
-+ load(0, true, false);
- }
- } while (XMLChar.isSpace(c = fCurrentEntity.ch[fCurrentEntity.position]));
- if (DEBUG_BUFFER) {
---- ./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-07-15 21:54:36.000000000 -0700
-@@ -58,6 +58,7 @@
- * @author Neeraj Bajaj, Sun Microsystems
- * @author Venugopal Rao K, Sun Microsystems
- * @author Elena Litani, IBM
-+ * @version $Id: XMLNSDocumentScannerImpl.java,v 1.11 2010-11-01 04:39:41 joehw Exp $
- */
- public class XMLNSDocumentScannerImpl
- extends XMLDocumentScannerImpl {
-@@ -219,6 +220,7 @@
- fCurrentElement = fElementQName;
-
- String rawname = fElementQName.rawname;
-+ checkDepth(rawname);
- if (fBindNamespaces) {
- fNamespaceContext.pushContext();
- if (fScannerState == SCANNER_STATE_ROOT_ELEMENT) {
-@@ -251,10 +253,11 @@
-
- do {
- scanAttribute(fAttributes);
-- if (fSecurityManager != null && fAttributes.getLength() > fElementAttributeLimit){
-+ if (fSecurityManager != null && (!fSecurityManager.isNoLimit(fElementAttributeLimit)) &&
-+ fAttributes.getLength() > fElementAttributeLimit){
- fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
- "ElementAttributeLimit",
-- new Object[]{rawname, new Integer(fAttributes.getLength()) },
-+ new Object[]{rawname, fElementAttributeLimit },
- XMLErrorReporter.SEVERITY_FATAL_ERROR );
- }
-
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -32,6 +32,8 @@
- import com.sun.org.apache.xerces.internal.util.XMLChar;
- import com.sun.org.apache.xerces.internal.util.XMLResourceIdentifierImpl;
- import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
-+import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.xni.Augmentations;
- import com.sun.org.apache.xerces.internal.xni.XMLAttributes;
- import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
-@@ -106,6 +108,9 @@
- protected static final String ENTITY_MANAGER =
- Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_MANAGER_PROPERTY;
-
-+ /** Property identifier: Security manager. */
-+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
-+
- // debugging
-
- /** Debug attribute normalization. */
-@@ -159,6 +164,12 @@
- /** xxx this should be available from EntityManager Entity storage */
- protected XMLEntityStorage fEntityStore = null ;
-
-+ /** Security manager. */
-+ protected XMLSecurityManager fSecurityManager = null;
-+
-+ /** Limit analyzer. */
-+ protected XMLLimitAnalyzer fLimitAnalyzer = null;
-+
- // protected data
-
- /** event type */
-@@ -256,6 +267,7 @@
- fSymbolTable = (SymbolTable)componentManager.getProperty(SYMBOL_TABLE);
- fErrorReporter = (XMLErrorReporter)componentManager.getProperty(ERROR_REPORTER);
- fEntityManager = (XMLEntityManager)componentManager.getProperty(ENTITY_MANAGER);
-+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
-
- //this step is extra because we have separated the storage of entity
- fEntityStore = fEntityManager.getEntityStore() ;
-@@ -293,6 +305,10 @@
- fEntityManager = (XMLEntityManager)value;
- }
- }
-+
-+ if (propertyId.equals(SECURITY_MANAGER)) {
-+ fSecurityManager = (XMLSecurityManager)value;
-+ }
- /*else if(propertyId.equals(Constants.STAX_PROPERTIES)){
- fStaxProperties = (HashMap)value;
- //TODO::discuss with neeraj what are his thoughts on passing properties.
-@@ -352,6 +368,8 @@
- fEntityManager = (XMLEntityManager)propertyManager.getProperty(ENTITY_MANAGER);
- fEntityStore = fEntityManager.getEntityStore() ;
- fEntityScanner = (XMLEntityScanner)fEntityManager.getEntityScanner() ;
-+ fSecurityManager = (XMLSecurityManager)propertyManager.getProperty(SECURITY_MANAGER);
-+
- //fEntityManager.reset();
- // DTD preparsing defaults:
- fValidation = false;
-@@ -499,7 +517,7 @@
- reportFatalError("SDDeclInvalid", new Object[] {standalone});
- }
- } else {
-- reportFatalError("EncodingDeclRequired", null);
-+ reportFatalError("SDDeclNameInvalid", null);
- }
- break;
- }
-@@ -510,8 +528,9 @@
- sawSpace = fEntityScanner.skipSpaces();
- }
- // restore original literal value
-- if(currLiteral)
-+ if(currLiteral) {
- currEnt.literal = true;
-+ }
- // REVISIT: should we remove this error reporting?
- if (scanningTextDecl && state != STATE_DONE) {
- reportFatalError("MorePseudoAttributes", null);
-@@ -564,7 +583,7 @@
- XMLString value)
- throws IOException, XNIException {
-
-- String name = fEntityScanner.scanName();
-+ String name = scanPseudoAttributeName();
- // XMLEntityManager.print(fEntityManager.getCurrentEntity());
-
- if (name == null) {
-@@ -617,6 +636,35 @@
- } // scanPseudoAttribute(XMLString):String
-
- /**
-+ * Scans the name of a pseudo attribute. The only legal names
-+ * in XML 1.0/1.1 documents are 'version', 'encoding' and 'standalone'.
-+ *
-+ * @return the name of the pseudo attribute or <code>null</code>
-+ * if a legal pseudo attribute name could not be scanned.
-+ */
-+ private String scanPseudoAttributeName() throws IOException, XNIException {
-+ final int ch = fEntityScanner.peekChar();
-+ switch (ch) {
-+ case 'v':
-+ if (fEntityScanner.skipString(fVersionSymbol)) {
-+ return fVersionSymbol;
-+ }
-+ break;
-+ case 'e':
-+ if (fEntityScanner.skipString(fEncodingSymbol)) {
-+ return fEncodingSymbol;
-+ }
-+ break;
-+ case 's':
-+ if (fEntityScanner.skipString(fStandaloneSymbol)) {
-+ return fStandaloneSymbol;
-+ }
-+ break;
-+ }
-+ return null;
-+ } // scanPseudoAttributeName()
-+
-+ /**
- * Scans a processing instruction.
- * <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 2014-07-15 21:54:36.000000000 -0700
-@@ -44,6 +44,7 @@
-
- # 2.9 Standalone Document Declaration
- SDDeclInvalid = The standalone document declaration value must be \"yes\" or \"no\", not \"{0}\".
-+ SDDeclNameInvalid = The standalone name in XML declaration may be misspelled.
- # 2.12 Language Identification
- XMLLangInvalid = The xml:lang attribute value \"{0}\" is an invalid language identifier.
- # 3. Logical Structures
-@@ -292,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=The parser has encountered more than \"{0}\" entity expansions in this document; this is the limit imposed by the application.
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: The parser has encountered more than \"{0}\" entity expansions in this document; this is the limit imposed by the JDK.
-+ ElementAttributeLimit=JAXP00010002: Element \"{0}\" has more than \"{1}\" attributes, \"{1}\" is the limit imposed by the JDK.
-+ MaxEntitySizeLimit=JAXP00010003: The length of entity \"{0}\" is \"{1}\" that exceeds the \"{2}\" limit set by \"{3}\".
-+ TotalEntitySizeLimit=JAXP00010004: The accumulated size \"{0}\" of entities exceeded the \"{1}\" limit set by \"{2}\".
-+ MaxXMLNameLimit=JAXP00010005: The name \"{0}\" exceeded the \"{1}\" limit set by \"{2}\".
-+ MaxElementDepthLimit=JAXP00010006: The element \"{0}\" has a depth of \"{1}\" that exceeds the limit \"{2}\" set by \"{3}\".
-
--# 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 2014-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Prolog des Dokuments gefunden.
- InvalidCharInXMLDecl = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der XML-Deklaration gefunden.
- # 2.4 Character Data and Markup
-- CDEndInContent = Zeichenfolge"\"]]>\" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
-+ CDEndInContent = Zeichenfolge""]]>" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
- # 2.7 CDATA Sections
-- CDSectUnterminated = CDATA-Abschnitt muss mit \"]]>\" enden.
-+ CDSectUnterminated = CDATA-Abschnitt muss mit "]]>" enden.
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = XML-Deklaration darf nur ganz am Anfang des Dokuments enthalten sein.
-- EqRequiredInXMLDecl = Zeichen " = " muss auf \"{0}\" in der XML-Deklaration folgen.
-- QuoteRequiredInXMLDecl = Der Wert nach \"{0}\" in der XML-Deklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
-- XMLDeclUnterminated = XML-Deklaration muss mit \"?>\" enden.
-+ EqRequiredInXMLDecl = Zeichen " = " muss auf "{0}" in der XML-Deklaration folgen.
-+ QuoteRequiredInXMLDecl = Der Wert nach "{0}" in der XML-Deklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
-+ XMLDeclUnterminated = XML-Deklaration muss mit "?>" enden.
- VersionInfoRequired = Version ist in der XML-Deklaration erforderlich.
- SpaceRequiredBeforeVersionInXMLDecl = Leerstelle vor dem Versionspseudoattribut in der XML-Deklaration erforderlich.
- SpaceRequiredBeforeEncodingInXMLDecl = Leerstelle vor dem Codierungspseudoattribut in der XML-Deklaration erforderlich.
-@@ -71,70 +43,71 @@
- ReferenceIllegalInTrailingMisc=Referenz ist nicht zul\u00E4ssig in angeh\u00E4ngtem Abschnitt.
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = Standalone-Dokumentdeklarationswert muss \"Ja\" oder \"Nein\" und nicht \"{0}\" sein.
-+ SDDeclInvalid = Standalone-Dokumentdeklarationswert muss "Ja" oder "Nein" und nicht "{0}" sein.
-+ SDDeclNameInvalid = Der Standalone-Name in der XML-Deklaration ist m\u00F6glicherweise falsch geschrieben.
- # 2.12 Language Identification
-- XMLLangInvalid = xml:lang-Attributwert \"{0}\" ist eine ung\u00FCltige Sprach-ID.
-+ XMLLangInvalid = xml:lang-Attributwert "{0}" ist eine ung\u00FCltige Sprach-ID.
- # 3. Logical Structures
-- ETagRequired = Elementtyp \"{0}\" muss mit dem entsprechenden Endtag \"</{0}>\" beendet werden.
-+ ETagRequired = Elementtyp "{0}" muss mit dem entsprechenden Endtag "</{0}>" beendet werden.
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = Auf Elementtyp \"{0}\" m\u00FCssen entweder Attributspezifikationen, \">\" oder \"/>\" folgen.
-- EqRequiredInAttribute = Mit Elementtyp \"{0}\" verkn\u00FCpfter Attributname \"{1}\" muss vom Zeichen " = " gefolgt werden.
-- OpenQuoteExpected = \u00D6ffnendes Anf\u00FChrungszeichen wird f\u00FCr Attribut \"{1}\" erwartet, das mit Elementtyp \"{0}\" verkn\u00FCpft ist.
-- CloseQuoteExpected = Schlie\u00DFendes Anf\u00FChrungszeichen wird f\u00FCr Attribut \"{1}\" erwartet, das mit Elementtyp \"{0}\" verkn\u00FCpft ist.
-- AttributeNotUnique = Attribut \"{1}\" wurde bereits f\u00FCr Element \"{0}\" angegeben.
-- AttributeNSNotUnique = An Namespace \"{2}\" gebundenes Attribut \"{1}\" wurde bereits f\u00FCr Element \"{0}\" angegeben.
-- ETagUnterminated = Endtag f\u00FCr Elementtyp \"{0}\" muss mit einem ">"-Begrenzungszeichen enden.
-+ ElementUnterminated = Auf Elementtyp "{0}" m\u00FCssen entweder Attributspezifikationen, ">" oder "/>" folgen.
-+ EqRequiredInAttribute = Mit Elementtyp "{0}" verkn\u00FCpfter Attributname "{1}" muss vom Zeichen " = " gefolgt werden.
-+ OpenQuoteExpected = \u00D6ffnendes Anf\u00FChrungszeichen wird f\u00FCr Attribut "{1}" erwartet, das mit Elementtyp "{0}" verkn\u00FCpft ist.
-+ CloseQuoteExpected = Schlie\u00DFendes Anf\u00FChrungszeichen wird f\u00FCr Attribut "{1}" erwartet, das mit Elementtyp "{0}" verkn\u00FCpft ist.
-+ AttributeNotUnique = Attribut "{1}" wurde bereits f\u00FCr Element "{0}" angegeben.
-+ AttributeNSNotUnique = An Namespace "{2}" gebundenes Attribut "{1}" wurde bereits f\u00FCr Element "{0}" angegeben.
-+ ETagUnterminated = Endtag f\u00FCr Elementtyp "{0}" muss mit einem ">"-Begrenzungszeichen enden.
- MarkupNotRecognizedInContent = Der Content von Elementen muss aus ordnungsgem\u00E4\u00DF formatierten Zeichendaten oder Markups bestehen.
- DoctypeIllegalInContent = DOCTYPE ist nicht zul\u00E4ssig in Content.
- # 4.1 Character and Entity References
- ReferenceUnterminated = Referenz muss mit einem ";"-Begrenzungszeichen beendet werden.
- # 4.3.2 Well-Formed Parsed Entities
- ReferenceNotInOneEntity = Referenz muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein.
-- ElementEntityMismatch = Element \"{0}\" muss innerhalb derselben Entit\u00E4t beginnen und enden.
-+ ElementEntityMismatch = Element "{0}" muss innerhalb derselben Entit\u00E4t beginnen und enden.
- MarkupEntityMismatch=XML-Dokumentstrukturen m\u00FCssen innerhalb derselben Entit\u00E4t beginnen und enden.
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{2}) wurde im Wert des Attributs \"{1}\" gefunden. Element ist \"{0}\".
-+ InvalidCharInAttValue = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{2}) wurde im Wert des Attributs "{1}" gefunden. Element ist "{0}".
- InvalidCharInComment = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Kommentar gefunden.
- InvalidCharInPI = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der Verarbeitungsanweisung gefunden.
- InvalidCharInInternalSubset = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der internen Teilmenge der DTD gefunden.
- InvalidCharInTextDecl = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der Textdeklaration gefunden.
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = Wert des Attributs \"{1}\" muss mit einem einzelnen oder doppelten Anf\u00FChrungszeichen beginnen.
-- LessthanInAttValue = Wert des Attributs \"{1}\", das mit Elementtyp \"{0}\" verkn\u00FCpft ist, darf nicht das Zeichen "<" enthalten.
-- AttributeValueUnterminated = Wert f\u00FCr Attribut \"{1}\" muss mit dem entsprechenden Anf\u00FChrungszeichen enden.
-+ QuoteRequiredInAttValue = Wert des Attributs "{1}" muss mit einem einzelnen oder doppelten Anf\u00FChrungszeichen beginnen.
-+ LessthanInAttValue = Wert des Attributs "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, darf nicht das Zeichen "<" enthalten.
-+ AttributeValueUnterminated = Wert f\u00FCr Attribut "{1}" muss mit dem entsprechenden Anf\u00FChrungszeichen enden.
- # 2.5 Comments
-- InvalidCommentStart = Kommentar muss mit \"<!--\" beginnen.
-- DashDashInComment = Zeichenfolge \"--\" ist in Kommentaren nicht zul\u00E4ssig.
-- CommentUnterminated = Kommentar muss mit \"-->\" enden.
-+ InvalidCommentStart = Kommentar muss mit "<!--" beginnen.
-+ DashDashInComment = Zeichenfolge "--" ist in Kommentaren nicht zul\u00E4ssig.
-+ CommentUnterminated = Kommentar muss mit "-->" enden.
- COMMENT_NOT_IN_ONE_ENTITY = Kommentar ist nicht in derselben Entit\u00E4t enthalten.
- # 2.6 Processing Instructions
- PITargetRequired = Verarbeitungsanweisung muss mit dem Namen des Ziels beginnen.
- SpaceRequiredInPI = Leerstelle ist zwischen dem Ziel der Verarbeitungsanweisung und den Daten erforderlich.
-- PIUnterminated = Verarbeitungsanweisung muss mit \"?>\" enden.
-- ReservedPITarget = Verarbeitungsanweisungsziel, das \"[xX][mM][lL]\" entspricht, ist nicht zul\u00E4ssig.
-+ PIUnterminated = Verarbeitungsanweisung muss mit "?>" enden.
-+ ReservedPITarget = Verarbeitungsanweisungsziel, das "[xX][mM][lL]" entspricht, ist nicht zul\u00E4ssig.
- PI_NOT_IN_ONE_ENTITY = Verarbeitungsanweisung ist nicht in derselben Entit\u00E4t enthalten.
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = Ung\u00FCltige Version \"{0}\".
-- VersionNotSupported = XML-Version \"{0}\" wird nicht unterst\u00FCtzt. Nur XML 1.0 wird unterst\u00FCtzt.
-- VersionNotSupported11 = XML-Version \"{0}\" wird nicht unterst\u00FCtzt. Nur XML 1.0 und XML 1.1 werden unterst\u00FCtzt.
-+ VersionInfoInvalid = Ung\u00FCltige Version "{0}".
-+ VersionNotSupported = XML-Version "{0}" wird nicht unterst\u00FCtzt. Nur XML 1.0 wird unterst\u00FCtzt.
-+ VersionNotSupported11 = XML-Version "{0}" wird nicht unterst\u00FCtzt. Nur XML 1.0 und XML 1.1 werden unterst\u00FCtzt.
- VersionMismatch= Eine Entit\u00E4t kann keine andere Entit\u00E4t einer sp\u00E4teren Version enthalten.
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = Auf \"&#\" in einer Zeichenreferenz muss umgehend eine Dezimaldarstellung folgen.
-- HexdigitRequiredInCharRef = Auf \"&#x\" in einer Zeichenreferenz muss umgehend eine hexadezimale Darstellung folgen.
-+ DigitRequiredInCharRef = Auf "&#" in einer Zeichenreferenz muss umgehend eine Dezimaldarstellung folgen.
-+ HexdigitRequiredInCharRef = Auf "&#x" in einer Zeichenreferenz muss umgehend eine hexadezimale Darstellung folgen.
- SemicolonRequiredInCharRef = Zeichenreferenz muss mit dem Begrenzungszeichen ";" enden.
-- InvalidCharRef = Zeichenreferenz \"&#{0}\" ist ein ung\u00FCltiges XML-Zeichen.
-+ InvalidCharRef = Zeichenreferenz "&#{0}" ist ein ung\u00FCltiges XML-Zeichen.
- NameRequiredInReference = Auf "&" in der Entit\u00E4tsreferenz muss umgehend der Entit\u00E4tsname folgen.
-- SemicolonRequiredInReference = Referenz zu Entit\u00E4t \"{0}\" muss mit dem Begrenzungszeichen ";" enden.
-+ SemicolonRequiredInReference = Referenz zu Entit\u00E4t "{0}" muss mit dem Begrenzungszeichen ";" enden.
- # 4.3.1 The Text Declaration
- TextDeclMustBeFirst = Textdeklaration darf nur ganz am Anfang der externen geparsten Entit\u00E4t enthalten sein.
-- EqRequiredInTextDecl = Zeichen " = " muss auf \"{0}\" in der Textdeklaration folgen.
-- QuoteRequiredInTextDecl = Der Wert nach \"{0}\" in der Textdeklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
-- CloseQuoteMissingInTextDecl = Schlie\u00DFendes Anf\u00FChrungszeichen im Wert nach \"{0}\" in der Textdeklaration fehlt.
-+ EqRequiredInTextDecl = Zeichen " = " muss auf "{0}" in der Textdeklaration folgen.
-+ QuoteRequiredInTextDecl = Der Wert nach "{0}" in der Textdeklaration muss eine Zeichenfolge in Anf\u00FChrungszeichen sein.
-+ CloseQuoteMissingInTextDecl = Schlie\u00DFendes Anf\u00FChrungszeichen im Wert nach "{0}" in der Textdeklaration fehlt.
- SpaceRequiredBeforeVersionInTextDecl = Leerstelle vor dem Versionspseudoattribut in der Textdeklaration erforderlich.
- SpaceRequiredBeforeEncodingInTextDecl = Leerstelle vor dem Codierungspseudoattribut in der Textdeklaration erforderlich.
-- TextDeclUnterminated = Textdeklaration muss mit \"?>\" enden.
-+ TextDeclUnterminated = Textdeklaration muss mit "?>" enden.
- EncodingDeclRequired = Codierungsdeklaration ist in der Textdeklaration erforderlich.
- NoMorePseudoAttributes = Es sind keine weiteren Pseudoattribute zul\u00E4ssig.
- MorePseudoAttributes = Es werden weitere Pseudoattribute erwartet.
-@@ -143,13 +116,13 @@
- CommentNotInOneEntity = Kommentar muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein.
- PINotInOneEntity = Verarbeitungsanweisung muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein.
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = Ung\u00FCltiger Codierungsname \"{0}\".
-- EncodingByteOrderUnsupported = Angegebene Bytereihenfolge f\u00FCr die Codierung von \"{0}\" wird nicht unterst\u00FCtzt.
-+ EncodingDeclInvalid = Ung\u00FCltiger Codierungsname "{0}".
-+ EncodingByteOrderUnsupported = Angegebene Bytereihenfolge f\u00FCr die Codierung von "{0}" wird nicht unterst\u00FCtzt.
- InvalidByte = Ung\u00FCltiges Byte {0} von {1}-Byte-UTF-8-Sequenz.
- ExpectedByte = Byte {0} von {1}-Byte-UTF-8-Sequenz erwartet.
- InvalidHighSurrogate = High-Surrogate-Bits in UTF-8-Sequenz d\u00FCrfen 0x10 nicht \u00FCberschreiten, gefunden wurde aber 0x{0}.
-- OperationNotSupported = Vorgang \"{0}\" nicht unterst\u00FCtzt von {1}-Reader.
-- InvalidASCII = Byte \"{0}\" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
-+ OperationNotSupported = Vorgang "{0}" nicht unterst\u00FCtzt von {1}-Reader.
-+ InvalidASCII = Byte "{0}" geh\u00F6rt nicht zum (7-Bit) ASCII-Zeichensatz.
- CharConversionFailure = Eine Entit\u00E4t, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung ung\u00FCltig sind.
-
- # DTD Messages
-@@ -169,135 +142,135 @@
- PubidCharIllegal = Zeichen (Unicode: 0x{0}) ist nicht zul\u00E4ssig in der \u00F6ffentlichen ID.
- SpaceRequiredBetweenPublicAndSystem = Leerstellen erforderlich zwischen publicId und systemId.
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Leerstelle nach \"<!DOCTYPE\" in der Dokumenttypdeklaration erforderlich.
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = Root-Elementtyp muss nach \"<!DOCTYPE\" in der Dokumenttypdeklaration enthalten sein.
-- DoctypedeclUnterminated = Dokumenttypdeklaration f\u00FCr Root-Elementtyp \"{0}\" muss mit ">" enden.
-- PEReferenceWithinMarkup = Parameterentit\u00E4tsreferenz \"%{0};\" darf nicht in Markup in der internen Teilmenge der DTD vorkommen.
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Leerstelle nach "<!DOCTYPE" in der Dokumenttypdeklaration erforderlich.
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = Root-Elementtyp muss nach "<!DOCTYPE" in der Dokumenttypdeklaration enthalten sein.
-+ DoctypedeclUnterminated = Dokumenttypdeklaration f\u00FCr Root-Elementtyp "{0}" muss mit ">" enden.
-+ PEReferenceWithinMarkup = Parameterentit\u00E4tsreferenz "%{0};" darf nicht in Markup in der internen Teilmenge der DTD vorkommen.
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Die Markup-Deklarationen, die in der Dokumenttypdeklaration enthalten sind bzw. auf die von der Dokumenttypdeklaration verwiesen wird, m\u00FCssen ordnungsgem\u00E4\u00DF formatiert sein.
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklaration f\u00FCr \"xml:space\" muss als aufgez\u00E4hlter Typ angegeben werden, dessen einzigen m\u00F6glichen Werte \"default\" und \"preserve\" sind.
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklaration f\u00FCr "xml:space" muss als aufgez\u00E4hlter Typ angegeben werden, dessen einzigen m\u00F6glichen Werte "default" und "preserve" sind.
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Leerstelle nach \"<!ELEMENT\" in der Elementtypdeklaration erforderlich.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Leerstelle nach "<!ELEMENT" in der Elementtypdeklaration erforderlich.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Elementtyp ist in der Elementtypdeklaration erforderlich.
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Leerstelle nach Elementtyp \"{0}\" in der Elementtypdeklaration erforderlich.
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Constraint ist nach dem Elementtyp \"{0}\" in der Elementtypdeklaration erforderlich.
-- ElementDeclUnterminated = Deklaration f\u00FCr Elementtyp \"{0}\" muss mit ">" enden.
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Leerstelle nach Elementtyp "{0}" in der Elementtypdeklaration erforderlich.
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Constraint ist nach dem Elementtyp "{0}" in der Elementtypdeklaration erforderlich.
-+ ElementDeclUnterminated = Deklaration f\u00FCr Elementtyp "{0}" muss mit ">" enden.
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Das Zeichen "(" oder ein Elementtyp ist in der Deklaration des Elementtyps \"{0}\" erforderlich.
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Das Zeichen ")" ist in der Deklaration des Elementtyps \"{0}\" erforderlich.
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Das Zeichen "(" oder ein Elementtyp ist in der Deklaration des Elementtyps "{0}" erforderlich.
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Das Zeichen ")" ist in der Deklaration des Elementtyps "{0}" erforderlich.
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Ein Elementtyp ist in der Deklaration des Elementtyps \"{0}\" erforderlich.
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Das Zeichen ")" ist in der Deklaration des Elementtyps \"{0}\" erforderlich.
-- MixedContentUnterminated = Das Mischcontentmodell \"{0}\" muss mit \")*\" enden, wenn die Typen der untergeordneten Elemente eingeschr\u00E4nkt sind.
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Ein Elementtyp ist in der Deklaration des Elementtyps "{0}" erforderlich.
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Das Zeichen ")" ist in der Deklaration des Elementtyps "{0}" erforderlich.
-+ MixedContentUnterminated = Das Mischcontentmodell "{0}" muss mit ")*" enden, wenn die Typen der untergeordneten Elemente eingeschr\u00E4nkt sind.
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Leerstelle nach \"<!ATTLIST\" in der Attributlistendeklaration erforderlich.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Leerstelle nach "<!ATTLIST" in der Attributlistendeklaration erforderlich.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Elementtyp ist in der Attributlistendeklaration erforderlich.
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Leerstelle vor dem Attributnamen in der Attributlistendeklaration f\u00FCr Element \"{0}\" erforderlich.
-- AttNameRequiredInAttDef = Attributname muss in der Attributlistendeklaration f\u00FCr Element \"{0}\" angegeben werden.
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Leerstelle vor dem Attributtyp in der Deklaration des Attributs \"{1}\" f\u00FCr Element \"{0}\" erforderlich.
-- AttTypeRequiredInAttDef = Attributtyp ist in der Deklaration des Attributs \"{1}\" f\u00FCr Element \"{0}\" erforderlich.
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Leerstelle vor dem Attributstandard in der Deklaration des Attributs \"{1}\" f\u00FCr Element \"{0}\" erforderlich.
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mehrere Attributdefinitionen f\u00FCr dasselbe Attribut \"{1}\" eines Elements \"{0}\" angegeben.
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Leerstelle vor dem Attributnamen in der Attributlistendeklaration f\u00FCr Element "{0}" erforderlich.
-+ AttNameRequiredInAttDef = Attributname muss in der Attributlistendeklaration f\u00FCr Element "{0}" angegeben werden.
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Leerstelle vor dem Attributtyp in der Deklaration des Attributs "{1}" f\u00FCr Element "{0}" erforderlich.
-+ AttTypeRequiredInAttDef = Attributtyp ist in der Deklaration des Attributs "{1}" f\u00FCr Element "{0}" erforderlich.
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Leerstelle vor dem Attributstandard in der Deklaration des Attributs "{1}" f\u00FCr Element "{0}" erforderlich.
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mehrere Attributdefinitionen f\u00FCr dasselbe Attribut "{1}" eines Elements "{0}" angegeben.
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Leerstelle nach \"NOTATION\" in der \"{1}\"-Attributdeklaration erforderlich.
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Das Zeichen "(" muss auf \"NOTATION\" in der \"{1}\"-Attributdeklaration folgen.
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsname ist in der Notationstypliste f\u00FCr die \"{1}\"-Attributdeklaration erforderlich.
-- NotationTypeUnterminated = Notationstypliste muss mit ")" in der\"{1}\"-Attributdeklaration enden.
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namenstoken ist in der aufgez\u00E4hlten Typliste f\u00FCr die \"{1}\"-Attributdeklaration erforderlich.
-- EnumerationUnterminated = Aufgez\u00E4hlte Typliste muss mit ")" in der\"{1}\"-Attributdeklaration enden.
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = Enumerationswert \"{1}\" wurde mehrmals in der Deklaration des Attributs \"{2}\" f\u00FCr Element \"{0}\" angegeben. Die NMTOKENS in einer einzelnen "Enumeration"-Attributdeklaration m\u00FCssen alle eindeutig sein.
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = Enumerationswert \"{1}\" wurde mehrmals in der Deklaration des Attributs \"{2}\" f\u00FCr Element \"{0}\" angegeben. Die NOTATION-Namen in einer einzelnen NotationType-Attributdeklaration m\u00FCssen alle eindeutig sein.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Leerstelle nach "NOTATION" in der "{1}"-Attributdeklaration erforderlich.
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Das Zeichen "(" muss auf "NOTATION" in der "{1}"-Attributdeklaration folgen.
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsname ist in der Notationstypliste f\u00FCr die "{1}"-Attributdeklaration erforderlich.
-+ NotationTypeUnterminated = Notationstypliste muss mit ")" in der"{1}"-Attributdeklaration enden.
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namenstoken ist in der aufgez\u00E4hlten Typliste f\u00FCr die "{1}"-Attributdeklaration erforderlich.
-+ EnumerationUnterminated = Aufgez\u00E4hlte Typliste muss mit ")" in der"{1}"-Attributdeklaration enden.
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = Enumerationswert "{1}" wurde mehrmals in der Deklaration des Attributs "{2}" f\u00FCr Element "{0}" angegeben. Die NMTOKENS in einer einzelnen "Enumeration"-Attributdeklaration m\u00FCssen alle eindeutig sein.
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = Enumerationswert "{1}" wurde mehrmals in der Deklaration des Attributs "{2}" f\u00FCr Element "{0}" angegeben. Die NOTATION-Namen in einer einzelnen NotationType-Attributdeklaration m\u00FCssen alle eindeutig sein.
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Leerstelle nach \"FIXED\" in der \"{1}\"-Attributdeklaration erforderlich.
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Leerstelle nach "FIXED" in der "{1}"-Attributdeklaration erforderlich.
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = Der eingeschlossene Bedingungsabschnitt muss mit \"]]>\" enden.
-- IgnoreSectUnterminated = Der ausgeschlossene Bedingungsabschnitt muss mit \"]]>\" enden.
-+ IncludeSectUnterminated = Der eingeschlossene Bedingungsabschnitt muss mit "]]>" enden.
-+ IgnoreSectUnterminated = Der ausgeschlossene Bedingungsabschnitt muss mit "]]>" enden.
- # 4.1 Character and Entity References
- NameRequiredInPEReference = Auf "%" in der Parameterentit\u00E4tsreferenz muss umgehend der Entit\u00E4tsname folgen.
-- SemicolonRequiredInPEReference = Parameterentit\u00E4tsreferenz \"%{0};\" muss mit dem Begrenzungszeichen ";" enden.
-+ SemicolonRequiredInPEReference = Parameterentit\u00E4tsreferenz "%{0};" muss mit dem Begrenzungszeichen ";" enden.
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Leerstelle nach \"<!ENTITY\" in der Entit\u00E4tsdeklaration erforderlich.
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Leerstelle zwischen \"<!ENTITY\" und dem Zeichen "%" in der Parameterentit\u00E4tsdeklaration erforderlich.
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Leerstelle nach "<!ENTITY" in der Entit\u00E4tsdeklaration erforderlich.
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Leerstelle zwischen "<!ENTITY" und dem Zeichen "%" in der Parameterentit\u00E4tsdeklaration erforderlich.
- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Leerstelle zwischen "%" und dem Entit\u00E4tsnamen in der Parameterentit\u00E4tsdeklaration erforderlich.
- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Name der Entit\u00E4t ist in der Entit\u00E4tsdeklaration erforderlich.
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Leerstelle zwischen dem Entit\u00E4tsnamen \"{0}\" und der Definition in der Entit\u00E4tsdeklaration erforderlich.
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Leerstelle zwischen \"NDATA\" und dem Notationsnamen in der Deklaration f\u00FCr die Entit\u00E4t \"{0}\ erforderlich.
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Leerstelle vor \"NDATA\" in der Deklaration f\u00FCr die Entit\u00E4t \"{0}\ erforderlich.
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsname ist nach \"NDATA\" in der Deklaration f\u00FCr die Entit\u00E4t \"{0}\ erforderlich.
-- EntityDeclUnterminated = Deklaration f\u00FCr Entit\u00E4t \"{0}\" muss mit ">" enden.
-- MSG_DUPLICATE_ENTITY_DEFINITION = Entit\u00E4t \"{0}\" wurde mehrmals deklariert.
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Leerstelle zwischen dem Entit\u00E4tsnamen "{0}" und der Definition in der Entit\u00E4tsdeklaration erforderlich.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Leerstelle zwischen "NDATA" und dem Notationsnamen in der Deklaration f\u00FCr die Entit\u00E4t "{0} erforderlich.
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Leerstelle vor "NDATA" in der Deklaration f\u00FCr die Entit\u00E4t "{0} erforderlich.
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsname ist nach "NDATA" in der Deklaration f\u00FCr die Entit\u00E4t "{0} erforderlich.
-+ EntityDeclUnterminated = Deklaration f\u00FCr Entit\u00E4t "{0}" muss mit ">" enden.
-+ MSG_DUPLICATE_ENTITY_DEFINITION = Entit\u00E4t "{0}" wurde mehrmals deklariert.
- # 4.2.2 External Entities
-- ExternalIDRequired = Externe Entit\u00E4tsdeklaration muss mit \"SYSTEM\" oder \"PUBLIC\" beginnen.
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen \"PUBLIC\" und der \u00F6ffentlichen ID erforderlich.
-+ ExternalIDRequired = Externe Entit\u00E4tsdeklaration muss mit "SYSTEM" oder "PUBLIC" beginnen.
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen "PUBLIC" und der \u00F6ffentlichen ID erforderlich.
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Leerstelle zwischen der \u00F6ffentlichen ID und der System-ID erforderlich.
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Leerstelle zwischen \"SYSTEM\" und der System-ID erforderlich.
-- MSG_URI_FRAGMENT_IN_SYSTEMID = Fragment-ID darf nicht als Teil der System-ID \"{0}\" angegeben werden.
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Leerstelle zwischen "SYSTEM" und der System-ID erforderlich.
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = Fragment-ID darf nicht als Teil der System-ID "{0}" angegeben werden.
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach \"<!NOTATION\" in der Notationsdeklaration erforderlich.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach "<!NOTATION" in der Notationsdeklaration erforderlich.
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Name der Notation ist in der Notationsdeklaration erforderlich.
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach dem Notationsnamen \"{0}\" in der Notationsdeklaration erforderlich.
-- ExternalIDorPublicIDRequired = Deklaration f\u00FCr die Notation \"{0}\" muss eine System- oder eine \u00F6ffentliche ID enthalten.
-- NotationDeclUnterminated = Deklaration f\u00FCr die Notation \"{0}\" muss mit ">" enden.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Leerstelle nach dem Notationsnamen "{0}" in der Notationsdeklaration erforderlich.
-+ ExternalIDorPublicIDRequired = Deklaration f\u00FCr die Notation "{0}" muss eine System- oder eine \u00F6ffentliche ID enthalten.
-+ NotationDeclUnterminated = Deklaration f\u00FCr die Notation "{0}" muss mit ">" enden.
-
- # Validation messages
-- DuplicateTypeInMixedContent = Elementtyp \"{1}\" wurde bereits im Contentmodell der Elementdeklaration\"{0}\" angegeben.
-- ENTITIESInvalid = Attributwert \"{1}\" mit dem Typ ENTITIES muss aus den Namen von mindestens einer geparsten Entit\u00E4t bestehen.
-- ENTITYInvalid = Attributwert \"{1}\" mit dem Typ ENTITY muss aus dem Namen einer geparsten Entit\u00E4t bestehen.
-- IDDefaultTypeInvalid = ID-Attribut \"{0}\" muss den deklarierten Standardwert \"#IMPLIED\" oder \"#REQUIRED\" haben.
-- IDInvalid = Attributwert \"{0}\" mit dem Typ ID muss ein Name sein.
-- IDInvalidWithNamespaces = Attributwert \"{0}\" mit dem Typ ID muss ein NCName sein, wenn Namespaces aktiviert sind.
-- IDNotUnique = Attributwert \"{0}\" mit dem Typ ID muss eindeutig im Dokument sein.
-- IDREFInvalid = Attributwert \"{0}\" mit dem Typ IDREF muss ein Name sein.
-- IDREFInvalidWithNamespaces = Attributwert \"{0}\" mit dem Typ IDREF muss ein NCName sein, wenn Namespaces aktiviert sind.
-- IDREFSInvalid = Attributwert \"{0}\" mit dem Typ IDREFS muss mindestens ein Name sein.
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ersatztext der Parameterentit\u00E4t \"{0}\" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten, wenn die Entit\u00E4tsreferenz als vollst\u00E4ndige Deklaration verwendet wird.
-- ImproperDeclarationNesting = Ersatztext der Parameterentit\u00E4t \"{0}\" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten.
-- ImproperGroupNesting = Ersatztext der Parameterentit\u00E4t \"{0}\" muss ordnungsgem\u00E4\u00DF verschachtelte Klammernpaare enthalten.
-- INVALID_PE_IN_CONDITIONAL = Ersatztext der Parameterentit\u00E4t \"{0}\" muss den gesamten Bedingungsabschnitt oder nur INCLUDE oder IGNORE enthalten.
-- MSG_ATTRIBUTE_NOT_DECLARED = Attribut \"{1}\" muss f\u00FCr Elementtyp \"{0}\" deklariert werden.
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attribut \"{0}\" mit Wert \"{1}\" muss einen Wert aus der Liste \"{2}\" haben.
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Der Wert \"{1}\" des Attributs \"{0}\" darf nicht von der Normalisierung (zu \"{2}\") in einem Standalone-Dokument ge\u00E4ndert werden.
-- MSG_CONTENT_INCOMPLETE = Content des Elementtyps \"{0}\" ist unvollst\u00E4ndig. Muss \"{1}\" entsprechen.
-- MSG_CONTENT_INVALID = Content des Elementtyps \"{0}\" muss \"{1}\" entsprechen.
-- MSG_CONTENT_INVALID_SPECIFIED = Content des Elementtyps \"{0}\" muss \"{1}\" entsprechen. Untergeordnete Elemente mit dem Typ \"{2}\" sind nicht zul\u00E4ssig.
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attribut \"{1}\" f\u00FCr Elementtyp \"{0}\" hat einen Standardwert und muss in einem Standalone-Dokument angegeben werden.
-- MSG_DUPLICATE_ATTDEF = Attribut \"{1}\" ist bereits deklariert f\u00FCr Elementtyp \"{0}\".
-- MSG_ELEMENT_ALREADY_DECLARED = Elementtyp \"{0}\" darf nicht mehrmals deklariert werden.
-- MSG_ELEMENT_NOT_DECLARED = Elementtyp \"{0}\" muss deklariert werden.
-+ DuplicateTypeInMixedContent = Elementtyp "{1}" wurde bereits im Contentmodell der Elementdeklaration"{0}" angegeben.
-+ ENTITIESInvalid = Attributwert "{1}" mit dem Typ ENTITIES muss aus den Namen von mindestens einer geparsten Entit\u00E4t bestehen.
-+ ENTITYInvalid = Attributwert "{1}" mit dem Typ ENTITY muss aus dem Namen einer geparsten Entit\u00E4t bestehen.
-+ IDDefaultTypeInvalid = ID-Attribut "{0}" muss den deklarierten Standardwert "#IMPLIED" oder "#REQUIRED" haben.
-+ IDInvalid = Attributwert "{0}" mit dem Typ ID muss ein Name sein.
-+ IDInvalidWithNamespaces = Attributwert "{0}" mit dem Typ ID muss ein NCName sein, wenn Namespaces aktiviert sind.
-+ IDNotUnique = Attributwert "{0}" mit dem Typ ID muss eindeutig im Dokument sein.
-+ IDREFInvalid = Attributwert "{0}" mit dem Typ IDREF muss ein Name sein.
-+ IDREFInvalidWithNamespaces = Attributwert "{0}" mit dem Typ IDREF muss ein NCName sein, wenn Namespaces aktiviert sind.
-+ IDREFSInvalid = Attributwert "{0}" mit dem Typ IDREFS muss mindestens ein Name sein.
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ersatztext der Parameterentit\u00E4t "{0}" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten, wenn die Entit\u00E4tsreferenz als vollst\u00E4ndige Deklaration verwendet wird.
-+ ImproperDeclarationNesting = Ersatztext der Parameterentit\u00E4t "{0}" muss ordnungsgem\u00E4\u00DF verschachtelte Deklarationen enthalten.
-+ ImproperGroupNesting = Ersatztext der Parameterentit\u00E4t "{0}" muss ordnungsgem\u00E4\u00DF verschachtelte Klammernpaare enthalten.
-+ INVALID_PE_IN_CONDITIONAL = Ersatztext der Parameterentit\u00E4t "{0}" muss den gesamten Bedingungsabschnitt oder nur INCLUDE oder IGNORE enthalten.
-+ MSG_ATTRIBUTE_NOT_DECLARED = Attribut "{1}" muss f\u00FCr Elementtyp "{0}" deklariert werden.
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attribut "{0}" mit Wert "{1}" muss einen Wert aus der Liste "{2}" haben.
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Der Wert "{1}" des Attributs "{0}" darf nicht von der Normalisierung (zu "{2}") in einem Standalone-Dokument ge\u00E4ndert werden.
-+ MSG_CONTENT_INCOMPLETE = Content des Elementtyps "{0}" ist unvollst\u00E4ndig. Muss "{1}" entsprechen.
-+ MSG_CONTENT_INVALID = Content des Elementtyps "{0}" muss "{1}" entsprechen.
-+ MSG_CONTENT_INVALID_SPECIFIED = Content des Elementtyps "{0}" muss "{1}" entsprechen. Untergeordnete Elemente mit dem Typ "{2}" sind nicht zul\u00E4ssig.
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attribut "{1}" f\u00FCr Elementtyp "{0}" hat einen Standardwert und muss in einem Standalone-Dokument angegeben werden.
-+ MSG_DUPLICATE_ATTDEF = Attribut "{1}" ist bereits deklariert f\u00FCr Elementtyp "{0}".
-+ MSG_ELEMENT_ALREADY_DECLARED = Elementtyp "{0}" darf nicht mehrmals deklariert werden.
-+ MSG_ELEMENT_NOT_DECLARED = Elementtyp "{0}" muss deklariert werden.
- MSG_GRAMMAR_NOT_FOUND = Dokument ist ung\u00FCltig. Keine Grammatik gefunden.
-- MSG_ELEMENT_WITH_ID_REQUIRED = Element mit \"{0}\" ist im Dokument erforderlich.
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referenz zur externen Entit\u00E4t \"{0}\" ist in einem Standalone-Dokument nicht zul\u00E4ssig.
-- MSG_FIXED_ATTVALUE_INVALID = Attribut \"{1}\" mit Wert \"{2}\" muss den Wert\"{3}\" haben.
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp \"{0}\" hat bereits ein Attribut \"{1}\" mit dem Typ ID. Ein zweites Attribut \"{2}\" mit dem Typ ID ist nicht zul\u00E4ssig.
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp \"{0}\" hat bereits ein Attribut \"{1}\" mit dem Typ NOTATION. Ein zweites Attribut \"{2}\" mit dem Typ NOTATION ist nicht zul\u00E4ssig.
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notation \"{1}\" muss deklariert werden, wenn sie in der Notationstypliste f\u00FCr Attribut \"{0}\" referenziert wird.
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notation \"{1}\" muss deklariert werden, wenn sie in der Deklaration der nicht geparsten Entit\u00E4t f\u00FCr \"{0}\" referenziert wird.
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referenz zur Entit\u00E4t \"{0}\", die in einer externen geparsten Entit\u00E4t deklariert wird, ist in einem Standalone-Dokument nicht zul\u00E4ssig.
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attribut \"{1}\" ist erforderlich und muss f\u00FCr Elementtyp \"{0}\" angegeben werden.
-+ MSG_ELEMENT_WITH_ID_REQUIRED = Element mit "{0}" ist im Dokument erforderlich.
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referenz zur externen Entit\u00E4t "{0}" ist in einem Standalone-Dokument nicht zul\u00E4ssig.
-+ MSG_FIXED_ATTVALUE_INVALID = Attribut "{1}" mit Wert "{2}" muss den Wert"{3}" haben.
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp "{0}" hat bereits ein Attribut "{1}" mit dem Typ ID. Ein zweites Attribut "{2}" mit dem Typ ID ist nicht zul\u00E4ssig.
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp "{0}" hat bereits ein Attribut "{1}" mit dem Typ NOTATION. Ein zweites Attribut "{2}" mit dem Typ NOTATION ist nicht zul\u00E4ssig.
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notation "{1}" muss deklariert werden, wenn sie in der Notationstypliste f\u00FCr Attribut "{0}" referenziert wird.
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notation "{1}" muss deklariert werden, wenn sie in der Deklaration der nicht geparsten Entit\u00E4t f\u00FCr "{0}" referenziert wird.
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referenz zur Entit\u00E4t "{0}", die in einer externen geparsten Entit\u00E4t deklariert wird, ist in einem Standalone-Dokument nicht zul\u00E4ssig.
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attribut "{1}" ist erforderlich und muss f\u00FCr Elementtyp "{0}" angegeben werden.
- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Es d\u00FCrfen keine Leerstellen zwischen Elementen in einem Standalone-Dokument vorkommen, die in einer externen geparsten Entit\u00E4t mit Elementcontent deklariert sind.
-- NMTOKENInvalid = Attributwert \"{0}\" mit dem Typ NMTOKEN muss ein Namenstoken sein.
-- NMTOKENSInvalid = Attributwert \"{0}\" mit dem Typ NMTOKENS muss mindestens ein Namenstoken sein.
-- NoNotationOnEmptyElement = Elementtyp \"{0}\", der als EMPTY deklariert wurde, kann nicht das Attribut \"{1}\" mit dem Typ NOTATION deklarieren.
-- RootElementTypeMustMatchDoctypedecl = Dokument-Root-Element \"{1}\"muss mit DOCTYPE-Root \"{0}\" \u00FCbereinstimmen.
-- UndeclaredElementInContentSpec = Contentmodell des Elements \"{0}\" verweist auf das nicht deklarierte Element \"{1}\".
-- UniqueNotationName = Deklaration f\u00FCr die Notation \"{0}\" ist nicht eindeutig. Ein jeweiliger Name darf nicht in mehreren Notationsdeklarationen deklariert werden.
-+ NMTOKENInvalid = Attributwert "{0}" mit dem Typ NMTOKEN muss ein Namenstoken sein.
-+ NMTOKENSInvalid = Attributwert "{0}" mit dem Typ NMTOKENS muss mindestens ein Namenstoken sein.
-+ NoNotationOnEmptyElement = Elementtyp "{0}", der als EMPTY deklariert wurde, kann nicht das Attribut "{1}" mit dem Typ NOTATION deklarieren.
-+ RootElementTypeMustMatchDoctypedecl = Document Root-Element "{1}"muss mit DOCTYPE-Root "{0}" \u00FCbereinstimmen.
-+ UndeclaredElementInContentSpec = Contentmodell des Elements "{0}" verweist auf das nicht deklarierte Element "{1}".
-+ UniqueNotationName = Deklaration f\u00FCr die Notation "{0}" ist nicht eindeutig. Ein jeweiliger Name darf nicht in mehreren Notationsdeklarationen deklariert werden.
- ENTITYFailedInitializeGrammar = ENTITYDatatype-Validator: Nicht erfolgreich. Initialisierungsmethode muss mit einer g\u00FCltigen Grammatikreferenz aufgerufen werden. \t
-- ENTITYNotUnparsed = ENTITY \"{0}\" ist geparst.
-- ENTITYNotValid = ENTITY \"{0}\" ist nicht g\u00FCltig.
-+ ENTITYNotUnparsed = ENTITY "{0}" ist geparst.
-+ ENTITYNotValid = ENTITY "{0}" ist nicht g\u00FCltig.
- EmptyList = Werte der Typen ENTITIES, IDREFS und NMTOKENS d\u00FCrfen keine leeren Listen sein.
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = Externe Entit\u00E4tsreferenz \"&{0};\" ist in einem Attributwert nicht zul\u00E4ssig.
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = Externe Entit\u00E4tsreferenz "&{0};" ist in einem Attributwert nicht zul\u00E4ssig.
-+ AccessExternalDTD = Externe DTD: Lesen von externer DTD "{0}" nicht erfolgreich, da "{1}"-Zugriff wegen der von der Eigenschaft "accessExternalDTD" festgelegten Einschr\u00E4nkung nicht zul\u00E4ssig ist.
-+ AccessExternalEntity = Externe Entit\u00E4t: Lesen des externen Dokuments "{0}" nicht erfolgreich, da "{1}"-Zugriff wegen der von der Eigenschaft "accessExternalDTD" festgelegten Einschr\u00E4nkung nicht zul\u00E4ssig ist.
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = Entit\u00E4t \"{0}\" wurde referenziert aber nicht deklariert.
-- ReferenceToUnparsedEntity = Nicht geparste Entit\u00E4tsreferenz \"&{0};\" ist nicht zul\u00E4ssig.
-- RecursiveReference = Rekursive Entit\u00E4tsreferenz \"{0}\". (Referenzpfad: {1}),
-- RecursiveGeneralReference = Rekursive allgemeine Entit\u00E4tsreferenz \"&{0};\". (Referenzpfad: {1}),
-- RecursivePEReference = Rekursive Parameterentit\u00E4tsreferenz \"%{0};\". (Referenzpfad: {1}),
-+ EntityNotDeclared = Entit\u00E4t "{0}" wurde referenziert aber nicht deklariert.
-+ ReferenceToUnparsedEntity = Nicht geparste Entit\u00E4tsreferenz "&{0};" ist nicht zul\u00E4ssig.
-+ RecursiveReference = Rekursive Entit\u00E4tsreferenz "{0}". (Referenzpfad: {1}),
-+ RecursiveGeneralReference = Rekursive allgemeine Entit\u00E4tsreferenz "&{0};". (Referenzpfad: {1}),
-+ RecursivePEReference = Rekursive Parameterentit\u00E4tsreferenz "%{0};". (Referenzpfad: {1}),
- # 4.3.3 Character Encoding in Entities
- EncodingNotSupported = Codierung "{0}" wird nicht unterst\u00FCtzt.
- EncodingRequired = Eine nicht in UTF-8 oder UTF-16 codierte geparste Entit\u00E4t muss eine Codierungsdeklaration enthalten.
-@@ -305,14 +278,14 @@
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = Element oder Attribut stimmt nicht mit QName-Production \u00FCberein: QName::=(NCName':')?NCName.
-- ElementXMLNSPrefix = Element \"{0}\" darf nicht \"xmlns\" als Pr\u00E4fix enthalten.
-- ElementPrefixUnbound = Pr\u00E4fix \"{0}\" f\u00FCr Element \"{1}\" ist nicht gebunden.
-- AttributePrefixUnbound = Pr\u00E4fix \"{2}\" f\u00FCr Attribut \"{1}\", das mit Elementtyp \"{0}\" verkn\u00FCpft ist, ist nicht gebunden.
-- EmptyPrefixedAttName = Wert des Attributs \"{0}\" ist ung\u00FCltig. Namespace Bindings mit Pr\u00E4fix d\u00FCrfen nicht leer sein.
-- PrefixDeclared = Namespace-Pr\u00E4fix \"{0}\" wurde nicht deklariert.
-+ ElementXMLNSPrefix = Element "{0}" darf nicht "xmlns" als Pr\u00E4fix enthalten.
-+ ElementPrefixUnbound = Pr\u00E4fix "{0}" f\u00FCr Element "{1}" ist nicht gebunden.
-+ AttributePrefixUnbound = Pr\u00E4fix "{2}" f\u00FCr Attribut "{1}", das mit Elementtyp "{0}" verkn\u00FCpft ist, ist nicht gebunden.
-+ EmptyPrefixedAttName = Wert des Attributs "{0}" ist ung\u00FCltig. Namespace Bindings mit Pr\u00E4fix d\u00FCrfen nicht leer sein.
-+ PrefixDeclared = Namespace-Pr\u00E4fix "{0}" wurde nicht deklariert.
- CantBindXMLNS = Pr\u00E4fix "xmlns" kann nicht explizit an einen Namespace gebunden werden. Umgekehrt kann auch der Namespace f\u00FCr "xmlns" nicht explizit an ein Pr\u00E4fix gebunden werden.
- CantBindXML = Pr\u00E4fix "xml" kann nicht an einen anderen Namespace als den gew\u00F6hnlichen gebunden werden. Umgekehrt kann auch der Namespace f\u00FCr "xml" nicht an ein anderes Pr\u00E4fix als "xml" gebunden werden.
-- MSG_ATT_DEFAULT_INVALID = defaultValue \"{1}\" von Attribut \"{0}\" ist aufgrund der lexikalischen Constraints dieses Attributtyps nicht g\u00FCltig.
-+ MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" von Attribut "{0}" ist aufgrund der lexikalischen Constraints dieses Attributtyps nicht g\u00FCltig.
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=Parser hat mehr als \"{0}\" Entit\u00E4tserweiterungen in diesem Dokument gefunden. Dies ist der durch die Anwendung vorgeschriebene Grenzwert.
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: Der Parser hat mehr als {0} Entit\u00E4tserweiterungen in diesem Dokument gefunden. Dies ist der von JDK vorgeschriebene Grenzwert.
-+ ElementAttributeLimit=JAXP00010002: Element "{0}" hat mehr als {1} Attribute. "{1}" ist der von JDK vorgeschriebene Grenzwert.
-+ MaxEntitySizeLimit=JAXP00010003: Die L\u00E4nge von Entit\u00E4t "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
-+ TotalEntitySizeLimit=JAXP00010004: Die akkumulierte Gr\u00F6\u00DFe "{0}" der Entit\u00E4ten \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
-+ MaxXMLNameLimit=JAXP00010005: Der Name "{0}" \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde.
-+ MaxElementDepthLimit=JAXP00010006: Die Tiefe von Element "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde.
-
--# 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 2014-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el pr\u00F3logo del documento.
- InvalidCharInXMLDecl = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la declaraci\u00F3n XML.
- # 2.4 Character Data and Markup
-- CDEndInContent = La secuencia de caracteres \"]]>\" no debe aparecer en el contenido, a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
-+ CDEndInContent = La secuencia de caracteres "]]>" no debe aparecer en el contenido, a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
- # 2.7 CDATA Sections
-- CDSectUnterminated = La secci\u00F3n CDATA debe finalizar en \"]]>\".
-+ CDSectUnterminated = La secci\u00F3n CDATA debe finalizar en "]]>".
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = La declaraci\u00F3n XML s\u00F3lo puede aparecer al principio del documento.
-- EqRequiredInXMLDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de \"{0}\" en la declaraci\u00F3n XML.
-- QuoteRequiredInXMLDecl = El valor despu\u00E9s de \"{0}\" en la declaraci\u00F3n XML debe ser una cadena con comillas.
-- XMLDeclUnterminated = La declaraci\u00F3n XML debe finalizar en \"?>\".
-+ EqRequiredInXMLDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de "{0}" en la declaraci\u00F3n XML.
-+ QuoteRequiredInXMLDecl = El valor despu\u00E9s de "{0}" en la declaraci\u00F3n XML debe ser una cadena con comillas.
-+ XMLDeclUnterminated = La declaraci\u00F3n XML debe finalizar en "?>".
- VersionInfoRequired = La versi\u00F3n es necesaria en la declaraci\u00F3n XML.
- SpaceRequiredBeforeVersionInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaraci\u00F3n XML.
- SpaceRequiredBeforeEncodingInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n XML.
-@@ -71,70 +43,71 @@
- ReferenceIllegalInTrailingMisc=La referencia no est\u00E1 permitida en la secci\u00F3n final.
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = El valor de declaraci\u00F3n del documento aut\u00F3nomo debe ser \"yes\" o \"no\", pero nunca \"{0}\".
-+ SDDeclInvalid = El valor de declaraci\u00F3n del documento aut\u00F3nomo debe ser "yes" o "no", pero nunca "{0}".
-+ SDDeclNameInvalid = Puede que el nombre aut\u00F3nomo de la declaraci\u00F3n XML est\u00E9 mal escrito.
- # 2.12 Language Identification
-- XMLLangInvalid = El valor del atributo xml:lang \"{0}\" es un identificador de idioma no v\u00E1lido.
-+ XMLLangInvalid = El valor del atributo xml:lang "{0}" es un identificador de idioma no v\u00E1lido.
- # 3. Logical Structures
-- ETagRequired = El tipo de elemento \"{0}\" debe finalizar por la etiqueta final coincidente \"</{0}>\".
-+ ETagRequired = El tipo de elemento "{0}" debe finalizar por la etiqueta final coincidente "</{0}>".
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = El tipo de elemento \"{0}\" debe ir seguido de una de estas especificaciones de atributo: \">\" o \"/>\".
-- EqRequiredInAttribute = El nombre de atributo \"{1}\" asociado a un tipo de elemento \"{0}\" debe ir seguido del car\u00E1cter '' = ''.
-- OpenQuoteExpected = Las comillas de apertura se deben utilizar para el atributo \"{1}\" asociado a un tipo de elemento \"{0}\".
-- CloseQuoteExpected = Las comillas de cierre se deben utilizar para el atributo \"{1}\" asociado a un tipo de elemento \"{0}\".
-- AttributeNotUnique = El atributo \"{1}\" ya se ha especificado para el elemento \"{0}\".
-- AttributeNSNotUnique = El atributo \"{1}\" enlazado al espacio de nombres \"{2}\" ya se ha especificado para el elemento \"{0}\".
-- ETagUnterminated = La etiqueta final para el tipo de elemento \"{0}\" debe finalizar en un delimitador ''>''.
-+ ElementUnterminated = El tipo de elemento "{0}" debe ir seguido de una de estas especificaciones de atributo: ">" o "/>".
-+ EqRequiredInAttribute = El nombre de atributo "{1}" asociado a un tipo de elemento "{0}" debe ir seguido del car\u00E1cter '' = ''.
-+ OpenQuoteExpected = Las comillas de apertura se deben utilizar para el atributo "{1}" asociado a un tipo de elemento "{0}".
-+ CloseQuoteExpected = Las comillas de cierre se deben utilizar para el atributo "{1}" asociado a un tipo de elemento "{0}".
-+ AttributeNotUnique = El atributo "{1}" ya se ha especificado para el elemento "{0}".
-+ AttributeNSNotUnique = El atributo "{1}" enlazado al espacio de nombres "{2}" ya se ha especificado para el elemento "{0}".
-+ ETagUnterminated = La etiqueta final para el tipo de elemento "{0}" debe finalizar en un delimitador ''>''.
- MarkupNotRecognizedInContent = El contenido de los elementos debe constar de marcadores o datos de car\u00E1cter con un formato correcto.
- DoctypeIllegalInContent = No se permite un DOCTYPE en el contenido.
- # 4.1 Character and Entity References
- ReferenceUnterminated = La referencia debe finalizar con un delimitador ';'.
- # 4.3.2 Well-Formed Parsed Entities
- ReferenceNotInOneEntity = La referencia debe incluirse totalmente en la misma entidad analizada.
-- ElementEntityMismatch = El elemento \"{0}\" debe empezar y finalizar en la misma entidad.
-+ ElementEntityMismatch = El elemento "{0}" debe empezar y finalizar en la misma entidad.
- MarkupEntityMismatch=Las estructuras del documento XML deben empezar y finalizar en la misma entidad.
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{2}) no v\u00E1lido en el valor del atributo \"{1}\" y el elemento es \"{0}\".
-+ InvalidCharInAttValue = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{2}) no v\u00E1lido en el valor del atributo "{1}" y el elemento es "{0}".
- InvalidCharInComment = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el comentario.
- InvalidCharInPI = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la instrucci\u00F3n de procesamiento.
- InvalidCharInInternalSubset = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el subconjunto interno del DTD.
- InvalidCharInTextDecl = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la declaraci\u00F3n de texto.
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = El valor del atributo \"{1}\" debe empezar por un car\u00E1cter de comillas dobles o simples.
-- LessthanInAttValue = El valor del atributo \"{1}\" asociado a un tipo de elemento \"{0}\" no debe contener el car\u00E1cter ''<''.
-- AttributeValueUnterminated = El valor para el atributo \"{1}\" debe finalizar en un car\u00E1cter de comillas coincidentes.
-+ QuoteRequiredInAttValue = El valor del atributo "{1}" debe empezar por un car\u00E1cter de comillas dobles o simples.
-+ LessthanInAttValue = El valor del atributo "{1}" asociado a un tipo de elemento "{0}" no debe contener el car\u00E1cter ''<''.
-+ AttributeValueUnterminated = El valor para el atributo "{1}" debe finalizar en un car\u00E1cter de comillas coincidentes.
- # 2.5 Comments
-- InvalidCommentStart = El comentario debe empezar por \"<!--\".
-- DashDashInComment = La cadena \"--\" no est\u00E1 permitida en los comentarios.
-- CommentUnterminated = El comentario debe finalizar en \"-->\".
-+ InvalidCommentStart = El comentario debe empezar por "<!--".
-+ DashDashInComment = La cadena "--" no est\u00E1 permitida en los comentarios.
-+ CommentUnterminated = El comentario debe finalizar en "-->".
- COMMENT_NOT_IN_ONE_ENTITY = El comentario no est\u00E1 incluido en la misma entidad.
- # 2.6 Processing Instructions
- PITargetRequired = La instrucci\u00F3n de procesamiento debe empezar por el nombre del destino.
- SpaceRequiredInPI = Es necesario un espacio en blanco entre el destino de la instrucci\u00F3n de procesamiento y los datos.
-- PIUnterminated = La instrucci\u00F3n de procesamiento debe finalizar en \"?>\".
-- ReservedPITarget = El destino de la instrucci\u00F3n de procesamiento que coincide con \"[xX][mM][lL]\" no est\u00E1 permitido.
-+ PIUnterminated = La instrucci\u00F3n de procesamiento debe finalizar en "?>".
-+ ReservedPITarget = El destino de la instrucci\u00F3n de procesamiento que coincide con "[xX][mM][lL]" no est\u00E1 permitido.
- PI_NOT_IN_ONE_ENTITY = La instrucci\u00F3n de procesamiento no est\u00E1 incluida en la misma entidad.
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = Versi\u00F3n no v\u00E1lida \"{0}\".
-- VersionNotSupported = La versi\u00F3n XML \"{0}\" no est\u00E1 soportada, s\u00F3lo la versi\u00F3n XML 1.0 est\u00E1 soportada.
-- VersionNotSupported11 = La versi\u00F3n XML \"{0}\" no est\u00E1 soportada, s\u00F3lo las versiones XML 1.0 y XML 1.1 est\u00E1n soportadas.
-+ VersionInfoInvalid = Versi\u00F3n no v\u00E1lida "{0}".
-+ VersionNotSupported = La versi\u00F3n XML "{0}" no est\u00E1 soportada, s\u00F3lo la versi\u00F3n XML 1.0 est\u00E1 soportada.
-+ VersionNotSupported11 = La versi\u00F3n XML "{0}" no est\u00E1 soportada, s\u00F3lo las versiones XML 1.0 y XML 1.1 est\u00E1n soportadas.
- VersionMismatch= Una entidad no puede incluir otra entidad de una versi\u00F3n posterior.
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = Una representaci\u00F3n decimal debe aparecer inmediatamente despu\u00E9s de \"&#\" en una referencia de caracteres.
-- HexdigitRequiredInCharRef = Una representaci\u00F3n hexadecimal debe aparecer inmediatamente despu\u00E9s de \"&#\" en una referencia de caracteres.
-+ DigitRequiredInCharRef = Una representaci\u00F3n decimal debe aparecer inmediatamente despu\u00E9s de "&#" en una referencia de caracteres.
-+ HexdigitRequiredInCharRef = Una representaci\u00F3n hexadecimal debe aparecer inmediatamente despu\u00E9s de "&#" en una referencia de caracteres.
- SemicolonRequiredInCharRef = La referencia de caracteres debe finalizar en el delimitador ';'.
-- InvalidCharRef = La referencia de caracteres \"&#{0}\" es un car\u00E1cter XML no v\u00E1lido.
-+ InvalidCharRef = La referencia de caracteres "&#{0}" es un car\u00E1cter XML no v\u00E1lido.
- NameRequiredInReference = El nombre de la entidad debe aparecer inmediatamente despu\u00E9s de '&' en la referencia de entidades.
-- SemicolonRequiredInReference = La referencia a la entidad \"{0}\" debe finalizar en el delimitador '';''.
-+ SemicolonRequiredInReference = La referencia a la entidad "{0}" debe finalizar en el delimitador '';''.
- # 4.3.1 The Text Declaration
- TextDeclMustBeFirst = La declaraci\u00F3n de texto s\u00F3lo puede aparecer al principio de la entidad analizada externa.
-- EqRequiredInTextDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de \"{0}\" en la declaraci\u00F3n de texto.
-- QuoteRequiredInTextDecl = El valor despu\u00E9s de \"{0}\" en la declaraci\u00F3n de texto debe ser una cadena con comillas.
-- CloseQuoteMissingInTextDecl = Faltan las comillas de cierre en el valor despu\u00E9s de \"{0}\" en la declaraci\u00F3n de texto.
-+ EqRequiredInTextDecl = El car\u00E1cter '' = '' debe aparecer despu\u00E9s de "{0}" en la declaraci\u00F3n de texto.
-+ QuoteRequiredInTextDecl = El valor despu\u00E9s de "{0}" en la declaraci\u00F3n de texto debe ser una cadena con comillas.
-+ CloseQuoteMissingInTextDecl = Faltan las comillas de cierre en el valor despu\u00E9s de "{0}" en la declaraci\u00F3n de texto.
- SpaceRequiredBeforeVersionInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaraci\u00F3n de texto.
- SpaceRequiredBeforeEncodingInTextDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n de texto.
-- TextDeclUnterminated = La declaraci\u00F3n de texto debe finalizar en \"?>\".
-+ TextDeclUnterminated = La declaraci\u00F3n de texto debe finalizar en "?>".
- EncodingDeclRequired = La declaraci\u00F3n de codificaci\u00F3n es necesaria en la declaraci\u00F3n de texto.
- NoMorePseudoAttributes = No se permiten m\u00E1s pseudo atributos.
- MorePseudoAttributes = Se esperan m\u00E1s pseudo atributos.
-@@ -143,13 +116,13 @@
- CommentNotInOneEntity = El comentario debe incluirse totalmente en la misma entidad analizada.
- PINotInOneEntity = La instrucci\u00F3n de procesamiento debe incluirse totalmente en la misma entidad analizada.
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = Nombre de codificaci\u00F3n no v\u00E1lido \"{0}\".
-- EncodingByteOrderUnsupported = El orden de bytes proporcionado para la codificaci\u00F3n \"{0}\" no est\u00E1 soportado.
-+ EncodingDeclInvalid = Nombre de codificaci\u00F3n no v\u00E1lido "{0}".
-+ EncodingByteOrderUnsupported = El orden de bytes proporcionado para la codificaci\u00F3n "{0}" no est\u00E1 soportado.
- InvalidByte = Byte no v\u00E1lido {0} de la secuencia UTF-8 de {1} bytes
- ExpectedByte = Byte esperado {0} de la secuencia UTF-8 de {1} bytes.
- InvalidHighSurrogate = Los bits de sustituci\u00F3n superior en la secuencia UTF-8 no deben exceder 0x10 pero se han encontrado 0x{0}.
-- OperationNotSupported = La operaci\u00F3n \"{0}\" no est\u00E1 soportada por el lector {1}.
-- InvalidASCII = El byte \"{0}\"no es un miembro del juego de caracteres ASCII (7 bits).
-+ OperationNotSupported = La operaci\u00F3n "{0}" no est\u00E1 soportada por el lector {1}.
-+ InvalidASCII = El byte "{0}"no es un miembro del juego de caracteres ASCII (7 bits).
- CharConversionFailure = Una entidad con una codificaci\u00F3n determinada no debe contener secuencias no permitidas en dicha codificaci\u00F3n.
-
- # DTD Messages
-@@ -169,150 +142,150 @@
- PubidCharIllegal = El car\u00E1cter (Unicode: 0x{0}) no est\u00E1 permitido en el identificador p\u00FAblico.
- SpaceRequiredBetweenPublicAndSystem = Son necesarios espacios en blanco entre publicId y systemId.
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!DOCTYPE\" en la declaraci\u00F3n de tipo de documento.
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = El tipo de elemento ra\u00EDz debe aparecer despu\u00E9s de \"<!DOCTYPE\" en la declaraci\u00F3n de tipo de documento.
-- DoctypedeclUnterminated = La declaraci\u00F3n de tipo de documento para el tipo de elemento ra\u00EDz \"{0}\" debe finalizar en ''>''.
-- PEReferenceWithinMarkup = La referencia de entidad del par\u00E1metro \"%{0};\" no puede producirse en el marcador en el subconjunto interno del DTD.
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Es necesario un espacio en blanco despu\u00E9s de "<!DOCTYPE" en la declaraci\u00F3n de tipo de documento.
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = El tipo de elemento ra\u00EDz debe aparecer despu\u00E9s de "<!DOCTYPE" en la declaraci\u00F3n de tipo de documento.
-+ DoctypedeclUnterminated = La declaraci\u00F3n de tipo de documento para el tipo de elemento ra\u00EDz "{0}" debe finalizar en ''>''.
-+ PEReferenceWithinMarkup = La referencia de entidad del par\u00E1metro "%{0};" no puede producirse en el marcador en el subconjunto interno del DTD.
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Las declaraciones de marcador que se incluyen o a las que apunta la declaraci\u00F3n de tipo de documento deben tener el formato correcto.
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = La declaraci\u00F3n de atributo para \"xml:space\" debe ofrecerse como un tipo enumerado cuyos \u00FAnicos valores posibles son \"default\" y \"preserve\".
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = La declaraci\u00F3n de atributo para "xml:space" debe ofrecerse como un tipo enumerado cuyos \u00FAnicos valores posibles son "default" y "preserve".
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!ELEMENT\" en la declaraci\u00F3n de tipo de elemento.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s de "<!ELEMENT" en la declaraci\u00F3n de tipo de elemento.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = El tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento.
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s del tipo de elemento \"{0}\" en la declaraci\u00F3n de tipo de elemento.
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Es necesaria la restricci\u00F3n despu\u00E9s del tipo de elemento \"{0}\" en la declaraci\u00F3n de tipo de elemento.
-- ElementDeclUnterminated = La declaraci\u00F3n para el tipo de elemento \"{0}\" debe finalizar en ''>''.
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Es necesario un espacio en blanco despu\u00E9s del tipo de elemento "{0}" en la declaraci\u00F3n de tipo de elemento.
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Es necesaria la restricci\u00F3n despu\u00E9s del tipo de elemento "{0}" en la declaraci\u00F3n de tipo de elemento.
-+ ElementDeclUnterminated = La declaraci\u00F3n para el tipo de elemento "{0}" debe finalizar en ''>''.
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un car\u00E1cter ''('' o un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento \"{0}\".
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un car\u00E1cter ''('' o un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento \"{0}\".
-- MixedContentUnterminated = El modelo de contenido mixto \"{0}\" debe finalizar en \")*\" cuando los tipos de elementos secundarios est\u00E1n restringidos.
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo de elemento es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un car\u00E1cter '')'' es necesario en la declaraci\u00F3n de tipo de elemento "{0}".
-+ MixedContentUnterminated = El modelo de contenido mixto "{0}" debe finalizar en ")*" cuando los tipos de elementos secundarios est\u00E1n restringidos.
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!ATTLIST\" en la declaraci\u00F3n de la lista de atributos.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Es necesario un espacio en blanco despu\u00E9s de "<!ATTLIST" en la declaraci\u00F3n de la lista de atributos.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = El tipo de elemento es necesario en la declaraci\u00F3n de la lista de atributos.
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Es necesario un espacio en blanco antes del nombre de atributo en la declaraci\u00F3n de la lista de atributos para el elemento \"{0}\".
-- AttNameRequiredInAttDef = Se debe especificar el nombre del atributo en la declaraci\u00F3n de la lista de atributos para el elemento \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Es necesario un espacio en blanco antes del tipo de atributo en la declaraci\u00F3n del atributo \"{1}\" para el elemento \"{0}\".
-- AttTypeRequiredInAttDef = Es necesario el tipo de atributo en la declaraci\u00F3n del atributo \"{1}\" para el elemento \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Es necesario un espacio en blanco antes del atributo por defecto en la declaraci\u00F3n del atributo \"{1}\" para el elemento \"{0}\".
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Se ha proporcionado m\u00E1s de una definici\u00F3n de atributo para el mismo atributo \"{1}\" de un elemento determinado \"{0}\".
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Es necesario un espacio en blanco antes del nombre de atributo en la declaraci\u00F3n de la lista de atributos para el elemento "{0}".
-+ AttNameRequiredInAttDef = Se debe especificar el nombre del atributo en la declaraci\u00F3n de la lista de atributos para el elemento "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Es necesario un espacio en blanco antes del tipo de atributo en la declaraci\u00F3n del atributo "{1}" para el elemento "{0}".
-+ AttTypeRequiredInAttDef = Es necesario el tipo de atributo en la declaraci\u00F3n del atributo "{1}" para el elemento "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Es necesario un espacio en blanco antes del atributo por defecto en la declaraci\u00F3n del atributo "{1}" para el elemento "{0}".
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Se ha proporcionado m\u00E1s de una definici\u00F3n de atributo para el mismo atributo "{1}" de un elemento determinado "{0}".
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Debe aparecer un espacio en blanco despu\u00E9s de \"NOTATION\" en la declaraci\u00F3n de atributo \"{1}\".
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = El car\u00E1cter ''('' debe aparecer despu\u00E9s de \"NOTATION\" en la declaraci\u00F3n de atributo \"{1}\".
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = El nombre de notaci\u00F3n es necesario en la lista de tipos de notaci\u00F3n para la declaraci\u00F3n de atributo \"{1}\".
-- NotationTypeUnterminated = La lista de tipos de notaciones debe finalizar en '')'' en la declaraci\u00F3n del atributo \"{1}\".
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = El elemento de nombre es necesario en la lista de tipos enumerados para la declaraci\u00F3n del atributo \"{1}\".
-- EnumerationUnterminated = La lista de tipos enumerados debe finalizar en '')'' en la declaraci\u00F3n del atributo \"{1}\".
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = El valor de enumeraci\u00F3n \"{1}\" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo \"{2}\" para el elemento \"{0}\". Todos los NMTOKENS en una declaraci\u00F3n del atributo Enumeration \u00FAnico deben ser distintos.
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = El valor de enumeraci\u00F3n \"{1}\" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo \"{2}\" para el elemento \"{0}\". Todos los nombres NOTATION en una declaraci\u00F3n del atributo NotationType \u00FAnico deben ser distintos.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Debe aparecer un espacio en blanco despu\u00E9s de "NOTATION" en la declaraci\u00F3n de atributo "{1}".
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = El car\u00E1cter ''('' debe aparecer despu\u00E9s de "NOTATION" en la declaraci\u00F3n de atributo "{1}".
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = El nombre de notaci\u00F3n es necesario en la lista de tipos de notaci\u00F3n para la declaraci\u00F3n de atributo "{1}".
-+ NotationTypeUnterminated = La lista de tipos de notaciones debe finalizar en '')'' en la declaraci\u00F3n del atributo "{1}".
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = El token de nombre es necesario en la lista de tipos enumerados para la declaraci\u00F3n del atributo "{1}".
-+ EnumerationUnterminated = La lista de tipos enumerados debe finalizar en '')'' en la declaraci\u00F3n del atributo "{1}".
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = El valor de enumeraci\u00F3n "{1}" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo "{2}" para el token "{0}". Todos los NMTOKENS en una declaraci\u00F3n del atributo Enumeration \u00FAnico deben ser distintos.
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = El valor de enumeraci\u00F3n "{1}" se especific\u00F3 m\u00E1s de una vez en la declaraci\u00F3n del atributo "{2}" para el elemento "{0}". Todos los nombres NOTATION en una declaraci\u00F3n del atributo NotationType \u00FAnico deben ser distintos.
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Debe aparecer un espacio en blanco despu\u00E9s de \"FIXED\" en la declaraci\u00F3n de atributo \"{1}\".
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Debe aparecer un espacio en blanco despu\u00E9s de "FIXED" en la declaraci\u00F3n de atributo "{1}".
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = La secci\u00F3n condicional incluida debe finalizar en \"]]>\".
-- IgnoreSectUnterminated = La secci\u00F3n condicional excluida debe finalizar en \"]]>\".
-+ IncludeSectUnterminated = La secci\u00F3n condicional incluida debe finalizar en "]]>".
-+ IgnoreSectUnterminated = La secci\u00F3n condicional excluida debe finalizar en "]]>".
- # 4.1 Character and Entity References
- NameRequiredInPEReference = El nombre de la entidad debe aparecer inmediatamente despu\u00E9s de '%' en la referencia de entidad de par\u00E1metro.
-- SemicolonRequiredInPEReference = La referencia de entidad de par\u00E1metro \"%{0};\" debe finalizar en el delimitador '';''.
-+ SemicolonRequiredInPEReference = La referencia de entidad de par\u00E1metro "%{0};" debe finalizar en el delimitador '';''.
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!ENTITY\" en la declaraci\u00F3n de entidad.
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Es necesario un espacio en blanco entre \"<!ENTITY\" y el car\u00E1cter '%' en la declaraci\u00F3n de entidad de par\u00E1metro.
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco despu\u00E9s de "<!ENTITY" en la declaraci\u00F3n de entidad.
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Es necesario un espacio en blanco entre "<!ENTITY" y el car\u00E1cter '%' en la declaraci\u00F3n de entidad de par\u00E1metro.
- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Es necesario un espacio en blanco entre '%' y el nombre de entidad en la declaraci\u00F3n de entidad de par\u00E1metro.
- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = El nombre de la entidad es necesario en la declaraci\u00F3n de entidad.
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco entre el nombre de entidad \"{0}\" y la definici\u00F3n en la declaraci\u00F3n de entidad.
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco entre \"NDATA\" y el nombre de notaci\u00F3n en la declaraci\u00F3n para la entidad \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco antes de \"NDATA\" en la declaraci\u00F3n para la entidad \"{0}\".
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = El nombre de notaci\u00F3n es necesario despu\u00E9s de \"NDATA\" en la declaraci\u00F3n para la entidad \"{0}\".
-- EntityDeclUnterminated = La declaraci\u00F3n para la entidad \"{0}\" debe finalizar en ''>''.
-- MSG_DUPLICATE_ENTITY_DEFINITION = La entidad \"{0}\" se ha declarado m\u00E1s de una vez.
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Es necesario un espacio en blanco entre el nombre de entidad "{0}" y la definici\u00F3n en la declaraci\u00F3n de entidad.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco entre "NDATA" y el nombre de notaci\u00F3n en la declaraci\u00F3n para la entidad "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Es necesario un espacio en blanco antes de "NDATA" en la declaraci\u00F3n para la entidad "{0}".
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = El nombre de notaci\u00F3n es necesario despu\u00E9s de "NDATA" en la declaraci\u00F3n para la entidad "{0}".
-+ EntityDeclUnterminated = La declaraci\u00F3n para la entidad "{0}" debe finalizar en ''>''.
-+ MSG_DUPLICATE_ENTITY_DEFINITION = La entidad "{0}" se ha declarado m\u00E1s de una vez.
- # 4.2.2 External Entities
-- ExternalIDRequired = La declaraci\u00F3n de entidad externa debe empezar por \"SYSTEM\" o \"PUBLIC\".
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre \"PUBLIC\" y el identificador p\u00FAblico.
-+ ExternalIDRequired = La declaraci\u00F3n de entidad externa debe empezar por "SYSTEM" o "PUBLIC".
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre "PUBLIC" y el identificador p\u00FAblico.
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre el identificador p\u00FAblico y el identificador del sistema.
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre \"SYSTEM\" y el identificador del sistema.
-- MSG_URI_FRAGMENT_IN_SYSTEMID = No se debe especificar el identificador del fragmento como parte del identificador del sistema \"{0}\".
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Es necesario un espacio en blanco entre "SYSTEM" y el identificador del sistema.
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = No se debe especificar el identificador del fragmento como parte del identificador del sistema "{0}".
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s de \"<!NOTATION\" en la declaraci\u00F3n de notaci\u00F3n.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s de "<!NOTATION" en la declaraci\u00F3n de notaci\u00F3n.
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = El nombre de la notaci\u00F3n es necesario en la declaraci\u00F3n de notaci\u00F3n.
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s del nombre de la notaci\u00F3n \"{0}\" en la declaraci\u00F3n de notaci\u00F3n.
-- ExternalIDorPublicIDRequired = La declaraci\u00F3n para la notaci\u00F3n \"{0}\" debe incluir un identificador p\u00FAblico o del sistema.
-- NotationDeclUnterminated = La declaraci\u00F3n para la notaci\u00F3n \"{0}\" debe finalizar en ''>''.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Es necesario un espacio en blanco despu\u00E9s del nombre de la notaci\u00F3n "{0}" en la declaraci\u00F3n de notaci\u00F3n.
-+ ExternalIDorPublicIDRequired = La declaraci\u00F3n para la notaci\u00F3n "{0}" debe incluir un identificador p\u00FAblico o del sistema.
-+ NotationDeclUnterminated = La declaraci\u00F3n para la notaci\u00F3n "{0}" debe finalizar en ''>''.
-
- # Validation messages
-- DuplicateTypeInMixedContent = El tipo de elemento \"{1}\" ya se especific\u00F3 en el modelo de contenido de la declaraci\u00F3n de elementos \"{0}\".
-- ENTITIESInvalid = El valor de atributo \"{1}\" del tipo ENTITIES debe ser el nombre de una o m\u00E1s entidades no analizadas.
-- ENTITYInvalid = El valor de atributo \"{1}\" del tipo ENTITY debe ser el nombre de una entidad no analizada.
-- IDDefaultTypeInvalid = El atributo de identificador \"{0}\" debe tener un valor por defecto declarado de \"#IMPLIED\" o \"#REQUIRED\".
-- IDInvalid = El valor de atributo \"{0}\" del tipo ID debe ser un nombre.
-- IDInvalidWithNamespaces = El valor de atributo \"{0}\" del tipo ID debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
-- IDNotUnique = El valor de atributo \"{0}\" del tipo ID debe ser \u00FAnico en el documento.
-- IDREFInvalid = El valor de atributo \"{0}\" del tipo IDREF debe ser un nombre.
-- IDREFInvalidWithNamespaces = El valor de atributo \"{0}\" del tipo IDREF debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
-- IDREFSInvalid = El valor de atributo \"{0}\" del tipo IDREFS debe ser uno o m\u00E1s nombres.
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro \"{0}\" debe incluir declaraciones correctamente anidadas cuando la referencia de entidad se utiliza como una declaraci\u00F3n completa.
-- ImproperDeclarationNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro \"{0}\" debe incluir declaraciones correctamente anidadas.
-- ImproperGroupNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro \"{0}\" debe incluir pares de par\u00E9ntesis correctamente anidados.
-- INVALID_PE_IN_CONDITIONAL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro \"{0}\" debe incluir la secci\u00F3n condicional completa o s\u00F3lo INCLUDE o IGNORE.
-- MSG_ATTRIBUTE_NOT_DECLARED = El atributo \"{1}\" se debe haber declarado para el tipo de elemento \"{0}\".
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = El atributo \"{0}\" con el valor \"{1}\" debe tener un valor de la lista \"{2}\".
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = El valor \"{1}\" del atributo \"{0}\" no se debe cambiar mediante la normalizaci\u00F3n (a \"{2}\") en un documento aut\u00F3nomo.
-- MSG_CONTENT_INCOMPLETE = El contenido del tipo de elemento \"{0}\" es incompleto, debe coincidir con \"{1}\".
-- MSG_CONTENT_INVALID = El contenido del tipo de elemento \"{0}\" debe coincidir con \"{1}\".
-- MSG_CONTENT_INVALID_SPECIFIED = El contenido del tipo de elemento \"{0}\" debe coincidir con \"{1}\". Los secundarios del tipo \"{2}\" no est\u00E1n permitidos.
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = El atributo \"{1}\" para el tipo de elemento \"{0}\" tiene un valor por defecto y debe especificarse en un documento aut\u00F3nomo.
-- MSG_DUPLICATE_ATTDEF = El atributo \"{1}\" ya se ha declarado para el tipo de elemento \"{0}\".
-- MSG_ELEMENT_ALREADY_DECLARED = El tipo de elemento \"{0}\" no debe declararse m\u00E1s de una vez.
-- MSG_ELEMENT_NOT_DECLARED = El tipo de elemento \"{0}\" debe declararse.
-+ DuplicateTypeInMixedContent = El tipo de elemento "{1}" ya se especific\u00F3 en el modelo de contenido de la declaraci\u00F3n de elementos "{0}".
-+ ENTITIESInvalid = El valor de atributo "{1}" del tipo ENTITIES debe ser el nombre de una o m\u00E1s entidades no analizadas.
-+ ENTITYInvalid = El valor de atributo "{1}" del tipo ENTITY debe ser el nombre de una entidad no analizada.
-+ IDDefaultTypeInvalid = El atributo de identificador "{0}" debe tener un valor por defecto declarado de "#IMPLIED" o "#REQUIRED".
-+ IDInvalid = El valor de atributo "{0}" del tipo ID debe ser un nombre.
-+ IDInvalidWithNamespaces = El valor de atributo "{0}" del tipo ID debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
-+ IDNotUnique = El valor de atributo "{0}" del tipo ID debe ser \u00FAnico en el documento.
-+ IDREFInvalid = El valor de atributo "{0}" del tipo IDREF debe ser un nombre.
-+ IDREFInvalidWithNamespaces = El valor de atributo "{0}" del tipo IDREF debe ser un NCName cuando los espacios de nombres est\u00E9n activados.
-+ IDREFSInvalid = El valor de atributo "{0}" del tipo IDREFS debe ser uno o m\u00E1s nombres.
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir declaraciones correctamente anidadas cuando la referencia de entidad se utiliza como una declaraci\u00F3n completa.
-+ ImproperDeclarationNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir declaraciones correctamente anidadas.
-+ ImproperGroupNesting = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir pares de par\u00E9ntesis correctamente anidados.
-+ INVALID_PE_IN_CONDITIONAL = El texto de sustituci\u00F3n de la entidad del par\u00E1metro "{0}" debe incluir la secci\u00F3n condicional completa o s\u00F3lo INCLUDE o IGNORE.
-+ MSG_ATTRIBUTE_NOT_DECLARED = El atributo "{1}" se debe haber declarado para el tipo de elemento "{0}".
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = El atributo "{0}" con el valor "{1}" debe tener un valor de la lista "{2}".
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = El valor "{1}" del atributo "{0}" no se debe cambiar mediante la normalizaci\u00F3n (a "{2}") en un documento aut\u00F3nomo.
-+ MSG_CONTENT_INCOMPLETE = El contenido del tipo de elemento "{0}" es incompleto, debe coincidir con "{1}".
-+ MSG_CONTENT_INVALID = El contenido del tipo de elemento "{0}" debe coincidir con "{1}".
-+ MSG_CONTENT_INVALID_SPECIFIED = El contenido del tipo de elemento "{0}" debe coincidir con "{1}". Los secundarios del tipo "{2}" no est\u00E1n permitidos.
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = El atributo "{1}" para el tipo de elemento "{0}" tiene un valor por defecto y debe especificarse en un documento aut\u00F3nomo.
-+ MSG_DUPLICATE_ATTDEF = El atributo "{1}" ya se ha declarado para el tipo de elemento "{0}".
-+ MSG_ELEMENT_ALREADY_DECLARED = El tipo de elemento "{0}" no debe declararse m\u00E1s de una vez.
-+ MSG_ELEMENT_NOT_DECLARED = El tipo de elemento "{0}" debe declararse.
- MSG_GRAMMAR_NOT_FOUND = El documento no es v\u00E1lido: no se ha encontrado la gram\u00E1tica.
-- MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con el identificador \"{0}\" debe aparecer en el documento.
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La referencia a la entidad externa \"{0}\" no est\u00E1 permitida en un documento aut\u00F3nomo.
-- MSG_FIXED_ATTVALUE_INVALID = El atributo \"{1}\" con el valor \"{2}\" debe tener un valor de \"{3}\".
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = El tipo de elemento \"{0}\" ya tiene un atributo \"{1}\" del tipo ID, un segundo atributo \"{2}\" del tipo ID no est\u00E1 permitido.
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = El tipo de elemento \"{0}\" ya tiene un atributo \"{1}\" del tipo NOTATION, un segundo atributo \"{2}\" del tipo NOTATION no est\u00E1 permitido.
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notaci\u00F3n \"{1}\" debe declararse cuando se hace referencia a la misma en la lista de tipos de notaci\u00F3n para el atributo \"{0}\".
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notaci\u00F3n \"{1}\" debe declararse cuando se hace referencia a la misma en la declaraci\u00F3n de entidad no analizada para \"{0}\".
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La referencia a la entidad \"{0}\" declarada en una entidad analizada externa no est\u00E1 permitida en un documento aut\u00F3nomo.
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = El atributo \"{1}\" es necesario y debe especificarse para el tipo de elemento \"{0}\".
-+ MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con el identificador "{0}" debe aparecer en el documento.
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La referencia a la entidad externa "{0}" no est\u00E1 permitida en un documento aut\u00F3nomo.
-+ MSG_FIXED_ATTVALUE_INVALID = El atributo "{1}" con el valor "{2}" debe tener un valor de "{3}".
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = El tipo de elemento "{0}" ya tiene un atributo "{1}" del tipo ID, un segundo atributo "{2}" del tipo ID no est\u00E1 permitido.
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = El tipo de elemento "{0}" ya tiene un atributo "{1}" del tipo NOTATION, un segundo atributo "{2}" del tipo NOTATION no est\u00E1 permitido.
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notaci\u00F3n "{1}" debe declararse cuando se hace referencia a la misma en la lista de tipos de notaci\u00F3n para el atributo "{0}".
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notaci\u00F3n "{1}" debe declararse cuando se hace referencia a la misma en la declaraci\u00F3n de entidad no analizada para "{0}".
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La referencia a la entidad "{0}" declarada en una entidad analizada externa no est\u00E1 permitida en un documento aut\u00F3nomo.
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = El atributo "{1}" es necesario y debe especificarse para el tipo de elemento "{0}".
- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = No debe incluirse un espacio en blanco entre los elementos declarados en una entidad analizada externa con el contenido del elemento en un documento aut\u00F3nomo.
-- NMTOKENInvalid = El valor de atributo \"{0}\" del tipo NMTOKEN debe ser un elemento de nombre.
-- NMTOKENSInvalid = El valor de atributo \"{0}\" del tipo NMTOKENS debe ser uno o m\u00E1s elementos de nombre.
-- NoNotationOnEmptyElement = El tipo de elemento \"{0}\" que se declar\u00F3 como EMPTY no puede declarar el atributo \"{1}\" del tipo NOTATION.
-- RootElementTypeMustMatchDoctypedecl = El elemento ra\u00EDz del documento \"{1}\", debe coincidir con la ra\u00EDz DOCTYPE \"{0}\".
-- UndeclaredElementInContentSpec = El modelo de contenido del elemento \"{0}\" hace referencia al elemento no declarado \"{1}\".
-- UniqueNotationName = La declaraci\u00F3n de la notaci\u00F3n \"{0}\" no es \u00FAnica. Un nombre determinado no debe declararse en m\u00E1s de una declaraci\u00F3n de notaci\u00F3n.
-+ NMTOKENInvalid = El valor de atributo "{0}" del tipo NMTOKEN debe ser un token de nombre.
-+ NMTOKENSInvalid = El valor de atributo "{0}" del tipo NMTOKENS debe ser uno o m\u00E1s tokens de nombre.
-+ NoNotationOnEmptyElement = El tipo de elemento "{0}" que se declar\u00F3 como EMPTY no puede declarar el atributo "{1}" del tipo NOTATION.
-+ RootElementTypeMustMatchDoctypedecl = El elemento ra\u00EDz del documento "{1}", debe coincidir con la ra\u00EDz DOCTYPE "{0}".
-+ UndeclaredElementInContentSpec = El modelo de contenido del elemento "{0}" hace referencia al elemento no declarado "{1}".
-+ UniqueNotationName = La declaraci\u00F3n de la notaci\u00F3n "{0}" no es \u00FAnica. Un nombre determinado no debe declararse en m\u00E1s de una declaraci\u00F3n de notaci\u00F3n.
- ENTITYFailedInitializeGrammar = Fallo del validador ENTITYDatatype. Es necesario llamar al m\u00E9todo de inicializaci\u00F3n con una referencia de gram\u00E1tica v\u00E1lida. \t
-- ENTITYNotUnparsed = ENTITY \"{0}\"no est\u00E1 sin analizar.
-- ENTITYNotValid = ENTITY \"{0}\" no es v\u00E1lida.
-+ ENTITYNotUnparsed = ENTITY "{0}"no est\u00E1 sin analizar.
-+ ENTITYNotValid = ENTITY "{0}" no es v\u00E1lida.
- EmptyList = El valor de tipo ENTITIES, IDREFS y NMTOKENS no puede ser una lista vac\u00EDa.
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = La referencia de entidad externa \"&{0};\" no est\u00E1 permitida en un valor de atributo.
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = La referencia de entidad externa "&{0};" no est\u00E1 permitida en un valor de atributo.
-+ AccessExternalDTD = DTD externa: fallo al leer DTD externa ''{0}'' porque el acceso a ''{1}'' no est\u00E1 permitido debido a una restricci\u00F3n que ha definido la propiedad accessExternalDTD.
-+ AccessExternalEntity = Entidad externa: fallo al leer el documento externo ''{0}'' porque el acceso a ''{1}'' no est\u00E1 permitido debido a una restricci\u00F3n que ha definido la propiedad accessExternalDTD.
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = Se hizo referencia a la entidad \"{0}\", pero no se declar\u00F3.
-- ReferenceToUnparsedEntity = La referencia de entidad no analizada \"&{0};\" no est\u00E1 permitida.
-- RecursiveReference = Referencia de entidad recursiva \"{0}\". (Ruta de acceso de referencia: {1}),
-- RecursiveGeneralReference = Referencia de entidad general recursiva \"&{0};\". (Ruta de acceso de referencia: {1}),
-- RecursivePEReference = Referencia de entidad de par\u00E1metro recursiva \"%{0};\". (Ruta de acceso de referencia: {1}),
-+ EntityNotDeclared = Se hizo referencia a la entidad "{0}", pero no se declar\u00F3.
-+ ReferenceToUnparsedEntity = La referencia de entidad no analizada "&{0};" no est\u00E1 permitida.
-+ RecursiveReference = Referencia de entidad recursiva "{0}". (Ruta de acceso de referencia: {1}),
-+ RecursiveGeneralReference = Referencia de entidad general recursiva "&{0};". (Ruta de acceso de referencia: {1}),
-+ RecursivePEReference = Referencia de entidad de par\u00E1metro recursiva "%{0};". (Ruta de acceso de referencia: {1}),
- # 4.3.3 Character Encoding in Entities
-- EncodingNotSupported = La codificaci\u00F3n \"{0}\" no est\u00E1 soportada.
-+ EncodingNotSupported = La codificaci\u00F3n "{0}" no est\u00E1 soportada.
- EncodingRequired = Una entidad analizada no codificada en UTF-8 o UTF-16 debe contener una declaraci\u00F3n de codificaci\u00F3n.
-
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = El elemento o el atributo no coinciden con la producci\u00F3n del QName: QName::=(NCName':')?NCName.
-- ElementXMLNSPrefix = El elemento \"{0}\" no puede tener \"xmlns\" como prefijo.
-- ElementPrefixUnbound = El prefijo \"{0}\" para el elemento \"{1}\" no est\u00E1 enlazado.
-- AttributePrefixUnbound = El prefijo \"{2}\" para el atributo \"{1}\" asociado a un tipo de elemento \"{0}\" no est\u00E1 enlazado.
-- EmptyPrefixedAttName = El valor del atributo \"{0}\" no es v\u00E1lido. Los enlaces de espacio de nombres utilizados de prefijo no pueden estar vac\u00EDos.
-- PrefixDeclared = El prefijo de espacio de nombres \"{0}\" no se ha declarado.
-+ ElementXMLNSPrefix = El elemento "{0}" no puede tener "xmlns" como prefijo.
-+ ElementPrefixUnbound = El prefijo "{0}" para el elemento "{1}" no est\u00E1 enlazado.
-+ AttributePrefixUnbound = El prefijo "{2}" para el atributo "{1}" asociado a un tipo de elemento "{0}" no est\u00E1 enlazado.
-+ EmptyPrefixedAttName = El valor del atributo "{0}" no es v\u00E1lido. Los enlaces de espacio de nombres utilizados de prefijo no pueden estar vac\u00EDos.
-+ PrefixDeclared = El prefijo de espacio de nombres "{0}" no se ha declarado.
- CantBindXMLNS = El prefijo "xmlns" no puede enlazarse a ning\u00FAn espacio de nombres expl\u00EDcitamente; tampoco puede enlazarse el espacio de nombres para "xmlns" a cualquier prefijo expl\u00EDcitamente.
- CantBindXML = El prefijo "xml" no puede enlazarse a ning\u00FAn espacio de nombres que no sea el habitual; tampoco puede enlazarse el espacio de nombres para "xml" a cualquier prefijo que no sea "xml".
-- MSG_ATT_DEFAULT_INVALID = El valor por defecto \"{1}\" del atributo \"{0}\" no es legal para las restricciones l\u00E9xicas de este tipo de atributo.
-+ MSG_ATT_DEFAULT_INVALID = El valor por defecto "{1}" del atributo "{0}" no es legal para las restricciones l\u00E9xicas de este tipo de atributo.
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=El analizador ha encontrado m\u00E1s de \"{0}\"ampliaciones de entidad en este documento; \u00E9ste es el l\u00EDmite impuesto por la aplicaci\u00F3n.
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: el analizador ha encontrado m\u00E1s de "{0}"ampliaciones de entidad en este documento; \u00E9ste es el l\u00EDmite impuesto por el JDK.
-+ ElementAttributeLimit=JAXP00010002: el elemento "{0}" tiene m\u00E1s de "{1}" atributos, "{1}" es el l\u00EDmite impuesto por el JDK.
-+ MaxEntitySizeLimit=JAXP00010003: la longitud de la entidad "{0}" es "{1}", que excede el l\u00EDmite de "{2}" que ha definido "{3}".
-+ TotalEntitySizeLimit=JAXP00010004: el tama\u00F1o acumulado "{0}" de las entidades ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
-+ MaxXMLNameLimit=JAXP00010005: el nombre "{0}" ha excedido el l\u00EDmite de "{1}" que ha definido "{2}".
-+ MaxElementDepthLimit=JAXP00010006: El elemento "{0}" tiene una profundidad de "{1}" que excede el l\u00EDmite "{2}" definido por "{3}".
-
--# 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 2014-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le prologue du document.
- InvalidCharInXMLDecl = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la d\u00E9claration XML.
- # 2.4 Character Data and Markup
-- CDEndInContent = La s\u00E9quence de caract\u00E8res \"]]>\" ne doit pas figurer dans le contenu sauf si elle est utilis\u00E9e pour baliser la fin d'une section CDATA.
-+ CDEndInContent = La s\u00E9quence de caract\u00E8res "]]>" ne doit pas figurer dans le contenu sauf si elle est utilis\u00E9e pour baliser la fin d'une section CDATA.
- # 2.7 CDATA Sections
-- CDSectUnterminated = La section CDATA doit se terminer par \"]]>\".
-+ CDSectUnterminated = La section CDATA doit se terminer par "]]>".
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = La d\u00E9claration XML ne peut figurer qu'au d\u00E9but du document.
-- EqRequiredInXMLDecl = Le caract\u00E8re ''='' doit suivre \"{0}\" dans la d\u00E9claration XML.
-- QuoteRequiredInXMLDecl = La valeur suivant \"{0}\" dans la d\u00E9claration XML doit \u00EAtre une cha\u00EEne entre guillemets.
-- XMLDeclUnterminated = La d\u00E9claration XML doit se terminer par \"?>\".
-+ EqRequiredInXMLDecl = Le caract\u00E8re ''='' doit suivre "{0}" dans la d\u00E9claration XML.
-+ QuoteRequiredInXMLDecl = La valeur suivant "{0}" dans la d\u00E9claration XML doit \u00EAtre une cha\u00EEne entre guillemets.
-+ XMLDeclUnterminated = La d\u00E9claration XML doit se terminer par "?>".
- VersionInfoRequired = La version est obligatoire dans la d\u00E9claration XML.
- SpaceRequiredBeforeVersionInXMLDecl = Un espace est obligatoire devant le pseudo-attribut version dans la d\u00E9claration XML.
- SpaceRequiredBeforeEncodingInXMLDecl = Un espace est obligatoire devant le pseudo-attribut encoding dans la d\u00E9claration XML.
-@@ -71,70 +43,71 @@
- ReferenceIllegalInTrailingMisc=R\u00E9f\u00E9rence non autoris\u00E9e dans la section de fin.
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = La valeur de d\u00E9claration de document autonome doit \u00EAtre \"oui\" ou \"non\", mais pas \"{0}\".
-+ SDDeclInvalid = La valeur de d\u00E9claration de document autonome doit \u00EAtre "oui" ou "non", mais pas "{0}".
-+ SDDeclNameInvalid = Le nom de document autonome contenu dans la d\u00E9claration XML est peut-\u00EAtre mal orthographi\u00E9.
- # 2.12 Language Identification
-- XMLLangInvalid = La valeur d''attribut xml:lang \"{0}\" est un identificateur de langue non valide.
-+ XMLLangInvalid = La valeur d''attribut xml:lang "{0}" est un identificateur de langue non valide.
- # 3. Logical Structures
-- ETagRequired = Le type d''\u00E9l\u00E9ment \"{0}\" doit se terminer par la balise de fin correspondante \"</{0}>\".
-+ ETagRequired = Le type d''\u00E9l\u00E9ment "{0}" doit se terminer par la balise de fin correspondante "</{0}>".
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = Le type d''\u00E9l\u00E9ment \"{0}\" doit \u00EAtre suivi des sp\u00E9cifications d''attribut, \">\" ou \"/>\".
-- EqRequiredInAttribute = Le nom d''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\" doit \u00EAtre suivi du caract\u00E8re ''=''.
-- OpenQuoteExpected = Des guillemets ouvrants sont attendus pour l''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\".
-- CloseQuoteExpected = Des guillemets fermants sont attendus pour l''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\".
-- AttributeNotUnique = L''attribut \"{1}\" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment \"{0}\".
-- AttributeNSNotUnique = L''attribut \"{1}\" li\u00E9 \u00E0 l''espace de noms \"{2}\" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment \"{0}\".
-- ETagUnterminated = La balise de fin pour le type d''\u00E9l\u00E9ment \"{0}\" doit se terminer par un d\u00E9limiteur ''>''.
-+ ElementUnterminated = Le type d''\u00E9l\u00E9ment "{0}" doit \u00EAtre suivi des sp\u00E9cifications d''attribut, ">" ou "/>".
-+ EqRequiredInAttribute = Le nom d''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}" doit \u00EAtre suivi du caract\u00E8re ''=''.
-+ OpenQuoteExpected = Des guillemets ouvrants sont attendus pour l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}".
-+ CloseQuoteExpected = Des guillemets fermants sont attendus pour l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}".
-+ AttributeNotUnique = L''attribut "{1}" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment "{0}".
-+ AttributeNSNotUnique = L''attribut "{1}" li\u00E9 \u00E0 l''espace de noms "{2}" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 pour l''\u00E9l\u00E9ment "{0}".
-+ ETagUnterminated = La balise de fin pour le type d''\u00E9l\u00E9ment "{0}" doit se terminer par un d\u00E9limiteur ''>''.
- MarkupNotRecognizedInContent = Le contenu des \u00E9l\u00E9ments doit inclure un balisage ou des caract\u00E8res au format correct.
- DoctypeIllegalInContent = Un DOCTYPE n'est pas autoris\u00E9 dans le contenu.
- # 4.1 Character and Entity References
- ReferenceUnterminated = La r\u00E9f\u00E9rence doit se terminer par un d\u00E9limiteur ';'.
- # 4.3.2 Well-Formed Parsed Entities
- ReferenceNotInOneEntity = La r\u00E9f\u00E9rence doit \u00EAtre enti\u00E8rement incluse dans la m\u00EAme entit\u00E9 analys\u00E9e.
-- ElementEntityMismatch = L''\u00E9l\u00E9ment \"{0}\" doit commencer et se terminer dans la m\u00EAme entit\u00E9.
-+ ElementEntityMismatch = L''\u00E9l\u00E9ment "{0}" doit commencer et se terminer dans la m\u00EAme entit\u00E9.
- MarkupEntityMismatch=Les structures de document XML doivent commencer et se terminer dans la m\u00EAme entit\u00E9.
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = Un caract\u00E8re XML non valide (Unicode : 0x{2}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la valeur de l''attribut \"{1}\" et l''\u00E9l\u00E9ment est \"{0}\".
-+ InvalidCharInAttValue = Un caract\u00E8re XML non valide (Unicode : 0x{2}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la valeur de l''attribut "{1}" et l''\u00E9l\u00E9ment est "{0}".
- InvalidCharInComment = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le commentaire.
- InvalidCharInPI = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans l''instruction de traitement.
- InvalidCharInInternalSubset = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le sous-ensemble interne de la DTD.
- InvalidCharInTextDecl = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la d\u00E9claration textuelle.
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = La valeur de l''attribut \"{1}\" doit commencer par une apostrophe ou des guillemets.
-- LessthanInAttValue = La valeur de l''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\" ne doit pas contenir le caract\u00E8re ''<''.
-- AttributeValueUnterminated = La valeur de l''attribut \"{1}\" doit se terminer par les guillemets correspondants.
-+ QuoteRequiredInAttValue = La valeur de l''attribut "{1}" doit commencer par une apostrophe ou des guillemets.
-+ LessthanInAttValue = La valeur de l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}" ne doit pas contenir le caract\u00E8re ''<''.
-+ AttributeValueUnterminated = La valeur de l''attribut "{1}" doit se terminer par les guillemets correspondants.
- # 2.5 Comments
-- InvalidCommentStart = Le commentaire doit commencer par \"<!--\".
-- DashDashInComment = La cha\u00EEne \"--\" n'est pas autoris\u00E9e dans les commentaires.
-- CommentUnterminated = Le commentaire doit se terminer par \"-->\".
-+ InvalidCommentStart = Le commentaire doit commencer par "<!--".
-+ DashDashInComment = La cha\u00EEne "--" n'est pas autoris\u00E9e dans les commentaires.
-+ CommentUnterminated = Le commentaire doit se terminer par "-->".
- COMMENT_NOT_IN_ONE_ENTITY = Le commentaire n'est pas compris dans la m\u00EAme entit\u00E9.
- # 2.6 Processing Instructions
- PITargetRequired = L'instruction de traitement doit commencer par le nom de la cible.
- SpaceRequiredInPI = Un espace est obligatoire entre les donn\u00E9es et la cible de l'instruction de traitement.
-- PIUnterminated = L'instruction de traitement doit se terminer par \"?>\".
-- ReservedPITarget = La cible de l'instruction de traitement correspondant \u00E0 \"[xX][mM][lL]\" n'est pas autoris\u00E9e.
-+ PIUnterminated = L'instruction de traitement doit se terminer par "?>".
-+ ReservedPITarget = La cible de l'instruction de traitement correspondant \u00E0 "[xX][mM][lL]" n'est pas autoris\u00E9e.
- PI_NOT_IN_ONE_ENTITY = L'instruction de traitement n'est pas comprise dans la m\u00EAme entit\u00E9.
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = Version \"{0}\" non valide.
-- VersionNotSupported = La version XML \"{0}\" n''est pas prise en charge. Seule la version XML 1.0 est prise en charge.
-- VersionNotSupported11 = La version XML \"{0}\" n''est pas prise en charge. Seules les versions XML 1.0 et XML 1.1 sont prises en charge.
-+ VersionInfoInvalid = Version "{0}" non valide.
-+ VersionNotSupported = La version XML "{0}" n''est pas prise en charge. Seule la version XML 1.0 est prise en charge.
-+ VersionNotSupported11 = La version XML "{0}" n''est pas prise en charge. Seules les versions XML 1.0 et XML 1.1 sont prises en charge.
- VersionMismatch= Une entit\u00E9 ne peut pas inclure une autre entit\u00E9 d'une version ult\u00E9rieure.
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = Une repr\u00E9sentation d\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne \"&#\" dans une r\u00E9f\u00E9rence de caract\u00E8re.
-- HexdigitRequiredInCharRef = Une repr\u00E9sentation hexad\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne \"&#x\" dans une r\u00E9f\u00E9rence de caract\u00E8re.
-+ DigitRequiredInCharRef = Une repr\u00E9sentation d\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne "&#" dans une r\u00E9f\u00E9rence de caract\u00E8re.
-+ HexdigitRequiredInCharRef = Une repr\u00E9sentation hexad\u00E9cimale doit imm\u00E9diatement suivre la cha\u00EEne "&#x" dans une r\u00E9f\u00E9rence de caract\u00E8re.
- SemicolonRequiredInCharRef = La r\u00E9f\u00E9rence de caract\u00E8re doit se terminer par le d\u00E9limiteur ';'.
-- InvalidCharRef = La r\u00E9f\u00E9rence de caract\u00E8re \"&#{0}\" est un caract\u00E8re XML non valide.
-+ InvalidCharRef = La r\u00E9f\u00E9rence de caract\u00E8re "&#{0}" est un caract\u00E8re XML non valide.
- NameRequiredInReference = Le nom de l'identit\u00E9 doit imm\u00E9diatement suivre le caract\u00E8re "&" dans la r\u00E9f\u00E9rence d'entit\u00E9.
-- SemicolonRequiredInReference = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 \"{0}\" doit se terminer par le d\u00E9limiteur '';''.
-+ SemicolonRequiredInReference = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 "{0}" doit se terminer par le d\u00E9limiteur '';''.
- # 4.3.1 The Text Declaration
- TextDeclMustBeFirst = La d\u00E9claration textuelle ne doit figurer qu'au d\u00E9but de l'entit\u00E9 analys\u00E9e externe.
-- EqRequiredInTextDecl = Le caract\u00E8re ''='' doit suivre \"{0}\" dans la d\u00E9claration textuelle.
-- QuoteRequiredInTextDecl = La valeur suivant \"{0}\" dans la d\u00E9claration textuelle doit \u00EAtre une cha\u00EEne entre guillemets.
-- CloseQuoteMissingInTextDecl = Dans la valeur suivant \"{0}\" dans la d\u00E9claration textuelle, il manque les guillemets fermants.
-+ EqRequiredInTextDecl = Le caract\u00E8re ''='' doit suivre "{0}" dans la d\u00E9claration textuelle.
-+ QuoteRequiredInTextDecl = La valeur suivant "{0}" dans la d\u00E9claration textuelle doit \u00EAtre une cha\u00EEne entre guillemets.
-+ CloseQuoteMissingInTextDecl = Dans la valeur suivant "{0}" dans la d\u00E9claration textuelle, il manque les guillemets fermants.
- SpaceRequiredBeforeVersionInTextDecl = Un espace est obligatoire devant le pseudo-attribut version dans la d\u00E9claration textuelle.
- SpaceRequiredBeforeEncodingInTextDecl = Un espace est obligatoire devant le pseudo-attribut encoding dans la d\u00E9claration textuelle.
-- TextDeclUnterminated = La d\u00E9claration textuelle doit se terminer par \"?>\".
-+ TextDeclUnterminated = La d\u00E9claration textuelle doit se terminer par "?>".
- EncodingDeclRequired = La d\u00E9claration d'encodage est obligatoire dans la d\u00E9claration textuelle.
- NoMorePseudoAttributes = Aucun autre pseudo-attribut n'est autoris\u00E9.
- MorePseudoAttributes = D'autres pseudo-attributs sont attendus.
-@@ -143,13 +116,13 @@
- CommentNotInOneEntity = Le commentaire doit \u00EAtre enti\u00E8rement inclus dans la m\u00EAme entit\u00E9 analys\u00E9e.
- PINotInOneEntity = L'instruction de traitement doit \u00EAtre enti\u00E8rement incluse dans la m\u00EAme entit\u00E9 analys\u00E9e.
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = Nom d''encodage \"{0}\" non valide.
-- EncodingByteOrderUnsupported = L''ordre des octets donn\u00E9 pour encoder \"{0}\" n''est pas pris en charge.
-+ EncodingDeclInvalid = Nom d''encodage "{0}" non valide.
-+ EncodingByteOrderUnsupported = L''ordre des octets donn\u00E9 pour encoder "{0}" n''est pas pris en charge.
- InvalidByte = Octet {0} de la s\u00E9quence UTF-8 \u00E0 {1} octets non valide.
- ExpectedByte = Octet {0} de la s\u00E9quence UTF-8 \u00E0 {1} octets attendu.
- InvalidHighSurrogate = Les bits de substitution sup\u00E9rieurs (High surrogate) dans la s\u00E9quence UTF-8 ne doivent pas d\u00E9passer 0x10 mais des bits 0x{0} ont \u00E9t\u00E9 d\u00E9tect\u00E9s.
-- OperationNotSupported = Op\u00E9ration \"{0}\" non prise en charge par le lecteur {1}.
-- InvalidASCII = L''octet \"{0}\" n''appartient pas au jeu de caract\u00E8res ASCII (7 bits).
-+ OperationNotSupported = Op\u00E9ration "{0}" non prise en charge par le lecteur {1}.
-+ InvalidASCII = L''octet "{0}" n''appartient pas au jeu de caract\u00E8res ASCII (7 bits).
- CharConversionFailure = Une entit\u00E9 respectant un certain encodage ne doit pas contenir de s\u00E9quences non admises dans cet encodage.
-
- # DTD Messages
-@@ -169,150 +142,150 @@
- PubidCharIllegal = Ce caract\u00E8re (Unicode : 0x{0}) n''est pas autoris\u00E9 dans l''identificateur public.
- SpaceRequiredBetweenPublicAndSystem = Des espaces sont obligatoires entre les ID publicId et systemId.
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Un espace est obligatoire apr\u00E8s \"<!DOCTYPE\" dans la d\u00E9claration de type de document.
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = Le type d'\u00E9l\u00E9ment racine doit figurer apr\u00E8s \"<!DOCTYPE\" dans la d\u00E9claration de type de document.
-- DoctypedeclUnterminated = La d\u00E9claration de type de document pour le type d''\u00E9l\u00E9ment racine \"{0}\" doit se terminer par ''>''.
-- PEReferenceWithinMarkup = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre \"%{0};\" ne peut pas survenir dans le balisage du sous-ensemble interne de la DTD.
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Un espace est obligatoire apr\u00E8s "<!DOCTYPE" dans la d\u00E9claration de type de document.
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = Le type d'\u00E9l\u00E9ment racine doit figurer apr\u00E8s "<!DOCTYPE" dans la d\u00E9claration de type de document.
-+ DoctypedeclUnterminated = La d\u00E9claration de type de document pour le type d''\u00E9l\u00E9ment racine "{0}" doit se terminer par ''>''.
-+ PEReferenceWithinMarkup = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre "%{0};" ne peut pas survenir dans le balisage du sous-ensemble interne de la DTD.
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Les d\u00E9clarations de balisage contenues dans la d\u00E9claration de type de document ou sur lesquelles pointe cette derni\u00E8re doivent avoir un format correct.
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = La d\u00E9claration d'attribut pour \"xml:space\" doit \u00EAtre pr\u00E9sent\u00E9e comme type \u00E9num\u00E9r\u00E9 dont les seules valeurs possibles sont \"default\" et \"preserve\".
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = La d\u00E9claration d'attribut pour "xml:space" doit \u00EAtre pr\u00E9sent\u00E9e comme type \u00E9num\u00E9r\u00E9 dont les seules valeurs possibles sont "default" et "preserve".
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s \"<!ELEMENT\" dans la d\u00E9claration de type d'\u00E9l\u00E9ment.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s "<!ELEMENT" dans la d\u00E9claration de type d'\u00E9l\u00E9ment.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Le type d'\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration de type d'\u00E9l\u00E9ment.
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment \"{0}\" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = La contrainte est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment \"{0}\" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
-- ElementDeclUnterminated = La d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\" doit se terminer par ''>''.
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Un espace est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment "{0}" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = La contrainte est obligatoire apr\u00E8s le type d''\u00E9l\u00E9ment "{0}" dans la d\u00E9claration de type d''\u00E9l\u00E9ment.
-+ ElementDeclUnterminated = La d\u00E9claration du type d''\u00E9l\u00E9ment "{0}" doit se terminer par ''>''.
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un caract\u00E8re ''('' ou un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\".
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un caract\u00E8re ''('' ou un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment \"{0}\".
-- MixedContentUnterminated = Le mod\u00E8le de contenu mixte \"{0}\" doit se terminer par \")*\" lorsque les types d''\u00E9l\u00E9ment enfant sont contraints.
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un type d''\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un caract\u00E8re '')'' est obligatoire dans la d\u00E9claration du type d''\u00E9l\u00E9ment "{0}".
-+ MixedContentUnterminated = Le mod\u00E8le de contenu mixte "{0}" doit se terminer par ")*" lorsque les types d''\u00E9l\u00E9ment enfant sont contraints.
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Un espace est obligatoire apr\u00E8s \"<!ATTLIST\" dans la d\u00E9claration de liste d'attributs.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Un espace est obligatoire apr\u00E8s "<!ATTLIST" dans la d\u00E9claration de liste d'attributs.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Le type d'\u00E9l\u00E9ment est obligatoire dans la d\u00E9claration de liste d'attributs.
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Un espace est obligatoire avant le nom d''attribut dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment \"{0}\".
-- AttNameRequiredInAttDef = Le nom d''attribut doit \u00EAtre sp\u00E9cifi\u00E9 dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Un espace est obligatoire avant le type d''attribut dans la d\u00E9claration de l''attribut \"{1}\" de l''\u00E9l\u00E9ment \"{0}\".
-- AttTypeRequiredInAttDef = Le type d''attribut est obligatoire dans la d\u00E9claration de l''attribut \"{1}\" de l''\u00E9l\u00E9ment \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Un espace est obligatoire avant la valeur par d\u00E9faut de l''attribut dans la d\u00E9claration de l''attribut \"{1}\" de l''\u00E9l\u00E9ment \"{0}\".
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Plusieurs d\u00E9finitions d''attribut sont fournies pour le m\u00EAme attribut \"{1}\" d''un \u00E9l\u00E9ment donn\u00E9 \"{0}\".
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Un espace est obligatoire avant le nom d''attribut dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment "{0}".
-+ AttNameRequiredInAttDef = Le nom d''attribut doit \u00EAtre sp\u00E9cifi\u00E9 dans la d\u00E9claration de liste d''attributs de l''\u00E9l\u00E9ment "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Un espace est obligatoire avant le type d''attribut dans la d\u00E9claration de l''attribut "{1}" de l''\u00E9l\u00E9ment "{0}".
-+ AttTypeRequiredInAttDef = Le type d''attribut est obligatoire dans la d\u00E9claration de l''attribut "{1}" de l''\u00E9l\u00E9ment "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Un espace est obligatoire avant la valeur par d\u00E9faut de l''attribut dans la d\u00E9claration de l''attribut "{1}" de l''\u00E9l\u00E9ment "{0}".
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Plusieurs d\u00E9finitions d''attribut sont fournies pour le m\u00EAme attribut "{1}" d''un \u00E9l\u00E9ment donn\u00E9 "{0}".
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Un espace doit figurer apr\u00E8s \"NOTATION\" dans la d\u00E9claration d''attribut \"{1}\".
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Le caract\u00E8re ''('' doit suivre \"NOTATION\" dans la d\u00E9claration d''attribut \"{1}\".
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Le nom de notation est obligatoire dans la liste des types de notation de la d\u00E9claration d''attribut \"{1}\".
-- NotationTypeUnterminated = La liste des types de notation doit se terminer par '')'' dans la d\u00E9claration d''attribut \"{1}\".
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Le jeton de nom est obligatoire dans la liste des types \u00E9num\u00E9r\u00E9s pour la d\u00E9claration d''attribut \"{1}\".
-- EnumerationUnterminated = La liste des types \u00E9num\u00E9r\u00E9s doit se terminer par '')'' dans la d\u00E9claration d''attribut \"{1}\".
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration \"{1}\" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut \"{2}\" pour l''\u00E9l\u00E9ment \"{0}\". Les valeurs NMTOKENS d''une d\u00E9claration d''attribut Enumeration unique doivent toutes \u00EAtre distinctes.
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration \"{1}\" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut \"{2}\" pour l''\u00E9l\u00E9ment \"{0}\". Les noms NOTATION d''une d\u00E9claration d''attribut NotationType unique doivent tous \u00EAtre distincts.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Un espace doit figurer apr\u00E8s "NOTATION" dans la d\u00E9claration d''attribut "{1}".
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Le caract\u00E8re ''('' doit suivre "NOTATION" dans la d\u00E9claration d''attribut "{1}".
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Le nom de notation est obligatoire dans la liste des types de notation de la d\u00E9claration d''attribut "{1}".
-+ NotationTypeUnterminated = La liste des types de notation doit se terminer par '')'' dans la d\u00E9claration d''attribut "{1}".
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Le jeton de nom est obligatoire dans la liste des types \u00E9num\u00E9r\u00E9s pour la d\u00E9claration d''attribut "{1}".
-+ EnumerationUnterminated = La liste des types \u00E9num\u00E9r\u00E9s doit se terminer par '')'' dans la d\u00E9claration d''attribut "{1}".
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration "{1}" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut "{2}" pour l''\u00E9l\u00E9ment "{0}". Les valeurs NMTOKENS d''une d\u00E9claration d''attribut Enumeration unique doivent toutes \u00EAtre distinctes.
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = La valeur d''\u00E9num\u00E9ration "{1}" a \u00E9t\u00E9 indiqu\u00E9e plusieurs fois dans la d\u00E9claration de l''attribut "{2}" pour l''\u00E9l\u00E9ment "{0}". Les noms NOTATION d''une d\u00E9claration d''attribut NotationType unique doivent tous \u00EAtre distincts.
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Un espace doit figurer apr\u00E8s \"FIXED\" dans la d\u00E9claration d''attribut \"{1}\".
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Un espace doit figurer apr\u00E8s "FIXED" dans la d\u00E9claration d''attribut "{1}".
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = La section conditionnelle incluse doit se terminer par \"]]>\".
-- IgnoreSectUnterminated = La section conditionnelle exclue doit se terminer par \"]]>\".
-+ IncludeSectUnterminated = La section conditionnelle incluse doit se terminer par "]]>".
-+ IgnoreSectUnterminated = La section conditionnelle exclue doit se terminer par "]]>".
- # 4.1 Character and Entity References
- NameRequiredInPEReference = Le nom de l'entit\u00E9 doit imm\u00E9diatement suivre le caract\u00E8re "%" dans la r\u00E9f\u00E9rence d'entit\u00E9 de param\u00E8tre.
-- SemicolonRequiredInPEReference = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre \"%{0};\" doit se terminer par le d\u00E9limiteur '';''.
-+ SemicolonRequiredInPEReference = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre "%{0};" doit se terminer par le d\u00E9limiteur '';''.
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire apr\u00E8s \"<!ENTITY\" dans la d\u00E9claration d'entit\u00E9.
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Un espace est obligatoire entre \"<!ENTITY\" et le caract\u00E8re "%" dans la d\u00E9claration d'entit\u00E9 de param\u00E8tre.
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire apr\u00E8s "<!ENTITY" dans la d\u00E9claration d'entit\u00E9.
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Un espace est obligatoire entre "<!ENTITY" et le caract\u00E8re "%" dans la d\u00E9claration d'entit\u00E9 de param\u00E8tre.
- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Un espace est obligatoire entre "%" et le nom de l'entit\u00E9 dans la d\u00E9claration d'entit\u00E9 de param\u00E8tre.
- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Le nom de l'entit\u00E9 est obligatoire dans la d\u00E9claration d'entit\u00E9.
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire entre le nom de l''entit\u00E9 \"{0}\" et la d\u00E9finition dans la d\u00E9claration d''entit\u00E9.
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire entre \"NDATA\" et le nom de notation dans la d\u00E9claration de l''entit\u00E9 \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire avant \"NDATA\" dans la d\u00E9claration de l''entit\u00E9 \"{0}\".
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Le nom de notation est obligatoire apr\u00E8s \"NDATA\" dans la d\u00E9claration de l''entit\u00E9 \"{0}\".
-- EntityDeclUnterminated = La d\u00E9claration de l''entit\u00E9 \"{0}\" doit se terminer par ''>''.
-- MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E9 \"{0}\" est d\u00E9clar\u00E9e plusieurs fois.
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Un espace est obligatoire entre le nom de l''entit\u00E9 "{0}" et la d\u00E9finition dans la d\u00E9claration d''entit\u00E9.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire entre "NDATA" et le nom de notation dans la d\u00E9claration de l''entit\u00E9 "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Un espace est obligatoire avant "NDATA" dans la d\u00E9claration de l''entit\u00E9 "{0}".
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Le nom de notation est obligatoire apr\u00E8s "NDATA" dans la d\u00E9claration de l''entit\u00E9 "{0}".
-+ EntityDeclUnterminated = La d\u00E9claration de l''entit\u00E9 "{0}" doit se terminer par ''>''.
-+ MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E9 "{0}" est d\u00E9clar\u00E9e plusieurs fois.
- # 4.2.2 External Entities
-- ExternalIDRequired = La d\u00E9claration d'entit\u00E9 externe doit commencer par \"SYSTEM\" ou \"PUBLIC\".
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Un espace est obligatoire entre \"PUBLIC\" et l'identificateur public.
-+ ExternalIDRequired = La d\u00E9claration d'entit\u00E9 externe doit commencer par "SYSTEM" ou "PUBLIC".
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Un espace est obligatoire entre "PUBLIC" et l'identificateur public.
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Un espace est obligatoire entre l'identificateur public et l'identificateur syst\u00E8me.
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Un espace est obligatoire entre \"SYSTEM\" et l'identificateur syst\u00E8me.
-- MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificateur du fragment ne doit pas \u00EAtre sp\u00E9cifi\u00E9 comme faisant partie de l''identificateur syst\u00E8me \"{0}\".
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Un espace est obligatoire entre "SYSTEM" et l'identificateur syst\u00E8me.
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificateur du fragment ne doit pas \u00EAtre sp\u00E9cifi\u00E9 comme faisant partie de l''identificateur syst\u00E8me "{0}".
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s \"<!NOTATION\" dans la d\u00E9claration de notation.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s "<!NOTATION" dans la d\u00E9claration de notation.
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Le nom de la notation est obligatoire dans la d\u00E9claration de notation.
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s le nom de notation \"{0}\" dans la d\u00E9claration de notation.
-- ExternalIDorPublicIDRequired = La d\u00E9claration de la notation \"{0}\" doit inclure un identificateur syst\u00E8me ou public.
-- NotationDeclUnterminated = La d\u00E9claration de la notation \"{0}\" doit se terminer par ''>''.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Un espace est obligatoire apr\u00E8s le nom de notation "{0}" dans la d\u00E9claration de notation.
-+ ExternalIDorPublicIDRequired = La d\u00E9claration de la notation "{0}" doit inclure un identificateur syst\u00E8me ou public.
-+ NotationDeclUnterminated = La d\u00E9claration de la notation "{0}" doit se terminer par ''>''.
-
- # Validation messages
-- DuplicateTypeInMixedContent = Le type d''\u00E9l\u00E9ment \"{1}\" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 dans le mod\u00E8le de contenu de la d\u00E9claration d''\u00E9l\u00E9ment \"{0}\".
-- ENTITIESInvalid = La valeur d''attribut \"{1}\" de type ENTITIES doit correspondre au nom d''au moins une entit\u00E9 non analys\u00E9e.
-- ENTITYInvalid = La valeur d''attribut \"{1}\" de type ENTITY doit correspondre au nom d''une entit\u00E9 non analys\u00E9e.
-- IDDefaultTypeInvalid = L''attribut d''ID \"{0}\" doit avoir une valeur par d\u00E9faut d\u00E9clar\u00E9e de \"#IMPLIED\" ou \"#REQUIRED\".
-- IDInvalid = La valeur d''attribut \"{0}\" de type ID doit \u00EAtre un nom.
-- IDInvalidWithNamespaces = La valeur d''attribut \"{0}\" de type ID doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
-- IDNotUnique = La valeur d''attribut \"{0}\" de type ID doit \u00EAtre unique dans le document.
-- IDREFInvalid = La valeur d''attribut \"{0}\" de type IDREF doit \u00EAtre un nom.
-- IDREFInvalidWithNamespaces = La valeur d''attribut \"{0}\" de type IDREF doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
-- IDREFSInvalid = Une valeur d''attribut \"{0}\" de type IDREFS doit correspondre \u00E0 au moins un nom.
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre \"{0}\" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es lorsque la r\u00E9f\u00E9rence d''entit\u00E9 est utilis\u00E9e comme d\u00E9claration compl\u00E8te.
-- ImproperDeclarationNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre \"{0}\" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es.
-- ImproperGroupNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre \"{0}\" doit inclure des paires de parenth\u00E8ses correctement imbriqu\u00E9es.
-- INVALID_PE_IN_CONDITIONAL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre \"{0}\" doit inclure la section conditionnelle compl\u00E8te ou seulement INCLUDE ou IGNORE.
-- MSG_ATTRIBUTE_NOT_DECLARED = L''attribut \"{1}\" doit \u00EAtre d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment \"{0}\".
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attribut \"{0}\" de valeur \"{1}\" doit avoir une valeur issue de la liste \"{2}\".
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = La valeur \"{1}\" de l''attribut \"{0}\" ne doit pas \u00EAtre modifi\u00E9e par normalisation (et devenir \"{2}\") dans un document autonome.
-- MSG_CONTENT_INCOMPLETE = Le contenu du type d''\u00E9l\u00E9ment \"{0}\" est incomplet. Il doit correspondre \u00E0 \"{1}\".
-- MSG_CONTENT_INVALID = Le contenu du type d''\u00E9l\u00E9ment \"{0}\" doit correspondre \u00E0 \"{1}\".
-- MSG_CONTENT_INVALID_SPECIFIED = Le contenu du type d''\u00E9l\u00E9ment \"{0}\" doit correspondre \u00E0 \"{1}\". Les enfants de type \"{2}\" ne sont pas autoris\u00E9s.
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attribut \"{1}\" du type d''\u00E9l\u00E9ment \"{0}\" a une valeur par d\u00E9faut et doit \u00EAtre sp\u00E9cifi\u00E9 dans un document autonome.
-- MSG_DUPLICATE_ATTDEF = L''attribut \"{1}\" est d\u00E9j\u00E0 d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment \"{0}\".
-- MSG_ELEMENT_ALREADY_DECLARED = Le type d''\u00E9l\u00E9ment \"{0}\" ne doit pas \u00EAtre d\u00E9clar\u00E9 plusieurs fois.
-- MSG_ELEMENT_NOT_DECLARED = Le type d''\u00E9l\u00E9ment \"{0}\" doit \u00EAtre d\u00E9clar\u00E9.
-+ DuplicateTypeInMixedContent = Le type d''\u00E9l\u00E9ment "{1}" a d\u00E9j\u00E0 \u00E9t\u00E9 sp\u00E9cifi\u00E9 dans le mod\u00E8le de contenu de la d\u00E9claration d''\u00E9l\u00E9ment "{0}".
-+ ENTITIESInvalid = La valeur d''attribut "{1}" de type ENTITIES doit correspondre au nom d''au moins une entit\u00E9 non analys\u00E9e.
-+ ENTITYInvalid = La valeur d''attribut "{1}" de type ENTITY doit correspondre au nom d''une entit\u00E9 non analys\u00E9e.
-+ IDDefaultTypeInvalid = L''attribut d''ID "{0}" doit avoir une valeur par d\u00E9faut d\u00E9clar\u00E9e de "#IMPLIED" ou "#REQUIRED".
-+ IDInvalid = La valeur d''attribut "{0}" de type ID doit \u00EAtre un nom.
-+ IDInvalidWithNamespaces = La valeur d''attribut "{0}" de type ID doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
-+ IDNotUnique = La valeur d''attribut "{0}" de type ID doit \u00EAtre unique dans le document.
-+ IDREFInvalid = La valeur d''attribut "{0}" de type IDREF doit \u00EAtre un nom.
-+ IDREFInvalidWithNamespaces = La valeur d''attribut "{0}" de type IDREF doit \u00EAtre un NCName lorsque les espaces de noms sont activ\u00E9s.
-+ IDREFSInvalid = Une valeur d''attribut "{0}" de type IDREFS doit correspondre \u00E0 au moins un nom.
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es lorsque la r\u00E9f\u00E9rence d''entit\u00E9 est utilis\u00E9e comme d\u00E9claration compl\u00E8te.
-+ ImproperDeclarationNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure des d\u00E9clarations correctement imbriqu\u00E9es.
-+ ImproperGroupNesting = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure des paires de parenth\u00E8ses correctement imbriqu\u00E9es.
-+ INVALID_PE_IN_CONDITIONAL = Le texte de remplacement de l''entit\u00E9 de param\u00E8tre "{0}" doit inclure la section conditionnelle compl\u00E8te ou seulement INCLUDE ou IGNORE.
-+ MSG_ATTRIBUTE_NOT_DECLARED = L''attribut "{1}" doit \u00EAtre d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment "{0}".
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attribut "{0}" de valeur "{1}" doit avoir une valeur issue de la liste "{2}".
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = La valeur "{1}" de l''attribut "{0}" ne doit pas \u00EAtre modifi\u00E9e par normalisation (et devenir "{2}") dans un document autonome.
-+ MSG_CONTENT_INCOMPLETE = Le contenu du type d''\u00E9l\u00E9ment "{0}" est incomplet. Il doit correspondre \u00E0 "{1}".
-+ MSG_CONTENT_INVALID = Le contenu du type d''\u00E9l\u00E9ment "{0}" doit correspondre \u00E0 "{1}".
-+ MSG_CONTENT_INVALID_SPECIFIED = Le contenu du type d''\u00E9l\u00E9ment "{0}" doit correspondre \u00E0 "{1}". Les enfants de type "{2}" ne sont pas autoris\u00E9s.
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attribut "{1}" du type d''\u00E9l\u00E9ment "{0}" a une valeur par d\u00E9faut et doit \u00EAtre sp\u00E9cifi\u00E9 dans un document autonome.
-+ MSG_DUPLICATE_ATTDEF = L''attribut "{1}" est d\u00E9j\u00E0 d\u00E9clar\u00E9 pour le type d''\u00E9l\u00E9ment "{0}".
-+ MSG_ELEMENT_ALREADY_DECLARED = Le type d''\u00E9l\u00E9ment "{0}" ne doit pas \u00EAtre d\u00E9clar\u00E9 plusieurs fois.
-+ MSG_ELEMENT_NOT_DECLARED = Le type d''\u00E9l\u00E9ment "{0}" doit \u00EAtre d\u00E9clar\u00E9.
- MSG_GRAMMAR_NOT_FOUND = Le document n'est pas valide : aucune grammaire d\u00E9tect\u00E9e.
-- MSG_ELEMENT_WITH_ID_REQUIRED = Un \u00E9l\u00E9ment avec l''identificateur \"{0}\" doit figurer dans le document.
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 externe \"{0}\" n''est pas autoris\u00E9e dans le document autonome.
-- MSG_FIXED_ATTVALUE_INVALID = L''attribut \"{1}\" de valeur \"{2}\" doit avoir une valeur de \"{3}\".
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Le type d''\u00E9l\u00E9ment \"{0}\" a d\u00E9j\u00E0 l''attribut \"{1}\" de type ID. Un deuxi\u00E8me attribut \"{2}\" de type ID n''est pas autoris\u00E9.
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Le type d''\u00E9l\u00E9ment \"{0}\" a d\u00E9j\u00E0 l''attribut \"{1}\" de type NOTATION. Un deuxi\u00E8me attribut \"{2}\" de type NOTATION n''est pas autoris\u00E9.
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notation \"{1}\" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la liste des types de notation de l''attribut \"{0}\".
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notation \"{1}\" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la d\u00E9claration d''entit\u00E9 non analys\u00E9e pour \"{0}\".
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 \"{0}\" d\u00E9clar\u00E9e dans une entit\u00E9 analys\u00E9e externe n''est pas autoris\u00E9e dans un document autonome.
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attribut \"{1}\" est obligatoire et doit \u00EAtre sp\u00E9cifi\u00E9 pour le type d''\u00E9l\u00E9ment \"{0}\".
-+ MSG_ELEMENT_WITH_ID_REQUIRED = Un \u00E9l\u00E9ment avec l''identificateur "{0}" doit figurer dans le document.
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 externe "{0}" n''est pas autoris\u00E9e dans le document autonome.
-+ MSG_FIXED_ATTVALUE_INVALID = L''attribut "{1}" de valeur "{2}" doit avoir une valeur de "{3}".
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Le type d''\u00E9l\u00E9ment "{0}" a d\u00E9j\u00E0 l''attribut "{1}" de type ID. Un deuxi\u00E8me attribut "{2}" de type ID n''est pas autoris\u00E9.
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Le type d''\u00E9l\u00E9ment "{0}" a d\u00E9j\u00E0 l''attribut "{1}" de type NOTATION. Un deuxi\u00E8me attribut "{2}" de type NOTATION n''est pas autoris\u00E9.
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notation "{1}" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la liste des types de notation de l''attribut "{0}".
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notation "{1}" doit \u00EAtre d\u00E9clar\u00E9e lorsqu''elle est r\u00E9f\u00E9renc\u00E9e dans la d\u00E9claration d''entit\u00E9 non analys\u00E9e pour "{0}".
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = La r\u00E9f\u00E9rence \u00E0 l''entit\u00E9 "{0}" d\u00E9clar\u00E9e dans une entit\u00E9 analys\u00E9e externe n''est pas autoris\u00E9e dans un document autonome.
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attribut "{1}" est obligatoire et doit \u00EAtre sp\u00E9cifi\u00E9 pour le type d''\u00E9l\u00E9ment "{0}".
- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Aucun espace ne doit figurer entre les \u00E9l\u00E9ments d\u00E9clar\u00E9s dans une entit\u00E9 analys\u00E9e externe avec le contenu des \u00E9l\u00E9ments dans un document autonome.
-- NMTOKENInvalid = La valeur d''attribut \"{0}\" de type NMTOKEN doit correspondre \u00E0 un jeton de nom.
-- NMTOKENSInvalid = La valeur d''attribut \"{0}\" de type NMTOKENS doit correspondre \u00E0 au moins un jeton de nom.
-- NoNotationOnEmptyElement = Le type d''\u00E9l\u00E9ment \"{0}\" d\u00E9clar\u00E9 EMPTY ne peut pas d\u00E9clarer un attribut \"{1}\" de type NOTATION.
-- RootElementTypeMustMatchDoctypedecl = L''\u00E9l\u00E9ment racine de document \"{1}\" doit correspondre \u00E0 la racine DOCTYPE \"{0}\".
-- UndeclaredElementInContentSpec = Le mod\u00E8le de contenu de l''\u00E9l\u00E9ment \"{0}\" fait r\u00E9f\u00E9rence \u00E0 l''\u00E9l\u00E9ment non d\u00E9clar\u00E9 \"{1}\".
-- UniqueNotationName = La d\u00E9claration de la notation \"{0}\" n''est pas unique. Une valeur Name donn\u00E9e ne doit pas \u00EAtre d\u00E9clar\u00E9e dans plusieurs d\u00E9clarations de notation.
-- ENTITYFailedInitializeGrammar = Contr\u00F4le de validation ENTITYDatatype : \u00E9chec. Besoin d'appeler une m\u00E9thode d'initialisation avec une r\u00E9f\u00E9rence de grammaire valide. \t
-- ENTITYNotUnparsed = La valeur ENTITY \"{0}\" est analys\u00E9e.
-- ENTITYNotValid = La valeur ENTITY \"{0}\" n''est pas valide.
-+ NMTOKENInvalid = La valeur d''attribut "{0}" de type NMTOKEN doit correspondre \u00E0 un jeton de nom.
-+ NMTOKENSInvalid = La valeur d''attribut "{0}" de type NMTOKENS doit correspondre \u00E0 au moins un jeton de nom.
-+ NoNotationOnEmptyElement = Le type d''\u00E9l\u00E9ment "{0}" d\u00E9clar\u00E9 EMPTY ne peut pas d\u00E9clarer un attribut "{1}" de type NOTATION.
-+ RootElementTypeMustMatchDoctypedecl = L''\u00E9l\u00E9ment racine de document "{1}" doit correspondre \u00E0 la racine DOCTYPE "{0}".
-+ UndeclaredElementInContentSpec = Le mod\u00E8le de contenu de l''\u00E9l\u00E9ment "{0}" fait r\u00E9f\u00E9rence \u00E0 l''\u00E9l\u00E9ment non d\u00E9clar\u00E9 "{1}".
-+ UniqueNotationName = La d\u00E9claration de la notation "{0}" n''est pas unique. Une valeur Name donn\u00E9e ne doit pas \u00EAtre d\u00E9clar\u00E9e dans plusieurs d\u00E9clarations de notation.
-+ ENTITYFailedInitializeGrammar = Valideur ENTITYDatatype : \u00E9chec. Besoin d'appeler une m\u00E9thode d'initialisation avec une r\u00E9f\u00E9rence de grammaire valide. \t
-+ ENTITYNotUnparsed = La valeur ENTITY "{0}" est analys\u00E9e.
-+ ENTITYNotValid = La valeur ENTITY "{0}" n''est pas valide.
- EmptyList = Une valeur de type ENTITIES, IDREFS et NMTOKENS ne peut pas correspondre \u00E0 une liste vide.
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = La r\u00E9f\u00E9rence d''entit\u00E9 externe \"&{0};\" n''est pas autoris\u00E9e dans une valeur d''attribut.
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = La r\u00E9f\u00E9rence d''entit\u00E9 externe "&{0};" n''est pas autoris\u00E9e dans une valeur d''attribut.
-+ AccessExternalDTD = DTD externe : \u00E9chec de la lecture de la DTD externe ''{0}'', car l''acc\u00E8s ''{1}'' n''est pas autoris\u00E9 en raison d''une restriction d\u00E9finie par la propri\u00E9t\u00E9 accessExternalDTD.
-+ AccessExternalEntity = Entit\u00E9 externe : \u00E9chec de la lecture du document externe ''{0}'', car l''acc\u00E8s ''{1}'' n''est pas autoris\u00E9 en raison d''une restriction d\u00E9finie par la propri\u00E9t\u00E9 accessExternalDTD.
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = L''entit\u00E9 \"{0}\" \u00E9tait r\u00E9f\u00E9renc\u00E9e, mais pas d\u00E9clar\u00E9e.
-- ReferenceToUnparsedEntity = La r\u00E9f\u00E9rence d''entit\u00E9 non analys\u00E9e \"&{0};\" n''est pas autoris\u00E9e.
-- RecursiveReference = R\u00E9f\u00E9rence d''entit\u00E9 r\u00E9cursive \"{0}\". (Chemin de r\u00E9f\u00E9rence : {1}),
-- RecursiveGeneralReference = R\u00E9f\u00E9rence d''entit\u00E9 g\u00E9n\u00E9rale r\u00E9cursive \"&{0};\". (Chemin de r\u00E9f\u00E9rence : {1}),
-- RecursivePEReference = R\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre r\u00E9cursive \"%{0};\". (Chemin de r\u00E9f\u00E9rence : {1}),
-+ EntityNotDeclared = L''entit\u00E9 "{0}" \u00E9tait r\u00E9f\u00E9renc\u00E9e, mais pas d\u00E9clar\u00E9e.
-+ ReferenceToUnparsedEntity = La r\u00E9f\u00E9rence d''entit\u00E9 non analys\u00E9e "&{0};" n''est pas autoris\u00E9e.
-+ RecursiveReference = R\u00E9f\u00E9rence d''entit\u00E9 r\u00E9cursive "{0}". (Chemin de r\u00E9f\u00E9rence : {1}),
-+ RecursiveGeneralReference = R\u00E9f\u00E9rence d''entit\u00E9 g\u00E9n\u00E9rale r\u00E9cursive "&{0};". (Chemin de r\u00E9f\u00E9rence : {1}),
-+ RecursivePEReference = R\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre r\u00E9cursive "%{0};". (Chemin de r\u00E9f\u00E9rence : {1}),
- # 4.3.3 Character Encoding in Entities
-- EncodingNotSupported = L''encodage \"{0}\" n''est pas pris en charge.
-+ EncodingNotSupported = L''encodage "{0}" n''est pas pris en charge.
- EncodingRequired = Une entit\u00E9 analys\u00E9e sans encodage UTF-8 ou UTF-16 doit contenir une d\u00E9claration d'encodage.
-
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = L'\u00E9l\u00E9ment ou l'attribut ne correspond pas \u00E0 la production QName : QName::=(NCName':')?NCName.
-- ElementXMLNSPrefix = L''\u00E9l\u00E9ment \"{0}\" ne peut pas avoir \"xmlns\" comme pr\u00E9fixe.
-- ElementPrefixUnbound = Le pr\u00E9fixe \"{0}\" de l''\u00E9l\u00E9ment \"{1}\" n''est pas li\u00E9.
-- AttributePrefixUnbound = Le pr\u00E9fixe \"{2}\" de l''attribut \"{1}\" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment \"{0}\" n''est pas li\u00E9.
-- EmptyPrefixedAttName = La valeur de l''attribut \"{0}\" n''est pas valide. Les liaisons d''espaces de noms pr\u00E9fix\u00E9s ne peuvent pas \u00EAtre vides.
-- PrefixDeclared = Le pr\u00E9fixe d''espace de noms \"{0}\" n''\u00E9tait pas d\u00E9clar\u00E9.
-+ ElementXMLNSPrefix = L''\u00E9l\u00E9ment "{0}" ne peut pas avoir "xmlns" comme pr\u00E9fixe.
-+ ElementPrefixUnbound = Le pr\u00E9fixe "{0}" de l''\u00E9l\u00E9ment "{1}" n''est pas li\u00E9.
-+ AttributePrefixUnbound = Le pr\u00E9fixe "{2}" de l''attribut "{1}" associ\u00E9 \u00E0 un type d''\u00E9l\u00E9ment "{0}" n''est pas li\u00E9.
-+ EmptyPrefixedAttName = La valeur de l''attribut "{0}" n''est pas valide. Les liaisons d''espaces de noms pr\u00E9fix\u00E9s ne peuvent pas \u00EAtre vides.
-+ PrefixDeclared = Le pr\u00E9fixe d''espace de noms "{0}" n''\u00E9tait pas d\u00E9clar\u00E9.
- CantBindXMLNS = Le pr\u00E9fixe "xmlns" ne peut pas \u00EAtre li\u00E9 \u00E0 un espace de noms de fa\u00E7on explicite, pas plus que l'espace de noms de "xmlns" \u00E0 un pr\u00E9fixe quelconque.
- CantBindXML = Le pr\u00E9fixe "xml" ne peut pas \u00EAtre li\u00E9 \u00E0 un autre espace de noms que son espace de noms habituel. L'espace de noms de "xml" ne peut pas non plus \u00EAtre li\u00E9 \u00E0 un autre pr\u00E9fixe que "xml".
-- MSG_ATT_DEFAULT_INVALID = La valeur par d\u00E9faut \"{1}\" de l''attribut \"{0}\" n''est pas admise conform\u00E9ment aux contraintes lexicales de ce type d''attribut.
-+ MSG_ATT_DEFAULT_INVALID = La valeur par d\u00E9faut "{1}" de l''attribut "{0}" n''est pas admise conform\u00E9ment aux contraintes lexicales de ce type d''attribut.
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=L''analyseur a rencontr\u00E9 plus de \"{0}\" d\u00E9veloppements d''entit\u00E9 dans ce document. Il s''agit de la limite impos\u00E9e par l''application.
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001 : L''analyseur a rencontr\u00E9 plus de "{0}" d\u00E9veloppements d''entit\u00E9 dans ce document. Il s''agit de la limite impos\u00E9e par le JDK.
-+ ElementAttributeLimit=JAXP00010002 : L''\u00E9l\u00E9ment "{0}" a plus de "{1}" attributs. "{1}" est la limite impos\u00E9e par le JDK.
-+ MaxEntitySizeLimit=JAXP00010003 : La longueur de l''entit\u00E9 "{0}" est de "{1}". Cette valeur d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}".
-+ TotalEntitySizeLimit=JAXP00010004 : La taille cumul\u00E9e des entit\u00E9s ("{0}") d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}".
-+ MaxXMLNameLimit=JAXP00010005 : le nom "{0}" d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}".
-+ MaxElementDepthLimit=JAXP00010006 : l''\u00E9l\u00E9ment "{0}" a une profondeur de "{1}" qui d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}".
-
--# 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 2014-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel prologo del documento.
- InvalidCharInXMLDecl = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nella dichiarazione XML.
- # 2.4 Character Data and Markup
-- CDEndInContent = La sequenza di caratteri \"]]>\" non deve essere presente nel contenuto a meno che non sia utilizzata per contrassegnare la fine di una sezione CDATA.
-+ CDEndInContent = La sequenza di caratteri "]]>" non deve essere presente nel contenuto a meno che non sia utilizzata per contrassegnare la fine di una sezione CDATA.
- # 2.7 CDATA Sections
-- CDSectUnterminated = La sezione CDATA deve terminare con \"]]>\".
-+ CDSectUnterminated = La sezione CDATA deve terminare con "]]>".
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = La dichiarazione XML pu\u00F2 comparire solo all'inizio del documento.
-- EqRequiredInXMLDecl = Il carattere '' = '' deve seguire \"{0}\" nella dichiarazione XML.
-- QuoteRequiredInXMLDecl = Il valore che segue \"{0}\" nella dichiarazione XML deve essere una stringa compresa tra apici.
-- XMLDeclUnterminated = La dichiarazione XML deve terminare con \"?>\".
-+ EqRequiredInXMLDecl = Il carattere '' = '' deve seguire "{0}" nella dichiarazione XML.
-+ QuoteRequiredInXMLDecl = Il valore che segue "{0}" nella dichiarazione XML deve essere una stringa compresa tra apici.
-+ XMLDeclUnterminated = La dichiarazione XML deve terminare con "?>".
- VersionInfoRequired = La versione \u00E8 obbligatoria nella dichiarazione XML.
- SpaceRequiredBeforeVersionInXMLDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo della versione nella dichiarazione XML.
- SpaceRequiredBeforeEncodingInXMLDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione XML.
-@@ -71,70 +43,71 @@
- ReferenceIllegalInTrailingMisc=Il riferimento non \u00E8 consentito nella sezione finale.
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = Il valore della dichiarazione del documento standalone deve essere \"yes\" o \"no\", non \"{0}\".
-+ SDDeclInvalid = Il valore della dichiarazione del documento standalone deve essere "yes" o "no", non "{0}".
-+ SDDeclNameInvalid = Il nome standalone nella dichiarazione XML potrebbe essere stato digitato in modo errato.
- # 2.12 Language Identification
-- XMLLangInvalid = Il valore dell''attributo xml:lang \"{0}\" \u00E8 un identificativo di lingua non valido.
-+ XMLLangInvalid = Il valore dell''attributo xml:lang "{0}" \u00E8 un identificativo di lingua non valido.
- # 3. Logical Structures
-- ETagRequired = Il tipo di elemento \"{0}\" deve terminare con la corrispondente tag finale \"</{0}>\".
-+ ETagRequired = Il tipo di elemento "{0}" deve terminare con la corrispondente tag finale "</{0}>".
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = Il tipo di elemento \"{0}\" deve essere seguito dalle specifiche di attributo \">\" o \"/>\".
-- EqRequiredInAttribute = Il nome attributo \"{1}\" associato a un tipo di elemento \"{0}\" deve essere seguito dal carattere '' = ''.
-- OpenQuoteExpected = \u00C8 previsto un apice di apertura per l''attributo \"{1}\" associato a un tipo di elemento \"{0}\".
-- CloseQuoteExpected = \u00C8 previsto un apice di chiusura per l''attributo \"{1}\" associato a un tipo di elemento \"{0}\".
-- AttributeNotUnique = L''attributo \"{1}\" \u00E8 gi\u00E0 stato specificato per l''elemento \"{0}\".
-- AttributeNSNotUnique = L''attributo \"{1}\" associato allo spazio di nomi \"{2}\" \u00E8 gi\u00E0 stato specificato per l''elemento \"{0}\".
-- ETagUnterminated = La tag finale per il tipo di elemento \"{0}\" deve terminare con un delimitatore ''>''.
-+ ElementUnterminated = Il tipo di elemento "{0}" deve essere seguito dalle specifiche di attributo ">" o "/>".
-+ EqRequiredInAttribute = Il nome attributo "{1}" associato a un tipo di elemento "{0}" deve essere seguito dal carattere '' = ''.
-+ OpenQuoteExpected = \u00C8 previsto un apice di apertura per l''attributo "{1}" associato a un tipo di elemento "{0}".
-+ CloseQuoteExpected = \u00C8 previsto un apice di chiusura per l''attributo "{1}" associato a un tipo di elemento "{0}".
-+ AttributeNotUnique = L''attributo "{1}" \u00E8 gi\u00E0 stato specificato per l''elemento "{0}".
-+ AttributeNSNotUnique = L''attributo "{1}" associato allo spazio di nomi "{2}" \u00E8 gi\u00E0 stato specificato per l''elemento "{0}".
-+ ETagUnterminated = La tag finale per il tipo di elemento "{0}" deve terminare con un delimitatore ''>''.
- MarkupNotRecognizedInContent = Il contenuto degli elementi deve essere composto da dati o markup di caratteri con formato corretto.
- DoctypeIllegalInContent = DOCTYPE non \u00E8 consentito nel contenuto.
- # 4.1 Character and Entity References
- ReferenceUnterminated = Il riferimento deve terminare con un delimitatore ';'.
- # 4.3.2 Well-Formed Parsed Entities
- ReferenceNotInOneEntity = Il riferimento deve essere compreso completamente all'interno della stessa entit\u00E0 analizzata.
-- ElementEntityMismatch = L''elemento \"{0}\" deve iniziare e finire con la stessa entit\u00E0.
-+ ElementEntityMismatch = L''elemento "{0}" deve iniziare e finire con la stessa entit\u00E0.
- MarkupEntityMismatch=Le strutture di documenti XML devono iniziare e finire con la stessa entit\u00E0.
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{2}) nel valore dell''attributo \"{1}\". L''elemento \u00E8 \"{0}\".
-+ InvalidCharInAttValue = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{2}) nel valore dell''attributo "{1}". L''elemento \u00E8 "{0}".
- InvalidCharInComment = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel commento.
- InvalidCharInPI = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nell''istruzione di elaborazione.
- InvalidCharInInternalSubset = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel set secondario interno del DTD.
- InvalidCharInTextDecl = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nella dichiarazione testuale.
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = Il valore dell''attributo \"{1}\" deve iniziare con un apice o una virgoletta.
-- LessthanInAttValue = Il valore dell''attributo \"{1}\" associato a un tipo di elemento \"{0}\" non deve essere contenere il carattere ''<''.
-- AttributeValueUnterminated = Il valore dell''attributo \"{1}\" deve terminare con un apice corrispondente.
-+ QuoteRequiredInAttValue = Il valore dell''attributo "{1}" deve iniziare con un apice o una virgoletta.
-+ LessthanInAttValue = Il valore dell''attributo "{1}" associato a un tipo di elemento "{0}" non deve essere contenere il carattere ''<''.
-+ AttributeValueUnterminated = Il valore dell''attributo "{1}" deve terminare con un apice corrispondente.
- # 2.5 Comments
-- InvalidCommentStart = Il commento deve iniziare con \"<!--\".
-- DashDashInComment = La stringa \"--\" non \u00E8 consentita nei commenti.
-- CommentUnterminated = Il commento deve terminare con \"-->\".
-+ InvalidCommentStart = Il commento deve iniziare con "<!--".
-+ DashDashInComment = La stringa "--" non \u00E8 consentita nei commenti.
-+ CommentUnterminated = Il commento deve terminare con "-->".
- COMMENT_NOT_IN_ONE_ENTITY = Il commento non \u00E8 compreso all'interno della stessa entit\u00E0.
- # 2.6 Processing Instructions
- PITargetRequired = L'istruzione di elaborazione deve iniziare con il nome della destinazione.
- SpaceRequiredInPI = \u00C8 richiesto uno spazio tra la destinazione delle istruzioni di elaborazione e i dati.
-- PIUnterminated = L'istruzione di elaborazione deve terminare con \"?>\".
-- ReservedPITarget = Non \u00E8 consentita una destinazione di istruzione di elaborazione corrispondente a \"[xX][mM][lL]\".
-+ PIUnterminated = L'istruzione di elaborazione deve terminare con "?>".
-+ ReservedPITarget = Non \u00E8 consentita una destinazione di istruzione di elaborazione corrispondente a "[xX][mM][lL]".
- PI_NOT_IN_ONE_ENTITY = L'istruzione di elaborazione non \u00E8 compresa all'interno della stessa entit\u00E0.
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = Versione \"{0}\" non valida.
-- VersionNotSupported = La versione XML \"{0}\" non \u00E8 supportata. Solo la versione XML 1.0 \u00E8 supportata.
-- VersionNotSupported11 = La versione XML \"{0}\" non \u00E8 supportata. Solo le versioni XML 1.0 e XML 1.1 sono supportate.
-+ VersionInfoInvalid = Versione "{0}" non valida.
-+ VersionNotSupported = La versione XML "{0}" non \u00E8 supportata. Solo la versione XML 1.0 \u00E8 supportata.
-+ VersionNotSupported11 = La versione XML "{0}" non \u00E8 supportata. Solo le versioni XML 1.0 e XML 1.1 sono supportate.
- VersionMismatch= Un'entit\u00E0 non pu\u00F2 includerne un'altra con una versione successiva.
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = Una rappresentazione decimale deve seguire immediatamente \"&#\" in un riferimento di carattere.
-- HexdigitRequiredInCharRef = Una rappresentazione esadecimale deve seguire immediatamente \"&#\" in un riferimento di carattere.
-+ DigitRequiredInCharRef = Una rappresentazione decimale deve seguire immediatamente "&#" in un riferimento di carattere.
-+ HexdigitRequiredInCharRef = Una rappresentazione esadecimale deve seguire immediatamente "&#" in un riferimento di carattere.
- SemicolonRequiredInCharRef = Il riferimento di carattere deve terminare con il delimitatore ';'.
-- InvalidCharRef = Il riferimento di carattere \"&#{0}\" \u00E8 un carattere XML non valido.
-+ InvalidCharRef = Il riferimento di carattere "&#{0}" \u00E8 un carattere XML non valido.
- NameRequiredInReference = Il nome entit\u00E0 deve seguire immediatamente '&' nel riferimento di entit\u00E0.
-- SemicolonRequiredInReference = Il riferimento di entit\u00E0 \"{0}\" deve terminare con il delimitatore '';''.
-+ SemicolonRequiredInReference = Il riferimento di entit\u00E0 "{0}" deve terminare con il delimitatore '';''.
- # 4.3.1 The Text Declaration
- TextDeclMustBeFirst = La dichiarazione di testo pu\u00F2 comparire solo all'inizio dell'entit\u00E0 esterna analizzata.
-- EqRequiredInTextDecl = Il carattere '' = '' deve seguire \"{0}\" nella dichiarazione di testo.
-- QuoteRequiredInTextDecl = Il valore che segue \"{0}\" nella dichiarazione di testo deve essere una stringa compresa tra apici.
-- CloseQuoteMissingInTextDecl = manca l''apice di chiusura nel valore che segue \"{0}\" nella dichiarazione di testo.
-+ EqRequiredInTextDecl = Il carattere '' = '' deve seguire "{0}" nella dichiarazione di testo.
-+ QuoteRequiredInTextDecl = Il valore che segue "{0}" nella dichiarazione di testo deve essere una stringa compresa tra apici.
-+ CloseQuoteMissingInTextDecl = manca l''apice di chiusura nel valore che segue "{0}" nella dichiarazione di testo.
- SpaceRequiredBeforeVersionInTextDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo della versione nella dichiarazione del testo.
- SpaceRequiredBeforeEncodingInTextDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione del testo.
-- TextDeclUnterminated = La dichiarazione di testo deve terminare con \"?>\".
-+ TextDeclUnterminated = La dichiarazione di testo deve terminare con "?>".
- EncodingDeclRequired = La dichiarazione di codifica \u00E8 obbligatoria nella dichiarazione di testo.
- NoMorePseudoAttributes = Non sono consentiti altri attributi pseudo.
- MorePseudoAttributes = Sono previsti altri attributi pseudo.
-@@ -143,13 +116,13 @@
- CommentNotInOneEntity = Il commento deve essere compreso completamente all'interno della stessa entit\u00E0 analizzata.
- PINotInOneEntity = L'istruzione di elaborazione deve essere compresa completamente all'interno della stessa entit\u00E0 analizzata.
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = Nome codifica \"{0}\" non valido.
-- EncodingByteOrderUnsupported = L''ordine di byte specificato per la codifica \"{0}\" non \u00E8 supportato.
-+ EncodingDeclInvalid = Nome codifica "{0}" non valido.
-+ EncodingByteOrderUnsupported = L''ordine di byte specificato per la codifica "{0}" non \u00E8 supportato.
- InvalidByte = Byte non valido {0} della sequenza UTF-8 a {1} byte.
- ExpectedByte = \u00C8 previsto il byte {0} della sequenza UTF-8 a {1} byte.
- InvalidHighSurrogate = I bit per surrogato alto nella sequenza UTF-8 non devono superare 0x10, ma \u00E8 stato trovato 0x{0}.
-- OperationNotSupported = Operazione \"{0}\" non supportata dal processo di lettura {1}.
-- InvalidASCII = Il byte \"{0}\" non fa parte del set di caratteri ASCII (a 7 bit).
-+ OperationNotSupported = Operazione "{0}" non supportata dal processo di lettura {1}.
-+ InvalidASCII = Il byte "{0}" non fa parte del set di caratteri ASCII (a 7 bit).
- CharConversionFailure = Un'entit\u00E0 che deve trovarsi in una determinata codifica non pu\u00F2 contenere sequenze non valide in quella codifica.
-
- # DTD Messages
-@@ -169,150 +142,150 @@
- PubidCharIllegal = Il carattere (Unicode: 0x{0}) non \u00E8 consentito nell''identificativo pubblico.
- SpaceRequiredBetweenPublicAndSystem = Sono richiesti spazi tra publicId e systemId.
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u00C8 richiesto uno spazio dopo \"<!DOCTYPE\" nella dichiarazione del tipo di documento.
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = Il tipo di elemento radice deve comparire dopo \"<!DOCTYPE\" nella dichiarazione del tipo di documento.
-- DoctypedeclUnterminated = La dichiarazione del tipo di documento per il tipo di elemento radice \"{0}\" deve terminare con ''>''.
-- PEReferenceWithinMarkup = Il riferimento di entit\u00E0 di parametro \"%{0};\" non pu\u00F2 essere presente nel markup del set secondario interno del DTD.
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u00C8 richiesto uno spazio dopo "<!DOCTYPE" nella dichiarazione del tipo di documento.
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = Il tipo di elemento radice deve comparire dopo "<!DOCTYPE" nella dichiarazione del tipo di documento.
-+ DoctypedeclUnterminated = La dichiarazione del tipo di documento per il tipo di elemento radice "{0}" deve terminare con ''>''.
-+ PEReferenceWithinMarkup = Il riferimento di entit\u00E0 di parametro "%{0};" non pu\u00F2 essere presente nel markup del set secondario interno del DTD.
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Le dichiarazioni di markup contenute o indicate dalla dichiarazione del tipo di documento devono avere un formato corretto.
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = La dichiarazione di attributo \"xml:space\" deve essere specificata come tipo enumerato, i cui unici possibili valori sono \"default\" e \"preserve\".
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = La dichiarazione di attributo "xml:space" deve essere specificata come tipo enumerato, i cui unici possibili valori sono "default" e "preserve".
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo \"<!ELEMENT\" nella dichiarazione del tipo di elemento.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo "<!ELEMENT" nella dichiarazione del tipo di elemento.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Il tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento.
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo il tipo di elemento \"{0}\" nella dichiarazione del tipo di elemento.
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u00C8 richiesto uno vincolo dopo il tipo di elemento \"{0}\" nella dichiarazione del tipo di elemento.
-- ElementDeclUnterminated = La dichiarazione per il tipo di elemento \"{0}\" deve terminare con ''>''.
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u00C8 richiesto uno spazio dopo il tipo di elemento "{0}" nella dichiarazione del tipo di elemento.
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u00C8 richiesto uno vincolo dopo il tipo di elemento "{0}" nella dichiarazione del tipo di elemento.
-+ ElementDeclUnterminated = La dichiarazione per il tipo di elemento "{0}" deve terminare con ''>''.
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un carattere ''('' o un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento \"{0}\".
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Un carattere ''('' o un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento \"{0}\".
-- MixedContentUnterminated = Il modello di contenuto misto \"{0}\" deve terminare con \")*\" se i tipi di elementi figlio hanno vincoli.
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = Un tipo di elemento \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Un carattere '')'' \u00E8 obbligatorio nella dichiarazione del tipo di elemento "{0}".
-+ MixedContentUnterminated = Il modello di contenuto misto "{0}" deve terminare con ")*" se i tipi di elementi figlio hanno vincoli.
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u00C8 richiesto uno spazio dopo \"<!ATTLIST\" nella dichiarazione della lista di attributi.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u00C8 richiesto uno spazio dopo "<!ATTLIST" nella dichiarazione della lista di attributi.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Il tipo di elemento \u00E8 obbligatorio nella dichiarazione della lista di attributi.
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C8 richiesto uno spazio prima del nome attributo nella dichiarazione della lista di attributi per l''elemento \"{0}\".
-- AttNameRequiredInAttDef = Specificare il nome attributo nella dichiarazione della lista di attributi per l''elemento \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C8 richiesto uno spazio prima del tipo di attributo nella dichiarazione dell''attributo \"{1}\" per l''elemento \"{0}\".
-- AttTypeRequiredInAttDef = Il tipo di attributo \u00E8 obbligatorio nella dichiarazione dell''attributo \"{1}\" per l''elemento \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C8 richiesto uno spazio prima del valore predefinito di attributo nella dichiarazione dell''attributo \"{1}\" per l''elemento \"{0}\".
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Sono state specificate pi\u00F9 definizioni di attributo per lo stesso attributo \"{1}\" dell''elemento \"{0}\" specificato.
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C8 richiesto uno spazio prima del nome attributo nella dichiarazione della lista di attributi per l''elemento "{0}".
-+ AttNameRequiredInAttDef = Specificare il nome attributo nella dichiarazione della lista di attributi per l''elemento "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C8 richiesto uno spazio prima del tipo di attributo nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
-+ AttTypeRequiredInAttDef = Il tipo di attributo \u00E8 obbligatorio nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C8 richiesto uno spazio prima del valore predefinito di attributo nella dichiarazione dell''attributo "{1}" per l''elemento "{0}".
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Sono state specificate pi\u00F9 definizioni di attributo per lo stesso attributo "{1}" dell''elemento "{0}" specificato.
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Deve essere presente uno spazio dopo \"NOTATION\" nella dichiarazione di attributo \"{1}\".
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Il carattere ''('' deve seguire \"NOTATION\" nella dichiarazione di attributo \"{1}\".
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Il nome notazione \u00E8 obbligatorio nella lista di tipi di notazione per la dichiarazione di attributo \"{1}\".
-- NotationTypeUnterminated = La lista di tipi di notazione deve terminare con '')'' nella dichiarazione di attributo \"{1}\".
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Il nome token \u00E8 obbligatorio nella lista di tipi enumerati per la dichiarazione di attributo \"{1}\".
-- EnumerationUnterminated = La lista di tipi enumerati deve terminare con '')'' nella dichiarazione di attributo \"{1}\".
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = Il valore di enumerazione \"{1}\" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo \"{2}\" per l''elemento \"{0}\". I valori di NMTOKENS in una dichiarazione singola di attributo Enumeration devono essere tutti diversi.
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = Il valore di enumerazione \"{1}\" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo \"{2}\" per l''elemento \"{0}\". I nomi NOTATION in una dichiarazione singola di attributo NotationType devono essere tutti diversi.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Deve essere presente uno spazio dopo "NOTATION" nella dichiarazione di attributo "{1}".
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Il carattere ''('' deve seguire "NOTATION" nella dichiarazione di attributo "{1}".
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Il nome notazione \u00E8 obbligatorio nella lista di tipi di notazione per la dichiarazione di attributo "{1}".
-+ NotationTypeUnterminated = La lista di tipi di notazione deve terminare con '')'' nella dichiarazione di attributo "{1}".
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Il nome token \u00E8 obbligatorio nella lista di tipi enumerati per la dichiarazione di attributo "{1}".
-+ EnumerationUnterminated = La lista di tipi enumerati deve terminare con '')'' nella dichiarazione di attributo "{1}".
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = Il valore di enumerazione "{1}" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo "{2}" per l''elemento "{0}". I valori di NMTOKENS in una dichiarazione singola di attributo Enumeration devono essere tutti diversi.
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = Il valore di enumerazione "{1}" \u00E8 stato specificato pi\u00F9 volte nella dichiarazione dell''attributo "{2}" per l''elemento "{0}". I nomi NOTATION in una dichiarazione singola di attributo NotationType devono essere tutti diversi.
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Deve essere presente uno spazio dopo \"FIXED\" nella dichiarazione di attributo \"{1}\".
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Deve essere presente uno spazio dopo "FIXED" nella dichiarazione di attributo "{1}".
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = La sezione condizionale inclusa deve terminare con \"]]>\".
-- IgnoreSectUnterminated = La sezione condizionale esclusa deve terminare con \"]]>\".
-+ IncludeSectUnterminated = La sezione condizionale inclusa deve terminare con "]]>".
-+ IgnoreSectUnterminated = La sezione condizionale esclusa deve terminare con "]]>".
- # 4.1 Character and Entity References
- NameRequiredInPEReference = Il nome entit\u00E0 deve seguire immediatamente '%' nel riferimento di entit\u00E0 di parametro.
-- SemicolonRequiredInPEReference = Il riferimento di entit\u00E0 di parametro \"%{0};\" deve terminare con il delimitatore '';''.
-+ SemicolonRequiredInPEReference = Il riferimento di entit\u00E0 di parametro "%{0};" deve terminare con il delimitatore '';''.
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio dopo \"<!ENTITY\" nella dichiarazione dell'entit\u00E0.
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u00C8 richiesto uno spazio tra \"<!ENTITY\" e il carattere '%' nella dichiarazione dell'entit\u00E0 di parametro.
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio dopo "<!ENTITY" nella dichiarazione dell'entit\u00E0.
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u00C8 richiesto uno spazio tra "<!ENTITY" e il carattere '%' nella dichiarazione dell'entit\u00E0 di parametro.
- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u00C8 richiesto uno spazio tra '%' e il nome entit\u00E0 nella dichiarazione dell'entit\u00E0 di parametro.
- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Il nome dell'entit\u00E0 \u00E8 obbligatorio nella dichiarazione di entit\u00E0.
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio tra il nome entit\u00E0 \"{0}\" e la definizione nella dichiarazione dell''entit\u00E0:
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio tra \"NDATA\" e il nome notazione nella dichiarazione dell''entit\u00E0 \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio prima di \"NDATA\" nella dichiarazione dell''entit\u00E0 \"{0}\".
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Il nome notazione \u00E8 obbligatorio dopo \"NDATA\" nella dichiarazione dell''entit\u00E0 \"{0}\".
-- EntityDeclUnterminated = La dichiarazione per l''entit\u00E0 \"{0}\" deve terminare con ''>''.
-- MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E0 \"{0}\" \u00E8 stata dichiarata pi\u00F9 volte.
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u00C8 richiesto uno spazio tra il nome entit\u00E0 "{0}" e la definizione nella dichiarazione dell''entit\u00E0:
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio tra "NDATA" e il nome notazione nella dichiarazione dell''entit\u00E0 "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u00C8 richiesto uno spazio prima di "NDATA" nella dichiarazione dell''entit\u00E0 "{0}".
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Il nome notazione \u00E8 obbligatorio dopo "NDATA" nella dichiarazione dell''entit\u00E0 "{0}".
-+ EntityDeclUnterminated = La dichiarazione per l''entit\u00E0 "{0}" deve terminare con ''>''.
-+ MSG_DUPLICATE_ENTITY_DEFINITION = L''entit\u00E0 "{0}" \u00E8 stata dichiarata pi\u00F9 volte.
- # 4.2.2 External Entities
-- ExternalIDRequired = La dichiarazione di entit\u00E0 esterna deve iniziare con \"SYSTEM\" o \"PUBLIC\".
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra \"PUBLIC\" e l'identificativo pubblico.
-+ ExternalIDRequired = La dichiarazione di entit\u00E0 esterna deve iniziare con "SYSTEM" o "PUBLIC".
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra "PUBLIC" e l'identificativo pubblico.
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra l'identificativo pubblico e quello di sistema.
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra \"SYSTEM\" e l'identificativo di sistema.
-- MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificativo di frammento non deve essere specificato nell''identificativo di sistema \"{0}\".
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u00C8 richiesto uno spazio tra "SYSTEM" e l'identificativo di sistema.
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = L''identificativo di frammento non deve essere specificato nell''identificativo di sistema "{0}".
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo \"<!NOTATION\" nella dichiarazione della notazione.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo "<!NOTATION" nella dichiarazione della notazione.
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Il nome della notazione \u00E8 obbligatorio nella dichiarazione di notazione.
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo il nome notazione \"{0}\" nella dichiarazione della notazione.
-- ExternalIDorPublicIDRequired = La dichiarazione per la notazione \"{0}\" deve includere un identificativo di sistema o pubblico.
-- NotationDeclUnterminated = La dichiarazione per la notazione \"{0}\" deve terminare con ''>''.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u00C8 richiesto uno spazio dopo il nome notazione "{0}" nella dichiarazione della notazione.
-+ ExternalIDorPublicIDRequired = La dichiarazione per la notazione "{0}" deve includere un identificativo di sistema o pubblico.
-+ NotationDeclUnterminated = La dichiarazione per la notazione "{0}" deve terminare con ''>''.
-
- # Validation messages
-- DuplicateTypeInMixedContent = Il tipo di elemento \"{1}\" \u00E8 gi\u00E0 stato specificato nel modello di contenuto della dichiarazione di elemento \"{0}\".
-- ENTITIESInvalid = Il valore di attributo \"{1}\" di tipo ENTITIES deve corrispondere ai nomi di una o pi\u00F9 entit\u00E0 non analizzate.
-- ENTITYInvalid = Il valore di attributo \"{1}\" di tipo ENTITY deve corrispondere al nome di un''entit\u00E0 non analizzata.
-- IDDefaultTypeInvalid = Nell''attributo ID \"{0}\" deve essere dichiarato un valore predefinito \"#IMPLIED\" o \"#REQUIRED\".
-- IDInvalid = Il valore di attributo \"{0}\" di tipo ID deve essere un nome.
-- IDInvalidWithNamespaces = Il valore di attributo \"{0}\" di tipo ID deve essere un NCName se sono abilitati gli spazi di nomi.
-- IDNotUnique = Il valore di attributo \"{0}\" di tipo ID deve essere univoco all''interno del documento.
-- IDREFInvalid = Il valore di attributo \"{0}\" di tipo IDREF deve essere un nome.
-- IDREFInvalidWithNamespaces = Il valore di attributo \"{0}\" di tipo IDREF deve essere un NCName se sono abilitati gli spazi di nomi.
-- IDREFSInvalid = Il valore di attributo \"{0}\" di tipo IDREFS deve corrispondere a uno o pi\u00F9 nomi.
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Il testo di sostituzione dell''entit\u00E0 di parametro \"{0}\" deve includere dichiarazioni nidificate correttamente se il riferimento dell''entit\u00E0 \u00E8 utilizzato come dichiarazione completa.
-- ImproperDeclarationNesting = Il testo di sostituzione dell''entit\u00E0 di parametro \"{0}\" deve includere dichiarazioni nidificate correttamente.
-- ImproperGroupNesting = Il testo di sostituzione dell''entit\u00E0 di parametro \"{0}\" deve includere coppie di parentesi nidificate correttamente.
-- INVALID_PE_IN_CONDITIONAL = Il testo di sostituzione dell''entit\u00E0 di parametro \"{0}\" deve includere tutta la sezione condizionale oppure solo INCLUDE o IGNORE.
-- MSG_ATTRIBUTE_NOT_DECLARED = Dichiarare l''attributo \"{1}\" per il tipo di elemento \"{0}\".
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attributo \"{0}\" con valore \"{1}\" deve avere un valore della lista \"{2}\".
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Il valore \"{1}\" dell''attributo \"{0}\" non deve essere modificato dalla normalizzazione (in \"{2}\") in un documento standalone.
-- MSG_CONTENT_INCOMPLETE = Il contenuto del tipo di elemento \"{0}\" \u00E8 incompleto. Deve corrispondere a \"{1}\".
-- MSG_CONTENT_INVALID = Il contenuto del tipo di elemento \"{0}\" deve corrispondere a \"{1}\".
-- MSG_CONTENT_INVALID_SPECIFIED = Il contenuto del tipo di elemento \"{0}\" deve corrispondere a \"{1}\". Non sono consentiti elementi figlio di tipo \"{2}\".
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attributo \"{1}\" per il tipo di elemento \"{0}\" ha un valore predefinito e deve essere specificato in un documento standalone.
-- MSG_DUPLICATE_ATTDEF = L''attributo \"{1}\" \u00E8 gi\u00E0 stato dichiarato per il tipo di elemento \"{0}\".
-- MSG_ELEMENT_ALREADY_DECLARED = Il tipo di elemento \"{0}\" non deve essere dichiarato pi\u00F9 volte.
-- MSG_ELEMENT_NOT_DECLARED = Il tipo di elemento \"{0}\" deve essere dichiarato.
-+ DuplicateTypeInMixedContent = Il tipo di elemento "{1}" \u00E8 gi\u00E0 stato specificato nel modello di contenuto della dichiarazione di elemento "{0}".
-+ ENTITIESInvalid = Il valore di attributo "{1}" di tipo ENTITIES deve corrispondere ai nomi di una o pi\u00F9 entit\u00E0 non analizzate.
-+ ENTITYInvalid = Il valore di attributo "{1}" di tipo ENTITY deve corrispondere al nome di un''entit\u00E0 non analizzata.
-+ IDDefaultTypeInvalid = Nell''attributo ID "{0}" deve essere dichiarato un valore predefinito "#IMPLIED" o "#REQUIRED".
-+ IDInvalid = Il valore di attributo "{0}" di tipo ID deve essere un nome.
-+ IDInvalidWithNamespaces = Il valore di attributo "{0}" di tipo ID deve essere un NCName se sono abilitati gli spazi di nomi.
-+ IDNotUnique = Il valore di attributo "{0}" di tipo ID deve essere univoco all''interno del documento.
-+ IDREFInvalid = Il valore di attributo "{0}" di tipo IDREF deve essere un nome.
-+ IDREFInvalidWithNamespaces = Il valore di attributo "{0}" di tipo IDREF deve essere un NCName se sono abilitati gli spazi di nomi.
-+ IDREFSInvalid = Il valore di attributo "{0}" di tipo IDREFS deve corrispondere a uno o pi\u00F9 nomi.
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere dichiarazioni nidificate correttamente se il riferimento dell''entit\u00E0 \u00E8 utilizzato come dichiarazione completa.
-+ ImproperDeclarationNesting = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere dichiarazioni nidificate correttamente.
-+ ImproperGroupNesting = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere coppie di parentesi nidificate correttamente.
-+ INVALID_PE_IN_CONDITIONAL = Il testo di sostituzione dell''entit\u00E0 di parametro "{0}" deve includere tutta la sezione condizionale oppure solo INCLUDE o IGNORE.
-+ MSG_ATTRIBUTE_NOT_DECLARED = Dichiarare l''attributo "{1}" per il tipo di elemento "{0}".
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = L''attributo "{0}" con valore "{1}" deve avere un valore della lista "{2}".
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = Il valore "{1}" dell''attributo "{0}" non deve essere modificato dalla normalizzazione (in "{2}") in un documento standalone.
-+ MSG_CONTENT_INCOMPLETE = Il contenuto del tipo di elemento "{0}" \u00E8 incompleto. Deve corrispondere a "{1}".
-+ MSG_CONTENT_INVALID = Il contenuto del tipo di elemento "{0}" deve corrispondere a "{1}".
-+ MSG_CONTENT_INVALID_SPECIFIED = Il contenuto del tipo di elemento "{0}" deve corrispondere a "{1}". Non sono consentiti elementi figlio di tipo "{2}".
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = L''attributo "{1}" per il tipo di elemento "{0}" ha un valore predefinito e deve essere specificato in un documento standalone.
-+ MSG_DUPLICATE_ATTDEF = L''attributo "{1}" \u00E8 gi\u00E0 stato dichiarato per il tipo di elemento "{0}".
-+ MSG_ELEMENT_ALREADY_DECLARED = Il tipo di elemento "{0}" non deve essere dichiarato pi\u00F9 volte.
-+ MSG_ELEMENT_NOT_DECLARED = Il tipo di elemento "{0}" deve essere dichiarato.
- MSG_GRAMMAR_NOT_FOUND = Documento non valido: nessuna grammatica trovata.
-- MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con identificativo \"{0}\" deve esistere nel documento.
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Il riferimento all''entit\u00E0 esterna \"{0}\" non \u00E8 consentito in un documento standalone.
-- MSG_FIXED_ATTVALUE_INVALID = L''attributo \"{1}\" con valore \"{2}\" deve avere un valore \"{3}\".
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Il tipo di elemento \"{0}\" ha gi\u00E0 un attributo \"{1}\" di tipo ID. Non \u00E8 consentito un secondo attributo \"{2}\" di tipo ID.
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Il tipo di elemento \"{0}\" ha gi\u00E0 un attributo \"{1}\" di tipo NOTATION. Non \u00E8 consentito un secondo attributo \"{2}\" di tipo NOTATION.
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notazione \"{1}\" deve essere dichiarata se vi viene fatto riferimento nella lista dei tipi di notazione per l''attributo \"{0}\".
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notazione \"{1}\" deve essere dichiarata se vi viene fatto riferimento dichiarazione di entit\u00E0 non analizzata per \"{0}\".
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Il riferimento all''entit\u00E0 \"{0}\" dichiarata in un''entit\u00E0 esterna analizzata non \u00E8 consentito in un documento standalone.
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attributo \"{1}\" \u00E8 obbligatorio e deve essere specificato per il tipo di elemento \"{0}\".
-+ MSG_ELEMENT_WITH_ID_REQUIRED = Un elemento con identificativo "{0}" deve esistere nel documento.
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Il riferimento all''entit\u00E0 esterna "{0}" non \u00E8 consentito in un documento standalone.
-+ MSG_FIXED_ATTVALUE_INVALID = L''attributo "{1}" con valore "{2}" deve avere un valore "{3}".
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Il tipo di elemento "{0}" ha gi\u00E0 un attributo "{1}" di tipo ID. Non \u00E8 consentito un secondo attributo "{2}" di tipo ID.
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Il tipo di elemento "{0}" ha gi\u00E0 un attributo "{1}" di tipo NOTATION. Non \u00E8 consentito un secondo attributo "{2}" di tipo NOTATION.
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = La notazione "{1}" deve essere dichiarata se vi viene fatto riferimento nella lista dei tipi di notazione per l''attributo "{0}".
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = La notazione "{1}" deve essere dichiarata se vi viene fatto riferimento dichiarazione di entit\u00E0 non analizzata per "{0}".
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Il riferimento all''entit\u00E0 "{0}" dichiarata in un''entit\u00E0 esterna analizzata non \u00E8 consentito in un documento standalone.
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = L''attributo "{1}" \u00E8 obbligatorio e deve essere specificato per il tipo di elemento "{0}".
- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Non deve esistere nessuno spazio tra gli elementi dichiarati in un'entit\u00E0 esterna analizzata con il contenuto dell'elemento in un documento standalone.
-- NMTOKENInvalid = Il valore di attributo \"{0}\" di tipo NMTOKEN deve essere un token di nome.
-- NMTOKENSInvalid = Il valore di attributo \"{0}\" di tipo NMTOKENS deve corrispondere a uno o pi\u00F9 token di nomi.
-- NoNotationOnEmptyElement = Il tipo di elemento \"{0}\" dichiarato come EMPTY non pu\u00F2 dichiarare l''attributo \"{1}\" di tipo NOTATION.
-- RootElementTypeMustMatchDoctypedecl = L''elemento radice \"{1}\" del documento deve corrispondere alla radice DOCTYPE \"{0}\".
-- UndeclaredElementInContentSpec = Il modello di contenuto dell''elemento \"{0}\" fa riferimento a un elemento \"{1}\" non dichiarato.
-- UniqueNotationName = La dichiarazione per la notazione \"{0}\" non \u00E8 univoca. Un nome non deve essere dichiarato pi\u00F9 volte nella dichiarazione di una notazione.
-+ NMTOKENInvalid = Il valore di attributo "{0}" di tipo NMTOKEN deve essere un token di nome.
-+ NMTOKENSInvalid = Il valore di attributo "{0}" di tipo NMTOKENS deve corrispondere a uno o pi\u00F9 token di nomi.
-+ NoNotationOnEmptyElement = Il tipo di elemento "{0}" dichiarato come EMPTY non pu\u00F2 dichiarare l''attributo "{1}" di tipo NOTATION.
-+ RootElementTypeMustMatchDoctypedecl = L''elemento radice "{1}" del documento deve corrispondere alla radice DOCTYPE "{0}".
-+ UndeclaredElementInContentSpec = Il modello di contenuto dell''elemento "{0}" fa riferimento a un elemento "{1}" non dichiarato.
-+ UniqueNotationName = La dichiarazione per la notazione "{0}" non \u00E8 univoca. Un nome non deve essere dichiarato pi\u00F9 volte nella dichiarazione di una notazione.
- ENTITYFailedInitializeGrammar = ENTITYDatatype Validator: errore. \u00C8 necessario richiamare il metodo di inizializzazione con un riferimento di grammatica valido. \t
-- ENTITYNotUnparsed = ENTITY \"{0}\" non analizzata.
-- ENTITYNotValid = ENTITY \"{0}\" non valida.
-+ ENTITYNotUnparsed = ENTITY "{0}" non analizzata.
-+ ENTITYNotValid = ENTITY "{0}" non valida.
- EmptyList = I valori di tipo ENTITIES, IDREFS e NMTOKENS non possono essere una lista vuota.
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = Il riferimento di entit\u00E0 esterna \"&{0};\" non \u00E8 consentito in un valore di attributo.
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = Il riferimento di entit\u00E0 esterna "&{0};" non \u00E8 consentito in un valore di attributo.
-+ AccessExternalDTD = DTD esterna: lettura della DTD esterna ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla propriet\u00E0 accessExternalDTD.
-+ AccessExternalEntity = Entit\u00E0 esterna: lettura del documento esterno ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla propriet\u00E0 accessExternalDTD.
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = L''entit\u00E0 \"{0}\" \u00E8 indicata da un riferimento, ma non \u00E8 dichiarata.
-- ReferenceToUnparsedEntity = Il riferimento di entit\u00E0 non analizzata \"&{0};\" non \u00E8 consentito.
-- RecursiveReference = Riferimento di entit\u00E0 ricorsivo \"{0}\" (percorso riferimento: {1}).
-- RecursiveGeneralReference = Riferimento di entit\u00E0 generale ricorsivo \"&{0};\" (percorso riferimento: {1}).
-- RecursivePEReference = Riferimento di entit\u00E0 parametro ricorsivo \"%{0};\" (percorso riferimento: {1}).
-+ EntityNotDeclared = L''entit\u00E0 "{0}" \u00E8 indicata da un riferimento, ma non \u00E8 dichiarata.
-+ ReferenceToUnparsedEntity = Il riferimento di entit\u00E0 non analizzata "&{0};" non \u00E8 consentito.
-+ RecursiveReference = Riferimento di entit\u00E0 ricorsivo "{0}" (percorso riferimento: {1}).
-+ RecursiveGeneralReference = Riferimento di entit\u00E0 generale ricorsivo "&{0};" (percorso riferimento: {1}).
-+ RecursivePEReference = Riferimento di entit\u00E0 parametro ricorsivo "%{0};" (percorso riferimento: {1}).
- # 4.3.3 Character Encoding in Entities
-- EncodingNotSupported = La codifica \"{0}\" non \u00E8 supportata.
-+ EncodingNotSupported = La codifica "{0}" non \u00E8 supportata.
- EncodingRequired = Un'entit\u00E0 analizzata non codificata in UTF-8 o UTF-16 deve contenere una dichiarazione di codifica.
-
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = L'elemento o l'attributo non corrisponde alla produzione del QName: QName::=(NCName':')?NCName.
-- ElementXMLNSPrefix = L''elemento \"{0}\" non pu\u00F2 avere \"xmlns\" come prefisso.
-- ElementPrefixUnbound = Il prefisso \"{0}\" per l''elemento \"{1}\" non \u00E8 associato.
-- AttributePrefixUnbound = Il prefisso \"{2}\" per l''attributo \"{1}\" associato a un tipo di elemento \"{0}\" non \u00E8 associato.
-- EmptyPrefixedAttName = Il valore dell''attributo \"{0}\" non \u00E8 valido. Le associazioni di spazi di nomi con prefisso non possono essere vuote.
-- PrefixDeclared = Il prefisso spazio di nomi \"{0}\" non \u00E8 stato dichiarato.
-+ ElementXMLNSPrefix = L''elemento "{0}" non pu\u00F2 avere "xmlns" come prefisso.
-+ ElementPrefixUnbound = Il prefisso "{0}" per l''elemento "{1}" non \u00E8 associato.
-+ AttributePrefixUnbound = Il prefisso "{2}" per l''attributo "{1}" associato a un tipo di elemento "{0}" non \u00E8 associato.
-+ EmptyPrefixedAttName = Il valore dell''attributo "{0}" non \u00E8 valido. Le associazioni di spazi di nomi con prefisso non possono essere vuote.
-+ PrefixDeclared = Il prefisso spazio di nomi "{0}" non \u00E8 stato dichiarato.
- CantBindXMLNS = Il prefisso "xmlns" non pu\u00F2 essere associato esplicitamente a uno spazio di nomi, n\u00E9 lo spazio di nomi per "xmlns" pu\u00F2 essere associato esplicitamente a un prefisso.
- CantBindXML = Il prefisso "xml" non pu\u00F2 essere associato a uno spazio di nomi diverso da quello al quale appartiene, n\u00E9 lo spazio di nomi per "xml" pu\u00F2 essere associato a un prefisso diverso da "xml".
-- MSG_ATT_DEFAULT_INVALID = defaultValue \"{1}\" dell''attributo \"{0}\" non valido per i vincoli lessicali di questo tipo di attributo.
-+ MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" dell''attributo "{0}" non valido per i vincoli lessicali di questo tipo di attributo.
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=Il parser ha rilevato pi\u00F9 \"{0}\" espansioni di entit\u00E0 nel documento. Questo \u00E8 il limite imposto dall''applicazione.
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: il parser ha rilevato pi\u00F9 "{0}" espansioni di entit\u00E0 nel documento. Questo \u00E8 il limite imposto dal kit JDK.
-+ ElementAttributeLimit=JAXP00010002: l''elemento "{0}" contiene pi\u00F9 di "{1}" attributi. "{1}" \u00E8 il limite imposto dal kit JDK.
-+ MaxEntitySizeLimit=JAXP00010003: la lunghezza dell''entit\u00E0 "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}".
-+ TotalEntitySizeLimit=JAXP00010004: le dimensioni accumulate "{0}" delle entit\u00E0 supera il limite "{1}" definito da "{2}".
-+ MaxXMLNameLimit=JAXP00010005: il nome "{0}" supera il limite "{1}" definito da "{2}".
-+ MaxElementDepthLimit=JAXP00010006: la profondit\u00E0 dell''elemento "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}".
-
--# 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-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D7\u30ED\u30ED\u30FC\u30B0\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
- InvalidCharInXMLDecl = XML\u5BA3\u8A00\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
- # 2.4 Character Data and Markup
-- CDEndInContent = \u6587\u5B57\u30B7\u30FC\u30B1\u30F3\u30B9\"]]>\"\u306F\u3001CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u7D42\u308F\u308A\u3092\u793A\u3059\u76EE\u7684\u4EE5\u5916\u3067\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-+ CDEndInContent = \u6587\u5B57\u30B7\u30FC\u30B1\u30F3\u30B9"]]>"\u306F\u3001CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u7D42\u308F\u308A\u3092\u793A\u3059\u76EE\u7684\u4EE5\u5916\u3067\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
- # 2.7 CDATA Sections
-- CDSectUnterminated = CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306F\"]]>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ CDSectUnterminated = CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u306F"]]>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = XML\u5BA3\u8A00\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u5148\u982D\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-- EqRequiredInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\"{0}\"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-- QuoteRequiredInXMLDecl = XML\u5BA3\u8A00\u306E\"{0}\"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- XMLDeclUnterminated = XML\u5BA3\u8A00\u306F\"?>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ EqRequiredInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001"{0}"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ QuoteRequiredInXMLDecl = XML\u5BA3\u8A00\u306E"{0}"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ XMLDeclUnterminated = XML\u5BA3\u8A00\u306F"?>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- VersionInfoRequired = XML\u5BA3\u8A00\u306B\u306F\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002
- SpaceRequiredBeforeVersionInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- SpaceRequiredBeforeEncodingInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-@@ -71,70 +43,71 @@
- ReferenceIllegalInTrailingMisc=\u5F8C\u7D9A\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u306F\u53C2\u7167\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = \u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5BA3\u8A00\u306E\u5024\u306F\u3001\"{0}\"\u3067\u306F\u306A\u304F\u3001\"yes\"\u307E\u305F\u306F\"no\"\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ SDDeclInvalid = \u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5BA3\u8A00\u306E\u5024\u306F\u3001"{0}"\u3067\u306F\u306A\u304F\u3001"yes"\u307E\u305F\u306F"no"\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ SDDeclNameInvalid = XML\u5BA3\u8A00\u306E\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u540D\u304C\u9593\u9055\u3063\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
- # 2.12 Language Identification
-- XMLLangInvalid = xml:lang\u5C5E\u6027\u306E\u5024\"{0}\"\u306F\u7121\u52B9\u306A\u8A00\u8A9E\u8B58\u5225\u5B50\u3067\u3059\u3002
-+ XMLLangInvalid = xml:lang\u5C5E\u6027\u306E\u5024"{0}"\u306F\u7121\u52B9\u306A\u8A00\u8A9E\u8B58\u5225\u5B50\u3067\u3059\u3002
- # 3. Logical Structures
-- ETagRequired = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u7D42\u4E86\u30BF\u30B0\"</{0}>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ ETagRequired = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u7D42\u4E86\u30BF\u30B0"</{0}>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5F8C\u306B\u306F\u3001\u5C5E\u6027\u6307\u5B9A\">\"\u307E\u305F\u306F\"/>\"\u304C\u5FC5\u8981\u3067\u3059\u3002
-- EqRequiredInAttribute = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\u540D\"{1}\"\u306E\u5F8C\u306B\u306F\u3001'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-- OpenQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\"{1}\"\u306B\u306F\u3001\u958B\u59CB\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
-- CloseQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\"{1}\"\u306B\u306F\u3001\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
-- AttributeNotUnique = \u5C5E\u6027\"{1}\"\u306F\u8981\u7D20\"{0}\"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-- AttributeNSNotUnique = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\"{2}\"\u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u305F\u5C5E\u6027\"{1}\"\u306F\u8981\u7D20\"{0}\"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-- ETagUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u7D42\u4E86\u30BF\u30B0\u306F''>''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ ElementUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5F8C\u306B\u306F\u3001\u5C5E\u6027\u6307\u5B9A">"\u307E\u305F\u306F"/>"\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ EqRequiredInAttribute = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\u540D"{1}"\u306E\u5F8C\u306B\u306F\u3001'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ OpenQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306B\u306F\u3001\u958B\u59CB\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ CloseQuoteExpected = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306B\u306F\u3001\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ AttributeNotUnique = \u5C5E\u6027"{1}"\u306F\u8981\u7D20"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-+ AttributeNSNotUnique = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9"{2}"\u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u305F\u5C5E\u6027"{1}"\u306F\u8981\u7D20"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-+ ETagUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u7D42\u4E86\u30BF\u30B0\u306F''>''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- MarkupNotRecognizedInContent = \u8981\u7D20\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u3001\u6574\u5F62\u5F0F\u306E\u6587\u5B57\u30C7\u30FC\u30BF\u307E\u305F\u306F\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u3067\u69CB\u6210\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- DoctypeIllegalInContent = \u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u306FDOCTYPE\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
- # 4.1 Character and Entity References
- ReferenceUnterminated = \u53C2\u7167\u306F';'\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 4.3.2 Well-Formed Parsed Entities
- ReferenceNotInOneEntity = \u53C2\u7167\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- ElementEntityMismatch = \u8981\u7D20\"{0}\"\u306F\u3001\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u3067\u958B\u59CB\u304A\u3088\u3073\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ ElementEntityMismatch = \u8981\u7D20"{0}"\u306F\u3001\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u3067\u958B\u59CB\u304A\u3088\u3073\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- MarkupEntityMismatch=XML\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u69CB\u9020\u306F\u3001\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u3067\u958B\u59CB\u304A\u3088\u3073\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = \u5C5E\u6027\"{1}\"\u306E\u5024\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{2})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u8981\u7D20\u306F\"{0}\"\u3067\u3059\u3002
-+ InvalidCharInAttValue = \u5C5E\u6027"{1}"\u306E\u5024\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{2})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u8981\u7D20\u306F"{0}"\u3067\u3059\u3002
- InvalidCharInComment = \u30B3\u30E1\u30F3\u30C8\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
- InvalidCharInPI = \u51E6\u7406\u547D\u4EE4\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
- InvalidCharInInternalSubset = DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
- InvalidCharInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = \u5C5E\u6027\"{1}\"\u306E\u5024\u306E\u5148\u982D\u306B\u306F\u3001\u4E00\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u307E\u305F\u306F\u4E8C\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-- LessthanInAttValue = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\"{1}\"\u306E\u5024\u306B\u306F\u3001''<''\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-- AttributeValueUnterminated = \u5C5E\u6027\"{1}\"\u306E\u5024\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u5F15\u7528\u7B26\u6587\u5B57\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ QuoteRequiredInAttValue = \u5C5E\u6027"{1}"\u306E\u5024\u306E\u5148\u982D\u306B\u306F\u3001\u4E00\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u307E\u305F\u306F\u4E8C\u91CD\u5F15\u7528\u7B26\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ LessthanInAttValue = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306E\u5024\u306B\u306F\u3001''<''\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-+ AttributeValueUnterminated = \u5C5E\u6027"{1}"\u306E\u5024\u306F\u3001\u5BFE\u5FDC\u3059\u308B\u5F15\u7528\u7B26\u6587\u5B57\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 2.5 Comments
-- InvalidCommentStart = \u30B3\u30E1\u30F3\u30C8\u306E\u5148\u982D\u306B\u306F\"<!--\"\u304C\u5FC5\u8981\u3067\u3059\u3002
-- DashDashInComment = \u30B3\u30E1\u30F3\u30C8\u5185\u3067\u306F\u6587\u5B57\u5217\"--\"\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-- CommentUnterminated = \u30B3\u30E1\u30F3\u30C8\u306F\"-->\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ InvalidCommentStart = \u30B3\u30E1\u30F3\u30C8\u306E\u5148\u982D\u306B\u306F"<!--"\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ DashDashInComment = \u30B3\u30E1\u30F3\u30C8\u5185\u3067\u306F\u6587\u5B57\u5217"--"\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-+ CommentUnterminated = \u30B3\u30E1\u30F3\u30C8\u306F"-->"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- COMMENT_NOT_IN_ONE_ENTITY = \u30B3\u30E1\u30F3\u30C8\u304C\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u56F2\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- # 2.6 Processing Instructions
- PITargetRequired = \u51E6\u7406\u547D\u4EE4\u306E\u5148\u982D\u306B\u306F\u30BF\u30FC\u30B2\u30C3\u30C8\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
- SpaceRequiredInPI = \u51E6\u7406\u547D\u4EE4\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u30C7\u30FC\u30BF\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- PIUnterminated = \u51E6\u7406\u547D\u4EE4\u306F\"?>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- ReservedPITarget = \"[xX][mM][lL]\"\u3068\u4E00\u81F4\u3059\u308B\u51E6\u7406\u547D\u4EE4\u30BF\u30FC\u30B2\u30C3\u30C8\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ PIUnterminated = \u51E6\u7406\u547D\u4EE4\u306F"?>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ ReservedPITarget = "[xX][mM][lL]"\u3068\u4E00\u81F4\u3059\u308B\u51E6\u7406\u547D\u4EE4\u30BF\u30FC\u30B2\u30C3\u30C8\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- PI_NOT_IN_ONE_ENTITY = \u51E6\u7406\u547D\u4EE4\u304C\u540C\u3058\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u56F2\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = \u30D0\u30FC\u30B8\u30E7\u30F3\"{0}\"\u306F\u7121\u52B9\u3067\u3059\u3002
-- VersionNotSupported = XML\u30D0\u30FC\u30B8\u30E7\u30F3\"{0}\"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u306E\u307F\u3067\u3059\u3002
-- VersionNotSupported11 = XML\u30D0\u30FC\u30B8\u30E7\u30F3\"{0}\"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u304A\u3088\u3073XML 1.1\u306E\u307F\u3067\u3059\u3002
-+ VersionInfoInvalid = \u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u306F\u7121\u52B9\u3067\u3059\u3002
-+ VersionNotSupported = XML\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u306E\u307F\u3067\u3059\u3002
-+ VersionNotSupported11 = XML\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u306E\u306FXML 1.0\u304A\u3088\u3073XML 1.1\u306E\u307F\u3067\u3059\u3002
- VersionMismatch= \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u5F8C\u7D9A\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u5225\u306E\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300110\u9032\u8868\u73FE\u306F\"&#\"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- HexdigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300116\u9032\u8868\u73FE\u306F\"&#x\"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ DigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300110\u9032\u8868\u73FE\u306F"&#"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ HexdigitRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u3067\u306F\u300116\u9032\u8868\u73FE\u306F"&#x"\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- SemicolonRequiredInCharRef = \u6587\u5B57\u53C2\u7167\u306F';'\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- InvalidCharRef = \u6587\u5B57\u53C2\u7167\"&#{0}\"\u306F\u7121\u52B9\u306AXML\u6587\u5B57\u3067\u3059\u3002
-+ InvalidCharRef = \u6587\u5B57\u53C2\u7167"&#{0}"\u306F\u7121\u52B9\u306AXML\u6587\u5B57\u3067\u3059\u3002
- NameRequiredInReference = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\u306F'&'\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- SemicolonRequiredInReference = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u3078\u306E\u53C2\u7167\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ SemicolonRequiredInReference = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 4.3.1 The Text Declaration
- TextDeclMustBeFirst = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306F\u3001\u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u5148\u982D\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-- EqRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\"{0}\"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-- QuoteRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E\"{0}\"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- CloseQuoteMissingInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E\"{0}\"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306B\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-+ EqRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001"{0}"\u306E\u5F8C\u306B'' = ''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ QuoteRequiredInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E"{0}"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306F\u3001\u5F15\u7528\u7B26\u3067\u56F2\u3093\u3060\u6587\u5B57\u5217\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ CloseQuoteMissingInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306E"{0}"\u306E\u5F8C\u306B\u7D9A\u304F\u5024\u306B\u7D42\u4E86\u5F15\u7528\u7B26\u304C\u3042\u308A\u307E\u305B\u3093\u3002
- SpaceRequiredBeforeVersionInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- SpaceRequiredBeforeEncodingInTextDecl = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- TextDeclUnterminated = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306F\"?>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ TextDeclUnterminated = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306F"?>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- EncodingDeclRequired = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u5BA3\u8A00\u304C\u5FC5\u8981\u3067\u3059\u3002
- NoMorePseudoAttributes = \u3053\u308C\u4EE5\u4E0A\u306E\u7591\u4F3C\u5C5E\u6027\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
- MorePseudoAttributes = \u7591\u4F3C\u5C5E\u6027\u304C\u3055\u3089\u306B\u5FC5\u8981\u3067\u3059\u3002
-@@ -143,13 +116,13 @@
- CommentNotInOneEntity = \u30B3\u30E1\u30F3\u30C8\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- PINotInOneEntity = \u51E6\u7406\u547D\u4EE4\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D\"{0}\"\u304C\u7121\u52B9\u3067\u3059\u3002
-- EncodingByteOrderUnsupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\"{0}\"\u306B\u6307\u5B9A\u3055\u308C\u305F\u30D0\u30A4\u30C8\u9806\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ EncodingDeclInvalid = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D"{0}"\u304C\u7121\u52B9\u3067\u3059\u3002
-+ EncodingByteOrderUnsupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0"{0}"\u306B\u6307\u5B9A\u3055\u308C\u305F\u30D0\u30A4\u30C8\u9806\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- InvalidByte = {1}\u30D0\u30A4\u30C8\u306EUTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u30D0\u30A4\u30C8{0}\u304C\u7121\u52B9\u3067\u3059\u3002
- ExpectedByte = {1}\u30D0\u30A4\u30C8\u306EUTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u30D0\u30A4\u30C8{0}\u304C\u5FC5\u8981\u3067\u3059\u3002
- InvalidHighSurrogate = UTF-8\u30B7\u30FC\u30B1\u30F3\u30B9\u306E\u4E0A\u4F4D\u30B5\u30ED\u30B2\u30FC\u30C8\u30FB\u30D3\u30C3\u30C8\u306E\u4E0A\u9650\u306F0x10\u3067\u3059\u304C\u30010x{0}\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-- OperationNotSupported = \u64CD\u4F5C\"{0}\"\u306F{1}\u30EA\u30FC\u30C0\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- InvalidASCII = \u30D0\u30A4\u30C8\"{0}\"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u30AD\u30E3\u30E9\u30AF\u30BF\u30FB\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+ OperationNotSupported = \u64CD\u4F5C"{0}"\u306F{1}\u30EA\u30FC\u30C0\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ InvalidASCII = \u30D0\u30A4\u30C8"{0}"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u6587\u5B57\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- CharConversionFailure = \u7279\u5B9A\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3042\u308B\u3068\u78BA\u5B9A\u3055\u308C\u305F\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u305D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u4E0D\u6B63\u306A\u30B7\u30FC\u30B1\u30F3\u30B9\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-
- # DTD Messages
-@@ -169,150 +142,150 @@
- PubidCharIllegal = \u516C\u958B\u8B58\u5225\u5B50\u3067\u306F\u3001\u6587\u5B57(Unicode: 0x{0})\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
- SpaceRequiredBetweenPublicAndSystem = \u516C\u958B\u8B58\u5225\u5B50\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\"<!DOCTYPE\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\"<!DOCTYPE\"\u306E\u5F8C\u306B\u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-- DoctypedeclUnterminated = \u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- PEReferenceWithinMarkup = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"%{0};\"\u306F\u3001DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5185\u306B\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!DOCTYPE"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!DOCTYPE"\u306E\u5F8C\u306B\u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ DoctypedeclUnterminated = \u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ PEReferenceWithinMarkup = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u306F\u3001DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5185\u306B\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306B\u542B\u307E\u308C\u308B\u304B\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u304C\u6307\u3057\u3066\u3044\u308B\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5BA3\u8A00\u306F\u6574\u5F62\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = \"xml:space\"\u306E\u5C5E\u6027\u5BA3\u8A00\u306F\u3001\"default\"\u304A\u3088\u3073\"preserve\"\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u308B\u5217\u6319\u30BF\u30A4\u30D7\u3068\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space"\u306E\u5C5E\u6027\u5BA3\u8A00\u306F\u3001"default"\u304A\u3088\u3073"preserve"\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u308B\u5217\u6319\u30BF\u30A4\u30D7\u3068\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\"<!ELEMENT\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"<!ELEMENT"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5F8C\u306B\u5236\u7D04\u304C\u5FC5\u8981\u3067\u3059\u3002
-- ElementDeclUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u8981\u7D20\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5F8C\u306B\u5236\u7D04\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ ElementDeclUnterminated = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F''(''\u6587\u5B57\u307E\u305F\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F''(''\u6587\u5B57\u307E\u305F\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MixedContentUnterminated = \u5B50\u8981\u7D20\u306E\u30BF\u30A4\u30D7\u304C\u5236\u7D04\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u6DF7\u5408\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\"{0}\"\u306F\")*\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5BA3\u8A00\u306B\u306F'')''\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MixedContentUnterminated = \u5B50\u8981\u7D20\u306E\u30BF\u30A4\u30D7\u304C\u5236\u7D04\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u6DF7\u5408\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB"{0}"\u306F")*"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\"<!ATTLIST\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001"<!ATTLIST"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = \u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u8981\u7D20\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u540D\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- AttNameRequiredInAttDef = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{1}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- AttTypeRequiredInAttDef = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{1}\"\u306E\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{1}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u7279\u5B9A\u306E\u8981\u7D20\"{0}\"\u306E\u540C\u4E00\u5C5E\u6027\"{1}\"\u306B\u8907\u6570\u306E\u5C5E\u6027\u5B9A\u7FA9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u8981\u7D20"{0}"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u540D\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ AttNameRequiredInAttDef = \u8981\u7D20"{0}"\u306E\u5C5E\u6027\u30EA\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{1}"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ AttTypeRequiredInAttDef = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{1}"\u306E\u5BA3\u8A00\u306B\u306F\u5C5E\u6027\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{1}"\u306E\u5BA3\u8A00\u3067\u306F\u3001\u5C5E\u6027\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u7279\u5B9A\u306E\u8981\u7D20"{0}"\u306E\u540C\u4E00\u5C5E\u6027"{1}"\u306B\u8907\u6570\u306E\u5C5E\u6027\u5B9A\u7FA9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001\"NOTATION\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001\"NOTATION\"\u306E\u5F8C\u306B''(''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- NotationTypeUnterminated = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002
-- EnumerationUnterminated = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{2}\"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024\"{1}\"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306EEnumeration\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNMTOKENS\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u8981\u7D20\"{0}\"\u306E\u5C5E\u6027\"{2}\"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024\"{1}\"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306ENotationType\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNOTATION\u306E\u540D\u524D\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001"NOTATION"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = "{1}"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001"NOTATION"\u306E\u5F8C\u306B''(''\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ NotationTypeUnterminated = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306B\u306F\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ EnumerationUnterminated = "{1}"\u5C5E\u6027\u5BA3\u8A00\u306E\u5217\u6319\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u306F'')''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{2}"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024"{1}"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306EEnumeration\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNMTOKENS\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u8981\u7D20"{0}"\u306E\u5C5E\u6027"{2}"\u306E\u5BA3\u8A00\u3067\u5217\u6319\u5024"{1}"\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u5358\u4E00\u306ENotationType\u5C5E\u6027\u5BA3\u8A00\u306B\u304A\u3051\u308BNOTATION\u306E\u540D\u524D\u306F\u3059\u3079\u3066\u7570\u306A\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \"{1}\"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001\"FIXED\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}"\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001"FIXED"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = \u5305\u542B\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306F\"]]>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- IgnoreSectUnterminated = \u9664\u5916\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u6700\u5F8C\u306F\"]]>\"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ IncludeSectUnterminated = \u5305\u542B\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306F"]]>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ IgnoreSectUnterminated = \u9664\u5916\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u306E\u6700\u5F8C\u306F"]]>"\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 4.1 Character and Entity References
- NameRequiredInPEReference = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\u306F'%'\u306E\u76F4\u5F8C\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- SemicolonRequiredInPEReference = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"%{0};\"\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ SemicolonRequiredInPEReference = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u306F'';''\u30C7\u30EA\u30DF\u30BF\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001\"<!ENTITY\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001\"<!ENTITY\"\u3068'%'\u6587\u5B57\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001"<!ENTITY"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001"<!ENTITY"\u3068'%'\u6587\u5B57\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001'%'\u3068\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u306B\u306F\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D\"{0}\"\u3068\u5B9A\u7FA9\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\"NDATA\"\u3068\u8868\u8A18\u540D\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\"NDATA\"\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u5BA3\u8A00\u3067\u306F\u3001\"NDATA\"\u306E\u5F8C\u306B\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- EntityDeclUnterminated = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_DUPLICATE_ENTITY_DEFINITION = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u304C\u8907\u6570\u56DE\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u540D"{0}"\u3068\u5B9A\u7FA9\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u3067\u306F\u3001"NDATA"\u3068\u8868\u8A18\u540D\u306E\u9593\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u3067\u306F\u3001"NDATA"\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u3067\u306F\u3001"NDATA"\u306E\u5F8C\u306B\u8868\u8A18\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ EntityDeclUnterminated = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_DUPLICATE_ENTITY_DEFINITION = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u304C\u8907\u6570\u56DE\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
- # 4.2.2 External Entities
-- ExternalIDRequired = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u306E\u5148\u982D\u306B\u306F\"SYSTEM\"\u307E\u305F\u306F\"PUBLIC\"\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \"PUBLIC\"\u3068\u516C\u958B\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ ExternalIDRequired = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u306E\u5148\u982D\u306B\u306F"SYSTEM"\u307E\u305F\u306F"PUBLIC"\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC"\u3068\u516C\u958B\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u516C\u958B\u8B58\u5225\u5B50\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \"SYSTEM\"\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_URI_FRAGMENT_IN_SYSTEMID = \u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u8B58\u5225\u5B50\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\"{0}\"\u306E\u4E00\u90E8\u3068\u3057\u3066\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM"\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = \u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u8B58\u5225\u5B50\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50"{0}"\u306E\u4E00\u90E8\u3068\u3057\u3066\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001\"<!NOTATION\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001"<!NOTATION"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u306B\u306F\u8868\u8A18\u306E\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001\u8868\u8A18\u540D\"{0}\"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-- ExternalIDorPublicIDRequired = \u8868\u8A18\u6CD5\"{0}\"\u306E\u5BA3\u8A00\u306B\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u307E\u305F\u306F\u516C\u958B\u8B58\u5225\u5B50\u3092\u542B\u3081\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- NotationDeclUnterminated = \u8868\u8A18\u6CD5\"{0}\"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u306F\u3001\u8868\u8A18\u540D"{0}"\u306E\u5F8C\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ ExternalIDorPublicIDRequired = \u8868\u8A18\u6CD5"{0}"\u306E\u5BA3\u8A00\u306B\u306F\u3001\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u307E\u305F\u306F\u516C\u958B\u8B58\u5225\u5B50\u3092\u542B\u3081\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ NotationDeclUnterminated = \u8868\u8A18\u6CD5"{0}"\u306E\u5BA3\u8A00\u306F''>''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-
- # Validation messages
-- DuplicateTypeInMixedContent = \u8981\u7D20\u30BF\u30A4\u30D7\"{1}\"\u306F\u3001\u8981\u7D20\u5BA3\u8A00\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-- ENTITIESInvalid = \u30BF\u30A4\u30D7ENTITIES\u306E\u5C5E\u6027\u5024\"{1}\"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- ENTITYInvalid = \u30BF\u30A4\u30D7ENTITY\u306E\u5C5E\u6027\u5024\"{1}\"\u306F\u3001\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- IDDefaultTypeInvalid = ID\u5C5E\u6027\"{0}\"\u306B\u306F\u3001\"#IMPLIED\"\u307E\u305F\u306F\"#REQUIRED\"\u306E\u5BA3\u8A00\u6E08\u30C7\u30D5\u30A9\u30EB\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- IDInvalid = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- IDInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024\"{0}\"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- IDNotUnique = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u4E00\u610F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- IDREFInvalid = \u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- IDREFInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024\"{0}\"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- IDREFSInvalid = \u30BF\u30A4\u30D7IDREFS\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u304C\u5B8C\u5168\u306A\u5BA3\u8A00\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- ImproperDeclarationNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- ImproperGroupNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u4E38\u30AB\u30C3\u30B3\u306E\u30DA\u30A2\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- INVALID_PE_IN_CONDITIONAL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u5168\u4F53\u304B\u3001INCLUDE\u307E\u305F\u306FIGNORE\u306E\u307F\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_ATTRIBUTE_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u5BFE\u3057\u3066\u5C5E\u6027\"{1}\"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5024\"{1}\"\u3092\u6301\u3064\u5C5E\u6027\"{0}\"\u306B\u306F\u3001\u30EA\u30B9\u30C8\"{2}\"\u304B\u3089\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5C5E\u6027\"{0}\"\u306E\u5024\"{1}\"\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6B63\u898F\u5316\u306B\u3088\u3063\u3066(\"{2}\"\u306B)\u5909\u66F4\u3055\u308C\u306A\u3044\u3088\u3046\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_CONTENT_INCOMPLETE = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E0D\u5B8C\u5168\u3067\u3059\u3002\"{1}\"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_CONTENT_INVALID = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\"{1}\"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_CONTENT_INVALID_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\"{1}\"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7\"{2}\"\u306E\u5B50\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306E\u5C5E\u6027\"{1}\"\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u6301\u3061\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_DUPLICATE_ATTDEF = \u5C5E\u6027\"{1}\"\u306F\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-- MSG_ELEMENT_ALREADY_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306F\u8907\u6570\u56DE\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-- MSG_ELEMENT_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_GRAMMAR_NOT_FOUND = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u7121\u52B9\u3067\u3059\u3002\u69CB\u6587\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-- MSG_ELEMENT_WITH_ID_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u8B58\u5225\u5B50\"{0}\"\u3092\u6301\u3064\u8981\u7D20\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- MSG_FIXED_ATTVALUE_INVALID = \u5024\"{2}\"\u3092\u6301\u3064\u5C5E\u6027\"{1}\"\u306B\u306F\u3001\"{3}\"\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u306F\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\"{1}\"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\"{2}\"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027\"{1}\"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027\"{2}\"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5C5E\u6027\"{0}\"\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5\"{1}\"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \"{0}\"\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5\"{1}\"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5C5E\u6027\"{1}\"\u304C\u5FC5\u8981\u3067\u3059\u3002\u3053\u306E\u5C5E\u6027\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u5BFE\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ DuplicateTypeInMixedContent = \u8981\u7D20\u30BF\u30A4\u30D7"{1}"\u306F\u3001\u8981\u7D20\u5BA3\u8A00"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u3059\u3067\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-+ ENTITIESInvalid = \u30BF\u30A4\u30D7ENTITIES\u306E\u5C5E\u6027\u5024"{1}"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ ENTITYInvalid = \u30BF\u30A4\u30D7ENTITY\u306E\u5C5E\u6027\u5024"{1}"\u306F\u3001\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ IDDefaultTypeInvalid = ID\u5C5E\u6027"{0}"\u306B\u306F\u3001"#IMPLIED"\u307E\u305F\u306F"#REQUIRED"\u306E\u5BA3\u8A00\u6E08\u30C7\u30D5\u30A9\u30EB\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ IDInvalid = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ IDInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024"{0}"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ IDNotUnique = \u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u4E00\u610F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ IDREFInvalid = \u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ IDREFInvalidWithNamespaces = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5834\u5408\u3001\u30BF\u30A4\u30D7IDREF\u306E\u5C5E\u6027\u5024"{0}"\u306FNCName\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ IDREFSInvalid = \u30BF\u30A4\u30D7IDREFS\u306E\u5C5E\u6027\u5024"{0}"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\u304C\u5B8C\u5168\u306A\u5BA3\u8A00\u3068\u3057\u3066\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ ImproperDeclarationNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ ImproperGroupNesting = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u9069\u5207\u306B\u30CD\u30B9\u30C8\u3055\u308C\u305F\u4E38\u30AB\u30C3\u30B3\u306E\u30DA\u30A2\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ INVALID_PE_IN_CONDITIONAL = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u7F6E\u63DB\u30C6\u30AD\u30B9\u30C8\u306B\u306F\u3001\u6761\u4EF6\u4ED8\u304D\u30BB\u30AF\u30B7\u30E7\u30F3\u5168\u4F53\u304B\u3001INCLUDE\u307E\u305F\u306FIGNORE\u306E\u307F\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_ATTRIBUTE_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u5C5E\u6027"{1}"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5024"{1}"\u3092\u6301\u3064\u5C5E\u6027"{0}"\u306B\u306F\u3001\u30EA\u30B9\u30C8"{2}"\u304B\u3089\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5C5E\u6027"{0}"\u306E\u5024"{1}"\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6B63\u898F\u5316\u306B\u3088\u3063\u3066("{2}"\u306B)\u5909\u66F4\u3055\u308C\u306A\u3044\u3088\u3046\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_CONTENT_INCOMPLETE = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u4E0D\u5B8C\u5168\u3067\u3059\u3002"{1}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_CONTENT_INVALID = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F"{1}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_CONTENT_INVALID_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F"{1}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7"{2}"\u306E\u5B50\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u5C5E\u6027"{1}"\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u6301\u3061\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_DUPLICATE_ATTDEF = \u5C5E\u6027"{1}"\u306F\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-+ MSG_ELEMENT_ALREADY_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306F\u8907\u6570\u56DE\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-+ MSG_ELEMENT_NOT_DECLARED = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_GRAMMAR_NOT_FOUND = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u7121\u52B9\u3067\u3059: \u69CB\u6587\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-+ MSG_ELEMENT_WITH_ID_REQUIRED = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u8B58\u5225\u5B50"{0}"\u3092\u6301\u3064\u8981\u7D20\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ MSG_FIXED_ATTVALUE_INVALID = \u5024"{2}"\u3092\u6301\u3064\u5C5E\u6027"{1}"\u306B\u306F\u3001"{3}"\u306E\u5024\u304C\u5FC5\u8981\u3067\u3059\u3002
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u306F\u3001\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027"{1}"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7ID\u306E\u5C5E\u6027"{2}"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027"{1}"\u304C\u3059\u3067\u306B\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027"{2}"\u3092\u3082\u30461\u3064\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5C5E\u6027"{0}"\u306E\u8868\u8A18\u6CD5\u30BF\u30A4\u30D7\u30FB\u30EA\u30B9\u30C8\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5"{1}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = "{0}"\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5BA3\u8A00\u3067\u53C2\u7167\u3055\u308C\u308B\u5834\u5408\u3001\u8868\u8A18\u6CD5"{1}"\u3092\u5BA3\u8A00\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u3078\u306E\u53C2\u7167\u306F\u3001\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5C5E\u6027"{1}"\u304C\u5FC5\u8981\u3067\u3059\u3002\u3053\u306E\u5C5E\u6027\u306F\u3001\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u5BFE\u3057\u3066\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3067\u306F\u3001\u8981\u7D20\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u6301\u3064\u5916\u90E8\u306E\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u3067\u5BA3\u8A00\u3055\u308C\u308B\u8981\u7D20\u9593\u306B\u7A7A\u767D\u306F\u4E0D\u8981\u3067\u3059\u3002
-- NMTOKENInvalid = \u30BF\u30A4\u30D7NMTOKEN\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u3001\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- NMTOKENSInvalid = \u30BF\u30A4\u30D7NMTOKENS\u306E\u5C5E\u6027\u5024\"{0}\"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- NoNotationOnEmptyElement = EMPTY\u3068\u5BA3\u8A00\u3055\u308C\u305F\u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u3067\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027\"{1}\"\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093\u3002
-- RootElementTypeMustMatchDoctypedecl = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30EB\u30FC\u30C8\u8981\u7D20\"{1}\"\u306FDOCTYPE\u30EB\u30FC\u30C8\"{0}\"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- UndeclaredElementInContentSpec = \u8981\u7D20\"{0}\"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u672A\u5BA3\u8A00\u306E\u8981\u7D20\"{1}\"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-- UniqueNotationName = \u8868\u8A18\u6CD5\"{0}\"\u306E\u5BA3\u8A00\u304C\u4E00\u610F\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u540C\u3058\u540D\u524D\u3092\u8907\u6570\u306E\u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-+ NMTOKENInvalid = \u30BF\u30A4\u30D7NMTOKEN\u306E\u5C5E\u6027\u5024"{0}"\u306F\u3001\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ NMTOKENSInvalid = \u30BF\u30A4\u30D7NMTOKENS\u306E\u5C5E\u6027\u5024"{0}"\u306F\u30011\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u30C8\u30FC\u30AF\u30F3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ NoNotationOnEmptyElement = EMPTY\u3068\u5BA3\u8A00\u3055\u308C\u305F\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u3067\u306F\u3001\u30BF\u30A4\u30D7NOTATION\u306E\u5C5E\u6027"{1}"\u3092\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093\u3002
-+ RootElementTypeMustMatchDoctypedecl = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30EB\u30FC\u30C8\u8981\u7D20"{1}"\u306FDOCTYPE\u30EB\u30FC\u30C8"{0}"\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ UndeclaredElementInContentSpec = \u8981\u7D20"{0}"\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u3067\u672A\u5BA3\u8A00\u306E\u8981\u7D20"{1}"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-+ UniqueNotationName = \u8868\u8A18\u6CD5"{0}"\u306E\u5BA3\u8A00\u304C\u4E00\u610F\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u540C\u3058\u540D\u524D\u3092\u8907\u6570\u306E\u8868\u8A18\u6CD5\u5BA3\u8A00\u3067\u5BA3\u8A00\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
- ENTITYFailedInitializeGrammar = ENTITYDatatype\u30D0\u30EA\u30C7\u30FC\u30BF: \u6709\u52B9\u306A\u69CB\u6587\u53C2\u7167\u306B\u3088\u308B\u521D\u671F\u5316\u30E1\u30BD\u30C3\u30C9\u306E\u547C\u51FA\u3057\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002 \t
-- ENTITYNotUnparsed = ENTITY \"{0}\"\u306F\u672A\u89E3\u6790\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-- ENTITYNotValid = ENTITY \"{0}\"\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+ ENTITYNotUnparsed = ENTITY "{0}"\u306F\u672A\u89E3\u6790\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+ ENTITYNotValid = ENTITY "{0}"\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- EmptyList = \u30BF\u30A4\u30D7ENTITIES\u3001IDREFS\u304A\u3088\u3073NMTOKENS\u306E\u5024\u306F\u7A7A\u306E\u30EA\u30B9\u30C8\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"&{0};\"\u306F\u3001\u5C5E\u6027\u5024\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"&{0};"\u306F\u3001\u5C5E\u6027\u5024\u3067\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ AccessExternalDTD = \u5916\u90E8DTD: accessExternalDTD\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650\u306B\u3088\u308A''{1}''\u30A2\u30AF\u30BB\u30B9\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u5916\u90E8DTD ''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-+ AccessExternalEntity = \u5916\u90E8\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3: accessExternalDTD\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650\u306B\u3088\u308A''{1}''\u30A2\u30AF\u30BB\u30B9\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u5916\u90E8\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\"{0}\"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- ReferenceToUnparsedEntity = \u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"&{0};\"\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- RecursiveReference = \u518D\u5E30\u7684\u306A\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"{0}\"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
-- RecursiveGeneralReference = \u518D\u5E30\u7684\u306A\u4E00\u822C\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"&{0};\"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
-- RecursivePEReference = \u518D\u5E30\u7684\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167\"%{0};\"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
-+ EntityNotDeclared = \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u304C\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ ReferenceToUnparsedEntity = \u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"&{0};"\u306F\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ RecursiveReference = \u518D\u5E30\u7684\u306A\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"{0}"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
-+ RecursiveGeneralReference = \u518D\u5E30\u7684\u306A\u4E00\u822C\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"&{0};"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
-+ RecursivePEReference = \u518D\u5E30\u7684\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u3067\u3059\u3002(\u53C2\u7167\u30D1\u30B9: {1})\u3001
- # 4.3.3 Character Encoding in Entities
-- EncodingNotSupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\"{0}\"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ EncodingNotSupported = \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0"{0}"\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- EncodingRequired = \u30A8\u30F3\u30B3\u30FC\u30C9\u304CUTF-8\u3068UTF-16\u306E\u3044\u305A\u308C\u3067\u3082\u306A\u3044\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = \u8981\u7D20\u307E\u305F\u306F\u5C5E\u6027\u304CQName\u751F\u6210\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: QName::=(NCName':')?NCName\u3002
-- ElementXMLNSPrefix = \u8981\u7D20\"{0}\"\u306E\u63A5\u982D\u8F9E\u3068\u3057\u3066\"xmlns\"\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-- ElementPrefixUnbound = \u8981\u7D20\"{1}\"\u306E\u63A5\u982D\u8F9E\"{0}\"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- AttributePrefixUnbound = \u8981\u7D20\u30BF\u30A4\u30D7\"{0}\"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027\"{1}\"\u306E\u63A5\u982D\u8F9E\"{2}\"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- EmptyPrefixedAttName = \u5C5E\u6027\"{0}\"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059\u3002\u63A5\u982D\u8F9E\u306E\u4ED8\u3044\u305F\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u30FB\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-- PrefixDeclared = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u63A5\u982D\u8F9E\"{0}\"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ ElementXMLNSPrefix = \u8981\u7D20"{0}"\u306E\u63A5\u982D\u8F9E\u3068\u3057\u3066"xmlns"\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
-+ ElementPrefixUnbound = \u8981\u7D20"{1}"\u306E\u63A5\u982D\u8F9E"{0}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ AttributePrefixUnbound = \u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u3044\u308B\u5C5E\u6027"{1}"\u306E\u63A5\u982D\u8F9E"{2}"\u304C\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ EmptyPrefixedAttName = \u5C5E\u6027"{0}"\u306E\u5024\u304C\u7121\u52B9\u3067\u3059\u3002\u63A5\u982D\u8F9E\u306E\u4ED8\u3044\u305F\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u30FB\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-+ PrefixDeclared = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u63A5\u982D\u8F9E"{0}"\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- CantBindXMLNS = \u63A5\u982D\u8F9E"xmlns"\u306F\u3001\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u660E\u793A\u7684\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002\u307E\u305F\u3001"xmlns"\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3082\u3001\u63A5\u982D\u8F9E\u306B\u660E\u793A\u7684\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002
- CantBindXML = \u63A5\u982D\u8F9E"xml"\u306F\u3001\u901A\u5E38\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u4EE5\u5916\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002\u307E\u305F\u3001"xml"\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3082\u3001"xml"\u4EE5\u5916\u306E\u63A5\u982D\u8F9E\u306B\u30D0\u30A4\u30F3\u30C9\u3067\u304D\u307E\u305B\u3093\u3002
-- MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027\"{0}\"\u306EdefaultValue \"{1}\"\u306F\u3001\u3053\u306E\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u5B57\u53E5\u5236\u7D04\u306B\u95A2\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+ MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027"{0}"\u306EdefaultValue "{1}"\u306F\u3001\u3053\u306E\u5C5E\u6027\u30BF\u30A4\u30D7\u306E\u5B57\u53E5\u5236\u7D04\u306B\u95A2\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=\u30D1\u30FC\u30B5\u30FC\u306B\u3088\u3063\u3066\u3001\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\"{0}\"\u3092\u8D85\u3048\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u62E1\u5F35\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u308C\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: \u30D1\u30FC\u30B5\u30FC\u306B\u3088\u3063\u3066\u3001\u3053\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067"{0}"\u3092\u8D85\u3048\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u62E1\u5F35\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u308C\u306F\u3001JDK\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
-+ ElementAttributeLimit=JAXP00010002: \u8981\u7D20"{0}"\u306B"{1}"\u3092\u8D85\u3048\u308B\u5C5E\u6027\u304C\u5B58\u5728\u3057\u307E\u3059\u3002"{1}"\u306F\u3001JDK\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002
-+ MaxEntitySizeLimit=JAXP00010003: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u9577\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
-+ TotalEntitySizeLimit=JAXP00010004: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u7D2F\u7A4D\u30B5\u30A4\u30BA"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u307E\u3057\u305F\u3002
-+ MaxXMLNameLimit=JAXP00010005: \u540D\u524D"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
-+ MaxElementDepthLimit=JAXP00010006: \u8981\u7D20"{0}"\u306E\u6DF1\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
-
--# 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 2014-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = \uBB38\uC11C\uC758 \uD504\uB864\uB85C\uADF8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- InvalidCharInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- # 2.4 Character Data and Markup
-- CDEndInContent = \uBB38\uC790 \uC2DC\uD000\uC2A4 \"]]>\"\uB294 CDATA \uC139\uC158 \uB05D\uC744 \uD45C\uC2DC\uD558\uB294 \uB370 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 \uCF58\uD150\uCE20\uC5D0 \uB098\uD0C0\uB098\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-+ CDEndInContent = \uBB38\uC790 \uC2DC\uD000\uC2A4 "]]>"\uB294 CDATA \uC139\uC158 \uB05D\uC744 \uD45C\uC2DC\uD558\uB294 \uB370 \uC0AC\uC6A9\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 \uCF58\uD150\uCE20\uC5D0 \uB098\uD0C0\uB098\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
- # 2.7 CDATA Sections
-- CDSectUnterminated = CDATA \uC139\uC158\uC740 \"]]>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ CDSectUnterminated = CDATA \uC139\uC158\uC740 "]]>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = XML \uC120\uC5B8\uC740 \uBB38\uC11C \uB9E8 \uC55E\uC5D0\uB9CC \uB098\uD0C0\uB0A0 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-- EqRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \"{0}\" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-- QuoteRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C \"{0}\" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- XMLDeclUnterminated = XML \uC120\uC5B8\uC740 \"?>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ EqRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 "{0}" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-+ QuoteRequiredInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C "{0}" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ XMLDeclUnterminated = XML \uC120\uC5B8\uC740 "?>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- VersionInfoRequired = XML \uC120\uC5B8\uC5D0\uB294 \uBC84\uC804\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- SpaceRequiredBeforeVersionInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \uBC84\uC804 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- SpaceRequiredBeforeEncodingInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \uC778\uCF54\uB529 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-@@ -71,70 +43,71 @@
- ReferenceIllegalInTrailingMisc=\uD6C4\uD589 \uC139\uC158\uC5D0\uC11C\uB294 \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = \uB3C5\uB9BD\uD615 \uBB38\uC11C \uC120\uC5B8 \uAC12\uC740 \"{0}\"\uC774(\uAC00) \uC544\uB2CC \"yes\" \uB610\uB294 \"no\"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-+ SDDeclInvalid = \uB3C5\uB9BD\uD615 \uBB38\uC11C \uC120\uC5B8 \uAC12\uC740 "{0}"\uC774(\uAC00) \uC544\uB2CC "yes" \uB610\uB294 "no"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-+ SDDeclNameInvalid = XML \uC120\uC5B8\uC758 \uB3C5\uB9BD\uD615 \uC774\uB984\uC758 \uCCA0\uC790\uAC00 \uC798\uBABB\uB418\uC5C8\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
- # 2.12 Language Identification
-- XMLLangInvalid = xml:lang \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC5B8\uC5B4 \uC2DD\uBCC4\uC790\uC785\uB2C8\uB2E4.
-+ XMLLangInvalid = xml:lang \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC5B8\uC5B4 \uC2DD\uBCC4\uC790\uC785\uB2C8\uB2E4.
- # 3. Logical Structures
-- ETagRequired = \uC694\uC18C \uC720\uD615 \"{0}\"\uC740(\uB294) \uC9DD\uC774 \uB9DE\uB294 \uC885\uB8CC \uD0DC\uADF8 \"</{0}>\"(\uC73C)\uB85C \uC885\uB8CC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ ETagRequired = \uC694\uC18C \uC720\uD615 "{0}"\uC740(\uB294) \uC9DD\uC774 \uB9DE\uB294 \uC885\uB8CC \uD0DC\uADF8 "</{0}>"(\uC73C)\uB85C \uC885\uB8CC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = \uC694\uC18C \uC720\uD615 \"{0}\" \uB2E4\uC74C\uC5D0\uB294 \uC18D\uC131 \uC0AC\uC591 \">\" \uB610\uB294 \"/>\"\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-- EqRequiredInAttribute = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \uC18D\uC131 \uC774\uB984 \"{1}\" \uB2E4\uC74C\uC5D0\uB294 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-- OpenQuoteExpected = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \"{1}\" \uC18D\uC131\uC5D0\uB294 \uC5EC\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-- CloseQuoteExpected = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \"{1}\" \uC18D\uC131\uC5D0\uB294 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-- AttributeNotUnique = \"{1}\" \uC18D\uC131\uC774 \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-- AttributeNSNotUnique = \"{2}\" \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB41C \"{1}\" \uC18D\uC131\uC774 \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-- ETagUnterminated = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \uC885\uB8CC \uD0DC\uADF8\uB294 ''>'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ ElementUnterminated = \uC694\uC18C \uC720\uD615 "{0}" \uB2E4\uC74C\uC5D0\uB294 \uC18D\uC131 \uC0AC\uC591 ">" \uB610\uB294 "/>"\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-+ EqRequiredInAttribute = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C \uC18D\uC131 \uC774\uB984 "{1}" \uB2E4\uC74C\uC5D0\uB294 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-+ OpenQuoteExpected = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC5D0\uB294 \uC5EC\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ CloseQuoteExpected = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC5D0\uB294 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ AttributeNotUnique = "{1}" \uC18D\uC131\uC774 "{0}" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-+ AttributeNSNotUnique = "{2}" \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB41C "{1}" \uC18D\uC131\uC774 "{0}" \uC694\uC18C\uC5D0 \uB300\uD574 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-+ ETagUnterminated = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uC885\uB8CC \uD0DC\uADF8\uB294 ''>'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- MarkupNotRecognizedInContent = \uC694\uC18C \uCF58\uD150\uCE20\uB294 \uC62C\uBC14\uB978 \uD615\uC2DD\uC758 \uBB38\uC790 \uB370\uC774\uD130 \uB610\uB294 \uB9C8\uD06C\uC5C5\uC73C\uB85C \uAD6C\uC131\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- DoctypeIllegalInContent = \uCF58\uD150\uCE20\uC5D0\uC11C\uB294 DOCTYPE\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- # 4.1 Character and Entity References
- ReferenceUnterminated = \uCC38\uC870\uB294 ';' \uAD6C\uBD84\uC790\uB85C \uC885\uB8CC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- # 4.3.2 Well-Formed Parsed Entities
- ReferenceNotInOneEntity = \uCC38\uC870\uB294 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- ElementEntityMismatch = \"{0}\" \uC694\uC18C\uB294 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC2DC\uC791\uB418\uACE0 \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ ElementEntityMismatch = "{0}" \uC694\uC18C\uB294 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC2DC\uC791\uB418\uACE0 \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- MarkupEntityMismatch=XML \uBB38\uC11C \uAD6C\uC870\uB294 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC2DC\uC791\uB418\uACE0 \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = \"{1}\" \uC18D\uC131\uC758 \uAC12\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{2})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC73C\uBA70 \uC694\uC18C\uAC00 \"{0}\"\uC785\uB2C8\uB2E4.
-+ InvalidCharInAttValue = "{1}" \uC18D\uC131\uC758 \uAC12\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{2})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC73C\uBA70 \uC694\uC18C\uAC00 "{0}"\uC785\uB2C8\uB2E4.
- InvalidCharInComment = \uC8FC\uC11D\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- InvalidCharInPI = \uCC98\uB9AC \uBA85\uB839\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- InvalidCharInInternalSubset = DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- InvalidCharInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = \"{1}\" \uC18D\uC131\uC758 \uAC12\uC740 \uC791\uC740 \uB530\uC634\uD45C \uB610\uB294 \uD070 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-- LessthanInAttValue = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \"{1}\" \uC18D\uC131\uC758 \uAC12\uC5D0\uB294 ''<'' \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-- AttributeValueUnterminated = \"{1}\" \uC18D\uC131\uC758 \uAC12\uC740 \uC9DD\uC774 \uB9DE\uB294 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ QuoteRequiredInAttValue = "{1}" \uC18D\uC131\uC758 \uAC12\uC740 \uC791\uC740 \uB530\uC634\uD45C \uB610\uB294 \uD070 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ LessthanInAttValue = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC758 \uAC12\uC5D0\uB294 ''<'' \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-+ AttributeValueUnterminated = "{1}" \uC18D\uC131\uC758 \uAC12\uC740 \uC9DD\uC774 \uB9DE\uB294 \uB530\uC634\uD45C \uBB38\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- # 2.5 Comments
-- InvalidCommentStart = \uC8FC\uC11D\uC740 \"<!--\"\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-- DashDashInComment = \uC8FC\uC11D\uC5D0\uC11C\uB294 \"--\" \uBB38\uC790\uC5F4\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- CommentUnterminated = \uC8FC\uC11D\uC740 \"-->\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ InvalidCommentStart = \uC8FC\uC11D\uC740 "<!--"\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ DashDashInComment = \uC8FC\uC11D\uC5D0\uC11C\uB294 "--" \uBB38\uC790\uC5F4\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ CommentUnterminated = \uC8FC\uC11D\uC740 "-->"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- COMMENT_NOT_IN_ONE_ENTITY = \uC8FC\uC11D\uC774 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0 \uC548\uC5D0 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- # 2.6 Processing Instructions
- PITargetRequired = \uCC98\uB9AC \uBA85\uB839\uC740 \uB300\uC0C1 \uC774\uB984\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
- SpaceRequiredInPI = \uCC98\uB9AC \uBA85\uB839 \uB300\uC0C1\uACFC \uB370\uC774\uD130 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- PIUnterminated = \uCC98\uB9AC \uBA85\uB839\uC740 \"?>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-- ReservedPITarget = \"[xX][mM][lL]\"\uACFC \uC77C\uCE58\uD558\uB294 \uCC98\uB9AC \uBA85\uB839 \uB300\uC0C1\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ PIUnterminated = \uCC98\uB9AC \uBA85\uB839\uC740 "?>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ ReservedPITarget = "[xX][mM][lL]"\uACFC \uC77C\uCE58\uD558\uB294 \uCC98\uB9AC \uBA85\uB839 \uB300\uC0C1\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- PI_NOT_IN_ONE_ENTITY = \uCC98\uB9AC \uBA85\uB839\uC774 \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0 \uC548\uC5D0 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = \"{0}\"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uBC84\uC804\uC785\uB2C8\uB2E4.
-- VersionNotSupported = XML \uBC84\uC804 \"{0}\"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
-- VersionNotSupported11 = XML \uBC84\uC804 \"{0}\"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0 \uBC0F XML 1.1\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
-+ VersionInfoInvalid = "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uBC84\uC804\uC785\uB2C8\uB2E4.
-+ VersionNotSupported = XML \uBC84\uC804 "{0}"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
-+ VersionNotSupported11 = XML \uBC84\uC804 "{0}"\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XML 1.0 \uBC0F XML 1.1\uB9CC \uC9C0\uC6D0\uB429\uB2C8\uB2E4.
- VersionMismatch= \uD558\uB098\uC758 \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uC774\uD6C4 \uBC84\uC804\uC758 \uB2E4\uB978 \uC5D4\uD2F0\uD2F0\uAC00 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 \"&#\" \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC2ED\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
-- HexdigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 \"&#x\" \uBC14\uB85C \uB2E4\uC74C\uC5D0 16\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
-+ DigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 "&#" \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC2ED\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
-+ HexdigitRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uC5D0\uC11C\uB294 "&#x" \uBC14\uB85C \uB2E4\uC74C\uC5D0 16\uC9C4\uC218 \uD45C\uD604\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
- SemicolonRequiredInCharRef = \uBB38\uC790 \uCC38\uC870\uB294 ';' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-- InvalidCharRef = \uBB38\uC790 \uCC38\uC870 \"&#{0}\"\uC740(\uB294) \uBD80\uC801\uD569\uD55C XML \uBB38\uC790\uC785\uB2C8\uB2E4.
-+ InvalidCharRef = \uBB38\uC790 \uCC38\uC870 "&#{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C XML \uBB38\uC790\uC785\uB2C8\uB2E4.
- NameRequiredInReference = \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC5D0\uC11C\uB294 '&' \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC5D4\uD2F0\uD2F0 \uC774\uB984\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
-- SemicolonRequiredInReference = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uB294 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ SemicolonRequiredInReference = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uB294 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- # 4.3.1 The Text Declaration
- TextDeclMustBeFirst = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uB9E8 \uC55E\uC5D0\uB9CC \uB098\uD0C0\uB0A0 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-- EqRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C\uB294 \"{0}\" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-- QuoteRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C \"{0}\" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- CloseQuoteMissingInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C \"{0}\" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC758 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-+ EqRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C\uB294 "{0}" \uB2E4\uC74C\uC5D0 '' = '' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-+ QuoteRequiredInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C "{0}" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC740 \uB530\uC634\uD45C\uAC00 \uBD99\uC740 \uBB38\uC790\uC5F4\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ CloseQuoteMissingInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uC11C "{0}" \uB2E4\uC74C\uC5D0 \uC624\uB294 \uAC12\uC758 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- SpaceRequiredBeforeVersionInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \uBC84\uC804 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- SpaceRequiredBeforeEncodingInTextDecl = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \uC778\uCF54\uB529 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- TextDeclUnterminated = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 \"?>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ TextDeclUnterminated = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC740 "?>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- EncodingDeclRequired = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uB294 \uC778\uCF54\uB529 \uC120\uC5B8\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- NoMorePseudoAttributes = \uC758\uC0AC \uC18D\uC131\uC740 \uB354 \uC774\uC0C1 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- MorePseudoAttributes = \uC758\uC0AC \uC18D\uC131\uC774 \uB354 \uD544\uC694\uD569\uB2C8\uB2E4.
-@@ -143,13 +116,13 @@
- CommentNotInOneEntity = \uC8FC\uC11D\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- PINotInOneEntity = \uCC98\uB9AC \uBA85\uB839\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = \"{0}\"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC778\uCF54\uB529 \uC774\uB984\uC785\uB2C8\uB2E4.
-- EncodingByteOrderUnsupported = \"{0}\" \uC778\uCF54\uB529\uC5D0 \uB300\uD574 \uC81C\uACF5\uB41C \uBC14\uC774\uD2B8 \uC21C\uC11C\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ EncodingDeclInvalid = "{0}"\uC740(\uB294) \uBD80\uC801\uD569\uD55C \uC778\uCF54\uB529 \uC774\uB984\uC785\uB2C8\uB2E4.
-+ EncodingByteOrderUnsupported = "{0}" \uC778\uCF54\uB529\uC5D0 \uB300\uD574 \uC81C\uACF5\uB41C \uBC14\uC774\uD2B8 \uC21C\uC11C\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- InvalidByte = {0}\uC740(\uB294) {1}\uBC14\uC774\uD2B8 UTF-8 \uC2DC\uD000\uC2A4\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uBC14\uC774\uD2B8\uC785\uB2C8\uB2E4.
- ExpectedByte = {1}\uBC14\uC774\uD2B8 UTF-8 \uC2DC\uD000\uC2A4\uC5D0 \uD544\uC694\uD55C \uBC14\uC774\uD2B8\uB294 {0}\uC785\uB2C8\uB2E4.
- InvalidHighSurrogate = UTF-8 \uC2DC\uD000\uC2A4\uC758 \uB192\uC740 \uB300\uB9AC \uBE44\uD2B8\uB294 0x10\uC744 \uCD08\uACFC\uD558\uC9C0 \uC54A\uC544\uC57C \uD558\uC9C0\uB9CC 0x{0}\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-- OperationNotSupported = {1} \uC77D\uAE30 \uD504\uB85C\uADF8\uB7A8\uC740 \"{0}\" \uC791\uC5C5\uC744 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- InvalidASCII = \uBC14\uC774\uD2B8 \"{0}\"\uC740(\uB294) (7\uBE44\uD2B8) ASCII \uBB38\uC790 \uC9D1\uD569\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ OperationNotSupported = {1} \uC77D\uAE30 \uD504\uB85C\uADF8\uB7A8\uC740 "{0}" \uC791\uC5C5\uC744 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ InvalidASCII = \uBC14\uC774\uD2B8 "{0}"\uC740(\uB294) (7\uBE44\uD2B8) ASCII \uBB38\uC790 \uC9D1\uD569\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- CharConversionFailure = \uD2B9\uC815 \uC778\uCF54\uB529 \uD615\uC2DD\uC774\uC5B4\uC57C \uD558\uB294 \uAC83\uC73C\uB85C \uD655\uC778\uB41C \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uD574\uB2F9 \uC778\uCF54\uB529\uC5D0 \uBD80\uC801\uD569\uD55C \uC2DC\uD000\uC2A4\uAC00 \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-
- # DTD Messages
-@@ -169,150 +142,150 @@
- PubidCharIllegal = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uC5D0\uB294 \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- SpaceRequiredBetweenPublicAndSystem = publicId\uC640 systemId \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!DOCTYPE\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!DOCTYPE\" \uB2E4\uC74C\uC5D0 \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-- DoctypedeclUnterminated = \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-- PEReferenceWithinMarkup = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 \"%{0};\"\uC740 DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0 \uC788\uB294 \uB9C8\uD06C\uC5C5 \uC548\uC5D0 \uD45C\uC2DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!DOCTYPE" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!DOCTYPE" \uB2E4\uC74C\uC5D0 \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ DoctypedeclUnterminated = \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ PEReferenceWithinMarkup = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "%{0};"\uC740 DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0 \uC788\uB294 \uB9C8\uD06C\uC5C5 \uC548\uC5D0 \uD45C\uC2DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC744 \uD3EC\uD568\uD558\uAC70\uB098 \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC774 \uAC00\uB9AC\uD0A4\uB294 \uB9C8\uD06C\uC5C5 \uC120\uC5B8\uC740 \uC62C\uBC14\uB978 \uD615\uC2DD\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = \"xml:space\"\uC5D0 \uB300\uD55C \uC18D\uC131 \uC120\uC5B8\uC740 \"default\" \uBC0F \"preserve\" \uAC12\uB9CC \uAC00\uB2A5\uD55C \uC5F4\uAC70 \uC720\uD615\uC73C\uB85C \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space"\uC5D0 \uB300\uD55C \uC18D\uC131 \uC120\uC5B8\uC740 "default" \uBC0F "preserve" \uAC12\uB9CC \uAC00\uB2A5\uD55C \uC5F4\uAC70 \uC720\uD615\uC73C\uB85C \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!ELEMENT\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ELEMENT" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 \"{0}\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 \"{0}\" \uB2E4\uC74C\uC5D0 \uC81C\uC57D \uC870\uAC74\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- ElementDeclUnterminated = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 "{0}" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \uC694\uC18C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC694\uC18C \uC720\uD615 "{0}" \uB2E4\uC74C\uC5D0 \uC81C\uC57D \uC870\uAC74\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ ElementDeclUnterminated = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uC120\uC5B8\uC5D0\uB294 ''('' \uBB38\uC790 \uB610\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 ''('' \uBB38\uC790 \uB610\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MixedContentUnterminated = \uD558\uC704 \uC694\uC18C \uC720\uD615\uC774 \uC81C\uD55C\uB418\uB294 \uACBD\uC6B0 \uD63C\uD569 \uCF58\uD150\uCE20 \uBAA8\uB378 \"{0}\"\uC740(\uB294) \")*\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uC120\uC5B8\uC5D0\uB294 '')''\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MixedContentUnterminated = \uD558\uC704 \uC694\uC18C \uC720\uD615\uC774 \uC81C\uD55C\uB418\uB294 \uACBD\uC6B0 \uD63C\uD569 \uCF58\uD150\uCE20 \uBAA8\uB378 "{0}"\uC740(\uB294) ")*"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!ATTLIST\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ATTLIST" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = attribute-list \uC120\uC5B8\uC5D0\uB294 \uC694\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC774\uB984 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- AttNameRequiredInAttDef = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC720\uD615 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- AttTypeRequiredInAttDef = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uAE30\uBCF8\uAC12 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \uC81C\uACF5\uB41C \uC694\uC18C \"{0}\"\uC758 \uB3D9\uC77C\uD55C \uC18D\uC131 \"{1}\"\uC5D0 \uB300\uD574 \uC18D\uC131 \uC815\uC758\uAC00 \uB450 \uAC1C \uC774\uC0C1 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC774\uB984 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ AttNameRequiredInAttDef = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C attribute-list \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uC720\uD615 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ AttTypeRequiredInAttDef = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uB294 \uC18D\uC131 \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC18D\uC131 \uAE30\uBCF8\uAC12 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \uC81C\uACF5\uB41C \uC694\uC18C "{0}"\uC758 \uB3D9\uC77C\uD55C \uC18D\uC131 "{1}"\uC5D0 \uB300\uD574 \uC18D\uC131 \uC815\uC758\uAC00 \uB450 \uAC1C \uC774\uC0C1 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 \"NOTATION\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 \"NOTATION\" \uB2E4\uC74C\uC5D0 ''('' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- NotationTypeUnterminated = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uC774\uB984 \uD1A0\uD070\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- EnumerationUnterminated = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{2}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 \"{1}\"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C \uBAA9\uB85D \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NMTOKENS\uB294 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = \"{0}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{2}\" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 \"{1}\"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C NotationType \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NOTATION \uC774\uB984\uC740 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 "NOTATION" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 "NOTATION" \uB2E4\uC74C\uC5D0 ''('' \uBB38\uC790\uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ NotationTypeUnterminated = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0 \uB300\uD55C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC5D0\uB294 \uC774\uB984 \uD1A0\uD070\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ EnumerationUnterminated = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uC5F4\uAC70 \uC720\uD615 \uBAA9\uB85D\uC740 '')''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{2}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 "{1}"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C \uBAA9\uB85D \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NMTOKENS\uB294 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = "{0}" \uC694\uC18C\uC5D0 \uB300\uD55C "{2}" \uC18D\uC131\uC758 \uC120\uC5B8\uC5D0\uC11C \uBAA9\uB85D \uAC12 "{1}"\uC774(\uAC00) \uB450 \uBC88 \uC774\uC0C1 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB2E8\uC77C NotationType \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C NOTATION \uC774\uB984\uC740 \uBAA8\uB450 \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \"{1}\" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 \"FIXED\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}" \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C\uB294 "FIXED" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = \uD3EC\uD568\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 \"]]>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-- IgnoreSectUnterminated = \uC81C\uC678\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 \"]]>\"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ IncludeSectUnterminated = \uD3EC\uD568\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 "]]>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ IgnoreSectUnterminated = \uC81C\uC678\uB41C \uC870\uAC74\uBD80 \uC139\uC158\uC740 "]]>"\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- # 4.1 Character and Entity References
- NameRequiredInPEReference = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC5D0\uC11C\uB294 '%' \uBC14\uB85C \uB2E4\uC74C\uC5D0 \uC5D4\uD2F0\uD2F0 \uC774\uB984\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4.
-- SemicolonRequiredInPEReference = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 \"%{0};\"\uC740 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ SemicolonRequiredInPEReference = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "%{0};"\uC740 '';'' \uAD6C\uBD84\uC790\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!ENTITY\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!ENTITY\"\uC640 '%' \uBB38\uC790 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ENTITY" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!ENTITY"\uC640 '%' \uBB38\uC790 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 '%'\uC640 \uC5D4\uD2F0\uD2F0 \uC774\uB984 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uB294 \uC5D4\uD2F0\uD2F0 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC5D4\uD2F0\uD2F0 \uC774\uB984 \"{0}\"\uACFC(\uC640) \uC815\uC758 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 \"NDATA\"\uC640 \uD45C\uAE30\uBC95 \uC774\uB984 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 \"NDATA\" \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 \"NDATA\" \uB2E4\uC74C\uC5D0 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- EntityDeclUnterminated = \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-- MSG_DUPLICATE_ENTITY_DEFINITION = \"{0}\" \uC5D4\uD2F0\uD2F0\uAC00 \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C\uB294 \uC5D4\uD2F0\uD2F0 \uC774\uB984 "{0}"\uACFC(\uC640) \uC815\uC758 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 "NDATA"\uC640 \uD45C\uAE30\uBC95 \uC774\uB984 \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 "NDATA" \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uC11C\uB294 "NDATA" \uB2E4\uC74C\uC5D0 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ EntityDeclUnterminated = "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_DUPLICATE_ENTITY_DEFINITION = "{0}" \uC5D4\uD2F0\uD2F0\uAC00 \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- # 4.2.2 External Entities
-- ExternalIDRequired = \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC740 \"SYSTEM\" \uB610\uB294 \"PUBLIC\"\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \"PUBLIC\"\uACFC \uACF5\uC6A9 \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ ExternalIDRequired = \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC740 "SYSTEM" \uB610\uB294 "PUBLIC"\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC"\uACFC \uACF5\uC6A9 \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uC640 \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \"SYSTEM\"\uACFC \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_URI_FRAGMENT_IN_SYSTEMID = \uBD80\uBD84 \uC2DD\uBCC4\uC790\uB294 \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \"{0}\"\uC758 \uC77C\uBD80\uB85C \uC9C0\uC815\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM"\uACFC \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = \uBD80\uBD84 \uC2DD\uBCC4\uC790\uB294 \uC2DC\uC2A4\uD15C \uC2DD\uBCC4\uC790 "{0}"\uC758 \uC77C\uBD80\uB85C \uC9C0\uC815\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 \"<!NOTATION\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 "<!NOTATION" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uB294 \uD45C\uAE30\uBC95 \uC774\uB984\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 \uD45C\uAE30\uBC95 \uC774\uB984 \"{0}\" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-- ExternalIDorPublicIDRequired = \"{0}\" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uB294 \uC2DC\uC2A4\uD15C \uB610\uB294 \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uAC00 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- NotationDeclUnterminated = \"{0}\" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C\uB294 \uD45C\uAE30\uBC95 \uC774\uB984 "{0}" \uB2E4\uC74C\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+ ExternalIDorPublicIDRequired = "{0}" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC5D0\uB294 \uC2DC\uC2A4\uD15C \uB610\uB294 \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uAC00 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ NotationDeclUnterminated = "{0}" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC740 ''>''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
-
- # Validation messages
-- DuplicateTypeInMixedContent = \uC694\uC18C \uC720\uD615 \"{1}\"\uC774(\uAC00) \uC694\uC18C \uC120\uC5B8 \"{0}\"\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC5D0 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-- ENTITIESInvalid = ENTITIES \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{1}\"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uD558\uB098 \uC774\uC0C1\uC758 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- ENTITYInvalid = ENTITY \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{1}\"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- IDDefaultTypeInvalid = ID \uC18D\uC131 \"{0}\"\uC758 \uC120\uC5B8\uB41C \uAE30\uBCF8\uAC12\uC740 \"#IMPLIED\" \uB610\uB294 \"#REQUIRED\"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-- IDInvalid = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- IDInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- IDNotUnique = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uBB38\uC11C \uB0B4\uC5D0\uC11C \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
-- IDREFInvalid = IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- IDREFInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- IDREFSInvalid = IDREFS \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uAC00 \uC804\uCCB4 \uC120\uC5B8\uC73C\uB85C \uC0AC\uC6A9\uB41C \uACBD\uC6B0 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- ImproperDeclarationNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- ImproperGroupNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uAD04\uD638 \uC30D\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- INVALID_PE_IN_CONDITIONAL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC804\uCCB4 \uC870\uAC74\uBD80 \uC139\uC158\uC774 \uD3EC\uD568\uB418\uAC70\uB098 INCLUDE \uB610\uB294 IGNORE\uB9CC \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- MSG_ATTRIBUTE_NOT_DECLARED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC744 \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \uAC12\uC774 \"{1}\"\uC778 \"{0}\" \uC18D\uC131\uC5D0\uB294 \"{2}\" \uBAA9\uB85D\uC758 \uAC12\uC774 \uC0AC\uC6A9\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \"{0}\" \uC18D\uC131\uC758 \"{1}\" \uAC12\uC740 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C \uC815\uADDC\uD654\uC5D0 \uC758\uD574 \"{2}\"(\uC73C)\uB85C \uBCC0\uACBD\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-- MSG_CONTENT_INCOMPLETE = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uCF58\uD150\uCE20\uAC00 \uBD88\uC644\uC804\uD569\uB2C8\uB2E4. \uD574\uB2F9 \uCF58\uD150\uCE20\uB294 \"{1}\"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-- MSG_CONTENT_INVALID = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uCF58\uD150\uCE20\uB294 \"{1}\"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-- MSG_CONTENT_INVALID_SPECIFIED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC758 \uCF58\uD150\uCE20\uB294 \"{1}\"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4. \"{2}\" \uC720\uD615\uC758 \uD558\uC704 \uD56D\uBAA9\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC5D0 \uAE30\uBCF8\uAC12\uC774 \uC788\uC73C\uBA70 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- MSG_DUPLICATE_ATTDEF = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD55C \"{1}\" \uC18D\uC131\uC774 \uC774\uBBF8 \uC120\uC5B8\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-- MSG_ELEMENT_ALREADY_DECLARED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC740(\uB294) \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-- MSG_ELEMENT_NOT_DECLARED = \uC694\uC18C \uC720\uD615 \"{0}\"\uC744(\uB97C) \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ DuplicateTypeInMixedContent = \uC694\uC18C \uC720\uD615 "{1}"\uC774(\uAC00) \uC694\uC18C \uC120\uC5B8 "{0}"\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC5D0 \uC774\uBBF8 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-+ ENTITIESInvalid = ENTITIES \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{1}"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uD558\uB098 \uC774\uC0C1\uC758 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ ENTITYInvalid = ENTITY \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{1}"\uC740(\uB294) \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ IDDefaultTypeInvalid = ID \uC18D\uC131 "{0}"\uC758 \uC120\uC5B8\uB41C \uAE30\uBCF8\uAC12\uC740 "#IMPLIED" \uB610\uB294 "#REQUIRED"\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-+ IDInvalid = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ IDInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ IDNotUnique = ID \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uBB38\uC11C \uB0B4\uC5D0\uC11C \uACE0\uC720\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ IDREFInvalid = IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ IDREFInvalidWithNamespaces = \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 IDREF \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) NCName\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ IDREFSInvalid = IDREFS \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uAC00 \uC804\uCCB4 \uC120\uC5B8\uC73C\uB85C \uC0AC\uC6A9\uB41C \uACBD\uC6B0 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ ImproperDeclarationNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ ImproperGroupNesting = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC81C\uB300\uB85C \uC911\uCCA9\uB41C \uAD04\uD638 \uC30D\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ INVALID_PE_IN_CONDITIONAL = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 "{0}"\uC758 \uB300\uCCB4 \uD14D\uC2A4\uD2B8\uC5D0\uB294 \uC804\uCCB4 \uC870\uAC74\uBD80 \uC139\uC158\uC774 \uD3EC\uD568\uB418\uAC70\uB098 INCLUDE \uB610\uB294 IGNORE\uB9CC \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_ATTRIBUTE_NOT_DECLARED = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC744 \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \uAC12\uC774 "{1}"\uC778 "{0}" \uC18D\uC131\uC5D0\uB294 "{2}" \uBAA9\uB85D\uC758 \uAC12\uC774 \uC0AC\uC6A9\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = "{0}" \uC18D\uC131\uC758 "{1}" \uAC12\uC740 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C \uC815\uADDC\uD654\uC5D0 \uC758\uD574 "{2}"(\uC73C)\uB85C \uBCC0\uACBD\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_CONTENT_INCOMPLETE = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uCF58\uD150\uCE20\uAC00 \uBD88\uC644\uC804\uD569\uB2C8\uB2E4. \uD574\uB2F9 \uCF58\uD150\uCE20\uB294 "{1}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_CONTENT_INVALID = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uCF58\uD150\uCE20\uB294 "{1}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_CONTENT_INVALID_SPECIFIED = \uC694\uC18C \uC720\uD615 "{0}"\uC758 \uCF58\uD150\uCE20\uB294 "{1}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4. "{2}" \uC720\uD615\uC758 \uD558\uC704 \uD56D\uBAA9\uC740 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC5D0 \uAE30\uBCF8\uAC12\uC774 \uC788\uC73C\uBA70 \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_DUPLICATE_ATTDEF = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C "{1}" \uC18D\uC131\uC774 \uC774\uBBF8 \uC120\uC5B8\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-+ MSG_ELEMENT_ALREADY_DECLARED = \uC694\uC18C \uC720\uD615 "{0}"\uC740(\uB294) \uB450 \uBC88 \uC774\uC0C1 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_ELEMENT_NOT_DECLARED = \uC694\uC18C \uC720\uD615 "{0}"\uC744(\uB97C) \uC120\uC5B8\uD574\uC57C \uD569\uB2C8\uB2E4.
- MSG_GRAMMAR_NOT_FOUND = \uBB38\uC11C\uAC00 \uBD80\uC801\uD569\uD568: \uBB38\uBC95\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- MSG_ELEMENT_WITH_ID_REQUIRED = \uC2DD\uBCC4\uC790\uAC00 \"{0}\"\uC778 \uC694\uC18C\uAC00 \uBB38\uC11C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \"{0}\"\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- MSG_FIXED_ATTVALUE_INVALID = \uAC12\uC774 \"{2}\"\uC778 \"{1}\" \uC18D\uC131\uC758 \uAC12\uC740 \"{3}\"\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 ID \uC720\uD615\uC758 \"{1}\" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C ID \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 \"{2}\"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 NOTATION \uC720\uD615\uC758 \"{1}\" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C NOTATION \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 \"{2}\"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \"{1}\" \uD45C\uAE30\uBC95\uC740 \"{0}\" \uC18D\uC131\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \"{1}\" \uD45C\uAE30\uBC95\uC740 \"{0}\"\uC5D0 \uB300\uD574 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC120\uC5B8\uB41C \"{0}\" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \"{1}\" \uC18D\uC131\uC774 \uD544\uC694\uD558\uBA70 \uC694\uC18C \uC720\uD615 \"{0}\"\uC5D0 \uB300\uD574 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_ELEMENT_WITH_ID_REQUIRED = \uC2DD\uBCC4\uC790\uAC00 "{0}"\uC778 \uC694\uC18C\uAC00 \uBB38\uC11C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 "{0}"\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ MSG_FIXED_ATTVALUE_INVALID = \uAC12\uC774 "{2}"\uC778 "{1}" \uC18D\uC131\uC758 \uAC12\uC740 "{3}"\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 ID \uC720\uD615\uC758 "{1}" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C ID \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 "{2}"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 NOTATION \uC720\uD615\uC758 "{1}" \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC73C\uBBC0\uB85C NOTATION \uC720\uD615\uC758 \uB450\uBC88\uC9F8 \uC18D\uC131 "{2}"\uC774(\uAC00) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = "{1}" \uD45C\uAE30\uBC95\uC740 "{0}" \uC18D\uC131\uC5D0 \uB300\uD55C \uD45C\uAE30\uBC95 \uC720\uD615 \uBAA9\uB85D\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = "{1}" \uD45C\uAE30\uBC95\uC740 "{0}"\uC5D0 \uB300\uD574 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uC120\uC5B8\uC5D0\uC11C \uCC38\uC870\uB418\uB294 \uACBD\uC6B0 \uC120\uC5B8\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC120\uC5B8\uB41C "{0}" \uC5D4\uD2F0\uD2F0\uC5D0 \uB300\uD55C \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = "{1}" \uC18D\uC131\uC774 \uD544\uC694\uD558\uBA70 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD574 \uC9C0\uC815\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \uB3C5\uB9BD\uD615 \uBB38\uC11C\uC5D0\uC11C\uB294 \uC694\uC18C \uCF58\uD150\uCE20\uB97C \uAC00\uC9C0\uBA70 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC678\uBD80 \uC5D4\uD2F0\uD2F0\uC5D0\uC11C \uC120\uC5B8\uB41C \uC694\uC18C \uC0AC\uC774\uC5D0 \uACF5\uBC31\uC774 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- NMTOKENInvalid = NMTOKEN \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- NMTOKENSInvalid = NMTOKENS \uC720\uD615\uC758 \uC18D\uC131\uAC12 \"{0}\"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- NoNotationOnEmptyElement = EMPTY\uB85C \uC120\uC5B8\uB41C \uC694\uC18C \uC720\uD615 \"{0}\"\uC740(\uB294) NOTATION \uC720\uD615\uC758 \"{1}\" \uC18D\uC131\uC744 \uC120\uC5B8\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- RootElementTypeMustMatchDoctypedecl = \uBB38\uC11C \uB8E8\uD2B8 \uC694\uC18C \"{1}\"\uC740(\uB294) DOCTYPE \uB8E8\uD2B8 \"{0}\"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-- UndeclaredElementInContentSpec = \"{0}\" \uC694\uC18C\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC774 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC740 \uC694\uC18C \"{1}\"\uC744(\uB97C) \uCC38\uC870\uD569\uB2C8\uB2E4.
-- UniqueNotationName = \"{0}\" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC774 \uACE0\uC720\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC81C\uACF5\uB41C \uC774\uB984\uC740 \uB450 \uAC1C \uC774\uC0C1\uC758 \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-+ NMTOKENInvalid = NMTOKEN \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ NMTOKENSInvalid = NMTOKENS \uC720\uD615\uC758 \uC18D\uC131\uAC12 "{0}"\uC740(\uB294) \uD558\uB098 \uC774\uC0C1\uC758 \uC774\uB984 \uD1A0\uD070\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ NoNotationOnEmptyElement = EMPTY\uB85C \uC120\uC5B8\uB41C \uC694\uC18C \uC720\uD615 "{0}"\uC740(\uB294) NOTATION \uC720\uD615\uC758 "{1}" \uC18D\uC131\uC744 \uC120\uC5B8\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+ RootElementTypeMustMatchDoctypedecl = \uBB38\uC11C \uB8E8\uD2B8 \uC694\uC18C "{1}"\uC740(\uB294) DOCTYPE \uB8E8\uD2B8 "{0}"\uACFC(\uC640) \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ UndeclaredElementInContentSpec = "{0}" \uC694\uC18C\uC758 \uCF58\uD150\uCE20 \uBAA8\uB378\uC774 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC740 \uC694\uC18C "{1}"\uC744(\uB97C) \uCC38\uC870\uD569\uB2C8\uB2E4.
-+ UniqueNotationName = "{0}" \uD45C\uAE30\uBC95\uC5D0 \uB300\uD55C \uC120\uC5B8\uC774 \uACE0\uC720\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC81C\uACF5\uB41C \uC774\uB984\uC740 \uB450 \uAC1C \uC774\uC0C1\uC758 \uD45C\uAE30\uBC95 \uC120\uC5B8\uC5D0\uC11C \uC120\uC5B8\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
- ENTITYFailedInitializeGrammar = ENTITYDatatype \uAC80\uC99D\uAE30: \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uC801\uD569\uD55C \uBB38\uBC95 \uCC38\uC870\uB85C \uCD08\uAE30\uD654 \uBA54\uC18C\uB4DC\uB97C \uD638\uCD9C\uD574\uC57C \uD569\uB2C8\uB2E4. \t
-- ENTITYNotUnparsed = ENTITY \"{0}\"\uC758 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-- ENTITYNotValid = ENTITY \"{0}\"\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-+ ENTITYNotUnparsed = ENTITY "{0}"\uC758 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-+ ENTITYNotValid = ENTITY "{0}"\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
- EmptyList = ENTITIES, IDREFS \uBC0F NMTOKENS \uC720\uD615\uC758 \uAC12\uC740 \uBE48 \uBAA9\uB85D\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = \uC18D\uC131\uAC12\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 \"&{0};\"\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = \uC18D\uC131\uAC12\uC5D0\uC11C\uB294 \uC678\uBD80 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "&{0};"\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ AccessExternalDTD = \uC678\uBD80 DTD: accessExternalDTD \uC18D\uC131\uC73C\uB85C \uC124\uC815\uB41C \uC81C\uD55C\uC73C\uB85C \uC778\uD574 ''{1}'' \uC561\uC138\uC2A4\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC73C\uBBC0\uB85C \uC678\uBD80 DTD ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-+ AccessExternalEntity = \uC678\uBD80 \uC5D4\uD2F0\uD2F0: accessExternalDTD \uC18D\uC131\uC73C\uB85C \uC124\uC815\uB41C \uC81C\uD55C\uC73C\uB85C \uC778\uD574 ''{1}'' \uC561\uC138\uC2A4\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC73C\uBBC0\uB85C \uC678\uBD80 \uBB38\uC11C ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = \"{0}\" \uC5D4\uD2F0\uD2F0\uAC00 \uCC38\uC870\uB418\uC5C8\uC9C0\uB9CC \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-- ReferenceToUnparsedEntity = \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 \"&{0};\"\uC740(\uB294) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- RecursiveReference = \"{0}\"\uC740(\uB294) \uC21C\uD658 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
-- RecursiveGeneralReference = \"&{0};\"\uC740 \uC21C\uD658 \uC77C\uBC18 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
-- RecursivePEReference = \"%{0};\"\uC740 \uC21C\uD658 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
-+ EntityNotDeclared = "{0}" \uC5D4\uD2F0\uD2F0\uAC00 \uCC38\uC870\uB418\uC5C8\uC9C0\uB9CC \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-+ ReferenceToUnparsedEntity = \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "&{0};"\uC740(\uB294) \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ RecursiveReference = "{0}"\uC740(\uB294) \uC21C\uD658 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
-+ RecursiveGeneralReference = "&{0};"\uC740 \uC21C\uD658 \uC77C\uBC18 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
-+ RecursivePEReference = "%{0};"\uC740 \uC21C\uD658 \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870\uC785\uB2C8\uB2E4(\uCC38\uC870 \uACBD\uB85C: {1}).
- # 4.3.3 Character Encoding in Entities
-- EncodingNotSupported = \"{0}\" \uC778\uCF54\uB529\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ EncodingNotSupported = "{0}" \uC778\uCF54\uB529\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- EncodingRequired = UTF-8 \uB610\uB294 UTF-16\uC73C\uB85C \uC778\uCF54\uB529\uB418\uC9C0 \uC54A\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uC778\uCF54\uB529 \uC120\uC5B8\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = \uC694\uC18C \uB610\uB294 \uC18D\uC131\uC774 QName \uC791\uC131\uACFC \uC77C\uCE58\uD558\uC9C0 \uC54A\uC74C: QName::=(NCName':')?NCName.
-- ElementXMLNSPrefix = \"{0}\" \uC694\uC18C\uC5D0\uB294 \"xmlns\"\uAC00 \uC811\uB450\uC5B4\uB85C \uC0AC\uC6A9\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- ElementPrefixUnbound = \"{1}\" \uC694\uC18C\uC5D0 \uB300\uD55C \"{0}\" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-- AttributePrefixUnbound = \uC694\uC18C \uC720\uD615 \"{0}\"\uACFC(\uC640) \uC5F0\uAD00\uB41C \"{1}\" \uC18D\uC131\uC758 \"{2}\" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-- EmptyPrefixedAttName = \"{0}\" \uC18D\uC131\uC758 \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC811\uB450\uC5B4\uAC00 \uC9C0\uC815\uB41C \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uBC14\uC778\uB529\uC740 \uBE44\uC6CC \uB458 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- PrefixDeclared = \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC811\uB450\uC5B4 \"{0}\"\uC774(\uAC00) \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-+ ElementXMLNSPrefix = "{0}" \uC694\uC18C\uC5D0\uB294 "xmlns"\uAC00 \uC811\uB450\uC5B4\uB85C \uC0AC\uC6A9\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+ ElementPrefixUnbound = "{1}" \uC694\uC18C\uC5D0 \uB300\uD55C "{0}" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-+ AttributePrefixUnbound = \uC694\uC18C \uC720\uD615 "{0}"\uACFC(\uC640) \uC5F0\uAD00\uB41C "{1}" \uC18D\uC131\uC758 "{2}" \uC811\uB450\uC5B4\uAC00 \uBC14\uC778\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-+ EmptyPrefixedAttName = "{0}" \uC18D\uC131\uC758 \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC811\uB450\uC5B4\uAC00 \uC9C0\uC815\uB41C \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uBC14\uC778\uB529\uC740 \uBE44\uC6CC \uB458 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+ PrefixDeclared = \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC811\uB450\uC5B4 "{0}"\uC774(\uAC00) \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
- CantBindXMLNS = "xmlns" \uC811\uB450\uC5B4\uB294 \uBA85\uC2DC\uC801\uC73C\uB85C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "xmlns"\uC5D0 \uB300\uD55C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uB3C4 \uBA85\uC2DC\uC801\uC73C\uB85C \uC811\uB450\uC5B4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- CantBindXML = "xml" \uC811\uB450\uC5B4\uB294 \uC77C\uBC18 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC544\uB2CC \uB2E4\uB978 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "xml"\uC5D0 \uB300\uD55C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uB3C4 "xml" \uC774\uC678\uC758 \uC811\uB450\uC5B4\uC5D0 \uBC14\uC778\uB4DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- MSG_ATT_DEFAULT_INVALID = \"{0}\" \uC18D\uC131\uC758 defaultValue \"{1}\"\uC740(\uB294) \uC774 \uC18D\uC131 \uC720\uD615\uC758 \uB809\uC2DC\uCE7C \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD55C \uAC12\uC73C\uB85C \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-+ MSG_ATT_DEFAULT_INVALID = "{0}" \uC18D\uC131\uC758 defaultValue "{1}"\uC740(\uB294) \uC774 \uC18D\uC131 \uC720\uD615\uC758 \uB809\uC2DC\uCE7C \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD55C \uAC12\uC73C\uB85C \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=\uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uC774 \uBB38\uC11C\uC5D0\uC11C \"{0}\"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC5D4\uD2F0\uD2F0 \uD655\uC7A5\uC744 \uBC1C\uACAC\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB294 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: \uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uC774 \uBB38\uC11C\uC5D0\uC11C "{0}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC5D4\uD2F0\uD2F0 \uD655\uC7A5\uC744 \uBC1C\uACAC\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB294 JDK\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
-+ ElementAttributeLimit=JAXP00010002: "{0}" \uC694\uC18C\uC5D0 "{1}"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4. "{1}"\uC740(\uB294) JDK\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4.
-+ MaxEntitySizeLimit=JAXP00010003: "{0}" \uC5D4\uD2F0\uD2F0\uC758 \uAE38\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4.
-+ TotalEntitySizeLimit=JAXP00010004: \uC5D4\uD2F0\uD2F0\uC758 \uB204\uC801 \uD06C\uAE30 "{0}"\uC774(\uAC00) "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
-+ MaxXMLNameLimit=JAXP00010005: "{0}" \uC774\uB984\uC774 "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
-+ MaxElementDepthLimit=JAXP00010006: "{0}" \uC694\uC18C\uC758 \uAE4A\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4.
-
--# 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 2014-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no pr\u00F3logo do documento.
- InvalidCharInXMLDecl = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na declara\u00E7\u00E3o XML.
- # 2.4 Character Data and Markup
-- CDEndInContent = A sequ\u00EAncia de caracteres \"]]>\" n\u00E3o deve aparecer no conte\u00FAdo, a menos que seja usada para marcar o fim de uma se\u00E7\u00E3o CDATA.
-+ CDEndInContent = A sequ\u00EAncia de caracteres "]]>" n\u00E3o deve aparecer no conte\u00FAdo, a menos que seja usada para marcar o fim de uma se\u00E7\u00E3o CDATA.
- # 2.7 CDATA Sections
-- CDSectUnterminated = A se\u00E7\u00E3o CDATA deve terminar com \"]]>\".
-+ CDSectUnterminated = A se\u00E7\u00E3o CDATA deve terminar com "]]>".
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = A declara\u00E7\u00E3o XML pode aparecer somente bem no in\u00EDcio do documento.
-- EqRequiredInXMLDecl = O caractere '' = '' deve estar ap\u00F3s \"{0}\" na declara\u00E7\u00E3o XML.
-- QuoteRequiredInXMLDecl = O valor ap\u00F3s \"{0}\" na declara\u00E7\u00E3o XML deve ser uma string entre aspas.
-- XMLDeclUnterminated = A declara\u00E7\u00E3o XML deve terminar com \"?>\".
-+ EqRequiredInXMLDecl = O caractere '' = '' deve estar ap\u00F3s "{0}" na declara\u00E7\u00E3o XML.
-+ QuoteRequiredInXMLDecl = O valor ap\u00F3s "{0}" na declara\u00E7\u00E3o XML deve ser uma string entre aspas.
-+ XMLDeclUnterminated = A declara\u00E7\u00E3o XML deve terminar com "?>".
- VersionInfoRequired = A vers\u00E3o \u00E9 obrigat\u00F3ria na declara\u00E7\u00E3o XML.
- SpaceRequiredBeforeVersionInXMLDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes do pseudo-atributo da vers\u00E3o na declara\u00E7\u00E3o XML.
- SpaceRequiredBeforeEncodingInXMLDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de codificar o pseudo-atributo na declara\u00E7\u00E3o XML.
-@@ -71,92 +43,93 @@
- ReferenceIllegalInTrailingMisc=A refer\u00EAncia n\u00E3o \u00E9 permitida na se\u00E7\u00E3o \u00E0 esquerda.
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = O valor da declara\u00E7\u00E3o do documento stand-alone deve ser \"sim\" ou \"n\u00E3o\", mas n\u00E3o deve ser \"{0}\".
-+ SDDeclInvalid = O valor da declara\u00E7\u00E3o do documento stand-alone deve ser "sim" ou "n\u00E3o", mas n\u00E3o deve ser "{0}".
-+ SDDeclNameInvalid = O nome standalone na declara\u00E7\u00E3o XML pode estar grafado incorretamente.
- # 2.12 Language Identification
-- XMLLangInvalid = O valor do atributo xml:lang \"{0}\" \u00E9 um identificador de idioma inv\u00E1lido.
-+ XMLLangInvalid = O valor do atributo xml:lang "{0}" \u00E9 um identificador de idioma inv\u00E1lido.
- # 3. Logical Structures
-- ETagRequired = O tipo de elemento {0}\" deve ser encerrado pela tag final correspondente \"</{0}>\".
-+ ETagRequired = O tipo de elemento {0}" deve ser encerrado pela tag final correspondente "</{0}>".
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = O tipo de elemento \"{0}\" deve ser seguido pelas especifica\u00E7\u00F5es do atributo, \">\" ou \"/>\".
-- EqRequiredInAttribute = O nome do atributo \"{1}\" associado a um tipo de elemento \"{0}\" deve ser seguido do caractere '' = ''.
-- OpenQuoteExpected = S\u00E3o esperadas aspas de abertura para o atributo \"{1}\" associado a um tipo de elemento \"{0}\".
-- CloseQuoteExpected = S\u00E3o esperadas aspas de fechamento para o atributo \"{1}\" associado a um tipo de elemento \"{0}\".
-- AttributeNotUnique = O atributo \"{1}\" j\u00E1 foi especificado para o elemento \"{0}\".
-- AttributeNSNotUnique = O atributo \"{1}\" vinculado ao namespace \"{2}\" j\u00E1 foi especificado para o elemento \"{0}\".
-- ETagUnterminated = A tag final do tipo de elemento \"{0}\" deve terminar com um delimitador ''>".
-+ ElementUnterminated = O tipo de elemento "{0}" deve ser seguido pelas especifica\u00E7\u00F5es do atributo, ">" ou "/>".
-+ EqRequiredInAttribute = O nome do atributo "{1}" associado a um tipo de elemento "{0}" deve ser seguido do caractere '' = ''.
-+ OpenQuoteExpected = S\u00E3o esperadas aspas de abertura para o atributo "{1}" associado a um tipo de elemento "{0}".
-+ CloseQuoteExpected = S\u00E3o esperadas aspas de fechamento para o atributo "{1}" associado a um tipo de elemento "{0}".
-+ AttributeNotUnique = O atributo "{1}" j\u00E1 foi especificado para o elemento "{0}".
-+ AttributeNSNotUnique = O atributo "{1}" vinculado ao namespace "{2}" j\u00E1 foi especificado para o elemento "{0}".
-+ ETagUnterminated = A tag final do tipo de elemento "{0}" deve terminar com um delimitador ''>".
- MarkupNotRecognizedInContent = O conte\u00FAdo dos elementos deve consistir em dados ou marca\u00E7\u00E3o do caractere correto.
- DoctypeIllegalInContent = Um DOCTYPE n\u00E3o \u00E9 permitido no conte\u00FAdo.
- # 4.1 Character and Entity References
- ReferenceUnterminated = A refer\u00EAncia deve ser encerrada por um delimitador ';'.
- # 4.3.2 Well-Formed Parsed Entities
-- ReferenceNotInOneEntity = A refer\u00EAncia deve estar totalmente contida na mesma entidade submetida a parse.
-- ElementEntityMismatch = O elemento \"{0}\" deve come\u00E7ar e terminar com a mesma entidade.
-+ ReferenceNotInOneEntity = A refer\u00EAncia deve estar totalmente contida na mesma entidade submetida a parsing.
-+ ElementEntityMismatch = O elemento "{0}" deve come\u00E7ar e terminar com a mesma entidade.
- MarkupEntityMismatch=As estruturas do documento XML devem come\u00E7ar e terminar com a mesma entidade.
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = Um caractere XML inv\u00E1lido (Unicode: 0x {2}) foi encontrado no valor do atributo \"{1}\" e o elemento \u00E9 \"{0}\".
-+ InvalidCharInAttValue = Um caractere XML inv\u00E1lido (Unicode: 0x {2}) foi encontrado no valor do atributo "{1}" e o elemento \u00E9 "{0}".
- InvalidCharInComment = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no coment\u00E1rio.
- InvalidCharInPI = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na instru\u00E7\u00E3o de processamento.
- InvalidCharInInternalSubset = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no subconjunto interno do DTD.
- InvalidCharInTextDecl = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na declara\u00E7\u00E3o de texto.
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = O valor do atributo \"{1}\" deve come\u00E7ar com aspas simples ou duplas.
-- LessthanInAttValue = O valor do atributo \"{1}\" associado a um tipo de elemento \"{0}\" n\u00E3o deve conter o caractere ''<''.
-- AttributeValueUnterminated = O valor do atributo \"{1}\" deve terminar com as aspas correspondentes.
-+ QuoteRequiredInAttValue = O valor do atributo "{1}" deve come\u00E7ar com aspas simples ou duplas.
-+ LessthanInAttValue = O valor do atributo "{1}" associado a um tipo de elemento "{0}" n\u00E3o deve conter o caractere ''<''.
-+ AttributeValueUnterminated = O valor do atributo "{1}" deve terminar com as aspas correspondentes.
- # 2.5 Comments
-- InvalidCommentStart = O coment\u00E1rio deve come\u00E7ar com \"<!--\".
-- DashDashInComment = A string \"--\" n\u00E3o \u00E9 permitida nos coment\u00E1rios.
-- CommentUnterminated = O coment\u00E1rio deve terminar com \"-->\".
-+ InvalidCommentStart = O coment\u00E1rio deve come\u00E7ar com "<!--".
-+ DashDashInComment = A string "--" n\u00E3o \u00E9 permitida nos coment\u00E1rios.
-+ CommentUnterminated = O coment\u00E1rio deve terminar com "-->".
- COMMENT_NOT_IN_ONE_ENTITY = O coment\u00E1rio n\u00E3o est\u00E1 entre chaves na mesma entidade.
- # 2.6 Processing Instructions
- PITargetRequired = A instru\u00E7\u00E3o de processamento deve come\u00E7ar com o nome do destino.
- SpaceRequiredInPI = O espa\u00E7o em branco \u00E9 obrigat\u00F3rio entre o destino da instru\u00E7\u00E3o de processamento e os dados.
-- PIUnterminated = A instru\u00E7\u00E3o de processamento deve terminar com \"?>\".
-- ReservedPITarget = O destino da instru\u00E7\u00E3o de processamento correspondente \"[xX][mM][lL]\" n\u00E3o \u00E9 permitido.
-+ PIUnterminated = A instru\u00E7\u00E3o de processamento deve terminar com "?>".
-+ ReservedPITarget = O destino da instru\u00E7\u00E3o de processamento correspondente "[xX][mM][lL]" n\u00E3o \u00E9 permitido.
- PI_NOT_IN_ONE_ENTITY = A instru\u00E7\u00E3o de processamento n\u00E3o est\u00E1 entre chaves na mesma entidade.
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = Vers\u00E3o inv\u00E1lida \"{0}\".
-- VersionNotSupported = Vers\u00E3o XML \"{0}\" n\u00E3o suportada; somente XML 1.0 \u00E9 suportada.
-- VersionNotSupported11 = Vers\u00E3o XML \"{0}\" n\u00E3o suportada, somente XML 1.0 e XML 1.1 s\u00E3o suportadas.
-+ VersionInfoInvalid = Vers\u00E3o inv\u00E1lida "{0}".
-+ VersionNotSupported = Vers\u00E3o XML "{0}" n\u00E3o suportada; somente XML 1.0 \u00E9 suportada.
-+ VersionNotSupported11 = Vers\u00E3o XML "{0}" n\u00E3o suportada, somente XML 1.0 e XML 1.1 s\u00E3o suportadas.
- VersionMismatch= Uma entidade n\u00E3o pode incluir outra entidade de uma vers\u00E3o posterior.
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = Uma representa\u00E7\u00E3o decimal deve seguir imediatamente o \"&#\" em uma refer\u00EAncia de caractere.
-- HexdigitRequiredInCharRef = Uma representa\u00E7\u00E3o hexadecimal deve seguir imediatamente o \"&#\" em uma refer\u00EAncia de caractere.
-+ DigitRequiredInCharRef = Uma representa\u00E7\u00E3o decimal deve seguir imediatamente o "&#" em uma refer\u00EAncia de caractere.
-+ HexdigitRequiredInCharRef = Uma representa\u00E7\u00E3o hexadecimal deve seguir imediatamente o "&#" em uma refer\u00EAncia de caractere.
- SemicolonRequiredInCharRef = A refer\u00EAncia de caractere deve terminar com o delimitador ';'.
-- InvalidCharRef = A refer\u00EAncia do caractere \"&#{0}\" \u00E9 um caractere XML inv\u00E1lido.
-+ InvalidCharRef = A refer\u00EAncia do caractere "&#{0}" \u00E9 um caractere XML inv\u00E1lido.
- NameRequiredInReference = O nome da entidade deve seguir imediatamente o '&' na refer\u00EAncia da entidade.
-- SemicolonRequiredInReference = A refer\u00EAncia \u00E0 entidade \"{0}\" deve terminar com o delimitador '';''.
-+ SemicolonRequiredInReference = A refer\u00EAncia \u00E0 entidade "{0}" deve terminar com o delimitador '';''.
- # 4.3.1 The Text Declaration
-- TextDeclMustBeFirst = A declara\u00E7\u00E3o de texto somente pode aparecer bem no in\u00EDcio da entidade externa submetida a parse.
-- EqRequiredInTextDecl = O caractere '' = '' deve estar ap\u00F3s \"{0}\" na declara\u00E7\u00E3o de texto.
-- QuoteRequiredInTextDecl = O valor ap\u00F3s \"{0}\" na declara\u00E7\u00E3o de texto deve ser uma string entre aspas.
-- CloseQuoteMissingInTextDecl = n\u00E3o foi encontrada a aspa de fechamento no valor ap\u00F3s "{0}\" na declara\u00E7\u00E3o de texto.
-+ TextDeclMustBeFirst = A declara\u00E7\u00E3o de texto somente pode aparecer bem no in\u00EDcio da entidade externa submetida a parsing.
-+ EqRequiredInTextDecl = O caractere '' = '' deve estar ap\u00F3s "{0}" na declara\u00E7\u00E3o de texto.
-+ QuoteRequiredInTextDecl = O valor ap\u00F3s "{0}" na declara\u00E7\u00E3o de texto deve ser uma string entre aspas.
-+ CloseQuoteMissingInTextDecl = n\u00E3o foi encontrada a aspa de fechamento no valor ap\u00F3s "{0}" na declara\u00E7\u00E3o de texto.
- SpaceRequiredBeforeVersionInTextDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes do pseudo-atributo da vers\u00E3o na declara\u00E7\u00E3o de texto.
- SpaceRequiredBeforeEncodingInTextDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de codificar o pseudo-atributo na declara\u00E7\u00E3o de texto.
-- TextDeclUnterminated = A declara\u00E7\u00E3o de texto deve terminar com \"?>\".
-+ TextDeclUnterminated = A declara\u00E7\u00E3o de texto deve terminar com "?>".
- EncodingDeclRequired = A declara\u00E7\u00E3o de codifica\u00E7\u00E3o \u00E9 necess\u00E1ria na declara\u00E7\u00E3o de texto.
- NoMorePseudoAttributes = N\u00E3o s\u00E3o mais permitidos pseudo-atributos.
- MorePseudoAttributes = S\u00E3o esperados mais pseudo-atributos.
- PseudoAttrNameExpected = \u00C9 esperado um nome de um pseudo-atributo.
- # 4.3.2 Well-Formed Parsed Entities
-- CommentNotInOneEntity = O coment\u00E1rio deve estar totalmente contido na mesma entidade submetida a parse.
-- PINotInOneEntity = A instru\u00E7\u00E3o de processamento deve estar totalmente contida na mesma entidade submetida a parse.
-+ CommentNotInOneEntity = O coment\u00E1rio deve estar totalmente contido na mesma entidade submetida a parsing.
-+ PINotInOneEntity = A instru\u00E7\u00E3o de processamento deve estar totalmente contida na mesma entidade submetida a parsing.
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = Nome da codifica\u00E7\u00E3o inv\u00E1lida \"{0}\".
-- EncodingByteOrderUnsupported = A ordem de bytes fornecida para codifica\u00E7\u00E3o \"{0}\" n\u00E3o \u00E9 suportada.
-+ EncodingDeclInvalid = Nome da codifica\u00E7\u00E3o inv\u00E1lida "{0}".
-+ EncodingByteOrderUnsupported = A ordem de bytes fornecida para codifica\u00E7\u00E3o "{0}" n\u00E3o \u00E9 suportada.
- InvalidByte = Byte inv\u00E1lido {0} da sequ\u00EAncia UTF-8 do byte {1}.
- ExpectedByte = Esperava {0} byte da sequ\u00EAncia UTF-8 do byte {1}.
- InvalidHighSurrogate = Os bits substitutos altos na sequ\u00EAncia da UTF-8 n\u00E3o devem exceder 0x10 mas foi encontrado 0x{0}.
-- OperationNotSupported = A opera\u00E7\u00E3o \"{0}\" n\u00E3o \u00E9 suportada pelo leitor {1}.
-- InvalidASCII = O byte \"{0}\" n\u00E3o \u00E9 membro do conjunto de caracteres ASCII (7 bits).
-+ OperationNotSupported = A opera\u00E7\u00E3o "{0}" n\u00E3o \u00E9 suportada pelo leitor {1}.
-+ InvalidASCII = O byte "{0}" n\u00E3o \u00E9 membro do conjunto de caracteres ASCII (7 bits).
- CharConversionFailure = Uma entidade destinada a estar em uma determinada codifica\u00E7\u00E3o n\u00E3o deve conter sequ\u00EAncias inv\u00E1lidas na referida codifica\u00E7\u00E3o.
-
- # DTD Messages
- # 2.2 Characters
- InvalidCharInEntityValue = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no valor da entidade da literal.
- InvalidCharInExternalSubset = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no subconjunto externo do DTD.
-- InvalidCharInIgnoreSect = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na se\u00E7\u00E3o condicional deletada.
-+ InvalidCharInIgnoreSect = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na se\u00E7\u00E3o condicional exclu\u00EDda.
- InvalidCharInPublicID = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no identificador p\u00FAblico.
- InvalidCharInSystemID = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no identificador do sistema.
- # 2.3 Common Syntactic Constructs
-@@ -169,150 +142,150 @@
- PubidCharIllegal = O caractere XML (Unicode: 0x{0}) n\u00E3o \u00E9 permitido no identificador p\u00FAblico.
- SpaceRequiredBetweenPublicAndSystem = Espa\u00E7os em branco s\u00E3o necess\u00E1rios entre publicId e systemId.
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!DOCTYPE\" na declara\u00E7\u00E3o do tipo de documento.
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = O tipo de elemento-raiz deve aparecer ap\u00F3s \"<!DOCTYPE\" na declara\u00E7\u00E3o do tipo de documento.
-- DoctypedeclUnterminated = A declara\u00E7\u00E3o do tipo de documento do tipo de elemento \"{0}\" deve terminar com ''>''.
-- PEReferenceWithinMarkup = A refer\u00EAncia da entidade do par\u00E2metro \"%{0};\" n\u00E3o pode ocorrer na marca\u00E7\u00E3o no subconjunto interno do DTD.
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!DOCTYPE" na declara\u00E7\u00E3o do tipo de documento.
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = O tipo de elemento-raiz deve aparecer ap\u00F3s "<!DOCTYPE" na declara\u00E7\u00E3o do tipo de documento.
-+ DoctypedeclUnterminated = A declara\u00E7\u00E3o do tipo de documento do tipo de elemento "{0}" deve terminar com ''>''.
-+ PEReferenceWithinMarkup = A refer\u00EAncia da entidade do par\u00E2metro "%{0};" n\u00E3o pode ocorrer na marca\u00E7\u00E3o no subconjunto interno do DTD.
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = As declara\u00E7\u00F5es de marca\u00E7\u00E3o contidas ou apontadas pela declara\u00E7\u00E3o do tipo de documento devem estar corretas.
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para \"xml:space\" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o \"default\" e \"preserve\".
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para "xml:space" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o "padr\u00E3o" e "preserve".
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!ELEMENT\" na declara\u00E7\u00E3o do tipo de elemento.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ELEMENT" na declara\u00E7\u00E3o do tipo de elemento.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = O tipo de elemento \u00E9 necess\u00E1rio na declara\u00E7\u00E3o do tipo de elemento.
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o tipo de elemento \"{0}\" na declara\u00E7\u00E3o do tipo de elemento.
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = A restri\u00E7\u00E3o \u00E9 necess\u00E1ria ap\u00F3s o tipo de elemento \"{0}\" na declara\u00E7\u00E3o do tipo de elemento.
-- ElementDeclUnterminated = A declara\u00E7\u00E3o do tipo de elemento \"{0}\" deve terminar com ''>''.
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o tipo de elemento "{0}" na declara\u00E7\u00E3o do tipo de elemento.
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = A restri\u00E7\u00E3o \u00E9 necess\u00E1ria ap\u00F3s o tipo de elemento "{0}" na declara\u00E7\u00E3o do tipo de elemento.
-+ ElementDeclUnterminated = A declara\u00E7\u00E3o do tipo de elemento "{0}" deve terminar com ''>''.
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere ''('' ou um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento \"{0}\".
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere ''('' ou um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento "{0}".
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u00C9 necess\u00E1rio um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento \"{0}\".
-- MixedContentUnterminated = O modelo de conte\u00FAdo misto \"{0}\" deve terminar com \")*\" quando os tipos de elementos filhos forem restringidos.
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u00C9 necess\u00E1rio um tipo de elemento na declara\u00E7\u00E3o do tipo de elemento "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u00C9 necess\u00E1rio um caractere '')'' na declara\u00E7\u00E3o do tipo de elemento "{0}".
-+ MixedContentUnterminated = O modelo de conte\u00FAdo misto "{0}" deve terminar com ")*" quando os tipos de elementos filhos forem restringidos.
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!ATTLIST\" na declara\u00E7\u00E3o da lista de atributos.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ATTLIST" na declara\u00E7\u00E3o da lista de atributos.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = \u00C9 necess\u00E1rio o tipo de elemento na declara\u00E7\u00E3o da lista de atributos.
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do nome do atributo na declara\u00E7\u00E3o da lista de atributos do elemento \"{0}\".
-- AttNameRequiredInAttDef = O nome do atributo deve ser especificado na declara\u00E7\u00E3o da lista de atributos do elemento \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do tipo de atributo na declara\u00E7\u00E3o do atributo \"{1}\" do elemento \"{0}\".
-- AttTypeRequiredInAttDef = \u00C9 necess\u00E1rio o tipo de atributo na declara\u00E7\u00E3o do atributo \"{1}\" do elemento \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do default do atributo na declara\u00E7\u00E3o do atributo \"{1}\" do elemento \"{0}\".
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mais de uma defini\u00E7\u00E3o de atributo fornecida para o mesmo atributo \"{1}\" de um determinado elemento \"{0}\".
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do nome do atributo na declara\u00E7\u00E3o da lista de atributos do elemento "{0}".
-+ AttNameRequiredInAttDef = O nome do atributo deve ser especificado na declara\u00E7\u00E3o da lista de atributos do elemento "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
-+ AttTypeRequiredInAttDef = \u00C9 necess\u00E1rio o tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do padr\u00E3o do atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}".
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mais de uma defini\u00E7\u00E3o de atributo fornecida para o mesmo atributo "{1}" de um determinado elemento "{0}".
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = O espa\u00E7o em branco deve aparecer ap\u00F3s \"NOTATION\" na declara\u00E7\u00E3o do atributo \"{1}\".
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = O caractere ''('' deve estar ap\u00F3s \"NOTATION\" na declara\u00E7\u00E3o do atributo \"{1}\".
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u00C9 necess\u00E1rio o nome da nota\u00E7\u00E3o na lista de tipos de nota\u00E7\u00E3o para a declara\u00E7\u00E3o do atributo \"{1}\".
-- NotationTypeUnterminated = A lista de tipos de nota\u00E7\u00E3o deve terminar com '')'' na declara\u00E7\u00E3o do atributo \"{1}\".
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = O token do nome \u00E9 obrigat\u00F3rio na lista de tipos enumerada para a declara\u00E7\u00E3o do atributo \"{1}\".
-- EnumerationUnterminated = A lista de tipos enumerada deve terminar com '')'' na declara\u00E7\u00E3o do atributo \"{1}\".
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o \"{1}\" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo \"{2}\" do elemento \"{0}\". Os NMTOKENS em uma declara\u00E7\u00E3o de atributo de Enumera\u00E7\u00E3o \u00FAnica devem ser todos distintos.
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o \"{1}\" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo \"{2}\" do elemento \"{0}\". Os nomes da NOTATION em uma declara\u00E7\u00E3o do atributo NotationType \u00FAnica devem ser todos distintos.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = O espa\u00E7o em branco deve aparecer ap\u00F3s "NOTATION" na declara\u00E7\u00E3o do atributo "{1}".
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = O caractere ''('' deve estar ap\u00F3s "NOTATION" na declara\u00E7\u00E3o do atributo "{1}".
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u00C9 necess\u00E1rio o nome da nota\u00E7\u00E3o na lista de tipos de nota\u00E7\u00E3o para a declara\u00E7\u00E3o do atributo "{1}".
-+ NotationTypeUnterminated = A lista de tipos de nota\u00E7\u00E3o deve terminar com '')'' na declara\u00E7\u00E3o do atributo "{1}".
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = O token do nome \u00E9 obrigat\u00F3rio na lista de tipos enumerada para a declara\u00E7\u00E3o do atributo "{1}".
-+ EnumerationUnterminated = A lista de tipos enumerada deve terminar com '')'' na declara\u00E7\u00E3o do atributo "{1}".
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o "{1}" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo "{2}" do elemento "{0}". Os NMTOKENS em uma declara\u00E7\u00E3o de atributo de Enumera\u00E7\u00E3o \u00FAnica devem ser todos distintos.
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = O valor da enumera\u00E7\u00E3o "{1}" foi especificado mais de uma vez na declara\u00E7\u00E3o do atributo "{2}" do elemento "{0}". Os nomes da NOTATION em uma declara\u00E7\u00E3o do atributo NotationType \u00FAnica devem ser todos distintos.
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = O espa\u00E7o em branco deve aparecer ap\u00F3s \"FIXED\" na declara\u00E7\u00E3o do atributo \"{1}\".
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = O espa\u00E7o em branco deve aparecer ap\u00F3s "FIXED" na declara\u00E7\u00E3o do atributo "{1}".
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = A se\u00E7\u00E3o condicional inclu\u00EDda deve terminar com \"]]>\".
-- IgnoreSectUnterminated = A se\u00E7\u00E3o condicional exclu\u00EDda deve terminar com \"]]>\".
-+ IncludeSectUnterminated = A se\u00E7\u00E3o condicional inclu\u00EDda deve terminar com "]]>".
-+ IgnoreSectUnterminated = A se\u00E7\u00E3o condicional exclu\u00EDda deve terminar com "]]>".
- # 4.1 Character and Entity References
- NameRequiredInPEReference = O nome da entidade deve seguir imediatamente o '%' na refer\u00EAncia da entidade do par\u00E2metro.
-- SemicolonRequiredInPEReference = A refer\u00EAncia da entidade do par\u00E2metro \"%{0};\" deve terminar com o delimitador '';".
-+ SemicolonRequiredInPEReference = A refer\u00EAncia da entidade do par\u00E2metro "%{0};" deve terminar com o delimitador '';".
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!ENTITY\" na declara\u00E7\u00E3o da entidade.
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre \"<!ENTITY\" e o caractere '%' na declara\u00E7\u00E3o da entidade do par\u00E2metro.
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ENTITY" na declara\u00E7\u00E3o da entidade.
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre "<!ENTITY" e o caractere '%' na declara\u00E7\u00E3o da entidade do par\u00E2metro.
- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre '%' e o nome da entidade na declara\u00E7\u00E3o da entidade do par\u00E2metro.
- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = O nome da entidade \u00E9 necess\u00E1rio na declara\u00E7\u00E3o da entidade.
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre o nome da entidade \"{0}\" e a defini\u00E7\u00E3o da declara\u00E7\u00E3o da entidade.
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C9 necess\u00E1rio um espa\u00E7o em branco entre \"NDATA\" e o nome da nota\u00E7\u00E3o na declara\u00E7\u00E3o da entidade \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de \"NDATA\" na declara\u00E7\u00E3o da entidade \"{0}\".
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = O nome da nota\u00E7\u00E3o \u00E9 necess\u00E1rio ap\u00F3s \"NDATA\" na declara\u00E7\u00E3o da entidade \"{0}\".
-- EntityDeclUnterminated = A declara\u00E7\u00E3o da entidade \"{0}\" deve terminar com ''>''.
-- MSG_DUPLICATE_ENTITY_DEFINITION = A entidade \"{0}\" foi declarada mais de uma vez.
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre o nome da entidade "{0}" e a defini\u00E7\u00E3o da declara\u00E7\u00E3o da entidade.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u00C9 necess\u00E1rio um espa\u00E7o em branco entre "NDATA" e o nome da nota\u00E7\u00E3o na declara\u00E7\u00E3o da entidade "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de "NDATA" na declara\u00E7\u00E3o da entidade "{0}".
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = O nome da nota\u00E7\u00E3o \u00E9 necess\u00E1rio ap\u00F3s "NDATA" na declara\u00E7\u00E3o da entidade "{0}".
-+ EntityDeclUnterminated = A declara\u00E7\u00E3o da entidade "{0}" deve terminar com ''>''.
-+ MSG_DUPLICATE_ENTITY_DEFINITION = A entidade "{0}" foi declarada mais de uma vez.
- # 4.2.2 External Entities
-- ExternalIDRequired = A declara\u00E7\u00E3o da entidade externa deve come\u00E7ar com \"SYSTEM\" ou \"PUBLIC\".
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre \"PUBLIC\" e o identificador p\u00FAblico.
-+ ExternalIDRequired = A declara\u00E7\u00E3o da entidade externa deve come\u00E7ar com "SYSTEM" ou "PUBLIC".
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre "PUBLIC" e o identificador p\u00FAblico.
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre o identificador p\u00FAblico e o identificador do sistema.
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre \"SYSTEM\" e o identificador do sistema.
-- MSG_URI_FRAGMENT_IN_SYSTEMID = O identificador do fragmento n\u00E3o deve ser especificado como parte do identificador do sistema \"{0}\".
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = O espa\u00E7o em branco \u00E9 necess\u00E1rio entre "SYSTEM" e o identificador do sistema.
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = O identificador do fragmento n\u00E3o deve ser especificado como parte do identificador do sistema "{0}".
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!NOTATION\" na declara\u00E7\u00E3o da nota\u00E7\u00E3o.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!NOTATION" na declara\u00E7\u00E3o da nota\u00E7\u00E3o.
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = O nome da nota\u00E7\u00E3o \u00E9 obrigat\u00F3rio na declara\u00E7\u00E3o de nota\u00E7\u00E3o.
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o nome da nota\u00E7\u00E3o \"{0}\" na declara\u00E7\u00E3o de nota\u00E7\u00E3o.
-- ExternalIDorPublicIDRequired = A declara\u00E7\u00E3o da nota\u00E7\u00E3o \"{0}\" deve incluir um identificador p\u00FAblico ou do sistema.
-- NotationDeclUnterminated = A declara\u00E7\u00E3o da nota\u00E7\u00E3o \"{0}\" deve terminar com ''>''.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s o nome da nota\u00E7\u00E3o "{0}" na declara\u00E7\u00E3o de nota\u00E7\u00E3o.
-+ ExternalIDorPublicIDRequired = A declara\u00E7\u00E3o da nota\u00E7\u00E3o "{0}" deve incluir um identificador p\u00FAblico ou do sistema.
-+ NotationDeclUnterminated = A declara\u00E7\u00E3o da nota\u00E7\u00E3o "{0}" deve terminar com ''>''.
-
- # Validation messages
-- DuplicateTypeInMixedContent = O tipo de elemento \"{1}\" j\u00E1 foi especificado no modelo de conte\u00FAdo da declara\u00E7\u00E3o do elemento \"{0}\".
-- ENTITIESInvalid = O valor do atributo \"{1}\" do tipo ENTITIES deve ser o nome de uma ou mais entidades n\u00E3o submetidas a parse.
-- ENTITYInvalid = O valor do atributo \"{1}\" do tipo ENTITY deve ser o nome de uma entidade n\u00E3o submetida a parse.
-- IDDefaultTypeInvalid = O atributo do ID \"{0}\" deve ter um default declarado \"#IMPLIED\" ou \"#REQUIRED\".
-- IDInvalid = O valor do atributo \"{0}\" do ID de tipo deve ser um nome.
-- IDInvalidWithNamespaces = O valor do atributo \"{0}\" do ID de tipo deve ser um NCName quando os namespaces estiverem ativados.
-- IDNotUnique = O valor do atributo \"{0}\" do ID de tipo deve ser exclusivo no documento.
-- IDREFInvalid = O valor do atributo \"{0}\" do IDREF de tipo deve ser um nome.
-- IDREFInvalidWithNamespaces = O valor do atributo \"{0}\" do IDREF de tipo deve ser um NCName quando os namespaces estiverem ativados.
-- IDREFSInvalid = O valor do atributo \"{0}\" de tipo IDREFS deve ter um ou mais nomes.
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro \"{0}\" deve incluir as declara\u00E7\u00F5es aninhadas corretamente quando a refer\u00EAncia da entidade for usada como uma declara\u00E7\u00E3o completa.
-- ImproperDeclarationNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro \"{0}\" deve incluir as declara\u00E7\u00F5es aninhadas corretamente.
-- ImproperGroupNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro \"{0}\" deve incluir pares de par\u00EAnteses aninhados corretamente.
-- INVALID_PE_IN_CONDITIONAL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro \"{0}\" deve incluir a se\u00E7\u00E3o condicional inteira ou apenas INCLUDE ou IGNORE.
-- MSG_ATTRIBUTE_NOT_DECLARED = O atributo \"{1}\" deve ser declarado para o tipo de elemento \"{0}\".
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = O atributo \"{0}\" com o valor \"{1}\" deve ter um valor da lista \"{2}\".
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = O valor \"{1}\" do atributo \"{0}\" n\u00E3o deve ser alterado por meio da normaliza\u00E7\u00E3o (para \"{2}\") em um documento stand-alone.
-- MSG_CONTENT_INCOMPLETE = O conte\u00FAdo do tipo de elemento \"{0}\" est\u00E1 incompleto; ele deve corresponder a \"{1}\".
-- MSG_CONTENT_INVALID = O conte\u00FAdo do tipo de elemento \"{0}\" deve corresponder a \"{1}\".
-- MSG_CONTENT_INVALID_SPECIFIED = O conte\u00FAdo do tipo de elemento \"{0}\" deve corresponder a \"{1}\". N\u00E3o s\u00E3o permitidos os filhos do tipo \"{2}\".
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo \"{1}\" do tipo de elemento \"{0}\" tem um valor default e deve ser especificado em um documento stand-alone.
-- MSG_DUPLICATE_ATTDEF = O atributo \"{1}\" j\u00E1 foi declarado para o tipo de elemento \"{0}\".
-- MSG_ELEMENT_ALREADY_DECLARED = O tipo de elemento \"{0}\" n\u00E3o deve ser declarado mais de uma vez.
-- MSG_ELEMENT_NOT_DECLARED = O tipo de elemento \"{0}\" deve ser declarado.
-+ DuplicateTypeInMixedContent = O tipo de elemento "{1}" j\u00E1 foi especificado no modelo de conte\u00FAdo da declara\u00E7\u00E3o do elemento "{0}".
-+ ENTITIESInvalid = O valor do atributo "{1}" do tipo ENTITIES deve ser o nome de uma ou mais entidades n\u00E3o submetidas a parsing.
-+ ENTITYInvalid = O valor do atributo "{1}" do tipo ENTITY deve ser o nome de uma entidade n\u00E3o submetida a parsing.
-+ IDDefaultTypeInvalid = O atributo do ID "{0}" deve ter um padr\u00E3o declarado "#IMPLIED" ou "#REQUIRED".
-+ IDInvalid = O valor do atributo "{0}" do ID de tipo deve ser um nome.
-+ IDInvalidWithNamespaces = O valor do atributo "{0}" do ID de tipo deve ser um NCName quando os namespaces estiverem ativados.
-+ IDNotUnique = O valor do atributo "{0}" do ID de tipo deve ser exclusivo no documento.
-+ IDREFInvalid = O valor do atributo "{0}" do IDREF de tipo deve ser um nome.
-+ IDREFInvalidWithNamespaces = O valor do atributo "{0}" do IDREF de tipo deve ser um NCName quando os namespaces estiverem ativados.
-+ IDREFSInvalid = O valor do atributo "{0}" de tipo IDREFS deve ter um ou mais nomes.
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir as declara\u00E7\u00F5es aninhadas corretamente quando a refer\u00EAncia da entidade for usada como uma declara\u00E7\u00E3o completa.
-+ ImproperDeclarationNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir as declara\u00E7\u00F5es aninhadas corretamente.
-+ ImproperGroupNesting = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir pares de par\u00EAnteses aninhados corretamente.
-+ INVALID_PE_IN_CONDITIONAL = O texto de substitui\u00E7\u00E3o da entidade do par\u00E2metro "{0}" deve incluir a se\u00E7\u00E3o condicional inteira ou apenas INCLUDE ou IGNORE.
-+ MSG_ATTRIBUTE_NOT_DECLARED = O atributo "{1}" deve ser declarado para o tipo de elemento "{0}".
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = O atributo "{0}" com o valor "{1}" deve ter um valor da lista "{2}".
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = O valor "{1}" do atributo "{0}" n\u00E3o deve ser alterado por meio da normaliza\u00E7\u00E3o (para "{2}") em um documento stand-alone.
-+ MSG_CONTENT_INCOMPLETE = O conte\u00FAdo do tipo de elemento "{0}" est\u00E1 incompleto; ele deve corresponder a "{1}".
-+ MSG_CONTENT_INVALID = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}".
-+ MSG_CONTENT_INVALID_SPECIFIED = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}". N\u00E3o s\u00E3o permitidos os filhos do tipo "{2}".
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" do tipo de elemento "{0}" tem um valor padr\u00E3o e deve ser especificado em um documento stand-alone.
-+ MSG_DUPLICATE_ATTDEF = O atributo "{1}" j\u00E1 foi declarado para o tipo de elemento "{0}".
-+ MSG_ELEMENT_ALREADY_DECLARED = O tipo de elemento "{0}" n\u00E3o deve ser declarado mais de uma vez.
-+ MSG_ELEMENT_NOT_DECLARED = O tipo de elemento "{0}" deve ser declarado.
- MSG_GRAMMAR_NOT_FOUND = O documento \u00E9 inv\u00E1lido: nenhuma gram\u00E1tica encontrada.
-- MSG_ELEMENT_WITH_ID_REQUIRED = Um elemento com o identificador \"{0}\" deve aparecer no documento.
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = A refer\u00EAncia \u00E0 entidade externa \"{0}\" n\u00E3o \u00E9 permitida em um documento stand-alone.
-- MSG_FIXED_ATTVALUE_INVALID = O atributo \"{1}\" com o valor \"{2}\" deve ter um valor \"{3}\".
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = O tipo de elemento \"{0}\" j\u00E1 tem o atributo \"{1}\" do ID do tipo; um segundo atributo \"{2}\" do ID de tipo n\u00E3o \u00E9 permitido.
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = O tipo de elemento \"{0}\" j\u00E1 tem o atributo \"{1}\" do tipo NOTATION; um segundo atributo \"{2}\" do tipo NOTATION n\u00E3o \u00E9 permitido.
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = A nota\u00E7\u00E3o \"{1}\" deve ser declarada quando referenciada na lista de tipos de nota\u00E7\u00E3o do atributo \"{0}\".
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = A nota\u00E7\u00E3o \"{1}\" deve ser declarada quando referenciada na declara\u00E7\u00E3o da entidade n\u00E3o submetida a parse para \"{0}\".
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = A refer\u00EAncia \u00E0 entidade \"{0}\" declarada em uma entidade externa submetida a parse n\u00E3o \u00E9 permitida em um documento stand-alone.
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = O atributo \"{1}\" \u00E9 necess\u00E1rio e deve ser especificado para o tipo de elemento \"{0}\".
-- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = N\u00E3o deve haver espa\u00E7o em branco entre os elementos declarados em uma entidade externa submetida a parse com o conte\u00FAdo do elemento em um documento stand-alone.
-- NMTOKENInvalid = O valor do atributo \"{0}\" do tipo NMTOKEN deve ser um token de nome.
-- NMTOKENSInvalid = O valor do atributo \"{0}\" do tipo NMTOKENS deve ter um ou mais tokens de nome.
-- NoNotationOnEmptyElement = O tipo de elemento \"{0}\" que foi declarado EMPTY n\u00E3o pode declarar o atributo \"{1}\" do tipo NOTATION.
-- RootElementTypeMustMatchDoctypedecl = O elemento-raiz do documento \"{1}\" deve corresponder \u00E0 raiz de DOCTYPE \"{0}\".
-- UndeclaredElementInContentSpec = O modelo do conte\u00FAdo do elemento \"{0}\" refere-se ao elemento n\u00E3o declarado \"{1}\".
-- UniqueNotationName = A declara\u00E7\u00E3o da nota\u00E7\u00E3o \"{0}\" n\u00E3o \u00E9 exclusiva. Um Nome fornecido n\u00E3o deve ser declarado em mais de uma declara\u00E7\u00E3o de nota\u00E7\u00E3o.
-+ MSG_ELEMENT_WITH_ID_REQUIRED = Um elemento com o identificador "{0}" deve aparecer no documento.
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = A refer\u00EAncia \u00E0 entidade externa "{0}" n\u00E3o \u00E9 permitida em um documento stand-alone.
-+ MSG_FIXED_ATTVALUE_INVALID = O atributo "{1}" com o valor "{2}" deve ter um valor "{3}".
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = O tipo de elemento "{0}" j\u00E1 tem o atributo "{1}" do ID do tipo; um segundo atributo "{2}" do ID de tipo n\u00E3o \u00E9 permitido.
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = O tipo de elemento "{0}" j\u00E1 tem o atributo "{1}" do tipo NOTATION; um segundo atributo "{2}" do tipo NOTATION n\u00E3o \u00E9 permitido.
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = A nota\u00E7\u00E3o "{1}" deve ser declarada quando referenciada na lista de tipos de nota\u00E7\u00E3o do atributo "{0}".
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = A nota\u00E7\u00E3o "{1}" deve ser declarada quando referenciada na declara\u00E7\u00E3o da entidade n\u00E3o submetida a parsing para "{0}".
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = A refer\u00EAncia \u00E0 entidade "{0}" declarada em uma entidade externa submetida a parsing n\u00E3o \u00E9 permitida em um documento stand-alone.
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" \u00E9 necess\u00E1rio e deve ser especificado para o tipo de elemento "{0}".
-+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = N\u00E3o deve haver espa\u00E7o em branco entre os elementos declarados em uma entidade externa submetida a parsing com o conte\u00FAdo do elemento em um documento stand-alone.
-+ NMTOKENInvalid = O valor do atributo "{0}" do tipo NMTOKEN deve ser um token de nome.
-+ NMTOKENSInvalid = O valor do atributo "{0}" do tipo NMTOKENS deve ter um ou mais tokens de nome.
-+ NoNotationOnEmptyElement = O tipo de elemento "{0}" que foi declarado EMPTY n\u00E3o pode declarar o atributo "{1}" do tipo NOTATION.
-+ RootElementTypeMustMatchDoctypedecl = O elemento-raiz do documento "{1}" deve corresponder \u00E0 raiz de DOCTYPE "{0}".
-+ UndeclaredElementInContentSpec = O modelo do conte\u00FAdo do elemento "{0}" refere-se ao elemento n\u00E3o declarado "{1}".
-+ UniqueNotationName = A declara\u00E7\u00E3o da nota\u00E7\u00E3o "{0}" n\u00E3o \u00E9 exclusiva. Um Nome fornecido n\u00E3o deve ser declarado em mais de uma declara\u00E7\u00E3o de nota\u00E7\u00E3o.
- ENTITYFailedInitializeGrammar = Validador de ENTITYDatatype: Falha ao chamar o m\u00E9todo de inicializa\u00E7\u00E3o com uma refer\u00EAncia de Gram\u00E1tica v\u00E1lida. \t
-- ENTITYNotUnparsed = ENTITY \"{0}\" n\u00E3o \u00E9 submetida a parse.
-- ENTITYNotValid = ENTITY \"{0}\" n\u00E3o \u00E9 v\u00E1lida.
-+ ENTITYNotUnparsed = ENTITY "{0}" n\u00E3o \u00E9 submetida a parsing.
-+ ENTITYNotValid = ENTITY "{0}" n\u00E3o \u00E9 v\u00E1lida.
- EmptyList = O valor dos tipos ENTITIES, IDREFS e NMTOKENS n\u00E3o pode estar na lista vazia.
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = A refer\u00EAncia da entidade externa \"&{0};\" n\u00E3o \u00E9 permitida em um valor do atributo.
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = A refer\u00EAncia da entidade externa "&{0};" n\u00E3o \u00E9 permitida em um valor do atributo.
-+ AccessExternalDTD = DTD Externo: falha ao ler o DTD ''{0}'' externo porque o acesso a ''{1}'' n\u00E3o \u00E9 permitido em decorr\u00EAncia de uma restri\u00E7\u00E3o definida pela propriedade accessExternalDTD.
-+ AccessExternalEntity = Entidade Externa: falha ao ler o documento ''{0}'' externo porque o acesso a ''{1}'' n\u00E3o \u00E9 permitido em decorr\u00EAncia de uma restri\u00E7\u00E3o definida pela propriedade accessExternalDTD.
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = A entidade \"{0}\" foi referenciada, mas n\u00E3o declarada.
-- ReferenceToUnparsedEntity = A refer\u00EAncia da entidade n\u00E3o submetida a parse \"&{0};\" n\u00E3o \u00E9 permitida.
-- RecursiveReference = Refer\u00EAncia da entidade recursiva \"{0}\". (Caminho de refer\u00EAncia: {1}),
-- RecursiveGeneralReference = Refer\u00EAncia geral da entidade recursiva \"&{0};\". (Caminho de refer\u00EAncia: {1}),
-- RecursivePEReference = Refer\u00EAncia da entidade do par\u00E2metro recursivo \"%{0};\". (Caminho de refer\u00EAncia: {1}),
-+ EntityNotDeclared = A entidade "{0}" foi referenciada, mas n\u00E3o declarada.
-+ ReferenceToUnparsedEntity = A refer\u00EAncia da entidade n\u00E3o submetida a parsing "&{0};" n\u00E3o \u00E9 permitida.
-+ RecursiveReference = Refer\u00EAncia da entidade recursiva "{0}". (Caminho de refer\u00EAncia: {1}),
-+ RecursiveGeneralReference = Refer\u00EAncia geral da entidade recursiva "&{0};". (Caminho de refer\u00EAncia: {1}),
-+ RecursivePEReference = Refer\u00EAncia da entidade do par\u00E2metro recursivo "%{0};". (Caminho de refer\u00EAncia: {1}),
- # 4.3.3 Character Encoding in Entities
-- EncodingNotSupported = A codifica\u00E7\u00E3o \"{0}\" n\u00E3o \u00E9 suportada.
-- EncodingRequired = Uma entidade submetida a parse n\u00E3o codificada em UTF-8 nem em UTF-16 deve conter uma declara\u00E7\u00E3o de codifica\u00E7\u00E3o.
-+ EncodingNotSupported = A codifica\u00E7\u00E3o "{0}" n\u00E3o \u00E9 suportada.
-+ EncodingRequired = Uma entidade submetida a parsing n\u00E3o codificada em UTF-8 nem em UTF-16 deve conter uma declara\u00E7\u00E3o de codifica\u00E7\u00E3o.
-
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = O elemento ou o atributo n\u00E3o correspondem \u00E0 produ\u00E7\u00E3o QName: QName::=(NCName':')?NCName.
-- ElementXMLNSPrefix = O elemento \"{0}\" n\u00E3o pode ter \"xmlns\" como seu prefixo.
-- ElementPrefixUnbound = O prefixo \"{0}\" do elemento \"{1}\" n\u00E3o est\u00E1 vinculado.
-- AttributePrefixUnbound = O prefixo \"{2}\" do atributo \"{1}\" associado a um tipo de elemento \"{0}\" n\u00E3o est\u00E1 vinculado.
-- EmptyPrefixedAttName = O valor do atributo \"{0}\" \u00E9 inv\u00E1lido. Associa\u00E7\u00F5es de namespace prefixadas n\u00E3o podem ficar vazias.
-- PrefixDeclared = O prefixo do namespace \"{0}\" n\u00E3o foi declarado.
-+ ElementXMLNSPrefix = O elemento "{0}" n\u00E3o pode ter "xmlns" como seu prefixo.
-+ ElementPrefixUnbound = O prefixo "{0}" do elemento "{1}" n\u00E3o est\u00E1 vinculado.
-+ AttributePrefixUnbound = O prefixo "{2}" do atributo "{1}" associado a um tipo de elemento "{0}" n\u00E3o est\u00E1 vinculado.
-+ EmptyPrefixedAttName = O valor do atributo "{0}" \u00E9 inv\u00E1lido. Associa\u00E7\u00F5es de namespace prefixadas n\u00E3o podem ficar vazias.
-+ PrefixDeclared = O prefixo do namespace "{0}" n\u00E3o foi declarado.
- CantBindXMLNS = O prefixo "xmlns" n\u00E3o pode ser vinculado a um namespace explicitamente, assim como o namespace de "xmlns" n\u00E3o pode ser vinculado a um prefixo explicitamente.
- CantBindXML = O prefixo "xml" n\u00E3o pode ser vinculado a um namespace diferente do namespace comum, assim como o namespace de "xml" n\u00E3o pode ser vinculado a um prefixo diferente de "xml".
-- MSG_ATT_DEFAULT_INVALID = O defaultValue \"{1}\" do atributo \"{0}\" n\u00E3o \u00E9 v\u00E1lido para as restri\u00E7\u00F5es l\u00E9xicas deste tipo de atributo.
-+ MSG_ATT_DEFAULT_INVALID = O defaultValue "{1}" do atributo "{0}" n\u00E3o \u00E9 v\u00E1lido para as restri\u00E7\u00F5es l\u00E9xicas deste tipo de atributo.
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=O parser detectou mais de \"{0}\" expans\u00F5es da entidade neste documento. Este \u00E9 o limite imposto pela aplica\u00E7\u00E3o.
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: O parser detectou mais de "{0}" expans\u00F5es da entidade neste documento. Este \u00E9 o limite imposto pelo JDK.
-+ ElementAttributeLimit=JAXP00010002: o elemento "{0}" tem mais de "{1}" atributos. "{1}" \u00E9 o limite imposto pelo JDK.
-+ MaxEntitySizeLimit=JAXP00010003: o tamanho da entidade "{0}" \u00E9 "{1}", o que excede o limite de "{2}" definido por "{3}".
-+ TotalEntitySizeLimit=JAXP00010004: o tamanho acumulado "{0}" de entidades excedeu o limite de "{1}" definido por "{2}".
-+ MaxXMLNameLimit=JAXP00010005: o nome "{0}" excedeu o limite de "{1}" definido por "{2}".
-+ MaxElementDepthLimit=JAXP00010006: o elemento "{0}" tem uma profundidade de "{1}" que excede o limite de "{2}" definido por "{3}".
-
--# 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 2014-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -35,7 +7,7 @@
- FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
-
- # Document messages
-- PrematureEOF=F\u00F6r tidigt filslut (EOF).
-+ PrematureEOF=Filen har avslutats f\u00F6r tidigt.
- # 2.1 Well-Formed XML Documents
- RootElementRequired = Rotelementet kr\u00E4vs i ett v\u00E4lformulerat dokument.
- # 2.2 Characters
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets prolog.
- InvalidCharInXMLDecl = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i XML-deklarationen.
- # 2.4 Character Data and Markup
-- CDEndInContent = Teckensekvensen \"]]>\" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion.
-+ CDEndInContent = Teckensekvensen "]]>" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion.
- # 2.7 CDATA Sections
-- CDSectUnterminated = CDATA-sektionen m\u00E5ste sluta med \"]]>\".
-+ CDSectUnterminated = CDATA-sektionen m\u00E5ste sluta med "]]>".
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = XML-deklarationen f\u00E5r endast f\u00F6rekomma allra \u00F6verst i dokumentet.
-- EqRequiredInXMLDecl = Tecknet '' = '' m\u00E5ste anges efter \"{0}\" i XML-deklarationen.
-- QuoteRequiredInXMLDecl = V\u00E4rdet som f\u00F6ljer \"{0}\" i XML-deklarationen m\u00E5ste omges av citattecken.
-- XMLDeclUnterminated = XML-deklarationen m\u00E5ste avslutas med \"?>\".
-+ EqRequiredInXMLDecl = Tecknet '' = '' m\u00E5ste anges efter "{0}" i XML-deklarationen.
-+ QuoteRequiredInXMLDecl = V\u00E4rdet som f\u00F6ljer "{0}" i XML-deklarationen m\u00E5ste omges av citattecken.
-+ XMLDeclUnterminated = XML-deklarationen m\u00E5ste avslutas med "?>".
- VersionInfoRequired = Versionen kr\u00E4vs i XML-deklarationen.
- SpaceRequiredBeforeVersionInXMLDecl = Tomt utrymme kr\u00E4vs f\u00F6re versionens pseudoattribut i XML-deklarationen.
- SpaceRequiredBeforeEncodingInXMLDecl = Tomt utrymme kr\u00E4vs f\u00F6re kodningens pseudoattribut i XML-deklarationen.
-@@ -71,70 +43,71 @@
- ReferenceIllegalInTrailingMisc=Referensen \u00E4r inte till\u00E5ten i efterf\u00F6ljande avsnitt.
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = Deklarationsv\u00E4rdet f\u00F6r frist\u00E5ende dokument m\u00E5ste vara \"yes\" eller \"no\", inte \"{0}\".
-+ SDDeclInvalid = Deklarationsv\u00E4rdet f\u00F6r frist\u00E5ende dokument m\u00E5ste vara "yes" eller "no", inte "{0}".
-+ SDDeclNameInvalid = Det frist\u00E5ende namnet i XML-deklarationen kan vara felstavat.
- # 2.12 Language Identification
-- XMLLangInvalid = Attributv\u00E4rdet \"{0}\" f\u00F6r xml:lang \u00E4r en ogiltig spr\u00E5kidentifierare.
-+ XMLLangInvalid = Attributv\u00E4rdet "{0}" f\u00F6r xml:lang \u00E4r en ogiltig spr\u00E5kidentifierare.
- # 3. Logical Structures
-- ETagRequired = Elementtyp \"{0}\" m\u00E5ste avslutas med matchande sluttagg \"</{0}>\".
-+ ETagRequired = Elementtyp "{0}" m\u00E5ste avslutas med matchande sluttagg "</{0}>".
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = Elementtyp \"{0}\" m\u00E5ste f\u00F6ljas av n\u00E5gondera av attributspecifikationerna \">\" eller \"/>\".
-- EqRequiredInAttribute = Attributnamnet \"{1}\" som associeras med elementtyp \"{0}\" m\u00E5ste f\u00F6ljas av likhetstecknet ('' = '').
-- OpenQuoteExpected = \u00D6ppningscitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet \"{1}\" som associeras med elementtyp \"{0}\".
-- CloseQuoteExpected = Slutcitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet \"{1}\" som associeras med elementtyp \"{0}\".
-- AttributeNotUnique = Attributet \"{1}\" har redan angetts f\u00F6r elementet \"{0}\".
-- AttributeNSNotUnique = Attributet \"{1}\" bundet till namnrymden \"{2}\" har redan angetts f\u00F6r elementet \"{0}\".
-- ETagUnterminated = Sluttaggen f\u00F6r elementtyp \"{0}\" m\u00E5ste avslutas med en ''>''-avgr\u00E4nsare.
-+ ElementUnterminated = Elementtyp "{0}" m\u00E5ste f\u00F6ljas av n\u00E5gondera av attributspecifikationerna ">" eller "/>".
-+ EqRequiredInAttribute = Attributnamnet "{1}" som associeras med elementtyp "{0}" m\u00E5ste f\u00F6ljas av likhetstecknet ('' = '').
-+ OpenQuoteExpected = \u00D6ppningscitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet "{1}" som associeras med elementtyp "{0}".
-+ CloseQuoteExpected = Slutcitattecken f\u00F6rv\u00E4ntas f\u00F6r attributet "{1}" som associeras med elementtyp "{0}".
-+ AttributeNotUnique = Attributet "{1}" har redan angetts f\u00F6r elementet "{0}".
-+ AttributeNSNotUnique = Attributet "{1}" bundet till namnrymden "{2}" har redan angetts f\u00F6r elementet "{0}".
-+ ETagUnterminated = Sluttaggen f\u00F6r elementtyp "{0}" m\u00E5ste avslutas med en ''>''-avgr\u00E4nsare.
- MarkupNotRecognizedInContent = Elementinneh\u00E5llet m\u00E5ste best\u00E5 av v\u00E4lformulerad(e) teckendata eller kodtext.
- DoctypeIllegalInContent = DOCTYPE \u00E4r inte till\u00E5tet i inneh\u00E5llet.
- # 4.1 Character and Entity References
- ReferenceUnterminated = Referensen m\u00E5ste avslutas med en ';'-avgr\u00E4nsare.
- # 4.3.2 Well-Formed Parsed Entities
- ReferenceNotInOneEntity = Referensen m\u00E5ste finnas med inom samma tolkade enhet.
-- ElementEntityMismatch = Elementet \"{0}\" m\u00E5ste b\u00F6rja och sluta inom samma enhet.
-+ ElementEntityMismatch = Elementet "{0}" m\u00E5ste b\u00F6rja och sluta inom samma enhet.
- MarkupEntityMismatch=XML-dokumentstrukturer m\u00E5ste b\u00F6rja och sluta inom samma enhet.
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = Ett ogiltigt XML-tecken (Unicode: 0x{2}) hittades i attributv\u00E4rdet \"{1}\" och elementet \u00E4r \"{0}\".
-+ InvalidCharInAttValue = Ett ogiltigt XML-tecken (Unicode: 0x{2}) hittades i attributv\u00E4rdet "{1}" och elementet \u00E4r "{0}".
- InvalidCharInComment = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i kommentaren.
-- InvalidCharInPI = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades bearbetningsinstruktionen.
-+ InvalidCharInPI = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i bearbetningsinstruktionen.
- InvalidCharInInternalSubset = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i den interna delm\u00E4ngden i DTD.
- InvalidCharInTextDecl = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i textdeklarationen.
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = Attributv\u00E4rdet \"{1}\" m\u00E5ste b\u00F6rja med antingen enkelt eller dubbelt citattecken.
-- LessthanInAttValue = Attributv\u00E4rdet \"{1}\" som associeras med elementtyp \"{0}\" f\u00E5r inte inneh\u00E5lla n\u00E5got ''<''-tecken.
-- AttributeValueUnterminated = Attributv\u00E4rdet \"{1}\" m\u00E5ste avslutas med matchande citattecken.
-+ QuoteRequiredInAttValue = Attributv\u00E4rdet "{1}" m\u00E5ste b\u00F6rja med antingen enkelt eller dubbelt citattecken.
-+ LessthanInAttValue = Attributv\u00E4rdet "{1}" som associeras med elementtyp "{0}" f\u00E5r inte inneh\u00E5lla n\u00E5got ''<''-tecken.
-+ AttributeValueUnterminated = Attributv\u00E4rdet "{1}" m\u00E5ste avslutas med matchande citattecken.
- # 2.5 Comments
-- InvalidCommentStart = Kommentarer m\u00E5ste inledas med \"<!--\".
-- DashDashInComment = Str\u00E4ngen \"--\" \u00E4r inte till\u00E5ten inom kommentarer.
-- CommentUnterminated = Kommentaren m\u00E5ste avslutas med \"-->\".
-+ InvalidCommentStart = Kommentarer m\u00E5ste inledas med "<!--".
-+ DashDashInComment = Str\u00E4ngen "--" \u00E4r inte till\u00E5ten inom kommentarer.
-+ CommentUnterminated = Kommentaren m\u00E5ste avslutas med "-->".
- COMMENT_NOT_IN_ONE_ENTITY = Kommentaren innesluts inte i samma enhet.
- # 2.6 Processing Instructions
- PITargetRequired = Bearbetningsinstruktionen m\u00E5ste b\u00F6rja med m\u00E5lnamnet.
- SpaceRequiredInPI = Tomt utrymme kr\u00E4vs mellan bearbetningsinstruktionens m\u00E5l och data.
-- PIUnterminated = Bearbetningsinstruktionen m\u00E5ste avslutas med \"?>\".
-- ReservedPITarget = Bearbetningsinstruktionens m\u00E5lmatchning \"[xX][mM][lL]\" \u00E4r inte till\u00E5ten.
-+ PIUnterminated = Bearbetningsinstruktionen m\u00E5ste avslutas med "?>".
-+ ReservedPITarget = Bearbetningsinstruktionens m\u00E5lmatchning "[xX][mM][lL]" \u00E4r inte till\u00E5ten.
- PI_NOT_IN_ONE_ENTITY = Bearbetningsinstruktionen innesluts inte i samma enhet.
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = Ogiltig version \"{0}\".
-- VersionNotSupported = XML-versionen \"{0}\" st\u00F6ds inte, endast XML 1.0 st\u00F6ds.
-- VersionNotSupported11 = XML-versionen \"{0}\" st\u00F6ds inte, endast XML 1.0 och XML 1.1 st\u00F6ds.
-+ VersionInfoInvalid = Ogiltig version "{0}".
-+ VersionNotSupported = XML-versionen "{0}" st\u00F6ds inte, endast XML 1.0 st\u00F6ds.
-+ VersionNotSupported11 = XML-versionen "{0}" st\u00F6ds inte, endast XML 1.0 och XML 1.1 st\u00F6ds.
- VersionMismatch= En enhet kan inte inkludera n\u00E5gon annan enhet som har en senare version.
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = Ett decimalt uttryck m\u00E5ste anges direkt efter \"&#\" i en teckenreferens.
-- HexdigitRequiredInCharRef = Ett hexadecimalt uttryck m\u00E5ste anges direkt efter \"&#x\" i en teckenreferens.
-+ DigitRequiredInCharRef = Ett decimalt uttryck m\u00E5ste anges direkt efter "&#" i en teckenreferens.
-+ HexdigitRequiredInCharRef = Ett hexadecimalt uttryck m\u00E5ste anges direkt efter "&#x" i en teckenreferens.
- SemicolonRequiredInCharRef = Teckenreferensen m\u00E5ste avslutas med ';'-avgr\u00E4nsare.
-- InvalidCharRef = Teckenreferensen \"&#{0}\" \u00E4r ett ogiltigt XML-tecken.
-+ InvalidCharRef = Teckenreferensen "&#{0}" \u00E4r ett ogiltigt XML-tecken.
- NameRequiredInReference = Enhetsnamnet m\u00E5ste omedelbart f\u00F6ljas av '&' i enhetsreferensen.
-- SemicolonRequiredInReference = Referensen till enhet \"{0}\" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
-+ SemicolonRequiredInReference = Referensen till enhet "{0}" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
- # 4.3.1 The Text Declaration
- TextDeclMustBeFirst = Textdeklarationen m\u00E5ste anges direkt i b\u00F6rjan av externt tolkad enhet.
-- EqRequiredInTextDecl = Ett likhetstecken ('' = '') m\u00E5ste anges efter \"{0}\" i textdeklarationen.
-- QuoteRequiredInTextDecl = V\u00E4rdet som f\u00F6ljer \"{0}\" i textdeklarationen m\u00E5ste omges av citattecken.
-- CloseQuoteMissingInTextDecl = avslutande citattecken saknas f\u00F6r v\u00E4rdet efter \"{0}\" i textdeklarationen.
-+ EqRequiredInTextDecl = Ett likhetstecken ('' = '') m\u00E5ste anges efter "{0}" i textdeklarationen.
-+ QuoteRequiredInTextDecl = V\u00E4rdet som f\u00F6ljer "{0}" i textdeklarationen m\u00E5ste omges av citattecken.
-+ CloseQuoteMissingInTextDecl = avslutande citattecken saknas f\u00F6r v\u00E4rdet efter "{0}" i textdeklarationen.
- SpaceRequiredBeforeVersionInTextDecl = Tomt utrymme kr\u00E4vs f\u00F6re versionens pseudoattribut i textdeklarationen.
- SpaceRequiredBeforeEncodingInTextDecl = Tomt utrymme kr\u00E4vs f\u00F6re kodningens pseudoattribut i textdeklarationen.
-- TextDeclUnterminated = Textdeklarationen m\u00E5ste avslutas med \"?>\".
-+ TextDeclUnterminated = Textdeklarationen m\u00E5ste avslutas med "?>".
- EncodingDeclRequired = Koddeklaration kr\u00E4vs i textdeklarationen.
- NoMorePseudoAttributes = Inga fler pseudoattribut \u00E4r till\u00E5tna.
- MorePseudoAttributes = Ytterligare pseudoattribut f\u00F6rv\u00E4ntas.
-@@ -143,13 +116,13 @@
- CommentNotInOneEntity = Kommentaren m\u00E5ste finnas med inom samma tolkade enhet.
- PINotInOneEntity = Bearbetningsinstruktionen m\u00E5ste finnas med inom samma tolkade enhet.
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = Ogiltigt kodnamn, \"{0}\".
-- EncodingByteOrderUnsupported = Angiven byteordningsf\u00F6ljd i kodning \"{0}\" st\u00F6ds inte.
-+ EncodingDeclInvalid = Ogiltigt kodnamn, "{0}".
-+ EncodingByteOrderUnsupported = Angiven byteordningsf\u00F6ljd i kodning "{0}" st\u00F6ds inte.
- InvalidByte = Ogiltig byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte.
- ExpectedByte = F\u00F6rv\u00E4ntad byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte.
- InvalidHighSurrogate = H\u00F6ga surrogatbitar i UTF-8-sekvens f\u00E5r inte \u00F6verskrida 0x10, men 0x{0} hittades.
-- OperationNotSupported = Operation \"{0}\" st\u00F6ds inte i l\u00E4saren {1}.
-- InvalidASCII = Byte \"{0}\" ing\u00E5r inte i ASCII-teckenupps\u00E4ttningen (7 bitar).
-+ OperationNotSupported = Operation "{0}" st\u00F6ds inte i l\u00E4saren {1}.
-+ InvalidASCII = Byte "{0}" ing\u00E5r inte i ASCII-teckenupps\u00E4ttningen (7 bitar).
- CharConversionFailure = En enhet som fastst\u00E4lls anv\u00E4nda ett visst kodformat f\u00E5r inte inneh\u00E5lla sekvenser som \u00E4r otill\u00E5tna i kodningen.
-
- # DTD Messages
-@@ -169,150 +142,150 @@
- PubidCharIllegal = Tecknet (Unicode: 0x{0}) \u00E4r inte till\u00E5tet i den allm\u00E4nna identifieraren.
- SpaceRequiredBetweenPublicAndSystem = Tomma utrymmen kr\u00E4vs mellan publicId och systemId.
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Tomt utrymme kr\u00E4vs efter \"<!DOCTYPE\" i dokumenttypdeklarationen.
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = Rotelementtyp m\u00E5ste anges efter \"<!DOCTYPE\" i dokumenttypdeklarationen.
-- DoctypedeclUnterminated = Dokumenttypdeklarationen f\u00F6r rotelementtyp \"{0}\" m\u00E5ste avslutas med ''>''.
-- PEReferenceWithinMarkup = Parameterreferensen \"%{0};\" f\u00E5r inte f\u00F6rekomma i kodtexten i den interna delm\u00E4ngden i DTD.
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Tomt utrymme kr\u00E4vs efter "<!DOCTYPE" i dokumenttypdeklarationen.
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = Rotelementtyp m\u00E5ste anges efter "<!DOCTYPE" i dokumenttypdeklarationen.
-+ DoctypedeclUnterminated = Dokumenttypdeklarationen f\u00F6r rotelementtyp "{0}" m\u00E5ste avslutas med ''>''.
-+ PEReferenceWithinMarkup = Parameterreferensen "%{0};" f\u00E5r inte f\u00F6rekomma i kodtexten i den interna delm\u00E4ngden i DTD.
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Kodtextdeklarationerna som finns med eller pekas till fr\u00E5n dokumenttypdeklarationen m\u00E5ste vara v\u00E4lformulerade.
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklarationen f\u00F6r \"xml:space\" m\u00E5ste anges som uppr\u00E4kningstyp vars enda m\u00F6jliga v\u00E4rden \u00E4r \"default\" och \"preserve\".
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = Attributdeklarationen f\u00F6r "xml:space" m\u00E5ste anges som uppr\u00E4kningstyp vars enda m\u00F6jliga v\u00E4rden \u00E4r "default" och "preserve".
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter \"<!ELEMENT\" i elementtypdeklarationen.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter "<!ELEMENT" i elementtypdeklarationen.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = Elementtyp m\u00E5ste anges i elementtypdeklarationen.
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter elementtyp \"{0}\" i elementtypdeklarationen.
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Begr\u00E4nsningen kr\u00E4vs efter elementtyp \"{0}\" i elementtypdeklarationen.
-- ElementDeclUnterminated = Deklarationen f\u00F6r elementtyp \"{0}\" m\u00E5ste avslutas med ''>''.
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = Tomt utrymme kr\u00E4vs efter elementtyp "{0}" i elementtypdeklarationen.
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = Begr\u00E4nsningen kr\u00E4vs efter elementtyp "{0}" i elementtypdeklarationen.
-+ ElementDeclUnterminated = Deklarationen f\u00F6r elementtyp "{0}" m\u00E5ste avslutas med ''>''.
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Tecknet ''('' eller en elementtyp m\u00E5ste anges i deklarationen av elementtyp \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp \"{0}\".
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = Tecknet ''('' eller en elementtyp m\u00E5ste anges i deklarationen av elementtyp "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp "{0}".
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = En elementtyp m\u00E5ste anges i deklarationen av elementtyp \"{0}\".
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp \"{0}\".
-- MixedContentUnterminated = Modellen med blandat inneh\u00E5ll \"{0}\" m\u00E5ste avslutas med \")*\" om typer av underordnade element \u00E4r begr\u00E4nsade.
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = En elementtyp m\u00E5ste anges i deklarationen av elementtyp "{0}".
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = Tecknet '')'' m\u00E5ste anges i deklarationen av elementtyp "{0}".
-+ MixedContentUnterminated = Modellen med blandat inneh\u00E5ll "{0}" m\u00E5ste avslutas med ")*" om typer av underordnade element \u00E4r begr\u00E4nsade.
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Tomt utrymme kr\u00E4vs efter \"<!ATTLIST\" i deklarationen f\u00F6r attributlista.
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = Tomt utrymme kr\u00E4vs efter "<!ATTLIST" i deklarationen f\u00F6r attributlista.
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = Elementtyp m\u00E5ste anges i deklarationen f\u00F6r attributlista.
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributnamnet i deklarationen f\u00F6r attributlista f\u00F6r elementet \"{0}\".
-- AttNameRequiredInAttDef = Attributnamnet m\u00E5ste anges i deklarationen f\u00F6r attributlista f\u00F6r elementet \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributtyp i deklarationen f\u00F6r attributet \"{1}\" f\u00F6r elementet \"{0}\".
-- AttTypeRequiredInAttDef = Attributtyp m\u00E5ste anges i deklarationen f\u00F6r attributet \"{1}\" f\u00F6r elementet \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributstandardv\u00E4rde i deklarationen f\u00F6r attributet \"{1}\" f\u00F6r elementet \"{0}\".
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Det finns fler \u00E4n en attributdefinition f\u00F6r samma attribut \"{1}\" f\u00F6r angivet element \"{0}\".
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributnamnet i deklarationen f\u00F6r attributlista f\u00F6r elementet "{0}".
-+ AttNameRequiredInAttDef = Attributnamnet m\u00E5ste anges i deklarationen f\u00F6r attributlista f\u00F6r elementet "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributtyp i deklarationen f\u00F6r attributet "{1}" f\u00F6r elementet "{0}".
-+ AttTypeRequiredInAttDef = Attributtyp m\u00E5ste anges i deklarationen f\u00F6r attributet "{1}" f\u00F6r elementet "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = Tomt utrymme kr\u00E4vs f\u00F6re attributstandardv\u00E4rde i deklarationen f\u00F6r attributet "{1}" f\u00F6r elementet "{0}".
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Det finns fler \u00E4n en attributdefinition f\u00F6r samma attribut "{1}" f\u00F6r angivet element "{0}".
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Tomt utrymme m\u00E5ste anges efter \"NOTATION\" i attributdeklarationen \"{1}\".
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Tecknet ''('' m\u00E5ste anges efter \"NOTATION\" i attributdeklarationen \"{1}\".
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsnamn m\u00E5ste anges i notationstyplistan f\u00F6r attributdeklarationen \"{1}\".
-- NotationTypeUnterminated = Notationstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen \"{1}\".
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntecken m\u00E5ste anges i uppr\u00E4kningstyplistan f\u00F6r attributdeklarationen \"{1}\".
-- EnumerationUnterminated = Uppr\u00E4kningstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen \"{1}\".
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet \"{1}\" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen \"{2}\" f\u00F6r elementet \"{0}\". Alla NMTOKENS i en och samma attributdeklaration f\u00F6r Enumeration m\u00E5ste vara unika.
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet \"{1}\" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen \"{2}\" f\u00F6r elementet \"{0}\". Alla NOTATION-namn i en och samma attributdeklaration f\u00F6r NotationType m\u00E5ste vara unika.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = Tomt utrymme m\u00E5ste anges efter "NOTATION" i attributdeklarationen "{1}".
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Tecknet ''('' m\u00E5ste anges efter "NOTATION" i attributdeklarationen "{1}".
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsnamn m\u00E5ste anges i notationstyplistan f\u00F6r attributdeklarationen "{1}".
-+ NotationTypeUnterminated = Notationstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}".
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntecken m\u00E5ste anges i uppr\u00E4kningstyplistan f\u00F6r attributdeklarationen "{1}".
-+ EnumerationUnterminated = Uppr\u00E4kningstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}".
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NMTOKENS i en och samma attributdeklaration f\u00F6r Enumeration m\u00E5ste vara unika.
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NOTATION-namn i en och samma attributdeklaration f\u00F6r NotationType m\u00E5ste vara unika.
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Tomt utrymme m\u00E5ste anges efter \"FIXED\" i attributdeklarationen \"{1}\".
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = Tomt utrymme m\u00E5ste anges efter "FIXED" i attributdeklarationen "{1}".
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = Inkluderat villkorsavsnitt m\u00E5ste avslutas med \"]]>\".
-- IgnoreSectUnterminated = Exkluderat villkorsavsnitt m\u00E5ste avslutas med \"]]>\".
-+ IncludeSectUnterminated = Inkluderat villkorsavsnitt m\u00E5ste avslutas med "]]>".
-+ IgnoreSectUnterminated = Exkluderat villkorsavsnitt m\u00E5ste avslutas med "]]>".
- # 4.1 Character and Entity References
- NameRequiredInPEReference = Enhetsnamnet m\u00E5ste omedelbart f\u00F6ljas av '%' i parameterreferensen.
-- SemicolonRequiredInPEReference = Parameterreferensen \"%{0};\" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
-+ SemicolonRequiredInPEReference = Parameterreferensen "%{0};" m\u00E5ste avslutas med '';''-avgr\u00E4nsare.
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs efter \"<!ENTITY\" i enhetsdeklarationen.
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Tomt utrymme kr\u00E4vs mellan \"<!ENTITY\" och '%'-tecknet i parameterdeklarationen.
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs efter "<!ENTITY" i enhetsdeklarationen.
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = Tomt utrymme kr\u00E4vs mellan "<!ENTITY" och '%'-tecknet i parameterdeklarationen.
- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = Tomt utrymme kr\u00E4vs mellan '%' och enhetsnamnet i parameterdeklarationen.
- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = Namnet p\u00E5 enheten m\u00E5ste anges i enhetsdeklarationen.
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan enhetsnamnet \"{0}\" och definitionen i enhetsdeklarationen.
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan \"NDATA\" och notationsnamnet i deklarationen f\u00F6r enheten \"{0}\".
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs f\u00F6re \"NDATA\" i deklarationen f\u00F6r enheten \"{0}\".
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsnamnet m\u00E5ste anges efter \"NDATA\" i deklarationen f\u00F6r enheten \"{0}\".
-- EntityDeclUnterminated = Deklarationen f\u00F6r enheten \"{0}\" m\u00E5ste avslutas med ''>''.
-- MSG_DUPLICATE_ENTITY_DEFINITION = Enheten \"{0}\" har deklarerats mer \u00E4n en g\u00E5ng.
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan enhetsnamnet "{0}" och definitionen i enhetsdeklarationen.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs mellan "NDATA" och notationsnamnet i deklarationen f\u00F6r enheten "{0}".
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = Tomt utrymme kr\u00E4vs f\u00F6re "NDATA" i deklarationen f\u00F6r enheten "{0}".
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = Notationsnamnet m\u00E5ste anges efter "NDATA" i deklarationen f\u00F6r enheten "{0}".
-+ EntityDeclUnterminated = Deklarationen f\u00F6r enheten "{0}" m\u00E5ste avslutas med ''>''.
-+ MSG_DUPLICATE_ENTITY_DEFINITION = Enheten "{0}" har deklarerats mer \u00E4n en g\u00E5ng.
- # 4.2.2 External Entities
-- ExternalIDRequired = Den externa enhetsdeklarationen m\u00E5ste inledas med antingen \"SYSTEM\" eller \"PUBLIC\".
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan \"PUBLIC\" och den allm\u00E4nna identifieraren.
-+ ExternalIDRequired = Den externa enhetsdeklarationen m\u00E5ste inledas med antingen "SYSTEM" eller "PUBLIC".
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan "PUBLIC" och den allm\u00E4nna identifieraren.
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan den allm\u00E4nna identifieraren och systemidentifieraren.
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan \"SYSTEM\" och systemidentifieraren.
-- MSG_URI_FRAGMENT_IN_SYSTEMID = Fragmentidentifieraren f\u00E5r inte anges som del av systemidentifieraren \"{0}\".
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = Tomt utrymme kr\u00E4vs mellan "SYSTEM" och systemidentifieraren.
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = Fragmentidentifieraren f\u00E5r inte anges som del av systemidentifieraren "{0}".
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter \"<!NOTATION\" i notationsdeklarationen.
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter "<!NOTATION" i notationsdeklarationen.
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = Namnet p\u00E5 notationen m\u00E5ste anges i notationsdeklarationen.
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter notationsnamnet \"{0}\" i notationsdeklarationen.
-- ExternalIDorPublicIDRequired = Deklarationen f\u00F6r notationen \"{0}\" m\u00E5ste inkludera systemidentifierare eller allm\u00E4n identifierare.
-- NotationDeclUnterminated = Deklarationen f\u00F6r notationen \"{0}\" m\u00E5ste avslutas med ''>''.
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = Tomt utrymme kr\u00E4vs efter notationsnamnet "{0}" i notationsdeklarationen.
-+ ExternalIDorPublicIDRequired = Deklarationen f\u00F6r notationen "{0}" m\u00E5ste inkludera systemidentifierare eller allm\u00E4n identifierare.
-+ NotationDeclUnterminated = Deklarationen f\u00F6r notationen "{0}" m\u00E5ste avslutas med ''>''.
-
- # Validation messages
-- DuplicateTypeInMixedContent = Elementtyp \"{1}\" har redan angetts i modellen med inneh\u00E5ll f\u00F6r elementdeklarationen \"{0}\".
-- ENTITIESInvalid = Attributv\u00E4rdet \"{1}\" av typen ENTITIES m\u00E5ste motsvara namnen p\u00E5 en eller flera otolkade enheter.
-- ENTITYInvalid = Attributv\u00E4rdet \"{1}\" av typen ENTITY m\u00E5ste motsvara namnet p\u00E5 en otolkad enhet.
-- IDDefaultTypeInvalid = Id-attributet \"{0}\" m\u00E5ste inneh\u00E5lla deklarerat standardv\u00E4rde \"#IMPLIED\" eller \"#REQUIRED\".
-- IDInvalid = Attributv\u00E4rdet \"{0}\" av typen ID m\u00E5ste vara ett namn.
-- IDInvalidWithNamespaces = Attributv\u00E4rdet \"{0}\" av typen ID m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
-- IDNotUnique = Attributv\u00E4rdet \"{0}\" av typen ID m\u00E5ste vara unikt inom dokumentet.
-- IDREFInvalid = Attributv\u00E4rdet \"{0}\" av typen IDREF m\u00E5ste vara ett namn.
-- IDREFInvalidWithNamespaces = Attributv\u00E4rdet \"{0}\" av typen IDREF m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
-- IDREFSInvalid = Attributv\u00E4rdet \"{0}\" av typen IDREFS m\u00E5ste vara ett eller flera namn.
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ers\u00E4ttningstexten f\u00F6r parameterenheten \"{0}\" m\u00E5ste inkludera korrekt kapslade deklarationer om enhetsreferensen anv\u00E4nds som fullst\u00E4ndig deklaration.
-- ImproperDeclarationNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten \"{0}\" m\u00E5ste inkludera deklarationer som \u00E4r korrekt kapslade.
-- ImproperGroupNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten \"{0}\" m\u00E5ste inkludera parentespar som \u00E4r korrekt kapslade.
-- INVALID_PE_IN_CONDITIONAL = Ers\u00E4ttningstexten f\u00F6r parameterenheten \"{0}\" m\u00E5st inkludera hela villkorsavsnittet eller endast INCLUDE eller IGNORE.
-- MSG_ATTRIBUTE_NOT_DECLARED = Attributet \"{1}\" m\u00E5ste deklareras f\u00F6r elementtyp \"{0}\".
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attributet \"{0}\" med v\u00E4rdet \"{1}\" m\u00E5ste ha ett v\u00E4rde fr\u00E5n listan \"{2}\".
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = V\u00E4rdet \"{1}\" f\u00F6r attributet \"{0}\" f\u00E5r inte \u00E4ndras vid normalisering (till \"{2}\") i ett frist\u00E5ende dokument.
-- MSG_CONTENT_INCOMPLETE = Inneh\u00E5llet i elementtyp \"{0}\" \u00E4r ofullst\u00E4ndigt, det m\u00E5ste matcha \"{1}\".
-- MSG_CONTENT_INVALID = Inneh\u00E5llet i elementtyp \"{0}\" m\u00E5ste matcha \"{1}\".
-- MSG_CONTENT_INVALID_SPECIFIED = Inneh\u00E5llet i elementtyp \"{0}\" m\u00E5ste matcha \"{1}\". Underordnade till typ \"{2}\" \u00E4r inte till\u00E5tna.
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attributet \"{1}\" f\u00F6r elementtyp \"{0}\" har ett standardv\u00E4rde och m\u00E5ste anges i ett frist\u00E5ende dokument.
-- MSG_DUPLICATE_ATTDEF = Attributet \"{1}\" har redan deklarerats f\u00F6r elementtyp \"{0}\".
-- MSG_ELEMENT_ALREADY_DECLARED = Elementtyp \"{0}\" f\u00E5r deklareras endast en g\u00E5ng.
-- MSG_ELEMENT_NOT_DECLARED = Elementtyp \"{0}\" m\u00E5ste deklareras.
-+ DuplicateTypeInMixedContent = Elementtyp "{1}" har redan angetts i modellen med inneh\u00E5ll f\u00F6r elementdeklarationen "{0}".
-+ ENTITIESInvalid = Attributv\u00E4rdet "{1}" av typen ENTITIES m\u00E5ste motsvara namnen p\u00E5 en eller flera otolkade enheter.
-+ ENTITYInvalid = Attributv\u00E4rdet "{1}" av typen ENTITY m\u00E5ste motsvara namnet p\u00E5 en otolkad enhet.
-+ IDDefaultTypeInvalid = Id-attributet "{0}" m\u00E5ste inneh\u00E5lla deklarerat standardv\u00E4rde "#IMPLIED" eller "#REQUIRED".
-+ IDInvalid = Attributv\u00E4rdet "{0}" av typen ID m\u00E5ste vara ett namn.
-+ IDInvalidWithNamespaces = Attributv\u00E4rdet "{0}" av typen ID m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
-+ IDNotUnique = Attributv\u00E4rdet "{0}" av typen ID m\u00E5ste vara unikt inom dokumentet.
-+ IDREFInvalid = Attributv\u00E4rdet "{0}" av typen IDREF m\u00E5ste vara ett namn.
-+ IDREFInvalidWithNamespaces = Attributv\u00E4rdet "{0}" av typen IDREF m\u00E5ste vara NCName om namnrymder anv\u00E4nds.
-+ IDREFSInvalid = Attributv\u00E4rdet "{0}" av typen IDREFS m\u00E5ste vara ett eller flera namn.
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5ste inkludera korrekt kapslade deklarationer om enhetsreferensen anv\u00E4nds som fullst\u00E4ndig deklaration.
-+ ImproperDeclarationNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5ste inkludera deklarationer som \u00E4r korrekt kapslade.
-+ ImproperGroupNesting = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5ste inkludera parentespar som \u00E4r korrekt kapslade.
-+ INVALID_PE_IN_CONDITIONAL = Ers\u00E4ttningstexten f\u00F6r parameterenheten "{0}" m\u00E5st inkludera hela villkorsavsnittet eller endast INCLUDE eller IGNORE.
-+ MSG_ATTRIBUTE_NOT_DECLARED = Attributet "{1}" m\u00E5ste deklareras f\u00F6r elementtyp "{0}".
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = Attributet "{0}" med v\u00E4rdet "{1}" m\u00E5ste ha ett v\u00E4rde fr\u00E5n listan "{2}".
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = V\u00E4rdet "{1}" f\u00F6r attributet "{0}" f\u00E5r inte \u00E4ndras vid normalisering (till "{2}") i ett frist\u00E5ende dokument.
-+ MSG_CONTENT_INCOMPLETE = Inneh\u00E5llet i elementtyp "{0}" \u00E4r ofullst\u00E4ndigt, det m\u00E5ste matcha "{1}".
-+ MSG_CONTENT_INVALID = Inneh\u00E5llet i elementtyp "{0}" m\u00E5ste matcha "{1}".
-+ MSG_CONTENT_INVALID_SPECIFIED = Inneh\u00E5llet i elementtyp "{0}" m\u00E5ste matcha "{1}". Underordnade till typ "{2}" \u00E4r inte till\u00E5tna.
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" f\u00F6r elementtyp "{0}" har ett standardv\u00E4rde och m\u00E5ste anges i ett frist\u00E5ende dokument.
-+ MSG_DUPLICATE_ATTDEF = Attributet "{1}" har redan deklarerats f\u00F6r elementtyp "{0}".
-+ MSG_ELEMENT_ALREADY_DECLARED = Elementtyp "{0}" f\u00E5r deklareras endast en g\u00E5ng.
-+ MSG_ELEMENT_NOT_DECLARED = Elementtyp "{0}" m\u00E5ste deklareras.
- MSG_GRAMMAR_NOT_FOUND = Dokumentet \u00E4r ogiltigt: hittade ingen grammatik.
-- MSG_ELEMENT_WITH_ID_REQUIRED = Ett element med identifieraren \"{0}\" m\u00E5ste finnas med i dokumentet.
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referens till den externa enheten \"{0}\" \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
-- MSG_FIXED_ATTVALUE_INVALID = Attributet \"{1}\" med v\u00E4rdet \"{2}\" m\u00E5ste ha v\u00E4rdet \"{3}\".
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp \"{0}\" har redan attributet \"{1}\" av id-typ, ett andra attribut \"{2}\" av samma typ \u00E4r inte till\u00E5tet.
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp \"{0}\" har redan attributet \"{1}\" av NOTATION-typ, ett andra attribut \"{2}\" av samma typ \u00E4r inte till\u00E5tet.
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notationen \"{1}\" m\u00E5ste deklareras vid referens i notationstyplistan f\u00F6r attributet \"{0}\".
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notationen \"{1}\" m\u00E5ste deklareras vid referens i otolkad enhetsdeklaration f\u00F6r \"{0}\".
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referensen till enheten \"{0}\" som har deklarerats i en externt tolkad enhet \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attributet \"{1}\" m\u00E5ste anges f\u00F6r elementtyp \"{0}\".
-+ MSG_ELEMENT_WITH_ID_REQUIRED = Ett element med identifieraren "{0}" m\u00E5ste finnas med i dokumentet.
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = Referens till den externa enheten "{0}" \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
-+ MSG_FIXED_ATTVALUE_INVALID = Attributet "{1}" med v\u00E4rdet "{2}" m\u00E5ste ha v\u00E4rdet "{3}".
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = Elementtyp "{0}" har redan attributet "{1}" av id-typ, ett andra attribut "{2}" av samma typ \u00E4r inte till\u00E5tet.
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = Elementtyp "{0}" har redan attributet "{1}" av NOTATION-typ, ett andra attribut "{2}" av samma typ \u00E4r inte till\u00E5tet.
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = Notationen "{1}" m\u00E5ste deklareras vid referens i notationstyplistan f\u00F6r attributet "{0}".
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = Notationen "{1}" m\u00E5ste deklareras vid referens i otolkad enhetsdeklaration f\u00F6r "{0}".
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referensen till enheten "{0}" som har deklarerats i en externt tolkad enhet \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" m\u00E5ste anges f\u00F6r elementtyp "{0}".
- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Tomt utrymme f\u00E5r inte f\u00F6rekomma mellan element som har deklarerats i en externt tolkad enhet med elementinneh\u00E5ll i frist\u00E5ende dokument.
-- NMTOKENInvalid = Attributv\u00E4rdet \"{0}\" av typen NMTOKEN m\u00E5ste vara ett namntecken.
-- NMTOKENSInvalid = Attributv\u00E4rdet \"{0}\" av typen NMTOKENS m\u00E5ste vara ett eller flera namntecken.
-- NoNotationOnEmptyElement = Elementtyp \"{0}\" med deklarationen EMPTY kan inte deklareras med attributet \"{1}\" av typen NOTATION.
-- RootElementTypeMustMatchDoctypedecl = Dokumentrotelementet \"{1}\" m\u00E5ste matcha DOCTYPE-roten \"{0}\".
-- UndeclaredElementInContentSpec = Modellen med inneh\u00E5ll f\u00F6r elementet \"{0}\" refererar till elementet \"{1}\" som inte har deklarerats.
-- UniqueNotationName = Deklarationen f\u00F6r notationen \"{0}\" \u00E4r inte unik. Ett namn f\u00E5r inte deklareras i fler \u00E4n en notationsdeklaration.
-+ NMTOKENInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKEN m\u00E5ste vara ett namntecken.
-+ NMTOKENSInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKENS m\u00E5ste vara ett eller flera namntecken.
-+ NoNotationOnEmptyElement = Elementtyp "{0}" med deklarationen EMPTY kan inte deklareras med attributet "{1}" av typen NOTATION.
-+ RootElementTypeMustMatchDoctypedecl = Dokumentrotelementet "{1}" m\u00E5ste matcha DOCTYPE-roten "{0}".
-+ UndeclaredElementInContentSpec = Modellen med inneh\u00E5ll f\u00F6r elementet "{0}" refererar till elementet "{1}" som inte har deklarerats.
-+ UniqueNotationName = Deklarationen f\u00F6r notationen "{0}" \u00E4r inte unik. Ett namn f\u00E5r inte deklareras i fler \u00E4n en notationsdeklaration.
- ENTITYFailedInitializeGrammar = ENTITYDatatype-validerare: Behov att anropa initieringsmetod med giltig grammatikreferens utf\u00F6rdes inte. \t
-- ENTITYNotUnparsed = ENTITY \"{0}\" \u00E4r otolkat.
-- ENTITYNotValid = ENTITY \"{0}\" \u00E4r inte giltigt.
-+ ENTITYNotUnparsed = ENTITY "{0}" \u00E4r otolkat.
-+ ENTITYNotValid = ENTITY "{0}" \u00E4r inte giltigt.
- EmptyList = V\u00E4rdet f\u00F6r typ ENTITIES, IDREFS och NMTOKENS f\u00E5r inte vara en tom lista.
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = Den externa enhetsreferensen \"&{0};\" till\u00E5ts inte i ett attributv\u00E4rde.
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = Den externa enhetsreferensen "&{0};" till\u00E5ts inte i ett attributv\u00E4rde.
-+ AccessExternalDTD = Extern DTD: Kunde inte l\u00E4sa extern DTD ''{0}'', eftersom ''{1}'' \u00E5tkomst inte till\u00E5ts p\u00E5 grund av begr\u00E4nsning som anges av accessExternalDTD-egenskapen.
-+ AccessExternalEntity = Extern enhet: Kunde inte l\u00E4sa externt dokument ''{0}'', eftersom ''{1}'' \u00E5tkomst inte till\u00E5ts p\u00E5 grund av begr\u00E4nsning som anges av accessExternalDTD-egenskapen.
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = Enheten \"{0}\" har refererats, men \u00E4r inte deklarerad.
-- ReferenceToUnparsedEntity = Den otolkade enhetsreferensen \"&{0};\" \u00E4r inte till\u00E5ten.
-- RecursiveReference = Rekursiv enhetsreferens \"{0}\". (Referenss\u00F6kv\u00E4g: {1}),
-- RecursiveGeneralReference = Rekursiv allm\u00E4n enhetsreferens \"&{0};\". (Referenss\u00F6kv\u00E4g: {1}),
-- RecursivePEReference = Rekursiv parameterreferens \"%{0};\". (Referenss\u00F6kv\u00E4g: {1}),
-+ EntityNotDeclared = Enheten "{0}" har refererats, men \u00E4r inte deklarerad.
-+ ReferenceToUnparsedEntity = Den otolkade enhetsreferensen "&{0};" \u00E4r inte till\u00E5ten.
-+ RecursiveReference = Rekursiv enhetsreferens "{0}". (Referenss\u00F6kv\u00E4g: {1}),
-+ RecursiveGeneralReference = Rekursiv allm\u00E4n enhetsreferens "&{0};". (Referenss\u00F6kv\u00E4g: {1}),
-+ RecursivePEReference = Rekursiv parameterreferens "%{0};". (Referenss\u00F6kv\u00E4g: {1}),
- # 4.3.3 Character Encoding in Entities
-- EncodingNotSupported = Kodningen \"{0}\" st\u00F6ds inte.
-+ EncodingNotSupported = Kodningen "{0}" st\u00F6ds inte.
- EncodingRequired = En tolkad enhet som inte \u00E4r kodad i varken UTF-8 eller UTF-16 m\u00E5ste ha en kodningsdeklaration.
-
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = Element eller attribut matchar inte QName-produktion: QName::=(NCName':')?NCName.
-- ElementXMLNSPrefix = Elementet \"{0}\" kan inte anv\u00E4ndas med \"xmlns\" som prefix.
-- ElementPrefixUnbound = Prefixet \"{0}\" f\u00F6r elementet \"{1}\" \u00E4r inte bundet.
-- AttributePrefixUnbound = Prefixet \"{2}\" f\u00F6r attributet \"{1}\" som associeras med elementtyp \"{0}\" \u00E4r inte bundet.
-- EmptyPrefixedAttName = Ogiltigt v\u00E4rde f\u00F6r attributet \"{0}\". Namnrymdsbindningar som prefix kanske inte \u00E4r tomma.
-- PrefixDeclared = Namnrymdsprefixet \"{0}\" har inte deklarerats.
-+ ElementXMLNSPrefix = Elementet "{0}" kan inte anv\u00E4ndas med "xmlns" som prefix.
-+ ElementPrefixUnbound = Prefixet "{0}" f\u00F6r elementet "{1}" \u00E4r inte bundet.
-+ AttributePrefixUnbound = Prefixet "{2}" f\u00F6r attributet "{1}" som associeras med elementtyp "{0}" \u00E4r inte bundet.
-+ EmptyPrefixedAttName = Ogiltigt v\u00E4rde f\u00F6r attributet "{0}". Namnrymdsbindningar som prefix kanske inte \u00E4r tomma.
-+ PrefixDeclared = Namnrymdsprefixet "{0}" har inte deklarerats.
- CantBindXMLNS = Prefixet "xmlns" kan inte bindas till en specifik namnrymd och namnrymden f\u00F6r "xmlns" kan inte heller bindas till ett specifikt prefix.
- CantBindXML = Prefixet "xml" kan inte bindas till en namnrymd ut\u00F6ver den vanliga och namnrymden f\u00F6r "xml" kan inte heller bindas till n\u00E5got annat prefix \u00E4n "xml".
-- MSG_ATT_DEFAULT_INVALID = defaultValue \"{1}\" f\u00F6r attributet \"{0}\" \u00E4r inte till\u00E5tet vad g\u00E4ller de lexikala begr\u00E4nsningarna f\u00F6r denna attributtyp.
-+ MSG_ATT_DEFAULT_INVALID = defaultValue "{1}" f\u00F6r attributet "{0}" \u00E4r inte till\u00E5tet vad g\u00E4ller de lexikala begr\u00E4nsningarna f\u00F6r denna attributtyp.
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=Parsern har p\u00E5tr\u00E4ffat fler \u00E4n \"{0}\" enhetstill\u00E4gg i dokumentet - applikationens gr\u00E4nsv\u00E4rde har uppn\u00E5tts.
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: Parsern har p\u00E5tr\u00E4ffat fler \u00E4n "{0}" enhetstill\u00E4gg i dokumentet - gr\u00E4nsv\u00E4rdet f\u00F6r JDK har uppn\u00E5tts.
-+ ElementAttributeLimit=JAXP00010002: Elementet "{0}" har fler \u00E4n "{1}" attribut, "{1}" \u00E4r gr\u00E4nsv\u00E4rdet f\u00F6r JDK.
-+ MaxEntitySizeLimit=JAXP00010003: L\u00E4ngden p\u00E5 enheten "{0}" \u00E4r "{1}" som \u00F6verskriver gr\u00E4nsv\u00E4rdet p\u00E5 "{2}" som anges av "{3}".
-+ TotalEntitySizeLimit=JAXP00010004: Den ackumulerade storleken "{0}" f\u00F6r enheter \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}".
-+ MaxXMLNameLimit=JAXP00010005: Namnet "{0}" \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}".
-+ MaxElementDepthLimit=JAXP00010006: Elementet "{0}" har djupet "{1}" vilket \u00E4r st\u00F6rre \u00E4n gr\u00E4nsen "{2}" som anges av "{3}".
-
--# 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 2014-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = \u5728\u6587\u6863\u524D\u8A00\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
- InvalidCharInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
- # 2.4 Character Data and Markup
-- CDEndInContent = \u9664\u975E\u4F7F\u7528\u5B57\u7B26\u5E8F\u5217 \"]]>\" \u6765\u6807\u8BB0 CDATA \u8282\u7684\u7ED3\u5C3E, \u5426\u5219\u8BE5\u5B57\u7B26\u5E8F\u5217\u4E0D\u80FD\u51FA\u73B0\u5728\u5185\u5BB9\u4E2D\u3002
-+ CDEndInContent = \u9664\u975E\u4F7F\u7528\u5B57\u7B26\u5E8F\u5217 "]]>" \u6765\u6807\u8BB0 CDATA \u8282\u7684\u7ED3\u5C3E, \u5426\u5219\u8BE5\u5B57\u7B26\u5E8F\u5217\u4E0D\u80FD\u51FA\u73B0\u5728\u5185\u5BB9\u4E2D\u3002
- # 2.7 CDATA Sections
-- CDSectUnterminated = CDATA \u8282\u5FC5\u987B\u4EE5 \"]]>\" \u7ED3\u5C3E\u3002
-+ CDSectUnterminated = CDATA \u8282\u5FC5\u987B\u4EE5 "]]>" \u7ED3\u5C3E\u3002
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = XML \u58F0\u660E\u53EA\u80FD\u51FA\u73B0\u5728\u6587\u6863\u7684\u6700\u5F00\u5934\u5904\u3002
-- EqRequiredInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D, \"{0}\" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
-- QuoteRequiredInXMLDecl = XML \u58F0\u660E\u4E2D \"{0}\" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
-- XMLDeclUnterminated = XML \u58F0\u660E\u5FC5\u987B\u4EE5 \"?>\" \u7ED3\u5C3E\u3002
-+ EqRequiredInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D, "{0}" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
-+ QuoteRequiredInXMLDecl = XML \u58F0\u660E\u4E2D "{0}" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
-+ XMLDeclUnterminated = XML \u58F0\u660E\u5FC5\u987B\u4EE5 "?>" \u7ED3\u5C3E\u3002
- VersionInfoRequired = XML \u58F0\u660E\u4E2D\u9700\u8981\u6B64\u7248\u672C\u3002
- SpaceRequiredBeforeVersionInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u7684\u7248\u672C\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
- SpaceRequiredBeforeEncodingInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u7684\u7F16\u7801\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
-@@ -71,85 +43,86 @@
- ReferenceIllegalInTrailingMisc=\u5C3E\u968F\u8282\u4E2D\u4E0D\u5141\u8BB8\u6709\u5F15\u7528\u3002
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = \u72EC\u7ACB\u6587\u6863\u58F0\u660E\u503C\u5FC5\u987B\u4E3A \"\u662F\" \u6216 \"\u5426\", \u4E0D\u80FD\u4E3A \"{0}\"\u3002
-+ SDDeclInvalid = \u72EC\u7ACB\u6587\u6863\u58F0\u660E\u503C\u5FC5\u987B\u4E3A "\u662F" \u6216 "\u5426", \u4E0D\u80FD\u4E3A "{0}"\u3002
-+ SDDeclNameInvalid = XML \u58F0\u660E\u4E2D\u7684\u72EC\u7ACB\u540D\u79F0\u53EF\u80FD\u62FC\u5199\u6709\u8BEF\u3002
- # 2.12 Language Identification
-- XMLLangInvalid = xml:lang \u5C5E\u6027\u503C \"{0}\" \u662F\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BC6\u7B26\u3002
-+ XMLLangInvalid = xml:lang \u5C5E\u6027\u503C "{0}" \u662F\u65E0\u6548\u7684\u8BED\u8A00\u6807\u8BC6\u7B26\u3002
- # 3. Logical Structures
-- ETagRequired = \u5143\u7D20\u7C7B\u578B \"{0}\" \u5FC5\u987B\u7531\u5339\u914D\u7684\u7ED3\u675F\u6807\u8BB0 \"</{0}>\" \u7EC8\u6B62\u3002
-+ ETagRequired = \u5143\u7D20\u7C7B\u578B "{0}" \u5FC5\u987B\u7531\u5339\u914D\u7684\u7ED3\u675F\u6807\u8BB0 "</{0}>" \u7EC8\u6B62\u3002
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = \u5143\u7D20\u7C7B\u578B \"{0}\" \u5FC5\u987B\u540E\u8DDF\u5C5E\u6027\u89C4\u8303 \">\" \u6216 \"/>\"\u3002
-- EqRequiredInAttribute = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684\u5C5E\u6027\u540D \"{1}\" \u5FC5\u987B\u540E\u8DDF '' = '' \u5B57\u7B26\u3002
-- OpenQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684\u5C5E\u6027 \"{1}\" \u5E94\u6709\u5DE6\u5F15\u53F7\u3002
-- CloseQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684\u5C5E\u6027 \"{1}\" \u5E94\u6709\u53F3\u5F15\u53F7\u3002
-- AttributeNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u5C5E\u6027 \"{1}\"\u3002
-- AttributeNSNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u7ED1\u5B9A\u5230\u540D\u79F0\u7A7A\u95F4 \"{2}\" \u7684\u5C5E\u6027 \"{1}\"\u3002
-- ETagUnterminated = \u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u7ED3\u675F\u6807\u8BB0\u5FC5\u987B\u4EE5 ''>'' \u5206\u9694\u7B26\u7ED3\u675F\u3002
-+ ElementUnterminated = \u5143\u7D20\u7C7B\u578B "{0}" \u5FC5\u987B\u540E\u8DDF\u5C5E\u6027\u89C4\u8303 ">" \u6216 "/>"\u3002
-+ EqRequiredInAttribute = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027\u540D "{1}" \u5FC5\u987B\u540E\u8DDF '' = '' \u5B57\u7B26\u3002
-+ OpenQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u5E94\u6709\u5DE6\u5F15\u53F7\u3002
-+ CloseQuoteExpected = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u5E94\u6709\u53F3\u5F15\u53F7\u3002
-+ AttributeNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u5C5E\u6027 "{1}"\u3002
-+ AttributeNSNotUnique = \u5DF2\u7ECF\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u7ED1\u5B9A\u5230\u540D\u79F0\u7A7A\u95F4 "{2}" \u7684\u5C5E\u6027 "{1}"\u3002
-+ ETagUnterminated = \u5143\u7D20\u7C7B\u578B "{0}" \u7684\u7ED3\u675F\u6807\u8BB0\u5FC5\u987B\u4EE5 ''>'' \u5206\u9694\u7B26\u7ED3\u675F\u3002
- MarkupNotRecognizedInContent = \u5143\u7D20\u5185\u5BB9\u5FC5\u987B\u7531\u683C\u5F0F\u6B63\u786E\u7684\u5B57\u7B26\u6570\u636E\u6216\u6807\u8BB0\u7EC4\u6210\u3002
- DoctypeIllegalInContent = \u5185\u5BB9\u4E2D\u4E0D\u5141\u8BB8\u6709 DOCTYPE\u3002
- # 4.1 Character and Entity References
- ReferenceUnterminated = \u5F15\u7528\u5FC5\u987B\u4EE5 ';' \u5206\u9694\u7B26\u7EC8\u6B62\u3002
- # 4.3.2 Well-Formed Parsed Entities
-- ReferenceNotInOneEntity = \u5F15\u7528\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u5185\u3002
-- ElementEntityMismatch = \u5143\u7D20 \"{0}\" \u5FC5\u987B\u4ECE\u5934\u81F3\u5C3E\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
-+ ReferenceNotInOneEntity = \u5F15\u7528\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u89E3\u6790\u5B9E\u4F53\u5185\u3002
-+ ElementEntityMismatch = \u5143\u7D20 "{0}" \u5FC5\u987B\u4ECE\u5934\u81F3\u5C3E\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
- MarkupEntityMismatch=XML \u6587\u6863\u7ED3\u6784\u5FC5\u987B\u4ECE\u5934\u81F3\u5C3E\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = \u5728 \"{1}\" \u5C5E\u6027\u503C\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{2}), \u5E76\u4E14\u5143\u7D20\u4E3A \"{0}\"\u3002
-+ InvalidCharInAttValue = \u5728 "{1}" \u5C5E\u6027\u503C\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{2}), \u5E76\u4E14\u5143\u7D20\u4E3A "{0}"\u3002
- InvalidCharInComment = \u5728\u6CE8\u91CA\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
- InvalidCharInPI = \u5728\u5904\u7406\u6307\u4EE4\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
- InvalidCharInInternalSubset = \u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
- InvalidCharInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = \"{1}\" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5355\u5F15\u53F7\u5B57\u7B26\u6216\u53CC\u5F15\u53F7\u5B57\u7B26\u5F00\u5934\u3002
-- LessthanInAttValue = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684 \"{1}\" \u5C5E\u6027\u503C\u4E0D\u80FD\u5305\u542B ''<'' \u5B57\u7B26\u3002
-- AttributeValueUnterminated = \"{1}\" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5339\u914D\u7684\u5F15\u53F7\u5B57\u7B26\u7ED3\u5C3E\u3002
-+ QuoteRequiredInAttValue = "{1}" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5355\u5F15\u53F7\u5B57\u7B26\u6216\u53CC\u5F15\u53F7\u5B57\u7B26\u5F00\u5934\u3002
-+ LessthanInAttValue = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684 "{1}" \u5C5E\u6027\u503C\u4E0D\u80FD\u5305\u542B ''<'' \u5B57\u7B26\u3002
-+ AttributeValueUnterminated = "{1}" \u5C5E\u6027\u503C\u5FC5\u987B\u4EE5\u5339\u914D\u7684\u5F15\u53F7\u5B57\u7B26\u7ED3\u5C3E\u3002
- # 2.5 Comments
-- InvalidCommentStart = \u6CE8\u91CA\u5FC5\u987B\u4EE5 \"<!--\" \u5F00\u5934\u3002
-- DashDashInComment = \u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u51FA\u73B0\u5B57\u7B26\u4E32 \"--\"\u3002
-- CommentUnterminated = \u6CE8\u91CA\u5FC5\u987B\u4EE5 \"-->\" \u7ED3\u5C3E\u3002
-+ InvalidCommentStart = \u6CE8\u91CA\u5FC5\u987B\u4EE5 "<!--" \u5F00\u5934\u3002
-+ DashDashInComment = \u6CE8\u91CA\u4E2D\u4E0D\u5141\u8BB8\u51FA\u73B0\u5B57\u7B26\u4E32 "--"\u3002
-+ CommentUnterminated = \u6CE8\u91CA\u5FC5\u987B\u4EE5 "-->" \u7ED3\u5C3E\u3002
- COMMENT_NOT_IN_ONE_ENTITY = \u6CE8\u91CA\u6CA1\u6709\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
- # 2.6 Processing Instructions
- PITargetRequired = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u4EE5\u76EE\u6807\u540D\u79F0\u5F00\u5934\u3002
- SpaceRequiredInPI = \u5728\u5904\u7406\u6307\u4EE4\u76EE\u6807\u548C\u6570\u636E\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-- PIUnterminated = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u4EE5 \"?>\" \u7ED3\u5C3E\u3002
-- ReservedPITarget = \u4E0D\u5141\u8BB8\u6709\u5339\u914D \"[xX][mM][lL]\" \u7684\u5904\u7406\u6307\u4EE4\u76EE\u6807\u3002
-+ PIUnterminated = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u4EE5 "?>" \u7ED3\u5C3E\u3002
-+ ReservedPITarget = \u4E0D\u5141\u8BB8\u6709\u5339\u914D "[xX][mM][lL]" \u7684\u5904\u7406\u6307\u4EE4\u76EE\u6807\u3002
- PI_NOT_IN_ONE_ENTITY = \u5904\u7406\u6307\u4EE4\u6CA1\u6709\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5B9E\u4F53\u5185\u3002
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = \u7248\u672C \"{0}\" \u65E0\u6548\u3002
-- VersionNotSupported = \u4E0D\u652F\u6301 XML \u7248\u672C \"{0}\", \u53EA\u652F\u6301 XML 1.0\u3002
-- VersionNotSupported11 = \u4E0D\u652F\u6301 XML \u7248\u672C \"{0}\", \u53EA\u652F\u6301 XML 1.0 \u548C XML 1.1\u3002
-+ VersionInfoInvalid = \u7248\u672C "{0}" \u65E0\u6548\u3002
-+ VersionNotSupported = \u4E0D\u652F\u6301 XML \u7248\u672C "{0}", \u53EA\u652F\u6301 XML 1.0\u3002
-+ VersionNotSupported11 = \u4E0D\u652F\u6301 XML \u7248\u672C "{0}", \u53EA\u652F\u6301 XML 1.0 \u548C XML 1.1\u3002
- VersionMismatch= \u5B9E\u4F53\u4E0D\u80FD\u5305\u542B\u8F83\u9AD8\u7248\u672C\u7684\u53E6\u4E00\u4E2A\u5B9E\u4F53\u3002
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 \"&#\" \u540E\u9762\u3002
-- HexdigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u516D\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 \"&#x\" \u540E\u9762\u3002
-+ DigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 "&#" \u540E\u9762\u3002
-+ HexdigitRequiredInCharRef = \u5728\u5B57\u7B26\u5F15\u7528\u4E2D, \u5341\u516D\u8FDB\u5236\u8868\u793A\u65B9\u6CD5\u5FC5\u987B\u7D27\u8DDF\u5728 "&#x" \u540E\u9762\u3002
- SemicolonRequiredInCharRef = \u5B57\u7B26\u5F15\u7528\u5FC5\u987B\u4EE5 ';' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
-- InvalidCharRef = \u5B57\u7B26\u5F15\u7528 \"&#{0}\" \u662F\u65E0\u6548\u7684 XML \u5B57\u7B26\u3002
-+ InvalidCharRef = \u5B57\u7B26\u5F15\u7528 "&#{0}" \u662F\u65E0\u6548\u7684 XML \u5B57\u7B26\u3002
- NameRequiredInReference = \u5728\u5B9E\u4F53\u5F15\u7528\u4E2D, \u5B9E\u4F53\u540D\u79F0\u5FC5\u987B\u7D27\u8DDF\u5728 '&' \u540E\u9762\u3002
-- SemicolonRequiredInReference = \u5BF9\u5B9E\u4F53 \"{0}\" \u7684\u5F15\u7528\u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
-+ SemicolonRequiredInReference = \u5BF9\u5B9E\u4F53 "{0}" \u7684\u5F15\u7528\u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
- # 4.3.1 The Text Declaration
-- TextDeclMustBeFirst = \u6587\u672C\u58F0\u660E\u53EA\u80FD\u51FA\u73B0\u5728\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u7684\u6700\u5F00\u5934\u5904\u3002
-- EqRequiredInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D, \"{0}\" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
-- QuoteRequiredInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D \"{0}\" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
-- CloseQuoteMissingInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D \"{0}\" \u540E\u9762\u8DDF\u968F\u7684\u503C\u7F3A\u5C11\u53F3\u5F15\u53F7\u3002
-+ TextDeclMustBeFirst = \u6587\u672C\u58F0\u660E\u53EA\u80FD\u51FA\u73B0\u5728\u5DF2\u89E3\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u7684\u6700\u5F00\u5934\u5904\u3002
-+ EqRequiredInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D, "{0}" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 '' = '' \u5B57\u7B26\u3002
-+ QuoteRequiredInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D "{0}" \u540E\u9762\u8DDF\u968F\u7684\u503C\u5FC5\u987B\u662F\u7528\u5F15\u53F7\u62EC\u8D77\u6765\u7684\u5B57\u7B26\u4E32\u3002
-+ CloseQuoteMissingInTextDecl = \u6587\u672C\u58F0\u660E\u4E2D "{0}" \u540E\u9762\u8DDF\u968F\u7684\u503C\u7F3A\u5C11\u53F3\u5F15\u53F7\u3002
- SpaceRequiredBeforeVersionInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D\u7684\u7248\u672C\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
- SpaceRequiredBeforeEncodingInTextDecl = \u5728\u6587\u672C\u58F0\u660E\u4E2D\u7684\u7F16\u7801\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002
-- TextDeclUnterminated = \u6587\u672C\u58F0\u660E\u5FC5\u987B\u4EE5 \"?>\" \u7ED3\u5C3E\u3002
-+ TextDeclUnterminated = \u6587\u672C\u58F0\u660E\u5FC5\u987B\u4EE5 "?>" \u7ED3\u5C3E\u3002
- EncodingDeclRequired = \u6587\u672C\u58F0\u660E\u4E2D\u9700\u8981\u7F16\u7801\u58F0\u660E\u3002
- NoMorePseudoAttributes = \u4E0D\u5141\u8BB8\u4F7F\u7528\u66F4\u591A\u7684\u4F2A\u5C5E\u6027\u3002
- MorePseudoAttributes = \u5E94\u8BE5\u6709\u66F4\u591A\u7684\u4F2A\u5C5E\u6027\u3002
- PseudoAttrNameExpected = \u5E94\u8BE5\u6709\u4F2A\u5C5E\u6027\u540D\u3002
- # 4.3.2 Well-Formed Parsed Entities
-- CommentNotInOneEntity = \u6CE8\u91CA\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u5185\u3002
-- PINotInOneEntity = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u5185\u3002
-+ CommentNotInOneEntity = \u6CE8\u91CA\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u89E3\u6790\u5B9E\u4F53\u5185\u3002
-+ PINotInOneEntity = \u5904\u7406\u6307\u4EE4\u5FC5\u987B\u5B8C\u5168\u5305\u542B\u5728\u540C\u4E00\u4E2A\u5DF2\u89E3\u6790\u5B9E\u4F53\u5185\u3002
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = \u7F16\u7801\u540D\u79F0 \"{0}\" \u65E0\u6548\u3002
-- EncodingByteOrderUnsupported = \u4E0D\u652F\u6301\u7F16\u7801 \"{0}\" \u7684\u7ED9\u5B9A\u5B57\u8282\u987A\u5E8F\u3002
-+ EncodingDeclInvalid = \u7F16\u7801\u540D\u79F0 "{0}" \u65E0\u6548\u3002
-+ EncodingByteOrderUnsupported = \u4E0D\u652F\u6301\u7F16\u7801 "{0}" \u7684\u7ED9\u5B9A\u5B57\u8282\u987A\u5E8F\u3002
- InvalidByte = {1} \u5B57\u8282\u7684 UTF-8 \u5E8F\u5217\u7684\u5B57\u8282 {0} \u65E0\u6548\u3002
- ExpectedByte = \u5E94\u4E3A {1} \u5B57\u8282\u7684 UTF-8 \u5E8F\u5217\u7684\u5B57\u8282 {0}\u3002
- InvalidHighSurrogate = UTF-8 \u5E8F\u5217\u4E2D\u7684\u9AD8\u4EE3\u7406\u4F4D\u4E0D\u80FD\u8D85\u8FC7 0x10, \u4F46\u627E\u5230 0x{0}\u3002
-- OperationNotSupported = {1}\u8BFB\u8FDB\u7A0B\u4E0D\u652F\u6301\u64CD\u4F5C \"{0}\"\u3002
-- InvalidASCII = \u5B57\u8282 \"{0}\" \u4E0D\u662F (7 \u4F4D) ASCII \u5B57\u7B26\u96C6\u7684\u6210\u5458\u3002
-+ OperationNotSupported = {1}\u8BFB\u8FDB\u7A0B\u4E0D\u652F\u6301\u64CD\u4F5C "{0}"\u3002
-+ InvalidASCII = \u5B57\u8282 "{0}" \u4E0D\u662F (7 \u4F4D) ASCII \u5B57\u7B26\u96C6\u7684\u6210\u5458\u3002
- CharConversionFailure = \u786E\u5B9A\u5C5E\u4E8E\u67D0\u4E2A\u7F16\u7801\u7684\u5B9E\u4F53\u4E0D\u80FD\u5305\u542B\u5728\u8BE5\u7F16\u7801\u4E2D\u975E\u6CD5\u7684\u5E8F\u5217\u3002
-
- # DTD Messages
-@@ -169,150 +142,150 @@
- PubidCharIllegal = \u516C\u5171\u6807\u8BC6\u7B26\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u8BE5\u5B57\u7B26 (Unicode: 0x{0})\u3002
- SpaceRequiredBetweenPublicAndSystem = \u5728 publicId \u548C systemId \u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 \"<!DOCTYPE\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D, \u6839\u5143\u7D20\u7C7B\u578B\u5FC5\u987B\u51FA\u73B0\u5728 \"<!DOCTYPE\" \u540E\u9762\u3002
-- DoctypedeclUnterminated = \u6839\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u6587\u6863\u7C7B\u578B\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
-- PEReferenceWithinMarkup = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 \"%{0};\" \u4E0D\u80FD\u51FA\u73B0\u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u7684\u6807\u8BB0\u5185\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 "<!DOCTYPE" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D, \u6839\u5143\u7D20\u7C7B\u578B\u5FC5\u987B\u51FA\u73B0\u5728 "<!DOCTYPE" \u540E\u9762\u3002
-+ DoctypedeclUnterminated = \u6839\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u6587\u6863\u7C7B\u578B\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
-+ PEReferenceWithinMarkup = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};" \u4E0D\u80FD\u51FA\u73B0\u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u7684\u6807\u8BB0\u5185\u3002
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u6863\u7C7B\u578B\u58F0\u660E\u5305\u542B\u6216\u6307\u5411\u7684\u6807\u8BB0\u58F0\u660E\u5FC5\u987B\u683C\u5F0F\u6B63\u786E\u3002
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = \"xml:space\" \u7684\u5C5E\u6027\u58F0\u660E\u5FC5\u987B\u6307\u5B9A\u4E3A\u679A\u4E3E\u7C7B\u578B, \u5B83\u7684\u53EF\u80FD\u503C\u53EA\u6709 \"default\" \u548C \"preserve\"\u3002
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space" \u7684\u5C5E\u6027\u58F0\u660E\u5FC5\u987B\u6307\u5B9A\u4E3A\u679A\u4E3E\u7C7B\u578B, \u5B83\u7684\u53EF\u80FD\u503C\u53EA\u6709 "default" \u548C "preserve"\u3002
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 \"<!ELEMENT\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 "<!ELEMENT" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B \"{0}\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B \"{0}\" \u540E\u9762\u9700\u8981\u6709\u7EA6\u675F\u6761\u4EF6\u3002
-- ElementDeclUnterminated = \u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B "{0}" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u7C7B\u578B\u58F0\u660E\u4E2D\u7684\u5143\u7D20\u7C7B\u578B "{0}" \u540E\u9762\u9700\u8981\u6709\u7EA6\u675F\u6761\u4EF6\u3002
-+ ElementDeclUnterminated = \u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 ''('' \u5B57\u7B26\u6216\u5143\u7D20\u7C7B\u578B\u3002
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 ''('' \u5B57\u7B26\u6216\u5143\u7D20\u7C7B\u578B\u3002
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5728\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5728\u5143\u7D20\u7C7B\u578B \"{0}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
-- MixedContentUnterminated = \u5F53\u5B50\u5143\u7D20\u7C7B\u578B\u53D7\u7EA6\u675F\u65F6, \u6DF7\u5408\u5185\u5BB9\u6A21\u578B \"{0}\" \u5FC5\u987B\u4EE5 \")*\" \u7ED3\u5C3E\u3002
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5728\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709 '')''\u3002
-+ MixedContentUnterminated = \u5F53\u5B50\u5143\u7D20\u7C7B\u578B\u53D7\u7EA6\u675F\u65F6, \u6DF7\u5408\u5185\u5BB9\u6A21\u578B "{0}" \u5FC5\u987B\u4EE5 ")*" \u7ED3\u5C3E\u3002
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684 \"<!ATTLIST\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684 "<!ATTLIST" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = \u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5143\u7D20\u7C7B\u578B\u3002
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684\u5C5E\u6027\u540D\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-- AttNameRequiredInAttDef = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u5FC5\u987B\u6307\u5B9A\u5C5E\u6027\u540D\u3002
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{1}\" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u7C7B\u578B\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-- AttTypeRequiredInAttDef = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{1}\" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5C5E\u6027\u7C7B\u578B\u3002
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{1}\" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u9ED8\u8BA4\u503C\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u4E3A\u6307\u5B9A\u5143\u7D20 \"{0}\" \u7684\u540C\u4E00\u5C5E\u6027 \"{1}\" \u63D0\u4F9B\u4E86\u591A\u4E2A\u5C5E\u6027\u5B9A\u4E49\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u7684\u5C5E\u6027\u540D\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ AttNameRequiredInAttDef = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027\u5217\u8868\u58F0\u660E\u4E2D\u5FC5\u987B\u6307\u5B9A\u5C5E\u6027\u540D\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{1}" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u7C7B\u578B\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ AttTypeRequiredInAttDef = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{1}" \u7684\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5C5E\u6027\u7C7B\u578B\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{1}" \u7684\u58F0\u660E\u4E2D, \u5728\u5C5E\u6027\u9ED8\u8BA4\u503C\u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u4E3A\u6307\u5B9A\u5143\u7D20 "{0}" \u7684\u540C\u4E00\u5C5E\u6027 "{1}" \u63D0\u4F9B\u4E86\u591A\u4E2A\u5C5E\u6027\u5B9A\u4E49\u3002
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 \"NOTATION\" \u540E\u9762\u3002
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \"NOTATION\" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 ''('' \u5B57\u7B26\u3002
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
-- NotationTypeUnterminated = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u7684\u679A\u4E3E\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u540D\u79F0\u6807\u8BB0\u3002
-- EnumerationUnterminated = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \u679A\u4E3E\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{2}\" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C \"{1}\" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A\u679A\u4E3E\u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NMTOKENS \u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5728\u5143\u7D20 \"{0}\" \u7684\u5C5E\u6027 \"{2}\" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C \"{1}\" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A NotationType \u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NOTATION \u540D\u79F0\u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 "NOTATION" \u540E\u9762\u3002
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, "NOTATION" \u540E\u9762\u5FC5\u987B\u8DDF\u6709 ''('' \u5B57\u7B26\u3002
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
-+ NotationTypeUnterminated = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u7684\u679A\u4E3E\u7C7B\u578B\u5217\u8868\u4E2D\u9700\u8981\u6709\u540D\u79F0\u6807\u8BB0\u3002
-+ EnumerationUnterminated = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u679A\u4E3E\u7C7B\u578B\u5217\u8868\u5FC5\u987B\u4EE5 '')'' \u7ED3\u5C3E\u3002
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{2}" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C "{1}" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A\u679A\u4E3E\u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NMTOKENS \u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5728\u5143\u7D20 "{0}" \u7684\u5C5E\u6027 "{2}" \u7684\u58F0\u660E\u4E2D, \u679A\u4E3E\u503C "{1}" \u6307\u5B9A\u4E86\u591A\u6B21\u3002\u5355\u4E2A NotationType \u5C5E\u6027\u58F0\u660E\u4E2D\u7684 NOTATION \u540D\u79F0\u5FC5\u987B\u5168\u90E8\u4E0D\u76F8\u540C\u3002
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \u5728 \"{1}\" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 \"FIXED\" \u540E\u9762\u3002
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \u5728 "{1}" \u5C5E\u6027\u58F0\u660E\u4E2D, \u7A7A\u683C\u5FC5\u987B\u51FA\u73B0\u5728 "FIXED" \u540E\u9762\u3002
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = \u5305\u542B\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 \"]]>\" \u7ED3\u5C3E\u3002
-- IgnoreSectUnterminated = \u6392\u9664\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 \"]]>\" \u7ED3\u5C3E\u3002
-+ IncludeSectUnterminated = \u5305\u542B\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 "]]>" \u7ED3\u5C3E\u3002
-+ IgnoreSectUnterminated = \u6392\u9664\u7684\u6761\u4EF6\u8282\u5FC5\u987B\u4EE5 "]]>" \u7ED3\u5C3E\u3002
- # 4.1 Character and Entity References
- NameRequiredInPEReference = \u5728\u53C2\u6570\u5B9E\u4F53\u5F15\u7528\u4E2D, \u5B9E\u4F53\u540D\u79F0\u5FC5\u987B\u7D27\u8DDF\u5728 '%' \u540E\u9762\u3002
-- SemicolonRequiredInPEReference = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 \"%{0};\" \u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
-+ SemicolonRequiredInPEReference = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};" \u5FC5\u987B\u4EE5 '';'' \u5206\u9694\u7B26\u7ED3\u5C3E\u3002
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 \"<!ENTITY\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C2\u6570\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 \"<!ENTITY\" \u548C '%' \u5B57\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 "<!ENTITY" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C2\u6570\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 "<!ENTITY" \u548C '%' \u5B57\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u5728\u53C2\u6570\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684 '%' \u548C\u5B9E\u4F53\u540D\u79F0\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u5B9E\u4F53\u58F0\u660E\u4E2D\u9700\u8981\u6709\u5B9E\u4F53\u540D\u79F0\u3002
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684\u5B9E\u4F53\u540D\u79F0 \"{0}\" \u548C\u5B9A\u4E49\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 \"{0}\" \u7684\u58F0\u660E\u4E2D\u7684 \"NDATA\" \u548C\u8BB0\u53F7\u540D\u79F0\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 \"{0}\" \u7684\u58F0\u660E\u4E2D\u7684 \"NDATA\" \u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 \"{0}\" \u7684\u58F0\u660E\u4E2D\u7684 \"NDATA\" \u540E\u9762\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
-- EntityDeclUnterminated = \u5B9E\u4F53 \"{0}\" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
-- MSG_DUPLICATE_ENTITY_DEFINITION = \u5B9E\u4F53 \"{0}\" \u58F0\u660E\u4E86\u591A\u6B21\u3002
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5B9E\u4F53\u58F0\u660E\u4E2D\u7684\u5B9E\u4F53\u540D\u79F0 "{0}" \u548C\u5B9A\u4E49\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u4E2D\u7684 "NDATA" \u548C\u8BB0\u53F7\u540D\u79F0\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u4E2D\u7684 "NDATA" \u524D\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u4E2D\u7684 "NDATA" \u540E\u9762\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
-+ EntityDeclUnterminated = \u5B9E\u4F53 "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
-+ MSG_DUPLICATE_ENTITY_DEFINITION = \u5B9E\u4F53 "{0}" \u58F0\u660E\u4E86\u591A\u6B21\u3002
- # 4.2.2 External Entities
-- ExternalIDRequired = \u5916\u90E8\u5B9E\u4F53\u58F0\u660E\u5FC5\u987B\u4EE5 \"SYSTEM\" \u6216 \"PUBLIC\" \u5F00\u5934\u3002
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u5728 \"PUBLIC\" \u548C\u516C\u5171\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ ExternalIDRequired = \u5916\u90E8\u5B9E\u4F53\u58F0\u660E\u5FC5\u987B\u4EE5 "SYSTEM" \u6216 "PUBLIC" \u5F00\u5934\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \u5728 "PUBLIC" \u548C\u516C\u5171\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u5728\u516C\u5171\u6807\u8BC6\u7B26\u548C\u7CFB\u7EDF\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u5728 \"SYSTEM\" \u548C\u7CFB\u7EDF\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-- MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5\u6807\u8BC6\u7B26\u4E0D\u80FD\u6307\u5B9A\u4E3A\u7CFB\u7EDF\u6807\u8BC6\u7B26 \"{0}\" \u7684\u4E00\u90E8\u5206\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \u5728 "SYSTEM" \u548C\u7CFB\u7EDF\u6807\u8BC6\u7B26\u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5\u6807\u8BC6\u7B26\u4E0D\u80FD\u6307\u5B9A\u4E3A\u7CFB\u7EDF\u6807\u8BC6\u7B26 "{0}" \u7684\u4E00\u90E8\u5206\u3002
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684 \"<!NOTATION\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684 "<!NOTATION" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \u8BB0\u53F7\u58F0\u660E\u4E2D\u9700\u8981\u6709\u8BB0\u53F7\u540D\u79F0\u3002
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684\u8BB0\u53F7\u540D\u79F0 \"{0}\" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-- ExternalIDorPublicIDRequired = \u8BB0\u53F7 \"{0}\" \u7684\u58F0\u660E\u5FC5\u987B\u5305\u542B\u7CFB\u7EDF\u6807\u8BC6\u7B26\u6216\u516C\u5171\u6807\u8BC6\u7B26\u3002
-- NotationDeclUnterminated = \u8BB0\u53F7 \"{0}\" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8BB0\u53F7\u58F0\u660E\u4E2D\u7684\u8BB0\u53F7\u540D\u79F0 "{0}" \u540E\u9762\u9700\u8981\u6709\u7A7A\u683C\u3002
-+ ExternalIDorPublicIDRequired = \u8BB0\u53F7 "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u5305\u542B\u7CFB\u7EDF\u6807\u8BC6\u7B26\u6216\u516C\u5171\u6807\u8BC6\u7B26\u3002
-+ NotationDeclUnterminated = \u8BB0\u53F7 "{0}" \u7684\u58F0\u660E\u5FC5\u987B\u4EE5 ''>'' \u7ED3\u5C3E\u3002
-
- # Validation messages
-- DuplicateTypeInMixedContent = \u5728\u5143\u7D20\u58F0\u660E \"{0}\" \u7684\u5185\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7ECF\u6307\u5B9A\u4E86\u5143\u7D20\u7C7B\u578B \"{1}\"\u3002
-- ENTITIESInvalid = \u7C7B\u578B\u4E3A ENTITIES \u7684\u5C5E\u6027\u503C \"{1}\" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u7684\u540D\u79F0\u3002
-- ENTITYInvalid = \u7C7B\u578B\u4E3A ENTITY \u7684\u5C5E\u6027\u503C \"{1}\" \u5FC5\u987B\u662F\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u7684\u540D\u79F0\u3002
-- IDDefaultTypeInvalid = ID \u5C5E\u6027 \"{0}\" \u5FC5\u987B\u5177\u6709\u5DF2\u58F0\u660E\u7684\u9ED8\u8BA4\u503C \"#IMPLIED\" \u6216 \"#REQUIRED\"\u3002
-- IDInvalid = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u540D\u79F0\u3002
-- IDInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F NCName\u3002
-- IDNotUnique = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C \"{0}\" \u5728\u6587\u6863\u5185\u5FC5\u987B\u662F\u552F\u4E00\u7684\u3002
-- IDREFInvalid = \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u540D\u79F0\u3002
-- IDREFInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F NCName\u3002
-- IDREFSInvalid = \u7C7B\u578B\u4E3A IDREFS \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u3002
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u5F53\u5B9E\u4F53\u5F15\u7528\u7528\u4F5C\u5B8C\u6574\u58F0\u660E\u65F6, \u53C2\u6570\u5B9E\u4F53 \"{0}\" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
-- ImproperDeclarationNesting = \u53C2\u6570\u5B9E\u4F53 \"{0}\" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
-- ImproperGroupNesting = \u53C2\u6570\u5B9E\u4F53 \"{0}\" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u62EC\u53F7\u5BF9\u3002
-- INVALID_PE_IN_CONDITIONAL = \u53C2\u6570\u5B9E\u4F53 \"{0}\" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6574\u4E2A\u6761\u4EF6\u8282, \u6216\u8005\u4EC5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
-- MSG_ATTRIBUTE_NOT_DECLARED = \u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B \"{0}\" \u58F0\u660E\u5C5E\u6027 \"{1}\"\u3002
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u503C\u4E3A \"{1}\" \u7684\u5C5E\u6027 \"{0}\" \u5FC5\u987B\u5177\u6709\u5217\u8868 \"{2}\" \u4E2D\u7684\u503C\u3002
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D, \u5C5E\u6027 \"{0}\" \u7684\u503C \"{1}\" \u4E0D\u80FD\u901A\u8FC7\u89C4\u8303\u5316\u8FDB\u884C\u66F4\u6539 (\u66F4\u6539\u4E3A \"{2}\")\u3002
-- MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u7C7B\u578B\u4E3A \"{0}\" \u7684\u5185\u5BB9\u4E0D\u5B8C\u6574, \u5B83\u5FC5\u987B\u5339\u914D \"{1}\"\u3002
-- MSG_CONTENT_INVALID = \u5143\u7D20\u7C7B\u578B\u4E3A \"{0}\" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D \"{1}\"\u3002
-- MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A \"{0}\" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D \"{1}\"\u3002\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A \"{2}\" \u7684\u5B50\u7EA7\u3002
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A \"{0}\" \u7684\u5C5E\u6027 \"{1}\" \u5177\u6709\u9ED8\u8BA4\u503C, \u5E76\u4E14\u5FC5\u987B\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u6307\u5B9A\u3002
-- MSG_DUPLICATE_ATTDEF = \u5DF2\u7ECF\u4E3A\u5143\u7D20\u7C7B\u578B \"{0}\" \u58F0\u660E\u5C5E\u6027 \"{1}\"\u3002
-- MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u7C7B\u578B \"{0}\" \u4E0D\u80FD\u58F0\u660E\u591A\u6B21\u3002
-- MSG_ELEMENT_NOT_DECLARED = \u5FC5\u987B\u58F0\u660E\u5143\u7D20\u7C7B\u578B \"{0}\"\u3002
-+ DuplicateTypeInMixedContent = \u5728\u5143\u7D20\u58F0\u660E "{0}" \u7684\u5185\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7ECF\u6307\u5B9A\u4E86\u5143\u7D20\u7C7B\u578B "{1}"\u3002
-+ ENTITIESInvalid = \u7C7B\u578B\u4E3A ENTITIES \u7684\u5C5E\u6027\u503C "{1}" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u672A\u89E3\u6790\u5B9E\u4F53\u7684\u540D\u79F0\u3002
-+ ENTITYInvalid = \u7C7B\u578B\u4E3A ENTITY \u7684\u5C5E\u6027\u503C "{1}" \u5FC5\u987B\u662F\u672A\u89E3\u6790\u5B9E\u4F53\u7684\u540D\u79F0\u3002
-+ IDDefaultTypeInvalid = ID \u5C5E\u6027 "{0}" \u5FC5\u987B\u5177\u6709\u5DF2\u58F0\u660E\u7684\u9ED8\u8BA4\u503C "#IMPLIED" \u6216 "#REQUIRED"\u3002
-+ IDInvalid = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u540D\u79F0\u3002
-+ IDInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F NCName\u3002
-+ IDNotUnique = \u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027\u503C "{0}" \u5728\u6587\u6863\u5185\u5FC5\u987B\u662F\u552F\u4E00\u7684\u3002
-+ IDREFInvalid = \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u540D\u79F0\u3002
-+ IDREFInvalidWithNamespaces = \u542F\u7528\u540D\u79F0\u7A7A\u95F4\u65F6, \u7C7B\u578B\u4E3A IDREF \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F NCName\u3002
-+ IDREFSInvalid = \u7C7B\u578B\u4E3A IDREFS \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u3002
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u5F53\u5B9E\u4F53\u5F15\u7528\u7528\u4F5C\u5B8C\u6574\u58F0\u660E\u65F6, \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
-+ ImproperDeclarationNesting = \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u58F0\u660E\u3002
-+ ImproperGroupNesting = \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6B63\u786E\u5D4C\u5957\u7684\u62EC\u53F7\u5BF9\u3002
-+ INVALID_PE_IN_CONDITIONAL = \u53C2\u6570\u5B9E\u4F53 "{0}" \u7684\u66FF\u6362\u6587\u672C\u5FC5\u987B\u5305\u542B\u6574\u4E2A\u6761\u4EF6\u8282, \u6216\u8005\u4EC5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
-+ MSG_ATTRIBUTE_NOT_DECLARED = \u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B "{0}" \u58F0\u660E\u5C5E\u6027 "{1}"\u3002
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u503C\u4E3A "{1}" \u7684\u5C5E\u6027 "{0}" \u5FC5\u987B\u5177\u6709\u5217\u8868 "{2}" \u4E2D\u7684\u503C\u3002
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D, \u5C5E\u6027 "{0}" \u7684\u503C "{1}" \u4E0D\u80FD\u901A\u8FC7\u89C4\u8303\u5316\u8FDB\u884C\u66F4\u6539 (\u66F4\u6539\u4E3A "{2}")\u3002
-+ MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5185\u5BB9\u4E0D\u5B8C\u6574, \u5B83\u5FC5\u987B\u5339\u914D "{1}"\u3002
-+ MSG_CONTENT_INVALID = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D "{1}"\u3002
-+ MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5185\u5BB9\u5FC5\u987B\u5339\u914D "{1}"\u3002\u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A "{2}" \u7684\u5B50\u7EA7\u3002
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u7C7B\u578B\u4E3A "{0}" \u7684\u5C5E\u6027 "{1}" \u5177\u6709\u9ED8\u8BA4\u503C, \u5E76\u4E14\u5FC5\u987B\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u6307\u5B9A\u3002
-+ MSG_DUPLICATE_ATTDEF = \u5DF2\u7ECF\u4E3A\u5143\u7D20\u7C7B\u578B "{0}" \u58F0\u660E\u5C5E\u6027 "{1}"\u3002
-+ MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u7C7B\u578B "{0}" \u4E0D\u80FD\u58F0\u660E\u591A\u6B21\u3002
-+ MSG_ELEMENT_NOT_DECLARED = \u5FC5\u987B\u58F0\u660E\u5143\u7D20\u7C7B\u578B "{0}"\u3002
- MSG_GRAMMAR_NOT_FOUND = \u6587\u6863\u65E0\u6548: \u627E\u4E0D\u5230\u8BED\u6CD5\u3002
-- MSG_ELEMENT_WITH_ID_REQUIRED = \u6587\u6863\u4E2D\u5FC5\u987B\u5305\u542B\u6807\u8BC6\u7B26\u4E3A \"{0}\" \u7684\u5143\u7D20\u3002
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5916\u90E8\u5B9E\u4F53 \"{0}\"\u3002
-- MSG_FIXED_ATTVALUE_INVALID = \u503C\u4E3A \"{2}\" \u7684\u5C5E\u6027 \"{1}\" \u5FC5\u987B\u5177\u6709 \"{3}\" \u7684\u503C\u3002
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B \"{0}\" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027 \"{1}\", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A ID \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 \"{2}\"\u3002
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B \"{0}\" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 \"{1}\", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A NOTATION \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 \"{2}\"\u3002
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5728\u5C5E\u6027 \"{0}\" \u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u5F15\u7528\u8BB0\u53F7 \"{1}\" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u5728 \"{0}\" \u7684\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u58F0\u660E\u4E2D\u5F15\u7528\u8BB0\u53F7 \"{1}\" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5B9E\u4F53 \"{0}\"\u3002
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u9700\u8981\u5C5E\u6027 \"{1}\", \u5E76\u4E14\u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B \"{0}\" \u6307\u5B9A\u8BE5\u5C5E\u6027\u3002
-- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5BF9\u4E8E\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u5177\u6709\u5143\u7D20\u5185\u5BB9\u7684\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5916\u90E8\u5B9E\u4F53, \u5728\u8BE5\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5143\u7D20\u4E4B\u95F4\u4E0D\u80FD\u51FA\u73B0\u7A7A\u683C\u3002
-- NMTOKENInvalid = \u7C7B\u578B\u4E3A NMTOKEN \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u540D\u79F0\u6807\u8BB0\u3002
-- NMTOKENSInvalid = \u7C7B\u578B\u4E3A NMTOKENS \u7684\u5C5E\u6027\u503C \"{0}\" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u6807\u8BB0\u3002
-- NoNotationOnEmptyElement = \u5DF2\u58F0\u660E\u4E3A EMPTY \u7684\u5143\u7D20\u7C7B\u578B \"{0}\" \u4E0D\u80FD\u58F0\u660E\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 \"{1}\"\u3002
-- RootElementTypeMustMatchDoctypedecl = \u6587\u6863\u6839\u5143\u7D20 \"{1}\" \u5FC5\u987B\u5339\u914D DOCTYPE \u6839 \"{0}\"\u3002
-- UndeclaredElementInContentSpec = \u5143\u7D20 \"{0}\" \u7684\u5185\u5BB9\u6A21\u578B\u5F15\u7528\u672A\u58F0\u660E\u7684\u5143\u7D20 \"{1}\"\u3002
-- UniqueNotationName = \u8BB0\u53F7 \"{0}\" \u7684\u58F0\u660E\u4E0D\u662F\u552F\u4E00\u7684\u3002\u4E0D\u80FD\u5728\u591A\u4E2A\u8BB0\u53F7\u58F0\u660E\u4E2D\u58F0\u660E\u6307\u5B9A\u7684\u540D\u79F0\u3002
-+ MSG_ELEMENT_WITH_ID_REQUIRED = \u6587\u6863\u4E2D\u5FC5\u987B\u5305\u542B\u6807\u8BC6\u7B26\u4E3A "{0}" \u7684\u5143\u7D20\u3002
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5916\u90E8\u5B9E\u4F53 "{0}"\u3002
-+ MSG_FIXED_ATTVALUE_INVALID = \u503C\u4E3A "{2}" \u7684\u5C5E\u6027 "{1}" \u5FC5\u987B\u5177\u6709 "{3}" \u7684\u503C\u3002
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B "{0}" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A ID \u7684\u5C5E\u6027 "{1}", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A ID \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 "{2}"\u3002
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u7C7B\u578B "{0}" \u5DF2\u7ECF\u5177\u6709\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 "{1}", \u4E0D\u5141\u8BB8\u4F7F\u7528\u7C7B\u578B\u4E3A NOTATION \u7684\u53E6\u4E00\u4E2A\u5C5E\u6027 "{2}"\u3002
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u5728\u5C5E\u6027 "{0}" \u7684\u8BB0\u53F7\u7C7B\u578B\u5217\u8868\u4E2D\u5F15\u7528\u8BB0\u53F7 "{1}" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u5728 "{0}" \u7684\u672A\u89E3\u6790\u5B9E\u4F53\u58F0\u660E\u4E2D\u5F15\u7528\u8BB0\u53F7 "{1}" \u65F6, \u5FC5\u987B\u58F0\u660E\u8BE5\u8BB0\u53F7\u3002
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u4E0D\u5141\u8BB8\u5F15\u7528\u5DF2\u89E3\u6790\u7684\u5916\u90E8\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5B9E\u4F53 "{0}"\u3002
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u9700\u8981\u5C5E\u6027 "{1}", \u5E76\u4E14\u5FC5\u987B\u4E3A\u5143\u7D20\u7C7B\u578B "{0}" \u6307\u5B9A\u8BE5\u5C5E\u6027\u3002
-+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5BF9\u4E8E\u5728\u72EC\u7ACB\u6587\u6863\u4E2D\u5177\u6709\u5143\u7D20\u5185\u5BB9\u7684\u5DF2\u89E3\u6790\u7684\u5916\u90E8\u5B9E\u4F53, \u5728\u8BE5\u5B9E\u4F53\u4E2D\u58F0\u660E\u7684\u5143\u7D20\u4E4B\u95F4\u4E0D\u80FD\u51FA\u73B0\u7A7A\u683C\u3002
-+ NMTOKENInvalid = \u7C7B\u578B\u4E3A NMTOKEN \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u540D\u79F0\u6807\u8BB0\u3002
-+ NMTOKENSInvalid = \u7C7B\u578B\u4E3A NMTOKENS \u7684\u5C5E\u6027\u503C "{0}" \u5FC5\u987B\u662F\u4E00\u4E2A\u6216\u591A\u4E2A\u540D\u79F0\u6807\u8BB0\u3002
-+ NoNotationOnEmptyElement = \u5DF2\u58F0\u660E\u4E3A EMPTY \u7684\u5143\u7D20\u7C7B\u578B "{0}" \u4E0D\u80FD\u58F0\u660E\u7C7B\u578B\u4E3A NOTATION \u7684\u5C5E\u6027 "{1}"\u3002
-+ RootElementTypeMustMatchDoctypedecl = \u6587\u6863\u6839\u5143\u7D20 "{1}" \u5FC5\u987B\u5339\u914D DOCTYPE \u6839 "{0}"\u3002
-+ UndeclaredElementInContentSpec = \u5143\u7D20 "{0}" \u7684\u5185\u5BB9\u6A21\u578B\u5F15\u7528\u672A\u58F0\u660E\u7684\u5143\u7D20 "{1}"\u3002
-+ UniqueNotationName = \u8BB0\u53F7 "{0}" \u7684\u58F0\u660E\u4E0D\u662F\u552F\u4E00\u7684\u3002\u4E0D\u80FD\u5728\u591A\u4E2A\u8BB0\u53F7\u58F0\u660E\u4E2D\u58F0\u660E\u6307\u5B9A\u7684\u540D\u79F0\u3002
- ENTITYFailedInitializeGrammar = ENTITYDatatype \u9A8C\u8BC1\u7A0B\u5E8F: \u672A\u80FD\u4F7F\u7528\u6709\u6548\u7684\u8BED\u6CD5\u5F15\u7528\u8C03\u7528\u521D\u59CB\u5316\u65B9\u6CD5\u3002\t
-- ENTITYNotUnparsed = ENTITY \"{0}\" \u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u3002
-- ENTITYNotValid = ENTITY \"{0}\" \u65E0\u6548\u3002
-+ ENTITYNotUnparsed = ENTITY "{0}" \u4E0D\u662F\u672A\u89E3\u6790\u7684\u3002
-+ ENTITYNotValid = ENTITY "{0}" \u65E0\u6548\u3002
- EmptyList = \u7C7B\u578B\u4E3A ENTITIES, IDREFS \u548C NMTOKENS \u7684\u503C\u4E0D\u80FD\u662F\u7A7A\u5217\u8868\u3002
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = \u5C5E\u6027\u503C\u4E2D\u4E0D\u5141\u8BB8\u91C7\u7528\u5916\u90E8\u5B9E\u4F53\u5F15\u7528 \"&{0};\"\u3002
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = \u5C5E\u6027\u503C\u4E2D\u4E0D\u5141\u8BB8\u91C7\u7528\u5916\u90E8\u5B9E\u4F53\u5F15\u7528 "&{0};"\u3002
-+ AccessExternalDTD = \u5916\u90E8 DTD: \u65E0\u6CD5\u8BFB\u53D6\u5916\u90E8 DTD ''{0}'', \u56E0\u4E3A accessExternalDTD \u5C5E\u6027\u8BBE\u7F6E\u7684\u9650\u5236\u5BFC\u81F4\u4E0D\u5141\u8BB8 ''{1}'' \u8BBF\u95EE\u3002
-+ AccessExternalEntity = \u5916\u90E8\u5B9E\u4F53: \u65E0\u6CD5\u8BFB\u53D6\u5916\u90E8\u6587\u6863 ''{0}'', \u56E0\u4E3A accessExternalDTD \u5C5E\u6027\u8BBE\u7F6E\u7684\u9650\u5236\u5BFC\u81F4\u4E0D\u5141\u8BB8 ''{1}'' \u8BBF\u95EE\u3002
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = \u5F15\u7528\u4E86\u5B9E\u4F53 \"{0}\", \u4F46\u672A\u58F0\u660E\u5B83\u3002
-- ReferenceToUnparsedEntity = \u4E0D\u5141\u8BB8\u4F7F\u7528\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u5F15\u7528 \"&{0};\"\u3002
-- RecursiveReference = \u9012\u5F52\u5B9E\u4F53\u5F15\u7528 \"{0}\"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
-- RecursiveGeneralReference = \u9012\u5F52\u4E00\u822C\u5B9E\u4F53\u5F15\u7528 \"&{0};\"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
-- RecursivePEReference = \u9012\u5F52\u53C2\u6570\u5B9E\u4F53\u5F15\u7528 \"%{0};\"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
-+ EntityNotDeclared = \u5F15\u7528\u4E86\u5B9E\u4F53 "{0}", \u4F46\u672A\u58F0\u660E\u5B83\u3002
-+ ReferenceToUnparsedEntity = \u4E0D\u5141\u8BB8\u4F7F\u7528\u672A\u89E3\u6790\u7684\u5B9E\u4F53\u5F15\u7528 "&{0};"\u3002
-+ RecursiveReference = \u9012\u5F52\u5B9E\u4F53\u5F15\u7528 "{0}"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
-+ RecursiveGeneralReference = \u9012\u5F52\u4E00\u822C\u5B9E\u4F53\u5F15\u7528 "&{0};"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
-+ RecursivePEReference = \u9012\u5F52\u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};"\u3002(\u5F15\u7528\u8DEF\u5F84: {1}),
- # 4.3.3 Character Encoding in Entities
-- EncodingNotSupported = \u4E0D\u652F\u6301\u7F16\u7801 \"{0}\"\u3002
-- EncodingRequired = \u5982\u679C\u5DF2\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53\u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u8FDB\u884C\u7F16\u7801, \u5219\u8BE5\u5B9E\u4F53\u5FC5\u987B\u5305\u542B\u7F16\u7801\u58F0\u660E\u3002
-+ EncodingNotSupported = \u4E0D\u652F\u6301\u7F16\u7801 "{0}"\u3002
-+ EncodingRequired = \u5982\u679C\u5DF2\u89E3\u6790\u7684\u5B9E\u4F53\u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u8FDB\u884C\u7F16\u7801, \u5219\u8BE5\u5B9E\u4F53\u5FC5\u987B\u5305\u542B\u7F16\u7801\u58F0\u660E\u3002
-
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = \u5143\u7D20\u6216\u5C5E\u6027\u4E0D\u5339\u914D QName \u751F\u4EA7: QName::=(NCName':')?NCName\u3002
-- ElementXMLNSPrefix = \u5143\u7D20 \"{0}\" \u4E0D\u80FD\u4F7F\u7528 \"xmlns\" \u4F5C\u4E3A\u524D\u7F00\u3002
-- ElementPrefixUnbound = \u5143\u7D20 \"{1}\" \u7684\u524D\u7F00 \"{0}\" \u672A\u7ED1\u5B9A\u3002
-- AttributePrefixUnbound = \u4E0E\u5143\u7D20\u7C7B\u578B \"{0}\" \u76F8\u5173\u8054\u7684\u5C5E\u6027 \"{1}\" \u7684\u524D\u7F00 \"{2}\" \u672A\u7ED1\u5B9A\u3002
-- EmptyPrefixedAttName = \u5C5E\u6027 \"{0}\" \u7684\u503C\u65E0\u6548\u3002\u5E26\u524D\u7F00\u7684\u540D\u79F0\u7A7A\u95F4\u7ED1\u5B9A\u4E0D\u80FD\u4E3A\u7A7A\u3002
-- PrefixDeclared = \u672A\u58F0\u660E\u540D\u79F0\u7A7A\u95F4\u524D\u7F00 \"{0}\"\u3002
-+ ElementXMLNSPrefix = \u5143\u7D20 "{0}" \u4E0D\u80FD\u4F7F\u7528 "xmlns" \u4F5C\u4E3A\u524D\u7F00\u3002
-+ ElementPrefixUnbound = \u5143\u7D20 "{1}" \u7684\u524D\u7F00 "{0}" \u672A\u7ED1\u5B9A\u3002
-+ AttributePrefixUnbound = \u4E0E\u5143\u7D20\u7C7B\u578B "{0}" \u76F8\u5173\u8054\u7684\u5C5E\u6027 "{1}" \u7684\u524D\u7F00 "{2}" \u672A\u7ED1\u5B9A\u3002
-+ EmptyPrefixedAttName = \u5C5E\u6027 "{0}" \u7684\u503C\u65E0\u6548\u3002\u5E26\u524D\u7F00\u7684\u540D\u79F0\u7A7A\u95F4\u7ED1\u5B9A\u4E0D\u80FD\u4E3A\u7A7A\u3002
-+ PrefixDeclared = \u672A\u58F0\u660E\u540D\u79F0\u7A7A\u95F4\u524D\u7F00 "{0}"\u3002
- CantBindXMLNS = \u524D\u7F00 "xmlns" \u4E0D\u80FD\u663E\u5F0F\u7ED1\u5B9A\u5230\u4EFB\u4F55\u540D\u79F0\u7A7A\u95F4; "xmlns" \u7684\u540D\u79F0\u7A7A\u95F4\u4E5F\u4E0D\u80FD\u663E\u5F0F\u7ED1\u5B9A\u5230\u4EFB\u4F55\u524D\u7F00\u3002
- CantBindXML = \u524D\u7F00 "xml" \u4E0D\u80FD\u7ED1\u5B9A\u5230\u9664\u5B83\u7684\u5E38\u7528\u540D\u79F0\u7A7A\u95F4\u5916\u7684\u4EFB\u4F55\u540D\u79F0\u7A7A\u95F4; "xml" \u7684\u540D\u79F0\u7A7A\u95F4\u4E5F\u4E0D\u80FD\u7ED1\u5B9A\u5230\u9664 "xml" \u5916\u7684\u4EFB\u4F55\u524D\u7F00\u3002
-- MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027 \"{0}\" \u7684 defaultValue \"{1}\" \u975E\u6CD5, \u56E0\u4E3A\u6B64\u5C5E\u6027\u7C7B\u578B\u5177\u6709\u8BCD\u6C47\u7EA6\u675F\u6761\u4EF6\u3002
-+ MSG_ATT_DEFAULT_INVALID = \u5C5E\u6027 "{0}" \u7684 defaultValue "{1}" \u975E\u6CD5, \u56E0\u4E3A\u6B64\u5C5E\u6027\u7C7B\u578B\u5177\u6709\u8BCD\u6C47\u7EA6\u675F\u6761\u4EF6\u3002
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=\u8BED\u6CD5\u5206\u6790\u5668\u5728\u6B64\u6587\u6863\u4E2D\u9047\u5230\u591A\u4E2A \"{0}\" \u5B9E\u4F53\u6269\u5C55; \u8FD9\u662F\u5E94\u7528\u7A0B\u5E8F\u65BD\u52A0\u7684\u9650\u5236\u3002
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: \u89E3\u6790\u5668\u5728\u6B64\u6587\u6863\u4E2D\u9047\u5230\u591A\u4E2A "{0}" \u5B9E\u4F53\u6269\u5C55; \u8FD9\u662F JDK \u65BD\u52A0\u7684\u9650\u5236\u3002
-+ ElementAttributeLimit=JAXP00010002: \u5143\u7D20 "{0}" \u5177\u6709\u591A\u4E2A "{1}" \u5C5E\u6027, "{1}" \u662F JDK \u65BD\u52A0\u7684\u9650\u5236\u3002
-+ MaxEntitySizeLimit=JAXP00010003: \u5B9E\u4F53 "{0}" \u7684\u957F\u5EA6\u4E3A "{1}", \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684 "{2}" \u9650\u5236\u3002
-+ TotalEntitySizeLimit=JAXP00010004: \u5B9E\u4F53\u7684\u7D2F\u8BA1\u5927\u5C0F "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002
-+ MaxXMLNameLimit=JAXP00010005: \u540D\u79F0 "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002
-+ MaxElementDepthLimit=JAXP00010006: \u5143\u7D20 "{0}" \u7684\u6DF1\u5EA6 "{1}" \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684\u9650\u5236 "{2}"\u3002
-
--# 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 2014-07-15 21:54:36.000000000 -0700
-@@ -1,31 +1,3 @@
--/*
-- * 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.
-- */
--
--/*
-- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
-- */
--
- # This file contains error and warning messages related to XML
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
-@@ -48,14 +20,14 @@
- InvalidCharInProlog = \u5728\u6587\u4EF6\u5BA3\u544A\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
- InvalidCharInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
- # 2.4 Character Data and Markup
-- CDEndInContent = \u5B57\u5143\u9806\u5E8F \"]]>\" \u4E0D\u53EF\u51FA\u73FE\u5728\u5167\u5BB9\u4E2D\uFF0C\u9664\u975E\u7528\u65BC\u6A19\u793A CDATA \u6BB5\u843D\u7684\u7D50\u5C3E\u3002
-+ CDEndInContent = \u5B57\u5143\u9806\u5E8F "]]>" \u4E0D\u53EF\u51FA\u73FE\u5728\u5167\u5BB9\u4E2D\uFF0C\u9664\u975E\u7528\u65BC\u6A19\u793A CDATA \u6BB5\u843D\u7684\u7D50\u5C3E\u3002
- # 2.7 CDATA Sections
-- CDSectUnterminated = CDATA \u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F \"]]>\"\u3002
-+ CDSectUnterminated = CDATA \u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F "]]>"\u3002
- # 2.8 Prolog and Document Type Declaration
- XMLDeclMustBeFirst = XML \u5BA3\u544A\u50C5\u80FD\u51FA\u73FE\u5728\u6587\u4EF6\u7684\u958B\u982D\u3002
-- EqRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 \"{0}\" \u4E4B\u5F8C\u3002
-- QuoteRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\"{0}\" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
-- XMLDeclUnterminated = XML \u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F \"?>\"\u3002
-+ EqRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 "{0}" \u4E4B\u5F8C\u3002
-+ QuoteRequiredInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C"{0}" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
-+ XMLDeclUnterminated = XML \u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F "?>"\u3002
- VersionInfoRequired = XML \u5BA3\u544A\u4E2D\u9700\u8981\u7248\u672C\u3002
- SpaceRequiredBeforeVersionInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\u7248\u672C\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
- SpaceRequiredBeforeEncodingInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\u7DE8\u78BC\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
-@@ -71,90 +43,91 @@
- ReferenceIllegalInTrailingMisc=\u5C3E\u7AEF\u6BB5\u843D\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u3002
-
- # 2.9 Standalone Document Declaration
-- SDDeclInvalid = \u7368\u7ACB\u6587\u4EF6\u5BA3\u544A\u503C\u5FC5\u9808\u662F \"yes\" \u6216 \"no\"\uFF0C\u800C\u975E \"{0}\"\u3002
-+ SDDeclInvalid = \u7368\u7ACB\u6587\u4EF6\u5BA3\u544A\u503C\u5FC5\u9808\u662F "yes" \u6216 "no"\uFF0C\u800C\u975E "{0}"\u3002
-+ SDDeclNameInvalid = XML \u5BA3\u544A\u4E2D\u7684\u7368\u7ACB\u540D\u7A31\u53EF\u80FD\u62FC\u932F\u4E86\u3002
- # 2.12 Language Identification
-- XMLLangInvalid = xml:lang \u5C6C\u6027\u503C \"{0}\" \u70BA\u7121\u6548\u7684\u8A9E\u8A00 ID\u3002
-+ XMLLangInvalid = xml:lang \u5C6C\u6027\u503C "{0}" \u70BA\u7121\u6548\u7684\u8A9E\u8A00 ID\u3002
- # 3. Logical Structures
-- ETagRequired = \u5143\u7D20\u985E\u578B \"{0}\" \u5FC5\u9808\u7531\u914D\u5C0D\u7684\u7D50\u675F\u6A19\u8A18 \"</{0}>\" \u7D42\u6B62\u3002
-+ ETagRequired = \u5143\u7D20\u985E\u578B "{0}" \u5FC5\u9808\u7531\u914D\u5C0D\u7684\u7D50\u675F\u6A19\u8A18 "</{0}>" \u7D42\u6B62\u3002
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ElementUnterminated = \u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5\u5C6C\u6027\u8A2D\u5B9A \">\" \u6216 \"/>\"\u3002
-- EqRequiredInAttribute = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5C6C\u6027\u540D\u7A31 \"{1}\" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5 '' = '' \u5B57\u5143\u3002
-- OpenQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5C6C\u6027 \"{1}\" \u9810\u671F\u6709\u958B\u982D\u5F15\u865F\u3002
-- CloseQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5C6C\u6027 \"{1}\" \u9810\u671F\u6709\u7D50\u675F\u5F15\u865F\u3002
-- AttributeNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 \"{0}\" \u6307\u5B9A\u5C6C\u6027 \"{1}\"\u3002
-- AttributeNSNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 \"{0}\" \u6307\u5B9A\u9023\u7D50\u547D\u540D\u7A7A\u9593 \"{2}\" \u7684\u5C6C\u6027 \"{1}\"\u3002
-- ETagUnterminated = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u7D50\u675F\u6A19\u8A18\u7D50\u5C3E\u5FC5\u9808\u662F ''>'' \u5206\u754C\u5B57\u5143\u3002
-+ ElementUnterminated = \u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5\u5C6C\u6027\u8A2D\u5B9A ">" \u6216 "/>"\u3002
-+ EqRequiredInAttribute = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027\u540D\u7A31 "{1}" \u4E4B\u5F8C\u5FC5\u9808\u7DCA\u63A5 '' = '' \u5B57\u5143\u3002
-+ OpenQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027 "{1}" \u9810\u671F\u6709\u958B\u982D\u5F15\u865F\u3002
-+ CloseQuoteExpected = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027 "{1}" \u9810\u671F\u6709\u7D50\u675F\u5F15\u865F\u3002
-+ AttributeNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 "{0}" \u6307\u5B9A\u5C6C\u6027 "{1}"\u3002
-+ AttributeNSNotUnique = \u5DF2\u7D93\u70BA\u5143\u7D20 "{0}" \u6307\u5B9A\u9023\u7D50\u547D\u540D\u7A7A\u9593 "{2}" \u7684\u5C6C\u6027 "{1}"\u3002
-+ ETagUnterminated = \u5143\u7D20\u985E\u578B "{0}" \u7684\u7D50\u675F\u6A19\u8A18\u7D50\u5C3E\u5FC5\u9808\u662F ''>'' \u5206\u754C\u5B57\u5143\u3002
- MarkupNotRecognizedInContent = \u5143\u7D20\u7684\u5167\u5BB9\u5FC5\u9808\u7531\u683C\u5F0F\u6B63\u78BA\u7684\u4F4D\u63CF\u8FF0\u8CC7\u6599\u6216\u6A19\u8A18\u6240\u7D44\u6210\u3002
- DoctypeIllegalInContent = \u5167\u5BB9\u4E0D\u5141\u8A31 DOCTYPE\u3002
- # 4.1 Character and Entity References
- ReferenceUnterminated = \u53C3\u7167\u5FC5\u9808\u7531 ';' \u5206\u754C\u5B57\u5143\u7D42\u6B62\u3002
- # 4.3.2 Well-Formed Parsed Entities
-- ReferenceNotInOneEntity = \u53C3\u7167\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u500B\u9AD4\u5167\u3002
-- ElementEntityMismatch = \u5143\u7D20 \"{0}\" \u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u500B\u9AD4\u5167\u3002
-- MarkupEntityMismatch=XML \u6587\u4EF6\u7D50\u69CB\u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u500B\u9AD4\u5167\u3002
-+ ReferenceNotInOneEntity = \u53C3\u7167\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u5BE6\u9AD4\u5167\u3002
-+ ElementEntityMismatch = \u5143\u7D20 "{0}" \u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
-+ MarkupEntityMismatch=XML \u6587\u4EF6\u7D50\u69CB\u7684\u958B\u982D\u8207\u7D50\u5C3E\u5FC5\u9808\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
-
- # Messages common to Document and DTD
- # 2.2 Characters
-- InvalidCharInAttValue = \u5728\u5C6C\u6027 \"{1}\" \u7684\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{2}) \u4E14\u5143\u7D20\u70BA \"{0}\"\u3002
-+ InvalidCharInAttValue = \u5728\u5C6C\u6027 "{1}" \u7684\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{2}) \u4E14\u5143\u7D20\u70BA "{0}"\u3002
- InvalidCharInComment = \u5728\u8A3B\u89E3\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
- InvalidCharInPI = \u5728\u8655\u7406\u6307\u793A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
- InvalidCharInInternalSubset = \u5728 DTD \u5167\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
- InvalidCharInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
- # 2.3 Common Syntactic Constructs
-- QuoteRequiredInAttValue = \u5C6C\u6027 \"{1}\" \u7684\u503C\u958B\u982D\u5FC5\u9808\u70BA\u55AE\u5F15\u865F\u6216\u96D9\u5F15\u865F\u5B57\u5143\u3002
-- LessthanInAttValue = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5C6C\u6027 \"{1}\" \u7684\u503C\u4E0D\u53EF\u5305\u542B ''<'' \u5B57\u5143\u3002
-- AttributeValueUnterminated = \u5C6C\u6027 \"{1}\" \u7684\u503C\u7D50\u5C3E\u5FC5\u9808\u662F\u914D\u5C0D\u7684\u5F15\u865F\u5B57\u5143\u3002
-+ QuoteRequiredInAttValue = \u5C6C\u6027 "{1}" \u7684\u503C\u958B\u982D\u5FC5\u9808\u70BA\u55AE\u5F15\u865F\u6216\u96D9\u5F15\u865F\u5B57\u5143\u3002
-+ LessthanInAttValue = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5C6C\u6027 "{1}" \u7684\u503C\u4E0D\u53EF\u5305\u542B ''<'' \u5B57\u5143\u3002
-+ AttributeValueUnterminated = \u5C6C\u6027 "{1}" \u7684\u503C\u7D50\u5C3E\u5FC5\u9808\u662F\u914D\u5C0D\u7684\u5F15\u865F\u5B57\u5143\u3002
- # 2.5 Comments
-- InvalidCommentStart = \u8A3B\u89E3\u958B\u982D\u5FC5\u9808\u70BA \"<!--\"\u3002
-- DashDashInComment = \u8A3B\u89E3\u4E0D\u5141\u8A31\u5B57\u4E32 \"--\"\u3002
-- CommentUnterminated = \u8A3B\u89E3\u7D50\u5C3E\u5FC5\u9808\u70BA \"-->\"\u3002
-- COMMENT_NOT_IN_ONE_ENTITY = \u8A3B\u89E3\u672A\u5305\u542B\u5728\u76F8\u540C\u500B\u9AD4\u5167\u3002
-+ InvalidCommentStart = \u8A3B\u89E3\u958B\u982D\u5FC5\u9808\u70BA "<!--"\u3002
-+ DashDashInComment = \u8A3B\u89E3\u4E0D\u5141\u8A31\u5B57\u4E32 "--"\u3002
-+ CommentUnterminated = \u8A3B\u89E3\u7D50\u5C3E\u5FC5\u9808\u70BA "-->"\u3002
-+ COMMENT_NOT_IN_ONE_ENTITY = \u8A3B\u89E3\u672A\u5305\u542B\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
- # 2.6 Processing Instructions
- PITargetRequired = \u8655\u7406\u6307\u793A\u7684\u958B\u982D\u5FC5\u9808\u662F\u76EE\u6A19\u7684\u540D\u7A31\u3002
- SpaceRequiredInPI = \u8655\u7406\u6307\u793A\u76EE\u6A19\u8207\u8CC7\u6599\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-- PIUnterminated = \u8655\u7406\u6307\u793A\u7D50\u5C3E\u5FC5\u9808\u662F \"?>\"\u3002
-- ReservedPITarget = \u4E0D\u5141\u8A31\u7B26\u5408 \"[xX][mM][lL]\" \u7684\u8655\u7406\u6307\u793A\u76EE\u6A19\u3002
-- PI_NOT_IN_ONE_ENTITY = \u8655\u7406\u6307\u793A\u672A\u5305\u542B\u5728\u76F8\u540C\u500B\u9AD4\u5167\u3002
-+ PIUnterminated = \u8655\u7406\u6307\u793A\u7D50\u5C3E\u5FC5\u9808\u662F "?>"\u3002
-+ ReservedPITarget = \u4E0D\u5141\u8A31\u7B26\u5408 "[xX][mM][lL]" \u7684\u8655\u7406\u6307\u793A\u76EE\u6A19\u3002
-+ PI_NOT_IN_ONE_ENTITY = \u8655\u7406\u6307\u793A\u672A\u5305\u542B\u5728\u76F8\u540C\u5BE6\u9AD4\u5167\u3002
- # 2.8 Prolog and Document Type Declaration
-- VersionInfoInvalid = \u7121\u6548\u7684\u7248\u672C \"{0}\"\u3002
-- VersionNotSupported = \u4E0D\u652F\u63F4 XML \u7248\u672C \"{0}\"\uFF0C\u50C5\u652F\u63F4 XML 1.0\u3002
-- VersionNotSupported11 = \u4E0D\u652F\u63F4 XML \u7248\u672C \"{0}\"\uFF0C\u50C5\u652F\u63F4 XML 1.0 \u8207 XML 1.1\u3002
-- VersionMismatch= \u500B\u9AD4\u4E0D\u53EF\u5305\u542B\u8F03\u65B0\u7248\u672C\u7684\u5176\u4ED6\u500B\u9AD4\u3002
-+ VersionInfoInvalid = \u7121\u6548\u7684\u7248\u672C "{0}"\u3002
-+ VersionNotSupported = \u4E0D\u652F\u63F4 XML \u7248\u672C "{0}"\uFF0C\u50C5\u652F\u63F4 XML 1.0\u3002
-+ VersionNotSupported11 = \u4E0D\u652F\u63F4 XML \u7248\u672C "{0}"\uFF0C\u50C5\u652F\u63F4 XML 1.0 \u8207 XML 1.1\u3002
-+ VersionMismatch= \u5BE6\u9AD4\u4E0D\u53EF\u5305\u542B\u8F03\u65B0\u7248\u672C\u7684\u5176\u4ED6\u5BE6\u9AD4\u3002
- # 4.1 Character and Entity References
-- DigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 \"&#\" \u4E4B\u5F8C\u3002
-- HexdigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u516D\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 \"&#x\" \u4E4B\u5F8C\u3002
-+ DigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 "&#" \u4E4B\u5F8C\u3002
-+ HexdigitRequiredInCharRef = \u5728\u5B57\u5143\u53C3\u7167\u4E2D\uFF0C\u5341\u516D\u9032\u4F4D\u8868\u793A\u6CD5\u5FC5\u9808\u7DCA\u63A5\u5728 "&#x" \u4E4B\u5F8C\u3002
- SemicolonRequiredInCharRef = \u5B57\u5143\u53C3\u7167\u7684\u7D50\u5C3E\u5FC5\u9808\u662F ';' \u5206\u754C\u5B57\u5143\u3002
-- InvalidCharRef = \u5B57\u5143\u53C3\u7167 \"&#{0}\" \u70BA\u7121\u6548\u7684 XML \u5B57\u5143\u3002
-- NameRequiredInReference = \u5728\u500B\u9AD4\u53C3\u7167\u4E2D\uFF0C\u500B\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '&' \u4E4B\u5F8C\u3002
-- SemicolonRequiredInReference = \u500B\u9AD4 \"{0}\" \u7684\u53C3\u7167\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
-+ InvalidCharRef = \u5B57\u5143\u53C3\u7167 "&#{0}" \u70BA\u7121\u6548\u7684 XML \u5B57\u5143\u3002
-+ NameRequiredInReference = \u5728\u5BE6\u9AD4\u53C3\u7167\u4E2D\uFF0C\u5BE6\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '&' \u4E4B\u5F8C\u3002
-+ SemicolonRequiredInReference = \u5BE6\u9AD4 "{0}" \u7684\u53C3\u7167\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
- # 4.3.1 The Text Declaration
-- TextDeclMustBeFirst = \u6587\u5B57\u5BA3\u544A\u50C5\u80FD\u51FA\u73FE\u5728\u5916\u90E8\u5256\u6790\u500B\u9AD4\u7684\u958B\u982D\u3002
-- EqRequiredInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 \"{0}\" \u4E4B\u5F8C\u3002
-- QuoteRequiredInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D \"{0}\" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
-- CloseQuoteMissingInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u907A\u6F0F \"{0}\" \u4E4B\u5F8C\u7684\u503C\u7684\u7D50\u675F\u5F15\u865F\u3002
-+ TextDeclMustBeFirst = \u6587\u5B57\u5BA3\u544A\u50C5\u80FD\u51FA\u73FE\u5728\u5916\u90E8\u5256\u6790\u5BE6\u9AD4\u7684\u958B\u982D\u3002
-+ EqRequiredInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C'' = '' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 "{0}" \u4E4B\u5F8C\u3002
-+ QuoteRequiredInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D "{0}" \u4E4B\u5F8C\u7684\u503C\u5FC5\u9808\u662F\u4EE5\u5F15\u865F\u62EC\u4F4F\u7684\u5B57\u4E32\u3002
-+ CloseQuoteMissingInTextDecl = \u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u907A\u6F0F "{0}" \u4E4B\u5F8C\u7684\u503C\u7684\u7D50\u675F\u5F15\u865F\u3002
- SpaceRequiredBeforeVersionInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u7248\u672C\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
- SpaceRequiredBeforeEncodingInTextDecl = \u5728\u6587\u5B57\u5BA3\u544A\u4E2D\uFF0C\u7DE8\u78BC\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002
-- TextDeclUnterminated = \u6587\u5B57\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F \"?>\"\u3002
-+ TextDeclUnterminated = \u6587\u5B57\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u662F "?>"\u3002
- EncodingDeclRequired = \u6587\u5B57\u5BA3\u544A\u4E2D\u9700\u8981\u7DE8\u78BC\u5BA3\u544A\u3002
- NoMorePseudoAttributes = \u4E0D\u5141\u8A31\u66F4\u591A\u7684\u865B\u64EC\u5C6C\u6027\u3002
- MorePseudoAttributes = \u9810\u671F\u66F4\u591A\u7684\u865B\u64EC\u5C6C\u6027\u3002
- PseudoAttrNameExpected = \u9810\u671F\u4E00\u500B\u865B\u64EC\u5C6C\u6027\u540D\u7A31\u3002
- # 4.3.2 Well-Formed Parsed Entities
-- CommentNotInOneEntity = \u8A3B\u89E3\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u500B\u9AD4\u5167\u3002
-- PINotInOneEntity = \u8655\u7406\u6307\u793A\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u500B\u9AD4\u5167\u3002
-+ CommentNotInOneEntity = \u8A3B\u89E3\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u5BE6\u9AD4\u5167\u3002
-+ PINotInOneEntity = \u8655\u7406\u6307\u793A\u5FC5\u9808\u6574\u500B\u5305\u542B\u5728\u76F8\u540C\u7684\u5256\u6790\u5BE6\u9AD4\u5167\u3002
- # 4.3.3 Character Encoding in Entities
-- EncodingDeclInvalid = \u7121\u6548\u7684\u7DE8\u78BC\u540D\u7A31 \"{0}\"\u3002
-- EncodingByteOrderUnsupported = \u4E0D\u652F\u63F4\u7DE8\u78BC \"{0}\" \u7684\u6307\u5B9A\u4F4D\u5143\u7D44\u9806\u5E8F\u3002
-+ EncodingDeclInvalid = \u7121\u6548\u7684\u7DE8\u78BC\u540D\u7A31 "{0}"\u3002
-+ EncodingByteOrderUnsupported = \u4E0D\u652F\u63F4\u7DE8\u78BC "{0}" \u7684\u6307\u5B9A\u4F4D\u5143\u7D44\u9806\u5E8F\u3002
- InvalidByte = {1}-byte UTF-8 \u5E8F\u5217\u7684\u7121\u6548\u4F4D\u5143\u7D44 {0}\u3002
- ExpectedByte = {1}-byte UTF-8 \u5E8F\u5217\u9810\u671F\u7684\u4F4D\u5143\u7D44 {0}\u3002
- InvalidHighSurrogate = UTF-8 \u5E8F\u5217\u4E2D\u9AD8\u66FF\u4EE3\u4F4D\u5143\u4E0D\u53EF\u8D85\u904E 0x10\uFF0C\u4F46\u627E\u5230 0x{0}\u3002
-- OperationNotSupported = {1} \u8B80\u53D6\u5668\u4E0D\u652F\u63F4\u4F5C\u696D \"{0}\"\u3002
-- InvalidASCII = \u7D44\u5143\u7D44 \"{0}\" \u4E0D\u662F (7 \u4F4D\u5143) ASCII \u5B57\u5143\u96C6\u7684\u6210\u54E1\u3002
-- CharConversionFailure = \u6C7A\u5B9A\u4F7F\u7528\u7279\u5B9A\u7DE8\u78BC\u7684\u500B\u9AD4\uFF0C\u5728\u8A72\u7DE8\u78BC\u4E2D\u4E0D\u53EF\u5305\u542B\u7121\u6548\u7684\u5E8F\u5217\u3002
-+ OperationNotSupported = {1} \u8B80\u53D6\u5668\u4E0D\u652F\u63F4\u4F5C\u696D "{0}"\u3002
-+ InvalidASCII = \u7D44\u5143\u7D44 "{0}" \u4E0D\u662F (7 \u4F4D\u5143) ASCII \u5B57\u5143\u96C6\u7684\u6210\u54E1\u3002
-+ CharConversionFailure = \u6C7A\u5B9A\u4F7F\u7528\u7279\u5B9A\u7DE8\u78BC\u7684\u5BE6\u9AD4\uFF0C\u5728\u8A72\u7DE8\u78BC\u4E2D\u4E0D\u53EF\u5305\u542B\u7121\u6548\u7684\u5E8F\u5217\u3002
-
- # DTD Messages
- # 2.2 Characters
-- InvalidCharInEntityValue = \u5728\u6587\u5B57\u500B\u9AD4\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-+ InvalidCharInEntityValue = \u5728\u6587\u5B57\u5BE6\u9AD4\u503C\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
- InvalidCharInExternalSubset = \u5728 DTD \u5916\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
- InvalidCharInIgnoreSect = \u5728\u6392\u9664\u7684\u689D\u4EF6\u6027\u6BB5\u843D\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
- InvalidCharInPublicID = \u5728\u516C\u7528 ID \u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
-@@ -169,150 +142,150 @@
- PubidCharIllegal = \u516C\u7528 ID \u4E2D\u4E0D\u5141\u8A31\u5B57\u5143 (Unicode: 0x{0})\u3002
- SpaceRequiredBetweenPublicAndSystem = publicId \u8207 systemId \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
- # 2.8 Prolog and Document Type Declaration
-- MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D \"<!DOCTYPE\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-- MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D\uFF0C\u6839\u5143\u7D20\u985E\u578B\u5FC5\u9808\u51FA\u73FE\u5728 \"<!DOCTYPE\" \u4E4B\u5F8C\u3002
-- DoctypedeclUnterminated = \u6839\u5143\u7D20\u985E\u578B \"{0}\" \u7684\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
-- PEReferenceWithinMarkup = DTD \u5167\u90E8\u5B57\u96C6\u7684\u6A19\u8A18\u5167\u4E0D\u80FD\u51FA\u73FE\u53C3\u6578\u500B\u9AD4\u53C3\u7167 \"%{0};\"\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D "<!DOCTYPE" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_ROOT_ELEMENT_TYPE_REQUIRED = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D\uFF0C\u6839\u5143\u7D20\u985E\u578B\u5FC5\u9808\u51FA\u73FE\u5728 "<!DOCTYPE" \u4E4B\u5F8C\u3002
-+ DoctypedeclUnterminated = \u6839\u5143\u7D20\u985E\u578B "{0}" \u7684\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
-+ PEReferenceWithinMarkup = DTD \u5167\u90E8\u5B57\u96C6\u7684\u6A19\u8A18\u5167\u4E0D\u80FD\u51FA\u73FE\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};"\u3002
- MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u4EF6\u985E\u578B\u5BA3\u544A\u5305\u542B\u6216\u6307\u5411\u7684\u6A19\u8A18\u5BA3\u544A\u5FC5\u9808\u683C\u5F0F\u6B63\u78BA\u3002
- # 2.10 White Space Handling
-- MSG_XML_SPACE_DECLARATION_ILLEGAL = \"xml:space\" \u7684\u5C6C\u6027\u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u70BA\u5217\u8209\u985E\u578B\uFF0C\u5176\u53EF\u80FD\u7684\u503C\u70BA \"default\" \u8207 \"preserve\"\u3002
-+ MSG_XML_SPACE_DECLARATION_ILLEGAL = "xml:space" \u7684\u5C6C\u6027\u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u70BA\u5217\u8209\u985E\u578B\uFF0C\u5176\u53EF\u80FD\u7684\u503C\u70BA "default" \u8207 "preserve"\u3002
- # 3.2 Element Type Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D \"<!ELEMENT\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D "<!ELEMENT" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
- MSG_ELEMENT_TYPE_REQUIRED_IN_ELEMENTDECL = \u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u9700\u8981\u5143\u7D20\u985E\u578B\u3002
-- MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-- MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5F8C\u9700\u8981\u9650\u5236\u689D\u4EF6\u3002
-- ElementDeclUnterminated = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_CONTENTSPEC_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_CONTENTSPEC_REQUIRED_IN_ELEMENTDECL = \u5728\u5143\u7D20\u985E\u578B\u5BA3\u544A\u4E2D\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5F8C\u9700\u8981\u9650\u5236\u689D\u4EF6\u3002
-+ ElementDeclUnterminated = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
- # 3.2.1 Element Content
-- MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B ''('' \u5B57\u5143\u6216\u5143\u7D20\u985E\u578B\u3002
-- MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
-+ MSG_OPEN_PAREN_OR_ELEMENT_TYPE_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B ''('' \u5B57\u5143\u6216\u5143\u7D20\u985E\u578B\u3002
-+ MSG_CLOSE_PAREN_REQUIRED_IN_CHILDREN = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
- # 3.2.2 Mixed Content
-- MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B\u5143\u7D20\u985E\u578B\u3002
-- MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
-- MixedContentUnterminated = \u5B50\u9805\u5143\u7D20\u7684\u985E\u578B\u53D7\u5230\u9650\u5236\u6642\uFF0C\u6DF7\u5408\u5167\u5BB9\u6A21\u578B \"{0}\" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA \")*\"\u3002
-+ MSG_ELEMENT_TYPE_REQUIRED_IN_MIXED_CONTENT = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B\u5143\u7D20\u985E\u578B\u3002
-+ MSG_CLOSE_PAREN_REQUIRED_IN_MIXED = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u4E00\u500B '')''\u3002
-+ MixedContentUnterminated = \u5B50\u9805\u5143\u7D20\u7684\u985E\u578B\u53D7\u5230\u9650\u5236\u6642\uFF0C\u6DF7\u5408\u5167\u5BB9\u6A21\u578B "{0}" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA ")*"\u3002
- # 3.3 Attribute-List Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728 attribute-list \u5BA3\u544A\u4E2D \"<!ATTLIST\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ATTLISTDECL = \u5728 attribute-list \u5BA3\u544A\u4E2D "<!ATTLIST" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
- MSG_ELEMENT_TYPE_REQUIRED_IN_ATTLISTDECL = attribute-list \u5BA3\u544A\u4E2D\u9700\u8981\u5143\u7D20\u985E\u578B\u3002
-- MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5143\u7D20 \"{0}\" \u7684 attribute-list \u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u540D\u7A31\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-- AttNameRequiredInAttDef = \u5143\u7D20 \"{0}\" \u7684 attribute-list \u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u5C6C\u6027\u540D\u7A31\u3002
-- MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5143\u7D20 \"{0}\" \u5C6C\u6027 \"{1}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u985E\u578B\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-- AttTypeRequiredInAttDef = \u5143\u7D20 \"{0}\" \u5C6C\u6027 \"{1}\" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u5C6C\u6027\u985E\u578B\u3002
-- MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5143\u7D20 \"{0}\" \u5C6C\u6027 \"{1}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u9810\u8A2D\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-- MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u70BA\u6307\u5B9A\u5143\u7D20 \"{0}\" \u7684\u76F8\u540C\u5C6C\u6027 \"{1}\" \u63D0\u4F9B\u4E86\u8D85\u904E\u4E00\u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\u5B9A\u7FA9\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ATTRIBUTE_NAME_IN_ATTDEF = \u5143\u7D20 "{0}" \u7684 attribute-list \u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u540D\u7A31\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-+ AttNameRequiredInAttDef = \u5143\u7D20 "{0}" \u7684 attribute-list \u5BA3\u544A\u5FC5\u9808\u6307\u5B9A\u5C6C\u6027\u540D\u7A31\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u5143\u7D20 "{0}" \u5C6C\u6027 "{1}" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u985E\u578B\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-+ AttTypeRequiredInAttDef = \u5143\u7D20 "{0}" \u5C6C\u6027 "{1}" \u7684\u5BA3\u544A\u4E2D\u9700\u8981\u5C6C\u6027\u985E\u578B\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u5143\u7D20 "{0}" \u5C6C\u6027 "{1}" \u7684\u5BA3\u544A\u4E2D\uFF0C\u5C6C\u6027\u9810\u8A2D\u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_DUPLICATE_ATTRIBUTE_DEFINITION = \u70BA\u6307\u5B9A\u5143\u7D20 "{0}" \u7684\u76F8\u540C\u5C6C\u6027 "{1}" \u63D0\u4F9B\u4E86\u8D85\u904E\u4E00\u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\u5B9A\u7FA9\u3002
- # 3.3.1 Attribute Types
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D \"NOTATION\" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
-- MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C''('' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 \"NOTATION\" \u4E4B\u5F8C\u3002
-- MSG_NAME_REQUIRED_IN_NOTATIONTYPE = \"{1}\" \u5C6C\u6027\u5BA3\u544A\u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
-- NotationTypeUnterminated = \u5728 \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
-- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = \"{1}\" \u5C6C\u6027\u5BA3\u544A\u7684\u5217\u8209\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u540D\u7A31\u8A18\u865F\u3002
-- EnumerationUnterminated = \u5728 \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u5217\u8209\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
-- MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5143\u7D20 \"{0}\" \u7684\u5C6C\u6027 \"{2}\" \u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C \"{1}\"\u3002\u55AE\u4E00 Enumeration \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NMTOKENS \u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
-- MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5143\u7D20 \"{0}\" \u5C6C\u6027 \"{2}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C \"{1}\"\u3002\u55AE\u4E00 NotationType \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NOTATION \u540D\u7A31\u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D "NOTATION" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
-+ MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = \u5728 "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C''('' \u5B57\u5143\u5FC5\u9808\u7DCA\u63A5\u5728 "NOTATION" \u4E4B\u5F8C\u3002
-+ MSG_NAME_REQUIRED_IN_NOTATIONTYPE = "{1}" \u5C6C\u6027\u5BA3\u544A\u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
-+ NotationTypeUnterminated = \u5728 "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
-+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = "{1}" \u5C6C\u6027\u5BA3\u544A\u7684\u5217\u8209\u985E\u578B\u6E05\u55AE\u4E2D\uFF0C\u9700\u8981\u540D\u7A31\u8A18\u865F\u3002
-+ EnumerationUnterminated = \u5728 "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u5217\u8209\u985E\u578B\u6E05\u55AE\u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '')''\u3002
-+ MSG_DISTINCT_TOKENS_IN_ENUMERATION = \u5143\u7D20 "{0}" \u7684\u5C6C\u6027 "{2}" \u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C "{1}"\u3002\u55AE\u4E00 Enumeration \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NMTOKENS \u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
-+ MSG_DISTINCT_NOTATION_IN_ENUMERATION = \u5143\u7D20 "{0}" \u5C6C\u6027 "{2}" \u7684\u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u7684\u5217\u8209\u503C "{1}"\u3002\u55AE\u4E00 NotationType \u5C6C\u6027\u5BA3\u544A\u4E2D\u7684 NOTATION \u540D\u7A31\u5FC5\u9808\u5168\u90E8\u90FD\u4E0D\u76F8\u540C\u3002
- # 3.3.2 Attribute Defaults
-- MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = \"{1}\" \u5C6C\u6027\u5BA3\u544A\u4E2D \"FIXED\" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL = "{1}" \u5C6C\u6027\u5BA3\u544A\u4E2D "FIXED" \u4E4B\u5F8C\u5FC5\u9808\u6709\u7A7A\u683C\u3002
- # 3.4 Conditional Sections
-- IncludeSectUnterminated = \u5305\u542B\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F \"]]>\"\u3002
-- IgnoreSectUnterminated = \u6392\u9664\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F \"]]>\"\u3002
-+ IncludeSectUnterminated = \u5305\u542B\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F "]]>"\u3002
-+ IgnoreSectUnterminated = \u6392\u9664\u689D\u4EF6\u6027\u6BB5\u843D\u7D50\u5C3E\u5FC5\u9808\u662F "]]>"\u3002
- # 4.1 Character and Entity References
-- NameRequiredInPEReference = \u5728\u53C3\u6578\u500B\u9AD4\u53C3\u7167\u4E2D\uFF0C\u500B\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '%' \u4E4B\u5F8C\u3002
-- SemicolonRequiredInPEReference = \u53C3\u6578\u500B\u9AD4\u53C3\u7167 \"%{0};\" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
-+ NameRequiredInPEReference = \u5728\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167\u4E2D\uFF0C\u5BE6\u9AD4\u540D\u7A31\u5FC5\u9808\u7DCA\u63A5\u5728 '%' \u4E4B\u5F8C\u3002
-+ SemicolonRequiredInPEReference = \u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};" \u7684\u7D50\u5C3E\u5FC5\u9808\u70BA '';'' \u5206\u754C\u5B57\u5143\u3002
- # 4.2 Entity Declarations
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u500B\u9AD4\u5BA3\u544A\u4E2D \"<!ENTITY\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-- MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C3\u6578\u500B\u9AD4\u5BA3\u544A\u4E2D\uFF0C\"<!ENTITY\" \u8207 '%' \u5B57\u5143\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-- MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u5728\u53C3\u6578\u500B\u9AD4\u5BA3\u544A\u4E2D\uFF0C'%' \u8207\u500B\u9AD4\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-- MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u500B\u9AD4\u5BA3\u544A\u4E2D\u9700\u8981\u500B\u9AD4\u7684\u540D\u7A31\u3002
-- MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u500B\u9AD4\u5BA3\u544A\u4E2D\uFF0C\u500B\u9AD4\u540D\u7A31 \"{0}\" \u8207\u5B9A\u7FA9\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u500B\u9AD4 \"{0}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\"NDATA\" \u8207\u8868\u793A\u6CD5\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-- MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u500B\u9AD4 \"{0}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\"NDATA\" \u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-- MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u500B\u9AD4 \"{0}\" \u7684\u5BA3\u544A\u4E2D\uFF0C\"NDATA\" \u4E4B\u5F8C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
-- EntityDeclUnterminated = \u500B\u9AD4 \"{0}\" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
-- MSG_DUPLICATE_ENTITY_DEFINITION = \u500B\u9AD4 \"{0}\" \u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5BE6\u9AD4\u5BA3\u544A\u4E2D "<!ENTITY" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_PERCENT_IN_PEDECL = \u5728\u53C3\u6578\u5BE6\u9AD4\u5BA3\u544A\u4E2D\uFF0C"<!ENTITY" \u8207 '%' \u5B57\u5143\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_ENTITY_NAME_IN_PEDECL = \u5728\u53C3\u6578\u5BE6\u9AD4\u5BA3\u544A\u4E2D\uFF0C'%' \u8207\u5BE6\u9AD4\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_ENTITY_NAME_REQUIRED_IN_ENTITYDECL = \u5BE6\u9AD4\u5BA3\u544A\u4E2D\u9700\u8981\u5BE6\u9AD4\u7684\u540D\u7A31\u3002
-+ MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL = \u5728\u5BE6\u9AD4\u5BA3\u544A\u4E2D\uFF0C\u5BE6\u9AD4\u540D\u7A31 "{0}" \u8207\u5B9A\u7FA9\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_UNPARSED_ENTITYDECL = \u5728\u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u4E2D\uFF0C"NDATA" \u8207\u8868\u793A\u6CD5\u540D\u7A31\u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_NDATA_IN_UNPARSED_ENTITYDECL = \u5728\u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u4E2D\uFF0C"NDATA" \u4E4B\u524D\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_NOTATION_NAME_REQUIRED_FOR_UNPARSED_ENTITYDECL = \u5728\u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u4E2D\uFF0C"NDATA" \u4E4B\u5F8C\u9700\u8981\u8868\u793A\u6CD5\u540D\u7A31\u3002
-+ EntityDeclUnterminated = \u5BE6\u9AD4 "{0}" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
-+ MSG_DUPLICATE_ENTITY_DEFINITION = \u5BE6\u9AD4 "{0}" \u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
- # 4.2.2 External Entities
-- ExternalIDRequired = \u5916\u90E8\u500B\u9AD4\u5BA3\u544A\u7684\u958B\u982D\u5FC5\u9808\u70BA \"SYSTEM\" \u6216 \"PUBLIC\"\u3002
-- MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = \"PUBLIC\" \u8207\u516C\u7528 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-+ ExternalIDRequired = \u5916\u90E8\u5BE6\u9AD4\u5BA3\u544A\u7684\u958B\u982D\u5FC5\u9808\u70BA "SYSTEM" \u6216 "PUBLIC"\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_PUBIDLITERAL_IN_EXTERNALID = "PUBLIC" \u8207\u516C\u7528 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
- MSG_SPACE_REQUIRED_AFTER_PUBIDLITERAL_IN_EXTERNALID = \u516C\u7528 ID \u8207\u7CFB\u7D71 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-- MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = \"SYSTEM\" \u8207\u7CFB\u7D71 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-- MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5 ID \u4E0D\u61C9\u6307\u5B9A\u70BA\u7CFB\u7D71 ID \"{0}\" \u7684\u4E00\u90E8\u5206\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_SYSTEMLITERAL_IN_EXTERNALID = "SYSTEM" \u8207\u7CFB\u7D71 ID \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_URI_FRAGMENT_IN_SYSTEMID = \u7247\u6BB5 ID \u4E0D\u61C9\u6307\u5B9A\u70BA\u7CFB\u7D71 ID "{0}" \u7684\u4E00\u90E8\u5206\u3002
- # 4.7 Notation Declarations
-- MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D \"<!NOTATION\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-+ MSG_SPACE_REQUIRED_BEFORE_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D "<!NOTATION" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
- MSG_NOTATION_NAME_REQUIRED_IN_NOTATIONDECL = \u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u9700\u8981\u8868\u793A\u6CD5\u7684\u540D\u7A31\u3002
-- MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u8868\u793A\u6CD5\u540D\u7A31 \"{0}\" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-- ExternalIDorPublicIDRequired = \u8868\u793A\u6CD5 \"{0}\" \u7684\u5BA3\u544A\u5FC5\u9808\u5305\u542B\u7CFB\u7D71\u6216\u516C\u7528 ID\u3002
-- NotationDeclUnterminated = \u8868\u793A\u6CD5 \"{0}\" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
-+ MSG_SPACE_REQUIRED_AFTER_NOTATION_NAME_IN_NOTATIONDECL = \u5728\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u8868\u793A\u6CD5\u540D\u7A31 "{0}" \u4E4B\u5F8C\u9700\u8981\u7A7A\u683C\u3002
-+ ExternalIDorPublicIDRequired = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u5FC5\u9808\u5305\u542B\u7CFB\u7D71\u6216\u516C\u7528 ID\u3002
-+ NotationDeclUnterminated = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA ''>''\u3002
-
- # Validation messages
-- DuplicateTypeInMixedContent = \u5143\u7D20\u5BA3\u544A \"{0}\" \u7684\u5167\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7D93\u6307\u5B9A\u5143\u7D20\u985E\u578B \"{1}\"\u3002
-- ENTITIESInvalid = \u985E\u578B ENTITIES \u7684\u5C6C\u6027\u503C \"{1}\" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u672A\u5256\u6790\u500B\u9AD4\u7684\u540D\u7A31\u3002
-- ENTITYInvalid = \u985E\u578B ENTITY \u7684\u5C6C\u6027\u503C \"{1}\" \u5FC5\u9808\u662F\u4E00\u500B\u672A\u5256\u6790\u500B\u9AD4\u7684\u540D\u7A31\u3002
-- IDDefaultTypeInvalid = ID \u5C6C\u6027 \"{0}\" \u5FC5\u9808\u5177\u6709 \"#IMPLIED\" \u6216 \"#REQUIRED\" \u7684\u5BA3\u544A\u9810\u8A2D\u3002
-- IDInvalid = \u985E\u578B ID \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u540D\u7A31\u3002
-- IDInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B ID \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F NCName\u3002
-- IDNotUnique = \u985E\u578B ID \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u6587\u4EF6\u5167\u7684\u552F\u4E00\u503C\u3002
-- IDREFInvalid = \u985E\u578B IDREF \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u540D\u7A31\u3002
-- IDREFInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B IDREF \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F NCName\u3002
-- IDREFSInvalid = \u985E\u578B IDREFS \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u3002
-- ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u7576\u500B\u9AD4\u53C3\u7167\u7576\u4F5C\u5B8C\u6574\u5BA3\u544A\u6642\uFF0C\u53C3\u6578\u500B\u9AD4 \"{0}\" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
-- ImproperDeclarationNesting = \u53C3\u6578\u500B\u9AD4 \"{0}\" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
-- ImproperGroupNesting = \u53C3\u6578\u500B\u9AD4 \"{0}\" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u6210\u5C0D\u62EC\u865F\u3002
-- INVALID_PE_IN_CONDITIONAL = \u53C3\u6578\u500B\u9AD4 \"{0}\" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6574\u500B\u689D\u4EF6\u6027\u6BB5\u843D\u6216\u50C5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
-- MSG_ATTRIBUTE_NOT_DECLARED = \u5143\u7D20\u985E\u578B \"{0}\" \u5FC5\u9808\u5BA3\u544A\u5C6C\u6027 \"{1}\"\u3002
-- MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5177\u6709\u503C \"{1}\" \u7684\u5C6C\u6027 \"{0}\" \u5FC5\u9808\u5177\u6709\u4F86\u81EA\u6E05\u55AE \"{2}\" \u7684\u503C\u3002
-- MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5C6C\u6027 \"{0}\" \u7684\u503C \"{1}\" \u4E0D\u53EF\u900F\u904E\u6B63\u898F\u5316\u9032\u884C\u8B8A\u66F4 (\u6210\u70BA \"{2}\")\u3002
-- MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5167\u5BB9\u4E0D\u5B8C\u6574\uFF0C\u5B83\u5FC5\u9808\u914D\u5C0D \"{1}\"\u3002
-- MSG_CONTENT_INVALID = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D \"{1}\"\u3002
-- MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D \"{1}\"\u3002\u4E0D\u5141\u8A31\u985E\u578B \"{2}\" \u7684\u5B50\u9805\u3002
-- MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B \"{0}\" \u7684\u5C6C\u6027 \"{1}\" \u5177\u6709\u9810\u8A2D\u503C\uFF0C\u4E14\u5FC5\u9808\u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\u6307\u5B9A\u3002
-- MSG_DUPLICATE_ATTDEF = \u5143\u7D20\u985E\u578B \"{0}\" \u5DF2\u7D93\u5BA3\u544A\u5C6C\u6027 \"{1}\"\u3002
-- MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u985E\u578B \"{0}\" \u4E0D\u53EF\u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
-- MSG_ELEMENT_NOT_DECLARED = \u5FC5\u9808\u5BA3\u544A\u5143\u7D20\u985E\u578B \"{0}\"\u3002
-+ DuplicateTypeInMixedContent = \u5143\u7D20\u5BA3\u544A "{0}" \u7684\u5167\u5BB9\u6A21\u578B\u4E2D\u5DF2\u7D93\u6307\u5B9A\u5143\u7D20\u985E\u578B "{1}"\u3002
-+ ENTITIESInvalid = \u985E\u578B ENTITIES \u7684\u5C6C\u6027\u503C "{1}" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u672A\u5256\u6790\u5BE6\u9AD4\u7684\u540D\u7A31\u3002
-+ ENTITYInvalid = \u985E\u578B ENTITY \u7684\u5C6C\u6027\u503C "{1}" \u5FC5\u9808\u662F\u4E00\u500B\u672A\u5256\u6790\u5BE6\u9AD4\u7684\u540D\u7A31\u3002
-+ IDDefaultTypeInvalid = ID \u5C6C\u6027 "{0}" \u5FC5\u9808\u5177\u6709 "#IMPLIED" \u6216 "#REQUIRED" \u7684\u5BA3\u544A\u9810\u8A2D\u3002
-+ IDInvalid = \u985E\u578B ID \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u540D\u7A31\u3002
-+ IDInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B ID \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F NCName\u3002
-+ IDNotUnique = \u985E\u578B ID \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u6587\u4EF6\u5167\u7684\u552F\u4E00\u503C\u3002
-+ IDREFInvalid = \u985E\u578B IDREF \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u540D\u7A31\u3002
-+ IDREFInvalidWithNamespaces = \u555F\u7528\u547D\u540D\u7A7A\u9593\u6642\uFF0C\u985E\u578B IDREF \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F NCName\u3002
-+ IDREFSInvalid = \u985E\u578B IDREFS \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u3002
-+ ILL_FORMED_PARAMETER_ENTITY_WHEN_USED_IN_DECL = \u7576\u5BE6\u9AD4\u53C3\u7167\u7576\u4F5C\u5B8C\u6574\u5BA3\u544A\u6642\uFF0C\u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
-+ ImproperDeclarationNesting = \u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u5BA3\u544A\u3002
-+ ImproperGroupNesting = \u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6B63\u78BA\u5DE2\u72C0\u7D50\u69CB\u7684\u6210\u5C0D\u62EC\u865F\u3002
-+ INVALID_PE_IN_CONDITIONAL = \u53C3\u6578\u5BE6\u9AD4 "{0}" \u7684\u53D6\u4EE3\u6587\u5B57\u5FC5\u9808\u5305\u542B\u6574\u500B\u689D\u4EF6\u6027\u6BB5\u843D\u6216\u50C5\u5305\u542B INCLUDE \u6216 IGNORE\u3002
-+ MSG_ATTRIBUTE_NOT_DECLARED = \u5143\u7D20\u985E\u578B "{0}" \u5FC5\u9808\u5BA3\u544A\u5C6C\u6027 "{1}"\u3002
-+ MSG_ATTRIBUTE_VALUE_NOT_IN_LIST = \u5177\u6709\u503C "{1}" \u7684\u5C6C\u6027 "{0}" \u5FC5\u9808\u5177\u6709\u4F86\u81EA\u6E05\u55AE "{2}" \u7684\u503C\u3002
-+ MSG_ATTVALUE_CHANGED_DURING_NORMALIZATION_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5C6C\u6027 "{0}" \u7684\u503C "{1}" \u4E0D\u53EF\u900F\u904E\u6B63\u898F\u5316\u9032\u884C\u8B8A\u66F4 (\u6210\u70BA "{2}")\u3002
-+ MSG_CONTENT_INCOMPLETE = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5167\u5BB9\u4E0D\u5B8C\u6574\uFF0C\u5B83\u5FC5\u9808\u914D\u5C0D "{1}"\u3002
-+ MSG_CONTENT_INVALID = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D "{1}"\u3002
-+ MSG_CONTENT_INVALID_SPECIFIED = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5167\u5BB9\u5FC5\u9808\u914D\u5C0D "{1}"\u3002\u4E0D\u5141\u8A31\u985E\u578B "{2}" \u7684\u5B50\u9805\u3002
-+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B "{0}" \u7684\u5C6C\u6027 "{1}" \u5177\u6709\u9810\u8A2D\u503C\uFF0C\u4E14\u5FC5\u9808\u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\u6307\u5B9A\u3002
-+ MSG_DUPLICATE_ATTDEF = \u5143\u7D20\u985E\u578B "{0}" \u5DF2\u7D93\u5BA3\u544A\u5C6C\u6027 "{1}"\u3002
-+ MSG_ELEMENT_ALREADY_DECLARED = \u5143\u7D20\u985E\u578B "{0}" \u4E0D\u53EF\u5BA3\u544A\u8D85\u904E\u4E00\u6B21\u4EE5\u4E0A\u3002
-+ MSG_ELEMENT_NOT_DECLARED = \u5FC5\u9808\u5BA3\u544A\u5143\u7D20\u985E\u578B "{0}"\u3002
- MSG_GRAMMAR_NOT_FOUND = \u6587\u4EF6\u7121\u6548: \u627E\u4E0D\u5230\u6587\u6CD5\u3002
-- MSG_ELEMENT_WITH_ID_REQUIRED = ID \u70BA \"{0}\" \u7684\u5143\u7D20\u5FC5\u9808\u51FA\u73FE\u5728\u6587\u4EF6\u4E2D\u3002
-- MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u7368\u7ACB\u6587\u4EF6\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u500B\u9AD4 \"{0}\"\u3002
-- MSG_FIXED_ATTVALUE_INVALID = \u5177\u6709\u503C \"{2}\" \u7684\u5C6C\u6027 \"{1}\" \u5FC5\u9808\u5177\u6709 \"{3}\" \u7684\u503C\u3002
-- MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u985E\u578B \"{0}\" \u5DF2\u7D93\u5177\u6709\u985E\u578B ID \u7684\u5C6C\u6027 \"{1}\"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B ID \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 \"{2}\"\u3002
-- MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u985E\u578B \"{0}\" \u5DF2\u7D93\u5177\u6709\u985E\u578B NOTATION \u7684\u5C6C\u6027 \"{1}\"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B NOTATION \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 \"{2}\"\u3002
-- MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u82E5\u8981\u5728\u5C6C\u6027 \"{0}\" \u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 \"{1}\"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
-- MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u82E5\u8981\u5728 \"{0}\" \u7684\u672A\u5256\u6790\u500B\u9AD4\u5BA3\u544A\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 \"{1}\"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
-- MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5256\u6790\u500B\u9AD4\u4E2D\u5BA3\u544A\u7684\u500B\u9AD4 \"{0}\"\u3002
-- MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B \"{0}\" \u9700\u8981\u5C6C\u6027 \"{1}\" \u4E14\u5FC5\u9808\u4E88\u4EE5\u6307\u5B9A\u3002
-- MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5177\u6709\u5143\u7D20\u5167\u5BB9\u7684\u5916\u90E8\u5256\u6790\u500B\u9AD4\u4E2D\u5BA3\u544A\u7684\u5143\u7D20\u4E4B\u9593\uFF0C\u4E0D\u53EF\u6709\u7A7A\u683C\u3002
-- NMTOKENInvalid = \u985E\u578B NMTOKEN \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u540D\u7A31\u8A18\u865F\u3002
-- NMTOKENSInvalid = \u985E\u578B NMTOKENS \u7684\u5C6C\u6027\u503C \"{0}\" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u8A18\u865F\u3002
-- NoNotationOnEmptyElement = \u5BA3\u544A EMPTY \u7684\u5143\u7D20\u985E\u578B \"{0}\" \u4E0D\u53EF\u5BA3\u544A\u985E\u578B NOTATION \u7684\u5C6C\u6027 \"{1}\"\u3002
-- RootElementTypeMustMatchDoctypedecl = \u6587\u4EF6\u6839\u5143\u7D20 \"{1}\" \u5FC5\u9808\u914D\u5C0D DOCTYPE \u6839 \"{0}\"\u3002
-- UndeclaredElementInContentSpec = \u5143\u7D20 \"{0}\" \u7684\u5167\u5BB9\u6A21\u578B\u53C3\u7167\u672A\u5BA3\u544A\u7684\u5143\u7D20 \"{1}\"\u3002
-- UniqueNotationName = \u8868\u793A\u6CD5 \"{0}\" \u7684\u5BA3\u544A\u4E26\u975E\u552F\u4E00\u3002\u6307\u5B9A\u7684 Name \u4E0D\u80FD\u5728\u4E00\u500B\u4EE5\u4E0A\u7684\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u5BA3\u544A\u3002
-+ MSG_ELEMENT_WITH_ID_REQUIRED = ID \u70BA "{0}" \u7684\u5143\u7D20\u5FC5\u9808\u51FA\u73FE\u5728\u6587\u4EF6\u4E2D\u3002
-+ MSG_EXTERNAL_ENTITY_NOT_PERMITTED = \u7368\u7ACB\u6587\u4EF6\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5BE6\u9AD4 "{0}"\u3002
-+ MSG_FIXED_ATTVALUE_INVALID = \u5177\u6709\u503C "{2}" \u7684\u5C6C\u6027 "{1}" \u5FC5\u9808\u5177\u6709 "{3}" \u7684\u503C\u3002
-+ MSG_MORE_THAN_ONE_ID_ATTRIBUTE = \u5143\u7D20\u985E\u578B "{0}" \u5DF2\u7D93\u5177\u6709\u985E\u578B ID \u7684\u5C6C\u6027 "{1}"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B ID \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 "{2}"\u3002
-+ MSG_MORE_THAN_ONE_NOTATION_ATTRIBUTE = \u5143\u7D20\u985E\u578B "{0}" \u5DF2\u7D93\u5177\u6709\u985E\u578B NOTATION \u7684\u5C6C\u6027 "{1}"\uFF0C\u4E0D\u5141\u8A31\u8A72\u985E\u578B NOTATION \u7684\u7B2C\u4E8C\u500B\u5C6C\u6027 "{2}"\u3002
-+ MSG_NOTATION_NOT_DECLARED_FOR_NOTATIONTYPE_ATTRIBUTE = \u82E5\u8981\u5728\u5C6C\u6027 "{0}" \u7684\u8868\u793A\u6CD5\u985E\u578B\u6E05\u55AE\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 "{1}"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
-+ MSG_NOTATION_NOT_DECLARED_FOR_UNPARSED_ENTITYDECL = \u82E5\u8981\u5728 "{0}" \u7684\u672A\u5256\u6790\u5BE6\u9AD4\u5BA3\u544A\u4E2D\u53C3\u7167\u8868\u793A\u6CD5 "{1}"\uFF0C\u5FC5\u9808\u4E88\u4EE5\u5BA3\u544A\u3002
-+ MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5256\u6790\u5BE6\u9AD4\u4E2D\u5BA3\u544A\u7684\u5BE6\u9AD4 "{0}"\u3002
-+ MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = \u5143\u7D20\u985E\u578B "{0}" \u9700\u8981\u5C6C\u6027 "{1}" \u4E14\u5FC5\u9808\u4E88\u4EE5\u6307\u5B9A\u3002
-+ MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = \u5728\u7368\u7ACB\u6587\u4EF6\u4E2D\uFF0C\u5177\u6709\u5143\u7D20\u5167\u5BB9\u7684\u5916\u90E8\u5256\u6790\u5BE6\u9AD4\u4E2D\u5BA3\u544A\u7684\u5143\u7D20\u4E4B\u9593\uFF0C\u4E0D\u53EF\u6709\u7A7A\u683C\u3002
-+ NMTOKENInvalid = \u985E\u578B NMTOKEN \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u540D\u7A31\u8A18\u865F\u3002
-+ NMTOKENSInvalid = \u985E\u578B NMTOKENS \u7684\u5C6C\u6027\u503C "{0}" \u5FC5\u9808\u662F\u4E00\u6216\u591A\u500B\u540D\u7A31\u8A18\u865F\u3002
-+ NoNotationOnEmptyElement = \u5BA3\u544A EMPTY \u7684\u5143\u7D20\u985E\u578B "{0}" \u4E0D\u53EF\u5BA3\u544A\u985E\u578B NOTATION \u7684\u5C6C\u6027 "{1}"\u3002
-+ RootElementTypeMustMatchDoctypedecl = \u6587\u4EF6\u6839\u5143\u7D20 "{1}" \u5FC5\u9808\u914D\u5C0D DOCTYPE \u6839 "{0}"\u3002
-+ UndeclaredElementInContentSpec = \u5143\u7D20 "{0}" \u7684\u5167\u5BB9\u6A21\u578B\u53C3\u7167\u672A\u5BA3\u544A\u7684\u5143\u7D20 "{1}"\u3002
-+ UniqueNotationName = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u4E26\u975E\u552F\u4E00\u3002\u6307\u5B9A\u7684 Name \u4E0D\u80FD\u5728\u4E00\u500B\u4EE5\u4E0A\u7684\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u5BA3\u544A\u3002
- ENTITYFailedInitializeGrammar = ENTITYDatatype \u9A57\u8B49\u7A0B\u5F0F: \u5931\u6557\u3002\u9700\u8981\u4F7F\u7528\u6709\u6548\u7684\u6587\u6CD5\u53C3\u7167\u4F86\u547C\u53EB\u8D77\u59CB\u65B9\u6CD5\u3002 \t
-- ENTITYNotUnparsed = ENTITY \"{0}\" \u4E26\u975E\u672A\u7D93\u5256\u6790\u3002
-- ENTITYNotValid = ENTITY \"{0}\" \u7121\u6548\u3002
-+ ENTITYNotUnparsed = ENTITY "{0}" \u4E26\u975E\u672A\u7D93\u5256\u6790\u3002
-+ ENTITYNotValid = ENTITY "{0}" \u7121\u6548\u3002
- EmptyList = \u985E\u578B ENTITIES\u3001IDREFS \u8207 NMTOKENS \u7684\u503C\u4E0D\u53EF\u70BA\u7A7A\u767D\u6E05\u55AE\u3002
-
- # Entity related messages
- # 3.1 Start-Tags, End-Tags, and Empty-Element Tags
-- ReferenceToExternalEntity = \u5C6C\u6027\u503C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u500B\u9AD4 \"&{0};\"\u3002
-- AccessExternalDTD = External DTD: Failed to read external DTD ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-- AccessExternalEntity = External Entity: Failed to read external document ''{0}'', because ''{1}'' access is not allowed due to restriction set by the accessExternalDTD property.
-+ ReferenceToExternalEntity = \u5C6C\u6027\u503C\u4E0D\u5141\u8A31\u53C3\u7167\u5916\u90E8\u5BE6\u9AD4 "&{0};"\u3002
-+ AccessExternalDTD = \u5916\u90E8 DTD: \u7121\u6CD5\u8B80\u53D6\u5916\u90E8 DTD ''{0}''\uFF0C\u56E0\u70BA accessExternalDTD \u5C6C\u6027\u8A2D\u5B9A\u7684\u9650\u5236\uFF0C\u6240\u4EE5\u4E0D\u5141\u8A31 ''{1}'' \u5B58\u53D6\u3002
-+ AccessExternalEntity = \u5916\u90E8\u5BE6\u9AD4: \u7121\u6CD5\u8B80\u53D6\u5916\u90E8\u6587\u4EF6 ''{0}''\uFF0C\u56E0\u70BA accessExternalDTD \u5C6C\u6027\u8A2D\u5B9A\u7684\u9650\u5236\uFF0C\u6240\u4EE5\u4E0D\u5141\u8A31 ''{1}'' \u5B58\u53D6\u3002
-
- # 4.1 Character and Entity References
-- EntityNotDeclared = \u53C3\u7167\u4E86\u500B\u9AD4 \"{0}\"\uFF0C\u4F46\u662F\u672A\u5BA3\u544A\u3002
-- ReferenceToUnparsedEntity = \u4E0D\u5141\u8A31\u672A\u5256\u6790\u7684\u500B\u9AD4\u53C3\u7167 \"&{0};\"\u3002
-- RecursiveReference = \u905E\u8FF4\u500B\u9AD4\u53C3\u7167 \"{0}\"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
-- RecursiveGeneralReference = \u905E\u8FF4\u4E00\u822C\u500B\u9AD4\u53C3\u7167 \"&{0};\"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
-- RecursivePEReference = \u905E\u8FF4\u53C3\u6578\u500B\u9AD4\u53C3\u7167 \"%{0};\"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
-+ EntityNotDeclared = \u53C3\u7167\u4E86\u5BE6\u9AD4 "{0}"\uFF0C\u4F46\u662F\u672A\u5BA3\u544A\u3002
-+ ReferenceToUnparsedEntity = \u4E0D\u5141\u8A31\u672A\u5256\u6790\u7684\u5BE6\u9AD4\u53C3\u7167 "&{0};"\u3002
-+ RecursiveReference = \u905E\u8FF4\u5BE6\u9AD4\u53C3\u7167 "{0}"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
-+ RecursiveGeneralReference = \u905E\u8FF4\u4E00\u822C\u5BE6\u9AD4\u53C3\u7167 "&{0};"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
-+ RecursivePEReference = \u905E\u8FF4\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};"\u3002(\u53C3\u7167\u8DEF\u5F91: {1})\uFF0C
- # 4.3.3 Character Encoding in Entities
-- EncodingNotSupported = \u4E0D\u652F\u63F4\u7DE8\u78BC \"{0}\"\u3002
-- EncodingRequired = \u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u7DE8\u78BC\u7684\u5256\u6790\u500B\u9AD4\uFF0C\u5FC5\u9808\u5305\u542B\u7DE8\u78BC\u5BA3\u544A\u3002
-+ EncodingNotSupported = \u4E0D\u652F\u63F4\u7DE8\u78BC "{0}"\u3002
-+ EncodingRequired = \u672A\u4F7F\u7528 UTF-8 \u6216 UTF-16 \u7DE8\u78BC\u7684\u5256\u6790\u5BE6\u9AD4\uFF0C\u5FC5\u9808\u5305\u542B\u7DE8\u78BC\u5BA3\u544A\u3002
-
- # Namespaces support
- # 4. Using Qualified Names
- IllegalQName = \u5143\u7D20\u6216\u5C6C\u6027\u4E0D\u7B26\u5408 QName \u7522\u751F: QName::=(NCName':')?NCName\u3002
-- ElementXMLNSPrefix = \u5143\u7D20 \"{0}\" \u4E0D\u80FD\u4F7F\u7528 \"xmlns\" \u4F5C\u70BA\u524D\u7F6E\u78BC\u3002
-- ElementPrefixUnbound = \u5143\u7D20 \"{1}\" \u7684\u524D\u7F6E\u78BC \"{0}\" \u672A\u9023\u7D50\u3002
-- AttributePrefixUnbound = \u95DC\u806F\u5143\u7D20\u985E\u578B \"{0}\" \u4E4B\u5C6C\u6027 \"{1}\" \u7684\u524D\u7F6E\u78BC \"{2}\" \u672A\u9023\u7D50\u3002
-- EmptyPrefixedAttName = \u5C6C\u6027 \"{0}\" \u7684\u503C\u7121\u6548\u3002\u524D\u7F6E\u7684\u547D\u540D\u7A7A\u9593\u9023\u7D50\u4E0D\u53EF\u70BA\u7A7A\u767D\u3002
-- PrefixDeclared = \u672A\u5BA3\u544A\u547D\u540D\u7A7A\u9593\u524D\u7F6E\u78BC \"{0}\"\u3002
-+ ElementXMLNSPrefix = \u5143\u7D20 "{0}" \u4E0D\u80FD\u4F7F\u7528 "xmlns" \u4F5C\u70BA\u524D\u7F6E\u78BC\u3002
-+ ElementPrefixUnbound = \u5143\u7D20 "{1}" \u7684\u524D\u7F6E\u78BC "{0}" \u672A\u9023\u7D50\u3002
-+ AttributePrefixUnbound = \u95DC\u806F\u5143\u7D20\u985E\u578B "{0}" \u4E4B\u5C6C\u6027 "{1}" \u7684\u524D\u7F6E\u78BC "{2}" \u672A\u9023\u7D50\u3002
-+ EmptyPrefixedAttName = \u5C6C\u6027 "{0}" \u7684\u503C\u7121\u6548\u3002\u524D\u7F6E\u7684\u547D\u540D\u7A7A\u9593\u9023\u7D50\u4E0D\u53EF\u70BA\u7A7A\u767D\u3002
-+ PrefixDeclared = \u672A\u5BA3\u544A\u547D\u540D\u7A7A\u9593\u524D\u7F6E\u78BC "{0}"\u3002
- CantBindXMLNS = \u524D\u7F6E\u78BC "xmlns" \u7121\u6CD5\u660E\u78BA\u9023\u7D50\u4EFB\u4F55\u547D\u540D\u7A7A\u9593; "xmlns" \u7684\u547D\u540D\u7A7A\u9593\u4E5F\u7121\u6CD5\u660E\u78BA\u9023\u7D50\u4EFB\u4F55\u524D\u7F6E\u78BC\u3002
- CantBindXML = \u524D\u7F6E\u78BC "xml" \u7121\u6CD5\u9023\u7D50\u4E00\u822C\u547D\u540D\u7A7A\u9593\u4E4B\u5916\u7684\u4EFB\u4F55\u547D\u540D\u7A7A\u9593; "xml" \u7684\u547D\u540D\u7A7A\u9593\u4E5F\u7121\u6CD5\u9023\u7D50 "xml" \u4E4B\u5916\u7684\u4EFB\u4F55\u547D\u540D\u7A7A\u9593\u3002
-- MSG_ATT_DEFAULT_INVALID = \u7531\u65BC\u6B64\u5C6C\u6027\u985E\u578B\u7684\u8A9E\u5F59\u9650\u5236\u689D\u4EF6\uFF0C\u5C6C\u6027 \"{0}\" \u7684 defaultValue \"{1}\" \u7121\u6548\u3002
-+ MSG_ATT_DEFAULT_INVALID = \u7531\u65BC\u6B64\u5C6C\u6027\u985E\u578B\u7684\u8A9E\u5F59\u9650\u5236\u689D\u4EF6\uFF0C\u5C6C\u6027 "{0}" \u7684 defaultValue "{1}" \u7121\u6548\u3002
-
- # REVISIT: These need messages
- MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID
-@@ -320,8 +293,11 @@
- InvalidCharInLiteral=InvalidCharInLiteral
-
-
--#Application can set the limit of number of entities that should be expanded by the parser.
--EntityExpansionLimitExceeded=\u5256\u6790\u5668\u5728\u6B64\u6587\u4EF6\u4E2D\u906D\u9047 \"{0}\" \u500B\u4EE5\u4E0A\u7684\u500B\u9AD4\u64F4\u5145; \u6B64\u70BA\u61C9\u7528\u7A0B\u5F0F\u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
-+# Implementation limits
-+ EntityExpansionLimitExceeded=JAXP00010001: \u5256\u6790\u5668\u5728\u6B64\u6587\u4EF6\u4E2D\u9047\u5230 "{0}" \u500B\u4EE5\u4E0A\u7684\u5BE6\u9AD4\u64F4\u5145; \u9019\u662F JDK \u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
-+ ElementAttributeLimit=JAXP00010002: \u5143\u7D20 "{0}" \u5177\u6709\u8D85\u904E "{1}" \u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\uFF0C"{1}" \u662F JDK \u6240\u898F\u5B9A\u7684\u9650\u5236\u3002
-+ MaxEntitySizeLimit=JAXP00010003: \u5BE6\u9AD4 "{0}" \u7684\u9577\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u6240\u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002
-+ TotalEntitySizeLimit=JAXP00010004: \u5BE6\u9AD4\u7684\u7D2F\u7A4D\u5927\u5C0F "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
-+ MaxXMLNameLimit=JAXP00010005: \u540D\u7A31 "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002
-+ MaxElementDepthLimit=JAXP00010006: \u5143\u7D20 "{0}" \u7684\u6DF1\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002
-
--# 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/xpath/XPath.java 2013-09-06 11:22:59.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2014-07-15 21:46:30.000000000 -0700
-@@ -1422,7 +1422,7 @@
- }
- ch = data.charAt(currentOffset);
- } while (ch == ' ' || ch == 0x0A || ch == 0x09 || ch == 0x0D);
-- if (currentOffset == endOffset || ch == '|') {
-+ if (currentOffset == endOffset || ch == '|' || ch == '/') {
- addToken(tokens, XPath.Tokens.EXPRTOKEN_PERIOD);
- starIsMultiplyOperator = true;
- break;
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -21,13 +21,13 @@
-
- package com.sun.org.apache.xerces.internal.impl.xs.models;
-
-+import com.sun.org.apache.xerces.internal.impl.Constants;
- import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
--import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
--import com.sun.org.apache.xerces.internal.util.SecurityManager ;
- import com.sun.org.apache.xerces.internal.impl.dtd.models.CMNode;
--import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
- import com.sun.org.apache.xerces.internal.impl.xs.XSMessageFormatter;
--import com.sun.org.apache.xerces.internal.impl.Constants;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
-+import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
-+import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
-
- /**
- *
-@@ -68,7 +68,7 @@
-
- // stores defaults for different security holes (maxOccurLimit in current context) if it has
- // been set on the configuration.
-- private SecurityManager fSecurityManager = null;
-+ private XMLSecurityManager fSecurityManager = null;
-
- /** default constructor */
- public CMNodeFactory() {
-@@ -77,10 +77,10 @@
- public void reset(XMLComponentManager componentManager){
- fErrorReporter = (XMLErrorReporter)componentManager.getProperty(ERROR_REPORTER);
- try {
-- fSecurityManager = (SecurityManager)componentManager.getProperty(SECURITY_MANAGER);
-+ fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
- //we are setting the limit of number of nodes to 3times the maxOccur value..
- if(fSecurityManager != null){
-- maxNodeLimit = fSecurityManager.getMaxOccurNodeLimit() * MULTIPLICITY ;
-+ maxNodeLimit = fSecurityManager.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT) * MULTIPLICITY ;
- }
- }
- catch (XMLConfigurationException e) {
-@@ -109,7 +109,8 @@
- }
-
- public void nodeCountCheck(){
-- if( fSecurityManager != null && nodeCount++ > maxNodeLimit){
-+ if( fSecurityManager != null && !fSecurityManager.isNoLimit(maxNodeLimit) &&
-+ nodeCount++ > maxNodeLimit){
- if(DEBUG){
- System.out.println("nodeCount = " + nodeCount ) ;
- System.out.println("nodeLimit = " + maxNodeLimit ) ;
-@@ -150,8 +151,9 @@
-
- if (suffixLength == Constants.SECURITY_MANAGER_PROPERTY.length() &&
- propertyId.endsWith(Constants.SECURITY_MANAGER_PROPERTY)) {
-- fSecurityManager = (SecurityManager)value;
-- maxNodeLimit = (fSecurityManager != null) ? fSecurityManager.getMaxOccurNodeLimit() * MULTIPLICITY : 0 ;
-+ fSecurityManager = (XMLSecurityManager)value;
-+ maxNodeLimit = (fSecurityManager != null) ?
-+ fSecurityManager.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT) * MULTIPLICITY : 0 ;
- return;
- }
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -40,6 +40,7 @@
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
- import com.sun.org.apache.xerces.internal.util.XMLChar;
- import com.sun.org.apache.xerces.internal.util.XMLSymbols;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.xni.QName;
- import com.sun.org.apache.xerces.internal.xs.XSConstants;
- import java.util.HashMap;
-@@ -1194,8 +1195,8 @@
- if (!optimize) {
- //Revisit :: IMO this is not right place to check
- // maxOccurNodeLimit.
-- int maxOccurNodeLimit = fSchemaHandler.fSecureProcessing.getMaxOccurNodeLimit();
-- if (max > maxOccurNodeLimit) {
-+ int maxOccurNodeLimit = fSchemaHandler.fSecureProcessing.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT);
-+ if (max > maxOccurNodeLimit && !fSchemaHandler.fSecureProcessing.isNoLimit(maxOccurNodeLimit)) {
- reportSchemaFatalError("maxOccurLimit", new Object[] {new Integer(maxOccurNodeLimit)}, element);
-
- // 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 2014-07-15 21:46:30.000000000 -0700
-@@ -70,7 +70,6 @@
- import com.sun.org.apache.xerces.internal.util.DefaultErrorHandler;
- import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
- import com.sun.org.apache.xerces.internal.util.SAXInputSource;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
- import com.sun.org.apache.xerces.internal.util.StAXInputSource;
- import com.sun.org.apache.xerces.internal.util.StAXLocationWrapper;
- import com.sun.org.apache.xerces.internal.util.SymbolHash;
-@@ -78,6 +77,7 @@
- import com.sun.org.apache.xerces.internal.util.XMLSymbols;
- import com.sun.org.apache.xerces.internal.util.URI.MalformedURIException;
- import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.QName;
- import com.sun.org.apache.xerces.internal.xni.XNIException;
-@@ -257,7 +257,7 @@
- *
- * <p>Protected to allow access by any traverser.</p>
- */
-- protected SecurityManager fSecureProcessing = null;
-+ protected XMLSecurityManager fSecureProcessing = null;
-
- private String fAccessExternalSchema;
- private String fAccessExternalDTD;
-@@ -2251,12 +2251,12 @@
- }
- catch (SAXException se) {}
-
-- try {
-- parser.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, fAccessExternalDTD);
-- } catch (SAXNotRecognizedException exc) {
-- System.err.println("Warning: " + parser.getClass().getName() + ": " +
-- exc.getMessage());
-- }
-+ try {
-+ parser.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, fAccessExternalDTD);
-+ } catch (SAXNotRecognizedException exc) {
-+ System.err.println("Warning: " + parser.getClass().getName() + ": " +
-+ exc.getMessage());
-+ }
- }
- // If XML names and Namespace URIs are already internalized we
- // can avoid running them through the SymbolTable.
-@@ -3509,7 +3509,7 @@
-
- fSecureProcessing = null;
- if( componentManager!=null ) {
-- fSecureProcessing = (SecurityManager) componentManager.getProperty(SECURE_PROCESSING, null);
-+ fSecureProcessing = (XMLSecurityManager) componentManager.getProperty(SECURE_PROCESSING, null);
- }
-
- //set entity resolver
---- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java 2013-09-06 11:23:00.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java 2014-07-15 21:46:30.000000000 -0700
-@@ -20,6 +20,8 @@
-
- package com.sun.org.apache.xerces.internal.jaxp;
-
-+import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
-+import java.util.Locale;
- import org.xml.sax.SAXException;
- import org.xml.sax.SAXParseException;
- import org.xml.sax.helpers.DefaultHandler;
-@@ -30,6 +32,11 @@
- class DefaultValidationErrorHandler extends DefaultHandler {
- static private int ERROR_COUNT_LIMIT = 10;
- private int errorCount = 0;
-+ private Locale locale = Locale.getDefault();
-+
-+ public DefaultValidationErrorHandler(Locale locale) {
-+ this.locale = locale;
-+ }
-
- // XXX Fix message i18n
- public void error(SAXParseException e) throws SAXException {
-@@ -38,11 +45,8 @@
- return;
- } else if (errorCount == 0) {
- // Print a warning before the first error
-- System.err.println("Warning: validation was turned on but an org.xml.sax.ErrorHandler was not");
-- System.err.println("set, which is probably not what is desired. Parser will use a default");
-- System.err.println("ErrorHandler to print the first " +
-- ERROR_COUNT_LIMIT + " errors. Please call");
-- System.err.println("the 'setErrorHandler' method to fix this.");
-+ System.err.println(SAXMessageFormatter.formatMessage(locale,
-+ "errorHandlerNotSet", new Object [] {errorCount}));
- }
-
- String systemId = e.getSystemId();
---- ./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 2014-07-15 21:46:30.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;
- import com.sun.org.apache.xerces.internal.parsers.DOMParser;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager.Property;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager.State;
-@@ -46,7 +46,6 @@
- import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLDocumentSource;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
--import javax.xml.XMLConstants;
- import org.w3c.dom.DOMImplementation;
- import org.w3c.dom.Document;
- import org.xml.sax.EntityResolver;
-@@ -110,7 +109,6 @@
- /** Property identifier: access to external schema */
- public static final String ACCESS_EXTERNAL_SCHEMA = XMLConstants.ACCESS_EXTERNAL_SCHEMA;
-
--
- private final DOMParser domParser;
- private final Schema grammar;
-
-@@ -125,6 +123,7 @@
- /** Initial EntityResolver */
- private final EntityResolver fInitEntityResolver;
-
-+ private XMLSecurityManager fSecurityManager;
- private XMLSecurityPropertyManager fSecurityPropertyMgr;
-
- DocumentBuilderImpl(DocumentBuilderFactoryImpl dbf, Hashtable dbfAttrs, Hashtable features)
-@@ -141,7 +140,7 @@
- // validation errors with a warning telling the user to set an
- // ErrorHandler
- if (dbf.isValidating()) {
-- fInitErrorHandler = new DefaultValidationErrorHandler();
-+ fInitErrorHandler = new DefaultValidationErrorHandler(domParser.getXMLParserConfiguration().getLocale());
- setErrorHandler(fInitErrorHandler);
- }
- else {
-@@ -173,10 +172,10 @@
- fSecurityPropertyMgr = new XMLSecurityPropertyManager();
- domParser.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
-
-- // If the secure processing feature is on set a security manager.
-- if (secureProcessing) {
-- domParser.setProperty(SECURITY_MANAGER, new SecurityManager());
-+ fSecurityManager = new XMLSecurityManager(secureProcessing);
-+ domParser.setProperty(SECURITY_MANAGER, fSecurityManager);
-
-+ if (secureProcessing) {
- /**
- * If secure processing is explicitly set on the factory, the
- * access properties will be set unless the corresponding
-@@ -250,9 +249,9 @@
- String feature = (String) entry.getKey();
- boolean value = ((Boolean) entry.getValue()).booleanValue();
- domParser.setFeature(feature, value);
-- }
- }
- }
-+ }
-
- /**
- * Set any DocumentBuilderFactory attributes of our underlying DOMParser
-@@ -289,30 +288,33 @@
- // spec when schema validation is enabled
- domParser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
- }
-- }
-- } else if(JAXP_SCHEMA_SOURCE.equals(name)){
-- if( isValidating() ) {
-- String value=(String)dbfAttrs.get(JAXP_SCHEMA_LANGUAGE);
-- if(value !=null && W3C_XML_SCHEMA.equals(value)){
-- domParser.setProperty(name, val);
-- }else{
-+ }
-+ } else if(JAXP_SCHEMA_SOURCE.equals(name)){
-+ if( isValidating() ) {
-+ String value=(String)dbfAttrs.get(JAXP_SCHEMA_LANGUAGE);
-+ if(value !=null && W3C_XML_SCHEMA.equals(value)){
-+ domParser.setProperty(name, val);
-+ }else{
- throw new IllegalArgumentException(
- DOMMessageFormatter.formatMessage(DOMMessageFormatter.DOM_DOMAIN,
- "jaxp-order-not-supported",
- new Object[] {JAXP_SCHEMA_LANGUAGE, JAXP_SCHEMA_SOURCE}));
-+ }
-+ }
-+ } else {
-+ //check if the property is managed by security manager
-+ if (fSecurityManager == null ||
-+ !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, val)) {
-+ //check if the property is managed by security property manager
-+ if (fSecurityPropertyMgr == null ||
-+ !fSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, val)) {
-+ //fall back to the existing property manager
-+ domParser.setProperty(name, val);
- }
-- }
-- } else {
-- int index = fSecurityPropertyMgr.getIndex(name);
-- if (index > -1) {
-- fSecurityPropertyMgr.setValue(index,
-- XMLSecurityPropertyManager.State.APIPROPERTY, (String)val);
-- } else {
-- // Let Xerces code handle the property
-- domParser.setProperty(name, val);
- }
-- }
-- }
-+
-+ }
-+ }
- }
- }
-
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -20,22 +20,13 @@
-
- package com.sun.org.apache.xerces.internal.jaxp;
-
--import java.io.IOException;
--import java.util.HashMap;
--import java.util.Hashtable;
--import java.util.Iterator;
--import java.util.Map;
--
--import javax.xml.XMLConstants;
--import javax.xml.validation.Schema;
--
- import com.sun.org.apache.xerces.internal.impl.Constants;
- import com.sun.org.apache.xerces.internal.impl.validation.ValidationManager;
- import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator;
- import com.sun.org.apache.xerces.internal.jaxp.validation.XSGrammarPoolContainer;
- import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
- import com.sun.org.apache.xerces.internal.util.Status;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.XMLDocumentHandler;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLComponent;
-@@ -46,6 +37,14 @@
- import com.sun.org.apache.xerces.internal.xs.AttributePSVI;
- import com.sun.org.apache.xerces.internal.xs.ElementPSVI;
- import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
-+import java.io.IOException;
-+import java.util.HashMap;
-+import java.util.Hashtable;
-+import java.util.Iterator;
-+import java.util.Locale;
-+import java.util.Map;
-+import javax.xml.XMLConstants;
-+import javax.xml.validation.Schema;
- import org.xml.sax.EntityResolver;
- import org.xml.sax.ErrorHandler;
- import org.xml.sax.HandlerBase;
-@@ -112,6 +111,7 @@
- /** Initial EntityResolver */
- private final EntityResolver fInitEntityResolver;
-
-+ private final XMLSecurityManager fSecurityManager;
- private final XMLSecurityPropertyManager fSecurityPropertyMgr;
-
- /**
-@@ -130,10 +130,10 @@
- SAXParserImpl(SAXParserFactoryImpl spf, Hashtable features, boolean secureProcessing)
- throws SAXException
- {
-+ fSecurityManager = new XMLSecurityManager(secureProcessing);
- fSecurityPropertyMgr = new XMLSecurityPropertyManager();
--
- // Instantiate a SAXParser directly and not through SAX so that we use the right ClassLoader
-- xmlReader = new JAXPSAXParser(this, fSecurityPropertyMgr);
-+ xmlReader = new JAXPSAXParser(this, fSecurityPropertyMgr, fSecurityManager);
-
- // JAXP "namespaceAware" == SAX Namespaces feature
- // Note: there is a compatibility problem here with default values:
-@@ -154,9 +154,9 @@
-
- xmlReader.setProperty0(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
-
-- // If the secure processing feature is on set a security manager.
-+ xmlReader.setProperty0(SECURITY_MANAGER, fSecurityManager);
-+
- if (secureProcessing) {
-- xmlReader.setProperty0(SECURITY_MANAGER, new SecurityManager());
- /**
- * By default, secure processing is set, no external access is allowed.
- * However, we need to check if it is actively set on the factory since we
-@@ -164,6 +164,7 @@
- * the default value
- */
- if (features != null) {
-+
- Object temp = features.get(XMLConstants.FEATURE_SECURE_PROCESSING);
- if (temp != null) {
- boolean value = ((Boolean) temp).booleanValue();
-@@ -172,7 +173,6 @@
- XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
- fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
- XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
--
- }
- }
- }
-@@ -185,7 +185,7 @@
- // validation errors with a warning telling the user to set an
- // ErrorHandler.
- if (spf.isValidating()) {
-- fInitErrorHandler = new DefaultValidationErrorHandler();
-+ fInitErrorHandler = new DefaultValidationErrorHandler(xmlReader.getLocale());
- xmlReader.setErrorHandler(fInitErrorHandler);
- }
- else {
-@@ -398,22 +398,34 @@
- private final HashMap fInitFeatures = new HashMap();
- private final HashMap fInitProperties = new HashMap();
- private final SAXParserImpl fSAXParser;
-+ private XMLSecurityManager fSecurityManager;
- private XMLSecurityPropertyManager fSecurityPropertyMgr;
-
-
- public JAXPSAXParser() {
-- this(null, null);
-+ this(null, null, null);
- }
-
-- JAXPSAXParser(SAXParserImpl saxParser, XMLSecurityPropertyManager spm) {
-+ JAXPSAXParser(SAXParserImpl saxParser, XMLSecurityPropertyManager securityPropertyMgr,
-+ XMLSecurityManager securityManager) {
- super();
- fSAXParser = saxParser;
-- fSecurityPropertyMgr = spm;
--
-+ fSecurityManager = securityManager;
-+ fSecurityPropertyMgr = securityPropertyMgr;
- /**
- * This class may be used directly. So initialize the security manager if
- * it is null.
- */
-+ if (fSecurityManager == null) {
-+ fSecurityManager = new XMLSecurityManager(true);
-+ try {
-+ super.setProperty(SECURITY_MANAGER, fSecurityManager);
-+ } catch (SAXException e) {
-+ throw new UnsupportedOperationException(
-+ SAXMessageFormatter.formatMessage(fConfiguration.getLocale(),
-+ "property-not-recognized", new Object [] {SECURITY_MANAGER}), e);
-+ }
-+ }
- if (fSecurityPropertyMgr == null) {
- fSecurityPropertyMgr = new XMLSecurityPropertyManager();
- try {
-@@ -421,7 +433,7 @@
- } catch (SAXException e) {
- throw new UnsupportedOperationException(
- SAXMessageFormatter.formatMessage(fConfiguration.getLocale(),
-- "property-not-recognized", new Object [] {SECURITY_MANAGER}), e);
-+ "property-not-recognized", new Object [] {XML_SECURITY_PROPERTY_MANAGER}), e);
- }
- }
- }
-@@ -439,7 +451,8 @@
- }
- if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
- try {
-- setProperty(SECURITY_MANAGER, value ? new SecurityManager() : null);
-+ fSecurityManager.setSecureProcessing(value);
-+ setProperty(SECURITY_MANAGER, fSecurityManager);
- }
- catch (SAXNotRecognizedException exc) {
- // If the property is not supported
-@@ -475,13 +488,7 @@
- throw new NullPointerException();
- }
- if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
-- try {
-- return (super.getProperty(SECURITY_MANAGER) != null);
-- }
-- // If the property is not supported the value must be false.
-- catch (SAXException exc) {
-- return false;
-- }
-+ return fSecurityManager.isSecureProcessing();
- }
- return super.getFeature(name);
- }
-@@ -560,17 +567,21 @@
- if (fSAXParser != null && fSAXParser.fSchemaValidator != null) {
- setSchemaValidatorProperty(name, value);
- }
-- /** Check to see if the property is managed by the property manager **/
-- int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1;
-- if (index > -1) {
-- fSecurityPropertyMgr.setValue(index,
-- XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
-- } else {
-- if (!fInitProperties.containsKey(name)) {
-- fInitProperties.put(name, super.getProperty(name));
-+
-+ //check if the property is managed by security manager
-+ if (fSecurityManager == null ||
-+ !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
-+ //check if the property is managed by security property manager
-+ if (fSecurityPropertyMgr == null ||
-+ !fSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
-+ //fall back to the existing property manager
-+ if (!fInitProperties.containsKey(name)) {
-+ fInitProperties.put(name, super.getProperty(name));
-+ }
-+ super.setProperty(name, value);
- }
-- super.setProperty(name, value);
- }
-+
- }
-
- public synchronized Object getProperty(String name)
-@@ -583,9 +594,18 @@
- // JAXP 1.2 support
- return fSAXParser.schemaLanguage;
- }
-- int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1;
-- if (index > -1) {
-- return fSecurityPropertyMgr.getValueByIndex(index);
-+
-+ /** Check to see if the property is managed by the security manager **/
-+ String propertyValue = (fSecurityManager != null) ?
-+ fSecurityManager.getLimitAsString(name) : null;
-+ if (propertyValue != null) {
-+ return propertyValue;
-+ } else {
-+ propertyValue = (fSecurityPropertyMgr != null) ?
-+ fSecurityPropertyMgr.getValue(name) : null;
-+ if (propertyValue != null) {
-+ return propertyValue;
-+ }
- }
-
- return super.getProperty(name);
-@@ -664,6 +684,10 @@
- return super.getProperty(name);
- }
-
-+ Locale getLocale() {
-+ return fConfiguration.getLocale();
-+ }
-+
- private void setSchemaValidatorFeature(String name, boolean value)
- throws SAXNotRecognizedException, SAXNotSupportedException {
- try {
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -26,6 +26,7 @@
- package com.sun.org.apache.xerces.internal.jaxp.validation;
-
- import com.sun.org.apache.xerces.internal.impl.Constants;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import java.io.IOException;
-
- import javax.xml.transform.Result;
-@@ -73,6 +74,19 @@
- SAXTransformerFactory tf = fComponentManager.getFeature(Constants.ORACLE_FEATURE_SERVICE_MECHANISM) ?
- (SAXTransformerFactory)SAXTransformerFactory.newInstance()
- : (SAXTransformerFactory) TransformerFactory.newInstance(DEFAULT_TRANSFORMER_IMPL, StAXValidatorHelper.class.getClassLoader());
-+ XMLSecurityManager securityManager = (XMLSecurityManager)fComponentManager.getProperty(Constants.SECURITY_MANAGER);
-+ if (securityManager != null) {
-+ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
-+ if (securityManager.isSet(limit.ordinal())){
-+ tf.setAttribute(limit.apiProperty(),
-+ securityManager.getLimitValueAsString(limit));
-+ }
-+ }
-+ if (securityManager.printEntityCountInfo()) {
-+ tf.setAttribute(Constants.JDK_ENTITY_COUNT_INFO, "yes");
-+ }
-+ }
-+
- identityTransformer1 = tf.newTransformer();
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -20,28 +20,27 @@
-
- package com.sun.org.apache.xerces.internal.jaxp.validation;
-
--import java.lang.ref.SoftReference;
--import java.io.IOException;
--
--import javax.xml.transform.Result;
--import javax.xml.transform.Source;
--import javax.xml.transform.sax.SAXTransformerFactory;
--import javax.xml.transform.sax.TransformerHandler;
--import javax.xml.transform.stream.StreamSource;
--import javax.xml.transform.stream.StreamResult;
--import javax.xml.transform.TransformerConfigurationException;
--import javax.xml.transform.TransformerFactory;
--import javax.xml.transform.TransformerFactoryConfigurationError;
--import javax.xml.XMLConstants;
--
- import com.sun.org.apache.xerces.internal.impl.Constants;
- import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
- import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
- import com.sun.org.apache.xerces.internal.parsers.XML11Configuration;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.xni.XNIException;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLParseException;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
-+import java.io.IOException;
-+import java.lang.ref.SoftReference;
-+import javax.xml.XMLConstants;
-+import javax.xml.transform.Result;
-+import javax.xml.transform.Source;
-+import javax.xml.transform.TransformerConfigurationException;
-+import javax.xml.transform.TransformerFactory;
-+import javax.xml.transform.TransformerFactoryConfigurationError;
-+import javax.xml.transform.sax.SAXTransformerFactory;
-+import javax.xml.transform.sax.TransformerHandler;
-+import javax.xml.transform.stream.StreamResult;
-+import javax.xml.transform.stream.StreamSource;
- import org.xml.sax.SAXException;
-
- /**
-@@ -86,6 +85,11 @@
- Constants.XERCES_PROPERTY_PREFIX + Constants.VALIDATION_MANAGER_PROPERTY;
-
- private static final String DEFAULT_TRANSFORMER_IMPL = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
-+
-+ /** Property id: security manager. */
-+ private static final String SECURITY_MANAGER =
-+ Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
-+
- //
- // Data
- //
-@@ -165,6 +169,9 @@
-
- private XMLParserConfiguration initialize() {
- XML11Configuration config = new XML11Configuration();
-+ if (fComponentManager.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING)) {
-+ config.setProperty(SECURITY_MANAGER, new XMLSecurityManager());
-+ }
- config.setProperty(ENTITY_RESOLVER, fComponentManager.getProperty(ENTITY_RESOLVER));
- config.setProperty(ERROR_HANDLER, fComponentManager.getProperty(ERROR_HANDLER));
- XMLErrorReporter errorReporter = (XMLErrorReporter) fComponentManager.getProperty(ERROR_REPORTER);
-@@ -182,6 +189,8 @@
- config.setDTDContentModelHandler(null);
- config.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER,
- fComponentManager.getProperty(Constants.XML_SECURITY_PROPERTY_MANAGER));
-+ config.setProperty(Constants.SECURITY_MANAGER,
-+ fComponentManager.getProperty(Constants.SECURITY_MANAGER));
- fConfiguration = new SoftReference(config);
- 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-07-15 21:46:30.000000000 -0700
-@@ -49,10 +49,10 @@
- import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
- import com.sun.org.apache.xerces.internal.util.Status;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
- import com.sun.org.apache.xerces.internal.util.URI;
- import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl;
- import com.sun.org.apache.xerces.internal.util.XMLSymbols;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.Augmentations;
- import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
-@@ -679,10 +679,12 @@
- SAXParserFactory.newInstance() : new SAXParserFactoryImpl();
- spf.setNamespaceAware(true);
- try {
-+ spf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
-+ fComponentManager.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING));
- reader = spf.newSAXParser().getXMLReader();
- // If this is a Xerces SAX parser, set the security manager if there is one
- if (reader instanceof com.sun.org.apache.xerces.internal.parsers.SAXParser) {
-- SecurityManager securityManager = (SecurityManager) fComponentManager.getProperty(SECURITY_MANAGER);
-+ XMLSecurityManager securityManager = (XMLSecurityManager) fComponentManager.getProperty(SECURITY_MANAGER);
- if (securityManager != null) {
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -41,10 +41,10 @@
- import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
- import com.sun.org.apache.xerces.internal.util.SAXInputSource;
- import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
- import com.sun.org.apache.xerces.internal.util.StAXInputSource;
- import com.sun.org.apache.xerces.internal.util.Status;
- import com.sun.org.apache.xerces.internal.util.XMLGrammarPoolImpl;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.XNIException;
- import com.sun.org.apache.xerces.internal.xni.grammars.Grammar;
-@@ -79,7 +79,7 @@
- private static final String XMLGRAMMAR_POOL =
- Constants.XERCES_PROPERTY_PREFIX + Constants.XMLGRAMMAR_POOL_PROPERTY;
-
-- /** Property identifier: SecurityManager. */
-+ /** Property identifier: XMLSecurityManager. */
- private static final String SECURITY_MANAGER =
- Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
-
-@@ -87,7 +87,6 @@
- private static final String XML_SECURITY_PROPERTY_MANAGER =
- Constants.XML_SECURITY_PROPERTY_MANAGER;
-
--
- //
- // Data
- //
-@@ -108,7 +107,7 @@
- private ErrorHandlerWrapper fErrorHandlerWrapper;
-
- /** The SecurityManager. */
-- private SecurityManager fSecurityManager;
-+ private XMLSecurityManager fSecurityManager;
-
- /** The Security property manager. */
- private XMLSecurityPropertyManager fSecurityPropertyMgr;
-@@ -122,8 +121,6 @@
- * Note the default value (false) is the safe option..
- */
- private final boolean fUseServicesMechanism;
--
--
- public XMLSchemaFactory() {
- this(true);
- }
-@@ -141,7 +138,7 @@
- fXMLSchemaLoader.setErrorHandler(fErrorHandlerWrapper);
-
- // Enable secure processing feature by default
-- fSecurityManager = new SecurityManager();
-+ fSecurityManager = new XMLSecurityManager(true);
- fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
-
- fSecurityPropertyMgr = new XMLSecurityPropertyManager();
-@@ -301,7 +298,7 @@
- "FeatureNameNull", null));
- }
- if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
-- return (fSecurityManager != null);
-+ return (fSecurityManager !=null && fSecurityManager.isSecureProcessing());
- }
- try {
- return fXMLSchemaLoader.getFeature(name);
-@@ -365,17 +362,15 @@
- SAXMessageFormatter.formatMessage(null,
- "jaxp-secureprocessing-feature", null));
- }
-- if (value) {
-- fSecurityManager = new SecurityManager();
-
-+ fSecurityManager.setSecureProcessing(value);
-+ if (value) {
- if (Constants.IS_JDK8_OR_ABOVE) {
- fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
- XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
- fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
- XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
- }
-- } else {
-- fSecurityManager = null;
- }
-
- fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
-@@ -410,9 +405,17 @@
- "ProperyNameNull", null));
- }
- if (name.equals(SECURITY_MANAGER)) {
-- fSecurityManager = (SecurityManager) object;
-+ fSecurityManager = XMLSecurityManager.convert(object, fSecurityManager);
- fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
- return;
-+ } else if (name.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
-+ if (object == null) {
-+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
-+ } else {
-+ fSecurityPropertyMgr = (XMLSecurityPropertyManager)object;
-+ }
-+ fXMLSchemaLoader.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
-+ return;
- }
- else if (name.equals(XMLGRAMMAR_POOL)) {
- throw new SAXNotSupportedException(
-@@ -420,12 +423,15 @@
- "property-not-supported", new Object [] {name}));
- }
- try {
-- int index = fSecurityPropertyMgr.getIndex(name);
-- if (index > -1) {
-- fSecurityPropertyMgr.setValue(index,
-- XMLSecurityPropertyManager.State.APIPROPERTY, (String)object);
-- } else {
-- fXMLSchemaLoader.setProperty(name, object);
-+ //check if the property is managed by security manager
-+ if (fSecurityManager == null ||
-+ !fSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, object)) {
-+ //check if the property is managed by security property manager
-+ if (fSecurityPropertyMgr == null ||
-+ !fSecurityPropertyMgr.setValue(name, XMLSecurityPropertyManager.State.APIPROPERTY, object)) {
-+ //fall back to the existing property manager
-+ fXMLSchemaLoader.setProperty(name, object);
-+ }
- }
- }
- 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-07-15 21:46:30.000000000 -0700
-@@ -39,9 +39,9 @@
- import com.sun.org.apache.xerces.internal.util.NamespaceSupport;
- import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
- import com.sun.org.apache.xerces.internal.util.PropertyState;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
- import com.sun.org.apache.xerces.internal.util.Status;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
- import com.sun.org.apache.xerces.internal.xni.XNIException;
-@@ -181,7 +181,7 @@
- private final HashMap fInitProperties = new HashMap();
-
- /** Stores the initial security manager. */
-- private final SecurityManager fInitSecurityManager;
-+ private XMLSecurityManager fInitSecurityManager;
-
- /** Stores the initial security property manager. */
- private final XMLSecurityPropertyManager fSecurityPropertyMgr;
-@@ -221,12 +221,6 @@
- fComponents.put(ENTITY_RESOLVER, null);
- fComponents.put(ERROR_HANDLER, null);
-
-- if (System.getSecurityManager() != null) {
-- _isSecureMode = true;
-- setProperty(SECURITY_MANAGER, new SecurityManager());
-- } else {
-- fComponents.put(SECURITY_MANAGER, null);
-- }
- fComponents.put(SYMBOL_TABLE, new SymbolTable());
-
- // setup grammar pool
-@@ -241,15 +235,21 @@
- addRecognizedParamsAndSetDefaults(fErrorReporter, grammarContainer);
- addRecognizedParamsAndSetDefaults(fSchemaValidator, grammarContainer);
-
-- // if the secure processing feature is set to true, add a security manager to the configuration
-- Boolean secureProcessing = grammarContainer.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING);
-- if (Boolean.TRUE.equals(secureProcessing)) {
-- fInitSecurityManager = new SecurityManager();
-+ boolean secureProcessing = grammarContainer.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING);
-+ if (System.getSecurityManager() != null) {
-+ _isSecureMode = true;
-+ secureProcessing = true;
- }
-- else {
-- fInitSecurityManager = null;
-+
-+ fInitSecurityManager = (XMLSecurityManager)
-+ grammarContainer.getProperty(SECURITY_MANAGER);
-+ if (fInitSecurityManager != null ) {
-+ fInitSecurityManager.setSecureProcessing(secureProcessing);
-+ } else {
-+ fInitSecurityManager = new XMLSecurityManager(secureProcessing);
- }
-- fComponents.put(SECURITY_MANAGER, fInitSecurityManager);
-+
-+ setProperty(SECURITY_MANAGER, fInitSecurityManager);
-
- //pass on properties set on SchemaFactory
- fSecurityPropertyMgr = (XMLSecurityPropertyManager)
-@@ -281,7 +281,7 @@
- return FeatureState.is(fUseGrammarPoolOnly);
- }
- else if (XMLConstants.FEATURE_SECURE_PROCESSING.equals(featureId)) {
-- return FeatureState.is(getProperty(SECURITY_MANAGER) != null);
-+ return FeatureState.is(fInitSecurityManager.isSecureProcessing());
- }
- else if (SCHEMA_ELEMENT_DEFAULT.equals(featureId)) {
- return FeatureState.is(true); //pre-condition: VALIDATION and SCHEMA_VALIDATION are always true
-@@ -311,7 +311,8 @@
- if (_isSecureMode && !value) {
- throw new XMLConfigurationException(Status.NOT_ALLOWED, XMLConstants.FEATURE_SECURE_PROCESSING);
- }
-- setProperty(SECURITY_MANAGER, value ? new SecurityManager() : null);
-+ fInitSecurityManager.setSecureProcessing(value);
-+ setProperty(SECURITY_MANAGER, fInitSecurityManager);
-
- if (value && Constants.IS_JDK8_OR_ABOVE) {
- fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
-@@ -390,10 +391,20 @@
- fComponents.put(propertyId, value);
- return;
- }
-- if (!fInitProperties.containsKey(propertyId)) {
-- fInitProperties.put(propertyId, super.getProperty(propertyId));
-+
-+ //check if the property is managed by security manager
-+ if (fInitSecurityManager == null ||
-+ !fInitSecurityManager.setLimit(propertyId, XMLSecurityManager.State.APIPROPERTY, value)) {
-+ //check if the property is managed by security property manager
-+ if (fSecurityPropertyMgr == null ||
-+ !fSecurityPropertyMgr.setValue(propertyId, XMLSecurityPropertyManager.State.APIPROPERTY, value)) {
-+ //fall back to the existing property manager
-+ if (!fInitProperties.containsKey(propertyId)) {
-+ fInitProperties.put(propertyId, super.getProperty(propertyId));
-+ }
-+ super.setProperty(propertyId, value);
-+ }
- }
-- super.setProperty(propertyId, value);
- }
-
- /**
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -20,18 +20,15 @@
-
- package com.sun.org.apache.xerces.internal.parsers;
-
--import java.io.IOException;
--import java.util.Locale;
--
- import com.sun.org.apache.xerces.internal.impl.Constants;
--import com.sun.org.apache.xerces.internal.util.Status;
--import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
--import com.sun.org.apache.xerces.internal.util.EntityResolverWrapper;
- import com.sun.org.apache.xerces.internal.util.EntityResolver2Wrapper;
-+import com.sun.org.apache.xerces.internal.util.EntityResolverWrapper;
- import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper;
- import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
-+import com.sun.org.apache.xerces.internal.util.Status;
- import com.sun.org.apache.xerces.internal.util.SymbolHash;
- import com.sun.org.apache.xerces.internal.util.XMLSymbols;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.xni.Augmentations;
- import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
- import com.sun.org.apache.xerces.internal.xni.QName;
-@@ -48,15 +45,17 @@
- import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
- import com.sun.org.apache.xerces.internal.xs.AttributePSVI;
- import com.sun.org.apache.xerces.internal.xs.ElementPSVI;
-+import com.sun.org.apache.xerces.internal.xs.PSVIProvider;
-+import java.io.IOException;
-+import java.util.Locale;
-+import javax.xml.XMLConstants;
- import org.xml.sax.AttributeList;
--import org.xml.sax.Attributes;
- import org.xml.sax.ContentHandler;
- import org.xml.sax.DTDHandler;
- import org.xml.sax.DocumentHandler;
- import org.xml.sax.EntityResolver;
- import org.xml.sax.ErrorHandler;
- import org.xml.sax.InputSource;
--import org.xml.sax.Locator;
- import org.xml.sax.Parser;
- import org.xml.sax.SAXException;
- import org.xml.sax.SAXNotRecognizedException;
-@@ -131,6 +130,10 @@
- protected static final String DOM_NODE =
- Constants.SAX_PROPERTY_PREFIX + Constants.DOM_NODE_PROPERTY;
-
-+ /** Property id: security manager. */
-+ private static final String SECURITY_MANAGER =
-+ Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
-+
- /** Recognized properties. */
- private static final String[] RECOGNIZED_PROPERTIES = {
- LEXICAL_HANDLER,
-@@ -1645,19 +1648,13 @@
- // Drop through and perform default processing
- //
- }
--
-- //
-- // Xerces Features
-- //
--
-- /*
-- else if (featureId.startsWith(XERCES_FEATURES_PREFIX)) {
-- String feature = featureId.substring(XERCES_FEATURES_PREFIX.length());
-- //
-- // Drop through and perform default processing
-- //
-+ else if (featureId.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
-+ if (state) {
-+ if (fConfiguration.getProperty(SECURITY_MANAGER )==null) {
-+ fConfiguration.setProperty(SECURITY_MANAGER, new XMLSecurityManager());
-+ }
-+ }
- }
-- */
-
- //
- // 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 2014-07-15 21:46:30.000000000 -0700
-@@ -29,6 +29,7 @@
- import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
- import com.sun.org.apache.xerces.internal.util.Status;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.XNIException;
- import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
-@@ -531,7 +532,54 @@
- */
- public void setProperty(String propertyId, Object value)
- throws SAXNotRecognizedException, SAXNotSupportedException {
-+ /**
-+ * It's possible for users to set a security manager through the interface.
-+ * If it's the old SecurityManager, convert it to the new XMLSecurityManager
-+ */
-+ if (propertyId.equals(Constants.SECURITY_MANAGER)) {
-+ securityManager = XMLSecurityManager.convert(value, securityManager);
-+ setProperty0(Constants.SECURITY_MANAGER, securityManager);
-+ return;
-+ }
-+ if (propertyId.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
-+ if (value == null) {
-+ securityPropertyManager = new XMLSecurityPropertyManager();
-+ } else {
-+ securityPropertyManager = (XMLSecurityPropertyManager)value;
-+ }
-+ setProperty0(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
-+ return;
-+ }
-+
-+ if (securityManager == null) {
-+ securityManager = new XMLSecurityManager(true);
-+ setProperty0(Constants.SECURITY_MANAGER, securityManager);
-+ }
-+
-+ if (securityPropertyManager == null) {
-+ securityPropertyManager = new XMLSecurityPropertyManager();
-+ setProperty0(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
-+ }
-+ int index = securityPropertyManager.getIndex(propertyId);
-+
-+ if (index > -1) {
-+ /**
-+ * this is a direct call to this parser, not a subclass since
-+ * internally the support of this property is done through
-+ * XMLSecurityPropertyManager
-+ */
-+ securityPropertyManager.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
-+ } else {
-+ //check if the property is managed by security manager
-+ if (!securityManager.setLimit(propertyId, XMLSecurityManager.State.APIPROPERTY, value)) {
-+ //fall back to the default configuration to handle the property
-+ setProperty0(propertyId, value);
-+ }
-+ }
-+ }
-
-+ public void setProperty0(String propertyId, Object value)
-+ throws SAXNotRecognizedException, SAXNotSupportedException {
- try {
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -38,7 +38,6 @@
- import com.sun.org.apache.xerces.internal.util.PropertyState;
- import com.sun.org.apache.xerces.internal.util.Status;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
--import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.XMLLocator;
- import com.sun.org.apache.xerces.internal.xni.XNIException;
- import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
-@@ -189,6 +188,9 @@
- protected static final String XML_SECURITY_PROPERTY_MANAGER =
- Constants.XML_SECURITY_PROPERTY_MANAGER;
-
-+ /** Property identifier: Security manager. */
-+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
-+
- // debugging
-
- /** Set to true and recompile to print exception stack trace. */
-@@ -334,6 +336,7 @@
- JAXP_SCHEMA_SOURCE,
- JAXP_SCHEMA_LANGUAGE,
- LOCALE,
-+ SECURITY_MANAGER,
- XML_SECURITY_PROPERTY_MANAGER
- };
- addRecognizedProperties(recognizedProperties);
-@@ -411,8 +414,6 @@
- // do nothing
- // REVISIT: What is the right thing to do? -Ac
- }
--
-- setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
- } // <init>(SymbolTable,XMLGrammarPool)
-
- //
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -36,7 +36,6 @@
- import com.sun.org.apache.xerces.internal.util.PropertyState;
- import com.sun.org.apache.xerces.internal.util.Status;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
--import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.XMLLocator;
- import com.sun.org.apache.xerces.internal.xni.XNIException;
- import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
-@@ -162,6 +161,9 @@
- protected static final String XML_SECURITY_PROPERTY_MANAGER =
- Constants.XML_SECURITY_PROPERTY_MANAGER;
-
-+ /** Property identifier: Security manager. */
-+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
-+
- // debugging
-
- /** Set to true and recompile to print exception stack trace. */
-@@ -316,6 +318,7 @@
- DATATYPE_VALIDATOR_FACTORY,
- VALIDATION_MANAGER,
- LOCALE,
-+ SECURITY_MANAGER,
- XML_SECURITY_PROPERTY_MANAGER
- };
- addRecognizedProperties(recognizedProperties);
-@@ -372,8 +375,6 @@
- // do nothing
- // REVISIT: What is the right thing to do? -Ac
- }
--
-- setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
- } // <init>(SymbolTable,XMLGrammarPool)
-
- //
---- ./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 2014-07-15 21:46:30.000000000 -0700
-@@ -22,6 +22,7 @@
-
- import com.sun.org.apache.xerces.internal.impl.Constants;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
-@@ -76,7 +77,7 @@
- XMLGRAMMAR_POOL,
- };
-
-- XMLSecurityPropertyManager securityPropertyManager;
-+
- //
- // Constructors
- //
-@@ -130,11 +131,36 @@
- */
- public void setProperty(String name, Object value)
- throws SAXNotRecognizedException, SAXNotSupportedException {
-+ /**
-+ * It's possible for users to set a security manager through the interface.
-+ * If it's the old SecurityManager, convert it to the new XMLSecurityManager
-+ */
-+ if (name.equals(Constants.SECURITY_MANAGER)) {
-+ securityManager = XMLSecurityManager.convert(value, securityManager);
-+ super.setProperty(Constants.SECURITY_MANAGER, securityManager);
-+ return;
-+ }
-+ if (name.equals(Constants.XML_SECURITY_PROPERTY_MANAGER)) {
-+ if (value == null) {
-+ securityPropertyManager = new XMLSecurityPropertyManager();
-+ } else {
-+ securityPropertyManager = (XMLSecurityPropertyManager)value;
-+ }
-+ super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
-+ return;
-+ }
-+
-+ if (securityManager == null) {
-+ securityManager = new XMLSecurityManager(true);
-+ super.setProperty(Constants.SECURITY_MANAGER, securityManager);
-+ }
-+
- if (securityPropertyManager == null) {
- securityPropertyManager = new XMLSecurityPropertyManager();
-+ super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
- }
-- int index = securityPropertyManager.getIndex(name);
-
-+ int index = securityPropertyManager.getIndex(name);
- if (index > -1) {
- /**
- * this is a direct call to this parser, not a subclass since
-@@ -142,9 +168,12 @@
- * XMLSecurityPropertyManager
- */
- securityPropertyManager.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
-- super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
- } else {
-- super.setProperty(name, value);
-+ //check if the property is managed by security manager
-+ if (!securityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
-+ //fall back to the default configuration to handle the property
-+ super.setProperty(name, value);
-+ }
- }
- }
- } // 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 2014-07-15 21:46:30.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;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
-
- /**
- * This configuration allows Xerces to behave in a security-conscious manner; that is,
-@@ -44,6 +44,7 @@
- *
- * @author Neil Graham, IBM
- *
-+ * @version $Id: SecurityConfiguration.java,v 1.6 2010-11-01 04:40:09 joehw Exp $
- */
- public class SecurityConfiguration extends XIncludeAwareParserConfiguration
- {
-@@ -107,7 +108,7 @@
- super(symbolTable, grammarPool, parentSettings);
-
- // create the SecurityManager property:
-- setProperty(SECURITY_MANAGER_PROPERTY, new SecurityManager());
-+ setProperty(SECURITY_MANAGER_PROPERTY, new XMLSecurityManager(true));
- } // <init>(SymbolTable,XMLGrammarPool)
-
- } // 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 2014-07-15 21:46:30.000000000 -0700
-@@ -52,6 +52,7 @@
- import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
- import com.sun.org.apache.xerces.internal.util.PropertyState;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.XMLDTDContentModelHandler;
- import com.sun.org.apache.xerces.internal.xni.XMLDTDHandler;
-@@ -279,6 +280,8 @@
- private static final String XML_SECURITY_PROPERTY_MANAGER =
- Constants.XML_SECURITY_PROPERTY_MANAGER;
-
-+ /** Property identifier: Security manager. */
-+ private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
-
- // debugging
-
-@@ -289,33 +292,33 @@
- // Data
- //
-
-- protected SymbolTable fSymbolTable;
-+ protected SymbolTable fSymbolTable;
- protected XMLInputSource fInputSource;
- protected ValidationManager fValidationManager;
-- protected XMLVersionDetector fVersionDetector;
-+ protected XMLVersionDetector fVersionDetector;
- protected XMLLocator fLocator;
-- protected Locale fLocale;
-+ protected Locale fLocale;
-
-- /** XML 1.0 Components. */
-- protected ArrayList fComponents;
-+ /** XML 1.0 Components. */
-+ protected ArrayList fComponents;
-
-- /** XML 1.1. Components. */
-- protected ArrayList fXML11Components = null;
-+ /** XML 1.1. Components. */
-+ protected ArrayList fXML11Components = null;
-
-- /** Common components: XMLEntityManager, XMLErrorReporter, XMLSchemaValidator */
-- protected ArrayList fCommonComponents = null;
-+ /** Common components: XMLEntityManager, XMLErrorReporter, XMLSchemaValidator */
-+ protected ArrayList fCommonComponents = null;
-
-- /** The document handler. */
-- protected XMLDocumentHandler fDocumentHandler;
-+ /** The document handler. */
-+ protected XMLDocumentHandler fDocumentHandler;
-
-- /** The DTD handler. */
-- protected XMLDTDHandler fDTDHandler;
-+ /** The DTD handler. */
-+ protected XMLDTDHandler fDTDHandler;
-
-- /** The DTD content model handler. */
-- protected XMLDTDContentModelHandler fDTDContentModelHandler;
-+ /** The DTD content model handler. */
-+ protected XMLDTDContentModelHandler fDTDContentModelHandler;
-
-- /** Last component in the document pipeline */
-- protected XMLDocumentSource fLastComponent;
-+ /** Last component in the document pipeline */
-+ protected XMLDocumentSource fLastComponent;
-
- /**
- * True if a parse is in progress. This state is needed because
-@@ -495,31 +498,31 @@
- fFeatures.put(SCHEMA_ELEMENT_DEFAULT, Boolean.TRUE);
- fFeatures.put(NORMALIZE_DATA, Boolean.TRUE);
- fFeatures.put(SCHEMA_AUGMENT_PSVI, Boolean.TRUE);
-- fFeatures.put(GENERATE_SYNTHETIC_ANNOTATIONS, Boolean.FALSE);
-- fFeatures.put(VALIDATE_ANNOTATIONS, Boolean.FALSE);
-- fFeatures.put(HONOUR_ALL_SCHEMALOCATIONS, Boolean.FALSE);
-- fFeatures.put(NAMESPACE_GROWTH, Boolean.FALSE);
-- fFeatures.put(TOLERATE_DUPLICATES, Boolean.FALSE);
-- fFeatures.put(USE_GRAMMAR_POOL_ONLY, Boolean.FALSE);
-+ fFeatures.put(GENERATE_SYNTHETIC_ANNOTATIONS, Boolean.FALSE);
-+ fFeatures.put(VALIDATE_ANNOTATIONS, Boolean.FALSE);
-+ fFeatures.put(HONOUR_ALL_SCHEMALOCATIONS, Boolean.FALSE);
-+ fFeatures.put(NAMESPACE_GROWTH, Boolean.FALSE);
-+ fFeatures.put(TOLERATE_DUPLICATES, Boolean.FALSE);
-+ fFeatures.put(USE_GRAMMAR_POOL_ONLY, Boolean.FALSE);
- fFeatures.put(PARSER_SETTINGS, Boolean.TRUE);
- fFeatures.put(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
-
- // add default recognized properties
- final String[] recognizedProperties =
- {
-- SYMBOL_TABLE,
-- ERROR_HANDLER,
-- ENTITY_RESOLVER,
-+ SYMBOL_TABLE,
-+ ERROR_HANDLER,
-+ ENTITY_RESOLVER,
- ERROR_REPORTER,
- ENTITY_MANAGER,
- DOCUMENT_SCANNER,
- DTD_SCANNER,
- DTD_PROCESSOR,
- DTD_VALIDATOR,
-- DATATYPE_VALIDATOR_FACTORY,
-- VALIDATION_MANAGER,
-- SCHEMA_VALIDATOR,
-- XML_STRING,
-+ DATATYPE_VALIDATOR_FACTORY,
-+ VALIDATION_MANAGER,
-+ SCHEMA_VALIDATOR,
-+ XML_STRING,
- XMLGRAMMAR_POOL,
- JAXP_SCHEMA_SOURCE,
- JAXP_SCHEMA_LANGUAGE,
-@@ -531,19 +534,20 @@
- SCHEMA_NONS_LOCATION,
- LOCALE,
- SCHEMA_DV_FACTORY,
-+ SECURITY_MANAGER,
- XML_SECURITY_PROPERTY_MANAGER
- };
- addRecognizedProperties(recognizedProperties);
-
-- if (symbolTable == null) {
-- symbolTable = new SymbolTable();
-- }
-- fSymbolTable = symbolTable;
-- fProperties.put(SYMBOL_TABLE, fSymbolTable);
-+ if (symbolTable == null) {
-+ symbolTable = new SymbolTable();
-+ }
-+ fSymbolTable = symbolTable;
-+ fProperties.put(SYMBOL_TABLE, fSymbolTable);
-
- fGrammarPool = grammarPool;
- if (fGrammarPool != null) {
-- fProperties.put(XMLGRAMMAR_POOL, fGrammarPool);
-+ fProperties.put(XMLGRAMMAR_POOL, fGrammarPool);
- }
-
- fEntityManager = new XMLEntityManager();
-@@ -579,8 +583,6 @@
-
- fVersionDetector = new XMLVersionDetector();
-
-- fProperties.put(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
--
- // add message formatters
- 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-07-15 21:46:30.000000000 -0700
-@@ -23,6 +23,8 @@
- import java.io.IOException;
-
- import com.sun.org.apache.xerces.internal.impl.Constants;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
- import com.sun.org.apache.xerces.internal.xni.XNIException;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
- import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
-@@ -78,6 +80,13 @@
- /** The parser configuration. */
- protected XMLParserConfiguration fConfiguration;
-
-+ /** The XML Security Manager. */
-+ XMLSecurityManager securityManager;
-+
-+ /** The XML Security Property Manager. */
-+ XMLSecurityPropertyManager securityPropertyManager;
-+
-+
- //
- // Constructors
- //
-@@ -118,6 +127,15 @@
- */
- public void parse(XMLInputSource inputSource)
- throws XNIException, IOException {
-+ // null indicates that the parser is called directly, initialize them
-+ if (securityManager == null) {
-+ securityManager = new XMLSecurityManager(true);
-+ fConfiguration.setProperty(Constants.SECURITY_MANAGER, securityManager);
-+ }
-+ if (securityPropertyManager == null) {
-+ securityPropertyManager = new XMLSecurityPropertyManager();
-+ fConfiguration.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
-+ }
-
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -61,8 +61,6 @@
-
- package com.sun.org.apache.xerces.internal.util;
- import com.sun.org.apache.xerces.internal.impl.Constants;
--import java.security.AccessController;
--import java.security.PrivilegedAction;
- /**
- * This class is a container for parser settings that relate to
- * security, or more specifically, it is intended to be used to prevent denial-of-service
-@@ -79,7 +77,6 @@
- *
- * @author Neil Graham, IBM
- *
-- * @version $Id: SecurityManager.java,v 1.5 2010-11-01 04:40:14 joehw Exp $
- */
- public final class SecurityManager {
-
-@@ -179,48 +176,40 @@
-
- private void readSystemProperties(){
-
-- //TODO: also read SYSTEM_PROPERTY_ELEMENT_ATTRIBUTE_LIMIT
-- try {
-- String value = getSystemProperty(Constants.ENTITY_EXPANSION_LIMIT);
-- if(value != null && !value.equals("")){
-- entityExpansionLimit = Integer.parseInt(value);
-- if (entityExpansionLimit < 0)
-- entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
-- }
-- else
-- entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
-- }catch(Exception ex){}
--
-- try {
-- String value = getSystemProperty(Constants.MAX_OCCUR_LIMIT);
-- if(value != null && !value.equals("")){
-- maxOccurLimit = Integer.parseInt(value);
-- if (maxOccurLimit < 0)
-- maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
-- }
-- else
-- maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
-- }catch(Exception ex){}
--
-- try {
-- String value = getSystemProperty(Constants.SYSTEM_PROPERTY_ELEMENT_ATTRIBUTE_LIMIT);
-- if(value != null && !value.equals("")){
-- fElementAttributeLimit = Integer.parseInt(value);
-- if ( fElementAttributeLimit < 0)
-- fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
-- }
-- else
-- fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
-+ try {
-+ String value = System.getProperty(Constants.ENTITY_EXPANSION_LIMIT);
-+ if(value != null && !value.equals("")){
-+ entityExpansionLimit = Integer.parseInt(value);
-+ if (entityExpansionLimit < 0)
-+ entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
-+ }
-+ else
-+ entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT;
-+ }catch(Exception ex){}
-+
-+ try {
-+ String value = System.getProperty(Constants.MAX_OCCUR_LIMIT);
-+ if(value != null && !value.equals("")){
-+ maxOccurLimit = Integer.parseInt(value);
-+ if (maxOccurLimit < 0)
-+ maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
-+ }
-+ else
-+ maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT;
-+ }catch(Exception ex){}
-+
-+ try {
-+ String value = System.getProperty(Constants.ELEMENT_ATTRIBUTE_LIMIT);
-+ if(value != null && !value.equals("")){
-+ fElementAttributeLimit = Integer.parseInt(value);
-+ if ( fElementAttributeLimit < 0)
-+ fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
-+ }
-+ else
-+ fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT;
-
- }catch(Exception ex){}
-
- }
-
-- private String getSystemProperty(final String propName) {
-- return AccessController.doPrivileged(new PrivilegedAction<String>() {
-- public String run() {
-- return System.getProperty(propName);
-- }
-- });
-- }
- } // 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 2014-07-15 21:46:30.000000000 -0700
-@@ -173,7 +173,7 @@
- for (int i = 0; i < length; i++) {
- code = code * 37 + symbol.charAt(i);
- }
-- return code & 0x7FFFFFF;
-+ return code & 0x7FFFFFFF;
-
- } // hash(String):int
-
-@@ -194,7 +194,7 @@
- for (int i = 0; i < length; i++) {
- code = code * 37 + buffer[offset + i];
- }
-- return code & 0x7FFFFFF;
-+ return code & 0x7FFFFFFF;
-
- } // hash(char[],int,int):int
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java 2013-09-06 11:23:00.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java 2014-07-15 21:46:30.000000000 -0700
-@@ -689,9 +689,13 @@
- if (!initializeAuthority(uriSpec.substring(startPos, index))) {
- index = startPos - 2;
- }
-- }
-- else {
-+ } else if (index < uriSpecLen) {
-+ //Same as java.net.URI:
-+ // DEVIATION: Allow empty authority prior to non-empty
-+ // path, query component or fragment identifier
- m_host = "";
-+ } else {
-+ throw new MalformedURIException("Expected authority.");
- }
- }
-
---- ./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-07-15 21:46:30.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/SecuritySupport.java 2013-09-06 11:23:00.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java 2014-07-15 21:46:30.000000000 -0700
-@@ -211,7 +211,7 @@
- if (i > 0) {
- return uri.substring(i+1, uri.length());
- }
-- return "";
-+ return uri;
- }
-
- /**
---- ./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-07-15 21:54:36.000000000 -0700
-@@ -0,0 +1,241 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-+ *
-+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
-+ *
-+ * The contents of this file are subject to the terms of either the GNU
-+ * General Public License Version 2 only ("GPL") or the Common Development
-+ * and Distribution License("CDDL") (collectively, the "License"). You
-+ * may not use this file except in compliance with the License. You can
-+ * obtain a copy of the License at
-+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-+ * or packager/legal/LICENSE.txt. See the License for the specific
-+ * language governing permissions and limitations under the License.
-+ *
-+ * When distributing the software, include this License Header Notice in each
-+ * file and include the License file at packager/legal/LICENSE.txt.
-+ *
-+ * GPL Classpath Exception:
-+ * Oracle designates this particular file as subject to the "Classpath"
-+ * exception as provided by Oracle in the GPL Version 2 section of the License
-+ * file that accompanied this code.
-+ *
-+ * Modifications:
-+ * If applicable, add the following below the License Header, with the fields
-+ * enclosed by brackets [] replaced by your own identifying information:
-+ * "Portions Copyright [year] [name of copyright owner]"
-+ *
-+ * Contributor(s):
-+ * If you wish your version of this file to be governed by only the CDDL or
-+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
-+ * elects to include this software in this distribution under the [CDDL or GPL
-+ * Version 2] license." If you don't indicate a single choice of license, a
-+ * recipient has the option to distribute your version of this file under
-+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
-+ * its licensees as provided above. However, if you add GPL Version 2 code
-+ * and therefore, elected the GPL Version 2 license, then the option applies
-+ * only if the new code is made subject to such option by the copyright
-+ * holder.
-+ */
-+package com.sun.org.apache.xerces.internal.utils;
-+
-+import com.sun.org.apache.xerces.internal.impl.Constants;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager.Limit;
-+import java.util.Formatter;
-+import java.util.HashMap;
-+import java.util.Map;
-+
-+/**
-+ * A helper for analyzing entity expansion limits
-+ *
-+ * @author Joe Wang Oracle Corp.
-+ *
-+ */
-+public final class XMLLimitAnalyzer {
-+
-+ /**
-+ * Map old property names with the new ones
-+ */
-+ public static enum NameMap {
-+ ENTITY_EXPANSION_LIMIT(Constants.SP_ENTITY_EXPANSION_LIMIT, Constants.ENTITY_EXPANSION_LIMIT),
-+ MAX_OCCUR_NODE_LIMIT(Constants.SP_MAX_OCCUR_LIMIT, Constants.MAX_OCCUR_LIMIT),
-+ ELEMENT_ATTRIBUTE_LIMIT(Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, Constants.ELEMENT_ATTRIBUTE_LIMIT);
-+
-+ final String newName;
-+ final String oldName;
-+
-+ NameMap(String newName, String oldName) {
-+ this.newName = newName;
-+ this.oldName = oldName;
-+ }
-+
-+ String getOldName(String newName) {
-+ if (newName.equals(this.newName)) {
-+ return oldName;
-+ }
-+ return null;
-+ }
-+ }
-+
-+ /**
-+ * Max value accumulated for each property
-+ */
-+ private final int[] values;
-+ /**
-+ * Names of the entities corresponding to their max values
-+ */
-+ private final String[] names;
-+ /**
-+ * Total value of accumulated entities
-+ */
-+ private final int[] totalValue;
-+
-+ /**
-+ * Maintain values of the top 10 elements in the process of parsing
-+ */
-+ private final Map[] caches;
-+
-+ private String entityStart, entityEnd;
-+ /**
-+ * Default constructor. Establishes default values for known security
-+ * vulnerabilities.
-+ */
-+ public XMLLimitAnalyzer() {
-+ values = new int[Limit.values().length];
-+ totalValue = new int[Limit.values().length];
-+ names = new String[Limit.values().length];
-+ caches = new Map[Limit.values().length];
-+ }
-+
-+ /**
-+ * Add the value to the current max count for the specified property
-+ * To find the max value of all entities, set no limit
-+ *
-+ * @param limit the type of the property
-+ * @param entityName the name of the entity
-+ * @param value the value of the entity
-+ */
-+ public void addValue(Limit limit, String entityName, int value) {
-+ addValue(limit.ordinal(), entityName, value);
-+ }
-+
-+ /**
-+ * Add the value to the current count by the index of the property
-+ * @param index the index of the property
-+ * @param entityName the name of the entity
-+ * @param value the value of the entity
-+ */
-+ public void addValue(int index, String entityName, int value) {
-+ if (index == Limit.ENTITY_EXPANSION_LIMIT.ordinal() ||
-+ index == Limit.MAX_OCCUR_NODE_LIMIT.ordinal() ||
-+ index == Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal()) {
-+ totalValue[index] += value;
-+ return;
-+ }
-+ if (index == Limit.MAX_ELEMENT_DEPTH_LIMIT.ordinal()) {
-+ totalValue[index] = value;
-+ return;
-+ }
-+
-+ Map<String, Integer> cache;
-+ if (caches[index] == null) {
-+ cache = new HashMap<String, Integer>(10);
-+ caches[index] = cache;
-+ } else {
-+ cache = caches[index];
-+ }
-+
-+ int accumulatedValue = value;
-+ if (cache.containsKey(entityName)) {
-+ accumulatedValue += cache.get(entityName).intValue();
-+ cache.put(entityName, Integer.valueOf(accumulatedValue));
-+ } else {
-+ cache.put(entityName, Integer.valueOf(value));
-+ }
-+
-+ if (accumulatedValue > values[index]) {
-+ values[index] = accumulatedValue;
-+ names[index] = entityName;
-+ }
-+
-+
-+ if (index == Limit.GENEAL_ENTITY_SIZE_LIMIT.ordinal() ||
-+ index == Limit.PARAMETER_ENTITY_SIZE_LIMIT.ordinal()) {
-+ totalValue[Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal()] += value;
-+ }
-+ }
-+
-+ /**
-+ * Return the value of the current max count for the specified property
-+ *
-+ * @param limit the property
-+ * @return the value of the property
-+ */
-+ public int getValue(Limit limit) {
-+ return values[limit.ordinal()];
-+ }
-+
-+ public int getValue(int index) {
-+ return values[index];
-+ }
-+ /**
-+ * Return the total value accumulated so far
-+ *
-+ * @param limit the property
-+ * @return the accumulated value of the property
-+ */
-+ public int getTotalValue(Limit limit) {
-+ return totalValue[limit.ordinal()];
-+ }
-+
-+ public int getTotalValue(int index) {
-+ return totalValue[index];
-+ }
-+ /**
-+ * Return the current max value (count or length) by the index of a property
-+ * @param index the index of a property
-+ * @return count of a property
-+ */
-+ public int getValueByIndex(int index) {
-+ return values[index];
-+ }
-+
-+ public void startEntity(String name) {
-+ entityStart = name;
-+ }
-+
-+ public boolean isTracking(String name) {
-+ if (entityStart == null) {
-+ return false;
-+ }
-+ return entityStart.equals(name);
-+ }
-+ /**
-+ * Stop tracking the entity
-+ * @param limit the limit property
-+ * @param name the name of an entity
-+ */
-+ public void endEntity(Limit limit, String name) {
-+ entityStart = "";
-+ Map<String, Integer> cache = caches[limit.ordinal()];
-+ if (cache != null) {
-+ cache.remove(name);
-+ }
-+ }
-+
-+ public void debugPrint(XMLSecurityManager securityManager) {
-+ Formatter formatter = new Formatter();
-+ System.out.println(formatter.format("%30s %15s %15s %15s %30s",
-+ "Property","Limit","Total size","Size","Entity Name"));
-+
-+ for (Limit limit : Limit.values()) {
-+ formatter = new Formatter();
-+ System.out.println(formatter.format("%30s %15d %15d %15d %30s",
-+ limit.name(),
-+ securityManager.getLimit(limit),
-+ totalValue[limit.ordinal()],
-+ values[limit.ordinal()],
-+ names[limit.ordinal()]));
-+ }
-+ }
-+}
---- ./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-07-15 21:54:36.000000000 -0700
-@@ -0,0 +1,542 @@
-+/*
-+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.org.apache.xerces.internal.utils;
-+
-+import com.sun.org.apache.xerces.internal.impl.Constants;
-+import com.sun.org.apache.xerces.internal.util.SecurityManager;
-+
-+/**
-+ * This class manages standard and implementation-specific limitations.
-+ *
-+ */
-+public final class XMLSecurityManager {
-+
-+ /**
-+ * States of the settings of a property, in the order: default value, value
-+ * set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
-+ * properties, and jaxp api properties
-+ */
-+ public static enum State {
-+ //this order reflects the overriding order
-+
-+ DEFAULT("default"), FSP("FEATURE_SECURE_PROCESSING"),
-+ JAXPDOTPROPERTIES("jaxp.properties"), SYSTEMPROPERTY("system property"),
-+ APIPROPERTY("property");
-+
-+ final String literal;
-+ State(String literal) {
-+ this.literal = literal;
-+ }
-+
-+ String literal() {
-+ return literal;
-+ }
-+ }
-+
-+ /**
-+ * Limits managed by the security manager
-+ */
-+ public static enum Limit {
-+
-+ ENTITY_EXPANSION_LIMIT(Constants.JDK_ENTITY_EXPANSION_LIMIT, Constants.SP_ENTITY_EXPANSION_LIMIT, 0, 64000),
-+ MAX_OCCUR_NODE_LIMIT(Constants.JDK_MAX_OCCUR_LIMIT, Constants.SP_MAX_OCCUR_LIMIT, 0, 5000),
-+ ELEMENT_ATTRIBUTE_LIMIT(Constants.JDK_ELEMENT_ATTRIBUTE_LIMIT, Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
-+ TOTAL_ENTITY_SIZE_LIMIT(Constants.JDK_TOTAL_ENTITY_SIZE_LIMIT, Constants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
-+ GENEAL_ENTITY_SIZE_LIMIT(Constants.JDK_GENEAL_ENTITY_SIZE_LIMIT, Constants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
-+ PARAMETER_ENTITY_SIZE_LIMIT(Constants.JDK_PARAMETER_ENTITY_SIZE_LIMIT, Constants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000),
-+ MAX_ELEMENT_DEPTH_LIMIT(Constants.JDK_MAX_ELEMENT_DEPTH, Constants.SP_MAX_ELEMENT_DEPTH, 0, 0);
-+
-+ final String apiProperty;
-+ final String systemProperty;
-+ final int defaultValue;
-+ final int secureValue;
-+
-+ Limit(String apiProperty, String systemProperty, int value, int secureValue) {
-+ this.apiProperty = apiProperty;
-+ this.systemProperty = systemProperty;
-+ this.defaultValue = value;
-+ this.secureValue = secureValue;
-+ }
-+
-+ public boolean equalsAPIPropertyName(String propertyName) {
-+ return (propertyName == null) ? false : apiProperty.equals(propertyName);
-+ }
-+
-+ public boolean equalsSystemPropertyName(String propertyName) {
-+ return (propertyName == null) ? false : systemProperty.equals(propertyName);
-+ }
-+
-+ public String apiProperty() {
-+ return apiProperty;
-+ }
-+
-+ String systemProperty() {
-+ return systemProperty;
-+ }
-+
-+ int defaultValue() {
-+ return defaultValue;
-+ }
-+
-+ int secureValue() {
-+ return secureValue;
-+ }
-+ }
-+
-+ /**
-+ * Map old property names with the new ones
-+ */
-+ public static enum NameMap {
-+
-+ ENTITY_EXPANSION_LIMIT(Constants.SP_ENTITY_EXPANSION_LIMIT, Constants.ENTITY_EXPANSION_LIMIT),
-+ MAX_OCCUR_NODE_LIMIT(Constants.SP_MAX_OCCUR_LIMIT, Constants.MAX_OCCUR_LIMIT),
-+ ELEMENT_ATTRIBUTE_LIMIT(Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, Constants.ELEMENT_ATTRIBUTE_LIMIT);
-+ final String newName;
-+ final String oldName;
-+
-+ NameMap(String newName, String oldName) {
-+ this.newName = newName;
-+ this.oldName = oldName;
-+ }
-+
-+ String getOldName(String newName) {
-+ if (newName.equals(this.newName)) {
-+ return oldName;
-+ }
-+ return null;
-+ }
-+ }
-+ private static final int NO_LIMIT = 0;
-+ /**
-+ * Values of the properties
-+ */
-+ private final int[] values;
-+ /**
-+ * States of the settings for each property
-+ */
-+ private State[] states;
-+ /**
-+ * Flag indicating if secure processing is set
-+ */
-+ boolean secureProcessing;
-+
-+ /**
-+ * States that determine if properties are set explicitly
-+ */
-+ private boolean[] isSet;
-+
-+
-+ /**
-+ * Index of the special entityCountInfo property
-+ */
-+ private int indexEntityCountInfo = 10000;
-+ private String printEntityCountInfo = "";
-+
-+ /**
-+ * Default constructor. Establishes default values for known security
-+ * vulnerabilities.
-+ */
-+ public XMLSecurityManager() {
-+ this(false);
-+ }
-+
-+ /**
-+ * Instantiate Security Manager in accordance with the status of
-+ * secure processing
-+ * @param secureProcessing
-+ */
-+ public XMLSecurityManager(boolean secureProcessing) {
-+ values = new int[Limit.values().length];
-+ states = new State[Limit.values().length];
-+ isSet = new boolean[Limit.values().length];
-+ this.secureProcessing = secureProcessing;
-+ for (Limit limit : Limit.values()) {
-+ if (secureProcessing) {
-+ values[limit.ordinal()] = limit.secureValue;
-+ states[limit.ordinal()] = State.FSP;
-+ } else {
-+ values[limit.ordinal()] = limit.defaultValue();
-+ states[limit.ordinal()] = State.DEFAULT;
-+ }
-+ }
-+ //read system properties or jaxp.properties
-+ readSystemProperties();
-+ }
-+
-+ /**
-+ * Setting FEATURE_SECURE_PROCESSING explicitly
-+ */
-+ public void setSecureProcessing(boolean secure) {
-+ secureProcessing = secure;
-+ for (Limit limit : Limit.values()) {
-+ if (secure) {
-+ setLimit(limit.ordinal(), State.FSP, limit.secureValue());
-+ } else {
-+ setLimit(limit.ordinal(), State.FSP, limit.defaultValue());
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Return the state of secure processing
-+ * @return the state of secure processing
-+ */
-+ public boolean isSecureProcessing() {
-+ return secureProcessing;
-+ }
-+
-+
-+ /**
-+ * Set limit by property name and state
-+ * @param propertyName property name
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ * @return true if the property is managed by the security manager; false
-+ * if otherwise.
-+ */
-+ public boolean setLimit(String propertyName, State state, Object value) {
-+ int index = getIndex(propertyName);
-+ if (index > -1) {
-+ setLimit(index, state, value);
-+ return true;
-+ }
-+ return false;
-+ }
-+
-+ /**
-+ * Set the value for a specific limit.
-+ *
-+ * @param limit the limit
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ */
-+ public void setLimit(Limit limit, State state, int value) {
-+ setLimit(limit.ordinal(), state, value);
-+ }
-+
-+ /**
-+ * Set the value of a property by its index
-+ *
-+ * @param index the index of the property
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ */
-+ public void setLimit(int index, State state, Object value) {
-+ if (index == indexEntityCountInfo) {
-+ printEntityCountInfo = (String)value;
-+ } else {
-+ int temp;
-+ if (Integer.class.isAssignableFrom(value.getClass())) {
-+ temp = ((Integer)value).intValue();
-+ } else {
-+ temp = Integer.parseInt((String) value);
-+ if (temp < 0) {
-+ temp = 0;
-+ }
-+ }
-+ setLimit(index, state, temp);
-+ }
-+ }
-+
-+ /**
-+ * Set the value of a property by its index
-+ *
-+ * @param index the index of the property
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ */
-+ public void setLimit(int index, State state, int value) {
-+ if (index == indexEntityCountInfo) {
-+ //if it's explicitly set, it's treated as yes no matter the value
-+ printEntityCountInfo = Constants.JDK_YES;
-+ } else {
-+ //only update if it shall override
-+ if (state.compareTo(states[index]) >= 0) {
-+ values[index] = value;
-+ states[index] = state;
-+ isSet[index] = true;
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Return the value of the specified property
-+ *
-+ * @param propertyName the property name
-+ * @return the value of the property as a string. If a property is managed
-+ * by this manager, its value shall not be null.
-+ */
-+ public String getLimitAsString(String propertyName) {
-+ int index = getIndex(propertyName);
-+ if (index > -1) {
-+ return getLimitValueByIndex(index);
-+ }
-+
-+ return null;
-+ }
-+ /**
-+ * Return the value of the specified property
-+ *
-+ * @param limit the property
-+ * @return the value of the property
-+ */
-+ public int getLimit(Limit limit) {
-+ return values[limit.ordinal()];
-+ }
-+
-+ /**
-+ * Return the value of a property by its ordinal
-+ *
-+ * @param limit the property
-+ * @return value of a property
-+ */
-+ public String getLimitValueAsString(Limit limit) {
-+ return Integer.toString(values[limit.ordinal()]);
-+ }
-+
-+ /**
-+ * Return the value of a property by its ordinal
-+ *
-+ * @param index the index of a property
-+ * @return limit of a property as a string
-+ */
-+ public String getLimitValueByIndex(int index) {
-+ if (index == indexEntityCountInfo) {
-+ return printEntityCountInfo;
-+ }
-+
-+ return Integer.toString(values[index]);
-+ }
-+
-+ /**
-+ * Return the state of the limit property
-+ *
-+ * @param limit the limit
-+ * @return the state of the limit property
-+ */
-+ public State getState(Limit limit) {
-+ return states[limit.ordinal()];
-+ }
-+
-+ /**
-+ * Return the state of the limit property
-+ *
-+ * @param limit the limit
-+ * @return the state of the limit property
-+ */
-+ public String getStateLiteral(Limit limit) {
-+ return states[limit.ordinal()].literal();
-+ }
-+
-+ /**
-+ * Get the index by property name
-+ *
-+ * @param propertyName property name
-+ * @return the index of the property if found; return -1 if not
-+ */
-+ public int getIndex(String propertyName) {
-+ for (Limit limit : Limit.values()) {
-+ if (limit.equalsAPIPropertyName(propertyName)) {
-+ //internally, ordinal is used as index
-+ return limit.ordinal();
-+ }
-+ }
-+ //special property to return entity count info
-+ if (propertyName.equals(Constants.JDK_ENTITY_COUNT_INFO)) {
-+ return indexEntityCountInfo;
-+ }
-+ return -1;
-+ }
-+
-+ /**
-+ * Check if there's no limit defined by the Security Manager
-+ * @param limit
-+ * @return
-+ */
-+ public boolean isNoLimit(int limit) {
-+ return limit==NO_LIMIT;
-+ }
-+ /**
-+ * Check if the size (length or count) of the specified limit property is
-+ * over the limit
-+ *
-+ * @param limit the type of the limit property
-+ * @param entityName the name of the entity
-+ * @param size the size (count or length) of the entity
-+ * @return true if the size is over the limit, false otherwise
-+ */
-+ public boolean isOverLimit(Limit limit, String entityName, int size,
-+ XMLLimitAnalyzer limitAnalyzer) {
-+ return isOverLimit(limit.ordinal(), entityName, size, limitAnalyzer);
-+ }
-+
-+ /**
-+ * Check if the value (length or count) of the specified limit property is
-+ * over the limit
-+ *
-+ * @param index the index of the limit property
-+ * @param entityName the name of the entity
-+ * @param size the size (count or length) of the entity
-+ * @return true if the size is over the limit, false otherwise
-+ */
-+ public boolean isOverLimit(int index, String entityName, int size,
-+ XMLLimitAnalyzer limitAnalyzer) {
-+ if (values[index] == NO_LIMIT) {
-+ return false;
-+ }
-+ if (size > values[index]) {
-+ limitAnalyzer.addValue(index, entityName, size);
-+ return true;
-+ }
-+ return false;
-+ }
-+
-+ /**
-+ * Check against cumulated value
-+ *
-+ * @param limit the type of the limit property
-+ * @param size the size (count or length) of the entity
-+ * @return true if the size is over the limit, false otherwise
-+ */
-+ public boolean isOverLimit(Limit limit, XMLLimitAnalyzer limitAnalyzer) {
-+ return isOverLimit(limit.ordinal(), limitAnalyzer);
-+ }
-+
-+ public boolean isOverLimit(int index, XMLLimitAnalyzer limitAnalyzer) {
-+ if (values[index] == NO_LIMIT) {
-+ return false;
-+ }
-+
-+ if (index == Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal() ||
-+ index == Limit.ENTITY_EXPANSION_LIMIT.ordinal() ||
-+ index == Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal() ||
-+ index == Limit.MAX_ELEMENT_DEPTH_LIMIT.ordinal()) {
-+ return (limitAnalyzer.getTotalValue(index) > values[index]);
-+ } else {
-+ return (limitAnalyzer.getValue(index) > values[index]);
-+ }
-+ }
-+
-+ public void debugPrint(XMLLimitAnalyzer limitAnalyzer) {
-+ if (printEntityCountInfo.equals(Constants.JDK_YES)) {
-+ limitAnalyzer.debugPrint(this);
-+ }
-+ }
-+
-+
-+ /**
-+ * Indicate if a property is set explicitly
-+ * @param index
-+ * @return
-+ */
-+ public boolean isSet(int index) {
-+ return isSet[index];
-+ }
-+
-+ public boolean printEntityCountInfo() {
-+ return printEntityCountInfo.equals(Constants.JDK_YES);
-+ }
-+
-+ /**
-+ * Read from system properties, or those in jaxp.properties
-+ */
-+ private void readSystemProperties() {
-+
-+ for (Limit limit : Limit.values()) {
-+ if (!getSystemProperty(limit, limit.systemProperty())) {
-+ //if system property is not found, try the older form if any
-+ for (NameMap nameMap : NameMap.values()) {
-+ String oldName = nameMap.getOldName(limit.systemProperty());
-+ if (oldName != null) {
-+ getSystemProperty(limit, oldName);
-+ }
-+ }
-+ }
-+ }
-+
-+ }
-+
-+ /**
-+ * Read from system properties, or those in jaxp.properties
-+ *
-+ * @param property the type of the property
-+ * @param sysPropertyName the name of system property
-+ */
-+ private boolean getSystemProperty(Limit limit, String sysPropertyName) {
-+ try {
-+ String value = SecuritySupport.getSystemProperty(sysPropertyName);
-+ if (value != null && !value.equals("")) {
-+ values[limit.ordinal()] = Integer.parseInt(value);
-+ states[limit.ordinal()] = State.SYSTEMPROPERTY;
-+ return true;
-+ }
-+
-+ value = SecuritySupport.readJAXPProperty(sysPropertyName);
-+ if (value != null && !value.equals("")) {
-+ values[limit.ordinal()] = Integer.parseInt(value);
-+ states[limit.ordinal()] = State.JAXPDOTPROPERTIES;
-+ return true;
-+ }
-+ } catch (NumberFormatException e) {
-+ //invalid setting
-+ throw new NumberFormatException("Invalid setting for system property: " + limit.systemProperty());
-+ }
-+ return false;
-+ }
-+
-+
-+ /**
-+ * Convert a value set through setProperty to XMLSecurityManager.
-+ * If the value is an instance of XMLSecurityManager, use it to override the default;
-+ * If the value is an old SecurityManager, convert to the new XMLSecurityManager.
-+ *
-+ * @param value user specified security manager
-+ * @param securityManager an instance of XMLSecurityManager
-+ * @return an instance of the new security manager XMLSecurityManager
-+ */
-+ static public XMLSecurityManager convert(Object value, XMLSecurityManager securityManager) {
-+ if (value == null) {
-+ if (securityManager == null) {
-+ securityManager = new XMLSecurityManager(true);
-+ }
-+ return securityManager;
-+ }
-+ if (XMLSecurityManager.class.isAssignableFrom(value.getClass())) {
-+ return (XMLSecurityManager)value;
-+ } else {
-+ if (securityManager == null) {
-+ securityManager = new XMLSecurityManager(true);
-+ }
-+ if (SecurityManager.class.isAssignableFrom(value.getClass())) {
-+ SecurityManager origSM = (SecurityManager)value;
-+ securityManager.setLimit(Limit.MAX_OCCUR_NODE_LIMIT, State.APIPROPERTY, origSM.getMaxOccurNodeLimit());
-+ securityManager.setLimit(Limit.ENTITY_EXPANSION_LIMIT, State.APIPROPERTY, origSM.getEntityExpansionLimit());
-+ securityManager.setLimit(Limit.ELEMENT_ATTRIBUTE_LIMIT, State.APIPROPERTY, origSM.getElementAttrLimit());
-+ }
-+ return securityManager;
-+ }
-+ }
-+}
---- ./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-07-15 21:46:30.000000000 -0700
-@@ -91,6 +91,24 @@
- readSystemProperties();
- }
-
-+
-+ /**
-+ * Set limit by property name and state
-+ * @param propertyName property name
-+ * @param state the state of the property
-+ * @param value the value of the property
-+ * @return true if the property is managed by the security property manager;
-+ * false if otherwise.
-+ */
-+ public boolean setValue(String propertyName, State state, Object value) {
-+ int index = getIndex(propertyName);
-+ if (index > -1) {
-+ setValue(index, state, (String)value);
-+ return true;
-+ }
-+ return false;
-+ }
-+
- /**
- * Set the value for a specific property.
- *
-@@ -119,6 +137,23 @@
- states[index] = state;
- }
- }
-+
-+
-+ /**
-+ * Return the value of the specified property
-+ *
-+ * @param propertyName the property name
-+ * @return the value of the property as a string
-+ */
-+ public String getValue(String propertyName) {
-+ int index = getIndex(propertyName);
-+ if (index > -1) {
-+ return getValueByIndex(index);
-+ }
-+
-+ return null;
-+ }
-+
- /**
- * 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 2014-07-15 21:46:30.000000000 -0700
-@@ -37,7 +37,6 @@
- import com.sun.org.apache.xerces.internal.util.HTTPInputSource;
- import com.sun.org.apache.xerces.internal.util.IntStack;
- import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
--import com.sun.org.apache.xerces.internal.util.SecurityManager;
- import com.sun.org.apache.xerces.internal.util.SymbolTable;
- import com.sun.org.apache.xerces.internal.util.URI;
- import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl;
-@@ -45,6 +44,7 @@
- import com.sun.org.apache.xerces.internal.util.XMLChar;
- import com.sun.org.apache.xerces.internal.util.XMLSymbols;
- import com.sun.org.apache.xerces.internal.util.URI.MalformedURIException;
-+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
- import com.sun.org.apache.xerces.internal.xni.Augmentations;
- import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
- import com.sun.org.apache.xerces.internal.xni.QName;
-@@ -289,7 +289,7 @@
- protected SymbolTable fSymbolTable;
- protected XMLErrorReporter fErrorReporter;
- protected XMLEntityResolver fEntityResolver;
-- protected SecurityManager fSecurityManager;
-+ protected XMLSecurityManager fSecurityManager;
- protected XMLSecurityPropertyManager fSecurityPropertyMgr;
-
- // these are needed for text include processing
-@@ -517,8 +517,8 @@
-
- // Get security manager.
- try {
-- SecurityManager value =
-- (SecurityManager)componentManager.getProperty(
-+ XMLSecurityManager value =
-+ (XMLSecurityManager)componentManager.getProperty(
- SECURITY_MANAGER);
-
- if (value != null) {
-@@ -674,7 +674,7 @@
- return;
- }
- if (propertyId.equals(SECURITY_MANAGER)) {
-- fSecurityManager = (SecurityManager)value;
-+ fSecurityManager = (XMLSecurityManager)value;
- if (fChildConfig != null) {
- 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-07-15 21:46:30.000000000 -0700
-@@ -20,6 +20,7 @@
-
- package com.sun.org.apache.xerces.internal.xni.parser;
-
-+import com.sun.org.apache.xerces.internal.utils.XMLLimitAnalyzer;
- import java.io.IOException;
- import com.sun.org.apache.xerces.internal.xni.XNIException;
-
-@@ -95,4 +96,5 @@
- public boolean scanDTDExternalSubset(boolean complete)
- throws IOException, XNIException;
-
-+ public void setLimitAnalyzer(XMLLimitAnalyzer limitAnalyzer);
- } // interface XMLDTDScanner
---- ./jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java 2013-09-06 11:23:01.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java 2014-07-15 21:46:30.000000000 -0700
-@@ -105,15 +105,15 @@
- */
- public Node item(int index) {
- if (m_iter != null) {
-- int node;
-+ int node = 0;
- int count = m_cachedNodes.size();
-
- if (count > index) {
- node = m_cachedNodes.elementAt(index);
- return m_dtm.getNode(node);
- } else if (m_last == -1) {
-- while (((node = m_iter.next()) != DTMAxisIterator.END)
-- && count <= index) {
-+ while (count <= index
-+ && ((node = m_iter.next()) != DTMAxisIterator.END)) {
- m_cachedNodes.addElement(node);
- count++;
- }
---- ./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-07-15 21:46:30.000000000 -0700
-@@ -24,20 +24,17 @@
- package com.sun.org.apache.xml.internal.resolver;
-
- import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
-+import com.sun.org.apache.xml.internal.resolver.helpers.BootstrapResolver;
-+import com.sun.org.apache.xml.internal.resolver.helpers.Debug;
- import java.io.InputStream;
--
--import java.net.URL;
- import java.net.MalformedURLException;
--
-+import java.net.URL;
- import java.util.MissingResourceException;
- import java.util.PropertyResourceBundle;
- import java.util.ResourceBundle;
- import java.util.StringTokenizer;
- import java.util.Vector;
--
--import com.sun.org.apache.xml.internal.resolver.helpers.Debug;
--import com.sun.org.apache.xml.internal.resolver.helpers.BootstrapResolver;
--import com.sun.org.apache.xml.internal.resolver.Catalog;
-+import sun.reflect.misc.ReflectUtil;
-
- /**
- * CatalogManager provides an interface to the catalog properties.
-@@ -687,7 +684,7 @@
- catalog = new Catalog();
- } else {
- try {
-- catalog = (Catalog) Class.forName(catalogClassName).newInstance();
-+ catalog = (Catalog) ReflectUtil.forName(catalogClassName).newInstance();
- } catch (ClassNotFoundException cnfe) {
- 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-07-15 21:46:30.000000000 -0700
-@@ -23,24 +23,21 @@
-
- package com.sun.org.apache.xml.internal.resolver.readers;
-
--import java.util.Hashtable;
-+import com.sun.org.apache.xml.internal.resolver.Catalog;
-+import com.sun.org.apache.xml.internal.resolver.CatalogException;
-+import com.sun.org.apache.xml.internal.resolver.helpers.Namespaces;
- import java.io.IOException;
- import java.io.InputStream;
-+import java.net.MalformedURLException;
- import java.net.URL;
- import java.net.URLConnection;
--import java.net.MalformedURLException;
--
--import javax.xml.parsers.DocumentBuilderFactory;
-+import java.util.Hashtable;
- import javax.xml.parsers.DocumentBuilder;
-+import javax.xml.parsers.DocumentBuilderFactory;
- import javax.xml.parsers.ParserConfigurationException;
--
--import com.sun.org.apache.xml.internal.resolver.Catalog;
--import com.sun.org.apache.xml.internal.resolver.CatalogException;
--import com.sun.org.apache.xml.internal.resolver.readers.CatalogReader;
--import com.sun.org.apache.xml.internal.resolver.helpers.Namespaces;
--
--import org.xml.sax.SAXException;
- import org.w3c.dom.*;
-+import org.xml.sax.SAXException;
-+import sun.reflect.misc.ReflectUtil;
-
- /**
- * A DOM-based CatalogReader.
-@@ -199,7 +196,7 @@
- DOMCatalogParser domParser = null;
-
- try {
-- domParser = (DOMCatalogParser) Class.forName(domParserClass).newInstance();
-+ domParser = (DOMCatalogParser) ReflectUtil.forName(domParserClass).newInstance();
- } catch (ClassNotFoundException cnfe) {
- 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-07-15 21:46:30.000000000 -0700
-@@ -23,19 +23,21 @@
-
- package com.sun.org.apache.xml.internal.resolver.readers;
-
--import java.util.Hashtable;
--import java.io.IOException;
-+import com.sun.org.apache.xml.internal.resolver.Catalog;
-+import com.sun.org.apache.xml.internal.resolver.CatalogException;
-+import com.sun.org.apache.xml.internal.resolver.CatalogManager;
-+import com.sun.org.apache.xml.internal.resolver.helpers.Debug;
- import java.io.FileNotFoundException;
-+import java.io.IOException;
- import java.io.InputStream;
-+import java.net.MalformedURLException;
- import java.net.URL;
- import java.net.URLConnection;
--import java.net.MalformedURLException;
- import java.net.UnknownHostException;
--
-+import java.util.Hashtable;
- import javax.xml.parsers.ParserConfigurationException;
--import javax.xml.parsers.SAXParserFactory;
- import javax.xml.parsers.SAXParser;
--
-+import javax.xml.parsers.SAXParserFactory;
- import org.xml.sax.AttributeList;
- import org.xml.sax.Attributes;
- import org.xml.sax.ContentHandler;
-@@ -45,12 +47,7 @@
- import org.xml.sax.Locator;
- import org.xml.sax.Parser;
- import org.xml.sax.SAXException;
--
--import com.sun.org.apache.xml.internal.resolver.Catalog;
--import com.sun.org.apache.xml.internal.resolver.CatalogManager;
--import com.sun.org.apache.xml.internal.resolver.CatalogException;
--import com.sun.org.apache.xml.internal.resolver.readers.CatalogReader;
--import com.sun.org.apache.xml.internal.resolver.helpers.Debug;
-+import sun.reflect.misc.ReflectUtil;
-
- /**
- * A SAX-based CatalogReader.
-@@ -246,7 +243,7 @@
- }
- parser.parse(new InputSource(is), spHandler);
- } else {
-- Parser parser = (Parser) Class.forName(parserClass).newInstance();
-+ Parser parser = (Parser) ReflectUtil.forName(parserClass).newInstance();
- parser.setDocumentHandler(this);
- if (bResolver != null) {
- parser.setEntityResolver(bResolver);
-@@ -352,7 +349,7 @@
-
- try {
- saxParser = (SAXCatalogParser)
-- Class.forName(saxParserClass).newInstance();
-+ ReflectUtil.forName(saxParserClass).newInstance();
-
- saxParser.setCatalog(catalog);
- saxParser.startDocument();
-@@ -413,7 +410,7 @@
-
- try {
- saxParser = (SAXCatalogParser)
-- Class.forName(saxParserClass).newInstance();
-+ ReflectUtil.forName(saxParserClass).newInstance();
-
- 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-07-15 21:46:30.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-07-15 21:46:30.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-07-15 21:46:30.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 2014-07-15 21:46:30.000000000 -0700
-@@ -25,12 +25,15 @@
- import com.sun.org.apache.xalan.internal.XalanConstants;
- import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
- import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
-+import com.sun.org.apache.xalan.internal.utils.XMLSecurityManager;
- import java.util.HashMap;
-+
- import javax.xml.XMLConstants;
- import javax.xml.parsers.FactoryConfigurationError;
- import javax.xml.parsers.ParserConfigurationException;
- import javax.xml.parsers.SAXParserFactory;
- import org.xml.sax.SAXException;
-+import org.xml.sax.SAXNotRecognizedException;
- import org.xml.sax.XMLReader;
- import org.xml.sax.helpers.XMLReaderFactory;
-
-@@ -63,11 +66,15 @@
- private HashMap m_inUse;
-
- private boolean m_useServicesMechanism = true;
-+
-+ private boolean _secureProcessing;
- /**
- * protocols allowed for external DTD references in source file and/or stylesheet.
- */
- private String _accessExternalDTD = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
-
-+ private XMLSecurityManager _xmlSecurityManager;
-+
- /**
- * Hidden constructor
- */
-@@ -118,7 +125,12 @@
- // TransformerFactory creates a reader via the
- // XMLReaderFactory if setXMLReader is not used
- reader = XMLReaderFactory.createXMLReader();
--
-+ try {
-+ reader.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, _secureProcessing);
-+ } catch (SAXNotRecognizedException e) {
-+ System.err.println("Warning: " + reader.getClass().getName() + ": "
-+ + e.getMessage());
-+ }
- } catch (Exception e) {
- try {
- // If unable to create an instance, let's try to use
-@@ -164,6 +176,21 @@
- + se.getMessage());
- }
-
-+ try {
-+ if (_xmlSecurityManager != null) {
-+ for (XMLSecurityManager.Limit limit : XMLSecurityManager.Limit.values()) {
-+ reader.setProperty(limit.apiProperty(),
-+ _xmlSecurityManager.getLimitValueAsString(limit));
-+ }
-+ if (_xmlSecurityManager.printEntityCountInfo()) {
-+ reader.setProperty(XalanConstants.JDK_ENTITY_COUNT_INFO, XalanConstants.JDK_YES);
-+ }
-+ }
-+ } catch (SAXException se) {
-+ System.err.println("Warning: " + reader.getClass().getName() + ": "
-+ + se.getMessage());
-+ }
-+
- return reader;
- }
-
-@@ -195,11 +222,22 @@
- }
-
- /**
-+ * Set feature
-+ */
-+ public void setFeature(String name, boolean value) {
-+ if (name.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
-+ _secureProcessing = value;
-+ }
-+ }
-+
-+ /**
- * Get property value
- */
-- public String getProperty(String name) {
-+ public Object getProperty(String name) {
- if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
- return _accessExternalDTD;
-+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
-+ return _xmlSecurityManager;
- }
- return null;
- }
-@@ -207,9 +245,11 @@
- /**
- * Set property.
- */
-- public void setProperty(String name, String value) {
-+ public void setProperty(String name, Object value) {
- if (name.equals(XMLConstants.ACCESS_EXTERNAL_DTD)) {
- _accessExternalDTD = (String)value;
-+ } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
-+ _xmlSecurityManager = (XMLSecurityManager)value;
- }
- }
- }
---- ./jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java 2013-09-06 11:23:03.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java 2014-07-15 21:46:30.000000000 -0700
-@@ -103,8 +103,7 @@
- * the DTMManager, it really is a proxy for this object, which
- * is the real DTMManager.
- */
-- protected DTMManager m_dtmManager = DTMManager.newInstance(
-- com.sun.org.apache.xpath.internal.objects.XMLStringFactoryImpl.getFactory());
-+ protected DTMManager m_dtmManager = null;
-
- /**
- * Return the DTMManager object. Though XPathContext context extends
---- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java 2013-09-06 11:23:03.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java 2014-07-15 21:46:30.000000000 -0700
-@@ -33,6 +33,7 @@
- import com.sun.org.apache.xpath.internal.objects.XNodeSet;
- import com.sun.org.apache.xpath.internal.res.XPATHErrorResources;
- import com.sun.org.apache.xalan.internal.res.XSLMessages;
-+import com.sun.org.apache.xalan.internal.utils.FeatureManager;
-
- import com.sun.org.apache.xpath.internal.functions.FuncExtFunction;
- import java.util.Vector;
-@@ -54,9 +55,12 @@
- }
-
- public JAXPExtensionsProvider(XPathFunctionResolver resolver,
-- boolean featureSecureProcessing ) {
-+ boolean featureSecureProcessing, FeatureManager featureManager ) {
- this.resolver = resolver;
-- this.extensionInvocationDisabled = featureSecureProcessing;
-+ if (featureSecureProcessing &&
-+ !featureManager.isFeatureEnabled(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION)) {
-+ this.extensionInvocationDisabled = true;
-+ }
- }
-
- /**
---- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java 2013-09-06 11:23:03.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java 2014-07-15 21:46:30.000000000 -0700
-@@ -30,6 +30,7 @@
- import com.sun.org.apache.xpath.internal.res.XPATHErrorResources;
- import com.sun.org.apache.xalan.internal.res.XSLMessages;
- import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
-+import com.sun.org.apache.xalan.internal.utils.FeatureManager;
-
- import javax.xml.namespace.NamespaceContext;
- import javax.xml.namespace.QName;
-@@ -67,33 +68,36 @@
- private boolean featureSecureProcessing = false;
-
- private boolean useServicesMechanism = true;
-+
-+ private final FeatureManager featureManager;
-+
- /** Protected constructor to prevent direct instantiation; use compile()
- * from the context.
- */
-- protected XPathExpressionImpl() { };
-+ protected XPathExpressionImpl() {
-+ this(null, null, null, null,
-+ false, true, new FeatureManager());
-+ };
-
- protected XPathExpressionImpl(com.sun.org.apache.xpath.internal.XPath xpath,
- JAXPPrefixResolver prefixResolver,
- XPathFunctionResolver functionResolver,
- XPathVariableResolver variableResolver ) {
-- this.xpath = xpath;
-- this.prefixResolver = prefixResolver;
-- this.functionResolver = functionResolver;
-- this.variableResolver = variableResolver;
-- this.featureSecureProcessing = false;
-+ this(xpath, prefixResolver, functionResolver, variableResolver,
-+ false, true, new FeatureManager());
- };
-
- protected XPathExpressionImpl(com.sun.org.apache.xpath.internal.XPath xpath,
-- JAXPPrefixResolver prefixResolver,
-- XPathFunctionResolver functionResolver,
-- XPathVariableResolver variableResolver,
-- boolean featureSecureProcessing, boolean useServicesMechanism ) {
-+ JAXPPrefixResolver prefixResolver,XPathFunctionResolver functionResolver,
-+ XPathVariableResolver variableResolver, boolean featureSecureProcessing,
-+ boolean useServicesMechanism, FeatureManager featureManager ) {
- this.xpath = xpath;
- this.prefixResolver = prefixResolver;
- this.functionResolver = functionResolver;
- this.variableResolver = variableResolver;
- this.featureSecureProcessing = featureSecureProcessing;
- this.useServicesMechanism = useServicesMechanism;
-+ this.featureManager = featureManager;
- };
-
- public void setXPath (com.sun.org.apache.xpath.internal.XPath xpath ) {
-@@ -111,7 +115,7 @@
- com.sun.org.apache.xpath.internal.XPathContext xpathSupport = null;
- if ( functionResolver != null ) {
- JAXPExtensionsProvider jep = new JAXPExtensionsProvider(
-- functionResolver, featureSecureProcessing );
-+ functionResolver, featureSecureProcessing, featureManager );
- xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext( jep );
- } else {
- xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext();
---- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java 2013-09-06 11:23:04.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java 2014-07-15 21:46:30.000000000 -0700
-@@ -24,6 +24,8 @@
- import com.sun.org.apache.xalan.internal.XalanConstants;
- import com.sun.org.apache.xpath.internal.res.XPATHErrorResources;
- import com.sun.org.apache.xalan.internal.res.XSLMessages;
-+import com.sun.org.apache.xalan.internal.utils.FeatureManager;
-+import com.sun.org.apache.xalan.internal.utils.FeaturePropertyBase;
-
- import javax.xml.XMLConstants;
- import javax.xml.xpath.XPathFactory;
-@@ -68,6 +70,8 @@
-
- private boolean _useServicesMechanism = true;
-
-+ private final FeatureManager _featureManager;
-+
- public XPathFactoryImpl() {
- this(true);
- }
-@@ -77,9 +81,12 @@
- }
-
- public XPathFactoryImpl(boolean useServicesMechanism) {
-+ _featureManager = new FeatureManager();
- if (System.getSecurityManager() != null) {
- _isSecureMode = true;
- _isNotSecureProcessing = false;
-+ _featureManager.setValue(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
-+ FeaturePropertyBase.State.FSP, XalanConstants.FEATURE_FALSE);
- }
- this._useServicesMechanism = useServicesMechanism;
- }
-@@ -131,7 +138,8 @@
- public javax.xml.xpath.XPath newXPath() {
- return new com.sun.org.apache.xpath.internal.jaxp.XPathImpl(
- xPathVariableResolver, xPathFunctionResolver,
-- !_isNotSecureProcessing, _useServicesMechanism );
-+ !_isNotSecureProcessing, _useServicesMechanism,
-+ _featureManager );
- }
-
- /**
-@@ -181,6 +189,10 @@
- }
-
- _isNotSecureProcessing = !value;
-+ if (value && _featureManager != null) {
-+ _featureManager.setValue(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
-+ FeaturePropertyBase.State.FSP, XalanConstants.FEATURE_FALSE);
-+ }
-
- // all done processing feature
- return;
-@@ -192,6 +204,11 @@
- return;
- }
-
-+ if (_featureManager != null &&
-+ _featureManager.setValue(name, FeaturePropertyBase.State.APIPROPERTY, value)) {
-+ return;
-+ }
-+
- // unknown feature
- String fmsg = XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_FEATURE_UNKNOWN,
-@@ -240,6 +257,14 @@
- if (name.equals(XalanConstants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
- return _useServicesMechanism;
- }
-+
-+ /** Check to see if the property is managed by the security manager **/
-+ String propertyValue = (_featureManager != null) ?
-+ _featureManager.getValueAsString(name) : null;
-+ if (propertyValue != null) {
-+ return _featureManager.isFeatureEnabled(name);
-+ }
-+
- // unknown feature
- String fmsg = XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_GETTING_UNKNOWN_FEATURE,
---- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java 2013-09-06 11:23:04.000000000 -0700
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java 2014-07-15 21:46:30.000000000 -0700
-@@ -35,6 +35,7 @@
- import com.sun.org.apache.xpath.internal.res.XPATHErrorResources;
- import com.sun.org.apache.xalan.internal.res.XSLMessages;
- import com.sun.org.apache.xalan.internal.utils.FactoryImpl;
-+import com.sun.org.apache.xalan.internal.utils.FeatureManager;
-
- import org.w3c.dom.Node;
- import org.w3c.dom.Document;
-@@ -70,18 +71,20 @@
- // extensions function need to throw XPathFunctionException
- private boolean featureSecureProcessing = false;
- private boolean useServiceMechanism = true;
-+ private final FeatureManager featureManager;
-
- XPathImpl( XPathVariableResolver vr, XPathFunctionResolver fr ) {
-- this.origVariableResolver = this.variableResolver = vr;
-- this.origFunctionResolver = this.functionResolver = fr;
-+ this(vr, fr, false, true, new FeatureManager());
- }
-
- XPathImpl( XPathVariableResolver vr, XPathFunctionResolver fr,
-- boolean featureSecureProcessing, boolean useServiceMechanism ) {
-+ boolean featureSecureProcessing, boolean useServiceMechanism,
-+ FeatureManager featureManager) {
- this.origVariableResolver = this.variableResolver = vr;
- this.origFunctionResolver = this.functionResolver = fr;
- this.featureSecureProcessing = featureSecureProcessing;
- this.useServiceMechanism = useServiceMechanism;
-+ this.featureManager = featureManager;
- }
-
- /**
-@@ -190,7 +193,7 @@
- com.sun.org.apache.xpath.internal.XPathContext xpathSupport = null;
- if ( functionResolver != null ) {
- JAXPExtensionsProvider jep = new JAXPExtensionsProvider(
-- functionResolver, featureSecureProcessing );
-+ functionResolver, featureSecureProcessing, featureManager );
- xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext( jep );
- } else {
- xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext();
-@@ -391,7 +394,7 @@
- // Can have errorListener
- XPathExpressionImpl ximpl = new XPathExpressionImpl (xpath,
- prefixResolver, functionResolver, variableResolver,
-- featureSecureProcessing, useServiceMechanism );
-+ featureSecureProcessing, useServiceMechanism, featureManager );
- return ximpl;
- } catch ( javax.xml.transform.TransformerException te ) {
- throw new XPathExpressionException ( te ) ;
---- ./jaxp/src/javax/xml/stream/FactoryFinder.java 2013-09-06 11:23:04.000000000 -0700
-+++ ./jaxp/src/javax/xml/stream/FactoryFinder.java 2014-07-15 21:46:30.000000000 -0700
-@@ -204,13 +204,15 @@
- * a property name
- * @param fallbackClassName Implementation class name, if nothing else
- * is found. Use null to mean no fallback.
-+ * @param standardId Indicate whether the factoryId is standard
-+ * or user specified.
- *
- * Package private so this code can be shared.
- */
-- static Object find(String factoryId, String fallbackClassName)
-+ static Object find(String factoryId, String fallbackClassName, boolean standardId)
- throws ConfigurationError
- {
-- return find(factoryId, null, fallbackClassName);
-+ return find(factoryId, null, fallbackClassName, standardId);
- }
-
- /**
-@@ -227,23 +229,34 @@
- * @param fallbackClassName Implementation class name, if nothing else
- * is found. Use null to mean no fallback.
- *
-+ * @param standardId Indicate whether the factoryId is standard
-+ * or user specified.
-+ *
- * Package private so this code can be shared.
- */
-- static Object find(String factoryId, ClassLoader cl, String fallbackClassName)
-+ static Object find(String factoryId, ClassLoader cl, String fallbackClassName,
-+ boolean standardId)
- throws ConfigurationError
- {
- dPrint("find factoryId =" + factoryId);
-
- // Use the system property first
- try {
-- String systemProp = ss.getSystemProperty(factoryId);
-+ String systemProp;
-+ if (standardId) {
-+ systemProp = ss.getSystemProperty(factoryId);
-+ } else {
-+ systemProp = System.getProperty(factoryId);
-+ }
-+
- if (systemProp != null) {
- dPrint("found system property, value=" + systemProp);
- return newInstance(systemProp, null, true);
- }
- }
- catch (SecurityException se) {
-- if (debug) se.printStackTrace();
-+ throw new ConfigurationError(
-+ "Failed to read factoryId '" + factoryId + "'", se);
- }
-
- // 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 2014-07-15 21:46:30.000000000 -0700
-@@ -60,9 +60,7 @@
- public static XMLEventFactory newInstance()
- throws FactoryConfigurationError
- {
-- return (XMLEventFactory) FactoryFinder.find(
-- JAXPFACTORYID,
-- DEFAULIMPL);
-+ return (XMLEventFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
- }
-
- /**
-@@ -93,9 +91,7 @@
- public static XMLEventFactory newFactory()
- throws FactoryConfigurationError
- {
-- return (XMLEventFactory) FactoryFinder.find(
-- JAXPFACTORYID,
-- DEFAULIMPL);
-+ return (XMLEventFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
- }
-
- /**
-@@ -118,7 +114,8 @@
- throws FactoryConfigurationError {
- try {
- //do not fallback if given classloader can't find the class, throw exception
-- return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader, null);
-+ return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader,
-+ null, factoryId.equals(JAXPFACTORYID) ? true : false);
- } catch (FactoryFinder.ConfigurationError e) {
- throw new FactoryConfigurationError(e.getException(),
- e.getMessage());
-@@ -145,7 +142,8 @@
- throws FactoryConfigurationError {
- try {
- //do not fallback if given classloader can't find the class, throw exception
-- return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader, null);
-+ return (XMLEventFactory) FactoryFinder.find(factoryId, classLoader,
-+ null, factoryId.equals(JAXPFACTORYID) ? true : false);
- } catch (FactoryFinder.ConfigurationError e) {
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -139,6 +139,7 @@
- public static final String ALLOCATOR=
- "javax.xml.stream.allocator";
-
-+ static final String JAXPFACTORYID = "javax.xml.stream.XMLInputFactory";
- static final String DEFAULIMPL = "com.sun.xml.internal.stream.XMLInputFactoryImpl";
-
- protected XMLInputFactory(){}
-@@ -150,9 +151,7 @@
- public static XMLInputFactory newInstance()
- throws FactoryConfigurationError
- {
-- return (XMLInputFactory) FactoryFinder.find(
-- "javax.xml.stream.XMLInputFactory",
-- DEFAULIMPL);
-+ return (XMLInputFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
- }
-
- /**
-@@ -183,9 +182,7 @@
- public static XMLInputFactory newFactory()
- throws FactoryConfigurationError
- {
-- return (XMLInputFactory) FactoryFinder.find(
-- "javax.xml.stream.XMLInputFactory",
-- DEFAULIMPL);
-+ return (XMLInputFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
- }
-
- /**
-@@ -208,7 +205,8 @@
- throws FactoryConfigurationError {
- try {
- //do not fallback if given classloader can't find the class, throw exception
-- return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader, null);
-+ return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader,
-+ null, factoryId.equals(JAXPFACTORYID) ? true : false);
- } catch (FactoryFinder.ConfigurationError e) {
- throw new FactoryConfigurationError(e.getException(),
- e.getMessage());
-@@ -235,7 +233,8 @@
- throws FactoryConfigurationError {
- try {
- //do not fallback if given classloader can't find the class, throw exception
-- return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader, null);
-+ return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader,
-+ null, factoryId.equals(JAXPFACTORYID) ? true : false);
- } catch (FactoryFinder.ConfigurationError e) {
- 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 2014-07-15 21:46:30.000000000 -0700
-@@ -115,6 +115,7 @@
- public static final String IS_REPAIRING_NAMESPACES=
- "javax.xml.stream.isRepairingNamespaces";
-
-+ static final String JAXPFACTORYID = "javax.xml.stream.XMLOutputFactory";
- static final String DEFAULIMPL = "com.sun.xml.internal.stream.XMLOutputFactoryImpl";
-
- protected XMLOutputFactory(){}
-@@ -126,8 +127,7 @@
- public static XMLOutputFactory newInstance()
- throws FactoryConfigurationError
- {
-- return (XMLOutputFactory) FactoryFinder.find("javax.xml.stream.XMLOutputFactory",
-- DEFAULIMPL);
-+ return (XMLOutputFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
- }
-
- /**
-@@ -158,8 +158,7 @@
- public static XMLOutputFactory newFactory()
- throws FactoryConfigurationError
- {
-- return (XMLOutputFactory) FactoryFinder.find("javax.xml.stream.XMLOutputFactory",
-- DEFAULIMPL);
-+ return (XMLOutputFactory) FactoryFinder.find(JAXPFACTORYID, DEFAULIMPL, true);
- }
-
- /**
-@@ -181,7 +180,8 @@
- throws FactoryConfigurationError {
- try {
- //do not fallback if given classloader can't find the class, throw exception
-- return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader, null);
-+ return (XMLInputFactory) FactoryFinder.find(factoryId, classLoader,
-+ null, factoryId.equals(JAXPFACTORYID) ? true : false);
- } catch (FactoryFinder.ConfigurationError e) {
- throw new FactoryConfigurationError(e.getException(),
- e.getMessage());
-@@ -210,7 +210,8 @@
- throws FactoryConfigurationError {
- try {
- //do not fallback if given classloader can't find the class, throw exception
-- return (XMLOutputFactory) FactoryFinder.find(factoryId, classLoader, null);
-+ return (XMLOutputFactory) FactoryFinder.find(factoryId, classLoader,
-+ null, factoryId.equals(JAXPFACTORYID) ? true : false);
- } catch (FactoryFinder.ConfigurationError e) {
- throw new FactoryConfigurationError(e.getException(),
- e.getMessage());
---- ./jaxp/src/javax/xml/xpath/XPathException.java 2013-09-06 11:23:05.000000000 -0700
-+++ ./jaxp/src/javax/xml/xpath/XPathException.java 2014-07-15 21:46:30.000000000 -0700
-@@ -26,6 +26,11 @@
- package javax.xml.xpath;
-
- import java.io.PrintWriter;
-+import java.io.IOException;
-+import java.io.ObjectInputStream;
-+import java.io.ObjectOutputStream;
-+import java.io.ObjectStreamField;
-+import java.io.InvalidClassException;
-
- /**
- * <code>XPathException</code> represents a generic XPath exception.</p>
-@@ -36,7 +41,9 @@
- */
- public class XPathException extends Exception {
-
-- private final Throwable cause;
-+ private static final ObjectStreamField[] serialPersistentFields = {
-+ new ObjectStreamField( "cause", Throwable.class )
-+ };
-
- /**
- * <p>Stream Unique Identifier.</p>
-@@ -62,7 +69,6 @@
- if ( message == null ) {
- throw new NullPointerException ( "message can't be null");
- }
-- this.cause = null;
- }
-
- /**
-@@ -77,8 +83,7 @@
- * @throws NullPointerException if <code>cause</code> is <code>null</code>.
- */
- public XPathException(Throwable cause) {
-- super();
-- this.cause = cause;
-+ super(cause);
- if ( cause == null ) {
- throw new NullPointerException ( "cause can't be null");
- }
-@@ -90,7 +95,47 @@
- * @return Cause of this XPathException.
- */
- public Throwable getCause() {
-- return cause;
-+ return super.getCause();
-+ }
-+
-+ /**
-+ * Writes "cause" field to the stream.
-+ * The cause is got from the parent class.
-+ *
-+ * @param out stream used for serialization.
-+ * @throws IOException thrown by <code>ObjectOutputStream</code>
-+ *
-+ */
-+ private void writeObject(ObjectOutputStream out)
-+ throws IOException
-+ {
-+ ObjectOutputStream.PutField fields = out.putFields();
-+ fields.put("cause", (Throwable) super.getCause());
-+ out.writeFields();
-+ }
-+
-+ /**
-+ * Reads the "cause" field from the stream.
-+ * And initializes the "cause" if it wasn't
-+ * done before.
-+ *
-+ * @param in stream used for deserialization
-+ * @throws IOException thrown by <code>ObjectInputStream</code>
-+ * @throws ClassNotFoundException thrown by <code>ObjectInputStream</code>
-+ */
-+ private void readObject(ObjectInputStream in)
-+ throws IOException, ClassNotFoundException
-+ {
-+ ObjectInputStream.GetField fields = in.readFields();
-+ Throwable scause = (Throwable) fields.get("cause", null);
-+
-+ if (super.getCause() == null && scause != null) {
-+ try {
-+ super.initCause(scause);
-+ } catch(IllegalStateException e) {
-+ throw new InvalidClassException("Inconsistent state: two causes");
-+ }
-+ }
- }
-
- /**
---- ./jaxws/.hgtags 2013-09-06 11:23:51.000000000 -0700
-+++ ./jaxws/.hgtags 2014-10-28 20:19:33.000000000 -0700
-@@ -123,6 +123,7 @@
- 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
- c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
- d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
-+ce6378e3c791c56b98cbf161804a07d0225b41c0 7u0
- 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
- 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
- 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
-@@ -302,6 +303,22 @@
- 0cd0d4e7331f7fc9f9ee77f2275113571bcf67cf jdk7u25-b09
- 105cdfd4f40837917d0065e3e58052d2854df7da jdk7u25-b10
- 6de7fec036abf91ce962c74f11a6266491df3fd8 jdk7u25-b11
-+a367ebf0c21512867f4ab5cdd206dd8c7817c004 jdk7u14-b16
-+74c34f35912d8d7145b3ff34fefea2d2f189f2b4 jdk7u14-b17
-+c93a35b3638f45de91013d65543217a002577684 jdk7u14-b18
-+82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19
-+82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19
-+d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19
-+dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20
-+97bbac299eb801709a924fe777b3ee9c96829d8b jdk7u14-b21
-+6e74b3e1773cfbac99998431a5a54c70baaf1dc5 jdk7u14-b22
-+e9bbdf789d2b512550e0ca80629980e96f02146d jdk7u40-b23
-+adaf9cf486fab1b14c5af9fc6525565760bb9c11 jdk7u40-b24
-+aafab1efbd4ced5e05695aa1887813f9f5de9d5c jdk7u40-b25
-+6581f9739031120bb7515d3b09fa3501653d11af jdk7u40-b26
-+46ebac943288218b14d7ce3df23aa42a70fa4cf9 jdk7u40-b27
-+016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28
-+15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29
- 4c5d242efa0d6e0cdb688e41e722bff671dfbfec jdk7u25-b12
- 6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13
- 03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14
-@@ -343,3 +360,146 @@
- 89f6c9663d75d9e4b672aed16f885b84232e9c93 jdk7u40-b42
- 3ee85b3793de16855e20272336a3565af8477b6b jdk7u40-b43
- cbeef786ce489096c39ec5effee4f8f9e770b4af jdk7u40-b60
-+4ee34d2cf2d84d0e1f5f20381ade525665ae424c jdk7u40-b61
-+b42a4cb742cf76f6c02d105349a7e8111ab8d68b jdk7u40-b62
-+000becfcb945d8592cfdef6ef1704b532af56762 jdk7u45-b01
-+817632baca26f7566e36c7708455494c15113d88 jdk7u45-b02
-+f65baba9400aec6cb29bc06b3139623bb4663225 jdk7u45-b03
-+80ff2468f520ed1940915815ceb85e05bd2bc568 jdk7u45-b04
-+1128d3934b643660a219532aa1ca554877d89375 jdk7u45-b05
-+8da3d41d946925a07a9f1001795959bfdb4c02c6 jdk7u45-b06
-+38f5b376c38035f13ede456f158ee26d0cf8d99c jdk7u45-b07
-+86f3efd1edae3c0f47ad14bef992e7566eaa94d4 jdk7u45-b08
-+ab835f7247e40dd7fb457830eaa31c550b434413 jdk7u45-b09
-+bbd594e6cf45ebfc37c71e217772b7f37a9c5750 jdk7u45-b10
-+c01eab96821e3c0315c4637e61a8015cbfe63b6a jdk7u45-b11
-+05f1274a8aa019584b4ceb05c73fc89bf7b7f4de jdk7u45-b12
-+3271849829b7c8ac32f6bb17b763d8a85a1a0a32 jdk7u45-b13
-+842dd63be9c633b8448e1837a5bb7b803dfdaad9 jdk7u45-b14
-+93a3fb090be58a5a45464f866a7093f24205dae2 jdk7u45-b15
-+5524cced32d3959d95ed414add230273bc10c38d jdk7u45-b16
-+a8baf22b5972e269a97f7b3b7eec2ad63a8c5aed jdk7u45-b17
-+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
-+2240523feb968d7921e22f6730c299246a4125d0 jdk7u51-b03
-+c4f7cc35e47a4db7f380d62127dd2b49713f5552 jdk7u51-b04
-+f8f0617c0310b638855add08df58c5b9cd7e2dcb jdk7u51-b05
-+49fc29e8890c52e771beb3fd9bf3cbb9ecbf5f5e jdk7u51-b06
-+da128632f015df99d0f6a53547484dbe44f722fb jdk7u51-b07
-+71a314d55844bd6fe18aed56ce065b8df5c5cb82 jdk7u51-b08
-+3b53d5ea0aec473b637cd0e49f227304bac848a7 jdk7u51-b09
-+53a566a724e59f31bbd25a6a21f0f36adb36e82b jdk7u51-b10
-+708507f4795cad1f0cf7e19ff2dc16fe9d441754 jdk7u51-b11
-+7c7c2ea4b6808d0abf7fd48d11440d75b0c08d3a jdk7u51-b12
-+81a1b110f70c37d2c2f0de7c0ef3bd2d04aba475 jdk7u51-b13
-+5dbeb9983f104be717da35c9b14923d71dd248d7 jdk7u51-b30
-+eb79f394916efba85f4f6c7ef562966699f2c1e8 jdk7u51-b31
-+b2e40219fdcb579d9e10bf01bbd1f05ddcc936fb jdk7u51-b33
-+f782f513bb1c74640fe0f4711fec6a417845e9e9 jdk7u51-b34
-+7c7c2ea4b6808d0abf7fd48d11440d75b0c08d3a jdk7u55-b00
-+c5eb0c2a0f9715b510bc641506fb90df9bf05ab0 jdk7u55-b01
-+a257072fc2aa482abd6ffa28e235dbe532af6d00 jdk7u55-b02
-+2916fdfc475bf29bc702887bf5ba02df67c98916 jdk7u55-b03
-+f4759b4547602b3bc865db8c5f356f46979c6389 jdk7u55-b04
-+8a8dfdbc66149b89f804c5a50e4692c2520569ae jdk7u65-b00
-+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
-+81d0f297557c4a876727cabeb2bfcdf066a1fc9d jdk7u55-b14
-+f616603ab693f6629c2994f6006ed4a21a428d8e jdk7u55-b15
-+2d103c97c9bd0b3357e6d5e2b5b9ffb64c271288 jdk7u55-b31
-+b15b4084288fa4ea9caf7f6b4e79d164c77bb1d6 jdk7u55-b32
-+efd71c6ca0832e894b7e1619111860062fa96458 jdk7u55-b33
-+485d7912bc20775bda670ea2236c883366590dd7 jdk7u55-b34
-+587be38f9a6d60fbefc92dbe9fbd4c83d579c680 jdk7u55-b35
-+62332eaec2ff8fc8bece2a905554ac08e375a661 jdk7u55-b36
-+cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
-+f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01
-+8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02
-+d4ba4e1ed3ecdef1ef7c3b7aaf62ff69fc105cb2 jdk7u60-b03
-+bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u60-b04
-+30afd3e2e7044b2aa87ce00ab4301990e6d94d27 jdk7u60-b05
-+dc6017fb9cde43bce92d403abc2821b741cf977c jdk7u60-b06
-+0380cb9d4dc27ed8e2c4fc3502e3d94b0ae0c02d jdk7u60-b07
-+d3896e59b04dc4022c3e0d04e8750b281249bbd2 jdk7u60-b08
-+c85645aa77cedabeeb6e01373cdd81afd56c602e jdk7u60-b09
-+79501d4561e4cfa96fd77e2e92eb6a1b6ad61005 jdk7u60-b10
-+5d848774565b5e188d7ba915ce1cb09d8f3fdb87 jdk7u60-b11
-+9d34f726e35b321072ce5bd0aad2e513b9fc972f jdk7u60-b12
-+d941a701cf5ca11b2777fd1d0238e05e3c963e89 jdk7u60-b13
-+43b5a7cf08e7ee018b1fa42a89510b4c381dc4c5 jdk7u60-b14
-+d00389bf5439e5c42599604d2ebc909d26df8dcf jdk7u60-b15
-+2fc16d3a321212abc0cc93462b22c4be7f693ab9 jdk7u60-b16
-+b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17
-+b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b18
-+23598a667bb89b57d5abab5b37781a0952e16cf9 jdk7u65-b01
-+1d21eb9011a060c7761c9a8a53e69d58bbea4893 jdk7u60-b19
-+39e67887a3b112bf74f84df2aac0f46c65bfb005 jdk7u60-b30
-+dfc2c4b9b16bd2d68435ddc9bb12036982021844 jdk7u60-b31
-+0e17943c39fadb810b4dd2e9ac732503b86043f4 jdk7u60-b32
-+910559d7f754d8fd6ab80a627869877443358316 jdk7u60-b33
-+8ac19021e6af5d92b46111a6c41430f36ccdb901 jdk7u65-b02
-+a70d681bc273a110d10cf3c4f9b35b25ca6a600f jdk7u65-b03
-+7cd17f96988509e99fbb71003aeb76d92b638fef jdk7u65-b04
-+7bafb24c6466999bc08742b160d0e450bc12a2c5 jdk7u65-b05
-+35b31c516cab0a81fa9d2a119ec101be3f5a2969 jdk7u65-b06
-+eb89c1c30a93b1d43cbc1b7520bca46d31d0829a jdk7u65-b07
-+d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u65-b08
-+e4cc1e93c6332c8463e75a25c3d735884d185259 jdk7u65-b09
-+d10ec17267415303a71d358ae6202369db77ba96 jdk7u65-b10
-+2f5dcee6d56b00551db21408ebad2ff2faad7c7a jdk7u65-b11
-+f03350485cd388620981bb7e7faa2d1890d11a1b jdk7u65-b12
-+471f883e9830d8341248b99da7c9cfab9fcc94d6 jdk7u65-b13
-+11deffa2096f08dab69de13d4fcf361c6d252636 jdk7u65-b14
-+39ad61a579fd824fbec1bec4e071376449ba8195 jdk7u65-b15
-+198bf1acd262f2c16715d3be5e33d7b8de1e7776 jdk7u65-b16
-+df4dc644fe344e973fc1692c28683eec8ba82600 jdk7u65-b17
-+0e0ca87a6d5212a0885f0c8c00b8f7cf24a64d89 jdk7u65-b30
-+dedfc93eeb5f4b28ad1a91902a0676aef0937e42 jdk7u65-b18
-+db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b19
-+0cd66509e11335fac490076cbdcb2f47c592de86 jdk7u65-b32
-+28d868d40df0d420b87698e1215e5039d24a8ae5 jdk7u65-b20
-+1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01
-+db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b40
-+190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31
-+6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33
-+d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00
-+1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01
-+04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09
-+73d97ba8b2d94c904f2b087b9f28664eb19e9ce2 jdk7u66-b10
-+7ecf8d9df00c185f381fa8cb92ea66fe1e5798ca jdk7u66-b11
-+9ac1d99f712a04548d7e5d784f06c87e35023080 jdk7u66-b12
-+f562dd8fb2b211a11b9a84849995d61b541723c3 jdk7u66-b13
-+ae584331109f291e03af72cc9fcbbe5f8f789ab1 jdk7u66-b14
-+36461c772d3101a8cb1eca16a9c81ed53218a4c9 jdk7u66-b15
-+19ed8a653a3e8c6536fd1090c14f93e690eda7a3 jdk7u66-b16
-+ea1e6f01f95c9a0984378643754d0f493bfa4484 jdk7u66-b17
-+6092d0059338df25e82fbc69cc749b95e2565547 jdk7u71-b00
-+814a3f0bb13071666375dd35bab7c9cc44c62448 jdk7u71-b01
-+ba22fdc22c0410b91f6f992e480d9e8b4c5e85d0 jdk7u71-b02
-+30edf4d8760f96b420bd40a2d9552826435356d4 jdk7u71-b03
-+22cc8b125a119f9c23d0e81fc6627af330a27e4a jdk7u71-b04
-+f612dbc0589894463f569fba245a98f842182d7a jdk7u71-b05
-+15bdfc8b209a7c5b4e06907df11d3f795d326c14 jdk7u71-b06
-+26ad03c06f31c516329059c5f053330570455887 jdk7u71-b07
-+8d9d92a8e6d8610994d1596961395a4ce2bc5a69 jdk7u71-b08
-+9ad7bbe28aecaf22c4f5c9ab905207ae963ec2c2 jdk7u71-b09
-+32406b446fd458c6d0d8bd610eeb12d96a5f20a4 jdk7u71-b10
-+b37043cee55ed025b04a3420908897e69c6c687f jdk7u71-b11
-+3a432d7f01ed998ee6ca2ed04e818849a3d1e0c7 jdk7u71-b12
-+9dd0dea849dd2550b58346977d9111717c1f38b2 jdk7u71-b13
---- ./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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java 2013-09-06 11:23:52.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java 2014-07-15 21:46:13.000000000 -0700
-@@ -26,6 +26,7 @@
-
-
- package com.sun.org.glassfish.external.statistics.impl;
-+
- import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic;
- import java.util.Map;
- import java.lang.reflect.*;
---- ./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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -71,8 +71,7 @@
- *
- * @author Kohsuke Kawaguchi (kk@kohsuke.org)
- */
--public class APTNavigator implements Navigator<TypeMirror,TypeDeclaration,FieldDeclaration,MethodDeclaration> {
--
-+public final class APTNavigator implements Navigator<TypeMirror,TypeDeclaration,FieldDeclaration,MethodDeclaration> {
- private final AnnotationProcessorEnvironment env;
-
- private final PrimitiveType primitiveByte;
-@@ -277,8 +276,9 @@
- return clazz.getPackage().getQualifiedName();
- }
-
-- public TypeDeclaration findClass(String className, TypeDeclaration referencePoint) {
-- return env.getTypeDeclaration(className);
-+ @Override
-+ public TypeDeclaration loadObjectFactory(TypeDeclaration referencePoint, String packageName) {
-+ return env.getTypeDeclaration(packageName + ".ObjectFactory");
- }
-
- public boolean isBridgeMethod(MethodDeclaration method) {
---- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java 2013-09-06 11:23:53.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java 2014-07-15 21:46:13.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
-@@ -204,24 +204,24 @@
- }
- portName = ClassNameInfo.getName(
- d.getSimpleName().replace(
-- SIGC_INNERCLASS,
-- SIGC_UNDERSCORE));;
-- packageName = d.getPackage().getQualifiedName();
-- portName = webService != null && webService.name() != null && webService.name().length() >0 ?
-- webService.name() : portName;
-- serviceName = ClassNameInfo.getName(d.getQualifiedName())+SERVICE;
-- serviceName = webService != null && webService.serviceName() != null &&
-- webService.serviceName().length() > 0 ?
-- webService.serviceName() : serviceName;
-- wsdlNamespace = seiContext.getNamespaceURI();
-- typeNamespace = wsdlNamespace;
--
-- SOAPBinding soapBinding = d.getAnnotation(SOAPBinding.class);
-- if (soapBinding != null) {
-- pushedSOAPBinding = pushSOAPBinding(soapBinding, d, d);
-- } else if (d.equals(typeDecl)) {
-- pushedSOAPBinding = pushSOAPBinding(new MySOAPBinding(), d, d);
-- }
-+ SIGC_INNERCLASS,
-+ SIGC_UNDERSCORE));;
-+ packageName = d.getPackage().getQualifiedName();
-+ portName = webService != null && webService.name() != null && webService.name().length() >0 ?
-+ webService.name() : portName;
-+ serviceName = ClassNameInfo.getName(d.getQualifiedName())+SERVICE;
-+ serviceName = webService != null && webService.serviceName() != null &&
-+ webService.serviceName().length() > 0 ?
-+ webService.serviceName() : serviceName;
-+ wsdlNamespace = seiContext.getNamespaceURI();
-+ typeNamespace = wsdlNamespace;
-+
-+ SOAPBinding soapBinding = d.getAnnotation(SOAPBinding.class);
-+ if (soapBinding != null) {
-+ pushedSOAPBinding = pushSOAPBinding(soapBinding, d, d);
-+ } else if (d.equals(typeDecl)) {
-+ pushedSOAPBinding = pushSOAPBinding(new MySOAPBinding(), d, d);
-+ }
- }
-
- public static boolean sameStyle(SOAPBinding.Style style, SOAPStyle soapStyle) {
-@@ -235,7 +235,7 @@
- }
-
- protected boolean pushSOAPBinding(SOAPBinding soapBinding, Declaration bindingDecl,
-- TypeDeclaration classDecl) {
-+ TypeDeclaration classDecl) {
- boolean changed = false;
- if (!sameStyle(soapBinding.style(), soapStyle)) {
- changed = true;
-@@ -293,7 +293,7 @@
-
- // abstract protected boolean shouldProcessWebService(WebService webService, InterfaceDeclaration intf);
-
--// abstract protected boolean shouldProcessWebService(WebService webService, ClassDeclaration decl);
-+ // abstract protected boolean shouldProcessWebService(WebService webService, ClassDeclaration decl);
- protected boolean shouldProcessWebService(WebService webService, InterfaceDeclaration intf) {
- hasWebMethods = false;
- if (webService == null)
-@@ -315,9 +315,9 @@
- return false;
- hasWebMethods = hasWebMethods(classDecl);
- SOAPBinding soapBinding = classDecl.getAnnotation(SOAPBinding.class);
-- if(soapBinding != null && soapBinding.style() == SOAPBinding.Style.RPC && soapBinding.parameterStyle() == SOAPBinding.ParameterStyle.BARE) {
-- builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(soapBinding, classDecl));
-- return false;
-+ if(soapBinding != null && soapBinding.style() == SOAPBinding.Style.RPC && soapBinding.parameterStyle() == SOAPBinding.ParameterStyle.BARE) {
-+ builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(soapBinding, classDecl));
-+ return false;
- }
- return isLegalImplementation(webService, classDecl);
- }
-@@ -345,8 +345,8 @@
- if (webMethod.exclude()) {
- if (webMethod.operationName().length() > 0)
- builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE("operationName", d.getQualifiedName(), method.toString()));
-- if (webMethod.action().length() > 0)
-- builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE("action", d.getQualifiedName(), method.toString()));
-+ if (webMethod.action().length() > 0)
-+ builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE("action", d.getQualifiedName(), method.toString()));
- } else {
- return true;
- }
-@@ -382,7 +382,7 @@
- }
-
- private InterfaceDeclaration getEndpointInterfaceDecl(String endpointInterfaceName,
-- ClassDeclaration d) {
-+ ClassDeclaration d) {
- InterfaceDeclaration intTypeDecl = null;
- for (InterfaceType interfaceType : d.getSuperinterfaces()) {
- if (endpointInterfaceName.equals(interfaceType.toString())) {
-@@ -488,7 +488,7 @@
- Collection<Modifier> modifiers = classDecl.getModifiers();
- if (!modifiers.contains(Modifier.PUBLIC)){
- builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(classDecl.getQualifiedName()));
-- return false;
-+ return false;
- }
- if (modifiers.contains(Modifier.FINAL) && !isStateful) {
- builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(classDecl.getQualifiedName()));
-@@ -538,7 +538,7 @@
- }
-
- protected boolean classImplementsSEI(ClassDeclaration classDecl,
-- InterfaceDeclaration intfDecl) {
-+ InterfaceDeclaration intfDecl) {
- for (InterfaceType interfaceType : classDecl.getSuperinterfaces()) {
- if (interfaceType.getDeclaration().equals(intfDecl))
- return true;
-@@ -637,8 +637,8 @@
- */
- if (!isLegalType(method.getReturnType())) {
- builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(typeDecl.getQualifiedName(),
-- method.getSimpleName(),
-- method.getReturnType()));
-+ method.getSimpleName(),
-+ method.getReturnType()));
- }
- boolean isOneway = method.getAnnotation(Oneway.class) != null;
- if (isOneway && !isValidOnewayMethod(method, typeDecl))
-@@ -684,14 +684,14 @@
- }
-
- protected boolean isLegalParameter(ParameterDeclaration param,
-- MethodDeclaration method,
-- TypeDeclaration typeDecl,
-- int paramIndex) {
-+ MethodDeclaration method,
-+ TypeDeclaration typeDecl,
-+ int paramIndex) {
- if (!isLegalType(param.getType())) {
- builder.onError(param.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(typeDecl.getQualifiedName(),
-- method.getSimpleName(),
-- param.getSimpleName(),
-- param.getType().toString()));
-+ method.getSimpleName(),
-+ param.getSimpleName(),
-+ param.getType().toString()));
- return false;
- }
- TypeMirror holderType;
---- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java 2013-09-06 11:23:53.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java 2014-07-15 21:46:13.000000000 -0700
-@@ -334,7 +334,7 @@
- if(options.verbose) {
- listener.message(WscompileMessages.WSIMPORT_ARCHIVE_ARTIFACT(f, options.clientjar));
- }
-- String entry = f.getCanonicalPath().substring(base.length()+1);
-+ String entry = f.getCanonicalPath().substring(base.length()+1).replace(File.separatorChar, '/');
- BufferedInputStream bis = new BufferedInputStream(
- new FileInputStream(f));
- JarEntry jarEntry = new JarEntry(entry);
---- ./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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -30,7 +30,6 @@
- import com.sun.codemodel.internal.JType;
- import com.sun.tools.internal.xjc.outline.Aspect;
- import com.sun.tools.internal.xjc.outline.Outline;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-
- /**
- * @author Kohsuke Kawaguchi
-@@ -69,6 +68,6 @@
- }
-
- public String fullName() {
-- return Navigator.REFLECTION.getTypeName(t);
-+ return Utils.REFLECTION_NAVIGATOR.getTypeName(t);
- }
- }
---- ./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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -56,7 +56,7 @@
- EagerNType ent = (EagerNType) nt;
- if (base instanceof EagerNClass) {
- EagerNClass enc = (EagerNClass) base;
-- return create(REFLECTION.getBaseClass(ent.t, enc.c));
-+ return create(Utils.REFLECTION_NAVIGATOR.getBaseClass(ent.t, enc.c));
- }
- // lazy class can never be a base type of an eager type
- return null;
-@@ -176,7 +176,7 @@
- public NType getTypeArgument(NType nt, int i) {
- if (nt instanceof EagerNType) {
- EagerNType ent = (EagerNType) nt;
-- return create(REFLECTION.getTypeArgument(ent.t,i));
-+ return create(Utils.REFLECTION_NAVIGATOR.getTypeArgument(ent.t,i));
- }
- if (nt instanceof NClassByJClass) {
- NClassByJClass nnt = (NClassByJClass) nt;
-@@ -189,7 +189,7 @@
- public boolean isParameterizedType(NType nt) {
- if (nt instanceof EagerNType) {
- EagerNType ent = (EagerNType) nt;
-- return REFLECTION.isParameterizedType(ent.t);
-+ return Utils.REFLECTION_NAVIGATOR.isParameterizedType(ent.t);
- }
- if (nt instanceof NClassByJClass) {
- NClassByJClass nnt = (NClassByJClass) nt;
-@@ -303,8 +303,8 @@
- throw new UnsupportedOperationException();
- }
-
-- public NClass findClass(String className, NClass referencePoint) {
-- // TODO: implement this method later
-+ @Override
-+ public NClass loadObjectFactory(NClass referencePoint, String pkg) {
- throw new UnsupportedOperationException();
- }
-
---- ./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-07-15 21:54:37.000000000 -0700
-@@ -0,0 +1,97 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.tools.internal.xjc.model.nav;
-+
-+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-+
-+import java.lang.reflect.Field;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Type;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utils class.
-+ *
-+ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
-+ *
-+ * Has *package private* access to avoid inappropriate usage.
-+ */
-+final class Utils {
-+
-+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
-+
-+ /**
-+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
-+ */
-+ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
-+
-+ static { // we statically initializing REFLECTION_NAVIGATOR property
-+ try {
-+ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
-+ //noinspection unchecked
-+ final Method getInstance = refNav.getDeclaredMethod("getInstance");
-+
-+ // requires accessClassInPackage privilege
-+ AccessController.doPrivileged(
-+ new PrivilegedAction<Object>() {
-+ @Override
-+ public Object run() {
-+ getInstance.setAccessible(true);
-+ return null;
-+ }
-+ }
-+ );
-+
-+ //noinspection unchecked
-+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
-+ } catch (ClassNotFoundException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("Can't find ReflectionNavigator class");
-+ } catch (InvocationTargetException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
-+ } catch (NoSuchMethodException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
-+ } catch (IllegalAccessException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
-+ } catch (SecurityException e) {
-+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
-+ throw e;
-+ }
-+ }
-+
-+ /**
-+ * private constructor to avoid util class instantiating
-+ */
-+ 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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -45,7 +45,6 @@
- import com.sun.xml.internal.bind.api.impl.NameConverter;
- import com.sun.xml.internal.bind.v2.ContextFactory;
- import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeInfoSet;
-
- /**
-@@ -404,7 +403,7 @@
- * @since 2.0 FCS
- */
- public static @Nullable Type getBaseType(@NotNull Type type, @NotNull Class baseType) {
-- return Navigator.REFLECTION.getBaseClass(type,baseType);
-+ return Utils.REFLECTION_NAVIGATOR.getBaseClass(type, baseType);
- }
-
-
---- ./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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -31,8 +31,6 @@
-
- import javax.xml.namespace.QName;
-
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
--
- /**
- * A reference to a JAXB-bound type.
- *
-@@ -104,11 +102,10 @@
- // if we are to reinstitute this check, check JAXB annotations only
- // assert annotations.length==0; // not designed to work with adapters.
-
-- Type base = Navigator.REFLECTION.getBaseClass(type, Collection.class);
-+ Type base = Utils.REFLECTION_NAVIGATOR.getBaseClass(type, Collection.class);
- if(base==null)
- return this; // not a collection
-
-- return new TypeReference(tagName,
-- Navigator.REFLECTION.getTypeArgument(base,0));
-+ return new TypeReference(tagName, Utils.REFLECTION_NAVIGATOR.getTypeArgument(base,0));
- }
- }
---- ./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-07-15 21:54:37.000000000 -0700
-@@ -0,0 +1,97 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.bind.api;
-+
-+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-+
-+import java.lang.reflect.Field;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Type;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utils class.
-+ *
-+ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
-+ *
-+ * Has *package private* access to avoid inappropriate usage.
-+ */
-+final class Utils {
-+
-+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
-+
-+ /**
-+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
-+ */
-+ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
-+
-+ static { // we statically initializing REFLECTION_NAVIGATOR property
-+ try {
-+ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
-+ //noinspection unchecked
-+ final Method getInstance = refNav.getDeclaredMethod("getInstance");
-+
-+ // requires accessClassInPackage privilege
-+ AccessController.doPrivileged(
-+ new PrivilegedAction<Object>() {
-+ @Override
-+ public Object run() {
-+ getInstance.setAccessible(true);
-+ return null;
-+ }
-+ }
-+ );
-+
-+ //noinspection unchecked
-+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
-+ } catch (ClassNotFoundException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("Can't find ReflectionNavigator class");
-+ } catch (InvocationTargetException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
-+ } catch (NoSuchMethodException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
-+ } catch (IllegalAccessException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
-+ } catch (SecurityException e) {
-+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
-+ throw e;
-+ }
-+ }
-+
-+ /**
-+ * private constructor to avoid util class instantiating
-+ */
-+ 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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.000000000 -0700
-@@ -160,8 +160,8 @@
- res = Messages.INCOMPATIBLE_API_VERSION;
-
- throw new LinkageError( res.format(
-- Which.which(XmlSchema.class),
-- Which.which(ModelBuilder.class)
-+ Which.which(XmlSchema.class),
-+ Which.which(ModelBuilder.class)
- ));
- }
- }
-@@ -176,8 +176,8 @@
- } catch (NoSuchMethodError e) {
- // we seem to be getting 1.0 runtime
- throw new LinkageError( Messages.RUNNING_WITH_1_0_RUNTIME.format(
-- Which.which(WhiteSpaceProcessor.class),
-- Which.which(ModelBuilder.class)
-+ Which.which(WhiteSpaceProcessor.class),
-+ Which.which(ModelBuilder.class)
- ));
- }
- }
-@@ -235,7 +235,7 @@
- String pkg = nav.getPackageName(ci.getClazz());
- if(!registries.containsKey(pkg)) {
- // insert the package's object factory
-- C c = loadObjectFactory(ci, pkg);
-+ C c = nav.loadObjectFactory(clazz, pkg);
- if(c!=null)
- addRegistry(c,(Locatable)p);
- }
-@@ -264,15 +264,6 @@
- return r;
- }
-
-- private C loadObjectFactory(ClassInfoImpl<T, C, F, M> ci, String pkg) {
-- try {
-- return nav.findClass(pkg + ".ObjectFactory", ci.getClazz());
-- } catch (SecurityException ignored) {
-- // treat SecurityException in same way as ClassNotFoundException in this case
-- return null;
-- }
-- }
--
- /**
- * Checks the uniqueness of the type name.
- */
-@@ -302,7 +293,7 @@
-
- if(nav.isArray(t)) { // no need for checking byte[], because above typeInfoset.getTypeInfo() would return non-null
- ArrayInfoImpl<T,C,F,M> ai =
-- createArrayInfo(upstream, t);
-+ createArrayInfo(upstream, t);
- addTypeName(ai);
- typeInfoSet.add(ai);
- return ai;
-@@ -338,7 +329,7 @@
- }
-
- protected ElementInfoImpl<T,C,F,M> createElementInfo(
-- RegistryInfoImpl<T,C,F,M> registryInfo, M m) throws IllegalAnnotationException {
-+ RegistryInfoImpl<T,C,F,M> registryInfo, M m) throws IllegalAnnotationException {
- return new ElementInfoImpl<T,C,F,M>(this,registryInfo,m);
- }
-
---- ./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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -27,7 +27,6 @@
-
- import java.lang.reflect.Type;
-
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
- import com.sun.xml.internal.bind.v2.runtime.Transducer;
-
-@@ -36,7 +35,7 @@
- */
- final class RuntimeAnyTypeImpl extends AnyTypeImpl<Type,Class> implements RuntimeNonElement {
- private RuntimeAnyTypeImpl() {
-- super(Navigator.REFLECTION);
-+ super(Utils.REFLECTION_NAVIGATOR);
- }
-
- 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-07-15 21:46:13.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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -42,7 +42,6 @@
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeRef;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
- import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
- import com.sun.xml.internal.bind.v2.runtime.Transducer;
- import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
-@@ -122,7 +121,7 @@
- }
-
- public Class<? extends JAXBElement> getType() {
-- return Navigator.REFLECTION.erasure(super.getType());
-+ return (Class<? extends JAXBElement>) Utils.REFLECTION_NAVIGATOR.erasure(super.getType());
- }
-
- 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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -37,8 +37,6 @@
- import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
- import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
- import com.sun.xml.internal.bind.v2.model.core.ID;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
--import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElementRef;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
-@@ -75,7 +73,7 @@
- public final @Nullable JAXBContextImpl context;
-
- public RuntimeModelBuilder(JAXBContextImpl context, RuntimeAnnotationReader annotationReader, Map<Class, Class> subclassReplacements, String defaultNamespaceRemap) {
-- super(annotationReader, Navigator.REFLECTION, subclassReplacements, defaultNamespaceRemap);
-+ super(annotationReader, Utils.REFLECTION_NAVIGATOR, subclassReplacements, defaultNamespaceRemap);
- this.context = context;
- }
-
-@@ -109,10 +107,6 @@
- return new RuntimeArrayInfoImpl(this, upstream, (Class)arrayType);
- }
-
-- public ReflectionNavigator getNavigator() {
-- return (ReflectionNavigator)nav;
-- }
--
- @Override
- 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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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.bind.v2.model.annotation.AnnotationReader;
- import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
--import com.sun.xml.internal.bind.v2.model.core.NonElement;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
--import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeInfoSet;
-
-@@ -47,7 +44,7 @@
- */
- final class RuntimeTypeInfoSetImpl extends TypeInfoSetImpl<Type,Class,Field,Method> implements RuntimeTypeInfoSet {
- public RuntimeTypeInfoSetImpl(AnnotationReader<Type,Class,Field,Method> reader) {
-- super(Navigator.REFLECTION,reader,RuntimeBuiltinLeafInfoImpl.LEAVES);
-+ super(Utils.REFLECTION_NAVIGATOR,reader,RuntimeBuiltinLeafInfoImpl.LEAVES);
- }
-
- @Override
-@@ -55,10 +52,6 @@
- return RuntimeAnyTypeImpl.theInstance;
- }
-
-- public ReflectionNavigator getNavigator() {
-- return (ReflectionNavigator)super.getNavigator();
-- }
--
- public RuntimeNonElement getTypeInfo( Type type ) {
- 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-07-15 21:54:37.000000000 -0700
-@@ -0,0 +1,97 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.bind.v2.model.impl;
-+
-+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-+
-+import java.lang.reflect.Field;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Type;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utils class.
-+ *
-+ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
-+ *
-+ * Has *package private* access to avoid inappropriate usage.
-+ */
-+final class Utils {
-+
-+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
-+
-+ /**
-+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
-+ */
-+ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
-+
-+ static { // we statically initializing REFLECTION_NAVIGATOR property
-+ try {
-+ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
-+ //noinspection unchecked
-+ final Method getInstance = refNav.getDeclaredMethod("getInstance");
-+
-+ // requires accessClassInPackage privilege
-+ AccessController.doPrivileged(
-+ new PrivilegedAction<Object>() {
-+ @Override
-+ public Object run() {
-+ getInstance.setAccessible(true);
-+ return null;
-+ }
-+ }
-+ );
-+
-+ //noinspection unchecked
-+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
-+ } catch (ClassNotFoundException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("Can't find ReflectionNavigator class");
-+ } catch (InvocationTargetException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
-+ } catch (NoSuchMethodException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
-+ } catch (IllegalAccessException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
-+ } catch (SecurityException e) {
-+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
-+ throw e;
-+ }
-+ }
-+
-+ /**
-+ * private constructor to avoid util class instantiating
-+ */
-+ private Utils() {
-+ }
-+}
---- ./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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -240,10 +240,6 @@
- */
- T getComponentType(T t);
-
--
-- /** The singleton instance. */
-- public static final ReflectionNavigator REFLECTION = new ReflectionNavigator();
--
- /**
- * Gets the i-th type argument from a parameterized type.
- *
-@@ -357,14 +353,14 @@
- String getPackageName(C clazz);
-
- /**
-- * Finds the class/interface/enum/annotation of the given name.
-+ * Finds ObjectFactory for the given referencePoint.
- *
- * @param referencePoint
- * The class that refers to the specified class.
- * @return
- * null if not found.
- */
-- C findClass(String className, C referencePoint);
-+ C loadObjectFactory(C referencePoint, String packageName);
-
- /**
- * 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-07-15 21:46:13.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
-@@ -44,16 +44,19 @@
- * {@link Navigator} implementation for {@code java.lang.reflect}.
- *
- */
--public final class ReflectionNavigator implements Navigator<Type, Class, Field, Method> {
-+/*package*/final class ReflectionNavigator implements Navigator<Type, Class, Field, Method> {
-
-- /**
-- * Singleton.
-- *
-- * Use {@link Navigator#REFLECTION}
-- */
-- ReflectionNavigator() {
-+// ---------- Singleton -----------------
-+ private static final ReflectionNavigator INSTANCE = new ReflectionNavigator();
-+
-+ /*package*/static ReflectionNavigator getInstance() { // accessible through reflection from Utils classes
-+ return INSTANCE;
- }
-
-+ private ReflectionNavigator() {
-+ }
-+// ---------------------------------------
-+
- public Class getSuperClass(Class clazz) {
- if (clazz == Object.class) {
- return null;
-@@ -64,6 +67,7 @@
- }
- return sc;
- }
-+
- private static final TypeVisitor<Type, Class> baseClassFinder = new TypeVisitor<Type, Class>() {
-
- public Type onClass(Class c, Class sup) {
-@@ -496,7 +500,7 @@
- c.getDeclaredConstructor();
- return true;
- } catch (NoSuchMethodException e) {
-- return false;
-+ return false; // todo: do this WITHOUT exception throw
- }
- }
-
-@@ -544,13 +548,15 @@
- }
- }
-
-- public Class findClass(String className, Class referencePoint) {
-+ @Override
-+ public Class loadObjectFactory(Class referencePoint, String pkg) {
-+ String clName = pkg + ".ObjectFactory";
-+ ClassLoader cl = referencePoint.getClassLoader();
-+ if (cl == null)
-+ cl = ClassLoader.getSystemClassLoader();
-+
- try {
-- ClassLoader cl = referencePoint.getClassLoader();
-- if (cl == null) {
-- cl = ClassLoader.getSystemClassLoader();
-- }
-- return cl.loadClass(className);
-+ return cl.loadClass(clName);
- } catch (ClassNotFoundException e) {
- return null;
- }
-@@ -569,7 +575,7 @@
- // class Base<T> {
- // T getX() { ... }
- // }
-- // to be overrided. Handling this correctly needs a careful implementation
-+ // to be overriden. Handling this correctly needs a careful implementation
-
- 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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -33,8 +33,6 @@
- import javax.xml.namespace.QName;
-
- import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
--import com.sun.xml.internal.bind.v2.model.core.NonElement;
--import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
-
- /**
- * {@link TypeInfoSet} refined for runtime.
-@@ -52,5 +50,4 @@
- RuntimeElementInfo getElementInfo( Class scope, QName name );
- Map<QName,? extends RuntimeElementInfo> getElementMappings( Class scope );
- Iterable<? extends RuntimeElementInfo> getAllElements();
-- 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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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,7 +36,6 @@
-
- import com.sun.xml.internal.bind.api.AccessorException;
- import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeElementInfo;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
- import com.sun.xml.internal.bind.v2.runtime.property.Property;
-@@ -81,10 +80,10 @@
- this.property = PropertyFactory.create(grammar,rei.getProperty());
-
- tagName = rei.getElementName();
-- expectedType = Navigator.REFLECTION.erasure(rei.getContentInMemoryType());
-+ expectedType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(rei.getContentInMemoryType());
- scope = rei.getScope()==null ? JAXBElement.GlobalScope.class : rei.getScope().getClazz();
-
-- Class type = Navigator.REFLECTION.erasure(rei.getType());
-+ Class type = (Class) Utils.REFLECTION_NAVIGATOR.erasure(rei.getType());
- if(type==JAXBElement.class)
- 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-07-15 21:54:37.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
-@@ -90,7 +90,6 @@
- import com.sun.xml.internal.bind.v2.model.impl.RuntimeBuiltinLeafInfoImpl;
- import com.sun.xml.internal.bind.v2.model.impl.RuntimeModelBuilder;
- import com.sun.xml.internal.bind.v2.model.nav.Navigator;
--import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeArrayInfo;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeBuiltinLeafInfo;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeClassInfo;
-@@ -131,14 +130,6 @@
- private final Map<TypeReference,Bridge> bridges = new LinkedHashMap<TypeReference,Bridge>();
-
- /**
-- * Shared instance of {@link TransformerFactory}.
-- * Lock before use, because a {@link TransformerFactory} is not thread-safe
-- * whereas {@link JAXBContextImpl} is.
-- * Lazily created.
-- */
-- private volatile static SAXTransformerFactory tf;
--
-- /**
- * Shared instance of {@link DocumentBuilder}.
- * Lock before use. Lazily created.
- */
-@@ -358,7 +349,7 @@
- beanInfoMap.put( e.getKey(), beanInfoMap.get(e.getValue()) );
-
- // build bridges
-- ReflectionNavigator nav = typeSet.getNavigator();
-+ Navigator<Type, Class, Field, Method> nav = typeSet.getNavigator();
-
- for (TypeReference tr : typeRefs) {
- XmlJavaTypeAdapter xjta = tr.get(XmlJavaTypeAdapter.class);
-@@ -366,7 +357,7 @@
- XmlList xl = tr.get(XmlList.class);
-
- // eventually compute the in-memory type
-- Class erasedType = nav.erasure(tr.type);
-+ Class erasedType = (Class) nav.erasure(tr.type);
-
- if(xjta!=null) {
- a = new Adapter<Type,Class>(xjta.value(),nav);
-@@ -377,7 +368,7 @@
- }
-
- if(a!=null) {
-- erasedType = nav.erasure(a.defaultType);
-+ erasedType = (Class) nav.erasure(a.defaultType);
- }
-
- Name name = nameBuilder.createElementName(tr.tagName);
-@@ -703,13 +694,7 @@
- */
- static Transformer createTransformer() {
- try {
-- if (tf==null) {
-- synchronized(JAXBContextImpl.class) {
-- if (tf==null) {
-- tf = (SAXTransformerFactory)TransformerFactory.newInstance();
-- }
-- }
-- }
-+ SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance();
- return tf.newTransformer();
- } catch (TransformerConfigurationException e) {
- throw new Error(e); // impossible
-@@ -721,13 +706,7 @@
- */
- public static TransformerHandler createTransformerHandler() {
- try {
-- if (tf==null) {
-- synchronized(JAXBContextImpl.class) {
-- if (tf==null) {
-- tf = (SAXTransformerFactory)TransformerFactory.newInstance();
-- }
-- }
-- }
-+ SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance();
- return tf.newTransformerHandler();
- } catch (TransformerConfigurationException e) {
- throw new Error(e); // impossible
-@@ -873,7 +852,7 @@
- // this is a special class we introduced for JAX-WS that we *don't* want in the schema
- } else {
- NonElement<Type,Class> typeInfo = getXmlType(tis,tr);
-- xsdgen.add(tr.tagName, !Navigator.REFLECTION.isPrimitive(tr.type),typeInfo);
-+ xsdgen.add(tr.tagName, !tis.getNavigator().isPrimitive(tr.type),typeInfo);
- }
- }
- 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-07-15 21:54:37.000000000 -0700
-@@ -0,0 +1,97 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.bind.v2.runtime;
-+
-+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-+
-+import java.lang.reflect.Field;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Type;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utils class.
-+ *
-+ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
-+ *
-+ * Has *package private* access to avoid inappropriate usage.
-+ */
-+final class Utils {
-+
-+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
-+
-+ /**
-+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
-+ */
-+ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
-+
-+ static { // we statically initializing REFLECTION_NAVIGATOR property
-+ try {
-+ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
-+ //noinspection unchecked
-+ final Method getInstance = refNav.getDeclaredMethod("getInstance");
-+
-+ // requires accessClassInPackage privilege
-+ AccessController.doPrivileged(
-+ new PrivilegedAction<Object>() {
-+ @Override
-+ public Object run() {
-+ getInstance.setAccessible(true);
-+ return null;
-+ }
-+ }
-+ );
-+
-+ //noinspection unchecked
-+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
-+ } catch (ClassNotFoundException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("Can't find ReflectionNavigator class");
-+ } catch (InvocationTargetException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
-+ } catch (NoSuchMethodException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
-+ } catch (IllegalAccessException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
-+ } catch (SecurityException e) {
-+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
-+ throw e;
-+ }
-+ }
-+
-+ /**
-+ * private constructor to avoid util class instantiating
-+ */
-+ 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-07-15 21:46:13.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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -27,7 +27,6 @@
-
-
- import com.sun.xml.internal.bind.api.AccessorException;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
- import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
- import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
-@@ -49,7 +48,7 @@
-
- assert prop.isCollection();
- lister = Lister.create(
-- Navigator.REFLECTION.erasure(prop.getRawType()),prop.id(),prop.getAdapter());
-+ Utils.REFLECTION_NAVIGATOR.erasure(prop.getRawType()),prop.id(),prop.getAdapter());
- assert lister!=null;
- 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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -42,7 +42,6 @@
- import com.sun.xml.internal.bind.v2.ClassFactory;
- import com.sun.xml.internal.bind.v2.util.QNameMap;
- import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
--import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeMapPropertyInfo;
- import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
- import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo;
-@@ -98,7 +97,8 @@
- this.valueBeanInfo = context.getOrCreate(prop.getValueType());
-
- // infer the implementation class
-- Class<ValueT> sig = ReflectionNavigator.REFLECTION.erasure(prop.getRawType());
-+ //noinspection unchecked
-+ Class<ValueT> sig = (Class<ValueT>) Utils.REFLECTION_NAVIGATOR.erasure(prop.getRawType());
- mapImplClass = ClassFactory.inferImplClass(sig,knownImplClasses);
- // 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-07-15 21:54:37.000000000 -0700
-@@ -0,0 +1,97 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.bind.v2.runtime.property;
-+
-+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-+
-+import java.lang.reflect.Field;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Type;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utils class.
-+ *
-+ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
-+ *
-+ * Has *package private* access to avoid inappropriate usage.
-+ */
-+final class Utils {
-+
-+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
-+
-+ /**
-+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
-+ */
-+ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
-+
-+ static { // we statically initializing REFLECTION_NAVIGATOR property
-+ try {
-+ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
-+ //noinspection unchecked
-+ final Method getInstance = refNav.getDeclaredMethod("getInstance");
-+
-+ // requires accessClassInPackage privilege
-+ AccessController.doPrivileged(
-+ new PrivilegedAction<Object>() {
-+ @Override
-+ public Object run() {
-+ getInstance.setAccessible(true);
-+ return null;
-+ }
-+ }
-+ );
-+
-+ //noinspection unchecked
-+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
-+ } catch (ClassNotFoundException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("Can't find ReflectionNavigator class");
-+ } catch (InvocationTargetException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
-+ } catch (NoSuchMethodException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
-+ } catch (IllegalAccessException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
-+ } catch (SecurityException e) {
-+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
-+ throw e;
-+ }
-+ }
-+
-+ /**
-+ * private constructor to avoid util class instantiating
-+ */
-+ private Utils() {
-+ }
-+}
---- ./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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -48,7 +48,6 @@
- import com.sun.xml.internal.bind.api.JAXBRIContext;
- import com.sun.xml.internal.bind.v2.model.core.Adapter;
- import com.sun.xml.internal.bind.v2.model.impl.RuntimeModelBuilder;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
- import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
- import com.sun.xml.internal.bind.v2.runtime.reflect.opt.OptimizedAccessorFactory;
- import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
-@@ -193,7 +192,7 @@
-
- public final <T> Accessor<BeanT, T> adapt(Adapter<Type, Class> adapter) {
- return new AdaptedAccessor<BeanT, ValueT, T>(
-- (Class<T>) Navigator.REFLECTION.erasure(adapter.defaultType),
-+ (Class<T>) Utils.REFLECTION_NAVIGATOR.erasure(adapter.defaultType),
- this,
- 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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -51,7 +51,6 @@
- import com.sun.xml.internal.bind.v2.TODO;
- import com.sun.xml.internal.bind.v2.model.core.Adapter;
- import com.sun.xml.internal.bind.v2.model.core.ID;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
- import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
- import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Patcher;
- import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
-@@ -116,7 +115,7 @@
- public static <BeanT,PropT,ItemT,PackT>
- Lister<BeanT,PropT,ItemT,PackT> create(Type fieldType,ID idness, Adapter<Type,Class> adapter) {
-
-- Class rawType = Navigator.REFLECTION.erasure(fieldType);
-+ Class rawType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(fieldType);
- Class itemType;
-
- Lister l;
-@@ -125,9 +124,9 @@
- l = getArrayLister(itemType);
- } else
- if( Collection.class.isAssignableFrom(rawType) ) {
-- Type bt = Navigator.REFLECTION.getBaseClass(fieldType,Collection.class);
-+ Type bt = Utils.REFLECTION_NAVIGATOR.getBaseClass(fieldType,Collection.class);
- if(bt instanceof ParameterizedType)
-- itemType = Navigator.REFLECTION.erasure(((ParameterizedType)bt).getActualTypeArguments()[0]);
-+ itemType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)bt).getActualTypeArguments()[0]);
- else
- 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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -39,7 +39,6 @@
- import com.sun.xml.internal.bind.api.AccessorException;
- import com.sun.xml.internal.bind.v2.model.core.ID;
- import com.sun.xml.internal.bind.v2.model.impl.RuntimeModelBuilder;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElementRef;
- import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
- import com.sun.xml.internal.bind.v2.runtime.Name;
-@@ -144,8 +143,7 @@
-
- if(prop.isCollection()) {
- return new ListTransducedAccessorImpl(xducer,prop.getAccessor(),
-- Lister.create(Navigator.REFLECTION.erasure(prop.getRawType()),prop.id(),
-- prop.getAdapter()));
-+ Lister.create(Utils.REFLECTION_NAVIGATOR.erasure(prop.getRawType()), prop.id(), prop.getAdapter()));
- }
-
- 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-07-15 21:54:37.000000000 -0700
-@@ -0,0 +1,97 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.bind.v2.runtime.reflect;
-+
-+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-+
-+import java.lang.reflect.Field;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Type;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utils class.
-+ *
-+ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
-+ *
-+ * Has *package private* access to avoid inappropriate usage.
-+ */
-+final class Utils {
-+
-+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
-+
-+ /**
-+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
-+ */
-+ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
-+
-+ static { // we statically initializing REFLECTION_NAVIGATOR property
-+ try {
-+ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
-+ //noinspection unchecked
-+ final Method getInstance = refNav.getDeclaredMethod("getInstance");
-+
-+ // requires accessClassInPackage privilege
-+ AccessController.doPrivileged(
-+ new PrivilegedAction<Object>() {
-+ @Override
-+ public Object run() {
-+ getInstance.setAccessible(true);
-+ return null;
-+ }
-+ }
-+ );
-+
-+ //noinspection unchecked
-+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
-+ } catch (ClassNotFoundException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("Can't find ReflectionNavigator class");
-+ } catch (InvocationTargetException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
-+ } catch (NoSuchMethodException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
-+ } catch (IllegalAccessException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
-+ } catch (SecurityException e) {
-+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
-+ throw e;
-+ }
-+ }
-+
-+ /**
-+ * private constructor to avoid util class instantiating
-+ */
-+ 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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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/org/jvnet/mimepull/MemoryData.java 2013-09-06 11:24:01.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java 2013-09-06 11:24:01.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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 2014-07-15 21:46:13.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
-@@ -232,7 +232,7 @@
- public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException {
- T t = resolve(p);
- try {
-- return m.invoke(t, args );
-+ return MethodUtil.invoke(t, m, args );
- } finally {
- 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 2014-07-15 21:46:13.000000000 -0700
-@@ -0,0 +1,94 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.ws.api.server;
-+
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
-+ * to java.lang,reflect.Method.invoke()
-+ *
-+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
-+ */
-+class MethodUtil {
-+
-+ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
-+ private static final Method INVOKE_METHOD;
-+
-+ static {
-+ Method method;
-+ try {
-+ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
-+ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
-+ }
-+ } catch (Throwable t) {
-+ method = null;
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
-+ }
-+ }
-+ INVOKE_METHOD = method;
-+ }
-+
-+ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
-+ if (INVOKE_METHOD != null) {
-+ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
-+ }
-+ try {
-+ return INVOKE_METHOD.invoke(null, method, target, args);
-+ } catch (InvocationTargetException ite) {
-+ // unwrap invocation exception added by reflection code ...
-+ throw unwrapException(ite);
-+ }
-+ } else {
-+ // other then Oracle JDK ...
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
-+ }
-+ return method.invoke(target, args);
-+ }
-+ }
-+
-+ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
-+ Throwable targetException = ite.getTargetException();
-+ if (targetException != null && targetException instanceof InvocationTargetException) {
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
-+ }
-+ return (InvocationTargetException) targetException;
-+ } else {
-+ return ite;
-+ }
-+ }
-+
-+}
---- ./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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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/WSServiceDelegate.java 2013-09-06 11:24:05.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2014-07-15 21:46:13.000000000 -0700
-@@ -22,6 +22,7 @@
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-+
- package com.sun.xml.internal.ws.client;
-
- import com.sun.istack.internal.NotNull;
-@@ -140,8 +141,8 @@
- /**
- * Information about SEI, keyed by their interface type.
- */
-- // private final Map<Class,SEIPortInfo> seiContext = new HashMap<Class,SEIPortInfo>();
-- private final Map<QName,SEIPortInfo> seiContext = new HashMap<QName,SEIPortInfo>();
-+ // private final Map<Class,SEIPortInfo> seiContext = new HashMap<Class,SEIPortInfo>();
-+ private final Map<QName,SEIPortInfo> seiContext = new HashMap<QName,SEIPortInfo>();
-
- // This executor is used for all the async invocations for all proxies
- // created from this service. But once the proxy is created, then changing
-@@ -166,8 +167,8 @@
-
- public WSServiceDelegate(URL wsdlDocumentLocation, QName serviceName, Class<? extends Service> serviceClass) {
- this(
-- wsdlDocumentLocation==null ? null : new StreamSource(wsdlDocumentLocation.toExternalForm()),
-- serviceName,serviceClass);
-+ wsdlDocumentLocation==null ? null : new StreamSource(wsdlDocumentLocation.toExternalForm()),
-+ serviceName,serviceClass);
- }
-
- /**
-@@ -204,10 +205,10 @@
- if(wsdl == null){
- if(serviceClass != Service.class){
- WebServiceClient wsClient = AccessController.doPrivileged(new PrivilegedAction<WebServiceClient>() {
-- public WebServiceClient run() {
-- return serviceClass.getAnnotation(WebServiceClient.class);
-- }
-- });
-+ public WebServiceClient run() {
-+ return serviceClass.getAnnotation(WebServiceClient.class);
-+ }
-+ });
- String wsdlLocation = wsClient.wsdlLocation();
- wsdlLocation = JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(wsdlLocation));
- wsdl = new StreamSource(wsdlLocation);
-@@ -221,8 +222,8 @@
- service = model.getService(this.serviceName);
- if (service == null)
- throw new WebServiceException(
-- ClientMessages.INVALID_SERVICE_NAME(this.serviceName,
-- buildNameList(model.getServices().keySet())));
-+ ClientMessages.INVALID_SERVICE_NAME(this.serviceName,
-+ buildNameList(model.getServices().keySet())));
- // fill in statically known ports
- for (WSDLPortImpl port : service.getPorts())
- ports.put(port.getName(), new PortInfo(this, port));
-@@ -255,7 +256,7 @@
- private WSDLModelImpl parseWSDL(URL wsdlDocumentLocation, Source wsdlSource) {
- try {
- return RuntimeWSDLParser.parse(wsdlDocumentLocation, wsdlSource, createDefaultCatalogResolver(),
-- true, getContainer(), ServiceFinder.find(WSDLParserExtension.class).toArray());
-+ true, getContainer(), ServiceFinder.find(WSDLParserExtension.class).toArray());
- } catch (IOException e) {
- throw new WebServiceException(e);
- } catch (XMLStreamException e) {
-@@ -345,7 +346,7 @@
- //get the first port corresponding to the SEI
- WSDLPortImpl port = wsdlService.getMatchingPort(portTypeName);
- if (port == null)
-- throw new WebServiceException(ClientMessages.UNDEFINED_PORT_TYPE(portTypeName));
-+ throw new WebServiceException(ClientMessages.UNDEFINED_PORT_TYPE(portTypeName));
- QName portName = port.getName();
- return getPort(portName, portInterface,features);
- }
-@@ -431,8 +432,8 @@
- binding.setMode(mode);
- Dispatch<Object> dispatch = Stubs.createJAXBDispatch(
- port, binding, jaxbContext, mode,wsepr);
-- serviceInterceptor.postCreateDispatch((WSBindingProvider)dispatch);
-- return dispatch;
-+ serviceInterceptor.postCreateDispatch((WSBindingProvider)dispatch);
-+ return dispatch;
- }
-
- @Override
-@@ -583,7 +584,7 @@
-
- if (wsdlService.get(portName)==null) {
- throw new WebServiceException(
-- ClientMessages.INVALID_PORT_NAME(portName,buildWsdlPortNames()));
-+ ClientMessages.INVALID_PORT_NAME(portName,buildWsdlPortNames()));
- }
-
- BindingImpl binding = eif.createBinding(webServiceFeatures,portInterface);
-@@ -681,7 +682,7 @@
- return wsdlService;
- }
-
-- class DaemonThreadFactory implements ThreadFactory {
-+ class DaemonThreadFactory implements ThreadFactory {
- public Thread newThread(Runnable r) {
- Thread daemonThread = new Thread(r);
- daemonThread.setDaemon(Boolean.TRUE);
---- ./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 2014-07-15 21:46:13.000000000 -0700
-@@ -0,0 +1,94 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.ws.client.sei;
-+
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
-+ * to java.lang,reflect.Method.invoke()
-+ * <p/>
-+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
-+ */
-+class MethodUtil {
-+
-+ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
-+ private static final Method INVOKE_METHOD;
-+
-+ static {
-+ Method method;
-+ try {
-+ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
-+ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
-+ }
-+ } catch (Throwable t) {
-+ method = null;
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
-+ }
-+ }
-+ INVOKE_METHOD = method;
-+ }
-+
-+ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
-+ if (INVOKE_METHOD != null) {
-+ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
-+ }
-+ try {
-+ return INVOKE_METHOD.invoke(null, method, target, args);
-+ } catch (InvocationTargetException ite) {
-+ // unwrap invocation exception added by reflection code ...
-+ throw unwrapException(ite);
-+ }
-+ } else {
-+ // other then Oracle JDK ...
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
-+ }
-+ return method.invoke(target, args);
-+ }
-+ }
-+
-+ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
-+ Throwable targetException = ite.getTargetException();
-+ if (targetException != null && targetException instanceof InvocationTargetException) {
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
-+ }
-+ return (InvocationTargetException) targetException;
-+ } else {
-+ return ite;
-+ }
-+ }
-+
-+}
---- ./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 2014-07-15 21:46:13.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
-@@ -28,17 +28,20 @@
- import com.sun.istack.internal.NotNull;
- import com.sun.istack.internal.Nullable;
- import com.sun.xml.internal.ws.api.SOAPVersion;
--import com.sun.xml.internal.ws.api.client.WSPortInfo;
- import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
-+import com.sun.xml.internal.ws.api.client.WSPortInfo;
- import com.sun.xml.internal.ws.api.message.Header;
- import com.sun.xml.internal.ws.api.message.Headers;
- import com.sun.xml.internal.ws.api.message.Packet;
- import com.sun.xml.internal.ws.api.model.MEP;
- import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
--import com.sun.xml.internal.ws.api.pipe.Tube;
- import com.sun.xml.internal.ws.api.pipe.Fiber;
-+import com.sun.xml.internal.ws.api.pipe.Tube;
- import com.sun.xml.internal.ws.binding.BindingImpl;
--import com.sun.xml.internal.ws.client.*;
-+import com.sun.xml.internal.ws.client.RequestContext;
-+import com.sun.xml.internal.ws.client.ResponseContextReceiver;
-+import com.sun.xml.internal.ws.client.Stub;
-+import com.sun.xml.internal.ws.client.WSServiceDelegate;
- import com.sun.xml.internal.ws.model.JavaMethodImpl;
- import com.sun.xml.internal.ws.model.SOAPSEIModel;
- import com.sun.xml.internal.ws.wsdl.OperationDispatcher;
-@@ -47,6 +50,8 @@
- import java.lang.reflect.InvocationHandler;
- import java.lang.reflect.InvocationTargetException;
- import java.lang.reflect.Method;
-+import java.lang.reflect.Modifier;
-+import java.lang.reflect.Proxy;
- import java.util.HashMap;
- import java.util.Map;
-
-@@ -124,13 +129,14 @@
- private final Map<Method, MethodHandler> methodHandlers = new HashMap<Method, MethodHandler>();
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-+ validateInputs(proxy, method);
- MethodHandler handler = methodHandlers.get(method);
- if (handler != null) {
- return handler.invoke(proxy, args);
- } else {
- // we handle the other method invocations by ourselves
- try {
-- return method.invoke(this, args);
-+ return MethodUtil.invoke(this, method, args);
- } catch (IllegalAccessException e) {
- // impossible
- throw new AssertionError(e);
-@@ -142,6 +148,17 @@
- }
- }
-
-+ private void validateInputs(Object proxy, Method method) {
-+ if (proxy == null || !Proxy.isProxyClass(proxy.getClass())) {
-+ throw new IllegalStateException("Passed object is not proxy!");
-+ }
-+ Class<?> declaringClass = method.getDeclaringClass();
-+ if (method == null || declaringClass == null
-+ || Modifier.isStatic(method.getModifiers())) {
-+ throw new IllegalStateException("Invoking static method is not allowed!");
-+ }
-+ }
-+
- 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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -59,6 +59,12 @@
- import java.lang.reflect.Constructor;
- import java.lang.reflect.Field;
- import java.lang.reflect.Method;
-+import java.lang.reflect.ReflectPermission;
-+import java.security.AccessControlContext;
-+import java.security.AccessController;
-+import java.security.Permissions;
-+import java.security.PrivilegedAction;
-+import java.security.ProtectionDomain;
- import java.util.Iterator;
- import java.util.Map;
- import java.util.logging.Level;
-@@ -546,10 +552,40 @@
- // ignore
- }
-
-- try {
-- JAXB_CONTEXT = (JAXBRIContext)JAXBContext.newInstance(SOAP11Fault.class, SOAP12Fault.class);
-- } catch (JAXBException e) {
-- throw new Error(e); // this must be a bug in our code
-+ JAXB_CONTEXT = createJAXBContext();
-+ }
-+
-+ private static JAXBRIContext createJAXBContext() {
-+
-+ // in jdk runtime doPrivileged is necessary since JAX-WS internal classes are in restricted packages
-+ if (isJDKRuntime()) {
-+ Permissions permissions = new Permissions();
-+ permissions.add(new RuntimePermission("accessClassInPackage.com.sun." + "xml.internal.ws.fault"));
-+ permissions.add(new ReflectPermission("suppressAccessChecks"));
-+ return AccessController.doPrivileged(
-+ new PrivilegedAction<JAXBRIContext>() {
-+ @Override
-+ public JAXBRIContext run() {
-+ try {
-+ return (JAXBRIContext) JAXBContext.newInstance(SOAP11Fault.class, SOAP12Fault.class);
-+ } catch (JAXBException e) {
-+ throw new Error(e);
-+ }
-+ }
-+ },
-+ new AccessControlContext(new ProtectionDomain[]{new ProtectionDomain(null, permissions)})
-+ );
-+
-+ } else {
-+ try {
-+ return (JAXBRIContext) JAXBContext.newInstance(SOAP11Fault.class, SOAP12Fault.class);
-+ } catch (JAXBException e) {
-+ throw new Error(e);
-+ }
- }
- }
-+
-+ private static boolean isJDKRuntime() {
-+ return SOAPFaultBuilder.class.getName().contains("internal");
-+ }
- }
---- ./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-07-15 21:46:13.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
-@@ -28,7 +28,6 @@
- import com.sun.istack.internal.NotNull;
- import com.sun.xml.internal.bind.api.CompositeStructure;
- import com.sun.xml.internal.bind.api.TypeReference;
--import com.sun.xml.internal.bind.v2.model.nav.Navigator;
- import com.sun.xml.internal.ws.api.BindingID;
- import com.sun.xml.internal.ws.api.SOAPVersion;
- import com.sun.xml.internal.ws.api.model.ExceptionType;
-@@ -735,7 +734,7 @@
- //set the actual type argument of Holder in the TypeReference
- if (isHolder) {
- if(clazzType==Holder.class){
-- clazzType = Navigator.REFLECTION.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
-+ clazzType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
- }
- }
- Mode paramMode = isHolder ? Mode.INOUT : Mode.IN;
-@@ -932,7 +931,7 @@
- //set the actual type argument of Holder in the TypeReference
- if (isHolder) {
- if (clazzType==Holder.class)
-- clazzType = Navigator.REFLECTION.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
-+ clazzType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
- }
- Mode paramMode = isHolder ? Mode.INOUT : Mode.IN;
- for (Annotation annotation : pannotations[pos]) {
-@@ -1172,7 +1171,7 @@
- //set the actual type argument of Holder in the TypeReference
- if (isHolder) {
- if (clazzType==Holder.class)
-- clazzType = Navigator.REFLECTION.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
-+ clazzType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]);
- }
-
- Mode paramMode = isHolder ? Mode.INOUT : Mode.IN;
-@@ -1258,14 +1257,14 @@
- private Class getAsyncReturnType(Method method, Class returnType) {
- if(Response.class.isAssignableFrom(returnType)){
- Type ret = method.getGenericReturnType();
-- return Navigator.REFLECTION.erasure(((ParameterizedType)ret).getActualTypeArguments()[0]);
-+ return (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)ret).getActualTypeArguments()[0]);
- }else{
- Type[] types = method.getGenericParameterTypes();
- Class[] params = method.getParameterTypes();
- int i = 0;
- for(Class cls : params){
- if(AsyncHandler.class.isAssignableFrom(cls)){
-- return Navigator.REFLECTION.erasure(((ParameterizedType)types[i]).getActualTypeArguments()[0]);
-+ return (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)types[i]).getActualTypeArguments()[0]);
- }
- 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-07-15 21:54:37.000000000 -0700
-@@ -0,0 +1,97 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.ws.model;
-+
-+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-+
-+import java.lang.reflect.Field;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Type;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utils class.
-+ *
-+ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
-+ *
-+ * Has *package private* access to avoid inappropriate usage.
-+ */
-+final class Utils {
-+
-+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
-+
-+ /**
-+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
-+ */
-+ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
-+
-+ static { // we statically initializing REFLECTION_NAVIGATOR property
-+ try {
-+ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
-+ //noinspection unchecked
-+ final Method getInstance = refNav.getDeclaredMethod("getInstance");
-+
-+ // requires accessClassInPackage privilege
-+ AccessController.doPrivileged(
-+ new PrivilegedAction<Object>() {
-+ @Override
-+ public Object run() {
-+ getInstance.setAccessible(true);
-+ return null;
-+ }
-+ }
-+ );
-+
-+ //noinspection unchecked
-+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
-+ } catch (ClassNotFoundException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("Can't find ReflectionNavigator class");
-+ } catch (InvocationTargetException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
-+ } catch (NoSuchMethodException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
-+ } catch (IllegalAccessException e) {
-+ e.printStackTrace();
-+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
-+ } catch (SecurityException e) {
-+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
-+ throw e;
-+ }
-+ }
-+
-+ /**
-+ * private constructor to avoid util class instantiating
-+ */
-+ private Utils() {
-+ }
-+}
---- ./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-07-15 21:46:13.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
-@@ -61,7 +61,7 @@
-
- private static final AbstractWrapperBeanGenerator RUNTIME_GENERATOR =
- new RuntimeWrapperBeanGenerator(new RuntimeInlineAnnotationReader(),
-- Navigator.REFLECTION, FIELD_FACTORY);
-+ Utils.REFLECTION_NAVIGATOR, FIELD_FACTORY);
-
- 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/AssertionSet.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java 2013-09-06 11:24:06.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./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 2014-07-15 21:46:13.000000000 -0700
-@@ -0,0 +1,92 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.ws.policy.privateutil;
-+
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
-+ * to java.lang,reflect.Method.invoke()
-+ */
-+class MethodUtil {
-+
-+ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
-+ private static final Method INVOKE_METHOD;
-+
-+ static {
-+ Method method;
-+ try {
-+ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
-+ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
-+ }
-+ } catch (Throwable t) {
-+ method = null;
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
-+ }
-+ }
-+ INVOKE_METHOD = method;
-+ }
-+
-+ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
-+ if (INVOKE_METHOD != null) {
-+ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
-+ }
-+ try {
-+ return INVOKE_METHOD.invoke(null, method, target, args);
-+ } catch (InvocationTargetException ite) {
-+ // unwrap invocation exception added by reflection code ...
-+ throw unwrapException(ite);
-+ }
-+ } else {
-+ // other then Oracle JDK ...
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
-+ }
-+ return method.invoke(target, args);
-+ }
-+ }
-+
-+ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
-+ Throwable targetException = ite.getTargetException();
-+ if (targetException != null && targetException instanceof InvocationTargetException) {
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
-+ }
-+ return (InvocationTargetException) targetException;
-+ } else {
-+ return ite;
-+ }
-+ }
-+
-+}
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./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 2014-07-15 21:46:13.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
-@@ -282,13 +282,13 @@
- /**
- * Reflection utilities wrapper
- */
-- public static class Reflection {
-+ static class Reflection {
- private static final PolicyLogger LOGGER = PolicyLogger.getLogger(PolicyUtils.Reflection.class);
-
- /**
- * Reflectively invokes specified method on the specified target
- */
-- public static <T> T invoke(final Object target, final String methodName,
-+ static <T> T invoke(final Object target, final String methodName,
- final Class<T> resultClass, final Object... parameters) throws RuntimePolicyUtilsException {
- Class[] parameterTypes;
- if (parameters != null && parameters.length > 0) {
-@@ -311,7 +311,7 @@
- final Object[] parameters, final Class[] parameterTypes) throws RuntimePolicyUtilsException {
- try {
- final Method method = target.getClass().getMethod(methodName, parameterTypes);
-- final Object result = method.invoke(target, parameters);
-+ final Object result = MethodUtil.invoke(target, method,parameters);
-
- return resultClass.cast(result);
- } catch (IllegalArgumentException e) {
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:54:37.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/policy/sourcemodel/attach/package-info.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java 2013-09-06 11:24:07.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./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 2014-07-15 21:46:13.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
-@@ -157,7 +157,7 @@
- if (!method.isAccessible()) {
- method.setAccessible(true);
- }
-- method.invoke(instance,args);
-+ MethodUtil.invoke(instance,method,args);
- } catch (IllegalAccessException e) {
- 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 2014-07-15 21:46:13.000000000 -0700
-@@ -0,0 +1,94 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.xml.internal.ws.server;
-+
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+/**
-+ * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
-+ * to java.lang,reflect.Method.invoke()
-+ *
-+ * Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
-+ */
-+class MethodUtil {
-+
-+ private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
-+ private static final Method INVOKE_METHOD;
-+
-+ static {
-+ Method method;
-+ try {
-+ Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
-+ method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
-+ }
-+ } catch (Throwable t) {
-+ method = null;
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
-+ }
-+ }
-+ INVOKE_METHOD = method;
-+ }
-+
-+ static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
-+ if (INVOKE_METHOD != null) {
-+ // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
-+ }
-+ try {
-+ return INVOKE_METHOD.invoke(null, method, target, args);
-+ } catch (InvocationTargetException ite) {
-+ // unwrap invocation exception added by reflection code ...
-+ throw unwrapException(ite);
-+ }
-+ } else {
-+ // other then Oracle JDK ...
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
-+ }
-+ return method.invoke(target, args);
-+ }
-+ }
-+
-+ private static InvocationTargetException unwrapException(InvocationTargetException ite) {
-+ Throwable targetException = ite.getTargetException();
-+ if (targetException != null && targetException instanceof InvocationTargetException) {
-+ if (LOGGER.isLoggable(Level.FINE)) {
-+ LOGGER.log(Level.FINE, "Unwrapping invocation target exception");
-+ }
-+ return (InvocationTargetException) targetException;
-+ } else {
-+ return ite;
-+ }
-+ }
-+
-+}
---- ./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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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-07-15 21:46:13.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/soap/AttachmentPart.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java 2014-07-15 21:46:13.000000000 -0700
-@@ -40,11 +40,12 @@
- */
- private static Object newInstance(String className,
- ClassLoader classLoader)
-- throws SOAPException
-+ throws SOAPException
- {
- try {
- Class spiClass = safeLoadClass(className, classLoader);
- return spiClass.newInstance();
-+
- } catch (ClassNotFoundException x) {
- throw new SOAPException("Provider " + className + " not found", x);
- } catch (Exception x) {
-@@ -66,7 +67,7 @@
- * @exception SOAPException if there is a SOAP error
- */
- static Object find(String factoryId)
-- throws SOAPException
-+ throws SOAPException
- {
- return find(factoryId, null, false);
- }
-@@ -92,7 +93,7 @@
- * @exception SOAPException if there is a SOAP error
- */
- static Object find(String factoryId, String fallbackClassName)
-- throws SOAPException
-+ throws SOAPException
- {
- return find(factoryId, fallbackClassName, true);
- }
-@@ -122,7 +123,7 @@
- * @exception SOAPException if there is a SOAP error
- */
- static Object find(String factoryId, String defaultClassName,
-- boolean tryFallback) throws SOAPException {
-+ boolean tryFallback) throws SOAPException {
- ClassLoader classLoader;
- try {
- classLoader = Thread.currentThread().getContextClassLoader();
-@@ -133,7 +134,7 @@
- // Use the system property first
- try {
- String systemProp =
-- System.getProperty( factoryId );
-+ System.getProperty( factoryId );
- if( systemProp!=null) {
- return newInstance(systemProp, classLoader);
- }
-@@ -144,7 +145,7 @@
- try {
- String javah=System.getProperty( "java.home" );
- String configFile = javah + File.separator +
-- "lib" + File.separator + "jaxm.properties";
-+ "lib" + File.separator + "jaxm.properties";
- File f=new File( configFile );
- if( f.exists()) {
- Properties props=new Properties();
-@@ -167,13 +168,13 @@
-
- if( is!=null ) {
- BufferedReader rd =
-- new BufferedReader(new InputStreamReader(is, "UTF-8"));
-+ new BufferedReader(new InputStreamReader(is, "UTF-8"));
-
- String factoryClassName = rd.readLine();
- rd.close();
-
- if (factoryClassName != null &&
-- ! "".equals(factoryClassName)) {
-+ ! "".equals(factoryClassName)) {
- return newInstance(factoryClassName, classLoader);
- }
- }
-@@ -188,7 +189,7 @@
- // (built in) factory if specified.
- if (defaultClassName == null) {
- throw new SOAPException(
-- "Provider for " + factoryId + " cannot be found", null);
-+ "Provider for " + factoryId + " cannot be found", null);
- }
- return newInstance(defaultClassName, classLoader);
- }
-@@ -200,7 +201,7 @@
- * Class.forName() on it so it will be loaded by the bootstrap class loader.
- */
- private static Class safeLoadClass(String className,
-- ClassLoader classLoader)
-+ ClassLoader classLoader)
- throws ClassNotFoundException {
- try {
- // make sure that the current thread has an access to the package of the given name.
-@@ -218,7 +219,7 @@
- return classLoader.loadClass(className);
- } catch (SecurityException se) {
- // (only) default implementation can be loaded
-- // using bootstrap class loader ...
-+ // using bootstrap class loader:
- if (isDefaultImplementation(className))
- return Class.forName(className);
-
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java 2014-07-15 21:46:13.000000000 -0700
-@@ -96,8 +96,9 @@
- * @see SAAJMetaFactory
- */
-
-- public static MessageFactory newInstance()
-- throws SOAPException {
-+ public static MessageFactory newInstance() throws SOAPException {
-+
-+
- try {
- MessageFactory factory = (MessageFactory) FactoryFinder.find(
- MESSAGE_FACTORY_PROPERTY,
-@@ -107,8 +108,8 @@
- if (factory != null) {
- return factory;
- }
--
- return newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
-+
- } catch (Exception ex) {
- throw new SOAPException(
- "Unable to create message factory for SOAP: "
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java 2014-07-15 21:46:13.000000000 -0700
-@@ -261,7 +261,8 @@
- throws SOAPException
- {
- try {
-- SOAPFactory factory = (SOAPFactory) FactoryFinder.find(SOAP_FACTORY_PROPERTY, DEFAULT_SOAP_FACTORY, false);
-+ SOAPFactory factory = (SOAPFactory) FactoryFinder.find(
-+ SOAP_FACTORY_PROPERTY, DEFAULT_SOAP_FACTORY, false);
- if (factory != null)
- return factory;
- return newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java 2013-09-06 11:24:11.000000000 -0700
-+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java 2014-07-15 21:46:13.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
---- ./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-07-15 21:46:13.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-10-28 20:19:52.000000000 -0700
-@@ -123,6 +123,7 @@
- 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
- 69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
- f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
-+0870207843e2a74816dff1e33a717ffaf6f0a919 7u0
- 2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
- a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
- b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
-@@ -342,3 +343,147 @@
- b479996d5c924128c3490165b592bf66a3034932 jdk7u40-b42
- fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43
- ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60
-+e045f6a3ad1d9f7b8982418addb3803ab63458f2 jdk7u40-b61
-+26cc60a250a0d333b1d5d7a9acb233ad62b2fb0b jdk7u40-b62
-+55f01444cf58c8004df9a9634c1bd7ff87caa370 jdk7u25-b32
-+b06abd965701459a868e88af9a3e564c0301971c jdk7u45-b01
-+d23a877da2d5dad6520a268c83f183295a9e7299 jdk7u45-b02
-+a56eb4f801232c409d34cd1190df4eec5fefe8a9 jdk7u45-b03
-+702c8d83dd8c5b6c76fe53a694244a36d23fa860 jdk7u45-b04
-+a70540e8a5e96773b83c7dc0accdb323d946c045 jdk7u45-b05
-+f39399baf36761571719f6ff5dc69c514d97842d jdk7u45-b06
-+a35d4a4ebcfa895202544c2f6b2d09e0b29bddfc jdk7u45-b07
-+2f01847eb9530ed5ec08b1b663f3a02cac57b048 jdk7u45-b08
-+6e2313d45f0c50d824531b32d3f577aa0b357551 jdk7u45-b09
-+d4506b816f63330489e00ba0b9e3c6583a8a9efa jdk7u45-b10
-+ee87452ba9e2b4b7d847bd2a7910a8aaeacfea7b jdk7u45-b11
-+d5e393a55e6adc2f1b9aaa752a5004fa07561480 jdk7u45-b12
-+34997920efe962b2e4422e2c2de8ae91cd1d563d jdk7u45-b13
-+59a78e4ca635a469a763ee408b11f8e1033f2584 jdk7u45-b14
-+96782fe0c38c41cc4806e27ee64b20dc647ea808 jdk7u45-b15
-+3c9a6d9eafd31be44b0ade0354e60f5078b417a4 jdk7u45-b16
-+3a65c1b0c6d15fb24298bcd133d7ab4baa741ae2 jdk7u45-b17
-+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
-+6b3c195c73b051ee3c4a0ac44f050011414ab08b jdk7u51-b03
-+96431826ae3a927008c56aeefa1397a33bda3e70 jdk7u51-b04
-+8ee582bb96a6b79311d55a7170f42844af77a269 jdk7u51-b05
-+594ae80153afaeced6acedff5d37f889a9821690 jdk7u51-b06
-+7b84e6514c297861d85ed9457b2260805311d9e8 jdk7u51-b07
-+40fca6b57cd81114d4aace3d0469e20274f015c3 jdk7u51-b08
-+33ae35eeb5a4c04a4d05351ff68d4021e4cad752 jdk7u51-b09
-+4a6e31d94b29c7115235824a6e317289819bb00f jdk7u51-b10
-+f0425ecbbb0ca9d8c87c250c19e8f9524b38833d jdk7u51-b11
-+f5eee4f1d5b4a1e19febc9c26c863ae853ed6d2e jdk7u51-b12
-+d19a89fdfb9b959b8638441d9d396685d6c7ab7b jdk7u51-b13
-+ef58b2b9a9a1e1a42b0139b57816a160c4681371 jdk7u51-b30
-+5bca0d0969b13b1d9b8caba3cce8293a98d68318 jdk7u51-b31
-+e9143dc3dc2a8f4b896e74f70d6c503d73c40533 jdk7u51-b33
-+c1eaf405fb8d7beddd75c6f81671970f6baa70d8 jdk7u51-b34
-+f5eee4f1d5b4a1e19febc9c26c863ae853ed6d2e jdk7u55-b00
-+5010db5b9b5ab07a9409a5c557d3f43ab32dc428 jdk7u55-b01
-+2ca3e1fa4455ad564228ad6e654498167af2f20d jdk7u55-b02
-+c12b3c81366cb067ff4444952209d54bfa387353 jdk7u55-b03
-+476d1bddaa32bf440953c3b1814ba38f16886c03 jdk7u55-b04
-+7fa6d3ba2cc77cd1e6f24e33f0c39788cb2893b8 jdk7u65-b00
-+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
-+ffd99c5975217a14609851602c5f5dc005234aba jdk7u55-b14
-+a015a0971dacd536f1ab92bf9bcf0dafb7684e61 jdk7u55-b15
-+88f1bf248cc520e0bf7ef17bc862f87aab958373 jdk7u55-b31
-+b83f5194edf23b752fe2c0a9be361455f87196df jdk7u55-b32
-+01a4cd03a6c85abb62eb5d1c2b5bf7d2f544c04e jdk7u55-b33
-+3f54f8a387c1a908c07106b685183b19a5fc1064 jdk7u55-b34
-+2cdc52ec4813abe38b4e52ae9c9f0ff5dcc87faa jdk7u55-b35
-+6845d311ff990d422f9376d37e3e82d5d06bff3f jdk7u55-b36
-+db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
-+def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01
-+ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02
-+b1bcc999a8f1b4b4452b59c6636153bb0154cf5a jdk7u60-b03
-+efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u60-b04
-+4fb749a3110727d5334c69793578a3254a053bf5 jdk7u60-b05
-+46ca1ce7550f1463d60c3eacaf7b8cdc44b0c66e jdk7u60-b06
-+d5a2f60006e3c4243abeee0f623e5c3f79372fd8 jdk7u60-b07
-+0dd27693876d66d176457749d0f2161b219eba2d jdk7u60-b08
-+7b571638b0f51bcbe04c088dfff569b4cba6bbdf jdk7u60-b09
-+fb4981489b09594d2449527e2d511834cf8ad370 jdk7u60-b10
-+c2bb87dae8a08eab6f4f336ce5a59865aa0214d6 jdk7u60-b11
-+1a90de8005e3de2475fd9355dcdb6f5e60bf89cc jdk7u60-b12
-+b06d4ed71ae0bc6e13f5a8437cb6388f17c66e84 jdk7u60-b13
-+b7fbd9b4febf8961091fdf451d3da477602a8f1d jdk7u60-b14
-+04882f9a073e8de153ec7ad32486569fd9a087ec jdk7u60-b15
-+41547583c3a035c3924ffedfa8704e58d69e5c50 jdk7u60-b16
-+e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17
-+e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b18
-+c220d329a78161f79df73048ed55db91f538e3b7 jdk7u65-b01
-+7190843ddaf4f3ad158c3071be0f4ca42a5802dc jdk7u60-b19
-+8dc56d0f3e860658619eaa57d10fb1a4182d71cd jdk7u60-b30
-+feac9624a1e1ffebe09a19ae351d88e3ef98c441 jdk7u60-b31
-+fb40615ef352e03ee94c0682a6ca0a0e6a33a70b jdk7u60-b32
-+9cfcdeeecfac66004cb5bbb2c5bba5c57e170539 jdk7u60-b33
-+a42a3bb22f6991d8f6a30e4f1782ad620c40eb65 jdk7u65-b02
-+756071871d61e1ca410c63a3f1c4dabcc51a90df jdk7u65-b03
-+bac16c82c14a35d1e9d3c4d0bd317dbbb296f34e jdk7u65-b04
-+14b3f82c245fb8d0eeb21dc99ff0b4985571910c jdk7u65-b05
-+7d8e5d90789533b5cc22eeb15c19ce1bb8a20573 jdk7u65-b06
-+cde691a6989fa875107a3974aa92681d286be6ec jdk7u65-b07
-+d5353f8e1e02e12a1262d65ed85183425b0cdf13 jdk7u65-b08
-+45913a29c1edd3e63c9c818ffab7aebd4d75fa40 jdk7u65-b09
-+3bb943c6ff7dd614cb428501db8c2c655e5f5223 jdk7u65-b10
-+b84e98280630be44a87f4336009f61350f3c7dc0 jdk7u65-b11
-+61d15f512305655a51c04811006850e4955936bd jdk7u65-b12
-+69698344d0a1771ed9162ecad2065829ca1f8994 jdk7u65-b13
-+2e6105ddad44866c4cdc1ba06620b48685e34111 jdk7u65-b14
-+8cff6ce00a91820b4cb7ef24ed42063c2305127d jdk7u65-b15
-+190017413768f02addea8b2c5106157e3c4076c7 jdk7u65-b16
-+23e78e36bc39f4f761ac2b0e055c562c3ff204f5 jdk7u65-b17
-+96d1fa382dda17ae105f28083bda41f79fc3093f jdk7u65-b30
-+7f7430459adfe7b7fb65da8c3fac2ac5e3495ea1 jdk7u65-b18
-+ba6cef21c369076be97dd8133fd4a158cd486bd8 jdk7u65-b19
-+c3a56021fc22f886106f123d4f25b385ac6b79d7 jdk7u65-b32
-+8b9d926bd35adceb99f244b7b068fedb0f220f03 jdk7u65-b20
-+5cf343beab2ce73d299d4f1a8f3b95892f9fd818 jdk7u67-b01
-+ba6cef21c369076be97dd8133fd4a158cd486bd8 jdk7u65-b40
-+7b47a34063e94e1ab5636b11231d33fae92754c9 jdk7u65-b31
-+4cb63f8ca9ee8c60d6f3d0051b69acc8392bd8de jdk7u65-b33
-+9ccfe70cee626ac7831cfa7b7a7eb7a88fe1cd42 jdk7u66-b00
-+fc87b55d62fc1e81aaf61ff21175129b8ccc302e jdk7u66-b01
-+c67e394e49429565540f04c5c2a5544f750658bb jdk7u66-b09
-+257fd79cdef52511db18e1bab8967d94a03920bc jdk7u66-b10
-+6f38c929df1b9d6df7760b2eb9bf3e4681a27c56 jdk7u66-b11
-+d4f0008cdf6d3ec8e8e210c03e55aaa751647e8d jdk7u66-b12
-+24b7c3d0942766af3415dd6125b9b8da059dbccc jdk7u66-b13
-+74d01c3385b915490255cd7467a3740aa3dce310 jdk7u66-b14
-+07fc91c550da6ba689e3abc9e688edcb73f9c95c jdk7u66-b15
-+d4814cafa25f5b076be9e99be2a8c0d98929476d jdk7u66-b16
-+69adfb3ccee5373438a6c394646c2c5ab93c89ee jdk7u66-b17
-+ee0cedc50d3250edf24e96aecc785580dd61944f jdk7u71-b00
-+6c865d8ab14093e4ef95e7c548c432e4bf887760 jdk7u71-b01
-+829ca47df2ced2d0dc330391bf7578363369b92b jdk7u71-b02
-+5b9e9506bd57763c958ea6fcff99b03d47942b9d jdk7u71-b03
-+347bc2b7831097ea373ef7be72bfbf0ba3de4b7f jdk7u71-b04
-+3019595da91688c79f617cf737431a2acee3ef71 jdk7u71-b05
-+0a05fabc719fe6c1ed02678d255f1250b32c30ed jdk7u71-b06
-+48db48aab05e47cafc37b277f68a0e2ff5f1f0b6 jdk7u71-b07
-+9ff013674339cb269280bfb4eaba40bba0584c40 jdk7u71-b08
-+7e47a971eff7d78a459c23ee0d44b8f6c6c4c812 jdk7u71-b09
-+919e84964279a058da2c8d4088c570c19543979f jdk7u71-b10
-+1108ab8e3dce0318529b4bcda46ce895659bb09b jdk7u71-b11
-+ae4e88c495851c43862e2fc3d1ff7b64c68f368c jdk7u71-b12
-+a6cbc82d62f915cdcd6037c8b40a4590585553c7 jdk7u71-b13
---- ./jdk/make/bridge/AccessBridgeJava/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ ./jdk/make/bridge/AccessBridgeJava/Makefile 2014-07-15 21:49:28.000000000 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+# 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
-@@ -51,7 +51,7 @@
- #
- # Java files to compile.
- #
--FILES_java = com/sun/java/accessibility/AccessBridge.java
-+FILES_java = com/sun/java/accessibility/AccessBridgeLoader.java com/sun/java/accessibility/AccessBridge.java
-
- #
- # Location for the newly built classfiles.
-@@ -68,7 +68,7 @@
- build: prebuild
-
- prebuild:
-- $(CP) $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility/$(ABPLATFORM)/AccessBridge.java \
-+ $(CP) $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility/$(ABPLATFORM)/AccessBridgeLoader.java \
- $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility
-
- all : build $(JARFILE)
---- ./jdk/make/bridge/Jabswitch/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ ./jdk/make/bridge/Jabswitch/Makefile 2014-07-15 21:49:28.000000000 -0700
-@@ -53,7 +53,7 @@
- buildexe :
- $(CD) $(TEMPDIR)
- $(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE)
-- $(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE)
-+ $(CC) $(CPPFLAGS) $(JAB_SRC) $(VERSIONRES) /link $(LDDFLAGS) -out:$(JAB_EXE)
- $(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE)
-
- copyfilejab :
---- ./jdk/make/com/oracle/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ ./jdk/make/com/oracle/Makefile 2014-07-15 21:49:28.000000000 -0700
-@@ -30,22 +30,8 @@
- #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
- include $(BUILDDIR)/common/Defs.gmk
-
--JFR_SRCDIRS_EXIST := $(shell \
-- if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \
-- echo true; \
-- else \
-- echo false; \
-- fi)
--
--JFR =
--ifndef OPENJDK
-- ifndef JAVASE_EMBEDDED
-- ifeq ($(JFR_SRCDIRS_EXIST), true)
-- ifneq (${ARCH},arm)
-- JFR = jfr
-- endif
-- endif
-- endif
-+ifeq ($(BUILD_JFR), true)
-+ JFR = jfr
- endif
-
- # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
---- ./jdk/make/com/sun/jmx/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ ./jdk/make/com/sun/jmx/Makefile 2014-07-15 21:49:28.000000000 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2003, 2012, 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
-@@ -115,6 +115,8 @@
-
- ifeq ($(CROSS_COMPILE_ARCH),)
- RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
-+else
-+RMIC = $(BOOT_JAVA_CMD) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
- endif
-
- $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-@@ -130,11 +132,13 @@
- $(RMIC) -classpath "$(CLASSDESTDIR)" \
- -d $(CLASSDESTDIR) \
- -iiop -v1.2 \
-+ -emitPermissionCheck \
- $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
- $(RMIC) $(HOTSPOT_INTERPRETER_FLAG) -classpath "$(CLASSDESTDIR)" \
- -d $(CLASSDESTDIR) \
- -iiop -v1.2 \
- -standardPackage \
-+ -emitPermissionCheck \
- $(subst /,.,$(<:$(CLASSDESTDIR)/%.class=%))
- @$(java-vm-cleanup)
-
---- ./jdk/make/com/sun/nio/Makefile 2013-09-06 11:27:36.000000000 -0700
-+++ ./jdk/make/com/sun/nio/Makefile 2014-10-28 20:19:52.000000000 -0700
-@@ -31,11 +31,18 @@
- include $(BUILDDIR)/common/Defs.gmk
-
- # MMM: disable for now
--ifneq ($(PLATFORM), macosx)
-+ifeq (,$(findstring $(PLATFORM), bsd macosx))
- include $(BUILDDIR)/common/Subdirs.gmk
- SUBDIRS = sctp
- endif
-
-+ifeq ($(OS_VENDOR), FreeBSD)
-+# FreeBSD 5.x and lower are unsupported, 6.x has no sctp support.
-+ifneq ($(call MajorVersion,$(shell uname -r)), 6)
-+include $(BUILDDIR)/common/Subdirs.gmk
-+SUBDIRS = sctp
-+endif
-+endif
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -59,15 +59,11 @@
- -I$(PLATFORM_SRC)/native/java/net \
- -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
-
-+OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
- ifeq ($(PLATFORM), linux)
- COMPILER_WARNINGS_FATAL=true
--#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
--OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
-+OTHER_LDLIBS += -lpthread $(LIBDL)
- endif
--ifeq ($(PLATFORM), solaris)
--#LIBSCTP = -lsctp
--OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
--endif # PLATFORM
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -67,7 +67,7 @@
- include FILES_c_solaris.gmk
- endif # solaris
-
--ifneq (,$(findstring $(PLATFORM), linux macosx))
-+ifneq (,$(findstring $(PLATFORM), linux bsd macosx))
- LIBRARY = jaas_unix
- 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-10-28 20:19:52.000000000 -0700
-@@ -43,7 +43,7 @@
- sun/tools/attach/LinuxVirtualMachine.java
- endif
-
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- FILES_export = \
- 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-10-28 20:19:52.000000000 -0700
-@@ -39,7 +39,7 @@
- LinuxVirtualMachine.c
- endif
-
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- FILES_c = \
- 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-10-28 20:19:52.000000000 -0700
-@@ -43,7 +43,7 @@
- sun/tools/attach/LinuxAttachProvider.java
- endif
-
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- FILES_java += \
- 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-10-28 20:19:52.000000000 -0700
-@@ -38,7 +38,7 @@
- ifeq ($(PLATFORM), linux)
- FILES_m = mapfile-linux
- endif
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- FILES_m = mapfile-bsd
- endif
- include $(BUILDDIR)/common/Mapfile-vers.gmk
-@@ -57,7 +57,7 @@
- EXTRA_LIBS += psapi.lib
- endif
-
--ifeq ($PLATFORM), macosx)
-+ifeq ($(PLATFORM), macosx)
- vpath %.c $(call NativeSrcDirList,,native/sun/tools/attach)
- 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-10-28 20:19:52.000000000 -0700
-@@ -30,6 +30,7 @@
- Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
- Java_sun_tools_attach_BsdVirtualMachine_close;
- Java_sun_tools_attach_BsdVirtualMachine_connect;
-+ Java_sun_tools_attach_BsdVirtualMachine_getTempDir;
- Java_sun_tools_attach_BsdVirtualMachine_open;
- 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-10-28 20:19:52.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.
-+#
-+# 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.
-+#
-+
-+#
-+# Makefile to specify compiler flags for programs and libraries
-+# targeted to BSD. Should not contain any rules.
-+#
-+# WARNING: This file is shared with other workspaces.
-+# So when it includes other files, it must use JDK_TOPDIR.
-+#
-+
-+# Warning: the following variables are overriden by Defs.gmk. Set
-+# values will be silently ignored:
-+# CFLAGS (set $(OTHER_CFLAGS) instead)
-+# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
-+# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
-+# LDFLAGS (set $(OTHER_LDFAGS) instead)
-+# LDLIBS (set $(EXTRA_LIBS) instead)
-+# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
-+
-+# Get shared JDK settings
-+include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
-+
-+# Part of INCREMENTAL_BUILD mechanism.
-+# Compiler emits things like: path/file.o: file.h
-+# We want something like: relative_path/file.o relative_path/file.d: file.h
-+CC_DEPEND = -MM
-+CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
-+
-+ifndef PLATFORM_SRC
-+ PLATFORM_SRC = $(BUILDDIR)/../src/solaris
-+endif # PLATFORM_SRC
-+
-+# Location of the various .properties files specific to BSD platform
-+ifndef PLATFORM_PROPERTIES
-+ PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib
-+endif # PLATFORM_SRC
-+
-+# BSD build pulls its platform sources from the solaris tree.
-+JAVA_SRCDIR_LIST = src/macosx src/solaris src/share
-+NATIVE_SRCDIR_LIST = src/macosx src/solaris src/share
-+
-+# Platform specific closed sources
-+ifndef OPENJDK
-+ ifndef CLOSED_PLATFORM_SRC
-+ CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
-+ endif
-+endif
-+
-+# platform specific include files
-+PLATFORM_INCLUDE_NAME = $(OS_NAME)
-+PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
-+
-+# suffix used for make dependencies files.
-+DEPEND_SUFFIX = d
-+# The suffix applied to the library name for FDLIBM
-+FDDLIBM_SUFFIX = a
-+# The suffix applied to scripts (.bat for windows, nothing for unix)
-+SCRIPT_SUFFIX =
-+# CC compiler object code output directive flag value
-+CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
-+CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
-+
-+# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
-+# enabled with debug info files ZIP'ed to save space. For VARIANT !=
-+# OPT builds, FDS is always enabled, after all a debug build without
-+# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
-+# meaning when FDS is enabled.
-+#
-+# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
-+# disabled for a VARIANT == OPT build.
-+#
-+# Note: Use of a different variable name for the FDS override option
-+# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
-+# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
-+# in options via environment variables, use of distinct variables
-+# prevents strange behaviours. For example, in a VARIANT != OPT build,
-+# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
-+# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
-+# variable name is used, then different values can be picked up by
-+# different parts of the build. Just to be clear, we only need two
-+# variable names because the incoming option value can be overridden
-+# in some situations, e.g., a VARIANT != OPT build.
-+
-+ifeq ($(VARIANT), OPT)
-+ FULL_DEBUG_SYMBOLS ?= 1
-+ ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
-+else
-+ # debug variants always get Full Debug Symbols (if available)
-+ ENABLE_FULL_DEBUG_SYMBOLS = 1
-+endif
-+_JUNK_ := $(shell \
-+ echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
-+# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
-+
-+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-+ # Default OBJCOPY comes from GNU Binutils on BSD:
-+ DEF_OBJCOPY=/usr/bin/objcopy
-+ ifdef CROSS_COMPILE_ARCH
-+ # don't try to generate .debuginfo files when cross compiling
-+ _JUNK_ := $(shell \
-+ echo >&2 "INFO: cross compiling for ARCH $(CROSS_COMPILE_ARCH)," \
-+ "skipping .debuginfo generation.")
-+ OBJCOPY=
-+ else
-+ OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
-+ ifneq ($(ALT_OBJCOPY),)
-+ _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
-+ # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
-+ OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
-+ endif
-+ endif
-+
-+ # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
-+ # JDK build to import .debuginfo or .diz files from the HotSpot build.
-+ # However, adding FDS support to the JDK build will occur in phases
-+ # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
-+ # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
-+ # particular library or program supports FDS.
-+
-+ ifeq ($(OBJCOPY),)
-+ _JUNK_ := $(shell \
-+ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
-+ ENABLE_FULL_DEBUG_SYMBOLS=0
-+ else
-+ _JUNK_ := $(shell \
-+ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
-+
-+ # Library stripping policies for .debuginfo configs:
-+ # all_strip - strips everything from the library
-+ # min_strip - strips most stuff from the library; leaves minimum symbols
-+ # no_strip - does not strip the library at all
-+ #
-+ # Oracle security policy requires "all_strip". A waiver was granted on
-+ # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
-+ #
-+ # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
-+ STRIP_POLICY ?= min_strip
-+
-+ _JUNK_ := $(shell \
-+ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
-+
-+ ZIP_DEBUGINFO_FILES ?= 1
-+
-+ _JUNK_ := $(shell \
-+ echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
-+ endif
-+endif
-+
-+#
-+# Default optimization
-+#
-+
-+ifndef OPTIMIZATION_LEVEL
-+ ifeq ($(PRODUCT), java)
-+ OPTIMIZATION_LEVEL = HIGHER
-+ else
-+ OPTIMIZATION_LEVEL = LOWER
-+ endif
-+endif
-+ifndef FASTDEBUG_OPTIMIZATION_LEVEL
-+ FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
-+endif
-+
-+CC_OPT/NONE =
-+CC_OPT/LOWER = -O2
-+CC_OPT/HIGHER = -O3
-+CC_OPT/HIGHEST = -O3
-+
-+CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
-+
-+# For all platforms, do not omit the frame pointer register usage.
-+# We need this frame pointer to make it easy to walk the stacks.
-+# This should be the default on X86, but ia64 and amd64 may not have this
-+# as the default.
-+CFLAGS_REQUIRED_amd64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-+LDFLAGS_COMMON_amd64 += -m64
-+CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-+LDFLAGS_COMMON_i586 += -m32
-+CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-+CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
-+LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
-+CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
-+LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
-+CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN
-+CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN
-+ifeq ($(ZERO_BUILD), true)
-+ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
-+ ifeq ($(ZERO_ENDIANNESS), little)
-+ CFLAGS_REQUIRED += -D_LITTLE_ENDIAN
-+ endif
-+ LDFLAGS_COMMON += $(ZERO_ARCHFLAG)
-+else
-+ CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
-+ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
-+endif
-+
-+#
-+# Selection of warning messages
-+#
-+GCC_INHIBIT = -Wno-unused -Wno-parentheses
-+GCC_STYLE =
-+GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
-+
-+#
-+# Treat compiler warnings as errors, if warnings not allowed
-+#
-+ifeq ($(COMPILER_WARNINGS_FATAL),true)
-+ GCC_WARNINGS += -Werror
-+endif
-+
-+#
-+# Misc compiler options
-+#
-+ifneq ($(ARCH),ppc)
-+ CFLAGS_COMMON = -fno-strict-aliasing
-+endif
-+PIC_CODE_LARGE = -fPIC
-+PIC_CODE_SMALL = -fpic
-+GLOBAL_KPIC = $(PIC_CODE_LARGE)
-+CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
-+ifeq ($(ARCH), amd64)
-+ CFLAGS_COMMON += -pipe
-+endif
-+
-+# BSD 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1
-+DEBUG_FLAG = -g
-+ifeq ($(FASTDEBUG), true)
-+ ifeq ($(ARCH_DATA_MODEL), 64)
-+ DEBUG_FLAG = -g1
-+ endif
-+endif
-+
-+# DEBUG_BINARIES overrides everything, use full -g debug information
-+ifeq ($(DEBUG_BINARIES), true)
-+ DEBUG_FLAG = -g
-+ CFLAGS_REQUIRED += $(DEBUG_FLAG)
-+endif
-+
-+# If Full Debug Symbols is enabled, then we want the same debug and
-+# optimization flags as used by FASTDEBUG.
-+#
-+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-+ ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
-+ ifeq ($(VARIANT), OPT)
-+ CC_OPT = $(DEBUG_FLAG) $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
-+ endif
-+ endif
-+endif
-+
-+CFLAGS_OPT = $(CC_OPT)
-+CFLAGS_DBG = $(DEBUG_FLAG)
-+CFLAGS_COMMON += $(CFLAGS_REQUIRED)
-+
-+CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
-+CXXFLAGS_OPT = $(CC_OPT)
-+CXXFLAGS_DBG = $(DEBUG_FLAG)
-+CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
-+
-+# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
-+ifeq ($(FASTDEBUG), true)
-+ CFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
-+ CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
-+endif
-+
-+CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
-+
-+# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
-+ifneq ($(ARCH),alpha)
-+ CPP_ARCH_FLAGS += -D$(ARCH)
-+else
-+ CPP_ARCH_FLAGS += -D_$(ARCH)_
-+endif
-+
-+CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D_ALLBSD_SOURCE $(VERSION_DEFINES) \
-+ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
-+
-+ifeq ($(ARCH_DATA_MODEL), 64)
-+CPPFLAGS_COMMON += -D_LP64=1
-+endif
-+
-+CPPFLAGS_OPT = -DNDEBUG
-+CPPFLAGS_DBG = -DDEBUG
-+ifneq ($(PRODUCT), java)
-+ CPPFLAGS_DBG += -DLOGGING
-+endif
-+
-+# Libraries need to locate other libraries at runtime, and you can tell
-+# a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
-+# buried inside the .so. The $ORIGIN says to look relative to where
-+# the library itself is and it can be followed with relative paths from
-+# that. By default we always look in $ORIGIN, optionally we add relative
-+# paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths.
-+# On BSD we add a flag -z origin, not sure if this is necessary, but
-+# doesn't seem to hurt.
-+# The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
-+# Try: 'readelf -d lib*.so' to see these settings in a library.
-+#
-+Z_ORIGIN_FLAG/sparc = -Xlinker -z -Xlinker origin
-+Z_ORIGIN_FLAG/i586 = -Xlinker -z -Xlinker origin
-+Z_ORIGIN_FLAG/amd64 = -Xlinker -z -Xlinker origin
-+Z_ORIGIN_FLAG/ia64 = -Xlinker -z -Xlinker origin
-+Z_ORIGIN_FLAG/arm =
-+Z_ORIGIN_FLAG/ppc =
-+Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlinker origin
-+
-+LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
-+
-+LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
-+LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
-+
-+#
-+# -L paths for finding and -ljava
-+#
-+LDFLAGS_OPT = -Xlinker -O1
-+LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
-+LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
-+
-+#
-+# -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
-+# statically link libgcc but will print a warning with the flag. We don't
-+# want the warning, so check gcc version first.
-+#
-+ifeq ($(CC_MAJORVER),3)
-+ OTHER_LDFLAGS += -static-libgcc
-+endif
-+
-+# Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
-+# (See Rules.gmk) The gcc 5 compiler might have an option for this?
-+AUTOMATIC_PCH_OPTION =
-+
-+#
-+# Post Processing of libraries/executables
-+#
-+ifeq ($(VARIANT), OPT)
-+ ifneq ($(NO_STRIP), true)
-+ ifneq ($(DEBUG_BINARIES), true)
-+ # Debug 'strip -S' leaves local function Elf symbols (better stack
-+ # traces)
-+ POST_STRIP_PROCESS = $(STRIP) -S
-+ endif
-+ endif
-+endif
-+
-+#
-+# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o
-+#
-+LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
-+
-+#
-+# Support for Quantify.
-+#
-+ifdef QUANTIFY
-+QUANTIFY_CMD = quantify
-+QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
-+LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
-+endif
-+
-+# Using map files currently break compilation on FreeBSD during shared library
-+# checks for some of the AWT native libraries.
-+ifeq ($(OS_VENDOR), FreeBSD)
-+LDNOMAP=true
-+endif
-+
-+#
-+# Path and option to link against the VM, if you have to. Note that
-+# there are libraries that link against only -ljava, but they do get
-+# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
-+# the library itself should not.
-+#
-+VM_NAME = server
-+JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
-+JAVALIB = -ljava $(JVMLIB)
-+
-+#
-+# We want to privatize JVM symbols on Solaris. This is so the user can
-+# write a function called FindClass and this should not override the
-+# FindClass that is inside the JVM. At this point in time we are not
-+# concerned with other JNI libraries because we hope that there will
-+# not be as many clashes there.
-+#
-+PRIVATIZE_JVM_SYMBOLS = false
-+
-+USE_PTHREADS = true
-+override ALT_CODESET_KEY = _NL_CTYPE_CODESET_NAME
-+override AWT_RUNPATH =
-+override HAVE_ALTZONE = false
-+override HAVE_FILIOH = false
-+override HAVE_GETHRTIME = false
-+override HAVE_GETHRVTIME = false
-+override LEX_LIBRARY = -lfl
-+ifeq ($(STATIC_CXX),true)
-+override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-+else
-+override LIBCXX = -lstdc++
-+endif
-+override LIBPOSIX4 =
-+override LIBSOCKET =
-+override LIBNSL =
-+override LIBSCF =
-+override LIBTHREAD =
-+override LIBDL =
-+override MOOT_PRIORITIES = true
-+override NO_INTERRUPTIBLE_IO = true
-+override OPENWIN_HOME = $(X11_PATH)
-+override OPENWIN_LIB = $(OPENWIN_HOME)/lib
-+override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
-+override SUN_CMM_SUBDIR =
-+override THREADS_FLAG = native
-+override USE_GNU_M4 = true
-+override USING_GNU_TAR = true
-+override WRITE_LIBVERSION = false
-+
-+# USE_EXECNAME forces the launcher to look up argv[0] on $PATH, and put the
-+# resulting resolved absolute name of the executable in the environment
-+# variable EXECNAME. That executable name is then used that to locate the
-+# installation area.
-+override USE_EXECNAME = true
-+
-+# If your platform has DPS, it will have Type1 fonts too, in which case
-+# it is best to enable DPS support until such time as 2D's rasteriser
-+# can fully handle Type1 fonts in all cases. Default is "yes".
-+# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
-+# DPS (Displayable PostScript) is available on Solaris machines
-+HAVE_DPS = no
-+
-+ifeq ($(OS_VENDOR), FreeBSD)
-+ SYSTEM_ZLIB = true
-+endif
-+
-+ifeq ($(OS_VENDOR), OpenBSD)
-+ SYSTEM_ZLIB = true
-+endif
-+
-+#
-+# Japanese manpages
-+#
-+JA_SOURCE_ENCODING = eucJP
-+JA_TARGET_ENCODINGS = UTF-8
-+
-+# Settings for the JDI - Serviceability Agent binding.
-+HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
-+SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
-+SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.debuginfo
-+SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz
-+
-+# The JDI - Serviceability Agent binding is not currently supported
-+# on ia64.
-+ifeq ($(ARCH), ia64)
-+ INCLUDE_SA = false
-+else
-+ INCLUDE_SA = true
-+endif
-+
-+ifdef CROSS_COMPILE_ARCH
-+ # X11 headers are not under /usr/include
-+ OTHER_CFLAGS += -I$(OPENWIN_HOME)/include
-+ 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-07-15 21:49:28.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-10-28 20:19:52.000000000 -0700
-@@ -426,6 +426,7 @@
- override LIBDL = -ldl
- override MOOT_PRIORITIES = true
- override NO_INTERRUPTIBLE_IO = true
-+override OPENWIN_HOME = $(X11_PATH)
- ifeq ($(ARCH), amd64)
- override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
- else
---- ./jdk/make/common/Defs-macosx.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/common/Defs-macosx.gmk 2014-07-15 21:49:28.000000000 -0700
-@@ -397,11 +397,14 @@
- INCLUDE_SA = true
- endif
-
--ifdef CROSS_COMPILE_ARCH
-- # X11 headers are not under /usr/include
-- OTHER_CFLAGS += -I$(OPENWIN_HOME)/include
-- OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
-- OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
--endif
-+# X11 headers are not under /usr/include
-+OTHER_CFLAGS += -I$(OPENWIN_HOME)/include
-+OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
-+OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
-+
-+# Use unlimited select
-+OTHER_CFLAGS += -D_DARWIN_UNLIMITED_SELECT
-+OTHER_CXXFLAGS += -D_DARWIN_UNLIMITED_SELECT
-+OTHER_CPPFLAGS += -D_DARWIN_UNLIMITED_SELECT
-
- LIB_LOCATION ?= $(LIBDIR)
---- ./jdk/make/common/Defs-solaris.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/common/Defs-solaris.gmk 2014-10-28 20:19:52.000000000 -0700
-@@ -753,6 +753,9 @@
- # Network Services library
- LIBNSL = -lnsl
-
-+# Dynamic Loading library
-+LIBDL = -ldl
-+
- # service configuration facility library
- LIBSCF = -lscf
-
---- ./jdk/make/common/Defs.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/common/Defs.gmk 2014-10-28 20:19:52.000000000 -0700
-@@ -179,15 +179,15 @@
-
- ifdef ALT_FREETYPE_LIB_PATH
- FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
-- ifeq ($(PLATFORM), macosx)
-+ ifneq (,$(findstring $(PLATFORM), bsd macosx))
- USING_SYSTEM_FT_LIB=true
- endif
- else
- ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
- FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
- else
-- ifeq ($(PLATFORM), macosx)
-- FREETYPE_LIB_PATH = /usr/X11R6/lib
-+ ifneq (,$(findstring $(PLATFORM), bsd macosx))
-+ FREETYPE_LIB_PATH = $(X11_PATH)/lib
- else
- FREETYPE_LIB_PATH = /usr/lib
- endif
-@@ -201,8 +201,8 @@
- ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
- FREETYPE_HEADERS_PATH = $(DEVTOOLS_FT_DIR)/include
- else
-- ifeq ($(PLATFORM), macosx)
-- FREETYPE_HEADERS_PATH = /usr/X11R6/include
-+ ifneq (,$(findstring $(PLATFORM), bsd macosx))
-+ FREETYPE_HEADERS_PATH = $(X11_PATH)/include
- else
- FREETYPE_HEADERS_PATH = /usr/include
- endif
-@@ -258,6 +258,10 @@
- LDLIBS_COMMON = -pthread
- endif
-
-+ ifeq ($(PLATFORM), bsd)
-+ LDLIBS_COMMON = -pthread
-+ endif
-+
- endif # PROGRAM
-
- LDLIBS_COMMON += $(EXTRA_LIBS)
-@@ -400,7 +404,7 @@
- # We define an intermediate variable for Java files because
- # we use its value later to help define $SOURCEPATH
-
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- VPATH0.java = $(subst $(ONESPACE),:,$(GENSRCDIR) $(call JavaSrcDirList,,classes))
- 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-10-28 20:19:52.000000000 -0700
-@@ -299,8 +299,12 @@
- ifeq ($(PLATFORM), solaris)
- $(STRIP) -x $@
- else
-- # assume Linux
-- $(STRIP) -g $@
-+ ifeq ($(PLATFORM), linux)
-+ $(STRIP) -g $@
-+ else
-+ # assume BSD
-+ $(STRIP) -S $@
-+ endif
- endif
- # 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-10-28 20:19:52.000000000 -0700
-@@ -76,7 +76,7 @@
-
- endif # PLATFORM
-
--ifeq ($(PLATFORM), linux)
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -95,23 +95,31 @@
- endif # SYSTEM_ZLIB
- endif # PLATFORM
-
-+ifeq ($(PLATFORM), bsd)
-+ LDFLAGS += -Wl,--whole-archive
-+ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
-+ LDFLAGS += -Wl,--no-whole-archive
-+# Work-around an dlsym(RTLD_DEFAULT) bug in at least FreeBSD & OpenBSD
-+ LDFLAGS += -Wl,--export-dynamic
-+ ifeq ($(SYSTEM_ZLIB),true)
-+ OTHER_LDLIBS += -lz
-+ endif
-+endif #PLATFORM
-+
- ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems
- LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
- OTHER_LDLIBS += -ljli
- ifeq ($(PLATFORM), solaris)
- ifeq ($(ARCH_DATA_MODEL), 32)
- LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
-- LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
- else # ! ARCH_DATA_MODEL 64-bit
- LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
-- LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
- endif # ARCH_DATA_MODEL
- endif # PLATFORM SOLARIS
- ifeq ($(PLATFORM), linux)
- LDFLAGS += $(LDFLAG_Z_ORIGIN)
- LDFLAGS += -Wl,--allow-shlib-undefined
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
-- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
- endif # PLATFORM LINUX
- endif # PLATFORM linux solaris
-
-@@ -226,6 +234,11 @@
- INFO_PLIST_FILE=
- endif # MACOSX
-
-+ ifeq ($(PLATFORM), bsd)
-+ THREADLIBS = -pthread
-+ OTHER_CPPFLAGS += -DPACKAGE_PATH='"$(PACKAGE_PATH)"'
-+ endif
-+
- #
- # This rule only applies on unix. It supports quantify and its ilk.
- #
-@@ -280,8 +293,12 @@
- ifeq ($(PLATFORM), solaris)
- $(STRIP) -x $@
- else
-- # assume Linux
-- $(STRIP) -g $@
-+ ifeq ($(PLATFORM), linux)
-+ $(STRIP) -g $@
-+ else
-+ # assume BSD
-+ $(STRIP) -S $@
-+ endif
- endif
- # implied else here is no stripping at all
- endif
-@@ -349,7 +366,9 @@
-
-
- ifneq ($(PLATFORM), windows)
-- HAVE_GETHRTIME=true
-+ ifneq ($(PLATFORM), bsd)
-+ HAVE_GETHRTIME=true
-+ endif
- endif #PLATFORM
-
- ifeq ($(HAVE_GETHRTIME),true)
-@@ -359,12 +378,10 @@
- OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
- ifeq ($(PLATFORM), macosx)
- OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)/bin
-- ifneq ($(SYSTEM_ZLIB), true)
-- OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
-- endif # SYSTEM_ZLIB
--else # PLATFORM !MACOSX
-+endif # PLATFORM
-+ifneq ($(SYSTEM_ZLIB), true)
- OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
--endif
-+endif # SYSTEM_ZLIB
-
- OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
- VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release-macosx.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/common/Release-macosx.gmk 2014-07-15 21:49:28.000000000 -0700
-@@ -58,6 +58,9 @@
- jdk-bundle-setup:
- $(RM) -r $(JDK_BUNDLE_DIR)
-
-+jdk-server-bundle-setup:
-+ $(RM) -r $(JDK_SERVER_BUNDLE_DIR)
-+
- jre-bundle-files:
- $(MKDIR) -p $(JRE_BUNDLE_DIR)/MacOS
- ln -s ../Home/lib/jli/libjli.dylib $(JRE_BUNDLE_DIR)/MacOS/
-@@ -79,6 +82,6 @@
- $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" -e "s/@@NAME@@/$(BUNDE_NAME_JDK)/g" -e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" < $(MACOSX_SRC)/bundle/JDK-Info.plist > $(JDK_SERVER_BUNDLE_DIR)/Info.plist
- /usr/bin/SetFile -a B $(JDK_SERVER_BUNDLE_DIR)/../
-
--EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jre-bundle-files jdk-bundle-files jdk-server-bundle-files
-+EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jdk-server-bundle-setup jre-bundle-files jdk-bundle-files jdk-server-bundle-files
-
- .PHONY: $(EXTRA_JRE_TARGETS) $(EXTRA_IMAGE_TARGETS)
---- ./jdk/make/common/Release.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/common/Release.gmk 2014-10-28 20:19:52.000000000 -0700
-@@ -180,6 +180,12 @@
- JA_DIRNAME=ja_JP.UTF-8
- endif # linux
-
-+ifeq ($(PLATFORM), bsd)
-+ MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
-+ MAN1SUBDIR=man
-+ JA_DIRNAME=ja_JP.UTF-8
-+endif # linux
-+
- define copy-man-pages
- $(MKDIR) -p $1/man/man1
- for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
-@@ -402,25 +408,9 @@
- sun/tools/jinfo \
- sun/tools/jmap
-
--JFR_SRCDIRS_EXIST := $(shell \
-- if [ -d $(CLOSED_SHARE_SRC)/classes/com/oracle/jrockit/jfr ] ; then \
-- echo true; \
-- else \
-- echo false; \
-- fi)
--
--BUILD_JFR=
--ifndef OPENJDK
--ifndef JAVASE_EMBEDDED
--ifeq ($(JFR_SRCDIRS_EXIST), true)
--BUILD_JFR=true
--endif
--endif
--endif
--
- # classes that go into jfr.jar
- JFR_CLASSES_DIRS=
--ifdef BUILD_JFR
-+ifeq ($(BUILD_JFR), true)
- JFR_CLASSES_DIRS= \
- com/oracle/jrockit/jfr \
- oracle/jrockit/jfr \
-@@ -629,7 +619,7 @@
- $(ECHO) "sun/tools/jstack/" >> $@
- $(ECHO) "sun/tools/jinfo/" >> $@
- $(ECHO) "sun/tools/jmap/" >> $@
--ifdef BUILD_JFR
-+ifeq ($(BUILD_JFR), true)
- $(ECHO) "com/oracle/jrockit/jfr/" >> $@
- $(ECHO) "com/oracle/jrockit/jfr/client/" >> $@
- $(ECHO) "com/oracle/jrockit/jfr/management/" >> $@
-@@ -668,7 +658,7 @@
-
- # Create jfr.jar
- JFR_JAR=
--ifdef BUILD_JFR
-+ifeq ($(BUILD_JFR), true)
- JFR_JAR=$(ABS_TEMPDIR)/jfr-orig.jar
- $(JFR_JAR): $(OTHER_JAR_MANIFEST_FILE)
- $(prep-target)
-@@ -852,10 +842,6 @@
- $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
- -o meta-index *.jar
- @$(CD) $(JRE_IMAGE_DIR)/lib/ext && $(java-vm-cleanup)
--ifeq ($(PLATFORM), macosx)
-- @#install jobjc, apple mac only
-- $(CP) $(OUTPUTDIR)/JObjC.build/JObjC.jar $(JRE_IMAGE_DIR)/lib/JObjC.jar
--endif # macosx
- ifeq ($(PLATFORM), windows)
- @# Remove certain *.lib files
- $(CD) $(JRE_IMAGE_DIR)/lib && \
-@@ -982,6 +968,11 @@
- endif
- $(RM) -rf $(JDK_IMAGE_DIR)/jre/man
- $(CHMOD) a+rx `$(FIND) $(JDK_IMAGE_DIR) -type d`
-+ ifneq (,$(findstring $(PLATFORM), linux solaris)) # If linux or solaris
-+ ($(CD) $(LIBDIR)/.. && $(TAR) cf - \
-+ `$(FIND) lib -name $(LIB_PREFIX)jli.$(LIB_SUFFIX) -print `) | \
-+ ($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -)
-+ endif # PLATFORM
-
- initial-image-jdk64-bindemos:
- for dir in bin demo ; do \
-@@ -1025,12 +1016,18 @@
- FILES_launcher = $(wildcard $(SHARE_SRC)/bin/*) \
- $(wildcard $(PLATFORM_SRC)/bin/java_md*)
-
-+ifeq ($(OS_VENDOR), OpenBSD)
-+ FILES_FROM_ARG=-I
-+else
-+ FILES_FROM_ARG=-T
-+endif
-+
- # Standard jdk image
- initial-image-jdk:: initial-image-jdk-setup \
- initial-image-jdk-db \
- $(JDK_DOCFILES) \
- $(JDK_DEMOS_AND_SAMPLES_DOCFILES)
-- $(MKDIR) $(JDK_IMAGE_DIR)/lib
-+ $(MKDIR) -p $(JDK_IMAGE_DIR)/lib
- @#
- @# Copy in the jars in lib that only belong in the JDK
- @#
-@@ -1112,7 +1109,7 @@
- @# So for Linux, make use of the -T option (like Solaris' -I option) of
- @# obtaining the list of files from a file. MKS tar has no such option.
-
-- ifneq (,$(findstring $(PLATFORM), linux macosx))
-+ ifneq (,$(findstring $(PLATFORM), linux macosx bsd))
- for d in $(SOURCE_DIRS); do \
- $(RM) $(ABS_TEMPDIR)/src-files.list; \
- ($(CD) $$d && \
-@@ -1125,7 +1122,7 @@
- done ; \
- ) ; \
- if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \
-- ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
-+ ($(CD) $$d && $(TAR) cf - $(FILES_FROM_ARG) $(ABS_TEMPDIR)/src-files.list ) \
- | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
- fi; \
- done
---- ./jdk/make/common/Rules.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/common/Rules.gmk 2014-10-28 20:19:52.000000000 -0700
-@@ -51,7 +51,7 @@
- #
- # All source tree areas for java/properties files (a few may be closed)
- #
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- ifdef OPENJDK
- ALL_CLASSES_SRC = $(call JavaSrcDirList,,classes)
- else
-@@ -212,7 +212,7 @@
- $(CLASSDESTDIR)/%.class: $(GENSRCDIR)/%.java
- @$(add-java-file)
-
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- # TODO(cpc): need to document why this is necessary...
- $(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-10-28 20:19:52.000000000 -0700
-@@ -72,6 +72,21 @@
-
- endif
-
-+ifeq ($(PLATFORM), bsd)
-+
-+ # Settings specific to BSD
-+ CC = $(COMPILER_PATH)gcc
-+ CPP = $(COMPILER_PATH)gcc -E
-+ CXX = $(COMPILER_PATH)g++
-+
-+ # Option used to create a shared library
-+ ifeq ($(OS_VENDOR), Apple)
-+ SHARED_LIBRARY_FLAG = -dynamiclib
-+ else
-+ SHARED_LIBRARY_FLAG = -shared
-+ endif
-+endif
-+
- ifeq ($(PLATFORM), solaris)
-
- # 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-10-28 20:19:52.000000000 -0700
-@@ -0,0 +1,267 @@
-+#
-+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation. Oracle designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Oracle in the LICENSE file that accompanied this code.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.com if you need additional information or have any
-+# questions.
-+#
-+
-+#
-+# Definitions for BSD.
-+#
-+
-+# Default for COMPILER_WARNINGS_FATAL on BSD (C & C++ compiler warnings)
-+ifndef COMPILER_WARNINGS_FATAL
-+ COMPILER_WARNINGS_FATAL=false
-+endif
-+
-+# BSD should use parallel compilation for best build times
-+ifndef COMPILE_APPROACH
-+ COMPILE_APPROACH = parallel
-+endif
-+
-+# Indication that we are doing an incremental build.
-+# This may trigger the creation of make depend files.
-+ifndef INCREMENTAL_BUILD
-+ INCREMENTAL_BUILD = false
-+endif
-+
-+# FullPath just makes sure it never ends with a / and no duplicates
-+define FullPath
-+$(shell cd $1 2> $(DEV_NULL) && pwd)
-+endef
-+
-+# OptFullPath: Absolute path name of a dir that might not initially exist.
-+define OptFullPath
-+$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-+endef
-+
-+ifdef ALT_X11_PATH
-+ X11_PATH = $(ALT_X11_PATH)
-+else
-+ ifeq ($(OS_VENDOR), NetBSD)
-+ X11_PATH = /usr/X11R7
-+ else
-+ ifeq ($(OS_VENDOR), FreeBSD)
-+ X11_PATH = /usr/local
-+ else
-+ X11_PATH = /usr/X11R6
-+ endif
-+ endif
-+endif
-+
-+ifdef ALT_PACKAGE_PATH
-+ PACKAGE_PATH = $(ALT_PACKAGE_PATH)
-+else
-+ ifeq ($(OS_VENDOR), NetBSD)
-+ PACKAGE_PATH = /usr/pkg
-+ else
-+ PACKAGE_PATH = /usr/local
-+ endif
-+endif
-+
-+# ALSA
-+ifdef ALT_ALSA_LIB_PATH
-+ ALSA_LIB_PATH = $(ALT_ALSA_LIB_PATH)
-+else
-+ ALSA_LIB_PATH = $(PACKAGE_PATH)/lib
-+endif
-+
-+ifdef ALT_ALSA_HEADERS_PATH
-+ ALSA_HEADERS_PATH = $(ALT_ALSA_HEADERS_PATH)
-+else
-+ ALSA_HEADERS_PATH = $(PACKAGE_PATH)/include
-+endif
-+
-+# Location on system where jdk installs might be
-+USRJDKINSTANCES_PATH = $(PACKAGE_PATH)
-+
-+# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-+# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-+ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
-+ UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-+else
-+ UNIXCOMMAND_PATH = /bin/
-+endif
-+
-+# USRBIN_PATH: path to where the most common Unix commands are.
-+# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-+ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
-+ USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
-+else
-+ USRBIN_PATH = /usr/bin/
-+endif
-+
-+# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
-+# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-+ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
-+ UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-+else
-+ UNIXCCS_PATH = /usr/ccs/bin/
-+endif
-+
-+# SLASH_JAVA: location of all network accessable files
-+ifdef ALT_SLASH_JAVA
-+ SLASH_JAVA :=$(ALT_SLASH_JAVA)
-+else
-+ SLASH_JAVA := $(call DirExists,/java,/java,/NOT-SET)
-+endif
-+
-+# JDK_DEVTOOLS_DIR: common path for all the java devtools
-+ifdef ALT_JDK_DEVTOOLS_DIR
-+ JDK_DEVTOOLS_DIR =$(ALT_JDK_DEVTOOLS_DIR)
-+else
-+ JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-+endif
-+
-+# COMPILER_PATH: path to where the compiler and tools are installed.
-+# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-+ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
-+ COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
-+else
-+ COMPILER_PATH =/usr/bin/
-+endif
-+
-+# OPENWIN_HOME: path to where the X11 environment is installed.
-+# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-+ifneq ($(ALT_OPENWIN_HOME),)
-+ OPENWIN_HOME :=$(call PrefixPath,$(ALT_OPENWIN_HOME))
-+else
-+ OPENWIN_HOME =$(X11_PATH)
-+endif
-+
-+# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-+# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-+ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
-+ DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-+else
-+ DEVTOOLS_PATH =$(PACKAGE_PATH)/bin/
-+endif
-+
-+# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-+# _BOOTDIR2: Second choice
-+ifndef ALT_BOOTDIR
-+ _BOOTDIR1 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
-+ _BOOTDIR2 =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-+endif
-+
-+# Always build headless on BSD
-+BUILD_HEADLESS = true
-+LIBM=-lm
-+
-+# Set ZLIB_LIBS if not already set
-+ifeq ("$(ZLIB_LIBS)", "")
-+ ZLIB_LIBS=-lz
-+endif
-+
-+_CUPS_HEADERS_PATH=$(PACKAGE_PATH)/include
-+
-+# Import JDK images allow for partial builds, components not built are
-+# imported (or copied from) these import areas when needed.
-+
-+# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-+# multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-+ifdef ALT_BUILD_JDK_IMPORT_PATH
-+ BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-+else
-+ BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
-+endif
-+BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-+
-+# JDK_IMPORT_PATH: location of JDK install tree (this version) to import
-+ifdef ALT_JDK_IMPORT_PATH
-+ JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-+else
-+ JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-+endif
-+JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-+
-+# HOTSPOT_IMPORT_PATH: location of hotspot pre-built files
-+ifdef ALT_HOTSPOT_IMPORT_PATH
-+ HOTSPOT_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_IMPORT_PATH))
-+else
-+ HOTSPOT_IMPORT_PATH =$(JDK_IMPORT_PATH)
-+endif
-+HOTSPOT_IMPORT_PATH:=$(call AltCheckValue,HOTSPOT_IMPORT_PATH)
-+
-+# HOTSPOT_CLIENT_PATH: location of client jvm library file.
-+ifeq ($(ARCH_DATA_MODEL), 32)
-+ ifdef ALT_HOTSPOT_CLIENT_PATH
-+ HOTSPOT_CLIENT_PATH :=$(call FullPath,$(ALT_HOTSPOT_CLIENT_PATH))
-+ else
-+ HOTSPOT_CLIENT_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/client
-+ endif
-+ HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
-+endif
-+
-+# HOTSPOT_SERVER_PATH: location of server jvm library file.
-+ifdef ALT_HOTSPOT_SERVER_PATH
-+ HOTSPOT_SERVER_PATH :=$(call FullPath,$(ALT_HOTSPOT_SERVER_PATH))
-+else
-+ HOTSPOT_SERVER_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/server
-+endif
-+HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
-+
-+# Special define for checking the binaries
-+
-+# Debug builds should downgrade warnings to just info
-+MAPFILE_WARNING-DBG=INFO
-+MAPFILE_WARNING-OPT=WARNING
-+MAPFILE_WARNING-=WARNING
-+MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))
-+
-+# Macro to check it's input file for banned dependencies and verify the
-+# binary built properly. Relies on process exit code.
-+ifndef CROSS_COMPILE_ARCH
-+ifeq ($(OS_VENDOR), OpenBSD)
-+define binary_file_verification # binary_file
-+( \
-+ $(ECHO) "Checking for mapfile use in: $1" && \
-+ if [ "`$(OBJDUMP) -T $1 | $(EGREP) '[0-9a-f]* g *DF \.text.*SUNWprivate'`" = "" ] ; then \
-+ $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
-+ fi && \
-+ $(ECHO) "Library loads for: $1" && \
-+ $(LDD) $1 && \
-+ $(ECHO) "RUNPATH for: $1" && \
-+ ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
-+) || true
-+endef
-+else
-+define binary_file_verification # binary_file
-+( \
-+ $(ECHO) "Checking for mapfile use in: $1" && \
-+ if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
-+ $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
-+ fi && \
-+ $(ECHO) "Library loads for: $1" && \
-+ $(LDD) $1 && \
-+ $(ECHO) "RUNPATH for: $1" && \
-+ ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
-+)
-+endef
-+endif
-+else
-+define binary_file_verification
-+( \
-+ $(ECHO) "Skipping binary file verification for cross-compile build" \
-+)
-+endef
-+endif
-+
---- ./jdk/make/common/shared/Defs-utils.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/common/shared/Defs-utils.gmk 2014-10-28 20:19:52.000000000 -0700
-@@ -74,6 +74,13 @@
- UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
- endif
-
-+ifeq ($(PLATFORM),bsd)
-+ UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
-+ UTILS_USR_BIN_PATH=$(USRBIN_PATH)
-+ UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
-+ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-+endif
-+
- # Utilities
- ifdef CROSS_COMPILE_ARCH
- AR = $(COMPILER_PATH)ar
-@@ -251,3 +258,35 @@
- # Builtin shell command, no -e option needed
- ECHO = echo
- endif
-+
-+# BSD specific
-+ifeq ($(PLATFORM),bsd)
-+ BASENAME = $(UTILS_USR_BIN_PATH)basename
-+ EGREP = $(UTILS_USR_BIN_PATH)egrep
-+ EXPR = $(UTILS_COMMAND_PATH)expr
-+ FMT = $(UTILS_USR_BIN_PATH)fmt
-+ GREP = $(UTILS_USR_BIN_PATH)grep
-+ GUNZIP = $(UTILS_USR_BIN_PATH)gunzip
-+ ID = $(UTILS_USR_BIN_PATH)id
-+ MSGFMT = $(UTILS_DEVTOOL_PATH)msgfmt
-+ SED = $(UTILS_USR_BIN_PATH)sed
-+ SORT = $(UTILS_USR_BIN_PATH)sort
-+ TEST = $(UTILS_COMMAND_PATH)test
-+ TOUCH = $(UTILS_USR_BIN_PATH)touch
-+ TRUE = $(UTILS_USR_BIN_PATH)true
-+ UNAME = $(UTILS_USR_BIN_PATH)uname
-+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
-+ # BSD OS_VENDOR specific
-+ ifeq ($(OS_VENDOR), OpenBSD)
-+ NAWK = $(UTILS_USR_BIN_PATH)awk
-+ OBJDUMP = $(UTILS_USR_BIN_PATH)objdump
-+ else
-+ CPIO = $(UTILS_USR_BIN_PATH)cpio
-+ TAR = $(UTILS_USR_BIN_PATH)tar
-+ endif
-+ ifeq ($(OS_VENDOR), NetBSD)
-+ NAWK = $(UTILS_USR_BIN_PATH)awk
-+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
-+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
-+ 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-10-28 20:19:52.000000000 -0700
-@@ -44,6 +44,11 @@
- override CC_VERSION = gcc
- endif
-
-+# BSD uses GNU compilers by default
-+ifeq ($(PLATFORM), bsd)
-+ override CC_VERSION = gcc
-+endif
-+
- # Mac OS X uses LLVM by default
- ifeq ($(PLATFORM), macosx)
- override CC_VERSION = llvm
-@@ -169,6 +174,13 @@
- endif
- endif
-
-+# BSD specific
-+ifeq ($(PLATFORM), macosx)
-+ REQUIRED_COMPILER_NAME = GCC4
-+ REQUIRED_COMPILER_VERSION = GCC4
-+ REQUIRED_CC_VER = 4.2.1
-+endif
-+
- # Mac specific
- 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-10-28 20:19:52.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
- # macosx trees, depending on the component.
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- define JavaSrcDirList
- $(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
- endef
-@@ -296,10 +296,8 @@
- RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
- endif
-
--# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
--ifdef BUILD_NUMBER
-- FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
--else
-+# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
-+ifndef BUILD_NUMBER
- BUILD_NUMBER = b00
- ifndef USER_RELEASE_SUFFIX
- BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
-@@ -307,6 +305,12 @@
- USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
- endif
- export USER_RELEASE_SUFFIX
-+endif
-+
-+# FULL_VERSION is RELEASE and BUILD_NUMBER if USER_RELEASE_SUFFIX is not set
-+ifndef USER_RELEASE_SUFFIX
-+ FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
-+else
- FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
- endif
-
---- ./jdk/make/common/shared/Platform.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/common/shared/Platform.gmk 2014-10-28 20:19:52.000000000 -0700
-@@ -298,6 +298,85 @@
- # How much RAM does this machine have:
- endif
-
-+ifeq ($(SYSTEM_UNAME), FreeBSD)
-+ PLATFORM = bsd
-+ OS_NAME = freebsd
-+ OS_VENDOR = FreeBSD
-+ REQUIRED_OS_VERSION = 6.0
-+endif
-+
-+ifeq ($(SYSTEM_UNAME), NetBSD)
-+ PLATFORM = bsd
-+ OS_NAME = netbsd
-+ OS_VENDOR = NetBSD
-+ REQUIRED_OS_VERSION = 3.0
-+endif
-+
-+ifeq ($(SYSTEM_UNAME), OpenBSD)
-+ PLATFORM = bsd
-+ OS_NAME = openbsd
-+ OS_VENDOR = OpenBSD
-+ REQUIRED_OS_VERSION = 4.9
-+endif
-+
-+# Platform settings specific to BSD
-+ifeq ($(PLATFORM), bsd)
-+ OS_VERSION := $(shell uname -r)
-+ # Arch and OS name/version
-+ mach := $(shell uname -m)
-+ archExpr = case "$(mach)" in \
-+ i[3-9]86) \
-+ echo i586 \
-+ ;; \
-+ sparc64) \
-+ echo sparcv9 \
-+ ;; \
-+ sparc*) \
-+ echo sparc \
-+ ;; \
-+ x86_64) \
-+ echo amd64 \
-+ ;; \
-+ "Power Macintosh") \
-+ echo ppc \
-+ ;; \
-+ *) \
-+ echo $(mach) \
-+ ;; \
-+ esac
-+ ARCH := $(shell $(archExpr) )
-+ ARCH_FAMILY := $(ARCH)
-+
-+ # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
-+ ifneq (,$(findstring $(ARCH), i586 sparc ppc))
-+ ARCH_DATA_MODEL=32
-+ else
-+ ARCH_DATA_MODEL=64
-+ endif
-+
-+ # Need to maintain the jre/lib/i386 location for 32-bit Intel
-+ ifeq ($(ARCH), i586)
-+ LIBARCH = i386
-+ else
-+ LIBARCH = $(ARCH)
-+ endif
-+
-+ # Value of Java os.arch property
-+ ARCHPROP = $(LIBARCH)
-+
-+ # Suffix for file bundles used in previous release
-+ BUNDLE_FILE_SUFFIX=.tar.gz
-+ # Minimum disk space needed as determined by running 'du -sk' on
-+ # a fully built workspace.
-+ REQUIRED_FREE_SPACE=1500000
-+ # How much RAM does this machine have:
-+ ifeq ($(OS_VENDOR), OpenBSD)
-+ MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' )
-+ else
-+ MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' )
-+ endif
-+endif
-+
- # Windows with and without CYGWIN will be slightly different
- ifeq ($(SYSTEM_UNAME), Windows_NT)
- PLATFORM = windows
---- ./jdk/make/java/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/Makefile 2014-10-28 20:19:52.000000000 -0700
-@@ -53,14 +53,10 @@
- endif
- endif # PLATFORM
-
--ifeq ($(PLATFORM), linux)
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
- SUBDIRS += jexec
- endif # PLATFORM
-
--ifeq ($(PLATFORM), macosx)
-- SUBDIRS += jobjc
--endif # PLATFORM
--
- include $(BUILDDIR)/common/Subdirs.gmk
-
- all build clean clobber::
---- ./jdk/make/java/instrument/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/instrument/Makefile 2014-10-28 20:19:52.000000000 -0700
-@@ -104,12 +104,24 @@
- # equivalent of strcasecmp is stricmp on Windows
- CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
- else
--ifneq (,$(findstring $(PLATFORM), macosx))
-- ifneq ($(ARCH), universal)
-- LDFLAGS += -Wl,-all_load
-+ifneq (,$(findstring $(PLATFORM), macosx bsd))
-+ ifeq ($(OS_VENDOR), Apple)
-+ ifneq ($(ARCH), universal)
-+ LDFLAGS += -Wl,-all_load
-+ endif
-+ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
-+ OTHER_LDLIBS += -liconv
-+ else
-+ LDFLAGS += -Wl,--whole-archive
-+ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
-+ LDFLAGS += -Wl,--no-whole-archive
-+ ifneq ($(OS_NAME), netbsd)
-+# Use CPPFLAGS instead of OTHER_INCLUDES to force this last
-+ CPPFLAGS += -I$(PACKAGE_PATH)/include
-+ OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
-+ endif
- endif
-- LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
-- OTHER_LDLIBS += -liconv
-+
- 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-07-15 21:49:28.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/FILES_c.gmk 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/java/FILES_c.gmk 2014-07-15 21:49:28.000000000 -0700
-@@ -37,7 +37,6 @@
- FileInputStream.c \
- FileInputStream_md.c \
- FileOutputStream_md.c \
-- Finalizer.c \
- Float.c \
- Object.c \
- ObjectOutputStream.c \
---- ./jdk/make/java/java/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/java/Makefile 2014-10-28 20:19:52.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 \
-@@ -101,6 +102,7 @@
- java/util/prefs/MacOSXPreferencesFactory.java
-
- CFLAGS_$(VARIANT)/java_props_md.o = -Os -x objective-c
-+CFLAGS_$(VARIANT)/java_props_macosx.o = -Os -x objective-c
- endif
-
- #
-@@ -175,9 +177,11 @@
- #
- ifneq ($(PLATFORM), windows)
- ifneq ($(PLATFORM), macosx)
-+ifneq ($(PLATFORM), bsd)
- HAVE_ALTZONE=true
- endif
- endif
-+endif
-
- ifeq ($(HAVE_ALTZONE),true)
- OTHER_CPPFLAGS += -DHAVE_ALTZONE
-@@ -221,6 +225,7 @@
- ifeq ($(PLATFORM), macosx)
- OTHER_LDLIBS += \
- -framework CoreFoundation \
-+ -framework Foundation \
- -framework Security \
- -framework SystemConfiguration
- endif
-@@ -451,3 +456,39 @@
- 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
-+ifeq ($(PLATFORM), bsd)
-+ 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-10-28 20:19:52.000000000 -0700
-@@ -93,18 +93,66 @@
-
- else
-
-+ifeq ($(PLATFORM), bsd)
-+
-+$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
-+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
-+ @$(prep-target)
-+ @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\
-+'@g > $@.tmp.euro;
-+ @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\
-+'@g >> $@.tmp.euro;
-+ @$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\
-+'@g > $@.tmp.noneuro;
-+ @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\
-+'@g >> $@.tmp.noneuro;
-+ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
-+ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
-+ $@.tmp.noneuro $< $@
-+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
-+
-+else
-+
-+ifeq ($(PLATFORM), bsd)
-+
-+$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
-+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
-+ @$(prep-target)
-+ @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\
-+'@g > $@.tmp.euro;
-+ @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\
-+'@g >> $@.tmp.euro;
-+ @$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\
-+'@g > $@.tmp.noneuro;
-+ @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\
-+'@g >> $@.tmp.noneuro;
-+ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
-+ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
-+ $@.tmp.noneuro $< $@
-+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
-+
-+else
-+
- $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
- @$(RM) $@.tmp.euro $@.tmp.noneuro;
- @$(prep-target)
-- @$(ECHO) $(subst .properties,'\n',$(Euro_Resources_properties)) > $@.tmp.euro;
-- @$(ECHO) $(subst .java,'\n',$(Euro_Resources_java)) >> $@.tmp.euro;
-- @$(ECHO) $(subst .properties,'\n',$(NonEuro_Resources_properties)) > $@.tmp.noneuro;
-- @$(ECHO) $(subst .java,'\n',$(NonEuro_Resources_java)) >> $@.tmp.noneuro;
-+ @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\
-+'@g > $@.tmp.euro;
-+ @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\
-+'@g >> $@.tmp.euro;
-+ @$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\
-+'@g > $@.tmp.noneuro;
-+ @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\
-+'@g >> $@.tmp.noneuro;
- NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
- $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
- $@.tmp.noneuro $< $@
- @$(RM) $@.tmp.euro $@.tmp.noneuro;
- endif
-+
-+endif
-+
-+endif
-
- genlocales : $(LocaleDataMetaInfo_Dest)
-
---- ./jdk/make/java/java/mapfile-vers 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/java/mapfile-vers 2014-07-15 21:49:28.000000000 -0700
-@@ -121,6 +121,7 @@
- Java_java_io_UnixFileSystem_setReadOnly;
- Java_java_io_UnixFileSystem_setPermission;
- Java_java_lang_Class_forName0;
-+ Java_java_lang_Class_getCheckMemberAccessMethod;
- Java_java_lang_Class_getPrimitiveClass;
- Java_java_lang_Class_isAssignableFrom;
- Java_java_lang_Class_isInstance;
-@@ -140,7 +141,6 @@
- Java_java_lang_Double_doubleToRawLongBits;
- Java_java_lang_reflect_Proxy_defineClass0;
- Java_java_lang_Shutdown_runAllFinalizers;
-- Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
- Java_java_lang_Float_intBitsToFloat;
- Java_java_lang_Float_floatToRawIntBits;
- Java_java_lang_StrictMath_IEEEremainder;
-@@ -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/java/reorder-i586 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/java/reorder-i586 2014-07-15 21:49:28.000000000 -0700
-@@ -77,7 +77,6 @@
- text: .text%JNU_GetEnv;
- text: .text%Java_java_io_UnixFileSystem_checkAccess;
- text: .text%Java_sun_reflect_NativeMethodAccessorImpl_invoke0;
--text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
- text: .text%Java_java_io_FileInputStream_available;
- text: .text%Java_java_lang_reflect_Array_newArray;
- text: .text%Java_java_lang_Throwable_getStackTraceDepth;
---- ./jdk/make/java/java/reorder-sparc 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/java/reorder-sparc 2014-07-15 21:49:28.000000000 -0700
-@@ -87,7 +87,6 @@
- text: .text%throwFileNotFoundException;
- text: .text%JNU_NotifyAll;
- # Test LoadFrame
--text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
- text: .text%JNU_CallMethodByName;
- text: .text%JNU_CallMethodByNameV;
- text: .text%Java_java_io_UnixFileSystem_createDirectory;
---- ./jdk/make/java/java/reorder-sparcv9 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/java/reorder-sparcv9 2014-07-15 21:49:28.000000000 -0700
-@@ -77,7 +77,6 @@
- text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
- text: .text%JNU_GetEnv;
- text: .text%Java_java_io_UnixFileSystem_checkAccess;
--text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
- text: .text%Java_java_lang_reflect_Array_newArray;
- text: .text%Java_java_lang_Throwable_getStackTraceDepth;
- text: .text%Java_java_lang_Throwable_getStackTraceElement;
---- ./jdk/make/java/jli/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/jli/Makefile 2014-10-28 20:19:52.000000000 -0700
-@@ -119,9 +119,9 @@
- LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
- endif # PLATFORM
-
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), macosx bsd))
- OTHER_CPPFLAGS += $(LIBARCH_DEFINES) -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
--else # ! MACOSX
-+else # ! MACOSX || BSD
- OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
- endif #PLATFORM
-
-@@ -134,7 +134,7 @@
- # Note: it is important to keep this order, meaning -lc as the
- # last library, otherwise it could cause compatibility issues
- # by pulling in SUNW_private symbols from libc
-- LDLIBS = -ldl -lc
-+ LDLIBS = $(LIBDL) -lc
- ifeq ($(USE_PTHREADS),true)
- 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 2014-07-15 21:49:28.000000000 -0700
-@@ -53,7 +53,7 @@
- Java_sun_management_GcInfoBuilder_fillGcAttributeInfo;
- Java_sun_management_GcInfoBuilder_getLastGcInfo0;
- Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
-- Java_sun_management_HotSpotDiagnostic_dumpHeap;
-+ Java_sun_management_HotSpotDiagnostic_dumpHeap0;
- Java_sun_management_HotspotThread_getInternalThreadCount;
- 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-10-28 20:19:52.000000000 -0700
-@@ -24,20 +24,22 @@
- #
-
- FILES_c = \
-- DatagramPacket.c \
-- InetAddress.c \
-- Inet4Address.c \
-- Inet6Address.c \
-- NetworkInterface.c \
-- InetAddressImplFactory.c \
-- Inet4AddressImpl.c \
-- Inet6AddressImpl.c \
-- SocketInputStream.c \
-- SocketOutputStream.c \
-- net_util.c \
-- net_util_md.c \
-- ResolverConfigurationImpl.c \
-- DefaultProxySelector.c
-+ AbstractPlainDatagramSocketImpl.c \
-+ DatagramPacket.c \
-+ InetAddress.c \
-+ Inet4Address.c \
-+ Inet6Address.c \
-+ NetworkInterface.c \
-+ InetAddressImplFactory.c \
-+ Inet4AddressImpl.c \
-+ Inet6AddressImpl.c \
-+ SocketInputStream.c \
-+ SocketOutputStream.c \
-+ net_util.c \
-+ net_util_md.c \
-+ portconfig.c \
-+ ResolverConfigurationImpl.c \
-+ DefaultProxySelector.c
-
- ifeq ($(PLATFORM), linux)
- FILES_c += linux_close.c
-@@ -47,6 +49,10 @@
- FILES_c += bsd_close.c
- endif
-
-+ifeq ($(OS_VENDOR), FreeBSD)
-+ FILES_c += bsd_close.c
-+endif
-+
- ifeq ($(PLATFORM), windows)
- 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-10-28 20:19:52.000000000 -0700
-@@ -83,7 +83,8 @@
- # Find platform specific native code
- #
- vpath %.c $(PLATFORM_SRC)/native/sun/net/dns $(PLATFORM_SRC)/native/sun/net/www/protocol/http/ntlm \
-- $(PLATFORM_SRC)/native/sun/net/sdp $(PLATFORM_SRC)/native/sun/net/spi
-+ $(PLATFORM_SRC)/native/sun/net/sdp $(PLATFORM_SRC)/native/sun/net/spi \
-+ $(PLATFORM_SRC)/native/sun/net
-
- #
- # Include rules
-@@ -92,7 +93,7 @@
-
- include $(BUILDDIR)/common/Library.gmk
-
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), macosx bsd))
- ifdef DONT_ENABLE_IPV6
- 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-10-28 20:19:45.000000000 -0700
-@@ -26,84 +26,88 @@
- # Define public interface.
-
- SUNWprivate_1.1 {
-- global:
-- JNI_OnLoad;
-- Java_java_net_PlainSocketImpl_socketListen;
-- Java_java_net_PlainDatagramSocketImpl_getTTL;
-- Java_java_net_PlainDatagramSocketImpl_init;
-- Java_java_net_SocketOutputStream_socketWrite0;
-- Java_java_net_PlainSocketImpl_socketCreate;
-- Java_java_net_PlainSocketImpl_socketAvailable;
-- Java_java_net_PlainDatagramSocketImpl_join;
-- Java_java_net_PlainDatagramSocketImpl_socketGetOption;
-- Java_java_net_InetAddress_init;
-- Java_java_net_Inet4Address_init;
-- Java_java_net_Inet6Address_init;
-- Java_java_net_PlainDatagramSocketImpl_setTTL;
-- Java_java_net_PlainDatagramSocketImpl_socketSetOption;
-- Java_java_net_PlainDatagramSocketImpl_bind0;
-- Java_java_net_PlainSocketImpl_socketAccept;
-- Java_java_net_DatagramPacket_init;
-- Java_java_net_PlainDatagramSocketImpl_leave;
-- Java_java_net_SocketInputStream_socketRead0;
-- Java_java_net_InetAddressImplFactory_isIPv6Supported;
-- Java_java_net_Inet4AddressImpl_getLocalHostName;
-- Java_java_net_Inet4AddressImpl_lookupAllHostAddr;
-- Java_java_net_Inet4AddressImpl_getHostByAddr;
-- Java_java_net_Inet4AddressImpl_isReachable0;
-- Java_java_net_Inet6AddressImpl_getLocalHostName;
-- Java_java_net_Inet6AddressImpl_lookupAllHostAddr;
-- Java_java_net_Inet6AddressImpl_getHostByAddr;
-- Java_java_net_Inet6AddressImpl_isReachable0;
-- Java_java_net_NetworkInterface_init;
-- Java_java_net_NetworkInterface_getByName0;
-- Java_java_net_NetworkInterface_getByIndex0;
-- Java_java_net_NetworkInterface_getByInetAddress0;
-- Java_java_net_NetworkInterface_getAll;
-- Java_java_net_NetworkInterface_isUp0;
-- Java_java_net_NetworkInterface_isLoopback0;
-- Java_java_net_NetworkInterface_isP2P0;
-- Java_java_net_NetworkInterface_supportsMulticast0;
-- Java_java_net_NetworkInterface_getMacAddr0;
-- Java_java_net_NetworkInterface_getMTU0;
-- Java_java_net_PlainDatagramSocketImpl_send;
-- Java_java_net_PlainSocketImpl_socketClose0;
-- Java_java_net_SocketOutputStream_init;
-- Java_java_net_PlainDatagramSocketImpl_peek;
-- Java_java_net_PlainDatagramSocketImpl_peekData;
-- Java_java_net_PlainSocketImpl_socketSetOption;
-- Java_java_net_PlainSocketImpl_socketSendUrgentData;
-- Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate;
-- Java_java_net_PlainSocketImpl_socketGetOption;
-- Java_java_net_PlainDatagramSocketImpl_receive0;
-- Java_java_net_PlainDatagramSocketImpl_connect0;
-- Java_java_net_PlainDatagramSocketImpl_disconnect0;
-- Java_java_net_PlainDatagramSocketImpl_datagramSocketClose;
-- Java_java_net_PlainSocketImpl_initProto;
-- Java_java_net_PlainSocketImpl_socketBind;
-- Java_java_net_PlainSocketImpl_socketShutdown;
-- Java_java_net_SocketInputStream_init;
-- Java_java_net_PlainSocketImpl_socketConnect;
-- Java_java_net_PlainDatagramSocketImpl_getTimeToLive;
-- Java_java_net_PlainDatagramSocketImpl_setTimeToLive;
-- Java_sun_net_dns_ResolverConfigurationImpl_localDomain0;
-- Java_sun_net_dns_ResolverConfigurationImpl_fallbackDomain0;
-- Java_sun_net_sdp_SdpSupport_convert0;
-- Java_sun_net_sdp_SdpSupport_create0;
-- Java_sun_net_spi_DefaultProxySelector_init;
-- Java_sun_net_spi_DefaultProxySelector_getSystemProxy;
-- NET_AllocSockaddr;
-- NET_SockaddrToInetAddress;
-+ global:
-+ JNI_OnLoad;
-+ Java_java_net_AbstractPlainDatagramSocketImpl_init;
-+ Java_java_net_AbstractPlainDatagramSocketImpl_dataAvailable;
-+ Java_java_net_PlainSocketImpl_socketListen;
-+ Java_java_net_PlainDatagramSocketImpl_getTTL;
-+ Java_java_net_PlainDatagramSocketImpl_init;
-+ Java_java_net_SocketOutputStream_socketWrite0;
-+ Java_java_net_PlainSocketImpl_socketCreate;
-+ Java_java_net_PlainSocketImpl_socketAvailable;
-+ Java_java_net_PlainDatagramSocketImpl_join;
-+ Java_java_net_PlainDatagramSocketImpl_socketGetOption;
-+ Java_java_net_InetAddress_init;
-+ Java_java_net_Inet4Address_init;
-+ Java_java_net_Inet6Address_init;
-+ Java_java_net_PlainDatagramSocketImpl_setTTL;
-+ Java_java_net_PlainDatagramSocketImpl_socketSetOption;
-+ Java_java_net_PlainDatagramSocketImpl_bind0;
-+ Java_java_net_PlainSocketImpl_socketAccept;
-+ Java_java_net_DatagramPacket_init;
-+ Java_java_net_PlainDatagramSocketImpl_leave;
-+ Java_java_net_SocketInputStream_socketRead0;
-+ Java_java_net_InetAddressImplFactory_isIPv6Supported;
-+ Java_java_net_Inet4AddressImpl_getLocalHostName;
-+ Java_java_net_Inet4AddressImpl_lookupAllHostAddr;
-+ Java_java_net_Inet4AddressImpl_getHostByAddr;
-+ Java_java_net_Inet4AddressImpl_isReachable0;
-+ Java_java_net_Inet6AddressImpl_getLocalHostName;
-+ Java_java_net_Inet6AddressImpl_lookupAllHostAddr;
-+ Java_java_net_Inet6AddressImpl_getHostByAddr;
-+ Java_java_net_Inet6AddressImpl_isReachable0;
-+ Java_java_net_NetworkInterface_init;
-+ Java_java_net_NetworkInterface_getByName0;
-+ Java_java_net_NetworkInterface_getByIndex0;
-+ Java_java_net_NetworkInterface_getByInetAddress0;
-+ Java_java_net_NetworkInterface_getAll;
-+ Java_java_net_NetworkInterface_isUp0;
-+ Java_java_net_NetworkInterface_isLoopback0;
-+ Java_java_net_NetworkInterface_isP2P0;
-+ Java_java_net_NetworkInterface_supportsMulticast0;
-+ Java_java_net_NetworkInterface_getMacAddr0;
-+ Java_java_net_NetworkInterface_getMTU0;
-+ Java_java_net_PlainDatagramSocketImpl_send;
-+ Java_java_net_PlainSocketImpl_socketClose0;
-+ Java_java_net_SocketOutputStream_init;
-+ Java_java_net_PlainDatagramSocketImpl_peek;
-+ Java_java_net_PlainDatagramSocketImpl_peekData;
-+ Java_java_net_PlainSocketImpl_socketSetOption;
-+ Java_java_net_PlainSocketImpl_socketSendUrgentData;
-+ Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate;
-+ Java_java_net_PlainSocketImpl_socketGetOption;
-+ Java_java_net_PlainDatagramSocketImpl_receive0;
-+ Java_java_net_PlainDatagramSocketImpl_connect0;
-+ Java_java_net_PlainDatagramSocketImpl_disconnect0;
-+ Java_java_net_PlainDatagramSocketImpl_datagramSocketClose;
-+ Java_java_net_PlainSocketImpl_initProto;
-+ Java_java_net_PlainSocketImpl_socketBind;
-+ Java_java_net_PlainSocketImpl_socketShutdown;
-+ Java_java_net_SocketInputStream_init;
-+ Java_java_net_PlainSocketImpl_socketConnect;
-+ Java_java_net_PlainDatagramSocketImpl_getTimeToLive;
-+ Java_java_net_PlainDatagramSocketImpl_setTimeToLive;
-+ Java_sun_net_PortConfig_getLower0;
-+ Java_sun_net_PortConfig_getUpper0;
-+ Java_sun_net_dns_ResolverConfigurationImpl_localDomain0;
-+ Java_sun_net_dns_ResolverConfigurationImpl_fallbackDomain0;
-+ Java_sun_net_sdp_SdpSupport_convert0;
-+ Java_sun_net_sdp_SdpSupport_create0;
-+ Java_sun_net_spi_DefaultProxySelector_init;
-+ Java_sun_net_spi_DefaultProxySelector_getSystemProxy;
-+ NET_AllocSockaddr;
-+ NET_SockaddrToInetAddress;
- NET_SockaddrEqualsInetAddress;
-- NET_InetAddressToSockaddr;
-- NET_GetPortFromSockaddr;
-- NET_SetSockOpt;
-- NET_GetSockOpt;
-- NET_Bind;
-- NET_MapSocketOption;
-- NET_Wait;
-+ NET_InetAddressToSockaddr;
-+ NET_GetPortFromSockaddr;
-+ NET_SetSockOpt;
-+ NET_GetSockOpt;
-+ NET_Bind;
-+ NET_MapSocketOption;
-+ NET_Wait;
- ipv6_available;
-
-- local:
-- *;
-+ local:
-+ *;
- };
---- ./jdk/make/java/nio/Makefile 2013-09-06 11:27:37.000000000 -0700
-+++ ./jdk/make/java/nio/Makefile 2014-10-28 20:19:52.000000000 -0700
-@@ -263,13 +263,89 @@
- sun/nio/fs/UnixConstants.java
- endif # PLATFORM = linux
-
-+ifeq ($(PLATFORM), bsd)
-+FILES_java += \
-+ sun/nio/ch/AbstractPollSelectorImpl.java \
-+ sun/nio/ch/BsdAsynchronousChannelProvider.java \
-+ sun/nio/ch/InheritedChannel.java \
-+ sun/nio/ch/KQueue.java \
-+ sun/nio/ch/KQueueArrayWrapper.java \
-+ sun/nio/ch/KQueuePort.java \
-+ sun/nio/ch/KQueueSelectorProvider.java \
-+ sun/nio/ch/KQueueSelectorImpl.java \
-+ sun/nio/ch/PollSelectorProvider.java \
-+ sun/nio/ch/PollSelectorImpl.java \
-+ sun/nio/ch/Port.java \
-+ sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
-+ sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
-+ sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
-+ \
-+ sun/nio/fs/BsdFileStore.java \
-+ sun/nio/fs/BsdFileSystem.java \
-+ sun/nio/fs/BsdFileSystemProvider.java \
-+ sun/nio/fs/BsdNativeDispatcher.java \
-+ sun/nio/fs/PollingWatchService.java \
-+ sun/nio/fs/UnixChannelFactory.java \
-+ sun/nio/fs/UnixCopyFile.java \
-+ sun/nio/fs/UnixDirectoryStream.java \
-+ sun/nio/fs/UnixException.java \
-+ sun/nio/fs/UnixFileAttributeViews.java \
-+ sun/nio/fs/UnixFileAttributes.java \
-+ sun/nio/fs/UnixFileKey.java \
-+ sun/nio/fs/UnixFileModeAttribute.java \
-+ sun/nio/fs/UnixFileStore.java \
-+ sun/nio/fs/UnixFileStoreAttributes.java \
-+ sun/nio/fs/UnixFileSystem.java \
-+ sun/nio/fs/UnixFileSystemProvider.java \
-+ sun/nio/fs/UnixMountEntry.java \
-+ sun/nio/fs/UnixNativeDispatcher.java \
-+ sun/nio/fs/UnixPath.java \
-+ sun/nio/fs/UnixSecureDirectoryStream.java \
-+ sun/nio/fs/UnixUriUtils.java \
-+ sun/nio/fs/UnixUserPrincipals.java
-+
-+FILES_c += \
-+ InheritedChannel.c \
-+ NativeThread.c \
-+ PollArrayWrapper.c \
-+ UnixAsynchronousServerSocketChannelImpl.c \
-+ UnixAsynchronousSocketChannelImpl.c \
-+ \
-+ BsdNativeDispatcher.c \
-+ UnixCopyFile.c \
-+ UnixNativeDispatcher.c \
-+ \
-+ KQueue.c \
-+ KQueueArrayWrapper.c \
-+ KQueuePort.c
-+
-+FILES_export += \
-+ sun/nio/ch/InheritedChannel.java \
-+ sun/nio/ch/KQueue.java \
-+ sun/nio/ch/KQueuePort.java \
-+ sun/nio/ch/NativeThread.java \
-+ sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
-+ sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
-+ \
-+ sun/nio/fs/BsdNativeDispatcher.java \
-+ sun/nio/fs/UnixCopyFile.java \
-+ sun/nio/fs/UnixNativeDispatcher.java
-+
-+FILES_gen += \
-+ sun/nio/fs/UnixConstants.java
-+
-+endif # PLATFORM = bsd
-+
- ifeq ($(PLATFORM), macosx)
- FILES_java += \
- sun/nio/ch/AbstractPollSelectorImpl.java \
- sun/nio/ch/BsdAsynchronousChannelProvider.java \
- sun/nio/ch/InheritedChannel.java \
- sun/nio/ch/KQueue.java \
-+ sun/nio/ch/KQueueArrayWrapper.java
- sun/nio/ch/KQueuePort.java \
-+ sun/nio/ch/KQueueSelectorProvider.java \
-+ sun/nio/ch/KQueueSelectorImpl.java \
- sun/nio/ch/PollSelectorProvider.java \
- sun/nio/ch/PollSelectorImpl.java \
- sun/nio/ch/Port.java \
-@@ -317,6 +393,7 @@
- UnixNativeDispatcher.c \
- \
- KQueue.c \
-+ KQueueArrayWrapper.c \
- KQueuePort.c
-
- FILES_export += \
-@@ -330,19 +407,13 @@
- sun/nio/fs/BsdNativeDispatcher.java \
- sun/nio/fs/UnixCopyFile.java \
- sun/nio/fs/UnixNativeDispatcher.java
--
-+
- FILES_gen += \
- sun/nio/fs/UnixConstants.java
--endif # PLATFORM = bsd, macosx
-
--ifeq ($(PLATFORM), macosx)
--FILES_java += \
-- sun/nio/ch/KQueueSelectorProvider.java \
-- sun/nio/ch/KQueueSelectorImpl.java \
-- sun/nio/ch/KQueueArrayWrapper.java
-+endif # PLATFORM = macosx
-
--FILES_c += \
-- KQueueArrayWrapper.c
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
-
- vpath %.c $(call NativeSrcDirList,,native/sun/nio/fs)
- vpath %.c $(call NativeSrcDirList,,native/sun/nio/ch)
-@@ -388,6 +459,9 @@
- ifeq ($(PLATFORM), macosx)
- OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread -framework CoreFoundation
- endif
-+ifeq ($(PLATFORM), bsd)
-+OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread
-+endif
- ifeq ($(PLATFORM), solaris)
- OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
-@@ -410,7 +484,7 @@
- ifeq ($(PLATFORM), linux)
- FILES_m = mapfile-linux
- endif
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- FILES_m = mapfile-bsd
- 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-10-28 20:19:52.000000000 -0700
-@@ -70,6 +70,7 @@
- Java_sun_nio_ch_IOUtil_drain;
- Java_sun_nio_ch_IOUtil_fdVal;
- Java_sun_nio_ch_IOUtil_initIDs;
-+ Java_sun_nio_ch_IOUtil_iovMax;
- Java_sun_nio_ch_IOUtil_makePipe;
- Java_sun_nio_ch_IOUtil_randomBytes;
- Java_sun_nio_ch_IOUtil_setfdVal;
-@@ -80,6 +81,11 @@
- Java_sun_nio_ch_KQueue_identOffset;
- Java_sun_nio_ch_KQueue_filterOffset;
- Java_sun_nio_ch_KQueue_flagsOffset;
-+ Java_sun_nio_ch_KQueueArrayWrapper_initStructSizes;
-+ Java_sun_nio_ch_KQueueArrayWrapper_init;
-+ Java_sun_nio_ch_KQueueArrayWrapper_register0;
-+ Java_sun_nio_ch_KQueueArrayWrapper_kevent0;
-+ Java_sun_nio_ch_KQueueArrayWrapper_interrupt;
- Java_sun_nio_ch_KQueuePort_socketpair;
- 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-10-28 20:19:52.000000000 -0700
-@@ -74,6 +74,14 @@
- OTHER_LDLIBS += -liconv
- endif
-
-+# Add location of iconv headers
-+ifeq ($(PLATFORM), bsd)
-+ ifneq ($(OS_NAME), netbsd)
-+ CPPFLAGS += -I$(PACKAGE_PATH)/include
-+ OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
-+ endif
-+endif
-+
- #
- # 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-10-28 20:19:52.000000000 -0700
-@@ -42,7 +42,7 @@
- $(LIBDIR)/fonts/LucidaSansRegular.ttf \
- $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
-
--ifeq ($(PLATFORM), linux)
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
-
- # The oblique versions of the font are derived from the base versions
- # and since 2D can do this derivation on the fly at run time there is no
-@@ -82,7 +82,7 @@
- $(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
- $(install-file)
-
--ifeq ($(PLATFORM), linux)
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
-
- # The oblique fonts are only needed/wanted on Linux.
-
-@@ -96,7 +96,7 @@
- $(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
- $(install-file)
-
--endif # linux
-+endif # linux || bsd
-
- all build : $(INTERNAL_IMPORT_LIST)
-
---- ./jdk/make/java/util/FILES_properties.gmk 2013-09-06 11:27:38.000000000 -0700
-+++ ./jdk/make/java/util/FILES_properties.gmk 2014-07-15 21:54:44.000000000 -0700
-@@ -107,6 +107,7 @@
- sun/util/resources/CalendarData_pl.properties \
- sun/util/resources/CalendarData_pt.properties \
- sun/util/resources/CalendarData_pt_PT.properties \
-+ sun/util/resources/CalendarData_pt_BR.properties \
- sun/util/resources/CalendarData_ro.properties \
- sun/util/resources/CalendarData_ru.properties \
- sun/util/resources/CalendarData_sk.properties \
---- ./jdk/make/javax/sound/Makefile 2013-09-06 11:27:38.000000000 -0700
-+++ ./jdk/make/javax/sound/Makefile 2014-10-28 20:19:52.000000000 -0700
-@@ -111,6 +111,21 @@
- #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
- endif # PLATFORM linux
-
-+ifeq ($(PLATFORM), bsd)
-+ifeq ($(OS_VENDOR), FreeBSD)
-+ # ALSA handles directaudio, ports, and MIDI
-+ SUBDIRS += jsoundalsa
-+ EXTRA_SOUND_JNI_LIBS += jsoundalsa
-+else
-+ # build with empty MIDI i/o
-+ INCLUDE_MIDI = TRUE
-+ # build with empty ports
-+ INCLUDE_PORTS = TRUE
-+ # build with empty direct audio
-+ INCLUDE_DAUDIO = TRUE
-+endif
-+endif # PLATFORM bsd
-+
- ifeq ($(PLATFORM), macosx)
- 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-10-28 20:19:52.000000000 -0700
-@@ -40,6 +40,10 @@
- CPPFLAGS += -DX_PLATFORM=X_LINUX
- endif # PLATFORM linux
-
-+ifeq ($(PLATFORM), bsd)
-+ CPPFLAGS += -DX_PLATFORM=X_BSD
-+endif # PLATFORM bsd
-+
- ifeq ($(PLATFORM), macosx)
- 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-10-28 20:19:52.000000000 -0700
-@@ -51,6 +51,7 @@
- $(PORTFILES_c)
-
- # platform dependent files
-+ifeq ($(PLATFORM), linux)
- FILES_c += \
- PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
- PLATFORM_API_LinuxOS_ALSA_PCM.c \
-@@ -60,19 +61,37 @@
- PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
- PLATFORM_API_LinuxOS_ALSA_Ports.c
-
-+MIDI_CPPFLAGS= \
-+ -DUSE_PLATFORM_MIDI_OUT=TRUE \
-+ -DUSE_PLATFORM_MIDI_IN=TRUE
-+endif
-+
-+ifeq ($(PLATFORM), bsd)
-+FILES_c += \
-+ PLATFORM_API_BsdOS_ALSA_CommonUtils.c \
-+ PLATFORM_API_BsdOS_ALSA_PCM.c \
-+ PLATFORM_API_BsdOS_ALSA_PCMUtils.c \
-+ PLATFORM_API_BsdOS_ALSA_MidiIn.c \
-+ PLATFORM_API_BsdOS_ALSA_MidiOut.c \
-+ PLATFORM_API_BsdOS_ALSA_MidiUtils.c \
-+ PLATFORM_API_BsdOS_ALSA_Ports.c
-+
-+MIDI_CPPFLAGS=
-+endif
-+
- FILES_export = \
- $(DAUDIOFILES_export) \
- $(MIDIFILES_export) \
- $(PORTFILES_export)
-
--OTHER_LDLIBS += -lasound
-+OTHER_LDLIBS += -L$(ALSA_LIB_PATH) -lasound
-
- CPPFLAGS += \
- -DUSE_DAUDIO=TRUE \
- -DUSE_PORTS=TRUE \
-- -DUSE_PLATFORM_MIDI_OUT=TRUE \
-- -DUSE_PLATFORM_MIDI_IN=TRUE \
-- -I$(SHARE_SRC)/native/com/sun/media/sound
-+ $(MIDI_CPPFLAGS) \
-+ -I$(SHARE_SRC)/native/com/sun/media/sound \
-+ -I$(ALSA_HEADERS_PATH)
-
- #
- # 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-10-28 20:19:52.000000000 -0700
-@@ -38,6 +38,11 @@
-
- include $(BUILDDIR)/common/Defs.gmk
-
-+ifeq ($(PLATFORM), bsd))
-+ LIBSOCKET =
-+ OTHER_LDLIBS += -pthread
-+endif
-+
- ifeq ($(PLATFORM), linux)
- OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
- endif
---- ./jdk/make/sun/awt/FILES_c_macosx.gmk 2013-09-06 11:27:39.000000000 -0700
-+++ ./jdk/make/sun/awt/FILES_c_macosx.gmk 1969-12-31 16:00:00.000000000 -0800
-@@ -1,28 +0,0 @@
--#
--# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# 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.
--#
--
--FILES_AWT_objc = \
-- $(TARGDIR)MacOSXResourceBundle.m
--
---- ./jdk/make/sun/awt/FILES_export_macosx.gmk 2013-09-06 11:27:39.000000000 -0700
-+++ ./jdk/make/sun/awt/FILES_export_macosx.gmk 1969-12-31 16:00:00.000000000 -0800
-@@ -1,29 +0,0 @@
--#
--# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# 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.
--#
--
--# FILES_export definitions for Mac OS X
--
--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-10-28 20:19:52.000000000 -0700
-@@ -127,7 +127,12 @@
- OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
- endif
-
--FILES_c += initIDs.c
-+ifeq ($(PLATFORM), bsd)
-+FILES_c = $(FILES_2D_c)
-+FILES_c += awt_LoadLibrary.c
-+OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
-+OTHER_LDLIBS = $(JVMLIB) $(LIBM)
-+endif
-
- ifeq ($(PLATFORM), macosx)
- FILES_c = $(FILES_2D_c)
-@@ -136,6 +141,8 @@
- OTHER_LDLIBS = $(JVMLIB) $(LIBM)
- endif
-
-+FILES_c += initIDs.c
-+
- # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
- endif # PLATFORM
-
-@@ -145,8 +152,6 @@
- #
- # Files
- #
--include FILES_c_macosx.gmk
--include FILES_export_macosx.gmk
-
- FILES_objc = $(FILES_AWT_objc)
- OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \
-@@ -193,6 +198,10 @@
- sun/awt/windows/awtLocalization.properties
- endif
-
-+ifeq ($(PLATFORM), macosx)
-+ NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES += \
-+ sun/awt/resources/awtosx.properties
-+endif
- #
- # Rules
- #
-@@ -502,6 +511,17 @@
- # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
- endif # PLATFORM
-
-+ifeq ($(PLATFORM), bsd)
-+# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv BSD
-+
-+FONTCONFIGS_SRC = $(PLATFORM_SRC)/classes/sun/awt/fontconfigs
-+_FONTCONFIGS = \
-+ fontconfig.properties
-+
-+FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
-+
-+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ BSD
-+endif # PLATFORM
-
- ifeq ($(PLATFORM), macosx)
- # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X
-@@ -607,6 +627,9 @@
- -I$(OPENWIN_HOME)/include/X11/extensions \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
- endif
-+ifeq ($(PLATFORM), bsd)
-+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
-+endif
- CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
-@@ -628,7 +651,13 @@
- -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- $(EVENT_MODEL)
-
--ifeq ($(PLATFORM), linux)
-+# include these last so we don't pick up unintentional includes
-+ifeq ($(PLATFORM), bsd)
-+CPPFLAGS += -I$(OPENWIN_HOME)/include \
-+ -I$(OPENWIN_HOME)/include/X11/extensions
-+endif
-+
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
- LDFLAGS += -L$(OPENWIN_LIB)
- endif
-
---- ./jdk/make/sun/awt/mawt.gmk 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/awt/mawt.gmk 2014-10-28 20:19:52.000000000 -0700
-@@ -169,7 +169,7 @@
- OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
- endif
-
--ifneq (,$(findstring $(PLATFORM), linux macosx))
-+ifneq (,$(findstring $(PLATFORM), bsd linux macosx))
- OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
- # XXX what is this define below? Isn't it motif-related?
- OTHER_CFLAGS += -DXMSTRINGDEFINES=1
-@@ -193,6 +193,7 @@
- #
- # Other extra flags needed for compiling.
- #
-+ifneq ($(PLATFORM), bsd))
- CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-
- ifndef HEADLESS
-@@ -200,6 +201,7 @@
- LDFLAGS += -L$(OPENWIN_LIB)
-
- endif # !HEADLESS
-+endif # !PLATFORM
-
- CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
-@@ -223,13 +225,16 @@
- -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- $(EVENT_MODEL)
-
--ifeq ($(PLATFORM), macosx)
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-
- ifndef HEADLESS
- CPPFLAGS += -I$(MOTIF_DIR)/include \
- -I$(OPENWIN_HOME)/include
- LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
-+ifeq ($(OS_NAME), netbsd)
-+LDFLAGS += -Wl,-R$(OPENWIN_LIB)
-+endif
-
- endif # !HEADLESS
- endif # PLATFORM
-@@ -240,6 +245,12 @@
- $(wildcard /usr/include/X11/extensions))
- endif
-
-+ifeq ($(PLATFORM), bsd))
-+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-+ -I$(OPENWIN_HOME)/include \
-+ -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
-+endif
-+
- ifeq ($(PLATFORM), macosx))
- 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-10-28 20:19:52.000000000 -0700
-@@ -36,7 +36,11 @@
- CPLUSPLUSLIBRARY=true
-
- # Use higher optimization level
--OPTIMIZATION_LEVEL = HIGHER
-+ifeq ($(PLATFORM), windows)
-+ OPTIMIZATION_LEVEL = HIGHEST
-+else
-+ OPTIMIZATION_LEVEL = HIGHER
-+endif
-
- include $(BUILDDIR)/common/Defs.gmk
-
-@@ -91,7 +95,7 @@
- endif # PLATFORM
-
- # Turn off aliasing with GCC for ExtensionSubtables.cpp
--ifeq ($(PLATFORM), linux)
-+ifneq (,$(findstring $(PLATFORM), bsd linux))
- CXXFLAGS += $(CXXFLAGS_$(@F))
- CXXFLAGS_ExtensionSubtables.o = -fno-strict-aliasing
- endif
-@@ -178,7 +182,7 @@
- # Libraries to link, and other C flags.
- #
-
--ifeq ($(PLATFORM), macosx))
-+ifneq (,$(findstring $(PLATFORM), bsd macosx))
- OTHER_INCLUDES += -I$(X11_PATH)/include
- 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-07-15 21:54:44.000000000 -0700
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
--tzdata2013d
-+tzdata2014c
---- ./jdk/make/sun/javazic/tzdata/africa 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/javazic/tzdata/africa 2014-07-15 21:54:44.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
-@@ -358,11 +358,54 @@
- # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
- # </a>
-
-+# From Ahmad El-Dardiry (2014-05-07):
-+# Egypt is to change back to Daylight system on May 15
-+# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
-+
-+# From Gunther Vermier (2015-05-13):
-+# our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
-+
-+# From Paul Eggert (2014-05-13):
-+# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
-+# the change is because of blackouts in Cairo, even though Ahram Online (cited
-+# above) says DST had no affect on electricity consumption. The AP story says
-+# DST will not be observed during Ramadan. There is no information about when
-+# DST will end. See:
-+# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
-+#
-+# For now, guess that later transitions will use 2010's rules, and that
-+# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-+# ends, though (unlike Morocco) it will switch at 00:00 standard time. In
-+# Egypt the spring-forward transitions are removed for 2020-2022, when the
-+# guessed spring-forward date falls during the estimated Ramadan, and all
-+# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-+# outside the guessed daylight-saving time. Ramadan intrudes on the guessed
-+# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-+
- Rule Egypt 2008 only - Aug lastThu 23:00s 0 -
- Rule Egypt 2009 only - Aug 20 23:00s 0 -
- Rule Egypt 2010 only - Aug 11 0:00 0 -
- Rule Egypt 2010 only - Sep 10 0:00 1:00 S
- Rule Egypt 2010 only - Sep lastThu 23:00s 0 -
-+Rule Egypt 2014 only - May 15 24:00 1:00 S
-+Rule Egypt 2014 only - Jun 29 0:00s 0 -
-+Rule Egypt 2014 only - Jul 29 0:00s 1:00 S
-+Rule Egypt 2014 max - Sep lastThu 23:00s 0 -
-+Rule Egypt 2015 2019 - Apr lastFri 0:00s 1:00 S
-+Rule Egypt 2015 only - Jun 18 0:00s 0 -
-+Rule Egypt 2015 only - Jul 18 0:00s 1:00 S
-+Rule Egypt 2016 only - Jun 7 0:00s 0 -
-+Rule Egypt 2016 only - Jul 7 0:00s 1:00 S
-+Rule Egypt 2017 only - May 27 0:00s 0 -
-+Rule Egypt 2017 only - Jun 26 0:00s 1:00 S
-+Rule Egypt 2018 only - May 16 0:00s 0 -
-+Rule Egypt 2018 only - Jun 15 0:00s 1:00 S
-+Rule Egypt 2019 only - May 6 0:00s 0 -
-+Rule Egypt 2019 only - Jun 5 0:00s 1:00 S
-+Rule Egypt 2020 only - May 24 0:00s 1:00 S
-+Rule Egypt 2021 only - May 13 0:00s 1:00 S
-+Rule Egypt 2022 only - May 3 0:00s 1:00 S
-+Rule Egypt 2023 max - Apr lastFri 0:00s 1:00 S
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
-@@ -474,6 +517,14 @@
- # (either two days before them or five days after them, so as to fall on
- # lastFri instead of lastSun).
-
-+# From Even Scharning (2013-10-25):
-+# The scheduled end of DST in Libya on Friday, October 25, 2013 was
-+# cancelled yesterday....
-+# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
-+#
-+# From Paul Eggert (2013-10-25):
-+# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
-+
- # 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,8 +541,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 -
--Rule Libya 2013 max - Mar lastFri 1:00 1:00 S
--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 -
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Africa/Tripoli 0:52:44 - LMT 1920
- 1:00 Libya CE%sT 1959
-@@ -502,7 +553,8 @@
- 2:00 - EET 1996 Sep 30
- 1:00 Libya CE%sT 1997 Oct 4
- 2:00 - EET 2012 Nov 10 2:00
-- 1:00 Libya CE%sT
-+ 1:00 Libya CE%sT 2013 Oct 25 2:00
-+ 2:00 - EET
-
- # Madagascar
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
-@@ -707,15 +759,6 @@
- # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
- # </a>
-
--# From Alex Krivenyshev (2008-05-09):
--# Is Western Sahara (part which administrated by Morocco) going to follow
--# Morocco DST changes? Any information? What about other part of
--# Western Sahara - under administration of POLISARIO Front (also named
--# SADR Saharawi Arab Democratic Republic)?
--
--# From Arthur David Olson (2008-05-09):
--# XXX--guess that it is only Morocco for now; guess only 2008 for now.
--
- # 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 +924,26 @@
- # 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
-
--# From Paul Eggert (2013-07-03):
-+# From Steffen Thorsen (2013-09-28):
-+# Morocco extends DST by one month, on very short notice, just 1 day
-+# before it was going to end. There is a new decree (2.13.781) for
-+# this, where DST from now on goes from last Sunday of March at 02:00
-+# to last Sunday of October at 03:00, similar to EU rules. Official
-+# source (French):
-+# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
-+# Another source (specifying the time for start and end in the decree):
-+# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
-+
-+# From Sebastien Willemijns (2014-03-18):
-+# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
-+
-+# From Paul Eggert (2014-03-19):
- # To estimate what the Moroccan government will do in future years,
--# transition dates for 2014 through 2021 were determined by running
-+# transition dates for 2014 through 2038 were determined by running
- # the following program under GNU Emacs 24.3:
- #
- # (let ((islamic-year 1435))
--# (while (< islamic-year 1444)
-+# (while (< islamic-year 1461)
- # (let ((a
- # (calendar-gregorian-from-absolute
- # (calendar-islamic-to-absolute (list 9 1 islamic-year))))
-@@ -902,13 +958,18 @@
- # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
- # (setq islamic-year (+ 1 islamic-year))))
- #
--# with the results hand-edited for 2020-2022, when the normal spring-forward
--# date falls during the estimated Ramadan.
--#
--# From 2023 through 2038 Ramadan is not predicted to overlap with
--# daylight saving time. Starting in 2039 there will be overlap again,
--# but 32-bit time_t values roll around in 2038 so for now do not worry
--# about dates after 2038.
-+# with spring-forward transitions removed for 2023-2025, when the
-+# normal spring-forward date falls during the estimated Ramadan; with
-+# all transitions removed for 2026-2035, where the estimated Ramadan
-+# falls entirely outside daylight-saving time; and with fall-back
-+# transitions removed for 2036-2037, where the normal fall-back
-+# date falls during the estimated Ramadan. Normally, the table would
-+# stop after 2037 because 32-bit time_t values roll around early in 2038,
-+# but that would imply a prediction of perpetual DST after March 2038
-+# due to the year-2037 glitches. So, this table instead stops after
-+# 2038, the first non-glitchy year after the 32-bit rollover.
-+# An advantage of stopping after 2038 is that it lets zic guess
-+# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
-
- # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-
-@@ -935,12 +996,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 -
--Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S
--Rule Morocco 2012 max - Sep lastSun 3:00 0 -
-+Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S
-+Rule Morocco 2012 only - Sep 30 3:00 0 -
- Rule Morocco 2012 only - Jul 20 3:00 0 -
- Rule Morocco 2012 only - Aug 20 2:00 1:00 S
- Rule Morocco 2013 only - Jul 7 3:00 0 -
- Rule Morocco 2013 only - Aug 10 2:00 1:00 S
-+Rule Morocco 2013 2035 - Oct lastSun 3:00 0 -
-+Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
- 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 +1016,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
-+Rule Morocco 2020 only - Apr 24 3:00 0 -
- Rule Morocco 2020 only - May 24 2:00 1:00 S
-+Rule Morocco 2021 only - Apr 13 3:00 0 -
- Rule Morocco 2021 only - May 13 2:00 1:00 S
-+Rule Morocco 2022 only - Apr 3 3:00 0 -
- Rule Morocco 2022 only - May 3 2:00 1:00 S
--Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S
-+Rule Morocco 2023 only - Apr 22 2:00 1:00 S
-+Rule Morocco 2024 only - Apr 10 2:00 1:00 S
-+Rule Morocco 2025 only - Mar 31 2:00 1:00 S
-+Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
-+Rule Morocco 2036 only - Oct 21 3:00 0 -
-+Rule Morocco 2037 only - Oct 11 3:00 0 -
-+Rule Morocco 2038 only - Sep 30 3:00 0 -
-+Rule Morocco 2038 only - Oct 30 2:00 1:00 S
-+Rule Morocco 2038 max - Oct lastSun 3:00 0 -
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
- 0:00 Morocco WE%sT 1984 Mar 16
- 1:00 - CET 1986
- 0:00 Morocco WE%sT
-+
- # Western Sahara
-+#
-+# From Gwillim Law (2013-10-22):
-+# A correspondent who is usually well informed about time zone matters
-+# ... says that Western Sahara observes daylight saving time, just as
-+# Morocco does.
-+#
-+# From Paul Eggert (2013-10-23):
-+# Assume that this has been true since Western Sahara switched to GMT,
-+# since most of it was then controlled by Morocco.
-+
- Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
- -1:00 - WAT 1976 Apr 14
-- 0:00 - WET
-+ 0:00 Morocco WE%sT
-
- # Mozambique
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
-@@ -1123,9 +1208,7 @@
- 3:00 - EAT
-
- # South Sudan
--Zone Africa/Juba 2:06:24 - LMT 1931
-- 2:00 Sudan CA%sT 2000 Jan 15 12:00
-- 3:00 - EAT
-+Link Africa/Khartoum Africa/Juba
-
- # 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-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
-@@ -39,9 +39,9 @@
- #
- # Except for the French entries,
- # I made up all time zone abbreviations mentioned here; corrections welcome!
--# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited.
-+# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
-
--# These rules are stolen from the `southamerica' file.
-+# These rules are stolen from the 'southamerica' file.
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule ArgAQ 1964 1966 - Mar 1 0:00 0 -
- Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S
-@@ -251,25 +251,43 @@
- # Scott Island (never inhabited)
- #
- # year-round base
--# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo.
--#
--# These rules for New Zealand are stolen from the `australasia' file.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
--Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
--Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D
--Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D
--Rule NZAQ 1975 only - Feb 23 2:00s 0 S
--Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S
--Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S
--Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D
--Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S
-+# Scott Base, Ross Island, since 1957-01.
-+# See Pacific/Auckland.
-
- # Norway - territories
- # Bouvet (never inhabited)
- #
- # claims
- # Peter I Island (never inhabited)
-+#
-+# year-round base
-+# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12
-+#
-+# From Paul-Inge Flakstad (2014-03-10):
-+# I recently had a long dialog about this with the developer of timegenie.com.
-+# In the absence of specific dates, he decided to choose some likely ones:
-+# GMT +1 - From March 1 to the last Sunday in March
-+# GMT +2 - From the last Sunday in March until the last Sunday in October
-+# GMT +1 - From the last Sunday in October until November 7
-+# GMT +0 - From November 7 until March 1
-+# The dates for switching to and from UTC+0 will probably not be absolutely
-+# correct, but they should be quite close to the actual dates.
-+#
-+# From Paul Eggert (2014-03-21):
-+# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
-+# suggested by Bengt-Inge Larsson comment them out for now, and approximate
-+# with only UTC and CEST. Uncomment them when 2014b is more prevalent.
-+#
-+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET
-+Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST
-+#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET
-+#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC
-+# Remove the following line when uncommenting the above '#Rule' lines.
-+Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC
-+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-+Zone Antarctica/Troll 0 - zzz 2005 Feb 12
-+ 0:00 Troll %s
-
- # Poland - year-round base
- # Arctowski, King George Island, -620945-0582745, since 1977
-@@ -291,11 +309,11 @@
- # From Lee Hotz (2001-03-08):
- # I queried the folks at Columbia who spent the summer at Vostok and this is
- # what they had to say about time there:
--# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo)
-+# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
- # time, which is 12 hours ahead of GMT. The Russian Station Vostok was
- # 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
- # of GMT). This is a time zone I think two hours east of Moscow. The
--# natural time zone is in between the two: 8 hours ahead of GMT.''
-+# natural time zone is in between the two: 8 hours ahead of GMT."
- #
- # From Paul Eggert (2001-05-04):
- # This seems to be hopelessly confusing, so I asked Lee Hotz about it
-@@ -360,16 +378,8 @@
- -4:00 ChileAQ CL%sT
- #
- #
--# McMurdo, Ross Island, since 1955-12
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone Antarctica/McMurdo 0 - zzz 1956
-- 12:00 NZAQ NZ%sT
--#
--# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20
--#
--# From Paul Eggert (1996-09-03):
--# Normally it wouldn't have a separate entry, since it's like the
--# larger Antarctica/McMurdo since 1970, but it's too famous to omit.
-+# McMurdo Station, Ross Island, since 1955-12
-+# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
- #
- # From Chris Carrier (1996-06-27):
- # Siple, the first commander of the South Pole station,
-@@ -391,4 +401,4 @@
- # we have to go around and set them back 5 minutes or so.
- # Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
- #
--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-07-15 21:54:44.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
-@@ -29,7 +29,7 @@
- # go ahead and edit the file (and please send any changes to
- # tz@iana.org for general use in the future).
-
--# From Paul Eggert (2013-02-21):
-+# From Paul Eggert (2013-08-11):
- #
- # A good source for time zone historical data outside the U.S. is
- # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-@@ -67,11 +67,11 @@
- # 4:00 GST Gulf*
- # 5:30 IST India
- # 7:00 ICT Indochina*
--# 7:00 WIT west Indonesia
--# 8:00 CIT central Indonesia
-+# 7:00 WIB west Indonesia (Waktu Indonesia Barat)
-+# 8:00 WITA central Indonesia (Waktu Indonesia Tengah)
- # 8:00 CST China
- # 9:00 CJT Central Japanese Time (1896/1937)*
--# 9:00 EIT east Indonesia
-+# 9:00 WIT east Indonesia (Waktu Indonesia Timur)
- # 9:00 JST JDT Japan
- # 9:00 KST KDT Korea
- # 9:30 CST (Australian) Central Standard Time
-@@ -779,7 +779,7 @@
- 8:00 - TLT 1942 Feb 21 23:00 # E Timor Time
- 9:00 - JST 1945 Sep 23
- 9:00 - TLT 1976 May 3
-- 8:00 - CIT 2000 Sep 17 00:00
-+ 8:00 - WITA 2000 Sep 17 00:00
- 9:00 - TLT
-
- # India
-@@ -816,36 +816,53 @@
- # (Hollandia). For now, assume all Indonesian locations other than Jayapura
- # switched on 1945-09-23.
- #
-+# From Paul Eggert (2013-08-11):
-+# Normally the tz database uses English-language abbreviations, but in
-+# Indonesia it's typical to use Indonesian-language abbreviations even
-+# when writing in English. For example, see the English-language
-+# summary published by the Time and Frequency Laboratory of the
-+# Research Center for Calibration, Instrumentation and Metrology,
-+# Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
-+# The abbreviations are:
-+#
-+# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
-+# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
-+# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
-+#
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
-+# Java, Sumatra
- Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10
- # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
- # but this must be a typo.
-- 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta
-+ 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia
- 7:20 - JAVT 1932 Nov # Java Time
-- 7:30 - WIT 1942 Mar 23
-+ 7:30 - WIB 1942 Mar 23
- 9:00 - JST 1945 Sep 23
-- 7:30 - WIT 1948 May
-- 8:00 - WIT 1950 May
-- 7:30 - WIT 1964
-- 7:00 - WIT
-+ 7:30 - WIB 1948 May
-+ 8:00 - WIB 1950 May
-+ 7:30 - WIB 1964
-+ 7:00 - WIB
-+# west and central Borneo
- Zone Asia/Pontianak 7:17:20 - LMT 1908 May
- 7:17:20 - PMT 1932 Nov # Pontianak MT
-- 7:30 - WIT 1942 Jan 29
-+ 7:30 - WIB 1942 Jan 29
- 9:00 - JST 1945 Sep 23
-- 7:30 - WIT 1948 May
-- 8:00 - WIT 1950 May
-- 7:30 - WIT 1964
-- 8:00 - CIT 1988 Jan 1
-- 7:00 - WIT
-+ 7:30 - WIB 1948 May
-+ 8:00 - WIB 1950 May
-+ 7:30 - WIB 1964
-+ 8:00 - WITA 1988 Jan 1
-+ 7:00 - WIB
-+# Sulawesi, Lesser Sundas, east and south Borneo
- Zone Asia/Makassar 7:57:36 - LMT 1920
- 7:57:36 - MMT 1932 Nov # Macassar MT
-- 8:00 - CIT 1942 Feb 9
-+ 8:00 - WITA 1942 Feb 9
- 9:00 - JST 1945 Sep 23
-- 8:00 - CIT
-+ 8:00 - WITA
-+# Maluku Islands, West Papua, Papua
- Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
-- 9:00 - EIT 1944 Sep 1
-+ 9:00 - WIT 1944 Sep 1
- 9:30 - CST 1964
-- 9:00 - EIT
-+ 9:00 - WIT
-
- # Iran
-
-@@ -1096,8 +1113,13 @@
- Rule Zion 1986 only - Sep 7 0:00 0 S
- Rule Zion 1987 only - Apr 15 0:00 1:00 D
- Rule Zion 1987 only - Sep 13 0:00 0 S
--Rule Zion 1988 only - Apr 9 0:00 1:00 D
--Rule Zion 1988 only - Sep 3 0:00 0 S
-+
-+# From Avigdor Finkelstein (2014-03-05):
-+# I check the Parliament (Knesset) records and there it's stated that the
-+# [1988] transition should take place on Saturday night, when the Sabbath
-+# ends and changes to Sunday.
-+Rule Zion 1988 only - Apr 10 0:00 1:00 D
-+Rule Zion 1988 only - Sep 4 0:00 0 S
-
- # From Ephraim Silverberg
- # (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, 2004-12-22,
-@@ -1348,22 +1370,6 @@
- # "Jordan will switch to winter time on Friday, October 27".
- #
-
--# From Phil Pizzey (2009-04-02):
--# ...I think I may have spotted an error in the timezone data for
--# Jordan.
--# The current (2009d) asia file shows Jordan going to daylight
--# saving
--# time on the last Thursday in March.
--#
--# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S
--#
--# However timeanddate.com, which I usually find reliable, shows Jordan
--# going to daylight saving time on the last Friday in March since 2002.
--# Please see
--# <a href="http://www.timeanddate.com/worldclock/timezone.html?n=11">
--# http://www.timeanddate.com/worldclock/timezone.html?n=11
--# </a>
--
- # From Steffen Thorsen (2009-04-02):
- # This single one might be good enough, (2009-03-24, Arabic):
- # <a href="http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279">
-@@ -1386,10 +1392,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 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,12 +1433,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
--Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S
-+Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S
- 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 2013 max - 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
-@@ -2303,9 +2323,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
-
--# From Paul Eggert (2013-04-15):
-+# From Steffen Thorsen (2013-09-24):
-+# The Gaza and West Bank are ending DST Thursday at midnight
-+# (2013-09-27 00:00:00) (one hour earlier than last year...).
-+# This source in English, says "that winter time will go into effect
-+# at midnight on Thursday in the West Bank and Gaza Strip":
-+# http://english.wafa.ps/index.php?action=detail&id=23246
-+# official source...:
-+# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
-+
-+# From Paul Eggert (2013-09-24):
- # For future dates, guess the last Thursday in March at 24:00 through
--# the first Friday on or after September 21 at 01:00. This is consistent with
-+# the first Friday on or after September 21 at 00:00. This is consistent with
- # 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 +2365,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
--Rule Palestine 2012 max - Sep Fri>=21 1:00 0 -
-+Rule Palestine 2012 only - Sep 21 1:00 0 -
-+Rule Palestine 2013 max - Sep Fri>=21 0:00 0 -
-
- # 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-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
-@@ -375,18 +375,30 @@
- # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
- # October 2012 and end at 3 am on Sunday 20th January 2013.
- # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
--#
--# From Paul Eggert (2012-08-31):
--# For now, guess a pattern of the penultimate Sundays in October and January.
-+
-+# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
-+# Fiji will start daylight savings on Sunday 27th October, 2013 ...
-+# move clocks forward by one hour from 2am
-+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
-+
-+# From Steffen Thorsen (2013-01-10):
-+# Fiji will end DST on 2014-01-19 02:00:
-+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
-+
-+# From Paul Eggert (2014-01-10):
-+# For now, guess that Fiji springs forward the Sunday before the fourth
-+# Monday in October, and springs back the penultimate Sunday in January.
-+# This is ad hoc, but matches recent practice.
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
- Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
- Rule Fiji 2009 only - Nov 29 2:00 1:00 S
- Rule Fiji 2010 only - Mar lastSun 3:00 0 -
--Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S
-+Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S
- Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
--Rule Fiji 2012 max - Jan Sun>=18 3:00 0 -
-+Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
-+Rule Fiji 2014 max - Jan Sun>=18 2:00 0 -
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
- 12:00 Fiji FJ%sT # Fiji Time
-@@ -510,6 +522,7 @@
- Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1
- 12:45 Chatham CHA%sT
-
-+Link Pacific/Auckland Antarctica/McMurdo
-
- # Auckland Is
- # uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers,
-@@ -759,7 +772,7 @@
- # 1886-1891; Baker was similar but exact dates are not known.
- # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
- # uninhabited thereafter.
--# Howland observed Hawaii Standard Time (UTC-10:30) in 1937;
-+# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
- # see page 206 of Elgen M. Long and Marie K. Long,
- # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
- # So most likely Howland and Baker observed Hawaii Time from 1935
-@@ -772,8 +785,32 @@
- # no information; was probably like Pacific/Kiritimati
-
- # Johnston
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone Pacific/Johnston -10:00 - HST
-+#
-+# From Paul Eggert (2014-03-11):
-+# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind.
-+# Details are uncertain. We have no data for Johnston after 1970, so
-+# treat it like Hawaii for now.
-+#
-+# In his memoirs of June 6th to October 4, 1945
-+# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
-+# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
-+# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and
-+# confirms that Johnston kept the same time as Honolulu in summer 1945.
-+#
-+# From Lyle McElhaney (2014-03-11):
-+# [W]hen JI was being used for that [atomic bomb] testing, the time being used
-+# was not Hawaiian time but rather the same time being used on the ships,
-+# which had a GMT offset of -11 hours. This apparently applied to at least the
-+# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
-+# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
-+# "The United States High-Altitude Test Experience: A Review Emphasizing the
-+# Impact on the Environment", Los Alamos LA-6405, Oct 1976
-+# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
-+# See the table on page 4 where he lists GMT and local times for the tests; a
-+# footnote for the JI tests reads that local time is "JI time = Hawaii Time
-+# Minus One Hour".
-+#
-+# See 'northamerica' for Pacific/Johnston.
-
- # Kingman
- # uninhabited
---- ./jdk/make/sun/javazic/tzdata/backward 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/javazic/tzdata/backward 2014-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
-@@ -45,15 +45,17 @@
- Link America/Argentina/Mendoza America/Mendoza
- Link America/Rio_Branco America/Porto_Acre
- Link America/Argentina/Cordoba America/Rosario
--Link America/St_Thomas America/Virgin
-+Link America/Denver America/Shiprock
-+Link America/Port_of_Spain America/Virgin
-+Link Pacific/Auckland Antarctica/South_Pole
- Link Asia/Ashgabat Asia/Ashkhabad
-+Link Asia/Kolkata Asia/Calcutta
- Link Asia/Chongqing Asia/Chungking
- Link Asia/Dhaka Asia/Dacca
- Link Asia/Kathmandu Asia/Katmandu
--Link Asia/Kolkata Asia/Calcutta
- Link Asia/Macau Asia/Macao
--Link Asia/Jerusalem Asia/Tel_Aviv
- Link Asia/Ho_Chi_Minh Asia/Saigon
-+Link Asia/Jerusalem Asia/Tel_Aviv
- Link Asia/Thimphu Asia/Thimbu
- Link Asia/Makassar Asia/Ujung_Pandang
- Link Asia/Ulaanbaatar Asia/Ulan_Bator
-@@ -111,10 +113,10 @@
- Link Pacific/Chatham NZ-CHAT
- Link America/Denver Navajo
- Link Asia/Shanghai PRC
-+Link Pacific/Pohnpei Pacific/Ponape
- Link Pacific/Pago_Pago Pacific/Samoa
--Link Pacific/Chuuk Pacific/Yap
- Link Pacific/Chuuk Pacific/Truk
--Link Pacific/Pohnpei Pacific/Ponape
-+Link Pacific/Chuuk Pacific/Yap
- Link Europe/Warsaw Poland
- 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-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
-@@ -54,9 +54,9 @@
- # even though this is the opposite of what many people expect.
- # POSIX has positive signs west of Greenwich, but many people expect
- # positive signs east of Greenwich. For example, TZ='Etc/GMT+4' uses
--# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC
-+# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
- # (i.e. west of Greenwich) even though many people would expect it to
--# mean 4 hours ahead of UTC (i.e. east of Greenwich).
-+# mean 4 hours ahead of UT (i.e. east of Greenwich).
- #
- # 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-07-15 21:54:44.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
-@@ -65,7 +65,7 @@
- # </a> (1998-09-21, in Portuguese)
-
- #
--# I invented the abbreviations marked `*' in the following table;
-+# I invented the abbreviations marked '*' in the following table;
- # the rest are from earlier versions of this file, or from other sources.
- # Corrections are welcome!
- # std dst 2dst
-@@ -119,7 +119,7 @@
- # and a sketch map showing some of the sightlines involved. One paragraph
- # of the text said:
- #
--# `An old stone obelisk marking a forgotten terrestrial meridian stands
-+# 'An old stone obelisk marking a forgotten terrestrial meridian stands
- # beside the river at Kew. In the 18th century, before time and longitude
- # was standardised by the Royal Observatory in Greenwich, scholars observed
- # this stone and the movement of stars from Kew Observatory nearby. They
-@@ -163,7 +163,7 @@
- # From Paul Eggert (2003-09-27):
- # Summer Time was first seriously proposed by William Willett (1857-1915),
- # a London builder and member of the Royal Astronomical Society
--# who circulated a pamphlet ``The Waste of Daylight'' (1907)
-+# who circulated a pamphlet "The Waste of Daylight" (1907)
- # that proposed advancing clocks 20 minutes on each of four Sundays in April,
- # and retarding them by the same amount on four Sundays in September.
- # A bill was drafted in 1909 and introduced in Parliament several times,
-@@ -188,10 +188,10 @@
- # </a>
-
- # From Paul Eggert (1996-09-03):
--# The OED Supplement says that the English originally said ``Daylight Saving''
-+# The OED Supplement says that the English originally said "Daylight Saving"
- # when they were debating the adoption of DST in 1908; but by 1916 this
- # term appears only in quotes taken from DST's opponents, whereas the
--# proponents (who eventually won the argument) are quoted as using ``Summer''.
-+# proponents (who eventually won the argument) are quoted as using "Summer".
-
- # From Arthur David Olson (1989-01-19):
- #
-@@ -231,9 +231,9 @@
- # which could not be said to run counter to any official description.
-
- # From Paul Eggert (2000-10-02):
--# Howse writes (p 157) `DBST' too, but `BDST' seems to have been common
-+# Howse writes (p 157) 'DBST' too, but 'BDST' seems to have been common
- # and follows the more usual convention of putting the location name first,
--# so we use `BDST'.
-+# so we use 'BDST'.
-
- # Peter Ilieve (1998-04-19) described at length
- # the history of summer time legislation in the United Kingdom.
-@@ -454,6 +454,8 @@
- Rule GB-Eire 1990 1995 - Oct Sun>=22 1:00u 0 GMT
- # Summer Time Order 1997 (S.I. 1997/2982)
- # See EU for rules starting in 1996.
-+#
-+# Use Europe/London for Jersey, Guernsey, and the Isle of Man.
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s
-@@ -820,7 +822,7 @@
- 1:00 EU CE%sT
-
- # Bosnia and Herzegovina
--# see Serbia
-+# See Europe/Belgrade.
-
- # Bulgaria
- #
-@@ -848,10 +850,10 @@
- 2:00 EU EE%sT
-
- # Croatia
--# see Serbia
-+# See Europe/Belgrade.
-
- # Cyprus
--# Please see the `asia' file for Asia/Nicosia.
-+# Please see the 'asia' file for Asia/Nicosia.
-
- # Czech Republic
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-@@ -868,6 +870,7 @@
- 1:00 C-Eur CE%sT 1944 Sep 17 2:00s
- 1:00 Czech CE%sT 1979
- 1:00 EU CE%sT
-+# Use Europe/Prague also for Slovakia.
-
- # Denmark, Faroe Islands, and Greenland
-
-@@ -1031,12 +1034,12 @@
- # From Peter Ilieve (1996-10-28):
- # [IATA SSIM (1992/1996) claims that the Baltic republics switch at 01:00s,
- # but a relative confirms that Estonia still switches at 02:00s, writing:]
--# ``I do not [know] exactly but there are some little different
-+# "I do not [know] exactly but there are some little different
- # (confusing) rules for International Air and Railway Transport Schedules
- # conversion in Sunday connected with end of summer time in Estonia....
- # A discussion is running about the summer time efficiency and effect on
- # human physiology. It seems that Estonia maybe will not change to
--# summer time next spring.''
-+# summer time next spring."
-
- # From Peter Ilieve (1998-11-04), heavily edited:
- # <a href="http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390">
-@@ -1091,7 +1094,7 @@
- # Well, here in Helsinki we're just changing from summer time to regular one,
- # and it's supposed to change at 4am...
-
--# From Janne Snabb (2010-0715):
-+# From Janne Snabb (2010-07-15):
- #
- # I noticed that the Finland data is not accurate for years 1981 and 1982.
- # During these two first trial years the DST adjustment was made one hour
-@@ -1148,7 +1151,7 @@
-
-
- #
--# Shank & Pottenger seem to use `24:00' ambiguously; resolve it with Whitman.
-+# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule France 1916 only - Jun 14 23:00s 1:00 S
- Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
-@@ -1438,7 +1441,7 @@
- # <a href="http://toi.iriti.cnr.it/uk/ienitlt.html">
- # Day-light Saving Time in Italy (2006-02-03)
- # </a>
--# (`FP' below), taken from an Italian National Electrotechnical Institute
-+# ('FP' below), taken from an Italian National Electrotechnical Institute
- # publication. When the three sources disagree, guess who's right, as follows:
- #
- # year FP Shanks&P. (S) Whitman (W) Go with:
-@@ -1584,10 +1587,22 @@
- 2:00 EU EE%sT
-
- # Liechtenstein
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone Europe/Vaduz 0:38:04 - LMT 1894 Jun
-- 1:00 - CET 1981
-- 1:00 EU CE%sT
-+
-+# From Paul Eggert (2013-09-09):
-+# Shanks & Pottenger say Vaduz is like Zurich.
-+
-+# From Alois Treindl (2013-09-18):
-+# http://www.eliechtensteinensia.li/LIJ/1978/1938-1978/1941.pdf
-+# ... confirms on p. 6 that Liechtenstein followed Switzerland in 1941 and 1942.
-+# I ... translate only the last two paragraphs:
-+# ... during second world war, in the years 1941 and 1942, Liechtenstein
-+# introduced daylight saving time, adapting to Switzerland. From 1943 on
-+# central European time was in force throughout the year.
-+# From a report of the duke's government to the high council,
-+# regarding the introduction of a time law, of 31 May 1977.
-+
-+Link Europe/Zurich Europe/Vaduz
-+
-
- # Lithuania
-
-@@ -1675,7 +1690,7 @@
- 1:00 EU CE%sT
-
- # Macedonia
--# see Serbia
-+# See Europe/Belgrade.
-
- # Malta
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-@@ -1768,7 +1783,7 @@
- 1:00 EU CE%sT
-
- # Montenegro
--# see Serbia
-+# See Europe/Belgrade.
-
- # Netherlands
-
-@@ -1883,7 +1898,7 @@
- # before 1895, and therefore probably changed the local time somewhere
- # between 1895 and 1925 (inclusive).
-
--# From Paul Eggert (2001-05-01):
-+# From Paul Eggert (2013-09-04):
- #
- # Actually, Jan Mayen was never occupied by Germany during World War II,
- # so it must have diverged from Oslo time during the war, as Oslo was
-@@ -1894,7 +1909,7 @@
- # 1941 with a small Norwegian garrison and continued operations despite
- # frequent air ttacks from Germans. In 1943 the Americans established a
- # radiolocating station on the island, called "Atlantic City". Possibly
--# the UTC offset changed during the war, but I think it unlikely that
-+# the UT offset changed during the war, but I think it unlikely that
- # Jan Mayen used German daylight-saving rules.
- #
- # Svalbard is more complicated, as it was raided in August 1941 by an
-@@ -1907,9 +1922,8 @@
- # the German armed forces at the Svalbard weather station code-named
- # Haudegen did not surrender to the Allies until September 1945.
- #
--# All these events predate our cutoff date of 1970. Unless we can
--# come up with more definitive info about the timekeeping during the
--# war years it's probably best just do...the following for now:
-+# All these events predate our cutoff date of 1970, so use Europe/Oslo
-+# for these regions.
- Link Europe/Oslo Arctic/Longyearbyen
-
- # Poland
-@@ -2167,7 +2181,7 @@
- # so we (Novosibirsk) simply did not switch.
- #
- # From Andrey A. Chernov (1996-10-04):
--# `MSK' and `MSD' were born and used initially on Moscow computers with
-+# 'MSK' and 'MSD' were born and used initially on Moscow computers with
- # UNIX-like OSes by several developer groups (e.g. Demos group, Kiae group)....
- # The next step was the UUCP network, the Relcom predecessor
- # (used mainly for mail), and MSK/MSD was actively used there.
-@@ -2466,6 +2480,9 @@
- 11:00 Russia ANA%sT 2011 Mar 27 2:00s
- 12:00 - ANAT
-
-+# San Marino
-+# See Europe/Rome.
-+
- # Serbia
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Europe/Belgrade 1:22:00 - LMT 1884
-@@ -2488,7 +2505,7 @@
- Link Europe/Prague Europe/Bratislava
-
- # Slovenia
--# see Serbia
-+# See Europe/Belgrade.
-
- # Spain
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-@@ -2622,7 +2639,7 @@
- # and their performance improved enormously. Communities began to keep
- # mean time in preference to apparent time -- Geneva from 1780 ....
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--# From Whitman (who writes ``Midnight?''):
-+# From Whitman (who writes "Midnight?"):
- # Rule Swiss 1940 only - Nov 2 0:00 1:00 S
- # Rule Swiss 1940 only - Dec 31 0:00 0 -
- # From Shanks & Pottenger:
-@@ -2667,23 +2684,53 @@
- # The 1940 rules must be deleted.
- #
- # One further detail for Switzerland, which is probably out of scope for
--# most users of tzdata:
--# The zone file
--# Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12
--# 0:29:44 - BMT 1894 Jun #Bern Mean Time
--# 1:00 Swiss CE%sT 1981
--# 1:00 EU CE%sT
-+# most users of tzdata: The [Europe/Zurich zone] ...
- # describes all of Switzerland correctly, with the exception of
- # the Cantone Geneve (Geneva, Genf). Between 1848 and 1894 Geneve did not
- # follow Bern Mean Time but kept its own local mean time.
- # To represent this, an extra zone would be needed.
-+#
-+# From Alois Treindl (2013-09-11):
-+# The Federal regulations say
-+# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html
-+# ... the meridian for Bern mean time ... is 7 degrees 26'22.50".
-+# Expressed in time, it is 0h29m45.5s.
-+
-+# From Pierre-Yves Berger (2013-09-11):
-+# the "Circulaire du conseil federal" (December 11 1893)
-+# <http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353> ...
-+# clearly states that the [1894-06-01] change should be done at midnight
-+# but if no one is present after 11 at night, could be postponed until one
-+# hour before the beginning of service.
-+
-+# From Paul Eggert (2013-09-11):
-+# Round BMT to the nearest even second, 0:29:46.
-+#
-+# We can find no reliable source for Shanks's assertion that all of Switzerland
-+# except Geneva switched to Bern Mean Time at 00:00 on 1848-09-12. This book:
-+#
-+# Jakob Messerli. Gleichmassig, punktlich, schnell: Zeiteinteilung und
-+# Zeitgebrauch in der Schweiz im 19. Jahrhundert. Chronos, Zurich 1995,
-+# ISBN 3-905311-68-2, OCLC 717570797.
-+#
-+# suggests that the transition was more gradual, and that the Swiss did not
-+# agree about civil time during the transition. The timekeeping it gives the
-+# most detail for is postal and telegraph time: here, federal legislation (the
-+# "Bundesgesetz uber die Erstellung von elektrischen Telegraphen") passed on
-+# 1851-11-23, and an official implementation notice was published 1853-07-16
-+# (Bundesblatt 1853, Bd. II, S. 859). On p 72 Messerli writes that in
-+# practice since July 1853 Bernese time was used in "all postal and telegraph
-+# offices in Switzerland from Geneva to St. Gallen and Basel to Chiasso"
-+# (Google translation). For now, model this transition as occurring on
-+# 1853-07-16, though it probably occurred at some other date in Zurich, and
-+# legal civil time probably changed at still some other transition date.
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
- Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12
-- 0:29:44 - BMT 1894 Jun # Bern Mean Time
-+Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
-+ 0:29:46 - BMT 1894 Jun # Bern Mean Time
- 1:00 Swiss CE%sT 1981
- 1:00 EU CE%sT
-
-@@ -2721,14 +2768,18 @@
- # According to the articles linked below, Turkey will change into summer
- # time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27.
- # This change is due to a nationwide exam on 27th.
--#
--# <a href="http://www.worldbulletin.net/?aType=haber&ArticleID=70872">
- # http://www.worldbulletin.net/?aType=haber&ArticleID=70872
--# </a>
- # Turkish:
--# <a href="http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373">
- # http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373
--# </a>
-+
-+# From Faruk Pasin (2014-02-14):
-+# The DST for Turkey has been changed for this year because of the
-+# Turkish Local election....
-+# http://www.sabah.com.tr/Ekonomi/2014/02/12/yaz-saatinde-onemli-degisiklik
-+# ... so Turkey will move clocks forward one hour on March 31 at 3:00 a.m.
-+# From Paul Eggert (2014-02-17):
-+# Here is an English-language source:
-+# http://www.worldbulletin.net/turkey/129016/turkey-switches-to-daylight-saving-time-march-31
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Turkey 1916 only - May 1 0:00 1:00 S
-@@ -2797,6 +2848,8 @@
- 2:00 Turkey EE%sT 2007
- 2:00 EU EE%sT 2011 Mar 27 1:00u
- 2:00 - EET 2011 Mar 28 1:00u
-+ 2:00 EU EE%sT 2014 Mar 30 1:00u
-+ 2:00 - EET 2014 Mar 31 1:00u
- 2:00 EU EE%sT
- Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
-
-@@ -2818,19 +2871,13 @@
- # approval from 266 deputies.
- #
- # Ukraine abolishes transter back to the winter time (in Russian)
--# <a href="http://news.mail.ru/politics/6861560/">
- # http://news.mail.ru/politics/6861560/
--# </a>
- #
- # The Ukrainians will no longer change the clock (in Russian)
--# <a href="http://www.segodnya.ua/news/14290482.html">
- # http://www.segodnya.ua/news/14290482.html
--# </a>
- #
- # Deputies cancelled the winter time (in Russian)
--# <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
- # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
--# </a>
- #
- # From Philip Pizzey (2011-10-18):
- # Today my Ukrainian colleagues have informed me that the
-@@ -2841,18 +2888,39 @@
- # As far as I understand, the recent change to the Ukrainian time zone
- # (Europe/Kiev) to introduce permanent daylight saving time (similar
- # to Russia) was reverted today:
--#
--# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">
- # http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
--# </a>
- #
- # Also reported by Alexander Bokovoy (2011-10-18) who also noted:
- # The law documents themselves are at
--#
--# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">
- # http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
--# </a>
-
-+# From Vladimir in Moscow via Alois Treindl re Kiev time 1991/2 (2014-02-28):
-+# First in Ukraine they changed Time zone from UTC+3 to UTC+2 with DST:
-+# 03 25 1990 02:00 -03.00 1 Time Zone 3 with DST
-+# 07 01 1990 02:00 -02.00 1 Time Zone 2 with DST
-+# * Ukrainian Government's Resolution of 18.06.1990, No. 134.
-+# http://search.ligazakon.ua/l_doc2.nsf/link1/T001500.html
-+#
-+# They did not end DST in September, 1990 (according to the law,
-+# "summer time" was still in action):
-+# 09 30 1990 03:00 -02.00 1 Time Zone 2 with DST
-+# * Ukrainian Government's Resolution of 21.09.1990, No. 272.
-+# http://search.ligazakon.ua/l_doc2.nsf/link1/KP900272.html
-+#
-+# Again no change in March, 1991 ("summer time" in action):
-+# 03 31 1991 02:00 -02.00 1 Time Zone 2 with DST
-+#
-+# DST ended in September 1991 ("summer time" ended):
-+# 09 29 1991 03:00 -02.00 0 Time Zone 2, no DST
-+# * Ukrainian Government's Resolution of 25.09.1991, No. 225.
-+# http://www.uazakon.com/documents/date_21/pg_iwgdoc.htm
-+# This is an answer.
-+#
-+# Since 1992 they had normal DST procedure:
-+# 03 29 1992 02:00 -02.00 1 DST started
-+# 09 27 1992 03:00 -02.00 0 DST ended
-+# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
-+# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- # Most of Ukraine since 1970 has been like Kiev.
-@@ -2863,9 +2931,8 @@
- 2:00 - EET 1930 Jun 21
- 3:00 - MSK 1941 Sep 20
- 1:00 C-Eur CE%sT 1943 Nov 6
-- 3:00 Russia MSK/MSD 1990
-- 3:00 - MSK 1990 Jul 1 2:00
-- 2:00 - EET 1992
-+ 3:00 Russia MSK/MSD 1990 Jul 1 2:00
-+ 2:00 1:00 EEST 1991 Sep 29 3:00
- 2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
- # Ruthenia used CET 1990/1991.
-@@ -2907,7 +2974,7 @@
- # From Paul Eggert (2006-03-22):
- # The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
- # from Kiev to Moscow time sometime after the January 1994 elections.
--# Shanks (1999) says ``date of change uncertain'', but implies that it happened
-+# Shanks (1999) says "date of change uncertain", but implies that it happened
- # sometime between the 1994 DST switches. Shanks & Pottenger simply say
- # 1994-09-25 03:00, but that can't be right. For now, guess it
- # changed in May.
-@@ -2919,7 +2986,18 @@
- # Assume it happened in March by not changing the clocks.
- 3:00 Russia MSK/MSD 1997
- 3:00 - MSK 1997 Mar lastSun 1:00u
-- 2:00 EU EE%sT
-+# From Alexander Krivenyshev (2014-03-17):
-+# time change at 2:00 (2am) on March 30, 2014
-+# http://vz.ru/news/2014/3/17/677464.html
-+# From Paul Eggert (2014-03-30):
-+# Simferopol and Sevastopol reportedly changed their central town clocks
-+# late the previous day, but this appears to have been ceremonial
-+# and the discrepancies are small enough to not worry about.
-+ 2:00 EU EE%sT 2014 Mar 30 2:00
-+ 4:00 - MSK
-+
-+# Vatican City
-+# See Europe/Rome.
-
- ###############################################################################
-
---- ./jdk/make/sun/javazic/tzdata/factory 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/javazic/tzdata/factory 2014-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
---- ./jdk/make/sun/javazic/tzdata/iso3166.tab 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/javazic/tzdata/iso3166.tab 2014-07-15 21:49:28.000000000 -0700
-@@ -1,30 +1,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
- # 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.
- #
--# <pre>
-+# ISO 3166 alpha-2 country codes
-+#
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
--# ISO 3166 alpha-2 country codes
- #
- # From Paul Eggert (2013-05-27):
- #
-@@ -32,7 +32,7 @@
- # 1. ISO 3166-1 alpha-2 country code, current as of
- # ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166
- # http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
--# 2. The usual English name for the country,
-+# 2. The usual English name for the coded region,
- # chosen so that alphabetic sorting of subsets produces helpful lists.
- # This is not the same as the English name in the ISO 3166 tables.
- #
-@@ -46,7 +46,7 @@
- # to take or endorse any position on legal or territorial claims.
- #
- #country-
--#code country name
-+#code name of country, territory, area, or subdivision
- AD Andorra
- AE United Arab Emirates
- AF Afghanistan
-@@ -76,7 +76,7 @@
- BM Bermuda
- BN Brunei
- BO Bolivia
--BQ Bonaire, St Eustatius & Saba
-+BQ Caribbean Netherlands
- BR Brazil
- 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-07-15 21:49:28.000000000 -0700
-@@ -1,37 +1,43 @@
- #
- # 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.
- #
--# <pre>
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
- # Allowance for leapseconds added to each timezone file.
-
-+# This file is in the public domain.
-+
-+# This file is generated automatically from the data in the public-domain
-+# leap-seconds.list file available from most NIST time servers.
-+# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
-+# you should be able to pick up leap-seconds.list from a secondary NIST server.
-+# For more about leap-seconds.list, please see
-+# The NTP Timescale and Leap Seconds
-+# <http://www.eecis.udel.edu/~mills/leap.html>.
-+
- # The International Earth Rotation Service periodically uses leap seconds
- # to keep UTC to within 0.9 s of UT1
- # (which measures the true angular orientation of the earth in space); see
- # Terry J Quinn, The BIPM and the accurate measure of time,
--# Proc IEEE 79, 7 (July 1991), 894-905.
-+# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
- # There were no leap seconds before 1972, because the official mechanism
- # accounting for the discrepancy between atomic time and the earth's rotation
- # did not exist until the early 1970s.
-@@ -42,8 +48,8 @@
- # or
- # Leap YEAR MON DAY 23:59:59 - R/S
-
--# If the leapsecond is Rolling (R) the given time is local time
--# If the leapsecond is Stationary (S) the given time is UTC
-+# If the leapsecond is Rolling (R) the given time is local time.
-+# If the leapsecond is Stationary (S) the given time is UTC.
-
- # Leap YEAR MONTH DAY HH:MM:SS CORR R/S
- Leap 1972 Jun 30 23:59:60 + S
-@@ -71,53 +77,3 @@
- Leap 2005 Dec 31 23:59:60 + S
- Leap 2008 Dec 31 23:59:60 + S
- Leap 2012 Jun 30 23:59:60 + S
--
--# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
--#
--# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
--#
--#
--# SERVICE DE LA ROTATION TERRESTRE
--# OBSERVATOIRE DE PARIS
--# 61, Av. de l'Observatoire 75014 PARIS (France)
--# Tel. : 33 (0) 1 40 51 22 26
--# FAX : 33 (0) 1 40 51 22 91
--# e-mail : (E-Mail Removed)
--# http://hpiers.obspm.fr/eop-pc
--#
--# Paris, 5 January 2012
--#
--#
--# Bulletin C 43
--#
--# To authorities responsible
--# for the measurement and
--# distribution of time
--#
--#
--# UTC TIME STEP
--# on the 1st of July 2012
--#
--#
--# A positive leap second will be introduced at the end of June 2012.
--# The sequence of dates of the UTC second markers will be:
--#
--# 2012 June 30, 23h 59m 59s
--# 2012 June 30, 23h 59m 60s
--# 2012 July 1, 0h 0m 0s
--#
--# The difference between UTC and the International Atomic Time TAI is:
--#
--# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s
--# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s
--#
--# Leap seconds can be introduced in UTC at the end of the months of December
--# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
--# six months, either to announce a time step in UTC or to confirm that there
--# will be no time step at the next possible date.
--#
--#
--# Daniel GAMBIS
--# Head
--# 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-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
-@@ -43,7 +43,7 @@
- # Howse writes (pp 121-125) that time zones were invented by
- # Professor Charles Ferdinand Dowd (1825-1904),
- # Principal of Temple Grove Ladies' Seminary (Saratoga Springs, NY).
--# His pamphlet ``A System of National Time for Railroads'' (1870)
-+# His pamphlet "A System of National Time for Railroads" (1870)
- # was the result of his proposals at the Convention of Railroad Trunk Lines
- # in New York City (1869-10). His 1870 proposal was based on Washington, DC,
- # but in 1872-05 he moved the proposed origin to Greenwich.
-@@ -63,8 +63,8 @@
-
- # From Paul Eggert (2001-03-06):
- # Daylight Saving Time was first suggested as a joke by Benjamin Franklin
--# in his whimsical essay ``An Economical Project for Diminishing the Cost
--# of Light'' published in the Journal de Paris (1784-04-26).
-+# in his whimsical essay "An Economical Project for Diminishing the Cost
-+# of Light" published in the Journal de Paris (1784-04-26).
- # Not everyone is happy with the results:
- #
- # I don't really care how time is reckoned so long as there is some
-@@ -190,8 +190,8 @@
- # of the Aleutian islands. No DST.
-
- # From Paul Eggert (1995-12-19):
--# The tables below use `NST', not `NT', for Nome Standard Time.
--# I invented `CAWT' for Central Alaska War Time.
-+# The tables below use 'NST', not 'NT', for Nome Standard Time.
-+# I invented 'CAWT' for Central Alaska War Time.
-
- # From U. S. Naval Observatory (1989-01-19):
- # USA EASTERN 5 H BEHIND UTC NEW YORK, WASHINGTON
-@@ -260,9 +260,9 @@
- # H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS.
- # (a) Amendment- Section 3(a) of the Uniform Time Act of 1966 (15
- # U.S.C. 260a(a)) is amended--
--# (1) by striking `first Sunday of April' and inserting `second
-+# (1) by striking 'first Sunday of April' and inserting 'second
- # Sunday of March'; and
--# (2) by striking `last Sunday of October' and inserting `first
-+# (2) by striking 'last Sunday of October' and inserting 'first
- # Sunday of November'.
- # (b) Effective Date- Subsection (a) shall take effect 1 year after the
- # date of enactment of this Act or March 1, 2007, whichever is later.
-@@ -414,9 +414,10 @@
- # US Pacific time, represented by Los Angeles
- #
- # California, northern Idaho (Benewah, Bonner, Boundary, Clearwater,
--# Idaho, Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties,
--# and the northern three-quarters of Idaho county),
--# most of Nevada, most of Oregon, and Washington
-+# Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties, Idaho county
-+# north of the Salmon River, and the towns of Burgdorf and Warren),
-+# Nevada (except West Wendover), Oregon (except the northern 3/4 of
-+# Malheur county), and Washington
- #
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
- Rule CA 1948 only - Mar 14 2:00 1:00 D
-@@ -623,6 +624,8 @@
- -10:30 - HST 1947 Jun 8 2:00 #Schmitt&Cox+2
- -10:00 - HST
-
-+Link Pacific/Honolulu Pacific/Johnston
-+
- # Now we turn to US areas that have diverged from the consensus since 1970.
-
- # Arizona mostly uses MST.
-@@ -659,8 +662,9 @@
- # Navajo Nation participates in the Daylight Saving Time policy, due to its
- # large size and location in three states." (The "only" means that other
- # tribal nations don't use DST.)
--
--Link America/Denver America/Shiprock
-+#
-+# From Paul Eggert (2013-08-26):
-+# See America/Denver for a zone appropriate for the Navajo Nation.
-
- # Southern Idaho (Ada, Adams, Bannock, Bear Lake, Bingham, Blaine,
- # Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark,
-@@ -700,13 +704,13 @@
- # and Switzerland counties have their own time zone histories as noted below.
- #
- # Shanks partitioned Indiana into 345 regions, each with its own time history,
--# and wrote ``Even newspaper reports present contradictory information.''
-+# and wrote "Even newspaper reports present contradictory information."
- # Those Hoosiers! Such a flighty and changeable people!
- # Fortunately, most of the complexity occurred before our cutoff date of 1970.
- #
- # Other than Indianapolis, the Indiana place names are so nondescript
--# that they would be ambiguous if we left them at the `America' level.
--# So we reluctantly put them all in a subdirectory `America/Indiana'.
-+# that they would be ambiguous if we left them at the 'America' level.
-+# So we reluctantly put them all in a subdirectory 'America/Indiana'.
-
- # From Paul Eggert (2005-08-16):
- # http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
-@@ -970,8 +974,8 @@
- # This story is too entertaining to be false, so go with Howse over Shanks.
- #
- # From Paul Eggert (2001-03-06):
--# Garland (1927) writes ``Cleveland and Detroit advanced their clocks
--# one hour in 1914.'' This change is not in Shanks. We have no more
-+# Garland (1927) writes "Cleveland and Detroit advanced their clocks
-+# one hour in 1914." This change is not in Shanks. We have no more
- # info, so omit this for now.
- #
- # Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
-@@ -1011,7 +1015,7 @@
- # occupied 1857/1900 by the Navassa Phosphate Co
- # US lighthouse 1917/1996-09
- # currently uninhabited
--# see Mark Fineman, ``An Isle Rich in Guano and Discord'',
-+# see Mark Fineman, "An Isle Rich in Guano and Discord",
- # _Los Angeles Times_ (1998-11-10), A1, A10; it cites
- # Jimmy Skaggs, _The Great Guano Rush_ (1994).
-
-@@ -1045,7 +1049,7 @@
- # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
- # <http://www.jstor.org/stable/1774359>.
- #
--# See the `europe' file for Greenland.
-+# See the 'europe' file for Greenland.
-
- # Canada
-
-@@ -1246,7 +1250,7 @@
-
- # most of east Labrador
-
--# The name `Happy Valley-Goose Bay' is too long; use `Goose Bay'.
-+# The name 'Happy Valley-Goose Bay' is too long; use 'Goose Bay'.
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone America/Goose_Bay -4:01:40 - LMT 1884 # Happy Valley-Goose Bay
- -3:30:52 - NST 1918
-@@ -1363,25 +1367,27 @@
-
- # Quebec
-
--# From Paul Eggert (2006-07-09):
--# Shanks & Pottenger write that since 1970 most of Quebec has been
--# like Montreal.
-+# From Paul Eggert (2013-08-30):
-+# Since 1970 most of Quebec has been like Toronto.
-+# However, because earlier versions of the tz database mistakenly relied on data
-+# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970,
-+# a separate entry was created for most of Quebec. We're loath to lose
-+# its pre-1970 info, even though the tz database is normally limited to
-+# zones that differ after 1970, so keep this otherwise out-of-scope entry.
-
--# From Paul Eggert (2006-06-27):
- # Matthews and Vincent (1998) also write that Quebec east of the -63
- # meridian is supposed to observe AST, but residents as far east as
- # Natashquan use EST/EDT, and residents east of Natashquan use AST.
--# In "Official time in Quebec" the Quebec department of justice writes in
--# http://www.justice.gouv.qc.ca/english/publications/generale/temps-regl-1-a.htm
--# that "The residents of the Municipality of the
--# Cote-Nord-du-Golfe-Saint-Laurent and the municipalities of Saint-Augustin,
--# Bonne-Esperance and Blanc-Sablon apply the Official Time Act as it is
--# written and use Atlantic standard time all year round. The same applies to
--# the residents of the Native facilities along the lower North Shore."
--# <http://www.assnat.qc.ca/eng/37legislature2/Projets-loi/Publics/06-a002.htm>
-+# The Quebec department of justice writes in
-+# "The situation in Minganie and Basse-Cote-Nord"
-+# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
-+# that the coastal strip from just east of Natashquan to Blanc-Sablon
-+# observes Atlantic standard time all year round.
-+# http://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
- # says this common practice was codified into law as of 2007.
- # For lack of better info, guess this practice began around 1970, contra to
- # Shanks & Pottenger who have this region observing AST/ADT.
-+# for post-1970 data America/Puerto_Rico.
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Mont 1917 only - Mar 25 2:00 1:00 D
-@@ -1425,7 +1431,6 @@
- -5:00 Mont E%sT 1974
- -5:00 Canada E%sT
-
--
- # Ontario
-
- # From Paul Eggert (2006-07-09):
-@@ -1644,7 +1649,7 @@
- -6:00 - CST 1910
- -5:00 - EST 1942
- -5:00 Canada E%sT 1970
-- -5:00 Mont E%sT 1973
-+ -5:00 Toronto E%sT 1973
- -5:00 - EST 1974
- -5:00 Canada E%sT
- Zone America/Nipigon -5:53:04 - LMT 1895
-@@ -2231,7 +2236,7 @@
- # From Paul Eggert (1996-06-12):
- # For an English translation of the decree, see
- # <a href="http://mexico-travel.com/extra/timezone_eng.html">
--# ``Diario Oficial: Time Zone Changeover'' (1996-01-04).
-+# "Diario Oficial: Time Zone Changeover" (1996-01-04).
- # </a>
-
- # From Rives McDow (1998-10-08):
-@@ -2568,9 +2573,7 @@
- ###############################################################################
-
- # Anguilla
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2
-- -4:00 - AST
-+# See 'southamerica'.
-
- # Antigua and Barbuda
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
-@@ -2639,13 +2642,13 @@
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
- -4:00 - AST 1974 Apr 28 2:00
-- -4:00 Bahamas A%sT 1976
-+ -4:00 Canada A%sT 1976
- -4:00 US A%sT
-
- # Cayman Is
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
-- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
-+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
- -5:00 - EST
-
- # Costa Rica
-@@ -2660,7 +2663,7 @@
- # go with Shanks & Pottenger.
- Rule CR 1991 only - Jul 1 0:00 0 S
- Rule CR 1992 only - Mar 15 0:00 0 S
--# There are too many San Joses elsewhere, so we'll use `Costa Rica'.
-+# There are too many San Joses elsewhere, so we'll use 'Costa Rica'.
- # 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
-@@ -2686,6 +2689,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 +2883,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 +2901,7 @@
- -5:00 Cuba C%sT
-
- # Dominica
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/Dominica -4:05:36 - LMT 1911 Jul 1 0:01 # Roseau
-- -4:00 - AST
-+# See 'southamerica'.
-
- # Dominican Republic
-
-@@ -2943,18 +2950,10 @@
- -6:00 Salv C%sT
-
- # Grenada
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's
-- -4:00 - AST
--
- # Guadeloupe
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre
-- -4:00 - AST
- # St Barthelemy
--Link America/Guadeloupe America/St_Barthelemy
- # St Martin (French part)
--Link America/Guadeloupe America/Marigot
-+# See 'southamerica'.
-
- # Guatemala
- #
-@@ -3097,17 +3096,12 @@
- # Great Swan I ceded by US to Honduras in 1972
-
- # Jamaica
--
--# From Bob Devine (1988-01-28):
--# Follows US rules.
--
--# From U. S. Naval Observatory (1989-01-19):
--# JAMAICA 5 H BEHIND UTC
--
--# From Shanks & Pottenger:
-+# Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
-+# unspecified official document, and says "This time is used throughout the
-+# island". Go with Milne. Round to the nearest second as required by zic.
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/Jamaica -5:07:12 - LMT 1890 # Kingston
-- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
-+Zone America/Jamaica -5:07:11 - LMT 1890 # Kingston
-+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
- -5:00 - EST 1974 Apr 28 2:00
- -5:00 US E%sT 1984
- -5:00 - EST
-@@ -3121,12 +3115,7 @@
- -4:00 - AST
-
- # Montserrat
--# From Paul Eggert (2006-03-22):
--# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
--# world.gazetteer.com says Cork Hill is the most populous location now.
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Cork Hill
-- -4:00 - AST
-+# See 'southamerica'.
-
- # Nicaragua
- #
-@@ -3200,7 +3189,7 @@
- -5:00 - EST
-
- # Puerto Rico
--# There are too many San Juans elsewhere, so we'll use `Puerto_Rico'.
-+# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
- # 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 +3197,11 @@
- -4:00 - AST
-
- # St Kitts-Nevis
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/St_Kitts -4:10:52 - LMT 1912 Mar 2 # Basseterre
-- -4:00 - AST
--
- # St Lucia
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/St_Lucia -4:04:00 - LMT 1890 # Castries
-- -4:04:00 - CMT 1912 # Castries Mean Time
-- -4:00 - AST
-+# See 'southamerica'.
-
- # St Pierre and Miquelon
--# There are too many St Pierres elsewhere, so we'll use `Miquelon'.
-+# There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
- # 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 +3209,7 @@
- -3:00 Canada PM%sT
-
- # St Vincent and the Grenadines
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/St_Vincent -4:04:56 - LMT 1890 # Kingstown
-- -4:04:56 - KMT 1912 # Kingstown Mean Time
-- -4:00 - AST
-+# See 'southamerica'.
-
- # Turks and Caicos
- #
-@@ -3260,15 +3239,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
-- -5:07:12 - KMT 1912 Feb # Kingston Mean Time
-+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time
- -5:00 TC E%sT
-
- # British Virgin Is
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town
-- -4:00 - AST
--
- # Virgin Is
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/St_Thomas -4:19:44 - LMT 1911 Jul # Charlotte Amalie
-- -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-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
---- ./jdk/make/sun/javazic/tzdata/solar87 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/javazic/tzdata/solar87 2014-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
---- ./jdk/make/sun/javazic/tzdata/solar88 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/javazic/tzdata/solar88 2014-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
---- ./jdk/make/sun/javazic/tzdata/solar89 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/javazic/tzdata/solar89 2014-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
---- ./jdk/make/sun/javazic/tzdata/southamerica 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/javazic/tzdata/southamerica 2014-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
-@@ -474,6 +474,17 @@
- # rules...San Luis is still using "Western ARgentina Time" and it got
- # stuck on Summer daylight savings time even though the summer is over.
-
-+# From Paul Eggert (2013-09-05):
-+# Perhaps San Luis operates on the legal fiction that it is at UTC-4
-+# with perpetual summer time, but ordinary usage typically seems to
-+# just say it's at UTC-3; see, for example,
-+# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
-+# We've documented similar situations as being plain changes to
-+# standard time, so let's do that here too. This does not change UTC
-+# offsets, only tm_isdst and the time zone abbreviations. One minor
-+# plus is that this silences a zic complaint that there's no POSIX TZ
-+# setting for time stamps past 2038.
-+
- # From Paul Eggert (2013-02-21):
- # Milne says Cordoba time was -4:16:48.2. Round to the nearest second.
-
-@@ -611,7 +622,7 @@
- # San Luis (SL)
-
- Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 -
--Rule SanLuis 2007 2009 - Oct Sun>=8 0:00 1:00 S
-+Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 S
-
- Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
- -4:16:48 - CMT 1920 May
-@@ -627,7 +638,8 @@
- -3:00 - ART 2004 May 31
- -4:00 - WART 2004 Jul 25
- -3:00 Arg AR%sT 2008 Jan 21
-- -4:00 SanLuis WAR%sT
-+ -4:00 SanLuis WAR%sT 2009 Oct 11
-+ -3:00 - ART
- #
- # Santa Cruz (SC)
- Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
-@@ -654,10 +666,7 @@
- -3:00 - ART
-
- # Aruba
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad
-- -4:30 - ANT 1965 # Netherlands Antilles Time
-- -4:00 - AST
-+Link America/Curacao America/Aruba
-
- # Bolivia
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
-@@ -859,6 +868,21 @@
- # Tocantins state will have DST.
- # http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
-
-+# From Steffen Thorsen (2013-09-20):
-+# Tocantins in Brazil is very likely not to observe DST from October....
-+# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
-+# We will keep this article updated when this is confirmed:
-+# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
-+
-+# From Steffen Thorsen (2013-10-17):
-+# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
-+# Senator Jorge Viana announced that Acre will change time zone on November 10.
-+# He did not specify the time of the change, nor if western parts of Amazonas
-+# will change as well.
-+#
-+# From Paul Eggert (2013-10-17):
-+# For now, assume western Amazonas will change as well.
-+
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
- # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
-@@ -1078,7 +1102,8 @@
- -3:00 - BRT 1995 Sep 14
- -3:00 Brazil BR%sT 2003 Sep 24
- -3:00 - BRT 2012 Oct 21
-- -3:00 Brazil BR%sT
-+ -3:00 Brazil BR%sT 2013 Sep
-+ -3:00 - BRT
- #
- # Alagoas (AL), Sergipe (SE)
- Zone America/Maceio -2:22:52 - LMT 1914
-@@ -1146,13 +1171,15 @@
- -5:00 - ACT 1993 Sep 28
- -5:00 Brazil AC%sT 1994 Sep 22
- -5:00 - ACT 2008 Jun 24 00:00
-- -4:00 - AMT
-+ -4:00 - AMT 2013 Nov 10
-+ -5:00 - ACT
- #
- # Acre (AC)
- Zone America/Rio_Branco -4:31:12 - LMT 1914
- -5:00 Brazil AC%sT 1988 Sep 12
- -5:00 - ACT 2008 Jun 24 00:00
-- -4:00 - AMT
-+ -4:00 - AMT 2013 Nov 10
-+ -5:00 - ACT
-
- # Chile
-
-@@ -1271,6 +1298,13 @@
- # start date is 2013-09-08 00:00....
- # http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm
-
-+# From Jose Miguel Garrido (2014-02-19):
-+# Today appeared in the Diario Oficial a decree amending the time change
-+# dates to 2014.
-+# DST End: last Saturday of April 2014 (Sun 27 Apr 2014 03:00 UTC)
-+# DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
-+# http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
-+
- # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
- # 'antarctica' file.
-
-@@ -1373,12 +1407,12 @@
- -4:00 - AST
-
- # From Arthur David Olson (2011-06-15):
--# At least for now, use links for places with new iso3166 codes.
-+# use links for places with new iso3166 codes.
- # The name "Lower Prince's Quarter" is both longer than fourteen charaters
- # and contains an apostrophe; use "Lower_Princes" below.
-
--Link America/Curacao America/Lower_Princes # Sint Maarten
--Link America/Curacao America/Kralendijk # Bonaire, Sint Estatius and Saba
-+Link America/Curacao America/Lower_Princes # Sint Maarten
-+Link America/Curacao America/Kralendijk # Caribbean Netherlands
-
- # Ecuador
- #
-@@ -1519,10 +1553,16 @@
- -4:00 - GYT
-
- # Paraguay
-+#
- # From Paul Eggert (2006-03-22):
- # Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
- # and autumn transitions are from 00:00 -> 23:00. Go with pre-1999
- # editions of Shanks, and with the IATA, who say transitions occur at 00:00.
-+#
-+# From Waldemar Villamayor-Venialbo (2013-09-20):
-+# No time of the day is established for the adjustment, so people normally
-+# adjust their clocks at 0 hour of the given dates.
-+#
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Para 1975 1988 - Oct 1 0:00 1:00 S
- Rule Para 1975 1978 - Mar 1 0:00 0 -
-@@ -1598,6 +1638,9 @@
- # From Carlos Raul Perasso (2013-03-15):
- # The change in Paraguay is now final. Decree number 10780
- # http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf
-+# From Carlos Raul Perasso (2014-02-28):
-+# Decree 1264 can be found at:
-+# http://www.presidencia.gov.py/archivos/documentos/DECRETO1264_ey9r8zai.pdf
- Rule Para 2013 max - Mar Sun>=22 0:00 0 -
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
-@@ -1656,6 +1699,20 @@
- Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
- -4:00 - AST
-
-+# These all agree with Trinidad and Tobago since 1970.
-+Link America/Port_of_Spain America/Anguilla
-+Link America/Port_of_Spain America/Dominica
-+Link America/Port_of_Spain America/Grenada
-+Link America/Port_of_Spain America/Guadeloupe
-+Link America/Port_of_Spain America/Marigot # St Martin (French part)
-+Link America/Port_of_Spain America/Montserrat
-+Link America/Port_of_Spain America/St_Barthelemy
-+Link America/Port_of_Spain America/St_Kitts # St Kitts & Nevis
-+Link America/Port_of_Spain America/St_Lucia
-+Link America/Port_of_Spain America/St_Thomas # Virgin Islands (US)
-+Link America/Port_of_Spain America/St_Vincent
-+Link America/Port_of_Spain America/Tortola # Virgin Islands (UK)
-+
- # Uruguay
- # From Paul Eggert (1993-11-18):
- # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
-@@ -1673,7 +1730,7 @@
- # Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
- Rule Uruguay 1937 1940 - Oct lastSun 0:00 0:30 HS
- # Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
--# and 1943 Apr 13 ``to present time''; go with Shanks & Pottenger.
-+# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
- Rule Uruguay 1941 only - Aug 1 0:00 0:30 HS
- 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-07-15 21:49:28.000000000 -0700
-@@ -1,22 +1,22 @@
- #
- # 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.
---- ./jdk/make/sun/javazic/tzdata/zone.tab 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/javazic/tzdata/zone.tab 2014-07-15 21:49:28.000000000 -0700
-@@ -1,53 +1,55 @@
- #
- # 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.
- #
--# <pre>
-+# TZ zone descriptions
-+#
- # This file is in the public domain, so clarified as of
- # 2009-05-17 by Arthur David Olson.
- #
--# TZ zone descriptions
-+# From Paul Eggert (2013-08-14):
- #
--# From Paul Eggert (2013-05-27):
-+# This file contains a table where each row stands for an area that is
-+# the intersection of a region identified by a country code and of a
-+# zone where civil clocks have agreed since 1970. The columns of the
-+# table are as follows:
- #
--# This file contains a table with the following columns:
--# 1. ISO 3166 2-character country code. See the file `iso3166.tab'.
--# This identifies a country that overlaps the zone. The country may
--# overlap other zones and the zone may overlap other countries.
--# 2. Latitude and longitude of the zone's principal location
-+# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'.
-+# 2. Latitude and longitude of the area's principal location
- # in ISO 6709 sign-degrees-minutes-seconds format,
- # either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
- # first latitude (+ is north), then longitude (+ is east).
--# This location need not lie within the column-1 country.
- # 3. Zone name used in value of TZ environment variable.
- # Please see the 'Theory' file for how zone names are chosen.
-+# If multiple zones overlap a country, each has a row in the
-+# table, with column 1 being duplicated.
- # 4. Comments; present if and only if the country has multiple rows.
- #
- # Columns are separated by a single tab.
- # The table is sorted first by country, then an order within the country that
- # (1) makes some geographical sense, and
--# (2) puts the most populous zones first, where that does not contradict (1).
-+# (2) puts the most populous areas first, where that does not contradict (1).
- #
--# Lines beginning with `#' are comments.
-+# Lines beginning with '#' are comments.
- #
- # This table is intended as an aid for users, to help them select time
- # zone data appropriate for their practical needs. It is not intended
-@@ -63,8 +65,7 @@
- AL +4120+01950 Europe/Tirane
- AM +4011+04430 Asia/Yerevan
- AO -0848+01314 Africa/Luanda
--AQ -7750+16636 Antarctica/McMurdo McMurdo Station, Ross Island
--AQ -9000+00000 Antarctica/South_Pole Amundsen-Scott Station, South Pole
-+AQ -7750+16636 Antarctica/McMurdo McMurdo, South Pole, Scott (New Zealand time)
- AQ -6734-06808 Antarctica/Rothera Rothera Station, Adelaide Island
- AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island
- AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay
-@@ -73,6 +74,7 @@
- AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
- AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
- AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
-+AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land
- AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
- AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF)
- AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN)
-@@ -144,8 +146,7 @@
- CA +4606-06447 America/Moncton Atlantic Time - New Brunswick
- CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador - most locations
- CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec - Lower North Shore
--CA +4531-07334 America/Montreal Eastern Time - Quebec - most locations
--CA +4339-07923 America/Toronto Eastern Time - Ontario - most locations
-+CA +4339-07923 America/Toronto Eastern Time - Ontario & Quebec - most locations
- CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
- CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario
- CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations
-@@ -256,7 +257,7 @@
- IS +6409-02151 Atlantic/Reykjavik
- IT +4154+01229 Europe/Rome
- JE +4912-00207 Europe/Jersey
--JM +1800-07648 America/Jamaica
-+JM +175805-0764736 America/Jamaica
- JO +3157+03556 Asia/Amman
- JP +353916+1394441 Asia/Tokyo
- KE -0117+03649 Africa/Nairobi
-@@ -366,6 +367,7 @@
- RU +5545+03735 Europe/Moscow Moscow+00 - west Russia
- RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
- RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia
-+RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea
- RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
- RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
- RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
-@@ -421,7 +423,6 @@
- UA +5026+03031 Europe/Kiev most locations
- UA +4837+02218 Europe/Uzhgorod Ruthenia
- UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
--UA +4457+03406 Europe/Simferopol central Crimea
- UG +0019+03225 Africa/Kampala
- UM +1645-16931 Pacific/Johnston Johnston Atoll
- UM +2813-17722 Pacific/Midway Midway Islands
-@@ -445,8 +446,7 @@
- US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County
- US +394421-1045903 America/Denver Mountain Time
- US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
--US +364708-1084111 America/Shiprock Mountain Time - Navajo
--US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona
-+US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
- US +340308-1181434 America/Los_Angeles Pacific Time
- 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-10-28 20:19:52.000000000 -0700
-@@ -99,8 +99,7 @@
- #
- # Other extra flags needed for compiling.
- #
--CPPFLAGS += -I$(OPENWIN_HOME)/include \
-- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/image \
- -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
- -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
-@@ -114,6 +113,7 @@
- -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
-+ -I$(OPENWIN_HOME)/include \
- $(EVENT_MODEL)
-
- #
-@@ -127,7 +127,7 @@
- endif
- endif # PLATFORM
-
--ifeq ($(PLATFORM), linux)
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
- ifndef BUILD_HEADLESS_ONLY
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
- else
---- ./jdk/make/sun/lwawt/FILES_export_macosx.gmk 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/lwawt/FILES_export_macosx.gmk 2014-10-28 20:19:47.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
-@@ -141,7 +141,6 @@
- sun/lwawt/macosx/CMenuBar.java \
- sun/lwawt/macosx/CMenuComponent.java \
- sun/lwawt/macosx/CMenuItem.java \
-- sun/lwawt/macosx/CMouseInfoPeer.java \
- sun/lwawt/macosx/CPlatformView.java \
- sun/lwawt/macosx/CPlatformWindow.java \
- sun/lwawt/macosx/CPlatformComponent.java \
---- ./jdk/make/sun/net/FILES_java.gmk 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/net/FILES_java.gmk 2014-07-15 21:49:28.000000000 -0700
-@@ -24,122 +24,123 @@
- #
-
- FILES_java = \
-- sun/net/InetAddressCachePolicy.java \
-- sun/net/URLCanonicalizer.java \
-- sun/net/NetworkClient.java \
-- sun/net/NetworkServer.java \
-- sun/net/ProgressMonitor.java \
-- sun/net/ProgressSource.java \
-- sun/net/ProgressEvent.java \
-- sun/net/ProgressListener.java \
-- sun/net/ProgressMeteringPolicy.java \
-- sun/net/SocksProxy.java \
-- sun/net/ResourceManager.java \
-- sun/net/TelnetInputStream.java \
-- sun/net/TelnetOutputStream.java \
-- sun/net/TelnetProtocolException.java \
-- sun/net/TransferProtocolClient.java \
-- sun/net/ConnectionResetException.java \
-- sun/net/NetProperties.java \
-- sun/net/NetHooks.java \
-- sun/net/util/IPAddressUtil.java \
-- sun/net/util/URLUtil.java \
-- sun/net/dns/ResolverConfiguration.java \
-- sun/net/dns/ResolverConfigurationImpl.java \
-- sun/net/ftp/FtpClient.java \
-- sun/net/ftp/FtpClientProvider.java \
-- sun/net/ftp/FtpDirEntry.java \
-- sun/net/ftp/FtpReplyCode.java \
-- sun/net/ftp/FtpDirParser.java \
-- sun/net/ftp/FtpLoginException.java \
-- sun/net/ftp/FtpProtocolException.java \
-- sun/net/ftp/impl/FtpClient.java \
-- sun/net/ftp/impl/DefaultFtpClientProvider.java \
-- sun/net/sdp/SdpSupport.java \
-- sun/net/spi/DefaultProxySelector.java \
-- sun/net/spi/nameservice/NameServiceDescriptor.java \
-- sun/net/spi/nameservice/NameService.java \
-- sun/net/smtp/SmtpClient.java \
-- sun/net/smtp/SmtpProtocolException.java \
-- sun/net/www/content/text/Generic.java \
-- sun/net/www/content/text/plain.java \
-- sun/net/www/content/text/PlainTextInputStream.java \
-- sun/net/www/MessageHeader.java \
-- sun/net/www/HeaderParser.java \
-- sun/net/www/MeteredStream.java \
-- sun/net/www/MimeEntry.java \
-- sun/net/www/MimeLauncher.java \
-- sun/net/www/ApplicationLaunchException.java \
-- sun/net/www/MimeTable.java \
-- sun/net/www/URLConnection.java \
-- sun/net/www/ParseUtil.java \
-- sun/net/www/protocol/file/Handler.java \
-- sun/net/www/protocol/file/FileURLConnection.java \
-- sun/net/www/http/HttpClient.java \
-- sun/net/www/http/HttpCapture.java \
-- sun/net/www/http/HttpCaptureInputStream.java \
-- sun/net/www/http/HttpCaptureOutputStream.java \
-- sun/net/www/http/PosterOutputStream.java \
-- sun/net/www/http/ChunkedInputStream.java \
-- sun/net/www/http/ChunkedOutputStream.java \
-- sun/net/www/http/KeepAliveCache.java \
-- sun/net/www/http/KeepAliveStream.java \
-- sun/net/www/http/KeepAliveStreamCleaner.java \
-- sun/net/www/http/Hurryable.java \
-- sun/net/www/protocol/http/Handler.java \
-- sun/net/www/protocol/http/HttpURLConnection.java \
-- sun/net/www/protocol/http/HttpAuthenticator.java \
-- sun/net/www/protocol/http/AuthenticationHeader.java \
-- sun/net/www/protocol/http/AuthenticationInfo.java \
-- sun/net/www/protocol/http/AuthCache.java \
-- sun/net/www/protocol/http/AuthCacheImpl.java \
-- sun/net/www/protocol/http/AuthCacheValue.java \
-- sun/net/www/protocol/http/AuthScheme.java \
-- sun/net/www/protocol/http/BasicAuthentication.java \
-- sun/net/www/protocol/http/DigestAuthentication.java \
-- sun/net/www/protocol/http/NTLMAuthenticationProxy.java \
-- sun/net/www/protocol/http/NegotiateAuthentication.java \
-- sun/net/www/protocol/http/Negotiator.java \
-- sun/net/www/protocol/http/ntlm/NTLMAuthentication.java \
-- sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java \
-- sun/net/www/protocol/http/spnego/NegotiatorImpl.java \
-- sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java \
-- sun/net/www/protocol/http/logging/HttpLogFormatter.java \
-- sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java \
-- sun/net/www/protocol/https/HttpsClient.java \
-- sun/net/www/protocol/https/DefaultHostnameVerifier.java \
-- sun/net/www/protocol/https/HttpsURLConnectionImpl.java \
-- sun/net/www/protocol/https/DelegateHttpsURLConnection.java \
-- sun/net/www/protocol/https/Handler.java \
-- sun/net/www/protocol/jar/Handler.java \
-- sun/net/www/protocol/jar/URLJarFile.java \
-- sun/net/www/protocol/jar/JarFileFactory.java \
-- sun/net/www/protocol/jar/JarURLConnection.java \
-- sun/net/www/protocol/netdoc/Handler.java \
-- sun/net/www/content/image/gif.java \
-- sun/net/www/content/image/jpeg.java \
-- sun/net/www/content/image/x_xbitmap.java \
-- sun/net/www/content/image/x_xpixmap.java \
-- sun/net/www/content/image/png.java \
-- sun/net/www/content/audio/aiff.java \
-- sun/net/www/content/audio/basic.java \
-- sun/net/www/content/audio/wav.java \
-- sun/net/www/content/audio/x_aiff.java \
-- sun/net/www/content/audio/x_wav.java \
-- sun/net/www/protocol/ftp/Handler.java \
-- sun/net/www/protocol/ftp/FtpURLConnection.java \
-- sun/net/www/protocol/gopher/GopherClient.java \
-- sun/net/www/protocol/gopher/Handler.java \
-- sun/net/www/protocol/mailto/Handler.java \
-- sun/net/www/protocol/mailto/MailToURLConnection.java \
-- sun/net/idn/Punycode.java \
-- sun/net/idn/UCharacterEnums.java \
-- sun/net/idn/UCharacterDirection.java \
-- sun/net/idn/StringPrepDataReader.java \
-- sun/net/idn/StringPrep.java
-+ sun/net/InetAddressCachePolicy.java \
-+ sun/net/URLCanonicalizer.java \
-+ sun/net/NetworkClient.java \
-+ sun/net/NetworkServer.java \
-+ sun/net/PortConfig.java \
-+ sun/net/ProgressMonitor.java \
-+ sun/net/ProgressSource.java \
-+ sun/net/ProgressEvent.java \
-+ sun/net/ProgressListener.java \
-+ sun/net/ProgressMeteringPolicy.java \
-+ sun/net/SocksProxy.java \
-+ sun/net/ResourceManager.java \
-+ sun/net/TelnetInputStream.java \
-+ sun/net/TelnetOutputStream.java \
-+ sun/net/TelnetProtocolException.java \
-+ sun/net/TransferProtocolClient.java \
-+ sun/net/ConnectionResetException.java \
-+ sun/net/NetProperties.java \
-+ sun/net/NetHooks.java \
-+ sun/net/util/IPAddressUtil.java \
-+ sun/net/util/URLUtil.java \
-+ sun/net/dns/ResolverConfiguration.java \
-+ sun/net/dns/ResolverConfigurationImpl.java \
-+ sun/net/ftp/FtpClient.java \
-+ sun/net/ftp/FtpClientProvider.java \
-+ sun/net/ftp/FtpDirEntry.java \
-+ sun/net/ftp/FtpReplyCode.java \
-+ sun/net/ftp/FtpDirParser.java \
-+ sun/net/ftp/FtpLoginException.java \
-+ sun/net/ftp/FtpProtocolException.java \
-+ sun/net/ftp/impl/FtpClient.java \
-+ sun/net/ftp/impl/DefaultFtpClientProvider.java \
-+ sun/net/sdp/SdpSupport.java \
-+ sun/net/spi/DefaultProxySelector.java \
-+ sun/net/spi/nameservice/NameServiceDescriptor.java \
-+ sun/net/spi/nameservice/NameService.java \
-+ sun/net/smtp/SmtpClient.java \
-+ sun/net/smtp/SmtpProtocolException.java \
-+ sun/net/www/content/text/Generic.java \
-+ sun/net/www/content/text/plain.java \
-+ sun/net/www/content/text/PlainTextInputStream.java \
-+ sun/net/www/MessageHeader.java \
-+ sun/net/www/HeaderParser.java \
-+ sun/net/www/MeteredStream.java \
-+ sun/net/www/MimeEntry.java \
-+ sun/net/www/MimeLauncher.java \
-+ sun/net/www/ApplicationLaunchException.java \
-+ sun/net/www/MimeTable.java \
-+ sun/net/www/URLConnection.java \
-+ sun/net/www/ParseUtil.java \
-+ sun/net/www/protocol/file/Handler.java \
-+ sun/net/www/protocol/file/FileURLConnection.java \
-+ sun/net/www/http/HttpClient.java \
-+ sun/net/www/http/HttpCapture.java \
-+ sun/net/www/http/HttpCaptureInputStream.java \
-+ sun/net/www/http/HttpCaptureOutputStream.java \
-+ sun/net/www/http/PosterOutputStream.java \
-+ sun/net/www/http/ChunkedInputStream.java \
-+ sun/net/www/http/ChunkedOutputStream.java \
-+ sun/net/www/http/KeepAliveCache.java \
-+ sun/net/www/http/KeepAliveStream.java \
-+ sun/net/www/http/KeepAliveStreamCleaner.java \
-+ sun/net/www/http/Hurryable.java \
-+ sun/net/www/protocol/http/Handler.java \
-+ sun/net/www/protocol/http/HttpURLConnection.java \
-+ sun/net/www/protocol/http/HttpAuthenticator.java \
-+ sun/net/www/protocol/http/AuthenticationHeader.java \
-+ sun/net/www/protocol/http/AuthenticationInfo.java \
-+ sun/net/www/protocol/http/AuthCache.java \
-+ sun/net/www/protocol/http/AuthCacheImpl.java \
-+ sun/net/www/protocol/http/AuthCacheValue.java \
-+ sun/net/www/protocol/http/AuthScheme.java \
-+ sun/net/www/protocol/http/BasicAuthentication.java \
-+ sun/net/www/protocol/http/DigestAuthentication.java \
-+ sun/net/www/protocol/http/NTLMAuthenticationProxy.java \
-+ sun/net/www/protocol/http/NegotiateAuthentication.java \
-+ sun/net/www/protocol/http/Negotiator.java \
-+ sun/net/www/protocol/http/ntlm/NTLMAuthentication.java \
-+ sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java \
-+ sun/net/www/protocol/http/spnego/NegotiatorImpl.java \
-+ sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java \
-+ sun/net/www/protocol/http/logging/HttpLogFormatter.java \
-+ sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java \
-+ sun/net/www/protocol/https/HttpsClient.java \
-+ sun/net/www/protocol/https/DefaultHostnameVerifier.java \
-+ sun/net/www/protocol/https/HttpsURLConnectionImpl.java \
-+ sun/net/www/protocol/https/DelegateHttpsURLConnection.java \
-+ sun/net/www/protocol/https/Handler.java \
-+ sun/net/www/protocol/jar/Handler.java \
-+ sun/net/www/protocol/jar/URLJarFile.java \
-+ sun/net/www/protocol/jar/JarFileFactory.java \
-+ sun/net/www/protocol/jar/JarURLConnection.java \
-+ sun/net/www/protocol/netdoc/Handler.java \
-+ sun/net/www/content/image/gif.java \
-+ sun/net/www/content/image/jpeg.java \
-+ sun/net/www/content/image/x_xbitmap.java \
-+ sun/net/www/content/image/x_xpixmap.java \
-+ sun/net/www/content/image/png.java \
-+ sun/net/www/content/audio/aiff.java \
-+ sun/net/www/content/audio/basic.java \
-+ sun/net/www/content/audio/wav.java \
-+ sun/net/www/content/audio/x_aiff.java \
-+ sun/net/www/content/audio/x_wav.java \
-+ sun/net/www/protocol/ftp/Handler.java \
-+ sun/net/www/protocol/ftp/FtpURLConnection.java \
-+ sun/net/www/protocol/gopher/GopherClient.java \
-+ sun/net/www/protocol/gopher/Handler.java \
-+ sun/net/www/protocol/mailto/Handler.java \
-+ sun/net/www/protocol/mailto/MailToURLConnection.java \
-+ sun/net/idn/Punycode.java \
-+ sun/net/idn/UCharacterEnums.java \
-+ sun/net/idn/UCharacterDirection.java \
-+ sun/net/idn/StringPrepDataReader.java \
-+ sun/net/idn/StringPrep.java
-
- ifeq ($(PLATFORM), windows)
-- FILES_java += sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
-+ FILES_java += sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
- else
- 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 2014-07-15 21:49:28.000000000 -0700
-@@ -329,6 +329,7 @@
- sun/nio/cs/ext/IBM280.java \
- sun/nio/cs/ext/IBM284.java \
- sun/nio/cs/ext/IBM285.java \
-+ sun/nio/cs/ext/IBM290.java \
- sun/nio/cs/ext/IBM297.java \
- sun/nio/cs/ext/IBM420.java \
- sun/nio/cs/ext/IBM424.java \
---- ./jdk/make/sun/nio/cs/Makefile 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/nio/cs/Makefile 2014-07-15 21:49:28.000000000 -0700
-@@ -85,9 +85,6 @@
- #
- # Extra rules to build character converters.
-
--SERVICE_DESCRIPTION = java.nio.charset.spi.CharsetProvider
--SERVICE_DESCRIPTION_PATH = META-INF/services/$(SERVICE_DESCRIPTION)
--
- GENCSDATASRC = $(BUILDDIR)/tools/CharsetMapping
- GENCSSRCDIR = $(BUILDDIR)/tools/src/build/tools/charsetmapping
- GENCSEXT = $(GENSRCDIR)/sun/nio/cs/ext
-@@ -116,10 +113,6 @@
- $(GENCSSRCDIR)/HKSCS.java
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) dbcs
-
--$(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH): \
-- $(SHARE_SRC)/classes/sun/nio/cs/ext/$(SERVICE_DESCRIPTION_PATH)
-- $(install-file)
--
- # no compression unless requested
- ifndef COMPRESS_JARS
- CREATE_JAR_OPTS_NOMANIFEST = cf0
-@@ -127,10 +120,9 @@
- CREATE_JAR_OPTS_NOMANIFEST = cf
- endif
-
--$(CHARSETS_JAR): $(FILES_class) $(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH) $(FILES_DAT)
-+$(CHARSETS_JAR): $(FILES_class) $(FILES_DAT)
- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(CHARSETS_JAR) \
- -C $(CLASSDESTDIR) sun \
-- -C $(CLASSDESTDIR) $(SERVICE_DESCRIPTION_PATH) \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
---- ./jdk/make/sun/rmi/rmi/Makefile 2013-09-06 11:27:40.000000000 -0700
-+++ ./jdk/make/sun/rmi/rmi/Makefile 2014-10-28 20:19:52.000000000 -0700
-@@ -71,6 +71,9 @@
- BUILD_TARGETS += bin
- endif
- endif
-+ifeq ($(PLATFORM), bsd)
-+ BUILD_TARGETS += bin
-+endif
-
- build: $(BUILD_TARGETS)
-
---- ./jdk/make/sun/security/ec/mapfile-vers 2013-09-06 11:27:41.000000000 -0700
-+++ ./jdk/make/sun/security/ec/mapfile-vers 2014-07-15 21:54:44.000000000 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2009, 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
-@@ -28,7 +28,6 @@
- SUNWprivate_1.1 {
- global:
- Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair;
-- Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes;
- Java_sun_security_ec_ECDSASignature_signDigest;
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
---- ./jdk/make/sun/splashscreen/Makefile 2013-09-06 11:27:41.000000000 -0700
-+++ ./jdk/make/sun/splashscreen/Makefile 2014-10-28 20:19:52.000000000 -0700
-@@ -61,6 +61,12 @@
-
- CFLAGS += -DSPLASHSCREEN
-
-+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
-+ifneq ($(SYSTEM_ZLIB),true)
-+ CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-+endif
-+
- ifeq ($(PLATFORM), macosx)
- CFLAGS += -DWITH_MACOSX
-
-@@ -83,15 +89,16 @@
- -framework JavaNativeFoundation
- else ifneq ($(PLATFORM), windows)
- CFLAGS += -DWITH_X11
-- ifeq ($(PLATFORM), macosx))
-- OTHER_LDLIBS += -liconv
-- CPPFLAGS += -I$(OPENWIN_HOME)/include \
-- -I$(OPENWIN_HOME)/include/X11/extensions
-- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -pthread
-- else
-- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
-- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
-+ ifeq ($(PLATFORM), bsd))
-+ ifeq ($(OS_NAME), netbsd)
-+ OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB)
-+ else
-+ CPPFLAGS += -I$(PACKAGE_PATH)/include
-+ OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
-+ endif
- endif
-+ CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
-+ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
- else # PLATFORM
- CFLAGS += -DWITH_WIN32
- OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll
-@@ -121,11 +128,7 @@
- CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen)
- CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp)
- endif
--CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
--CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
--ifneq ($(SYSTEM_ZLIB),true)
-- CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
--else
-+ifeq ($(SYSTEM_ZLIB),true)
- OTHER_CFLAGS += $(ZLIB_CFLAGS)
- OTHER_LDLIBS += $(ZLIB_LIBS)
- endif
---- ./jdk/make/sun/xawt/Makefile 2013-09-06 11:27:41.000000000 -0700
-+++ ./jdk/make/sun/xawt/Makefile 2014-10-28 20:19:52.000000000 -0700
-@@ -52,6 +52,9 @@
- AUTO_JAVA_PRUNE = WrapperGenerator.java
-
- LDFLAGS += -L$(OPENWIN_LIB)
-+ifeq ($(OS_NAME), netbsd)
-+LDFLAGS += -Wl,-R$(OPENWIN_LIB)
-+endif
-
- # For Xrender extension.
- ifeq ($(PLATFORM), solaris)
-@@ -63,6 +66,11 @@
- dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
- endif
-
-+ifeq ($(PLATFORM), bsd)
-+LDFLAGS += -pthread
-+dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-+endif
-+
- ifeq ($(PLATFORM), macosx))
- LDFLAGS += -pthread
- dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-@@ -110,8 +118,6 @@
- dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
- endif
-
--CPPFLAGS += -I$(CUPS_HEADERS_PATH)
--
- CPPFLAGS += -DXAWT -DXAWT_HACK \
- -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
- -I$(PLATFORM_SRC)/native/sun/awt \
-@@ -138,6 +144,8 @@
- -I$(SHARE_SRC)/native/sun/awt \
- -I$(PLATFORM_SRC)/native/sun/awt
-
-+CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-+
- ifeq ($(PLATFORM), linux)
- ifndef CROSS_COMPILE_ARCH
- # Allows for builds on Debian GNU Linux, X11 is in a different place
-@@ -173,6 +181,11 @@
- endif
- endif
-
-+ifeq ($(PLATFORM), bsd)
-+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(OPENWIN_HOME)/include
-+ CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
-+endif
-+
- ifeq ($(PLATFORM), macosx)
- 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 2014-07-15 21:49:28.000000000 -0700
-@@ -0,0 +1,100 @@
-+#
-+# Diff of
-+# b2c: cdctables.zip/Package2.zip/IBM-290.zip/012234B0.TPMAP100
-+# c2b: cdctables.zip/Package2.zip/IBM-290.zip/012234B0.UPMAP100
-+#
-+# fullwidth form
-+0x4B U+FF0E
-+0x4C U+FF1C
-+0x4D U+FF08
-+0x4E U+FF0B
-+0x4F U+FF5C
-+0x50 U+FF06
-+0x5A U+FF01
-+0x5C U+FF0A
-+0x5D U+FF09
-+0x5E U+FF1B
-+0x60 U+FF0D
-+0x61 U+FF0F
-+0x62 U+FF41
-+0x63 U+FF42
-+0x64 U+FF43
-+0x65 U+FF44
-+0x66 U+FF45
-+0x67 U+FF46
-+0x68 U+FF47
-+0x69 U+FF48
-+0x6B U+FF0C
-+0x6C U+FF05
-+0x6D U+FF3F
-+0x6E U+FF1E
-+0x6F U+FF1F
-+0x70 U+FF3B
-+0x71 U+FF49
-+0x72 U+FF4A
-+0x73 U+FF4B
-+0x74 U+FF4C
-+0x75 U+FF4D
-+0x76 U+FF4E
-+0x77 U+FF4F
-+0x78 U+FF50
-+0x79 U+FF40
-+0x7A U+FF1A
-+0x7B U+FF03
-+0x7C U+FF20
-+0x7D U+FF07
-+0x7E U+FF1D
-+0x7F U+FF02
-+0x80 U+FF3D
-+0x8B U+FF51
-+0x9B U+FF52
-+0xA0 U+FF5E
-+0xAB U+FF53
-+0xB0 U+FF3E
-+0xB2 U+FF3C
-+0xB3 U+FF54
-+0xB4 U+FF55
-+0xB5 U+FF56
-+0xB6 U+FF57
-+0xB7 U+FF58
-+0xB8 U+FF59
-+0xB9 U+FF5A
-+0xC0 U+FF5B
-+0xC1 U+FF21
-+0xC2 U+FF22
-+0xC3 U+FF23
-+0xC4 U+FF24
-+0xC5 U+FF25
-+0xC6 U+FF26
-+0xC7 U+FF27
-+0xC8 U+FF28
-+0xC9 U+FF29
-+0xD0 U+FF5D
-+0xD1 U+FF2A
-+0xD2 U+FF2B
-+0xD3 U+FF2C
-+0xD4 U+FF2D
-+0xD5 U+FF2E
-+0xD6 U+FF2F
-+0xD7 U+FF30
-+0xD8 U+FF31
-+0xD9 U+FF32
-+0xE0 U+FF04
-+0xE2 U+FF33
-+0xE3 U+FF34
-+0xE4 U+FF35
-+0xE5 U+FF36
-+0xE6 U+FF37
-+0xE7 U+FF38
-+0xE8 U+FF39
-+0xE9 U+FF3A
-+0xF0 U+FF10
-+0xF1 U+FF11
-+0xF2 U+FF12
-+0xF3 U+FF13
-+0xF4 U+FF14
-+0xF5 U+FF15
-+0xF6 U+FF16
-+0xF7 U+FF17
-+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 2014-07-15 21:49:28.000000000 -0700
-@@ -0,0 +1,232 @@
-+#
-+# b2c mapping for IBM290, generated from
-+# cdctables.zip/Package2.zip/IBM-290.zip/012234B0.TPMAP100
-+#
-+0x00 U+0000
-+0x01 U+0001
-+0x02 U+0002
-+0x03 U+0003
-+0x04 U+009C
-+0x05 U+0009
-+0x06 U+0086
-+0x07 U+007F
-+0x08 U+0097
-+0x09 U+008D
-+0x0A U+008E
-+0x0B U+000B
-+0x0C U+000C
-+0x0D U+000D
-+0x0E U+000E
-+0x0F U+000F
-+0x10 U+0010
-+0x11 U+0011
-+0x12 U+0012
-+0x13 U+0013
-+0x14 U+009D
-+0x15 U+0085
-+0x16 U+0008
-+0x17 U+0087
-+0x18 U+0018
-+0x19 U+0019
-+0x1A U+0092
-+0x1B U+008F
-+0x1C U+001C
-+0x1D U+001D
-+0x1E U+001E
-+0x1F U+001F
-+0x20 U+0080
-+0x21 U+0081
-+0x22 U+0082
-+0x23 U+0083
-+0x24 U+0084
-+0x25 U+000A
-+0x26 U+0017
-+0x27 U+001B
-+0x28 U+0088
-+0x29 U+0089
-+0x2A U+008A
-+0x2B U+008B
-+0x2C U+008C
-+0x2D U+0005
-+0x2E U+0006
-+0x2F U+0007
-+0x30 U+0090
-+0x31 U+0091
-+0x32 U+0016
-+0x33 U+0093
-+0x34 U+0094
-+0x35 U+0095
-+0x36 U+0096
-+0x37 U+0004
-+0x38 U+0098
-+0x39 U+0099
-+0x3A U+009A
-+0x3B U+009B
-+0x3C U+0014
-+0x3D U+0015
-+0x3E U+009E
-+0x3F U+001A
-+0x40 U+0020
-+0x41 U+FF61
-+0x42 U+FF62
-+0x43 U+FF63
-+0x44 U+FF64
-+0x45 U+FF65
-+0x46 U+FF66
-+0x47 U+FF67
-+0x48 U+FF68
-+0x49 U+FF69
-+0x4A U+00A3
-+0x4B U+002E
-+0x4C U+003C
-+0x4D U+0028
-+0x4E U+002B
-+0x4F U+007C
-+0x50 U+0026
-+0x51 U+FF6A
-+0x52 U+FF6B
-+0x53 U+FF6C
-+0x54 U+FF6D
-+0x55 U+FF6E
-+0x56 U+FF6F
-+0x58 U+FF70
-+0x5A U+0021
-+0x5B U+00A5
-+0x5C U+002A
-+0x5D U+0029
-+0x5E U+003B
-+0x5F U+00AC
-+0x60 U+002D
-+0x61 U+002F
-+0x62 U+0061
-+0x63 U+0062
-+0x64 U+0063
-+0x65 U+0064
-+0x66 U+0065
-+0x67 U+0066
-+0x68 U+0067
-+0x69 U+0068
-+0x6B U+002C
-+0x6C U+0025
-+0x6D U+005F
-+0x6E U+003E
-+0x6F U+003F
-+0x70 U+005B
-+0x71 U+0069
-+0x72 U+006A
-+0x73 U+006B
-+0x74 U+006C
-+0x75 U+006D
-+0x76 U+006E
-+0x77 U+006F
-+0x78 U+0070
-+0x79 U+0060
-+0x7A U+003A
-+0x7B U+0023
-+0x7C U+0040
-+0x7D U+0027
-+0x7E U+003D
-+0x7F U+0022
-+0x80 U+005D
-+0x81 U+FF71
-+0x82 U+FF72
-+0x83 U+FF73
-+0x84 U+FF74
-+0x85 U+FF75
-+0x86 U+FF76
-+0x87 U+FF77
-+0x88 U+FF78
-+0x89 U+FF79
-+0x8A U+FF7A
-+0x8B U+0071
-+0x8C U+FF7B
-+0x8D U+FF7C
-+0x8E U+FF7D
-+0x8F U+FF7E
-+0x90 U+FF7F
-+0x91 U+FF80
-+0x92 U+FF81
-+0x93 U+FF82
-+0x94 U+FF83
-+0x95 U+FF84
-+0x96 U+FF85
-+0x97 U+FF86
-+0x98 U+FF87
-+0x99 U+FF88
-+0x9A U+FF89
-+0x9B U+0072
-+0x9D U+FF8A
-+0x9E U+FF8B
-+0x9F U+FF8C
-+0xA0 U+007E
-+0xA1 U+203E
-+0xA2 U+FF8D
-+0xA3 U+FF8E
-+0xA4 U+FF8F
-+0xA5 U+FF90
-+0xA6 U+FF91
-+0xA7 U+FF92
-+0xA8 U+FF93
-+0xA9 U+FF94
-+0xAA U+FF95
-+0xAB U+0073
-+0xAC U+FF96
-+0xAD U+FF97
-+0xAE U+FF98
-+0xAF U+FF99
-+0xB0 U+005E
-+0xB1 U+00A2
-+0xB2 U+005C
-+0xB3 U+0074
-+0xB4 U+0075
-+0xB5 U+0076
-+0xB6 U+0077
-+0xB7 U+0078
-+0xB8 U+0079
-+0xB9 U+007A
-+0xBA U+FF9A
-+0xBB U+FF9B
-+0xBC U+FF9C
-+0xBD U+FF9D
-+0xBE U+FF9E
-+0xBF U+FF9F
-+0xC0 U+007B
-+0xC1 U+0041
-+0xC2 U+0042
-+0xC3 U+0043
-+0xC4 U+0044
-+0xC5 U+0045
-+0xC6 U+0046
-+0xC7 U+0047
-+0xC8 U+0048
-+0xC9 U+0049
-+0xD0 U+007D
-+0xD1 U+004A
-+0xD2 U+004B
-+0xD3 U+004C
-+0xD4 U+004D
-+0xD5 U+004E
-+0xD6 U+004F
-+0xD7 U+0050
-+0xD8 U+0051
-+0xD9 U+0052
-+0xE0 U+0024
-+0xE2 U+0053
-+0xE3 U+0054
-+0xE4 U+0055
-+0xE5 U+0056
-+0xE6 U+0057
-+0xE7 U+0058
-+0xE8 U+0059
-+0xE9 U+005A
-+0xF0 U+0030
-+0xF1 U+0031
-+0xF2 U+0032
-+0xF3 U+0033
-+0xF4 U+0034
-+0xF5 U+0035
-+0xF6 U+0036
-+0xF7 U+0037
-+0xF8 U+0038
-+0xF9 U+0039
-+0xFF U+009F
---- ./jdk/make/tools/CharsetMapping/extsbcs 2013-09-06 11:27:42.000000000 -0700
-+++ ./jdk/make/tools/CharsetMapping/extsbcs 2014-07-15 21:49:28.000000000 -0700
-@@ -28,6 +28,7 @@
- IBM280 IBM280 Cp280 false sun.nio.cs.ext
- IBM284 IBM284 Cp284 false sun.nio.cs.ext
- IBM285 IBM285 Cp285 false sun.nio.cs.ext
-+IBM290 IBM290 Cp290 false sun.nio.cs.ext
- IBM297 IBM297 Cp297 false sun.nio.cs.ext
- 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-10-28 20:19:52.000000000 -0700
-@@ -52,8 +52,15 @@
- else
- ifeq ($(PLATFORM), macosx)
- FT_LD_OPTIONS += -lfreetype -lz
-- else # linux
-- FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
-+ else
-+ ifeq ($(PLATFORM), bsd)
-+ ifeq ($(OS_NAME), netbsd)
-+ FT_LD_OPTIONS += -Wl,-R$(FREETYPE_LIB_PATH)
-+ endif
-+ FT_LD_OPTIONS += -lfreetype -lz
-+ else # linux
-+ FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
-+ endif
- endif
- endif
- endif
---- ./jdk/make/tools/sharing/classlist.bsd 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/make/tools/sharing/classlist.bsd 2014-10-28 20:19:52.000000000 -0700
-@@ -0,0 +1,2327 @@
-+java/lang/Object
-+java/lang/String
-+java/io/Serializable
-+java/lang/Comparable
-+java/lang/CharSequence
-+java/lang/Class
-+java/lang/reflect/GenericDeclaration
-+java/lang/reflect/Type
-+java/lang/reflect/AnnotatedElement
-+java/lang/Cloneable
-+java/lang/ClassLoader
-+java/lang/System
-+java/lang/Throwable
-+java/lang/Error
-+java/lang/ThreadDeath
-+java/lang/Exception
-+java/lang/RuntimeException
-+java/security/ProtectionDomain
-+java/security/AccessControlContext
-+java/lang/ClassNotFoundException
-+java/lang/NoClassDefFoundError
-+java/lang/LinkageError
-+java/lang/ClassCastException
-+java/lang/ArrayStoreException
-+java/lang/VirtualMachineError
-+java/lang/OutOfMemoryError
-+java/lang/StackOverflowError
-+java/lang/IllegalMonitorStateException
-+java/lang/ref/Reference
-+java/lang/ref/SoftReference
-+java/lang/ref/WeakReference
-+java/lang/ref/FinalReference
-+java/lang/ref/PhantomReference
-+java/lang/ref/Finalizer
-+java/lang/Thread
-+java/lang/Runnable
-+java/lang/ThreadGroup
-+java/lang/Thread$UncaughtExceptionHandler
-+java/util/Properties
-+java/util/Hashtable
-+java/util/Map
-+java/util/Dictionary
-+java/lang/reflect/AccessibleObject
-+java/lang/reflect/Field
-+java/lang/reflect/Member
-+java/lang/reflect/Method
-+java/lang/reflect/Constructor
-+sun/reflect/MagicAccessorImpl
-+sun/reflect/MethodAccessorImpl
-+sun/reflect/MethodAccessor
-+sun/reflect/ConstructorAccessorImpl
-+sun/reflect/ConstructorAccessor
-+sun/reflect/DelegatingClassLoader
-+sun/reflect/ConstantPool
-+sun/reflect/UnsafeStaticFieldAccessorImpl
-+sun/reflect/UnsafeFieldAccessorImpl
-+sun/reflect/FieldAccessorImpl
-+sun/reflect/FieldAccessor
-+java/util/Vector
-+java/util/List
-+java/util/Collection
-+java/lang/Iterable
-+java/util/RandomAccess
-+java/util/AbstractList
-+java/util/AbstractCollection
-+java/lang/StringBuffer
-+java/lang/AbstractStringBuilder
-+java/lang/Appendable
-+java/lang/StackTraceElement
-+java/nio/Buffer
-+java/lang/Boolean
-+java/lang/Character
-+java/lang/Float
-+java/lang/Number
-+java/lang/Double
-+java/lang/Byte
-+java/lang/Short
-+java/lang/Integer
-+java/lang/Long
-+java/lang/NullPointerException
-+java/lang/ArithmeticException
-+java/io/ObjectStreamField
-+java/lang/String$CaseInsensitiveComparator
-+java/util/Comparator
-+java/lang/RuntimePermission
-+java/security/BasicPermission
-+java/security/Permission
-+java/security/Guard
-+sun/misc/SoftCache
-+java/util/AbstractMap
-+java/lang/ref/ReferenceQueue
-+java/lang/ref/ReferenceQueue$Null
-+java/lang/ref/ReferenceQueue$Lock
-+java/util/HashMap
-+java/lang/annotation/Annotation
-+java/util/HashMap$Entry
-+java/util/Map$Entry
-+java/security/AccessController
-+java/lang/reflect/ReflectPermission
-+sun/reflect/ReflectionFactory$GetReflectionFactoryAction
-+java/security/PrivilegedAction
-+java/util/Stack
-+sun/reflect/ReflectionFactory
-+java/lang/ref/Reference$Lock
-+java/lang/ref/Reference$ReferenceHandler
-+java/lang/ref/Finalizer$FinalizerThread
-+java/util/Enumeration
-+java/util/Iterator
-+java/util/Hashtable$Entry
-+java/nio/charset/Charset
-+sun/nio/cs/StandardCharsets
-+sun/nio/cs/FastCharsetProvider
-+java/nio/charset/spi/CharsetProvider
-+sun/nio/cs/StandardCharsets$Aliases
-+sun/util/PreHashedMap
-+sun/nio/cs/StandardCharsets$Classes
-+sun/nio/cs/StandardCharsets$Cache
-+java/lang/ThreadLocal
-+java/util/concurrent/atomic/AtomicInteger
-+sun/misc/Unsafe
-+java/lang/NoSuchMethodError
-+java/lang/IncompatibleClassChangeError
-+sun/reflect/Reflection
-+java/util/Collections
-+java/util/Collections$EmptySet
-+java/util/AbstractSet
-+java/util/Set
-+java/util/Collections$EmptyList
-+java/util/Collections$EmptyMap
-+java/util/Collections$ReverseComparator
-+java/util/Collections$SynchronizedMap
-+java/lang/Class$3
-+java/lang/reflect/Modifier
-+java/lang/reflect/ReflectAccess
-+sun/reflect/LangReflectAccess
-+java/util/Arrays
-+java/lang/Math
-+sun/nio/cs/US_ASCII
-+sun/nio/cs/HistoricallyNamedCharset
-+sun/misc/VM
-+java/lang/StringCoding
-+java/lang/ThreadLocal$ThreadLocalMap
-+java/lang/ThreadLocal$ThreadLocalMap$Entry
-+java/lang/StringCoding$StringDecoder
-+sun/nio/cs/US_ASCII$Decoder
-+java/nio/charset/CharsetDecoder
-+java/nio/charset/CodingErrorAction
-+java/nio/ByteBuffer
-+java/nio/HeapByteBuffer
-+java/nio/Bits
-+java/nio/ByteOrder
-+java/nio/CharBuffer
-+java/lang/Readable
-+java/nio/HeapCharBuffer
-+java/nio/charset/CoderResult
-+java/nio/charset/CoderResult$1
-+java/nio/charset/CoderResult$Cache
-+java/nio/charset/CoderResult$2
-+sun/misc/Version
-+java/io/FileInputStream
-+java/io/InputStream
-+java/io/Closeable
-+java/io/FileDescriptor
-+java/io/FileOutputStream
-+java/io/OutputStream
-+java/io/Flushable
-+java/io/BufferedInputStream
-+java/io/FilterInputStream
-+java/util/concurrent/atomic/AtomicReferenceFieldUpdater
-+java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl
-+sun/reflect/misc/ReflectUtil
-+java/io/PrintStream
-+java/io/FilterOutputStream
-+java/io/BufferedOutputStream
-+java/io/OutputStreamWriter
-+java/io/Writer
-+sun/nio/cs/StreamEncoder
-+sun/security/action/GetPropertyAction
-+sun/nio/cs/US_ASCII$Encoder
-+java/nio/charset/CharsetEncoder
-+sun/nio/cs/Surrogate$Parser
-+sun/nio/cs/Surrogate
-+java/io/BufferedWriter
-+java/lang/Runtime
-+java/io/File
-+java/io/FileSystem
-+java/io/UnixFileSystem
-+java/io/ExpiringCache
-+java/io/ExpiringCache$1
-+java/util/LinkedHashMap
-+java/util/LinkedHashMap$Entry
-+java/lang/StringBuilder
-+sun/misc/SharedSecrets
-+java/lang/ClassLoader$3
-+java/lang/StringCoding$StringEncoder
-+java/io/ExpiringCache$Entry
-+java/lang/ClassLoader$NativeLibrary
-+java/lang/Terminator
-+java/lang/Terminator$1
-+sun/misc/SignalHandler
-+sun/misc/Signal
-+sun/misc/NativeSignalHandler
-+java/io/Console
-+java/io/Console$1
-+sun/misc/JavaIOAccess
-+java/lang/Shutdown
-+java/util/ArrayList
-+java/lang/Shutdown$Lock
-+java/lang/ApplicationShutdownHooks
-+java/util/IdentityHashMap
-+sun/misc/OSEnvironment
-+java/lang/System$2
-+sun/misc/JavaLangAccess
-+java/lang/Compiler
-+java/lang/Compiler$1
-+sun/misc/Launcher
-+sun/misc/Launcher$Factory
-+java/net/URLStreamHandlerFactory
-+sun/misc/Launcher$ExtClassLoader
-+java/net/URLClassLoader
-+java/security/SecureClassLoader
-+sun/security/util/Debug
-+java/net/URLClassLoader$7
-+sun/misc/JavaNetAccess
-+java/util/StringTokenizer
-+sun/misc/Launcher$ExtClassLoader$1
-+java/security/PrivilegedExceptionAction
-+sun/misc/MetaIndex
-+java/io/BufferedReader
-+java/io/Reader
-+java/io/FileReader
-+java/io/InputStreamReader
-+sun/nio/cs/StreamDecoder
-+java/lang/reflect/Array
-+sun/net/www/ParseUtil
-+java/util/BitSet
-+java/io/ObjectStreamClass
-+java/net/URL
-+java/util/Locale
-+java/util/concurrent/ConcurrentHashMap
-+java/util/concurrent/ConcurrentMap
-+java/util/concurrent/ConcurrentHashMap$Segment
-+java/util/concurrent/locks/ReentrantLock
-+java/util/concurrent/locks/Lock
-+java/util/concurrent/locks/ReentrantLock$NonfairSync
-+java/util/concurrent/locks/ReentrantLock$Sync
-+java/util/concurrent/locks/AbstractQueuedSynchronizer
-+java/util/concurrent/locks/AbstractOwnableSynchronizer
-+java/util/concurrent/locks/AbstractQueuedSynchronizer$Node
-+java/util/concurrent/ConcurrentHashMap$HashEntry
-+java/lang/CharacterDataLatin1
-+java/net/Parts
-+sun/net/www/protocol/file/Handler
-+java/net/URLStreamHandler
-+java/lang/Class$1
-+sun/reflect/ReflectionFactory$1
-+sun/reflect/NativeConstructorAccessorImpl
-+sun/reflect/DelegatingConstructorAccessorImpl
-+java/util/HashSet
-+sun/misc/URLClassPath
-+sun/net/www/protocol/jar/Handler
-+sun/misc/Launcher$AppClassLoader
-+sun/misc/Launcher$AppClassLoader$1
-+java/lang/SystemClassLoaderAction
-+java/net/URLClassLoader$1
-+sun/misc/URLClassPath$3
-+sun/misc/URLClassPath$JarLoader
-+sun/misc/URLClassPath$Loader
-+java/security/PrivilegedActionException
-+sun/misc/URLClassPath$FileLoader
-+sun/misc/URLClassPath$FileLoader$1
-+sun/misc/Resource
-+sun/nio/ByteBuffered
-+java/security/CodeSource
-+java/security/Permissions
-+java/security/PermissionCollection
-+sun/net/www/protocol/file/FileURLConnection
-+sun/net/www/URLConnection
-+java/net/URLConnection
-+java/net/UnknownContentHandler
-+java/net/ContentHandler
-+sun/net/www/MessageHeader
-+java/io/FilePermission
-+java/io/FilePermission$1
-+sun/security/provider/PolicyFile
-+java/security/Policy
-+java/security/Policy$UnsupportedEmptyCollection
-+java/io/FilePermissionCollection
-+java/security/AllPermission
-+java/security/UnresolvedPermission
-+java/security/BasicPermissionCollection
-+java/security/Principal
-+java/security/cert/Certificate
-+java/util/AbstractList$Itr
-+java/util/IdentityHashMap$KeySet
-+java/util/IdentityHashMap$KeyIterator
-+java/util/IdentityHashMap$IdentityHashMapIterator
-+java/io/DeleteOnExitHook
-+java/util/LinkedHashSet
-+java/util/HashMap$KeySet
-+java/util/LinkedHashMap$KeyIterator
-+java/util/LinkedHashMap$LinkedHashIterator
-+java/awt/Frame
-+java/awt/MenuContainer
-+java/awt/Window
-+javax/accessibility/Accessible
-+java/awt/Container
-+java/awt/Component
-+java/awt/image/ImageObserver
-+java/lang/InterruptedException
-+java/awt/Label
-+java/util/logging/Logger
-+java/util/logging/Handler
-+java/util/logging/Level
-+java/util/logging/LogManager
-+java/util/logging/LogManager$1
-+java/beans/PropertyChangeSupport
-+java/util/logging/LogManager$LogNode
-+java/util/logging/LoggingPermission
-+java/util/logging/LogManager$Cleaner
-+java/util/logging/LogManager$RootLogger
-+java/util/logging/LogManager$2
-+java/util/Properties$LineReader
-+java/util/Hashtable$Enumerator
-+java/beans/PropertyChangeEvent
-+java/util/EventObject
-+java/awt/Component$AWTTreeLock
-+sun/awt/NativeLibLoader
-+sun/security/action/LoadLibraryAction
-+java/awt/GraphicsEnvironment
-+java/awt/GraphicsEnvironment$1
-+java/lang/ProcessEnvironment
-+java/lang/ProcessEnvironment$Variable
-+java/lang/ProcessEnvironment$ExternalData
-+java/lang/ProcessEnvironment$Value
-+java/lang/ProcessEnvironment$StringEnvironment
-+java/util/Collections$UnmodifiableMap
-+java/awt/Toolkit
-+java/awt/Toolkit$3
-+sun/util/CoreResourceBundleControl
-+java/util/ResourceBundle$Control
-+java/util/Arrays$ArrayList
-+java/util/Collections$UnmodifiableRandomAccessList
-+java/util/Collections$UnmodifiableList
-+java/util/Collections$UnmodifiableCollection
-+java/util/ResourceBundle
-+java/util/ResourceBundle$1
-+java/util/ResourceBundle$RBClassLoader
-+java/util/ResourceBundle$RBClassLoader$1
-+java/util/ResourceBundle$CacheKey
-+java/util/ResourceBundle$LoaderReference
-+java/util/ResourceBundle$CacheKeyReference
-+java/util/ResourceBundle$SingleFormatControl
-+sun/awt/resources/awt
-+java/util/ListResourceBundle
-+java/awt/Toolkit$1
-+java/io/FileNotFoundException
-+java/io/IOException
-+java/awt/event/KeyEvent
-+java/awt/event/InputEvent
-+java/awt/event/ComponentEvent
-+java/awt/AWTEvent
-+java/awt/event/NativeLibLoader
-+java/util/WeakHashMap
-+java/util/WeakHashMap$Entry
-+java/awt/Component$DummyRequestFocusController
-+sun/awt/RequestFocusController
-+java/awt/LayoutManager
-+java/awt/LightweightDispatcher
-+java/awt/event/AWTEventListener
-+java/util/EventListener
-+java/awt/Dimension
-+java/awt/geom/Dimension2D
-+java/util/concurrent/atomic/AtomicBoolean
-+java/awt/ComponentOrientation
-+java/awt/Component$2
-+java/lang/NoSuchMethodException
-+sun/awt/AppContext
-+sun/awt/AppContext$1
-+sun/awt/AppContext$2
-+sun/awt/MostRecentKeyValue
-+java/awt/Cursor
-+sun/awt/X11GraphicsEnvironment
-+sun/java2d/SunGraphicsEnvironment
-+sun/java2d/FontSupport
-+sun/awt/DisplayChangedListener
-+java/io/FilenameFilter
-+sun/awt/X11GraphicsEnvironment$1
-+sun/awt/SunToolkit
-+sun/awt/WindowClosingSupport
-+sun/awt/WindowClosingListener
-+sun/awt/ComponentFactory
-+sun/awt/InputMethodSupport
-+java/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject
-+java/util/concurrent/locks/Condition
-+sun/awt/AWTAutoShutdown
-+sun/awt/SunToolkit$6
-+java/awt/Dialog$ModalExclusionType
-+java/lang/Enum
-+java/awt/Dialog
-+java/awt/Dialog$ModalityType
-+java/awt/ModalEventFilter
-+java/awt/EventFilter
-+sun/reflect/UnsafeFieldAccessorFactory
-+sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl
-+sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl
-+sun/awt/SunDisplayChanger
-+sun/java2d/SunGraphicsEnvironment$1
-+java/io/StreamTokenizer
-+sun/font/FontManager
-+sun/font/FileFont
-+sun/font/PhysicalFont
-+sun/font/Font2D
-+sun/font/CompositeFont
-+java/util/HashMap$Values
-+java/util/HashMap$ValueIterator
-+java/util/HashMap$HashIterator
-+java/awt/Font
-+java/awt/geom/AffineTransform
-+sun/font/AttributeValues
-+sun/font/EAttribute
-+java/text/AttributedCharacterIterator$Attribute
-+java/lang/Class$4
-+sun/reflect/NativeMethodAccessorImpl
-+sun/reflect/DelegatingMethodAccessorImpl
-+java/awt/font/TextAttribute
-+java/lang/Integer$IntegerCache
-+sun/font/TrueTypeFont
-+java/awt/font/FontRenderContext
-+java/awt/RenderingHints
-+sun/awt/SunHints
-+sun/awt/SunHints$Key
-+java/awt/RenderingHints$Key
-+sun/awt/SunHints$Value
-+sun/awt/SunHints$LCDContrastKey
-+sun/font/Type1Font
-+java/awt/geom/Point2D$Float
-+java/awt/geom/Point2D
-+sun/font/StrikeMetrics
-+java/awt/geom/Rectangle2D$Float
-+java/awt/geom/Rectangle2D
-+java/awt/geom/RectangularShape
-+java/awt/Shape
-+java/awt/geom/GeneralPath
-+java/awt/geom/Path2D$Float
-+java/awt/geom/Path2D
-+sun/font/CharToGlyphMapper
-+sun/font/PhysicalStrike
-+sun/font/FontStrike
-+sun/font/GlyphList
-+sun/font/StrikeCache
-+sun/java2d/Disposer
-+sun/java2d/Disposer$1
-+sun/font/StrikeCache$1
-+sun/awt/motif/MFontConfiguration
-+sun/awt/FontConfiguration
-+sun/awt/FontDescriptor
-+java/util/Scanner
-+java/util/regex/Pattern
-+java/util/regex/Pattern$Node
-+java/util/regex/Pattern$LastNode
-+java/util/regex/Pattern$GroupHead
-+java/util/regex/Pattern$CharPropertyNames
-+java/util/regex/Pattern$CharPropertyNames$1
-+java/util/regex/Pattern$CharPropertyNames$CharPropertyFactory
-+java/util/regex/Pattern$CharPropertyNames$2
-+java/util/regex/Pattern$CharPropertyNames$5
-+java/util/regex/Pattern$CharPropertyNames$3
-+java/util/regex/Pattern$CharPropertyNames$6
-+java/util/regex/Pattern$CharPropertyNames$CloneableProperty
-+java/util/regex/Pattern$CharProperty
-+java/util/regex/Pattern$CharPropertyNames$4
-+java/util/regex/Pattern$CharPropertyNames$7
-+java/util/regex/Pattern$CharPropertyNames$8
-+java/util/regex/Pattern$CharPropertyNames$9
-+java/util/regex/Pattern$CharPropertyNames$10
-+java/util/regex/Pattern$CharPropertyNames$11
-+java/util/regex/Pattern$CharPropertyNames$12
-+java/util/regex/Pattern$CharPropertyNames$13
-+java/util/regex/Pattern$CharPropertyNames$14
-+java/util/regex/Pattern$CharPropertyNames$15
-+java/util/regex/Pattern$CharPropertyNames$16
-+java/util/regex/Pattern$CharPropertyNames$17
-+java/util/regex/Pattern$CharPropertyNames$18
-+java/util/regex/Pattern$CharPropertyNames$19
-+java/util/regex/Pattern$CharPropertyNames$20
-+java/util/regex/Pattern$CharPropertyNames$21
-+java/util/regex/Pattern$Curly
-+java/util/regex/Pattern$Slice
-+java/util/regex/Pattern$Begin
-+java/util/regex/Pattern$First
-+java/util/regex/Pattern$Start
-+java/util/regex/Pattern$TreeInfo
-+java/util/regex/Pattern$All
-+java/util/regex/Pattern$BitClass
-+java/util/regex/Pattern$BmpCharProperty
-+java/util/regex/Pattern$6
-+java/util/regex/Pattern$CharProperty$1
-+sun/nio/ch/FileChannelImpl
-+java/nio/channels/FileChannel
-+java/nio/channels/ByteChannel
-+java/nio/channels/ReadableByteChannel
-+java/nio/channels/Channel
-+java/nio/channels/WritableByteChannel
-+java/nio/channels/GatheringByteChannel
-+java/nio/channels/ScatteringByteChannel
-+java/nio/channels/spi/AbstractInterruptibleChannel
-+java/nio/channels/InterruptibleChannel
-+sun/nio/ch/Util
-+sun/nio/ch/IOUtil
-+sun/nio/ch/FileDispatcher
-+sun/nio/ch/NativeDispatcher
-+sun/nio/ch/Reflect
-+java/nio/MappedByteBuffer
-+sun/nio/ch/Reflect$1
-+sun/nio/ch/NativeThreadSet
-+java/nio/channels/Channels
-+java/util/Scanner$1
-+sun/misc/LRUCache
-+java/util/regex/Matcher
-+java/util/regex/MatchResult
-+java/text/NumberFormat
-+java/text/Format
-+java/text/spi/NumberFormatProvider
-+java/util/spi/LocaleServiceProvider
-+sun/util/LocaleServiceProviderPool
-+sun/util/LocaleServiceProviderPool$1
-+java/util/ServiceLoader
-+java/util/ServiceLoader$LazyIterator
-+java/util/ServiceLoader$1
-+java/util/HashMap$EntrySet
-+java/util/LinkedHashMap$EntryIterator
-+sun/misc/Launcher$1
-+sun/misc/URLClassPath$2
-+java/lang/ClassLoader$2
-+sun/misc/URLClassPath$1
-+java/net/URLClassLoader$3
-+sun/misc/CompoundEnumeration
-+sun/misc/URLClassPath$JarLoader$1
-+sun/misc/FileURLMapper
-+java/net/URLClassLoader$3$1
-+sun/util/resources/LocaleData
-+sun/util/resources/LocaleData$1
-+sun/util/resources/LocaleData$LocaleDataResourceBundleControl
-+sun/util/LocaleDataMetaInfo
-+sun/text/resources/FormatData
-+java/util/ResourceBundle$BundleReference
-+sun/text/resources/FormatData_en
-+sun/text/resources/FormatData_en_US
-+java/text/DecimalFormatSymbols
-+java/text/spi/DecimalFormatSymbolsProvider
-+java/util/Currency
-+java/util/Currency$1
-+java/util/spi/CurrencyNameProvider
-+sun/util/resources/CurrencyNames
-+sun/util/resources/LocaleNamesBundle
-+sun/util/resources/OpenListResourceBundle
-+sun/util/resources/CurrencyNames_en_US
-+java/text/DecimalFormat
-+java/text/FieldPosition
-+java/text/DigitList
-+java/math/RoundingMode
-+java/util/regex/Pattern$GroupTail
-+java/util/regex/Pattern$Ctype
-+java/util/regex/Pattern$Ques
-+java/util/regex/Pattern$GroupCurly
-+java/util/regex/Pattern$5
-+java/util/regex/Pattern$Loop
-+java/util/regex/Pattern$Prolog
-+java/util/regex/Pattern$BranchConn
-+java/util/regex/Pattern$Branch
-+java/nio/channels/spi/AbstractInterruptibleChannel$1
-+sun/nio/ch/Interruptible
-+sun/nio/ch/NativeThread
-+sun/nio/ch/DirectBuffer
-+java/nio/DirectByteBuffer
-+java/nio/DirectByteBuffer$Deallocator
-+sun/misc/Cleaner
-+sun/nio/ch/IOStatus
-+java/util/regex/ASCII
-+java/io/DataInputStream
-+java/io/DataInput
-+java/lang/Short$ShortCache
-+java/util/HashMap$KeyIterator
-+sun/font/CompositeFontDescriptor
-+sun/font/Font2DHandle
-+sun/font/FontFamily
-+java/awt/GraphicsDevice
-+sun/awt/X11GraphicsDevice
-+sun/awt/X11GraphicsConfig
-+java/awt/GraphicsConfiguration
-+java/awt/ImageCapabilities
-+sun/java2d/x11/X11SurfaceData
-+sun/java2d/SurfaceData
-+java/awt/Transparency
-+sun/java2d/DisposerTarget
-+sun/java2d/InvalidPipeException
-+java/lang/IllegalStateException
-+sun/java2d/NullSurfaceData
-+sun/java2d/loops/SurfaceType
-+sun/awt/image/PixelConverter
-+sun/awt/image/PixelConverter$Xrgb
-+sun/awt/image/PixelConverter$Argb
-+sun/awt/image/PixelConverter$ArgbPre
-+sun/awt/image/PixelConverter$Xbgr
-+sun/awt/image/PixelConverter$Rgba
-+sun/awt/image/PixelConverter$RgbaPre
-+sun/awt/image/PixelConverter$Ushort565Rgb
-+sun/awt/image/PixelConverter$Ushort555Rgb
-+sun/awt/image/PixelConverter$Ushort555Rgbx
-+sun/awt/image/PixelConverter$Ushort4444Argb
-+sun/awt/image/PixelConverter$ByteGray
-+sun/awt/image/PixelConverter$UshortGray
-+sun/awt/image/PixelConverter$Rgbx
-+sun/awt/image/PixelConverter$Bgrx
-+sun/awt/image/PixelConverter$ArgbBm
-+java/awt/image/ColorModel
-+java/awt/image/DirectColorModel
-+java/awt/image/PackedColorModel
-+java/awt/color/ColorSpace
-+java/awt/color/ICC_Profile
-+java/awt/color/ICC_ProfileRGB
-+java/awt/color/ICC_Profile$1
-+java/awt/color/ICC_ColorSpace
-+sun/java2d/pipe/NullPipe
-+sun/java2d/pipe/PixelDrawPipe
-+sun/java2d/pipe/PixelFillPipe
-+sun/java2d/pipe/ShapeDrawPipe
-+sun/java2d/pipe/TextPipe
-+sun/java2d/pipe/DrawImagePipe
-+java/awt/image/IndexColorModel
-+sun/java2d/pipe/LoopPipe
-+sun/java2d/pipe/OutlineTextRenderer
-+sun/java2d/pipe/SolidTextRenderer
-+sun/java2d/pipe/GlyphListLoopPipe
-+sun/java2d/pipe/GlyphListPipe
-+sun/java2d/pipe/AATextRenderer
-+sun/java2d/pipe/LCDTextRenderer
-+sun/java2d/pipe/AlphaColorPipe
-+sun/java2d/pipe/CompositePipe
-+sun/java2d/pipe/PixelToShapeConverter
-+sun/java2d/pipe/TextRenderer
-+sun/java2d/pipe/SpanClipRenderer
-+sun/java2d/pipe/Region
-+sun/java2d/pipe/RegionIterator
-+sun/java2d/pipe/AlphaPaintPipe
-+sun/java2d/pipe/SpanShapeRenderer$Composite
-+sun/java2d/pipe/SpanShapeRenderer
-+sun/java2d/pipe/GeneralCompositePipe
-+sun/java2d/pipe/DrawImage
-+sun/java2d/loops/RenderCache
-+sun/java2d/loops/RenderCache$Entry
-+sun/java2d/loops/XORComposite
-+java/awt/Composite
-+sun/font/X11TextRenderer
-+sun/java2d/loops/GraphicsPrimitive
-+sun/java2d/x11/X11PMBlitLoops
-+sun/java2d/loops/Blit
-+sun/java2d/loops/GraphicsPrimitiveMgr
-+sun/java2d/loops/CompositeType
-+sun/java2d/SunGraphics2D
-+sun/awt/ConstrainableGraphics
-+java/awt/Graphics2D
-+java/awt/Graphics
-+java/awt/Color
-+java/awt/Paint
-+java/awt/AlphaComposite
-+sun/java2d/loops/BlitBg
-+sun/java2d/loops/ScaledBlit
-+sun/java2d/loops/FillRect
-+sun/java2d/loops/FillSpans
-+sun/java2d/loops/DrawLine
-+sun/java2d/loops/DrawRect
-+sun/java2d/loops/DrawPolygons
-+sun/java2d/loops/DrawPath
-+sun/java2d/loops/FillPath
-+sun/java2d/loops/MaskBlit
-+sun/java2d/loops/MaskFill
-+sun/java2d/loops/DrawGlyphList
-+sun/java2d/loops/DrawGlyphListAA
-+sun/java2d/loops/DrawGlyphListLCD
-+sun/java2d/loops/TransformHelper
-+java/awt/BasicStroke
-+java/awt/Stroke
-+sun/misc/PerformanceLogger
-+sun/misc/PerformanceLogger$TimeData
-+sun/java2d/pipe/ValidatePipe
-+sun/java2d/loops/CustomComponent
-+sun/java2d/loops/GraphicsPrimitiveProxy
-+sun/java2d/loops/GeneralRenderer
-+sun/java2d/loops/GraphicsPrimitiveMgr$1
-+sun/java2d/loops/GraphicsPrimitiveMgr$2
-+sun/java2d/x11/X11PMBlitLoops$DelegateBlitLoop
-+sun/java2d/x11/X11PMBlitBgLoops
-+sun/java2d/x11/X11SurfaceData$LazyPipe
-+sun/awt/X11GraphicsConfig$X11GCDisposerRecord
-+sun/java2d/DisposerRecord
-+java/awt/BorderLayout
-+java/awt/LayoutManager2
-+java/awt/Rectangle
-+java/awt/Toolkit$2
-+sun/awt/X11/XToolkit
-+sun/awt/X11/XConstants
-+sun/awt/UNIXToolkit
-+java/util/TreeMap
-+java/util/NavigableMap
-+java/util/SortedMap
-+sun/awt/X11/XlibWrapper
-+sun/awt/X11/XUtilConstants
-+sun/awt/X11/XProtocolConstants
-+sun/awt/X11/XCursorFontConstants
-+sun/awt/X11/XlibWrapper$1
-+sun/awt/X11/XToolkit$4
-+sun/awt/X11/XModifierKeymap
-+sun/awt/X11/XWrapperBase
-+sun/awt/X11/Native
-+sun/awt/X11/Native$1
-+java/awt/EventQueue
-+java/util/EmptyStackException
-+java/lang/reflect/InvocationTargetException
-+java/awt/EventDispatchThread
-+java/awt/event/PaintEvent
-+java/awt/event/MouseEvent
-+sun/awt/PeerEvent
-+java/awt/event/InvocationEvent
-+java/awt/ActiveEvent
-+sun/awt/X11/XToolkit$1
-+sun/awt/X11/XEventDispatcher
-+sun/awt/SunToolkit$ModalityListenerList
-+sun/awt/ModalityListener
-+sun/awt/SunToolkit$1
-+java/util/MissingResourceException
-+java/awt/Queue
-+sun/awt/PostEventQueue
-+java/util/LinkedList
-+java/util/Deque
-+java/util/Queue
-+java/util/AbstractSequentialList
-+sun/awt/X11/AwtScreenData
-+sun/awt/X11/XWM
-+sun/awt/X11/MWMConstants
-+sun/awt/X11/XAtom
-+java/awt/Insets
-+sun/awt/X11/XWM$1
-+sun/awt/X11/XSetWindowAttributes
-+sun/awt/X11/XErrorEvent
-+sun/awt/X11/XNETProtocol
-+sun/awt/X11/XStateProtocol
-+sun/awt/X11/XLayerProtocol
-+sun/awt/X11/XProtocol
-+sun/awt/X11/WindowPropertyGetter
-+sun/awt/X11/UnsafeXDisposerRecord
-+sun/awt/X11/XPropertyCache
-+sun/awt/X11/XWINProtocol
-+sun/awt/X11/XAtomList
-+sun/awt/X11/XToolkit$3
-+sun/awt/X11/XAnyEvent
-+java/awt/Window$WindowDisposerRecord
-+java/awt/KeyboardFocusManager
-+java/awt/KeyEventDispatcher
-+java/awt/KeyEventPostProcessor
-+java/awt/AWTKeyStroke
-+java/awt/AWTKeyStroke$1
-+java/awt/DefaultKeyboardFocusManager
-+java/awt/DefaultFocusTraversalPolicy
-+java/awt/ContainerOrderFocusTraversalPolicy
-+java/awt/FocusTraversalPolicy
-+java/util/Collections$UnmodifiableSet
-+sun/awt/HeadlessToolkit
-+sun/awt/X11/XKeyboardFocusManagerPeer
-+java/awt/peer/KeyboardFocusManagerPeer
-+sun/awt/X11/XKeyboardFocusManagerPeer$1
-+sun/awt/X11/XFramePeer
-+java/awt/peer/FramePeer
-+java/awt/peer/WindowPeer
-+java/awt/peer/ContainerPeer
-+java/awt/peer/ComponentPeer
-+sun/awt/X11/XDecoratedPeer
-+sun/awt/X11/XWindowPeer
-+sun/awt/X11/XPanelPeer
-+java/awt/peer/PanelPeer
-+sun/awt/X11/XCanvasPeer
-+java/awt/peer/CanvasPeer
-+sun/awt/X11/XComponentPeer
-+java/awt/dnd/peer/DropTargetPeer
-+sun/awt/X11/XWindow
-+sun/awt/X11ComponentPeer
-+sun/awt/X11/XBaseWindow
-+sun/awt/X11/XCreateWindowParams
-+java/lang/Long$LongCache
-+sun/awt/X11/XBaseWindow$InitialiseState
-+sun/awt/X11/XBaseWindow$StateLock
-+sun/awt/X11/AwtGraphicsConfigData
-+sun/awt/X11/XVisualInfo
-+java/awt/SystemColor
-+sun/awt/X11/MotifColorUtilities
-+java/lang/StrictMath
-+sun/awt/X11/XRepaintArea
-+sun/awt/RepaintArea
-+sun/awt/X11/XWindowAttributesData
-+java/util/concurrent/locks/LockSupport
-+sun/awt/X11/WindowDimensions
-+java/awt/Point
-+java/util/TreeMap$Entry
-+sun/nio/cs/UTF_8
-+sun/nio/cs/Unicode
-+sun/nio/cs/UTF_8$Encoder
-+sun/nio/cs/UTF_8$Decoder
-+sun/nio/cs/Surrogate$Generator
-+sun/awt/X11/XPropertyEvent
-+sun/awt/X11/XDropTargetEventProcessor
-+sun/awt/X11/XDragSourceContextPeer
-+sun/awt/X11/XDragSourceProtocolListener
-+sun/awt/dnd/SunDragSourceContextPeer
-+java/awt/dnd/peer/DragSourceContextPeer
-+sun/awt/X11/XAwtState
-+sun/awt/X11/XBaseWindow$1
-+sun/awt/X11/XRootWindow
-+sun/nio/cs/ISO_8859_1
-+sun/nio/cs/ISO_8859_1$Encoder
-+sun/nio/cs/ISO_8859_1$Decoder
-+sun/java2d/x11/X11SurfaceData$X11WindowSurfaceData
-+sun/java2d/loops/RenderLoops
-+sun/java2d/loops/GraphicsPrimitiveMgr$PrimitiveSpec
-+sun/java2d/DefaultDisposerRecord
-+sun/java2d/x11/X11Renderer
-+sun/awt/X11/XGlobalCursorManager
-+sun/awt/GlobalCursorManager
-+java/awt/Cursor$CursorDisposer
-+java/awt/AWTException
-+java/awt/HeadlessException
-+java/lang/UnsupportedOperationException
-+sun/reflect/UnsafeLongFieldAccessorImpl
-+sun/reflect/UnsafeIntegerFieldAccessorImpl
-+sun/awt/X11/XClientMessageEvent
-+sun/awt/X11/XIconInfo
-+sun/awt/X11/XAWTIcon32_java_icon16_png
-+sun/awt/X11/XAWTIcon32_java_icon24_png
-+sun/awt/X11/XAWTIcon32_java_icon32_png
-+sun/awt/X11/XAWTIcon32_java_icon48_png
-+sun/awt/X11/XSizeHints
-+sun/awt/X11/XContentWindow
-+sun/awt/X11/XFocusProxyWindow
-+sun/awt/X11/XWMHints
-+java/util/LinkedList$ListItr
-+java/util/ListIterator
-+sun/awt/SunToolkit$2
-+java/awt/image/BufferStrategy
-+java/awt/dnd/DropTarget
-+java/awt/dnd/DropTargetListener
-+java/awt/event/ComponentListener
-+java/awt/event/FocusListener
-+java/awt/event/HierarchyListener
-+java/awt/event/HierarchyBoundsListener
-+java/awt/event/KeyListener
-+java/awt/event/MouseListener
-+java/awt/event/MouseMotionListener
-+java/awt/event/MouseWheelListener
-+java/awt/event/InputMethodListener
-+java/awt/event/ContainerListener
-+javax/accessibility/AccessibleContext
-+sun/reflect/UnsafeObjectFieldAccessorImpl
-+java/awt/peer/LightweightPeer
-+sun/awt/X11/XLabelPeer
-+java/awt/peer/LabelPeer
-+sun/awt/X11/XMapEvent
-+sun/awt/X11/XQueryTree
-+sun/awt/X11/XConfigureEvent
-+sun/awt/X11/PropMwmHints
-+sun/awt/GlobalCursorManager$NativeUpdater
-+javax/swing/JFrame
-+javax/swing/WindowConstants
-+javax/swing/RootPaneContainer
-+javax/swing/TransferHandler$HasGetTransferHandler
-+javax/swing/JLabel
-+javax/swing/SwingConstants
-+javax/swing/JComponent
-+javax/swing/JComponent$1
-+javax/swing/SwingUtilities
-+javax/swing/JRootPane
-+sun/security/action/GetBooleanAction
-+javax/swing/event/EventListenerList
-+javax/swing/JPanel
-+java/awt/FlowLayout
-+javax/swing/UIManager
-+javax/swing/UIManager$LookAndFeelInfo
-+sun/swing/SwingUtilities2
-+sun/swing/SwingUtilities2$LSBCacheEntry
-+javax/swing/UIManager$LAFState
-+javax/swing/UIDefaults
-+javax/swing/MultiUIDefaults
-+javax/swing/UIManager$1
-+javax/swing/plaf/metal/MetalLookAndFeel
-+javax/swing/plaf/basic/BasicLookAndFeel
-+javax/swing/LookAndFeel
-+sun/swing/DefaultLookup
-+javax/swing/plaf/metal/OceanTheme
-+javax/swing/plaf/metal/DefaultMetalTheme
-+javax/swing/plaf/metal/MetalTheme
-+javax/swing/plaf/ColorUIResource
-+javax/swing/plaf/UIResource
-+sun/swing/PrintColorUIResource
-+javax/swing/plaf/metal/DefaultMetalTheme$FontDelegate
-+javax/swing/plaf/FontUIResource
-+sun/swing/SwingLazyValue
-+javax/swing/UIDefaults$LazyValue
-+javax/swing/UIDefaults$ActiveValue
-+javax/swing/plaf/InsetsUIResource
-+sun/swing/SwingUtilities2$2
-+javax/swing/plaf/basic/BasicLookAndFeel$2
-+javax/swing/plaf/DimensionUIResource
-+javax/swing/UIDefaults$LazyInputMap
-+java/lang/Character$CharacterCache
-+javax/swing/plaf/metal/MetalLookAndFeel$MetalLazyValue
-+javax/swing/plaf/metal/MetalLookAndFeel$FontActiveValue
-+java/awt/print/PrinterJob
-+sun/swing/SwingUtilities2$AATextInfo
-+sun/awt/X11/XAWTXSettings
-+sun/awt/X11/XMSelectionListener
-+sun/awt/XSettings
-+sun/awt/X11/XMSelection
-+sun/awt/X11/XMSelection$1
-+javax/swing/plaf/metal/MetalLookAndFeel$AATextListener
-+java/beans/PropertyChangeListener
-+java/beans/PropertyChangeListenerProxy
-+java/util/EventListenerProxy
-+sun/awt/EventListenerAggregate
-+javax/swing/UIDefaults$ProxyLazyValue
-+javax/swing/plaf/metal/OceanTheme$1
-+javax/swing/plaf/metal/OceanTheme$2
-+javax/swing/plaf/metal/OceanTheme$3
-+javax/swing/plaf/metal/OceanTheme$4
-+javax/swing/plaf/metal/OceanTheme$5
-+javax/swing/plaf/metal/OceanTheme$6
-+javax/swing/RepaintManager
-+javax/swing/RepaintManager$DisplayChangedHandler
-+javax/swing/SwingPaintEventDispatcher
-+sun/awt/PaintEventDispatcher
-+javax/swing/UIManager$2
-+java/awt/PopupMenu
-+java/awt/Menu
-+java/awt/MenuItem
-+java/awt/MenuComponent
-+java/io/ObjectOutputStream
-+java/io/ObjectOutput
-+java/io/DataOutput
-+java/io/ObjectStreamConstants
-+java/io/PrintWriter
-+java/io/ObjectInputStream
-+java/io/ObjectInput
-+java/awt/Event
-+java/awt/im/InputContext
-+java/awt/event/MouseWheelEvent
-+java/awt/BufferCapabilities
-+sun/awt/CausedFocusEvent$Cause
-+java/awt/PointerInfo
-+java/awt/Component$BaselineResizeBehavior
-+java/awt/FontMetrics
-+java/awt/Image
-+java/awt/image/ImageProducer
-+java/awt/image/VolatileImage
-+java/awt/im/InputMethodRequests
-+java/awt/event/FocusEvent
-+java/awt/event/InputMethodEvent
-+java/awt/event/HierarchyEvent
-+javax/accessibility/AccessibleStateSet
-+com/sun/swing/internal/plaf/metal/resources/metal
-+sun/util/ResourceBundleEnumeration
-+com/sun/swing/internal/plaf/basic/resources/basic
-+javax/swing/plaf/basic/BasicPanelUI
-+javax/swing/plaf/PanelUI
-+javax/swing/plaf/ComponentUI
-+sun/reflect/misc/MethodUtil
-+sun/reflect/misc/MethodUtil$1
-+java/util/jar/JarFile
-+java/util/zip/ZipFile
-+java/util/zip/ZipConstants
-+java/util/jar/JavaUtilJarAccessImpl
-+sun/misc/JavaUtilJarAccess
-+sun/misc/JarIndex
-+java/util/zip/ZipEntry
-+java/util/jar/JarFile$JarFileEntry
-+java/util/jar/JarEntry
-+sun/misc/URLClassPath$JarLoader$2
-+sun/net/www/protocol/jar/JarURLConnection
-+java/net/JarURLConnection
-+sun/net/www/protocol/jar/JarFileFactory
-+sun/net/www/protocol/jar/URLJarFile$URLJarFileCloseController
-+java/net/HttpURLConnection
-+sun/net/www/protocol/jar/URLJarFile
-+sun/net/www/protocol/jar/URLJarFile$URLJarFileEntry
-+sun/net/www/protocol/jar/JarURLConnection$JarURLInputStream
-+java/util/zip/ZipFile$ZipFileInputStream
-+java/security/AllPermissionCollection
-+java/lang/IllegalAccessException
-+javax/swing/JPasswordField
-+javax/swing/JTextField
-+javax/swing/text/JTextComponent
-+javax/swing/Scrollable
-+javax/swing/JLayeredPane
-+javax/swing/JRootPane$1
-+javax/swing/ArrayTable
-+javax/swing/JInternalFrame
-+javax/swing/JRootPane$RootLayout
-+javax/swing/BufferStrategyPaintManager
-+javax/swing/RepaintManager$PaintManager
-+javax/swing/plaf/metal/MetalRootPaneUI
-+javax/swing/plaf/basic/BasicRootPaneUI
-+javax/swing/plaf/RootPaneUI
-+javax/swing/plaf/basic/BasicRootPaneUI$RootPaneInputMap
-+javax/swing/plaf/ComponentInputMapUIResource
-+javax/swing/ComponentInputMap
-+javax/swing/InputMap
-+javax/swing/plaf/InputMapUIResource
-+javax/swing/KeyStroke
-+java/awt/VKCollection
-+sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl
-+javax/swing/plaf/basic/LazyActionMap
-+javax/swing/plaf/ActionMapUIResource
-+javax/swing/ActionMap
-+javax/swing/LayoutFocusTraversalPolicy
-+javax/swing/SortingFocusTraversalPolicy
-+javax/swing/InternalFrameFocusTraversalPolicy
-+javax/swing/SwingContainerOrderFocusTraversalPolicy
-+javax/swing/SwingDefaultFocusTraversalPolicy
-+javax/swing/LayoutComparator
-+javax/swing/plaf/metal/MetalLabelUI
-+javax/swing/plaf/basic/BasicLabelUI
-+javax/swing/plaf/LabelUI
-+javax/swing/plaf/metal/DefaultMetalTheme$FontDelegate$1
-+javax/swing/plaf/basic/BasicHTML
-+sun/awt/NullComponentPeer
-+java/awt/event/WindowEvent
-+java/awt/EventQueue$1
-+java/awt/EventDispatchThread$1
-+java/awt/Conditional
-+java/awt/EventDispatchThread$HierarchyEventFilter
-+java/awt/EventFilter$FilterAction
-+sun/awt/dnd/SunDropTargetEvent
-+java/awt/event/ActionEvent
-+java/util/jar/Manifest
-+java/io/ByteArrayInputStream
-+java/util/jar/Attributes
-+java/util/jar/Manifest$FastInputStream
-+java/util/jar/Attributes$Name
-+sun/misc/ASCIICaseInsensitiveComparator
-+java/util/jar/JarVerifier
-+java/io/ByteArrayOutputStream
-+sun/misc/ExtensionDependency
-+java/lang/Package
-+sun/security/util/ManifestEntryVerifier
-+java/security/Provider
-+java/security/Provider$ServiceKey
-+java/security/Provider$EngineDescription
-+java/security/Security
-+java/security/Security$1
-+sun/misc/FloatingDecimal
-+sun/misc/FloatingDecimal$1
-+sun/security/provider/NativePRNG
-+java/security/SecureRandomSpi
-+sun/security/provider/NativePRNG$1
-+sun/security/provider/NativePRNG$RandomIO
-+sun/misc/BASE64Decoder
-+sun/misc/CharacterDecoder
-+sun/security/util/SignatureFileVerifier
-+java/awt/event/KeyAdapter
-+java/lang/NumberFormatException
-+java/lang/IllegalArgumentException
-+java/io/FileWriter
-+java/net/Authenticator
-+java/net/MalformedURLException
-+javax/swing/text/Element
-+javax/swing/text/Document
-+javax/swing/text/PlainDocument
-+javax/swing/text/AbstractDocument
-+javax/swing/text/GapContent
-+javax/swing/text/AbstractDocument$Content
-+javax/swing/text/GapVector
-+javax/swing/text/GapContent$MarkVector
-+javax/swing/text/GapContent$MarkData
-+javax/swing/text/StyleContext
-+javax/swing/text/AbstractDocument$AttributeContext
-+javax/swing/text/StyleConstants
-+javax/swing/text/StyleConstants$CharacterConstants
-+javax/swing/text/AttributeSet$CharacterAttribute
-+javax/swing/text/StyleConstants$FontConstants
-+javax/swing/text/AttributeSet$FontAttribute
-+javax/swing/text/StyleConstants$ColorConstants
-+javax/swing/text/AttributeSet$ColorAttribute
-+javax/swing/text/StyleConstants$ParagraphConstants
-+javax/swing/text/AttributeSet$ParagraphAttribute
-+javax/swing/text/StyleContext$FontKey
-+javax/swing/text/SimpleAttributeSet
-+javax/swing/text/MutableAttributeSet
-+javax/swing/text/AttributeSet
-+javax/swing/text/SimpleAttributeSet$EmptyAttributeSet
-+javax/swing/text/StyleContext$NamedStyle
-+javax/swing/text/Style
-+javax/swing/text/StyleContext$SmallAttributeSet
-+javax/swing/text/AbstractDocument$BidiRootElement
-+javax/swing/text/AbstractDocument$BranchElement
-+javax/swing/text/AbstractDocument$AbstractElement
-+javax/swing/tree/TreeNode
-+javax/swing/text/AbstractDocument$1
-+javax/swing/text/AbstractDocument$BidiElement
-+javax/swing/text/AbstractDocument$LeafElement
-+javax/swing/text/GapContent$StickyPosition
-+javax/swing/text/Position
-+javax/swing/text/StyleContext$KeyEnumeration
-+javax/swing/text/GapContent$InsertUndo
-+javax/swing/undo/AbstractUndoableEdit
-+javax/swing/undo/UndoableEdit
-+javax/swing/text/AbstractDocument$DefaultDocumentEvent
-+javax/swing/event/DocumentEvent
-+javax/swing/undo/CompoundEdit
-+javax/swing/event/DocumentEvent$EventType
-+javax/swing/text/Segment
-+java/text/CharacterIterator
-+javax/swing/text/Utilities
-+javax/swing/text/SegmentCache
-+javax/swing/text/SegmentCache$CachedSegment
-+javax/swing/event/UndoableEditEvent
-+javax/swing/text/AbstractDocument$ElementEdit
-+javax/swing/event/DocumentEvent$ElementChange
-+java/net/Socket
-+java/net/InetAddress
-+java/net/InetAddress$Cache
-+java/net/InetAddress$Cache$Type
-+java/net/InetAddressImplFactory
-+java/net/Inet4AddressImpl
-+java/net/InetAddressImpl
-+java/net/InetAddress$1
-+sun/net/spi/nameservice/NameService
-+sun/net/util/IPAddressUtil
-+java/util/RandomAccessSubList
-+java/util/SubList
-+java/util/SubList$1
-+java/util/AbstractList$ListItr
-+java/net/Inet4Address
-+java/net/InetSocketAddress
-+java/net/SocketAddress
-+java/net/SocksSocketImpl
-+java/net/SocksConsts
-+java/net/PlainSocketImpl
-+java/net/SocketImpl
-+java/net/SocketOptions
-+java/net/SocketException
-+java/net/SocksSocketImpl$5
-+java/net/ProxySelector
-+sun/net/spi/DefaultProxySelector
-+sun/net/spi/DefaultProxySelector$1
-+sun/net/NetProperties
-+sun/net/NetProperties$1
-+sun/net/spi/DefaultProxySelector$NonProxyInfo
-+java/net/Inet6Address
-+java/net/URI
-+java/net/URI$Parser
-+java/net/Proxy
-+java/net/Proxy$Type
-+java/net/ConnectException
-+javax/swing/JMenu
-+javax/swing/MenuElement
-+javax/swing/JMenuItem
-+javax/swing/AbstractButton
-+java/awt/ItemSelectable
-+javax/swing/event/MenuListener
-+javax/swing/JCheckBoxMenuItem
-+javax/swing/Icon
-+javax/swing/JButton
-+java/awt/event/WindowListener
-+java/net/URLClassLoader$2
-+javax/swing/ImageIcon
-+javax/swing/ImageIcon$1
-+java/awt/MediaTracker
-+sun/misc/SoftCache$ValueCell
-+sun/awt/image/URLImageSource
-+sun/awt/image/InputStreamImageSource
-+sun/awt/image/ImageFetchable
-+sun/awt/image/ToolkitImage
-+java/awt/Image$1
-+sun/awt/image/SurfaceManager$ImageAccessor
-+sun/awt/image/SurfaceManager
-+sun/awt/image/NativeLibLoader
-+java/awt/ImageMediaEntry
-+java/awt/MediaEntry
-+sun/awt/image/ImageRepresentation
-+java/awt/image/ImageConsumer
-+sun/awt/image/ImageWatched
-+sun/awt/image/ImageWatched$Link
-+sun/awt/image/ImageWatched$WeakLink
-+sun/awt/image/ImageConsumerQueue
-+sun/awt/image/ImageFetcher
-+sun/awt/image/FetcherInfo
-+sun/awt/image/ImageFetcher$1
-+sun/awt/image/GifImageDecoder
-+sun/awt/image/ImageDecoder
-+sun/awt/image/GifFrame
-+java/awt/image/Raster
-+java/awt/image/DataBufferByte
-+java/awt/image/DataBuffer
-+java/awt/image/PixelInterleavedSampleModel
-+java/awt/image/ComponentSampleModel
-+java/awt/image/SampleModel
-+sun/awt/image/ByteInterleavedRaster
-+sun/awt/image/ByteComponentRaster
-+sun/awt/image/SunWritableRaster
-+java/awt/image/WritableRaster
-+java/awt/image/BufferedImage
-+java/awt/image/WritableRenderedImage
-+java/awt/image/RenderedImage
-+sun/awt/image/IntegerComponentRaster
-+sun/awt/image/BytePackedRaster
-+java/awt/Canvas
-+sun/font/FontDesignMetrics
-+sun/font/FontStrikeDesc
-+sun/font/CompositeStrike
-+sun/font/FontStrikeDisposer
-+sun/font/StrikeCache$SoftDisposerRef
-+sun/font/StrikeCache$DisposableStrike
-+sun/font/TrueTypeFont$TTDisposerRecord
-+sun/font/TrueTypeFont$1
-+java/io/RandomAccessFile
-+java/nio/ByteBufferAsIntBufferB
-+java/nio/IntBuffer
-+sun/font/TrueTypeFont$DirectoryEntry
-+java/nio/ByteBufferAsShortBufferB
-+java/nio/ShortBuffer
-+sun/nio/cs/UTF_16
-+sun/nio/cs/UTF_16$Decoder
-+sun/nio/cs/UnicodeDecoder
-+sun/font/FileFontStrike
-+sun/font/TrueTypeGlyphMapper
-+sun/font/CMap
-+sun/font/CMap$NullCMapClass
-+sun/font/CMap$CMapFormat4
-+java/nio/ByteBufferAsCharBufferB
-+sun/font/FontDesignMetrics$KeyReference
-+sun/awt/image/PNGImageDecoder
-+sun/awt/image/PNGFilterInputStream
-+java/util/zip/InflaterInputStream
-+java/util/zip/Inflater
-+sun/awt/EventQueueItem
-+sun/awt/SunToolkit$3
-+sun/awt/X11/XExposeEvent
-+sun/reflect/UnsafeBooleanFieldAccessorImpl
-+sun/awt/event/IgnorePaintEvent
-+java/awt/image/DataBufferInt
-+java/awt/image/SinglePixelPackedSampleModel
-+sun/awt/image/IntegerInterleavedRaster
-+sun/awt/image/OffScreenImage
-+sun/awt/image/BufImgSurfaceData
-+sun/java2d/opengl/GLXGraphicsConfig
-+sun/java2d/opengl/OGLGraphicsConfig
-+sun/java2d/x11/X11SurfaceData$X11PixmapSurfaceData
-+sun/awt/image/WritableRasterNative
-+sun/awt/image/DataBufferNative
-+sun/java2d/SurfaceManagerFactory
-+sun/java2d/opengl/GLXSurfaceData
-+sun/java2d/opengl/OGLSurfaceData
-+sun/font/CompositeGlyphMapper
-+sun/java2d/loops/FontInfo
-+java/util/Date
-+sun/util/calendar/CalendarSystem
-+sun/util/calendar/Gregorian
-+sun/util/calendar/BaseCalendar
-+sun/util/calendar/AbstractCalendar
-+java/util/TimeZone
-+java/lang/InheritableThreadLocal
-+sun/util/calendar/ZoneInfo
-+sun/util/calendar/ZoneInfoFile
-+sun/util/calendar/ZoneInfoFile$1
-+java/util/TimeZone$1
-+sun/util/calendar/Gregorian$Date
-+sun/util/calendar/BaseCalendar$Date
-+sun/util/calendar/CalendarDate
-+sun/util/calendar/CalendarUtils
-+java/util/TimeZone$DisplayNames
-+sun/util/TimeZoneNameUtility
-+sun/util/resources/TimeZoneNames
-+sun/util/resources/TimeZoneNamesBundle
-+sun/util/resources/TimeZoneNames_en
-+java/util/spi/TimeZoneNameProvider
-+java/lang/ProcessBuilder
-+java/lang/ProcessImpl
-+java/lang/UNIXProcess
-+java/lang/Process
-+java/lang/UNIXProcess$1
-+java/net/ServerSocket
-+java/util/Random
-+java/util/concurrent/atomic/AtomicLong
-+java/lang/InternalError
-+java/io/StringReader
-+java/lang/SecurityException
-+java/io/FilterReader
-+java/lang/reflect/Proxy
-+java/lang/reflect/InvocationHandler
-+java/lang/NoSuchFieldException
-+java/lang/InstantiationException
-+java/lang/ArrayIndexOutOfBoundsException
-+java/lang/IndexOutOfBoundsException
-+javax/swing/JDialog
-+sun/awt/X11/XClipboard
-+sun/awt/datatransfer/SunClipboard
-+java/awt/datatransfer/Clipboard
-+java/awt/datatransfer/SystemFlavorMap
-+java/awt/datatransfer/FlavorMap
-+java/awt/datatransfer/FlavorTable
-+java/awt/datatransfer/SystemFlavorMap$1
-+sun/net/ProgressMonitor
-+sun/net/DefaultProgressMeteringPolicy
-+sun/net/ProgressMeteringPolicy
-+java/awt/datatransfer/SystemFlavorMap$2
-+java/awt/datatransfer/MimeType
-+java/io/Externalizable
-+java/awt/datatransfer/MimeTypeParameterList
-+sun/awt/datatransfer/DataTransferer
-+java/util/Collections$SynchronizedSet
-+java/util/Collections$SynchronizedCollection
-+java/awt/datatransfer/DataFlavor
-+java/awt/datatransfer/DataFlavor$1
-+sun/awt/datatransfer/DataTransferer$CharsetComparator
-+sun/awt/datatransfer/DataTransferer$IndexedComparator
-+sun/nio/cs/UTF_16LE
-+sun/nio/cs/UTF_16BE
-+sun/awt/datatransfer/DataTransferer$DataFlavorComparator
-+java/rmi/Remote
-+sun/awt/datatransfer/DataTransferer$1
-+sun/awt/X11/XDataTransferer
-+sun/awt/datatransfer/ToolkitThreadBlockedHandler
-+javax/imageio/ImageTypeSpecifier
-+sun/awt/X11/XSelection
-+sun/security/action/GetIntegerAction
-+sun/awt/X11/XSelection$IncrementalTransferHandler
-+sun/awt/X11/XSelection$SelectionEventHandler
-+java/awt/datatransfer/Transferable
-+java/io/EOFException
-+java/util/Vector$1
-+java/util/zip/ZipFile$1
-+java/util/zip/ZipFile$2
-+java/util/jar/JarFile$1
-+java/util/PropertyResourceBundle
-+java/util/ResourceBundle$Control$1
-+java/util/Hashtable$EntrySet
-+java/lang/IllegalAccessError
-+java/text/MessageFormat
-+java/text/MessageFormat$Field
-+java/text/Format$Field
-+java/lang/CloneNotSupportedException
-+sun/reflect/MethodAccessorGenerator
-+sun/reflect/AccessorGenerator
-+sun/reflect/ClassFileConstants
-+java/lang/Void
-+sun/reflect/ByteVectorFactory
-+sun/reflect/ByteVectorImpl
-+sun/reflect/ByteVector
-+sun/reflect/ClassFileAssembler
-+sun/reflect/UTF8
-+sun/reflect/Label
-+sun/reflect/Label$PatchInfo
-+sun/reflect/MethodAccessorGenerator$1
-+sun/reflect/ClassDefiner
-+sun/reflect/ClassDefiner$1
-+sun/reflect/BootstrapConstructorAccessorImpl
-+java/awt/event/ActionListener
-+javax/swing/Timer
-+javax/swing/Timer$DoPostEvent
-+javax/swing/TimerQueue
-+javax/swing/TimerQueue$1
-+javax/swing/ToolTipManager
-+java/awt/event/MouseAdapter
-+javax/swing/ToolTipManager$insideTimerAction
-+javax/swing/ToolTipManager$outsideTimerAction
-+javax/swing/ToolTipManager$stillInsideTimerAction
-+sun/swing/UIAction
-+javax/swing/Action
-+javax/swing/ToolTipManager$MoveBeforeEnterListener
-+java/awt/event/MouseMotionAdapter
-+java/util/Hashtable$ValueCollection
-+javax/swing/event/CaretListener
-+javax/swing/JToolBar
-+javax/swing/JSplitPane
-+javax/swing/border/Border
-+javax/swing/JToggleButton
-+javax/swing/border/EmptyBorder
-+javax/swing/border/AbstractBorder
-+javax/swing/DefaultButtonModel
-+javax/swing/ButtonModel
-+javax/swing/AbstractButton$Handler
-+javax/swing/event/ChangeListener
-+java/awt/event/ItemListener
-+javax/swing/plaf/metal/MetalButtonUI
-+javax/swing/plaf/basic/BasicButtonUI
-+javax/swing/plaf/ButtonUI
-+javax/swing/plaf/metal/MetalBorders
-+javax/swing/plaf/BorderUIResource$CompoundBorderUIResource
-+javax/swing/border/CompoundBorder
-+javax/swing/plaf/metal/MetalBorders$ButtonBorder
-+javax/swing/plaf/basic/BasicBorders$MarginBorder
-+javax/swing/plaf/basic/BasicButtonListener
-+java/awt/AWTEventMulticaster
-+java/awt/event/WindowFocusListener
-+java/awt/event/WindowStateListener
-+java/awt/event/AdjustmentListener
-+java/awt/event/TextListener
-+javax/swing/event/AncestorListener
-+java/beans/VetoableChangeListener
-+javax/swing/ButtonGroup
-+javax/swing/JToggleButton$ToggleButtonModel
-+javax/swing/plaf/metal/MetalToggleButtonUI
-+javax/swing/plaf/basic/BasicToggleButtonUI
-+javax/swing/plaf/metal/MetalBorders$ToggleButtonBorder
-+java/awt/CardLayout
-+javax/swing/Box
-+javax/swing/plaf/metal/MetalBorders$TextFieldBorder
-+javax/swing/plaf/metal/MetalBorders$Flush3DBorder
-+javax/swing/BoxLayout
-+javax/swing/JMenuBar
-+javax/swing/DefaultSingleSelectionModel
-+javax/swing/SingleSelectionModel
-+javax/swing/plaf/basic/BasicMenuBarUI
-+javax/swing/plaf/MenuBarUI
-+javax/swing/plaf/basic/DefaultMenuLayout
-+javax/swing/plaf/metal/MetalBorders$MenuBarBorder
-+javax/swing/plaf/basic/BasicMenuBarUI$Handler
-+javax/swing/KeyboardManager
-+javax/swing/event/MenuEvent
-+javax/swing/JMenu$MenuChangeListener
-+javax/swing/JMenuItem$MenuItemFocusListener
-+javax/swing/plaf/basic/BasicMenuUI
-+javax/swing/plaf/basic/BasicMenuItemUI
-+javax/swing/plaf/MenuItemUI
-+javax/swing/plaf/metal/MetalBorders$MenuItemBorder
-+javax/swing/plaf/metal/MetalIconFactory
-+javax/swing/plaf/metal/MetalIconFactory$MenuArrowIcon
-+javax/swing/plaf/basic/BasicMenuUI$Handler
-+javax/swing/event/MenuKeyListener
-+javax/swing/plaf/basic/BasicMenuItemUI$Handler
-+javax/swing/event/MenuDragMouseListener
-+javax/swing/event/MouseInputListener
-+javax/swing/event/ChangeEvent
-+java/awt/event/ContainerEvent
-+javax/swing/plaf/metal/MetalIconFactory$MenuItemArrowIcon
-+javax/swing/JPopupMenu
-+javax/swing/plaf/basic/BasicPopupMenuUI
-+javax/swing/plaf/PopupMenuUI
-+javax/swing/plaf/basic/BasicLookAndFeel$AWTEventHelper
-+java/awt/event/AWTEventListenerProxy
-+java/awt/Toolkit$SelectiveAWTEventListener
-+java/awt/Toolkit$ToolkitEventMulticaster
-+javax/swing/plaf/basic/BasicLookAndFeel$1
-+javax/swing/plaf/metal/MetalBorders$PopupMenuBorder
-+javax/swing/plaf/basic/BasicPopupMenuUI$BasicPopupMenuListener
-+javax/swing/event/PopupMenuListener
-+javax/swing/plaf/basic/BasicPopupMenuUI$BasicMenuKeyListener
-+javax/swing/plaf/basic/BasicPopupMenuUI$MouseGrabber
-+javax/swing/MenuSelectionManager
-+javax/swing/plaf/basic/BasicPopupMenuUI$MenuKeyboardHelper
-+javax/swing/plaf/basic/BasicPopupMenuUI$MenuKeyboardHelper$1
-+java/awt/event/FocusAdapter
-+javax/swing/JMenu$WinListener
-+java/awt/event/WindowAdapter
-+javax/swing/JPopupMenu$Separator
-+javax/swing/JSeparator
-+javax/swing/plaf/metal/MetalPopupMenuSeparatorUI
-+javax/swing/plaf/metal/MetalSeparatorUI
-+javax/swing/plaf/basic/BasicSeparatorUI
-+javax/swing/plaf/SeparatorUI
-+javax/swing/JComboBox
-+javax/swing/event/ListDataListener
-+javax/swing/event/CaretEvent
-+javax/swing/text/TabExpander
-+javax/swing/JScrollBar
-+java/awt/Adjustable
-+javax/swing/event/MouseInputAdapter
-+javax/swing/JScrollBar$ModelListener
-+javax/swing/DefaultBoundedRangeModel
-+javax/swing/BoundedRangeModel
-+javax/swing/plaf/metal/MetalScrollBarUI
-+javax/swing/plaf/basic/BasicScrollBarUI
-+javax/swing/plaf/ScrollBarUI
-+javax/swing/plaf/metal/MetalBumps
-+javax/swing/plaf/metal/MetalScrollButton
-+javax/swing/plaf/basic/BasicArrowButton
-+javax/swing/plaf/basic/BasicScrollBarUI$TrackListener
-+javax/swing/plaf/basic/BasicScrollBarUI$ArrowButtonListener
-+javax/swing/plaf/basic/BasicScrollBarUI$ModelListener
-+javax/swing/plaf/metal/MetalScrollBarUI$ScrollBarListener
-+javax/swing/plaf/basic/BasicScrollBarUI$PropertyChangeHandler
-+javax/swing/plaf/basic/BasicScrollBarUI$Handler
-+javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener
-+javax/swing/CellRendererPane
-+java/util/HashMap$EntryIterator
-+javax/swing/border/MatteBorder
-+sun/font/StandardGlyphVector
-+java/awt/font/GlyphVector
-+sun/font/StandardGlyphVector$GlyphStrike
-+sun/font/CoreMetrics
-+sun/font/FontLineMetrics
-+java/awt/font/LineMetrics
-+javax/swing/ComboBoxModel
-+javax/swing/ListModel
-+javax/swing/ListCellRenderer
-+javax/swing/DefaultComboBoxModel
-+javax/swing/MutableComboBoxModel
-+javax/swing/AbstractListModel
-+javax/swing/JComboBox$1
-+javax/swing/AncestorNotifier
-+javax/swing/plaf/metal/MetalComboBoxUI
-+javax/swing/plaf/basic/BasicComboBoxUI
-+javax/swing/plaf/ComboBoxUI
-+javax/swing/plaf/metal/MetalComboBoxUI$MetalComboBoxLayoutManager
-+javax/swing/plaf/basic/BasicComboBoxUI$ComboBoxLayoutManager
-+javax/swing/plaf/basic/BasicComboPopup
-+javax/swing/plaf/basic/ComboPopup
-+javax/swing/plaf/basic/BasicComboPopup$EmptyListModelClass
-+javax/swing/border/LineBorder
-+javax/swing/plaf/basic/BasicComboPopup$1
-+javax/swing/JList
-+javax/swing/DropMode
-+javax/swing/DefaultListSelectionModel
-+javax/swing/ListSelectionModel
-+javax/swing/plaf/basic/BasicListUI
-+javax/swing/plaf/ListUI
-+javax/swing/plaf/basic/BasicListUI$ListTransferHandler
-+javax/swing/TransferHandler
-+javax/swing/TransferHandler$TransferAction
-+javax/swing/DefaultListCellRenderer$UIResource
-+javax/swing/DefaultListCellRenderer
-+javax/swing/TransferHandler$SwingDropTarget
-+java/awt/dnd/DropTargetContext
-+javax/swing/TransferHandler$DropHandler
-+javax/swing/TransferHandler$TransferSupport
-+javax/swing/plaf/basic/BasicListUI$Handler
-+javax/swing/event/ListSelectionListener
-+javax/swing/plaf/basic/DragRecognitionSupport$BeforeDrag
-+javax/swing/plaf/basic/BasicComboPopup$Handler
-+javax/swing/JScrollPane
-+javax/swing/ScrollPaneConstants
-+javax/swing/ScrollPaneLayout$UIResource
-+javax/swing/ScrollPaneLayout
-+javax/swing/JViewport
-+javax/swing/ViewportLayout
-+javax/swing/plaf/basic/BasicViewportUI
-+javax/swing/plaf/ViewportUI
-+javax/swing/JScrollPane$ScrollBar
-+javax/swing/JViewport$ViewListener
-+java/awt/event/ComponentAdapter
-+javax/swing/plaf/metal/MetalScrollPaneUI
-+javax/swing/plaf/basic/BasicScrollPaneUI
-+javax/swing/plaf/ScrollPaneUI
-+javax/swing/plaf/metal/MetalBorders$ScrollPaneBorder
-+javax/swing/plaf/basic/BasicScrollPaneUI$Handler
-+javax/swing/plaf/metal/MetalScrollPaneUI$1
-+javax/swing/plaf/basic/BasicComboBoxRenderer$UIResource
-+javax/swing/plaf/basic/BasicComboBoxRenderer
-+javax/swing/plaf/metal/MetalComboBoxEditor$UIResource
-+javax/swing/plaf/metal/MetalComboBoxEditor
-+javax/swing/plaf/basic/BasicComboBoxEditor
-+javax/swing/ComboBoxEditor
-+javax/swing/plaf/basic/BasicComboBoxEditor$BorderlessTextField
-+javax/swing/JTextField$NotifyAction
-+javax/swing/text/TextAction
-+javax/swing/AbstractAction
-+javax/swing/text/JTextComponent$MutableCaretEvent
-+javax/swing/plaf/metal/MetalTextFieldUI
-+javax/swing/plaf/basic/BasicTextFieldUI
-+javax/swing/plaf/basic/BasicTextUI
-+javax/swing/text/ViewFactory
-+javax/swing/plaf/TextUI
-+javax/swing/plaf/basic/BasicTextUI$BasicCursor
-+javax/swing/text/DefaultEditorKit
-+javax/swing/text/EditorKit
-+javax/swing/text/DefaultEditorKit$InsertContentAction
-+javax/swing/text/DefaultEditorKit$DeletePrevCharAction
-+javax/swing/text/DefaultEditorKit$DeleteNextCharAction
-+javax/swing/text/DefaultEditorKit$ReadOnlyAction
-+javax/swing/text/DefaultEditorKit$DeleteWordAction
-+javax/swing/text/DefaultEditorKit$WritableAction
-+javax/swing/text/DefaultEditorKit$CutAction
-+javax/swing/text/DefaultEditorKit$CopyAction
-+javax/swing/text/DefaultEditorKit$PasteAction
-+javax/swing/text/DefaultEditorKit$VerticalPageAction
-+javax/swing/text/DefaultEditorKit$PageAction
-+javax/swing/text/DefaultEditorKit$InsertBreakAction
-+javax/swing/text/DefaultEditorKit$BeepAction
-+javax/swing/text/DefaultEditorKit$NextVisualPositionAction
-+javax/swing/text/DefaultEditorKit$BeginWordAction
-+javax/swing/text/DefaultEditorKit$EndWordAction
-+javax/swing/text/DefaultEditorKit$PreviousWordAction
-+javax/swing/text/DefaultEditorKit$NextWordAction
-+javax/swing/text/DefaultEditorKit$BeginLineAction
-+javax/swing/text/DefaultEditorKit$EndLineAction
-+javax/swing/text/DefaultEditorKit$BeginParagraphAction
-+javax/swing/text/DefaultEditorKit$EndParagraphAction
-+javax/swing/text/DefaultEditorKit$BeginAction
-+javax/swing/text/DefaultEditorKit$EndAction
-+javax/swing/text/DefaultEditorKit$DefaultKeyTypedAction
-+javax/swing/text/DefaultEditorKit$InsertTabAction
-+javax/swing/text/DefaultEditorKit$SelectWordAction
-+javax/swing/text/DefaultEditorKit$SelectLineAction
-+javax/swing/text/DefaultEditorKit$SelectParagraphAction
-+javax/swing/text/DefaultEditorKit$SelectAllAction
-+javax/swing/text/DefaultEditorKit$UnselectAction
-+javax/swing/text/DefaultEditorKit$ToggleComponentOrientationAction
-+javax/swing/text/DefaultEditorKit$DumpModelAction
-+javax/swing/plaf/basic/BasicTextUI$TextTransferHandler
-+javax/swing/text/Position$Bias
-+javax/swing/plaf/basic/BasicTextUI$RootView
-+javax/swing/text/View
-+javax/swing/plaf/basic/BasicTextUI$UpdateHandler
-+javax/swing/event/DocumentListener
-+javax/swing/plaf/basic/BasicTextUI$DragListener
-+javax/swing/plaf/basic/BasicComboBoxEditor$UIResource
-+javax/swing/plaf/basic/BasicTextUI$BasicCaret
-+javax/swing/text/DefaultCaret
-+javax/swing/text/Caret
-+javax/swing/text/DefaultCaret$Handler
-+java/awt/datatransfer/ClipboardOwner
-+javax/swing/plaf/basic/BasicTextUI$BasicHighlighter
-+javax/swing/text/DefaultHighlighter
-+javax/swing/text/LayeredHighlighter
-+javax/swing/text/Highlighter
-+javax/swing/text/Highlighter$Highlight
-+javax/swing/text/DefaultHighlighter$DefaultHighlightPainter
-+javax/swing/text/LayeredHighlighter$LayerPainter
-+javax/swing/text/Highlighter$HighlightPainter
-+javax/swing/text/DefaultHighlighter$SafeDamager
-+javax/swing/text/FieldView
-+javax/swing/text/PlainView
-+javax/swing/text/JTextComponent$DefaultKeymap
-+javax/swing/text/Keymap
-+javax/swing/text/JTextComponent$KeymapWrapper
-+javax/swing/text/JTextComponent$KeymapActionMap
-+javax/swing/plaf/basic/BasicTextUI$FocusAction
-+javax/swing/plaf/basic/BasicTextUI$TextActionWrapper
-+javax/swing/JTextArea
-+javax/swing/JEditorPane
-+javax/swing/JTextField$ScrollRepainter
-+javax/swing/plaf/metal/MetalComboBoxEditor$1
-+javax/swing/plaf/metal/MetalComboBoxEditor$EditorBorder
-+javax/swing/plaf/metal/MetalComboBoxUI$MetalPropertyChangeListener
-+javax/swing/plaf/basic/BasicComboBoxUI$PropertyChangeHandler
-+javax/swing/plaf/basic/BasicComboBoxUI$Handler
-+javax/swing/plaf/metal/MetalComboBoxButton
-+javax/swing/plaf/metal/MetalComboBoxIcon
-+javax/swing/plaf/metal/MetalComboBoxButton$1
-+javax/swing/plaf/basic/BasicComboBoxUI$DefaultKeySelectionManager
-+javax/swing/JComboBox$KeySelectionManager
-+javax/swing/JToolBar$DefaultToolBarLayout
-+javax/swing/plaf/metal/MetalToolBarUI
-+javax/swing/plaf/basic/BasicToolBarUI
-+javax/swing/plaf/ToolBarUI
-+javax/swing/plaf/metal/MetalBorders$ToolBarBorder
-+javax/swing/plaf/metal/MetalLookAndFeel$MetalLazyValue$1
-+javax/swing/plaf/metal/MetalBorders$RolloverButtonBorder
-+javax/swing/plaf/metal/MetalBorders$RolloverMarginBorder
-+javax/swing/plaf/basic/BasicBorders$RadioButtonBorder
-+javax/swing/plaf/basic/BasicBorders$ButtonBorder
-+javax/swing/plaf/basic/BasicBorders$RolloverMarginBorder
-+javax/swing/plaf/metal/MetalToolBarUI$MetalDockingListener
-+javax/swing/plaf/basic/BasicToolBarUI$DockingListener
-+javax/swing/plaf/basic/BasicToolBarUI$Handler
-+javax/swing/border/EtchedBorder
-+javax/swing/JToolBar$Separator
-+javax/swing/plaf/basic/BasicToolBarSeparatorUI
-+java/applet/Applet
-+java/awt/Panel
-+com/sun/awt/AWTUtilities
-+javax/swing/KeyboardManager$ComponentKeyStrokePair
-+sun/awt/EmbeddedFrame
-+sun/awt/im/InputMethodContext
-+java/awt/im/spi/InputMethodContext
-+sun/awt/im/InputContext
-+sun/awt/im/InputMethodManager
-+sun/awt/im/ExecutableInputMethodManager
-+sun/awt/X11/XInputMethodDescriptor
-+sun/awt/X11InputMethodDescriptor
-+java/awt/im/spi/InputMethodDescriptor
-+sun/awt/im/InputMethodLocator
-+sun/awt/im/ExecutableInputMethodManager$2
-+sun/misc/Service
-+sun/misc/Service$LazyIterator
-+java/util/TreeSet
-+java/util/NavigableSet
-+java/util/SortedSet
-+javax/swing/SizeRequirements
-+javax/swing/plaf/basic/BasicGraphicsUtils
-+java/awt/event/AdjustmentEvent
-+java/awt/MenuBar
-+sun/awt/X11/XComponentPeer$2
-+java/awt/SequencedEvent
-+java/beans/PropertyVetoException
-+java/awt/DefaultKeyboardFocusManager$TypeAheadMarker
-+java/awt/KeyboardFocusManager$HeavyweightFocusRequest
-+java/awt/KeyboardFocusManager$LightweightFocusRequest
-+sun/awt/KeyboardFocusManagerPeerImpl
-+sun/awt/SunToolkit$7
-+java/awt/Window$1DisposeAction
-+java/awt/LightweightDispatcher$2
-+sun/awt/X11/XReparentEvent
-+sun/awt/X11/XWindowAttributes
-+sun/awt/X11/XFocusChangeEvent
-+sun/awt/X11/XComponentPeer$1
-+sun/awt/X11/XUnmapEvent
-+java/io/StringWriter
-+javax/swing/JWindow
-+java/io/UnsupportedEncodingException
-+java/net/UnknownHostException
-+java/nio/channels/SocketChannel
-+java/nio/channels/spi/AbstractSelectableChannel
-+java/nio/channels/SelectableChannel
-+java/net/SocketImplFactory
-+javax/swing/UnsupportedLookAndFeelException
-+java/lang/UnsatisfiedLinkError
-+javax/swing/Box$Filler
-+javax/swing/JComponent$2
-+sun/net/www/MimeTable
-+java/net/FileNameMap
-+sun/net/www/MimeTable$1
-+sun/net/www/MimeEntry
-+java/net/URLConnection$1
-+java/text/SimpleDateFormat
-+java/text/DateFormat
-+java/text/DateFormat$Field
-+java/util/Calendar
-+java/util/GregorianCalendar
-+sun/util/resources/CalendarData
-+sun/util/resources/CalendarData_en
-+java/text/DateFormatSymbols
-+java/text/spi/DateFormatSymbolsProvider
-+java/text/DontCareFieldPosition
-+java/text/DontCareFieldPosition$1
-+java/text/Format$FieldDelegate
-+javax/swing/plaf/BorderUIResource
-+javax/swing/BorderFactory
-+javax/swing/border/BevelBorder
-+javax/swing/plaf/metal/MetalIconFactory$TreeFolderIcon
-+javax/swing/plaf/metal/MetalIconFactory$FolderIcon16
-+java/util/zip/ZipInputStream
-+java/io/PushbackInputStream
-+java/util/zip/CRC32
-+java/util/zip/Checksum
-+java/lang/Thread$State
-+javax/swing/SwingUtilities$SharedOwnerFrame
-+javax/swing/JTable
-+javax/swing/event/TableModelListener
-+javax/swing/event/TableColumnModelListener
-+javax/swing/event/CellEditorListener
-+javax/swing/event/RowSorterListener
-+javax/swing/BufferStrategyPaintManager$BufferInfo
-+java/awt/Component$BltSubRegionBufferStrategy
-+sun/awt/SubRegionShowable
-+java/awt/Component$BltBufferStrategy
-+sun/awt/image/SunVolatileImage
-+sun/awt/image/BufferedImageGraphicsConfig
-+sun/print/PrinterGraphicsConfig
-+sun/java2d/x11/X11VolatileSurfaceManager
-+sun/awt/image/VolatileSurfaceManager
-+java/awt/print/PrinterGraphics
-+java/awt/PrintGraphics
-+java/awt/GraphicsCallback$PaintCallback
-+java/awt/GraphicsCallback
-+sun/awt/SunGraphicsCallback
-+javax/swing/JRadioButton
-+java/lang/ClassFormatError
-+javax/swing/JTabbedPane
-+javax/swing/JTabbedPane$ModelListener
-+javax/swing/plaf/metal/MetalTabbedPaneUI
-+javax/swing/plaf/basic/BasicTabbedPaneUI
-+javax/swing/plaf/TabbedPaneUI
-+javax/swing/plaf/metal/MetalTabbedPaneUI$TabbedPaneLayout
-+javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneLayout
-+javax/swing/plaf/basic/BasicTabbedPaneUI$TabbedPaneScrollLayout
-+javax/swing/plaf/basic/BasicTabbedPaneUI$Handler
-+sun/swing/ImageIconUIResource
-+javax/swing/GrayFilter
-+java/awt/image/RGBImageFilter
-+java/awt/image/ImageFilter
-+java/awt/image/FilteredImageSource
-+org/w3c/dom/Node
-+org/xml/sax/SAXException
-+javax/xml/parsers/ParserConfigurationException
-+org/xml/sax/EntityResolver
-+java/security/NoSuchAlgorithmException
-+java/security/GeneralSecurityException
-+java/util/zip/GZIPInputStream
-+java/util/zip/DeflaterOutputStream
-+org/xml/sax/InputSource
-+javax/xml/parsers/DocumentBuilderFactory
-+javax/xml/parsers/FactoryFinder
-+javax/xml/parsers/SecuritySupport
-+javax/xml/parsers/SecuritySupport$2
-+javax/xml/parsers/SecuritySupport$5
-+javax/xml/parsers/SecuritySupport$1
-+javax/xml/parsers/SecuritySupport$4
-+javax/xml/parsers/DocumentBuilder
-+org/w3c/dom/Document
-+org/xml/sax/helpers/DefaultHandler
-+org/xml/sax/DTDHandler
-+org/xml/sax/ContentHandler
-+org/xml/sax/ErrorHandler
-+org/xml/sax/SAXNotSupportedException
-+org/xml/sax/Locator
-+org/xml/sax/SAXNotRecognizedException
-+org/xml/sax/SAXParseException
-+org/w3c/dom/NodeList
-+org/w3c/dom/events/EventTarget
-+org/w3c/dom/traversal/DocumentTraversal
-+org/w3c/dom/events/DocumentEvent
-+org/w3c/dom/ranges/DocumentRange
-+org/w3c/dom/Entity
-+org/w3c/dom/Element
-+org/w3c/dom/CharacterData
-+org/w3c/dom/CDATASection
-+org/w3c/dom/Text
-+org/xml/sax/AttributeList
-+org/w3c/dom/DOMException
-+org/w3c/dom/Notation
-+org/w3c/dom/DocumentType
-+org/w3c/dom/Attr
-+org/w3c/dom/EntityReference
-+org/w3c/dom/ProcessingInstruction
-+org/w3c/dom/Comment
-+org/w3c/dom/DocumentFragment
-+org/w3c/dom/events/Event
-+org/w3c/dom/events/MutationEvent
-+org/w3c/dom/traversal/TreeWalker
-+org/w3c/dom/ranges/Range
-+org/w3c/dom/traversal/NodeIterator
-+org/w3c/dom/events/EventException
-+org/w3c/dom/NamedNodeMap
-+java/lang/StringIndexOutOfBoundsException
-+java/awt/GridLayout
-+javax/swing/plaf/metal/MetalRadioButtonUI
-+javax/swing/plaf/basic/BasicRadioButtonUI
-+javax/swing/plaf/basic/BasicBorders
-+javax/swing/plaf/metal/MetalIconFactory$RadioButtonIcon
-+java/awt/event/ItemEvent
-+java/awt/CardLayout$Card
-+javax/swing/JCheckBox
-+javax/swing/event/ListSelectionEvent
-+javax/swing/plaf/metal/MetalCheckBoxUI
-+javax/swing/plaf/metal/MetalIconFactory$CheckBoxIcon
-+java/lang/ExceptionInInitializerError
-+com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI
-+javax/swing/JProgressBar
-+javax/swing/JProgressBar$ModelListener
-+javax/swing/plaf/metal/MetalProgressBarUI
-+javax/swing/plaf/basic/BasicProgressBarUI
-+javax/swing/plaf/ProgressBarUI
-+javax/swing/plaf/BorderUIResource$LineBorderUIResource
-+javax/swing/plaf/basic/BasicProgressBarUI$Handler
-+javax/swing/tree/TreeModel
-+javax/swing/table/TableCellRenderer
-+javax/swing/table/JTableHeader
-+javax/swing/event/TreeExpansionListener
-+javax/swing/table/AbstractTableModel
-+javax/swing/table/TableModel
-+javax/swing/table/DefaultTableCellRenderer
-+javax/swing/JTree
-+javax/swing/tree/TreeSelectionModel
-+javax/swing/tree/DefaultTreeCellRenderer
-+javax/swing/tree/TreeCellRenderer
-+javax/swing/table/TableCellEditor
-+javax/swing/CellEditor
-+javax/swing/JToolTip
-+javax/swing/table/TableColumn
-+javax/swing/table/DefaultTableColumnModel
-+javax/swing/table/TableColumnModel
-+javax/swing/table/DefaultTableModel
-+javax/swing/event/TableModelEvent
-+sun/swing/table/DefaultTableCellHeaderRenderer
-+javax/swing/plaf/basic/BasicTableHeaderUI
-+javax/swing/plaf/TableHeaderUI
-+javax/swing/plaf/basic/BasicTableHeaderUI$1
-+javax/swing/plaf/basic/BasicTableHeaderUI$MouseInputHandler
-+javax/swing/DefaultCellEditor
-+javax/swing/tree/TreeCellEditor
-+javax/swing/AbstractCellEditor
-+javax/swing/plaf/basic/BasicTableUI
-+javax/swing/plaf/TableUI
-+javax/swing/plaf/basic/BasicTableUI$TableTransferHandler
-+javax/swing/plaf/basic/BasicTableUI$Handler
-+javax/swing/tree/DefaultTreeSelectionModel
-+javax/swing/tree/TreePath
-+javax/swing/plaf/metal/MetalTreeUI
-+javax/swing/plaf/basic/BasicTreeUI
-+javax/swing/plaf/TreeUI
-+javax/swing/plaf/basic/BasicTreeUI$Actions
-+javax/swing/plaf/basic/BasicTreeUI$TreeTransferHandler
-+javax/swing/plaf/metal/MetalTreeUI$LineListener
-+javax/swing/plaf/basic/BasicTreeUI$Handler
-+javax/swing/event/TreeModelListener
-+javax/swing/event/TreeSelectionListener
-+javax/swing/event/SwingPropertyChangeSupport
-+javax/swing/tree/VariableHeightLayoutCache
-+javax/swing/tree/AbstractLayoutCache
-+javax/swing/tree/RowMapper
-+javax/swing/plaf/basic/BasicTreeUI$NodeDimensionsHandler
-+javax/swing/tree/AbstractLayoutCache$NodeDimensions
-+javax/swing/JTree$TreeModelHandler
-+javax/swing/tree/VariableHeightLayoutCache$TreeStateNode
-+javax/swing/tree/DefaultMutableTreeNode
-+javax/swing/tree/MutableTreeNode
-+javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration
-+javax/swing/event/TableColumnModelEvent
-+java/text/ParseException
-+java/text/NumberFormat$Field
-+javax/swing/event/UndoableEditListener
-+javax/swing/filechooser/FileFilter
-+javax/swing/tree/DefaultTreeModel
-+javax/swing/tree/DefaultTreeCellEditor
-+javax/swing/tree/DefaultTreeCellEditor$1
-+javax/swing/tree/DefaultTreeCellEditor$DefaultTextField
-+javax/swing/DefaultCellEditor$1
-+javax/swing/DefaultCellEditor$EditorDelegate
-+javax/swing/tree/DefaultTreeCellEditor$EditorContainer
-+javax/swing/JTree$TreeSelectionRedirector
-+javax/swing/event/TreeModelEvent
-+javax/swing/plaf/metal/MetalSplitPaneUI
-+javax/swing/plaf/basic/BasicSplitPaneUI
-+javax/swing/plaf/SplitPaneUI
-+javax/swing/plaf/basic/BasicSplitPaneDivider
-+javax/swing/plaf/basic/BasicBorders$SplitPaneBorder
-+javax/swing/plaf/metal/MetalSplitPaneDivider
-+javax/swing/plaf/basic/BasicSplitPaneDivider$DividerLayout
-+javax/swing/plaf/basic/BasicSplitPaneDivider$MouseHandler
-+javax/swing/plaf/basic/BasicBorders$SplitPaneDividerBorder
-+javax/swing/plaf/basic/BasicSplitPaneUI$BasicHorizontalLayoutManager
-+javax/swing/plaf/basic/BasicSplitPaneUI$1
-+javax/swing/plaf/basic/BasicSplitPaneUI$Handler
-+javax/swing/plaf/metal/MetalSplitPaneDivider$1
-+javax/swing/plaf/basic/BasicSplitPaneDivider$OneTouchActionHandler
-+javax/swing/plaf/metal/MetalSplitPaneDivider$2
-+javax/swing/border/TitledBorder
-+javax/swing/plaf/basic/BasicTextAreaUI
-+java/util/Collections$UnmodifiableCollection$1
-+java/io/InterruptedIOException
-+java/net/NoRouteToHostException
-+java/net/BindException
-+javax/swing/tree/PathPlaceHolder
-+javax/swing/event/TreeSelectionEvent
-+javax/swing/JList$3
-+javax/swing/JList$ListSelectionHandler
-+javax/swing/JSlider
-+javax/swing/JSlider$ModelListener
-+javax/swing/plaf/metal/MetalSliderUI
-+javax/swing/plaf/basic/BasicSliderUI
-+javax/swing/plaf/SliderUI
-+javax/swing/plaf/basic/BasicSliderUI$Actions
-+javax/swing/plaf/metal/MetalIconFactory$HorizontalSliderThumbIcon
-+javax/swing/plaf/metal/MetalIconFactory$VerticalSliderThumbIcon
-+javax/swing/plaf/basic/BasicSliderUI$TrackListener
-+javax/swing/plaf/basic/BasicSliderUI$Handler
-+javax/swing/plaf/basic/BasicSliderUI$ScrollListener
-+javax/swing/plaf/metal/MetalSliderUI$MetalPropertyListener
-+javax/swing/plaf/basic/BasicSliderUI$PropertyChangeHandler
-+sun/java2d/HeadlessGraphicsEnvironment
-+java/util/Hashtable$KeySet
-+java/awt/FontFormatException
-+sun/font/Type1Font$1
-+java/nio/channels/FileChannel$MapMode
-+sun/nio/ch/FileChannelImpl$Unmapper
-+sun/nio/ch/Util$3
-+java/nio/DirectByteBufferR
-+java/nio/charset/Charset$3
-+sun/nio/cs/AbstractCharsetProvider
-+sun/nio/cs/SingleByteDecoder
-+java/lang/CharacterData00
-+javax/swing/DefaultListModel
-+javax/swing/event/ListDataEvent
-+javax/sound/sampled/DataLine
-+javax/sound/sampled/Line
-+javax/sound/sampled/Line$Info
-+javax/sound/sampled/DataLine$Info
-+javax/sound/sampled/Control$Type
-+javax/sound/sampled/FloatControl$Type
-+javax/sound/sampled/LineUnavailableException
-+javax/sound/sampled/UnsupportedAudioFileException
-+javax/swing/JRadioButtonMenuItem
-+javax/swing/JMenuItem$AccessibleJMenuItem
-+javax/swing/AbstractButton$AccessibleAbstractButton
-+javax/accessibility/AccessibleAction
-+javax/accessibility/AccessibleValue
-+javax/accessibility/AccessibleText
-+javax/accessibility/AccessibleExtendedComponent
-+javax/accessibility/AccessibleComponent
-+javax/swing/JComponent$AccessibleJComponent
-+java/awt/Container$AccessibleAWTContainer
-+java/awt/Component$AccessibleAWTComponent
-+javax/accessibility/AccessibleRelationSet
-+javax/accessibility/AccessibleState
-+javax/accessibility/AccessibleBundle
-+javax/swing/plaf/basic/BasicCheckBoxMenuItemUI
-+javax/swing/plaf/metal/MetalIconFactory$CheckBoxMenuItemIcon
-+javax/swing/JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem
-+javax/swing/plaf/basic/BasicRadioButtonMenuItemUI
-+javax/swing/plaf/metal/MetalIconFactory$RadioButtonMenuItemIcon
-+sun/awt/image/ImageDecoder$1
-+javax/swing/JTabbedPane$Page
-+java/net/DatagramSocket
-+java/net/MulticastSocket
-+java/net/DatagramPacket
-+sun/net/InetAddressCachePolicy
-+sun/net/InetAddressCachePolicy$1
-+sun/net/InetAddressCachePolicy$2
-+java/net/InetAddress$CacheEntry
-+java/net/PlainDatagramSocketImpl
-+java/net/DatagramSocketImpl
-+java/net/NetworkInterface
-+java/net/InterfaceAddress
-+java/text/Collator
-+java/text/spi/CollatorProvider
-+sun/text/resources/CollationData
-+sun/text/resources/CollationData_en
-+sun/util/EmptyListResourceBundle
-+java/text/RuleBasedCollator
-+java/text/CollationRules
-+java/text/RBCollationTables
-+java/text/RBTableBuilder
-+java/text/RBCollationTables$BuildAPI
-+sun/text/IntHashtable
-+sun/text/UCompactIntArray
-+sun/text/normalizer/NormalizerImpl
-+sun/text/normalizer/ICUData
-+sun/text/normalizer/NormalizerDataReader
-+sun/text/normalizer/ICUBinary$Authenticate
-+sun/text/normalizer/ICUBinary
-+sun/text/normalizer/NormalizerImpl$FCDTrieImpl
-+sun/text/normalizer/Trie$DataManipulate
-+sun/text/normalizer/NormalizerImpl$NormTrieImpl
-+sun/text/normalizer/NormalizerImpl$AuxTrieImpl
-+sun/text/normalizer/IntTrie
-+sun/text/normalizer/Trie
-+sun/text/normalizer/CharTrie
-+sun/text/normalizer/CharTrie$FriendAgent
-+sun/text/normalizer/UnicodeSet
-+sun/text/normalizer/UnicodeMatcher
-+sun/text/normalizer/NormalizerImpl$DecomposeArgs
-+java/text/MergeCollation
-+java/text/PatternEntry$Parser
-+java/text/PatternEntry
-+java/text/EntryPair
-+sun/text/ComposedCharIter
-+sun/text/normalizer/UTF16
-+sun/net/www/protocol/http/Handler
-+java/io/ObjectInputStream$BlockDataInputStream
-+java/io/ObjectInputStream$PeekInputStream
-+java/io/ObjectInputStream$HandleTable
-+java/io/ObjectInputStream$ValidationList
-+java/io/Bits
-+java/io/ObjectStreamClass$Caches
-+java/io/ObjectStreamClass$WeakClassKey
-+java/io/ObjectStreamClass$EntryFuture
-+java/io/ObjectStreamClass$2
-+sun/reflect/SerializationConstructorAccessorImpl
-+java/io/ObjectStreamClass$FieldReflectorKey
-+java/io/ObjectStreamClass$FieldReflector
-+java/io/ObjectStreamClass$1
-+java/io/DataOutputStream
-+java/io/ObjectStreamClass$MemberSignature
-+java/io/ObjectStreamClass$3
-+java/io/ObjectStreamClass$4
-+java/io/ObjectStreamClass$5
-+java/security/MessageDigest
-+java/security/MessageDigestSpi
-+sun/security/jca/GetInstance
-+sun/security/jca/Providers
-+sun/security/jca/ProviderList
-+sun/security/jca/ProviderConfig
-+sun/security/jca/ProviderList$3
-+sun/security/jca/ProviderList$1
-+sun/security/jca/ProviderList$2
-+sun/security/jca/ProviderConfig$1
-+sun/security/jca/ProviderConfig$3
-+java/security/Provider$Service
-+java/security/Provider$UString
-+sun/security/provider/SHA
-+sun/security/provider/DigestBase
-+sun/security/jca/GetInstance$Instance
-+java/security/MessageDigest$Delegate
-+sun/security/provider/ByteArrayAccess
-+java/io/ObjectStreamClass$ClassDataSlot
-+sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl
-+java/security/SignatureException
-+java/security/InvalidKeyException
-+java/security/KeyException
-+java/security/Signature
-+java/security/SignatureSpi
-+java/io/ObjectOutputStream$BlockDataOutputStream
-+sun/security/provider/DSAPublicKey
-+java/security/interfaces/DSAPublicKey
-+java/security/interfaces/DSAKey
-+java/security/PublicKey
-+java/security/Key
-+sun/security/x509/X509Key
-+java/io/ObjectOutputStream$HandleTable
-+java/io/ObjectOutputStream$ReplaceTable
-+sun/security/x509/AlgorithmId
-+sun/security/util/DerEncoder
-+sun/security/util/BitArray
-+sun/security/util/DerOutputStream
-+sun/security/util/DerValue
-+java/math/BigInteger
-+java/security/interfaces/DSAParams
-+sun/security/util/DerInputStream
-+sun/security/util/DerInputBuffer
-+sun/security/util/ObjectIdentifier
-+java/security/AlgorithmParameters
-+java/security/AlgorithmParametersSpi
-+sun/security/provider/DSAParameters
-+sun/security/util/ByteArrayLexOrder
-+sun/security/util/ByteArrayTagOrder
-+sun/security/util/DerIndefLenConverter
-+java/io/InvalidClassException
-+java/io/ObjectStreamException
-+java/io/ObjectInputStream$GetFieldImpl
-+java/io/ObjectInputStream$GetField
-+sun/security/jca/ServiceId
-+sun/security/jca/ProviderList$ServiceList
-+sun/security/jca/ProviderList$ServiceList$1
-+java/security/Signature$Delegate
-+java/security/interfaces/DSAPrivateKey
-+java/security/PrivateKey
-+sun/security/provider/DSA$SHA1withDSA
-+sun/security/provider/DSA
-+java/security/spec/DSAParameterSpec
-+java/security/spec/AlgorithmParameterSpec
-+java/math/MutableBigInteger
-+java/math/SignedMutableBigInteger
-+java/awt/EventQueue$1AWTInvocationLock
-+java/awt/Component$FlipBufferStrategy
-+java/awt/SentEvent
-+sun/awt/X11/XDestroyWindowEvent
-+sun/awt/X11/XDropTargetRegistry
-+sun/awt/X11/XEmbeddedFramePeer
-+sun/awt/X11/XDragAndDropProtocols
-+sun/awt/X11/XDropTargetContextPeer
-+sun/awt/dnd/SunDropTargetContextPeer
-+java/awt/dnd/peer/DropTargetContextPeer
-+sun/awt/X11/XDropTargetContextPeer$XDropTargetProtocolListenerImpl
-+sun/awt/X11/XDropTargetProtocolListener
-+sun/awt/X11/XDnDDragSourceProtocol
-+sun/awt/X11/XDragSourceProtocol
-+sun/awt/X11/MotifDnDDragSourceProtocol
-+sun/awt/X11/XDnDDropTargetProtocol
-+sun/awt/X11/XDropTargetProtocol
-+sun/awt/X11/MotifDnDDropTargetProtocol
-+sun/awt/X11/XDnDConstants
-+sun/awt/X11/MotifDnDConstants
-+javax/swing/JTable$2
-+javax/swing/JTable$Resizable3
-+javax/swing/JTable$Resizable2
-+javax/swing/JTable$5
-+javax/swing/event/AncestorEvent
-+sun/font/FontDesignMetrics$MetricsKey
-+java/awt/geom/Line2D$Float
-+java/awt/geom/Line2D
-+com/sun/java/swing/plaf/gtk/GTKLookAndFeel
-+javax/swing/plaf/synth/SynthLookAndFeel
-+javax/swing/plaf/synth/DefaultSynthStyleFactory
-+javax/swing/plaf/synth/SynthStyleFactory
-+sun/swing/BakedArrayList
-+javax/swing/plaf/synth/SynthLookAndFeel$Handler
-+javax/swing/plaf/synth/SynthDefaultLookup
-+com/sun/java/swing/plaf/gtk/GTKEngine
-+com/sun/java/swing/plaf/gtk/GTKEngine$Settings
-+com/sun/java/swing/plaf/gtk/GTKStyleFactory
-+com/sun/java/swing/plaf/gtk/PangoFonts
-+com/sun/java/swing/plaf/gtk/GTKLookAndFeel$WeakPCL
-+javax/swing/plaf/synth/Region
-+javax/swing/plaf/synth/SynthLookAndFeel$AATextListener
-+com/sun/java/swing/plaf/gtk/GTKRegion
-+com/sun/java/swing/plaf/gtk/GTKStyle
-+com/sun/java/swing/plaf/gtk/GTKConstants
-+javax/swing/plaf/synth/SynthStyle
-+javax/swing/plaf/synth/SynthGraphicsUtils
-+com/sun/java/swing/plaf/gtk/GTKGraphicsUtils
-+com/sun/java/swing/plaf/gtk/GTKStyle$GTKStockIcon
-+sun/swing/plaf/synth/SynthIcon
-+com/sun/java/swing/plaf/gtk/GTKColorType
-+javax/swing/plaf/synth/ColorType
-+com/sun/java/swing/plaf/gtk/resources/gtk
-+com/sun/swing/internal/plaf/synth/resources/synth
-+com/sun/java/swing/plaf/gtk/GTKStyle$GTKLazyValue
-+com/sun/java/swing/plaf/gtk/GTKLookAndFeel$1FontLazyValue
-+com/sun/java/swing/plaf/gtk/GTKLookAndFeel$2
-+com/sun/java/swing/plaf/gtk/GTKLookAndFeel$3
-+javax/swing/plaf/synth/SynthPanelUI
-+javax/swing/plaf/synth/SynthConstants
-+javax/swing/plaf/synth/SynthContext
-+javax/swing/plaf/synth/SynthBorder
-+javax/swing/plaf/synth/SynthRootPaneUI
-+javax/swing/plaf/synth/SynthLabelUI
-+javax/swing/plaf/synth/SynthButtonUI
-+javax/swing/plaf/synth/SynthToggleButtonUI
-+javax/swing/plaf/basic/BasicBorders$FieldBorder
-+javax/swing/plaf/synth/SynthMenuBarUI
-+javax/swing/plaf/synth/SynthMenuUI
-+javax/swing/plaf/synth/SynthUI
-+com/sun/java/swing/plaf/gtk/GTKIconFactory
-+com/sun/java/swing/plaf/gtk/GTKIconFactory$MenuArrowIcon
-+com/sun/java/swing/plaf/gtk/GTKIconFactory$DelegatingIcon
-+com/sun/java/swing/plaf/gtk/GTKConstants$ArrowType
-+javax/swing/plaf/basic/BasicIconFactory
-+javax/swing/plaf/basic/BasicIconFactory$MenuItemCheckIcon
-+javax/swing/plaf/synth/SynthMenuItemUI
-+javax/swing/plaf/synth/SynthPopupMenuUI
-+javax/swing/plaf/synth/SynthSeparatorUI
-+javax/swing/plaf/synth/SynthScrollBarUI
-+javax/swing/plaf/synth/SynthArrowButton
-+javax/swing/plaf/synth/SynthArrowButton$SynthArrowButtonUI
-+javax/swing/plaf/synth/SynthComboBoxUI
-+javax/swing/plaf/synth/SynthComboPopup
-+javax/swing/plaf/synth/SynthListUI
-+javax/swing/plaf/synth/SynthListUI$SynthListCellRenderer
-+javax/swing/plaf/synth/SynthViewportUI
-+javax/swing/plaf/synth/SynthScrollPaneUI
-+javax/swing/plaf/synth/SynthScrollPaneUI$ViewportBorder
-+javax/swing/plaf/synth/SynthComboBoxUI$SynthComboBoxRenderer
-+javax/swing/plaf/synth/SynthComboBoxUI$SynthComboBoxEditor
-+javax/swing/plaf/synth/SynthTextFieldUI
-+javax/swing/plaf/synth/SynthToolBarUI
-+javax/swing/plaf/synth/SynthToolBarUI$SynthToolBarLayoutManager
-+com/sun/java/swing/plaf/gtk/GTKIconFactory$ToolBarHandleIcon
-+com/sun/java/swing/plaf/gtk/GTKConstants$Orientation
-+sun/awt/X11/XTranslateCoordinates
-+com/sun/java/swing/plaf/gtk/GTKPainter
-+javax/swing/plaf/synth/SynthPainter
-+javax/swing/plaf/synth/SynthPainter$1
-+com/sun/java/swing/plaf/gtk/GTKConstants$PositionType
-+com/sun/java/swing/plaf/gtk/GTKConstants$ShadowType
-+java/io/ObjectInputStream$HandleTable$HandleList
-+sun/java2d/pipe/ShapeSpanIterator
-+sun/java2d/pipe/SpanIterator
-+sun/dc/path/PathConsumer
-+sun/dc/pr/PathStroker
-+sun/dc/pr/PathDasher
-+java/awt/geom/LineIterator
-+java/awt/geom/PathIterator
-+sun/applet/Main
-+sun/applet/AppletMessageHandler
-+sun/applet/resources/MsgAppletViewer
-+sun/applet/AppletSecurity
-+sun/awt/AWTSecurityManager
-+java/lang/SecurityManager
-+java/security/DomainCombiner
-+sun/applet/AppletSecurity$1
-+java/lang/SecurityManager$1
-+java/security/SecurityPermission
-+java/util/PropertyPermission
-+sun/applet/AppletViewer
-+java/applet/AppletContext
-+java/awt/print/Printable
-+sun/security/util/SecurityConstants
-+java/awt/AWTPermission
-+java/net/NetPermission
-+java/net/SocketPermission
-+javax/security/auth/AuthPermission
-+java/lang/Thread$1
-+java/util/logging/LogManager$5
-+sun/applet/StdAppletViewerFactory
-+sun/applet/AppletViewerFactory
-+sun/applet/AppletViewer$UserActionListener
-+sun/applet/AppletViewerPanel
-+sun/applet/AppletPanel
-+java/applet/AppletStub
-+sun/misc/MessageUtils
-+sun/applet/AppletPanel$10
-+java/security/Policy$1
-+sun/security/provider/PolicyFile$1
-+sun/security/provider/PolicyFile$3
-+sun/security/util/PropertyExpander
-+sun/security/provider/PolicyParser
-+sun/security/util/PolicyUtil
-+sun/security/provider/PolicyParser$GrantEntry
-+sun/security/provider/PolicyParser$PermissionEntry
-+sun/security/provider/PolicyFile$PolicyEntry
-+sun/security/provider/PolicyFile$6
-+sun/security/provider/PolicyFile$7
-+java/net/SocketPermissionCollection
-+java/util/PropertyPermissionCollection
-+sun/applet/AppletPanel$9
-+sun/applet/AppletClassLoader
-+sun/applet/AppletThreadGroup
-+sun/applet/AppContextCreator
-+sun/applet/AppletPanel$1
-+sun/awt/X11/XMenuBarPeer
-+java/awt/peer/MenuBarPeer
-+java/awt/peer/MenuComponentPeer
-+sun/awt/X11/XBaseMenuWindow
-+sun/awt/X11/XMenuPeer
-+java/awt/peer/MenuPeer
-+java/awt/peer/MenuItemPeer
-+sun/awt/X11/XMenuItemPeer
-+java/awt/MenuShortcut
-+sun/awt/X11/XMenuWindow
-+sun/awt/X11/XMenuItemPeer$TextMetrics
-+sun/awt/AppContext$3
-+sun/awt/X11/XMenuBarPeer$MappingData
-+sun/awt/X11/XBaseMenuWindow$MappingData
-+sun/applet/AppletViewer$1
-+sun/applet/AppletViewer$1AppletEventListener
-+sun/applet/AppletListener
-+sun/applet/AppletEventMulticaster
-+sun/misc/Queue
-+sun/misc/QueueElement
-+sun/applet/AppletEvent
-+sun/applet/AppletClassLoader$1
-+sun/awt/X11/XBaseMenuWindow$3
-+java/awt/DefaultKeyboardFocusManager$DefaultKeyboardFocusManagerSentEvent
-+sun/awt/CausedFocusEvent
-+sun/awt/X11/XWindow$1
-+java/net/URLClassLoader$4
-+sun/applet/AppletClassLoader$2
-+javax/swing/JApplet
-+java/lang/ClassLoader$1
-+sun/security/provider/PolicyFile$5
-+java/security/PermissionsEnumerator
-+java/util/Collections$1
-+sun/applet/AppletPanel$11
-+sun/applet/AppletPanel$8
-+sun/applet/AppletPanel$2
-+sun/applet/AppletPanel$3
-+sun/applet/AppletPanel$6
-+javax/swing/BufferStrategyPaintManager$1
-+# f3ac8b467e7f8c49
---- ./jdk/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java 2013-09-06 11:27:48.000000000 -0700
-+++ ./jdk/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java 2014-07-15 21:49:29.000000000 -0700
-@@ -31,6 +31,7 @@
- import javax.swing.*;
- import javax.swing.plaf.MenuBarUI;
-
-+import com.apple.laf.ScreenMenuBar;
- import sun.lwawt.macosx.CMenuBar;
-
- import com.apple.laf.AquaMenuBarUI;
-@@ -72,12 +73,15 @@
- // scan the current frames, and see if any are foreground
- final Frame[] frames = Frame.getFrames();
- for (final Frame frame : frames) {
-- if (frame.isVisible() && !isFrameMinimized(frame)) return;
-+ if (frame.isVisible() && !isFrameMinimized(frame)) {
-+ return;
-+ }
- }
-
- // if we have no foreground frames, then we have to "kick" the menubar
- final JFrame pingFrame = new JFrame();
- pingFrame.getRootPane().putClientProperty("Window.alpha", new Float(0.0f));
-+ pingFrame.setUndecorated(true);
- pingFrame.setVisible(true);
- pingFrame.toFront();
- pingFrame.setVisible(false);
-@@ -101,7 +105,6 @@
- // Aqua was not installed
- throw new IllegalStateException("Application.setDefaultMenuBar() only works with the Aqua Look and Feel");
- }
--/* TODO: disabled until ScreenMenuBar is working
-
- final AquaMenuBarUI aquaUI = (AquaMenuBarUI)ui;
- final ScreenMenuBar screenMenuBar = aquaUI.getScreenMenuBar();
-@@ -118,8 +121,7 @@
- }
-
- // grab the pointer to the CMenuBar, and retain it in native
-- nativeSetDefaultMenuBar(((CMenuBar)peer).getNativeMenuBarPeer());
--*/
-+ nativeSetDefaultMenuBar(((CMenuBar)peer).getModel());
- }
-
- void setAboutMenuItemVisible(final boolean present) {
---- ./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 2014-07-15 21:49:29.000000000 -0700
-@@ -37,8 +37,6 @@
- import sun.swing.*;
- import apple.laf.*;
-
--import com.apple.resources.MacOSXResourceBundle;
--
- public class AquaLookAndFeel extends BasicLookAndFeel {
- static final String sOldPropertyPrefix = "com.apple.macos."; // old prefix for things like 'useScreenMenuBar'
- static final String sPropertyPrefix = "apple.laf."; // new prefix for things like 'useScreenMenuBar'
-@@ -246,7 +244,7 @@
- table.setDefaultLocale(Locale.getDefault());
- table.addResourceBundle(PKG_PREFIX + "resources.aqua");
- try {
-- final ResourceBundle aquaProperties = MacOSXResourceBundle.getMacResourceBundle(PKG_PREFIX + "resources.aqua");
-+ final ResourceBundle aquaProperties = ResourceBundle.getBundle(PKG_PREFIX + "resources.aqua");
- final Enumeration<String> propertyKeys = aquaProperties.getKeys();
-
- 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 2014-07-15 21:49:29.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
-@@ -29,6 +29,7 @@
- import java.awt.image.*;
- import java.lang.ref.SoftReference;
- import java.lang.reflect.Method;
-+import java.security.AccessController;
- import java.security.PrivilegedAction;
- import java.util.*;
-
-@@ -41,56 +42,68 @@
- import sun.lwawt.macosx.CImage;
- import sun.lwawt.macosx.CImage.Creator;
- import sun.lwawt.macosx.CPlatformWindow;
-+import sun.misc.Launcher;
-+import sun.reflect.misc.ReflectUtil;
-+import sun.security.action.GetPropertyAction;
- import sun.swing.SwingUtilities2;
-
- import com.apple.laf.AquaImageFactory.SlicedImageControl;
-
--public class AquaUtils {
-- final static String ANIMATIONS_SYSTEM_PROPERTY = "swing.enableAnimations";
-+final class AquaUtils {
-
-- /*
-+ private static final String ANIMATIONS_PROPERTY = "swing.enableAnimations";
-+
-+ /**
-+ * Suppresses default constructor, ensuring non-instantiability.
-+ */
-+ private AquaUtils() {
-+ }
-+
-+ /**
- * Convenience function for determining ComponentOrientation. Helps us
- * avoid having Munge directives throughout the code.
- */
-- public static boolean isLeftToRight(final Component c) {
-+ static boolean isLeftToRight(final Component c) {
- return c.getComponentOrientation().isLeftToRight();
- }
-
-- public static void enforceComponentOrientation(Component c, ComponentOrientation orientation) {
-+ static void enforceComponentOrientation(final Component c, final ComponentOrientation orientation) {
- c.setComponentOrientation(orientation);
- if (c instanceof Container) {
-- for (Component child : ((Container)c).getComponents()) {
-+ for (final Component child : ((Container)c).getComponents()) {
- enforceComponentOrientation(child, orientation);
- }
- }
- }
-
-- private static CImage.Creator getCImageCreatorInternal() {
-- return java.security.AccessController.doPrivileged(new PrivilegedAction<CImage.Creator>() {
-+ private static Creator getCImageCreatorInternal() {
-+ return AccessController.doPrivileged(new PrivilegedAction<Creator>() {
-+ @Override
- public Creator run() {
- try {
- final Method getCreatorMethod = CImage.class.getDeclaredMethod("getCreator", new Class[] {});
- getCreatorMethod.setAccessible(true);
-- return (CImage.Creator)getCreatorMethod.invoke(null, new Object[] {});
-- } catch (final Exception e) {
-+ return (Creator)getCreatorMethod.invoke(null, new Object[] {});
-+ } catch (final Exception ignored) {
- return null;
- }
- }
- });
- }
-
-- private static final RecyclableSingleton<CImage.Creator> cImageCreator = new RecyclableSingleton<CImage.Creator>() {
-+ private static final RecyclableSingleton<Creator> cImageCreator = new RecyclableSingleton<Creator>() {
- @Override
- protected Creator getInstance() {
- return getCImageCreatorInternal();
- }
- };
-- static CImage.Creator getCImageCreator() {
-+ static Creator getCImageCreator() {
- return cImageCreator.get();
- }
-
-- protected static Image generateSelectedDarkImage(final Image image) {
-+ static Image generateSelectedDarkImage(final Image image) {
- final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
-+ @Override
- int getGreyFor(final int gray) {
- return gray * 75 / 100;
- }
-@@ -98,8 +111,9 @@
- return Toolkit.getDefaultToolkit().createImage(prod);
- }
-
-- protected static Image generateDisabledImage(final Image image) {
-+ static Image generateDisabledImage(final Image image) {
- final ImageProducer prod = new FilteredImageSource(image.getSource(), new IconImageFilter() {
-+ @Override
- int getGreyFor(final int gray) {
- return 255 - ((255 - gray) * 65 / 100);
- }
-@@ -107,19 +121,20 @@
- return Toolkit.getDefaultToolkit().createImage(prod);
- }
-
-- protected static Image generateLightenedImage(final Image image, final int percent) {
-+ static Image generateLightenedImage(final Image image, final int percent) {
- final GrayFilter filter = new GrayFilter(true, percent);
- final ImageProducer prod = new FilteredImageSource(image.getSource(), filter);
- return Toolkit.getDefaultToolkit().createImage(prod);
- }
-
-- static abstract class IconImageFilter extends RGBImageFilter {
-- public IconImageFilter() {
-+ private abstract static class IconImageFilter extends RGBImageFilter {
-+ IconImageFilter() {
- super();
- canFilterIndexColorModel = true;
- }
-
-- public int filterRGB(final int x, final int y, final int rgb) {
-+ @Override
-+ public final int filterRGB(final int x, final int y, final int rgb) {
- final int red = (rgb >> 16) & 0xff;
- final int green = (rgb >> 8) & 0xff;
- final int blue = rgb & 0xff;
-@@ -135,14 +150,14 @@
- return result;
- }
-
-- abstract int getGreyFor(final int gray);
-+ abstract int getGreyFor(int gray);
- }
-
-- public abstract static class RecyclableObject<T> {
-- protected SoftReference<T> objectRef = null;
-+ abstract static class RecyclableObject<T> {
-+ private SoftReference<T> objectRef;
-
-- public T get() {
-- T referent = null;
-+ T get() {
-+ T referent;
- if (objectRef != null && (referent = objectRef.get()) != null) return referent;
- referent = create();
- objectRef = new SoftReference<T>(referent);
-@@ -152,8 +167,8 @@
- protected abstract T create();
- }
-
-- public abstract static class RecyclableSingleton<T> {
-- public T get() {
-+ abstract static class RecyclableSingleton<T> {
-+ final T get() {
- final AppContext appContext = AppContext.getAppContext();
- SoftReference<T> ref = (SoftReference<T>) appContext.get(this);
- if (ref != null) {
-@@ -166,38 +181,36 @@
- return object;
- }
-
-- public void reset() {
-- AppContext appContext = AppContext.getAppContext();
-- appContext.remove(this);
-+ void reset() {
-+ AppContext.getAppContext().remove(this);
- }
-
-- protected abstract T getInstance();
-+ abstract T getInstance();
- }
-
-- public static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
-- protected final Class<T> clazz;
-+ static class RecyclableSingletonFromDefaultConstructor<T> extends RecyclableSingleton<T> {
-+ private final Class<T> clazz;
-
-- public RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
-+ RecyclableSingletonFromDefaultConstructor(final Class<T> clazz) {
- this.clazz = clazz;
- }
-
-- protected T getInstance() {
-+ @Override
-+ T getInstance() {
- try {
-+ ReflectUtil.checkPackageAccess(clazz);
- return clazz.newInstance();
-- } catch (final InstantiationException e) {
-- e.printStackTrace();
-- } catch (final IllegalAccessException e) {
-- e.printStackTrace();
-+ } catch (InstantiationException | IllegalAccessException ignored) {
- }
- return null;
- }
- }
-
-- public abstract static class LazyKeyedSingleton<K, V> {
-- protected Map<K, V> refs;
-+ abstract static class LazyKeyedSingleton<K, V> {
-+ private Map<K, V> refs;
-
-- public V get(final K key) {
-- if (refs == null) refs = new HashMap<K, V>();
-+ V get(final K key) {
-+ if (refs == null) refs = new HashMap<>();
-
- final V cachedValue = refs.get(key);
- if (cachedValue != null) return cachedValue;
-@@ -207,44 +220,45 @@
- return value;
- }
-
-- protected abstract V getInstance(final K key);
-+ protected abstract V getInstance(K key);
- }
-
-- static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
-+ private static final RecyclableSingleton<Boolean> enableAnimations = new RecyclableSingleton<Boolean>() {
- @Override
- protected Boolean getInstance() {
-- final String sizeProperty = (String)java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.GetPropertyAction(ANIMATIONS_SYSTEM_PROPERTY));
-- return new Boolean(!"false".equals(sizeProperty)); // should be true by default
-+ final String sizeProperty = (String) AccessController.doPrivileged((PrivilegedAction<?>)new GetPropertyAction(
-+ ANIMATIONS_PROPERTY));
-+ return !"false".equals(sizeProperty); // should be true by default
- }
- };
-- static boolean animationsEnabled() {
-+ private static boolean animationsEnabled() {
- return enableAnimations.get();
- }
-
-- static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
-- protected static void blinkMenu(final Selectable selectable) {
-+ private static final int MENU_BLINK_DELAY = 50; // 50ms == 3/60 sec, according to the spec
-+ static void blinkMenu(final Selectable selectable) {
- if (!animationsEnabled()) return;
- try {
- selectable.paintSelected(false);
- Thread.sleep(MENU_BLINK_DELAY);
- selectable.paintSelected(true);
- Thread.sleep(MENU_BLINK_DELAY);
-- } catch (final InterruptedException e) { }
-+ } catch (final InterruptedException ignored) { }
- }
-
- interface Selectable {
-- void paintSelected(final boolean selected);
-+ void paintSelected(boolean selected);
- }
-
- interface JComponentPainter {
-- public void paint(JComponent c, Graphics g, int x, int y, int w, int h);
-+ void paint(JComponent c, Graphics g, int x, int y, int w, int h);
- }
-
- interface Painter {
-- public void paint(final Graphics g, int x, int y, int w, int h);
-+ void paint(Graphics g, int x, int y, int w, int h);
- }
-
-- public static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
-+ static void paintDropShadowText(final Graphics g, final JComponent c, final Font font, final FontMetrics metrics, final int x, final int y, final int offsetX, final int offsetY, final Color textColor, final Color shadowColor, final String text) {
- g.setFont(font);
- g.setColor(shadowColor);
- SwingUtilities2.drawString(c, g, text, x + offsetX, y + offsetY + metrics.getAscent());
-@@ -252,22 +266,22 @@
- SwingUtilities2.drawString(c, g, text, x, y + metrics.getAscent());
- }
-
-- public static class ShadowBorder implements Border {
-- final Painter prePainter;
-- final Painter postPainter;
--
-- final int offsetX;
-- final int offsetY;
-- final float distance;
-- final int blur;
-- final Insets insets;
-- final ConvolveOp blurOp;
-+ static class ShadowBorder implements Border {
-+ private final Painter prePainter;
-+ private final Painter postPainter;
-+
-+ private final int offsetX;
-+ private final int offsetY;
-+ private final float distance;
-+ private final int blur;
-+ private final Insets insets;
-+ private final ConvolveOp blurOp;
-
-- public ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
-+ ShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur) {
- this.prePainter = prePainter; this.postPainter = postPainter;
- this.offsetX = offsetX; this.offsetY = offsetY; this.distance = distance; this.blur = blur;
- final int halfBlur = blur / 2;
-- this.insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);
-+ insets = new Insets(halfBlur - offsetY, halfBlur - offsetX, halfBlur + offsetY, halfBlur + offsetX);
-
- final float blurry = intensity / (blur * blur);
- final float[] blurKernel = new float[blur * blur];
-@@ -275,14 +289,17 @@
- blurOp = new ConvolveOp(new Kernel(blur, blur, blurKernel));
- }
-
-- public boolean isBorderOpaque() {
-+ @Override
-+ public final boolean isBorderOpaque() {
- return false;
- }
-
-- public Insets getBorderInsets(final Component c) {
-+ @Override
-+ public final Insets getBorderInsets(final Component c) {
- return insets;
- }
-
-+ @Override
- public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) {
- final BufferedImage img = new BufferedImage(width + blur * 2, height + blur * 2, BufferedImage.TYPE_INT_ARGB_PRE);
- paintToImage(img, x, y, width, height);
-@@ -290,7 +307,7 @@
- g.drawImage(img, -blur, -blur, null);
- }
-
-- protected void paintToImage(final BufferedImage img, final int x, final int y, final int width, final int height) {
-+ private void paintToImage(final BufferedImage img, final int x, final int y, final int width, final int height) {
- // clear the prior image
- Graphics2D imgG = (Graphics2D)img.getGraphics();
- imgG.setComposite(AlphaComposite.Clear);
-@@ -319,10 +336,10 @@
- }
- }
-
-- public static class SlicedShadowBorder extends ShadowBorder {
-- final SlicedImageControl slices;
-+ static class SlicedShadowBorder extends ShadowBorder {
-+ private final SlicedImageControl slices;
-
-- public SlicedShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur, final int templateWidth, final int templateHeight, final int leftCut, final int topCut, final int rightCut, final int bottomCut) {
-+ SlicedShadowBorder(final Painter prePainter, final Painter postPainter, final int offsetX, final int offsetY, final float distance, final float intensity, final int blur, final int templateWidth, final int templateHeight, final int leftCut, final int topCut, final int rightCut, final int bottomCut) {
- super(prePainter, postPainter, offsetX, offsetY, distance, intensity, blur);
-
- final BufferedImage i = new BufferedImage(templateWidth, templateHeight, BufferedImage.TYPE_INT_ARGB_PRE);
-@@ -331,15 +348,12 @@
- slices = new SlicedImageControl(i, leftCut, topCut, rightCut, bottomCut, false);
- }
-
-+ @Override
- public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) {
- slices.paint(g, x, y, width, height);
- }
- }
-
-- public interface NineSliceMetricsProvider {
--
-- }
--
- // static void debugFrame(String name, Image image) {
- // JFrame f = new JFrame(name);
- // f.setContentPane(new JLabel(new ImageIcon(image)));
-@@ -350,28 +364,30 @@
- // special casing naughty applications, like InstallAnywhere
- // <rdar://problem/4851533> REGR: JButton: Myst IV: the buttons of 1.0.3 updater have redraw issue
- static boolean shouldUseOpaqueButtons() {
-- final ClassLoader launcherClassLoader = sun.misc.Launcher.getLauncher().getClassLoader();
-+ final ClassLoader launcherClassLoader = Launcher.getLauncher().getClassLoader();
- if (classExists(launcherClassLoader, "com.installshield.wizard.platform.macosx.MacOSXUtils")) return true;
- return false;
- }
-
-- static boolean classExists(final ClassLoader classLoader, final String clazzName) {
-+ private static boolean classExists(final ClassLoader classLoader, final String clazzName) {
- try {
- return Class.forName(clazzName, false, classLoader) != null;
-- } catch (final Throwable e) { }
-+ } catch (final Throwable ignored) { }
- return false;
- }
-
-- private static RecyclableSingleton<Method> getJComponentGetFlagMethod = new RecyclableSingleton<Method>() {
-+ private static final RecyclableSingleton<Method> getJComponentGetFlagMethod = new RecyclableSingleton<Method>() {
-+ @Override
- protected Method getInstance() {
-- return java.security.AccessController.doPrivileged(
-+ return AccessController.doPrivileged(
- new PrivilegedAction<Method>() {
-+ @Override
- public Method run() {
- try {
- final Method method = JComponent.class.getDeclaredMethod("getFlag", new Class[] { int.class });
- method.setAccessible(true);
- return method;
-- } catch (final Throwable e) {
-+ } catch (final Throwable ignored) {
- return null;
- }
- }
-@@ -380,18 +396,18 @@
- }
- };
-
-- private static final Integer OPAQUE_SET_FLAG = new Integer(24); // private int JComponent.OPAQUE_SET
-- protected static boolean hasOpaqueBeenExplicitlySet(final JComponent c) {
-+ private static final Integer OPAQUE_SET_FLAG = 24; // private int JComponent.OPAQUE_SET
-+ static boolean hasOpaqueBeenExplicitlySet(final JComponent c) {
- final Method method = getJComponentGetFlagMethod.get();
- if (method == null) return false;
- try {
- return Boolean.TRUE.equals(method.invoke(c, OPAQUE_SET_FLAG));
-- } catch (final Throwable e) {
-+ } catch (final Throwable ignored) {
- return false;
- }
- }
-
-- protected static boolean isWindowTextured(final Component c) {
-+ private static boolean isWindowTextured(final Component c) {
- if (!(c instanceof JComponent)) {
- return false;
- }
-@@ -412,13 +428,12 @@
- return new Color(color.getRed(), color.getGreen(), color.getBlue(), 0);
- }
-
-- protected static void fillRect(final Graphics g, final Component c) {
-+ static void fillRect(final Graphics g, final Component c) {
- fillRect(g, c, c.getBackground(), 0, 0, c.getWidth(), c.getHeight());
- }
-
-- protected static void fillRect(final Graphics g, final Component c,
-- final Color color, final int x, final int y,
-- final int w, final int h) {
-+ static void fillRect(final Graphics g, final Component c, final Color color,
-+ final int x, final int y, final int w, final int h) {
- if (!(g instanceof Graphics2D)) {
- 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 2014-07-15 21:49:29.000000000 -0700
-@@ -37,26 +37,31 @@
- import sun.lwawt.LWToolkit;
- import sun.lwawt.macosx.*;
-
--class ScreenMenu extends Menu implements ContainerListener, ComponentListener, ScreenMenuPropertyHandler {
-+final class ScreenMenu extends Menu
-+ implements ContainerListener, ComponentListener,
-+ ScreenMenuPropertyHandler {
-+
- static {
- java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("awt"));
- }
-
- // screen menu stuff
-- public static native long addMenuListeners(ScreenMenu listener, long nativeMenu);
-- public static native void removeMenuListeners(long modelPtr);
-+ private static native long addMenuListeners(ScreenMenu listener, long nativeMenu);
-+ private static native void removeMenuListeners(long modelPtr);
-
-- long fModelPtr = 0;
-+ private transient long fModelPtr;
-
-- Hashtable<Component, MenuItem> fItems;
-- JMenu fInvoker;
-+ private final Hashtable<Component, MenuItem> fItems;
-+ private final JMenu fInvoker;
-
-- Component fLastMouseEventTarget;
-- Rectangle fLastTargetRect;
-+ private Component fLastMouseEventTarget;
-+ private Rectangle fLastTargetRect;
- private volatile Rectangle[] fItemBounds;
-
-+ private ScreenMenuPropertyListener fPropertyListener;
-+
- // Array of child hashes used to see if we need to recreate the Menu.
-- int childHashArray[];
-+ private int childHashArray[];
-
- ScreenMenu(final JMenu invoker) {
- super(invoker.getText());
-@@ -69,25 +74,12 @@
- updateItems();
- }
-
-- // I'm always 'visible', but never on screen
-- static class ScreenMenuComponent extends Container {
-- public boolean isVisible() { return true; }
-- public boolean isShowing() { return true; }
-- public void setVisible(final boolean b) {}
-- public void show() {}
-- }
--
-- ScreenMenuComponent makeScreenMenuComponent() {
-- return new ScreenMenuComponent();
-- }
--
--
- /**
- * Determine if we need to tear down the Menu and re-create it, since the contents may have changed in the Menu opened listener and
- * we do not get notified of it, because EDT is busy in our code. We only need to update if the menu contents have changed in some
- * way, such as the number of menu items, the text of the menuitems, icon, shortcut etc.
- */
-- static boolean needsUpdate(final Component items[], final int childHashArray[]) {
-+ private static boolean needsUpdate(final Component items[], final int childHashArray[]) {
- if (items == null || childHashArray == null) {
- return true;
- }
-@@ -107,7 +99,7 @@
- * Used to recreate the AWT based Menu structure that implements the Screen Menu.
- * Also computes hashcode and stores them so that we can compare them later in needsUpdate.
- */
-- void updateItems() {
-+ private void updateItems() {
- final int count = fInvoker.getMenuComponentCount();
- final Component[] items = fInvoker.getMenuComponents();
- if (needsUpdate(items, childHashArray)) {
-@@ -158,16 +150,14 @@
- LWCToolkit.invokeAndWait(new Runnable() {
- public void run() {
- invoker.setSelected(false);
--
-- // Null out the tracking rectangles and the array.
-+ // Null out the tracking rectangles and the array.
- if (fItemBounds != null) {
-- for (int i = 0; i < fItemBounds.length; i++) {
-- fItemBounds[i] = null;
-- }
-+ for (int i = 0; i < fItemBounds.length; i++) {
-+ fItemBounds[i] = null;
-+ }
- }
--
-- fItemBounds = null;
-- }
-+ fItemBounds = null;
-+ }
- }, invoker);
- } catch (final Exception e) {
- e.printStackTrace();
-@@ -232,49 +222,56 @@
- });
- }
-
-- ScreenMenuPropertyListener fPropertyListener;
-+ @Override
- public void addNotify() {
-- super.addNotify();
-- if (fModelPtr == 0) {
-- fInvoker.addContainerListener(this);
-- fInvoker.addComponentListener(this);
-- fPropertyListener = new ScreenMenuPropertyListener(this);
-- fInvoker.addPropertyChangeListener(fPropertyListener);
--
-- final Icon icon = fInvoker.getIcon();
-- if (icon != null) {
-- this.setIcon(icon);
-- }
-+ synchronized (getTreeLock()) {
-+ super.addNotify();
-+ if (fModelPtr == 0) {
-+ fInvoker.addContainerListener(this);
-+ fInvoker.addComponentListener(this);
-+ fPropertyListener = new ScreenMenuPropertyListener(this);
-+ fInvoker.addPropertyChangeListener(fPropertyListener);
-+
-+ final Icon icon = fInvoker.getIcon();
-+ if (icon != null) {
-+ setIcon(icon);
-+ }
-
-- final String tooltipText = fInvoker.getToolTipText();
-- if (tooltipText != null) {
-- this.setToolTipText(tooltipText);
-- }
-- final MenuComponentPeer peer = getPeer();
-- if (peer instanceof CMenu) {
-- final CMenu menu = (CMenu)peer;
-- final long nativeMenu = menu.getNativeMenu();
-- fModelPtr = addMenuListeners(this, nativeMenu);
-+ final String tooltipText = fInvoker.getToolTipText();
-+ if (tooltipText != null) {
-+ setToolTipText(tooltipText);
-+ }
-+ final MenuComponentPeer peer = getPeer();
-+ if (peer instanceof CMenu) {
-+ final CMenu menu = (CMenu) peer;
-+ final long nativeMenu = menu.getNativeMenu();
-+ fModelPtr = addMenuListeners(this, nativeMenu);
-+ }
- }
- }
- }
-
-+ @Override
- public void removeNotify() {
-- // Call super so that the NSMenu has been removed, before we release the delegate in removeMenuListeners
-- super.removeNotify();
-- fItems.clear();
-- if (fModelPtr != 0) {
-- removeMenuListeners(fModelPtr);
-- fModelPtr = 0;
-- fInvoker.removeContainerListener(this);
-- fInvoker.removeComponentListener(this);
-- fInvoker.removePropertyChangeListener(fPropertyListener);
-+ synchronized (getTreeLock()) {
-+ // Call super so that the NSMenu has been removed, before we release
-+ // the delegate in removeMenuListeners
-+ super.removeNotify();
-+ fItems.clear();
-+ if (fModelPtr != 0) {
-+ removeMenuListeners(fModelPtr);
-+ fModelPtr = 0;
-+ fInvoker.removeContainerListener(this);
-+ fInvoker.removeComponentListener(this);
-+ fInvoker.removePropertyChangeListener(fPropertyListener);
-+ }
- }
- }
-
- /**
- * Invoked when a component has been added to the container.
- */
-+ @Override
- public void componentAdded(final ContainerEvent e) {
- addItem(e.getChild());
- }
-@@ -282,23 +279,26 @@
- /**
- * Invoked when a component has been removed from the container.
- */
-+ @Override
- public void componentRemoved(final ContainerEvent e) {
- final Component child = e.getChild();
- final MenuItem sm = fItems.get(child);
- if (sm == null) return;
-
-- remove(sm);
-- fItems.remove(sm);
-- }
-+ remove(sm);
-+ fItems.remove(sm);
-+ }
-
- /**
- * Invoked when the component's size changes.
- */
-+ @Override
- public void componentResized(final ComponentEvent e) {}
-
- /**
- * Invoked when the component's position changes.
- */
-+ @Override
- public void componentMoved(final ComponentEvent e) {}
-
- /**
-@@ -306,6 +306,7 @@
- * See componentHidden - we should still have a MenuItem
- * it just isn't inserted
- */
-+ @Override
- public void componentShown(final ComponentEvent e) {
- setVisible(true);
- }
-@@ -316,11 +317,12 @@
- * so we remove the ScreenMenuItem from the ScreenMenu
- * but leave it in fItems
- */
-+ @Override
- public void componentHidden(final ComponentEvent e) {
- setVisible(false);
- }
-
-- public void setVisible(final boolean b) {
-+ private void setVisible(final boolean b) {
- // Tell our parent to add/remove us
- final MenuContainer parent = getParent();
-
-@@ -328,20 +330,24 @@
- if (parent instanceof ScreenMenu) {
- final ScreenMenu sm = (ScreenMenu)parent;
- sm.setChildVisible(fInvoker, b);
-- }
-+ }
- }
- }
-
-+ @Override
- public void setChildVisible(final JMenuItem child, final boolean b) {
- fItems.remove(child);
- updateItems();
- }
-
-+ @Override
- public void setAccelerator(final KeyStroke ks) {}
-
- // only check and radio items can be indeterminate
-+ @Override
- public void setIndeterminate(boolean indeterminate) { }
-
-+ @Override
- public void setToolTipText(final String text) {
- final MenuComponentPeer peer = getPeer();
- if (!(peer instanceof CMenuItem)) return;
-@@ -350,6 +356,7 @@
- cmi.setToolTipText(text);
- }
-
-+ @Override
- public void setIcon(final Icon i) {
- final MenuComponentPeer peer = getPeer();
- if (!(peer instanceof CMenuItem)) return;
-@@ -369,9 +376,8 @@
- /**
- * Gets a hashCode for a JMenu or JMenuItem or subclass so that we can compare for
- * changes in the Menu.
-- *
- */
-- static int getHashCode(final Component m) {
-+ private static int getHashCode(final Component m) {
- int hashCode = m.hashCode();
-
- if (m instanceof JMenuItem) {
-@@ -403,7 +409,7 @@
- return hashCode;
- }
-
-- void addItem(final Component m) {
-+ private void addItem(final Component m) {
- if (!m.isVisible()) return;
- 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-07-15 21:49:29.000000000 -0700
-@@ -46,7 +46,7 @@
- FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30
- FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
- FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
--FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0
-+FileChooser.updateButton.textAndMnemonic=\uC5C5\uB370\uC774\uD2B8
- FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0
- FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30
-
---- ./jdk/src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java 2013-09-06 11:27:48.000000000 -0700
-+++ ./jdk/src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,110 +0,0 @@
--/*
-- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. 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.apple.resources;
--
--import java.security.*;
--import java.util.PropertyResourceBundle;
--import java.util.ResourceBundle;
--import java.io.*;
--
--public class MacOSXResourceBundle extends PropertyResourceBundle {
-- MacOSXResourceBundle(InputStream stream) throws IOException {
-- super(stream);
-- }
--
-- void setItsParent(ResourceBundle rb) {
-- setParent(rb);
-- }
--
-- public static ResourceBundle getMacResourceBundle(String baseJavaBundle) throws Exception {
-- return getMacResourceBundle(baseJavaBundle, null);
-- }
--
-- public static ResourceBundle getMacResourceBundle(String baseJavaBundle, String filename) throws Exception {
-- LoadNativeBundleAction lnba = new LoadNativeBundleAction(baseJavaBundle, filename);
-- return (ResourceBundle)java.security.AccessController.doPrivileged(lnba);
-- }
--}
--
--class LoadNativeBundleAction implements PrivilegedExceptionAction {
-- String mBaseJavaBundle;
-- String mFilenameOverride;
--
-- LoadNativeBundleAction(String baseJavaBundle, String filenameOverride) {
-- mBaseJavaBundle = baseJavaBundle;
-- mFilenameOverride = filenameOverride;
-- }
--
-- public Object run() {
-- java.util.ResourceBundle returnValue = null;
-- MacOSXResourceBundle macOSrb = null;
--
-- // Load the Mac OS X resources.
-- // Use a base filename if we were given one. Otherwise, we will look for the last piece of the bundle path
-- // with '.properties' appended. Either way, the native method will take care of the extension.
-- String filename = mFilenameOverride;
--
-- if (filename == null) {
-- filename = mBaseJavaBundle.substring(mBaseJavaBundle.lastIndexOf('.') + 1);
-- }
--
-- File propsFile = null;
-- String propertyFileName = getPathToBundleFile(filename);
-- InputStream stream = null;
--
-- try {
-- propsFile = new File(propertyFileName);
-- stream = new FileInputStream(propsFile);
-- stream = new java.io.BufferedInputStream(stream);
-- macOSrb = new MacOSXResourceBundle(stream);
-- } catch (Exception e) {
-- //e.printStackTrace();
-- //System.out.println("Failed to create resources from application bundle. Using Java-based resources.");
-- } finally {
-- try {
-- if (stream != null) stream.close();
-- stream = null;
-- } catch (Exception e) {
-- e.printStackTrace();
-- }
-- }
--
-- returnValue = ResourceBundle.getBundle(mBaseJavaBundle);
--
-- // If we have a platform-specific bundle, make it the parent of the generic bundle, so failures propagate up to the parent.
-- if (returnValue != null) {
-- if (macOSrb != null) {
-- macOSrb.setItsParent(returnValue);
-- returnValue = macOSrb;
-- }
-- }
--
-- return returnValue;
-- }
--
-- private static native String getPathToBundleFile(String filename);
--}
--
---- ./jdk/src/macosx/classes/sun/awt/resources/awtosx.properties 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/macosx/classes/sun/awt/resources/awtosx.properties 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,71 @@
-+#
-+# OS X specific AWT properties
-+#
-+
-+# Modifier names
-+AWT.shift=\u21e7
-+AWT.control=\u2303
-+AWT.alt=\u2325
-+AWT.meta=\u2318
-+AWT.altGraph=\u2325
-+
-+# Key names
-+AWT.enter=\u23ce
-+AWT.backSpace=\u232b
-+AWT.tab=\u21e5
-+AWT.cancel=\u238b
-+AWT.clear=\u2327
-+AWT.capsLock=\u21ea
-+AWT.escape=\u238b
-+AWT.space=\u2423
-+AWT.pgup=\u21de
-+AWT.pgdn=\u21df
-+AWT.end=\u2198
-+AWT.home=\u2196
-+AWT.left=\u2190
-+AWT.up=\u2191
-+AWT.right=\u2192
-+AWT.down=\u2193
-+AWT.comma=,
-+AWT.period=.
-+AWT.slash=/
-+AWT.semicolon=;
-+AWT.equals=\u003d
-+AWT.openBracket=[
-+AWT.backSlash=\\
-+AWT.closeBracket=]
-+AWT.multiply=\u2328 *
-+AWT.add=\u2328 +
-+AWT.separator=\u2328 ,
-+AWT.separater=\u2328 ,
-+AWT.subtract=\u2328 -
-+AWT.decimal=\u2328 .
-+AWT.divide=\u2328 /
-+AWT.delete=\u2326
-+AWT.printScreen=\u2399
-+AWT.backQuote=`
-+AWT.quote='
-+AWT.ampersand=&
-+AWT.asterisk=*
-+AWT.quoteDbl="
-+AWT.Less=<
-+AWT.greater=>
-+AWT.braceLeft=[
-+AWT.braceRight=]
-+AWT.at=@
-+AWT.colon=:
-+AWT.circumflex=^
-+AWT.dollar=$
-+AWT.euro=\u20ac
-+AWT.exclamationMark=!
-+AWT.invertedExclamationMark=\u00a1
-+AWT.leftParenthesis=(
-+AWT.numberSign=#
-+AWT.plus=+
-+AWT.minus=-
-+AWT.rightParenthesis=)
-+AWT.underscore=_
-+
-+# Numeric Keypad
-+AWT.numpad=\u2328
-+
---- ./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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.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/LWWindowPeer.java 2013-09-06 11:27:49.000000000 -0700
-+++ ./jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java 2014-10-28 20:19:45.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
-@@ -89,10 +89,15 @@
-
- private volatile int windowState = Frame.NORMAL;
-
-- // A peer where the last mouse event came to. Used to generate
-- // MOUSE_ENTERED/EXITED notifications and by cursor manager to
-+ // check that the mouse is over the window
-+ private volatile boolean isMouseOver = false;
-+ // A peer where the last mouse event came to. Used by cursor manager to
- // find the component under cursor
-- private static volatile LWComponentPeer lastMouseEventPeer = null;
-+ private static volatile LWComponentPeer lastCommonMouseEventPeer = null;
-+
-+ // A peer where the last mouse event came to. Used to generate
-+ // MOUSE_ENTERED/EXITED notifications
-+ private volatile LWComponentPeer lastMouseEventPeer;
-
- // Peers where all dragged/released events should come to,
- // depending on what mouse button is being dragged according to Cocoa
-@@ -773,59 +778,62 @@
- Rectangle r = getBounds();
- // findPeerAt() expects parent coordinates
- LWComponentPeer targetPeer = findPeerAt(r.x + x, r.y + y);
-- LWWindowPeer lastWindowPeer =
-- (lastMouseEventPeer != null) ? lastMouseEventPeer.getWindowPeerOrSelf() : null;
-- LWWindowPeer curWindowPeer =
-- (targetPeer != null) ? targetPeer.getWindowPeerOrSelf() : null;
-
- if (id == MouseEvent.MOUSE_EXITED) {
-- // Sometimes we may get MOUSE_EXITED after lastMouseEventPeer is switched
-- // to a peer from another window. So we must first check if this peer is
-- // the same as lastWindowPeer
-- if (lastWindowPeer == this) {
-- if (isEnabled()) {
-+ isMouseOver = false;
-+ if (lastMouseEventPeer != null) {
-+ if (lastMouseEventPeer.isEnabled()) {
- Point lp = lastMouseEventPeer.windowToLocal(x, y,
-- lastWindowPeer);
-+ this);
- Component target = lastMouseEventPeer.getTarget();
- postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED,
- when, modifiers, lp,
- screenX, screenY, clickCount, popupTrigger, button);
- }
-+
-+ // Sometimes we may get MOUSE_EXITED after lastCommonMouseEventPeer is switched
-+ // to a peer from another window. So we must first check if this peer is
-+ // the same as lastWindowPeer
-+ if (lastCommonMouseEventPeer != null && lastCommonMouseEventPeer.getWindowPeerOrSelf() == this) {
-+ lastCommonMouseEventPeer = null;
-+ }
- lastMouseEventPeer = null;
- }
-- } else {
-- if (targetPeer != lastMouseEventPeer) {
-- // lastMouseEventPeer may be null if mouse was out of Java windows
-- if (lastMouseEventPeer != null && lastMouseEventPeer.isEnabled()) {
-- // Sometimes, MOUSE_EXITED is not sent by delegate (or is sent a bit
-- // later), in which case lastWindowPeer is another window
-- if (lastWindowPeer != this) {
-- Point oldp = lastMouseEventPeer.windowToLocal(x, y, lastWindowPeer);
-- // Additionally translate from this to lastWindowPeer coordinates
-- Rectangle lr = lastWindowPeer.getBounds();
-- oldp.x += r.x - lr.x;
-- oldp.y += r.y - lr.y;
-- Component target = lastMouseEventPeer.getTarget();
-- postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED,
-- when, modifiers, oldp,
-- screenX, screenY, clickCount, popupTrigger, button);
-- } else {
-- Point oldp = lastMouseEventPeer.windowToLocal(x, y, this);
-- Component target = lastMouseEventPeer.getTarget();
-- postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED,
-- when, modifiers, oldp,
-- screenX, screenY, clickCount, popupTrigger, button);
-- }
-- }
-- lastMouseEventPeer = targetPeer;
-- if (targetPeer != null && targetPeer.isEnabled() && id != MouseEvent.MOUSE_ENTERED) {
-- Point newp = targetPeer.windowToLocal(x, y, curWindowPeer);
-+ } else if (id == MouseEvent.MOUSE_ENTERED) {
-+ isMouseOver = true;
-+ if (targetPeer != null) {
-+ if (targetPeer.isEnabled()) {
-+ Point lp = targetPeer.windowToLocal(x, y, this);
- Component target = targetPeer.getTarget();
-- postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_ENTERED,
-- when, modifiers, newp,
-+ postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_ENTERED, when, modifiers, lp,
- screenX, screenY, clickCount, popupTrigger, button);
- }
-+ lastCommonMouseEventPeer = targetPeer;
-+ lastMouseEventPeer = targetPeer;
-+ }
-+ } else {
-+ PlatformWindow topmostPlatformWindow =
-+ platformWindow.getTopmostPlatformWindowUnderMouse();
-+
-+ LWWindowPeer topmostWindowPeer =
-+ topmostPlatformWindow != null ? topmostPlatformWindow.getPeer() : null;
-+
-+ // topmostWindowPeer == null condition is added for the backword
-+ // compatibility with applets. It can be removed when the
-+ // getTopmostPlatformWindowUnderMouse() method will be properly
-+ // implemented i CPlatformEmbeddedFrame class
-+ if (topmostWindowPeer == this || topmostWindowPeer == null) {
-+ generateMouseEnterExitEventsForComponents(when, button, x, y,
-+ screenX, screenY, modifiers, clickCount, popupTrigger,
-+ targetPeer);
-+ } else {
-+ LWComponentPeer topmostTargetPeer =
-+ topmostWindowPeer != null ? topmostWindowPeer.findPeerAt(r.x + x, r.y + y) : null;
-+ topmostWindowPeer.generateMouseEnterExitEventsForComponents(when, button, x, y,
-+ screenX, screenY, modifiers, clickCount, popupTrigger,
-+ topmostTargetPeer);
- }
-+
- // TODO: fill "bdata" member of AWTEvent
-
- int eventButtonMask = (button > 0)? MouseEvent.getMaskForButton(button) : 0;
-@@ -875,19 +883,13 @@
- // mouseClickButtons is updated below, after MOUSE_CLICK is sent
- }
-
-- // check if we receive mouseEvent from outside the window's bounds
-- // it can be either mouseDragged or mouseReleased
-- if (curWindowPeer == null) {
-- //TODO This can happen if this window is invisible. this is correct behavior in this case?
-- curWindowPeer = this;
-- }
- if (targetPeer == null) {
- //TODO This can happen if this window is invisible. this is correct behavior in this case?
- targetPeer = this;
- }
-
-
-- Point lp = targetPeer.windowToLocal(x, y, curWindowPeer);
-+ Point lp = targetPeer.windowToLocal(x, y, this);
- if (targetPeer.isEnabled()) {
- if (id == MouseEvent.MOUSE_ENTERED || id == MouseEvent.MOUSE_EXITED) {
- postMouseEnteredExitedEvent(targetPeer.getTarget(), id,
-@@ -918,6 +920,33 @@
- notifyUpdateCursor();
- }
-
-+ private void generateMouseEnterExitEventsForComponents(long when,
-+ int button, int x, int y, int screenX, int screenY,
-+ int modifiers, int clickCount, boolean popupTriger,
-+ LWComponentPeer targetPeer) {
-+ if (!isMouseOver || targetPeer == lastMouseEventPeer) {
-+ return;
-+ }
-+
-+ // Generate Mouse Exit for components
-+ if (lastMouseEventPeer != null && lastMouseEventPeer.isEnabled()) {
-+ Point oldp = lastMouseEventPeer.windowToLocal(x, y, this);
-+ Component target = lastMouseEventPeer.getTarget();
-+ postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED, when, modifiers,
-+ oldp, screenX, screenY, clickCount, popupTriger, button);
-+ }
-+ lastCommonMouseEventPeer = targetPeer;
-+ lastMouseEventPeer = targetPeer;
-+
-+ // Genrate Mouse Enter for Componetns
-+ if (targetPeer != null && targetPeer.isEnabled()) {
-+ Point newp = targetPeer.windowToLocal(x, y, this);
-+ Component target = targetPeer.getTarget();
-+ postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_ENTERED, when, modifiers,
-+ newp, screenX, screenY, clickCount, popupTriger, button);
-+ }
-+ }
-+
- private void postMouseEnteredExitedEvent(
- Component target, int id, long when, int modifiers,
- Point loc, int xAbs, int yAbs,
-@@ -1198,11 +1227,11 @@
- }
-
- public static LWWindowPeer getWindowUnderCursor() {
-- return lastMouseEventPeer != null ? lastMouseEventPeer.getWindowPeerOrSelf() : null;
-+ return lastCommonMouseEventPeer != null ? lastCommonMouseEventPeer.getWindowPeerOrSelf() : null;
- }
-
- public static LWComponentPeer<?, ?> getPeerUnderCursor() {
-- return lastMouseEventPeer;
-+ return lastCommonMouseEventPeer;
- }
-
- /*
---- ./jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java 2013-09-06 11:27:49.000000000 -0700
-+++ ./jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java 2014-10-28 20:19:45.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
-@@ -118,6 +118,8 @@
-
- public void setAlwaysOnTop(boolean value);
-
-+ public PlatformWindow getTopmostPlatformWindowUnderMouse();
-+
- public void updateFocusableWindowState();
-
- public boolean rejectFocusRequest(CausedFocusEvent.Cause cause);
---- ./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-07-15 21:49:29.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/CDropTargetContextPeer.java 2013-09-06 11:27:49.000000000 -0700
-+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java 2014-07-15 21:49:29.000000000 -0700
-@@ -26,6 +26,7 @@
- package sun.lwawt.macosx;
-
- import java.awt.*;
-+import java.awt.dnd.DropTarget;
-
- import sun.awt.dnd.SunDropTargetContextPeer;
- import sun.awt.dnd.SunDropTargetEvent;
-@@ -38,7 +39,7 @@
- private long fNativeDropTransfer = 0;
- private long fNativeDataAvailable = 0;
- private Object fNativeData = null;
-- private boolean insideTarget = true;
-+ private DropTarget insideTarget = null;
-
- Object awtLockAccess = new Object();
-
-@@ -88,26 +89,19 @@
- return fNativeData;
- }
-
-- // We need to take care of dragExit message because for some reason it is not being
-- // generated for lightweight components
-+ // We need to take care of dragEnter and dragExit messages because
-+ // native system generates them only for heavyweights
- @Override
- protected void processMotionMessage(SunDropTargetEvent event, boolean operationChanged) {
-- Component eventSource = (Component)event.getComponent();
-- Point screenPoint = event.getPoint();
-- SwingUtilities.convertPointToScreen(screenPoint, eventSource);
-- Rectangle screenBounds = new Rectangle(eventSource.getLocationOnScreen().x,
-- eventSource.getLocationOnScreen().y,
-- eventSource.getWidth(), eventSource.getHeight());
-- if(insideTarget) {
-- if(!screenBounds.contains(screenPoint)) {
-+ boolean eventInsideTarget = isEventInsideTarget(event);
-+ if (event.getComponent().getDropTarget() == insideTarget) {
-+ if (!eventInsideTarget) {
- processExitMessage(event);
-- insideTarget = false;
- return;
- }
- } else {
-- if(screenBounds.contains(screenPoint)) {
-+ if (eventInsideTarget) {
- processEnterMessage(event);
-- insideTarget = true;
- } else {
- return;
- }
-@@ -115,19 +109,54 @@
- super.processMotionMessage(event, operationChanged);
- }
-
-+ /**
-+ * Could be called when DnD enters a heavyweight or synthesized in processMotionMessage
-+ */
-+ @Override
-+ protected void processEnterMessage(SunDropTargetEvent event) {
-+ Component c = event.getComponent();
-+ DropTarget dt = event.getComponent().getDropTarget();
-+ if (isEventInsideTarget(event)
-+ && dt != insideTarget
-+ && c.isShowing()
-+ && dt != null
-+ && dt.isActive()) {
-+ insideTarget = dt;
-+ super.processEnterMessage(event);
-+ }
-+ }
-+
-+ /**
-+ * Could be called when DnD exits a heavyweight or synthesized in processMotionMessage
-+ */
-+ @Override
-+ protected void processExitMessage(SunDropTargetEvent event) {
-+ if (event.getComponent().getDropTarget() == insideTarget) {
-+ insideTarget = null;
-+ super.processExitMessage(event);
-+ }
-+ }
-+
- @Override
- protected void processDropMessage(SunDropTargetEvent event) {
-- Component eventSource = (Component)event.getComponent();
-- Point screenPoint = event.getPoint();
-- SwingUtilities.convertPointToScreen(screenPoint, eventSource);
-- Rectangle screenBounds = new Rectangle(eventSource.getLocationOnScreen().x,
-- eventSource.getLocationOnScreen().y,
-- eventSource.getWidth(), eventSource.getHeight());
-- if(screenBounds.contains(screenPoint)) {
-+ if (isEventInsideTarget(event)) {
- super.processDropMessage(event);
-+ insideTarget = null;
- }
- }
-
-+ private boolean isEventInsideTarget(SunDropTargetEvent event) {
-+ Component eventSource = event.getComponent();
-+ Point screenPoint = event.getPoint();
-+ SwingUtilities.convertPointToScreen(screenPoint, eventSource);
-+ Point locationOnScreen = eventSource.getLocationOnScreen();
-+ Rectangle screenBounds = new Rectangle(locationOnScreen.x,
-+ locationOnScreen.y,
-+ eventSource.getWidth(),
-+ eventSource.getHeight());
-+ return screenBounds.contains(screenPoint);
-+ }
-+
- @Override
- protected int postDropTargetEvent(Component component, int x, int y, int dropAction,
- int actions, long[] formats, long nativeCtxt, int eventID,
---- ./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-07-15 21:49:29.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/CMenuComponent.java 2013-09-06 11:27:49.000000000 -0700
-+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CMenuComponent.java 2014-07-15 21:49:29.000000000 -0700
-@@ -43,7 +43,7 @@
- return target;
- }
-
-- long getModel() {
-+ public long getModel() {
- return modelPtr;
- }
-
---- ./jdk/src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java 2013-09-06 11:27:49.000000000 -0700
-+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,45 +0,0 @@
--/*
-- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. 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.lwawt.macosx;
--
--import java.awt.Window;
--import sun.lwawt.LWMouseInfoPeer;
--import sun.lwawt.LWWindowPeer;
--
--public class CMouseInfoPeer extends LWMouseInfoPeer
--{
-- //If a new window is to appear under the cursor,
-- //we get wrong window.
-- //This is a workaround for macosx.
-- @Override
-- public boolean isWindowUnderMouse(Window w) {
-- if (w == null) {
-- return false;
-- }
--
-- return ((LWWindowPeer)w.getPeer()).getPlatformWindow().isUnderMouse();
-- }
--}
---- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java 2013-09-06 11:27:49.000000000 -0700
-+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java 2014-10-28 20:19:45.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
-@@ -151,6 +151,11 @@
- @Override
- public void setAlwaysOnTop(boolean value) {}
-
-+ // This method should be properly implemented for applets.
-+ // It returns null just as a stub.
-+ @Override
-+ public PlatformWindow getTopmostPlatformWindowUnderMouse() { return null; }
-+
- @Override
- public void updateFocusableWindowState() {}
-
---- ./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-10-28 20:19:45.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
-@@ -61,8 +61,9 @@
- private static native void nativeSetNSWindowMinimizedIcon(long nsWindowPtr, long nsImage);
- private static native void nativeSetNSWindowRepresentedFilename(long nsWindowPtr, String representedFilename);
- private static native void nativeSetEnabled(long nsWindowPtr, boolean isEnabled);
-- private static native void nativeSynthesizeMouseEnteredExitedEvents(long nsWindowPtr);
-+ private static native void nativeSynthesizeMouseEnteredExitedEvents();
- private static native void nativeDispose(long nsWindowPtr);
-+ private static native CPlatformWindow nativeGetTopmostPlatformWindowUnderMouse();
-
- // Loger to report issues happened during execution but that do not affect functionality
- private static final PlatformLogger logger = PlatformLogger.getLogger("sun.lwawt.macosx.CPlatformWindow");
-@@ -579,7 +580,12 @@
- if (visible) {
- // Apply the extended state as expected in shared code
- if (target instanceof Frame) {
-- switch (((Frame)target).getExtendedState()) {
-+ int frameState = ((Frame)target).getExtendedState();
-+ if ((frameState & Frame.ICONIFIED) != 0) {
-+ // Treat all state bit masks with ICONIFIED bit as ICONIFIED state.
-+ frameState = Frame.ICONIFIED;
-+ }
-+ switch (frameState) {
- case Frame.ICONIFIED:
- CWrapper.NSWindow.miniaturize(nsWindowPtr);
- break;
-@@ -593,7 +599,7 @@
- }
- }
-
-- nativeSynthesizeMouseEnteredExitedEvents(nsWindowPtr);
-+ nativeSynthesizeMouseEnteredExitedEvents();
-
- // Configure stuff #2
- updateFocusabilityForAutoRequestFocus(true);
-@@ -738,6 +744,9 @@
- setStyleBits(ALWAYS_ON_TOP, isAlwaysOnTop);
- }
-
-+ public PlatformWindow getTopmostPlatformWindowUnderMouse() {
-+ return CPlatformWindow.nativeGetTopmostPlatformWindowUnderMouse();
-+ }
- @Override
- public void setOpacity(float opacity) {
- CWrapper.NSWindow.setAlphaValue(getNSWindowPtr(), opacity);
-@@ -802,6 +811,10 @@
- if (prevWindowState == windowState) return;
-
- final long nsWindowPtr = getNSWindowPtr();
-+ if ((windowState & Frame.ICONIFIED) != 0) {
-+ // Treat all state bit masks with ICONIFIED bit as ICONIFIED state.
-+ windowState = Frame.ICONIFIED;
-+ }
- switch (windowState) {
- case Frame.ICONIFIED:
- if (prevWindowState == Frame.MAXIMIZED_BOTH) {
-@@ -830,7 +843,7 @@
- throw new RuntimeException("Unknown window state: " + windowState);
- }
-
-- nativeSynthesizeMouseEnteredExitedEvents(nsWindowPtr);
-+ nativeSynthesizeMouseEnteredExitedEvents();
-
- // NOTE: the SWP.windowState field gets updated to the newWindowState
- // value when the native notification comes to us
-@@ -918,7 +931,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-07-15 21:49:29.000000000 -0700
-@@ -97,6 +97,6 @@
- setVisible(true);
- }
- }, this);
-- } catch (InterruptedException | InvocationTargetException ex) {}
-+ } catch (InvocationTargetException ex) {}
- }
- }
---- ./jdk/src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java 2013-09-06 11:27:49.000000000 -0700
-+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java 2014-10-28 20:19:45.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 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
-@@ -148,6 +148,11 @@
- }
-
- @Override
-+ public PlatformWindow getTopmostPlatformWindowUnderMouse() {
-+ return null;
-+ }
-+
-+ @Override
- public void updateFocusableWindowState() {
- }
-
---- ./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-10-28 20:19:45.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 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
-@@ -44,6 +44,8 @@
- import sun.lwawt.LWWindowPeer.PeerType;
- import sun.security.action.GetBooleanAction;
-
-+import sun.util.CoreResourceBundleControl;
-+
-
- class NamedCursor extends Cursor {
- NamedCursor(String name) {
-@@ -68,13 +70,26 @@
-
- static {
- System.err.flush();
-- java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Object>() {
-- public Object run() {
-+ ResourceBundle platformResources = java.security.AccessController.doPrivileged(
-+ new java.security.PrivilegedAction<ResourceBundle>() {
-+ public ResourceBundle run() {
-+ ResourceBundle platformResources = null;
-+ try {
-+ platformResources =
-+ ResourceBundle.getBundle("sun.awt.resources.awtosx",
-+ CoreResourceBundleControl.getRBControlInstance());
-+ } catch (MissingResourceException e) {
-+ // No resource file; defaults will be used.
-+ }
-+
- System.loadLibrary("awt");
- System.loadLibrary("fontmanager");
-- return null;
-+ return platformResources;
- }
- });
-+
-+ AWTAccessor.getToolkitAccessor().setPlatformResources(platformResources);
-+
- if (!GraphicsEnvironment.isHeadless()) {
- initIDs();
- }
-@@ -285,11 +300,6 @@
- }
-
- @Override
-- protected MouseInfoPeer createMouseInfoPeerImpl() {
-- return new CMouseInfoPeer();
-- }
--
-- @Override
- protected int getScreenHeight() {
- return GraphicsEnvironment.getLocalGraphicsEnvironment()
- .getDefaultScreenDevice().getDefaultConfiguration().getBounds().height;
-@@ -414,8 +424,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 +535,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/lib/flavormap.properties 2013-09-06 11:27:49.000000000 -0700
-+++ ./jdk/src/macosx/lib/flavormap.properties 2014-07-15 21:49:29.000000000 -0700
-@@ -76,5 +76,6 @@
- text/uri-list=application/x-java-file-list;class=java.util.List
- PNG=image/x-java-image;class=java.awt.Image
- JFIF=image/x-java-image;class=java.awt.Image
-+TIFF=image/x-java-image;class=java.awt.Image
- RICH_TEXT=text/rtf
- HTML=text/html;charset=utf-8;eoln="\r\n";terminators=1
---- ./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 @@
--/*
-- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--#import <dlfcn.h>
--#import <Cocoa/Cocoa.h>
--#import <JavaNativeFoundation/JavaNativeFoundation.h>
--
--#ifndef MAXPATHLEN
--#define MAXPATHLEN PATH_MAX
--#endif
--
--static jboolean
--GetPathFromCurrentBinary(char *buf, jint bufsize)
--{
-- Dl_info dlinfo;
-- dladdr((void *)GetPathFromCurrentBinary, &dlinfo);
-- if (realpath(dlinfo.dli_fname, buf) == NULL) {
--// fprintf(stderr, "Error: realpath(`%s') failed.\n", dlinfo.dli_fname);
-- return JNI_FALSE;
-- }
--
-- const char *libawt = "lib/libawt.dylib";
-- int strLen, libawtLen;
--
-- strLen = strlen(buf);
-- libawtLen = strlen(libawt);
--
-- if (strLen < libawtLen ||
-- strcmp(buf + strLen - libawtLen, libawt) != 0) {
-- return JNI_FALSE;
-- }
--
-- buf[strLen - libawtLen] = '\0';
--
-- return JNI_TRUE;
--}
--
--#define JAVA_DLL "libjava.dylib"
--
--static jboolean
--GetJREPath(char *buf, jint bufsize)
--{
-- /* try to get the path from the current binary, if not, bail to the framework */
-- if (GetPathFromCurrentBinary(buf, bufsize) == JNI_TRUE) {
-- /* does the rest of the JRE exist? */
-- char libjava[MAXPATHLEN];
-- snprintf(libjava, MAXPATHLEN, "%s/lib/" JAVA_DLL, buf);
-- if (access(libjava, F_OK) == 0) {
-- return JNI_TRUE;
-- }
-- }
--
-- return JNI_FALSE;
--}
--
--static NSString *getRunningJavaBundle()
--{
-- char path[MAXPATHLEN];
-- GetJREPath(path, MAXPATHLEN);
-- return [[NSString alloc] initWithFormat:@"%@/bundle", [NSString stringWithUTF8String:path]];
--}
--
--/*
-- * Class: com_apple_resources_LoadNativeBundleAction
-- * Method: getPathToBundleFile
-- * Signature: (Ljava/lang/String)Ljava/lang/String;
-- */
--JNIEXPORT jstring JNICALL
--Java_com_apple_resources_LoadNativeBundleAction_getPathToBundleFile
-- (JNIEnv *env, jclass klass, jstring filename)
--{
-- jstring returnVal = NULL;
-- if (filename == NULL) {
-- return NULL;
-- }
--
--JNF_COCOA_ENTER(env);
-- NSBundle *javaBundle = [NSBundle bundleWithPath:getRunningJavaBundle()];
-- NSString *baseFilename = JNFJavaToNSString(env, filename);
-- NSString *propertyFilePath = [javaBundle pathForResource:baseFilename ofType:@"properties"];
--
-- if (propertyFilePath != nil) {
-- returnVal = JNFNSToJavaString(env, propertyFilePath);
-- }
--JNF_COCOA_EXIT(env);
--
-- return returnVal;
--}
---- ./jdk/src/macosx/native/java/util/SCDynamicStoreConfig.m 2013-09-06 11:27:49.000000000 -0700
-+++ ./jdk/src/macosx/native/java/util/SCDynamicStoreConfig.m 2014-07-15 21:49:29.000000000 -0700
-@@ -103,7 +103,6 @@
- CFTypeRef realmInfo = SCDynamicStoreCopyValue(store, (CFStringRef) [NSString stringWithFormat:@"Kerberos:%@", realm]);
-
- if (CFGetTypeID(realmInfo) != CFDictionaryGetTypeID()) {
-- NSLog(@"Unexpected CFType for realm Info: %lu", CFGetTypeID(realmInfo));
- return nil;
- }
-
-@@ -140,7 +139,6 @@
-
- SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("java"), _SCDynamicStoreCallBack, NULL);
- if (store == NULL) {
-- NSLog(@"Unable to load SCDynamicStore to install NotificationCallback");
- return;
- }
-
-@@ -171,19 +169,11 @@
-
- SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR("java-kerberos"), NULL, NULL);
- if (store == NULL) {
-- NSLog(@"Unable to load SCDynamicStore");
-- return NULL;
-- }
--
-- // Create the store if it is NULL and set it.
-- if (store == NULL) {
-- NSLog(@"Invalid value for SCDynamicStore");
- return NULL;
- }
-
- CFTypeRef realms = SCDynamicStoreCopyValue(store, (CFStringRef) KERBEROS_DEFAULT_REALMS);
- if (realms == NULL || CFGetTypeID(realms) != CFArrayGetTypeID()) {
-- NSLog(@"Unable to load realm info from SCDynamicStore");
- if (realms) CFRelease(realms);
- CFRelease(store);
- return NULL;
-@@ -192,7 +182,6 @@
- CFTypeRef realmMappings = SCDynamicStoreCopyValue(store, (CFStringRef) KERBEROS_DEFAULT_REALM_MAPPINGS);
-
- if (realmMappings == NULL || CFGetTypeID(realmMappings) != CFArrayGetTypeID()) {
-- NSLog(@"Unable to load realm mapping info from SCDynamicStore");
- if (realmMappings) CFRelease(realmMappings);
- CFRelease(realms);
- CFRelease(store);
---- ./jdk/src/macosx/native/sun/awt/AWTEvent.m 2013-09-06 11:27:50.000000000 -0700
-+++ ./jdk/src/macosx/native/sun/awt/AWTEvent.m 2014-07-15 21:49:29.000000000 -0700
-@@ -382,7 +382,7 @@
- {
- TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
- CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
-- if (uchr == nil) { return; }
-+ if (uchr == nil) { return 0; }
- const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr);
- // Carbon modifiers should be used instead of NSEvent modifiers
- UInt32 modifierKeyState = (GetCurrentEventKeyModifiers() >> 8) & 0xFF;
---- ./jdk/src/macosx/native/sun/awt/AWTView.h 2013-09-06 11:27:50.000000000 -0700
-+++ ./jdk/src/macosx/native/sun/awt/AWTView.h 2014-10-28 20:19:45.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,8 +33,8 @@
- @private
- jobject m_cPlatformView;
-
-- // Handler for the tracking rect needed for Enter/Exit events management.
-- NSTrackingRectTag rolloverTrackingRectTag;
-+ // Handler for the tracking area needed for Enter/Exit events management.
-+ NSTrackingArea* rolloverTrackingArea;
-
- // TODO: NSMenu *contextualMenu;
-
-@@ -61,7 +61,7 @@
-
- - (id) initWithRect:(NSRect) rect platformView:(jobject)cPlatformView windowLayer:(CALayer*)windowLayer;
- - (void) deliverJavaMouseEvent: (NSEvent *) event;
--- (void) resetTrackingRect;
-+- (void) resetTrackingArea;
- - (void) deliverJavaKeyEventHelper: (NSEvent *) event;
- - (jobject) awtComponent:(JNIEnv *)env;
-
---- ./jdk/src/macosx/native/sun/awt/AWTView.m 2013-09-06 11:27:50.000000000 -0700
-+++ ./jdk/src/macosx/native/sun/awt/AWTView.m 2014-10-28 20:19:45.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
-@@ -82,6 +82,7 @@
- fPAHNeedsToSelect = NO;
-
- mouseIsOver = NO;
-+ [self resetTrackingArea];
-
- if (windowLayer != nil) {
- self.cglLayer = windowLayer;
-@@ -149,7 +150,7 @@
- [[self window] makeFirstResponder: self];
- }];
- if ([self window] != NULL) {
-- [self resetTrackingRect];
-+ [self resetTrackingArea];
- }
- }
-
-@@ -380,30 +381,31 @@
- JNFCallVoidMethod(env, m_cPlatformView, jm_deliverMouseEvent, jEvent);
- }
-
--
--- (void) clearTrackingRect {
-- if (rolloverTrackingRectTag > 0) {
-- [self removeTrackingRect:rolloverTrackingRectTag];
-- rolloverTrackingRectTag = 0;
-+- (void) resetTrackingArea {
-+ if (rolloverTrackingArea != nil) {
-+ [self removeTrackingArea:rolloverTrackingArea];
-+ [rolloverTrackingArea release];
- }
--}
-
--- (void) resetTrackingRect {
-- [self clearTrackingRect];
-- rolloverTrackingRectTag = [self addTrackingRect:[self visibleRect]
-- owner:self
-- userData:NULL
-- assumeInside:NO];
-+ int options = (NSTrackingActiveAlways | NSTrackingMouseEnteredAndExited |
-+ NSTrackingMouseMoved | NSTrackingEnabledDuringMouseDrag);
-+
-+ rolloverTrackingArea = [[NSTrackingArea alloc] initWithRect:[self visibleRect]
-+ options:options
-+ owner:self
-+ userInfo:nil
-+ ];
-+ [self addTrackingArea:rolloverTrackingArea];
- }
-
- - (void)updateTrackingAreas {
- [super updateTrackingAreas];
-- [self resetTrackingRect];
-+ [self resetTrackingArea];
- }
-
- - (void) resetCursorRects {
- [super resetCursorRects];
-- [self resetTrackingRect];
-+ [self resetTrackingArea];
- }
-
- -(void) deliverJavaKeyEventHelper: (NSEvent *) event {
---- ./jdk/src/macosx/native/sun/awt/AWTWindow.m 2013-09-06 11:27:51.000000000 -0700
-+++ ./jdk/src/macosx/native/sun/awt/AWTWindow.m 2014-10-28 20:19:45.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
-@@ -30,6 +30,7 @@
- #import "sun_lwawt_macosx_CPlatformWindow.h"
- #import "com_apple_eawt_event_GestureHandler.h"
- #import "com_apple_eawt_FullScreenHandler.h"
-+#import "ApplicationDelegate.h"
-
- #import "AWTWindow.h"
- #import "AWTView.h"
-@@ -313,10 +314,8 @@
- return [window isKindOfClass: [AWTWindow_Panel class]] || [window isKindOfClass: [AWTWindow_Normal class]];
- }
-
--// checks that this window is under the mouse cursor and this point is not overlapped by others windows
--- (BOOL) isTopmostWindowUnderMouse {
--
-- int currentWinID = [self.nsWindow windowNumber];
-+// return id for the topmost window under mouse
-++ (NSInteger) getTopmostWindowUnderMouseID {
-
- NSRect screenRect = [[NSScreen mainScreen] frame];
- NSPoint nsMouseLocation = [NSEvent mouseLocation];
-@@ -326,51 +325,75 @@
-
-
- for (NSDictionary *window in windows) {
-- int layer = [[window objectForKey:(id)kCGWindowLayer] intValue];
-+ NSInteger layer = [[window objectForKey:(id)kCGWindowLayer] integerValue];
- if (layer == 0) {
-- int winID = [[window objectForKey:(id)kCGWindowNumber] intValue];
- CGRect rect;
- CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[window objectForKey:(id)kCGWindowBounds], &rect);
- if (CGRectContainsPoint(rect, cgMouseLocation)) {
-- return currentWinID == winID;
-- } else if (currentWinID == winID) {
-- return NO;
-+ return [[window objectForKey:(id)kCGWindowNumber] integerValue];
- }
- }
- }
-- return NO;
-+ return -1;
- }
-
--- (void) synthesizeMouseEnteredExitedEvents {
-+// checks that this window is under the mouse cursor and this point is not overlapped by other windows
-+- (BOOL) isTopmostWindowUnderMouse {
-+ return [self.nsWindow windowNumber] == [AWTWindow getTopmostWindowUnderMouseID];
-+}
-
-- int eventType = 0;
-- BOOL isUnderMouse = [self isTopmostWindowUnderMouse];
-- BOOL mouseIsOver = [[self.nsWindow contentView] mouseIsOver];
--
-- if (isUnderMouse && !mouseIsOver) {
-- eventType = NSMouseEntered;
-- } else if (!isUnderMouse && mouseIsOver) {
-- eventType = NSMouseExited;
-- } else {
-- return;
-++ (AWTWindow *) getTopmostWindowUnderMouse {
-+ NSEnumerator *windowEnumerator = [[NSApp windows] objectEnumerator];
-+ NSWindow *window;
-+
-+ NSInteger topmostWindowUnderMouseID = [AWTWindow getTopmostWindowUnderMouseID];
-+
-+ while ((window = [windowEnumerator nextObject]) != nil) {
-+ if ([window windowNumber] == topmostWindowUnderMouseID) {
-+ BOOL isAWTWindow = [AWTWindow isAWTWindow: window];
-+ return isAWTWindow ? (AWTWindow *) [window delegate] : nil;
-+ }
- }
-+ return nil;
-+}
-+
-++ (void) synthesizeMouseEnteredExitedEvents:(NSWindow*)window withType:(NSEventType)eventType {
-
- NSPoint screenLocation = [NSEvent mouseLocation];
-- NSPoint windowLocation = [self.nsWindow convertScreenToBase: screenLocation];
-+ NSPoint windowLocation = [window convertScreenToBase: screenLocation];
- int modifierFlags = (eventType == NSMouseEntered) ? NSMouseEnteredMask : NSMouseExitedMask;
-
- NSEvent *mouseEvent = [NSEvent enterExitEventWithType: eventType
- location: windowLocation
- modifierFlags: modifierFlags
- timestamp: 0
-- windowNumber: [self.nsWindow windowNumber]
-+ windowNumber: [window windowNumber]
- context: nil
- eventNumber: 0
- trackingNumber: 0
- userData: nil
- ];
-
-- [[self.nsWindow contentView] deliverJavaMouseEvent: mouseEvent];
-+ [[window contentView] deliverJavaMouseEvent: mouseEvent];
-+}
-+
-++(void) synthesizeMouseEnteredExitedEventsForAllWindows {
-+ NSInteger topmostWindowUnderMouseID = [AWTWindow getTopmostWindowUnderMouseID];
-+ NSArray *windows = [NSApp windows];
-+ NSWindow *window;
-+
-+ NSEnumerator *windowEnumerator = [windows objectEnumerator];
-+ while ((window = [windowEnumerator nextObject]) != nil) {
-+ if ([AWTWindow isAWTWindow: window]) {
-+ BOOL isUnderMouse = ([window windowNumber] == topmostWindowUnderMouseID);
-+ BOOL mouseIsOver = [[window contentView] mouseIsOver];
-+ if (isUnderMouse && !mouseIsOver) {
-+ [AWTWindow synthesizeMouseEnteredExitedEvents: window withType:NSMouseEntered];
-+ } else if (!isUnderMouse && mouseIsOver) {
-+ [AWTWindow synthesizeMouseEnteredExitedEvents: window withType:NSMouseExited];
-+ }
-+ }
-+ }
- }
-
- + (NSNumber *) getNSWindowDisplayID_AppKitThread:(NSWindow *)window {
-@@ -585,17 +608,26 @@
- AWT_ASSERT_APPKIT_THREAD;
- [AWTToolkit eventCountPlusPlus];
- AWTWindow *opposite = [AWTWindow lastKeyWindow];
--
-+
- // Finds appropriate menubar in our hierarchy,
- AWTWindow *awtWindow = self;
- while (awtWindow.ownerWindow != nil) {
- awtWindow = awtWindow.ownerWindow;
- }
-+
- CMenuBar *menuBar = nil;
-+ BOOL isDisabled = NO;
- if ([awtWindow.nsWindow isVisible]){
- menuBar = awtWindow.javaMenuBar;
-+ isDisabled = !awtWindow.isEnabled;
-+ }
-+
-+ if (menuBar == nil) {
-+ menuBar = [[ApplicationDelegate sharedDelegate] defaultMenuBar];
-+ isDisabled = NO;
- }
-- [CMenuBar activate:menuBar modallyDisabled:!awtWindow.isEnabled];
-+
-+ [CMenuBar activate:menuBar modallyDisabled:isDisabled];
-
- [AWTWindow setLastKeyWindow:nil];
-
-@@ -608,6 +640,14 @@
- [AWTToolkit eventCountPlusPlus];
- [self.javaMenuBar deactivate];
-
-+ // In theory, this might cause flickering if the window gaining focus
-+ // has its own menu. However, I couldn't reproduce it on practice, so
-+ // perhaps this is a non issue.
-+ CMenuBar* defaultMenu = [[ApplicationDelegate sharedDelegate] defaultMenuBar];
-+ if (defaultMenu != nil) {
-+ [CMenuBar activate:defaultMenu modallyDisabled:NO];
-+ }
-+
- // the new key window
- NSWindow *keyWindow = [NSApp keyWindow];
- AWTWindow *opposite = nil;
-@@ -875,11 +915,19 @@
-
- AWTWindow *window = (AWTWindow*)[nsWindow delegate];
-
-- if ([nsWindow isKeyWindow]) [window.javaMenuBar deactivate];
-+ if ([nsWindow isKeyWindow]) {
-+ [window.javaMenuBar deactivate];
-+ }
-+
- window.javaMenuBar = menuBar;
-
-+ CMenuBar* actualMenuBar = menuBar;
-+ if (actualMenuBar == nil) {
-+ actualMenuBar = [[ApplicationDelegate sharedDelegate] defaultMenuBar];
-+ }
-+
- if ([nsWindow isKeyWindow]) {
-- [CMenuBar activate:window.javaMenuBar modallyDisabled:NO];
-+ [CMenuBar activate:actualMenuBar modallyDisabled:NO];
- }
- }];
-
-@@ -953,7 +1001,7 @@
- // (this will also re-enable screen updates, which were disabled above)
- // TODO: send PaintEvent
-
-- [window synthesizeMouseEnteredExitedEvents];
-+ [AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
- }];
-
- JNF_COCOA_EXIT(env);
-@@ -1132,19 +1180,40 @@
-
- /*
- * Class: sun_lwawt_macosx_CPlatformWindow
-+ * Method: nativeGetTopMostWindowUnderMouse
-+ * Signature: (J)V
-+ */
-+JNIEXPORT jobject
-+JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeGetTopmostPlatformWindowUnderMouse
-+(JNIEnv *env, jclass clazz)
-+{
-+ jobject topmostWindowUnderMouse = nil;
-+
-+ JNF_COCOA_ENTER(env);
-+ AWT_ASSERT_APPKIT_THREAD;
-+
-+ AWTWindow *awtWindow = [AWTWindow getTopmostWindowUnderMouse];
-+ if (awtWindow != nil) {
-+ topmostWindowUnderMouse = [awtWindow.javaPlatformWindow jObject];
-+ }
-+
-+ JNF_COCOA_EXIT(env);
-+
-+ return topmostWindowUnderMouse;
-+}
-+
-+/*
-+ * Class: sun_lwawt_macosx_CPlatformWindow
- * Method: nativeSynthesizeMouseEnteredExitedEvents
- * Signature: (J)V
- */
- JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents
--(JNIEnv *env, jclass clazz, jlong windowPtr)
-+(JNIEnv *env, jclass clazz)
- {
- JNF_COCOA_ENTER(env);
-
-- NSWindow *nsWindow = OBJC(windowPtr);
- [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
-- AWTWindow *window = (AWTWindow*)[nsWindow delegate];
--
-- [window synthesizeMouseEnteredExitedEvents];
-+ [AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
- }];
-
- JNF_COCOA_EXIT(env);
---- ./jdk/src/macosx/native/sun/awt/CDropTarget.m 2013-09-06 11:27:51.000000000 -0700
-+++ ./jdk/src/macosx/native/sun/awt/CDropTarget.m 2014-07-15 21:49:29.000000000 -0700
-@@ -477,6 +477,8 @@
- sDraggingExited = FALSE;
- sDraggingLocation = [sender draggingLocation];
- NSPoint javaLocation = [fView convertPoint:sDraggingLocation fromView:nil];
-+ javaLocation.y = fView.window.frame.size.height - javaLocation.y;
-+
- DLog5(@"+ dragEnter: loc native %f, %f, java %f, %f\n", sDraggingLocation.x, sDraggingLocation.y, javaLocation.x, javaLocation.y);
-
- ////////// BEGIN Calculate the current drag actions //////////
-@@ -570,8 +572,7 @@
- // Should we notify Java things have changed?
- if (sDraggingError == FALSE && notifyJava) {
- NSPoint javaLocation = [fView convertPoint:sDraggingLocation fromView:nil];
-- // For some reason even after the convertPoint drag events come with the y coordinate reverted
-- javaLocation.y = fView.window.frame.size.height - javaLocation.y;
-+ javaLocation.y = fView.window.frame.size.height - javaLocation.y;
- //DLog5(@" : dragMoved: loc native %f, %f, java %f, %f\n", sDraggingLocation.x, sDraggingLocation.y, javaLocation.x, javaLocation.y);
-
- jlongArray formats = sDraggingFormats;
---- ./jdk/src/macosx/native/sun/awt/CMenuItem.m 2013-09-06 11:27:51.000000000 -0700
-+++ ./jdk/src/macosx/native/sun/awt/CMenuItem.m 2014-07-15 21:49:29.000000000 -0700
-@@ -70,9 +70,15 @@
- JNIEnv *env = [ThreadUtilities getJNIEnv];
- JNF_COCOA_ENTER(env);
-
-- // If we are called as a result of user pressing a shorcut, do nothing,
-- // because AWTView has already sent corresponding key event to the Java
-- // layer from performKeyEquivalent
-+ // If we are called as a result of user pressing a shortcut, do nothing,
-+ // because AVTView has already sent corresponding key event to the Java
-+ // layer from performKeyEquivalent.
-+ // There is an exception from the rule above, though: if a window with
-+ // a menu gets minimized by user and there are no other windows to take
-+ // focus, the window's menu won't be removed from the global menu bar.
-+ // However, the Java layer won't handle invocation by a shortcut coming
-+ // from this "frameless" menu, because there are no active windows. This
-+ // means we have to handle it here.
- NSEvent *currEvent = [[NSApplication sharedApplication] currentEvent];
- if ([currEvent type] == NSKeyDown) {
- NSString *menuKey = [sender keyEquivalent];
-@@ -91,7 +97,8 @@
- eventKey = [NSString stringWithCharacters: &newChar length: 1];
- }
-
-- if ([menuKey isEqualToString:eventKey]) {
-+ NSWindow *keyWindow = [NSApp keyWindow];
-+ if ([menuKey isEqualToString:eventKey] && keyWindow != nil) {
- return;
- }
- }
-@@ -289,7 +296,7 @@
-
- case java_awt_event_KeyEvent_VK_HELP : macKey = NSHelpFunctionKey; break;
- case java_awt_event_KeyEvent_VK_TAB : macKey = NSTabCharacter; break;
-- case java_awt_event_KeyEvent_VK_ENTER : macKey = NSCarriageReturnCharacter; break;
-+ case java_awt_event_KeyEvent_VK_ENTER : macKey = NSNewlineCharacter; break;
- case java_awt_event_KeyEvent_VK_BACK_SPACE : macKey = NSBackspaceCharacter; break;
- case java_awt_event_KeyEvent_VK_DELETE : macKey = NSDeleteCharacter; break;
- case java_awt_event_KeyEvent_VK_CLEAR : macKey = NSClearDisplayFunctionKey; break;
---- ./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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.000000000 -0700
-@@ -290,8 +290,8 @@
- SplashUnlock(splash);
- rc = poll(pfd, 1, timeout);
- SplashLock(splash);
-- if (splash->isVisible>0 && SplashTime() >= splash->time +
-- splash->frames[splash->currentFrame].delay) {
-+ if (splash->isVisible > 0 && splash->currentFrame >= 0 &&
-+ SplashTime() >= splash->time + splash->frames[splash->currentFrame].delay) {
- 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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:30.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-07-15 21:49:30.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/back/SDE.c 2013-09-06 11:27:51.000000000 -0700
-+++ ./jdk/src/share/back/SDE.c 2014-07-15 21:49:30.000000000 -0700
-@@ -28,6 +28,12 @@
- #include "util.h"
- #include "SDE.h"
-
-+#ifdef __APPLE__
-+/* use setjmp/longjmp versions that do not save/restore the signal mask */
-+#define setjmp _setjmp
-+#define longjmp _longjmp
-+#endif
-+
- /**
- * This SourceDebugExtension code does not
- * allow concurrent translation - due to caching method.
---- ./jdk/src/share/back/export/sys.h 2013-09-06 11:27:52.000000000 -0700
-+++ ./jdk/src/share/back/export/sys.h 2014-07-15 21:49:30.000000000 -0700
-@@ -37,7 +37,7 @@
-
- /* Implemented in linker_md.c */
-
--void dbgsysBuildLibName(char *, int, char *, char *);
-+void dbgsysBuildLibName(char *, int, const char *, const char *);
- void * dbgsysLoadLibrary(const char *, char *err_buf, int err_buflen);
- void dbgsysUnloadLibrary(void *);
- void * dbgsysFindLibraryEntry(void *, const char *);
---- ./jdk/src/share/back/transport.c 2013-09-06 11:27:52.000000000 -0700
-+++ ./jdk/src/share/back/transport.c 2014-07-15 21:49:30.000000000 -0700
-@@ -97,12 +97,12 @@
-
- /* Load transport library (directory=="" means do system search) */
- static void *
--loadTransportLibrary(char *libdir, char *name)
-+loadTransportLibrary(const char *libdir, const char *name)
- {
- void *handle;
- char libname[MAXPATHLEN+2];
- char buf[MAXPATHLEN*2+100];
-- char *plibdir;
-+ const char *plibdir;
-
- /* Convert libdir from UTF-8 to platform encoding */
- plibdir = NULL;
-@@ -117,6 +117,9 @@
-
- /* Construct library name (simple name or full path) */
- dbgsysBuildLibName(libname, sizeof(libname), plibdir, name);
-+ if (strlen(libname) == 0) {
-+ return NULL;
-+ }
-
- /* dlopen (unix) / LoadLibrary (windows) the transport library */
- handle = dbgsysLoadLibrary(libname, buf, sizeof(buf));
-@@ -128,12 +131,12 @@
- * JDK 1.2 javai.c v1.61
- */
- static jdwpError
--loadTransport(char *name, jdwpTransportEnv **transportPtr)
-+loadTransport(const char *name, jdwpTransportEnv **transportPtr)
- {
- JNIEnv *env;
- jdwpTransport_OnLoad_t onLoad;
- void *handle;
-- char *libdir;
-+ const char *libdir;
-
- /* Make sure library name is not empty */
- if (name == NULL) {
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -17,7 +17,7 @@
- awtcomponent=AWT-Komponente
- checkbox=Kontrollk\u00E4stchen
- colorchooser=Farbauswahl
--columnheader=Spalten-Header
-+columnheader=Spaltenheader
- combobox=Kombinationsfeld
- canvas=Leinwand
- desktopicon=Desktopsymbol
-@@ -46,7 +46,7 @@
- pushbutton=Schaltfl\u00E4che
- radiobutton=Optionsfeld
- rootpane=Root-Bereich
--rowheader=Zeilen-Header
-+rowheader=Zeilenheader
- scrollbar=Bildlaufleiste
- scrollpane=Bildlaufbereich
- separator=Trennzeichen
-@@ -102,7 +102,7 @@
- #
- # accessible actions
- #
--toggleexpand=ein-/ausblenden
-+toggleexpand=einblenden umschalten
-
- # 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-07-15 21:49:30.000000000 -0700
-@@ -102,7 +102,7 @@
- #
- # accessible actions
- #
--toggleexpand=activar/desactivar ampliaci\u00F3n
-+toggleexpand=conmutar ampliaci\u00F3n
-
- # 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-07-15 21:49:30.000000000 -0700
-@@ -102,7 +102,7 @@
- #
- # accessible actions
- #
--toggleexpand=basculer le d\u00E9veloppement
-+toggleexpand=activer/d\u00E9sactiver d\u00E9veloppement
-
- # 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-07-15 21:49:30.000000000 -0700
-@@ -102,7 +102,7 @@
- #
- # accessible actions
- #
--toggleexpand=abilita/disabilita espansione
-+toggleexpand=attiva/disattiva espansione
-
- # 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-07-15 21:49:30.000000000 -0700
-@@ -102,7 +102,7 @@
- #
- # accessible actions
- #
--toggleexpand=alternar expans\u00E3o
-+toggleexpand=alternar expandir
-
- # 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-07-15 21:49:30.000000000 -0700
-@@ -102,7 +102,7 @@
- #
- # accessible actions
- #
--toggleexpand=v\u00E4xla ut\u00F6ka
-+toggleexpand=v\u00E4xla expandering
-
- # new relations, roles and states for J2SE 1.5.0
-
---- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties 2013-09-06 11:27:52.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties 2014-10-28 20:19:45.000000000 -0700
-@@ -44,7 +44,7 @@
- popupmenu=\u5373\u73FE\u5F0F\u529F\u80FD\u8868
- progressbar=\u9032\u5EA6\u5217
- pushbutton=\u4E0B\u58D3\u6309\u9215
--radiobutton=\u55AE\u9078\u9215
-+radiobutton=\u5713\u9215
- rootpane=root \u7A97\u683C
- rowheader=\u5217\u6A19\u984C
- scrollbar=\u6372\u8EF8
---- ./jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java 2013-09-06 11:27:52.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 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
-@@ -110,6 +110,20 @@
- }
-
- /**
-+ * Tests whether the value of this element can be used
-+ * as an argument of the element that contained in this one.
-+ *
-+ * @return {@code true} if the value of this element can be used
-+ * as an argument of the element that contained in this one,
-+ * {@code false} otherwise
-+ */
-+ @Override
-+ protected boolean isArgument() {
-+ return true; // hack for compatibility
-+ }
-+
-+
-+ /**
- * Creates an instance of the array.
- *
- * @param type the base class
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -29,6 +29,7 @@
- import java.beans.ExceptionListener;
-
- import java.io.IOException;
-+import java.io.StringReader;
-
- import java.lang.ref.Reference;
- import java.lang.ref.WeakReference;
-@@ -246,6 +247,14 @@
- }
-
- /**
-+ * Disables any external entities.
-+ */
-+ @Override
-+ public InputSource resolveEntity(String publicId, String systemId) {
-+ return new InputSource(new StringReader(""));
-+ }
-+
-+ /**
- * Prepares this handler to read objects from XML document.
- */
- @Override
---- ./jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java 2013-09-06 11:27:52.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java 2014-07-15 21:49:30.000000000 -0700
-@@ -24,11 +24,12 @@
- */
- package com.sun.beans.finder;
-
--import com.sun.beans.WeakCache;
-+import com.sun.beans.util.Cache;
-
- import java.lang.reflect.Constructor;
- import java.lang.reflect.Modifier;
-
-+import static com.sun.beans.util.Cache.Kind.SOFT;
- import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
-
- /**
-@@ -41,7 +42,18 @@
- * @author Sergey A. Malenkov
- */
- public final class ConstructorFinder extends AbstractFinder<Constructor<?>> {
-- private static final WeakCache<Signature, Constructor<?>> CACHE = new WeakCache<Signature, Constructor<?>>();
-+ private static final Cache<Signature, Constructor<?>> CACHE = new Cache<Signature, Constructor<?>>(SOFT, SOFT) {
-+ @Override
-+ public Constructor create(Signature signature) {
-+ try {
-+ ConstructorFinder finder = new ConstructorFinder(signature.getArgs());
-+ return finder.find(signature.getType().getConstructors());
-+ }
-+ catch (Exception exception) {
-+ throw new SignatureException(exception);
-+ }
-+ }
-+ };
-
- /**
- * Finds public constructor
-@@ -69,13 +81,12 @@
- PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);
- Signature signature = new Signature(type, args);
-
-- Constructor<?> constructor = CACHE.get(signature);
-- if (constructor != null) {
-- return constructor;
-- }
-- constructor = new ConstructorFinder(args).find(type.getConstructors());
-- CACHE.put(signature, constructor);
-- return constructor;
-+ try {
-+ return CACHE.get(signature);
-+ }
-+ catch (SignatureException exception) {
-+ throw exception.toNoSuchMethodException("Constructor is not found");
-+ }
- }
-
- /**
---- ./jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java 2013-09-06 11:27:52.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java 2014-07-15 21:49:30.000000000 -0700
-@@ -25,7 +25,7 @@
- package com.sun.beans.finder;
-
- import com.sun.beans.TypeResolver;
--import com.sun.beans.WeakCache;
-+import com.sun.beans.util.Cache;
-
- import java.lang.reflect.Method;
- import java.lang.reflect.Modifier;
-@@ -33,6 +33,7 @@
- import java.lang.reflect.Type;
- import java.util.Arrays;
-
-+import static com.sun.beans.util.Cache.Kind.SOFT;
- import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
-
- /**
-@@ -45,7 +46,18 @@
- * @author Sergey A. Malenkov
- */
- public final class MethodFinder extends AbstractFinder<Method> {
-- private static final WeakCache<Signature, Method> CACHE = new WeakCache<Signature, Method>();
-+ private static final Cache<Signature, Method> CACHE = new Cache<Signature, Method>(SOFT, SOFT) {
-+ @Override
-+ public Method create(Signature signature) {
-+ try {
-+ MethodFinder finder = new MethodFinder(signature.getName(), signature.getArgs());
-+ return findAccessibleMethod(finder.find(signature.getType().getMethods()));
-+ }
-+ catch (Exception exception) {
-+ throw new SignatureException(exception);
-+ }
-+ }
-+ };
-
- /**
- * Finds public method (static or non-static)
-@@ -65,16 +77,13 @@
- PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);
- Signature signature = new Signature(type, name, args);
-
-- Method method = CACHE.get(signature);
-- boolean cached = method != null;
-- if (cached && isPackageAccessible(method.getDeclaringClass())) {
-- return method;
-+ try {
-+ Method method = CACHE.get(signature);
-+ return (method == null) || isPackageAccessible(method.getDeclaringClass()) ? method : CACHE.create(signature);
- }
-- method = findAccessibleMethod(new MethodFinder(name, args).find(type.getMethods()));
-- if (!cached) {
-- CACHE.put(signature, method);
-+ catch (SignatureException exception) {
-+ throw exception.toNoSuchMethodException("Method '" + name + "' is not found");
- }
-- return method;
- }
-
- /**
---- ./jdk/src/share/classes/com/sun/beans/finder/Signature.java 2013-09-06 11:27:52.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/beans/finder/Signature.java 2014-07-15 21:49:30.000000000 -0700
-@@ -62,6 +62,18 @@
- this.args = args;
- }
-
-+ Class<?> getType() {
-+ return this.type;
-+ }
-+
-+ String getName() {
-+ return this.name;
-+ }
-+
-+ Class<?>[] getArgs() {
-+ return this.args;
-+ }
-+
- /**
- * Indicates whether some other object is "equal to" this one.
- *
---- ./jdk/src/share/classes/com/sun/beans/finder/SignatureException.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/classes/com/sun/beans/finder/SignatureException.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,41 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+package com.sun.beans.finder;
-+
-+final class SignatureException extends RuntimeException {
-+ SignatureException(Throwable cause) {
-+ super(cause);
-+ }
-+
-+ NoSuchMethodException toNoSuchMethodException(String message) {
-+ Throwable throwable = getCause();
-+ if (throwable instanceof NoSuchMethodException) {
-+ return (NoSuchMethodException) throwable;
-+ }
-+ NoSuchMethodException exception = new NoSuchMethodException(message);
-+ exception.initCause(throwable);
-+ return exception;
-+ }
-+}
---- ./jdk/src/share/classes/com/sun/beans/util/Cache.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,613 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+package com.sun.beans.util;
-+
-+import java.lang.ref.ReferenceQueue;
-+import java.lang.ref.SoftReference;
-+import java.lang.ref.WeakReference;
-+import java.util.Objects;
-+
-+/**
-+ * Hash table based implementation of the cache,
-+ * which allows to use weak or soft references for keys and values.
-+ * An entry in a {@code Cache} will automatically be removed
-+ * when its key or value is no longer in ordinary use.
-+ *
-+ * @author Sergey Malenkov
-+ * @since 1.8
-+ */
-+public abstract class Cache<K,V> {
-+ private static final int MAXIMUM_CAPACITY = 1 << 30; // maximum capacity MUST be a power of two <= 1<<30
-+
-+ private final boolean identity; // defines whether the identity comparison is used
-+ private final Kind keyKind; // a reference kind for the cache keys
-+ private final Kind valueKind; // a reference kind for the cache values
-+
-+ private final ReferenceQueue<Object> queue = new ReferenceQueue<>(); // queue for references to remove
-+
-+ private volatile CacheEntry<K,V>[] table = newTable(1 << 3); // table's length MUST be a power of two
-+ private int threshold = 6; // the next size value at which to resize
-+ private int size; // the number of key-value mappings contained in this map
-+
-+ /**
-+ * Creates a corresponding value for the specified key.
-+ *
-+ * @param key a key that can be used to create a value
-+ * @return a corresponding value for the specified key
-+ */
-+ public abstract V create(K key);
-+
-+ /**
-+ * Constructs an empty {@code Cache}.
-+ * The default initial capacity is 8.
-+ * The default load factor is 0.75.
-+ *
-+ * @param keyKind a reference kind for keys
-+ * @param valueKind a reference kind for values
-+ *
-+ * @throws NullPointerException if {@code keyKind} or {@code valueKind} are {@code null}
-+ */
-+ public Cache(Kind keyKind, Kind valueKind) {
-+ this(keyKind, valueKind, false);
-+ }
-+
-+ /**
-+ * Constructs an empty {@code Cache}
-+ * with the specified comparison method.
-+ * The default initial capacity is 8.
-+ * The default load factor is 0.75.
-+ *
-+ * @param keyKind a reference kind for keys
-+ * @param valueKind a reference kind for values
-+ * @param identity defines whether reference-equality
-+ * is used in place of object-equality
-+ *
-+ * @throws NullPointerException if {@code keyKind} or {@code valueKind} are {@code null}
-+ */
-+ public Cache(Kind keyKind, Kind valueKind, boolean identity) {
-+ Objects.requireNonNull(keyKind, "keyKind");
-+ Objects.requireNonNull(valueKind, "valueKind");
-+ this.keyKind = keyKind;
-+ this.valueKind = valueKind;
-+ this.identity = identity;
-+ }
-+
-+ /**
-+ * Returns the value to which the specified key is mapped,
-+ * or {@code null} if there is no mapping for the key.
-+ *
-+ * @param key the key whose cached value is to be returned
-+ * @return a value to which the specified key is mapped,
-+ * or {@code null} if there is no mapping for {@code key}
-+ *
-+ * @throws NullPointerException if {@code key} is {@code null}
-+ * or corresponding value is {@code null}
-+ */
-+ public final V get(K key) {
-+ Objects.requireNonNull(key, "key");
-+ removeStaleEntries();
-+ int hash = hash(key);
-+ // unsynchronized search improves performance
-+ // the null value does not mean that there are no needed entry
-+ CacheEntry<K,V>[] table = this.table; // unsynchronized access
-+ V current = getEntryValue(key, hash, table[index(hash, table)]);
-+ if (current != null) {
-+ return current;
-+ }
-+ synchronized (this.queue) {
-+ // synchronized search improves stability
-+ // we must create and add new value if there are no needed entry
-+ int index = index(hash, this.table);
-+ current = getEntryValue(key, hash, this.table[index]);
-+ if (current != null) {
-+ return current;
-+ }
-+ V value = create(key);
-+ Objects.requireNonNull(value, "value");
-+ this.table[index] = new CacheEntry<>(hash, key, value, this.table[index]);
-+ if (++this.size >= this.threshold) {
-+ if (this.table.length == MAXIMUM_CAPACITY) {
-+ this.threshold = Integer.MAX_VALUE;
-+ } else {
-+ removeStaleEntries();
-+ table = newTable(this.table.length << 1);
-+ transfer(this.table, table);
-+ // If ignoring null elements and processing ref queue caused massive
-+ // shrinkage, then restore old table. This should be rare, but avoids
-+ // unbounded expansion of garbage-filled tables.
-+ if (this.size >= this.threshold / 2) {
-+ this.table = table;
-+ this.threshold <<= 1;
-+ } else {
-+ transfer(table, this.table);
-+ }
-+ removeStaleEntries();
-+ }
-+ }
-+ return value;
-+ }
-+ }
-+
-+ /**
-+ * Removes the cached value that corresponds to the specified key.
-+ *
-+ * @param key the key whose mapping is to be removed from this cache
-+ */
-+ public final void remove(K key) {
-+ if (key != null) {
-+ synchronized (this.queue) {
-+ removeStaleEntries();
-+ int hash = hash(key);
-+ int index = index(hash, this.table);
-+ CacheEntry<K,V> prev = this.table[index];
-+ CacheEntry<K,V> entry = prev;
-+ while (entry != null) {
-+ CacheEntry<K,V> next = entry.next;
-+ if (entry.matches(hash, key)) {
-+ if (entry == prev) {
-+ this.table[index] = next;
-+ } else {
-+ prev.next = next;
-+ }
-+ entry.unlink();
-+ break;
-+ }
-+ prev = entry;
-+ entry = next;
-+ }
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Removes all of the mappings from this cache.
-+ * It will be empty after this call returns.
-+ */
-+ public final void clear() {
-+ synchronized (this.queue) {
-+ int index = this.table.length;
-+ while (0 < index--) {
-+ CacheEntry<K,V> entry = this.table[index];
-+ while (entry != null) {
-+ CacheEntry<K,V> next = entry.next;
-+ entry.unlink();
-+ entry = next;
-+ }
-+ this.table[index] = null;
-+ }
-+ while (null != this.queue.poll()) {
-+ // Clear out the reference queue.
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Retrieves object hash code and applies a supplemental hash function
-+ * to the result hash, which defends against poor quality hash functions.
-+ * This is critical because {@code Cache} uses power-of-two length hash tables,
-+ * that otherwise encounter collisions for hashCodes that do not differ
-+ * in lower bits.
-+ *
-+ * @param key the object which hash code is to be calculated
-+ * @return a hash code value for the specified object
-+ */
-+ private int hash(Object key) {
-+ if (this.identity) {
-+ int hash = System.identityHashCode(key);
-+ return (hash << 1) - (hash << 8);
-+ }
-+ int hash = key.hashCode();
-+ // This function ensures that hashCodes that differ only by
-+ // constant multiples at each bit position have a bounded
-+ // number of collisions (approximately 8 at default load factor).
-+ hash ^= (hash >>> 20) ^ (hash >>> 12);
-+ return hash ^ (hash >>> 7) ^ (hash >>> 4);
-+ }
-+
-+ /**
-+ * Returns index of the specified hash code in the given table.
-+ * Note that the table size must be a power of two.
-+ *
-+ * @param hash the hash code
-+ * @param table the table
-+ * @return an index of the specified hash code in the given table
-+ */
-+ private static int index(int hash, Object[] table) {
-+ return hash & (table.length - 1);
-+ }
-+
-+ /**
-+ * Creates a new array for the cache entries.
-+ *
-+ * @param size requested capacity MUST be a power of two
-+ * @return a new array for the cache entries
-+ */
-+ @SuppressWarnings("unchecked")
-+ private CacheEntry<K,V>[] newTable(int size) {
-+ return (CacheEntry<K,V>[]) new CacheEntry[size];
-+ }
-+
-+ private V getEntryValue(K key, int hash, CacheEntry<K,V> entry) {
-+ while (entry != null) {
-+ if (entry.matches(hash, key)) {
-+ return entry.value.getReferent();
-+ }
-+ entry = entry.next;
-+ }
-+ return null;
-+ }
-+
-+ private void removeStaleEntries() {
-+ Object reference = this.queue.poll();
-+ if (reference != null) {
-+ synchronized (this.queue) {
-+ do {
-+ if (reference instanceof Ref) {
-+ Ref ref = (Ref) reference;
-+ @SuppressWarnings("unchecked")
-+ CacheEntry<K,V> owner = (CacheEntry<K,V>) ref.getOwner();
-+ if (owner != null) {
-+ int index = index(owner.hash, this.table);
-+ CacheEntry<K,V> prev = this.table[index];
-+ CacheEntry<K,V> entry = prev;
-+ while (entry != null) {
-+ CacheEntry<K,V> next = entry.next;
-+ if (entry == owner) {
-+ if (entry == prev) {
-+ this.table[index] = next;
-+ } else {
-+ prev.next = next;
-+ }
-+ entry.unlink();
-+ break;
-+ }
-+ prev = entry;
-+ entry = next;
-+ }
-+ }
-+ }
-+ reference = this.queue.poll();
-+ }
-+ while (reference != null);
-+ }
-+ }
-+ }
-+
-+ private void transfer(CacheEntry<K,V>[] oldTable, CacheEntry<K,V>[] newTable) {
-+ int oldIndex = oldTable.length;
-+ while (0 < oldIndex--) {
-+ CacheEntry<K,V> entry = oldTable[oldIndex];
-+ oldTable[oldIndex] = null;
-+ while (entry != null) {
-+ CacheEntry<K,V> next = entry.next;
-+ if (entry.key.isStale() || entry.value.isStale()) {
-+ entry.unlink();
-+ } else {
-+ int newIndex = index(entry.hash, newTable);
-+ entry.next = newTable[newIndex];
-+ newTable[newIndex] = entry;
-+ }
-+ entry = next;
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Represents a cache entry (key-value pair).
-+ */
-+ private final class CacheEntry<K,V> {
-+ private final int hash;
-+ private final Ref<K> key;
-+ private final Ref<V> value;
-+ private volatile CacheEntry<K,V> next;
-+
-+ /**
-+ * Constructs an entry for the cache.
-+ *
-+ * @param hash the hash code calculated for the entry key
-+ * @param key the entry key
-+ * @param value the initial value of the entry
-+ * @param next the next entry in a chain
-+ */
-+ private CacheEntry(int hash, K key, V value, CacheEntry<K,V> next) {
-+ this.hash = hash;
-+ this.key = Cache.this.keyKind.create(this, key, Cache.this.queue);
-+ this.value = Cache.this.valueKind.create(this, value, Cache.this.queue);
-+ this.next = next;
-+ }
-+
-+ /**
-+ * Determines whether the entry has the given key with the given hash code.
-+ *
-+ * @param hash an expected hash code
-+ * @param object an object to be compared with the entry key
-+ * @return {@code true} if the entry has the given key with the given hash code;
-+ * {@code false} otherwise
-+ */
-+ private boolean matches(int hash, Object object) {
-+ if (this.hash != hash) {
-+ return false;
-+ }
-+ Object key = this.key.getReferent();
-+ return (key == object) || !Cache.this.identity && (key != null) && key.equals(object);
-+ }
-+
-+ /**
-+ * Marks the entry as actually removed from the cache.
-+ */
-+ private void unlink() {
-+ this.next = null;
-+ this.key.removeOwner();
-+ this.value.removeOwner();
-+ Cache.this.size--;
-+ }
-+ }
-+
-+ /**
-+ * Basic interface for references.
-+ * It defines the operations common for the all kind of references.
-+ *
-+ * @param <T> the type of object to refer
-+ */
-+ private static interface Ref<T> {
-+ /**
-+ * Returns the object that possesses information about the reference.
-+ *
-+ * @return the owner of the reference or {@code null} if the owner is unknown
-+ */
-+ Object getOwner();
-+
-+ /**
-+ * Returns the object to refer.
-+ *
-+ * @return the referred object or {@code null} if it was collected
-+ */
-+ T getReferent();
-+
-+ /**
-+ * Determines whether the referred object was taken by the garbage collector or not.
-+ *
-+ * @return {@code true} if the referred object was collected
-+ */
-+ boolean isStale();
-+
-+ /**
-+ * Marks this reference as removed from the cache.
-+ */
-+ void removeOwner();
-+ }
-+
-+ /**
-+ * Represents a reference kind.
-+ */
-+ public static enum Kind {
-+ STRONG {
-+ <T> Ref<T> create(Object owner, T value, ReferenceQueue<? super T> queue) {
-+ return new Strong<>(owner, value);
-+ }
-+ },
-+ SOFT {
-+ <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
-+ return (referent == null)
-+ ? new Strong<>(owner, referent)
-+ : new Soft<>(owner, referent, queue);
-+ }
-+ },
-+ WEAK {
-+ <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
-+ return (referent == null)
-+ ? new Strong<>(owner, referent)
-+ : new Weak<>(owner, referent, queue);
-+ }
-+ };
-+
-+ /**
-+ * Creates a reference to the specified object.
-+ *
-+ * @param <T> the type of object to refer
-+ * @param owner the owner of the reference, if needed
-+ * @param referent the object to refer
-+ * @param queue the queue to register the reference with,
-+ * or {@code null} if registration is not required
-+ * @return the reference to the specified object
-+ */
-+ abstract <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue);
-+
-+ /**
-+ * This is an implementation of the {@link Cache.Ref} interface
-+ * that uses the strong references that prevent their referents
-+ * from being made finalizable, finalized, and then reclaimed.
-+ *
-+ * @param <T> the type of object to refer
-+ */
-+ private static final class Strong<T> implements Ref<T> {
-+ private Object owner;
-+ private final T referent;
-+
-+ /**
-+ * Creates a strong reference to the specified object.
-+ *
-+ * @param owner the owner of the reference, if needed
-+ * @param referent the non-null object to refer
-+ */
-+ private Strong(Object owner, T referent) {
-+ this.owner = owner;
-+ this.referent = referent;
-+ }
-+
-+ /**
-+ * Returns the object that possesses information about the reference.
-+ *
-+ * @return the owner of the reference or {@code null} if the owner is unknown
-+ */
-+ public Object getOwner() {
-+ return this.owner;
-+ }
-+
-+ /**
-+ * Returns the object to refer.
-+ *
-+ * @return the referred object
-+ */
-+ public T getReferent() {
-+ return this.referent;
-+ }
-+
-+ /**
-+ * Determines whether the referred object was taken by the garbage collector or not.
-+ *
-+ * @return {@code true} if the referred object was collected
-+ */
-+ public boolean isStale() {
-+ return false;
-+ }
-+
-+ /**
-+ * Marks this reference as removed from the cache.
-+ */
-+ public void removeOwner() {
-+ this.owner = null;
-+ }
-+ }
-+
-+ /**
-+ * This is an implementation of the {@link Cache.Ref} interface
-+ * that uses the soft references that are cleared at the discretion
-+ * of the garbage collector in response to a memory request.
-+ *
-+ * @param <T> the type of object to refer
-+ * @see java.lang.ref.SoftReference
-+ */
-+ private static final class Soft<T> extends SoftReference<T> implements Ref<T> {
-+ private Object owner;
-+
-+ /**
-+ * Creates a soft reference to the specified object.
-+ *
-+ * @param owner the owner of the reference, if needed
-+ * @param referent the non-null object to refer
-+ * @param queue the queue to register the reference with,
-+ * or {@code null} if registration is not required
-+ */
-+ private Soft(Object owner, T referent, ReferenceQueue<? super T> queue) {
-+ super(referent, queue);
-+ this.owner = owner;
-+ }
-+
-+ /**
-+ * Returns the object that possesses information about the reference.
-+ *
-+ * @return the owner of the reference or {@code null} if the owner is unknown
-+ */
-+ public Object getOwner() {
-+ return this.owner;
-+ }
-+
-+ /**
-+ * Returns the object to refer.
-+ *
-+ * @return the referred object or {@code null} if it was collected
-+ */
-+ public T getReferent() {
-+ return get();
-+ }
-+
-+ /**
-+ * Determines whether the referred object was taken by the garbage collector or not.
-+ *
-+ * @return {@code true} if the referred object was collected
-+ */
-+ public boolean isStale() {
-+ return null == get();
-+ }
-+
-+ /**
-+ * Marks this reference as removed from the cache.
-+ */
-+ public void removeOwner() {
-+ this.owner = null;
-+ }
-+ }
-+
-+ /**
-+ * This is an implementation of the {@link Cache.Ref} interface
-+ * that uses the weak references that do not prevent their referents
-+ * from being made finalizable, finalized, and then reclaimed.
-+ *
-+ * @param <T> the type of object to refer
-+ * @see java.lang.ref.WeakReference
-+ */
-+ private static final class Weak<T> extends WeakReference<T> implements Ref<T> {
-+ private Object owner;
-+
-+ /**
-+ * Creates a weak reference to the specified object.
-+ *
-+ * @param owner the owner of the reference, if needed
-+ * @param referent the non-null object to refer
-+ * @param queue the queue to register the reference with,
-+ * or {@code null} if registration is not required
-+ */
-+ private Weak(Object owner, T referent, ReferenceQueue<? super T> queue) {
-+ super(referent, queue);
-+ this.owner = owner;
-+ }
-+
-+ /**
-+ * Returns the object that possesses information about the reference.
-+ *
-+ * @return the owner of the reference or {@code null} if the owner is unknown
-+ */
-+ public Object getOwner() {
-+ return this.owner;
-+ }
-+
-+ /**
-+ * Returns the object to refer.
-+ *
-+ * @return the referred object or {@code null} if it was collected
-+ */
-+ public T getReferent() {
-+ return get();
-+ }
-+
-+ /**
-+ * Determines whether the referred object was taken by the garbage collector or not.
-+ *
-+ * @return {@code true} if the referred object was collected
-+ */
-+ public boolean isStale() {
-+ return null == get();
-+ }
-+
-+ /**
-+ * Marks this reference as removed from the cache.
-+ */
-+ public void removeOwner() {
-+ this.owner = null;
-+ }
-+ }
-+ }
-+}
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2012, 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
-@@ -404,8 +404,9 @@
- }
- return skey;
- } else if (algorithm.equals("TlsPremasterSecret")) {
-- // return entire secret
-- return new SecretKeySpec(secret, "TlsPremasterSecret");
-+ // remove leading zero bytes per RFC 5246 Section 8.1.2
-+ return new SecretKeySpec(
-+ KeyUtil.trimZeroes(secret), "TlsPremasterSecret");
- } else {
- 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 2014-07-15 21:49:30.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
-@@ -280,22 +280,6 @@
- return new DHParameterSpec(this.p, this.g);
- }
-
-- public String toString() {
-- String LINE_SEP = System.getProperty("line.separator");
--
-- StringBuffer strbuf
-- = new StringBuffer("SunJCE Diffie-Hellman Private Key:"
-- + LINE_SEP + "x:" + LINE_SEP
-- + Debug.toHexString(this.x)
-- + LINE_SEP + "p:" + LINE_SEP
-- + Debug.toHexString(this.p)
-- + LINE_SEP + "g:" + LINE_SEP
-- + Debug.toHexString(this.g));
-- if (this.l != 0)
-- strbuf.append(LINE_SEP + "l:" + LINE_SEP + " " + this.l);
-- return strbuf.toString();
-- }
--
- private void parseKeyBits() throws InvalidKeyException {
- try {
- DerInputStream in = new DerInputStream(this.key);
---- ./jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java 2013-09-06 11:27:53.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java 2014-10-28 20:19:45.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2009, 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
-@@ -39,6 +39,8 @@
-
- import sun.security.rsa.*;
- import sun.security.jca.Providers;
-+import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
-+import sun.security.util.KeyUtil;
-
- /**
- * RSA cipher implementation. Supports RSA en/decryption and signing/verifying
-@@ -91,8 +93,8 @@
- // padding object
- private RSAPadding padding;
-
-- // cipher parameter for OAEP padding
-- private OAEPParameterSpec spec = null;
-+ // cipher parameter for OAEP padding and TLS RSA premaster secret
-+ private AlgorithmParameterSpec spec = null;
-
- // buffer for the data
- private byte[] buffer;
-@@ -110,6 +112,9 @@
- // hash algorithm for OAEP
- private String oaepHashAlgorithm = "SHA-1";
-
-+ // the source of randomness
-+ private SecureRandom random;
-+
- public RSACipher() {
- paddingType = PAD_PKCS1;
- }
-@@ -175,7 +180,7 @@
-
- // see JCE spec
- protected AlgorithmParameters engineGetParameters() {
-- if (spec != null) {
-+ if (spec != null && spec instanceof OAEPParameterSpec) {
- try {
- AlgorithmParameters params =
- AlgorithmParameters.getInstance("OAEP", "SunJCE");
-@@ -278,8 +283,13 @@
- buffer = new byte[n];
- } else if (paddingType == PAD_PKCS1) {
- if (params != null) {
-- throw new InvalidAlgorithmParameterException
-- ("Parameters not supported");
-+ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
-+ throw new InvalidAlgorithmParameterException(
-+ "Parameters not supported");
-+ }
-+
-+ spec = params;
-+ this.random = random; // for TLS RSA premaster secret
- }
- int blockType = (mode <= MODE_DECRYPT) ? RSAPadding.PAD_BLOCKTYPE_2
- : RSAPadding.PAD_BLOCKTYPE_1;
-@@ -295,19 +305,18 @@
- throw new InvalidKeyException
- ("OAEP cannot be used to sign or verify signatures");
- }
-- OAEPParameterSpec myParams;
- if (params != null) {
- if (!(params instanceof OAEPParameterSpec)) {
- throw new InvalidAlgorithmParameterException
- ("Wrong Parameters for OAEP Padding");
- }
-- myParams = (OAEPParameterSpec) params;
-+ spec = params;
- } else {
-- myParams = new OAEPParameterSpec(oaepHashAlgorithm, "MGF1",
-+ spec = new OAEPParameterSpec(oaepHashAlgorithm, "MGF1",
- MGF1ParameterSpec.SHA1, PSource.PSpecified.DEFAULT);
- }
- padding = RSAPadding.getInstance(RSAPadding.PAD_OAEP_MGF1, n,
-- random, myParams);
-+ random, (OAEPParameterSpec)spec);
- if (encrypt) {
- int k = padding.getMaxDataSize();
- buffer = new byte[k];
-@@ -422,17 +431,40 @@
- if (wrappedKey.length > buffer.length) {
- throw new InvalidKeyException("Key is too long for unwrapping");
- }
-+
-+ boolean isTlsRsaPremasterSecret =
-+ algorithm.equals("TlsRsaPremasterSecret");
-+ Exception failover = null;
-+ byte[] encoded = null;
-+
- update(wrappedKey, 0, wrappedKey.length);
- try {
-- byte[] encoded = doFinal();
-- return ConstructKeys.constructKey(encoded, algorithm, type);
-+ encoded = doFinal();
- } catch (BadPaddingException e) {
-- // should not occur
-- throw new InvalidKeyException("Unwrapping failed", e);
-+ if (isTlsRsaPremasterSecret) {
-+ failover = e;
-+ } else {
-+ throw new InvalidKeyException("Unwrapping failed", e);
-+ }
- } catch (IllegalBlockSizeException e) {
- // should not occur, handled with length check above
- throw new InvalidKeyException("Unwrapping failed", e);
- }
-+
-+ if (isTlsRsaPremasterSecret) {
-+ if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) {
-+ throw new IllegalStateException(
-+ "No TlsRsaPremasterSecretParameterSpec specified");
-+ }
-+
-+ // polish the TLS premaster secret
-+ encoded = KeyUtil.checkTlsPreMasterSecretKey(
-+ ((TlsRsaPremasterSecretParameterSpec)spec).getClientVersion(),
-+ ((TlsRsaPremasterSecretParameterSpec)spec).getServerVersion(),
-+ random, encoded, (failover != null));
-+ }
-+
-+ return ConstructKeys.constructKey(encoded, algorithm, type);
- }
-
- // see JCE spec
-@@ -440,5 +472,4 @@
- RSAKey rsaKey = RSAKeyFactory.toRSAKey(key);
- return rsaKey.getModulus().bitLength();
- }
--
- }
---- ./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-10-28 20:19:45.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
-@@ -56,7 +56,7 @@
-
- protected void engineInit(AlgorithmParameterSpec params,
- SecureRandom random) throws InvalidAlgorithmParameterException {
-- if (params instanceof TlsRsaPremasterSecretParameterSpec == false) {
-+ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
- throw new InvalidAlgorithmParameterException(MSG);
- }
- this.spec = (TlsRsaPremasterSecretParameterSpec)params;
-@@ -67,11 +67,13 @@
- throw new InvalidParameterException(MSG);
- }
-
-+ // Only can be used in client side to generate TLS RSA premaster secret.
- protected SecretKey engineGenerateKey() {
- if (spec == null) {
- throw new IllegalStateException(
- "TlsRsaPremasterSecretGenerator must be initialized");
- }
-+
- if (random == null) {
- random = new SecureRandom();
- }
-@@ -79,6 +81,7 @@
- random.nextBytes(b);
- b[0] = (byte)spec.getMajorVersion();
- b[1] = (byte)spec.getMinorVersion();
-+
- return new SecretKeySpec(b, "TlsRsaPremasterSecret");
- }
-
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -53,7 +53,10 @@
-
- public static void ObjectInit(Object obj)
- {
-- if ( engaged != 0 ) {
-+ if ( engaged != 0) {
-+ if (obj == null) {
-+ throw new IllegalArgumentException("Null object.");
-+ }
- nativeObjectInit(Thread.currentThread(), obj);
- }
- }
-@@ -66,7 +69,10 @@
-
- public static void NewArray(Object obj)
- {
-- if ( engaged != 0 ) {
-+ if ( engaged != 0) {
-+ if (obj == null) {
-+ throw new IllegalArgumentException("Null object.");
-+ }
- nativeNewArray(Thread.currentThread(), obj);
- }
- }
-@@ -82,6 +88,14 @@
- public static void CallSite(int cnum, int mnum)
- {
- if ( engaged != 0 ) {
-+ if (cnum < 0) {
-+ throw new IllegalArgumentException("Negative class index");
-+ }
-+
-+ if (mnum < 0) {
-+ throw new IllegalArgumentException("Negative method index");
-+ }
-+
- nativeCallSite(Thread.currentThread(), cnum, mnum);
- }
- }
-@@ -95,6 +109,14 @@
- public static void ReturnSite(int cnum, int mnum)
- {
- if ( engaged != 0 ) {
-+ if (cnum < 0) {
-+ throw new IllegalArgumentException("Negative class index");
-+ }
-+
-+ if (mnum < 0) {
-+ throw new IllegalArgumentException("Negative method index");
-+ }
-+
- nativeReturnSite(Thread.currentThread(), cnum, mnum);
- }
- }
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -1160,6 +1160,11 @@
- target = imRas;
- }
- int [] bandSizes = target.getSampleModel().getSampleSize();
-+ for (int i = 0; i < bandSizes.length; i++) {
-+ if (bandSizes[i] <= 0 || bandSizes[i] > 8) {
-+ throw new IIOException("Illegal band size: should be 0 < size <= 8");
-+ }
-+ }
-
- /*
- * 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 2014-07-15 21:49:30.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
- // per sample.
-- if (bandSizes[i] > 8) {
-- throw new IIOException("Sample size must be <= 8");
-+ if (bandSizes[i] <= 0 || bandSizes[i] > 8) {
-+ throw new IIOException("Illegal band size: should be 0 < size <= 8");
- }
- // 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/imageio/plugins/jpeg/JPEGMetadata.java 2013-09-06 11:27:53.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2001, 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
-@@ -278,10 +278,11 @@
- (JFIFMarkerSegment) findMarkerSegment
- (JFIFMarkerSegment.class, true);
- if (jfif == null) {
-- throw new IIOException
-- ("ICC APP2 encountered without prior JFIF!");
-+ newGuy = new MarkerSegment(buffer);
-+ newGuy.loadData(buffer);
-+ } else {
-+ jfif.addICC(buffer);
- }
-- jfif.addICC(buffer);
- // newGuy remains null
- } else {
- newGuy = new MarkerSegment(buffer);
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -41,7 +41,7 @@
- FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
- FileChooser.pathLabel.textAndMnemonic=Aus&wahl:
- FileChooser.filterLabel.textAndMnemonic=Filter:
--FileChooser.foldersLabel.textAndMnemonic=Or&dner
-+FileChooser.foldersLabel.textAndMnemonic=O&rdner
- FileChooser.filesLabel.textAndMnemonic=&Dateien
-
- 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-07-15 21:49:30.000000000 -0700
-@@ -24,7 +24,7 @@
- FileChooser.openButton.textAndMnemonic=\uD655\uC778
- FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
- FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
--FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0
-+FileChooser.updateButton.textAndMnemonic=\uC5C5\uB370\uC774\uD2B8
- FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0
- FileChooser.pathLabel.textAndMnemonic=\uACBD\uB85C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uC785\uB825(&P):
- FileChooser.filterLabel.textAndMnemonic=\uD544\uD130(&R)
-@@ -36,5 +36,5 @@
- FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
- FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
- FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
--FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D\uC744 \uAC31\uC2E0\uD569\uB2C8\uB2E4.
-+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/java/swing/plaf/windows/resources/windows_fr.properties 2013-09-06 11:27:55.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties 2014-07-15 21:49:30.000000000 -0700
-@@ -25,8 +25,8 @@
- FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
- FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
- FileChooser.upFolderAccessibleName=Monter
--FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
--FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
-+FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire de base
-+FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
- FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
- FileChooser.newFolderAccessibleName=Nouveau dossier
- FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
---- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties 2013-09-06 11:27:55.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties 2014-10-28 20:19:45.000000000 -0700
-@@ -22,7 +22,7 @@
- FileChooser.saveInLabel.textAndMnemonic=Spara i:
- FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
- FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
--FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typ:
-+FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typen:
- FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
- FileChooser.upFolderAccessibleName=Upp
- FileChooser.homeFolderToolTip.textAndMnemonic=Hem
---- ./jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java 2013-09-06 11:27:55.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java 2014-07-15 21:49:30.000000000 -0700
-@@ -146,7 +146,6 @@
- int verbose = getPackage().verbose;
- if (verbose > 2)
- System.out.println("Reference scan "+this);
-- Class cls = thisClass();
- refs.addAll(Arrays.asList(handler_class));
- if (fixups != null) {
- fixups.visitRefs(refs);
---- ./jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-09-06 11:27:55.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-07-15 21:49:30.000000000 -0700
-@@ -670,53 +670,55 @@
- return new String(sig);
- }
-
-- static private int skipClassNameChars(String sig, int i) {
-- int len = sig.length();
-- for (; i < len; i++) {
-- char ch = sig.charAt(i);
-- if (ch <= ' ') break;
-- if (ch >= ';' && ch <= '@') break;
-- }
-- return i;
-+ static private int skipTo(char semi, String sig, int i) {
-+ i = sig.indexOf(semi, i);
-+ return (i >= 0) ? i : sig.length();
- }
-
- static String[] structureSignature(String sig) {
-- sig = sig.intern();
--
-- int formLen = 0;
-- int nparts = 1;
-- for (int i = 0; i < sig.length(); i++) {
-- char ch = sig.charAt(i);
-- formLen++;
-- if (ch == 'L') {
-- nparts++;
-- int i2 = skipClassNameChars(sig, i+1);
-- i = i2-1; // keep the semicolon in the form
-- int i3 = sig.indexOf('<', i+1);
-- if (i3 > 0 && i3 < i2)
-- i = i3-1;
-- }
-- }
-- char[] form = new char[formLen];
-- if (nparts == 1) {
-+ int firstl = sig.indexOf('L');
-+ if (firstl < 0) {
- String[] parts = { sig };
- return parts;
- }
-- String[] parts = new String[nparts];
-- int j = 0;
-- int k = 1;
-- for (int i = 0; i < sig.length(); i++) {
-- char ch = sig.charAt(i);
-- form[j++] = ch;
-- if (ch == 'L') {
-- int i2 = skipClassNameChars(sig, i+1);
-- parts[k++] = sig.substring(i+1, i2);
-- i = i2;
-- --i; // keep the semicolon in the form
-- }
-+ // Segment the string like sig.split("L\\([^;<]*\\)").
-+ // N.B.: Previous version of this code did a more complex match,
-+ // to next ch < ' ' or ch in [';'..'@']. The only important
-+ // characters are ';' and '<', since they are part of the
-+ // signature syntax.
-+ // Examples:
-+ // "(Ljava/lang/Object;IJLLoo;)V" => {"(L;IJL;)V", "java/lang/Object", "Loo"}
-+ // "Ljava/util/List<Ljava/lang/String;>;" => {"L<L;>;", "java/util/List", "java/lang/String"}
-+ char[] form = null;
-+ String[] parts = null;
-+ for (int pass = 0; pass <= 1; pass++) {
-+ // pass 0 is a sizing pass, pass 1 packs the arrays
-+ int formPtr = 0;
-+ int partPtr = 1;
-+ int nextsemi = 0, nextangl = 0; // next ';' or '<', or zero, or sigLen
-+ int lastj = 0;
-+ for (int i = firstl + 1, j; i > 0; i = sig.indexOf('L', j) + 1) {
-+ // sig[i-1] is 'L', while sig[j] will be the first ';' or '<' after it
-+ // each part is in sig[i .. j-1]
-+ if (nextsemi < i) nextsemi = skipTo(';', sig, i);
-+ if (nextangl < i) nextangl = skipTo('<', sig, i);
-+ j = (nextsemi < nextangl ? nextsemi : nextangl);
-+ if (pass != 0) {
-+ sig.getChars(lastj, i, form, formPtr);
-+ parts[partPtr] = sig.substring(i, j);
-+ }
-+ formPtr += (i - lastj);
-+ partPtr += 1;
-+ lastj = j;
-+ }
-+ if (pass != 0) {
-+ sig.getChars(lastj, sig.length(), form, formPtr);
-+ break;
-+ }
-+ formPtr += (sig.length() - lastj);
-+ form = new char[formPtr];
-+ parts = new String[partPtr];
- }
-- assert(j == formLen);
-- assert(k == parts.length);
- parts[0] = new String(form);
- //assert(flattenSignature(parts).equals(sig));
- return parts;
---- ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,131 @@
-+/*
-+ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-+ * 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.java.util.jar.pack;
-+
-+import java.util.ListResourceBundle;
-+
-+public class DriverResource_ja extends ListResourceBundle {
-+ public static final String VERSION ="VERSION";
-+ public static final String BAD_ARGUMENT ="BAD_ARGUMENT";
-+ public static final String BAD_OPTION ="BAD_OPTION";
-+ public static final String BAD_REPACK_OUTPUT="BAD_REPACK_OUTPUT";
-+ public static final String DETECTED_ZIP_COMMENT="DETECTED_ZIP_COMMENT";
-+ public static final String SKIP_FOR_REPACKED ="SKIP_FOR_REPACKED";
-+ public static final String WRITE_PACK_FILE ="WRITE_PACK_FILE";
-+ public static final String WIRTE_PACKGZ_FILE="WIRTE_PACKGZ_FILE";
-+ public static final String SKIP_FOR_MOVE_FAILED="SKIP_FOR_MOVE_FAILED";
-+ public static final String PACK_HELP="PACK_HELP";
-+ public static final String UNPACK_HELP ="UNPACK_HELP";
-+ public static final String MORE_INFO = "MORE_INFO";
-+ public static final String DUPLICATE_OPTION = "DUPLICATE_OPTION";
-+ public static final String BAD_SPEC = "BAD_SPEC";
-+
-+ //The following string is duplicate in PACK and UNPACK comment,which was draw out to ruduce translation work.
-+ private static final String PARAMETER_V = " -v, --verbose increase program verbosity";
-+ private static final String PARAMETER_Q = " -q, --quiet set verbosity to lowest level";
-+ private static final String PARAMETER_LF = " -l{F}, --log-file={F} output to the given log file, or '-' for System.out";
-+ private static final String PARAMETER_H = " -?, -h, --help print this message";
-+ private static final String PARAMETER_VER = " -V, --version print program version";
-+ private static final String PARAMETER_J = " -J{X} pass option X to underlying Java VM";
-+
-+
-+ //The following are outputs of command 'pack200' and 'unpack200'.
-+ //Don't translate command arguments ,words with a prefix of '-' or '--'.
-+ //
-+ private static final Object[][] resource= {
-+ {VERSION,"{0}\u30D0\u30FC\u30B8\u30E7\u30F3{1}"},//parameter 0:class name;parameter 1: version value
-+ {BAD_ARGUMENT,"\u7121\u52B9\u306A\u5F15\u6570: {0}"},
-+ {BAD_OPTION,"\u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}={1}"},//parameter 0:option name;parameter 1:option value
-+ {BAD_REPACK_OUTPUT,"\u7121\u52B9\u306A--repack\u51FA\u529B: {0}"},//parameter 0:filename
-+ {DETECTED_ZIP_COMMENT,"\u691C\u51FA\u3055\u308C\u305FZIP\u30B3\u30E1\u30F3\u30C8: {0}"},//parameter 0:comment
-+ {SKIP_FOR_REPACKED,"\u3059\u3067\u306B\u518D\u5727\u7E2E\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059: {0}"},//parameter 0:filename
-+ {WRITE_PACK_FILE,"*.pack\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080\u306B\u306F\u3001--no-gzip\u3092\u6307\u5B9A\u3057\u307E\u3059: {0}"},//parameter 0:filename
-+ {WIRTE_PACKGZ_FILE,"*.pack.gz\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080\u306B\u306F\u3001--gzip\u3092\u6307\u5B9A\u3057\u307E\u3059: {0}"},//parameter 0:filename
-+ {SKIP_FOR_MOVE_FAILED,"\u79FB\u52D5\u304C\u5931\u6557\u3057\u305F\u305F\u3081\u89E3\u51CD\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059: {0}"},//parameter 0:filename
-+ {PACK_HELP,new String[]{
-+ "\u4F7F\u7528\u65B9\u6CD5: pack200 [-opt... | --option=value]... x.pack[.gz] y.jar",
-+ "",
-+ "\u5727\u7E2E\u30AA\u30D7\u30B7\u30E7\u30F3",
-+ " -g\u3001--no-gzip \u30D7\u30EC\u30FC\u30F3\u306A*.pack\u30D5\u30A1\u30A4\u30EB\u3092\u5727\u7E2E\u305B\u305A\u306B\u51FA\u529B\u3057\u307E\u3059",
-+ " --gzip (\u30C7\u30D5\u30A9\u30EB\u30C8)\u5727\u7E2E\u51FA\u529B\u3092gzip\u3067\u5F8C\u51E6\u7406\u3057\u307E\u3059",
-+ " -G\u3001--strip-debug \u5727\u7E2E\u4E2D\u306B\u30C7\u30D0\u30C3\u30B0\u5C5E\u6027\u3092\u524A\u9664\u3057\u307E\u3059",
-+ " -O\u3001--no-keep-file-order \u30D5\u30A1\u30A4\u30EB\u306E\u9806\u5E8F\u4ED8\u3051\u60C5\u5831\u3092\u8EE2\u9001\u3057\u307E\u305B\u3093",
-+ " --keep-file-order (\u30C7\u30D5\u30A9\u30EB\u30C8)\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u9806\u5E8F\u4ED8\u3051\u3092\u4FDD\u6301\u3057\u307E\u3059",
-+ " -S{N}\u3001--segment-limit={N} \u30BB\u30B0\u30E1\u30F3\u30C8\u5236\u9650\u3092\u51FA\u529B\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8N=1Mb)",
-+ " -E{N}\u3001--effort={N} \u5727\u7E2E\u306E\u8A66\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8N=5)",
-+ " -H{h}\u3001--deflate-hint={h} \u30C7\u30D5\u30EC\u30FC\u30C8\u30FB\u30D2\u30F3\u30C8\u3092\u8EE2\u9001\u3057\u307E\u3059: true\u3001false\u307E\u305F\u306Fkeep(\u30C7\u30D5\u30A9\u30EB\u30C8)",
-+ " -m{V}\u3001--modification-time={V} \u5909\u66F4\u6642\u9593\u3092\u8EE2\u9001\u3057\u307E\u3059: latest\u307E\u305F\u306Fkeep(\u30C7\u30D5\u30A9\u30EB\u30C8)",
-+ " -P{F}\u3001--pass-file={F} \u6307\u5B9A\u3055\u308C\u305F\u5727\u7E2E\u3055\u308C\u3066\u3044\u306A\u3044\u5165\u529B\u8981\u7D20\u3092\u8EE2\u9001\u3057\u307E\u3059",
-+ " -U{a}\u3001--unknown-attribute={a} \u4E0D\u660E\u306E\u5C5E\u6027\u30A2\u30AF\u30B7\u30E7\u30F3: error\u3001strip\u307E\u305F\u306Fpass(\u30C7\u30D5\u30A9\u30EB\u30C8)",
-+ " -C{N}={L}\u3001--class-attribute={N}={L} (\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u5C5E\u6027)",
-+ " -F{N}={L}\u3001--field-attribute={N}={L} (\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u5C5E\u6027)",
-+ " -M{N}={L}\u3001--method-attribute={N}={L} (\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u5C5E\u6027)",
-+ " -D{N}={L}\u3001--code-attribute={N}={L} (\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u5C5E\u6027)",
-+ " -f{F}\u3001--config-file={F} Pack200.Packer\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u30D5\u30A1\u30A4\u30EBF\u3092\u8AAD\u307F\u8FBC\u307F\u307E\u3059",
-+ PARAMETER_V ,
-+ PARAMETER_Q ,
-+ PARAMETER_LF ,
-+ PARAMETER_H ,
-+ PARAMETER_VER ,
-+ PARAMETER_J,
-+ "",
-+ "\u6CE8\u610F:",
-+ " -P\u3001-C\u3001-F\u3001-M\u304A\u3088\u3073-D\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u7D2F\u7A4D\u3055\u308C\u307E\u3059\u3002",
-+ " \u5C5E\u6027\u5B9A\u7FA9\u306E\u4F8B: -C SourceFile=RUH .",
-+ " Config.\u30D5\u30A1\u30A4\u30EB\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u306F\u3001Pack200 API\u306B\u3088\u3063\u3066\u5B9A\u7FA9\u3055\u308C\u307E\u3059\u3002",
-+ " -S\u3001-E\u3001-H\u3001-m\u3001-U\u306E\u5024\u306E\u610F\u5473\u306F\u3001Pack200 API\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002",
-+ " \u30EC\u30A4\u30A2\u30A6\u30C8\u5B9A\u7FA9(RUH\u306A\u3069)\u306FJSR 200\u306B\u3088\u3063\u3066\u5B9A\u7FA9\u3055\u308C\u307E\u3059\u3002",
-+ "",
-+ "\u518D\u5727\u7E2E\u30E2\u30FC\u30C9\u3067\u306F\u3001JAR\u30D5\u30A1\u30A4\u30EB\u304C\u5727\u7E2E/\u89E3\u51CD\u30B5\u30A4\u30AF\u30EB\u3067\u66F4\u65B0\u3055\u308C\u307E\u3059:",
-+ " pack200 [-r|--repack] [-opt | --option=value]... [repackedy.jar] y.jar\n"
-+ }
-+ },
-+ {UNPACK_HELP,new String[]{
-+ "\u4F7F\u7528\u65B9\u6CD5: unpack200 [-opt... | --option=value]... x.pack[.gz] y.jar\n",
-+ "",
-+ "\u89E3\u51CD\u30AA\u30D7\u30B7\u30E7\u30F3",
-+ " -H{h}\u3001--deflate-hint={h} \u8EE2\u9001\u3055\u308C\u305F\u30C7\u30D5\u30EC\u30FC\u30C8\u30FB\u30D2\u30F3\u30C8\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059: true\u3001false\u307E\u305F\u306Fkeep(\u30C7\u30D5\u30A9\u30EB\u30C8)",
-+ " -r\u3001--remove-pack-file \u89E3\u51CD\u5F8C\u306B\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3057\u307E\u3059",
-+ PARAMETER_V ,
-+ PARAMETER_Q ,
-+ PARAMETER_LF ,
-+ PARAMETER_H ,
-+ PARAMETER_VER ,
-+ PARAMETER_J,
-+ }
-+ },
-+
-+ {MORE_INFO,"(\u8A73\u7D30\u306F\u3001{0} --help\u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002)"},//parameter 0:command name
-+ {DUPLICATE_OPTION,"\u91CD\u8907\u30AA\u30D7\u30B7\u30E7\u30F3: {0}"},//parameter 0:option
-+ {BAD_SPEC,"{0}\u306E\u7121\u52B9\u306A\u4ED5\u69D8: {1}"},//parameter 0:option;parameter 1:specifier
-+ };
-+
-+ protected Object[][] getContents() {
-+ return resource;
-+ }
-+
-+
-+}
---- ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,131 @@
-+/*
-+ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-+ * 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.java.util.jar.pack;
-+
-+import java.util.ListResourceBundle;
-+
-+public class DriverResource_zh_CN extends ListResourceBundle {
-+ public static final String VERSION ="VERSION";
-+ public static final String BAD_ARGUMENT ="BAD_ARGUMENT";
-+ public static final String BAD_OPTION ="BAD_OPTION";
-+ public static final String BAD_REPACK_OUTPUT="BAD_REPACK_OUTPUT";
-+ public static final String DETECTED_ZIP_COMMENT="DETECTED_ZIP_COMMENT";
-+ public static final String SKIP_FOR_REPACKED ="SKIP_FOR_REPACKED";
-+ public static final String WRITE_PACK_FILE ="WRITE_PACK_FILE";
-+ public static final String WIRTE_PACKGZ_FILE="WIRTE_PACKGZ_FILE";
-+ public static final String SKIP_FOR_MOVE_FAILED="SKIP_FOR_MOVE_FAILED";
-+ public static final String PACK_HELP="PACK_HELP";
-+ public static final String UNPACK_HELP ="UNPACK_HELP";
-+ public static final String MORE_INFO = "MORE_INFO";
-+ public static final String DUPLICATE_OPTION = "DUPLICATE_OPTION";
-+ public static final String BAD_SPEC = "BAD_SPEC";
-+
-+ //The following string is duplicate in PACK and UNPACK comment,which was draw out to ruduce translation work.
-+ private static final String PARAMETER_V = " -v, --verbose increase program verbosity";
-+ private static final String PARAMETER_Q = " -q, --quiet set verbosity to lowest level";
-+ private static final String PARAMETER_LF = " -l{F}, --log-file={F} output to the given log file, or '-' for System.out";
-+ private static final String PARAMETER_H = " -?, -h, --help print this message";
-+ private static final String PARAMETER_VER = " -V, --version print program version";
-+ private static final String PARAMETER_J = " -J{X} pass option X to underlying Java VM";
-+
-+
-+ //The following are outputs of command 'pack200' and 'unpack200'.
-+ //Don't translate command arguments ,words with a prefix of '-' or '--'.
-+ //
-+ private static final Object[][] resource= {
-+ {VERSION,"{0}\u7248\u672C {1}"},//parameter 0:class name;parameter 1: version value
-+ {BAD_ARGUMENT,"\u9519\u8BEF\u53C2\u6570: {0}"},
-+ {BAD_OPTION,"\u9519\u8BEF\u9009\u9879: {0}={1}"},//parameter 0:option name;parameter 1:option value
-+ {BAD_REPACK_OUTPUT,"--repack \u8F93\u51FA\u9519\u8BEF: {0}"},//parameter 0:filename
-+ {DETECTED_ZIP_COMMENT,"\u68C0\u6D4B\u5230 ZIP \u6CE8\u91CA: {0}"},//parameter 0:comment
-+ {SKIP_FOR_REPACKED,"\u7531\u4E8E\u5DF2\u91CD\u65B0\u6253\u5305\u800C\u8DF3\u8FC7: {0}"},//parameter 0:filename
-+ {WRITE_PACK_FILE,"\u8981\u5199\u5165 *.pack \u6587\u4EF6, \u8BF7\u6307\u5B9A --no-gzip: {0}"},//parameter 0:filename
-+ {WIRTE_PACKGZ_FILE,"\u8981\u5199\u5165 *.pack.gz \u6587\u4EF6, \u8BF7\u6307\u5B9A --gzip: {0}"},//parameter 0:filename
-+ {SKIP_FOR_MOVE_FAILED,"\u7531\u4E8E\u79FB\u52A8\u5931\u8D25\u800C\u8DF3\u8FC7\u91CD\u65B0\u6253\u5305: {0}"},//parameter 0:filename
-+ {PACK_HELP,new String[]{
-+ "\u7528\u6CD5: pack200 [-opt... | --option=value]... x.pack[.gz] y.jar",
-+ "",
-+ "\u6253\u5305\u9009\u9879",
-+ " -g, --no-gzip \u8F93\u51FA\u65E0\u683C\u5F0F\u7684 *.pack \u6587\u4EF6, \u4E0D\u538B\u7F29",
-+ " --gzip (\u9ED8\u8BA4\u503C) \u4F7F\u7528 gzip \u5BF9\u6253\u5305\u8FDB\u884C\u540E\u5904\u7406",
-+ " -G, --strip-debug \u6253\u5305\u65F6\u5220\u9664\u8C03\u8BD5\u5C5E\u6027",
-+ " -O, --no-keep-file-order \u4E0D\u4F20\u8F93\u6587\u4EF6\u6392\u5E8F\u4FE1\u606F",
-+ " --keep-file-order (\u9ED8\u8BA4\u503C) \u4FDD\u7559\u8F93\u5165\u6587\u4EF6\u6392\u5E8F",
-+ " -S{N}, --segment-limit={N} \u8F93\u51FA\u6BB5\u9650\u5236 (\u9ED8\u8BA4\u503C N=1Mb)",
-+ " -E{N}, --effort={N} \u6253\u5305\u6548\u679C (\u9ED8\u8BA4\u503C N=5)",
-+ " -H{h}, --deflate-hint={h} \u4F20\u8F93\u538B\u7F29\u63D0\u793A: true, false \u6216 keep (\u9ED8\u8BA4\u503C)",
-+ " -m{V}, --modification-time={V} \u4F20\u8F93 modtimes: latest \u6216 keep (\u9ED8\u8BA4\u503C)",
-+ " -P{F}, --pass-file={F} \u4F20\u8F93\u672A\u89E3\u538B\u7F29\u7684\u7ED9\u5B9A\u8F93\u5165\u5143\u7D20",
-+ " -U{a}, --unknown-attribute={a} \u672A\u77E5\u5C5E\u6027\u64CD\u4F5C: error, strip \u6216 pass (\u9ED8\u8BA4\u503C)",
-+ " -C{N}={L}, --class-attribute={N}={L} (\u7528\u6237\u5B9A\u4E49\u7684\u5C5E\u6027)",
-+ " -F{N}={L}, --field-attribute={N}={L} (\u7528\u6237\u5B9A\u4E49\u7684\u5C5E\u6027)",
-+ " -M{N}={L}, --method-attribute={N}={L} (\u7528\u6237\u5B9A\u4E49\u7684\u5C5E\u6027)",
-+ " -D{N}={L}, --code-attribute={N}={L} (\u7528\u6237\u5B9A\u4E49\u7684\u5C5E\u6027)",
-+ " -f{F}, --config-file={F} \u8BFB\u53D6\u6587\u4EF6 F \u7684 Pack200.Packer \u5C5E\u6027",
-+ PARAMETER_V ,
-+ PARAMETER_Q ,
-+ PARAMETER_LF ,
-+ PARAMETER_H ,
-+ PARAMETER_VER ,
-+ PARAMETER_J,
-+ "",
-+ "\u6CE8:",
-+ " -P, -C, -F, -M \u548C -D \u9009\u9879\u7D2F\u8BA1\u3002",
-+ " \u793A\u4F8B\u5C5E\u6027\u5B9A\u4E49: -C SourceFile=RUH\u3002",
-+ " Config. \u6587\u4EF6\u5C5E\u6027\u7531 Pack200 API \u5B9A\u4E49\u3002",
-+ " \u6709\u5173 -S, -E, -H-, -m, -U \u503C\u7684\u542B\u4E49, \u8BF7\u53C2\u9605 Pack200 API\u3002",
-+ " \u5E03\u5C40\u5B9A\u4E49 (\u4F8B\u5982 RUH) \u7531 JSR 200 \u5B9A\u4E49\u3002",
-+ "",
-+ "\u91CD\u65B0\u6253\u5305\u6A21\u5F0F\u901A\u8FC7\u6253\u5305/\u89E3\u5305\u5468\u671F\u66F4\u65B0 JAR \u6587\u4EF6:",
-+ " pack200 [-r|--repack] [-opt | --option=value]... [repackedy.jar] y.jar\n"
-+ }
-+ },
-+ {UNPACK_HELP,new String[]{
-+ "\u7528\u6CD5: unpack200 [-opt... | --option=value]... x.pack[.gz] y.jar\n",
-+ "",
-+ "\u89E3\u5305\u9009\u9879",
-+ " -H{h}, --deflate-hint={h} \u8986\u76D6\u5DF2\u4F20\u8F93\u7684\u538B\u7F29\u63D0\u793A: true, false \u6216 keep (\u9ED8\u8BA4\u503C)",
-+ " -r, --remove-pack-file \u89E3\u5305\u4E4B\u540E\u5220\u9664\u8F93\u5165\u6587\u4EF6",
-+ PARAMETER_V ,
-+ PARAMETER_Q ,
-+ PARAMETER_LF ,
-+ PARAMETER_H ,
-+ PARAMETER_VER ,
-+ PARAMETER_J,
-+ }
-+ },
-+
-+ {MORE_INFO,"(\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u8FD0\u884C {0} --help\u3002)"},//parameter 0:command name
-+ {DUPLICATE_OPTION,"\u91CD\u590D\u7684\u9009\u9879: {0}"},//parameter 0:option
-+ {BAD_SPEC,"{0}\u7684\u89C4\u8303\u9519\u8BEF: {1}"},//parameter 0:option;parameter 1:specifier
-+ };
-+
-+ protected Object[][] getContents() {
-+ return resource;
-+ }
-+
-+
-+}
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2009,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,13 +36,34 @@
- import java.rmi.NoSuchObjectException;
-
- import com.sun.jmx.remote.internal.IIOPProxy;
-+import java.io.SerializablePermission;
-+import java.security.AccessControlContext;
-+import java.security.AccessController;
-+import java.security.Permissions;
-+import java.security.PrivilegedActionException;
-+import java.security.PrivilegedExceptionAction;
-+import java.security.ProtectionDomain;
-
- /**
-- * An implementatin of IIOPProxy that simply delegates to the appropriate
-+ * An implementation of IIOPProxy that simply delegates to the appropriate
- * RMI-IIOP and CORBA APIs.
- */
-
- public class IIOPProxyImpl implements IIOPProxy {
-+ // special ACC used to initialize the IIOP stub
-+ // the only allowed privilege is SerializablePermission("enableSubclassImplementation")
-+ private static final AccessControlContext STUB_ACC;
-+
-+ static {
-+ Permissions p = new Permissions();
-+ p.add(new SerializablePermission("enableSubclassImplementation"));
-+ STUB_ACC = new AccessControlContext(
-+ new ProtectionDomain[]{
-+ new ProtectionDomain(null, p)
-+ }
-+ );
-+ }
-+
- public IIOPProxyImpl() { }
-
- @Override
-@@ -113,7 +134,24 @@
- }
-
- @Override
-- public Remote toStub(Remote obj) throws NoSuchObjectException {
-- return PortableRemoteObject.toStub(obj);
-+ public Remote toStub(final Remote obj) throws NoSuchObjectException {
-+ if (System.getSecurityManager() == null) {
-+ return PortableRemoteObject.toStub(obj);
-+ } else {
-+ try {
-+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Remote>() {
-+
-+ @Override
-+ public Remote run() throws Exception {
-+ return PortableRemoteObject.toStub(obj);
-+ }
-+ }, STUB_ACC);
-+ } catch (PrivilegedActionException e) {
-+ if (e.getException() instanceof NoSuchObjectException) {
-+ throw (NoSuchObjectException)e.getException();
-+ }
-+ throw new RuntimeException("Unexpected exception type", e.getException());
-+ }
-+ }
- }
- }
---- ./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-07-15 21:54:44.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2006, 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
-@@ -34,81 +34,37 @@
-
- import javax.management.remote.SubjectDelegationPermission;
-
--import com.sun.jmx.remote.util.CacheMap;
-+import java.util.*;
-
- public class SubjectDelegator {
-- private static final int PRINCIPALS_CACHE_SIZE = 10;
-- private static final int ACC_CACHE_SIZE = 10;
--
-- private CacheMap<Subject, Principal[]> principalsCache;
-- private CacheMap<Subject, AccessControlContext> accCache;
--
- /* Return the AccessControlContext appropriate to execute an
- operation on behalf of the delegatedSubject. If the
- authenticatedAccessControlContext does not have permission to
- delegate to that subject, throw SecurityException. */
-- public synchronized AccessControlContext
-+ public AccessControlContext
- delegatedContext(AccessControlContext authenticatedACC,
- Subject delegatedSubject,
- boolean removeCallerContext)
- throws SecurityException {
-
-- if (principalsCache == null || accCache == null) {
-- principalsCache =
-- new CacheMap<Subject, Principal[]>(PRINCIPALS_CACHE_SIZE);
-- accCache =
-- new CacheMap<Subject, AccessControlContext>(ACC_CACHE_SIZE);
-- }
--
-- // Retrieve the principals for the given
-- // delegated subject from the cache
-- //
-- Principal[] delegatedPrincipals = principalsCache.get(delegatedSubject);
--
-- // Convert the set of principals stored in the
-- // delegated subject into an array of principals
-- // and store it in the cache
-- //
-- if (delegatedPrincipals == null) {
-- delegatedPrincipals =
-- delegatedSubject.getPrincipals().toArray(new Principal[0]);
-- principalsCache.put(delegatedSubject, delegatedPrincipals);
-- }
--
-- // Retrieve the access control context for the
-- // given delegated subject from the cache
-- //
-- AccessControlContext delegatedACC = accCache.get(delegatedSubject);
--
-- // Build the access control context to be used
-- // when executing code as the delegated subject
-- // and store it in the cache
-- //
-- if (delegatedACC == null) {
-- if (removeCallerContext) {
-- delegatedACC =
-- JMXSubjectDomainCombiner.getDomainCombinerContext(
-- delegatedSubject);
-- } else {
-- delegatedACC =
-- JMXSubjectDomainCombiner.getContext(delegatedSubject);
-- }
-- accCache.put(delegatedSubject, delegatedACC);
-+ if (System.getSecurityManager() != null && authenticatedACC == null) {
-+ throw new SecurityException("Illegal AccessControlContext: null");
- }
-
- // Check if the subject delegation permission allows the
- // authenticated subject to assume the identity of each
- // principal in the delegated subject
- //
-- final Principal[] dp = delegatedPrincipals;
-+ Collection<Principal> ps = getSubjectPrincipals(delegatedSubject);
-+ final Collection<Permission> permissions = new ArrayList<>(ps.size());
-+ for(Principal p : ps) {
-+ 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;
-@@ -116,7 +72,15 @@
- };
- AccessController.doPrivileged(action, authenticatedACC);
-
-- return delegatedACC;
-+ return getDelegatedAcc(delegatedSubject, removeCallerContext);
-+ }
-+
-+ private AccessControlContext getDelegatedAcc(Subject delegatedSubject, boolean removeCallerContext) {
-+ if (removeCallerContext) {
-+ return JMXSubjectDomainCombiner.getDomainCombinerContext(delegatedSubject);
-+ } else {
-+ return JMXSubjectDomainCombiner.getContext(delegatedSubject);
-+ }
- }
-
- /**
-@@ -131,11 +95,9 @@
- public static synchronized boolean
- checkRemoveCallerContext(Subject subject) {
- try {
-- final Principal[] dp =
-- subject.getPrincipals().toArray(new Principal[0]);
-- for (int i = 0 ; i < dp.length ; i++) {
-+ for (Principal p : getSubjectPrincipals(subject)) {
- final String pname =
-- dp[i].getClass().getName() + "." + dp[i].getName();
-+ p.getClass().getName() + "." + p.getName();
- final Permission sdp =
- new SubjectDelegationPermission(pname);
- AccessController.checkPermission(sdp);
-@@ -145,4 +107,19 @@
- }
- return true;
- }
-+
-+ /**
-+ * Retrieves the {@linkplain Subject} principals
-+ * @param subject The subject
-+ * @return If the {@code Subject} is immutable it will return the principals directly.
-+ * If the {@code Subject} is mutable it will create an unmodifiable copy.
-+ */
-+ private static Collection<Principal> getSubjectPrincipals(Subject subject) {
-+ if (subject.isReadOnly()) {
-+ return subject.getPrincipals();
-+ }
-+
-+ List<Principal> principals = Arrays.asList(subject.getPrincipals().toArray(new Principal[0]));
-+ return Collections.unmodifiableList(principals);
-+ }
- }
---- ./jdk/src/share/classes/com/sun/jmx/remote/util/CacheMap.java 2013-09-06 11:27:56.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/jmx/remote/util/CacheMap.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,121 +0,0 @@
--/*
-- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
-- * 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.jmx.remote.util;
--
--import java.lang.ref.SoftReference;
--import java.util.Iterator;
--import java.util.LinkedList;
--import java.util.List;
--import java.util.WeakHashMap;
--
--import com.sun.jmx.mbeanserver.Util;
--
--/**
-- * <p>Like WeakHashMap, except that the keys of the <em>n</em> most
-- * recently-accessed entries are kept as {@link SoftReference soft
-- * references}. Accessing an element means creating it, or retrieving
-- * it with {@link #get(Object) get}. Because these entries are kept
-- * with soft references, they will tend to remain even if their keys
-- * are not referenced elsewhere. But if memory is short, they will
-- * be removed.</p>
-- */
--public class CacheMap<K, V> extends WeakHashMap<K, V> {
-- /**
-- * <p>Create a <code>CacheMap</code> that can keep up to
-- * <code>nSoftReferences</code> as soft references.</p>
-- *
-- * @param nSoftReferences Maximum number of keys to keep as soft
-- * references. Access times for {@link #get(Object) get} and
-- * {@link #put(Object, Object) put} have a component that scales
-- * linearly with <code>nSoftReferences</code>, so this value
-- * should not be too great.
-- *
-- * @throws IllegalArgumentException if
-- * <code>nSoftReferences</code> is negative.
-- */
-- public CacheMap(int nSoftReferences) {
-- if (nSoftReferences < 0) {
-- throw new IllegalArgumentException("nSoftReferences = " +
-- nSoftReferences);
-- }
-- this.nSoftReferences = nSoftReferences;
-- }
--
-- public V put(K key, V value) {
-- cache(key);
-- return super.put(key, value);
-- }
--
-- public V get(Object key) {
-- cache(Util.<K>cast(key));
-- return super.get(key);
-- }
--
-- /* We don't override remove(Object) or try to do something with
-- the map's iterators to detect removal. So we may keep useless
-- entries in the soft reference list for keys that have since
-- been removed. The assumption is that entries are added to the
-- cache but never removed. But the behavior is not wrong if
-- they are in fact removed -- the caching is just less
-- performant. */
--
-- private void cache(K key) {
-- Iterator<SoftReference<K>> it = cache.iterator();
-- while (it.hasNext()) {
-- SoftReference<K> sref = it.next();
-- K key1 = sref.get();
-- if (key1 == null)
-- it.remove();
-- else if (key.equals(key1)) {
-- // Move this element to the head of the LRU list
-- it.remove();
-- cache.add(0, sref);
-- return;
-- }
-- }
--
-- int size = cache.size();
-- if (size == nSoftReferences) {
-- if (size == 0)
-- return; // degenerate case, equivalent to WeakHashMap
-- it.remove();
-- }
--
-- cache.add(0, new SoftReference<K>(key));
-- }
--
-- /* List of soft references for the most-recently referenced keys.
-- The list is in most-recently-used order, i.e. the first element
-- is the most-recently referenced key. There are never more than
-- nSoftReferences elements of this list.
--
-- If we didn't care about J2SE 1.3 compatibility, we could use
-- LinkedHashSet in conjunction with a subclass of SoftReference
-- whose equals and hashCode reflect the referent. */
-- private final LinkedList<SoftReference<K>> cache =
-- new LinkedList<SoftReference<K>>();
-- private final int nSoftReferences;
--}
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -27,17 +27,9 @@
-
- // java imports
- //
-+import com.sun.jmx.snmp.SnmpDefinitions;
- import java.io.Serializable;
--import java.util.Hashtable;
--import java.util.Enumeration;
--
--// jmx imports
--//
--import com.sun.jmx.snmp.SnmpValue;
--import com.sun.jmx.snmp.SnmpVarBind;
- import com.sun.jmx.snmp.SnmpStatusException;
--import com.sun.jmx.snmp.agent.SnmpMibOid;
--import com.sun.jmx.snmp.agent.SnmpMibNode;
-
- /**
- * Represents a node in an SNMP MIB which corresponds to a table entry
-@@ -99,7 +91,7 @@
- */
- public void validateVarId(long arc, Object userData)
- throws SnmpStatusException {
-- if (isVariable(arc) == false) throw noSuchNameException;
-+ if (isVariable(arc) == false) throw new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName);
- }
-
- /**
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -116,7 +116,7 @@
- public void validateVarId(long arc, Object userData)
- throws SnmpStatusException {
- if (isVariable(arc) == false)
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- }
-
-
-@@ -365,16 +365,16 @@
-
- // The trailing .0 is missing in the OID
- if (depth+2 > length)
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
-
- // There are too many arcs left in the OID (there should remain
- // a single trailing .0)
- if (depth+2 < length)
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
-
- // The last trailing arc is not .0
- if (oid[depth+1] != 0L)
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
-
- // It's one of our variable, register this node.
- handlers.add(this,depth,varbind);
-@@ -397,7 +397,7 @@
- // abort the whole request, so we're going to throw
- // a noSuchObject...
- //
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- final Object data = handlers.getUserData();
- final int pduVersion = handlers.getRequestPduVersion();
-@@ -433,7 +433,7 @@
- depth+1,handlers,
- checker);
- }catch(SnmpStatusException ex) {
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- } finally {
- checker.remove(depth);
- }
-@@ -458,7 +458,7 @@
- try {
- checker.checkCurrentOid();
- } catch(SnmpStatusException e) {
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- } finally {
- checker.remove(depth,2);
- }
-@@ -503,7 +503,7 @@
- // The oid is not valid, we will throw an exception in order
- // to try with the next valid identifier...
- //
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- } 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-07-15 21:49:30.000000000 -0700
-@@ -155,7 +155,7 @@
- long[] oid, int depth,
- SnmpRequestTree handlers)
- throws SnmpStatusException {
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- }
-
- /**
-@@ -183,7 +183,7 @@
- long[] oid, int pos, int depth,
- SnmpRequestTree handlers, AcmChecker checker)
- throws SnmpStatusException {
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- }
-
- /**
-@@ -347,7 +347,7 @@
- final int val= (int) value;
-
- if (a == null)
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- int low= 0;
- int max= a.length;
-@@ -357,10 +357,10 @@
- // Basic check
- //
- if (max < 1)
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- if (a[max-1] <= val)
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- while (low <= max) {
- elmt= a[curr];
-@@ -400,15 +400,4 @@
- * Contains the list of variable identifiers.
- */
- protected int[] varList;
--
-- /**
-- * Contains a predefined exception that is often fired when an
-- * object is not found in the MIB.
-- */
-- static final protected SnmpStatusException noSuchInstanceException =
-- new SnmpStatusException(SnmpStatusException.noSuchInstance);
-- static final protected SnmpStatusException noSuchObjectException =
-- new SnmpStatusException(SnmpStatusException.noSuchObject);
-- static final protected SnmpStatusException noSuchNameException =
-- 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-07-15 21:49:30.000000000 -0700
-@@ -157,11 +157,11 @@
-
- if (depth > length) {
- // Nothing is left... the oid is not valid
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- } else if (depth == length) {
- // The oid is not complete...
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
-
- } else {
- // Some children variable or subobject is being querried
-@@ -206,7 +206,7 @@
- // abort the whole request, so we're going to throw
- // a noSuchObject...
- //
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- final Object data = handlers.getUserData();
- final int pduVersion = handlers.getRequestPduVersion();
-@@ -231,7 +231,7 @@
- // SnmpOid result = null;
- if (child == null) {
- // shouldn't happen
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- // validateVarId(index);
- // handlers.add(this,varbind,depth);
- // result = new SnmpOid(0);
-@@ -442,10 +442,10 @@
- //
- final int pos= getInsertAt(id);
- if (pos >= nbChildren)
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- if (varList[pos] != (int) id)
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- // Access the node
- //
-@@ -453,10 +453,10 @@
- try {
- child = children.elementAtNonSync(pos);
- } catch(ArrayIndexOutOfBoundsException e) {
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- }
- if (child == null)
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
- return child;
- }
-
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -279,7 +279,7 @@
- SnmpVarBind var = null;
- for (Enumeration e= r.getElements(); e.hasMoreElements();) {
- var = (SnmpVarBind) e.nextElement();
-- r.registerGetException(var,noSuchInstanceException);
-+ r.registerGetException(var,new SnmpStatusException(SnmpStatusException.noSuchInstance));
- }
- }
-
-@@ -1607,7 +1607,7 @@
- throws SnmpStatusException {
-
- if (size == 0)
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
-
- final SnmpOid resOid = oid;
-
-@@ -1618,7 +1618,7 @@
- if (last.equals(resOid)) {
- // Last element of the table ...
- //
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
- }
-
- // First find the oid. This will allow to speed up retrieval process
-@@ -1640,12 +1640,12 @@
- // XX last = (SnmpOid) oids.elementAt(newPos);
- last = tableoids[newPos];
- } catch(ArrayIndexOutOfBoundsException e) {
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
- }
- } else {
- // We are dealing with the last element of the table ..
- //
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
- }
-
-
-@@ -1668,7 +1668,7 @@
- protected SnmpOid getNextOid(Object userData)
- throws SnmpStatusException {
- if (size == 0)
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
- // XX return (SnmpOid) oids.firstElement();
- return tableoids[0];
- }
-@@ -1875,7 +1875,7 @@
- if (!hasEntry) {
- if (!handlers.isCreationAllowed())
- // we're not doing a set
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
- else if (!isCreationEnabled())
- // we're doing a set but creation is disabled.
- throw new
-@@ -1921,7 +1921,7 @@
- // abort the whole request, so we're going to throw
- // a noSuchObject...
- //
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- final Object data = handlers.getUserData();
- final int pduVersion = handlers.getRequestPduVersion();
-@@ -1955,7 +1955,7 @@
- // so we won't find the next element in this table... (any
- // element in this table will have a smaller OID)
- //
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- } else if (oid[pos] < nodeId) {
- // we must return the first leaf under the first columnar
- // object, so we are back to our first case where pos was
-@@ -2046,7 +2046,7 @@
- // must have the same holes)
- //
- if (skipEntryVariable(entryoid,var,data,pduVersion))
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- } catch(SnmpStatusException se) {
- entryoid = getNextOid(data);
- var = getNextVarEntryId(entryoid,var,data,pduVersion);
-@@ -2079,7 +2079,7 @@
- // So we throw the exception.
- // => will skip to next node in the MIB tree.
- //
-- if (entryoid == null || var == -1 ) throw noSuchObjectException;
-+ if (entryoid == null || var == -1 ) throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
-
- // So here we know both the row (entryoid) and the column (var)
-@@ -2092,7 +2092,7 @@
- // other entry => skip to next column.
- //
- if (!isReadableEntryId(entryoid,var,data))
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- // Prepare the result and the ACM checker.
- //
-@@ -2156,7 +2156,7 @@
- // => will skip to next node in the MIB tree.
- //
- if (entryoid == null || var == -1 )
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
- }
- }
-
-@@ -2177,12 +2177,12 @@
- // Control the length of the oid
- //
- if (pos +2 >= length)
-- throw noSuchInstanceException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
-
- // Check that the entry identifier is specified
- //
- if (oid[pos] != nodeId)
-- throw noSuchObjectException;
-+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-
- }
-
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -1146,7 +1146,4 @@
-
- static final private String InterruptSysCallMsg =
- "Interrupted system call";
--
-- 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-07-15 21:49:30.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-07-15 21:49:30.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-07-15 21:49:30.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 2014-07-15 21:49:30.000000000 -0700
-@@ -25,11 +25,12 @@
-
- package com.sun.jndi.ldap;
-
--import java.net.URL;
- import java.net.URLClassLoader;
- import java.net.MalformedURLException;
-+import java.security.AccessControlContext;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
-+import sun.misc.SharedSecrets;
-
- final class VersionHelper12 extends VersionHelper {
-
-@@ -82,12 +83,16 @@
- }
-
- Thread createThread(final Runnable r) {
-- return (Thread) AccessController.doPrivileged(
-- new PrivilegedAction() {
-- public Object run() {
-- return new Thread(r);
-+ final AccessControlContext acc = AccessController.getContext();
-+ // 4290486: doPrivileged is needed to create a thread in
-+ // an environment that restricts "modifyThreadGroup".
-+ return AccessController.doPrivileged(
-+ new PrivilegedAction<Thread>() {
-+ public Thread run() {
-+ return SharedSecrets.getJavaLangAccess()
-+ .newThreadWithAcc(r, acc);
-+ }
- }
-- }
- );
- }
- }
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -66,6 +66,11 @@
- * cannot be created, opened, or written to.
- * @throws UnsupportedOperationException if this operation is not supported.
- * @throws NullPointerException if <tt>outputFile</tt> is <tt>null</tt>.
-+ * @throws SecurityException
-+ * If a security manager exists and its {@link
-+ * java.lang.SecurityManager#checkWrite(java.lang.String)}
-+ * method denies write access to the named file
-+ * or the caller does not have ManagmentPermission("control").
- */
- public void dumpHeap(String outputFile, boolean live) throws java.io.IOException;
-
---- ./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-07-15 21:49:31.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-07-15 21:49:31.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-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 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
-@@ -29,10 +29,10 @@
- import javax.naming.NamingException;
-
- /**
-- * The FactoryEnumeration is used for returning factory instances.
-- *
-- * @author Rosanna Lee
-- * @author Scott Seligman
-+ * The FactoryEnumeration is used for returning factory instances.
-+ *
-+ * @author Rosanna Lee
-+ * @author Scott Seligman
- */
-
- // no need to implement Enumeration since this is only for internal use
-@@ -55,9 +55,12 @@
- * references so as not to prevent GC of the class loader. Each
- * weak reference is tagged with the factory's class name so the
- * class can be reloaded if the reference is cleared.
--
-+ *
- * @param factories A non-null list
- * @param loader The class loader of the list's contents
-+ *
-+ * This internal method is used with Thread Context Class Loader (TCCL),
-+ * please don't expose this method as public.
- */
- FactoryEnumeration(List factories, ClassLoader loader) {
- this.factories = factories;
-@@ -77,7 +80,8 @@
-
- try {
- if (answer == null) { // reload class if weak ref cleared
-- answer = Class.forName(className, true, loader);
-+ Class<?> cls = Class.forName(className, true, loader);
-+ answer = cls;
- }
- // 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-07-15 21:49:31.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-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 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
-@@ -35,7 +35,6 @@
- import java.security.PrivilegedActionException;
- import java.security.PrivilegedExceptionAction;
- import java.util.Enumeration;
--import java.util.Hashtable;
- import java.util.NoSuchElementException;
- import java.util.Properties;
-
-@@ -54,21 +53,24 @@
-
- final class VersionHelper12 extends VersionHelper {
-
-- private boolean getSystemPropsFailed = false;
--
-- VersionHelper12() {} // Disallow external from creating one of these.
-+ // Disallow external from creating one of these.
-+ VersionHelper12() {
-+ }
-
- public Class loadClass(String className) throws ClassNotFoundException {
-- ClassLoader cl = getContextClassLoader();
-- return Class.forName(className, true, cl);
-+ return loadClass(className, getContextClassLoader());
- }
-
- /**
-- * Package private.
-- */
-+ * Package private.
-+ *
-+ * This internal method is used with Thread Context Class Loader (TCCL),
-+ * please don't expose this method as public.
-+ */
- Class loadClass(String className, ClassLoader cl)
- throws ClassNotFoundException {
-- return Class.forName(className, true, cl);
-+ Class<?> cls = Class.forName(className, true, cl);
-+ return cls;
- }
-
- /**
-@@ -77,12 +79,12 @@
- */
- public Class loadClass(String className, String codebase)
- throws ClassNotFoundException, MalformedURLException {
-- ClassLoader cl;
-
- ClassLoader parent = getContextClassLoader();
-- cl = URLClassLoader.newInstance(getUrlArray(codebase), parent);
-+ ClassLoader cl =
-+ URLClassLoader.newInstance(getUrlArray(codebase), parent);
-
-- return Class.forName(className, true, cl);
-+ return loadClass(className, cl);
- }
-
- String getJndiProperty(final int i) {
-@@ -100,16 +102,12 @@
- }
-
- String[] getJndiProperties() {
-- if (getSystemPropsFailed) {
-- return null; // after one failure, don't bother trying again
-- }
- Properties sysProps = (Properties) AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
- try {
- return System.getProperties();
- } catch (SecurityException e) {
-- getSystemPropsFailed = true;
- return null;
- }
- }
-@@ -175,17 +173,31 @@
- return new InputStreamEnumeration(urls);
- }
-
-+ /**
-+ * Package private.
-+ *
-+ * This internal method returns Thread Context Class Loader (TCCL),
-+ * if null, returns the system Class Loader.
-+ *
-+ * Please don't expose this method as public.
-+ */
- ClassLoader getContextClassLoader() {
- return (ClassLoader) AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
-- return Thread.currentThread().getContextClassLoader();
-+ ClassLoader loader =
-+ Thread.currentThread().getContextClassLoader();
-+ if (loader == null) {
-+ // Don't use bootstrap class loader directly!
-+ loader = ClassLoader.getSystemClassLoader();
-+ }
-+
-+ return loader;
- }
- }
- );
- }
-
--
- /**
- * 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/Init.java 2013-09-06 11:28:00.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java 2014-10-28 20:19:45.000000000 -0700
-@@ -25,6 +25,8 @@
- import java.io.InputStream;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
-+import java.security.PrivilegedActionException;
-+import java.security.PrivilegedExceptionAction;
- import java.util.ArrayList;
- import java.util.List;
-
-@@ -35,6 +37,7 @@
- import com.sun.org.apache.xml.internal.security.algorithms.JCEMapper;
- import com.sun.org.apache.xml.internal.security.algorithms.SignatureAlgorithm;
- import com.sun.org.apache.xml.internal.security.c14n.Canonicalizer;
-+import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
- import com.sun.org.apache.xml.internal.security.keys.keyresolver.KeyResolver;
- import com.sun.org.apache.xml.internal.security.transforms.Transform;
- import com.sun.org.apache.xml.internal.security.utils.ElementProxy;
-@@ -118,43 +121,50 @@
- log.log(java.util.logging.Level.FINE, "Registering default algorithms");
- }
- try {
-- //
-- // Bind the default prefixes
-- //
-- ElementProxy.registerDefaultPrefixes();
--
-- //
-- // Set the default Transforms
-- //
-- Transform.registerDefaultAlgorithms();
--
-- //
-- // Set the default signature algorithms
-- //
-- SignatureAlgorithm.registerDefaultAlgorithms();
--
-- //
-- // Set the default JCE algorithms
-- //
-- JCEMapper.registerDefaultAlgorithms();
--
-- //
-- // Set the default c14n algorithms
-- //
-- Canonicalizer.registerDefaultAlgorithms();
--
-- //
-- // Register the default resolvers
-- //
-- ResourceResolver.registerDefaultResolvers();
--
-- //
-- // Register the default key resolvers
-- //
-- KeyResolver.registerDefaultResolvers();
-- } catch (Exception ex) {
-- log.log(java.util.logging.Level.SEVERE, ex.getMessage(), ex);
-- ex.printStackTrace();
-+ AccessController.doPrivileged(new PrivilegedExceptionAction<Void>(){
-+ @Override public Void run() throws XMLSecurityException {
-+ //
-+ // Bind the default prefixes
-+ //
-+ ElementProxy.registerDefaultPrefixes();
-+
-+ //
-+ // Set the default Transforms
-+ //
-+ Transform.registerDefaultAlgorithms();
-+
-+ //
-+ // Set the default signature algorithms
-+ //
-+ SignatureAlgorithm.registerDefaultAlgorithms();
-+
-+ //
-+ // Set the default JCE algorithms
-+ //
-+ JCEMapper.registerDefaultAlgorithms();
-+
-+ //
-+ // Set the default c14n algorithms
-+ //
-+ Canonicalizer.registerDefaultAlgorithms();
-+
-+ //
-+ // Register the default resolvers
-+ //
-+ ResourceResolver.registerDefaultResolvers();
-+
-+ //
-+ // Register the default key resolvers
-+ //
-+ KeyResolver.registerDefaultResolvers();
-+
-+ return null;
-+ }
-+ });
-+ } catch (PrivilegedActionException ex) {
-+ XMLSecurityException xse = (XMLSecurityException)ex.getException();
-+ log.log(java.util.logging.Level.SEVERE, xse.getMessage(), xse);
-+ xse.printStackTrace();
- }
- }
-
---- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java 2013-09-06 11:28:00.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java 2014-10-28 20:19:45.000000000 -0700
-@@ -27,6 +27,7 @@
-
- import com.sun.org.apache.xml.internal.security.encryption.XMLCipher;
- import com.sun.org.apache.xml.internal.security.signature.XMLSignature;
-+import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
- import org.w3c.dom.Element;
-
-
-@@ -49,8 +50,11 @@
- *
- * @param id
- * @param algorithm
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the JCE algorithm
- */
- public static void register(String id, Algorithm algorithm) {
-+ JavaUtils.checkRegisterPermission();
- algorithmsMap.put(id, algorithm);
- }
-
-@@ -264,8 +268,11 @@
- /**
- * Sets the default Provider for obtaining the security algorithms
- * @param provider the default providerId.
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to set the JCE provider
- */
- public static void setProviderId(String provider) {
-+ JavaUtils.checkRegisterPermission();
- providerName = provider;
- }
-
---- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java 2013-09-06 11:28:00.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java 2014-10-28 20:19:45.000000000 -0700
-@@ -37,6 +37,7 @@
- import com.sun.org.apache.xml.internal.security.signature.XMLSignature;
- import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
- import com.sun.org.apache.xml.internal.security.utils.Constants;
-+import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
- import org.w3c.dom.Attr;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
-@@ -314,18 +315,21 @@
- }
-
- /**
-- * Registers implementing class of the Transform algorithm with algorithmURI
-+ * Registers implementing class of the SignatureAlgorithm with algorithmURI
- *
-- * @param algorithmURI algorithmURI URI representation of <code>Transform algorithm</code>.
-+ * @param algorithmURI algorithmURI URI representation of <code>SignatureAlgorithm</code>.
- * @param implementingClass <code>implementingClass</code> the implementing class of
- * {@link SignatureAlgorithmSpi}
- * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
- * @throws XMLSignatureException
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the signature algorithm
- */
- @SuppressWarnings("unchecked")
- public static void register(String algorithmURI, String implementingClass)
- throws AlgorithmAlreadyRegisteredException, ClassNotFoundException,
- XMLSignatureException {
-+ JavaUtils.checkRegisterPermission();
- if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
- }
-@@ -352,15 +356,18 @@
- /**
- * Registers implementing class of the Transform algorithm with algorithmURI
- *
-- * @param algorithmURI algorithmURI URI representation of <code>Transform algorithm</code>.
-+ * @param algorithmURI algorithmURI URI representation of <code>SignatureAlgorithm</code>.
- * @param implementingClass <code>implementingClass</code> the implementing class of
- * {@link SignatureAlgorithmSpi}
- * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
- * @throws XMLSignatureException
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the signature algorithm
- */
- public static void register(String algorithmURI, Class<? extends SignatureAlgorithmSpi> implementingClass)
- throws AlgorithmAlreadyRegisteredException, ClassNotFoundException,
- XMLSignatureException {
-+ JavaUtils.checkRegisterPermission();
- if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
- }
---- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java 2013-09-06 11:28:00.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java 2014-10-28 20:19:45.000000000 -0700
-@@ -40,6 +40,7 @@
- import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315OmitComments;
- import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315WithComments;
- import com.sun.org.apache.xml.internal.security.exceptions.AlgorithmAlreadyRegisteredException;
-+import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
- import org.w3c.dom.Document;
- import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-@@ -136,10 +137,13 @@
- * @param algorithmURI
- * @param implementingClass
- * @throws AlgorithmAlreadyRegisteredException
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the canonicalizer
- */
- @SuppressWarnings("unchecked")
- public static void register(String algorithmURI, String implementingClass)
- throws AlgorithmAlreadyRegisteredException, ClassNotFoundException {
-+ JavaUtils.checkRegisterPermission();
- // check whether URI is already registered
- Class<? extends CanonicalizerSpi> registeredClass =
- canonicalizerHash.get(algorithmURI);
-@@ -160,9 +164,12 @@
- * @param algorithmURI
- * @param implementingClass
- * @throws AlgorithmAlreadyRegisteredException
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the canonicalizer
- */
-- public static void register(String algorithmURI, Class<CanonicalizerSpi> implementingClass)
-+ public static void register(String algorithmURI, Class<? extends CanonicalizerSpi> implementingClass)
- throws AlgorithmAlreadyRegisteredException, ClassNotFoundException {
-+ JavaUtils.checkRegisterPermission();
- // check whether URI is already registered
- Class<? extends CanonicalizerSpi> registeredClass = canonicalizerHash.get(algorithmURI);
-
---- ./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-07-15 21:49:31.000000000 -0700
-@@ -358,7 +358,8 @@
- } else if (!isVisible(xmlns)) {
- // There is a defn but the xmlns is not selected by the xpath.
- // then xmlns=""
-- n = ns.addMappingAndRender(XMLNS, "", nullNode);
-+ n = ns.addMappingAndRender(XMLNS, "",
-+ getNullNode(xmlns.getOwnerDocument()));
- }
- // 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-07-15 21:49:31.000000000 -0700
-@@ -302,7 +302,8 @@
- } else if ( !isVisible(xmlns)) {
- //There is a definition but the xmlns is not selected by the xpath.
- //then xmlns=""
-- n=ns.addMappingAndRender(XMLNS,"",nullNode);
-+ n=ns.addMappingAndRender(XMLNS, "",
-+ getNullNode(xmlns.getOwnerDocument()));
- }
- //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-07-15 21:49:31.000000000 -0700
-@@ -300,7 +300,7 @@
- if ((xmlns!=null) && (!isVisible(xmlns))) {
- //There is a definition but the xmlns is not selected by the xpath.
- //then xmlns=""
-- ns.addMapping(XMLNS,"",nullNode);
-+ ns.addMapping(XMLNS, "", getNullNode(xmlns.getOwnerDocument()));
- }
-
- 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-07-15 21:49:31.000000000 -0700
-@@ -34,7 +34,6 @@
- import java.util.Map;
- import java.util.Set;
-
--import javax.xml.parsers.DocumentBuilderFactory;
- import javax.xml.parsers.ParserConfigurationException;
-
- import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
-@@ -48,6 +47,7 @@
- import org.w3c.dom.Attr;
- import org.w3c.dom.Comment;
- import org.w3c.dom.Element;
-+import org.w3c.dom.Document;
- import org.w3c.dom.NamedNodeMap;
- import org.w3c.dom.Node;
- import org.w3c.dom.ProcessingInstruction;
-@@ -63,6 +63,9 @@
- public abstract class CanonicalizerBase extends CanonicalizerSpi {
- //Constants to be outputed, In char array form, so
- //less garbage is generate when outputed.
-+ //
-+ // Make sure you clone the following mutable arrays before passing to
-+ // potentially untrusted objects such as OutputStreams.
- private static final byte[] _END_PI = {'?','>'};
- private static final byte[] _BEGIN_PI = {'<','?'};
- private static final byte[] _END_COMM = {'-','-','>'};
-@@ -75,29 +78,18 @@
- private static final byte[] _LT_ = {'&','l','t',';'};
- private static final byte[] _END_TAG = {'<','/'};
- private static final byte[] _AMP_ = {'&','a','m','p',';'};
-+ private static final byte[] _EQUALS_STR = {'=','\"'};
-+
- final static AttrCompare COMPARE=new AttrCompare();
- final static String XML="xml";
- final static String XMLNS="xmlns";
-- final static byte[] equalsStr= {'=','\"'};
- static final int NODE_BEFORE_DOCUMENT_ELEMENT = -1;
- static final int NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT = 0;
- static final int NODE_AFTER_DOCUMENT_ELEMENT = 1;
-- //The null xmlns definiton.
-- protected static final Attr nullNode;
-- static {
-- try {
-- nullNode=DocumentBuilderFactory.newInstance().
-- newDocumentBuilder().newDocument().createAttributeNS(Constants.NamespaceSpecNS,XMLNS);
-- nullNode.setValue("");
-- } catch (Exception e) {
-- throw new RuntimeException("Unable to create nullNode"/*,*/+e);
-- }
-- }
--
- List nodeFilter;
--
- boolean _includeComments;
- Set _xpathNodeSet = null;
-+
- /**
- * The node to be skiped/excluded from the DOM tree
- * in subtree canonicalizations.
-@@ -106,6 +98,11 @@
- OutputStream _writer = new UnsyncByteArrayOutputStream();//null;
-
- /**
-+ * The null xmlns definition.
-+ */
-+ private Attr nullNode;
-+
-+ /**
- * Constructor CanonicalizerBase
- *
- * @param includeComments
-@@ -309,7 +306,7 @@
- writer.write('>');
- sibling= currentNode.getFirstChild();
- if (sibling==null) {
-- writer.write(_END_TAG);
-+ writer.write(_END_TAG.clone());
- UtfHelpper.writeStringToUtf8(name,writer);
- writer.write('>');
- //We fineshed with this level, pop to the previous definitions.
-@@ -323,7 +320,7 @@
- break;
- }
- while (sibling==null && parentNode!=null) {
-- writer.write(_END_TAG);
-+ writer.write(_END_TAG.clone());
- UtfHelpper.writeByte(((Element)parentNode).getTagName(),writer,cache);
- writer.write('>');
- //We fineshed with this level, pop to the previous definitions.
-@@ -479,7 +476,7 @@
-
- if (sibling==null) {
- if (currentNodeIsVisible) {
-- writer.write(_END_TAG);
-+ writer.write(_END_TAG.clone());
- UtfHelpper.writeByte(name,writer,cache);
- writer.write('>');
- //We fineshed with this level, pop to the previous definitions.
-@@ -497,7 +494,7 @@
- }
- while (sibling==null && parentNode!=null) {
- if (isVisible(parentNode)) {
-- writer.write(_END_TAG);
-+ writer.write(_END_TAG.clone());
- UtfHelpper.writeByte(((Element)parentNode).getTagName(),writer,cache);
- writer.write('>');
- //We fineshed with this level, pop to the previous definitions.
-@@ -609,7 +606,8 @@
- Attr nsprefix;
- if (((nsprefix=ns.getMappingWithoutRendered("xmlns"))!=null)
- && "".equals(nsprefix.getValue())) {
-- ns.addMappingAndRender("xmlns","",nullNode);
-+ ns.addMappingAndRender("xmlns", "",
-+ getNullNode(nsprefix.getOwnerDocument()));
- }
- }
- /**
-@@ -659,7 +657,7 @@
- final Map cache) throws IOException {
- writer.write(' ');
- UtfHelpper.writeByte(name,writer,cache);
-- writer.write(equalsStr);
-+ writer.write(_EQUALS_STR.clone());
- byte []toWrite;
- final int length = value.length();
- int i=0;
-@@ -669,27 +667,27 @@
- switch (c) {
-
- case '&' :
-- toWrite=_AMP_;
-+ toWrite=_AMP_.clone();
- break;
-
- case '<' :
-- toWrite=_LT_;
-+ toWrite=_LT_.clone();
- break;
-
- case '"' :
-- toWrite=_QUOT_;
-+ toWrite=_QUOT_.clone();
- break;
-
- case 0x09 : // '\t'
-- toWrite=__X9_;
-+ toWrite=__X9_.clone();
- break;
-
- case 0x0A : // '\n'
-- toWrite=__XA_;
-+ toWrite=__XA_.clone();
- break;
-
- case 0x0D : // '\r'
-- toWrite=__XD_;
-+ toWrite=__XD_.clone();
- break;
-
- default :
-@@ -718,7 +716,7 @@
- if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
- writer.write('\n');
- }
-- writer.write(_BEGIN_PI);
-+ writer.write(_BEGIN_PI.clone());
-
- final String target = currentPI.getTarget();
- int length = target.length();
-@@ -726,7 +724,7 @@
- for (int i = 0; i < length; i++) {
- char c=target.charAt(i);
- if (c==0x0D) {
-- writer.write(__XD_);
-+ writer.write(__XD_.clone());
- } else {
- if (c < 0x80) {
- writer.write(c);
-@@ -746,14 +744,14 @@
- for (int i = 0; i < length; i++) {
- char c=data.charAt(i);
- if (c==0x0D) {
-- writer.write(__XD_);
-+ writer.write(__XD_.clone());
- } else {
- UtfHelpper.writeCharToUtf8(c,writer);
- }
- }
- }
-
-- writer.write(_END_PI);
-+ writer.write(_END_PI.clone());
- if (position == NODE_BEFORE_DOCUMENT_ELEMENT) {
- writer.write('\n');
- }
-@@ -770,7 +768,7 @@
- if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
- writer.write('\n');
- }
-- writer.write(_BEGIN_COMM);
-+ writer.write(_BEGIN_COMM.clone());
-
- final String data = currentComment.getData();
- final int length = data.length();
-@@ -778,7 +776,7 @@
- for (int i = 0; i < length; i++) {
- char c=data.charAt(i);
- if (c==0x0D) {
-- writer.write(__XD_);
-+ writer.write(__XD_.clone());
- } else {
- if (c < 0x80) {
- writer.write(c);
-@@ -788,7 +786,7 @@
- }
- }
-
-- writer.write(_END_COMM);
-+ writer.write(_END_COMM.clone());
- if (position == NODE_BEFORE_DOCUMENT_ELEMENT) {
- writer.write('\n');
- }
-@@ -810,19 +808,19 @@
- switch (c) {
-
- case '&' :
-- toWrite=_AMP_;
-+ toWrite=_AMP_.clone();
- break;
-
- case '<' :
-- toWrite=_LT_;
-+ toWrite=_LT_.clone();
- break;
-
- case '>' :
-- toWrite=_GT_;
-+ toWrite=_GT_.clone();
- break;
-
- case 0xD :
-- toWrite=__XD_;
-+ toWrite=__XD_.clone();
- break;
-
- default :
-@@ -837,4 +835,18 @@
- }
- }
-
-+ // The null xmlns definition.
-+ protected Attr getNullNode(Document ownerDocument) {
-+ if (nullNode == null) {
-+ try {
-+ nullNode = ownerDocument.createAttributeNS(
-+ Constants.NamespaceSpecNS, XMLNS);
-+ nullNode.setValue("");
-+ } catch (Exception e) {
-+ throw new RuntimeException("Unable to create nullNode: " + e);
-+ }
-+ }
-+ return nullNode;
-+ }
-+
- }
---- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java 2013-09-06 11:28:01.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java 2014-10-28 20:19:45.000000000 -0700
-@@ -39,6 +39,7 @@
- import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SKIResolver;
- import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SubjectNameResolver;
- import com.sun.org.apache.xml.internal.security.keys.storage.StorageResolver;
-+import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
- import org.w3c.dom.Element;
- import org.w3c.dom.Node;
-
-@@ -172,9 +173,12 @@
- * @throws InstantiationException
- * @throws IllegalAccessException
- * @throws ClassNotFoundException
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the key resolver
- */
- public static void register(String className, boolean globalResolver)
- throws ClassNotFoundException, IllegalAccessException, InstantiationException {
-+ JavaUtils.checkRegisterPermission();
- KeyResolverSpi keyResolverSpi =
- (KeyResolverSpi) Class.forName(className).newInstance();
- keyResolverSpi.setGlobalResolver(globalResolver);
-@@ -192,8 +196,11 @@
- *
- * @param className
- * @param globalResolver Whether the KeyResolverSpi is a global resolver or not
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the key resolver
- */
- public static void registerAtStart(String className, boolean globalResolver) {
-+ JavaUtils.checkRegisterPermission();
- KeyResolverSpi keyResolverSpi = null;
- Exception ex = null;
- try {
-@@ -225,11 +232,14 @@
- *
- * @param keyResolverSpi a KeyResolverSpi instance to register
- * @param start whether to register the KeyResolverSpi at the start of the list or not
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the key resolver
- */
- public static void register(
- KeyResolverSpi keyResolverSpi,
- boolean start
- ) {
-+ JavaUtils.checkRegisterPermission();
- KeyResolver resolver = new KeyResolver(keyResolverSpi);
- if (start) {
- resolverVector.add(0, resolver);
-@@ -251,9 +261,12 @@
- * @throws InstantiationException
- * @throws IllegalAccessException
- * @throws ClassNotFoundException
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the key resolver
- */
- public static void registerClassNames(List<String> classNames)
- throws ClassNotFoundException, IllegalAccessException, InstantiationException {
-+ JavaUtils.checkRegisterPermission();
- List<KeyResolver> keyResolverList = new ArrayList<KeyResolver>(classNames.size());
- for (String className : classNames) {
- KeyResolverSpi keyResolverSpi =
---- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java 2013-09-06 11:28:01.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java 2014-10-28 20:19:45.000000000 -0700
-@@ -46,6 +46,7 @@
- import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXSLT;
- import com.sun.org.apache.xml.internal.security.utils.Constants;
- import com.sun.org.apache.xml.internal.security.utils.HelperNodeList;
-+import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
- import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
- import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
- import org.w3c.dom.Document;
-@@ -181,11 +182,14 @@
- * class of {@link TransformSpi}
- * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI
- * is already registered
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the transform
- */
- @SuppressWarnings("unchecked")
- public static void register(String algorithmURI, String implementingClass)
- throws AlgorithmAlreadyRegisteredException, ClassNotFoundException,
- InvalidTransformException {
-+ JavaUtils.checkRegisterPermission();
- // are we already registered?
- Class<? extends TransformSpi> transformSpi = transformSpiHash.get(algorithmURI);
- if (transformSpi != null) {
-@@ -206,9 +210,12 @@
- * class of {@link TransformSpi}
- * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI
- * is already registered
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register the transform
- */
- public static void register(String algorithmURI, Class<? extends TransformSpi> implementingClass)
- throws AlgorithmAlreadyRegisteredException {
-+ JavaUtils.checkRegisterPermission();
- // are we already registered?
- Class<? extends TransformSpi> transformSpi = transformSpiHash.get(algorithmURI);
- if (transformSpi != null) {
---- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java 2013-09-06 11:28:02.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java 2014-10-28 20:19:45.000000000 -0700
-@@ -468,9 +468,12 @@
- * @param namespace
- * @param prefix
- * @throws XMLSecurityException
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to set the default prefix
- */
- public static void setDefaultPrefix(String namespace, String prefix)
- throws XMLSecurityException {
-+ JavaUtils.checkRegisterPermission();
- if (prefixMappings.containsValue(prefix)) {
- String storedPrefix = prefixMappings.get(namespace);
- if (!storedPrefix.equals(prefix)) {
---- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java 2013-09-06 11:28:02.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java 2014-10-28 20:19:45.000000000 -0700
-@@ -26,6 +26,7 @@
- import java.io.FileOutputStream;
- import java.io.IOException;
- import java.io.InputStream;
-+import java.security.SecurityPermission;
-
- /**
- * A collection of different, general-purpose methods for JAVA-specific things
-@@ -37,6 +38,10 @@
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(JavaUtils.class.getName());
-
-+ private static final SecurityPermission REGISTER_PERMISSION =
-+ new SecurityPermission(
-+ "com.sun.org.apache.xml.internal.security.register");
-+
- private JavaUtils() {
- // we don't allow instantiation
- }
-@@ -128,4 +133,21 @@
- refBytes = baos.toByteArray();
- return refBytes;
- }
-+
-+ /**
-+ * Throws a {@code SecurityException} if a security manager is installed
-+ * and the caller is not allowed to register an implementation of an
-+ * algorithm, transform, or other security sensitive XML Signature function.
-+ *
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller has not been granted the
-+ * {@literal "com.sun.org.apache.xml.internal.security.register"}
-+ * {@code SecurityPermission}
-+ */
-+ public static void checkRegisterPermission() {
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ sm.checkPermission(REGISTER_PERMISSION);
-+ }
-+ }
- }
---- ./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 2014-07-15 21:49:32.000000000 -0700
-@@ -44,6 +44,9 @@
- }
-
- public void write(byte[] arg0) {
-+ if ((Integer.MAX_VALUE - pos) < arg0.length) {
-+ throw new OutOfMemoryError();
-+ }
- int newPos = pos + arg0.length;
- if (newPos > size) {
- expandSize(newPos);
-@@ -53,6 +56,9 @@
- }
-
- public void write(byte[] arg0, int arg1, int arg2) {
-+ if ((Integer.MAX_VALUE - pos) < arg2) {
-+ throw new OutOfMemoryError();
-+ }
- int newPos = pos + arg2;
- if (newPos > size) {
- expandSize(newPos);
-@@ -62,6 +68,9 @@
- }
-
- public void write(int arg0) {
-+ if ((Integer.MAX_VALUE - pos) == 0) {
-+ throw new OutOfMemoryError();
-+ }
- int newPos = pos + 1;
- if (newPos > size) {
- expandSize(newPos);
-@@ -82,7 +91,11 @@
- private void expandSize(int newPos) {
- int newSize = size;
- while (newPos > newSize) {
-- newSize = newSize<<2;
-+ newSize = newSize << 1;
-+ // Deal with overflow
-+ if (newSize < 0) {
-+ newSize = Integer.MAX_VALUE;
-+ }
- }
- byte newBuf[] = new byte[newSize];
- System.arraycopy(buf, 0, newBuf, 0, pos);
---- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java 2013-09-06 11:28:02.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java 2014-10-28 20:19:45.000000000 -0700
-@@ -79,16 +79,22 @@
- /**
- * Set the prefix for the digital signature namespace
- * @param prefix the new prefix for the digital signature namespace
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to set the prefix
- */
- public static void setDsPrefix(String prefix) {
-+ JavaUtils.checkRegisterPermission();
- dsPrefix = prefix;
- }
-
- /**
- * Set the prefix for the encryption namespace
- * @param prefix the new prefix for the encryption namespace
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to set the prefix
- */
- public static void setXencPrefix(String prefix) {
-+ JavaUtils.checkRegisterPermission();
- xencPrefix = prefix;
- }
-
---- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java 2013-09-06 11:28:02.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java 2014-10-28 20:19:45.000000000 -0700
-@@ -27,6 +27,7 @@
- import java.util.Map;
-
- import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
-+import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
- import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverDirectHTTP;
- import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverFragment;
- import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverLocalFilesystem;
-@@ -192,9 +193,12 @@
- * the class cannot be registered.
- *
- * @param className the name of the ResourceResolverSpi class to be registered
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register a resource resolver
- */
- @SuppressWarnings("unchecked")
- public static void register(String className) {
-+ JavaUtils.checkRegisterPermission();
- try {
- Class<ResourceResolverSpi> resourceResolverClass =
- (Class<ResourceResolverSpi>) Class.forName(className);
-@@ -209,9 +213,12 @@
- * list. This method logs a warning if the class cannot be registered.
- *
- * @param className the name of the ResourceResolverSpi class to be registered
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register a resource resolver
- */
- @SuppressWarnings("unchecked")
- public static void registerAtStart(String className) {
-+ JavaUtils.checkRegisterPermission();
- try {
- Class<ResourceResolverSpi> resourceResolverClass =
- (Class<ResourceResolverSpi>) Class.forName(className);
-@@ -226,8 +233,11 @@
- * cannot be registered.
- * @param className
- * @param start
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register a resource resolver
- */
- public static void register(Class<? extends ResourceResolverSpi> className, boolean start) {
-+ JavaUtils.checkRegisterPermission();
- try {
- ResourceResolverSpi resourceResolverSpi = className.newInstance();
- register(resourceResolverSpi, start);
-@@ -243,8 +253,11 @@
- * cannot be registered.
- * @param resourceResolverSpi
- * @param start
-+ * @throws SecurityException if a security manager is installed and the
-+ * caller does not have permission to register a resource resolver
- */
- public static void register(ResourceResolverSpi resourceResolverSpi, boolean start) {
-+ JavaUtils.checkRegisterPermission();
- synchronized(resolverList) {
- if (start) {
- resolverList.add(0, new ResourceResolver(resourceResolverSpi));
---- ./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-07-15 21:49:32.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_de.properties 2013-09-06 11:28:02.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties 2014-07-15 21:49:32.000000000 -0700
-@@ -140,7 +140,7 @@
- #WebRowSetXmlReader exception
- wrsxmlreader.invalidcp = Ende von RowSet wurde erreicht. Ung\u00FCltige Cursorposition
- wrsxmlreader.readxml = readXML: {0}
--wrsxmlreader.parseerr = ** Parsing-Fehler: {0}, Zeile: {1} , URI: {2}
-+wrsxmlreader.parseerr = ** Parsingfehler: {0}, Zeile: {1} , URI: {2}
-
- #WebRowSetXmlWriter exceptions
- wrsxmlwriter.ioex = IOException: {0}
---- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties 2013-09-06 11:28:02.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties 2014-07-15 21:49:32.000000000 -0700
-@@ -51,8 +51,8 @@
- cachedrowsetimpl.last = last: TYPE_FORWARD_ONLY
- cachedrowsetimpl.absolute = absolute: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u4F4D\u7F6E
- cachedrowsetimpl.relative = relative: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u4F4D\u7F6E
--cachedrowsetimpl.asciistream = ascii\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F
--cachedrowsetimpl.binstream = \u30D0\u30A4\u30CA\u30EA\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-+cachedrowsetimpl.asciistream = ascii\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-+cachedrowsetimpl.binstream = \u30D0\u30A4\u30CA\u30EA\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u8FBC\u307F\u304C\u5931\u6557\u3057\u307E\u3057\u305F
- cachedrowsetimpl.failedins = \u884C\u306E\u633F\u5165\u306B\u5931\u6557
- cachedrowsetimpl.updateins = \u633F\u5165\u884C\u306B\u304A\u3044\u3066updateRow\u304C\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F
- cachedrowsetimpl.movetoins = moveToInsertRow: CONCUR_READ_ONLY
-@@ -101,7 +101,7 @@
-
- #JdbcRowSetImpl exceptions
- jdbcrowsetimpl.invalstate = \u7121\u52B9\u306A\u72B6\u614B
--jdbcrowsetimpl.connect = JdbcRowSet(connect): JNDI\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093
-+jdbcrowsetimpl.connect = JdbcRowSet (connect): JNDI\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093
- jdbcrowsetimpl.paramtype = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093
- jdbcrowsetimpl.matchcols = \u4E00\u81F4\u5217\u304C\u5217\u306E\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093
- jdbcrowsetimpl.setmatchcols = \u4E00\u81F4\u5217\u3092\u53D6\u5F97\u3059\u308B\u524D\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
---- ./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-07-15 21:49:32.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.
- cachedrowsetimpl.timefail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getTime\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uBCC0\uD658\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
--cachedrowsetimpl.posupdate = \uC704\uCE58\uAC00 \uC9C0\uC815\uB41C \uAC31\uC2E0\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+cachedrowsetimpl.posupdate = \uC704\uCE58\uAC00 \uC9C0\uC815\uB41C \uC5C5\uB370\uC774\uD2B8\uAC00 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- cachedrowsetimpl.unableins = \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC74C: {0}
- cachedrowsetimpl.beforefirst = beforeFirst: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
- cachedrowsetimpl.first = \uCC98\uC74C: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-@@ -110,7 +110,7 @@
- jdbcrowsetimpl.unsetmatch = \uC124\uC815\uC744 \uD574\uC81C\uD558\uB824\uB294 \uC5F4\uC774 \uC124\uC815\uB41C \uC5F4\uACFC \uB2E4\uB985\uB2C8\uB2E4.
- jdbcrowsetimpl.usecolname = \uC5F4 \uC774\uB984\uC744 unsetMatchColumn\uC758 \uC778\uC218\uB85C \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
- jdbcrowsetimpl.usecolid = \uC5F4 ID\uB97C unsetMatchColumn\uC758 \uC778\uC218\uB85C \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
--jdbcrowsetimpl.resnotupd = ResultSet\uB97C \uAC31\uC2E0\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+jdbcrowsetimpl.resnotupd = ResultSet\uB97C \uC5C5\uB370\uC774\uD2B8\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- jdbcrowsetimpl.opnotysupp = \uC791\uC5C5\uC774 \uC544\uC9C1 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- jdbcrowsetimpl.featnotsupp = \uAE30\uB2A5\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-
-@@ -157,7 +157,7 @@
- xmlrch.errinsert = insert \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
- xmlrch.errinsdel = insdel \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
- xmlrch.errupdate = update \uD589\uC744 \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
--xmlrch.errupdrow = \uD589\uC744 \uAC31\uC2E0\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
-+xmlrch.errupdrow = \uD589\uC744 \uC5C5\uB370\uC774\uD2B8\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: {0}
- 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/RowSetResourceBundle_pt_BR.properties 2013-09-06 11:28:02.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties 2014-10-28 20:19:45.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
-@@ -153,7 +153,7 @@
- xmlrch.errmetadata = Erro ao definir metadados : {0}
- xmlrch.errinsertval = Erro ao inserir valores : {0}
- xmlrch.errconstr = Erro ao construir a linha : {0}
--xmlrch.errdel = Erro ao deletar a linha : {0}
-+xmlrch.errdel = Erro ao excluir a linha : {0}
- xmlrch.errinsert = Erro ao construir a linha de inser\u00E7\u00E3o : {0}
- xmlrch.errinsdel = Erro ao construir a linha insdel : {0}
- xmlrch.errupdate = Erro ao construir a linha de atualiza\u00E7\u00E3o : {0}
---- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties 2013-09-06 11:28:02.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties 2014-07-15 21:49:32.000000000 -0700
-@@ -29,11 +29,11 @@
- cachedrowsetimpl.nullhash = Kan inte instansiera CachedRowSetImpl. Null-hashtabell skickades till konstruktor
- cachedrowsetimpl.invalidop = En ogiltig \u00E5tg\u00E4rd utf\u00F6rdes p\u00E5 infogad rad
- cachedrowsetimpl.accfailed = acceptChanges utf\u00F6rdes inte
--cachedrowsetimpl.invalidcp = Mark\u00F6rpositionen \u00E4r ogiltig
-+cachedrowsetimpl.invalidcp = Ogiltigt mark\u00F6rl\u00E4ge
- cachedrowsetimpl.illegalop = En otill\u00E5ten \u00E5tg\u00E4rd utf\u00F6rdes p\u00E5 en icke infogad rad
- cachedrowsetimpl.clonefail = Kloningen utf\u00F6rdes inte: {0}
--cachedrowsetimpl.invalidcol = Kolumnindexet \u00E4r ogiltigt
--cachedrowsetimpl.invalcolnm = Kolumnnamnet \u00E4r ogiltigt
-+cachedrowsetimpl.invalidcol = Ogiltigt kolumnindex
-+cachedrowsetimpl.invalcolnm = Ogiltigt kolumnnamn
- cachedrowsetimpl.boolfail = getBoolen utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
- cachedrowsetimpl.bytefail = getByte utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
- cachedrowsetimpl.shortfail = getShort utf\u00F6rdes inte f\u00F6r v\u00E4rdet ({0}) i kolumnen {1}
-@@ -60,7 +60,7 @@
- cachedrowsetimpl.movetoins2 = moveToInsertRow: ogiltigt antal kolumner
- cachedrowsetimpl.tablename = Tabellnamnet kan inte vara null
- cachedrowsetimpl.keycols = Ogiltiga nyckelkolumner
--cachedrowsetimpl.invalidcol = Kolumnindexet \u00E4r ogiltigt
-+cachedrowsetimpl.invalidcol = Ogiltigt kolumnindex
- cachedrowsetimpl.opnotsupp = Databasen har inte st\u00F6d f\u00F6r denna \u00E5tg\u00E4rd
- cachedrowsetimpl.matchcols = Matchningskolumnerna \u00E4r inte samma som de som st\u00E4llts in
- cachedrowsetimpl.setmatchcols = St\u00E4ll in matchningskolumnerna innan du h\u00E4mtar dem
-@@ -81,7 +81,7 @@
-
- # WebRowSetImpl exceptions
- webrowsetimpl.nullhash = Kan inte instansiera WebRowSetImpl. Null-hashtabell skickades till konstruktor.
--webrowsetimpl.invalidwr = Ogiltig f\u00F6rfattare
-+webrowsetimpl.invalidwr = Ogiltig skrivfunktion
- webrowsetimpl.invalidrd = Ogiltig l\u00E4sare
-
- #FilteredRowSetImpl exceptions
---- ./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-07-15 21:49:32.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-07-15 21:49:32.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
-@@ -659,7 +659,7 @@
- //Added the handling for Class tags to take care of maps
- //Makes an entry into the map upon end of class tag
- try{
-- typeMap.put(Key_map,Class.forName(Value_map));
-+ typeMap.put(Key_map,sun.reflect.misc.ReflectUtil.forName(Value_map));
-
- }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 2014-07-15 21:49:32.000000000 -0700
-@@ -28,6 +28,7 @@
- import javax.script.*;
- import java.lang.reflect.*;
- import java.security.*;
-+import sun.reflect.misc.ReflectUtil;
-
- /*
- * java.lang.reflect.Proxy based interface implementor. This is meant
-@@ -85,8 +86,18 @@
- if (! isImplemented(thiz, iface)) {
- return null;
- }
-+
-+ if (System.getSecurityManager() != null &&
-+ !Modifier.isPublic(iface.getModifiers())) {
-+ throw new SecurityException("attempt to implement non-public interface");
-+ }
-+
-+ // make sure restricted package interfaces are not attempted.
-+ ReflectUtil.checkPackageAccess(iface.getName());
-+
- AccessControlContext accCtxt = AccessController.getContext();
-- return iface.cast(Proxy.newProxyInstance(iface.getClassLoader(),
-+ return iface.cast(Proxy.newProxyInstance(
-+ getLoaderForProxy(iface),
- new Class[]{iface},
- new InterfaceImplementorInvocationHandler(thiz, accCtxt)));
- }
-@@ -108,4 +119,20 @@
- // default is identity conversion
- return args;
- }
-+
-+ // get appropriate ClassLoader for generated Proxy class
-+ private static ClassLoader getLoaderForProxy(Class<?> iface) {
-+ ClassLoader loader = iface.getClassLoader();
-+
-+ // if bootstrap class, try TCCL
-+ if (loader == null) {
-+ loader = Thread.currentThread().getContextClassLoader();
-+ }
-+
-+ // if TCCL is also null, try System class loader
-+ if (loader == null) {
-+ loader = ClassLoader.getSystemClassLoader();
-+ }
-+ return loader;
-+ }
- }
---- ./jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java 2013-09-06 11:28:02.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java 2014-07-15 21:49:32.000000000 -0700
-@@ -875,8 +875,7 @@
- char[] tmpPassword = ((PasswordCallback)
- callbacks[0]).getPassword();
- if (tmpPassword == null) {
-- // treat a NULL password as an empty password
-- tmpPassword = new char[0];
-+ throw new LoginException("No password provided");
- }
- password = new char[tmpPassword.length];
- System.arraycopy(tmpPassword, 0,
---- ./jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java 2013-09-06 11:28:03.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java 2014-07-15 21:54:44.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 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
-@@ -32,6 +32,7 @@
- import java.security.NoSuchAlgorithmException;
- import java.security.MessageDigest;
-
-+import java.util.Arrays;
- import java.util.logging.Logger;
-
- /**
-@@ -159,7 +160,7 @@
- MessageDigest md5 = MessageDigest.getInstance("MD5");
-
- /* digest the key if longer than 64 bytes */
-- if (key.length > 64) {
-+ if (key.length > MD5_BLOCKSIZE) {
- key = md5.digest(key);
- }
-
-@@ -169,13 +170,9 @@
- int i;
-
- /* store key in pads */
-- for (i = 0; i < MD5_BLOCKSIZE; i++) {
-- for ( ; i < key.length; i++) {
-- ipad[i] = key[i];
-- opad[i] = key[i];
-- }
-- ipad[i] = 0x00;
-- opad[i] = 0x00;
-+ for (i = 0; i < key.length; i++) {
-+ ipad[i] = key[i];
-+ opad[i] = key[i];
- }
-
- /* XOR key with pads */
-@@ -207,6 +204,11 @@
- }
- }
-
-+ Arrays.fill(ipad, (byte)0);
-+ Arrays.fill(opad, (byte)0);
-+ ipad = null;
-+ opad = null;
-+
- return (digestString.toString());
- }
-
---- ./jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java 2013-09-06 11:28:03.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java 2014-07-15 21:49:32.000000000 -0700
-@@ -252,11 +252,12 @@
-
-
- /**
-- * Outputs a byte array and converts
-+ * Outputs a byte array. Can be null.
- */
- protected static final void traceOutput(String srcClass, String srcMethod,
- String traceTag, byte[] output) {
-- traceOutput(srcClass, srcMethod, traceTag, output, 0, output.length);
-+ traceOutput(srcClass, srcMethod, traceTag, output, 0,
-+ output == null ? 0 : output.length);
- }
-
- protected static final void traceOutput(String srcClass, String srcMethod,
-@@ -272,13 +273,20 @@
- lev = Level.FINEST;
- }
-
-- ByteArrayOutputStream out = new ByteArrayOutputStream(len);
-- new HexDumpEncoder().encodeBuffer(
-- new ByteArrayInputStream(output, offset, len), out);
-+ String content;
-+
-+ if (output != null) {
-+ ByteArrayOutputStream out = new ByteArrayOutputStream(len);
-+ new HexDumpEncoder().encodeBuffer(
-+ new ByteArrayInputStream(output, offset, len), out);
-+ content = out.toString();
-+ } else {
-+ content = "NULL";
-+ }
-
- // Message id supplied by caller as part of traceTag
- logger.logp(lev, srcClass, srcMethod, "{0} ( {1} ): {2}",
-- new Object[] {traceTag, new Integer(origlen), out.toString()});
-+ new Object[] {traceTag, new Integer(origlen), content});
- } catch (Exception e) {
- logger.logp(Level.WARNING, srcClass, srcMethod,
- "SASLIMPL09:Error generating trace output: {0}", e);
---- ./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-07-15 21:49:32.000000000 -0700
-@@ -46,7 +46,7 @@
- FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30(&O)
- FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
- FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
--FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0(&U)
-+FileChooser.updateButton.textAndMnemonic=\uC5C5\uB370\uC774\uD2B8(&U)
- FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0(&H)
- FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30(&O)
-
-@@ -66,7 +66,7 @@
- FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790 \uC911\uB2E8
- FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC800\uC7A5
- FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30
--FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uAC31\uC2E0
-+FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uC5C5\uB370\uC774\uD2B8
- FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0
- FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30
-
---- ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties 2013-09-06 11:28:03.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties 2014-07-15 21:49:32.000000000 -0700
-@@ -25,8 +25,8 @@
- FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
- FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
- FileChooser.upFolderAccessibleName=Monter
--FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
--FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
-+FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire de base
-+FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
- FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
- FileChooser.newFolderAccessibleName=Nouveau dossier
- FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
---- ./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-10-28 20:19:45.000000000 -0700
-@@ -20,9 +20,9 @@
-
- FileChooser.lookInLabel.textAndMnemonic=Leta &i:
- FileChooser.saveInLabel.textAndMnemonic=Spara i:
--FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
--FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
--FileChooser.filesOfTypeLabel.textAndMnemonic=Mapp&namn:
-+FileChooser.fileNameLabel.textAndMnemonic=&Fil:
-+FileChooser.folderNameLabel.textAndMnemonic=&Mapp:
-+FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typen:
- FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
- FileChooser.upFolderAccessibleName=Upp
- FileChooser.homeFolderToolTip.textAndMnemonic=Hem
---- ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties 2013-09-06 11:28:03.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties 2014-07-15 21:49:32.000000000 -0700
-@@ -25,8 +25,8 @@
- FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
- FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
- FileChooser.upFolderAccessibleName=Monter
--FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
--FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
-+FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire de base
-+FileChooser.homeFolderAccessibleName=R\u00E9pertoire de base
- FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
- FileChooser.newFolderAccessibleName=Nouveau dossier
- FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
---- ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties 2013-09-06 11:28:03.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties 2014-10-28 20:19:46.000000000 -0700
-@@ -22,7 +22,7 @@
- FileChooser.saveInLabel.textAndMnemonic=Spara i:
- FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
- FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
--FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typ:
-+FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typen:
- FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
- FileChooser.upFolderAccessibleName=Upp
- FileChooser.homeFolderToolTip.textAndMnemonic=Hem
---- ./jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java 2013-09-06 11:28:04.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java 2014-10-28 20:19:46.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2010, 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
-@@ -82,7 +82,7 @@
- {"Can only trace", "'methods'\u3001'method exit'\u307E\u305F\u306F'method exits'\u306E\u307F\u30C8\u30EC\u30FC\u30B9\u3067\u304D\u307E\u3059"},
- {"cannot redefine existing connection", "{0}\u306F\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u518D\u5B9A\u7FA9\u3067\u304D\u307E\u305B\u3093"},
- {"Cannot assign to a method invocation", "\u30E1\u30BD\u30C3\u30C9\u547C\u51FA\u3057\u306B\u5272\u5F53\u3066\u3067\u304D\u307E\u305B\u3093"},
-- {"Cannot specify command line with connector:", "\u30B3\u30CD\u30AF\u30BF\u3067\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093: {0}"},
-+ {"Cannot specify command line with connector:", "\u30B3\u30CD\u30AF\u30BF\u3067\u30B3\u30DE\u30F3\u30C9\u884C\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093: {0}"},
- {"Cannot specify target vm arguments with connector:", "\u30B3\u30CD\u30AF\u30BF\u3067\u30BF\u30FC\u30B2\u30C3\u30C8VM\u5F15\u6570\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093: {0}"},
- {"Class containing field must be specified.", "\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u542B\u3080\u30AF\u30E9\u30B9\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
- {"Class:", "\u30AF\u30E9\u30B9: {0}"},
---- ./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 2014-07-15 21:49:32.000000000 -0700
-@@ -84,7 +84,7 @@
- lastPackage = pkg;
- printClass(clazz);
- if (clazz.getId() != -1) {
-- out.print(" [" + clazz.getIdString() + "]");
-+ print(" [" + clazz.getIdString() + "]");
- }
- 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 2014-07-15 21:49:32.000000000 -0700
-@@ -112,12 +112,12 @@
- out.println("<h2>Instances</h2>");
-
- printAnchorStart();
-- out.print("instances/" + encodeForURL(clazz));
-+ print("instances/" + encodeForURL(clazz));
- out.print("\">");
- out.println("Exclude subclasses</a><br>");
-
- printAnchorStart();
-- out.print("allInstances/" + encodeForURL(clazz));
-+ print("allInstances/" + encodeForURL(clazz));
- out.print("\">");
- out.println("Include subclasses</a><br>");
-
-@@ -126,19 +126,19 @@
- out.println("<h2>New Instances</h2>");
-
- printAnchorStart();
-- out.print("newInstances/" + encodeForURL(clazz));
-+ print("newInstances/" + encodeForURL(clazz));
- out.print("\">");
- out.println("Exclude subclasses</a><br>");
-
- printAnchorStart();
-- out.print("allNewInstances/" + encodeForURL(clazz));
-+ print("allNewInstances/" + encodeForURL(clazz));
- out.print("\">");
- out.println("Include subclasses</a><br>");
- }
-
- out.println("<h2>References summary by Type</h2>");
- printAnchorStart();
-- out.print("refsByType/" + encodeForURL(clazz));
-+ print("refsByType/" + encodeForURL(clazz));
- out.print("\">");
- 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 2014-07-15 21:49:32.000000000 -0700
-@@ -41,21 +41,17 @@
-
-
- import java.net.Socket;
--import java.net.ServerSocket;
--import java.net.InetAddress;
-
- import java.io.InputStream;
- import java.io.BufferedInputStream;
- import java.io.IOException;
--import java.io.Writer;
- import java.io.BufferedWriter;
- import java.io.PrintWriter;
--import java.io.OutputStream;
- import java.io.OutputStreamWriter;
--import java.io.BufferedOutputStream;
-
- import com.sun.tools.hat.internal.model.Snapshot;
- import com.sun.tools.hat.internal.oql.OQLEngine;
-+import com.sun.tools.hat.internal.util.Misc;
-
- public class HttpReader implements Runnable {
-
-@@ -87,7 +83,7 @@
- outputError("Protocol error");
- }
- int data;
-- StringBuffer queryBuf = new StringBuffer();
-+ StringBuilder queryBuf = new StringBuilder();
- while ((data = in.read()) != -1 && data != ' ') {
- char ch = (char) data;
- queryBuf.append(ch);
-@@ -217,7 +213,7 @@
- private void outputError(String msg) {
- out.println();
- out.println("<html><body bgcolor=\"#ffffff\">");
-- out.println(msg);
-+ out.println(Misc.encodeHtml(msg));
- out.println("</body></html>");
- }
-
---- ./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 2014-07-15 21:49:32.000000000 -0700
-@@ -102,7 +102,7 @@
- int count = clazz.getInstancesCount(false);
- print("" + count);
- printAnchorStart();
-- out.print("instances/" + encodeForURL(classes[i]));
-+ print("instances/" + encodeForURL(classes[i]));
- out.print("\"> ");
- if (count == 1) {
- print("instance");
-@@ -121,7 +121,7 @@
- }
- print("(");
- printAnchorStart();
-- out.print("newInstances/" + encodeForURL(classes[i]));
-+ print("newInstances/" + encodeForURL(classes[i]));
- out.print("\">");
- 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 2014-07-15 21:49:32.000000000 -0700
-@@ -54,10 +54,7 @@
- out.print((char)ch);
- }
- } catch (Exception exp) {
-- out.println(exp.getMessage());
-- out.println("<pre>");
-- exp.printStackTrace(out);
-- out.println("</pre>");
-+ printException(exp);
- }
- }
- }
---- ./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 2014-07-15 21:49:32.000000000 -0700
-@@ -32,10 +32,7 @@
-
- package com.sun.tools.hat.internal.server;
-
--import com.sun.tools.hat.internal.model.*;
- import com.sun.tools.hat.internal.oql.*;
--import com.sun.tools.hat.internal.util.ArraySorter;
--import com.sun.tools.hat.internal.util.Comparer;
-
- /**
- * This handles Object Query Language (OQL) queries.
-@@ -68,7 +65,7 @@
- out.println("<p align='center'>");
- out.println("<textarea name='query' cols=80 rows=10>");
- if (oql != null) {
-- out.println(oql);
-+ println(oql);
- }
- out.println("</textarea>");
- out.println("</p>");
-@@ -91,10 +88,7 @@
- try {
- out.println(engine.toHtml(o));
- } catch (Exception e) {
-- out.println(e.getMessage());
-- out.println("<pre>");
-- e.printStackTrace(out);
-- out.println("</pre>");
-+ printException(e);
- }
- out.println("</td></tr>");
- return false;
-@@ -102,10 +96,7 @@
- });
- out.println("</table>");
- } catch (OQLException exp) {
-- out.println(exp.getMessage());
-- out.println("<pre>");
-- exp.printStackTrace(out);
-- out.println("</pre>");
-+ printException(exp);
- }
- }
-
---- ./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 2014-07-15 21:49:32.000000000 -0700
-@@ -36,6 +36,7 @@
-
- import com.sun.tools.hat.internal.model.*;
- import com.sun.tools.hat.internal.util.Misc;
-+import java.io.StringWriter;
-
- import java.net.URLEncoder;
- import java.io.UnsupportedEncodingException;
-@@ -96,7 +97,7 @@
- }
-
- protected void error(String msg) {
-- out.println(msg);
-+ println(msg);
- }
-
- protected void printAnchorStart() {
-@@ -160,7 +161,6 @@
- out.println("null");
- return;
- }
-- String name = clazz.getName();
- printAnchorStart();
- out.print("class/");
- print(encodeForURL(clazz));
-@@ -208,6 +208,15 @@
- }
- }
-
-+ protected void printException(Throwable t) {
-+ println(t.getMessage());
-+ out.println("<pre>");
-+ StringWriter sw = new StringWriter();
-+ t.printStackTrace(new PrintWriter(sw));
-+ print(sw.toString());
-+ out.println("</pre>");
-+ }
-+
- protected void printHex(long addr) {
- if (snapshot.getIdentifierSize() == 4) {
- out.print(Misc.toHex((int)addr));
-@@ -223,4 +232,8 @@
- protected void print(String str) {
- out.print(Misc.encodeHtml(str));
- }
-+
-+ protected void println(String str) {
-+ out.println(Misc.encodeHtml(str));
-+ }
- }
---- ./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 2014-07-15 21:49:32.000000000 -0700
-@@ -89,7 +89,7 @@
- out.println("<p align='center'>");
- printClass(clazz);
- if (clazz.getId() != -1) {
-- out.println("[" + clazz.getIdString() + "]");
-+ println("[" + clazz.getIdString() + "]");
- }
- out.println("</p>");
-
-@@ -125,9 +125,9 @@
- JavaClass clazz = classes[i];
- out.println("<tr><td>");
- out.print("<a href='/refsByType/");
-- out.print(clazz.getIdString());
-+ print(clazz.getIdString());
- out.print("'>");
-- out.print(clazz.getName());
-+ print(clazz.getName());
- out.println("</a>");
- out.println("</td><td>");
- out.println(map.get(clazz));
---- ./jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties 2013-09-06 11:28:05.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties 2014-10-28 20:19:46.000000000 -0700
-@@ -5,9 +5,9 @@
- raw.command.label = \u30B3\u30DE\u30F3\u30C9
- raw.address = raw\u30B3\u30DE\u30F3\u30C9\u5B9F\u884C\u5F8C\u306B\u63A5\u7D9A\u3092\u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u30A2\u30C9\u30EC\u30B9
- raw.address.label = \u30A2\u30C9\u30EC\u30B9
--raw.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
-+raw.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
- raw.quote.label = \u5F15\u7528\u7B26
--raw.description = \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
-+raw.description = \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30B3\u30DE\u30F3\u30C9\u884C\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
- sun.home = SDK\u306E\u30DB\u30FC\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u307E\u305F\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u8D77\u52D5\u306B\u4F7F\u7528\u3055\u308C\u308B\u5B9F\u884C\u74B0\u5883
- sun.home.label = \u30DB\u30FC\u30E0
- sun.options = \u8D77\u52D5\u3059\u308BVM\u306E\u30AA\u30D7\u30B7\u30E7\u30F3
-@@ -16,11 +16,11 @@
- sun.main.label = \u30E1\u30A4\u30F3
- sun.init_suspend = \u30E1\u30A4\u30F3\u306E\u5B9F\u884C\u524D\u306B\u3059\u3079\u3066\u306E\u30B9\u30EC\u30C3\u30C9\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3059\u3002
- sun.init_suspend.label = \u4E2D\u65AD
--sun.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
-+sun.quote = \u5358\u4E00\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570\u5185\u306B\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u7D50\u3073\u4ED8\u3051\u308B\u305F\u3081\u306B\u4F7F\u7528\u3055\u308C\u308B\u6587\u5B57
- sun.quote.label = \u5F15\u7528\u7B26
- sun.vm_exec = Java VM\u8D77\u52D5\u30C4\u30FC\u30EB\u540D
- sun.vm_exec.label = \u8D77\u52D5\u30C4\u30FC\u30EB
--sun.description = Sun\u306EJava VM\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
-+sun.description = Sun\u306EJava VM\u30B3\u30DE\u30F3\u30C9\u884C\u3092\u4F7F\u7528\u3057\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8D77\u52D5\u3057\u3001\u63A5\u7D9A\u3057\u307E\u3059
- generic_attaching.address = VM\u306B\u63A5\u7D9A\u3059\u308B\u30A2\u30C9\u30EC\u30B9
- generic_attaching.address.label = \u30A2\u30C9\u30EC\u30B9
- generic_attaching.timeout = \u63A5\u7D9A\u3092\u5F85\u3064\u9593\u306E\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
-@@ -47,6 +47,6 @@
- memory_listening.name = VM\u3078\u306E\u63A5\u7D9A\u3092\u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u305F\u3081\u306E\u5171\u6709\u30E1\u30E2\u30EA\u30FC\u9818\u57DF\u540D
- memory_listening.name.label = \u540D\u524D
- memory_listening.description = \u305D\u306E\u4ED6\u306EVM\u306B\u3088\u308A\u958B\u59CB\u3055\u308C\u308B\u5171\u6709\u30E1\u30E2\u30EA\u30FC\u63A5\u7D9A\u3092\u53D7\u3051\u5165\u308C\u307E\u3059
--process_attaching.description = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u306B\u30D7\u30ED\u30BB\u30B9ID(pid)\u3092\u4F7F\u7528\u3057\u3066\u63A5\u7D9A\u3057\u307E\u3059
-+process_attaching.description = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u306B\u30D7\u30ED\u30BB\u30B9ID (pid)\u3092\u4F7F\u7528\u3057\u3066\u63A5\u7D9A\u3057\u307E\u3059
- process_attaching.pid = pid
--process_attaching.pid.label = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9ID(pid)
-+process_attaching.pid.label = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9ID (pid)
---- ./jdk/src/share/classes/java/awt/AWTException.java 2013-09-06 11:28:05.000000000 -0700
-+++ ./jdk/src/share/classes/java/awt/AWTException.java 2014-07-15 21:49:32.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1995, 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,7 +26,7 @@
-
-
- /**
-- * Signals that an Absract Window Toolkit exception has occurred.
-+ * Signals that an Abstract Window Toolkit exception has occurred.
- *
- * @author Arthur van Hoff
- */
---- ./jdk/src/share/classes/java/awt/Component.java 2013-09-06 11:28:05.000000000 -0700
-+++ ./jdk/src/share/classes/java/awt/Component.java 2014-07-15 21:54:44.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1995, 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
-@@ -972,6 +972,10 @@
- public AccessControlContext getAccessControlContext(Component comp) {
- return comp.getAccessControlContext();
- }
-+
-+ public void revalidateSynchronously(Component comp) {
-+ comp.revalidateSynchronously();
-+ }
- });
- }
-
-@@ -2963,6 +2967,13 @@
- * @since 1.7
- */
- public void revalidate() {
-+ revalidateSynchronously();
-+ }
-+
-+ /**
-+ * Revalidates the component synchronously.
-+ */
-+ final void revalidateSynchronously() {
- synchronized (getTreeLock()) {
- invalidate();
-
-@@ -7911,7 +7922,7 @@
- res = toFocus.requestFocusInWindow(CausedFocusEvent.Cause.TRAVERSAL_BACKWARD);
- }
- }
-- if (!res) {
-+ if (clearOnFailure && !res) {
- if (focusLog.isLoggable(PlatformLogger.FINER)) {
- focusLog.finer("clear global focus owner");
- }
---- ./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-07-15 21:49:32.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/KeyboardFocusManager.java 2013-09-06 11:28:06.000000000 -0700
-+++ ./jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2014-07-15 21:54:44.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, 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
-@@ -248,15 +248,7 @@
- public static void setCurrentKeyboardFocusManager(
- KeyboardFocusManager newManager) throws SecurityException
- {
-- SecurityManager security = System.getSecurityManager();
-- if (security != null) {
-- if (replaceKeyboardFocusManagerPermission == null) {
-- replaceKeyboardFocusManagerPermission =
-- new AWTPermission("replaceKeyboardFocusManager");
-- }
-- security.
-- checkPermission(replaceKeyboardFocusManagerPermission);
-- }
-+ checkReplaceKFMPermission();
-
- KeyboardFocusManager oldManager = null;
-
-@@ -508,7 +500,7 @@
- */
- protected Component getGlobalFocusOwner() throws SecurityException {
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
- return focusOwner;
- }
- }
-@@ -543,7 +535,7 @@
-
- if (focusOwner == null || focusOwner.isFocusable()) {
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
-
- oldFocusOwner = getFocusOwner();
-
-@@ -595,7 +587,7 @@
- */
- public void clearGlobalFocusOwner() {
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
- }
- if (!GraphicsEnvironment.isHeadless()) {
- // Toolkit must be fully initialized, otherwise
-@@ -676,7 +668,7 @@
- throws SecurityException
- {
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
- return permanentFocusOwner;
- }
- }
-@@ -712,7 +704,7 @@
-
- if (permanentFocusOwner == null || permanentFocusOwner.isFocusable()) {
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
-
- oldPermanentFocusOwner = getPermanentFocusOwner();
-
-@@ -779,7 +771,7 @@
- */
- protected Window getGlobalFocusedWindow() throws SecurityException {
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
- return focusedWindow;
- }
- }
-@@ -811,7 +803,7 @@
-
- if (focusedWindow == null || focusedWindow.isFocusableWindow()) {
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
-
- oldFocusedWindow = getFocusedWindow();
-
-@@ -879,7 +871,7 @@
- */
- protected Window getGlobalActiveWindow() throws SecurityException {
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
- return activeWindow;
- }
- }
-@@ -909,7 +901,7 @@
- protected void setGlobalActiveWindow(Window activeWindow) {
- Window oldActiveWindow;
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
-
- oldActiveWindow = getActiveWindow();
- if (focusLog.isLoggable(PlatformLogger.FINER)) {
-@@ -1205,7 +1197,7 @@
- throws SecurityException
- {
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
- return currentFocusCycleRoot;
- }
- }
-@@ -1230,7 +1222,7 @@
- Container oldFocusCycleRoot;
-
- synchronized (KeyboardFocusManager.class) {
-- checkCurrentKFMSecurity();
-+ checkKFMSecurity();
-
- oldFocusCycleRoot = getCurrentFocusCycleRoot();
- currentFocusCycleRoot = newFocusCycleRoot;
-@@ -2368,7 +2360,8 @@
- focusLog.finest("Request {0}", String.valueOf(hwFocusRequest));
- }
- if (hwFocusRequest == null &&
-- heavyweight == nativeFocusOwner)
-+ heavyweight == nativeFocusOwner &&
-+ heavyweight.getContainingWindow() == nativeFocusedWindow)
- {
- if (descendant == currentFocusOwner) {
- // Redundant request.
-@@ -3050,13 +3043,36 @@
- }
- }
-
-- private void checkCurrentKFMSecurity() {
-- if (this != getCurrentKeyboardFocusManager()) {
-- if (focusLog.isLoggable(PlatformLogger.FINER)) {
-- focusLog.finer("This manager is " + this +
-- ", current is " + getCurrentKeyboardFocusManager());
-+ private static void checkReplaceKFMPermission()
-+ throws SecurityException
-+ {
-+ SecurityManager security = System.getSecurityManager();
-+ if (security != null) {
-+ if (replaceKeyboardFocusManagerPermission == null) {
-+ replaceKeyboardFocusManagerPermission =
-+ new AWTPermission("replaceKeyboardFocusManager");
- }
-- throw new SecurityException(notPrivileged);
-+ security.
-+ checkPermission(replaceKeyboardFocusManagerPermission);
-+ }
-+ }
-+
-+ // Checks if this KeyboardFocusManager instance is the current KFM,
-+ // or otherwise checks if the calling thread has "replaceKeyboardFocusManager"
-+ // permission. Here's the reasoning to do so:
-+ //
-+ // A system KFM instance (which is the current KFM by default) may have no
-+ // "replaceKFM" permission when a client code is on the call stack beneath,
-+ // but still it should be able to execute the methods protected by this check
-+ // due to the system KFM is trusted (and so it does like "privileged").
-+ //
-+ // If this KFM instance is not the current KFM but the client code has all
-+ // permissions we can't throw SecurityException because it would contradict
-+ // the security concepts. In this case the trusted client code is responsible
-+ // for calling the secured methods from KFM instance which is not current.
-+ private void checkKFMSecurity() {
-+ if (this != getCurrentKeyboardFocusManager()) {
-+ checkReplaceKFMPermission();
- }
- }
- }
---- ./jdk/src/share/classes/java/awt/Toolkit.java 2013-09-06 11:28:06.000000000 -0700
-+++ ./jdk/src/share/classes/java/awt/Toolkit.java 2014-07-15 21:49:32.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1995, 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
-@@ -56,6 +56,7 @@
- import sun.awt.NullComponentPeer;
- import sun.awt.PeerEvent;
- import sun.awt.SunToolkit;
-+import sun.awt.AWTAccessor;
- import sun.security.util.SecurityConstants;
-
- import sun.util.CoreResourceBundleControl;
-@@ -1607,6 +1608,12 @@
- * here, so that only one copy is maintained.
- */
- private static ResourceBundle resources;
-+ private static ResourceBundle platformResources;
-+
-+ // called by platform toolkit
-+ private static void setPlatformResources(ResourceBundle bundle) {
-+ platformResources = bundle;
-+ }
-
- /**
- * Initialize JNI field and method ids
-@@ -1650,6 +1657,13 @@
- }
-
- static {
-+ AWTAccessor.setToolkitAccessor(
-+ new AWTAccessor.ToolkitAccessor() {
-+ @Override
-+ public void setPlatformResources(ResourceBundle bundle) {
-+ Toolkit.setPlatformResources(bundle);
-+ }
-+ });
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
-@@ -1677,6 +1691,14 @@
- * This method returns defaultValue if the property is not found.
- */
- public static String getProperty(String key, String defaultValue) {
-+ // first try platform specific bundle
-+ if (platformResources != null) {
-+ try {
-+ return platformResources.getString(key);
-+ } catch (MissingResourceException e) {}
-+ }
-+
-+ // then shared one
- if (resources != null) {
- try {
- return resources.getString(key);
-@@ -2544,7 +2566,7 @@
- Runnable updater = new Runnable() {
- public void run() {
- PropertyChangeSupport pcs = (PropertyChangeSupport)
-- AppContext.getAppContext().get(PROP_CHANGE_SUPPORT_KEY);
-+ AppContext.getAppContext().get(PROP_CHANGE_SUPPORT_KEY);
- if (null != pcs) {
- pcs.firePropertyChange(evt);
- }
---- ./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 2014-07-15 21:49:32.000000000 -0700
-@@ -25,12 +25,14 @@
-
- package java.awt.datatransfer;
-
--import java.awt.Toolkit;
- import java.io.*;
- import java.nio.*;
- import java.util.*;
-
- import sun.awt.datatransfer.DataTransferer;
-+import sun.reflect.misc.ReflectUtil;
-+
-+import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION;
-
- /**
- * A {@code DataFlavor} provides meta information about data. {@code DataFlavor}
-@@ -117,27 +119,33 @@
- ClassLoader fallback)
- throws ClassNotFoundException
- {
-- ClassLoader systemClassLoader = (ClassLoader)
-- java.security.AccessController.doPrivileged(
-- new java.security.PrivilegedAction() {
-- public Object run() {
-- ClassLoader cl = Thread.currentThread().
-- getContextClassLoader();
-- return (cl != null)
-- ? cl
-- : ClassLoader.getSystemClassLoader();
-- }
-- });
--
-+ ReflectUtil.checkPackageAccess(className);
- try {
-- return Class.forName(className, true, systemClassLoader);
-- } catch (ClassNotFoundException e2) {
-- if (fallback != null) {
-- return Class.forName(className, true, fallback);
-- } else {
-- throw new ClassNotFoundException(className);
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ sm.checkPermission(GET_CLASSLOADER_PERMISSION);
-+ }
-+ ClassLoader loader = ClassLoader.getSystemClassLoader();
-+ try {
-+ // bootstrap class loader and system class loader if present
-+ return Class.forName(className, true, loader);
-+ }
-+ catch (ClassNotFoundException exception) {
-+ // thread context class loader if and only if present
-+ loader = Thread.currentThread().getContextClassLoader();
-+ if (loader != null) {
-+ try {
-+ return Class.forName(className, true, loader);
-+ }
-+ catch (ClassNotFoundException e) {
-+ // fallback to user's class loader
-+ }
-+ }
- }
-+ } catch (SecurityException exception) {
-+ // ignore secured class loaders
- }
-+ return Class.forName(className, true, fallback);
- }
-
- /*
---- ./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-07-15 21:49:32.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-07-15 21:49:32.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 2014-07-15 21:49:32.000000000 -0700
-@@ -42,6 +42,8 @@
- import java.io.ObjectStreamClass;
- import java.io.StreamCorruptedException;
-
-+import java.lang.reflect.Modifier;
-+
- import java.net.URL;
-
- import java.security.AccessController;
-@@ -222,6 +224,10 @@
- throw ex;
- }
-
-+ if (!Modifier.isPublic(cl.getModifiers())) {
-+ throw new ClassNotFoundException("" + cl + " : no public access");
-+ }
-+
- /*
- * 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 2014-07-15 21:49:32.000000000 -0700
-@@ -220,6 +220,9 @@
- // Write out the properties of this instance.
- private void initBean(Class type, Object oldInstance, Object newInstance, Encoder out) {
- for (Field field : type.getFields()) {
-+ if (!ReflectUtil.isPackageAccessible(field.getDeclaringClass())) {
-+ continue;
-+ }
- int mod = field.getModifiers();
- 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 2014-07-15 21:49:33.000000000 -0700
-@@ -42,6 +42,7 @@
- import java.lang.reflect.Constructor;
- import java.lang.reflect.Field;
- import java.lang.reflect.Method;
-+import java.lang.reflect.Modifier;
- import java.lang.reflect.InvocationTargetException;
-
- import java.security.AccessController;
-@@ -56,7 +57,7 @@
-
- import sun.swing.PrintColorUIResource;
-
--import java.util.Objects;
-+import static sun.reflect.misc.ReflectUtil.isPackageAccessible;
-
- /*
- * Like the <code>Intropector</code>, the <code>MetaData</code> class
-@@ -850,13 +851,15 @@
-
- static class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
- protected void installFields(Encoder out, Class<?> cls) {
-- Field fields[] = cls.getFields();
-- for(int i = 0; i < fields.length; i++) {
-- Field field = fields[i];
-- // Don't install primitives, their identity will not be preserved
-- // by wrapping.
-- if (Object.class.isAssignableFrom(field.getType())) {
-- out.writeExpression(new Expression(field, "get", new Object[]{null}));
-+ if (Modifier.isPublic(cls.getModifiers()) && isPackageAccessible(cls)) {
-+ Field fields[] = cls.getFields();
-+ for(int i = 0; i < fields.length; i++) {
-+ Field field = fields[i];
-+ // Don't install primitives, their identity will not be preserved
-+ // by wrapping.
-+ if (Object.class.isAssignableFrom(field.getType())) {
-+ out.writeExpression(new Expression(field, "get", new Object[]{null}));
-+ }
- }
- }
- }
---- ./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-07-15 21:49:33.000000000 -0700
-@@ -41,24 +41,20 @@
- */
- final class ThreadGroupContext {
-
-- private static final WeakIdentityMap<ThreadGroupContext> contexts = new WeakIdentityMap<>();
-+ private static final WeakIdentityMap<ThreadGroupContext> contexts = new WeakIdentityMap<ThreadGroupContext>() {
-+ protected ThreadGroupContext create(Object key) {
-+ return new ThreadGroupContext();
-+ }
-+ };
-
- /**
-- * Returns the appropriate {@code AppContext} for the caller,
-+ * Returns the appropriate {@code ThreadGroupContext} for the caller,
- * as determined by its {@code ThreadGroup}.
- *
- * @return the application-dependent context
- */
- static ThreadGroupContext getContext() {
-- ThreadGroup group = Thread.currentThread().getThreadGroup();
-- synchronized (contexts) {
-- ThreadGroupContext context = contexts.get(group);
-- if (context == null) {
-- context = new ThreadGroupContext();
-- contexts.put(group, context);
-- }
-- return context;
-- }
-+ return contexts.get(Thread.currentThread().getThreadGroup());
- }
-
- 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-07-15 21:49:33.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
- * in ordinary use. Both null values and the null key are supported.
-+ * This class does not require additional synchronization.
-+ * A thread-safety is provided by a fragile combination
-+ * of synchronized blocks and volatile fields.
-+ * Be very careful during editing!
- *
- * @see java.util.IdentityHashMap
- * @see java.util.WeakHashMap
- */
--final class WeakIdentityMap<T> {
-+abstract class WeakIdentityMap<T> {
-
- private static final int MAXIMUM_CAPACITY = 1 << 30; // it MUST be a power of two
- private static final Object NULL = new Object(); // special object for null key
-
- private final ReferenceQueue<Object> queue = new ReferenceQueue<Object>();
-
-- private Entry<T>[] table = newTable(1<<3); // table's length MUST be a power of two
-+ private volatile Entry<T>[] table = newTable(1<<3); // table's length MUST be a power of two
- private int threshold = 6; // the next size value at which to resize
- private int size = 0; // the number of key-value mappings
-
-@@ -54,78 +58,83 @@
- key = NULL;
- }
- int hash = key.hashCode();
-- int index = getIndex(this.table, hash);
-- for (Entry<T> entry = this.table[index]; entry != null; entry = entry.next) {
-+ Entry<T>[] table = this.table;
-+ // unsynchronized search improves performance
-+ // the null value does not mean that there are no needed entry
-+ int index = getIndex(table, hash);
-+ for (Entry<T> entry = table[index]; entry != null; entry = entry.next) {
- if (entry.isMatched(key, hash)) {
- return entry.value;
- }
- }
-- return null;
-- }
--
-- public T put(Object key, T value) {
-- removeStaleEntries();
-- if (key == null) {
-- key = NULL;
-- }
-- int hash = key.hashCode();
-- int index = getIndex(this.table, hash);
-- for (Entry<T> entry = this.table[index]; entry != null; entry = entry.next) {
-- if (entry.isMatched(key, hash)) {
-- T oldValue = entry.value;
-- entry.value = value;
-- return oldValue;
-- }
-- }
-- this.table[index] = new Entry<T>(key, hash, value, this.queue, this.table[index]);
-- if (++this.size >= this.threshold) {
-- if (this.table.length == MAXIMUM_CAPACITY) {
-- this.threshold = Integer.MAX_VALUE;
-+ synchronized (NULL) {
-+ // synchronized search improves stability
-+ // we must create and add new value if there are no needed entry
-+ index = getIndex(this.table, hash);
-+ for (Entry<T> entry = this.table[index]; entry != null; entry = entry.next) {
-+ if (entry.isMatched(key, hash)) {
-+ return entry.value;
-+ }
- }
-- else {
-- removeStaleEntries();
-- Entry<T>[] table = newTable(this.table.length * 2);
-- transfer(this.table, table);
--
-- // If ignoring null elements and processing ref queue caused massive
-- // shrinkage, then restore old table. This should be rare, but avoids
-- // unbounded expansion of garbage-filled tables.
-- if (this.size >= this.threshold / 2) {
-- this.table = table;
-- this.threshold *= 2;
-+ T value = create(key);
-+ this.table[index] = new Entry<T>(key, hash, value, this.queue, this.table[index]);
-+ if (++this.size >= this.threshold) {
-+ if (this.table.length == MAXIMUM_CAPACITY) {
-+ this.threshold = Integer.MAX_VALUE;
- }
- else {
-- transfer(table, this.table);
-+ removeStaleEntries();
-+ table = newTable(this.table.length * 2);
-+ transfer(this.table, table);
-+ // If ignoring null elements and processing ref queue caused massive
-+ // shrinkage, then restore old table. This should be rare, but avoids
-+ // unbounded expansion of garbage-filled tables.
-+ if (this.size >= this.threshold / 2) {
-+ this.table = table;
-+ this.threshold *= 2;
-+ }
-+ else {
-+ transfer(table, this.table);
-+ }
- }
- }
-+ return value;
- }
-- return null;
- }
-
-+ protected abstract T create(Object key);
-+
- private void removeStaleEntries() {
-- for (Object ref = this.queue.poll(); ref != null; ref = this.queue.poll()) {
-- @SuppressWarnings("unchecked")
-- Entry<T> entry = (Entry<T>) ref;
-- int index = getIndex(this.table, entry.hash);
--
-- Entry<T> prev = this.table[index];
-- Entry<T> current = prev;
-- while (current != null) {
-- Entry<T> next = current.next;
-- if (current == entry) {
-- if (prev == entry) {
-- this.table[index] = next;
-+ Object ref = this.queue.poll();
-+ if (ref != null) {
-+ synchronized (NULL) {
-+ do {
-+ @SuppressWarnings("unchecked")
-+ Entry<T> entry = (Entry<T>) ref;
-+ int index = getIndex(this.table, entry.hash);
-+
-+ Entry<T> prev = this.table[index];
-+ Entry<T> current = prev;
-+ while (current != null) {
-+ Entry<T> next = current.next;
-+ if (current == entry) {
-+ if (prev == entry) {
-+ this.table[index] = next;
-+ }
-+ else {
-+ prev.next = next;
-+ }
-+ entry.value = null; // Help GC
-+ entry.next = null; // Help GC
-+ this.size--;
-+ break;
-+ }
-+ prev = current;
-+ current = next;
- }
-- else {
-- prev.next = next;
-- }
-- entry.value = null; // Help GC
-- entry.next = null; // Help GC
-- this.size--;
-- break;
-+ ref = this.queue.poll();
- }
-- prev = current;
-- current = next;
-+ while (ref != null);
- }
- }
- }
-@@ -164,8 +173,8 @@
-
- private static class Entry<T> extends WeakReference<Object> {
- private final int hash;
-- private T value;
-- private Entry<T> next;
-+ private volatile T value;
-+ private volatile Entry<T> next;
-
- 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 2014-07-15 21:49:33.000000000 -0700
-@@ -1885,10 +1885,18 @@
- } else {
- n = Math.abs(n);
- }
-+
-+ // Use only the file name from the supplied prefix
-+ prefix = (new File(prefix)).getName();
-+
- String name = prefix + Long.toString(n) + suffix;
- File f = new File(dir, name);
-- if (!name.equals(f.getName()))
-- throw new IOException("Unable to create temporary file");
-+ if (!name.equals(f.getName())) {
-+ if (System.getSecurityManager() != null)
-+ throw new IOException("Unable to create temporary file");
-+ else
-+ throw new IOException("Unable to create temporary file, " + f);
-+ }
- return f;
- }
- }
---- ./jdk/src/share/classes/java/io/ObjectInputStream.java 2013-09-06 11:28:09.000000000 -0700
-+++ ./jdk/src/share/classes/java/io/ObjectInputStream.java 2014-07-15 21:49:33.000000000 -0700
-@@ -490,11 +490,12 @@
- public void defaultReadObject()
- throws IOException, ClassNotFoundException
- {
-- if (curContext == null) {
-+ SerialCallbackContext ctx = curContext;
-+ if (ctx == null) {
- throw new NotActiveException("not in call to readObject");
- }
-- Object curObj = curContext.getObj();
-- ObjectStreamClass curDesc = curContext.getDesc();
-+ Object curObj = ctx.getObj();
-+ ObjectStreamClass curDesc = ctx.getDesc();
- bin.setBlockDataMode(false);
- defaultReadFields(curObj, curDesc);
- bin.setBlockDataMode(true);
-@@ -528,11 +529,12 @@
- public ObjectInputStream.GetField readFields()
- throws IOException, ClassNotFoundException
- {
-- if (curContext == null) {
-+ SerialCallbackContext ctx = curContext;
-+ if (ctx == null) {
- throw new NotActiveException("not in call to readObject");
- }
-- Object curObj = curContext.getObj();
-- ObjectStreamClass curDesc = curContext.getDesc();
-+ Object curObj = ctx.getObj();
-+ ObjectStreamClass curDesc = ctx.getDesc();
- bin.setBlockDataMode(false);
- GetFieldImpl getField = new GetFieldImpl(curDesc);
- getField.readFields();
-@@ -1965,7 +1967,6 @@
- private void defaultReadFields(Object obj, ObjectStreamClass desc)
- throws IOException
- {
-- // REMIND: is isInstance check necessary?
- Class cl = desc.forClass();
- 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 2014-10-28 20:19:46.000000000 -0700
-@@ -430,11 +430,12 @@
- * <code>OutputStream</code>
- */
- public void defaultWriteObject() throws IOException {
-- if ( curContext == null ) {
-+ SerialCallbackContext ctx = curContext;
-+ if (ctx == null) {
- throw new NotActiveException("not in call to writeObject");
- }
-- Object curObj = curContext.getObj();
-- ObjectStreamClass curDesc = curContext.getDesc();
-+ Object curObj = ctx.getObj();
-+ ObjectStreamClass curDesc = ctx.getDesc();
- bout.setBlockDataMode(false);
- defaultWriteFields(curObj, curDesc);
- bout.setBlockDataMode(true);
-@@ -452,11 +453,12 @@
- */
- public ObjectOutputStream.PutField putFields() throws IOException {
- if (curPut == null) {
-- if (curContext == null) {
-+ SerialCallbackContext ctx = curContext;
-+ if (ctx == null) {
- throw new NotActiveException("not in call to writeObject");
- }
-- Object curObj = curContext.getObj();
-- ObjectStreamClass curDesc = curContext.getDesc();
-+ Object curObj = ctx.getObj();
-+ ObjectStreamClass curDesc = ctx.getDesc();
- curPut = new PutFieldImpl(curDesc);
- }
- return curPut;
-@@ -1252,7 +1254,7 @@
- }
-
- bout.setBlockDataMode(true);
-- if (isCustomSubclass()) {
-+ if (cl != null && isCustomSubclass()) {
- ReflectUtil.checkPackageAccess(cl);
- }
- annotateProxyClass(cl);
-@@ -1281,7 +1283,7 @@
-
- Class cl = desc.forClass();
- bout.setBlockDataMode(true);
-- if (isCustomSubclass()) {
-+ if (cl != null && isCustomSubclass()) {
- ReflectUtil.checkPackageAccess(cl);
- }
- annotateClass(cl);
-@@ -1516,7 +1518,11 @@
- private void defaultWriteFields(Object obj, ObjectStreamClass desc)
- throws IOException
- {
-- // REMIND: perform conservative isInstance check here?
-+ Class<?> cl = desc.forClass();
-+ if (cl != null && obj != null && !cl.isInstance(obj)) {
-+ throw new ClassCastException();
-+ }
-+
- desc.checkDefaultSerialize();
-
- int primDataSize = desc.getPrimDataSize();
---- ./jdk/src/share/classes/java/lang/AbstractStringBuilder.java 2013-09-06 11:28:09.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/AbstractStringBuilder.java 2014-07-15 21:49:33.000000000 -0700
-@@ -1273,7 +1273,7 @@
- * specified substring, starting at the specified index. The integer
- * returned is the smallest value <tt>k</tt> for which:
- * <blockquote><pre>
-- * k >= Math.min(fromIndex, str.length()) &&
-+ * k >= Math.min(fromIndex, this.length()) &&
- * this.toString().startsWith(str, k)
- * </pre></blockquote>
- * If no such value of <i>k</i> exists, then -1 is returned.
-@@ -1317,7 +1317,7 @@
- * specified substring. The integer returned is the largest value <i>k</i>
- * such that:
- * <blockquote><pre>
-- * k <= Math.min(fromIndex, str.length()) &&
-+ * k <= Math.min(fromIndex, this.length()) &&
- * this.toString().startsWith(str, k)
- * </pre></blockquote>
- * If no such value of <i>k</i> exists, then -1 is returned.
---- ./jdk/src/share/classes/java/lang/Class.java 2013-09-06 11:28:09.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/Class.java 2014-10-28 20:19:46.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1994, 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
-@@ -187,8 +187,8 @@
- @CallerSensitive
- public static Class<?> forName(String className)
- throws ClassNotFoundException {
-- return forName0(className, true,
-- ClassLoader.getClassLoader(Reflection.getCallerClass()));
-+ Class<?> caller = Reflection.getCallerClass();
-+ return forName0(className, true, ClassLoader.getClassLoader(caller), caller);
- }
-
-
-@@ -257,22 +257,27 @@
- ClassLoader loader)
- throws ClassNotFoundException
- {
-- if (loader == null) {
-- SecurityManager sm = System.getSecurityManager();
-- if (sm != null) {
-- ClassLoader ccl = ClassLoader.getClassLoader(Reflection.getCallerClass());
-+ Class<?> caller = null;
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ // Reflective call to get caller class is only needed if a security manager
-+ // is present. Avoid the overhead of making this call otherwise.
-+ caller = Reflection.getCallerClass();
-+ if (loader == null) {
-+ ClassLoader ccl = ClassLoader.getClassLoader(caller);
- if (ccl != null) {
- sm.checkPermission(
- SecurityConstants.GET_CLASSLOADER_PERMISSION);
- }
- }
- }
-- return forName0(name, initialize, loader);
-+ return forName0(name, initialize, loader, caller);
- }
-
-- /** Called after security checks have been made. */
-+ /** Called after security check for system loader access checks have been made. */
- private static native Class<?> forName0(String name, boolean initialize,
-- ClassLoader loader)
-+ ClassLoader loader,
-+ Class<?> caller)
- throws ClassNotFoundException;
-
- /**
-@@ -1096,7 +1101,17 @@
- * @return the declaring class for this class
- * @since JDK1.1
- */
-- public native Class<?> getDeclaringClass();
-+ @CallerSensitive
-+ public Class<?> getDeclaringClass() {
-+ final Class<?> candidate = getDeclaringClass0();
-+
-+ if (candidate != null)
-+ candidate.checkPackageAccess(
-+ ClassLoader.getClassLoader(Reflection.getCallerClass()), true);
-+ return candidate;
-+ }
-+
-+ private native Class<?> getDeclaringClass0();
-
-
- /**
-@@ -2197,14 +2212,53 @@
- */
- static native Class getPrimitiveClass(String name);
-
-- private static boolean isCheckMemberAccessOverridden(SecurityManager smgr) {
-- if (smgr.getClass() == SecurityManager.class) return false;
-+ private static class SecurityManagerHelper {
-+ final SecurityManager sm;
-+ final boolean overrideCheckMemberAccess;
-+ SecurityManagerHelper(SecurityManager sm) {
-+ this.sm = sm;
-+
-+ boolean overridden = false;
-+ if (sm.getClass() != SecurityManager.class) {
-+ try {
-+ overridden = getCheckMemberAccessMethod(sm.getClass()).
-+ getDeclaringClass() != SecurityManager.class;
-+ } catch (NoSuchMethodError e) {
-+ // fall back to invoke sm.checkMemberAccess for the member access check
-+ }
-+ }
-+ this.overrideCheckMemberAccess = overridden;
-+ }
-
-- Class<?>[] paramTypes = new Class<?>[] {Class.class, int.class};
-- return smgr.getClass().getMethod0("checkMemberAccess", paramTypes).
-- getDeclaringClass() != SecurityManager.class;
- }
-
-+ private static volatile SecurityManagerHelper smHelper;
-+ private static boolean isCheckMemberAccessOverridden(SecurityManager sm) {
-+ if (sm.getClass() == SecurityManager.class) return false;
-+
-+ SecurityManagerHelper helper = smHelper;
-+ if (helper == null || helper.sm != sm) {
-+ helper = new SecurityManagerHelper(sm);
-+ smHelper = helper;
-+ }
-+ return helper.overrideCheckMemberAccess;
-+ }
-+
-+ /**
-+ * Finds the checkMemberAccess method of the given SecurityManager class.
-+ *
-+ * This method calls JNI_GetMethodID to look up the checkMemberAccess method
-+ * instead of Class.getMethod0 that may cause loading of classes referenced
-+ * by the SecurityManager subclass and cause ClassCircularityError.
-+ *
-+ * JNI_GetMethodID may throw NoSuchMethodError if the given class
-+ * has a static checkMemberAccess method.
-+ *
-+ * @throws NoSuchMethodError if the method cannot be found.
-+ */
-+ private static native Method getCheckMemberAccessMethod(Class<? extends SecurityManager> c)
-+ throws NoSuchMethodError;
-+
-
- /*
- * Check if client is allowed to access members. If access is denied,
-@@ -2289,44 +2343,110 @@
- }
-
- /**
-+ * Atomic operations support.
-+ */
-+ private static class Atomic {
-+ // initialize Unsafe machinery here, since we need to call Class.class instance method
-+ // and have to avoid calling it in the static initializer of the Class class...
-+ private static final Unsafe unsafe = Unsafe.getUnsafe();
-+ // offset of Class.reflectionData instance field
-+ private static final long reflectionDataOffset;
-+ // offset of Class.annotationType instance field
-+ private static final long annotationTypeOffset;
-+
-+ static {
-+ Field[] fields = Class.class.getDeclaredFields0(false); // bypass caches
-+ reflectionDataOffset = objectFieldOffset(fields, "reflectionData");
-+ annotationTypeOffset = objectFieldOffset(fields, "annotationType");
-+ }
-+
-+ private static long objectFieldOffset(Field[] fields, String fieldName) {
-+ Field field = searchFields(fields, fieldName);
-+ if (field == null) {
-+ throw new Error("No " + fieldName + " field found in java.lang.Class");
-+ }
-+ return unsafe.objectFieldOffset(field);
-+ }
-+
-+ static <T> boolean casReflectionData(Class<?> clazz,
-+ SoftReference<ReflectionData<T>> oldData,
-+ SoftReference<ReflectionData<T>> newData) {
-+ return unsafe.compareAndSwapObject(clazz, reflectionDataOffset, oldData, newData);
-+ }
-+
-+ static <T> boolean casAnnotationType(Class<?> clazz,
-+ AnnotationType oldType,
-+ AnnotationType newType) {
-+ return unsafe.compareAndSwapObject(clazz, annotationTypeOffset, oldType, newType);
-+ }
-+ }
-+
-+ /**
- * Reflection support.
- */
-
- // Caches for certain reflective results
- private static boolean useCaches = true;
-- private volatile transient SoftReference<Field[]> declaredFields;
-- private volatile transient SoftReference<Field[]> publicFields;
-- private volatile transient SoftReference<Method[]> declaredMethods;
-- private volatile transient SoftReference<Method[]> publicMethods;
-- private volatile transient SoftReference<Constructor<T>[]> declaredConstructors;
-- private volatile transient SoftReference<Constructor<T>[]> publicConstructors;
-- // Intermediate results for getFields and getMethods
-- private volatile transient SoftReference<Field[]> declaredPublicFields;
-- private volatile transient SoftReference<Method[]> declaredPublicMethods;
-+
-+ // reflection data that might get invalidated when JVM TI RedefineClasses() is called
-+ static class ReflectionData<T> {
-+ volatile Field[] declaredFields;
-+ volatile Field[] publicFields;
-+ volatile Method[] declaredMethods;
-+ volatile Method[] publicMethods;
-+ volatile Constructor<T>[] declaredConstructors;
-+ volatile Constructor<T>[] publicConstructors;
-+ // Intermediate results for getFields and getMethods
-+ volatile Field[] declaredPublicFields;
-+ volatile Method[] declaredPublicMethods;
-+ // Value of classRedefinedCount when we created this ReflectionData instance
-+ final int redefinedCount;
-+
-+ ReflectionData(int redefinedCount) {
-+ this.redefinedCount = redefinedCount;
-+ }
-+ }
-+
-+ private volatile transient SoftReference<ReflectionData<T>> reflectionData;
-
- // Incremented by the VM on each call to JVM TI RedefineClasses()
- // that redefines this class or a superclass.
- private volatile transient int classRedefinedCount = 0;
-
-- // Value of classRedefinedCount when we last cleared the cached values
-- // that are sensitive to class redefinition.
-- private volatile transient int lastRedefinedCount = 0;
--
-- // Clears cached values that might possibly have been obsoleted by
-- // a class redefinition.
-- private void clearCachesOnClassRedefinition() {
-- if (lastRedefinedCount != classRedefinedCount) {
-- declaredFields = publicFields = declaredPublicFields = null;
-- declaredMethods = publicMethods = declaredPublicMethods = null;
-- declaredConstructors = publicConstructors = null;
-- annotations = declaredAnnotations = null;
--
-- // Use of "volatile" (and synchronization by caller in the case
-- // of annotations) ensures that no thread sees the update to
-- // lastRedefinedCount before seeing the caches cleared.
-- // We do not guard against brief windows during which multiple
-- // threads might redundantly work to fill an empty cache.
-- lastRedefinedCount = classRedefinedCount;
-+ // Lazily create and cache ReflectionData
-+ private ReflectionData<T> reflectionData() {
-+ SoftReference<ReflectionData<T>> reflectionData = this.reflectionData;
-+ int classRedefinedCount = this.classRedefinedCount;
-+ ReflectionData<T> rd;
-+ if (useCaches &&
-+ reflectionData != null &&
-+ (rd = reflectionData.get()) != null &&
-+ rd.redefinedCount == classRedefinedCount) {
-+ return rd;
-+ }
-+ // else no SoftReference or cleared SoftReference or stale ReflectionData
-+ // -> create and replace new instance
-+ return newReflectionData(reflectionData, classRedefinedCount);
-+ }
-+
-+ private ReflectionData<T> newReflectionData(SoftReference<ReflectionData<T>> oldReflectionData,
-+ int classRedefinedCount) {
-+ if (!useCaches) return null;
-+
-+ while (true) {
-+ ReflectionData<T> rd = new ReflectionData<>(classRedefinedCount);
-+ // try to CAS it...
-+ if (Atomic.casReflectionData(this, oldReflectionData, new SoftReference<>(rd))) {
-+ return rd;
-+ }
-+ // else retry
-+ oldReflectionData = this.reflectionData;
-+ classRedefinedCount = this.classRedefinedCount;
-+ if (oldReflectionData != null &&
-+ (rd = oldReflectionData.get()) != null &&
-+ rd.redefinedCount == classRedefinedCount) {
-+ return rd;
-+ }
- }
- }
-
-@@ -2354,7 +2474,7 @@
- }
-
- // Annotations handling
-- private native byte[] getRawAnnotations();
-+ native byte[] getRawAnnotations();
-
- native ConstantPool getConstantPool();
-
-@@ -2369,27 +2489,19 @@
- // via ReflectionFactory.copyField.
- private Field[] privateGetDeclaredFields(boolean publicOnly) {
- checkInitted();
-- Field[] res = null;
-- if (useCaches) {
-- clearCachesOnClassRedefinition();
-- if (publicOnly) {
-- if (declaredPublicFields != null) {
-- res = declaredPublicFields.get();
-- }
-- } else {
-- if (declaredFields != null) {
-- res = declaredFields.get();
-- }
-- }
-+ Field[] res;
-+ ReflectionData<T> rd = reflectionData();
-+ if (rd != null) {
-+ res = publicOnly ? rd.declaredPublicFields : rd.declaredFields;
- if (res != null) return res;
- }
- // No cached value available; request value from VM
- res = Reflection.filterFields(this, getDeclaredFields0(publicOnly));
-- if (useCaches) {
-+ if (rd != null) {
- if (publicOnly) {
-- declaredPublicFields = new SoftReference<>(res);
-+ rd.declaredPublicFields = res;
- } else {
-- declaredFields = new SoftReference<>(res);
-+ rd.declaredFields = res;
- }
- }
- return res;
-@@ -2400,12 +2512,10 @@
- // via ReflectionFactory.copyField.
- private Field[] privateGetPublicFields(Set<Class<?>> traversedInterfaces) {
- checkInitted();
-- Field[] res = null;
-- if (useCaches) {
-- clearCachesOnClassRedefinition();
-- if (publicFields != null) {
-- res = publicFields.get();
-- }
-+ Field[] res;
-+ ReflectionData<T> rd = reflectionData();
-+ if (rd != null) {
-+ res = rd.publicFields;
- if (res != null) return res;
- }
-
-@@ -2438,8 +2548,8 @@
-
- res = new Field[fields.size()];
- fields.toArray(res);
-- if (useCaches) {
-- publicFields = new SoftReference<>(res);
-+ if (rd != null) {
-+ rd.publicFields = res;
- }
- return res;
- }
-@@ -2462,18 +2572,10 @@
- // instead be copied via ReflectionFactory.copyConstructor.
- private Constructor<T>[] privateGetDeclaredConstructors(boolean publicOnly) {
- checkInitted();
-- Constructor<T>[] res = null;
-- if (useCaches) {
-- clearCachesOnClassRedefinition();
-- if (publicOnly) {
-- if (publicConstructors != null) {
-- res = publicConstructors.get();
-- }
-- } else {
-- if (declaredConstructors != null) {
-- res = declaredConstructors.get();
-- }
-- }
-+ Constructor<T>[] res;
-+ ReflectionData<T> rd = reflectionData();
-+ if (rd != null) {
-+ res = publicOnly ? rd.publicConstructors : rd.declaredConstructors;
- if (res != null) return res;
- }
- // No cached value available; request value from VM
-@@ -2482,11 +2584,11 @@
- } else {
- res = getDeclaredConstructors0(publicOnly);
- }
-- if (useCaches) {
-+ if (rd != null) {
- if (publicOnly) {
-- publicConstructors = new SoftReference<>(res);
-+ rd.publicConstructors = res;
- } else {
-- declaredConstructors = new SoftReference<>(res);
-+ rd.declaredConstructors = res;
- }
- }
- return res;
-@@ -2503,27 +2605,19 @@
- // via ReflectionFactory.copyMethod.
- private Method[] privateGetDeclaredMethods(boolean publicOnly) {
- checkInitted();
-- Method[] res = null;
-- if (useCaches) {
-- clearCachesOnClassRedefinition();
-- if (publicOnly) {
-- if (declaredPublicMethods != null) {
-- res = declaredPublicMethods.get();
-- }
-- } else {
-- if (declaredMethods != null) {
-- res = declaredMethods.get();
-- }
-- }
-+ Method[] res;
-+ ReflectionData<T> rd = reflectionData();
-+ if (rd != null) {
-+ res = publicOnly ? rd.declaredPublicMethods : rd.declaredMethods;
- if (res != null) return res;
- }
- // No cached value available; request value from VM
- res = Reflection.filterMethods(this, getDeclaredMethods0(publicOnly));
-- if (useCaches) {
-+ if (rd != null) {
- if (publicOnly) {
-- declaredPublicMethods = new SoftReference<>(res);
-+ rd.declaredPublicMethods = res;
- } else {
-- declaredMethods = new SoftReference<>(res);
-+ rd.declaredMethods = res;
- }
- }
- return res;
-@@ -2625,12 +2719,10 @@
- // via ReflectionFactory.copyMethod.
- private Method[] privateGetPublicMethods() {
- checkInitted();
-- Method[] res = null;
-- if (useCaches) {
-- clearCachesOnClassRedefinition();
-- if (publicMethods != null) {
-- res = publicMethods.get();
-- }
-+ Method[] res;
-+ ReflectionData<T> rd = reflectionData();
-+ if (rd != null) {
-+ res = rd.publicMethods;
- if (res != null) return res;
- }
-
-@@ -2678,8 +2770,8 @@
- methods.addAllIfNotPresent(inheritedMethods);
- methods.compactAndTrim();
- res = methods.getArray();
-- if (useCaches) {
-- publicMethods = new SoftReference<>(res);
-+ if (rd != null) {
-+ rd.publicMethods = res;
- }
- return res;
- }
-@@ -2689,7 +2781,7 @@
- // Helpers for fetchers of one field, method, or constructor
- //
-
-- private Field searchFields(Field[] fields, String name) {
-+ private static Field searchFields(Field[] fields, String name) {
- String internedName = name.intern();
- for (int i = 0; i < fields.length; i++) {
- if (fields[i].getName() == internedName) {
-@@ -2707,7 +2799,7 @@
- // of Field objects which have to be created for the common
- // case where the field being requested is declared in the
- // class which is being queried.
-- Field res = null;
-+ Field res;
- // Search declared public fields
- if ((res = searchFields(privateGetDeclaredFields(true), name)) != null) {
- return res;
-@@ -2759,7 +2851,7 @@
- // number of Method objects which have to be created for the
- // common case where the method being requested is declared in
- // the class which is being queried.
-- Method res = null;
-+ Method res;
- // Search declared public methods
- if ((res = searchMethods(privateGetDeclaredMethods(true),
- name,
-@@ -3160,9 +3252,20 @@
- // Annotations cache
- private transient Map<Class<? extends Annotation>, Annotation> annotations;
- private transient Map<Class<? extends Annotation>, Annotation> declaredAnnotations;
-+ // Value of classRedefinedCount when we last cleared the cached annotations and declaredAnnotations fields
-+ private transient int lastAnnotationsRedefinedCount = 0;
-+
-+ // Clears cached values that might possibly have been obsoleted by
-+ // a class redefinition.
-+ private void clearAnnotationCachesOnClassRedefinition() {
-+ if (lastAnnotationsRedefinedCount != classRedefinedCount) {
-+ annotations = declaredAnnotations = null;
-+ lastAnnotationsRedefinedCount = classRedefinedCount;
-+ }
-+ }
-
- private synchronized void initAnnotationsIfNecessary() {
-- clearCachesOnClassRedefinition();
-+ clearAnnotationCachesOnClassRedefinition();
- if (annotations != null)
- return;
- declaredAnnotations = AnnotationParser.parseAnnotations(
-@@ -3184,10 +3287,11 @@
-
- // Annotation types cache their internal (AnnotationType) form
-
-- private AnnotationType annotationType;
-+ @SuppressWarnings("UnusedDeclaration")
-+ private volatile transient AnnotationType annotationType;
-
-- void setAnnotationType(AnnotationType type) {
-- annotationType = type;
-+ boolean casAnnotationType(AnnotationType oldType, AnnotationType newType) {
-+ return Atomic.casAnnotationType(this, oldType, newType);
- }
-
- AnnotationType getAnnotationType() {
---- ./jdk/src/share/classes/java/lang/ClassLoader.java 2013-09-06 11:28:09.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/ClassLoader.java 2014-07-15 21:49:33.000000000 -0700
-@@ -58,6 +58,7 @@
- import sun.misc.VM;
- import sun.reflect.CallerSensitive;
- import sun.reflect.Reflection;
-+import sun.reflect.misc.ReflectUtil;
- import sun.security.util.SecurityConstants;
-
- /**
-@@ -487,6 +488,13 @@
- private void checkPackageAccess(Class cls, ProtectionDomain pd) {
- final SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
-+ if (ReflectUtil.isNonPublicProxyClass(cls)) {
-+ for (Class intf: cls.getInterfaces()) {
-+ checkPackageAccess(intf, pd);
-+ }
-+ return;
-+ }
-+
- final String name = cls.getName();
- final int i = name.lastIndexOf('.');
- if (i != -1) {
---- ./jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java 2013-09-06 11:28:09.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java 2014-07-15 21:49:33.000000000 -0700
-@@ -74,7 +74,6 @@
- new Entry(0x00CC, new char[]{0x0069, 0x0307, 0x0300}, new char[]{0x00CC}, "lt", 0), // # LATIN CAPITAL LETTER I WITH GRAVE
- new Entry(0x00CD, new char[]{0x0069, 0x0307, 0x0301}, new char[]{0x00CD}, "lt", 0), // # LATIN CAPITAL LETTER I WITH ACUTE
- new Entry(0x0128, new char[]{0x0069, 0x0307, 0x0303}, new char[]{0x0128}, "lt", 0), // # LATIN CAPITAL LETTER I WITH TILDE
-- new Entry(0x0130, new char[]{0x0069, 0x0307}, new char[]{0x0130}, "lt", 0), // # LATIN CAPITAL LETTER I WITH DOT ABOVE
-
- //# ================================================================================
- //# Turkish and Azeri
-@@ -85,10 +84,7 @@
- new Entry(0x0049, new char[]{0x0131}, new char[]{0x0049}, "tr", NOT_BEFORE_DOT), // # LATIN CAPITAL LETTER I
- new Entry(0x0049, new char[]{0x0131}, new char[]{0x0049}, "az", NOT_BEFORE_DOT), // # LATIN CAPITAL LETTER I
- new Entry(0x0069, new char[]{0x0069}, new char[]{0x0130}, "tr", 0), // # LATIN SMALL LETTER I
-- new Entry(0x0069, new char[]{0x0069}, new char[]{0x0130}, "az", 0), // # LATIN SMALL LETTER I
-- //# ================================================================================
-- //# Other
-- new Entry(0x0130, new char[]{0x0069, 0x0307}, new char[]{0x0130}, "en", 0), // # LATIN CAPITALLETTER I WITH DOT ABOVE
-+ new Entry(0x0069, new char[]{0x0069}, new char[]{0x0130}, "az", 0) // # LATIN SMALL LETTER I
- };
-
- // A hash table that contains the above entries
---- ./jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-07-15 21:54:44.000000000 -0700
-@@ -1018,6 +1018,12 @@
-
- String dir = directory == null ? null : directory.toString();
-
-+ for (int i = 1; i < cmdarray.length; i++) {
-+ if (cmdarray[i].indexOf('\u0000') >= 0) {
-+ throw new IOException("invalid null character in command");
-+ }
-+ }
-+
- try {
- return ProcessImpl.start(cmdarray,
- environment,
---- ./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-07-15 21:49:33.000000000 -0700
-@@ -1131,12 +1131,8 @@
- * @see #checkPermission(java.security.Permission) checkPermission
- */
- public void checkListen(int port) {
-- if (port == 0) {
-- checkPermission(SecurityConstants.LOCAL_LISTEN_PERMISSION);
-- } else {
-- checkPermission(new SocketPermission("localhost:"+port,
-- SecurityConstants.SOCKET_LISTEN_ACTION));
-- }
-+ checkPermission(new SocketPermission("localhost:"+port,
-+ SecurityConstants.SOCKET_LISTEN_ACTION));
- }
-
- /**
---- ./jdk/src/share/classes/java/lang/String.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/String.java 2014-07-15 21:49:33.000000000 -0700
-@@ -2461,21 +2461,14 @@
- }
- if (localeDependent || srcChar == '\u03A3') { // GREEK CAPITAL LETTER SIGMA
- lowerChar = ConditionalSpecialCasing.toLowerCaseEx(this, i, locale);
-- } else if (srcChar == '\u0130') { // LATIN CAPITAL LETTER I DOT
-- lowerChar = Character.ERROR;
- } else {
- lowerChar = Character.toLowerCase(srcChar);
- }
- if ((lowerChar == Character.ERROR)
- || (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
- if (lowerChar == Character.ERROR) {
-- if (!localeDependent && srcChar == '\u0130') {
-- lowerCharArray =
-- ConditionalSpecialCasing.toLowerCaseCharArray(this, i, Locale.ENGLISH);
-- } else {
-- lowerCharArray =
-- ConditionalSpecialCasing.toLowerCaseCharArray(this, i, locale);
-- }
-+ lowerCharArray =
-+ ConditionalSpecialCasing.toLowerCaseCharArray(this, i, locale);
- } else if (srcCount == 2) {
- resultOffset += Character.toChars(lowerChar, result, i + resultOffset) - srcCount;
- continue;
---- ./jdk/src/share/classes/java/lang/System.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/System.java 2014-10-28 20:19:46.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1994, 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 java.lang;
-
- import java.io.*;
-+import java.security.AccessControlContext;
- import java.util.Properties;
- import java.util.PropertyPermission;
- import java.util.StringTokenizer;
-@@ -1177,12 +1178,15 @@
- public sun.reflect.ConstantPool getConstantPool(Class klass) {
- return klass.getConstantPool();
- }
-- public void setAnnotationType(Class klass, AnnotationType type) {
-- klass.setAnnotationType(type);
-+ public boolean casAnnotationType(Class<?> klass, AnnotationType oldType, AnnotationType newType) {
-+ return klass.casAnnotationType(oldType, newType);
- }
- public AnnotationType getAnnotationType(Class klass) {
- return klass.getAnnotationType();
- }
-+ public byte[] getRawClassAnnotations(Class<?> klass) {
-+ return klass.getRawAnnotations();
-+ }
- public <E extends Enum<E>>
- E[] getEnumConstantsShared(Class<E> klass) {
- return klass.getEnumConstantsShared();
-@@ -1202,6 +1206,12 @@
- public int getStringHash32(String string) {
- return string.hash32();
- }
-+ public Thread newThreadWithAcc(Runnable target, AccessControlContext acc) {
-+ return new Thread(target, acc);
-+ }
-+ public void invokeFinalize(Object o) throws Throwable {
-+ o.finalize();
-+ }
- });
- }
- }
---- ./jdk/src/share/classes/java/lang/Thread.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/Thread.java 2014-07-15 21:49:33.000000000 -0700
-@@ -341,6 +341,15 @@
- }
-
- /**
-+ * Initializes a Thread with the current AccessControlContext.
-+ * @see #init(ThreadGroup,Runnable,String,long,AccessControlContext)
-+ */
-+ private void init(ThreadGroup g, Runnable target, String name,
-+ long stackSize) {
-+ init(g, target, name, stackSize, null);
-+ }
-+
-+ /**
- * Initializes a Thread.
- *
- * @param g the Thread group
-@@ -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.
-+ * @param acc the AccessControlContext to inherit, or
-+ * AccessController.getContext() if null
- */
- private void init(ThreadGroup g, Runnable target, String name,
-- long stackSize) {
-+ long stackSize, AccessControlContext acc) {
- if (name == null) {
- throw new NullPointerException("name cannot be null");
- }
-
-+ 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;
-- this.inheritedAccessControlContext = AccessController.getContext();
-+ this.inheritedAccessControlContext =
-+ acc != null ? acc : AccessController.getContext();
- this.target = target;
- setPriority(priority);
- if (parent.inheritableThreadLocals != null)
-@@ -449,6 +462,14 @@
- }
-
- /**
-+ * Creates a new Thread that inherits the given AccessControlContext.
-+ * This is not a public constructor.
-+ */
-+ Thread(Runnable target, AccessControlContext acc) {
-+ init(null, target, "Thread-" + nextThreadNum(), 0, acc);
-+ }
-+
-+ /**
- * 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-07-15 21:49:33.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/DirectMethodHandle.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2014-07-15 21:54:44.000000000 -0700
-@@ -53,7 +53,8 @@
- if (!member.isResolved())
- throw new InternalError();
-
-- if (member.getDeclaringClass().isInterface() && !member.isAbstract()) {
-+ if (member.getDeclaringClass().isInterface() &&
-+ member.isMethod() && !member.isAbstract()) {
- // Check for corner case: invokeinterface of Object method
- MemberName m = new MemberName(Object.class, member.getName(), member.getMethodType(), member.getReferenceKind());
- m = MemberName.getFactory().resolveOrNull(m.getReferenceKind(), m, null);
-@@ -242,12 +243,12 @@
- assert(names.length == nameCursor);
- if (doesAlloc) {
- // names = { argx,y,z,... new C, init method }
-- names[NEW_OBJ] = new Name(NF_allocateInstance, names[DMH_THIS]);
-- names[GET_MEMBER] = new Name(NF_constructorMethod, names[DMH_THIS]);
-+ names[NEW_OBJ] = new Name(Lazy.NF_allocateInstance, names[DMH_THIS]);
-+ names[GET_MEMBER] = new Name(Lazy.NF_constructorMethod, names[DMH_THIS]);
- } else if (needsInit) {
-- names[GET_MEMBER] = new Name(NF_internalMemberNameEnsureInit, names[DMH_THIS]);
-+ names[GET_MEMBER] = new Name(Lazy.NF_internalMemberNameEnsureInit, names[DMH_THIS]);
- } else {
-- names[GET_MEMBER] = new Name(NF_internalMemberName, names[DMH_THIS]);
-+ names[GET_MEMBER] = new Name(Lazy.NF_internalMemberName, names[DMH_THIS]);
- }
- Object[] outArgs = Arrays.copyOfRange(names, ARG_BASE, GET_MEMBER+1, Object[].class);
- assert(outArgs[outArgs.length-1] == names[GET_MEMBER]); // look, shifted args!
-@@ -595,18 +596,18 @@
- final int RESULT = nameCursor-1; // either the call or the cast
- Name[] names = arguments(nameCursor - ARG_LIMIT, mtype.invokerType());
- if (needsInit)
-- names[INIT_BAR] = new Name(NF_ensureInitialized, names[DMH_THIS]);
-+ names[INIT_BAR] = new Name(Lazy.NF_ensureInitialized, names[DMH_THIS]);
- if (needsCast && !isGetter)
-- names[PRE_CAST] = new Name(NF_checkCast, names[DMH_THIS], names[SET_VALUE]);
-+ names[PRE_CAST] = new Name(Lazy.NF_checkCast, names[DMH_THIS], names[SET_VALUE]);
- Object[] outArgs = new Object[1 + linkerType.parameterCount()];
- assert(outArgs.length == (isGetter ? 3 : 4));
- outArgs[0] = UNSAFE;
- if (isStatic) {
-- outArgs[1] = names[F_HOLDER] = new Name(NF_staticBase, names[DMH_THIS]);
-- outArgs[2] = names[F_OFFSET] = new Name(NF_staticOffset, names[DMH_THIS]);
-+ outArgs[1] = names[F_HOLDER] = new Name(Lazy.NF_staticBase, names[DMH_THIS]);
-+ outArgs[2] = names[F_OFFSET] = new Name(Lazy.NF_staticOffset, names[DMH_THIS]);
- } else {
-- outArgs[1] = names[OBJ_CHECK] = new Name(NF_checkBase, names[OBJ_BASE]);
-- outArgs[2] = names[F_OFFSET] = new Name(NF_fieldOffset, names[DMH_THIS]);
-+ outArgs[1] = names[OBJ_CHECK] = new Name(Lazy.NF_checkBase, names[OBJ_BASE]);
-+ outArgs[2] = names[F_OFFSET] = new Name(Lazy.NF_fieldOffset, names[DMH_THIS]);
- }
- if (!isGetter) {
- outArgs[3] = (needsCast ? names[PRE_CAST] : names[SET_VALUE]);
-@@ -614,7 +615,7 @@
- for (Object a : outArgs) assert(a != null);
- names[LINKER_CALL] = new Name(linker, outArgs);
- if (needsCast && isGetter)
-- names[POST_CAST] = new Name(NF_checkCast, names[DMH_THIS], names[LINKER_CALL]);
-+ names[POST_CAST] = new Name(Lazy.NF_checkCast, names[DMH_THIS], names[LINKER_CALL]);
- for (Name n : names) assert(n != null);
- String fieldOrStatic = (isStatic ? "Static" : "Field");
- String lambdaName = (linkerName + fieldOrStatic); // significant only for debugging
-@@ -623,48 +624,54 @@
- return new LambdaForm(lambdaName, ARG_LIMIT, names, RESULT);
- }
-
-- private static final NamedFunction
-- NF_internalMemberName,
-- NF_internalMemberNameEnsureInit,
-- NF_ensureInitialized,
-- NF_fieldOffset,
-- NF_checkBase,
-- NF_staticBase,
-- NF_staticOffset,
-- NF_checkCast,
-- NF_allocateInstance,
-- NF_constructorMethod;
-- static {
-- try {
-- NamedFunction nfs[] = {
-- NF_internalMemberName = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("internalMemberName", Object.class)),
-- NF_internalMemberNameEnsureInit = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("internalMemberNameEnsureInit", Object.class)),
-- NF_ensureInitialized = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("ensureInitialized", Object.class)),
-- NF_fieldOffset = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("fieldOffset", Object.class)),
-- NF_checkBase = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("checkBase", Object.class)),
-- NF_staticBase = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("staticBase", Object.class)),
-- NF_staticOffset = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("staticOffset", Object.class)),
-- NF_checkCast = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("checkCast", Object.class, Object.class)),
-- NF_allocateInstance = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("allocateInstance", Object.class)),
-- NF_constructorMethod = new NamedFunction(DirectMethodHandle.class
-- .getDeclaredMethod("constructorMethod", Object.class))
-- };
-- for (NamedFunction nf : nfs) {
-- // Each nf must be statically invocable or we get tied up in our bootstraps.
-- assert(InvokerBytecodeGenerator.isStaticallyInvocable(nf.member)) : nf;
-- nf.resolve();
-+ /**
-+ * Pre-initialized NamedFunctions for bootstrapping purposes.
-+ * Factored in an inner class to delay initialization until first usage.
-+ */
-+ private static class Lazy {
-+ static final NamedFunction
-+ NF_internalMemberName,
-+ NF_internalMemberNameEnsureInit,
-+ NF_ensureInitialized,
-+ NF_fieldOffset,
-+ NF_checkBase,
-+ NF_staticBase,
-+ NF_staticOffset,
-+ NF_checkCast,
-+ NF_allocateInstance,
-+ NF_constructorMethod;
-+ static {
-+ try {
-+ NamedFunction nfs[] = {
-+ NF_internalMemberName = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("internalMemberName", Object.class)),
-+ NF_internalMemberNameEnsureInit = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("internalMemberNameEnsureInit", Object.class)),
-+ NF_ensureInitialized = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("ensureInitialized", Object.class)),
-+ NF_fieldOffset = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("fieldOffset", Object.class)),
-+ NF_checkBase = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("checkBase", Object.class)),
-+ NF_staticBase = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("staticBase", Object.class)),
-+ NF_staticOffset = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("staticOffset", Object.class)),
-+ NF_checkCast = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("checkCast", Object.class, Object.class)),
-+ NF_allocateInstance = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("allocateInstance", Object.class)),
-+ NF_constructorMethod = new NamedFunction(DirectMethodHandle.class
-+ .getDeclaredMethod("constructorMethod", Object.class))
-+ };
-+ for (NamedFunction nf : nfs) {
-+ // Each nf must be statically invocable or we get tied up in our bootstraps.
-+ assert(InvokerBytecodeGenerator.isStaticallyInvocable(nf.member)) : nf;
-+ nf.resolve();
-+ }
-+ } catch (ReflectiveOperationException ex) {
-+ throw newInternalError(ex);
- }
-- } catch (ReflectiveOperationException ex) {
-- throw newInternalError(ex);
- }
- }
- }
---- ./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-10-28 20:19:46.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();
-@@ -612,6 +613,12 @@
- return false; // inner class of some sort
- if (cls.getClassLoader() != MethodHandle.class.getClassLoader())
- return false; // not on BCP
-+ MethodType mtype = member.getMethodOrFieldType();
-+ if (!isStaticallyNameable(mtype.returnType()))
-+ return false;
-+ for (Class<?> ptype : mtype.parameterArray())
-+ if (!isStaticallyNameable(ptype))
-+ return false;
- if (!member.isPrivate() && VerifyAccess.isSamePackage(MethodHandle.class, cls))
- return true; // in java.lang.invoke package
- if (member.isPublic() && isStaticallyNameable(cls))
-@@ -654,6 +661,12 @@
- refKind = REF_invokeVirtual;
- }
-
-+ if (member.getDeclaringClass().isInterface() && refKind == REF_invokeVirtual) {
-+ // Methods from Object declared in an interface can be resolved by JVM to invokevirtual kind.
-+ // Need to convert it back to invokeinterface to pass verification and make the invocation works as expected.
-+ refKind = REF_invokeInterface;
-+ }
-+
- // push arguments
- for (int i = 0; i < name.arguments.length; i++) {
- emitPushArgument(name, i);
---- ./jdk/src/share/classes/java/lang/invoke/Invokers.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/invoke/Invokers.java 2014-07-15 21:54:44.000000000 -0700
-@@ -318,6 +318,7 @@
- // let mt=TYPEOF(a*:R), tmh=asType(mh, mt);
- // tmh.invokeBasic(a*)
- outArgs = Arrays.copyOfRange(names, CALL_MH, OUTARG_LIMIT, Object[].class);
-+ outArgs[0] = names[CHECK_TYPE];
- outCallType = mtype;
- } else {
- names[CHECK_TYPE] = new Name(NF_checkGenericType, names[CALL_MH], mtypeArg);
---- ./jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2014-10-28 20:19:47.000000000 -0700
-@@ -753,6 +753,10 @@
- * to the target method handle.
- * (The array may also be null when zero elements are required.)
- * <p>
-+ * If, when the adapter is called, the supplied array argument does
-+ * not have the correct number of elements, the adapter will throw
-+ * an {@link IllegalArgumentException} instead of invoking the target.
-+ * <p>
- * Here are some simple examples of array-spreading method handles:
- * <blockquote><pre>
- MethodHandle equals = publicLookup()
-@@ -763,6 +767,12 @@
- MethodHandle eq2 = equals.asSpreader(Object[].class, 2);
- assert( (boolean) eq2.invokeExact(new Object[]{ "me", "me" }));
- assert(!(boolean) eq2.invokeExact(new Object[]{ "me", "thee" }));
-+// try to spread from anything but a 2-array:
-+for (int n = 0; n <= 10; n++) {
-+ Object[] badArityArgs = (n == 2 ? null : new Object[n]);
-+ try { assert((boolean) eq2.invokeExact(badArityArgs) && false); }
-+ catch (IllegalArgumentException ex) { } // OK
-+}
- // spread both arguments from a String array:
- MethodHandle eq2s = equals.asSpreader(String[].class, 2);
- assert( (boolean) eq2s.invokeExact(new String[]{ "me", "me" }));
-@@ -1250,8 +1260,6 @@
- /*non-public*/
- MethodHandle viewAsType(MethodType newType) {
- // No actual conversions, just a new view of the same method.
-- if (!type.isViewableAs(newType))
-- throw new InternalError();
- return MethodHandleImpl.makePairwiseConvert(this, newType, 0);
- }
-
---- ./jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-07-15 21:54:44.000000000 -0700
-@@ -430,7 +430,7 @@
- // Spread the array.
- MethodHandle aload = MethodHandles.arrayElementGetter(spreadArgType);
- Name array = names[argIndex];
-- names[nameCursor++] = new Name(NF_checkSpreadArgument, array, spreadArgCount);
-+ names[nameCursor++] = new Name(Lazy.NF_checkSpreadArgument, array, spreadArgCount);
- for (int j = 0; j < spreadArgCount; i++, j++) {
- indexes[i] = nameCursor;
- names[nameCursor++] = new Name(aload, array, j);
-@@ -454,14 +454,8 @@
- }
-
- static void checkSpreadArgument(Object av, int n) {
-- // FIXME: regression test for bug 7141637 erroneously expects an NPE, and other tests may expect IAE
-- // but the actual exception raised by an arity mismatch should be WMTE
-- final boolean RAISE_RANDOM_EXCEPTIONS = true; // FIXME: delete in JSR 292 M1
- if (av == null) {
- if (n == 0) return;
-- int len;
-- if (RAISE_RANDOM_EXCEPTIONS)
-- len = ((Object[])av).length; // throw NPE; but delete this after tests are fixed
- } else if (av instanceof Object[]) {
- int len = ((Object[])av).length;
- if (len == n) return;
-@@ -470,19 +464,23 @@
- if (len == n) return;
- }
- // fall through to error:
-- if (RAISE_RANDOM_EXCEPTIONS)
-- throw newIllegalArgumentException("Array is not of length "+n);
-- throw new WrongMethodTypeException("Array is not of length "+n);
-+ throw newIllegalArgumentException("array is not of length "+n);
- }
-
-- private static final NamedFunction NF_checkSpreadArgument;
-- static {
-- try {
-- NF_checkSpreadArgument = new NamedFunction(MethodHandleImpl.class
-- .getDeclaredMethod("checkSpreadArgument", Object.class, int.class));
-- NF_checkSpreadArgument.resolve();
-- } catch (ReflectiveOperationException ex) {
-- throw newInternalError(ex);
-+ /**
-+ * Pre-initialized NamedFunctions for bootstrapping purposes.
-+ * Factored in an inner class to delay initialization until first usage.
-+ */
-+ private static class Lazy {
-+ static final NamedFunction NF_checkSpreadArgument;
-+ static {
-+ try {
-+ NF_checkSpreadArgument = new NamedFunction(MethodHandleImpl.class
-+ .getDeclaredMethod("checkSpreadArgument", Object.class, int.class));
-+ NF_checkSpreadArgument.resolve();
-+ } catch (ReflectiveOperationException ex) {
-+ throw newInternalError(ex);
-+ }
- }
- }
-
-@@ -742,7 +740,8 @@
- GuardWithCatch gguard = new GuardWithCatch(gtarget, exType, gcatcher);
- if (gtarget == null || gcatcher == null) throw new InternalError();
- MethodHandle ginvoker = GuardWithCatch.VARARGS_INVOKE.bindReceiver(gguard);
-- return makeCollectArguments(ginvoker, ValueConversions.varargsArray(nargs), 0, false);
-+ MethodHandle gcollect = makeCollectArguments(ginvoker, ValueConversions.varargsArray(nargs), 0, false);
-+ return makePairwiseConvert(gcollect, type, 2);
- }
- }
-
---- ./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 2014-07-15 21:49:33.000000000 -0700
-@@ -456,6 +456,7 @@
- case "getDeclaredField":
- case "getDeclaredMethod":
- case "getDeclaredConstructor":
-+ case "getDeclaringClass":
- case "getEnclosingClass":
- case "getEnclosingMethod":
- case "getEnclosingConstructor":
-@@ -491,6 +492,7 @@
- return defc == java.lang.ClassLoader.class;
- case "registerAsParallelCapable":
- return defc == java.lang.ClassLoader.class;
-+ case "getInvocationHandler":
- case "getProxyClass":
- 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 2014-10-28 20:19:47.000000000 -0700
-@@ -26,12 +26,15 @@
- package java.lang.invoke;
-
- import java.lang.reflect.*;
-+
- import sun.invoke.util.ValueConversions;
- import sun.invoke.util.VerifyAccess;
- import sun.invoke.util.Wrapper;
-+
- import java.util.List;
- import java.util.ArrayList;
- import java.util.Arrays;
-+
- import sun.reflect.CallerSensitive;
- import sun.reflect.Reflection;
- import sun.reflect.misc.ReflectUtil;
-@@ -245,6 +248,9 @@
- * In general, the conditions under which a method handle may be
- * looked up for a method {@code M} are exactly equivalent to the conditions
- * under which the lookup class could have compiled and resolved a call to {@code M}.
-+ * Where the JVM would raise exceptions like {@code NoSuchMethodError},
-+ * a method handle lookup will generally raise a corresponding
-+ * checked exception, such as {@code NoSuchMethodException}.
- * And the effect of invoking the method handle resulting from the lookup
- * is exactly equivalent to executing the compiled and resolved call to {@code M}.
- * The same point is true of fields and constructors.
-@@ -261,6 +267,12 @@
- * (which will necessarily be a superclass of the lookup class)
- * to the lookup class itself.
- * <p>
-+ * The JVM represents constructors and static initializer blocks as internal methods
-+ * with special names ({@code "<init>"} and {@code "<clinit>"}).
-+ * The internal syntax of invocation instructions allows them to refer to such internal
-+ * methods as if they were normal methods, but the JVM verifier rejects them.
-+ * A lookup of such an internal method will produce a {@code NoSuchMethodException}.
-+ * <p>
- * In some cases, access between nested classes is obtained by the Java compiler by creating
- * an wrapper method to access a private method of another class
- * in the same top-level declaration.
-@@ -426,7 +438,7 @@
-
- Lookup(Class<?> lookupClass) {
- this(lookupClass, ALL_MODES);
-- checkUnprivilegedlookupClass(lookupClass);
-+ checkUnprivilegedlookupClass(lookupClass, ALL_MODES);
- }
-
- private Lookup(Class<?> lookupClass, int allowedModes) {
-@@ -480,7 +492,7 @@
- // No permissions.
- newModes = 0;
- }
-- checkUnprivilegedlookupClass(requestedLookupClass);
-+ checkUnprivilegedlookupClass(requestedLookupClass, newModes);
- return new Lookup(requestedLookupClass, newModes);
- }
-
-@@ -496,10 +508,19 @@
- /** Package-private version of lookup which is trusted. */
- static final Lookup IMPL_LOOKUP = new Lookup(Object.class, TRUSTED);
-
-- private static void checkUnprivilegedlookupClass(Class<?> lookupClass) {
-+ private static void checkUnprivilegedlookupClass(Class<?> lookupClass, int allowedModes) {
- String name = lookupClass.getName();
- if (name.startsWith("java.lang.invoke."))
- throw newIllegalArgumentException("illegal lookupClass: "+lookupClass);
-+
-+ // For caller-sensitive MethodHandles.lookup()
-+ // disallow lookup more restricted packages
-+ if (allowedModes == ALL_MODES && lookupClass.getClassLoader() == null) {
-+ if (name.startsWith("java.") ||
-+ (name.startsWith("sun.") && !name.startsWith("sun.invoke."))) {
-+ throw newIllegalArgumentException("illegal lookupClass: " + lookupClass);
-+ }
-+ }
- }
-
- /**
-@@ -566,6 +587,15 @@
- * The returned method handle will have
- * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
- * the method's variable arity modifier bit ({@code 0x0080}) is set.
-+ * <b>Example:</b>
-+ * <p><blockquote><pre>{@code
-+import static java.lang.invoke.MethodHandles.*;
-+import static java.lang.invoke.MethodType.*;
-+...
-+MethodHandle MH_asList = publicLookup().findStatic(Arrays.class,
-+ "asList", methodType(List.class, Object[].class));
-+assertEquals("[x, y]", MH_asList.invoke("x", "y").toString());
-+ * }</pre></blockquote>
- * @param refc the class from which the method is accessed
- * @param name the name of the method
- * @param type the type of the method
-@@ -616,6 +646,34 @@
- * {@link java.lang.invoke.MethodHandles#invoker MethodHandles.invoker}
- * with the same {@code type} argument.
- *
-+ * <b>Example:</b>
-+ * <p><blockquote><pre>{@code
-+import static java.lang.invoke.MethodHandles.*;
-+import static java.lang.invoke.MethodType.*;
-+...
-+MethodHandle MH_concat = publicLookup().findVirtual(String.class,
-+ "concat", methodType(String.class, String.class));
-+MethodHandle MH_hashCode = publicLookup().findVirtual(Object.class,
-+ "hashCode", methodType(int.class));
-+MethodHandle MH_hashCode_String = publicLookup().findVirtual(String.class,
-+ "hashCode", methodType(int.class));
-+assertEquals("xy", (String) MH_concat.invokeExact("x", "y"));
-+assertEquals("xy".hashCode(), (int) MH_hashCode.invokeExact((Object)"xy"));
-+assertEquals("xy".hashCode(), (int) MH_hashCode_String.invokeExact("xy"));
-+// interface method:
-+MethodHandle MH_subSequence = publicLookup().findVirtual(CharSequence.class,
-+ "subSequence", methodType(CharSequence.class, int.class, int.class));
-+assertEquals("def", MH_subSequence.invoke("abcdefghi", 3, 6).toString());
-+// constructor "internal method" must be accessed differently:
-+MethodType MT_newString = methodType(void.class); //()V for new String()
-+try { assertEquals("impossible", lookup()
-+ .findVirtual(String.class, "<init>", MT_newString));
-+ } catch (NoSuchMethodException ex) { } // OK
-+MethodHandle MH_newString = publicLookup()
-+ .findConstructor(String.class, MT_newString);
-+assertEquals("", (String) MH_newString.invokeExact());
-+ * }</pre></blockquote>
-+ *
- * @param refc the class or interface from which the method is accessed
- * @param name the name of the method
- * @param type the type of the method, with the receiver argument omitted
-@@ -657,12 +715,30 @@
- * If the constructor's class has not yet been initialized, that is done
- * immediately, before the method handle is returned.
- * <p>
-- * Note: The requested type must have a return type of {@code void}.
-- * This is consistent with the JVM's treatment of constructor type descriptors.
-+ * <em>(Note: The requested type must have a return type of {@code void}.
-+ * This is consistent with the JVM's treatment of constructor type descriptors.)</em>
- * <p>
- * The returned method handle will have
- * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
- * the constructor's variable arity modifier bit ({@code 0x0080}) is set.
-+ * <b>Example:</b>
-+ * <p><blockquote><pre>{@code
-+import static java.lang.invoke.MethodHandles.*;
-+import static java.lang.invoke.MethodType.*;
-+...
-+MethodHandle MH_newArrayList = publicLookup().findConstructor(
-+ ArrayList.class, methodType(void.class, Collection.class));
-+Collection orig = Arrays.asList("x", "y");
-+Collection copy = (ArrayList) MH_newArrayList.invokeExact(orig);
-+assert(orig != copy);
-+assertEquals(orig, copy);
-+// a variable-arity constructor:
-+MethodHandle MH_newProcessBuilder = publicLookup().findConstructor(
-+ ProcessBuilder.class, methodType(void.class, String[].class));
-+ProcessBuilder pb = (ProcessBuilder)
-+ MH_newProcessBuilder.invoke("x", "y", "z");
-+assertEquals("[x, y, z]", pb.command().toString());
-+ * }</pre></blockquote>
- * @param refc the class or interface from which the method is accessed
- * @param type the type of the method, with the receiver argument omitted, and a void return type
- * @return the desired method handle
-@@ -702,6 +778,45 @@
- * The returned method handle will have
- * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
- * the method's variable arity modifier bit ({@code 0x0080}) is set.
-+ * <p>
-+ * <em>(Note: JVM internal methods named {@code <init>} not visible to this API,
-+ * even though the {@code invokespecial} instruction can refer to them
-+ * in special circumstances. Use {@link #findConstructor findConstructor}
-+ * to access instance initialization methods in a safe manner.)</em>
-+ * <b>Example:</b>
-+ * <p><blockquote><pre>{@code
-+import static java.lang.invoke.MethodHandles.*;
-+import static java.lang.invoke.MethodType.*;
-+...
-+static class Listie extends ArrayList {
-+ public String toString() { return "[wee Listie]"; }
-+ static Lookup lookup() { return MethodHandles.lookup(); }
-+}
-+...
-+// no access to constructor via invokeSpecial:
-+MethodHandle MH_newListie = Listie.lookup()
-+ .findConstructor(Listie.class, methodType(void.class));
-+Listie l = (Listie) MH_newListie.invokeExact();
-+try { assertEquals("impossible", Listie.lookup().findSpecial(
-+ Listie.class, "<init>", methodType(void.class), Listie.class));
-+ } catch (NoSuchMethodException ex) { } // OK
-+// access to super and self methods via invokeSpecial:
-+MethodHandle MH_super = Listie.lookup().findSpecial(
-+ ArrayList.class, "toString" , methodType(String.class), Listie.class);
-+MethodHandle MH_this = Listie.lookup().findSpecial(
-+ Listie.class, "toString" , methodType(String.class), Listie.class);
-+MethodHandle MH_duper = Listie.lookup().findSpecial(
-+ Object.class, "toString" , methodType(String.class), Listie.class);
-+assertEquals("[]", (String) MH_super.invokeExact(l));
-+assertEquals(""+l, (String) MH_this.invokeExact(l));
-+assertEquals("[]", (String) MH_duper.invokeExact(l)); // ArrayList method
-+try { assertEquals("inaccessible", Listie.lookup().findSpecial(
-+ String.class, "toString", methodType(String.class), Listie.class));
-+ } catch (IllegalAccessException ex) { } // OK
-+Listie subl = new Listie() { public String toString() { return "[subclass]"; } };
-+assertEquals(""+l, (String) MH_this.invokeExact(subl)); // Listie method
-+ * }</pre></blockquote>
-+ *
- * @param refc the class or interface from which the method is accessed
- * @param name the name of the method (which must not be "&lt;init&gt;")
- * @param type the type of the method, with the receiver argument omitted
-@@ -1005,15 +1120,16 @@
- /// Helper methods, all package-private.
-
- MemberName resolveOrFail(byte refKind, Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
-- checkSymbolicClass(refc); // do this before attempting to resolve
- name.getClass(); type.getClass(); // NPE
-+ checkSymbolicClass(refc); // do this before attempting to resolve
- return IMPL_NAMES.resolveOrFail(refKind, new MemberName(refc, name, type, refKind), lookupClassOrNull(),
- NoSuchFieldException.class);
- }
-
- MemberName resolveOrFail(byte refKind, Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
-+ type.getClass(); // NPE
- checkSymbolicClass(refc); // do this before attempting to resolve
-- name.getClass(); type.getClass(); // NPE
-+ checkMethodName(refKind, name);
- return IMPL_NAMES.resolveOrFail(refKind, new MemberName(refc, name, type, refKind), lookupClassOrNull(),
- NoSuchMethodException.class);
- }
-@@ -1024,6 +1140,12 @@
- throw new MemberName(refc).makeAccessException("symbolic reference class is not public", this);
- }
-
-+ void checkMethodName(byte refKind, String name) throws NoSuchMethodException {
-+ if (name.startsWith("<") && refKind != REF_newInvokeSpecial)
-+ throw new NoSuchMethodException("illegal method name: "+name);
-+ }
-+
-+
- /**
- * Find my trustable caller class if m is a caller sensitive method.
- * If this lookup object has private access, then the caller class is the lookupClass.
-@@ -1146,6 +1268,31 @@
- int allowedModes = this.allowedModes;
- if (allowedModes == TRUSTED) return;
- int mods = m.getModifiers();
-+ if (Modifier.isProtected(mods)) {
-+ if (refKind == REF_invokeVirtual &&
-+ m.getDeclaringClass() == Object.class &&
-+ m.getName().equals("clone") &&
-+ refc.isArray()) {
-+ // The JVM does this hack also.
-+ // (See ClassVerifier::verify_invoke_instructions
-+ // and LinkResolver::check_method_accessability.)
-+ // Because the JVM does not allow separate methods on array types,
-+ // there is no separate method for int[].clone.
-+ // All arrays simply inherit Object.clone.
-+ // But for access checking logic, we make Object.clone
-+ // (normally protected) appear to be public.
-+ // Later on, when the DirectMethodHandle is created,
-+ // its leading argument will be restricted to the
-+ // requested array type.
-+ // N.B. The return type is not adjusted, because
-+ // that is *not* the bytecode behavior.
-+ mods ^= Modifier.PROTECTED | Modifier.PUBLIC;
-+ }
-+ if (refKind == REF_newInvokeSpecial) {
-+ // cannot "new" a protected ctor in a different package
-+ mods ^= Modifier.PROTECTED;
-+ }
-+ }
- if (Modifier.isFinal(mods) &&
- MethodHandleNatives.refKindIsSetter(refKind))
- throw m.makeAccessException("unexpected set of a final field", this);
-@@ -1316,6 +1463,10 @@
- : resolveOrFail(refKind, defc, name, (Class<?>) type);
- return getDirectField(refKind, defc, field);
- } else if (MethodHandleNatives.refKindIsMethod(refKind)) {
-+ if (defc == MethodHandle.class && refKind == REF_invokeVirtual) {
-+ MethodHandle mh = findVirtualForMH(name, (MethodType) type);
-+ if (mh != null) return mh;
-+ }
- MemberName method = (resolved != null) ? resolved
- : resolveOrFail(refKind, defc, name, (MethodType) type);
- return getDirectMethod(refKind, defc, method, lookupClass);
-@@ -1386,6 +1537,9 @@
- * <p>
- * Before invoking its target, the invoker will spread the final array, apply
- * reference casts as necessary, and unbox and widen primitive arguments.
-+ * If, when the invoker is called, the supplied array argument does
-+ * not have the correct number of elements, the invoker will throw
-+ * an {@link IllegalArgumentException} instead of invoking the target.
- * <p>
- * This method is equivalent to the following code (though it may be more efficient):
- * <p><blockquote><pre>
-@@ -1603,6 +1757,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 +1952,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/invoke/MethodType.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/invoke/MethodType.java 2014-10-28 20:19:47.000000000 -0700
-@@ -628,7 +628,7 @@
- * @return the parameter types (as an immutable list)
- */
- public List<Class<?>> parameterList() {
-- return Collections.unmodifiableList(Arrays.asList(ptypes));
-+ return Collections.unmodifiableList(Arrays.asList(ptypes.clone()));
- }
-
- /*non-public*/ Class<?> lastParameterType() {
---- ./jdk/src/share/classes/java/lang/ref/Finalizer.java 2013-09-06 11:28:10.000000000 -0700
-+++ ./jdk/src/share/classes/java/lang/ref/Finalizer.java 2014-07-15 21:49:33.000000000 -0700
-@@ -27,17 +27,14 @@
-
- import java.security.PrivilegedAction;
- import java.security.AccessController;
--
-+import sun.misc.JavaLangAccess;
-+import sun.misc.SharedSecrets;
-+import sun.misc.VM;
-
- final class Finalizer extends FinalReference { /* Package-private; must be in
- same package as the Reference
- class */
-
-- /* A native method that invokes an arbitrary object's finalize method is
-- required since the finalize method is protected
-- */
-- static native void invokeFinalizeMethod(Object o) throws Throwable;
--
- private static ReferenceQueue queue = new ReferenceQueue();
- private static Finalizer unfinalized = null;
- private static final Object lock = new Object();
-@@ -90,7 +87,7 @@
- new Finalizer(finalizee);
- }
-
-- private void runFinalizer() {
-+ private void runFinalizer(JavaLangAccess jla) {
- synchronized (this) {
- if (hasBeenFinalized()) return;
- remove();
-@@ -98,7 +95,8 @@
- try {
- Object finalizee = this.get();
- if (finalizee != null && !(finalizee instanceof java.lang.Enum)) {
-- invokeFinalizeMethod(finalizee);
-+ jla.invokeFinalize(finalizee);
-+
- /* Clear stack slot containing this variable, to decrease
- the chances of false retention with a conservative GC */
- finalizee = null;
-@@ -141,16 +139,21 @@
-
- /* Called by Runtime.runFinalization() */
- static void runFinalization() {
-+ if (!VM.isBooted()) {
-+ return;
-+ }
-+
- forkSecondaryFinalizer(new Runnable() {
- private volatile boolean running;
- public void run() {
- if (running)
- return;
-+ final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
- running = true;
- for (;;) {
- Finalizer f = (Finalizer)queue.poll();
- if (f == null) break;
-- f.runFinalizer();
-+ f.runFinalizer(jla);
- }
- }
- });
-@@ -158,11 +161,16 @@
-
- /* Invoked by java.lang.Shutdown */
- static void runAllFinalizers() {
-+ if (!VM.isBooted()) {
-+ return;
-+ }
-+
- forkSecondaryFinalizer(new Runnable() {
- private volatile boolean running;
- public void run() {
- if (running)
- return;
-+ final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
- running = true;
- for (;;) {
- Finalizer f;
-@@ -171,7 +179,7 @@
- if (f == null) break;
- unfinalized = f.next;
- }
-- f.runFinalizer();
-+ f.runFinalizer(jla);
- }}});
- }
-
-@@ -183,13 +191,25 @@
- public void run() {
- if (running)
- return;
-+
-+ // Finalizer thread starts before System.initializeSystemClass
-+ // is called. Wait until JavaLangAccess is available
-+ while (!VM.isBooted()) {
-+ // delay until VM completes initialization
-+ try {
-+ VM.awaitBooted();
-+ } catch (InterruptedException x) {
-+ // ignore and continue
-+ }
-+ }
-+ final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
- running = true;
- for (;;) {
- try {
- Finalizer f = (Finalizer)queue.remove();
-- f.runFinalizer();
-+ f.runFinalizer(jla);
- } catch (InterruptedException x) {
-- continue;
-+ // ignore and continue
- }
- }
- }
---- ./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 2014-07-15 21:54:44.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 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,19 +25,15 @@
-
- package java.lang.reflect;
-
--import java.lang.ref.Reference;
- import java.lang.ref.WeakReference;
-+import java.lang.reflect.WeakCache.BiFunction;
- import java.security.AccessController;
- import java.security.Permission;
- import java.security.PrivilegedAction;
- import java.util.Arrays;
--import java.util.Collections;
--import java.util.HashMap;
--import java.util.HashSet;
-+import java.util.IdentityHashMap;
- import java.util.Map;
--import java.util.Set;
--import java.util.List;
--import java.util.WeakHashMap;
-+import java.util.concurrent.atomic.AtomicLong;
- import sun.misc.ProxyGenerator;
- import sun.reflect.CallerSensitive;
- import sun.reflect.Reflection;
-@@ -230,27 +226,15 @@
-
- private static final long serialVersionUID = -2222568056686623797L;
-
-- /** prefix for all proxy class names */
-- private final static String proxyClassNamePrefix = "$Proxy";
--
- /** parameter types of a proxy class constructor */
-- private final static Class[] constructorParams =
-+ private static final Class<?>[] constructorParams =
- { InvocationHandler.class };
-
-- /** maps a class loader to the proxy class cache for that loader */
-- private static Map<ClassLoader, Map<List<String>, Object>> loaderToCache
-- = new WeakHashMap<>();
--
-- /** marks that a particular proxy class is currently being generated */
-- private static Object pendingGenerationMarker = new Object();
--
-- /** next number to use for generation of unique proxy class names */
-- private static long nextUniqueNumber = 0;
-- private static Object nextUniqueNumberLock = new Object();
--
-- /** set of all generated proxy classes, for isProxyClass implementation */
-- private static Map<Class<?>, Void> proxyClasses =
-- Collections.synchronizedMap(new WeakHashMap<Class<?>, Void>());
-+ /**
-+ * a cache of proxy classes
-+ */
-+ private static final WeakCache<ClassLoader, Class<?>[], Class<?>>
-+ proxyClassCache = new WeakCache<>(new KeyFactory(), new ProxyClassFactory());
-
- /**
- * the invocation handler for this proxy instance.
-@@ -412,12 +396,13 @@
- Class<?>... interfaces)
- throws IllegalArgumentException
- {
-- SecurityManager sm = System.getSecurityManager();
-+ final Class<?>[] intfs = interfaces.clone();
-+ final SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
-- checkProxyAccess(Reflection.getCallerClass(), loader, interfaces);
-+ checkProxyAccess(Reflection.getCallerClass(), loader, intfs);
- }
-
-- return getProxyClass0(loader, interfaces);
-+ return getProxyClass0(loader, intfs);
- }
-
- /*
-@@ -464,131 +449,190 @@
- throw new IllegalArgumentException("interface limit exceeded");
- }
-
-- Class<?> proxyClass = null;
-+ // If the proxy class defined by the given loader implementing
-+ // the given interfaces exists, this will simply return the cached copy;
-+ // otherwise, it will create the proxy class via the ProxyClassFactory
-+ return proxyClassCache.get(loader, interfaces);
-+ }
-
-- /* collect interface names to use as key for proxy class cache */
-- String[] interfaceNames = new String[interfaces.length];
-+ /*
-+ * a key used for proxy class with 0 implemented interfaces
-+ */
-+ private static final Object key0 = new Object();
-
-- // for detecting duplicates
-- Set<Class<?>> interfaceSet = new HashSet<>();
-+ /*
-+ * Key1 and Key2 are optimized for the common use of dynamic proxies
-+ * that implement 1 or 2 interfaces.
-+ */
-
-- for (int i = 0; i < interfaces.length; i++) {
-- /*
-- * Verify that the class loader resolves the name of this
-- * interface to the same Class object.
-- */
-- String interfaceName = interfaces[i].getName();
-- Class<?> interfaceClass = null;
-- try {
-- interfaceClass = Class.forName(interfaceName, false, loader);
-- } catch (ClassNotFoundException e) {
-- }
-- if (interfaceClass != interfaces[i]) {
-- throw new IllegalArgumentException(
-- interfaces[i] + " is not visible from class loader");
-- }
-+ /*
-+ * a key used for proxy class with 1 implemented interface
-+ */
-+ private static final class Key1 extends WeakReference<Class<?>> {
-+ private final int hash;
-
-- /*
-- * Verify that the Class object actually represents an
-- * interface.
-- */
-- if (!interfaceClass.isInterface()) {
-- throw new IllegalArgumentException(
-- interfaceClass.getName() + " is not an interface");
-- }
-+ Key1(Class<?> intf) {
-+ super(intf);
-+ this.hash = intf.hashCode();
-+ }
-+
-+ @Override
-+ public int hashCode() {
-+ return hash;
-+ }
-+
-+ @Override
-+ public boolean equals(Object obj) {
-+ Class<?> intf;
-+ return this == obj ||
-+ obj != null &&
-+ obj.getClass() == Key1.class &&
-+ (intf = get()) != null &&
-+ intf == ((Key1) obj).get();
-+ }
-+ }
-
-- /*
-- * Verify that this interface is not a duplicate.
-- */
-- if (interfaceSet.contains(interfaceClass)) {
-- throw new IllegalArgumentException(
-- "repeated interface: " + interfaceClass.getName());
-+ /*
-+ * a key used for proxy class with 2 implemented interfaces
-+ */
-+ private static final class Key2 extends WeakReference<Class<?>> {
-+ private final int hash;
-+ private final WeakReference<Class<?>> ref2;
-+
-+ Key2(Class<?> intf1, Class<?> intf2) {
-+ super(intf1);
-+ hash = 31 * intf1.hashCode() + intf2.hashCode();
-+ ref2 = new WeakReference<Class<?>>(intf2);
-+ }
-+
-+ @Override
-+ public int hashCode() {
-+ return hash;
-+ }
-+
-+ @Override
-+ public boolean equals(Object obj) {
-+ Class<?> intf1, intf2;
-+ return this == obj ||
-+ obj != null &&
-+ obj.getClass() == Key2.class &&
-+ (intf1 = get()) != null &&
-+ intf1 == ((Key2) obj).get() &&
-+ (intf2 = ref2.get()) != null &&
-+ intf2 == ((Key2) obj).ref2.get();
-+ }
-+ }
-+
-+ /*
-+ * a key used for proxy class with any number of implemented interfaces
-+ * (used here for 3 or more only)
-+ */
-+ private static final class KeyX {
-+ private final int hash;
-+ private final WeakReference<Class<?>>[] refs;
-+
-+ KeyX(Class<?>[] interfaces) {
-+ hash = Arrays.hashCode(interfaces);
-+ refs = new WeakReference[interfaces.length];
-+ for (int i = 0; i < interfaces.length; i++) {
-+ refs[i] = new WeakReference(interfaces[i]);
- }
-- interfaceSet.add(interfaceClass);
-+ }
-
-- interfaceNames[i] = interfaceName;
-+ @Override
-+ public int hashCode() {
-+ return hash;
- }
-
-- /*
-- * Using string representations of the proxy interfaces as
-- * keys in the proxy class cache (instead of their Class
-- * objects) is sufficient because we require the proxy
-- * interfaces to be resolvable by name through the supplied
-- * class loader, and it has the advantage that using a string
-- * representation of a class makes for an implicit weak
-- * reference to the class.
-- */
-- List<String> key = Arrays.asList(interfaceNames);
-+ @Override
-+ public boolean equals(Object obj) {
-+ return this == obj ||
-+ obj != null &&
-+ obj.getClass() == KeyX.class &&
-+ equals(refs, ((KeyX) obj).refs);
-+ }
-
-- /*
-- * Find or create the proxy class cache for the class loader.
-- */
-- Map<List<String>, Object> cache;
-- synchronized (loaderToCache) {
-- cache = loaderToCache.get(loader);
-- if (cache == null) {
-- cache = new HashMap<>();
-- loaderToCache.put(loader, cache);
-+ private static boolean equals(WeakReference<Class<?>>[] refs1,
-+ WeakReference<Class<?>>[] refs2) {
-+ if (refs1.length != refs2.length) {
-+ return false;
- }
-- /*
-- * This mapping will remain valid for the duration of this
-- * method, without further synchronization, because the mapping
-- * will only be removed if the class loader becomes unreachable.
-- */
-+ for (int i = 0; i < refs1.length; i++) {
-+ Class<?> intf = refs1[i].get();
-+ if (intf == null || intf != refs2[i].get()) {
-+ return false;
-+ }
-+ }
-+ return true;
- }
-+ }
-
-- /*
-- * Look up the list of interfaces in the proxy class cache using
-- * the key. This lookup will result in one of three possible
-- * kinds of values:
-- * null, if there is currently no proxy class for the list of
-- * interfaces in the class loader,
-- * the pendingGenerationMarker object, if a proxy class for the
-- * list of interfaces is currently being generated,
-- * or a weak reference to a Class object, if a proxy class for
-- * the list of interfaces has already been generated.
-- */
-- synchronized (cache) {
-- /*
-- * Note that we need not worry about reaping the cache for
-- * entries with cleared weak references because if a proxy class
-- * has been garbage collected, its class loader will have been
-- * garbage collected as well, so the entire cache will be reaped
-- * from the loaderToCache map.
-- */
-- do {
-- Object value = cache.get(key);
-- if (value instanceof Reference) {
-- proxyClass = (Class<?>) ((Reference) value).get();
-+ /**
-+ * A function that maps an array of interfaces to an optimal key where
-+ * Class objects representing interfaces are weakly referenced.
-+ */
-+ private static final class KeyFactory
-+ implements BiFunction<ClassLoader, Class<?>[], Object>
-+ {
-+ @Override
-+ public Object apply(ClassLoader classLoader, Class<?>[] interfaces) {
-+ switch (interfaces.length) {
-+ case 1: return new Key1(interfaces[0]); // the most frequent
-+ case 2: return new Key2(interfaces[0], interfaces[1]);
-+ case 0: return key0;
-+ default: return new KeyX(interfaces);
-+ }
-+ }
-+ }
-+
-+ /**
-+ * A factory function that generates, defines and returns the proxy class given
-+ * the ClassLoader and array of interfaces.
-+ */
-+ private static final class ProxyClassFactory
-+ implements BiFunction<ClassLoader, Class<?>[], Class<?>>
-+ {
-+ // prefix for all proxy class names
-+ private static final String proxyClassNamePrefix = "$Proxy";
-+
-+ // next number to use for generation of unique proxy class names
-+ private static final AtomicLong nextUniqueNumber = new AtomicLong();
-+
-+ @Override
-+ public Class<?> apply(ClassLoader loader, Class<?>[] interfaces) {
-+
-+ Map<Class<?>, Boolean> interfaceSet = new IdentityHashMap<>(interfaces.length);
-+ for (Class<?> intf : interfaces) {
-+ /*
-+ * Verify that the class loader resolves the name of this
-+ * interface to the same Class object.
-+ */
-+ Class<?> interfaceClass = null;
-+ try {
-+ interfaceClass = Class.forName(intf.getName(), false, loader);
-+ } catch (ClassNotFoundException e) {
- }
-- if (proxyClass != null) {
-- // proxy class already generated: return it
-- return proxyClass;
-- } else if (value == pendingGenerationMarker) {
-- // proxy class being generated: wait for it
-- try {
-- cache.wait();
-- } catch (InterruptedException e) {
-- /*
-- * The class generation that we are waiting for should
-- * take a small, bounded time, so we can safely ignore
-- * thread interrupts here.
-- */
-- }
-- continue;
-- } else {
-- /*
-- * No proxy class for this list of interfaces has been
-- * generated or is being generated, so we will go and
-- * generate it now. Mark it as pending generation.
-- */
-- cache.put(key, pendingGenerationMarker);
-- break;
-+ if (interfaceClass != intf) {
-+ throw new IllegalArgumentException(
-+ intf + " is not visible from class loader");
- }
-- } while (true);
-- }
-+ /*
-+ * Verify that the Class object actually represents an
-+ * interface.
-+ */
-+ if (!interfaceClass.isInterface()) {
-+ throw new IllegalArgumentException(
-+ interfaceClass.getName() + " is not an interface");
-+ }
-+ /*
-+ * Verify that this interface is not a duplicate.
-+ */
-+ if (interfaceSet.put(interfaceClass, Boolean.TRUE) != null) {
-+ throw new IllegalArgumentException(
-+ "repeated interface: " + interfaceClass.getName());
-+ }
-+ }
-
-- try {
- String proxyPkg = null; // package to define proxy class in
-
- /*
-@@ -596,10 +640,10 @@
- * proxy class will be defined in the same package. Verify that
- * all non-public proxy interfaces are in the same package.
- */
-- for (int i = 0; i < interfaces.length; i++) {
-- int flags = interfaces[i].getModifiers();
-+ for (Class<?> intf : interfaces) {
-+ int flags = intf.getModifiers();
- if (!Modifier.isPublic(flags)) {
-- String name = interfaces[i].getName();
-+ String name = intf.getName();
- int n = name.lastIndexOf('.');
- String pkg = ((n == -1) ? "" : name.substring(0, n + 1));
- if (proxyPkg == null) {
-@@ -616,60 +660,31 @@
- proxyPkg = ReflectUtil.PROXY_PACKAGE + ".";
- }
-
-- {
-- /*
-- * Choose a name for the proxy class to generate.
-- */
-- long num;
-- synchronized (nextUniqueNumberLock) {
-- num = nextUniqueNumber++;
-- }
-- String proxyName = proxyPkg + proxyClassNamePrefix + num;
-- /*
-- * Verify that the class loader hasn't already
-- * defined a class with the chosen name.
-- */
--
-- /*
-- * Generate the specified proxy class.
-- */
-- byte[] proxyClassFile = ProxyGenerator.generateProxyClass(
-- proxyName, interfaces);
-- try {
-- proxyClass = defineClass0(loader, proxyName,
-- proxyClassFile, 0, proxyClassFile.length);
-- } catch (ClassFormatError e) {
-- /*
-- * A ClassFormatError here means that (barring bugs in the
-- * proxy class generation code) there was some other
-- * invalid aspect of the arguments supplied to the proxy
-- * class creation (such as virtual machine limitations
-- * exceeded).
-- */
-- throw new IllegalArgumentException(e.toString());
-- }
-- }
-- // add to set of all generated proxy classes, for isProxyClass
-- proxyClasses.put(proxyClass, null);
-+ /*
-+ * Choose a name for the proxy class to generate.
-+ */
-+ long num = nextUniqueNumber.getAndIncrement();
-+ String proxyName = proxyPkg + proxyClassNamePrefix + num;
-
-- } finally {
- /*
-- * We must clean up the "pending generation" state of the proxy
-- * class cache entry somehow. If a proxy class was successfully
-- * generated, store it in the cache (with a weak reference);
-- * otherwise, remove the reserved entry. In all cases, notify
-- * all waiters on reserved entries in this cache.
-+ * Generate the specified proxy class.
- */
-- synchronized (cache) {
-- if (proxyClass != null) {
-- cache.put(key, new WeakReference<Class<?>>(proxyClass));
-- } else {
-- cache.remove(key);
-- }
-- cache.notifyAll();
-+ byte[] proxyClassFile = ProxyGenerator.generateProxyClass(
-+ proxyName, interfaces);
-+ try {
-+ return defineClass0(loader, proxyName,
-+ proxyClassFile, 0, proxyClassFile.length);
-+ } catch (ClassFormatError e) {
-+ /*
-+ * A ClassFormatError here means that (barring bugs in the
-+ * proxy class generation code) there was some other
-+ * invalid aspect of the arguments supplied to the proxy
-+ * class creation (such as virtual machine limitations
-+ * exceeded).
-+ */
-+ throw new IllegalArgumentException(e.toString());
- }
- }
-- return proxyClass;
- }
-
- /**
-@@ -711,15 +726,16 @@
- throw new NullPointerException();
- }
-
-+ final Class<?>[] intfs = interfaces.clone();
- final SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
-- checkProxyAccess(Reflection.getCallerClass(), loader, interfaces);
-+ checkProxyAccess(Reflection.getCallerClass(), loader, intfs);
- }
-
- /*
- * Look up or generate the designated proxy class.
- */
-- Class<?> cl = getProxyClass0(loader, interfaces);
-+ Class<?> cl = getProxyClass0(loader, intfs);
-
- /*
- * Invoke its constructor with the designated invocation handler.
-@@ -773,11 +789,7 @@
- * @throws NullPointerException if {@code cl} is {@code null}
- */
- public static boolean isProxyClass(Class<?> cl) {
-- if (cl == null) {
-- throw new NullPointerException();
-- }
--
-- return proxyClasses.containsKey(cl);
-+ return Proxy.class.isAssignableFrom(cl) && proxyClassCache.containsValue(cl);
- }
-
- /**
-@@ -788,6 +800,7 @@
- * @throws IllegalArgumentException if the argument is not a
- * proxy instance
- */
-+ @CallerSensitive
- public static InvocationHandler getInvocationHandler(Object proxy)
- throws IllegalArgumentException
- {
-@@ -798,8 +811,19 @@
- throw new IllegalArgumentException("not a proxy instance");
- }
-
-- Proxy p = (Proxy) proxy;
-- return p.h;
-+ final Proxy p = (Proxy) proxy;
-+ final InvocationHandler ih = p.h;
-+ if (System.getSecurityManager() != null) {
-+ Class<?> ihClass = ih.getClass();
-+ Class<?> caller = Reflection.getCallerClass();
-+ if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(),
-+ ihClass.getClassLoader()))
-+ {
-+ ReflectUtil.checkPackageAccess(ihClass);
-+ }
-+ }
-+
-+ return ih;
- }
-
- private static native Class defineClass0(ClassLoader loader, String name,
---- ./jdk/src/share/classes/java/lang/reflect/WeakCache.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/classes/java/lang/reflect/WeakCache.java 2014-07-15 21:49:33.000000000 -0700
-@@ -0,0 +1,393 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+package java.lang.reflect;
-+
-+import java.lang.ref.ReferenceQueue;
-+import java.lang.ref.WeakReference;
-+import java.util.Objects;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentMap;
-+
-+/**
-+ * Cache mapping pairs of {@code (key, sub-key) -> value}. Keys and values are
-+ * weakly but sub-keys are strongly referenced. Keys are passed directly to
-+ * {@link #get} method which also takes a {@code parameter}. Sub-keys are
-+ * calculated from keys and parameters using the {@code subKeyFactory} function
-+ * passed to the constructor. Values are calculated from keys and parameters
-+ * using the {@code valueFactory} function passed to the constructor.
-+ * Keys can be {@code null} and are compared by identity while sub-keys returned by
-+ * {@code subKeyFactory} or values returned by {@code valueFactory}
-+ * can not be null. Sub-keys are compared using their {@link #equals} method.
-+ * Entries are expunged from cache lazily on each invocation to {@link #get},
-+ * {@link #containsValue} or {@link #size} methods when the WeakReferences to
-+ * keys are cleared. Cleared WeakReferences to individual values don't cause
-+ * expunging, but such entries are logically treated as non-existent and
-+ * trigger re-evaluation of {@code valueFactory} on request for their
-+ * key/subKey.
-+ *
-+ * @author Peter Levart
-+ * @param <K> type of keys
-+ * @param <P> type of parameters
-+ * @param <V> type of values
-+ */
-+final class WeakCache<K, P, V> {
-+
-+ interface BiFunction<T, U, R> {
-+
-+ /**
-+ * Applies this function to the given arguments.
-+ *
-+ * @param t the first function argument
-+ * @param u the second function argument
-+ * @return the function result
-+ */
-+ R apply(T t, U u);
-+ }
-+
-+ interface Supplier<T> {
-+ T get();
-+ }
-+
-+ private final ReferenceQueue<K> refQueue
-+ = new ReferenceQueue<>();
-+ // the key type is Object for supporting null key
-+ private final ConcurrentMap<Object, ConcurrentMap<Object, Supplier<V>>> map
-+ = new ConcurrentHashMap<>();
-+ private final ConcurrentMap<Supplier<V>, Boolean> reverseMap
-+ = new ConcurrentHashMap<>();
-+ private final BiFunction<K, P, ?> subKeyFactory;
-+ private final BiFunction<K, P, V> valueFactory;
-+
-+ /**
-+ * Construct an instance of {@code WeakCache}
-+ *
-+ * @param subKeyFactory a function mapping a pair of
-+ * {@code (key, parameter) -> sub-key}
-+ * @param valueFactory a function mapping a pair of
-+ * {@code (key, parameter) -> value}
-+ * @throws NullPointerException if {@code subKeyFactory} or
-+ * {@code valueFactory} is null.
-+ */
-+ public WeakCache(BiFunction<K, P, ?> subKeyFactory,
-+ BiFunction<K, P, V> valueFactory) {
-+ this.subKeyFactory = Objects.requireNonNull(subKeyFactory);
-+ this.valueFactory = Objects.requireNonNull(valueFactory);
-+ }
-+
-+ /**
-+ * Look-up the value through the cache. This always evaluates the
-+ * {@code subKeyFactory} function and optionally evaluates
-+ * {@code valueFactory} function if there is no entry in the cache for given
-+ * pair of (key, subKey) or the entry has already been cleared.
-+ *
-+ * @param key possibly null key
-+ * @param parameter parameter used together with key to create sub-key and
-+ * value (should not be null)
-+ * @return the cached value (never null)
-+ * @throws NullPointerException if {@code parameter} passed in or
-+ * {@code sub-key} calculated by
-+ * {@code subKeyFactory} or {@code value}
-+ * calculated by {@code valueFactory} is null.
-+ */
-+ public V get(K key, P parameter) {
-+ Objects.requireNonNull(parameter);
-+
-+ expungeStaleEntries();
-+
-+ Object cacheKey = CacheKey.valueOf(key, refQueue);
-+
-+ // lazily install the 2nd level valuesMap for the particular cacheKey
-+ ConcurrentMap<Object, Supplier<V>> valuesMap = map.get(cacheKey);
-+ if (valuesMap == null) {
-+ ConcurrentMap<Object, Supplier<V>> oldValuesMap
-+ = map.putIfAbsent(cacheKey,
-+ valuesMap = new ConcurrentHashMap<>());
-+ if (oldValuesMap != null) {
-+ valuesMap = oldValuesMap;
-+ }
-+ }
-+
-+ // create subKey and retrieve the possible Supplier<V> stored by that
-+ // subKey from valuesMap
-+ Object subKey = Objects.requireNonNull(subKeyFactory.apply(key, parameter));
-+ Supplier<V> supplier = valuesMap.get(subKey);
-+ Factory factory = null;
-+
-+ while (true) {
-+ if (supplier != null) {
-+ // supplier might be a Factory or a CacheValue<V> instance
-+ V value = supplier.get();
-+ if (value != null) {
-+ return value;
-+ }
-+ }
-+ // else no supplier in cache
-+ // or a supplier that returned null (could be a cleared CacheValue
-+ // or a Factory that wasn't successful in installing the CacheValue)
-+
-+ // lazily construct a Factory
-+ if (factory == null) {
-+ factory = new Factory(key, parameter, subKey, valuesMap);
-+ }
-+
-+ if (supplier == null) {
-+ supplier = valuesMap.putIfAbsent(subKey, factory);
-+ if (supplier == null) {
-+ // successfully installed Factory
-+ supplier = factory;
-+ }
-+ // else retry with winning supplier
-+ } else {
-+ if (valuesMap.replace(subKey, supplier, factory)) {
-+ // successfully replaced
-+ // cleared CacheEntry / unsuccessful Factory
-+ // with our Factory
-+ supplier = factory;
-+ } else {
-+ // retry with current supplier
-+ supplier = valuesMap.get(subKey);
-+ }
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Checks whether the specified non-null value is already present in this
-+ * {@code WeakCache}. The check is made using identity comparison regardless
-+ * of whether value's class overrides {@link Object#equals} or not.
-+ *
-+ * @param value the non-null value to check
-+ * @return true if given {@code value} is already cached
-+ * @throws NullPointerException if value is null
-+ */
-+ public boolean containsValue(V value) {
-+ Objects.requireNonNull(value);
-+
-+ expungeStaleEntries();
-+ return reverseMap.containsKey(new LookupValue<>(value));
-+ }
-+
-+ /**
-+ * Returns the current number of cached entries that
-+ * can decrease over time when keys/values are GC-ed.
-+ */
-+ public int size() {
-+ expungeStaleEntries();
-+ return reverseMap.size();
-+ }
-+
-+ private void expungeStaleEntries() {
-+ CacheKey<K> cacheKey;
-+ while ((cacheKey = (CacheKey<K>)refQueue.poll()) != null) {
-+ cacheKey.expungeFrom(map, reverseMap);
-+ }
-+ }
-+
-+ /**
-+ * A factory {@link Supplier} that implements the lazy synchronized
-+ * construction of the value and installment of it into the cache.
-+ */
-+ private final class Factory implements Supplier<V> {
-+
-+ private final K key;
-+ private final P parameter;
-+ private final Object subKey;
-+ private final ConcurrentMap<Object, Supplier<V>> valuesMap;
-+
-+ Factory(K key, P parameter, Object subKey,
-+ ConcurrentMap<Object, Supplier<V>> valuesMap) {
-+ this.key = key;
-+ this.parameter = parameter;
-+ this.subKey = subKey;
-+ this.valuesMap = valuesMap;
-+ }
-+
-+ @Override
-+ public synchronized V get() { // serialize access
-+ // re-check
-+ Supplier<V> supplier = valuesMap.get(subKey);
-+ if (supplier != this) {
-+ // something changed while we were waiting:
-+ // might be that we were replaced by a CacheValue
-+ // or were removed because of failure ->
-+ // return null to signal WeakCache.get() to retry
-+ // the loop
-+ return null;
-+ }
-+ // else still us (supplier == this)
-+
-+ // create new value
-+ V value = null;
-+ try {
-+ value = Objects.requireNonNull(valueFactory.apply(key, parameter));
-+ } finally {
-+ if (value == null) { // remove us on failure
-+ valuesMap.remove(subKey, this);
-+ }
-+ }
-+ // the only path to reach here is with non-null value
-+ assert value != null;
-+
-+ // wrap value with CacheValue (WeakReference)
-+ CacheValue<V> cacheValue = new CacheValue<>(value);
-+
-+ // try replacing us with CacheValue (this should always succeed)
-+ if (valuesMap.replace(subKey, this, cacheValue)) {
-+ // put also in reverseMap
-+ reverseMap.put(cacheValue, Boolean.TRUE);
-+ } else {
-+ throw new AssertionError("Should not reach here");
-+ }
-+
-+ // successfully replaced us with new CacheValue -> return the value
-+ // wrapped by it
-+ return value;
-+ }
-+ }
-+
-+ /**
-+ * Common type of value suppliers that are holding a referent.
-+ * The {@link #equals} and {@link #hashCode} of implementations is defined
-+ * to compare the referent by identity.
-+ */
-+ private interface Value<V> extends Supplier<V> {}
-+
-+ /**
-+ * An optimized {@link Value} used to look-up the value in
-+ * {@link WeakCache#containsValue} method so that we are not
-+ * constructing the whole {@link CacheValue} just to look-up the referent.
-+ */
-+ private static final class LookupValue<V> implements Value<V> {
-+ private final V value;
-+
-+ LookupValue(V value) {
-+ this.value = value;
-+ }
-+
-+ @Override
-+ public V get() {
-+ return value;
-+ }
-+
-+ @Override
-+ public int hashCode() {
-+ return System.identityHashCode(value); // compare by identity
-+ }
-+
-+ @Override
-+ public boolean equals(Object obj) {
-+ return obj == this ||
-+ obj instanceof Value &&
-+ this.value == ((Value<?>) obj).get(); // compare by identity
-+ }
-+ }
-+
-+ /**
-+ * A {@link Value} that weakly references the referent.
-+ */
-+ private static final class CacheValue<V>
-+ extends WeakReference<V> implements Value<V>
-+ {
-+ private final int hash;
-+
-+ CacheValue(V value) {
-+ super(value);
-+ this.hash = System.identityHashCode(value); // compare by identity
-+ }
-+
-+ @Override
-+ public int hashCode() {
-+ return hash;
-+ }
-+
-+ @Override
-+ public boolean equals(Object obj) {
-+ V value;
-+ return obj == this ||
-+ obj instanceof Value &&
-+ // cleared CacheValue is only equal to itself
-+ (value = get()) != null &&
-+ value == ((Value<?>) obj).get(); // compare by identity
-+ }
-+ }
-+
-+ /**
-+ * CacheKey containing a weakly referenced {@code key}. It registers
-+ * itself with the {@code refQueue} so that it can be used to expunge
-+ * the entry when the {@link WeakReference} is cleared.
-+ */
-+ private static final class CacheKey<K> extends WeakReference<K> {
-+
-+ // a replacement for null keys
-+ private static final Object NULL_KEY = new Object();
-+
-+ static <K> Object valueOf(K key, ReferenceQueue<K> refQueue) {
-+ return key == null
-+ // null key means we can't weakly reference it,
-+ // so we use a NULL_KEY singleton as cache key
-+ ? NULL_KEY
-+ // non-null key requires wrapping with a WeakReference
-+ : new CacheKey<>(key, refQueue);
-+ }
-+
-+ private final int hash;
-+
-+ private CacheKey(K key, ReferenceQueue<K> refQueue) {
-+ super(key, refQueue);
-+ this.hash = System.identityHashCode(key); // compare by identity
-+ }
-+
-+ @Override
-+ public int hashCode() {
-+ return hash;
-+ }
-+
-+ @Override
-+ public boolean equals(Object obj) {
-+ K key;
-+ return obj == this ||
-+ obj != null &&
-+ obj.getClass() == this.getClass() &&
-+ // cleared CacheKey is only equal to itself
-+ (key = this.get()) != null &&
-+ // compare key by identity
-+ key == ((CacheKey<K>) obj).get();
-+ }
-+
-+ void expungeFrom(ConcurrentMap<?, ? extends ConcurrentMap<?, ?>> map,
-+ ConcurrentMap<?, Boolean> reverseMap) {
-+ // removing just by key is always safe here because after a CacheKey
-+ // is cleared and enqueue-ed it is only equal to itself
-+ // (see equals method)...
-+ ConcurrentMap<?, ?> valuesMap = map.remove(this);
-+ // remove also from reverseMap if needed
-+ if (valuesMap != null) {
-+ for (Object cacheValue : valuesMap.values()) {
-+ reverseMap.remove(cacheValue);
-+ }
-+ }
-+ }
-+ }
-+}
---- ./jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2013-09-06 11:28:11.000000000 -0700
-+++ ./jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2014-10-28 20:19:47.000000000 -0700
-@@ -70,6 +70,7 @@
- static {
- java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("net"));
-+ init();
- }
-
- /**
-@@ -362,4 +363,7 @@
- protected boolean nativeConnectDisabled() {
- return connectDisabled;
- }
-+
-+ native int dataAvailable();
-+ private static native void init();
- }
---- ./jdk/src/share/classes/java/net/DatagramSocket.java 2013-09-06 11:28:11.000000000 -0700
-+++ ./jdk/src/share/classes/java/net/DatagramSocket.java 2014-10-28 20:19:47.000000000 -0700
-@@ -85,6 +85,17 @@
- */
- boolean oldImpl = false;
-
-+ /**
-+ * Set when a socket is ST_CONNECTED until we are certain
-+ * that any packets which might have been received prior
-+ * to calling connect() but not read by the application
-+ * have been read. During this time we check the source
-+ * address of all packets received to be sure they are from
-+ * the connected destination. Other packets are read but
-+ * silently dropped.
-+ */
-+ private boolean explicitFilter = false;
-+ private int bytesLeftToFilter;
- /*
- * Connection state:
- * ST_NOT_CONNECTED = socket not connected
-@@ -144,6 +155,15 @@
-
- // socket is now connected by the impl
- connectState = ST_CONNECTED;
-+ // Do we need to filter some packets?
-+ int avail = getImpl().dataAvailable();
-+ if (avail == -1) {
-+ throw new SocketException();
-+ }
-+ explicitFilter = avail > 0;
-+ if (explicitFilter) {
-+ bytesLeftToFilter = getReceiveBufferSize();
-+ }
- } catch (SocketException se) {
-
- // connection will be emulated by DatagramSocket
-@@ -494,6 +514,7 @@
- connectedAddress = null;
- connectedPort = -1;
- connectState = ST_NOT_CONNECTED;
-+ explicitFilter = false;
- }
- }
-
-@@ -752,10 +773,13 @@
- } // end of while
- }
- }
-- if (connectState == ST_CONNECTED_NO_IMPL) {
-+ DatagramPacket tmp = null;
-+ if ((connectState == ST_CONNECTED_NO_IMPL) || explicitFilter) {
- // We have to do the filtering the old fashioned way since
- // the native impl doesn't support connect or the connect
-- // via the impl failed.
-+ // via the impl failed, or .. "explicitFilter" may be set when
-+ // a socket is connected via the impl, for a period of time
-+ // when packets from other sources might be queued on socket.
- boolean stop = false;
- while (!stop) {
- InetAddress peekAddress = null;
-@@ -774,8 +798,14 @@
- if ((!connectedAddress.equals(peekAddress)) ||
- (connectedPort != peekPort)) {
- // throw the packet away and silently continue
-- DatagramPacket tmp = new DatagramPacket(new byte[1], 1);
-+ tmp = new DatagramPacket(
-+ new byte[1024], 1024);
- getImpl().receive(tmp);
-+ if (explicitFilter) {
-+ if (checkFiltering(tmp)) {
-+ stop = true;
-+ }
-+ }
- } else {
- stop = true;
- }
-@@ -784,7 +814,21 @@
- // If the security check succeeds, or the datagram is
- // connected then receive the packet
- getImpl().receive(p);
-+ if (explicitFilter && tmp == null) {
-+ // packet was not filtered, account for it here
-+ checkFiltering(p);
-+ }
-+ }
-+ }
-+
-+ // Update the filter information and return true if finished
-+ private boolean checkFiltering(DatagramPacket p) throws SocketException {
-+ bytesLeftToFilter -= p.getLength();
-+ if (bytesLeftToFilter <= 0 || getImpl().dataAvailable() <= 0) {
-+ explicitFilter = false;
-+ return true;
- }
-+ return false;
- }
-
- /**
---- ./jdk/src/share/classes/java/net/DatagramSocketImpl.java 2013-09-06 11:28:11.000000000 -0700
-+++ ./jdk/src/share/classes/java/net/DatagramSocketImpl.java 2014-10-28 20:19:47.000000000 -0700
-@@ -47,6 +47,12 @@
- */
- protected FileDescriptor fd;
-
-+ int dataAvailable() {
-+ // default impl returns zero, which disables the calling
-+ // functionality
-+ return 0;
-+ }
-+
- /**
- * Creates a datagram socket.
- * @exception SocketException if there is an error in the
---- ./jdk/src/share/classes/java/net/IDN.java 2013-09-06 11:28:11.000000000 -0700
-+++ ./jdk/src/share/classes/java/net/IDN.java 2014-07-15 21:49:33.000000000 -0700
-@@ -271,13 +271,17 @@
- if (useSTD3ASCIIRules) {
- for (int i = 0; i < dest.length(); i++) {
- int c = dest.charAt(i);
-- if (!isLDHChar(c)) {
-- throw new IllegalArgumentException("Contains non-LDH characters");
-+ if (isNonLDHAsciiCodePoint(c)) {
-+ throw new IllegalArgumentException(
-+ "Contains non-LDH ASCII characters");
- }
- }
-
-- if (dest.charAt(0) == '-' || dest.charAt(dest.length() - 1) == '-') {
-- throw new IllegalArgumentException("Has leading or trailing hyphen");
-+ if (dest.charAt(0) == '-' ||
-+ dest.charAt(dest.length() - 1) == '-') {
-+
-+ throw new IllegalArgumentException(
-+ "Has leading or trailing hyphen");
- }
- }
-
-@@ -380,26 +384,20 @@
- //
- // LDH stands for "letter/digit/hyphen", with characters restricted to the
- // 26-letter Latin alphabet <A-Z a-z>, the digits <0-9>, and the hyphen
-- // <->
-- // non-LDH = 0..0x2C, 0x2E..0x2F, 0x3A..0x40, 0x56..0x60, 0x7B..0x7F
-- //
-- private static boolean isLDHChar(int ch){
-- // high runner case
-- if(ch > 0x007A){
-- return false;
-- }
-- //['-' '0'..'9' 'A'..'Z' 'a'..'z']
-- if((ch == 0x002D) ||
-- (0x0030 <= ch && ch <= 0x0039) ||
-- (0x0041 <= ch && ch <= 0x005A) ||
-- (0x0061 <= ch && ch <= 0x007A)
-- ){
-- return true;
-- }
-- return false;
-+ // <->.
-+ // Non LDH refers to characters in the ASCII range, but which are not
-+ // letters, digits or the hypen.
-+ //
-+ // non-LDH = 0..0x2C, 0x2E..0x2F, 0x3A..0x40, 0x5B..0x60, 0x7B..0x7F
-+ //
-+ private static boolean isNonLDHAsciiCodePoint(int ch){
-+ return (0x0000 <= ch && ch <= 0x002C) ||
-+ (0x002E <= ch && ch <= 0x002F) ||
-+ (0x003A <= ch && ch <= 0x0040) ||
-+ (0x005B <= ch && ch <= 0x0060) ||
-+ (0x007B <= ch && ch <= 0x007F);
- }
-
--
- //
- // search dots in a string and return the index of that character;
- // or if there is no dots, return the length of input string
---- ./jdk/src/share/classes/java/net/Inet6Address.java 2013-09-06 11:28:11.000000000 -0700
-+++ ./jdk/src/share/classes/java/net/Inet6Address.java 2014-07-15 21:49:33.000000000 -0700
-@@ -26,6 +26,8 @@
- package java.net;
-
- import java.io.ObjectInputStream;
-+import java.io.ObjectOutputStream;
-+import java.io.ObjectStreamField;
- import java.io.IOException;
- import java.io.InvalidObjectException;
- import java.util.Enumeration;
-@@ -171,36 +173,196 @@
- */
- private transient int cached_scope_id = 0;
-
-- /**
-- * Holds a 128-bit (16 bytes) IPv6 address.
-- *
-- * @serial
-- */
-- byte[] ipaddress;
-+ private class Inet6AddressHolder {
-
-- /**
-- * scope_id. The scope specified when the object is created. If the object is created
-- * with an interface name, then the scope_id is not determined until the time it is needed.
-- */
-- private int scope_id = 0;
-+ private Inet6AddressHolder() {
-+ ipaddress = new byte[INADDRSZ];
-+ }
-
-- /**
-- * This will be set to true when the scope_id field contains a valid
-- * integer scope_id.
-- */
-- private boolean scope_id_set = false;
-+ private Inet6AddressHolder(
-+ byte[] ipaddress, int scope_id, boolean scope_id_set,
-+ NetworkInterface ifname, boolean scope_ifname_set)
-+ {
-+ this.ipaddress = ipaddress;
-+ this.scope_id = scope_id;
-+ this.scope_id_set = scope_id_set;
-+ this.scope_ifname_set = scope_ifname_set;
-+ this.scope_ifname = ifname;
-+ }
-+
-+ /**
-+ * Holds a 128-bit (16 bytes) IPv6 address.
-+ */
-+ byte[] ipaddress;
-+
-+ /**
-+ * scope_id. The scope specified when the object is created. If the object is created
-+ * with an interface name, then the scope_id is not determined until the time it is needed.
-+ */
-+ int scope_id = 0;
-+
-+ /**
-+ * This will be set to true when the scope_id field contains a valid
-+ * integer scope_id.
-+ */
-+ boolean scope_id_set = false;
-+
-+ /**
-+ * scoped interface. scope_id is derived from this as the scope_id of the first
-+ * address whose scope is the same as this address for the named interface.
-+ */
-+ NetworkInterface scope_ifname = null;
-+
-+ /**
-+ * set if the object is constructed with a scoped interface instead of a
-+ * numeric scope id.
-+ */
-+ boolean scope_ifname_set = false;
-+
-+ void setAddr(byte addr[]) {
-+ if (addr.length == INADDRSZ) { // normal IPv6 address
-+ System.arraycopy(addr, 0, ipaddress, 0, INADDRSZ);
-+ }
-+ }
-
-- /**
-- * scoped interface. scope_id is derived from this as the scope_id of the first
-- * address whose scope is the same as this address for the named interface.
-- */
-- private transient NetworkInterface scope_ifname = null;
-+ void init(byte addr[], int scope_id) {
-+ setAddr(addr);
-
-- /**
-- * set if the object is constructed with a scoped interface instead of a
-- * numeric scope id.
-- */
-- private boolean scope_ifname_set = false;
-+ if (scope_id >= 0) {
-+ this.scope_id = scope_id;
-+ this.scope_id_set = true;
-+ }
-+ }
-+
-+ void init(byte addr[], NetworkInterface nif)
-+ throws UnknownHostException
-+ {
-+ setAddr(addr);
-+
-+ if (nif != null) {
-+ this.scope_id = deriveNumericScope(ipaddress, nif);
-+ this.scope_id_set = true;
-+ this.scope_ifname = nif;
-+ this.scope_ifname_set = true;
-+ }
-+ }
-+
-+ String getHostAddress() {
-+ String s = numericToTextFormat(ipaddress);
-+ if (scope_ifname_set) { /* must check this first */
-+ s = s + "%" + scope_ifname.getName();
-+ } else if (scope_id_set) {
-+ s = s + "%" + scope_id;
-+ }
-+ return s;
-+ }
-+
-+ public boolean equals(Object o) {
-+ if (! (o instanceof Inet6AddressHolder)) {
-+ return false;
-+ }
-+ Inet6AddressHolder that = (Inet6AddressHolder)o;
-+
-+ for (int i = 0; i < INADDRSZ; i++) {
-+ if (this.ipaddress[i] != that.ipaddress[i])
-+ return false;
-+ }
-+
-+ return true;
-+ }
-+
-+ public int hashCode() {
-+ if (ipaddress != null) {
-+
-+ int hash = 0;
-+ int i=0;
-+ while (i<INADDRSZ) {
-+ int j=0;
-+ int component=0;
-+ while (j<4 && i<INADDRSZ) {
-+ component = (component << 8) + ipaddress[i];
-+ j++;
-+ i++;
-+ }
-+ hash += component;
-+ }
-+ return hash;
-+
-+ } else {
-+ return 0;
-+ }
-+ }
-+
-+ boolean isIPv4CompatibleAddress() {
-+ if ((ipaddress[0] == 0x00) && (ipaddress[1] == 0x00) &&
-+ (ipaddress[2] == 0x00) && (ipaddress[3] == 0x00) &&
-+ (ipaddress[4] == 0x00) && (ipaddress[5] == 0x00) &&
-+ (ipaddress[6] == 0x00) && (ipaddress[7] == 0x00) &&
-+ (ipaddress[8] == 0x00) && (ipaddress[9] == 0x00) &&
-+ (ipaddress[10] == 0x00) && (ipaddress[11] == 0x00)) {
-+ return true;
-+ }
-+ return false;
-+ }
-+
-+ boolean isMulticastAddress() {
-+ return ((ipaddress[0] & 0xff) == 0xff);
-+ }
-+
-+ boolean isAnyLocalAddress() {
-+ byte test = 0x00;
-+ for (int i = 0; i < INADDRSZ; i++) {
-+ test |= ipaddress[i];
-+ }
-+ return (test == 0x00);
-+ }
-+
-+ boolean isLoopbackAddress() {
-+ byte test = 0x00;
-+ for (int i = 0; i < 15; i++) {
-+ test |= ipaddress[i];
-+ }
-+ return (test == 0x00) && (ipaddress[15] == 0x01);
-+ }
-+
-+ boolean isLinkLocalAddress() {
-+ return ((ipaddress[0] & 0xff) == 0xfe
-+ && (ipaddress[1] & 0xc0) == 0x80);
-+ }
-+
-+
-+ boolean isSiteLocalAddress() {
-+ return ((ipaddress[0] & 0xff) == 0xfe
-+ && (ipaddress[1] & 0xc0) == 0xc0);
-+ }
-+
-+ boolean isMCGlobal() {
-+ return ((ipaddress[0] & 0xff) == 0xff
-+ && (ipaddress[1] & 0x0f) == 0x0e);
-+ }
-+
-+ boolean isMCNodeLocal() {
-+ return ((ipaddress[0] & 0xff) == 0xff
-+ && (ipaddress[1] & 0x0f) == 0x01);
-+ }
-+
-+ boolean isMCLinkLocal() {
-+ return ((ipaddress[0] & 0xff) == 0xff
-+ && (ipaddress[1] & 0x0f) == 0x02);
-+ }
-+
-+ boolean isMCSiteLocal() {
-+ return ((ipaddress[0] & 0xff) == 0xff
-+ && (ipaddress[1] & 0x0f) == 0x05);
-+ }
-+
-+ boolean isMCOrgLocal() {
-+ return ((ipaddress[0] & 0xff) == 0xff
-+ && (ipaddress[1] & 0x0f) == 0x08);
-+ }
-+ }
-+
-+ private final transient Inet6AddressHolder holder6;
-
- private static final long serialVersionUID = 6880410070516793377L;
-
-@@ -213,37 +375,33 @@
-
- Inet6Address() {
- super();
-- holder().hostName = null;
-- ipaddress = new byte[INADDRSZ];
-- holder().family = IPv6;
-+ holder.init(null, IPv6);
-+ holder6 = new Inet6AddressHolder();
- }
-
- /* checking of value for scope_id should be done by caller
- * scope_id must be >= 0, or -1 to indicate not being set
- */
- Inet6Address(String hostName, byte addr[], int scope_id) {
-- holder().hostName = hostName;
-- if (addr.length == INADDRSZ) { // normal IPv6 address
-- holder().family = IPv6;
-- ipaddress = addr.clone();
-- }
-- if (scope_id >= 0) {
-- this.scope_id = scope_id;
-- scope_id_set = true;
-- }
-+ holder.init(hostName, IPv6);
-+ holder6 = new Inet6AddressHolder();
-+ holder6.init(addr, scope_id);
- }
-
- Inet6Address(String hostName, byte addr[]) {
-+ holder6 = new Inet6AddressHolder();
- try {
- initif (hostName, addr, null);
- } catch (UnknownHostException e) {} /* cant happen if ifname is null */
- }
-
- Inet6Address (String hostName, byte addr[], NetworkInterface nif) throws UnknownHostException {
-+ holder6 = new Inet6AddressHolder();
- initif (hostName, addr, nif);
- }
-
- Inet6Address (String hostName, byte addr[], String ifname) throws UnknownHostException {
-+ holder6 = new Inet6AddressHolder();
- initstr (hostName, addr, ifname);
- }
-
-@@ -325,17 +483,13 @@
- }
-
- private void initif(String hostName, byte addr[],NetworkInterface nif) throws UnknownHostException {
-- holder().hostName = hostName;
-+ int family = -1;
-+ holder6.init(addr, nif);
-+
- if (addr.length == INADDRSZ) { // normal IPv6 address
-- holder().family = IPv6;
-- ipaddress = addr.clone();
-- }
-- if (nif != null) {
-- this.scope_ifname = nif;
-- scope_ifname_set = true;
-- scope_id = deriveNumericScope (nif);
-- scope_id_set = true;
-+ family = IPv6;
- }
-+ holder.init(hostName, family);
- }
-
- /* check the two Ipv6 addresses and return false if they are both
-@@ -343,18 +497,21 @@
- * (ie. one is sitelocal and the other linklocal)
- * return true otherwise.
- */
-- private boolean differentLocalAddressTypes(Inet6Address other) {
-+ private static boolean differentLocalAddressTypes(
-+ byte[] thisAddr, byte[] otherAddr) {
-
-- if (isLinkLocalAddress() && !other.isLinkLocalAddress()) {
-+ if (Inet6Address.isLinkLocalAddress(thisAddr) &&
-+ !Inet6Address.isLinkLocalAddress(otherAddr)) {
- return false;
- }
-- if (isSiteLocalAddress() && !other.isSiteLocalAddress()) {
-+ if (Inet6Address.isSiteLocalAddress(thisAddr) &&
-+ !Inet6Address.isSiteLocalAddress(otherAddr)) {
- return false;
- }
- return true;
- }
-
-- private int deriveNumericScope (NetworkInterface ifc) throws UnknownHostException {
-+ private static int deriveNumericScope (byte[] thisAddr, NetworkInterface ifc) throws UnknownHostException {
- Enumeration<InetAddress> addresses = ifc.getInetAddresses();
- while (addresses.hasMoreElements()) {
- InetAddress addr = addresses.nextElement();
-@@ -363,12 +520,12 @@
- }
- Inet6Address ia6_addr = (Inet6Address)addr;
- /* check if site or link local prefixes match */
-- if (!differentLocalAddressTypes(ia6_addr)){
-+ if (!differentLocalAddressTypes(thisAddr, ia6_addr.getAddress())){
- /* type not the same, so carry on searching */
- continue;
- }
- /* found a matching address - return its scope_id */
-- return ia6_addr.scope_id;
-+ return ia6_addr.getScopeId();
- }
- throw new UnknownHostException ("no scope_id found");
- }
-@@ -383,41 +540,61 @@
- while (en.hasMoreElements()) {
- NetworkInterface ifc = en.nextElement();
- if (ifc.getName().equals (ifname)) {
-- Enumeration addresses = ifc.getInetAddresses();
-- while (addresses.hasMoreElements()) {
-- InetAddress addr = (InetAddress)addresses.nextElement();
-- if (!(addr instanceof Inet6Address)) {
-- continue;
-- }
-- Inet6Address ia6_addr = (Inet6Address)addr;
-- /* check if site or link local prefixes match */
-- if (!differentLocalAddressTypes(ia6_addr)){
-- /* type not the same, so carry on searching */
-- continue;
-- }
-- /* found a matching address - return its scope_id */
-- return ia6_addr.scope_id;
-- }
-+ return deriveNumericScope(holder6.ipaddress, ifc);
- }
- }
- throw new UnknownHostException ("No matching address found for interface : " +ifname);
- }
-
- /**
-+ * @serialField ipaddress byte[]
-+ * @serialField scope_id int
-+ * @serialField scope_id_set boolean
-+ * @serialField scope_ifname_set boolean
-+ * @serialField ifname String
-+ */
-+
-+ private static final ObjectStreamField[] serialPersistentFields = {
-+ new ObjectStreamField("ipaddress", byte[].class),
-+ new ObjectStreamField("scope_id", int.class),
-+ new ObjectStreamField("scope_id_set", boolean.class),
-+ new ObjectStreamField("scope_ifname_set", boolean.class),
-+ new ObjectStreamField("ifname", String.class)
-+ };
-+
-+ private static final long FIELDS_OFFSET;
-+ private static final sun.misc.Unsafe UNSAFE;
-+
-+ static {
-+ try {
-+ sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
-+ FIELDS_OFFSET = unsafe.objectFieldOffset(
-+ Inet6Address.class.getDeclaredField("holder6"));
-+ UNSAFE = unsafe;
-+ } catch (ReflectiveOperationException e) {
-+ throw new Error(e);
-+ }
-+ }
-+
-+ /**
- * restore the state of this object from stream
- * including the scope information, only if the
- * scoped interface name is valid on this system
- */
- private void readObject(ObjectInputStream s)
- throws IOException, ClassNotFoundException {
-- scope_ifname = null;
-- scope_ifname_set = false;
-+ NetworkInterface scope_ifname = null;
-
- if (getClass().getClassLoader() != null) {
- throw new SecurityException ("invalid address type");
- }
-
-- s.defaultReadObject();
-+ ObjectInputStream.GetField gf = s.readFields();
-+ byte[] ipaddress = (byte[])gf.get("ipaddress", null);
-+ int scope_id = (int)gf.get("scope_id", -1);
-+ boolean scope_id_set = (boolean)gf.get("scope_id_set", false);
-+ boolean scope_ifname_set = (boolean)gf.get("scope_ifname_set", false);
-+ String ifname = (String)gf.get("ifname", null);
-
- if (ifname != null && !"".equals (ifname)) {
- try {
-@@ -430,7 +607,7 @@
- scope_id = 0;
- } else {
- try {
-- scope_id = deriveNumericScope (scope_ifname);
-+ scope_id = deriveNumericScope (ipaddress, scope_ifname);
- } catch (UnknownHostException e) {
- // typically should not happen, but it may be that
- // the machine being used for deserialization has
-@@ -438,8 +615,8 @@
- }
- }
- } catch (SocketException e) {}
--
- }
-+
- /* if ifname was not supplied, then the numeric info is used */
-
- ipaddress = ipaddress.clone();
-@@ -450,9 +627,37 @@
- ipaddress.length);
- }
-
-- if (holder().getFamily() != IPv6) {
-+ if (holder.getFamily() != IPv6) {
- throw new InvalidObjectException("invalid address family type");
- }
-+
-+ Inet6AddressHolder h = new Inet6AddressHolder(
-+ ipaddress, scope_id, scope_id_set, scope_ifname, scope_ifname_set
-+ );
-+
-+ UNSAFE.putObject(this, FIELDS_OFFSET, h);
-+ }
-+
-+ /**
-+ * default behavior is overridden in order to write the
-+ * scope_ifname field as a String, rather than a NetworkInterface
-+ * which is not serializable
-+ */
-+ private synchronized void writeObject(ObjectOutputStream s)
-+ throws IOException
-+ {
-+ String ifname = null;
-+
-+ if (holder6.scope_ifname_set) {
-+ ifname = holder6.scope_ifname.getName();
-+ }
-+ ObjectOutputStream.PutField pfields = s.putFields();
-+ pfields.put("ipaddress", holder6.ipaddress);
-+ pfields.put("scope_id", holder6.scope_id);
-+ pfields.put("scope_id_set", holder6.scope_id_set);
-+ pfields.put("scope_ifname_set", holder6.scope_ifname_set);
-+ pfields.put("ifname", ifname);
-+ s.writeFields();
- }
-
- /**
-@@ -466,7 +671,7 @@
- */
- @Override
- public boolean isMulticastAddress() {
-- return ((ipaddress[0] & 0xff) == 0xff);
-+ return holder6.isMulticastAddress();
- }
-
- /**
-@@ -477,11 +682,7 @@
- */
- @Override
- public boolean isAnyLocalAddress() {
-- byte test = 0x00;
-- for (int i = 0; i < INADDRSZ; i++) {
-- test |= ipaddress[i];
-- }
-- return (test == 0x00);
-+ return holder6.isAnyLocalAddress();
- }
-
- /**
-@@ -493,11 +694,7 @@
- */
- @Override
- public boolean isLoopbackAddress() {
-- byte test = 0x00;
-- for (int i = 0; i < 15; i++) {
-- test |= ipaddress[i];
-- }
-- return (test == 0x00) && (ipaddress[15] == 0x01);
-+ return holder6.isLoopbackAddress();
- }
-
- /**
-@@ -509,6 +706,11 @@
- */
- @Override
- public boolean isLinkLocalAddress() {
-+ return holder6.isLinkLocalAddress();
-+ }
-+
-+ /* static version of above */
-+ static boolean isLinkLocalAddress(byte[] ipaddress) {
- return ((ipaddress[0] & 0xff) == 0xfe
- && (ipaddress[1] & 0xc0) == 0x80);
- }
-@@ -522,6 +724,11 @@
- */
- @Override
- public boolean isSiteLocalAddress() {
-+ return holder6.isSiteLocalAddress();
-+ }
-+
-+ /* static version of above */
-+ static boolean isSiteLocalAddress(byte[] ipaddress) {
- return ((ipaddress[0] & 0xff) == 0xfe
- && (ipaddress[1] & 0xc0) == 0xc0);
- }
-@@ -536,8 +743,7 @@
- */
- @Override
- public boolean isMCGlobal() {
-- return ((ipaddress[0] & 0xff) == 0xff
-- && (ipaddress[1] & 0x0f) == 0x0e);
-+ return holder6.isMCGlobal();
- }
-
- /**
-@@ -550,8 +756,7 @@
- */
- @Override
- public boolean isMCNodeLocal() {
-- return ((ipaddress[0] & 0xff) == 0xff
-- && (ipaddress[1] & 0x0f) == 0x01);
-+ return holder6.isMCNodeLocal();
- }
-
- /**
-@@ -564,8 +769,7 @@
- */
- @Override
- public boolean isMCLinkLocal() {
-- return ((ipaddress[0] & 0xff) == 0xff
-- && (ipaddress[1] & 0x0f) == 0x02);
-+ return holder6.isMCLinkLocal();
- }
-
- /**
-@@ -578,8 +782,7 @@
- */
- @Override
- public boolean isMCSiteLocal() {
-- return ((ipaddress[0] & 0xff) == 0xff
-- && (ipaddress[1] & 0x0f) == 0x05);
-+ return holder6.isMCSiteLocal();
- }
-
- /**
-@@ -593,10 +796,8 @@
- */
- @Override
- public boolean isMCOrgLocal() {
-- return ((ipaddress[0] & 0xff) == 0xff
-- && (ipaddress[1] & 0x0f) == 0x08);
-+ return holder6.isMCOrgLocal();
- }
--
- /**
- * Returns the raw IP address of this <code>InetAddress</code>
- * object. The result is in network byte order: the highest order
-@@ -606,7 +807,7 @@
- */
- @Override
- public byte[] getAddress() {
-- return ipaddress.clone();
-+ return holder6.ipaddress.clone();
- }
-
- /**
-@@ -617,7 +818,7 @@
- * @since 1.5
- */
- public int getScopeId () {
-- return scope_id;
-+ return holder6.scope_id;
- }
-
- /**
-@@ -628,7 +829,7 @@
- * @since 1.5
- */
- public NetworkInterface getScopedInterface () {
-- return scope_ifname;
-+ return holder6.scope_ifname;
- }
-
- /**
-@@ -641,13 +842,7 @@
- */
- @Override
- public String getHostAddress() {
-- String s = numericToTextFormat(ipaddress);
-- if (scope_ifname_set) { /* must check this first */
-- s = s + "%" + scope_ifname.getName();
-- } else if (scope_id_set) {
-- s = s + "%" + scope_id;
-- }
-- return s;
-+ return holder6.getHostAddress();
- }
-
- /**
-@@ -657,25 +852,7 @@
- */
- @Override
- public int hashCode() {
-- if (ipaddress != null) {
--
-- int hash = 0;
-- int i=0;
-- while (i<INADDRSZ) {
-- int j=0;
-- int component=0;
-- while (j<4 && i<INADDRSZ) {
-- component = (component << 8) + ipaddress[i];
-- j++;
-- i++;
-- }
-- hash += component;
-- }
-- return hash;
--
-- } else {
-- return 0;
-- }
-+ return holder6.hashCode();
- }
-
- /**
-@@ -702,12 +879,7 @@
-
- Inet6Address inetAddr = (Inet6Address)obj;
-
-- for (int i = 0; i < INADDRSZ; i++) {
-- if (ipaddress[i] != inetAddr.ipaddress[i])
-- return false;
-- }
--
-- return true;
-+ return holder6.equals(inetAddr.holder6);
- }
-
- /**
-@@ -719,15 +891,7 @@
- * @since 1.4
- */
- public boolean isIPv4CompatibleAddress() {
-- if ((ipaddress[0] == 0x00) && (ipaddress[1] == 0x00) &&
-- (ipaddress[2] == 0x00) && (ipaddress[3] == 0x00) &&
-- (ipaddress[4] == 0x00) && (ipaddress[5] == 0x00) &&
-- (ipaddress[6] == 0x00) && (ipaddress[7] == 0x00) &&
-- (ipaddress[8] == 0x00) && (ipaddress[9] == 0x00) &&
-- (ipaddress[10] == 0x00) && (ipaddress[11] == 0x00)) {
-- return true;
-- }
-- return false;
-+ return holder6.isIPv4CompatibleAddress();
- }
-
- // Utilities
-@@ -757,23 +921,4 @@
- * Perform class load-time initializations.
- */
- private static native void init();
--
-- /**
-- * Following field is only used during (de)/serialization
-- */
-- private String ifname;
--
-- /**
-- * default behavior is overridden in order to write the
-- * scope_ifname field as a String, rather than a NetworkInterface
-- * which is not serializable
-- */
-- private synchronized void writeObject(java.io.ObjectOutputStream s)
-- throws IOException
-- {
-- if (scope_ifname_set) {
-- ifname = scope_ifname.getName();
-- }
-- s.defaultWriteObject();
-- }
- }
---- ./jdk/src/share/classes/java/net/InetAddress.java 2013-09-06 11:28:11.000000000 -0700
-+++ ./jdk/src/share/classes/java/net/InetAddress.java 2014-07-15 21:49:33.000000000 -0700
-@@ -213,6 +213,13 @@
- this.family = family;
- }
-
-+ void init(String hostName, int family) {
-+ this.hostName = hostName;
-+ if (family != -1) {
-+ this.family = family;
-+ }
-+ }
-+
- String hostName;
-
- String getHostName() {
-@@ -1594,7 +1601,6 @@
- pf.put("address", holder().address);
- pf.put("family", holder().family);
- s.writeFields();
-- s.flush();
- }
- }
-
---- ./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-07-15 21:49:33.000000000 -0700
-@@ -624,6 +624,10 @@
- InetAddress addr = epoint.getAddress();
- int port = epoint.getPort();
- checkAddress (addr, "bind");
-+ SecurityManager security = System.getSecurityManager();
-+ if (security != null) {
-+ security.checkListen(port);
-+ }
- getImpl().bind (addr, port);
- 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-07-15 21:49:28.000000000 -0700
-@@ -34,6 +34,9 @@
- import java.net.InetAddress;
- import java.security.Permission;
- import java.security.PermissionCollection;
-+import java.security.PrivilegedAction;
-+import java.security.AccessController;
-+import java.security.Security;
- import java.io.Serializable;
- import java.io.ObjectStreamField;
- import java.io.ObjectOutputStream;
-@@ -41,6 +44,7 @@
- import java.io.IOException;
- import sun.net.util.IPAddressUtil;
- import sun.net.RegisteredDomain;
-+import sun.net.PortConfig;
- import sun.security.util.SecurityConstants;
- import sun.security.util.Debug;
-
-@@ -176,6 +180,7 @@
- private static final int PORT_MIN = 0;
- private static final int PORT_MAX = 65535;
- private static final int PRIV_PORT_MAX = 1023;
-+ private static final int DEF_EPH_LOW = 49152;
-
- // the actions mask
- private transient int mask;
-@@ -226,6 +231,14 @@
- private static Debug debug = null;
- private static boolean debugInit = false;
-
-+ // ephemeral port range for this system
-+ private static final int ephemeralLow = initEphemeralPorts(
-+ "low", DEF_EPH_LOW
-+ );
-+ private static final int ephemeralHigh = initEphemeralPorts(
-+ "high", PORT_MAX
-+ );
-+
- static {
- Boolean tmp = java.security.AccessController.doPrivileged(
- new sun.security.action.GetBooleanAction("sun.net.trustNameService"));
-@@ -362,6 +375,14 @@
- }
-
- /**
-+ * Returns true if the permission has specified zero
-+ * as its value (or lower bound) signifying the ephemeral range
-+ */
-+ private boolean includesEphemerals() {
-+ return portrange[0] == 0;
-+ }
-+
-+ /**
- * Initialize the SocketPermission object. We don't do any DNS lookups
- * as this point, instead we hold off until the implies method is
- * called.
-@@ -853,10 +874,21 @@
- int i,j;
-
- if ((that.mask & RESOLVE) != that.mask) {
-- // check port range
-+
-+ // check simple port range
- if ((that.portrange[0] < this.portrange[0]) ||
- (that.portrange[1] > this.portrange[1])) {
-+
-+ // if either includes the ephemeral range, do full check
-+ if (this.includesEphemerals() || that.includesEphemerals()) {
-+ if (!inRange(this.portrange[0], this.portrange[1],
-+ that.portrange[0], that.portrange[1]))
-+ {
-+ return false;
-+ }
-+ } else {
- return false;
-+ }
- }
- }
-
-@@ -1165,6 +1197,78 @@
- init(getName(),getMask(actions));
- }
-
-+ /**
-+ * Check the system/security property for the ephemeral port range
-+ * for this system. The suffix is either "high" or "low"
-+ */
-+ private static int initEphemeralPorts(
-+ final String suffix, final int defval
-+ )
-+ {
-+ return AccessController.doPrivileged(
-+ new PrivilegedAction<Integer>(){
-+ public Integer run() {
-+ int val = Integer.getInteger(
-+ "jdk.net.ephemeralPortRange."+suffix, -1
-+ );
-+ if (val != -1) {
-+ return val;
-+ } else {
-+ return suffix.equals("low") ?
-+ PortConfig.getLower() : PortConfig.getUpper();
-+ }
-+ }
-+ }
-+ );
-+ }
-+
-+ /**
-+ * Check if the target range is within the policy range
-+ * together with the ephemeral range for this platform
-+ * (if policy includes ephemeral range)
-+ */
-+ private static boolean inRange(
-+ int policyLow, int policyHigh, int targetLow, int targetHigh
-+ )
-+ {
-+ if (targetLow == 0) {
-+ // check policy includes ephemeral range
-+ if (!inRange(policyLow, policyHigh, ephemeralLow, ephemeralHigh)) {
-+ return false;
-+ }
-+ if (targetHigh == 0) {
-+ // nothing left to do
-+ return true;
-+ }
-+ // continue check with first real port number
-+ targetLow = 1;
-+ }
-+
-+ if (policyLow == 0 && policyHigh == 0) {
-+ // ephemeral range only
-+ return targetLow >= ephemeralLow && targetHigh <= ephemeralHigh;
-+ }
-+
-+ if (policyLow != 0) {
-+ // simple check of policy only
-+ return targetLow >= policyLow && targetHigh <= policyHigh;
-+ }
-+
-+ // policyLow == 0 which means possibly two ranges to check
-+
-+ // first check if policy and ephem range overlap/contiguous
-+
-+ if (policyHigh >= ephemeralLow - 1) {
-+ return targetHigh <= ephemeralHigh;
-+ }
-+
-+ // policy and ephem range do not overlap
-+
-+ // target range must lie entirely inside policy range or eph range
-+
-+ return (targetLow <= policyHigh && targetHigh <= policyHigh) ||
-+ (targetLow >= ephemeralLow && targetHigh <= ephemeralHigh);
-+ }
- /*
- public String toString()
- {
---- ./jdk/src/share/classes/java/nio/charset/Charset.java 2013-09-06 11:28:12.000000000 -0700
-+++ ./jdk/src/share/classes/java/nio/charset/Charset.java 2014-07-15 21:49:28.000000000 -0700
-@@ -426,39 +426,32 @@
- }
-
- /* The extended set of charsets */
-- private static Object extendedProviderLock = new Object();
-- private static boolean extendedProviderProbed = false;
-- private static CharsetProvider extendedProvider = null;
--
-- private static void probeExtendedProvider() {
-- AccessController.doPrivileged(new PrivilegedAction<Object>() {
-- public Object run() {
-- try {
-- Class epc
-- = Class.forName("sun.nio.cs.ext.ExtendedCharsets");
-- extendedProvider = (CharsetProvider)epc.newInstance();
-- } catch (ClassNotFoundException x) {
-- // Extended charsets not available
-- // (charsets.jar not present)
-- } catch (InstantiationException x) {
-- throw new Error(x);
-- } catch (IllegalAccessException x) {
-- throw new Error(x);
-- }
-- return null;
-- }
-- });
-+ private static class ExtendedProviderHolder {
-+ static final CharsetProvider extendedProvider = extendedProvider();
-+ // returns ExtendedProvider, if installed
-+ private static CharsetProvider extendedProvider() {
-+ return AccessController.doPrivileged(
-+ new PrivilegedAction<CharsetProvider>() {
-+ public CharsetProvider run() {
-+ try {
-+ Class<?> epc
-+ = Class.forName("sun.nio.cs.ext.ExtendedCharsets");
-+ return (CharsetProvider)epc.newInstance();
-+ } catch (ClassNotFoundException x) {
-+ // Extended charsets not available
-+ // (charsets.jar not present)
-+ } catch (InstantiationException |
-+ IllegalAccessException x) {
-+ throw new Error(x);
-+ }
-+ return null;
-+ }
-+ });
-+ }
- }
-
- private static Charset lookupExtendedCharset(String charsetName) {
-- CharsetProvider ecp = null;
-- synchronized (extendedProviderLock) {
-- if (!extendedProviderProbed) {
-- probeExtendedProvider();
-- extendedProviderProbed = true;
-- }
-- ecp = extendedProvider;
-- }
-+ CharsetProvider ecp = ExtendedProviderHolder.extendedProvider;
- return (ecp != null) ? ecp.charsetForName(charsetName) : null;
- }
-
-@@ -588,6 +581,9 @@
- new TreeMap<String,Charset>(
- ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER);
- put(standardProvider.charsets(), m);
-+ CharsetProvider ecp = ExtendedProviderHolder.extendedProvider;
-+ if (ecp != null)
-+ put(ecp.charsets(), m);
- for (Iterator i = providers(); i.hasNext();) {
- CharsetProvider cp = (CharsetProvider)i.next();
- put(cp.charsets(), m);
---- ./jdk/src/share/classes/java/nio/file/Files.java 2013-09-06 11:28:12.000000000 -0700
-+++ ./jdk/src/share/classes/java/nio/file/Files.java 2014-07-15 21:49:28.000000000 -0700
-@@ -28,6 +28,8 @@
- import java.nio.file.attribute.*;
- import java.nio.file.spi.FileSystemProvider;
- import java.nio.file.spi.FileTypeDetector;
-+import java.nio.channels.Channels;
-+import java.nio.channels.FileChannel;
- import java.nio.channels.SeekableByteChannel;
- import java.io.InputStream;
- import java.io.OutputStream;
-@@ -2896,41 +2898,63 @@
- }
-
- /**
-- * Read all the bytes from an input stream. The {@code initialSize}
-- * parameter indicates the initial size of the byte[] to allocate.
-+ * The maximum size of array to allocate.
-+ * Some VMs reserve some header words in an array.
-+ * Attempts to allocate larger arrays may result in
-+ * OutOfMemoryError: Requested array size exceeds VM limit
-+ */
-+ private static final int MAX_BUFFER_SIZE = Integer.MAX_VALUE - 8;
-+
-+ /**
-+ * Reads all the bytes from an input stream. Uses {@code initialSize} as a hint
-+ * about how many bytes the stream will have.
-+ *
-+ * @param source
-+ * the input stream to read from
-+ * @param initialSize
-+ * the initial size of the byte array to allocate
-+ *
-+ * @return a byte array containing the bytes read from the file
-+ *
-+ * @throws IOException
-+ * if an I/O error occurs reading from the stream
-+ * @throws OutOfMemoryError
-+ * if an array of the required size cannot be allocated
- */
- private static byte[] read(InputStream source, int initialSize)
-- throws IOException
-+ throws IOException
- {
- int capacity = initialSize;
- byte[] buf = new byte[capacity];
- int nread = 0;
-- int rem = buf.length;
- int n;
-- // read to EOF which may read more or less than initialSize (eg: file
-- // is truncated while we are reading)
-- while ((n = source.read(buf, nread, rem)) > 0) {
-- nread += n;
-- rem -= n;
-- assert rem >= 0;
-- if (rem == 0) {
-- // need larger buffer
-- int newCapacity = capacity << 1;
-- if (newCapacity < 0) {
-- if (capacity == Integer.MAX_VALUE)
-- throw new OutOfMemoryError("Required array size too large");
-- newCapacity = Integer.MAX_VALUE;
-- }
-- rem = newCapacity - capacity;
-- buf = Arrays.copyOf(buf, newCapacity);
-- capacity = newCapacity;
-+ for (;;) {
-+ // read to EOF which may read more or less than initialSize (eg: file
-+ // is truncated while we are reading)
-+ while ((n = source.read(buf, nread, capacity - nread)) > 0)
-+ nread += n;
-+
-+ // if last call to source.read() returned -1, we are done
-+ // otherwise, try to read one more byte; if that failed we're done too
-+ if (n < 0 || (n = source.read()) < 0)
-+ break;
-+
-+ // one more byte was read; need to allocate a larger buffer
-+ if (capacity <= MAX_BUFFER_SIZE - capacity) {
-+ capacity = Math.max(capacity << 1, BUFFER_SIZE);
-+ } else {
-+ if (capacity == MAX_BUFFER_SIZE)
-+ throw new OutOfMemoryError("Required array size too large");
-+ capacity = MAX_BUFFER_SIZE;
- }
-+ buf = Arrays.copyOf(buf, capacity);
-+ buf[nread++] = (byte)n;
- }
- return (capacity == nread) ? buf : Arrays.copyOf(buf, nread);
- }
-
- /**
-- * Read all the bytes from a file. The method ensures that the file is
-+ * Reads all the bytes from a file. The method ensures that the file is
- * closed when all bytes have been read or an I/O error, or other runtime
- * exception, is thrown.
- *
-@@ -2954,12 +2978,13 @@
- * method is invoked to check read access to the file.
- */
- public static byte[] readAllBytes(Path path) throws IOException {
-- long size = size(path);
-- if (size > (long)Integer.MAX_VALUE)
-- throw new OutOfMemoryError("Required array size too large");
-+ try (SeekableByteChannel sbc = Files.newByteChannel(path);
-+ InputStream in = Channels.newInputStream(sbc)) {
-+ long size = sbc.size();
-+ if (size > (long)MAX_BUFFER_SIZE)
-+ throw new OutOfMemoryError("Required array size too large");
-
-- try (InputStream in = newInputStream(path)) {
-- return read(in, (int)size);
-+ return read(in, (int)size);
- }
- }
-
---- ./jdk/src/share/classes/java/security/DigestOutputStream.java 2013-09-06 11:28:13.000000000 -0700
-+++ ./jdk/src/share/classes/java/security/DigestOutputStream.java 2014-10-28 20:19:47.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 1999, 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
-@@ -112,10 +112,10 @@
- * @see MessageDigest#update(byte)
- */
- public void write(int b) throws IOException {
-+ out.write(b);
- if (on) {
- digest.update((byte)b);
- }
-- out.write(b);
- }
-
- /**
-@@ -142,10 +142,10 @@
- * @see MessageDigest#update(byte[], int, int)
- */
- public void write(byte[] b, int off, int len) throws IOException {
-+ out.write(b, off, len);
- if (on) {
- digest.update(b, off, len);
- }
-- out.write(b, off, len);
- }
-
- /**
---- ./jdk/src/share/classes/java/security/Provider.java 2013-09-06 11:28:13.000000000 -0700
-+++ ./jdk/src/share/classes/java/security/Provider.java 2014-07-15 21:54:44.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
-@@ -1017,7 +1017,7 @@
- * <p>This class defines the methods {@link #supportsParameter
- * supportsParameter()} and {@link #newInstance newInstance()}
- * which are used by the Java security framework when it searches for
-- * suitable services and instantes them. The valid arguments to those
-+ * suitable services and instantiates them. The valid arguments to those
- * methods depend on the type of service. For the service types defined
- * within Java SE, see the
- * <a href="../../../technotes/guides/security/crypto/CryptoSpec.html">
-@@ -1207,7 +1207,7 @@
- *
- * @throws InvalidParameterException if the value of
- * constructorParameter is invalid for this type of service.
-- * @throws NoSuchAlgorithmException if instantation failed for
-+ * @throws NoSuchAlgorithmException if instantiation failed for
- * any other reason.
- */
- public Object newInstance(Object constructorParameter)
-@@ -1235,7 +1235,9 @@
- + " engines");
- }
- Class clazz = getImplClass();
-- return clazz.newInstance();
-+ Class<?>[] empty = {};
-+ Constructor<?> con = clazz.getConstructor(empty);
-+ return con.newInstance();
- } else {
- Class paramClass = cap.getConstructorParameterClass();
- if (constructorParameter != null) {
-@@ -1278,13 +1280,18 @@
- } else {
- clazz = cl.loadClass(className);
- }
-+ if (!Modifier.isPublic(clazz.getModifiers())) {
-+ throw new NoSuchAlgorithmException
-+ ("class configured for " + type + " (provider: " +
-+ provider.getName() + ") is not public.");
-+ }
- classRef = new WeakReference<Class>(clazz);
- }
- return clazz;
- } catch (ClassNotFoundException e) {
- throw new NoSuchAlgorithmException
- ("class configured for " + type + "(provider: " +
-- provider.getName() + ")" + "cannot be found.", e);
-+ provider.getName() + ") cannot be found.", e);
- }
- }
-
-@@ -1297,15 +1304,21 @@
- throws Exception {
- Class clazz = getImplClass();
- if (constructorParameter == null) {
-- Object o = clazz.newInstance();
-- return o;
-+ // create instance with public no-arg constructor if it exists
-+ try {
-+ Class<?>[] empty = {};
-+ Constructor<?> con = clazz.getConstructor(empty);
-+ return con.newInstance();
-+ } catch (NoSuchMethodException e) {
-+ throw new NoSuchAlgorithmException("No public no-arg "
-+ + "constructor found in class " + className);
-+ }
- }
- Class argClass = constructorParameter.getClass();
- Constructor[] cons = clazz.getConstructors();
- // find first public constructor that can take the
- // argument as parameter
-- for (int i = 0; i < cons.length; i++) {
-- Constructor con = cons[i];
-+ for (Constructor<?> con : cons) {
- Class[] paramTypes = con.getParameterTypes();
- if (paramTypes.length != 1) {
- continue;
-@@ -1313,10 +1326,9 @@
- if (paramTypes[0].isAssignableFrom(argClass) == false) {
- continue;
- }
-- Object o = con.newInstance(new Object[] {constructorParameter});
-- return o;
-+ return con.newInstance(constructorParameter);
- }
-- throw new NoSuchAlgorithmException("No constructor matching "
-+ throw new NoSuchAlgorithmException("No public constructor matching "
- + argClass.getName() + " found in class " + className);
- }
-
---- ./jdk/src/share/classes/java/security/Signature.java 2013-09-06 11:28:13.000000000 -0700
-+++ ./jdk/src/share/classes/java/security/Signature.java 2014-10-28 20:19:47.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2012, 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
-@@ -589,6 +589,9 @@
- if (outbuf == null) {
- throw new IllegalArgumentException("No output buffer given");
- }
-+ if (offset < 0 || len < 0) {
-+ throw new IllegalArgumentException("offset or len is less than 0");
-+ }
- if (outbuf.length - offset < len) {
- throw new IllegalArgumentException
- ("Output buffer too small for specified offset and length");
-@@ -657,9 +660,16 @@
- public final boolean verify(byte[] signature, int offset, int length)
- throws SignatureException {
- if (state == VERIFY) {
-- if ((signature == null) || (offset < 0) || (length < 0) ||
-- (length > signature.length - offset)) {
-- throw new IllegalArgumentException("Bad arguments");
-+ if (signature == null) {
-+ throw new IllegalArgumentException("signature is null");
-+ }
-+ if (offset < 0 || length < 0) {
-+ throw new IllegalArgumentException
-+ ("offset or length is less than 0");
-+ }
-+ if (signature.length - offset < length) {
-+ throw new IllegalArgumentException
-+ ("signature too small for specified offset and length");
- }
-
- return engineVerify(signature, offset, length);
-@@ -712,6 +722,16 @@
- public final void update(byte[] data, int off, int len)
- throws SignatureException {
- if (state == SIGN || state == VERIFY) {
-+ if (data == null) {
-+ throw new IllegalArgumentException("data is null");
-+ }
-+ if (off < 0 || len < 0) {
-+ throw new IllegalArgumentException("off or len is less than 0");
-+ }
-+ if (data.length - off < len) {
-+ throw new IllegalArgumentException
-+ ("data too small for specified offset and length");
-+ }
- engineUpdate(data, off, len);
- } else {
- throw new SignatureException("object not initialized for "
---- ./jdk/src/share/classes/java/security/cert/CertificateRevokedException.java 2013-09-06 11:28:14.000000000 -0700
-+++ ./jdk/src/share/classes/java/security/cert/CertificateRevokedException.java 2014-10-28 20:19:47.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
-@@ -95,7 +95,10 @@
- this.revocationDate = new Date(revocationDate.getTime());
- this.reason = reason;
- this.authority = authority;
-- this.extensions = new HashMap(extensions);
-+ // make sure Map only contains correct types
-+ this.extensions = Collections.checkedMap(new HashMap<String, Extension>(),
-+ String.class, Extension.class);
-+ this.extensions.putAll(extensions);
- }
-
- /**
-@@ -174,7 +177,8 @@
- public String getMessage() {
- return "Certificate has been revoked, reason: "
- + reason + ", revocation date: " + revocationDate
-- + ", authority: " + authority + ", extensions: " + extensions;
-+ + ", authority: " + authority + ", extension OIDs: "
-+ + extensions.keySet();
- }
-
- /**
---- ./jdk/src/share/classes/java/util/ComparableTimSort.java 2013-09-06 11:28:15.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/ComparableTimSort.java 2014-07-15 21:49:28.000000000 -0700
-@@ -131,7 +131,7 @@
- */
- int stackLen = (len < 120 ? 5 :
- len < 1542 ? 10 :
-- len < 119151 ? 19 : 40);
-+ len < 119151 ? 24 : 40);
- runBase = new int[stackLen];
- runLen = new int[stackLen];
- }
---- ./jdk/src/share/classes/java/util/HashMap.java 2013-09-06 11:28:15.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/HashMap.java 2014-07-15 21:49:28.000000000 -0700
-@@ -300,13 +300,9 @@
-
- private static int roundUpToPowerOf2(int number) {
- // assert number >= 0 : "number must be non-negative";
-- int rounded = number >= MAXIMUM_CAPACITY
-+ return number >= MAXIMUM_CAPACITY
- ? MAXIMUM_CAPACITY
-- : (rounded = Integer.highestOneBit(number)) != 0
-- ? (Integer.bitCount(number) > 1) ? rounded << 1 : rounded
-- : 1;
--
-- return rounded;
-+ : (number > 1) ? Integer.highestOneBit((number - 1) << 1) : 1;
- }
-
- /**
---- ./jdk/src/share/classes/java/util/ResourceBundle.java 2013-09-06 11:28:15.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/ResourceBundle.java 2014-10-28 20:19:47.000000000 -0700
-@@ -2577,7 +2577,10 @@
- } catch (ClassNotFoundException e) {
- }
- } else if (format.equals("java.properties")) {
-- final String resourceName = toResourceName(bundleName, "properties");
-+ final String resourceName = toResourceName0(bundleName, "properties");
-+ if (resourceName == null) {
-+ return bundle;
-+ }
- final ClassLoader classLoader = loader;
- final boolean reloadFlag = reload;
- InputStream stream = null;
-@@ -2731,7 +2734,10 @@
- }
- boolean result = false;
- try {
-- String resourceName = toResourceName(toBundleName(baseName, locale), format);
-+ String resourceName = toResourceName0(toBundleName(baseName, locale), format);
-+ if (resourceName == null) {
-+ return result;
-+ }
- URL url = loader.getResource(resourceName);
- if (url != null) {
- long lastModified = 0;
-@@ -2865,6 +2871,15 @@
- sb.append(bundleName.replace('.', '/')).append('.').append(suffix);
- return sb.toString();
- }
-+
-+ private String toResourceName0(String bundleName, String suffix) {
-+ // application protocol check
-+ if (bundleName.contains("://")) {
-+ return null;
-+ } else {
-+ return toResourceName(bundleName, suffix);
-+ }
-+ }
- }
-
- private static class SingleFormatControl extends Control {
---- ./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-07-15 21:49:28.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/TimSort.java 2013-09-06 11:28:15.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/TimSort.java 2014-07-15 21:49:28.000000000 -0700
-@@ -158,7 +158,7 @@
- */
- int stackLen = (len < 120 ? 5 :
- len < 1542 ? 10 :
-- len < 119151 ? 19 : 40);
-+ len < 119151 ? 24 : 40);
- runBase = new int[stackLen];
- runLen = new int[stackLen];
- }
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -165,6 +165,11 @@
- // Proclaim serialization compatibility with JDK 1.1
- static final long serialVersionUID = 3581463369166924961L;
-
-+ // TimeZone.setDefault maintains the compatible behavior of the AppContext-based
-+ // default setting for untrusted code if allowSetDefault is true.
-+ private static final boolean allowSetDefault = AccessController.doPrivileged(
-+ new sun.security.action.GetPropertyAction("jdk.util.TimeZone.allowSetDefault")) != null;
-+
- /**
- * Gets the time zone offset, for current date, modified in case of
- * daylight savings. This is the offset to add to UTC to get local time.
-@@ -689,6 +694,9 @@
- sm.checkPermission(new PropertyPermission
- ("user.timezone", "write"));
- } catch (SecurityException e) {
-+ if (!allowSetDefault) {
-+ throw e;
-+ }
- hasPermission = false;
- }
- }
-@@ -719,6 +727,7 @@
- * Returns the default TimeZone in an AppContext if any AppContext
- * has ever used. null is returned if any AppContext hasn't been
- * used or if the AppContext doesn't have the default TimeZone.
-+ * null is also returned if allowSetDefault is false.
- *
- * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
- * been loaded. If so, it implies that AWTSecurityManager is not our
-@@ -726,14 +735,15 @@
- * This works around a build time issue.
- */
- private static TimeZone getDefaultInAppContext() {
-- // JavaAWTAccess provides access implementation-private methods without using reflection.
-- JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-- if (javaAWTAccess == null) {
-- return mainAppContextDefault;
-- } else {
-- if (!javaAWTAccess.isDisposed()) {
-- TimeZone tz = (TimeZone)
-- javaAWTAccess.get(TimeZone.class);
-+ if (allowSetDefault) {
-+ // JavaAWTAccess provides access implementation-private methods without using reflection.
-+ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-+ if (System.getSecurityManager() == null || javaAWTAccess == null) {
-+ return mainAppContextDefault;
-+ } else if (javaAWTAccess.isDisposed()) {
-+ return null;
-+ } else {
-+ TimeZone tz = (TimeZone) javaAWTAccess.get(TimeZone.class);
- if (tz == null && javaAWTAccess.isMainAppContext()) {
- return mainAppContextDefault;
- } else {
-@@ -745,9 +755,9 @@
- }
-
- /**
-- * Sets the default TimeZone in the AppContext to the given
-- * tz. null is handled special: do nothing if any AppContext
-- * hasn't been used, remove the default TimeZone in the
-+ * Sets the default TimeZone in the AppContext to the given tz if
-+ * allowSetDefault is true. null is handled special: do nothing if any
-+ * AppContext hasn't been used, remove the default TimeZone in the
- * AppContext otherwise.
- *
- * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
-@@ -756,12 +766,12 @@
- * This works around a build time issue.
- */
- private static void setDefaultInAppContext(TimeZone tz) {
-- // JavaAWTAccess provides access implementation-private methods without using reflection.
-- JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-- if (javaAWTAccess == null) {
-- mainAppContextDefault = tz;
-- } else {
-- if (!javaAWTAccess.isDisposed()) {
-+ if (allowSetDefault) {
-+ // JavaAWTAccess provides access implementation-private methods without using reflection.
-+ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-+ if (System.getSecurityManager() == null || javaAWTAccess == null) {
-+ mainAppContextDefault = tz;
-+ } else if (!javaAWTAccess.isDisposed()) {
- javaAWTAccess.put(TimeZone.class, tz);
- if (javaAWTAccess.isMainAppContext()) {
- mainAppContextDefault = null;
-@@ -907,15 +917,13 @@
- }
- int gmtOffset = (hours * 60 + num) * 60 * 1000;
-
-+ zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
- if (gmtOffset == 0) {
-- zi = ZoneInfoFile.getZoneInfo(GMT_ID);
- if (negative) {
- zi.setID("GMT-00:00");
- } else {
- zi.setID("GMT+00:00");
- }
-- } else {
-- zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
- }
- return zi;
- }
---- ./jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java 2013-09-06 11:28:16.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java 2014-07-15 21:54:44.000000000 -0700
-@@ -221,6 +221,8 @@
-
- if (vclass != fieldClass)
- throw new ClassCastException();
-+ if (vclass.isPrimitive())
-+ throw new IllegalArgumentException("Must be reference type");
-
- if (!Modifier.isVolatile(modifiers))
- throw new IllegalArgumentException("Must be volatile type");
---- ./jdk/src/share/classes/java/util/jar/JarFile.java 2013-09-06 11:28:16.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/jar/JarFile.java 2014-07-15 21:49:28.000000000 -0700
-@@ -38,6 +38,7 @@
- import sun.security.action.GetPropertyAction;
- import sun.security.util.ManifestEntryVerifier;
- import sun.misc.SharedSecrets;
-+import sun.security.util.SignatureFileVerifier;
-
- /**
- * The <code>JarFile</code> class is used to read the contents of a jar file
-@@ -329,11 +330,13 @@
- String[] names = getMetaInfEntryNames();
- if (names != null) {
- for (int i = 0; i < names.length; i++) {
-- JarEntry e = getJarEntry(names[i]);
-- if (e == null) {
-- throw new JarException("corrupted jar file");
-- }
-- if (!e.isDirectory()) {
-+ String uname = names[i].toUpperCase(Locale.ENGLISH);
-+ if (MANIFEST_NAME.equals(uname)
-+ || SignatureFileVerifier.isBlockOrSF(uname)) {
-+ JarEntry e = getJarEntry(names[i]);
-+ if (e == null) {
-+ throw new JarException("corrupted jar file");
-+ }
- if (mev == null) {
- mev = new ManifestEntryVerifier
- (getManifestFromReference());
---- ./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-07-15 21:49:28.000000000 -0700
-@@ -32,6 +32,7 @@
- import java.security.cert.CertificateException;
- import java.util.zip.ZipEntry;
-
-+import sun.misc.JarIndex;
- import sun.security.util.ManifestDigester;
- import sun.security.util.ManifestEntryVerifier;
- import sun.security.util.SignatureFileVerifier;
-@@ -139,13 +140,22 @@
- return;
- }
-
-+ if (uname.equals(JarFile.MANIFEST_NAME) ||
-+ uname.equals(JarIndex.INDEX_NAME)) {
-+ return;
-+ }
-+
- if (SignatureFileVerifier.isBlockOrSF(uname)) {
- /* We parse only DSA, RSA or EC PKCS7 blocks. */
- parsingBlockOrSF = true;
- baos.reset();
- mev.setEntry(null, je);
-+ return;
- }
-- return;
-+
-+ // If a META-INF entry is not MF or block or SF, they should
-+ // be normal entries. According to 2 above, no more block or
-+ // SF will appear. Let's doneWithMeta.
- }
- }
-
-@@ -169,7 +179,9 @@
- name = name.substring(1);
-
- // only set the jev object for entries that have a signature
-- if (sigFileSigners.get(name) != null) {
-+ // (either verified or not)
-+ if (sigFileSigners.get(name) != null ||
-+ verifiedSigners.get(name) != null) {
- mev.setEntry(name, je);
- return;
- }
-@@ -675,6 +687,8 @@
- } else {
- matchUnsigned = true;
- }
-+ } else {
-+ matchUnsigned = true;
- }
- }
-
-@@ -777,23 +791,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/Level.java 2013-09-06 11:28:16.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/logging/Level.java 2014-07-15 21:49:28.000000000 -0700
-@@ -27,6 +27,7 @@
- import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.List;
-+import java.util.Locale;
- import java.util.Map;
- import java.util.ResourceBundle;
-
-@@ -63,7 +64,7 @@
- */
-
- public class Level implements java.io.Serializable {
-- private static String defaultBundle = "sun.util.logging.resources.logging";
-+ private static final String defaultBundle = "sun.util.logging.resources.logging";
-
- /**
- * @serial The non-localized name of the level.
-@@ -81,7 +82,8 @@
- private final String resourceBundleName;
-
- // localized level name
-- private String localizedLevelName;
-+ private transient String localizedLevelName;
-+ private transient Locale cachedLocale;
-
- /**
- * OFF is a special level that can be used to turn off logging.
-@@ -209,6 +211,7 @@
- this.value = value;
- this.resourceBundleName = resourceBundleName;
- this.localizedLevelName = resourceBundleName == null ? name : null;
-+ this.cachedLocale = null;
- KnownLevel.add(this);
- }
-
-@@ -250,17 +253,71 @@
- return this.name;
- }
-
-- final synchronized String getLocalizedLevelName() {
-+ private String computeLocalizedLevelName(Locale newLocale) {
-+ ResourceBundle rb = ResourceBundle.getBundle(resourceBundleName, newLocale);
-+ final String localizedName = rb.getString(name);
-+
-+ final boolean isDefaultBundle = defaultBundle.equals(resourceBundleName);
-+ if (!isDefaultBundle) return localizedName;
-+
-+ // This is a trick to determine whether the name has been translated
-+ // or not. If it has not been translated, we need to use Locale.ROOT
-+ // when calling toUpperCase().
-+ final Locale rbLocale = rb.getLocale();
-+ final Locale locale =
-+ Locale.ROOT.equals(rbLocale)
-+ || name.equals(localizedName.toUpperCase(Locale.ROOT))
-+ ? Locale.ROOT : rbLocale;
-+
-+ // ALL CAPS in a resource bundle's message indicates no translation
-+ // needed per Oracle translation guideline. To workaround this
-+ // in Oracle JDK implementation, convert the localized level name
-+ // to uppercase for compatibility reason.
-+ return Locale.ROOT.equals(locale) ? name : localizedName.toUpperCase(locale);
-+ }
-+
-+ // Avoid looking up the localizedLevelName twice if we already
-+ // have it.
-+ final String getCachedLocalizedLevelName() {
-+
- if (localizedLevelName != null) {
-- return localizedLevelName;
-+ if (cachedLocale != null) {
-+ if (cachedLocale.equals(Locale.getDefault())) {
-+ // OK: our cached value was looked up with the same
-+ // locale. We can use it.
-+ return localizedLevelName;
-+ }
-+ }
-+ }
-+
-+ if (resourceBundleName == null) {
-+ // No resource bundle: just use the name.
-+ return name;
-+ }
-+
-+ // We need to compute the localized name.
-+ // Either because it's the first time, or because our cached
-+ // value is for a different locale. Just return null.
-+ return null;
-+ }
-+
-+ final synchronized String getLocalizedLevelName() {
-+
-+ // See if we have a cached localized name
-+ final String cachedLocalizedName = getCachedLocalizedLevelName();
-+ if (cachedLocalizedName != null) {
-+ return cachedLocalizedName;
- }
-
-+ // No cached localized name or cache invalid.
-+ // Need to compute the localized name.
-+ final Locale newLocale = Locale.getDefault();
- try {
-- ResourceBundle rb = ResourceBundle.getBundle(resourceBundleName);
-- localizedLevelName = rb.getString(name);
-+ localizedLevelName = computeLocalizedLevelName(newLocale);
- } catch (Exception ex) {
- localizedLevelName = name;
- }
-+ cachedLocale = newLocale;
- return localizedLevelName;
- }
-
-@@ -318,6 +375,7 @@
- *
- * @return the non-localized name of the Level, for example "INFO".
- */
-+ @Override
- public final String toString() {
- return name;
- }
-@@ -420,6 +478,7 @@
- * Compare two objects for value equality.
- * @return true if and only if the two objects have the same level value.
- */
-+ @Override
- public boolean equals(Object ox) {
- try {
- Level lx = (Level)ox;
-@@ -433,6 +492,7 @@
- * Generate a hashcode.
- * @return a hashcode based on the level value
- */
-+ @Override
- public int hashCode() {
- return this.value;
- }
---- ./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-07-15 21:49:28.000000000 -0700
-@@ -149,7 +149,15 @@
- // The global LogManager object
- private static LogManager manager;
-
-- private Properties props = new Properties();
-+ // 'props' is assigned within a lock but accessed without it.
-+ // Declaring it volatile makes sure that another thread will not
-+ // be able to see a partially constructed 'props' object.
-+ // (seeing a partially constructed 'props' object can result in
-+ // NPE being thrown in Hashtable.get(), because it leaves the door
-+ // open for props.getProperties() to be called before the construcor
-+ // of Hashtable is actually completed).
-+ private volatile Properties props = new Properties();
-+
- private PropertyChangeSupport changes
- = new PropertyChangeSupport(LogManager.class);
- private final static Level defaultLevel = Level.INFO;
-@@ -257,6 +265,11 @@
- * retrieved by calling Logmanager.getLogManager.
- */
- protected LogManager() {
-+ this(checkSubclassPermissions());
-+ }
-+
-+ private LogManager(Void checked) {
-+
- // Add a shutdown hook to close the global handlers.
- try {
- Runtime.getRuntime().addShutdownHook(new Cleaner());
-@@ -266,6 +279,19 @@
- }
- }
-
-+ private static Void checkSubclassPermissions() {
-+ final SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ // These permission will be checked in the LogManager constructor,
-+ // in order to register the Cleaner() thread as a shutdown hook.
-+ // Check them here to avoid the penalty of constructing the object
-+ // etc...
-+ sm.checkPermission(new RuntimePermission("shutdownHooks"));
-+ sm.checkPermission(new RuntimePermission("setContextClassLoader"));
-+ }
-+ return null;
-+ }
-+
- /**
- * Return the global LogManager object.
- */
-@@ -345,6 +371,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 +382,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 +430,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 +477,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;
-@@ -524,7 +548,7 @@
- if (logger == null) {
- // Hashtable holds stale weak reference
- // to a logger which has been GC-ed.
-- removeLogger(name);
-+ ref.dispose();
- }
- return logger;
- }
-@@ -611,7 +635,7 @@
- // It's possible that the Logger was GC'ed after a
- // drainLoggerRefQueueBounded() call so allow
- // a new one to be registered.
-- removeLogger(name);
-+ ref.dispose();
- } else {
- // We already have a registered logger with the given name.
- return false;
-@@ -657,10 +681,10 @@
- return true;
- }
-
-- // note: all calls to removeLogger are synchronized on LogManager's
-- // intrinsic lock
-- void removeLogger(String name) {
-- namedLoggers.remove(name);
-+ synchronized void removeLoggerRef(String name, LoggerWeakRef ref) {
-+ if (namedLoggers.get(name) == ref) {
-+ namedLoggers.remove(name);
-+ }
- }
-
- synchronized Enumeration<String> getLoggerNames() {
-@@ -742,7 +766,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
-@@ -838,6 +862,7 @@
- private String name; // for namedLoggers cleanup
- private LogNode node; // for loggerRef cleanup
- private WeakReference<Logger> parentRef; // for kids cleanup
-+ private boolean disposed = false; // avoid calling dispose twice
-
- LoggerWeakRef(Logger logger) {
- super(logger, loggerRefQueue);
-@@ -847,14 +872,45 @@
-
- // dispose of this LoggerWeakRef object
- void dispose() {
-- if (node != null) {
-- // if we have a LogNode, then we were a named Logger
-- // so clear namedLoggers weak ref to us
-- node.context.removeLogger(name);
-- name = null; // clear our ref to the Logger's name
--
-- node.loggerRef = null; // clear LogNode's weak ref to us
-- node = null; // clear our ref to LogNode
-+ // Avoid calling dispose twice. When a Logger is gc'ed, its
-+ // LoggerWeakRef will be enqueued.
-+ // However, a new logger of the same name may be added (or looked
-+ // up) before the queue is drained. When that happens, dispose()
-+ // will be called by addLocalLogger() or findLogger().
-+ // Later when the queue is drained, dispose() will be called again
-+ // for the same LoggerWeakRef. Marking LoggerWeakRef as disposed
-+ // avoids processing the data twice (even though the code should
-+ // now be reentrant).
-+ synchronized(this) {
-+ // Note to maintainers:
-+ // Be careful not to call any method that tries to acquire
-+ // another lock from within this block - as this would surely
-+ // lead to deadlocks, given that dispose() can be called by
-+ // multiple threads, and from within different synchronized
-+ // methods/blocks.
-+ if (disposed) return;
-+ disposed = true;
-+ }
-+
-+ final LogNode n = node;
-+ if (n != null) {
-+ // n.loggerRef can only be safely modified from within
-+ // a lock on LoggerContext. removeLoggerRef is already
-+ // synchronized on LoggerContext so calling
-+ // n.context.removeLoggerRef from within this lock is safe.
-+ synchronized (n.context) {
-+ // if we have a LogNode, then we were a named Logger
-+ // so clear namedLoggers weak ref to us
-+ n.context.removeLoggerRef(name, this);
-+ name = null; // clear our ref to the Logger's name
-+
-+ // LogNode may have been reused - so only clear
-+ // LogNode.loggerRef if LogNode.loggerRef == this
-+ if (n.loggerRef == this) {
-+ n.loggerRef = null; // clear LogNode's weak ref to us
-+ }
-+ node = null; // clear our ref to LogNode
-+ }
- }
-
- if (parentRef != null) {
-@@ -907,7 +963,7 @@
- // - maximum: 10.9 ms
- //
- private final static int MAX_ITERATIONS = 400;
-- final synchronized void drainLoggerRefQueueBounded() {
-+ final void drainLoggerRefQueueBounded() {
- for (int i = 0; i < MAX_ITERATIONS; i++) {
- if (loggerRefQueue == null) {
- // haven't finished loading LogManager yet
-@@ -1407,31 +1463,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/LogRecord.java 2013-09-06 11:28:16.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/logging/LogRecord.java 2014-10-28 20:19:47.000000000 -0700
-@@ -510,7 +510,13 @@
- // If necessary, try to regenerate the resource bundle.
- if (resourceBundleName != null) {
- try {
-- resourceBundle = ResourceBundle.getBundle(resourceBundleName);
-+ // use system class loader to ensure the ResourceBundle
-+ // instance is a different instance than null loader uses
-+ final ResourceBundle bundle =
-+ ResourceBundle.getBundle(resourceBundleName,
-+ Locale.getDefault(),
-+ ClassLoader.getSystemClassLoader());
-+ resourceBundle = bundle;
- } catch (MissingResourceException ex) {
- // This is not a good place to throw an exception,
- // so we simply leave the resourceBundle null.
---- ./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-10-28 20:19:47.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2013, 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
-@@ -174,11 +174,11 @@
- public class Logger {
- private static final Handler emptyHandlers[] = new Handler[0];
- private static final int offValue = Level.OFF.intValue();
-- private LogManager manager;
-+ private volatile LogManager manager;
- 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);
- }
-
-@@ -1510,6 +1526,9 @@
- }
-
- setCallersClassLoaderRef(callersClass);
-+ if (isSystemLogger && getCallersClassLoader() != null) {
-+ checkPermission();
-+ }
- if (findResourceBundle(name, true) == null) {
- // We've failed to find an expected ResourceBundle.
- // unset the caller's ClassLoader since we were unable to find the
-@@ -1557,6 +1576,9 @@
- if (parent == null) {
- throw new NullPointerException();
- }
-+ if (manager == null) {
-+ manager = LogManager.getLogManager();
-+ }
- manager.checkPermission();
- doSetParent(parent);
- }
-@@ -1669,11 +1691,15 @@
- private String getEffectiveResourceBundleName() {
- Logger target = this;
- while (target != null) {
-- String rbn = target.getResourceBundleName();
-+ final String rbn = isSystemLogger
-+ // ancestor of a system logger is expected to be a system logger.
-+ // ignore resource bundle name if it's not.
-+ ? (target.isSystemLogger ? target.resourceBundleName : null)
-+ : target.getResourceBundleName();
- if (rbn != null) {
- return rbn;
- }
-- target = target.getParent();
-+ target = isSystemLogger ? target.parent : target.getParent();
- }
- return null;
- }
---- ./jdk/src/share/classes/javax/crypto/CipherInputStream.java 2013-09-06 11:28:17.000000000 -0700
-+++ ./jdk/src/share/classes/javax/crypto/CipherInputStream.java 2014-10-28 20:19:47.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2007, 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,6 +86,10 @@
- private int ostart = 0;
- // the offset pointing to the last "new" byte
- private int ofinish = 0;
-+ // stream status
-+ private boolean closed = false;
-+ // The stream has been read from. False if the stream has never been read.
-+ private boolean read = false;
-
- /**
- * private convenience function.
-@@ -101,13 +105,15 @@
- private int getMoreData() throws IOException {
- if (done) return -1;
- int readin = input.read(ibuffer);
-+ read = true;
- if (readin == -1) {
- done = true;
- try {
- obuffer = cipher.doFinal();
-+ } catch (IllegalBlockSizeException | BadPaddingException e) {
-+ obuffer = null;
-+ throw new IOException(e);
- }
-- catch (IllegalBlockSizeException e) {obuffer = null;}
-- catch (BadPaddingException e) {obuffer = null;}
- if (obuffer == null)
- return -1;
- else {
-@@ -118,7 +124,10 @@
- }
- try {
- obuffer = cipher.update(ibuffer, 0, readin);
-- } catch (IllegalStateException e) {obuffer = null;};
-+ } catch (IllegalStateException e) {
-+ obuffer = null;
-+ throw e;
-+ }
- ostart = 0;
- if (obuffer == null)
- ofinish = 0;
-@@ -293,14 +302,24 @@
- * @since JCE1.2
- */
- public void close() throws IOException {
-+ if (closed) {
-+ return;
-+ }
-+
-+ closed = true;
- input.close();
- try {
- // throw away the unprocessed data
-- cipher.doFinal();
-- }
-- catch (BadPaddingException ex) {
-+ if (!done) {
-+ cipher.doFinal();
-+ }
- }
-- catch (IllegalBlockSizeException ex) {
-+ catch (BadPaddingException | IllegalBlockSizeException ex) {
-+ /* If no data has been read from the stream to be en/decrypted,
-+ we supress any exceptions, and close quietly. */
-+ if (read) {
-+ throw new IOException(ex);
-+ }
- }
- ostart = 0;
- ofinish = 0;
---- ./jdk/src/share/classes/javax/crypto/CipherOutputStream.java 2013-09-06 11:28:17.000000000 -0700
-+++ ./jdk/src/share/classes/javax/crypto/CipherOutputStream.java 2014-10-28 20:19:47.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2007, 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
-@@ -74,6 +74,9 @@
- // the buffer holding data ready to be written out
- private byte[] obuffer;
-
-+ // stream status
-+ private boolean closed = false;
-+
- /**
- *
- * Constructs a CipherOutputStream from an OutputStream and a
-@@ -198,11 +201,14 @@
- * @since JCE1.2
- */
- public void close() throws IOException {
-+ if (closed) {
-+ return;
-+ }
-+
-+ closed = true;
- try {
- obuffer = cipher.doFinal();
-- } catch (IllegalBlockSizeException e) {
-- obuffer = null;
-- } catch (BadPaddingException e) {
-+ } catch (IllegalBlockSizeException | BadPaddingException e) {
- obuffer = null;
- }
- try {
---- ./jdk/src/share/classes/javax/crypto/JceSecurity.java 2013-09-06 11:28:17.000000000 -0700
-+++ ./jdk/src/share/classes/javax/crypto/JceSecurity.java 2014-10-28 20:19:47.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2009, 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
-@@ -216,26 +216,28 @@
- private static final Map codeBaseCacheRef = new WeakHashMap();
-
- /*
-- * Retuns the CodeBase for the given class.
-+ * Returns the CodeBase for the given class.
- */
- static URL getCodeBase(final Class clazz) {
-- URL url = (URL)codeBaseCacheRef.get(clazz);
-- if (url == null) {
-- url = (URL)AccessController.doPrivileged(new PrivilegedAction() {
-- public Object run() {
-- ProtectionDomain pd = clazz.getProtectionDomain();
-- if (pd != null) {
-- CodeSource cs = pd.getCodeSource();
-- if (cs != null) {
-- return cs.getLocation();
-+ synchronized (codeBaseCacheRef) {
-+ URL url = (URL)codeBaseCacheRef.get(clazz);
-+ if (url == null) {
-+ url = (URL)AccessController.doPrivileged(new PrivilegedAction() {
-+ public Object run() {
-+ ProtectionDomain pd = clazz.getProtectionDomain();
-+ if (pd != null) {
-+ CodeSource cs = pd.getCodeSource();
-+ if (cs != null) {
-+ return cs.getLocation();
-+ }
- }
-+ return NULL_URL;
- }
-- return NULL_URL;
-- }
-- });
-- codeBaseCacheRef.put(clazz, url);
-+ });
-+ codeBaseCacheRef.put(clazz, url);
-+ }
-+ return (url == NULL_URL) ? null : url;
- }
-- return (url == NULL_URL) ? null : url;
- }
-
- private static void setupJurisdictionPolicies() throws Exception {
---- ./jdk/src/share/classes/javax/management/BadAttributeValueExpException.java 2013-09-06 11:28:18.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/BadAttributeValueExpException.java 2014-07-15 21:49:28.000000000 -0700
-@@ -25,6 +25,9 @@
-
- package javax.management;
-
-+import java.io.IOException;
-+import java.io.ObjectInputStream;
-+
-
- /**
- * Thrown when an invalid MBean attribute is passed to a query
-@@ -51,7 +54,7 @@
- * @param val the inappropriate value.
- */
- public BadAttributeValueExpException (Object val) {
-- this.val = val;
-+ this.val = val == null ? null : val.toString();
- }
-
-
-@@ -62,4 +65,25 @@
- return "BadAttributeValueException: " + val;
- }
-
-+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
-+ ObjectInputStream.GetField gf = ois.readFields();
-+ Object valObj = gf.get("val", null);
-+
-+ if (valObj == null) {
-+ val = null;
-+ } else if (valObj instanceof String) {
-+ val= valObj;
-+ } else if (System.getSecurityManager() == null
-+ || valObj instanceof Long
-+ || valObj instanceof Integer
-+ || valObj instanceof Float
-+ || valObj instanceof Double
-+ || valObj instanceof Byte
-+ || valObj instanceof Short
-+ || valObj instanceof Boolean) {
-+ val = valObj.toString();
-+ } else { // the serialized object is from a version without JDK-8019292 fix
-+ val = System.identityHashCode(valObj) + "@" + valObj.getClass().getName();
-+ }
-+ }
- }
---- ./jdk/src/share/classes/javax/management/MBeanAttributeInfo.java 2013-09-06 11:28:18.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/MBeanAttributeInfo.java 2014-07-15 21:49:28.000000000 -0700
-@@ -30,6 +30,7 @@
-
- import com.sun.jmx.mbeanserver.GetPropertyAction;
- import com.sun.jmx.mbeanserver.Introspector;
-+import java.util.Objects;
-
-
- /**
-@@ -285,10 +286,10 @@
- if (!(o instanceof MBeanAttributeInfo))
- return false;
- MBeanAttributeInfo p = (MBeanAttributeInfo) o;
-- return (p.getName().equals(getName()) &&
-- p.getType().equals(getType()) &&
-- p.getDescription().equals(getDescription()) &&
-- p.getDescriptor().equals(getDescriptor()) &&
-+ return (Objects.equals(p.getName(), getName()) &&
-+ Objects.equals(p.getType(), getType()) &&
-+ Objects.equals(p.getDescription(), getDescription()) &&
-+ Objects.equals(p.getDescriptor(), getDescriptor()) &&
- p.isReadable() == isReadable() &&
- p.isWritable() == isWritable() &&
- p.isIs() == isIs());
-@@ -301,7 +302,7 @@
- right and we needlessly hashed in the description and parameter
- array. */
- public int hashCode() {
-- return getName().hashCode() ^ getType().hashCode();
-+ return Objects.hash(getName(), getType());
- }
-
- private static boolean isIs(Method getter) {
---- ./jdk/src/share/classes/javax/management/MBeanConstructorInfo.java 2013-09-06 11:28:18.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/MBeanConstructorInfo.java 2014-07-15 21:49:28.000000000 -0700
-@@ -29,6 +29,7 @@
- import java.lang.annotation.Annotation;
- import java.lang.reflect.Constructor;
- import java.util.Arrays;
-+import java.util.Objects;
-
- /**
- * Describes a constructor exposed by an MBean. Instances of this
-@@ -190,10 +191,10 @@
- if (!(o instanceof MBeanConstructorInfo))
- return false;
- MBeanConstructorInfo p = (MBeanConstructorInfo) o;
-- return (p.getName().equals(getName()) &&
-- p.getDescription().equals(getDescription()) &&
-+ return (Objects.equals(p.getName(), getName()) &&
-+ Objects.equals(p.getDescription(), getDescription()) &&
- Arrays.equals(p.fastGetSignature(), fastGetSignature()) &&
-- p.getDescriptor().equals(getDescriptor()));
-+ Objects.equals(p.getDescriptor(), getDescriptor()));
- }
-
- /* Unlike attributes and operations, it's quite likely we'll have
-@@ -203,11 +204,7 @@
- quite long and yet the same between constructors. Likewise for
- the descriptor. */
- public int hashCode() {
-- int hash = getName().hashCode();
-- MBeanParameterInfo[] sig = fastGetSignature();
-- for (int i = 0; i < sig.length; i++)
-- hash ^= sig[i].hashCode();
-- return hash;
-+ return Objects.hash(getName()) ^ Arrays.hashCode(fastGetSignature());
- }
-
- private static MBeanParameterInfo[] constructorSignature(Constructor<?> cn) {
---- ./jdk/src/share/classes/javax/management/MBeanFeatureInfo.java 2013-09-06 11:28:18.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/MBeanFeatureInfo.java 2014-07-15 21:49:28.000000000 -0700
-@@ -30,6 +30,7 @@
- import java.io.ObjectOutputStream;
- import java.io.Serializable;
- import java.io.StreamCorruptedException;
-+import java.util.Objects;
-
- /**
- * <p>Provides general information for an MBean descriptor object.
-@@ -147,9 +148,9 @@
- if (!(o instanceof MBeanFeatureInfo))
- return false;
- MBeanFeatureInfo p = (MBeanFeatureInfo) o;
-- return (p.getName().equals(getName()) &&
-- p.getDescription().equals(getDescription()) &&
-- p.getDescriptor().equals(getDescriptor()));
-+ return (Objects.equals(p.getName(), getName()) &&
-+ Objects.equals(p.getDescription(), getDescription()) &&
-+ Objects.equals(p.getDescriptor(), getDescriptor()));
- }
-
- public int hashCode() {
---- ./jdk/src/share/classes/javax/management/MBeanInfo.java 2013-09-06 11:28:18.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/MBeanInfo.java 2014-07-15 21:49:28.000000000 -0700
-@@ -36,6 +36,7 @@
- import java.util.WeakHashMap;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
-+import java.util.Objects;
-
- import static javax.management.ImmutableDescriptor.nonNullDescriptor;
-
-@@ -515,24 +516,15 @@
- if (hashCode != 0)
- return hashCode;
-
-- hashCode =
-- getClassName().hashCode() ^
-- getDescriptor().hashCode() ^
-- arrayHashCode(fastGetAttributes()) ^
-- arrayHashCode(fastGetOperations()) ^
-- arrayHashCode(fastGetConstructors()) ^
-- arrayHashCode(fastGetNotifications());
-+ hashCode = Objects.hash(getClassName(), getDescriptor())
-+ ^ Arrays.hashCode(fastGetAttributes())
-+ ^ Arrays.hashCode(fastGetOperations())
-+ ^ Arrays.hashCode(fastGetConstructors())
-+ ^ Arrays.hashCode(fastGetNotifications());
-
- return hashCode;
- }
-
-- private static int arrayHashCode(Object[] array) {
-- int hash = 0;
-- for (int i = 0; i < array.length; i++)
-- hash ^= array[i].hashCode();
-- return hash;
-- }
--
- /**
- * Cached results of previous calls to arrayGettersSafe. This is
- * a WeakHashMap so that we don't prevent a class from being
---- ./jdk/src/share/classes/javax/management/MBeanNotificationInfo.java 2013-09-06 11:28:18.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/MBeanNotificationInfo.java 2014-07-15 21:49:28.000000000 -0700
-@@ -25,7 +25,11 @@
-
- package javax.management;
-
-+import java.io.IOException;
-+import java.io.InvalidObjectException;
-+import java.io.ObjectInputStream;
- import java.util.Arrays;
-+import java.util.Objects;
-
- /**
- * <p>The <CODE>MBeanNotificationInfo</CODE> class is used to describe the
-@@ -67,7 +71,7 @@
- /**
- * @serial The different types of the notification.
- */
-- private final String[] types;
-+ private String[] types;
-
- /** @see MBeanInfo#arrayGettersSafe */
- private final transient boolean arrayGettersSafe;
-@@ -114,9 +118,8 @@
- notifType, though it doesn't explicitly allow it
- either. */
-
-- if (notifTypes == null)
-- notifTypes = NO_TYPES;
-- this.types = notifTypes;
-+ this.types = (notifTypes != null && notifTypes.length > 0) ?
-+ notifTypes.clone() : NO_TYPES;
- this.arrayGettersSafe =
- MBeanInfo.arrayGettersSafe(this.getClass(),
- MBeanNotificationInfo.class);
-@@ -191,9 +194,9 @@
- if (!(o instanceof MBeanNotificationInfo))
- return false;
- MBeanNotificationInfo p = (MBeanNotificationInfo) o;
-- return (p.getName().equals(getName()) &&
-- p.getDescription().equals(getDescription()) &&
-- p.getDescriptor().equals(getDescriptor()) &&
-+ return (Objects.equals(p.getName(), getName()) &&
-+ Objects.equals(p.getDescription(), getDescription()) &&
-+ Objects.equals(p.getDescriptor(), getDescriptor()) &&
- Arrays.equals(p.fastGetNotifTypes(), fastGetNotifTypes()));
- }
-
-@@ -203,4 +206,11 @@
- hash ^= types[i].hashCode();
- return hash;
- }
-+
-+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
-+ ObjectInputStream.GetField gf = ois.readFields();
-+ String[] t = (String[])gf.get("types", null);
-+
-+ types = (t != null && t.length != 0) ? t.clone() : NO_TYPES;
-+ }
- }
---- ./jdk/src/share/classes/javax/management/MBeanOperationInfo.java 2013-09-06 11:28:18.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/MBeanOperationInfo.java 2014-07-15 21:49:28.000000000 -0700
-@@ -29,6 +29,7 @@
- import java.lang.annotation.Annotation;
- import java.lang.reflect.Method;
- import java.util.Arrays;
-+import java.util.Objects;
-
- /**
- * Describes a management operation exposed by an MBean. Instances of
-@@ -293,12 +294,12 @@
- if (!(o instanceof MBeanOperationInfo))
- return false;
- MBeanOperationInfo p = (MBeanOperationInfo) o;
-- return (p.getName().equals(getName()) &&
-- p.getReturnType().equals(getReturnType()) &&
-- p.getDescription().equals(getDescription()) &&
-+ return (Objects.equals(p.getName(), getName()) &&
-+ Objects.equals(p.getReturnType(), getReturnType()) &&
-+ Objects.equals(p.getDescription(), getDescription()) &&
- p.getImpact() == getImpact() &&
- Arrays.equals(p.fastGetSignature(), fastGetSignature()) &&
-- p.getDescriptor().equals(getDescriptor()));
-+ Objects.equals(p.getDescriptor(), getDescriptor()));
- }
-
- /* We do not include everything in the hashcode. We assume that
-@@ -309,7 +310,7 @@
- parameter array. */
- @Override
- public int hashCode() {
-- return getName().hashCode() ^ getReturnType().hashCode();
-+ return Objects.hash(getName(), getReturnType());
- }
-
- private static MBeanParameterInfo[] methodSignature(Method method) {
---- ./jdk/src/share/classes/javax/management/MBeanParameterInfo.java 2013-09-06 11:28:18.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/MBeanParameterInfo.java 2014-07-15 21:49:28.000000000 -0700
-@@ -25,6 +25,8 @@
-
- package javax.management;
-
-+import java.util.Objects;
-+
-
- /**
- * Describes an argument of an operation exposed by an MBean.
-@@ -136,13 +138,13 @@
- if (!(o instanceof MBeanParameterInfo))
- return false;
- MBeanParameterInfo p = (MBeanParameterInfo) o;
-- return (p.getName().equals(getName()) &&
-- p.getType().equals(getType()) &&
-- p.getDescription().equals(getDescription()) &&
-- p.getDescriptor().equals(getDescriptor()));
-+ return (Objects.equals(p.getName(), getName()) &&
-+ Objects.equals(p.getType(), getType()) &&
-+ Objects.equals(p.getDescription(), getDescription()) &&
-+ Objects.equals(p.getDescriptor(), getDescriptor()));
- }
-
- public int hashCode() {
-- return getName().hashCode() ^ getType().hashCode();
-+ return Objects.hash(getName(), getType());
- }
- }
---- ./jdk/src/share/classes/javax/management/MBeanTrustPermission.java 2013-09-06 11:28:18.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/MBeanTrustPermission.java 2014-07-15 21:49:28.000000000 -0700
-@@ -26,6 +26,9 @@
- package javax.management;
-
- import java.security.BasicPermission;
-+import java.io.IOException;
-+import java.io.InvalidObjectException;
-+import java.io.ObjectInputStream;
-
- /**
- * This permission represents "trust" in a signer or codebase.
-@@ -75,15 +78,31 @@
- */
- public MBeanTrustPermission(String name, String actions) {
- super(name, actions);
-+ validate(name,actions);
-+ }
-+
-+ private static void validate(String name, String actions) {
- /* Check that actions is a null empty string */
-- if (actions != null && actions.length() > 0)
-- throw new IllegalArgumentException("MBeanTrustPermission " +
-- "actions must be null: " +
-+ if (actions != null && actions.length() > 0) {
-+ throw new IllegalArgumentException("MBeanTrustPermission actions must be null: " +
- actions);
-+ }
-
-- if (!name.equals("register") && !name.equals("*"))
-- throw new IllegalArgumentException("MBeanTrustPermission: " +
-- "Unknown target name " +
-+ if (!name.equals("register") && !name.equals("*")) {
-+ throw new IllegalArgumentException("MBeanTrustPermission: Unknown target name " +
- "[" + name + "]");
-+ }
-+ }
-+
-+ private void readObject(ObjectInputStream in)
-+ throws IOException, ClassNotFoundException {
-+
-+ // Reading private fields of base class
-+ in.defaultReadObject();
-+ try {
-+ validate(super.getName(),super.getActions());
-+ } catch (IllegalArgumentException e) {
-+ throw new InvalidObjectException(e.getMessage());
-+ }
- }
- }
---- ./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 2014-07-15 21:49:28.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -298,11 +298,15 @@
- RequiredModelMBean.class.getName(),
- "setModelMBeanInfo(ModelMBeanInfo)",
- "Setting ModelMBeanInfo to " + printModelMBeanInfo(mbi));
-+ int noOfNotifications = 0;
-+ if (mbi.getNotifications() != null) {
-+ noOfNotifications = mbi.getNotifications().length;
-+ }
- MODELMBEAN_LOGGER.logp(Level.FINER,
- RequiredModelMBean.class.getName(),
- "setModelMBeanInfo(ModelMBeanInfo)",
- "ModelMBeanInfo notifications has " +
-- (mbi.getNotifications()).length + " elements");
-+ noOfNotifications + " elements");
- }
-
- modelMBeanInfo = (ModelMBeanInfo)mbi.clone();
-@@ -2997,4 +3001,4 @@
- Void.class.getName()
- };
- }
--}
-\ No newline at end of file
-+}
---- ./jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java 2013-09-06 11:28:19.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java 2014-07-15 21:49:28.000000000 -0700
-@@ -31,6 +31,7 @@
- //
- import java.util.Arrays;
- import java.util.HashSet;
-+import java.util.Objects;
-
- import javax.management.Descriptor;
- import javax.management.MBeanAttributeInfo;
-@@ -269,8 +270,9 @@
- //
-
- // their MBean className should be equal
-- if ( ! this.getClassName().equals(other.getClassName()) )
-+ if (!Objects.equals(this.getClassName(), other.getClassName())) {
- return false;
-+ }
-
- // their infos on attributes should be equal (order not
- // significant => equality between sets, not arrays or lists)
-@@ -342,7 +344,9 @@
- //
- if (myHashCode == null) {
- int value = 0;
-- value += this.getClassName().hashCode();
-+ if (this.getClassName() != null) {
-+ value += this.getClassName().hashCode();
-+ }
- value += arraySetHash(this.getAttributes());
- value += arraySetHash(this.getConstructors());
- value += arraySetHash(this.getOperations());
---- ./jdk/src/share/classes/javax/management/relation/RelationNotification.java 2013-09-06 11:28:19.000000000 -0700
-+++ ./jdk/src/share/classes/javax/management/relation/RelationNotification.java 2014-07-15 21:49:28.000000000 -0700
-@@ -260,7 +260,7 @@
-
- super(notifType, sourceObj, sequence, timeStamp, message);
-
-- if (!isValidBasic(notifType,sourceObj,id,typeName) || !isValidCreate(notifType)) {
-+ if (!isValidBasicStrict(notifType,sourceObj,id,typeName) || !isValidCreate(notifType)) {
- throw new IllegalArgumentException("Invalid parameter.");
- }
-
-@@ -310,7 +310,7 @@
-
- super(notifType, sourceObj, sequence, timeStamp, message);
-
-- if (!isValidBasic(notifType,sourceObj,id,typeName) || !isValidUpdate(notifType,name,newValue,oldValue)) {
-+ if (!isValidBasicStrict(notifType,sourceObj,id,typeName) || !isValidUpdate(notifType,name,newValue,oldValue)) {
- throw new IllegalArgumentException("Invalid parameter.");
- }
-
-@@ -457,14 +457,26 @@
- // - no role old value (for role update)
- // - no role new value (for role update)
-
-+ // Despite the fact, that validation in constructor of RelationNotification prohibit
-+ // creation of the class instance with null sourceObj its possible to set it to null later
-+ // by public setSource() method.
-+ // So we should relax validation rules to preserve serialization behavior compatibility.
-+
-+ private boolean isValidBasicStrict(String notifType, Object sourceObj, String id, String typeName){
-+ if (sourceObj == null) {
-+ return false;
-+ }
-+ return isValidBasic(notifType,sourceObj,id,typeName);
-+ }
-+
- private boolean isValidBasic(String notifType, Object sourceObj, String id, String typeName){
-- if (notifType == null || sourceObj == null ||
-- id == null || typeName == null) {
-+ if (notifType == null || id == null || typeName == null) {
- return false;
- }
-
-- if (!(sourceObj instanceof RelationService) &&
-- !(sourceObj instanceof ObjectName)) {
-+ if (sourceObj != null && (
-+ !(sourceObj instanceof RelationService) &&
-+ !(sourceObj instanceof ObjectName))) {
- return false;
- }
-
---- ./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 2014-07-15 21:49:28.000000000 -0700
-@@ -26,6 +26,9 @@
-
- package javax.management.remote;
-
-+import java.io.IOException;
-+import java.io.InvalidObjectException;
-+import java.io.ObjectInputStream;
- import java.io.Serializable;
- import java.security.Principal;
-
-@@ -64,9 +67,7 @@
- * <code>null</code>.
- */
- public JMXPrincipal(String name) {
-- if (name == null)
-- throw new NullPointerException("illegal null input");
--
-+ validate(name);
- this.name = name;
- }
-
-@@ -130,4 +131,20 @@
- public int hashCode() {
- return name.hashCode();
- }
-+
-+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
-+ ObjectInputStream.GetField gf = ois.readFields();
-+ String principalName = (String)gf.get("name", null);
-+ try {
-+ validate(principalName);
-+ this.name = principalName;
-+ } catch (NullPointerException e) {
-+ throw new InvalidObjectException(e.getMessage());
-+ }
-+ }
-+
-+ private static void validate(String name) throws NullPointerException {
-+ if (name == null)
-+ throw new NullPointerException("illegal null input");
-+ }
- }
---- ./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 2014-07-15 21:49:28.000000000 -0700
-@@ -29,6 +29,9 @@
-
- import com.sun.jmx.remote.util.ClassLogger;
- import com.sun.jmx.remote.util.EnvHelp;
-+import java.io.IOException;
-+import java.io.InvalidObjectException;
-+import java.io.ObjectInputStream;
-
- import java.io.Serializable;
- import java.net.InetAddress;
-@@ -297,7 +300,7 @@
- If we're given an explicit host name that is illegal we
- have to reject it. (Bug 5057532.) */
- try {
-- validateHost(host);
-+ validateHost(host, port);
- } catch (MalformedURLException e) {
- if (logger.fineOn()) {
- logger.fine("JMXServiceURL",
-@@ -336,36 +339,82 @@
- validate();
- }
-
-- private void validate() throws MalformedURLException {
-+ private static final String INVALID_INSTANCE_MSG =
-+ "Trying to deserialize an invalid instance of JMXServiceURL";
-+ private void readObject(ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
-+ ObjectInputStream.GetField gf = inputStream.readFields();
-+ String h = (String)gf.get("host", null);
-+ int p = (int)gf.get("port", -1);
-+ String proto = (String)gf.get("protocol", null);
-+ String url = (String)gf.get("urlPath", null);
-
-- // Check protocol
-+ if (proto == null || url == null || h == null) {
-+ StringBuilder sb = new StringBuilder(INVALID_INSTANCE_MSG).append('[');
-+ boolean empty = true;
-+ if (proto == null) {
-+ sb.append("protocol=null");
-+ empty = false;
-+ }
-+ if (h == null) {
-+ sb.append(empty ? "" : ",").append("host=null");
-+ empty = false;
-+ }
-+ if (url == null) {
-+ sb.append(empty ? "" : ",").append("urlPath=null");
-+ }
-+ sb.append(']');
-+ throw new InvalidObjectException(sb.toString());
-+ }
-
-- final int protoEnd = indexOfFirstNotInSet(protocol, protocolBitSet, 0);
-- if (protoEnd == 0 || protoEnd < protocol.length()
-- || !alphaBitSet.get(protocol.charAt(0))) {
-+ if (h.contains("[") || h.contains("]")) {
-+ throw new InvalidObjectException("Invalid host name: " + h);
-+ }
-+
-+ try {
-+ validate(proto, h, p, url);
-+ this.protocol = proto;
-+ this.host = h;
-+ this.port = p;
-+ this.urlPath = url;
-+ } catch (MalformedURLException e) {
-+ throw new InvalidObjectException(INVALID_INSTANCE_MSG + ": " +
-+ e.getMessage());
-+ }
-+
-+ }
-+
-+ private void validate(String proto, String h, int p, String url)
-+ throws MalformedURLException {
-+ // Check protocol
-+ final int protoEnd = indexOfFirstNotInSet(proto, protocolBitSet, 0);
-+ if (protoEnd == 0 || protoEnd < proto.length()
-+ || !alphaBitSet.get(proto.charAt(0))) {
- throw new MalformedURLException("Missing or invalid protocol " +
-- "name: \"" + protocol + "\"");
-+ "name: \"" + proto + "\"");
- }
-
- // Check host
--
-- validateHost();
-+ validateHost(h, p);
-
- // Check port
--
-- if (port < 0)
-- throw new MalformedURLException("Bad port: " + port);
-+ if (p < 0)
-+ throw new MalformedURLException("Bad port: " + p);
-
- // Check URL path
--
-- if (urlPath.length() > 0) {
-- if (!urlPath.startsWith("/") && !urlPath.startsWith(";"))
-- throw new MalformedURLException("Bad URL path: " + urlPath);
-+ if (url.length() > 0) {
-+ if (!url.startsWith("/") && !url.startsWith(";"))
-+ throw new MalformedURLException("Bad URL path: " + url);
- }
- }
-
-- private void validateHost() throws MalformedURLException {
-- if (host.length() == 0) {
-+ private void validate() throws MalformedURLException {
-+ validate(this.protocol, this.host, this.port, this.urlPath);
-+ }
-+
-+ private static void validateHost(String h, int port)
-+ throws MalformedURLException {
-+
-+ if (h.length() == 0) {
- if (port != 0) {
- throw new MalformedURLException("Cannot give port number " +
- "without host name");
-@@ -373,12 +422,6 @@
- return;
- }
-
-- validateHost(host);
-- }
--
-- private static void validateHost(String h)
-- throws MalformedURLException {
--
- if (isNumericIPv6Address(h)) {
- /* We assume J2SE >= 1.4 here. Otherwise you can't
- use the address anyway. We can't call
-@@ -663,22 +706,22 @@
- /**
- * The value returned by {@link #getProtocol()}.
- */
-- private final String protocol;
-+ private String protocol;
-
- /**
- * The value returned by {@link #getHost()}.
- */
-- private final String host;
-+ private String host;
-
- /**
- * The value returned by {@link #getPort()}.
- */
-- private final int port;
-+ private int port;
-
- /**
- * The value returned by {@link #getURLPath()}.
- */
-- private final String urlPath;
-+ private String urlPath;
-
- /**
- * 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 2014-07-15 21:49:28.000000000 -0700
-@@ -25,6 +25,9 @@
-
- package javax.management.remote;
-
-+import java.io.IOException;
-+import java.io.InvalidObjectException;
-+import java.io.ObjectInputStream;
- import java.io.Serializable;
-
- /**
-@@ -76,17 +79,7 @@
- public NotificationResult(long earliestSequenceNumber,
- long nextSequenceNumber,
- TargetedNotification[] targetedNotifications) {
-- if (targetedNotifications == null) {
-- final String msg = "Notifications null";
-- throw new IllegalArgumentException(msg);
-- }
--
-- if (earliestSequenceNumber < 0 || nextSequenceNumber < 0)
-- throw new IllegalArgumentException("Bad sequence numbers");
-- /* We used to check nextSequenceNumber >= earliestSequenceNumber
-- here. But in fact the opposite can legitimately be true if
-- notifications have been lost. */
--
-+ validate(targetedNotifications, earliestSequenceNumber, nextSequenceNumber);
- this.earliestSequenceNumber = earliestSequenceNumber;
- this.nextSequenceNumber = nextSequenceNumber;
- this.targetedNotifications = (targetedNotifications.length == 0 ? targetedNotifications : targetedNotifications.clone());
-@@ -138,7 +131,40 @@
- getTargetedNotifications().length;
- }
-
-- private final long earliestSequenceNumber;
-- private final long nextSequenceNumber;
-- private final TargetedNotification[] targetedNotifications;
-+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
-+ ois.defaultReadObject();
-+ try {
-+ validate(
-+ this.targetedNotifications,
-+ this.earliestSequenceNumber,
-+ this.nextSequenceNumber
-+ );
-+
-+ this.targetedNotifications = this.targetedNotifications.length == 0 ?
-+ this.targetedNotifications :
-+ this.targetedNotifications.clone();
-+ } catch (IllegalArgumentException e) {
-+ throw new InvalidObjectException(e.getMessage());
-+ }
-+ }
-+
-+ private long earliestSequenceNumber;
-+ private long nextSequenceNumber;
-+ private TargetedNotification[] targetedNotifications;
-+
-+ private static void validate(TargetedNotification[] targetedNotifications,
-+ long earliestSequenceNumber,
-+ long nextSequenceNumber)
-+ throws IllegalArgumentException {
-+ if (targetedNotifications == null) {
-+ final String msg = "Notifications null";
-+ throw new IllegalArgumentException(msg);
-+ }
-+
-+ if (earliestSequenceNumber < 0 || nextSequenceNumber < 0)
-+ throw new IllegalArgumentException("Bad sequence numbers");
-+ /* We used to check nextSequenceNumber >= earliestSequenceNumber
-+ here. But in fact the opposite can legitimately be true if
-+ notifications have been lost. */
-+ }
- }
---- ./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 2014-07-15 21:49:28.000000000 -0700
-@@ -26,6 +26,9 @@
-
- package javax.management.remote;
-
-+import java.io.IOException;
-+import java.io.InvalidObjectException;
-+import java.io.ObjectInputStream;
- import java.io.Serializable;
- import javax.management.Notification;
-
-@@ -73,12 +76,9 @@
- */
- public TargetedNotification(Notification notification,
- Integer listenerID) {
-+ validate(notification, listenerID);
- // If we replace integer with int...
- // this(notification,intValue(listenerID));
-- if (notification == null) throw new
-- IllegalArgumentException("Invalid notification: null");
-- if (listenerID == null) throw new
-- IllegalArgumentException("Invalid listener ID: null");
- this.notif = notification;
- this.id = listenerID;
- }
-@@ -115,13 +115,13 @@
- * @serial A notification to transmit to the other side.
- * @see #getNotification()
- **/
-- private final Notification notif;
-+ private Notification notif;
- /**
- * @serial The ID of the listener to which the notification is
- * targeted.
- * @see #getListenerID()
- **/
-- private final Integer id;
-+ private Integer id;
- //private final int id;
-
- // Needed if we use int instead of Integer...
-@@ -130,4 +130,22 @@
- // IllegalArgumentException("Invalid listener ID: null");
- // return id.intValue();
- // }
-+
-+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
-+ ois.defaultReadObject();
-+ try {
-+ validate(this.notif, this.id);
-+ } catch (IllegalArgumentException e) {
-+ throw new InvalidObjectException(e.getMessage());
-+ }
-+ }
-+
-+ private static void validate(Notification notif, Integer id) throws IllegalArgumentException {
-+ if (notif == null) {
-+ throw new IllegalArgumentException("Invalid notification: null");
-+ }
-+ if (id == null) {
-+ throw new IllegalArgumentException("Invalid listener ID: null");
-+ }
-+ }
- }
---- ./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 2014-07-15 21:49:28.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 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
-@@ -61,6 +61,7 @@
- import java.security.AccessController;
- import java.security.PrivilegedAction;
- import java.security.PrivilegedExceptionAction;
-+import java.security.PrivilegedActionException;
- import java.security.ProtectionDomain;
- import java.util.Arrays;
- import java.util.Collections;
-@@ -128,7 +129,6 @@
- Map<String, ?> environment) {
- if (rmiServer == null && address == null) throw new
- IllegalArgumentException("rmiServer and jmxServiceURL both null");
--
- initTransients();
-
- this.rmiServer = rmiServer;
-@@ -239,10 +239,21 @@
- //--------------------------------------------------------------------
- // implements JMXConnector interface
- //--------------------------------------------------------------------
-+
-+ /**
-+ * @throws IOException if the connection could not be made because of a
-+ * communication problem, or in the case of the {@code iiop} protocol,
-+ * that RMI/IIOP is not supported
-+ */
- public void connect() throws IOException {
- connect(null);
- }
-
-+ /**
-+ * @throws IOException if the connection could not be made because of a
-+ * communication problem, or in the case of the {@code iiop} protocol,
-+ * that RMI/IIOP is not supported
-+ */
- public synchronized void connect(Map<String,?> environment)
- throws IOException {
- final boolean tracing = logger.traceOn();
-@@ -394,14 +405,7 @@
- throw new IOException("Not connected");
- }
-
-- MBeanServerConnection rmbsc = rmbscMap.get(delegationSubject);
-- if (rmbsc != null) {
-- return rmbsc;
-- }
--
-- rmbsc = new RemoteMBeanServerConnection(delegationSubject);
-- rmbscMap.put(delegationSubject, rmbsc);
-- return rmbsc;
-+ return getConnectionWithSubject(delegationSubject);
- }
-
- public void
-@@ -1820,7 +1824,7 @@
-
- // Initialization of transient variables.
- private void initTransients() {
-- rmbscMap = new WeakHashMap<Subject, MBeanServerConnection>();
-+ rmbscMap = new WeakHashMap<Subject, WeakReference<MBeanServerConnection>>();
- connected = false;
- terminated = false;
-
-@@ -2000,6 +2004,25 @@
- private final ClassLoader loader;
- }
-
-+ private MBeanServerConnection getConnectionWithSubject(Subject delegationSubject) {
-+ MBeanServerConnection conn = null;
-+
-+ if (delegationSubject == null) {
-+ if (nullSubjectConnRef == null
-+ || (conn = nullSubjectConnRef.get()) == null) {
-+ conn = new RemoteMBeanServerConnection(null);
-+ nullSubjectConnRef = new WeakReference(conn);
-+ }
-+ } else {
-+ WeakReference<MBeanServerConnection> wr = rmbscMap.get(delegationSubject);
-+ if (wr == null || (conn = wr.get()) == null) {
-+ conn = new RemoteMBeanServerConnection(delegationSubject);
-+ rmbscMap.put(delegationSubject, new WeakReference(conn));
-+ }
-+ }
-+ return conn;
-+ }
-+
- /*
- The following section of code avoids a class loading problem
- with RMI. The problem is that an RMI stub, when deserializing
-@@ -2359,13 +2382,21 @@
- }
- }
-
-- private static RMIConnection shadowIiopStub(Object stub)
-+ private static RMIConnection shadowIiopStub(Object stub)
- throws InstantiationException, IllegalAccessException {
-- Object proxyStub = proxyStubClass.newInstance();
-+ Object proxyStub = null;
-+ try {
-+ proxyStub = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-+ public Object run() throws Exception {
-+ return proxyStubClass.newInstance();
-+ }
-+ });
-+ } catch (PrivilegedActionException e) {
-+ throw new InternalError();
-+ }
- IIOPHelper.setDelegate(proxyStub, IIOPHelper.getDelegate(stub));
- return (RMIConnection) proxyStub;
- }
--
- private static RMIConnection getConnection(RMIServer server,
- Object credentials,
- boolean checkStub)
-@@ -2540,7 +2571,8 @@
-
- private transient long clientNotifSeqNo = 0;
-
-- private transient WeakHashMap<Subject, MBeanServerConnection> rmbscMap;
-+ private transient WeakHashMap<Subject, WeakReference<MBeanServerConnection>> rmbscMap;
-+ private transient WeakReference<MBeanServerConnection> nullSubjectConnRef = null;
-
- private transient RMINotifClient rmiNotifClient;
- // = new RMINotifClient(new Integer(0));
---- ./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-07-15 21:49:28.000000000 -0700
-@@ -91,7 +91,10 @@
-
- Class repClass = null;
- try {
-- repClass = Class.forName(flavor.getRepresentationClassName());
-+ String className = flavor.getRepresentationClassName();
-+ sun.reflect.misc.ReflectUtil.checkPackageAccess(className);
-+ repClass = Class.forName(className, false,
-+ Thread.currentThread().getContextClassLoader());
- } 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-07-15 21:49:28.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-07-15 21:49:28.000000000 -0700
-@@ -26,6 +26,10 @@
- package javax.security.auth;
-
- import java.security.Security;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+import java.security.PrivilegedExceptionAction;
-+import java.util.Objects;
- import sun.security.util.Debug;
-
- /**
-@@ -160,21 +164,14 @@
- public abstract class Policy {
-
- private static Policy policy;
-- private static ClassLoader contextClassLoader;
-+
-+ private final java.security.AccessControlContext acc =
-+ java.security.AccessController.getContext();
-
- // true if a custom (not com.sun.security.auth.PolicyFile) system-wide
- // policy object is set
- private static boolean isCustomPolicy;
-
-- static {
-- contextClassLoader = java.security.AccessController.doPrivileged
-- (new java.security.PrivilegedAction<ClassLoader>() {
-- public ClassLoader run() {
-- return Thread.currentThread().getContextClassLoader();
-- }
-- });
-- };
--
- /**
- * Sole constructor. (For invocation by subclass constructors, typically
- * implicit.)
-@@ -217,8 +214,8 @@
-
- if (policy == null) {
- String policy_class = null;
-- policy_class = java.security.AccessController.doPrivileged
-- (new java.security.PrivilegedAction<String>() {
-+ policy_class = AccessController.doPrivileged
-+ (new PrivilegedAction<String>() {
- public String run() {
- return java.security.Security.getProperty
- ("auth.policy.provider");
-@@ -230,19 +227,28 @@
-
- try {
- final String finalClass = policy_class;
-- policy = java.security.AccessController.doPrivileged
-- (new java.security.PrivilegedExceptionAction<Policy>() {
-- public Policy run() throws ClassNotFoundException,
-- InstantiationException,
-- IllegalAccessException {
-- return (Policy) Class.forName
-- (finalClass,
-- true,
-- contextClassLoader).newInstance();
-- }
-- });
-- isCustomPolicy =
-- !finalClass.equals("com.sun.security.auth.PolicyFile");
-+ final Policy untrustedImpl = AccessController.doPrivileged(
-+ new PrivilegedExceptionAction<Policy>() {
-+ public Policy run() throws ClassNotFoundException,
-+ InstantiationException,
-+ IllegalAccessException {
-+ Class<? extends Policy> implClass = Class.forName(
-+ finalClass, false,
-+ Thread.currentThread().getContextClassLoader()
-+ ).asSubclass(Policy.class);
-+ return implClass.newInstance();
-+ }
-+ });
-+ AccessController.doPrivileged(
-+ new PrivilegedExceptionAction<Void>() {
-+ public Void run() {
-+ setPolicy(untrustedImpl);
-+ isCustomPolicy =
-+ !finalClass.equals("com.sun.security.auth.PolicyFile");
-+ return null;
-+ }
-+ }, Objects.requireNonNull(untrustedImpl.acc)
-+ );
- } catch (Exception e) {
- 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-07-15 21:49:28.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 {
-
-- 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.
-@@ -1296,8 +1316,14 @@
- {
- ObjectInputStream.GetField fields = ois.readFields();
- subject = (Subject) fields.get("this$0", null);
-- elements = (LinkedList<E>) fields.get("elements", null);
- which = fields.get("which", 0);
-+
-+ LinkedList<E> tmp = (LinkedList<E>) fields.get("elements", null);
-+ if (tmp.getClass() != LinkedList.class) {
-+ elements = new LinkedList<E>(tmp);
-+ } else {
-+ elements = tmp;
-+ }
- }
- }
-
---- ./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 2014-07-15 21:49:28.000000000 -0700
-@@ -26,6 +26,7 @@
- package javax.security.auth.kerberos;
-
- import java.io.File;
-+import java.security.AccessControlException;
- import java.util.Objects;
- import sun.misc.SharedSecrets;
- import sun.security.krb5.EncryptionKey;
-@@ -114,7 +115,19 @@
-
- //Takes a snapshot of the keytab content
- private sun.security.krb5.internal.ktab.KeyTab takeSnapshot() {
-- return sun.security.krb5.internal.ktab.KeyTab.getInstance(file);
-+ try {
-+ return sun.security.krb5.internal.ktab.KeyTab.getInstance(file);
-+ } catch (AccessControlException ace) {
-+ if (file != null) {
-+ // It's OK to show the name if caller specified it
-+ throw ace;
-+ } else {
-+ AccessControlException ace2 = new AccessControlException(
-+ "Access to default keytab denied (modified exception)");
-+ ace2.setStackTrace(ace.getStackTrace());
-+ throw ace2;
-+ }
-+ }
- }
-
- /**
---- ./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-07-15 21:49:28.000000000 -0700
-@@ -27,9 +27,6 @@
-
- import javax.security.auth.AuthPermission;
-
--import java.io.*;
--import java.util.*;
--import java.net.URI;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
- import java.security.PrivilegedExceptionAction;
-@@ -38,7 +35,7 @@
- import java.security.NoSuchProviderException;
- import java.security.Provider;
- import java.security.Security;
--import java.security.SecurityPermission;
-+import java.util.Objects;
-
- import sun.security.jca.GetInstance;
-
-@@ -194,16 +191,9 @@
- public abstract class Configuration {
-
- private static Configuration configuration;
-- private static ClassLoader contextClassLoader;
-
-- static {
-- contextClassLoader = AccessController.doPrivileged
-- (new PrivilegedAction<ClassLoader>() {
-- public ClassLoader run() {
-- return Thread.currentThread().getContextClassLoader();
-- }
-- });
-- };
-+ private final java.security.AccessControlContext acc =
-+ java.security.AccessController.getContext();
-
- private static void checkPermission(String type) {
- SecurityManager sm = System.getSecurityManager();
-@@ -256,17 +246,26 @@
-
- try {
- final String finalClass = config_class;
-- configuration = AccessController.doPrivileged
-- (new PrivilegedExceptionAction<Configuration>() {
-- public Configuration run() throws ClassNotFoundException,
-- InstantiationException,
-- IllegalAccessException {
-- return (Configuration)Class.forName
-- (finalClass,
-- true,
-- contextClassLoader).newInstance();
-- }
-- });
-+ final Configuration untrustedImpl = AccessController.doPrivileged(
-+ new PrivilegedExceptionAction<Configuration>() {
-+ public Configuration run() throws ClassNotFoundException,
-+ InstantiationException,
-+ IllegalAccessException {
-+ Class<? extends Configuration> implClass = Class.forName(
-+ finalClass, false,
-+ Thread.currentThread().getContextClassLoader()
-+ ).asSubclass(Configuration.class);
-+ return implClass.newInstance();
-+ }
-+ });
-+ AccessController.doPrivileged(
-+ new PrivilegedExceptionAction<Void>() {
-+ public Void run() {
-+ setConfiguration(untrustedImpl);
-+ return null;
-+ }
-+ }, Objects.requireNonNull(untrustedImpl.acc)
-+ );
- } catch (PrivilegedActionException e) {
- 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-07-15 21:49:28.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -217,8 +217,7 @@
- private Map state = new HashMap();
-
- private Configuration config;
-- private boolean configProvided = false;
-- private AccessControlContext creatorAcc = null;
-+ private AccessControlContext creatorAcc = null; // customized config only
- private ModuleInfo[] moduleStack;
- private ClassLoader contextClassLoader = null;
- private static final Class[] PARAMS = { };
-@@ -237,7 +236,7 @@
- private void init(String name) throws LoginException {
-
- SecurityManager sm = System.getSecurityManager();
-- if (sm != null && !configProvided) {
-+ if (sm != null && creatorAcc == null) {
- sm.checkPermission(new AuthPermission
- ("createLoginContext." + name));
- }
-@@ -260,7 +259,7 @@
- AppConfigurationEntry[] entries = config.getAppConfigurationEntry(name);
- if (entries == null) {
-
-- if (sm != null && !configProvided) {
-+ if (sm != null && creatorAcc == null) {
- sm.checkPermission(new AuthPermission
- ("createLoginContext." + OTHER));
- }
-@@ -287,7 +286,15 @@
- contextClassLoader = java.security.AccessController.doPrivileged
- (new java.security.PrivilegedAction<ClassLoader>() {
- public ClassLoader run() {
-- return Thread.currentThread().getContextClassLoader();
-+ ClassLoader loader =
-+ Thread.currentThread().getContextClassLoader();
-+ if (loader == null) {
-+ // Don't use bootstrap class loader directly to ensure
-+ // proper package access control!
-+ loader = ClassLoader.getSystemClassLoader();
-+ }
-+
-+ return loader;
- }
- });
- }
-@@ -306,10 +313,10 @@
- (DEFAULT_HANDLER);
- if (defaultHandler == null || defaultHandler.length() == 0)
- return null;
-- Class c = Class.forName(defaultHandler,
-- true,
-- finalLoader);
-- return (CallbackHandler)c.newInstance();
-+ Class<? extends CallbackHandler> c = Class.forName(
-+ defaultHandler, true,
-+ finalLoader).asSubclass(CallbackHandler.class);
-+ return c.newInstance();
- }
- });
- } catch (java.security.PrivilegedActionException pae) {
-@@ -317,7 +324,7 @@
- }
-
- // secure it with the caller's ACC
-- if (this.callbackHandler != null && !configProvided) {
-+ if (this.callbackHandler != null && creatorAcc == null) {
- this.callbackHandler = new SecureCallbackHandler
- (java.security.AccessController.getContext(),
- this.callbackHandler);
-@@ -506,8 +513,7 @@
- CallbackHandler callbackHandler,
- Configuration config) throws LoginException {
- this.config = config;
-- configProvided = (config != null) ? true : false;
-- if (configProvided) {
-+ if (config != null) {
- creatorAcc = java.security.AccessController.getContext();
- }
-
-@@ -518,7 +524,7 @@
- }
- if (callbackHandler == null) {
- loadDefaultCallbackHandler();
-- } else if (!configProvided) {
-+ } else if (creatorAcc == null) {
- this.callbackHandler = new SecureCallbackHandler
- (java.security.AccessController.getContext(),
- callbackHandler);
-@@ -585,23 +591,13 @@
- }
-
- try {
-- if (configProvided) {
-- // module invoked in doPrivileged with creatorAcc
-- invokeCreatorPriv(LOGIN_METHOD);
-- invokeCreatorPriv(COMMIT_METHOD);
-- } else {
-- // module invoked in doPrivileged
-- invokePriv(LOGIN_METHOD);
-- invokePriv(COMMIT_METHOD);
-- }
-+ // module invoked in doPrivileged
-+ invokePriv(LOGIN_METHOD);
-+ invokePriv(COMMIT_METHOD);
- loginSucceeded = true;
- } catch (LoginException le) {
- try {
-- if (configProvided) {
-- invokeCreatorPriv(ABORT_METHOD);
-- } else {
-- invokePriv(ABORT_METHOD);
-- }
-+ invokePriv(ABORT_METHOD);
- } catch (LoginException le2) {
- throw le;
- }
-@@ -636,13 +632,8 @@
- ("null.subject.logout.called.before.login"));
- }
-
-- if (configProvided) {
-- // module invoked in doPrivileged with creatorAcc
-- invokeCreatorPriv(LOGOUT_METHOD);
-- } else {
-- // module invoked in doPrivileged
-- invokePriv(LOGOUT_METHOD);
-- }
-+ // module invoked in doPrivileged
-+ invokePriv(LOGOUT_METHOD);
- }
-
- /**
-@@ -685,7 +676,8 @@
-
- /**
- * Invokes the login, commit, and logout methods
-- * from a LoginModule inside a doPrivileged block.
-+ * from a LoginModule inside a doPrivileged block restricted
-+ * by creatorAcc (may be null).
- *
- * This version is called if the caller did not instantiate
- * the LoginContext with a Configuration object.
-@@ -698,29 +690,6 @@
- invoke(methodName);
- return null;
- }
-- });
-- } catch (java.security.PrivilegedActionException pae) {
-- throw (LoginException)pae.getException();
-- }
-- }
--
-- /**
-- * Invokes the login, commit, and logout methods
-- * from a LoginModule inside a doPrivileged block restricted
-- * by creatorAcc
-- *
-- * This version is called if the caller instantiated
-- * the LoginContext with a Configuration object.
-- */
-- private void invokeCreatorPriv(final String methodName)
-- throws LoginException {
-- try {
-- java.security.AccessController.doPrivileged
-- (new java.security.PrivilegedExceptionAction<Void>() {
-- public Void run() throws LoginException {
-- invoke(methodName);
-- return null;
-- }
- }, creatorAcc);
- } catch (java.security.PrivilegedActionException pae) {
- throw (LoginException)pae.getException();
-@@ -743,24 +712,24 @@
- } else {
-
- // instantiate the LoginModule
-- Class c = Class.forName
-- (moduleStack[i].entry.getLoginModuleName(),
-+ //
-+ // Allow any object to be a LoginModule as long as it
-+ // conforms to the interface.
-+ Class<?> c = Class.forName(
-+ moduleStack[i].entry.getLoginModuleName(),
- true,
- contextClassLoader);
-
- Constructor constructor = c.getConstructor(PARAMS);
- Object[] args = { };
--
-- // allow any object to be a LoginModule
-- // as long as it conforms to the interface
- moduleStack[i].module = constructor.newInstance(args);
-
-- methods = moduleStack[i].module.getClass().getMethods();
--
- // call the LoginModule's initialize method
-+ methods = moduleStack[i].module.getClass().getMethods();
- for (mIndex = 0; mIndex < methods.length; mIndex++) {
-- if (methods[mIndex].getName().equals(INIT_METHOD))
-+ if (methods[mIndex].getName().equals(INIT_METHOD)) {
- break;
-+ }
- }
-
- Object[] initArgs = {subject,
-@@ -768,19 +737,28 @@
- state,
- moduleStack[i].entry.getOptions() };
- // invoke the LoginModule initialize method
-+ //
-+ // Throws ArrayIndexOutOfBoundsException if no such
-+ // method defined. May improve to use LoginException in
-+ // the future.
- methods[mIndex].invoke(moduleStack[i].module, initArgs);
- }
-
- // find the requested method in the LoginModule
- for (mIndex = 0; mIndex < methods.length; mIndex++) {
-- if (methods[mIndex].getName().equals(methodName))
-+ if (methods[mIndex].getName().equals(methodName)) {
- break;
-+ }
- }
-
- // set up the arguments to be passed to the LoginModule method
- Object[] args = { };
-
- // invoke the LoginModule method
-+ //
-+ // Throws ArrayIndexOutOfBoundsException if no such
-+ // method defined. May improve to use LoginException in
-+ // the future.
- 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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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
-@@ -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;
-
- /**
- * 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
- */
-- String strRowsetProperties = System.getProperty("rowset.properties");
-+ String strRowsetProperties;
-+ try {
-+ strRowsetProperties = AccessController.doPrivileged(new PrivilegedAction<String>() {
-+ public String run() {
-+ return System.getProperty("rowset.properties");
-+ }
-+ });
-+ } 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
-@@ -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();
-- String providerImpls = System.getProperty(ROWSET_SYNC_PROVIDER);
-+ String providerImpls;
-+ try {
-+ providerImpls = AccessController.doPrivileged(new PrivilegedAction<String>() {
-+ public String run() {
-+ return System.getProperty(ROWSET_SYNC_PROVIDER);
-+ }
-+ });
-+ } catch (Exception ex) {
-+ providerImpls = null;
-+ }
-
- 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/JDesktopPane.java 2013-09-06 11:28:23.000000000 -0700
-+++ ./jdk/src/share/classes/javax/swing/JDesktopPane.java 2014-10-28 20:19:47.000000000 -0700
-@@ -43,6 +43,7 @@
- import java.beans.PropertyVetoException;
- import java.util.Set;
- import java.util.TreeSet;
-+import java.util.LinkedHashSet;
- /**
- * A container used to create a multiple-document interface or a virtual desktop.
- * You create <code>JInternalFrame</code> objects and add them to the
-@@ -266,7 +267,7 @@
-
- private static Collection<JInternalFrame> getAllFrames(Container parent) {
- int i, count;
-- Collection<JInternalFrame> results = new ArrayList<JInternalFrame>();
-+ Collection<JInternalFrame> results = new LinkedHashSet<>();
- count = parent.getComponentCount();
- for (i = 0; i < count; i++) {
- Component next = parent.getComponent(i);
---- ./jdk/src/share/classes/javax/swing/JTable.java 2013-09-06 11:28:23.000000000 -0700
-+++ ./jdk/src/share/classes/javax/swing/JTable.java 2014-07-15 21:49:28.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
-@@ -52,6 +52,7 @@
-
- import javax.print.attribute.*;
- import javax.print.PrintService;
-+import sun.reflect.misc.ReflectUtil;
-
- import sun.swing.SwingUtilities2;
- import sun.swing.SwingUtilities2.Section;
-@@ -5460,14 +5461,16 @@
- // they have the option to replace the value with
- // null or use escape to restore the original.
- // For Strings, return "" for backward compatibility.
-- if ("".equals(s)) {
-- if (constructor.getDeclaringClass() == String.class) {
-- value = s;
-- }
-- return super.stopCellEditing();
-- }
-
- try {
-+ if ("".equals(s)) {
-+ if (constructor.getDeclaringClass() == String.class) {
-+ value = s;
-+ }
-+ return super.stopCellEditing();
-+ }
-+
-+ SwingUtilities2.checkAccess(constructor.getModifiers());
- value = constructor.newInstance(new Object[]{s});
- }
- catch (Exception e) {
-@@ -5491,6 +5494,8 @@
- if (type == Object.class) {
- type = String.class;
- }
-+ ReflectUtil.checkPackageAccess(type);
-+ SwingUtilities2.checkAccess(type.getModifiers());
- constructor = type.getConstructor(argTypes);
- }
- 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-07-15 21:49:28.000000000 -0700
-@@ -24,6 +24,7 @@
- */
- package javax.swing;
-
-+import sun.reflect.misc.ReflectUtil;
- import sun.swing.SwingUtilities2;
- import sun.swing.UIAction;
-
-@@ -33,9 +34,6 @@
- import java.awt.event.*;
- import java.awt.dnd.DropTarget;
-
--import java.util.Vector;
--import java.util.Hashtable;
--
- import java.lang.reflect.*;
-
- import javax.accessibility.*;
-@@ -1871,6 +1869,7 @@
-
-
- static Class<?> loadSystemClass(String className) throws ClassNotFoundException {
-+ ReflectUtil.checkPackageAccess(className);
- return Class.forName(className, true, Thread.currentThread().
- 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 2014-07-15 21:49:28.000000000 -0700
-@@ -53,6 +53,7 @@
-
- import sun.reflect.misc.MethodUtil;
- import sun.reflect.misc.ReflectUtil;
-+import sun.swing.SwingUtilities2;
- import sun.util.CoreResourceBundleControl;
-
- /**
-@@ -1101,7 +1102,7 @@
- }
- ReflectUtil.checkPackageAccess(className);
- c = Class.forName(className, true, (ClassLoader)cl);
-- checkAccess(c.getModifiers());
-+ SwingUtilities2.checkAccess(c.getModifiers());
- if (methodName != null) {
- Class[] types = getClassArray(args);
- Method m = c.getMethod(methodName, types);
-@@ -1109,7 +1110,7 @@
- } else {
- Class[] types = getClassArray(args);
- Constructor constructor = c.getConstructor(types);
-- checkAccess(constructor.getModifiers());
-+ SwingUtilities2.checkAccess(constructor.getModifiers());
- return constructor.newInstance(args);
- }
- } catch(Exception e) {
-@@ -1124,13 +1125,6 @@
- }, acc);
- }
-
-- private void checkAccess(int modifiers) {
-- if(System.getSecurityManager() != null &&
-- !Modifier.isPublic(modifiers)) {
-- throw new SecurityException("Resource is not accessible");
-- }
-- }
--
- /*
- * 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-07-15 21:49:28.000000000 -0700
-@@ -27,6 +27,7 @@
- import java.io.*;
- import java.util.*;
- import java.lang.reflect.Array;
-+import sun.reflect.misc.ReflectUtil;
-
- /**
- * A class that holds a list of EventListeners. A single instance
-@@ -270,7 +271,9 @@
- while (null != (listenerTypeOrNull = s.readObject())) {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- EventListener l = (EventListener)s.readObject();
-- add((Class<EventListener>)Class.forName((String)listenerTypeOrNull, true, cl), l);
-+ String name = (String) listenerTypeOrNull;
-+ ReflectUtil.checkPackageAccess(name);
-+ add((Class<EventListener>)Class.forName(name, true, cl), l);
- }
- }
-
---- ./jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java 2013-09-06 11:28:24.000000000 -0700
-+++ ./jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java 2014-07-15 21:54:44.000000000 -0700
-@@ -718,7 +718,8 @@
- * @return the Desktop folder.
- */
- public File getHomeDirectory() {
-- return getRoots()[0];
-+ File[] roots = getRoots();
-+ return (roots.length == 0) ? null : roots[0];
- }
-
- /**
---- ./jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java 2013-09-06 11:28:25.000000000 -0700
-+++ ./jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -42,6 +42,7 @@
- import javax.swing.tree.*;
- import javax.swing.text.Position;
- import javax.swing.plaf.basic.DragRecognitionSupport.BeforeDrag;
-+import sun.awt.AWTAccessor;
- import sun.swing.SwingUtilities2;
-
- import sun.swing.DefaultLookup;
-@@ -2165,11 +2166,7 @@
- nodeBounds.width,
- nodeBounds.height);
- editingPath = path;
-- if (editingComponent instanceof JComponent) {
-- ((JComponent)editingComponent).revalidate();
-- } else {
-- editingComponent.validate();
-- }
-+ AWTAccessor.getComponentAccessor().revalidateSynchronously(editingComponent);
- editingComponent.repaint();
- if(cellEditor.shouldSelectCell(event)) {
- stopEditingInCompleteEditing = false;
---- ./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 2014-07-15 21:49:29.000000000 -0700
-@@ -24,7 +24,8 @@
- */
- package javax.swing.text;
-
--import sun.reflect.misc.ConstructorUtil;
-+import sun.reflect.misc.ReflectUtil;
-+import sun.swing.SwingUtilities2;
-
- import java.io.Serializable;
- import java.lang.reflect.*;
-@@ -247,7 +248,9 @@
- Constructor cons;
-
- try {
-- cons = ConstructorUtil.getConstructor(vc, new Class[]{String.class});
-+ ReflectUtil.checkPackageAccess(vc);
-+ SwingUtilities2.checkAccess(vc.getModifiers());
-+ cons = vc.getConstructor(new Class[]{String.class});
-
- } catch (NoSuchMethodException nsme) {
- cons = null;
-@@ -255,6 +258,7 @@
-
- if (cons != null) {
- try {
-+ SwingUtilities2.checkAccess(cons.getModifiers());
- return cons.newInstance(new Object[] { string });
- } catch (Throwable ex) {
- throw new ParseException("Error creating instance", 0);
---- ./jdk/src/share/classes/javax/swing/text/FlowView.java 2013-09-06 11:28:27.000000000 -0700
-+++ ./jdk/src/share/classes/javax/swing/text/FlowView.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 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
-@@ -796,6 +796,22 @@
- v.setParent(parent);
- }
-
-+ /** {@inheritDoc} */
-+ @Override
-+ protected void forwardUpdate(DocumentEvent.ElementChange ec,
-+ DocumentEvent e, Shape a, ViewFactory f) {
-+ calculateUpdateIndexes(e);
-+ // Send update event to all views followed by the changed place.
-+ lastUpdateIndex = Math.max((getViewCount() - 1), 0);
-+ for (int i = firstUpdateIndex; i <= lastUpdateIndex; i++) {
-+ View v = getView(i);
-+ if (v != null) {
-+ Shape childAlloc = getChildAllocation(i, a);
-+ forwardUpdateToView(v, e, childAlloc, f);
-+ }
-+ }
-+ }
-+
- // The following methods don't do anything useful, they
- // simply keep the class from being abstract.
-
---- ./jdk/src/share/classes/javax/swing/text/GlyphView.java 2013-09-06 11:28:27.000000000 -0700
-+++ ./jdk/src/share/classes/javax/swing/text/GlyphView.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 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
-@@ -514,7 +514,7 @@
- int x1 = x0 + (int) painter.getSpan(this, p0, p1, getTabExpander(), x0);
-
- // calculate y coordinate
-- int y = alloc.y + alloc.height - (int) painter.getDescent(this);
-+ int y = alloc.y + (int)(painter.getHeight(this) - painter.getDescent(this));
- if (underline) {
- int yTmp = y + 1;
- g.drawLine(x0, yTmp, x1, yTmp);
---- ./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 2014-07-15 21:49:29.000000000 -0700
-@@ -27,6 +27,8 @@
- import java.lang.reflect.*;
- import java.text.*;
- import java.util.*;
-+import sun.reflect.misc.ReflectUtil;
-+import sun.swing.SwingUtilities2;
-
- /**
- * <code>NumberFormatter</code> subclasses <code>InternationalFormatter</code>
-@@ -427,10 +429,12 @@
- valueClass = value.getClass();
- }
- try {
-+ ReflectUtil.checkPackageAccess(valueClass);
-+ SwingUtilities2.checkAccess(valueClass.getModifiers());
- Constructor cons = valueClass.getConstructor(
- new Class[] { String.class });
--
- if (cons != null) {
-+ SwingUtilities2.checkAccess(cons.getModifiers());
- return cons.newInstance(new Object[]{string});
- }
- } catch (Throwable ex) { }
---- ./jdk/src/share/classes/javax/swing/text/View.java 2013-09-06 11:28:27.000000000 -0700
-+++ ./jdk/src/share/classes/javax/swing/text/View.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1137,32 +1137,9 @@
- */
- protected void forwardUpdate(DocumentEvent.ElementChange ec,
- DocumentEvent e, Shape a, ViewFactory f) {
-- Element elem = getElement();
-- int pos = e.getOffset();
-- int index0 = getViewIndex(pos, Position.Bias.Forward);
-- if (index0 == -1 && e.getType() == DocumentEvent.EventType.REMOVE &&
-- pos >= getEndOffset()) {
-- // Event beyond our offsets. We may have represented this, that is
-- // the remove may have removed one of our child Elements that
-- // represented this, so, we should foward to last element.
-- index0 = getViewCount() - 1;
-- }
-- int index1 = index0;
-- View v = (index0 >= 0) ? getView(index0) : null;
-- if (v != null) {
-- if ((v.getStartOffset() == pos) && (pos > 0)) {
-- // If v is at a boundary, forward the event to the previous
-- // view too.
-- index0 = Math.max(index0 - 1, 0);
-- }
-- }
-- if (e.getType() != DocumentEvent.EventType.REMOVE) {
-- index1 = getViewIndex(pos + e.getLength(), Position.Bias.Forward);
-- if (index1 < 0) {
-- index1 = getViewCount() - 1;
-- }
-- }
-- int hole0 = index1 + 1;
-+ calculateUpdateIndexes(e);
-+
-+ int hole0 = lastUpdateIndex + 1;
- int hole1 = hole0;
- Element[] addedElems = (ec != null) ? ec.getChildrenAdded() : null;
- if ((addedElems != null) && (addedElems.length > 0)) {
-@@ -1173,11 +1150,9 @@
- // forward to any view not in the forwarding hole
- // formed by added elements (i.e. they will be updated
- // by initialization.
-- index0 = Math.max(index0, 0);
-- index1 = Math.max((getViewCount() - 1), 0);
-- for (int i = index0; i <= index1; i++) {
-+ for (int i = firstUpdateIndex; i <= lastUpdateIndex; i++) {
- if (! ((i >= hole0) && (i <= hole1))) {
-- v = getView(i);
-+ View v = getView(i);
- if (v != null) {
- Shape childAlloc = getChildAllocation(i, a);
- forwardUpdateToView(v, e, childAlloc, f);
-@@ -1187,6 +1162,39 @@
- }
-
- /**
-+ * Calculates the first and the last indexes of the child views
-+ * that need to be notified of the change to the model.
-+ * @param e the change information from the associated document
-+ */
-+ void calculateUpdateIndexes(DocumentEvent e) {
-+ int pos = e.getOffset();
-+ firstUpdateIndex = getViewIndex(pos, Position.Bias.Forward);
-+ if (firstUpdateIndex == -1 && e.getType() == DocumentEvent.EventType.REMOVE &&
-+ pos >= getEndOffset()) {
-+ // Event beyond our offsets. We may have represented this, that is
-+ // the remove may have removed one of our child Elements that
-+ // represented this, so, we should forward to last element.
-+ firstUpdateIndex = getViewCount() - 1;
-+ }
-+ lastUpdateIndex = firstUpdateIndex;
-+ View v = (firstUpdateIndex >= 0) ? getView(firstUpdateIndex) : null;
-+ if (v != null) {
-+ if ((v.getStartOffset() == pos) && (pos > 0)) {
-+ // If v is at a boundary, forward the event to the previous
-+ // view too.
-+ firstUpdateIndex = Math.max(firstUpdateIndex - 1, 0);
-+ }
-+ }
-+ if (e.getType() != DocumentEvent.EventType.REMOVE) {
-+ lastUpdateIndex = getViewIndex(pos + e.getLength(), Position.Bias.Forward);
-+ if (lastUpdateIndex < 0) {
-+ lastUpdateIndex = getViewCount() - 1;
-+ }
-+ }
-+ firstUpdateIndex = Math.max(firstUpdateIndex, 0);
-+ }
-+
-+ /**
- * Forwards the <code>DocumentEvent</code> to the give child view. This
- * simply messages the view with a call to <code>insertUpdate</code>,
- * <code>removeUpdate</code>, or <code>changedUpdate</code> depending
-@@ -1345,4 +1353,14 @@
- private View parent;
- private Element elem;
-
-+ /**
-+ * The index of the first child view to be notified.
-+ */
-+ int firstUpdateIndex;
-+
-+ /**
-+ * The index of the last child view to be notified.
-+ */
-+ int lastUpdateIndex;
-+
- };
---- ./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 2014-07-15 21:49:29.000000000 -0700
-@@ -31,6 +31,9 @@
- import java.beans.*;
- import java.lang.reflect.*;
-
-+import sun.reflect.misc.MethodUtil;
-+import sun.reflect.misc.ReflectUtil;
-+
- /**
- * Component decorator that implements the view interface
- * for &lt;object&gt; elements.
-@@ -87,6 +90,7 @@
- AttributeSet attr = getElement().getAttributes();
- String classname = (String) attr.getAttribute(HTML.Attribute.CLASSID);
- try {
-+ ReflectUtil.checkPackageAccess(classname);
- Class c = Class.forName(classname, true,Thread.currentThread().
- getContextClassLoader());
- Object o = c.newInstance();
-@@ -116,28 +120,6 @@
- }
-
- /**
-- * Get a Class object to use for loading the
-- * classid. If possible, the Classloader
-- * used to load the associated Document is used.
-- * This would typically be the same as the ClassLoader
-- * used to load the EditorKit. If the documents
-- * ClassLoader is null,
-- * <code>Class.forName</code> is used.
-- */
-- private Class getClass(String classname) throws ClassNotFoundException {
-- Class klass;
--
-- Class docClass = getDocument().getClass();
-- ClassLoader loader = docClass.getClassLoader();
-- if (loader != null) {
-- klass = loader.loadClass(classname);
-- } else {
-- klass = Class.forName(classname);
-- }
-- return klass;
-- }
--
-- /**
- * Initialize this component according the KEY/VALUEs passed in
- * via the &lt;param&gt; elements in the corresponding
- * &lt;object&gt; element.
-@@ -170,7 +152,7 @@
- }
- Object [] args = { value };
- try {
-- writer.invoke(comp, args);
-+ MethodUtil.invoke(writer, comp, args);
- } catch (Exception ex) {
- System.err.println("Invocation failed");
- // invocation code
---- ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java 2013-09-06 11:28:29.000000000 -0700
-+++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java 2014-07-15 21:49:29.000000000 -0700
-@@ -57,9 +57,9 @@
- {"appletviewer.appletinfo.applet", "-- \u30A2\u30D7\u30EC\u30C3\u30C8\u60C5\u5831\u306A\u3057 --"},
- {"appletviewer.appletinfo.param", "-- \u30D1\u30E9\u30E1\u30FC\u30BF\u60C5\u5831\u306A\u3057 --"},
- {"appletviewer.appletinfo.textframe", "\u30A2\u30D7\u30EC\u30C3\u30C8\u60C5\u5831"},
-- {"appletviewer.appletprint.fail", "\u5370\u5237\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002"},
-- {"appletviewer.appletprint.finish", "\u5370\u5237\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002"},
-- {"appletviewer.appletprint.cancel", "\u5370\u5237\u304C\u4E2D\u6B62\u3055\u308C\u307E\u3057\u305F\u3002"},
-+ {"appletviewer.appletprint.fail", "\u5370\u5237\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002"},
-+ {"appletviewer.appletprint.finish", "\u5370\u5237\u3092\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002"},
-+ {"appletviewer.appletprint.cancel", "\u5370\u5237\u304C\u53D6\u308A\u6D88\u3055\u308C\u307E\u3057\u305F\u3002"},
- {"appletviewer.appletencoding", "\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0: {0}"},
- {"appletviewer.parse.warning.requiresname", "\u8B66\u544A: <param name=... value=...>\u30BF\u30B0\u306Bname\u5C5E\u6027\u304C\u5FC5\u8981\u3067\u3059\u3002"},
- {"appletviewer.parse.warning.paramoutside", "\u8B66\u544A: <param>\u30BF\u30B0\u304C<applet> ... </applet>\u306E\u5916\u5074\u3067\u3059\u3002"},
-@@ -98,7 +98,7 @@
- {"appletioexception.loadclass.throw.notloaded", "\u30AF\u30E9\u30B9\u304C\u30ED\u30FC\u30C9\u3055\u308C\u307E\u305B\u3093: {0}"},
- {"appletclassloader.loadcode.verbose", "{1}\u3092\u53D6\u5F97\u3059\u308B\u305F\u3081\u306E{0}\u3078\u306E\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u958B\u304D\u307E\u3059"},
- {"appletclassloader.filenotfound", "{0}\u306E\u691C\u7D22\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
-- {"appletclassloader.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u30FB\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-+ {"appletclassloader.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
- {"appletclassloader.fileioexception", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u5165\u51FA\u529B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
- {"appletclassloader.fileexception", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
- {"appletclassloader.filedeath", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u304C\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3057\u305F"},
-@@ -132,7 +132,7 @@
- {"appletpanel.notdisposed", "\u30ED\u30FC\u30C9: \u30A2\u30D7\u30EC\u30C3\u30C8\u304C\u7834\u68C4\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
- {"appletpanel.bail", "\u4E2D\u65AD\u6E08: \u7D42\u4E86\u3057\u3066\u3044\u307E\u3059\u3002"},
- {"appletpanel.filenotfound", "{0}\u306E\u691C\u7D22\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
-- {"appletpanel.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u30FB\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
-+ {"appletpanel.fileformat", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
- {"appletpanel.fileioexception", "{0}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B\u5165\u51FA\u529B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
- {"appletpanel.fileexception", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"},
- {"appletpanel.filedeath", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u304C\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3057\u305F"},
---- ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java 2013-09-06 11:28:29.000000000 -0700
-+++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java 2014-07-15 21:49:29.000000000 -0700
-@@ -93,7 +93,7 @@
- {"appletviewer.main.nosecmgr", "Advert\u00EAncia: SecurityManager n\u00E3o instalado!"},
- {"appletviewer.main.warning", "Advert\u00EAncia: Nenhum applet iniciado. Certifique-se de que a entrada contenha uma tag <applet>."},
- {"appletviewer.main.warn.prop.overwrite", "Advert\u00EAncia: Substituindo a propriedade do sistema temporariamente a pedido do usu\u00E1rio: chave: {0} valor antigo: {1} valor novo: {2}"},
-- {"appletviewer.main.warn.cantreadprops", "Advert\u00EAncia: N\u00E3o \u00E9 poss\u00EDvel ler o arquivo de propriedades AppletViewer: {0} Usando defaults."},
-+ {"appletviewer.main.warn.cantreadprops", "Advert\u00EAncia: N\u00E3o \u00E9 poss\u00EDvel ler o arquivo de propriedades AppletViewer: {0} Usando padr\u00F5es."},
- {"appletioexception.loadclass.throw.interrupted", "carregamento de classe interrompido: {0}"},
- {"appletioexception.loadclass.throw.notloaded", "classe n\u00E3o carregada: {0}"},
- {"appletclassloader.loadcode.verbose", "Fluxo de abertura para: {0} para obter {1}"},
---- ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java 2013-09-06 11:28:29.000000000 -0700
-+++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java 2014-07-15 21:49:29.000000000 -0700
-@@ -85,7 +85,7 @@
- {"appletviewer.main.prop.store", "Anv\u00E4ndarspecifika egenskaper f\u00F6r AppletViewer"},
- {"appletviewer.main.err.prop.cantread", "Kan inte l\u00E4sa egenskapsfilen: {0}"},
- {"appletviewer.main.err.prop.cantsave", "Kan inte spara egenskapsfilen: {0}"},
-- {"appletviewer.main.warn.nosecmgr", "Varning: s\u00E4kerheten inaktiveras."},
-+ {"appletviewer.main.warn.nosecmgr", "Varning! S\u00E4kerheten avaktiveras."},
- {"appletviewer.main.debug.cantfinddebug", "Hittar inte fels\u00F6kningsprogrammet!"},
- {"appletviewer.main.debug.cantfindmain", "Hittar inte huvudmetoden i fels\u00F6kningsprogrammet!"},
- {"appletviewer.main.debug.exceptionindebug", "Undantag i fels\u00F6kningsprogrammet!"},
---- ./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-07-15 21:49:29.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
-@@ -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;
-
-@@ -39,6 +40,7 @@
- import java.security.AccessControlContext;
-
- import java.io.File;
-+import java.util.ResourceBundle;
- import java.util.Vector;
-
- /**
-@@ -236,6 +238,11 @@
- */
- AccessControlContext getAccessControlContext(Component comp);
-
-+ /**
-+ * Revalidates the component synchronously.
-+ */
-+ void revalidateSynchronously(Component comp);
-+
- }
-
- /*
-@@ -690,6 +697,32 @@
- }
-
- /*
-+ *An accessor for the toolkit class
-+ */
-+ public interface ToolkitAccessor {
-+ void setPlatformResources(ResourceBundle bundle);
-+ }
-+
-+ /*
-+ * 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 +749,8 @@
- private static TrayIconAccessor trayIconAccessor;
- private static DefaultKeyboardFocusManagerAccessor defaultKeyboardFocusManagerAccessor;
- private static SequencedEventAccessor sequencedEventAccessor;
-+ private static InvocationEventAccessor invocationEventAccessor;
-+ private static ToolkitAccessor toolkitAccessor;
-
- /*
- * Set an accessor object for the java.awt.Component class.
-@@ -1110,4 +1145,36 @@
- // (so not a single instance of the event has been created).
- return sequencedEventAccessor;
- }
-+
-+ /*
-+ * Set an accessor object for the java.awt.Toolkit class.
-+ */
-+ public static void setToolkitAccessor(ToolkitAccessor ta) {
-+ toolkitAccessor = ta;
-+ }
-+
-+ /*
-+ * Get the accessor object for the java.awt.Toolkit class.
-+ */
-+ public static ToolkitAccessor getToolkitAccessor() {
-+ if (toolkitAccessor == null) {
-+ unsafe.ensureClassInitialized(Toolkit.class);
-+ }
-+
-+ return toolkitAccessor;
-+ }
-+
-+ /*
-+ * 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-07-15 21:49:29.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-07-15 21:54:44.000000000 -0700
-@@ -323,6 +323,20 @@
- while (context == null) {
- threadGroup = threadGroup.getParent();
- if (threadGroup == null) {
-+ // We've got up to the root thread group and did not find an AppContext
-+ // Try to get it from the security manager
-+ SecurityManager securityManager = System.getSecurityManager();
-+ if (securityManager != null) {
-+ ThreadGroup smThreadGroup = securityManager.getThreadGroup();
-+ if (smThreadGroup != null) {
-+ /*
-+ * If we get this far then it's likely that
-+ * the ThreadGroup does not actually belong
-+ * to the applet, so do not cache it.
-+ */
-+ return threadGroup2appContext.get(smThreadGroup);
-+ }
-+ }
- return null;
- }
- context = threadGroup2appContext.get(threadGroup);
-@@ -837,21 +851,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-10-28 20:19:52.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
-@@ -867,7 +867,7 @@
- return descriptors;
- }
-
-- private FontDescriptor[] buildFontDescriptors(int fontIndex, int styleIndex) {
-+ protected FontDescriptor[] buildFontDescriptors(int fontIndex, int styleIndex) {
- String fontName = fontNames[fontIndex];
- String styleName = styleNames[styleIndex];
-
-@@ -1146,7 +1146,7 @@
- */
- HashMap<String, Boolean> existsMap;
- public boolean needToSearchForFile(String fileName) {
-- if (!FontUtilities.isLinux) {
-+ if (!FontUtilities.isLinux && !FontUtilities.isBSD) {
- return false;
- } 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-10-28 20:19:52.000000000 -0700
-@@ -39,6 +39,7 @@
- WINDOWS,
- LINUX,
- SOLARIS,
-+ BSD,
- MACOSX,
- UNKNOWN
- }
-@@ -101,6 +102,10 @@
- return SOLARIS;
- }
-
-+ if (osName.contains("BSD")) {
-+ return BSD;
-+ }
-+
- 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-07-15 21:49:29.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-07-15 21:49:29.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(); )
- {
-@@ -98,8 +98,7 @@
- }
-
- flavors = DataTransferer.getInstance().
-- setToSortedDataFlavorArray(flavorsToData.keySet(),
-- flavorsForFormats);
-+ setToSortedDataFlavorArray(flavorsToData.keySet());
- }
- } finally {
- clipboard.closeClipboard();
---- ./jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java 2013-09-06 11:28:30.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java 2014-07-15 21:49:29.000000000 -0700
-@@ -2406,15 +2406,6 @@
- }
-
- /**
-- * Helper function to reduce a Map with DataFlavor keys to a DataFlavor
-- * array. The array will be sorted according to
-- * <code>DataFlavorComparator</code>.
-- */
-- public static DataFlavor[] keysToDataFlavorArray(Map map) {
-- return setToSortedDataFlavorArray(map.keySet(), map);
-- }
--
-- /**
- * Helper function to convert a Set of DataFlavors to a sorted array.
- * The array will be sorted according to <code>DataFlavorComparator</code>.
- */
-@@ -2428,24 +2419,6 @@
- }
-
- /**
-- * Helper function to convert a Set of DataFlavors to a sorted array.
-- * The array will be sorted according to a
-- * <code>DataFlavorComparator</code> created with the specified
-- * flavor-to-native map as an argument.
-- */
-- public static DataFlavor[] setToSortedDataFlavorArray
-- (Set flavorsSet, Map flavorToNativeMap)
-- {
-- DataFlavor[] flavors = new DataFlavor[flavorsSet.size()];
-- flavorsSet.toArray(flavors);
-- Comparator comparator =
-- new DataFlavorComparator(flavorToNativeMap,
-- IndexedComparator.SELECT_WORST);
-- Arrays.sort(flavors, comparator);
-- return flavors;
-- }
--
-- /**
- * Helper function to convert an InputStream to a byte[] array.
- */
- protected static byte[] inputStreamToByteArray(InputStream str)
-@@ -2723,11 +2696,9 @@
- * application/x-java-* MIME types. Unknown application types are preferred
- * because if the user provides his own data flavor, it will likely be the
- * most descriptive one. For flavors which are otherwise equal, the
-- * flavors' native formats are compared, with greater long values
-- * taking precedence.
-+ * flavors' string representation are compared in the alphabetical order.
- */
- public static class DataFlavorComparator extends IndexedComparator {
-- protected final Map flavorToFormatMap;
-
- private final CharsetComparator charsetComparator;
-
-@@ -2863,20 +2834,6 @@
- super(order);
-
- charsetComparator = new CharsetComparator(order);
-- flavorToFormatMap = Collections.EMPTY_MAP;
-- }
--
-- public DataFlavorComparator(Map map) {
-- this(map, SELECT_BEST);
-- }
--
-- public DataFlavorComparator(Map map, boolean order) {
-- super(order);
--
-- charsetComparator = new CharsetComparator(order);
-- HashMap hashMap = new HashMap(map.size());
-- hashMap.putAll(map);
-- flavorToFormatMap = Collections.unmodifiableMap(hashMap);
- }
-
- public int compare(Object obj1, Object obj2) {
-@@ -2972,10 +2929,9 @@
- }
- }
-
-- // As a last resort, take the DataFlavor with the greater integer
-- // format.
-- return compareLongs(flavorToFormatMap, flavor1, flavor2,
-- UNKNOWN_OBJECT_LOSES_L);
-+ // The flavours are not equal but still not distinguishable.
-+ // Compare String representations in alphabetical order
-+ return flavor1.getMimeType().compareTo(flavor2.getMimeType());
- }
- }
-
---- ./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-07-15 21:49:29.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/awt/image/ByteBandedRaster.java 2013-09-06 11:28:30.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/image/ByteBandedRaster.java 2014-10-28 20:19:47.000000000 -0700
-@@ -755,10 +755,22 @@
- + scanlineStride);
- }
-
-- for (int i = 0; i < data.length; i++) {
-- if (scanlineStride > data[i].length) {
-- throw new RasterFormatException("Incorrect scanline stride: "
-- + scanlineStride);
-+ if ((long)minX - sampleModelTranslateX < 0 ||
-+ (long)minY - sampleModelTranslateY < 0) {
-+
-+ throw new RasterFormatException("Incorrect origin/translate: (" +
-+ minX + ", " + minY + ") / (" +
-+ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
-+ }
-+
-+
-+ if (height > 1 || minY - sampleModelTranslateY > 0) {
-+ // buffer should contain at least one scanline
-+ for (int i = 0; i < data.length; i++) {
-+ if (scanlineStride > data[i].length) {
-+ throw new RasterFormatException("Incorrect scanline stride: "
-+ + scanlineStride);
-+ }
- }
- }
-
---- ./jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java 2013-09-06 11:28:30.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java 2014-10-28 20:19:47.000000000 -0700
-@@ -885,15 +885,31 @@
- }
- }
-
-+ if ((long)minX - sampleModelTranslateX < 0 ||
-+ (long)minY - sampleModelTranslateY < 0) {
-+
-+ throw new RasterFormatException("Incorrect origin/translate: (" +
-+ minX + ", " + minY + ") / (" +
-+ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
-+ }
-+
- // we can be sure that width and height are greater than 0
- if (scanlineStride < 0 ||
-- scanlineStride > (Integer.MAX_VALUE / height) ||
-- scanlineStride > data.length)
-+ scanlineStride > (Integer.MAX_VALUE / height))
- {
- // integer overflow
- throw new RasterFormatException("Incorrect scanline stride: "
- + scanlineStride);
- }
-+
-+ if (height > 1 || minY - sampleModelTranslateY > 0) {
-+ // buffer should contain at least one scanline
-+ if (scanlineStride > data.length) {
-+ throw new RasterFormatException("Incorrect scanline stride: "
-+ + scanlineStride);
-+ }
-+ }
-+
- int lastScanOffset = (height - 1) * scanlineStride;
-
- if (pixelStride < 0 ||
---- ./jdk/src/share/classes/sun/awt/image/BytePackedRaster.java 2013-09-06 11:28:30.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/image/BytePackedRaster.java 2014-10-28 20:19:47.000000000 -0700
-@@ -1386,17 +1386,32 @@
- throw new RasterFormatException("Invalid raster dimension");
- }
-
-+ if ((long)minX - sampleModelTranslateX < 0 ||
-+ (long)minY - sampleModelTranslateY < 0) {
-+
-+ throw new RasterFormatException("Incorrect origin/translate: (" +
-+ minX + ", " + minY + ") / (" +
-+ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
-+ }
-+
- if (scanlineStride < 0 ||
-- scanlineStride > (Integer.MAX_VALUE / height) ||
-- scanlineStride > data.length)
-+ scanlineStride > (Integer.MAX_VALUE / height))
- {
- throw new RasterFormatException("Invalid scanline stride");
- }
-
-- int lastbit = (dataBitOffset
-- + (height-1) * scanlineStride * 8
-- + (width-1) * pixelBitStride
-- + pixelBitStride - 1);
-+ if (height > 1 || minY - sampleModelTranslateY > 0) {
-+ // buffer should contain at least one scanline
-+ if (scanlineStride > data.length) {
-+ throw new RasterFormatException("Incorrect scanline stride: "
-+ + scanlineStride);
-+ }
-+ }
-+
-+ long lastbit = (long) dataBitOffset
-+ + (long) (height - 1) * (long) scanlineStride * 8
-+ + (long) (width - 1) * (long) pixelBitStride
-+ + (long) pixelBitStride - 1;
- if (lastbit < 0 || lastbit / 8 >= data.length) {
- throw new RasterFormatException("raster dimensions overflow " +
- "array bounds");
---- ./jdk/src/share/classes/sun/awt/image/FileImageSource.java 2013-09-06 11:28:30.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/image/FileImageSource.java 2014-10-28 20:19:47.000000000 -0700
-@@ -48,6 +48,10 @@
- }
-
- protected ImageDecoder getDecoder() {
-+ if (imagefile == null) {
-+ return null;
-+ }
-+
- InputStream is;
- try {
- is = new BufferedInputStream(new FileInputStream(imagefile));
---- ./jdk/src/share/classes/sun/awt/image/IntegerComponentRaster.java 2013-09-06 11:28:30.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/image/IntegerComponentRaster.java 2014-10-28 20:19:47.000000000 -0700
-@@ -654,15 +654,31 @@
- ") must be >= 0");
- }
-
-+ if ((long)minX - sampleModelTranslateX < 0 ||
-+ (long)minY - sampleModelTranslateY < 0) {
-+
-+ throw new RasterFormatException("Incorrect origin/translate: (" +
-+ minX + ", " + minY + ") / (" +
-+ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
-+ }
-+
- // we can be sure that width and height are greater than 0
- if (scanlineStride < 0 ||
-- scanlineStride > (Integer.MAX_VALUE / height) ||
-- scanlineStride > data.length)
-+ scanlineStride > (Integer.MAX_VALUE / height))
- {
- // integer overflow
- throw new RasterFormatException("Incorrect scanline stride: "
- + scanlineStride);
- }
-+
-+ if (height > 1 || minY - sampleModelTranslateY > 0) {
-+ // buffer should contain at least one scanline
-+ if (scanlineStride > data.length) {
-+ throw new RasterFormatException("Incorrect scanline stride: "
-+ + scanlineStride);
-+ }
-+ }
-+
- int lastScanOffset = (height - 1) * scanlineStride;
-
- if (pixelStride < 0 ||
---- ./jdk/src/share/classes/sun/awt/image/ShortBandedRaster.java 2013-09-06 11:28:30.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/image/ShortBandedRaster.java 2014-10-28 20:19:47.000000000 -0700
-@@ -754,10 +754,21 @@
- + scanlineStride);
- }
-
-- for (int i = 0; i < data.length; i++) {
-- if (scanlineStride > data[i].length) {
-- throw new RasterFormatException("Incorrect scanline stride: "
-- + scanlineStride);
-+ if ((long)minX - sampleModelTranslateX < 0 ||
-+ (long)minY - sampleModelTranslateY < 0) {
-+
-+ throw new RasterFormatException("Incorrect origin/translate: (" +
-+ minX + ", " + minY + ") / (" +
-+ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
-+ }
-+
-+ if (height > 1 || minY - sampleModelTranslateY > 0) {
-+ // buffer should contain at least one scanline
-+ for (int i = 0; i < data.length; i++) {
-+ if (scanlineStride > data[i].length) {
-+ throw new RasterFormatException("Incorrect scanline stride: "
-+ + scanlineStride);
-+ }
- }
- }
-
---- ./jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java 2013-09-06 11:28:30.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java 2014-10-28 20:19:48.000000000 -0700
-@@ -819,15 +819,31 @@
- }
- }
-
-+ if ((long)minX - sampleModelTranslateX < 0 ||
-+ (long)minY - sampleModelTranslateY < 0) {
-+
-+ throw new RasterFormatException("Incorrect origin/translate: (" +
-+ minX + ", " + minY + ") / (" +
-+ sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
-+ }
-+
- // we can be sure that width and height are greater than 0
- if (scanlineStride < 0 ||
-- scanlineStride > (Integer.MAX_VALUE / height) ||
-- scanlineStride > data.length)
-+ scanlineStride > (Integer.MAX_VALUE / height))
- {
- // integer overflow
- throw new RasterFormatException("Incorrect scanline stride: "
- + scanlineStride);
- }
-+
-+ if (height > 1 || minY - sampleModelTranslateY > 0) {
-+ // buffer should contain at least one scanline
-+ if (scanlineStride > data.length) {
-+ throw new RasterFormatException("Incorrect scanline stride: "
-+ + scanlineStride);
-+ }
-+ }
-+
- int lastScanOffset = (height - 1) * scanlineStride;
-
- if (pixelStride < 0 ||
---- ./jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties 2013-09-06 11:28:30.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties 2014-10-28 20:19:48.000000000 -0700
-@@ -44,7 +44,7 @@
- AWT.subtract=Teclado Num\u00E9rico -
- AWT.decimal=Teclado Num\u00E9rico .
- AWT.divide=Teclado Num\u00E9rico /
--AWT.delete=Deletar
-+AWT.delete=Excluir
- AWT.numLock=Num Lock
- AWT.scrollLock=Scroll Lock
- AWT.f1=F1
-@@ -151,7 +151,7 @@
- AWT.undefined=Indefinido
-
- # Predefined cursor names
--AWT.DefaultCursor=Cursor Default
-+AWT.DefaultCursor=Cursor Padr\u00E3o
- AWT.CrosshairCursor=Cursor em Forma de Cruz
- AWT.TextCursor=Cursor de Texto
- AWT.WaitCursor=Cursor em Forma de Ampulheta
-@@ -165,9 +165,9 @@
- AWT.EResizeCursor=Cursor de Seta Que Aponta \u00E0 Direita
- AWT.HandCursor=Cursor em Forma de M\u00E3o
- AWT.MoveCursor=Cursor de Movimento
--AWT.DefaultDragCursor=Cursor Default de Arrastar
--AWT.DefaultNoDropCursor=Cursor Default sem Arrastar
--AWT.DefaultDropCursor=Cursor Default de Soltar
-+AWT.DefaultDragCursor=Cursor Padr\u00E3o de Arrastar
-+AWT.DefaultNoDropCursor=Cursor Padr\u00E3o sem Arrastar
-+AWT.DefaultDropCursor=Cursor Padr\u00E3o de Soltar
-
- # Input method related strings
- AWT.CompositionWindowTitle=Janela de Entrada
---- ./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-07-15 21:49:29.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 2014-07-15 21:49:29.000000000 -0700
-@@ -170,7 +170,9 @@
- }
- }
- }
-- scaler.dispose();
-+ if (scaler != null) {
-+ scaler.dispose();
-+ }
- scaler = FontScaler.getNullScaler();
- }
-
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -48,6 +48,8 @@
-
- public static boolean isLinux;
-
-+ public static boolean isBSD;
-+
- public static boolean isMacOSX;
-
- public static boolean isSolaris8;
-@@ -78,6 +80,11 @@
-
- isLinux = osName.startsWith("Linux");
-
-+
-+ isBSD = (osName.startsWith("FreeBSD") ||
-+ osName.startsWith("NetBSD") ||
-+ osName.startsWith("OpenBSD"));
-+
- isMacOSX = osName.contains("OS X"); // TODO: MacOSX
-
- 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 2014-07-15 21:49:29.000000000 -0700
-@@ -468,9 +468,10 @@
- _gvdata.grow();
- }
- }
-- if (_gvdata._count < 0) {
-- break;
-- }
-+ }
-+ // Break out of the outer for loop if layout fails.
-+ if (_gvdata._count < 0) {
-+ break;
- }
- }
-
---- ./jdk/src/share/classes/sun/font/StandardGlyphVector.java 2013-09-06 11:28:31.000000000 -0700
-+++ ./jdk/src/share/classes/sun/font/StandardGlyphVector.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1740,8 +1740,9 @@
- tx,
- sgv.font.getStyle(),
- aa, fm);
--
-- FontStrike strike = sgv.font2D.getStrike(desc); // !!! getStrike(desc, false)
-+ // Get the strike via the handle. Shouldn't matter
-+ // if we've invalidated the font but its an extra precaution.
-+ FontStrike strike = sgv.font2D.handle.font2D.getStrike(desc); // !!! getStrike(desc, false)
-
- 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-10-28 20:19:52.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.
- */
-- if (FontUtilities.isLinux) {
-+ if (FontUtilities.isLinux || FontUtilities.isBSD) {
- /* 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 2014-07-15 21:49:29.000000000 -0700
-@@ -1037,6 +1037,9 @@
- if (head_Table != null && head_Table.capacity() >= 18) {
- ShortBuffer sb = head_Table.asShortBuffer();
- upem = sb.get(9) & 0xffff;
-+ if (upem < 16 || upem > 16384) {
-+ upem = 2048;
-+ }
- }
-
- ByteBuffer os2_Table = getTableBuffer(os_2Tag);
---- ./jdk/src/share/classes/sun/invoke/util/VerifyAccess.java 2013-09-06 11:28:31.000000000 -0700
-+++ ./jdk/src/share/classes/sun/invoke/util/VerifyAccess.java 2014-07-15 21:54:44.000000000 -0700
-@@ -89,35 +89,28 @@
- if (allowedModes == 0) return false;
- assert((allowedModes & PUBLIC) != 0 &&
- (allowedModes & ~(ALL_ACCESS_MODES|PACKAGE_ALLOWED)) == 0);
-- // Usually refc and defc are the same, but if they differ, verify them both.
-- if (refc != defc) {
-- if (!isClassAccessible(refc, lookupClass, allowedModes)) {
-- // Note that defc is verified in the switch below.
-- return false;
-- }
-- if ((mods & (ALL_ACCESS_MODES|STATIC)) == (PROTECTED|STATIC) &&
-- (allowedModes & PROTECTED_OR_PACKAGE_ALLOWED) != 0) {
-- // Apply the special rules for refc here.
-- if (!isRelatedClass(refc, lookupClass))
-- return isSamePackage(defc, lookupClass);
-- // If refc == defc, the call to isPublicSuperClass will do
-- // the whole job, since in that case refc (as defc) will be
-- // a superclass of the lookup class.
-- }
-+ // The symbolic reference class (refc) must always be fully verified.
-+ if (!isClassAccessible(refc, lookupClass, allowedModes)) {
-+ return false;
- }
-+ // Usually refc and defc are the same, but verify defc also in case they differ.
- if (defc == lookupClass &&
- (allowedModes & PRIVATE) != 0)
- return true; // easy check; all self-access is OK
- switch (mods & ALL_ACCESS_MODES) {
- case PUBLIC:
-- if (refc != defc) return true; // already checked above
-- return isClassAccessible(refc, lookupClass, allowedModes);
-+ return true; // already checked above
- case PROTECTED:
- if ((allowedModes & PROTECTED_OR_PACKAGE_ALLOWED) != 0 &&
- isSamePackage(defc, lookupClass))
- return true;
-+ if ((allowedModes & PROTECTED) == 0)
-+ return false;
-+ if ((mods & STATIC) != 0 &&
-+ !isRelatedClass(refc, lookupClass))
-+ return false;
- if ((allowedModes & PROTECTED) != 0 &&
-- isPublicSuperClass(defc, lookupClass))
-+ isSuperClass(defc, lookupClass))
- return true;
- return false;
- case PACKAGE_ONLY: // That is, zero. Unmarked member is package-only access.
-@@ -139,8 +132,8 @@
- lookupClass.isAssignableFrom(refc));
- }
-
-- static boolean isPublicSuperClass(Class<?> defc, Class<?> lookupClass) {
-- return isPublic(defc.getModifiers()) && defc.isAssignableFrom(lookupClass);
-+ static boolean isSuperClass(Class<?> defc, Class<?> lookupClass) {
-+ return defc.isAssignableFrom(lookupClass);
- }
-
- /**
---- ./jdk/src/share/classes/sun/java2d/Disposer.java 2013-09-06 11:28:34.000000000 -0700
-+++ ./jdk/src/share/classes/sun/java2d/Disposer.java 2014-07-15 21:49:29.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();
- } catch (Exception e) {
-- System.out.println("Exception while removing reference: " + e);
-- e.printStackTrace();
-+ System.out.println("Exception while removing reference.");
- }
- }
- }
-@@ -177,7 +176,6 @@
- rec.dispose();
- } catch (Exception e) {
- System.out.println("Exception while disposing deferred rec.");
-- e.printStackTrace();
- }
- }
- deferredRecords.clear();
-@@ -228,8 +226,7 @@
- }
- }
- } catch (Exception e) {
-- System.out.println("Exception while removing reference: " + e);
-- e.printStackTrace();
-+ System.out.println("Exception while removing reference.");
- } 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-07-15 21:49:29.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_de.properties 2013-09-06 11:28:35.000000000 -0700
-+++ ./jdk/src/share/classes/sun/launcher/resources/launcher_de.properties 2014-07-15 21:49:29.000000000 -0700
-@@ -37,7 +37,7 @@
- java.launcher.opt.footer =\ -cp <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n -classpath <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n und ZIP-Archiven zur Suche nach Klassendateien.\n -D<name>=<value>\n Legt eine Systemeigenschaft fest\n -verbose:[class|gc|jni]\n Aktiviert die Verbose-Ausgabe\n -version Druckt Produktversion und beendet das Programm\n -version:<value>\n Erfordert die angegebene Version zur Ausf\u00FChrung\n -showversion Druckt Produktversion und f\u00E4hrt fort\n -jre-restrict-search | -no-jre-restrict-search\n Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n -? -help Druckt diese Hilfemeldung\n -X Druckt Hilfe zu Nicht-Standardoptionen\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n Aktiviert Assertionen mit angegebener Granularit\u00E4t\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n Deaktiviert Assertionen mit angegebener Granularit\u00E4t\n -esa | -enablesystemassertions\n Aktiviert Systemassertionen\n -dsa | -disablesystemassertions\n Deaktiviert Systemassertionen\n -agentlib:<libname>[=<options>]\n L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n siehe auch -agentlib:jdwp=help und -agentlib:hprof=help\n -agentpath:<pathname>[=<options>]\n L\u00E4dt native Agent Library nach vollem Pfadnamen\n -javaagent:<jarpath>[=<options>]\n L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n -splash:<imagepath>\n Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://www.oracle.com/technetwork/java/javase/documentation/index.html
-
- # Translators please note do not translate the options themselves
--java.launcher.X.usage=\ -Xmixed Ausf\u00FChrung im gemischten Modus (Standard)\n -Xint Nur Ausf\u00FChrung im interpretierten Modus\n -Xbootclasspath:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Legt Suchpfad f\u00FCr Bootstrap-Klassen und Ressourcen fest\n -Xbootclasspath/a:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n H\u00E4ngt an das Ende des Bootstrap Classpath an\n -Xbootclasspath/p:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Stellt Bootstrap Classpath voran\n -Xdiag Zeigt zus\u00E4tzliche Diagnosemeldungen an\n -Xnoclassgc Deaktiviert Klassen-Garbage Collection\n -Xincgc Aktiviert inkrementelle Garbage Collection\n -Xloggc:<file> Loggt GC-Status in einer Datei mit Zeitstempeln\n -Xbatch Deaktiviert Hintergrundkompilierung\n -Xms<size> Legt anf\u00E4ngliche Java Heap-Gr\u00F6\u00DFe fest\n -Xmx<size> Legt maximale Java Heap-Gr\u00F6\u00DFe fest\n -Xss<size> Legt Java-Thread-Stackgr\u00F6\u00DFe fest\n -Xprof Gibt CPU-Profiling-Daten aus\n -Xfuture Aktiviert strengste Pr\u00FCfungen, antizipiert zuk\u00FCnftigen Standardwert\n -Xrs Reduziert Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n -Xcheck:jni F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen durch\n -Xshare:off Kein Versuch, gemeinsame Klassendaten zu verwenden\n -Xshare:auto Verwendet gemeinsame Klassendaten, wenn m\u00F6glich (Standard)\n -Xshare:on Erfordert die Verwendung gemeinsamer Klassendaten, sonst verl\u00E4uft der Vorgang nicht erfolgreich.\n -XshowSettings Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:all\n Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen und f\u00E4hrt fort\n -XshowSettings:properties\n Zeigt alle Eigenschaftseinstellungen und f\u00E4hrt fort\n -XshowSettings:locale\n Zeigt alle gebietsschemabezogenen Einstellungen und f\u00E4hrt fort\n\nDie -X-Optionen sind keine Standardoptionen und k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
-+java.launcher.X.usage=\ -Xmixed Ausf\u00FChrung im gemischten Modus (Standard)\n -Xint Nur Ausf\u00FChrung im interpretierten Modus\n -Xbootclasspath:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Legt Suchpfad f\u00FCr Bootstrap-Klassen und Ressourcen fest\n -Xbootclasspath/a:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n H\u00E4ngt an das Ende des Bootstrap Classpath an\n -Xbootclasspath/p:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n Stellt Bootstrap Classpath voran\n -Xdiag Zeigt zus\u00E4tzliche Diagnosemeldungen an\n -Xnoclassgc Deaktiviert Klassen-Garbage Collection\n -Xincgc Aktiviert inkrementelle Garbage Collection\n -Xloggc:<file> Loggt GC-Status in einer Datei mit Zeitstempeln\n -Xbatch Deaktiviert Hintergrundkompilierung\n -Xms<size> Legt anf\u00E4ngliche Java Heap-Gr\u00F6\u00DFe fest\n -Xmx<size> Legt maximale Java Heap-Gr\u00F6\u00DFe fest\n -Xss<size> Legt Java-Threadstackgr\u00F6\u00DFe fest\n -Xprof Gibt CPU-Profiling-Daten aus\n -Xfuture Aktiviert strengste Pr\u00FCfungen, antizipiert zuk\u00FCnftigen Standardwert\n -Xrs Reduziert Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n -Xcheck:jni F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen durch\n -Xshare:off Kein Versuch, gemeinsame Klassendaten zu verwenden\n -Xshare:auto Verwendet gemeinsame Klassendaten, wenn m\u00F6glich (Standard)\n -Xshare:on Erfordert die Verwendung gemeinsamer Klassendaten, sonst verl\u00E4uft der Vorgang nicht erfolgreich.\n -XshowSettings Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:all\n Zeigt alle Einstellungen und f\u00E4hrt fort\n -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen und f\u00E4hrt fort\n -XshowSettings:properties\n Zeigt alle Eigenschaftseinstellungen und f\u00E4hrt fort\n -XshowSettings:locale\n Zeigt alle gebietsschemabezogenen Einstellungen und f\u00E4hrt fort\n\nDie -X-Optionen sind keine Standardoptionen und k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
-
- # Translators please note do not translate the options themselves
- java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr Mac OS X spezifisch:\n -XstartOnFirstThread\n f\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit) Thread aus\n -Xdock:name=<Anwendungsname>"\n \u00DCberschreibt den in der Uhr angezeigten Standardanwendungsnamen\n -Xdock:icon=<Pfad zu Symboldatei>\n \u00DCberschreibt das in der Uhr angezeigte Standardsymbol\n\n
---- ./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-07-15 21:49:29.000000000 -0700
-@@ -34,7 +34,7 @@
- java.launcher.ergo.message2 =\ car vous ex\u00E9cutez une machine de classe de serveur.\n
-
- # Translators please note do not translate the options themselves
--java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n -classpath <class search path of directories and zip/jar files>\n Liste de r\u00E9pertoires, d''archives JAR et\n d''archives ZIP s\u00E9par\u00E9s par des {0}, dans laquelle rechercher les fichiers de classe.\n -D<name>=<value>\n d\u00E9finition d''une propri\u00E9t\u00E9 syst\u00E8me\n -verbose[:class|gc|jni]\n activation de la sortie en mode verbose\n -version impression de la version du produit et fin de l''op\u00E9ration\n -version:<value>\n ex\u00E9cution de la version sp\u00E9cifi\u00E9e obligatoire\n -showversion impression de la version du produit et poursuite de l''op\u00E9ration\n -jre-restrict-search | -no-jre-restrict-search\n inclusion/exclusion des environnements JRE priv\u00E9s de l''utilisateur dans la recherche de version\n -? -help impression du message d''aide\n -X impression de l''aide sur les options non standard\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n activation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n d\u00E9sactivation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n -esa | -enablesystemassertions\n activation des assertions syst\u00E8me\n -dsa | -disablesystemassertions\n d\u00E9sactivation des assertions syst\u00E8me\n -agentlib:<libname>[=<options>]\n chargement de la biblioth\u00E8que d''agent natif <libname>, par exemple -agentlib:hprof\n voir \u00E9galement, -agentlib:jdwp=help et -agentlib:hprof=help\n -agentpath:<pathname>[=<options>]\n chargement de la biblioth\u00E8que d''agent natif via le chemin d''acc\u00E8s complet\n -javaagent:<jarpath>[=<options>]\n chargement de l''agent du langage de programmation Java, voir java.lang.instrument\n -splash:<imagepath>\n affichage de l''\u00E9cran d''accueil avec l''image sp\u00E9cifi\u00E9e\nVoir http://www.oracle.com/technetwork/java/javase/documentation/index.html pour plus de d\u00E9tails.
-+java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n -classpath <class search path of directories and zip/jar files>\n Liste de r\u00E9pertoires, d''archives JAR et\n d''archives ZIP s\u00E9par\u00E9s par des {0}, dans laquelle rechercher les fichiers de classe.\n -D<name>=<value>\n d\u00E9finition d''une propri\u00E9t\u00E9 syst\u00E8me\n -verbose:[class|gc|jni]\n activation de la sortie en mode verbose\n -version impression de la version du produit et fin de l''op\u00E9ration\n -version:<value>\n ex\u00E9cution de la version sp\u00E9cifi\u00E9e obligatoire\n -showversion impression de la version du produit et poursuite de l''op\u00E9ration\n -jre-restrict-search | -no-jre-restrict-search\n inclusion/exclusion des environnements JRE priv\u00E9s de l''utilisateur dans la recherche de version\n -? -help impression du message d''aide\n -X impression de l''aide sur les options non standard\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n activation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n d\u00E9sactivation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n -esa | -enablesystemassertions\n activation des assertions syst\u00E8me\n -dsa | -disablesystemassertions\n d\u00E9sactivation des assertions syst\u00E8me\n -agentlib:<libname>[=<options>]\n chargement de la biblioth\u00E8que d''agent natif <libname>, par exemple -agentlib:hprof\n voir \u00E9galement, -agentlib:jdwp=help et -agentlib:hprof=help\n -agentpath:<pathname>[=<options>]\n chargement de la biblioth\u00E8que d''agent natif via le chemin d''acc\u00E8s complet\n -javaagent:<jarpath>[=<options>]\n chargement de l''agent du langage de programmation Java, voir java.lang.instrument\n -splash:<imagepath>\n affichage de l''\u00E9cran d''accueil avec l''image sp\u00E9cifi\u00E9e\nVoir http://www.oracle.com/technetwork/java/javase/documentation/index.html pour plus de d\u00E9tails.
-
- # 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-07-15 21:49:29.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
-
- # Translators please note do not translate the options themselves
--java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n -classpath <class search path of directories and zip/jar files>\n \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001\n JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u304A\u3088\u3073ZIP\u30A2\u30FC\u30AB\u30A4\u30D6\u306E{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30EA\u30B9\u30C8\u3067\u3059\u3002\n -D<name>=<value>\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n -verbose:[class|gc|jni]\n \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046\n -version \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n -version:<value>\n \u6307\u5B9A\u3057\u305F\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5B9F\u884C\u306B\u5FC5\u9808\u306B\u3059\u308B\n -showversion \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3059\u308B\n -jre-restrict-search | -no-jre-restrict-search\n \u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8JRE\u3092\u30D0\u30FC\u30B8\u30E7\u30F3\u691C\u7D22\u306B\u542B\u3081\u308B/\u9664\u5916\u3059\u308B\n -? -help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n -X \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u95A2\u3059\u308B\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3059\u308B\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -esa | -enablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -dsa | -disablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -agentlib:<libname>[=<options>]\n \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002\u4F8B: -agentlib:hprof\n -agentlib:jdwp=help\u3068-agentlib:hprof=help\u3082\u53C2\u7167\n -agentpath:<pathname>[=<options>]\n \u30D5\u30EB\u30D1\u30B9\u540D\u3067\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3059\u308B\n -javaagent:<jarpath>[=<options>]\n Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002java.lang.instrument\u3092\u53C2\u7167\n -splash:<imagepath>\n \u6307\u5B9A\u3057\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3059\u308B\n\u8A73\u7D30\u306Fhttp://www.oracle.com/technetwork/java/javase/documentation/index.html\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-+java.launcher.opt.footer =\ -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001\n JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u304A\u3088\u3073ZIP\u30A2\u30FC\u30AB\u30A4\u30D6\u306E{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30EA\u30B9\u30C8\u3067\u3059\u3002\n -D<name>=<value>\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n -verbose:[class|gc|jni]\n \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046\n -version \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n -version:<value>\n \u6307\u5B9A\u3057\u305F\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5B9F\u884C\u306B\u5FC5\u9808\u306B\u3059\u308B\n -showversion \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3059\u308B\n -jre-restrict-search | -no-jre-restrict-search\n \u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8JRE\u3092\u30D0\u30FC\u30B8\u30E7\u30F3\u691C\u7D22\u306B\u542B\u3081\u308B/\u9664\u5916\u3059\u308B\n -? -help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n -X \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u95A2\u3059\u308B\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3059\u308B\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -esa | -enablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -dsa | -disablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -agentlib:<libname>[=<options>]\n \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002\u4F8B: -agentlib:hprof\n -agentlib:jdwp=help\u3068-agentlib:hprof=help\u3082\u53C2\u7167\n -agentpath:<pathname>[=<options>]\n \u30D5\u30EB\u30D1\u30B9\u540D\u3067\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3059\u308B\n -javaagent:<jarpath>[=<options>]\n Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002java.lang.instrument\u3092\u53C2\u7167\n -splash:<imagepath>\n \u6307\u5B9A\u3057\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3059\u308B\n\u8A73\u7D30\u306Fhttp://www.oracle.com/technetwork/java/javase/documentation/index.html\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
- # Translators please note do not translate the options themselves
--java.launcher.X.usage=\ -Xmixed \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xint \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n -Xbootclasspath:<directories and zip/jar files separated by {0}>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u306E\u30AF\u30E9\u30B9\u3068\u30EA\u30BD\u30FC\u30B9\u306E\u691C\u7D22\u30D1\u30B9\u3092\u8A2D\u5B9A\u3059\u308B\n -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3059\u308B\n -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u524D\u306B\u4ED8\u52A0\u3059\u308B\n -Xdiag \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\n -Xnoclassgc \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xincgc \u5897\u5206\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -Xloggc:<file> \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3059\u308B\n -Xbatch \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xms<size> Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xmx<size> Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xss<size> Java\u306E\u30B9\u30EC\u30C3\u30C9\u30FB\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xprof CPU\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u30FB\u30C7\u30FC\u30BF\u3092\u51FA\u529B\u3059\u308B\n -Xfuture \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3059\u308B\n -Xrs Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3059\u308B(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n -Xcheck:jni JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3059\u308B\n -Xshare:off \u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u306A\u3044\n -Xshare:auto \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xshare:on \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3059\u308B\u3002\n -XshowSettings \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:all\n \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:vm \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:properties\n \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:locale\n \
--\u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\n-X\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u6A19\u6E96\u306A\u306E\u3067\u3001\u4E88\u544A\u306A\u304F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n
-+java.launcher.X.usage=\ -Xmixed \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xint \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n -Xbootclasspath:<{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u306E\u30AF\u30E9\u30B9\u3068\u30EA\u30BD\u30FC\u30B9\u306E\u691C\u7D22\u30D1\u30B9\u3092\u8A2D\u5B9A\u3059\u308B\n -Xbootclasspath/a:<{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3059\u308B\n -Xbootclasspath/p:<{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u524D\u306B\u4ED8\u52A0\u3059\u308B\n -Xdiag \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\n -Xnoclassgc \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xincgc \u5897\u5206\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n -Xloggc:<file> \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3059\u308B\n -Xbatch \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xms<size> Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xmx<size> Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xss<size> Java\u306E\u30B9\u30EC\u30C3\u30C9\u30FB\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xprof CPU\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u30FB\u30C7\u30FC\u30BF\u3092\u51FA\u529B\u3059\u308B\n -Xfuture \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3059\u308B\n -Xrs Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3059\u308B(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n -Xcheck:jni JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3059\u308B\n -Xshare:off \u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u306A\u3044\n -Xshare:auto \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xshare:on \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3059\u308B\u3002\n -XshowSettings \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:all\n \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:vm \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:properties\n \
-+\u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:locale\n \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\n-X\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u6A19\u6E96\u306A\u306E\u3067\u3001\u4E88\u544A\u306A\u304F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n
-
- # 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-07-15 21:49:30.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
-
- # Translators please note do not translate the options themselves
--java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\\n -classpath <class search path of directories and zip/jar files>\\n \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD560 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC,\\n JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\\n -D<name>=<value>\\n \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\\n -verbose:[class|gc|jni]\\n \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -version \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uC885\uB8CC\uD569\uB2C8\uB2E4.\\n -version:<value>\\n \uC2E4\uD589\uD560 \uBC84\uC804\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.\\n -showversion \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\\n -jre-restrict-search | -no-jre-restrict-search\\n \uBC84\uC804 \uAC80\uC0C9\uC5D0\uC11C \uC0AC\uC6A9\uC790 \uC804\uC6A9 JRE\uB97C \uD3EC\uD568/\uC81C\uC678\uD569\uB2C8\uB2E4.\\n -? -help \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\\n -X \uBE44\uD45C\uC900 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\\n -ea[:<packagename>...|:<classname>]\\n -enableassertions[:<packagename>...|:<classname>]\\n \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -da[:<packagename>...|:<classname>]\\n -disableassertions[:<packagename>...|:<classname>]\\n \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -esa | -enablesystemassertions\\n \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -dsa | -disablesystemassertions\\n \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\\n -agentlib:<libname>[=<options>]\\n <libname> \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:hprof).\\n -agentlib:jdwp=help \uBC0F -agentlib:hprof=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\\n -agentpath:<pathname>[=<options>]\\n \uC804\uCCB4 \uACBD\uB85C\uBA85\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\\n -javaagent:<jarpath>[=<options>]\\n Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\\n -splash:<imagepath>\\n \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\\n\uC790\uC138\uD55C \uB0B4\uC6A9\uC740 http://www.oracle.com/technetwork/java/javase/documentation/index.html\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
-+java.launcher.opt.footer =\ -cp <\uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C\uC758 \uD074\uB798\uC2A4 \uAC80\uC0C9 \uACBD\uB85C>\n -classpath <\uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C\uC758 \uD074\uB798\uC2A4 \uAC80\uC0C9 \uACBD\uB85C>\n \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD560 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC,\n JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\n -D<name>=<value>\n \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\n -verbose:[class|gc|jni]\n \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -version \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n -version:<value>\n \uC2E4\uD589\uD560 \uBC84\uC804\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.\n -showversion \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -jre-restrict-search | -no-jre-restrict-search\n \uBC84\uC804 \uAC80\uC0C9\uC5D0\uC11C \uC0AC\uC6A9\uC790 \uC804\uC6A9 JRE\uB97C \uD3EC\uD568/\uC81C\uC678\uD569\uB2C8\uB2E4.\n -? -help \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\n -X \uBE44\uD45C\uC900 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -esa | -enablesystemassertions\n \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -dsa | -disablesystemassertions\n \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -agentlib:<libname>[=<options>]\n <libname> \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:hprof).\n -agentlib:jdwp=help \uBC0F -agentlib:hprof=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n -agentpath:<pathname>[=<options>]\n \uC804\uCCB4 \uACBD\uB85C\uBA85\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\n -javaagent:<jarpath>[=<options>]\n Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n -splash:<imagepath>\n \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\uC790\uC138\uD55C \uB0B4\uC6A9\uC740 http://www.oracle.com/technetwork/java/javase/documentation/index.html\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
-
- # Translators please note do not translate the options themselves
--java.launcher.X.usage=\ -Xmixed \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xint \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n -Xbootclasspath:<directories and zip/jar files separated by {0}>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uBC0F \uB9AC\uC18C\uC2A4\uC5D0 \uB300\uD55C \uAC80\uC0C9 \uACBD\uB85C\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uC55E\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n -Xdiag \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n -Xnoclassgc \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xincgc \uC99D\uBD84\uC801\uC778 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xloggc:<file> \uC2DC\uAC04 \uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n -Xbatch \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xms<size> \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xmx<size> \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xss<size> Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xprof CPU \uD504\uB85C\uD30C\uC77C \uC791\uC131 \uB370\uC774\uD130\uB97C \uCD9C\uB825\uD569\uB2C8\uB2E4.\n -Xfuture \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xrs Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n -Xcheck:jni JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n -Xshare:off \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -Xshare:auto \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xshare:on \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n -XshowSettings \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:all\n \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:properties\n \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:locale\n \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\n-X \uC635\uC158\uC740 \uBE44\uD45C\uC900 \uC635\uC158\uC774\uBBC0\uB85C \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
-+java.launcher.X.usage=\ -Xmixed \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xint \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n -Xbootclasspath:<{0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uBC0F \uB9AC\uC18C\uC2A4\uC5D0 \uB300\uD55C \uAC80\uC0C9 \uACBD\uB85C\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xbootclasspath/a:<{0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n -Xbootclasspath/p:<{0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uC55E\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n -Xdiag \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n -Xnoclassgc \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xincgc \uC99D\uBD84\uC801\uC778 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xloggc:<file> \uC2DC\uAC04 \uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n -Xbatch \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xms<size> \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xmx<size> \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xss<size> Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xprof CPU \uD504\uB85C\uD30C\uC77C \uC791\uC131 \uB370\uC774\uD130\uB97C \uCD9C\uB825\uD569\uB2C8\uB2E4.\n -Xfuture \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xrs Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n -Xcheck:jni JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n -Xshare:off \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -Xshare:auto \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xshare:on \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n -XshowSettings \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:all\n \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:properties\n \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:locale\n \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\n-X \uC635\uC158\uC740 \uBE44\uD45C\uC900 \uC635\uC158\uC774\uBBC0\uB85C \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \
-+\uC788\uC2B5\uB2C8\uB2E4.\n
-
- # 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-07-15 21:49:30.000000000 -0700
-@@ -30,17 +30,17 @@
- java.launcher.opt.vmselect =\ {0}\t para selecionar a VM "{1}"\n
- java.launcher.opt.hotspot =\ {0}\t \u00E9 um sin\u00F4nimo da VM "{1}" [obsoleto]\n
-
--java.launcher.ergo.message1 =\ A VM default \u00E9 {0}
-+java.launcher.ergo.message1 =\ A VM padr\u00E3o \u00E9 {0}
- java.launcher.ergo.message2 =\ porque a execu\u00E7\u00E3o est\u00E1 sendo feita em uma m\u00E1quina de classe de servidor.\n
-
- # Translators please note do not translate the options themselves
--java.launcher.opt.footer =\ -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n Uma lista separada por {0} de diret\u00F3rios, archives JAR\n e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n -D<nome>=<valor>\n define uma propriedade do sistema\n -verbose[:classe|gc|jni]\n ativa a sa\u00EDda detalhada\n -version imprime a vers\u00E3o do produto e sai do programa\n -version:<valor>\n requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n -showversion imprime a vers\u00E3o do produto e continua\n -jre-restrict-search | -no-jre-restrict-search\n inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n -? -help imprime esta mensagem de ajuda\n -X imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n -ea[:<nome do pacote>...|:<nome da classe>]\n -enableassertions[:<nome do pacote>...|:<nome da classe>]\n ativa asser\u00E7\u00F5es com granularidade especificada\n -da[:<nome do pacote>...|:<nome da classe>]\n -disableassertions[:<nome do pacote>...|:<nome da classe>]\n desativa asser\u00E7\u00F5es com granularidade especificada\n -esa | -enablesystemassertions\n ativa asser\u00E7\u00F5es do sistema\n -dsa | -disablesystemassertions\n desativa asser\u00E7\u00F5es do sistema\n -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa <nome da biblioteca>, por exemplo: -agentlib:hprof\n consulte tamb\u00E9m: -agentlib:jdwp=help e -agentlib:hprof=help\n -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa com base no nome do caminho completo\n -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n -splash:<caminho da imagem>\n mostra a tela de abertura com a imagem especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para obter mais detalhes.
-+java.launcher.opt.footer =\ -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n Uma lista separada por {0} de diret\u00F3rios, archives JAR\n e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n -D<nome>=<valor>\n define uma propriedade do sistema\n -verbose:[class|gc|jni]\n ativa a sa\u00EDda detalhada\n -version imprime a vers\u00E3o do produto e sai do programa\n -version:<valor>\n requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n -showversion imprime a vers\u00E3o do produto e continua\n -jre-restrict-search | -no-jre-restrict-search\n inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n -? -help imprime esta mensagem de ajuda\n -X imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n -ea[:<nome do pacote>...|:<nome da classe>]\n -enableassertions[:<nome do pacote>...|:<nome da classe>]\n ativa asser\u00E7\u00F5es com granularidade especificada\n -da[:<nome do pacote>...|:<nome da classe>]\n -disableassertions[:<nome do pacote>...|:<nome da classe>]\n desativa asser\u00E7\u00F5es com granularidade especificada\n -esa | -enablesystemassertions\n ativa asser\u00E7\u00F5es do sistema\n -dsa | -disablesystemassertions\n desativa asser\u00E7\u00F5es do sistema\n -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa <nome da biblioteca>, por exemplo: -agentlib:hprof\n consulte tamb\u00E9m: -agentlib:jdwp=help e -agentlib:hprof=help\n -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n carrega a biblioteca de agentes nativa com base no nome do caminho completo\n -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n -splash:<caminho da imagem>\n mostra a tela de abertura com a imagem especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para obter mais detalhes.
-
- # 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
-+java.launcher.X.usage=\ -Xmixed execu\u00E7\u00E3o no modo misto (padr\u00E3o)\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 padr\u00E3o 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 (padr\u00E3o)\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
-
- # Translators please note do not translate the options themselves
--java.launcher.X.macosx.usage=\nAs op\u00E7\u00F5es a seguir s\u00E3o espec\u00EDficas para o Mac OS X:\n -XstartOnFirstThread\n executa o m\u00E9todo main() no primeiro thread (AppKit)\n -Xdock:name=<nome da aplica\u00E7\u00E3o>"\n substitui o nome da aplica\u00E7\u00E3o default exibido no encaixe\n -Xdock:icon=<caminho para o arquivo do \u00EDcone>\n substitui o \u00EDcone exibido no encaixe\n\n
-+java.launcher.X.macosx.usage=\nAs op\u00E7\u00F5es a seguir s\u00E3o espec\u00EDficas para o Mac OS X:\n -XstartOnFirstThread\n executa o m\u00E9todo main() no primeiro thread (AppKit)\n -Xdock:name=<nome da aplica\u00E7\u00E3o>"\n substitui o nome da aplica\u00E7\u00E3o padr\u00E3o exibido no encaixe\n -Xdock:icon=<caminho para o arquivo do \u00EDcone>\n substitui o \u00EDcone exibido no encaixe\n\n
-
- java.launcher.cls.error1=Erro: N\u00E3o foi poss\u00EDvel localizar nem carregar a classe principal {0}
- java.launcher.cls.error2=Erro: o m\u00E9todo main n\u00E3o \u00E9 {0} na classe {1}; defina o m\u00E9todo main como:\n public static void main(String[] args)
---- ./jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2013-09-06 11:28:35.000000000 -0700
-+++ ./jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2014-07-15 21:49:30.000000000 -0700
-@@ -40,7 +40,17 @@
- public HotSpotDiagnostic() {
- }
-
-- public native void dumpHeap(String outputFile, boolean live) throws IOException;
-+ public void dumpHeap(String outputFile, boolean live) throws IOException {
-+ SecurityManager security = System.getSecurityManager();
-+ if (security != null) {
-+ security.checkWrite(outputFile);
-+ Util.checkControlAccess();
-+ }
-+
-+ dumpHeap0(outputFile, live);
-+ }
-+
-+ private native void dumpHeap0(String outputFile, boolean live) throws IOException;
-
- public List<VMOption> getDiagnosticOptions() {
- List<Flag> allFlags = Flag.getAllFlags();
---- ./jdk/src/share/classes/sun/management/resources/agent_ja.properties 2013-09-06 11:28:36.000000000 -0700
-+++ ./jdk/src/share/classes/sun/management/resources/agent_ja.properties 2014-07-15 21:49:30.000000000 -0700
-@@ -36,7 +36,7 @@
- agent.err.configfile.closed.failed = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u3092\u9589\u3058\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
- agent.err.configfile.access.denied = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
-
--agent.err.exportaddress.failed = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30A2\u30C9\u30EC\u30B9\u306E\u8A08\u6E2C\u30D0\u30C3\u30D5\u30A1\u3078\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-+agent.err.exportaddress.failed = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30A2\u30C9\u30EC\u30B9\u306E\u8A08\u6E2C\u30D0\u30C3\u30D5\u30A1\u3078\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u304C\u5931\u6557\u3057\u307E\u3057\u305F
-
- agent.err.agentclass.notfound = \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
- agent.err.agentclass.failed = \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u304C\u5931\u6557\u3057\u307E\u3057\u305F
---- ./jdk/src/share/classes/sun/misc/FloatingDecimal.java 2013-09-06 11:28:37.000000000 -0700
-+++ ./jdk/src/share/classes/sun/misc/FloatingDecimal.java 2014-07-15 21:49:30.000000000 -0700
-@@ -70,6 +70,15 @@
- static final int minDecimalExponent = -324;
- static final int bigDecimalExponent = 324; // i.e. abs(minDecimalExponent)
-
-+ //
-+ // The value below is chosen as a conservative threshold. It
-+ // can be demonstrated that a decimal ulp less than 10^(-1075)
-+ // is enough to guarantee correctness. Compensation is also made
-+ // for the binary mantissa which takes 53 binary digits, or
-+ // 17 decimal ones. Hence 1075 + 17 =~ 1100.
-+ //
-+ static final int MAX_NDIGITS = 1100;
-+
- static final long highbyte = 0xff00000000000000L;
- static final long highbit = 0x8000000000000000L;
- static final long lowbytes = ~highbyte;
-@@ -1468,6 +1477,10 @@
- * Formulate the EXACT big-number result as
- * bigD0 * 10^exp
- */
-+ if (nDigits > MAX_NDIGITS) {
-+ nDigits = MAX_NDIGITS + 1;
-+ digits[MAX_NDIGITS] = '1';
-+ }
- FDBigInt bigD0 = new FDBigInt( lValue, digits, kDigits, nDigits );
- exp = decExponent - nDigits;
-
---- ./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-07-15 21:49:30.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-07-15 21:49:30.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 2014-10-28 20:19:48.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2006, 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
-@@ -25,6 +25,7 @@
-
- package sun.misc;
-
-+import java.security.AccessControlContext;
- import sun.reflect.ConstantPool;
- import sun.reflect.annotation.AnnotationType;
- import sun.nio.ch.Interruptible;
-@@ -34,10 +35,10 @@
- ConstantPool getConstantPool(Class klass);
-
- /**
-- * Set the AnnotationType instance corresponding to this class.
-+ * Compare-And-Swap the AnnotationType instance corresponding to this class.
- * (This method only applies to annotation types.)
- */
-- void setAnnotationType(Class klass, AnnotationType annotationType);
-+ boolean casAnnotationType(Class<?> klass, AnnotationType oldType, AnnotationType newType);
-
- /**
- * Get the AnnotationType instance corresponding to this class.
-@@ -46,6 +47,12 @@
- AnnotationType getAnnotationType(Class klass);
-
- /**
-+ * Get the array of bytes that is the class-file representation
-+ * of this Class' annotations.
-+ */
-+ byte[] getRawClassAnnotations(Class<?> klass);
-+
-+ /**
- * Returns the elements of an enum class or null if the
- * Class object does not represent an enum type;
- * the result is uncloned, cached, and shared by all callers.
-@@ -88,4 +95,15 @@
- * Returns the murmur hash value for the specified String.
- */
- int getStringHash32(String string);
-+
-+ /**
-+ * Returns a new Thread with the given Runnable and an
-+ * inherited AccessControlContext.
-+ */
-+ Thread newThreadWithAcc(Runnable target, AccessControlContext acc);
-+
-+ /**
-+ * Invokes the finalize method of the given object.
-+ */
-+ void invokeFinalize(Object o) throws Throwable;
- }
---- ./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-07-15 21:49:30.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-07-15 21:49:30.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-07-15 21:49:30.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/misc/VM.java 2013-09-06 11:28:37.000000000 -0700
-+++ ./jdk/src/share/classes/sun/misc/VM.java 2014-07-15 21:49:30.000000000 -0700
-@@ -147,6 +147,7 @@
-
-
- private static volatile boolean booted = false;
-+ private static final Object lock = new Object();
-
- // Invoked by by System.initializeSystemClass just before returning.
- // Subsystems that are invoked during initialization can check this
-@@ -154,13 +155,27 @@
- // application class loader has been set up.
- //
- public static void booted() {
-- booted = true;
-+ synchronized (lock) {
-+ booted = true;
-+ lock.notifyAll();
-+ }
- }
-
- public static boolean isBooted() {
- return booted;
- }
-
-+ // Waits until VM completes initialization
-+ //
-+ // This method is invoked by the Finalizer thread
-+ public static void awaitBooted() throws InterruptedException {
-+ synchronized (lock) {
-+ while (!booted) {
-+ lock.wait();
-+ }
-+ }
-+ }
-+
- // A user-settable upper limit on the maximum amount of allocatable direct
- // buffer memory. This value may be changed during VM initialization if
- // "java" is launched with "-XX:MaxDirectMemorySize=<size>".
---- ./jdk/src/share/classes/sun/net/www/http/ChunkedOutputStream.java 2013-09-06 11:28:38.000000000 -0700
-+++ ./jdk/src/share/classes/sun/net/www/http/ChunkedOutputStream.java 2014-10-28 20:19:48.000000000 -0700
-@@ -125,7 +125,7 @@
- completeHeader = getHeader(preferredChunkDataSize);
-
- /* start with an initial buffer */
-- buf = new byte[preferredChunkDataSize + 32];
-+ buf = new byte[preferredChunkGrossSize];
- reset();
- }
-
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -428,6 +428,10 @@
- throw new AlreadyBoundException();
- InetSocketAddress isa = (local == null) ?
- new InetSocketAddress(0) : Net.checkAddress(local);
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ sm.checkListen(isa.getPort());
-+ }
- 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/DatagramChannelImpl.java 2013-09-06 11:28:38.000000000 -0700
-+++ ./jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2014-10-28 20:19:48.000000000 -0700
-@@ -751,6 +751,26 @@
-
- // set or refresh local address
- localAddress = Net.localAddress(fd);
-+
-+ // flush any packets already received.
-+ boolean blocking = false;
-+ synchronized (blockingLock()) {
-+ try {
-+ blocking = isBlocking();
-+ // remainder of each packet thrown away
-+ ByteBuffer tmpBuf = ByteBuffer.allocate(1);
-+ if (blocking) {
-+ configureBlocking(false);
-+ }
-+ do {
-+ tmpBuf.clear();
-+ } while (receive(tmpBuf) != null);
-+ } finally {
-+ if (blocking) {
-+ configureBlocking(true);
-+ }
-+ }
-+ }
- }
- }
- }
---- ./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-07-15 21:49:30.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-07-15 21:49:30.000000000 -0700
-@@ -599,6 +599,10 @@
- throw new AlreadyBoundException();
- InetSocketAddress isa = (local == null) ?
- new InetSocketAddress(0) : Net.checkAddress(local);
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ sm.checkListen(isa.getPort());
-+ }
- 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-07-15 21:49:30.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 2014-07-15 21:49:30.000000000 -0700
-@@ -1031,6 +1031,24 @@
- "ebcdic-s-871+euro"
- });
-
-+ charset("IBM290", "IBM290",
-+ new String[] {
-+ "cp290",
-+ "ibm290",
-+ "ibm-290",
-+ "csIBM290",
-+ "EBCDIC-JP-kana",
-+ "290"
-+ });
-+
-+ charset("x-IBM300", "IBM300",
-+ new String[] {
-+ "cp300",
-+ "ibm300",
-+ "ibm-300",
-+ "300"
-+ });
-+
- // Macintosh MacOS/Apple char encodingd
-
-
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,1875 @@
-+/*
-+ * 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.
-+ */
-+
-+// -- This file was mechanically generated: Do not edit! -- //
-+
-+package sun.nio.cs.ext;
-+
-+import java.nio.charset.Charset;
-+import java.nio.charset.CharsetDecoder;
-+import java.nio.charset.CharsetEncoder;
-+import java.util.Arrays;
-+import sun.nio.cs.HistoricallyNamedCharset;
-+import sun.nio.cs.ext.DoubleByte;
-+
-+public class IBM300 extends Charset
-+ implements HistoricallyNamedCharset
-+{
-+ public IBM300() {
-+ super("x-IBM300", ExtendedCharsets.aliasesFor("x-IBM300"));
-+ }
-+
-+ public String historicalName() { return "Cp300"; }
-+
-+ public boolean contains(Charset cs) {
-+ return (cs instanceof IBM300);
-+ }
-+
-+ public CharsetDecoder newDecoder() {
-+ initb2c();
-+ return new DoubleByte.Decoder_EBCDIC_DBCSONLY(this, b2c, 0x40, 0xfe);
-+ }
-+
-+ public CharsetEncoder newEncoder() {
-+ initc2b();
-+ return new DoubleByte.Encoder_EBCDIC_DBCSONLY(
-+ this, new byte[]{ (byte)0x42, (byte)0x6f }, c2b, c2bIndex);
-+ }
-+ static final String b2cSBStr =
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ;
-+
-+ static final String[] b2cStr = {
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ "\u3000\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
-+ "\uFFFD\u03B1\u03B2\u03B3\u03B4\u03B5\u03B6\u03B7" +
-+ "\u03B8\u03B9\u03BA\u03BB\u03BC\u03BD\u03BE\u03BF" +
-+ "\u03C0\u03C1\u03C3\u03C4\u03C5\u03C6\u03C7\u03C8" +
-+ "\u03C9\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\u0391\u0392\u0393\u0394\u0395\u0396\u0397" +
-+ "\u0398\u0399\u039A\u039B\u039C\u039D\u039E\u039F" +
-+ "\u03A0\u03A1\u03A3\u03A4\u03A5\u03A6\u03A7\u03A8" +
-+ "\u03A9\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\u0430\u0431\u0432\u0433\u0434\u0435\u0451\u0436" +
-+ "\u0437\u0438\u0439\u043A\u043B\u043C\u043D\u043E" +
-+ "\u043F\u0440\u0441\u0442\u0443\u0444\u0445\u0446" +
-+ "\u0447\u0448\u0449\u044A\u044B\u044C\u044D\u044E" +
-+ "\u044F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\u2170\u2171\u2172\u2173\u2174\u2175\u2176" +
-+ "\u2177\u2178\u2179\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\u0410\u0411\u0412\u0413\u0414\u0415\u0401\u0416" +
-+ "\u0417\u0418\u0419\u041A\u041B\u041C\u041D\u041E" +
-+ "\u041F\u0420\u0421\u0422\u0423\u0424\u0425\u0426" +
-+ "\u0427\u0428\u0429\u042A\u042B\u042C\u042D\u042E" +
-+ "\u042F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\u2160\u2161\u2162\u2163\u2164\u2165\u2166" +
-+ "\u2167\u2168\u2169\uFFFD\uFFFD\uFFFD\uFFFD" ,
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFE1\uFF0E\uFF1C\uFF08\uFF0B\uFF5C" +
-+ "\uFF06\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFF01\uFFE5\uFF0A\uFF09\uFF1B\uFFE2" +
-+ "\uFF0D\uFF0F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFE4\uFF0C\uFF05\uFF3F\uFF1E\uFF1F" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFF40\uFF1A\uFF03\uFF20\uFF07\uFF1D\uFF02" +
-+ "\uFFFD\uFF41\uFF42\uFF43\uFF44\uFF45\uFF46\uFF47" +
-+ "\uFF48\uFF49\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFF4A\uFF4B\uFF4C\uFF4D\uFF4E\uFF4F\uFF50" +
-+ "\uFF51\uFF52\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFE3\uFF53\uFF54\uFF55\uFF56\uFF57\uFF58" +
-+ "\uFF59\uFF5A\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFF5B\uFF21\uFF22\uFF23\uFF24\uFF25\uFF26\uFF27" +
-+ "\uFF28\uFF29\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFF5D\uFF2A\uFF2B\uFF2C\uFF2D\uFF2E\uFF2F\uFF30" +
-+ "\uFF31\uFF32\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFF04\uFFFD\uFF33\uFF34\uFF35\uFF36\uFF37\uFF38" +
-+ "\uFF39\uFF3A\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFF10\uFF11\uFF12\uFF13\uFF14\uFF15\uFF16\uFF17" +
-+ "\uFF18\uFF19\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
-+ "\uFFFD\u3002\u300C\u300D\u3001\u30FB\u30F2\u30A1" +
-+ "\u30A3\u30A5\uFFE0\u2220\u22A5\u2312\u2202\u2207" +
-+ "\uFFFD\u30A7\u30A9\u30E3\u30E5\u30E7\u30C3\u30EE" +
-+ "\u30FC\u30F5\u30F6\u2261\u2252\u226A\u226B\u221A" +
-+ "\u223D\u221D\u222B\u222C\u2208\u220B\u2286\u2287" +
-+ "\u2282\u2283\u222A\u2229\u2227\u2228\u21D2\u21D4" +
-+ "\u2200\u2203\u212B\u2030\u266F\u266D\u266A\u2020" +
-+ "\u2021\u00B6\u25EF\uFFFD\u2500\u2502\u250C\u2510" +
-+ "\uFFFD\u30A2\u30A4\u30A6\u30A8\u30AA\u30AB\u30AD" +
-+ "\u30AF\u30B1\u30B3\uFFFD\u30B5\u30B7\u30B9\u30BB" +
-+ "\u30BD\u30BF\u30C1\u30C4\u30C6\u30C8\u30CA\u30CB" +
-+ "\u30CC\u30CD\u30CE\uFFFD\uFFFD\u30CF\u30D2\u30D5" +
-+ "\uFFFD\uFF5E\u30D8\u30DB\u30DE\u30DF\u30E0\u30E1" +
-+ "\u30E2\u30E4\u30E6\uFFFD\u30E8\u30E9\u30EA\u30EB" +
-+ "\u2518\u2514\u251C\u252C\u2524\u2534\u253C\u2501" +
-+ "\u2503\u250F\u30EC\u30ED\u30EF\u30F3\u309B\u309C" +
-+ "\u30AC\u30AE\u30B0\u30B2\u30B4\u30B6\u30B8\u30BA" +
-+ "\u30BC\u30BE\u30C0\u30C2\u30C5\u30C7\u30C9\u30D0" +
-+ "\u30D3\u30D6\u30D9\u30DC\u30F4\u30D1\u30D4\u30D7" +
-+ "\u30DA\u30DD\u30F0\u30F1\u30FD\u30FE\uFFFD\uFFFD" +
-+ "\uFF3C\u2513\u251B\u2517\u2523\u2533\u252B\u253B" +
-+ "\u254B\u2520\u252F\u2528\u2537\u253F\u251D\u2530" +
-+ "\u2525\u2538\u2542\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
-+ "\uFFFD\uFFFD\u300E\u300F\uFF3B\uFF3D\u3092\u3041" +
-+ "\u3043\u3045\u2015\u00B1\u2260\u221E\u2103\uFFFD" +
-+ "\u00B4\u3047\u3049\u3083\u3085\u3087\u3063\u308E" +
-+ "\uFFFD\uFFFD\u2010\u3003\u4EDD\u3005\u3006\u3007" +
-+ "\u00A8\u2018\u201C\u3014\u3008\u300A\u3010\u2266" +
-+ "\u2234\u2642\u00A7\u203B\u3012\u3231\u2116\u2121" +
-+ "\uFF3E\u2019\u201D\u3015\u3009\u300B\u3011\u2267" +
-+ "\u2235\u2640\u00D7\u00F7\u2225\u3013\u2025\u2026" +
-+ "\uFFFD\u3042\u3044\u3046\u3048\u304A\u304B\u304D" +
-+ "\u304F\u3051\u3053\uFFFD\u3055\u3057\u3059\u305B" +
-+ "\u305D\u305F\u3061\u3064\u3066\u3068\u306A\u306B" +
-+ "\u306C\u306D\u306E\uFFFD\uFFFD\u306F\u3072\u3075" +
-+ "\uFFFD\uFFFD\u3078\u307B\u307E\u307F\u3080\u3081" +
-+ "\u3082\u3084\u3086\uFFFD\u3088\u3089\u308A\u308B" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\u308C\u308D\u308F\u3093\uFFFD\uFFFD" +
-+ "\u304C\u304E\u3050\u3052\u3054\u3056\u3058\u305A" +
-+ "\u305C\u305E\u3060\u3062\u3065\u3067\u3069\u3070" +
-+ "\u3073\u3076\u3079\u307C\uFFFD\u3071\u3074\u3077" +
-+ "\u307A\u307D\u3090\u3091\u309D\u309E\uFFFD\uFFFD" +
-+ "\u25CB\u25CF\u25B3\u25B2\u25CE\u2606\u2605\u25C7" +
-+ "\u25C6\u25A1\u25A0\u25BD\u25BC\u00B0\u2032\u2033" +
-+ "\u2192\u2190\u2191\u2193\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
-+ "\uFFFD\u4E00\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03" +
-+ "\u516B\u4E5D\u5341\u767E\u5343\u4E07\u5104\u90FD" +
-+ "\u9053\u5E9C\u770C\u5E02\u533A\u753A\u6751\u6771" +
-+ "\u897F\u5357\u5317\u5927\u4E2D\u5C0F\u4E0A\u4E0B" +
-+ "\u5E74\u6708\u65E5\u7530\u5B50\u5C71\u672C\u5DDD" +
-+ "\u85E4\u91CE\u5DE5\u696D\u6728\u4E95\u90CE\u5CF6" +
-+ "\u96C4\u9AD8\u5CA1\u592B\u539F\u4EAC\u4F50\u6B63" +
-+ "\u677E\u6A5F\u548C\u88FD\u7537\u7F8E\u5409\u5D0E" +
-+ "\u77F3\u8C37\u96FB\u9577\u6CBB\u6CA2\u91D1\u65B0" +
-+ "\u53E3\u6A4B\u4E45\u798F\u6240\u5E73\u5185\u56FD" +
-+ "\u5316\u962A\u5BAE\u4EBA\u4F5C\u90E8\u6E05\u6B21" +
-+ "\u7FA9\u751F\u4EE3\u51FA\u6C34\u68EE\u5149\u52A0" +
-+ "\u5408\u795E\u6797\u91CD\u884C\u4FE1\u660E\u6D77" +
-+ "\u5B89\u5E78\u4FDD\u592A\u5BCC\u6C5F\u9234\u524D" +
-+ "\u77E5\u6B66\u4F0A\u662D\u5206\u52DD\u7528\u5E83" +
-+ "\u9020\u6C17\u6210\u898B\u5229\u4F1A\u5B66\u5CA9" +
-+ "\u7523\u9593\u5730\u81EA\u826F\u95A2\u611B\u653F" +
-+ "\u5C3E\u8A08\u6587\u624B\u7236\u65B9\u4E8B\u6238" +
-+ "\u54C1\u559C\u6E21\u5F18\u53E4\u8FBA\u5009\u9244" +
-+ "\u4E4B\u5834\u6D0B\u57CE\u6D25\u7ACB\u5EA6\u5348" +
-+ "\u4ECA\u5F66\u8A2D\u901A\u52D5\u5F8C\u5948\u5B9A" +
-+ "\u6C60\u5C4B\u6D5C\u7406\u5742\u5B9F\u82F1\u7684" +
-+ "\u53F8\u79C0\u6A2A\u540D\u5B5D\u7AF9\u535A\u529B" +
-+ "\u5EAB\u8449\u6804\u6C38\u5668\u7389\u591A" ,
-+ "\uFFFD\u8CC0\u771F\u6075\u9759\u5186\u8302\u654F" +
-+ "\u8C4A\u5175\u6CD5\u767A\u9752\u5897\u6599\u5FE0" +
-+ "\u8CC7\u6642\u7269\u8ECA\u5FB3\u8981\u5BFE\u585A" +
-+ "\u79CB\u767D\u6CB3\u702C\u6CB9\u9686\u8535\u5F53" +
-+ "\u4FCA\u5FD7\u6625\u793E\u99AC\u5165\u5EFA\u6839" +
-+ "\u6749\u9032\u8208\u6D66\u7CBE\u540C\u6027\u7C73" +
-+ "\u8005\u52A9\u679D\u8FD1\u76F4\u76EE\u6765\u753B" +
-+ "\u76F8\u9ED2\u4E38\u8239\u7531\u58EB\u7B2C\u718A" +
-+ "\u7D19\u5065\u68B0\u82B3\u571F\u6709\u5BB6\u7DDA" +
-+ "\u7D4C\u8ABF\u5929\u671F\u7F6E\u6D45\u6589\u5F0F" +
-+ "\u5F62\u9762\u7A2E\u8F38\u5916\u5143\u4F53\u9E7F" +
-+ "\u5FA1\u5973\u5EB7\u4E16\u52C7\u5800\u597D\u5150" +
-+ "\u5BFA\u92FC\u7279\u57FC\u9054\u5411\u53D6\u7B49" +
-+ "\u667A\u56DE\u9580\u904B\u5099\u601D\u963F\u4E0D" +
-+ "\u9808\u5168\u5BFF\u5584\u677F\u98EF\u8C9E\u73FE" +
-+ "\u98DF\u7D44\u985E\u516C\u6750\u9999\u5546\u7D50" +
-+ "\u8868\u77E2\u6F5F\u79C1\u5236\u90A6\u6CBC\u7CF8" +
-+ "\u5B8F\u7B56\u6CE2\u54E1\u6570\u958B\u6E96\u6A39" +
-+ "\u8CBB\u660C\u5F37\u7814\u53CB\u5B87\u82E5\u83CA" +
-+ "\u6301\u82B1\u5F15\u7D00\u8352\u5225\u4FEE\u8D8A" +
-+ "\u4F4F\u85AC\u6BDB\u9060\u554F\u5965\u578B\u5FC3" +
-+ "\u767B\u65E9\u67F3\u6D69\u8CEA\u52D9\u6CC9\u5E38" +
-+ "\u5B88\u57FA\u7BA1\u6CF0\u4F38\u6700\u4EE5\u6B4C" +
-+ "\u88D5\u8D64\u8DB3\u898F\u6D41\u8AA0\u6607" ,
-+ "\uFFFD\u5DDE\u7167\u5869\u9001\u96C5\u672B\u54F2" +
-+ "\u5CB8\u4E5F\u5C90\u521D\u8328\u5247\u6BD4\u80FD" +
-+ "\u8A71\u6295\u8EE2\u83C5\u9023\u4ED6\u6C11\u7D66" +
-+ "\u9152\u7E41\u4FA1\u6E80\u671D\u4ED8\u6761\u7121" +
-+ "\u8003\u697D\u4E3B\u610F\u6226\u5207\u5264\u7247" +
-+ "\u7D30\u6E08\u7A32\u5E03\u91CC\u5C5E\u7AE0\u5909" +
-+ "\u4F55\u685C\u5F7C\u67FB\u76CA\u58F2\u4EC1\u6DF1" +
-+ "\u53F0\u9CE5\u9DB4\u652F\u6574\u89D2\u5609\u5473" +
-+ "\u885B\u8B70\u5727\u7387\u8DEF\u706B\u961C\u8F1D" +
-+ "\u70B9\u4E0E\u6E1B\u7551\u9280\u7A7A\u4EA4\u7FBD" +
-+ "\u534A\u53CE\u592E\u7DCF\u8A18\u6674\u69CB\u969B" +
-+ "\u6885\u5370\u8A00\u6817\u8EAB\u66F8\u514B\u7D20" +
-+ "\u96C6\u7BC0\u5148\u6EDD\u6C7A\u6559\u7D14\u67F4" +
-+ "\u63A5\u661F\u7740\u7559\u6620\u5DF1\u754C\u5177" +
-+ "\u656C\u7FA4\u9806\u5171\u6D3B\u91CF\u6307\u89E3" +
-+ "\u5BA4\u679C\u5404\u671B\u9632\u7D04\u61B2\u967D" +
-+ "\u4E80\u56F3\u4E88\u8272\u7A0E\u690D\u53EF\u6052" +
-+ "\u4F4D\u5178\u5FC5\u7D9A\u6025\u5728\u57A3\u541B" +
-+ "\u5EF6\u5D8B\u4F01\u6803\u670D\u71B1\u5272\u5354" +
-+ "\u6B69\u53F2\u512A\u658E\u623F\u5B97\u683C\u8FB0" +
-+ "\u7B20\u5712\u8AF8\u8107\u5553\u8CE2\u5F25\u98A8" +
-+ "\u5F97\u6613\u6253\u982D\u65ED\u6BB5\u52E2\u7136" +
-+ "\u56E3\u984D\u843D\u914D\u7A0B\u8FBB\u543E\u611F" +
-+ "\u5BDB\u53CD\u7A14\u9700\u6E90\u6C96\u984C" ,
-+ "\uFFFD\u8FBC\u8349\u7B97\u76DB\u8FB2\u90A3\u7701" +
-+ "\u69D8\u6BBF\u5C11\u4ECB\u53D7\u97F3\u7DE8\u59D4" +
-+ "\u5E84\u4FC2\u72B6\u793A\u5E97\u5A9B\u682A\u6ECB" +
-+ "\u68A8\u7E04\u53F3\u5DE6\u53CA\u9078\u5C45\u60C5" +
-+ "\u7DF4\u70AD\u9928\u9271\u6A21\u6B8A\u7E3E\u4E9C" +
-+ "\u7E4A\u4EF2\u5857\u6D88\u8853\u691C\u6717\u5B85" +
-+ "\u529F\u5C1A\u8CBF\u60A6\u8102\u7BE0\u4F73\u7D21" +
-+ "\u51A8\u6851\u78BA\u7267\u4E26\u5024\u89B3\u8CB4" +
-+ "\u7DAD\u7D71\u5BBF\u4E21\u7CD6\u89AA\u9332\u6F84" +
-+ "\u65BD\u5BB9\u98DB\u5C40\u7950\u904E\u6C0F\u6539" +
-+ "\u76E4\u7A4D\u6E0B\u5DFB\u6DF3\u5FDC\u4E89\u8ECD" +
-+ "\u88C5\u9178\u7E54\u67D3\u5E1D\u7DBF\u7C89\u822A" +
-+ "\u7532\u5468\u4ED9\u5F85\u4F4E\u7DD1\u8EFD\u9EBB" +
-+ "\u6176\u52B4\u78EF\u4E39\u80B2\u9650\u5C0E\u653E" +
-+ "\u6643\u5EA7\u4EF6\u60F3\u9A13\u4ED5\u4F7F\u8F2A" +
-+ "\u9854\u756A\u5F35\u805E\u4F9B\u6E6F\u6EB6\u6821" +
-+ "\u9285\u92F3\u878D\u9756\u5199\u5B8C\u6E2F\u935B" +
-+ "\u591C\u5145\u9F8D\u7DB1\u83F1\u901F\u52C9\u5237" +
-+ "\u8D77\u6469\u53C2\u55B6\u7A42\u63A8\u8FD4\u8077" +
-+ "\u6B62\u4F1D\u5E79\u7403\u6A29\u5C55\u5E61\u845B" +
-+ "\u5EAD\u975E\u53F7\u5358\u6B73\u62E1\u51E6\u8A9E" +
-+ "\u6628\u57DF\u6DF5\u518D\u50CD\u79D1\u9B5A\u7AEF" +
-+ "\u9014\u6848\u5B57\u8AD6\u517C\u53C8\u632F\u6280" +
-+ "\u5FB9\u672D\u7CFB\u5F93\u51B7\u614B\u5CF0" ,
-+ "\uFFFD\u5931\u539A\u5074\u6CE8\u6E2C\u9803\u4E57" +
-+ "\u8A66\u576A\u8429\u515A\u6C7D\u5B9D\u606D\u6A0B" +
-+ "\u6E29\u6577\u8AAC\u82B8\u544A\u6B74\u822C\u98FE" +
-+ "\u793C\u5C06\u96E3\u7802\u5224\u5F79\u5F71\u66FD" +
-+ "\u5E2F\u9678\u938C\u8AC7\u5F70\u60AA\u6A19\u7533" +
-+ "\u5BB3\u6BCD\u88DC\u5E4C\u58F0\u9664\u7B39\u5A66" +
-+ "\u4E7E\u7AF6\u829D\u725B\u8CB7\u79FB\u785D\u8336" +
-+ "\u52B9\u990A\u52F2\u80A5\u8B19\u7089\u590F\u5802" +
-+ "\u67CF\u6255\u5E30\u713C\u786B\u8001\u7A76\u5BE9" +
-+ "\u91DD\u65AD\u5C04\u5DEE\u5D50\u6298\u8010\u5BA3" +
-+ "\u59CB\u5F8B\u6B8B\u666F\u8C61\u90F7\u5353\u96E2" +
-+ "\u85AB\u6B7B\u8015\u64CD\u4EAE\u4E91\u90E1\u52E4" +
-+ "\u6C42\u8CAB\u5B98\u59BB\u88CF\u773C\u4F2F\u7AAF" +
-+ "\u7BC9\u968E\u63DB\u6842\u99C5\u68B6\u5747\u8CA1" +
-+ "\u547D\u738B\u84B2\u90C1\u78E8\u7B11\u66F2\u6975" +
-+ "\u5831\u63D0\u8A3C\u96EA\u9055\u88C1\u9996\u75C5" +
-+ "\u6850\u4F59\u74E6\u4EE4\u5439\u732A\u672A\u525B" +
-+ "\u8CA0\u4F34\u5100\u542B\u9069\u8FC4\u5C3B\u5DCC" +
-+ "\u7B54\u8FFD\u8A0E\u4E08\u925B\u71C3\u8AB2\u70BA" +
-+ "\u9662\u679A\u76AE\u8B77\u7DBE\u96E8\u6211\u5BC4" +
-+ "\u837B\u62BC\u7D0D\u76E3\u7E2B\u964D\u572D\u7ADC" +
-+ "\u7BC4\u6BBA\u8C9D\u698E\u9047\u6F14\u5360\u8FEB" +
-+ "\u5287\u624D\u6566\u7D1A\u7D42\u6BCE\u7D79\u7E2E" +
-+ "\u666E\u7965\u500B\u5C02\u99D2\u8A55\u7560" ,
-+ "\uFFFD\u5B58\u8089\u50BE\u5E2B\u6DB2\u4F8B\u81E3" +
-+ "\u81F3\u56E0\u7D99\u5DF2\u899A\u6E9D\u6D17\u8AAD" +
-+ "\u8996\u731B\u5DE8\u7DB2\u888B\u4EFB\u5BC6\u8896" +
-+ "\u6CC1\u8457\u8F03\u6BC5\u97FF\u8CA9\u5E45\u82E6" +
-+ "\u63AA\u5F81\u78C1\u821E\u52AA\u7AAA\u5999\u6297" +
-+ "\u8F14\u7FD2\u4FC3\u54C9\u967A\u66F4\u8B1B\u5E72" +
-+ "\u5FA9\u8A2A\u6D3E\u7763\u6483\u8B58\u614E\u5A5A" +
-+ "\u8D85\u71D0\u983C\u72E9\u583A\u5DFE\u8A8D\u67C4" +
-+ "\u7DE0\u4F11\u77ED\u4F0F\u5BC5\u629C\u5C3C\u533B" +
-+ "\u6DC0\u81FC\u96D1\u904A\u6D6E\u93E1\u5C64\u98FC" +
-+ "\u524A\u6DFB\u8584\u968A\u56FA\u5883\u7766\u9805" +
-+ "\u4E73\u8C46\u8A31\u7DD2\u8FF0\u6D6A\u4F9D\u6B6F" +
-+ "\u6B27\u62C5\u511F\u9769\u5374\u9AA8\u6775\u887F" +
-+ "\u5305\u7570\u8D70\u864E\u5CEF\u8CDE\u5FF5\u725F" +
-+ "\u7686\u609F\u80CC\u59EB\u8131\u5E0C\u8A17\u9676" +
-+ "\u82D7\u74B0\u84B8\u50D5\u96F2\u7248\u7834\u6DD1" +
-+ "\u6E09\u67FF\u6F54\u5915\u500D\u72AC\u9EC4\u7B46" +
-+ "\u9B3C\u6563\u53BB\u8A98\u91DC\u9818\u6FC3\u65C5" +
-+ "\u501F\u7F8A\u6F64\u9031\u5F3E\u63F4\u9038\u8B66" +
-+ "\u7BE4\u7206\u6843\u72EC\u65CF\u82A6\u5BA2\u6960" +
-+ "\u9EA6\u52DF\u6790\u639B\u7D75\u9855\u5DF3\u5805" +
-+ "\u8ACB\u95A3\u8863\u8CA8\u5B63\u5E8A\u5449\u786C" +
-+ "\u7D2B\u8CA2\u5352\u7D76\u8CB8\u7070\u547C\u6545" +
-+ "\u6676\u73B2\u56F2\u7BB1\u58A8\u7A81\u66AE" ,
-+ "\uFFFD\u8087\u59FF\u8840\u56F0\u7B51\u6DF7\u5F01" +
-+ "\u934B\u9000\u4FE3\u675F\u4FBF\u8CC3\u526F\u63A1" +
-+ "\u5442\u8907\u698A\u5E2D\u5A18\u7518\u514D\u5E7E" +
-+ "\u50B5\u5BDD\u68D2\u745E\u69FB\u5FAE\u55E3\u8A70" +
-+ "\u5BF8\u5824\u8358\u5F13\u5E95\u706F\u751A\u7D05" +
-+ "\u60E3\u7E70\u5012\u5238\u83EF\u5373\u5F31\u6A2B" +
-+ "\u9CF4\u53CC\u6D32\u4EAB\u4E92\u842C\u8A8C\u65E2" +
-+ "\u6F01\u80A9\u9DF9\u8B72\u7B52\u9589\u6D74\u63A2" +
-+ "\u6590\u5BD2\u6319\u8AB0\u76DF\u99A8\u7A74\u8236" +
-+ "\u8846\u8061\u6557\u5922\u9644\u88AB\u9326\u7B4B" +
-+ "\u62B5\u5371\u5E81\u5BDF\u4F75\u58C1\u7058\u7DCA" +
-+ "\u5438\u73E0\u52D8\u5208\u78D0\u6B23\u6838\u4E43" +
-+ "\u690E\u8377\u6ED1\u98F2\u8170\u8857\u8EF8\u798E" +
-+ "\u83DC\u8FCE\u7E01\u5510\u4EA8\u8A33\u9162\u5EFB" +
-+ "\u606F\u4E86\u664B\u6368\u5217\u8056\u51FD\u7642" +
-+ "\u821F\u9685\u50CF\u662F\u4F3C\u4E59\u6A3D\u4E71" +
-+ "\u523A\u8ACF\u6A58\u66FF\u670B\u653B\u9732\u5EC3" +
-+ "\u8A13\u5782\u604B\u866B\u95D8\u60A9\u4E01\u63CF" +
-+ "\u6FC0\u659C\u8CAC\u8305\u7CA7\u6050\u96F7\u5FCD" +
-+ "\u640D\u5B54\u900F\u62D3\u59B9\u7159\u51AC\u79F0" +
-+ "\u552F\u5275\u6697\u80F8\u4E98\u4ECF\u51CD\u9D5C" +
-+ "\u5144\u7A93\u67F1\u5841\u7C21\u8861\u5C31\u68DA" +
-+ "\u91E7\u9DF2\u63EE\u6575\u84EE\u523B\u6B32\u7C98" +
-+ "\u5982\u969C\u8987\u7C9F\u9006\u62DB\u66DC" ,
-+ "\uFFFD\u6355\u6982\u50AC\u623B\u5FD8\u63DA\u75DB" +
-+ "\u627F\u616E\u8266\u7C95\u716E\u96C7\u7F6A\u5426" +
-+ "\u5200\u83D3\u5211\u594F\u9D28\u574A\u66C7\u9858" +
-+ "\u820E\u6614\u733F\u50B7\u6551\u5EB8\u5B6B\u55AC" +
-+ "\u5FEB\u6388\u8CAF\u676F\u5951\u5A01\u71E5\u5DE3" +
-+ "\u8C6A\u6271\u81F4\u5C3A\u5F92\u9045\u7384\u7149" +
-+ "\u79D8\u796D\u9003\u83CC\u5FB4\u5B8D\u6279\u64AE" +
-+ "\u7D18\u723E\u5BEE\u65E7\u8D08\u9E78\u52E7\u5D07" +
-+ "\u9F62\u6069\u536F\u6681\u9663\u5E3D\u62B1\u722A" +
-+ "\u6E4A\u93AE\u79E6\u53E5\u809D\u88FE\u53B3\u6C88" +
-+ "\u6E7F\u5141\u9091\u6F6E\u84C4\u85EA\u8129\u6BD2" +
-+ "\u663C\u7F72\u73C2\u5F1F\u790E\u60B2\u72ED\u58EE" +
-+ "\u8179\u8E8D\u5C65\u5DE7\u6C37\u6DE1\u862D\u72AF" +
-+ "\u8E0A\u7C92\u8218\u8033\u63A7\u9291\u5019\u8155" +
-+ "\u8A69\u8EDF\u66B4\u8133\u7591\u6B20\u6669\u90F5" +
-+ "\u4E32\u73EA\u693F\u7687\u707D\u7D3A\u6148\u8607" +
-+ "\u99FF\u59C9\u7832\u7815\u907F\u80A1\u5C3F\u66A2" +
-+ "\u9418\u6D44\u5E55\u5854\u7B95\u8DE1\u4EA1\u8C5A" +
-+ "\u81E8\u89E6\u9670\u5263\u74F6\u9A5A\u6012\u520A" +
-+ "\u7434\u9801\u907A\u5504\u7956\u5230\u54B2\u8A34" +
-+ "\u96A3\u4FF3\u9283\u91E3\u7D39\u9688\u4F51\u7D61" +
-+ "\u5DBA\u9BAE\u5F80\u795D\u8597\u8DA3\u7C60\u5C0A" +
-+ "\u7565\u85A9\u63D6\u9E97\u7D22\u5375\u9AEA\u9042" +
-+ "\u6B3D\u7D0B\u6392\u80AA\u7DE9\u9F3B\u99C6" ,
-+ "\uFFFD\u6D78\u6731\u5531\u6398\u7825\u5CB3\u5DE1" +
-+ "\u92AD\u98FD\u9810\u6CE3\u6B64\u5321\u6B53\u5E8F" +
-+ "\u7AE5\u502B\u6E56\u62BD\u8276\u6A9C\u4E18\u57F7" +
-+ "\u752B\u7C97\u82EB\u9802\u811A\u73CD\u8F9B\u5C0B" +
-+ "\u63E1\u7372\u8150\u80E1\u5B99\u76D7\u6291\u65EC" +
-+ "\u8A3A\u5947\u65E8\u6E7E\u6696\u55AB\u8F09\u92ED" +
-+ "\u9396\u4EEE\u755C\u6F38\u8F9E\u7981\u5C01\u62E0" +
-+ "\u9BE8\u91C8\u6276\u65CB\u8E0F\u8B21\u699B\u6216" +
-+ "\u5A92\u90B8\u50DA\u79DF\u6C41\u5270\u9175\u8B39" +
-+ "\u685D\u5875\u819C\u5B9C\u8A89\u8A72\u9D8F\u6377" +
-+ "\u5974\u8AA4\u52B1\u6962\u5C48\u9CE9\u673A\u75B2" +
-+ "\u6D1E\u4F0D\u7E6D\u7B48\u7FCC\u65E6\u59A5\u79E9" +
-+ "\u6212\u6EDE\u770B\u8CA7\u65BC\u885D\u6ADB\u5C4A" +
-+ "\u8074\u9084\u8ECC\u65D7\u57F9\u708E\u6F06\u5E7C" +
-+ "\u77AC\u4FF5\u5949\u81ED\u9B45\u7FFC\u8178\u69FD" +
-+ "\u6CCA\u69C7\u79D2\u8B1D\u9ED9\u81D3\u7A3C\u7968" +
-+ "\u6F5C\u63B2\u8DDD\u6383\u6E9C\u5E33\u61F8\u76BF" +
-+ "\u642C\u7DB4\u6247\u6458\u6816\u5F69\u9022\u7A1A" +
-+ "\u82B9\u70C8\u9A12\u6163\u6FEF\u53EB\u9D3B\u62FE" +
-+ "\u60A0\u9591\u6D99\u6162\u9298\u635C\u9707\u8972" +
-+ "\u683D\u51E1\u9B54\u608C\u5B22\u99C4\u7126\u8A73" +
-+ "\u971C\u7396\u67D4\u60A3\u4E11\u4EF0\u8CDB\u8CB0" +
-+ "\u7912\u9774\u8986\u5146\u57DC\u99D0\u80C3\u8338" +
-+ "\u78A7\u86CD\u7F85\u5049\u8247\u690B\u7C4D" ,
-+ "\uFFFD\u53EA\u5F26\u6E25\u6881\u9375\u5DFD\u5347" +
-+ "\u9727\u643A\u75C7\u6FA4\u73A9\u77E9\u9451\u8B5C" +
-+ "\u808C\u674E\u4EAD\u582F\u7573\u8ED2\u6CE5\u9320" +
-+ "\u8FF7\u7D33\u72C2\u8217\u7422\u82C5\u9A30\u773A" +
-+ "\u5F84\u9673\u64AD\u920D\u74DC\u60C7\u86ED\u4FFA" +
-+ "\u52A3\u6A3A\u7720\u5320\u61B6\u5674\u8776\u6CBF" +
-+ "\u505C\u602A\u8466\u6B96\u6DBC\u97D3\u968F\u6876" +
-+ "\u60D1\u5378\u64A4\u51A0\u9154\u5DF4\u629E\u5E63" +
-+ "\u929A\u7693\u6C5A\u6597\u50E7\u7C82\u5F6B\u6CE1" +
-+ "\u5F6C\u5AC1\u6F2C\u852D\u6442\u5750\u58C7\u8CFC" +
-+ "\u8A5E\u7A7F\u689D\u7E26\u7A40\u7344\u8AEB\u4FD7" +
-+ "\u7A63\u8036\u7DEF\u80C6\u8AED\u731F\u8FEA\u4F0E" +
-+ "\u758B\u518A\u6734\u5FD9\u61C7\u65AF\u9CF3\u5ECA" +
-+ "\u9262\u68DF\u6CB8\u80F4\u57CB\u6C99\u96A0\u5B64" +
-+ "\u58F1\u68C4\u5410\u982C\u8A87\u4E5E\u6167\u9BAB" +
-+ "\u90AA\u55B0\u82BD\u596A\u66F3\u8299\u5893\u719F" +
-+ "\u6284\u67D1\u9063\u5ACC\u6C57\u7CE7\u5851\u64B2" +
-+ "\u58CA\u830E\u5968\u5302\u5A46\u8702\u6065\u72D9" +
-+ "\u89A7\u6689\u66F9\u5D6F\u5BB0\u96BC\u636E\u60DC" +
-+ "\u7948\u51DD\u8606\u5EC9\u7554\u596E\u6B04\u4F43" +
-+ "\u7B94\u67DA\u62DD\u628A\u971E\u62ED\u6EC5\u508D" +
-+ "\u67B6\u80E4\u9EBF\u5EB5\u638C\u85CD\u9867\u52C5" +
-+ "\u6016\u68CB\u61D0\u5751\u8F29\u5FAA\u81A8\u7D62" +
-+ "\u71C8\u54C0\u69CC\u6B3E\u65AC\u63C3\u4F46" ,
-+ "\uFFFD\u7B1B\u6B86\u88F8\u5203\u732E\u6687\u7D17" +
-+ "\u57F4\u570F\u618E\u970A\u7C3F\u8B00\u7881\u8CE0" +
-+ "\u548B\u7B87\u745B\u7C11\u8870\u5398\u5448\u6CF3" +
-+ "\u6F22\u53F6\u88B4\u5301\u7A6B\u8695\u586B\u5D29" +
-+ "\u88C2\u62D2\u4E1E\u5036\u96C0\u7363\u8A3B\u5176" +
-+ "\u7199\u7FE0\u8888\u7E1E\u4E4F\u84CB\u6F2B\u5859" +
-+ "\u936C\u53E9\u865A\u9149\u86EF\u5E06\u5507\u902E" +
-+ "\u6795\u846C\u5BA5\u82A5\u8431\u6D8C\u63FA\u4EA5" +
-+ "\u51C6\u6328\u7F70\u5B5F\u5DBD\u99C8\u53EC\u7985" +
-+ "\u8A54\u7962\u88DF\u5B09\u4FB5\u4F91\u9B8E\u5192" +
-+ "\u96F0\u6DAF\u622F\u8490\u8CDC\u5075\u5CE0\u4E14" +
-+ "\u4F83\u7C54\u84D1\u77B3\u8AEE\u5CE8\u62F6\u663B" +
-+ "\u8A93\u8526\u8A95\u65FA\u6714\u53D4\u62AB\u8CE6" +
-+ "\u88F3\u5BE7\u868A\u668E\u582A\u6170\u696F\u9F13" +
-+ "\u7A92\u7893\u6A7F\u9017\u9266\u7D10\u7BC7\u6EF4" +
-+ "\u821C\u5C3D\u62CD\u85C1\u6F02\u6E67\u6691\u85A6" +
-+ "\u637A\u821B\u4F8D\u5091\u8A02\u62EC\u9BC9\u7A3D" +
-+ "\u7C9B\u50C5\u9019\u708A\u7C8B\u64EC\u665F\u6562" +
-+ "\u732B\u5339\u67A0\u55A7\u6D2A\u7A3F\u64E6\u79A7" +
-+ "\u67D8\u7B26\u96BB\u6311\u72A0\u5C6F\u7026\u97EE" +
-+ "\u60DF\u8AFE\u8B04\u8494\u9BD6\u82AF\u932C\u6606" +
-+ "\u9640\u5BC2\u86C7\u7949\u8017\u6919\u7092\u963B" +
-+ "\u7C7E\u59D3\u5B5C\u7D1B\u91D8\u6A80\u85E9\u6905" +
-+ "\u6C93\u502D\u4EA6\u7FC1\u61A4\u8CCA\u9665" ,
-+ "\uFFFD\u93D1\u53F1\u598A\u8EAC\u62D8\u6867\u71D5" +
-+ "\u7B67\u504F\u67D0\u82D1\u978D\u748B\u80BA\u7336" +
-+ "\u514E\u8105\u90CA\u584A\u67FE\u6FF1\u5FFD\u76C6" +
-+ "\u9A0E\u507D\u9694\u5EF7\u7BB8\u904D\u6C4E\u85FB" +
-+ "\u819D\u67AF\u564C\u5606\u8C8C\u56DA\u73ED\u8CC4" +
-+ "\u8FC5\u96F6\u6C50\u8944\u8F3F\u7D5E\u60E8\u72FC" +
-+ "\u7D9C\u8463\u5CFB\u5446\u5D16\u6CA1\u81B3\u58FA" +
-+ "\u5BB4\u8108\u541F\u8CBC\u6182\u78A9\u6FE1\u91A4" +
-+ "\u76F2\u6020\u76FE\u84C9\u7F36\u4EC7\u755D\u7A17" +
-+ "\u84EC\u75F4\u4F3A\u676D\u7460\u62F3\u6F20\u79E4" +
-+ "\u87F9\u6094\u6234\u66AB\u820C\u8499\u723A\u5FCC" +
-+ "\u6109\u70CF\u7261\u7A50\u5098\u9AED\u5D69\u601C" +
-+ "\u6667\u99B4\u5E7B\u643E\u5830\u53C9\u7A9F\u990C" +
-+ "\u9B42\u8F5F\u7AAE\u5B9B\u68A2\u6249\u7984\u9DFA" +
-+ "\u5451\u932F\u8AC4\u5F90\u8DF3\u5A2F\u80DE\u6D29" +
-+ "\u7A4F\u84BC\u9D2B\u9010\u6D38\u916A\u6FC1\u9905" +
-+ "\u6BBB\u5EB6\u91B8\u5076\u6F0F\u4E19\u540F\u9675" +
-+ "\u6C72\u51B4\u5631\u9F20\u66A6\u5F0A\u75AB\u51F8" +
-+ "\u674F\u8DF5\u6C70\u8A6B\u757F\u5CAC\u6841\u8CD3" +
-+ "\u9BDB\u8475\u6893\u840C\u72DB\u7577\u8568\u783A" +
-+ "\u847A\u5F10\u831C\u6813\u6E1A\u9DAF\u51F9\u7980" +
-+ "\u4E99\u5EE3\u908A\u80AF\u59A8\u77DB\u8D74\u8A1F" +
-+ "\u673D\u533F\u8A0A\u5618\u6756\u53D9\u4F10\u7409" +
-+ "\u5A41\u4FF8\u79B0\u9838\u8E2A\u9D60\u8F44" ,
-+ "\uFFFD\u65A5\u75BE\u906D\u867B\u60BC\u51B6\u5937" +
-+ "\u7D2F\u916C\u69AE\u7CE0\u792A\u5D14\u64C1\u58EC" +
-+ "\u589C\u8D66\u66D9\u61F2\u912D\u6E58\u9435\u965B" +
-+ "\u7272\u5F6A\u5E9A\u8F1B\u5B95\u5C39\u9013\u834F" +
-+ "\u7CCE\u620A\u90ED\u691B\u6E15\u65DB\u66FE\u4E9F" +
-+ "\u55AA\u7A83\u83E9\u8B83\u846D\u83F0\u7F50\u918D" +
-+ "\u9190\u758E\u95A5\u81E7\u75E2\u61A9\u8A50\u95B2" +
-+ "\u53A8\u59F6\u9813\u7891\u7C17\u6B3A\u57E0\u620E" +
-+ "\u83D6\u8AD2\u75D4\u927E\u59DC\u5289\u9087\u6FFE" +
-+ "\u7473\u5C09\u9D6C\u84FC\u7CDF\u7BAD\u8A6E\u594E" +
-+ "\u56A2\u819A\u7947\u6636\u53E1\u7887\u58CC\u9397" +
-+ "\u6E13\u5256\u828B\u9E9F\u9583\u658C\u9E93\u7345" +
-+ "\u6E26\u9D07\u5983\u7DAC\u96C1\u61BE\u6762\u9ECE" +
-+ "\u90A8\u9187\u9F0E\u7C38\u51F1\u8599\u524C\u540E" +
-+ "\u7901\u655E\u6668\u5CE1\u7566\u76C8\u8679\u531D" +
-+ "\u5506\u7926\u8912\u77EF\u7CC0\u570B\u515C\u7E8A" +
-+ "\u535C\u8A60\u65A7\u8766\u5766\u6AE8\u87FB\u5E16" +
-+ "\u7AEA\u8D73\u771E\u737A\u66E0\u9410\u816B\u7B08" +
-+ "\u91FC\u5737\u6FE4\u856A\u7E55\u9957\u87BA\u694A" +
-+ "\u818F\u5EFF\u891C\u72D0\u9846\u9EDB\u8D99\u5DD6" +
-+ "\u62B9\u64AB\u4F76\u613F\u68AF\u5F14\u800C\u92F8" +
-+ "\u7BC1\u52FE\u664F\u9177\u51F6\u97A0\u839E\u647A" +
-+ "\u9C3A\u67F5\u7C4F\u685F\u9B6F\u9F4B\u7FFB\u9348" +
-+ "\u4FF6\u9E92\u9197\u96DB\u5BE6\u6CCC\u7CFE" ,
-+ "\uFFFD\u9453\u6822\u66B9\u5BD4\u98F4\u8AE6\u8154" +
-+ "\u7827\u74BD\u6ED3\u9288\u5A20\u5B8B\u86F8\u760D" +
-+ "\u865C\u6641\u91C9\u5589\u7A4E\u59E5\u6042\u932B" +
-+ "\u5B5A\u849C\u5C91\u96CD\u62D9\u675C\u6787\u5E7D" +
-+ "\u8650\u9EB9\u5CB1\u80CE\u7A00\u8ABC\u5700\u8096" +
-+ "\u7D72\u9211\u8098\u907C\u7761\u8737\u9075\u817A" +
-+ "\u7C3E\u6EA2\u965E\u7E90\u72D7\u58FD\u60B3\u9786" +
-+ "\u7E88\u587E\u6E20\u84DC\u6961\u77AD\u5197\u652A" +
-+ "\u6777\u5DCD\u6101\u932E\u5954\u6367\u798D\u7AFF" +
-+ "\u80D6\u58B3\u6168\u6AC3\u7483\u9B92\u660A\u642D" +
-+ "\u5118\u6763\u809B\u9C10\u4FC9\u6953\u7A1C\u52FF" +
-+ "\u6055\u768E\u817F\u5642\u5F6D\u7194\u70BB\u7436" +
-+ "\u8000\u874B\u55DA\u7435\u7690\u96EB\u66DD\u751C" +
-+ "\u633D\u6EC9\u7C64\u7CA5\u6D35\u935C\u7027\u5E25" +
-+ "\u701D\u54BD\u611A\u6973\u6C6A\u559A\u6D19\u96CC" +
-+ "\u5BE1\u59FB\u697C\u914C\u7709\u8500\u7A46\u7872" +
-+ "\u92E4\u8CED\u7CFA\u9D1B\u814E\u9AC4\u68A0\u6DCB" +
-+ "\u5918\u83B1\u5629\u9B41\u6897\u70B3\u9771\u9419" +
-+ "\u67A2\u6802\u7895\u68A7\u50D6\u80B1\u5EF8\u82D4" +
-+ "\u797A\u67CA\u7E4D\u69CD\u51C4\u723D\u6829\u99B3" +
-+ "\u5F3C\u8F61\u682B\u6155\u6591\u8FB1\u7E1B\u9798" +
-+ "\u9952\u8877\u5B2C\u6631\u4FA0\u6939\u6AFB\u5BB5" +
-+ "\u7AC8\u5026\u5944\u9059\u7B25\u7B4F\u8E74\u8543" +
-+ "\u5858\u8B0E\u5039\u8654\u97F6\u7569\u72F8" ,
-+ "\uFFFD\u4EF7\u9D89\u5016\u51CC\u62CC\u91C6\u8755" +
-+ "\u649A\u88F4\u91E6\u6854\u695A\u6C40\u7B6C\u6741" +
-+ "\u77D7\u8823\u5384\u8EAF\u7280\u8C6B\u788D\u7165" +
-+ "\u8207\u68B1\u8D04\u9077\u701E\u8FE6\u810A\u81BF" +
-+ "\u89DC\u68B3\u6ADF\u92EA\u95C7\u7957\u7A20\u53A9" +
-+ "\u8E5F\u786F\u79B9\u5F27\u5ED6\u6853\u93AC\u919C" +
-+ "\u691A\u5806\u64B0\u7E4B\u7D8F\u68F2\u6EA5\u82DB" +
-+ "\u9192\u5243\u8EB0\u9081\u721B\u7DCB\u7656\u59AC" +
-+ "\u6FE0\u8B28\u80A2\u5544\u6070\u5F4A\u68C8\u633A" +
-+ "\u9438\u9B4F\u81E5\u6A17\u70DD\u69A7\u614C\u920E" +
-+ "\u9310\u9BAD\u52D7\u925E\u92F9\u5993\u7696\u66FB" +
-+ "\u5769\u73CA\u7678\u6A1F\u7E9C\u9811\u8CD1\u5840" +
-+ "\u6349\u871C\u62D0\u60B4\u6B89\u86EE\u5764\u581D" +
-+ "\u8549\u7235\u7652\u983B\u8237\u5351\u5C24\u59BE" +
-+ "\u5815\u901D\u69B4\u834A\u9EA9\u976B\u8086\u53AD" +
-+ "\u6068\u4FAE\u76C3\u6A05\u689B\u937E\u99D5\u91C7" +
-+ "\u5C16\u585E\u61A7\u9699\u4FDF\u8278\u9C52\u5F45" +
-+ "\u6108\u7C8D\u806F\u5DF7\u8D6B\u57B0\u98E2\u5703" +
-+ "\u79BF\u5996\u7941\u540A\u83DF\u9C39\u52D2\u6BD8" +
-+ "\u86CB\u4EC0\u9A28\u5366\u8006\u7337\u6492\u8FED" +
-+ "\u5AC9\u5420\u537F\u4FAF\u807E\u543B\u7515\u7B18" +
-+ "\u8749\u54B3\u704C\u8997\u6CAB\u85FA\u7114\u696E" +
-+ "\u9328\u745A\u59D1\u6E5B\u617E\u53E2\u8317\u76E7" +
-+ "\u848B\u85AF\u6925\u5C60\u7259\u75D5\u8B90" ,
-+ "\uFFFD\u6E07\u82AD\u5C4F\u7BED\u9784\u6F70\u764C" +
-+ "\u88B7\u92D2\u4F36\u5EFE\u9061\u88E1\u8471\u711A" +
-+ "\u6D1B\u80B4\u74E2\u7433\u5A7F\u905C\u980C\u5319" +
-+ "\u906E\u6BB4\u85AA\u7897\u7AFA\u6AAE\u8910\u958F" +
-+ "\u620C\u4F3D\u4F7C\u79BE\u9D0E\u4ED4\u57A2\u51A5" +
-+ "\u6900\u6089\u707C\u7AE3\u8956\u93A7\u9C2D\u5112" +
-+ "\u52FA\u7CCA\u60F9\u7078\u81C6\u559D\u6991\u96C9" +
-+ "\u553E\u805A\u8304\u8332\u54FA\u565B\u8FBF\u5634" +
-+ "\u6760\u5265\u840E\u5E5F\u7B65\u9035\u8387\u6B4E" +
-+ "\u58BE\u6309\u727D\u97AD\u69D0\u546A\u984E\u632B" +
-+ "\u714E\u8557\u7CDE\u6372\u68F9\u7511\u8602\u6EBA" +
-+ "\u5A3C\u7A84\u851A\u95A4\u59D0\u60DA\u51EA\u5A29" +
-+ "\u7169\u6F15\u696B\u63BB\u75E9\u4E4E\u7DBB\u6934" +
-+ "\u8521\u8FFA\u9354\u9C3B\u5F17\u5ED3\u8258\u895F" +
-+ "\u82E7\u52C3\u5C51\u83AB\u7826\u79E1\u7FF0\u626E" +
-+ "\u60F0\u5CA8\u6F97\u71A8\u9909\u5132\u5E37\u5F04" +
-+ "\u637B\u6753\u68D7\u6652\u9CF6\u88B0\u52AB\u4FC4" +
-+ "\u4E3C\u67B3\u7BAA\u7F4D\u8A23\u63B4\u71E6\u65A4" +
-+ "\u6F09\u853D\u5072\u7DBA\u5516\u7B04\u72FD\u6CD3" +
-+ "\u8422\u621F\u50AD\u8235\u8718\u5919\u6028\u677C" +
-+ "\u6F23\u75B9\u695C\u520E\u8018\u8B01\u71ED\u5713" +
-+ "\u660F\u83EB\u7164\u7D9B\u5617\u7D7D\u8F4D\u9318" +
-+ "\u8569\u5D17\u678C\u67DE\u87C7\u79AE\u5835\u8404" +
-+ "\u9041\u7FD4\u6E8C\u8A63\u9D08\u670F\u939A" ,
-+ "\uFFFD\u63AC\u602F\u64E2\u608D\u96B7\u6357\u8461" +
-+ "\u914B\u75D8\u60E7\u9913\u9C57\u5984\u6DEB\u5E96" +
-+ "\u6D9C\u9BF0\u58BB\u7977\u60B6\u633F\u5BF5\u9812" +
-+ "\u558B\u82D3\u5147\u6190\u7953\u79BD\u6C5D\u9EBA" +
-+ "\u9C48\u8DA8\u5EE0\u7D43\u5EFC\u854E\u8CE4\u5AE1" +
-+ "\u54E8\u5023\u52BE\u7DEC\u8511\u6666\u6C3E\u724C" +
-+ "\u8ADC\u9C0D\u77A5\u8B02\u8D05\u6F11\u9834\u97FB" +
-+ "\u50FB\u7F75\u5A03\u8513\u4FB6\u634C\u9D61\u808B" +
-+ "\u5294\u65A1\u567A\u5957\u8D0B\u6A35\u6AD3\u70F9" +
-+ "\u865E\u6FB1\u51E7\u7FEB\u59EA\u5E87\u6B6A\u754F" +
-+ "\u717D\u914E\u7D2C\u8C79\u6062\u621A\u7FA8\u5F1B" +
-+ "\u6C8C\u86FE\u7562\u7B86\u9AB8\u6627\u7ABA\u844E" +
-+ "\u6F81\u8B2C\u86A4\u6FEB\u7B8B\u7F77\u8F2F\u8E44" +
-+ "\u7E23\u4E4D\u79A6\u8AFA\u903C\u50D1\u9ECD\u5EDF" +
-+ "\u758F\u631F\u53DB\u9910\u826E\u62F7\u68FA\u725D" +
-+ "\u803D\u58D5\u5C4D\u86D9\u540B\u8805\u92F2\u9237" +
-+ "\u5C61\u985B\u86E4\u966A\u7262\u6955\u6CD7\u6994" +
-+ "\u9C2F\u77E7\u68C9\u8DE8\u6D6C\u67C1\u9BAA\u619A" +
-+ "\u63A9\u7015\u9306\u934D\u6A61\u6258\u5283\u7525" +
-+ "\u5687\u6C83\u6834\u649E\u4E9B\u7252\u59E6\u8FC2" +
-+ "\u5FBD\u6DD8\u85F7\u8A51\u9817\u99C1\u63A0\u7C81" +
-+ "\u5B30\u8139\u5403\u7E82\u8106\u532A\u6A8E\u7F6B" +
-+ "\u54E9\u5678\u8AB9\u6715\u5BD3\u6478\u64FE\u6B1D" +
-+ "\u8CC2\u51CB\u7E8F\uFFFD\uFFFD\uFFFD\uFFFD" ,
-+ "\uFFFD\u5F0C\u4E10\u4E15\u4E28\u4E2A\u4E31\u4E36" +
-+ "\u4E3F\u4E42\u4E56\u4E58\u4E62\u4E82\u4E85\u4E8A" +
-+ "\u4E8E\u5F0D\u4E9E\u4EA0\u4EA2\u4EB0\u4EB3\u4EB6" +
-+ "\u4ECE\u4ECD\u4EC4\u4EC6\u4EC2\u4EE1\u4ED7\u4EDE" +
-+ "\u4EED\u4EDF\u4EFC\u4F09\u4F1C\u4F00\u4F03\u4F5A" +
-+ "\u4F30\u4F5D\u4F39\u4F57\u4F47\u4F5E\u4F56\u4F5B" +
-+ "\u4F92\u4F8A\u4F88\u4F8F\u4F9A\u4FAD\u4F98\u4F7B" +
-+ "\u4FAB\u4F69\u4F70\u4F94\u4F6F\u4F86\u4F96\u4FD4" +
-+ "\u4FCE\u4FD8\u4FDB\u4FD1\u4FDA\u4FD0\u4FCD\u4FE4" +
-+ "\u4FE5\u501A\u5040\u5028\u5014\u502A\u5025\u5005" +
-+ "\u5021\u5022\u5029\u502C\u4FFF\u4FFE\u4FEF\u5011" +
-+ "\u501E\u5006\u5043\u5047\u5055\u5050\u5048\u505A" +
-+ "\u5056\u500F\u5046\u5070\u5042\u506C\u5078\u5080" +
-+ "\u5094\u509A\u5085\u50B4\u6703\u50B2\u50C9\u50CA" +
-+ "\u50B3\u50C2\u50F4\u50DE\u50E5\u50D8\u50ED\u50E3" +
-+ "\u50EE\u50F9\u50F5\u5109\u5101\u5102\u511A\u5115" +
-+ "\u5114\u5116\u5121\u513A\u5137\u513C\u513B\u513F" +
-+ "\u5140\u514A\u514C\u5152\u5154\u5162\u5164\u5169" +
-+ "\u516A\u516E\u5180\u5182\u56D8\u518C\u5189\u518F" +
-+ "\u5191\u5193\u5195\u5196\u519D\u51A4\u51A6\u51A2" +
-+ "\u51A9\u51AA\u51AB\u51B3\u51B1\u51B2\u51B0\u51B5" +
-+ "\u51BE\u51BD\u51C5\u51C9\u51DB\u51E0\u51E9\u51EC" +
-+ "\u51ED\u51F0\u51F5\u51FE\u5204\u520B\u5214\u5215" +
-+ "\u5227\u522A\u522E\u5233\u5239\u5244\u524B" ,
-+ "\uFFFD\u524F\u525E\u5254\u5271\u526A\u5273\u5274" +
-+ "\u5269\u527F\u527D\u528D\u5288\u5292\u5291\u529C" +
-+ "\u52A6\u52AC\u52AD\u52BC\u52B5\u52C1\u52C0\u52CD" +
-+ "\u52DB\u52DE\u52E3\u52E6\u52E0\u52F3\u52F5\u52F8" +
-+ "\u52F9\u5300\u5306\u5307\u5308\u7538\u530D\u5310" +
-+ "\u530F\u5315\u531A\u5324\u5323\u532F\u5331\u5333" +
-+ "\u5338\u5340\u5345\u5346\u5349\u4E17\u534D\u51D6" +
-+ "\u8209\u535E\u5369\u536E\u5372\u5377\u537B\u5382" +
-+ "\u5393\u5396\u53A0\u53A6\u53A5\u53AE\u53B0\u53B2" +
-+ "\u53B6\u53C3\u7C12\u53DD\u53DF\u66FC\uFA0E\u71EE" +
-+ "\u53EE\u53E8\u53ED\u53FA\u5401\u543D\u5440\u542C" +
-+ "\u542D\u543C\u542E\u5436\u5429\u541D\u544E\u548F" +
-+ "\u5475\u548E\u545F\u5471\u5477\u5470\u5492\u547B" +
-+ "\u5480\u549C\u5476\u5484\u5490\u5486\u548A\u54C7" +
-+ "\u54BC\u54AF\u54A2\u54B8\u54A5\u54AC\u54C4\u54D8" +
-+ "\u54C8\u54A8\u54AB\u54C2\u54A4\u54A9\u54BE\u54E5" +
-+ "\u54FF\u54E6\u550F\u5514\u54FD\u54EE\u54ED\u54E2" +
-+ "\u5539\u5540\u5563\u554C\u552E\u555C\u5545\u5556" +
-+ "\u5557\u5538\u5533\u555D\u5599\u5580\u558A\u559F" +
-+ "\u557B\u557E\u5598\u559E\u55AE\u557C\u5586\u5583" +
-+ "\u55A9\u5587\u55A8\u55C5\u55DF\u55C4\u55DC\u55E4" +
-+ "\u55D4\u55F9\u5614\u55F7\u5616\u55FE\u55FD\u561B" +
-+ "\u564E\u5650\u5636\u5632\u5638\u566B\u5664\u5686" +
-+ "\u562F\u566C\u566A\u71DF\u5694\u568F\u5680" ,
-+ "\uFFFD\u568A\u56A0\u56A5\u56AE\u56B6\u56B4\u56C8" +
-+ "\u56C2\u56BC\u56C1\u56C3\u56C0\u56CE\u56D3\u56D1" +
-+ "\u56D7\u56EE\u56F9\u56FF\u5704\u5709\u5708\u570D" +
-+ "\u55C7\u5718\u5716\u571C\u5726\u5738\u574E\u573B" +
-+ "\u5759\u5740\u574F\u5765\u5788\u5761\u577F\u5789" +
-+ "\u5793\u57A0\u57A4\u57B3\u57AC\u57AA\u57C3\u57C6" +
-+ "\u57C8\u57C0\u57D4\u57C7\u57D2\u57D3\u57D6\uFA0F" +
-+ "\u580A\u57E3\u580B\u5819\u5821\u584B\u5862\u6BC0" +
-+ "\u583D\u5852\uFA10\u5870\u5879\u5885\u5872\u589F" +
-+ "\u58AB\u58B8\u589E\u58AE\u58B2\u58B9\u58BA\u58C5" +
-+ "\u58D3\u58D1\u58D7\u58D9\u58D8\u58DE\u58DC\u58DF" +
-+ "\u58E4\u58E5\u58EF\u58F7\u58F9\u58FB\u58FC\u5902" +
-+ "\u590A\u590B\u5910\u591B\u68A6\u5925\u592C\u592D" +
-+ "\u5932\u5938\u593E\u5955\u5950\u5953\u595A\u5958" +
-+ "\u595B\u595D\u5963\u5962\u5960\u5967\u596C\u5969" +
-+ "\u5978\u5981\u598D\u599B\u599D\u59A3\u59A4\u59B2" +
-+ "\u59BA\u59C6\u59E8\u59D9\u59DA\u5A25\u5A1F\u5A11" +
-+ "\u5A1C\u5A1A\u5A09\u5A40\u5A6C\u5A49\u5A35\u5A36" +
-+ "\u5A62\u5A6A\u5A9A\u5ABC\u5ABE\u5AD0\u5ACB\u5AC2" +
-+ "\u5ABD\u5AE3\u5AD7\u5AE6\u5AE9\u5AD6\u5AFA\u5AFB" +
-+ "\u5B0C\u5B0B\u5B16\u5B32\u5B2A\u5B36\u5B3E\u5B43" +
-+ "\u5B45\u5B40\u5B51\u5B55\u5B56\u6588\u5B5B\u5B65" +
-+ "\u5B69\u5B70\u5B73\u5B75\u5B78\u5B7A\u5B80\u5B83" +
-+ "\u5BA6\u5BB8\u5BC3\u5BC7\u5BC0\u5BC9\u752F" ,
-+ "\uFFFD\u5BD0\u5BD8\u5BDE\u5BEC\u5BE4\u5BE2\u5BE5" +
-+ "\u5BEB\u5BF0\u5BF3\u5BF6\u5C05\u5C07\u5C08\u5C0D" +
-+ "\u5C13\u5C1E\u5C20\u5C22\u5C28\u5C38\u5C41\u5C46" +
-+ "\u5C4E\u5C53\u5C50\u5B71\u5C6C\u5C6E\u5C76\u5C79" +
-+ "\u5C8C\u5C94\u5CBE\u5CAB\u5CBB\u5CB6\u5CB7\u5CA6" +
-+ "\u5CBA\u5CC5\u5CBC\u5CC7\u5CD9\u5CE9\u5CFD\u5CFA" +
-+ "\u5CF5\u5CED\u5CEA\u5D0B\u5D15\u5D1F\u5D1B\u5D11" +
-+ "\u5D27\u5D22\u5D1A\u5D19\u5D18\u5D4C\u5D52\u5D53" +
-+ "\uFA11\u5D5C\u5D4E\u5D4B\u5D42\u5D6C\u5D73\u5D6D" +
-+ "\u5D76\u5D87\u5D84\u5D82\u5D8C\u5DA2\u5D9D\u5D90" +
-+ "\u5DAC\u5DAE\u5DB7\u5DB8\u5DBC\u5DB9\u5DC9\u5DD0" +
-+ "\u5DD3\u5DD2\u5DDB\u5DEB\u5DF5\u5E0B\u5E1A\u5E19" +
-+ "\u5E11\u5E1B\u5E36\u5E44\u5E43\u5E40\u5E47\u5E4E" +
-+ "\u5E57\u5E54\u5E62\u5E64\u5E75\u5E76\u5E7A\u5E7F" +
-+ "\u5EA0\u5EC1\u5EC2\u5EC8\u5ED0\u5ECF\u5EDD\u5EDA" +
-+ "\u5EDB\u5EE2\u5EE1\u5EE8\u5EE9\u5EEC\u5EF0\u5EF1" +
-+ "\u5EF3\u5EF4\u5F03\u5F09\u5F0B\u5F11\u5F16\u5F21" +
-+ "\u5F29\u5F2D\u5F2F\u5F34\u5F38\u5F41\u5F48\u5F4C" +
-+ "\u5F4E\u5F51\u5F56\u5F57\u5F59\u5F5C\u5F5D\u5F61" +
-+ "\u5F67\u5F73\u5F77\u5F83\u5F82\u5F7F\u5F8A\u5F88" +
-+ "\u5F87\u5F91\u5F99\u5F9E\u5F98\u5FA0\u5FA8\u5FAD" +
-+ "\u5FB7\u5FBC\u5FD6\u5FFB\u5FE4\u5FF8\u5FF1\u5FF0" +
-+ "\u5FDD\u5FDE\u5FFF\u6021\u6019\u6010\u6029\u600E" +
-+ "\u6031\u601B\u6015\u602B\u6026\u600F\u603A" ,
-+ "\uFFFD\u605A\u6041\u6060\u605D\u606A\u6077\u605F" +
-+ "\u604A\u6046\u604D\u6063\u6043\u6064\u606C\u606B" +
-+ "\u6059\u6085\u6081\u6083\u609A\u6084\u609B\u608A" +
-+ "\u6096\u6097\u6092\u60A7\u608B\u60E1\u60B8\u60DE" +
-+ "\u60E0\u60D3\u60BD\u60C6\u60B5\u60D5\u60D8\u6120" +
-+ "\u60F2\u6115\u6106\u60F6\u60F7\u6100\u60F4\u60FA" +
-+ "\u6103\u6121\u60FB\u60F1\u610D\u610E\u6111\u6147" +
-+ "\u614D\u6137\u6128\u6127\u613E\u614A\u6130\u613C" +
-+ "\u612C\u6134\u6165\u615D\u613D\u6142\u6144\u6173" +
-+ "\u6187\u6177\u6158\u6159\u615A\u616B\u6174\u616F" +
-+ "\u6171\u615F\u6153\u6175\u6198\u6199\u6196\u61AC" +
-+ "\u6194\u618A\u6191\u61AB\u61AE\u61CC\u61CA\u61C9" +
-+ "\u61C8\u61C3\u61C6\u61BA\u61CB\u7F79\u61CD\u61E6" +
-+ "\u61E3\u61F4\u61F7\u61F6\u61FD\u61FA\u61FF\u61FC" +
-+ "\u61FE\u6200\u6208\u6209\u620D\u6213\u6214\u621B" +
-+ "\u621E\u6221\u622A\u622E\u6230\u6232\u6233\u6241" +
-+ "\u624E\u625E\u6263\u625B\u6260\u6268\u627C\u6282" +
-+ "\u6289\u6292\u627E\u6293\u6296\u6283\u6294\u62D7" +
-+ "\u62D1\u62BB\u62CF\u62AC\u62C6\u62C8\u62DC\u62D4" +
-+ "\u62CA\u62C2\u62A6\u62C7\u629B\u62C9\u630C\u62EE" +
-+ "\u62F1\u6327\u6302\u6308\u62EF\u62F5\u62FF\u6350" +
-+ "\u634D\u633E\u634F\u6396\u638E\u6380\u63AB\u6376" +
-+ "\u63A3\u638F\u6389\u639F\u636B\u6369\u63B5\u63BE" +
-+ "\u63E9\u63C0\u63C6\u63F5\u63E3\u63C9\u63D2" ,
-+ "\uFFFD\u63F6\u63C4\u6434\u6406\u6413\u6426\u6436" +
-+ "\u641C\u6417\u6428\u640F\u6416\u644E\u6467\u646F" +
-+ "\u6460\u6476\u64B9\u649D\u64CE\u6495\u64BB\u6493" +
-+ "\u64A5\u64A9\u6488\u64BC\u64DA\u64D2\u64C5\u64C7" +
-+ "\u64D4\u64D8\u64C2\u64F1\u64E7\u64E0\u64E1\u64E3" +
-+ "\u64EF\u64F4\u64F6\u64F2\u64FA\u6500\u64FD\u6518" +
-+ "\u651C\u651D\u6505\u6524\u6523\u652B\u652C\u6534" +
-+ "\u6535\u6537\u6536\u6538\u754B\u6548\u654E\u6556" +
-+ "\u654D\u6558\u6555\u655D\u6572\u6578\u6582\u6583" +
-+ "\u8B8A\u659B\u659F\u65AB\u65B7\u65C3\u65C6\u65C1" +
-+ "\u65C4\u65CC\u65D2\u65D9\u65E1\u65E0\u65F1\u6600" +
-+ "\u6615\u6602\u6772\u6603\u65FB\u6609\u663F\u6635" +
-+ "\u662E\u661E\u6634\u661C\u6624\u6644\u6649\u6665" +
-+ "\u6657\u665E\u6664\u6659\u6662\u665D\uFA12\u6673" +
-+ "\u6670\u6683\u6688\u6684\u6699\u6698\u66A0\u669D" +
-+ "\u66B2\u66C4\u66C1\u66BF\u66C9\u66BE\u66BC\u66B8" +
-+ "\u66D6\u66DA\u66E6\u66E9\u66F0\u66F5\u66F7\u66FA" +
-+ "\u670E\uF929\u6716\u671E\u7E22\u6726\u6727\u9738" +
-+ "\u672E\u673F\u6736\u6737\u6738\u6746\u675E\u6759" +
-+ "\u6766\u6764\u6789\u6785\u6770\u67A9\u676A\u678B" +
-+ "\u6773\u67A6\u67A1\u67BB\u67B7\u67EF\u67B4\u67EC" +
-+ "\u67E9\u67B8\u67E7\u67E4\u6852\u67DD\u67E2\u67EE" +
-+ "\u67C0\u67CE\u67B9\u6801\u67C6\u681E\u6846\u684D" +
-+ "\u6840\u6844\u6832\u684E\u6863\u6859\u688D" ,
-+ "\uFFFD\u6877\u687F\u689F\u687E\u688F\u68AD\u6894" +
-+ "\u6883\u68BC\u68B9\u6874\u68B5\u68BA\u690F\u6901" +
-+ "\u68CA\u6908\u68D8\u6926\u68E1\u690C\u68CD\u68D4" +
-+ "\u68E7\u68D5\u6912\u68EF\u6904\u68E3\u68E0\u68CF" +
-+ "\u68C6\u6922\u692A\u6921\u6923\u6928\uFA13\u6979" +
-+ "\u6977\u6936\u6978\u6954\u696A\u6974\u6968\u693D" +
-+ "\u6959\u6930\u695E\u695D\u697E\u6981\u69B2\u69BF" +
-+ "\uFA14\u6998\u69C1\u69D3\u69BE\u69CE\u5BE8\u69CA" +
-+ "\u69B1\u69DD\u69BB\u69C3\u69A0\u699C\u6995\u69DE" +
-+ "\u6A2E\u69E8\u6A02\u6A1B\u69FF\u69F9\u69F2\u69E7" +
-+ "\u69E2\u6A1E\u69ED\u6A14\u69EB\u6A0A\u6A22\u6A12" +
-+ "\u6A23\u6A13\u6A30\u6A6B\u6A44\u6A0C\u6AA0\u6A36" +
-+ "\u6A78\u6A47\u6A62\u6A59\u6A66\u6A48\u6A46\u6A38" +
-+ "\u6A72\u6A73\u6A90\u6A8D\u6A84\u6AA2\u6AA3\u6A7E" +
-+ "\u6A97\u6AAC\u6AAA\u6ABB\u6AC2\u6AB8\u6AB3\u6AC1" +
-+ "\u6ADE\u6AE2\u6AD1\u6ADA\u6AE4\u8616\u8617\u6AEA" +
-+ "\u6B05\u6B0A\u6AFA\u6B12\u6B16\u6B1F\u6B38\u6B37" +
-+ "\u6B39\u76DC\u98EE\u6B47\u6B43\u6B49\u6B50\u6B59" +
-+ "\u6B54\u6B5B\u6B5F\u6B61\u6B78\u6B79\u6B7F\u6B80" +
-+ "\u6B84\u6B83\u6B8D\u6B98\u6B95\u6B9E\u6BA4\u6BAA" +
-+ "\u6BAB\u6BAF\u6BB1\u6BB2\u6BB3\u6BB7\u6BBC\u6BC6" +
-+ "\u6BCB\u6BD3\u6BD6\u6BDF\u6BEC\u6BEB\u6BF3\u6BEF" +
-+ "\u6C08\u6C13\u6C14\u6C1B\u6C24\u6C23\u6C3F\u6C5E" +
-+ "\u6C55\u6C5C\u6C62\u6C82\u6C8D\u6C86\u6C6F" ,
-+ "\uFFFD\u6C9A\u6C81\u6C9B\u6C7E\u6C68\u6C73\u6C92" +
-+ "\u6C90\u6CC4\u6CF1\u6CBD\u6CC5\u6CAE\u6CDA\u6CDD" +
-+ "\u6CB1\u6CBE\u6CBA\u6CDB\u6CEF\u6CD9\u6CEA\u6D1F" +
-+ "\u6D04\u6D36\u6D2B\u6D3D\u6D33\u6D12\u6D0C\u6D63" +
-+ "\u6D87\u6D93\u6D6F\u6D64\u6D5A\u6D79\u6D59\u6D8E" +
-+ "\u6D95\u6D9B\u6D85\u6D96\u6DF9\u6E0A\u6E2E\u6DB5" +
-+ "\u6DE6\u6DC7\u6DAC\u6DB8\u6DCF\u6DC6\u6DEC\u6DDE" +
-+ "\u6DCC\u6DE8\u6DF8\u6DD2\u6DC5\u6DFA\u6DD9\u6DF2" +
-+ "\u6DFC\u6DE4\u6DD5\u6DEA\u6DEE\u6E2D\u6E6E\u6E19" +
-+ "\u6E72\u6E5F\u6E39\u6E3E\u6E23\u6E6B\u6E5C\u6E2B" +
-+ "\u6E76\u6E4D\u6E1F\u6E27\u6E43\u6E3C\u6E3A\u6E4E" +
-+ "\u6E24\u6E1D\u6E38\u6E82\u6EAA\u6E98\u6EB7\u6EBD" +
-+ "\u6EAF\u6EC4\u6EB2\u6ED4\u6ED5\u6E8F\u6EBF\u6EC2" +
-+ "\u6E9F\u6F41\u6F45\u6EEC\u6EF8\u6EFE\u6F3F\u6EF2" +
-+ "\u6F31\u6EEF\u6F32\u6ECC\u6EFF\u6F3E\u6F13\u6EF7" +
-+ "\u6F86\u6F7A\u6F78\u6F80\u6F6F\u6F5B\u6F6D\u6F74" +
-+ "\u6F82\u6F88\u6F7C\u6F58\u6FC6\u6F8E\u6F91\u6F66" +
-+ "\u6FB3\u6FA3\u6FB5\u6FA1\u6FB9\u6FDB\u6FAA\u6FC2" +
-+ "\u6FDF\u6FD5\u6FEC\u6FD8\u6FD4\u6FF5\u6FEE\u7005" +
-+ "\u7007\u7009\u700B\u6FFA\u7011\u7001\u700F\u701B" +
-+ "\u701A\u701F\u6FF3\u7028\u7018\u7030\u703E\u7032" +
-+ "\u7051\u7063\u7085\u7099\u70AF\u70AB\u70AC\u70B8" +
-+ "\u70AE\u70DF\u70CB\u70D9\u7109\u710F\u7104\u70F1" +
-+ "\u70FD\u711C\u7119\u715C\u7146\u7147\u7166" ,
-+ "\uFFFD\u7162\u714C\u7156\u716C\u7188\u718F\u7184" +
-+ "\u7195\uFA15\u71AC\u71C1\u71B9\u71BE\u71D2\u71E7" +
-+ "\u71C9\u71D4\u71D7\u71CE\u71F5\u71E0\u71EC\u71FB" +
-+ "\u71FC\u71F9\u71FE\u71FF\u720D\u7210\u7228\u722D" +
-+ "\u722C\u7230\u7232\u723B\u723C\u723F\u7240\u7246" +
-+ "\u724B\u7258\u7274\u727E\u7281\u7287\u7282\u7292" +
-+ "\u7296\u72A2\u72A7\u72B1\u72B2\u72BE\u72C3\u72C6" +
-+ "\u72C4\u72B9\u72CE\u72D2\u72E2\u72E0\u72E1\u72F9" +
-+ "\u72F7\u7317\u730A\u731C\u7316\u731D\u7324\u7334" +
-+ "\u7329\u732F\uFA16\u7325\u733E\u734F\u734E\u7357" +
-+ "\u9ED8\u736A\u7368\u7370\u7377\u7378\u7375\u737B" +
-+ "\u73C8\u73BD\u73B3\u73CE\u73BB\u73C0\u73C9\u73D6" +
-+ "\u73E5\u73E3\u73D2\u73EE\u73F1\u73DE\u73F8\u7407" +
-+ "\u73F5\u7405\u7426\u742A\u7425\u7429\u742E\u7432" +
-+ "\u743A\u7455\u743F\u745F\u7459\u7441\u745C\u7469" +
-+ "\u7470\u7463\u746A\u7464\u7462\u7489\u746F\u747E" +
-+ "\u749F\u749E\u74A2\u74A7\u74CA\u74CF\u74D4\u74E0" +
-+ "\u74E3\u74E7\u74E9\u74EE\u74F0\u74F2\u74F1\u74F7" +
-+ "\u74F8\u7501\u7504\u7503\u7505\u750D\u750C\u750E" +
-+ "\u7513\u751E\u7526\u752C\u753C\u7544\u754D\u754A" +
-+ "\u7549\u7546\u755B\u755A\u7564\u7567\u756B\u756F" +
-+ "\u7574\u756D\u7578\u7576\u7582\u7586\u7587\u758A" +
-+ "\u7589\u7594\u759A\u759D\u75A5\u75A3\u75C2\u75B3" +
-+ "\u75C3\u75B5\u75BD\u75B8\u75BC\u75B1\u75CD" ,
-+ "\uFFFD\u75CA\u75D2\u75D9\u75E3\u75DE\u75FE\u75FF" +
-+ "\u75FC\u7601\u75F0\u75FA\u75F2\u75F3\u760B\u7609" +
-+ "\u761F\u7627\u7620\u7621\u7622\u7624\u7634\u7630" +
-+ "\u763B\u7647\u7648\u7658\u7646\u765C\u7661\u7662" +
-+ "\u7668\u7669\u7667\u766A\u766C\u7670\u7672\u7676" +
-+ "\u767C\u7682\u7680\u7683\u7688\u768B\u7699\u769A" +
-+ "\u769C\u769E\u769B\u76A6\u76B0\u76B4\u76B8\u76B9" +
-+ "\u76BA\u76C2\uFA17\u76CD\u76D6\u76D2\u76DE\u76E1" +
-+ "\u76E5\u76EA\u862F\u76FB\u7708\u7707\u7704\u7724" +
-+ "\u7729\u7725\u7726\u771B\u7737\u7738\u7746\u7747" +
-+ "\u775A\u7768\u776B\u775B\u7765\u777F\u777E\u7779" +
-+ "\u778E\u778B\u7791\u77A0\u779E\u77B0\u77B6\u77B9" +
-+ "\u77BF\u77BC\u77BD\u77BB\u77C7\u77CD\u77DA\u77DC" +
-+ "\u77E3\u77EE\u52AF\u77FC\u780C\u7812\u7821\u783F" +
-+ "\u7820\u7845\u784E\u7864\u7874\u788E\u787A\u7886" +
-+ "\u789A\u787C\u788C\u78A3\u78B5\u78AA\u78AF\u78D1" +
-+ "\u78C6\u78CB\u78D4\u78BE\u78BC\u78C5\u78CA\u78EC" +
-+ "\u78E7\u78DA\u78FD\u78F4\u7907\u7911\u7919\u792C" +
-+ "\u792B\u7930\uFA18\u7940\u7960\uFA19\u795F\u795A" +
-+ "\u7955\uFA1A\u797F\u798A\u7994\uFA1B\u799D\u799B" +
-+ "\u79AA\u79B3\u79BA\u79C9\u79D5\u79E7\u79EC\u79E3" +
-+ "\u7A08\u7A0D\u7A18\u7A19\u7A1F\u7A31\u7A3E\u7A37" +
-+ "\u7A3B\u7A43\u7A57\u7A49\u7A62\u7A61\u7A69\u9F9D" +
-+ "\u7A70\u7A79\u7A7D\u7A88\u7A95\u7A98\u7A96" ,
-+ "\uFFFD\u7A97\u7AA9\u7AB0\u7AB6\u9083\u7AC3\u7ABF" +
-+ "\u7AC5\u7AC4\u7AC7\u7ACA\u7ACD\u7ACF\u7AD2\u7AD1" +
-+ "\u7AD5\u7AD3\u7AD9\u7ADA\u7ADD\u7AE1\u7AE2\u7AE6" +
-+ "\u7AE7\uFA1C\u7AEB\u7AED\u7AF0\u7AF8\u7B02\u7B0F" +
-+ "\u7B0B\u7B0A\u7B06\u7B33\u7B36\u7B19\u7B1E\u7B35" +
-+ "\u7B28\u7B50\u7B4D\u7B4C\u7B45\u7B5D\u7B75\u7B7A" +
-+ "\u7B74\u7B70\u7B71\u7B6E\u7B9D\u7B98\u7B9F\u7B8D" +
-+ "\u7B9C\u7B9A\u7B92\u7B8F\u7B99\u7BCF\u7BCB\u7BCC" +
-+ "\u7BB4\u7BC6\u7B9E\u7BDD\u7BE9\u7BE6\u7BF7\u7BE5" +
-+ "\u7C14\u7C00\u7C13\u7C07\u7BF3\u7C0D\u7BF6\u7C23" +
-+ "\u7C27\u7C2A\u7C1F\u7C37\u7C2B\u7C3D\u7C40\u7C4C" +
-+ "\u7C43\u7C56\u7C50\u7C58\u7C5F\u7C65\u7C6C\u7C75" +
-+ "\u7C83\u7C90\u7CA4\u7CA2\u7CAB\u7CA1\u7CAD\u7CA8" +
-+ "\u7CB3\u7CB2\u7CB1\u7CAE\u7CB9\uFA1D\u7CBD\u7CC5" +
-+ "\u7CC2\u7CD2\u7CE2\u7CD8\u7CDC\u7CEF\u7CF2\u7CF4" +
-+ "\u7CF6\u7D06\u7D02\u7D1C\u7D15\u7D0A\u7D45\u7D4B" +
-+ "\u7D2E\u7D32\u7D3F\u7D35\u7D48\u7D46\u7D5C\u7D73" +
-+ "\u7D56\u7D4E\u7D68\u7D6E\u7D4F\u7D63\u7D93\u7D89" +
-+ "\u7D5B\u7DAE\u7DA3\u7DB5\u7DB7\u7DC7\u7DBD\u7DAB" +
-+ "\u7DA2\u7DAF\u7DA0\u7DB8\u7D9F\u7DB0\u7DD5\u7DD8" +
-+ "\u7DDD\u7DD6\u7DE4\u7DDE\u7DFB\u7E0B\u7DF2\u7DE1" +
-+ "\u7DDC\u7E05\u7E0A\u7E21\u7E12\u7E1F\u7E09\u7E3A" +
-+ "\u7E46\u7E66\u7E31\u7E3D\u7E35\u7E3B\u7E39\u7E43" +
-+ "\u7E37\u7E32\u7E5D\u7E56\u7E5E\u7E52\u7E59" ,
-+ "\uFFFD\u7E5A\u7E67\u7E79\u7E6A\u7E69\u7E7C\u7E7B" +
-+ "\u7E7D\u8FAE\u7E7F\u7E83\u7E89\u7E8E\u7E8C\u7E92" +
-+ "\u7E93\u7E94\u7E96\u7E9B\u7F38\u7F3A\u7F45\u7F47" +
-+ "\u7F4C\u7F4E\u7F51\u7F55\u7F54\u7F58\u7F5F\u7F60" +
-+ "\u7F68\u7F67\u7F69\u7F78\u7F82\u7F86\u7F83\u7F87" +
-+ "\u7F88\u7F8C\u7F94\u7F9E\u7F9D\u7F9A\u7FA1\u7FA3" +
-+ "\u7FAF\u7FAE\u7FB2\u7FB9\u7FB6\u7FB8\u8B71\uFA1E" +
-+ "\u7FC5\u7FC6\u7FCA\u7FD5\u7FE1\u7FE6\u7FE9\u7FF3" +
-+ "\u7FF9\u8004\u800B\u8012\u8019\u801C\u8021\u8028" +
-+ "\u803F\u803B\u804A\u8046\u8052\u8058\u805F\u8062" +
-+ "\u8068\u8073\u8072\u8070\u8076\u8079\u807D\u807F" +
-+ "\u8084\u8085\u8093\u809A\u80AD\u5190\u80AC\u80DB" +
-+ "\u80E5\u80D9\u80DD\u80C4\u80DA\u8109\u80EF\u80F1" +
-+ "\u811B\u8123\u812F\u814B\u8146\u813E\u8153\u8151" +
-+ "\u80FC\u8171\u816E\u8165\u815F\u8166\u8174\u8183" +
-+ "\u8188\u818A\u8180\u8182\u81A0\u8195\u81A3\u8193" +
-+ "\u81B5\u81A4\u81A9\u81B8\u81B0\u81C8\u81BE\u81BD" +
-+ "\u81C0\u81C2\u81BA\u81C9\u81CD\u81D1\u81D8\u81D9" +
-+ "\u81DA\u81DF\u81E0\u81FA\u81FB\u81FE\u8201\u8202" +
-+ "\u8205\u820D\u8210\u8212\u8216\u8229\u822B\u822E" +
-+ "\u8238\u8233\u8240\u8259\u825A\u825D\u825F\u8264" +
-+ "\u8262\u8268\u826A\u826B\u8271\u8277\u827E\u828D" +
-+ "\u8292\u82AB\u829F\u82BB\u82AC\u82E1\u82E3\u82DF" +
-+ "\u8301\u82D2\u82F4\u82F3\u8303\u82FB\u82F9" ,
-+ "\uFFFD\u82DE\u8306\u82DC\u82FA\u8309\u82D9\u8335" +
-+ "\u8362\u8334\u8316\u8331\u8340\u8339\u8350\u8345" +
-+ "\u832F\u832B\u8318\u839A\u83AA\u839F\u83A2\u8396" +
-+ "\u8323\u838E\u8375\u837F\u838A\u837C\u83B5\u8373" +
-+ "\u8393\u83A0\u8385\u8389\u83A8\u83F4\u8413\u83C7" +
-+ "\u83CE\u83F7\u83FD\u8403\u83D8\u840B\u83C1\u8407" +
-+ "\u83E0\u83F2\u840D\u8420\u83F6\u83BD\u83FB\u842A" +
-+ "\u8462\u843C\u8484\u8477\u846B\u8479\u8448\u846E" +
-+ "\u8482\u8469\u8446\u846F\u8438\u8435\u84CA\u84B9" +
-+ "\u84BF\u849F\u84B4\u84CD\u84BB\u84DA\u84D0\u84C1" +
-+ "\u84AD\u84C6\u84D6\u84A1\u84D9\u84FF\u84F4\u8517" +
-+ "\u8518\u852C\u851F\u8515\u8514\u8506\u8553\u855A" +
-+ "\u8540\u8559\u8563\u8558\u8548\u8541\u854A\u854B" +
-+ "\u856B\u8555\u8580\u85A4\u8588\u8591\u858A\u85A8" +
-+ "\u856D\u8594\u859B\u85AE\u8587\u859C\u8577\u857E" +
-+ "\u8590\uFA1F\u820A\u85B0\u85C9\u85BA\u85CF\u85B9" +
-+ "\u85D0\u85D5\u85DD\u85E5\u85DC\u85F9\u860A\u8613" +
-+ "\u860B\u85FE\u8622\u861A\u8630\u863F\uFA20\u864D" +
-+ "\u4E55\u8655\u865F\u8667\u8671\u8693\u86A3\u86A9" +
-+ "\u868B\u86AA\u868C\u86B6\u86AF\u86C4\u86C6\u86B0" +
-+ "\u86C9\u86CE\uFA21\u86AB\u86D4\u86DE\u86E9\u86EC" +
-+ "\u86DF\u86DB\u8712\u8706\u8708\u8700\u8703\u86FB" +
-+ "\u8711\u8709\u870D\u86F9\u870A\u8734\u873F\u873B" +
-+ "\u8725\u8729\u871A\u875F\u8778\u874C\u874E" ,
-+ "\uFFFD\u8774\u8757\u8768\u8782\u876A\u8760\u876E" +
-+ "\u8759\u8753\u8763\u877F\u87A2\u87C6\u879F\u87AF" +
-+ "\u87CB\u87BD\u87C0\u87D0\u96D6\u87AB\u87C4\u87B3" +
-+ "\u87D2\u87BB\u87EF\u87F2\u87E0\u880E\u8807\u880F" +
-+ "\u8816\u880D\u87FE\u87F6\u87F7\u8811\u8815\u8822" +
-+ "\u8821\u8827\u8831\u8836\u8839\u883B\u8842\u8844" +
-+ "\u884D\u8852\u8859\u885E\u8862\u886B\u8881\u887E" +
-+ "\u8875\u887D\u8872\u8882\u889E\u8897\u8892\u88AE" +
-+ "\u8899\u88A2\u888D\u88A4\u88BF\u88B5\u88B1\u88C3" +
-+ "\u88C4\u88D4\u88D8\u88D9\u88DD\u88F9\u8902\u88FC" +
-+ "\u88F5\u88E8\u88F2\u8904\u890C\u892A\u891D\u890A" +
-+ "\u8913\u891E\u8925\u892B\u8941\u893B\u8936\u8943" +
-+ "\u8938\u894D\u894C\u8960\u895E\u8966\u896A\u8964" +
-+ "\u896D\u896F\u8974\u8977\u897E\u8983\u8988\u898A" +
-+ "\u8993\u8998\u89A1\u89A9\u89A6\u89AC\u89AF\u89B2" +
-+ "\u89BA\u89BF\u89BD\u89C0\u89DA\u89DD\u89E7\u89F4" +
-+ "\u89F8\u8A03\u8A16\u8A10\u8A0C\u8A12\u8A1B\u8A1D" +
-+ "\u8A25\u8A36\u8A41\u8A37\u8A5B\u8A52\u8A46\u8A48" +
-+ "\u8A7C\u8A6D\u8A6C\u8A62\u8A79\u8A85\u8A82\u8A84" +
-+ "\u8AA8\u8AA1\u8A91\u8AA5\u8AA6\u8A9A\u8AA3\u8AA7" +
-+ "\u8ACC\u8ABE\u8ACD\u8AC2\u8ADA\u8AF3\u8AE7\u8AE4" +
-+ "\u8AF1\u8B14\u8AE0\u8AE2\u8AE1\u8ADF\uFA22\u8AF6" +
-+ "\u8AF7\u8ADE\u8ADB\u8B0C\u8B07\u8B1A\u8B16\u8B10" +
-+ "\u8B17\u8B20\u8B33\u8B41\u97AB\u8B26\u8B2B" ,
-+ "\uFFFD\u8B3E\u8B4C\u8B4F\u8B4E\u8B53\u8B49\u8B56" +
-+ "\u8B5B\u8B5A\u8B74\u8B6B\u8B5F\u8B6C\u8B6F\u8B7D" +
-+ "\u8B7F\u8B80\u8B8C\u8B8E\u8B99\u8B92\u8B93\u8B96" +
-+ "\u8B9A\u8C3A\u8C41\u8C3F\u8C48\u8C4C\u8C4E\u8C50" +
-+ "\u8C55\u8C62\u8C6C\u8C78\u8C7A\u8C7C\u8C82\u8C89" +
-+ "\u8C85\u8C8A\u8C8D\u8C8E\u8C98\u8C94\u621D\u8CAD" +
-+ "\u8CAA\u8CAE\u8CBD\u8CB2\u8CB3\u8CC1\u8CB6\u8CC8" +
-+ "\u8CCE\u8CCD\u8CE3\u8CDA\u8CF0\u8CF4\u8CFD\u8CFA" +
-+ "\u8CFB\u8D07\u8D0A\u8D0F\u8D0D\u8D12\u8D10\u8D13" +
-+ "\u8D14\u8D16\u8D67\u8D6D\u8D71\u8D76\uFA23\u8D81" +
-+ "\u8DC2\u8DBE\u8DBA\u8DCF\u8DDA\u8DD6\u8DCC\u8DDB" +
-+ "\u8DCB\u8DEA\u8DEB\u8DDF\u8DE3\u8DFC\u8E08\u8DFF" +
-+ "\u8E09\u8E1D\u8E1E\u8E10\u8E1F\u8E42\u8E35\u8E30" +
-+ "\u8E34\u8E4A\u8E47\u8E49\u8E4C\u8E50\u8E48\u8E59" +
-+ "\u8E64\u8E60\u8E55\u8E63\u8E76\u8E72\u8E87\u8E7C" +
-+ "\u8E81\u8E85\u8E84\u8E8B\u8E8A\u8E93\u8E91\u8E94" +
-+ "\u8E99\u8EA1\u8EAA\u8EB1\u8EBE\u8EC6\u8EC5\u8EC8" +
-+ "\u8ECB\u8ECF\u8EDB\u8EE3\u8EFC\u8EFB\u8EEB\u8EFE" +
-+ "\u8F0A\u8F0C\u8F05\u8F15\u8F12\u8F13\u8F1C\u8F19" +
-+ "\u8F1F\u8F26\u8F33\u8F3B\u8F39\u8F45\u8F42\u8F3E" +
-+ "\u8F49\u8F46\u8F4C\u8F4E\u8F57\u8F5C\u8F62\u8F63" +
-+ "\u8F64\u8F9C\u8F9F\u8FA3\u8FA8\u8FA7\u8FAD\u8FAF" +
-+ "\u8FB7\uFA24\u8FDA\u8FE5\u8FE2\u8FEF\u8FE9\u8FF4" +
-+ "\u9005\u8FF9\u8FF8\u9011\u9015\u900E\u9021" ,
-+ "\uFFFD\u900D\u901E\u9016\u900B\u9027\u9036\u9039" +
-+ "\u904F\uFA25\u9050\u9051\u9052\u9049\u903E\u9056" +
-+ "\u9058\u905E\u9068\u9067\u906F\u9076\u96A8\u9072" +
-+ "\u9082\u907D\u9089\u9080\u908F\u6248\u90AF\u90B1" +
-+ "\u90B5\u90E2\u90E4\u90DB\u90DE\u9102\uFA26\u9115" +
-+ "\u9112\u9119\u9132\u9127\u9130\u914A\u9156\u9158" +
-+ "\u9163\u9165\u9169\u9173\u9172\u918B\u9189\u9182" +
-+ "\u91A2\u91AB\u91AF\u91AA\u91B5\u91B4\u91BA\u91C0" +
-+ "\u91C1\u91CB\u91D0\u91DA\u91DB\u91D7\u91DE\u91D6" +
-+ "\u91DF\u91E1\u91ED\u91F5\u91EE\u91E4\u91F6\u91E5" +
-+ "\u9206\u921E\u91FF\u9210\u9214\u920A\u922C\u9215" +
-+ "\u9229\u9257\u9245\u923A\u9249\u9264\u9240\u923C" +
-+ "\u9248\u924E\u9250\u9259\u923F\u9251\u9239\u924B" +
-+ "\u9267\u925A\u929C\u92A7\u9277\u9278\u9296\u9293" +
-+ "\u929B\u9295\u92E9\u92CF\u92E7\u92D7\u92D9\u92D0" +
-+ "\uFA27\u92D5\u92B9\u92B7\u92E0\u92D3\u933A\u9335" +
-+ "\u930F\u9325\u92FA\u9321\u9344\u92FB\uFA28\u9319" +
-+ "\u931E\u92FF\u9322\u931A\u931D\u9323\u9302\u933B" +
-+ "\u9370\u9360\u937C\u936E\u9356\u9357\u93B9\u93B0" +
-+ "\u93A4\u93AD\u9394\u93C8\u93D6\u93C6\u93D7\u93E8" +
-+ "\u93E5\u93D8\u93C3\u93DD\u93DE\u93D0\u93E4\u941A" +
-+ "\u93F8\u9414\u9413\u9421\u9403\u9407\u9436\u942B" +
-+ "\u9431\u943A\u9441\u9452\u9445\u9444\u9448\u945B" +
-+ "\u945A\u9460\u9462\u945E\u946A\u9475\u9470" ,
-+ "\uFFFD\u9477\u947F\u947D\u947C\u947E\u9481\u9582" +
-+ "\u9587\u958A\u9592\u9594\u9596\u9598\u9599\u95A0" +
-+ "\u95A8\u95A7\u95AD\u95BC\u95BB\u95B9\u95BE\u95CA" +
-+ "\u6FF6\u95C3\u95CD\u95CC\u95D5\u95D4\u95D6\u95DC" +
-+ "\u95E1\u95E5\u95E2\u9621\u9628\u962E\u962F\u9642" +
-+ "\u964F\u964C\u964B\u965C\u965D\u965F\u9666\u9677" +
-+ "\u9672\u966C\u968D\u968B\uF9DC\u9698\u9695\u9697" +
-+ "\uFA29\u969D\u96A7\u96AA\u96B1\u96B2\u96B0\u96AF" +
-+ "\u96B4\u96B6\u96B8\u96B9\u96CE\u96CB\u96D5\u96DC" +
-+ "\u96D9\u96F9\u9704\u9706\u9708\u9719\u970D\u9713" +
-+ "\u970E\u9711\u970F\u9716\u9724\u972A\u9730\u9733" +
-+ "\u9739\u973B\u973D\u973E\u9746\u9744\u9743\u9748" +
-+ "\u9742\u9749\u974D\u974F\u9751\u9755\u975C\u9760" +
-+ "\u9764\u9766\u9768\u976D\u9779\u9785\u977C\u9781" +
-+ "\u977A\u978B\u978F\u9790\u979C\u97A8\u97A6\u97A3" +
-+ "\u97B3\u97B4\u97C3\u97C6\u97C8\u97CB\u97DC\u97ED" +
-+ "\u97F2\u7ADF\u97F5\u980F\u981A\u9824\u9821\u9837" +
-+ "\u983D\u984F\u984B\u9857\u9865\u986B\u986F\u9870" +
-+ "\u9871\u9874\u9873\u98AA\u98AF\u98B1\u98B6\u98C4" +
-+ "\u98C3\u98C6\u98DC\u98ED\u98E9\uFA2A\u98EB\uFA2B" +
-+ "\u9903\u991D\u9912\u9914\u9918\u9927\uFA2C\u9921" +
-+ "\u991E\u9924\u9920\u992C\u992E\u993D\u993E\u9942" +
-+ "\u9949\u9945\u9950\u994B\u9951\u994C\u9955\u9997" +
-+ "\u9998\u999E\u99A5\u99AD\u99AE\u99BC\u99DF" ,
-+ "\uFFFD\u99DB\u99DD\u99D8\u99D1\u99ED\u99EE\u99E2" +
-+ "\u99F1\u99F2\u99FB\u99F8\u9A01\u9A0F\u9A05\u9A19" +
-+ "\u9A2B\u9A37\u9A40\u9A45\u9A42\u9A43\u9A3E\u9A55" +
-+ "\u9A4D\u9A4E\u9A5B\u9A57\u9A5F\u9A62\u9A69\u9A65" +
-+ "\u9A64\u9A6A\u9A6B\u9AAD\u9AB0\u9ABC\u9AC0\u9ACF" +
-+ "\u9AD3\u9AD4\u9AD1\u9AD9\u9ADC\u9ADE\u9ADF\u9AE2" +
-+ "\u9AE3\u9AE6\u9AEF\u9AEB\u9AEE\u9AF4\u9AF1\u9AF7" +
-+ "\u9AFB\u9B06\u9B18\u9B1A\u9B1F\u9B22\u9B23\u9B25" +
-+ "\u9B27\u9B28\u9B29\u9B2A\u9B2E\u9B2F\u9B31\u9B32" +
-+ "\u9B3B\u9B44\u9B43\u9B4D\u9B4E\u9B51\u9B58\u9B75" +
-+ "\u9B74\u9B72\u9B93\u9B8F\u9B83\u9B91\u9B96\u9B97" +
-+ "\u9B9F\u9BA0\u9BA8\u9BB1\u9BB4\u9BC0\u9BCA\u9BBB" +
-+ "\u9BB9\u9BC6\u9BCF\u9BD1\u9BD2\u9BE3\u9BE2\u9BE4" +
-+ "\u9BD4\u9BE1\u9BF5\u9BF1\u9BF2\u9C04\u9C1B\u9C15" +
-+ "\u9C14\u9C00\u9C09\u9C13\u9C0C\u9C06\u9C08\u9C12" +
-+ "\u9C0A\u9C2E\u9C25\u9C24\u9C21\u9C30\u9C47\u9C32" +
-+ "\u9C46\u9C3E\u9C5A\u9C60\u9C67\u9C76\u9C78\u9CEB" +
-+ "\u9CE7\u9CEC\u9CF0\u9D09\u9D03\u9D06\u9D2A\u9D26" +
-+ "\u9D2C\u9D23\u9D1F\u9D15\u9D12\u9D41\u9D3F\u9D44" +
-+ "\u9D3E\u9D46\u9D48\u9D5D\u9D5E\u9D59\u9D51\u9D50" +
-+ "\u9D64\u9D72\u9D70\u9D87\u9D6B\u9D6F\u9D7A\u9D9A" +
-+ "\u9DA4\u9DA9\u9DAB\u9DB2\u9DC4\u9DC1\u9DBB\u9DB8" +
-+ "\u9DBA\u9DC6\u9DCF\u9DC2\uFA2D\u9DD9\u9DD3\u9DF8" +
-+ "\u9DE6\u9DED\u9DEF\u9DFD\u9E1A\u9E1B\u9E19" ,
-+ "\uFFFD\u9E1E\u9E75\u9E79\u9E7D\u9E81\u9E88\u9E8B" +
-+ "\u9E8C\u9E95\u9E91\u9E9D\u9EA5\u9EB8\u9EAA\u9EAD" +
-+ "\u9EBC\u9EBE\u9761\u9ECC\u9ECF\u9ED0\u9ED1\u9ED4" +
-+ "\u9EDC\u9EDE\u9EDD\u9EE0\u9EE5\u9EE8\u9EEF\u9EF4" +
-+ "\u9EF6\u9EF7\u9EF9\u9EFB\u9EFC\u9EFD\u9F07\u9F08" +
-+ "\u76B7\u9F15\u9F21\u9F2C\u9F3E\u9F4A\u9F4E\u9F4F" +
-+ "\u9F52\u9F54\u9F63\u9F5F\u9F60\u9F61\u9F66\u9F67" +
-+ "\u9F6C\u9F6A\u9F77\u9F72\u9F76\u9F95\u9F9C\u9FA0" +
-+ "\u5C2D\u69D9\u9065\u7476\u51DC\u7155\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" +
-+ "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD" ,
-+ "\uFFFD\uE000\uE001\uE002\uE003\uE004\uE005\uE006" +
-+ "\uE007\uE008\uE009\uE00A\uE00B\uE00C\uE00D\uE00E" +
-+ "\uE00F\uE010\uE011\uE012\uE013\uE014\uE015\uE016" +
-+ "\uE017\uE018\uE019\uE01A\uE01B\uE01C\uE01D\uE01E" +
-+ "\uE01F\uE020\uE021\uE022\uE023\uE024\uE025\uE026" +
-+ "\uE027\uE028\uE029\uE02A\uE02B\uE02C\uE02D\uE02E" +
-+ "\uE02F\uE030\uE031\uE032\uE033\uE034\uE035\uE036" +
-+ "\uE037\uE038\uE039\uE03A\uE03B\uE03C\uE03D\uE03E" +
-+ "\uE03F\uE040\uE041\uE042\uE043\uE044\uE045\uE046" +
-+ "\uE047\uE048\uE049\uE04A\uE04B\uE04C\uE04D\uE04E" +
-+ "\uE04F\uE050\uE051\uE052\uE053\uE054\uE055\uE056" +
-+ "\uE057\uE058\uE059\uE05A\uE05B\uE05C\uE05D\uE05E" +
-+ "\uE05F\uE060\uE061\uE062\uE063\uE064\uE065\uE066" +
-+ "\uE067\uE068\uE069\uE06A\uE06B\uE06C\uE06D\uE06E" +
-+ "\uE06F\uE070\uE071\uE072\uE073\uE074\uE075\uE076" +
-+ "\uE077\uE078\uE079\uE07A\uE07B\uE07C\uE07D\uE07E" +
-+ "\uE07F\uE080\uE081\uE082\uE083\uE084\uE085\uE086" +
-+ "\uE087\uE088\uE089\uE08A\uE08B\uE08C\uE08D\uE08E" +
-+ "\uE08F\uE090\uE091\uE092\uE093\uE094\uE095\uE096" +
-+ "\uE097\uE098\uE099\uE09A\uE09B\uE09C\uE09D\uE09E" +
-+ "\uE09F\uE0A0\uE0A1\uE0A2\uE0A3\uE0A4\uE0A5\uE0A6" +
-+ "\uE0A7\uE0A8\uE0A9\uE0AA\uE0AB\uE0AC\uE0AD\uE0AE" +
-+ "\uE0AF\uE0B0\uE0B1\uE0B2\uE0B3\uE0B4\uE0B5\uE0B6" +
-+ "\uE0B7\uE0B8\uE0B9\uE0BA\uE0BB\uE0BC\uE0BD" ,
-+ "\uFFFD\uE0BE\uE0BF\uE0C0\uE0C1\uE0C2\uE0C3\uE0C4" +
-+ "\uE0C5\uE0C6\uE0C7\uE0C8\uE0C9\uE0CA\uE0CB\uE0CC" +
-+ "\uE0CD\uE0CE\uE0CF\uE0D0\uE0D1\uE0D2\uE0D3\uE0D4" +
-+ "\uE0D5\uE0D6\uE0D7\uE0D8\uE0D9\uE0DA\uE0DB\uE0DC" +
-+ "\uE0DD\uE0DE\uE0DF\uE0E0\uE0E1\uE0E2\uE0E3\uE0E4" +
-+ "\uE0E5\uE0E6\uE0E7\uE0E8\uE0E9\uE0EA\uE0EB\uE0EC" +
-+ "\uE0ED\uE0EE\uE0EF\uE0F0\uE0F1\uE0F2\uE0F3\uE0F4" +
-+ "\uE0F5\uE0F6\uE0F7\uE0F8\uE0F9\uE0FA\uE0FB\uE0FC" +
-+ "\uE0FD\uE0FE\uE0FF\uE100\uE101\uE102\uE103\uE104" +
-+ "\uE105\uE106\uE107\uE108\uE109\uE10A\uE10B\uE10C" +
-+ "\uE10D\uE10E\uE10F\uE110\uE111\uE112\uE113\uE114" +
-+ "\uE115\uE116\uE117\uE118\uE119\uE11A\uE11B\uE11C" +
-+ "\uE11D\uE11E\uE11F\uE120\uE121\uE122\uE123\uE124" +
-+ "\uE125\uE126\uE127\uE128\uE129\uE12A\uE12B\uE12C" +
-+ "\uE12D\uE12E\uE12F\uE130\uE131\uE132\uE133\uE134" +
-+ "\uE135\uE136\uE137\uE138\uE139\uE13A\uE13B\uE13C" +
-+ "\uE13D\uE13E\uE13F\uE140\uE141\uE142\uE143\uE144" +
-+ "\uE145\uE146\uE147\uE148\uE149\uE14A\uE14B\uE14C" +
-+ "\uE14D\uE14E\uE14F\uE150\uE151\uE152\uE153\uE154" +
-+ "\uE155\uE156\uE157\uE158\uE159\uE15A\uE15B\uE15C" +
-+ "\uE15D\uE15E\uE15F\uE160\uE161\uE162\uE163\uE164" +
-+ "\uE165\uE166\uE167\uE168\uE169\uE16A\uE16B\uE16C" +
-+ "\uE16D\uE16E\uE16F\uE170\uE171\uE172\uE173\uE174" +
-+ "\uE175\uE176\uE177\uE178\uE179\uE17A\uE17B" ,
-+ "\uFFFD\uE17C\uE17D\uE17E\uE17F\uE180\uE181\uE182" +
-+ "\uE183\uE184\uE185\uE186\uE187\uE188\uE189\uE18A" +
-+ "\uE18B\uE18C\uE18D\uE18E\uE18F\uE190\uE191\uE192" +
-+ "\uE193\uE194\uE195\uE196\uE197\uE198\uE199\uE19A" +
-+ "\uE19B\uE19C\uE19D\uE19E\uE19F\uE1A0\uE1A1\uE1A2" +
-+ "\uE1A3\uE1A4\uE1A5\uE1A6\uE1A7\uE1A8\uE1A9\uE1AA" +
-+ "\uE1AB\uE1AC\uE1AD\uE1AE\uE1AF\uE1B0\uE1B1\uE1B2" +
-+ "\uE1B3\uE1B4\uE1B5\uE1B6\uE1B7\uE1B8\uE1B9\uE1BA" +
-+ "\uE1BB\uE1BC\uE1BD\uE1BE\uE1BF\uE1C0\uE1C1\uE1C2" +
-+ "\uE1C3\uE1C4\uE1C5\uE1C6\uE1C7\uE1C8\uE1C9\uE1CA" +
-+ "\uE1CB\uE1CC\uE1CD\uE1CE\uE1CF\uE1D0\uE1D1\uE1D2" +
-+ "\uE1D3\uE1D4\uE1D5\uE1D6\uE1D7\uE1D8\uE1D9\uE1DA" +
-+ "\uE1DB\uE1DC\uE1DD\uE1DE\uE1DF\uE1E0\uE1E1\uE1E2" +
-+ "\uE1E3\uE1E4\uE1E5\uE1E6\uE1E7\uE1E8\uE1E9\uE1EA" +
-+ "\uE1EB\uE1EC\uE1ED\uE1EE\uE1EF\uE1F0\uE1F1\uE1F2" +
-+ "\uE1F3\uE1F4\uE1F5\uE1F6\uE1F7\uE1F8\uE1F9\uE1FA" +
-+ "\uE1FB\uE1FC\uE1FD\uE1FE\uE1FF\uE200\uE201\uE202" +
-+ "\uE203\uE204\uE205\uE206\uE207\uE208\uE209\uE20A" +
-+ "\uE20B\uE20C\uE20D\uE20E\uE20F\uE210\uE211\uE212" +
-+ "\uE213\uE214\uE215\uE216\uE217\uE218\uE219\uE21A" +
-+ "\uE21B\uE21C\uE21D\uE21E\uE21F\uE220\uE221\uE222" +
-+ "\uE223\uE224\uE225\uE226\uE227\uE228\uE229\uE22A" +
-+ "\uE22B\uE22C\uE22D\uE22E\uE22F\uE230\uE231\uE232" +
-+ "\uE233\uE234\uE235\uE236\uE237\uE238\uE239" ,
-+ "\uFFFD\uE23A\uE23B\uE23C\uE23D\uE23E\uE23F\uE240" +
-+ "\uE241\uE242\uE243\uE244\uE245\uE246\uE247\uE248" +
-+ "\uE249\uE24A\uE24B\uE24C\uE24D\uE24E\uE24F\uE250" +
-+ "\uE251\uE252\uE253\uE254\uE255\uE256\uE257\uE258" +
-+ "\uE259\uE25A\uE25B\uE25C\uE25D\uE25E\uE25F\uE260" +
-+ "\uE261\uE262\uE263\uE264\uE265\uE266\uE267\uE268" +
-+ "\uE269\uE26A\uE26B\uE26C\uE26D\uE26E\uE26F\uE270" +
-+ "\uE271\uE272\uE273\uE274\uE275\uE276\uE277\uE278" +
-+ "\uE279\uE27A\uE27B\uE27C\uE27D\uE27E\uE27F\uE280" +
-+ "\uE281\uE282\uE283\uE284\uE285\uE286\uE287\uE288" +
-+ "\uE289\uE28A\uE28B\uE28C\uE28D\uE28E\uE28F\uE290" +
-+ "\uE291\uE292\uE293\uE294\uE295\uE296\uE297\uE298" +
-+ "\uE299\uE29A\uE29B\uE29C\uE29D\uE29E\uE29F\uE2A0" +
-+ "\uE2A1\uE2A2\uE2A3\uE2A4\uE2A5\uE2A6\uE2A7\uE2A8" +
-+ "\uE2A9\uE2AA\uE2AB\uE2AC\uE2AD\uE2AE\uE2AF\uE2B0" +
-+ "\uE2B1\uE2B2\uE2B3\uE2B4\uE2B5\uE2B6\uE2B7\uE2B8" +
-+ "\uE2B9\uE2BA\uE2BB\uE2BC\uE2BD\uE2BE\uE2BF\uE2C0" +
-+ "\uE2C1\uE2C2\uE2C3\uE2C4\uE2C5\uE2C6\uE2C7\uE2C8" +
-+ "\uE2C9\uE2CA\uE2CB\uE2CC\uE2CD\uE2CE\uE2CF\uE2D0" +
-+ "\uE2D1\uE2D2\uE2D3\uE2D4\uE2D5\uE2D6\uE2D7\uE2D8" +
-+ "\uE2D9\uE2DA\uE2DB\uE2DC\uE2DD\uE2DE\uE2DF\uE2E0" +
-+ "\uE2E1\uE2E2\uE2E3\uE2E4\uE2E5\uE2E6\uE2E7\uE2E8" +
-+ "\uE2E9\uE2EA\uE2EB\uE2EC\uE2ED\uE2EE\uE2EF\uE2F0" +
-+ "\uE2F1\uE2F2\uE2F3\uE2F4\uE2F5\uE2F6\uE2F7" ,
-+ "\uFFFD\uE2F8\uE2F9\uE2FA\uE2FB\uE2FC\uE2FD\uE2FE" +
-+ "\uE2FF\uE300\uE301\uE302\uE303\uE304\uE305\uE306" +
-+ "\uE307\uE308\uE309\uE30A\uE30B\uE30C\uE30D\uE30E" +
-+ "\uE30F\uE310\uE311\uE312\uE313\uE314\uE315\uE316" +
-+ "\uE317\uE318\uE319\uE31A\uE31B\uE31C\uE31D\uE31E" +
-+ "\uE31F\uE320\uE321\uE322\uE323\uE324\uE325\uE326" +
-+ "\uE327\uE328\uE329\uE32A\uE32B\uE32C\uE32D\uE32E" +
-+ "\uE32F\uE330\uE331\uE332\uE333\uE334\uE335\uE336" +
-+ "\uE337\uE338\uE339\uE33A\uE33B\uE33C\uE33D\uE33E" +
-+ "\uE33F\uE340\uE341\uE342\uE343\uE344\uE345\uE346" +
-+ "\uE347\uE348\uE349\uE34A\uE34B\uE34C\uE34D\uE34E" +
-+ "\uE34F\uE350\uE351\uE352\uE353\uE354\uE355\uE356" +
-+ "\uE357\uE358\uE359\uE35A\uE35B\uE35C\uE35D\uE35E" +
-+ "\uE35F\uE360\uE361\uE362\uE363\uE364\uE365\uE366" +
-+ "\uE367\uE368\uE369\uE36A\uE36B\uE36C\uE36D\uE36E" +
-+ "\uE36F\uE370\uE371\uE372\uE373\uE374\uE375\uE376" +
-+ "\uE377\uE378\uE379\uE37A\uE37B\uE37C\uE37D\uE37E" +
-+ "\uE37F\uE380\uE381\uE382\uE383\uE384\uE385\uE386" +
-+ "\uE387\uE388\uE389\uE38A\uE38B\uE38C\uE38D\uE38E" +
-+ "\uE38F\uE390\uE391\uE392\uE393\uE394\uE395\uE396" +
-+ "\uE397\uE398\uE399\uE39A\uE39B\uE39C\uE39D\uE39E" +
-+ "\uE39F\uE3A0\uE3A1\uE3A2\uE3A3\uE3A4\uE3A5\uE3A6" +
-+ "\uE3A7\uE3A8\uE3A9\uE3AA\uE3AB\uE3AC\uE3AD\uE3AE" +
-+ "\uE3AF\uE3B0\uE3B1\uE3B2\uE3B3\uE3B4\uE3B5" ,
-+ "\uFFFD\uE3B6\uE3B7\uE3B8\uE3B9\uE3BA\uE3BB\uE3BC" +
-+ "\uE3BD\uE3BE\uE3BF\uE3C0\uE3C1\uE3C2\uE3C3\uE3C4" +
-+ "\uE3C5\uE3C6\uE3C7\uE3C8\uE3C9\uE3CA\uE3CB\uE3CC" +
-+ "\uE3CD\uE3CE\uE3CF\uE3D0\uE3D1\uE3D2\uE3D3\uE3D4" +
-+ "\uE3D5\uE3D6\uE3D7\uE3D8\uE3D9\uE3DA\uE3DB\uE3DC" +
-+ "\uE3DD\uE3DE\uE3DF\uE3E0\uE3E1\uE3E2\uE3E3\uE3E4" +
-+ "\uE3E5\uE3E6\uE3E7\uE3E8\uE3E9\uE3EA\uE3EB\uE3EC" +
-+ "\uE3ED\uE3EE\uE3EF\uE3F0\uE3F1\uE3F2\uE3F3\uE3F4" +
-+ "\uE3F5\uE3F6\uE3F7\uE3F8\uE3F9\uE3FA\uE3FB\uE3FC" +
-+ "\uE3FD\uE3FE\uE3FF\uE400\uE401\uE402\uE403\uE404" +
-+ "\uE405\uE406\uE407\uE408\uE409\uE40A\uE40B\uE40C" +
-+ "\uE40D\uE40E\uE40F\uE410\uE411\uE412\uE413\uE414" +
-+ "\uE415\uE416\uE417\uE418\uE419\uE41A\uE41B\uE41C" +
-+ "\uE41D\uE41E\uE41F\uE420\uE421\uE422\uE423\uE424" +
-+ "\uE425\uE426\uE427\uE428\uE429\uE42A\uE42B\uE42C" +
-+ "\uE42D\uE42E\uE42F\uE430\uE431\uE432\uE433\uE434" +
-+ "\uE435\uE436\uE437\uE438\uE439\uE43A\uE43B\uE43C" +
-+ "\uE43D\uE43E\uE43F\uE440\uE441\uE442\uE443\uE444" +
-+ "\uE445\uE446\uE447\uE448\uE449\uE44A\uE44B\uE44C" +
-+ "\uE44D\uE44E\uE44F\uE450\uE451\uE452\uE453\uE454" +
-+ "\uE455\uE456\uE457\uE458\uE459\uE45A\uE45B\uE45C" +
-+ "\uE45D\uE45E\uE45F\uE460\uE461\uE462\uE463\uE464" +
-+ "\uE465\uE466\uE467\uE468\uE469\uE46A\uE46B\uE46C" +
-+ "\uE46D\uE46E\uE46F\uE470\uE471\uE472\uE473" ,
-+ "\uFFFD\uE474\uE475\uE476\uE477\uE478\uE479\uE47A" +
-+ "\uE47B\uE47C\uE47D\uE47E\uE47F\uE480\uE481\uE482" +
-+ "\uE483\uE484\uE485\uE486\uE487\uE488\uE489\uE48A" +
-+ "\uE48B\uE48C\uE48D\uE48E\uE48F\uE490\uE491\uE492" +
-+ "\uE493\uE494\uE495\uE496\uE497\uE498\uE499\uE49A" +
-+ "\uE49B\uE49C\uE49D\uE49E\uE49F\uE4A0\uE4A1\uE4A2" +
-+ "\uE4A3\uE4A4\uE4A5\uE4A6\uE4A7\uE4A8\uE4A9\uE4AA" +
-+ "\uE4AB\uE4AC\uE4AD\uE4AE\uE4AF\uE4B0\uE4B1\uE4B2" +
-+ "\uE4B3\uE4B4\uE4B5\uE4B6\uE4B7\uE4B8\uE4B9\uE4BA" +
-+ "\uE4BB\uE4BC\uE4BD\uE4BE\uE4BF\uE4C0\uE4C1\uE4C2" +
-+ "\uE4C3\uE4C4\uE4C5\uE4C6\uE4C7\uE4C8\uE4C9\uE4CA" +
-+ "\uE4CB\uE4CC\uE4CD\uE4CE\uE4CF\uE4D0\uE4D1\uE4D2" +
-+ "\uE4D3\uE4D4\uE4D5\uE4D6\uE4D7\uE4D8\uE4D9\uE4DA" +
-+ "\uE4DB\uE4DC\uE4DD\uE4DE\uE4DF\uE4E0\uE4E1\uE4E2" +
-+ "\uE4E3\uE4E4\uE4E5\uE4E6\uE4E7\uE4E8\uE4E9\uE4EA" +
-+ "\uE4EB\uE4EC\uE4ED\uE4EE\uE4EF\uE4F0\uE4F1\uE4F2" +
-+ "\uE4F3\uE4F4\uE4F5\uE4F6\uE4F7\uE4F8\uE4F9\uE4FA" +
-+ "\uE4FB\uE4FC\uE4FD\uE4FE\uE4FF\uE500\uE501\uE502" +
-+ "\uE503\uE504\uE505\uE506\uE507\uE508\uE509\uE50A" +
-+ "\uE50B\uE50C\uE50D\uE50E\uE50F\uE510\uE511\uE512" +
-+ "\uE513\uE514\uE515\uE516\uE517\uE518\uE519\uE51A" +
-+ "\uE51B\uE51C\uE51D\uE51E\uE51F\uE520\uE521\uE522" +
-+ "\uE523\uE524\uE525\uE526\uE527\uE528\uE529\uE52A" +
-+ "\uE52B\uE52C\uE52D\uE52E\uE52F\uE530\uE531" ,
-+ "\uFFFD\uE532\uE533\uE534\uE535\uE536\uE537\uE538" +
-+ "\uE539\uE53A\uE53B\uE53C\uE53D\uE53E\uE53F\uE540" +
-+ "\uE541\uE542\uE543\uE544\uE545\uE546\uE547\uE548" +
-+ "\uE549\uE54A\uE54B\uE54C\uE54D\uE54E\uE54F\uE550" +
-+ "\uE551\uE552\uE553\uE554\uE555\uE556\uE557\uE558" +
-+ "\uE559\uE55A\uE55B\uE55C\uE55D\uE55E\uE55F\uE560" +
-+ "\uE561\uE562\uE563\uE564\uE565\uE566\uE567\uE568" +
-+ "\uE569\uE56A\uE56B\uE56C\uE56D\uE56E\uE56F\uE570" +
-+ "\uE571\uE572\uE573\uE574\uE575\uE576\uE577\uE578" +
-+ "\uE579\uE57A\uE57B\uE57C\uE57D\uE57E\uE57F\uE580" +
-+ "\uE581\uE582\uE583\uE584\uE585\uE586\uE587\uE588" +
-+ "\uE589\uE58A\uE58B\uE58C\uE58D\uE58E\uE58F\uE590" +
-+ "\uE591\uE592\uE593\uE594\uE595\uE596\uE597\uE598" +
-+ "\uE599\uE59A\uE59B\uE59C\uE59D\uE59E\uE59F\uE5A0" +
-+ "\uE5A1\uE5A2\uE5A3\uE5A4\uE5A5\uE5A6\uE5A7\uE5A8" +
-+ "\uE5A9\uE5AA\uE5AB\uE5AC\uE5AD\uE5AE\uE5AF\uE5B0" +
-+ "\uE5B1\uE5B2\uE5B3\uE5B4\uE5B5\uE5B6\uE5B7\uE5B8" +
-+ "\uE5B9\uE5BA\uE5BB\uE5BC\uE5BD\uE5BE\uE5BF\uE5C0" +
-+ "\uE5C1\uE5C2\uE5C3\uE5C4\uE5C5\uE5C6\uE5C7\uE5C8" +
-+ "\uE5C9\uE5CA\uE5CB\uE5CC\uE5CD\uE5CE\uE5CF\uE5D0" +
-+ "\uE5D1\uE5D2\uE5D3\uE5D4\uE5D5\uE5D6\uE5D7\uE5D8" +
-+ "\uE5D9\uE5DA\uE5DB\uE5DC\uE5DD\uE5DE\uE5DF\uE5E0" +
-+ "\uE5E1\uE5E2\uE5E3\uE5E4\uE5E5\uE5E6\uE5E7\uE5E8" +
-+ "\uE5E9\uE5EA\uE5EB\uE5EC\uE5ED\uE5EE\uE5EF" ,
-+ "\uFFFD\uE5F0\uE5F1\uE5F2\uE5F3\uE5F4\uE5F5\uE5F6" +
-+ "\uE5F7\uE5F8\uE5F9\uE5FA\uE5FB\uE5FC\uE5FD\uE5FE" +
-+ "\uE5FF\uE600\uE601\uE602\uE603\uE604\uE605\uE606" +
-+ "\uE607\uE608\uE609\uE60A\uE60B\uE60C\uE60D\uE60E" +
-+ "\uE60F\uE610\uE611\uE612\uE613\uE614\uE615\uE616" +
-+ "\uE617\uE618\uE619\uE61A\uE61B\uE61C\uE61D\uE61E" +
-+ "\uE61F\uE620\uE621\uE622\uE623\uE624\uE625\uE626" +
-+ "\uE627\uE628\uE629\uE62A\uE62B\uE62C\uE62D\uE62E" +
-+ "\uE62F\uE630\uE631\uE632\uE633\uE634\uE635\uE636" +
-+ "\uE637\uE638\uE639\uE63A\uE63B\uE63C\uE63D\uE63E" +
-+ "\uE63F\uE640\uE641\uE642\uE643\uE644\uE645\uE646" +
-+ "\uE647\uE648\uE649\uE64A\uE64B\uE64C\uE64D\uE64E" +
-+ "\uE64F\uE650\uE651\uE652\uE653\uE654\uE655\uE656" +
-+ "\uE657\uE658\uE659\uE65A\uE65B\uE65C\uE65D\uE65E" +
-+ "\uE65F\uE660\uE661\uE662\uE663\uE664\uE665\uE666" +
-+ "\uE667\uE668\uE669\uE66A\uE66B\uE66C\uE66D\uE66E" +
-+ "\uE66F\uE670\uE671\uE672\uE673\uE674\uE675\uE676" +
-+ "\uE677\uE678\uE679\uE67A\uE67B\uE67C\uE67D\uE67E" +
-+ "\uE67F\uE680\uE681\uE682\uE683\uE684\uE685\uE686" +
-+ "\uE687\uE688\uE689\uE68A\uE68B\uE68C\uE68D\uE68E" +
-+ "\uE68F\uE690\uE691\uE692\uE693\uE694\uE695\uE696" +
-+ "\uE697\uE698\uE699\uE69A\uE69B\uE69C\uE69D\uE69E" +
-+ "\uE69F\uE6A0\uE6A1\uE6A2\uE6A3\uE6A4\uE6A5\uE6A6" +
-+ "\uE6A7\uE6A8\uE6A9\uE6AA\uE6AB\uE6AC\uE6AD" ,
-+ "\uFFFD\uE6AE\uE6AF\uE6B0\uE6B1\uE6B2\uE6B3\uE6B4" +
-+ "\uE6B5\uE6B6\uE6B7\uE6B8\uE6B9\uE6BA\uE6BB\uE6BC" +
-+ "\uE6BD\uE6BE\uE6BF\uE6C0\uE6C1\uE6C2\uE6C3\uE6C4" +
-+ "\uE6C5\uE6C6\uE6C7\uE6C8\uE6C9\uE6CA\uE6CB\uE6CC" +
-+ "\uE6CD\uE6CE\uE6CF\uE6D0\uE6D1\uE6D2\uE6D3\uE6D4" +
-+ "\uE6D5\uE6D6\uE6D7\uE6D8\uE6D9\uE6DA\uE6DB\uE6DC" +
-+ "\uE6DD\uE6DE\uE6DF\uE6E0\uE6E1\uE6E2\uE6E3\uE6E4" +
-+ "\uE6E5\uE6E6\uE6E7\uE6E8\uE6E9\uE6EA\uE6EB\uE6EC" +
-+ "\uE6ED\uE6EE\uE6EF\uE6F0\uE6F1\uE6F2\uE6F3\uE6F4" +
-+ "\uE6F5\uE6F6\uE6F7\uE6F8\uE6F9\uE6FA\uE6FB\uE6FC" +
-+ "\uE6FD\uE6FE\uE6FF\uE700\uE701\uE702\uE703\uE704" +
-+ "\uE705\uE706\uE707\uE708\uE709\uE70A\uE70B\uE70C" +
-+ "\uE70D\uE70E\uE70F\uE710\uE711\uE712\uE713\uE714" +
-+ "\uE715\uE716\uE717\uE718\uE719\uE71A\uE71B\uE71C" +
-+ "\uE71D\uE71E\uE71F\uE720\uE721\uE722\uE723\uE724" +
-+ "\uE725\uE726\uE727\uE728\uE729\uE72A\uE72B\uE72C" +
-+ "\uE72D\uE72E\uE72F\uE730\uE731\uE732\uE733\uE734" +
-+ "\uE735\uE736\uE737\uE738\uE739\uE73A\uE73B\uE73C" +
-+ "\uE73D\uE73E\uE73F\uE740\uE741\uE742\uE743\uE744" +
-+ "\uE745\uE746\uE747\uE748\uE749\uE74A\uE74B\uE74C" +
-+ "\uE74D\uE74E\uE74F\uE750\uE751\uE752\uE753\uE754" +
-+ "\uE755\uE756\uE757\uE758\uE759\uE75A\uE75B\uE75C" +
-+ "\uE75D\uE75E\uE75F\uE760\uE761\uE762\uE763\uE764" +
-+ "\uE765\uE766\uE767\uE768\uE769\uE76A\uE76B" ,
-+ "\uFFFD\uE76C\uE76D\uE76E\uE76F\uE770\uE771\uE772" +
-+ "\uE773\uE774\uE775\uE776\uE777\uE778\uE779\uE77A" +
-+ "\uE77B\uE77C\uE77D\uE77E\uE77F\uE780\uE781\uE782" +
-+ "\uE783\uE784\uE785\uE786\uE787\uE788\uE789\uE78A" +
-+ "\uE78B\uE78C\uE78D\uE78E\uE78F\uE790\uE791\uE792" +
-+ "\uE793\uE794\uE795\uE796\uE797\uE798\uE799\uE79A" +
-+ "\uE79B\uE79C\uE79D\uE79E\uE79F\uE7A0\uE7A1\uE7A2" +
-+ "\uE7A3\uE7A4\uE7A5\uE7A6\uE7A7\uE7A8\uE7A9\uE7AA" +
-+ "\uE7AB\uE7AC\uE7AD\uE7AE\uE7AF\uE7B0\uE7B1\uE7B2" +
-+ "\uE7B3\uE7B4\uE7B5\uE7B6\uE7B7\uE7B8\uE7B9\uE7BA" +
-+ "\uE7BB\uE7BC\uE7BD\uE7BE\uE7BF\uE7C0\uE7C1\uE7C2" +
-+ "\uE7C3\uE7C4\uE7C5\uE7C6\uE7C7\uE7C8\uE7C9\uE7CA" +
-+ "\uE7CB\uE7CC\uE7CD\uE7CE\uE7CF\uE7D0\uE7D1\uE7D2" +
-+ "\uE7D3\uE7D4\uE7D5\uE7D6\uE7D7\uE7D8\uE7D9\uE7DA" +
-+ "\uE7DB\uE7DC\uE7DD\uE7DE\uE7DF\uE7E0\uE7E1\uE7E2" +
-+ "\uE7E3\uE7E4\uE7E5\uE7E6\uE7E7\uE7E8\uE7E9\uE7EA" +
-+ "\uE7EB\uE7EC\uE7ED\uE7EE\uE7EF\uE7F0\uE7F1\uE7F2" +
-+ "\uE7F3\uE7F4\uE7F5\uE7F6\uE7F7\uE7F8\uE7F9\uE7FA" +
-+ "\uE7FB\uE7FC\uE7FD\uE7FE\uE7FF\uE800\uE801\uE802" +
-+ "\uE803\uE804\uE805\uE806\uE807\uE808\uE809\uE80A" +
-+ "\uE80B\uE80C\uE80D\uE80E\uE80F\uE810\uE811\uE812" +
-+ "\uE813\uE814\uE815\uE816\uE817\uE818\uE819\uE81A" +
-+ "\uE81B\uE81C\uE81D\uE81E\uE81F\uE820\uE821\uE822" +
-+ "\uE823\uE824\uE825\uE826\uE827\uE828\uE829" ,
-+ "\uFFFD\uE82A\uE82B\uE82C\uE82D\uE82E\uE82F\uE830" +
-+ "\uE831\uE832\uE833\uE834\uE835\uE836\uE837\uE838" +
-+ "\uE839\uE83A\uE83B\uE83C\uE83D\uE83E\uE83F\uE840" +
-+ "\uE841\uE842\uE843\uE844\uE845\uE846\uE847\uE848" +
-+ "\uE849\uE84A\uE84B\uE84C\uE84D\uE84E\uE84F\uE850" +
-+ "\uE851\uE852\uE853\uE854\uE855\uE856\uE857\uE858" +
-+ "\uE859\uE85A\uE85B\uE85C\uE85D\uE85E\uE85F\uE860" +
-+ "\uE861\uE862\uE863\uE864\uE865\uE866\uE867\uE868" +
-+ "\uE869\uE86A\uE86B\uE86C\uE86D\uE86E\uE86F\uE870" +
-+ "\uE871\uE872\uE873\uE874\uE875\uE876\uE877\uE878" +
-+ "\uE879\uE87A\uE87B\uE87C\uE87D\uE87E\uE87F\uE880" +
-+ "\uE881\uE882\uE883\uE884\uE885\uE886\uE887\uE888" +
-+ "\uE889\uE88A\uE88B\uE88C\uE88D\uE88E\uE88F\uE890" +
-+ "\uE891\uE892\uE893\uE894\uE895\uE896\uE897\uE898" +
-+ "\uE899\uE89A\uE89B\uE89C\uE89D\uE89E\uE89F\uE8A0" +
-+ "\uE8A1\uE8A2\uE8A3\uE8A4\uE8A5\uE8A6\uE8A7\uE8A8" +
-+ "\uE8A9\uE8AA\uE8AB\uE8AC\uE8AD\uE8AE\uE8AF\uE8B0" +
-+ "\uE8B1\uE8B2\uE8B3\uE8B4\uE8B5\uE8B6\uE8B7\uE8B8" +
-+ "\uE8B9\uE8BA\uE8BB\uE8BC\uE8BD\uE8BE\uE8BF\uE8C0" +
-+ "\uE8C1\uE8C2\uE8C3\uE8C4\uE8C5\uE8C6\uE8C7\uE8C8" +
-+ "\uE8C9\uE8CA\uE8CB\uE8CC\uE8CD\uE8CE\uE8CF\uE8D0" +
-+ "\uE8D1\uE8D2\uE8D3\uE8D4\uE8D5\uE8D6\uE8D7\uE8D8" +
-+ "\uE8D9\uE8DA\uE8DB\uE8DC\uE8DD\uE8DE\uE8DF\uE8E0" +
-+ "\uE8E1\uE8E2\uE8E3\uE8E4\uE8E5\uE8E6\uE8E7" ,
-+ "\uFFFD\uE8E8\uE8E9\uE8EA\uE8EB\uE8EC\uE8ED\uE8EE" +
-+ "\uE8EF\uE8F0\uE8F1\uE8F2\uE8F3\uE8F4\uE8F5\uE8F6" +
-+ "\uE8F7\uE8F8\uE8F9\uE8FA\uE8FB\uE8FC\uE8FD\uE8FE" +
-+ "\uE8FF\uE900\uE901\uE902\uE903\uE904\uE905\uE906" +
-+ "\uE907\uE908\uE909\uE90A\uE90B\uE90C\uE90D\uE90E" +
-+ "\uE90F\uE910\uE911\uE912\uE913\uE914\uE915\uE916" +
-+ "\uE917\uE918\uE919\uE91A\uE91B\uE91C\uE91D\uE91E" +
-+ "\uE91F\uE920\uE921\uE922\uE923\uE924\uE925\uE926" +
-+ "\uE927\uE928\uE929\uE92A\uE92B\uE92C\uE92D\uE92E" +
-+ "\uE92F\uE930\uE931\uE932\uE933\uE934\uE935\uE936" +
-+ "\uE937\uE938\uE939\uE93A\uE93B\uE93C\uE93D\uE93E" +
-+ "\uE93F\uE940\uE941\uE942\uE943\uE944\uE945\uE946" +
-+ "\uE947\uE948\uE949\uE94A\uE94B\uE94C\uE94D\uE94E" +
-+ "\uE94F\uE950\uE951\uE952\uE953\uE954\uE955\uE956" +
-+ "\uE957\uE958\uE959\uE95A\uE95B\uE95C\uE95D\uE95E" +
-+ "\uE95F\uE960\uE961\uE962\uE963\uE964\uE965\uE966" +
-+ "\uE967\uE968\uE969\uE96A\uE96B\uE96C\uE96D\uE96E" +
-+ "\uE96F\uE970\uE971\uE972\uE973\uE974\uE975\uE976" +
-+ "\uE977\uE978\uE979\uE97A\uE97B\uE97C\uE97D\uE97E" +
-+ "\uE97F\uE980\uE981\uE982\uE983\uE984\uE985\uE986" +
-+ "\uE987\uE988\uE989\uE98A\uE98B\uE98C\uE98D\uE98E" +
-+ "\uE98F\uE990\uE991\uE992\uE993\uE994\uE995\uE996" +
-+ "\uE997\uE998\uE999\uE99A\uE99B\uE99C\uE99D\uE99E" +
-+ "\uE99F\uE9A0\uE9A1\uE9A2\uE9A3\uE9A4\uE9A5" ,
-+ "\uFFFD\uE9A6\uE9A7\uE9A8\uE9A9\uE9AA\uE9AB\uE9AC" +
-+ "\uE9AD\uE9AE\uE9AF\uE9B0\uE9B1\uE9B2\uE9B3\uE9B4" +
-+ "\uE9B5\uE9B6\uE9B7\uE9B8\uE9B9\uE9BA\uE9BB\uE9BC" +
-+ "\uE9BD\uE9BE\uE9BF\uE9C0\uE9C1\uE9C2\uE9C3\uE9C4" +
-+ "\uE9C5\uE9C6\uE9C7\uE9C8\uE9C9\uE9CA\uE9CB\uE9CC" +
-+ "\uE9CD\uE9CE\uE9CF\uE9D0\uE9D1\uE9D2\uE9D3\uE9D4" +
-+ "\uE9D5\uE9D6\uE9D7\uE9D8\uE9D9\uE9DA\uE9DB\uE9DC" +
-+ "\uE9DD\uE9DE\uE9DF\uE9E0\uE9E1\uE9E2\uE9E3\uE9E4" +
-+ "\uE9E5\uE9E6\uE9E7\uE9E8\uE9E9\uE9EA\uE9EB\uE9EC" +
-+ "\uE9ED\uE9EE\uE9EF\uE9F0\uE9F1\uE9F2\uE9F3\uE9F4" +
-+ "\uE9F5\uE9F6\uE9F7\uE9F8\uE9F9\uE9FA\uE9FB\uE9FC" +
-+ "\uE9FD\uE9FE\uE9FF\uEA00\uEA01\uEA02\uEA03\uEA04" +
-+ "\uEA05\uEA06\uEA07\uEA08\uEA09\uEA0A\uEA0B\uEA0C" +
-+ "\uEA0D\uEA0E\uEA0F\uEA10\uEA11\uEA12\uEA13\uEA14" +
-+ "\uEA15\uEA16\uEA17\uEA18\uEA19\uEA1A\uEA1B\uEA1C" +
-+ "\uEA1D\uEA1E\uEA1F\uEA20\uEA21\uEA22\uEA23\uEA24" +
-+ "\uEA25\uEA26\uEA27\uEA28\uEA29\uEA2A\uEA2B\uEA2C" +
-+ "\uEA2D\uEA2E\uEA2F\uEA30\uEA31\uEA32\uEA33\uEA34" +
-+ "\uEA35\uEA36\uEA37\uEA38\uEA39\uEA3A\uEA3B\uEA3C" +
-+ "\uEA3D\uEA3E\uEA3F\uEA40\uEA41\uEA42\uEA43\uEA44" +
-+ "\uEA45\uEA46\uEA47\uEA48\uEA49\uEA4A\uEA4B\uEA4C" +
-+ "\uEA4D\uEA4E\uEA4F\uEA50\uEA51\uEA52\uEA53\uEA54" +
-+ "\uEA55\uEA56\uEA57\uEA58\uEA59\uEA5A\uEA5B\uEA5C" +
-+ "\uEA5D\uEA5E\uEA5F\uEA60\uEA61\uEA62\uEA63" ,
-+ "\uFFFD\uEA64\uEA65\uEA66\uEA67\uEA68\uEA69\uEA6A" +
-+ "\uEA6B\uEA6C\uEA6D\uEA6E\uEA6F\uEA70\uEA71\uEA72" +
-+ "\uEA73\uEA74\uEA75\uEA76\uEA77\uEA78\uEA79\uEA7A" +
-+ "\uEA7B\uEA7C\uEA7D\uEA7E\uEA7F\uEA80\uEA81\uEA82" +
-+ "\uEA83\uEA84\uEA85\uEA86\uEA87\uEA88\uEA89\uEA8A" +
-+ "\uEA8B\uEA8C\uEA8D\uEA8E\uEA8F\uEA90\uEA91\uEA92" +
-+ "\uEA93\uEA94\uEA95\uEA96\uEA97\uEA98\uEA99\uEA9A" +
-+ "\uEA9B\uEA9C\uEA9D\uEA9E\uEA9F\uEAA0\uEAA1\uEAA2" +
-+ "\uEAA3\uEAA4\uEAA5\uEAA6\uEAA7\uEAA8\uEAA9\uEAAA" +
-+ "\uEAAB\uEAAC\uEAAD\uEAAE\uEAAF\uEAB0\uEAB1\uEAB2" +
-+ "\uEAB3\uEAB4\uEAB5\uEAB6\uEAB7\uEAB8\uEAB9\uEABA" +
-+ "\uEABB\uEABC\uEABD\uEABE\uEABF\uEAC0\uEAC1\uEAC2" +
-+ "\uEAC3\uEAC4\uEAC5\uEAC6\uEAC7\uEAC8\uEAC9\uEACA" +
-+ "\uEACB\uEACC\uEACD\uEACE\uEACF\uEAD0\uEAD1\uEAD2" +
-+ "\uEAD3\uEAD4\uEAD5\uEAD6\uEAD7\uEAD8\uEAD9\uEADA" +
-+ "\uEADB\uEADC\uEADD\uEADE\uEADF\uEAE0\uEAE1\uEAE2" +
-+ "\uEAE3\uEAE4\uEAE5\uEAE6\uEAE7\uEAE8\uEAE9\uEAEA" +
-+ "\uEAEB\uEAEC\uEAED\uEAEE\uEAEF\uEAF0\uEAF1\uEAF2" +
-+ "\uEAF3\uEAF4\uEAF5\uEAF6\uEAF7\uEAF8\uEAF9\uEAFA" +
-+ "\uEAFB\uEAFC\uEAFD\uEAFE\uEAFF\uEB00\uEB01\uEB02" +
-+ "\uEB03\uEB04\uEB05\uEB06\uEB07\uEB08\uEB09\uEB0A" +
-+ "\uEB0B\uEB0C\uEB0D\uEB0E\uEB0F\uEB10\uEB11\uEB12" +
-+ "\uEB13\uEB14\uEB15\uEB16\uEB17\uEB18\uEB19\uEB1A" +
-+ "\uEB1B\uEB1C\uEB1D\uEB1E\uEB1F\uEB20\uEB21" ,
-+ "\uFFFD\uEB22\uEB23\uEB24\uEB25\uEB26\uEB27\uEB28" +
-+ "\uEB29\uEB2A\uEB2B\uEB2C\uEB2D\uEB2E\uEB2F\uEB30" +
-+ "\uEB31\uEB32\uEB33\uEB34\uEB35\uEB36\uEB37\uEB38" +
-+ "\uEB39\uEB3A\uEB3B\uEB3C\uEB3D\uEB3E\uEB3F\uEB40" +
-+ "\uEB41\uEB42\uEB43\uEB44\uEB45\uEB46\uEB47\uEB48" +
-+ "\uEB49\uEB4A\uEB4B\uEB4C\uEB4D\uEB4E\uEB4F\uEB50" +
-+ "\uEB51\uEB52\uEB53\uEB54\uEB55\uEB56\uEB57\uEB58" +
-+ "\uEB59\uEB5A\uEB5B\uEB5C\uEB5D\uEB5E\uEB5F\uEB60" +
-+ "\uEB61\uEB62\uEB63\uEB64\uEB65\uEB66\uEB67\uEB68" +
-+ "\uEB69\uEB6A\uEB6B\uEB6C\uEB6D\uEB6E\uEB6F\uEB70" +
-+ "\uEB71\uEB72\uEB73\uEB74\uEB75\uEB76\uEB77\uEB78" +
-+ "\uEB79\uEB7A\uEB7B\uEB7C\uEB7D\uEB7E\uEB7F\uEB80" +
-+ "\uEB81\uEB82\uEB83\uEB84\uEB85\uEB86\uEB87\uEB88" +
-+ "\uEB89\uEB8A\uEB8B\uEB8C\uEB8D\uEB8E\uEB8F\uEB90" +
-+ "\uEB91\uEB92\uEB93\uEB94\uEB95\uEB96\uEB97\uEB98" +
-+ "\uEB99\uEB9A\uEB9B\uEB9C\uEB9D\uEB9E\uEB9F\uEBA0" +
-+ "\uEBA1\uEBA2\uEBA3\uEBA4\uEBA5\uEBA6\uEBA7\uEBA8" +
-+ "\uEBA9\uEBAA\uEBAB\uEBAC\uEBAD\uEBAE\uEBAF\uEBB0" +
-+ "\uEBB1\uEBB2\uEBB3\uEBB4\uEBB5\uEBB6\uEBB7\uEBB8" +
-+ "\uEBB9\uEBBA\uEBBB\uEBBC\uEBBD\uEBBE\uEBBF\uEBC0" +
-+ "\uEBC1\uEBC2\uEBC3\uEBC4\uEBC5\uEBC6\uEBC7\uEBC8" +
-+ "\uEBC9\uEBCA\uEBCB\uEBCC\uEBCD\uEBCE\uEBCF\uEBD0" +
-+ "\uEBD1\uEBD2\uEBD3\uEBD4\uEBD5\uEBD6\uEBD7\uEBD8" +
-+ "\uEBD9\uEBDA\uEBDB\uEBDC\uEBDD\uEBDE\uEBDF" ,
-+ "\uFFFD\uEBE0\uEBE1\uEBE2\uEBE3\uEBE4\uEBE5\uEBE6" +
-+ "\uEBE7\uEBE8\uEBE9\uEBEA\uEBEB\uEBEC\uEBED\uEBEE" +
-+ "\uEBEF\uEBF0\uEBF1\uEBF2\uEBF3\uEBF4\uEBF5\uEBF6" +
-+ "\uEBF7\uEBF8\uEBF9\uEBFA\uEBFB\uEBFC\uEBFD\uEBFE" +
-+ "\uEBFF\uEC00\uEC01\uEC02\uEC03\uEC04\uEC05\uEC06" +
-+ "\uEC07\uEC08\uEC09\uEC0A\uEC0B\uEC0C\uEC0D\uEC0E" +
-+ "\uEC0F\uEC10\uEC11\uEC12\uEC13\uEC14\uEC15\uEC16" +
-+ "\uEC17\uEC18\uEC19\uEC1A\uEC1B\uEC1C\uEC1D\uEC1E" +
-+ "\uEC1F\uEC20\uEC21\uEC22\uEC23\uEC24\uEC25\uEC26" +
-+ "\uEC27\uEC28\uEC29\uEC2A\uEC2B\uEC2C\uEC2D\uEC2E" +
-+ "\uEC2F\uEC30\uEC31\uEC32\uEC33\uEC34\uEC35\uEC36" +
-+ "\uEC37\uEC38\uEC39\uEC3A\uEC3B\uEC3C\uEC3D\uEC3E" +
-+ "\uEC3F\uEC40\uEC41\uEC42\uEC43\uEC44\uEC45\uEC46" +
-+ "\uEC47\uEC48\uEC49\uEC4A\uEC4B\uEC4C\uEC4D\uEC4E" +
-+ "\uEC4F\uEC50\uEC51\uEC52\uEC53\uEC54\uEC55\uEC56" +
-+ "\uEC57\uEC58\uEC59\uEC5A\uEC5B\uEC5C\uEC5D\uEC5E" +
-+ "\uEC5F\uEC60\uEC61\uEC62\uEC63\uEC64\uEC65\uEC66" +
-+ "\uEC67\uEC68\uEC69\uEC6A\uEC6B\uEC6C\uEC6D\uEC6E" +
-+ "\uEC6F\uEC70\uEC71\uEC72\uEC73\uEC74\uEC75\uEC76" +
-+ "\uEC77\uEC78\uEC79\uEC7A\uEC7B\uEC7C\uEC7D\uEC7E" +
-+ "\uEC7F\uEC80\uEC81\uEC82\uEC83\uEC84\uEC85\uEC86" +
-+ "\uEC87\uEC88\uEC89\uEC8A\uEC8B\uEC8C\uEC8D\uEC8E" +
-+ "\uEC8F\uEC90\uEC91\uEC92\uEC93\uEC94\uEC95\uEC96" +
-+ "\uEC97\uEC98\uEC99\uEC9A\uEC9B\uEC9C\uEC9D" ,
-+ "\uFFFD\uEC9E\uEC9F\uECA0\uECA1\uECA2\uECA3\uECA4" +
-+ "\uECA5\uECA6\uECA7\uECA8\uECA9\uECAA\uECAB\uECAC" +
-+ "\uECAD\uECAE\uECAF\uECB0\uECB1\uECB2\uECB3\uECB4" +
-+ "\uECB5\uECB6\uECB7\uECB8\uECB9\uECBA\uECBB\uECBC" +
-+ "\uECBD\uECBE\uECBF\uECC0\uECC1\uECC2\uECC3\uECC4" +
-+ "\uECC5\uECC6\uECC7\uECC8\uECC9\uECCA\uECCB\uECCC" +
-+ "\uECCD\uECCE\uECCF\uECD0\uECD1\uECD2\uECD3\uECD4" +
-+ "\uECD5\uECD6\uECD7\uECD8\uECD9\uECDA\uECDB\uECDC" +
-+ "\uECDD\uECDE\uECDF\uECE0\uECE1\uECE2\uECE3\uECE4" +
-+ "\uECE5\uECE6\uECE7\uECE8\uECE9\uECEA\uECEB\uECEC" +
-+ "\uECED\uECEE\uECEF\uECF0\uECF1\uECF2\uECF3\uECF4" +
-+ "\uECF5\uECF6\uECF7\uECF8\uECF9\uECFA\uECFB\uECFC" +
-+ "\uECFD\uECFE\uECFF\uED00\uED01\uED02\uED03\uED04" +
-+ "\uED05\uED06\uED07\uED08\uED09\uED0A\uED0B\uED0C" +
-+ "\uED0D\uED0E\uED0F\uED10\uED11\uED12\uED13\uED14" +
-+ "\uED15\uED16\uED17\uED18\uED19\uED1A\uED1B\uED1C" +
-+ "\uED1D\uED1E\uED1F\uED20\uED21\uED22\uED23\uED24" +
-+ "\uED25\uED26\uED27\uED28\uED29\uED2A\uED2B\uED2C" +
-+ "\uED2D\uED2E\uED2F\uED30\uED31\uED32\uED33\uED34" +
-+ "\uED35\uED36\uED37\uED38\uED39\uED3A\uED3B\uED3C" +
-+ "\uED3D\uED3E\uED3F\uED40\uED41\uED42\uED43\uED44" +
-+ "\uED45\uED46\uED47\uED48\uED49\uED4A\uED4B\uED4C" +
-+ "\uED4D\uED4E\uED4F\uED50\uED51\uED52\uED53\uED54" +
-+ "\uED55\uED56\uED57\uED58\uED59\uED5A\uED5B" ,
-+ "\uFFFD\uED5C\uED5D\uED5E\uED5F\uED60\uED61\uED62" +
-+ "\uED63\uED64\uED65\uED66\uED67\uED68\uED69\uED6A" +
-+ "\uED6B\uED6C\uED6D\uED6E\uED6F\uED70\uED71\uED72" +
-+ "\uED73\uED74\uED75\uED76\uED77\uED78\uED79\uED7A" +
-+ "\uED7B\uED7C\uED7D\uED7E\uED7F\uED80\uED81\uED82" +
-+ "\uED83\uED84\uED85\uED86\uED87\uED88\uED89\uED8A" +
-+ "\uED8B\uED8C\uED8D\uED8E\uED8F\uED90\uED91\uED92" +
-+ "\uED93\uED94\uED95\uED96\uED97\uED98\uED99\uED9A" +
-+ "\uED9B\uED9C\uED9D\uED9E\uED9F\uEDA0\uEDA1\uEDA2" +
-+ "\uEDA3\uEDA4\uEDA5\uEDA6\uEDA7\uEDA8\uEDA9\uEDAA" +
-+ "\uEDAB\uEDAC\uEDAD\uEDAE\uEDAF\uEDB0\uEDB1\uEDB2" +
-+ "\uEDB3\uEDB4\uEDB5\uEDB6\uEDB7\uEDB8\uEDB9\uEDBA" +
-+ "\uEDBB\uEDBC\uEDBD\uEDBE\uEDBF\uEDC0\uEDC1\uEDC2" +
-+ "\uEDC3\uEDC4\uEDC5\uEDC6\uEDC7\uEDC8\uEDC9\uEDCA" +
-+ "\uEDCB\uEDCC\uEDCD\uEDCE\uEDCF\uEDD0\uEDD1\uEDD2" +
-+ "\uEDD3\uEDD4\uEDD5\uEDD6\uEDD7\uEDD8\uEDD9\uEDDA" +
-+ "\uEDDB\uEDDC\uEDDD\uEDDE\uEDDF\uEDE0\uEDE1\uEDE2" +
-+ "\uEDE3\uEDE4\uEDE5\uEDE6\uEDE7\uEDE8\uEDE9\uEDEA" +
-+ "\uEDEB\uEDEC\uEDED\uEDEE\uEDEF\uEDF0\uEDF1\uEDF2" +
-+ "\uEDF3\uEDF4\uEDF5\uEDF6\uEDF7\uEDF8\uEDF9\uEDFA" +
-+ "\uEDFB\uEDFC\uEDFD\uEDFE\uEDFF\uEE00\uEE01\uEE02" +
-+ "\uEE03\uEE04\uEE05\uEE06\uEE07\uEE08\uEE09\uEE0A" +
-+ "\uEE0B\uEE0C\uEE0D\uEE0E\uEE0F\uEE10\uEE11\uEE12" +
-+ "\uEE13\uEE14\uEE15\uEE16\uEE17\uEE18\uEE19" ,
-+ "\uFFFD\uEE1A\uEE1B\uEE1C\uEE1D\uEE1E\uEE1F\uEE20" +
-+ "\uEE21\uEE22\uEE23\uEE24\uEE25\uEE26\uEE27\uEE28" +
-+ "\uEE29\uEE2A\uEE2B\uEE2C\uEE2D\uEE2E\uEE2F\uEE30" +
-+ "\uEE31\uEE32\uEE33\uEE34\uEE35\uEE36\uEE37\uEE38" +
-+ "\uEE39\uEE3A\uEE3B\uEE3C\uEE3D\uEE3E\uEE3F\uEE40" +
-+ "\uEE41\uEE42\uEE43\uEE44\uEE45\uEE46\uEE47\uEE48" +
-+ "\uEE49\uEE4A\uEE4B\uEE4C\uEE4D\uEE4E\uEE4F\uEE50" +
-+ "\uEE51\uEE52\uEE53\uEE54\uEE55\uEE56\uEE57\uEE58" +
-+ "\uEE59\uEE5A\uEE5B\uEE5C\uEE5D\uEE5E\uEE5F\uEE60" +
-+ "\uEE61\uEE62\uEE63\uEE64\uEE65\uEE66\uEE67\uEE68" +
-+ "\uEE69\uEE6A\uEE6B\uEE6C\uEE6D\uEE6E\uEE6F\uEE70" +
-+ "\uEE71\uEE72\uEE73\uEE74\uEE75\uEE76\uEE77\uEE78" +
-+ "\uEE79\uEE7A\uEE7B\uEE7C\uEE7D\uEE7E\uEE7F\uEE80" +
-+ "\uEE81\uEE82\uEE83\uEE84\uEE85\uEE86\uEE87\uEE88" +
-+ "\uEE89\uEE8A\uEE8B\uEE8C\uEE8D\uEE8E\uEE8F\uEE90" +
-+ "\uEE91\uEE92\uEE93\uEE94\uEE95\uEE96\uEE97\uEE98" +
-+ "\uEE99\uEE9A\uEE9B\uEE9C\uEE9D\uEE9E\uEE9F\uEEA0" +
-+ "\uEEA1\uEEA2\uEEA3\uEEA4\uEEA5\uEEA6\uEEA7\uEEA8" +
-+ "\uEEA9\uEEAA\uEEAB\uEEAC\uEEAD\uEEAE\uEEAF\uEEB0" +
-+ "\uEEB1\uEEB2\uEEB3\uEEB4\uEEB5\uEEB6\uEEB7\uEEB8" +
-+ "\uEEB9\uEEBA\uEEBB\uEEBC\uEEBD\uEEBE\uEEBF\uEEC0" +
-+ "\uEEC1\uEEC2\uEEC3\uEEC4\uEEC5\uEEC6\uEEC7\uEEC8" +
-+ "\uEEC9\uEECA\uEECB\uEECC\uEECD\uEECE\uEECF\uEED0" +
-+ "\uEED1\uEED2\uEED3\uEED4\uEED5\uEED6\uEED7" ,
-+ "\uFFFD\uEED8\uEED9\uEEDA\uEEDB\uEEDC\uEEDD\uEEDE" +
-+ "\uEEDF\uEEE0\uEEE1\uEEE2\uEEE3\uEEE4\uEEE5\uEEE6" +
-+ "\uEEE7\uEEE8\uEEE9\uEEEA\uEEEB\uEEEC\uEEED\uEEEE" +
-+ "\uEEEF\uEEF0\uEEF1\uEEF2\uEEF3\uEEF4\uEEF5\uEEF6" +
-+ "\uEEF7\uEEF8\uEEF9\uEEFA\uEEFB\uEEFC\uEEFD\uEEFE" +
-+ "\uEEFF\uEF00\uEF01\uEF02\uEF03\uEF04\uEF05\uEF06" +
-+ "\uEF07\uEF08\uEF09\uEF0A\uEF0B\uEF0C\uEF0D\uEF0E" +
-+ "\uEF0F\uEF10\uEF11\uEF12\uEF13\uEF14\uEF15\uEF16" +
-+ "\uEF17\uEF18\uEF19\uEF1A\uEF1B\uEF1C\uEF1D\uEF1E" +
-+ "\uEF1F\uEF20\uEF21\uEF22\uEF23\uEF24\uEF25\uEF26" +
-+ "\uEF27\uEF28\uEF29\uEF2A\uEF2B\uEF2C\uEF2D\uEF2E" +
-+ "\uEF2F\uEF30\uEF31\uEF32\uEF33\uEF34\uEF35\uEF36" +
-+ "\uEF37\uEF38\uEF39\uEF3A\uEF3B\uEF3C\uEF3D\uEF3E" +
-+ "\uEF3F\uEF40\uEF41\uEF42\uEF43\uEF44\uEF45\uEF46" +
-+ "\uEF47\uEF48\uEF49\uEF4A\uEF4B\uEF4C\uEF4D\uEF4E" +
-+ "\uEF4F\uEF50\uEF51\uEF52\uEF53\uEF54\uEF55\uEF56" +
-+ "\uEF57\uEF58\uEF59\uEF5A\uEF5B\uEF5C\uEF5D\uEF5E" +
-+ "\uEF5F\uEF60\uEF61\uEF62\uEF63\uEF64\uEF65\uEF66" +
-+ "\uEF67\uEF68\uEF69\uEF6A\uEF6B\uEF6C\uEF6D\uEF6E" +
-+ "\uEF6F\uEF70\uEF71\uEF72\uEF73\uEF74\uEF75\uEF76" +
-+ "\uEF77\uEF78\uEF79\uEF7A\uEF7B\uEF7C\uEF7D\uEF7E" +
-+ "\uEF7F\uEF80\uEF81\uEF82\uEF83\uEF84\uEF85\uEF86" +
-+ "\uEF87\uEF88\uEF89\uEF8A\uEF8B\uEF8C\uEF8D\uEF8E" +
-+ "\uEF8F\uEF90\uEF91\uEF92\uEF93\uEF94\uEF95" ,
-+ "\uFFFD\uEF96\uEF97\uEF98\uEF99\uEF9A\uEF9B\uEF9C" +
-+ "\uEF9D\uEF9E\uEF9F\uEFA0\uEFA1\uEFA2\uEFA3\uEFA4" +
-+ "\uEFA5\uEFA6\uEFA7\uEFA8\uEFA9\uEFAA\uEFAB\uEFAC" +
-+ "\uEFAD\uEFAE\uEFAF\uEFB0\uEFB1\uEFB2\uEFB3\uEFB4" +
-+ "\uEFB5\uEFB6\uEFB7\uEFB8\uEFB9\uEFBA\uEFBB\uEFBC" +
-+ "\uEFBD\uEFBE\uEFBF\uEFC0\uEFC1\uEFC2\uEFC3\uEFC4" +
-+ "\uEFC5\uEFC6\uEFC7\uEFC8\uEFC9\uEFCA\uEFCB\uEFCC" +
-+ "\uEFCD\uEFCE\uEFCF\uEFD0\uEFD1\uEFD2\uEFD3\uEFD4" +
-+ "\uEFD5\uEFD6\uEFD7\uEFD8\uEFD9\uEFDA\uEFDB\uEFDC" +
-+ "\uEFDD\uEFDE\uEFDF\uEFE0\uEFE1\uEFE2\uEFE3\uEFE4" +
-+ "\uEFE5\uEFE6\uEFE7\uEFE8\uEFE9\uEFEA\uEFEB\uEFEC" +
-+ "\uEFED\uEFEE\uEFEF\uEFF0\uEFF1\uEFF2\uEFF3\uEFF4" +
-+ "\uEFF5\uEFF6\uEFF7\uEFF8\uEFF9\uEFFA\uEFFB\uEFFC" +
-+ "\uEFFD\uEFFE\uEFFF\uF000\uF001\uF002\uF003\uF004" +
-+ "\uF005\uF006\uF007\uF008\uF009\uF00A\uF00B\uF00C" +
-+ "\uF00D\uF00E\uF00F\uF010\uF011\uF012\uF013\uF014" +
-+ "\uF015\uF016\uF017\uF018\uF019\uF01A\uF01B\uF01C" +
-+ "\uF01D\uF01E\uF01F\uF020\uF021\uF022\uF023\uF024" +
-+ "\uF025\uF026\uF027\uF028\uF029\uF02A\uF02B\uF02C" +
-+ "\uF02D\uF02E\uF02F\uF030\uF031\uF032\uF033\uF034" +
-+ "\uF035\uF036\uF037\uF038\uF039\uF03A\uF03B\uF03C" +
-+ "\uF03D\uF03E\uF03F\uF040\uF041\uF042\uF043\uF044" +
-+ "\uF045\uF046\uF047\uF048\uF049\uF04A\uF04B\uF04C" +
-+ "\uF04D\uF04E\uF04F\uF050\uF051\uF052\uF053" ,
-+ "\uFFFD\uF054\uF055\uF056\uF057\uF058\uF059\uF05A" +
-+ "\uF05B\uF05C\uF05D\uF05E\uF05F\uF060\uF061\uF062" +
-+ "\uF063\uF064\uF065\uF066\uF067\uF068\uF069\uF06A" +
-+ "\uF06B\uF06C\uF06D\uF06E\uF06F\uF070\uF071\uF072" +
-+ "\uF073\uF074\uF075\uF076\uF077\uF078\uF079\uF07A" +
-+ "\uF07B\uF07C\uF07D\uF07E\uF07F\uF080\uF081\uF082" +
-+ "\uF083\uF084\uF085\uF086\uF087\uF088\uF089\uF08A" +
-+ "\uF08B\uF08C\uF08D\uF08E\uF08F\uF090\uF091\uF092" +
-+ "\uF093\uF094\uF095\uF096\uF097\uF098\uF099\uF09A" +
-+ "\uF09B\uF09C\uF09D\uF09E\uF09F\uF0A0\uF0A1\uF0A2" +
-+ "\uF0A3\uF0A4\uF0A5\uF0A6\uF0A7\uF0A8\uF0A9\uF0AA" +
-+ "\uF0AB\uF0AC\uF0AD\uF0AE\uF0AF\uF0B0\uF0B1\uF0B2" +
-+ "\uF0B3\uF0B4\uF0B5\uF0B6\uF0B7\uF0B8\uF0B9\uF0BA" +
-+ "\uF0BB\uF0BC\uF0BD\uF0BE\uF0BF\uF0C0\uF0C1\uF0C2" +
-+ "\uF0C3\uF0C4\uF0C5\uF0C6\uF0C7\uF0C8\uF0C9\uF0CA" +
-+ "\uF0CB\uF0CC\uF0CD\uF0CE\uF0CF\uF0D0\uF0D1\uF0D2" +
-+ "\uF0D3\uF0D4\uF0D5\uF0D6\uF0D7\uF0D8\uF0D9\uF0DA" +
-+ "\uF0DB\uF0DC\uF0DD\uF0DE\uF0DF\uF0E0\uF0E1\uF0E2" +
-+ "\uF0E3\uF0E4\uF0E5\uF0E6\uF0E7\uF0E8\uF0E9\uF0EA" +
-+ "\uF0EB\uF0EC\uF0ED\uF0EE\uF0EF\uF0F0\uF0F1\uF0F2" +
-+ "\uF0F3\uF0F4\uF0F5\uF0F6\uF0F7\uF0F8\uF0F9\uF0FA" +
-+ "\uF0FB\uF0FC\uF0FD\uF0FE\uF0FF\uF100\uF101\uF102" +
-+ "\uF103\uF104\uF105\uF106\uF107\uF108\uF109\uF10A" +
-+ "\uF10B\uF10C\uF10D\uF10E\uF10F\uF110\uF111" ,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ null,
-+ };
-+
-+ static char[][] b2c = new char[b2cStr.length][];
-+ private static volatile boolean b2cInitialized = false;
-+
-+ static void initb2c() {
-+ if (b2cInitialized)
-+ return;
-+ synchronized (b2c) {
-+ if (b2cInitialized)
-+ return;
-+ for (int i = 0; i < b2cStr.length; i++) {
-+ if (b2cStr[i] == null)
-+ b2c[i] = DoubleByte.B2C_UNMAPPABLE;
-+ else
-+ b2c[i] = b2cStr[i].toCharArray();
-+ }
-+ b2cInitialized = true;
-+ }
-+ }
-+
-+ static char[] c2b = new char[0x7400];
-+ static char[] c2bIndex = new char[0x100];
-+ private static volatile boolean c2bInitialized = false;
-+
-+ static void initc2b() {
-+ if (c2bInitialized)
-+ return;
-+ synchronized (c2b) {
-+ if (c2bInitialized)
-+ return;
-+ String b2cNR = null;
-+ String c2bNR =
-+ "\u4260\u2212\u426A\u00A6\u43A1\u301C\u444A\u2014" +
-+ "\u446E\uF86F\u447C\u2016\u4C7D\u9E7C\u4EB3\u9830" +
-+ "\u4F5E\u5861\u507F\u91AC\u5190\u56CA\u51F1\u6805" +
-+ "\u51FA\u91B1\u5261\u9EB4\u52A1\u881F\u52C9\u840A" +
-+ "\u52DA\u7E61\u52EC\u4FE0\u5353\u8EC0\u5373\u7E6B" +
-+ "\u53B3\u8346\u53DA\u9A52\u53E8\u87EC\u53EE\u7130" +
-+ "\u53F8\u8523\u5443\u5C5B\u5464\u9DD7\u547D\u5699" +
-+ "\u5481\u525D\u54A3\u6414\u54A4\u7626\u54CA\u7C1E" +
-+ "\u54CD\u6451\u54D4\u555E\u54FA\u6F51\u5550\u7006" +
-+ "\u5553\u79B1\u555F\u9EB5\u55C0\u5C62\u55C1\u985A" +
-+ "\u5B72\u6522\u5BFE\u688E\u60F1\u7E48\u61B0\u8141" +
-+ "\u66C8\u9839" ;
-+
-+ DoubleByte.Encoder.initC2B(b2cStr, b2cSBStr, b2cNR, c2bNR,
-+ 0x40, 0xfe,
-+ c2b, c2bIndex);
-+ c2bInitialized = true;
-+ }
-+ }
-+}
---- ./jdk/src/share/classes/sun/nio/cs/ext/META-INF/services/java.nio.charset.spi.CharsetProvider 2013-09-06 11:28:40.000000000 -0700
-+++ ./jdk/src/share/classes/sun/nio/cs/ext/META-INF/services/java.nio.charset.spi.CharsetProvider 1969-12-31 16:00:00.000000000 -0800
-@@ -1,2 +0,0 @@
--# NIO charset SPI extended charset provider
--sun.nio.cs.ext.ExtendedCharsets
---- ./jdk/src/share/classes/sun/print/DocumentPropertiesUI.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/classes/sun/print/DocumentPropertiesUI.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,62 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package sun.print;
-+
-+import java.awt.Window;
-+import java.awt.print.PrinterJob;
-+import javax.print.PrintService;
-+import javax.print.ServiceUIFactory;
-+import javax.print.attribute.PrintRequestAttributeSet;
-+
-+public abstract class DocumentPropertiesUI {
-+
-+ /**
-+ * For Win32 doc properties sheet.
-+ */
-+ public static final int
-+ DOCUMENTPROPERTIES_ROLE = ServiceUIFactory.RESERVED_UIROLE +100;
-+
-+ /**
-+ * Name of (this) abstract class for Document Properties.
-+ */
-+ public static final String
-+ DOCPROPERTIESCLASSNAME = DocumentPropertiesUI.class.getName();
-+
-+ /**
-+ * Invokes whatever code is needed to display a native dialog
-+ * with the specified owner. The owner should be the cross-platform
-+ * dialog. If the user cancels the dialog the return value is null.
-+ * A non-null return value is always a new attribute set (or is it?)
-+ * The cross-platform dialog may need to be updated to reflect the
-+ * updated properties.
-+ */
-+ public abstract PrintRequestAttributeSet
-+ showDocumentProperties(PrinterJob job,
-+ Window owner,
-+ PrintService service,
-+ PrintRequestAttributeSet aset);
-+
-+}
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -1568,7 +1568,7 @@
- }
-
- String osname = System.getProperty("os.name");
-- if (osname.equals("Linux") || osname.contains("OS X")) {
-+ if (osname.equals("Linux") || osname.equals("FreeBSD") || osname.equals("NetBSD") || osname.equals("OpenBSD") || osname.equals("OS X")) {
- execCmd = new String[ncomps];
- execCmd[n++] = "/usr/bin/lpr";
- if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/print/PrinterJobWrapper.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/classes/sun/print/PrinterJobWrapper.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,60 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package sun.print;
-+
-+import java.awt.print.PrinterJob;
-+import javax.print.attribute.PrintRequestAttribute;
-+
-+public class PrinterJobWrapper implements PrintRequestAttribute {
-+
-+ private static final long serialVersionUID = -8792124426995707237L;
-+
-+ private PrinterJob job;
-+
-+ public PrinterJobWrapper(PrinterJob job) {
-+ this.job = job;
-+ }
-+
-+ public PrinterJob getPrinterJob() {
-+ return job;
-+ }
-+
-+ public final Class getCategory() {
-+ return PrinterJobWrapper.class;
-+ }
-+
-+ public final String getName() {
-+ return "printerjob-wrapper";
-+ }
-+
-+ public String toString() {
-+ return "printerjob-wrapper: " + job.toString();
-+ }
-+
-+ public int hashCode() {
-+ return job.hashCode();
-+ }
-+}
---- ./jdk/src/share/classes/sun/print/RasterPrinterJob.java 2013-09-06 11:28:40.000000000 -0700
-+++ ./jdk/src/share/classes/sun/print/RasterPrinterJob.java 2014-07-15 21:49:30.000000000 -0700
-@@ -879,6 +879,9 @@
- int x = bounds.x+bounds.width/3;
- int y = bounds.y+bounds.height/3;
- PrintService newService;
-+ // temporarily add an attribute pointing back to this job.
-+ PrinterJobWrapper jobWrapper = new PrinterJobWrapper(this);
-+ attributes.add(jobWrapper);
- try {
- newService =
- ServiceUI.printDialog(gc, x, y,
-@@ -891,6 +894,7 @@
- DocFlavor.SERVICE_FORMATTED.PAGEABLE,
- attributes);
- }
-+ attributes.remove(PrinterJobWrapper.class);
-
- if (newService == null) {
- return false;
---- ./jdk/src/share/classes/sun/print/ServiceDialog.java 2013-09-06 11:28:40.000000000 -0700
-+++ ./jdk/src/share/classes/sun/print/ServiceDialog.java 2014-07-15 21:49:30.000000000 -0700
-@@ -46,6 +46,7 @@
- import java.awt.event.ItemListener;
- import java.awt.event.WindowEvent;
- import java.awt.event.WindowAdapter;
-+import java.awt.print.PrinterJob;
- import java.io.File;
- import java.io.FilePermission;
- import java.io.IOException;
-@@ -119,8 +120,6 @@
- private AppearancePanel pnlAppearance;
-
- private boolean isAWT = false;
--
--
- static {
- initResource();
- }
-@@ -801,9 +800,32 @@
- if (dialog != null) {
- dialog.show();
- } else {
-- // REMIND: may want to notify the user why we're
-- // disabling the button
-- btnProperties.setEnabled(false);
-+ DocumentPropertiesUI docPropertiesUI = null;
-+ try {
-+ docPropertiesUI =
-+ (DocumentPropertiesUI)uiFactory.getUI
-+ (DocumentPropertiesUI.DOCUMENTPROPERTIES_ROLE,
-+ DocumentPropertiesUI.DOCPROPERTIESCLASSNAME);
-+ } catch (Exception ex) {
-+ }
-+ if (docPropertiesUI != null) {
-+ PrinterJobWrapper wrapper = (PrinterJobWrapper)
-+ asCurrent.get(PrinterJobWrapper.class);
-+ if (wrapper == null) {
-+ return; // should not happen, defensive only.
-+ }
-+ PrinterJob job = wrapper.getPrinterJob();
-+ if (job == null) {
-+ return; // should not happen, defensive only.
-+ }
-+ PrintRequestAttributeSet newAttrs =
-+ docPropertiesUI.showDocumentProperties
-+ (job, ServiceDialog.this, psCurrent, asCurrent);
-+ if (newAttrs != null) {
-+ asCurrent.addAll(newAttrs);
-+ updatePanels();
-+ }
-+ }
- }
- }
- }
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -36,29 +36,29 @@
- label.pstype=Tipo:
- label.rangeto=A
- label.size=Tama&\u00F1o:
--label.source=Ori&gen:
-+label.source=Orig&en:
- label.status=Estado:
- label.username=&Usuario:
- label.millimetres=(mm)
- label.inches=(pulg.)
--label.topmargin=&superior
-+label.topmargin=s&uperior
- label.bottommargin=in&ferior
- label.leftmargin=iz&quierdo
- label.rightmargin=d&erecho
- #
- radiobutton.color=&Color
--radiobutton.draftq=Bo&rrador
-+radiobutton.draftq=B&orrador
- radiobutton.duplex=&D\u00FAplex
--radiobutton.highq=&Alta
-+radiobutton.highq=Al&ta
- radiobutton.landscape=Hori&zontal
- radiobutton.monochrome=&Monocromo
- radiobutton.normalq=&Normal
- radiobutton.oneside=Una Ca&ra
- radiobutton.portrait=&Vertical
- radiobutton.rangeall=&Todo
--radiobutton.rangepages=P\u00E1&ginas
-+radiobutton.rangepages=P\u00E1gina&s
- radiobutton.revlandscape=&Horizontal Inverso
--radiobutton.revportrait=Vertical Inver&so
-+radiobutton.revportrait=Vertical I&nverso
- radiobutton.tumble=Cam&bio de Cara
- # 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-07-15 21:49:30.000000000 -0700
-@@ -29,7 +29,7 @@
- dialog.writeerror=Impossible d'\u00E9crire dans le fichier :
- #
- label.info=Infos :
--label.jobname=Nom du &travail :
-+label.jobname=Nom du tra&vail :
- label.numcopies=Nombre de c&opies :
- label.priority=P&riorit\u00E9 :
- label.psname=&Nom :
-@@ -38,22 +38,22 @@
- label.size=Tai&lle :
- label.source=Sour&ce :
- label.status=Statut :
--label.username=Nom &utilisateur :
-+label.username=Nom ut&ilisateur :
- label.millimetres=(mm)
- label.inches=(po)
- label.topmargin=&haut
- label.bottommargin=&bas
--label.leftmargin=&gauche
-+label.leftmargin=gauc&he
- label.rightmargin=&droite
- #
--radiobutton.color=Coule&ur
-+radiobutton.color=Coul&eur
- radiobutton.draftq=Broui&llon
- radiobutton.duplex=&Duplex
- radiobutton.highq=Ma&x.
--radiobutton.landscape=Pay&sage
--radiobutton.monochrome=&Monochrome
-+radiobutton.landscape=Pa&ysage
-+radiobutton.monochrome=Monoc&hrome
- radiobutton.normalq=&Normal
--radiobutton.oneside=&Un c\u00F4t\u00E9
-+radiobutton.oneside=Un &c\u00F4t\u00E9
- radiobutton.portrait=&Portrait
- radiobutton.rangeall=&Tout
- radiobutton.rangepages=Pag&es
-@@ -64,7 +64,7 @@
- # 65 = KeyEvent.VK_A
- tab.appearance=&Apparence
- tab.general=&G\u00E9n\u00E9ral
--tab.pagesetup=Mi&se en page
-+tab.pagesetup=&Mise en page
- #
- 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-07-15 21:49:30.000000000 -0700
-@@ -47,8 +47,8 @@
- label.rightmargin=&destro
- #
- radiobutton.color=&Colore
--radiobutton.draftq=&Bozza
--radiobutton.duplex=F&ronte retro
-+radiobutton.draftq=Bo&zza
-+radiobutton.duplex=&Fronte retro
- radiobutton.highq=A&lta
- radiobutton.landscape=Orizzonta&le
- radiobutton.monochrome=Monocrom&atico
-@@ -62,7 +62,7 @@
- radiobutton.tumble=La&to corto
- # The vkMnemonics correspond with the constants defined in KeyEvent, eg
- # 65 = KeyEvent.VK_A
--tab.appearance=&Aspetto
-+tab.appearance=As&petto
- tab.general=&Generale
- 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-07-15 21:49:30.000000000 -0700
-@@ -31,7 +31,7 @@
- label.info=Informa\u00E7\u00F5es:
- label.jobname=Nome do &Job:
- label.numcopies=N\u00FAmer&o de c\u00F3pias:
--label.priority=P&rioridade:
-+label.priority=Pri&oridade:
- label.psname=&Nome:
- label.pstype=Tipo:
- label.rangeto=At\u00E9
-@@ -44,27 +44,27 @@
- label.topmargin=&superior
- label.bottommargin=&inferior
- label.leftmargin=es&querda:
--label.rightmargin=di&reita
-+label.rightmargin=&direita
- #
--radiobutton.color=C&or
--radiobutton.draftq=&Rascunho
--radiobutton.duplex=&Duplex
--radiobutton.highq=&Alta
-+radiobutton.color=&Cor
-+radiobutton.draftq=Rascun&ho
-+radiobutton.duplex=Duple&x
-+radiobutton.highq=A&lta
- radiobutton.landscape=&Paisagem
- radiobutton.monochrome=&Monocrom\u00E1tico
- radiobutton.normalq=&Normal
--radiobutton.oneside=Um Lad&o
--radiobutton.portrait=&Retrato
-+radiobutton.oneside=Um La&do
-+radiobutton.portrait=Re&trato
- radiobutton.rangeall=T&udo
- radiobutton.rangepages=&P\u00E1ginas
- radiobutton.revlandscape=Paisagem I&nvertida
--radiobutton.revportrait=Retrato &Invertido
-+radiobutton.revportrait=Retrato In&vertido
- radiobutton.tumble=&Virar
- # The vkMnemonics correspond with the constants defined in KeyEvent, eg
- # 65 = KeyEvent.VK_A
--tab.appearance=&Apar\u00EAncia
-+tab.appearance=Apa&r\u00EAncia
- tab.general=&Geral
--tab.pagesetup=Configura\u00E7\u00E3o de &P\u00E1gina
-+tab.pagesetup=Con&figura\u00E7\u00E3o da P\u00E1gina
- #
- 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-07-15 21:49:30.000000000 -0700
-@@ -17,7 +17,7 @@
- button.properties=&Egenskaper...
- #
- checkbox.collate=&Sortera
--checkbox.jobsheets=&F\u00F6rs\u00E4ttsblad
-+checkbox.jobsheets=F&\u00F6rs\u00E4ttsblad
- checkbox.printtofile=Skriv ut till &fil
- #
- dialog.printtitle=Skriv ut
-@@ -30,13 +30,13 @@
- #
- label.info=Information:
- label.jobname=&Utskrift:
--label.numcopies=Antal &exemplar:
-+label.numcopies=Antal e&xemplar:
- label.priority=P&rioritet:
- label.psname=&Namn:
- label.pstype=Typ:
- label.rangeto=Till
- label.size=Stor&lek:
--label.source=K\u00E4l&la:
-+label.source=&K\u00E4lla:
- label.status=Status:
- label.username=A&nv\u00E4ndarnamn:
- label.millimetres=(mm)
-@@ -50,7 +50,7 @@
- radiobutton.draftq=Utka&st
- radiobutton.duplex=&Dubbelsidig
- radiobutton.highq=&H\u00F6g
--radiobutton.landscape=&Liggande
-+radiobutton.landscape=Liggan&de
- radiobutton.monochrome=&Monokrom
- radiobutton.normalq=&Normal
- radiobutton.oneside=&Ensidig
-@@ -62,9 +62,9 @@
- radiobutton.tumble=&V\u00E4nd
- # The vkMnemonics correspond with the constants defined in KeyEvent, eg
- # 65 = KeyEvent.VK_A
--tab.appearance=&Format
-+tab.appearance=Fo&rmat
- tab.general=&Allm\u00E4nt
--tab.pagesetup=Utskrifts&format
-+tab.pagesetup=&Utskriftsformat
- #
- 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/annotation/AnnotationInvocationHandler.java 2013-09-06 11:28:41.000000000 -0700
-+++ ./jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java 2014-10-28 20:19:48.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2013, 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
-@@ -29,7 +29,6 @@
- import java.lang.reflect.*;
- import java.io.Serializable;
- import java.util.*;
--import java.lang.annotation.*;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
-
-@@ -45,6 +44,11 @@
- private final Map<String, Object> memberValues;
-
- AnnotationInvocationHandler(Class<? extends Annotation> type, Map<String, Object> memberValues) {
-+ Class<?>[] superInterfaces = type.getInterfaces();
-+ if (!type.isAnnotation() ||
-+ superInterfaces.length != 1 ||
-+ superInterfaces[0] != java.lang.annotation.Annotation.class)
-+ throw new AnnotationFormatError("Attempt to create proxy for a non-annotation type.");
- this.type = type;
- this.memberValues = memberValues;
- }
-@@ -57,13 +61,17 @@
- if (member.equals("equals") && paramTypes.length == 1 &&
- paramTypes[0] == Object.class)
- return equalsImpl(args[0]);
-- assert paramTypes.length == 0;
-- if (member.equals("toString"))
-+ if (paramTypes.length != 0)
-+ throw new AssertionError("Too many parameters for an annotation method");
-+
-+ switch(member) {
-+ case "toString":
- return toStringImpl();
-- if (member.equals("hashCode"))
-+ case "hashCode":
- return hashCodeImpl();
-- if (member.equals("annotationType"))
-+ case "annotationType":
- return type;
-+ }
-
- // Handle annotation member accessors
- Object result = memberValues.get(member);
-@@ -129,7 +137,7 @@
- * Implementation of dynamicProxy.toString()
- */
- private String toStringImpl() {
-- StringBuffer result = new StringBuffer(128);
-+ StringBuilder result = new StringBuilder(128);
- result.append('@');
- result.append(type.getName());
- result.append('(');
-@@ -277,6 +285,7 @@
- new PrivilegedAction<Method[]>() {
- public Method[] run() {
- final Method[] mm = type.getDeclaredMethods();
-+ validateAnnotationMethods(mm);
- AccessibleObject.setAccessible(mm, true);
- return mm;
- }
-@@ -287,6 +296,93 @@
- private transient volatile Method[] memberMethods = null;
-
- /**
-+ * Validates that a method is structurally appropriate for an
-+ * annotation type. As of Java SE 7, annotation types cannot
-+ * contain static methods and the declared methods of an
-+ * annotation type must take zero arguments and there are
-+ * restrictions on the return type.
-+ */
-+ private void validateAnnotationMethods(Method[] memberMethods) {
-+ /*
-+ * Specification citations below are from JLS
-+ * 9.6.1. Annotation Type Elements
-+ */
-+ boolean valid = true;
-+ for(Method method : memberMethods) {
-+ /*
-+ * "By virtue of the AnnotationTypeElementDeclaration
-+ * production, a method declaration in an annotation type
-+ * declaration cannot have formal parameters, type
-+ * parameters, or a throws clause.
-+ *
-+ * "By virtue of the AnnotationTypeElementModifier
-+ * production, a method declaration in an annotation type
-+ * declaration cannot be default or static."
-+ */
-+ if (method.getModifiers() != (Modifier.PUBLIC | Modifier.ABSTRACT) ||
-+ method.getParameterTypes().length != 0 ||
-+ method.getExceptionTypes().length != 0) {
-+ valid = false;
-+ break;
-+ }
-+
-+ /*
-+ * "It is a compile-time error if the return type of a
-+ * method declared in an annotation type is not one of the
-+ * following: a primitive type, String, Class, any
-+ * parameterized invocation of Class, an enum type
-+ * (section 8.9), an annotation type, or an array type
-+ * (chapter 10) whose element type is one of the preceding
-+ * types."
-+ */
-+ Class<?> returnType = method.getReturnType();
-+ if (returnType.isArray()) {
-+ returnType = returnType.getComponentType();
-+ if (returnType.isArray()) { // Only single dimensional arrays
-+ valid = false;
-+ break;
-+ }
-+ }
-+
-+ if (!((returnType.isPrimitive() && returnType != void.class) ||
-+ returnType == java.lang.String.class ||
-+ returnType == java.lang.Class.class ||
-+ returnType.isEnum() ||
-+ returnType.isAnnotation())) {
-+ valid = false;
-+ break;
-+ }
-+
-+ /*
-+ * "It is a compile-time error if any method declared in an
-+ * annotation type has a signature that is
-+ * override-equivalent to that of any public or protected
-+ * method declared in class Object or in the interface
-+ * java.lang.annotation.Annotation."
-+ *
-+ * The methods in Object or Annotation meeting the other
-+ * criteria (no arguments, contrained return type, etc.)
-+ * above are:
-+ *
-+ * String toString()
-+ * int hashCode()
-+ * Class<? extends Annotation> annotationType()
-+ */
-+ String methodName = method.getName();
-+ if ((methodName.equals("toString") && returnType == java.lang.String.class) ||
-+ (methodName.equals("hashCode") && returnType == int.class) ||
-+ (methodName.equals("annotationType") && returnType == java.lang.Class.class)) {
-+ valid = false;
-+ break;
-+ }
-+ }
-+ if (valid)
-+ return;
-+ else
-+ throw new AnnotationFormatError("Malformed method on an annotation type");
-+ }
-+
-+ /**
- * Implementation of dynamicProxy.hashCode()
- */
- private int hashCodeImpl() {
-@@ -330,7 +426,6 @@
- throws java.io.IOException, ClassNotFoundException {
- s.defaultReadObject();
-
--
- // Check to make sure that types have not evolved incompatibly
-
- AnnotationType annotationType = null;
-@@ -343,7 +438,6 @@
-
- Map<String, Class<?>> memberTypes = annotationType.memberTypes();
-
--
- // If there are annotation members without values, that
- // situation is handled by the invoke method.
- for (Map.Entry<String, Object> memberValue : memberValues.entrySet()) {
---- ./jdk/src/share/classes/sun/reflect/annotation/AnnotationParser.java 2013-09-06 11:28:41.000000000 -0700
-+++ ./jdk/src/share/classes/sun/reflect/annotation/AnnotationParser.java 2014-10-28 20:19:48.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2005, 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
-@@ -67,7 +67,35 @@
- return Collections.emptyMap();
-
- try {
-- return parseAnnotations2(rawAnnotations, constPool, container);
-+ return parseAnnotations2(rawAnnotations, constPool, container, null);
-+ } catch(BufferUnderflowException e) {
-+ throw new AnnotationFormatError("Unexpected end of annotations.");
-+ } catch(IllegalArgumentException e) {
-+ // Type mismatch in constant pool
-+ throw new AnnotationFormatError(e);
-+ }
-+ }
-+
-+ /**
-+ * Like {@link #parseAnnotations(byte[], sun.reflect.ConstantPool, Class)}
-+ * with an additional parameter {@code selectAnnotationClasses} which selects the
-+ * annotation types to parse (other than selected are quickly skipped).<p>
-+ * This method is only used to parse select meta annotations in the construction
-+ * phase of {@link AnnotationType} instances to prevent infinite recursion.
-+ *
-+ * @param selectAnnotationClasses an array of annotation types to select when parsing
-+ */
-+ @SafeVarargs
-+ static Map<Class<? extends Annotation>, Annotation> parseSelectAnnotations(
-+ byte[] rawAnnotations,
-+ ConstantPool constPool,
-+ Class<?> container,
-+ Class<? extends Annotation> ... selectAnnotationClasses) {
-+ if (rawAnnotations == null)
-+ return Collections.emptyMap();
-+
-+ try {
-+ return parseAnnotations2(rawAnnotations, constPool, container, selectAnnotationClasses);
- } catch(BufferUnderflowException e) {
- throw new AnnotationFormatError("Unexpected end of annotations.");
- } catch(IllegalArgumentException e) {
-@@ -79,22 +107,23 @@
- private static Map<Class<? extends Annotation>, Annotation> parseAnnotations2(
- byte[] rawAnnotations,
- ConstantPool constPool,
-- Class<?> container) {
-+ Class<?> container,
-+ Class<? extends Annotation>[] selectAnnotationClasses) {
- Map<Class<? extends Annotation>, Annotation> result =
- new LinkedHashMap<Class<? extends Annotation>, Annotation>();
- ByteBuffer buf = ByteBuffer.wrap(rawAnnotations);
- int numAnnotations = buf.getShort() & 0xFFFF;
- for (int i = 0; i < numAnnotations; i++) {
-- Annotation a = parseAnnotation(buf, constPool, container, false);
-+ Annotation a = parseAnnotation2(buf, constPool, container, false, selectAnnotationClasses);
- if (a != null) {
- Class<? extends Annotation> klass = a.annotationType();
-- AnnotationType type = AnnotationType.getInstance(klass);
-- if (type.retention() == RetentionPolicy.RUNTIME)
-- if (result.put(klass, a) != null)
-+ if (AnnotationType.getInstance(klass).retention() == RetentionPolicy.RUNTIME &&
-+ result.put(klass, a) != null) {
- throw new AnnotationFormatError(
- "Duplicate annotation for class: "+klass+": " + a);
- }
- }
-+ }
- return result;
- }
-
-@@ -191,6 +220,15 @@
- ConstantPool constPool,
- Class<?> container,
- boolean exceptionOnMissingAnnotationClass) {
-+ return parseAnnotation2(buf, constPool, container, exceptionOnMissingAnnotationClass, null);
-+ }
-+
-+ @SuppressWarnings("unchecked")
-+ private static Annotation parseAnnotation2(ByteBuffer buf,
-+ ConstantPool constPool,
-+ Class<?> container,
-+ boolean exceptionOnMissingAnnotationClass,
-+ Class<? extends Annotation>[] selectAnnotationClasses) {
- int typeIndex = buf.getShort() & 0xFFFF;
- Class<? extends Annotation> annotationClass = null;
- String sig = "[unknown]";
-@@ -216,6 +254,10 @@
- skipAnnotation(buf, false);
- return null;
- }
-+ if (selectAnnotationClasses != null && !contains(selectAnnotationClasses, annotationClass)) {
-+ skipAnnotation(buf, false);
-+ return null;
-+ }
- AnnotationType type = null;
- try {
- type = AnnotationType.getInstance(annotationClass);
-@@ -791,6 +833,17 @@
- skipMemberValue(buf);
- }
-
-+ /**
-+ * Searches for given {@code element} in given {@code array} by identity.
-+ * Returns {@code true} if found {@code false} if not.
-+ */
-+ private static boolean contains(Object[] array, Object element) {
-+ for (Object e : array)
-+ if (e == element)
-+ return true;
-+ return false;
-+ }
-+
- /*
- * This method converts the annotation map returned by the parseAnnotations()
- * method to an array. It is called by Field.getDeclaredAnnotations(),
---- ./jdk/src/share/classes/sun/reflect/annotation/AnnotationType.java 2013-09-06 11:28:41.000000000 -0700
-+++ ./jdk/src/share/classes/sun/reflect/annotation/AnnotationType.java 2014-10-28 20:19:48.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2006, 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
-@@ -25,6 +25,8 @@
-
- package sun.reflect.annotation;
-
-+import sun.misc.JavaLangAccess;
-+
- import java.lang.annotation.*;
- import java.lang.reflect.*;
- import java.util.*;
-@@ -45,29 +47,28 @@
- * types. This matches the return value that must be used for a
- * dynamic proxy, allowing for a simple isInstance test.
- */
-- private final Map<String, Class<?>> memberTypes = new HashMap<String,Class<?>>();
-+ private final Map<String, Class<?>> memberTypes;
-
- /**
- * Member name -> default value mapping.
- */
-- private final Map<String, Object> memberDefaults =
-- new HashMap<String, Object>();
-+ private final Map<String, Object> memberDefaults;
-
- /**
-- * Member name -> Method object mapping. This (and its assoicated
-+ * Member name -> Method object mapping. This (and its associated
- * accessor) are used only to generate AnnotationTypeMismatchExceptions.
- */
-- private final Map<String, Method> members = new HashMap<String, Method>();
-+ private final Map<String, Method> members;
-
- /**
- * The retention policy for this annotation type.
- */
-- private RetentionPolicy retention = RetentionPolicy.RUNTIME;;
-+ private final RetentionPolicy retention;
-
- /**
- * Whether this annotation type is inherited.
- */
-- private boolean inherited = false;
-+ private final boolean inherited;
-
- /**
- * Returns an AnnotationType instance for the specified annotation type.
-@@ -75,13 +76,20 @@
- * @throw IllegalArgumentException if the specified class object for
- * does not represent a valid annotation type
- */
-- public static synchronized AnnotationType getInstance(
-+ public static AnnotationType getInstance(
- Class<? extends Annotation> annotationClass)
- {
-- AnnotationType result = sun.misc.SharedSecrets.getJavaLangAccess().
-- getAnnotationType(annotationClass);
-- if (result == null)
-- result = new AnnotationType((Class<? extends Annotation>) annotationClass);
-+ JavaLangAccess jla = sun.misc.SharedSecrets.getJavaLangAccess();
-+ AnnotationType result = jla.getAnnotationType(annotationClass); // volatile read
-+ if (result == null) {
-+ result = new AnnotationType(annotationClass);
-+ // try to CAS the AnnotationType: null -> result
-+ if (!jla.casAnnotationType(annotationClass, null, result)) {
-+ // somebody was quicker -> read it's result
-+ result = jla.getAnnotationType(annotationClass);
-+ assert result != null;
-+ }
-+ }
-
- return result;
- }
-@@ -105,6 +113,9 @@
- }
- });
-
-+ memberTypes = new HashMap<String,Class<?>>(methods.length+1, 1.0f);
-+ memberDefaults = new HashMap<String, Object>(0);
-+ members = new HashMap<String, Method>(methods.length+1, 1.0f);
-
- for (Method method : methods) {
- if (method.getParameterTypes().length != 0)
-@@ -117,20 +128,27 @@
- Object defaultValue = method.getDefaultValue();
- if (defaultValue != null)
- memberDefaults.put(name, defaultValue);
--
-- members.put(name, method);
- }
-
-- sun.misc.SharedSecrets.getJavaLangAccess().
-- setAnnotationType(annotationClass, this);
--
- // Initialize retention, & inherited fields. Special treatment
- // of the corresponding annotation types breaks infinite recursion.
- if (annotationClass != Retention.class &&
- annotationClass != Inherited.class) {
-- Retention ret = annotationClass.getAnnotation(Retention.class);
-+ JavaLangAccess jla = sun.misc.SharedSecrets.getJavaLangAccess();
-+ Map<Class<? extends Annotation>, Annotation> metaAnnotations =
-+ AnnotationParser.parseSelectAnnotations(
-+ jla.getRawClassAnnotations(annotationClass),
-+ jla.getConstantPool(annotationClass),
-+ annotationClass,
-+ Retention.class, Inherited.class
-+ );
-+ Retention ret = (Retention) metaAnnotations.get(Retention.class);
- retention = (ret == null ? RetentionPolicy.CLASS : ret.value());
-- inherited = annotationClass.isAnnotationPresent(Inherited.class);
-+ inherited = metaAnnotations.containsKey(Inherited.class);
-+ }
-+ else {
-+ retention = RetentionPolicy.RUNTIME;
-+ inherited = false;
- }
- }
-
-@@ -205,11 +223,10 @@
- * For debugging.
- */
- public String toString() {
-- StringBuffer s = new StringBuffer("Annotation Type:" + "\n");
-- s.append(" Member types: " + memberTypes + "\n");
-- s.append(" Member defaults: " + memberDefaults + "\n");
-- s.append(" Retention policy: " + retention + "\n");
-- s.append(" Inherited: " + inherited);
-- return s.toString();
-+ return "Annotation Type:\n" +
-+ " Member types: " + memberTypes + "\n" +
-+ " Member defaults: " + memberDefaults + "\n" +
-+ " Retention policy: " + retention + "\n" +
-+ " Inherited: " + inherited;
- }
- }
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -25,13 +25,17 @@
-
- package sun.reflect.generics.reflectiveObjects;
-
-+import java.lang.reflect.Constructor;
- import java.lang.reflect.GenericDeclaration;
-+import java.lang.reflect.Member;
-+import java.lang.reflect.Method;
- import java.lang.reflect.Type;
- import java.lang.reflect.TypeVariable;
-
- import sun.reflect.generics.factory.GenericsFactory;
- import sun.reflect.generics.tree.FieldTypeSignature;
- import sun.reflect.generics.visitor.Reifier;
-+import sun.reflect.misc.ReflectUtil;
-
- /**
- * Implementation of <tt>java.lang.reflect.TypeVariable</tt> interface
-@@ -87,6 +91,13 @@
- TypeVariableImpl<T> make(T decl, String name,
- FieldTypeSignature[] bs,
- GenericsFactory f) {
-+
-+ if (!((decl instanceof Class) ||
-+ (decl instanceof Method) ||
-+ (decl instanceof Constructor))) {
-+ throw new AssertionError("Unexpected kind of GenericDeclaration" +
-+ decl.getClass().toString());
-+ }
- return new TypeVariableImpl<T>(decl, name, bs, f);
- }
-
-@@ -141,6 +152,13 @@
- * @since 1.5
- */
- public D getGenericDeclaration(){
-+ if (genericDeclaration instanceof Class)
-+ ReflectUtil.checkPackageAccess((Class)genericDeclaration);
-+ else if ((genericDeclaration instanceof Method) ||
-+ (genericDeclaration instanceof Constructor))
-+ ReflectUtil.conservativeCheckMemberAccess((Member)genericDeclaration);
-+ else
-+ throw new AssertionError("Unexpected kind of GenericDeclaration");
- return genericDeclaration;
- }
-
-@@ -156,7 +174,8 @@
-
- @Override
- public boolean equals(Object o) {
-- if (o instanceof TypeVariable) {
-+ if (o instanceof TypeVariable &&
-+ o.getClass() == TypeVariableImpl.class) {
- TypeVariable that = (TypeVariable) o;
-
- 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-07-15 21:49:30.000000000 -0700
-@@ -26,9 +26,13 @@
-
- package sun.reflect.misc;
-
-+import java.lang.reflect.Member;
-+import java.lang.reflect.Method;
- import java.lang.reflect.Modifier;
- import java.lang.reflect.Proxy;
-+import java.util.Arrays;
- import sun.reflect.Reflection;
-+import sun.security.util.SecurityConstants;
-
- public final class ReflectUtil {
-
-@@ -115,6 +119,39 @@
- return false;
- }
-
-+ /**
-+ * Does a conservative approximation of member access check. Use this if
-+ * you don't have an actual 'userland' caller Class/ClassLoader available.
-+ * This might be more restrictive than a precise member access check where
-+ * you have a caller, but should never allow a member access that is
-+ * forbidden.
-+ *
-+ * @param m the {@code Member} about to be accessed
-+ */
-+ public static void conservativeCheckMemberAccess(Member m) throws SecurityException{
-+ final SecurityManager sm = System.getSecurityManager();
-+ if (sm == null)
-+ return;
-+
-+ // Check for package access on the declaring class.
-+ //
-+ // In addition, unless the member and the declaring class are both
-+ // public check for access declared member permissions.
-+ //
-+ // This is done regardless of ClassLoader relations between the {@code
-+ // Member m} and any potential caller.
-+
-+ final Class<?> declaringClass = m.getDeclaringClass();
-+
-+ checkPackageAccess(declaringClass);
-+
-+ if (Modifier.isPublic(m.getModifiers()) &&
-+ Modifier.isPublic(declaringClass.getModifiers()))
-+ return;
-+
-+ // Check for declared member access.
-+ sm.checkPermission(SecurityConstants.CHECK_MEMBER_ACCESS_PERMISSION);
-+ }
-
- /**
- * Checks package access on the given class.
-@@ -249,4 +286,50 @@
- String pkg = (i != -1) ? name.substring(0, i) : "";
- return Proxy.isProxyClass(cls) && !pkg.equals(PROXY_PACKAGE);
- }
-+
-+ /**
-+ * Check if the given method is a method declared in the proxy interface
-+ * implemented by the given proxy instance.
-+ *
-+ * @param proxy a proxy instance
-+ * @param method an interface method dispatched to a InvocationHandler
-+ *
-+ * @throws IllegalArgumentException if the given proxy or method is invalid.
-+ */
-+ public static void checkProxyMethod(Object proxy, Method method) {
-+ // check if it is a valid proxy instance
-+ if (proxy == null || !Proxy.isProxyClass(proxy.getClass())) {
-+ throw new IllegalArgumentException("Not a Proxy instance");
-+}
-+ if (Modifier.isStatic(method.getModifiers())) {
-+ throw new IllegalArgumentException("Can't handle static method");
-+ }
-+
-+ Class<?> c = method.getDeclaringClass();
-+ if (c == Object.class) {
-+ String name = method.getName();
-+ if (name.equals("hashCode") || name.equals("equals") || name.equals("toString")) {
-+ return;
-+ }
-+ }
-+
-+ if (isSuperInterface(proxy.getClass(), c)) {
-+ return;
-+ }
-+
-+ // disallow any method not declared in one of the proxy intefaces
-+ throw new IllegalArgumentException("Can't handle: " + method);
-+ }
-+
-+ private static boolean isSuperInterface(Class<?> c, Class<?> intf) {
-+ for (Class<?> i : c.getInterfaces()) {
-+ if (i == intf) {
-+ return true;
-+ }
-+ if (isSuperInterface(i, intf)) {
-+ return true;
-+ }
-+ }
-+ return false;
-+ }
- }
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -352,7 +352,7 @@
- public RegistryImpl run() throws RemoteException {
- return new RegistryImpl(regPort);
- }
-- }, getAccessControlContext());
-+ }, getAccessControlContext(regPort));
- } catch (PrivilegedActionException ex) {
- throw (RemoteException) ex.getException();
- }
-@@ -382,7 +382,7 @@
- * The approach used here is taken from the similar method
- * getAccessControlContext() in the sun.applet.AppletPanel class.
- */
-- private static AccessControlContext getAccessControlContext() {
-+ private static AccessControlContext getAccessControlContext(int port) {
- // begin with permissions granted to all code in current policy
- PermissionCollection perms = AccessController.doPrivileged(
- new java.security.PrivilegedAction<PermissionCollection>() {
-@@ -404,6 +404,7 @@
- * related classes themselves are more tightly limited by RMI.
- */
- perms.add(new SocketPermission("*", "connect,accept"));
-+ perms.add(new SocketPermission("localhost:"+port, "listen,accept"));
-
- perms.add(new RuntimePermission("accessClassInPackage.sun.jvmstat.*"));
- perms.add(new RuntimePermission("accessClassInPackage.sun.jvm.hotspot.*"));
---- ./jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties 2013-09-06 11:28:42.000000000 -0700
-+++ ./jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties 2014-10-28 20:19:48.000000000 -0700
-@@ -1,6 +1,6 @@
- #
- #
--# Copyright (c) 1996, 2010, 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
-@@ -91,8 +91,8 @@
- rmic.warnings=\u8B66\u544A{0}\u500B
- rmic.1warning=\u8B66\u544A1\u500B
- rmic.done_in=[{0}\u30DF\u30EA\u79D2\u3067\u5B8C\u4E86]
--rmic.no.memory=\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u30E1\u30E2\u30EA\u30FC\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002"-J-Xmx<size>"\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002
--rmic.stack.overflow=\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u30B9\u30BF\u30C3\u30AF\u7A7A\u9593\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002"-J-Xss<size>"\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001Java\u30B9\u30BF\u30C3\u30AF\u306B\u5272\u308A\u5F53\u3066\u308B\u30E1\u30E2\u30EA\u30FC\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-+rmic.no.memory=\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u30E1\u30E2\u30EA\u30FC\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002"-J-Xmx<size>"\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-+rmic.stack.overflow=\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u30B9\u30BF\u30C3\u30AF\u7A7A\u9593\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002"-J-Xss<size>"\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001Java\u30B9\u30BF\u30C3\u30AF\u306B\u5272\u308A\u5F53\u3066\u308B\u30E1\u30E2\u30EA\u30FC\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002
- rmic.class.not.found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
- rmic.missing.property=\u30D7\u30ED\u30D1\u30C6\u30A3generator.class.{0}\u304C\u3042\u308A\u307E\u305B\u3093
- rmic.cannot.instantiate=\u30AF\u30E9\u30B9{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093
---- ./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-07-15 21:49:30.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:
-
- # "rmid" should not be translated
--rmid.log.update.warning=\nrmid: (\uACBD\uACE0) \uB85C\uADF8 \uAC31\uC2E0\uC73C\uB85C \uC778\uD574 \uBC1C\uC0DD\uD55C \uC624\uB958:
-+rmid.log.update.warning=\nrmid: (\uACBD\uACE0) \uB85C\uADF8 \uC5C5\uB370\uC774\uD2B8\uB85C \uC778\uD574 \uBC1C\uC0DD\uD55C \uC624\uB958:
-
- # "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/ECKeyPairGenerator.java 2013-09-06 11:28:42.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java 2014-07-15 21:54:44.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2009, 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
-@@ -123,19 +123,19 @@
-
- try {
-
-- long[] handles = generateECKeyPair(keySize, encodedParams, seed);
-+ Object[] keyBytes = generateECKeyPair(keySize, encodedParams, seed);
-
- // The 'params' object supplied above is equivalent to the native
- // one so there is no need to fetch it.
-
-- // handles[0] points to the native private key
-- BigInteger s = new BigInteger(1, getEncodedBytes(handles[0]));
-+ // keyBytes[0] is the encoding of the native private key
-+ BigInteger s = new BigInteger(1, (byte[])keyBytes[0]);
-
- PrivateKey privateKey =
- new ECPrivateKeyImpl(s, (ECParameterSpec)params);
-
-- // handles[1] points to the native public key
-- ECPoint w = ECParameters.decodePoint(getEncodedBytes(handles[1]),
-+ // keyBytes[1] is the encoding of the native public key
-+ ECPoint w = ECParameters.decodePoint((byte[])keyBytes[1],
- ((ECParameterSpec)params).getCurve());
- PublicKey publicKey =
- new ECPublicKeyImpl(w, (ECParameterSpec)params);
-@@ -160,14 +160,9 @@
- }
-
- /*
-- * Generates the keypair and returns a 2-element array of handles.
-- * The first handle points to the private key, the second to the public key.
-+ * Generates the keypair and returns a 2-element array of encoding bytes.
-+ * The first one is for the private key, the second for the public key.
- */
-- private static native long[] generateECKeyPair(int keySize,
-+ private static native Object[] generateECKeyPair(int keySize,
- byte[] encodedParams, byte[] seed) throws GeneralSecurityException;
--
-- /*
-- * Extracts the encoded key data using the supplied handle.
-- */
-- private static native byte[] getEncodedBytes(long handle);
- }
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -153,12 +153,4 @@
- throw new InvalidKeyException("Invalid EC private key", e);
- }
- }
--
-- // return a string representation of this key for debugging
-- public String toString() {
-- return "Sun EC private key, " + params.getCurve().getField().getFieldSize()
-- + " bits\n private value: "
-- + s + "\n parameters: " + params;
-- }
--
- }
---- ./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-10-28 20:19:48.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
-@@ -26,11 +26,11 @@
- package sun.security.internal.spec;
-
- import java.security.spec.AlgorithmParameterSpec;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-
- /**
-- * Parameters for SSL/TLS RSA Premaster secret generation.
-- * This class is used by SSL/TLS client to initialize KeyGenerators of the
-- * type "TlsRsaPremasterSecret".
-+ * Parameters for SSL/TLS RSA premaster secret.
- *
- * <p>Instances of this class are immutable.
- *
-@@ -43,45 +43,108 @@
- public class TlsRsaPremasterSecretParameterSpec
- implements AlgorithmParameterSpec {
-
-- private final int majorVersion;
-- private final int minorVersion;
-+ /*
-+ * The TLS spec says that the version in the RSA premaster secret must
-+ * be the maximum version supported by the client (i.e. the version it
-+ * requested in its client hello version). However, we (and other
-+ * implementations) used to send the active negotiated version. The
-+ * system property below allows to toggle the behavior.
-+ */
-+ private final static String PROP_NAME =
-+ "com.sun.net.ssl.rsaPreMasterSecretFix";
-+
-+ /*
-+ * Default is "false" (old behavior) for compatibility reasons in
-+ * SSLv3/TLSv1. Later protocols (TLSv1.1+) do not use this property.
-+ */
-+ private final static boolean rsaPreMasterSecretFix =
-+ AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-+ public Boolean run() {
-+ String value = System.getProperty(PROP_NAME);
-+ if (value != null && value.equalsIgnoreCase("true")) {
-+ return Boolean.TRUE;
-+ }
-+
-+ return Boolean.FALSE;
-+ }
-+ });
-+
-+ private final int clientVersion;
-+ private final int serverVersion;
-
- /**
- * Constructs a new TlsRsaPremasterSecretParameterSpec.
- *
-- * <p>The version numbers will be placed inside the premaster secret to
-- * detect version rollbacks attacks as described in the TLS specification.
-- * Note that they do not indicate the protocol version negotiated for
-- * the handshake.
-- *
-- * @param majorVersion the major number of the protocol version
-- * @param minorVersion the minor number of the protocol version
-- *
-- * @throws IllegalArgumentException if minorVersion or majorVersion are
-- * negative or larger than 255
-- */
-- public TlsRsaPremasterSecretParameterSpec(int majorVersion,
-- int minorVersion) {
-- this.majorVersion =
-- TlsMasterSecretParameterSpec.checkVersion(majorVersion);
-- this.minorVersion =
-- TlsMasterSecretParameterSpec.checkVersion(minorVersion); }
-+ * @param clientVersion the version of the TLS protocol by which the
-+ * client wishes to communicate during this session
-+ * @param serverVersion the negotiated version of the TLS protocol which
-+ * contains the lower of that suggested by the client in the client
-+ * hello and the highest supported by the server.
-+ *
-+ * @throws IllegalArgumentException if clientVersion or serverVersion are
-+ * negative or larger than (2^16 - 1)
-+ */
-+ public TlsRsaPremasterSecretParameterSpec(
-+ int clientVersion, int serverVersion) {
-+
-+ this.clientVersion = checkVersion(clientVersion);
-+ this.serverVersion = checkVersion(serverVersion);
-+ }
-+
-+ /**
-+ * Returns the version of the TLS protocol by which the client wishes to
-+ * communicate during this session.
-+ *
-+ * @return the version of the TLS protocol in ClientHello message
-+ */
-+ public int getClientVersion() {
-+ return clientVersion;
-+ }
-
- /**
-- * Returns the major version.
-+ * Returns the negotiated version of the TLS protocol which contains the
-+ * lower of that suggested by the client in the client hello and the
-+ * highest supported by the server.
- *
-- * @return the major version.
-+ * @return the negotiated version of the TLS protocol in ServerHello message
-+ */
-+ public int getServerVersion() {
-+ return serverVersion;
-+ }
-+
-+ /**
-+ * Returns the major version used in RSA premaster secret.
-+ *
-+ * @return the major version used in RSA premaster secret.
- */
- public int getMajorVersion() {
-- return majorVersion;
-+ if (rsaPreMasterSecretFix || clientVersion >= 0x0302) {
-+ // 0x0302: TLSv1.1
-+ return (clientVersion >>> 8) & 0xFF;
-+ }
-+
-+ return (serverVersion >>> 8) & 0xFF;
- }
-
- /**
-- * Returns the minor version.
-+ * Returns the minor version used in RSA premaster secret.
- *
-- * @return the minor version.
-+ * @return the minor version used in RSA premaster secret.
- */
- public int getMinorVersion() {
-- return minorVersion;
-+ if (rsaPreMasterSecretFix || clientVersion >= 0x0302) {
-+ // 0x0302: TLSv1.1
-+ return clientVersion & 0xFF;
-+ }
-+
-+ return serverVersion & 0xFF;
-+ }
-+
-+ private int checkVersion(int version) {
-+ if ((version < 0) || (version > 0xFFFF)) {
-+ throw new IllegalArgumentException(
-+ "Version must be between 0 and 65,535");
-+ }
-+ return version;
- }
- }
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -630,7 +630,7 @@
- buffer.append(element.isAcceptorCredential() ?
- " Accept" : "");
- buffer.append(" [");
-- buffer.append(element.toString());
-+ buffer.append(element.getClass());
- buffer.append(']');
- } catch (GSSException e) {
- // skip to next element
---- ./jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java 2013-09-06 11:28:43.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java 2014-07-15 21:49:30.000000000 -0700
-@@ -525,6 +525,10 @@
-
- // get the mechanism token
- byte[] mechToken = initToken.getMechToken();
-+ if (mechToken == null) {
-+ throw new GSSException(GSSException.FAILURE, -1,
-+ "mechToken is missing");
-+ }
-
- /*
- * Select the best match between the list of mechs
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -83,7 +83,8 @@
- String osname = System.getProperty("os.name");
- if (osname.startsWith("SunOS")) {
- gssLibs = new String[]{ "libgss.so" };
-- } else if (osname.startsWith("Linux")) {
-+ } else if (osname.startsWith("Linux") ||
-+ osname.endsWith("BSD")) {
- gssLibs = new String[]{
- "libgssapi.so",
- "libgssapi_krb5.so",
---- ./jdk/src/share/classes/sun/security/krb5/Credentials.java 2013-09-06 11:28:43.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/krb5/Credentials.java 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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,7 +62,9 @@
- private static CredentialsCache cache;
- static boolean alreadyLoaded = false;
- private static boolean alreadyTried = false;
-- private static native Credentials acquireDefaultNativeCreds();
-+
-+ // Read native ticket with session key type in the given list
-+ private static native Credentials acquireDefaultNativeCreds(int[] eTypes);
-
- public Credentials(Ticket new_ticket,
- PrincipalName new_client,
-@@ -373,6 +375,8 @@
- // It assumes that the GSS call has
- // the privilege to access the default cache file.
-
-+ // This method is only called on Windows and Mac OS X, the native
-+ // acquireDefaultNativeCreds is also available on these platforms.
- public static synchronized Credentials acquireDefaultCreds() {
- Credentials result = null;
-
-@@ -416,10 +420,11 @@
- }
- if (alreadyLoaded) {
- // There is some native code
-- if (DEBUG)
-- System.out.println(">> Acquire default native Credentials");
-- result = acquireDefaultNativeCreds();
-- // only TGT with DES key will be returned by native method
-+ if (DEBUG) {
-+ System.out.println(">> Acquire default native Credentials");
-+ }
-+ result = acquireDefaultNativeCreds(
-+ EType.getDefaults("default_tkt_enctypes"));
- }
- }
- return result;
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -239,11 +239,15 @@
- savedException = e;
- }
- }
-- if (ibuf == null && savedException != null) {
-- if (savedException instanceof IOException) {
-- throw (IOException) savedException;
-+ if (ibuf == null) {
-+ if (savedException != null) {
-+ if (savedException instanceof IOException) {
-+ throw (IOException) savedException;
-+ } else {
-+ throw (KrbException) savedException;
-+ }
- } else {
-- throw (KrbException) savedException;
-+ throw new IOException("Cannot get a KDC reply");
- }
- }
- return ibuf;
---- ./jdk/src/share/classes/sun/security/krb5/Realm.java 2013-09-06 11:28:43.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/krb5/Realm.java 2014-07-15 21:49:30.000000000 -0700
-@@ -34,6 +34,7 @@
- import sun.security.krb5.internal.Krb5;
- import sun.security.util.*;
- import java.io.IOException;
-+import java.util.LinkedList;
- import java.util.StringTokenizer;
- import java.util.Vector;
- import java.util.Stack;
-@@ -301,21 +302,25 @@
- }
-
- /**
-- * Parses the [capaths] stanza of the configuration file
-- * for a list of realms to traverse
-- * to obtain credentials from the initiating realm cRealm to
-- * the target realm sRealm.
-- * @param cRealm the initiating realm
-- * @param sRealm the target realm
-- * @returns array of realms
-- * @ throws KrbException
-- */
--
-- /*
-- * parseCapaths works for a capaths organized such that
-- * for a given client realm C there is a tag C that
-- * contains subtags Ci ... Cn that completely define intermediate
-- * realms from C to target T. For example:
-+ * Parses the [capaths] stanza of the configuration file for a
-+ * list of realms to traverse to obtain credentials from the
-+ * initiating realm cRealm to the target realm sRealm.
-+ *
-+ * For a given client realm C there is a tag C in [capaths] whose
-+ * subtag S has a value which is a (possibly partial) path from C
-+ * to S. When the path is partial, it contains only the tail of the
-+ * full path. Values of other subtags will be used to build the full
-+ * path. The value "." means a direct path from C to S. If realm S
-+ * does not appear as a subtag, there is no path defined here.
-+ *
-+ * The implementation ignores all values which equals to C or S, or
-+ * a "." in multiple values, or any duplicated realm names.
-+ *
-+ * When a path value has more than two realms, they can be specified
-+ * with multiple key-value pairs each having a single value, but the
-+ * order must not change.
-+ *
-+ * For example:
- *
- * [capaths]
- * TIVOLI.COM = {
-@@ -324,19 +329,24 @@
- * LDAPCENTRAL.NET = .
- * }
- *
-- * The tag TIVOLI.COM contains subtags IBM.COM, IBM_LDAPCENTRAL.COM
-- * and LDAPCENTRAL.NET that completely define the path from TIVOLI.COM
-- * to IBM.COM (TIVOLI.COM->LADAPCENTRAL.NET->IBM_LDAPCENTRAL.COM->IBM
-- * or TIVOLI.COM->MOONLITE.ORG->IBM.COM).
-- *
-- * A direct path is assumed for an intermediary whose entry is not
-- * "closed" by a "." In the above example, TIVOLI.COM is assumed
-- * to have a direct path to MOONLITE.ORG and MOONLITE.COM
-- * in turn to IBM.COM.
-+ * TIVOLI.COM has a direct path to LDAPCENTRAL.NET, which has a direct
-+ * path to IBM_LDAPCENTRAL.COM. It also has a partial path to IBM.COM
-+ * being "IBM_LDAPCENTRAL.COM MOONLITE.ORG". Merging these info together,
-+ * a full path from TIVOLI.COM to IBM.COM will be
-+ *
-+ * TIVOLI.COM -> LDAPCENTRAL.NET -> IBM_LDAPCENTRAL.COM
-+ * -> IBM_LDAPCENTRAL.COM -> MOONLITE.ORG
-+ *
-+ * Please note the sRealm IBM.COM does not appear in the path.
-+ *
-+ * @param cRealm the initiating realm
-+ * @param sRealm the target realm, not the same as cRealm
-+ * @returns array of realms including at least cRealm as the first
-+ * element, or null if the config does not contain a sub-stanza
-+ * for cRealm in [capaths] or the sub-stanza does not contain
-+ * sRealm as a tag
- */
--
-- private static String[] parseCapaths(String cRealm, String sRealm) throws KrbException {
-- String[] retList = null;
-+ private static String[] parseCapaths(String cRealm, String sRealm) {
-
- Config cfg = null;
- try {
-@@ -358,323 +368,102 @@
- return null;
- }
-
-- String tempTarget = null, tempRealm = null;
-- Stack<String> iStack = new Stack<>();
--
-- /*
-- * The half-established reversed-path, starting from the final target
-- * (sRealm), each item can be connected to by the next one.
-- * Might contains wrong item, if found, a bad track is performed
-- */
-- Vector<String> tempList = new Vector<>(8, 8);
-- tempList.add(sRealm);
--
-- int count = 0; // For debug only
-- tempTarget = sRealm;
--
-- out: do {
-- if (DEBUG) {
-- count++;
-- System.out.println(">>> Realm parseCapaths: loop " +
-- count + ": target=" + tempTarget);
-- }
-+ LinkedList<String> path = new LinkedList<>();
-
-- if (intermediaries != null &&
-- !intermediaries.equals(".") &&
-- !intermediaries.equals(cRealm)) {
-- if (DEBUG) {
-- System.out.println(">>> Realm parseCapaths: loop " +
-- count + ": intermediaries=[" +
-- intermediaries + "]");
-- }
--
-- /*
-- * We have one or more space-separated intermediary realms.
-- * Stack them. A null is always added between intermedies of
-- * different targets. When this null is popped, it means none
-- * of the intermedies for this target is useful (because of
-- * infinite loop), the target is then removed from the partial
-- * tempList, and the next possible intermediary is tried.
-- */
-- iStack.push(null);
-- String[] ints = intermediaries.split("\\s+");
-- for (int i = ints.length-1; i>=0; i--)
-- {
-- tempRealm = ints[i];
-- if (tempRealm.equals(PrincipalName.REALM_COMPONENT_SEPARATOR_STR)) {
-- break out;
-- }
-- if (!tempList.contains(tempRealm)) {
-- iStack.push(tempRealm);
-- if (DEBUG) {
-- System.out.println(">>> Realm parseCapaths: loop " +
-- count +
-- ": pushed realm on to stack: " +
-- tempRealm);
-- }
-- } else if (DEBUG) {
-- System.out.println(">>> Realm parseCapaths: loop " +
-- count +
-- ": ignoring realm: [" +
-- tempRealm + "]");
-- }
-- }
-- } else {
-- if (DEBUG) {
-- System.out.println(">>> Realm parseCapaths: loop " +
-- count +
-- ": no intermediaries");
-- }
-+ String head = sRealm;
-+ while (true) {
-+ String value = cfg.getDefault(head, cRealm);
-+ if (value == null) {
- break;
- }
--
-- /*
-- * Get next intermediary realm from the stack
-- */
--
-- try {
-- while ((tempTarget = iStack.pop()) == null) {
-- tempList.removeElementAt(tempList.size()-1);
-- if (DEBUG) {
-- System.out.println(">>> Realm parseCapaths: backtrack, remove tail");
-- }
-+ String[] more = value.split("\\s+");
-+ boolean changed = false;
-+ for (int i=more.length-1; i>=0; i--) {
-+ if (path.contains(more[i])
-+ || more[i].equals(".")
-+ || more[i].equals(cRealm)
-+ || more[i].equals(sRealm)
-+ || more[i].equals(head)) {
-+ // Ignore invalid values
-+ continue;
- }
-- } catch (EmptyStackException exc) {
-- tempTarget = null;
-- }
--
-- if (tempTarget == null) {
-- /*
-- * No more intermediaries. We're done.
-- */
-- break;
-- }
--
-- tempList.add(tempTarget);
--
-- if (DEBUG) {
-- System.out.println(">>> Realm parseCapaths: loop " + count +
-- ": added intermediary to list: " +
-- tempTarget);
-- }
--
-- intermediaries = cfg.getDefault(tempTarget, cRealm);
--
-- } while (true);
--
-- if (tempList.isEmpty()) {
-- return null;
-- }
--
-- // From (SREALM, T1, T2) to (CREALM, T2, T1)
-- retList = new String[tempList.size()];
-- retList[0] = cRealm;
-- for (int i=1; i<tempList.size(); i++) {
-- retList[i] = tempList.elementAt(tempList.size()-i);
-- }
--
-- if (DEBUG && retList != null) {
-- for (int i = 0; i < retList.length; i++) {
-- System.out.println(">>> Realm parseCapaths [" + i +
-- "]=" + retList[i]);
-+ changed = true;
-+ path.addFirst(more[i]);
- }
-+ if (!changed) break;
-+ head = path.getFirst();
- }
--
-- return retList;
-- }
-+ path.addFirst(cRealm);
-+ return path.toArray(new String[path.size()]);
-+ }
-
- /**
- * Build a list of realm that can be traversed
- * to obtain credentials from the initiating realm cRealm
- * for a service in the target realm sRealm.
- * @param cRealm the initiating realm
-- * @param sRealm the target realm
-- * @returns array of realms
-- * @throws KrbException
-+ * @param sRealm the target realm, not the same as cRealm
-+ * @returns array of realms including cRealm as the first element
- */
-- private static String[] parseHierarchy(String cRealm, String sRealm)
-- throws KrbException
-- {
-- String[] retList = null;
--
-- // Parse the components and determine common part, if any.
-+ private static String[] parseHierarchy(String cRealm, String sRealm) {
-
-- String[] cComponents = null;
-- String[] sComponents = null;
-+ String[] cComponents = cRealm.split("\\.");
-+ String[] sComponents = sRealm.split("\\.");
-
-- StringTokenizer strTok =
-- new StringTokenizer(cRealm,
-- PrincipalName.REALM_COMPONENT_SEPARATOR_STR);
-+ int cPos = cComponents.length;
-+ int sPos = sComponents.length;
-
-- // Parse cRealm
--
-- int cCount = strTok.countTokens();
-- cComponents = new String[cCount];
--
-- for (cCount = 0; strTok.hasMoreTokens(); cCount++) {
-- cComponents[cCount] = strTok.nextToken();
-- }
--
-- if (DEBUG) {
-- System.out.println(">>> Realm parseHierarchy: cRealm has " +
-- cCount + " components:");
-- int j = 0;
-- while (j < cCount) {
-- System.out.println(">>> Realm parseHierarchy: " +
-- "cComponents["+j+"]=" + cComponents[j++]);
-- }
-- }
--
-- // Parse sRealm
--
-- strTok = new StringTokenizer(sRealm,
-- PrincipalName.REALM_COMPONENT_SEPARATOR_STR);
--
-- int sCount = strTok.countTokens();
-- sComponents = new String[sCount];
--
-- for (sCount = 0; strTok.hasMoreTokens(); sCount++) {
-- sComponents[sCount] = strTok.nextToken();
-- }
--
-- if (DEBUG) {
-- System.out.println(">>> Realm parseHierarchy: sRealm has " +
-- sCount + " components:");
-- int j = 0;
-- while (j < sCount) {
-- System.out.println(">>> Realm parseHierarchy: sComponents["+j+
-- "]=" + sComponents[j++]);
-- }
-+ boolean hasCommon = false;
-+ for (sPos--, cPos--; sPos >=0 && cPos >= 0 &&
-+ sComponents[sPos].equals(cComponents[cPos]);
-+ sPos--, cPos--) {
-+ hasCommon = true;
- }
-
-- // Determine common components, if any.
-+ // For those with common components:
-+ // length pos
-+ // SITES1.SALES.EXAMPLE.COM 4 1
-+ // EVERYWHERE.EXAMPLE.COM 3 0
-
-- int commonComponents = 0;
-+ // For those without common components:
-+ // length pos
-+ // DEVEL.EXAMPLE.COM 3 2
-+ // PROD.EXAMPLE.ORG 3 2
-
-- //while (sCount > 0 && cCount > 0 &&
-- // sComponents[--sCount].equals(cComponents[--cCount]))
-+ LinkedList<String> path = new LinkedList<>();
-
-- for (sCount--, cCount--; sCount >=0 && cCount >= 0 &&
-- sComponents[sCount].equals(cComponents[cCount]);
-- sCount--, cCount--) {
-- commonComponents++;
-+ // Un-common ones for client side
-+ for (int i=0; i<=cPos; i++) {
-+ path.addLast(subStringFrom(cComponents, i));
- }
-
-- int cCommonStart = -1;
-- int sCommonStart = -1;
--
-- int links = 0;
--
-- if (commonComponents > 0) {
-- sCommonStart = sCount+1;
-- cCommonStart = cCount+1;
--
-- // components from common to ancestors
-- links += sCommonStart;
-- links += cCommonStart;
-- } else {
-- links++;
-+ // Common one
-+ if (hasCommon) {
-+ path.addLast(subStringFrom(cComponents, cPos+1));
- }
-
-- if (DEBUG) {
-- if (commonComponents > 0) {
-- System.out.println(">>> Realm parseHierarchy: " +
-- commonComponents + " common component" +
-- (commonComponents > 1 ? "s" : " "));
--
-- System.out.println(">>> Realm parseHierarchy: common part "
-- +
-- "in cRealm (starts at index " +
-- cCommonStart + ")");
-- System.out.println(">>> Realm parseHierarchy: common part in sRealm (starts at index " +
-- sCommonStart + ")");
--
--
-- String commonPart = substring(cRealm, cCommonStart);
-- System.out.println(">>> Realm parseHierarchy: common part in cRealm=" +
-- commonPart);
--
-- commonPart = substring(sRealm, sCommonStart);
-- System.out.println(">>> Realm parseHierarchy: common part in sRealm=" +
-- commonPart);
--
-- } else
-- System.out.println(">>> Realm parseHierarchy: no common part");
-- }
--
-- if (DEBUG) {
-- System.out.println(">>> Realm parseHierarchy: total links=" + links);
-+ // Un-common ones for server side
-+ for (int i=sPos; i>=0; i--) {
-+ path.addLast(subStringFrom(sComponents, i));
- }
-
-- retList = new String[links];
--
-- retList[0] = new String(cRealm);
-+ // Remove sRealm from path. Note that it might be added at last loop
-+ // or as a common component, if sRealm is a parent of cRealm
-+ path.removeLast();
-
-- if (DEBUG) {
-- System.out.println(">>> Realm parseHierarchy A: retList[0]=" +
-- retList[0]);
-- }
--
-- // For an initiator realm A.B.C.D.COM,
-- // build a list krbtgt/B.C.D.COM@A.B.C.D.COM up to the common part,
-- // ie the issuer realm is the immediate descendant
-- // of the target realm.
--
-- String cTemp = null, sTemp = null;
-- int i;
-- for (i = 1, cCount = 0; i < links && cCount < cCommonStart; cCount++) {
-- sTemp = substring(cRealm, cCount+1);
-- //cTemp = substring(cRealm, cCount);
-- retList[i++] = new String(sTemp);
--
-- if (DEBUG) {
-- System.out.println(">>> Realm parseHierarchy B: retList[" +
-- (i-1) +"]="+retList[i-1]);
-- }
-- }
--
--
-- for (sCount = sCommonStart; i < links && sCount - 1 > 0; sCount--) {
-- sTemp = substring(sRealm, sCount-1);
-- //cTemp = substring(sRealm, sCount);
-- retList[i++] = new String(sTemp);
-- if (DEBUG) {
-- System.out.println(">>> Realm parseHierarchy D: retList[" +
-- (i-1) +"]="+retList[i-1]);
-- }
-- }
--
-- return retList;
-+ return path.toArray(new String[path.size()]);
- }
-
-- private static String substring(String realm, int componentIndex)
-- {
-- int i = 0 , j = 0, len = realm.length();
--
-- while(i < len && j != componentIndex) {
-- if (realm.charAt(i++) != PrincipalName.REALM_COMPONENT_SEPARATOR)
-- continue;
-- j++;
-- }
--
-- return realm.substring(i);
-- }
--
-- static int getRandIndex(int arraySize) {
-- return (int)(Math.random() * 16384.0) % arraySize;
-- }
--
-- static void printNames(String[] names) {
-- if (names == null || names.length == 0)
-- return;
--
-- int len = names.length;
-- int i = 0;
-- System.out.println("List length = " + len);
-- while (i < names.length) {
-- System.out.println("["+ i +"]=" + names[i]);
-- i++;
-+ /**
-+ * Creates a realm name using components from the given postion.
-+ * For example, subStringFrom({"A", "B", "C"}, 1) is "B.C".
-+ */
-+ private static String subStringFrom(String[] components, int from) {
-+ StringBuilder sb = new StringBuilder();
-+ for (int i=from; i<components.length; i++) {
-+ if (sb.length() != 0) sb.append('.');
-+ sb.append(components[i]);
- }
-+ return sb.toString();
- }
--
- }
---- ./jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java 2013-09-06 11:28:43.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java 2014-07-15 21:49:30.000000000 -0700
-@@ -155,13 +155,11 @@
- }
-
- /*
-- * No tgt found. Try to get one for a
-- * realm as close to the target as possible.
-- * That means traversing the realms list backwards.
-+ * No tgt found. Let's go thru the realms list one by one.
- */
-
-- for (newTgt = null, k = realms.length - 1;
-- newTgt == null && k > i; k--)
-+ for (newTgt = null, k = i+1;
-+ newTgt == null && k < realms.length; k++)
- {
-
- tempService = new ServiceName(
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -31,6 +31,8 @@
-
- package sun.security.krb5.internal;
-
-+import sun.misc.IOUtils;
-+
- import java.io.*;
- import java.net.*;
-
-@@ -102,17 +104,15 @@
- return null;
- }
-
-- byte data[] = new byte[len];
-- count = readFully(data, len);
-- if (count != len) {
-+ try {
-+ return IOUtils.readFully(in, len, true);
-+ } catch (IOException ioe) {
- if (Krb5.DEBUG) {
- System.out.println(
- ">>>DEBUG: TCPClient could not read complete packet (" +
- len + "/" + count + ")");
- }
- return null;
-- } else {
-- return data;
- }
- }
-
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1996, 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
-@@ -304,17 +304,6 @@
- return encodedKey.clone();
- }
-
-- /*
-- * Returns a printable representation of the key
-- */
-- public String toString ()
-- {
-- HexDumpEncoder encoder = new HexDumpEncoder ();
--
-- return "algorithm = " + algid.toString ()
-- + ", unparsed keybits = \n" + encoder.encodeBuffer (key);
-- }
--
- /**
- * 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 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, 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
-@@ -542,27 +542,6 @@
- fetchValues();
- return coeff;
- }
-- public String toString() {
-- fetchValues();
-- StringBuilder sb = new StringBuilder(super.toString());
-- sb.append("\n modulus: ");
-- sb.append(n);
-- sb.append("\n public exponent: ");
-- sb.append(e);
-- sb.append("\n private exponent: ");
-- sb.append(d);
-- sb.append("\n prime p: ");
-- sb.append(p);
-- sb.append("\n prime q: ");
-- sb.append(q);
-- sb.append("\n prime exponent p: ");
-- sb.append(pe);
-- sb.append("\n prime exponent q: ");
-- sb.append(qe);
-- sb.append("\n crt coefficient: ");
-- sb.append(coeff);
-- return sb.toString();
-- }
- }
-
- // RSA non-CRT private key
-@@ -616,15 +595,6 @@
- fetchValues();
- return d;
- }
-- public String toString() {
-- fetchValues();
-- StringBuilder sb = new StringBuilder(super.toString());
-- sb.append("\n modulus: ");
-- sb.append(n);
-- sb.append("\n private exponent: ");
-- sb.append(d);
-- return sb.toString();
-- }
- }
-
- private static final class P11RSAPublicKey extends P11Key
-@@ -794,11 +764,6 @@
- fetchValues();
- return params;
- }
-- public String toString() {
-- fetchValues();
-- return super.toString() + "\n x: " + x + "\n p: " + params.getP()
-- + "\n q: " + params.getQ() + "\n g: " + params.getG();
-- }
- }
-
- private static final class P11DHPrivateKey extends P11Key
-@@ -856,11 +821,6 @@
- fetchValues();
- return params;
- }
-- public String toString() {
-- fetchValues();
-- return super.toString() + "\n x: " + x + "\n p: " + params.getP()
-- + "\n g: " + params.getG();
-- }
- }
-
- private static final class P11DHPublicKey extends P11Key
-@@ -977,12 +937,6 @@
- fetchValues();
- return params;
- }
-- public String toString() {
-- fetchValues();
-- return super.toString()
-- + "\n private value: " + s
-- + "\n parameters: " + params;
-- }
- }
-
- 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-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, 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
-@@ -330,7 +330,7 @@
- // as here we always retrieve the CKA_VALUE even for tokens
- // that do not have that bug.
- byte[] keyBytes = key.getEncoded();
-- byte[] newBytes = P11Util.trimZeroes(keyBytes);
-+ byte[] newBytes = KeyUtil.trimZeroes(keyBytes);
- if (keyBytes != newBytes) {
- 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-10-28 20:19:48.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, 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,8 @@
- import static sun.security.pkcs11.TemplateManager.*;
- import sun.security.pkcs11.wrapper.*;
- import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
-+import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
-+import sun.security.util.KeyUtil;
-
- /**
- * RSA Cipher implementation class. We currently only support
-@@ -102,6 +104,12 @@
- // maximum output size. this is the length of the key
- private int outputSize;
-
-+ // cipher parameter for TLS RSA premaster secret
-+ private AlgorithmParameterSpec spec = null;
-+
-+ // the source of randomness
-+ private SecureRandom random;
-+
- P11RSACipher(Token token, String algorithm, long mechanism)
- throws PKCS11Exception {
- super();
-@@ -165,8 +173,12 @@
- AlgorithmParameterSpec params, SecureRandom random)
- throws InvalidKeyException, InvalidAlgorithmParameterException {
- if (params != null) {
-- throw new InvalidAlgorithmParameterException
-- ("Parameters not supported");
-+ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
-+ throw new InvalidAlgorithmParameterException(
-+ "Parameters not supported");
-+ }
-+ spec = params;
-+ this.random = random; // for TLS RSA premaster secret
- }
- implInit(opmode, key);
- }
-@@ -176,8 +188,8 @@
- SecureRandom random)
- throws InvalidKeyException, InvalidAlgorithmParameterException {
- if (params != null) {
-- throw new InvalidAlgorithmParameterException
-- ("Parameters not supported");
-+ throw new InvalidAlgorithmParameterException(
-+ "Parameters not supported");
- }
- implInit(opmode, key);
- }
-@@ -451,46 +463,103 @@
- // see JCE spec
- protected Key engineUnwrap(byte[] wrappedKey, String algorithm,
- int type) throws InvalidKeyException, NoSuchAlgorithmException {
-- if (algorithm.equals("TlsRsaPremasterSecret")) {
-- // the instance variable "session" has been initialized for
-- // decrypt mode, so use a local variable instead.
-+
-+ boolean isTlsRsaPremasterSecret =
-+ algorithm.equals("TlsRsaPremasterSecret");
-+ Exception failover = null;
-+
-+ SecureRandom secureRandom = random;
-+ if (secureRandom == null && isTlsRsaPremasterSecret) {
-+ secureRandom = new SecureRandom();
-+ }
-+
-+ // Should C_Unwrap be preferred for non-TLS RSA premaster secret?
-+ if (token.supportsRawSecretKeyImport()) {
-+ // XXX implement unwrap using C_Unwrap() for all keys
-+ implInit(Cipher.DECRYPT_MODE, p11Key);
-+ if (wrappedKey.length > maxInputSize) {
-+ throw new InvalidKeyException("Key is too long for unwrapping");
-+ }
-+
-+ byte[] encoded = null;
-+ implUpdate(wrappedKey, 0, wrappedKey.length);
-+ try {
-+ encoded = doFinal();
-+ } catch (BadPaddingException e) {
-+ if (isTlsRsaPremasterSecret) {
-+ failover = e;
-+ } else {
-+ throw new InvalidKeyException("Unwrapping failed", e);
-+ }
-+ } catch (IllegalBlockSizeException e) {
-+ // should not occur, handled with length check above
-+ throw new InvalidKeyException("Unwrapping failed", e);
-+ }
-+
-+ if (isTlsRsaPremasterSecret) {
-+ if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) {
-+ throw new IllegalStateException(
-+ "No TlsRsaPremasterSecretParameterSpec specified");
-+ }
-+
-+ // polish the TLS premaster secret
-+ TlsRsaPremasterSecretParameterSpec psps =
-+ (TlsRsaPremasterSecretParameterSpec)spec;
-+ encoded = KeyUtil.checkTlsPreMasterSecretKey(
-+ psps.getClientVersion(), psps.getServerVersion(),
-+ secureRandom, encoded, (failover != null));
-+ }
-+
-+ return ConstructKeys.constructKey(encoded, algorithm, type);
-+ } else {
- Session s = null;
-+ SecretKey secretKey = null;
- try {
-- s = token.getObjSession();
-- long keyType = CKK_GENERIC_SECRET;
-- CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] {
-- new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY),
-- new CK_ATTRIBUTE(CKA_KEY_TYPE, keyType),
-- };
-- attributes = token.getAttributes
-- (O_IMPORT, CKO_SECRET_KEY, keyType, attributes);
-- long keyID = token.p11.C_UnwrapKey(s.id(),
-- new CK_MECHANISM(mechanism), p11Key.keyID, wrappedKey,
-- attributes);
-- return P11Key.secretKey(s, keyID, algorithm, 48 << 3,
-- attributes);
-- } catch (PKCS11Exception e) {
-- throw new InvalidKeyException("unwrap() failed", e);
-+ try {
-+ s = token.getObjSession();
-+ long keyType = CKK_GENERIC_SECRET;
-+ CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] {
-+ new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY),
-+ new CK_ATTRIBUTE(CKA_KEY_TYPE, keyType),
-+ };
-+ attributes = token.getAttributes(
-+ O_IMPORT, CKO_SECRET_KEY, keyType, attributes);
-+ long keyID = token.p11.C_UnwrapKey(s.id(),
-+ new CK_MECHANISM(mechanism), p11Key.keyID,
-+ wrappedKey, attributes);
-+ secretKey = P11Key.secretKey(s, keyID,
-+ algorithm, 48 << 3, attributes);
-+ } catch (PKCS11Exception e) {
-+ if (isTlsRsaPremasterSecret) {
-+ failover = e;
-+ } else {
-+ throw new InvalidKeyException("unwrap() failed", e);
-+ }
-+ }
-+
-+ if (isTlsRsaPremasterSecret) {
-+ byte[] replacer = new byte[48];
-+ if (failover == null) {
-+ // Does smart compiler dispose this operation?
-+ secureRandom.nextBytes(replacer);
-+ }
-+
-+ TlsRsaPremasterSecretParameterSpec psps =
-+ (TlsRsaPremasterSecretParameterSpec)spec;
-+
-+ // Please use the tricky failover and replacer byte array
-+ // as the parameters so that smart compiler won't dispose
-+ // the unused variable .
-+ secretKey = polishPreMasterSecretKey(token, s,
-+ failover, replacer, secretKey,
-+ psps.getClientVersion(), psps.getServerVersion());
-+ }
-+
-+ return secretKey;
- } finally {
- token.releaseSession(s);
- }
- }
-- // XXX implement unwrap using C_Unwrap() for all keys
-- implInit(Cipher.DECRYPT_MODE, p11Key);
-- if (wrappedKey.length > maxInputSize) {
-- throw new InvalidKeyException("Key is too long for unwrapping");
-- }
-- implUpdate(wrappedKey, 0, wrappedKey.length);
-- try {
-- byte[] encoded = doFinal();
-- return ConstructKeys.constructKey(encoded, algorithm, type);
-- } catch (BadPaddingException e) {
-- // should not occur
-- throw new InvalidKeyException("Unwrapping failed", e);
-- } catch (IllegalBlockSizeException e) {
-- // should not occur, handled with length check above
-- throw new InvalidKeyException("Unwrapping failed", e);
-- }
- }
-
- // see JCE spec
-@@ -498,6 +567,34 @@
- int n = P11KeyFactory.convertKey(token, key, algorithm).length();
- return n;
- }
-+
-+ private static SecretKey polishPreMasterSecretKey(
-+ Token token, Session session,
-+ Exception failover, byte[] replacer, SecretKey secretKey,
-+ int clientVersion, int serverVersion) {
-+
-+ if (failover != null) {
-+ CK_VERSION version = new CK_VERSION(
-+ (clientVersion >>> 8) & 0xFF, clientVersion & 0xFF);
-+ try {
-+ CK_ATTRIBUTE[] attributes = token.getAttributes(
-+ O_GENERATE, CKO_SECRET_KEY,
-+ CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
-+ long keyID = token.p11.C_GenerateKey(session.id(),
-+ // new CK_MECHANISM(CKM_TLS_PRE_MASTER_KEY_GEN, version),
-+ new CK_MECHANISM(CKM_SSL3_PRE_MASTER_KEY_GEN, version),
-+ attributes);
-+ return P11Key.secretKey(session,
-+ keyID, "TlsRsaPremasterSecret", 48 << 3, attributes);
-+ } catch (PKCS11Exception e) {
-+ throw new ProviderException(
-+ "Could not generate premaster secret", e);
-+ }
-+ }
-+
-+ return secretKey;
-+ }
-+
- }
-
- final class ConstructKeys {
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, 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
-@@ -41,6 +41,7 @@
-
- import sun.security.pkcs11.wrapper.*;
- import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
-+import sun.security.util.KeyUtil;
-
- /**
- * Signature implementation class. This class currently supports the
-@@ -687,8 +688,8 @@
- BigInteger r = values[0].getPositiveBigInteger();
- BigInteger s = values[1].getPositiveBigInteger();
- // trim leading zeroes
-- byte[] br = P11Util.trimZeroes(r.toByteArray());
-- byte[] bs = P11Util.trimZeroes(s.toByteArray());
-+ byte[] br = KeyUtil.trimZeroes(r.toByteArray());
-+ byte[] bs = KeyUtil.trimZeroes(s.toByteArray());
- int k = Math.max(br.length, bs.length);
- // 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-10-28 20:19:48.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2007, 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
-@@ -73,7 +73,7 @@
-
- protected void engineInit(AlgorithmParameterSpec params,
- SecureRandom random) throws InvalidAlgorithmParameterException {
-- if (params instanceof TlsRsaPremasterSecretParameterSpec == false) {
-+ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
- throw new InvalidAlgorithmParameterException(MSG);
- }
- this.spec = (TlsRsaPremasterSecretParameterSpec)params;
-@@ -83,25 +83,29 @@
- throw new InvalidParameterException(MSG);
- }
-
-+ // Only can be used in client side to generate TLS RSA premaster secret.
- protected SecretKey engineGenerateKey() {
- if (spec == null) {
- throw new IllegalStateException
- ("TlsRsaPremasterSecretGenerator must be initialized");
- }
-- CK_VERSION version =
-- new CK_VERSION(spec.getMajorVersion(), spec.getMinorVersion());
-+
-+ CK_VERSION version = new CK_VERSION(
-+ spec.getMajorVersion(), spec.getMinorVersion());
- Session session = null;
- try {
- session = token.getObjSession();
-- CK_ATTRIBUTE[] attributes = token.getAttributes
-- (O_GENERATE, CKO_SECRET_KEY, CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
-- long keyID = token.p11.C_GenerateKey
-- (session.id(), new CK_MECHANISM(mechanism, version), attributes);
-- SecretKey key = P11Key.secretKey
-- (session, keyID, "TlsRsaPremasterSecret", 48 << 3, attributes);
-+ CK_ATTRIBUTE[] attributes = token.getAttributes(
-+ O_GENERATE, CKO_SECRET_KEY,
-+ CKK_GENERIC_SECRET, new CK_ATTRIBUTE[0]);
-+ long keyID = token.p11.C_GenerateKey(session.id(),
-+ new CK_MECHANISM(mechanism, version), attributes);
-+ SecretKey key = P11Key.secretKey(session,
-+ keyID, "TlsRsaPremasterSecret", 48 << 3, attributes);
- return key;
- } catch (PKCS11Exception e) {
-- throw new ProviderException("Could not generate premaster secret", e);
-+ throw new ProviderException(
-+ "Could not generate premaster secret", e);
- } finally {
- token.releaseSession(session);
- }
---- ./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-07-15 21:49:31.000000000 -0700
-@@ -131,20 +131,6 @@
- return b;
- }
-
-- // trim leading (most significant) zeroes from the result
-- static byte[] trimZeroes(byte[] b) {
-- int i = 0;
-- while ((i < b.length - 1) && (b[i] == 0)) {
-- i++;
-- }
-- if (i == 0) {
-- return b;
-- }
-- byte[] t = new byte[b.length - i];
-- System.arraycopy(b, i, t, 0, t.length);
-- return t;
-- }
--
- public static byte[] getMagnitude(BigInteger bi) {
- byte[] b = bi.toByteArray();
- if ((b.length > 1) && (b[0] == 0)) {
---- ./jdk/src/share/classes/sun/security/pkcs11/Token.java 2013-09-06 11:28:44.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/pkcs11/Token.java 2014-10-28 20:19:48.000000000 -0700
-@@ -35,6 +35,7 @@
- import sun.security.jca.JCAUtil;
-
- import sun.security.pkcs11.wrapper.*;
-+import static sun.security.pkcs11.TemplateManager.*;
- import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
-
- /**
-@@ -121,6 +122,9 @@
- private final static CK_MECHANISM_INFO INVALID_MECH =
- new CK_MECHANISM_INFO(0, 0, 0);
-
-+ // flag indicating whether the token supports raw secret key material import
-+ private Boolean supportsRawSecretKeyImport;
-+
- Token(SunPKCS11 provider) throws PKCS11Exception {
- this.provider = provider;
- this.removable = provider.removable;
-@@ -159,6 +163,36 @@
- return writeProtected;
- }
-
-+ // return whether the token supports raw secret key material import
-+ boolean supportsRawSecretKeyImport() {
-+ if (supportsRawSecretKeyImport == null) {
-+ SecureRandom random = JCAUtil.getSecureRandom();
-+ byte[] encoded = new byte[48];
-+ random.nextBytes(encoded);
-+
-+ CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[3];
-+ attributes[0] = new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY);
-+ attributes[1] = new CK_ATTRIBUTE(CKA_KEY_TYPE, CKK_GENERIC_SECRET);
-+ attributes[2] = new CK_ATTRIBUTE(CKA_VALUE, encoded);
-+
-+ Session session = null;
-+ try {
-+ attributes = getAttributes(O_IMPORT,
-+ CKO_SECRET_KEY, CKK_GENERIC_SECRET, attributes);
-+ session = getObjSession();
-+ long keyID = p11.C_CreateObject(session.id(), attributes);
-+
-+ supportsRawSecretKeyImport = Boolean.TRUE;
-+ } catch (PKCS11Exception e) {
-+ supportsRawSecretKeyImport = Boolean.FALSE;
-+ } finally {
-+ releaseSession(session);
-+ }
-+ }
-+
-+ return supportsRawSecretKeyImport;
-+ }
-+
- // return whether we are logged in
- // uses cached result if current. session is optional and may be null
- boolean isLoggedIn(Session session) throws PKCS11Exception {
---- ./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-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -43,10 +43,8 @@
- * These are the only platforms we currently support, but other optimized
- * variants could be added as needed.
- *
-- * NOTE that because this code performs unchecked direct memory access, it
-- * MUST be restricted to trusted code. It is imperative that the caller protects
-- * against out of bounds memory access by performing the necessary bounds
-- * checks before calling methods in this class.
-+ * NOTE that ArrayIndexOutOfBoundsException will be thrown if the bounds checks
-+ * failed.
- *
- * This class may also be helpful in improving the performance of the
- * crypto code in the SunJCE provider. However, for now it is only accessible by
-@@ -103,6 +101,10 @@
- * byte[] to int[] conversion, little endian byte order.
- */
- static void b2iLittle(byte[] in, int inOfs, int[] out, int outOfs, int len) {
-+ if ((inOfs < 0) || ((in.length - inOfs) < len) ||
-+ (outOfs < 0) || ((out.length - outOfs) < len/4)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- inOfs += byteArrayOfs;
- len += inOfs;
-@@ -131,6 +133,10 @@
-
- // Special optimization of b2iLittle(in, inOfs, out, 0, 64)
- static void b2iLittle64(byte[] in, int inOfs, int[] out) {
-+ if ((inOfs < 0) || ((in.length - inOfs) < 64) ||
-+ (out.length < 16)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- inOfs += byteArrayOfs;
- out[ 0] = unsafe.getInt(in, (long)(inOfs ));
-@@ -176,6 +182,10 @@
- * int[] to byte[] conversion, little endian byte order.
- */
- static void i2bLittle(int[] in, int inOfs, byte[] out, int outOfs, int len) {
-+ if ((inOfs < 0) || ((in.length - inOfs) < len/4) ||
-+ (outOfs < 0) || ((out.length - outOfs) < len)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- outOfs += byteArrayOfs;
- len += outOfs;
-@@ -204,6 +214,9 @@
-
- // Store one 32-bit value into out[outOfs..outOfs+3] in little endian order.
- static void i2bLittle4(int val, byte[] out, int outOfs) {
-+ if ((outOfs < 0) || ((out.length - outOfs) < 4)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- unsafe.putInt(out, (long)(byteArrayOfs + outOfs), val);
- } else if (bigEndian && ((outOfs & 3) == 0)) {
-@@ -220,6 +233,10 @@
- * byte[] to int[] conversion, big endian byte order.
- */
- static void b2iBig(byte[] in, int inOfs, int[] out, int outOfs, int len) {
-+ if ((inOfs < 0) || ((in.length - inOfs) < len) ||
-+ (outOfs < 0) || ((out.length - outOfs) < len/4)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- inOfs += byteArrayOfs;
- len += inOfs;
-@@ -248,6 +265,10 @@
-
- // Special optimization of b2iBig(in, inOfs, out, 0, 64)
- static void b2iBig64(byte[] in, int inOfs, int[] out) {
-+ if ((inOfs < 0) || ((in.length - inOfs) < 64) ||
-+ (out.length < 16)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- inOfs += byteArrayOfs;
- out[ 0] = reverseBytes(unsafe.getInt(in, (long)(inOfs )));
-@@ -293,6 +314,10 @@
- * int[] to byte[] conversion, big endian byte order.
- */
- static void i2bBig(int[] in, int inOfs, byte[] out, int outOfs, int len) {
-+ if ((inOfs < 0) || ((in.length - inOfs) < len/4) ||
-+ (outOfs < 0) || ((out.length - outOfs) < len)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- outOfs += byteArrayOfs;
- len += outOfs;
-@@ -321,6 +346,9 @@
-
- // Store one 32-bit value into out[outOfs..outOfs+3] in big endian order.
- static void i2bBig4(int val, byte[] out, int outOfs) {
-+ if ((outOfs < 0) || ((out.length - outOfs) < 4)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- unsafe.putInt(out, (long)(byteArrayOfs + outOfs), reverseBytes(val));
- } else if (bigEndian && ((outOfs & 3) == 0)) {
-@@ -337,6 +365,10 @@
- * byte[] to long[] conversion, big endian byte order.
- */
- static void b2lBig(byte[] in, int inOfs, long[] out, int outOfs, int len) {
-+ if ((inOfs < 0) || ((in.length - inOfs) < len) ||
-+ (outOfs < 0) || ((out.length - outOfs) < len/8)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- inOfs += byteArrayOfs;
- len += inOfs;
-@@ -378,6 +410,10 @@
-
- // Special optimization of b2lBig(in, inOfs, out, 0, 128)
- static void b2lBig128(byte[] in, int inOfs, long[] out) {
-+ if ((inOfs < 0) || ((in.length - inOfs) < 128) ||
-+ (out.length < 16)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- if (littleEndianUnaligned) {
- inOfs += byteArrayOfs;
- out[ 0] = reverseBytes(unsafe.getLong(in, (long)(inOfs )));
-@@ -406,6 +442,10 @@
- * long[] to byte[] conversion, big endian byte order.
- */
- static void l2bBig(long[] in, int inOfs, byte[] out, int outOfs, int len) {
-+ if ((inOfs < 0) || ((in.length - inOfs) < len/8) ||
-+ (outOfs < 0) || ((out.length - outOfs) < len)) {
-+ throw new ArrayIndexOutOfBoundsException();
-+ }
- len += outOfs;
- while (outOfs < len) {
- long i = in[inOfs++];
-@@ -419,5 +459,4 @@
- out[outOfs++] = (byte)(i );
- }
- }
--
- }
---- ./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 2014-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1996, 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
-@@ -142,11 +142,6 @@
- }
- }
-
-- public String toString() {
-- return "Sun DSA Private Key \nparameters:" + algid + "\nx: " +
-- Debug.toHexString(x) + "\n";
-- }
--
- 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-07-15 21:49:31.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-07-15 21:49:31.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-07-15 21:49:31.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/RSACore.java 2013-09-06 11:28:45.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/rsa/RSACore.java 2014-07-15 21:54:45.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
-@@ -50,6 +50,15 @@
- */
- public final class RSACore {
-
-+ // globally enable/disable use of blinding
-+ private final static boolean ENABLE_BLINDING = true;
-+
-+ // cache for blinding parameters. Map<BigInteger, BlindingParameters>
-+ // use a weak hashmap so that cached values are automatically cleared
-+ // when the modulus is GC'ed
-+ private final static Map<BigInteger, BlindingParameters>
-+ blindingCache = new WeakHashMap<>();
-+
- private RSACore() {
- // empty
- }
-@@ -100,12 +109,12 @@
- if (key instanceof RSAPrivateCrtKey) {
- return crtCrypt(msg, (RSAPrivateCrtKey)key);
- } else {
-- return crypt(msg, key.getModulus(), key.getPrivateExponent());
-+ return priCrypt(msg, key.getModulus(), key.getPrivateExponent());
- }
- }
-
- /**
-- * RSA public key ops and non-CRT private key ops. Simple modPow().
-+ * RSA public key ops. Simple modPow().
- */
- private static byte[] crypt(byte[] msg, BigInteger n, BigInteger exp)
- throws BadPaddingException {
-@@ -115,22 +124,29 @@
- }
-
- /**
-+ * RSA non-CRT private key operations.
-+ */
-+ private static byte[] priCrypt(byte[] msg, BigInteger n, BigInteger exp)
-+ throws BadPaddingException {
-+
-+ BigInteger c = parseMsg(msg, n);
-+ BlindingRandomPair brp = null;
-+ BigInteger m;
-+ if (ENABLE_BLINDING) {
-+ brp = getBlindingRandomPair(null, exp, n);
-+ c = c.multiply(brp.u).mod(n);
-+ m = c.modPow(exp, n);
-+ m = m.multiply(brp.v).mod(n);
-+ } else {
-+ m = c.modPow(exp, n);
-+ }
-+
-+ return toByteArray(m, getByteLength(n));
-+ }
-+
-+ /**
- * RSA private key operations with CRT. Algorithm and variable naming
- * are taken from PKCS#1 v2.1, section 5.1.2.
-- *
-- * The only difference is the addition of blinding to twart timing attacks.
-- * This is described in the RSA Bulletin#2 (Jan 96) among other places.
-- * This means instead of implementing RSA as
-- * m = c ^ d mod n (or RSA in CRT variant)
-- * we do
-- * r = random(0, n-1)
-- * c' = c * r^e mod n
-- * m' = c' ^ d mod n (or RSA in CRT variant)
-- * m = m' * r^-1 mod n (where r^-1 is the modular inverse of r mod n)
-- * This works because r^(e*d) * r^-1 = r * r^-1 = 1 (all mod n)
-- *
-- * We do not generate new blinding parameters for each operation but reuse
-- * them BLINDING_MAX_REUSE times (see definition below).
- */
- private static byte[] crtCrypt(byte[] msg, RSAPrivateCrtKey key)
- throws BadPaddingException {
-@@ -141,13 +157,13 @@
- BigInteger dP = key.getPrimeExponentP();
- BigInteger dQ = key.getPrimeExponentQ();
- BigInteger qInv = key.getCrtCoefficient();
-+ BigInteger e = key.getPublicExponent();
-+ BigInteger d = key.getPrivateExponent();
-
-- BlindingParameters params;
-+ BlindingRandomPair brp;
- if (ENABLE_BLINDING) {
-- params = getBlindingParameters(key);
-- c = c.multiply(params.re).mod(n);
-- } else {
-- params = null;
-+ brp = getBlindingRandomPair(e, d, n);
-+ c = c.multiply(brp.u).mod(n);
- }
-
- // m1 = c ^ dP mod p
-@@ -165,8 +181,8 @@
- // m = m2 + q * h
- BigInteger m = h.multiply(q).add(m2);
-
-- if (params != null) {
-- m = m.multiply(params.rInv).mod(n);
-+ if (ENABLE_BLINDING) {
-+ m = m.multiply(brp.v).mod(n);
- }
-
- return toByteArray(m, getByteLength(n));
-@@ -208,82 +224,221 @@
- return t;
- }
-
-- // globally enable/disable use of blinding
-- private final static boolean ENABLE_BLINDING = true;
--
-- // maximum number of times that we will use a set of blinding parameters
-- // value suggested by Paul Kocher (quoted by NSS)
-- private final static int BLINDING_MAX_REUSE = 50;
--
-- // cache for blinding parameters. Map<BigInteger, BlindingParameters>
-- // use a weak hashmap so that cached values are automatically cleared
-- // when the modulus is GC'ed
-- private final static Map<BigInteger, BlindingParameters> blindingCache =
-- new WeakHashMap<>();
-+ /**
-+ * Parameters (u,v) for RSA Blinding. This is described in the RSA
-+ * Bulletin#2 (Jan 96) and other places:
-+ *
-+ * ftp://ftp.rsa.com/pub/pdfs/bull-2.pdf
-+ *
-+ * The standard RSA Blinding decryption requires the public key exponent
-+ * (e) and modulus (n), and converts ciphertext (c) to plaintext (p).
-+ *
-+ * Before the modular exponentiation operation, the input message should
-+ * be multiplied by (u (mod n)), and afterward the result is corrected
-+ * by multiplying with (v (mod n)). The system should reject messages
-+ * equal to (0 (mod n)). That is:
-+ *
-+ * 1. Generate r between 0 and n-1, relatively prime to n.
-+ * 2. Compute x = (c*u) mod n
-+ * 3. Compute y = (x^d) mod n
-+ * 4. Compute p = (y*v) mod n
-+ *
-+ * The Java APIs allows for either standard RSAPrivateKey or
-+ * RSAPrivateCrtKey RSA keys.
-+ *
-+ * If the public exponent is available to us (e.g. RSAPrivateCrtKey),
-+ * choose a random r, then let (u, v):
-+ *
-+ * u = r ^ e mod n
-+ * v = r ^ (-1) mod n
-+ *
-+ * The proof follows:
-+ *
-+ * p = (((c * u) ^ d mod n) * v) mod n
-+ * = ((c ^ d) * (u ^ d) * v) mod n
-+ * = ((c ^ d) * (r ^ e) ^ d) * (r ^ (-1))) mod n
-+ * = ((c ^ d) * (r ^ (e * d)) * (r ^ (-1))) mod n
-+ * = ((c ^ d) * (r ^ 1) * (r ^ (-1))) mod n (see below)
-+ * = (c ^ d) mod n
-+ *
-+ * because in RSA cryptosystem, d is the multiplicative inverse of e:
-+ *
-+ * (r^(e * d)) mod n
-+ * = (r ^ 1) mod n
-+ * = r mod n
-+ *
-+ * However, if the public exponent is not available (e.g. RSAPrivateKey),
-+ * we mitigate the timing issue by using a similar random number blinding
-+ * approach using the private key:
-+ *
-+ * u = r
-+ * v = ((r ^ (-1)) ^ d) mod n
-+ *
-+ * This returns the same plaintext because:
-+ *
-+ * p = (((c * u) ^ d mod n) * v) mod n
-+ * = ((c ^ d) * (u ^ d) * v) mod n
-+ * = ((c ^ d) * (u ^ d) * ((u ^ (-1)) ^d)) mod n
-+ * = (c ^ d) mod n
-+ *
-+ * Computing inverses mod n and random number generation is slow, so
-+ * it is often not practical to generate a new random (u, v) pair for
-+ * each new exponentiation. The calculation of parameters might even be
-+ * subject to timing attacks. However, (u, v) pairs should not be
-+ * reused since they themselves might be compromised by timing attacks,
-+ * leaving the private exponent vulnerable. An efficient solution to
-+ * this problem is update u and v before each modular exponentiation
-+ * step by computing:
-+ *
-+ * u = u ^ 2
-+ * v = v ^ 2
-+ *
-+ * The total performance cost is small.
-+ */
-+ private final static class BlindingRandomPair {
-+ final BigInteger u;
-+ final BigInteger v;
-+
-+ BlindingRandomPair(BigInteger u, BigInteger v) {
-+ this.u = u;
-+ this.v = v;
-+ }
-+ }
-
- /**
- * Set of blinding parameters for a given RSA key.
- *
- * The RSA modulus is usually unique, so we index by modulus in
-- * blindingCache. However, to protect against the unlikely case of two
-- * keys sharing the same modulus, we also store the public exponent.
-- * This means we cannot cache blinding parameters for multiple keys that
-- * share the same modulus, but since sharing moduli is fundamentally broken
-- * an insecure, this does not matter.
-- */
-- private static final class BlindingParameters {
-- // e (RSA public exponent)
-- final BigInteger e;
-- // r ^ e mod n
-- final BigInteger re;
-- // inverse of r mod n
-- final BigInteger rInv;
-- // how many more times this parameter object can be used
-- private volatile int remainingUses;
-- BlindingParameters(BigInteger e, BigInteger re, BigInteger rInv) {
-+ * {@code blindingCache}. However, to protect against the unlikely
-+ * case of two keys sharing the same modulus, we also store the public
-+ * or the private exponent. This means we cannot cache blinding
-+ * parameters for multiple keys that share the same modulus, but
-+ * since sharing moduli is fundamentally broken and insecure, this
-+ * does not matter.
-+ */
-+ private final static class BlindingParameters {
-+ private final static BigInteger BIG_TWO = BigInteger.valueOf(2L);
-+
-+ // RSA public exponent
-+ private final BigInteger e;
-+
-+ // hash code of RSA private exponent
-+ private final BigInteger d;
-+
-+ // r ^ e mod n (CRT), or r mod n (Non-CRT)
-+ private BigInteger u;
-+
-+ // r ^ (-1) mod n (CRT) , or ((r ^ (-1)) ^ d) mod n (Non-CRT)
-+ private BigInteger v;
-+
-+ // e: the public exponent
-+ // d: the private exponent
-+ // n: the modulus
-+ BlindingParameters(BigInteger e, BigInteger d, BigInteger n) {
-+ this.u = null;
-+ this.v = null;
- this.e = e;
-- this.re = re;
-- this.rInv = rInv;
-- // initialize remaining uses, subtract current use now
-- remainingUses = BLINDING_MAX_REUSE - 1;
-- }
-- boolean valid(BigInteger e) {
-- int k = remainingUses--;
-- return (k > 0) && this.e.equals(e);
-+ this.d = d;
-+
-+ int len = n.bitLength();
-+ SecureRandom random = JCAUtil.getSecureRandom();
-+ u = new BigInteger(len, random).mod(n);
-+ // Although the possibility is very much limited that u is zero
-+ // or is not relatively prime to n, we still want to be careful
-+ // about the special value.
-+ //
-+ // Secure random generation is expensive, try to use BigInteger.ONE
-+ // this time if this new generated random number is zero or is not
-+ // relatively prime to n. Next time, new generated secure random
-+ // number will be used instead.
-+ if (u.equals(BigInteger.ZERO)) {
-+ u = BigInteger.ONE; // use 1 this time
-+ }
-+
-+ try {
-+ // The call to BigInteger.modInverse() checks that u is
-+ // relatively prime to n. Otherwise, ArithmeticException is
-+ // thrown.
-+ v = u.modInverse(n);
-+ } catch (ArithmeticException ae) {
-+ // if u is not relatively prime to n, use 1 this time
-+ u = BigInteger.ONE;
-+ v = BigInteger.ONE;
-+ }
-+
-+ if (e != null) {
-+ u = u.modPow(e, n); // e: the public exponent
-+ // u: random ^ e
-+ // v: random ^ (-1)
-+ } else {
-+ v = v.modPow(d, n); // d: the private exponent
-+ // u: random
-+ // v: random ^ (-d)
-+ }
-+ }
-+
-+ // return null if need to reset the parameters
-+ BlindingRandomPair getBlindingRandomPair(
-+ BigInteger e, BigInteger d, BigInteger n) {
-+
-+ if ((this.e != null && this.e.equals(e)) ||
-+ (this.d != null && this.d.equals(d))) {
-+
-+ BlindingRandomPair brp = null;
-+ synchronized (this) {
-+ if (!u.equals(BigInteger.ZERO) &&
-+ !v.equals(BigInteger.ZERO)) {
-+
-+ brp = new BlindingRandomPair(u, v);
-+ if (u.compareTo(BigInteger.ONE) <= 0 ||
-+ v.compareTo(BigInteger.ONE) <= 0) {
-+
-+ // need to reset the random pair next time
-+ u = BigInteger.ZERO;
-+ v = BigInteger.ZERO;
-+ } else {
-+ u = u.modPow(BIG_TWO, n);
-+ v = v.modPow(BIG_TWO, n);
-+ }
-+ } // Otherwise, need to reset the random pair.
-+ }
-+ return brp;
-+ }
-+
-+ return null;
- }
- }
-
-- /**
-- * Return valid RSA blinding parameters for the given private key.
-- * Use cached parameters if available. If not, generate new parameters
-- * and cache.
-- */
-- private static BlindingParameters getBlindingParameters
-- (RSAPrivateCrtKey key) {
-- BigInteger modulus = key.getModulus();
-- BigInteger e = key.getPublicExponent();
-- BlindingParameters params;
-- // we release the lock between get() and put()
-- // that means threads might concurrently generate new blinding
-- // parameters for the same modulus. this is only a slight waste
-- // of cycles and seems preferable in terms of scalability
-- // to locking out all threads while generating new parameters
-+ private static BlindingRandomPair getBlindingRandomPair(
-+ BigInteger e, BigInteger d, BigInteger n) {
-+
-+ BlindingParameters bps = null;
- synchronized (blindingCache) {
-- params = blindingCache.get(modulus);
-+ bps = blindingCache.get(n);
- }
-- if ((params != null) && params.valid(e)) {
-- return params;
-- }
-- int len = modulus.bitLength();
-- SecureRandom random = JCAUtil.getSecureRandom();
-- BigInteger r = new BigInteger(len, random).mod(modulus);
-- BigInteger re = r.modPow(e, modulus);
-- BigInteger rInv = r.modInverse(modulus);
-- params = new BlindingParameters(e, re, rInv);
-- synchronized (blindingCache) {
-- blindingCache.put(modulus, params);
-+
-+ if (bps == null) {
-+ bps = new BlindingParameters(e, d, n);
-+ synchronized (blindingCache) {
-+ if (blindingCache.get(n) == null) {
-+ blindingCache.put(n, bps);
-+ }
-+ }
-+ }
-+
-+ BlindingRandomPair brp = bps.getBlindingRandomPair(e, d, n);
-+ if (brp == null) {
-+ // need to reset the blinding parameters
-+ bps = new BlindingParameters(e, d, n);
-+ synchronized (blindingCache) {
-+ if (blindingCache.get(n) != null) {
-+ blindingCache.put(n, bps);
-+ }
-+ }
-+ brp = bps.getBlindingRandomPair(e, d, n);
- }
-- return params;
-+
-+ return brp;
- }
-
- }
---- ./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-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 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
-@@ -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 @@
- }
-
- /**
-- * 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;
-+ boolean bp = false;
-+
- if (padded[k++] != 0) {
-- throw new BadPaddingException("Data must start with zero");
-+ bp = true;
- }
- if (padded[k++] != type) {
-- throw new BadPaddingException("Blocktype mismatch: " + padded[1]);
-+ bp = true;
- }
-- while (true) {
-+ int p = 0;
-+ while (k < padded.length) {
- int b = padded[k++] & 0xff;
-- if (b == 0) {
-- break;
-+ if ((b == 0) && (p == 0)) {
-+ p = k;
- }
-- if (k == padded.length) {
-- throw 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)) {
-+ bp = true;
- }
- }
-- int n = padded.length - k;
-+ int n = padded.length - p;
- if (n > maxDataSize) {
-- throw new BadPaddingException("Padding string too short");
-+ bp = true;
- }
-+
-+ // copy useless padding array for a constant-time method
-+ 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);
-+
-+ 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");
-+
-+ 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 2014-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -225,29 +225,4 @@
- }
- return b;
- }
--
-- // return a string representation of this key for debugging
-- public String toString() {
-- StringBuffer sb = new StringBuffer();
-- sb.append("Sun RSA private CRT key, ");
-- sb.append(n.bitLength());
-- sb.append(" bits\n modulus: ");
-- sb.append(n);
-- sb.append("\n public exponent: ");
-- sb.append(e);
-- sb.append("\n private exponent: ");
-- sb.append(d);
-- sb.append("\n prime p: ");
-- sb.append(p);
-- sb.append("\n prime q: ");
-- sb.append(q);
-- sb.append("\n prime exponent p: ");
-- sb.append(pe);
-- sb.append("\n prime exponent q: ");
-- sb.append(qe);
-- sb.append("\n crt coefficient: ");
-- sb.append(coeff);
-- return sb.toString();
-- }
--
- }
---- ./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 2014-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -98,11 +98,4 @@
- public BigInteger getPrivateExponent() {
- return d;
- }
--
-- // return a string representation of this key for debugging
-- public String toString() {
-- return "Sun RSA private key, " + n.bitLength() + " bits\n modulus: "
-- + n + "\n private exponent: " + d;
-- }
--
- }
---- ./jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2013-09-06 11:28:45.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2014-10-28 20:19:48.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2012, 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
-@@ -36,6 +36,8 @@
-
- import java.security.cert.X509Certificate;
- import java.security.cert.CertificateException;
-+import java.security.cert.CertificateParsingException;
-+import javax.security.auth.x500.X500Principal;
-
- import javax.crypto.SecretKey;
- import javax.crypto.spec.SecretKeySpec;
-@@ -93,6 +95,60 @@
- Debug.getBooleanProperty("jsse.enableSNIExtension", true);
-
- /*
-+ * Allow unsafe server certificate change?
-+ *
-+ * Server certificate change during SSL/TLS renegotiation may be considered
-+ * unsafe, as described in the Triple Handshake attacks:
-+ *
-+ * https://secure-resumption.com/tlsauth.pdf
-+ *
-+ * Endpoint identification (See
-+ * SSLParameters.getEndpointIdentificationAlgorithm()) is a pretty nice
-+ * guarantee that the server certificate change in the renegotiation is legal.
-+ * However, endpoint identification is only enabled for HTTPS and LDAP
-+ * over SSL/TLS by default. It is not enough to protect SSL/TLS
-+ * connections other than HTTPS and LDAP.
-+ *
-+ * The renegotiation indication extension (See RFC 5764) is a pretty
-+ * strong guarantee that the endpoints on both client and server sides
-+ * are identical on the same connection. However, the Triple Handshake
-+ * attacks can bypass this guarantee if there is a session-resumption
-+ * handshake between the initial full handshake and the renegotiation
-+ * full handshake.
-+ *
-+ * Server certificate change may be unsafe and should be restricted if
-+ * endpoint identification is not enabled and the previous handshake is
-+ * a session-resumption abbreviated initial handshake, unless the
-+ * identities reproesented by both certificates can be regraded as the
-+ * same (See isIdentityEquivalent()).
-+ *
-+ * Considering the compatibility impact and the actual requirements to
-+ * support server certificate change in practice, the system property,
-+ * jdk.tls.allowUnsafeServerCertChange, is used to define whether unsafe
-+ * server certificate change in renegotiation is allowed or not. The
-+ * default value of the system property is "false". To mitigate the
-+ * compatibility impact, applications may want to set the system
-+ * property to "true" at their own risk.
-+ *
-+ * If the value of the system property is "false", server certificate
-+ * change in renegotiation after a session-resumption abbreviated initial
-+ * handshake is restricted (See isIdentityEuivalent()).
-+ *
-+ * If the system property is set to "truie" explicitly, the restriction on
-+ * server certificate change in renegotiation is disabled.
-+ */
-+ private final static boolean allowUnsafeServerCertChange =
-+ Debug.getBooleanProperty("jdk.tls.allowUnsafeServerCertChange", false);
-+
-+ /*
-+ * the reserved server certificate chain in previous handshaking
-+ *
-+ * The server certificate chain is only reserved if the previous
-+ * handshake is a session-resumption abbreviated initial handshake.
-+ */
-+ private X509Certificate[] reservedServerCerts = null;
-+
-+ /*
- * Constructors
- */
- ClientHandshaker(SSLSocketImpl socket, SSLContextImpl context,
-@@ -551,8 +607,7 @@
- // we wanted to resume, but the server refused
- session = null;
- if (!enableNewSession) {
-- throw new SSLException
-- ("New session creation is disabled");
-+ throw new SSLException("New session creation is disabled");
- }
- }
- }
-@@ -563,6 +618,11 @@
- }
-
- setHandshakeSessionSE(session);
-+ // Reserve the handshake state if this is a session-resumption
-+ // abbreviated initial handshake.
-+ if (isInitialHandshake) {
-+ session.setAsSessionResumption(true);
-+ }
- return;
- }
-
-@@ -1035,6 +1095,13 @@
- }
-
- /*
-+ * Reset the handshake state if this is not an initial handshake.
-+ */
-+ if (!isInitialHandshake) {
-+ session.setAsSessionResumption(false);
-+ }
-+
-+ /*
- * OK, it verified. If we're doing the fast handshake, add that
- * "Finished" message to the hash of handshake messages, then send
- * our own change_cipher_spec and Finished message for the server
-@@ -1131,8 +1198,22 @@
- System.out.println("%% No cached client session");
- }
- }
-- if ((session != null) && (session.isRejoinable() == false)) {
-- session = null;
-+ if (session != null) {
-+ // If unsafe server certificate change is not allowed, reserve
-+ // current server certificates if the preious handshake is a
-+ // session-resumption abbreviated initial handshake.
-+ if (!allowUnsafeServerCertChange && session.isSessionResumption()) {
-+ try {
-+ // If existing, peer certificate chain cannot be null.
-+ reservedServerCerts =
-+ (X509Certificate[])session.getPeerCertificates();
-+ } catch (SSLPeerUnverifiedException puve) {
-+ // Maybe not certificate-based, ignore the exception.
-+ }
-+ }
-+ if (!session.isRejoinable()) {
-+ session = null;
-+ }
- }
-
- if (session != null) {
-@@ -1303,8 +1384,25 @@
- }
- X509Certificate[] peerCerts = mesg.getCertificateChain();
- if (peerCerts.length == 0) {
-- fatalSE(Alerts.alert_bad_certificate,
-- "empty certificate chain");
-+ fatalSE(Alerts.alert_bad_certificate, "empty certificate chain");
-+ }
-+
-+ // Allow server certificate change in client side during renegotiation
-+ // after session-resumption abbreviated initial handshake ?
-+ //
-+ // DO NOT need to check allowUnsafeServerCertChange here. We only
-+ // reserve server certificates when allowUnsafeServerCertChange is
-+ // false.
-+ if (reservedServerCerts != null) {
-+ // It is not necessary to check the certificate update if endpoint
-+ // identification is enabled.
-+ String identityAlg = getEndpointIdentificationAlgorithmSE();
-+ if ((identityAlg == null || identityAlg.length() == 0) &&
-+ !isIdentityEquivalent(peerCerts[0], reservedServerCerts[0])) {
-+ fatalSE(Alerts.alert_bad_certificate,
-+ "server certificate change is restricted" +
-+ "during renegotiation");
-+ }
- }
- // ask the trust manager to verify the chain
- X509TrustManager tm = sslContext.getX509TrustManager();
-@@ -1342,4 +1440,82 @@
- }
- session.setPeerCertificates(peerCerts);
- }
-+
-+ /*
-+ * Whether the certificates can represent the same identity?
-+ *
-+ * The certificates can be used to represent the same identity:
-+ * 1. If the subject alternative names of IP address are present in
-+ * both certificates, they should be identical; otherwise,
-+ * 2. if the subject alternative names of DNS name are present in
-+ * both certificates, they should be identical; otherwise,
-+ * 3. if the subject fields are present in both certificates, the
-+ * certificate subjects and issuers should be identical.
-+ */
-+
-+ private static boolean isIdentityEquivalent(X509Certificate thisCert,
-+ X509Certificate prevCert) {
-+ if (thisCert.equals(prevCert)) {
-+ return true;
-+ }
-+
-+ // check the iPAddress field in subjectAltName extension
-+ Object thisIPAddress = getSubjectAltName(thisCert, 7); // 7: iPAddress
-+ Object prevIPAddress = getSubjectAltName(prevCert, 7);
-+ if (thisIPAddress != null && prevIPAddress!= null) {
-+ // only allow the exactly match
-+ return Objects.equals(thisIPAddress, prevIPAddress);
-+ }
-+
-+ // check the dNSName field in subjectAltName extension
-+ Object thisDNSName = getSubjectAltName(thisCert, 2); // 2: dNSName
-+ Object prevDNSName = getSubjectAltName(prevCert, 2);
-+ if (thisDNSName != null && prevDNSName!= null) {
-+ // only allow the exactly match
-+ return Objects.equals(thisDNSName, prevDNSName);
-+ }
-+
-+ // check the certificate subject and issuer
-+ X500Principal thisSubject = thisCert.getSubjectX500Principal();
-+ X500Principal prevSubject = prevCert.getSubjectX500Principal();
-+ X500Principal thisIssuer = thisCert.getIssuerX500Principal();
-+ X500Principal prevIssuer = prevCert.getIssuerX500Principal();
-+ if (!thisSubject.getName().isEmpty() &&
-+ !prevSubject.getName().isEmpty() &&
-+ thisSubject.equals(prevSubject) &&
-+ thisIssuer.equals(prevIssuer)) {
-+ return true;
-+ }
-+
-+ return false;
-+ }
-+
-+ /*
-+ * Returns the subject alternative name of the specified type in the
-+ * subjectAltNames extension of a certificate.
-+ */
-+ private static Object getSubjectAltName(X509Certificate cert, int type) {
-+ Collection<List<?>> subjectAltNames;
-+
-+ try {
-+ subjectAltNames = cert.getSubjectAlternativeNames();
-+ } catch (CertificateParsingException cpe) {
-+ if (debug != null && Debug.isOn("handshake")) {
-+ System.out.println(
-+ "Attempt to obtain subjectAltNames extension failed!");
-+ }
-+ return null;
-+ }
-+
-+ if (subjectAltNames != null) {
-+ for (List<?> subjectAltName : subjectAltNames) {
-+ int subjectAltNameType = (Integer)subjectAltName.get(0);
-+ if (subjectAltNameType == type) {
-+ return subjectAltName.get(1);
-+ }
-+ }
-+ }
-+
-+ return null;
-+ }
- }
---- ./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-10-28 20:19:49.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2012, 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
-@@ -348,6 +348,16 @@
- }
- }
-
-+ String getEndpointIdentificationAlgorithmSE() {
-+ SSLParameters paras;
-+ if (conn != null) {
-+ paras = conn.getSSLParameters();
-+ } else {
-+ paras = engine.getSSLParameters();
-+ }
-+ return paras.getEndpointIdentificationAlgorithm();
-+ }
-+
- private void setVersionSE(ProtocolVersion protocolVersion) {
- if (conn != null) {
- conn.setVersion(protocolVersion);
-@@ -1047,94 +1057,22 @@
- clnt_random.random_bytes, svr_random.random_bytes,
- prfHashAlg, prfHashLength, prfBlockSize);
-
-- SecretKey masterSecret;
- try {
- KeyGenerator kg = JsseJce.getKeyGenerator(masterAlg);
- kg.init(spec);
-- masterSecret = kg.generateKey();
-- } catch (GeneralSecurityException e) {
-+ return kg.generateKey();
-+ } catch (InvalidAlgorithmParameterException |
-+ NoSuchAlgorithmException iae) {
-+ // unlikely to happen, otherwise, must be a provider exception
-+ //
- // For RSA premaster secrets, do not signal a protocol error
- // due to the Bleichenbacher attack. See comments further down.
-- if (!preMasterSecret.getAlgorithm().equals(
-- "TlsRsaPremasterSecret")) {
-- throw new ProviderException(e);
-- }
--
- if (debug != null && Debug.isOn("handshake")) {
- System.out.println("RSA master secret generation error:");
-- e.printStackTrace(System.out);
-- }
--
-- if (requestedVersion != null) {
-- preMasterSecret =
-- RSAClientKeyExchange.generateDummySecret(requestedVersion);
-- } else {
-- preMasterSecret =
-- RSAClientKeyExchange.generateDummySecret(protocolVersion);
-+ iae.printStackTrace(System.out);
- }
--
-- // recursive call with new premaster secret
-- return calculateMasterSecret(preMasterSecret, null);
-+ throw new ProviderException(iae);
- }
--
-- // if no version check requested (client side handshake), or version
-- // information is not available (not an RSA premaster secret),
-- // return master secret immediately.
-- if ((requestedVersion == null) ||
-- !(masterSecret instanceof TlsMasterSecret)) {
-- return masterSecret;
-- }
--
-- // we have checked the ClientKeyExchange message when reading TLS
-- // record, the following check is necessary to ensure that
-- // JCE provider does not ignore the checking, or the previous
-- // checking process bypassed the premaster secret version checking.
-- TlsMasterSecret tlsKey = (TlsMasterSecret)masterSecret;
-- int major = tlsKey.getMajorVersion();
-- int minor = tlsKey.getMinorVersion();
-- if ((major < 0) || (minor < 0)) {
-- return masterSecret;
-- }
--
-- // check if the premaster secret version is ok
-- // the specification says that it must be the maximum version supported
-- // by the client from its ClientHello message. However, many
-- // implementations send the negotiated version, so accept both
-- // for SSL v3.0 and TLS v1.0.
-- // NOTE that we may be comparing two unsupported version numbers, which
-- // is why we cannot use object reference equality in this special case.
-- ProtocolVersion premasterVersion =
-- ProtocolVersion.valueOf(major, minor);
-- boolean versionMismatch = (premasterVersion.v != requestedVersion.v);
--
-- /*
-- * we never checked the client_version in server side
-- * for TLS v1.0 and SSL v3.0. For compatibility, we
-- * maintain this behavior.
-- */
-- if (versionMismatch && requestedVersion.v <= ProtocolVersion.TLS10.v) {
-- versionMismatch = (premasterVersion.v != protocolVersion.v);
-- }
--
-- if (versionMismatch == false) {
-- // check passed, return key
-- return masterSecret;
-- }
--
-- // Due to the Bleichenbacher attack, do not signal a protocol error.
-- // Generate a random premaster secret and continue with the handshake,
-- // which will fail when verifying the finished messages.
-- // For more information, see comments in PreMasterSecret.
-- if (debug != null && Debug.isOn("handshake")) {
-- System.out.println("RSA PreMasterSecret version error: expected"
-- + protocolVersion + " or " + requestedVersion + ", decrypted: "
-- + premasterVersion);
-- }
-- preMasterSecret =
-- RSAClientKeyExchange.generateDummySecret(requestedVersion);
--
-- // recursive call with new premaster secret
-- return calculateMasterSecret(preMasterSecret, null);
- }
-
- /*
---- ./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-10-28 20:19:49.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1996, 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
-@@ -50,23 +50,6 @@
- */
- final class RSAClientKeyExchange extends HandshakeMessage {
-
-- /**
-- * The TLS spec says that the version in the RSA premaster secret must
-- * be the maximum version supported by the client (i.e. the version it
-- * requested in its client hello version). However, we (and other
-- * implementations) used to send the active negotiated version. The
-- * system property below allows to toggle the behavior.
-- */
-- private final static String PROP_NAME =
-- "com.sun.net.ssl.rsaPreMasterSecretFix";
--
-- /*
-- * Default is "false" (old behavior) for compatibility reasons in
-- * SSLv3/TLSv1. Later protocols (TLSv1.1+) do not use this property.
-- */
-- private final static boolean rsaPreMasterSecretFix =
-- Debug.getBooleanProperty(PROP_NAME, false);
--
- /*
- * The following field values were encrypted with the server's public
- * key (or temp key from server key exchange msg) and are presented
-@@ -90,22 +73,12 @@
- }
- this.protocolVersion = protocolVersion;
-
-- int major, minor;
--
-- if (rsaPreMasterSecretFix || maxVersion.v >= ProtocolVersion.TLS11.v) {
-- major = maxVersion.major;
-- minor = maxVersion.minor;
-- } else {
-- major = protocolVersion.major;
-- minor = protocolVersion.minor;
-- }
--
- try {
- String s = ((protocolVersion.v >= ProtocolVersion.TLS12.v) ?
- "SunTls12RsaPremasterSecret" : "SunTlsRsaPremasterSecret");
- KeyGenerator kg = JsseJce.getKeyGenerator(s);
-- kg.init(new TlsRsaPremasterSecretParameterSpec(major, minor),
-- generator);
-+ kg.init(new TlsRsaPremasterSecretParameterSpec(
-+ maxVersion.v, protocolVersion.v), generator);
- preMaster = kg.generateKey();
-
- Cipher cipher = JsseJce.getCipher(JsseJce.CIPHER_RSA_PKCS1);
-@@ -135,140 +108,30 @@
- } else {
- encrypted = new byte [messageSize];
- if (input.read(encrypted) != messageSize) {
-- throw new SSLProtocolException
-- ("SSL: read PreMasterSecret: short read");
-+ throw new SSLProtocolException(
-+ "SSL: read PreMasterSecret: short read");
- }
- }
-
- try {
- Cipher cipher = JsseJce.getCipher(JsseJce.CIPHER_RSA_PKCS1);
-- cipher.init(Cipher.UNWRAP_MODE, privateKey);
-+ // Cannot generate key here, please don't use Cipher.UNWRAP_MODE!
-+ cipher.init(Cipher.UNWRAP_MODE, privateKey,
-+ new TlsRsaPremasterSecretParameterSpec(
-+ maxVersion.v, currentVersion.v),
-+ generator);
- preMaster = (SecretKey)cipher.unwrap(encrypted,
- "TlsRsaPremasterSecret", Cipher.SECRET_KEY);
--
-- // polish the premaster secret
-- preMaster = polishPreMasterSecretKey(currentVersion, maxVersion,
-- generator, preMaster, null);
-+ } catch (InvalidKeyException ibk) {
-+ // the message is too big to process with RSA
-+ throw new SSLProtocolException(
-+ "Unable to process PreMasterSecret, may be too big");
- } catch (Exception e) {
-- // polish the premaster secret
-- preMaster =
-- polishPreMasterSecretKey(currentVersion, maxVersion,
-- generator, null, e);
-- }
-- }
--
-- /**
-- * To avoid vulnerabilities described by section 7.4.7.1, RFC 5246,
-- * treating incorrectly formatted message blocks and/or mismatched
-- * version numbers in a manner indistinguishable from correctly
-- * formatted RSA blocks.
-- *
-- * RFC 5246 describes the approach as :
-- *
-- * 1. Generate a string R of 46 random bytes
-- *
-- * 2. Decrypt the message to recover the plaintext M
-- *
-- * 3. If the PKCS#1 padding is not correct, or the length of message
-- * M is not exactly 48 bytes:
-- * pre_master_secret = ClientHello.client_version || R
-- * else If ClientHello.client_version <= TLS 1.0, and version
-- * number check is explicitly disabled:
-- * pre_master_secret = M
-- * else:
-- * pre_master_secret = ClientHello.client_version || M[2..47]
-- */
-- private SecretKey polishPreMasterSecretKey(ProtocolVersion currentVersion,
-- ProtocolVersion clientHelloVersion, SecureRandom generator,
-- SecretKey secretKey, Exception failoverException) {
--
-- this.protocolVersion = clientHelloVersion;
--
-- if (failoverException == null && secretKey != null) {
-- // check the length
-- byte[] encoded = secretKey.getEncoded();
-- if (encoded == null) { // unable to get the encoded key
-- if (debug != null && Debug.isOn("handshake")) {
-- System.out.println(
-- "unable to get the plaintext of the premaster secret");
-- }
--
-- int keySize = KeyUtil.getKeySize(secretKey);
-- if (keySize > 0 && keySize != 384) { // 384 = 48 * 8
-- if (debug != null && Debug.isOn("handshake")) {
-- System.out.println(
-- "incorrect length of premaster secret: " +
-- (keySize/8));
-- }
--
-- return generateDummySecret(clientHelloVersion);
-- }
--
-- // The key size is exactly 48 bytes or not accessible.
-- //
-- // Conservatively, pass the checking to master secret
-- // calculation.
-- return secretKey;
-- } else if (encoded.length == 48) {
-- // check the version
-- if (clientHelloVersion.major == encoded[0] &&
-- clientHelloVersion.minor == encoded[1]) {
--
-- return secretKey;
-- } else if (clientHelloVersion.v <= ProtocolVersion.TLS10.v &&
-- currentVersion.major == encoded[0] &&
-- currentVersion.minor == encoded[1]) {
-- /*
-- * For compatibility, we maintain the behavior that the
-- * version in pre_master_secret can be the negotiated
-- * version for TLS v1.0 and SSL v3.0.
-- */
-- this.protocolVersion = currentVersion;
-- return secretKey;
-- }
--
-- if (debug != null && Debug.isOn("handshake")) {
-- System.out.println("Mismatching Protocol Versions, " +
-- "ClientHello.client_version is " + clientHelloVersion +
-- ", while PreMasterSecret.client_version is " +
-- ProtocolVersion.valueOf(encoded[0], encoded[1]));
-- }
--
-- return generateDummySecret(clientHelloVersion);
-- } else {
-- if (debug != null && Debug.isOn("handshake")) {
-- System.out.println(
-- "incorrect length of premaster secret: " +
-- encoded.length);
-- }
--
-- return generateDummySecret(clientHelloVersion);
-+ // unlikely to happen, otherwise, must be a provider exception
-+ if (debug != null && Debug.isOn("handshake")) {
-+ System.out.println("RSA premaster secret decryption error:");
-+ e.printStackTrace(System.out);
- }
-- }
--
-- if (debug != null && Debug.isOn("handshake") &&
-- failoverException != null) {
-- System.out.println("Error decrypting premaster secret:");
-- failoverException.printStackTrace(System.out);
-- }
--
-- return generateDummySecret(clientHelloVersion);
-- }
--
-- // generate a premaster secret with the specified version number
-- static SecretKey generateDummySecret(ProtocolVersion version) {
-- if (debug != null && Debug.isOn("handshake")) {
-- System.out.println("Generating a random fake premaster secret");
-- }
--
-- try {
-- String s = ((version.v >= ProtocolVersion.TLS12.v) ?
-- "SunTls12RsaPremasterSecret" : "SunTlsRsaPremasterSecret");
-- KeyGenerator kg = JsseJce.getKeyGenerator(s);
-- kg.init(new TlsRsaPremasterSecretParameterSpec
-- (version.major, version.minor));
-- return kg.generateKey();
-- } catch (GeneralSecurityException e) {
- throw new RuntimeException("Could not generate dummy secret", e);
- }
- }
---- ./jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2013-09-06 11:28:45.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2014-10-28 20:19:49.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
-@@ -117,6 +117,14 @@
- private Principal localPrincipal;
-
- /*
-+ * Is the session currently re-established with a session-resumption
-+ * abbreviated initial handshake?
-+ *
-+ * Note that currently we only set this variable in client side.
-+ */
-+ private boolean isSessionResumption = false;
-+
-+ /*
- * We count session creations, eventually for statistical data but
- * also since counters make shorter debugging IDs than the big ones
- * we use in the protocol for uniqueness-over-time.
-@@ -320,6 +328,22 @@
- }
-
- /**
-+ * Return true if the session is currently re-established with a
-+ * session-resumption abreviated initial handshake.
-+ */
-+ boolean isSessionResumption() {
-+ return isSessionResumption;
-+ }
-+
-+ /**
-+ * Resets whether the session is re-established with a session-resumption
-+ * abbreviated initial handshake.
-+ */
-+ void setAsSessionResumption(boolean flag) {
-+ isSessionResumption = flag;
-+ }
-+
-+ /**
- * Returns the name of the cipher suite in use on this session
- */
- public String getCipherSuite() {
---- ./jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2013-09-06 11:28:45.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2014-07-15 21:49:31.000000000 -0700
-@@ -172,7 +172,7 @@
- /*
- * Drives the protocol state machine.
- */
-- private int connectionState;
-+ private volatile int connectionState;
-
- /*
- * Flag indicating if the next record we receive MUST be a Finished
-@@ -1443,7 +1443,7 @@
- * Return whether the socket has been explicitly closed by the application.
- */
- public boolean isClosed() {
-- return getConnectionState() == cs_APP_CLOSED;
-+ return connectionState == cs_APP_CLOSED;
- }
-
- /**
---- ./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-07-15 21:49:31.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-07-15 21:49:31.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;
-
-- private boolean hasExpiredCert = false;
-+ // Informational warnings
- private boolean hasExpiringCert = false;
-+ private boolean noTimestamp = false;
-+ private Date expireDate = new Date(0L); // used in noTimestamp warning
-+
-+ // Severe warnings
-+ private boolean hasExpiredCert = false;
- private boolean notYetValidCert = false;
- private boolean chainNotValidated = false;
- private boolean notSignedByAlias = false;
-@@ -255,9 +257,6 @@
-
- if (strict) {
- int exitCode = 0;
-- if (hasExpiringCert) {
-- exitCode |= 2;
-- }
- if (chainNotValidated || hasExpiredCert || notYetValidCert) {
- exitCode |= 4;
- }
-@@ -746,14 +745,25 @@
- System.out.println(rb.getString(
- "jar.is.unsigned.signatures.missing.or.not.parsable."));
- } else {
-- System.out.println(rb.getString("jar.verified."));
-- if (hasUnsignedEntry || hasExpiredCert || hasExpiringCert ||
-- badKeyUsage || badExtendedKeyUsage || badNetscapeCertType ||
-- notYetValidCert || chainNotValidated ||
-- aliasNotInStore || notSignedByAlias) {
-+ boolean warningAppeared = false;
-+ boolean errorAppeared = false;
-+ if (badKeyUsage || badExtendedKeyUsage || badNetscapeCertType ||
-+ notYetValidCert || chainNotValidated || hasExpiredCert ||
-+ hasUnsignedEntry ||
-+ aliasNotInStore || notSignedByAlias) {
-+
-+ if (strict) {
-+ System.out.println(rb.getString("jar.verified.with.signer.errors."));
-+ System.out.println();
-+ System.out.println(rb.getString("Error."));
-+ errorAppeared = true;
-+ } else {
-+ System.out.println(rb.getString("jar.verified."));
-+ System.out.println();
-+ System.out.println(rb.getString("Warning."));
-+ warningAppeared = true;
-+ }
-
-- System.out.println();
-- System.out.println(rb.getString("Warning."));
- if (badKeyUsage) {
- System.out.println(
- rb.getString("This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing."));
-@@ -777,10 +787,6 @@
- System.out.println(rb.getString(
- "This.jar.contains.entries.whose.signer.certificate.has.expired."));
- }
-- if (hasExpiringCert) {
-- System.out.println(rb.getString(
-- "This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months."));
-- }
- if (notYetValidCert) {
- System.out.println(rb.getString(
- "This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid."));
-@@ -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."));
- }
-+ } else {
-+ System.out.println(rb.getString("jar.verified."));
-+ }
-+ if (hasExpiringCert || noTimestamp) {
-+ if (!warningAppeared) {
-+ System.out.println();
-+ System.out.println(rb.getString("Warning."));
-+ warningAppeared = true;
-+ }
-+ if (hasExpiringCert) {
-+ System.out.println(rb.getString(
-+ "This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months."));
-+ }
-+ if (noTimestamp) {
-+ System.out.println(
-+ String.format(rb.getString("no.timestamp.verifying"), expireDate));
-+ }
-+ }
-+ if (warningAppeared || errorAppeared) {
- if (! (verbose != null && showcerts)) {
- System.out.println();
- System.out.println(rb.getString(
-- "Re.run.with.the.verbose.and.certs.options.for.more.details."));
-+ "Re.run.with.the.verbose.and.certs.options.for.more.details."));
- }
- }
- }
-@@ -862,6 +887,9 @@
- try {
- boolean printValidity = true;
- if (timestamp == null) {
-+ if (expireDate.getTime() == 0 || expireDate.after(notAfter)) {
-+ expireDate = notAfter;
-+ }
- x509Cert.checkValidity();
- // test if cert will expire within six months
- if (notAfter.getTime() < System.currentTimeMillis() + SIX_MONTHS) {
-@@ -1227,6 +1255,10 @@
- tsaCert = getTsaCert(tsaAlias);
- }
-
-+ if (tsaUrl == null && tsaCert == null) {
-+ noTimestamp = true;
-+ }
-+
- SignatureFile.Block block = null;
-
- try {
-@@ -1375,12 +1407,20 @@
- }
- }
-
-- if (hasExpiredCert || hasExpiringCert || notYetValidCert
-- || badKeyUsage || badExtendedKeyUsage
-- || badNetscapeCertType || chainNotValidated) {
-- System.out.println();
-+ boolean warningAppeared = false;
-+ if (badKeyUsage || badExtendedKeyUsage || badNetscapeCertType ||
-+ notYetValidCert || chainNotValidated || hasExpiredCert) {
-+ if (strict) {
-+ System.out.println(rb.getString("jar.signed.with.signer.errors."));
-+ System.out.println();
-+ System.out.println(rb.getString("Error."));
-+ } else {
-+ System.out.println(rb.getString("jar.signed."));
-+ System.out.println();
-+ System.out.println(rb.getString("Warning."));
-+ warningAppeared = true;
-+ }
-
-- System.out.println(rb.getString("Warning."));
- if (badKeyUsage) {
- System.out.println(
- rb.getString("The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing."));
-@@ -1399,9 +1439,6 @@
- if (hasExpiredCert) {
- System.out.println(
- rb.getString("The.signer.certificate.has.expired."));
-- } else if (hasExpiringCert) {
-- System.out.println(
-- rb.getString("The.signer.certificate.will.expire.within.six.months."));
- } else if (notYetValidCert) {
- System.out.println(
- rb.getString("The.signer.certificate.is.not.yet.valid."));
-@@ -1411,6 +1448,24 @@
- System.out.println(
- rb.getString("The.signer.s.certificate.chain.is.not.validated."));
- }
-+ } else {
-+ System.out.println(rb.getString("jar.signed."));
-+ }
-+ if (hasExpiringCert || noTimestamp) {
-+ if (!warningAppeared) {
-+ System.out.println();
-+ System.out.println(rb.getString("Warning."));
-+ }
-+
-+ if (hasExpiringCert) {
-+ System.out.println(
-+ rb.getString("The.signer.certificate.will.expire.within.six.months."));
-+ }
-+
-+ if (noTimestamp) {
-+ System.out.println(
-+ String.format(rb.getString("no.timestamp.signing"), expireDate));
-+ }
- }
-
- // no IOException thrown in the above try clause, so disable
-@@ -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;
-+ noTimestamp = true;
- }
- // 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-07-15 21:49:31.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"},
- {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
-- "This jar contains signed entries which is not signed by the specified alias(es)."},
-+ "This jar contains signed entries which are not signed by the specified alias(es)."},
- {"This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.",
-- "This jar contains signed entries that's not signed by alias in this keystore."},
-+ "This jar contains signed entries that are not signed by alias in this keystore."},
- {"s", "s"},
- {"m", "m"},
- {"k", "k"},
-@@ -133,7 +133,10 @@
- {".Unsigned.entries.", "(Unsigned entries)"},
- {"jar.is.unsigned.signatures.missing.or.not.parsable.",
- "jar is unsigned. (signatures missing or not parsable)"},
-+ {"jar.signed.", "jar signed."},
-+ {"jar.signed.with.signer.errors.", "jar signed, with signer errors."},
- {"jar.verified.", "jar verified."},
-+ {"jar.verified.with.signer.errors.", "jar verified, with signer errors."},
- {"jarsigner.", "jarsigner: "},
- {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
- "signature filename must consist of the following characters: A-Z, 0-9, _ or -"},
-@@ -191,6 +194,7 @@
- "using an alternative signing mechanism"},
- {"entry.was.signed.on", "entry was signed on {0}"},
- {"Warning.", "Warning: "},
-+ {"Error.", "Error: "},
- {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
- "This jar contains unsigned entries which have not been integrity-checked. "},
- {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
-@@ -227,6 +231,10 @@
- "The signer's certificate chain is not validated."},
- {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
- "This jar contains entries whose certificate chain is not validated."},
-+ {"no.timestamp.signing",
-+ "No -tsa or -tsacert is provided and this jar is not timestamped. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td) or after any future revocation date."},
-+ {"no.timestamp.verifying",
-+ "This jar contains signatures that does not include a timestamp. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td) or after any future revocation date."},
- };
-
- /**
---- ./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-07-15 21:49:31.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"},
- {".suboptions.can.be.all.grouped.or.summary",
-- " \u30B5\u30D6\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u3057\u3066\u3001\u3059\u3079\u3066\u3001\u30B0\u30EB\u30FC\u30D7\u307E\u305F\u306F\u30B5\u30DE\u30EA\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059"},
-+ " \u30B5\u30D6\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u3057\u3066\u3001all\u3001grouped\u307E\u305F\u306Fsummary\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059"},
- {".certs.display.certificates.when.verbose.and.verifying",
- "[-certs] \u8A73\u7D30\u51FA\u529B\u304A\u3088\u3073\u691C\u8A3C\u6642\u306B\u8A3C\u660E\u66F8\u3092\u8868\u793A"},
- {".tsa.url.location.of.the.Timestamping.Authority",
-@@ -133,7 +133,10 @@
- {".Unsigned.entries.", "(\u672A\u7F72\u540D\u306E\u30A8\u30F3\u30C8\u30EA)"},
- {"jar.is.unsigned.signatures.missing.or.not.parsable.",
- "jar\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002(\u7F72\u540D\u304C\u898B\u3064\u304B\u3089\u306A\u3044\u304B\u3001\u69CB\u6587\u89E3\u6790\u3067\u304D\u307E\u305B\u3093)"},
-- {"jar.verified.", "jar\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F\u3002"},
-+ {"jar.signed.", "jar\u306F\u7F72\u540D\u3055\u308C\u307E\u3057\u305F\u3002"},
-+ {"jar.signed.with.signer.errors.", "jar\u306F\u7F72\u540D\u3055\u308C\u307E\u3057\u305F - \u7F72\u540D\u8005\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\u3002"},
-+ {"jar.verified.", "jar\u306F\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F\u3002"},
-+ {"jar.verified.with.signer.errors.", "jar\u306F\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F - \u7F72\u540D\u8005\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\u3002"},
- {"jarsigner.", "jarsigner: "},
- {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
- "\u7F72\u540D\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u306F\u6B21\u306E\u6587\u5B57\u3067\u69CB\u6210\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: A-Z 0-9 _ -"},
-@@ -189,6 +192,7 @@
- "\u4EE3\u66FF\u7F72\u540D\u30E1\u30AB\u30CB\u30BA\u30E0\u306E\u4F7F\u7528"},
- {"entry.was.signed.on", "\u30A8\u30F3\u30C8\u30EA\u306F{0}\u306B\u7F72\u540D\u3055\u308C\u307E\u3057\u305F"},
- {"Warning.", "\u8B66\u544A: "},
-+ {"Error.", "\u30A8\u30E9\u30FC: "},
- {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
- "\u3053\u306Ejar\u306B\u306F\u3001\u6574\u5408\u6027\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u3044\u306A\u3044\u672A\u7F72\u540D\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "},
- {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
-@@ -225,6 +229,10 @@
- "\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u307E\u3060\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
- {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
- "\u3053\u306Ejar\u306B\u306F\u3001\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u307E\u3060\u691C\u8A3C\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002"},
-+ {"no.timestamp.signing",
-+ "-tsa\u307E\u305F\u306F-tsacert\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u3053\u306Ejar\u306B\u306F\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u3068\u3001\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u671F\u9650(%1$tY-%1$tm-%1$td)\u5F8C\u307E\u305F\u306F\u5C06\u6765\u306E\u5931\u52B9\u65E5\u5F8C\u306B\u3001\u30E6\u30FC\u30B6\u30FC\u306F\u3053\u306Ejar\u3092\u691C\u8A3C\u3067\u304D\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"},
-+ {"no.timestamp.verifying",
-+ "\u3053\u306Ejar\u306B\u306F\u3001\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u7F72\u540D\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u3068\u3001\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u671F\u9650(%1$tY-%1$tm-%1$td)\u5F8C\u307E\u305F\u306F\u5C06\u6765\u306E\u5931\u52B9\u65E5\u5F8C\u306B\u3001\u30E6\u30FC\u30B6\u30FC\u306F\u3053\u306Ejar\u3092\u691C\u8A3C\u3067\u304D\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"},
- };
-
- /**
---- ./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-07-15 21:49:31.000000000 -0700
-@@ -53,9 +53,9 @@
- {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
- "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"},
- {"Usage.jarsigner.options.jar.file.alias",
-- "\u7528\u6CD5: jarsigner [\u9009\u9879] jar \u6587\u4EF6\u522B\u540D"},
-+ "\u7528\u6CD5: jarsigner [\u9009\u9879] jar-file \u522B\u540D"},
- {".jarsigner.verify.options.jar.file.alias.",
-- " jarsigner -verify [options] jar-file [alias...]"},
-+ " jarsigner -verify [\u9009\u9879] jar-file [\u522B\u540D...]"},
- {".keystore.url.keystore.location",
- "[-keystore <url>] \u5BC6\u94A5\u5E93\u4F4D\u7F6E"},
- {".storepass.password.password.for.keystore.integrity",
-@@ -65,7 +65,7 @@
- {".keypass.password.password.for.private.key.if.different.",
- "[-keypass <\u53E3\u4EE4>] \u79C1\u6709\u5BC6\u94A5\u7684\u53E3\u4EE4 (\u5982\u679C\u4E0D\u540C)"},
- {".certchain.file.name.of.alternative.certchain.file",
-- "[-certchain <file>] \u66FF\u4EE3 certchain \u6587\u4EF6\u7684\u540D\u79F0"},
-+ "[-certchain <\u6587\u4EF6>] \u66FF\u4EE3\u8BC1\u4E66\u94FE\u6587\u4EF6\u7684\u540D\u79F0"},
- {".sigfile.file.name.of.SF.DSA.file",
- "[-sigfile <\u6587\u4EF6>] .SF/.DSA \u6587\u4EF6\u7684\u540D\u79F0"},
- {".signedjar.file.name.of.signed.JAR.file",
-@@ -132,8 +132,11 @@
- {".Signature.related.entries.","(\u4E0E\u7B7E\u540D\u76F8\u5173\u7684\u6761\u76EE)"},
- {".Unsigned.entries.", "(\u672A\u7B7E\u540D\u6761\u76EE)"},
- {"jar.is.unsigned.signatures.missing.or.not.parsable.",
-- "jar \u672A\u7B7E\u540D\u3002(\u7F3A\u5C11\u7B7E\u540D\u6216\u65E0\u6CD5\u5BF9\u7B7E\u540D\u8FDB\u884C\u8BED\u6CD5\u5206\u6790)"},
-+ "jar \u672A\u7B7E\u540D\u3002(\u7F3A\u5C11\u7B7E\u540D\u6216\u65E0\u6CD5\u89E3\u6790\u7B7E\u540D)"},
-+ {"jar.signed.", "jar \u5DF2\u7B7E\u540D\u3002"},
-+ {"jar.signed.with.signer.errors.", "jar \u5DF2\u7B7E\u540D, \u4F46\u51FA\u73B0\u7B7E\u540D\u8005\u9519\u8BEF\u3002"},
- {"jar.verified.", "jar \u5DF2\u9A8C\u8BC1\u3002"},
-+ {"jar.verified.with.signer.errors.", "jar \u5DF2\u9A8C\u8BC1, \u4F46\u51FA\u73B0\u7B7E\u540D\u8005\u9519\u8BEF\u3002"},
- {"jarsigner.", "jarsigner: "},
- {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
- "\u7B7E\u540D\u6587\u4EF6\u540D\u5FC5\u987B\u5305\u542B\u4EE5\u4E0B\u5B57\u7B26: A-Z, 0-9, _ \u6216 -"},
-@@ -189,6 +192,7 @@
- "\u6B63\u5728\u4F7F\u7528\u66FF\u4EE3\u7684\u7B7E\u540D\u673A\u5236"},
- {"entry.was.signed.on", "\u6761\u76EE\u7684\u7B7E\u540D\u65E5\u671F\u4E3A {0}"},
- {"Warning.", "\u8B66\u544A: "},
-+ {"Error.", "\u9519\u8BEF: "},
- {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
- "\u6B64 jar \u5305\u542B\u5C1A\u672A\u8FDB\u884C\u5B8C\u6574\u6027\u68C0\u67E5\u7684\u672A\u7B7E\u540D\u6761\u76EE\u3002 "},
- {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
-@@ -225,6 +229,10 @@
- "\u7B7E\u540D\u8005\u7684\u8BC1\u4E66\u94FE\u672A\u9A8C\u8BC1\u3002"},
- {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.",
- "\u6B64 jar \u5305\u542B\u8BC1\u4E66\u94FE\u672A\u9A8C\u8BC1\u7684\u6761\u76EE\u3002"},
-+ {"no.timestamp.signing",
-+ "\u672A\u63D0\u4F9B -tsa \u6216 -tsacert, \u6B64 jar \u6CA1\u6709\u65F6\u95F4\u6233\u3002\u5982\u679C\u6CA1\u6709\u65F6\u95F4\u6233, \u5219\u5728\u7B7E\u540D\u8005\u8BC1\u4E66\u7684\u5230\u671F\u65E5\u671F (%1$tY-%1$tm-%1$td) \u6216\u4EE5\u540E\u7684\u4EFB\u4F55\u64A4\u9500\u65E5\u671F\u4E4B\u540E, \u7528\u6237\u53EF\u80FD\u65E0\u6CD5\u9A8C\u8BC1\u6B64 jar\u3002"},
-+ {"no.timestamp.verifying",
-+ "\u6B64 jar \u5305\u542B\u7684\u7B7E\u540D\u6CA1\u6709\u65F6\u95F4\u6233\u3002\u5982\u679C\u6CA1\u6709\u65F6\u95F4\u6233, \u5219\u5728\u7B7E\u540D\u8005\u8BC1\u4E66\u7684\u5230\u671F\u65E5\u671F (%1$tY-%1$tm-%1$td) \u6216\u4EE5\u540E\u7684\u4EFB\u4F55\u64A4\u9500\u65E5\u671F\u4E4B\u540E, \u7528\u6237\u53EF\u80FD\u65E0\u6CD5\u9A8C\u8BC1\u6B64 jar\u3002"},
- };
-
- /**
---- ./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-10-28 20:19:49.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 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
-@@ -32,6 +32,7 @@
- import java.security.interfaces.ECKey;
- import java.security.interfaces.RSAKey;
- import java.security.interfaces.DSAKey;
-+import java.security.SecureRandom;
- import java.security.spec.KeySpec;
- import javax.crypto.SecretKey;
- import javax.crypto.interfaces.DHKey;
-@@ -157,6 +158,79 @@
- }
-
- /**
-+ * Check the format of TLS PreMasterSecret.
-+ * <P>
-+ * To avoid vulnerabilities described by section 7.4.7.1, RFC 5246,
-+ * treating incorrectly formatted message blocks and/or mismatched
-+ * version numbers in a manner indistinguishable from correctly
-+ * formatted RSA blocks.
-+ *
-+ * RFC 5246 describes the approach as :
-+ *
-+ * 1. Generate a string R of 48 random bytes
-+ *
-+ * 2. Decrypt the message to recover the plaintext M
-+ *
-+ * 3. If the PKCS#1 padding is not correct, or the length of message
-+ * M is not exactly 48 bytes:
-+ * pre_master_secret = R
-+ * else If ClientHello.client_version <= TLS 1.0, and version
-+ * number check is explicitly disabled:
-+ * premaster secret = M
-+ * else If M[0..1] != ClientHello.client_version:
-+ * premaster secret = R
-+ * else:
-+ * premaster secret = M
-+ *
-+ * Note that #2 should have completed before the call to this method.
-+ *
-+ * @param clientVersion the version of the TLS protocol by which the
-+ * client wishes to communicate during this session
-+ * @param serverVersion the negotiated version of the TLS protocol which
-+ * contains the lower of that suggested by the client in the client
-+ * hello and the highest supported by the server.
-+ * @param encoded the encoded key in its "RAW" encoding format
-+ * @param isFailover whether or not the previous decryption of the
-+ * encrypted PreMasterSecret message run into problem
-+ * @return the polished PreMasterSecret key in its "RAW" encoding format
-+ */
-+ public static byte[] checkTlsPreMasterSecretKey(
-+ int clientVersion, int serverVersion, SecureRandom random,
-+ byte[] encoded, boolean isFailOver) {
-+
-+ if (random == null) {
-+ random = new SecureRandom();
-+ }
-+ byte[] replacer = new byte[48];
-+ random.nextBytes(replacer);
-+
-+ if (!isFailOver && (encoded != null)) {
-+ // check the length
-+ if (encoded.length != 48) {
-+ // private, don't need to clone the byte array.
-+ return replacer;
-+ }
-+
-+ int encodedVersion =
-+ ((encoded[0] & 0xFF) << 8) | (encoded[1] & 0xFF);
-+ if (clientVersion != encodedVersion) {
-+ if (clientVersion > 0x0301 || // 0x0301: TLSv1
-+ serverVersion != encodedVersion) {
-+ encoded = replacer;
-+ } // Otherwise, For compatibility, we maintain the behavior
-+ // that the version in pre_master_secret can be the
-+ // negotiated version for TLS v1.0 and SSL v3.0.
-+ }
-+
-+ // private, don't need to clone the byte array.
-+ return encoded;
-+ }
-+
-+ // private, don't need to clone the byte array.
-+ return replacer;
-+ }
-+
-+ /**
- * Returns whether the Diffie-Hellman public key is valid or not.
- *
- * Per RFC 2631 and NIST SP800-56A, the following algorithm is used to
-@@ -198,7 +272,35 @@
- "Diffie-Hellman public key is too large");
- }
-
-- // Don't bother to check against the y^q mod p if safe primes are used.
-+ // y^q mod p == 1?
-+ // Unable to perform this check as q is unknown in this circumstance.
-+
-+ // p is expected to be prime. However, it is too expensive to check
-+ // that p is prime. Instead, in order to mitigate the impact of
-+ // non-prime values, we check that y is not a factor of p.
-+ BigInteger r = p.remainder(y);
-+ if (r.equals(BigInteger.ZERO)) {
-+ throw new InvalidKeyException("Invalid Diffie-Hellman parameters");
-+ }
- }
-+
-+ /**
-+ * Trim leading (most significant) zeroes from the result.
-+ *
-+ * @throws NullPointerException if {@code b} is null
-+ */
-+ public static byte[] trimZeroes(byte[] b) {
-+ int i = 0;
-+ while ((i < b.length - 1) && (b[i] == 0)) {
-+ i++;
-+ }
-+ if (i == 0) {
-+ return b;
-+ }
-+ byte[] t = new byte[b.length - i];
-+ System.arraycopy(b, i, t, 0, t.length);
-+ return t;
-+ }
-+
- }
-
---- ./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-10-28 20:19:49.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, 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
-@@ -75,7 +75,7 @@
- {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
- "Importiert Eintr\u00E4ge aus einer Identity-Datenbank im JDK 1.1.x-Stil"}, //-identitydb
- {"Imports.a.certificate.or.a.certificate.chain",
-- "Importiert ein Zertifikat oder eine Zertifikatkette"}, //-importcert
-+ "Importiert ein Zertifikat oder eine Zertifikatskette"}, //-importcert
- {"Imports.one.or.all.entries.from.another.keystore",
- "Importiert einen oder alle Eintr\u00E4ge aus einem anderen Keystore"}, //-importkeystore
- {"Clones.a.key.entry",
-@@ -301,7 +301,7 @@
- "{0}, {1,date}, "},
- {"alias.", "{0}, "},
- {"Entry.type.type.", "Eintragstyp: {0}"},
-- {"Certificate.chain.length.", "Zertifikatkettenl\u00E4nge: "},
-+ {"Certificate.chain.length.", "Zertifikatskettenl\u00E4nge: "},
- {"Certificate.i.1.", "Zertifikat[{0,number,integer}]:"},
- {"Certificate.fingerprint.SHA1.", "Zertifikat-Fingerprint (SHA1): "},
- {"Keystore.type.", "Keystore-Typ: "},
-@@ -384,9 +384,9 @@
- {"Certificate.reply.does.not.contain.public.key.for.alias.",
- "Zertifikatantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
- {"Incomplete.certificate.chain.in.reply",
-- "Unvollst\u00E4ndige Zertifikatkette in Antwort"},
-+ "Unvollst\u00E4ndige Zertifikatskette in Antwort"},
- {"Certificate.chain.in.reply.does.not.verify.",
-- "Zertifikatkette in Antwort verifiziert nicht: "},
-+ "Zertifikatskette in Antwort verifiziert nicht: "},
- {"Top.level.certificate.in.reply.",
- "Zertifikat der obersten Ebene in Antwort:\n"},
- {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "},
-@@ -444,7 +444,7 @@
- {"Retain", "Beibehalten"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
-- "Warnung: M\u00F6glicherweise enth\u00E4lt der Dateiname Escape-Zeichen mit Backslash. Es ist nicht notwendig, Backslash-Zeichen zu escapen (das Tool f\u00FChrt dies automatisch beim Schreiben des Policy-Contents in den persistenten Speicher aus).\n\nKlicken Sie auf \"Beibehalten\", um den eingegebenen Namen beizubehalten oder auf \"Bearbeiten\", um den Namen zu bearbeiten."},
-+ "Warnung: M\u00F6glicherweise enth\u00E4lt der Dateiname Escapezeichen mit Backslash. Es ist nicht notwendig, Backslash-Zeichen zu escapen (das Tool f\u00FChrt dies automatisch beim Schreiben des Policy-Contents in den persistenten Speicher aus).\n\nKlicken Sie auf \"Beibehalten\", um den eingegebenen Namen beizubehalten oder auf \"Bearbeiten\", um den Namen zu bearbeiten."},
-
- {"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-10-28 20:19:49.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, 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
-@@ -444,7 +444,7 @@
- {"Retain", "Conserver"},
-
- {"Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes",
-- "Avertissement : il se peut que le nom de fichier contienne des barres obliques inverses avec caract\u00E8re d'\u00E9chappement. Il n'est pas n\u00E9cessaire d'ajouter un caract\u00E8re d'\u00E9chappement aux barres obliques inverses. L'outil proc\u00E8de \u00E0 l'\u00E9chappement si n\u00E9cessaire lorsqu'il \u00E9crit le contenu des r\u00E8gles dans la zone de stockage persistant).\n\nCliquez sur Conserver pour garder le nom saisi ou sur Modifier pour le remplacer."},
-+ "Avertissement : il se peut que le nom de fichier contienne des barres obliques inverses avec caract\u00E8re d'\u00E9chappement. Il n'est pas n\u00E9cessaire d'ajouter un caract\u00E8re d'\u00E9chappement aux barres obliques inverses. (L'outil proc\u00E8de \u00E0 l'\u00E9chappement si n\u00E9cessaire lorsqu'il \u00E9crit le contenu des r\u00E8gles dans la zone de stockage persistant).\n\nCliquez sur Conserver pour garder le nom saisi ou sur Modifier pour le remplacer."},
-
- {"Add.Public.Key.Alias", "Ajouter un alias de cl\u00E9 publique"},
- {"Remove.Public.Key.Alias", "Enlever un alias de cl\u00E9 publique"},
-@@ -557,12 +557,12 @@
- {"invalid.null.Class.provided", "classe NULL fournie non valide"},
- {"Subject.", "Objet :\n"},
- {".Principal.", "\tPrincipal : "},
-- {".Public.Credential.", "\tInformations d'identification et de connexion publiques : "},
-+ {".Public.Credential.", "\tInformations d'identification publiques : "},
- {".Private.Credentials.inaccessible.",
-- "\tInformations d'identification et de connexion priv\u00E9es inaccessibles\n"},
-- {".Private.Credential.", "\tInformations d'identification et de connexion priv\u00E9es : "},
-+ "\tInformations d'identification priv\u00E9es inaccessibles\n"},
-+ {".Private.Credential.", "\tInformations d'identification priv\u00E9es : "},
- {".Private.Credential.inaccessible.",
-- "\tInformations d'identification et de connexion priv\u00E9es inaccessibles\n"},
-+ "\tInformations d'identification priv\u00E9es inaccessibles\n"},
- {"Subject.is.read.only", "Sujet en lecture seule"},
- {"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_it.java 2013-09-06 11:28:46.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/util/Resources_it.java 2014-10-28 20:19:49.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, 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
-@@ -340,7 +340,7 @@
- "Immettere un nuovo nome alias\t(premere INVIO per annullare l'importazione della voce): "},
- {"Enter.alias.name.", "Immettere nome alias: "},
- {".RETURN.if.same.as.for.otherAlias.",
-- "\t(INVIO se corrisponde al nome di <{0}>"},
-+ "\t(INVIO se corrisponde al nome di <{0}>)"},
- {".PATTERN.printX509Cert",
- "Proprietario: {0}\nAutorit\u00E0 emittente: {1}\nNumero di serie: {2}\nValido da: {3} a: {4}\nImpronte digitali certificato:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Nome algoritmo firma: {8}\n\t Versione: {9}"},
- {"What.is.your.first.and.last.name.",
---- ./jdk/src/share/classes/sun/security/util/Resources_pt_BR.java 2013-09-06 11:28:46.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/util/Resources_pt_BR.java 2014-10-28 20:19:49.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, 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
-@@ -62,7 +62,7 @@
- {"Changes.an.entry.s.alias",
- "Altera um alias de entrada"}, //-changealias
- {"Deletes.an.entry",
-- "Deleta uma entrada"}, //-delete
-+ "Exclui uma entrada"}, //-delete
- {"Exports.certificate",
- "Exporta o certificado"}, //-exportcert
- {"Generates.a.key.pair",
---- ./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-07-15 21:49:31.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",
- "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
-- {"Failed.to.parse.input", "\u65E0\u6CD5\u5BF9\u8F93\u5165\u8FDB\u884C\u8BED\u6CD5\u5206\u6790"},
-+ {"Failed.to.parse.input", "\u65E0\u6CD5\u89E3\u6790\u8F93\u5165"},
- {"Empty.input", "\u7A7A\u8F93\u5165"},
- {"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-07-15 21:49:31.000000000 -0700
-@@ -388,7 +388,7 @@
- {"Certificate.chain.in.reply.does.not.verify.",
- "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u672A\u9A57\u8B49: "},
- {"Top.level.certificate.in.reply.",
-- "\u56DE\u8986\u6642\u7684\u6700\u9AD8\u7D1A\u6191\u8B49:\\n"},
-+ "\u56DE\u8986\u6642\u7684\u6700\u9AD8\u7D1A\u6191\u8B49:\n"},
- {".is.not.trusted.", "... \u662F\u4E0D\u88AB\u4FE1\u4EFB\u7684\u3002"},
- {"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-07-15 21:49:31.000000000 -0700
-@@ -257,5 +257,5 @@
-
- // java.lang.SecurityManager
- public static final SocketPermission LOCAL_LISTEN_PERMISSION =
-- 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-07-15 21:49:31.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 2014-07-15 21:49:31.000000000 -0700
-@@ -30,6 +30,7 @@
- import java.security.AccessController;
- import java.security.PrivilegedAction;
- import javax.swing.UIDefaults;
-+import sun.reflect.misc.ReflectUtil;
-
- /**
- * SwingLazyValue is a copy of ProxyLazyValue that does not snapshot the
-@@ -63,7 +64,7 @@
-
- public Object createValue(final UIDefaults table) {
- try {
-- Object cl;
-+ ReflectUtil.checkPackageAccess(className);
- Class<?> c = Class.forName(className, true, null);
- 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 2014-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 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,6 +34,7 @@
- import java.awt.geom.*;
- import java.awt.print.PrinterGraphics;
- import java.text.Bidi;
-+import java.text.CharacterIterator;
- import java.text.AttributedCharacterIterator;
- import java.text.AttributedString;
-
-@@ -503,21 +504,24 @@
- * it to fit in the screen width. This distributes the spacing
- * more evenly than directly laying out to the screen advances.
- */
-- float screenWidth = (float)
-- g2d.getFont().getStringBounds(text, DEFAULT_FRC).getWidth();
-- TextLayout layout = createTextLayout(c, text, g2d.getFont(),
-- g2d.getFontRenderContext());
--
-- layout = layout.getJustifiedLayout(screenWidth);
-- /* Use alternate print color if specified */
-- Color col = g2d.getColor();
-- if (col instanceof PrintColorUIResource) {
-- g2d.setColor(((PrintColorUIResource)col).getPrintColor());
-- }
-+ String trimmedText = trimTrailingSpaces(text);
-+ if (!trimmedText.isEmpty()) {
-+ float screenWidth = (float) g2d.getFont().getStringBounds
-+ (trimmedText, DEFAULT_FRC).getWidth();
-+ TextLayout layout = createTextLayout(c, text, g2d.getFont(),
-+ g2d.getFontRenderContext());
-+
-+ layout = layout.getJustifiedLayout(screenWidth);
-+ /* Use alternate print color if specified */
-+ Color col = g2d.getColor();
-+ if (col instanceof PrintColorUIResource) {
-+ g2d.setColor(((PrintColorUIResource)col).getPrintColor());
-+ }
-
-- layout.draw(g2d, x, y);
-+ layout.draw(g2d, x, y);
-
-- g2d.setColor(col);
-+ g2d.setColor(col);
-+ }
-
- return;
- }
-@@ -777,24 +781,26 @@
- if (frc != null &&
- !isFontRenderContextPrintCompatible
- (deviceFontRenderContext, frc)) {
-- TextLayout layout =
-- createTextLayout(c, new String(data, offset, length),
-- g2d.getFont(),
-- deviceFontRenderContext);
-- float screenWidth = (float)g2d.getFont().
-- getStringBounds(data, offset, offset + length, frc).
-- getWidth();
-- layout = layout.getJustifiedLayout(screenWidth);
-
-- /* Use alternate print color if specified */
-- Color col = g2d.getColor();
-- if (col instanceof PrintColorUIResource) {
-- g2d.setColor(((PrintColorUIResource)col).getPrintColor());
-- }
-+ String text = new String(data, offset, length);
-+ TextLayout layout = new TextLayout(text, g2d.getFont(),
-+ deviceFontRenderContext);
-+ String trimmedText = trimTrailingSpaces(text);
-+ if (!trimmedText.isEmpty()) {
-+ float screenWidth = (float)g2d.getFont().
-+ getStringBounds(trimmedText, frc).getWidth();
-+ layout = layout.getJustifiedLayout(screenWidth);
-
-- layout.draw(g2d,x,y);
-+ /* Use alternate print color if specified */
-+ Color col = g2d.getColor();
-+ if (col instanceof PrintColorUIResource) {
-+ g2d.setColor(((PrintColorUIResource)col).getPrintColor());
-+ }
-
-- g2d.setColor(col);
-+ layout.draw(g2d,x,y);
-+
-+ g2d.setColor(col);
-+ }
-
- return nextX;
- }
-@@ -876,14 +882,23 @@
- } else {
- frc = g2d.getFontRenderContext();
- }
-- TextLayout layout = new TextLayout(iterator, frc);
-+ TextLayout layout;
- if (isPrinting) {
- FontRenderContext deviceFRC = g2d.getFontRenderContext();
- if (!isFontRenderContextPrintCompatible(frc, deviceFRC)) {
-- float screenWidth = layout.getAdvance();
- layout = new TextLayout(iterator, deviceFRC);
-- layout = layout.getJustifiedLayout(screenWidth);
-+ AttributedCharacterIterator trimmedIt =
-+ getTrimmedTrailingSpacesIterator(iterator);
-+ if (trimmedIt != null) {
-+ float screenWidth = new TextLayout(trimmedIt, frc).
-+ getAdvance();
-+ layout = layout.getJustifiedLayout(screenWidth);
-+ }
-+ } else {
-+ layout = new TextLayout(iterator, frc);
- }
-+ } else {
-+ layout = new TextLayout(iterator, frc);
- }
- layout.draw(g2d, x, y);
- retVal = layout.getAdvance();
-@@ -1035,6 +1050,39 @@
- return (g instanceof PrinterGraphics || g instanceof PrintGraphics);
- }
-
-+ private static String trimTrailingSpaces(String s) {
-+ int i = s.length() - 1;
-+ while(i >= 0 && Character.isWhitespace(s.charAt(i))) {
-+ i--;
-+ }
-+ return s.substring(0, i + 1);
-+ }
-+
-+ private static AttributedCharacterIterator getTrimmedTrailingSpacesIterator
-+ (AttributedCharacterIterator iterator) {
-+ int curIdx = iterator.getIndex();
-+
-+ char c = iterator.last();
-+ while(c != CharacterIterator.DONE && Character.isWhitespace(c)) {
-+ c = iterator.previous();
-+ }
-+
-+ if (c != CharacterIterator.DONE) {
-+ int endIdx = iterator.getIndex();
-+
-+ if (endIdx == iterator.getEndIndex() - 1) {
-+ iterator.setIndex(curIdx);
-+ return iterator;
-+ } else {
-+ AttributedString trimmedText = new AttributedString(iterator,
-+ iterator.getBeginIndex(), endIdx + 1);
-+ return trimmedText.getIterator();
-+ }
-+ } else {
-+ return null;
-+ }
-+ }
-+
- /**
- * Determines whether the SelectedTextColor should be used for painting text
- * foreground for the specified highlight.
-@@ -1301,6 +1349,19 @@
- }
-
- /**
-+ * Utility method that throws SecurityException if SecurityManager is set
-+ * and modifiers are not public
-+ *
-+ * @param modifiers a set of modifiers
-+ */
-+ public static void checkAccess(int modifiers) {
-+ if (System.getSecurityManager() != null
-+ && !Modifier.isPublic(modifiers)) {
-+ throw new SecurityException("Resource is not accessible");
-+ }
-+ }
-+
-+ /**
- * Returns true if EventQueue.getCurrentEvent() has the permissions to
- * 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-10-28 20:19:52.000000000 -0700
-@@ -30,4 +30,5 @@
- #[solaris]sun.tools.attach.SolarisAttachProvider
- #[windows]sun.tools.attach.WindowsAttachProvider
- #[linux]sun.tools.attach.LinuxAttachProvider
-+#[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-10-28 20:19:52.000000000 -0700
-@@ -51,6 +51,7 @@
- String zname = "";
- String[] files;
- String rootjar = null;
-+ String cwd;
-
- // An entryName(path)->File map generated during "expand", it helps to
- // decide whether or not an existing entry in a jar file needs to be
-@@ -867,6 +868,19 @@
- * Extracts specified entries from JAR file.
- */
- void extract(InputStream in, String files[]) throws IOException {
-+ // Current working directory
-+
-+ cwd = System.getProperty("user.dir");
-+ if (cwd == null) {
-+ fatalError(getMsg("error.no.cwd"));
-+ }
-+ cwd = (new File(cwd)).getCanonicalPath();
-+ if (!cwd.endsWith(File.separator)) {
-+ cwd += File.separator;
-+ }
-+
-+ // Extract the files
-+
- ZipInputStream zis = new ZipInputStream(in);
- ZipEntry e;
- // Set of all directory entries specified in archive. Disallows
-@@ -897,6 +911,19 @@
- * Extracts specified entries from JAR file, via ZipFile.
- */
- void extract(String fname, String files[]) throws IOException {
-+ // Current working directory
-+
-+ cwd = System.getProperty("user.dir");
-+ if (cwd == null) {
-+ fatalError(getMsg("error.no.cwd"));
-+ }
-+ cwd = (new File(cwd)).getCanonicalPath();
-+ if (!cwd.endsWith(File.separator)) {
-+ cwd += File.separator;
-+ }
-+
-+ // Extract the files
-+
- ZipFile zf = new ZipFile(fname);
- Set<ZipEntry> dirs = newDirSet();
- Enumeration<? extends ZipEntry> zes = zf.entries();
-@@ -928,6 +955,10 @@
- ZipEntry rc = null;
- String name = e.getName();
- File f = new File(e.getName().replace('/', File.separatorChar));
-+ if (!f.getCanonicalPath().startsWith(cwd)) {
-+ output(formatMsg("out.ignore.entry", name));
-+ return null;
-+ }
- if (e.isDirectory()) {
- if (f.exists()) {
- if (!f.isDirectory()) {
-@@ -949,6 +980,10 @@
- } else {
- if (f.getParent() != null) {
- File d = new File(f.getParent());
-+ if (!d.getCanonicalPath().startsWith(cwd)) {
-+ output(formatMsg("out.ignore.entry", name));
-+ return null;
-+ }
- if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
- 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-10-28 20:19:52.000000000 -0700
-@@ -44,6 +44,8 @@
- {0} : could not create directory
- error.incorrect.length=\
- incorrect length while processing: {0}
-+error.no.cwd=\
-+ {0} : could not determine current working directory
- out.added.manifest=\
- 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-07-15 21:49:31.000000000 -0700
-@@ -41,7 +41,7 @@
- out.stored=(0 % gespeichert)
- out.create=\ erstellt: {0}
- out.extracted=extrahiert: {0}
--out.inflated=\ \\vergr\u00F6\u00DFert: {0}
-+out.inflated=\ vergr\u00F6\u00DFert: {0}
- out.size=(ein = {0}) (aus = {1})
-
- 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-07-15 21:49:31.000000000 -0700
-@@ -41,7 +41,7 @@
- out.stored=(almacenado 0%)
- out.create=\ creado: {0}
- out.extracted=extra\u00EDdo: {0}
--out.inflated=\ \\inflado: {0}
-+out.inflated=\ inflado: {0}
- out.size=(entrada = {0}) (salida = {1})
-
--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-07-15 21:49:31.000000000 -0700
-@@ -41,7 +41,7 @@
- out.stored=(stockage : 0 %)
- out.create=\ cr\u00E9\u00E9 : {0}
- out.extracted=extrait : {0}
--out.inflated=\ \\d\u00E9compress\u00E9 : {0}
-+out.inflated=\ d\u00E9compress\u00E9 : {0}
- out.size=(entr\u00E9e = {0}) (sortie = {1})
-
- 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-07-15 21:49:31.000000000 -0700
-@@ -41,7 +41,7 @@
- out.stored=(memorizzato 0%)
- out.create=\ creato: {0}
- out.extracted=estratto: {0}
--out.inflated=\ \\decompresso: {0}
-+out.inflated=\ decompresso: {0}
- out.size=(in = {0}) (out = {1})
-
--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-07-15 21:49:31.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
- out.extracted={0}\u304C\u62BD\u51FA\u3055\u308C\u307E\u3057\u305F
--out.inflated=\ \\{0}\u304C\u5C55\u958B\u3055\u308C\u307E\u3057\u305F
-+out.inflated=\ {0}\u304C\u5C55\u958B\u3055\u308C\u307E\u3057\u305F
- out.size=(\u5165={0})(\u51FA={1})
-
--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-07-15 21:49:31.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}
- out.added.manifest=Manifest\uB97C \uCD94\uAC00\uD568
--out.update.manifest=Manifest\uB97C \uAC31\uC2E0\uD568
-+out.update.manifest=Manifest\uB97C \uC5C5\uB370\uC774\uD2B8\uD568
- out.ignore.entry={0} \uD56D\uBAA9\uC744 \uBB34\uC2DC\uD558\uB294 \uC911
- out.adding=\uCD94\uAC00\uD558\uB294 \uC911: {0}
- out.deflated=({0}%\uB97C \uAC10\uC18C\uD568)
- out.stored=(0%\uB97C \uC800\uC7A5\uD568)
- out.create=\ \uC0DD\uC131\uB428: {0}
- out.extracted=\uCD94\uCD9C\uB428: {0}
--out.inflated=\ \\\uC99D\uAC00\uB428: {0}
-+out.inflated=\ \uC99D\uAC00\uB428: {0}
- out.size=(\uC785\uB825 = {0}) (\uCD9C\uB825 = {1})
-
--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-07-15 21:49:31.000000000 -0700
-@@ -37,11 +37,11 @@
- out.update.manifest=manifesto atualizado
- out.ignore.entry=ignorando entrada {0}
- out.adding=adicionando: {0}
--out.deflated=(vazio {0}%)
-+out.deflated=(compactado {0}%)
- out.stored=(armazenado 0%)
- out.create=\ criado: {0}
- out.extracted=extra\u00EDdo: {0}
--out.inflated=\ \\cheio: {0}
--out.size=(dentro = {0}) (fora= {1})
-+out.inflated=\ inflado: {0}
-+out.size=(entrada = {0}) (sa\u00EDda= {1})
-
--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
-+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 atualiza 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 passa para o diret\u00F3rio especificado e inclui o arquivo a seguir\nSe um arquivo tamb\u00E9m for um diret\u00F3rio, ele 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 denominado 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-07-15 21:49:31.000000000 -0700
-@@ -44,4 +44,4 @@
- out.inflated=\ uppackat: {0}
- out.size=(in = {0}) (ut = {1})
-
--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-07-15 21:49:31.000000000 -0700
-@@ -44,4 +44,4 @@
- out.inflated=\ \u5DF2\u89E3\u538B: {0}
- out.size=(\u8F93\u5165 = {0}) (\u8F93\u51FA = {1})
-
--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-07-15 21:49:31.000000000 -0700
-@@ -41,7 +41,7 @@
- out.stored=(\u5132\u5B58 0%)
- out.create=\ \u5EFA\u7ACB: {0}
- out.extracted=\u64F7\u53D6: {0}
--out.inflated=\ \\\u64F4\u5C55: {0}
-+out.inflated=\ \u64F4\u5C55: {0}
- out.size=\ (\u8B80={0})(\u5BEB={1})
-
- 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/tools/jconsole/Messages.java 2013-09-06 11:28:49.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/jconsole/Messages.java 2014-07-15 21:49:31.000000000 -0700
-@@ -36,7 +36,7 @@
- Resources.initializeMessages(Messages.class, BUNDLE_NAME);
- }
- // TODO:
-- // The names of some of the constants below looks strange.
-+ // The names of some of the constants below look strange.
- // That's because they were generated programmatically
- // from the messages. They should be cleaned up,
- // ___ should be removed etc.
-@@ -265,6 +265,7 @@
- public static String SUMMARY_TAB_TAB_NAME;
- public static String SUMMARY_TAB_VM_VERSION;
- public static String THREADS;
-+ public static String THREAD_TAB_INFO_LABEL_FORMAT;
- public static String THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME;
- public static String THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME;
- public static String THRESHOLD;
-@@ -304,9 +305,9 @@
- public static String WRITABLE;
- public static String CONNECTION_FAILED1;
- public static String CONNECTION_FAILED2;
-+ public static String CONNECTION_FAILED_SSL1;
-+ public static String CONNECTION_FAILED_SSL2;
- public static String CONNECTION_LOST1;
-- public static String CONNECTION_INSECURE1;
-- public static String CONNECTION_INSECURE2;
- public static String CONNECTING_TO1;
- public static String CONNECTING_TO2;
- public static String DEADLOCK_TAB;
---- ./jdk/src/share/classes/sun/tools/jconsole/SummaryTab.java 2013-09-06 11:28:49.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/jconsole/SummaryTab.java 2014-07-15 21:49:31.000000000 -0700
-@@ -213,8 +213,8 @@
- String[] strings2 = formatKByteStrings(u.getCommitted());
- append(Messages.COMMITTED_MEMORY, strings2[0]);
- append(Messages.SUMMARY_TAB_PENDING_FINALIZATION_LABEL,
-- Messages.SUMMARY_TAB_PENDING_FINALIZATION_VALUE,
-- memoryBean.getObjectPendingFinalizationCount());
-+ Resources.format(Messages.SUMMARY_TAB_PENDING_FINALIZATION_VALUE,
-+ memoryBean.getObjectPendingFinalizationCount()));
- append(endTable);
-
- append(newTable);
---- ./jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java 2013-09-06 11:28:49.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java 2014-07-15 21:49:31.000000000 -0700
-@@ -66,9 +66,6 @@
-
- private static final Border thinEmptyBorder = new EmptyBorder(2, 2, 2, 2);
-
-- private static final String infoLabelFormat = "ThreadTab.infoLabelFormat";
--
--
- /*
- Hierarchy of panels and layouts for this tab:
-
-@@ -690,7 +687,7 @@
-
- private void updateThreadsInfo(long tlCount, long tpCount, long ttCount, long timeStamp) {
- getPlotter().addValues(timeStamp, tlCount);
-- getInfoLabel().setText(Resources.format(infoLabelFormat, tlCount, tpCount, ttCount));
-+ getInfoLabel().setText(Resources.format(Messages.THREAD_TAB_INFO_LABEL_FORMAT, tlCount, tpCount, ttCount));
- }
- }
- }
---- ./jdk/src/share/classes/sun/tools/jconsole/VMPanel.java 2013-09-06 11:28:50.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/jconsole/VMPanel.java 2014-07-15 21:49:31.000000000 -0700
-@@ -469,8 +469,8 @@
- msgExplanation = Resources.format(Messages.CONNECTING_TO2, getConnectionName());
- buttonStr = Messages.RECONNECT;
- } else if (shouldUseSSL) {
-- msgTitle = Messages.CONNECTION_INSECURE1;
-- msgExplanation = Resources.format(Messages.CONNECTION_INSECURE2, getConnectionName());
-+ msgTitle = Messages.CONNECTION_FAILED_SSL1;
-+ msgExplanation = Resources.format(Messages.CONNECTION_FAILED_SSL2, getConnectionName());
- buttonStr = Messages.INSECURE;
- } else {
- msgTitle = Messages.CONNECTION_FAILED1;
---- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties 2013-09-06 11:28:50.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties 2014-07-15 21:49:32.000000000 -0700
-@@ -223,6 +223,7 @@
- SUMMARY_TAB_TAB_NAME=VM Summary
- SUMMARY_TAB_VM_VERSION={0} version {1}
- THREADS=Threads
-+THREAD_TAB_INFO_LABEL_FORMAT=<html>Live: {0} Peak: {1} Total: {2}</html>
- THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=Thread Information
- THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=Chart for number of threads.
- THRESHOLD=Threshold
-@@ -244,7 +245,7 @@
- UNREGISTER=Unregister
- UPTIME=Uptime
- USAGE_THRESHOLD=Usage Threshold
--REMOTE_TF_USAGE=<b>Usage</b>: &lt;hostname&gt;:&lt;port&gt; OR service:jmx:&lt;protocol&gt;:&lt;sap&gt;
-+REMOTE_TF_USAGE=<b>Usage</b>: &&lt;hostname&&gt;:&&lt;port&&gt; OR service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
- USED=Used
- USERNAME_COLON_=&Username:
- USERNAME_ACCESSIBLE_NAME=User Name
-@@ -262,9 +263,9 @@
- WRITABLE=Writable
- CONNECTION_FAILED1=Connection Failed: Retry?
- CONNECTION_FAILED2=The connection to {0} did not succeed.<br>Would you like to try again?
-+CONNECTION_FAILED_SSL1=Secure connection failed. Retry insecurely?
-+CONNECTION_FAILED_SSL2=The connection to {0} could not be made using SSL.<br>Would you like to try without SSL?<br>(Username and password will be sent in plain text.)
- CONNECTION_LOST1=Connection Lost: Reconnect?
--CONNECTION_INSECURE1=ConnectionFailedSSL1
--CONNECTION_INSECURE2=ConnectionFailedSSL2
- CONNECTING_TO1=Connecting to {0}
- CONNECTING_TO2=You are currently being connected to {0}.<br>This will take a few moments.
- DEADLOCK_TAB=Deadlock
---- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties 2013-09-06 11:28:50.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties 2014-10-28 20:19:49.000000000 -0700
-@@ -31,7 +31,7 @@
- CPU_USAGE=CPU\u4F7F\u7528\u7387
- CPU_USAGE_FORMAT=CPU\u4F7F\u7528\u7387: {0}%
- CANCEL=\u53D6\u6D88
--CASCADE=\u91CD\u306D\u3066\u8868\u793A(&C)
-+CASCADE=\u30AB\u30B9\u30B1\u30FC\u30C9\u8868\u793A(&C)
- CHART_COLON=\u30C1\u30E3\u30FC\u30C8(&C):
- CLASS_PATH=\u30AF\u30E9\u30B9\u30D1\u30B9
- CLASS_NAME=ClassName
-@@ -52,7 +52,7 @@
- CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u30B9\u30C6\u30FC\u30BF\u30B9\u30FB\u30D0\u30FC
- CONNECT_DIALOG_TITLE=JConsole: \u65B0\u898F\u63A5\u7D9A
- CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u63A5\u7D9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u5207\u65AD\u3057\u307E\u3059\u3002
--CONNECTION_FAILED=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-+CONNECTION_FAILED=\u63A5\u7D9A\u304C\u5931\u6557\u3057\u307E\u3057\u305F
- CONNECTION=\u63A5\u7D9A(&C)
- CONNECTION_NAME=\u63A5\u7D9A\u540D
- CONNECTION_NAME__DISCONNECTED_={0} (\u5207\u65AD\u6E08)
-@@ -88,8 +88,8 @@
- FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u7F6E\u63DB
- FILE_CHOOSER_FILE_EXISTS_TITLE=\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
- FILE_CHOOSER_SAVED_FILE=<html>\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3057\u305F:<br>{0}<br>({1}\u30D0\u30A4\u30C8)
--FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F:<br>{0}<br>{1}
--FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-+FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u4FDD\u5B58\u304C\u5931\u6557\u3057\u307E\u3057\u305F:<br>{0}<br>{1}
-+FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u304C\u5931\u6557\u3057\u307E\u3057\u305F
- FREE_PHYSICAL_MEMORY=\u7A7A\u304D\u7269\u7406\u30E1\u30E2\u30EA\u30FC
- FREE_SWAP_SPACE=\u7A7A\u304D\u30B9\u30EF\u30C3\u30D7\u30FB\u30B9\u30DA\u30FC\u30B9
- GARBAGE_COLLECTOR=\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30BF
-@@ -161,7 +161,7 @@
- MESSAGE=\u30E1\u30C3\u30BB\u30FC\u30B8
- METHOD_SUCCESSFULLY_INVOKED=\u30E1\u30BD\u30C3\u30C9\u304C\u6B63\u5E38\u306B\u8D77\u52D5\u3055\u308C\u307E\u3057\u305F
- MINIMIZE_ALL=\u3059\u3079\u3066\u6700\u5C0F\u5316(&M)
--MONITOR_LOCKED=\ \ \ - \u30ED\u30C3\u30AF\u6E08{0}\n
-+MONITOR_LOCKED=\ - \u30ED\u30C3\u30AF\u6E08{0}\n
- NAME=\u540D\u524D
- NAME_AND_BUILD={0} (\u30D3\u30EB\u30C9{1})
- NAME_STATE=\u540D\u524D: {0}\n\u72B6\u614B: {1}\n
-@@ -205,6 +205,7 @@
- PROCESS_CPU_TIME=\u30D7\u30ED\u30BB\u30B9CPU\u6642\u9593
- READABLE=\u8AAD\u53D6\u308A\u53EF\u80FD
- RECONNECT=\u518D\u63A5\u7D9A
-+INSECURE=\u975E\u30BB\u30AD\u30E5\u30A2
- REMOTE_PROCESS_COLON=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9(&R):
- REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9
- RESTORE_ALL=\u3059\u3079\u3066\u5FA9\u5143(&R)
-@@ -222,10 +223,11 @@
- SUMMARY_TAB_TAB_NAME=VM\u30B5\u30DE\u30EA\u30FC
- SUMMARY_TAB_VM_VERSION={0}\u30D0\u30FC\u30B8\u30E7\u30F3{1}
- THREADS=\u30B9\u30EC\u30C3\u30C9
-+THREAD_TAB_INFO_LABEL_FORMAT=<html>\u5B9F\u884C\u4E2D: {0} \u30D4\u30FC\u30AF: {1} \u5408\u8A08: {2}</html>
- THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u60C5\u5831
- THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u6570\u306E\u30C1\u30E3\u30FC\u30C8\u3002
- THRESHOLD=\u3057\u304D\u3044\u5024
--TILE=\u4E26\u3079\u3066\u8868\u793A(&T)
-+TILE=\u30BF\u30A4\u30EB\u8868\u793A(&T)
- TIME_RANGE_COLON=\u6642\u9593\u7BC4\u56F2(&T):
- TIME=\u6642\u9593
- TIME_STAMP=TimeStamp
-@@ -243,14 +245,14 @@
- UNREGISTER=\u767B\u9332\u89E3\u9664
- UPTIME=\u7A3C\u50CD\u6642\u9593
- USAGE_THRESHOLD=\u4F7F\u7528\u3057\u304D\u3044\u5024
--REMOTE_TF_USAGE=<b>\u4F7F\u7528\u65B9\u6CD5</b>: &lt;hostname&gt;:&lt;port&gt;\u307E\u305F\u306Fservice:jmx:&lt;protocol&gt;:&lt;sap&gt;
-+REMOTE_TF_USAGE=<b>\u4F7F\u7528\u65B9\u6CD5</b>: &&lt;hostname&&gt;:&&lt;port&&gt; OR service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
- USED=\u4F7F\u7528\u6E08
- USERNAME_COLON_=\u30E6\u30FC\u30B6\u30FC\u540D(&U):
- USERNAME_ACCESSIBLE_NAME=\u30E6\u30FC\u30B6\u30FC\u540D
- USER_DATA=UserData
- VIRTUAL_MACHINE=\u4EEE\u60F3\u30DE\u30B7\u30F3
- VM_ARGUMENTS=VM\u5F15\u6570
--VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30E2\u30CB\u30BF\u30FC\u7528\u306E\u5185\u90E8\u30D5\u30EC\u30FC\u30E0
-+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30E2\u30CB\u30BF\u30EA\u30F3\u30B0\u7528\u306E\u5185\u90E8\u30D5\u30EC\u30FC\u30E0
- VALUE=\u5024
- VENDOR=\u30D9\u30F3\u30C0\u30FC
- VERBOSE_OUTPUT=\u8A73\u7D30\u51FA\u529B
-@@ -259,8 +261,10 @@
- WINDOW=\u30A6\u30A3\u30F3\u30C9\u30A6(&W)
- WINDOWS=\u30A6\u30A3\u30F3\u30C9\u30A6
- WRITABLE=\u66F8\u8FBC\u307F\u53EF\u80FD
--CONNECTION_FAILED1=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F: \u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
--CONNECTION_FAILED2={0}\u3078\u306E\u63A5\u7D9A\u304C\u6210\u529F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002<br>\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u307E\u3059\u304B\u3002
-+CONNECTION_FAILED1=\u63A5\u7D9A\u304C\u5931\u6557\u3057\u307E\u3057\u305F: \u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
-+CONNECTION_FAILED2={0}\u3078\u306E\u63A5\u7D9A\u304C\u6210\u529F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002<br>\u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
-+CONNECTION_FAILED_SSL1=\u30BB\u30AD\u30E5\u30A2\u306A\u63A5\u7D9A\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u975E\u30BB\u30AD\u30E5\u30A2\u3067\u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
-+CONNECTION_FAILED_SSL2=SSL\u3092\u4F7F\u7528\u3057\u3066{0}\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002<br>SSL\u306A\u3057\u3067\u63A5\u7D9A\u3057\u307E\u3059\u304B\u3002<br>(\u30E6\u30FC\u30B6\u30FC\u540D\u304A\u3088\u3073\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u30D7\u30EC\u30FC\u30F3\u30FB\u30C6\u30AD\u30B9\u30C8\u3067\u9001\u4FE1\u3055\u308C\u307E\u3059\u3002)
- CONNECTION_LOST1=\u63A5\u7D9A\u304C\u5931\u308F\u308C\u307E\u3057\u305F: \u518D\u63A5\u7D9A\u3057\u307E\u3059\u304B\u3002
- CONNECTING_TO1={0}\u306B\u63A5\u7D9A\u4E2D
- CONNECTING_TO2={0}\u306B\u73FE\u5728\u63A5\u7D9A\u4E2D\u3067\u3059\u3002<br>\u3053\u308C\u306B\u306F\u6570\u5206\u304B\u304B\u308A\u307E\u3059\u3002
-@@ -270,4 +274,4 @@
- KBYTES={0} KB
- PLOT=\u30D7\u30ED\u30C3\u30C8
- VISUALIZE=\u8996\u899A\u5316
--ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n -interval \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n -notile \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u4E26\u3079\u3066\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n -version \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5370\u5237\u3059\u308B\n\n connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n pid \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n host \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n port \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n -J JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B
-+ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n -interval \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n -notile \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u30BF\u30A4\u30EB\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n -version \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3059\u308B\n\n connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n pid \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n host \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n port \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n -J JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B
---- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties 2013-09-06 11:28:50.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties 2014-07-15 21:49:32.000000000 -0700
-@@ -161,7 +161,7 @@
- MESSAGE=\u6D88\u606F
- METHOD_SUCCESSFULLY_INVOKED=\u5DF2\u6210\u529F\u8C03\u7528\u65B9\u6CD5
- MINIMIZE_ALL=\u5168\u90E8\u6700\u5C0F\u5316(&M)
--MONITOR_LOCKED=\ \ \ - \u5DF2\u9501\u5B9A {0}\n
-+MONITOR_LOCKED=\ - \u5DF2\u9501\u5B9A {0}\n
- NAME=\u540D\u79F0
- NAME_AND_BUILD={0} (\u5DE5\u4F5C\u7248\u672C {1})
- NAME_STATE=\u540D\u79F0: {0}\n\u72B6\u6001: {1}\n
-@@ -205,6 +205,7 @@
- PROCESS_CPU_TIME=\u8FDB\u7A0B CPU \u65F6\u95F4
- READABLE=\u53EF\u8BFB
- RECONNECT=\u91CD\u65B0\u8FDE\u63A5
-+INSECURE=\u4E0D\u5B89\u5168
- REMOTE_PROCESS_COLON=\u8FDC\u7A0B\u8FDB\u7A0B(&R):
- REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u8FDC\u7A0B\u8FDB\u7A0B
- RESTORE_ALL=\u5168\u90E8\u8FD8\u539F(&R)
-@@ -222,6 +223,7 @@
- SUMMARY_TAB_TAB_NAME=VM \u6982\u8981
- SUMMARY_TAB_VM_VERSION={0}\u7248\u672C {1}
- THREADS=\u7EBF\u7A0B
-+THREAD_TAB_INFO_LABEL_FORMAT=<html>\u6D3B\u52A8: {0} \u5CF0\u503C: {1} \u603B\u8BA1: {2}</html>
- THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u7EBF\u7A0B\u4FE1\u606F
- THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u8868\u793A\u7EBF\u7A0B\u6570\u7684\u56FE\u8868\u3002
- THRESHOLD=\u9608\u503C
-@@ -243,7 +245,7 @@
- UNREGISTER=\u6CE8\u9500
- UPTIME=\u8FD0\u884C\u65F6\u95F4
- USAGE_THRESHOLD=\u7528\u6CD5\u9608\u503C
--REMOTE_TF_USAGE=<b>\u7528\u6CD5</b>: &lt;hostname&gt;:&lt;port&gt; \u6216 service:jmx:&lt;protocol&gt;:&lt;sap&gt;
-+REMOTE_TF_USAGE=<b>\u7528\u6CD5</b>: &&lt;hostname&&gt;:&&lt;port&&gt; \u6216 service:jmx:&&lt;protocol&&gt;:&&lt;sap&&gt;
- USED=\u5DF2\u7528
- USERNAME_COLON_=\u7528\u6237\u540D(&U):
- USERNAME_ACCESSIBLE_NAME=\u7528\u6237\u540D
-@@ -261,6 +263,8 @@
- WRITABLE=\u53EF\u5199\u5165
- CONNECTION_FAILED1=\u8FDE\u63A5\u5931\u8D25: \u662F\u5426\u91CD\u8BD5?
- CONNECTION_FAILED2=\u672A\u6210\u529F\u8FDE\u63A5\u5230{0}\u3002<br>\u662F\u5426\u8981\u91CD\u8BD5?
-+CONNECTION_FAILED_SSL1=\u5B89\u5168\u8FDE\u63A5\u5931\u8D25\u3002\u662F\u5426\u4EE5\u4E0D\u5B89\u5168\u7684\u65B9\u5F0F\u91CD\u8BD5?
-+CONNECTION_FAILED_SSL2=\u65E0\u6CD5\u4F7F\u7528 SSL \u8FDE\u63A5\u5230{0}\u3002<br>\u662F\u5426\u5728\u4E0D\u4F7F\u7528 SSL \u7684\u60C5\u51B5\u4E0B\u8FDB\u884C\u5C1D\u8BD5?<br>(\u7528\u6237\u540D\u548C\u53E3\u4EE4\u5C06\u4EE5\u7EAF\u6587\u672C\u683C\u5F0F\u53D1\u9001\u3002)
- CONNECTION_LOST1=\u8FDE\u63A5\u4E22\u5931: \u662F\u5426\u91CD\u65B0\u8FDE\u63A5?
- CONNECTING_TO1=\u6B63\u5728\u8FDE\u63A5\u5230{0}
- CONNECTING_TO2=\u60A8\u5F53\u524D\u6B63\u5728\u8FDE\u63A5\u5230{0}\u3002<br>\u8FD9\u5C06\u9700\u8981\u51E0\u5206\u949F\u7684\u65F6\u95F4\u3002
---- ./jdk/src/share/classes/sun/util/locale/BaseLocale.java 2013-09-06 11:28:51.000000000 -0700
-+++ ./jdk/src/share/classes/sun/util/locale/BaseLocale.java 2014-10-28 20:19:49.000000000 -0700
-@@ -31,6 +31,7 @@
- */
-
- package sun.util.locale;
-+import java.lang.ref.SoftReference;
-
-
- public final class BaseLocale {
-@@ -163,11 +164,11 @@
- return h;
- }
-
-- private static final class Key implements Comparable<Key> {
-- private final String lang;
-- private final String scrt;
-- private final String regn;
-- private final String vart;
-+ private static final class Key {
-+ private final SoftReference<String> lang;
-+ private final SoftReference<String> scrt;
-+ private final SoftReference<String> regn;
-+ private final SoftReference<String> vart;
- private final boolean normalized;
- private final int hash;
-
-@@ -179,10 +180,10 @@
- assert language.intern() == language
- && region.intern() == region;
-
-- lang = language;
-- scrt = "";
-- regn = region;
-- vart = "";
-+ lang = new SoftReference(language);
-+ scrt = new SoftReference("");
-+ regn = new SoftReference(region);
-+ vart = new SoftReference("");
- this.normalized = true;
-
- int h = language.hashCode();
-@@ -203,40 +204,40 @@
- String variant, boolean normalized) {
- int h = 0;
- if (language != null) {
-- lang = language;
-+ lang = new SoftReference(language);
- int len = language.length();
- for (int i = 0; i < len; i++) {
- h = 31*h + LocaleUtils.toLower(language.charAt(i));
- }
- } else {
-- lang = "";
-+ lang = new SoftReference("");
- }
- if (script != null) {
-- scrt = script;
-+ scrt = new SoftReference(script);
- int len = script.length();
- for (int i = 0; i < len; i++) {
- h = 31*h + LocaleUtils.toLower(script.charAt(i));
- }
- } else {
-- scrt = "";
-+ scrt = new SoftReference("");
- }
- if (region != null) {
-- regn = region;
-+ regn = new SoftReference(region);
- int len = region.length();
- for (int i = 0; i < len; i++) {
- h = 31*h + LocaleUtils.toLower(region.charAt(i));
- }
- } else {
-- regn = "";
-+ regn = new SoftReference("");
- }
- if (variant != null) {
-- vart = variant;
-+ vart = new SoftReference(variant);
- int len = variant.length();
- for (int i = 0; i < len; i++) {
- h = 31*h + variant.charAt(i);
- }
- } else {
-- vart = "";
-+ vart = new SoftReference("");
- }
- hash = h;
- this.normalized = normalized;
-@@ -244,28 +245,31 @@
-
- @Override
- public boolean equals(Object obj) {
-- return (this == obj) ||
-- (obj instanceof Key)
-- && this.hash == ((Key)obj).hash
-- && LocaleUtils.caseIgnoreMatch(((Key)obj).lang, this.lang)
-- && LocaleUtils.caseIgnoreMatch(((Key)obj).scrt, this.scrt)
-- && LocaleUtils.caseIgnoreMatch(((Key)obj).regn, this.regn)
-- && ((Key)obj).vart.equals(vart); // variant is case sensitive in JDK!
-+ if (this == obj) {
-+ return true;
- }
-
-- @Override
-- public int compareTo(Key other) {
-- int res = LocaleUtils.caseIgnoreCompare(this.lang, other.lang);
-- if (res == 0) {
-- res = LocaleUtils.caseIgnoreCompare(this.scrt, other.scrt);
-- if (res == 0) {
-- res = LocaleUtils.caseIgnoreCompare(this.regn, other.regn);
-- if (res == 0) {
-- res = this.vart.compareTo(other.vart);
-+ if (obj instanceof Key && this.hash == ((Key)obj).hash) {
-+ String tl = this.lang.get();
-+ String ol = ((Key)obj).lang.get();
-+ if (tl != null && ol != null &&
-+ LocaleUtils.caseIgnoreMatch(ol, tl)) {
-+ String ts = this.scrt.get();
-+ String os = ((Key)obj).scrt.get();
-+ if (ts != null && os != null &&
-+ LocaleUtils.caseIgnoreMatch(os, ts)) {
-+ String tr = this.regn.get();
-+ String or = ((Key)obj).regn.get();
-+ if (tr != null && or != null &&
-+ LocaleUtils.caseIgnoreMatch(or, tr)) {
-+ String tv = this.vart.get();
-+ String ov = ((Key)obj).vart.get();
-+ return (ov != null && ov.equals(tv));
- }
- }
- }
-- return res;
-+ }
-+ return false;
- }
-
- @Override
-@@ -278,10 +282,10 @@
- return key;
- }
-
-- String lang = LocaleUtils.toLowerString(key.lang).intern();
-- String scrt = LocaleUtils.toTitleString(key.scrt).intern();
-- String regn = LocaleUtils.toUpperString(key.regn).intern();
-- String vart = key.vart.intern(); // preserve upper/lower cases
-+ String lang = LocaleUtils.toLowerString(key.lang.get()).intern();
-+ String scrt = LocaleUtils.toTitleString(key.scrt.get()).intern();
-+ String regn = LocaleUtils.toUpperString(key.regn.get()).intern();
-+ String vart = key.vart.get().intern(); // preserve upper/lower cases
-
- return new Key(lang, scrt, regn, vart, true);
- }
-@@ -294,12 +298,18 @@
-
- @Override
- protected Key normalizeKey(Key key) {
-+ assert key.lang.get() != null &&
-+ key.scrt.get() != null &&
-+ key.regn.get() != null &&
-+ key.vart.get() != null;
-+
- return Key.normalize(key);
- }
-
- @Override
- protected BaseLocale createObject(Key key) {
-- return new BaseLocale(key.lang, key.scrt, key.regn, key.vart);
-+ return new BaseLocale(key.lang.get(), key.scrt.get(),
-+ key.regn.get(), key.vart.get());
- }
- }
- }
---- ./jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2013-09-06 11:28:51.000000000 -0700
-+++ ./jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2014-10-28 20:19:49.000000000 -0700
-@@ -57,8 +57,10 @@
- value = entry.get();
- }
- if (value == null) {
-- key = normalizeKey(key);
- V newVal = createObject(key);
-+ // make sure key is normalized *after* the object creation
-+ // so that newVal is assured to be created from a valid key.
-+ key = normalizeKey(key);
- if (key == null || newVal == null) {
- // subclass must return non-null key/value object
- return null;
---- ./jdk/src/share/classes/sun/util/logging/resources/logging.properties 2013-09-06 11:28:51.000000000 -0700
-+++ ./jdk/src/share/classes/sun/util/logging/resources/logging.properties 2014-07-15 21:49:32.000000000 -0700
-@@ -27,20 +27,20 @@
- # these are the same as the non-localized level name.
-
- # The following ALL CAPS words should be translated.
--ALL=ALL
-+ALL=All
- # The following ALL CAPS words should be translated.
--SEVERE=SEVERE
-+SEVERE=Severe
- # The following ALL CAPS words should be translated.
--WARNING=WARNING
-+WARNING=Warning
- # The following ALL CAPS words should be translated.
--INFO=INFO
-+INFO=Info
- # The following ALL CAPS words should be translated.
--CONFIG= CONFIG
-+CONFIG= Config
- # The following ALL CAPS words should be translated.
--FINE=FINE
-+FINE=Fine
- # The following ALL CAPS words should be translated.
--FINER=FINER
-+FINER=Finer
- # The following ALL CAPS words should be translated.
--FINEST=FINEST
-+FINEST=Finest
- # The following ALL CAPS words should be translated.
--OFF=OFF
-+OFF=Off
---- ./jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties 2013-09-06 11:28:52.000000000 -0700
-+++ ./jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties 2014-07-15 21:49:32.000000000 -0700
-@@ -27,7 +27,7 @@
- # these are the same as the non-localized level name.
-
- # The following ALL CAPS words should be translated.
--ALL=\u5168\u90E8
-+ALL=\u6240\u6709
- # The following ALL CAPS words should be translated.
- SEVERE=\u56B4\u91CD
- # The following ALL CAPS words should be translated.
---- ./jdk/src/share/classes/sun/util/resources/CalendarData_pt_BR.properties 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/CalendarData_pt_BR.properties 2014-07-15 21:54:45.000000000 -0700
-@@ -0,0 +1,40 @@
-+#
-+# 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.
-+#
-+
-+# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
-+# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved
-+#
-+# The original version of this source code and documentation
-+# is copyrighted and owned by Taligent, Inc., a wholly-owned
-+# subsidiary of IBM. These materials are provided under terms
-+# of a License Agreement between Taligent and Sun. This technology
-+# is protected by multiple US and International patents.
-+#
-+# This notice and attribution to Taligent may not be removed.
-+# Taligent is a registered trademark of Taligent, Inc.
-+
-+
-+firstDayOfWeek=1
-+minimalDaysInFirstWeek=1
---- ./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-07-15 21:49:32.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",
- "Chuuk Summer Time", "CHUST"};
-- String CIT[] = new String[] {"Central Indonesia Time", "CIT",
-+ String CIT[] = new String[] {"Central Indonesia Time", "WITA",
- "Central Indonesia Summer Time", "CIST"};
- String CLT[] = new String[] {"Chile Time", "CLT",
- "Chile Summer Time", "CLST"};
-@@ -193,7 +193,7 @@
- "Western African Summer Time", "WAST"};
- String WET[] = new String[] {"Western European Time", "WET",
- "Western European Summer Time", "WEST"};
-- String WIT[] = new String[] {"West Indonesia Time", "WIT",
-+ String WIT[] = new String[] {"West Indonesia Time", "WIB",
- "West Indonesia Summer Time", "WIST"};
- String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST",
- "Western Summer Time (Australia)", "WST"};
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -426,7 +426,7 @@
- "Suriname Summer Time", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"Syowa Time", "SYOT",
- "Syowa Summer Time", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"Coordinated Universal Time", "UTC",
-+ "Central European Summer Time", "CEST"}},
- {"Antarctica/Vostok", new String[] {"Vostok Time", "VOST",
- "Vostok Summer Time", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "Irkutsk Summer Time", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"East Indonesia Time", "EIT",
-+ {"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT",
- "East Indonesia Summer Time", "EIST"}},
- {"Asia/Kabul", new String[] {"Afghanistan Time", "AFT",
- "Afghanistan Summer Time", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
-+ "Khandyga Summer Time", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT",
- "Krasnoyarsk Summer Time", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
-+ "Ust-Nera Summer Time", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "Samara Summer Time", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"Middle Europe Time", "MET",
- "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-07-15 21:49:32.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",
- "Acre Sommerzeit", "ACST"};
-- String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien)", "CST",
-- "Zentrale Sommerzeit (S\u00fcdaustralien)", "CST"};
-+ String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST",
-+ "Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"};
- String AGT[] = new String[] {"Argentinische Zeit", "ART",
- "Argentinische Sommerzeit", "ARST"};
- String AKST[] = new String[] {"Alaska Normalzeit", "AKST",
-@@ -61,10 +61,10 @@
- "Atlantik Sommerzeit", "ADT"};
- String BDT[] = new String[] {"Bangladesch Zeit", "BDT",
- "Bangladesch Sommerzeit", "BDST"};
-- String BRISBANE[] = new String[] {"\u00d6stliche Normalzeit (Queensland)", "EST",
-- "\u00d6stliche Sommerzeit (Queensland)", "EST"};
-- String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien/New South Wales)", "CST",
-- "Zentrale Sommerzeit (S\u00fcdaustralien/New South Wales)", "CST"};
-+ String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "EST",
-+ "\u00D6stliche Sommerzeit (Queensland)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "CST",
-+ "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "CST"};
- String BRT[] = new String[] {"Brasilianische Zeit", "BRT",
- "Brasilianische Sommerzeit", "BRST"};
- String BTT[] = new String[] {"Bhutanische Zeit", "BTT",
-@@ -77,9 +77,9 @@
- "Chatham Sommerzeit", "CHADT"};
- String ChST[] = new String[] {"Chamorro Normalzeit", "ChST",
- "Chamorro Sommerzeit", "ChDT"};
-- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-- "Chuuk Summer Time", "CHUST"};
-- String CIT[] = new String[] {"Zentralindonesische Zeit", "CIT",
-+ String CHUT[] = new String[] {"Chuuk Zeit", "CHUT",
-+ "Chuuk Sommerzeit", "CHUST"};
-+ String CIT[] = new String[] {"Zentralindonesische Zeit", "WITA",
- "Zentralindonesische Sommerzeit", "CIST"};
- String CLT[] = new String[] {"Chilenische Zeit", "CLT",
- "Chilenische Sommerzeit", "CLST"};
-@@ -89,7 +89,7 @@
- "Chinesische Sommerzeit", "CDT"};
- String CUBA[] = new String[] {"Kubanische Normalzeit", "CST",
- "Kubanische Sommerzeit", "CDT"};
-- String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST",
-+ String DARWIN[] = new String[] {"Central Normalzeit (Northern Territory)", "CST",
- "Zentrale Sommerzeit (Northern Territory)", "CST"};
- String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT",
- "Irische Sommerzeit", "IST"};
-@@ -103,10 +103,10 @@
- "Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST"};
- String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST",
- "\u00d6stliche Sommerzeit", "EDT"};
-- String EST_NSW[] = new String[] {"\u00d6stliche Normalzeit (New South Wales)", "EST",
-- "\u00d6stliche Sommerzeit (New South Wales)", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ String EST_NSW[] = new String[] {"Eastern Normalzeit (Neus\u00FCdwales)", "EST",
-+ "\u00D6stliche Sommerzeit (New South Wales)", "EST"};
-+ String FET[] = new String[] {"Kaliningrader Zeit", "FET",
-+ "Kaliningrader Sommerzeit", "FEST"};
- String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT",
- "Ghanaische Sommerzeit", "GHST"};
- String GAMBIER[] = new String[] {"Gambier Zeit", "GAMT",
-@@ -159,8 +159,8 @@
- "Pitcairn Sommerzeit", "PDT"};
- String PKT[] = new String[] {"Pakistanische Zeit", "PKT",
- "Pakistanische Sommerzeit", "PKST"};
-- String PONT[] = new String[] {"Pohnpei Time", "PONT",
-- "Pohnpei Summer Time", "PONST"};
-+ String PONT[] = new String[] {"Pohnpei Zeit", "PONT",
-+ "Pohnpei Sommerzeit", "PONST"};
- String PST[] = new String[] {"Pazifische Normalzeit", "PST",
- "Pazifische Sommerzeit", "PDT"};
- String SAMOA[] = new String[] {"Samoa Normalzeit", "SST",
-@@ -173,8 +173,8 @@
- "Singapur Sommerzeit", "SGST"};
- String SLST[] = new String[] {"Greenwich Normalzeit", "GMT",
- "Sierra Leone Sommerzeit", "SLST"};
-- String TASMANIA[] = new String[] {"\u00d6stliche Normalzeit (Tasmanien)", "EST",
-- "\u00d6stliche Sommerzeit (Tasmanien)", "EST"};
-+ String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "EST",
-+ "\u00D6stliche Sommerzeit (Tasmanien)", "EST"};
- String TMT[] = new String[] {"Turkmenische Zeit", "TMT",
- "Turkmenische Sommerzeit", "TMST"};
- String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT",
-@@ -183,8 +183,8 @@
- "Koordinierte Universalzeit", "UTC"};
- String UZT[] = new String[] {"Usbekistan Zeit", "UZT",
- "Usbekistan Sommerzeit", "UZST"};
-- String VICTORIA[] = new String[] {"\u00d6stliche Normalzeit (Victoria)", "EST",
-- "\u00d6stliche Sommerzeit (Victoria)", "EST"};
-+ String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "EST",
-+ "\u00D6stliche Sommerzeit (Victoria)", "EST"};
- String VLAT[] = new String[] {"Wladiwostok Zeit", "VLAT",
- "Wladiwostok Sommerzeit", "VLAST"};
- String WART[] = new String[] {"Westargentinische Zeit", "WART",
-@@ -193,7 +193,7 @@
- "Westafrikanische Sommerzeit", "WAST"};
- String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ",
- "Westeurop\u00e4ische Sommerzeit", "WESZ"};
-- String WIT[] = new String[] {"Westindonesische Zeit", "WIT",
-+ String WIT[] = new String[] {"Westindonesische Zeit", "WIB",
- "Westindonesische Sommerzeit", "WIST"};
- String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST",
- "Westliche Sommerzeit (Australien)", "WST"};
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -401,8 +401,8 @@
- {"America/Mendoza", AGT},
- {"America/Menominee", CST},
- {"America/Merida", CST},
-- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-- "Metlakatla Daylight Time", "MeDT"}},
-+ {"America/Metlakatla", new String[] {"Metlakatla Normalzeit", "MeST",
-+ "Metlakatla Sommerzeit", "MeDT"}},
- {"America/Mexico_City", CST},
- {"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST",
- "Pierre & Miquelon Sommerzeit", "PMDT"}},
-@@ -426,7 +426,7 @@
- "Suriname Sommerzeit", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -466,8 +466,8 @@
- "Davis Sommerzeit", "DAVST"}},
- {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Zeit", "DDUT",
- "Dumont-d'Urville Sommerzeit", "DDUST"}},
-- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-- "Macquarie Island Summer Time", "MIST"}},
-+ {"Antarctica/Macquarie", new String[] {"Macquarieinsel Zeit", "MIST",
-+ "Macquarieinsel Sommerzeit", "MIST"}},
- {"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT",
- "Mawson Sommerzeit", "MAWST"}},
- {"Antarctica/McMurdo", NZST},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"Syowa Zeit", "SYOT",
- "Syowa Sommerzeit", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"Koordinierte Universalzeit", "UTC",
-+ "Mitteleurop\u00e4ische Sommerzeit", "MESZ"}},
- {"Antarctica/Vostok", new String[] {"Vostok Zeit", "VOST",
- "Vostok Sommerzeit", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "Irkutsk Sommerzeit", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "EIT",
-+ {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "WIT",
- "Ostindonesische Sommerzeit", "EIST"}},
- {"Asia/Kabul", new String[] {"Afghanistanische Zeit", "AFT",
- "Afghanistanische Sommerzeit", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT",
-+ "Chandyga Sommerzeit", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT",
- "Krasnojarsker Sommerzeit", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT",
-+ "Ust-Nera Sommerzeit", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "Samarische Sommerzeit", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"Zentraleurop\u00e4ische Zeit", "MET",
- "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-07-15 21:49:32.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",
- "Hora de verano de Acre", "ACST"};
-- String ADELAIDE[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia)", "CST",
-+ String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST",
- "Hora de verano Central (Sur de Australia)", "CST"};
- String AGT[] = new String[] {"Hora de Argentina", "ART",
- "Hora de verano de Argentina", "ARST"};
-@@ -61,9 +61,9 @@
- "Hora de verano Atl\u00e1ntico", "ADT"};
- String BDT[] = new String[] {"Hora de Bangladesh", "BDT",
- "Hora de verano de Bangladesh", "BDST"};
-- String BRISBANE[] = new String[] {"Hora est\u00e1ndar del Este (Queensland)", "EST",
-- "Hora de verano del Este (Queensland)", "EST"};
-- String BROKEN_HILL[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
-+ String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "EST",
-+ "Hora est\u00E1ndar de verano del Este (Queensland)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
- "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST"};
- String BRT[] = new String[] {"Hora de Brasil", "BRT",
- "Hora de verano de Brasil", "BRST"};
-@@ -79,7 +79,7 @@
- "Hora de verano de Chamorro", "ChDT"};
- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
- "Chuuk Summer Time", "CHUST"};
-- String CIT[] = new String[] {"Hora de Indonesia Central", "CIT",
-+ String CIT[] = new String[] {"Hora de Indonesia Central", "WITA",
- "Hora de verano de Indonesia Central", "CIST"};
- String CLT[] = new String[] {"Hora de Chile", "CLT",
- "Hora de verano de Chile", "CLST"};
-@@ -89,7 +89,7 @@
- "Hora de verano de China", "CDT"};
- String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST",
- "Hora de verano de Cuba", "CDT"};
-- String DARWIN[] = new String[] {"Hora est\u00e1ndar Central (territorio del Norte)", "CST",
-+ String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "CST",
- "Hora de verano Central (territorio del Norte)", "CST"};
- String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
- "Hora de verano de Irlanda", "IST"};
-@@ -103,10 +103,10 @@
- "Hora de verano de Groenlandia Oriental", "EGST"};
- String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST",
- "Hora de verano Oriental", "EDT"};
-- String EST_NSW[] = new String[] {"Hora est\u00e1ndar Oriental (Nueva Gales del Sur)", "EST",
-+ String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "EST",
- "Hora de verano Oriental (Nueva Gales del Sur)", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET",
-+ "Hora de verano de Europa m\u00E1s Oriental", "FEST"};
- String GHMT[] = new String[] {"Hora central de Ghana", "GMT",
- "Hora de verano de Ghana", "GHST"};
- String GAMBIER[] = new String[] {"Hora de Gambier", "GAMT",
-@@ -173,7 +173,7 @@
- "Hora de verano de Singapur", "SGST"};
- String SLST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
- "Hora de verano de Sierra Leona", "SLST"};
-- String TASMANIA[] = new String[] {"Hora est\u00e1ndar del Este (Tasmania)", "EST",
-+ String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "EST",
- "Hora de verano del Este (Tasmania)", "EST"};
- String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT",
- "Hora de verano de Turkmenist\u00e1n", "TMST"};
-@@ -183,7 +183,7 @@
- "Hora Universal Coordinada", "UTC"};
- String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT",
- "Hora de verano de Uzbekist\u00e1n", "UZST"};
-- String VICTORIA[] = new String[] {"Hora est\u00e1ndar del Este (Victoria)", "EST",
-+ String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "EST",
- "Hora de verano del Este (Victoria)", "EST"};
- String VLAT[] = new String[] {"Hora de Vladivostok", "VLAT",
- "Hora de verano de Vladivostok", "VLAST"};
-@@ -193,9 +193,9 @@
- "Hora de verano de \u00c1frica Occidental", "WAST"};
- String WET[] = new String[] {"Hora de Europa Occidental", "WET",
- "Hora de verano de Europa Occidental", "WEST"};
-- String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIT",
-+ String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIB",
- "Indonesia Hora de verano de Indonesia Occidental", "WIST"};
-- String WST_AUS[] = new String[] {"Hora est\u00e1ndar Occidental (Australia)", "WST",
-+ String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "WST",
- "Hora de verano Occidental (Australia)", "WST"};
- String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST",
- "Hora de verano de Samoa Occidental", "WSDT"};
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -426,7 +426,7 @@
- "Hora de verano de Surinam", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"Hora de Syowa", "SYOT",
- "Hora de verano de Syowa", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"Hora Universal Coordinada", "UTC",
-+ "Hora de verano de Europa Central", "CEST"}},
- {"Antarctica/Vostok", new String[] {"Hora de Vostok", "VOST",
- "Hora de verano de Vostok", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "Hora de verano de Irkutsk", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "EIT",
-+ {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "WIT",
- "Hora de verano de Indonesia Oriental", "EIST"}},
- {"Asia/Kabul", new String[] {"Hora de Afganist\u00e1n", "AFT",
- "Hora de verano de Afganist\u00e1n", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT",
-+ "Hora de verano de Khandyga", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT",
- "Hora de verano de Krasnoyarsk", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT",
-+ "Hora de verano de Ust-Nera", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -616,8 +620,8 @@
- {"Australia/Canberra", EST_NSW},
- {"Australia/Currie", EST_NSW},
- {"Australia/Darwin", DARWIN},
-- {"Australia/Eucla", new String[] {"Hora est\u00e1ndar de Australia Central y Occidental", "CWST",
-- "Hora de verano de Australia Central y Occidental", "CWST"}},
-+ {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "CWST",
-+ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST"}},
- {"Australia/Hobart", TASMANIA},
- {"Australia/LHI", LORD_HOWE},
- {"Australia/Lindeman", BRISBANE},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "Hora de verano de Samara", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"Hora de Europa Central", "MET",
- "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-07-15 21:49:32.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"};
- String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST",
-- "Heure d'\u00e9t\u00e9 d'Australie centrale (Australie du sud)", "CST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST"};
- String AGT[] = new String[] {"Heure D'Argentine", "ART",
- "Heure d'\u00e9t\u00e9 D'Argentine", "ARST"};
- String AKST[] = new String[] {"Heure normale d'Alaska", "AKST",
-@@ -62,9 +62,9 @@
- String BDT[] = new String[] {"Heure du Bangladesh", "BDT",
- "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"};
- String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "EST",
-- "Heure d'\u00e9t\u00e9 d'Australie orientale (Queensland)", "EST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST",
-- "Heure d'\u00e9t\u00e9 d'Australie centrale(Australie du sud/Nouvelle-Galles du sud)", "CST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST"};
- String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT",
- "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST"};
- String BTT[] = new String[] {"Heure du Bhoutan", "BTT",
-@@ -77,9 +77,9 @@
- "Heure avanc\u00e9e de Chatham", "CHADT"};
- String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST",
- "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"};
-- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-- "Chuuk Summer Time", "CHUST"};
-- String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "CIT",
-+ String CHUT[] = new String[] {"Heure de Chuuk", "CHUT",
-+ "Heure d'\u00E9t\u00E9 de Chuuk", "CHUST"};
-+ String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "WITA",
- "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie centrale", "CIST"};
- String CLT[] = new String[] {"Heure du Chili", "CLT",
- "Heure d'\u00e9t\u00e9 du Chili", "CLST"};
-@@ -90,7 +90,7 @@
- String CUBA[] = new String[] {"Heure standard de Cuba", "CST",
- "Heure d'\u00e9t\u00e9 de Cuba", "CDT"};
- String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST",
-- "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "CST"};
- String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
- "Heure d'\u00e9t\u00e9 irlandaise", "IST"};
- String EAT[] = new String[] {"Heure d'Afrique de l'Est", "EAT",
-@@ -104,9 +104,9 @@
- String EST[] = new String[] {"Heure normale de l'Est", "EST",
- "Heure avanc\u00e9e de l'Est", "EDT"};
- String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST",
-- "Heure d'\u00e9t\u00e9 de l'Est (Nouvelle-Galles du Sud)", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "EST"};
-+ String FET[] = new String[] {"Heure d'Europe de l'Est UTC+3", "FET",
-+ "Heure d'\u00E9t\u00E9 d'Europe de l'Est UTC+3", "FEST"};
- String GHMT[] = new String[] {"Heure du Ghana", "GMT",
- "Heure d'\u00e9t\u00e9 du Ghana", "GHST"};
- String GAMBIER[] = new String[] {"Heure de Gambi", "GAMT",
-@@ -159,8 +159,8 @@
- "heure avanc\u00e9e des Pitcairn", "PDT"};
- String PKT[] = new String[] {"Heure du Pakistan", "PKT",
- "Heure d'\u00e9t\u00e9 du Pakistan", "PKST"};
-- String PONT[] = new String[] {"Pohnpei Time", "PONT",
-- "Pohnpei Summer Time", "PONST"};
-+ String PONT[] = new String[] {"Heure de Pohnpei", "PONT",
-+ "Heure d'\u00E9t\u00E9 de Pohnpei", "PONST"};
- String PST[] = new String[] {"Heure normale du Pacifique", "PST",
- "Heure avanc\u00e9e du Pacifique", "PDT"};
- String SAMOA[] = new String[] {"Heure standard de Samoa", "SST",
-@@ -174,7 +174,7 @@
- String SLST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
- "Heure d'\u00e9t\u00e9 de Sierra Leone", "SLST"};
- String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "EST",
-- "Heure d'\u00e9t\u00e9 d'Australie orientale (Tasmanie)", "EST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "EST"};
- String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT",
- "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"};
- String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT",
-@@ -184,7 +184,7 @@
- String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT",
- "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"};
- String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST",
-- "Heure d'\u00e9t\u00e9 d'Australie orientale (Victoria)", "EST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "EST"};
- String VLAT[] = new String[] {"Heure de Vladivostok", "VLAT",
- "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"};
- String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART",
-@@ -193,10 +193,10 @@
- "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"};
- String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET",
- "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"};
-- String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIT",
-+ String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB",
- "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"};
- String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST",
-- "Heure d'\u00e9t\u00e9 de l'Ouest (Australie)", "WST"};
-+ "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "WST"};
- String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST",
- "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"};
- String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT",
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -401,8 +401,8 @@
- {"America/Mendoza", AGT},
- {"America/Menominee", CST},
- {"America/Merida", CST},
-- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-- "Metlakatla Daylight Time", "MeDT"}},
-+ {"America/Metlakatla", new String[] {"Heure normale de Metlakatla", "MeST",
-+ "Heure avanc\u00E9e de Metlakatla", "MeDT"}},
- {"America/Mexico_City", CST},
- {"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST",
- "Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT"}},
-@@ -426,7 +426,7 @@
- "Heure d'\u00e9t\u00e9 du Surinam", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -466,8 +466,8 @@
- "Heure d'\u00e9t\u00e9 de Davis", "DAVST"}},
- {"Antarctica/DumontDUrville", new String[] {"Heure de Dumont-d'Urville", "DDUT",
- "Heure d'\u00e9t\u00e9 de Dumont-d'Urville", "DDUST"}},
-- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-- "Macquarie Island Summer Time", "MIST"}},
-+ {"Antarctica/Macquarie", new String[] {"Heure de l'Ile Macquarie", "MIST",
-+ "Heure d'\u00E9t\u00E9 de l'Ile Macquarie", "MIST"}},
- {"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT",
- "Heure d'\u00e9t\u00e9 de Mawson", "MAWST"}},
- {"Antarctica/McMurdo", NZST},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"Heure de Syowa", "SYOT",
- "Heure d'\u00e9t\u00e9 de Syowa", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"Temps universel coordonn\u00e9", "UTC",
-+ "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"}},
- {"Antarctica/Vostok", new String[] {"Heure de Vostok", "VOST",
- "Heure d'\u00e9t\u00e9 de Vostok", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "EIT",
-+ {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "WIT",
- "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie orientale", "EIST"}},
- {"Asia/Kabul", new String[] {"Heure d'Afghanistan", "AFT",
- "Heure d'\u00e9t\u00e9 d'Afghanistan", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT",
-+ "Heure d'\u00E9t\u00E9 de Khandyga", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT",
- "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT",
-+ "Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -617,7 +621,7 @@
- {"Australia/Currie", EST_NSW},
- {"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST",
-- "Heure d'\u00e9t\u00e9 de l'Australie occidentale (centre)", "CWST"}},
-+ "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "CWST"}},
- {"Australia/Hobart", TASMANIA},
- {"Australia/LHI", LORD_HOWE},
- {"Australia/Lindeman", BRISBANE},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "Heure d'\u00e9t\u00e9 de Samara", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"Heure de l'Europe centrale", "MET",
- "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-07-15 21:49:32.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",
- "Ora estiva di Acre", "ACST"};
-- String ADELAIDE[] = new String[] {"Ora centrale standard (Australia del Sud)", "CST",
-- "Ora estiva standard (Australia del Sud)", "CST"};
-+ String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "CST",
-+ "Ora estiva centrale (Australia del Sud)", "CST"};
- String AGT[] = new String[] {"Ora dell'Argentina", "ART",
- "Ora estiva dell'Argentina", "ARST"};
- String AKST[] = new String[] {"Ora solare dell'Alaska", "AKST",
-@@ -61,9 +61,9 @@
- "Ora legale dell'Atlantico occidentale", "ADT"};
- String BDT[] = new String[] {"Ora del Bangladesh", "BDT",
- "Ora estiva del Bangladesh", "BDST"};
-- String BRISBANE[] = new String[] {"Ora orientale standard (Queensland)", "EST",
-+ String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "EST",
- "Ora estiva orientale (Queensland)", "EST"};
-- String BROKEN_HILL[] = new String[] {"Ora centrale standard (Australia del Sud/Nuovo Galles del Sud)", "CST",
-+ String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "CST",
- "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "CST"};
- String BRT[] = new String[] {"Ora del Brasile", "BRT",
- "Ora estiva del Brasile", "BRST"};
-@@ -75,11 +75,11 @@
- "Ora estiva dell'Europa centrale", "CEST"};
- String CHAST[] = new String[] {"Ora di Chatham standard", "CHAST",
- "Ora legale di Chatham", "CHADT"};
-- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-- "Chuuk Summer Time", "CHUST"};
-+ String CHUT[] = new String[] {"Ora di Chuuk", "CHUT",
-+ "Ora estiva di Chuuk", "CHUST"};
- String ChST[] = new String[] {"Ora standard di Chamorro", "ChST",
- "Ora legale di Chamorro", "ChDT"};
-- String CIT[] = new String[] {"Ora dell'Indonesia centrale", "CIT",
-+ String CIT[] = new String[] {"Ora dell'Indonesia centrale", "WITA",
- "Ora estiva dell'Indonesia centrale", "CIST"};
- String CLT[] = new String[] {"Ora del Cile", "CLT",
- "Ora estiva del Cile", "CLST"};
-@@ -89,7 +89,7 @@
- "Ora legale della Cina", "CDT"};
- String CUBA[] = new String[] {"Ora solare Cuba", "CST",
- "Ora legale Cuba", "CDT"};
-- String DARWIN[] = new String[] {"Ora centrale standard (Territori del Nord)", "CST",
-+ String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "CST",
- "Ora estiva centrale (Territori del Nord)", "CST"};
- String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT",
- "Ora estiva irlandese", "IST"};
-@@ -103,10 +103,10 @@
- "Ora estiva della Groenlandia orientale", "EGST"};
- String EST[] = new String[] {"Ora solare USA orientale", "EST",
- "Ora legale USA orientale", "EDT"};
-- String EST_NSW[] = new String[] {"Ora solare dell'Australia orientale (Nuovo Galles del Sud)", "EST",
-+ String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "EST",
- "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET",
-+ "Ora estiva dei paesi europei pi\u00F9 orientali", "FEST"};
- String GHMT[] = new String[] {"Ora media del Ghana", "GMT",
- "Ora legale del Ghana", "GHST"};
- String GAMBIER[] = new String[] {"Ora di Gambier", "GAMT",
-@@ -159,8 +159,8 @@
- "Ora legale di Pitcairn", "PDT"};
- String PKT[] = new String[] {"Ora del Pakistan", "PKT",
- "Ora estiva del Pakistan", "PKST"};
-- String PONT[] = new String[] {"Pohnpei Time", "PONT",
-- "Pohnpei Summer Time", "PONST"};
-+ String PONT[] = new String[] {"Ora di Pohnpei", "PONT",
-+ "Ora estiva di Pohnpei", "PONST"};
- String PST[] = new String[] {"Ora solare della costa occidentale USA", "PST",
- "Ora legale della costa occidentale USA", "PDT"};
- String SAMOA[] = new String[] {"Ora standard di Samoa", "SST",
-@@ -173,7 +173,7 @@
- "Ora estiva di Singapore", "SGST"};
- String SLST[] = new String[] {"Ora media di Greenwich", "GMT",
- "Ora legale della Sierra Leone", "SLST"};
-- String TASMANIA[] = new String[] {"Ora orientale standard (Tasmania)", "EST",
-+ String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "EST",
- "Ora estiva orientale (Tasmania)", "EST"};
- String TMT[] = new String[] {"Ora del Turkmenistan", "TMT",
- "Ora estiva del Turkmenistan", "TMST"};
-@@ -183,7 +183,7 @@
- "Tempo universale coordinato", "UTC"};
- String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT",
- "Ora estiva dell'Uzbekistan", "UZST"};
-- String VICTORIA[] = new String[] {"Ora orientale standard (Victoria)", "EST",
-+ String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "EST",
- "Ora estiva orientale (Victoria)", "EST"};
- String VLAT[] = new String[] {"Ora di Vladivostok", "VLAT",
- "Ora estiva di Vladivostok", "VLAST"};
-@@ -193,9 +193,9 @@
- "Ora estiva dell'Africa occidentale", "WAST"};
- String WET[] = new String[] {"Ora dell'Europa occidentale", "WET",
- "Ora estiva dell'Europa occidentale", "WEST"};
-- String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIT",
-+ String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIB",
- "Ora estiva dell'Indonesia occidentale", "WIST"};
-- String WST_AUS[] = new String[] {"Ora solare dell'Australia occidentale", "WST",
-+ String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "WST",
- "Ora estiva dell'Australia occidentale", "WST"};
- String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST",
- "Ora estiva di Samoa", "WSDT"};
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -401,8 +401,8 @@
- {"America/Mendoza", AGT},
- {"America/Menominee", CST},
- {"America/Merida", CST},
-- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-- "Metlakatla Daylight Time", "MeDT"}},
-+ {"America/Metlakatla", new String[] {"Ora standard di Metlakatla", "MeST",
-+ "Ora legale di Metlakatla", "MeDT"}},
- {"America/Mexico_City", CST},
- {"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST",
- "Ora legale di Saint-Pierre e Miquelon", "PMDT"}},
-@@ -426,7 +426,7 @@
- "Ora estiva di Suriname", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -466,8 +466,8 @@
- "Ora estiva di Davis", "DAVST"}},
- {"Antarctica/DumontDUrville", new String[] {"Ora di Dumont-d'Urville", "DDUT",
- "Ora estiva di Dumont-d'Urville", "DDUST"}},
-- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-- "Macquarie Island Summer Time", "MIST"}},
-+ {"Antarctica/Macquarie", new String[] {"Ora dell'Isola Macquarie", "MIST",
-+ "Ora estiva dell'Isola Macquarie", "MIST"}},
- {"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT",
- "Ora estiva di Mawson", "MAWST"}},
- {"Antarctica/McMurdo", NZST},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"Ora di Syowa", "SYOT",
- "Ora estiva di Syowa", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"Tempo universale coordinato", "UTC",
-+ "Ora estiva dell'Europa centrale", "CEST"}},
- {"Antarctica/Vostok", new String[] {"Ora di Vostok", "VOST",
- "Ora estiva di Vostok", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "Ora estiva di Irkutsk", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "EIT",
-+ {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "WIT",
- "Ora estiva dell'Indonesia orientale", "EIST"}},
- {"Asia/Kabul", new String[] {"Ora dell'Afghanistan", "AFT",
- "Ora estiva dell'Afghanistan", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT",
-+ "Ora estiva di Khandyga", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT",
- "Ora estiva di Krasnojarsk", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT",
-+ "Ora estiva di Ust-Nera", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -616,8 +620,8 @@
- {"Australia/Canberra", EST_NSW},
- {"Australia/Currie", EST_NSW},
- {"Australia/Darwin", DARWIN},
-- {"Australia/Eucla", new String[] {"Ora solare Australia centrorientale", "CWST",
-- "Ora estiva Australia centrorientale", "CWST"}},
-+ {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "CWST",
-+ "Ora estiva Australia centro-occidentale", "CWST"}},
- {"Australia/Hobart", TASMANIA},
- {"Australia/LHI", LORD_HOWE},
- {"Australia/Lindeman", BRISBANE},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "Ora estiva di Samara", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"Ora dell'Europa centrale", "MET",
- "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-07-15 21:49:32.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",
- "\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST"};
-- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST",
-- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST"};
-+ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST",
-+ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST"};
- String AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART",
- "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "ARST"};
- String AKST[] = new String[] {"\u30a2\u30e9\u30b9\u30ab\u6a19\u6e96\u6642", "AKST",
-@@ -61,10 +61,10 @@
- "\u5927\u897f\u6d0b\u590f\u6642\u9593", "ADT"};
- String BDT[] = new String[] {"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u6642\u9593", "BDT",
- "\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u590f\u6642\u9593", "BDST"};
-- String BRISBANE[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30af\u30a4\u30fc\u30f3\u30ba\u30e9\u30f3\u30c9)", "EST",
-- "\u6771\u90e8\u590f\u6642\u9593 (\u30af\u30a4\u30fc\u30f3\u30ba\u30e9\u30f3\u30c9)", "EST"};
-- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST",
-- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST"};
-+ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST",
-+ "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST",
-+ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST"};
- String BRT[] = new String[] {"\u30d6\u30e9\u30b8\u30eb\u6642\u9593", "BRT",
- "\u30d6\u30e9\u30b8\u30eb\u590f\u6642\u9593", "BRST"};
- String BTT[] = new String[] {"\u30d6\u30fc\u30bf\u30f3\u6642\u9593", "BTT",
-@@ -77,9 +77,9 @@
- "\u30c1\u30e3\u30bf\u30e0\u590f\u6642\u9593", "CHADT"};
- String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST",
- "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"};
-- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-- "Chuuk Summer Time", "CHUST"};
-- String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "CIT",
-+ String CHUT[] = new String[] {"\u30C1\u30E5\u30FC\u30AF\u6642\u9593", "CHUT",
-+ "Chuuk Time", "CHUST"};
-+ String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WITA",
- "\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "CIST"};
- String CLT[] = new String[] {"\u30c1\u30ea\u6642\u9593", "CLT",
- "\u30c1\u30ea\u590f\u6642\u9593", "CLST"};
-@@ -89,8 +89,8 @@
- "\u4e2d\u56fd\u590f\u6642\u9593", "CDT"};
- String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST",
- "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT"};
-- String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST",
-- "\u4e2d\u90e8\u590f\u6642\u9593 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST"};
-+ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST",
-+ "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST"};
- String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
- "\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u590f\u6642\u9593", "IST"};
- String EAT[] = new String[] {"\u6771\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "EAT",
-@@ -103,10 +103,10 @@
- "\u6771\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "EGST"};
- String EST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST",
- "\u6771\u90e8\u590f\u6642\u9593", "EDT"};
-- String EST_NSW[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST",
-- "\u6771\u90e8\u590f\u6642\u9593 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST",
-+ "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST"};
-+ String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET",
-+ "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST"};
- String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT",
- "\u30ac\u30fc\u30ca\u590f\u6642\u9593", "GHST"};
- String GAMBIER[] = new String[] {"\u30ac\u30f3\u30d3\u30a2\u6642\u9593", "GAMT",
-@@ -159,8 +159,8 @@
- "\u30d4\u30c8\u30b1\u30eb\u30f3\u5cf6\u590f\u6642\u9593", "PDT"};
- String PKT[] = new String[] {"\u30d1\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "PKT",
- "\u30d1\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "PKST"};
-- String PONT[] = new String[] {"Pohnpei Time", "PONT",
-- "Pohnpei Summer Time", "PONST"};
-+ String PONT[] = new String[] {"\u30DD\u30F3\u30DA\u30A4\u6642\u9593", "PONT",
-+ "\u30DD\u30F3\u30DA\u30A4\u590F\u6642\u9593", "PONST"};
- String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "PST",
- "\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT"};
- String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST",
-@@ -173,8 +173,8 @@
- "\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u590f\u6642\u9593", "SGST"};
- String SLST[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
- "\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd\u590f\u6642\u9593", "SLST"};
-- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST",
-- "\u6771\u90e8\u590f\u6642\u9593 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST"};
-+ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST",
-+ "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST"};
- String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT",
- "\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST"};
- String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT",
-@@ -183,8 +183,8 @@
- "\u5354\u5b9a\u4e16\u754c\u6642", "UTC"};
- String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT",
- "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST"};
-- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST",
-- "\u6771\u90e8\u590f\u6642\u9593 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST"};
-+ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST",
-+ "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST"};
- String VLAT[] = new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT",
- "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"};
- String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART",
-@@ -193,10 +193,10 @@
- "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"};
- String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET",
- "\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "WEST"};
-- String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT",
-+ String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIB",
- "\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST"};
-- String WST_AUS[] = new String[] {"\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST",
-- "\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST"};
-+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST",
-+ "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST"};
- String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST",
- "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"};
- String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT",
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -401,8 +401,8 @@
- {"America/Mendoza", AGT},
- {"America/Menominee", CST},
- {"America/Merida", CST},
-- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-- "Metlakatla Daylight Time", "MeDT"}},
-+ {"America/Metlakatla", new String[] {"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u6A19\u6E96\u6642\u9593", "MeST",
-+ "\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u590F\u6642\u9593", "MeDT"}},
- {"America/Mexico_City", CST},
- {"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST",
- "\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT"}},
-@@ -426,7 +426,7 @@
- "\u30b9\u30ea\u30ca\u30e0\u590f\u6642\u9593", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -466,8 +466,8 @@
- "\u30c7\u30a4\u30d3\u30b9\u590f\u6642\u9593", "DAVST"}},
- {"Antarctica/DumontDUrville", new String[] {"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u6642\u9593", "DDUT",
- "\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u590f\u6642\u9593", "DDUST"}},
-- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-- "Macquarie Island Summer Time", "MIST"}},
-+ {"Antarctica/Macquarie", new String[] {"\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u6642\u9593", "MIST",
-+ "\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u590F\u6642\u9593", "MIST"}},
- {"Antarctica/Mawson", new String[] {"\u30e2\u30fc\u30bd\u30f3\u6642\u9593", "MAWT",
- "\u30e2\u30fc\u30bd\u30f3\u590f\u6642\u9593", "MAWST"}},
- {"Antarctica/McMurdo", NZST},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"\u662d\u548c\u57fa\u5730\u6642\u9593", "SYOT",
- "\u662d\u548c\u57fa\u5730\u590f\u6642\u9593", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC",
-+ "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST"}},
- {"Antarctica/Vostok", new String[] {"\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u6642\u9593", "VOST",
- "\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u590f\u6642\u9593", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "EIT",
-+ {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT",
- "\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "EIST" }},
- {"Asia/Kabul", new String[] {"\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "AFT",
- "\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT",
-+ "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
- "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT",
-+ "\u30A6\u30B9\u30C1\u30CD\u30E9\u590F\u6642\u9593", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -616,8 +620,8 @@
- {"Australia/Canberra", EST_NSW},
- {"Australia/Currie", EST_NSW},
- {"Australia/Darwin", DARWIN},
-- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST",
-- "\u4e2d\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST",
-+ "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST"}},
- {"Australia/Hobart", TASMANIA},
- {"Australia/LHI", LORD_HOWE},
- {"Australia/Lindeman", BRISBANE},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "MET",
- "\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-07-15 21:49:32.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",
- "\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST"};
-- String ADELAIDE[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST",
-- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST"};
-+ String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST",
-+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST"};
- String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART",
- "\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ARST"};
- String AKST[] = new String[] {"\uc54c\ub798\uc2a4\uce74 \ud45c\uc900\uc2dc", "AKST",
-@@ -61,10 +61,10 @@
- "\ub300\uc11c\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ADT"};
- String BDT[] = new String[] {"\ubc29\uae00\ub77c\ub370\uc2dc \uc2dc\uac04", "BDT",
- "\ubc29\uae00\ub77c\ub370\uc2dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BDST"};
-- String BRISBANE[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ud038\uc990\ub79c\ub4dc)", "EST",
-- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud038\uc990\ub79c\ub4dc)", "EST"};
-- String BROKEN_HILL[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST",
-- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST"};
-+ String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "EST",
-+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST",
-+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST"};
- String BRT[] = new String[] {"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc2dc\uac04", "BRT",
- "\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BRST"};
- String BTT[] = new String[] {"\ubd80\ud0c4 \uc2dc\uac04", "BTT",
-@@ -77,9 +77,9 @@
- "Chatham \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHADT"};
- String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST",
- "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"};
-- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-- "Chuuk Summer Time", "CHUST"};
-- String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "CIT",
-+ String CHUT[] = new String[] {"\uCD94\uD06C \uD45C\uC900\uC2DC", "CHUT",
-+ "\uCD94\uD06C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "CHUST"};
-+ String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WITA",
- "\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CIST"};
- String CLT[] = new String[] {"\uce60\ub808 \uc2dc\uac04", "CLT",
- "\uce60\ub808 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CLST"};
-@@ -89,8 +89,8 @@
- "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
- String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST",
- "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
-- String DARWIN[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\ub178\ub358 \uc9c0\uc5ed)", "CST",
-- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub178\ub358 \uc9c0\uc5ed)", "CST"};
-+ String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "CST",
-+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "CST"};
- String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
- "\uc544\uc77c\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IST"};
- String EAT[] = new String[] {"\ub3d9\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "EAT",
-@@ -103,10 +103,10 @@
- "\ub3d9\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EGST"};
- String EST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST",
- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT"};
-- String EST_NSW[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST",
-- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST",
-+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST"};
-+ String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET",
-+ "\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST"};
- String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT",
- "\uac00\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GHST"};
- String GAMBIER[] = new String[] {"\uac10\ube44\uc544 \uc2dc\uac04", "GAMT",
-@@ -159,8 +159,8 @@
- "Pitcairn \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"};
- String PKT[] = new String[] {"\ud30c\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "PKT",
- "\ud30c\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PKST"};
-- String PONT[] = new String[] {"Pohnpei Time", "PONT",
-- "Pohnpei Summer Time", "PONST"};
-+ String PONT[] = new String[] {"\uD3F0\uD398\uC774 \uD45C\uC900\uC2DC", "PONT",
-+ "\uD3F0\uD398\uC774 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "PONST"};
- String PST[] = new String[] {"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc", "PST",
- "\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"};
- String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST",
-@@ -173,8 +173,8 @@
- "\uc2f1\uac00\ud3ec\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SGST"};
- String SLST[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
- "\uc2dc\uc5d0\ub77c\ub9ac\uc628 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SLST"};
-- String TASMANIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST",
-- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST"};
-+ String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST",
-+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST"};
- String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT",
- "\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST"};
- String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT",
-@@ -183,8 +183,8 @@
- "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC"};
- String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT",
- "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST"};
-- String VICTORIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ube45\ud1a0\ub9ac\uc544)", "EST",
-- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ube45\ud1a0\ub9ac\uc544)", "EST"};
-+ String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "EST",
-+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "EST"};
- String VLAT[] = new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT",
- "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"};
- String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART",
-@@ -193,10 +193,10 @@
- "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"};
- String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET",
- "\uc11c\uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WEST"};
-- String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT",
-+ String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIB",
- "\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST"};
-- String WST_AUS[] = new String[] {"\uc11c\ubd80 \ud45c\uc900\uc2dc(\ud638\uc8fc)", "WST",
-- "\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud638\uc8fc)", "WST"};
-+ String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST",
-+ "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST"};
- String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST",
- "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"};
- String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT",
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -401,8 +401,8 @@
- {"America/Mendoza", AGT},
- {"America/Menominee", CST},
- {"America/Merida", CST},
-- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-- "Metlakatla Daylight Time", "MeDT"}},
-+ {"America/Metlakatla", new String[] {"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uD45C\uC900\uC2DC", "MeST",
-+ "\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MeDT"}},
- {"America/Mexico_City", CST},
- {"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST",
- "\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT"}},
-@@ -426,7 +426,7 @@
- "\uc218\ub9ac\ub0a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -466,8 +466,8 @@
- "Davis \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DAVST"}},
- {"Antarctica/DumontDUrville", new String[] {"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc2dc\uac04", "DDUT",
- "\ub4a4\ubabd \ub4a4\ub974\ube4c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DDUST"}},
-- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-- "Macquarie Island Summer Time", "MIST"}},
-+ {"Antarctica/Macquarie", new String[] {"\uB9E4\uCF70\uB9AC \uC12C \uD45C\uC900\uC2DC", "MIST",
-+ "\uB9E4\uCF70\uB9AC \uC12C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MIST"}},
- {"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT",
- "\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST"}},
- {"Antarctica/McMurdo", NZST},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"Syowa \uc2dc\uac04", "SYOT",
- "Syowa \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC",
-+ "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST"}},
- {"Antarctica/Vostok", new String[] {"Vostok \uc2dc\uac04", "VOST",
- "Vostok \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "EIT",
-+ {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT",
- "\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EIST"}},
- {"Asia/Kabul", new String[] {"\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "AFT",
- "\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT",
-+ "\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
- "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT",
-+ "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -616,8 +620,8 @@
- {"Australia/Canberra", EST_NSW},
- {"Australia/Currie", EST_NSW},
- {"Australia/Darwin", DARWIN},
-- {"Australia/Eucla", new String[] {"\uc911\uc11c\ubd80 \ud45c\uc900\uc2dc(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST",
-- "\uc911\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST",
-+ "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST"}},
- {"Australia/Hobart", TASMANIA},
- {"Australia/LHI", LORD_HOWE},
- {"Australia/Lindeman", BRISBANE},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"\uc911\ubd80 \uc720\ub7fd \uc2dc\uac04", "MET",
- "\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-07-15 21:49:32.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",
- "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"};
-- String ADELAIDE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul)", "CST",
-- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul)", "CST"};
-+ String ADELAIDE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul)", "CST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "CST"};
- String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART",
- "Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST"};
- String AKST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Alaska", "AKST",
-@@ -61,10 +61,10 @@
- "Hor\u00e1rio de luz natural do Atl\u00e2ntico", "ADT"};
- String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT",
- "Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST"};
-- String BRISBANE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Queensland)", "EST",
-- "Fuso hor\u00e1rio de ver\u00e3o oriental (Queensland)", "EST"};
-- String BROKEN_HILL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST",
-- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST"};
-+ String BRISBANE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Queensland)", "EST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Queensland)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST"};
- String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT",
- "Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST"};
- String BTT[] = new String[] {"Fuso hor\u00e1rio de But\u00e3o", "BTT",
-@@ -77,7 +77,7 @@
- "Hor\u00e1rio de luz natural de Chatham", "CHADT"};
- String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST",
- "Hor\u00e1rio de luz natural de Chamorro", "ChDT"};
-- String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "CIT",
-+ String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "WITA",
- "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Central", "CIST"};
- String CLT[] = new String[] {"Fuso hor\u00e1rio do Chile", "CLT",
- "Fuso hor\u00e1rio de ver\u00e3o do Chile", "CLST"};
-@@ -87,8 +87,8 @@
- "Hor\u00e1rio de luz natural da China", "CDT"};
- String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST",
- "Hor\u00e1rio de luz natural de Cuba", "CDT"};
-- String DARWIN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Territ\u00f3rio do Norte)", "CST",
-- "Fuso hor\u00e1rio de ver\u00e3o central (Territ\u00f3rio do Norte)", "CST"};
-+ String DARWIN[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Territ\u00F3rio do Norte)", "CST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Territ\u00F3rio do Norte)", "CST"};
- String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
- "Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST"};
- String EAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Oriental", "EAT",
-@@ -101,10 +101,10 @@
- "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Oriental", "EGST"};
- String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST",
- "Hor\u00e1rio de luz natural oriental", "EDT"};
-- String EST_NSW[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Nova Gales do Sul)", "EST",
-- "Fuso hor\u00e1rio de ver\u00e3o oriental (Nova Gales do Sul)", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ String EST_NSW[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Oriental (Nova Gales do Sul)", "EST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Nova Gales do Sul)", "EST"};
-+ String FET[] = new String[] {"Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o do Extremo Leste Europeu", "FEST"};
- String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT",
- "Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST"};
- String GAMBIER[] = new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT",
-@@ -157,8 +157,8 @@
- "Hor\u00e1rio de luz natural de Pitcairn", "PDT"};
- String PKT[] = new String[] {"Fuso hor\u00e1rio do Paquist\u00e3o", "PKT",
- "Fuso hor\u00e1rio de ver\u00e3o do Paquist\u00e3o", "PKST"};
-- String PONT[] = new String[] {"Fuso hor\u00e1rio de Pohnpei", "PONT",
-- "Fuso hor\u00e1rio de ver\u00e3o de Pohnpei", "PONST"};
-+ String PONT[] = new String[] {"Fuso Hor\u00E1rio de Pohnpei", "PONT",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o de Pohnpei", "PONST"};
- String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST",
- "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"};
- String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST",
-@@ -171,20 +171,20 @@
- "Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST"};
- String SLST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
- "Fuso hor\u00e1rio de ver\u00e3o de Serra Leoa", "SLST"};
-- String TASMANIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Tasm\u00e2nia)", "EST",
-- "Fuso hor\u00e1rio de ver\u00e3o oriental (Tasm\u00e2nia)", "EST"};
-+ String TASMANIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Tasm\u00E2nia)", "EST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Tasm\u00E2nia)", "EST"};
- String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT",
- "Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST"};
-- String TRUT[] = new String[] {"Fuso hor\u00e1rio de Chuuk", "CHUT",
-- "Fuso hor\u00e1rio de ver\u00e3o de Chuuk", "CHUST"};
-+ String TRUT[] = new String[] {"Fuso Hor\u00E1rio de Chuuk", "CHUT",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o de Chuuk", "CHUST"};
- String ULAT[]= new String[] {"Fuso hor\u00e1rio de Ulan Bator", "ULAT",
- "Fuso hor\u00e1rio de ver\u00e3o de Ulan Bator", "ULAST"};
- String UTC[] = new String[] {"Tempo universal coordenado", "UTC",
- "Tempo universal coordenado", "UTC"};
- String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT",
- "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST"};
-- String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST",
-- "Fuso hor\u00e1rio de ver\u00e3o oriental (Victoria)", "EST"};
-+ String VICTORIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Victoria)", "EST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Victoria)", "EST"};
- String VLAT[] = new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT",
- "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"};
- String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART",
-@@ -193,10 +193,10 @@
- "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST"};
- String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET",
- "Fuso hor\u00e1rio de ver\u00e3o da Europa Ocidental", "WEST"};
-- String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIT",
-+ String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIB",
- "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST"};
-- String WST_AUS[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o ocidental (Austr\u00e1lia)", "WST",
-- "Fuso hor\u00e1rio de ver\u00e3o ocidental (Austr\u00e1lia)", "WST"};
-+ String WST_AUS[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Ocidental (Austr\u00E1lia)", "WST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental (Austr\u00E1lia)", "WST"};
- String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST",
- "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT"};
- String YAKT[] = new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT",
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -401,8 +401,8 @@
- {"America/Mendoza", AGT},
- {"America/Menominee", CST},
- {"America/Merida", CST},
-- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-- "Metlakatla Daylight Time", "MeDT"}},
-+ {"America/Metlakatla", new String[] {"Hor\u00E1rio Padr\u00E3o de Metlakatla", "MeST",
-+ "Hor\u00E1rio de Luz Natural de Metlakatla", "MeDT"}},
- {"America/Mexico_City", CST},
- {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST",
- "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT"}},
-@@ -426,7 +426,7 @@
- "Fuso hor\u00e1rio de ver\u00e3o do Suriname", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -466,8 +466,8 @@
- "Fuso hor\u00e1rio de ver\u00e3o de Davis", "DAVST"}},
- {"Antarctica/DumontDUrville", new String[] {"Fuso hor\u00e1rio de Dumont-d'Urville", "DDUT",
- "Fuso hor\u00e1rio de ver\u00e3o de Dumont-d'Urville", "DDUST"}},
-- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-- "Macquarie Island Summer Time", "MIST"}},
-+ {"Antarctica/Macquarie", new String[] {"Fuso Hor\u00E1rio da Ilha de Macquarie", "MIST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o da Ilha de Macquarie", "MIST"}},
- {"Antarctica/Mawson", new String[] {"Fuso hor\u00e1rio de Mawson", "MAWT",
- "Fuso hor\u00e1rio de ver\u00e3o de Mawson", "MAWST"}},
- {"Antarctica/McMurdo", NZST},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"Fuso hor\u00e1rio de Syowa", "SYOT",
- "Fuso hor\u00e1rio de ver\u00e3o de Syowa", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"Tempo universal coordenado", "UTC",
-+ "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST"}},
- {"Antarctica/Vostok", new String[] {"Fuso hor\u00e1rio de Vostok", "VOST",
- "Fuso hor\u00e1rio de ver\u00e3o de Vostok", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "EIT",
-+ {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "WIT",
- "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Oriental", "EIST"}},
- {"Asia/Kabul", new String[] {"Fuso hor\u00e1rio do Afeganist\u00e3o", "AFT",
- "Fuso hor\u00e1rio de ver\u00e3o do Afeganist\u00e3o", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"Hor\u00E1rio de Khandyga", "YAKT",
-+ "Hor\u00E1rio de Ver\u00E3o de Khandyga", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT",
- "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"Hor\u00E1rio de Ust-Nera", "VLAT",
-+ "Hor\u00E1rio de Ver\u00E3o de Ust-Nera", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -616,8 +620,8 @@
- {"Australia/Canberra", EST_NSW},
- {"Australia/Currie", EST_NSW},
- {"Australia/Darwin", DARWIN},
-- {"Australia/Eucla", new String[] {"Fuso hor\u00e1rio ocidental central (Austr\u00e1lia)", "CWST",
-- "Fuso hor\u00e1rio de ver\u00e3o ocidental central (Austr\u00e1lia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"Fuso Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "CWST",
-+ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental Central (Austr\u00E1lia)", "CWST"}},
- {"Australia/Hobart", TASMANIA},
- {"Australia/LHI", LORD_HOWE},
- {"Australia/Lindeman", BRISBANE},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET",
- "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-07-15 21:49:32.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",
- "Acre, sommartid", "ACST"};
-- String ADELAIDE[] = new String[] {"Central normaltid (S\u00f6dra Australien)", "CST",
-- "Central sommartid (S\u00f6dra Australien)", "CST"};
-+ String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST",
-+ "Central sommartid (South Australia)", "CST"};
- String AGT[] = new String[] {"Argentina, normaltid", "ART",
- "Argentina, sommartid", "ARST"};
- String AKST[] = new String[] {"Alaska, normaltid", "AKST",
-@@ -61,10 +61,10 @@
- "Atlantisk sommartid", "ADT"};
- String BDT[] = new String[] {"Bangladesh, normaltid", "BDT",
- "Bangladesh, sommartid", "BDST"};
-- String BRISBANE[] = new String[] {"\u00d6stlig normaltid (Queensland)", "EST",
-- "\u00d6stlig sommartid (Queensland)", "EST"};
-- String BROKEN_HILL[] = new String[] {"Central normaltid (S\u00f6dra Australien/Nya Sydwales)", "CST",
-- "Central sommartid (S\u00f6dra Australien/Nya Sydwales)", "CST"};
-+ String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "EST",
-+ "\u00D6stlig sommartid (Queensland)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien)/New South Wales)", "CST",
-+ "Central sommartid (South Australia/New South Wales)", "CST"};
- String BRT[] = new String[] {"Brasilien, normaltid", "BRT",
- "Brasilien, sommartid", "BRST"};
- String BTT[] = new String[] {"Bhutan, normaltid", "BTT",
-@@ -77,9 +77,9 @@
- "Chatham, sommartid", "CHADT"};
- String ChST[] = new String[] {"Chamorro, normaltid", "ChST",
- "Chamorro, sommartid", "ChDT"};
-- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-- "Chuuk Summer Time", "CHUST"};
-- String CIT[] = new String[] {"Centralindonesisk tid", "CIT",
-+ String CHUT[] = new String[] {"Chuuk, normaltid", "CHUT",
-+ "Chuuk, sommartid", "CHUST"};
-+ String CIT[] = new String[] {"Centralindonesisk tid", "WITA",
- "Centralindonesisk sommartid", "CIST"};
- String CLT[] = new String[] {"Chile, normaltid", "CLT",
- "Chile, sommartid", "CLST"};
-@@ -89,7 +89,7 @@
- "Kina, sommartid", "CDT"};
- String CUBA[] = new String[] {"Kuba, normaltid", "CST",
- "Kuba, sommartid", "CDT"};
-- String DARWIN[] = new String[] {"Central normaltid (Nordterritoriet)", "CST",
-+ String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "CST",
- "Central sommartid (Nordterritoriet)", "CST"};
- String DUBLIN[] = new String[] {"Greenwichtid", "GMT",
- "Irland, sommartid", "IST"};
-@@ -103,10 +103,10 @@
- "\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST"};
- String EST[] = new String[] {"Eastern, normaltid", "EST",
- "Eastern, sommartid", "EDT"};
-- String EST_NSW[] = new String[] {"Eastern, normaltid (Nya Sydwales)", "EST",
-- "Eastern, sommartid (Nya Sydwales)", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "EST",
-+ "\u00D6stlig sommartid (New South Wales)", "EST"};
-+ String FET[] = new String[] {"Kaliningradtid", "FET",
-+ "\u00D6steuropeisk sommartid", "FEST"};
- String GHMT[] = new String[] {"Ghana, normaltid", "GMT",
- "Ghana, sommartid", "GHST"};
- String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT",
-@@ -159,8 +159,8 @@
- "Pitcairn, sommartid", "PDT"};
- String PKT[] = new String[] {"Pakistan, normaltid", "PKT",
- "Pakistan, sommartid", "PKST"};
-- String PONT[] = new String[] {"Pohnpei Time", "PONT",
-- "Pohnpei Summer Time", "PONST"};
-+ String PONT[] = new String[] {"Pohnpei, normaltid", "PONT",
-+ "Pohnpei, sommartid", "PONST"};
- String PST[] = new String[] {"Stilla havet, normaltid", "PST",
- "Stilla havet, sommartid", "PDT"};
- String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
-@@ -173,8 +173,8 @@
- "Singapore, sommartid", "SGST"};
- String SLST[] = new String[] {"Greenwichtid", "GMT",
- "Sierra Leone, sommartid", "SLST"};
-- String TASMANIA[] = new String[] {"Eastern, normaltid (Tasmanien)", "EST",
-- "Eastern, sommartid (Tasmanien)", "EST"};
-+ String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "EST",
-+ "\u00D6stlig sommartid (Tasmanien)", "EST"};
- String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT",
- "Turkmenistan, sommartid", "TMST"};
- String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT",
-@@ -183,8 +183,8 @@
- "Koordinerad universell tid", "UTC"};
- String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT",
- "Uzbekistan, sommartid", "UZST"};
-- String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST",
-- "\u00d6stlig sommartid (Victoria)", "EST"};
-+ String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "EST",
-+ "\u00D6stlig sommartid (Victoria)", "EST"};
- String VLAT[] = new String[] {"Vladivostok, normaltid", "VLAT",
- "Vladivostok, sommartid", "VLAST"};
- String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART",
-@@ -193,10 +193,10 @@
- "V\u00e4stafrikansk sommartid", "WAST"};
- String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET",
- "V\u00e4steuropeisk sommartid", "WEST"};
-- String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIT",
-+ String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIB",
- "V\u00e4stindonesisk sommartid", "WIST"};
-- String WST_AUS[] = new String[] {"V\u00e4stlig normaltid (Australien)", "WST",
-- "V\u00e4stlig sommartid (Australien)", "WST"};
-+ String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST",
-+ "V\u00E4stlig sommartid (Australien)", "WST"};
- String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST",
- "V\u00e4stsamoansk sommartid", "WSDT"};
- String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT",
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -401,8 +401,8 @@
- {"America/Mendoza", AGT},
- {"America/Menominee", CST},
- {"America/Merida", CST},
-- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-- "Metlakatla Daylight Time", "MeDT"}},
-+ {"America/Metlakatla", new String[] {"Metlakatla, normaltid", "MeST",
-+ "Metlakatla, sommartid", "MeDT"}},
- {"America/Mexico_City", CST},
- {"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST",
- "Saint-Pierre-et-Miquelon, sommartid", "PMDT"}},
-@@ -426,7 +426,7 @@
- "Surinam, sommartid", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -466,8 +466,8 @@
- "Davis, sommartid", "DAVST"}},
- {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville, normaltid", "DDUT",
- "Dumont-d'Urville, sommartid", "DDUST"}},
-- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-- "Macquarie Island Summer Time", "MIST"}},
-+ {"Antarctica/Macquarie", new String[] {"Macquarie\u00F6n, normaltid", "MIST",
-+ "Macquarie\u00F6n, sommartid", "MIST"}},
- {"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT",
- "Mawson, sommartid", "MAWST"}},
- {"Antarctica/McMurdo", NZST},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"Syowa, normaltid", "SYOT",
- "Syowa, sommartid", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"Koordinerad universell tid", "UTC",
-+ "Centraleuropeisk sommartid", "CEST"}},
- {"Antarctica/Vostok", new String[] {"Vostok, normaltid", "VOST",
- "Vostok, sommartid", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "Irkutsk, sommartid", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "EIT",
-+ {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "WIT",
- "\u00d6stindonesisk sommartid", "EIST"}},
- {"Asia/Kabul", new String[] {"Afghanistan, normaltid", "AFT",
- "Afghanistan, sommartid", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT",
-+ "Khandyga, sommartid", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT",
- "Krasnojarsk, sommartid", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT",
-+ "Ust-Nera, sommartid", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -616,8 +620,8 @@
- {"Australia/Canberra", EST_NSW},
- {"Australia/Currie", EST_NSW},
- {"Australia/Darwin", DARWIN},
-- {"Australia/Eucla", new String[] {"Central v\u00e4stlig normaltid (Australien)", "CWST",
-- "Central v\u00e4stlig sommartid (Australien)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "CWST",
-+ "Central v\u00E4stlig sommartid (Australien)", "CWST"}},
- {"Australia/Hobart", TASMANIA},
- {"Australia/LHI", LORD_HOWE},
- {"Australia/Lindeman", BRISBANE},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "Samara, sommartid", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"Mellaneuropeisk tid", "MET",
- "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-07-15 21:49:32.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",
- "Acre \u590f\u4ee4\u65f6", "ACST"};
-- String ADELAIDE[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST",
-- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST"};
-+ String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST",
-+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST"};
- String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART",
- "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "ARST"};
- String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6807\u51c6\u65f6\u95f4", "AKST",
-@@ -61,10 +61,10 @@
- "\u5927\u897f\u6d0b\u590f\u4ee4\u65f6", "ADT"};
- String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u65f6\u95f4", "BDT",
- "\u5b5f\u52a0\u62c9\u590f\u4ee4\u65f6", "BDST"};
-- String BRISBANE[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6606\u58eb\u5170\uff09", "EST",
-- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u6606\u58eb\u5170\uff09", "EST"};
-- String BROKEN_HILL[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST",
-- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST"};
-+ String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "EST",
-+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST",
-+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST"};
- String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9a\u65f6\u95f4", "BRT",
- "\u5df4\u897f\u5229\u4e9a\u590f\u4ee4\u65f6", "BRST"};
- String BTT[] = new String[] {"\u4e0d\u4e39\u65f6\u95f4", "BTT",
-@@ -77,9 +77,9 @@
- "\u67e5\u8428\u59c6\u590f\u4ee4\u65f6", "CHADT"};
- String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST",
- "Chamorro \u590f\u4ee4\u65f6", "ChDT"};
-- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-- "Chuuk Summer Time", "CHUST"};
-- String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "CIT",
-+ String CHUT[] = new String[] {"\u4E18\u514B\u65F6\u95F4", "CHUT",
-+ "\u4E18\u514B\u590F\u4EE4\u65F6", "CHUST"};
-+ String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WITA",
- "\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "CIST"};
- String CLT[] = new String[] {"\u667a\u5229\u65f6\u95f4", "CLT",
- "\u667a\u5229\u590f\u4ee4\u65f6", "CLST"};
-@@ -89,8 +89,8 @@
- "\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT"};
- String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST",
- "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT"};
-- String DARWIN[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5317\u9886\u5730\uff09", "CST",
-- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5317\u9886\u5730\uff09", "CST"};
-+ String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "CST",
-+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "CST"};
- String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
- "\u7231\u5c14\u5170\u590f\u4ee4\u65f6", "IST"};
- String EAT[] = new String[] {"\u4e1c\u975e\u65f6\u95f4", "EAT",
-@@ -103,10 +103,10 @@
- "\u4e1c\u683c\u6797\u5c9b\u590f\u4ee4\u65f6", "EGST"};
- String EST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST",
- "\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT"};
-- String EST_NSW[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST",
-- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST",
-+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST"};
-+ String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET",
-+ "\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST"};
- String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT",
- "\u52a0\u7eb3\u590f\u4ee4\u65f6", "GHST"};
- String GAMBIER[] = new String[] {"\u5188\u6bd4\u4e9a\u65f6\u95f4", "GAMT",
-@@ -159,8 +159,8 @@
- "\u76ae\u7279\u5eb7\u5c9b\u590f\u4ee4\u65f6", "PDT"};
- String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u65f6\u95f4", "PKT",
- "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u65f6", "PKST"};
-- String PONT[] = new String[] {"Pohnpei Time", "PONT",
-- "Pohnpei Summer Time", "PONST"};
-+ String PONT[] = new String[] {"\u6CE2\u7EB3\u4F69\u65F6\u95F4", "PONT",
-+ "\u6CE2\u7EB3\u4F69\u590F\u4EE4\u65F6", "PONST"};
- String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "PST",
- "\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT"};
- String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST",
-@@ -173,8 +173,8 @@
- "\u65b0\u52a0\u5761\u590f\u4ee4\u65f6", "SGST"};
- String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
- "\u585e\u62c9\u5229\u6602\u590f\u4ee4\u65f6", "SLST"};
-- String TASMANIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST",
-- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST"};
-+ String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST",
-+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST"};
- String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT",
- "\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST"};
- String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT",
-@@ -183,8 +183,8 @@
- "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC"};
- String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT",
- "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST"};
-- String VICTORIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST",
-- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST"};
-+ String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "EST",
-+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "EST"};
- String VLAT[] = new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT",
- "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"};
- String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART",
-@@ -193,10 +193,10 @@
- "\u897f\u975e\u590f\u4ee4\u65f6", "WAST"};
- String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET",
- "\u897f\u6b27\u590f\u4ee4\u65f6", "WEST"};
-- String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT",
-+ String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIB",
- "\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST"};
-- String WST_AUS[] = new String[] {"\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST",
-- "\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST"};
-+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "WST",
-+ "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "WST"};
- String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST",
- "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"};
- String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT",
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -401,8 +401,8 @@
- {"America/Mendoza", AGT},
- {"America/Menominee", CST},
- {"America/Merida", CST},
-- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-- "Metlakatla Daylight Time", "MeDT"}},
-+ {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6807\u51C6\u65F6\u95F4", "MeST",
-+ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u590F\u4EE4\u65F6", "MeDT"}},
- {"America/Mexico_City", CST},
- {"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST",
- "\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT"}},
-@@ -426,7 +426,7 @@
- "\u82cf\u5229\u5357\u590f\u4ee4\u65f6", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -466,8 +466,8 @@
- "\u6234\u7ef4\u65af\u590f\u4ee4\u65f6", "DAVST"}},
- {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u65f6\u95f4", "DDUT",
- "Dumont-d'Urville \u590f\u4ee4\u65f6", "DDUST"}},
-- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-- "Macquarie Island Summer Time", "MIST"}},
-+ {"Antarctica/Macquarie", new String[] {"\u9EA6\u5938\u91CC\u5C9B\u65F6\u95F4", "MIST",
-+ "\u9EA6\u5938\u91CC\u5C9B\u590F\u4EE4\u65F6", "MIST"}},
- {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT",
- "\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST"}},
- {"Antarctica/McMurdo", NZST},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"Syowa \u65f6\u95f4", "SYOT",
- "Syowa \u590f\u4ee4\u65f6", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC",
-+ "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST"}},
- {"Antarctica/Vostok", new String[] {"\u83ab\u65af\u6258\u514b\u65f6\u95f4", "VOST",
- "\u83ab\u65af\u6258\u514b\u590f\u4ee4\u65f6", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "EIT",
-+ {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT",
- "\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "EIST"}},
- {"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u65f6\u95f4", "AFT",
- "\u963f\u5bcc\u6c57\u590f\u4ee4\u65f6", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT",
-+ "\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
- "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}},
-@@ -586,7 +589,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT",
-+ "\u4E4C\u65AF\u5B63\u6D85\u62C9\u590F\u4EE4\u65F6", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -616,8 +620,8 @@
- {"Australia/Canberra", EST_NSW},
- {"Australia/Currie", EST_NSW},
- {"Australia/Darwin", DARWIN},
-- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST",
-- "\u4e2d\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST"}},
-+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "CWST",
-+ "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "CWST"}},
- {"Australia/Hobart", TASMANIA},
- {"Australia/LHI", LORD_HOWE},
- {"Australia/Lindeman", BRISBANE},
-@@ -635,7 +639,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -705,7 +709,7 @@
- "\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -753,7 +757,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"\u4e2d\u6b27\u65f6\u95f4", "MET",
- "\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-07-15 21:49:32.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",
- "Acre \u590f\u4ee4\u6642\u9593", "ACST"};
-- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST",
-- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST"};
-+ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "CST",
-+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "CST"};
- String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART",
- "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "ARST"};
- String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6a19\u6e96\u6642\u9593", "AKST",
-@@ -61,10 +61,10 @@
- "\u5927\u897f\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ADT"};
- String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u6642\u9593", "BDT",
- "\u5b5f\u52a0\u62c9\u590f\u4ee4\u6642\u9593", "BDST"};
-- String BRISBANE[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u6606\u58eb\u862d)", "EST",
-- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u6606\u58eb\u862d)", "EST"};
-- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST",
-- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST"};
-+ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "EST",
-+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST",
-+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST"};
- String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9e\u6642\u9593", "BRT",
- "\u5df4\u897f\u5229\u4e9e\u590f\u4ee4\u6642\u9593", "BRST"};
- String BTT[] = new String[] {"\u4e0d\u4e39\u6642\u9593", "BTT",
-@@ -77,9 +77,9 @@
- "\u67e5\u5766\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CHADT"};
- String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST",
- "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"};
-- String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-- "Chuuk Summer Time", "CHUST"};
-- String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "CIT",
-+ String CHUT[] = new String[] {"\u695A\u514B\u6642\u9593", "CHUT",
-+ "\u695A\u514B\u590F\u4EE4\u6642\u9593", "CHUST"};
-+ String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WITA",
- "\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u4ee4\u6642\u9593", "CIST"};
- String CLT[] = new String[] {"\u667a\u5229\u6642\u9593", "CLT",
- "\u667a\u5229\u590f\u4ee4\u6642\u9593", "CLST"};
-@@ -89,8 +89,8 @@
- "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
- String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST",
- "\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
-- String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST",
-- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST"};
-+ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST",
-+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST"};
- String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
- "\u611b\u723e\u862d\u590f\u4ee4\u6642\u9593", "IST"};
- String EAT[] = new String[] {"\u6771\u975e\u6642\u9593", "EAT",
-@@ -103,10 +103,10 @@
- "\u6771\u683c\u6797\u5cf6\u590f\u4ee4\u6642\u9593", "EGST"};
- String EST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST",
- "\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT"};
-- String EST_NSW[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST",
-- "\u6771\u65b9\u590f\u4ee4\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST"};
-- String FET[] = new String[] {"Further-eastern European Time", "FET",
-- "Further-eastern European Summer Time", "FEST"};
-+ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST",
-+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST"};
-+ String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET",
-+ "\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST"};
- String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT",
- "\u8fe6\u7d0d\u590f\u4ee4\u6642\u9593", "GHST"};
- String GAMBIER[] = new String[] {"\u7518\u6bd4\u723e\u6642\u9593", "GAMT",
-@@ -159,8 +159,8 @@
- "\u76ae\u7279\u5eb7\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"};
- String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u6642\u9593", "PKT",
- "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u6642\u9593", "PKST"};
-- String PONT[] = new String[] {"Pohnpei Time", "PONT",
-- "Pohnpei Summer Time", "PONST"};
-+ String PONT[] = new String[] {"\u6CE2\u7D0D\u4F69\u6642\u9593", "PONT",
-+ "\u6CE2\u7D0D\u4F69\u590F\u4EE4\u6642\u9593", "PONST"};
- String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593", "PST",
- "\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"};
- String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST",
-@@ -173,8 +173,8 @@
- "\u65b0\u52a0\u5761\u590f\u4ee4\u6642\u9593", "SGST"};
- String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
- "\u7345\u5b50\u5c71\u590f\u4ee4\u6642\u9593", "SLST"};
-- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST",
-- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST"};
-+ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST",
-+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST"};
- String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT",
- "\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST"};
- String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT",
-@@ -183,8 +183,8 @@
- "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC"};
- String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT",
- "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST"};
-- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST",
-- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST"};
-+ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST",
-+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST"};
- String VLAT[] = new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT",
- "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"};
- String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART",
-@@ -193,10 +193,10 @@
- "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"};
- String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET",
- "\u897f\u6b50\u590f\u4ee4\u6642\u9593", "WEST"};
-- String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIT",
-+ String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIB",
- "\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST"};
-- String WST_AUS[] = new String[] {"\u897f\u65b9\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST",
-- "\u897f\u65b9\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST"};
-+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST",
-+ "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST"};
- String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST",
- "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"};
- String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT",
-@@ -291,7 +291,7 @@
- {"Africa/Porto-Novo", WAT},
- {"Africa/Sao_Tome", GMT},
- {"Africa/Timbuktu", GMT},
-- {"Africa/Tripoli", CET},
-+ {"Africa/Tripoli", EET},
- {"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
- {"America/Adak", HAST},
-@@ -308,7 +308,7 @@
- {"America/Argentina/Rio_Gallegos", AGT},
- {"America/Argentina/Salta", AGT},
- {"America/Argentina/San_Juan", AGT},
-- {"America/Argentina/San_Luis", WART},
-+ {"America/Argentina/San_Luis", AGT},
- {"America/Argentina/Tucuman", AGT},
- {"America/Argentina/Ushuaia", AGT},
- {"America/Aruba", AST},
-@@ -349,7 +349,7 @@
- {"America/Detroit", EST},
- {"America/Dominica", AST},
- {"America/Edmonton", MST},
-- {"America/Eirunepe", AMT},
-+ {"America/Eirunepe", ACT},
- {"America/El_Salvador", CST},
- {"America/Ensenada", PST},
- {"America/Fort_Wayne", EST},
-@@ -401,8 +401,8 @@
- {"America/Mendoza", AGT},
- {"America/Menominee", CST},
- {"America/Merida", CST},
-- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-- "Metlakatla Daylight Time", "MeDT"}},
-+ {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6A19\u6E96\u6642\u9593", "MeST",
-+ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u65E5\u5149\u7BC0\u7D04\u6642\u9593", "MeDT"}},
- {"America/Mexico_City", CST},
- {"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST",
- "\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT"}},
-@@ -426,7 +426,7 @@
- "\u8607\u5229\u5357\u590f\u4ee4\u6642\u9593", "SRST"}},
- {"America/Port-au-Prince", EST},
- {"America/Port_of_Spain", AST},
-- {"America/Porto_Acre", AMT},
-+ {"America/Porto_Acre", ACT},
- {"America/Porto_Velho", AMT},
- {"America/Puerto_Rico", AST},
- {"America/Rainy_River", CST},
-@@ -434,7 +434,7 @@
- {"America/Recife", BRT},
- {"America/Regina", CST},
- {"America/Resolute", CST},
-- {"America/Rio_Branco", AMT},
-+ {"America/Rio_Branco", ACT},
- {"America/Rosario", AGT},
- {"America/Santa_Isabel", PST},
- {"America/Santarem", BRT},
-@@ -466,8 +466,8 @@
- "\u81fa\u7dad\u65af\u590f\u4ee4\u6642\u9593", "DAVST"}},
- {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u6642\u9593", "DDUT",
- "Dumont-d'Urville \u590f\u4ee4\u6642\u9593", "DDUST"}},
-- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-- "Macquarie Island Summer Time", "MIST"}},
-+ {"Antarctica/Macquarie", new String[] {"\u9EA5\u5938\u5229\u5CF6\u6642\u9593", "MIST",
-+ "\u9EA5\u5938\u5229\u5CF6\u590F\u4EE4\u6642\u9593", "MIST"}},
- {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT",
- "\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST"}},
- {"Antarctica/McMurdo", NZST},
-@@ -477,6 +477,8 @@
- {"Antarctica/South_Pole", NZST},
- {"Antarctica/Syowa", new String[] {"\u5915\u6b50\u74e6 (Syowa) \u6642\u9593", "SYOT",
- "\u5915\u6b50\u74e6 (Syowa) \u590f\u4ee4\u6642\u9593", "SYOST"}},
-+ {"Antarctica/Troll", new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC",
-+ "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST"}},
- {"Antarctica/Vostok", new String[] {"\u4f5b\u65af\u6258 (Vostok) \u6642\u9593", "VOST",
- "\u4f5b\u65af\u6258 (Vostok) \u590f\u4ee4\u6642\u9593", "VOSST"}},
- {"Arctic/Longyearbyen", CET},
-@@ -527,7 +529,7 @@
- "Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"}},
- {"Asia/Istanbul", EET},
- {"Asia/Jakarta", WIT},
-- {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "EIT",
-+ {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WIT",
- "\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u65e5\u6642\u9593", "EIST"}},
- {"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u6642\u9593", "AFT",
- "\u963f\u5bcc\u6c57\u590f\u4ee4\u6642\u9593", "AFST"}},
-@@ -537,7 +539,8 @@
- {"Asia/Kashgar", CTT},
- {"Asia/Kathmandu", NPT},
- {"Asia/Katmandu", NPT},
-- {"Asia/Khandyga", YAKT},
-+ {"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT",
-+ "\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST"}},
- {"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
- "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}},
-@@ -587,7 +590,8 @@
- {"Asia/Ulaanbaatar", ULAT},
- {"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
-- {"Asia/Ust-Nera", VLAT},
-+ {"Asia/Ust-Nera", new String[] {"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT",
-+ "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u590F\u4EE4\u6642\u9593", "VLAST"}},
- {"Asia/Vientiane", ICT},
- {"Asia/Vladivostok", VLAT},
- {"Asia/Yakutsk", YAKT},
-@@ -617,8 +621,8 @@
- {"Australia/Canberra", EST_NSW},
- {"Australia/Currie", EST_NSW},
- {"Australia/Darwin", DARWIN},
-- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST",
-- "\u4e2d\u897f\u90e8\u65e5\u5149\u7bc0\u7d04\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST",
-+ "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST"}},
- {"Australia/Hobart", TASMANIA},
- {"Australia/LHI", LORD_HOWE},
- {"Australia/Lindeman", BRISBANE},
-@@ -636,7 +640,7 @@
- {"Australia/Yancowinna", BROKEN_HILL},
- {"BET", BRT},
- {"BST", BDT},
-- {"Brazil/Acre", AMT},
-+ {"Brazil/Acre", ACT},
- {"Brazil/DeNoronha", NORONHA},
- {"Brazil/East", BRT},
- {"Brazil/West", AMT},
-@@ -706,7 +710,7 @@
- "\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST"}},
- {"Europe/San_Marino", CET},
- {"Europe/Sarajevo", CET},
-- {"Europe/Simferopol", EET},
-+ {"Europe/Simferopol", MSK},
- {"Europe/Skopje", CET},
- {"Europe/Sofia", EET},
- {"Europe/Stockholm", CET},
-@@ -754,7 +758,7 @@
- {"Jamaica", EST},
- {"Japan", JST},
- {"Kwajalein", MHT},
-- {"Libya", CET},
-+ {"Libya", EET},
- {"MET", new String[] {"\u4e2d\u6b50\u6642\u9593", "MET",
- "\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-10-28 20:19:52.000000000 -0700
-@@ -38,6 +38,7 @@
- # gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
- # gnumake JDK=<java_home> OSNAME=linux [OPT=true]
- # gnumake JDK=<java_home> OSNAME=win32 [OPT=true]
-+# gnumake JDK=<java_home> OSNAME=bsd [OPT=true]
- #
- ########################################################################
-
-@@ -120,6 +121,29 @@
- LINK_SHARED=link -dll -out:$@
- endif
-
-+# BSD GNU C Compiler
-+ifeq ($(OSNAME), bsd)
-+ # GNU Compiler options needed to build it
-+ COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer
-+ # Options that help find errors
-+ COMMON_FLAGS+= -W -Wall -Wno-unused -Wno-parentheses
-+ ifeq ($(OPT), true)
-+ CFLAGS=-O2 $(COMMON_FLAGS)
-+ else
-+ CFLAGS=-g $(COMMON_FLAGS)
-+ endif
-+ # Object files needed to create library
-+ OBJECTS=$(SOURCES:%.c=%.o)
-+ # Library name and options needed to build it
-+ # XXX: Needs to be fixed for MacOS X
-+ LIBRARY=lib$(LIBNAME).so
-+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
-+ # Libraries we are dependent on
-+ LIBRARIES=-lc
-+ # Building a shared library
-+ LINK_SHARED=$(LINK.c) -shared -o $@
-+endif
-+
- # Common -I options
- 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 2014-07-15 21:49:32.000000000 -0700
-@@ -527,7 +527,12 @@
- jmethodID method;
-
- info = get_info(index);
-- HPROF_ASSERT(mnum < info->method_count);
-+ if (mnum >= info->method_count) {
-+ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
-+ (*env)->ThrowNew(env, newExcCls, "Illegal mnum");
-+
-+ return NULL;
-+ }
- method = info->method[mnum].method_id;
- if ( method == NULL ) {
- char * name;
-@@ -535,7 +540,12 @@
- jclass clazz;
-
- name = (char *)string_get(info->method[mnum].name_index);
-- HPROF_ASSERT(name!=NULL);
-+ if (name==NULL) {
-+ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
-+ (*env)->ThrowNew(env, newExcCls, "Name not found");
-+
-+ return NULL;
-+ }
- sig = (char *)string_get(info->method[mnum].sig_index);
- 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 2014-07-15 21:49:32.000000000 -0700
-@@ -195,7 +195,12 @@
-
- HPROF_ASSERT(env!=NULL);
- HPROF_ASSERT(thread!=NULL);
-- HPROF_ASSERT(cnum!=0 && cnum!=gdata->tracker_cnum);
-+ if (cnum == 0 || cnum == gdata->tracker_cnum) {
-+ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
-+ (*env)->ThrowNew(env, newExcCls, "Illegal cnum.");
-+
-+ return;
-+ }
-
- /* Prevent recursion into any BCI function for this thread (pstatus). */
- if ( tls_get_tracker_status(env, thread, JNI_FALSE,
-@@ -204,8 +209,10 @@
-
- (*pstatus) = 1;
- method = class_get_methodID(env, cnum, mnum);
-- HPROF_ASSERT(method!=NULL);
-- tls_push_method(tls_index, method);
-+ if (method != NULL) {
-+ tls_push_method(tls_index, method);
-+ }
-+
- (*pstatus) = 0;
- }
- }
-@@ -248,7 +255,13 @@
-
- HPROF_ASSERT(env!=NULL);
- HPROF_ASSERT(thread!=NULL);
-- HPROF_ASSERT(cnum!=0 && cnum!=gdata->tracker_cnum);
-+
-+ if (cnum == 0 || cnum == gdata->tracker_cnum) {
-+ jclass newExcCls = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
-+ (*env)->ThrowNew(env, newExcCls, "Illegal cnum.");
-+
-+ return;
-+ }
-
- /* Prevent recursion into any BCI function for this thread (pstatus). */
- if ( tls_get_tracker_status(env, thread, JNI_FALSE,
-@@ -257,8 +270,10 @@
-
- (*pstatus) = 1;
- method = class_get_methodID(env, cnum, mnum);
-- HPROF_ASSERT(method!=NULL);
-- tls_pop_method(tls_index, thread, method);
-+ if (method != NULL) {
-+ tls_pop_method(tls_index, thread, method);
-+ }
-+
- (*pstatus) = 0;
- }
- }
---- ./jdk/src/share/demo/jvmti/hprof/hprof_init.c 2013-09-06 11:28:55.000000000 -0700
-+++ ./jdk/src/share/demo/jvmti/hprof/hprof_init.c 2014-07-15 21:49:32.000000000 -0700
-@@ -1899,11 +1899,17 @@
- */
- getSystemProperty("sun.boot.library.path", &boot_path);
- md_build_library_name(lname, FILENAME_MAX, boot_path, name);
-+ if ( strlen(lname) == 0 ) {
-+ HPROF_ERROR(JNI_TRUE, "Could not find library");
-+ }
- jvmtiDeallocate(boot_path);
- handle = md_load_library(lname, err_buf, (int)sizeof(err_buf));
- if ( handle == NULL ) {
- /* This may be necessary on Windows. */
- md_build_library_name(lname, FILENAME_MAX, "", name);
-+ if ( strlen(lname) == 0 ) {
-+ HPROF_ERROR(JNI_TRUE, "Could not find library");
-+ }
- handle = md_load_library(lname, err_buf, (int)sizeof(err_buf));
- if ( handle == NULL ) {
- HPROF_ERROR(JNI_TRUE, err_buf);
-@@ -1968,6 +1974,9 @@
- getSystemProperty("sun.boot.library.path", &boot_path);
- /* Load in NPT library for character conversions */
- md_build_library_name(npt_lib, sizeof(npt_lib), boot_path, NPT_LIBNAME);
-+ if ( strlen(npt_lib) == 0 ) {
-+ HPROF_ERROR(JNI_TRUE, "Could not find npt library");
-+ }
- jvmtiDeallocate(boot_path);
- NPT_INITIALIZE(npt_lib, &(gdata->npt), NPT_VERSION, NULL);
- if ( gdata->npt == NULL ) {
---- ./jdk/src/share/demo/jvmti/hprof/hprof_md.h 2013-09-06 11:28:55.000000000 -0700
-+++ ./jdk/src/share/demo/jvmti/hprof/hprof_md.h 2014-07-15 21:49:32.000000000 -0700
-@@ -69,7 +69,7 @@
- unsigned md_ntohs(unsigned short s);
- unsigned md_ntohl(unsigned l);
-
--void md_build_library_name(char *holder, int holderlen, char *pname, char *fname);
-+void md_build_library_name(char *holder, int holderlen, const char *pname, const char *fname);
- void * md_load_library(const char *name, char *err_buf, int err_buflen);
- void md_unload_library(void *handle);
- void * md_find_library_entry(void *handle, const char *name);
---- ./jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java 2013-09-06 11:28:57.000000000 -0700
-+++ ./jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java 2014-07-15 21:49:32.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 2013 Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
-@@ -54,7 +54,7 @@
- * jconsole's script console.
- */
-
--class ScriptShellPanel extends JPanel {
-+public class ScriptShellPanel extends JPanel {
-
- private static final long serialVersionUID = 4116273141148726319L;
-
---- ./jdk/src/share/javavm/export/jvm.h 2013-09-06 11:28:57.000000000 -0700
-+++ ./jdk/src/share/javavm/export/jvm.h 2014-10-28 20:19:49.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
-@@ -384,6 +384,19 @@
- JVM_FindClassFromBootLoader(JNIEnv *env, const char *name);
-
- /*
-+ * Find a class from a given class loader. Throws ClassNotFoundException.
-+ * name: name of class
-+ * init: whether initialization is done
-+ * loader: class loader to look up the class. This may not be the same as the caller's
-+ * class loader.
-+ * caller: initiating class. The initiating class may be null when a security
-+ * manager is not installed.
-+ */
-+JNIEXPORT jclass JNICALL
-+JVM_FindClassFromCaller(JNIEnv *env, const char *name, jboolean init,
-+ jobject loader, jclass caller);
-+
-+/*
- * Find a class from a given class loader. Throw ClassNotFoundException
- * or NoClassDefFoundError depending on the value of the last
- * argument.
---- ./jdk/src/share/lib/security/java.policy 2013-09-06 11:28:57.000000000 -0700
-+++ ./jdk/src/share/lib/security/java.policy 2014-07-15 21:49:32.000000000 -0700
-@@ -2,48 +2,51 @@
- // Standard extensions get all permissions by default
-
- grant codeBase "file:${{java.ext.dirs}}/*" {
-- permission java.security.AllPermission;
-+ permission java.security.AllPermission;
- };
-
- // default permissions granted to all domains
-
--grant {
-- // Allows any thread to stop itself using the java.lang.Thread.stop()
-- // method that takes no argument.
-- // Note that this permission is granted by default only to remain
-- // backwards compatible.
-- // It is strongly recommended that you either remove this permission
-- // from this policy file or further restrict it to code sources
-- // that you specify, because Thread.stop() is potentially unsafe.
-- // See the API specification of java.lang.Thread.stop() for more
-+grant {
-+ // Allows any thread to stop itself using the java.lang.Thread.stop()
-+ // method that takes no argument.
-+ // Note that this permission is granted by default only to remain
-+ // backwards compatible.
-+ // It is strongly recommended that you either remove this permission
-+ // from this policy file or further restrict it to code sources
-+ // that you specify, because Thread.stop() is potentially unsafe.
-+ // See the API specification of java.lang.Thread.stop() for more
- // information.
-- permission java.lang.RuntimePermission "stopThread";
-+ permission java.lang.RuntimePermission "stopThread";
-
-- // allows anyone to listen on un-privileged ports
-- permission java.net.SocketPermission "localhost:1024-", "listen";
-+ // allows anyone to listen on dynamic ports
-+ permission java.net.SocketPermission "localhost:0", "listen";
-
-- // "standard" properies that can be read by anyone
-+ // permission for standard RMI registry port
-+ permission java.net.SocketPermission "localhost:1099", "listen";
-
-- permission java.util.PropertyPermission "java.version", "read";
-- permission java.util.PropertyPermission "java.vendor", "read";
-- permission java.util.PropertyPermission "java.vendor.url", "read";
-- permission java.util.PropertyPermission "java.class.version", "read";
-- permission java.util.PropertyPermission "os.name", "read";
-- permission java.util.PropertyPermission "os.version", "read";
-- permission java.util.PropertyPermission "os.arch", "read";
-- permission java.util.PropertyPermission "file.separator", "read";
-- permission java.util.PropertyPermission "path.separator", "read";
-- permission java.util.PropertyPermission "line.separator", "read";
--
-- permission java.util.PropertyPermission "java.specification.version", "read";
-- permission java.util.PropertyPermission "java.specification.vendor", "read";
-- permission java.util.PropertyPermission "java.specification.name", "read";
--
-- permission java.util.PropertyPermission "java.vm.specification.version", "read";
-- permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-- permission java.util.PropertyPermission "java.vm.specification.name", "read";
-- permission java.util.PropertyPermission "java.vm.version", "read";
-- permission java.util.PropertyPermission "java.vm.vendor", "read";
-- permission java.util.PropertyPermission "java.vm.name", "read";
-+ // "standard" properies that can be read by anyone
-+
-+ permission java.util.PropertyPermission "java.version", "read";
-+ permission java.util.PropertyPermission "java.vendor", "read";
-+ permission java.util.PropertyPermission "java.vendor.url", "read";
-+ permission java.util.PropertyPermission "java.class.version", "read";
-+ permission java.util.PropertyPermission "os.name", "read";
-+ permission java.util.PropertyPermission "os.version", "read";
-+ permission java.util.PropertyPermission "os.arch", "read";
-+ permission java.util.PropertyPermission "file.separator", "read";
-+ permission java.util.PropertyPermission "path.separator", "read";
-+ permission java.util.PropertyPermission "line.separator", "read";
-+
-+ permission java.util.PropertyPermission "java.specification.version", "read";
-+ permission java.util.PropertyPermission "java.specification.vendor", "read";
-+ permission java.util.PropertyPermission "java.specification.name", "read";
-+
-+ permission java.util.PropertyPermission "java.vm.specification.version", "read";
-+ permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-+ permission java.util.PropertyPermission "java.vm.specification.name", "read";
-+ permission java.util.PropertyPermission "java.vm.version", "read";
-+ permission java.util.PropertyPermission "java.vm.vendor", "read";
-+ permission java.util.PropertyPermission "java.vm.name", "read";
- };
-
---- ./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-07-15 21:49:32.000000000 -0700
-@@ -128,7 +128,10 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.naming.internal.,\
- com.sun.proxy.,\
-+ com.sun.corba.se.,\
-+ com.sun.script.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -165,7 +168,10 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.naming.internal.,\
- com.sun.proxy.,\
-+ com.sun.corba.se.,\
-+ com.sun.script.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -423,4 +429,3 @@
- #
- # Example:
- # 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-07-15 21:49:32.000000000 -0700
-@@ -129,7 +129,10 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.naming.internal.,\
- com.sun.proxy.,\
-+ com.sun.corba.se.,\
-+ com.sun.script.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -168,7 +171,10 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.naming.internal.,\
- com.sun.proxy.,\
-+ com.sun.corba.se.,\
-+ com.sun.script.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -428,4 +434,3 @@
- #
- # Example:
- # 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-07-15 21:49:32.000000000 -0700
-@@ -130,7 +130,10 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.naming.internal.,\
- com.sun.proxy.,\
-+ com.sun.corba.se.,\
-+ com.sun.script.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -168,7 +171,10 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.naming.internal.,\
- com.sun.proxy.,\
-+ com.sun.corba.se.,\
-+ com.sun.script.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -427,4 +433,3 @@
- #
- # Example:
- # 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-07-15 21:49:32.000000000 -0700
-@@ -129,7 +129,10 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.naming.internal.,\
- com.sun.proxy.,\
-+ com.sun.corba.se.,\
-+ com.sun.script.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -168,7 +171,10 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.naming.internal.,\
- com.sun.proxy.,\
-+ com.sun.corba.se.,\
-+ com.sun.script.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -428,4 +434,3 @@
- #
- # Example:
- # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
--
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-09-06 11:28:57.000000000 -0700
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2014-10-28 20:19:52.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2009, 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
-@@ -79,6 +79,7 @@
- #define ERROR_RESOURCE "Cannot extract resource file"
- #define ERROR_OVERFLOW "Internal buffer overflow"
- #define ERROR_INTERNAL "Internal error"
-+#define ERROR_INIT "cannot init class members"
-
- #define LOGFILE_STDOUT "-"
- #define LOGFILE_STDERR ""
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp 2013-09-06 11:28:57.000000000 -0700
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp 2014-07-15 21:54:45.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2012, 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
-@@ -56,6 +56,45 @@
-
- #define THROW_IOE(x) JNU_ThrowIOException(env,x)
-
-+#define CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(CERVTI_exception, CERVTI_message) \
-+ do { \
-+ if ((env)->ExceptionOccurred()) { \
-+ THROW_IOE(CERVTI_message); \
-+ return; \
-+ } \
-+ if ((CERVTI_exception) == NULL) { \
-+ THROW_IOE(CERVTI_message); \
-+ return; \
-+ } \
-+ } while (JNI_FALSE)
-+
-+
-+#define CHECK_EXCEPTION_RETURN_VALUE(CERL_exception, CERL_return_value) \
-+ do { \
-+ if ((env)->ExceptionOccurred()) { \
-+ return CERL_return_value; \
-+ } \
-+ if ((CERL_exception) == NULL) { \
-+ return CERL_return_value; \
-+ } \
-+ } while (JNI_FALSE)
-+
-+
-+// If these useful macros aren't defined in jni_util.h then define them here
-+#ifndef CHECK_NULL_RETURN
-+#define CHECK_NULL_RETURN(x, y) \
-+ do { \
-+ if ((x) == NULL) return (y); \
-+ } while (JNI_FALSE)
-+#endif
-+
-+#ifndef CHECK_EXCEPTION_RETURN
-+#define CHECK_EXCEPTION_RETURN(env, y) \
-+ do { \
-+ if ((*env)->ExceptionCheck(env)) return (y); \
-+ } while (JNI_FALSE)
-+#endif
-+
- static jlong read_input_via_jni(unpacker* self,
- void* buf, jlong minlen, jlong maxlen);
-
-@@ -92,9 +131,11 @@
- vm->GetEnv(&envRaw, JNI_VERSION_1_1);
- JNIEnv* env = (JNIEnv*) envRaw;
- //fprintf(stderr, "get_unpacker() env=%p\n", env);
-- if (env == null)
-- return null;
-+ CHECK_NULL_RETURN(env, NULL);
- jobject pObj = env->CallStaticObjectMethod(NIclazz, currentInstMID);
-+ // We should check upon the known non-null variable because here we want to check
-+ // only for pending exceptions. If pObj is null we'll deal with it later.
-+ CHECK_EXCEPTION_RETURN_VALUE(env, NULL);
- //fprintf(stderr, "get_unpacker0() pObj=%p\n", pObj);
- if (pObj != null) {
- // Got pObj and env; now do it the easy way.
-@@ -137,20 +178,20 @@
- while( dbg != null) { sleep(10); }
- #endif
- NIclazz = (jclass) env->NewGlobalRef(clazz);
-+
- unpackerPtrFID = env->GetFieldID(clazz, "unpackerPtr", "J");
-+ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(unpackerPtrFID, ERROR_INIT);
-+
- currentInstMID = env->GetStaticMethodID(clazz, "currentInstance",
- "()Ljava/lang/Object;");
-+ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(currentInstMID, ERROR_INIT);
-+
- readInputMID = env->GetMethodID(clazz, "readInputFn",
- "(Ljava/nio/ByteBuffer;J)J");
-- getUnpackerPtrMID = env->GetMethodID(clazz, "getUnpackerPtr", "()J");
-+ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(readInputMID, ERROR_INIT);
-
-- if (unpackerPtrFID == null ||
-- currentInstMID == null ||
-- readInputMID == null ||
-- NIclazz == null ||
-- getUnpackerPtrMID == null) {
-- THROW_IOE("cannot init class members");
-- }
-+ getUnpackerPtrMID = env->GetMethodID(clazz, "getUnpackerPtr", "()J");
-+ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(getUnpackerPtrMID, ERROR_INIT);
- }
-
- JNIEXPORT jlong JNICALL
-@@ -160,9 +201,7 @@
- // valid object pointers and env is intact, if not now is good time to bail.
- unpacker* uPtr = get_unpacker();
- //fprintf(stderr, "start(%p) uPtr=%p initializing\n", pObj, uPtr);
-- if (uPtr == null) {
-- return -1;
-- }
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, -1);
- // redirect our io to the default log file or whatever.
- uPtr->redirect_stdio();
-
-@@ -200,6 +239,7 @@
- jobjectArray pParts) {
-
- unpacker* uPtr = get_unpacker(env, pObj);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
- unpacker::file* filep = uPtr->get_next_file();
-
- if (uPtr->aborting()) {
-@@ -207,32 +247,38 @@
- return false;
- }
-
-- if (filep == null) {
-- return false; // end of the sequence
-- }
-+ CHECK_NULL_RETURN(filep, false);
- assert(filep == &uPtr->cur_file);
-
- int pidx = 0, iidx = 0;
- jintArray pIntParts = (jintArray) env->GetObjectArrayElement(pParts, pidx++);
-+ CHECK_EXCEPTION_RETURN_VALUE(pIntParts, false);
- jint* intParts = env->GetIntArrayElements(pIntParts, null);
- intParts[iidx++] = (jint)( (julong)filep->size >> 32 );
- intParts[iidx++] = (jint)( (julong)filep->size >> 0 );
- intParts[iidx++] = filep->modtime;
- intParts[iidx++] = filep->deflate_hint() ? 1 : 0;
- env->ReleaseIntArrayElements(pIntParts, intParts, JNI_COMMIT);
--
-- env->SetObjectArrayElement(pParts, pidx++, env->NewStringUTF(filep->name));
--
-+ jstring filename = env->NewStringUTF(filep->name);
-+ CHECK_EXCEPTION_RETURN_VALUE(filename, false);
-+ env->SetObjectArrayElement(pParts, pidx++, filename);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
- jobject pDataBuf = null;
-- if (filep->data[0].len > 0)
-+ if (filep->data[0].len > 0) {
- pDataBuf = env->NewDirectByteBuffer(filep->data[0].ptr,
- filep->data[0].len);
-+ CHECK_EXCEPTION_RETURN_VALUE(pDataBuf, false);
-+ }
- env->SetObjectArrayElement(pParts, pidx++, pDataBuf);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
- pDataBuf = null;
-- if (filep->data[1].len > 0)
-+ if (filep->data[1].len > 0) {
- pDataBuf = env->NewDirectByteBuffer(filep->data[1].ptr,
- filep->data[1].len);
-+ CHECK_EXCEPTION_RETURN_VALUE(pDataBuf, false);
-+ }
- env->SetObjectArrayElement(pParts, pidx++, pDataBuf);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
-
- return true;
- }
-@@ -241,6 +287,7 @@
- JNIEXPORT jobject JNICALL
- Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject pObj) {
- unpacker* uPtr = get_unpacker(env, pObj);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
- unpacker::file* filep = &uPtr->cur_file;
-
- if (uPtr->aborting()) {
-@@ -263,7 +310,7 @@
- JNIEXPORT jlong JNICALL
- Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
- unpacker* uPtr = get_unpacker(env, pObj, false);
-- if (uPtr == null) return 0;
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
- size_t consumed = uPtr->input_consumed();
- free_unpacker(env, pObj, uPtr);
- return consumed;
-@@ -274,7 +321,9 @@
- jstring pProp, jstring pValue) {
- unpacker* uPtr = get_unpacker(env, pObj);
- const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
-+ CHECK_EXCEPTION_RETURN_VALUE(prop, false);
- const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
-+ CHECK_EXCEPTION_RETURN_VALUE(value, false);
- jboolean retval = uPtr->set_option(prop, value);
- env->ReleaseStringUTFChars(pProp, prop);
- env->ReleaseStringUTFChars(pValue, value);
-@@ -286,9 +335,11 @@
- jstring pProp) {
-
- unpacker* uPtr = get_unpacker(env, pObj);
-+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
- const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
-+ CHECK_EXCEPTION_RETURN_VALUE(prop, NULL);
- const char* value = uPtr->get_option(prop);
-+ CHECK_EXCEPTION_RETURN_VALUE(value, NULL);
- env->ReleaseStringUTFChars(pProp, prop);
-- if (value == null) return null;
- return env->NewStringUTF(value);
- }
---- ./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-07-15 21:49:32.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 2014-10-28 20:19:52.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2001, 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
-@@ -33,6 +33,10 @@
-
- #include <stdlib.h>
-
-+#ifdef _ALLBSD_SOURCE
-+#include <machine/endian.h>
-+#endif
-+
- #ifndef _MSC_VER
- #include <strings.h>
- #endif
-@@ -62,7 +66,7 @@
-
- #endif // End of ZLIB
-
--#ifdef sparc
-+#if (BYTE_ORDER == BIG_ENDIAN)
- #define SWAP_BYTES(a) \
- ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
- #else
-@@ -340,6 +344,10 @@
- struct tm sbuf;
- (void)memset((void*)&sbuf,0, sizeof(sbuf));
- struct tm* s = gmtime_r(&t, &sbuf);
-+ if (s == NULL) {
-+ fprintf(u->errstrm, "Error: gmtime failure, invalid input archive\n");
-+ exit(2);
-+ }
- modtime_cache = modtime;
- dostime_cache = dostime(s->tm_year + 1900, s->tm_mon + 1, s->tm_mday,
- s->tm_hour, s->tm_min, s->tm_sec);
-@@ -384,7 +392,7 @@
- }
-
- deflated.empty();
-- zs.next_out = (uchar*) deflated.grow(len + (len/2));
-+ zs.next_out = (uchar*) deflated.grow(add_size(len, (len/2)));
- zs.avail_out = (int)deflated.size();
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -64,7 +64,7 @@
-
-
- // following is needed for _LP64
--#if ((X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) || (X_PLATFORM == X_MACOSX))
-+#if ((X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) || (X_PLATFORM == X_BSD) || (X_PLATFORM == X_MACOSX))
- #include <sys/types.h>
- #endif
-
---- ./jdk/src/share/native/common/check_code.c 2013-09-06 11:28:58.000000000 -0700
-+++ ./jdk/src/share/native/common/check_code.c 2014-10-28 20:19:52.000000000 -0700
-@@ -90,6 +90,12 @@
- #include "classfile_constants.h"
- #include "opcodes.in_out"
-
-+#ifdef __APPLE__
-+/* use setjmp/longjmp versions that do not save/restore the signal mask */
-+#define setjmp _setjmp
-+#define longjmp _longjmp
-+#endif
-+
- #define MAX_ARRAY_DIMENSIONS 255
- /* align byte code */
- #ifndef ALIGN_UP
---- ./jdk/src/share/native/java/lang/Class.c 2013-09-06 11:28:58.000000000 -0700
-+++ ./jdk/src/share/native/java/lang/Class.c 2014-10-28 20:19:50.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1994, 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
-@@ -70,7 +70,7 @@
- {"getProtectionDomain0", "()" PD, (void *)&JVM_GetProtectionDomain},
- {"setProtectionDomain0", "(" PD ")V", (void *)&JVM_SetProtectionDomain},
- {"getDeclaredClasses0", "()[" CLS, (void *)&JVM_GetDeclaredClasses},
-- {"getDeclaringClass", "()" CLS, (void *)&JVM_GetDeclaringClass},
-+ {"getDeclaringClass0", "()" CLS, (void *)&JVM_GetDeclaringClass},
- {"getGenericSignature", "()" STR, (void *)&JVM_GetClassSignature},
- {"getRawAnnotations", "()" BA, (void *)&JVM_GetClassAnnotations},
- {"getConstantPool", "()" CPL, (void *)&JVM_GetClassConstantPool},
-@@ -97,7 +97,7 @@
-
- JNIEXPORT jclass JNICALL
- Java_java_lang_Class_forName0(JNIEnv *env, jclass this, jstring classname,
-- jboolean initialize, jobject loader)
-+ jboolean initialize, jobject loader, jclass caller)
- {
- char *clname;
- jclass cls = 0;
-@@ -135,8 +135,7 @@
- goto done;
- }
-
-- cls = JVM_FindClassFromClassLoader(env, clname, initialize,
-- loader, JNI_FALSE);
-+ cls = JVM_FindClassFromCaller(env, clname, initialize, loader, caller);
-
- done:
- if (clname != buf) {
-@@ -187,3 +186,16 @@
-
- return result;
- }
-+
-+JNIEXPORT jobject JNICALL
-+Java_java_lang_Class_getCheckMemberAccessMethod(JNIEnv *env, jclass cls, jclass smClass)
-+{
-+ jmethodID mid;
-+
-+ mid = (*env)->GetMethodID(env, smClass, "checkMemberAccess", "(Ljava/lang/Class;I)V");
-+ if (mid == NULL) {
-+ return NULL;
-+ }
-+ return (*env)->ToReflectedMethod(env, smClass, mid, JNI_FALSE);
-+}
-+
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -24,6 +24,9 @@
- * questions.
- */
-
-+#ifdef __OpenBSD__
-+#include <sys/types.h>
-+#endif
- #ifdef _ALLBSD_SOURCE
- #include <machine/endian.h>
- #elif __linux__
-@@ -32,6 +35,12 @@
- #endif
- #include "jfdlibm.h"
-
-+/* BSD's always define both _LITTLE_ENDIAN && _BIG_ENDIAN */
-+#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) && \
-+ _BYTE_ORDER == _BIG_ENDIAN
-+#undef _LITTLE_ENDIAN
-+#endif
-+
- #ifdef __NEWVALID /* special setup for Sun test regime */
- #if defined(i386) || defined(i486) || \
- defined(intel) || defined(x86) || defined(arm) || \
---- ./jdk/src/share/native/java/lang/ref/Finalizer.c 2013-09-06 11:28:58.000000000 -0700
-+++ ./jdk/src/share/native/java/lang/ref/Finalizer.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,42 +0,0 @@
--/*
-- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--#include "jni.h"
--#include "java_lang_ref_Finalizer.h"
--
--
--JNIEXPORT void JNICALL
--Java_java_lang_ref_Finalizer_invokeFinalizeMethod(JNIEnv *env, jclass clazz,
-- jobject ob)
--{
-- jclass cls;
-- jmethodID mid;
--
-- cls = (*env)->GetObjectClass(env, ob);
-- if (cls == NULL) return;
-- mid = (*env)->GetMethodID(env, cls, "finalize", "()V");
-- if (mid == NULL) return;
-- (*env)->CallVoidMethod(env, ob, mid);
--}
---- ./jdk/src/share/native/java/net/Inet6Address.c 2013-09-06 11:28:58.000000000 -0700
-+++ ./jdk/src/share/native/java/net/Inet6Address.c 2014-07-15 21:49:32.000000000 -0700
-@@ -33,6 +33,8 @@
- */
-
- jclass ia6_class;
-+jfieldID ia6_holder6ID;
-+
- jfieldID ia6_ipaddressID;
- jfieldID ia6_scopeidID;
- jfieldID ia6_cachedscopeidID;
-@@ -48,21 +50,26 @@
- */
- JNIEXPORT void JNICALL
- Java_java_net_Inet6Address_init(JNIEnv *env, jclass cls) {
-+ jclass ia6h_class;
- jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
- CHECK_NULL(c);
- ia6_class = (*env)->NewGlobalRef(env, c);
- CHECK_NULL(ia6_class);
-- ia6_ipaddressID = (*env)->GetFieldID(env, ia6_class, "ipaddress", "[B");
-+ ia6h_class = (*env)->FindClass(env, "java/net/Inet6Address$Inet6AddressHolder");
-+ CHECK_NULL(ia6h_class);
-+ ia6_holder6ID = (*env)->GetFieldID(env, ia6_class, "holder6", "Ljava/net/Inet6Address$Inet6AddressHolder;");
-+ CHECK_NULL(ia6_holder6ID);
-+ ia6_ipaddressID = (*env)->GetFieldID(env, ia6h_class, "ipaddress", "[B");
- CHECK_NULL(ia6_ipaddressID);
-- ia6_scopeidID = (*env)->GetFieldID(env, ia6_class, "scope_id", "I");
-+ ia6_scopeidID = (*env)->GetFieldID(env, ia6h_class, "scope_id", "I");
- CHECK_NULL(ia6_scopeidID);
- ia6_cachedscopeidID = (*env)->GetFieldID(env, ia6_class, "cached_scope_id", "I");
- CHECK_NULL(ia6_cachedscopeidID);
-- ia6_scopeidsetID = (*env)->GetFieldID(env, ia6_class, "scope_id_set", "Z");
-+ ia6_scopeidsetID = (*env)->GetFieldID(env, ia6h_class, "scope_id_set", "Z");
- CHECK_NULL(ia6_scopeidID);
-- ia6_scopeifnameID = (*env)->GetFieldID(env, ia6_class, "scope_ifname", "Ljava/net/NetworkInterface;");
-+ ia6_scopeifnameID = (*env)->GetFieldID(env, ia6h_class, "scope_ifname", "Ljava/net/NetworkInterface;");
- CHECK_NULL(ia6_scopeifnameID);
-- ia6_scopeifnamesetID = (*env)->GetFieldID(env, ia6_class, "scope_ifname_set", "Z");
-+ ia6_scopeifnamesetID = (*env)->GetFieldID(env, ia6h_class, "scope_ifname_set", "Z");
- CHECK_NULL(ia6_scopeifnamesetID);
- 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 2014-07-15 21:49:32.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -94,6 +94,111 @@
- extern jfieldID iac_addressID;
- extern jfieldID iac_familyID;
-
-+/**
-+ * set_ methods return JNI_TRUE on success JNI_FALSE on error
-+ * get_ methods that return +ve int return -1 on error
-+ * get_ methods that return objects return NULL on error.
-+ */
-+jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) {
-+ jobject holder;
-+
-+ initInetAddrs(env);
-+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+ CHECK_NULL_RETURN(holder, NULL);
-+ return (*env)->GetObjectField(env, holder, ia6_scopeifnameID);
-+}
-+
-+int setInet6Address_scopeifname(JNIEnv *env, jobject iaObj, jobject scopeifname) {
-+ jobject holder;
-+
-+ initInetAddrs(env);
-+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+ CHECK_NULL_RETURN(holder, JNI_FALSE);
-+ (*env)->SetObjectField(env, holder, ia6_scopeifnameID, scopeifname);
-+ return JNI_TRUE;
-+}
-+
-+int getInet6Address_scopeifname_set(JNIEnv *env, jobject iaObj) {
-+ jobject holder;
-+
-+ initInetAddrs(env);
-+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+ CHECK_NULL_RETURN(holder, -1);
-+ return (*env)->GetBooleanField(env, holder, ia6_scopeifnamesetID);
-+}
-+
-+int setInet6Address_scopeifname_set(JNIEnv *env, jobject iaObj, int scopeifname_set) {
-+ jobject holder;
-+
-+ initInetAddrs(env);
-+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+ CHECK_NULL_RETURN(holder, JNI_FALSE);
-+ (*env)->SetBooleanField(env, holder, ia6_scopeifnamesetID, scopeifname_set);
-+ return JNI_TRUE;
-+}
-+
-+int getInet6Address_scopeid_set(JNIEnv *env, jobject iaObj) {
-+ jobject holder;
-+
-+ initInetAddrs(env);
-+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+ CHECK_NULL_RETURN(holder, -1);
-+ return (*env)->GetBooleanField(env, holder, ia6_scopeidsetID);
-+}
-+
-+int getInet6Address_scopeid(JNIEnv *env, jobject iaObj) {
-+ jobject holder;
-+
-+ initInetAddrs(env);
-+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+ CHECK_NULL_RETURN(holder, -1);
-+ return (*env)->GetIntField(env, holder, ia6_scopeidID);
-+}
-+
-+int setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
-+ jobject holder;
-+
-+ initInetAddrs(env);
-+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+ CHECK_NULL_RETURN(holder, JNI_FALSE);
-+ (*env)->SetIntField(env, holder, ia6_scopeidID, scopeid);
-+ if (scopeid > 0) {
-+ (*env)->SetBooleanField(env, holder, ia6_scopeidsetID, JNI_TRUE);
-+ }
-+ return JNI_TRUE;
-+}
-+
-+
-+int getInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *dest) {
-+ jobject holder, addr;
-+ jbyteArray barr;
-+
-+ initInetAddrs(env);
-+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+ CHECK_NULL_RETURN(holder, JNI_FALSE);
-+ addr = (*env)->GetObjectField(env, holder, ia6_ipaddressID);
-+ CHECK_NULL_RETURN(addr, JNI_FALSE);
-+ (*env)->GetByteArrayRegion(env, addr, 0, 16, (jbyte *)dest);
-+ return JNI_TRUE;
-+}
-+
-+int setInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *address) {
-+ jobject holder;
-+ jbyteArray addr;
-+
-+ initInetAddrs(env);
-+ holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+ CHECK_NULL_RETURN(holder, JNI_FALSE);
-+ addr = (jbyteArray)(*env)->GetObjectField(env, holder, ia6_ipaddressID);
-+ if (addr == NULL) {
-+ addr = (*env)->NewByteArray(env, 16);
-+ CHECK_NULL_RETURN(addr, JNI_FALSE);
-+ (*env)->SetObjectField(env, holder, ia6_ipaddressID, addr);
-+ }
-+ (*env)->SetByteArrayRegion(env, addr, 0, 16, (jbyte *)address);
-+ return JNI_TRUE;
-+}
-+
- void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address) {
- jobject holder;
- initInetAddrs(env);
-@@ -168,6 +273,7 @@
- } else {
- static jclass inet6Cls = 0;
- jint scope;
-+ int ret;
- if (inet6Cls == 0) {
- jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
- CHECK_NULL_RETURN(c, NULL);
-@@ -177,18 +283,11 @@
- }
- iaObj = (*env)->NewObject(env, inet6Cls, ia6_ctrID);
- CHECK_NULL_RETURN(iaObj, NULL);
-- ipaddress = (*env)->NewByteArray(env, 16);
-- CHECK_NULL_RETURN(ipaddress, NULL);
-- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
-- (jbyte *)&(him6->sin6_addr));
--
-- (*env)->SetObjectField(env, iaObj, ia6_ipaddressID, ipaddress);
--
-+ ret = setInet6Address_ipaddress(env, iaObj, (char *)&(him6->sin6_addr));
-+ CHECK_NULL_RETURN(ret, NULL);
- setInetAddress_family(env, iaObj, IPv6);
- scope = getScopeID(him);
-- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
-- if (scope > 0)
-- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
-+ setInet6Address_scopeid(env, iaObj, scope);
- }
- *port = ntohs(him6->sin6_port);
- } else
-@@ -248,9 +347,8 @@
- if (family == AF_INET) {
- return JNI_FALSE;
- }
-- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
-- scope = (*env)->GetIntField(env, iaObj, ia6_scopeidID);
-- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddrCur);
-+ scope = getInet6Address_scopeid(env, iaObj);
-+ getInet6Address_ipaddress(env, iaObj, (char *)caddrCur);
- if (NET_IsEqual(caddrNew, caddrCur) && cmpScopeID(scope, him)) {
- 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 2014-07-15 21:49:32.000000000 -0700
-@@ -58,6 +58,22 @@
- extern jfieldID iac_hostNameID;
- extern jfieldID ia_preferIPv6AddressID;
-
-+/** (Inet6Address accessors)
-+ * set_ methods return JNI_TRUE on success JNI_FALSE on error
-+ * get_ methods that return int/boolean, return -1 on error
-+ * get_ methods that return objects return NULL on error.
-+ */
-+extern jobject getInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj);
-+extern int setInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj, jobject scopeifname);
-+extern int getInet6Address_scopeifname_set(JNIEnv *env, jobject ia6Obj);
-+extern int setInet6Address_scopeifname_set(JNIEnv *env, jobject ia6Obj,
-+ int scopeifname_set);
-+extern int getInet6Address_scopeid_set(JNIEnv *env, jobject ia6Obj);
-+extern int getInet6Address_scopeid(JNIEnv *env, jobject ia6Obj);
-+extern int setInet6Address_scopeid(JNIEnv *env, jobject ia6Obj, int scopeid);
-+extern int getInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *dest);
-+extern int setInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *address);
-+
- extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address);
- extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family);
- extern void setInetAddress_hostName(JNIEnv *env, jobject iaObj, jobject h);
-@@ -93,6 +109,7 @@
-
- /* Inet6Address fields */
- extern jclass ia6_class;
-+extern jfieldID ia6_holder6ID;
- 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-07-15 21:49:32.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 2014-07-15 21:49:32.000000000 -0700
-@@ -808,363 +808,204 @@
- return 1;
- }
-
--/*
-- * This routine will fill in a buffer of data for either 1 band or all
-- * bands (if band == -1).
-- */
- #define MAX_TO_GRAB (10240)
-
--int awt_getPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
-- unsigned char *bufferP) {
-- int w = rasterP->width;
-- int h = rasterP->height;
-- int numBands = rasterP->numBands;
-+typedef union {
-+ void *pv;
-+ unsigned char *pb;
-+ unsigned short *ps;
-+} PixelData_t;
-+
-+
-+int awt_getPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP) {
-+ const int w = rasterP->width;
-+ const int h = rasterP->height;
-+ const int numBands = rasterP->numBands;
- int y;
- int i;
-- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
-+ int maxLines;
- jobject jsm;
-- int off;
-+ int off = 0;
- jarray jdata = NULL;
- jobject jdatabuffer;
- int *dataP;
-- int maxBytes = w;
-+ int maxSamples;
-+ PixelData_t p;
-
-- jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
-- jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
-- g_RasterDataBufferID);
-- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
-- if (JNU_IsNull(env, jdata)) {
-- JNU_ThrowOutOfMemoryError(env, "Out of Memory");
-+ if (bufferP == NULL) {
- return -1;
- }
-
-- /* Here is the generic code */
-- if (band >= 0) {
-- int dOff;
-- if (band >= numBands) {
-- (*env)->DeleteLocalRef(env, jdata);
-- JNU_ThrowInternalError(env, "Band out of range.");
-- return -1;
-- }
-- off = 0;
-- for (y=0; y < h; ) {
-- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
-- 0, y, w,
-- maxLines, jdata, jdatabuffer);
-- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-- NULL);
-- if (dataP == NULL) {
-- (*env)->DeleteLocalRef(env, jdata);
-- return -1;
-- }
-- dOff = band;
-- for (i=0; i < maxBytes; i++, dOff += numBands) {
-- bufferP[off++] = (unsigned char) dataP[dOff];
-- }
-+ if (rasterP->dataType != BYTE_DATA_TYPE &&
-+ rasterP->dataType != SHORT_DATA_TYPE)
-+ {
-+ return -1;
-+ }
-
-- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-- JNI_ABORT);
-+ p.pv = bufferP;
-
-- if (y+maxLines < h) {
-- y += maxLines;
-- }
-- else {
-- y++;
-- maxBytes = w;
-- }
-- }
-+ if (!SAFE_TO_MULT(w, numBands)) {
-+ return -1;
- }
-- else {
-- off = 0;
-- maxBytes *= numBands;
-- for (y=0; y < h; ) {
-- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
-- 0, y, w,
-- maxLines, jdata, jdatabuffer);
-- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-- NULL);
-- if (dataP == NULL) {
-- (*env)->DeleteLocalRef(env, jdata);
-- return -1;
-- }
-- for (i=0; i < maxBytes; i++) {
-- bufferP[off++] = (unsigned char) dataP[i];
-- }
-+ maxSamples = w * numBands;
-
-- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-- JNI_ABORT);
--
-- if (y+maxLines < h) {
-- y += maxLines;
-- }
-- else {
-- y++;
-- maxBytes = w*numBands;
-- }
-- }
-+ maxLines = maxSamples > MAX_TO_GRAB ? 1 : (MAX_TO_GRAB / maxSamples);
-+ if (maxLines > h) {
-+ maxLines = h;
-+ }
-
-+ if (!SAFE_TO_MULT(maxSamples, maxLines)) {
-+ return -1;
- }
-- (*env)->DeleteLocalRef(env, jdata);
-
-- return 0;
--}
--int awt_setPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
-- unsigned char *bufferP) {
-- int w = rasterP->width;
-- int h = rasterP->height;
-- int numBands = rasterP->numBands;
-- int y;
-- int i;
-- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
-- jobject jsm;
-- int off;
-- jarray jdata = NULL;
-- jobject jdatabuffer;
-- int *dataP;
-- int maxBytes = w;
-+ maxSamples *= maxLines;
-
- jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
- jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
- g_RasterDataBufferID);
-- /* Here is the generic code */
-- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
-+
-+ jdata = (*env)->NewIntArray(env, maxSamples);
- if (JNU_IsNull(env, jdata)) {
- JNU_ThrowOutOfMemoryError(env, "Out of Memory");
- return -1;
- }
-- if (band >= 0) {
-- int dOff;
-- if (band >= numBands) {
-+
-+ for (y = 0; y < h; y += maxLines) {
-+ if (y + maxLines > h) {
-+ maxLines = h - y;
-+ maxSamples = w * numBands * maxLines;
-+ }
-+
-+ (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
-+ 0, y, w,
-+ maxLines, jdata, jdatabuffer);
-+
-+ if ((*env)->ExceptionOccurred(env)) {
- (*env)->DeleteLocalRef(env, jdata);
-- JNU_ThrowInternalError(env, "Band out of range.");
- return -1;
- }
-- off = 0;
-- for (y=0; y < h; y+=maxLines) {
-- if (y+maxLines > h) {
-- maxBytes = w*numBands;
-- maxLines = h - y;
-- }
-- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-- NULL);
-- if (dataP == NULL) {
-- (*env)->DeleteLocalRef(env, jdata);
-- return -1;
-- }
-- dOff = band;
-- for (i=0; i < maxBytes; i++, dOff += numBands) {
-- dataP[dOff] = bufferP[off++];
-- }
--
-- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-- JNI_ABORT);
-
-- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
-- 0, y, w,
-- maxLines, jdata, jdatabuffer);
-+ dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-+ NULL);
-+ if (dataP == NULL) {
-+ (*env)->DeleteLocalRef(env, jdata);
-+ return -1;
- }
-- }
-- else {
-- off = 0;
-- maxBytes *= numBands;
-- for (y=0; y < h; y+=maxLines) {
-- if (y+maxLines > h) {
-- maxBytes = w*numBands;
-- maxLines = h - y;
-- }
-- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-- NULL);
-- if (dataP == NULL) {
-- (*env)->DeleteLocalRef(env, jdata);
-- return -1;
-+
-+ switch (rasterP->dataType) {
-+ case BYTE_DATA_TYPE:
-+ for (i = 0; i < maxSamples; i ++) {
-+ p.pb[off++] = (unsigned char) dataP[i];
- }
-- for (i=0; i < maxBytes; i++) {
-- dataP[i] = bufferP[off++];
-+ break;
-+ case SHORT_DATA_TYPE:
-+ for (i = 0; i < maxSamples; i ++) {
-+ p.ps[off++] = (unsigned short) dataP[i];
- }
--
-- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-- JNI_ABORT);
--
-- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
-- 0, y, w,
-- maxLines, jdata, jdatabuffer);
-+ break;
- }
-
-+ (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-+ JNI_ABORT);
- }
--
- (*env)->DeleteLocalRef(env, jdata);
-
-- return 0;
-+ return 1;
- }
--int awt_getPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
-- unsigned short *bufferP) {
-- int w = rasterP->width;
-- int h = rasterP->height;
-- int numBands = rasterP->numBands;
-+
-+int awt_setPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP) {
-+ const int w = rasterP->width;
-+ const int h = rasterP->height;
-+ const int numBands = rasterP->numBands;
-+
- int y;
- int i;
-- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
-+ int maxLines;
- jobject jsm;
-- int off;
-+ int off = 0;
- jarray jdata = NULL;
- jobject jdatabuffer;
- int *dataP;
-- int maxBytes = w*maxLines;
-+ int maxSamples;
-+ PixelData_t p;
-
-- jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
-- jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
-- g_RasterDataBufferID);
-- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
-- if (JNU_IsNull(env, jdata)) {
-- JNU_ThrowOutOfMemoryError(env, "Out of Memory");
-+ if (bufferP == NULL) {
- return -1;
- }
-- /* Here is the generic code */
-- if (band >= 0) {
-- int dOff;
-- if (band >= numBands) {
-- (*env)->DeleteLocalRef(env, jdata);
-- JNU_ThrowInternalError(env, "Band out of range.");
-- return -1;
-- }
-- off = 0;
-- for (y=0; y < h; y += maxLines) {
-- if (y+maxLines > h) {
-- maxBytes = w*numBands;
-- maxLines = h - y;
-- }
-- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
-- 0, y, w,
-- maxLines, jdata, jdatabuffer);
-- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-- NULL);
-- if (dataP == NULL) {
-- (*env)->DeleteLocalRef(env, jdata);
-- return -1;
-- }
-
-- dOff = band;
-- for (i=0; i < maxBytes; i++, dOff += numBands) {
-- bufferP[off++] = (unsigned short) dataP[dOff];
-- }
-+ if (rasterP->dataType != BYTE_DATA_TYPE &&
-+ rasterP->dataType != SHORT_DATA_TYPE)
-+ {
-+ return -1;
-+ }
-
-- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-- JNI_ABORT);
-- }
-+ p.pv = bufferP;
-+
-+ if (!SAFE_TO_MULT(w, numBands)) {
-+ return -1;
- }
-- else {
-- off = 0;
-- maxBytes *= numBands;
-- for (y=0; y < h; y+=maxLines) {
-- if (y+maxLines > h) {
-- maxBytes = w*numBands;
-- maxLines = h - y;
-- }
-- (*env)->CallObjectMethod(env, jsm, g_SMGetPixelsMID,
-- 0, y, w,
-- maxLines, jdata, jdatabuffer);
-- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-- NULL);
-- if (dataP == NULL) {
-- (*env)->DeleteLocalRef(env, jdata);
-- return -1;
-- }
-- for (i=0; i < maxBytes; i++) {
-- bufferP[off++] = (unsigned short) dataP[i];
-- }
-+ maxSamples = w * numBands;
-
-- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-- JNI_ABORT);
-- }
-+ maxLines = maxSamples > MAX_TO_GRAB ? 1 : (MAX_TO_GRAB / maxSamples);
-+ if (maxLines > h) {
-+ maxLines = h;
-+ }
-
-+ if (!SAFE_TO_MULT(maxSamples, maxLines)) {
-+ return -1;
- }
-
-- (*env)->DeleteLocalRef(env, jdata);
-- return 0;
--}
--int awt_setPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
-- unsigned short *bufferP) {
-- int w = rasterP->width;
-- int h = rasterP->height;
-- int numBands = rasterP->numBands;
-- int y;
-- int i;
-- int maxLines = (h < MAX_TO_GRAB/w ? h : MAX_TO_GRAB/w);
-- jobject jsm;
-- int off;
-- jarray jdata = NULL;
-- jobject jdatabuffer;
-- int *dataP;
-- int maxBytes = w;
-+ maxSamples *= maxLines;
-
- jsm = (*env)->GetObjectField(env, rasterP->jraster, g_RasterSampleModelID);
- jdatabuffer = (*env)->GetObjectField(env, rasterP->jraster,
- g_RasterDataBufferID);
-- if (band >= numBands) {
-- JNU_ThrowInternalError(env, "Band out of range.");
-- return -1;
-- }
-- /* Here is the generic code */
-- jdata = (*env)->NewIntArray(env, maxBytes*rasterP->numBands*maxLines);
-+
-+ jdata = (*env)->NewIntArray(env, maxSamples);
- if (JNU_IsNull(env, jdata)) {
- JNU_ThrowOutOfMemoryError(env, "Out of Memory");
- return -1;
- }
-- if (band >= 0) {
-- int dOff;
-- off = 0;
-- for (y=0; y < h; y+=maxLines) {
-- if (y+maxLines > h) {
-- maxBytes = w*numBands;
-- maxLines = h - y;
-- }
-- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-- NULL);
-- if (dataP == NULL) {
-- (*env)->DeleteLocalRef(env, jdata);
-- return -1;
-- }
-- dOff = band;
-- for (i=0; i < maxBytes; i++, dOff += numBands) {
-- dataP[dOff] = bufferP[off++];
-- }
--
-- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-- JNI_ABORT);
-
-- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
-- 0, y, w,
-- maxLines, jdata, jdatabuffer);
-+ for (y = 0; y < h; y += maxLines) {
-+ if (y + maxLines > h) {
-+ maxLines = h - y;
-+ maxSamples = w * numBands * maxLines;
-+ }
-+ dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-+ NULL);
-+ if (dataP == NULL) {
-+ (*env)->DeleteLocalRef(env, jdata);
-+ return -1;
- }
-- }
-- else {
-- off = 0;
-- maxBytes *= numBands;
-- for (y=0; y < h; y+=maxLines) {
-- if (y+maxLines > h) {
-- maxBytes = w*numBands;
-- maxLines = h - y;
-- }
-- dataP = (int *) (*env)->GetPrimitiveArrayCritical(env, jdata,
-- NULL);
-- if (dataP == NULL) {
-- (*env)->DeleteLocalRef(env, jdata);
-- return -1;
-+
-+ switch (rasterP->dataType) {
-+ case BYTE_DATA_TYPE:
-+ for (i = 0; i < maxSamples; i ++) {
-+ dataP[i] = p.pb[off++];
- }
-- for (i=0; i < maxBytes; i++) {
-- dataP[i] = bufferP[off++];
-+ break;
-+ case SHORT_DATA_TYPE:
-+ for (i = 0; i < maxSamples; i ++) {
-+ dataP[i] = p.ps[off++];
- }
-+ break;
-+ }
-
-- (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-- JNI_ABORT);
-+ (*env)->ReleasePrimitiveArrayCritical(env, jdata, dataP,
-+ JNI_ABORT);
-
-- (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
-- 0, y, w,
-- maxLines, jdata, jdatabuffer);
-- }
-+ (*env)->CallVoidMethod(env, jsm, g_SMSetPixelsMID,
-+ 0, y, w,
-+ maxLines, jdata, jdatabuffer);
-
-+ if ((*env)->ExceptionOccurred(env)) {
-+ (*env)->DeleteLocalRef(env, jdata);
-+ return -1;
-+ }
- }
-
- (*env)->DeleteLocalRef(env, jdata);
-- return 0;
-+
-+ 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 2014-07-15 21:49:32.000000000 -0700
-@@ -188,13 +188,8 @@
-
- void awt_freeParsedImage(BufImageS_t *imageP, int freeImageP);
-
--int awt_getPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
-- unsigned char *bufferP);
--int awt_setPixelByte(JNIEnv *env, int band, RasterS_t *rasterP,
-- unsigned char *bufferP);
--int awt_getPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
-- unsigned short *bufferP);
--int awt_setPixelShort(JNIEnv *env, int band, RasterS_t *rasterP,
-- unsigned short *bufferP);
-+int awt_getPixels(JNIEnv *env, RasterS_t *rasterP, void *bufferP);
-+
-+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-07-15 21:49:32.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 2014-07-15 21:49:32.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.
- */
-+ RELEASE_ARRAYS(env, data, src->next_input_byte);
-+
- GET_IO_REF(input);
-
-- RELEASE_ARRAYS(env, data, src->next_input_byte);
- ret = (*env)->CallIntMethod(env,
- input,
- JPEGImageReader_readInputDataID,
- 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);
- }
-
-- GET_IO_REF(input);
-
- RELEASE_ARRAYS(env, data, src->next_input_byte);
-+
-+ GET_IO_REF(input);
-+
- buflen = sb->bufferLength - offset;
- if (buflen <= 0) {
- if (!GET_ARRAYS(env, data, &(src->next_input_byte))) {
-@@ -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;
- }
-
-+ RELEASE_ARRAYS(env, data, src->next_input_byte);
-+
- GET_IO_REF(input);
-
-- RELEASE_ARRAYS(env, data, src->next_input_byte);
- ret = (*env)->CallLongMethod(env,
- input,
- JPEGImageReader_skipInputBytesID,
-@@ -2306,10 +2314,10 @@
- JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
- jobject output = NULL;
-
-- GET_IO_REF(output);
--
- RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
-
-+ GET_IO_REF(output);
-+
- (*env)->CallVoidMethod(env,
- output,
- JPEGImageWriter_writeOutputDataID,
-@@ -2348,10 +2356,10 @@
- if (datacount != 0) {
- jobject output = NULL;
-
-- GET_IO_REF(output);
--
- RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
-
-+ GET_IO_REF(output);
-+
- (*env)->CallVoidMethod(env,
- output,
- JPEGImageWriter_writeOutputDataID,
-@@ -2702,6 +2710,15 @@
- bandSize = (*env)->GetIntArrayElements(env, bandSizes, NULL);
-
- for (i = 0; i < numBands; i++) {
-+ if (bandSize[i] <= 0 || bandSize[i] > JPEG_BAND_SIZE) {
-+ (*env)->ReleaseIntArrayElements(env, bandSizes,
-+ bandSize, JNI_ABORT);
-+ JNU_ThrowByName(env, "javax/imageio/IIOException", "Invalid Image");
-+ return JNI_FALSE;;
-+ }
-+ }
-+
-+ for (i = 0; i < numBands; i++) {
- 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-07-15 21:49:32.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-07-15 21:49:32.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-07-15 21:49:32.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-07-15 21:49:32.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 2014-07-15 21:54:45.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
-@@ -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 *
- ***************************************************************************/
-@@ -330,14 +373,14 @@
-
-
- /* Parse the source image */
-- if ((status = awt_parseImage(env, jsrc, &srcImageP, FALSE)) <= 0) {
-+ if (awt_parseImage(env, jsrc, &srcImageP, FALSE) <= 0) {
- /* Can't handle any custom images */
- free(dkern);
- return 0;
- }
-
- /* Parse the destination image */
-- if ((status = awt_parseImage(env, jdst, &dstImageP, FALSE)) <= 0) {
-+ if (awt_parseImage(env, jdst, &dstImageP, FALSE) <= 0) {
- /* Can't handle any custom images */
- awt_freeParsedImage(srcImageP, TRUE);
- free(dkern);
-@@ -584,7 +627,7 @@
- }
-
- /* Parse the source raster */
-- if ((status = awt_parseRaster(env, jsrc, srcRasterP)) <= 0) {
-+ if (awt_parseRaster(env, jsrc, srcRasterP) <= 0) {
- /* Can't handle any custom rasters */
- free(srcRasterP);
- free(dstRasterP);
-@@ -593,7 +636,7 @@
- }
-
- /* Parse the destination raster */
-- if ((status = awt_parseRaster(env, jdst, dstRasterP)) <= 0) {
-+ if (awt_parseRaster(env, jdst, dstRasterP) <= 0) {
- /* Can't handle any custom images */
- awt_freeParsedRaster(srcRasterP, TRUE);
- free(dstRasterP);
-@@ -700,21 +743,8 @@
-
- /* Means that we couldn't write directly into the destination buffer */
- if (ddata == NULL) {
-- unsigned char *bdataP;
-- unsigned short *sdataP;
--
-- /* Punt for now */
-- switch (dstRasterP->dataType) {
-- case BYTE_DATA_TYPE:
-- bdataP = (unsigned char *) mlib_ImageGetData(dst);
-- retStatus = (awt_setPixelByte(env, -1, dstRasterP, bdataP) >= 0) ;
-- break;
-- case SHORT_DATA_TYPE:
-- sdataP = (unsigned short *) mlib_ImageGetData(dst);
-- retStatus = (awt_setPixelShort(env, -1, dstRasterP, sdataP) >= 0) ;
-- break;
-- default:
-- retStatus = 0;
-+ if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
-+ retStatus = setPixelsFormMlibImage(env, dstRasterP, dst);
- }
- }
-
-@@ -809,13 +839,13 @@
- (*env)->ReleasePrimitiveArrayCritical(env, jmatrix, matrix, JNI_ABORT);
-
- /* Parse the source image */
-- if ((status = awt_parseImage(env, jsrc, &srcImageP, FALSE)) <= 0) {
-+ if (awt_parseImage(env, jsrc, &srcImageP, FALSE) <= 0) {
- /* Can't handle any custom images */
- return 0;
- }
-
- /* Parse the destination image */
-- if ((status = awt_parseImage(env, jdst, &dstImageP, FALSE)) <= 0) {
-+ if (awt_parseImage(env, jdst, &dstImageP, FALSE) <= 0) {
- /* Can't handle any custom images */
- awt_freeParsedImage(srcImageP, TRUE);
- return 0;
-@@ -1029,7 +1059,7 @@
- (*env)->ReleasePrimitiveArrayCritical(env, jmatrix, matrix, JNI_ABORT);
-
- /* Parse the source raster */
-- if ((status = awt_parseRaster(env, jsrc, srcRasterP)) <= 0) {
-+ if (awt_parseRaster(env, jsrc, srcRasterP) <= 0) {
- /* Can't handle any custom rasters */
- free(srcRasterP);
- free(dstRasterP);
-@@ -1037,7 +1067,7 @@
- }
-
- /* Parse the destination raster */
-- if ((status = awt_parseRaster(env, jdst, dstRasterP)) <= 0) {
-+ if (awt_parseRaster(env, jdst, dstRasterP) <= 0) {
- /* Can't handle any custom images */
- awt_freeParsedRaster(srcRasterP, TRUE);
- free(dstRasterP);
-@@ -1119,24 +1149,9 @@
-
- /* Means that we couldn't write directly into the destination buffer */
- if (ddata == NULL) {
-- unsigned char *bdataP;
-- unsigned short *sdataP;
--
- /* Need to store it back into the array */
- if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
-- /* Punt for now */
-- switch (dst->type) {
-- case MLIB_BYTE:
-- bdataP = (unsigned char *) mlib_ImageGetData(dst);
-- retStatus = (awt_setPixelByte(env, -1, dstRasterP, bdataP) >= 0) ;
-- break;
-- case MLIB_SHORT:
-- sdataP = (unsigned short *) mlib_ImageGetData(dst);
-- retStatus = (awt_setPixelShort(env, -1, dstRasterP, sdataP) >= 0) ;
-- break;
-- default:
-- retStatus = 0;
-- }
-+ retStatus = setPixelsFormMlibImage(env, dstRasterP, dst);
- }
- }
-
-@@ -1290,13 +1305,13 @@
- if (s_timeIt) (*start_timer)(3600);
-
- /* Parse the source image */
-- if ((status = awt_parseImage(env, jsrc, &srcImageP, FALSE)) <= 0) {
-+ if (awt_parseImage(env, jsrc, &srcImageP, FALSE) <= 0) {
- /* Can't handle any custom images */
- return 0;
- }
-
- /* Parse the destination image */
-- if ((status = awt_parseImage(env, jdst, &dstImageP, FALSE)) <= 0) {
-+ if (awt_parseImage(env, jdst, &dstImageP, FALSE) <= 0) {
- /* Can't handle any custom images */
- awt_freeParsedImage(srcImageP, TRUE);
- return 0;
-@@ -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 @@
- }
- }
-
-- /* 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);
-@@ -1537,14 +1553,14 @@
- }
-
- /* Parse the source raster - reject custom images */
-- if ((status = awt_parseRaster(env, jsrc, srcRasterP)) <= 0) {
-+ if (awt_parseRaster(env, jsrc, srcRasterP) <= 0) {
- free(srcRasterP);
- free(dstRasterP);
- return 0;
- }
-
- /* Parse the destination image - reject custom images */
-- if ((status = awt_parseRaster(env, jdst, dstRasterP)) <= 0) {
-+ if (awt_parseRaster(env, jdst, dstRasterP) <= 0) {
- awt_freeParsedRaster(srcRasterP, TRUE);
- free(dstRasterP);
- return 0;
-@@ -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) {
-- unsigned char* bdataP;
-- unsigned short* sdataP;
--
-- switch (dstRasterP->dataType) {
-- case BYTE_DATA_TYPE:
-- bdataP = (unsigned char *) mlib_ImageGetData(dst);
-- retStatus = (awt_setPixelByte(env, -1, dstRasterP, bdataP) >= 0) ;
-- break;
-- case SHORT_DATA_TYPE:
-- sdataP = (unsigned short *) mlib_ImageGetData(dst);
-- retStatus = (awt_setPixelShort(env, -1, dstRasterP, sdataP) >= 0) ;
-- break;
-- default:
-- retStatus = 0;
-+ if (storeRasterArray(env, srcRasterP, dstRasterP, dst) < 0) {
-+ retStatus = setPixelsFormMlibImage(env, dstRasterP, dst);
- }
- }
-
-- /* 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;
- }
-
-+#define NUM_LINES 10
-+
- static int
- cvtCustomToDefault(JNIEnv *env, BufImageS_t *imageP, int component,
- unsigned char *dataP) {
-- ColorModelS_t *cmP = &imageP->cmodel;
-- RasterS_t *rasterP = &imageP->raster;
-+ const RasterS_t *rasterP = &imageP->raster;
-+ const int w = rasterP->width;
-+ const int h = rasterP->height;
-+
- int y;
-- jobject jpixels = NULL;
-+ jintArray jpixels = NULL;
- jint *pixels;
- unsigned char *dP = dataP;
--#define NUM_LINES 10
-- int numLines = NUM_LINES;
-+ int numLines = h > NUM_LINES ? NUM_LINES : h;
-+
- /* it is safe to calculate the scan length, because width has been verified
- * on creation of the mlib image
- */
-- int scanLength = rasterP->width * 4;
-+ const int scanLength = w * 4;
-
- int nbytes = 0;
- if (!SAFE_TO_MULT(numLines, scanLength)) {
-@@ -2052,42 +2060,70 @@
-
- nbytes = numLines * scanLength;
-
-- for (y=0; y < rasterP->height; y+=numLines) {
-- /* getData, one scanline at a time */
-- if (y+numLines > rasterP->height) {
-- numLines = rasterP->height - y;
-+ jpixels = (*env)->NewIntArray(env, nbytes);
-+ if (JNU_IsNull(env, jpixels)) {
-+ JNU_ThrowOutOfMemoryError(env, "Out of Memory");
-+ return -1;
-+ }
-+
-+ for (y = 0; y < h; y += numLines) {
-+ if (y + numLines > h) {
-+ numLines = h - y;
- nbytes = numLines * scanLength;
- }
-- jpixels = (*env)->CallObjectMethod(env, imageP->jimage,
-- g_BImgGetRGBMID, 0, y,
-- rasterP->width, numLines,
-- jpixels,0, rasterP->width);
-- if (jpixels == NULL) {
-- JNU_ThrowInternalError(env, "Can't retrieve pixels.");
-+
-+ (*env)->CallObjectMethod(env, imageP->jimage,
-+ g_BImgGetRGBMID, 0, y,
-+ w, numLines,
-+ jpixels, 0, w);
-+ if ((*env)->ExceptionOccurred(env)) {
-+ (*env)->DeleteLocalRef(env, jpixels);
- return -1;
- }
-
- pixels = (*env)->GetPrimitiveArrayCritical(env, jpixels, NULL);
-+ if (pixels == NULL) {
-+ (*env)->DeleteLocalRef(env, jpixels);
-+ return -1;
-+ }
-+
- memcpy(dP, pixels, nbytes);
- dP += nbytes;
-+
- (*env)->ReleasePrimitiveArrayCritical(env, jpixels, pixels,
- JNI_ABORT);
- }
-+
-+ /* Need to release the array */
-+ (*env)->DeleteLocalRef(env, jpixels);
-+
- return 0;
- }
-
- static int
- cvtDefaultToCustom(JNIEnv *env, BufImageS_t *imageP, int component,
- unsigned char *dataP) {
-- ColorModelS_t *cmP = &imageP->cmodel;
-- RasterS_t *rasterP = &imageP->raster;
-+ const RasterS_t *rasterP = &imageP->raster;
-+ const int w = rasterP->width;
-+ const int h = rasterP->height;
-+
- int y;
-+ jintArray jpixels = NULL;
- jint *pixels;
- unsigned char *dP = dataP;
--#define NUM_LINES 10
-- int numLines = NUM_LINES;
-- int nbytes = rasterP->width*4*NUM_LINES;
-- jintArray jpixels;
-+ int numLines = h > NUM_LINES ? NUM_LINES : h;
-+
-+ /* it is safe to calculate the scan length, because width has been verified
-+ * on creation of the mlib image
-+ */
-+ const int scanLength = w * 4;
-+
-+ int nbytes = 0;
-+ if (!SAFE_TO_MULT(numLines, scanLength)) {
-+ return -1;
-+ }
-+
-+ nbytes = numLines * scanLength;
-
- jpixels = (*env)->NewIntArray(env, nbytes);
- if (JNU_IsNull(env, jpixels)) {
-@@ -2095,14 +2131,15 @@
- return -1;
- }
-
-- for (y=0; y < rasterP->height; y+=NUM_LINES) {
-- if (y+numLines > rasterP->height) {
-- numLines = rasterP->height - y;
-- nbytes = rasterP->width*4*numLines;
-+ for (y = 0; y < h; y += numLines) {
-+ if (y + numLines > h) {
-+ numLines = h - y;
-+ nbytes = numLines * scanLength;
- }
-+
- pixels = (*env)->GetPrimitiveArrayCritical(env, jpixels, NULL);
- if (pixels == NULL) {
-- /* JNI error */
-+ (*env)->DeleteLocalRef(env, jpixels);
- return -1;
- }
-
-@@ -2111,12 +2148,11 @@
-
- (*env)->ReleasePrimitiveArrayCritical(env, jpixels, pixels, 0);
-
-- /* setData, one scanline at a time */
-- /* Fix 4223648, 4184283 */
- (*env)->CallVoidMethod(env, imageP->jimage, g_BImgSetRGBMID, 0, y,
-- rasterP->width, numLines, jpixels, 0,
-- rasterP->width);
-+ w, numLines, jpixels,
-+ 0, w);
- if ((*env)->ExceptionOccurred(env)) {
-+ (*env)->DeleteLocalRef(env, jpixels);
- return -1;
- }
- }
-@@ -2298,7 +2334,6 @@
- mlib_image **mlibImagePP, void **dataPP, int isSrc) {
- void *dataP;
- unsigned char *cDataP;
-- unsigned short *sdataP;
- int dataType = BYTE_DATA_TYPE;
- int width;
- int height;
-@@ -2484,8 +2519,7 @@
- return -1;
- }
- if (isSrc) {
-- cDataP = (unsigned char *) mlib_ImageGetData(*mlibImagePP);
-- if (awt_getPixelByte(env, -1, rasterP, cDataP) < 0) {
-+ if (awt_getPixels(env, rasterP, mlib_ImageGetData(*mlibImagePP)) < 0) {
- (*sMlibSysFns.deleteImageFP)(*mlibImagePP);
- return -1;
- }
-@@ -2499,8 +2533,7 @@
- return -1;
- }
- if (isSrc) {
-- sdataP = (unsigned short *) mlib_ImageGetData(*mlibImagePP);
-- if (awt_getPixelShort(env, -1, rasterP, sdataP) < 0) {
-+ if (awt_getPixels(env, rasterP, mlib_ImageGetData(*mlibImagePP)) < 0) {
- (*sMlibSysFns.deleteImageFP)(*mlibImagePP);
- return -1;
- }
-@@ -2550,60 +2583,6 @@
- }
- }
-
--static int
--storeDstArray(JNIEnv *env, BufImageS_t *srcP, BufImageS_t *dstP,
-- mlibHintS_t *hintP, mlib_image *mlibImP, void *ddata) {
-- RasterS_t *rasterP = &dstP->raster;
--
-- /* Nothing to do since it is the same image type */
-- if (srcP->imageType == dstP->imageType
-- && srcP->imageType != java_awt_image_BufferedImage_TYPE_CUSTOM
-- && srcP->imageType != java_awt_image_BufferedImage_TYPE_BYTE_INDEXED
-- && srcP->imageType != java_awt_image_BufferedImage_TYPE_BYTE_BINARY) {
-- /* REMIND: Should check the ICM LUTS to see if it is the same */
-- return 0;
-- }
--
-- /* These types are compatible with TYPE_INT_RGB */
-- if (srcP->imageType == java_awt_image_BufferedImage_TYPE_INT_RGB
-- && (dstP->imageType == java_awt_image_BufferedImage_TYPE_INT_ARGB ||
-- dstP->imageType == java_awt_image_BufferedImage_TYPE_INT_ARGB_PRE)){
-- return 0;
-- }
--
-- if (hintP->cvtSrcToDefault &&
-- (srcP->cmodel.isAlphaPre == dstP->cmodel.isAlphaPre)) {
-- if (srcP->cmodel.isAlphaPre) {
-- if (dstP->imageType ==
-- java_awt_image_BufferedImage_TYPE_INT_ARGB_PRE)
-- {
-- return 0;
-- }
-- if (!srcP->cmodel.supportsAlpha &&
-- dstP->imageType == java_awt_image_BufferedImage_TYPE_INT_RGB){
-- return 0;
-- }
-- }
-- else {
-- /* REMIND: */
-- }
-- }
--
-- if (dstP->cmodel.cmType == DIRECT_CM_TYPE) {
-- /* Just need to move bits */
-- if (mlibImP->type == MLIB_BYTE) {
-- return awt_setPixelByte(env, -1, &dstP->raster,
-- (unsigned char *) mlibImP->data);
-- }
-- else if (mlibImP->type == MLIB_SHORT) {
-- return awt_setPixelByte(env, -1, &dstP->raster,
-- (unsigned char *) mlibImP->data);
-- }
-- }
--
-- return 0;
--}
--
- #define ERR_BAD_IMAGE_LAYOUT (-2)
-
- #define CHECK_DST_ARRAY(start_offset, elements_per_scan, elements_per_pixel) \
-@@ -2709,8 +2688,7 @@
- }
- }
- else if (mlibImP->type == MLIB_SHORT) {
-- return awt_setPixelShort(env, -1, rasterP,
-- (unsigned short *) 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-10-28 20:19:52.000000000 -0700
-@@ -86,7 +86,7 @@
- #endif /* MLIB_USE_FTOI_CLAMPING */
-
- /***************************************************************/
--#if defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG)
-+#if (BYTE_ORDER == LITTLE_ENDIAN) && !defined(_NO_LONGLONG)
-
- /* NB: Explicit cast to DTYPE is necessary to avoid warning from Microsoft VC compiler.
- And we need to explicitly define cast behavior if source exceeds destination range.
-@@ -103,7 +103,7 @@
- dp[0 ] = (DTYPE) ((res0) & DTYPE_MASK); \
- dp[chan1] = (DTYPE) ((res1) & DTYPE_MASK)
-
--#endif /* defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG) */
-+#endif /* (BYTE_ORDER == LITTLE_ENDIAN) && !defined(_NO_LONGLONG) */
-
- /***************************************************************/
- #ifdef _NO_LONGLONG
-@@ -114,17 +114,17 @@
-
- #else /* _NO_LONGLONG */
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | ((mlib_s64)sp[0] & 0xffffffff)
-
--#else /* _LITTLE_ENDIAN */
-+#else
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | ((mlib_s64)sp[chan1] & 0xffffffff)
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- #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-10-28 20:19:52.000000000 -0700
-@@ -126,7 +126,7 @@
- #define D2I(x) CLAMP_S32((x) SAT_OFF)
-
- /***************************************************************/
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define STORE2(res0, res1) \
- dp[0 ] = res1; \
-@@ -138,7 +138,7 @@
- dp[0 ] = res0; \
- dp[chan1] = res1
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /***************************************************************/
- #ifdef _NO_LONGLONG
-@@ -149,17 +149,17 @@
-
- #else /* _NO_LONGLONG */
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
-
--#else /* _LITTLE_ENDIAN */
-+#else
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- #endif /* _NO_LONGLONG */
-
- /***************************************************************/
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -94,7 +94,7 @@
- #define D2I(x) CLAMP_S32((x) SAT_OFF)
-
- /***************************************************************/
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define STORE2(res0, res1) \
- dp[0 ] = res1; \
-@@ -106,7 +106,7 @@
- dp[0 ] = res0; \
- dp[chan1] = res1
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /***************************************************************/
- #ifdef _NO_LONGLONG
-@@ -117,17 +117,17 @@
-
- #else /* _NO_LONGLONG */
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
-
--#else /* _LITTLE_ENDIAN */
-+#else
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- #endif /* _NO_LONGLONG */
-
- /***************************************************************/
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -126,7 +126,7 @@
- #define D2I(x) CLAMP_S32((x) SAT_OFF)
-
- /***************************************************************/
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define STORE2(res0, res1) \
- dp[0 ] = res1; \
-@@ -138,7 +138,7 @@
- dp[0 ] = res0; \
- dp[chan1] = res1
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /***************************************************************/
- #ifdef _NO_LONGLONG
-@@ -149,17 +149,17 @@
-
- #else /* _NO_LONGLONG */
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
-
--#else /* _LITTLE_ENDIAN */
-+#else
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- #endif /* _NO_LONGLONG */
-
- /***************************************************************/
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -95,7 +95,7 @@
- #define D2I(x) CLAMP_S32((x) SAT_OFF)
-
- /***************************************************************/
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define STORE2(res0, res1) \
- dp[0 ] = res1; \
-@@ -107,7 +107,7 @@
- dp[0 ] = res0; \
- dp[chan1] = res1
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /***************************************************************/
- #ifdef _NO_LONGLONG
-@@ -118,17 +118,17 @@
-
- #else /* _NO_LONGLONG */
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
-
--#else /* _LITTLE_ENDIAN */
-+#else
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- #endif /* _NO_LONGLONG */
-
- /***************************************************************/
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -126,7 +126,7 @@
- #define D2I(x) CLAMP_S32((x) SAT_OFF)
-
- /***************************************************************/
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define STORE2(res0, res1) \
- dp[0 ] = res1; \
-@@ -138,7 +138,7 @@
- dp[0 ] = res0; \
- dp[chan1] = res1
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /***************************************************************/
- #ifdef _NO_LONGLONG
-@@ -149,17 +149,17 @@
-
- #else /* _NO_LONGLONG */
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
-
--#else /* _LITTLE_ENDIAN */
-+#else
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- #endif /* _NO_LONGLONG */
-
- /***************************************************************/
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -94,7 +94,7 @@
- #define D2I(x) CLAMP_S32((x) SAT_OFF)
-
- /***************************************************************/
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define STORE2(res0, res1) \
- dp[0 ] = res1; \
-@@ -106,7 +106,7 @@
- dp[0 ] = res0; \
- dp[chan1] = res1
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /***************************************************************/
- #ifdef _NO_LONGLONG
-@@ -117,17 +117,17 @@
-
- #else /* _NO_LONGLONG */
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
-
--#else /* _LITTLE_ENDIAN */
-+#else
-
- #define LOAD_BUFF(buff) \
- *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- #endif /* _NO_LONGLONG */
-
- /***************************************************************/
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -95,7 +95,7 @@
- dst = dp[0];
- if (ld_offset + size < 32) {
- dmask = (mask0 << (32 - size)) >> ld_offset;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
- src = (src0 >> (ld_offset - ls_offset));
- dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -104,12 +104,12 @@
- #else
- src = (src0 >> (ld_offset - ls_offset));
- dp[0] = (dst & (~dmask)) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- return;
- }
-
- dmask = mask0 >> ld_offset;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
- src = (src0 >> (ld_offset - ls_offset));
- dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -118,7 +118,7 @@
- #else
- src = (src0 >> (ld_offset - ls_offset));
- dp[0] = (dst & ~dmask) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- j = 32 - ld_offset;
- dp++;
- ls_offset += j;
-@@ -131,7 +131,7 @@
-
- if (ld_offset + size < 32) {
- dmask = (mask0 << (32 - size)) >> ld_offset;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
- src = (src0 << shift) | (src1 >> (32 - shift));
-@@ -141,12 +141,12 @@
- #else
- src = (src0 << shift) | (src1 >> (32 - shift));
- dp[0] = (dst & ~dmask) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- return;
- }
-
- dmask = mask0 >> ld_offset;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
- src = (src0 << shift) | (src1 >> (32 - shift));
-@@ -156,7 +156,7 @@
- #else
- src = (src0 << shift) | (src1 >> (32 - shift));
- dp[0] = (dst & ~dmask) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- j = 32 - ld_offset;
- dp++;
- sp++;
-@@ -164,19 +164,19 @@
- }
-
- if (j < size) src1 = sp[0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- for (; j <= size - 32; j += 32) {
- src0 = src1;
- src1 = sp[1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
- src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
- dp[0] = (src << 24) | ((src & 0xFF00) << 8) | ((src >> 8) & 0xFF00) | (src >> 24);
- #else
- dp[0] = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- sp++;
- dp++;
- }
-@@ -187,7 +187,7 @@
- if (ls_offset + j > 32) src1 = sp[1];
- dst = dp[0];
- dmask = mask0 << (32 - j);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
- src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
- dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -196,7 +196,7 @@
- #else
- src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
- dp[0] = (dst & ~dmask) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- }
-
- #else /* _LONGLONG */
-@@ -315,7 +315,7 @@
- dst = dp[0];
- if (ld_offset >= size) {
- dmask = (lmask0 << (32 - size)) >> (ld_offset - size);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
- src = (src0 << (ls_offset - ld_offset));
- dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -324,12 +324,12 @@
- #else
- src = (src0 << (ls_offset - ld_offset));
- dp[0] = (dst & (~dmask)) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- return;
- }
-
- dmask = lmask0 << (32 - ld_offset);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
- src = (src0 << (ls_offset - ld_offset));
- dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -338,7 +338,7 @@
- #else
- src = (src0 << (ls_offset - ld_offset));
- dp[0] = (dst & ~dmask) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- j = ld_offset;
- dp--;
- ls_offset -= j;
-@@ -351,7 +351,7 @@
-
- if (ld_offset >= size) {
- dmask = (lmask0 << (32 - size)) >> (ld_offset - size);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
- src = (src0 >> shift) | (src1 << (32 - shift));
-@@ -361,12 +361,12 @@
- #else
- src = (src0 >> shift) | (src1 << (32 - shift));
- dp[0] = (dst & ~dmask) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- return;
- }
-
- dmask = lmask0 << (32 - ld_offset);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
- src = (src0 >> shift) | (src1 << (32 - shift));
-@@ -376,7 +376,7 @@
- #else
- src = (src0 >> shift) | (src1 << (32 - shift));
- dp[0] = (dst & ~dmask) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- j = ld_offset;
- dp--;
- sp--;
-@@ -384,22 +384,22 @@
- }
-
- if (j < size) src1 = sp[0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- #ifdef __SUNPRO_C
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
- for (; j <= size - 32; j += 32) {
- src0 = src1;
- src1 = sp[-1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
- src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
- dp[0] = (src << 24) | ((src & 0xFF00) << 8) | ((src >> 8) & 0xFF00) | (src >> 24);
- #else
- dp[0] = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- sp--;
- dp--;
- }
-@@ -410,7 +410,7 @@
- if (ls_offset < j) src1 = sp[-1];
- dst = dp[0];
- dmask = lmask0 >> (32 - j);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
- src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
- dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -419,7 +419,7 @@
- #else
- src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
- dp[0] = (dst & ~dmask) | (src & dmask);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- }
-
- #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-10-28 20:19:52.000000000 -0700
-@@ -168,7 +168,7 @@
- }
-
- /***************************************************************/
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #define READ_U8_D64(table0, table1, table2, table3) \
- t0 = *(mlib_d64*)((mlib_u8*)table0 + ((s0 << 3) & 0x7F8)); \
-@@ -184,7 +184,7 @@
- t2 = *(mlib_d64*)((mlib_u8*)table2 + ((s0 >> 5) & 0x7F8)); \
- t3 = *(mlib_d64*)((mlib_u8*)table3 + ((s0 << 3) & 0x7F8))
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /***************************************************************/
- void mlib_ImageLookUp_U8_D64(const mlib_u8 *src,
-@@ -613,7 +613,7 @@
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
- for (i = 0; i < size - 7; i += 4, dp += 8, sa++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
-@@ -623,12 +623,12 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
-@@ -638,7 +638,7 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- dp[4] = t0;
- dp[5] = t1;
-@@ -646,7 +646,7 @@
- dp[7] = t3;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
-@@ -656,12 +656,12 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
-@@ -671,7 +671,7 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[4] = t0;
- dp[5] = t1;
- dp[6] = t2;
-@@ -719,7 +719,7 @@
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
- for (i = 0; i < size - 7; i += 4, dp += 12, sa++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
-@@ -733,14 +733,14 @@
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
- dp[4] = t4;
- dp[5] = t5;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
-@@ -754,7 +754,7 @@
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- dp[6] = t0;
- dp[7] = t1;
-@@ -764,7 +764,7 @@
- dp[11] = t5;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
-@@ -778,14 +778,14 @@
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
- dp[4] = t4;
- dp[5] = t5;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
-@@ -799,7 +799,7 @@
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[6] = t0;
- dp[7] = t1;
- dp[8] = t2;
-@@ -852,7 +852,7 @@
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
- for (i = 0; i < size - 7; i += 4, dp += 16, sa++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
-@@ -862,12 +862,12 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
-@@ -877,12 +877,12 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[4] = t0;
- dp[5] = t1;
- dp[6] = t2;
- dp[7] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
-@@ -892,12 +892,12 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[8] = t0;
- dp[9] = t1;
- dp[10] = t2;
- dp[11] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
-@@ -907,7 +907,7 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- dp[12] = t0;
- dp[13] = t1;
-@@ -915,7 +915,7 @@
- dp[15] = t3;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
-@@ -925,12 +925,12 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
-@@ -940,12 +940,12 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[4] = t0;
- dp[5] = t1;
- dp[6] = t2;
- dp[7] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
-@@ -955,12 +955,12 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[8] = t0;
- dp[9] = t1;
- dp[10] = t2;
- dp[11] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
-@@ -970,7 +970,7 @@
- t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
- t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
- t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[12] = t0;
- 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-10-28 20:19:52.000000000 -0700
-@@ -88,7 +88,7 @@
- } d64_2_f32;
-
- /***************************************************************/
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- static const mlib_u32 mlib_bit_mask[16] = {
- 0x00000000u, 0xFF000000u, 0x00FF0000u, 0xFFFF0000u,
-@@ -126,7 +126,7 @@
- 0x00000000u, 0x00FFFFFFu, 0xFF000000u, 0xFFFFFFFFu
- };
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /***************************************************************/
- mlib_status mlib_ImageLookUp_Bit_U8_1(const mlib_u8 *src,
-@@ -228,13 +228,13 @@
- #endif /* __SUNPRO_C */
- for (; i <= (size - 16); i += 16) {
- s0 = *(mlib_u16*)sa;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *da++ = dd_array[s0 & 0xFF];
- *da++ = dd_array[s0 >> 8];
- #else
- *da++ = dd_array[s0 >> 8];
- *da++ = dd_array[s0 & 0xFF];
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- sa += 2;
- }
-
-@@ -258,20 +258,20 @@
- val1 = p_dd[2*val0+1];
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8);
- #else
- emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- ((mlib_u32*)da)[0] = (val1 & emask) | (((mlib_u32*)da)[0] &~ emask);
-
- #else /* _NO_LONGLONG */
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- mlib_u64 emask = (mlib_u64)((mlib_s64)(-1)) >> ((8 - (size - i)) * 8);
- #else
- mlib_u64 emask = (mlib_s64)(-1) << ((8 - (size - i)) * 8);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- ((mlib_u64*)da)[0] = (((mlib_u64*)dd_array)[sa[0]] & emask) | (((mlib_u64*)da)[0] &~ emask);
-
-@@ -323,13 +323,13 @@
-
- val0 = table[0][0];
- val1 = table[0][1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- val0 = val0 | (table[1][0] << 8);
- val1 = val1 | (table[1][1] << 8);
- #else
- val0 = (val0 << 8) | table[1][0];
- val1 = (val1 << 8) | table[1][1];
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- val0 |= (val0 << 16);
- val1 |= (val1 << 16);
-
-@@ -394,11 +394,11 @@
- dd1 = dd2;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8);
- #else
- emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- ((mlib_u32*)da)[0] = (dd1 & emask) | (((mlib_u32*)da)[0] &~ emask);
-
- #else /* _NO_LONGLONG */
-@@ -412,11 +412,11 @@
- dd = ((mlib_u64*)dd_array)[s0 & 0xf];
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- emask = (mlib_u64)((mlib_s64)(-1)) >> ((8 - (size - i)) * 8);
- #else
- emask = (mlib_s64)(-1) << ((8 - (size - i)) * 8);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- ((mlib_u64*)da)[0] = (dd & emask) | (((mlib_u64*)da)[0] &~ emask);
-
- #endif /* _NO_LONGLONG */
-@@ -462,7 +462,7 @@
-
- buffs = buff + size;
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- l0 = (table[0][0] << 24) | (table[2][0] << 16) | (table[1][0] << 8) | (table[0][0]);
- h0 = (table[0][1] << 24) | (table[2][1] << 16) | (table[1][1] << 8) | (table[0][1]);
- l1 = (l0 >> 8); l1 |= (l1 << 24);
-@@ -476,7 +476,7 @@
- h1 = (h0 << 8); h1 |= (h1 >> 24);
- l2 = (l1 << 8); l2 |= (l2 >> 24);
- h2 = (h1 << 8); h2 |= (h2 >> 24);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /* calculate lookup table */
- #ifdef __SUNPRO_C
-@@ -564,11 +564,11 @@
- dd = ((mlib_u32*)(d_array12 + (s0 & 0xF)))[1];
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- emask = (mlib_u32)((mlib_s32)(-1)) >> ((4 - (size - i)) * 8);
- #else
- emask = (mlib_s32)(-1) << ((4 - (size - i)) * 8);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = (dd & emask) | (da[0] &~ emask);
- }
-
-@@ -611,13 +611,13 @@
-
- buffs = buff + size;
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- l = (table[3][0] << 24) | (table[2][0] << 16) | (table[1][0] << 8) | (table[0][0]);
- h = (table[3][1] << 24) | (table[2][1] << 16) | (table[1][1] << 8) | (table[0][1]);
- #else
- l = (table[0][0] << 24) | (table[1][0] << 16) | (table[2][0] << 8) | (table[3][0]);
- h = (table[0][1] << 24) | (table[1][1] << 16) | (table[2][1] << 8) | (table[3][1]);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- ((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-10-28 20:19:52.000000000 -0700
-@@ -30,7 +30,7 @@
- typedef union {
- mlib_d64 db;
- struct {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- mlib_s32 int1, int0;
- #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-10-28 20:19:52.000000000 -0700
-@@ -275,11 +275,11 @@
- for (i = 0; j <= (b_size - 4); j += 4, i++) {
- src0 = src1;
- src1 = pws[i + 1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- pwd[i] = (src0 >> lshift) | (src1 << rshift);
- #else
- pwd[i] = (src0 << lshift) | (src1 >> rshift);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- }
-
- sa += i << 2;
-@@ -381,11 +381,11 @@
- for (; j <= (src_width - 4); j += 4) {
- src0 = src1;
- src1 = ps[1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *((mlib_s32 *) (pdst_row + j)) = (src0 >> shl) | (src1 << shr);
- #else
- *((mlib_s32 *) (pdst_row + j)) = (src0 << shl) | (src1 >> shr);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- ps++;
- }
- }
-@@ -414,11 +414,11 @@
- for (; j <= (src_width - 8); j += 8) {
- src0 = src1;
- src1 = ps[1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *((mlib_s64 *) (pdst_row + j)) = (src0 >> shl) | (src1 << shr);
- #else
- *((mlib_s64 *) (pdst_row + j)) = (src0 << shl) | (src1 >> shr);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- ps++;
- }
- }
-@@ -484,11 +484,11 @@
- for (; j <= (src_width - 2); j += 2) {
- src0 = src1;
- src1 = ps[1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *((mlib_s32 *) (pdst_row + j)) = (src0 >> 16) | (src1 << 16);
- #else
- *((mlib_s32 *) (pdst_row + j)) = (src0 << 16) | (src1 >> 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- ps++;
- }
- }
-@@ -516,11 +516,11 @@
- for (; j <= (src_width - 4); j += 4) {
- src0 = src1;
- src1 = ps[1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *((mlib_s64 *) (pdst_row + j)) = (src0 >> shl) | (src1 << shr);
- #else
- *((mlib_s64 *) (pdst_row + j)) = (src0 << shl) | (src1 >> shr);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- ps++;
- }
- }
-@@ -585,11 +585,11 @@
- for (; j <= (src_width - 2); j += 2) {
- src0 = src1;
- src1 = ps[1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *((mlib_s64 *) (pdst_row + j)) = (src0 >> 32) | (src1 << 32);
- #else
- *((mlib_s64 *) (pdst_row + j)) = (src0 << 32) | (src1 >> 32);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- ps++;
- }
- }
-@@ -687,11 +687,11 @@
- #endif /* __SUNPRO_C */
- for (; n > SIZE; n -= SIZE) {
- s1 = *tmp++;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *(TYPE *) dp = (s0 >> shl) | (s1 << shr);
- #else
- *(TYPE *) dp = (s0 << shl) | (s1 >> shr);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = s1;
- 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-10-28 20:19:52.000000000 -0700
-@@ -120,7 +120,7 @@
- } \
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- /***************************************************************/
- #define READ_U8_U8_ALIGN(table0, table1, table2, table3) \
-@@ -163,7 +163,7 @@
- t2 = *(mlib_u32*)((mlib_u8*)table2 + ((s0 >> 14) & 0x3FC)); \
- t3 = *(mlib_u32*)((mlib_u8*)table3 + ((s0 >> 22) & 0x3FC))
-
--#else /* _LITTLE_ENDIAN */
-+#else /* BYTE_ORDER == ... */
-
- /***********/
- #define READ_U8_U8_ALIGN(table0, table1, table2, table3) \
-@@ -206,7 +206,7 @@
- t2 = *(mlib_u32*)((mlib_u8*)table2 + ((s0 >> 6) & 0x3FC)); \
- t3 = *(mlib_u32*)((mlib_u8*)table3 + ((s0 << 2) & 0x3FC))
-
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- /***************************************************************/
- void mlib_c_ImageLookUp_U8_U8(const mlib_u8 *src,
-@@ -297,11 +297,11 @@
- da[0] = t;
- da++;
- dp = (mlib_u8 *) da;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *dp++ = tab[s2 >> 8];
- #else
- *dp++ = tab[s2 & 0xFF];
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- sp = (mlib_u8 *) sa;
- i += 5;
- for (; i < size; i++, dp++, sp++)
-@@ -403,11 +403,11 @@
- da[0] = t;
- da++;
- dp = (mlib_u8 *) da;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *dp++ = tab0[s2 >> 8];
- #else
- *dp++ = tab0[s2 & 0xFF];
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- sp = (mlib_u8 *) sa;
- i += 5;
-
-@@ -544,11 +544,11 @@
- da[0] = t;
- da++;
- dp = (mlib_u8 *) da;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *dp++ = tab1[s2 >> 8];
- #else
- *dp++ = tab1[s2 & 0xFF];
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- sp = (mlib_u8 *) sa;
- i += 5;
-
-@@ -694,11 +694,11 @@
- da[0] = t;
- da++;
- dp = (mlib_u8 *) da;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *dp++ = tab0[s2 >> 8];
- #else
- *dp++ = tab0[s2 & 0xFF];
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- sp = (mlib_u8 *) sa;
- i += 5;
-
-@@ -1852,21 +1852,21 @@
- s0 = tab0[0];
- s1 = tab1[0];
- for (i = 1; i < 256; i++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s2 = (s1 << 8) + s0;
- #else
- s2 = (s0 << 8) + s1;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = tab0[i];
- s1 = tab1[i];
- tab[i - 1] = (mlib_u16) s2;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s2 = (s1 << 8) + s0;
- #else
- s2 = (s0 << 8) + s1;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- tab[255] = (mlib_u16) s2;
-
- for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -1897,11 +1897,11 @@
- for (i = 0; i < size - 3; i += 2, da++, sa += 2) {
- t0 = tab[s0];
- t1 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t = (t1 << 16) + t0;
- #else
- t = (t0 << 16) + t1;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- s1 = sa[1];
- da[0] = t;
-@@ -1909,11 +1909,11 @@
-
- t0 = tab[s0];
- t1 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t = (t1 << 16) + t0;
- #else
- t = (t0 << 16) + t1;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = t;
- da++;
-
-@@ -1927,13 +1927,13 @@
-
- if (off > 1) {
- t0 = tab[sa[0]];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- dp[1] = (t0 >> 8);
- dp[0] = t0;
- #else
- dp[0] = (t0 >> 8);
- dp[1] = t0;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- sa++;
- size--;
- dp += 2;
-@@ -1941,11 +1941,11 @@
-
- t0 = tab[sa[0]];
- sa++;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *dp++ = t0;
- #else
- *dp++ = (t0 >> 8);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- da = (mlib_s32 *) dp;
-
-@@ -1959,11 +1959,11 @@
- for (i = 0; i < size - 4; i += 2, da++, sa += 2) {
- t1 = tab[s0];
- t2 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t = (t0 >> 8) + (t1 << 8) + (t2 << 24);
- #else
- t = (t0 << 24) + (t1 << 8) + (t2 >> 8);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- t0 = t2;
- s0 = sa[0];
- s1 = sa[1];
-@@ -1972,29 +1972,29 @@
-
- t1 = tab[s0];
- t2 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t = (t0 >> 8) + (t1 << 8) + (t2 << 24);
- #else
- t = (t0 << 24) + (t1 << 8) + (t2 >> 8);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = t;
- da++;
- dp = (mlib_u8 *) da;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- dp[0] = (t2 >> 8);
- #else
- dp[0] = t2;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- if ((size & 1) == 0) {
- t0 = tab[sa[0]];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- dp[2] = (t0 >> 8);
- dp[1] = t0;
- #else
- dp[1] = (t0 >> 8);
- dp[2] = t0;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- }
- }
- }
-@@ -2012,22 +2012,22 @@
- s1 = tab1[0];
- s2 = tab2[0];
- for (i = 1; i < 256; i++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s3 = (s2 << 24) + (s1 << 16) + (s0 << 8);
- #else
- s3 = (s0 << 16) + (s1 << 8) + s2;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = tab0[i];
- s1 = tab1[i];
- s2 = tab2[i];
- tab[i - 1] = s3;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s3 = (s2 << 24) + (s1 << 16) + (s0 << 8);
- #else
- s3 = (s0 << 16) + (s1 << 8) + s2;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- tab[255] = s3;
-
- for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -2064,24 +2064,24 @@
- for (i = 0; i < size - 7; i += 4, da += 3, sa += 4) {
- t0 = tab[s0];
- t1 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- da[0] = (t0 >> 8) + (t1 << 16);
- res2 = (t1 >> 16);
- #else
- da[0] = (t0 << 8) + (t1 >> 16);
- res2 = (t1 << 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- s1 = sa[1];
- t0 = tab[s0];
- t1 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 += (t0 << 8);
- res1 = (t0 >> 24) + t1;
- #else
- res2 += (t0 >> 8);
- res1 = (t0 << 24) + t1;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[2];
- s1 = sa[3];
- da[1] = res2;
-@@ -2090,24 +2090,24 @@
-
- t0 = tab[s0];
- t1 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- da[0] = (t0 >> 8) + (t1 << 16);
- res2 = (t1 >> 16);
- #else
- da[0] = (t0 << 8) + (t1 >> 16);
- res2 = (t1 << 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- s1 = sa[1];
- t0 = tab[s0];
- t1 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 += (t0 << 8);
- res1 = (t0 >> 24) + t1;
- #else
- res2 += (t0 >> 8);
- res1 = (t0 << 24) + t1;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[1] = res2;
- da[2] = res1;
- da += 3;
-@@ -2143,11 +2143,11 @@
- s2 = tab2[0];
- s3 = tab3[0];
- for (i = 1; i < 256; i++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s4 = (s3 << 24) + (s2 << 16) + (s1 << 8) + s0;
- #else
- s4 = (s0 << 24) + (s1 << 16) + (s2 << 8) + s3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = tab0[i];
- s1 = tab1[i];
- s2 = tab2[i];
-@@ -2155,11 +2155,11 @@
- tab[i - 1] = s4;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s4 = (s3 << 24) + (s2 << 16) + (s1 << 8) + s0;
- #else
- s4 = (s0 << 24) + (s1 << 16) + (s2 << 8) + s3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- tab[255] = s4;
-
- for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -2225,13 +2225,13 @@
- for (i = 0; i < size - 4; i += 2, da += 2, sa += 2) {
- t1 = tab[s0];
- t2 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t0 >> shift) + (t1 << shift1);
- res2 = (t1 >> shift) + (t2 << shift1);
- #else
- res1 = (t0 << shift) + (t1 >> shift1);
- res2 = (t1 << shift) + (t2 >> shift1);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- t0 = t2;
- s0 = sa[0];
- s1 = sa[1];
-@@ -2241,28 +2241,28 @@
-
- t1 = tab[s0];
- t2 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t0 >> shift) + (t1 << shift1);
- res2 = (t1 >> shift) + (t2 << shift1);
- #else
- res1 = (t0 << shift) + (t1 >> shift1);
- res2 = (t1 << shift) + (t2 >> shift1);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = res1;
- da[1] = res2;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = (da[2] >> shift1);
- da[2] = (t2 >> shift) + (t0 << shift1);
- #else
- t0 = (da[2] << shift1);
- da[2] = (t2 << shift) + (t0 >> shift1);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da += 2;
- dp = (mlib_u8 *) da + (4 - off);
-
- if ((size & 1) == 0) {
- t0 = tab[sa[0]];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- dp[3] = (mlib_u8) (t0 >> 24);
- dp[2] = (mlib_u8) (t0 >> 16);
- dp[1] = (mlib_u8) (t0 >> 8);
-@@ -2272,7 +2272,7 @@
- dp[1] = (mlib_u8) (t0 >> 16);
- dp[2] = (mlib_u8) (t0 >> 8);
- dp[3] = (mlib_u8) t0;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- }
- }
- }
-@@ -2348,13 +2348,13 @@
- t3 = tab0[s1];
- t4 = tab1[s1];
- t5 = tab2[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- res2 = (t5 << 8) + t4;
- #else
- da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
- res2 = (t4 << 24) + (t5 << 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- s1 = sa[1];
- t0 = tab0[s0];
-@@ -2363,13 +2363,13 @@
- t3 = tab0[s1];
- t4 = tab1[s1];
- t5 = tab2[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 += ((t1 << 24) + (t0 << 16));
- res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2;
- #else
- res2 += ((t0 << 8) + t1);
- res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[2];
- s1 = sa[3];
- da[1] = res2;
-@@ -2382,13 +2382,13 @@
- t3 = tab0[s1];
- t4 = tab1[s1];
- t5 = tab2[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- res2 = (t5 << 8) + t4;
- #else
- da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
- res2 = (t4 << 24) + (t5 << 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- s1 = sa[1];
- t0 = tab0[s0];
-@@ -2397,13 +2397,13 @@
- t3 = tab0[s1];
- t4 = tab1[s1];
- t5 = tab2[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 += ((t1 << 24) + (t0 << 16));
- res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2;
- #else
- res2 += ((t0 << 8) + t1);
- res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[1] = res2;
- da[2] = res1;
- da += 3;
-@@ -2455,11 +2455,11 @@
- t1 = tab1[s0];
- t2 = tab2[s0];
- t3 = tab3[s0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- #else
- res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- da[0] = res;
- }
-@@ -2468,11 +2468,11 @@
- t1 = tab1[s0];
- t2 = tab2[s0];
- t3 = tab3[s0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- #else
- res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = res;
-
- }
-@@ -2496,11 +2496,11 @@
- t2 = tab2[s0];
- t3 = tab3[s0];
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- #else
- res1 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- s0 = sa[0];
- sa++;
-@@ -2513,13 +2513,13 @@
- t1 = tab1[s0];
- t2 = tab2[s0];
- t3 = tab3[s0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- res = (res1 >> shift) + (res2 << shift1);
- #else
- res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
- res = (res1 << shift) + (res2 >> shift1);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- res1 = res2;
- s0 = sa[0];
- da[0] = res;
-@@ -2529,21 +2529,21 @@
- t1 = tab1[s0];
- t2 = tab2[s0];
- t3 = tab3[s0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- res = (res1 >> shift) + (res2 << shift1);
- #else
- res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
- res = (res1 << shift) + (res2 >> shift1);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = res;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (da[1] >> shift1);
- da[1] = (res2 >> shift) + (res1 << shift1);
- #else
- res1 = (da[1] << shift1);
- da[1] = (res2 << shift) + (res1 >> shift1);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- }
- }
- }
-@@ -2617,13 +2617,13 @@
- t3 = tab0[s1];
- t4 = tab1[s1];
- t5 = tab2[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- res2 = (t5 << 8) + t4;
- #else
- da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
- res2 = (t4 << 24) + (t5 << 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- s1 = sa[1];
- t0 = tab0[s0];
-@@ -2632,13 +2632,13 @@
- t3 = tab0[s1];
- t4 = tab1[s1];
- t5 = tab2[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 += ((t1 << 24) + (t0 << 16));
- res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2;
- #else
- res2 += ((t0 << 8) + t1);
- res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[2];
- s1 = sa[3];
- da[1] = res2;
-@@ -2651,13 +2651,13 @@
- t3 = tab0[s1];
- t4 = tab1[s1];
- t5 = tab2[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- da[0] = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- res2 = (t5 << 8) + t4;
- #else
- da[0] = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
- res2 = (t4 << 24) + (t5 << 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- s1 = sa[1];
- t0 = tab0[s0];
-@@ -2666,13 +2666,13 @@
- t3 = tab0[s1];
- t4 = tab1[s1];
- t5 = tab2[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 += ((t1 << 24) + (t0 << 16));
- res1 = (t5 << 24) + (t4 << 16) + (t3 << 8) + t2;
- #else
- res2 += ((t0 << 8) + t1);
- res1 = (t2 << 24) + (t3 << 16) + (t4 << 8) + t5;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[1] = res2;
- da[2] = res1;
- da += 3;
-@@ -2724,11 +2724,11 @@
- t1 = tab1[s0];
- t2 = tab2[s0];
- t3 = tab3[s0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- #else
- res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- da[0] = res;
- }
-@@ -2737,11 +2737,11 @@
- t1 = tab1[s0];
- t2 = tab2[s0];
- t3 = tab3[s0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- #else
- res = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = res;
-
- }
-@@ -2765,11 +2765,11 @@
- t2 = tab2[s0];
- t3 = tab3[s0];
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- #else
- res1 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- s0 = sa[0];
- sa++;
-@@ -2782,13 +2782,13 @@
- t1 = tab1[s0];
- t2 = tab2[s0];
- t3 = tab3[s0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- res = (res1 >> shift) + (res2 << shift1);
- #else
- res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
- res = (res1 << shift) + (res2 >> shift1);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- res1 = res2;
- s0 = sa[0];
- da[0] = res;
-@@ -2798,21 +2798,21 @@
- t1 = tab1[s0];
- t2 = tab2[s0];
- t3 = tab3[s0];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res2 = (t3 << 24) + (t2 << 16) + (t1 << 8) + t0;
- res = (res1 >> shift) + (res2 << shift1);
- #else
- res2 = (t0 << 24) + (t1 << 16) + (t2 << 8) + t3;
- res = (res1 << shift) + (res2 >> shift1);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = res;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (da[1] >> shift1);
- da[1] = (res2 >> shift) + (res1 << shift1);
- #else
- res1 = (da[1] << shift1);
- da[1] = (res2 << shift) + (res1 >> shift1);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- }
- }
- }
-@@ -2863,21 +2863,21 @@
- s0 = tab0[0];
- s1 = tab1[0];
- for (i = 1; i < 256; i++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s2 = (s1 << 16) + s0;
- #else
- s2 = (s0 << 16) + s1;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = tab0[i];
- s1 = tab1[i];
- tab[i - 1] = s2;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s2 = (s1 << 16) + s0;
- #else
- s2 = (s0 << 16) + s1;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- tab[255] = s2;
-
- for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -2919,11 +2919,11 @@
- else {
-
- t0 = tab[*sa++];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *dp++ = (mlib_u16) (t0);
- #else
- *dp++ = (mlib_u16) (t0 >> 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da = (mlib_u32 *) dp;
- s0 = sa[0];
- s1 = sa[1];
-@@ -2935,13 +2935,13 @@
- for (i = 0; i < size - 4; i += 2, da += 2, sa += 2) {
- t1 = tab[s0];
- t2 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t0 >> 16) + (t1 << 16);
- res2 = (t1 >> 16) + (t2 << 16);
- #else
- res1 = (t0 << 16) + (t1 >> 16);
- res2 = (t1 << 16) + (t2 >> 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- t0 = t2;
- s0 = sa[0];
- s1 = sa[1];
-@@ -2951,32 +2951,32 @@
-
- t1 = tab[s0];
- t2 = tab[s1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t0 >> 16) + (t1 << 16);
- res2 = (t1 >> 16) + (t2 << 16);
- #else
- res1 = (t0 << 16) + (t1 >> 16);
- res2 = (t1 << 16) + (t2 >> 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = res1;
- da[1] = res2;
- da += 2;
- dp = (mlib_u16 *) da;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- dp[0] = (mlib_u16) (t2 >> 16);
- #else
- dp[0] = (mlib_u16) t2;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- if ((size & 1) == 0) {
- t0 = tab[sa[0]];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- dp[2] = (mlib_u16) (t0 >> 16);
- dp[1] = (mlib_u16) t0;
- #else
- dp[1] = (mlib_u16) (t0 >> 16);
- dp[2] = (mlib_u16) t0;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- }
- }
- }
-@@ -2994,13 +2994,13 @@
- s1 = tab1[0];
- s2 = tab2[0];
- for (i = 1; i < 256; i++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s3 = (s0 << 16);
- s4 = (s2 << 16) + s1;
- #else
- s3 = s0;
- s4 = (s1 << 16) + s2;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = tab0[i];
- s1 = tab1[i];
- s2 = tab2[i];
-@@ -3008,13 +3008,13 @@
- tab[2 * i - 1] = s4;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s4 = (s2 << 16) + s1;
- tab[510] = s0 << 16;
- #else
- s4 = (s1 << 16) + s2;
- tab[510] = s0;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- tab[511] = s4;
-
- for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -3050,13 +3050,13 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t0 >> 16) + (t1 << 16);
- res2 = (t1 >> 16) + t2;
- #else
- res1 = (t0 << 16) + (t1 >> 16);
- res2 = (t1 << 16) + t2;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0] << 3;
- s1 = sa[1] << 3;
- da[0] = res1;
-@@ -3068,13 +3068,13 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t0 >> 16) + (t1 << 16);
- res2 = (t1 >> 16) + t2;
- #else
- res1 = (t0 << 16) + (t1 >> 16);
- res2 = (t1 << 16) + t2;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = res1;
- da[1] = res2;
- da[2] = t3;
-@@ -3105,13 +3105,13 @@
- s2 = tab2[0];
- s3 = tab3[0];
- for (i = 1; i < 256; i++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s4 = (s1 << 16) + s0;
- s5 = (s3 << 16) + s2;
- #else
- s4 = (s0 << 16) + s1;
- s5 = (s2 << 16) + s3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = tab0[i];
- s1 = tab1[i];
- s2 = tab2[i];
-@@ -3120,13 +3120,13 @@
- tab[2 * i - 1] = s5;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- s4 = (s1 << 16) + s0;
- s5 = (s3 << 16) + s2;
- #else
- s4 = (s0 << 16) + s1;
- s5 = (s2 << 16) + s3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- tab[510] = s4;
- tab[511] = s5;
-
-@@ -3181,18 +3181,18 @@
-
- t4 = tab[2 * sa[0]];
- t5 = tab[2 * sa[0] + 1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *dp++ = (mlib_u16) (t4);
- #else
- *dp++ = (mlib_u16) (t4 >> 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- sa++;
- da = (mlib_u32 *) dp;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- *da++ = (t4 >> 16) + (t5 << 16);
- #else
- *da++ = (t4 << 16) + (t5 >> 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0] << 3;
- s1 = sa[1] << 3;
- sa += 2;
-@@ -3205,7 +3205,7 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t5 >> 16) + (t0 << 16);
- res2 = (t0 >> 16) + (t1 << 16);
- res3 = (t1 >> 16) + (t2 << 16);
-@@ -3215,7 +3215,7 @@
- res2 = (t0 << 16) + (t1 >> 16);
- res3 = (t1 << 16) + (t2 >> 16);
- res4 = (t2 << 16) + (t3 >> 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0] << 3;
- s1 = sa[1] << 3;
- da[0] = res1;
-@@ -3229,7 +3229,7 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- res1 = (t5 >> 16) + (t0 << 16);
- res2 = (t0 >> 16) + (t1 << 16);
- res3 = (t1 >> 16) + (t2 << 16);
-@@ -3239,36 +3239,36 @@
- res2 = (t0 << 16) + (t1 >> 16);
- res3 = (t1 << 16) + (t2 >> 16);
- res4 = (t2 << 16) + (t3 >> 16);
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- da[0] = res1;
- da[1] = res2;
- da[2] = res3;
- da[3] = res4;
- da += 4;
- dp = (mlib_u16 *) da;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- dp[0] = (mlib_u16) (t3 >> 16);
- #else
- dp[0] = (mlib_u16) t3;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
- if ((size & 1) == 0) {
- t0 = tab[2 * sa[0]];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- dp[2] = (mlib_u16) (t0 >> 16);
- dp[1] = (mlib_u16) t0;
- #else
- dp[1] = (mlib_u16) (t0 >> 16);
- dp[2] = (mlib_u16) t0;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- t0 = tab[2 * sa[0] + 1];
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- dp[4] = (mlib_u16) (t0 >> 16);
- dp[3] = (mlib_u16) t0;
- #else
- dp[3] = (mlib_u16) (t0 >> 16);
- dp[4] = (mlib_u16) t0;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- }
- }
- }
-@@ -3439,7 +3439,7 @@
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
- for (i = 0; i < size - 7; i += 4, dp += 8, sa++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
-@@ -3449,12 +3449,12 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
-@@ -3464,7 +3464,7 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- dp[4] = t0;
- dp[5] = t1;
-@@ -3472,7 +3472,7 @@
- dp[7] = t3;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
-@@ -3482,12 +3482,12 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
-@@ -3497,7 +3497,7 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[4] = t0;
- dp[5] = t1;
- dp[6] = t2;
-@@ -3545,7 +3545,7 @@
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
- for (i = 0; i < size - 7; i += 4, dp += 12, sa++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
-@@ -3559,14 +3559,14 @@
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
- dp[4] = t4;
- dp[5] = t5;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
-@@ -3580,7 +3580,7 @@
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- dp[6] = t0;
- dp[7] = t1;
-@@ -3590,7 +3590,7 @@
- dp[11] = t5;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
-@@ -3604,14 +3604,14 @@
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
- dp[4] = t4;
- dp[5] = t5;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
-@@ -3625,7 +3625,7 @@
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[6] = t0;
- dp[7] = t1;
- dp[8] = t2;
-@@ -3678,7 +3678,7 @@
- #pragma pipeloop(0)
- #endif /* __SUNPRO_C */
- for (i = 0; i < size - 7; i += 4, dp += 16, sa++) {
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
-@@ -3688,12 +3688,12 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 22) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
-@@ -3703,12 +3703,12 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 14) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[4] = t0;
- dp[5] = t1;
- dp[6] = t2;
- dp[7] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
-@@ -3718,12 +3718,12 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 6) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[8] = t0;
- dp[9] = t1;
- dp[10] = t2;
- dp[11] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
-@@ -3733,7 +3733,7 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 << 2) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- s0 = sa[0];
- dp[12] = t0;
- dp[13] = t1;
-@@ -3741,7 +3741,7 @@
- dp[15] = t3;
- }
-
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
-@@ -3751,12 +3751,12 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 22) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[0] = t0;
- dp[1] = t1;
- dp[2] = t2;
- dp[3] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
-@@ -3766,12 +3766,12 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 14) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[4] = t0;
- dp[5] = t1;
- dp[6] = t2;
- dp[7] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
-@@ -3781,12 +3781,12 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 6) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[8] = t0;
- dp[9] = t1;
- dp[10] = t2;
- dp[11] = t3;
--#ifdef _LITTLE_ENDIAN
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
- t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
-@@ -3796,7 +3796,7 @@
- t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
- t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
- t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 << 2) & 0x3FC));
--#endif /* _LITTLE_ENDIAN */
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
- dp[12] = t0;
- 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-10-28 20:19:52.000000000 -0700
-@@ -27,9 +27,21 @@
- #ifndef MLIB_IMAGE_H
- #define MLIB_IMAGE_H
-
--#ifdef MACOSX
-+#ifdef __OpenBSD__
-+#include <sys/types.h>
-+#endif
-+
-+#ifdef _ALLBSD_SOURCE
- #include <machine/endian.h>
-+
-+/* BSD's always define both _LITTLE_ENDIAN && _BIG_ENDIAN */
-+#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) && \
-+ _BYTE_ORDER == _BIG_ENDIAN
-+#undef _LITTLE_ENDIAN
- #endif
-+
-+#endif /* _ALLBSD_SOURCE */
-+
- #include <mlib_types.h>
- #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-10-28 20:19:52.000000000 -0700
-@@ -26,7 +26,7 @@
-
- #include <stdlib.h>
- #include <string.h>
--#ifdef MACOSX
-+#ifdef _ALLBSD_SOURCE
- #include <unistd.h>
- #include <sys/param.h>
- #endif
-@@ -90,7 +90,10 @@
- * alignment. -- from stdlib.h of MS VC++5.0.
- */
- return (void *) malloc(size);
--#elif defined(MACOSX)
-+#elif defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
-+ void *ret;
-+ return posix_memalign(&ret, 8, size) ? NULL : ret;
-+#elif defined(_ALLBSD_SOURCE)
- return valloc(size);
- #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-10-28 20:19:52.000000000 -0700
-@@ -59,7 +59,7 @@
-
- #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
-
--#if defined(MACOSX)
-+#if defined(_ALLBSD_SOURCE)
- #include <stddef.h> /* for ptrdiff_t */
- #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-07-15 21:49:32.000000000 -0700
-@@ -111,8 +111,9 @@
- int
- SplashIsStillLooping(Splash * splash)
- {
-- if (splash->currentFrame < 0)
-+ if (splash->currentFrame < 0) {
- return 0;
-+ }
- return splash->loopCount != 1 ||
- splash->currentFrame + 1 < splash->frameCount;
- }
-@@ -121,17 +122,22 @@
- SplashUpdateScreenData(Splash * splash)
- {
- ImageRect srcRect, dstRect;
-+ if (splash->currentFrame < 0) {
-+ return;
-+ }
-
- initRect(&srcRect, 0, 0, splash->width, splash->height, 1,
- splash->width * sizeof(rgbquad_t),
- splash->frames[splash->currentFrame].bitmapBits, &splash->imageFormat);
-- if (splash->screenData)
-+ if (splash->screenData) {
- free(splash->screenData);
-+ }
- splash->screenStride = splash->width * splash->screenFormat.depthBytes;
-- if (splash->byteAlignment > 1)
-+ if (splash->byteAlignment > 1) {
- splash->screenStride =
- (splash->screenStride + splash->byteAlignment - 1) &
- ~(splash->byteAlignment - 1);
-+ }
- splash->screenData = malloc(splash->height * splash->screenStride);
- initRect(&dstRect, 0, 0, splash->width, splash->height, 1,
- splash->screenStride, splash->screenData, &splash->screenFormat);
-@@ -146,16 +152,19 @@
- void
- SplashNextFrame(Splash * splash)
- {
-- if (splash->currentFrame < 0)
-+ if (splash->currentFrame < 0) {
- return;
-+ }
- do {
-- if (!SplashIsStillLooping(splash))
-+ if (!SplashIsStillLooping(splash)) {
- return;
-+ }
- splash->time += splash->frames[splash->currentFrame].delay;
- if (++splash->currentFrame >= splash->frameCount) {
- splash->currentFrame = 0;
-- if (splash->loopCount > 0)
-+ if (splash->loopCount > 0) {
- splash->loopCount--;
-+ }
- }
- } while (splash->time + splash->frames[splash->currentFrame].delay -
- SplashTime() <= 0);
-@@ -183,8 +192,9 @@
- pSrc += pSrcRect->depthBytes;
- ++i;
- }
-- if (i >= pSrcRect->numSamples)
-+ if (i >= pSrcRect->numSamples) {
- break;
-+ }
- i0 = i;
- while (i < pSrcRect->numSamples &&
- getRGBA(pSrc, pSrcRect->format) >= ALPHA_THRESHOLD) {
---- ./jdk/src/share/native/sun/font/freetypeScaler.c 2013-09-06 11:29:01.000000000 -0700
-+++ ./jdk/src/share/native/sun/font/freetypeScaler.c 2014-07-15 21:54:46.000000000 -0700
-@@ -177,18 +177,10 @@
- if (numBytes > FILEDATACACHESIZE) {
- bBuffer = (*env)->NewDirectByteBuffer(env, destBuffer, numBytes);
- if (bBuffer != NULL) {
-- /* Loop until the read succeeds (or EOF).
-- * This should improve robustness in the event of a problem in
-- * the I/O system. If we find that we ever end up spinning here
-- * we are going to have to do some serious work to recover.
-- * Just returning without reading the data will cause a crash.
-- */
-- while (bread == 0) {
-- bread = (*env)->CallIntMethod(env,
-- scalerInfo->font2D,
-- sunFontIDs.ttReadBlockMID,
-- bBuffer, offset, numBytes);
-- }
-+ bread = (*env)->CallIntMethod(env,
-+ scalerInfo->font2D,
-+ sunFontIDs.ttReadBlockMID,
-+ bBuffer, offset, numBytes);
- return bread;
- } else {
- /* We probably hit bug bug 4845371. For reasons that
-@@ -224,19 +216,10 @@
- (offset + FILEDATACACHESIZE > scalerInfo->fileSize) ?
- scalerInfo->fileSize - offset : FILEDATACACHESIZE;
- bBuffer = scalerInfo->directBuffer;
-- /* Loop until all the read succeeds (or EOF).
-- * This should improve robustness in the event of a problem in
-- * the I/O system. If we find that we ever end up spinning here
-- * we are going to have to do some serious work to recover.
-- * Just returning without reading the data will cause a crash.
-- */
-- while (bread == 0) {
-- bread = (*env)->CallIntMethod(env, scalerInfo->font2D,
-- sunFontIDs.ttReadBlockMID,
-- bBuffer, offset,
-- scalerInfo->fontDataLength);
-- }
--
-+ bread = (*env)->CallIntMethod(env, scalerInfo->font2D,
-+ sunFontIDs.ttReadBlockMID,
-+ bBuffer, offset,
-+ scalerInfo->fontDataLength);
- memcpy(destBuffer, scalerInfo->fontData, numBytes);
- return numBytes;
- }
---- ./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-07-15 21:49:32.000000000 -0700
-@@ -55,7 +55,7 @@
- (const AlternateSetTable *) ((char *) this + alternateSetTableOffset));
- TTGlyphID alternate = SWAPW(alternateSetTable->alternateArray[0]);
-
-- if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, alternate))) {
-+ if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, alternate), success)) {
- glyphIterator->setCurrGlyphID(SWAPW(alternateSetTable->alternateArray[0]));
- }
-
---- ./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-07-15 21:49:32.000000000 -0700
-@@ -37,55 +37,54 @@
-
- U_NAMESPACE_BEGIN
-
--void AnchorTable::getAnchor(LEGlyphID glyphID, const LEFontInstance *fontInstance,
-- LEPoint &anchor) const
-+void AnchorTable::getAnchor(const LETableReference &base, LEGlyphID glyphID, const LEFontInstance *fontInstance,
-+ LEPoint &anchor, LEErrorCode &success) const
- {
- switch(SWAPW(anchorFormat)) {
- case 1:
- {
-- const Format1AnchorTable *f1 = (const Format1AnchorTable *) this;
--
-- f1->getAnchor(fontInstance, anchor);
-+ LEReferenceTo<Format1AnchorTable> f1(base, success);
-+ f1->getAnchor(f1, fontInstance, anchor, success);
- break;
- }
-
- case 2:
- {
-- const Format2AnchorTable *f2 = (const Format2AnchorTable *) this;
--
-- f2->getAnchor(glyphID, fontInstance, anchor);
-+ LEReferenceTo<Format2AnchorTable> f2(base, success);
-+ f2->getAnchor(f2, glyphID, fontInstance, anchor, success);
- break;
- }
-
- case 3:
- {
-- const Format3AnchorTable *f3 = (const Format3AnchorTable *) this;
--
-- f3->getAnchor(fontInstance, anchor);
-+ LEReferenceTo<Format3AnchorTable> f3(base, success);
-+ f3->getAnchor(f3, fontInstance, anchor, success);
- break;
- }
-
- default:
-+ {
- // unknown format: just use x, y coordinate, like format 1...
-- const Format1AnchorTable *f1 = (const Format1AnchorTable *) this;
--
-- f1->getAnchor(fontInstance, anchor);
-+ LEReferenceTo<Format1AnchorTable> f1(base, success);
-+ f1->getAnchor(f1, fontInstance, anchor, success);
- break;
- }
- }
-+}
-
--void Format1AnchorTable::getAnchor(const LEFontInstance *fontInstance, LEPoint &anchor) const
-+void Format1AnchorTable::getAnchor(const LEReferenceTo<Format1AnchorTable>& base, const LEFontInstance *fontInstance, LEPoint &anchor, LEErrorCode &success) const
- {
- le_int16 x = SWAPW(xCoordinate);
- le_int16 y = SWAPW(yCoordinate);
- LEPoint pixels;
-
- fontInstance->transformFunits(x, y, pixels);
--
- fontInstance->pixelsToUnits(pixels, anchor);
- }
-
--void Format2AnchorTable::getAnchor(LEGlyphID glyphID, const LEFontInstance *fontInstance, LEPoint &anchor) const
-+void Format2AnchorTable::getAnchor(const LEReferenceTo<Format2AnchorTable>& base,
-+ LEGlyphID glyphID, const LEFontInstance *fontInstance, LEPoint &anchor
-+ , LEErrorCode &success) const
- {
- LEPoint point;
-
-@@ -100,7 +99,8 @@
- fontInstance->pixelsToUnits(point, anchor);
- }
-
--void Format3AnchorTable::getAnchor(const LEFontInstance *fontInstance, LEPoint &anchor) const
-+void Format3AnchorTable::getAnchor(const LEReferenceTo<Format3AnchorTable> &base, const LEFontInstance *fontInstance,
-+ LEPoint &anchor, LEErrorCode &success) const
- {
- le_int16 x = SWAPW(xCoordinate);
- le_int16 y = SWAPW(yCoordinate);
-@@ -111,15 +111,15 @@
- fontInstance->transformFunits(x, y, pixels);
-
- if (dtxOffset != 0) {
-- const DeviceTable *dtx = (const DeviceTable *) ((char *) this + dtxOffset);
-- le_int16 adjx = dtx->getAdjustment((le_int16) fontInstance->getXPixelsPerEm());
-+ LEReferenceTo<DeviceTable> dt(base, success, dtxOffset);
-+ le_int16 adjx = dt->getAdjustment(dt, (le_int16) fontInstance->getXPixelsPerEm(), success);
-
- pixels.fX += adjx;
- }
-
- if (dtyOffset != 0) {
-- const DeviceTable *dty = (const DeviceTable *) ((char *) this + dtyOffset);
-- le_int16 adjy = dty->getAdjustment((le_int16) fontInstance->getYPixelsPerEm());
-+ LEReferenceTo<DeviceTable> dt(base, success, dtyOffset);
-+ le_int16 adjy = dt->getAdjustment(dt, (le_int16) fontInstance->getYPixelsPerEm(), success);
-
- 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-07-15 21:49:32.000000000 -0700
-@@ -49,20 +49,23 @@
- le_int16 xCoordinate;
- le_int16 yCoordinate;
-
-- void getAnchor(LEGlyphID glyphID, const LEFontInstance *fontInstance,
-- LEPoint &anchor) const;
-+ void getAnchor(const LETableReference &base, LEGlyphID glyphID, const LEFontInstance *fontInstance,
-+ LEPoint &anchor, LEErrorCode &success) const;
- };
-
- struct Format1AnchorTable : AnchorTable
- {
-- void getAnchor(const LEFontInstance *fontInstance, LEPoint &anchor) const;
-+ void getAnchor(const LEReferenceTo<Format1AnchorTable>& base,
-+ const LEFontInstance *fontInstance, LEPoint &anchor, LEErrorCode &success) const;
- };
-
- struct Format2AnchorTable : AnchorTable
- {
- le_uint16 anchorPoint;
-
-- void getAnchor(LEGlyphID glyphID, const LEFontInstance *fontInstance, LEPoint &anchor) const;
-+ void getAnchor(const LEReferenceTo<Format2AnchorTable>& base,
-+ LEGlyphID glyphID, const LEFontInstance *fontInstance,
-+ LEPoint &anchor, LEErrorCode &success) const;
- };
-
- struct Format3AnchorTable : AnchorTable
-@@ -70,7 +73,9 @@
- Offset xDeviceTableOffset;
- Offset yDeviceTableOffset;
-
-- void getAnchor(const LEFontInstance *fontInstance, LEPoint &anchor) const;
-+ void getAnchor(const LEReferenceTo<Format3AnchorTable>& base,
-+ const LEFontInstance *fontInstance, LEPoint &anchor,
-+ LEErrorCode &success) const;
- };
-
- 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-07-15 21:49:32.000000000 -0700
-@@ -51,7 +51,7 @@
-
- U_NAMESPACE_BEGIN
-
--le_bool CharSubstitutionFilter::accept(LEGlyphID glyph) const
-+le_bool CharSubstitutionFilter::accept(LEGlyphID glyph, LEErrorCode &/*success*/) const
- {
- return fFontInstance->canDisplay((LEUnicode) glyph);
- }
-@@ -147,7 +147,9 @@
- GDEFMarkFilter filter(fGDEFTable, success);
- adjustMarkGlyphs(glyphStorage, &filter, success);
- } else {
-- LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(CanonShaping::glyphDefinitionTable, CanonShaping::glyphDefinitionTableLen);
-+ LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(LETableReference::kStaticData,
-+ CanonShaping::glyphDefinitionTable,
-+ CanonShaping::glyphDefinitionTableLen);
- GDEFMarkFilter filter(gdefTable, success);
-
- adjustMarkGlyphs(&chars[offset], count, reverse, glyphStorage, &filter, success);
-@@ -157,8 +159,8 @@
- UnicodeArabicOpenTypeLayoutEngine::UnicodeArabicOpenTypeLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, le_int32 typoFlags, LEErrorCode &success)
- : ArabicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags | LE_CHAR_FILTER_FEATURE_FLAG, success)
- {
-- fGSUBTable = (const GlyphSubstitutionTableHeader *) CanonShaping::glyphSubstitutionTable;
-- fGDEFTable = (const GlyphDefinitionTableHeader *) CanonShaping::glyphDefinitionTable;
-+ fGSUBTable.setTo(LETableReference::kStaticData, (const GlyphSubstitutionTableHeader *) CanonShaping::glyphSubstitutionTable, CanonShaping::glyphSubstitutionTableLen);
-+ fGDEFTable.setTo(LETableReference::kStaticData, (const GlyphDefinitionTableHeader *) CanonShaping::glyphDefinitionTable, CanonShaping::glyphDefinitionTableLen);
- /* OpenTypeLayoutEngine will allocate a substitution filter */
- }
-
---- ./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-07-15 21:49:32.000000000 -0700
-@@ -59,7 +59,8 @@
- ArabicShaping::ShapeType ArabicShaping::getShapeType(LEUnicode c)
- {
- LEErrorCode success = LE_NO_ERROR;
-- const LEReferenceTo<ClassDefinitionTable> joiningTypes((const ClassDefinitionTable *) ArabicShaping::shapingTypeTable,
-+ const LEReferenceTo<ClassDefinitionTable> joiningTypes(LETableReference::kStaticData,
-+ (const ClassDefinitionTable *) ArabicShaping::shapingTypeTable,
- ArabicShaping::shapingTypeTableLen);
- 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-07-15 21:49:33.000000000 -0700
-@@ -60,7 +60,7 @@
- LEUnicode *outChars, LEGlyphStorage &glyphStorage)
- {
- LEErrorCode success = LE_NO_ERROR;
-- LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(CanonShaping::glyphDefinitionTable, CanonShaping::glyphDefinitionTableLen);
-+ LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(LETableReference::kStaticData, CanonShaping::glyphDefinitionTable, CanonShaping::glyphDefinitionTableLen);
- LEReferenceTo<ClassDefinitionTable> classTable = gdefTable->getMarkAttachClassDefinitionTable(gdefTable, success);
- 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-07-15 21:49:33.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.
- *
-+ * Note: Implementation is in ArabicLayoutEngine.cpp
-+ *
- * @internal
- */
- class CharSubstitutionFilter : public UMemory, public LEGlyphFilter
-@@ -97,7 +99,7 @@
- *
- * @internal
- */
-- le_bool accept(LEGlyphID glyph) const;
-+ le_bool accept(LEGlyphID glyph, LEErrorCode &success) const;
- };
-
- 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-07-15 21:49:33.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;
-
-+#if LE_ENABLE_RAW
- le_int32 getGlyphClass(LEGlyphID glyphID) const {
- LETableReference base((const le_uint8*)this);
- LEErrorCode ignored = LE_NO_ERROR;
-@@ -60,6 +61,7 @@
- LEErrorCode ignored = LE_NO_ERROR;
- return hasGlyphClass(base,glyphClass,ignored);
- }
-+#endif
- };
-
- 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-07-15 21:49:33.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-10-28 20:19:45.000000000 -0700
-@@ -48,7 +48,7 @@
- */
- void ContextualSubstitutionBase::applySubstitutionLookups(
- const LookupProcessor *lookupProcessor,
-- const SubstitutionLookupRecord *substLookupRecordArray,
-+ const LEReferenceToArrayOf<SubstitutionLookupRecord>& substLookupRecordArray,
- le_uint16 substCount,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
-@@ -60,10 +60,11 @@
- }
-
- GlyphIterator tempIterator(*glyphIterator);
-+ const SubstitutionLookupRecord *substLookupRecordArrayPtr = substLookupRecordArray.getAlias(); // OK to dereference, range checked against substCount below.
-
- for (le_int16 subst = 0; subst < substCount && LE_SUCCESS(success); subst += 1) {
-- le_uint16 sequenceIndex = SWAPW(substLookupRecordArray[subst].sequenceIndex);
-- le_uint16 lookupListIndex = SWAPW(substLookupRecordArray[subst].lookupListIndex);
-+ le_uint16 sequenceIndex = SWAPW(substLookupRecordArrayPtr[subst].sequenceIndex);
-+ le_uint16 lookupListIndex = SWAPW(substLookupRecordArrayPtr[subst].lookupListIndex);
-
- tempIterator.setCurrStreamPosition(position);
- tempIterator.next(sequenceIndex);
-@@ -72,7 +73,7 @@
- }
- }
-
--le_bool ContextualSubstitutionBase::matchGlyphIDs(const TTGlyphID *glyphArray, le_uint16 glyphCount,
-+le_bool ContextualSubstitutionBase::matchGlyphIDs(const LEReferenceToArrayOf<TTGlyphID>& glyphArray, le_uint16 glyphCount,
- GlyphIterator *glyphIterator, le_bool backtrack)
- {
- le_int32 direction = 1;
-@@ -101,11 +102,16 @@
- return TRUE;
- }
-
--le_bool ContextualSubstitutionBase::matchGlyphClasses(const le_uint16 *classArray, le_uint16 glyphCount,
-+le_bool ContextualSubstitutionBase::matchGlyphClasses(
-+ const LEReferenceToArrayOf<le_uint16> &classArray,
-+ le_uint16 glyphCount,
- GlyphIterator *glyphIterator,
-- const ClassDefinitionTable *classDefinitionTable,
-+ const LEReferenceTo<ClassDefinitionTable> &classDefinitionTable,
-+ LEErrorCode &success,
- le_bool backtrack)
- {
-+ if (LE_FAILURE(success)) { return FALSE; }
-+
- le_int32 direction = 1;
- le_int32 match = 0;
-
-@@ -120,7 +126,7 @@
- }
-
- LEGlyphID glyph = glyphIterator->getCurrGlyphID();
-- le_int32 glyphClass = classDefinitionTable->getGlyphClass(glyph);
-+ le_int32 glyphClass = classDefinitionTable->getGlyphClass(classDefinitionTable, glyph, success);
- le_int32 matchClass = SWAPW(classArray[match]);
-
- if (glyphClass != matchClass) {
-@@ -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.
-- if (classDefinitionTable->hasGlyphClass(matchClass)) {
-+ if (classDefinitionTable->hasGlyphClass(classDefinitionTable, matchClass, success)) {
- return FALSE;
- }
- }
-@@ -140,8 +146,8 @@
- return TRUE;
- }
-
--le_bool ContextualSubstitutionBase::matchGlyphCoverages(const Offset *coverageTableOffsetArray, le_uint16 glyphCount,
-- GlyphIterator *glyphIterator, const char *offsetBase, le_bool backtrack)
-+le_bool ContextualSubstitutionBase::matchGlyphCoverages(const LEReferenceToArrayOf<Offset> &coverageTableOffsetArray, le_uint16 glyphCount,
-+GlyphIterator *glyphIterator, const LETableReference &offsetBase, LEErrorCode &success, le_bool backtrack)
- {
- le_int32 direction = 1;
- le_int32 glyph = 0;
-@@ -153,13 +159,15 @@
-
- while (glyphCount > 0) {
- Offset coverageTableOffset = SWAPW(coverageTableOffsetArray[glyph]);
-- const CoverageTable *coverageTable = (const CoverageTable *) (offsetBase + coverageTableOffset);
-+ LEReferenceTo<CoverageTable> coverageTable(offsetBase, success, coverageTableOffset);
-
-- if (! glyphIterator->next()) {
-+ if (LE_FAILURE(success) || ! glyphIterator->next()) {
- return FALSE;
- }
-
-- if (coverageTable->getGlyphCoverage((LEGlyphID) glyphIterator->getCurrGlyphID()) < 0) {
-+ if (coverageTable->getGlyphCoverage(coverageTable,
-+ (LEGlyphID) glyphIterator->getCurrGlyphID(),
-+ success) < 0) {
- return FALSE;
- }
-
-@@ -170,7 +178,7 @@
- return TRUE;
- }
-
--le_uint32 ContextualSubstitutionSubtable::process(const LookupProcessor *lookupProcessor,
-+le_uint32 ContextualSubstitutionSubtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
- LEErrorCode& success) const
-@@ -186,20 +194,29 @@
-
- case 1:
- {
-- const ContextualSubstitutionFormat1Subtable *subtable = (const ContextualSubstitutionFormat1Subtable *) this;
-- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
-+ LEReferenceTo<ContextualSubstitutionFormat1Subtable> subtable(base, success, (const ContextualSubstitutionFormat1Subtable *) this);
-+ if( LE_FAILURE(success) ) {
-+ return 0;
-+ }
-+ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
- }
-
- case 2:
- {
-- const ContextualSubstitutionFormat2Subtable *subtable = (const ContextualSubstitutionFormat2Subtable *) this;
-- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
-+ LEReferenceTo<ContextualSubstitutionFormat2Subtable> subtable(base, success, (const ContextualSubstitutionFormat2Subtable *) this);
-+ if( LE_FAILURE(success) ) {
-+ return 0;
-+ }
-+ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
- }
-
- case 3:
- {
-- const ContextualSubstitutionFormat3Subtable *subtable = (const ContextualSubstitutionFormat3Subtable *) this;
-- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
-+ LEReferenceTo<ContextualSubstitutionFormat3Subtable> subtable(base, success, (const ContextualSubstitutionFormat3Subtable *) this);
-+ if( LE_FAILURE(success) ) {
-+ return 0;
-+ }
-+ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
- }
-
- default:
-@@ -207,7 +224,7 @@
- }
- }
-
--le_uint32 ContextualSubstitutionFormat1Subtable::process(const LookupProcessor *lookupProcessor,
-+le_uint32 ContextualSubstitutionFormat1Subtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
- LEErrorCode& success) const
-@@ -226,23 +243,34 @@
- le_uint16 srSetCount = SWAPW(subRuleSetCount);
-
- if (coverageIndex < srSetCount) {
-+ LEReferenceToArrayOf<Offset> subRuleSetTableOffsetArrayRef(base, success,
-+ &subRuleSetTableOffsetArray[coverageIndex], 1);
-+ if (LE_FAILURE(success)) {
-+ return 0;
-+ }
- Offset subRuleSetTableOffset = SWAPW(subRuleSetTableOffsetArray[coverageIndex]);
-- const SubRuleSetTable *subRuleSetTable =
-- (const SubRuleSetTable *) ((char *) this + subRuleSetTableOffset);
-+ LEReferenceTo<SubRuleSetTable>
-+ subRuleSetTable(base, success, (const SubRuleSetTable *) ((char *) this + subRuleSetTableOffset));
- le_uint16 subRuleCount = SWAPW(subRuleSetTable->subRuleCount);
- le_int32 position = glyphIterator->getCurrStreamPosition();
-
-+ LEReferenceToArrayOf<Offset> subRuleTableOffsetArrayRef(base, success,
-+ subRuleSetTable->subRuleTableOffsetArray, subRuleCount);
-+ if (LE_FAILURE(success)) {
-+ return 0;
-+ }
- for (le_uint16 subRule = 0; subRule < subRuleCount; subRule += 1) {
- Offset subRuleTableOffset =
- SWAPW(subRuleSetTable->subRuleTableOffsetArray[subRule]);
-- const SubRuleTable *subRuleTable =
-- (const SubRuleTable *) ((char *) subRuleSetTable + subRuleTableOffset);
-+ LEReferenceTo<SubRuleTable>
-+ subRuleTable(subRuleSetTable, success, subRuleTableOffset);
- le_uint16 matchCount = SWAPW(subRuleTable->glyphCount) - 1;
- le_uint16 substCount = SWAPW(subRuleTable->substCount);
--
-- if (matchGlyphIDs(subRuleTable->inputGlyphArray, matchCount, glyphIterator)) {
-- 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 +287,8 @@
- return 0;
- }
-
--le_uint32 ContextualSubstitutionFormat2Subtable::process(const LookupProcessor *lookupProcessor,
-+le_uint32 ContextualSubstitutionFormat2Subtable::process(const LETableReference &base,
-+ const LookupProcessor *lookupProcessor,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
- LEErrorCode& success) const
-@@ -275,29 +304,43 @@
- }
-
- if (coverageIndex >= 0) {
-- const ClassDefinitionTable *classDefinitionTable =
-- (const ClassDefinitionTable *) ((char *) this + SWAPW(classDefTableOffset));
-+ LEReferenceTo<ClassDefinitionTable> classDefinitionTable(base, success,
-+ (const ClassDefinitionTable *) ((char *) this + SWAPW(classDefTableOffset)));
- le_uint16 scSetCount = SWAPW(subClassSetCount);
-- le_int32 setClass = classDefinitionTable->getGlyphClass(glyphIterator->getCurrGlyphID());
-+ le_int32 setClass = classDefinitionTable->getGlyphClass(classDefinitionTable,
-+ glyphIterator->getCurrGlyphID(),
-+ success);
-+
-+ if (setClass < scSetCount) {
-+ LEReferenceToArrayOf<Offset>
-+ subClassSetTableOffsetArrayRef(base, success, subClassSetTableOffsetArray, setClass);
-+ if (LE_FAILURE(success)) { return 0; }
-+ if (subClassSetTableOffsetArray[setClass] != 0) {
-
-- if (setClass < scSetCount && subClassSetTableOffsetArray[setClass] != 0) {
- Offset subClassSetTableOffset = SWAPW(subClassSetTableOffsetArray[setClass]);
-- const SubClassSetTable *subClassSetTable =
-- (const SubClassSetTable *) ((char *) this + subClassSetTableOffset);
-+ LEReferenceTo<SubClassSetTable>
-+ subClassSetTable(base, success, (const SubClassSetTable *) ((char *) this + subClassSetTableOffset));
- le_uint16 subClassRuleCount = SWAPW(subClassSetTable->subClassRuleCount);
- le_int32 position = glyphIterator->getCurrStreamPosition();
--
-+ LEReferenceToArrayOf<Offset>
-+ subClassRuleTableOffsetArrayRef(base, success, subClassSetTable->subClassRuleTableOffsetArray, subClassRuleCount);
-+ if (LE_FAILURE(success)) {
-+ return 0;
-+ }
- for (le_uint16 scRule = 0; scRule < subClassRuleCount; scRule += 1) {
- Offset subClassRuleTableOffset =
- SWAPW(subClassSetTable->subClassRuleTableOffsetArray[scRule]);
-- const SubClassRuleTable *subClassRuleTable =
-- (const SubClassRuleTable *) ((char *) subClassSetTable + subClassRuleTableOffset);
-+ LEReferenceTo<SubClassRuleTable>
-+ subClassRuleTable(subClassSetTable, success, subClassRuleTableOffset);
- le_uint16 matchCount = SWAPW(subClassRuleTable->glyphCount) - 1;
- le_uint16 substCount = SWAPW(subClassRuleTable->substCount);
-
-- if (matchGlyphClasses(subClassRuleTable->classArray, matchCount, glyphIterator, classDefinitionTable)) {
-- const SubstitutionLookupRecord *substLookupRecordArray =
-- (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);
-
-@@ -307,6 +350,7 @@
- glyphIterator->setCurrStreamPosition(position);
- }
- }
-+ }
-
- // XXX If we get here, the table is mal-formed...
- }
-@@ -314,7 +358,8 @@
- return 0;
- }
-
--le_uint32 ContextualSubstitutionFormat3Subtable::process(const LookupProcessor *lookupProcessor,
-+le_uint32 ContextualSubstitutionFormat3Subtable::process(const LETableReference &base,
-+ const LookupProcessor *lookupProcessor,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
- LEErrorCode& success)const
-@@ -333,9 +378,13 @@
- // that matched when we're done.
- glyphIterator->prev();
-
-- if (ContextualSubstitutionBase::matchGlyphCoverages(coverageTableOffsetArray, gCount, glyphIterator, (const char *) this)) {
-- const SubstitutionLookupRecord *substLookupRecordArray =
-- (const SubstitutionLookupRecord *) &coverageTableOffsetArray[gCount];
-+ LEReferenceToArrayOf<Offset> covTableOffsetArray(base, success, coverageTableOffsetArray, gCount);
-+
-+ if( LE_FAILURE(success) ) { return 0; }
-+
-+ if (ContextualSubstitutionBase::matchGlyphCoverages(covTableOffsetArray, gCount, glyphIterator, base, success)) {
-+ LEReferenceToArrayOf<SubstitutionLookupRecord>
-+ substLookupRecordArray(base, success, (const SubstitutionLookupRecord *) &coverageTableOffsetArray[gCount], subCount);
-
- ContextualSubstitutionBase::applySubstitutionLookups(lookupProcessor, substLookupRecordArray, subCount, glyphIterator, fontInstance, position, success);
-
-@@ -347,7 +396,8 @@
- return 0;
- }
-
--le_uint32 ChainingContextualSubstitutionSubtable::process(const LookupProcessor *lookupProcessor,
-+le_uint32 ChainingContextualSubstitutionSubtable::process(const LEReferenceTo<ChainingContextualSubstitutionSubtable> &base,
-+ const LookupProcessor *lookupProcessor,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
- LEErrorCode& success) const
-@@ -363,20 +413,23 @@
-
- case 1:
- {
-- const ChainingContextualSubstitutionFormat1Subtable *subtable = (const ChainingContextualSubstitutionFormat1Subtable *) this;
-- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
-+ LEReferenceTo<ChainingContextualSubstitutionFormat1Subtable> subtable(base, success, (ChainingContextualSubstitutionFormat1Subtable *) this);
-+ if(LE_FAILURE(success)) return 0;
-+ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
- }
-
- case 2:
- {
-- const ChainingContextualSubstitutionFormat2Subtable *subtable = (const ChainingContextualSubstitutionFormat2Subtable *) this;
-- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
-+ LEReferenceTo<ChainingContextualSubstitutionFormat2Subtable> subtable(base, success, (const ChainingContextualSubstitutionFormat2Subtable *) this);
-+ if( LE_FAILURE(success) ) { return 0; }
-+ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
- }
-
- case 3:
- {
-- const ChainingContextualSubstitutionFormat3Subtable *subtable = (const ChainingContextualSubstitutionFormat3Subtable *) this;
-- return subtable->process(lookupProcessor, glyphIterator, fontInstance, success);
-+ LEReferenceTo<ChainingContextualSubstitutionFormat3Subtable> subtable(base, success, (const ChainingContextualSubstitutionFormat3Subtable *) this);
-+ if( LE_FAILURE(success) ) { return 0; }
-+ return subtable->process(subtable, lookupProcessor, glyphIterator, fontInstance, success);
- }
-
- default:
-@@ -390,7 +443,7 @@
- // emptyFeatureList matches an le_uint32 or an le_uint16...
- static const FeatureMask emptyFeatureList = 0x00000000UL;
-
--le_uint32 ChainingContextualSubstitutionFormat1Subtable::process(const LookupProcessor *lookupProcessor,
-+le_uint32 ChainingContextualSubstitutionFormat1Subtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
- LEErrorCode& success) const
-@@ -409,23 +462,38 @@
- le_uint16 srSetCount = SWAPW(chainSubRuleSetCount);
-
- if (coverageIndex < srSetCount) {
-+ LEReferenceToArrayOf<Offset>
-+ chainSubRuleSetTableOffsetArrayRef(base, success, chainSubRuleSetTableOffsetArray, coverageIndex);
-+ if (LE_FAILURE(success)) {
-+ return 0;
-+ }
- Offset chainSubRuleSetTableOffset = SWAPW(chainSubRuleSetTableOffsetArray[coverageIndex]);
-- const ChainSubRuleSetTable *chainSubRuleSetTable =
-- (const ChainSubRuleSetTable *) ((char *) this + chainSubRuleSetTableOffset);
-+ LEReferenceTo<ChainSubRuleSetTable>
-+ chainSubRuleSetTable(base, success, (const ChainSubRuleSetTable *) ((char *) this + chainSubRuleSetTableOffset));
- le_uint16 chainSubRuleCount = SWAPW(chainSubRuleSetTable->chainSubRuleCount);
- le_int32 position = glyphIterator->getCurrStreamPosition();
- GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
--
-+ LEReferenceToArrayOf<Offset>
-+ chainSubRuleTableOffsetArrayRef(base, success, chainSubRuleSetTable->chainSubRuleTableOffsetArray, chainSubRuleCount);
-+ if (LE_FAILURE(success)) {
-+ return 0;
-+ }
- for (le_uint16 subRule = 0; subRule < chainSubRuleCount; subRule += 1) {
- Offset chainSubRuleTableOffset =
- SWAPW(chainSubRuleSetTable->chainSubRuleTableOffsetArray[subRule]);
-- const ChainSubRuleTable *chainSubRuleTable =
-- (const ChainSubRuleTable *) ((char *) chainSubRuleSetTable + chainSubRuleTableOffset);
-+ LEReferenceTo<ChainSubRuleTable>
-+ chainSubRuleTable = LEReferenceTo<ChainSubRuleTable>(chainSubRuleSetTable, success, chainSubRuleTableOffset);
-+ if( LE_FAILURE(success) ) { return 0; }
- le_uint16 backtrackGlyphCount = SWAPW(chainSubRuleTable->backtrackGlyphCount);
-+ LEReferenceToArrayOf<TTGlyphID> backtrackGlyphArray(base, success, chainSubRuleTable->backtrackGlyphArray, backtrackGlyphCount);
-+ if( LE_FAILURE(success) ) { return 0; }
- le_uint16 inputGlyphCount = (le_uint16) SWAPW(chainSubRuleTable->backtrackGlyphArray[backtrackGlyphCount]) - 1;
-- const TTGlyphID *inputGlyphArray = &chainSubRuleTable->backtrackGlyphArray[backtrackGlyphCount + 1];
-+ LEReferenceToArrayOf<TTGlyphID> inputGlyphArray(base, success, &chainSubRuleTable->backtrackGlyphArray[backtrackGlyphCount + 1], inputGlyphCount+2);
-+
-+ if( LE_FAILURE(success) ) { return 0; }
- le_uint16 lookaheadGlyphCount = (le_uint16) SWAPW(inputGlyphArray[inputGlyphCount]);
-- const TTGlyphID *lookaheadGlyphArray = &inputGlyphArray[inputGlyphCount + 1];
-+ LEReferenceToArrayOf<TTGlyphID> lookaheadGlyphArray(base, success, inputGlyphArray.getAlias(inputGlyphCount + 1,success), lookaheadGlyphCount+2);
-+ if( LE_FAILURE(success) ) { return 0; }
- le_uint16 substCount = (le_uint16) SWAPW(lookaheadGlyphArray[lookaheadGlyphCount]);
-
- tempIterator.setCurrStreamPosition(position);
-@@ -435,7 +503,8 @@
- }
-
- tempIterator.prev();
-- if (! matchGlyphIDs(chainSubRuleTable->backtrackGlyphArray, backtrackGlyphCount, &tempIterator, TRUE)) {
-+
-+ if (! matchGlyphIDs(backtrackGlyphArray, backtrackGlyphCount, &tempIterator, TRUE)) {
- continue;
- }
-
-@@ -446,8 +515,8 @@
- }
-
- if (matchGlyphIDs(inputGlyphArray, inputGlyphCount, glyphIterator)) {
-- const SubstitutionLookupRecord *substLookupRecordArray =
-- (const SubstitutionLookupRecord *) &lookaheadGlyphArray[lookaheadGlyphCount + 1];
-+ LEReferenceToArrayOf<SubstitutionLookupRecord>
-+ substLookupRecordArray(base, success, (const SubstitutionLookupRecord *) lookaheadGlyphArray.getAlias(lookaheadGlyphCount + 1,success), substCount);
-
- applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success);
-
-@@ -464,7 +533,7 @@
- return 0;
- }
-
--le_uint32 ChainingContextualSubstitutionFormat2Subtable::process(const LookupProcessor *lookupProcessor,
-+le_uint32 ChainingContextualSubstitutionFormat2Subtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
- LEErrorCode& success) const
-@@ -480,33 +549,46 @@
- }
-
- if (coverageIndex >= 0) {
-- const ClassDefinitionTable *backtrackClassDefinitionTable =
-- (const ClassDefinitionTable *) ((char *) this + SWAPW(backtrackClassDefTableOffset));
-- const ClassDefinitionTable *inputClassDefinitionTable =
-- (const ClassDefinitionTable *) ((char *) this + SWAPW(inputClassDefTableOffset));
-- const ClassDefinitionTable *lookaheadClassDefinitionTable =
-- (const ClassDefinitionTable *) ((char *) this + SWAPW(lookaheadClassDefTableOffset));
-+ LEReferenceTo<ClassDefinitionTable>
-+ backtrackClassDefinitionTable(base, success, (const ClassDefinitionTable *) ((char *) this + SWAPW(backtrackClassDefTableOffset)));
-+ LEReferenceTo<ClassDefinitionTable>
-+ inputClassDefinitionTable(base, success, (const ClassDefinitionTable *) ((char *) this + SWAPW(inputClassDefTableOffset)));
-+ LEReferenceTo<ClassDefinitionTable>
-+ lookaheadClassDefinitionTable(base, success, (const ClassDefinitionTable *) ((char *) this + SWAPW(lookaheadClassDefTableOffset)));
- le_uint16 scSetCount = SWAPW(chainSubClassSetCount);
-- le_int32 setClass = inputClassDefinitionTable->getGlyphClass(glyphIterator->getCurrGlyphID());
-+ le_int32 setClass = inputClassDefinitionTable->getGlyphClass(inputClassDefinitionTable,
-+ glyphIterator->getCurrGlyphID(),
-+ success);
-+ LEReferenceToArrayOf<Offset>
-+ chainSubClassSetTableOffsetArrayRef(base, success, chainSubClassSetTableOffsetArray, setClass);
-+ if (LE_FAILURE(success)) {
-+ return 0;
-+ }
-
- if (setClass < scSetCount && chainSubClassSetTableOffsetArray[setClass] != 0) {
- Offset chainSubClassSetTableOffset = SWAPW(chainSubClassSetTableOffsetArray[setClass]);
-- const ChainSubClassSetTable *chainSubClassSetTable =
-- (const ChainSubClassSetTable *) ((char *) this + chainSubClassSetTableOffset);
-+ LEReferenceTo<ChainSubClassSetTable>
-+ chainSubClassSetTable(base, success, (const ChainSubClassSetTable *) ((char *) this + chainSubClassSetTableOffset));
- le_uint16 chainSubClassRuleCount = SWAPW(chainSubClassSetTable->chainSubClassRuleCount);
- le_int32 position = glyphIterator->getCurrStreamPosition();
- GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
--
-+ LEReferenceToArrayOf<Offset>
-+ chainSubClassRuleTableOffsetArrayRef(base, success, chainSubClassSetTable->chainSubClassRuleTableOffsetArray, chainSubClassRuleCount);
-+ if (LE_FAILURE(success)) {
-+ return 0;
-+ }
- for (le_uint16 scRule = 0; scRule < chainSubClassRuleCount; scRule += 1) {
- Offset chainSubClassRuleTableOffset =
- SWAPW(chainSubClassSetTable->chainSubClassRuleTableOffsetArray[scRule]);
-- const ChainSubClassRuleTable *chainSubClassRuleTable =
-- (const ChainSubClassRuleTable *) ((char *) chainSubClassSetTable + chainSubClassRuleTableOffset);
-+ LEReferenceTo<ChainSubClassRuleTable>
-+ chainSubClassRuleTable(chainSubClassSetTable, success, chainSubClassRuleTableOffset);
- le_uint16 backtrackGlyphCount = SWAPW(chainSubClassRuleTable->backtrackGlyphCount);
- le_uint16 inputGlyphCount = SWAPW(chainSubClassRuleTable->backtrackClassArray[backtrackGlyphCount]) - 1;
-- const le_uint16 *inputClassArray = &chainSubClassRuleTable->backtrackClassArray[backtrackGlyphCount + 1];
-- le_uint16 lookaheadGlyphCount = SWAPW(inputClassArray[inputGlyphCount]);
-- const le_uint16 *lookaheadClassArray = &inputClassArray[inputGlyphCount + 1];
-+ LEReferenceToArrayOf<le_uint16> inputClassArray(base, success, &chainSubClassRuleTable->backtrackClassArray[backtrackGlyphCount + 1],inputGlyphCount+2); // +2 for the lookaheadGlyphCount count
-+ le_uint16 lookaheadGlyphCount = SWAPW(inputClassArray.getObject(inputGlyphCount, success));
-+ LEReferenceToArrayOf<le_uint16> lookaheadClassArray(base, success, inputClassArray.getAlias(inputGlyphCount + 1,success), lookaheadGlyphCount+2); // +2 for the substCount
-+
-+ if( LE_FAILURE(success) ) { return 0; }
- le_uint16 substCount = SWAPW(lookaheadClassArray[lookaheadGlyphCount]);
-
-
-@@ -517,21 +599,23 @@
- }
-
- tempIterator.prev();
-- if (! matchGlyphClasses(chainSubClassRuleTable->backtrackClassArray, backtrackGlyphCount,
-- &tempIterator, backtrackClassDefinitionTable, TRUE)) {
-+ LEReferenceToArrayOf<le_uint16> backtrackClassArray(base, success, chainSubClassRuleTable->backtrackClassArray, backtrackGlyphCount);
-+ if( LE_FAILURE(success) ) { return 0; }
-+ if (! matchGlyphClasses(backtrackClassArray, backtrackGlyphCount,
-+ &tempIterator, backtrackClassDefinitionTable, success, TRUE)) {
- continue;
- }
-
- tempIterator.setCurrStreamPosition(position);
- tempIterator.next(inputGlyphCount);
-- if (! matchGlyphClasses(lookaheadClassArray, lookaheadGlyphCount, &tempIterator, lookaheadClassDefinitionTable)) {
-+ if (! matchGlyphClasses(lookaheadClassArray, lookaheadGlyphCount, &tempIterator, lookaheadClassDefinitionTable, success)) {
- continue;
- }
-
-- 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);
-
- return inputGlyphCount + 1;
-@@ -547,7 +631,7 @@
- return 0;
- }
-
--le_uint32 ChainingContextualSubstitutionFormat3Subtable::process(const LookupProcessor *lookupProcessor,
-+le_uint32 ChainingContextualSubstitutionFormat3Subtable::process(const LETableReference &base, const LookupProcessor *lookupProcessor,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
- LEErrorCode & success) const
-@@ -557,10 +641,17 @@
- }
-
- le_uint16 backtrkGlyphCount = SWAPW(backtrackGlyphCount);
-+ LEReferenceToArrayOf<Offset> backtrackGlyphArrayRef(base, success, backtrackCoverageTableOffsetArray, backtrkGlyphCount);
-+ if (LE_FAILURE(success)) {
-+ return 0;
-+ }
- 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];
-+ LEReferenceToArrayOf<Offset> lookaheadCoverageTableOffsetArray(base, success, inputCoverageTableOffsetArray.getAlias(inputGlyphCount + 1, success), lookaheadGlyphCount+2);
-+
-+ if( LE_FAILURE(success) ) { return 0; }
- le_uint16 substCount = (le_uint16) SWAPW(lookaheadCoverageTableOffsetArray[lookaheadGlyphCount]);
- le_int32 position = glyphIterator->getCurrStreamPosition();
- GlyphIterator tempIterator(*glyphIterator, emptyFeatureList);
-@@ -571,14 +662,14 @@
-
- tempIterator.prev();
- if (! ContextualSubstitutionBase::matchGlyphCoverages(backtrackCoverageTableOffsetArray,
-- backtrkGlyphCount, &tempIterator, (const char *) this, TRUE)) {
-+ backtrkGlyphCount, &tempIterator, base, success, TRUE)) {
- return 0;
- }
-
- tempIterator.setCurrStreamPosition(position);
- tempIterator.next(inputGlyphCount - 1);
- if (! ContextualSubstitutionBase::matchGlyphCoverages(lookaheadCoverageTableOffsetArray,
-- lookaheadGlyphCount, &tempIterator, (const char *) this)) {
-+ lookaheadGlyphCount, &tempIterator, base, success)) {
- return 0;
- }
-
-@@ -589,9 +680,10 @@
- glyphIterator->prev();
-
- if (ContextualSubstitutionBase::matchGlyphCoverages(inputCoverageTableOffsetArray,
-- inputGlyphCount, glyphIterator, (const char *) this)) {
-- const SubstitutionLookupRecord *substLookupRecordArray =
-- (const SubstitutionLookupRecord *) &lookaheadCoverageTableOffsetArray[lookaheadGlyphCount + 1];
-+ inputGlyphCount, glyphIterator, base, success)) {
-+ LEReferenceToArrayOf<SubstitutionLookupRecord>
-+ substLookupRecordArray(base, success,
-+ (const SubstitutionLookupRecord *) lookaheadCoverageTableOffsetArray.getAlias(lookaheadGlyphCount + 1,success), substCount);
-
- 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-07-15 21:49:33.000000000 -0700
-@@ -56,20 +56,32 @@
- struct ContextualSubstitutionBase : GlyphSubstitutionSubtable
- {
- static le_bool matchGlyphIDs(
-- const TTGlyphID *glyphArray, le_uint16 glyphCount, GlyphIterator *glyphIterator,
-+ const LEReferenceToArrayOf<TTGlyphID> &glyphArray, le_uint16 glyphCount, GlyphIterator *glyphIterator,
- le_bool backtrack = FALSE);
-
- static le_bool matchGlyphClasses(
-- const le_uint16 *classArray, le_uint16 glyphCount, GlyphIterator *glyphIterator,
-- const ClassDefinitionTable *classDefinitionTable, le_bool backtrack = FALSE);
-+ const LEReferenceToArrayOf<le_uint16> &classArray, le_uint16 glyphCount, GlyphIterator *glyphIterator,
-+ const LEReferenceTo<ClassDefinitionTable> &classDefinitionTable, LEErrorCode &success, le_bool backtrack = FALSE);
-
- static le_bool matchGlyphCoverages(
-+ const LEReferenceToArrayOf<Offset> &coverageTableOffsetArray, le_uint16 glyphCount,
-+ GlyphIterator *glyphIterator, const LETableReference& offsetBase, LEErrorCode &success, le_bool backtrack = FALSE);
-+
-+ /**
-+ * little shim to wrap the Offset array in range checking
-+ * @private
-+ */
-+ static le_bool matchGlyphCoverages(
- const Offset *coverageTableOffsetArray, le_uint16 glyphCount,
-- GlyphIterator *glyphIterator, const char *offsetBase, le_bool backtrack = FALSE);
-+ GlyphIterator *glyphIterator, const LETableReference& offsetBase, LEErrorCode &success, le_bool backtrack = FALSE) {
-+ LEReferenceToArrayOf<Offset> ref(offsetBase, success, coverageTableOffsetArray, glyphCount);
-+ if( LE_FAILURE(success) ) { return FALSE; }
-+ return matchGlyphCoverages(ref, glyphCount, glyphIterator, offsetBase, success, backtrack);
-+ }
-
- static void applySubstitutionLookups(
- const LookupProcessor *lookupProcessor,
-- const SubstitutionLookupRecord *substLookupRecordArray,
-+ const LEReferenceToArrayOf<SubstitutionLookupRecord>& substLookupRecordArray,
- le_uint16 substCount,
- GlyphIterator *glyphIterator,
- const LEFontInstance *fontInstance,
-@@ -79,7 +91,8 @@
-
- struct ContextualSubstitutionSubtable : ContextualSubstitutionBase
- {
-- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
-+ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor,
-+ GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
- };
-
- struct ContextualSubstitutionFormat1Subtable : ContextualSubstitutionSubtable
-@@ -87,7 +100,8 @@
- le_uint16 subRuleSetCount;
- Offset subRuleSetTableOffsetArray[ANY_NUMBER];
-
-- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
-+ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
-+ const LEFontInstance *fontInstance, LEErrorCode& success) const;
- };
- LE_VAR_ARRAY(ContextualSubstitutionFormat1Subtable, subRuleSetTableOffsetArray)
-
-@@ -116,7 +130,7 @@
- le_uint16 subClassSetCount;
- Offset subClassSetTableOffsetArray[ANY_NUMBER];
-
-- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
-+ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
- };
- LE_VAR_ARRAY(ContextualSubstitutionFormat2Subtable, subClassSetTableOffsetArray)
-
-@@ -152,13 +166,15 @@
- Offset coverageTableOffsetArray[ANY_NUMBER];
- //SubstitutionLookupRecord substLookupRecord[ANY_NUMBER];
-
-- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
-+ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
-+ const LEFontInstance *fontInstance, LEErrorCode& success) const;
- };
- LE_VAR_ARRAY(ContextualSubstitutionFormat3Subtable, coverageTableOffsetArray)
-
- struct ChainingContextualSubstitutionSubtable : ContextualSubstitutionBase
- {
-- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
-+ le_uint32 process(const LEReferenceTo<ChainingContextualSubstitutionSubtable> &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
-+ const LEFontInstance *fontInstance, LEErrorCode& success) const;
- };
-
- struct ChainingContextualSubstitutionFormat1Subtable : ChainingContextualSubstitutionSubtable
-@@ -166,7 +182,8 @@
- le_uint16 chainSubRuleSetCount;
- Offset chainSubRuleSetTableOffsetArray[ANY_NUMBER];
-
-- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
-+ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
-+ const LEFontInstance *fontInstance, LEErrorCode& success) const;
- };
- LE_VAR_ARRAY(ChainingContextualSubstitutionFormat1Subtable, chainSubRuleSetTableOffsetArray)
-
-@@ -201,7 +218,8 @@
- le_uint16 chainSubClassSetCount;
- Offset chainSubClassSetTableOffsetArray[ANY_NUMBER];
-
-- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
-+ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator,
-+ const LEFontInstance *fontInstance, LEErrorCode& success) const;
- };
- LE_VAR_ARRAY(ChainingContextualSubstitutionFormat2Subtable, chainSubClassSetTableOffsetArray)
-
-@@ -243,7 +261,8 @@
- //le_uint16 substCount;
- //SubstitutionLookupRecord substLookupRecord[ANY_NUMBER];
-
-- le_uint32 process(const LookupProcessor *lookupProcessor, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
-+ le_uint32 process(const LETableReference &base, const LookupProcessor *lookupProcessor,
-+ GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
- };
- 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-07-15 21:49:33.000000000 -0700
-@@ -37,8 +37,10 @@
-
- U_NAMESPACE_BEGIN
-
--le_int32 CoverageTable::getGlyphCoverage(LEGlyphID glyphID) const
-+le_int32 CoverageTable::getGlyphCoverage(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const
- {
-+ if(LE_FAILURE(success)) return -1;
-+
- switch(SWAPW(coverageFormat))
- {
- case 0:
-@@ -46,16 +48,16 @@
-
- case 1:
- {
-- const CoverageFormat1Table *f1Table = (const CoverageFormat1Table *) this;
-+ LEReferenceTo<CoverageFormat1Table> f1Table(base, success);
-
-- return f1Table->getGlyphCoverage(glyphID);
-+ return f1Table->getGlyphCoverage(f1Table, glyphID, success);
- }
-
- case 2:
- {
-- const CoverageFormat2Table *f2Table = (const CoverageFormat2Table *) this;
-+ LEReferenceTo<CoverageFormat2Table> f2Table(base, success);
-
-- return f2Table->getGlyphCoverage(glyphID);
-+ return f2Table->getGlyphCoverage(f2Table, glyphID, success);
- }
-
- default:
-@@ -63,8 +65,10 @@
- }
- }
-
--le_int32 CoverageFormat1Table::getGlyphCoverage(LEGlyphID glyphID) const
-+le_int32 CoverageFormat1Table::getGlyphCoverage(LEReferenceTo<CoverageFormat1Table> &base, LEGlyphID glyphID, LEErrorCode &success) const
- {
-+ if(LE_FAILURE(success)) return -1;
-+
- TTGlyphID ttGlyphID = (TTGlyphID) LE_GET_GLYPH(glyphID);
- le_uint16 count = SWAPW(glyphCount);
- le_uint8 bit = OpenTypeUtilities::highBit(count);
-@@ -77,6 +81,10 @@
- return -1;
- }
-
-+ LEReferenceToArrayOf<TTGlyphID>(base, success, glyphArray, count);
-+ if(LE_FAILURE(success)) return -1; // range checks array
-+
-+
- if (SWAPW(glyphArray[extra]) <= ttGlyphID) {
- index = extra;
- }
-@@ -96,14 +104,18 @@
- return -1;
- }
-
--le_int32 CoverageFormat2Table::getGlyphCoverage(LEGlyphID glyphID) const
-+le_int32 CoverageFormat2Table::getGlyphCoverage(LEReferenceTo<CoverageFormat2Table> &base, LEGlyphID glyphID, LEErrorCode &success) const
- {
-+ if(LE_FAILURE(success)) return -1;
-+
- TTGlyphID ttGlyphID = (TTGlyphID) LE_GET_GLYPH(glyphID);
- le_uint16 count = SWAPW(rangeCount);
-+
-+ LEReferenceToArrayOf<GlyphRangeRecord> rangeRecordArrayRef(base, success, rangeRecordArray, count);
- le_int32 rangeIndex =
-- OpenTypeUtilities::getGlyphRangeIndex(ttGlyphID, rangeRecordArray, count);
-+ OpenTypeUtilities::getGlyphRangeIndex(ttGlyphID, rangeRecordArrayRef, success);
-
-- if (rangeIndex < 0) {
-+ if (rangeIndex < 0 || LE_FAILURE(success)) { // could fail if array out of bounds
- return -1;
- }
-
---- ./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-07-15 21:49:33.000000000 -0700
-@@ -46,7 +46,7 @@
- {
- le_uint16 coverageFormat;
-
-- le_int32 getGlyphCoverage(LEGlyphID glyphID) const;
-+ le_int32 getGlyphCoverage(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const;
- };
-
- struct CoverageFormat1Table : CoverageTable
-@@ -54,7 +54,7 @@
- le_uint16 glyphCount;
- TTGlyphID glyphArray[ANY_NUMBER];
-
-- le_int32 getGlyphCoverage(LEGlyphID glyphID) const;
-+ le_int32 getGlyphCoverage(LEReferenceTo<CoverageFormat1Table> &base, LEGlyphID glyphID, LEErrorCode &success) const;
- };
- LE_VAR_ARRAY(CoverageFormat1Table, glyphArray)
-
-@@ -64,7 +64,7 @@
- le_uint16 rangeCount;
- GlyphRangeRecord rangeRecordArray[ANY_NUMBER];
-
-- le_int32 getGlyphCoverage(LEGlyphID glyphID) const;
-+ le_int32 getGlyphCoverage(LEReferenceTo<CoverageFormat2Table> &base, LEGlyphID glyphID, LEErrorCode &success) const;
- };
- 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-07-15 21:49:33.000000000 -0700
-@@ -51,23 +51,27 @@
- }
-
- LEPoint entryAnchor, exitAnchor;
-- Offset entryOffset = SWAPW(entryExitRecords[coverageIndex].entryAnchor); // TODO
-+ Offset entryOffset = SWAPW(entryExitRecords[coverageIndex].entryAnchor);
- Offset exitOffset = SWAPW(entryExitRecords[coverageIndex].exitAnchor);
-
- if (entryOffset != 0) {
-- const AnchorTable *entryAnchorTable = (const AnchorTable *) ((char *) this + entryOffset);
-+ LEReferenceTo<AnchorTable> entryAnchorTable(base, success, entryOffset);
-
-- entryAnchorTable->getAnchor(glyphID, fontInstance, entryAnchor);
-+ if( LE_SUCCESS(success) ) {
-+ entryAnchorTable->getAnchor(entryAnchorTable, glyphID, fontInstance, entryAnchor, success);
- glyphIterator->setCursiveEntryPoint(entryAnchor);
-+ }
- } else {
- //glyphIterator->clearCursiveEntryPoint();
- }
-
- if (exitOffset != 0) {
-- const AnchorTable *exitAnchorTable = (const AnchorTable *) ((char *) this + exitOffset);
-+ LEReferenceTo<AnchorTable> exitAnchorTable(base, success, exitOffset);
-
-- exitAnchorTable->getAnchor(glyphID, fontInstance, exitAnchor);
-+ if( LE_SUCCESS(success) ) {
-+ exitAnchorTable->getAnchor(exitAnchorTable, glyphID, fontInstance, exitAnchor, success);
- glyphIterator->setCursiveExitPoint(exitAnchor);
-+ }
- } else {
- //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-07-15 21:49:33.000000000 -0700
-@@ -43,7 +43,7 @@
-
- #define FORMAT_COUNT LE_ARRAY_SIZE(fieldBits)
-
--le_int16 DeviceTable::getAdjustment(le_uint16 ppem) const
-+le_int16 DeviceTable::getAdjustment(const LEReferenceTo<DeviceTable>&base, le_uint16 ppem, LEErrorCode &success) const
- {
- le_uint16 start = SWAPW(startSize);
- le_uint16 format = SWAPW(deltaFormat) - 1;
-@@ -53,6 +53,13 @@
- le_uint16 sizeIndex = ppem - start;
- le_uint16 bits = fieldBits[format];
- le_uint16 count = 16 / bits;
-+
-+ LEReferenceToArrayOf<le_uint16> deltaValuesRef(base, success, deltaValues, (sizeIndex / count));
-+
-+ if(LE_FAILURE(success)) {
-+ return result;
-+ }
-+
- le_uint16 word = SWAPW(deltaValues[sizeIndex / count]);
- 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-07-15 21:49:33.000000000 -0700
-@@ -50,7 +50,7 @@
- le_uint16 deltaFormat;
- le_uint16 deltaValues[ANY_NUMBER];
-
-- le_int16 getAdjustment(le_uint16 ppem) const;
-+ le_int16 getAdjustment(const LEReferenceTo<DeviceTable> &base, le_uint16 ppem, LEErrorCode &success) const;
-
- 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-07-15 21:49:33.000000000 -0700
-@@ -48,7 +48,6 @@
- const LookupProcessor *lookupProcessor, le_uint16 lookupType,
- GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const
- {
--
- if (LE_FAILURE(success)) {
- 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-07-15 21:49:33.000000000 -0700
-@@ -52,8 +52,7 @@
- le_uint16 extensionLookupType;
- le_uint32 extensionOffset;
-
-- le_uint32 process(const LEReferenceTo<ExtensionSubtable> &extRef,
-- const LookupProcessor *lookupProcessor, le_uint16 lookupType,
-+ le_uint32 process(const LEReferenceTo<ExtensionSubtable> &base, const LookupProcessor *lookupProcessor, le_uint16 lookupType,
- GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const;
- };
-
---- ./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-07-15 21:49:33.000000000 -0700
-@@ -49,9 +49,9 @@
- // nothing to do?
- }
-
--le_bool GDEFMarkFilter::accept(LEGlyphID glyph) const
-+le_bool GDEFMarkFilter::accept(LEGlyphID glyph, LEErrorCode &success) const
- {
-- le_int32 glyphClass = classDefTable->getGlyphClass(glyph);
-+ le_int32 glyphClass = classDefTable->getGlyphClass(classDefTable, glyph, success);
-
- 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-07-15 21:49:33.000000000 -0700
-@@ -55,7 +55,7 @@
- GDEFMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success);
- virtual ~GDEFMarkFilter();
-
-- virtual le_bool accept(LEGlyphID glyph) const;
-+ virtual le_bool accept(LEGlyphID glyph, LEErrorCode &success) const;
- };
-
- 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-07-15 21:49:33.000000000 -0700
-@@ -41,14 +41,13 @@
- U_NAMESPACE_BEGIN
-
- GlyphIterator::GlyphIterator(LEGlyphStorage &theGlyphStorage, GlyphPositionAdjustments *theGlyphPositionAdjustments, le_bool rightToLeft, le_uint16 theLookupFlags,
-- FeatureMask theFeatureMask, const LEReferenceTo<GlyphDefinitionTableHeader> &theGlyphDefinitionTableHeader)
-+ FeatureMask theFeatureMask, const LEReferenceTo<GlyphDefinitionTableHeader> &theGlyphDefinitionTableHeader, LEErrorCode &success)
- : direction(1), position(-1), nextLimit(-1), prevLimit(-1),
- glyphStorage(theGlyphStorage), glyphPositionAdjustments(theGlyphPositionAdjustments),
- srcIndex(-1), destIndex(-1), lookupFlags(theLookupFlags), featureMask(theFeatureMask), glyphGroup(0),
- glyphClassDefinitionTable(), markAttachClassDefinitionTable()
-
- {
-- LEErrorCode success = LE_NO_ERROR; // TODO
- le_int32 glyphCount = glyphStorage.getGlyphCount();
-
- if (theGlyphDefinitionTableHeader.isValid()) {
-@@ -66,6 +65,7 @@
- nextLimit = -1;
- prevLimit = glyphCount;
- }
-+ filterResetCache();
- }
-
- GlyphIterator::GlyphIterator(GlyphIterator &that)
-@@ -84,6 +84,7 @@
- glyphGroup = that.glyphGroup;
- glyphClassDefinitionTable = that.glyphClassDefinitionTable;
- markAttachClassDefinitionTable = that.markAttachClassDefinitionTable;
-+ filterResetCache();
- }
-
- GlyphIterator::GlyphIterator(GlyphIterator &that, FeatureMask newFeatureMask)
-@@ -102,6 +103,7 @@
- glyphGroup = 0;
- glyphClassDefinitionTable = that.glyphClassDefinitionTable;
- markAttachClassDefinitionTable = that.markAttachClassDefinitionTable;
-+ filterResetCache();
- }
-
- GlyphIterator::GlyphIterator(GlyphIterator &that, le_uint16 newLookupFlags)
-@@ -120,6 +122,7 @@
- glyphGroup = that.glyphGroup;
- glyphClassDefinitionTable = that.glyphClassDefinitionTable;
- markAttachClassDefinitionTable = that.markAttachClassDefinitionTable;
-+ filterResetCache();
- }
-
- GlyphIterator::~GlyphIterator()
-@@ -133,6 +136,7 @@
- featureMask = newFeatureMask;
- glyphGroup = 0;
- lookupFlags = newLookupFlags;
-+ filterResetCache();
- }
-
- LEGlyphID *GlyphIterator::insertGlyphs(le_int32 count, LEErrorCode& success)
-@@ -381,53 +385,68 @@
- glyphPositionAdjustments->setCursiveGlyph(position, baselineIsLogicalEnd());
- }
-
--le_bool GlyphIterator::filterGlyph(le_uint32 index) const
-+void GlyphIterator::filterResetCache(void) {
-+ filterCacheValid = FALSE;
-+ }
-+
-+le_bool GlyphIterator::filterGlyph(le_uint32 index)
- {
-- LEErrorCode success = LE_NO_ERROR;
- LEGlyphID glyphID = glyphStorage[index];
-- le_int32 glyphClass = gcdNoGlyphClass;
-
-- if (LE_GET_GLYPH(glyphID) >= 0xFFFE) {
-- return TRUE;
-- }
-+ if (!filterCacheValid || filterCache.id != glyphID) {
-+ filterCache.id = glyphID;
-
-+ le_bool &filterResult = filterCache.result; // NB: Making this a reference to accept the updated value, in case
-+ // we want more fancy cacheing in the future.
-+ if (LE_GET_GLYPH(glyphID) >= 0xFFFE) {
-+ filterResult = TRUE;
-+ } else {
-+ LEErrorCode success = LE_NO_ERROR;
-+ le_int32 glyphClass = gcdNoGlyphClass;
- if (glyphClassDefinitionTable.isValid()) {
- glyphClass = glyphClassDefinitionTable->getGlyphClass(glyphClassDefinitionTable, glyphID, success);
- }
--
-- switch (glyphClass)
-- {
-+ switch (glyphClass) {
- case gcdNoGlyphClass:
-- return FALSE;
-+ filterResult = FALSE;
-+ break;
-
- case gcdSimpleGlyph:
-- return (lookupFlags & lfIgnoreBaseGlyphs) != 0;
-+ filterResult = (lookupFlags & lfIgnoreBaseGlyphs) != 0;
-+ break;
-
- case gcdLigatureGlyph:
-- return (lookupFlags & lfIgnoreLigatures) != 0;
-+ filterResult = (lookupFlags & lfIgnoreLigatures) != 0;
-+ break;
-
- case gcdMarkGlyph:
-- {
- if ((lookupFlags & lfIgnoreMarks) != 0) {
-- return TRUE;
-- }
--
-+ filterResult = TRUE;
-+ } else {
- le_uint16 markAttachType = (lookupFlags & lfMarkAttachTypeMask) >> lfMarkAttachTypeShift;
-
- if ((markAttachType != 0) && (markAttachClassDefinitionTable.isValid())) {
-- return markAttachClassDefinitionTable
-- -> getGlyphClass(markAttachClassDefinitionTable, glyphID, success) != markAttachType;
-+ filterResult = (markAttachClassDefinitionTable
-+ -> getGlyphClass(markAttachClassDefinitionTable, glyphID, success) != markAttachType);
-+ } else {
-+ filterResult = FALSE;
- }
--
-- return FALSE;
- }
-+ break;
-
- case gcdComponentGlyph:
-- return (lookupFlags & lfIgnoreBaseGlyphs) != 0;
-+ filterResult = ((lookupFlags & lfIgnoreBaseGlyphs) != 0);
-+ break;
-
- default:
-- return FALSE;
-+ filterResult = FALSE;
-+ break;
- }
-+ }
-+ filterCacheValid = TRUE;
-+ }
-+
-+ return filterCache.result;
- }
-
- 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-07-15 21:49:33.000000000 -0700
-@@ -49,7 +49,7 @@
- class GlyphIterator : public UMemory {
- public:
- GlyphIterator(LEGlyphStorage &theGlyphStorage, GlyphPositionAdjustments *theGlyphPositionAdjustments, le_bool rightToLeft, le_uint16 theLookupFlags,
-- FeatureMask theFeatureMask, const LEReferenceTo<GlyphDefinitionTableHeader> &theGlyphDefinitionTableHeader);
-+ FeatureMask theFeatureMask, const LEReferenceTo<GlyphDefinitionTableHeader> &theGlyphDefinitionTableHeader, LEErrorCode &success);
-
- GlyphIterator(GlyphIterator &that);
-
-@@ -98,7 +98,7 @@
- le_int32 applyInsertions();
-
- private:
-- le_bool filterGlyph(le_uint32 index) const;
-+ le_bool filterGlyph(le_uint32 index);
- le_bool hasFeatureTag(le_bool matchGroup) const;
- le_bool nextInternal(le_uint32 delta = 1);
- le_bool prevInternal(le_uint32 delta = 1);
-@@ -121,6 +121,14 @@
- LEReferenceTo<MarkAttachClassDefinitionTable> markAttachClassDefinitionTable;
-
- GlyphIterator &operator=(const GlyphIterator &other); // forbid copying of this class
-+
-+ struct {
-+ LEGlyphID id;
-+ le_bool result;
-+ } filterCache;
-+ le_bool filterCacheValid;
-+
-+ void filterResetCache(void);
- };
-
- 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-07-15 21:49:33.000000000 -0700
-@@ -95,6 +95,8 @@
-
- le_uint32 delta = 0;
-
-+ //_LETRACE("attempting lookupType #%d", lookupType);
-+
- switch(lookupType)
- {
- case 0:
-@@ -152,21 +154,21 @@
- {
- LEReferenceTo<ContextualPositioningSubtable> subtable(lookupSubtable, success);
-
-- delta = subtable->process(this, glyphIterator, fontInstance, success);
-+ delta = subtable->process(subtable, this , glyphIterator, fontInstance, success);
- break;
- }
-
- case gpstChainedContext:
- {
-- LEReferenceTo<ChainingContextualPositioningSubtable> subtable(lookupSubtable, success);
-+ const LEReferenceTo<ChainingContextualPositioningSubtable> subtable(lookupSubtable, success);
-
-- delta = subtable->process(this, glyphIterator, fontInstance, success);
-+ delta = subtable->process(subtable, this, glyphIterator, fontInstance, success);
- break;
- }
-
- case gpstExtension:
- {
-- LEReferenceTo<ExtensionSubtable> subtable(lookupSubtable, success);
-+ const LEReferenceTo<ExtensionSubtable> subtable(lookupSubtable, success);
-
- delta = subtable->process(subtable, this, lookupType, glyphIterator, fontInstance, success);
- break;
-@@ -176,6 +178,12 @@
- break;
- }
-
-+#if LE_TRACE
-+ if(delta != 0) {
-+ _LETRACE("GlyphPositioningLookupProcessor applied #%d -> delta %d @ %d", lookupType, delta, glyphIterator->getCurrStreamPosition());
-+ }
-+#endif
-+
- return delta;
- }
-
---- ./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-07-15 21:49:33.000000000 -0700
-@@ -123,7 +123,7 @@
- {
- const LEReferenceTo<ContextualSubstitutionSubtable> subtable(lookupSubtable, success);
-
-- delta = subtable->process(this, glyphIterator, fontInstance, success);
-+ delta = subtable->process(subtable, this, glyphIterator, fontInstance, success);
- break;
- }
-
-@@ -131,7 +131,7 @@
- {
- const LEReferenceTo<ChainingContextualSubstitutionSubtable> subtable(lookupSubtable, success);
-
-- delta = subtable->process(this, glyphIterator, fontInstance, success);
-+ delta = subtable->process(subtable, this, glyphIterator, fontInstance, success);
- break;
- }
-
---- ./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-07-15 21:49:33.000000000 -0700
-@@ -44,7 +44,7 @@
- #include "LEGlyphStorage.h"
-
- #include "IndicReordering.h"
--#include <stdio.h>
-+
- U_NAMESPACE_BEGIN
-
- UOBJECT_DEFINE_RTTI_IMPLEMENTATION(IndicOpenTypeLayoutEngine)
-@@ -90,6 +90,7 @@
- return 0;
- }
-
-+ _LETRACE("IOTLE::gp, calling parent");
- le_int32 retCount = OpenTypeLayoutEngine::glyphProcessing(chars, offset, count, max, rightToLeft, glyphStorage, success);
-
- if (LE_FAILURE(success)) {
-@@ -97,10 +98,14 @@
- }
-
- if (fVersion2) {
-+ _LETRACE("IOTLE::gp, v2 final,");
- IndicReordering::finalReordering(glyphStorage,retCount);
-+ _LETRACE("IOTLE::gp, v2 pres");
- IndicReordering::applyPresentationForms(glyphStorage,retCount);
-+ _LETRACE("IOTLE::gp, parent gsub");
- OpenTypeLayoutEngine::glyphSubstitution(count,max, rightToLeft, glyphStorage, success);
- } else {
-+ _LETRACE("IOTLE::gp, adjust mpres");
- IndicReordering::adjustMPres(fMPreFixups, glyphStorage, success);
- }
- return retCount;
-@@ -116,6 +121,8 @@
- return 0;
- }
-
-+ _LETRACE("IOTLE: charProc");
-+
- if (chars == NULL || offset < 0 || count < 0 || max < 0 || offset >= max || offset + count > max) {
- success = LE_ILLEGAL_ARGUMENT_ERROR;
- return 0;
-@@ -143,8 +150,10 @@
-
- le_int32 outCharCount;
- if (fVersion2) {
-+ _LETRACE("v2process");
- outCharCount = IndicReordering::v2process(&chars[offset], count, fScriptCode, outChars, glyphStorage);
- } else {
-+ _LETRACE("reorder");
- outCharCount = IndicReordering::reorder(&chars[offset], count, fScriptCode, outChars, glyphStorage, &fMPreFixups, success);
- }
-
---- ./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-07-15 21:49:28.000000000 -0700
-@@ -39,7 +39,7 @@
-
- #include <stdio.h>
-
--#define DEBUG 0
-+#define DEBUG_KERN_TABLE 0
-
- U_NAMESPACE_BEGIN
-
-@@ -99,14 +99,14 @@
- : pairsSwapped(NULL), fTable(base)
- {
- if(LE_FAILURE(success) || (fTable.isEmpty())) {
--#if DEBUG
-+#if DEBUG_KERN_TABLE
- fprintf(stderr, "no kern data\n");
- #endif
- return;
- }
- LEReferenceTo<KernTableHeader> header(fTable, success);
-
--#if DEBUG
-+#if DEBUG_KERN_TABLE
- // dump first 32 bytes of header
- for (int i = 0; i < 64; ++i) {
- fprintf(stderr, "%0.2x ", ((const char*)header.getAlias())[i]&0xff);
-@@ -171,13 +171,13 @@
- fprintf(stderr, " searchRange: %d entrySelector: %d rangeShift: %d\n", searchRange, entrySelector, rangeShift);
- fprintf(stderr, "[[ ignored font table entries: range %d selector %d shift %d ]]\n", SWAPW(table->searchRange), SWAPW(table->entrySelector), SWAPW(table->rangeShift));
- #endif
--#if DEBUG
-+#if DEBUG_KERN_TABLE
- fprintf(stderr, "coverage: %0.4x nPairs: %d pairs 0x%x\n", coverage, nPairs, pairsSwapped);
- fprintf(stderr,
- " searchRange(pairs): %d entrySelector: %d rangeShift(pairs): %d\n",
- searchRange, entrySelector, rangeShift);
-
-- {
-+ if (LE_SUCCESS(success)) {
- // dump part of the pair list
- char ids[256];
- for (int i = 256; --i >= 0;) {
-@@ -242,7 +242,7 @@
- p = tp;
- }
-
--#if DEBUG
-+#if DEBUG_KERN_TABLE
- fprintf(stderr, "binary search for %0.8x\n", key);
- #endif
-
-@@ -251,13 +251,13 @@
- probe >>= 1;
- tp = (const PairInfo*)(p + (probe/KERN_PAIRINFO_SIZE));
- le_uint32 tkey = tp->key;
--#if DEBUG
-+#if DEBUG_KERN_TABLE
- fprintf(stdout, " %.3d (%0.8x)\n", (tp - pairsSwapped), tkey);
- #endif
- if (tkey <= key) {
- if (tkey == key) {
- le_int16 value = SWAPW(tp->value);
--#if DEBUG
-+#if DEBUG_KERN_TABLE
- fprintf(stdout, "binary found kerning pair %x:%x at %d, value: 0x%x (%g)\n",
- 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-07-15 21:49:28.000000000 -0700
-@@ -181,6 +181,10 @@
- *
- * Subclasses which represent composite fonts should always return <code>NULL</code>.
- *
-+ * Note that implementing this function does not allow for range checking.
-+ * Subclasses that desire the safety of range checking must implement the
-+ * variation which has a length parameter.
-+ *
- * @param tableTag - the four byte table tag. (e.g. 'cmap')
- *
- * @return the address of the table in memory, or <code>NULL</code>
-@@ -200,6 +204,8 @@
- * Subclasses which represent composite fonts should always return <code>NULL</code>.
- *
- * This version sets a length, for range checking.
-+ * Note that range checking can only be accomplished if this function is
-+ * implemented in subclasses.
- *
- * @param tableTag - the four byte table tag. (e.g. 'cmap')
- * @param length - ignored on entry, on exit will be the length of the table if known, or -1 if unknown.
-@@ -572,5 +578,3 @@
-
- U_NAMESPACE_END
- #endif
--
--
---- ./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-07-15 21:49:28.000000000 -0700
-@@ -62,7 +62,7 @@
- *
- * @internal
- */
-- virtual le_bool accept(LEGlyphID glyph) const = 0;
-+ virtual le_bool accept(LEGlyphID glyph, LEErrorCode &success) const = 0;
- };
- #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-07-15 21:49:28.000000000 -0700
-@@ -458,7 +458,7 @@
- success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
- return;
- }
--
-+ _LETRACE("set%-4d\t(%.2f, %.2f)", glyphIndex, x, y);
- fPositions[glyphIndex * 2] = x;
- fPositions[glyphIndex * 2 + 1] = y;
- }
-@@ -694,4 +694,3 @@
- }
-
- 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-07-15 21:49:28.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-10-28 20:19:45.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.
- *
-- * Generated on: 10/26/2010 02:53:33 PM PDT
-+ * Generated on: 11/01/2011 04:08:09 PM PDT
- */
-
- #ifndef __LESCRIPTS_H
-@@ -262,7 +262,10 @@
- khojScriptCode = 157,
- tirhScriptCode = 158,
-
-- scriptCodeCount = 159
-+/**
-+ * @stable ICU 2.2
-+ */
-+ scriptCodeCount
- };
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -132,6 +132,9 @@
- #define uprv_memcpy memcpy
- #define uprv_realloc realloc
-
-+#define U_EXPORT2
-+#define U_CAPI extern "C"
-+
- #if !defined(U_IS_BIG_ENDIAN)
- #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-07-15 21:49:28.000000000 -0700
-@@ -38,34 +38,47 @@
- #include "LETypes.h"
- #include "LEFontInstance.h"
-
-+/**
-+ * \def LE_ENABLE_RAW
-+ * If this is 1, enables old non-safe raw access
-+ */
-+#ifndef LE_ENABLE_RAW
-+#define LE_ENABLE_RAW 0
-+#endif
-
--#define kQuestionmarkTableTag 0x3F3F3F3FUL
--#define kTildeTableTag 0x7e7e7e7eUL
-+#define kQuestionmarkTableTag 0x3F3F3F3FUL /* ???? */
-+#define kStaticTableTag 0x30303030UL /* 0000 */
-+#define kTildeTableTag 0x7e7e7e7eUL /* ~~~~ */
- #ifdef __cplusplus
-
- // internal - interface for range checking
- U_NAMESPACE_BEGIN
-
- #if LE_ASSERT_BAD_FONT
-+
-+#ifndef LE_TRACE_TR
-+#define LE_TRACE_TR 0
-+#endif
-+
- class LETableReference; // fwd
- /**
- * defined in OpenTypeUtilities.cpp
- * @internal
- */
--extern void _debug_LETableReference(const char *f, int l, const char *msg, const LETableReference *what, const void *ptr, size_t len);
-+U_CAPI void U_EXPORT2 _debug_LETableReference(const char *f, int l, const char *msg, const LETableReference *what, const void *ptr, size_t len);
-
- #define LE_DEBUG_TR(x) _debug_LETableReference(__FILE__, __LINE__, x, this, NULL, 0);
- #define LE_DEBUG_TR3(x,y,z) _debug_LETableReference(__FILE__, __LINE__, x, this, (const void*)y, (size_t)z);
--#if 0
--#define LE_TRACE_TR(x) _debug_LETableReference(__FILE__, __LINE__, x, this, NULL, 0);
-+#if LE_TRACE_TR
-+#define _TRTRACE(x) _debug_LETableReference(__FILE__, __LINE__, x, this, NULL, 0);
- #else
--#define LE_TRACE_TR(x)
-+#define _TRTRACE(x)
- #endif
-
- #else
- #define LE_DEBUG_TR(x)
- #define LE_DEBUG_TR3(x,y,z)
--#define LE_TRACE_TR(x)
-+#define _TRTRACE(x)
- #endif
-
- /**
-@@ -73,6 +86,13 @@
- */
- class LETableReference {
- public:
-+
-+ /**
-+ * Dummy enum asserting that a value is actually static data
-+ * and does not need to be range checked
-+ */
-+ enum EStaticData { kStaticData = 0 };
-+
- /**
- * @internal
- * Construct from a specific tag
-@@ -80,28 +100,42 @@
- LETableReference(const LEFontInstance* font, LETag tableTag, LEErrorCode &success) :
- fFont(font), fTag(tableTag), fParent(NULL), fStart(NULL),fLength(LE_UINTPTR_MAX) {
- loadTable(success);
-- LE_TRACE_TR("INFO: new table load")
-+ _TRTRACE("INFO: new table load")
- }
-
- LETableReference(const LETableReference &parent, LEErrorCode &success) : fFont(parent.fFont), fTag(parent.fTag), fParent(&parent), fStart(parent.fStart), fLength(parent.fLength) {
- if(LE_FAILURE(success)) {
- clear();
- }
-- LE_TRACE_TR("INFO: new clone")
-+ _TRTRACE("INFO: new clone")
- }
-
-+#if LE_ENABLE_RAW
-+ /**
-+ * Construct without a parent LETR.
-+ */
- LETableReference(const le_uint8* data, size_t length = LE_UINTPTR_MAX) :
- fFont(NULL), fTag(kQuestionmarkTableTag), fParent(NULL), fStart(data), fLength(length) {
-- LE_TRACE_TR("INFO: new raw")
-+ _TRTRACE("INFO: new raw")
- }
-+#endif
-+
-+ /**
-+ * Construct without a parent LETR.
-+ */
-+ LETableReference(EStaticData /* NOTUSED */, const le_uint8* data, size_t length) :
-+ fFont(NULL), fTag(kQuestionmarkTableTag), fParent(NULL), fStart(data), fLength(length) {
-+ _TRTRACE("INFO: new EStaticData")
-+ }
-+
- LETableReference() :
- fFont(NULL), fTag(kQuestionmarkTableTag), fParent(NULL), fStart(NULL), fLength(0) {
-- LE_TRACE_TR("INFO: new empty")
-+ _TRTRACE("INFO: new empty")
- }
-
- ~LETableReference() {
-- fTag=kTildeTableTag;
-- LE_TRACE_TR("INFO: new dtor")
-+ fTag= (LETag)kTildeTableTag;
-+ _TRTRACE("INFO: new dtor")
- }
-
- /**
-@@ -127,7 +161,7 @@
- fLength = (fParent->fLength) - offset; // decrement length as base address is incremented
- }
- if(fLength != LE_UINTPTR_MAX) { // if we have bounds:
-- if(offset+fLength > fParent->fLength) {
-+ if((offset+fLength < offset) || (offset+fLength > fParent->fLength)) {
- LE_DEBUG_TR3("offset+fLength out of range: (%p) +%d", NULL, offset+fLength);
- err = LE_INDEX_OUT_OF_BOUNDS_ERROR; // exceeded
- clear();
-@@ -137,11 +171,13 @@
- } else {
- clear();
- }
-- LE_TRACE_TR("INFO: new subset")
-+ _TRTRACE("INFO: new subset")
- }
-
- const void* getAlias() const { return (const void*)fStart; }
-- const void* getAliasTODO() const { LE_DEBUG_TR("getAliasTODO()"); return (const void*)fStart; }
-+#ifndef LE_ENABLE_RAW
-+ const void* getAliasRAW() const { LE_DEBUG_TR("getAliasRAW()"); return (const void*)fStart; }
-+#endif
- le_bool isEmpty() const { return fStart==NULL || fLength==0; }
- le_bool isValid() const { return !isEmpty(); }
- le_bool hasBounds() const { return fLength!=LE_UINTPTR_MAX; }
-@@ -234,7 +270,18 @@
-
- void setRaw(const void *data, size_t length = LE_UINTPTR_MAX) {
- fFont = NULL;
-- fTag = kQuestionmarkTableTag;
-+ fTag = (LETag)kQuestionmarkTableTag;
-+ fParent = NULL;
-+ fStart = (const le_uint8*)data;
-+ fLength = length;
-+ }
-+
-+ /**
-+ * set this object pointing to static data
-+ */
-+ void setTo(EStaticData /*notused*/, const void *data, size_t length) {
-+ fFont = NULL;
-+ fTag = (LETag)kStaticTableTag;
- fParent = NULL;
- fStart = (const le_uint8*)data;
- fLength = length;
-@@ -277,6 +324,90 @@
- * Open a new entry based on an existing table
- */
-
-+template<class T>
-+class LEReferenceTo : public LETableReference {
-+public:
-+ /**
-+ * open a sub reference.
-+ * @param parent parent reference
-+ * @param success error status
-+ * @param atPtr location of reference - if NULL, will be at offset zero (i.e. downcast of parent). Otherwise must be a pointer within parent's bounds.
-+ */
-+ inline LEReferenceTo(const LETableReference &parent, LEErrorCode &success, const void* atPtr)
-+ : LETableReference(parent, parent.ptrToOffset(atPtr, success), LE_UINTPTR_MAX, success) {
-+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
-+ if(LE_FAILURE(success)) clear();
-+ }
-+ /**
-+ * ptr plus offset
-+ */
-+ inline LEReferenceTo(const LETableReference &parent, LEErrorCode &success, const void* atPtr, size_t offset)
-+ : LETableReference(parent, parent.ptrToOffset(atPtr, success)+offset, LE_UINTPTR_MAX, success) {
-+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
-+ if(LE_FAILURE(success)) clear();
-+ }
-+ inline LEReferenceTo(const LETableReference &parent, LEErrorCode &success, size_t offset)
-+ : LETableReference(parent, offset, LE_UINTPTR_MAX, success) {
-+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
-+ if(LE_FAILURE(success)) clear();
-+ }
-+ inline LEReferenceTo(const LETableReference &parent, LEErrorCode &success)
-+ : LETableReference(parent, 0, LE_UINTPTR_MAX, success) {
-+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
-+ if(LE_FAILURE(success)) clear();
-+ }
-+ inline LEReferenceTo(const LEFontInstance *font, LETag tableTag, LEErrorCode &success)
-+ : LETableReference(font, tableTag, success) {
-+ verifyLength(0, LETableVarSizer<T>::getSize(), success);
-+ if(LE_FAILURE(success)) clear();
-+ }
-+#if LE_ENABLE_RAW
-+ inline LEReferenceTo(const le_uint8 *data, size_t length = LE_UINTPTR_MAX) : LETableReference(data, length) {}
-+ inline LEReferenceTo(const T *data, size_t length = LE_UINTPTR_MAX) : LETableReference((const le_uint8*)data, length) {}
-+#endif
-+ inline LEReferenceTo(EStaticData staticData, const le_uint8 *data, size_t length) : LETableReference(staticData, data, length) {}
-+ inline LEReferenceTo(EStaticData staticData, const T *data, size_t length) : LETableReference(staticData, (const le_uint8*)data, length) {}
-+
-+ inline LEReferenceTo() : LETableReference() {}
-+
-+#if LE_ENABLE_RAW
-+ inline LEReferenceTo<T>& operator=(const T* other) {
-+ setRaw(other);
-+ return *this;
-+ }
-+#endif
-+
-+ LEReferenceTo<T>& setTo(LETableReference::EStaticData staticData, const T* other, size_t length) {
-+ LETableReference::setTo(staticData, other, length);
-+ return *this;
-+ }
-+
-+ LEReferenceTo<T> &reparent(const LETableReference &base) {
-+ fParent = &base;
-+ return *this;
-+ }
-+
-+ /**
-+ * roll forward by one <T> size.
-+ * same as addOffset(LETableVarSizer<T>::getSize(),success)
-+ */
-+ void addObject(LEErrorCode &success) {
-+ addOffset(LETableVarSizer<T>::getSize(), success);
-+ }
-+ void addObject(size_t count, LEErrorCode &success) {
-+ addOffset(LETableVarSizer<T>::getSize()*count, success);
-+ }
-+
-+ const T *operator->() const { return getAlias(); }
-+ const T *operator*() const { return getAlias(); }
-+ const T *getAlias() const { return (const T*)fStart; }
-+#if LE_ENABLE_RAW
-+ const T *getAliasRAW() const { LE_DEBUG_TR("getAliasRAW<>"); return (const T*)fStart; }
-+#endif
-+
-+};
-+
-+
- /**
- * \def LE_UNBOUNDED_ARRAY
- * define an array with no *known* bound. Will trim to available size.
-@@ -289,12 +420,12 @@
- public:
- LEReferenceToArrayOf(const LETableReference &parent, LEErrorCode &success, size_t offset, le_uint32 count)
- : LETableReference(parent, offset, LE_UINTPTR_MAX, success), fCount(count) {
-- LE_TRACE_TR("INFO: new RTAO by offset")
-+ _TRTRACE("INFO: new RTAO by offset")
- if(LE_SUCCESS(success)) {
-- if(count == LE_UNBOUNDED_ARRAY) { // not a known length
-- count = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
-+ if(fCount == LE_UNBOUNDED_ARRAY) { // not a known length
-+ fCount = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
- }
-- LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*count, success);
-+ LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*fCount, success);
- }
- if(LE_FAILURE(success)) {
- fCount=0;
-@@ -304,23 +435,23 @@
-
- LEReferenceToArrayOf(const LETableReference &parent, LEErrorCode &success, const T* array, le_uint32 count)
- : LETableReference(parent, parent.ptrToOffset(array, success), LE_UINTPTR_MAX, success), fCount(count) {
--LE_TRACE_TR("INFO: new RTAO")
-+_TRTRACE("INFO: new RTAO")
- if(LE_SUCCESS(success)) {
-- if(count == LE_UNBOUNDED_ARRAY) { // not a known length
-- count = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
-+ if(fCount == LE_UNBOUNDED_ARRAY) { // not a known length
-+ fCount = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
- }
-- LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*count, success);
-+ LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*fCount, success);
- }
- if(LE_FAILURE(success)) clear();
- }
- LEReferenceToArrayOf(const LETableReference &parent, LEErrorCode &success, const T* array, size_t offset, le_uint32 count)
- : LETableReference(parent, parent.ptrToOffset(array, success)+offset, LE_UINTPTR_MAX, success), fCount(count) {
--LE_TRACE_TR("INFO: new RTAO")
-+_TRTRACE("INFO: new RTAO")
- if(LE_SUCCESS(success)) {
-- if(count == LE_UNBOUNDED_ARRAY) { // not a known length
-- count = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
-+ if(fCount == LE_UNBOUNDED_ARRAY) { // not a known length
-+ fCount = getLength()/LETableVarSizer<T>::getSize(); // fit to max size
- }
-- LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*count, success);
-+ LETableReference::verifyLength(0, LETableVarSizer<T>::getSize()*fCount, success);
- }
- if(LE_FAILURE(success)) clear();
- }
-@@ -329,18 +460,40 @@
-
- le_uint32 getCount() const { return fCount; }
-
-- using LETableReference::getAlias;
-+ const T *getAlias() const { return (const T*)fStart; }
-
- const T *getAlias(le_uint32 i, LEErrorCode &success) const {
- return ((const T*)(((const char*)getAlias())+getOffsetFor(i, success)));
- }
-
-- const T *getAliasTODO() const { LE_DEBUG_TR("getAliasTODO<>"); return (const T*)fStart; }
-+#ifndef LE_ENABLE_RAW
-+ const T *getAliasRAW() const { LE_DEBUG_TR("getAliasRAW<>"); return (const T*)fStart; }
-+#endif
-
- const T& getObject(le_uint32 i, LEErrorCode &success) const {
- return *getAlias(i,success);
- }
-
-+ /**
-+ * by-value array accessor for integral types.
-+ */
-+ const T operator[](le_uint32 i) const {
-+ LEErrorCode success = LE_NO_ERROR;
-+ const T *ret = getAlias(i, success);
-+ if(LE_FAILURE(success) || ret==NULL) {
-+#if LE_ASSERT_BAD_FONT
-+ LE_DEBUG_TR3("Range error, out of bounds? (%p) #%d", NULL, i);
-+#endif
-+ return T(0); // will not work for all types.
-+ }
-+ return *ret;
-+ }
-+
-+ const LEReferenceTo<T> getReference(le_uint32 i, LEErrorCode &success) const {
-+ if(LE_FAILURE(success)) return LEReferenceTo<T>();
-+ return LEReferenceTo<T>(*this, success, getAlias(i,success));
-+ }
-+
- const T& operator()(le_uint32 i, LEErrorCode &success) const {
- return *getAlias(i,success);
- }
-@@ -349,6 +502,7 @@
- if(LE_SUCCESS(success)&&i<getCount()) {
- return LETableVarSizer<T>::getSize()*i;
- } else {
-+ LE_DEBUG_TR3("getOffsetFor failed (%p) index=%d",NULL, i);
- success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
- }
- return 0;
-@@ -360,7 +514,7 @@
- }
-
- LEReferenceToArrayOf(const LETableReference& parent, LEErrorCode & success) : LETableReference(parent,0, LE_UINTPTR_MAX, success), fCount(0) {
-- LE_TRACE_TR("INFO: null RTAO")
-+ _TRTRACE("INFO: null RTAO")
- }
-
- private:
-@@ -368,73 +522,11 @@
- };
-
-
--template<class T>
--class LEReferenceTo : public LETableReference {
--public:
-- /**
-- * open a sub reference.
-- * @param parent parent reference
-- * @param success error status
-- * @param atPtr location of reference - if NULL, will be at offset zero (i.e. downcast of parent). Otherwise must be a pointer within parent's bounds.
-- */
-- LEReferenceTo(const LETableReference &parent, LEErrorCode &success, const void* atPtr)
-- : LETableReference(parent, parent.ptrToOffset(atPtr, success), LE_UINTPTR_MAX, success) {
-- verifyLength(0, LETableVarSizer<T>::getSize(), success);
-- if(LE_FAILURE(success)) clear();
-- }
-- /**
-- * ptr plus offset
-- */
-- LEReferenceTo(const LETableReference &parent, LEErrorCode &success, const void* atPtr, size_t offset)
-- : LETableReference(parent, parent.ptrToOffset(atPtr, success)+offset, LE_UINTPTR_MAX, success) {
-- verifyLength(0, LETableVarSizer<T>::getSize(), success);
-- if(LE_FAILURE(success)) clear();
-- }
-- LEReferenceTo(const LETableReference &parent, LEErrorCode &success, size_t offset)
-- : LETableReference(parent, offset, LE_UINTPTR_MAX, success) {
-- verifyLength(0, LETableVarSizer<T>::getSize(), success);
-- if(LE_FAILURE(success)) clear();
-- }
-- LEReferenceTo(const LETableReference &parent, LEErrorCode &success)
-- : LETableReference(parent, 0, LE_UINTPTR_MAX, success) {
-- verifyLength(0, LETableVarSizer<T>::getSize(), success);
-- if(LE_FAILURE(success)) clear();
-- }
-- LEReferenceTo(const LEFontInstance *font, LETag tableTag, LEErrorCode &success)
-- : LETableReference(font, tableTag, success) {
-- verifyLength(0, LETableVarSizer<T>::getSize(), success);
-- if(LE_FAILURE(success)) clear();
-- }
-- LEReferenceTo(const le_uint8 *data, size_t length = LE_UINTPTR_MAX) : LETableReference(data, length) {}
-- LEReferenceTo(const T *data, size_t length = LE_UINTPTR_MAX) : LETableReference((const le_uint8*)data, length) {}
-- LEReferenceTo() : LETableReference(NULL) {}
--
-- LEReferenceTo<T>& operator=(const T* other) {
-- setRaw(other);
-- return *this;
-- }
--
-- LEReferenceTo<T> &reparent(const LETableReference &base) {
-- fParent = &base;
-- return *this;
-- }
-
-- /**
-- * roll forward by one <T> size.
-- * same as addOffset(LETableVarSizer<T>::getSize(),success)
-- */
-- void addObject(LEErrorCode &success) {
-- addOffset(LETableVarSizer<T>::getSize(), success);
-- }
-- void addObject(size_t count, LEErrorCode &success) {
-- addOffset(LETableVarSizer<T>::getSize()*count, success);
-- }
--
-- const T *operator->() const { return getAlias(); }
-- const T *getAlias() const { return (const T*)fStart; }
-- const T *getAliasTODO() const { LE_DEBUG_TR("getAliasTODO<>"); return (const T*)fStart; }
--};
-
-+#ifdef _TRTRACE
-+#undef _TRTRACE
-+#endif
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -337,6 +337,20 @@
- typedef struct LEPoint LEPoint;
- #endif
-
-+/**
-+ * \def LE_TRACE
-+ * @internal
-+ */
-+#ifndef LE_TRACE
-+# define LE_TRACE 0
-+#endif
-+
-+#if LE_TRACE
-+# include <stdio.h>
-+# define _LETRACE printf("\n%s:%d: LE: ", __FILE__, __LINE__),printf
-+#else
-+# define _LETRACE 0&&
-+#endif
-
- #ifndef U_HIDE_INTERNAL_API
-
-@@ -701,6 +715,12 @@
- LE_FEATURE_ENUM_MAX = LE_CHAR_FILTER_FEATURE_ENUM
- };
-
-+
-+/**
-+ * Flags for typographic features.
-+ * @internal
-+ * @{
-+ */
- #define LE_Kerning_FEATURE_FLAG (1 << LE_Kerning_FEATURE_ENUM)
- #define LE_Ligatures_FEATURE_FLAG (1 << LE_Ligatures_FEATURE_ENUM)
- #define LE_NoCanon_FEATURE_FLAG (1 << LE_NoCanon_FEATURE_ENUM)
-@@ -727,6 +747,9 @@
- #define LE_SS07_FEATURE_FLAG (1 << LE_SS07_FEATURE_ENUM)
-
- #define LE_CHAR_FILTER_FEATURE_FLAG (1 << LE_CHAR_FILTER_FEATURE_ENUM)
-+/**
-+ * @}
-+ */
-
- #define LE_DEFAULT_FEATURE_FLAG (LE_Kerning_FEATURE_FLAG | LE_Ligatures_FEATURE_FLAG) /**< default features */
-
-@@ -768,7 +791,7 @@
- *
- * @stable ICU 2.4
- */
--#ifndef LE_FAILURE
-+#ifndef LE_SUCCESS
- #define LE_SUCCESS(code) (U_SUCCESS((UErrorCode)code))
- #endif
-
-@@ -781,4 +804,4 @@
- #define LE_FAILURE(code) (U_FAILURE((UErrorCode)code))
- #endif
-
--#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-07-15 21:49:28.000000000 -0700
-@@ -156,7 +156,7 @@
- CanonMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success);
- virtual ~CanonMarkFilter();
-
-- virtual le_bool accept(LEGlyphID glyph) const;
-+ virtual le_bool accept(LEGlyphID glyph, LEErrorCode &success) const;
- };
-
- CanonMarkFilter::CanonMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success)
-@@ -169,9 +169,8 @@
- // nothing to do?
- }
-
--le_bool CanonMarkFilter::accept(LEGlyphID glyph) const
-+le_bool CanonMarkFilter::accept(LEGlyphID glyph, LEErrorCode &success) const
- {
-- LEErrorCode success = LE_NO_ERROR;
- le_int32 glyphClass = classDefTable->getGlyphClass(classDefTable, glyph, success);
- if(LE_FAILURE(success)) return false;
- return glyphClass != 0;
-@@ -263,7 +262,9 @@
- return count;
- }
-
-- LEReferenceTo<GlyphSubstitutionTableHeader> canonGSUBTable((GlyphSubstitutionTableHeader *) CanonShaping::glyphSubstitutionTable);
-+ LEReferenceTo<GlyphSubstitutionTableHeader> canonGSUBTable(LETableReference::kStaticData,
-+ (GlyphSubstitutionTableHeader *) CanonShaping::glyphSubstitutionTable,
-+ CanonShaping::glyphSubstitutionTableLen);
- LETag scriptTag = OpenTypeLayoutEngine::getScriptTag(fScriptCode);
- LETag langSysTag = OpenTypeLayoutEngine::getLangSysTag(fLanguageCode);
- le_int32 i, dir = 1, out = 0, outCharCount = count;
-@@ -323,7 +324,8 @@
- LE_DELETE_ARRAY(reordered);
- }
-
-- outCharCount = canonGSUBTable->process(canonGSUBTable, fakeGlyphStorage, rightToLeft, scriptTag, langSysTag, (const GlyphDefinitionTableHeader*)NULL, substitutionFilter, canonFeatureMap, canonFeatureMapCount, FALSE, success);
-+ const LEReferenceTo<GlyphDefinitionTableHeader> noGDEF; // empty gdef header
-+ outCharCount = canonGSUBTable->process(canonGSUBTable, fakeGlyphStorage, rightToLeft, scriptTag, langSysTag, noGDEF, substitutionFilter, canonFeatureMap, canonFeatureMapCount, FALSE, success);
-
- if (LE_FAILURE(success)) {
- delete substitutionFilter;
-@@ -403,10 +405,13 @@
- LEPoint advance;
-
- glyphStorage.setPosition(i, x, y, success);
-+ _LETRACE("g#%-4d (%.2f, %.2f)", i, x, y);
-
- fFontInstance->getGlyphAdvance(glyphStorage[i], advance);
- x += advance.fX;
- y += advance.fY;
-+
-+
- }
-
- glyphStorage.setPosition(glyphCount, x, y, success);
-@@ -424,7 +429,7 @@
- return;
- }
-
-- LEReferenceTo<GlyphDefinitionTableHeader> gdefTable((GlyphDefinitionTableHeader *) CanonShaping::glyphDefinitionTable,
-+ LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(LETableReference::kStaticData, (GlyphDefinitionTableHeader *) CanonShaping::glyphDefinitionTable,
- CanonShaping::glyphDefinitionTableLen);
- CanonMarkFilter filter(gdefTable, success);
-
-@@ -464,9 +469,10 @@
- glyphStorage.getGlyphPosition(p + 1, next, ignore, success);
-
- xAdvance = next - prev;
-+ _LETRACE("p#%d (%.2f,%.2f)", p, xAdvance, 0);
- glyphStorage.adjustPosition(p, xAdjust, 0, success);
-
-- if (markFilter->accept(glyphStorage[p])) {
-+ if (markFilter->accept(glyphStorage[p], success)) {
- xAdjust -= xAdvance;
- }
-
-@@ -506,9 +512,13 @@
- glyphStorage.getGlyphPosition(p + 1, next, ignore, success);
-
- xAdvance = next - prev;
-+
-+ _LETRACE("p#%d (%.2f,%.2f)", p, xAdvance, 0);
-+
-+
- glyphStorage.adjustPosition(p, xAdjust, 0, success);
-
-- if (markFilter->accept(chars[c])) {
-+ if (markFilter->accept(chars[c], success)) {
- xAdjust -= xAdvance;
- }
-
-@@ -662,8 +672,10 @@
- break;
- }
- } else {
-- MorphTableHeader2 *morxTable = (MorphTableHeader2 *)fontInstance->getFontTable(morxTableTag);
-- if (morxTable != NULL && SWAPL(morxTable->version)==0x00020000) {
-+ LEReferenceTo<MorphTableHeader2> morxTable(fontInstance, morxTableTag, success);
-+ if (LE_SUCCESS(success) &&
-+ morxTable.isValid() &&
-+ SWAPL(morxTable->version)==0x00020000) {
- result = new GXLayoutEngine2(fontInstance, scriptCode, languageCode, morxTable, typoFlags, success);
- } else {
- LEReferenceTo<MorphTableHeader> mortTable(fontInstance, mortTableTag, success);
-@@ -687,7 +699,6 @@
- }
-
- case arabScriptCode:
-- //case hebrScriptCode:
- result = new UnicodeArabicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, success);
- 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-07-15 21:49:28.000000000 -0700
-@@ -156,8 +156,8 @@
- * @param fontInstance - the font for the text
- * @param scriptCode - the script for the text
- * @param languageCode - the language for the text
-- * @param typoFlags - the typographic control flags for the text. Set bit 1 if kerning
-- * is desired, set bit 2 if ligature formation is desired. Others are reserved.
-+ * @param typoFlags - the typographic control flags for the text (a bitfield). Use kTypoFlagKern
-+ * if kerning is desired, kTypoFlagLiga if ligature formation is desired. Others are reserved.
- * @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-07-15 21:49:28.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-07-15 21:49:28.000000000 -0700
-@@ -49,14 +49,20 @@
- return 0;
- }
-
-- if (coverageIndex >= 0) {
-+ LEReferenceToArrayOf<Offset> ligSetTableOffsetArrayRef(base, success, ligSetTableOffsetArray, SWAPW(ligSetCount));
-+
-+ if (coverageIndex >= 0 && LE_SUCCESS(success) && (le_uint32)coverageIndex < ligSetTableOffsetArrayRef.getCount()) {
- Offset ligSetTableOffset = SWAPW(ligSetTableOffsetArray[coverageIndex]);
-- const LigatureSetTable *ligSetTable = (const LigatureSetTable *) ((char *) this + ligSetTableOffset);
-+ LEReferenceTo<LigatureSetTable> ligSetTable(base, success, ligSetTableOffset);
-+
-+ if( LE_FAILURE(success) ) { return 0; }
- le_uint16 ligCount = SWAPW(ligSetTable->ligatureCount);
-
-- for (le_uint16 lig = 0; lig < ligCount; lig += 1) {
-+ LEReferenceTo<Offset> ligatureTableOffsetArray(base, success, ligSetTable->ligatureTableOffsetArray, ligCount);
-+ for (le_uint16 lig = 0; LE_SUCCESS(success) && lig < ligCount; lig += 1) {
- Offset ligTableOffset = SWAPW(ligSetTable->ligatureTableOffsetArray[lig]);
-- const LigatureTable *ligTable = (const LigatureTable *) ((char *)ligSetTable + ligTableOffset);
-+ LEReferenceTo<LigatureTable> ligTable(ligSetTable, success, ligTableOffset);
-+ if(LE_FAILURE(success)) { return 0; }
- le_uint16 compCount = SWAPW(ligTable->compCount) - 1;
- le_int32 startPosition = glyphIterator->getCurrStreamPosition();
- TTGlyphID ligGlyph = SWAPW(ligTable->ligGlyph);
-@@ -72,7 +78,7 @@
- }
- }
-
-- if (comp == compCount && (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, ligGlyph)))) {
-+ if (comp == compCount && (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, ligGlyph), success))) {
- GlyphIterator tempIterator(*glyphIterator);
- 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-07-15 21:49:28.000000000 -0700
-@@ -60,8 +60,10 @@
- LEReferenceTo<LookupSubtable> lookupSubtable = lookupTable->getLookupSubtable(lookupTable, subtable, success);
-
- delta = applySubtable(lookupSubtable, lookupType, glyphIterator, fontInstance, success);
--
-- if (delta > 0 || LE_FAILURE(success)) {
-+ if (delta > 0 && LE_FAILURE(success)) {
-+#if LE_TRACE
-+ _LETRACE("Posn #%d, type %X, applied subtable #%d/%d - %s\n", startPosition, lookupType, subtable, subtableCount, u_errorName((UErrorCode)success));
-+#endif
- return 1;
- }
-
-@@ -86,7 +88,7 @@
- }
-
- GlyphIterator glyphIterator(glyphStorage, glyphPositionAdjustments,
-- rightToLeft, 0, 0, glyphDefinitionTableHeader);
-+ rightToLeft, 0, 0, glyphDefinitionTableHeader, success);
- le_int32 newGlyphCount = glyphCount;
-
- for (le_uint16 order = 0; order < lookupOrderCount && LE_SUCCESS(success); order += 1) {
-@@ -94,6 +96,7 @@
- FeatureMask selectMask = lookupSelectArray[lookup];
-
- if (selectMask != 0) {
-+ _LETRACE("Processing order#%d/%d", order, lookupOrderCount);
- const LEReferenceTo<LookupTable> lookupTable = lookupListTable->getLookupTable(lookupListTable, lookup, success);
- if (!lookupTable.isValid() ||LE_FAILURE(success) ) {
- continue;
-@@ -103,8 +106,11 @@
- glyphIterator.reset(lookupFlags, selectMask);
-
- while (glyphIterator.findFeatureTag()) {
-- applyLookupTable(lookupTable, &glyphIterator, fontInstance, success); // TODO
-+ applyLookupTable(lookupTable, &glyphIterator, fontInstance, success);
- if (LE_FAILURE(success)) {
-+#if LE_TRACE
-+ _LETRACE("Failure for lookup 0x%x - %s\n", lookup, u_errorName((UErrorCode)success));
-+#endif
- return 0;
- }
- }
-@@ -138,7 +144,7 @@
- le_int32 LookupProcessor::selectLookups(const LEReferenceTo<FeatureTable> &featureTable, FeatureMask featureMask, le_int32 order, LEErrorCode &success)
- {
- le_uint16 lookupCount = featureTable.isValid()? SWAPW(featureTable->lookupCount) : 0;
-- le_int32 store = order;
-+ le_uint32 store = (le_uint32)order;
-
- LEReferenceToArrayOf<le_uint16> lookupListIndexArray(featureTable, success, featureTable->lookupListIndexArray, lookupCount);
-
-@@ -147,6 +153,9 @@
- if (lookupListIndex >= lookupSelectCount) {
- continue;
- }
-+ if (store >= lookupOrderCount) {
-+ continue;
-+ }
-
- lookupSelectArray[lookupListIndex] |= featureMask;
- lookupOrderArray[store++] = lookupListIndex;
-@@ -246,7 +255,7 @@
-
- if (requiredFeatureIndex != 0xFFFF) {
- requiredFeatureTable = featureListTable->getFeatureTable(featureListTable, requiredFeatureIndex, &requiredFeatureTag, success);
-- featureReferences += SWAPW(featureTable->lookupCount);
-+ featureReferences += SWAPW(requiredFeatureTable->lookupCount);
- }
-
- lookupOrderArray = LE_NEW_ARRAY(le_uint16, featureReferences);
-@@ -254,6 +263,7 @@
- success = LE_MEMORY_ALLOCATION_ERROR;
- return;
- }
-+ lookupOrderCount = featureReferences;
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -65,7 +65,7 @@
-
- if(LE_FAILURE(success)) return 0;
-
-- return coverageTable->getGlyphCoverage(glyphID);
-+ return coverageTable->getGlyphCoverage(coverageTable, glyphID, success);
- }
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -38,20 +38,28 @@
-
- U_NAMESPACE_BEGIN
-
--le_int32 MarkArray::getMarkClass(LEGlyphID glyphID, le_int32 coverageIndex, const LEFontInstance *fontInstance,
-- LEPoint &anchor) const
-+le_int32 MarkArray::getMarkClass(const LETableReference &base, LEGlyphID glyphID,
-+ le_int32 coverageIndex, const LEFontInstance *fontInstance,
-+ LEPoint &anchor, LEErrorCode &success) const
- {
- le_int32 markClass = -1;
-
-- if (coverageIndex >= 0) {
-+ if ( coverageIndex >= 0 && LE_SUCCESS(success) ) {
- le_uint16 mCount = SWAPW(markCount);
--
- if (coverageIndex < mCount) {
-+ LEReferenceToArrayOf<MarkRecord> markRecordArrayRef(base, success, markRecordArray, mCount);
-+ if(LE_FAILURE(success)) {
-+ return markClass;
-+ }
- const MarkRecord *markRecord = &markRecordArray[coverageIndex];
- Offset anchorTableOffset = SWAPW(markRecord->markAnchorTableOffset);
-- const AnchorTable *anchorTable = (AnchorTable *) ((char *) this + anchorTableOffset);
-+ LEReferenceTo<AnchorTable> anchorTable(base, success, anchorTableOffset);
-+
-+ if(LE_FAILURE(success)) {
-+ return markClass;
-+ }
-
-- anchorTable->getAnchor(glyphID, fontInstance, anchor);
-+ anchorTable->getAnchor(anchorTable, glyphID, fontInstance, anchor, success);
- markClass = SWAPW(markRecord->markClass);
- }
-
---- ./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-07-15 21:49:28.000000000 -0700
-@@ -54,8 +54,9 @@
- le_uint16 markCount;
- MarkRecord markRecordArray[ANY_NUMBER];
-
-- le_int32 getMarkClass(LEGlyphID glyphID, le_int32 coverageIndex, const LEFontInstance *fontInstance,
-- LEPoint &anchor) const;
-+ le_int32 getMarkClass(const LETableReference &base, LEGlyphID glyphID,
-+ le_int32 coverageIndex, const LEFontInstance *fontInstance,
-+ LEPoint &anchor, LEErrorCode &success) const;
- };
- 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-07-15 21:49:28.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);
-
-- if (markClass < 0 || markClass >= mcCount) {
-+ if (markClass < 0 || markClass >= mcCount || LE_FAILURE(success)) {
- // markGlyph isn't in the mark array or its
- // mark class is too big. The table is mal-formed!
- return 0;
-@@ -80,7 +81,8 @@
- GlyphIterator baseIterator(*glyphIterator, (le_uint16) (lfIgnoreMarks /*| lfIgnoreLigatures*/));
- LEGlyphID baseGlyph = findBaseGlyph(&baseIterator);
- le_int32 baseCoverage = getBaseCoverage(base, (LEGlyphID) baseGlyph, success);
-- const BaseArray *baseArray = (const BaseArray *) ((char *) this + SWAPW(baseArrayOffset));
-+ LEReferenceTo<BaseArray> baseArray(base, success, (const BaseArray *) ((char *) this + SWAPW(baseArrayOffset)));
-+ if(LE_FAILURE(success)) return 0;
- le_uint16 baseCount = SWAPW(baseArray->baseRecordCount);
-
- if (baseCoverage < 0 || baseCoverage >= baseCount) {
-@@ -89,19 +91,23 @@
- // table is mal-formed...
- return 0;
- }
-+ LEReferenceTo<BaseRecord> baseRecord(base, success, &baseArray->baseRecordArray[baseCoverage * mcCount]);
-+ if( LE_FAILURE(success) ) { return 0; }
-+ LEReferenceToArrayOf<Offset> baseAnchorTableOffsetArray(base, success, &(baseRecord->baseAnchorTableOffsetArray[0]), markClass+1);
-
-- const BaseRecord *baseRecord = &baseArray->baseRecordArray[baseCoverage * mcCount];
-+ if( LE_FAILURE(success) ) { return 0; }
- Offset anchorTableOffset = SWAPW(baseRecord->baseAnchorTableOffsetArray[markClass]);
-- const AnchorTable *anchorTable = (const AnchorTable *) ((char *) baseArray + anchorTableOffset);
-- LEPoint baseAnchor, markAdvance, pixels;
--
-- if (anchorTableOffset == 0) {
-+ if (anchorTableOffset <= 0) {
- // this means the table is mal-formed...
- glyphIterator->setCurrGlyphBaseOffset(baseIterator.getCurrStreamPosition());
- return 0;
- }
-
-- anchorTable->getAnchor(baseGlyph, fontInstance, baseAnchor);
-+ LEReferenceTo<AnchorTable> anchorTable(baseArray, success, anchorTableOffset);
-+ LEPoint baseAnchor, markAdvance, pixels;
-+
-+
-+ anchorTable->getAnchor(anchorTable, baseGlyph, fontInstance, baseAnchor, success);
-
- fontInstance->getGlyphAdvance(markGlyph, pixels);
- fontInstance->pixelsToUnits(pixels, markAdvance);
-@@ -109,6 +115,8 @@
- float anchorDiffX = baseAnchor.fX - markAnchor.fX;
- float anchorDiffY = baseAnchor.fY - markAnchor.fY;
-
-+ _LETRACE("Offset: (%.2f, %.2f) glyph 0x%X", anchorDiffX, anchorDiffY, markGlyph);
-+
- glyphIterator->setCurrGlyphBaseOffset(baseIterator.getCurrStreamPosition());
-
- if (glyphIterator->isRightToLeft()) {
-@@ -132,7 +140,6 @@
- gi.next();
- }
- // end of JK patch
--
- fontInstance->pixelsToUnits(pixels, baseAdvance);
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -65,8 +65,11 @@
- }
-
- 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, SWAPW(markArrayOffset));
-+ if( LE_FAILURE(success) ) {
-+ return 0;
-+ }
-+ le_int32 markClass = markArray->getMarkClass(markArray, markGlyph, markCoverage, fontInstance, markAnchor, success);
- le_uint16 mcCount = SWAPW(classCount);
-
- if (markClass < 0 || markClass >= mcCount) {
-@@ -79,7 +82,7 @@
- GlyphIterator ligatureIterator(*glyphIterator, (le_uint16) (lfIgnoreMarks /*| lfIgnoreBaseGlyphs*/));
- LEGlyphID ligatureGlyph = findLigatureGlyph(&ligatureIterator);
- le_int32 ligatureCoverage = getBaseCoverage(base, (LEGlyphID) ligatureGlyph, success);
-- const LigatureArray *ligatureArray = (const LigatureArray *) ((char *) this + SWAPW(baseArrayOffset));
-+ LEReferenceTo<LigatureArray> ligatureArray(base, success, SWAPW(baseArrayOffset));
- le_uint16 ligatureCount = SWAPW(ligatureArray->ligatureCount);
-
- if (ligatureCoverage < 0 || ligatureCoverage >= ligatureCount) {
-@@ -91,7 +94,7 @@
-
- le_int32 markPosition = glyphIterator->getCurrStreamPosition();
- Offset ligatureAttachOffset = SWAPW(ligatureArray->ligatureAttachTableOffsetArray[ligatureCoverage]);
-- const LigatureAttachTable *ligatureAttachTable = (const LigatureAttachTable *) ((char *) ligatureArray + ligatureAttachOffset);
-+ LEReferenceTo<LigatureAttachTable> ligatureAttachTable(ligatureArray, success, ligatureAttachOffset);
- le_int32 componentCount = SWAPW(ligatureAttachTable->componentCount);
- le_int32 component = ligatureIterator.getMarkComponent(markPosition);
-
-@@ -100,12 +103,14 @@
- component = componentCount - 1;
- }
-
-- const ComponentRecord *componentRecord = &ligatureAttachTable->componentRecordArray[component * mcCount];
-+ LEReferenceTo<ComponentRecord> componentRecord(base, success, &ligatureAttachTable->componentRecordArray[component * mcCount]);
-+ LEReferenceToArrayOf<Offset> ligatureAnchorTableOffsetArray(base, success, &(componentRecord->ligatureAnchorTableOffsetArray[0]), markClass+1);
-+ if( LE_FAILURE(success) ) { return 0; }
- Offset anchorTableOffset = SWAPW(componentRecord->ligatureAnchorTableOffsetArray[markClass]);
-- const AnchorTable *anchorTable = (const AnchorTable *) ((char *) ligatureAttachTable + anchorTableOffset);
-+ LEReferenceTo<AnchorTable> anchorTable(ligatureAttachTable, success, anchorTableOffset);
- LEPoint ligatureAnchor, markAdvance, pixels;
-
-- anchorTable->getAnchor(ligatureGlyph, fontInstance, ligatureAnchor);
-+ anchorTable->getAnchor(anchorTable, ligatureGlyph, fontInstance, ligatureAnchor, success);
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -66,8 +66,11 @@
- }
-
- 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, SWAPW(markArrayOffset));
-+ if(LE_FAILURE(success)) {
-+ return 0;
-+ }
-+ le_int32 markClass = markArray->getMarkClass(markArray, markGlyph, markCoverage, fontInstance, markAnchor, success);
- le_uint16 mcCount = SWAPW(classCount);
-
- if (markClass < 0 || markClass >= mcCount) {
-@@ -79,7 +82,8 @@
- GlyphIterator mark2Iterator(*glyphIterator);
- LEGlyphID mark2Glyph = findMark2Glyph(&mark2Iterator);
- le_int32 mark2Coverage = getBaseCoverage(base, (LEGlyphID) mark2Glyph, success);
-- const Mark2Array *mark2Array = (const Mark2Array *) ((char *) this + SWAPW(baseArrayOffset));
-+ LEReferenceTo<Mark2Array> mark2Array(base, success, (const Mark2Array *) ((char *) this + SWAPW(baseArrayOffset)));
-+ if(LE_FAILURE(success)) return 0;
- le_uint16 mark2Count = SWAPW(mark2Array->mark2RecordCount);
-
- if (mark2Coverage < 0 || mark2Coverage >= mark2Count) {
-@@ -89,9 +93,11 @@
- return 0;
- }
-
-- const Mark2Record *mark2Record = &mark2Array->mark2RecordArray[mark2Coverage * mcCount];
-+ LEReferenceTo<Mark2Record> mark2Record(base, success, &mark2Array->mark2RecordArray[mark2Coverage * mcCount]);
-+ if(LE_FAILURE(success)) return 0;
- Offset anchorTableOffset = SWAPW(mark2Record->mark2AnchorTableOffsetArray[markClass]);
-- const AnchorTable *anchorTable = (const AnchorTable *) ((char *) mark2Array + anchorTableOffset);
-+ LEReferenceTo<AnchorTable> anchorTable(mark2Array, success, anchorTableOffset);
-+ if(LE_FAILURE(success)) return 0;
- LEPoint mark2Anchor, markAdvance, pixels;
-
- if (anchorTableOffset == 0) {
-@@ -99,7 +105,7 @@
- return 0;
- }
-
-- anchorTable->getAnchor(mark2Glyph, fontInstance, mark2Anchor);
-+ anchorTable->getAnchor(anchorTable, mark2Glyph, fontInstance, mark2Anchor, success);
-
- fontInstance->getGlyphAdvance(markGlyph, pixels);
- fontInstance->pixelsToUnits(pixels, markAdvance);
-@@ -107,6 +113,8 @@
- float anchorDiffX = mark2Anchor.fX - markAnchor.fX;
- float anchorDiffY = mark2Anchor.fY - markAnchor.fY;
-
-+ _LETRACE("Offset: (%.2f, %.2f) glyph 0x%X mark2 0x%X", anchorDiffX, anchorDiffY, markGlyph, mark2Glyph);
-+
- glyphIterator->setCurrGlyphBaseOffset(mark2Iterator.getCurrStreamPosition());
-
- 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-07-15 21:49:28.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
- // glyphCount?
-- if (filter != NULL && filter->accept(glyph)) {
-+ if (filter != NULL && filter->accept(glyph, success)) {
- return 0;
- }
-+ if(LE_FAILURE(success)) return 0;
-
- le_int32 coverageIndex = getGlyphCoverage(base, glyph, success);
- le_uint16 seqCount = SWAPW(sequenceCount);
-@@ -67,7 +68,7 @@
-
- if (coverageIndex >= 0 && coverageIndex < seqCount) {
- Offset sequenceTableOffset = SWAPW(sequenceTableOffsetArray[coverageIndex]);
-- const SequenceTable *sequenceTable = (const SequenceTable *) ((char *) this + sequenceTableOffset);
-+ LEReferenceTo<SequenceTable> sequenceTable(base, success, sequenceTableOffset);
- le_uint16 glyphCount = SWAPW(sequenceTable->glyphCount);
-
- if (glyphCount == 0) {
-@@ -76,7 +77,7 @@
- } else if (glyphCount == 1) {
- TTGlyphID substitute = SWAPW(sequenceTable->substituteArray[0]);
-
-- if (filter != NULL && ! filter->accept(LE_SET_GLYPH(glyph, substitute))) {
-+ if (filter != NULL && ! filter->accept(LE_SET_GLYPH(glyph, substitute), success)) {
- return 0;
- }
-
-@@ -89,7 +90,7 @@
- for (le_int32 i = 0; i < glyphCount; i += 1) {
- TTGlyphID substitute = SWAPW(sequenceTable->substituteArray[i]);
-
-- if (! filter->accept(substitute)) {
-+ if (! filter->accept(substitute, success)) {
- return 0;
- }
- }
---- ./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-07-15 21:49:28.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)
- {
-+ _LETRACE("OTLE::adjustGPOS");
- if (LE_FAILURE(success)) {
- return;
- }
-@@ -510,14 +511,17 @@
- if (!fGPOSTable.isEmpty()) {
- if (fScriptTagV2 != nullScriptTag &&
- fGPOSTable->coversScriptAndLanguage(fGPOSTable, fScriptTagV2,fLangSysTag,success)) {
-+ _LETRACE("OTLE::process [0]");
- fGPOSTable->process(fGPOSTable, glyphStorage, adjustments, reverse, fScriptTagV2, fLangSysTag,
- fGDEFTable, success, fFontInstance, fFeatureMap, fFeatureMapCount, fFeatureOrder);
-
- } else {
-+ _LETRACE("OTLE::process [1]");
- fGPOSTable->process(fGPOSTable, glyphStorage, adjustments, reverse, fScriptTag, fLangSysTag,
- fGDEFTable, success, fFontInstance, fFeatureMap, fFeatureMapCount, fFeatureOrder);
- }
- } else if (fTypoFlags & LE_Kerning_FEATURE_FLAG) { /* kerning enabled */
-+ _LETRACE("OTLE::kerning");
- LETableReference kernTable(fFontInstance, LE_KERN_TABLE_TAG, success);
- KernTable kt(kernTable, success);
- kt.process(glyphStorage, success);
-@@ -546,6 +550,7 @@
-
- xPlacement = fFontInstance->xUnitsToPoints(xPlacement);
- yPlacement = fFontInstance->yUnitsToPoints(yPlacement);
-+ _LETRACE("OTLE GPOS: #%d, (%.2f,%.2f)", i, xPlacement, yPlacement);
- glyphStorage.adjustPosition(i, xAdjust + xPlacement, -(yAdjust + yPlacement), success);
-
- 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 2014-07-15 21:49:28.000000000 -0700
-@@ -80,6 +80,7 @@
- Offset OpenTypeUtilities::getTagOffset(LETag tag, const LEReferenceToArrayOf<TagAndOffsetRecord> &records, LEErrorCode &success)
- {
- 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;
-
- {
-- const ATag &aTag = records.getAlias(extra,success)->tag;
-+ const ATag &aTag = (r0+extra)->tag;
- if (SWAPT(aTag) <= tag) {
- index = extra;
- }
- }
-
-- while (probe > (1 << 0) && LE_SUCCESS(success)) {
-+ while (probe > (1 << 0)) {
- probe >>= 1;
-
- {
-- const ATag &aTag = records.getAlias(index+probe,success)->tag;
-+ const ATag &aTag = (r0+index+probe)->tag;
- if (SWAPT(aTag) <= tag) {
- index += probe;
- }
-@@ -107,9 +108,9 @@
- }
-
- {
-- const ATag &aTag = records.getAlias(index,success)->tag;
-+ const ATag &aTag = (r0+index)->tag;
- if (SWAPT(aTag) == tag) {
-- return SWAPW(records.getAlias(index,success)->offset);
-+ return SWAPW((r0+index)->offset);
- }
- }
-
---- ./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-07-15 21:49:28.000000000 -0700
-@@ -46,15 +46,14 @@
- public:
- static le_int8 highBit(le_int32 value);
- static Offset getTagOffset(LETag tag, const LEReferenceToArrayOf<TagAndOffsetRecord> &records, LEErrorCode &success);
-- /**
-- * @deprecated TODO remove
-- */
-+#if LE_ENABLE_RAW
- static le_int32 getGlyphRangeIndex(TTGlyphID glyphID, const GlyphRangeRecord *records, le_int32 recordCount) {
- LEErrorCode success = LE_NO_ERROR;
- LETableReference recordRef0((const le_uint8*)records);
- LEReferenceToArrayOf<GlyphRangeRecord> recordRef(recordRef0, success, (size_t)0, recordCount);
- return getGlyphRangeIndex(glyphID, recordRef, success);
- }
-+#endif
- static le_int32 getGlyphRangeIndex(TTGlyphID glyphID, const LEReferenceToArrayOf<GlyphRangeRecord> &records, LEErrorCode &success);
- 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-07-15 21:49:28.000000000 -0700
-@@ -76,19 +76,17 @@
- {
- LEGlyphID firstGlyph = glyphIterator->getCurrGlyphID();
- le_int32 coverageIndex = getGlyphCoverage(base, firstGlyph, success);
--
-- if (LE_FAILURE(success)) {
-- return 0;
-- }
- GlyphIterator tempIterator(*glyphIterator);
-
-- if (coverageIndex >= 0 && glyphIterator->next()) {
-+ LEReferenceToArrayOf<Offset> pairSetTableOffsetArrayRef(base, success, pairSetTableOffsetArray, SWAPW(pairSetCount));
-+
-+ if (LE_SUCCESS(success) && coverageIndex >= 0 && glyphIterator->next() && (le_uint32)coverageIndex < pairSetTableOffsetArrayRef.getCount()) {
- Offset pairSetTableOffset = SWAPW(pairSetTableOffsetArray[coverageIndex]);
-- LEReferenceTo<PairSetTable> pairSetTable(base, success, ((char *) this + pairSetTableOffset));
-- if (LE_FAILURE(success)) {
-- return 0;
-- }
-+ LEReferenceTo<PairSetTable> pairSetTable(base, success, pairSetTableOffset);
-+ if( LE_FAILURE(success) ) return 0;
- le_uint16 pairValueCount = SWAPW(pairSetTable->pairValueCount);
-+ LEReferenceTo<PairValueRecord> pairValueRecordArray(pairSetTable, success, pairSetTable->pairValueRecordArray);
-+ if( LE_FAILURE(success) ) return 0;
- le_int16 valueRecord1Size = ValueRecord::getSize(SWAPW(valueFormat1));
- le_int16 valueRecord2Size = ValueRecord::getSize(SWAPW(valueFormat2));
- le_int16 recordSize = sizeof(PairValueRecord) - sizeof(ValueRecord) + valueRecord1Size + valueRecord2Size;
-@@ -96,21 +94,22 @@
- LEReferenceTo<PairValueRecord> pairValueRecord;
-
- if (pairValueCount != 0) {
-- pairValueRecord = findPairValueRecord(base, (TTGlyphID) LE_GET_GLYPH(secondGlyph), pairSetTable->pairValueRecordArray, pairValueCount, recordSize, success);
-+ pairValueRecord = findPairValueRecord((TTGlyphID) LE_GET_GLYPH(secondGlyph), pairValueRecordArray, pairValueCount, recordSize, success);
- }
-
-- if (pairValueRecord.isEmpty()) {
-+ if (pairValueRecord.isEmpty() || LE_FAILURE(success)) {
- return 0;
- }
-
- if (valueFormat1 != 0) {
-- pairValueRecord->valueRecord1.adjustPosition(SWAPW(valueFormat1), (char *) this, tempIterator, fontInstance);
-+ pairValueRecord->valueRecord1.adjustPosition(SWAPW(valueFormat1), base, tempIterator, fontInstance, success);
- }
-
- if (valueFormat2 != 0) {
-- const ValueRecord *valueRecord2 = (const ValueRecord *) ((char *) &pairValueRecord->valueRecord1 + valueRecord1Size);
--
-- valueRecord2->adjustPosition(SWAPW(valueFormat2), (char *) this, *glyphIterator, fontInstance);
-+ LEReferenceTo<ValueRecord> valueRecord2(base, success, ((char *) &pairValueRecord->valueRecord1 + valueRecord1Size));
-+ if(LE_SUCCESS(success)) {
-+ valueRecord2->adjustPosition(SWAPW(valueFormat2), base, *glyphIterator, fontInstance, success);
-+ }
- }
-
- // back up glyphIterator so second glyph can be
-@@ -135,26 +134,28 @@
-
- if (coverageIndex >= 0 && glyphIterator->next()) {
- LEGlyphID secondGlyph = glyphIterator->getCurrGlyphID();
-- const ClassDefinitionTable *classDef1 = (const ClassDefinitionTable *) ((char *) this + SWAPW(classDef1Offset));
-- const ClassDefinitionTable *classDef2 = (const ClassDefinitionTable *) ((char *) this + SWAPW(classDef2Offset));
-- le_int32 class1 = classDef1->getGlyphClass(firstGlyph);
-- le_int32 class2 = classDef2->getGlyphClass(secondGlyph);
-+ const LEReferenceTo<ClassDefinitionTable> classDef1(base, success, SWAPW(classDef1Offset));
-+ const LEReferenceTo<ClassDefinitionTable> classDef2(base, success, SWAPW(classDef2Offset));
-+ le_int32 class1 = classDef1->getGlyphClass(classDef1, firstGlyph, success);
-+ le_int32 class2 = classDef2->getGlyphClass(classDef2, secondGlyph, success);
- le_int16 valueRecord1Size = ValueRecord::getSize(SWAPW(valueFormat1));
- le_int16 valueRecord2Size = ValueRecord::getSize(SWAPW(valueFormat2));
- le_int16 class2RecordSize = valueRecord1Size + valueRecord2Size;
- le_int16 class1RecordSize = class2RecordSize * SWAPW(class2Count);
-- const Class1Record *class1Record = (const Class1Record *) ((char *) class1RecordArray + (class1RecordSize * class1));
-- const Class2Record *class2Record = (const Class2Record *) ((char *) class1Record->class2RecordArray + (class2RecordSize * class2));
--
-+ const LEReferenceTo<Class1Record> class1Record(base, success, (const Class1Record *) ((char *) class1RecordArray + (class1RecordSize * class1)));
-+ const LEReferenceTo<Class2Record> class2Record(base, success, (const Class2Record *) ((char *) class1Record->class2RecordArray + (class2RecordSize * class2)));
-
-+ if( LE_SUCCESS(success) ) {
- if (valueFormat1 != 0) {
-- class2Record->valueRecord1.adjustPosition(SWAPW(valueFormat1), (char *) this, tempIterator, fontInstance);
-+ class2Record->valueRecord1.adjustPosition(SWAPW(valueFormat1), base, tempIterator, fontInstance, success);
- }
--
- if (valueFormat2 != 0) {
-- const ValueRecord *valueRecord2 = (const ValueRecord *) ((char *) &class2Record->valueRecord1 + valueRecord1Size);
--
-- valueRecord2->adjustPosition(SWAPW(valueFormat2), (const char *) this, *glyphIterator, fontInstance);
-+ const LEReferenceTo<ValueRecord> valueRecord2(base, success, ((char *) &class2Record->valueRecord1) + valueRecord1Size);
-+ LEReferenceTo<PairPositioningFormat2Subtable> thisRef(base, success, this);
-+ if(LE_SUCCESS(success)) {
-+ valueRecord2->adjustPosition(SWAPW(valueFormat2), thisRef, *glyphIterator, fontInstance, success);
-+ }
-+ }
- }
-
- // back up glyphIterator so second glyph can be
-@@ -166,23 +167,24 @@
- return 0;
- }
-
--LEReferenceTo<PairValueRecord> PairPositioningFormat1Subtable::findPairValueRecord(const LETableReference &base, TTGlyphID glyphID, const PairValueRecord *records, le_uint16 recordCount, le_uint16 recordSize, LEErrorCode &success) const
-+LEReferenceTo<PairValueRecord>
-+PairPositioningFormat1Subtable::findPairValueRecord(TTGlyphID glyphID, LEReferenceTo<PairValueRecord>& records,
-+ le_uint16 recordCount,
-+ le_uint16 recordSize, LEErrorCode &success) const
- {
- #if 1
- // The OpenType spec. says that the ValueRecord table is
- // sorted by secondGlyph. Unfortunately, there are fonts
- // around that have an unsorted ValueRecord table.
-- LEReferenceTo<PairValueRecord> record(base, success, records);
-- record.verifyLength(0, recordSize, success);
-+ LEReferenceTo<PairValueRecord> record(records);
-
- for(le_int32 r = 0; r < recordCount; r += 1) {
-- if (LE_FAILURE(success)) return (const PairValueRecord*)NULL;
-+ if(LE_FAILURE(success)) return LEReferenceTo<PairValueRecord>();
- if (SWAPW(record->secondGlyph) == glyphID) {
- return record;
- }
-
-- record = LEReferenceTo<PairValueRecord>(base, success, ((const char*)record.getAlias())+ recordSize);
-- record.verifyLength(0, recordSize, success);
-+ record.addOffset(recordSize, success);
- }
- #else
- #error dead code - not updated.
-@@ -211,7 +213,7 @@
- }
- #endif
-
-- return (const PairValueRecord*)NULL;
-+ return LEReferenceTo<PairValueRecord>();
- }
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -77,9 +77,8 @@
- le_uint32 process(const LEReferenceTo<PairPositioningFormat1Subtable> &base, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode &success) const;
-
- private:
-- LEReferenceTo<PairValueRecord> findPairValueRecord(const LETableReference &base, TTGlyphID glyphID, const PairValueRecord *records,
-+ LEReferenceTo<PairValueRecord> findPairValueRecord(TTGlyphID glyphID, LEReferenceTo<PairValueRecord> &records,
- le_uint16 recordCount, le_uint16 recordSize, LEErrorCode &success) const;
--
- };
- 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-07-15 21:49:28.000000000 -0700
-@@ -106,7 +106,8 @@
- }
- } else {
- LEReferenceToArrayOf<ScriptRecord> scriptRecordArrayRef(base, success, &scriptRecordArray[0], count);
-- scriptTableOffset = OpenTypeUtilities::getTagOffset(scriptTag, scriptRecordArrayRef, success); // TODO
-+
-+ scriptTableOffset = OpenTypeUtilities::getTagOffset(scriptTag, scriptRecordArrayRef, success);
- }
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -126,13 +126,13 @@
- linaScriptTag, /* 'lina' (LINA) */
- mandScriptTag, /* 'mand' (MANDAIC) */
- mayaScriptTag, /* 'maya' (MAYA) */
-- meroScriptTag, /* 'mero' (MERO) */
-+ meroScriptTag, /* 'mero' (MEROITIC_HIEROGLYPHS) */
- nkooScriptTag, /* 'nko ' (NKO) */
- orkhScriptTag, /* 'orkh' (OLD_TURKIC) */
- permScriptTag, /* 'perm' (PERM) */
- phagScriptTag, /* 'phag' (PHAGS_PA) */
- phnxScriptTag, /* 'phnx' (PHOENICIAN) */
-- plrdScriptTag, /* 'plrd' (PLRD) */
-+ plrdScriptTag, /* 'plrd' (MIAO/POLLARD) */
- roroScriptTag, /* 'roro' (RORO) */
- saraScriptTag, /* 'sara' (SARA) */
- syreScriptTag, /* 'syre' (SYRE) */
-@@ -158,7 +158,7 @@
- mteiScriptTag, /* 'mtei' (MEETEI_MAYEK) */
- armiScriptTag, /* 'armi' (IMPERIAL_ARAMAIC) */
- avstScriptTag, /* 'avst' (AVESTAN) */
-- cakmScriptTag, /* 'cakm' (CAKM) */
-+ cakmScriptTag, /* 'cakm' (CHAKMA) */
- koreScriptTag, /* 'kore' (KORE) */
- kthiScriptTag, /* 'kthi' (KAITHI) */
- maniScriptTag, /* 'mani' (MANI) */
-@@ -181,7 +181,7 @@
- kpelScriptTag, /* 'kpel' (KPEL) */
- lomaScriptTag, /* 'loma' (LOMA) */
- mendScriptTag, /* 'mend' (MEND) */
-- mercScriptTag, /* 'merc' (MERC) */
-+ mercScriptTag, /* 'merc' (MEROITIC_CURSIVE) */
- narbScriptTag, /* 'narb' (NARB) */
- 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-07-15 21:49:28.000000000 -0700
-@@ -140,13 +140,13 @@
- const LETag linaScriptTag = 0x6C696E61; /* 'lina' (LINA) */
- const LETag mandScriptTag = 0x6D616E64; /* 'mand' (MANDAIC) */
- const LETag mayaScriptTag = 0x6D617961; /* 'maya' (MAYA) */
--const LETag meroScriptTag = 0x6D65726F; /* 'mero' (MERO) */
-+const LETag meroScriptTag = 0x6D65726F; /* 'mero' (MEROITIC_HIEROGLYPHS) */
- const LETag nkooScriptTag = 0x6E6B6F20; /* 'nko ' (NKO) */
- const LETag orkhScriptTag = 0x6F726B68; /* 'orkh' (OLD_TURKIC) */
- const LETag permScriptTag = 0x7065726D; /* 'perm' (PERM) */
- const LETag phagScriptTag = 0x70686167; /* 'phag' (PHAGS_PA) */
- const LETag phnxScriptTag = 0x70686E78; /* 'phnx' (PHOENICIAN) */
--const LETag plrdScriptTag = 0x706C7264; /* 'plrd' (PLRD) */
-+const LETag plrdScriptTag = 0x706C7264; /* 'plrd' (MIAO) */
- const LETag roroScriptTag = 0x726F726F; /* 'roro' (RORO) */
- const LETag saraScriptTag = 0x73617261; /* 'sara' (SARA) */
- const LETag syreScriptTag = 0x73797265; /* 'syre' (SYRE) */
-@@ -172,7 +172,7 @@
- const LETag mteiScriptTag = 0x6D746569; /* 'mtei' (MEETEI_MAYEK) */
- const LETag armiScriptTag = 0x61726D69; /* 'armi' (IMPERIAL_ARAMAIC) */
- const LETag avstScriptTag = 0x61767374; /* 'avst' (AVESTAN) */
--const LETag cakmScriptTag = 0x63616B6D; /* 'cakm' (CAKM) */
-+const LETag cakmScriptTag = 0x63616B6D; /* 'cakm' (CHAKMA) */
- const LETag koreScriptTag = 0x6B6F7265; /* 'kore' (KORE) */
- const LETag kthiScriptTag = 0x6B746869; /* 'kthi' (KAITHI) */
- const LETag maniScriptTag = 0x6D616E69; /* 'mani' (MANI) */
-@@ -195,7 +195,7 @@
- const LETag kpelScriptTag = 0x6B70656C; /* 'kpel' (KPEL) */
- const LETag lomaScriptTag = 0x6C6F6D61; /* 'loma' (LOMA) */
- const LETag mendScriptTag = 0x6D656E64; /* 'mend' (MEND) */
--const LETag mercScriptTag = 0x6D657263; /* 'merc' (MERC) */
-+const LETag mercScriptTag = 0x6D657263; /* 'merc' (MEROITIC_CURSIVE) */
- 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-07-15 21:49:28.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-07-15 21:49:28.000000000 -0700
-@@ -65,16 +65,17 @@
-
- for (glyph = 0; glyph < glyphCount; glyph += 1) {
- LEGlyphID thisGlyph = glyphStorage[glyph];
-+ // lookupSegment already range checked by lookupSegment() function.
- const LookupSegment *lookupSegment = segmentArrayLookupTable->lookupSegment(segmentArrayLookupTable, segments, thisGlyph, success);
-
-- if (lookupSegment != NULL) {
-+ if (lookupSegment != NULL&& LE_SUCCESS(success)) {
- TTGlyphID firstGlyph = SWAPW(lookupSegment->firstGlyph);
-+ TTGlyphID lastGlyph = SWAPW(lookupSegment->lastGlyph);
- le_int16 offset = SWAPW(lookupSegment->value);
--
-- if (offset != 0) {
-- TTGlyphID *glyphArray = (TTGlyphID *) ((char *) subtableHeader.getAliasTODO() + offset);
-- TTGlyphID newGlyph = SWAPW(glyphArray[LE_GET_GLYPH(thisGlyph) - firstGlyph]);
--
-+ TTGlyphID thisGlyphId= LE_GET_GLYPH(thisGlyph);
-+ LEReferenceToArrayOf<TTGlyphID> glyphArray(subtableHeader, success, offset, lastGlyph - firstGlyph + 1);
-+ if (offset != 0 && thisGlyphId <= lastGlyph && thisGlyphId >= firstGlyph && LE_SUCCESS(success) ) {
-+ TTGlyphID newGlyph = SWAPW(glyphArray[thisGlyphId]);
- glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);
- }
- }
---- ./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-07-15 21:49:28.000000000 -0700
-@@ -75,7 +75,7 @@
- }
-
- if (coverageIndex >= 0) {
-- valueRecord.adjustPosition(SWAPW(valueFormat), (const char *) this, *glyphIterator, fontInstance);
-+ valueRecord.adjustPosition(SWAPW(valueFormat), base, *glyphIterator, fontInstance, success);
-
- return 1;
- }
-@@ -92,7 +92,7 @@
- }
-
- if (coverageIndex >= 0) {
-- valueRecordArray[0].adjustPosition(coverageIndex, SWAPW(valueFormat), (const char *) this, *glyphIterator, fontInstance);
-+ valueRecordArray[0].adjustPosition(coverageIndex, SWAPW(valueFormat), base, *glyphIterator, fontInstance, success);
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -76,7 +76,7 @@
- if (coverageIndex >= 0) {
- TTGlyphID substitute = ((TTGlyphID) LE_GET_GLYPH(glyph)) + SWAPW(deltaGlyphID);
-
-- if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, substitute))) {
-+ if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, substitute), success)) {
- glyphIterator->setCurrGlyphID(substitute);
- }
-
-@@ -97,7 +97,7 @@
- if (coverageIndex >= 0) {
- TTGlyphID substitute = SWAPW(substituteArray[coverageIndex]);
-
-- if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, substitute))) {
-+ if (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, substitute), success)) {
- 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-07-15 21:49:28.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 2014-07-15 21:49:28.000000000 -0700
-@@ -104,6 +104,10 @@
-
- int putGV(JNIEnv* env, jint gmask, jint baseIndex, jobject gvdata, const LayoutEngine* engine, int glyphCount) {
- int count = env->GetIntField(gvdata, gvdCountFID);
-+ if (count < 0) {
-+ JNU_ThrowInternalError(env, "count negative");
-+ return 0;
-+ }
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -39,7 +39,7 @@
- */
-
- #ifndef __TIBETANREORDERING_H
--#define __TIBETANORDERING_H
-+#define __TIBETANREORDERING_H
-
- /**
- * \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-07-15 21:49:28.000000000 -0700
-@@ -59,8 +59,8 @@
- return SWAPW(value);
- }
-
--void ValueRecord::adjustPosition(ValueFormat valueFormat, const char *base, GlyphIterator &glyphIterator,
-- const LEFontInstance *fontInstance) const
-+void ValueRecord::adjustPosition(ValueFormat valueFormat, const LETableReference& base, GlyphIterator &glyphIterator,
-+ const LEFontInstance *fontInstance, LEErrorCode &success) const
- {
- float xPlacementAdjustment = 0;
- float yPlacementAdjustment = 0;
-@@ -118,8 +118,8 @@
- Offset dtOffset = getFieldValue(valueFormat, vrfXPlaDevice);
-
- if (dtOffset != 0) {
-- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
-- le_int16 xAdj = dt->getAdjustment(xppem);
-+ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
-+ le_int16 xAdj = dt->getAdjustment(dt, xppem, success);
-
- xPlacementAdjustment += fontInstance->xPixelsToUnits(xAdj);
- }
-@@ -129,8 +129,8 @@
- Offset dtOffset = getFieldValue(valueFormat, vrfYPlaDevice);
-
- if (dtOffset != 0) {
-- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
-- le_int16 yAdj = dt->getAdjustment(yppem);
-+ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
-+ le_int16 yAdj = dt->getAdjustment(dt, yppem, success);
-
- yPlacementAdjustment += fontInstance->yPixelsToUnits(yAdj);
- }
-@@ -140,8 +140,8 @@
- Offset dtOffset = getFieldValue(valueFormat, vrfXAdvDevice);
-
- if (dtOffset != 0) {
-- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
-- le_int16 xAdj = dt->getAdjustment(xppem);
-+ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
-+ le_int16 xAdj = dt->getAdjustment(dt, xppem, success);
-
- xAdvanceAdjustment += fontInstance->xPixelsToUnits(xAdj);
- }
-@@ -151,8 +151,8 @@
- Offset dtOffset = getFieldValue(valueFormat, vrfYAdvDevice);
-
- if (dtOffset != 0) {
-- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
-- le_int16 yAdj = dt->getAdjustment(yppem);
-+ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
-+ le_int16 yAdj = dt->getAdjustment(dt, yppem, success);
-
- yAdvanceAdjustment += fontInstance->yPixelsToUnits(yAdj);
- }
-@@ -163,8 +163,8 @@
- xPlacementAdjustment, yPlacementAdjustment, xAdvanceAdjustment, yAdvanceAdjustment);
- }
-
--void ValueRecord::adjustPosition(le_int16 index, ValueFormat valueFormat, const char *base, GlyphIterator &glyphIterator,
-- const LEFontInstance *fontInstance) const
-+void ValueRecord::adjustPosition(le_int16 index, ValueFormat valueFormat, const LETableReference& base, GlyphIterator &glyphIterator,
-+ const LEFontInstance *fontInstance, LEErrorCode &success) const
- {
- float xPlacementAdjustment = 0;
- float yPlacementAdjustment = 0;
-@@ -222,8 +222,8 @@
- Offset dtOffset = getFieldValue(index, valueFormat, vrfXPlaDevice);
-
- if (dtOffset != 0) {
-- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
-- le_int16 xAdj = dt->getAdjustment(xppem);
-+ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
-+ le_int16 xAdj = dt->getAdjustment(dt, xppem, success);
-
- xPlacementAdjustment += fontInstance->xPixelsToUnits(xAdj);
- }
-@@ -233,8 +233,8 @@
- Offset dtOffset = getFieldValue(index, valueFormat, vrfYPlaDevice);
-
- if (dtOffset != 0) {
-- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
-- le_int16 yAdj = dt->getAdjustment(yppem);
-+ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
-+ le_int16 yAdj = dt->getAdjustment(dt, yppem, success);
-
- yPlacementAdjustment += fontInstance->yPixelsToUnits(yAdj);
- }
-@@ -244,8 +244,8 @@
- Offset dtOffset = getFieldValue(index, valueFormat, vrfXAdvDevice);
-
- if (dtOffset != 0) {
-- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
-- le_int16 xAdj = dt->getAdjustment(xppem);
-+ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
-+ le_int16 xAdj = dt->getAdjustment(dt, xppem, success);
-
- xAdvanceAdjustment += fontInstance->xPixelsToUnits(xAdj);
- }
-@@ -255,8 +255,8 @@
- Offset dtOffset = getFieldValue(index, valueFormat, vrfYAdvDevice);
-
- if (dtOffset != 0) {
-- const DeviceTable *dt = (const DeviceTable *) (base + dtOffset);
-- le_int16 yAdj = dt->getAdjustment(yppem);
-+ LEReferenceTo<DeviceTable> dt(base, success, dtOffset);
-+ le_int16 yAdj = dt->getAdjustment(dt, yppem, success);
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -53,10 +53,10 @@
-
- le_int16 getFieldValue(ValueFormat valueFormat, ValueRecordField field) const;
- le_int16 getFieldValue(le_int16 index, ValueFormat valueFormat, ValueRecordField field) const;
-- void adjustPosition(ValueFormat valueFormat, const char *base, GlyphIterator &glyphIterator,
-- const LEFontInstance *fontInstance) const;
-- void adjustPosition(le_int16 index, ValueFormat valueFormat, const char *base, GlyphIterator &glyphIterator,
-- const LEFontInstance *fontInstance) const;
-+ void adjustPosition(ValueFormat valueFormat, const LETableReference &base, GlyphIterator &glyphIterator,
-+ const LEFontInstance *fontInstance, LEErrorCode &success) const;
-+ void adjustPosition(le_int16 index, ValueFormat valueFormat, const LETableReference &base, GlyphIterator &glyphIterator,
-+ const LEFontInstance *fontInstance, LEErrorCode &success) const;
-
- 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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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 2014-07-15 21:49:28.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;
-+
-+ if (!profile) {
-+ return FALSE;
-+ }
-+
-+ io = profile->IOhandler;
-+ if (!io) {
-+ return FALSE;
-+ }
-+
-+ if (!io->Seek ||
-+ !(io->Seek==NULLSeek || io->Seek==MemorySeek || io->Seek==FileSeek))
-+ {
-+ return FALSE;
-+ }
-+ if (!io->Read ||
-+ !(io->Read==NULLRead || io->Read==MemoryRead || io->Read==FileRead))
-+ {
-+ return FALSE;
-+ }
-
-+ return TRUE;
-+}
-
- // Dump tag contents. If the profile is being modified, untouched tags are copied from FileOrig
- static
-@@ -1085,12 +1147,13 @@
- cmsIOHANDLER* io = Icc ->IOhandler;
- cmsTagDescriptor* TagDescriptor;
- cmsTagTypeSignature TypeBase;
-+ cmsTagTypeSignature Type;
- cmsTagTypeHandler* TypeHandler;
--
-+ cmsFloat64Number Version = cmsGetProfileVersion((cmsHPROFILE) Icc);
-+ cmsTagTypeHandler LocalTypeHandler;
-
- for (i=0; i < Icc -> TagCount; i++) {
-
--
- 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);
-- return 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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:28.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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.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-07-15 21:49:29.000000000 -0700
-@@ -661,7 +661,12 @@
- (sy2-sy1) != (jint)(dy2-dy1) ||
- oglc->extraAlpha != 1.0f;
- break;
--
-+#ifdef MACOSX
-+ case OGLC_VENDOR_ATI:
-+ // see 8024461
-+ viaTexture = JNI_TRUE;
-+ break;
-+#endif
- default:
- // 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-10-28 20:19:52.000000000 -0700
-@@ -26,7 +26,7 @@
- #ifndef OGLFuncs_h_Included
- #define OGLFuncs_h_Included
-
--#ifdef MACOSX
-+#ifdef _ALLBSD_SOURCE
- #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-07-15 21:49:29.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-07-15 21:49:29.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 2014-07-15 21:49:29.000000000 -0700
-@@ -29,7 +29,7 @@
- #include "sun_management_HotSpotDiagnostic.h"
-
- JNIEXPORT void JNICALL
--Java_sun_management_HotSpotDiagnostic_dumpHeap
-+Java_sun_management_HotSpotDiagnostic_dumpHeap0
- (JNIEnv *env, jobject dummy, jstring outputfile, jboolean live)
- {
- jmm_interface->DumpHeap0(env, outputfile, live);
---- ./jdk/src/share/native/sun/security/ec/ECC_JNI.cpp 2013-09-06 11:29:04.000000000 -0700
-+++ ./jdk/src/share/native/sun/security/ec/ECC_JNI.cpp 2014-07-15 21:54:46.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2009, 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
-@@ -62,24 +62,42 @@
- SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
- if (freeStruct)
- free(ecparams);
-+
-+}
-+
-+jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
-+{
-+ SECItem *s = (SECItem *)hSECItem;
-+
-+ jbyteArray jEncodedBytes = env->NewByteArray(s->len);
-+ if (jEncodedBytes == NULL) {
-+ return NULL;
-+ }
-+ // Copy bytes from a native SECItem buffer to java byte array
-+ env->SetByteArrayRegion(jEncodedBytes, 0, s->len, (jbyte *)s->data);
-+ if (env->ExceptionCheck()) { //should never happen
-+ return NULL;
-+ }
-+ return jEncodedBytes;
- }
-
- /*
- * Class: sun_security_ec_ECKeyPairGenerator
- * Method: generateECKeyPair
-- * Signature: (I[B[B)[J
-+ * Signature: (I[B[B)[B
- */
--JNIEXPORT jlongArray
-+JNIEXPORT jobjectArray
- JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
- (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
- {
-- ECPrivateKey *privKey; /* contains both public and private values */
-+ ECPrivateKey *privKey = NULL; /* contains both public and private values */
- ECParams *ecparams = NULL;
- SECKEYECParams params_item;
- jint jSeedLength;
- jbyte* pSeedBuffer = NULL;
-- jlongArray result = NULL;
-- jlong* resultElements = NULL;
-+ jobjectArray result = NULL;
-+ jclass baCls = NULL;
-+ jbyteArray jba;
-
- // Initialize the ECParams struct
- params_item.len = env->GetArrayLength(encodedParams);
-@@ -106,61 +124,64 @@
- }
-
- jboolean isCopy;
-- result = env->NewLongArray(2);
-- resultElements = env->GetLongArrayElements(result, &isCopy);
--
-- resultElements[0] = (jlong) &(privKey->privateValue); // private big integer
-- resultElements[1] = (jlong) &(privKey->publicValue); // encoded ec point
-+ baCls = env->FindClass("[B");
-+ if (baCls == NULL) {
-+ goto cleanup;
-+ }
-+ result = env->NewObjectArray(2, baCls, NULL);
-+ if (result == NULL) {
-+ goto cleanup;
-+ }
-+ jba = getEncodedBytes(env, &(privKey->privateValue));
-+ if (jba == NULL) {
-+ result = NULL;
-+ goto cleanup;
-+ }
-+ env->SetObjectArrayElement(result, 0, jba); // big integer
-+ if (env->ExceptionCheck()) { // should never happen
-+ result = NULL;
-+ goto cleanup;
-+ }
-
-- // If the array is a copy then we must write back our changes
-- if (isCopy == JNI_TRUE) {
-- env->ReleaseLongArrayElements(result, resultElements, 0);
-+ jba = getEncodedBytes(env, &(privKey->publicValue));
-+ if (jba == NULL) {
-+ result = NULL;
-+ goto cleanup;
-+ }
-+ env->SetObjectArrayElement(result, 1, jba); // encoded ec point
-+ if (env->ExceptionCheck()) { // should never happen
-+ result = NULL;
-+ goto cleanup;
- }
-
- cleanup:
- {
-- if (params_item.data)
-+ if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+ }
-
-- if (ecparams)
-+ if (ecparams) {
- FreeECParams(ecparams, true);
-+ }
-
- if (privKey) {
- FreeECParams(&privKey->ecParams, false);
- SECITEM_FreeItem(&privKey->version, B_FALSE);
-- // Don't free privKey->privateValue and privKey->publicValue
-+ SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
-+ SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
-+ free(privKey);
- }
-
-- if (pSeedBuffer)
-+ if (pSeedBuffer) {
- delete [] pSeedBuffer;
-+ }
- }
-
- return result;
- }
-
- /*
-- * Class: sun_security_ec_ECKeyPairGenerator
-- * Method: getEncodedBytes
-- * Signature: (J)[B
-- */
--JNIEXPORT jbyteArray
--JNICALL Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes
-- (JNIEnv *env, jclass clazz, jlong hSECItem)
--{
-- SECItem *s = (SECItem *)hSECItem;
-- jbyteArray jEncodedBytes = env->NewByteArray(s->len);
--
-- // Copy bytes from a native SECItem buffer to Java byte array
-- env->SetByteArrayRegion(jEncodedBytes, 0, s->len, (jbyte *)s->data);
--
-- // Use B_FALSE to free only the SECItem->data
-- SECITEM_FreeItem(s, B_FALSE);
--
-- return jEncodedBytes;
--}
--
--/*
- * Class: sun_security_ec_ECDSASignature
- * Method: signDigest
- * Signature: ([B[B[B[B)[B
-@@ -234,21 +255,31 @@
-
- cleanup:
- {
-- if (params_item.data)
-+ if (params_item.data) {
- env->ReleaseByteArrayElements(encodedParams,
- (jbyte *) params_item.data, JNI_ABORT);
-+ }
-
-- if (pDigestBuffer)
-+ if (privKey.privateValue.data) {
-+ env->ReleaseByteArrayElements(privateKey,
-+ (jbyte *) privKey.privateValue.data, JNI_ABORT);
-+ }
-+
-+ if (pDigestBuffer) {
- delete [] pDigestBuffer;
-+ }
-
-- if (pSignedDigestBuffer)
-+ if (pSignedDigestBuffer) {
- delete [] pSignedDigestBuffer;
-+ }
-
-- if (pSeedBuffer)
-+ if (pSeedBuffer) {
- delete [] pSeedBuffer;
-+ }
-
-- if (ecparams)
-+ if (ecparams) {
- FreeECParams(ecparams, true);
-+ }
- }
-
- return jSignedDigest;
---- ./jdk/src/share/native/sun/security/krb5/nativeccache.c 2013-09-06 11:29:04.000000000 -0700
-+++ ./jdk/src/share/native/sun/security/krb5/nativeccache.c 2014-07-15 21:49:29.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
-@@ -264,13 +264,22 @@
-
- }
-
-+int isIn(krb5_enctype e, int n, jint* etypes)
-+{
-+ int i;
-+ for (i=0; i<n; i++) {
-+ if (e == etypes[i]) return 1;
-+ }
-+ return 0;
-+}
-+
- /*
- * Class: sun_security_krb5_Credentials
- * Method: acquireDefaultNativeCreds
- * Signature: ()Lsun/security/krb5/Credentials;
- */
- JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativeCreds
--(JNIEnv *env, jclass krbcredsClass)
-+(JNIEnv *env, jclass krbcredsClass, jintArray jetypes)
- {
- jobject krbCreds = NULL;
- krb5_error_code err = 0;
-@@ -279,6 +288,8 @@
- krb5_creds creds;
- krb5_flags flags = 0;
- krb5_context kcontext = NULL;
-+ int netypes;
-+ jint *etypes = NULL;
-
- /* Initialize the Kerberos 5 context */
- err = krb5_init_context (&kcontext);
-@@ -295,6 +306,9 @@
- err = krb5_cc_start_seq_get (kcontext, ccache, &cursor);
- }
-
-+ netypes = (*env)->GetArrayLength(env, jetypes);
-+ etypes = (jint *) (*env)->GetIntArrayElements(env, jetypes, NULL);
-+
- if (!err) {
- while ((err = krb5_cc_next_cred (kcontext, ccache, &cursor, &creds)) == 0) {
- char *serverName = NULL;
-@@ -305,7 +319,8 @@
- }
-
- if (!err) {
-- if (strncmp (serverName, "krbtgt", strlen("krbtgt")) == 0) {
-+ if (strncmp (serverName, "krbtgt", sizeof("krbtgt")-1) == 0 &&
-+ isIn(creds.keyblock.enctype, netypes, etypes)) {
- jobject ticket, clientPrincipal, targetPrincipal, encryptionKey;
- jobject ticketFlags, startTime, endTime;
- jobject authTime, renewTillTime, hostAddresses;
-@@ -321,7 +336,7 @@
- targetPrincipal = BuildClientPrincipal(env, kcontext, creds.server);
- if (targetPrincipal == NULL) goto cleanup;
-
-- // Build a com.ibm.security.krb5.Ticket
-+ // Build a sun/security/krb5/internal/Ticket
- ticket = BuildTicket(env, &creds.ticket);
- if (ticket == NULL) goto cleanup;
-
-@@ -353,7 +368,7 @@
- krbcredsConstructor = (*env)->GetMethodID(env, krbcredsClass, "<init>",
- "(Lsun/security/krb5/internal/Ticket;Lsun/security/krb5/PrincipalName;Lsun/security/krb5/PrincipalName;Lsun/security/krb5/EncryptionKey;Lsun/security/krb5/internal/TicketFlags;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/HostAddresses;)V");
- if (krbcredsConstructor == 0) {
-- printf("Couldn't find com.ibm.security.krb5.Credentials constructor\n");
-+ printf("Couldn't find sun.security.krb5.internal.Ticket constructor\n");
- break;
- }
- }
-@@ -409,6 +424,10 @@
- printiferr (err, "while finishing ticket retrieval");
- }
-
-+ if (etypes != NULL) {
-+ (*env)->ReleaseIntArrayElements(env, jetypes, etypes, 0);
-+ }
-+
- krb5_free_context (kcontext);
- return krbCreds;
- }
---- ./jdk/src/solaris/back/linker_md.c 2013-09-06 11:29:05.000000000 -0700
-+++ ./jdk/src/solaris/back/linker_md.c 2014-10-28 20:19:52.000000000 -0700
-@@ -55,29 +55,27 @@
- #endif
-
- static void dll_build_name(char* buffer, size_t buflen,
-- const char* pname, const char* fname) {
-- // Based on os_solaris.cpp
-+ const char* paths, const char* fname) {
-+ char *path, *paths_copy, *next_token;
-
-- char *path_sep = PATH_SEPARATOR;
-- char *pathname = (char *)pname;
-- while (strlen(pathname) > 0) {
-- char *p = strchr(pathname, *path_sep);
-- if (p == NULL) {
-- p = pathname + strlen(pathname);
-- }
-- /* check for NULL path */
-- if (p == pathname) {
-- continue;
-- }
-- (void)snprintf(buffer, buflen, "%.*s/lib%s." LIB_SUFFIX, (p - pathname),
-- pathname, fname);
-+ paths_copy = strdup(paths);
-+ if (paths_copy == NULL) {
-+ return;
-+ }
-+
-+ next_token = NULL;
-+ path = strtok_r(paths_copy, PATH_SEPARATOR, &next_token);
-
-+ while (path != NULL) {
-+ snprintf(buffer, buflen, "%s/lib%s." LIB_SUFFIX, path, fname);
- if (access(buffer, F_OK) == 0) {
- break;
- }
-- pathname = p + 1;
- *buffer = '\0';
-+ path = strtok_r(NULL, PATH_SEPARATOR, &next_token);
- }
-+
-+ free(paths_copy);
- }
-
- /*
-@@ -98,7 +96,7 @@
- * appropriate pre and extensions to a filename and the path
- */
- void
--dbgsysBuildLibName(char *holder, int holderlen, char *pname, char *fname)
-+dbgsysBuildLibName(char *holder, int holderlen, const char *pname, const char *fname)
- {
- const int pnamelen = pname ? strlen(pname) : 0;
-
---- ./jdk/src/solaris/back/util_md.h 2013-09-06 11:29:05.000000000 -0700
-+++ ./jdk/src/solaris/back/util_md.h 2014-10-28 20:19:52.000000000 -0700
-@@ -51,7 +51,7 @@
-
- /* On little endian machines, convert java big endian numbers. */
-
--#if defined(_LITTLE_ENDIAN)
-+#if (BYTE_ORDER == LITTLE_ENDIAN)
-
- #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-10-28 20:19:52.000000000 -0700
-@@ -100,6 +100,27 @@
- /* Compute physical memory by asking the OS */
- uint64_t
- physical_memory(void) {
-+#if !defined(MACOSX) && defined(_ALLBSD_SOURCE)
-+ uint64_t result;
-+#ifdef HW_PHYSMEM64
-+ int64_t physmem;
-+ int name[2] = { CTL_HW, HW_PHYSMEM64 };
-+#else
-+ unsigned long physmem;
-+ int name[2] = { CTL_HW, HW_PHYSMEM };
-+#endif
-+ size_t physmem_len = sizeof(physmem);
-+# define UINT64_FORMAT "%" PRIu64
-+
-+ if (sysctl(name, 2, &physmem, &physmem_len, NULL, 0) == -1)
-+ physmem = 256 * MB;
-+
-+ result = (uint64_t)physmem;
-+
-+ JLI_TraceLauncher("physical memory: " UINT64_FORMAT " (%.3fGB)\n",
-+ result, result / (double) GB);
-+ return result;
-+#else /* !_ALLBSD_SOURCE */
- const uint64_t pages = (uint64_t) sysconf(_SC_PHYS_PAGES);
- const uint64_t page_size = (uint64_t) sysconf(_SC_PAGESIZE);
- const uint64_t result = pages * page_size;
-@@ -110,4 +131,5 @@
- " physical memory: " UINT64_FORMAT " (%.3fGB)\n",
- pages, page_size, result, result / (double) GB);
- return result;
-+#endif
- }
---- ./jdk/src/solaris/bin/ergo.h 2013-09-06 11:29:05.000000000 -0700
-+++ ./jdk/src/solaris/bin/ergo.h 2014-10-28 20:19:52.000000000 -0700
-@@ -33,6 +33,10 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#ifdef _ALLBSD_SOURCE
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#endif
-
- #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-10-28 20:19:52.000000000 -0700
-@@ -106,7 +106,7 @@
-
- #endif /* __solaris__ */
-
--#ifdef __linux__
-+#if !defined(MACOSX) && (defined(__linux__) || defined(_ALLBSD_SOURCE))
-
- /*
- * A utility method for asking the CPU about itself.
-@@ -171,6 +171,12 @@
- #endif /* _LP64 */
- }
-
-+#ifdef __linux__
-+#define OSNAMEPREFIX "linux_"
-+#else
-+#define OSNAMEPREFIX "bsd_"
-+#endif
-+
- /* The definition of a server-class machine for linux-i586 */
- jboolean
- ServerClassMachineImpl(void) {
-@@ -193,11 +199,11 @@
- result = JNI_TRUE;
- }
- }
-- JLI_TraceLauncher("linux_" LIBARCHNAME "_ServerClassMachine: %s\n",
-+ JLI_TraceLauncher(OSNAMEPREFIX LIBARCHNAME "_ServerClassMachine: %s\n",
- (result == JNI_TRUE ? "true" : "false"));
- return result;
- }
--#endif /* __linux__ */
-+#endif /* !MACOSX && (__linux__ || _ALLBSD_SOURCE) */
-
- /*
- * Routines shared by solaris-i586 and linux-i586.
-@@ -308,6 +314,15 @@
- /* Compute the number of physical processors, not logical processors */
- static unsigned long
- physical_processors(void) {
-+#if !defined(MACOSX) && defined(_ALLBSD_SOURCE)
-+ unsigned long result;
-+ int name[2] = { CTL_HW, HW_NCPU };
-+ size_t rlen = sizeof(result);
-+
-+ if (sysctl(name, 2, &result, &rlen, NULL, 0) == -1)
-+ result = 1;
-+ return result;
-+#else
- const long sys_processors = sysconf(_SC_NPROCESSORS_CONF);
- unsigned long result = sys_processors;
-
-@@ -320,4 +335,5 @@
- }
- JLI_TraceLauncher("physical processors: %lu\n", result);
- return result;
-+#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-10-28 20:19:52.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -899,8 +899,9 @@
- * onwards the filename returned in DL_info structure from dladdr is
- * an absolute pathname so technically realpath isn't required.
- * On Linux we read the executable name from /proc/self/exe.
-- * As a fallback, and for platforms other than Solaris and Linux,
-- * we use FindExecName to compute the executable name.
-+ * On *BSD we read the executable name from /proc/curproc/file.
-+ * As a fallback, and for platforms other than Solaris, Linux, and
-+ * *BSD, we use FindExecName to compute the executable name.
- */
- const char*
- SetExecname(char **argv)
-@@ -927,9 +928,13 @@
- }
- }
- }
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(_ALLBSD_SOURCE)
- {
-+#if defined(_ALLBSD_SOURCE)
-+ const char* self = "/proc/curproc/file";
-+#else
- const char* self = "/proc/self/exe";
-+#endif
- char buf[PATH_MAX+1];
- int len = readlink(self, buf, PATH_MAX);
- if (len >= 0) {
-@@ -937,7 +942,7 @@
- exec_path = JLI_StringDup(buf);
- }
- }
--#else /* !__solaris__ && !__linux__ */
-+#else /* !__solaris__ && !__linux__ && !_ALLBSD_SOURCE */
- {
- /* Not implemented */
- }
-@@ -950,15 +955,46 @@
- return exec_path;
- }
-
-+#if !defined(MACOSX) && defined(_ALLBSD_SOURCE)
-+/*
-+ * BSD's implementation of CounterGet()
-+ */
-+int64_t
-+CounterGet()
-+{
-+ struct timeval tv;
-+ gettimeofday(&tv, NULL);
-+ return (tv.tv_sec * 1000) + tv.tv_usec;
-+}
-+#endif
-+
- /* --- Splash Screen shared library support --- */
- static const char* SPLASHSCREEN_SO = JNI_LIB_NAME("splashscreen");
- static void* hSplashLib = NULL;
-
- void* SplashProcAddress(const char* name) {
- if (!hSplashLib) {
-- const char * splashLibPath;
-- splashLibPath = SPLASHSCREEN_SO;
-- hSplashLib = dlopen(splashLibPath, RTLD_LAZY | RTLD_GLOBAL);
-+ int ret;
-+ char jrePath[MAXPATHLEN];
-+ char splashPath[MAXPATHLEN];
-+
-+ if (!GetJREPath(jrePath, sizeof(jrePath), GetArch(), JNI_FALSE)) {
-+ JLI_ReportErrorMessage(JRE_ERROR1);
-+ return NULL;
-+ }
-+ ret = JLI_Snprintf(splashPath, sizeof(splashPath), "%s/lib/%s/%s",
-+ jrePath, GetArch(), SPLASHSCREEN_SO);
-+
-+ if (ret >= (int) sizeof(splashPath)) {
-+ JLI_ReportErrorMessage(JRE_ERROR11);
-+ return NULL;
-+ }
-+ if (ret < 0) {
-+ JLI_ReportErrorMessage(JRE_ERROR13);
-+ return NULL;
-+ }
-+ hSplashLib = dlopen(splashPath, RTLD_LAZY | RTLD_GLOBAL);
-+ JLI_TraceLauncher("Info: loaded %s\n", splashPath);
- }
- 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-10-28 20:19:52.000000000 -0700
-@@ -33,6 +33,10 @@
- #include <sys/time.h>
- #define CounterGet() (gethrtime()/1000)
- #define Counter2Micros(counts) (counts)
-+#elif !defined(MACOSX) && defined(_ALLBSD_SOURCE)
-+/* CounterGet() is implemented in java_md_solinux.c */
-+int64_t CounterGet(void);
-+#define Counter2Micros(counts) (counts)
- #else /* ! HAVE_GETHRTIME */
- #define CounterGet() (0)
- #define Counter2Micros(counts) (1)
-@@ -48,6 +52,9 @@
- #ifdef __linux__
- static const char *system_dir = "/usr/java";
- static const char *user_dir = "/java";
-+#elif !defined(MACOSX) && defined(_ALLBSD_SOURCE)
-+static const char *system_dir = PACKAGE_PATH "/openjdk7";
-+static const char *user_dir = "/java";
- #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-10-28 20:19:52.000000000 -0700
-@@ -63,11 +63,66 @@
- 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");
-+
-+ String osname = System.getProperty("os.name");
-+ if (osname.endsWith("BSD")) {
-+ String osArch = System.getProperty("os.arch");
-+ helperpath = toCString(javahome + "/lib/" + osArch + "/jspawnhelper");
-+ } else {
-+ 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 +135,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 +188,9 @@
- final boolean redirectErrorStream)
- throws IOException {
-
-- pid = forkAndExec(prog,
-+ pid = forkAndExec(launchMechanism.value,
-+ helperpath,
-+ prog,
- argBlock, argc,
- envBlock, envc,
- dir,
-@@ -236,11 +294,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();
- }
-
- /**
-@@ -253,40 +310,54 @@
- * able to read any buffered data lingering in the OS pipe buffer.
- */
- static class ProcessPipeInputStream extends BufferedInputStream {
-+ private final Object closeLock = new Object();
-+
- ProcessPipeInputStream(int fd) {
- super(new FileInputStream(newFileDescriptor(fd)));
- }
-
-- private static byte[] drainInputStream(InputStream in)
-+ private InputStream drainInputStream(InputStream in)
- throws IOException {
-- if (in == null) return null;
- int n = 0;
- int j;
- byte[] a = null;
-- while ((j = in.available()) > 0) {
-+ synchronized (closeLock) {
-+ if (buf == null) // asynchronous close()?
-+ return null; // discard
-+ j = in.available();
-+ }
-+ while (j > 0) {
- a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j);
-- n += in.read(a, n, j);
-+ synchronized (closeLock) {
-+ if (buf == null) // asynchronous close()?
-+ return null; // discard
-+ n += in.read(a, n, j);
-+ j = in.available();
-+ }
- }
-- return (a == null || n == a.length) ? a : Arrays.copyOf(a, n);
-+ return (a == null) ?
-+ ProcessBuilder.NullInputStream.INSTANCE :
-+ new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n));
- }
-
- /** Called by the process reaper thread when the process exits. */
- synchronized void processExited() {
-- // Most BufferedInputStream methods are synchronized, but close()
-- // is not, and so we have to handle concurrent racing close().
- try {
- InputStream in = this.in;
- if (in != null) {
-- byte[] stragglers = drainInputStream(in);
-+ InputStream stragglers = drainInputStream(in);
- in.close();
-- this.in = (stragglers == null) ?
-- ProcessBuilder.NullInputStream.INSTANCE :
-- new ByteArrayInputStream(stragglers);
-- if (buf == null) // asynchronous close()?
-- this.in = null;
-+ this.in = stragglers;
- }
-- } catch (IOException ignored) {
-- // probably an asynchronous close().
-+ } catch (IOException ignored) { }
-+ }
-+
-+ @Override
-+ public void close() throws IOException {
-+ // BufferedInputStream#close() is not synchronized unlike most other methods.
-+ // Synchronizing helps avoid racing with drainInputStream().
-+ synchronized (closeLock) {
-+ super.close();
- }
- }
- }
---- ./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-07-15 21:49:29.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();
- }
-
- /**
-@@ -253,40 +305,54 @@
- * able to read any buffered data lingering in the OS pipe buffer.
- */
- static class ProcessPipeInputStream extends BufferedInputStream {
-+ private final Object closeLock = new Object();
-+
- ProcessPipeInputStream(int fd) {
- super(new FileInputStream(newFileDescriptor(fd)));
- }
-
-- private static byte[] drainInputStream(InputStream in)
-+ private InputStream drainInputStream(InputStream in)
- throws IOException {
-- if (in == null) return null;
- int n = 0;
- int j;
- byte[] a = null;
-- while ((j = in.available()) > 0) {
-+ synchronized (closeLock) {
-+ if (buf == null) // asynchronous close()?
-+ return null; // discard
-+ j = in.available();
-+ }
-+ while (j > 0) {
- a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j);
-- n += in.read(a, n, j);
-+ synchronized (closeLock) {
-+ if (buf == null) // asynchronous close()?
-+ return null; // discard
-+ n += in.read(a, n, j);
-+ j = in.available();
-+ }
- }
-- return (a == null || n == a.length) ? a : Arrays.copyOf(a, n);
-+ return (a == null) ?
-+ ProcessBuilder.NullInputStream.INSTANCE :
-+ new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n));
- }
-
- /** Called by the process reaper thread when the process exits. */
- synchronized void processExited() {
-- // Most BufferedInputStream methods are synchronized, but close()
-- // is not, and so we have to handle concurrent racing close().
- try {
- InputStream in = this.in;
- if (in != null) {
-- byte[] stragglers = drainInputStream(in);
-+ InputStream stragglers = drainInputStream(in);
- in.close();
-- this.in = (stragglers == null) ?
-- ProcessBuilder.NullInputStream.INSTANCE :
-- new ByteArrayInputStream(stragglers);
-- if (buf == null) // asynchronous close()?
-- this.in = null;
-+ this.in = stragglers;
- }
-- } catch (IOException ignored) {
-- // probably an asynchronous close().
-+ } catch (IOException ignored) { }
-+ }
-+
-+ @Override
-+ public void close() throws IOException {
-+ // BufferedInputStream#close() is not synchronized unlike most other methods.
-+ // Synchronizing helps avoid racing with drainInputStream().
-+ synchronized (closeLock) {
-+ super.close();
- }
- }
- }
---- ./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-07-15 21:49:29.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/MotifDnDConstants.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -190,7 +190,7 @@
- try {
- Native.putLong(data, motifWindow);
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XlibWrapper.XChangeProperty(XToolkit.getDisplay(),
- defaultRootWindow,
- XA_MOTIF_DRAG_WINDOW.getAtom(),
-@@ -198,10 +198,10 @@
- XConstants.PropModeReplace,
- data, 1);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write motif drag window handle.");
- }
-
-@@ -394,7 +394,7 @@
- }
- }
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XlibWrapper.XChangeProperty(XToolkit.getDisplay(),
- motifWindow,
- XA_MOTIF_DRAG_TARGETS.getAtom(),
-@@ -402,15 +402,15 @@
- XConstants.PropModeReplace,
- data, tableSize);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
-
- // Create a new motif window and retry.
- motifWindow = createMotifWindow();
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XlibWrapper.XChangeProperty(XToolkit.getDisplay(),
- motifWindow,
- XA_MOTIF_DRAG_TARGETS.getAtom(),
-@@ -418,10 +418,10 @@
- XConstants.PropModeReplace,
- data, tableSize);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write motif drag targets property.");
- }
- }
-@@ -534,16 +534,16 @@
- // CARD32 icc_handle
- unsafe.putInt(structData + 4, (int)XA_MOTIF_ATOM_0.getAtom());
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XlibWrapper.XChangeProperty(XToolkit.getDisplay(), window,
- XA_MOTIF_ATOM_0.getAtom(),
- XA_MOTIF_DRAG_INITIATOR_INFO.getAtom(),
- 8, XConstants.PropModeReplace,
- structData, MOTIF_INITIATOR_INFO_SIZE);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write drag initiator info");
- }
- } finally {
-@@ -567,16 +567,16 @@
- unsafe.putShort(data + 10, (short)0); /* pad */
- unsafe.putInt(data + 12, dataSize);
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XlibWrapper.XChangeProperty(XToolkit.getDisplay(), window,
- XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
- XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
- 8, XConstants.PropModeReplace,
- data, dataSize);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write Motif receiver info property");
- }
- } finally {
---- ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java 2014-07-15 21:49:29.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
-@@ -162,16 +162,16 @@
- unsafe.putInt(data + 12, dataSize);
- }
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XlibWrapper.XChangeProperty(XToolkit.getDisplay(), embedder,
- MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
- MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
- 8, XConstants.PropModeReplace,
- data, dataSize);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write Motif receiver info property");
- }
- } finally {
-@@ -236,16 +236,16 @@
-
- unsafe.putInt(data + 4, tproxy);
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XlibWrapper.XChangeProperty(XToolkit.getDisplay(), embedder,
- MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
- MotifDnDConstants.XA_MOTIF_DRAG_RECEIVER_INFO.getAtom(),
- 8, XConstants.PropModeReplace,
- data, dataSize);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write Motif receiver info property");
- }
- }
-@@ -412,15 +412,15 @@
- */
- XWindowAttributes wattr = new XWindowAttributes();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
- source_win, wattr.pData);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (status == 0 ||
-- (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
-+ if ((status == 0) ||
-+ ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
- throw new XException("XGetWindowAttributes failed");
- }
-
-@@ -429,15 +429,15 @@
- wattr.dispose();
- }
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- XlibWrapper.XSelectInput(XToolkit.getDisplay(), source_win,
- source_win_mask |
- XConstants.StructureNotifyMask);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("XSelectInput failed");
- }
-
-@@ -1024,10 +1024,10 @@
- if (sourceWindow != 0) {
- XToolkit.awtLock();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- XlibWrapper.XSelectInput(XToolkit.getDisplay(), sourceWindow,
- sourceWindowMask);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
- } finally {
- XToolkit.awtUnlock();
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -99,7 +99,7 @@
- }
-
- if (errorHandler != null) {
-- XToolkit.WITH_XERROR_HANDLER(errorHandler);
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);
- }
- Native.putLong(data, 0);
- int status = XlibWrapper.XGetWindowProperty(XToolkit.getDisplay(), window, property.getAtom(),
-@@ -112,7 +112,7 @@
- }
-
- if (errorHandler != null) {
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
- }
- return status;
- } finally {
---- ./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-07-15 21:49:29.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/XConstants.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XConstants.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2009, 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
---- ./jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -96,14 +96,14 @@
- action_count++;
- }
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndActionList.setAtomData(window,
- XAtom.XA_ATOM,
- data, action_count);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- cleanup();
- throw new XException("Cannot write XdndActionList property");
- }
-@@ -117,14 +117,14 @@
- try {
- Native.put(data, formats);
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndTypeList.setAtomData(window,
- XAtom.XA_ATOM,
- data, formats.length);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- cleanup();
- throw new XException("Cannot write XdndActionList property");
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -88,12 +88,12 @@
- try {
- Native.putLong(data, 0, XDnDConstants.XDND_PROTOCOL_VERSION);
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndAware.setAtomData(window, XAtom.XA_ATOM, data, 1);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write XdndAware property");
- }
- } finally {
-@@ -205,54 +205,50 @@
-
- /* The proxy window must have the XdndAware set, as XDnD protocol
- prescribes to check the proxy window for XdndAware. */
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndAware.setAtomData(newProxy, XAtom.XA_ATOM,
- data, 1);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() !=
-- XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write XdndAware property");
- }
-
- Native.putLong(data, 0, newProxy);
-
- /* The proxy window must have the XdndProxy set to point to itself.*/
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndProxy.setAtomData(newProxy, XAtom.XA_WINDOW,
- data, 1);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() !=
-- XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write XdndProxy property");
- }
-
- Native.putLong(data, 0, XDnDConstants.XDND_PROTOCOL_VERSION);
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndAware.setAtomData(embedder, XAtom.XA_ATOM,
- data, 1);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() !=
-- XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write XdndAware property");
- }
-
- Native.putLong(data, 0, newProxy);
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndProxy.setAtomData(embedder, XAtom.XA_WINDOW,
- data, 1);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() !=
-- XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write XdndProxy property");
- }
- } finally {
-@@ -278,27 +274,25 @@
- try {
- Native.putLong(data, 0, entry.getVersion());
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndAware.setAtomData(embedder, XAtom.XA_ATOM,
- data, 1);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() !=
-- XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write XdndAware property");
- }
-
- Native.putLong(data, 0, (int)entry.getProxy());
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndProxy.setAtomData(embedder, XAtom.XA_WINDOW,
- data, 1);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() !=
-- XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("Cannot write XdndProxy property");
- }
- } finally {
-@@ -541,15 +535,15 @@
- */
- XWindowAttributes wattr = new XWindowAttributes();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
- source_win, wattr.pData);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (status == 0 ||
-- (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
-+ if ((status == 0) ||
-+ ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
- throw new XException("XGetWindowAttributes failed");
- }
-
-@@ -558,15 +552,15 @@
- wattr.dispose();
- }
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- XlibWrapper.XSelectInput(XToolkit.getDisplay(), source_win,
- source_win_mask |
- XConstants.StructureNotifyMask);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("XSelectInput failed");
- }
-
-@@ -963,10 +957,10 @@
- if (sourceWindow != 0) {
- XToolkit.awtLock();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- XlibWrapper.XSelectInput(XToolkit.getDisplay(), sourceWindow,
- sourceWindowMask);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
- } finally {
- XToolkit.awtUnlock();
- }
-@@ -1111,15 +1105,15 @@
-
- XToolkit.awtLock();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XDnDConstants.XA_XdndTypeList.setAtomData(xclient.get_window(),
- XAtom.XA_ATOM,
- wpg.getData(),
- wpg.getNumberOfItems());
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- if (logger.isLoggable(PlatformLogger.WARNING)) {
- logger.warning("Cannot set XdndTypeList on the proxy window");
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -181,15 +181,15 @@
- long time) {
- XWindowAttributes wattr = new XWindowAttributes();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
- targetWindow, wattr.pData);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (status == 0 ||
-- (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
-+ if ((status == 0) ||
-+ ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
- throw new XException("XGetWindowAttributes failed");
- }
-
-@@ -198,15 +198,15 @@
- wattr.dispose();
- }
-
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- XlibWrapper.XSelectInput(XToolkit.getDisplay(), targetWindow,
- targetWindowMask |
- XConstants.StructureNotifyMask);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("XSelectInput failed");
- }
-
-@@ -214,10 +214,10 @@
- }
-
- protected final void finalizeDrop() {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- XlibWrapper.XSelectInput(XToolkit.getDisplay(), targetWindow,
- targetWindowMask);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
- }
-
- public abstract boolean processProxyModeEvent(XClientMessageEvent xclient,
---- ./jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -168,14 +168,14 @@
- if (dest_x >= 0 && dest_y >= 0) {
- XWindowAttributes wattr = new XWindowAttributes();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
- window, wattr.pData);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (status == 0 ||
-- (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
-+ if ((status == 0) ||
-+ ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
- continue;
- }
-
-@@ -222,14 +222,14 @@
- long event_mask = 0;
- XWindowAttributes wattr = new XWindowAttributes();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
- embedder, wattr.pData);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (status == 0 ||
-- (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
-+ if ((status == 0) ||
-+ ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
- throw new XException("XGetWindowAttributes failed");
- }
-
-@@ -240,13 +240,13 @@
- }
-
- if ((event_mask & XConstants.PropertyChangeMask) == 0) {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- XlibWrapper.XSelectInput(XToolkit.getDisplay(), embedder,
- event_mask | XConstants.PropertyChangeMask);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("XSelectInput failed");
- }
- }
-@@ -394,13 +394,13 @@
-
- /* Restore the original event mask for the embedder. */
- if ((event_mask & XConstants.PropertyChangeMask) == 0) {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- XlibWrapper.XSelectInput(XToolkit.getDisplay(), embedder,
- event_mask);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- throw new XException("XSelectInput failed");
- }
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -295,15 +295,15 @@
- try {
- XWindowAttributes wattr = new XWindowAttributes();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
- xembed.handle, wattr.pData);
-
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (status == 0 ||
-- (XToolkit.saved_error != null &&
-- XToolkit.saved_error.get_error_code() != XConstants.Success)) {
-+ if ((status == 0) ||
-+ ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
- return null;
- }
-
---- ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2009, 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
-@@ -38,7 +38,7 @@
- public static class XBaseErrorHandler extends XErrorHandler {
- @Override
- public int handleError(long display, XErrorEvent err) {
-- return XToolkit.SAVED_ERROR_HANDLER(display, err);
-+ return XErrorHandlerUtil.SAVED_XERROR_HANDLER(display, err);
- }
- }
-
---- ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,168 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+package sun.awt.X11;
-+
-+import java.security.AccessController;
-+import sun.awt.SunToolkit;
-+import sun.security.action.GetBooleanAction;
-+import sun.util.logging.PlatformLogger;
-+
-+/**
-+ * This class contains code of the global toolkit error handler, exposes static
-+ * methods which allow to set and unset synthetic error handlers.
-+ */
-+public final class XErrorHandlerUtil {
-+ private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XErrorHandlerUtil");
-+
-+ /**
-+ * The connection to X11 window server.
-+ */
-+ private static long display;
-+
-+ /**
-+ * Error handler at the moment of {@code XErrorHandlerUtil} initialization.
-+ */
-+ private static long saved_error_handler;
-+
-+ /**
-+ * XErrorEvent being handled.
-+ */
-+ static volatile XErrorEvent saved_error;
-+
-+ /**
-+ * Current error handler or null if no error handler is set.
-+ */
-+ private static XErrorHandler current_error_handler;
-+
-+ /**
-+ * Value of sun.awt.noisyerrorhandler system property.
-+ */
-+ private static boolean noisyAwtHandler = AccessController.doPrivileged(
-+ new GetBooleanAction("sun.awt.noisyerrorhandler"));
-+
-+ /**
-+ * The flag indicating that {@code init} was called already.
-+ */
-+ private static boolean initPassed;
-+
-+ /**
-+ * Guarantees that no instance of this class can be created.
-+ */
-+ private XErrorHandlerUtil() {}
-+
-+ /**
-+ * Sets the toolkit global error handler, stores the connection to X11 server,
-+ * which will be used during an error handling process. This method is called
-+ * once from {@code awt_init_Display} function defined in {@code awt_GraphicsEnv.c}
-+ * file immediately after the connection to X11 window server is opened.
-+ * @param display the connection to X11 server which should be stored
-+ */
-+ private static void init(long display) {
-+ SunToolkit.awtLock();
-+ try {
-+ if (!initPassed) {
-+ XErrorHandlerUtil.display = display;
-+ saved_error_handler = XlibWrapper.SetToolkitErrorHandler();
-+ initPassed = true;
-+ }
-+ } finally {
-+ SunToolkit.awtUnlock();
-+ }
-+ }
-+
-+ /**
-+ * Sets a synthetic error handler. Must be called with the acquired AWT lock.
-+ * @param handler the synthetic error handler to set
-+ */
-+ public static void WITH_XERROR_HANDLER(XErrorHandler handler) {
-+ saved_error = null;
-+ current_error_handler = handler;
-+ }
-+
-+ /**
-+ * Unsets a current synthetic error handler. Must be called with the acquired AWT lock.
-+ */
-+ public static void RESTORE_XERROR_HANDLER() {
-+ RESTORE_XERROR_HANDLER(true);
-+ }
-+
-+ private static void RESTORE_XERROR_HANDLER(boolean doXSync) {
-+ if (doXSync) {
-+ // Wait until all requests are processed by the X server
-+ // and only then uninstall the error handler.
-+ XSync();
-+ }
-+ current_error_handler = null;
-+ }
-+
-+ /**
-+ * Should be called under LOCK.
-+ */
-+ public static int SAVED_XERROR_HANDLER(long display, XErrorEvent error) {
-+ if (saved_error_handler != 0) {
-+ // Default XErrorHandler may just terminate the process. Don't call it.
-+ // return XlibWrapper.CallErrorHandler(saved_error_handler, display, error.pData);
-+ }
-+ if (log.isLoggable(PlatformLogger.FINE)) {
-+ log.fine("Unhandled XErrorEvent: " +
-+ "id=" + error.get_resourceid() + ", " +
-+ "serial=" + error.get_serial() + ", " +
-+ "ec=" + error.get_error_code() + ", " +
-+ "rc=" + error.get_request_code() + ", " +
-+ "mc=" + error.get_minor_code());
-+ }
-+ return 0;
-+ }
-+
-+ /**
-+ * Called from the native code when an error occurs.
-+ */
-+ private static int globalErrorHandler(long display, long event_ptr) {
-+ if (noisyAwtHandler) {
-+ XlibWrapper.PrintXErrorEvent(display, event_ptr);
-+ }
-+ XErrorEvent event = new XErrorEvent(event_ptr);
-+ saved_error = event;
-+ try {
-+ if (current_error_handler != null) {
-+ return current_error_handler.handleError(display, event);
-+ } else {
-+ return SAVED_XERROR_HANDLER(display, event);
-+ }
-+ } catch (Throwable z) {
-+ log.fine("Error in GlobalErrorHandler", z);
-+ }
-+ return 0;
-+ }
-+
-+ private static void XSync() {
-+ SunToolkit.awtLock();
-+ try {
-+ XlibWrapper.XSync(display, 0);
-+ } finally {
-+ SunToolkit.awtUnlock();
-+ }
-+ }
-+}
---- ./jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2008, 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
-@@ -26,9 +26,11 @@
-
- import java.awt.Component;
- import java.awt.Window;
--import sun.util.logging.PlatformLogger;
-+
-+import sun.awt.AWTAccessor;
- import sun.awt.CausedFocusEvent;
- import sun.awt.KeyboardFocusManagerPeerImpl;
-+import sun.util.logging.PlatformLogger;
-
- public class XKeyboardFocusManagerPeer extends KeyboardFocusManagerPeerImpl {
- private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XKeyboardFocusManagerPeer");
-@@ -68,13 +70,13 @@
-
- synchronized(this) {
- if (currentFocusedWindow != null) {
-- from = (XWindowPeer)currentFocusedWindow.getPeer();
-+ from = (XWindowPeer)AWTAccessor.getComponentAccessor().getPeer(currentFocusedWindow);
- }
-
- currentFocusedWindow = win;
-
- if (currentFocusedWindow != null) {
-- to = (XWindowPeer)currentFocusedWindow.getPeer();
-+ to = (XWindowPeer)AWTAccessor.getComponentAccessor().getPeer(currentFocusedWindow);
- }
- }
-
---- ./jdk/src/solaris/classes/sun/awt/X11/XQueryTree.java 2013-09-06 11:29:06.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XQueryTree.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2005, 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
-@@ -61,7 +61,7 @@
- }
- __executed = true;
- if (errorHandler != null) {
-- XToolkit.WITH_XERROR_HANDLER(errorHandler);
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);
- }
- Native.putLong(children_ptr, 0);
- int status =
-@@ -72,7 +72,7 @@
- children_ptr,
- nchildren_ptr );
- if (errorHandler != null) {
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
- }
- return status;
- } finally {
---- ./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-07-15 21:49:29.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;
-@@ -127,7 +128,6 @@
- initIDs();
- setBackingStoreType();
- }
-- noisyAwtHandler = AccessController.doPrivileged(new GetBooleanAction("sun.awt.noisyerrorhandler"));
- }
-
- /*
-@@ -136,78 +136,6 @@
- */
- static native long getTrayIconDisplayTimeout();
-
-- //---- ERROR HANDLER CODE ----//
--
-- /*
-- * Error handler at the moment of XToolkit initialization
-- */
-- private static long saved_error_handler;
--
-- /*
-- * XErrorEvent being handled
-- */
-- static volatile XErrorEvent saved_error;
--
-- /*
-- * Current error handler or null if no error handler is set
-- */
-- private static XErrorHandler current_error_handler;
--
-- /*
-- * Value of sun.awt.noisyerrorhandler system property
-- */
-- private static boolean noisyAwtHandler;
--
-- public static void WITH_XERROR_HANDLER(XErrorHandler handler) {
-- saved_error = null;
-- current_error_handler = handler;
-- }
--
-- public static void RESTORE_XERROR_HANDLER() {
-- // wait until all requests are processed by the X server
-- // and only then uninstall the error handler
-- XSync();
-- current_error_handler = null;
-- }
--
-- // Should be called under LOCK
-- public static int SAVED_ERROR_HANDLER(long display, XErrorEvent error) {
-- if (saved_error_handler != 0) {
-- // Default XErrorHandler may just terminate the process. Don't call it.
-- // return XlibWrapper.CallErrorHandler(saved_error_handler, display, error.pData);
-- }
-- if (log.isLoggable(PlatformLogger.FINE)) {
-- log.fine("Unhandled XErrorEvent: " +
-- "id=" + error.get_resourceid() + ", " +
-- "serial=" + error.get_serial() + ", " +
-- "ec=" + error.get_error_code() + ", " +
-- "rc=" + error.get_request_code() + ", " +
-- "mc=" + error.get_minor_code());
-- }
-- return 0;
-- }
--
-- // Called from the native code when an error occurs
-- private static int globalErrorHandler(long display, long event_ptr) {
-- if (noisyAwtHandler) {
-- XlibWrapper.PrintXErrorEvent(display, event_ptr);
-- }
-- XErrorEvent event = new XErrorEvent(event_ptr);
-- saved_error = event;
-- try {
-- if (current_error_handler != null) {
-- return current_error_handler.handleError(display, event);
-- } else {
-- return SAVED_ERROR_HANDLER(display, event);
-- }
-- } catch (Throwable z) {
-- log.fine("Error in GlobalErrorHandler", z);
-- }
-- return 0;
-- }
--
-- //---- END OF ERROR HANDLER CODE ----//
--
- private native static void initIDs();
- native static void waitForEvents(long nextTaskTime);
- static Thread toolkitThread;
-@@ -304,20 +232,12 @@
- areExtraMouseButtonsEnabled = Boolean.parseBoolean(System.getProperty("sun.awt.enableExtraMouseButtons", "true"));
- //set system property if not yet assigned
- System.setProperty("sun.awt.enableExtraMouseButtons", ""+areExtraMouseButtonsEnabled);
--
-- saved_error_handler = XlibWrapper.SetToolkitErrorHandler();
- } finally {
- awtUnlock();
- }
- 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 +299,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/X11/XTranslateCoordinates.java 2013-09-06 11:29:07.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2005, 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
-@@ -68,7 +68,7 @@
- }
- __executed = true;
- if (errorHandler != null) {
-- XToolkit.WITH_XERROR_HANDLER(errorHandler);
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);
- }
- int status =
- XlibWrapper.XTranslateCoordinates(XToolkit.getDisplay(),
-@@ -80,7 +80,7 @@
- dest_y_ptr,
- child_ptr );
- if (errorHandler != null) {
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
- }
- return status;
- } finally {
---- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2013-09-06 11:29:07.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2014-07-15 21:49:29.000000000 -0700
-@@ -283,12 +283,12 @@
- winmgr_running = false;
- substruct.set_event_mask(XConstants.SubstructureRedirectMask);
-
-- XToolkit.WITH_XERROR_HANDLER(detectWMHandler);
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(detectWMHandler);
- XlibWrapper.XChangeWindowAttributes(XToolkit.getDisplay(),
- XToolkit.getDefaultRootWindow(),
- XConstants.CWEventMask,
- substruct.pData);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
- /*
- * If no WM is running then our selection for SubstructureRedirect
-@@ -617,15 +617,16 @@
-
- XToolkit.awtLock();
- try {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
- XlibWrapper.XChangePropertyS(XToolkit.getDisplay(), XToolkit.getDefaultRootWindow(),
- XA_ICEWM_WINOPTHINT.getAtom(),
- XA_ICEWM_WINOPTHINT.getAtom(),
- 8, XConstants.PropModeReplace,
- new String(opt));
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
-
-- if (XToolkit.saved_error != null && XToolkit.saved_error.get_error_code() != XConstants.Success) {
-+ if ((XErrorHandlerUtil.saved_error != null) &&
-+ (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
- log.finer("Erorr getting XA_ICEWM_WINOPTHINT property");
- return false;
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/XlibUtil.java 2013-09-06 11:29:07.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XlibUtil.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -151,8 +151,8 @@
- {
- int status = xtc.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- if ((status != 0) &&
-- ((XToolkit.saved_error == null) ||
-- (XToolkit.saved_error.get_error_code() == XConstants.Success)))
-+ ((XErrorHandlerUtil.saved_error == null) ||
-+ (XErrorHandlerUtil.saved_error.get_error_code() == XConstants.Success)))
- {
- translated = new Point(xtc.get_dest_x(), xtc.get_dest_y());
- }
-@@ -345,13 +345,13 @@
- XWindowAttributes wattr = new XWindowAttributes();
- try
- {
-- XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
-+ XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
- int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
- window, wattr.pData);
-- XToolkit.RESTORE_XERROR_HANDLER();
-+ XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
- if ((status != 0) &&
-- ((XToolkit.saved_error == null) ||
-- (XToolkit.saved_error.get_error_code() == XConstants.Success)))
-+ ((XErrorHandlerUtil.saved_error == null) ||
-+ (XErrorHandlerUtil.saved_error.get_error_code() == XConstants.Success)))
- {
- return wattr.get_map_state();
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2013-09-06 11:29:07.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2014-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2009, 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
-@@ -992,7 +992,7 @@
- pw.println("\t\t\t}");
- pw.println("\t\t\t__executed = true;");
- pw.println("\t\t\tif (errorHandler != null) {");
-- pw.println("\t\t\t XToolkit.WITH_XERROR_HANDLER(errorHandler);");
-+ pw.println("\t\t\t XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);");
- pw.println("\t\t\t}");
- iter = ft.getArguments().iterator();
- while (iter.hasNext()) {
-@@ -1021,7 +1021,7 @@
- }
- pw.println("\t\t\t);");
- pw.println("\t\t\tif (errorHandler != null) {");
-- pw.println("\t\t\t XToolkit.RESTORE_XERROR_HANDLER();");
-+ pw.println("\t\t\t XErrorHandlerUtil.RESTORE_XERROR_HANDLER();");
- pw.println("\t\t\t}");
- if (!ft.isVoid()) {
- pw.println("\t\t\treturn status;");
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -213,7 +213,7 @@
- if (fontID != null) {
- fileName = (String)fontNameMap.get(fontID);
- /* On Linux check for the Lucida Oblique fonts */
-- if (fileName == null && FontUtilities.isLinux && !isOpenJDK()) {
-+ if (fileName == null && (FontUtilities.isLinux || FontUtilities.isBSD) && !isOpenJDK()) {
- if (oblmap == null) {
- initObliqueLucidaFontMap();
- }
-@@ -712,7 +712,7 @@
- if (fontConfigDirs == null) {
- return;
- }
-- if (FontUtilities.isLinux) {
-+ if (FontUtilities.isLinux || FontUtilities.isBSD) {
- fontConfigDirs.add(jreLibDirName+File.separator+"oblique-fonts");
- }
- fontdirs = (String[])fontConfigDirs.toArray(new String[0]);
-@@ -740,7 +740,7 @@
- */
- FontConfiguration mFontConfig = new MFontConfiguration(this);
- if (FontUtilities.isOpenSolaris ||
-- (FontUtilities.isLinux &&
-+ ((FontUtilities.isLinux || FontUtilities.isBSD) &&
- (!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-07-15 21:49:29.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/font/FcFontConfiguration.java 2013-09-06 11:29:07.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/font/FcFontConfiguration.java 2014-07-15 21:54:44.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
-@@ -33,6 +33,7 @@
- import java.net.InetAddress;
- import java.net.UnknownHostException;
- import java.nio.charset.Charset;
-+import java.nio.charset.StandardCharsets;
- import java.nio.file.Files;
- import java.util.HashMap;
- import java.util.HashSet;
-@@ -173,8 +174,16 @@
- }
-
- @Override
-- public FontDescriptor[] getFontDescriptors(String fontName, int style) {
-- return new FontDescriptor[0];
-+ protected FontDescriptor[] buildFontDescriptors(int fontIndex, int styleIndex) {
-+ CompositeFontDescriptor[] cfi = get2DCompositeFontInfo();
-+ int idx = fontIndex * NUM_STYLES + styleIndex;
-+ String[] componentFaceNames = cfi[idx].getComponentFaceNames();
-+ FontDescriptor[] ret = new FontDescriptor[componentFaceNames.length];
-+ for (int i = 0; i < componentFaceNames.length; i++) {
-+ ret[i] = new FontDescriptor(componentFaceNames[i], StandardCharsets.UTF_8.newEncoder(), new int[0]);
-+ }
-+
-+ return ret;
- }
-
- @Override
-@@ -250,10 +259,12 @@
- }
-
- String[] fileNames = new String[numFonts];
-+ String[] faceNames = new String[numFonts];
-
- int index;
- for (index = 0; index < fcFonts.length; index++) {
- fileNames[index] = fcFonts[index].fontFile;
-+ faceNames[index] = fcFonts[index].familyName;
- }
-
- if (installedFallbackFontFiles != null) {
-@@ -266,7 +277,7 @@
- = new CompositeFontDescriptor(
- faceName,
- 1,
-- null,
-+ faceNames,
- fileNames,
- null, 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-10-28 20:19:52.000000000 -0700
-@@ -0,0 +1,89 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package sun.net;
-+
-+import java.security.AccessController;
-+
-+/**
-+ * Determines the ephemeral port range in use on this system.
-+ * If this cannot be determined, then the default settings
-+ * of the OS are returned.
-+ */
-+
-+public final class PortConfig {
-+
-+ private static int defaultUpper, defaultLower;
-+ private final static int upper, lower;
-+
-+ private PortConfig() {}
-+
-+ static {
-+ AccessController.doPrivileged(
-+ new java.security.PrivilegedAction<Void>() {
-+ public Void run() {
-+ System.loadLibrary("net");
-+ String os = System.getProperty("os.name");
-+ if (os.startsWith("Linux")) {
-+ defaultLower = 32768;
-+ defaultUpper = 61000;
-+ } else if (os.startsWith("SunOS")) {
-+ defaultLower = 32768;
-+ defaultUpper = 65535;
-+ } else if (os.contains("OS X") || os.endsWith("BSD")) {
-+ defaultLower = 49152;
-+ defaultUpper = 65535;
-+ } else {
-+ throw new InternalError(
-+ "sun.net.PortConfig: unknown OS");
-+ }
-+ return null;
-+ }
-+ });
-+
-+ int v = getLower0();
-+ if (v == -1) {
-+ v = defaultLower;
-+ }
-+ lower = v;
-+
-+ v = getUpper0();
-+ if (v == -1) {
-+ v = defaultUpper;
-+ }
-+ upper = v;
-+ }
-+
-+ static native int getLower0();
-+ static native int getUpper0();
-+
-+ public static int getLower() {
-+ return lower;
-+ }
-+
-+ public static int getUpper() {
-+ return upper;
-+ }
-+}
---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java 2013-09-06 11:29:08.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java 2014-10-28 20:19:52.000000000 -0700
-@@ -50,7 +50,7 @@
- return new SolarisAsynchronousChannelProvider();
- if (osname.equals("Linux"))
- return new LinuxAsynchronousChannelProvider();
-- if (osname.contains("OS X"))
-+ if (osname.contains("OS X") || osname.endsWith("BSD"))
- return new BsdAsynchronousChannelProvider();
- throw new InternalError("platform not recognized");
- }
---- ./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 2014-07-15 21:49:29.000000000 -0700
-@@ -26,9 +26,11 @@
- package sun.nio.ch;
-
- import java.io.IOException;
-+import java.security.AccessController;
- import java.util.BitSet;
- import java.util.Map;
- import java.util.HashMap;
-+import sun.security.action.GetIntegerAction;
-
-
- /**
-@@ -78,10 +80,11 @@
- static final int NUM_POLLFDS = Math.min(OPEN_MAX-1, 8192);
-
- // Initial size of arrays for fd registration changes
-- private final int INITIAL_PENDING_UPDATE_SIZE = 64;
-+ private static final int INITIAL_PENDING_UPDATE_SIZE = 64;
-
- // maximum size of updatesLow
-- private final int MAX_UPDATE_ARRAY_SIZE = Math.min(OPEN_MAX, 64*1024);
-+ private static final int MAX_UPDATE_ARRAY_SIZE = AccessController.doPrivileged(
-+ new GetIntegerAction("sun.nio.ch.maxUpdateArraySize", Math.min(OPEN_MAX, 64*1024)));
-
- // 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 2014-07-15 21:49:29.000000000 -0700
-@@ -26,9 +26,11 @@
- package sun.nio.ch;
-
- import java.io.IOException;
-+import java.security.AccessController;
- import java.util.BitSet;
- import java.util.HashMap;
- import java.util.Map;
-+import sun.security.action.GetIntegerAction;
-
- /**
- * Manipulates a native array of epoll_event structs on Linux:
-@@ -78,8 +80,8 @@
- private static final int INITIAL_PENDING_UPDATE_SIZE = 64;
-
- // maximum size of updatesLow
-- private static final int MAX_UPDATE_ARRAY_SIZE = Math.min(OPEN_MAX, 64*1024);
--
-+ private static final int MAX_UPDATE_ARRAY_SIZE = AccessController.doPrivileged(
-+ new GetIntegerAction("sun.nio.ch.maxUpdateArraySize", Math.min(OPEN_MAX, 64*1024)));
-
- // The fd of the epoll driver
- private final int epfd;
-@@ -164,6 +166,16 @@
- }
-
- /**
-+ * Returns {@code true} if updates for the given key (file
-+ * descriptor) are killed.
-+ */
-+ private boolean isEventsHighKilled(Integer key) {
-+ assert key >= MAX_UPDATE_ARRAY_SIZE;
-+ Byte value = eventsHigh.get(key);
-+ return (value != null && value == KILLED);
-+ }
-+
-+ /**
- * Sets the pending update events for the given file descriptor. This
- * method has no effect if the update events is already set to KILLED,
- * unless {@code force} is {@code true}.
-@@ -175,7 +187,7 @@
- }
- } else {
- Integer key = Integer.valueOf(fd);
-- if ((eventsHigh.get(key) != KILLED) || force) {
-+ if (!isEventsHighKilled(key) || force) {
- eventsHigh.put(key, Byte.valueOf(events));
- }
- }
---- ./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 2014-07-15 21:49:29.000000000 -0700
-@@ -25,9 +25,14 @@
-
- package sun.nio.ch;
-
--import sun.misc.Unsafe;
- import java.io.IOException;
--import java.util.*;
-+import java.security.AccessController;
-+import java.util.BitSet;
-+import java.util.HashMap;
-+import java.util.Map;
-+
-+import sun.misc.Unsafe;
-+import sun.security.action.GetIntegerAction;
- import static sun.nio.ch.SolarisEventPort.*;
-
- /**
-@@ -49,7 +54,8 @@
- private final int INITIAL_PENDING_UPDATE_SIZE = 256;
-
- // maximum size of updateArray
-- private final int MAX_UPDATE_ARRAY_SIZE = Math.min(OPEN_MAX, 64*1024);
-+ private static final int MAX_UPDATE_ARRAY_SIZE = AccessController.doPrivileged(
-+ new GetIntegerAction("sun.nio.ch.maxUpdateArraySize", Math.min(OPEN_MAX, 64*1024)));
-
- // 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-07-15 21:49:29.000000000 -0700
-@@ -180,6 +180,10 @@
- SctpNet.throwAlreadyBoundException();
- InetSocketAddress isa = (local == null) ?
- new InetSocketAddress(0) : Net.checkAddress(local);
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ sm.checkListen(isa.getPort());
-+ }
- Net.bind(fd, isa.getAddress(), isa.getPort());
- 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-10-28 20:19:52.000000000 -0700
-@@ -70,6 +70,8 @@
- return createProvider("sun.nio.fs.LinuxFileSystemProvider");
- if (osname.equals("Darwin") || osname.contains("OS X"))
- return createProvider("sun.nio.fs.MacOSXFileSystemProvider");
-+ if (osname.endsWith("BSD"))
-+ return createProvider("sun.nio.fs.BsdFileSystemProvider");
- throw new AssertionError("Platform not recognized");
- }
- }
---- ./jdk/src/solaris/classes/sun/print/CUPSPrinter.java 2013-09-06 11:29:08.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/print/CUPSPrinter.java 2014-10-28 20:19:46.000000000 -0700
-@@ -121,7 +121,7 @@
- /**
- * Returns array of MediaSizeNames derived from PPD.
- */
-- public MediaSizeName[] getMediaSizeNames() {
-+ MediaSizeName[] getMediaSizeNames() {
- initMedia();
- return cupsMediaSNames;
- }
-@@ -130,7 +130,7 @@
- /**
- * Returns array of Custom MediaSizeNames derived from PPD.
- */
-- public CustomMediaSizeName[] getCustomMediaSizeNames() {
-+ CustomMediaSizeName[] getCustomMediaSizeNames() {
- initMedia();
- return cupsCustomMediaSNames;
- }
-@@ -139,7 +139,7 @@
- /**
- * Returns array of MediaPrintableArea derived from PPD.
- */
-- public MediaPrintableArea[] getMediaPrintableArea() {
-+ MediaPrintableArea[] getMediaPrintableArea() {
- initMedia();
- return cupsMediaPrintables;
- }
-@@ -147,7 +147,7 @@
- /**
- * Returns array of MediaTrays derived from PPD.
- */
-- public MediaTray[] getMediaTrays() {
-+ MediaTray[] getMediaTrays() {
- initMedia();
- return cupsMediaTrays;
- }
---- ./jdk/src/solaris/classes/sun/print/IPPPrintService.java 2013-09-06 11:29:08.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/print/IPPPrintService.java 2014-10-28 20:19:46.000000000 -0700
-@@ -991,7 +991,9 @@
-
- public synchronized Class[] getSupportedAttributeCategories() {
- if (supportedCats != null) {
-- return supportedCats;
-+ Class<?> [] copyCats = new Class<?>[supportedCats.length];
-+ System.arraycopy(supportedCats, 0, copyCats, 0, copyCats.length);
-+ return copyCats;
- }
-
- initAttributes();
-@@ -1048,7 +1050,9 @@
- }
- supportedCats = new Class[catList.size()];
- catList.toArray(supportedCats);
-- return supportedCats;
-+ Class<?>[] copyCats = new Class<?>[supportedCats.length];
-+ System.arraycopy(supportedCats, 0, copyCats, 0, copyCats.length);
-+ return copyCats;
- }
-
-
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -129,6 +129,7 @@
-
- static boolean isBSD() {
- return (osname.equals("Linux") ||
-+ osname.endsWith("BSD") ||
- osname.contains("OS X"));
- }
-
---- ./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-07-15 21:49:29.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/demo/jvmti/hprof/hprof_md.c 2013-09-06 11:29:09.000000000 -0700
-+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2014-10-28 20:19:52.000000000 -0700
-@@ -376,33 +376,32 @@
- }
-
- static void dll_build_name(char* buffer, size_t buflen,
-- const char* pname, const char* fname) {
-- // Loosely based on os_solaris.cpp
-+ const char* paths, const char* fname) {
-+ char *path, *paths_copy, *next_token;
-
-- char *pathname = (char *)pname;
-- while (strlen(pathname) > 0) {
-- char *p = strchr(pathname, ':');
-- if (p == NULL) {
-- p = pathname + strlen(pathname);
-- }
-- /* check for NULL path */
-- if (p == pathname) {
-- continue;
-- }
-- (void)snprintf(buffer, buflen, "%.*s/lib%s" JNI_LIB_SUFFIX,
-- (p - pathname), pathname, fname);
-+ paths_copy = strdup(paths);
-+ if (paths_copy == NULL) {
-+ return;
-+ }
-+
-+ next_token = NULL;
-+ path = strtok_r(paths_copy, ":", &next_token);
-
-- if (access(buffer, F_OK) == 0) {
-+ while (path != NULL) {
-+ snprintf(buffer, buflen, "%s/lib%s" JNI_LIB_SUFFIX, path, fname);
-+ if (access(buffer, F_OK) == 0) {
- break;
-- }
-- pathname = p + 1;
-- *buffer = '\0';
-- }
-+ }
-+ *buffer = '\0';
-+ path = strtok_r(NULL, ":", &next_token);
-+ }
-+
-+ free(paths_copy);
- }
-
- /* Create the actual fill filename for a dynamic library. */
- void
--md_build_library_name(char *holder, int holderlen, char *pname, char *fname)
-+md_build_library_name(char *holder, int holderlen, const char *pname, const char *fname)
- {
- int pnamelen;
-
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -75,7 +75,11 @@
- #define JVM_O_O_APPEND O_APPEND
- #define JVM_O_EXCL O_EXCL
- #define JVM_O_CREAT O_CREAT
-+#if !defined(__APPLE__) && defined(_ALLBSD_SOURCE)
-+#define JVM_O_DELETE 0x10000000
-+#else
- #define JVM_O_DELETE 0x10000
-+#endif
-
- /* 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-10-28 20:19:52.000000000 -0700
-@@ -168,6 +168,9 @@
- /*
- * XXXBSD: there's no way available to get swap info in
- * FreeBSD. Usage of libkvm is not an option here
-+ *
-+ * XXX: Investigate how swapinfo(8) does this.
-+ * Total swap is in vm.swap_total
- */
- // throw_internal_error(env, "Unimplemented in FreeBSD");
- return (0);
-@@ -242,6 +245,8 @@
- #else /* _ALLBSD_SOURCE */
- /*
- * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
-+ *
-+ * XXX: Determine how linprocfs gets this.
- */
- // throw_internal_error(env, "Unimplemented in FreeBSD");
- return (64 * MB);
-@@ -323,6 +328,8 @@
- #elif defined(_ALLBSD_SOURCE)
- /*
- * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
-+ *
-+ * XXX: Investigate how top(8) gets this on FreeBSD.
- */
- // throw_internal_error(env, "Unimplemented in FreeBSD");
- return (128 * MB);
-@@ -342,7 +349,11 @@
- size_t rlen;
-
- mib[0] = CTL_HW;
-+#ifdef __APPLE__
- mib[1] = HW_MEMSIZE;
-+#else
-+ mib[1] = HW_PHYSMEM;
-+#endif
- rlen = sizeof(result);
- if (sysctl(mib, 2, &result, &rlen, NULL, 0) != 0) {
- throw_internal_error(env, "sysctl failed");
-@@ -408,6 +419,8 @@
- #elif defined(_ALLBSD_SOURCE)
- /*
- * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
-+ *
-+ * XXX: Investigate getting this on FreeBSD. Look at lsof.
- */
- // 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-07-15 21:49:29.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-10-28 20:19:52.000000000 -0700
-@@ -151,7 +151,6 @@
- return rv;
- }
-
--
- JNIEXPORT jboolean JNICALL
- 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-10-28 20:19:52.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 */
-- if (strchr(environ[i], '=') != NULL)
-+ if (strchr(environ[i], '=') != NULL && *environ[i] != '=')
- count++;
- }
-
-@@ -63,7 +66,7 @@
- for (i = 0, j = 0; environ[i]; i++) {
- const char * varEnd = strchr(environ[i], '=');
- /* Ignore corrupted environment variables */
-- if (varEnd != NULL) {
-+ if (varEnd != NULL && varEnd != environ[i]) {
- jbyteArray var, val;
- 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-10-28 20:19:52.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-10-28 20:19:52.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__)
-+int
-+closeDescriptors(void)
-+{
-+ int err;
-+ RESTARTABLE(closefrom(FAIL_FILENO + 1), err);
-+ return err;
-+}
-+#else
-+
-+#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-07-15 21:49:29.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
---- ./jdk/src/solaris/native/java/lang/java_props_macosx.c 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/java/lang/java_props_macosx.c 2014-07-15 21:49:29.000000000 -0700
-@@ -31,6 +31,7 @@
- #include <Security/AuthSession.h>
- #include <CoreFoundation/CoreFoundation.h>
- #include <SystemConfiguration/SystemConfiguration.h>
-+#include <Foundation/Foundation.h>
-
- #include "java_props_macosx.h"
-
-@@ -262,9 +263,20 @@
- return c_exception;
- }
-
-+/*
-+ * Method for fetching the user.home path and storing it in the property list.
-+ * For signed .apps running in the Mac App Sandbox, user.home is set to the
-+ * app's sandbox container.
-+ */
-+void setUserHome(java_props_t *sprops) {
-+ if (sprops == NULL) { return; }
-+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-+ sprops->user_home = createUTF8CString((CFStringRef)NSHomeDirectory());
-+ [pool drain];
-+}
-
- /*
-- * Method for fetching proxy info and storing it in the propery list.
-+ * Method for fetching proxy info and storing it in the property list.
- */
- void setProxyProperties(java_props_t *sProps) {
- if (sProps == NULL) return;
---- ./jdk/src/solaris/native/java/lang/java_props_macosx.h 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/java/lang/java_props_macosx.h 2014-07-15 21:49:29.000000000 -0700
-@@ -27,6 +27,7 @@
-
- char *setupMacOSXLocale(int cat);
- void setOSNameAndVersion(java_props_t *sprops);
-+void setUserHome(java_props_t *sprops);
- void setProxyProperties(java_props_t *sProps);
-
- enum PreferredToolkit_enum {
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -151,7 +151,7 @@
- lc = setlocale(cat, NULL);
- #endif
-
--#ifndef __linux__
-+#if !defined(__linux__) && !defined(__OpenBSD__)
- if (lc == NULL) {
- return 0;
- }
-@@ -324,6 +324,25 @@
- *std_encoding = "Big5-HKSCS-2001";
- }
- #endif
-+#ifdef MACOSX
-+ /*
-+ * For the case on MacOS X where encoding is set to US-ASCII, but we
-+ * don't have any encoding hints from LANG/LC_ALL/LC_CTYPE, use UTF-8
-+ * instead.
-+ *
-+ * The contents of ASCII files will still be read and displayed
-+ * correctly, but so will files containing UTF-8 characters beyond the
-+ * standard ASCII range.
-+ *
-+ * Specifically, this allows apps launched by double-clicking a .jar
-+ * file to correctly read UTF-8 files using the default encoding (see
-+ * 8011194).
-+ */
-+ if (strcmp(p,"US-ASCII") == 0 && getenv("LANG") == NULL &&
-+ getenv("LC_ALL") == NULL && getenv("LC_CTYPE") == NULL) {
-+ *std_encoding = "UTF-8";
-+ }
-+#endif
- }
-
- return 1;
-@@ -484,12 +503,19 @@
- &(sprops.format_country),
- &(sprops.format_variant),
- &(sprops.encoding))) {
-+#ifdef __OpenBSD__
-+ sprops.language = sprops.format_language;
-+ sprops.script = sprops.format_script;
-+ sprops.country = sprops.format_country;
-+ sprops.variant = sprops.format_variant;
-+#else
- ParseLocale(LC_MESSAGES,
- &(sprops.language),
- &(sprops.script),
- &(sprops.country),
- &(sprops.variant),
- NULL);
-+#endif
- } else {
- sprops.language = "en";
- sprops.encoding = "ISO8859-1";
-@@ -527,7 +553,14 @@
- {
- struct passwd *pwent = getpwuid(getuid());
- sprops.user_name = pwent ? strdup(pwent->pw_name) : "?";
-- sprops.user_home = pwent ? strdup(pwent->pw_dir) : "?";
-+#ifdef MACOSX
-+ setUserHome(&sprops);
-+#else
-+ sprops.user_home = pwent ? strdup(pwent->pw_dir) : NULL;
-+#endif
-+ if (sprops.user_home == NULL) {
-+ sprops.user_home = "?";
-+ }
- }
-
- /* User TIMEZONE */
---- ./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-07-15 21:49:29.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/AbstractPlainDatagramSocketImpl.c 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/AbstractPlainDatagramSocketImpl.c 2014-10-28 20:19:47.000000000 -0700
-@@ -0,0 +1,89 @@
-+/*
-+ * 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.
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+
-+#ifdef __solaris__
-+#include <unistd.h>
-+#include <stropts.h>
-+
-+#ifndef BSD_COMP
-+#define BSD_COMP
-+#endif
-+
-+#endif
-+
-+#include <sys/ioctl.h>
-+
-+#include "jvm.h"
-+#include "jni_util.h"
-+#include "net_util.h"
-+
-+#include "java_net_AbstractPlainDatagramSocketImpl.h"
-+
-+static jfieldID IO_fd_fdID;
-+
-+static jfieldID apdsi_fdID;
-+
-+
-+/*
-+ * Class: java_net_AbstractPlainDatagramSocketImpl
-+ * Method: init
-+ * Signature: ()V
-+ */
-+JNIEXPORT void JNICALL
-+Java_java_net_AbstractPlainDatagramSocketImpl_init(JNIEnv *env, jclass cls) {
-+
-+ apdsi_fdID = (*env)->GetFieldID(env, cls, "fd",
-+ "Ljava/io/FileDescriptor;");
-+ CHECK_NULL(apdsi_fdID);
-+
-+ IO_fd_fdID = NET_GetFileDescriptorID(env);
-+}
-+
-+/*
-+ * Class: java_net_AbstractPlainDatagramSocketImpl
-+ * Method: dataAvailable
-+ * Signature: ()I
-+ */
-+JNIEXPORT jint JNICALL Java_java_net_AbstractPlainDatagramSocketImpl_dataAvailable
-+(JNIEnv *env, jobject this) {
-+ int fd, retval;
-+
-+ jobject fdObj = (*env)->GetObjectField(env, this, apdsi_fdID);
-+
-+ if (IS_NULL(fdObj)) {
-+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-+ "Socket closed");
-+ return -1;
-+ }
-+ fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
-+
-+ if (ioctl(fd, FIONREAD, &retval) < 0) {
-+ return -1;
-+ }
-+ return retval;
-+}
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -122,7 +122,6 @@
- static jclass ni_ia6cls;
- static jmethodID ni_ia4ctrID;
- static jmethodID ni_ia6ctrID;
--static jfieldID ni_ia6ipaddressID;
- static int initialized = 0;
-
- /*
-@@ -158,7 +157,6 @@
- ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
- ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
-- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
- initialized = 1;
- }
-
-@@ -306,6 +304,7 @@
- }
-
- while (iterator != NULL) {
-+ int ret1;
- if (iterator->ai_family == AF_INET) {
- jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID);
- if (IS_NULL(iaObj)) {
-@@ -318,20 +317,17 @@
- inetIndex++;
- } else if (iterator->ai_family == AF_INET6) {
- jint scope = 0;
-- jbyteArray ipaddress;
-
- jobject iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
- if (IS_NULL(iaObj)) {
- ret = NULL;
- goto cleanupAndReturn;
- }
-- ipaddress = (*env)->NewByteArray(env, 16);
-- if (IS_NULL(ipaddress)) {
-- ret = NULL;
-- goto cleanupAndReturn;
-+ ret1 = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
-+ if (!ret1) {
-+ ret = NULL;
-+ goto cleanupAndReturn;
- }
-- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
-- (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
- #ifdef __linux__
- if (!kernelIsV22()) {
- scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
-@@ -340,10 +336,8 @@
- scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
- #endif
- if (scope != 0) { /* zero is default value, no need to set */
-- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
-- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
-+ setInet6Address_scopeid(env, iaObj, scope);
- }
-- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
- setInetAddress_hostName(env, iaObj, host);
- (*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-10-28 20:19:52.000000000 -0700
-@@ -60,14 +60,19 @@
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/sockio.h>
--#if defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__APPLE__)
- #include <net/ethernet.h>
- #include <net/if_var.h>
-+#elif defined(__OpenBSD__)
-+#include <netinet/if_ether.h>
-+#include <netinet6/in6_var.h>
-+#elif defined(__NetBSD__)
-+#include <net/if_ether.h>
-+#endif
- #include <net/if_dl.h>
- #include <netinet/in_var.h>
- #include <ifaddrs.h>
- #endif
--#endif
-
- #include "jvm.h"
- #include "jni_util.h"
-@@ -118,7 +123,6 @@
- static jmethodID ni_ia4ctrID;
- static jmethodID ni_ia6ctrID;
- static jmethodID ni_ibctrID;
--static jfieldID ni_ia6ipaddressID;
- static jfieldID ni_ibaddressID;
- static jfieldID ni_ib4broadcastID;
- static jfieldID ni_ib4maskID;
-@@ -193,7 +197,6 @@
- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
- ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
- ni_ibctrID = (*env)->GetMethodID(env, ni_ibcls, "<init>", "()V");
-- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
- ni_ibaddressID = (*env)->GetFieldID(env, ni_ibcls, "address", "Ljava/net/InetAddress;");
- ni_ib4broadcastID = (*env)->GetFieldID(env, ni_ibcls, "broadcast", "Ljava/net/Inet4Address;");
- ni_ib4maskID = (*env)->GetFieldID(env, ni_ibcls, "maskLength", "S");
-@@ -332,11 +335,9 @@
- #ifdef AF_INET6
- if (family == AF_INET6) {
- jbyte *bytes = (jbyte *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr);
-- jbyteArray ipaddress = (*env)->GetObjectField(env, iaObj, ni_ia6ipaddressID);
- jbyte caddr[16];
- int i;
--
-- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
-+ getInet6Address_ipaddress(env, iaObj, (char *)caddr);
- i = 0;
- while (i < 16) {
- if (caddr[i] != bytes[i]) {
-@@ -563,11 +564,9 @@
-
- if ((sock = openSocketWithFallback(env, name_utf)) < 0) {
- (*env)->ReleaseStringUTFChars(env, name, name_utf);
-- return -1;
-+ return -1;
- }
-
-- name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
--
- ret = getFlags(sock, name_utf, &flags);
-
- close(sock);
-@@ -670,21 +669,17 @@
- int scope=0;
- iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
- if (iaObj) {
-- jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
-- if (ipaddress == NULL) {
-+ int ret = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr));
-+ if (ret == JNI_FALSE) {
- return NULL;
- }
-- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
-- (jbyte *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr));
-
- scope = ((struct sockaddr_in6*)addrP->addr)->sin6_scope_id;
-
- if (scope != 0) { /* zero is default value, no need to set */
-- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
-- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
-- (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
-+ setInet6Address_scopeid(env, iaObj, scope);
-+ setInet6Address_scopeifname(env, iaObj, netifObj);
- }
-- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
- }
- ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
- if (ibObj) {
-@@ -1293,11 +1288,15 @@
- return -1;
- }
-
-+#ifdef __FreeBSD__
-+ *flags = ((if2.ifr_flags & 0xffff) | (if2.ifr_flagshigh << 16));
-+#else
- if (sizeof(if2.ifr_flags) == sizeof(short)) {
- *flags = (if2.ifr_flags & 0xffff);
- } else {
- *flags = if2.ifr_flags;
- }
-+#endif
- return 0;
- }
-
-@@ -1989,11 +1988,15 @@
- return -1;
- }
-
-+#ifdef __FreeBSD__
-+ *flags = ((if2.ifr_flags & 0xffff) | (if2.ifr_flagshigh << 16));
-+#else
- if (sizeof(if2.ifr_flags) == sizeof(short)) {
- *flags = (if2.ifr_flags & 0xffff);
- } else {
- *flags = if2.ifr_flags;
- }
-+#endif
- return 0;
- }
-
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -23,12 +23,12 @@
- * questions.
- */
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <errno.h>
- #include <netinet/in.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/types.h>
--#include <sys/socket.h>
-
- #ifdef __solaris__
- #include <fcntl.h>
-@@ -357,13 +357,21 @@
- #ifdef AF_INET6
- if (ipv6_available()) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&addr;
-+#ifdef __FreeBSD__
-+ him6->sin6_family = AF_INET6;
-+#else
- him6->sin6_family = AF_UNSPEC;
-+#endif
- len = sizeof(struct sockaddr_in6);
- } else
- #endif
- {
- struct sockaddr_in *him4 = (struct sockaddr_in*)&addr;
-+#ifdef __FreeBSD__
-+ him4->sin_family = AF_INET;
-+#else
- him4->sin_family = AF_UNSPEC;
-+#endif
- len = sizeof(struct sockaddr_in);
- }
- JVM_Connect(fd, (struct sockaddr *)&addr, len);
-@@ -574,6 +582,8 @@
- } else if (ret == JVM_IO_ERR) {
- if (errno == EBADF) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
-+ } else if (errno == ENOMEM) {
-+ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
- } else {
- NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "Peek failed");
- }
-@@ -674,15 +684,18 @@
- "Receive timed out");
- return -1;
- } else if (ret == JVM_IO_ERR) {
-+ if (errno == ENOMEM) {
-+ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
- #ifdef __linux__
-- if (errno == EBADF) {
-+ } else if (errno == EBADF) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
- } else {
- NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "Receive failed");
-- }
- #else
-- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
-+ } else {
-+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
- #endif
-+ }
- return -1;
- } else if (ret == JVM_IO_INTR) {
- JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
-@@ -910,15 +923,18 @@
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
- "Receive timed out");
- } else if (ret == JVM_IO_ERR) {
-+ if (errno == ENOMEM) {
-+ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
- #ifdef __linux__
-- if (errno == EBADF) {
-+ } else if (errno == EBADF) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
- } else {
- NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "Receive failed");
-- }
- #else
-- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
-+ } else {
-+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
- #endif
-+ }
- } else if (ret == JVM_IO_INTR) {
- JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
- "operation interrupted");
-@@ -2359,8 +2375,7 @@
- caddr[14] = ((address >> 8) & 0xff);
- caddr[15] = (address & 0xff);
- } else {
-- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
-- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
-+ getInet6Address_ipaddress(env, iaObj, caddr);
- }
-
- memcpy((void *)&(mname6.ipv6mr_multiaddr), caddr, sizeof(struct in6_addr));
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-10-28 20:19:52.000000000 -0700
-@@ -708,7 +708,6 @@
- } else {
- ret = NET_Timeout(fd, timeout);
- }
--
- if (ret == 0) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
- "Accept timed out");
-@@ -716,6 +715,8 @@
- } else if (ret == JVM_IO_ERR) {
- if (errno == EBADF) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
-+ } else if (errno == ENOMEM) {
-+ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
- } else {
- NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "Accept failed");
- }
---- ./jdk/src/solaris/native/java/net/SocketInputStream.c 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/SocketInputStream.c 2014-07-15 21:49:30.000000000 -0700
-@@ -108,6 +108,8 @@
- } else if (nread == JVM_IO_ERR) {
- if (errno == EBADF) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
-+ } else if (errno == ENOMEM) {
-+ JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
- } else {
- NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "select/poll failed");
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -25,6 +25,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/param.h>
- #include <signal.h>
- #include <pthread.h>
- #include <sys/types.h>
-@@ -35,7 +36,6 @@
- #include <sys/uio.h>
- #include <unistd.h>
- #include <errno.h>
--
- #include <sys/poll.h>
-
- /*
-@@ -345,8 +345,82 @@
- * signal other than our wakeup signal.
- */
- int NET_Timeout(int s, long timeout) {
-+/*
-+ * On MacOS X, poll(2) is not working correctly, so a select(2) based
-+ * implementation is preferred. See
-+ *
-+ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7131399
-+ *
-+ * However, on FreeBSD, the select(2) based implementation can cause
-+ * crashes under load and poll(2) is preferred. See
-+ *
-+ * http://docs.freebsd.org/cgi/getmsg.cgi?fetch=215525+0+current/freebsd-java
-+ *
-+ * Other *BSD will use poll(2) for now, but please adjust as appropriate.
-+ */
-+#ifndef __APPLE__
-+ long prevtime = 0, newtime;
-+ struct timeval t;
-+ fdEntry_t *fdEntry = getFdEntry(s);
-+
-+ /*
-+ * Check that fd hasn't been closed.
-+ */
-+ if (fdEntry == NULL) {
-+ errno = EBADF;
-+ return -1;
-+ }
-+
-+ /*
-+ * Pick up current time as may need to adjust timeout
-+ */
-+ if (timeout > 0) {
-+ gettimeofday(&t, NULL);
-+ prevtime = t.tv_sec * 1000 + t.tv_usec / 1000;
-+ }
-+
-+ for(;;) {
-+ struct pollfd pfd;
-+ int rv;
-+ threadEntry_t self;
-+
-+ /*
-+ * Poll the fd. If interrupted by our wakeup signal
-+ * errno will be set to EBADF.
-+ */
-+ pfd.fd = s;
-+ pfd.events = POLLIN | POLLERR;
-+
-+ startOp(fdEntry, &self);
-+ rv = poll(&pfd, 1, timeout);
-+ endOp(fdEntry, &self);
-+
-+ /*
-+ * If interrupted then adjust timeout. If timeout
-+ * has expired return 0 (indicating timeout expired).
-+ */
-+ if (rv < 0 && errno == EINTR) {
-+ if (timeout > 0) {
-+ gettimeofday(&t, NULL);
-+ newtime = t.tv_sec * 1000 + t.tv_usec / 1000;
-+ timeout -= newtime - prevtime;
-+ if (timeout <= 0) {
-+ return 0;
-+ }
-+ prevtime = newtime;
-+ }
-+ } else {
-+ return rv;
-+ }
-+
-+ }
-+#else
- long prevtime = 0, newtime;
- struct timeval t, *tp = &t;
-+ fd_set fds;
-+ fd_set* fdsp = NULL;
-+ int allocated = 0;
-+ threadEntry_t self;
- fdEntry_t *fdEntry = getFdEntry(s);
-
- /*
-@@ -376,20 +450,29 @@
- t.tv_usec = 0;
- }
-
-+ if (s < FD_SETSIZE) {
-+ fdsp = &fds;
-+ FD_ZERO(fdsp);
-+ } else {
-+ int length = (howmany(s+1, NFDBITS)) * sizeof(int);
-+ fdsp = (fd_set *) calloc(1, length);
-+ if (fdsp == NULL) {
-+ return -1; // errno will be set to ENOMEM
-+ }
-+ allocated = 1;
-+ }
-+ FD_SET(s, fdsp);
-+
- for(;;) {
-- fd_set rfds;
- int rv;
-- threadEntry_t self;
-
- /*
- * call select on the fd. If interrupted by our wakeup signal
- * errno will be set to EBADF.
- */
-- FD_ZERO(&rfds);
-- FD_SET(s, &rfds);
-
- startOp(fdEntry, &self);
-- rv = select(s+1, &rfds, 0, 0, tp);
-+ rv = select(s+1, fdsp, 0, 0, tp);
- endOp(fdEntry, &self);
-
- /*
-@@ -403,6 +486,8 @@
- newtime = now.tv_sec * 1000 + now.tv_usec / 1000;
- timeout -= newtime - prevtime;
- if (timeout <= 0) {
-+ if (allocated != 0)
-+ free(fdsp);
- return 0;
- }
- prevtime = newtime;
-@@ -410,8 +495,11 @@
- t.tv_usec = (timeout % 1000) * 1000;
- }
- } else {
-+ if (allocated != 0)
-+ free(fdsp);
- return rv;
- }
-
- }
-+#endif
- }
---- ./jdk/src/solaris/native/java/net/linux_close.c 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/linux_close.c 2014-07-15 21:49:30.000000000 -0700
-@@ -34,7 +34,6 @@
- #include <sys/uio.h>
- #include <unistd.h>
- #include <errno.h>
--
- #include <sys/poll.h>
-
- /*
-@@ -192,17 +191,6 @@
-
- {
- /*
-- * Send a wakeup signal to all threads blocked on this
-- * file descriptor.
-- */
-- threadEntry_t *curr = fdEntry->threads;
-- while (curr != NULL) {
-- curr->intr = 1;
-- pthread_kill( curr->thr, sigWakeup );
-- curr = curr->next;
-- }
--
-- /*
- * And close/dup the file descriptor
- * (restart if interrupted by signal)
- */
-@@ -214,6 +202,16 @@
- }
- } while (rv == -1 && errno == EINTR);
-
-+ /*
-+ * Send a wakeup signal to all threads blocked on this
-+ * file descriptor.
-+ */
-+ threadEntry_t *curr = fdEntry->threads;
-+ while (curr != NULL) {
-+ curr->intr = 1;
-+ pthread_kill( curr->thr, sigWakeup );
-+ curr = curr->next;
-+ }
- }
-
- /*
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -45,6 +45,10 @@
- #endif
- #endif
-
-+#ifdef __OpenBSD__
-+#include <sys/socketvar.h>
-+#endif
-+
- #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
- */
--static int
--getParam(char *driver, char *param)
-+int net_getParam(char *driver, char *param)
- {
- struct strioctl stri;
- char buf [64];
-@@ -166,7 +169,7 @@
-
- /*
- * Iterative way to find the max value that SO_SNDBUF or SO_RCVBUF
-- * for Solaris versions that do not support the ioctl() in getParam().
-+ * for Solaris versions that do not support the ioctl() in net_getParam().
- * Ugly, but only called once (for each sotype).
- *
- * As an optimisation, we make a guess using the default values for Solaris
-@@ -823,7 +826,6 @@
- /* needs work. 1. family 2. clean up him6 etc deallocate memory */
- if (ipv6_available() && !(family == IPv4 && v4MappedAddress == JNI_FALSE)) {
- struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
-- jbyteArray ipaddress;
- jbyte caddr[16];
- jint address;
-
-@@ -844,8 +846,7 @@
- caddr[15] = (address & 0xff);
- }
- } else {
-- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
-- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
-+ getInet6Address_ipaddress(env, iaObj, (char *)caddr);
- }
- memset((char *)him6, 0, sizeof(struct sockaddr_in6));
- him6->sin6_port = htons(port);
-@@ -882,7 +883,7 @@
- */
- if (!cached_scope_id) {
- if (ia6_scopeidID) {
-- scope_id = (int)(*env)->GetIntField(env,iaObj,ia6_scopeidID);
-+ scope_id = getInet6Address_scopeid(env, iaObj);
- }
- if (scope_id != 0) {
- /* check user-specified value for loopback case
-@@ -928,7 +929,7 @@
-
- if (family != IPv4) {
- if (ia6_scopeidID) {
-- him6->sin6_scope_id = (int)(*env)->GetIntField(env, iaObj, ia6_scopeidID);
-+ him6->sin6_scope_id = getInet6Address_scopeid(env, iaObj);
- }
- }
- #endif
-@@ -1409,7 +1410,7 @@
- * If that fails, we use the search algorithm in findMaxBuf()
- */
- if (!init_tcp_max_buf && sotype == SOCK_STREAM) {
-- tcp_max_buf = getParam("/dev/tcp", "tcp_max_buf");
-+ tcp_max_buf = net_getParam("/dev/tcp", "tcp_max_buf");
- if (tcp_max_buf == -1) {
- tcp_max_buf = findMaxBuf(fd, opt, SOCK_STREAM);
- if (tcp_max_buf == -1) {
-@@ -1418,7 +1419,7 @@
- }
- init_tcp_max_buf = 1;
- } else if (!init_udp_max_buf && sotype == SOCK_DGRAM) {
-- udp_max_buf = getParam("/dev/udp", "udp_max_buf");
-+ udp_max_buf = net_getParam("/dev/udp", "udp_max_buf");
- if (udp_max_buf == -1) {
- udp_max_buf = findMaxBuf(fd, opt, SOCK_DGRAM);
- if (udp_max_buf == -1) {
-@@ -1515,7 +1516,22 @@
- }
- }
-
--#endif
-+#ifndef __APPLE__
-+ /*
-+ * Don't allow SO_LINGER value to be too big.
-+ * Current max value (240) is empiric value based on tcp_timer.h's
-+ * constant TCP_LINGERTIME, which was doubled.
-+ *
-+ * XXXBSD: maybe we should step it down to 120 ?
-+ */
-+ if (level == SOL_SOCKET && opt == SO_LINGER) {
-+ ling = (struct linger *)arg;
-+ if (ling->l_linger > 240 || ling->l_linger < 0) {
-+ ling->l_linger = 240;
-+ }
-+ }
-+#endif __APPLE__
-+#endif _ALLBSD_SOURCE
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -37,7 +37,7 @@
- #endif
-
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX)
- extern int NET_Timeout(int s, long timeout);
- extern int NET_Read(int s, void* buf, size_t len);
- extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
-@@ -81,6 +81,9 @@
- int getDefaultIPv6Interface(struct in6_addr *target_addr);
- #endif
-
-+#ifdef __solaris__
-+extern int net_getParam(char *driver, char *param);
-+#endif
-
- /* needed from libsocket on Solaris 8 */
-
---- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2014-10-28 20:19:52.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2004, 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
-@@ -38,12 +38,14 @@
- JNIEXPORT jint JNICALL
- Java_java_util_prefs_FileSystemPreferences_chmod(JNIEnv *env,
- jclass thisclass, jstring java_fname, jint permission) {
-- const char *fname = JNU_GetStringPlatformChars(env, java_fname, JNI_FALSE);
-- int result;
-- result = chmod(fname, permission);
-- if (result != 0)
-- result = errno;
-- JNU_ReleaseStringPlatformChars(env, java_fname, fname);
-+ const char *fname = JNU_GetStringPlatformChars(env, java_fname, NULL);
-+ int result = -1;
-+ if (fname) {
-+ result = chmod(fname, permission);
-+ if (result != 0)
-+ result = errno;
-+ JNU_ReleaseStringPlatformChars(env, java_fname, fname);
-+ }
- return (jint) result;
- }
-
-@@ -61,13 +63,16 @@
- JNIEXPORT jintArray JNICALL
- Java_java_util_prefs_FileSystemPreferences_lockFile0(JNIEnv *env,
- jclass thisclass, jstring java_fname, jint permission, jboolean shared) {
-- const char *fname = JNU_GetStringPlatformChars(env, java_fname, JNI_FALSE);
-+ const char *fname = JNU_GetStringPlatformChars(env, java_fname, NULL);
- int fd, rc;
- int result[2];
-- jintArray javaResult;
-+ jintArray javaResult = NULL;
- int old_umask;
- FLOCK fl;
-
-+ if (!fname)
-+ return javaResult;
-+
- fl.l_whence = SEEK_SET;
- fl.l_len = 0;
- fl.l_start = 0;
-@@ -104,7 +109,8 @@
- }
- JNU_ReleaseStringPlatformChars(env, java_fname, fname);
- javaResult = (*env)->NewIntArray(env,2);
-- (*env)->SetIntArrayRegion(env, javaResult, 0, 2, result);
-+ if (javaResult)
-+ (*env)->SetIntArrayRegion(env, javaResult, 0, 2, result);
- return javaResult;
- }
-
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -123,7 +123,7 @@
- return NULL;
- }
-
--#if defined(__linux__) || defined(MACOSX) || (defined(__solaris__) \
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE) || (defined(__solaris__) \
- && (defined(_POSIX_PTHREAD_SEMANTICS) || defined(_LP64)))
- while (readdir_r(dirp, entry, &dp) == 0 && dp != NULL) {
- #else
-@@ -212,7 +212,7 @@
- return tz;
- }
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
-
- /*
- * Performs Linux specific mapping and returns a zone ID
-@@ -678,7 +678,7 @@
- * Returns a GMT-offset-based zone ID. (e.g., "GMT-08:00")
- */
-
--#ifdef MACOSX
-+#ifdef _ALLBSD_SOURCE
-
- char *
- getGMTOffsetID()
-@@ -738,4 +738,4 @@
- sign, (int)(offset/3600), (int)((offset%3600)/60));
- return strdup(buf);
- }
--#endif /* MACOSX */
-+#endif /* _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1996, 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
-@@ -405,7 +405,14 @@
- target = (*env)->GetObjectField(env, peer, mComponentPeerIDs.target);
- }
- #else
-- target = (*env)->GetObjectField(env, peer, targetID);
-+ if (window != None) {
-+ peer = JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit",
-+ "windowToXWindow", "(J)Lsun/awt/X11/XBaseWindow;", (jlong)window).l;
-+ }
-+ if ((peer != NULL) &&
-+ (JNU_IsInstanceOfByName(env, peer, "sun/awt/X11/XWindow") == 1)) {
-+ target = (*env)->GetObjectField(env, peer, targetID);
-+ }
- #endif
-
- if (target == NULL) {
-@@ -414,7 +421,6 @@
- return (jobject)NULL;
- }
-
--
- AWT_UNLOCK();
-
- return target;
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -334,7 +334,7 @@
- if (strcmp(style, "regular") == 0) {
- altstyle = "roman";
- }
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- if (!strcmp(family, "lucidasans")) {
- 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-10-28 20:19:52.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2011, 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
-@@ -123,7 +123,7 @@
- */
-
- #define MAXFRAMEBUFFERS 16
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- typedef struct {
- int screen_number;
- short x_org;
-@@ -652,7 +652,7 @@
- #endif /* HEADLESS */
-
- #ifndef HEADLESS
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- static void xinerama_init_linux()
- {
- void* libHandle = NULL;
-@@ -703,7 +703,7 @@
- }
- }
- #endif
--#if !defined(__linux__) && !defined(MACOSX) /* Solaris */
-+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) /* Solaris */
- static void xinerama_init_solaris()
- {
- void* libHandle = NULL;
-@@ -763,11 +763,11 @@
- }
-
- DTRACE_PRINTLN("Xinerama extension is available");
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- xinerama_init_linux();
- #else /* Solaris */
- xinerama_init_solaris();
--#endif /* __linux__ || MACOSX */
-+#endif /* __linux__ || _ALLBSD_SOURCE */
- }
- #endif /* HEADLESS */
-
-@@ -830,6 +830,8 @@
- }
-
- XSetIOErrorHandler(xioerror_handler);
-+ JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XErrorHandlerUtil", "init", "(J)V",
-+ ptr_to_jlong(awt_display));
-
- /* set awt_numScreens, and whether or not we're using Xinerama */
- xineramaInit();
-@@ -978,16 +980,11 @@
- static jint canUseShmExtPixmaps = UNSET_MITSHM;
- static jboolean xshmAttachFailed = JNI_FALSE;
-
--extern int mitShmPermissionMask;
--
--int J2DXErrHandler(Display *display, XErrorEvent *xerr) {
-- int ret = 0;
-+int XShmAttachXErrHandler(Display *display, XErrorEvent *xerr) {
- if (xerr->minor_code == X_ShmAttach) {
- xshmAttachFailed = JNI_TRUE;
-- } else {
-- ret = (*xerror_saved_handler)(display, xerr);
- }
-- return ret;
-+ return 0;
- }
- jboolean isXShmAttachFailed() {
- return xshmAttachFailed;
-@@ -996,6 +993,8 @@
- xshmAttachFailed = JNI_FALSE;
- }
-
-+extern int mitShmPermissionMask;
-+
- void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps) {
- XShmSegmentInfo shminfo;
- int XShmMajor, XShmMinor;
-@@ -1043,7 +1042,7 @@
- * The J2DXErrHandler handler will set xshmAttachFailed
- * to JNI_TRUE if any Shm error has occured.
- */
-- EXEC_WITH_XERROR_HANDLER(J2DXErrHandler,
-+ EXEC_WITH_XERROR_HANDLER(XShmAttachXErrHandler,
- XShmAttach(awt_display, &shminfo));
-
- /**
-@@ -1645,7 +1644,7 @@
- {
- jobject point = NULL;
- #ifndef HEADLESS /* return NULL in HEADLESS, Linux */
--#if !defined(__linux__) && !defined(MACOSX)
-+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
- int x,y;
-
- AWT_LOCK();
-@@ -1658,7 +1657,7 @@
- DTRACE_PRINTLN("unable to call XineramaSolarisCenterFunc: symbol is null");
- }
- AWT_FLUSH_UNLOCK();
--#endif /* __linux __ || MACOSX */
-+#endif /* __linux __ || _ALLBSD_SOURCE */
- #endif /* HEADLESS */
- return point;
- }
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * 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
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -67,7 +67,7 @@
- XIMPreeditDrawCallbackStruct *);
- static void PreeditCaretCallback(XIC, XPointer,
- XIMPreeditCaretCallbackStruct *);
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- static void StatusStartCallback(XIC, XPointer, XPointer);
- static void StatusDoneCallback(XIC, XPointer, XPointer);
- static void StatusDrawCallback(XIC, XPointer,
-@@ -81,7 +81,7 @@
- #define PreeditDoneIndex 1
- #define PreeditDrawIndex 2
- #define PreeditCaretIndex 3
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- #define StatusStartIndex 4
- #define StatusDoneIndex 5
- #define StatusDrawIndex 6
-@@ -99,14 +99,14 @@
- (XIMProc)PreeditDoneCallback,
- (XIMProc)PreeditDrawCallback,
- (XIMProc)PreeditCaretCallback,
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- (XIMProc)StatusStartCallback,
- (XIMProc)StatusDoneCallback,
- (XIMProc)StatusDrawCallback,
- #endif
- };
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- #define MAX_STATUS_LEN 100
- typedef struct {
- Window w; /*status window id */
-@@ -146,7 +146,7 @@
- #endif /* XAWT */
- jobject x11inputmethod; /* global ref to X11InputMethod instance */
- /* associated with the XIC */
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- StatusWindow *statusWindow; /* our own status window */
- #else
- #ifndef XAWT
-@@ -425,7 +425,7 @@
- static void
- freeX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData)
- {
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- if (pX11IMData->statusWindow != NULL){
- StatusWindow *sw = pX11IMData->statusWindow;
- XFreeGC(awt_display, sw->lightGC);
-@@ -531,7 +531,7 @@
- pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance);
-
- if (pX11IMData == NULL) {
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- return False;
- #else
- return result;
-@@ -539,7 +539,7 @@
- }
-
- if ((ic = pX11IMData->current_ic) == (XIC)0){
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- return False;
- #else
- return result;
-@@ -648,7 +648,7 @@
- return result;
- }
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- static StatusWindow *createStatusWindow(
- #ifdef XAWT
- Window parent) {
-@@ -993,7 +993,7 @@
- }
- }
- }
--#endif /* __linux__ || MACOSX */
-+#endif /* __linux__ || _ALLBSD_SOURCE */
- /*
- * Creates two XICs, one for active clients and the other for passive
- * clients. All information on those XICs are stored in the
-@@ -1050,7 +1050,7 @@
- return FALSE ;
- }
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- on_the_spot_styles |= XIMStatusNothing;
-
- /*kinput does not support XIMPreeditCallbacks and XIMStatusArea
-@@ -1063,7 +1063,7 @@
- break;
- }
- }
--#else /*! __linux__ && !MACOSX */
-+#else /*! __linux__ && !_ALLBSD_SOURCE */
- #ifdef XAWT
- on_the_spot_styles |= XIMStatusNothing;
- #else /* !XAWT */
-@@ -1086,7 +1086,7 @@
- on_the_spot_styles |= XIMStatusNothing;
-
- #endif /* XAWT */
--#endif /* __linux__ || MACOSX */
-+#endif /* __linux__ || _ALLBSD_SOURCE */
-
- for (i = 0; i < im_styles->count_styles; i++) {
- active_styles |= im_styles->supported_styles[i] & on_the_spot_styles;
-@@ -1134,7 +1134,7 @@
- NULL);
- if (preedit == (XVaNestedList)NULL)
- goto err;
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- /*always try XIMStatusCallbacks for active client...*/
- {
- status = (XVaNestedList)XVaCreateNestedList(0,
-@@ -1156,7 +1156,7 @@
- XFree((void *)status);
- XFree((void *)preedit);
- }
--#else /* !__linux__ && !MACOSX */
-+#else /* !__linux__ && !_ALLBSD_SOURCE */
- #ifndef XAWT
- if (on_the_spot_styles & XIMStatusArea) {
- Widget parent;
-@@ -1184,7 +1184,7 @@
- }
- #endif /* XAWT */
- XFree((void *)preedit);
--#endif /* __linux__ || MACOSX */
-+#endif /* __linux__ || _ALLBSD_SOURCE */
- pX11IMData->ic_passive = XCreateIC(X11im,
- XNClientWindow, w,
- XNFocusWindow, w,
-@@ -1343,7 +1343,7 @@
-
- }
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- static void
- StatusStartCallback(XIC ic, XPointer client_data, XPointer call_data)
- {
-@@ -1411,7 +1411,7 @@
- finally:
- AWT_UNLOCK();
- }
--#endif /* __linux__ || MACOSX */
-+#endif /* __linux__ || _ALLBSD_SOURCE */
-
- static void CommitStringCallback(XIC ic, XPointer client_data, XPointer call_data) {
- JNIEnv *env = GetJNIEnv();
-@@ -1517,14 +1517,14 @@
- /* Use IMInstantiate call back only on Linux, as there is a bug in Solaris
- (4768335)
- */
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- registered = XRegisterIMInstantiateCallback(dpy, NULL, NULL,
- NULL, (XIDProc)OpenXIMCallback, NULL);
- if (!registered) {
- /* directly call openXIM callback */
- #endif
- OpenXIMCallback(dpy, NULL, NULL);
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- }
- #endif
-
-@@ -1588,13 +1588,13 @@
- #endif /* XAWT */
- globalRef = (*env)->NewGlobalRef(env, this);
- pX11IMData->x11inputmethod = globalRef;
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- pX11IMData->statusWindow = NULL;
--#else /* !__linux__ && !MACOSX */
-+#else /* !__linux__ && !_ALLBSD_SOURCE */
- #ifndef XAWT
- pX11IMData->statusWidget = (Widget) NULL;
- #endif /* XAWT */
--#endif /* __linux__ || MACOSX */
-+#endif /* __linux__ || _ALLBSD_SOURCE */
-
- pX11IMData->lookup_buf = 0;
- pX11IMData->lookup_buf_len = 0;
-@@ -1741,14 +1741,14 @@
- setXICFocus(pX11IMData->current_ic, req);
- currentX11InputMethodInstance = pX11IMData->x11inputmethod;
- currentFocusWindow = w;
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- if (active && pX11IMData->statusWindow && pX11IMData->statusWindow->on)
- onoffStatusWindow(pX11IMData, w, True);
- #endif
- } else {
- currentX11InputMethodInstance = NULL;
- currentFocusWindow = 0;
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- onoffStatusWindow(pX11IMData, 0, False);
- if (pX11IMData->current_ic != NULL)
- #endif
-@@ -1765,7 +1765,7 @@
- Java_sun_awt_X11InputMethod_turnoffStatusWindow(JNIEnv *env,
- jobject this)
- {
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- X11InputMethodData *pX11IMData;
- StatusWindow *statusWindow;
-
-@@ -1862,7 +1862,7 @@
- X11InputMethodData *pX11IMData;
- XVaNestedList status;
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- /*do nothing for linux? */
- #else
- AWT_LOCK();
-@@ -1968,7 +1968,7 @@
- JNIEXPORT void JNICALL Java_sun_awt_X11_XInputMethod_adjustStatusWindow
- (JNIEnv *env, jobject this, jlong window)
- {
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- 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-10-28 20:19:52.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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- #include "wsutils.h"
- #include "list.h"
- #include "multiVis.h"
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- #include <sys/socket.h>
- #endif
-
---- ./jdk/src/solaris/native/sun/awt/awt_util.c 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.c 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1995, 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
-@@ -58,16 +58,14 @@
- #include "java_awt_event_MouseWheelEvent.h"
-
- /*
-- * Since X reports protocol errors asynchronously, we often need to
-- * install an error handler that acts like a callback. While that
-- * specialized handler is installed we save original handler here.
-+ * Called by "ToolkitErrorHandler" function in "XlibWrapper.c" file.
- */
--XErrorHandler xerror_saved_handler;
-+XErrorHandler current_native_xerror_handler = NULL;
-
- /*
- * A place for error handler to report the error code.
- */
--unsigned char xerror_code;
-+unsigned char xerror_code = Success;
-
- extern jint getModifiers(uint32_t state, jint button, jint keyCode);
- extern jint getButton(uint32_t button);
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1995, 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
-@@ -82,7 +82,7 @@
- #define WITH_XERROR_HANDLER(f) do { \
- XSync(awt_display, False); \
- xerror_code = Success; \
-- xerror_saved_handler = XSetErrorHandler(f); \
-+ current_native_xerror_handler = (f); \
- } while (0)
-
- /* Convenience macro for handlers to use */
-@@ -92,7 +92,7 @@
-
- #define RESTORE_XERROR_HANDLER do { \
- XSync(awt_display, False); \
-- XSetErrorHandler(xerror_saved_handler); \
-+ current_native_xerror_handler = NULL; \
- } while (0)
-
- #define EXEC_WITH_XERROR_HANDLER(f, code) do { \
-@@ -104,11 +104,9 @@
- } while (0)
-
- /*
-- * Since X reports protocol errors asynchronously, we often need to
-- * install an error handler that acts like a callback. While that
-- * specialized handler is installed we save original handler here.
-+ * Called by "ToolkitErrorHandler" function in "XlibWrapper.c" file.
- */
--extern XErrorHandler xerror_saved_handler;
-+extern XErrorHandler current_native_xerror_handler;
-
- /*
- * A place for error handler to report the error code.
-@@ -187,7 +185,7 @@
- #ifdef __solaris__
- extern Widget awt_util_getXICStatusAreaWindow(Widget w);
- #else
--#if defined(MACOSX)
-+#if defined(_ALLBSD_SOURCE)
- int32_t awt_util_getIMStatusHeight(Widget vw);
- Widget awt_util_getXICStatusAreaWindow(Widget w);
- #else
-@@ -200,7 +198,7 @@
-
-
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- typedef struct _XmImRefRec {
- 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-10-28 20:19:52.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2001, 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
-@@ -121,12 +121,19 @@
- static Atom XA_KWM_WIN_MAXIMIZED;
-
- /* OpenLook */
-+static Atom _XA_OL_DECOR_ADD;
- static Atom _XA_OL_DECOR_DEL;
- static Atom _XA_OL_DECOR_HEADER;
- static Atom _XA_OL_DECOR_RESIZE;
- static Atom _XA_OL_DECOR_PIN;
- static Atom _XA_OL_DECOR_CLOSE;
-
-+/* AfterStep */
-+static Atom _XA_AS_STYLE;
-+
-+/* WindowMaker */
-+static Atom _XA_WINDOWMAKER_STATE;
-+
- /* For _NET_WM_STATE ClientMessage requests */
- #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */
- #define _NET_WM_STATE_ADD 1 /* add/set property */
-@@ -193,7 +200,12 @@
- { &_XA_OL_DECOR_HEADER, "_OL_DECOR_HEADER" },
- { &_XA_OL_DECOR_RESIZE, "_OL_DECOR_RESIZE" },
- { &_XA_OL_DECOR_PIN, "_OL_DECOR_PIN" },
-- { &_XA_OL_DECOR_CLOSE, "_OL_DECOR_CLOSE" }
-+ { &_XA_OL_DECOR_CLOSE, "_OL_DECOR_CLOSE" },
-+ { &_XA_OL_DECOR_ADD, "_OL_DECOR_ADD" },
-+
-+ { &_XA_AS_STYLE, "_XA_AS_STYLE" },
-+
-+ { &_XA_WINDOWMAKER_STATE, "_XA_WINDOWMAKER_STATE" }
- };
- #define ATOM_LIST_LENGTH (sizeof(atom_list)/sizeof(atom_list[0]))
-
-@@ -382,14 +394,10 @@
- XERROR_SAVE(err);
- if (err->error_code == BadWindow) {
- DTRACE_PRINTLN("IGNORING BadWindow");
-- return 0; /* ok to fail */
-- }
-- else {
-- return (*xerror_saved_handler)(dpy, err);
- }
-+ return 0; /* ok to fail */
- }
-
--
- /*
- * Convenience wrapper for XGetWindowProperty for XA_ATOM properties.
- * E.g. WM_PROTOCOLS, _NET_WM_STATE, _OL_DECOR_DEL.
-@@ -942,6 +950,39 @@
- return True;
- }
-
-+/*
-+ * Window Maker.
-+ */
-+static Boolean
-+awt_wm_isWindowmaker()
-+{
-+ if (awt_wm_atomInterned(&_XA_WINDOWMAKER_STATE, "_WINDOWMAKER_STATE"))
-+ return True;
-+ return False;
-+}
-+
-+/*
-+ * Afterstep.
-+ */
-+static Boolean
-+awt_wm_isAfterstep()
-+{
-+ if (awt_wm_atomInterned(&_XA_AS_STYLE, "_AS_STYLE"))
-+ return True;
-+ return False;
-+}
-+
-+/*
-+ * FVWM 2.
-+ */
-+static Boolean
-+awt_wm_isFvwm2()
-+{
-+ if (awt_wm_atomInterned(&_XA_OL_DECOR_ADD, "_OL_DECOR_ADD")
-+ && !awt_wm_atomInterned(&_XA_OL_DECOR_PIN, "_OL_DECOR_PIN"))
-+ return True;
-+ return False;
-+}
-
- static Boolean
- awt_wm_isNetWMName(char *name)
-@@ -1011,7 +1052,6 @@
- return awt_wm_isNetWMName("Metacity");
- }
-
--
- /*
- * Temporary error handler that ensures that we know if
- * XChangeProperty succeeded or not.
-@@ -1020,15 +1060,10 @@
- xerror_verify_change_property(Display *dpy, XErrorEvent *err)
- {
- XERROR_SAVE(err);
-- if (err->request_code == X_ChangeProperty) {
-- return 0;
-- }
-- else {
-- return (*xerror_saved_handler)(dpy, err);
-- }
-+ if (err->request_code == X_ChangeProperty) { }
-+ return 0;
- }
-
--
- /*
- * Prepare IceWM check.
- *
-@@ -1159,8 +1194,6 @@
- return True;
- }
-
--
--
- static Boolean winmgr_running = False;
-
- /*
-@@ -1176,14 +1209,10 @@
- {
- DTRACE_PRINTLN("some WM is running (hmm, we'll see)");
- winmgr_running = True;
-- return 0;
-- }
-- else {
-- return (*xerror_saved_handler)(dpy, err);
- }
-+ return 0;
- }
-
--
- /*
- * Make an educated guess about running window manager.
- * XXX: ideally, we should detect wm restart.
-@@ -1280,6 +1309,12 @@
- else if (awt_wm_isKDE2()) {
- awt_wmgr = KDE2_WM;
- }
-+ else if (awt_wm_isWindowmaker()) {
-+ awt_wmgr = WINDOWMAKER_WM;
-+ }
-+ else if (awt_wm_isAfterstep()) {
-+ awt_wmgr = AFTERSTEP_WM;
-+ }
- /*
- * We don't check for legacy WM when we already know that WM
- * supports WIN or _NET wm spec.
-@@ -1302,6 +1337,9 @@
- awt_wmgr = MOTIF_WM;
- }
- else if (awt_wm_isOpenLook()) {
-+ awt_wmgr = OPENLOOK_WM;
-+ }
-+ else if (awt_wm_isFvwm2()) {
- awt_wmgr = OPENLOOK_WM;
- }
- 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-10-28 20:19:52.000000000 -0700
-@@ -45,7 +45,10 @@
- KDE2_WM,
- SAWFISH_WM,
- ICE_WM,
-- METACITY_WM
-+ METACITY_WM,
-+ AFTERSTEP_WM,
-+ WINDOWMAKER_WM,
-+ FVWM2_WM
- };
-
- extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/awt_xembed_server.c 2013-09-06 11:29:10.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_xembed_server.c 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2005, 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
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -58,7 +58,7 @@
- */
- /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
-
- #ifndef _EXTUTIL_H_
- #define _EXTUTIL_H_
-@@ -248,4 +248,4 @@
- char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)
- #endif
-
--#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-10-28 20:19:52.000000000 -0700
-@@ -23,7 +23,7 @@
- * questions.
- */
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- #include <string.h>
- #endif /* __linux__ */
- #include <stdio.h>
-@@ -79,7 +79,7 @@
-
- #define MAXFDIRS 512 /* Max number of directories that contain fonts */
-
--#if !defined(__linux__) && !defined(MACOSX)
-+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
- /*
- * This can be set in the makefile to "/usr/X11" if so desired.
- */
-@@ -145,6 +145,22 @@
- PACKAGE_PATH "/share/fonts/Type1",
- NULL, /* terminates the list */
- };
-+#elif _ALLBSD_SOURCE
-+static char *fullBSDFontPath[] = {
-+ X11_PATH "/lib/X11/fonts/TrueType",
-+ X11_PATH "/lib/X11/fonts/truetype",
-+ X11_PATH "/lib/X11/fonts/tt",
-+ X11_PATH "/lib/X11/fonts/TTF",
-+ X11_PATH "/lib/X11/fonts/OTF",
-+ PACKAGE_PATH "/share/fonts/TrueType",
-+ PACKAGE_PATH "/share/fonts/truetype",
-+ PACKAGE_PATH "/share/fonts/tt",
-+ PACKAGE_PATH "/share/fonts/TTF",
-+ PACKAGE_PATH "/share/fonts/OTF",
-+ X11_PATH "/lib/X11/fonts/Type1",
-+ PACKAGE_PATH "/share/fonts/Type1",
-+ NULL, /* terminates the list */
-+};
- #else /* __linux */
- /* All the known interesting locations we have discovered on
- * various flavors of Linux
-@@ -401,7 +417,7 @@
-
- #endif /* !HEADLESS */
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- /* from awt_LoadLibrary.c */
- JNIEXPORT jboolean JNICALL AWTIsHeadless();
- #endif
-@@ -530,6 +546,8 @@
- knowndirs = fullLinuxFontPath;
- #elif defined(MACOSX)
- knowndirs = full_MACOSX_X11FontPath;
-+#elif defined(_ALLBSD_SOURCE)
-+ knowndirs = fullBSDFontPath;
- #else /* IF SOLARIS */
- knowndirs = fullSolarisFontPath;
- #endif
-@@ -540,7 +558,7 @@
- * be initialised.
- */
- #ifndef HEADLESS
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- /* There's no headless build on linux ... */
- if (!AWTIsHeadless()) { /* .. so need to call a function to check */
- #endif
-@@ -556,7 +574,7 @@
- x11dirs = getX11FontPath();
- }
- AWT_UNLOCK();
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- }
- #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-10-28 20:19:52.000000000 -0700
-@@ -27,7 +27,7 @@
- #error This file should not be included in headless library
- #endif
-
--#ifdef MACOSX
-+#ifdef _ALLBSD_SOURCE
- #include <stdlib.h>
- #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-07-15 21:49:30.000000000 -0700
-@@ -577,8 +577,8 @@
- SplashUnlock(splash);
- rc = poll(pfd, 2, timeout);
- SplashLock(splash);
-- if (splash->isVisible>0 && SplashTime() >= splash->time +
-- splash->frames[splash->currentFrame].delay) {
-+ if (splash->isVisible > 0 && splash->currentFrame >= 0 &&
-+ SplashTime() >= splash->time + splash->frames[splash->currentFrame].delay) {
- SplashNextFrame(splash);
- 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-10-28 20:19:52.000000000 -0700
-@@ -28,9 +28,9 @@
- #include <sys/types.h>
-
- /*
-- * Linux and MACOSX's version of <sys/types.h> does not define intptr_t
-+ * Linux and BSD's's version of <sys/types.h> does not define intptr_t
- */
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- #include <stdint.h>
- #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-10-28 20:19:52.000000000 -0700
-@@ -804,7 +804,7 @@
- static int initialized;
- static int usevis = JNI_TRUE;
-
--#if defined(__linux__) || defined(MACOSX)
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- # define ULTRA_CHIP "sparc64"
- #else
- # define ULTRA_CHIP "sun4u"
---- ./jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c 2013-09-06 11:29:12.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c 2014-07-15 21:49:30.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
-@@ -396,13 +396,10 @@
- static int
- GLXSD_BadAllocXErrHandler(Display *display, XErrorEvent *xerr)
- {
-- int ret = 0;
- if (xerr->error_code == BadAlloc) {
- surfaceCreationFailed = JNI_TRUE;
-- } else {
-- ret = (*xerror_saved_handler)(display, xerr);
- }
-- return ret;
-+ return 0;
- }
-
- JNIEXPORT jboolean JNICALL
---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2013-09-06 11:29:12.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2014-10-28 20:19:52.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 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
-@@ -68,7 +68,7 @@
- #ifndef XAWT
- extern struct MComponentPeerIDs mComponentPeerIDs;
- #endif
--extern int J2DXErrHandler(Display *display, XErrorEvent *xerr);
-+extern int XShmAttachXErrHandler(Display *display, XErrorEvent *xerr);
- extern AwtGraphicsConfigDataPtr
- getGraphicsConfigFromComponentPeer(JNIEnv *env, jobject this);
- extern struct X11GraphicsConfigIDs x11GraphicsConfigIDs;
-@@ -591,7 +591,7 @@
- shminfo->readOnly = False;
-
- resetXShmAttachFailed();
-- EXEC_WITH_XERROR_HANDLER(J2DXErrHandler,
-+ EXEC_WITH_XERROR_HANDLER(XShmAttachXErrHandler,
- XShmAttach(awt_display, shminfo));
-
- /*
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -0,0 +1,140 @@
-+/*
-+ * 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 <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <errno.h>
-+
-+#if defined(_ALLBSD_SOURCE)
-+#include <sys/sysctl.h>
-+#endif
-+
-+#include "jni.h"
-+#include "net_util.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct portrange {
-+ int lower;
-+ int higher;
-+};
-+
-+static int getPortRange(struct portrange *range)
-+{
-+#ifdef __linux__
-+ {
-+ int ret;
-+ FILE *f;
-+
-+ f = fopen("/proc/sys/net/ipv4/ip_local_port_range", "r");
-+ if (f != NULL) {
-+ ret = fscanf(f, "%d %d", &range->lower, &range->higher);
-+ fclose(f);
-+ return ret == 2 ? 0 : -1;
-+ }
-+ return -1;
-+ }
-+
-+#elif defined(__solaris__)
-+ {
-+ range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port");
-+ range->higher = net_getParam("/dev/tcp", "tcp_largest_anon_port");
-+ return 0;
-+ }
-+#elif defined(__OpenBSD__)
-+ {
-+ int mib[3];
-+ mib[0] = CTL_NET;
-+ mib[1] = PF_INET;
-+
-+ mib[2] = IPCTL_IPPORT_HIFIRSTAUTO;
-+ size_t rlen = sizeof(range->lower);
-+ if (sysctl(mib, 3, &range->lower, &rlen, NULL, 0) == -1)
-+ return -1;
-+
-+ mib[2] = IPCTL_IPPORT_HILASTAUTO;
-+ rlen = sizeof(range->higher);
-+ if (sysctl(mib, 3, &range->higher, &rlen, NULL, 0) == -1)
-+ return -1;
-+
-+ return 0;
-+ }
-+#elif defined(_ALLBSD_SOURCE)
-+ {
-+ int ret;
-+ size_t size = sizeof(range->lower);
-+ ret = sysctlbyname(
-+ "net.inet.ip.portrange.first", &range->lower, &size, 0, 0
-+ );
-+ if (ret == -1) {
-+ return -1;
-+ }
-+ size = sizeof(range->higher);
-+ ret = sysctlbyname(
-+ "net.inet.ip.portrange.last", &range->higher, &size, 0, 0
-+ );
-+ return ret;
-+ }
-+#else
-+ return -1;
-+#endif
-+}
-+
-+/*
-+ * Class: sun_net_PortConfig
-+ * Method: getLower0
-+ * Signature: ()I
-+ */
-+JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getLower0
-+ (JNIEnv *env, jclass clazz)
-+{
-+ struct portrange range;
-+ if (getPortRange(&range) < 0) {
-+ return -1;
-+ }
-+ return range.lower;
-+}
-+
-+/*
-+ * Class: sun_net_PortConfig
-+ * Method: getUpper
-+ * Signature: ()I
-+ */
-+JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getUpper0
-+ (JNIEnv *env, jclass clazz)
-+{
-+ struct portrange range;
-+ if (getPortRange(&range) < 0) {
-+ return -1;
-+ }
-+ return range.higher;
-+}
-+
-+#ifdef __cplusplus
-+}
-+#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-10-28 20:19:52.000000000 -0700
-@@ -201,7 +201,7 @@
- return IOS_THROWN;
- }
- return result;
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
- off_t numBytes;
- int result;
-
-@@ -209,6 +209,8 @@
-
- #ifdef __APPLE__
- result = sendfile(srcFD, dstFD, position, &numBytes, NULL, 0);
-+#elif defined(__FreeBSD__)
-+ result = sendfile(srcFD, dstFD, position, count, NULL, &numBytes, 0);
- #endif
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -227,6 +227,21 @@
- fl.l_start = (off64_t)pos;
- fl.l_type = F_UNLCK;
- lockResult = fcntl(fd, cmd, &fl);
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+ /* XXXFREEBSD: While doing of preClose0() we're closing actual fd which
-+ was locked, so here we'll get an error which need to be ignored to
-+ satisfy TCK FileLock test */
-+ if (lockResult < 0 && errno == EBADF)
-+ lockResult = errno = 0;
-+#endif
-+#if defined(__NetBSD__)
-+ /* XXXNETBSD: The dup2 in preClose0 is being done onto 1 end of a
-+ socketpair which isn't a valid target for F_UNLCK. No good way to see
-+ this vs. a bad lock setup so just return errno = 0 there
-+ to pass JCK (lock will get removed once all fd's close anyways) */
-+ if (lockResult < 0 && errno == EINVAL)
-+ lockResult = errno = 0;
-+#endif
- if (lockResult < 0) {
- JNU_ThrowIOExceptionWithLastError(env, "Release failed");
- }
---- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2013-09-06 11:29:12.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2014-10-28 20:19:52.000000000 -0700
-@@ -33,12 +33,19 @@
- #include "nio_util.h"
-
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- #include <pthread.h>
-+#if defined(__linux__)
- #include <sys/signal.h>
-
- /* Also defined in src/solaris/native/java/net/linux_close.c */
- #define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
-+#else
-+#include <signal.h>
-+
-+/* Also defined in src/solaris/native/java/net/bsd_close.c */
-+#define INTERRUPT_SIGNAL SIGIO
-+#endif
-
- static void
- nullHandler(int sig)
-@@ -51,7 +58,7 @@
- JNIEXPORT void JNICALL
- Java_sun_nio_ch_NativeThread_init(JNIEnv *env, jclass cl)
- {
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
-
- /* Install the null handler for INTERRUPT_SIGNAL. This might overwrite the
- * handler previously installed by java/net/linux_close.c, but that's okay
-@@ -74,7 +81,7 @@
- JNIEXPORT jlong JNICALL
- Java_sun_nio_ch_NativeThread_current(JNIEnv *env, jclass cl)
- {
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- return (long)pthread_self();
- #else
- return -1;
-@@ -84,7 +91,7 @@
- JNIEXPORT void JNICALL
- Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
- {
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL))
- JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
- #endif
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -320,8 +320,20 @@
- typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
-
-
-+#elif defined(__FreeBSD__) && __FreeBSD__ >= 7
-+
-+#include <stdint.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/sctp.h>
-+#include <netinet/sctp_peeloff.h>
-+#include <netinet/sctp_uio.h>
-+#include "jni.h"
-+
- #endif /* __linux__ */
-
-+#if !defined(__FreeBSD__) || __FreeBSD__ < 7
-+
- sctp_getladdrs_func* nio_sctp_getladdrs;
- sctp_freeladdrs_func* nio_sctp_freeladdrs;
- sctp_getpaddrs_func* nio_sctp_getpaddrs;
-@@ -329,6 +341,17 @@
- sctp_bindx_func* nio_sctp_bindx;
- sctp_peeloff_func* nio_sctp_peeloff;
-
-+#else
-+
-+#define nio_sctp_getladdrs sctp_getladdrs
-+#define nio_sctp_freeladdrs sctp_freeladdrs
-+#define nio_sctp_getpaddrs sctp_getpaddrs
-+#define nio_sctp_freepaddrs sctp_freepaddrs
-+#define nio_sctp_bindx sctp_bindx
-+#define nio_sctp_peeloff sctp_peeloff
-+
-+#endif
-+
- jboolean loadSocketExtensionFuncs(JNIEnv* env);
-
- #endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2013-09-06 11:29:12.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2014-10-28 20:19:52.000000000 -0700
-@@ -38,8 +38,7 @@
- #include "sun_nio_ch_SctpResultContainer.h"
- #include "sun_nio_ch_SctpPeerAddrChange.h"
-
--/* sizeof(union sctp_notification */
--#define NOTIFICATION_BUFFER_SIZE 280
-+static int SCTP_NOTIFICATION_SIZE = sizeof(union sctp_notification);
-
- #define MESSAGE_IMPL_CLASS "sun/nio/ch/SctpMessageInfoImpl"
- #define RESULT_CONTAINER_CLASS "sun/nio/ch/SctpResultContainer"
-@@ -458,20 +457,47 @@
- if (msg->msg_flags & MSG_NOTIFICATION) {
- char *bufp = (char*)addr;
- union sctp_notification *snp;
-+ jboolean allocated = JNI_FALSE;
-
-- if (!(msg->msg_flags & MSG_EOR) && length < NOTIFICATION_BUFFER_SIZE) {
-- char buf[NOTIFICATION_BUFFER_SIZE];
-+ if (rv > SCTP_NOTIFICATION_SIZE) {
-+ JNU_ThrowInternalError(env, "should not reach here");
-+ return -1;
-+ }
-+
-+ if (!(msg->msg_flags & MSG_EOR) && length < SCTP_NOTIFICATION_SIZE) {
-+ char* newBuf;
- int rvSAVE = rv;
-- memcpy(buf, addr, rv);
-- iov->iov_base = buf + rv;
-- iov->iov_len = NOTIFICATION_BUFFER_SIZE - rv;
-+
-+ if ((newBuf = malloc(SCTP_NOTIFICATION_SIZE)) == NULL) {
-+ JNU_ThrowOutOfMemoryError(env, "Out of native heap space.");
-+ return -1;
-+ }
-+ allocated = JNI_TRUE;
-+
-+ memcpy(newBuf, addr, rv);
-+ iov->iov_base = newBuf + rv;
-+ iov->iov_len = SCTP_NOTIFICATION_SIZE - rv;
- if ((rv = recvmsg(fd, msg, flags)) < 0) {
- handleSocketError(env, errno);
- return 0;
- }
-- bufp = buf;
-+ bufp = newBuf;
- rv += rvSAVE;
- }
-+#ifdef __sparc
-+ else if ((intptr_t)addr & 0x3) {
-+ /* the given buffer is not 4 byte aligned */
-+ char* newBuf;
-+ if ((newBuf = malloc(SCTP_NOTIFICATION_SIZE)) == NULL) {
-+ JNU_ThrowOutOfMemoryError(env, "Out of native heap space.");
-+ return -1;
-+ }
-+ allocated = JNI_TRUE;
-+
-+ memcpy(newBuf, addr, rv);
-+ bufp = newBuf;
-+ }
-+#endif
- snp = (union sctp_notification *) bufp;
- if (handleNotification(env, fd, resultContainerObj, snp, rv,
- (msg->msg_flags & MSG_EOR),
-@@ -479,9 +505,16 @@
- /* We have received a notification that is of interest to
- to the Java API. The appropriate notification will be
- set in the result container. */
-+ if (allocated == JNI_TRUE) {
-+ free(bufp);
-+ }
- return 0;
- }
-
-+ if (allocated == JNI_TRUE) {
-+ free(bufp);
-+ }
-+
- // set iov back to addr, and reset msg_controllen
- iov->iov_base = addr;
- iov->iov_len = length;
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -58,6 +58,7 @@
- */
- jboolean loadSocketExtensionFuncs
- (JNIEnv* env) {
-+#if !defined(__FreeBSD__) || __FreeBSD__ < 7 /* On FreeBSD 7.x these functions are in libc */
- if (dlopen(nativeSctpLib, RTLD_GLOBAL | RTLD_LAZY) == NULL) {
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- dlerror());
-@@ -105,6 +106,7 @@
- dlerror());
- return JNI_FALSE;
- }
-+#endif /* __FreeBSD__ */
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -33,6 +33,11 @@
-
- #include "j2secmod.h"
-
-+#ifndef RTLD_NOLOAD
-+/* A gross hack that will work if the NSS library is only opened once */
-+static void *nssLibHandle = NULL;
-+#endif
-+
- void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
- void *hModule = (void*)jHandle;
- void *fAddress = dlsym(hModule, functionName);
-@@ -50,7 +55,11 @@
- {
- const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
- // look up existing handle only, do not load
-+#ifdef RTLD_NOLOAD
- void *hModule = dlopen(libName, RTLD_NOLOAD);
-+#else
-+ void *hModule = nssLibHandle;
-+#endif
- dprintf2("-handle for %s: %u\n", libName, hModule);
- (*env)->ReleaseStringUTFChars(env, jLibName, libName);
- return (jlong)hModule;
-@@ -64,6 +73,9 @@
-
- dprintf1("-lib %s\n", libName);
- hModule = dlopen(libName, RTLD_LAZY);
-+#ifndef RTLD_NOLOAD
-+ nssLibHandle = hModule;
-+#endif
- (*env)->ReleaseStringUTFChars(env, jLibName, libName);
- 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-10-28 20:19:52.000000000 -0700
-@@ -867,7 +867,7 @@
- {
- KeySym originalKeysym = *keysym;
-
--#if !defined(__linux__) && !defined(MACOSX)
-+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
- /* 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/solaris/native/sun/xawt/XlibWrapper.c 2013-09-06 11:29:12.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/xawt/XlibWrapper.c 2014-07-15 21:49:30.000000000 -0700
-@@ -41,6 +41,7 @@
- #include <sizecalc.h>
-
- #include <awt.h>
-+#include <awt_util.h>
- #include <jvm.h>
-
- #include <Region.h>
-@@ -1262,11 +1263,15 @@
- JavaVM* jvm = NULL;
- static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) {
- JNIEnv * env;
-+ // First call the native synthetic error handler declared in "awt_util.h" file.
-+ if (current_native_xerror_handler != NULL) {
-+ current_native_xerror_handler(dpy, event);
-+ }
- if (jvm != NULL) {
- env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
- if (env) {
-- return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I",
-- ptr_to_jlong(dpy), ptr_to_jlong(event)).i;
-+ return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XErrorHandlerUtil",
-+ "globalErrorHandler", "(JJ)I", ptr_to_jlong(dpy), ptr_to_jlong(event)).i;
- }
- }
- return 0;
---- ./jdk/src/windows/back/linker_md.c 2013-09-06 11:29:12.000000000 -0700
-+++ ./jdk/src/windows/back/linker_md.c 2014-07-15 21:49:30.000000000 -0700
-@@ -39,33 +39,27 @@
- #include "path_md.h"
-
- static void dll_build_name(char* buffer, size_t buflen,
-- const char* pname, const char* fname) {
-- // Based on os_windows.cpp
-+ const char* paths, const char* fname) {
-+ char *path, *paths_copy, *next_token;
-
-- char *path_sep = PATH_SEPARATOR;
-- char *pathname = (char *)pname;
-- while (strlen(pathname) > 0) {
-- char *p = strchr(pathname, *path_sep);
-- if (p == NULL) {
-- p = pathname + strlen(pathname);
-- }
-- /* check for NULL path */
-- if (p == pathname) {
-- continue;
-- }
-- if (*(p-1) == ':' || *(p-1) == '\\') {
-- (void)_snprintf(buffer, buflen, "%.*s%s.dll", (p - pathname),
-- pathname, fname);
-- } else {
-- (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (p - pathname),
-- pathname, fname);
-- }
-+ paths_copy = strdup(paths);
-+ if (paths_copy == NULL) {
-+ return;
-+ }
-+
-+ next_token = NULL;
-+ path = strtok_s(paths_copy, PATH_SEPARATOR, &next_token);
-+
-+ while (path != NULL) {
-+ _snprintf(buffer, buflen, "%s\\%s.dll", path, fname);
- if (_access(buffer, 0) == 0) {
- break;
- }
-- pathname = p + 1;
- *buffer = '\0';
-+ path = strtok_s(NULL, PATH_SEPARATOR, &next_token);
- }
-+
-+ free(paths_copy);
- }
-
- /*
-@@ -108,7 +102,7 @@
- * Build a machine dependent library name out of a path and file name.
- */
- void
--dbgsysBuildLibName(char *holder, int holderlen, char *pname, char *fname)
-+dbgsysBuildLibName(char *holder, int holderlen, const char *pname, const char *fname)
- {
- const int pnamelen = pname ? (int)strlen(pname) : 0;
-
---- ./jdk/src/windows/bin/cmdtoargs.c 2013-09-06 11:29:12.000000000 -0700
-+++ ./jdk/src/windows/bin/cmdtoargs.c 2014-07-15 21:49:30.000000000 -0700
-@@ -53,6 +53,16 @@
- static StdArg *stdargs;
- static int stdargc;
-
-+static int copyCh(USHORT ch, char* dest) {
-+ if (HIBYTE(ch) == 0) {
-+ *dest = (char)ch;
-+ return 1;
-+ } else {
-+ *((USHORT *)dest) = ch;
-+ return 2;
-+ }
-+}
-+
- static char* next_arg(char* cmdline, char* arg, jboolean* wildcard) {
-
- char* src = cmdline;
-@@ -61,31 +71,43 @@
- int quotes = 0;
- int slashes = 0;
-
-- char prev = 0;
-- char ch = 0;
-+ // "prev"/"ch" may contain either a single byte, or a double byte
-+ // character encoded in CP_ACP.
-+ USHORT prev = 0;
-+ USHORT ch = 0;
- int i;
- jboolean done = JNI_FALSE;
-+ int charLength;
-
- *wildcard = JNI_FALSE;
-- while ((ch = *src) != 0 && !done) {
-+ while (!done) {
-+ charLength = CharNextExA(CP_ACP, src, 0) - src;
-+ if (charLength == 0) {
-+ break;
-+ } else if (charLength == 1) {
-+ ch = (USHORT)(UCHAR)src[0];
-+ } else {
-+ ch = ((USHORT *)src)[0];
-+ }
-+
- switch (ch) {
-- case '"':
-+ case L'"':
- if (separator) {
- done = JNI_TRUE;
- break;
- }
-- if (prev == '\\') {
-+ if (prev == L'\\') {
- for (i = 1; i < slashes; i += 2) {
-- *dest++ = prev;
-+ dest += copyCh(prev, dest);
- }
- if (slashes % 2 == 1) {
-- *dest++ = ch;
-+ dest += copyCh(ch, dest);
- } else {
- quotes++;
- }
-- } else if (prev == '"' && quotes % 2 == 0) {
-+ } else if (prev == L'"' && quotes % 2 == 0) {
- quotes++;
-- *dest++ = ch; // emit every other consecutive quote
-+ dest += copyCh(ch, dest); // emit every other consecutive quote
- } else if (quotes == 0) {
- quotes++; // starting quote
- } else {
-@@ -94,7 +116,7 @@
- slashes = 0;
- break;
-
-- case '\\':
-+ case L'\\':
- slashes++;
- if (separator) {
- done = JNI_TRUE;
-@@ -102,23 +124,23 @@
- }
- break;
-
-- case ' ':
-- case '\t':
-- if (prev == '\\') {
-+ case L' ':
-+ case L'\t':
-+ if (prev == L'\\') {
- for (i = 0 ; i < slashes; i++) {
-- *dest++ = prev;
-+ dest += copyCh(prev, dest);
- }
- }
- if (quotes % 2 == 1) {
-- *dest++ = ch;
-+ dest += copyCh(ch, dest);
- } else {
- separator = JNI_TRUE;
- }
- slashes = 0;
- break;
-
-- case '*':
-- case '?':
-+ case L'*':
-+ case L'?':
- if (separator) {
- done = JNI_TRUE;
- separator = JNI_FALSE;
-@@ -127,36 +149,36 @@
- if (quotes % 2 == 0) {
- *wildcard = JNI_TRUE;
- }
-- if (prev == '\\') {
-+ if (prev == L'\\') {
- for (i = 0 ; i < slashes ; i++) {
-- *dest++ = prev;
-+ dest += copyCh(prev, dest);
- }
- }
-- *dest++ = ch;
-+ dest += copyCh(ch, dest);
- break;
-
- default:
-- if (prev == '\\') {
-+ if (prev == L'\\') {
- for (i = 0 ; i < slashes ; i++) {
-- *dest++ = prev;
-+ dest += copyCh(prev, dest);
- }
-- *dest++ = ch;
-+ dest += copyCh(ch, dest);
- } else if (separator) {
- done = JNI_TRUE;
- } else {
-- *dest++ = ch;
-+ dest += copyCh(ch, dest);
- }
- slashes = 0;
- }
-
- if (!done) {
- prev = ch;
-- src++;
-+ src += charLength;
- }
- }
-- if (prev == '\\') {
-+ if (prev == L'\\') {
- for (i = 0; i < slashes; i++) {
-- *dest++ = prev;
-+ dest += copyCh(prev, dest);
- }
- }
- *dest = 0;
---- ./jdk/src/windows/bin/java_md.c 2013-09-06 11:29:12.000000000 -0700
-+++ ./jdk/src/windows/bin/java_md.c 2014-07-15 21:54:46.000000000 -0700
-@@ -1301,6 +1301,14 @@
- /* save path length */
- jrePathLen = JLI_StrLen(libraryPath);
-
-+ if (jrePathLen + JLI_StrLen("\\bin\\verify.dll") >= MAXPATHLEN) {
-+ /* jre path is too long, the library path will not fit there;
-+ * report and abort preloading
-+ */
-+ JLI_ReportErrorMessage(JRE_ERROR11);
-+ break;
-+ }
-+
- /* load msvcrt 1st */
- LoadMSVCRT();
-
---- ./jdk/src/windows/classes/java/lang/ProcessImpl.java 2013-09-06 11:29:13.000000000 -0700
-+++ ./jdk/src/windows/classes/java/lang/ProcessImpl.java 2014-07-15 21:49:30.000000000 -0700
-@@ -457,8 +457,10 @@
-
- /**
- * Create a process using the win32 function CreateProcess.
-+ * The method is synchronized due to MS kb315939 problem.
-+ * All native handles should restore the inherit flag at the end of call.
- *
-- * @param cmdstr the Windows commandline
-+ * @param cmdstr the Windows command line
- * @param envblock NUL-separated, double-NUL-terminated list of
- * environment strings in VAR=VALUE form
- * @param dir the working directory of the process, or null if
-@@ -474,7 +476,7 @@
- * @param redirectErrorStream redirectErrorStream attribute
- * @return the native subprocess HANDLE returned by CreateProcess
- */
-- private static native long create(String cmdstr,
-+ private static synchronized native long create(String cmdstr,
- String envblock,
- String dir,
- long[] stdHandles,
---- ./jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java 2013-09-06 11:29:13.000000000 -0700
-+++ ./jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2007, 2008, 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
-@@ -162,8 +162,9 @@
- if (!fd.valid())
- return;
-
-- close0(fdAccess.get(fd));
-+ final int nativefd = fdAccess.get(fd);
- fdAccess.set(fd, -1);
-+ close0(nativefd);
- }
-
- void socketShutdown(int howto) throws IOException {
---- ./jdk/src/windows/classes/java/net/PlainSocketImpl.java 2013-09-06 11:29:13.000000000 -0700
-+++ ./jdk/src/windows/classes/java/net/PlainSocketImpl.java 2014-07-15 21:49:30.000000000 -0700
-@@ -191,14 +191,17 @@
- }
-
- protected synchronized void accept(SocketImpl s) throws IOException {
-- // pass in the real impl not the wrapper.
-- SocketImpl delegate = ((PlainSocketImpl)s).impl;
-- delegate.address = new InetAddress();
-- delegate.fd = new FileDescriptor();
-- impl.accept(delegate);
--
-- // set fd to delegate's fd to be compatible with older releases
-- s.fd = delegate.fd;
-+ if (s instanceof PlainSocketImpl) {
-+ // pass in the real impl not the wrapper.
-+ SocketImpl delegate = ((PlainSocketImpl)s).impl;
-+ delegate.address = new InetAddress();
-+ delegate.fd = new FileDescriptor();
-+ impl.accept(delegate);
-+ // set fd to delegate's fd to be compatible with older releases
-+ s.fd = delegate.fd;
-+ } else {
-+ impl.accept(s);
-+ }
- }
-
- void setFileDescriptor(FileDescriptor fd) {
---- ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java 2013-09-06 11:29:13.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java 2014-07-15 21:54:46.000000000 -0700
-@@ -583,11 +583,18 @@
-
- // Needs to be accessible to Win32ShellFolderManager2
- static String getFileSystemPath(final int csidl) throws IOException, InterruptedException {
-- return invoke(new Callable<String>() {
-+ String path = invoke(new Callable<String>() {
- public String call() throws IOException {
- return getFileSystemPath0(csidl);
- }
- }, IOException.class);
-+ if (path != null) {
-+ SecurityManager security = System.getSecurityManager();
-+ if (security != null) {
-+ security.checkRead(path);
-+ }
-+ }
-+ return path;
- }
-
- // NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details
---- ./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-07-15 21:54:46.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.
-@@ -137,6 +138,8 @@
- if (desktop == null) {
- try {
- desktop = new Win32ShellFolder2(DESKTOP);
-+ } catch (SecurityException e) {
-+ // Ignore error
- } catch (IOException e) {
- // Ignore error
- } catch (InterruptedException e) {
-@@ -150,6 +153,8 @@
- if (drives == null) {
- try {
- drives = new Win32ShellFolder2(DRIVES);
-+ } catch (SecurityException e) {
-+ // Ignore error
- } catch (IOException e) {
- // Ignore error
- } catch (InterruptedException e) {
-@@ -166,6 +171,8 @@
- if (path != null) {
- recent = createShellFolder(getDesktop(), new File(path));
- }
-+ } catch (SecurityException e) {
-+ // Ignore error
- } catch (InterruptedException e) {
- // Ignore error
- } catch (IOException e) {
-@@ -179,6 +186,8 @@
- if (network == null) {
- try {
- network = new Win32ShellFolder2(NETWORK);
-+ } catch (SecurityException e) {
-+ // Ignore error
- } catch (IOException e) {
- // Ignore error
- } catch (InterruptedException e) {
-@@ -202,6 +211,8 @@
- personal.setIsPersonal();
- }
- }
-+ } catch (SecurityException e) {
-+ // Ignore error
- } catch (InterruptedException e) {
- // Ignore error
- } catch (IOException e) {
-@@ -505,23 +516,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/ThemeReader.java 2013-09-06 11:29:13.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/awt/windows/ThemeReader.java 2014-07-15 21:54:46.000000000 -0700
-@@ -56,18 +56,12 @@
- new ReentrantReadWriteLock();
- private static final Lock readLock = readWriteLock.readLock();
- private static final Lock writeLock = readWriteLock.writeLock();
-+ private static volatile boolean valid = false;
-
- static void flush() {
-- writeLock.lock();
-- try {
-- // Close old themes.
-- for (Long value : widgetToTheme.values()) {
-- closeTheme(value.longValue());
-- }
-- widgetToTheme.clear();
-- } finally {
-- writeLock.unlock();
-- }
-+ // Could be called on Toolkit thread, so do not try to aquire locks
-+ // to avoid deadlock with theme initialization
-+ valid = false;
- }
-
- public native static boolean isThemed();
-@@ -94,6 +88,24 @@
- // returns theme value
- // this method should be invoked with readLock locked
- private static Long getTheme(String widget) {
-+ if (!valid) {
-+ readLock.unlock();
-+ writeLock.lock();
-+ try {
-+ if (!valid) {
-+ // Close old themes.
-+ for (Long value : widgetToTheme.values()) {
-+ closeTheme(value);
-+ }
-+ widgetToTheme.clear();
-+ valid = true;
-+ }
-+ } finally {
-+ readLock.lock();
-+ writeLock.unlock();
-+ }
-+ }
-+
- // mostly copied from the javadoc for ReentrantReadWriteLock
- Long theme = widgetToTheme.get(widget);
- if (theme == null) {
---- ./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-07-15 21:49:30.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/WPrinterJob.java 2013-09-06 11:29:13.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java 2014-07-15 21:49:30.000000000 -0700
-@@ -179,6 +179,7 @@
- private static final int SET_RES_LOW = 0x00000080;
- private static final int SET_COLOR = 0x00000200;
- private static final int SET_ORIENTATION = 0x00004000;
-+ private static final int SET_COLLATED = 0x00008000;
-
- /**
- * Values must match those defined in wingdi.h & commdlg.h
-@@ -189,10 +190,33 @@
- private static final int PD_NOSELECTION = 0x00000004;
- private static final int PD_COLLATE = 0x00000010;
- private static final int PD_PRINTTOFILE = 0x00000020;
-- private static final int DM_ORIENTATION = 0x00000001;
-- private static final int DM_PRINTQUALITY = 0x00000400;
-- private static final int DM_COLOR = 0x00000800;
-- private static final int DM_DUPLEX = 0x00001000;
-+ private static final int DM_ORIENTATION = 0x00000001;
-+ private static final int DM_PAPERSIZE = 0x00000002;
-+ private static final int DM_COPIES = 0x00000100;
-+ private static final int DM_DEFAULTSOURCE = 0x00000200;
-+ private static final int DM_PRINTQUALITY = 0x00000400;
-+ private static final int DM_COLOR = 0x00000800;
-+ private static final int DM_DUPLEX = 0x00001000;
-+ private static final int DM_YRESOLUTION = 0x00002000;
-+ private static final int DM_COLLATE = 0x00008000;
-+
-+ private static final short DMCOLLATE_FALSE = 0;
-+ private static final short DMCOLLATE_TRUE = 1;
-+
-+ private static final short DMORIENT_PORTRAIT = 1;
-+ private static final short DMORIENT_LANDSCAPE = 2;
-+
-+ private static final short DMCOLOR_MONOCHROME = 1;
-+ private static final short DMCOLOR_COLOR = 2;
-+
-+ private static final short DMRES_DRAFT = -1;
-+ private static final short DMRES_LOW = -2;
-+ private static final short DMRES_MEDIUM = -3;
-+ private static final short DMRES_HIGH = -4;
-+
-+ private static final short DMDUP_SIMPLEX = 1;
-+ private static final short DMDUP_VERTICAL = 2;
-+ private static final short DMDUP_HORIZONTAL = 3;
-
- /**
- * Pageable MAX pages
-@@ -592,13 +616,23 @@
- }
- driverDoesMultipleCopies = false;
- driverDoesCollation = false;
-- setNativePrintService(service.getName());
-+ setNativePrintServiceIfNeeded(service.getName());
- }
-
- /* associates this job with the specified native service */
- private native void setNativePrintService(String name)
- throws PrinterException;
-
-+ private String lastNativeService = null;
-+ private void setNativePrintServiceIfNeeded(String name)
-+ throws PrinterException {
-+
-+ if (name != null && !(name.equals(lastNativeService))) {
-+ setNativePrintService(name);
-+ lastNativeService = name;
-+ }
-+ }
-+
- public PrintService getPrintService() {
- if (myService == null) {
- String printerName = getNativePrintService();
-@@ -616,7 +650,7 @@
- myService = PrintServiceLookup.lookupDefaultPrintService();
- if (myService != null) {
- try {
-- setNativePrintService(myService.getName());
-+ setNativePrintServiceIfNeeded(myService.getName());
- } catch (Exception e) {
- myService = null;
- }
-@@ -1742,8 +1776,13 @@
- mAttMediaSizeName = ((Win32PrintService)myService).findPaperID(msn);
- }
-
-- private void setWin32MediaAttrib(int dmIndex, int width, int length) {
-- MediaSizeName msn =
-+ private void addPaperSize(PrintRequestAttributeSet aset,
-+ int dmIndex, int width, int length) {
-+
-+ if (aset == null) {
-+ return;
-+ }
-+ MediaSizeName msn =
- ((Win32PrintService)myService).findWin32Media(dmIndex);
- if (msn == null) {
- msn = ((Win32PrintService)myService).
-@@ -1751,10 +1790,12 @@
- }
-
- if (msn != null) {
-- if (attributes != null) {
-- attributes.add(msn);
-- }
-+ aset.add(msn);
- }
-+ }
-+
-+ private void setWin32MediaAttrib(int dmIndex, int width, int length) {
-+ addPaperSize(attributes, dmIndex, width, length);
- mAttMediaSizeName = dmIndex;
- }
-
-@@ -1776,7 +1817,7 @@
- // no equivalent predefined value
- mAttMediaTray = 7; // DMBIN_AUTO
- } else if (attr == MediaTray.TOP) {
-- mAttMediaTray =1; // DMBIN_UPPER
-+ mAttMediaTray = 1; // DMBIN_UPPER
- } else {
- if (attr instanceof Win32MediaTray) {
- mAttMediaTray = ((Win32MediaTray)attr).winID;
-@@ -1902,6 +1943,254 @@
- }
- }
-
-+ private static final class DevModeValues {
-+ int dmFields;
-+ short copies;
-+ short collate;
-+ short color;
-+ short duplex;
-+ short orient;
-+ short paper;
-+ short bin;
-+ short xres_quality;
-+ short yres;
-+ }
-+
-+ private void getDevModeValues(PrintRequestAttributeSet aset,
-+ DevModeValues info) {
-+
-+ Copies c = (Copies)aset.get(Copies.class);
-+ if (c != null) {
-+ info.dmFields |= DM_COPIES;
-+ info.copies = (short)c.getValue();
-+ }
-+
-+ SheetCollate sc = (SheetCollate)aset.get(SheetCollate.class);
-+ if (sc != null) {
-+ info.dmFields |= DM_COLLATE;
-+ info.collate = (sc == SheetCollate.COLLATED) ?
-+ DMCOLLATE_TRUE : DMCOLLATE_FALSE;
-+ }
-+
-+ Chromaticity ch = (Chromaticity)aset.get(Chromaticity.class);
-+ if (ch != null) {
-+ info.dmFields |= DM_COLOR;
-+ if (ch == Chromaticity.COLOR) {
-+ info.color = DMCOLOR_COLOR;
-+ } else {
-+ info.color = DMCOLOR_MONOCHROME;
-+ }
-+ }
-+
-+ Sides s = (Sides)aset.get(Sides.class);
-+ if (s != null) {
-+ info.dmFields |= DM_DUPLEX;
-+ if (s == Sides.TWO_SIDED_LONG_EDGE) {
-+ info.duplex = DMDUP_VERTICAL;
-+ } else if (s == Sides.TWO_SIDED_SHORT_EDGE) {
-+ info.duplex = DMDUP_HORIZONTAL;
-+ } else { // Sides.ONE_SIDED
-+ info.duplex = DMDUP_SIMPLEX;
-+ }
-+ }
-+
-+ OrientationRequested or =
-+ (OrientationRequested)aset.get(OrientationRequested.class);
-+ if (or != null) {
-+ info.dmFields |= DM_ORIENTATION;
-+ info.orient = (or == OrientationRequested.LANDSCAPE)
-+ ? DMORIENT_LANDSCAPE : DMORIENT_PORTRAIT;
-+ }
-+
-+ Media m = (Media)aset.get(Media.class);
-+ if (m instanceof MediaSizeName) {
-+ info.dmFields |= DM_PAPERSIZE;
-+ MediaSizeName msn = (MediaSizeName)m;
-+ info.paper =
-+ (short)((Win32PrintService)myService).findPaperID(msn);
-+ }
-+
-+ MediaTray mt = null;
-+ if (m instanceof MediaTray) {
-+ mt = (MediaTray)m;
-+ }
-+ if (mt == null) {
-+ SunAlternateMedia sam =
-+ (SunAlternateMedia)aset.get(SunAlternateMedia.class);
-+ if (sam != null && (sam.getMedia() instanceof MediaTray)) {
-+ mt = (MediaTray)sam.getMedia();
-+ }
-+ }
-+
-+ if (mt != null) {
-+ info.dmFields |= DM_DEFAULTSOURCE;
-+ info.bin = (short)(((Win32PrintService)myService).findTrayID(mt));
-+ }
-+
-+ PrintQuality q = (PrintQuality)aset.get(PrintQuality.class);
-+ if (q != null) {
-+ info.dmFields |= DM_PRINTQUALITY;
-+ if (q == PrintQuality.DRAFT) {
-+ info.xres_quality = DMRES_DRAFT;
-+ } else if (q == PrintQuality.HIGH) {
-+ info.xres_quality = DMRES_HIGH;
-+ } else {
-+ info.xres_quality = DMRES_MEDIUM;
-+ }
-+ }
-+
-+ PrinterResolution r =
-+ (PrinterResolution)aset.get(PrinterResolution.class);
-+ if (r != null) {
-+ info.dmFields |= DM_PRINTQUALITY | DM_YRESOLUTION;
-+ info.xres_quality =
-+ (short)r.getCrossFeedResolution(PrinterResolution.DPI);
-+ info.yres = (short)r.getFeedResolution(PrinterResolution.DPI);
-+ }
-+ }
-+
-+ /* This method is called from native to update the values in the
-+ * attribute set which originates from the cross-platform dialog,
-+ * but updated by the native DocumentPropertiesUI which updates the
-+ * devmode. This syncs the devmode back in to the attributes so that
-+ * we can update the cross-platform dialog.
-+ * The attribute set here is a temporary one installed whilst this
-+ * happens,
-+ */
-+ private final void setJobAttributes(PrintRequestAttributeSet attributes,
-+ int fields, int values,
-+ short copies,
-+ short dmPaperSize,
-+ short dmPaperWidth,
-+ short dmPaperLength,
-+ short dmDefaultSource,
-+ short xRes,
-+ short yRes) {
-+
-+ if (attributes == null) {
-+ return;
-+ }
-+
-+ if ((fields & DM_COPIES) != 0) {
-+ attributes.add(new Copies(copies));
-+ }
-+
-+ if ((fields & DM_COLLATE) != 0) {
-+ if ((values & SET_COLLATED) != 0) {
-+ attributes.add(SheetCollate.COLLATED);
-+ } else {
-+ attributes.add(SheetCollate.UNCOLLATED);
-+ }
-+ }
-+
-+ if ((fields & DM_ORIENTATION) != 0) {
-+ if ((values & SET_ORIENTATION) != 0) {
-+ attributes.add(OrientationRequested.LANDSCAPE);
-+ } else {
-+ attributes.add(OrientationRequested.PORTRAIT);
-+ }
-+ }
-+
-+ if ((fields & DM_COLOR) != 0) {
-+ if ((values & SET_COLOR) != 0) {
-+ attributes.add(Chromaticity.COLOR);
-+ } else {
-+ attributes.add(Chromaticity.MONOCHROME);
-+ }
-+ }
-+
-+ if ((fields & DM_PRINTQUALITY) != 0) {
-+ /* value < 0 indicates quality setting.
-+ * value > 0 indicates X resolution. In that case
-+ * hopefully we will also find y-resolution specified.
-+ * If its not, assume its the same as x-res.
-+ * Maybe Java code should try to reconcile this against
-+ * the printers claimed set of supported resolutions.
-+ */
-+ if (xRes < 0) {
-+ PrintQuality quality;
-+ if ((values & SET_RES_LOW) != 0) {
-+ quality = PrintQuality.DRAFT;
-+ } else if ((fields & SET_RES_HIGH) != 0) {
-+ quality = PrintQuality.HIGH;
-+ } else {
-+ quality = PrintQuality.NORMAL;
-+ }
-+ attributes.add(quality);
-+ } else if (xRes > 0 && yRes > 0) {
-+ attributes.add(
-+ new PrinterResolution(xRes, yRes, PrinterResolution.DPI));
-+ }
-+ }
-+
-+ if ((fields & DM_DUPLEX) != 0) {
-+ Sides sides;
-+ if ((values & SET_DUP_VERTICAL) != 0) {
-+ sides = Sides.TWO_SIDED_LONG_EDGE;
-+ } else if ((values & SET_DUP_HORIZONTAL) != 0) {
-+ sides = Sides.TWO_SIDED_SHORT_EDGE;
-+ } else {
-+ sides = Sides.ONE_SIDED;
-+ }
-+ attributes.add(sides);
-+ }
-+
-+ if ((fields & DM_PAPERSIZE) != 0) {
-+ addPaperSize(attributes, dmPaperSize, dmPaperWidth, dmPaperLength);
-+ }
-+
-+ if ((fields & DM_DEFAULTSOURCE) != 0) {
-+ MediaTray tray =
-+ ((Win32PrintService)myService).findMediaTray(dmDefaultSource);
-+ attributes.add(new SunAlternateMedia(tray));
-+ }
-+ }
-+
-+ private native boolean showDocProperties(long hWnd,
-+ PrintRequestAttributeSet aset,
-+ int dmFields,
-+ short copies,
-+ short collate,
-+ short color,
-+ short duplex,
-+ short orient,
-+ short paper,
-+ short bin,
-+ short xres_quality,
-+ short yres);
-+
-+ @SuppressWarnings("deprecation")
-+ public PrintRequestAttributeSet
-+ showDocumentProperties(Window owner,
-+ PrintService service,
-+ PrintRequestAttributeSet aset)
-+ {
-+ try {
-+ setNativePrintServiceIfNeeded(service.getName());
-+ } catch (PrinterException e) {
-+ }
-+ long hWnd = ((WWindowPeer)(owner.getPeer())).getHWnd();
-+ DevModeValues info = new DevModeValues();
-+ getDevModeValues(aset, info);
-+ boolean ok =
-+ showDocProperties(hWnd, aset,
-+ info.dmFields,
-+ info.copies,
-+ info.collate,
-+ info.color,
-+ info.duplex,
-+ info.orient,
-+ info.paper,
-+ info.bin,
-+ info.xres_quality,
-+ info.yres);
-+
-+ if (ok) {
-+ return aset;
-+ } else {
-+ return null;
-+ }
-+ }
-
- /* Printer Resolution. See also getXRes() and getYRes() */
- private final void setResolutionDPI(int xres, int yres) {
-@@ -1944,7 +2233,7 @@
- }
- //** END Functions called by native code for querying/updating attributes
-
-- }
-+ }
-
- class PrintToFileErrorDialog extends Dialog implements ActionListener{
- public PrintToFileErrorDialog(Frame parent, String title, String message,
---- ./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-10-28 20:19:51.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
-@@ -37,7 +37,9 @@
- import java.security.AccessController;
- import java.security.PrivilegedAction;
- import sun.awt.AWTAutoShutdown;
-+import sun.awt.AppContext;
- import sun.awt.SunToolkit;
-+import sun.misc.ThreadGroupUtils;
- import sun.awt.Win32GraphicsDevice;
- import sun.awt.Win32GraphicsEnvironment;
- import sun.java2d.d3d.D3DRenderQueue;
-@@ -215,7 +217,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 +234,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 +272,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 +285,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) {
-@@ -855,11 +864,18 @@
- * Windows doesn't always send WM_SETTINGCHANGE when it should.
- */
- private void windowsSettingChange() {
-- EventQueue.invokeLater(new Runnable() {
-- public void run() {
-- updateProperties();
-- }
-- });
-+ if (AppContext.getAppContext() == null) {
-+ // We cannot post the update to any EventQueue. Listeners will
-+ // be called on EDTs by DesktopPropertyChangeSupport
-+ updateProperties();
-+ } else {
-+ EventQueue.invokeLater(new Runnable() {
-+ @Override
-+ public void run() {
-+ updateProperties();
-+ }
-+ });
-+ }
- }
-
- private synchronized void updateProperties() {
---- ./jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java 2013-09-06 11:29:13.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java 2014-07-15 21:54:46.000000000 -0700
-@@ -421,6 +421,7 @@
- */
- public static long[] getActiveWindowHandles() {
- AppContext appContext = AppContext.getAppContext();
-+ if (appContext == null) return null;
- synchronized (appContext) {
- List<WWindowPeer> l = (List<WWindowPeer>)appContext.get(ACTIVE_WINDOWS_KEY);
- if (l == null) {
---- ./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-07-15 21:49:30.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-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,65 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package sun.net;
-+
-+import java.security.AccessController;
-+
-+/**
-+ * Determines the ephemeral port range in use on this system.
-+ * If this cannot be determined, then the default settings
-+ * of the OS are returned.
-+ */
-+
-+public final class PortConfig {
-+
-+ private final static int upper, lower;
-+
-+ private PortConfig() {}
-+
-+ static {
-+ AccessController.doPrivileged(
-+ new java.security.PrivilegedAction<Void>() {
-+ public Void run() {
-+ System.loadLibrary("net");
-+ return null;
-+ }
-+ });
-+
-+ lower = getLower0();
-+ upper = getUpper0();
-+ }
-+
-+ static native int getLower0();
-+ static native int getUpper0();
-+
-+ public static int getLower() {
-+ return lower;
-+ }
-+
-+ public static int getUpper() {
-+ return upper;
-+ }
-+}
---- ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java 2013-09-06 11:29:14.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java 2014-07-15 21:49:30.000000000 -0700
-@@ -230,6 +230,7 @@
- @Override
- public void run() {
- long overlapped = 0L;
-+ boolean pending = false;
- try {
- begin();
-
-@@ -243,6 +244,7 @@
- overlapped);
- if (n == IOStatus.UNAVAILABLE) {
- // I/O is pending
-+ pending = true;
- return;
- }
- // acquired lock immediately
-@@ -252,10 +254,10 @@
- } catch (Throwable x) {
- // lock failed or channel closed
- removeFromFileLockTable(fli);
-- if (overlapped != 0L)
-- ioCache.remove(overlapped);
- result.setFailure(toIOException(x));
- } finally {
-+ if (!pending && overlapped != 0L)
-+ ioCache.remove(overlapped);
- end();
- }
-
---- ./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-07-15 21:49:30.000000000 -0700
-@@ -31,6 +31,9 @@
- import java.net.*;
- import java.util.concurrent.*;
- import java.io.IOException;
-+import java.security.AccessController;
-+import java.security.PrivilegedActionException;
-+import java.security.PrivilegedExceptionAction;
- import sun.misc.Unsafe;
-
- /**
-@@ -300,6 +303,19 @@
- }
- }
-
-+ private void doPrivilegedBind(final SocketAddress sa) throws IOException {
-+ try {
-+ AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
-+ public Void run() throws IOException {
-+ bind(sa);
-+ return null;
-+ }
-+ });
-+ } catch (PrivilegedActionException e) {
-+ throw (IOException) e.getException();
-+ }
-+ }
-+
- @Override
- <A> Future<Void> implConnect(SocketAddress remote,
- A attachment,
-@@ -330,7 +346,12 @@
- throw new ConnectionPendingException();
- if (localAddress == null) {
- try {
-- bind(new InetSocketAddress(0));
-+ SocketAddress any = new InetSocketAddress(0);
-+ if (sm == null) {
-+ bind(any);
-+ } else {
-+ doPrivilegedBind(any);
-+ }
- } catch (IOException x) {
- bindException = x;
- }
---- ./jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java 2013-09-06 11:29:14.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java 2014-07-15 21:49:30.000000000 -0700
-@@ -100,6 +100,7 @@
- public static final int ERROR_INVALID_LEVEL = 124;
- public static final int ERROR_DIR_NOT_EMPTY = 145;
- public static final int ERROR_ALREADY_EXISTS = 183;
-+ public static final int ERROR_MORE_DATA = 234;
- public static final int ERROR_DIRECTORY = 267;
- public static final int ERROR_NOTIFY_ENUM_DIR = 1022;
- public static final int ERROR_NONE_MAPPED = 1332;
---- ./jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java 2013-09-06 11:29:14.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java 2014-07-15 21:49:30.000000000 -0700
-@@ -973,19 +973,19 @@
- * HANDLE CreateIoCompletionPort (
- * HANDLE FileHandle,
- * HANDLE ExistingCompletionPort,
-- * DWORD CompletionKey,
-+ * ULONG_PTR CompletionKey,
- * DWORD NumberOfConcurrentThreads
- * )
- */
- static native long CreateIoCompletionPort(long fileHandle, long existingPort,
-- int completionKey) throws WindowsException;
-+ long completionKey) throws WindowsException;
-
-
- /**
- * GetQueuedCompletionStatus(
- * HANDLE CompletionPort,
- * LPDWORD lpNumberOfBytesTransferred,
-- * LPDWORD lpCompletionKey,
-+ * PULONG_PTR lpCompletionKey,
- * LPOVERLAPPED *lpOverlapped,
- * DWORD dwMilliseconds
- */
-@@ -999,12 +999,12 @@
- static class CompletionStatus {
- private int error;
- private int bytesTransferred;
-- private int completionKey;
-+ private long completionKey;
- private CompletionStatus() { }
-
- int error() { return error; }
- int bytesTransferred() { return bytesTransferred; }
-- int completionKey() { return completionKey; }
-+ long completionKey() { return completionKey; }
- }
- private static native void GetQueuedCompletionStatus0(long completionPort,
- CompletionStatus status) throws WindowsException;
-@@ -1013,12 +1013,12 @@
- * PostQueuedCompletionStatus(
- * HANDLE CompletionPort,
- * DWORD dwNumberOfBytesTransferred,
-- * DWORD dwCompletionKey,
-+ * ULONG_PTR dwCompletionKey,
- * LPOVERLAPPED lpOverlapped
- * )
- */
- static native void PostQueuedCompletionStatus(long completionPort,
-- int completionKey) throws WindowsException;
-+ long completionKey) throws WindowsException;
-
- /**
- * ReadDirectoryChangesW(
---- ./jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java 2013-09-06 11:29:14.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java 2014-07-15 21:49:30.000000000 -0700
-@@ -41,6 +41,7 @@
- class WindowsWatchService
- extends AbstractWatchService
- {
-+ private final static int WAKEUP_COMPLETION_KEY = 0;
- private final Unsafe unsafe = Unsafe.getUnsafe();
-
- // background thread to service I/O completion port
-@@ -83,7 +84,7 @@
- */
- private class WindowsWatchKey extends AbstractWatchKey {
- // file key (used to detect existing registrations)
-- private FileKey fileKey;
-+ private final FileKey fileKey;
-
- // handle to directory
- private volatile long handle = INVALID_HANDLE_VALUE;
-@@ -223,8 +224,7 @@
- FileKey other = (FileKey)obj;
- if (this.volSerialNumber != other.volSerialNumber) return false;
- if (this.fileIndexHigh != other.fileIndexHigh) return false;
-- if (this.fileIndexLow != other.fileIndexLow) return false;
-- return true;
-+ return this.fileIndexLow == other.fileIndexLow;
- }
- }
-
-@@ -268,6 +268,7 @@
- private static final short OFFSETOF_FILENAME = 12;
-
- // size of per-directory buffer for events (FIXME - make this configurable)
-+ // Need to be less than 4*16384 = 65536. DWORD align.
- private static final int CHANGES_BUFFER_SIZE = 16 * 1024;
-
- private final WindowsFileSystem fs;
-@@ -275,27 +276,28 @@
- private final long port;
-
- // maps completion key to WatchKey
-- private final Map<Integer,WindowsWatchKey> int2key;
-+ private final Map<Integer,WindowsWatchKey> ck2key;
-
- // maps file key to WatchKey
- private final Map<FileKey,WindowsWatchKey> fk2key;
-
- // unique completion key for each directory
-+ // native completion key capacity is 64 bits on Win64.
- private int lastCompletionKey;
-
- Poller(WindowsFileSystem fs, WindowsWatchService watcher, long port) {
- this.fs = fs;
- this.watcher = watcher;
- this.port = port;
-- this.int2key = new HashMap<Integer,WindowsWatchKey>();
-- this.fk2key = new HashMap<FileKey,WindowsWatchKey>();
-+ this.ck2key = new HashMap<>();
-+ this.fk2key = new HashMap<>();
- this.lastCompletionKey = 0;
- }
-
- @Override
- void wakeup() throws IOException {
- try {
-- PostQueuedCompletionStatus(port, 0);
-+ PostQueuedCompletionStatus(port, WAKEUP_COMPLETION_KEY);
- } catch (WindowsException x) {
- throw new IOException(x.getMessage());
- }
-@@ -322,7 +324,6 @@
- for (WatchEvent.Modifier modifier: modifiers) {
- if (modifier == ExtendedWatchEventModifier.FILE_TREE) {
- watchSubtree = true;
-- continue;
- } else {
- if (modifier == null)
- return new NullPointerException();
-@@ -333,7 +334,7 @@
- }
-
- // open directory
-- long handle = -1L;
-+ long handle;
- try {
- handle = CreateFile(dir.getPathForWin32Calls(),
- FILE_LIST_DIRECTORY,
-@@ -347,7 +348,7 @@
- boolean registered = false;
- try {
- // read attributes and check file is a directory
-- WindowsFileAttributes attrs = null;
-+ WindowsFileAttributes attrs;
- try {
- attrs = WindowsFileAttributes.readAttributes(handle);
- } catch (WindowsException x) {
-@@ -370,9 +371,10 @@
- return existing;
- }
-
-- // unique completion key (skip 0)
-+ // Can overflow the int type capacity.
-+ // Skip WAKEUP_COMPLETION_KEY value.
- int completionKey = ++lastCompletionKey;
-- if (completionKey == 0)
-+ if (completionKey == WAKEUP_COMPLETION_KEY)
- completionKey = ++lastCompletionKey;
-
- // associate handle with completion port
-@@ -418,13 +420,13 @@
- // 1. remove mapping from old completion key to existing watch key
- // 2. release existing key's resources (handle/buffer)
- // 3. re-initialize key with new handle/buffer
-- int2key.remove(existing.completionKey());
-+ ck2key.remove(existing.completionKey());
- existing.releaseResources();
- watchKey = existing.init(handle, events, watchSubtree, buffer,
- countAddress, overlappedAddress, completionKey);
- }
- // map completion map to watch key
-- int2key.put(completionKey, watchKey);
-+ ck2key.put(completionKey, watchKey);
-
- registered = true;
- return watchKey;
-@@ -440,7 +442,7 @@
- WindowsWatchKey key = (WindowsWatchKey)obj;
- if (key.isValid()) {
- fk2key.remove(key.fileKey());
-- int2key.remove(key.completionKey());
-+ ck2key.remove(key.completionKey());
- key.invalidate();
- }
- }
-@@ -449,11 +451,11 @@
- @Override
- void implCloseAll() {
- // cancel all keys
-- for (Map.Entry<Integer,WindowsWatchKey> entry: int2key.entrySet()) {
-+ for (Map.Entry<Integer, WindowsWatchKey> entry: ck2key.entrySet()) {
- entry.getValue().invalidate();
- }
- fk2key.clear();
-- int2key.clear();
-+ ck2key.clear();
-
- // close I/O completion port
- CloseHandle(port);
-@@ -517,7 +519,7 @@
- @Override
- public void run() {
- for (;;) {
-- CompletionStatus info = null;
-+ CompletionStatus info;
- try {
- info = GetQueuedCompletionStatus(port);
- } catch (WindowsException x) {
-@@ -527,7 +529,7 @@
- }
-
- // wakeup
-- if (info.completionKey() == 0) {
-+ if (info.completionKey() == WAKEUP_COMPLETION_KEY) {
- boolean shutdown = processRequests();
- if (shutdown) {
- return;
-@@ -536,7 +538,7 @@
- }
-
- // map completionKey to get WatchKey
-- WindowsWatchKey key = int2key.get(info.completionKey());
-+ WindowsWatchKey key = ck2key.get((int)info.completionKey());
- if (key == null) {
- // We get here when a registration is changed. In that case
- // the directory is closed which causes an event with the
-@@ -544,38 +546,44 @@
- continue;
- }
-
-- // ReadDirectoryChangesW failed
-- if (info.error() != 0) {
-+ boolean criticalError = false;
-+ int errorCode = info.error();
-+ int messageSize = info.bytesTransferred();
-+ if (errorCode == ERROR_NOTIFY_ENUM_DIR) {
- // buffer overflow
-- if (info.error() == ERROR_NOTIFY_ENUM_DIR) {
-+ key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
-+ } else if (errorCode != 0 && errorCode != ERROR_MORE_DATA) {
-+ // ReadDirectoryChangesW failed
-+ criticalError = true;
-+ } else {
-+ // ERROR_MORE_DATA is a warning about incomplite
-+ // data transfer over TCP/UDP stack. For the case
-+ // [messageSize] is zero in the most of cases.
-+
-+ if (messageSize > 0) {
-+ // process non-empty events.
-+ processEvents(key, messageSize);
-+ } else if (errorCode == 0) {
-+ // insufficient buffer size
-+ // not described, but can happen.
- key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
-- } else {
-- // other error so cancel key
-- implCancelKey(key);
-- key.signal();
- }
-- continue;
-- }
-
-- // process the events
-- if (info.bytesTransferred() > 0) {
-- processEvents(key, info.bytesTransferred());
-- } else {
-- // insufficient buffer size
-- key.signalEvent(StandardWatchEventKinds.OVERFLOW, null);
-+ // start read for next batch of changes
-+ try {
-+ ReadDirectoryChangesW(key.handle(),
-+ key.buffer().address(),
-+ CHANGES_BUFFER_SIZE,
-+ key.watchSubtree(),
-+ ALL_FILE_NOTIFY_EVENTS,
-+ key.countAddress(),
-+ key.overlappedAddress());
-+ } catch (WindowsException x) {
-+ // no choice but to cancel key
-+ criticalError = true;
-+ }
- }
--
-- // start read for next batch of changes
-- try {
-- ReadDirectoryChangesW(key.handle(),
-- key.buffer().address(),
-- CHANGES_BUFFER_SIZE,
-- key.watchSubtree(),
-- ALL_FILE_NOTIFY_EVENTS,
-- key.countAddress(),
-- key.overlappedAddress());
-- } catch (WindowsException x) {
-- // no choice but to cancel key
-+ if (criticalError) {
- implCancelKey(key);
- key.signal();
- }
---- ./jdk/src/windows/classes/sun/print/Win32MediaTray.java 2013-09-06 11:29:14.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/print/Win32MediaTray.java 2014-07-15 21:49:30.000000000 -0700
-@@ -70,6 +70,10 @@
- winEnumTable.add(this);
- }
-
-+ public int getDMBinID() {
-+ return winID;
-+ }
-+
- private static final String[] myStringTable ={
- "Manual-Envelope",
- "Automatic-Feeder",
---- ./jdk/src/windows/classes/sun/print/Win32PrintService.java 2013-09-06 11:29:14.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/print/Win32PrintService.java 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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,14 +25,13 @@
-
- package sun.print;
-
-+import java.awt.Window;
-+import java.awt.print.PrinterJob;
- import java.io.File;
- import java.net.URI;
- import java.net.URISyntaxException;
--import java.net.URL;
--
--import java.util.Vector;
-+import java.util.ArrayList;
- import java.util.HashMap;
--
- import javax.print.DocFlavor;
- import javax.print.DocPrintJob;
- import javax.print.PrintService;
-@@ -42,6 +41,7 @@
- import javax.print.attribute.AttributeSetUtilities;
- import javax.print.attribute.EnumSyntax;
- import javax.print.attribute.HashAttributeSet;
-+import javax.print.attribute.PrintRequestAttributeSet;
- import javax.print.attribute.PrintServiceAttribute;
- import javax.print.attribute.PrintServiceAttributeSet;
- import javax.print.attribute.HashPrintServiceAttributeSet;
-@@ -69,22 +69,15 @@
- import javax.print.attribute.standard.Sides;
- import javax.print.attribute.standard.ColorSupported;
- import javax.print.attribute.standard.PrintQuality;
--import javax.print.attribute.ResolutionSyntax;
- import javax.print.attribute.standard.PrinterResolution;
- import javax.print.attribute.standard.SheetCollate;
- import javax.print.event.PrintServiceAttributeListener;
--import java.util.ArrayList;
--
--import sun.print.SunPrinterJobService;
-+import sun.awt.windows.WPrinterJob;
-
- public class Win32PrintService implements PrintService, AttributeUpdater,
- SunPrinterJobService {
-
-- public static MediaSize[] predefMedia;
--
-- static {
-- Class c = Win32MediaSize.class;
-- }
-+ public static MediaSize[] predefMedia = Win32MediaSize.getPredefMedia();
-
- private static final DocFlavor[] supportedFlavors = {
- DocFlavor.BYTE_ARRAY.GIF,
-@@ -290,6 +283,22 @@
- return 0;
- }
-
-+ public int findTrayID(MediaTray tray) {
-+
-+ getMediaTrays(); // make sure they are initialised.
-+
-+ if (tray instanceof Win32MediaTray) {
-+ Win32MediaTray winTray = (Win32MediaTray)tray;
-+ return winTray.getDMBinID();
-+ }
-+ for (int id=0; id<dmPaperBinToPrintService.length; id++) {
-+ if (tray.equals(dmPaperBinToPrintService[id])) {
-+ return id+1; // DMBIN_FIRST = 1;
-+ }
-+ }
-+ return 0; // didn't find the tray
-+ }
-+
- public MediaTray findMediaTray(int dmBin) {
- if (dmBin >= 1 && dmBin <= dmPaperBinToPrintService.length) {
- return dmPaperBinToPrintService[dmBin-1];
-@@ -310,7 +319,9 @@
-
- public MediaSizeName findWin32Media(int dmIndex) {
- if (dmIndex >= 1 && dmIndex <= dmPaperToPrintService.length) {
-- switch(dmIndex) {
-+ return dmPaperToPrintService[dmIndex - 1];
-+ }
-+ switch(dmIndex) {
- /* matching media sizes with indices beyond
- dmPaperToPrintService's length */
- case DMPAPER_A2:
-@@ -320,11 +331,8 @@
- case DMPAPER_B6_JIS:
- return MediaSizeName.JIS_B6;
- default:
-- return dmPaperToPrintService[dmIndex - 1];
-- }
-+ return null;
- }
--
-- return null;
- }
-
- private boolean addToUniqueList(ArrayList msnList, MediaSizeName mediaName) {
-@@ -350,6 +358,7 @@
- }
-
- ArrayList msnList = new ArrayList();
-+ ArrayList<Win32MediaSize> trailingWmsList = new ArrayList<Win32MediaSize>();
- ArrayList printableList = new ArrayList();
- MediaSizeName mediaName;
- boolean added;
-@@ -368,7 +377,8 @@
- idList.add(Integer.valueOf(media[i]));
- }
-
-- mediaSizes = getMediaSizes(idList, media);
-+ ArrayList<String> dmPaperNameList = new ArrayList<String>();
-+ mediaSizes = getMediaSizes(idList, media, dmPaperNameList);
- for (int i = 0; i < idList.size(); i++) {
-
- // match Win ID with our predefined ID using table
-@@ -387,6 +397,7 @@
- mediaName = null;
- }
- }
-+ boolean dmPaperIDMatched = (mediaName != null);
-
- // No match found, then we get the MediaSizeName out of the MediaSize
- // This requires 1-1 correspondence, lengths must be checked.
-@@ -395,9 +406,32 @@
- }
-
- // Add mediaName to the msnList
-+ added = false;
- if (mediaName != null) {
- added = addToUniqueList(msnList, mediaName);
- }
-+ if ((!dmPaperIDMatched || !added) && (idList.size() == dmPaperNameList.size())) {
-+ /* The following block allows to add such media names to the list, whose sizes
-+ * matched with media sizes predefined in JDK, while whose paper IDs did not,
-+ * or whose sizes and paper IDs both did not match with any predefined in JDK.
-+ */
-+ Win32MediaSize wms = Win32MediaSize.findMediaName(dmPaperNameList.get(i));
-+ if ((wms == null) && (idList.size() == mediaSizes.length)) {
-+ wms = new Win32MediaSize(dmPaperNameList.get(i), (Integer)idList.get(i));
-+ mediaSizes[i] = new MediaSize(mediaSizes[i].getX(MediaSize.MM),
-+ mediaSizes[i].getY(MediaSize.MM), MediaSize.MM, wms);
-+ }
-+ if ((wms != null) && (wms != mediaName)) {
-+ if (!added) {
-+ added = addToUniqueList(msnList, mediaName = wms);
-+ } else {
-+ trailingWmsList.add(wms);
-+ }
-+ }
-+ }
-+ }
-+ for (Win32MediaSize wms : trailingWmsList) {
-+ added = addToUniqueList(msnList, wms);
- }
-
- // init mediaSizeNames
-@@ -588,7 +622,11 @@
- }
-
-
-- private MediaSize[] getMediaSizes(ArrayList idList, int[] media) {
-+ private MediaSize[] getMediaSizes(ArrayList idList, int[] media, ArrayList<String> dmPaperNameList) {
-+ if (dmPaperNameList == null) {
-+ dmPaperNameList = new ArrayList<String>();
-+ }
-+
- String prnPort = getPort();
- int[] mediaSz = getAllMediaSizes(printer, prnPort);
- String[] winMediaNames = getAllMediaNames(printer, prnPort);
-@@ -607,40 +645,43 @@
- wid = mediaSz[i*2]/10f;
- ht = mediaSz[i*2+1]/10f;
-
-- // Make sure to validate wid & ht.
-- // HP LJ 4050 (german) causes IAE in Sonderformat paper, wid & ht
-- // returned is not constant.
-- if ((wid <= 0) || (ht <= 0)) {
-- //Remove corresponding ID from list
-- if (nMedia == media.length) {
-- Integer remObj = Integer.valueOf(media[i]);
-- idList.remove(idList.indexOf(remObj));
-+ // Make sure to validate wid & ht.
-+ // HP LJ 4050 (german) causes IAE in Sonderformat paper, wid & ht
-+ // returned is not constant.
-+ if ((wid <= 0) || (ht <= 0)) {
-+ //Remove corresponding ID from list
-+ if (nMedia == media.length) {
-+ Integer remObj = Integer.valueOf(media[i]);
-+ idList.remove(idList.indexOf(remObj));
-+ }
-+ continue;
- }
-- continue;
-- }
-- // Find matching media using dimensions.
-- // This call matches only with our own predefined sizes.
-- msn = findMatchingMediaSizeNameMM(wid, ht);
-- if (msn != null) {
-- ms = MediaSize.getMediaSizeForName(msn);
-- }
--
-- if (ms != null) {
-- msList.add(ms);
-- } else {
-- Win32MediaSize wms =
-- new Win32MediaSize(winMediaNames[i], media[i]);
-- try {
-- ms = new MediaSize(wid, ht, MediaSize.MM, wms);
-- msList.add(ms);
-- } catch(IllegalArgumentException e) {
-- if (nMedia == media.length) {
-- Integer remObj = Integer.valueOf(media[i]);
-- idList.remove(idList.indexOf(remObj));
-- }
-+ // Find matching media using dimensions.
-+ // This call matches only with our own predefined sizes.
-+ msn = findMatchingMediaSizeNameMM(wid, ht);
-+ if (msn != null) {
-+ ms = MediaSize.getMediaSizeForName(msn);
- }
-- }
-
-+ if (ms != null) {
-+ msList.add(ms);
-+ dmPaperNameList.add(winMediaNames[i]);
-+ } else {
-+ Win32MediaSize wms = Win32MediaSize.findMediaName(winMediaNames[i]);
-+ if (wms == null) {
-+ wms = new Win32MediaSize(winMediaNames[i], media[i]);
-+ }
-+ try {
-+ ms = new MediaSize(wid, ht, MediaSize.MM, wms);
-+ msList.add(ms);
-+ dmPaperNameList.add(winMediaNames[i]);
-+ } catch(IllegalArgumentException e) {
-+ if (nMedia == media.length) {
-+ Integer remObj = Integer.valueOf(media[i]);
-+ idList.remove(idList.indexOf(remObj));
-+ }
-+ }
-+ }
- }
-
- MediaSize[] arr2 = new MediaSize[msList.size()];
-@@ -649,7 +690,6 @@
- return arr2;
- }
-
--
- private PrinterIsAcceptingJobs getPrinterIsAcceptingJobs() {
- if (getJobStatus(printer, 2) != 1) {
- return PrinterIsAcceptingJobs.NOT_ACCEPTING_JOBS;
-@@ -1572,8 +1612,76 @@
- }
- }
-
-- public ServiceUIFactory getServiceUIFactory() {
-- return null;
-+ private Win32DocumentPropertiesUI docPropertiesUI = null;
-+
-+ private static class Win32DocumentPropertiesUI
-+ extends DocumentPropertiesUI {
-+
-+ Win32PrintService service;
-+
-+ private Win32DocumentPropertiesUI(Win32PrintService s) {
-+ service = s;
-+ }
-+
-+ public PrintRequestAttributeSet
-+ showDocumentProperties(PrinterJob job,
-+ Window owner,
-+ PrintService service,
-+ PrintRequestAttributeSet aset) {
-+
-+ if (!(job instanceof WPrinterJob)) {
-+ return null;
-+ }
-+ WPrinterJob wJob = (WPrinterJob)job;
-+ return wJob.showDocumentProperties(owner, service, aset);
-+ }
-+ }
-+
-+ private synchronized DocumentPropertiesUI getDocumentPropertiesUI() {
-+ return new Win32DocumentPropertiesUI(this);
-+ }
-+
-+ private static class Win32ServiceUIFactory extends ServiceUIFactory {
-+
-+ Win32PrintService service;
-+
-+ Win32ServiceUIFactory(Win32PrintService s) {
-+ service = s;
-+ }
-+
-+ public Object getUI(int role, String ui) {
-+ if (role <= ServiceUIFactory.MAIN_UIROLE) {
-+ return null;
-+ }
-+ if (role == DocumentPropertiesUI.DOCUMENTPROPERTIES_ROLE &&
-+ DocumentPropertiesUI.DOCPROPERTIESCLASSNAME.equals(ui))
-+ {
-+ return service.getDocumentPropertiesUI();
-+ }
-+ throw new IllegalArgumentException("Unsupported role");
-+ }
-+
-+ public String[] getUIClassNamesForRole(int role) {
-+
-+ if (role <= ServiceUIFactory.MAIN_UIROLE) {
-+ return null;
-+ }
-+ if (role == DocumentPropertiesUI.DOCUMENTPROPERTIES_ROLE) {
-+ String[] names = new String[0];
-+ names[0] = DocumentPropertiesUI.DOCPROPERTIESCLASSNAME;
-+ return names;
-+ }
-+ throw new IllegalArgumentException("Unsupported role");
-+ }
-+ }
-+
-+ private Win32ServiceUIFactory uiFactory = null;
-+
-+ public synchronized ServiceUIFactory getServiceUIFactory() {
-+ if (uiFactory == null) {
-+ uiFactory = new Win32ServiceUIFactory(this);
-+ }
-+ return uiFactory;
- }
-
- public String toString() {
-@@ -1614,6 +1722,7 @@
- class Win32MediaSize extends MediaSizeName {
- private static ArrayList winStringTable = new ArrayList();
- private static ArrayList winEnumTable = new ArrayList();
-+ private static MediaSize[] predefMedia;
-
- private int dmPaperID; // driver ID for this paper.
-
-@@ -1627,6 +1736,18 @@
- return (winStringTable.size()-1);
- }
-
-+ public static synchronized Win32MediaSize findMediaName(String name) {
-+ int nameIndex = winStringTable.indexOf(name);
-+ if (nameIndex != -1) {
-+ return (Win32MediaSize)winEnumTable.get(nameIndex);
-+ }
-+ return null;
-+ }
-+
-+ public static MediaSize[] getPredefMedia() {
-+ return predefMedia;
-+ }
-+
- public Win32MediaSize(String name, int dmPaper) {
- super(nextValue(name));
- dmPaperID = dmPaper;
-@@ -1638,18 +1759,17 @@
- }
-
- static {
-- /* initialize Win32PrintService.predefMedia */
-+ /* initialize predefMedia */
- {
- Win32MediaSize winMedia = new Win32MediaSize(-1);
-
- // cannot call getSuperEnumTable directly because of static context
- MediaSizeName[] enumMedia = winMedia.getSuperEnumTable();
- if (enumMedia != null) {
-- Win32PrintService.predefMedia = new MediaSize[enumMedia.length];
-+ predefMedia = new MediaSize[enumMedia.length];
-
- for (int i=0; i<enumMedia.length; i++) {
-- Win32PrintService.predefMedia[i] =
-- MediaSize.getMediaSizeForName(enumMedia[i]);
-+ predefMedia[i] = MediaSize.getMediaSizeForName(enumMedia[i]);
- }
- }
- }
---- ./jdk/src/windows/classes/sun/security/mscapi/RSACipher.java 2013-09-06 11:29:14.000000000 -0700
-+++ ./jdk/src/windows/classes/sun/security/mscapi/RSACipher.java 2014-10-28 20:19:51.000000000 -0700
-@@ -35,6 +35,8 @@
- import javax.crypto.spec.*;
-
- import sun.security.rsa.RSAKeyFactory;
-+import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
-+import sun.security.util.KeyUtil;
-
- /**
- * RSA cipher implementation using the Microsoft Crypto API.
-@@ -92,9 +94,16 @@
-
- // the public key, if we were initialized using a public key
- private sun.security.mscapi.Key publicKey;
-+
- // the private key, if we were initialized using a private key
- private sun.security.mscapi.Key privateKey;
-
-+ // cipher parameter for TLS RSA premaster secret
-+ private AlgorithmParameterSpec spec = null;
-+
-+ // the source of randomness
-+ private SecureRandom random;
-+
- public RSACipher() {
- paddingType = PAD_PKCS1;
- }
-@@ -155,8 +164,12 @@
- throws InvalidKeyException, InvalidAlgorithmParameterException {
-
- if (params != null) {
-- throw new InvalidAlgorithmParameterException
-- ("Parameters not supported");
-+ if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
-+ throw new InvalidAlgorithmParameterException(
-+ "Parameters not supported");
-+ }
-+ spec = params;
-+ this.random = random; // for TLS RSA premaster secret
- }
- init(opmode, key);
- }
-@@ -356,39 +369,47 @@
- }
-
- // see JCE spec
-- protected java.security.Key engineUnwrap(byte[] wrappedKey, String algorithm,
-+ protected java.security.Key engineUnwrap(byte[] wrappedKey,
-+ String algorithm,
- int type) throws InvalidKeyException, NoSuchAlgorithmException {
-
- if (wrappedKey.length > buffer.length) {
- throw new InvalidKeyException("Key is too long for unwrapping");
- }
-- update(wrappedKey, 0, wrappedKey.length);
-
-- try {
-- byte[] encoding = doFinal();
--
-- switch (type) {
-- case Cipher.PUBLIC_KEY:
-- return constructPublicKey(encoding, algorithm);
--
-- case Cipher.PRIVATE_KEY:
-- return constructPrivateKey(encoding, algorithm);
--
-- case Cipher.SECRET_KEY:
-- return constructSecretKey(encoding, algorithm);
--
-- default:
-- throw new InvalidKeyException("Unknown key type " + type);
-- }
-+ boolean isTlsRsaPremasterSecret =
-+ algorithm.equals("TlsRsaPremasterSecret");
-+ Exception failover = null;
-+ byte[] encoded = null;
-
-+ update(wrappedKey, 0, wrappedKey.length);
-+ try {
-+ encoded = doFinal();
- } catch (BadPaddingException e) {
-- // should not occur
-- throw new InvalidKeyException("Unwrapping failed", e);
--
-+ if (isTlsRsaPremasterSecret) {
-+ failover = e;
-+ } else {
-+ throw new InvalidKeyException("Unwrapping failed", e);
-+ }
- } catch (IllegalBlockSizeException e) {
- // should not occur, handled with length check above
- throw new InvalidKeyException("Unwrapping failed", e);
- }
-+
-+ if (isTlsRsaPremasterSecret) {
-+ if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) {
-+ throw new IllegalStateException(
-+ "No TlsRsaPremasterSecretParameterSpec specified");
-+ }
-+
-+ // polish the TLS premaster secret
-+ encoded = KeyUtil.checkTlsPreMasterSecretKey(
-+ ((TlsRsaPremasterSecretParameterSpec)spec).getClientVersion(),
-+ ((TlsRsaPremasterSecretParameterSpec)spec).getServerVersion(),
-+ random, encoded, (failover != null));
-+ }
-+
-+ return constructKey(encoded, algorithm, type);
- }
-
- // see JCE spec
-@@ -452,6 +473,22 @@
- return new SecretKeySpec(encodedKey, encodedKeyAlgorithm);
- }
-
-+ private static Key constructKey(byte[] encodedKey,
-+ String encodedKeyAlgorithm,
-+ int keyType) throws InvalidKeyException, NoSuchAlgorithmException {
-+
-+ switch (keyType) {
-+ case Cipher.PUBLIC_KEY:
-+ return constructPublicKey(encodedKey, encodedKeyAlgorithm);
-+ case Cipher.PRIVATE_KEY:
-+ return constructPrivateKey(encodedKey, encodedKeyAlgorithm);
-+ case Cipher.SECRET_KEY:
-+ return constructSecretKey(encodedKey, encodedKeyAlgorithm);
-+ default:
-+ throw new InvalidKeyException("Unknown key type " + keyType);
-+ }
-+ }
-+
- /*
- * Encrypt/decrypt a data buffer using Microsoft Crypto API with HCRYPTKEY.
- * It expects and returns ciphertext data in big-endian form.
---- ./jdk/src/windows/demo/jvmti/hprof/hprof_md.c 2013-09-06 11:29:14.000000000 -0700
-+++ ./jdk/src/windows/demo/jvmti/hprof/hprof_md.c 2014-07-15 21:49:30.000000000 -0700
-@@ -368,37 +368,32 @@
- }
-
- static void dll_build_name(char* buffer, size_t buflen,
-- const char* pname, const char* fname) {
-- // Loosley based on os_windows.cpp
-+ const char* paths, const char* fname) {
-+ char *path, *paths_copy, *next_token;
-
-- char *pathname = (char *)pname;
-- while (strlen(pathname) > 0) {
-- char *p = strchr(pathname, ';');
-- if (p == NULL) {
-- p = pathname + strlen(pathname);
-- }
-- /* check for NULL path */
-- if (p == pathname) {
-- continue;
-- }
-- if (*(p-1) == ':' || *(p-1) == '\\') {
-- (void)_snprintf(buffer, buflen, "%.*s%s.dll", (p - pathname),
-- pathname, fname);
-- } else {
-- (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (p - pathname),
-- pathname, fname);
-- }
-+ paths_copy = strdup(paths);
-+ if (paths_copy == NULL) {
-+ return;
-+ }
-+
-+ next_token = NULL;
-+ path = strtok_s(paths_copy, ";", &next_token);
-+
-+ while (path != NULL) {
-+ _snprintf(buffer, buflen, "%s\\%s.dll", path, fname);
- if (_access(buffer, 0) == 0) {
- break;
- }
-- pathname = p + 1;
- *buffer = '\0';
-+ path = strtok_s(NULL, ";", &next_token);
- }
-+
-+ free(paths_copy);
- }
-
- /* Build a machine dependent library name out of a path and file name. */
- void
--md_build_library_name(char *holder, int holderlen, char *pname, char *fname)
-+md_build_library_name(char *holder, int holderlen, const char *pname, const char *fname)
- {
- int pnamelen;
-
---- ./jdk/src/windows/native/java/lang/ProcessImpl_md.c 2013-09-06 11:29:15.000000000 -0700
-+++ ./jdk/src/windows/native/java/lang/ProcessImpl_md.c 2014-07-15 21:49:30.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
-@@ -63,46 +63,52 @@
- return source;
- }
-
-+static const char EXE_EXT[] = ".exe";
-+
- DWORD
- selectProcessFlag(JNIEnv *env, jstring cmd0)
- {
-- char buf[MAX_PATH];
- DWORD newFlag = 0;
-- char *exe, *p, *name;
-- unsigned char buffer[2];
-- long headerLoc = 0;
-- int fd = 0;
--
-- exe = (char *)JNU_GetStringPlatformChars(env, cmd0, 0);
-- exe = extractExecutablePath(env, exe);
--
-+ char *exe = (char *)JNU_GetStringPlatformChars(env, cmd0, 0);
- if (exe != NULL) {
-- if ((p = strchr(exe, '\\')) == NULL) {
-- SearchPath(NULL, exe, ".exe", MAX_PATH, buf, &name);
-- } else {
-- p = strrchr(exe, '\\');
-- *p = 0;
-- p++;
-- SearchPath(exe, p, ".exe", MAX_PATH, buf, &name);
-+ char buf[MAX_PATH];
-+ char *name;
-+ DWORD len;
-+ exe = extractExecutablePath(env, exe);
-+ if (exe != NULL) {
-+ /* We are here for Win9x/Me, so the [/] is not the path sep */
-+ char *p = strrchr(exe, '\\');
-+ if (p == NULL) {
-+ len = SearchPath(NULL, exe, EXE_EXT, MAX_PATH, buf, &name);
-+ } else {
-+ *p = 0;
-+ len = SearchPath(exe, p + 1, EXE_EXT, MAX_PATH, buf, &name);
-+ }
- }
-- }
-
-- fd = _open(buf, _O_RDONLY);
-- if (fd > 0) {
-- _read(fd, buffer, 2);
-- if (buffer[0] == 'M' && buffer[1] == 'Z') {
-- _lseek(fd, 60L, SEEK_SET);
-- _read(fd, buffer, 2);
-- headerLoc = (long)buffer[1] << 8 | (long)buffer[0];
-- _lseek(fd, headerLoc, SEEK_SET);
-- _read(fd, buffer, 2);
-- if (buffer[0] == 'P' && buffer[1] == 'E') {
-- newFlag = DETACHED_PROCESS;
-+ if (len > 0 && len < MAX_PATH) {
-+ /* Here the [buf] path is valid and null terminated */
-+ int fd = _open(buf, _O_RDONLY);
-+ if (fd != -1) {
-+ unsigned char buffer[2];
-+ if (_read(fd, buffer, 2) == 2
-+ && buffer[0] == 'M' && buffer[1] == 'Z'
-+ && _lseek(fd, 60L, SEEK_SET) == 60L
-+ && _read(fd, buffer, 2) == 2)
-+ {
-+ long headerLoc = (long)buffer[1] << 8 | (long)buffer[0];
-+ if (_lseek(fd, headerLoc, SEEK_SET) == headerLoc
-+ && _read(fd, buffer, 2) == 2
-+ && buffer[0] == 'P' && buffer[1] == 'E')
-+ {
-+ newFlag = DETACHED_PROCESS;
-+ }
-+ }
-+ _close(fd);
- }
- }
-- _close(fd);
-+ JNU_ReleaseStringPlatformChars(env, cmd0, exe);
- }
-- JNU_ReleaseStringPlatformChars(env, cmd0, exe);
- return newFlag;
- }
-
-@@ -129,6 +135,237 @@
- CloseHandle(handle);
- }
-
-+static BOOL hasInheritFlag(HANDLE handle)
-+{
-+ DWORD mask;
-+ if (GetHandleInformation(handle, &mask)) {
-+ return mask & HANDLE_FLAG_INHERIT;
-+ }
-+ return FALSE;
-+}
-+
-+#define HANDLE_STORAGE_SIZE 6
-+#define OFFSET_READ 0
-+#define OFFSET_WRITE 1
-+//long signed version of INVALID_HANDLE_VALUE
-+#define JAVA_INVALID_HANDLE_VALUE ((jlong) -1)
-+#define OPPOSITE_END(offset) (offset==OFFSET_READ ? OFFSET_WRITE : OFFSET_READ)
-+
-+/* Pipe holder structure */
-+typedef struct _STDHOLDER {
-+ HANDLE pipe[2];
-+ int offset;
-+} STDHOLDER;
-+
-+/* Responsible for correct initialization of the [pHolder] structure
-+ (that is used for handles recycling) if needs,
-+ and appropriate setup of IOE handle [phStd] for child process based
-+ on created pipe or Java handle. */
-+static BOOL initHolder(
-+ JNIEnv *env,
-+ jlong *pjhandles, /* IN OUT - the handle form Java,
-+ that can be a file, console or undefined */
-+ STDHOLDER *pHolder, /* OUT - initialized structure that holds pipe
-+ handles */
-+ HANDLE *phStd /* OUT - initialized handle for child process */
-+) {
-+ /* Here we test the value from Java against invalid
-+ handle value. We are not using INVALID_HANDLE_VALUE macro
-+ due to double signed/unsigned and 32/64bit ambiguity.
-+ Otherwise it will be easy to get the wrong
-+ value 0x00000000FFFFFFFF
-+ instead 0xFFFFFFFFFFFFFFFF. */
-+ if (*pjhandles != JAVA_INVALID_HANDLE_VALUE) {
-+ /* Java file or console redirection */
-+ *phStd = (HANDLE) *pjhandles;
-+ /* Here we set the related Java stream (Process.getXXXXStream())
-+ to [ProcessBuilder.NullXXXXStream.INSTANCE] value.
-+ The initial Java handle [*pjhandles] will be closed in
-+ ANY case. It is not a handle leak. */
-+ *pjhandles = JAVA_INVALID_HANDLE_VALUE;
-+ } else {
-+ /* Creation of parent-child pipe */
-+ if (!CreatePipe(
-+ &pHolder->pipe[OFFSET_READ],
-+ &pHolder->pipe[OFFSET_WRITE],
-+ NULL, /* we would like to inherit
-+ default process access,
-+ instead of 'Everybody' access */
-+ PIPE_SIZE))
-+ {
-+ win32Error(env, "CreatePipe");
-+ return FALSE;
-+ } else {
-+ /* [thisProcessEnd] has no the inherit flag because
-+ the [lpPipeAttributes] param of [CreatePipe]
-+ had the NULL value. */
-+ HANDLE thisProcessEnd = pHolder->pipe[OPPOSITE_END(pHolder->offset)];
-+ *phStd = pHolder->pipe[pHolder->offset];
-+ *pjhandles = (jlong) thisProcessEnd;
-+ }
-+ }
-+ /* Pipe handle will be closed in the [releaseHolder] call,
-+ file handle will be closed in Java.
-+ The long-live handle need to restore the inherit flag,
-+ we do it later in the [prepareIOEHandleState] call. */
-+ SetHandleInformation(
-+ *phStd,
-+ HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
-+ return TRUE;
-+}
-+
-+/* Smart recycling of pipe handles in [pHolder]. For the failed
-+ create process attempts, both ends of pipe need to be released.
-+ The [complete] has the [TRUE] value in the failed attempt. */
-+static void releaseHolder(BOOL complete, STDHOLDER *pHolder) {
-+ closeSafely(pHolder->pipe[pHolder->offset]);
-+ if (complete) {
-+ /* Error occur, close this process pipe end */
-+ closeSafely(pHolder->pipe[OPPOSITE_END(pHolder->offset)]);
-+ }
-+}
-+
-+/* Stores and drops the inherit flag of handles that should not
-+ be shared with the child process by default, but can hold the
-+ inherit flag due to MS process birth specific. */
-+static void prepareIOEHandleState(
-+ HANDLE *stdIOE,
-+ BOOL *inherit)
-+{
-+ int i;
-+ for (i = 0; i < HANDLE_STORAGE_SIZE; ++i) {
-+ HANDLE hstd = stdIOE[i];
-+ if (INVALID_HANDLE_VALUE != hstd && hasInheritFlag(hstd)) {
-+ /* FALSE by default */
-+ inherit[i] = TRUE;
-+ /* Java does not need implicit inheritance for IOE handles,
-+ so we drop inherit flag that probably was installed by
-+ previous CreateProcess call that launched current process.
-+ We will return the handle state back after CreateProcess call.
-+ By clearing inherit flag we prevent "greedy grandchild" birth.
-+ The explicit inheritance for child process IOE handles is
-+ implemented in the [initHolder] call. */
-+ SetHandleInformation(hstd, HANDLE_FLAG_INHERIT, 0);
-+ }
-+ }
-+}
-+
-+/* Restores the inheritance flag of handles from stored values. */
-+static void restoreIOEHandleState(
-+ const HANDLE *stdIOE,
-+ const BOOL *inherit)
-+{
-+ /* The set of current process standard IOE handles and
-+ the set of child process IOE handles can intersect.
-+ To restore the inherit flag right, we use backward
-+ array iteration. */
-+ int i;
-+ for (i = HANDLE_STORAGE_SIZE - 1; i >= 0; --i)
-+ if (INVALID_HANDLE_VALUE != stdIOE[i]) {
-+ /* Restore inherit flag for any case.
-+ The handle can be changed by explicit inheritance.*/
-+ SetHandleInformation(stdIOE[i],
-+ HANDLE_FLAG_INHERIT,
-+ inherit[i] ? HANDLE_FLAG_INHERIT : 0);
-+ }
-+}
-+
-+/* Please, read about the MS inheritance problem
-+ http://support.microsoft.com/kb/315939
-+ and critical section/synchronized block solution. */
-+static jlong processCreate(
-+ JNIEnv *env,
-+ const jchar *pcmd,
-+ const jchar *penvBlock,
-+ const jchar *pdir,
-+ jlong *handles,
-+ jboolean redirectErrorStream)
-+{
-+ jlong ret = 0L;
-+ STARTUPINFOW si = {sizeof(si)};
-+
-+ /* Handles for which the inheritance flag must be restored. */
-+ HANDLE stdIOE[HANDLE_STORAGE_SIZE] = {
-+ /* Current process standard IOE handles: JDK-7147084 */
-+ INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE,
-+ /* Child process IOE handles: JDK-6921885 */
-+ (HANDLE)handles[0], (HANDLE)handles[1], (HANDLE)handles[2]};
-+ BOOL inherit[HANDLE_STORAGE_SIZE] = {
-+ FALSE, FALSE, FALSE,
-+ FALSE, FALSE, FALSE};
-+
-+ {
-+ /* Extraction of current process standard IOE handles */
-+ DWORD idsIOE[3] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE};
-+ int i;
-+ for (i = 0; i < 3; ++i)
-+ /* Should not be closed by CloseHandle! */
-+ stdIOE[i] = GetStdHandle(idsIOE[i]);
-+ }
-+
-+ prepareIOEHandleState(stdIOE, inherit);
-+ {
-+ /* Input */
-+ STDHOLDER holderIn = {{INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE}, OFFSET_READ};
-+ if (initHolder(env, &handles[0], &holderIn, &si.hStdInput)) {
-+
-+ /* Output */
-+ STDHOLDER holderOut = {{INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE}, OFFSET_WRITE};
-+ if (initHolder(env, &handles[1], &holderOut, &si.hStdOutput)) {
-+
-+ /* Error */
-+ STDHOLDER holderErr = {{INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE}, OFFSET_WRITE};
-+ BOOL success;
-+ if (redirectErrorStream) {
-+ si.hStdError = si.hStdOutput;
-+ /* Here we set the error stream to [ProcessBuilder.NullInputStream.INSTANCE]
-+ value. That is in accordance with Java Doc for the redirection case.
-+ The Java file for the [ handles[2] ] will be closed in ANY case. It is not
-+ a handle leak. */
-+ handles[2] = JAVA_INVALID_HANDLE_VALUE;
-+ success = TRUE;
-+ } else {
-+ success = initHolder(env, &handles[2], &holderErr, &si.hStdError);
-+ }
-+
-+ if (success) {
-+ PROCESS_INFORMATION pi;
-+ DWORD processFlag = CREATE_UNICODE_ENVIRONMENT;
-+
-+ /* Suppress popping-up of a console window for non-console applications */
-+ if (GetConsoleWindow() == NULL)
-+ processFlag |= CREATE_NO_WINDOW;
-+
-+ si.dwFlags = STARTF_USESTDHANDLES;
-+ if (!CreateProcessW(
-+ NULL, /* executable name */
-+ (LPWSTR)pcmd, /* command line */
-+ NULL, /* process security attribute */
-+ NULL, /* thread security attribute */
-+ TRUE, /* inherits system handles */
-+ processFlag, /* selected based on exe type */
-+ (LPVOID)penvBlock,/* environment block */
-+ (LPCWSTR)pdir, /* change to the new current directory */
-+ &si, /* (in) startup information */
-+ &pi)) /* (out) process information */
-+ {
-+ win32Error(env, "CreateProcess");
-+ } else {
-+ closeSafely(pi.hThread);
-+ ret = (jlong)pi.hProcess;
-+ }
-+ }
-+ releaseHolder(ret == 0, &holderErr);
-+ releaseHolder(ret == 0, &holderOut);
-+ }
-+ releaseHolder(ret == 0, &holderIn);
-+ }
-+ }
-+ restoreIOEHandleState(stdIOE, inherit);
-+
-+ return ret;
-+}
-+
- JNIEXPORT jlong JNICALL
- Java_java_lang_ProcessImpl_create(JNIEnv *env, jclass ignored,
- jstring cmd,
-@@ -137,142 +374,35 @@
- jlongArray stdHandles,
- jboolean redirectErrorStream)
- {
-- HANDLE inRead = INVALID_HANDLE_VALUE;
-- HANDLE inWrite = INVALID_HANDLE_VALUE;
-- HANDLE outRead = INVALID_HANDLE_VALUE;
-- HANDLE outWrite = INVALID_HANDLE_VALUE;
-- HANDLE errRead = INVALID_HANDLE_VALUE;
-- HANDLE errWrite = INVALID_HANDLE_VALUE;
-- SECURITY_ATTRIBUTES sa;
-- PROCESS_INFORMATION pi;
-- STARTUPINFOW si;
-- const jchar* pcmd = NULL;
-- const jchar* pdir = NULL;
-- const jchar* penvBlock = NULL;
-- jlong *handles = NULL;
- jlong ret = 0;
-- OSVERSIONINFO ver;
-- jboolean onNT = JNI_FALSE;
-- DWORD processFlag;
--
-- ver.dwOSVersionInfoSize = sizeof(ver);
-- GetVersionEx(&ver);
-- if (ver.dwPlatformId == VER_PLATFORM_WIN32_NT)
-- onNT = JNI_TRUE;
--
-- assert(cmd != NULL);
-- pcmd = (*env)->GetStringChars(env, cmd, NULL);
-- if (pcmd == NULL) goto Catch;
--
-- if (dir != 0) {
-- pdir = (*env)->GetStringChars(env, dir, NULL);
-- if (pdir == NULL) goto Catch;
-- }
-- if (envBlock != NULL) {
-- penvBlock = ((*env)->GetStringChars(env, envBlock, NULL));
-- if (penvBlock == NULL) goto Catch;
-- }
-- assert(stdHandles != NULL);
-- handles = (*env)->GetLongArrayElements(env, stdHandles, NULL);
-- if (handles == NULL) goto Catch;
--
-- memset(&si, 0, sizeof(si));
-- si.cb = sizeof(si);
-- si.dwFlags = STARTF_USESTDHANDLES;
--
-- sa.nLength = sizeof(sa);
-- sa.lpSecurityDescriptor = 0;
-- sa.bInheritHandle = TRUE;
--
-- if (handles[0] != (jlong) -1) {
-- si.hStdInput = (HANDLE) handles[0];
-- handles[0] = (jlong) -1;
-- } else {
-- if (! CreatePipe(&inRead, &inWrite, &sa, PIPE_SIZE)) {
-- win32Error(env, "CreatePipe");
-- goto Catch;
-- }
-- si.hStdInput = inRead;
-- SetHandleInformation(inWrite, HANDLE_FLAG_INHERIT, FALSE);
-- handles[0] = (jlong) inWrite;
-- }
-- SetHandleInformation(si.hStdInput, HANDLE_FLAG_INHERIT, TRUE);
--
-- if (handles[1] != (jlong) -1) {
-- si.hStdOutput = (HANDLE) handles[1];
-- handles[1] = (jlong) -1;
-- } else {
-- if (! CreatePipe(&outRead, &outWrite, &sa, PIPE_SIZE)) {
-- win32Error(env, "CreatePipe");
-- goto Catch;
-- }
-- si.hStdOutput = outWrite;
-- SetHandleInformation(outRead, HANDLE_FLAG_INHERIT, FALSE);
-- handles[1] = (jlong) outRead;
-- }
-- SetHandleInformation(si.hStdOutput, HANDLE_FLAG_INHERIT, TRUE);
--
-- if (redirectErrorStream) {
-- si.hStdError = si.hStdOutput;
-- handles[2] = (jlong) -1;
-- } else if (handles[2] != (jlong) -1) {
-- si.hStdError = (HANDLE) handles[2];
-- handles[2] = (jlong) -1;
-- } else {
-- if (! CreatePipe(&errRead, &errWrite, &sa, PIPE_SIZE)) {
-- win32Error(env, "CreatePipe");
-- goto Catch;
-+ if (cmd != NULL && stdHandles != NULL) {
-+ const jchar *pcmd = (*env)->GetStringChars(env, cmd, NULL);
-+ if (pcmd != NULL) {
-+ const jchar *penvBlock = (envBlock != NULL)
-+ ? (*env)->GetStringChars(env, envBlock, NULL)
-+ : NULL;
-+ const jchar *pdir = (dir != NULL)
-+ ? (*env)->GetStringChars(env, dir, NULL)
-+ : NULL;
-+ jlong *handles = (*env)->GetLongArrayElements(env, stdHandles, NULL);
-+ if (handles != NULL) {
-+ ret = processCreate(
-+ env,
-+ pcmd,
-+ penvBlock,
-+ pdir,
-+ handles,
-+ redirectErrorStream);
-+ (*env)->ReleaseLongArrayElements(env, stdHandles, handles, 0);
-+ }
-+ if (pdir != NULL)
-+ (*env)->ReleaseStringChars(env, dir, pdir);
-+ if (penvBlock != NULL)
-+ (*env)->ReleaseStringChars(env, envBlock, penvBlock);
-+ (*env)->ReleaseStringChars(env, cmd, pcmd);
- }
-- si.hStdError = errWrite;
-- SetHandleInformation(errRead, HANDLE_FLAG_INHERIT, FALSE);
-- handles[2] = (jlong) errRead;
- }
-- SetHandleInformation(si.hStdError, HANDLE_FLAG_INHERIT, TRUE);
--
-- if (onNT)
-- processFlag = CREATE_NO_WINDOW | CREATE_UNICODE_ENVIRONMENT;
-- else
-- processFlag = selectProcessFlag(env, cmd) | CREATE_UNICODE_ENVIRONMENT;
-- ret = CreateProcessW(0, /* executable name */
-- (LPWSTR)pcmd, /* command line */
-- 0, /* process security attribute */
-- 0, /* thread security attribute */
-- TRUE, /* inherits system handles */
-- processFlag, /* selected based on exe type */
-- (LPVOID)penvBlock,/* environment block */
-- (LPCWSTR)pdir, /* change to the new current directory */
-- &si, /* (in) startup information */
-- &pi); /* (out) process information */
-- if (!ret) {
-- win32Error(env, "CreateProcess");
-- goto Catch;
-- }
--
-- CloseHandle(pi.hThread);
-- ret = (jlong)pi.hProcess;
--
-- Finally:
-- /* Always clean up the child's side of the pipes */
-- closeSafely(inRead);
-- closeSafely(outWrite);
-- closeSafely(errWrite);
--
-- if (pcmd != NULL)
-- (*env)->ReleaseStringChars(env, cmd, pcmd);
-- if (pdir != NULL)
-- (*env)->ReleaseStringChars(env, dir, pdir);
-- if (penvBlock != NULL)
-- (*env)->ReleaseStringChars(env, envBlock, penvBlock);
-- if (handles != NULL)
-- (*env)->ReleaseLongArrayElements(env, stdHandles, handles, 0);
- return ret;
--
-- Catch:
-- /* Clean up the parent's side of the pipes in case of failure only */
-- closeSafely(inWrite);
-- closeSafely(outRead);
-- closeSafely(errRead);
-- goto Finally;
- }
-
- JNIEXPORT jint JNICALL
---- ./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-07-15 21:49:30.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/AbstractPlainDatagramSocketImpl.c 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/windows/native/java/net/AbstractPlainDatagramSocketImpl.c 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,111 @@
-+/*
-+ * 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.
-+ */
-+
-+#include <windows.h>
-+#include <winsock2.h>
-+
-+#include "jvm.h"
-+#include "jni_util.h"
-+#include "net_util.h"
-+
-+#include "java_net_AbstractPlainDatagramSocketImpl.h"
-+
-+static jfieldID IO_fd_fdID = NULL;
-+static jfieldID apdsi_fdID = NULL;
-+
-+static jfieldID apdsi_fd1ID = NULL;
-+static jclass two_stacks_clazz = NULL;
-+
-+
-+/*
-+ * Class: java_net_AbstractPlainDatagramSocketImpl
-+ * Method: init
-+ * Signature: ()V
-+ */
-+JNIEXPORT void JNICALL
-+Java_java_net_AbstractPlainDatagramSocketImpl_init(JNIEnv *env, jclass cls) {
-+
-+ apdsi_fdID = (*env)->GetFieldID(env, cls, "fd",
-+ "Ljava/io/FileDescriptor;");
-+ CHECK_NULL(apdsi_fdID);
-+ IO_fd_fdID = NET_GetFileDescriptorID(env);
-+ CHECK_NULL(IO_fd_fdID);
-+
-+ two_stacks_clazz = (*env)->FindClass(env, "java/net/TwoStacksPlainDatagramSocketImpl");
-+ CHECK_NULL(two_stacks_clazz);
-+
-+ /* Handle both TwoStacks and DualStack here */
-+
-+ if (JNU_Equals(env, cls, two_stacks_clazz)) {
-+ /* fd1 present only in TwoStack.. */
-+ apdsi_fd1ID = (*env)->GetFieldID(env, cls, "fd1",
-+ "Ljava/io/FileDescriptor;");
-+ CHECK_NULL(apdsi_fd1ID);
-+ }
-+}
-+
-+/*
-+ * Class: java_net_AbstractPlainDatagramSocketImpl
-+ * Method: dataAvailable
-+ * Signature: ()I
-+ */
-+JNIEXPORT jint JNICALL Java_java_net_AbstractPlainDatagramSocketImpl_dataAvailable
-+(JNIEnv *env, jobject this) {
-+ SOCKET fd;
-+ SOCKET fd1;
-+ int rv = -1, rv1 = -1;
-+ jobject fdObj = (*env)->GetObjectField(env, this, apdsi_fdID);
-+
-+ if (!IS_NULL(fdObj)) {
-+ int retval = 0;
-+ fd = (SOCKET)(*env)->GetIntField(env, fdObj, IO_fd_fdID);
-+ rv = ioctlsocket(fd, FIONREAD, &retval);
-+ if (retval > 0) {
-+ return retval;
-+ }
-+ }
-+
-+ if (!IS_NULL(apdsi_fd1ID)) {
-+ /* TwoStacks */
-+ jobject fd1Obj = (*env)->GetObjectField(env, this, apdsi_fd1ID);
-+ if (!IS_NULL(fd1Obj)) {
-+ int retval = 0;
-+ fd1 = (SOCKET)(*env)->GetIntField(env, fd1Obj, IO_fd_fdID);
-+ rv1 = ioctlsocket(fd1, FIONREAD, &retval);
-+ if (retval > 0) {
-+ return retval;
-+ }
-+ }
-+ }
-+
-+ if (rv < 0 && rv1 < 0) {
-+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-+ "Socket closed");
-+ return -1;
-+ }
-+
-+ return 0;
-+}
-+
---- ./jdk/src/windows/native/java/net/Inet6AddressImpl.c 2013-09-06 11:29:15.000000000 -0700
-+++ ./jdk/src/windows/native/java/net/Inet6AddressImpl.c 2014-07-15 21:49:30.000000000 -0700
-@@ -77,7 +77,6 @@
- static jclass ni_ia6cls;
- static jmethodID ni_ia4ctrID;
- static jmethodID ni_ia6ctrID;
--static jfieldID ni_ia6ipaddressID;
- static int initialized = 0;
-
- JNIEXPORT jobjectArray JNICALL
-@@ -101,7 +100,6 @@
- ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
- ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
-- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
- initialized = 1;
- }
- if (IS_NULL(host)) {
-@@ -242,26 +240,22 @@
- (*env)->SetObjectArrayElement(env, ret, inetIndex, iaObj);
- inetIndex ++;
- } else if (iterator->ai_family == AF_INET6) {
-- jint scope = 0;
-- jbyteArray ipaddress;
-+ jint scope = 0, ret1;
- jobject iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
- if (IS_NULL(iaObj)) {
- ret = NULL;
- goto cleanupAndReturn;
- }
-- ipaddress = (*env)->NewByteArray(env, 16);
-- if (IS_NULL(ipaddress)) {
-+ ret1 = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
-+
-+ if (ret1 == JNI_FALSE) {
- ret = NULL;
- goto cleanupAndReturn;
- }
-- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
-- (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
- scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
- if (scope != 0) { /* zero is default value, no need to set */
-- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
-- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
-+ setInet6Address_scopeid(env, iaObj, scope);
- }
-- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
- setInetAddress_hostName(env, iaObj, host);
- (*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 2014-07-15 21:49:30.000000000 -0700
-@@ -72,8 +72,6 @@
-
- jclass ni_ia6cls; /* Inet6Address */
- jmethodID ni_ia6ctrID; /* Inet6Address() */
--jfieldID ni_ia6ipaddressID;
--jfieldID ni_ia6ipaddressID;
-
- jclass ni_ibcls; /* InterfaceAddress */
- jmethodID ni_ibctrID; /* InterfaceAddress() */
-@@ -482,7 +480,6 @@
- ni_ia6cls = (*env)->FindClass(env, "java/net/Inet6Address");
- ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
- ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
-- ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
-
- ni_ibcls = (*env)->FindClass(env, "java/net/InterfaceAddress");
- ni_ibcls = (*env)->NewGlobalRef(env, ni_ibcls);
-@@ -583,19 +580,16 @@
- int scope;
- iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
- if (iaObj) {
-- jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
-- if (ipaddress == NULL) {
-+ int ret = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
-+ if (ret == JNI_FALSE) {
- return NULL;
- }
-- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
-- (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
-+
- scope = addrs->addr.him6.sin6_scope_id;
- if (scope != 0) { /* zero is default value, no need to set */
-- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
-- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
-- (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
-+ setInet6Address_scopeid(env, iaObj, scope);
-+ setInet6Address_scopeifname(env, iaObj, netifObj);
- }
-- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
- ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
- 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 2014-10-28 20:19:45.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
-@@ -145,8 +145,12 @@
- ptr = adapterInfo;
- ret = NULL;
- while (ptr != NULL) {
-- // IPv4 interface
-- if (ptr->Ipv6IfIndex == index) {
-+ // in theory the IPv4 index and the IPv6 index can be the same
-+ // where an interface is enabled for v4 and v6
-+ // IfIndex == 0 IPv4 not available on this interface
-+ // Ipv6IfIndex == 0 IPv6 not available on this interface
-+ if (((ptr->IfIndex != 0)&&(ptr->IfIndex == index)) ||
-+ ((ptr->Ipv6IfIndex !=0) && (ptr->Ipv6IfIndex == index))) {
- ret = (IP_ADAPTER_ADDRESSES *) malloc(sizeof(IP_ADAPTER_ADDRESSES));
- memcpy(ret, ptr, sizeof(IP_ADAPTER_ADDRESSES));
- }
-@@ -241,7 +245,7 @@
- * set the index to the IPv6 index and add the
- * IPv6 addresses
- */
-- nif->index = ptr->Ipv6IfIndex;
-+ nif->ipv6Index = ptr->Ipv6IfIndex;
- c = getAddrsFromAdapter(ptr, &nif->addrs);
- nif->naddrs += c;
- break;
-@@ -286,6 +290,9 @@
- strcpy (nif->name, newname);
- wcscpy ((PWCHAR)nif->displayName, ptr->FriendlyName);
- nif->dNameIsUnicode = TRUE;
-+
-+ // the java.net.NetworkInterface abstraction only has index
-+ // so the Ipv6IfIndex needs to map onto index
- nif->index = ptr->Ipv6IfIndex;
- nif->ipv6Index = ptr->Ipv6IfIndex;
- nif->hasIpv6Address = TRUE;
-@@ -442,7 +449,6 @@
- (*env)->SetObjectField(env, netifObj, ni_nameID, name);
- (*env)->SetObjectField(env, netifObj, ni_displayNameID, displayName);
- (*env)->SetIntField(env, netifObj, ni_indexID, ifs->index);
--
- /*
- * Get the IP addresses for this interface if necessary
- * Note that 0 is a valid number of addresses.
-@@ -499,19 +505,15 @@
- int scope;
- iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
- if (iaObj) {
-- jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
-- if (ipaddress == NULL) {
-+ int ret = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
-+ if (ret == JNI_FALSE) {
- return NULL;
- }
-- (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
-- (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
- scope = addrs->addr.him6.sin6_scope_id;
- if (scope != 0) { /* zero is default value, no need to set */
-- (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
-- (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
-- (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
-+ setInet6Address_scopeid(env, iaObj, scope);
-+ setInet6Address_scopeifname(env, iaObj, netifObj);
- }
-- (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
- ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
- if (ibObj == NULL) {
- free_netaddr(netaddrP);
---- ./jdk/src/windows/native/java/net/SocketInputStream.c 2013-09-06 11:29:15.000000000 -0700
-+++ ./jdk/src/windows/native/java/net/SocketInputStream.c 2014-07-15 21:49:30.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2003, 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
-@@ -134,32 +134,34 @@
- (*env)->SetByteArrayRegion(env, data, off, nread, (jbyte *)bufP);
- } else {
- if (nread < 0) {
-- /*
-- * Recv failed.
-- */
-- switch (WSAGetLastError()) {
-- case WSAEINTR:
-- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-- "socket closed");
-- break;
--
-- case WSAECONNRESET:
-- case WSAESHUTDOWN:
-- /*
-- * Connection has been reset - Windows sometimes reports
-- * the reset as a shutdown error.
-- */
-- JNU_ThrowByName(env, "sun/net/ConnectionResetException",
-- "");
-- break;
-+ // Check if the socket has been closed since we last checked.
-+ // This could be a reason for recv failing.
-+ if ((*env)->GetIntField(env, fdObj, IO_fd_fdID) == -1) {
-+ NET_ThrowSocketException(env, "Socket closed");
-+ } else {
-+ switch (WSAGetLastError()) {
-+ case WSAEINTR:
-+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-+ "socket closed");
-+ break;
-+ case WSAECONNRESET:
-+ case WSAESHUTDOWN:
-+ /*
-+ * Connection has been reset - Windows sometimes reports
-+ * the reset as a shutdown error.
-+ */
-+ JNU_ThrowByName(env, "sun/net/ConnectionResetException",
-+ "");
-+ break;
-+
-+ case WSAETIMEDOUT :
-+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
-+ "Read timed out");
-+ break;
-
-- case WSAETIMEDOUT :
-- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
-- "Read timed out");
-- break;
--
-- default:
-- NET_ThrowCurrent(env, "recv failed");
-+ default:
-+ NET_ThrowCurrent(env, "recv failed");
-+ }
- }
- }
- }
---- ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c 2013-09-06 11:29:15.000000000 -0700
-+++ ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c 2014-07-15 21:49:30.000000000 -0700
-@@ -728,7 +728,6 @@
- setInetAddress_family(env, socketAddressObj, IPv4);
- (*env)->SetObjectField(env, socket, psi_addressID, socketAddressObj);
- } else {
-- jbyteArray addr;
- /* AF_INET6 -> Inet6Address */
- if (inet6Cls == 0) {
- jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
-@@ -751,10 +750,10 @@
- NET_SocketClose(fd);
- return;
- }
-- addr = (*env)->GetObjectField (env, socketAddressObj, ia6_ipaddressID);
-- (*env)->SetByteArrayRegion (env, addr, 0, 16, (const char *)&him.him6.sin6_addr);
-+ setInet6Address_ipaddress(env, socketAddressObj, (const char *)&him.him6.sin6_addr);
-+
- setInetAddress_family(env, socketAddressObj, IPv6);
-- (*env)->SetIntField(env, socketAddressObj, ia6_scopeidID, him.him6.sin6_scope_id);
-+ setInet6Address_scopeid(env, socketAddressObj, him.him6.sin6_scope_id);
- }
- /* 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 2014-07-15 21:49:30.000000000 -0700
-@@ -851,7 +851,6 @@
- family = (iafam == IPv4)? AF_INET : AF_INET6;
- if (ipv6_available() && !(family == AF_INET && v4MappedAddress == JNI_FALSE)) {
- struct SOCKADDR_IN6 *him6 = (struct SOCKADDR_IN6 *)him;
-- jbyteArray ipaddress;
- jbyte caddr[16];
- jint address, scopeid = 0;
- jint cached_scope_id = 0;
-@@ -872,10 +871,9 @@
- caddr[15] = (address & 0xff);
- }
- } else {
-- ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
-- scopeid = (jint)(*env)->GetIntField(env, iaObj, ia6_scopeidID);
-+ getInet6Address_ipaddress(env, iaObj, (char *)caddr);
-+ scopeid = getInet6Address_scopeid(env, iaObj);
- cached_scope_id = (jint)(*env)->GetIntField(env, iaObj, ia6_cachedscopeidID);
-- (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
- }
-
- memset((char *)him6, 0, sizeof(struct SOCKADDR_IN6));
---- ./jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c 2013-09-06 11:29:15.000000000 -0700
-+++ ./jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c 2014-10-28 20:19:45.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2008, 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
-@@ -213,6 +213,14 @@
- void
- SplashRedrawWindow(Splash * splash)
- {
-+ if (!SplashIsStillLooping(splash)) {
-+ KillTimer(splash->hWnd, 0);
-+ }
-+
-+ if (splash->currentFrame < 0) {
-+ return;
-+ }
-+
- SplashUpdateScreenData(splash);
- if (splash->isLayered) {
- BLENDFUNCTION bf;
-@@ -303,9 +311,6 @@
- time = 0;
- SetTimer(splash->hWnd, 0, time, NULL);
- }
-- else {
-- KillTimer(splash->hWnd, 0);
-- }
- }
-
- void SplashReconfigureNow(Splash * splash) {
---- ./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-07-15 21:49:30.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-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,106 @@
-+/*
-+ * 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 <windows.h>
-+#include "jni.h"
-+#include "net_util.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct portrange {
-+ int lower;
-+ int higher;
-+};
-+
-+static int getPortRange(struct portrange *range)
-+{
-+ OSVERSIONINFO ver;
-+ ver.dwOSVersionInfoSize = sizeof(ver);
-+ GetVersionEx(&ver);
-+
-+ /* Check for major version 5 or less = Windows XP/2003 or older */
-+ if (ver.dwMajorVersion <= 5) {
-+ LONG ret;
-+ HKEY hKey;
-+ range->lower = 1024;
-+ range->higher = 4999;
-+
-+ /* check registry to see if upper limit was raised */
-+ ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-+ "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters",
-+ 0, KEY_READ, (PHKEY)&hKey
-+ );
-+ if (ret == ERROR_SUCCESS) {
-+ DWORD maxuserport;
-+ ULONG ulType;
-+ DWORD dwLen = sizeof(maxuserport);
-+ ret = RegQueryValueEx(hKey, "MaxUserPort", NULL, &ulType,
-+ (LPBYTE)&maxuserport, &dwLen);
-+ RegCloseKey(hKey);
-+ if (ret == ERROR_SUCCESS) {
-+ range->higher = maxuserport;
-+ }
-+ }
-+ } else {
-+ /* There doesn't seem to be an API to access this. "MaxUserPort"
-+ * is affected, but is not sufficient to determine.
-+ * so we just use the defaults, which are less likely to change
-+ */
-+ range->lower = 49152;
-+ range->higher = 65535;
-+ }
-+ return 0;
-+}
-+
-+/*
-+ * Class: sun_net_PortConfig
-+ * Method: getLower0
-+ * Signature: ()I
-+ */
-+JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getLower0
-+ (JNIEnv *env, jclass clazz)
-+{
-+ struct portrange range;
-+ getPortRange(&range);
-+ return range.lower;
-+}
-+
-+/*
-+ * Class: sun_net_PortConfig
-+ * Method: getUpper0
-+ * Signature: ()I
-+ */
-+JNIEXPORT jint JNICALL Java_sun_net_PortConfig_getUpper0
-+ (JNIEnv *env, jclass clazz)
-+{
-+ struct portrange range;
-+ getPortRange(&range);
-+ return range.higher;
-+}
-+#ifdef __cplusplus
-+}
-+#endif
---- ./jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c 2013-09-06 11:29:15.000000000 -0700
-+++ ./jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c 2014-07-15 21:49:30.000000000 -0700
-@@ -192,45 +192,66 @@
- jobject fdo, jlong address, jint len)
- {
- /* set up */
-- int i = 0;
-+ int next_index, next_offset, ret=0;
- DWORD written = 0;
- jint fd = fdval(env, fdo);
- struct iovec *iovp = (struct iovec *)address;
- WSABUF *bufs = malloc(len * sizeof(WSABUF));
-- jint rem = MAX_BUFFER_SIZE;
-+ jlong count = 0;
-
- if (bufs == 0) {
- JNU_ThrowOutOfMemoryError(env, 0);
- return IOS_THROWN;
- }
-
-- /* copy iovec into WSABUF */
-- for(i=0; i<len; i++) {
-- jint iov_len = iovp[i].iov_len;
-- if (iov_len > rem)
-- iov_len = rem;
-- bufs[i].buf = (char *)iovp[i].iov_base;
-- bufs[i].len = (u_long)iov_len;
-- rem -= iov_len;
-- if (rem == 0) {
-- len = i+1;
-+ // next buffer and offset to consume
-+ next_index = 0;
-+ next_offset = 0;
-+
-+ while (next_index < len) {
-+ DWORD buf_count = 0;
-+
-+ /* Prepare the WSABUF array to a maximum total size of MAX_BUFFER_SIZE */
-+ jint rem = MAX_BUFFER_SIZE;
-+ while (next_index < len && rem > 0) {
-+ jint iov_len = iovp[next_index].iov_len - next_offset;
-+ char* ptr = (char *)iovp[next_index].iov_base;
-+ ptr += next_offset;
-+ if (iov_len > rem) {
-+ iov_len = rem;
-+ next_offset += rem;
-+ } else {
-+ next_index ++;
-+ next_offset = 0;
-+ }
-+
-+ bufs[buf_count].buf = ptr;
-+ bufs[buf_count].len = (u_long)iov_len;
-+ buf_count++;
-+
-+ rem -= iov_len;
-+ }
-+
-+ /* write the buffers */
-+ ret = WSASend((SOCKET)fd, /* Socket */
-+ bufs, /* pointers to the buffers */
-+ buf_count, /* number of buffers to process */
-+ &written, /* receives number of bytes written */
-+ 0, /* no flags */
-+ 0, /* no overlapped sockets */
-+ 0); /* no completion routine */
-+
-+ if (ret == SOCKET_ERROR) {
- break;
- }
-- }
-
-- /* read into the buffers */
-- i = WSASend((SOCKET)fd, /* Socket */
-- bufs, /* pointers to the buffers */
-- (DWORD)len, /* number of buffers to process */
-- &written, /* receives number of bytes written */
-- 0, /* no flags */
-- 0, /* no overlapped sockets */
-- 0); /* no completion routine */
-+ count += written;
-+ }
-
- /* clean up */
- free(bufs);
-
-- if (i != 0) {
-+ if (ret == SOCKET_ERROR && count == 0) {
- int theErr = (jint)WSAGetLastError();
- if (theErr == WSAEWOULDBLOCK) {
- return IOS_UNAVAILABLE;
-@@ -239,7 +260,7 @@
- return IOS_THROWN;
- }
-
-- return convertLongReturnVal(env, (jlong)written, JNI_FALSE);
-+ return convertLongReturnVal(env, count, JNI_FALSE);
- }
-
- JNIEXPORT void JNICALL
---- ./jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c 2013-09-06 11:29:15.000000000 -0700
-+++ ./jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c 2014-07-15 21:49:31.000000000 -0700
-@@ -162,7 +162,7 @@
- }
- completionStatus_error = (*env)->GetFieldID(env, clazz, "error", "I");
- completionStatus_bytesTransferred = (*env)->GetFieldID(env, clazz, "bytesTransferred", "I");
-- completionStatus_completionKey = (*env)->GetFieldID(env, clazz, "completionKey", "I");
-+ completionStatus_completionKey = (*env)->GetFieldID(env, clazz, "completionKey", "J");
-
- clazz = (*env)->FindClass(env, "sun/nio/fs/WindowsNativeDispatcher$BackupResult");
- if (clazz == NULL) {
-@@ -1169,12 +1169,11 @@
-
- JNIEXPORT jlong JNICALL
- Java_sun_nio_fs_WindowsNativeDispatcher_CreateIoCompletionPort(JNIEnv* env, jclass this,
-- jlong fileHandle, jlong existingPort, jint completionKey)
-+ jlong fileHandle, jlong existingPort, jlong completionKey)
- {
-- ULONG_PTR ck = completionKey;
- HANDLE port = CreateIoCompletionPort((HANDLE)jlong_to_ptr(fileHandle),
- (HANDLE)jlong_to_ptr(existingPort),
-- ck,
-+ (ULONG_PTR)completionKey,
- 0);
- if (port == NULL) {
- throwWindowsException(env, GetLastError());
-@@ -1203,21 +1202,20 @@
- (*env)->SetIntField(env, obj, completionStatus_error, ioResult);
- (*env)->SetIntField(env, obj, completionStatus_bytesTransferred,
- (jint)bytesTransferred);
-- (*env)->SetIntField(env, obj, completionStatus_completionKey,
-- (jint)completionKey);
--
-+ (*env)->SetLongField(env, obj, completionStatus_completionKey,
-+ (jlong)completionKey);
- }
- }
-
- JNIEXPORT void JNICALL
- Java_sun_nio_fs_WindowsNativeDispatcher_PostQueuedCompletionStatus(JNIEnv* env, jclass this,
-- jlong completionPort, jint completionKey)
-+ jlong completionPort, jlong completionKey)
- {
- BOOL res;
-
- res = PostQueuedCompletionStatus((HANDLE)jlong_to_ptr(completionPort),
- (DWORD)0, /* dwNumberOfBytesTransferred */
-- (DWORD)completionKey,
-+ (ULONG_PTR)completionKey,
- NULL); /* lpOverlapped */
- if (res == 0) {
- throwWindowsException(env, GetLastError());
-@@ -1232,7 +1230,17 @@
- BOOL res;
- BOOL subtree = (watchSubTree == JNI_TRUE) ? TRUE : FALSE;
-
-- ((LPOVERLAPPED)jlong_to_ptr(pOverlapped))->hEvent = NULL;
-+ /* Any unused members of [OVERLAPPED] structure should always be initialized to zero
-+ before the structure is used in a function call.
-+ Otherwise, the function may fail and return ERROR_INVALID_PARAMETER.
-+ http://msdn.microsoft.com/en-us/library/windows/desktop/ms684342%28v=vs.85%29.aspx
-+
-+ The [Offset] and [OffsetHigh] members of this structure are not used.
-+ http://msdn.microsoft.com/en-us/library/windows/desktop/aa365465%28v=vs.85%29.aspx
-+
-+ [hEvent] should be zero, other fields are the return values. */
-+ ZeroMemory((LPOVERLAPPED)jlong_to_ptr(pOverlapped), sizeof(OVERLAPPED));
-+
- res = ReadDirectoryChangesW((HANDLE)jlong_to_ptr(hDirectory),
- (LPVOID)jlong_to_ptr(bufferAddress),
- (DWORD)bufferLength,
---- ./jdk/src/windows/native/sun/security/krb5/NativeCreds.c 2013-09-06 11:29:15.000000000 -0700
-+++ ./jdk/src/windows/native/sun/security/krb5/NativeCreds.c 2014-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -380,7 +380,8 @@
- */
- JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativeCreds(
- JNIEnv *env,
-- jclass krbcredsClass) {
-+ jclass krbcredsClass,
-+ jintArray jetypes) {
-
- KERB_QUERY_TKT_CACHE_REQUEST CacheRequest;
- PKERB_RETRIEVE_TKT_RESPONSE TktCacheResponse = NULL;
-@@ -396,9 +397,12 @@
- jobject ticketFlags, startTime, endTime, krbCreds = NULL;
- jobject authTime, renewTillTime, hostAddresses = NULL;
- KERB_EXTERNAL_TICKET *msticket;
-- int ignore_cache = 0;
-+ int found_in_cache = 0;
- FILETIME Now, EndTime, LocalEndTime;
-
-+ int i, netypes;
-+ jint *etypes = NULL;
-+
- while (TRUE) {
-
- if (krbcredsConstructor == 0) {
-@@ -465,31 +469,33 @@
- // got the native MS TGT
- msticket = &(TktCacheResponse->Ticket);
-
-+ netypes = (*env)->GetArrayLength(env, jetypes);
-+ etypes = (jint *) (*env)->GetIntArrayElements(env, jetypes, NULL);
-+
- // check TGT validity
-- switch (msticket->SessionKey.KeyType) {
-- case KERB_ETYPE_DES_CBC_CRC:
-- case KERB_ETYPE_DES_CBC_MD5:
-- case KERB_ETYPE_NULL:
-- case KERB_ETYPE_RC4_HMAC_NT:
-- GetSystemTimeAsFileTime(&Now);
-- EndTime.dwLowDateTime = msticket->EndTime.LowPart;
-- EndTime.dwHighDateTime = msticket->EndTime.HighPart;
-- FileTimeToLocalFileTime(&EndTime, &LocalEndTime);
-- if (CompareFileTime(&Now, &LocalEndTime) >= 0) {
-- ignore_cache = 1;
-- }
-- if (msticket->TicketFlags & KERB_TICKET_FLAGS_invalid) {
-- ignore_cache = 1;
-+ if (native_debug) {
-+ printf("LSA: TICKET SessionKey KeyType is %d\n", msticket->SessionKey.KeyType);
-+ }
-+
-+ if ((msticket->TicketFlags & KERB_TICKET_FLAGS_invalid) == 0) {
-+ GetSystemTimeAsFileTime(&Now);
-+ EndTime.dwLowDateTime = msticket->EndTime.LowPart;
-+ EndTime.dwHighDateTime = msticket->EndTime.HighPart;
-+ FileTimeToLocalFileTime(&EndTime, &LocalEndTime);
-+ if (CompareFileTime(&Now, &LocalEndTime) < 0) {
-+ for (i=0; i<netypes; i++) {
-+ if (etypes[i] == msticket->SessionKey.KeyType) {
-+ found_in_cache = 1;
-+ if (native_debug) {
-+ printf("LSA: Valid etype found: %d\n", etypes[i]);
-+ }
-+ break;
-+ }
- }
-- break;
-- case KERB_ETYPE_RC4_MD4:
-- default:
-- // not supported
-- ignore_cache = 1;
-- break;
-+ }
- }
-
-- if (ignore_cache) {
-+ if (!found_in_cache) {
- if (native_debug) {
- printf("LSA: MS TGT in cache is invalid/not supported; request new ticket\n");
- }
-@@ -503,34 +509,40 @@
- }
-
- pTicketRequest->MessageType = KerbRetrieveEncodedTicketMessage;
-- pTicketRequest->EncryptionType = KERB_ETYPE_DES_CBC_MD5;
- pTicketRequest->CacheOptions = KERB_RETRIEVE_TICKET_DONT_USE_CACHE;
-
-- Status = LsaCallAuthenticationPackage(
-- LogonHandle,
-- PackageId,
-- pTicketRequest,
-- requestSize,
-- &pTicketResponse,
-- &responseSize,
-- &SubStatus
-- );
-+ for (i=0; i<netypes; i++) {
-+ pTicketRequest->EncryptionType = etypes[i];
-+ Status = LsaCallAuthenticationPackage(
-+ LogonHandle,
-+ PackageId,
-+ pTicketRequest,
-+ requestSize,
-+ &pTicketResponse,
-+ &responseSize,
-+ &SubStatus
-+ );
-
-- if (native_debug) {
-- printf("LSA: Response size is %d\n", responseSize);
-- }
-+ if (native_debug) {
-+ printf("LSA: Response size is %d for %d\n", responseSize, etypes[i]);
-+ }
-
-- if (!LSA_SUCCESS(Status) || !LSA_SUCCESS(SubStatus)) {
-- if (!LSA_SUCCESS(Status)) {
-- ShowNTError("LsaCallAuthenticationPackage", Status);
-- } else {
-- ShowNTError("Protocol status", SubStatus);
-+ if (!LSA_SUCCESS(Status) || !LSA_SUCCESS(SubStatus)) {
-+ if (!LSA_SUCCESS(Status)) {
-+ ShowNTError("LsaCallAuthenticationPackage", Status);
-+ } else {
-+ ShowNTError("Protocol status", SubStatus);
-+ }
-+ continue;
- }
-+
-+ // got the native MS Kerberos TGT
-+ msticket = &(pTicketResponse->Ticket);
- break;
- }
--
-- // got the native MS Kerberos TGT
-- msticket = &(pTicketResponse->Ticket);
-+ }
-+ if (etypes != NULL) {
-+ (*env)->ReleaseIntArrayElements(env, jetypes, etypes, 0);
- }
-
- /*
-@@ -653,7 +665,7 @@
- hostAddresses);
-
- break;
-- } // end of WHILE
-+ } // end of WHILE. This WHILE will never loop.
-
- // clean up resources
- if (TktCacheResponse != NULL) {
---- ./jdk/src/windows/native/sun/windows/awt_Component.cpp 2013-09-06 11:29:16.000000000 -0700
-+++ ./jdk/src/windows/native/sun/windows/awt_Component.cpp 2014-07-15 21:54:46.000000000 -0700
-@@ -1719,9 +1719,11 @@
- case WM_IME_SETCONTEXT:
- // lParam is passed as pointer and it can be modified.
- mr = WmImeSetContext(static_cast<BOOL>(wParam), &lParam);
-+ CallProxyDefWindowProc(message, wParam, lParam, retValue, mr);
- break;
- case WM_IME_NOTIFY:
- mr = WmImeNotify(wParam, lParam);
-+ CallProxyDefWindowProc(message, wParam, lParam, retValue, mr);
- break;
- case WM_IME_STARTCOMPOSITION:
- mr = WmImeStartComposition();
-@@ -4066,7 +4068,7 @@
- {
- if (mr != mrConsume) {
- HWND proxy = GetProxyFocusOwner();
-- if (proxy != NULL) {
-+ if (proxy != NULL && ::IsWindowEnabled(proxy)) {
- retVal = ComCtl32Util::GetInstance().DefWindowProc(NULL, proxy, message, wParam, lParam);
- mr = mrConsume;
- }
---- ./jdk/src/windows/native/sun/windows/awt_FileDialog.cpp 2013-09-06 11:29:16.000000000 -0700
-+++ ./jdk/src/windows/native/sun/windows/awt_FileDialog.cpp 2014-07-15 21:49:31.000000000 -0700
-@@ -372,7 +372,9 @@
-
- // Report result to peer.
- if (result) {
-- jint length = (jint)GetBufferLength(ofn.lpstrFile, ofn.nMaxFile);
-+ jint length = multipleMode
-+ ? (jint)GetBufferLength(ofn.lpstrFile, ofn.nMaxFile)
-+ : (jint)_tcslen(ofn.lpstrFile);
- jcharArray jnames = env->NewCharArray(length);
- env->SetCharArrayRegion(jnames, 0, length, (jchar*)ofn.lpstrFile);
-
---- ./jdk/src/windows/native/sun/windows/awt_Frame.cpp 2013-09-06 11:29:16.000000000 -0700
-+++ ./jdk/src/windows/native/sun/windows/awt_Frame.cpp 2014-07-15 21:54:46.000000000 -0700
-@@ -319,6 +319,8 @@
- case WM_IME_STARTCOMPOSITION:
- case WM_IME_ENDCOMPOSITION:
- case WM_IME_COMPOSITION:
-+ case WM_IME_SETCONTEXT:
-+ case WM_IME_NOTIFY:
- case WM_IME_CONTROL:
- case WM_IME_COMPOSITIONFULL:
- case WM_IME_SELECT:
---- ./jdk/src/windows/native/sun/windows/awt_PrintControl.cpp 2013-09-06 11:29:16.000000000 -0700
-+++ ./jdk/src/windows/native/sun/windows/awt_PrintControl.cpp 2014-07-15 21:49:31.000000000 -0700
-@@ -81,6 +81,7 @@
- jmethodID AwtPrintControl::setNativeAttID;
- jmethodID AwtPrintControl::setRangeCopiesID;
- jmethodID AwtPrintControl::setResID;
-+jmethodID AwtPrintControl::setJobAttributesID;
-
-
- BOOL AwtPrintControl::IsSupportedLevel(HANDLE hPrinter, DWORD dwLevel) {
-@@ -297,6 +298,10 @@
- AwtPrintControl::setPrinterID =
- env->GetMethodID(cls, "setPrinterNameAttrib", "(Ljava/lang/String;)V");
-
-+ AwtPrintControl::setJobAttributesID =
-+ env->GetMethodID(cls, "setJobAttributes",
-+ "(Ljavax/print/attribute/PrintRequestAttributeSet;IISSSSSSS)V");
-+
- DASSERT(AwtPrintControl::driverDoesMultipleCopiesID != NULL);
- DASSERT(AwtPrintControl::getPrintDCID != NULL);
- DASSERT(AwtPrintControl::setPrintDCID != NULL);
-@@ -327,6 +332,7 @@
- DASSERT(AwtPrintControl::getSidesID != NULL);
- DASSERT(AwtPrintControl::getSelectID != NULL);
- DASSERT(AwtPrintControl::getPrintToFileEnabledID != NULL);
-+ DASSERT(AwtPrintControl::setJobAttributesID != NULL);
-
-
- CATCH_BAD_ALLOC;
---- ./jdk/src/windows/native/sun/windows/awt_PrintControl.h 2013-09-06 11:29:16.000000000 -0700
-+++ ./jdk/src/windows/native/sun/windows/awt_PrintControl.h 2014-07-15 21:49:31.000000000 -0700
-@@ -47,7 +47,6 @@
- static jmethodID setDevmodeID;
- static jmethodID getDevnamesID;
- static jmethodID setDevnamesID;
--
- static jmethodID getWin32MediaID;
- static jmethodID setWin32MediaID;
- static jmethodID getWin32MediaTrayID;
-@@ -73,6 +72,7 @@
- static jmethodID setNativeAttID;
- static jmethodID setRangeCopiesID;
- static jmethodID setResID;
-+ static jmethodID setJobAttributesID;
-
- static void initIDs(JNIEnv *env, jclass cls);
- static BOOL FindPrinter(jstring printerName, LPBYTE pPrinterEnum,
---- ./jdk/src/windows/native/sun/windows/awt_PrintJob.cpp 2013-09-06 11:29:16.000000000 -0700
-+++ ./jdk/src/windows/native/sun/windows/awt_PrintJob.cpp 2014-07-15 21:49:31.000000000 -0700
-@@ -329,6 +329,156 @@
- static int embolden(int currentWeight);
- static BOOL getPrintableArea(HDC pdc, HANDLE hDevMode, RectDouble *margin);
-
-+
-+
-+/************************************************************************
-+ * DocumentProperties native support
-+ */
-+
-+/* Values must match those defined in WPrinterJob.java */
-+static const DWORD SET_COLOR = 0x00000200;
-+static const DWORD SET_ORIENTATION = 0x00004000;
-+static const DWORD SET_COLLATED = 0x00008000;
-+static const DWORD SET_DUP_VERTICAL = 0x00000010;
-+static const DWORD SET_DUP_HORIZONTAL = 0x00000020;
-+static const DWORD SET_RES_HIGH = 0x00000040;
-+static const DWORD SET_RES_LOW = 0x00000080;
-+
-+/*
-+ * Copy DEVMODE state back into JobAttributes.
-+ */
-+
-+static void UpdateJobAttributes(JNIEnv *env,
-+ jobject wJob,
-+ jobject attrSet,
-+ DEVMODE *devmode) {
-+
-+ DWORD dmValues = 0;
-+ int xRes = 0, yRes = 0;
-+
-+ if (devmode->dmFields & DM_COLOR) {
-+ if (devmode->dmColor == DMCOLOR_COLOR) {
-+ dmValues |= SET_COLOR;
-+ }
-+ }
-+
-+ if (devmode->dmFields & DM_ORIENTATION) {
-+ if (devmode->dmOrientation == DMORIENT_LANDSCAPE) {
-+ dmValues |= SET_ORIENTATION;
-+ }
-+ }
-+
-+ if (devmode->dmFields & DM_COLLATE &&
-+ devmode->dmCollate == DMCOLLATE_TRUE) {
-+ dmValues |= SET_COLLATED;
-+ }
-+
-+ if (devmode->dmFields & DM_PRINTQUALITY) {
-+ /* value < 0 indicates quality setting.
-+ * value > 0 indicates X resolution. In that case
-+ * hopefully we will also find y-resolution specified.
-+ * If its not, assume its the same as x-res.
-+ * Maybe Java code should try to reconcile this against
-+ * the printers claimed set of supported resolutions.
-+ */
-+ if (devmode->dmPrintQuality < 0) {
-+ if (devmode->dmPrintQuality == DMRES_HIGH) {
-+ dmValues |= SET_RES_HIGH;
-+ } else if ((devmode->dmPrintQuality == DMRES_LOW) ||
-+ (devmode->dmPrintQuality == DMRES_DRAFT)) {
-+ dmValues |= SET_RES_LOW;
-+ }
-+ /* else if (devmode->dmPrintQuality == DMRES_MEDIUM)
-+ * will set to NORMAL.
-+ */
-+ } else {
-+ xRes = devmode->dmPrintQuality;
-+ yRes = (devmode->dmFields & DM_YRESOLUTION) ?
-+ devmode->dmYResolution : devmode->dmPrintQuality;
-+ }
-+ }
-+
-+ if (devmode->dmFields & DM_DUPLEX) {
-+ if (devmode->dmDuplex == DMDUP_HORIZONTAL) {
-+ dmValues |= SET_DUP_HORIZONTAL;
-+ } else if (devmode->dmDuplex == DMDUP_VERTICAL) {
-+ dmValues |= SET_DUP_VERTICAL;
-+ }
-+ }
-+
-+ env->CallVoidMethod(wJob, AwtPrintControl::setJobAttributesID, attrSet,
-+ devmode->dmFields, dmValues, devmode->dmCopies,
-+ devmode->dmPaperSize, devmode->dmPaperWidth,
-+ devmode->dmPaperLength, devmode->dmDefaultSource,
-+ xRes, yRes);
-+
-+}
-+
-+JNIEXPORT jboolean JNICALL
-+Java_sun_awt_windows_WPrinterJob_showDocProperties(JNIEnv *env,
-+ jobject wJob,
-+ jlong hWndParent,
-+ jobject attrSet,
-+ jint dmFields,
-+ jshort copies,
-+ jshort collate,
-+ jshort color,
-+ jshort duplex,
-+ jshort orient,
-+ jshort paper,
-+ jshort bin,
-+ jshort xres_quality,
-+ jshort yres)
-+{
-+ TRY;
-+
-+ HGLOBAL hDevMode = AwtPrintControl::getPrintHDMode(env, wJob);
-+ HGLOBAL hDevNames = AwtPrintControl::getPrintHDName(env, wJob);
-+ DEVMODE *devmode = NULL;
-+ DEVNAMES *devnames = NULL;
-+ LONG rval = IDCANCEL;
-+ jboolean ret = JNI_FALSE;
-+
-+ if (hDevMode != NULL && hDevNames != NULL) {
-+ devmode = (DEVMODE *)::GlobalLock(hDevMode);
-+ devnames = (DEVNAMES *)::GlobalLock(hDevNames);
-+
-+ LPTSTR lpdevnames = (LPTSTR)devnames;
-+ // No need to call _tcsdup as we won't unlock until we are done.
-+ LPTSTR printerName = lpdevnames+devnames->wDeviceOffset;
-+ LPTSTR portName = lpdevnames+devnames->wOutputOffset;
-+
-+ HANDLE hPrinter;
-+ if (::OpenPrinter(printerName, &hPrinter, NULL) == TRUE) {
-+ devmode->dmFields |= dmFields;
-+ devmode->dmCopies = copies;
-+ devmode->dmCollate = collate;
-+ devmode->dmColor = color;
-+ devmode->dmDuplex = duplex;
-+ devmode->dmOrientation = orient;
-+ devmode->dmPrintQuality = xres_quality;
-+ devmode->dmYResolution = yres;
-+ devmode->dmPaperSize = paper;
-+ devmode->dmDefaultSource = bin;
-+
-+ rval = ::DocumentProperties((HWND)hWndParent,
-+ hPrinter, printerName, devmode, devmode,
-+ DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT);
-+ if (rval == IDOK) {
-+ UpdateJobAttributes(env, wJob, attrSet, devmode);
-+ ret = JNI_TRUE;
-+ }
-+ VERIFY(::ClosePrinter(hPrinter));
-+ }
-+ ::GlobalUnlock(hDevNames);
-+ ::GlobalUnlock(hDevMode);
-+ }
-+
-+ return ret;
-+
-+ CATCH_BAD_ALLOC_RET(0);
-+}
-+
- /************************************************************************
- * WPageDialog native methods
- */
-@@ -732,7 +882,6 @@
- memset(&pd, 0, sizeof(PRINTDLG));
- pd.lStructSize = sizeof(PRINTDLG);
- pd.Flags = PD_RETURNDEFAULT | PD_RETURNDC;
--
- if (::PrintDlg(&pd)) {
- printDC = pd.hDC;
- hDevMode = pd.hDevMode;
-@@ -792,8 +941,19 @@
- jint imgPixelWid = GetDeviceCaps(printDC, HORZRES);
- jint imgPixelHgt = GetDeviceCaps(printDC, VERTRES);
-
-+ // The DC may be obtained when we first selected the printer as a
-+ // result of a call to setNativePrintService.
-+ // If the Devmode was obtained later on from the DocumentProperties dialog
-+ // the DC won't have been updated and its settings may be for PORTRAIT.
-+ // This may happen in other cases too, but was observed for the above.
-+ // To get a DC compatible with this devmode we should really call
-+ // CreateDC() again to get a DC for the devmode we are using.
-+ // The changes for that are a lot more risk, so to minimise that
-+ // risk, assume its not LANDSCAPE unless width > height, even if the
-+ // devmode says its LANDSCAPE.
- // if the values were obtained from a rotated device, swap.
-- if (getOrientationFromDevMode2(hDevMode) == DMORIENT_LANDSCAPE) {
-+ if ((getOrientationFromDevMode2(hDevMode) == DMORIENT_LANDSCAPE) &&
-+ (imgPixelWid > imgPixelHgt)) {
- jint tmp;
- tmp = xPixelRes;
- xPixelRes = yPixelRes;
-@@ -941,6 +1101,9 @@
- setBooleanField(env, self, DRIVER_COLLATE_STR, JNI_FALSE);
- }
-
-+ if (dmFields & DM_COPIES) {
-+ setBooleanField(env, self, DRIVER_COPIES_STR, JNI_TRUE);
-+ }
- }
-
- CATCH_BAD_ALLOC;
---- ./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-07-15 21:49:31.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-07-15 21:49:31.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-10-28 20:19:52.000000000 -0700
-@@ -79,6 +79,11 @@
- endif
- OS_VERSION := $(shell $(UNAME) -r)
- endif
-+ifeq ($(findstring BSD,$(UNAME_S)), BSD)
-+ OS_NAME = bsd
-+ OS_ARCH := $(shell $(UNAME) -m)
-+ OS_VERSION := $(shell $(UNAME) -r)
-+endif
- ifeq ($(UNAME_S), Darwin)
- 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-07-15 21:49:31.000000000 -0700
-@@ -369,15 +369,6 @@
- # 7147060
- com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java generic-all
-
--# 8000439: NPG: REGRESSION : sun/security/krb5/auto/MaxRetries.java fails with timeout
--sun/security/krb5/auto/MaxRetries.java solaris-sparcv9
--
--# 8006690: sun/security/krb5/auto/BadKdc1.java fails intermittently
--sun/security/krb5/auto/BadKdc1.java solaris-sparcv9
--sun/security/krb5/auto/BadKdc2.java solaris-sparcv9
--sun/security/krb5/auto/BadKdc3.java solaris-sparcv9
--sun/security/krb5/auto/BadKdc4.java solaris-sparcv9
--
- ############################################################################
-
- # jdk_swing
-@@ -456,6 +447,9 @@
- # 7041639, Solaris DSA keypair generation bug
- java/util/TimeZone/TimeZoneDatePermissionCheck.sh solaris-all
-
-+# 8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing
-+sun/util/resources/TimeZone/Bug6317929.java generic-all
-+
- ############################################################################
-
-
---- ./jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,108 @@
-+/*
-+ * 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 8007267
-+ * @summary [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
-+ * @author leonid.romanov@oracle.com
-+ * @run main DefaultMenuBarTest
-+ */
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+import javax.swing.*;
-+import sun.awt.*;
-+import java.lang.reflect.Method;
-+
-+
-+public class DefaultMenuBarTest {
-+ static KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.META_MASK);
-+
-+ static volatile int listenerCallCounter = 0;
-+ public static void main(String[] args) throws Exception {
-+ if (sun.awt.OSInfo.getOSType() != sun.awt.OSInfo.OSType.MACOSX) {
-+ System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
-+ return;
-+ }
-+
-+ System.setProperty("apple.laf.useScreenMenuBar", "true");
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ Robot robot = new Robot();
-+ robot.setAutoDelay(100);
-+
-+ robot.keyPress(KeyEvent.VK_META);
-+ robot.keyPress(ks.getKeyCode());
-+ robot.keyRelease(ks.getKeyCode());
-+ robot.keyRelease(KeyEvent.VK_META);
-+
-+ toolkit.realSync();
-+
-+ if (listenerCallCounter != 1) {
-+ throw new Exception("Test failed: ActionListener either wasn't called or was called more than once");
-+ }
-+ }
-+
-+ private static void createAndShowGUI() {
-+ JMenu menu = new JMenu("File");
-+ JMenuItem newItem = new JMenuItem("Open");
-+
-+ newItem.setAccelerator(ks);
-+ newItem.addActionListener(
-+ new ActionListener(){
-+ public void actionPerformed(ActionEvent e) {
-+ listenerCallCounter++;
-+ }
-+ }
-+ );
-+ menu.add(newItem);
-+
-+ JMenuBar defaultMenu = new JMenuBar();
-+ defaultMenu.add(menu);
-+
-+ // Application.getApplication().setDefaultMenuBar(defaultMenu);
-+ try {
-+ Class appClass = Class.forName("com.apple.eawt.Application");
-+ if (appClass != null) {
-+ Method method = appClass.getMethod("getApplication");
-+ if (method != null) {
-+ Object app = method.invoke(null, new Object[]{});
-+ if (app != null) {
-+ method = appClass.getMethod("setDefaultMenuBar", new Class[]{JMenuBar.class});
-+ if (method != null) {
-+ method.invoke(app, new Object[]{defaultMenu});
-+ }
-+ }
-+ }
-+ }
-+ } catch (Exception e) {
-+ e.printStackTrace();
-+ }
-+ }
-+}
---- ./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-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,61 @@
-+/*
-+ * 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 8028215
-+ * @summary SetDefaultORBTest setting ORB impl via properties test
-+ * @run main/othervm SetDefaultORBTest
-+ *
-+ */
-+
-+import java.util.Properties;
-+
-+import org.omg.CORBA.ORB;
-+
-+
-+public class SetDefaultORBTest {
-+
-+ public static void main(String[] args) {
-+ Properties systemProperties = System.getProperties();
-+ systemProperties.setProperty("org.omg.CORBA.ORBSingletonClass",
-+ "com.sun.corba.se.impl.orb.ORBSingleton");
-+ System.setSecurityManager(new SecurityManager());
-+ Properties props = new Properties();
-+ props.put("org.omg.CORBA.ORBClass", "com.sun.corba.se.impl.orb.ORBImpl");
-+ ORB orb = ORB.init(args, props);
-+ Class<?> orbClass = orb.getClass();
-+ if (orbClass.getName().equals("com.sun.corba.se.impl.orb.ORBImpl")) {
-+ System.out.println("orbClass is com.sun.corba.se.impl.orb.ORBimpl as expected");
-+ } else {
-+ throw new RuntimeException("com.sun.corba.se.impl.orb.ORBimpl class expected for ORBImpl");
-+ }
-+ ORB singletonORB = ORB.init();
-+ Class<?> singletoneOrbClass = singletonORB.getClass();
-+ if (singletoneOrbClass.getName().equals("com.sun.corba.se.impl.orb.ORBSingleton")) {
-+ System.out.println("singeletonOrbClass is com.sun.corba.se.impl.orb.ORBSingleton as expected");
-+ } else {
-+ throw new RuntimeException("com.sun.corba.se.impl.orb.ORBSingleton class expected for ORBSingleton");
-+ }
-+ }
-+}
---- ./jdk/test/com/sun/corba/transport/KeepAliveSockets.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/com/sun/corba/transport/KeepAliveSockets.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,68 @@
-+/*
-+ * 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 8017195
-+ * @summary Introduce option to setKeepAlive parameter on CORBA sockets
-+ *
-+ * @run main/othervm KeepAliveSockets
-+ * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive KeepAliveSockets
-+ * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive=true KeepAliveSockets
-+ * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive=false KeepAliveSockets
-+ */
-+
-+import java.lang.*;
-+import java.net.InetSocketAddress;
-+import java.net.Socket;
-+import java.nio.channels.ServerSocketChannel;
-+import java.util.*;
-+import com.sun.corba.se.impl.orb.*;
-+
-+import com.sun.corba.se.impl.transport.*;
-+
-+public class KeepAliveSockets {
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ boolean keepAlive = false;
-+ String prop = System.getProperty("com.sun.CORBA.transport.enableTcpKeepAlive");
-+ if (prop != null)
-+ keepAlive = !"false".equalsIgnoreCase(prop);
-+
-+ DefaultSocketFactoryImpl sfImpl = new DefaultSocketFactoryImpl();
-+ ORBImpl orb = new ORBImpl();
-+ orb.set_parameters(null);
-+ sfImpl.setORB(orb);
-+
-+ ServerSocketChannel ssc = ServerSocketChannel.open();
-+ ssc.socket().bind(new InetSocketAddress(0));
-+
-+ InetSocketAddress isa = new InetSocketAddress("localhost", ssc.socket().getLocalPort());
-+ Socket s = sfImpl.createSocket("ignore", isa);
-+ System.out.println("Received factory socket" + s);
-+ if (keepAlive != s.getKeepAlive())
-+ throw new RuntimeException("KeepAlive value not honoured in CORBA socket");
-+ }
-+
-+}
---- ./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-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,420 @@
-+/*
-+ * 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 8014618
-+ * @summary Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
-+ * @author Pasi Eronen
-+ */
-+
-+import java.io.*;
-+import java.security.*;
-+import java.security.spec.*;
-+import java.security.interfaces.*;
-+import javax.crypto.*;
-+import javax.crypto.spec.*;
-+import javax.crypto.interfaces.*;
-+import com.sun.crypto.provider.SunJCE;
-+
-+/**
-+ * Test that leading zeroes are stripped in TlsPremasterSecret case,
-+ * but are left as-is in other cases.
-+ *
-+ * We use pre-generated keypairs, since with randomly generated keypairs,
-+ * a leading zero happens only (roughly) 1 out of 256 cases.
-+ */
-+
-+public class TestLeadingZeroes {
-+
-+ private static final String SUNJCE = "SunJCE";
-+
-+ private TestLeadingZeroes() {}
-+
-+ public static void main(String argv[]) throws Exception {
-+ // Add JCE to the list of providers
-+ SunJCE jce = new SunJCE();
-+ Security.addProvider(jce);
-+
-+ TestLeadingZeroes keyAgree = new TestLeadingZeroes();
-+ keyAgree.run();
-+ System.out.println("Test Passed");
-+ }
-+
-+ private void run() throws Exception {
-+
-+ // decode pre-generated keypairs
-+ KeyFactory kfac = KeyFactory.getInstance("DH");
-+ PublicKey alicePubKey =
-+ kfac.generatePublic(new X509EncodedKeySpec(alicePubKeyEnc));
-+ PublicKey bobPubKey =
-+ kfac.generatePublic(new X509EncodedKeySpec(bobPubKeyEnc));
-+ PrivateKey alicePrivKey =
-+ kfac.generatePrivate(new PKCS8EncodedKeySpec(alicePrivKeyEnc));
-+ PrivateKey bobPrivKey =
-+ kfac.generatePrivate(new PKCS8EncodedKeySpec(bobPrivKeyEnc));
-+
-+ // generate normal shared secret
-+ KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", SUNJCE);
-+ aliceKeyAgree.init(alicePrivKey);
-+ aliceKeyAgree.doPhase(bobPubKey, true);
-+ byte[] sharedSecret = aliceKeyAgree.generateSecret();
-+ System.out.println("shared secret:\n" + toHexString(sharedSecret));
-+
-+ // verify that leading zero is present
-+ if (sharedSecret.length != 128) {
-+ throw new Exception("Unexpected shared secret length");
-+ }
-+ if (sharedSecret[0] != 0) {
-+ throw new Exception("First byte is not zero as expected");
-+ }
-+
-+ // now, test TLS premaster secret
-+ aliceKeyAgree.init(alicePrivKey);
-+ aliceKeyAgree.doPhase(bobPubKey, true);
-+ byte[] tlsPremasterSecret =
-+ aliceKeyAgree.generateSecret("TlsPremasterSecret").getEncoded();
-+ System.out.println(
-+ "tls premaster secret:\n" + toHexString(tlsPremasterSecret));
-+
-+ // check that leading zero has been stripped
-+ if (tlsPremasterSecret.length != 127) {
-+ throw new Exception("Unexpected TLS premaster secret length");
-+ }
-+ if (tlsPremasterSecret[0] == 0) {
-+ throw new Exception("First byte is zero");
-+ }
-+ for (int i = 0; i < tlsPremasterSecret.length; i++) {
-+ if (tlsPremasterSecret[i] != sharedSecret[i+1]) {
-+ throw new Exception("Shared secrets differ");
-+ }
-+ }
-+
-+ }
-+
-+ /*
-+ * Converts a byte to hex digit and writes to the supplied buffer
-+ */
-+ private void byte2hex(byte b, StringBuffer buf) {
-+ char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
-+ '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-+ int high = ((b & 0xf0) >> 4);
-+ int low = (b & 0x0f);
-+ buf.append(hexChars[high]);
-+ buf.append(hexChars[low]);
-+ }
-+
-+ /*
-+ * Converts a byte array to hex string
-+ */
-+ private String toHexString(byte[] block) {
-+ StringBuffer buf = new StringBuffer();
-+
-+ int len = block.length;
-+
-+ for (int i = 0; i < len; i++) {
-+ byte2hex(block[i], buf);
-+ if (i < len-1) {
-+ buf.append(":");
-+ }
-+ }
-+ return buf.toString();
-+ }
-+
-+ private static final byte alicePubKeyEnc[] = {
-+ (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x24,
-+ (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
-+ (byte)0x09, (byte)0x2A, (byte)0x86, (byte)0x48,
-+ (byte)0x86, (byte)0xF7, (byte)0x0D, (byte)0x01,
-+ (byte)0x03, (byte)0x01, (byte)0x30, (byte)0x81,
-+ (byte)0x8B, (byte)0x02, (byte)0x81, (byte)0x81,
-+ (byte)0x00, (byte)0xF4, (byte)0x88, (byte)0xFD,
-+ (byte)0x58, (byte)0x4E, (byte)0x49, (byte)0xDB,
-+ (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D,
-+ (byte)0xE4, (byte)0x91, (byte)0x07, (byte)0x36,
-+ (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38,
-+ (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
-+ (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C,
-+ (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E,
-+ (byte)0xF6, (byte)0xF3, (byte)0xC9, (byte)0x23,
-+ (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5,
-+ (byte)0x5B, (byte)0x18, (byte)0x8D, (byte)0x8E,
-+ (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8,
-+ (byte)0x5D, (byte)0x38, (byte)0xD3, (byte)0x34,
-+ (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57,
-+ (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
-+ (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21,
-+ (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF,
-+ (byte)0x3C, (byte)0xE1, (byte)0xB1, (byte)0x29,
-+ (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D,
-+ (byte)0x7C, (byte)0x84, (byte)0xA7, (byte)0x0A,
-+ (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4,
-+ (byte)0x03, (byte)0x19, (byte)0xC8, (byte)0x07,
-+ (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95,
-+ (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
-+ (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50,
-+ (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3,
-+ (byte)0x08, (byte)0x3D, (byte)0x66, (byte)0xA4,
-+ (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C,
-+ (byte)0x7C, (byte)0xBD, (byte)0x89, (byte)0x4B,
-+ (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA,
-+ (byte)0xAB, (byte)0xA2, (byte)0x5E, (byte)0xC3,
-+ (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78,
-+ (byte)0xC7, (byte)0x02, (byte)0x01, (byte)0x02,
-+ (byte)0x02, (byte)0x02, (byte)0x02, (byte)0x00,
-+ (byte)0x03, (byte)0x81, (byte)0x85, (byte)0x00,
-+ (byte)0x02, (byte)0x81, (byte)0x81, (byte)0x00,
-+ (byte)0xEE, (byte)0xD6, (byte)0xB1, (byte)0xA3,
-+ (byte)0xB4, (byte)0x78, (byte)0x2B, (byte)0x35,
-+ (byte)0xEF, (byte)0xCD, (byte)0x17, (byte)0x86,
-+ (byte)0x63, (byte)0x2B, (byte)0x97, (byte)0x0E,
-+ (byte)0x7A, (byte)0xD1, (byte)0xFF, (byte)0x7A,
-+ (byte)0xEB, (byte)0x57, (byte)0x61, (byte)0xA1,
-+ (byte)0xF7, (byte)0x90, (byte)0x11, (byte)0xA7,
-+ (byte)0x79, (byte)0x28, (byte)0x69, (byte)0xBA,
-+ (byte)0xA7, (byte)0xB2, (byte)0x37, (byte)0x17,
-+ (byte)0xAE, (byte)0x3C, (byte)0x92, (byte)0x89,
-+ (byte)0x88, (byte)0xE5, (byte)0x7E, (byte)0x8E,
-+ (byte)0xF0, (byte)0x24, (byte)0xD0, (byte)0xE1,
-+ (byte)0xC4, (byte)0xB0, (byte)0x26, (byte)0x5A,
-+ (byte)0x1E, (byte)0xBD, (byte)0xA0, (byte)0xCF,
-+ (byte)0x3E, (byte)0x97, (byte)0x2A, (byte)0x13,
-+ (byte)0x92, (byte)0x3B, (byte)0x39, (byte)0xD0,
-+ (byte)0x1D, (byte)0xA3, (byte)0x6B, (byte)0x3E,
-+ (byte)0xC2, (byte)0xBB, (byte)0x14, (byte)0xB6,
-+ (byte)0xE2, (byte)0x4C, (byte)0x0E, (byte)0x5B,
-+ (byte)0x4B, (byte)0xA4, (byte)0x9D, (byte)0xA6,
-+ (byte)0x21, (byte)0xB0, (byte)0xF9, (byte)0xDE,
-+ (byte)0x55, (byte)0xAE, (byte)0x5C, (byte)0x29,
-+ (byte)0x0E, (byte)0xC1, (byte)0xFC, (byte)0xBA,
-+ (byte)0x51, (byte)0xD3, (byte)0xB6, (byte)0x6D,
-+ (byte)0x75, (byte)0x72, (byte)0xDF, (byte)0x43,
-+ (byte)0xAB, (byte)0x94, (byte)0x21, (byte)0x6E,
-+ (byte)0x0C, (byte)0xD1, (byte)0x93, (byte)0x54,
-+ (byte)0x56, (byte)0x7D, (byte)0x4B, (byte)0x90,
-+ (byte)0xF1, (byte)0x94, (byte)0x45, (byte)0xD4,
-+ (byte)0x2A, (byte)0x71, (byte)0xA1, (byte)0xB8,
-+ (byte)0xDD, (byte)0xAA, (byte)0x05, (byte)0xF0,
-+ (byte)0x27, (byte)0x37, (byte)0xBD, (byte)0x44
-+ };
-+
-+ private static final byte alicePrivKeyEnc[] = {
-+ (byte)0x30, (byte)0x81, (byte)0xE3, (byte)0x02,
-+ (byte)0x01, (byte)0x00, (byte)0x30, (byte)0x81,
-+ (byte)0x99, (byte)0x06, (byte)0x09, (byte)0x2A,
-+ (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xF7,
-+ (byte)0x0D, (byte)0x01, (byte)0x03, (byte)0x01,
-+ (byte)0x30, (byte)0x81, (byte)0x8B, (byte)0x02,
-+ (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xF4,
-+ (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
-+ (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20,
-+ (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91,
-+ (byte)0x07, (byte)0x36, (byte)0x6B, (byte)0x33,
-+ (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45,
-+ (byte)0x1D, (byte)0x0F, (byte)0x7C, (byte)0x88,
-+ (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B,
-+ (byte)0x2D, (byte)0x8E, (byte)0xF6, (byte)0xF3,
-+ (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43,
-+ (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
-+ (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55,
-+ (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38,
-+ (byte)0xD3, (byte)0x34, (byte)0xFD, (byte)0x7C,
-+ (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3,
-+ (byte)0x1D, (byte)0x18, (byte)0x6C, (byte)0xDE,
-+ (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5,
-+ (byte)0x2A, (byte)0xFF, (byte)0x3C, (byte)0xE1,
-+ (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18,
-+ (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
-+ (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6,
-+ (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19,
-+ (byte)0xC8, (byte)0x07, (byte)0x29, (byte)0x7A,
-+ (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9,
-+ (byte)0x96, (byte)0x9F, (byte)0xAB, (byte)0xD0,
-+ (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02,
-+ (byte)0x46, (byte)0xD3, (byte)0x08, (byte)0x3D,
-+ (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41,
-+ (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
-+ (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19,
-+ (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2,
-+ (byte)0x5E, (byte)0xC3, (byte)0x55, (byte)0xE9,
-+ (byte)0x2F, (byte)0x78, (byte)0xC7, (byte)0x02,
-+ (byte)0x01, (byte)0x02, (byte)0x02, (byte)0x02,
-+ (byte)0x02, (byte)0x00, (byte)0x04, (byte)0x42,
-+ (byte)0x02, (byte)0x40, (byte)0x36, (byte)0x4D,
-+ (byte)0xD0, (byte)0x58, (byte)0x64, (byte)0x91,
-+ (byte)0x78, (byte)0xA2, (byte)0x4B, (byte)0x79,
-+ (byte)0x46, (byte)0xFE, (byte)0xC9, (byte)0xD9,
-+ (byte)0xCA, (byte)0x5C, (byte)0xF9, (byte)0xFD,
-+ (byte)0x6C, (byte)0x5D, (byte)0x76, (byte)0x3A,
-+ (byte)0x41, (byte)0x6D, (byte)0x44, (byte)0x62,
-+ (byte)0x75, (byte)0x93, (byte)0x81, (byte)0x93,
-+ (byte)0x00, (byte)0x4C, (byte)0xB1, (byte)0xD8,
-+ (byte)0x7D, (byte)0x9D, (byte)0xF3, (byte)0x16,
-+ (byte)0x2C, (byte)0x6C, (byte)0x9F, (byte)0x7A,
-+ (byte)0x84, (byte)0xA3, (byte)0x7A, (byte)0xC1,
-+ (byte)0x4F, (byte)0x60, (byte)0xE3, (byte)0xB5,
-+ (byte)0x86, (byte)0x28, (byte)0x08, (byte)0x4D,
-+ (byte)0x94, (byte)0xB6, (byte)0x04, (byte)0x0D,
-+ (byte)0xAC, (byte)0xBD, (byte)0x1F, (byte)0x42,
-+ (byte)0x8F, (byte)0x1B
-+ };
-+
-+ private static final byte bobPubKeyEnc[] = {
-+ (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x23,
-+ (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
-+ (byte)0x09, (byte)0x2A, (byte)0x86, (byte)0x48,
-+ (byte)0x86, (byte)0xF7, (byte)0x0D, (byte)0x01,
-+ (byte)0x03, (byte)0x01, (byte)0x30, (byte)0x81,
-+ (byte)0x8B, (byte)0x02, (byte)0x81, (byte)0x81,
-+ (byte)0x00, (byte)0xF4, (byte)0x88, (byte)0xFD,
-+ (byte)0x58, (byte)0x4E, (byte)0x49, (byte)0xDB,
-+ (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D,
-+ (byte)0xE4, (byte)0x91, (byte)0x07, (byte)0x36,
-+ (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38,
-+ (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
-+ (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C,
-+ (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E,
-+ (byte)0xF6, (byte)0xF3, (byte)0xC9, (byte)0x23,
-+ (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5,
-+ (byte)0x5B, (byte)0x18, (byte)0x8D, (byte)0x8E,
-+ (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8,
-+ (byte)0x5D, (byte)0x38, (byte)0xD3, (byte)0x34,
-+ (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57,
-+ (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
-+ (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21,
-+ (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF,
-+ (byte)0x3C, (byte)0xE1, (byte)0xB1, (byte)0x29,
-+ (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D,
-+ (byte)0x7C, (byte)0x84, (byte)0xA7, (byte)0x0A,
-+ (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4,
-+ (byte)0x03, (byte)0x19, (byte)0xC8, (byte)0x07,
-+ (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95,
-+ (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
-+ (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50,
-+ (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3,
-+ (byte)0x08, (byte)0x3D, (byte)0x66, (byte)0xA4,
-+ (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C,
-+ (byte)0x7C, (byte)0xBD, (byte)0x89, (byte)0x4B,
-+ (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA,
-+ (byte)0xAB, (byte)0xA2, (byte)0x5E, (byte)0xC3,
-+ (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78,
-+ (byte)0xC7, (byte)0x02, (byte)0x01, (byte)0x02,
-+ (byte)0x02, (byte)0x02, (byte)0x02, (byte)0x00,
-+ (byte)0x03, (byte)0x81, (byte)0x84, (byte)0x00,
-+ (byte)0x02, (byte)0x81, (byte)0x80, (byte)0x2C,
-+ (byte)0x40, (byte)0xFA, (byte)0xF6, (byte)0xA6,
-+ (byte)0xF8, (byte)0xAC, (byte)0xC2, (byte)0x4F,
-+ (byte)0xCD, (byte)0xC7, (byte)0x37, (byte)0x93,
-+ (byte)0xE5, (byte)0xE4, (byte)0x5E, (byte)0x18,
-+ (byte)0x14, (byte)0xE6, (byte)0x50, (byte)0xDA,
-+ (byte)0x55, (byte)0x38, (byte)0x5D, (byte)0x24,
-+ (byte)0xF5, (byte)0x42, (byte)0x68, (byte)0x5F,
-+ (byte)0xF5, (byte)0x15, (byte)0xC8, (byte)0x9B,
-+ (byte)0x5D, (byte)0x06, (byte)0x3D, (byte)0xE1,
-+ (byte)0x52, (byte)0x2F, (byte)0x98, (byte)0xFF,
-+ (byte)0x37, (byte)0xBB, (byte)0x75, (byte)0x48,
-+ (byte)0x48, (byte)0xE9, (byte)0x65, (byte)0x84,
-+ (byte)0x37, (byte)0xBB, (byte)0xB3, (byte)0xE9,
-+ (byte)0x36, (byte)0x01, (byte)0xB4, (byte)0x6A,
-+ (byte)0x1C, (byte)0xB2, (byte)0x11, (byte)0x82,
-+ (byte)0xCE, (byte)0x3D, (byte)0x65, (byte)0xE5,
-+ (byte)0x3C, (byte)0x89, (byte)0xE9, (byte)0x52,
-+ (byte)0x19, (byte)0xBD, (byte)0x58, (byte)0xF6,
-+ (byte)0xA2, (byte)0x03, (byte)0xA8, (byte)0xB2,
-+ (byte)0xA5, (byte)0xDB, (byte)0xEB, (byte)0xF5,
-+ (byte)0x94, (byte)0xF9, (byte)0x46, (byte)0xBE,
-+ (byte)0x45, (byte)0x4C, (byte)0x65, (byte)0xD2,
-+ (byte)0xD1, (byte)0xCF, (byte)0xFF, (byte)0xFF,
-+ (byte)0xFA, (byte)0x38, (byte)0xF1, (byte)0x72,
-+ (byte)0xAB, (byte)0xB9, (byte)0x14, (byte)0x4E,
-+ (byte)0xF5, (byte)0xF0, (byte)0x7A, (byte)0x8E,
-+ (byte)0x45, (byte)0xFD, (byte)0x5B, (byte)0xF9,
-+ (byte)0xA2, (byte)0x97, (byte)0x1B, (byte)0xAE,
-+ (byte)0x2C, (byte)0x7B, (byte)0x6B, (byte)0x7C,
-+ (byte)0x98, (byte)0xFE, (byte)0x58, (byte)0xDD,
-+ (byte)0xBE, (byte)0xF6, (byte)0x1C, (byte)0x8E,
-+ (byte)0xD0, (byte)0xA1, (byte)0x72
-+ };
-+
-+ private static final byte bobPrivKeyEnc[] = {
-+ (byte)0x30, (byte)0x81, (byte)0xE4, (byte)0x02,
-+ (byte)0x01, (byte)0x00, (byte)0x30, (byte)0x81,
-+ (byte)0x99, (byte)0x06, (byte)0x09, (byte)0x2A,
-+ (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xF7,
-+ (byte)0x0D, (byte)0x01, (byte)0x03, (byte)0x01,
-+ (byte)0x30, (byte)0x81, (byte)0x8B, (byte)0x02,
-+ (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xF4,
-+ (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
-+ (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20,
-+ (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91,
-+ (byte)0x07, (byte)0x36, (byte)0x6B, (byte)0x33,
-+ (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45,
-+ (byte)0x1D, (byte)0x0F, (byte)0x7C, (byte)0x88,
-+ (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B,
-+ (byte)0x2D, (byte)0x8E, (byte)0xF6, (byte)0xF3,
-+ (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43,
-+ (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
-+ (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55,
-+ (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38,
-+ (byte)0xD3, (byte)0x34, (byte)0xFD, (byte)0x7C,
-+ (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3,
-+ (byte)0x1D, (byte)0x18, (byte)0x6C, (byte)0xDE,
-+ (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5,
-+ (byte)0x2A, (byte)0xFF, (byte)0x3C, (byte)0xE1,
-+ (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18,
-+ (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
-+ (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6,
-+ (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19,
-+ (byte)0xC8, (byte)0x07, (byte)0x29, (byte)0x7A,
-+ (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9,
-+ (byte)0x96, (byte)0x9F, (byte)0xAB, (byte)0xD0,
-+ (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02,
-+ (byte)0x46, (byte)0xD3, (byte)0x08, (byte)0x3D,
-+ (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41,
-+ (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
-+ (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19,
-+ (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2,
-+ (byte)0x5E, (byte)0xC3, (byte)0x55, (byte)0xE9,
-+ (byte)0x2F, (byte)0x78, (byte)0xC7, (byte)0x02,
-+ (byte)0x01, (byte)0x02, (byte)0x02, (byte)0x02,
-+ (byte)0x02, (byte)0x00, (byte)0x04, (byte)0x43,
-+ (byte)0x02, (byte)0x41, (byte)0x00, (byte)0xE0,
-+ (byte)0x31, (byte)0xE7, (byte)0x77, (byte)0xB8,
-+ (byte)0xD0, (byte)0x7E, (byte)0x0A, (byte)0x9B,
-+ (byte)0x94, (byte)0xD5, (byte)0x3D, (byte)0x33,
-+ (byte)0x62, (byte)0x32, (byte)0x51, (byte)0xCE,
-+ (byte)0x74, (byte)0x5C, (byte)0xA5, (byte)0x72,
-+ (byte)0xD9, (byte)0x36, (byte)0xF3, (byte)0x8A,
-+ (byte)0x3F, (byte)0x8B, (byte)0xC6, (byte)0xFE,
-+ (byte)0xEF, (byte)0x94, (byte)0x8B, (byte)0x50,
-+ (byte)0x41, (byte)0x9B, (byte)0x14, (byte)0xC8,
-+ (byte)0xE9, (byte)0x1F, (byte)0x24, (byte)0x1F,
-+ (byte)0x65, (byte)0x8E, (byte)0xD3, (byte)0x85,
-+ (byte)0xD0, (byte)0x68, (byte)0x6C, (byte)0xF1,
-+ (byte)0x79, (byte)0x45, (byte)0xD0, (byte)0x06,
-+ (byte)0xA4, (byte)0xB8, (byte)0xE0, (byte)0x64,
-+ (byte)0xF5, (byte)0x38, (byte)0x72, (byte)0x97,
-+ (byte)0x00, (byte)0x23, (byte)0x5F
-+ };
-+}
-+
---- ./jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java 2013-09-06 11:29:18.000000000 -0700
-+++ ./jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java 2014-10-28 20:19:45.000000000 -0700
-@@ -33,6 +33,7 @@
-
- import javax.crypto.KeyGenerator;
- import javax.crypto.SecretKey;
-+import java.util.Formatter;
-
- import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
-
-@@ -52,27 +53,51 @@
- System.out.println("OK: " + e);
- }
-
-- test(kg, 3, 0);
-- test(kg, 3, 1);
-- test(kg, 3, 2);
-- test(kg, 4, 0);
-+ int[] protocolVersions = {0x0300, 0x0301, 0x0302, 0x0400};
-+ for (int clientVersion : protocolVersions) {
-+ for (int serverVersion : protocolVersions) {
-+ test(kg, clientVersion, serverVersion);
-+ if (serverVersion >= clientVersion) {
-+ break;
-+ }
-+ }
-+ }
-
- System.out.println("Done.");
- }
-
-- private static void test(KeyGenerator kg, int major, int minor)
-- throws Exception {
-+ private static void test(KeyGenerator kg,
-+ int clientVersion, int serverVersion) throws Exception {
-+
-+ System.out.printf(
-+ "Testing RSA pre-master secret key generation between " +
-+ "client (0x%04X) and server(0x%04X)%n",
-+ clientVersion, serverVersion);
-+ kg.init(new TlsRsaPremasterSecretParameterSpec(
-+ clientVersion, serverVersion));
-
-- kg.init(new TlsRsaPremasterSecretParameterSpec(major, minor));
- SecretKey key = kg.generateKey();
- byte[] encoded = key.getEncoded();
-- if (encoded.length != 48) {
-- throw new Exception("length: " + encoded.length);
-- }
-- if ((encoded[0] != major) || (encoded[1] != minor)) {
-- throw new Exception("version mismatch: " + encoded[0] +
-- "." + encoded[1]);
-- }
-- System.out.println("OK: " + major + "." + minor);
-+ if (encoded != null) { // raw key material may be not extractable
-+ if (encoded.length != 48) {
-+ throw new Exception("length: " + encoded.length);
-+ }
-+ int v = versionOf(encoded[0], encoded[1]);
-+ if (clientVersion != v) {
-+ if (serverVersion != v || clientVersion >= 0x0302) {
-+ throw new Exception(String.format(
-+ "version mismatch: (0x%04X) rather than (0x%04X) " +
-+ "is used in pre-master secret", v, clientVersion));
-+ }
-+ System.out.printf("Use compatible version (0x%04X)%n", v);
-+ }
-+ System.out.println("Passed, version matches!");
-+ } else {
-+ System.out.println("Raw key material is not extractable");
-+ }
-+ }
-+
-+ private static int versionOf(int major, int minor) {
-+ return ((major & 0xFF) << 8) | (minor & 0xFF);
- }
- }
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2013-09-06 11:29:18.000000000 -0700
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -56,7 +56,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- ;;
-
---- ./jdk/test/com/sun/jdi/JITDebug.sh 2013-09-06 11:29:18.000000000 -0700
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -63,7 +63,7 @@
- OS=`uname -s`
- export TRANSPORT_METHOD
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -123,7 +123,7 @@
- esac
- libloc=${jreloc}/lib/${libarch}
- ;;
-- Linux)
-+ Linux | *BSD)
- xx=`find ${jreloc}/lib -name libdt_socket.so`
- 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-10-28 20:19:52.000000000 -0700
-@@ -293,7 +293,7 @@
- psCmd=ps
- jstack=jstack.exe
- ;;
-- SunOS | Linux | Darwin)
-+ SunOS | Linux | *BSD | Darwin)
- transport=dt_socket
- 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-10-28 20:19:52.000000000 -0700
-@@ -112,7 +112,7 @@
- fi
- ;;
-
-- Linux | Darwin )
-+ Linux | *BSD | Darwin )
- pass "This test always passes on $OS"
- ;;
-
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -45,7 +45,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- ;;
- 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-10-28 20:19:52.000000000 -0700
-@@ -72,6 +72,16 @@
- done
- }
-
-+bsd_swap_size()
-+{
-+ total_swap=0
-+ for i in `/usr/sbin/swapinfo -k | awk '{print $2}' | grep -v blocks`
-+ do
-+ # swapinfo -k returns size in kilobytes.
-+ total_swap=`expr $i \* 1024 + $total_swap`
-+ done
-+}
-+
- # Test GetTotalSwapSpaceSize if we are running on Unix
- total_swap=0
- case `uname -s` in
-@@ -83,6 +93,9 @@
- total_swap=`free -b | grep -i swap | awk '{print $2}'`
- runOne GetTotalSwapSpaceSize $total_swap
- ;;
-+ *BSD )
-+ bsd_swap_size
-+ runOne GetTotalSwapSpaceSize $total_swap
- Darwin )
- # $ 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-10-28 20:19:52.000000000 -0700
-@@ -48,7 +48,7 @@
-
- # Test GetMaxFileDescriptorCount if we are running on Unix
- case `uname -s` in
-- SunOS | Linux )
-+ SunOS | Linux | *BSD | Darwin )
- runOne GetMaxFileDescriptorCount
- ;;
- * )
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -48,7 +48,7 @@
-
- # Test GetOpenFileDescriptorCount if we are running on Unix
- case `uname -s` in
-- SunOS | Linux )
-+ SunOS | Linux | *BSD | Darwin )
- runOne GetOpenFileDescriptorCount
- ;;
- * )
---- ./jdk/test/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,276 @@
-+/*
-+ * 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 8034181
-+ * @summary SIGBUS in SctpChannelImpl receive
-+ * @author chegar
-+ */
-+
-+import java.net.InetSocketAddress;
-+import java.net.SocketAddress;
-+import java.io.IOException;
-+import java.nio.ByteBuffer;
-+import com.sun.nio.sctp.AbstractNotificationHandler;
-+import com.sun.nio.sctp.AssociationChangeNotification;
-+import com.sun.nio.sctp.AssociationChangeNotification.AssocChangeEvent;
-+import com.sun.nio.sctp.HandlerResult;
-+import com.sun.nio.sctp.MessageInfo;
-+import com.sun.nio.sctp.Notification;
-+import com.sun.nio.sctp.PeerAddressChangeNotification;
-+import com.sun.nio.sctp.SctpChannel;
-+import com.sun.nio.sctp.SctpServerChannel;
-+import com.sun.nio.sctp.ShutdownNotification;
-+import static java.lang.System.out;
-+import static java.lang.System.err;
-+import static java.nio.charset.StandardCharsets.US_ASCII;
-+
-+public class ReceiveIntoDirect {
-+ /* suitably small message to NOT overrun small buffers */
-+ final byte[] msgBytes = "Hello".getBytes(US_ASCII);
-+
-+ /* number of client connections/combinations (accepted by the server) */
-+ final int NUM_CONNECTIONS = 75;
-+
-+ void test(String[] args) throws IOException {
-+ SocketAddress address = null;
-+ Server server;
-+
-+ if (!Util.isSCTPSupported()) {
-+ out.println("SCTP protocol is not supported");
-+ out.println("Test cannot be run");
-+ return;
-+ }
-+
-+ if (args.length == 2) {
-+ /* requested to connecct to a specific address */
-+ try {
-+ int port = Integer.valueOf(args[1]);
-+ address = new InetSocketAddress(args[0], port);
-+ } catch (NumberFormatException nfe) {
-+ err.println(nfe);
-+ }
-+ } else {
-+ /* start server on local machine, default */
-+ server = new Server();
-+ server.start();
-+ address = server.address();
-+ debug("Server started and listening on " + address);
-+ }
-+
-+ /* many combinations with varing buffer sizes, and offsets */
-+ runWithManyOffsets(address, 20);
-+ runWithManyOffsets(address, 49);
-+ runWithManyOffsets(address, 50);
-+ runWithManyOffsets(address, 51);
-+ runWithManyOffsets(address, 1024);
-+ }
-+
-+ void runWithManyOffsets(SocketAddress addr, int bufferSize)
-+ throws IOException
-+ {
-+ doTest(addr, bufferSize, 1);
-+ doTest(addr, bufferSize, 2);
-+ doTest(addr, bufferSize, 3);
-+ doTest(addr, bufferSize, 4);
-+ doTest(addr, bufferSize, 5);
-+ doTest(addr, bufferSize, 6);
-+ doTest(addr, bufferSize, 7);
-+ doTest(addr, bufferSize, 8);
-+ doTest(addr, bufferSize, 9);
-+ doTest(addr, bufferSize, 10);
-+ doTest(addr, bufferSize, 11);
-+ doTest(addr, bufferSize, 12);
-+ doTest(addr, bufferSize, 13);
-+ doTest(addr, bufferSize, 14);
-+ doTest(addr, bufferSize, 15);
-+ }
-+
-+ void doTest(SocketAddress peerAddress, int bufferSize, int bufferOffset)
-+ throws IOException
-+ {
-+ debug("\n\nTesting with bufferSize " + bufferSize + " and offset " + bufferOffset);
-+ assert bufferOffset + msgBytes.length <= bufferSize :
-+ "buffer offset + message length greater than buffer size ";
-+
-+ ByteBuffer buffer = ByteBuffer.allocateDirect(bufferSize);
-+ MessageInfo info;
-+
-+ try (SctpChannel channel = SctpChannel.open()) {
-+ channel.connect(peerAddress);
-+
-+ ReceiveNotificationHandler handler =
-+ new ReceiveNotificationHandler();
-+
-+ /* TEST 1: Assoc/peer change notif into direct buffer with offest */
-+ do {
-+ debug("Test 1: Assoc/peer change with offset " + bufferOffset);
-+ buffer.position(bufferOffset);
-+ info = channel.receive(buffer, null, handler);
-+ if (info == null) {
-+ fail("unexpected null from receive");
-+ return;
-+ }
-+ } while (!info.isComplete());
-+
-+ buffer.flip().position(bufferOffset);
-+ check(handler.receivedCommUp(), "SCTP_COMM_UP not received");
-+ check(info != null, "info is null");
-+ check(info.address() != null, "address is null");
-+ check(info.association() != null, "association is null");
-+ check(info.isComplete(), "message is not complete");
-+ check(info.isUnordered() != true,
-+ "message should not be unordered");
-+ check(info.streamNumber() >= 0, "invalid stream number");
-+ check(info.bytes() == msgBytes.length,
-+ "bytes received not equal to message length");
-+ check(info.bytes() == buffer.remaining(), "bytes != remaining");
-+ check(Util.compare(buffer, msgBytes),
-+ "received message not the same as sent message");
-+
-+ /* TEST 2: shutdown notification with offset */
-+ debug("Test 2: shutdown notif with offset " + bufferOffset);
-+ buffer.clear().position(bufferOffset);
-+ while ((info = channel.receive(buffer, null, handler )) != null &&
-+ info.bytes() != -1 );
-+ }
-+ }
-+
-+ class Server implements Runnable
-+ {
-+ private final InetSocketAddress serverAddr;
-+ private final SctpServerChannel ssc;
-+
-+ public Server() throws IOException {
-+ ssc = SctpServerChannel.open().bind(null);
-+ java.util.Set<SocketAddress> addrs = ssc.getAllLocalAddresses();
-+ if (addrs.isEmpty())
-+ debug("addrs should not be empty");
-+
-+ serverAddr = (InetSocketAddress) addrs.iterator().next();
-+ }
-+
-+ public void start() {
-+ (new Thread(this, "Server-" + serverAddr.getPort())).start();
-+ }
-+
-+ public InetSocketAddress address() {
-+ return serverAddr;
-+ }
-+
-+ @Override
-+ public void run() {
-+ try {
-+ for (int i=0; i<NUM_CONNECTIONS; i++) {
-+ SctpChannel sc = ssc.accept();
-+
-+ /* send a small message */
-+ MessageInfo info = MessageInfo.createOutgoing(null, 0);
-+ ByteBuffer buf = ByteBuffer.allocateDirect(Util.SMALL_BUFFER);
-+ buf.put(msgBytes);
-+ buf.flip();
-+
-+ debug("sending small message: " + buf);
-+ sc.send(buf, info);
-+
-+ sc.shutdown();
-+ sc.close();
-+ }
-+ } catch (IOException x) {
-+ unexpected(x);
-+ } finally {
-+ try { ssc.close(); }
-+ catch (IOException x) { unexpected(x); }
-+ }
-+ }
-+ }
-+
-+ class ReceiveNotificationHandler extends AbstractNotificationHandler<Object>
-+ {
-+ boolean receivedCommUp; // false
-+
-+ public ReceiveNotificationHandler() { }
-+
-+ public boolean receivedCommUp() {
-+ return receivedCommUp;
-+ }
-+
-+ @Override
-+ public HandlerResult handleNotification(
-+ Notification notification, Object attachment) {
-+ fail("Unknown notification type");
-+ return HandlerResult.CONTINUE;
-+ }
-+
-+ @Override
-+ public HandlerResult handleNotification(
-+ AssociationChangeNotification notification, Object attachment) {
-+ AssocChangeEvent event = notification.event();
-+ debug("AssociationChangeNotification");
-+ debug(" Association: " + notification.association());
-+ debug(" Event: " + event);
-+
-+ if (event.equals(AssocChangeEvent.COMM_UP))
-+ receivedCommUp = true;
-+
-+ return HandlerResult.CONTINUE;
-+ }
-+
-+ @Override
-+ public HandlerResult handleNotification(
-+ PeerAddressChangeNotification pacn, Object unused)
-+ {
-+ debug("PeerAddressChangeNotification: " + pacn);
-+ return HandlerResult.CONTINUE;
-+ }
-+
-+ @Override
-+ public HandlerResult handleNotification(
-+ ShutdownNotification notification, Object attachment) {
-+ debug("ShutdownNotification");
-+ debug(" Association: " + notification.association());
-+ return HandlerResult.CONTINUE;
-+ }
-+ }
-+ //--------------------- Infrastructure ---------------------------
-+ boolean debug = true;
-+ volatile int passed = 0, failed = 0;
-+ void pass() {passed++;}
-+ void fail() {failed++; Thread.dumpStack();}
-+ void fail(String msg) {System.err.println(msg); fail();}
-+ void unexpected(Throwable t) {failed++; t.printStackTrace();}
-+ void check(boolean cond) {if (cond) pass(); else fail();}
-+ void check(boolean cond, String failMessage) {if (cond) pass(); else fail(failMessage);}
-+ void debug(String message) {if(debug) {
-+ System.out.println(Thread.currentThread() + " " + message); } }
-+ public static void main(String[] args) throws Throwable {
-+ Class<?> k = new Object(){}.getClass().getEnclosingClass();
-+ try {k.getMethod("instanceMain",String[].class)
-+ .invoke( k.newInstance(), (Object) args);}
-+ catch (Throwable e) {throw e.getCause();}}
-+ public void instanceMain(String[] args) throws Throwable {
-+ try {test(args);} catch (Throwable t) {unexpected(t);}
-+ System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
-+ if (failed > 0) throw new AssertionError("Some tests failed");}
-+
-+}
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -36,7 +36,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java 2013-09-06 11:29:21.000000000 -0700
-+++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java 2014-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * 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
-@@ -24,5 +24,6 @@
- interface InterprocessMessages {
- final static int EXECUTION_IS_SUCCESSFULL = 0;
- final static int DATA_IS_CORRUPTED = 212;
-+ final static int NO_DROP_HAPPENED = 112;
- }
-
---- ./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-07-15 21:49:31.000000000 -0700
-@@ -1,18 +1,39 @@
- <html>
--<!--
--
-+<!--
-+ Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+
-+ This code is free software; you can redistribute it and/or modify it
-+ under the terms of the GNU General Public License version 2 only, as
-+ published by the Free Software Foundation.
-+
-+ 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 8005932
-+ @bug 8005932 8017456
- @summary Java 7 on mac os x only provides text clipboard formats
- @author mikhail.cherkasov@oracle.com
- @library ../../regtesthelpers
- @library ../../regtesthelpers/process
- @build Util
- @build ProcessResults ProcessCommunicator
--
--
- @run applet/othervm MissedHtmlAndRtfBug.html
--*/>
-+-->
-+
- <head>
- <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-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * 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
-@@ -22,17 +22,10 @@
- */
-
- /*
-- @test
-- @bug 8005932
-- @summary Java 7 on mac os x only provides text clipboard formats
-- @author mikhail.cherkasov@oracle.com
-- @library ../../regtesthelpers
-- @library ../../regtesthelpers/process
-- @build Util
-- @build ProcessResults ProcessCommunicator
--
--
-- @run applet/othervm MissedHtmlAndRtfBug.html
-+ This is a part of MissedHtmlAndRtfBug.html test. Do not add any JTREG tags here
-+ bug 8005932
-+ summary Java 7 on mac os x only provides text clipboard formats
-+ author mikhail.cherkasov@oracle.com
- */
- import java.awt.*;
- import java.awt.datatransfer.DataFlavor;
-@@ -49,6 +42,7 @@
- import static java.lang.Thread.sleep;
-
- public class MissedHtmlAndRtfBug extends Applet {
-+
- public void init() {
- setLayout(new BorderLayout());
- }//End init()
-@@ -84,9 +78,6 @@
- args.add(concatStrings(DataFlavorSearcher.RICH_TEXT_NAMES));
-
- ProcessResults processResults =
--// ProcessCommunicator.executeChildProcess(this.getClass(), "/Users/mcherkasov/ws/clipboard/DataFlover/out/production/DataFlover" +
--// " -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 ",
--// args.toArray(new String[0]));
- ProcessCommunicator.executeChildProcess(this.getClass(),
- "." + File.separator + System.getProperty("java.class.path"), args.toArray(new String[]{}));
-
-@@ -119,6 +110,13 @@
- throw new RuntimeException("TEST IS FAILED: Target has received" +
- " corrupted data.");
- }
-+ if (InterprocessMessages.NO_DROP_HAPPENED ==
-+ processResults.getExitValue()) {
-+ processResults.printProcessErrorOutput(System.err);
-+ throw new RuntimeException("Error. Drop did not happen." +
-+ " Target frame is possibly covered by a window of other application." +
-+ " Please, rerun the test with all windows minimized.");
-+ }
- processResults.verifyStdErr(System.err);
- processResults.verifyProcessExitValue(System.err);
- processResults.printProcessStandartOutput(System.out);
-@@ -186,7 +184,7 @@
- }
- }
-
-- public static void main(String[] args) {
-+ public static void main(String[] args) throws InterruptedException {
- Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extractInt(args),
- InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extractInt(args));
- Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extractInt(args),
-@@ -199,6 +197,8 @@
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-+ sleep(5000);
-+ System.exit(InterprocessMessages.NO_DROP_HAPPENED);
- }
-
-
---- ./jdk/test/java/awt/Focus/8013611/JDK8013611.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/Focus/8013611/JDK8013611.java 2014-07-15 21:54:46.000000000 -0700
-@@ -0,0 +1,111 @@
-+/*
-+ * 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 8013611
-+ @summary Tests showing a modal dialog with requesting focus in frame.
-+ @author Anton.Tarasov: area=awt.focus
-+ @library ../../regtesthelpers
-+ @build Util
-+ @run main JDK8013611
-+*/
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+import javax.swing.*;
-+import test.java.awt.regtesthelpers.Util;
-+
-+import java.awt.*;
-+
-+public class JDK8013611 extends JFrame {
-+ static JTextField textField = new JTextField("text");
-+ static JButton button1 = new JButton("button1");
-+ static JButton button2 = new JButton("button2");
-+ static Robot robot;
-+
-+ static JDialog dialog;
-+ static JButton button3 = new JButton("button3");
-+
-+ public static void main(String[] args) {
-+ robot = Util.createRobot();
-+
-+ JDK8013611 frame = new JDK8013611();
-+ frame.setLayout(new FlowLayout());
-+ frame.add(textField);
-+ frame.add(button1);
-+ frame.add(button2);
-+ frame.pack();
-+
-+ dialog = new JDialog(frame, true);
-+ dialog.add(button3);
-+ dialog.pack();
-+
-+ textField.addFocusListener(new FocusAdapter() {
-+ @Override
-+ public void focusLost(FocusEvent e) {
-+ dialog.setVisible(true);
-+ }
-+ });
-+
-+ button1.addFocusListener(new FocusAdapter() {
-+ @Override
-+ public void focusGained(FocusEvent e) {
-+ button2.requestFocusInWindow();
-+ }
-+ });
-+
-+ frame.setVisible(true);
-+
-+ frame.test();
-+ }
-+
-+ public void test() {
-+ if (!testFocused(textField)) {
-+ Util.clickOnComp(textField, robot);
-+ if (!testFocused(textField)) {
-+ throw new RuntimeException("Error: couldn't focus " + textField);
-+ }
-+ }
-+
-+ robot.keyPress(KeyEvent.VK_TAB);
-+ robot.delay(50);
-+ robot.keyRelease(KeyEvent.VK_TAB);
-+
-+ if (!testFocused(button3)) {
-+ throw new RuntimeException("Test failed: dialog didn't get focus!");
-+ }
-+
-+ System.out.println("Test passed.");
-+ }
-+
-+ boolean testFocused(Component c) {
-+ for (int i=0; i<10; i++) {
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() == c) {
-+ return true;
-+ }
-+ Util.waitForIdle(robot);
-+ }
-+ return false;
-+ }
-+}
---- ./jdk/test/java/awt/Focus/DialogTraversFocusBackTest/DialogTraversFocusBackTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/Focus/DialogTraversFocusBackTest/DialogTraversFocusBackTest.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,94 @@
-+/*
-+ * 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 8031075
-+ @summary Regression: focus disappears with shift+tab on dialogue having a focus component
-+ @author mcherkas
-+ @run main DialogTraversFocusBackTest
-+*/
-+
-+import sun.awt.SunToolkit;
-+
-+import javax.swing.*;
-+import java.awt.*;
-+import java.awt.event.KeyEvent;
-+
-+public class DialogTraversFocusBackTest {
-+
-+ private static Robot robot;
-+ private volatile static JButton button;
-+ private static Component currentFocusOwner;
-+
-+ public static void main(String[] args) throws Exception {
-+ initUI();
-+ sync();
-+ initRobot();
-+ runScript();
-+ sync();
-+ validate();
-+ }
-+
-+ public static void sync() {
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ toolkit.realSync();
-+ }
-+
-+ private static void validate() throws Exception {
-+ currentFocusOwner = FocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
-+ if(currentFocusOwner
-+ != button) {
-+ throw new Exception("Test failed! Wrong focus owner: " +
-+ String.valueOf(currentFocusOwner) + "\n but must be: " +
-+ button);
-+ }
-+ }
-+
-+ private static void runScript() {
-+ robot.keyPress(KeyEvent.VK_SHIFT);
-+ robot.keyPress(KeyEvent.VK_TAB);
-+ robot.keyRelease(KeyEvent.VK_TAB);
-+ robot.keyRelease(KeyEvent.VK_SHIFT);
-+
-+ }
-+
-+ private static void initRobot() throws AWTException {
-+ robot = new Robot();
-+ robot.setAutoDelay(100);
-+
-+ }
-+
-+ private static void initUI() throws Exception {
-+ SwingUtilities.invokeAndWait( new Runnable() {
-+ @Override
-+ public void run() {
-+ JDialog dialog = new JDialog((Frame)null, "Test Dialog");
-+ button = new JButton("Button 1");
-+ dialog.add(button);
-+ dialog.pack();
-+ dialog.setVisible(true);
-+ }
-+ });
-+
-+ }
-+}
---- ./jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,144 @@
-+/*
-+ * 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 4476629
-+ @library ../../../../javax/swing/regtesthelpers
-+ @build Util
-+ @summary KeyEvents dispatched to old focus owner that is no longer showing
-+ @author son@sparc.spb.su: area=awt.focus
-+ @run main KeyEventForBadFocusOwnerTest
-+*/
-+
-+/**
-+ * KeyEventForBadFocusOwnerTest.java
-+ *
-+ * summary: KeyEvents dispatched to old focus owner that is no longer showing
-+ */
-+
-+
-+import java.awt.Robot;
-+import java.awt.Toolkit;
-+
-+import java.awt.event.*;
-+
-+import javax.swing.*;
-+import javax.swing.event.*;
-+import sun.awt.SunToolkit;
-+
-+public class KeyEventForBadFocusOwnerTest {
-+ final static String ITEM_ONE_TEXT = "one";
-+ final static String ITEM_TWO_TEXT = "two";
-+
-+ volatile static boolean itemOneSelected = false;
-+ volatile static boolean itemTwoSelected = false;
-+ volatile static boolean unexpectedItemSelected = false;
-+
-+ static Robot robot;
-+ static SunToolkit toolkit;
-+
-+ public static void main(String[] args) throws Exception {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ JFrame frame = new JFrame("TEST");
-+ JMenuBar mb = new JMenuBar();
-+ JMenu one = new JMenu(ITEM_ONE_TEXT);
-+ JMenu two = new JMenu(ITEM_TWO_TEXT);
-+
-+ mb.add(one);
-+ mb.add(two);
-+
-+ ActionListener al = new ActionListener() {
-+ public void actionPerformed(ActionEvent ae) {
-+ String itemText = ((JMenuItem)ae.getSource()).getText();
-+ System.out.println("--> " + itemText);
-+ unexpectedItemSelected = true;
-+ }
-+ };
-+ one.setMnemonic(KeyEvent.VK_O);
-+ JMenuItem item = new JMenuItem("one 1");
-+ item.setMnemonic(KeyEvent.VK_O);
-+ item.addActionListener(al);
-+ one.add(item);
-+ one.add("two");
-+ one.add("three");
-+
-+ two.setMnemonic(KeyEvent.VK_T);
-+ item = new JMenuItem("two 2");
-+ item.setMnemonic(KeyEvent.VK_T);
-+ item.addActionListener(al);
-+ two.add(item);
-+ two.add("three");
-+ two.add("four");
-+
-+ PopupMenuListener popupMenuListener = new PopupMenuListener() {
-+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-+ System.out.print(e);
-+ System.out.print(e.getSource());
-+ String itemText = ((JPopupMenu)e.getSource()).getName();
-+ System.out.println("Menu " + itemText + "is opened.");
-+ switch(itemText) {
-+ case ITEM_ONE_TEXT:
-+ itemOneSelected = true;
-+ break;
-+ case ITEM_TWO_TEXT:
-+ itemTwoSelected = true;
-+ break;
-+ }
-+ }
-+
-+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
-+ public void popupMenuCanceled(PopupMenuEvent e) {}
-+ };
-+ one.getPopupMenu().setName(ITEM_ONE_TEXT);
-+ two.getPopupMenu().setName(ITEM_TWO_TEXT);
-+ one.getPopupMenu().addPopupMenuListener(popupMenuListener);
-+ two.getPopupMenu().addPopupMenuListener(popupMenuListener);
-+ frame.setJMenuBar(mb);
-+ frame.setSize(100,100);
-+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+ frame.pack();
-+ frame.setVisible(true);
-+ }
-+ });
-+
-+ toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ toolkit.realSync();
-+
-+ robot = new Robot();
-+ robot.setAutoDelay(100);
-+
-+ Util.hitMnemonics(robot, KeyEvent.VK_O);
-+ Util.hitMnemonics(robot, KeyEvent.VK_T);
-+
-+ toolkit.realSync();
-+ Thread.sleep(1000); // workaround for MacOS
-+
-+ if (unexpectedItemSelected) {
-+ throw new Exception("Test failed. KeyEvent dispatched to old focus owner. ");
-+ }
-+ if (!itemOneSelected || !itemTwoSelected) {
-+ throw new Exception("Not all expected events were received");
-+ }
-+ }
-+}
---- ./jdk/test/java/awt/Frame/7024749/bug7024749.java 2013-09-06 11:29:22.000000000 -0700
-+++ ./jdk/test/java/awt/Frame/7024749/bug7024749.java 2014-07-15 21:54:44.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 7024749 7184326
-+ * @bug 7024749 7184326 8019990
- * @summary JDK7 b131---a crash in: Java_sun_awt_windows_ThemeReader_isGetThemeTransitionDurationDefined+0x75
- * @library ../../regtesthelpers
- * @build Util
---- ./jdk/test/java/awt/Frame/DefaultUnixIcon/TestUnixDefaultIcon.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/Frame/DefaultUnixIcon/TestUnixDefaultIcon.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,448 @@
-+/*
-+ * 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 4934843
-+@summary Tests that Frame/Dialog have java-cup icon on Unix
-+@author dom@sparc.spb.su: area=awt.toplevel
-+@run main/manual TestUnixDefaultIcon
-+*/
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+import java.awt.image.*;
-+import javax.imageio.ImageIO;
-+import java.lang.reflect.*;
-+import java.io.*;
-+import java.awt.color.*;
-+
-+public class TestUnixDefaultIcon
-+{
-+ private static void init()
-+ {
-+ //*** Create instructions for the user here ***
-+ boolean isWindows = Toolkit.getDefaultToolkit().getClass().getName().equals("sun.awt.windows.WToolkit");
-+
-+ String[] instructions;
-+ if (isWindows){
-+ instructions = new String[]{"This test is for linux only. Passed automatically."};
-+ } else {
-+ instructions = new String[]{
-+ "This test verifies that Frame and Dialog on Unix have Java-cup",
-+ "icon by default as their icon. For your convenience, the example ",
-+ "of such icons of different sizes are displayed inside of the frame",
-+ "Press Pass if it is so, Fail otherwise."
-+ };
-+ }
-+ Sysout.createDialog( );
-+ Sysout.printInstructions( instructions );
-+
-+ if (isWindows){
-+ pass();
-+ return;
-+ }
-+
-+ Frame frame = new Frame("frame");
-+ frame.setLayout(new FlowLayout());
-+ frame.add(new IconCanvas(16, getImage("16")));
-+ frame.add(new IconCanvas(24, getImage("24")));
-+ frame.add(new IconCanvas(32, getImage("32")));
-+ frame.add(new IconCanvas(48, getImage("48")));
-+ frame.setBounds(0, 500, 200, 100);
-+ frame.setVisible(true);
-+
-+ Dialog d = new Dialog(frame, "Dialog", false);
-+ d.setBounds(200, 500, 200, 100);
-+ d.setVisible(true);
-+
-+ }//End init()
-+
-+ private static BufferedImage createImage(int[] bits) {
-+ ColorModel cm =
-+ new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), 32,
-+ 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000,
-+ false, DataBuffer.TYPE_INT);
-+ DataBuffer buffer = new DataBufferInt(bits, bits.length-2, 2);
-+ WritableRaster raster =
-+ Raster.createPackedRaster(buffer, bits[0], bits[1],
-+ bits[0],
-+ new int[] {0x00ff0000, 0x0000ff00,
-+ 0x000000ff, 0xff000000},
-+ null);
-+ BufferedImage im = new BufferedImage(cm, raster, false, null);
-+ return im;
-+ }
-+ private static Image getImage(String name) {
-+ try {
-+ Class cl = Class.forName("sun.awt.AWTIcon32_java_icon" + name + "_png");
-+ Field f = cl.getField("java_icon" + name + "_png");
-+ int[] ints = (int[])f.get(cl);
-+
-+ return createImage(ints);
-+ } catch (ClassNotFoundException | IllegalAccessException | NoSuchFieldException e) {
-+ throw new RuntimeException(e);
-+ }
-+ }
-+
-+ static class IconCanvas extends Canvas {
-+ private Image im;
-+ private int s;
-+ public IconCanvas(int s, Image im) {
-+ this.im = im;
-+ this.s = s;
-+ }
-+
-+ public Dimension getPreferredSize() {
-+ return new Dimension(s, s);
-+ }
-+
-+ public void paint(Graphics g) {
-+ if (im != null) {
-+ g.drawImage(im, 0, 0, this);
-+ }
-+ }
-+ }
-+
-+ /*****************************************************
-+ * Standard Test Machinery Section
-+ * DO NOT modify anything in this section -- it's a
-+ * standard chunk of code which has all of the
-+ * synchronisation necessary for the test harness.
-+ * By keeping it the same in all tests, it is easier
-+ * to read and understand someone else's test, as
-+ * well as insuring that all tests behave correctly
-+ * with the test harness.
-+ * There is a section following this for test-defined
-+ * classes
-+ ******************************************************/
-+ private static boolean theTestPassed = false;
-+ private static boolean testGeneratedInterrupt = false;
-+ private static String failureMessage = "";
-+
-+ private static Thread mainThread = null;
-+
-+ private static int sleepTime = 300000;
-+
-+ public static void main( String args[] ) throws InterruptedException
-+ {
-+ mainThread = Thread.currentThread();
-+ try
-+ {
-+ init();
-+ }
-+ catch( TestPassedException e )
-+ {
-+ //The test passed, so just return from main and harness will
-+ // interepret this return as a pass
-+ return;
-+ }
-+ //At this point, neither test passed nor test failed has been
-+ // called -- either would have thrown an exception and ended the
-+ // test, so we know we have multiple threads.
-+
-+ //Test involves other threads, so sleep and wait for them to
-+ // called pass() or fail()
-+ try
-+ {
-+ Thread.sleep( sleepTime );
-+ //Timed out, so fail the test
-+ throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
-+ }
-+ catch (InterruptedException e)
-+ {
-+ if( ! testGeneratedInterrupt ) throw e;
-+
-+ //reset flag in case hit this code more than once for some reason (just safety)
-+ testGeneratedInterrupt = false;
-+ if ( theTestPassed == false )
-+ {
-+ throw new RuntimeException( failureMessage );
-+ }
-+ }
-+
-+ }//main
-+
-+ public static synchronized void setTimeoutTo( int seconds )
-+ {
-+ sleepTime = seconds * 1000;
-+ }
-+
-+ public static synchronized void pass()
-+ {
-+ Sysout.println( "The test passed." );
-+ Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
-+ //first check if this is executing in main thread
-+ if ( mainThread == Thread.currentThread() )
-+ {
-+ //Still in the main thread, so set the flag just for kicks,
-+ // and throw a test passed exception which will be caught
-+ // and end the test.
-+ theTestPassed = true;
-+ throw new TestPassedException();
-+ }
-+ //pass was called from a different thread, so set the flag and interrupt
-+ // the main thead.
-+ theTestPassed = true;
-+ testGeneratedInterrupt = true;
-+ mainThread.interrupt();
-+ }//pass()
-+
-+ public static synchronized void fail()
-+ {
-+ //test writer didn't specify why test failed, so give generic
-+ fail( "it just plain failed! :-)" );
-+ }
-+
-+ public static synchronized void fail( String whyFailed )
-+ {
-+ Sysout.println( "The test failed: " + whyFailed );
-+ Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
-+ //check if this called from main thread
-+ if ( mainThread == Thread.currentThread() )
-+ {
-+ //If main thread, fail now 'cause not sleeping
-+ throw new RuntimeException( whyFailed );
-+ }
-+ theTestPassed = false;
-+ testGeneratedInterrupt = true;
-+ failureMessage = whyFailed;
-+ mainThread.interrupt();
-+ }//fail()
-+
-+}// class TestUnixDefaultIcon
-+
-+//This exception is used to exit from any level of call nesting
-+// when it's determined that the test has passed, and immediately
-+// end the test.
-+class TestPassedException extends RuntimeException
-+{
-+}
-+
-+//*********** End Standard Test Machinery Section **********
-+
-+
-+//************ Begin classes defined for the test ****************
-+
-+// make listeners in a class defined here, and instantiate them in init()
-+
-+/* Example of a class which may be written as part of a test
-+class NewClass implements anInterface
-+ {
-+ static int newVar = 0;
-+
-+ public void eventDispatched(AWTEvent e)
-+ {
-+ //Counting events to see if we get enough
-+ eventCount++;
-+
-+ if( eventCount == 20 )
-+ {
-+ //got enough events, so pass
-+
-+ TestUnixDefaultIcon.pass();
-+ }
-+ else if( tries == 20 )
-+ {
-+ //tried too many times without getting enough events so fail
-+
-+ TestUnixDefaultIcon.fail();
-+ }
-+
-+ }// eventDispatched()
-+
-+ }// NewClass class
-+
-+*/
-+
-+
-+//************** End classes defined for the test *******************
-+
-+
-+
-+
-+/****************************************************
-+ Standard Test Machinery
-+ DO NOT modify anything below -- it's a standard
-+ chunk of code whose purpose is to make user
-+ interaction uniform, and thereby make it simpler
-+ to read and understand someone else's test.
-+ ****************************************************/
-+
-+/**
-+ This is part of the standard test machinery.
-+ It creates a dialog (with the instructions), and is the interface
-+ for sending text messages to the user.
-+ To print the instructions, send an array of strings to Sysout.createDialog
-+ WithInstructions method. Put one line of instructions per array entry.
-+ To display a message for the tester to see, simply call Sysout.println
-+ with the string to be displayed.
-+ This mimics System.out.println but works within the test harness as well
-+ as standalone.
-+ */
-+
-+class Sysout
-+{
-+ private static TestDialog dialog;
-+
-+ public static void createDialogWithInstructions( String[] instructions )
-+ {
-+ dialog = new TestDialog( new Frame(), "Instructions" );
-+ dialog.printInstructions( instructions );
-+ dialog.setVisible(true);
-+ println( "Any messages for the tester will display here." );
-+ }
-+
-+ public static void createDialog( )
-+ {
-+ dialog = new TestDialog( new Frame(), "Instructions" );
-+ String[] defInstr = { "Instructions will appear here. ", "" } ;
-+ dialog.printInstructions( defInstr );
-+ dialog.setVisible(true);
-+ println( "Any messages for the tester will display here." );
-+ }
-+
-+
-+ public static void printInstructions( String[] instructions )
-+ {
-+ dialog.printInstructions( instructions );
-+ }
-+
-+
-+ public static void println( String messageIn )
-+ {
-+ dialog.displayMessage( messageIn );
-+ }
-+
-+}// Sysout class
-+
-+/**
-+ This is part of the standard test machinery. It provides a place for the
-+ test instructions to be displayed, and a place for interactive messages
-+ to the user to be displayed.
-+ To have the test instructions displayed, see Sysout.
-+ To have a message to the user be displayed, see Sysout.
-+ Do not call anything in this dialog directly.
-+ */
-+class TestDialog extends Dialog implements ActionListener
-+{
-+
-+ TextArea instructionsText;
-+ TextArea messageText;
-+ int maxStringLength = 80;
-+ Panel buttonP = new Panel();
-+ Button passB = new Button( "pass" );
-+ Button failB = new Button( "fail" );
-+
-+ //DO NOT call this directly, go through Sysout
-+ public TestDialog( Frame frame, String name )
-+ {
-+ super( frame, name );
-+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
-+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
-+ add( "North", instructionsText );
-+
-+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
-+ add("Center", messageText);
-+
-+ passB = new Button( "pass" );
-+ passB.setActionCommand( "pass" );
-+ passB.addActionListener( this );
-+ buttonP.add( "East", passB );
-+
-+ failB = new Button( "fail" );
-+ failB.setActionCommand( "fail" );
-+ failB.addActionListener( this );
-+ buttonP.add( "West", failB );
-+
-+ add( "South", buttonP );
-+ pack();
-+
-+ setVisible(true);
-+ }// TestDialog()
-+
-+ //DO NOT call this directly, go through Sysout
-+ public void printInstructions( String[] instructions )
-+ {
-+ //Clear out any current instructions
-+ instructionsText.setText( "" );
-+
-+ //Go down array of instruction strings
-+
-+ String printStr, remainingStr;
-+ for( int i=0; i < instructions.length; i++ )
-+ {
-+ //chop up each into pieces maxSringLength long
-+ remainingStr = instructions[ i ];
-+ while( remainingStr.length() > 0 )
-+ {
-+ //if longer than max then chop off first max chars to print
-+ if( remainingStr.length() >= maxStringLength )
-+ {
-+ //Try to chop on a word boundary
-+ int posOfSpace = remainingStr.
-+ lastIndexOf( ' ', maxStringLength - 1 );
-+
-+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-+
-+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
-+ remainingStr = remainingStr.substring( posOfSpace + 1 );
-+ }
-+ //else just print
-+ else
-+ {
-+ printStr = remainingStr;
-+ remainingStr = "";
-+ }
-+
-+ instructionsText.append( printStr + "\n" );
-+
-+ }// while
-+
-+ }// for
-+
-+ }//printInstructions()
-+
-+ //DO NOT call this directly, go through Sysout
-+ public void displayMessage( String messageIn )
-+ {
-+ messageText.append( messageIn + "\n" );
-+ System.out.println(messageIn);
-+ }
-+
-+ //catch presses of the passed and failed buttons.
-+ //simply call the standard pass() or fail() static methods of
-+ //TestUnixDefaultIcon
-+ public void actionPerformed( ActionEvent e )
-+ {
-+ if( e.getActionCommand() == "pass" )
-+ {
-+ TestUnixDefaultIcon.pass();
-+ }
-+ else
-+ {
-+ TestUnixDefaultIcon.fail();
-+ }
-+ }
-+
-+}// TestDialog class
---- ./jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,104 @@
-+/*
-+ * 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 8032078
-+ @summary Frame.setExtendedState throws RuntimeException, if
-+ windowState=ICONIFIED|MAXIMIZED_BOTH, on OS X
-+ @author Anton Litvinov
-+*/
-+
-+import java.awt.*;
-+
-+import sun.awt.SunToolkit;
-+
-+public class ExceptionOnSetExtendedStateTest {
-+ private static final int[] frameStates = { Frame.NORMAL, Frame.ICONIFIED, Frame.MAXIMIZED_BOTH };
-+ private static final SunToolkit toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
-+
-+ private static boolean validatePlatform() {
-+ String osName = System.getProperty("os.name");
-+ if (osName == null) {
-+ throw new RuntimeException("Name of the current OS could not be retrieved.");
-+ }
-+ return osName.startsWith("Mac");
-+ }
-+
-+ private static void testStateChange(int oldState, int newState, boolean decoratedFrame) {
-+ System.out.println(String.format(
-+ "testStateChange: oldState='%d', newState='%d', decoratedFrame='%b'",
-+ oldState, newState, decoratedFrame));
-+
-+ Frame frame = new Frame("ExceptionOnSetExtendedStateTest");
-+ frame.setSize(200, 200);
-+ frame.setUndecorated(!decoratedFrame);
-+ frame.setVisible(true);
-+ toolkit.realSync();
-+
-+ frame.setExtendedState(oldState);
-+ sleep(1000);
-+ frame.setExtendedState(newState);
-+
-+ boolean stateWasNotChanged = true;
-+ int currentState = 0;
-+ for (int i = 0; (i < 3) && stateWasNotChanged; i++) {
-+ sleep(1000);
-+ currentState = frame.getExtendedState();
-+ if ((currentState == newState) ||
-+ (((newState & Frame.ICONIFIED) != 0) && ((currentState & Frame.ICONIFIED) != 0))) {
-+ stateWasNotChanged = false;
-+ }
-+ }
-+ frame.dispose();
-+
-+ if (stateWasNotChanged) {
-+ throw new RuntimeException(String.format(
-+ "Frame state was not changed. currentState='%d'", currentState));
-+ }
-+ }
-+
-+ private static void sleep(int millis) {
-+ try {
-+ Thread.sleep(millis);
-+ } catch (Exception e) {
-+ e.printStackTrace();
-+ }
-+ }
-+
-+ public static void main(String[] args) {
-+ if (!validatePlatform()) {
-+ System.out.println("This test is only for OS X.");
-+ return;
-+ }
-+
-+ // Verify that changing states of decorated/undecorated frame to/from supported states
-+ // and the state bit mask ICONIFIED | MAXIMIZED_BOTH does not raise RuntimeException.
-+ for (int i = 0; i < frameStates.length; i++) {
-+ testStateChange(frameStates[i], Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, true);
-+ testStateChange(frameStates[i], Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, false);
-+ testStateChange(Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, frameStates[i], true);
-+ // Uncomment the line below, when 8026143 is ported to JDK 7.
-+ //testStateChange(Frame.ICONIFIED | Frame.MAXIMIZED_BOTH, frameStates[i], false);
-+ }
-+ }
-+}
---- ./jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java 2013-09-06 11:29:22.000000000 -0700
-+++ ./jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java 2014-07-15 21:49:31.000000000 -0700
-@@ -42,6 +42,7 @@
- GraphicsDevice gd = ge.getDefaultScreenDevice();
-
- Frame f = new Frame("Test frame");
-+ f.setUndecorated(true);
- f.setBounds(100, 100, 320, 240);
-
- // First, check it can be made fullscreen window without any effects applied
---- ./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-07-15 21:49:31.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-07-15 21:49:31.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/JAWT/JAWT.sh 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/JAWT/JAWT.sh 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,173 @@
-+#!/bin/sh
-+
-+# 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.
-+
-+# @test JAWT.sh
-+# @bug 7190587
-+# @summary Tests Java AWT native interface library
-+# @author kshefov
-+# @run shell JAWT.sh
-+
-+# NB: To run on Windows with MKS and Visual Studio compiler
-+# add the following options to jtreg: -e INCLUDE="%INCLUDE%;." -e LIB="%LIB%;."
-+
-+if [ "${TESTSRC}" = "" ]
-+then TESTSRC=.
-+fi
-+
-+if [ "${TESTJAVA}" = "" ]
-+then
-+ PARENT=`dirname \`which java\``
-+ TESTJAVA=`dirname ${PARENT}`
-+ echo "TESTJAVA not set, selecting " ${TESTJAVA}
-+ echo "If this is incorrect, try setting the variable manually."
-+fi
-+
-+# set platform-dependent variables
-+OS=`uname -s`
-+case "$OS" in
-+ Linux )
-+ NULL=/dev/null
-+ PS=":"
-+ FS="/"
-+ ${TESTJAVA}${FS}bin${FS}java -version 2>&1 | grep '64-Bit' > $NULL
-+ if [ $? -eq '0' ]
-+ then
-+ ARCH="amd64"
-+ else
-+ ARCH="i386"
-+ fi
-+ SYST="linux"
-+ MAKEFILE="Makefile.unix"
-+ CC="gcc"
-+ MAKE="make"
-+ LD_LIBRARY_PATH=".":${TESTJAVA}${FS}jre${FS}lib${FS}${ARCH}
-+ ;;
-+ SunOS )
-+ NULL=/dev/null
-+ PS=":"
-+ FS="/"
-+ if [ `uname -p | grep -c 'sparc'` -gt '0' ]
-+ then
-+ ARCH="sparc"
-+ else
-+ ARCH="i386"
-+ fi
-+ SYST="solaris"
-+ MAKEFILE="Makefile.unix"
-+ CC="gcc"
-+ MAKE="make"
-+ LD_LIBRARY_PATH=".":${TESTJAVA}${FS}jre${FS}lib${FS}${ARCH}
-+ ;;
-+ Windows* )
-+ NULL=null
-+ PS=";"
-+ FS="\\"
-+ MAKEFILE="Makefile.win"
-+ CC="cl"
-+ MAKE="nmake"
-+ ${TESTJAVA}${FS}bin${FS}java -d64 -version 2>&1 | grep '64-Bit' > $NULL
-+ if [ "$?" -eq '0' ]
-+ then
-+ ARCH="amd64"
-+ else
-+ ARCH="i386"
-+ fi
-+ SYST="windows"
-+ ;;
-+ CYGWIN* )
-+ NULL=/dev/null
-+ PS=":"
-+ FS="/"
-+ MAKEFILE="Makefile.cygwin"
-+ CC="gcc"
-+ ${TESTJAVA}${FS}bin${FS}java -d64 -version 2>&1 | grep '64-Bit' > $NULL
-+ if [ "$?" -eq '0' ]
-+ then
-+ ARCH="amd64"
-+ else
-+ ARCH="i386"
-+ fi
-+ SYST="cygwin"
-+ MAKE="make"
-+ ;;
-+ Darwin )
-+ echo "Test passed. This test is not for MacOS."
-+ exit 0;
-+ ;;
-+ * )
-+ echo "Unrecognized system!"
-+ exit 1;
-+ ;;
-+esac
-+
-+# Skip unsupported platforms
-+case `uname -m` in
-+ arm* | ppc* )
-+ echo "Test passed. Not supported on current architecture."
-+ exit 0
-+ ;;
-+esac
-+
-+echo "OS-ARCH is" ${SYST}-${ARCH}
-+${TESTJAVA}${FS}jre${FS}bin${FS}java -fullversion 2>&1
-+
-+which ${MAKE} >${NULL} 2>&1
-+if [ "$?" -ne '0' ]
-+then
-+ echo "No make found. Test passed."
-+ exit 0
-+fi
-+
-+which ${CC} >${NULL} 2>&1
-+if [ "$?" -ne '0' ]
-+then
-+ echo "No C compiler found. Test passed."
-+ exit 0
-+fi
-+case "$OS" in
-+ SunOS )
-+ ${CC} -v >${NULL} 2>&1
-+ if [ "$?" -ne '0' ]
-+ then
-+ echo "No C compiler found. Test passed."
-+ exit 0
-+ fi
-+esac
-+
-+cp ${TESTSRC}${FS}${MAKEFILE} .
-+
-+JAVA=${TESTJAVA}${FS}jre${FS}bin${FS}java
-+JAVAC=${TESTJAVA}${FS}bin${FS}javac
-+JAVAH=${TESTJAVA}${FS}bin${FS}javah
-+
-+export CC SYST ARCH LD_LIBRARY_PATH
-+
-+${JAVAC} -d . ${TESTSRC}${FS}MyCanvas.java
-+${JAVAH} -jni -classpath . -d . MyCanvas
-+${MAKE} -f ${MAKEFILE}
-+${JAVA} -classpath . MyCanvas
-+
-+exit $?
-+
---- ./jdk/test/java/awt/JAWT/Makefile.cygwin 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/JAWT/Makefile.cygwin 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,49 @@
-+# 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.
-+
-+CFLAGS =
-+OBJS = myfile.o
-+HEADERS = MyCanvas.h
-+CLASSES = MyCanvas.class
-+
-+JAVA = $(TESTJAVA)/bin/java -classpath .
-+JAVAC = $(TESTJAVA)/bin/javac
-+JAVAH = $(TESTJAVA)/bin/javah
-+DEL = rm -rf
-+LINK = $(CC)
-+
-+INCLUDES = -I $(TESTJAVA)/include/win32 -I $(TESTJAVA)/include -I .
-+
-+LIBS = $(TESTJAVA)/lib/jawt.lib -lgdi32
-+
-+all: $(CLASSES) mylib.dll
-+
-+mylib.dll: $(HEADERS) $(OBJS)
-+ $(LINK) -shared -o mylib.dll $(OBJS) $(LIBS)
-+
-+myfile.o:
-+ $(CC) $(CFLAGS) $(INCLUDES) -c $(TESTSRC)/myfile.cpp
-+
-+clean:
-+ $(DEL) mylib.* *.h *.class *.o
-+
---- ./jdk/test/java/awt/JAWT/Makefile.unix 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/JAWT/Makefile.unix 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,48 @@
-+# 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.
-+
-+CFLAGS = -fPIC -O
-+OBJS = myfile.o
-+HEADERS = MyCanvas.h
-+CLASSES = MyCanvas.class
-+
-+ENV = /usr/bin/env
-+JAVA = $(TESTJAVA)/bin/java -classpath .
-+JAVAC = $(TESTJAVA)/bin/javac
-+JAVAH = $(TESTJAVA)/bin/javah
-+LINK = ld
-+
-+J_INC = $(TESTJAVA)/include
-+INCLUDES = -I$(J_INC) -I$(J_INC)/$(SYST) -I.
-+LIBS = -L$(TESTJAVA)/jre/lib/$(ARCH) -ljawt -lX11
-+
-+all: $(CLASSES) libmylib.so
-+
-+libmylib.so: $(HEADERS) $(OBJS)
-+ $(LINK) -G -o libmylib.so $(OBJS) $(LIBS)
-+
-+myfile.o: $(TESTSRC)/myfile.c
-+ $(CC) $(CFLAGS) $(INCLUDES) -c $(TESTSRC)/myfile.c
-+
-+clean:
-+ rm -rf libmylib.so $(HEADERS) $(CLASSES) $(OBJS)
---- ./jdk/test/java/awt/JAWT/Makefile.win 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/JAWT/Makefile.win 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,47 @@
-+# 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.
-+
-+CFLAGS = -nologo
-+OBJS = myfile.obj
-+HEADERS = MyCanvas.h
-+CLASSES = MyCanvas.class
-+
-+DEL = del /Q
-+LINK = link
-+
-+INCLUDES = -I$(TESTJAVA)\include\win32 -I$(TESTJAVA)\include
-+
-+LIBS = gdi32.lib user32.lib $(TESTJAVA)\lib\jawt.lib
-+
-+all: $(CLASSES) mylib.dll
-+
-+mylib.dll: $(HEADERS) $(OBJS)
-+ $(LINK) -nologo -dll -out:mylib.dll $(OBJS) $(LIBS)
-+
-+myfile.obj: $(TESTSRC)\myfile.cpp
-+ $(CC) $(CFLAGS) $(INCLUDES) -c $(TESTSRC)\myfile.cpp
-+
-+clean:
-+ $(DEL) mylib.*
-+ $(DEL) $(HEADERS) $(CLASSES)
-+ $(DEL) *.obj
---- ./jdk/test/java/awt/JAWT/MyCanvas.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/JAWT/MyCanvas.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,72 @@
-+/**
-+ * 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.
-+ */
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+
-+public class MyCanvas extends Canvas {
-+
-+ static {
-+ try {
-+ System.loadLibrary("mylib");
-+ } catch (Throwable t) {
-+ System.out.println("Test failed!!");
-+ t.printStackTrace();
-+ System.exit(1);
-+ }
-+ }
-+
-+ public native void paint(Graphics g);
-+
-+ public static void main(String[] args) {
-+ try {
-+ Robot robot = new Robot();
-+ Frame f = new Frame();
-+ f.setBounds(0, 0, 100, 100);
-+ f.add(new MyCanvas());
-+ f.addWindowListener(new WindowAdapter() {
-+ public void windowClosing(WindowEvent ev) {
-+ System.exit(0);
-+ }
-+ });
-+ f.setVisible(true);
-+ robot.delay(5000);
-+ Color col1 = new Color(0, 0, 0);
-+ Color col2 = robot.getPixelColor(f.getX()+50, f.getY()+50);
-+ if (col1.equals(col2)) {
-+ System.out.println("Test passed!");
-+ } else {
-+ throw new RuntimeException("Color of JAWT canvas is wrong or " +
-+ "it was not rendered. " + "Check that other windows " +
-+ "do not block the test frame.");
-+ }
-+ System.exit(0);
-+ } catch (Throwable t) {
-+ System.out.println("Test failed!");
-+ t.printStackTrace();
-+ System.exit(1);
-+ }
-+ }
-+}
---- ./jdk/test/java/awt/JAWT/myfile.c 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/JAWT/myfile.c 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,106 @@
-+/*
-+ * 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 "MyCanvas.h"
-+#include "jawt_md.h"
-+
-+/*
-+ * Class: MyCanvas
-+ * Method: paint
-+ * Signature: (Ljava/awt/Graphics;)V
-+ */
-+JNIEXPORT void JNICALL Java_MyCanvas_paint
-+(JNIEnv* env, jobject canvas, jobject graphics)
-+{
-+ JAWT awt;
-+ JAWT_DrawingSurface* ds;
-+ JAWT_DrawingSurfaceInfo* dsi;
-+ JAWT_X11DrawingSurfaceInfo* dsi_x11;
-+ jboolean result;
-+ jint lock;
-+ GC gc;
-+ jobject ref;
-+
-+ /* Get the AWT */
-+ awt.version = JAWT_VERSION_1_4;
-+ if (JAWT_GetAWT(env, &awt) == JNI_FALSE) {
-+ printf("AWT Not found\n");
-+ return;
-+ }
-+
-+ /* Lock the AWT */
-+ awt.Lock(env);
-+
-+ /* Unlock the AWT */
-+ awt.Unlock(env);
-+
-+ /* Get the drawing surface */
-+ ds = awt.GetDrawingSurface(env, canvas);
-+ if (ds == NULL) {
-+ printf("NULL drawing surface\n");
-+ return;
-+ }
-+
-+ /* Lock the drawing surface */
-+ lock = ds->Lock(ds);
-+ printf("Lock value %d\n", (int)lock);
-+ if((lock & JAWT_LOCK_ERROR) != 0) {
-+ printf("Error locking surface\n");
-+ awt.FreeDrawingSurface(ds);
-+ return;
-+ }
-+
-+ /* Get the drawing surface info */
-+ dsi = ds->GetDrawingSurfaceInfo(ds);
-+ if (dsi == NULL) {
-+ printf("Error getting surface info\n");
-+ ds->Unlock(ds);
-+ awt.FreeDrawingSurface(ds);
-+ return;
-+ }
-+
-+ /* Get the platform-specific drawing info */
-+ dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo;
-+
-+ /* Now paint */
-+ gc = XCreateGC(dsi_x11->display, dsi_x11->drawable, 0, 0);
-+ XSetForeground(dsi_x11->display, gc, 0);
-+ XFillRectangle(dsi_x11->display, dsi_x11->drawable, gc,
-+ 5, 5, 90, 90);
-+ XFreeGC(dsi_x11->display, gc);
-+ ref = awt.GetComponent(env, (void*)(dsi_x11->drawable));
-+ if (!(*env)->IsSameObject(env, ref, canvas)) {
-+ printf("Error! Different objects!\n");
-+ }
-+
-+ /* Free the drawing surface info */
-+ ds->FreeDrawingSurfaceInfo(dsi);
-+
-+ /* Unlock the drawing surface */
-+ ds->Unlock(ds);
-+
-+ /* Free the drawing surface */
-+ awt.FreeDrawingSurface(ds);
-+}
---- ./jdk/test/java/awt/JAWT/myfile.cpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/JAWT/myfile.cpp 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,110 @@
-+/*
-+ * 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 <windows.h>
-+#include "MyCanvas.h"
-+#include "jawt_md.h"
-+
-+/*
-+ * Class: MyCanvas
-+ * Method: paint
-+ * Signature: (Ljava/awt/Graphics;)V
-+ */
-+
-+extern "C" {
-+
-+JNIEXPORT void JNICALL Java_MyCanvas_paint
-+(JNIEnv* env, jobject canvas, jobject graphics)
-+{
-+ /* Get the AWT */
-+ JAWT awt;
-+ awt.version = JAWT_VERSION_1_4;
-+ if (JAWT_GetAWT(env, &awt) == JNI_FALSE) {
-+ printf("AWT Not found\n");
-+ return;
-+ }
-+
-+ /* Lock the AWT */
-+ awt.Lock(env);
-+
-+ /* Unlock the AWT */
-+ awt.Unlock(env);
-+
-+ /* Get the drawing surface */
-+ JAWT_DrawingSurface* ds = awt.GetDrawingSurface(env, canvas);
-+ if (ds == NULL) {
-+ printf("NULL drawing surface\n");
-+ return;
-+ }
-+
-+ /* Lock the drawing surface */
-+ jint lock = ds->Lock(ds);
-+ printf("Lock value %d\n", (int)lock);
-+ if((lock & JAWT_LOCK_ERROR) != 0) {
-+ printf("Error locking surface\n");
-+ return;
-+ }
-+
-+ /* Get the drawing surface info */
-+ JAWT_DrawingSurfaceInfo* dsi = ds->GetDrawingSurfaceInfo(ds);
-+ if (dsi == NULL) {
-+ printf("Error getting surface info\n");
-+ ds->Unlock(ds);
-+ return;
-+ }
-+
-+ /* Get the platform-specific drawing info */
-+ JAWT_Win32DrawingSurfaceInfo* dsi_win =
-+ (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
-+
-+ /* Now paint */
-+ PAINTSTRUCT ps;
-+ /* Do not use the HDC returned from BeginPaint()!! */
-+ ::BeginPaint(dsi_win->hwnd, &ps);
-+ HBRUSH hbrush = (HBRUSH)::GetStockObject(BLACK_BRUSH);
-+ RECT rect;
-+ rect.left = 5;
-+ rect.top = 5;
-+ rect.right = 95;
-+ rect.bottom = 95;
-+ ::FillRect(dsi_win->hdc, &rect, hbrush);
-+ ::EndPaint(dsi_win->hwnd, &ps);
-+
-+ jobject ref = awt.GetComponent(env, (void*)(dsi_win->hwnd));
-+ if (!env->IsSameObject(ref, canvas)) {
-+ printf("Error! Different objects!\n");
-+ }
-+
-+ /* Free the drawing surface info */
-+ ds->FreeDrawingSurfaceInfo(dsi);
-+
-+ /* Unlock the drawing surface */
-+ ds->Unlock(ds);
-+
-+ /* Free the drawing surface */
-+ awt.FreeDrawingSurface(ds);
-+}
-+
-+}
---- ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,43 @@
-+<html>
-+<!--
-+ 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 6299858
-+ @summary PIT. Focused border not shown on List if selected item is removed, XToolkit
-+ @author Dmitry.Cherepanov@SUN.COM area=awt.list
-+ @run applet FirstItemRemoveTest.html
-+ -->
-+<head>
-+<title> </title>
-+</head>
-+<body>
-+
-+<h1>FirstItemRemoveTest<br>Bug ID: 6299858 </h1>
-+
-+<p> This is an AUTOMATIC test, simply wait for completion </p>
-+
-+<APPLET CODE="FirstItemRemoveTest.class" WIDTH=200 HEIGHT=200></APPLET>
-+</body>
-+</html>
-+
---- ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,119 @@
-+/*
-+ * 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 6299858 7124338
-+ @summary PIT. Focused border not shown on List if selected item is removed, XToolkit
-+ @author Dmitry.Cherepanov@SUN.COM area=awt.list
-+ @run applet FirstItemRemoveTest.html
-+*/
-+
-+import java.applet.Applet;
-+import java.awt.*;
-+import java.awt.event.*;
-+
-+public class FirstItemRemoveTest extends Applet
-+{
-+ List list = new List(4, false);
-+ Panel panel = new Panel();
-+
-+ public void init()
-+ {
-+ list.add("000");
-+ list.add("111");
-+ list.add("222");
-+ list.add("333");
-+ list.add("444");
-+ list.add("555");
-+
-+ panel.setLayout(new FlowLayout ());
-+ panel.add(list);
-+
-+ this.add(panel);
-+ this.setLayout (new FlowLayout ());
-+ }//End init()
-+
-+ public void start ()
-+ {
-+ setSize (200,200);
-+ setVisible(true);
-+ validate();
-+
-+ test();
-+ }// start()
-+
-+ private void test(){
-+
-+ if (sun.awt.OSInfo.getOSType() == sun.awt.OSInfo.OSType.MACOSX) {
-+ System.err.println("Skipped. This test is not for OS X.");
-+ return;
-+ }
-+
-+ Robot r;
-+ try {
-+ r = new Robot();
-+ } catch(AWTException e) {
-+ throw new RuntimeException(e.getMessage());
-+ }
-+
-+ // Removing first item in order to reproduce incorrect behaviour
-+ r.delay(1000);
-+ list.remove(0);
-+ r.delay(1000);
-+
-+ // Request focus to list
-+ Point loc = this.getLocationOnScreen();
-+ r.delay(1000);
-+
-+ r.mouseMove(loc.x+10, loc.y+10);
-+ r.delay(10);
-+ r.mousePress(InputEvent.BUTTON1_MASK);
-+ r.delay(10);
-+ r.mouseRelease(InputEvent.BUTTON1_MASK);
-+ r.delay(1000);
-+
-+ list.requestFocusInWindow();
-+ r.delay(1000);
-+ r.waitForIdle();
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != list){
-+ throw new RuntimeException("Test failed - list isn't focus owner.");
-+ }
-+
-+ // The focus index should be set to first item after removing
-+ // So if we press VK_SPACE then the selected item will be equals 0.
-+ r.delay(100);
-+ r.keyPress(KeyEvent.VK_SPACE);
-+ r.delay(10);
-+ r.keyRelease(KeyEvent.VK_SPACE);
-+ r.delay(1000);
-+ r.waitForIdle();
-+
-+ int selectedIndex = list.getSelectedIndex();
-+ if (selectedIndex != 0){
-+ throw new RuntimeException("Test failed. list.getSelectedIndex() = "+selectedIndex);
-+ }
-+
-+ }
-+
-+}// class AutomaticAppletTest
---- ./jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,219 @@
-+/*
-+ * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * 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 7154048
-+ * @summary Window created under a mouse does not receive mouse enter event.
-+ * Mouse Entered/Exited events are wrongly generated during dragging the window
-+ * from one component to another
-+ * @library ../../regtesthelpers
-+ * @build Util
-+ * @author alexandr.scherbatiy area=awt.event
-+ * @run main DragWindowTest
-+ */
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+import javax.swing.*;
-+
-+import java.util.concurrent.*;
-+import sun.awt.SunToolkit;
-+
-+import test.java.awt.regtesthelpers.Util;
-+
-+public class DragWindowTest {
-+
-+ private static volatile int dragWindowMouseEnteredCount = 0;
-+ private static volatile int dragWindowMouseReleasedCount = 0;
-+ private static volatile int buttonMouseEnteredCount = 0;
-+ private static volatile int labelMouseReleasedCount = 0;
-+ private static MyDragWindow dragWindow;
-+ private static JLabel label;
-+ private static JButton button;
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ Robot robot = new Robot();
-+ robot.setAutoDelay(50);
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+
-+ @Override
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+
-+ toolkit.realSync();
-+
-+ Point pointToClick = Util.invokeOnEDT(new Callable<Point>() {
-+
-+ @Override
-+ public Point call() throws Exception {
-+ return getCenterPoint(label);
-+ }
-+ });
-+
-+
-+ robot.mouseMove(pointToClick.x, pointToClick.y);
-+ robot.mousePress(InputEvent.BUTTON1_MASK);
-+ toolkit.realSync();
-+
-+ if (dragWindowMouseEnteredCount != 1) {
-+ throw new RuntimeException("No MouseEntered event on Drag Window!");
-+ }
-+
-+ Point pointToDrag = Util.invokeOnEDT(new Callable<Point>() {
-+
-+ @Override
-+ public Point call() throws Exception {
-+ button.addMouseListener(new ButtonMouseListener());
-+ return getCenterPoint(button);
-+ }
-+ });
-+
-+ robot.mouseMove(pointToDrag.x, pointToDrag.y);
-+ toolkit.realSync();
-+
-+ if (buttonMouseEnteredCount != 0) {
-+ throw new RuntimeException("Extra MouseEntered event on button!");
-+ }
-+
-+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
-+ toolkit.realSync();
-+
-+ if (labelMouseReleasedCount != 1) {
-+ throw new RuntimeException("No MouseReleased event on label!");
-+ }
-+
-+ }
-+
-+ private static Point getCenterPoint(Component comp) {
-+ Point p = comp.getLocationOnScreen();
-+ Rectangle rect = comp.getBounds();
-+ return new Point(p.x + rect.width / 2, p.y + rect.height / 2);
-+ }
-+
-+ private static void createAndShowGUI() {
-+
-+ JFrame frame = new JFrame("Main Frame");
-+ frame.setSize(300, 200);
-+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+
-+ label = new JLabel("Label");
-+
-+ LabelMouseListener listener = new LabelMouseListener(frame);
-+ label.addMouseListener(listener);
-+ label.addMouseMotionListener(listener);
-+
-+ button = new JButton("Button");
-+ Panel panel = new Panel(new BorderLayout());
-+
-+ panel.add(label, BorderLayout.NORTH);
-+ panel.add(button, BorderLayout.CENTER);
-+
-+ frame.getContentPane().add(panel);
-+ frame.setVisible(true);
-+
-+ }
-+
-+ private static Point getAbsoluteLocation(MouseEvent e) {
-+ return new Point(e.getXOnScreen(), e.getYOnScreen());
-+ }
-+
-+ static class MyDragWindow extends Window {
-+
-+ static int d = 30;
-+
-+ public MyDragWindow(Window parent, Point location) {
-+ super(parent);
-+ setSize(150, 150);
-+ setVisible(true);
-+ JPanel panel = new JPanel();
-+ add(panel);
-+ setLocation(location.x - d, location.y - d);
-+ addMouseListener(new DragWindowMouseListener());
-+ }
-+
-+ void dragTo(Point point) {
-+ setLocation(point.x - d, point.y - d);
-+ }
-+ }
-+
-+ static class LabelMouseListener extends MouseAdapter {
-+
-+ Point origin;
-+ Window parent;
-+
-+ public LabelMouseListener(Window parent) {
-+ this.parent = parent;
-+ }
-+
-+ @Override
-+ public void mousePressed(MouseEvent e) {
-+ if (dragWindow == null) {
-+ dragWindow = new MyDragWindow(parent, getAbsoluteLocation(e));
-+ } else {
-+ dragWindow.setVisible(true);
-+ dragWindow.dragTo(getAbsoluteLocation(e));
-+ }
-+ }
-+
-+ @Override
-+ public void mouseReleased(MouseEvent e) {
-+ labelMouseReleasedCount++;
-+ if (dragWindow != null) {
-+ dragWindow.setVisible(false);
-+ }
-+ }
-+
-+ public void mouseDragged(MouseEvent e) {
-+ if (dragWindow != null) {
-+ dragWindow.dragTo(getAbsoluteLocation(e));
-+ }
-+ }
-+ }
-+
-+ static class DragWindowMouseListener extends MouseAdapter {
-+
-+ @Override
-+ public void mouseEntered(MouseEvent e) {
-+ dragWindowMouseEnteredCount++;
-+ }
-+
-+ @Override
-+ public void mouseReleased(MouseEvent e) {
-+ dragWindowMouseReleasedCount++;
-+ }
-+ }
-+
-+ static class ButtonMouseListener extends MouseAdapter {
-+
-+ @Override
-+ public void mouseEntered(MouseEvent e) {
-+ buttonMouseEnteredCount++;
-+ }
-+ }
-+}
---- ./jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,108 @@
-+/*
-+ * 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 test.java.awt.regtesthelpers.Util;
-+
-+import javax.swing.*;
-+import java.awt.*;
-+import java.util.concurrent.atomic.AtomicReference;
-+
-+/**
-+ * @test
-+ * @bug 8012026
-+ * @summary Component.getMousePosition() does not work in an applet on MacOS
-+ * @author Petr Pchelko
-+ * @library ../../regtesthelpers
-+ * @build Util
-+ * @compile GetMousePositionWithOverlay.java
-+ * @run main/othervm GetMousePositionWithOverlay
-+ */
-+
-+public class GetMousePositionWithOverlay {
-+
-+ static Frame backFrame;
-+ static Frame frontFrame;
-+
-+ public static void main(String[] args) throws Throwable {
-+ try {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ constructTestUI();
-+ }
-+ });
-+ Util.waitForIdle(null);
-+
-+ Robot r = new Robot();
-+ Util.pointOnComp(frontFrame, r);
-+ Util.waitForIdle(null);
-+
-+ Point pos = getMousePosition(backFrame);
-+ if (pos != null) {
-+ throw new RuntimeException("Test failed. Mouse position should be null but was" + pos);
-+ }
-+
-+ pos = getMousePosition(frontFrame);
-+ if (pos == null) {
-+ throw new RuntimeException("Test failed. Mouse position should not be null");
-+ }
-+
-+ r.mouseMove(189, 189);
-+ Util.waitForIdle(null);
-+
-+ pos = getMousePosition(backFrame);
-+ if (pos == null) {
-+ throw new RuntimeException("Test failed. Mouse position should not be null");
-+ }
-+ } finally {
-+ SwingUtilities.invokeLater(new Runnable() {
-+ @Override
-+ public void run() {
-+ backFrame.dispose();
-+ frontFrame.dispose();
-+ }
-+ });
-+ }
-+ }
-+
-+ private static Point getMousePosition(final Component component) throws Exception {
-+ final AtomicReference<Point> pos = new AtomicReference<Point>();
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ pos.set(component.getMousePosition());
-+ }
-+ });
-+ return pos.get();
-+ }
-+
-+ private static void constructTestUI() {
-+ backFrame = new Frame();
-+ backFrame.setBounds(100, 100, 100, 100);
-+ backFrame.setVisible(true);
-+
-+ frontFrame = new Frame();
-+ frontFrame.setBounds(120, 120, 60, 60);
-+ frontFrame.setVisible(true);
-+ }
-+}
---- ./jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,111 @@
-+/*
-+ * 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 test.java.awt.regtesthelpers.Util;
-+
-+import javax.swing.*;
-+import java.awt.*;
-+import java.awt.event.MouseEvent;
-+import java.awt.event.MouseMotionAdapter;
-+
-+/**
-+ * @test
-+ * @bug 8012026
-+ * @summary Component.getMousePosition() does not work in an applet on MacOS
-+ * @author Petr Pchelko
-+ * @library ../../regtesthelpers
-+ * @build Util
-+ * @compile GetMousePositionWithPopup.java
-+ * @run main/othervm GetMousePositionWithPopup
-+ */
-+
-+public class GetMousePositionWithPopup {
-+
-+ private static Frame frame1;
-+ private static Frame frame2;
-+
-+ public static void main(String[] args) throws Exception {
-+ try {
-+ Robot r = Util.createRobot();
-+ r.mouseMove(0, 0);
-+ Util.waitForIdle(null);
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ constructTestUI();
-+ }
-+ });
-+
-+ Util.waitForIdle(null);
-+ r.mouseMove(149, 149);
-+ Util.waitForIdle(null);
-+ r.mouseMove(150, 150);
-+ Util.waitForIdle(null);
-+
-+ } finally {
-+ SwingUtilities.invokeLater(new Runnable() {
-+ @Override
-+ public void run() {
-+ frame1.dispose();
-+ frame2.dispose();
-+ }
-+ });
-+ }
-+ }
-+
-+ private static void constructTestUI() {
-+ frame1 = new Frame();
-+ frame1.setBounds(100, 100, 100, 100);
-+ frame1.addMouseMotionListener(new MouseMotionAdapter() {
-+
-+ private boolean shown = false;
-+
-+ @Override
-+ public void mouseMoved(MouseEvent e) {
-+ if (shown) {
-+ return;
-+ }
-+
-+ shown = true;
-+
-+ frame2 = new Frame();
-+ frame2.setBounds(120, 120, 120, 120);
-+ frame2.setVisible(true);
-+
-+ Point positionInFrame2 = frame2.getMousePosition();
-+ if (positionInFrame2.x != 30 || positionInFrame2.y != 30) {
-+ throw new RuntimeException("Wrong position reported. Should be [30, 30] but was [" +
-+ positionInFrame2.x + ", " + positionInFrame2.y + "]");
-+ }
-+
-+ Point positionInFrame1 = frame1.getMousePosition();
-+ if (positionInFrame1 != null) {
-+ throw new RuntimeException("Wrong position reported. Should be null");
-+ }
-+
-+ }
-+ });
-+ frame1.setVisible(true);
-+ }
-+}
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -25,10 +25,11 @@
- fi
-
-
--if [ $OS = SunOS -o $OS = Linux ]
--then
-- exit 0
--fi
-+case "${OS}" in
-+ SunOS | Linux | *BSD | Darwin )
-+ exit 0
-+ ;;
-+esac
- # 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-07-15 21:49:31.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/Toolkit/ToolkitPropertyTest/bug7129133.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,50 @@
-+/*
-+ * 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 7129133
-+ * @summary [macosx] Accelerators are displayed as Meta instead of the Command symbol
-+ * @author leonid.romanov@oracle.com
-+ * @run main bug7129133
-+ */
-+
-+import java.awt.*;
-+
-+public class bug7129133 {
-+ public static void main(String[] args) throws Exception {
-+ if (sun.awt.OSInfo.getOSType() != sun.awt.OSInfo.OSType.MACOSX) {
-+ System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
-+ return;
-+ }
-+
-+ Toolkit.getDefaultToolkit();
-+
-+ String cmdSymbol = "\u2318";
-+ String val = Toolkit.getProperty("AWT.meta", "Meta");
-+
-+ if (!val.equals(cmdSymbol)) {
-+ throw new Exception("Wrong property value for AWT.meta. Expected: " + cmdSymbol + ", actual: " + val);
-+ }
-+ }
-+}
---- ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,43 @@
-+<html>
-+<!--
-+ 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 6384984 8004032
-+ @summary TrayIcon try to dispay a tooltip when is not visible
-+ @author Dmitry.Cherepanov@sun.com area=awt.tray
-+ @run applet/manual=yesno ShowAfterDisposeTest.html
-+ -->
-+<head>
-+<title> ShowAfterDisposeTest </title>
-+</head>
-+<body>
-+
-+<h1>ShowAfterDisposeTest<br>Bug ID: 6384984</h1>
-+
-+<p> See the dialog box (usually in upper left corner) for instructions</p>
-+
-+<APPLET CODE="ShowAfterDisposeTest.class" WIDTH=200 HEIGHT=200></APPLET>
-+</body>
-+</html>
---- ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,246 @@
-+/*
-+ * 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 6384984 8004032
-+ @summary TrayIcon try to dispay a tooltip when is not visible
-+ @author Dmitry.Cherepanov@sun.com area=awt.tray
-+ @run applet/manual=yesno ShowAfterDisposeTest.html
-+*/
-+
-+import java.applet.*;
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+import java.awt.image.*;
-+
-+public class ShowAfterDisposeTest extends Applet
-+{
-+ boolean traySupported;
-+
-+ public void init()
-+ {
-+ this.setLayout (new BorderLayout ());
-+
-+ String[] instructions;
-+ traySupported = SystemTray.isSupported();
-+ if (traySupported)
-+ {
-+ String[] s =
-+ {
-+ "1) When the test starts an icon is added to the SystemTray area.",
-+ "2a) If you use Apple OS X,",
-+ " right click on this icon (it's important to click before the tooltip is shown).",
-+ " The icon should disappear.",
-+ "2b) If you use other os (Windows, Linux, Solaris),",
-+ " double click on this icon (it's important to click before the tooltip is shown).",
-+ " The icon should disappear.",
-+ "3) If the bug is reproducible then the test will fail without assistance.",
-+ "4) Just press the 'pass' button."
-+ };
-+ instructions = s;
-+ }
-+ else
-+ {
-+ String[] s =
-+ {
-+ "The test cannot be run because SystemTray is not supported.",
-+ "Simply press PASS button."
-+ };
-+ instructions = s;
-+ }
-+ Sysout.createDialogWithInstructions(instructions);
-+ }
-+
-+ public void start ()
-+ {
-+ setSize (200,200);
-+ setVisible(true);
-+ validate();
-+
-+ if (!traySupported)
-+ {
-+ return;
-+ }
-+
-+ BufferedImage img = new BufferedImage(32, 32, BufferedImage.TYPE_INT_ARGB);
-+ Graphics g = img.createGraphics();
-+ g.setColor(Color.WHITE);
-+ g.fillRect(0, 0, 32, 32);
-+ g.setColor(Color.RED);
-+ g.fillRect(6, 6, 20, 20);
-+ g.dispose();
-+
-+ final SystemTray tray = SystemTray.getSystemTray();
-+ final TrayIcon icon = new TrayIcon(img);
-+ icon.setImageAutoSize(true);
-+ icon.addActionListener(new ActionListener()
-+ {
-+ public void actionPerformed(ActionEvent ev)
-+ {
-+ tray.remove(icon);
-+ }
-+ }
-+ );
-+
-+ try {
-+ tray.add(icon);
-+ } catch (AWTException e) {
-+ Sysout.println(e.toString());
-+ Sysout.println("!!! The test coudn't be performed !!!");
-+ return;
-+ }
-+ icon.setToolTip("tooltip");
-+ }
-+}
-+
-+/****************************************************
-+ Standard Test Machinery
-+ DO NOT modify anything below -- it's a standard
-+ chunk of code whose purpose is to make user
-+ interaction uniform, and thereby make it simpler
-+ to read and understand someone else's test.
-+ ****************************************************/
-+
-+/**
-+ This is part of the standard test machinery.
-+ It creates a dialog (with the instructions), and is the interface
-+ for sending text messages to the user.
-+ To print the instructions, send an array of strings to Sysout.createDialog
-+ WithInstructions method. Put one line of instructions per array entry.
-+ To display a message for the tester to see, simply call Sysout.println
-+ with the string to be displayed.
-+ This mimics System.out.println but works within the test harness as well
-+ as standalone.
-+ */
-+
-+class Sysout
-+{
-+ private static TestDialog dialog;
-+
-+ public static void createDialogWithInstructions( String[] instructions )
-+ {
-+ dialog = new TestDialog( new Frame(), "Instructions" );
-+ dialog.printInstructions( instructions );
-+ dialog.setVisible(true);
-+ println( "Any messages for the tester will display here." );
-+ }
-+
-+ public static void createDialog( )
-+ {
-+ dialog = new TestDialog( new Frame(), "Instructions" );
-+ String[] defInstr = { "Instructions will appear here. ", "" } ;
-+ dialog.printInstructions( defInstr );
-+ dialog.setVisible(true);
-+ println( "Any messages for the tester will display here." );
-+ }
-+
-+ public static void printInstructions( String[] instructions )
-+ {
-+ dialog.printInstructions( instructions );
-+ }
-+
-+ public static void println( String messageIn )
-+ {
-+ dialog.displayMessage( messageIn );
-+ }
-+}
-+
-+/**
-+ This is part of the standard test machinery. It provides a place for the
-+ test instructions to be displayed, and a place for interactive messages
-+ to the user to be displayed.
-+ To have the test instructions displayed, see Sysout.
-+ To have a message to the user be displayed, see Sysout.
-+ Do not call anything in this dialog directly.
-+ */
-+class TestDialog extends Dialog
-+{
-+
-+ TextArea instructionsText;
-+ TextArea messageText;
-+ int maxStringLength = 80;
-+
-+ //DO NOT call this directly, go through Sysout
-+ public TestDialog( Frame frame, String name )
-+ {
-+ super( frame, name );
-+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
-+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
-+ add( "North", instructionsText );
-+
-+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
-+ add("Center", messageText);
-+
-+ pack();
-+
-+ setVisible(true);
-+ }
-+
-+ //DO NOT call this directly, go through Sysout
-+ public void printInstructions( String[] instructions )
-+ {
-+ //Clear out any current instructions
-+ instructionsText.setText( "" );
-+
-+ //Go down array of instruction strings
-+
-+ String printStr, remainingStr;
-+ for( int i=0; i < instructions.length; i++ )
-+ {
-+ //chop up each into pieces maxSringLength long
-+ remainingStr = instructions[ i ];
-+ while( remainingStr.length() > 0 )
-+ {
-+ //if longer than max then chop off first max chars to print
-+ if( remainingStr.length() >= maxStringLength )
-+ {
-+ //Try to chop on a word boundary
-+ int posOfSpace = remainingStr.
-+ lastIndexOf( ' ', maxStringLength - 1 );
-+
-+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-+
-+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
-+ remainingStr = remainingStr.substring( posOfSpace + 1 );
-+ }
-+ //else just print
-+ else
-+ {
-+ printStr = remainingStr;
-+ remainingStr = "";
-+ }
-+
-+ instructionsText.append( printStr + "\n" );
-+ }
-+ }
-+ }
-+
-+ //DO NOT call this directly, go through Sysout
-+ public void displayMessage( String messageIn )
-+ {
-+ messageText.append( messageIn + "\n" );
-+ System.out.println(messageIn);
-+ }
-+}
---- ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,133 @@
-+/*
-+ * 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 8024163
-+ * @summary Checks the dragEnter event is correctly generated
-+ * @library ../../regtesthelpers
-+ * @build Util
-+ * @compile ExtraDragEnterTest.java
-+ * @run main/othervm ExtraDragEnterTest
-+ * @author Petr Pchelko
-+ */
-+
-+import test.java.awt.regtesthelpers.Util;
-+
-+import javax.swing.*;
-+import java.awt.*;
-+import java.awt.datatransfer.StringSelection;
-+import java.awt.dnd.DnDConstants;
-+import java.awt.dnd.DragGestureEvent;
-+import java.awt.dnd.DragGestureListener;
-+import java.awt.dnd.DragSource;
-+import java.awt.dnd.DropTarget;
-+import java.awt.dnd.DropTargetAdapter;
-+import java.awt.dnd.DropTargetDragEvent;
-+import java.awt.dnd.DropTargetDropEvent;
-+import java.awt.event.InputEvent;
-+import java.util.concurrent.atomic.AtomicInteger;
-+
-+public class ExtraDragEnterTest {
-+
-+ private static final int FRAME_SIZE = 100;
-+ private static final int FRAME_LOCATION = 100;
-+
-+ private static AtomicInteger dragEnterCalled = new AtomicInteger(0);
-+
-+ private static volatile Panel mainPanel;
-+ private static volatile Frame f;
-+
-+ private static void initAndShowUI() {
-+ f = new Frame("Test frame");
-+ f.setBounds(FRAME_LOCATION,FRAME_LOCATION,FRAME_SIZE,FRAME_SIZE);
-+ mainPanel = new Panel();
-+ mainPanel.setBounds(0, 0, FRAME_SIZE, FRAME_SIZE);
-+ mainPanel.setBackground(Color.black);
-+ mainPanel.setLayout(new GridLayout(2, 1));
-+
-+ final DraggablePanel dragSource = new DraggablePanel();
-+ dragSource.setBackground(Color.yellow);
-+ dragSource.setDropTarget(null);
-+ mainPanel.add(dragSource);
-+
-+ Panel dropTarget = new Panel();
-+ dropTarget.setBackground(Color.red);
-+ DropTarget dt = new DropTarget(dropTarget, new DropTargetAdapter() {
-+ @Override public void drop(DropTargetDropEvent dtde) { }
-+
-+ @Override
-+ public void dragEnter(DropTargetDragEvent dtde) {
-+ dragEnterCalled.incrementAndGet();
-+ }
-+ });
-+ dropTarget.setDropTarget(dt);
-+ mainPanel.add(dropTarget);
-+
-+ f.add(mainPanel);
-+ f.setVisible(true);
-+ }
-+
-+ public static void main(String[] args) throws Throwable {
-+ try {
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ initAndShowUI();
-+ }
-+ });
-+
-+ Robot r = new Robot();
-+ Util.waitForIdle(r);
-+ Point leftCorner = new Point(mainPanel.getLocationOnScreen());
-+ leftCorner.translate(5, 5);
-+ Point rightCorner = new Point(mainPanel.getLocationOnScreen());
-+ rightCorner.translate(mainPanel.getWidth(), mainPanel.getHeight());
-+ rightCorner.translate(-5, -5);
-+ Util.drag(r, leftCorner, rightCorner, InputEvent.BUTTON1_MASK);
-+ Util.waitForIdle(r);
-+
-+ int called = dragEnterCalled.get();
-+ if (called != 1) {
-+ throw new RuntimeException("Failed. Drag enter called " + called + " times. Expected 1" );
-+ }
-+ } finally {
-+ if (f != null) {
-+ f.dispose();
-+ }
-+ }
-+ }
-+
-+ private static class DraggablePanel extends Panel implements DragGestureListener {
-+
-+ public DraggablePanel() {
-+ (new DragSource()).createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY, this);
-+ }
-+
-+ @Override
-+ public void dragGestureRecognized(DragGestureEvent dge) {
-+ dge.startDrag(Cursor.getDefaultCursor(), new StringSelection("test"));
-+ }
-+ }
-+}
---- ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,128 @@
-+/*
-+ * 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 8024163
-+ * @summary Checks that dragExit is generated when the new DropTarget is created under the drag
-+ * @library ../../regtesthelpers
-+ * @build Util
-+ * @compile MissedDragExitTest.java
-+ * @run main/othervm MissedDragExitTest
-+ * @author Petr Pchelko
-+ */
-+
-+import test.java.awt.regtesthelpers.Util;
-+
-+import javax.swing.*;
-+import java.awt.*;
-+import java.awt.datatransfer.StringSelection;
-+import java.awt.dnd.DnDConstants;
-+import java.awt.dnd.DragGestureEvent;
-+import java.awt.dnd.DragGestureListener;
-+import java.awt.dnd.DragSource;
-+import java.awt.dnd.DropTarget;
-+import java.awt.dnd.DropTargetAdapter;
-+import java.awt.dnd.DropTargetDragEvent;
-+import java.awt.dnd.DropTargetDropEvent;
-+import java.awt.dnd.DropTargetEvent;
-+import java.awt.event.InputEvent;
-+
-+public class MissedDragExitTest {
-+
-+ private static final int FRAME_SIZE = 100;
-+ private static final int FRAME_LOCATION = 100;
-+
-+ private static volatile boolean dragExitCalled = false;
-+
-+ private static volatile Frame f;
-+
-+ private static void initAndShowUI() {
-+ f = new Frame("Test frame");
-+ f.setBounds(FRAME_LOCATION,FRAME_LOCATION,FRAME_SIZE,FRAME_SIZE);
-+
-+ final DraggablePanel dragSource = new DraggablePanel();
-+ dragSource.setBackground(Color.yellow);
-+ DropTarget dt = new DropTarget(dragSource, new DropTargetAdapter() {
-+ @Override public void drop(DropTargetDropEvent dtde) { }
-+
-+ @Override
-+ public void dragExit(DropTargetEvent dte) {
-+ dragExitCalled = true;
-+ }
-+
-+ @Override
-+ public void dragOver(DropTargetDragEvent dtde) {
-+ Panel newDropTarget = new Panel();
-+ newDropTarget.setDropTarget(new DropTarget());
-+ newDropTarget.setBackground(Color.red);
-+ newDropTarget.setBounds(0, 0, FRAME_SIZE, FRAME_SIZE);
-+ dragSource.add(newDropTarget);
-+ }
-+ });
-+ dragSource.setDropTarget(dt);
-+ f.add(dragSource);
-+
-+ f.setVisible(true);
-+ }
-+
-+ public static void main(String[] args) throws Throwable {
-+ try {
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ initAndShowUI();
-+ }
-+ });
-+
-+ Robot r = new Robot();
-+ Util.waitForIdle(r);
-+ Util.drag(r,
-+ new Point(FRAME_LOCATION + FRAME_SIZE / 3, FRAME_LOCATION + FRAME_SIZE / 3),
-+ new Point(FRAME_LOCATION + FRAME_SIZE / 3 * 2, FRAME_LOCATION + FRAME_SIZE / 3 * 2),
-+ InputEvent.BUTTON1_MASK);
-+ Util.waitForIdle(r);
-+
-+ if (!dragExitCalled) {
-+ throw new RuntimeException("Failed. Drag exit was not called" );
-+ }
-+ } finally {
-+ if (f != null) {
-+ f.dispose();
-+ }
-+ }
-+ }
-+
-+ private static class DraggablePanel extends Panel implements DragGestureListener {
-+
-+ public DraggablePanel() {
-+ (new DragSource()).createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY, this);
-+ }
-+
-+ @Override
-+ public void dragGestureRecognized(DragGestureEvent dge) {
-+ dge.startDrag(Cursor.getDefaultCursor(), new StringSelection("test"));
-+ }
-+ }
-+}
---- ./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-07-15 21:49:32.000000000 -0700
-@@ -39,13 +39,10 @@
- import java.util.Hashtable;
-
- /*
--@test
--@bug 8010009
--@summary [macosx] Unable type into online word games on MacOSX
--@author petr.pchelko : area=awt.keyboard
--@run clean *
--@run build TestApplet
--@run applet/manual=yesno KeyReleasedInAppletTest.html
-+ This is a part of test KeyReleasedInAppletTest.html. Do not add any JTREG tags here
-+ bug 8010009
-+ summary [macosx] Unable type into online word games on MacOSX
-+ author petr.pchelko : area=awt.keyboard
- */
-
- 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-07-15 21:49:32.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/awt/image/ImageIconHang.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/image/ImageIconHang.java 2014-10-28 20:19:45.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.
-+ *
-+ * 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.*;
-+
-+/*
-+ * @test
-+ * @bug 8032788
-+ * @summary Checks that null filename argument is processed correctly
-+ *
-+ * @run main ImageIconHang
-+ */
-+public class ImageIconHang {
-+ public static void main(String[] args) throws Exception {
-+ Image image = Toolkit.getDefaultToolkit().getImage((String) null);
-+ MediaTracker mt = new MediaTracker(new Component() {});
-+ mt.addImage(image, 1);
-+ mt.waitForID(1, 5000);
-+
-+ int status = mt.statusID(1, false);
-+
-+ System.out.println("Status: " + status);
-+
-+ if (status != MediaTracker.ERRORED) {
-+ throw new RuntimeException("MediaTracker.waitForID() hung.");
-+ }
-+ }
-+}
---- ./jdk/test/java/awt/print/bug8023392/bug8023392.html 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/print/bug8023392/bug8023392.html 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,20 @@
-+<html>
-+<!--
-+ @test
-+ @bug 8023392
-+ @summary Swing text components printed with spaces between chars
-+ @author Anton Nashatyrev
-+ @run applet/manual=yesno bug8023392.html
-+ -->
-+<head>
-+ <title> Bug 8023392 </title>
-+</head>
-+<body>
-+
-+<h1>Bug ID: 8023392</h1>
-+
-+<p> See the dialog box (usually in upper left corner) for instructions</p>
-+
-+<APPLET CODE="bug8023392.class" WIDTH=400 HEIGHT=400></APPLET>
-+</body>
-+</html>
---- ./jdk/test/java/awt/print/bug8023392/bug8023392.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/awt/print/bug8023392/bug8023392.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,286 @@
-+/*
-+ * 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.
-+ */
-+
-+/*
-+ test
-+ @bug 8023392
-+ @summary Swing text components printed with spaces between chars
-+ @author Anton Nashatyrev
-+ @run applet/manual=yesno bug8023392.html
-+*/
-+
-+import javax.swing.*;
-+import javax.swing.border.LineBorder;
-+import java.applet.Applet;
-+import java.awt.*;
-+import java.awt.event.ActionEvent;
-+import java.awt.event.ActionListener;
-+import java.awt.font.TextAttribute;
-+import java.awt.print.PageFormat;
-+import java.awt.print.Printable;
-+import java.awt.print.PrinterException;
-+import java.awt.print.PrinterJob;
-+import java.text.AttributedCharacterIterator;
-+import java.text.AttributedString;
-+
-+
-+public class bug8023392 extends Applet {
-+ static final String[] instructions = {
-+ "A Frame containing several pairs of labels ((a) and (b)) is displayed.",
-+ "Labels of each pair look the same and are left-aligned (with spaces ",
-+ "between chars).",
-+ "1. Hit the print button.",
-+ "2. Select any available printer (printing to file is also fine).",
-+ "3. Look at the printing result (paper, PDF, PS, etc.):",
-+ " The (a) and (b) labels should look almost the same and the (a) labels",
-+ " shouldn't appear as if they are stretched along X axis."};
-+
-+ public void init() {
-+ this.setLayout(new BorderLayout());
-+ add(new SimplePrint2(), BorderLayout.CENTER);
-+
-+ Sysout.createDialogWithInstructions(instructions);
-+
-+ }
-+
-+ public static class SimplePrint2 extends JPanel
-+ implements ActionListener, Printable {
-+ JLabel label1;
-+ JLabel label2;
-+ JButton printButton;
-+
-+
-+ public SimplePrint2() {
-+ setLayout(new BorderLayout());
-+ label1 = new JLabel("2a) a b c d e" +
-+ " ");
-+ label2 = new JLabel("2b) a b c d e");
-+
-+ Box p1 = new Box(BoxLayout.Y_AXIS);
-+ p1.add(label1);
-+ p1.add(label2);
-+ p1.add(new JLabel("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww") {
-+ String s = "3a) a b c d e ";
-+ @Override
-+ protected void paintComponent(Graphics g) {
-+ sun.swing.SwingUtilities2.drawChars(this, g, s.toCharArray(),
-+ 0, s.length(), 0, 15);
-+ }
-+ });
-+ p1.add(new JLabel("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww") {
-+ String s = "3b) a b c d e";
-+ @Override
-+ protected void paintComponent(Graphics g) {
-+ sun.swing.SwingUtilities2.drawChars(this, g, s.toCharArray(),
-+ 0, s.length(), 0, 15);
-+ }
-+ });
-+ p1.add(new JLabel("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww") {
-+ String s = "4a) a b c d e ";
-+ AttributedCharacterIterator it;
-+ {
-+ AttributedString as = new AttributedString(s);
-+ as.addAttribute(TextAttribute.FONT, getFont());
-+ as.addAttribute(TextAttribute.FOREGROUND, Color.RED, 3, 8);
-+ it = as.getIterator();
-+ }
-+ @Override
-+ protected void paintComponent(Graphics g) {
-+ sun.swing.SwingUtilities2.drawString(this, g, it, 0, 15);
-+ }
-+ });
-+
-+ p1.add(new JLabel("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww") {
-+ String s = "4b) a b c d e";
-+ AttributedCharacterIterator it;
-+ {
-+ AttributedString as = new AttributedString(s);
-+ as.addAttribute(TextAttribute.FONT, getFont());
-+ as.addAttribute(TextAttribute.FOREGROUND, Color.RED, 3, 8);
-+ it = as.getIterator();
-+ }
-+ @Override
-+ protected void paintComponent(Graphics g) {
-+ sun.swing.SwingUtilities2.drawString(this, g, it, 0, 15);
-+ }
-+ });
-+
-+ JPanel p2 = new JPanel();
-+ printButton = new JButton("Print");
-+ printButton.addActionListener(this);
-+ p2.add(printButton);
-+
-+ Container c = this;
-+ c.add(p1, BorderLayout.CENTER);
-+ c.add(p2, BorderLayout.SOUTH);
-+
-+ String[] data = {
-+ "1a) \u30aa\u30f3\u30e9\u30a4\u30f3\u6d88\u8fbc" +
-+ " ",
-+ "1b) \u30aa\u30f3\u30e9\u30a4\u30f3\u6d88\u8fbc"
-+ };
-+ JList l0 = new JList(data);
-+ l0.setVisibleRowCount(l0.getModel().getSize());
-+ JScrollPane jsp = new JScrollPane(l0);
-+ l0.setBorder(new LineBorder(Color.GRAY));
-+ c.add(jsp, BorderLayout.NORTH);
-+
-+ for (Component comp : new Component[]{label1, label2, printButton}) {
-+ comp.setFont(new Font("Monospaced", 0, 16));
-+ }
-+ }
-+
-+ public void actionPerformed(ActionEvent e) {
-+ PrinterJob job = PrinterJob.getPrinterJob();
-+ job.setPrintable(this);
-+ if (job.printDialog()) {
-+ try {
-+ job.print();
-+ } catch (PrinterException ex) {
-+ ex.printStackTrace();
-+ }
-+ }
-+ }
-+
-+ public int print(Graphics graphics,
-+ PageFormat pageFormat,
-+ int pageIndex)
-+ throws PrinterException {
-+ if (pageIndex >= 1) {
-+ return Printable.NO_SUCH_PAGE;
-+ }
-+
-+ this.paint(graphics);
-+ return Printable.PAGE_EXISTS;
-+ }
-+ }
-+}
-+
-+
-+/**
-+ * *************************************************
-+ * Standard Test Machinery
-+ * DO NOT modify anything below -- it's a standard
-+ * chunk of code whose purpose is to make user
-+ * interaction uniform, and thereby make it simpler
-+ * to read and understand someone else's test.
-+ * **************************************************
-+ */
-+class Sysout {
-+ private static TestDialog dialog;
-+
-+ public static void createDialogWithInstructions(String[] instructions) {
-+ dialog = new TestDialog(new Frame(), "Instructions");
-+ dialog.printInstructions(instructions);
-+ dialog.show();
-+ println("Any messages for the tester will display here.");
-+ }
-+
-+ public static void createDialog() {
-+ dialog = new TestDialog(new Frame(), "Instructions");
-+ String[] defInstr = {"Instructions will appear here. ", ""};
-+ dialog.printInstructions(defInstr);
-+ dialog.show();
-+ println("Any messages for the tester will display here.");
-+ }
-+
-+
-+ public static void printInstructions(String[] instructions) {
-+ dialog.printInstructions(instructions);
-+ }
-+
-+
-+ public static void println(String messageIn) {
-+ dialog.displayMessage(messageIn);
-+ }
-+
-+}// Sysout class
-+
-+
-+class TestDialog extends Dialog {
-+
-+ TextArea instructionsText;
-+ TextArea messageText;
-+ int maxStringLength = 80;
-+
-+ //DO NOT call this directly, go through Sysout
-+ public TestDialog(Frame frame, String name) {
-+ super(frame, name);
-+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
-+ instructionsText = new TextArea("", 15, maxStringLength, scrollBoth);
-+ add("North", instructionsText);
-+
-+ messageText = new TextArea("", 5, maxStringLength, scrollBoth);
-+ add("South", messageText);
-+
-+ pack();
-+
-+ show();
-+ }// TestDialog()
-+
-+ //DO NOT call this directly, go through Sysout
-+ public void printInstructions(String[] instructions) {
-+ //Clear out any current instructions
-+ instructionsText.setText("");
-+
-+ //Go down array of instruction strings
-+
-+ String printStr, remainingStr;
-+ for (int i = 0; i < instructions.length; i++) {
-+ //chop up each into pieces maxSringLength long
-+ remainingStr = instructions[i];
-+ while (remainingStr.length() > 0) {
-+ //if longer than max then chop off first max chars to print
-+ if (remainingStr.length() >= maxStringLength) {
-+ //Try to chop on a word boundary
-+ int posOfSpace = remainingStr.
-+ lastIndexOf(' ', maxStringLength - 1);
-+
-+ if (posOfSpace <= 0) posOfSpace = maxStringLength - 1;
-+
-+ printStr = remainingStr.substring(0, posOfSpace + 1);
-+ remainingStr = remainingStr.substring(posOfSpace + 1);
-+ }
-+ //else just print
-+ else {
-+ printStr = remainingStr;
-+ remainingStr = "";
-+ }
-+
-+ instructionsText.append(printStr + "\n");
-+
-+ }// while
-+
-+ }// for
-+
-+ }//printInstructions()
-+
-+ //DO NOT call this directly, go through Sysout
-+ public void displayMessage(String messageIn) {
-+ messageText.append(messageIn + "\n");
-+ }
-+
-+}// TestDialog class
-+
---- ./jdk/test/java/beans/Introspector/TestTypeResolver.java 2013-09-06 11:29:26.000000000 -0700
-+++ ./jdk/test/java/beans/Introspector/TestTypeResolver.java 2014-07-15 21:49:32.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/beans/XMLDecoder/8028054/Task.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/beans/XMLDecoder/8028054/Task.java 2014-07-15 21:49:32.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.
-+ */
-+
-+import java.util.ArrayList;
-+import java.util.Enumeration;
-+import java.util.List;
-+import java.util.jar.JarEntry;
-+import java.util.jar.JarFile;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+
-+abstract class Task<T> implements Runnable {
-+ private transient boolean working = true;
-+ private final List<T> methods;
-+ private final Thread thread;
-+
-+ Task(List<T> methods) {
-+ this.methods = methods;
-+ this.thread = new Thread(this);
-+ this.thread.start();
-+ }
-+
-+ boolean isAlive() {
-+ return this.thread.isAlive();
-+ }
-+
-+ boolean isWorking() {
-+ boolean working = this.working && this.thread.isAlive();
-+ this.working = false;
-+ return working;
-+ }
-+
-+ @Override
-+ public void run() {
-+ long time = -System.currentTimeMillis();
-+ for (T method : this.methods) {
-+ this.working = true;
-+ try {
-+ for (int i = 0; i < 100; i++) {
-+ process(method);
-+ }
-+ } catch (NoSuchMethodException ignore) {
-+ }
-+ }
-+ time += System.currentTimeMillis();
-+ print("thread done in " + time / 1000 + " seconds");
-+ }
-+
-+ protected abstract void process(T method) throws NoSuchMethodException;
-+
-+ static synchronized void print(Object message) {
-+ System.out.println(message);
-+ System.out.flush();
-+ }
-+
-+ static List<Class<?>> getClasses(int count) throws Exception {
-+ String resource = ClassLoader.getSystemClassLoader().getResource("java/lang/Object.class").toString();
-+
-+ Pattern pattern = Pattern.compile("jar:file:(.*)!.*");
-+ Matcher matcher = pattern.matcher(resource);
-+ matcher.matches();
-+ resource = matcher.group(1);
-+
-+ List<Class<?>> classes = new ArrayList<>();
-+ try (JarFile jarFile = new JarFile(resource)) {
-+ Enumeration<JarEntry> entries = jarFile.entries();
-+ while (entries.hasMoreElements()) {
-+ String name = entries.nextElement().getName();
-+ if (name.startsWith("java") && name.endsWith(".class")) {
-+ classes.add(Class.forName(name.substring(0, name.indexOf(".")).replace('/', '.')));
-+ if (count == classes.size()) {
-+ break;
-+ }
-+ }
-+ }
-+ }
-+ return classes;
-+ }
-+}
---- ./jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java 2014-07-15 21:49:32.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 com.sun.beans.finder.ConstructorFinder;
-+
-+import java.lang.reflect.Constructor;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+
-+/*
-+ * @test
-+ * @bug 8028054
-+ * @summary Tests that cached constructors have synchronized access
-+ * @author Sergey Malenkov
-+ * @compile -XDignore.symbol.file TestConstructorFinder.java
-+ * @run main TestConstructorFinder
-+ */
-+
-+public class TestConstructorFinder {
-+ public static void main(String[] args) throws Exception {
-+ List<Class<?>> classes = Task.getClasses(Integer.MAX_VALUE);
-+ List<Constructor> constructors = new ArrayList<>();
-+ for (Class<?> type : classes) {
-+ Collections.addAll(constructors, type.getConstructors());
-+ }
-+ Task.print("found " + constructors.size() + " constructors in " + classes.size() + " classes");
-+
-+ List<Task> tasks = new ArrayList<>();
-+ for (int i = 0; i < 50; i++) {
-+ tasks.add(new Task<Constructor>(constructors) {
-+ @Override
-+ protected void process(Constructor constructor) throws NoSuchMethodException {
-+ ConstructorFinder.findConstructor(constructor.getDeclaringClass(), constructor.getParameterTypes());
-+ }
-+ });
-+ }
-+ int alarm = 0;
-+ while (true) {
-+ int alive = 0;
-+ int working = 0;
-+ for (Task task : tasks) {
-+ if (task.isWorking()) {
-+ working++;
-+ alive++;
-+ } else if (task.isAlive()) {
-+ alive++;
-+ }
-+ }
-+ if (alive == 0) {
-+ break;
-+ }
-+ Task.print(working + " out of " + alive + " threads are working");
-+ if ((working == 0) && (++alarm == 10)) {
-+ Task.print("DEADLOCK DETECTED");
-+ System.exit(100);
-+ }
-+ Thread.sleep(1000);
-+ }
-+ }
-+}
---- ./jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java 2014-07-15 21:49:32.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 com.sun.beans.finder.MethodFinder;
-+
-+import java.lang.reflect.Method;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+
-+/*
-+ * @test
-+ * @bug 8028054
-+ * @summary Tests that cached methods have synchronized access
-+ * @author Sergey Malenkov
-+ * @compile -XDignore.symbol.file TestMethodFinder.java
-+ * @run main TestMethodFinder
-+ */
-+
-+public class TestMethodFinder {
-+ public static void main(String[] args) throws Exception {
-+ List<Class<?>> classes = Task.getClasses(4000);
-+ List<Method> methods = new ArrayList<>();
-+ for (Class<?> type : classes) {
-+ Collections.addAll(methods, type.getMethods());
-+ }
-+ Task.print("found " + methods.size() + " methods in " + classes.size() + " classes");
-+
-+ List<Task> tasks = new ArrayList<>();
-+ for (int i = 0; i < 50; i++) {
-+ tasks.add(new Task<Method>(methods) {
-+ @Override
-+ protected void process(Method method) throws NoSuchMethodException {
-+ MethodFinder.findMethod(method.getDeclaringClass(), method.getName(), method.getParameterTypes());
-+ }
-+ });
-+ }
-+ int alarm = 0;
-+ while (true) {
-+ int alive = 0;
-+ int working = 0;
-+ for (Task task : tasks) {
-+ if (task.isWorking()) {
-+ working++;
-+ alive++;
-+ } else if (task.isAlive()) {
-+ alive++;
-+ }
-+ }
-+ if (alive == 0) {
-+ break;
-+ }
-+ Task.print(working + " out of " + alive + " threads are working");
-+ if ((working == 0) && (++alarm == 10)) {
-+ Task.print("DEADLOCK DETECTED");
-+ System.exit(100);
-+ }
-+ Thread.sleep(1000);
-+ }
-+ }
-+}
---- ./jdk/test/java/beans/XMLEncoder/Test8027066.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/beans/XMLEncoder/Test8027066.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,41 @@
-+/*
-+ * 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 8027066
-+ * @summary Tests that the same array can be encoded twice
-+ * @author Anton Nashatyrev
-+ */
-+public class Test8027066 extends AbstractTest<String[][]> {
-+ public static void main(String[] args) {
-+ new Test8027066().test(true);
-+ }
-+
-+ @Override
-+ protected String[][] getObject() {
-+ String[] strings = {"first", "second"};
-+ String[][] arrays = {strings, strings};
-+ return arrays;
-+ }
-+}
---- ./jdk/test/java/io/File/GetXSpace.sh 2013-09-06 11:29:29.000000000 -0700
-+++ ./jdk/test/java/io/File/GetXSpace.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -26,7 +26,7 @@
- # set platform-dependent variable
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux ) TMP=/tmp ;;
-+ SunOS | Linux | *BSD | Darwin ) TMP=/tmp ;;
- Windows_98 ) return ;;
- 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 2014-07-15 21:49:32.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 8013827 8011950
-+ * @bug 8013827 8011950 8025128
- * @summary Check whether File.createTempFile can handle special parameters
- * on Windows platforms
- * @author Dan Xu
-@@ -34,7 +34,9 @@
-
- public class SpecialTempFile {
-
-- private static void test(String name, String[] prefix, String[] suffix) {
-+ private static void test(String name, String[] prefix, String[] suffix,
-+ boolean expectedException) throws IOException
-+ {
- if (prefix == null || suffix == null
- || prefix.length != suffix.length)
- {
-@@ -42,39 +44,59 @@
- }
-
- final String exceptionMsg = "Unable to create temporary file";
-- final String errMsg = "IOException is expected";
-
- for (int i = 0; i < prefix.length; i++) {
- boolean exceptionThrown = false;
- File f = null;
-- System.out.println("In test " + name
-- + ", creating temp file with prefix, "
-- + prefix[i] + ", suffix, " + suffix[i]);
-- try {
-- f = File.createTempFile(prefix[i], suffix[i]);
-- } catch (IOException e) {
-- if (exceptionMsg.equals(e.getMessage()))
-- exceptionThrown = true;
-- else
-- System.out.println("Wrong error message:" + e.getMessage());
-+
-+ String[] dirs = { null, "." };
-+
-+ for (String dir : dirs ) {
-+ System.out.println("In test " + name +
-+ ", creating temp file with prefix, " +
-+ prefix[i] + ", suffix, " + suffix[i] +
-+ ", in dir, " + dir);
-+
-+ try {
-+ if (dir == null || dir.isEmpty())
-+ f = File.createTempFile(prefix[i], suffix[i]);
-+ else
-+ f = File.createTempFile(prefix[i], suffix[i], new File(dir));
-+ } catch (IOException e) {
-+ if (expectedException) {
-+ if (e.getMessage().startsWith(exceptionMsg))
-+ exceptionThrown = true;
-+ else
-+ System.out.println("Wrong error message:" +
-+ e.getMessage());
-+ } else {
-+ throw e;
-+ }
-+ }
-+
-+ if (expectedException && (!exceptionThrown || f != null))
-+ throw new RuntimeException("IOException is expected");
- }
-- if (!exceptionThrown || f != null)
-- throw new RuntimeException(errMsg);
- }
- }
-
- public static void main(String[] args) throws Exception {
-+ // Test JDK-8025128
-+ String[] goodPre = { "///..///", "/foo" };
-+ String[] goodSuf = { ".temp", ".tmp" };
-+ test("goodName", goodPre, goodSuf, false);
-+
-+ // Test JDK-8011950
-+ String[] slashPre = { "temp", "///..///", "/foo" };
-+ String[] slashSuf = { "///..///..", "///..///..", "///..///.." };
-+ test("SlashedName", slashPre, slashSuf, true);
-+
- if (!System.getProperty("os.name").startsWith("Windows"))
- return;
-
- // Test JDK-8013827
- String[] resvPre = { "LPT1.package.zip", "com7.4.package.zip" };
- String[] resvSuf = { ".temp", ".temp" };
-- test("ReservedName", resvPre, resvSuf);
--
-- // Test JDK-8011950
-- String[] slashPre = { "///..///", "temp", "///..///" };
-- String[] slashSuf = { ".temp", "///..///..", "///..///.." };
-- test("SlashedName", slashPre, slashSuf);
-+ test("ReservedName", resvPre, resvSuf, true);
- }
- }
---- ./jdk/test/java/io/FileOutputStream/ManyFiles.java 2013-09-06 11:29:29.000000000 -0700
-+++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java 2014-10-28 20:19:52.000000000 -0700
-@@ -43,7 +43,7 @@
- // Windows capability it is much simpler to only run it
- // on that platform.
- String osName = System.getProperty("os.name");
-- if (osName.startsWith("Linux")||osName.startsWith("SunOS"))
-+ if (osName.startsWith("Linux")||osName.startsWith("SunOS")||osName.endsWith("BSD")||osName.contains("OS X"))
- return;
-
- 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 2014-07-15 21:49:32.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -22,7 +22,8 @@
- */
-
- /* @test
-- @bug 4167937
-+ @bug 4167937 8023964
-+ @ignore Test truncates system files when run as root, see 7042603
- @summary Test code paths that use the JVM_LastErrorString procedure
- */
-
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -41,7 +41,7 @@
- # Need to determine the classpath separator and filepath separator based on the
- # operating system.
- case "$OS" in
--SunOS | Linux | Darwin )
-+SunOS | Linux | *BSD | Darwin )
- PS=":" ;;
- 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-10-28 20:19:52.000000000 -0700
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":" ;;
- 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-10-28 20:19:52.000000000 -0700
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":" ;;
- Windows* | CYGWIN* )
- PS=";" ;;
---- ./jdk/test/java/io/Serializable/unresolvableObjectStreamClass/UnresolvableObjectStreamClass.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/io/Serializable/unresolvableObjectStreamClass/UnresolvableObjectStreamClass.java 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,68 @@
-+/*
-+ * 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 8039396
-+ * @run main UnresolvableObjectStreamClass serialize
-+ * @clean MySerializable
-+ * @run main UnresolvableObjectStreamClass deserialize
-+ *
-+ * @summary NPE when writing a class descriptor object to a custom
-+ * ObjectOutputStream
-+ */
-+
-+import java.io.*;
-+
-+public class UnresolvableObjectStreamClass {
-+ public static void main(String[] args) throws Throwable {
-+ if (args.length > 0 && args[0].equals("serialize")) {
-+ try (FileOutputStream fos = new FileOutputStream("temp1.ser");
-+ ObjectOutputStream oos = new ObjectOutputStream(fos)) {
-+ ObjectStreamClass osc =
-+ ObjectStreamClass.lookup(MySerializable.class);
-+ oos.writeObject(osc);
-+ }
-+ } else if (args.length > 0 && args[0].equals("deserialize")) {
-+ try (FileInputStream fis = new FileInputStream("temp1.ser");
-+ ObjectInputStream ois = new ObjectInputStream(fis);
-+ FileOutputStream fos = new FileOutputStream("temp2.ser");
-+ ObjectOutputStream oos = new ObjectOutputStream(fos) {
-+ /*must be subclassed*/}) {
-+ ObjectStreamClass osc = (ObjectStreamClass)ois.readObject();
-+ // serialize it again
-+ try {
-+ oos.writeObject(osc);
-+ } catch (NullPointerException e) {
-+ throw new RuntimeException("Failed to write" +
-+ " unresolvable ObjectStreamClass", e);
-+ }
-+ }
-+ } else {
-+ throw new RuntimeException("The command line option must be" +
-+ " one of: serialize or deserialize");
-+ }
-+ }
-+}
-+
-+class MySerializable implements Serializable {
-+}
---- ./jdk/test/java/lang/Class/checkMemberAccess/CheckMemberAccess.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/Class/checkMemberAccess/CheckMemberAccess.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,123 @@
-+/*
-+ * 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.IOException;
-+import java.lang.reflect.Method;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+
-+/*
-+ * @test
-+ * @bug 8021368
-+ * @summary SecurityManager.checkMemberAccess call should not resolve
-+ * and load other classes
-+ * @run main/othervm/policy=test.policy CheckMemberAccess
-+ */
-+
-+public class CheckMemberAccess {
-+ private static int count = 0;
-+ public static void main(String[] args) throws Exception {
-+ String testClasses = System.getProperty("test.classes", ".");
-+ // remove Foo class
-+ // the test will verify SecurityManager.checkMemberAccess should not
-+ // cause any class loading of implementation classes
-+ Path p = Paths.get(testClasses, "CheckMemberAccess$Foo.class");
-+ if (Files.exists(p)) {
-+ // Foo already deleted in rerun
-+ Files.delete(p);
-+ }
-+ // patch the checkMemberAcces_ method name
-+ patch(Paths.get(testClasses, "CheckMemberAccess$PrivateCheckMemberAccess.class"));
-+ patch(Paths.get(testClasses, "CheckMemberAccess$StaticCheckMemberAccess.class"));
-+
-+ test(new OverriddedCheckMemberAccess(), count+1);
-+ test(new NoOverriddedCheckMemberAccess(), count+1);
-+ test(new PrivateCheckMemberAccess(), count);
-+ test(new StaticCheckMemberAccess(), count);
-+ }
-+
-+ private static void patch(Path p) throws IOException {
-+ // s/checkMemberAcces_/checkMemberAccess
-+ byte[] bytes = Files.readAllBytes(p);
-+ int len = "Acces_".length();
-+ for (int i=0; i < bytes.length-len; i++) {
-+ if (bytes[i] == 'A' &&
-+ bytes[i+1] == 'c' &&
-+ bytes[i+2] == 'c' &&
-+ bytes[i+3] == 'e' &&
-+ bytes[i+4] == 's' &&
-+ bytes[i+5] == '_') {
-+ bytes[i+5] = 's';
-+ break;
-+ }
-+ }
-+ Files.write(p, bytes);
-+ }
-+
-+ public void findMe() {};
-+ public static void test(SecurityManager smgr, int expected) throws Exception {
-+ System.setSecurityManager(smgr);
-+ // this will trigger SecurityManager.checkMemberAccess to be called
-+ Method m = CheckMemberAccess.class.getMethod("findMe", new Class<?>[0]);
-+ if (count != expected) {
-+ throw new RuntimeException(smgr.getClass() + ": " + count + " != " + expected);
-+ }
-+ }
-+
-+ static class OverriddedCheckMemberAccess extends SecurityManager {
-+ @Override
-+ public void checkMemberAccess(Class<?> clazz, int which) {
-+ System.out.println("OverriddedCheckMemberAccess.checkMemberAccess called");
-+ count++;
-+ }
-+ // implementation-specific class should not be loaded when
-+ // this.checkMemberAccess is called
-+ public Foo foo() {
-+ return null;
-+ }
-+ }
-+ static class NoOverriddedCheckMemberAccess extends OverriddedCheckMemberAccess {
-+ }
-+ static class PrivateCheckMemberAccess extends SecurityManager {
-+ private void checkMemberAcces_(Class<?> clazz, int which) {
-+ throw new RuntimeException("should not reach here");
-+ }
-+ // implementation-specific class should not be loaded when
-+ // this.checkMemberAccess is called
-+ public Foo foo() {
-+ return null;
-+ }
-+ }
-+ static class StaticCheckMemberAccess extends SecurityManager {
-+ public static void checkMemberAcces_(Class<?> clazz, int which) {
-+ throw new RuntimeException("should not reach here");
-+ }
-+ // implementation-specific class should not be loaded when
-+ // this.checkMemberAccess is called
-+ public Foo foo() {
-+ return null;
-+ }
-+ }
-+ static class Foo {}
-+}
---- ./jdk/test/java/lang/Class/checkMemberAccess/test.policy 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/Class/checkMemberAccess/test.policy 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,6 @@
-+grant {
-+ permission java.lang.RuntimePermission "createSecurityManager";
-+ permission java.lang.RuntimePermission "setSecurityManager";
-+ permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
-+ permission java.util.PropertyPermission "*", "read";
-+};
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -45,13 +45,7 @@
- # set platform-specific variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- FS="/"
-- ;;
-- Linux )
-- FS="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FS="/"
- ;;
- 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-10-28 20:19:52.000000000 -0700
-@@ -49,13 +49,7 @@
- # set platform-specific variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- FS="/"
-- ;;
-- Linux )
-- FS="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- 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-07-15 21:49:32.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
- */
-
-@@ -295,11 +296,15 @@
- System.exit(5);
- System.err.print("standard error");
- System.out.print("standard output");
-- } else if (action.equals("testInheritIO")) {
-+ } else if (action.equals("testInheritIO")
-+ || action.equals("testRedirectInherit")) {
- List<String> childArgs = new ArrayList<String>(javaChildArgs);
- childArgs.add("testIO");
- ProcessBuilder pb = new ProcessBuilder(childArgs);
-- pb.inheritIO();
-+ if (action.equals("testInheritIO"))
-+ pb.inheritIO();
-+ else
-+ redirectIO(pb, INHERIT, INHERIT, INHERIT);
- ProcessResults r = run(pb);
- if (! r.out().equals(""))
- System.exit(7);
-@@ -554,9 +559,10 @@
- System.getProperty("java.class.path");
-
- private static final List<String> javaChildArgs =
-- Arrays.asList(new String[]
-- { javaExe, "-classpath", absolutifyPath(classpath),
-- "Basic$JavaChild"});
-+ Arrays.asList(javaExe,
-+ "-XX:+DisplayVMOutputToStderr",
-+ "-classpath", absolutifyPath(classpath),
-+ "Basic$JavaChild");
-
- private static void testEncoding(String encoding, String tested) {
- try {
-@@ -988,10 +994,10 @@
- // Note that this requires __FOUR__ nested JVMs involved in one test,
- // if you count the harness JVM.
- //----------------------------------------------------------------
-- {
-+ for (String testName : new String[] { "testInheritIO", "testRedirectInherit" } ) {
- redirectIO(pb, PIPE, PIPE, PIPE);
- List<String> command = pb.command();
-- command.set(command.size() - 1, "testInheritIO");
-+ command.set(command.size() - 1, testName);
- Process p = pb.start();
- new PrintStream(p.getOutputStream()).print("standard input");
- p.getOutputStream().close();
-@@ -1592,8 +1598,8 @@
- javaExe));
- list.add("ArrayOOME");
- ProcessResults r = run(new ProcessBuilder(list));
-- check(r.out().contains("java.lang.OutOfMemoryError:"));
-- check(r.out().contains(javaExe));
-+ check(r.err().contains("java.lang.OutOfMemoryError:"));
-+ check(r.err().contains(javaExe));
- check(r.err().contains(System.getProperty("java.version")));
- equal(r.exitValue(), 1);
- } catch (Throwable t) { unexpected(t); }
---- ./jdk/test/java/lang/ProcessBuilder/BasicLauncher.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/ProcessBuilder/BasicLauncher.java 2014-07-15 21:49:32.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/ProcessBuilder/InheritIO/InheritIO.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,47 @@
-+/*
-+ * 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 static java.lang.ProcessBuilder.Redirect.*;
-+
-+class InheritIO {
-+
-+ public static class TestInheritIO {
-+ public static void main(String args[]) throws Throwable {
-+ int err = new ProcessBuilder(args).inheritIO().start().waitFor();
-+ System.err.print("exit value: " + err);
-+ System.exit(err);
-+ }
-+ }
-+
-+ public static class TestRedirectInherit {
-+ public static void main(String args[]) throws Throwable {
-+ int err = new ProcessBuilder(args)
-+ .redirectInput(INHERIT)
-+ .redirectOutput(INHERIT)
-+ .redirectError(INHERIT)
-+ .start().waitFor();
-+ System.err.print("exit value: " + err);
-+ System.exit(err);
-+ }
-+ }
-+}
---- ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh 2014-07-15 21:49:32.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.
-+#
-+
-+# @test
-+# @bug 8023130
-+# @summary (process) ProcessBuilder#inheritIO does not work on Windows
-+# @run shell InheritIO.sh
-+
-+if [ "x${TESTSRC}" = "x" ]; then
-+ echo "TESTSRC not set. Test cannot execute. Failed."
-+ exit 1
-+fi
-+
-+if [ "x${TESTJAVA}" = "x" ]; then
-+ echo "TESTJAVA not set. Test cannot execute. Failed."
-+ exit 1
-+fi
-+
-+
-+JAVA="${TESTJAVA}/bin/java"
-+JAVAC="${TESTJAVA}/bin/javac"
-+
-+cp -f ${TESTSRC}/InheritIO.java .
-+
-+# compile the class ourselves, so this can run as a standalone test
-+
-+${JAVAC} InheritIO.java
-+RES="$?"
-+if [ ${RES} != 0 ]; then
-+ echo 'FAIL: Cannot compile InheritIO.java'
-+ exit ${RES}
-+fi
-+
-+
-+for TEST_NAME in TestInheritIO TestRedirectInherit
-+do
-+ ${JAVA} ${TESTVMOPTS} -classpath . \
-+ 'InheritIO$'${TEST_NAME} printf message > stdout.txt 2> stderr.txt
-+
-+ RES="$?"
-+ if [ ${RES} != 0 ]; then
-+ echo 'FAIL: InheritIO$'${TEST_NAME}' failed with '${RES}
-+ exit ${RES}
-+ fi
-+
-+ OUT_EXPECTED='message'
-+ OUT_RECEIVED=`cat stdout.txt`
-+ if [ "x${OUT_RECEIVED}" != "x${OUT_EXPECTED}" ]; then
-+ echo "FAIL: unexpected '${OUT_RECEIVED}' in stdout"
-+ exit 1
-+ fi
-+
-+ ERR_EXPECTED='exit value: 0'
-+ ERR_RECEIVED=`cat stderr.txt`
-+ if [ "x${ERR_RECEIVED}" != "x${ERR_EXPECTED}" ]; then
-+ echo "FAIL: unexpected '${ERR_RECEIVED}' in stderr"
-+ exit 1
-+ fi
-+done
-+
-+echo 'PASS: InheritIO works as expected'
---- ./jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,147 @@
-+/*
-+ * 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 7147084
-+ * @run main/othervm InheritIOEHandle
-+ * @summary inherit IOE handles and MS CreateProcess limitations (kb315939)
-+ */
-+
-+import java.io.BufferedReader;
-+import java.io.File;
-+import java.io.IOException;
-+import java.io.InputStreamReader;
-+
-+public class InheritIOEHandle {
-+ private static enum APP {
-+ B, C;
-+ }
-+ private static File stopC = new File(".\\StopC.txt");
-+ private static String SIGNAL = "After call child process";
-+ private static String JAVA_EXE = System.getProperty("java.home")
-+ + File.separator + "bin"
-+ + File.separator + "java";
-+
-+ private static String[] getCommandArray(String processName) {
-+ String[] cmdArray = {
-+ JAVA_EXE,
-+ "-cp",
-+ System.getProperty("java.class.path"),
-+ InheritIOEHandle.class.getName(),
-+ processName
-+ };
-+ return cmdArray;
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ if (!System.getProperty("os.name").startsWith("Windows")) {
-+ return;
-+ }
-+
-+ if (args.length > 0) {
-+ APP app = APP.valueOf(args[0]);
-+ switch (app) {
-+ case B:
-+ performB();
-+ break;
-+ case C:
-+ performC();
-+ break;
-+ }
-+ return;
-+ }
-+ performA();
-+ }
-+
-+ private static void performA() {
-+ try {
-+ stopC.delete();
-+
-+ ProcessBuilder builder = new ProcessBuilder(
-+ getCommandArray(APP.B.name()));
-+ builder.redirectErrorStream(true);
-+
-+ Process process = builder.start();
-+
-+ process.getOutputStream().close();
-+ process.getErrorStream().close();
-+
-+ try (BufferedReader in = new BufferedReader( new InputStreamReader(
-+ process.getInputStream(), "utf-8")))
-+ {
-+ String result;
-+ while ((result = in.readLine()) != null) {
-+ if (!SIGNAL.equals(result)) {
-+ throw new Error("Catastrophe in process B! Bad output.");
-+ }
-+ }
-+ }
-+
-+ // If JDK-7147084 is not fixed that point is unreachable.
-+
-+ // write signal file
-+ stopC.createNewFile();
-+
-+ System.err.println("Read stream finished.");
-+ } catch (IOException ex) {
-+ throw new Error("Catastrophe in process A!", ex);
-+ }
-+ }
-+
-+ private static void performB() {
-+ try {
-+ ProcessBuilder builder = new ProcessBuilder(
-+ getCommandArray(APP.C.name()));
-+
-+ Process process = builder.start();
-+
-+ process.getInputStream().close();
-+ process.getOutputStream().close();
-+ process.getErrorStream().close();
-+
-+ System.out.println(SIGNAL);
-+
-+ // JDK-7147084 subject:
-+ // Process C inherits the [System.out] handle and
-+ // handle close in B does not finalize the streaming for A.
-+ // (handle reference count > 1).
-+ } catch (IOException ex) {
-+ throw new Error("Catastrophe in process B!", ex);
-+ }
-+ }
-+
-+ private static void performC() {
-+ // If JDK-7147084 is not fixed the loop is 5min long.
-+ for (int i = 0; i < 5*60; ++i) {
-+ try {
-+ Thread.sleep(1000);
-+ // check for sucess
-+ if (stopC.exists())
-+ break;
-+ } catch (InterruptedException ex) {
-+ // that is ok. Longer sleep - better effect.
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,205 @@
-+/*
-+ * 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 6921885
-+ * @run main/othervm SiblingIOEHandle
-+ * @summary inherit IOE handles and MS CreateProcess limitations (kb315939)
-+ */
-+
-+import java.io.BufferedReader;
-+import java.io.File;
-+import java.io.IOException;
-+import java.io.InputStreamReader;
-+import java.util.concurrent.BrokenBarrierException;
-+import java.util.concurrent.CyclicBarrier;
-+
-+public class SiblingIOEHandle {
-+ private static enum APP {
-+ B, C;
-+ }
-+ private static File stopC = new File(".\\StopCs.txt");
-+ private static String SIGNAL = "B child reported.";
-+ private static String JAVA_EXE = System.getProperty("java.home")
-+ + File.separator + "bin"
-+ + File.separator + "java";
-+
-+ private static String[] getCommandArray(String processName) {
-+ String[] cmdArray = {
-+ JAVA_EXE,
-+ "-cp",
-+ System.getProperty("java.class.path"),
-+ SiblingIOEHandle.class.getName(),
-+ processName
-+ };
-+ return cmdArray;
-+ }
-+
-+ public static void main(String[] args) {
-+ if (!System.getProperty("os.name").startsWith("Windows")) {
-+ return;
-+ }
-+
-+ if (args.length > 0) {
-+ APP app = APP.valueOf(args[0]);
-+ switch (app) {
-+ case B:
-+ performB();
-+ break;
-+ case C:
-+ performC();
-+ break;
-+ }
-+ return;
-+ }
-+ performA(true);
-+ performA(false);
-+ }
-+
-+ static boolean procClaunched = false;
-+
-+ private static void waitAbit() {
-+ try {
-+ Thread.sleep(0);
-+ } catch (InterruptedException ex) {
-+ // that was long enough
-+ }
-+ }
-+ private static boolean waitBarrier(CyclicBarrier barrier) {
-+ while (true) try {
-+ barrier.await();
-+ return true;
-+ } catch (InterruptedException ex) {
-+ continue;
-+ } catch (BrokenBarrierException ex) {
-+ ex.printStackTrace();
-+ return false;
-+ }
-+ }
-+
-+ private static void performA(boolean fileOut) {
-+ try {
-+ stopC.delete();
-+ ProcessBuilder builderB = new ProcessBuilder(
-+ getCommandArray(APP.B.name()));
-+
-+ File outB = null;
-+ if (fileOut) {
-+ outB = new File("outB.txt");
-+ builderB.redirectOutput(outB);
-+ }
-+ builderB.redirectErrorStream(true);
-+
-+ final CyclicBarrier barrier = new CyclicBarrier(2);
-+ Thread procCRunner = new Thread(new Runnable() {
-+ @Override public void run() {
-+ try {
-+ if (waitBarrier(barrier)) {
-+ waitAbit();
-+ // Run process C next to B ASAP to make an attempt
-+ // to capture the B-process IOE handles in C process.
-+ Runtime.getRuntime().exec(getCommandArray(APP.C.name()));
-+ procClaunched = true;
-+ }
-+ } catch (IOException ex) {
-+ ex.printStackTrace();
-+ }
-+ }
-+ });
-+ procCRunner.start();
-+
-+
-+ if (!waitBarrier(barrier)) {
-+ throw new Error("Catastrophe in process A! Synchronization failed.");
-+ }
-+ // Run process B first.
-+ Process processB = builderB.start();
-+
-+ while (true) try {
-+ procCRunner.join();
-+ break;
-+ } catch (InterruptedException ex) {
-+ continue;
-+ }
-+
-+ if (!procClaunched) {
-+ throw new Error("Catastrophe in process A! C was not launched.");
-+ }
-+
-+ processB.getOutputStream().close();
-+ processB.getErrorStream().close();
-+
-+ if (fileOut) {
-+ try {
-+ processB.waitFor();
-+ } catch (InterruptedException ex) {
-+ throw new Error("Catastrophe in process B! B hung up.");
-+ }
-+ System.err.println("Trying to delete [outB.txt].");
-+ if (!outB.delete()) {
-+ throw new Error("Greedy brother C deadlock! File share.");
-+ }
-+ System.err.println("Succeeded in delete [outB.txt].");
-+ } else {
-+ System.err.println("Read stream start.");
-+ try (BufferedReader in = new BufferedReader( new InputStreamReader(
-+ processB.getInputStream(), "utf-8")))
-+ {
-+ String result;
-+ while ((result = in.readLine()) != null) {
-+ if (!SIGNAL.equals(result)) {
-+ throw new Error("Catastrophe in process B! Bad output.");
-+ }
-+ }
-+ }
-+ System.err.println("Read stream finished.");
-+ }
-+ // If JDK-6921885 is not fixed that point is unreachable.
-+ // Test timeout exception.
-+
-+ // write signal file to stop C process.
-+ stopC.createNewFile();
-+ } catch (IOException ex) {
-+ throw new Error("Catastrophe in process A!", ex);
-+ }
-+ }
-+
-+ private static void performB() {
-+ System.out.println(SIGNAL);
-+ }
-+
-+ private static void performC() {
-+ // If JDK-7147084 is not fixed the loop is 5min long.
-+ for (int i = 0; i < 5*60; ++i) {
-+ try {
-+ Thread.sleep(1000);
-+ // check for sucess
-+ if (stopC.exists())
-+ break;
-+ } catch (InterruptedException ex) {
-+ // that is ok. Longer sleep - better effect.
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/java/lang/Runtime/exec/CloseRace.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/Runtime/exec/CloseRace.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,146 @@
-+/*
-+ * 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 8024521
-+ * @summary Closing ProcessPipeInputStream at the time the process exits is racy
-+ * and leads to the data corruption.
-+ * @library /lib/testlibrary
-+ * @run main/othervm/timeout=80 CloseRace
-+ */
-+
-+/**
-+ * This test has a little chance to catch the race during the given default
-+ * time gap of 20 seconds. To increase the time gap, set the system property
-+ * CloseRaceTimeGap=N to the number of seconds.
-+ * Jtreg's timeoutFactor should also be set appropriately.
-+ *
-+ * For example, to run the test for 10 minutes:
-+ * > jtreg \
-+ * -testjdk:$(PATH_TO_TESTED_JDK) \
-+ * -timeoutFactor:10 \
-+ * -DCloseRaceTimeGap=600 \
-+ * $(PATH_TO_TESTED_JDK_SOURCE)/test/java/lang/Runtime/exec/CloseRace.java
-+ */
-+
-+import java.io.*;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.LinkedList;
-+import java.util.List;
-+import jdk.testlibrary.OutputAnalyzer;
-+import static jdk.testlibrary.ProcessTools.*;
-+
-+public class CloseRace {
-+
-+ public static void main(String args[]) throws Exception {
-+ ProcessBuilder pb = createJavaProcessBuilder("-Xmx64M", "CloseRace$Child",
-+ System.getProperty("CloseRaceTimeGap", "20"));
-+ OutputAnalyzer oa = new OutputAnalyzer(pb.start());
-+ oa.stderrShouldNotContain("java.lang.OutOfMemoryError");
-+ }
-+
-+ public static class Child {
-+ private static final String BIG_FILE = "bigfile";
-+ private static final String SMALL_FILE = "smallfile";
-+ private static int timeGap = 20; // seconds
-+
-+ public static void main(String args[]) throws Exception {
-+ if (args.length > 0) {
-+ try {
-+ timeGap = Integer.parseInt(args[0]);
-+ timeGap = Math.max(timeGap, 10);
-+ timeGap = Math.min(timeGap, 10 * 60 * 60); // no more than 10 hours
-+ } catch (NumberFormatException ignore) {}
-+ }
-+ try (RandomAccessFile f = new RandomAccessFile(BIG_FILE, "rw")) {
-+ f.setLength(1024 * 1024 * 1024); // 1 Gb, greater than max heap size
-+ }
-+ try (FileOutputStream fs = new FileOutputStream(SMALL_FILE);
-+ PrintStream ps = new PrintStream(fs)) {
-+ for (int i = 0; i < 128; ++i)
-+ ps.println("line of text");
-+ }
-+
-+ List<Thread> threads = new LinkedList<>();
-+ for (int i = 0; i < 99; ++i) {
-+ Thread t = new Thread (new OpenLoop());
-+ t.start();
-+ threads.add(t);
-+ }
-+ Thread t2 = new Thread (new ExecLoop());
-+ t2.start();
-+ threads.add(t2);
-+
-+ Thread.sleep(timeGap);
-+
-+ for (Thread t : threads) {
-+ t.interrupt();
-+ t.join();
-+ }
-+ }
-+
-+ private static class OpenLoop implements Runnable {
-+ public void run() {
-+ final Path bigFilePath = Paths.get(BIG_FILE);
-+ while (!Thread.interrupted()) {
-+ try (InputStream in = Files.newInputStream(bigFilePath)) {
-+ // Widen the race window by sleeping 1ms
-+ Thread.sleep(1);
-+ } catch (InterruptedException e) {
-+ break;
-+ } catch (Exception e) {
-+ System.err.println(e);
-+ }
-+ }
-+ }
-+ }
-+
-+ private static class ExecLoop implements Runnable {
-+ public void run() {
-+ List<String> command = new ArrayList<>(
-+ Arrays.asList("/bin/cat", SMALL_FILE));
-+ while (!Thread.interrupted()) {
-+ try {
-+ ProcessBuilder builder = new ProcessBuilder(command);
-+ final Process process = builder.start();
-+ InputStream is = process.getInputStream();
-+ InputStreamReader isr = new InputStreamReader(is);
-+ BufferedReader br = new BufferedReader(isr);
-+ while (br.readLine() != null) {}
-+ process.waitFor();
-+ isr.close();
-+ } catch (InterruptedException e) {
-+ break;
-+ } catch (Exception e) {
-+ System.err.println(e);
-+ }
-+ }
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/java/lang/SecurityManager/CheckPackageAccess.java 2013-09-06 11:29:33.000000000 -0700
-+++ ./jdk/test/java/lang/SecurityManager/CheckPackageAccess.java 2014-07-15 21:49:32.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 6741606 7146431 8000450
-+ * @bug 6741606 7146431 8000450 8022945
- * @summary Make sure all restricted packages listed in the package.access
- * property in the java.security file are blocked
- * @run main/othervm CheckPackageAccess
-@@ -54,7 +54,9 @@
- "com.sun.imageio.",
- "com.sun.istack.internal.",
- "com.sun.jmx.",
-+ "com.sun.naming.internal.",
- "com.sun.proxy.",
-+ "com.sun.corba.se.",
- "com.sun.org.apache.bcel.internal.",
- "com.sun.org.apache.regexp.internal.",
- "com.sun.org.apache.xerces.internal.",
-@@ -74,6 +76,7 @@
- "com.sun.org.apache.xml.internal.serializer.utils.",
- "com.sun.org.apache.xml.internal.utils.",
- "com.sun.org.glassfish.",
-+ "com.sun.script.",
- "oracle.jrockit.jfr.",
- "org.jcp.xml.dsig.internal.",
- };
---- ./jdk/test/java/lang/String/ToLowerCase.java 2013-09-06 11:29:33.000000000 -0700
-+++ ./jdk/test/java/lang/String/ToLowerCase.java 2014-07-15 21:49:32.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- @test
-- @bug 4217441 4533872 4900935
-+ @bug 4217441 4533872 4900935 8020037
- @summary toLowerCase should lower-case Greek Sigma correctly depending
- on the context (final/non-final). Also it should handle
- Locale specific (lt, tr, and az) lowercasings and supplementary
-@@ -69,10 +69,11 @@
- test("\u00CD", Locale.US, "\u00ED");
- test("\u0128", Locale.US, "\u0129");
-
-- // I-dot tests (Turkish and Azeri)
-+ // I-dot tests
- test("\u0130", turkish, "i");
- test("\u0130", az, "i");
-- test("\u0130", Locale.US, "i\u0307");
-+ test("\u0130", lt, "i");
-+ test("\u0130", Locale.US, "i");
-
- // Remove dot_above in the sequence I + dot_above (Turkish and Azeri)
- test("I\u0307", turkish, "i");
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2013-09-06 11:29:33.000000000 -0700
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -30,7 +30,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin) ;;
-+ SunOS | Linux | *BSD | Darwin) ;;
- Windows* | CYGWIN* )
- echo "Passed"; exit 0 ;;
- * ) echo "Unrecognized system!" ; exit 1 ;;
---- ./jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,66 @@
-+/*
-+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/**
-+ * Check that the value of file.encoding and sun.jnu.encoding match the expected
-+ * values passed in on the command-line.
-+ */
-+public class ExpectedEncoding {
-+ public static void main(String[] args) {
-+ boolean failed = false;
-+ if (args.length != 2) {
-+ System.out.println("Usage:");
-+ System.out.println("$ java ExpectedEncoding <expected file.encoding> <expected sun.jnu.encoding>");
-+ System.out.println("$ use \"skip\" to skip checking property's value");
-+ System.exit(1);
-+ }
-+ String expectFileEnc = args[0];
-+ String expectSunJnuEnc = args[1];
-+
-+ String fileEnc = System.getProperty("file.encoding");
-+ String jnuEnc = System.getProperty("sun.jnu.encoding");
-+
-+ if ("skip".equals(expectFileEnc)) {
-+ System.err.println("Expected file.encoding is \"skip\", ignoring");
-+ } else {
-+ System.err.println("Expected file.encoding: " + expectFileEnc);
-+ System.err.println("Actual file.encoding: " + fileEnc);
-+ if (fileEnc == null || !fileEnc.equals(expectFileEnc)) {
-+ failed = true;
-+ }
-+ }
-+ if ("skip".equals(expectSunJnuEnc)) {
-+ System.err.println("Expected sun.jnu.encoding is \"skip\", ignoring");
-+ } else {
-+ if (jnuEnc == null || !jnuEnc.equals(expectSunJnuEnc)) {
-+ System.err.println("Expected sun.jnu.encoding: " + expectSunJnuEnc);
-+ System.err.println("Actual sun.jnu.encoding: " + jnuEnc);
-+ failed = true;
-+ }
-+ }
-+
-+ if (failed) {
-+ throw new RuntimeException("Test Failed");
-+ }
-+ }
-+}
---- ./jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.sh 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.sh 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,96 @@
-+#!/bin/sh
-+
-+#
-+# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.com if you need additional information or have any
-+# questions.
-+
-+# @test
-+# @bug 8003228
-+# @summary Test the value of sun.jnu.encoding on Mac
-+# @author Brent Christian
-+#
-+# @run shell MacJNUEncoding.sh
-+
-+# Only run test on Mac
-+OS=`uname -s`
-+case "$OS" in
-+ Darwin ) ;;
-+ * )
-+ exit 0
-+ ;;
-+esac
-+
-+if [ "${TESTJAVA}" = "" ]
-+then
-+ echo "TESTJAVA not set. Test cannot execute. Failed."
-+ exit 1
-+fi
-+
-+if [ "${TESTSRC}" = "" ]
-+then
-+ echo "TESTSRC not set. Test cannot execute. Failed."
-+ exit 1
-+fi
-+
-+if [ "${TESTCLASSES}" = "" ]
-+then
-+ echo "TESTCLASSES not set. Test cannot execute. Failed."
-+ exit 1
-+fi
-+
-+JAVAC="${TESTJAVA}"/bin/javac
-+JAVA="${TESTJAVA}"/bin/java
-+
-+echo "Building test classes..."
-+"$JAVAC" -d "${TESTCLASSES}" "${TESTSRC}"/ExpectedEncoding.java
-+
-+echo ""
-+echo "Running test for C locale"
-+export LANG=C
-+export LC_ALL=C
-+"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding US-ASCII UTF-8
-+result1=$?
-+
-+echo ""
-+echo "Running test for en_US.UTF-8 locale"
-+export LANG=en_US.UTF-8
-+export LC_ALL=en_US.UTF-8
-+"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding UTF-8 UTF-8
-+result2=$?
-+
-+echo ""
-+echo "Cleanup"
-+rm ${TESTCLASSES}/ExpectedEncoding.class
-+
-+if [ ${result1} -ne 0 ] ; then
-+ echo "Test failed for C locale"
-+ echo " LANG=\"${LANG}\""
-+ echo " LC_ALL=\"${LC_ALL}\""
-+ exit ${result1}
-+fi
-+if [ ${result2} -ne 0 ] ; then
-+ echo "Test failed for en_US.UTF-8 locale"
-+ echo " LANG=\"${LANG}\""
-+ echo " LC_ALL=\"${LC_ALL}\""
-+ exit ${result2}
-+fi
-+exit 0
-+
---- ./jdk/test/java/lang/System/MacEncoding/TestFileEncoding.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/System/MacEncoding/TestFileEncoding.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,168 @@
-+/*
-+ * 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.*;
-+
-+/*
-+ * @test
-+ * @bug 8011194
-+ * @summary Test value of file.encoding for corresponding value of LANG, etc
-+ * @library ../../../../tools/launcher/ ../
-+ * @build TestHelper TestFileEncoding ExpectedEncoding
-+ * @run main TestFileEncoding UTF-8
-+ * @run main/othervm -Dfile.encoding=MyEncoding -DuserEncoding=MyEncoding TestFileEncoding MyEncoding
-+ * @run main TestFileEncoding UTF-8 en_US.UTF-8
-+ * @run main/othervm -Dfile.encoding=MyEncoding -DuserEncoding=MyEncoding TestFileEncoding MyEncoding en_US.UTF-8
-+ * @run main TestFileEncoding US-ASCII C
-+ * @run main/othervm -Dfile.encoding=MyEncoding -DuserEncoding=MyEncoding TestFileEncoding MyEncoding C
-+ * @author Brent Christian
-+ */
-+
-+/**
-+ * Setup the environment and run a sub-test to check the expected value of
-+ * file.encoding, based on the value(s) of encoding-related environment vars
-+ * (LANG, LC_ALL, LC_CTYPE).
-+ *
-+ * The first argument (required) is the expected value of the
-+ * file.encoding System property.
-+ * The second argument (optional) is the value to set to the LANG/etc env vars.
-+ */
-+public class TestFileEncoding {
-+ private static final String TEST_NAME = "ExpectedEncoding";
-+
-+ private String expectedEncoding; // Expected value for file.encoding
-+ private String langVar = null; // Value to set for LANG, etc
-+
-+ private static Set<String> envToRm = new HashSet<>(3);
-+ static {
-+ // Take these vars out of the test's run environment, possibly adding
-+ // our own value back in.
-+ envToRm.add("LANG");
-+ envToRm.add("LC_ALL");
-+ envToRm.add("LC_CTYPE");
-+ }
-+
-+ public TestFileEncoding(String expectedEncoding) {
-+ this.expectedEncoding = expectedEncoding;
-+ }
-+
-+ public TestFileEncoding(String expectedEncoding, String langVar) {
-+ this.expectedEncoding = expectedEncoding;
-+ this.langVar = langVar;
-+ }
-+
-+ /*
-+ * Launch ExpectedEncoding with the given parameters, check for the
-+ * expected file.encoding.
-+ */
-+ private void run() {
-+ String testClasses = System.getProperty("test.classes");
-+
-+ // Pick up VM opts
-+ String vmOptsStr = System.getProperty("test.vm.opts");
-+ System.out.println("test.vm.opts: " + vmOptsStr);
-+ String[] vmOpts = new String[0];
-+ if (vmOptsStr != null && !"".equals(vmOptsStr)) {
-+ vmOpts = vmOptsStr.split(" ");
-+ System.out.println("found vm options:");
-+ for (String opt : vmOpts) {
-+ System.out.println(" <" + opt + ">");
-+ }
-+ }
-+
-+ // Build java cmd
-+ LinkedList<String> cmdList = new LinkedList<>();
-+ cmdList.add(TestHelper.javaCmd);
-+ for (String vmOpt : vmOpts) {
-+ if (vmOpt != null && !vmOpt.equals("")) {
-+ cmdList.add(vmOpt);
-+ }
-+ }
-+
-+ // See if the user specified a file.encoding that we should pass through
-+ String userEncoding = System.getProperty("userEncoding");
-+ if (userEncoding != null) {
-+ cmdList.add("-Dfile.encoding="+userEncoding);
-+ }
-+
-+ cmdList.add("-cp");
-+ cmdList.add(testClasses);
-+ cmdList.add(TEST_NAME);
-+ cmdList.add(expectedEncoding);
-+ cmdList.add("skip"); // ignore sun.jnu.encoding for this test
-+
-+ String cmdArray[] = new String[cmdList.size()];
-+ cmdList.toArray(cmdArray);
-+
-+ // Run the test(s)
-+ if (langVar == null) {
-+ System.out.println("TestFileEncoding: Running with no envvars set");
-+ TestHelper.TestResult tr = TestHelper.doExec(null, envToRm,
-+ cmdArray);
-+ checkResult(tr);
-+ } else {
-+ runWithEnvVar("LANG", cmdArray);
-+ runWithEnvVar("LC_ALL", cmdArray);
-+ runWithEnvVar("LC_CTYPE", cmdArray);
-+ }
-+ }
-+
-+ /*
-+ * Run the test, setting the environment named by envVarName to the value
-+ * in langVar.
-+ */
-+ private void runWithEnvVar(String envVarName, String[] cmdArray) {
-+ Map<String, String> envToAdd = new HashMap<>(1);
-+ TestHelper.TestResult tr = null;
-+
-+ System.out.println("TestFileEncoding: Running with " + envVarName + "=" + langVar);
-+ envToAdd.put(envVarName, langVar);
-+ tr = TestHelper.doExec(envToAdd, envToRm, cmdArray);
-+ checkResult(tr);
-+ }
-+
-+ private void checkResult(TestHelper.TestResult tr) {
-+ System.out.println(tr);
-+ if (!tr.isOK()) {
-+ throw new RuntimeException("TEST FAILED: !tr.isOK()");
-+ }
-+ }
-+
-+ public static void main(String[] args) {
-+ TestFileEncoding cfe = null;
-+ if (!TestHelper.isMacOSX) {
-+ System.out.println("Test is currently only for Mac OS X - pass.");
-+ return;
-+ }
-+ if (args.length == 1) {
-+ cfe = new TestFileEncoding(args[0]);
-+ } else if (args.length == 2) {
-+ cfe = new TestFileEncoding(args[0], args[1]);
-+ } else {
-+ System.out.println("Usage: TestFileEncoding <expected file.encoding>");
-+ System.out.println(" TestFileEncoding <expected file.encoding> <value for LANG/etc env var>");
-+ return;
-+ }
-+ cfe.run();
-+ }
-+}
---- ./jdk/test/java/lang/System/MacJNUEncoding/ExpectedEncoding.java 2013-09-06 11:29:33.000000000 -0700
-+++ ./jdk/test/java/lang/System/MacJNUEncoding/ExpectedEncoding.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,56 +0,0 @@
--/*
-- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/**
-- * Check that the value of file.encoding and sun.jnu.encoding match the expected
-- * values passed in on the command-line.
-- */
--public class ExpectedEncoding {
-- public static void main(String[] args) {
-- boolean failed = false;
-- if (args.length != 2) {
-- System.out.println("Usage:");
-- System.out.println("$ java ExpectedEncoding <expected file.encoding> <expected sun.jnu.encoding>");
-- System.exit(1);
-- }
-- String expectFileEnc = args[0];
-- String expectSunJnuEnc = args[1];
--
-- String fileEnc = System.getProperty("file.encoding");
-- String jnuEnc = System.getProperty("sun.jnu.encoding");
--
-- if (fileEnc == null || !fileEnc.equals(expectFileEnc)) {
-- System.err.println("Expected file.encoding: " + expectFileEnc);
-- System.err.println("Actual file.encoding: " + fileEnc);
-- failed = true;
-- }
-- if (jnuEnc == null || !jnuEnc.equals(expectSunJnuEnc)) {
-- System.err.println("Expected sun.jnu.encoding: " + expectSunJnuEnc);
-- System.err.println("Actual sun.jnu.encoding: " + jnuEnc);
-- failed = true;
-- }
-- if (failed) {
-- throw new RuntimeException("Test Failed");
-- }
-- }
--}
---- ./jdk/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh 2013-09-06 11:29:33.000000000 -0700
-+++ ./jdk/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh 1969-12-31 16:00:00.000000000 -0800
-@@ -1,96 +0,0 @@
--#!/bin/sh
--
--#
--# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--
--# @test
--# @bug 8003228
--# @summary Test the value of sun.jnu.encoding on Mac
--# @author Brent Christian
--#
--# @run shell MacJNUEncoding.sh
--
--# Only run test on Mac
--OS=`uname -s`
--case "$OS" in
-- Darwin ) ;;
-- * )
-- exit 0
-- ;;
--esac
--
--if [ "${TESTJAVA}" = "" ]
--then
-- echo "TESTJAVA not set. Test cannot execute. Failed."
-- exit 1
--fi
--
--if [ "${TESTSRC}" = "" ]
--then
-- echo "TESTSRC not set. Test cannot execute. Failed."
-- exit 1
--fi
--
--if [ "${TESTCLASSES}" = "" ]
--then
-- echo "TESTCLASSES not set. Test cannot execute. Failed."
-- exit 1
--fi
--
--JAVAC="${TESTJAVA}"/bin/javac
--JAVA="${TESTJAVA}"/bin/java
--
--echo "Building test classes..."
--"$JAVAC" -d "${TESTCLASSES}" "${TESTSRC}"/ExpectedEncoding.java
--
--echo ""
--echo "Running test for C locale"
--export LANG=C
--export LC_ALL=C
--"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding US-ASCII UTF-8
--result1=$?
--
--echo ""
--echo "Running test for en_US.UTF-8 locale"
--export LANG=en_US.UTF-8
--export LC_ALL=en_US.UTF-8
--"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding UTF-8 UTF-8
--result2=$?
--
--echo ""
--echo "Cleanup"
--rm ${TESTCLASSES}/ExpectedEncoding.class
--
--if [ ${result1} -ne 0 ] ; then
-- echo "Test failed for C locale"
-- echo " LANG=\"${LANG}\""
-- echo " LC_ALL=\"${LC_ALL}\""
-- exit ${result1}
--fi
--if [ ${result2} -ne 0 ] ; then
-- echo "Test failed for en_US.UTF-8 locale"
-- echo " LANG=\"${LANG}\""
-- echo " LC_ALL=\"${LC_ALL}\""
-- exit ${result2}
--fi
--exit 0
--
---- ./jdk/test/java/lang/ThreadGroup/Suspend.java 2013-09-06 11:29:34.000000000 -0700
-+++ ./jdk/test/java/lang/ThreadGroup/Suspend.java 2014-07-15 21:49:32.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 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
-@@ -23,47 +23,55 @@
-
- /**
- * @test
-- * @bug 4176355
-+ * @bug 4176355 7181748
- * @summary Suspending a ThreadGroup that contains the current thread has
- * unpredictable results.
- */
-
- public class Suspend implements Runnable {
-- private static Thread first=null;
-- private static Thread second=null;
-- private static ThreadGroup group = new ThreadGroup("");
-- private static int count = 0;
--
-- Suspend() {
-- Thread thread = new Thread(group, this);
-- if (first == null)
-- first = thread;
-- else
-- second = thread;
-
-- thread.start();
-- }
-+ private static volatile int count = 0;
-+ private static final ThreadGroup group = new ThreadGroup("");
-+ private static final Thread first = new Thread(group, new Suspend());
-+ private static final Thread second = new Thread(group, new Suspend());
-
- public void run() {
- while (true) {
- try {
-- Thread.sleep(1000); // Give other thread a chance to start
-- if (Thread.currentThread() == first)
-- group.suspend();
-- else
-+ Thread.sleep(100);
-+ if (Thread.currentThread() == first) {
-+ if (second.isAlive()) {
-+ group.suspend();
-+ }
-+ } else {
- count++;
-- } catch(InterruptedException e){
-+ }
-+ } catch (InterruptedException e) {
- }
- }
- }
-
- public static void main(String[] args) throws Exception {
-- for (int i=0; i<2; i++)
-- new Suspend();
-- Thread.sleep(3000);
-+ // Launch two threads as part of the same thread group
-+ first.start();
-+ second.start();
-+
-+ // Wait for the thread group suspend to be issued
-+ while (!first.isAlive() || !second.isAlive()) {
-+ Thread.sleep(100);
-+ }
-+ Thread.sleep(1000);
-+ // Suppose, the thread group is now suspended
-+
-+ count = 0;
-+ Thread.sleep(1000);
-+
-+ // Increment of the count indicates that the second thread is still running
- boolean failed = (count > 1);
-- first.stop(); second.stop();
-- if (failed)
-+ first.stop();
-+ second.stop();
-+ if (failed) {
- throw new RuntimeException("Failure.");
-+ }
- }
- }
---- ./jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,101 @@
-+/*
-+ * 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 7122142
-+ * @summary Test deadlock situation when recursive annotations are parsed
-+ */
-+
-+import java.lang.annotation.Retention;
-+import java.lang.management.ManagementFactory;
-+import java.lang.management.ThreadInfo;
-+import java.lang.management.ThreadMXBean;
-+import java.util.concurrent.CountDownLatch;
-+import java.util.concurrent.atomic.AtomicInteger;
-+
-+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-+
-+public class AnnotationTypeDeadlockTest {
-+
-+ @Retention(RUNTIME)
-+ @AnnB
-+ public @interface AnnA {
-+ }
-+
-+ @Retention(RUNTIME)
-+ @AnnA
-+ public @interface AnnB {
-+ }
-+
-+ static class Task extends Thread {
-+ final CountDownLatch prepareLatch;
-+ final AtomicInteger goLatch;
-+ final Class<?> clazz;
-+
-+ Task(CountDownLatch prepareLatch, AtomicInteger goLatch, Class<?> clazz) {
-+ super(clazz.getSimpleName());
-+ setDaemon(true); // in case it deadlocks
-+ this.prepareLatch = prepareLatch;
-+ this.goLatch = goLatch;
-+ this.clazz = clazz;
-+ }
-+
-+ @Override
-+ public void run() {
-+ prepareLatch.countDown(); // notify we are prepared
-+ while (goLatch.get() > 0); // spin-wait before go
-+ clazz.getDeclaredAnnotations();
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ CountDownLatch prepareLatch = new CountDownLatch(2);
-+ AtomicInteger goLatch = new AtomicInteger(1);
-+ Task taskA = new Task(prepareLatch, goLatch, AnnA.class);
-+ Task taskB = new Task(prepareLatch, goLatch, AnnB.class);
-+ taskA.start();
-+ taskB.start();
-+ // wait until both threads start-up
-+ prepareLatch.await();
-+ // let them go
-+ goLatch.set(0);
-+ // obtain ThreadMXBean
-+ ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
-+ // wait for threads to finish or dead-lock
-+ while (taskA.isAlive() || taskB.isAlive()) {
-+ // attempt to join threads
-+ taskA.join(500L);
-+ taskB.join(500L);
-+ // detect dead-lock
-+ long[] deadlockedIds = threadBean.findMonitorDeadlockedThreads();
-+ if (deadlockedIds != null && deadlockedIds.length > 0) {
-+ StringBuilder sb = new StringBuilder("deadlock detected:\n\n");
-+ for (ThreadInfo ti : threadBean.getThreadInfo(deadlockedIds, Integer.MAX_VALUE)) {
-+ sb.append(ti);
-+ }
-+ throw new IllegalStateException(sb.toString());
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeRuntimeAssumptionTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/annotation/AnnotationType/AnnotationTypeRuntimeAssumptionTest.java 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,187 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * 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 7122142
-+ * @summary Test consistent parsing of ex-RUNTIME annotations that
-+ * were changed and separately compiled to have CLASS retention
-+ */
-+
-+import sun.misc.IOUtils;
-+
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.lang.annotation.Annotation;
-+import java.lang.annotation.Retention;
-+import java.lang.annotation.RetentionPolicy;
-+
-+import static java.lang.annotation.RetentionPolicy.CLASS;
-+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-+
-+/**
-+ * This test simulates a situation where there are two mutually recursive
-+ * {@link RetentionPolicy#RUNTIME RUNTIME} annotations {@link AnnA_v1 AnnA_v1}
-+ * and {@link AnnB AnnB} and then the first is changed to have
-+ * {@link RetentionPolicy#CLASS CLASS} retention and separately compiled.
-+ * When {@link AnnA_v1 AnnA_v1} annotation is looked-up on {@link AnnB AnnB}
-+ * it still appears to have {@link RetentionPolicy#RUNTIME RUNTIME} retention.
-+ */
-+public class AnnotationTypeRuntimeAssumptionTest {
-+
-+ @Retention(RUNTIME)
-+ @AnnB
-+ public @interface AnnA_v1 {
-+ }
-+
-+ // An alternative version of AnnA_v1 with CLASS retention instead.
-+ // Used to simulate separate compilation (see AltClassLoader below).
-+ @Retention(CLASS)
-+ @AnnB
-+ public @interface AnnA_v2 {
-+ }
-+
-+ @Retention(RUNTIME)
-+ @AnnA_v1
-+ public @interface AnnB {
-+ }
-+
-+ @AnnA_v1
-+ public static class TestTask implements Runnable {
-+ @Override
-+ public void run() {
-+ AnnA_v1 ann1 = getDeclaredAnnotation(TestTask.class, AnnA_v1.class);
-+ if (ann1 != null) {
-+ throw new IllegalStateException(
-+ "@" + ann1.annotationType().getSimpleName() +
-+ " found on: " + TestTask.class.getName() +
-+ " should not be visible at runtime");
-+ }
-+ AnnA_v1 ann2 = getDeclaredAnnotation(AnnB.class, AnnA_v1.class);
-+ if (ann2 != null) {
-+ throw new IllegalStateException(
-+ "@" + ann2.annotationType().getSimpleName() +
-+ " found on: " + AnnB.class.getName() +
-+ " should not be visible at runtime");
-+ }
-+ }
-+
-+ private static <A extends Annotation> A getDeclaredAnnotation(Class<?> clazz, Class<A> annotationClass) {
-+ for (Annotation ann : clazz.getDeclaredAnnotations()) {
-+ if (ann.annotationType() == annotationClass) {
-+ return annotationClass.cast(ann);
-+ }
-+ }
-+ return null;
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ ClassLoader altLoader = new AltClassLoader(
-+ AnnotationTypeRuntimeAssumptionTest.class.getClassLoader());
-+
-+ Runnable altTask = (Runnable) Class.forName(
-+ TestTask.class.getName(),
-+ true,
-+ altLoader).newInstance();
-+
-+ altTask.run();
-+ }
-+
-+ /**
-+ * A ClassLoader implementation that loads alternative implementations of
-+ * classes. If class name ends with "_v1" it locates instead a class with
-+ * name ending with "_v2" and loads that class instead.
-+ */
-+ static class AltClassLoader extends ClassLoader {
-+ AltClassLoader(ClassLoader parent) {
-+ super(parent);
-+ }
-+
-+ @Override
-+ protected Class<?> loadClass(String name, boolean resolve)
-+ throws ClassNotFoundException {
-+ if (name.indexOf('.') < 0) { // root package is our class
-+ synchronized (getClassLoadingLock(name)) {
-+ // First, check if the class has already been loaded
-+ Class<?> c = findLoadedClass(name);
-+ if (c == null) {
-+ c = findClass(name);
-+ }
-+ if (resolve) {
-+ resolveClass(c);
-+ }
-+ return c;
-+ }
-+ }
-+ else { // not our class
-+ return super.loadClass(name, resolve);
-+ }
-+ }
-+
-+ @Override
-+ protected Class<?> findClass(String name)
-+ throws ClassNotFoundException {
-+ // special class name -> replace it with alternative name
-+ if (name.endsWith("_v1")) {
-+ String altName = name.substring(0, name.length() - 3) + "_v2";
-+ String altPath = altName.replace('.', '/').concat(".class");
-+ try (InputStream is = getResourceAsStream(altPath)) {
-+ if (is != null) {
-+ byte[] bytes = IOUtils.readFully(is, -1, true);
-+ // patch class bytes to contain original name
-+ for (int i = 0; i < bytes.length - 2; i++) {
-+ if (bytes[i] == '_' &&
-+ bytes[i + 1] == 'v' &&
-+ bytes[i + 2] == '2') {
-+ bytes[i + 2] = '1';
-+ }
-+ }
-+ return defineClass(name, bytes, 0, bytes.length);
-+ }
-+ else {
-+ throw new ClassNotFoundException(name);
-+ }
-+ }
-+ catch (IOException e) {
-+ throw new ClassNotFoundException(name, e);
-+ }
-+ }
-+ else { // not special class name -> just load the class
-+ String path = name.replace('.', '/').concat(".class");
-+ try (InputStream is = getResourceAsStream(path)) {
-+ if (is != null) {
-+ byte[] bytes = IOUtils.readFully(is, -1, true);
-+ return defineClass(name, bytes, 0, bytes.length);
-+ }
-+ else {
-+ throw new ClassNotFoundException(name);
-+ }
-+ }
-+ catch (IOException e) {
-+ throw new ClassNotFoundException(name, e);
-+ }
-+ }
-+ }
-+ }
-+}
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -44,7 +44,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin)
-+ SunOS | Linux | *BSD | Darwin)
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -49,7 +49,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- ;;
-
---- ./jdk/test/java/lang/instrument/RedefineBigClass.sh 2013-09-06 11:29:34.000000000 -0700
-+++ ./jdk/test/java/lang/instrument/RedefineBigClass.sh 2014-07-15 21:49:32.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
-@@ -22,7 +22,7 @@
- #
-
- # @test
--# @bug 7121600
-+# @bug 7121600 8016838
- # @summary Redefine a big class.
- # @author Daniel D. Daugherty
- #
---- ./jdk/test/java/lang/instrument/RedefineBigClassApp.java 2013-09-06 11:29:34.000000000 -0700
-+++ ./jdk/test/java/lang/instrument/RedefineBigClassApp.java 2014-07-15 21:49:32.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
-@@ -21,12 +21,21 @@
- * questions.
- */
-
-+import java.io.*;
-+
- public class RedefineBigClassApp {
-+ /**
-+ * Memory leak is assumed, if application consumes more than specified amount of memory during its execution.
-+ * The number is given in Kb.
-+ */
-+ private static final long MEM_LEAK_THRESHOLD = 32 * 1024; // 32Mb
-+
- public static void main(String[] args) throws Exception {
- System.out.println("Creating instance of " +
- RedefineBigClassAgent.clz);
- RedefineBigClassAgent.clz.newInstance();
-
-+ long vMemBefore = getVMemSize();
- int count = 0;
- while (!RedefineBigClassAgent.doneRedefining) {
- System.out.println("App loop count: " + ++count);
-@@ -37,6 +46,39 @@
- }
- System.out.println("App looped " + count + " times.");
-
-+ long vMemAfter = getVMemSize();
-+ if (vMemBefore == 0 || vMemAfter == 0) {
-+ System.err.println("WARNING: Cannot perform memory leak detection on this OS");
-+ } else {
-+ long vMemDelta = vMemAfter - vMemBefore;
-+ if (vMemDelta > MEM_LEAK_THRESHOLD) {
-+ System.err.println("FAIL: Virtual memory usage increased by " + vMemDelta + "Kb " +
-+ "(greater than " + MEM_LEAK_THRESHOLD + "Kb)");
-+ System.exit(1);
-+ }
-+ System.err.println("PASS: Virtual memory usage increased by " + vMemDelta + "Kb " +
-+ "(not greater than " + MEM_LEAK_THRESHOLD + "Kb)");
-+ }
- System.exit(0);
- }
-+
-+ /**
-+ * Return size of virtual memory allocated to the process in Kb.
-+ * Linux specific. On other platforms and in case of any errors return 0.
-+ */
-+ private static long getVMemSize() {
-+
-+ // Refer to the Linux proc(5) man page for details about /proc/self/stat file
-+ //
-+ // In short, this file contains status information about the current process
-+ // written in one line. The fields are separated with spaces.
-+ // The 23rd field is defined as 'vsize %lu Virtual memory size in bytes'
-+
-+ try (FileReader fileReader = new FileReader("/proc/self/stat");
-+ BufferedReader bufferedReader = new BufferedReader(fileReader)) {
-+ String line = bufferedReader.readLine();
-+ return Long.parseLong(line.split(" ")[22]) / 1024;
-+ } catch (Exception ex) {}
-+ return 0;
-+ }
- }
---- ./jdk/test/java/lang/instrument/RetransformBigClass.sh 2013-09-06 11:29:34.000000000 -0700
-+++ ./jdk/test/java/lang/instrument/RetransformBigClass.sh 2014-07-15 21:49:32.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
-@@ -22,7 +22,7 @@
- #
-
- # @test
--# @bug 7122253
-+# @bug 7122253 8016838
- # @ignore until the fix for 7122253 (from HotSpot) is in a promoted build
- # @summary Retransform a big class.
- # @author Daniel D. Daugherty
---- ./jdk/test/java/lang/instrument/RetransformBigClassApp.java 2013-09-06 11:29:34.000000000 -0700
-+++ ./jdk/test/java/lang/instrument/RetransformBigClassApp.java 2014-07-15 21:49:32.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
-@@ -21,12 +21,21 @@
- * questions.
- */
-
-+import java.io.*;
-+
- public class RetransformBigClassApp {
-+ /**
-+ * Memory leak is assumed, if application consumes more than specified amount of memory during its execution.
-+ * The number is given in Kb.
-+ */
-+ private static final long MEM_LEAK_THRESHOLD = 32 * 1024; // 32Mb
-+
- public static void main(String[] args) throws Exception {
- System.out.println("Creating instance of " +
- RetransformBigClassAgent.clz);
- RetransformBigClassAgent.clz.newInstance();
-
-+ long vMemBefore = getVMemSize();
- int count = 0;
- while (!RetransformBigClassAgent.doneRetransforming) {
- System.out.println("App loop count: " + ++count);
-@@ -37,6 +46,39 @@
- }
- System.out.println("App looped " + count + " times.");
-
-+ long vMemAfter = getVMemSize();
-+ if (vMemBefore == 0 || vMemAfter == 0) {
-+ System.err.println("WARNING: Cannot perform memory leak detection on this OS");
-+ } else {
-+ long vMemDelta = vMemAfter - vMemBefore;
-+ if (vMemDelta > MEM_LEAK_THRESHOLD) {
-+ System.err.println("FAIL: Virtual memory usage increased by " + vMemDelta + "Kb " +
-+ "(greater than " + MEM_LEAK_THRESHOLD + "Kb)");
-+ System.exit(1);
-+ }
-+ System.err.println("PASS: Virtual memory usage increased by " + vMemDelta + "Kb " +
-+ "(not greater than " + MEM_LEAK_THRESHOLD + "Kb)");
-+ }
- System.exit(0);
- }
-+
-+ /**
-+ * Return size of virtual memory allocated to the process in Kb.
-+ * Linux specific. On other platforms and in case of any errors return 0.
-+ */
-+ private static long getVMemSize() {
-+
-+ // Refer to the Linux proc(5) man page for details about /proc/self/stat file
-+ //
-+ // In short, this file contains status information about the current process
-+ // written in one line. The fields are separated with spaces.
-+ // The 23rd field is defined as 'vsize %lu Virtual memory size in bytes'
-+
-+ try (FileReader fileReader = new FileReader("/proc/self/stat");
-+ BufferedReader bufferedReader = new BufferedReader(fileReader)) {
-+ String line = bufferedReader.readLine();
-+ return Long.parseLong(line.split(" ")[22]) / 1024;
-+ } catch (Exception ex) {}
-+ return 0;
-+ }
- }
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -35,15 +35,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PS=":"
-- FS="/"
-- ;;
-- Linux )
-- PS=":"
-- FS="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/java/lang/invoke/8009222/Test8009222.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/invoke/8009222/Test8009222.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,49 @@
-+/*
-+ * 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 8009222
-+ * @summary java.lang.IllegalArgumentException: not invocable, no method type
-+ * when attempting to get getter method handle for a static field
-+ *
-+ * @run main/othervm Test8009222
-+ */
-+
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+
-+interface Intf {
-+ static int i = 0;
-+}
-+
-+public class Test8009222 {
-+ public static void main(String[] args) throws Exception {
-+ MethodHandles.lookup()
-+ .findStaticGetter(Intf.class, "i", int.class)
-+ .getClass(); // null check
-+
-+ System.out.println("TEST PASSED");
-+ }
-+}
---- ./jdk/test/java/lang/invoke/BigArityTest.java 2013-09-06 11:29:35.000000000 -0700
-+++ ./jdk/test/java/lang/invoke/BigArityTest.java 2014-07-15 21:49:32.000000000 -0700
-@@ -26,7 +26,7 @@
- /* @test
- * @summary High arity invocations, up to the maximum of 255 arguments
- * @compile BigArityTest.java
-- * @run junit/othervm -DBigArityTest.ITERATION_COUNT=1 test.java.lang.invoke.BigArityTest
-+ * @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -esa -DBigArityTest.ITERATION_COUNT=1 test.java.lang.invoke.BigArityTest
- */
-
- package test.java.lang.invoke;
---- ./jdk/test/java/lang/invoke/CallSiteTest.java 2013-09-06 11:29:35.000000000 -0700
-+++ ./jdk/test/java/lang/invoke/CallSiteTest.java 2014-07-15 21:49:32.000000000 -0700
-@@ -28,7 +28,7 @@
- *
- * @build indify.Indify
- * @compile CallSiteTest.java
-- * @run main/othervm
-+ * @run main/othervm/timeout=3600 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies
- * indify.Indify
- * --expand-properties --classpath ${test.classes}
- * --java test.java.lang.invoke.CallSiteTest
---- ./jdk/test/java/lang/invoke/JavaDocExamplesTest.java 2013-09-06 11:29:35.000000000 -0700
-+++ ./jdk/test/java/lang/invoke/JavaDocExamplesTest.java 2014-10-28 20:19:45.000000000 -0700
-@@ -64,7 +64,11 @@
- new JavaDocExamplesTest().run();
- }
- public void run() throws Throwable {
-+ testMisc();
-+ testFindStatic();
-+ testFindConstructor();
- testFindVirtual();
-+ testFindSpecial();
- testPermuteArguments();
- testDropArguments();
- testFilterArguments();
-@@ -110,7 +114,8 @@
-
- {}
-
-- @Test public void testFindVirtual() throws Throwable {
-+ @Test public void testMisc() throws Throwable {
-+// Extra tests, not from javadoc:
- {}
- MethodHandle CONCAT_3 = LOOKUP.findVirtual(String.class,
- "concat", methodType(String.class, String.class));
-@@ -125,6 +130,92 @@
- {}
- }
-
-+ @Test public void testFindStatic() throws Throwable {
-+{}
-+MethodHandle MH_asList = publicLookup().findStatic(Arrays.class,
-+ "asList", methodType(List.class, Object[].class));
-+assertEquals("[x, y]", MH_asList.invoke("x", "y").toString());
-+{}
-+ }
-+
-+ @Test public void testFindVirtual() throws Throwable {
-+{}
-+MethodHandle MH_concat = publicLookup().findVirtual(String.class,
-+ "concat", methodType(String.class, String.class));
-+MethodHandle MH_hashCode = publicLookup().findVirtual(Object.class,
-+ "hashCode", methodType(int.class));
-+MethodHandle MH_hashCode_String = publicLookup().findVirtual(String.class,
-+ "hashCode", methodType(int.class));
-+assertEquals("xy", (String) MH_concat.invokeExact("x", "y"));
-+assertEquals("xy".hashCode(), (int) MH_hashCode.invokeExact((Object)"xy"));
-+assertEquals("xy".hashCode(), (int) MH_hashCode_String.invokeExact("xy"));
-+// interface method:
-+MethodHandle MH_subSequence = publicLookup().findVirtual(CharSequence.class,
-+ "subSequence", methodType(CharSequence.class, int.class, int.class));
-+assertEquals("def", MH_subSequence.invoke("abcdefghi", 3, 6).toString());
-+// constructor "internal method" must be accessed differently:
-+MethodType MT_newString = methodType(void.class); //()V for new String()
-+try { assertEquals("impossible", lookup()
-+ .findVirtual(String.class, "<init>", MT_newString));
-+ } catch (NoSuchMethodException ex) { } // OK
-+MethodHandle MH_newString = publicLookup()
-+ .findConstructor(String.class, MT_newString);
-+assertEquals("", (String) MH_newString.invokeExact());
-+{}
-+ }
-+
-+ @Test public void testFindConstructor() throws Throwable {
-+{}
-+MethodHandle MH_newArrayList = publicLookup().findConstructor(
-+ ArrayList.class, methodType(void.class, Collection.class));
-+Collection orig = Arrays.asList("x", "y");
-+Collection copy = (ArrayList) MH_newArrayList.invokeExact(orig);
-+assert(orig != copy);
-+assertEquals(orig, copy);
-+// a variable-arity constructor:
-+MethodHandle MH_newProcessBuilder = publicLookup().findConstructor(
-+ ProcessBuilder.class, methodType(void.class, String[].class));
-+ProcessBuilder pb = (ProcessBuilder)
-+ MH_newProcessBuilder.invoke("x", "y", "z");
-+assertEquals("[x, y, z]", pb.command().toString());
-+{}
-+ }
-+
-+// for testFindSpecial
-+{}
-+static class Listie extends ArrayList {
-+ public String toString() { return "[wee Listie]"; }
-+ static Lookup lookup() { return MethodHandles.lookup(); }
-+}
-+{}
-+
-+ @Test public void testFindSpecial() throws Throwable {
-+{}
-+// no access to constructor via invokeSpecial:
-+MethodHandle MH_newListie = Listie.lookup()
-+ .findConstructor(Listie.class, methodType(void.class));
-+Listie l = (Listie) MH_newListie.invokeExact();
-+try { assertEquals("impossible", Listie.lookup().findSpecial(
-+ Listie.class, "<init>", methodType(void.class), Listie.class));
-+ } catch (NoSuchMethodException ex) { } // OK
-+// access to super and self methods via invokeSpecial:
-+MethodHandle MH_super = Listie.lookup().findSpecial(
-+ ArrayList.class, "toString" , methodType(String.class), Listie.class);
-+MethodHandle MH_this = Listie.lookup().findSpecial(
-+ Listie.class, "toString" , methodType(String.class), Listie.class);
-+MethodHandle MH_duper = Listie.lookup().findSpecial(
-+ Object.class, "toString" , methodType(String.class), Listie.class);
-+assertEquals("[]", (String) MH_super.invokeExact(l));
-+assertEquals(""+l, (String) MH_this.invokeExact(l));
-+assertEquals("[]", (String) MH_duper.invokeExact(l)); // ArrayList method
-+try { assertEquals("inaccessible", Listie.lookup().findSpecial(
-+ String.class, "toString", methodType(String.class), Listie.class));
-+ } catch (IllegalAccessException ex) { } // OK
-+Listie subl = new Listie() { public String toString() { return "[subclass]"; } };
-+assertEquals(""+l, (String) MH_this.invokeExact(subl)); // Listie method
-+{}
-+ }
-+
- @Test public void testPermuteArguments() throws Throwable {
- {{
- {} /// JAVADOC
-@@ -275,6 +366,12 @@
- MethodHandle eq2 = equals.asSpreader(Object[].class, 2);
- assert( (boolean) eq2.invokeExact(new Object[]{ "me", "me" }));
- assert(!(boolean) eq2.invokeExact(new Object[]{ "me", "thee" }));
-+// try to spread from anything but a 2-array:
-+for (int n = 0; n <= 10; n++) {
-+ Object[] badArityArgs = (n == 2 ? null : new Object[n]);
-+ try { assert((boolean) eq2.invokeExact(badArityArgs) && false); }
-+ catch (IllegalArgumentException ex) { } // OK
-+}
- // spread both arguments from a String array:
- MethodHandle eq2s = equals.asSpreader(String[].class, 2);
- assert( (boolean) eq2s.invokeExact(new String[]{ "me", "me" }));
---- ./jdk/test/java/lang/invoke/MethodHandleConstants.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/invoke/MethodHandleConstants.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,188 @@
-+/*
-+ * 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
-+ * 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 8022066
-+ * @summary smoke test for method handle constants
-+ * @build indify.Indify
-+ * @compile MethodHandleConstants.java
-+ * @run main/othervm
-+ * indify.Indify
-+ * --verify-specifier-count=0
-+ * --expand-properties --classpath ${test.classes}
-+ * --java test.java.lang.invoke.MethodHandleConstants --check-output
-+ * @run main/othervm
-+ * indify.Indify
-+ * --expand-properties --classpath ${test.classes}
-+ * --java test.java.lang.invoke.MethodHandleConstants --security-manager
-+ */
-+
-+package test.java.lang.invoke;
-+
-+import java.util.*;
-+import java.io.*;
-+import java.lang.invoke.*;
-+import java.security.*;
-+
-+import static java.lang.invoke.MethodHandles.*;
-+import static java.lang.invoke.MethodType.*;
-+
-+public class MethodHandleConstants {
-+ public static void main(String... av) throws Throwable {
-+ if (av.length > 0 && av[0].equals("--check-output")) openBuf();
-+ if (av.length > 0 && av[0].equals("--security-manager")) setSM();
-+ System.out.println("Obtaining method handle constants:");
-+ testCase(MH_String_replace_C2(), String.class, "replace", String.class, String.class, char.class, char.class);
-+ testCase(MH_MethodHandle_invokeExact_SC2(), MethodHandle.class, "invokeExact", String.class, MethodHandle.class, String.class, char.class, char.class);
-+ testCase(MH_MethodHandle_invoke_SC2(), MethodHandle.class, "invoke", String.class, MethodHandle.class, String.class, char.class, char.class);
-+ testCase(MH_Class_forName_S(), Class.class, "forName", Class.class, String.class);
-+ testCase(MH_Class_forName_SbCL(), Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class);
-+ System.out.println("Done.");
-+ closeBuf();
-+ }
-+
-+ private static void testCase(MethodHandle mh, Class<?> defc, String name, Class<?> rtype, Class<?>... ptypes) throws Throwable {
-+ System.out.println(mh);
-+ // we include defc, because we assume it is a non-static MH:
-+ MethodType mt = methodType(rtype, ptypes);
-+ assertEquals(mh.type(), mt);
-+ // FIXME: Use revealDirect to find out more
-+ }
-+ private static void assertEquals(Object exp, Object act) {
-+ if (exp == act || (exp != null && exp.equals(act))) return;
-+ throw new AssertionError("not equal: "+exp+", "+act);
-+ }
-+
-+ private static void setSM() {
-+ Policy.setPolicy(new TestPolicy());
-+ System.setSecurityManager(new SecurityManager());
-+ }
-+
-+ private static PrintStream oldOut;
-+ private static ByteArrayOutputStream buf;
-+ private static void openBuf() {
-+ oldOut = System.out;
-+ buf = new ByteArrayOutputStream();
-+ System.setOut(new PrintStream(buf));
-+ }
-+ private static void closeBuf() {
-+ if (buf == null) return;
-+ System.out.flush();
-+ System.setOut(oldOut);
-+ String[] haveLines = new String(buf.toByteArray()).split("[\n\r]+");
-+ for (String line : haveLines) System.out.println(line);
-+ Iterator<String> iter = Arrays.asList(haveLines).iterator();
-+ for (String want : EXPECT_OUTPUT) {
-+ String have = iter.hasNext() ? iter.next() : "[EOF]";
-+ if (want.equals(have)) continue;
-+ System.err.println("want line: "+want);
-+ System.err.println("have line: "+have);
-+ throw new AssertionError("unexpected output: "+have);
-+ }
-+ if (iter.hasNext())
-+ throw new AssertionError("unexpected output: "+iter.next());
-+ }
-+ private static final String[] EXPECT_OUTPUT = {
-+ "Obtaining method handle constants:",
-+ "MethodHandle(String,char,char)String",
-+ "MethodHandle(MethodHandle,String,char,char)String",
-+ "MethodHandle(MethodHandle,String,char,char)String",
-+ "MethodHandle(String)Class",
-+ "MethodHandle(String,boolean,ClassLoader)Class",
-+ "Done."
-+ };
-+
-+ // String.replace(String, char, char)
-+ private static MethodType MT_String_replace_C2() {
-+ shouldNotCallThis();
-+ return methodType(String.class, char.class, char.class);
-+ }
-+ private static MethodHandle MH_String_replace_C2() throws ReflectiveOperationException {
-+ shouldNotCallThis();
-+ return lookup().findVirtual(String.class, "replace", MT_String_replace_C2());
-+ }
-+
-+ // MethodHandle.invokeExact(...)
-+ private static MethodType MT_MethodHandle_invokeExact_SC2() {
-+ shouldNotCallThis();
-+ return methodType(String.class, String.class, char.class, char.class);
-+ }
-+ private static MethodHandle MH_MethodHandle_invokeExact_SC2() throws ReflectiveOperationException {
-+ shouldNotCallThis();
-+ return lookup().findVirtual(MethodHandle.class, "invokeExact", MT_MethodHandle_invokeExact_SC2());
-+ }
-+
-+ // MethodHandle.invoke(...)
-+ private static MethodType MT_MethodHandle_invoke_SC2() {
-+ shouldNotCallThis();
-+ return methodType(String.class, String.class, char.class, char.class);
-+ }
-+ private static MethodHandle MH_MethodHandle_invoke_SC2() throws ReflectiveOperationException {
-+ shouldNotCallThis();
-+ return lookup().findVirtual(MethodHandle.class, "invoke", MT_MethodHandle_invoke_SC2());
-+ }
-+
-+ // Class.forName(String)
-+ private static MethodType MT_Class_forName_S() {
-+ shouldNotCallThis();
-+ return methodType(Class.class, String.class);
-+ }
-+ private static MethodHandle MH_Class_forName_S() throws ReflectiveOperationException {
-+ shouldNotCallThis();
-+ return lookup().findStatic(Class.class, "forName", MT_Class_forName_S());
-+ }
-+
-+ // Class.forName(String, boolean, ClassLoader)
-+ private static MethodType MT_Class_forName_SbCL() {
-+ shouldNotCallThis();
-+ return methodType(Class.class, String.class, boolean.class, ClassLoader.class);
-+ }
-+ private static MethodHandle MH_Class_forName_SbCL() throws ReflectiveOperationException {
-+ shouldNotCallThis();
-+ return lookup().findStatic(Class.class, "forName", MT_Class_forName_SbCL());
-+ }
-+
-+ private static void shouldNotCallThis() {
-+ // if this gets called, the transformation has not taken place
-+ if (System.getProperty("MethodHandleConstants.allow-untransformed") != null) return;
-+ throw new AssertionError("this code should be statically transformed away by Indify");
-+ }
-+
-+ static class TestPolicy extends Policy {
-+ final PermissionCollection permissions = new Permissions();
-+ TestPolicy() {
-+ permissions.add(new java.io.FilePermission("<<ALL FILES>>", "read"));
-+ }
-+ public PermissionCollection getPermissions(ProtectionDomain domain) {
-+ return permissions;
-+ }
-+
-+ public PermissionCollection getPermissions(CodeSource codesource) {
-+ return permissions;
-+ }
-+
-+ public boolean implies(ProtectionDomain domain, Permission perm) {
-+ return permissions.implies(perm);
-+ }
-+ }
-+}
---- ./jdk/test/java/lang/invoke/MethodHandlesTest.java 2013-09-06 11:29:35.000000000 -0700
-+++ ./jdk/test/java/lang/invoke/MethodHandlesTest.java 2014-10-28 20:19:45.000000000 -0700
-@@ -26,7 +26,7 @@
- /* @test
- * @summary unit tests for java.lang.invoke.MethodHandles
- * @compile MethodHandlesTest.java remote/RemoteExample.java
-- * @run junit/othervm test.java.lang.invoke.MethodHandlesTest
-+ * @run junit/othervm/timeout=2500 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -esa test.java.lang.invoke.MethodHandlesTest
- */
-
- package test.java.lang.invoke;
-@@ -140,7 +140,7 @@
- Object actual = calledLog.get(calledLog.size() - 1);
- if (expected.equals(actual) && verbosity < 9) return;
- System.out.println("assertCalled "+name+":");
-- System.out.println("expected: "+expected);
-+ System.out.println("expected: "+deepToString(expected));
- System.out.println("actual: "+actual);
- System.out.println("ex. types: "+getClasses(expected));
- System.out.println("act. types: "+getClasses(actual));
-@@ -148,7 +148,25 @@
- }
- static void printCalled(MethodHandle target, String name, Object... args) {
- if (verbosity >= 3)
-- System.out.println("calling MH="+target+" to "+name+Arrays.toString(args));
-+ System.out.println("calling MH="+target+" to "+name+deepToString(args));
-+ }
-+ static String deepToString(Object x) {
-+ if (x == null) return "null";
-+ if (x instanceof Collection)
-+ x = ((Collection)x).toArray();
-+ if (x instanceof Object[]) {
-+ Object[] ax = (Object[]) x;
-+ ax = Arrays.copyOf(ax, ax.length, Object[].class);
-+ for (int i = 0; i < ax.length; i++)
-+ ax[i] = deepToString(ax[i]);
-+ x = Arrays.deepToString(ax);
-+ }
-+ if (x.getClass().isArray())
-+ try {
-+ x = Arrays.class.getMethod("toString", x.getClass()).invoke(null, x);
-+ } catch (ReflectiveOperationException ex) { throw new Error(ex); }
-+ assert(!(x instanceof Object[]));
-+ return x.toString();
- }
-
- static Object castToWrapper(Object value, Class<?> dst) {
-@@ -230,6 +248,12 @@
- { param = c; break; }
- }
- }
-+ if (param.isArray()) {
-+ Class<?> ctype = param.getComponentType();
-+ Object arg = Array.newInstance(ctype, 2);
-+ Array.set(arg, 0, randomArg(ctype));
-+ return arg;
-+ }
- if (param.isInterface() && param.isAssignableFrom(List.class))
- return Arrays.asList("#"+nextArg());
- if (param.isInterface() || param.isAssignableFrom(String.class))
-@@ -363,6 +387,7 @@
- protected Example(String name) { this.name = name; }
- @SuppressWarnings("LeakingThisInConstructor")
- protected Example(int x) { this(); called("protected <init>", this, x); }
-+ //Example(Void x) { does not exist; lookup elicts NoSuchMethodException }
- @Override public String toString() { return name; }
-
- public void v0() { called("v0", this); }
-@@ -463,6 +488,9 @@
- return lookup.in(defc);
- }
-
-+ /** Is findVirtual (etc.) of "<init>" supposed to elicit a NoSuchMethodException? */
-+ final static boolean INIT_REF_CAUSES_NSME = true;
-+
- @Test
- public void testFindStatic() throws Throwable {
- if (CAN_SKIP_WORKING) return;
-@@ -483,6 +511,8 @@
- testFindStatic(Example.class, Object.class, "s7", float.class, double.class);
-
- testFindStatic(false, PRIVATE, Example.class, void.class, "bogus");
-+ testFindStatic(false, PRIVATE, Example.class, void.class, "<init>", int.class);
-+ testFindStatic(false, PRIVATE, Example.class, void.class, "<init>", Void.class);
- testFindStatic(false, PRIVATE, Example.class, void.class, "v0");
- }
-
-@@ -505,11 +535,12 @@
- target = maybeMoveIn(lookup, defc).findStatic(defc, methodName, type);
- } catch (ReflectiveOperationException ex) {
- noAccess = ex;
-+ assertExceptionClass(
-+ (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>"))
-+ ? NoSuchMethodException.class
-+ : IllegalAccessException.class,
-+ noAccess);
- if (verbosity >= 5) ex.printStackTrace(System.out);
-- if (name.contains("bogus"))
-- assertTrue(noAccess instanceof NoSuchMethodException);
-- else
-- assertTrue(noAccess instanceof IllegalAccessException);
- }
- if (verbosity >= 3)
- System.out.println("findStatic "+lookup+": "+defc.getName()+"."+name+"/"+type+" => "+target
-@@ -527,6 +558,13 @@
- System.out.print(':');
- }
-
-+ static void assertExceptionClass(Class<? extends Throwable> expected,
-+ Throwable actual) {
-+ if (expected.isInstance(actual)) return;
-+ actual.printStackTrace();
-+ assertEquals(expected, actual.getClass());
-+ }
-+
- static final boolean DEBUG_METHOD_HANDLE_NAMES = Boolean.getBoolean("java.lang.invoke.MethodHandle.DEBUG_NAMES");
-
- // rough check of name string
-@@ -556,6 +594,8 @@
- testFindVirtual(PubExample.class, void.class, "Pub/pro_v0");
-
- testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "bogus");
-+ testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "<init>", int.class);
-+ testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "<init>", Void.class);
- testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "s0");
-
- // test dispatch
-@@ -568,6 +608,16 @@
- testFindVirtual(IntExample.Impl.class, IntExample.class, void.class, "Int/v0");
- }
-
-+ @Test
-+ public void testFindVirtualClone() throws Throwable {
-+ // test some ad hoc system methods
-+ testFindVirtual(false, PUBLIC, Object.class, Object.class, "clone");
-+ testFindVirtual(true, PUBLIC, Object[].class, Object.class, "clone");
-+ testFindVirtual(true, PUBLIC, int[].class, Object.class, "clone");
-+ for (Class<?> cls : new Class<?>[]{ boolean[].class, long[].class, float[].class, char[].class })
-+ testFindVirtual(true, PUBLIC, cls, Object.class, "clone");
-+ }
-+
- void testFindVirtual(Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable {
- Class<?> rcvc = defc;
- testFindVirtual(rcvc, defc, ret, name, params);
-@@ -580,6 +630,9 @@
- void testFindVirtual(Lookup lookup, Class<?> rcvc, Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable {
- testFindVirtual(true, lookup, rcvc, defc, ret, name, params);
- }
-+ void testFindVirtual(boolean positive, Lookup lookup, Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable {
-+ testFindVirtual(positive, lookup, defc, defc, ret, name, params);
-+ }
- void testFindVirtual(boolean positive, Lookup lookup, Class<?> rcvc, Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable {
- countTest(positive);
- String methodName = name.substring(1 + name.indexOf('/')); // foo/bar => foo
-@@ -591,11 +644,12 @@
- target = maybeMoveIn(lookup, defc).findVirtual(defc, methodName, type);
- } catch (ReflectiveOperationException ex) {
- noAccess = ex;
-+ assertExceptionClass(
-+ (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>"))
-+ ? NoSuchMethodException.class
-+ : IllegalAccessException.class,
-+ noAccess);
- if (verbosity >= 5) ex.printStackTrace(System.out);
-- if (name.contains("bogus"))
-- assertTrue(noAccess instanceof NoSuchMethodException);
-- else
-- assertTrue(noAccess instanceof IllegalAccessException);
- }
- if (verbosity >= 3)
- System.out.println("findVirtual "+lookup+": "+defc.getName()+"."+name+"/"+type+" => "+target
-@@ -618,8 +672,21 @@
- Object[] argsWithSelf = randomArgs(paramsWithSelf);
- if (selfc.isAssignableFrom(rcvc) && rcvc != selfc) argsWithSelf[0] = randomArg(rcvc);
- printCalled(target, name, argsWithSelf);
-- target.invokeWithArguments(argsWithSelf);
-- assertCalled(name, argsWithSelf);
-+ Object res = target.invokeWithArguments(argsWithSelf);
-+ if (Example.class.isAssignableFrom(defc) || IntExample.class.isAssignableFrom(defc)) {
-+ assertCalled(name, argsWithSelf);
-+ } else if (name.equals("clone")) {
-+ // Ad hoc method call outside Example. For Object[].clone.
-+ printCalled(target, name, argsWithSelf);
-+ assertEquals(MethodType.methodType(Object.class, rcvc), target.type());
-+ Object orig = argsWithSelf[0];
-+ assertEquals(orig.getClass(), res.getClass());
-+ if (res instanceof Object[])
-+ assertArrayEquals((Object[])res, (Object[])argsWithSelf[0]);
-+ assert(Arrays.deepEquals(new Object[]{res}, new Object[]{argsWithSelf[0]}));
-+ } else {
-+ assert(false) : Arrays.asList(positive, lookup, rcvc, defc, ret, name, deepToString(params));
-+ }
- if (verbosity >= 1)
- System.out.print(':');
- }
-@@ -632,11 +699,11 @@
- testFindSpecial(SubExample.class, Example.class, void.class, "pkg_v0");
- testFindSpecial(RemoteExample.class, PubExample.class, void.class, "Pub/pro_v0");
- // Do some negative testing:
-- testFindSpecial(false, EXAMPLE, SubExample.class, Example.class, void.class, "bogus");
-- testFindSpecial(false, PRIVATE, SubExample.class, Example.class, void.class, "bogus");
- for (Lookup lookup : new Lookup[]{ PRIVATE, EXAMPLE, PACKAGE, PUBLIC }) {
- testFindSpecial(false, lookup, Object.class, Example.class, void.class, "v0");
-+ testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "bogus");
- testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "<init>", int.class);
-+ testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "<init>", Void.class);
- testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "s0");
- }
- }
-@@ -662,19 +729,25 @@
- countTest(positive);
- String methodName = name.substring(1 + name.indexOf('/')); // foo/bar => foo
- MethodType type = MethodType.methodType(ret, params);
-+ Lookup specialLookup = maybeMoveIn(lookup, specialCaller);
-+ boolean specialAccessOK = (specialLookup.lookupClass() == specialCaller &&
-+ (specialLookup.lookupModes() & Lookup.PRIVATE) != 0);
- MethodHandle target = null;
- Exception noAccess = null;
- try {
- if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type);
-- if (verbosity >= 5) System.out.println(" lookup => "+maybeMoveIn(lookup, specialCaller));
-- target = maybeMoveIn(lookup, specialCaller).findSpecial(defc, methodName, type, specialCaller);
-+ if (verbosity >= 5) System.out.println(" lookup => "+specialLookup);
-+ target = specialLookup.findSpecial(defc, methodName, type, specialCaller);
- } catch (ReflectiveOperationException ex) {
- noAccess = ex;
-+ assertExceptionClass(
-+ (!specialAccessOK) // this check should happen first
-+ ? IllegalAccessException.class
-+ : (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>"))
-+ ? NoSuchMethodException.class
-+ : IllegalAccessException.class,
-+ noAccess);
- if (verbosity >= 5) ex.printStackTrace(System.out);
-- if (name.contains("bogus"))
-- assertTrue(noAccess instanceof NoSuchMethodException);
-- else
-- assertTrue(noAccess instanceof IllegalAccessException);
- }
- if (verbosity >= 3)
- System.out.println("findSpecial from "+specialCaller.getName()+" to "+defc.getName()+"."+name+"/"+type+" => "+target
-@@ -719,7 +792,7 @@
- target = lookup.findConstructor(defc, type);
- } catch (ReflectiveOperationException ex) {
- noAccess = ex;
-- assertTrue(noAccess instanceof IllegalAccessException);
-+ assertTrue(noAccess.getClass().getName(), noAccess instanceof IllegalAccessException);
- }
- if (verbosity >= 3)
- System.out.println("findConstructor "+defc.getName()+".<init>/"+type+" => "+target
-@@ -750,6 +823,8 @@
- testBind(Example.class, Object.class, "v2", int.class, Object.class);
- testBind(Example.class, Object.class, "v2", int.class, int.class);
- testBind(false, PRIVATE, Example.class, void.class, "bogus");
-+ testBind(false, PRIVATE, Example.class, void.class, "<init>", int.class);
-+ testBind(false, PRIVATE, Example.class, void.class, "<init>", Void.class);
- testBind(SubExample.class, void.class, "Sub/v0");
- testBind(SubExample.class, void.class, "Sub/pkg_v0");
- testBind(IntExample.Impl.class, void.class, "Int/v0");
-@@ -773,11 +848,12 @@
- target = maybeMoveIn(lookup, defc).bind(receiver, methodName, type);
- } catch (ReflectiveOperationException ex) {
- noAccess = ex;
-+ assertExceptionClass(
-+ (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>"))
-+ ? NoSuchMethodException.class
-+ : IllegalAccessException.class,
-+ noAccess);
- if (verbosity >= 5) ex.printStackTrace(System.out);
-- if (name.contains("bogus"))
-- assertTrue(noAccess instanceof NoSuchMethodException);
-- else
-- assertTrue(noAccess instanceof IllegalAccessException);
- }
- if (verbosity >= 3)
- System.out.println("bind "+receiver+"."+name+"/"+type+" => "+target
-@@ -840,6 +916,10 @@
- countTest(positive);
- String methodName = name.substring(1 + name.indexOf('/')); // foo/bar => foo
- MethodType type = MethodType.methodType(ret, params);
-+ Lookup specialLookup = (specialCaller != null ? maybeMoveIn(lookup, specialCaller) : null);
-+ boolean specialAccessOK = (specialCaller != null &&
-+ specialLookup.lookupClass() == specialCaller &&
-+ (specialLookup.lookupModes() & Lookup.PRIVATE) != 0);
- Method rmethod = defc.getDeclaredMethod(methodName, params);
- MethodHandle target = null;
- Exception noAccess = null;
-@@ -848,16 +928,15 @@
- try {
- if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type);
- if (isSpecial)
-- target = maybeMoveIn(lookup, specialCaller).unreflectSpecial(rmethod, specialCaller);
-+ target = specialLookup.unreflectSpecial(rmethod, specialCaller);
- else
- target = maybeMoveIn(lookup, defc).unreflect(rmethod);
- } catch (ReflectiveOperationException ex) {
- noAccess = ex;
-+ assertExceptionClass(
-+ IllegalAccessException.class, // NSME is impossible, since it was already reflected
-+ noAccess);
- if (verbosity >= 5) ex.printStackTrace(System.out);
-- if (name.contains("bogus"))
-- assertTrue(noAccess instanceof NoSuchMethodException);
-- else
-- assertTrue(noAccess instanceof IllegalAccessException);
- }
- if (verbosity >= 3)
- System.out.println("unreflect"+(isSpecial?"Special":"")+" "+defc.getName()+"."+name+"/"+type
-@@ -1091,11 +1170,12 @@
- } catch (ReflectiveOperationException ex) {
- mh = null;
- noAccess = ex;
-+ assertExceptionClass(
-+ (fname.contains("bogus"))
-+ ? NoSuchFieldException.class
-+ : IllegalAccessException.class,
-+ noAccess);
- if (verbosity >= 5) ex.printStackTrace(System.out);
-- if (fname.contains("bogus"))
-- assertTrue(noAccess instanceof NoSuchFieldException);
-- else
-- assertTrue(noAccess instanceof IllegalAccessException);
- }
- if (verbosity >= 3)
- System.out.println("find"+(isStatic?"Static":"")+(isGetter?"Getter":"Setter")+" "+fclass.getName()+"."+fname+"/"+ftype
---- ./jdk/test/java/lang/invoke/ObjectMethodInInterfaceTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/invoke/ObjectMethodInInterfaceTest.java 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,46 @@
-+/*
-+ * 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 8031502
-+ * @summary JSR292: IncompatibleClassChangeError in LambdaForm for CharSequence.toString() method handle type converter
-+ * @compile ObjectMethodInInterfaceTest.java
-+ * @run main/othervm -Djava.lang.invoke.MethodHandle.COMPILE_THRESHOLD=0 test.java.lang.invoke.ObjectMethodInInterfaceTest
-+ */
-+package test.java.lang.invoke;
-+
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.invoke.MethodType;
-+
-+public class ObjectMethodInInterfaceTest {
-+ public static void main(String[] args) throws Throwable {
-+ MethodHandle mh = MethodHandles.lookup().findVirtual(CharSequence.class, "toString", MethodType.methodType(String.class));
-+ MethodType mt = MethodType.methodType(Object.class, CharSequence.class);
-+ mh = mh.asType(mt);
-+
-+ Object res = mh.invokeExact((CharSequence)"123");
-+
-+ System.out.println("TEST PASSED");
-+ }
-+}
---- ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,33 @@
-+/*
-+ * 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 8032585 8033278
-+ * @summary JSR292: IllegalAccessError when attempting to invoke protected method from different package
-+ *
-+ * @compile p1/T2.java p2/T3.java
-+ * @run main/othervm p2.T3
-+ */
-+public class Test {}
---- ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,127 @@
-+/*
-+ * 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.
-+ *
-+ */
-+package p1;
-+
-+import p2.T3;
-+
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.invoke.MethodHandles.Lookup;
-+import java.lang.invoke.MethodType;
-+import java.util.concurrent.Callable;
-+
-+class T1 {
-+ protected void m1() {}
-+ protected static void m2() {}
-+}
-+
-+public class T2 extends T1 {
-+ public static void main(String[] args) throws Throwable {
-+ final Lookup LOOKUP = T3.lookup();
-+ Class<IllegalAccessException> IAE = IllegalAccessException.class;
-+
-+ assertFailure(IAE, new Callable<Integer>() {
-+ public Integer call() throws Exception {
-+ LOOKUP.findVirtual(T1.class, "m1", MethodType.methodType(void.class));
-+ return null;
-+ }
-+ }
-+ );
-+ assertFailure(IAE, new Callable<Integer>() {
-+ public Integer call() throws Exception {
-+ LOOKUP.findStatic(T1.class, "m2", MethodType.methodType(void.class));
-+ return null;
-+ }
-+ }
-+ );
-+
-+ assertSuccess(new Callable<Integer>() {
-+ public Integer call() throws Exception {
-+ LOOKUP.findVirtual(T2.class, "m1", MethodType.methodType(void.class));
-+ return null;
-+ }
-+ }
-+ );
-+ assertSuccess(new Callable<Integer>() {
-+ public Integer call() throws Exception {
-+ LOOKUP.findVirtual(T3.class, "m1", MethodType.methodType(void.class));
-+ return null;
-+ }
-+ }
-+ );
-+
-+ assertSuccess(new Callable<Integer>() {
-+ public Integer call() throws Exception {
-+ LOOKUP.findStatic(T2.class, "m2", MethodType.methodType(void.class));
-+ return null;
-+ }
-+ }
-+ );
-+ assertSuccess(new Callable<Integer>() {
-+ public Integer call() throws Exception {
-+ LOOKUP.findStatic(T3.class, "m2", MethodType.methodType(void.class));
-+ return null;
-+ }
-+ }
-+ );
-+
-+ assertFailure(IAE, new Callable<Integer>() {
-+ public Integer call() throws Exception {
-+ LOOKUP.unreflect(T1.class.getDeclaredMethod("m1"));
-+ return null;
-+ }
-+ }
-+ );
-+ assertFailure(IAE, new Callable<Integer>() {
-+ public Integer call() throws Exception {
-+ LOOKUP.unreflect(T1.class.getDeclaredMethod("m2"));
-+ return null;
-+ }
-+ }
-+ );
-+
-+ System.out.println("TEST PASSED");
-+ }
-+
-+ public static void assertFailure(Class<? extends Throwable> expectedError, Callable r) {
-+ try {
-+ r.call();
-+ } catch(Throwable e) {
-+ if (expectedError.isAssignableFrom(e.getClass())) {
-+ return; // expected error
-+ } else {
-+ throw new Error("Unexpected error type: "+e.getClass()+"; expected type: "+expectedError, e);
-+ }
-+ }
-+ throw new Error("No error");
-+ }
-+
-+ public static void assertSuccess(Callable r) {
-+ try {
-+ r.call();
-+ } catch(Throwable e) {
-+ throw new Error("Unexpected error", e);
-+ }
-+ }
-+}
---- ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,32 @@
-+/*
-+ * 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.
-+ *
-+ */
-+package p2;
-+
-+import p1.T2;
-+
-+import java.lang.invoke.MethodHandles;
-+
-+public class T3 extends T2 {
-+ public static MethodHandles.Lookup lookup() { return MethodHandles.lookup(); }
-+}
---- ./jdk/test/java/lang/invoke/RicochetTest.java 2013-09-06 11:29:35.000000000 -0700
-+++ ./jdk/test/java/lang/invoke/RicochetTest.java 2014-07-15 21:49:32.000000000 -0700
-@@ -25,7 +25,7 @@
-
- /* @test
- * @summary unit tests for recursive method handles
-- * @run junit/othervm -DRicochetTest.MAX_ARITY=50 test.java.lang.invoke.RicochetTest
-+ * @run junit/othervm/timeout=3600 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -DRicochetTest.MAX_ARITY=10 test.java.lang.invoke.RicochetTest
- */
- /*
- * @ignore The following test creates an unreasonable number of adapters in -Xcomp mode (7049122)
---- ./jdk/test/java/lang/invoke/TestCatchExceptionWithVarargs.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/invoke/TestCatchExceptionWithVarargs.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,97 @@
-+/*
-+ * 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.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 8019184
-+ * @summary MethodHandles.catchException() fails when methods have 8 args + varargs
-+ */
-+
-+import java.util.*;
-+import java.lang.invoke.*;
-+
-+public class TestCatchExceptionWithVarargs {
-+
-+ private static final Class<?> CLASS = TestCatchExceptionWithVarargs.class;
-+ private static final int MAX_MH_ARITY = 254;
-+
-+ public static MethodHandle target;
-+ public static MethodHandle handler;
-+
-+ private static Object firstArg;
-+
-+ static class MyException extends Exception {
-+ }
-+
-+ public static Object target(Object... a) throws Exception {
-+ if (a[0] != firstArg) {
-+ throw new AssertionError("first argument different than expected: " + a[0] + " != " + firstArg);
-+ }
-+ throw new MyException();
-+ }
-+
-+ public static Object handler(Object... a) {
-+ if (a[0] != firstArg) {
-+ throw new AssertionError("first argument different than expected: " + a[0] + " != " + firstArg);
-+ }
-+ return a[0];
-+ }
-+
-+ static {
-+ try {
-+ MethodType mtype = MethodType.methodType(Object.class, Object[].class);
-+ target = MethodHandles.lookup().findStatic(CLASS, "target", mtype);
-+ handler = MethodHandles.lookup().findStatic(CLASS, "handler", mtype);
-+ } catch (Exception e) {
-+ throw new AssertionError(e);
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Throwable {
-+ List<Class<?>> ptypes = new LinkedList<>();
-+ ptypes.add(Object[].class);
-+
-+ // We use MAX_MH_ARITY - 1 here to account for the Object[] argument.
-+ for (int i = 1; i < MAX_MH_ARITY - 1; i++) {
-+ ptypes.add(0, Object.class);
-+
-+ MethodHandle targetWithArgs = target.asType(MethodType.methodType(Object.class, ptypes));
-+ MethodHandle handlerWithArgs = handler.asType(MethodType.methodType(Object.class, ptypes));
-+ handlerWithArgs = MethodHandles.dropArguments(handlerWithArgs, 0, MyException.class);
-+
-+ MethodHandle gwc1 = MethodHandles.catchException(targetWithArgs, MyException.class, handlerWithArgs);
-+
-+ // The next line throws an IllegalArgumentException if there is a bug.
-+ MethodHandle gwc2 = MethodHandles.catchException(gwc1, MyException.class, handlerWithArgs);
-+
-+ // This is only to verify that the method handles can actually be invoked and do the right thing.
-+ firstArg = new Object();
-+ Object o = gwc2.asSpreader(Object[].class, ptypes.size() - 1).invoke(firstArg, new Object[i]);
-+ if (o != firstArg) {
-+ throw new AssertionError("return value different than expected: " + o + " != " + firstArg);
-+ }
-+ }
-+ }
-+}
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -61,7 +61,7 @@
- while true; do
- echo "Run $i: TestSystemLoadAvg"
- case `uname -s` in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- runOne GetSystemLoadAverage
- ;;
- * )
---- ./jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java 2013-09-06 11:29:35.000000000 -0700
-+++ ./jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java 2014-07-15 21:49:32.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 7024172
-+ * @bug 7024172 7067691
- * @summary Test if proxy for PlatformLoggingMXBean is equivalent
- * to proxy for LoggingMXBean
- *
-@@ -36,12 +36,21 @@
- import java.util.logging.*;
- import java.util.ArrayList;
- import java.util.List;
-+import java.util.Map;
-+import java.util.HashMap;
-
- public class LoggingMXBeanTest
- {
-- static String LOGGER_NAME_1 = "com.sun.management.Logger";
-- static String LOGGER_NAME_2 = "com.sun.management.Logger.Logger2";
-- static String UNKNOWN_LOGGER_NAME = "com.sun.management.Unknown";
-+ static final String LOGGER_NAME_1 = "com.sun.management.Logger";
-+ static final String LOGGER_NAME_2 = "com.sun.management.Logger.Logger2";
-+ static final String UNKNOWN_LOGGER_NAME = "com.sun.management.Unknown";
-+
-+ // These instance variables prevent premature logger garbage collection
-+ // See getLogger() weak reference warnings.
-+ Logger logger1;
-+ Logger logger2;
-+
-+ static LoggingMXBeanTest test;
-
- public static void main(String[] argv) throws Exception {
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-@@ -51,7 +60,7 @@
- LoggingMXBean.class);
-
- // test LoggingMXBean proxy
-- LoggingMXBeanTest p = new LoggingMXBeanTest(proxy);
-+ test = new LoggingMXBeanTest(proxy);
-
- // check if the attributes implemented by PlatformLoggingMXBean
- // and LoggingMXBean return the same value
-@@ -64,9 +73,9 @@
- // same verification as in java/util/logging/LoggingMXBeanTest2
- public LoggingMXBeanTest(LoggingMXBean mbean) throws Exception {
-
-- Logger logger1 = Logger.getLogger( LOGGER_NAME_1 );
-+ logger1 = Logger.getLogger( LOGGER_NAME_1 );
- logger1.setLevel(Level.FINE);
-- Logger logger2 = Logger.getLogger( LOGGER_NAME_2 );
-+ logger2 = Logger.getLogger( LOGGER_NAME_2 );
- logger2.setLevel(null);
-
- /*
-@@ -206,20 +215,36 @@
- PlatformLoggingMXBean mxbean2) {
- // verify logger names
- List<String> loggers1 = mxbean1.getLoggerNames();
-+ System.out.println("Loggers: " + loggers1);
-+
-+ // Retrieve the named loggers to prevent them from being
-+ // spontaneously gc'ed.
-+ Map<String, Logger> loggersMap = new HashMap<>();
-+ for (String n : loggers1) {
-+ loggersMap.put(n, Logger.getLogger(n));
-+ }
-+
- List<String> loggers2 = mxbean2.getLoggerNames();
-+
-+ // loggers1 and loggers2 should be identical - no new logger should
-+ // have been created in between (at least no new logger name)
-+ //
- if (loggers1.size() != loggers2.size())
- throw new RuntimeException("LoggerNames: unmatched number of entries");
-- List<String> loggers3 = new ArrayList<>(loggers1);
-- loggers3.removeAll(loggers2);
-- if (loggers3.size() != 0)
-+ if (!loggers2.containsAll(loggersMap.keySet()))
- throw new RuntimeException("LoggerNames: unmatched loggers");
-
-+
- // verify logger's level and parent
- for (String logger : loggers1) {
-- if (!mxbean1.getLoggerLevel(logger)
-- .equals(mxbean2.getLoggerLevel(logger)))
-+ String level1 = mxbean1.getLoggerLevel(logger);
-+ String level2 = mxbean2.getLoggerLevel(logger);
-+ if (!java.util.Objects.equals(level1, level2)) {
- throw new RuntimeException(
-- "LoggerLevel: unmatched level for " + logger);
-+ "LoggerLevel: unmatched level for " + logger
-+ + ", " + level1 + ", " + level2);
-+ }
-+
- if (!mxbean1.getParentLoggerName(logger)
- .equals(mxbean2.getParentLoggerName(logger)))
- throw new RuntimeException(
---- ./jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java 2013-09-06 11:29:35.000000000 -0700
-+++ ./jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java 2014-07-15 21:49:32.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 6876135 7024172
-+ * @bug 6876135 7024172 7067691
- *
- * @summary Test PlatformLoggingMXBean
- * This test performs similar testing as
-@@ -41,11 +41,15 @@
-
- public class PlatformLoggingMXBeanTest
- {
--
- ObjectName objectName = null;
- static String LOGGER_NAME_1 = "com.sun.management.Logger1";
- static String LOGGER_NAME_2 = "com.sun.management.Logger2";
-
-+ // Use Logger instance variables to prevent premature garbage collection
-+ // of weak references.
-+ Logger logger1;
-+ Logger logger2;
-+
- public PlatformLoggingMXBeanTest() throws Exception {
- }
-
-@@ -135,8 +139,8 @@
- System.out.println( "*********** Phase 3 ***********" );
- System.out.println( "*******************************" );
- System.out.println( " Create and test new Loggers" );
-- Logger logger1 = Logger.getLogger( LOGGER_NAME_1 );
-- Logger logger2 = Logger.getLogger( LOGGER_NAME_2 );
-+ logger1 = Logger.getLogger( LOGGER_NAME_1 );
-+ logger2 = Logger.getLogger( LOGGER_NAME_2 );
-
- // check that Level object are returned properly
- try {
-@@ -187,6 +191,7 @@
- System.out.println( " Set and Check the Logger Level" );
- log1 = false;
- log2 = false;
-+
- try {
- // Set the level of logger1 to ALL
- params = new Object[2];
---- ./jdk/test/java/lang/ref/FinalizeOverride.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/lang/ref/FinalizeOverride.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,167 @@
-+/*
-+ * 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.ByteArrayOutputStream;
-+import java.io.IOException;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+import java.util.concurrent.atomic.AtomicInteger;
-+
-+/* @test
-+ * @bug 8027351
-+ * @summary Basic test of the finalize method
-+ */
-+
-+public class FinalizeOverride {
-+ // finalizedCount is incremented when the finalize method is invoked
-+ private static AtomicInteger finalizedCount = new AtomicInteger();
-+
-+ // finalizedSum and privateFinalizedInvoke are used to verify
-+ // the right overrided finalize method is invoked
-+ private static AtomicInteger finalizedSum = new AtomicInteger();
-+ private static volatile boolean privateFinalizeInvoked = false;
-+
-+ public static void main(String[] argvs) throws IOException {
-+ patchPrivateFinalize();
-+
-+ test(new Base(10), 10);
-+ test(new Subclass(20), 0);
-+ test(new SubSubclass(30), 30);
-+ test(new PublicFinalize(40), 40*100+40);
-+ test(new PrivateFinalize(50), 50);
-+ test(new NoOverride(60), 60);
-+ }
-+
-+ static void test(Object o, int expected) {
-+ int count = finalizedCount.get();
-+ int sum = finalizedSum.get();
-+ privateFinalizeInvoked = false;
-+
-+ // force GC and finalization
-+ o = null;
-+ while (finalizedCount.get() != (count+1)) {
-+ System.gc();
-+ System.runFinalization();
-+ }
-+
-+ if (privateFinalizeInvoked) {
-+ throw new RuntimeException("private finalize method invoked");
-+ }
-+ if (finalizedCount.get() != (count+1)) {
-+ throw new RuntimeException("Unexpected count=" + finalizedCount +
-+ " expected=" + (count+1));
-+ }
-+ if (finalizedSum.get() != (sum+expected)) {
-+ throw new RuntimeException("Unexpected sum=" + finalizedSum +
-+ " prev=" + sum + " value=" + expected);
-+ }
-+ }
-+
-+ static void patchPrivateFinalize() throws IOException {
-+ // patch the private f_nal_ze method name to "finalize"
-+ String testClasses = System.getProperty("test.classes", ".");
-+ Path p = Paths.get(testClasses, "FinalizeOverride$PrivateFinalize.class");
-+ byte[] bytes = Files.readAllBytes(p);
-+ int len = "f_nal_ze".length();
-+ for (int i=0; i < bytes.length-len; i++) {
-+ if (bytes[i] == 'f' &&
-+ bytes[i+1] == '_' &&
-+ bytes[i+2] == 'n' &&
-+ bytes[i+3] == 'a' &&
-+ bytes[i+4] == 'l' &&
-+ bytes[i+5] == '_' &&
-+ bytes[i+6] == 'z' &&
-+ bytes[i+7] == 'e')
-+ {
-+ // s%_%i%
-+ bytes[i+1] = 'i';
-+ bytes[i+5] = 'i';
-+ break;
-+ }
-+ }
-+ Files.write(p, bytes);
-+ }
-+
-+ static class Base {
-+ protected int value;
-+ Base(int v) {
-+ this.value = v;
-+ }
-+ int called() {
-+ finalizedSum.addAndGet(value);
-+ return value;
-+ }
-+ protected void finalize() {
-+ System.out.println("Base.finalize() sum += " + called());
-+ finalizedCount.incrementAndGet();
-+ }
-+ }
-+ static class PublicFinalize extends Base {
-+ PublicFinalize(int v) {
-+ super(v);
-+ }
-+ public void finalize() {
-+ finalizedSum.addAndGet(value * 100);
-+ System.out.println("PublicFinalize.finalize() sum += " + called() +
-+ "+"+value+"*100");
-+ finalizedCount.incrementAndGet();
-+ }
-+ }
-+ static class Subclass extends Base {
-+ Subclass(int v) {
-+ super(v);
-+ }
-+ protected void finalize() {
-+ // no value added to sum
-+ System.out.println("Subclass.finalize() sum += 0");
-+ finalizedCount.incrementAndGet();
-+ }
-+ }
-+ static class SubSubclass extends Subclass {
-+ SubSubclass(int v) {
-+ super(v);
-+ }
-+ protected final void finalize() {
-+ finalizedSum.addAndGet(value);
-+ System.out.println("SubSubclass.finalize() sum +=" +value);
-+ finalizedCount.incrementAndGet();
-+ }
-+ }
-+ static class PrivateFinalize extends Base {
-+ PrivateFinalize(int v) {
-+ super(v);
-+ }
-+ private void f_nal_ze() {
-+ // finalization catches any exception
-+ System.out.println("Error: private finalize invoked!!");
-+ privateFinalizeInvoked = true;
-+ finalizedCount.incrementAndGet();
-+ }
-+ }
-+ static class NoOverride extends PrivateFinalize {
-+ NoOverride(int v) {
-+ super(v);
-+ }
-+ }
-+}
---- ./jdk/test/java/net/Authenticator/B4769350.java 2013-09-06 11:29:36.000000000 -0700
-+++ ./jdk/test/java/net/Authenticator/B4769350.java 2014-07-15 21:49:32.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
-@@ -23,9 +23,7 @@
-
- /**
- * @test
-- * @bug 4769350
-- * @library ../../../sun/net/www/httptest/
-- * @build HttpCallback HttpServer ClosedChannelList HttpTransaction AbstractCallback
-+ * @bug 4769350 8017779
- * @run main/othervm B4769350 server
- * @run main/othervm B4769350 proxy
- * @summary proxy authentication username and password caching only works in serial case
-@@ -34,8 +32,17 @@
- * tests may already have invoked the HTTP handler.
- */
-
-+import com.sun.net.httpserver.HttpExchange;
-+import com.sun.net.httpserver.HttpHandler;
-+import com.sun.net.httpserver.HttpServer;
- import java.io.*;
- import java.net.*;
-+import java.util.concurrent.BrokenBarrierException;
-+import java.util.concurrent.CountDownLatch;
-+import java.util.concurrent.CyclicBarrier;
-+import java.util.concurrent.Executor;
-+import java.util.concurrent.ExecutorService;
-+import java.util.concurrent.Executors;
-
- public class B4769350 {
-
-@@ -43,13 +50,12 @@
- static boolean error = false;
-
- static void read (InputStream is) throws IOException {
-- int c;
-- while ((c=is.read()) != -1) {
-+ while (is.read() != -1) {
- //System.out.write (c);
- }
- }
-
-- static class Client extends Thread {
-+ static class Client extends Thread {
- String authority, path;
- boolean allowerror;
-
-@@ -64,8 +70,8 @@
- try {
- URI u = new URI ("http", authority, path, null, null);
- URL url = u.toURL();
-- URLConnection urlc = url.openConnection ();
-- InputStream is = urlc.getInputStream ();
-+ URLConnection urlc = url.openConnection();
-+ InputStream is = urlc.getInputStream();
- read (is);
- is.close();
- } catch (URISyntaxException e) {
-@@ -73,7 +79,8 @@
- error = true;
- } catch (IOException e) {
- if (!allowerror) {
-- System.out.println (Thread.currentThread().getName() + " " + e);
-+ System.out.println (Thread.currentThread().getName()
-+ + " " + e);
- e.printStackTrace();
- error = true;
- }
-@@ -81,55 +88,58 @@
- }
- }
-
-- static class CallBack extends AbstractCallback {
-+ class Server implements AutoCloseable {
-+ HttpServer server;
-+ Executor executor;
-+ CyclicBarrier t1Cond1;
-+ CyclicBarrier t1Cond2;
-
-- void errorReply (HttpTransaction req, String reply) throws IOException {
-- req.addResponseHeader ("Connection", "close");
-- req.addResponseHeader ("WWW-Authenticate", reply);
-- req.sendResponse (401, "Unauthorized");
-- req.orderlyClose();
-+ public String getAddress() {
-+ return server.getAddress().getHostName();
- }
-
-- void proxyReply (HttpTransaction req, String reply) throws IOException {
-- req.addResponseHeader ("Proxy-Authenticate", reply);
-- req.sendResponse (407, "Proxy Authentication Required");
-- }
--
-- void okReply (HttpTransaction req) throws IOException {
-- req.addResponseHeader ("Connection", "close");
-- req.setResponseEntityBody ("Hello .");
-- req.sendResponse (200, "Ok");
-- req.orderlyClose();
-- }
-+ public void startServer() {
-+ InetSocketAddress addr = new InetSocketAddress(0);
-
-- public void request (HttpTransaction req, int count) {
- try {
-- URI uri = req.getRequestURI();
-- String path = uri.getPath();
-- if (path.endsWith ("/t1a")) {
-- doT1a (req, count);
-- } else if (path.endsWith ("/t1b")) {
-- doT1b (req, count);
-- } else if (path.endsWith ("/t1c")) {
-- doT1c (req, count);
-- } else if (path.endsWith ("/t1d")) {
-- doT1d (req, count);
-- } else if (path.endsWith ("/t2a")) {
-- doT2a (req, count);
-- } else if (path.endsWith ("/t2b")) {
-- doT2b (req, count);
-- } else if (path.endsWith ("/t3a")) {
-- doT3a (req, count);
-- } else if (path.endsWith ("/t3b")) {
-- doT3bc (req, count);
-- } else if (path.endsWith ("/t3c")) {
-- doT3bc (req, count);
-- } else {
-- System.out.println ("unexpected request URI");
-- }
-- } catch (IOException e) {
-- e.printStackTrace();
-- }
-+ server = HttpServer.create(addr, 0);
-+ } catch (IOException ioe) {
-+ throw new RuntimeException("Server could not be created");
-+ }
-+ executor = Executors.newFixedThreadPool(10);
-+ server.setExecutor(executor);
-+ server.createContext("/test/realm1/t1a",
-+ new AuthenticationHandlerT1a() );
-+ server.createContext("/test/realm2/t1b",
-+ new AuthenticationHandlerT1b());
-+ server.createContext("/test/realm1/t1c",
-+ new AuthenticationHandlerT1c());
-+ server.createContext("/test/realm2/t1d",
-+ new AuthenticationHandlerT1d());
-+ server.createContext("/test/realm3/t2a",
-+ new AuthenticationHandlerT2a());
-+ server.createContext("/test/realm3/t2b",
-+ new AuthenticationHandlerT2b());
-+ server.createContext("/test/realm4/t3a",
-+ new AuthenticationHandlerT3a());
-+ server.createContext("/test/realm4/t3b",
-+ new AuthenticationHandlerT3bc());
-+ server.createContext("/test/realm4/t3c",
-+ new AuthenticationHandlerT3bc());
-+ t1Cond1 = new CyclicBarrier(2);
-+ t1Cond2 = new CyclicBarrier(2);
-+ server.start();
-+ }
-+
-+ public int getPort() {
-+ return server.getAddress().getPort();
-+ }
-+
-+ public void close() {
-+ if (executor != null)
-+ ((ExecutorService)executor).shutdownNow();
-+ if (server != null)
-+ server.stop(0);
- }
-
- /* T1 tests the client by sending 4 requests to 2 different realms
-@@ -138,90 +148,158 @@
- * the second requests should be executed without calling the authenticator.
- * The test succeeds if the authenticator was only called twice.
- */
-- void doT1a (HttpTransaction req, int count) throws IOException {
-- switch (count) {
-- case 0:
-- errorReply (req, "Basic realm=\"realm1\"");
-- HttpServer.rendezvous ("one", 2);
-- break;
-- case 1:
-- HttpServer.waitForCondition ("cond2");
-- okReply (req);
-- break;
-- default:
-- System.out.println ("Unexpected request");
-+ class AuthenticationHandlerT1a implements HttpHandler
-+ {
-+ volatile int count = -1;
-+
-+ @Override
-+ public void handle(HttpExchange exchange) throws IOException {
-+ count++;
-+ try {
-+ switch(count) {
-+ case 0:
-+ AuthenticationHandler.errorReply(exchange,
-+ "Basic realm=\"realm1\"");
-+ break;
-+ case 1:
-+ t1Cond1.await();
-+ t1cond2latch.await();
-+ AuthenticationHandler.okReply(exchange);
-+ break;
-+ default:
-+ System.out.println ("Unexpected request");
-+ }
-+ } catch (InterruptedException |
-+ BrokenBarrierException e)
-+ {
-+ throw new RuntimeException(e);
-+ }
- }
- }
-
--
-- void doT1b (HttpTransaction req, int count) throws IOException {
-- switch (count) {
-- case 0:
-- errorReply (req, "Basic realm=\"realm2\"");
-- HttpServer.rendezvous ("one", 2);
-- HttpServer.setCondition ("cond1");
-- break;
-- case 1:
-- HttpServer.waitForCondition ("cond2");
-- okReply (req);
-- break;
-- default:
-- System.out.println ("Unexpected request");
-+ class AuthenticationHandlerT1b implements HttpHandler
-+ {
-+ volatile int count = -1;
-+
-+ @Override
-+ public void handle(HttpExchange exchange) throws IOException {
-+ count++;
-+ try {
-+ switch(count) {
-+ case 0:
-+ AuthenticationHandler.errorReply(exchange,
-+ "Basic realm=\"realm2\"");
-+ break;
-+ case 1:
-+ t1Cond1.await();
-+ t1cond1latch.countDown();
-+ t1cond2latch.await();
-+ AuthenticationHandler.okReply(exchange);
-+ break;
-+ default:
-+ System.out.println ("Unexpected request");
-+ }
-+ } catch (InterruptedException | BrokenBarrierException e) {
-+ throw new RuntimeException(e);
-+ }
- }
- }
-
-- void doT1c (HttpTransaction req, int count) throws IOException {
-- switch (count) {
-- case 0:
-- errorReply (req, "Basic realm=\"realm1\"");
-- HttpServer.rendezvous ("two", 2);
-- break;
-- case 1:
-- okReply (req);
-- break;
-- default:
-- System.out.println ("Unexpected request");
-+ class AuthenticationHandlerT1c implements HttpHandler
-+ {
-+ volatile int count = -1;
-+
-+ @Override
-+ public void handle(HttpExchange exchange) throws IOException {
-+ count++;
-+ switch(count) {
-+ case 0:
-+ AuthenticationHandler.errorReply(exchange,
-+ "Basic realm=\"realm1\"");
-+ try {
-+ t1Cond2.await();
-+ } catch (InterruptedException |
-+ BrokenBarrierException e)
-+ {
-+ throw new RuntimeException(e);
-+ }
-+ break;
-+ case 1:
-+ AuthenticationHandler.okReply(exchange);
-+ break;
-+ default:
-+ System.out.println ("Unexpected request");
-+ }
- }
- }
-
-- void doT1d (HttpTransaction req, int count) throws IOException {
-- switch (count) {
-- case 0:
-- errorReply (req, "Basic realm=\"realm2\"");
-- HttpServer.rendezvous ("two", 2);
-- HttpServer.setCondition ("cond2");
-- break;
-- case 1:
-- okReply (req);
-- break;
-- default:
-- System.out.println ("Unexpected request");
-+ class AuthenticationHandlerT1d implements HttpHandler
-+ {
-+ volatile int count = -1;
-+
-+ @Override
-+ public void handle(HttpExchange exchange) throws IOException {
-+ count++;
-+ switch(count) {
-+ case 0:
-+ AuthenticationHandler.errorReply(exchange,
-+ "Basic realm=\"realm2\"");
-+ try {
-+ t1Cond2.await();
-+ } catch (InterruptedException |
-+ BrokenBarrierException e)
-+ {
-+ throw new RuntimeException(e);
-+ }
-+ t1cond2latch.countDown();
-+ break;
-+ case 1:
-+ AuthenticationHandler.okReply(exchange);
-+ break;
-+ default:
-+ System.out.println ("Unexpected request");
-+ }
- }
- }
-
--
- /* T2 tests to check that if initial authentication fails, the second will
- * succeed, and the authenticator is called twice
- */
-
-- void doT2a (HttpTransaction req, int count) throws IOException {
-- /* This will be called several times */
-- if (count == 1) {
-- HttpServer.setCondition ("T2cond1");
-- }
-- errorReply (req, "Basic realm=\"realm3\"");
-- }
--
-- void doT2b (HttpTransaction req, int count) throws IOException {
-- switch (count) {
-- case 0:
-- errorReply (req, "Basic realm=\"realm3\"");
-- break;
-- case 1:
-- okReply (req);
-- break;
-- default:
-- System.out.println ("Unexpected request");
-+ class AuthenticationHandlerT2a implements HttpHandler
-+ {
-+ volatile int count = -1;
-+
-+ @Override
-+ public void handle(HttpExchange exchange) throws IOException {
-+ count++;
-+ if (count == 1) {
-+ t2condlatch.countDown();
-+ }
-+ AuthenticationHandler.errorReply(exchange,
-+ "Basic realm=\"realm3\"");
-+
-+ }
-+ }
-+
-+ class AuthenticationHandlerT2b implements HttpHandler
-+ {
-+ volatile int count = -1;
-+
-+ @Override
-+ public void handle(HttpExchange exchange) throws IOException {
-+ count++;
-+ switch(count) {
-+ case 0:
-+ AuthenticationHandler.errorReply(exchange,
-+ "Basic realm=\"realm3\"");
-+ break;
-+ case 1:
-+ AuthenticationHandler.okReply(exchange);
-+ break;
-+ default:
-+ System.out.println ("Unexpected request");
-+ }
- }
- }
-
-@@ -229,36 +307,82 @@
- * resource at same time. Authenticator should be called once for server
- * and once for proxy
- */
-- void doT3a (HttpTransaction req, int count) throws IOException {
-- switch (count) {
-- case 0:
-- proxyReply (req, "Basic realm=\"proxy\"");
-- HttpServer.setCondition ("T3cond1");
-- break;
-- case 1:
-- errorReply (req, "Basic realm=\"realm4\"");
-- break;
-- case 2:
-- okReply (req);
-- break;
-- default:
-- System.out.println ("Unexpected request");
-+
-+ class AuthenticationHandlerT3a implements HttpHandler
-+ {
-+ volatile int count = -1;
-+
-+ @Override
-+ public void handle(HttpExchange exchange) throws IOException {
-+ count++;
-+ switch(count) {
-+ case 0:
-+ AuthenticationHandler.proxyReply(exchange,
-+ "Basic realm=\"proxy\"");
-+ break;
-+ case 1:
-+ t3cond1.countDown();
-+ AuthenticationHandler.errorReply(exchange,
-+ "Basic realm=\"realm4\"");
-+ break;
-+ case 2:
-+ AuthenticationHandler.okReply(exchange);
-+ break;
-+ default:
-+ System.out.println ("Unexpected request");
-+ }
- }
- }
-
-- void doT3bc (HttpTransaction req, int count) throws IOException {
-- switch (count) {
-- case 0:
-- proxyReply (req, "Basic realm=\"proxy\"");
-- break;
-- case 1:
-- okReply (req);
-- break;
-- default:
-- System.out.println ("Unexpected request");
-+ class AuthenticationHandlerT3bc implements HttpHandler
-+ {
-+ volatile int count = -1;
-+
-+ @Override
-+ public void handle(HttpExchange exchange) throws IOException {
-+ count++;
-+ switch(count) {
-+ case 0:
-+ AuthenticationHandler.proxyReply(exchange,
-+ "Basic realm=\"proxy\"");
-+ break;
-+ case 1:
-+ AuthenticationHandler.okReply(exchange);
-+ break;
-+ default:
-+ System.out.println ("Unexpected request");
-+ }
- }
- }
-- };
-+ }
-+
-+ static class AuthenticationHandler {
-+ static void errorReply(HttpExchange exchange, String reply)
-+ throws IOException
-+ {
-+ exchange.getResponseHeaders().add("Connection", "close");
-+ exchange.getResponseHeaders().add("WWW-Authenticate", reply);
-+ exchange.sendResponseHeaders(401, 0);
-+ exchange.close();
-+ }
-+
-+ static void proxyReply (HttpExchange exchange, String reply)
-+ throws IOException
-+ {
-+ exchange.getResponseHeaders().add("Proxy-Authenticate", reply);
-+ exchange.sendResponseHeaders(407, 0);
-+ }
-+
-+ static void okReply (HttpExchange exchange) throws IOException {
-+ exchange.getResponseHeaders().add("Connection", "close");
-+ String response = "Hello .";
-+ exchange.sendResponseHeaders(200, response.getBytes().length);
-+ OutputStream os = exchange.getResponseBody();
-+ os.write(response.getBytes());
-+ os.close();
-+ exchange.close();
-+ }
-+ }
-
- static HttpServer server;
- static MyAuthenticator auth = new MyAuthenticator ();
-@@ -267,7 +391,14 @@
-
- static Client c1,c2,c3,c4,c5,c6,c7,c8,c9;
-
-- static void doServerTests (String authority) throws Exception {
-+ static CountDownLatch t1cond1latch;
-+ static CountDownLatch t1cond2latch;
-+ static CountDownLatch t2condlatch;
-+ static CountDownLatch t3cond1;
-+
-+ static void doServerTests (String authority, Server server) throws Exception
-+ {
-+
- System.out.println ("Doing Server tests");
- System.out.println ("T1");
- c1 = new Client (authority, "/test/realm1/t1a", false);
-@@ -275,17 +406,20 @@
- c3 = new Client (authority, "/test/realm1/t1c", false);
- c4 = new Client (authority, "/test/realm2/t1d", false);
-
-+ t1cond1latch = new CountDownLatch(1);
-+ t1cond2latch = new CountDownLatch(1);
- c1.start(); c2.start();
-- HttpServer.waitForCondition ("cond1");
-+ t1cond1latch.await();
- c3.start(); c4.start();
- c1.join(); c2.join(); c3.join(); c4.join();
-
- int f = auth.getCount();
- if (f != 2) {
-- except ("Authenticator was called "+f+" times. Should be 2");
-+ except ("Authenticator was called "+f+" times. Should be 2",
-+ server);
- }
- if (error) {
-- except ("error occurred");
-+ except ("error occurred", server);
- }
-
- auth.resetCount();
-@@ -293,73 +427,71 @@
-
- c5 = new Client (authority, "/test/realm3/t2a", true);
- c6 = new Client (authority, "/test/realm3/t2b", false);
-+ t2condlatch = new CountDownLatch(1);
- c5.start ();
-- HttpServer.waitForCondition ("T2cond1");
-+ t2condlatch.await();
- c6.start ();
- c5.join(); c6.join();
-
- f = auth.getCount();
- if (f != redirects+1) {
-- except ("Authenticator was called "+f+" times. Should be: " + redirects+1);
-+ except ("Authenticator was called "+f+" times. Should be: "
-+ + redirects+1, server);
- }
- if (error) {
-- except ("error occurred");
-+ except ("error occurred", server);
- }
- }
-
-- static void doProxyTests (String authority) throws Exception {
-+ static void doProxyTests (String authority, Server server) throws Exception
-+ {
- System.out.println ("Doing Proxy tests");
- c7 = new Client (authority, "/test/realm4/t3a", false);
- c8 = new Client (authority, "/test/realm4/t3b", false);
- c9 = new Client (authority, "/test/realm4/t3c", false);
-+ t3cond1 = new CountDownLatch(1);
- c7.start ();
-- HttpServer.waitForCondition ("T3cond1");
-+ t3cond1.await();
- c8.start ();
- c9.start ();
- c7.join(); c8.join(); c9.join();
-
- int f = auth.getCount();
- if (f != 2) {
-- except ("Authenticator was called "+f+" times. Should be: " + 2);
-+ except ("Authenticator was called "+f+" times. Should be: " + 2,
-+ server);
- }
- if (error) {
-- except ("error occurred");
-+ except ("error occurred", server);
- }
- }
-
- public static void main (String[] args) throws Exception {
-+ new B4769350().runTest(args[0].equals ("proxy"));
-+ }
-+
-+ public void runTest(boolean proxy) throws Exception {
- System.setProperty ("http.maxRedirects", Integer.toString (redirects));
- System.setProperty ("http.auth.serializeRequests", "true");
- Authenticator.setDefault (auth);
-- boolean proxy = args[0].equals ("proxy");
-- try {
-- server = new HttpServer (new CallBack(), 10, 1, 0);
-- System.out.println ("Server: listening on port: " + server.getLocalPort());
-+ try (Server server = new Server()) {
-+ server.startServer();
-+ System.out.println ("Server: listening on port: "
-+ + server.getPort());
- if (proxy) {
- System.setProperty ("http.proxyHost", "localhost");
-- System.setProperty ("http.proxyPort",Integer.toString(server.getLocalPort()));
-- doProxyTests ("www.foo.com");
-+ System.setProperty ("http.proxyPort",
-+ Integer.toString(server.getPort()));
-+ doProxyTests ("www.foo.com", server);
- } else {
-- doServerTests ("localhost:"+server.getLocalPort());
-+ doServerTests ("localhost:"+server.getPort(), server);
- }
-- server.terminate();
--
-- } catch (Exception e) {
-- if (server != null) {
-- server.terminate();
-- }
-- throw e;
- }
-- }
-
-- static void pause (int millis) {
-- try {
-- Thread.sleep (millis);
-- } catch (InterruptedException e) {}
- }
-
-- public static void except (String s) {
-- server.terminate();
-+ public static void except (String s, Server server) {
-+ server.close();
- throw new RuntimeException (s);
- }
-
-@@ -368,13 +500,10 @@
- super ();
- }
-
-- int count = 0;
-+ volatile int count = 0;
-
-+ @Override
- public PasswordAuthentication getPasswordAuthentication () {
-- //System.out.println ("Authenticator called: " + getRequestingPrompt());
-- //try {
-- //Thread.sleep (1000);
-- //} catch (InterruptedException e) {}
- PasswordAuthentication pw;
- pw = new PasswordAuthentication ("user", "pass1".toCharArray());
- count ++;
-@@ -386,7 +515,7 @@
- }
-
- public int getCount () {
-- return (count);
-+ return count;
- }
- }
- }
---- ./jdk/test/java/net/Authenticator/B4933582.sh 2013-09-06 11:29:36.000000000 -0700
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -26,7 +26,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java 2013-09-06 11:29:36.000000000 -0700
-+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java 2014-10-28 20:19:52.000000000 -0700
-@@ -45,6 +45,8 @@
- return (true);
- if (p.getProperty ("os.name").equals ("Linux"))
- return (true);
-+ if (p.getProperty ("os.name").endsWith ("BSD"))
-+ return (true);
- if (p.getProperty ("os.name").startsWith ("Mac OS"))
- 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-10-28 20:19:52.000000000 -0700
-@@ -27,11 +27,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Darwin )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Linux )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- FILESEP="/"
- ;;
---- ./jdk/test/java/net/IDN/UseSTD3ASCIIRules.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/net/IDN/UseSTD3ASCIIRules.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,80 @@
-+/*
-+ * 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 8023881
-+ * @summary IDN.USE_STD3_ASCII_RULES option is too strict to use Unicode
-+ * in IDN.toASCII
-+ */
-+
-+import java.net.*;
-+
-+public class UseSTD3ASCIIRules {
-+
-+ public static void main(String[] args) throws Exception {
-+ // Per Section 4.1, RFC 3490, if the UseSTD3ASCIIRules flag is set,
-+ // then perform these checks:
-+ //
-+ // (a) Verify the absence of non-LDH ASCII code points; that is, the
-+ // absence of 0..2C, 2E..2F, 3A..40, 5B..60, and 7B..7F.
-+ //
-+ // (b) Verify the absence of leading and trailing hyphen-minus; that
-+ // is, the absence of U+002D at the beginning and end of the
-+ // sequence.
-+ String[] illegalNames = {
-+ "www.example.com-",
-+ "-www.example.com",
-+ "-www.example.com-",
-+ "www.ex\u002Cmple.com",
-+ "www.ex\u007Bmple.com",
-+ "www.ex\u007Fmple.com"
-+ };
-+
-+ String[] legalNames = {
-+ "www.ex-ample.com",
-+ "www.ex\u002Dmple.com", // www.ex-mple.com
-+ "www.ex\u007Ample.com", // www.exzmple.com
-+ "www.ex\u3042mple.com", // www.xn--exmple-j43e.com
-+ "www.\u3042\u3044\u3046.com", // www.xn--l8jeg.com
-+ "www.\u793A\u4F8B.com" // www.xn--fsq092h.com
-+ };
-+
-+ for (String name : illegalNames) {
-+ try {
-+ System.out.println("Convering illegal IDN: " + name);
-+ IDN.toASCII(name, IDN.USE_STD3_ASCII_RULES);
-+ throw new Exception(
-+ "Expected to get IllegalArgumentException for " + name);
-+ } catch (IllegalArgumentException iae) {
-+ // That's the right behavior.
-+ }
-+ }
-+
-+ for (String name : legalNames) {
-+ System.out.println("Convering legal IDN: " + name);
-+ System.out.println("\tThe ACE form is: " +
-+ IDN.toASCII(name, IDN.USE_STD3_ASCII_RULES));
-+ }
-+ }
-+}
---- ./jdk/test/java/net/Inet6Address/serialize/Serialize.java 2013-09-06 11:29:37.000000000 -0700
-+++ ./jdk/test/java/net/Inet6Address/serialize/Serialize.java 2014-07-15 21:49:32.000000000 -0700
-@@ -94,7 +94,26 @@
- } finally {
- ois.close();
- }
-- System.out.println(nobj);
-+
-+ nobj = (Inet6Address)InetAddress.getByAddress("foo.com", new byte[] {
-+ (byte)0xfe,(byte)0x80,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,
-+ (byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)1
-+ });
-+ if (!test1(nobj, addr1)) {
-+ throw new RuntimeException("failed with " + nobj.toString());
-+ }
-+ nobj = (Inet6Address)InetAddress.getByAddress("x.bar.com", new byte[] {
-+ (byte)0xfe,(byte)0xC0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,
-+ (byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)0,(byte)1
-+ });
-+ if (!test1(nobj, addr2)) {
-+ throw new RuntimeException("failed with " + nobj.toString());
-+ }
-+ nobj = (Inet6Address)InetAddress.getByName("::1");
-+ if (!test1(nobj, addr3)) {
-+ throw new RuntimeException("failed with " + nobj.toString());
-+ }
-+
- System.out.println("All tests passed");
- }
-
-@@ -113,4 +132,162 @@
- return false;
- }
- }
-- }
-+
-+ static boolean test1 (Inet6Address obj, byte[] buf) throws Exception {
-+ ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(buf));
-+ Inet6Address nobj = (Inet6Address) ois.readObject();
-+ ois.close();
-+
-+ if (nobj.equals(obj)) {
-+ return true;
-+ } else {
-+ return false;
-+ }
-+ }
-+
-+ // Inet6Address instances serialized with JDK 6
-+
-+ static byte[] addr1 = {
-+ (byte)0xac,(byte)0xed,(byte)0x00,(byte)0x05,(byte)0x73,(byte)0x72,
-+ (byte)0x00,(byte)0x15,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
-+ (byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x2e,(byte)0x49,
-+ (byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x36,(byte)0x41,(byte)0x64,
-+ (byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,(byte)0x5f,
-+ (byte)0x7c,(byte)0x20,(byte)0x81,(byte)0x52,(byte)0x2c,(byte)0x80,
-+ (byte)0x21,(byte)0x03,(byte)0x00,(byte)0x05,(byte)0x49,(byte)0x00,
-+ (byte)0x08,(byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,
-+ (byte)0x5f,(byte)0x69,(byte)0x64,(byte)0x5a,(byte)0x00,(byte)0x0c,
-+ (byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,(byte)0x5f,
-+ (byte)0x69,(byte)0x64,(byte)0x5f,(byte)0x73,(byte)0x65,(byte)0x74,
-+ (byte)0x5a,(byte)0x00,(byte)0x10,(byte)0x73,(byte)0x63,(byte)0x6f,
-+ (byte)0x70,(byte)0x65,(byte)0x5f,(byte)0x69,(byte)0x66,(byte)0x6e,
-+ (byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x5f,(byte)0x73,(byte)0x65,
-+ (byte)0x74,(byte)0x4c,(byte)0x00,(byte)0x06,(byte)0x69,(byte)0x66,
-+ (byte)0x6e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x74,(byte)0x00,
-+ (byte)0x12,(byte)0x4c,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
-+ (byte)0x2f,(byte)0x6c,(byte)0x61,(byte)0x6e,(byte)0x67,(byte)0x2f,
-+ (byte)0x53,(byte)0x74,(byte)0x72,(byte)0x69,(byte)0x6e,(byte)0x67,
-+ (byte)0x3b,(byte)0x5b,(byte)0x00,(byte)0x09,(byte)0x69,(byte)0x70,
-+ (byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,
-+ (byte)0x73,(byte)0x74,(byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,
-+ (byte)0x78,(byte)0x72,(byte)0x00,(byte)0x14,(byte)0x6a,(byte)0x61,
-+ (byte)0x76,(byte)0x61,(byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,
-+ (byte)0x2e,(byte)0x49,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x41,
-+ (byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,
-+ (byte)0x2d,(byte)0x9b,(byte)0x57,(byte)0xaf,(byte)0x9f,(byte)0xe3,
-+ (byte)0xeb,(byte)0xdb,(byte)0x02,(byte)0x00,(byte)0x03,(byte)0x49,
-+ (byte)0x00,(byte)0x07,(byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,
-+ (byte)0x65,(byte)0x73,(byte)0x73,(byte)0x49,(byte)0x00,(byte)0x06,
-+ (byte)0x66,(byte)0x61,(byte)0x6d,(byte)0x69,(byte)0x6c,(byte)0x79,
-+ (byte)0x4c,(byte)0x00,(byte)0x08,(byte)0x68,(byte)0x6f,(byte)0x73,
-+ (byte)0x74,(byte)0x4e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x71,
-+ (byte)0x00,(byte)0x7e,(byte)0x00,(byte)0x01,(byte)0x78,(byte)0x70,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x02,(byte)0x74,(byte)0x00,(byte)0x07,(byte)0x66,
-+ (byte)0x6f,(byte)0x6f,(byte)0x2e,(byte)0x63,(byte)0x6f,(byte)0x6d,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x70,(byte)0x75,(byte)0x72,(byte)0x00,(byte)0x02,(byte)0x5b,
-+ (byte)0x42,(byte)0xac,(byte)0xf3,(byte)0x17,(byte)0xf8,(byte)0x06,
-+ (byte)0x08,(byte)0x54,(byte)0xe0,(byte)0x02,(byte)0x00,(byte)0x00,
-+ (byte)0x78,(byte)0x70,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x10,
-+ (byte)0xfe,(byte)0x80,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,(byte)0x78
-+ };
-+
-+ static byte[] addr2 = {
-+ (byte)0xac,(byte)0xed,(byte)0x00,(byte)0x05,(byte)0x73,(byte)0x72,
-+ (byte)0x00,(byte)0x15,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
-+ (byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x2e,(byte)0x49,
-+ (byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x36,(byte)0x41,(byte)0x64,
-+ (byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,(byte)0x5f,
-+ (byte)0x7c,(byte)0x20,(byte)0x81,(byte)0x52,(byte)0x2c,(byte)0x80,
-+ (byte)0x21,(byte)0x03,(byte)0x00,(byte)0x05,(byte)0x49,(byte)0x00,
-+ (byte)0x08,(byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,
-+ (byte)0x5f,(byte)0x69,(byte)0x64,(byte)0x5a,(byte)0x00,(byte)0x0c,
-+ (byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,(byte)0x5f,
-+ (byte)0x69,(byte)0x64,(byte)0x5f,(byte)0x73,(byte)0x65,(byte)0x74,
-+ (byte)0x5a,(byte)0x00,(byte)0x10,(byte)0x73,(byte)0x63,(byte)0x6f,
-+ (byte)0x70,(byte)0x65,(byte)0x5f,(byte)0x69,(byte)0x66,(byte)0x6e,
-+ (byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x5f,(byte)0x73,(byte)0x65,
-+ (byte)0x74,(byte)0x4c,(byte)0x00,(byte)0x06,(byte)0x69,(byte)0x66,
-+ (byte)0x6e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x74,(byte)0x00,
-+ (byte)0x12,(byte)0x4c,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
-+ (byte)0x2f,(byte)0x6c,(byte)0x61,(byte)0x6e,(byte)0x67,(byte)0x2f,
-+ (byte)0x53,(byte)0x74,(byte)0x72,(byte)0x69,(byte)0x6e,(byte)0x67,
-+ (byte)0x3b,(byte)0x5b,(byte)0x00,(byte)0x09,(byte)0x69,(byte)0x70,
-+ (byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,
-+ (byte)0x73,(byte)0x74,(byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,
-+ (byte)0x78,(byte)0x72,(byte)0x00,(byte)0x14,(byte)0x6a,(byte)0x61,
-+ (byte)0x76,(byte)0x61,(byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,
-+ (byte)0x2e,(byte)0x49,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x41,
-+ (byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,
-+ (byte)0x2d,(byte)0x9b,(byte)0x57,(byte)0xaf,(byte)0x9f,(byte)0xe3,
-+ (byte)0xeb,(byte)0xdb,(byte)0x02,(byte)0x00,(byte)0x03,(byte)0x49,
-+ (byte)0x00,(byte)0x07,(byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,
-+ (byte)0x65,(byte)0x73,(byte)0x73,(byte)0x49,(byte)0x00,(byte)0x06,
-+ (byte)0x66,(byte)0x61,(byte)0x6d,(byte)0x69,(byte)0x6c,(byte)0x79,
-+ (byte)0x4c,(byte)0x00,(byte)0x08,(byte)0x68,(byte)0x6f,(byte)0x73,
-+ (byte)0x74,(byte)0x4e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x71,
-+ (byte)0x00,(byte)0x7e,(byte)0x00,(byte)0x01,(byte)0x78,(byte)0x70,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x02,(byte)0x74,(byte)0x00,(byte)0x09,(byte)0x78,
-+ (byte)0x2e,(byte)0x62,(byte)0x61,(byte)0x72,(byte)0x2e,(byte)0x63,
-+ (byte)0x6f,(byte)0x6d,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x00,(byte)0x70,(byte)0x75,(byte)0x72,(byte)0x00,
-+ (byte)0x02,(byte)0x5b,(byte)0x42,(byte)0xac,(byte)0xf3,(byte)0x17,
-+ (byte)0xf8,(byte)0x06,(byte)0x08,(byte)0x54,(byte)0xe0,(byte)0x02,
-+ (byte)0x00,(byte)0x00,(byte)0x78,(byte)0x70,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x10,(byte)0xfe,(byte)0xc0,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,
-+ (byte)0x78
-+ };
-+
-+ static byte[] addr3 = {
-+ (byte)0xac,(byte)0xed,(byte)0x00,(byte)0x05,(byte)0x73,(byte)0x72,
-+ (byte)0x00,(byte)0x15,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
-+ (byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x2e,(byte)0x49,
-+ (byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x36,(byte)0x41,(byte)0x64,
-+ (byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,(byte)0x5f,
-+ (byte)0x7c,(byte)0x20,(byte)0x81,(byte)0x52,(byte)0x2c,(byte)0x80,
-+ (byte)0x21,(byte)0x03,(byte)0x00,(byte)0x05,(byte)0x49,(byte)0x00,
-+ (byte)0x08,(byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,
-+ (byte)0x5f,(byte)0x69,(byte)0x64,(byte)0x5a,(byte)0x00,(byte)0x0c,
-+ (byte)0x73,(byte)0x63,(byte)0x6f,(byte)0x70,(byte)0x65,(byte)0x5f,
-+ (byte)0x69,(byte)0x64,(byte)0x5f,(byte)0x73,(byte)0x65,(byte)0x74,
-+ (byte)0x5a,(byte)0x00,(byte)0x10,(byte)0x73,(byte)0x63,(byte)0x6f,
-+ (byte)0x70,(byte)0x65,(byte)0x5f,(byte)0x69,(byte)0x66,(byte)0x6e,
-+ (byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x5f,(byte)0x73,(byte)0x65,
-+ (byte)0x74,(byte)0x4c,(byte)0x00,(byte)0x06,(byte)0x69,(byte)0x66,
-+ (byte)0x6e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x74,(byte)0x00,
-+ (byte)0x12,(byte)0x4c,(byte)0x6a,(byte)0x61,(byte)0x76,(byte)0x61,
-+ (byte)0x2f,(byte)0x6c,(byte)0x61,(byte)0x6e,(byte)0x67,(byte)0x2f,
-+ (byte)0x53,(byte)0x74,(byte)0x72,(byte)0x69,(byte)0x6e,(byte)0x67,
-+ (byte)0x3b,(byte)0x5b,(byte)0x00,(byte)0x09,(byte)0x69,(byte)0x70,
-+ (byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,
-+ (byte)0x73,(byte)0x74,(byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,
-+ (byte)0x78,(byte)0x72,(byte)0x00,(byte)0x14,(byte)0x6a,(byte)0x61,
-+ (byte)0x76,(byte)0x61,(byte)0x2e,(byte)0x6e,(byte)0x65,(byte)0x74,
-+ (byte)0x2e,(byte)0x49,(byte)0x6e,(byte)0x65,(byte)0x74,(byte)0x41,
-+ (byte)0x64,(byte)0x64,(byte)0x72,(byte)0x65,(byte)0x73,(byte)0x73,
-+ (byte)0x2d,(byte)0x9b,(byte)0x57,(byte)0xaf,(byte)0x9f,(byte)0xe3,
-+ (byte)0xeb,(byte)0xdb,(byte)0x02,(byte)0x00,(byte)0x03,(byte)0x49,
-+ (byte)0x00,(byte)0x07,(byte)0x61,(byte)0x64,(byte)0x64,(byte)0x72,
-+ (byte)0x65,(byte)0x73,(byte)0x73,(byte)0x49,(byte)0x00,(byte)0x06,
-+ (byte)0x66,(byte)0x61,(byte)0x6d,(byte)0x69,(byte)0x6c,(byte)0x79,
-+ (byte)0x4c,(byte)0x00,(byte)0x08,(byte)0x68,(byte)0x6f,(byte)0x73,
-+ (byte)0x74,(byte)0x4e,(byte)0x61,(byte)0x6d,(byte)0x65,(byte)0x71,
-+ (byte)0x00,(byte)0x7e,(byte)0x00,(byte)0x01,(byte)0x78,(byte)0x70,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x02,(byte)0x70,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x70,(byte)0x75,(byte)0x72,
-+ (byte)0x00,(byte)0x02,(byte)0x5b,(byte)0x42,(byte)0xac,(byte)0xf3,
-+ (byte)0x17,(byte)0xf8,(byte)0x06,(byte)0x08,(byte)0x54,(byte)0xe0,
-+ (byte)0x02,(byte)0x00,(byte)0x00,(byte)0x78,(byte)0x70,(byte)0x00,
-+ (byte)0x00,(byte)0x00,(byte)0x10,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
-+ (byte)0x01,(byte)0x78
-+ };
-+}
---- ./jdk/test/java/net/NetworkInterface/UniqueMacAddressesTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/net/NetworkInterface/UniqueMacAddressesTest.java 2014-10-28 20:19:45.000000000 -0700
-@@ -0,0 +1,129 @@
-+/*
-+ * 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.net.InetAddress;
-+import java.net.NetworkInterface;
-+import java.net.SocketException;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Enumeration;
-+import java.util.List;
-+
-+
-+/*
-+ * @test
-+ * @bug 8021372
-+ * @summary Tests that the MAC addresses returned by NetworkInterface.getNetworkInterfaces are unique for each adapter.
-+ *
-+ */
-+public class UniqueMacAddressesTest {
-+
-+ public static void main(String[] args) throws Exception {
-+ new UniqueMacAddressesTest().execute();
-+ System.out.println("UniqueMacAddressesTest: OK");
-+ }
-+
-+ public UniqueMacAddressesTest() {
-+ System.out.println("UniqueMacAddressesTest: start ");
-+ }
-+
-+ public void execute() throws Exception {
-+ Enumeration<NetworkInterface> networkInterfaces;
-+ boolean areMacAddressesUnique = false;
-+ List<NetworkInterface> networkInterfaceList = new ArrayList<NetworkInterface>();
-+ networkInterfaces = NetworkInterface.getNetworkInterfaces();
-+
-+ // build a list of NetworkInterface objects to test MAC address
-+ // uniqueness
-+ createNetworkInterfaceList(networkInterfaces, networkInterfaceList);
-+ areMacAddressesUnique = checkMacAddressesAreUnique(networkInterfaceList);
-+ if (!areMacAddressesUnique) {
-+ throw new RuntimeException("mac address uniqueness test failed");
-+ }
-+ }
-+
-+ private boolean checkMacAddressesAreUnique (
-+ List<NetworkInterface> networkInterfaces) throws Exception {
-+ boolean uniqueMacAddresses = true;
-+ for (NetworkInterface networkInterface : networkInterfaces) {
-+ for (NetworkInterface comparisonNetIf : networkInterfaces) {
-+ System.out.println("Comparing netif "
-+ + networkInterface.getName() + " and netif "
-+ + comparisonNetIf.getName());
-+ if (testMacAddressesEqual(networkInterface, comparisonNetIf)) {
-+ uniqueMacAddresses = false;
-+ break;
-+ }
-+ }
-+ if (uniqueMacAddresses != true)
-+ break;
-+ }
-+ return uniqueMacAddresses;
-+ }
-+
-+ private boolean testMacAddressesEqual(NetworkInterface netIf1,
-+ NetworkInterface netIf2) throws Exception {
-+
-+ byte[] rawMacAddress1 = null;
-+ byte[] rawMacAddress2 = null;
-+ boolean macAddressesEqual = false;
-+ if (!netIf1.getName().equals(netIf2.getName())) {
-+ System.out.println("compare hardware addresses "
-+ + createMacAddressString(netIf1) + " and " + createMacAddressString(netIf2));
-+ rawMacAddress1 = netIf1.getHardwareAddress();
-+ rawMacAddress2 = netIf2.getHardwareAddress();
-+ macAddressesEqual = Arrays.equals(rawMacAddress1, rawMacAddress2);
-+ } else {
-+ // same interface
-+ macAddressesEqual = false;
-+ }
-+ return macAddressesEqual;
-+ }
-+
-+ private String createMacAddressString (NetworkInterface netIf) throws Exception {
-+ byte[] macAddr = netIf.getHardwareAddress();
-+ StringBuilder sb = new StringBuilder();
-+ if (macAddr != null) {
-+ for (int i = 0; i < macAddr.length; i++) {
-+ sb.append(String.format("%02X%s", macAddr[i],
-+ (i < macAddr.length - 1) ? "-" : ""));
-+ }
-+ }
-+ return sb.toString();
-+ }
-+
-+ private void createNetworkInterfaceList(Enumeration<NetworkInterface> nis,
-+ List<NetworkInterface> networkInterfaceList) throws Exception {
-+ byte[] macAddr = null;
-+ NetworkInterface netIf = null;
-+ while (nis.hasMoreElements()) {
-+ netIf = (NetworkInterface) nis.nextElement();
-+ macAddr = netIf.getHardwareAddress();
-+ if (macAddr != null) {
-+ System.out
-+ .println("Adding NetworkInterface " + netIf.getName());
-+ networkInterfaceList.add(netIf);
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/java/net/PlainSocketImpl/CustomSocketImplFactory.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/net/PlainSocketImpl/CustomSocketImplFactory.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,107 @@
-+/*
-+ * 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 8024952
-+ * @summary ClassCastException in PlainSocketImpl.accept() when using custom socketImpl
-+ * @run main/othervm CustomSocketImplFactory
-+ */
-+
-+import java.net.*;
-+import java.io.*;
-+
-+public class CustomSocketImplFactory implements SocketImplFactory {
-+
-+ @Override
-+ public SocketImpl createSocketImpl() {
-+ try {
-+ SocketImpl s = new CustomSocketImpl();
-+ System.out.println("Created " + s);
-+ return s;
-+ } catch (Exception e) {
-+ throw new RuntimeException(e);
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ Socket.setSocketImplFactory(new CustomSocketImplFactory());
-+ try (ServerSocket ss = new ServerSocket(0)) {
-+ ss.setSoTimeout(1);
-+ ss.accept();
-+ System.out.println("PASS");
-+ } catch (SocketTimeoutException | NullPointerException e) {
-+ // Not a real socket impl
-+ }
-+ }
-+
-+ class CustomSocketImpl extends SocketImpl {
-+
-+ public void create(boolean stream) throws IOException {
-+ }
-+
-+ public void connect(String host, int port) throws IOException {
-+ }
-+
-+ public void connect(InetAddress addr, int port) throws IOException {
-+ }
-+
-+ public void connect(SocketAddress addr, int timeout) throws IOException {
-+ }
-+
-+ public void bind(InetAddress host, int port) throws IOException {
-+ }
-+
-+ public void listen(int backlog) throws IOException {
-+ }
-+
-+ public void accept(SocketImpl s) throws IOException {
-+ }
-+
-+ public InputStream getInputStream() throws IOException {
-+ return null;
-+ }
-+
-+ public OutputStream getOutputStream() throws IOException {
-+ return null;
-+ }
-+
-+ public int available() throws IOException {
-+ return 0;
-+ }
-+
-+ public void close() throws IOException {
-+ }
-+
-+ public void sendUrgentData(int data) throws IOException {
-+ }
-+
-+ public Object getOption(int i) throws SocketException {
-+ return null;
-+ }
-+
-+ public void setOption(int i, Object o) throws SocketException {
-+ }
-+ }
-+}
---- ./jdk/test/java/net/ServerSocket/AnotherSelectFdsLimit.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/net/ServerSocket/AnotherSelectFdsLimit.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,78 @@
-+/*
-+ * 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 8035897
-+ * @summary FD_SETSIZE should be set on macosx
-+ * @run main/othervm AnotherSelectFdsLimit 1023
-+ * @run main/othervm AnotherSelectFdsLimit 1024
-+ * @run main/othervm AnotherSelectFdsLimit 1025
-+ * @run main/othervm AnotherSelectFdsLimit 1600
-+ */
-+
-+import java.io.IOException;
-+import java.net.ServerSocket;
-+import java.net.SocketTimeoutException;
-+import java.util.ArrayList;
-+import java.util.List;
-+
-+public class AnotherSelectFdsLimit {
-+ static final int DEFAULT_FDS_TO_USE = 1600;
-+
-+ public static void main(String [] args) throws Exception {
-+ if (!System.getProperty("os.name").contains("OS X")) {
-+ System.out.println("Test only run on MAC. Exiting.");
-+ return;
-+ }
-+
-+ int fdsToUse = DEFAULT_FDS_TO_USE;
-+ if (args.length == 1)
-+ fdsToUse = Integer.parseInt(args[0]);
-+
-+ System.out.println("Using " + fdsToUse + " fds.");
-+
-+ List<Thread> threads = new ArrayList<>();
-+ for (int i=0; i<fdsToUse; i++)
-+ threads.add(new WorkerThread());
-+
-+ for (Thread t : threads)
-+ t.start();
-+
-+ for (Thread t : threads)
-+ t.join();
-+ }
-+
-+ static class WorkerThread extends Thread {
-+ public void run() {
-+ try (ServerSocket ss = new ServerSocket(0)) {
-+ ss.setSoTimeout(2000);
-+ ss.accept();
-+ } catch (SocketTimeoutException x) {
-+ // expected
-+ } catch (IOException x) {
-+ throw new RuntimeException(x);
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/java/net/ServerSocket/SelectFdsLimit.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/net/ServerSocket/SelectFdsLimit.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,104 @@
-+/*
-+ * 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 8021820
-+ * @summary The total number of file descriptors is limited to
-+ * 1024(FDSET_SIZE) on MacOSX (the size of fd array passed to select()
-+ * call in java.net classes is limited to this value).
-+ * @run main/othervm SelectFdsLimit
-+ * @author aleksej.efimov@oracle.com
-+ */
-+
-+import java.io.File;
-+import java.io.FileInputStream;
-+import java.io.FileNotFoundException;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.net.ServerSocket;
-+import java.net.SocketTimeoutException;
-+
-+
-+/*
-+ * Test must be run in othervm mode to ensure that all files
-+ * opened by openFiles() are closed propertly.
-+*/
-+public class SelectFdsLimit {
-+ static final int FDTOOPEN = 1023;
-+ static final String TESTFILE = "testfile";
-+ static FileInputStream [] testFIS;
-+
-+ static void prepareTestEnv() throws IOException {
-+ File fileToCreate = new File(TESTFILE);
-+ if (!fileToCreate.exists())
-+ if (!fileToCreate.createNewFile())
-+ throw new RuntimeException("Can't create test file");
-+ }
-+
-+ //If there will be some problem (i.e. ulimits on number of opened files will fail)
-+ //then this method will fail with exception and test will be considered as
-+ //failed. But allocated fds will be released because the test is executed by
-+ //dedicated VM (@run main/othervm).
-+ static void openFiles(int fn, File f) throws FileNotFoundException, IOException {
-+ testFIS = new FileInputStream[FDTOOPEN];
-+ for (;;) {
-+ if (0 == fn)
-+ break;
-+ FileInputStream fis = new FileInputStream(f);
-+ testFIS[--fn] = fis;
-+ }
-+ }
-+
-+ public static void main(String [] args) throws IOException, FileNotFoundException {
-+
-+ //The bug 8021820 is a Mac specific and because of that test will pass on all
-+ //other platforms
-+ if (!System.getProperty("os.name").contains("OS X")) {
-+ return;
-+ }
-+
-+ //Create test directory with test files
-+ prepareTestEnv();
-+
-+ //Consume FD ids for this java process to overflow the 1024
-+ openFiles(FDTOOPEN,new File(TESTFILE));
-+
-+ //Wait for incoming connection and make the select() used in java.net
-+ //classes fail the limitation on FDSET_SIZE
-+ ServerSocket socket = new ServerSocket(0);
-+
-+ //Set the minimal timeout, no one is
-+ //going to connect to this server socket
-+ socket.setSoTimeout(1);
-+
-+ // The accept() call will throw SocketException if the
-+ // select() has failed due to limitation on fds size,
-+ // indicating test failure. A SocketTimeoutException
-+ // is expected, so it is caught and ignored, and the test
-+ // passes.
-+ try {
-+ socket.accept();
-+ } catch (SocketTimeoutException e) { }
-+ }
-+}
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2013-09-06 11:29:37.000000000 -0700
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -28,7 +28,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/java/net/Socket/asyncClose/Race.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/net/Socket/asyncClose/Race.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,77 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * 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 8006395 8012244
-+ * @summary Tests racing code that reads and closes a Socket
-+ */
-+
-+import java.io.InputStream;
-+import java.net.ServerSocket;
-+import java.net.Socket;
-+import java.net.SocketException;
-+import java.util.concurrent.Phaser;
-+
-+// Racey test, will not always fail, but if it does then we have a problem.
-+
-+public class Race {
-+ final static int THREADS = 100;
-+
-+ public static void main(String[] args) throws Exception {
-+ try (ServerSocket ss = new ServerSocket(0)) {
-+ final int port = ss.getLocalPort();
-+ final Phaser phaser = new Phaser(THREADS + 1);
-+ for (int i=0; i<100; i++) {
-+ final Socket s = new Socket("localhost", port);
-+ s.setSoLinger(false, 0);
-+ try (Socket sa = ss.accept()) {
-+ sa.setSoLinger(false, 0);
-+ final InputStream is = s.getInputStream();
-+ Thread[] threads = new Thread[THREADS];
-+ for (int j=0; j<THREADS; j++) {
-+ threads[j] = new Thread() {
-+ public void run() {
-+ try {
-+ phaser.arriveAndAwaitAdvance();
-+ while (is.read() != -1)
-+ Thread.sleep(50);
-+ } catch (Exception x) {
-+ if (!(x instanceof SocketException
-+ && x.getMessage().equalsIgnoreCase("socket closed")))
-+ x.printStackTrace();
-+ // ok, expect Socket closed
-+ }
-+ }};
-+ }
-+ for (int j=0; j<100; j++)
-+ threads[j].start();
-+ phaser.arriveAndAwaitAdvance();
-+ s.close();
-+ for (int j=0; j<100; j++)
-+ threads[j].join();
-+ }
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/java/net/URL/B5086147.sh 2013-09-06 11:29:38.000000000 -0700
-+++ ./jdk/test/java/net/URL/B5086147.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -26,7 +26,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- exit 0
- ;;
- CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh 2013-09-06 11:29:38.000000000 -0700
-+++ ./jdk/test/java/net/URL/runconstructor.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -27,7 +27,7 @@
- #
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2013-09-06 11:29:38.000000000 -0700
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -34,11 +34,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Darwin )
-- PS=":"
-- FS="/"
-- ;;
-- Linux )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/java/net/URLClassLoader/closetest/CloseTest.java 2013-09-06 11:29:38.000000000 -0700
-+++ ./jdk/test/java/net/URLClassLoader/closetest/CloseTest.java 2014-07-15 21:49:32.000000000 -0700
-@@ -25,7 +25,8 @@
- * @test
- * @bug 4167874
- * @library ../../../../com/sun/net/httpserver
-- * @build FileServerHandler
-+ * @library /lib/testlibrary
-+ * @build FileServerHandler jdk.testlibrary.FileUtils
- * @run shell build.sh
- * @run main/othervm CloseTest
- * @summary URL-downloaded jar files can consume all available file descriptors
---- ./jdk/test/java/net/URLClassLoader/closetest/Common.java 2013-09-06 11:29:38.000000000 -0700
-+++ ./jdk/test/java/net/URLClassLoader/closetest/Common.java 2014-07-15 21:49:32.000000000 -0700
-@@ -23,6 +23,9 @@
-
- import java.io.*;
- import java.net.*;
-+import java.nio.file.Files;
-+import jdk.testlibrary.FileUtils;
-+import static java.nio.file.StandardCopyOption.*;
-
- public class Common {
-
-@@ -39,42 +42,16 @@
- if (!src.isFile()) {
- throw new RuntimeException ("File not found: " + src.toString());
- }
-- dst.delete();
-- dst.createNewFile();
-- FileInputStream i = new FileInputStream (src);
-- FileOutputStream o = new FileOutputStream (dst);
-- byte[] buf = new byte [1024];
-- int count;
-- while ((count=i.read(buf)) >= 0) {
-- o.write (buf, 0, count);
-- }
-- i.close();
-- o.close();
-+ Files.copy(src.toPath(), dst.toPath(), REPLACE_EXISTING);
- } catch (IOException e) {
- throw new RuntimeException (e);
- }
- }
-
-- static void rm_minus_rf (File path) {
-- if (!path.exists()) {
-+ static void rm_minus_rf (File path) throws IOException, InterruptedException {
-+ if (!path.exists())
- return;
-- }
-- if (path.isFile()) {
-- if (!path.delete()) {
-- throw new RuntimeException ("Could not delete " + path);
-- }
-- } else if (path.isDirectory ()) {
-- String[] names = path.list();
-- File[] files = path.listFiles();
-- for (int i=0; i<files.length; i++) {
-- rm_minus_rf (new File(path, names[i]));
-- }
-- if (!path.delete()) {
-- throw new RuntimeException ("Could not delete " + path);
-- }
-- } else {
-- throw new RuntimeException ("Trying to delete something that isn't a file or a directory");
-- }
-+ FileUtils.deleteFileTreeWithRetry(path.toPath());
- }
-
- static void copyDir (File src, File dst) {
---- ./jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java 2013-09-06 11:29:38.000000000 -0700
-+++ ./jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java 2014-07-15 21:49:32.000000000 -0700
-@@ -24,6 +24,8 @@
- /**
- * @test
- * @bug 6899919
-+ * @library /lib/testlibrary
-+ * @build jdk.testlibrary.FileUtils
- * @run shell build2.sh
- * @run main/othervm GetResourceAsStream
- */
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -27,11 +27,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Darwin )
-- PS=":"
-- FS="/"
-- ;;
-- Linux )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -33,11 +33,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Darwin )
-- PS=":"
-- FS="/"
-- ;;
-- Linux )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java 2013-09-06 11:29:39.000000000 -0700
-+++ ./jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java 2014-07-15 21:49:33.000000000 -0700
-@@ -36,44 +36,31 @@
- // number of concurrent completion handlers
- static final int CONCURRENCY_COUNT = 256;
-
-- public static void main(String[] args) throws Exception {
-- // all accepted connections are added to a queue
-- final ArrayBlockingQueue<AsynchronousSocketChannel> queue =
-- new ArrayBlockingQueue<AsynchronousSocketChannel>(CONCURRENCY_COUNT);
-+ // set to true if an I/O operation fails
-+ static volatile boolean failed;
-+
-+ // set to true when the test is done
-+ static volatile boolean finished;
-
-+ public static void main(String[] args) throws Exception {
- // create listener to accept connections
-- final AsynchronousServerSocketChannel listener =
-+ AsynchronousServerSocketChannel listener =
- AsynchronousServerSocketChannel.open()
- .bind(new InetSocketAddress(0));
-- listener.accept((Void)null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
-- public void completed(AsynchronousSocketChannel ch, Void att) {
-- queue.add(ch);
-- listener.accept((Void)null, this);
-- }
-- public void failed(Throwable exc, Void att) {
-- }
-- });
-- System.out.println("Listener created.");
-
-- // establish lots of connections
-+ // establish connections
-+
-+ AsynchronousSocketChannel[] clients = new AsynchronousSocketChannel[CONCURRENCY_COUNT];
-+ AsynchronousSocketChannel[] peers = new AsynchronousSocketChannel[CONCURRENCY_COUNT];
-+
- int port = ((InetSocketAddress)(listener.getLocalAddress())).getPort();
- SocketAddress sa = new InetSocketAddress(InetAddress.getLocalHost(), port);
-- AsynchronousSocketChannel[] channels =
-- new AsynchronousSocketChannel[CONCURRENCY_COUNT];
-+
- for (int i=0; i<CONCURRENCY_COUNT; i++) {
-- int attempts = 0;
-- for (;;) {
-- try {
-- channels[i] = AsynchronousSocketChannel.open();
-- channels[i].connect(sa).get();
-- break;
-- } catch (IOException x) {
-- // probably resource issue so back off and retry
-- if (++attempts >= 3)
-- throw x;
-- Thread.sleep(50);
-- }
-- }
-+ clients[i] = AsynchronousSocketChannel.open();
-+ Future<Void> result = clients[i].connect(sa);
-+ peers[i] = listener.accept().get();
-+ result.get();
- }
- System.out.println("All connection established.");
-
-@@ -81,9 +68,9 @@
- final CyclicBarrier barrier = new CyclicBarrier(CONCURRENCY_COUNT+1);
-
- // initiate a read operation on each channel.
-- for (int i=0; i<CONCURRENCY_COUNT; i++) {
-+ for (AsynchronousSocketChannel client: clients) {
- ByteBuffer buf = ByteBuffer.allocateDirect(100);
-- channels[i].read( buf, channels[i],
-+ client.read(buf, client,
- new CompletionHandler<Integer,AsynchronousSocketChannel>() {
- public void completed(Integer bytesRead, AsynchronousSocketChannel ch) {
- try {
-@@ -94,23 +81,29 @@
- }
- }
- public void failed(Throwable exc, AsynchronousSocketChannel ch) {
-+ failed = true;
-+ System.err.println("read failed: " + exc);
-+ completed(0, ch);
- }
- });
- }
- System.out.println("All read operations outstanding.");
-
- // write data to each of the accepted connections
-- int remaining = CONCURRENCY_COUNT;
-- while (remaining > 0) {
-- AsynchronousSocketChannel ch = queue.take();
-- ch.write(ByteBuffer.wrap("welcome".getBytes())).get();
-- ch.close();
-- remaining--;
-+ for (AsynchronousSocketChannel peer: peers) {
-+ peer.write(ByteBuffer.wrap("welcome".getBytes())).get();
-+ peer.shutdownOutput();
-+ peer.close();
- }
-
- // wait for all threads to reach the barrier
- System.out.println("Waiting for all threads to reach barrier");
- barrier.await();
-+
-+ // finish up
-+ finished = true;
- listener.close();
-+ if (failed)
-+ throw new RuntimeException("I/O operation failed, see log for details");
- }
- }
---- ./jdk/test/java/nio/channels/Selector/ByteServer.java 2013-09-06 11:29:39.000000000 -0700
-+++ ./jdk/test/java/nio/channels/Selector/ByteServer.java 2014-07-15 21:54:44.000000000 -0700
-@@ -22,52 +22,54 @@
- */
-
- /**
-- *
-- * Utility class for tests. A simple server, which waits for a connection,
-- * writes out n bytes and waits.
-+ * Utility class for tests. A simple "in-thread" server to accept connections
-+ * and write bytes.
- * @author kladko
- */
-
- import java.net.Socket;
- import java.net.ServerSocket;
-+import java.net.SocketAddress;
-+import java.net.InetSocketAddress;
-+import java.io.IOException;
-+import java.io.Closeable;
-
--public class ByteServer {
-+public class ByteServer implements Closeable {
-
-- public static final String LOCALHOST = "localhost";
-- private int bytecount;
-- private Socket socket;
-- private ServerSocket serversocket;
-- private Thread serverthread;
-- volatile Exception savedException;
--
-- public ByteServer(int bytecount) throws Exception{
-- this.bytecount = bytecount;
-- serversocket = new ServerSocket(0);
-- }
--
-- public int port() {
-- return serversocket.getLocalPort();
-- }
--
-- public void start() {
-- serverthread = new Thread() {
-- public void run() {
-- try {
-- socket = serversocket.accept();
-- socket.getOutputStream().write(new byte[bytecount]);
-- socket.getOutputStream().flush();
-- } catch (Exception e) {
-- System.err.println("Exception in ByteServer: " + e);
-- System.exit(1);
-- }
-- }
-- };
-- serverthread.start();
-- }
--
-- public void exit() throws Exception {
-- serverthread.join();
-- socket.close();
-- serversocket.close();
-+ private final ServerSocket ss;
-+ private Socket s;
-+
-+ ByteServer() throws IOException {
-+ this.ss = new ServerSocket(0);
-+ }
-+
-+ SocketAddress address() {
-+ return new InetSocketAddress(ss.getInetAddress(), ss.getLocalPort());
-+ }
-+
-+ void acceptConnection() throws IOException {
-+ if (s != null)
-+ throw new IllegalStateException("already connected");
-+ this.s = ss.accept();
-+ }
-+
-+ void closeConnection() throws IOException {
-+ Socket s = this.s;
-+ if (s != null) {
-+ this.s = null;
-+ s.close();
-+ }
-+ }
-+
-+ void write(int count) throws IOException {
-+ if (s == null)
-+ throw new IllegalStateException("no connection");
-+ s.getOutputStream().write(new byte[count]);
-+ }
-+
-+ public void close() throws IOException {
-+ if (s != null)
-+ s.close();
-+ ss.close();
- }
- }
---- ./jdk/test/java/nio/channels/Selector/LotsOfChannels.java 2013-09-06 11:29:40.000000000 -0700
-+++ ./jdk/test/java/nio/channels/Selector/LotsOfChannels.java 2014-07-15 21:49:33.000000000 -0700
-@@ -22,9 +22,10 @@
- */
-
- /* @test
-- * @bug 4503092
-+ * @bug 4503092 8024883
- * @summary Tests that Windows Selector can use more than 63 channels
-- * @run main/timeout=300 LotsOfChannels
-+ * @run main LotsOfChannels
-+ * @run main/othervm -Dsun.nio.ch.maxUpdateArraySize=64 LotsOfChannels
- * @author kladko
- */
-
---- ./jdk/test/java/nio/channels/Selector/ReadAfterConnect.java 2013-09-06 11:29:40.000000000 -0700
-+++ ./jdk/test/java/nio/channels/Selector/ReadAfterConnect.java 2014-07-15 21:54:44.000000000 -0700
-@@ -27,27 +27,25 @@
- * @author kladko
- */
-
--import java.net.*;
--import java.nio.*;
--import java.nio.channels.*;
-+import java.nio.channels.Selector;
-+import java.nio.channels.SelectionKey;
-+import java.nio.channels.SocketChannel;
-
- public class ReadAfterConnect {
--
- public static void main(String[] argv) throws Exception {
-- ByteServer server = new ByteServer(0); // server: accept connection and do nothing
-- server.start();
-- InetSocketAddress isa = new InetSocketAddress(
-- InetAddress.getByName(ByteServer.LOCALHOST), server.port());
-- Selector sel = Selector.open();
-- SocketChannel sc = SocketChannel.open();
-- sc.connect(isa);
-- sc.configureBlocking(false);
-- sc.register(sel, SelectionKey.OP_READ);
-- // Previously channel would get selected here, although there is nothing to read
-- if (sel.selectNow() != 0)
-- throw new Exception("Select returned nonzero value");
-- sc.close();
-- server.exit();
-+ try (ByteServer server = new ByteServer();
-+ SocketChannel sc = SocketChannel.open(server.address())) {
-+
-+ server.acceptConnection();
-+
-+ try (Selector sel = Selector.open()) {
-+ sc.configureBlocking(false);
-+ sc.register(sel, SelectionKey.OP_READ);
-+ // Previously channel would get selected here, although there is nothing to read
-+ if (sel.selectNow() != 0)
-+ throw new Exception("Select returned nonzero value");
-+ }
-+ }
- }
-
- }
---- ./jdk/test/java/nio/channels/Selector/SelectAfterRead.java 2013-09-06 11:29:40.000000000 -0700
-+++ ./jdk/test/java/nio/channels/Selector/SelectAfterRead.java 2014-07-15 21:54:44.000000000 -0700
-@@ -28,60 +28,62 @@
- * @author kladko
- */
-
--import java.net.*;
--import java.nio.*;
--import java.nio.channels.*;
-+import java.nio.ByteBuffer;
-+import java.nio.channels.Selector;
-+import java.nio.channels.SelectionKey;
-+import java.nio.channels.SocketChannel;
-
- public class SelectAfterRead {
-
-- final static int TIMEOUT = 1000;
-+ private static final int TIMEOUT = 1000;
-
- public static void main(String[] argv) throws Exception {
-- InetAddress lh = InetAddress.getByName(ByteServer.LOCALHOST);
-
- // server: accept connection and write one byte
-- ByteServer server = new ByteServer(1);
-- server.start();
-- Selector sel = Selector.open();
-- SocketChannel sc = SocketChannel.open();
-- sc.connect(new InetSocketAddress(lh, server.port()));
-- sc.read(ByteBuffer.allocate(1));
-- sc.configureBlocking(false);
-- sc.register(sel, SelectionKey.OP_READ);
-- // previously on Windows select would select channel here, although there was
-- // nothing to read
-- if (sel.selectNow() != 0)
-- throw new Exception("Select returned nonzero value");
-- sc.close();
-- sel.close();
-- server.exit();
-+ try (ByteServer server = new ByteServer();
-+ SocketChannel sc = SocketChannel.open(server.address())) {
-+
-+ server.acceptConnection();
-+ server.write(1);
-+
-+ try (Selector sel = Selector.open()) {
-+ sc.read(ByteBuffer.allocate(1));
-+ sc.configureBlocking(false);
-+ sc.register(sel, SelectionKey.OP_READ);
-+ // previously on Windows select would select channel here, although there was
-+ // nothing to read
-+ if (sel.selectNow() != 0)
-+ throw new Exception("Select returned nonzero value");
-+ }
-+ }
-
- // Now we will test a two reads combination
- // server: accept connection and write two bytes
-- server = new ByteServer(2);
-- server.start();
-- sc = SocketChannel.open();
-- sc.connect(new InetSocketAddress(lh, server.port()));
-- sc.configureBlocking(false);
-- sel = Selector.open();
-- sc.register(sel, SelectionKey.OP_READ);
-- if (sel.select(TIMEOUT) != 1)
-- throw new Exception("One selected key expected");
-- sel.selectedKeys().clear();
-- // previously on Windows a channel would get selected only once
-- if (sel.selectNow() != 1)
-- throw new Exception("One selected key expected");
-- // Previously on Windows two consequent reads would cause select()
-- // to select a channel, although there was nothing remaining to
-- // read in the channel
-- if (sc.read(ByteBuffer.allocate(1)) != 1)
-- throw new Exception("One byte expected");
-- if (sc.read(ByteBuffer.allocate(1)) != 1)
-- throw new Exception("One byte expected");
-- if (sel.selectNow() != 0)
-- throw new Exception("Select returned nonzero value");
-- sc.close();
-- sel.close();
-- server.exit();
-+ try (ByteServer server = new ByteServer();
-+ SocketChannel sc = SocketChannel.open(server.address())) {
-+
-+ server.acceptConnection();
-+ server.write(2);
-+
-+ try (Selector sel = Selector.open()) {
-+ sc.configureBlocking(false);
-+ sc.register(sel, SelectionKey.OP_READ);
-+ if (sel.select(TIMEOUT) != 1)
-+ throw new Exception("One selected key expected");
-+ sel.selectedKeys().clear();
-+ // previously on Windows a channel would get selected only once
-+ if (sel.selectNow() != 1)
-+ throw new Exception("One selected key expected");
-+ // Previously on Windows two consequent reads would cause select()
-+ // to select a channel, although there was nothing remaining to
-+ // read in the channel
-+ if (sc.read(ByteBuffer.allocate(1)) != 1)
-+ throw new Exception("One byte expected");
-+ if (sc.read(ByteBuffer.allocate(1)) != 1)
-+ throw new Exception("One byte expected");
-+ if (sel.selectNow() != 0)
-+ throw new Exception("Select returned nonzero value");
-+ }
-+ }
- }
- }
---- ./jdk/test/java/nio/channels/Selector/SelectWrite.java 2013-09-06 11:29:40.000000000 -0700
-+++ ./jdk/test/java/nio/channels/Selector/SelectWrite.java 2014-07-15 21:54:44.000000000 -0700
-@@ -22,36 +22,33 @@
- */
-
- /* @test
-- @bug 4645302
-- @summary Socket with OP_WRITE would get selected only once
-- @author kladko
-+ * @bug 4645302
-+ * @summary Socket with OP_WRITE would get selected only once
-+ * @author kladko
- */
-
--import java.net.*;
--import java.nio.*;
--import java.nio.channels.*;
--
-+import java.nio.channels.Selector;
-+import java.nio.channels.SelectionKey;
-+import java.nio.channels.SocketChannel;
-
- public class SelectWrite {
-
- public static void main(String[] argv) throws Exception {
-- ByteServer server = new ByteServer(0);
-- // server: accept connection and do nothing
-- server.start();
-- InetSocketAddress isa = new InetSocketAddress(
-- InetAddress.getByName(ByteServer.LOCALHOST), server.port());
-- Selector sel = Selector.open();
-- SocketChannel sc = SocketChannel.open();
-- sc.connect(isa);
-- sc.configureBlocking(false);
-- sc.register(sel, SelectionKey.OP_WRITE);
-- sel.select();
-- sel.selectedKeys().clear();
-- if (sel.select() == 0) {
-- throw new Exception("Select returned zero");
-+ try (ByteServer server = new ByteServer();
-+ SocketChannel sc = SocketChannel.open(server.address())) {
-+
-+ server.acceptConnection();
-+
-+ try (Selector sel = Selector.open()) {
-+ sc.configureBlocking(false);
-+ sc.register(sel, SelectionKey.OP_WRITE);
-+ sel.select();
-+ sel.selectedKeys().clear();
-+ if (sel.select() == 0) {
-+ throw new Exception("Select returned zero");
-+ }
-+ }
- }
-- sc.close();
-- sel.close();
- }
-
- }
---- ./jdk/test/java/nio/channels/Selector/SelectorLimit.java 2013-09-06 11:29:40.000000000 -0700
-+++ ./jdk/test/java/nio/channels/Selector/SelectorLimit.java 2014-07-15 21:49:28.000000000 -0700
-@@ -22,12 +22,13 @@
- */
-
- /* @test
-- * @bug 4777504
-+ * @bug 4777504 8024883
- * @summary Ensure that a Selector can return at least 100 selected keys
- * @author Mark Reinhold
- * @library ..
- * @build SelectorLimit
- * @run main/othervm SelectorLimit
-+ * @run main/othervm -Dsun.nio.ch.maxUpdateArraySize=128 SelectorLimit
- */
-
- import java.io.*;
---- ./jdk/test/java/nio/channels/SocketChannel/ShortWrite.java 2013-09-06 11:29:40.000000000 -0700
-+++ ./jdk/test/java/nio/channels/SocketChannel/ShortWrite.java 2014-07-15 21:49:28.000000000 -0700
-@@ -22,7 +22,7 @@
- */
-
- /* @test
-- * @bug 7176630
-+ * @bug 7176630 7074436
- * @summary Check for short writes on SocketChannels configured in blocking mode
- */
-
-@@ -40,9 +40,10 @@
- /**
- * Returns a checksum on the remaining bytes in the given buffer.
- */
-- static long computeChecksum(ByteBuffer bb) {
-+ static long computeChecksum(ByteBuffer... bufs) {
- CRC32 crc32 = new CRC32();
-- crc32.update(bb.array());
-+ for (int i=0; i<bufs.length; i++)
-+ crc32.update(bufs[i].array());
- return crc32.getValue();
- }
-
-@@ -71,15 +72,15 @@
- }
-
- /**
-- * Run test with a write of the given number of bytes.
-+ * Exercise write(ByteBuffer) with given number of bytes.
- */
-- static void test(ExecutorService pool,
-- SocketChannel source,
-- SocketChannel sink,
-- int size)
-+ static void test1(ExecutorService pool,
-+ SocketChannel source,
-+ SocketChannel sink,
-+ int size)
- throws Exception
- {
-- System.out.println(size);
-+ System.out.println("write(ByteBuffer), size=" + size);
-
- // random bytes in the buffer
- ByteBuffer buf = ByteBuffer.allocate(size);
-@@ -101,6 +102,47 @@
- throw new RuntimeException("Checksum did not match");
- }
-
-+ /**
-+ * Exercise write(ByteBuffer[]) with buffers of the given sizes.
-+ */
-+ static void testN(ExecutorService pool,
-+ SocketChannel source,
-+ SocketChannel sink,
-+ int... sizes)
-+ throws Exception
-+ {
-+ System.out.print("write(ByteBuffer[]), sizes=");
-+ for (int size: sizes)
-+ System.out.print(size + " ");
-+ System.out.println();
-+
-+ int total = 0;
-+ int len = sizes.length;
-+ ByteBuffer[] bufs = new ByteBuffer[len];
-+ for (int i=0; i<len; i++) {
-+ int size = sizes[i];
-+ ByteBuffer buf = ByteBuffer.allocate(size);
-+ rand.nextBytes(buf.array());
-+ bufs[i] = buf;
-+ total += size;
-+ }
-+
-+ // submit task to read the bytes
-+ Future<Long> result = pool.submit(new Reader(sink, total));
-+
-+ // write the bytes
-+ long n = source.write(bufs);
-+ if (n != total)
-+ throw new RuntimeException("Short write detected");
-+
-+ // check the bytes that were received match
-+ for (int i=0; i<len; i++)
-+ bufs[i].rewind();
-+ long expected = computeChecksum(bufs);
-+ long actual = result.get();
-+ if (actual != expected)
-+ throw new RuntimeException("Checksum did not match");
-+ }
-
- public static void main(String[] args) throws Exception {
- ExecutorService pool = Executors.newSingleThreadExecutor();
-@@ -114,17 +156,47 @@
- try (SocketChannel source = SocketChannel.open(sa);
- SocketChannel sink = ssc.accept())
- {
-- // run tests on sizes around 128k as that is the problem
-- // area on Windows.
-+ // Exercise write(BufferBuffer) on sizes around 128k
- int BOUNDARY = 128 * 1024;
- for (int size=(BOUNDARY-2); size<=(BOUNDARY+2); size++) {
-- test(pool, source, sink, size);
-+ test1(pool, source, sink, size);
- }
-
-- // run tests on random sizes
-+ // Exercise write(BufferBuffer) on random sizes
- for (int i=0; i<20; i++) {
- int size = rand.nextInt(1024*1024);
-- test(pool, source, sink, size);
-+ test1(pool, source, sink, size);
-+ }
-+
-+ // Exercise write(BufferBuffer[]) on sizes around 128k
-+ for (int i=BOUNDARY-2; i<=BOUNDARY+2; i++) {
-+ testN(pool, source, sink, i);
-+ testN(pool, source, sink, 0, i);
-+ testN(pool, source, sink, i, 0);
-+ for (int j=BOUNDARY-2; j<=BOUNDARY+2; j++) {
-+ testN(pool, source, sink, i, j);
-+ testN(pool, source, sink, 0, i, j);
-+ testN(pool, source, sink, i, 0, j);
-+ testN(pool, source, sink, i, j, 0);
-+ for (int k=BOUNDARY-2; k<=BOUNDARY+2; k++) {
-+ testN(pool, source, sink, i, j, k);
-+ testN(pool, source, sink, 0, i, j, k);
-+ testN(pool, source, sink, i, 0, j, k);
-+ testN(pool, source, sink, i, j, 0, k);
-+ testN(pool, source, sink, i, j, k, 0);
-+ }
-+ }
-+ }
-+
-+ // Exercise write(BufferBuffer[]) on random sizes
-+ // (assumes IOV_MAX >= 8)
-+ for (int i=0; i<20; i++) {
-+ int n = rand.nextInt(9);
-+ int[] sizes = new int[n];
-+ for (int j=0; j<n; j++) {
-+ sizes[j] = rand.nextInt(1024*1024);
-+ }
-+ testN(pool, source, sink, sizes);
- }
- }
- }
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -71,6 +71,48 @@
- EXTRA_LIBS = -lc
- endif
-
-+ifeq ($(uname), Darwin)
-+ PLATFORM = bsd
-+ archExpr = case "`$(UNAME) -m`" in \
-+ i[3-6]86) \
-+ $(ECHO) i586 \
-+ ;; \
-+ sparc*) \
-+ $(ECHO) sparc \
-+ ;; \
-+ *) \
-+ $(UNAME) -m \
-+ ;; \
-+ esac
-+ ARCH := $(shell $(archExpr) )
-+ CC = gcc
-+ CFLAGS = -fno-strict-aliasing -fPIC -W -Wall
-+ LD = ld
-+ LDFLAGS_COMMON = -shared
-+ EXTRA_LIBS = -lc
-+endif
-+
-+ifeq ($(findstring BSD,$(uname)), BSD)
-+ PLATFORM = bsd
-+ archExpr = case "`$(UNAME) -m`" in \
-+ i[3-6]86) \
-+ $(ECHO) i586 \
-+ ;; \
-+ sparc*) \
-+ $(ECHO) sparc \
-+ ;; \
-+ *) \
-+ $(UNAME) -m \
-+ ;; \
-+ esac
-+ ARCH := $(shell $(archExpr) )
-+ CC = gcc
-+ CFLAGS = -fno-strict-aliasing -fPIC -W -Wall
-+ LD = ld
-+ LDFLAGS_COMMON = -shared
-+ EXTRA_LIBS = -lc
-+endif
-+
- LIBDIR=lib/$(PLATFORM)-$(ARCH)
- 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-10-28 20:19:52.000000000 -0700
-@@ -33,11 +33,14 @@
- # @run shell run_tests.sh
-
- os=`uname -s`
--
--if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
-- echo "Test not designed to run on this operating system, skipping..."
-- exit 0
--fi
-+case "${os}" in
-+ SunOS | Linux | *BSD | Darwin )
-+ ;;
-+ * )
-+ echo "Test not designed to run on this operating system, skipping..."
-+ exit 0
-+ ;;
-+esac
-
-
- # if TESTJAVA isn't set then we assume an interactive run. So that it's
-@@ -67,7 +70,8 @@
- # On Solaris we assume 64-bit if java -d64 works.
-
- DFLAG=
--if [ "$os" = "SunOS" ]; then
-+case "${os}" in
-+ SunOS )
- PLATFORM=solaris
- case "`uname -p`" in
- i[3-9]86)
-@@ -84,9 +88,9 @@
- fi
- ;;
- esac
--fi
-+ ;;
-
--if [ "$os" = "Linux" ]; then
-+ Linux )
- PLATFORM=linux
- ARCH=unknown
- case "`uname -m`" in
-@@ -100,7 +104,24 @@
- ARCH=amd64
- ;;
- esac
--fi
-+ ;;
-+
-+ *BSD | Darwin )
-+ PLATFORM=bsd
-+ ARCH=unknown
-+ case "`uname -m`" in
-+ i[3-6]86)
-+ ARCH=i586
-+ ;;
-+ ia64)
-+ ARCH=ia64
-+ ;;
-+ x86_64)
-+ ARCH=amd64
-+ ;;
-+ esac
-+ ;;
-+esac
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -41,10 +41,14 @@
- fi
-
- s="`uname -s`"
--if [ "$s" != Linux -a "$s" != SunOS ]; then
-- echo "$s: locale command not supported on this system, skipping..."
-- exit 0
--fi
-+case "$s" in
-+ Linux|SunOS|*BSD|Darwin)
-+ ;;
-+ *)
-+ echo "$s: locale command not supported on this system, skipping..."
-+ exit 0
-+ ;;
-+esac
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -34,7 +34,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin ) ;;
-+ SunOS | Linux | *BSD | Darwin ) ;;
- # Skip locale test for Windows
- 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-10-28 20:19:52.000000000 -0700
-@@ -70,10 +70,14 @@
- L="$1"
- shift
- s=`uname -s`
-- if [ $s != Linux -a $s != SunOS -a $s != Darwin ]; then
-- echo "$L: Locales not supported on this system, skipping..."
-- exit 0
-- fi
-+ case "$s" in
-+ Linux|SunOS|*BSD|Darwin)
-+ ;;
-+ *)
-+ echo "$L: Locales not supported on this system, skipping..."
-+ exit 0
-+ ;;
-+ esac
- if [ "x`locale -a | grep $L`" != "x$L" ]; then
- echo "$L: Locale not supported, skipping..."
- exit 0
-@@ -85,7 +89,7 @@
- cd $TMP
-
- case `uname` in
-- SunOS | Linux | Darwin ) CPS=':' ;;
-+ SunOS | Linux | *BSD | Darwin ) CPS=':' ;;
- Windows* ) CPS=';' ;;
- *) 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-10-28 20:19:52.000000000 -0700
-@@ -76,6 +76,8 @@
- checkSupported(fs, "posix", "unix", "owner", "acl", "user");
- if (os.equals("Linux"))
- checkSupported(fs, "posix", "unix", "owner", "dos", "user");
-+ if (os.endsWith("BSD"))
-+ checkSupported(fs, "posix", "unix", "owner");
- if (os.contains("OS X"))
- checkSupported(fs, "posix", "unix", "owner");
- if (os.equals("Windows"))
---- ./jdk/test/java/nio/file/Files/BytesAndLines.java 2013-09-06 11:29:41.000000000 -0700
-+++ ./jdk/test/java/nio/file/Files/BytesAndLines.java 2014-07-15 21:49:28.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
-@@ -22,7 +22,9 @@
- */
-
- /* @test
-- * @bug 7006126
-+ * @bug 7006126 8020669 8024788
-+ * @build BytesAndLines PassThroughFileSystem
-+ * @run main BytesAndLines
- * @summary Unit test for methods for Files readAllBytes, readAllLines and
- * and write methods.
- */
-@@ -82,6 +84,26 @@
- write(file, lines, Charset.defaultCharset(), opts);
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
-+
-+ // read from procfs
-+ if (System.getProperty("os.name").equals("Linux")) {
-+ // Refer to the Linux proc(5) man page for details about /proc/self/stat file
-+ // procfs reports it to be zero sized, even though data can be read from it
-+ String statFile = "/proc/self/stat";
-+ Path pathStat = Paths.get(statFile);
-+ byte[] data = Files.readAllBytes(pathStat);
-+ assertTrue(data.length > 0, "Files.readAllBytes('" + statFile + "') failed to read");
-+ }
-+
-+ // test readAllBytes on custom file system
-+ Path myfile = PassThroughFileSystem.create().getPath(file.toString());
-+ for (int size=0; size<=1024; size+=512) {
-+ byte[] b1 = new byte[size];
-+ rand.nextBytes(b1);
-+ Files.write(myfile, b1);
-+ byte[] b2 = Files.readAllBytes(myfile);
-+ assertTrue(Arrays.equals(b1, b2), "bytes not equal");
-+ }
- }
-
-
-@@ -174,6 +196,16 @@
- throw new RuntimeException("NullPointerException expected");
- } catch (NullPointerException ignore) { }
-
-+ // read from procfs
-+ if (System.getProperty("os.name").equals("Linux")) {
-+ // Refer to the Linux proc(5) man page for details about /proc/self/status file
-+ // procfs reports this file to be zero sized, even though data can be read from it
-+ String statusFile = "/proc/self/status";
-+ Path pathStatus = Paths.get(statusFile);
-+ lines = Files.readAllLines(pathStatus, US_ASCII);
-+ assertTrue(lines.size() > 0, "Files.readAllLines('" + pathStatus + "') failed to read");
-+ }
-+
- } finally {
- delete(tmpfile);
- }
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -634,7 +634,7 @@
-
- // check POSIX attributes are copied
- String os = System.getProperty("os.name");
-- if (os.equals("SunOS") || os.equals("Linux")) {
-+ if (os.equals("SunOS") || os.equals("Linux") || os.endsWith("BSD")) {
- checkPosixAttributes(
- readAttributes(source, PosixFileAttributes.class, linkOptions),
- readAttributes(target, PosixFileAttributes.class, linkOptions));
-@@ -1136,7 +1136,7 @@
- static void randomizeAttributes(Path file) throws IOException {
- String os = System.getProperty("os.name");
- boolean isWindows = os.startsWith("Windows");
-- boolean isUnix = os.equals("SunOS") || os.equals("Linux");
-+ boolean isUnix = os.equals("SunOS") || os.equals("Linux") || os.endsWith("BSD");
- boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
-
- 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-07-15 21:49:28.000000000 -0700
-@@ -88,6 +88,17 @@
- TestLibrary.RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT);
- rmid.addOptions(new String[]{
- "-Djava.nio.channels.spi.SelectorProvider=RmidViaInheritedChannel$RmidSelectorProvider"});
-+ if (System.getProperty("os.name").startsWith("Windows") &&
-+ System.getProperty("os.version").startsWith("5."))
-+ {
-+ /* Windows XP/2003 or older
-+ * Need to expand ephemeral range to include RMI test ports
-+ */
-+ rmid.addOptions(new String[]{
-+ "-Djdk.net.ephemeralPortRange.low=1024",
-+ "-Djdk.net.ephemeralPortRange.high=64000"
-+ });
-+ }
- rmid.start();
-
- /*
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -29,8 +29,12 @@
- # @run shell readTest.sh
-
- OS=`uname -s`
-+VER=`uname -r`
-+ARGS=""
-+REGARGS=""
-+
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- FILEURL="file:"
-@@ -39,11 +43,19 @@
- PS=";"
- FS="\\"
- FILEURL="file:/"
-+ if [ "$VER" -eq "5" ]; then
-+ ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
-+ REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000"
-+ fi
- ;;
- CYGWIN* )
- PS=";"
- FS="/"
- FILEURL="file:/"
-+ if [ "${VER}" -eq "5" ]; then
-+ ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
-+ REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000"
-+ fi
- ;;
- * )
- echo "Unrecognized system!"
-@@ -61,8 +73,8 @@
- #start rmiregistry without any local classes on classpath
- cd rmi_tmp
- # NOTE: This RMI Registry port must match TestLibrary.READTEST_REGISTRY_PORT
--${TESTJAVA}${FS}bin${FS}rmiregistry -J-Djava.rmi.server.useCodebaseOnly=false \
-- ${TESTTOOLVMOPTS} 64005 > ..${FS}${RMIREG_OUT} 2>&1 &
-+${TESTJAVA}${FS}bin${FS}rmiregistry ${REGARGS} -J-Djava.rmi.server.useCodebaseOnly=false \
-+ ${TESTTOOLVMOPTS} 60005 > ..${FS}${RMIREG_OUT} 2>&1 &
- RMIREG_PID=$!
- # allow some time to start
- sleep 3
-@@ -74,10 +86,10 @@
- ;;
- * )
- CODEBASE=`pwd`
-- ;;
-+ ;;
- esac
- # trailing / after code base is important for rmi codebase property.
--${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
-+${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH ${ARGS} -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
- TEST_PID=$!
- #bulk of testcase - let it run for a while
- sleep 5
-@@ -100,7 +112,7 @@
- result2=$?
-
- if [ $result1 -eq 0 -a $result2 -eq 0 ]
--then
-+then
- echo "Passed"
- exitCode=0;
- else
-@@ -108,6 +120,6 @@
- exitCode=1
- fi
- rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp
--exit ${exitCode}
-+exit ${exitCode}
-
-
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -84,14 +84,12 @@
-
-
- # set platform-dependent variables
--if [ `uname` = "SunOS" ] ; then
-+case `uname` in
-+ SunOS | Linux | *BSD | Darwin )
- PATH_SEP=":"
--
--elif [ `uname` = "Linux" ] ; then
-- PATH_SEP=":"
--else
-+ * )
- PATH_SEP=";"
--fi
-+esac
-
- 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-07-15 21:49:29.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -86,13 +86,13 @@
- * FIXED_PORT_MIN or above FIXED_PORT_MAX, then adjust
- * FIXED_PORT_MIN/MAX appropriately.
- */
-- public final static int FIXED_PORT_MIN = 64001;
-- public final static int FIXED_PORT_MAX = 64010;
-- public final static int RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT = 64001;
-- public final static int RMIDVIAINHERITEDCHANNEL_REGISTRY_PORT = 64002;
-- public final static int INHERITEDCHANNELNOTSERVERSOCKET_ACTIVATION_PORT = 64003;
-- public final static int INHERITEDCHANNELNOTSERVERSOCKET_REGISTRY_PORT = 64004;
-- public final static int READTEST_REGISTRY_PORT = 64005;
-+ public final static int FIXED_PORT_MIN = 60001;
-+ public final static int FIXED_PORT_MAX = 60010;
-+ public final static int RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT = 60001;
-+ public final static int RMIDVIAINHERITEDCHANNEL_REGISTRY_PORT = 60002;
-+ public final static int INHERITEDCHANNELNOTSERVERSOCKET_ACTIVATION_PORT = 60003;
-+ public final static int INHERITEDCHANNELNOTSERVERSOCKET_REGISTRY_PORT = 60004;
-+ public final static int READTEST_REGISTRY_PORT = 60005;
- private final static int MAX_SERVER_SOCKET_TRIES = 2*(FIXED_PORT_MAX-FIXED_PORT_MIN+1);
-
- static void mesg(Object mesg) {
-@@ -127,6 +127,33 @@
- bomb(null, e);
- }
-
-+ /**
-+ * Helper method to determine if registry has started
-+ *
-+ * @param port The port number to check
-+ * @param msTimeout The amount of milliseconds to spend checking
-+ */
-+
-+ public static boolean checkIfRegistryRunning(int port, int msTimeout) {
-+ long stopTime = System.currentTimeMillis() + msTimeout;
-+ do {
-+ try {
-+ Registry r = LocateRegistry.getRegistry(port);
-+ String[] s = r.list();
-+ // no exception. We're now happy that registry is running
-+ return true;
-+ } catch (RemoteException e) {
-+ // problem - not ready ? Try again
-+ try {
-+ Thread.sleep(500);
-+ } catch (InterruptedException ie) {
-+ // not expected
-+ }
-+ }
-+ } while (stopTime > System.currentTimeMillis());
-+ return false;
-+ }
-+
- public static String getProperty(String property, String defaultVal) {
- final String prop = property;
- final String def = defaultVal;
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -46,15 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Linux )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -34,15 +34,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Linux )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -50,19 +50,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Linux )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- CYGWIN* )
-- PATHSEP=";"
-- FILESEP="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,15 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Linux )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,15 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Linux )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- FILESEP="/"
- ;;
---- ./jdk/test/java/util/Arrays/TimSortStackSize.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/util/Arrays/TimSortStackSize.java 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,123 @@
-+/*
-+ * 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 8011944
-+ * @summary Test TimSort stack size
-+ */
-+import java.util.Arrays;
-+import java.util.ArrayDeque;
-+import java.util.Comparator;
-+
-+public class TimSortStackSize {
-+
-+ public static void main(String[] args) {
-+ testComparableTimSort();
-+ testTimSort();
-+ }
-+
-+ static void testComparableTimSort() {
-+ System.out.printf("testComparableTimSort()%n");
-+ Arrays.sort(genData());
-+ }
-+
-+ static void testTimSort() {
-+ System.out.printf("testTimSort()%n");
-+ //Arrays.sort(genData(), Integer::compare);
-+ Arrays.sort(genData(),
-+ new java.util.Comparator<Integer>() {
-+ public int compare(Integer a1, Integer a2){
-+ return Integer.compare(a1.intValue(), a2.intValue());
-+ }
-+ });
-+ }
-+
-+ private static final int MIN = 16;
-+
-+ private static final int BOUND1 = 2 * MIN + 1;
-+ private static final int BOUND2 = BOUND1 + MIN + 2;
-+ private static final int BOUND3 = BOUND1 + 1 + BOUND2;
-+ private static final int BOUND4 = BOUND2 + 1 + BOUND3;
-+ private static final int BOUND5 = BOUND3 + 1 + BOUND4;
-+
-+ static int build(int size, int B, ArrayDeque<Integer> chunks) {
-+ chunks.addFirst(B);
-+ if (size < BOUND1) {
-+ chunks.addFirst(size);
-+ return size;
-+ }
-+
-+ int asize = (size + 2) / 2;
-+ if (size >= BOUND2 && asize < BOUND1) {
-+ asize = BOUND1;
-+ } else if (size >= BOUND3 && asize < BOUND2) {
-+ asize = BOUND2;
-+ } else if (size >= BOUND4 && asize < BOUND3) {
-+ asize = BOUND3;
-+ } else if (size >= BOUND5 && asize < BOUND4) {
-+ asize = BOUND4;
-+ }
-+ if (size - asize >= B) {
-+ throw new AssertionError(" " + size + " , " + asize + " , " + B);
-+ }
-+ return build(asize, size - asize, chunks);
-+ }
-+
-+ static Integer[] genData() {
-+ ArrayDeque<Integer> chunks = new ArrayDeque<Integer>();
-+ chunks.addFirst(MIN);
-+
-+ int B = MIN + 4;
-+ int A = B + MIN + 1;
-+
-+ for (int i = 0; i < 8; i++) {
-+ int eps = build(A, B, chunks);
-+ B = B + A + 1;
-+ A = B + eps + 1;
-+ }
-+ chunks.addFirst(B);
-+ chunks.addFirst(A);
-+ int total = 0;
-+ for (Integer len : chunks) {
-+ total += len;
-+ }
-+ int pow = MIN;
-+ while (pow < total) {
-+ pow += pow;
-+ }
-+ chunks.addLast(pow - total);
-+ System.out.println(" Total: " + total);
-+ Integer[] array = new Integer[pow];
-+ int off = 0;
-+ int pos = 0;
-+ for (Integer len : chunks) {
-+ for (int i = 0; i < len; i++) {
-+ array[pos++] = Integer.valueOf(i == 0 ? 0 : 1);
-+ }
-+ off++;
-+ }
-+ return array;
-+ }
-+
-+}
---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2013-09-06 11:29:47.000000000 -0700
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -30,7 +30,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2013-09-06 11:29:48.000000000 -0700
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -58,7 +58,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2013-09-06 11:29:49.000000000 -0700
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -31,7 +31,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -72,10 +72,10 @@
- Windows* | CYGWIN* )
- DEL=";"
- ;;
--SunOS | Darwin)
-+SunOS | Darwin )
- DEL=":"
- ;;
--Linux)
-+Linux | *BSD )
- DEL=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -42,9 +42,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Darwin )
-- SEP=':' ;;
-- Linux )
-+ SunOS | Linux | *BSD | Darwin )
- SEP=':' ;;
- * )
- SEP='\;' ;;
---- ./jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,71 @@
-+/*
-+ * 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 8021788
-+ * @summary JarInputStream doesn't provide certificates for some file under META-INF
-+ */
-+
-+import java.util.jar.*;
-+import java.io.*;
-+import java.util.zip.ZipEntry;
-+import java.util.zip.ZipOutputStream;
-+
-+public class ExtraFileInMetaInf {
-+ public static void main(String args[]) throws Exception {
-+
-+ // Create a zip file with 2 entries
-+ try (ZipOutputStream zos =
-+ new ZipOutputStream(new FileOutputStream("x.jar"))) {
-+ zos.putNextEntry(new ZipEntry("META-INF/SUB/file"));
-+ zos.write(new byte[10]);
-+ zos.putNextEntry(new ZipEntry("x"));
-+ zos.write(new byte[10]);
-+ zos.close();
-+ }
-+
-+ // Sign it
-+ new File("ks").delete();
-+ sun.security.tools.KeyTool.main(
-+ ("-keystore ks -storepass changeit -keypass changeit " +
-+ "-alias a -dname CN=A -genkeypair").split(" "));
-+ sun.security.tools.JarSigner.main(
-+ "-keystore ks -storepass changeit x.jar a".split(" "));
-+
-+ // Check if the entries are signed
-+ try (JarInputStream jis =
-+ new JarInputStream(new FileInputStream("x.jar"))) {
-+ JarEntry je;
-+ while ((je = jis.getNextJarEntry()) != null) {
-+ String name = je.toString();
-+ if (name.equals("META-INF/SUB/file") || name.equals("x")) {
-+ while (jis.read(new byte[1000]) >= 0);
-+ if (je.getCertificates() == null) {
-+ throw new Exception(name + " not signed");
-+ }
-+ }
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/java/util/logging/LevelResourceBundle.java 2013-09-06 11:29:51.000000000 -0700
-+++ ./jdk/test/java/util/logging/LevelResourceBundle.java 2014-07-15 21:49:29.000000000 -0700
-@@ -33,15 +33,19 @@
-
- public class LevelResourceBundle {
- public static void main(String args[]) throws Exception {
-- final String name = "SEVERE";
-- String en = getLocalizedMessage(Locale.getDefault(), name);
-- String fr = getLocalizedMessage(Locale.FRANCE, name);
-+ final String key = "SEVERE";
-+ final String name = "Severe";
-+ String en = getLocalizedMessage(Locale.getDefault(), key);
-+ String fr = getLocalizedMessage(Locale.FRANCE, key);
- if (!name.equals(en)) {
- throw new RuntimeException("Expect " + name + " equals " + en);
- }
- if (name.equals(fr)) {
- throw new RuntimeException("Expect " + name + " not equals " + fr);
- }
-+ if (key.equals(fr)) {
-+ throw new RuntimeException("Expect " + key + " not equals " + fr);
-+ }
- }
-
- private static final String RBNAME = "sun.util.logging.resources.logging";
---- ./jdk/test/java/util/logging/LocalizedLevelName.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/util/logging/LocalizedLevelName.java 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,103 @@
-+/*
-+ * 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.*;
-+import java.util.logging.*;
-+
-+/*
-+ * @test
-+ * @bug 8016127 8024131
-+ * @summary test logging.properties localized
-+ * @run main/othervm LocalizedLevelName
-+ */
-+
-+public class LocalizedLevelName {
-+ private static Object[] namesMap = {
-+ "SEVERE", Locale.ENGLISH, "Severe", Level.SEVERE,
-+ "WARNING", Locale.FRENCH, "Avertissement", Level.WARNING,
-+ "INFO", Locale.ITALIAN, "Informazioni", Level.INFO,
-+ "SEVERE", Locale.FRENCH, "Grave", Level.SEVERE,
-+ "CONFIG", Locale.GERMAN, "Konfiguration", Level.CONFIG,
-+ "ALL", Locale.ROOT, "All", Level.ALL,
-+ "SEVERE", Locale.ROOT, "Severe", Level.SEVERE,
-+ "WARNING", Locale.ROOT, "Warning", Level.WARNING,
-+ "CONFIG", Locale.ROOT, "Config", Level.CONFIG,
-+ "INFO", Locale.ROOT, "Info", Level.INFO,
-+ "FINE", Locale.ROOT, "Fine", Level.FINE,
-+ "FINER", Locale.ROOT, "Finer", Level.FINER,
-+ "FINEST", Locale.ROOT, "Finest", Level.FINEST
-+ };
-+
-+ public static void main(String args[]) throws Exception {
-+ Locale defaultLocale = Locale.getDefault();
-+ for (int i=0; i<namesMap.length; i += 4) {
-+ final String key = (String) namesMap[i];
-+ final Locale locale = (Locale) namesMap[i+1];
-+ final String expectedTranslation = (String) namesMap[i+2];
-+ final Level level = (Level) namesMap[i+3];
-+
-+ final String en = getLocalizedMessage(Locale.ENGLISH, key);
-+ final String other = getLocalizedMessage(locale, key);
-+
-+ System.out.println(locale + ": " + key + "=" + expectedTranslation
-+ + ", (Level." + level.getName() + ")");
-+ System.out.println(" => localized(" + Locale.ENGLISH + ", "
-+ + key + ")=" + en);
-+ System.out.println(" => localized(" + locale + ", " + key
-+ + ")=" + other);
-+ if (!key.equals(en.toUpperCase(Locale.ROOT))) {
-+ throw new RuntimeException("Expect " + key
-+ + " equals upperCase(" + en + ")");
-+ }
-+ if (!Locale.ENGLISH.equals(locale) && !Locale.ROOT.equals(locale)
-+ && key.equals(other.toUpperCase(Locale.ROOT))) {
-+ throw new RuntimeException("Expect " + key
-+ + " not equals upperCase(" + other +")");
-+ }
-+ if ((Locale.ENGLISH.equals(locale) || Locale.ROOT.equals(locale))
-+ && !key.equals(other.toUpperCase(Locale.ROOT))) {
-+ throw new RuntimeException("Expect " + key
-+ + " equals upperCase(" + other +")");
-+ }
-+ if (!other.equals(expectedTranslation)) {
-+ throw new RuntimeException("Expected \"" + expectedTranslation
-+ + "\" for '" + locale + "' but got \"" + other + "\"");
-+ }
-+ Locale.setDefault(locale);
-+ final String levelName = level.getLocalizedName();
-+ System.out.println("Level.getLocalizedName() is: " + levelName);
-+ if (!levelName.equals(other.toUpperCase(locale))) {
-+ throw new RuntimeException("Expected \""
-+ + other.toUpperCase(locale) + "\" for '"
-+ + locale + "' but got \"" + levelName + "\"");
-+ }
-+ Locale.setDefault(defaultLocale);
-+ }
-+ }
-+
-+ private static final String RBNAME = "sun.util.logging.resources.logging";
-+ private static String getLocalizedMessage(Locale locale, String key) {
-+ ResourceBundle rb = ResourceBundle.getBundle(RBNAME, locale);
-+ return rb.getString(key);
-+ }
-+}
---- ./jdk/test/java/util/logging/TestAppletLoggerContext.java 2013-09-06 11:29:51.000000000 -0700
-+++ ./jdk/test/java/util/logging/TestAppletLoggerContext.java 2014-07-15 21:49:29.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/TestGetLoggerNPE.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/util/logging/TestGetLoggerNPE.java 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,91 @@
-+/*
-+ * 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.PrintStream;
-+import java.security.Permission;
-+import java.security.Policy;
-+import java.security.ProtectionDomain;
-+import java.util.logging.LogManager;
-+import java.util.logging.Logger;
-+import sun.awt.SunToolkit;
-+
-+/*
-+ * @test
-+ * @bug 8025512
-+ *
-+ * @summary NPE with logging while launching webstart
-+ *
-+ * @build TestGetLoggerNPE
-+ * @run main/othervm TestGetLoggerNPE getLogger
-+ * @run main/othervm TestGetLoggerNPE getLogManager
-+ */
-+public class TestGetLoggerNPE {
-+ static volatile Throwable thrown = null;
-+ static volatile sun.awt.AppContext context = null;
-+ public static void main(String[] args) throws Exception {
-+ final String testCase = args.length == 0 ? "getLogger" : args[0];
-+ final ThreadGroup tg = new ThreadGroup("TestGroup");
-+ Thread t = new Thread(tg, "test") {
-+ public void run() {
-+ try {
-+ context = SunToolkit.createNewAppContext();
-+ final PrintStream out = System.out;
-+ System.setOut(null);
-+ try {
-+ if ("getLogger".equals(testCase)) {
-+ Logger.getLogger("sun.plugin");
-+ } else {
-+ LogManager.getLogManager();
-+ }
-+ } finally {
-+ System.setOut(out);
-+ }
-+
-+ System.out.println(Logger.global);
-+ } catch (Throwable x) {
-+ x.printStackTrace();
-+ thrown = x;
-+ }
-+ }
-+ };
-+ Policy.setPolicy(new Policy() {
-+ public boolean implies(ProtectionDomain domain,
-+ Permission permission) {
-+ return true; // all permissions
-+ }
-+ });
-+ System.setSecurityManager(new SecurityManager());
-+ t.start();
-+ t.join();
-+ if (context != null && !context.isDisposed()) {
-+ context.dispose();
-+ }
-+ if (thrown == null) {
-+ System.out.println("PASSED: " + testCase);
-+ } else {
-+ System.err.println("FAILED: " + testCase);
-+ throw new Error("Test failed: " + testCase + " - " + thrown, thrown);
-+ }
-+
-+ }
-+
-+}
---- ./jdk/test/java/util/logging/TestLogConfigurationDeadLock.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/util/logging/TestLogConfigurationDeadLock.java 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,256 @@
-+/*
-+ * 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.lang.management.ManagementFactory;
-+import java.lang.management.ThreadInfo;
-+import java.security.Permission;
-+import java.security.Policy;
-+import java.security.ProtectionDomain;
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.concurrent.atomic.AtomicLong;
-+import java.util.logging.LogManager;
-+import java.util.logging.Logger;
-+
-+
-+/**
-+ * @test
-+ * @bug 8029281 8027670
-+ * @summary Synchronization issues in Logger and LogManager. This test
-+ * focusses more particularly on potential deadlock in
-+ * drainLoggerRefQueueBounded / readConfiguration
-+ * @run main/othervm TestLogConfigurationDeadLock
-+ * @author danielfuchs
-+ */
-+// This test is a best effort to try & detect issues. The test itself will run
-+// for 8secs. This is usually unsufficient to detect issues.
-+// To get a greater confidence it is recommended to run this test in a loop:
-+// e.g. use something like:
-+// $ while jtreg -jdk:$JDK -verbose:all \
-+// test/java/util/logging/TestLogConfigurationDeadLock.java ; \
-+// do echo Running test again ; done
-+// and let it run for a few hours...
-+//
-+public class TestLogConfigurationDeadLock {
-+
-+ static volatile Exception thrown = null;
-+ static volatile boolean goOn = true;
-+
-+ static final int READERS = 2;
-+ static final int LOGGERS = 2;
-+ static final long TIME = 4 * 1000; // 4 sec.
-+ static final long STEP = 1 * 1000; // message every 1 sec.
-+ static final int LCOUNT = 50; // 50 loggers created in a row...
-+ static final AtomicLong nextLogger = new AtomicLong(0);
-+ static final AtomicLong readCount = new AtomicLong(0);
-+ static final AtomicLong checkCount = new AtomicLong(0);
-+
-+ /**
-+ * This test will run both with and without a security manager.
-+ *
-+ * The test starts a number of threads that will call
-+ * LogManager.readConfiguration() concurrently (ReadConf), then starts
-+ * a number of threads that will create new loggers concurrently
-+ * (AddLogger), and then two additional threads: one (Stopper) that
-+ * will stop the test after 4secs (TIME ms), and one DeadlockDetector
-+ * that will attempt to detect deadlocks.
-+ * If after 4secs no deadlock was detected and no exception was thrown
-+ * then the test is considered a success and passes.
-+ *
-+ * This procedure is done twice: once without a security manager and once
-+ * again with a security manager - which means the test takes ~8secs to
-+ * run.
-+ *
-+ * Note that 8sec may not be enough to detect issues if there are some.
-+ * This is a best effort test.
-+ *
-+ * @param args the command line arguments
-+ */
-+ public static void main(String[] args) throws Exception {
-+
-+ // test without security
-+ System.out.println("No security");
-+ test();
-+
-+ // test with security
-+ System.out.println("\nWith security");
-+ Policy.setPolicy(new Policy() {
-+ @Override
-+ public boolean implies(ProtectionDomain domain, Permission permission) {
-+ if (super.implies(domain, permission)) return true;
-+ // System.out.println("Granting " + permission);
-+ return true; // all permissions
-+ }
-+ });
-+ System.setSecurityManager(new SecurityManager());
-+ test();
-+ }
-+
-+ /**
-+ * Starts all threads, wait 4secs, then stops all threads.
-+ * @throws Exception if a deadlock was detected or an error occurred.
-+ */
-+ public static void test() throws Exception {
-+ goOn = true;
-+ thrown = null;
-+ long sNextLogger = nextLogger.get();
-+ long sReadCount = readCount.get();
-+ long sCheckCount = checkCount.get();
-+ List<Thread> threads = new ArrayList<>();
-+ for (int i = 0; i<READERS; i++) {
-+ threads.add(new ReadConf());
-+ }
-+ for (int i = 0; i<LOGGERS; i++) {
-+ threads.add(new AddLogger());
-+ }
-+ threads.add(new DeadlockDetector());
-+ threads.add(0, new Stopper(TIME));
-+ for (Thread t : threads) {
-+ t.start();
-+ }
-+ for (Thread t : threads) {
-+ try {
-+ t.join();
-+ } catch (Exception x) {
-+ fail(x);
-+ }
-+ }
-+ if (thrown != null) {
-+ throw thrown;
-+ }
-+ System.out.println("Passed: " + (nextLogger.get() - sNextLogger)
-+ + " loggers created by " + LOGGERS + " Thread(s),");
-+ System.out.println("\t LogManager.readConfiguration() called "
-+ + (readCount.get() - sReadCount) + " times by " + READERS
-+ + " Thread(s).");
-+ System.out.println("\t ThreadMXBean.findDeadlockedThreads called "
-+ + (checkCount.get() -sCheckCount) + " times by 1 Thread.");
-+
-+ }
-+
-+
-+ final static class ReadConf extends Thread {
-+ @Override
-+ public void run() {
-+ while (goOn) {
-+ try {
-+ LogManager.getLogManager().readConfiguration();
-+ readCount.incrementAndGet();
-+ Thread.sleep(1);
-+ } catch (Exception x) {
-+ fail(x);
-+ }
-+ }
-+ }
-+ }
-+
-+ final static class AddLogger extends Thread {
-+ @Override
-+ public void run() {
-+ try {
-+ while (goOn) {
-+ Logger l;
-+ Logger foo = Logger.getLogger("foo");
-+ Logger bar = Logger.getLogger("foo.bar");
-+ for (int i=0; i < LCOUNT ; i++) {
-+ l = Logger.getLogger("foo.bar.l"+nextLogger.incrementAndGet());
-+ l.fine("I'm fine");
-+ if (!goOn) break;
-+ Thread.sleep(1);
-+ }
-+ }
-+ } catch (InterruptedException | RuntimeException x ) {
-+ fail(x);
-+ }
-+ }
-+ }
-+
-+ final static class DeadlockDetector extends Thread {
-+
-+ @Override
-+ public void run() {
-+ while(goOn) {
-+ try {
-+ long[] ids = ManagementFactory.getThreadMXBean().findDeadlockedThreads();
-+ checkCount.incrementAndGet();
-+ ids = ids == null ? new long[0] : ids;
-+ if (ids.length == 1) {
-+ throw new RuntimeException("Found 1 deadlocked thread: "+ids[0]);
-+ } else if (ids.length > 0) {
-+ ThreadInfo[] infos = ManagementFactory.getThreadMXBean()
-+ .getThreadInfo(ids, Integer.MAX_VALUE);
-+ System.err.println("Found "+ids.length+" deadlocked threads: ");
-+ for (ThreadInfo inf : infos) {
-+ System.err.println(inf.toString());
-+ }
-+ throw new RuntimeException("Found "+ids.length+" deadlocked threads");
-+ }
-+ Thread.sleep(100);
-+ } catch(InterruptedException | RuntimeException x) {
-+ fail(x);
-+ }
-+ }
-+ }
-+
-+ }
-+
-+ static final class Stopper extends Thread {
-+ long start;
-+ long time;
-+
-+ Stopper(long time) {
-+ start = System.currentTimeMillis();
-+ this.time = time;
-+ }
-+
-+ @Override
-+ public void run() {
-+ try {
-+ long rest, previous;
-+ previous = time;
-+ while (goOn && (rest = start - System.currentTimeMillis() + time) > 0) {
-+ if (previous == time || previous - rest >= STEP) {
-+ Logger.getLogger("remaining").info(String.valueOf(rest)+"ms remaining...");
-+ previous = rest == time ? rest -1 : rest;
-+ System.gc();
-+ }
-+ if (goOn == false) break;
-+ Thread.sleep(Math.min(rest, 100));
-+ }
-+ System.out.println(System.currentTimeMillis() - start
-+ + " ms elapsed ("+time+ " requested)");
-+ goOn = false;
-+ } catch(InterruptedException | RuntimeException x) {
-+ fail(x);
-+ }
-+ }
-+
-+ }
-+
-+ static void fail(Exception x) {
-+ x.printStackTrace();
-+ if (thrown == null) {
-+ thrown = x;
-+ }
-+ goOn = false;
-+ }
-+}
---- ./jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,340 @@
-+/*
-+ * 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.PrintStream;
-+import java.lang.management.ManagementFactory;
-+import java.lang.management.ThreadInfo;
-+import java.security.Permission;
-+import java.security.Policy;
-+import java.security.ProtectionDomain;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.HashSet;
-+import java.util.List;
-+import java.util.Random;
-+import java.util.Set;
-+import java.util.concurrent.atomic.AtomicLong;
-+import java.util.logging.Level;
-+import java.util.logging.LogManager;
-+import java.util.logging.Logger;
-+
-+
-+/**
-+ * @test
-+ * @bug 8027670 8029281
-+ * @summary Deadlock in drainLoggerRefQueueBounded / readConfiguration
-+ * caused by synchronization issues in Logger and LogManager.
-+ * @run main/othervm TestLogConfigurationDeadLockWithConf
-+ * @author danielfuchs
-+ */
-+// This test is a best effort to try & detect issues. The test itself will run
-+// for 8secs. This is usually sufficient to detect issues.
-+// However to get a greater confidence it is recommended to run this test in a loop:
-+// e.g. use something like:
-+// $ while jtreg -jdk:$JDK -verbose:all \
-+// test/java/util/logging/TestLogConfigurationDeadLockWithConf.java ; \
-+// do echo Running test again ; done
-+// and let it run for a few hours...
-+//
-+public class TestLogConfigurationDeadLockWithConf {
-+
-+ static volatile Exception thrown = null;
-+ static volatile boolean goOn = true;
-+
-+ static final int READERS = 2;
-+ static final int LOGGERS = 2;
-+ static final long TIME = 4 * 1000; // 4 sec.
-+ static final long STEP = 1 * 1000; // message every 1 sec.
-+ static final int LCOUNT = 50; // 50 loggers created in a row...
-+ static final AtomicLong nextLogger = new AtomicLong(0);
-+ static final AtomicLong readCount = new AtomicLong(0);
-+ static final AtomicLong checkCount = new AtomicLong(0);
-+
-+ /**
-+ * This test will run both with and without a security manager.
-+ *
-+ * The test starts a number of threads that will call
-+ * LogManager.readConfiguration() concurrently (ReadConf), then starts
-+ * a number of threads that will create new loggers concurrently
-+ * (AddLogger), and then two additional threads: one (Stopper) that
-+ * will stop the test after 4secs (TIME ms), and one DeadlockDetector
-+ * that will attempt to detect deadlocks.
-+ * If after 4secs no deadlock was detected and no exception was thrown
-+ * then the test is considered a success and passes.
-+ *
-+ * This procedure is done twice: once without a security manager and once
-+ * again with a security manager - which means the test takes ~8secs to
-+ * run.
-+ *
-+ * Note that 8sec may not be enough to detect issues if there are some.
-+ * This is a best effort test.
-+ *
-+ * @param args the command line arguments
-+ * @throws java.lang.Exception if the test fails.
-+ */
-+ public static void main(String[] args) throws Exception {
-+ File config = new File(System.getProperty("test.src", "."),
-+ "deadlockconf.properties");
-+ if (!config.canRead()) {
-+ System.err.println("Can't read config file: test cannot execute.");
-+ System.err.println("Please check your test environment: ");
-+ System.err.println("\t -Dtest.src=" + System.getProperty("test.src", "."));
-+ System.err.println("\t config file is: " + config.getAbsolutePath());
-+ throw new RuntimeException("Can't read config file: "
-+ + config.getAbsolutePath());
-+ }
-+
-+ System.setProperty("java.util.logging.config.file",
-+ config.getAbsolutePath());
-+
-+ // test without security
-+ System.out.println("No security");
-+ test();
-+
-+ // test with security
-+ System.out.println("\nWith security");
-+ Policy.setPolicy(new Policy() {
-+ @Override
-+ public boolean implies(ProtectionDomain domain, Permission permission) {
-+ if (super.implies(domain, permission)) return true;
-+ // System.out.println("Granting " + permission);
-+ return true; // all permissions
-+ }
-+ });
-+ System.setSecurityManager(new SecurityManager());
-+ test();
-+ }
-+
-+ static Random rand = new Random(System.currentTimeMillis());
-+ private static int getBarCount() {
-+ return rand.nextInt(10);
-+ }
-+
-+ /**
-+ * Starts all threads, wait 4secs, then stops all threads.
-+ * @throws Exception if a deadlock was detected or an error occurred.
-+ */
-+ public static void test() throws Exception {
-+ goOn = true;
-+ thrown = null;
-+ long sNextLogger = nextLogger.get();
-+ long sReadCount = readCount.get();
-+ long sCheckCount = checkCount.get();
-+ List<Thread> threads = new ArrayList<>();
-+ for (int i = 0; i<READERS; i++) {
-+ threads.add(new ReadConf());
-+ }
-+ for (int i = 0; i<LOGGERS; i++) {
-+ threads.add(new AddLogger());
-+ }
-+ DeadlockDetector detector = new DeadlockDetector();
-+ threads.add(detector);
-+ threads.add(0, new Stopper(TIME));
-+ for (Thread t : threads) {
-+ t.start();
-+ }
-+
-+ // wait for the detector to finish.
-+ detector.join();
-+
-+ final PrintStream out = thrown == null ? System.out : System.err;
-+
-+ // Try to wait for all threads to finish.
-+ // This is a best effort: if some threads are in deadlock we can't
-+ // obviously wait for them, and other threads may have joined in
-+ // the deadlock since we last checked.
-+ // However, all threads which are succeptible of deadlocking
-+ // extend DeamonThread.
-+ for (Thread t : threads) {
-+ if (t == detector) {
-+ continue;
-+ }
-+ if (detector.deadlocked.contains(t.getId())) {
-+ out.println("Skipping deadlocked thread "
-+ + t.getClass().getSimpleName() + ": " + t);
-+ continue; // don't wait for deadlocked thread: they won't terminate
-+ }
-+ try {
-+ if (detector.deadlocked.isEmpty()) {
-+ t.join();
-+ } else {
-+ if (t instanceof DaemonThread) {
-+ // Some other threads may have join the deadlock.
-+ // don't wait forever.
-+ t.join(100);
-+ } else {
-+ // Those threads that don't extend DaemonThread
-+ // should be safe from deadlock.
-+ out.println("Waiting for "
-+ + t.getClass().getSimpleName() + ": " + t);
-+ t.join();
-+ }
-+ }
-+ } catch (Exception x) {
-+ fail(x);
-+ }
-+ }
-+ out.println("All threads joined.");
-+
-+ final String status = thrown == null ? "Passed" : "FAILED";
-+
-+ out.println(status + ": " + (nextLogger.get() - sNextLogger)
-+ + " loggers created by " + LOGGERS + " Thread(s),");
-+ out.println("\t LogManager.readConfiguration() called "
-+ + (readCount.get() - sReadCount) + " times by " + READERS
-+ + " Thread(s).");
-+ out.println("\t ThreadMXBean.findDeadlockedThreads called "
-+ + (checkCount.get() -sCheckCount) + " times by 1 Thread.");
-+
-+ if (thrown != null) {
-+ out.println("\t Error is: "+thrown.getMessage());
-+ throw thrown;
-+ }
-+ }
-+
-+ static class DaemonThread extends Thread {
-+ public DaemonThread() {
-+ this.setDaemon(true);
-+ }
-+ }
-+
-+ final static class ReadConf extends DaemonThread {
-+ @Override
-+ public void run() {
-+ while (goOn) {
-+ try {
-+ LogManager.getLogManager().readConfiguration();
-+ readCount.incrementAndGet();
-+ Thread.sleep(1);
-+ } catch (Exception x) {
-+ fail(x);
-+ }
-+ }
-+ }
-+ }
-+
-+ final static class AddLogger extends DaemonThread {
-+ @Override
-+ public void run() {
-+ try {
-+ while (goOn) {
-+ Logger l;
-+ int barcount = getBarCount();
-+ for (int i=0; i < LCOUNT ; i++) {
-+ l = Logger.getLogger("foo.bar"+barcount+".l"+nextLogger.incrementAndGet());
-+ l.fine("I'm fine");
-+ if (!goOn) break;
-+ Thread.sleep(1);
-+ }
-+ }
-+ } catch (InterruptedException | RuntimeException x ) {
-+ fail(x);
-+ }
-+ }
-+ }
-+
-+ final static class DeadlockDetector extends Thread {
-+
-+ final Set<Long> deadlocked = Collections.synchronizedSet(new HashSet<Long>());
-+
-+ static List<Long> asList(long... ids) {
-+ final List<Long> list = new ArrayList<>(ids.length);
-+ for (long id : ids) {
-+ list.add(id);
-+ }
-+ return list;
-+ }
-+
-+ @Override
-+ public void run() {
-+ while(goOn) {
-+ try {
-+ long[] ids = ManagementFactory.getThreadMXBean().findDeadlockedThreads();
-+ checkCount.incrementAndGet();
-+ ids = ids == null ? new long[0] : ids;
-+ if (ids.length > 0) {
-+ deadlocked.addAll(asList(ids));
-+ }
-+ if (ids.length == 1) {
-+ throw new RuntimeException("Found 1 deadlocked thread: "+ids[0]);
-+ } else if (ids.length > 0) {
-+ ThreadInfo[] infos = ManagementFactory.getThreadMXBean().getThreadInfo(ids, Integer.MAX_VALUE);
-+ System.err.println("Found "+ids.length+" deadlocked threads: ");
-+ for (ThreadInfo inf : infos) {
-+ System.err.println(inf.toString());
-+ }
-+ throw new RuntimeException("Found "+ids.length+" deadlocked threads");
-+ }
-+ Thread.sleep(100);
-+ } catch(InterruptedException | RuntimeException x) {
-+ fail(x);
-+ }
-+ }
-+ }
-+
-+ }
-+
-+ static final class Stopper extends Thread {
-+ long start;
-+ long time;
-+
-+ static final Logger logger = Logger.getLogger("remaining");
-+
-+ Stopper(long time) {
-+ start = System.currentTimeMillis();
-+ this.time = time;
-+ }
-+
-+ @Override
-+ public void run() {
-+ try {
-+ long rest, previous;
-+ previous = time;
-+ while (goOn && (rest = start - System.currentTimeMillis() + time) > 0) {
-+ if (previous == time || previous - rest >= STEP) {
-+ logger.log(Level.INFO,
-+ "{0}ms remaining...", String.valueOf(rest));
-+ previous = rest == time ? rest -1 : rest;
-+ System.gc();
-+ }
-+ if (goOn == false) break;
-+ Thread.sleep(Math.min(rest, 100));
-+ }
-+ System.out.println(System.currentTimeMillis() - start
-+ + " ms elapsed ("+time+ " requested)");
-+ goOn = false;
-+ } catch(InterruptedException | RuntimeException x) {
-+ fail(x);
-+ }
-+ }
-+
-+ }
-+
-+ static void fail(Exception x) {
-+ x.printStackTrace();
-+ if (thrown == null) {
-+ thrown = x;
-+ }
-+ goOn = false;
-+ }
-+}
---- ./jdk/test/java/util/logging/TestLoggerBundleSync.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/util/logging/TestLoggerBundleSync.java 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,535 @@
-+/*
-+ * 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.lang.management.ManagementFactory;
-+import java.lang.management.ThreadInfo;
-+import java.security.Permission;
-+import java.security.Policy;
-+import java.security.ProtectionDomain;
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.ListResourceBundle;
-+import java.util.Objects;
-+import java.util.ResourceBundle;
-+import java.util.concurrent.Callable;
-+import java.util.concurrent.ExecutorService;
-+import java.util.concurrent.Executors;
-+import java.util.concurrent.FutureTask;
-+import java.util.concurrent.atomic.AtomicLong;
-+import java.util.logging.Handler;
-+import java.util.logging.Level;
-+import java.util.logging.LogRecord;
-+import java.util.logging.Logger;
-+
-+/**
-+ * @test
-+ * @bug 8029281 8028763
-+ * @summary Attempts to detect synchronization issues with getResourceBundle()
-+ * and getResourceBundleName(). It might also detect issues in the way
-+ * that the logger tree is cleaned up after a logger has been garbage
-+ * collected. This test helped find the root cause of 8029092, so if
-+ * this test fails one might also expect failures in
-+ * java/util/logging/Logger/logrb/TestLogrbResourceBundle.java and
-+ * java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java.
-+ * Note that this is a best effort test. Running it in a loop to
-+ * reproduce intermittent issues can be a good idea.
-+ * @run main/othervm TestLoggerBundleSync
-+ * @author danielfuchs
-+ */
-+public class TestLoggerBundleSync {
-+
-+ static volatile Exception thrown = null;
-+ static volatile boolean goOn = true;
-+
-+ static final int READERS = 3;
-+ static final long TIME = 4 * 1000; // 4 sec.
-+ static final long STEP = 1 * 1000; // message every 1 sec.
-+ static final int LCOUNT = 50; // change bundle 50 times...
-+ static final AtomicLong setRBcount = new AtomicLong(0);
-+ static final AtomicLong setRBNameCount = new AtomicLong(0);
-+ static final AtomicLong getRBcount = new AtomicLong(0);
-+ static final AtomicLong checkCount = new AtomicLong(0);
-+ static final AtomicLong nextLong = new AtomicLong(0);
-+
-+ public static class MyBundle extends ListResourceBundle {
-+ @Override
-+ protected Object[][] getContents() {
-+ return new Object[][] {
-+ {"dummy", "foo"}
-+ };
-+ }
-+ }
-+
-+ public static final class MyBundle1 extends MyBundle { };
-+ public static final class MyBundle2 extends MyBundle { };
-+ public static final class MyBundle3 extends MyBundle { };
-+
-+
-+ public static final class LoggerRB {
-+ public final String resourceBundleName;
-+ public final ResourceBundle userBundle;
-+ public LoggerRB(String name, ResourceBundle bundle) {
-+ resourceBundleName = name;
-+ userBundle = bundle;
-+ }
-+ }
-+
-+ static final List<Class<? extends ResourceBundle>> classes = new ArrayList<>();
-+ static {
-+ classes.add(MyBundle1.class);
-+ classes.add(MyBundle2.class);
-+ classes.add(MyBundle3.class);
-+ }
-+
-+
-+ /**
-+ * This test will run both with and without a security manager.
-+ *
-+ * The test starts a number of threads that will attempt to concurrently
-+ * set resource bundles on Logger, and verifies the consistency of the
-+ * obtained results.
-+ *
-+ * This is a best effort test.
-+ *
-+ * @param args the command line arguments
-+ */
-+ public static void main(String[] args) throws Exception {
-+
-+ try {
-+ // test without security
-+ System.out.println("No security");
-+ test();
-+
-+ // test with security
-+ System.out.println("\nWith security");
-+ Policy.setPolicy(new Policy() {
-+ @Override
-+ public boolean implies(ProtectionDomain domain, Permission permission) {
-+ if (super.implies(domain, permission)) return true;
-+ // System.out.println("Granting " + permission);
-+ return true; // all permissions
-+ }
-+ });
-+ System.setSecurityManager(new SecurityManager());
-+ test();
-+ } finally {
-+ SetRB.executor.shutdownNow();
-+ SetRBName.executor.shutdownNow();
-+ }
-+ }
-+
-+ /**
-+ * Starts all threads, wait 15secs, then stops all threads.
-+ * @throws Exception if a deadlock was detected or an error occurred.
-+ */
-+ public static void test() throws Exception {
-+ goOn = true;
-+ thrown = null;
-+ long sGetRBCount = getRBcount.get();
-+ long sSetRBCount = setRBcount.get();
-+ long sSetRBNameCount = setRBNameCount.get();
-+ long sCheckCount = checkCount.get();
-+ long sNextLong = nextLong.get();
-+ List<Thread> threads = new ArrayList<>();
-+ for (Class<? extends ResourceBundle> type : classes) {
-+ threads.add(new SetRB(type));
-+ threads.add(new SetRBName(type));
-+ }
-+ for (int i =0 ; i < READERS ; i++) {
-+ threads.add(new GetRB());
-+ }
-+ threads.add(new DeadlockDetector());
-+ threads.add(0, new Stopper(TIME));
-+ for (Thread t : threads) {
-+ t.start();
-+ }
-+ for (Thread t : threads) {
-+ try {
-+ t.join();
-+ } catch (Exception x) {
-+ fail(x);
-+ }
-+ }
-+ if (thrown != null) {
-+ throw thrown;
-+ }
-+ System.out.println("Passed: " + (nextLong.longValue() - sNextLong)
-+ + " unique loggers created");
-+ System.out.println("\t " +(getRBcount.get() - sGetRBCount)
-+ + " loggers tested by " + READERS + " Thread(s),");
-+ System.out.println("\t " + (setRBcount.get() - sSetRBCount)
-+ + " resource bundles set by " + classes.size() + " Thread(s),");
-+ System.out.println("\t " + (setRBNameCount.get() - sSetRBNameCount)
-+ + " resource bundle names set by " + classes.size() + " Thread(s),");
-+ System.out.println("\t ThreadMXBean.findDeadlockedThreads called "
-+ + (checkCount.get() -sCheckCount) + " times by 1 Thread.");
-+
-+ }
-+
-+ final static class GetRB extends Thread {
-+ final static class MyHandler extends Handler {
-+ volatile ResourceBundle rb;
-+ volatile String rbName;
-+ @Override
-+ public synchronized void publish(LogRecord record) {
-+ rb = record.getResourceBundle();
-+ rbName = record.getResourceBundleName();
-+ }
-+
-+ @Override
-+ public void flush() {
-+ }
-+
-+ @Override
-+ public void close() throws SecurityException {
-+ }
-+ };
-+ final MyHandler handler = new MyHandler();
-+ @Override
-+ public void run() {
-+ try {
-+ handler.setLevel(Level.FINEST);
-+ while (goOn) {
-+ Logger l;
-+ Logger foo = Logger.getLogger("foo");
-+ Logger bar = Logger.getLogger("foo.bar");
-+ for (long i=0; i < nextLong.longValue() + 100 ; i++) {
-+ if (!goOn) break;
-+ l = Logger.getLogger("foo.bar.l"+i);
-+ final ResourceBundle b = l.getResourceBundle();
-+ final String name = l.getResourceBundleName();
-+ if (b != null) {
-+ if (!name.equals(b.getClass().getName())) {
-+ throw new RuntimeException("Unexpected bundle name: "
-+ +b.getClass().getName());
-+ }
-+ }
-+ Logger ll = Logger.getLogger(l.getName()+".bie.bye");
-+ ResourceBundle hrb;
-+ String hrbName;
-+ ll.setLevel(Level.FINEST);
-+ ll.addHandler(handler);
-+ ll.fine("dummy");
-+ ll.removeHandler(handler);
-+ hrb = handler.rb;
-+ hrbName = handler.rbName;
-+ if (name != null) {
-+ if (!name.equals(hrbName)) {
-+ throw new RuntimeException("Unexpected bundle name: "
-+ +hrb.getClass().getName());
-+ }
-+ if (!name.equals(hrb.getClass().getName())) {
-+ throw new RuntimeException("Unexpected bundle name: "
-+ +hrb.getClass().getName());
-+ }
-+ }
-+
-+ getRBcount.incrementAndGet();
-+ if (!goOn) break;
-+ Thread.sleep(1);
-+ }
-+ }
-+ } catch (Exception x) {
-+ fail(x);
-+ }
-+ }
-+ }
-+
-+ final static class SetRB extends Thread {
-+ final Class<? extends ResourceBundle> type;
-+ final static ExecutorService executor = Executors.newSingleThreadExecutor();
-+ final static class CheckRBTask implements Callable<Exception> {
-+ final Logger logger;
-+ volatile String rbName;
-+ volatile ResourceBundle rb;
-+
-+ public CheckRBTask(Logger logger) {
-+ this.logger = logger;
-+ }
-+
-+ @Override
-+ public Exception call() throws Exception {
-+ try {
-+ final String name = logger.getResourceBundleName();
-+ if (!Objects.equals(name, rbName)) {
-+ throw new RuntimeException("Unexpected rbname for "
-+ + logger.getName() + ": " + name);
-+ }
-+ final ResourceBundle b = logger.getResourceBundle();
-+ if (b != rb) {
-+ throw new RuntimeException("Unexpected rb for "
-+ + logger.getName() + ": " + b);
-+ }
-+ } catch(Exception x) {
-+ return x;
-+ }
-+ return null;
-+ }
-+
-+ public void check() throws Exception {
-+ final FutureTask<Exception> futureTask = new FutureTask<>(this);
-+ executor.submit(futureTask);
-+ Exception x = futureTask.get();
-+ if ( x != null) {
-+ throw new RuntimeException("Check failed: "+x,x);
-+ }
-+ }
-+ }
-+ SetRB(Class<? extends ResourceBundle> type) {
-+ super("SetRB["+type.getSimpleName()+"]");
-+ this.type = type;
-+ }
-+ @Override
-+ public void run() {
-+ try {
-+ while (goOn) {
-+ Logger l;
-+ Logger foo = Logger.getLogger("foo");
-+ Logger bar = Logger.getLogger("foo.bar");
-+ l = Logger.getLogger("foo.bar.l"+nextLong.incrementAndGet());
-+ final CheckRBTask checkTask = new CheckRBTask(l);
-+ checkTask.check();
-+ Logger l1 = l;
-+
-+ for (int i=0; i < LCOUNT ; i++) {
-+ if (!goOn) break;
-+
-+ ResourceBundle b = ResourceBundle.getBundle(type.getName());
-+ try {
-+ l = Logger.getLogger(l1.getName(), type.getName());
-+ checkTask.rb = b;
-+ checkTask.rbName = type.getName();
-+ checkTask.check();
-+ if (!goOn) break;
-+
-+ String name = l.getResourceBundleName();
-+ ResourceBundle bb = l.getResourceBundle();
-+ if (!type.getName().equals(name)) {
-+ throw new RuntimeException(this.getName()
-+ + ": Unexpected name: "+name);
-+ }
-+ if (!b.getClass().getName().equals(name)) {
-+ throw new RuntimeException(this.getName()
-+ + ": Unexpected base name: " +
-+ b.getClass().getName());
-+ }
-+ if (b != bb) {
-+ throw new RuntimeException(this.getName()
-+ + ": Unexpected bundle: "+bb);
-+ }
-+ setRBcount.incrementAndGet();
-+ } catch (IllegalArgumentException x) {
-+ final String name = l.getResourceBundleName();
-+ if (!name.startsWith(MyBundle.class.getName())) {
-+ throw new RuntimeException(this.getName()
-+ + ": Unexpected name: "+name, x);
-+ } else if (type.getName().equals(name)) {
-+ throw new RuntimeException(this.getName()
-+ + ": Unexpected exception for "+name, x);
-+ }
-+ throw x;
-+ }
-+ l.fine("I'm fine");
-+ if (!goOn) break;
-+ Thread.sleep(1);
-+ }
-+ }
-+ } catch (Exception x) {
-+ fail(x);
-+ }
-+ }
-+ }
-+
-+ final static class SetRBName extends Thread {
-+ int nexti = 0;
-+ final Class<? extends ResourceBundle> type;
-+ final static ExecutorService executor = Executors.newSingleThreadExecutor();
-+ final static class CheckRBNameTask implements Callable<Exception> {
-+ final Logger logger;
-+ volatile String rbName;
-+
-+ public CheckRBNameTask(Logger logger) {
-+ this.logger = logger;
-+ }
-+
-+ @Override
-+ public Exception call() throws Exception {
-+ try {
-+ final String name = logger.getResourceBundleName();
-+ if (!Objects.equals(name, rbName)) {
-+ throw new RuntimeException("Unexpected rbname for "
-+ + logger.getName() + ": " + name);
-+ }
-+ final ResourceBundle b = logger.getResourceBundle();
-+ if (!Objects.equals(b == null ? null : b.getClass().getName(), rbName)) {
-+ throw new RuntimeException("Unexpected base name for "
-+ + logger.getName() + ": " + b.getClass().getName());
-+ }
-+ } catch(Exception x) {
-+ return x;
-+ }
-+ return null;
-+ }
-+
-+ public void check() throws Exception {
-+ final FutureTask<Exception> futureTask = new FutureTask<>(this);
-+ executor.submit(futureTask);
-+ Exception x = futureTask.get();
-+ if ( x != null) {
-+ throw new RuntimeException("Check failed: "+x,x);
-+ }
-+ }
-+
-+ }
-+ SetRBName(Class<? extends ResourceBundle> type) {
-+ super("SetRB["+type.getSimpleName()+"]");
-+ this.type = type;
-+ }
-+ @Override
-+ public void run() {
-+ try {
-+ while (goOn) {
-+ Logger foo = Logger.getLogger("foo");
-+ Logger bar = Logger.getLogger("foo.bar");
-+ Logger l = Logger.getLogger("foo.bar.l"+nextLong.incrementAndGet());
-+ final CheckRBNameTask checkTask = new CheckRBNameTask(l);
-+ checkTask.check();
-+
-+ for (int i=0; i < LCOUNT ; i++) {
-+ if (!goOn) break;
-+
-+ try {
-+ Logger l2 = Logger.getLogger(l.getName(), type.getName());
-+ if (l2 != l) {
-+ System.err.println("**** ERROR WITH "+l.getName());
-+ throw new RuntimeException("l2 != l ["
-+ + l2 + "(" + l2.getName() + ") != "
-+ + l + "(" + l.getName() + ")]");
-+ }
-+ checkTask.rbName = type.getName();
-+ checkTask.check();
-+ if (!goOn) break;
-+
-+ String name = l.getResourceBundleName();
-+ ResourceBundle bb = l.getResourceBundle();
-+ if (!type.getName().equals(name)) {
-+ throw new RuntimeException(this.getName()
-+ + ": Unexpected name: "+name);
-+ }
-+ if (!bb.getClass().getName().equals(name)) {
-+ throw new RuntimeException(this.getName()
-+ + ": Unexpected base name: "
-+ + bb.getClass().getName());
-+ }
-+ setRBNameCount.incrementAndGet();
-+ } catch (IllegalArgumentException x) {
-+ final String name = l.getResourceBundleName();
-+ if (!name.startsWith(MyBundle.class.getName())) {
-+ throw new RuntimeException(this.getName()
-+ + ": Unexpected name: "+name, x);
-+ } else if (type.getName().equals(name)) {
-+ throw new RuntimeException(this.getName()
-+ + ": Unexpected exception for "+name, x);
-+ }
-+ throw x;
-+ }
-+ l.fine("I'm fine");
-+ if (!goOn) break;
-+ Thread.sleep(1);
-+ }
-+ }
-+ } catch (Exception x) {
-+ fail(x);
-+ }
-+ }
-+ }
-+
-+ final static class DeadlockDetector extends Thread {
-+
-+ @Override
-+ public void run() {
-+ while(goOn) {
-+ try {
-+ long[] ids = ManagementFactory.getThreadMXBean().findDeadlockedThreads();
-+ checkCount.incrementAndGet();
-+ ids = ids == null ? new long[0] : ids;
-+ if (ids.length == 1) {
-+ throw new RuntimeException("Found 1 deadlocked thread: "+ids[0]);
-+ } else if (ids.length > 0) {
-+ ThreadInfo[] infos = ManagementFactory.getThreadMXBean().getThreadInfo(ids);
-+ System.err.println("Found "+ids.length+" deadlocked threads: ");
-+ for (ThreadInfo inf : infos) {
-+ System.err.println(inf.toString());
-+ }
-+ throw new RuntimeException("Found "+ids.length+" deadlocked threads");
-+ }
-+ Thread.sleep(100);
-+ } catch(InterruptedException | RuntimeException x) {
-+ fail(x);
-+ }
-+ }
-+ }
-+
-+ }
-+
-+ static final class Stopper extends Thread {
-+ long start;
-+ long time;
-+
-+ Stopper(long time) {
-+ start = System.currentTimeMillis();
-+ this.time = time;
-+ }
-+
-+ @Override
-+ public void run() {
-+ try {
-+ long rest, previous;
-+ previous = time;
-+ while (goOn && (rest = start - System.currentTimeMillis() + time) > 0) {
-+ if (previous == time || previous - rest >= STEP) {
-+ Logger.getLogger("remaining").info(String.valueOf(rest)+"ms remaining...");
-+ previous = rest == time ? rest -1 : rest;
-+ System.gc();
-+ }
-+ if (goOn == false) break;
-+ Thread.sleep(Math.min(rest, 100));
-+ }
-+ System.out.println(System.currentTimeMillis() - start
-+ + " ms elapsed ("+time+ " requested)");
-+ goOn = false;
-+ } catch(InterruptedException | RuntimeException x) {
-+ fail(x);
-+ }
-+ }
-+
-+ }
-+
-+ static void fail(Exception x) {
-+ x.printStackTrace();
-+ if (thrown == null) {
-+ thrown = x;
-+ }
-+ goOn = false;
-+ }
-+}
---- ./jdk/test/java/util/logging/TestLoggingWithMainAppContext.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/util/logging/TestLoggingWithMainAppContext.java 2014-07-15 21:49:29.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-07-15 21:49:29.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/java/util/logging/bundlesearch/ResourceBundleSearchTest.java 2013-09-06 11:29:51.000000000 -0700
-+++ ./jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java 2014-07-15 21:49:29.000000000 -0700
-@@ -59,9 +59,32 @@
- private static int numFail = 0;
- private static List<String> msgs = new ArrayList<>();
-
-+ // This test has been falling in timeout - so we're adding some
-+ // time stamp here and there to help diagnose whether it's a
-+ // simple system slowness or whether there's a deeper issue,
-+ // like a deadlock. The timeout issue should be fixed now,
-+ // but we leave the time stamps in case it reappears.
-+ //
-+ static final long stamp = System.currentTimeMillis();
-+ private static String getTimeStamp() {
-+ long time = System.currentTimeMillis();
-+ long delta = time - stamp;
-+ long min = delta/60000;
-+ long sec = (delta - min * 60000) / 10000;
-+ long msec = delta - min * 60000 - sec * 1000;
-+ return (min == 0 ? "" : (min + " min. ")) +
-+ (sec == 0 ? "" : (sec + " sec. ")) +
-+ (msec == 0 ? "" : (msec + "ms."));
-+ }
-+
- public static void main(String[] args) throws Throwable {
-+ System.out.println("ResourceBundleSearchTest starting: "+getTimeStamp());
- ResourceBundleSearchTest test = new ResourceBundleSearchTest();
-- test.runTests();
-+ try {
-+ test.runTests();
-+ } finally {
-+ System.out.println("ResourceBundleSearchTest terminated: "+getTimeStamp());
-+ }
- }
-
- private void runTests() throws Throwable {
-@@ -82,7 +105,8 @@
- // Test 1 - can we find a Logger bundle from doing a stack search?
- // We shouldn't be able to
- // unless -Djdk.logging.allowStackWalkSearch=true is set
--
-+ int testnb = 1;
-+ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
- boolean allowStackWalkSearch = Boolean.getBoolean("jdk.logging.allowStackWalkSearch");
- if (allowStackWalkSearch) {
- assertTrue(testGetBundleFromStackSearch(), "1-testGetBundleFromStackSearch");
-@@ -93,6 +117,7 @@
-
- // Test 2 - can we find a Logger bundle off of the Thread context class
- // loader? We should be able to.
-+ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
- assertTrue(testGetBundleFromTCCL(TCCL_TEST_BUNDLE, rbClassLoader),
- "2-testGetBundleFromTCCL");
-
-@@ -100,6 +125,7 @@
- // able to. We'll first check to make sure the setup is correct and
- // it actually is on the classpath before checking whether logging
- // can see it there.
-+ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
- if (isOnClassPath(PROP_RB_NAME, myClassLoader)) {
- debug("We should be able to see " + PROP_RB_NAME + " on the classpath");
- assertTrue(testGetBundleFromSystemClassLoader(PROP_RB_NAME),
-@@ -111,17 +137,20 @@
-
- // Test 4 - we should be able to find a bundle from the caller's
- // classloader, but only one level up.
-+ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
- assertTrue(testGetBundleFromCallersClassLoader(),
- "4-testGetBundleFromCallersClassLoader");
-
- // Test 5 - this ensures that getAnonymousLogger(String rbName)
- // can find the bundle from the caller's classloader
-+ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
- assertTrue(testGetAnonymousLogger(), "5-testGetAnonymousLogger");
-
- // Test 6 - first call getLogger("myLogger").
- // Then call getLogger("myLogger","bundleName") from a different ClassLoader
- // Make sure we find the bundle
- if (!allowStackWalkSearch) {
-+ System.out.println("ResourceBundleSearchTest starting test #"+(testnb++)+": "+getTimeStamp());
- assertTrue(testGetBundleFromSecondCallersClassLoader(),
- "6-testGetBundleFromSecondCallersClassLoader");
- }
-@@ -144,6 +173,7 @@
- public void assertTrue(boolean testResult, String testName) {
- if (testResult) {
- numPass++;
-+ System.out.println("PASSED: " + testName);
- } else {
- numFail++;
- System.out.println("FAILED: " + testName
-@@ -154,6 +184,7 @@
- public void assertFalse(boolean testResult, String testName) {
- if (!testResult) {
- numPass++;
-+ System.out.println("PASSED: " + testName);
- } else {
- numFail++;
- System.out.println("FAILED: " + testName
-@@ -182,12 +213,10 @@
- debug("Looking for " + bundleName + " using TCCL");
- LoggingThread lr = new LoggingThread(bundleName, setOnTCCL);
- lr.start();
-- synchronized (lr) {
-- try {
-- lr.wait();
-- } catch (InterruptedException ex) {
-- throw ex;
-- }
-+ try {
-+ lr.join();
-+ } catch (InterruptedException ex) {
-+ throw ex;
- }
- msgs.add(lr.msg);
- return lr.foundBundle;
---- ./jdk/test/java/util/logging/deadlockconf.properties 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/java/util/logging/deadlockconf.properties 2014-07-15 21:49:29.000000000 -0700
-@@ -0,0 +1,22 @@
-+# This file is used by TestLogConfigurationDeadLockWithConf
-+handlers= java.util.logging.ConsoleHandler
-+.level= INFO
-+java.util.logging.ConsoleHandler.level = INFO
-+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-+
-+
-+foo.bar0.level = INFO
-+foo.bar1.level = INFO
-+foo.bar2.level = INFO
-+foo.bar3.level = INFO
-+foo.bar4.level = INFO
-+
-+# We leave foo.bar5 out so that we have at least
-+# one logger whose parent won't be in the configuration
-+# file
-+#foo.bar5.level = INFO
-+
-+foo.bar6.level = INFO
-+foo.bar7.level = INFO
-+foo.bar8.level = INFO
-+foo.bar9.level = INFO
---- ./jdk/test/javax/crypto/Cipher/CipherStreamClose.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/crypto/Cipher/CipherStreamClose.java 2014-10-28 20:19:47.000000000 -0700
-@@ -0,0 +1,167 @@
-+/*
-+ * 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 7160837
-+ * @summary Make sure Cipher IO streams doesn't call extra doFinal if close()
-+ * is called multiple times. Additionally, verify the input and output streams
-+ * match with encryption and decryption with non-stream crypto.
-+ */
-+
-+import java.io.*;
-+import java.security.DigestOutputStream;
-+import java.security.DigestInputStream;
-+import java.security.MessageDigest;
-+import java.util.Arrays;
-+
-+import javax.crypto.Cipher;
-+import javax.crypto.CipherOutputStream;
-+import javax.crypto.CipherInputStream;
-+import javax.crypto.SecretKey;
-+import javax.crypto.spec.SecretKeySpec;
-+import javax.xml.bind.DatatypeConverter;
-+
-+public class CipherStreamClose {
-+ private static final String message = "This is the sample message";
-+ static boolean debug = false;
-+
-+ /*
-+ * This method does encryption by cipher.doFinal(), and not with
-+ * CipherOutputStream
-+ */
-+ public static byte[] blockEncrypt(String message, SecretKey key)
-+ throws Exception {
-+
-+ byte[] data;
-+ Cipher encCipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-+ encCipher.init(Cipher.ENCRYPT_MODE, key);
-+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
-+ try (ObjectOutputStream oos = new ObjectOutputStream(bos)) {
-+ oos.writeObject(message);
-+ }
-+ data = bos.toByteArray();
-+ }
-+
-+ if (debug) {
-+ System.out.println(DatatypeConverter.printHexBinary(data));
-+ }
-+ return encCipher.doFinal(data);
-+
-+ }
-+
-+ /*
-+ * This method does decryption by cipher.doFinal(), and not with
-+ * CipherIntputStream
-+ */
-+ public static Object blockDecrypt(byte[] data, SecretKey key)
-+ throws Exception {
-+
-+ Cipher c = Cipher.getInstance("AES/ECB/PKCS5Padding");
-+ c.init(Cipher.DECRYPT_MODE, key);
-+ data = c.doFinal(data);
-+ try (ByteArrayInputStream bis = new ByteArrayInputStream(data)) {
-+ try (ObjectInputStream ois = new ObjectInputStream(bis)) {
-+ return ois.readObject();
-+ }
-+ }
-+ }
-+
-+ public static byte[] streamEncrypt(String message, SecretKey key,
-+ MessageDigest digest)
-+ throws Exception {
-+
-+ byte[] data;
-+ Cipher encCipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-+ encCipher.init(Cipher.ENCRYPT_MODE, key);
-+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
-+ DigestOutputStream dos = new DigestOutputStream(bos, digest);
-+ CipherOutputStream cos = new CipherOutputStream(dos, encCipher)) {
-+ try (ObjectOutputStream oos = new ObjectOutputStream(cos)) {
-+ oos.writeObject(message);
-+ }
-+ data = bos.toByteArray();
-+ }
-+
-+ if (debug) {
-+ System.out.println(DatatypeConverter.printHexBinary(data));
-+ }
-+ return data;
-+ }
-+
-+ public static Object streamDecrypt(byte[] data, SecretKey key,
-+ MessageDigest digest) throws Exception {
-+
-+ Cipher decCipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-+ decCipher.init(Cipher.DECRYPT_MODE, key);
-+ digest.reset();
-+ try (ByteArrayInputStream bis = new ByteArrayInputStream(data);
-+ DigestInputStream dis = new DigestInputStream(bis, digest);
-+ CipherInputStream cis = new CipherInputStream(dis, decCipher)) {
-+
-+ try (ObjectInputStream ois = new ObjectInputStream(cis)) {
-+ return ois.readObject();
-+ }
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ MessageDigest digest = MessageDigest.getInstance("SHA1");
-+ SecretKeySpec key = new SecretKeySpec(
-+ DatatypeConverter.parseHexBinary(
-+ "12345678123456781234567812345678"), "AES");
-+
-+ // Run 'message' through streamEncrypt
-+ byte[] se = streamEncrypt(message, key, digest);
-+ // 'digest' already has the value from the stream, just finish the op
-+ byte[] sd = digest.digest();
-+ digest.reset();
-+ // Run 'message' through blockEncrypt
-+ byte[] be = blockEncrypt(message, key);
-+ // Take digest of encrypted blockEncrypt result
-+ byte[] bd = digest.digest(be);
-+ // Verify both returned the same value
-+ if (!Arrays.equals(sd, bd)) {
-+ System.err.println("Stream: "+DatatypeConverter.printHexBinary(se)+
-+ "\t Digest: "+DatatypeConverter.printHexBinary(sd));
-+ System.err.println("Block : "+DatatypeConverter.printHexBinary(be)+
-+ "\t Digest: "+DatatypeConverter.printHexBinary(bd));
-+ throw new Exception("stream & block encryption does not match");
-+ }
-+
-+ digest.reset();
-+ // Sanity check: Decrypt separately from stream to verify operations
-+ String bm = (String) blockDecrypt(be, key);
-+ if (message.compareTo(bm) != 0) {
-+ System.err.println("Expected: "+message+"\nBlock: "+bm);
-+ throw new Exception("Block decryption does not match expected");
-+ }
-+
-+ // Have decryption and digest included in the object stream
-+ String sm = (String) streamDecrypt(se, key, digest);
-+ if (message.compareTo(sm) != 0) {
-+ System.err.println("Expected: "+message+"\nStream: "+sm);
-+ throw new Exception("Stream decryption does not match expected.");
-+ }
-+ }
-+}
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2013-09-06 11:29:52.000000000 -0700
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -51,7 +51,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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 2014-07-15 21:49:30.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /**
- * @test
-- * @bug 8020983
-+ * @bug 8020983 8024697
- * @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-07-15 21:49:30.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-10-28 20:19:52.000000000 -0700
-@@ -84,7 +84,7 @@
- TMP="/tmp"
- ;;
-
-- Linux )
-+ Linux | *BSD | Darwin )
- VAR="A different value for Linux"
- DEFAULT_JDK=/
- FILESEP="/"
-@@ -92,14 +92,6 @@
- TMP="/tmp"
- ;;
-
-- Darwin )
-- VAR="A different value for MacOSX"
-- DEFAULT_JDK=/usr
-- FILESEP="/"
-- PATHSEP=":"
-- TMP="/tmp"
-- ;;
--
- Windows* )
- VAR="A different value for Win32"
- DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
---- ./jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,216 @@
-+/*
-+ * 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 javax.management.MBeanAttributeInfo;
-+import javax.management.MBeanConstructorInfo;
-+import javax.management.MBeanFeatureInfo;
-+import javax.management.MBeanInfo;
-+import javax.management.MBeanNotificationInfo;
-+import javax.management.MBeanOperationInfo;
-+import javax.management.MBeanParameterInfo;
-+import javax.management.modelmbean.DescriptorSupport;
-+import javax.management.openmbean.SimpleType;
-+
-+/*
-+ * @test
-+ * @bug 8023954
-+ * @summary Test that MBean*Info.equals do not throw NPE
-+ * @author Shanliang JIANG
-+ * @run clean MBeanInfoEqualsNPETest
-+ * @run build MBeanInfoEqualsNPETest
-+ * @run main MBeanInfoEqualsNPETest
-+ */
-+public class MBeanInfoEqualsNPETest {
-+ private static int failed = 0;
-+
-+ public static void main(String[] args) throws Exception {
-+ System.out.println("---MBeanInfoEqualsNPETest-main ...");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanAttributeInfo...");
-+ MBeanAttributeInfo mbeanAttributeInfo0 = new MBeanAttributeInfo(
-+ "name", SimpleType.INTEGER.getClassName(), "description", true, true, false);
-+ MBeanAttributeInfo mbeanAttributeInfo = new MBeanAttributeInfo(
-+ null, SimpleType.INTEGER.getClassName(), "description", true, true, false);
-+ test(mbeanAttributeInfo0, mbeanAttributeInfo, "class name");
-+
-+ mbeanAttributeInfo = new MBeanAttributeInfo(
-+ "name", null, "description", true, true, false);
-+ test(mbeanAttributeInfo0, mbeanAttributeInfo, "type");
-+
-+ mbeanAttributeInfo = new MBeanAttributeInfo(
-+ "name", SimpleType.INTEGER.getClassName(), null, true, true, false);
-+ test(mbeanAttributeInfo0, mbeanAttributeInfo, "description");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanConstructorInfo...");
-+ MBeanConstructorInfo mbeanConstructorInfo0 = new MBeanConstructorInfo(
-+ "", "", new MBeanParameterInfo[]{}, new DescriptorSupport());
-+ MBeanConstructorInfo mbeanConstructorInfo = new MBeanConstructorInfo(
-+ null, "", new MBeanParameterInfo[]{}, new DescriptorSupport());
-+ test(mbeanConstructorInfo0, mbeanConstructorInfo, "name");
-+
-+ mbeanConstructorInfo = new MBeanConstructorInfo(
-+ "", null, new MBeanParameterInfo[]{}, new DescriptorSupport());
-+ test(mbeanConstructorInfo0, mbeanConstructorInfo, "description");
-+
-+ mbeanConstructorInfo = new MBeanConstructorInfo(
-+ "", "", null, new DescriptorSupport());
-+ test(mbeanConstructorInfo0, mbeanConstructorInfo, "MBeanParameterInfo");
-+
-+ mbeanConstructorInfo = new MBeanConstructorInfo(
-+ "", "", new MBeanParameterInfo[]{}, null);
-+ test(mbeanConstructorInfo0, mbeanConstructorInfo, "descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanOperationInfo...");
-+ MBeanOperationInfo mbeanOperationInfo0 = new MBeanOperationInfo(
-+ "name", "description", new MBeanParameterInfo[]{}, "type",
-+ MBeanOperationInfo.UNKNOWN, new DescriptorSupport());
-+
-+ MBeanOperationInfo mbeanOperationInfo = new MBeanOperationInfo(
-+ null, "description", new MBeanParameterInfo[]{}, "type",
-+ MBeanOperationInfo.UNKNOWN, new DescriptorSupport());
-+ test(mbeanOperationInfo0, mbeanOperationInfo, "name");
-+
-+ mbeanOperationInfo = new MBeanOperationInfo(
-+ "name", null, new MBeanParameterInfo[]{}, "type",
-+ MBeanOperationInfo.UNKNOWN, new DescriptorSupport());
-+ test(mbeanOperationInfo0, mbeanOperationInfo, "description");
-+
-+ mbeanOperationInfo = new MBeanOperationInfo(
-+ "name", "description", null, "type", 1, new DescriptorSupport());
-+ test(mbeanOperationInfo0, mbeanOperationInfo, "MBeanParameterInfo");
-+
-+ mbeanOperationInfo = new MBeanOperationInfo(
-+ "name", "description", new MBeanParameterInfo[]{}, null,
-+ MBeanOperationInfo.UNKNOWN, new DescriptorSupport());
-+ test(mbeanOperationInfo0, mbeanOperationInfo, "type");
-+
-+ mbeanOperationInfo = new MBeanOperationInfo(
-+ "name", "description", new MBeanParameterInfo[]{}, null,
-+ MBeanOperationInfo.UNKNOWN, null);
-+ test(mbeanOperationInfo0, mbeanOperationInfo, "Descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanParameterInfo...");
-+ MBeanParameterInfo mbeanParameterInfo0 = new MBeanParameterInfo(
-+ "name", "type", "description", new DescriptorSupport());
-+ MBeanParameterInfo mbeanParameterInfo = new MBeanParameterInfo(
-+ null, "type", "description", new DescriptorSupport());
-+ test(mbeanParameterInfo0, mbeanParameterInfo, "name");
-+
-+ mbeanParameterInfo = new MBeanParameterInfo(
-+ "name", null, "description", new DescriptorSupport());
-+ test(mbeanParameterInfo0, mbeanParameterInfo, "type");
-+
-+ mbeanParameterInfo = new MBeanParameterInfo(
-+ "name", "type", null, new DescriptorSupport());
-+ test(mbeanParameterInfo0, mbeanParameterInfo, "description");
-+
-+ mbeanParameterInfo = new MBeanParameterInfo(
-+ "name", "type", "description", null);
-+ test(mbeanParameterInfo0, mbeanParameterInfo, "Descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanFeatureInfo ...");
-+ MBeanFeatureInfo mbeanFeatureInfo0 = new MBeanFeatureInfo(
-+ "name", "description", new DescriptorSupport());
-+ MBeanFeatureInfo mbeanFeatureInfo = new MBeanFeatureInfo(
-+ null, "description", new DescriptorSupport());
-+ test(mbeanFeatureInfo0, mbeanFeatureInfo, "name");
-+
-+ mbeanFeatureInfo = new MBeanFeatureInfo(
-+ "name", null, new DescriptorSupport());
-+ test(mbeanParameterInfo0, mbeanParameterInfo, "description");
-+
-+ mbeanFeatureInfo = new MBeanFeatureInfo(
-+ "name", "description", null);
-+ test(mbeanParameterInfo0, mbeanParameterInfo, "Descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanInfo...");
-+ String className = "toto";
-+ String description = "titi";
-+ MBeanAttributeInfo[] attrInfos = new MBeanAttributeInfo[]{};
-+ MBeanConstructorInfo[] constrInfos = new MBeanConstructorInfo[]{};
-+ MBeanOperationInfo[] operaInfos = new MBeanOperationInfo[]{};
-+ MBeanNotificationInfo[] notifInfos = new MBeanNotificationInfo[]{};
-+
-+ MBeanInfo minfo0 = new MBeanInfo("toto", description, attrInfos, constrInfos, operaInfos, notifInfos);
-+ MBeanInfo minfo = new MBeanInfo(null, description, attrInfos, constrInfos, operaInfos, notifInfos);
-+ test(minfo0, minfo, "class name");
-+
-+ minfo = new MBeanInfo(className, null, attrInfos, constrInfos, operaInfos, notifInfos);
-+ test(minfo0, minfo, "description");
-+
-+ minfo = new MBeanInfo(className, description, null, constrInfos, operaInfos, notifInfos);
-+ test(minfo0, minfo, "attrInfos");
-+
-+ minfo = new MBeanInfo(className, description, attrInfos, null, operaInfos, notifInfos);
-+ test(minfo0, minfo, "constrInfos");
-+
-+ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, null, notifInfos);
-+ test(minfo0, minfo, "operaInfos");
-+
-+ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, operaInfos, null);
-+ test(minfo0, minfo, "notifInfos");
-+
-+ if (failed > 0) {
-+ throw new RuntimeException("Test failed: "+failed);
-+ } else {
-+ System.out.println("---Test: PASSED");
-+ }
-+ }
-+
-+ private static void test(Object obj1, Object obj2, String param) {
-+ try {
-+ obj1.equals(obj2);
-+ System.out.println("OK-1: "+obj1.getClass().getSimpleName()+".equals worked with a null paramer: "+param);
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO-1!!! "+obj1.getClass().getSimpleName()+".equals got NPE with a null paramer: "+param);
-+ npe.printStackTrace();
-+ failed++;
-+ }
-+
-+ try {
-+ obj2.equals(obj1);
-+ System.out.println("OK-2: "+obj2.getClass().getSimpleName()+".equals worked with a null paramer: "+param);
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO-2!!! "+obj2.getClass().getSimpleName()+".equals got NPE with a null paramer: "+param);
-+ npe.printStackTrace();
-+ failed++;
-+ }
-+
-+ try {
-+ obj1.equals(null);
-+ obj2.equals(null);
-+
-+ System.out.println("OK-3: "+obj1.getClass().getSimpleName()+".equals worked with a null field.");
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO-3!!! "+obj1.getClass().getSimpleName()+".equals got NPE with a null field.");
-+ npe.printStackTrace();
-+ failed++;
-+ }
-+ }
-+}
---- ./jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,176 @@
-+/*
-+ * 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 javax.management.MBeanAttributeInfo;
-+import javax.management.MBeanConstructorInfo;
-+import javax.management.MBeanInfo;
-+import javax.management.MBeanNotificationInfo;
-+import javax.management.MBeanOperationInfo;
-+import javax.management.MBeanParameterInfo;
-+import javax.management.modelmbean.DescriptorSupport;
-+import javax.management.openmbean.SimpleType;
-+
-+/*
-+ * @test
-+ * @bug 8023669
-+ * @summary Test that hashCode()throws NullPointerException
-+ * @author Shanliang JIANG
-+ * @run clean MBeanInfoHashCodeNPETest
-+ * @run build MBeanInfoHashCodeNPETest
-+ * @run main MBeanInfoHashCodeNPETest
-+ */
-+public class MBeanInfoHashCodeNPETest {
-+ private static int failed = 0;
-+
-+ public static void main(String[] args) throws Exception {
-+ System.out.println("---MBeanInfoHashCodeNPETest-main ...");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanAttributeInfo...");
-+ MBeanAttributeInfo mbeanAttributeInfo = new MBeanAttributeInfo(
-+ null, SimpleType.INTEGER.getClassName(), "description", true, true, false);
-+ test(mbeanAttributeInfo, "class name");
-+
-+ mbeanAttributeInfo = new MBeanAttributeInfo(
-+ "name", null, "description", true, true, false);
-+ test(mbeanAttributeInfo, "type");
-+
-+ mbeanAttributeInfo = new MBeanAttributeInfo(
-+ "name", SimpleType.INTEGER.getClassName(), null, true, true, false);
-+ test(mbeanAttributeInfo, "description");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanConstructorInfo...");
-+ MBeanConstructorInfo mbeanConstructorInfo = new MBeanConstructorInfo(
-+ null, "", new MBeanParameterInfo[]{}, new DescriptorSupport());
-+ test(mbeanConstructorInfo, "name");
-+
-+ mbeanConstructorInfo = new MBeanConstructorInfo(
-+ "", null, new MBeanParameterInfo[]{}, new DescriptorSupport());
-+ test(mbeanConstructorInfo, "description");
-+
-+ mbeanConstructorInfo = new MBeanConstructorInfo(
-+ "", "", null, new DescriptorSupport());
-+ test(mbeanConstructorInfo, "MBeanParameterInfo");
-+
-+ mbeanConstructorInfo = new MBeanConstructorInfo(
-+ "", "", new MBeanParameterInfo[]{}, null);
-+ test(mbeanConstructorInfo, "descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanOperationInfo...");
-+ MBeanOperationInfo mbeanOperationInfo = new MBeanOperationInfo(
-+ null, "description", new MBeanParameterInfo[]{}, "type", 1, new DescriptorSupport());
-+ test(mbeanOperationInfo, "name");
-+
-+ mbeanOperationInfo = new MBeanOperationInfo(
-+ "name", null, new MBeanParameterInfo[]{}, "type", 1, new DescriptorSupport());
-+ test(mbeanOperationInfo, "description");
-+
-+ mbeanOperationInfo = new MBeanOperationInfo(
-+ "name", "description", null, "type", 1, new DescriptorSupport());
-+ test(mbeanOperationInfo, "MBeanParameterInfo");
-+
-+ mbeanOperationInfo = new MBeanOperationInfo(
-+ "name", "description", new MBeanParameterInfo[]{}, null, 1, new DescriptorSupport());
-+ test(mbeanOperationInfo, "type");
-+
-+ mbeanOperationInfo = new MBeanOperationInfo(
-+ "name", "description", new MBeanParameterInfo[]{}, "type", -1, new DescriptorSupport());
-+ test(mbeanOperationInfo, "native impact");
-+
-+ mbeanOperationInfo = new MBeanOperationInfo(
-+ "name", "description", new MBeanParameterInfo[]{}, "type", 1, null);
-+ test(mbeanOperationInfo, "Descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanParameterInfo...");
-+ MBeanParameterInfo mbeanParameterInfo = new MBeanParameterInfo(
-+ null, "type", "description", new DescriptorSupport());
-+ test(mbeanParameterInfo, "name");
-+
-+ mbeanParameterInfo = new MBeanParameterInfo(
-+ "name", null, "description", new DescriptorSupport());
-+ test(mbeanParameterInfo, "description");
-+
-+ mbeanParameterInfo = new MBeanParameterInfo(
-+ "name", "type", null, new DescriptorSupport());
-+ test(mbeanParameterInfo, "description");
-+
-+ mbeanParameterInfo = new MBeanParameterInfo(
-+ "name", "type", "description", null);
-+ test(mbeanParameterInfo, "Descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on MBeanInfo...");
-+ String className = "toto";
-+ String description = "titi";
-+ MBeanAttributeInfo[] attrInfos = new MBeanAttributeInfo[]{};
-+ MBeanConstructorInfo[] constrInfos = new MBeanConstructorInfo[]{};
-+ MBeanOperationInfo[] operaInfos = new MBeanOperationInfo[]{};
-+ MBeanNotificationInfo[] notifInfos = new MBeanNotificationInfo[]{};
-+
-+ MBeanInfo minfo = new MBeanInfo(null, description, attrInfos, constrInfos, operaInfos, notifInfos);
-+ test(minfo, "class name");
-+
-+ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, operaInfos, notifInfos);
-+ test(minfo, "name");
-+
-+ minfo = new MBeanInfo(className, null, attrInfos, constrInfos, operaInfos, notifInfos);
-+ test(minfo, "description");
-+
-+ minfo = new MBeanInfo(className, description, null, constrInfos, operaInfos, notifInfos);
-+ test(minfo, "attrInfos");
-+
-+ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, null, notifInfos);
-+ test(minfo, "operaInfos");
-+
-+ minfo = new MBeanInfo(className, description, attrInfos, constrInfos, operaInfos, null);
-+ test(minfo, "notifInfos");
-+
-+ Thread.sleep(100);
-+ if (failed > 0) {
-+ throw new RuntimeException("Test failed: "+failed);
-+ } else {
-+ System.out.println("---Test: PASSED");
-+ }
-+ }
-+
-+ private static void test(Object obj, String param) {
-+ try {
-+ obj.hashCode();
-+ System.out.println("OK: "+obj.getClass().getSimpleName()+".hashCode worked with a null "+param);
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO!!! "+obj.getClass().getSimpleName()+".hashCode got NPE with a null "+param);
-+ failed++;
-+ }
-+
-+ try {
-+ obj.toString();
-+ System.out.println("OK: "+obj.getClass().getSimpleName()+".toString worked with a null "+param);
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO!!! "+obj.getClass().getSimpleName()+".toString got NPE.");
-+ failed++;
-+ }
-+ }
-+}
---- ./jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java 2013-09-06 11:29:53.000000000 -0700
-+++ ./jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 6229368
-+ * @bug 6229368 8025207
- * @summary Wrong threshold value in CounterMonitor with offset and modulus.
- * @author Luis-Miguel Alventosa
- * @run clean CounterMonitorThresholdTest
-@@ -144,16 +144,14 @@
- for (int i = 0; i < counter.length; i++) {
- mbean.setCounter(counter[i]);
- System.out.println("\nCounter = " + mbean.getCounter());
-- Thread.sleep(300);
-- Integer derivedGaugeValue = (Integer) cm.getDerivedGauge(name);
-- System.out.println("Derived Gauge = " + derivedGaugeValue);
-- if (derivedGaugeValue.intValue() != derivedGauge[i]) {
-- System.out.println("Wrong derived gauge! Current value = " +
-- derivedGaugeValue + " Expected value = " + derivedGauge[i]);
-- System.out.println("\nStop monitoring...");
-- cm.stop();
-- throw new IllegalArgumentException("wrong derived gauge");
-- }
-+ Integer derivedGaugeValue;
-+ // either pass or test timeout (killed by test harness)
-+ // see 8025207
-+ do {
-+ Thread.sleep(150);
-+ derivedGaugeValue = (Integer) cm.getDerivedGauge(name);
-+ } while (derivedGaugeValue.intValue() != derivedGauge[i]);
-+
- Number thresholdValue = cm.getThreshold(name);
- System.out.println("Threshold = " + thresholdValue);
- if (thresholdValue.intValue() != threshold[i]) {
-@@ -163,7 +161,6 @@
- cm.stop();
- throw new IllegalArgumentException("wrong threshold");
- }
-- Thread.sleep(300);
- }
-
- // Stop the monitor
---- ./jdk/test/javax/management/monitor/NullAttributeValueTest.java 2013-09-06 11:29:53.000000000 -0700
-+++ ./jdk/test/javax/management/monitor/NullAttributeValueTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -23,11 +23,12 @@
-
- /*
- * @test
-- * @bug 6200031
-+ * @bug 6200031 8025206
- * @summary Test that the counter/gauge/string monitors emit a
- * jmx.monitor.error.type notification when the attribute
- * being monitored returns a null value.
- * @author Luis-Miguel Alventosa
-+ * @author Shanliang JIANG
- * @run clean NullAttributeValueTest
- * @run build NullAttributeValueTest
- * @run main NullAttributeValueTest
-@@ -39,7 +40,7 @@
- public class NullAttributeValueTest implements NotificationListener {
-
- // Flag to notify that a message has been received
-- private boolean messageReceived = false;
-+ private volatile boolean messageReceived = false;
-
- // MBean class
- public class ObservedObject implements ObservedObjectMBean {
-@@ -83,7 +84,6 @@
- * Update the counter and check for notifications
- */
- public int counterMonitorNotification() throws Exception {
--
- CounterMonitor counterMonitor = null;
- try {
- MBeanServer server = MBeanServerFactory.newMBeanServer();
-@@ -134,31 +134,17 @@
- echo(">>> START the CounterMonitor");
- counterMonitor.start();
-
-- // Wait for granularity period (multiplied by 2 for sure)
-- //
-- Thread.sleep(granularityperiod * 2);
--
-- // Check if notification was received
-- //
-- if (messageReceived) {
-- echo("\tOK: CounterMonitor notification received");
-- } else {
-- echo("\tKO: CounterMonitor notification missed or not emitted");
-- return 1;
-- }
-+ return checkReceived(granularityperiod, "CounterMonitor");
- } finally {
- if (counterMonitor != null)
- counterMonitor.stop();
- }
--
-- return 0;
- }
-
- /**
- * Update the gauge and check for notifications
- */
- public int gaugeMonitorNotification() throws Exception {
--
- GaugeMonitor gaugeMonitor = null;
- try {
- MBeanServer server = MBeanServerFactory.newMBeanServer();
-@@ -212,31 +198,17 @@
- echo(">>> START the GaugeMonitor");
- gaugeMonitor.start();
-
-- // Wait for granularity period (multiplied by 2 for sure)
-- //
-- Thread.sleep(granularityperiod * 2);
--
-- // Check if notification was received
-- //
-- if (messageReceived) {
-- echo("\tOK: GaugeMonitor notification received");
-- } else {
-- echo("\tKO: GaugeMonitor notification missed or not emitted");
-- return 1;
-- }
-+ return checkReceived(granularityperiod, "GaugeMonitor");
- } finally {
- if (gaugeMonitor != null)
- gaugeMonitor.stop();
- }
--
-- return 0;
- }
-
- /**
- * Update the string and check for notifications
- */
- public int stringMonitorNotification() throws Exception {
--
- StringMonitor stringMonitor = null;
- try {
- MBeanServer server = MBeanServerFactory.newMBeanServer();
-@@ -289,24 +261,11 @@
- echo(">>> START the StringMonitor");
- stringMonitor.start();
-
-- // Wait for granularity period (multiplied by 2 for sure)
-- //
-- Thread.sleep(granularityperiod * 2);
--
-- // Check if notification was received
-- //
-- if (messageReceived) {
-- echo("\tOK: StringMonitor notification received");
-- } else {
-- echo("\tKO: StringMonitor notification missed or not emitted");
-- return 1;
-- }
-+ return checkReceived(granularityperiod, "StringMonitor");
- } finally {
- if (stringMonitor != null)
- stringMonitor.stop();
- }
--
-- return 0;
- }
-
- /**
-@@ -326,6 +285,21 @@
- return error;
- }
-
-+ private int checkReceived(long granularityperiod, String caller) throws InterruptedException {
-+ int i = 100;
-+ do {
-+ Thread.sleep(granularityperiod);
-+ } while (!messageReceived && i-- > 0);
-+
-+ if (messageReceived) {
-+ echo("\tOK: " + caller + " notification received");
-+ } else {
-+ echo("\tKO: " + caller + " notification missed or not emitted");
-+ }
-+
-+ return messageReceived ? 0 : 1;
-+ }
-+
- /*
- * Print message
- */
---- ./jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,196 @@
-+/*
-+ * 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 javax.management.MBeanNotificationInfo;
-+import javax.management.MBeanOperationInfo;
-+import javax.management.modelmbean.DescriptorSupport;
-+import javax.management.openmbean.OpenMBeanAttributeInfo;
-+import javax.management.openmbean.OpenMBeanAttributeInfoSupport;
-+import javax.management.openmbean.OpenMBeanConstructorInfo;
-+import javax.management.openmbean.OpenMBeanConstructorInfoSupport;
-+import javax.management.openmbean.OpenMBeanInfo;
-+import javax.management.openmbean.OpenMBeanInfoSupport;
-+import javax.management.openmbean.OpenMBeanOperationInfo;
-+import javax.management.openmbean.OpenMBeanOperationInfoSupport;
-+import javax.management.openmbean.OpenMBeanParameterInfo;
-+import javax.management.openmbean.OpenMBeanParameterInfoSupport;
-+import javax.management.openmbean.SimpleType;
-+
-+/*
-+ * @test
-+ * @bug 8023529
-+ * @summary Test that OpenMBean*Info.equals do not throw NPE
-+ * @author Shanliang JIANG
-+ * @run clean OpenMBeanInfoEqualsNPETest
-+ * @run build OpenMBeanInfoEqualsNPETest
-+ * @run main OpenMBeanInfoEqualsNPETest
-+ */
-+public class OpenMBeanInfoEqualsNPETest {
-+ private static int failed = 0;
-+
-+ public static void main(String[] args) throws Exception {
-+ System.out.println("---OpenMBeanInfoEqualsNPETest-main ...");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanAttributeInfoSupport...");
-+ OpenMBeanAttributeInfo openMBeanAttributeInfo0 = new OpenMBeanAttributeInfoSupport(
-+ "name", "description", SimpleType.INTEGER, true, true, false, 1, new Integer[]{1, 2, 3});
-+ OpenMBeanAttributeInfo openMBeanAttributeInfo = new OpenMBeanAttributeInfoSupport(
-+ "name", "description", SimpleType.INTEGER, true, true, false, null, new Integer[]{1, 2, 3});
-+ test(openMBeanAttributeInfo0, openMBeanAttributeInfo, "defaultValue");
-+
-+ openMBeanAttributeInfo = new OpenMBeanAttributeInfoSupport(
-+ "name", "description", SimpleType.INTEGER, true, true, false, 1, null);
-+ test(openMBeanAttributeInfo0, openMBeanAttributeInfo, "legalValues");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanConstructorInfoSupport...");
-+ OpenMBeanConstructorInfo openMBeanConstructorInfo0 = new OpenMBeanConstructorInfoSupport(
-+ "name", "description", new OpenMBeanParameterInfo[]{}, new DescriptorSupport());
-+ OpenMBeanConstructorInfo openMBeanConstructorInfo;
-+
-+ openMBeanConstructorInfo = new OpenMBeanConstructorInfoSupport(
-+ "name", "description", null, new DescriptorSupport());
-+ test(openMBeanConstructorInfo0, openMBeanConstructorInfo, "sigs");
-+
-+ openMBeanConstructorInfo = new OpenMBeanConstructorInfoSupport(
-+ "name", "description", new OpenMBeanParameterInfo[]{}, null);
-+ test(openMBeanConstructorInfo0, openMBeanConstructorInfo, "Descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanOperationInfoSupport...");
-+ OpenMBeanOperationInfo openMBeanOperationInfo0 = new OpenMBeanOperationInfoSupport(
-+ "name", "description", new OpenMBeanParameterInfo[]{}, SimpleType.INTEGER, 1, new DescriptorSupport());
-+ OpenMBeanOperationInfo openMBeanOperationInfo;
-+
-+ openMBeanOperationInfo = new OpenMBeanOperationInfoSupport(
-+ "name", "description", null, SimpleType.INTEGER, 1, new DescriptorSupport());
-+ test(openMBeanOperationInfo0, openMBeanOperationInfo, "sigs");
-+
-+ openMBeanOperationInfo = new OpenMBeanOperationInfoSupport(
-+ "name", "description", new OpenMBeanParameterInfo[]{}, SimpleType.INTEGER, MBeanOperationInfo.UNKNOWN, null);
-+ test(openMBeanOperationInfo0, openMBeanOperationInfo, "Descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanParameterInfoSupport 1...");
-+ OpenMBeanParameterInfo openMBeanParameterInfo0 = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, 0, -1, 1);
-+ OpenMBeanParameterInfo openMBeanParameterInfo;
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, null, -1, 1);
-+ test(openMBeanParameterInfo0, openMBeanParameterInfo, "default value");
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, 0, null, 1);
-+ test(openMBeanParameterInfo0, openMBeanParameterInfo, "min value");
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, 0, -1, null);
-+ test(openMBeanParameterInfo0, openMBeanParameterInfo, "max value");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanParameterInfoSupport 2...");
-+ openMBeanParameterInfo0 = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, 1, new Integer[]{-1, 1, 2});
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, null, new Integer[]{-1, 1, 2});
-+ test(openMBeanParameterInfo0, openMBeanParameterInfo, "default value");
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, 1, null);
-+ test(openMBeanParameterInfo0, openMBeanParameterInfo, "legal values");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanInfoSupport...");
-+ String className = "toto";
-+ String description = "titi";
-+ OpenMBeanAttributeInfo[] attrInfos = new OpenMBeanAttributeInfo[]{};
-+ OpenMBeanConstructorInfo[] constrInfos = new OpenMBeanConstructorInfo[]{};
-+ OpenMBeanOperationInfo[] operaInfos = new OpenMBeanOperationInfo[]{};
-+ MBeanNotificationInfo[] notifInfos = new MBeanNotificationInfo[]{};
-+
-+ OpenMBeanInfo ominfo0 = new OpenMBeanInfoSupport("toto", description, attrInfos, constrInfos, operaInfos, notifInfos);
-+ OpenMBeanInfo ominfo = new OpenMBeanInfoSupport(null, description, attrInfos, constrInfos, operaInfos, notifInfos);
-+ test(ominfo0, ominfo, "class name");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, null, attrInfos, constrInfos, operaInfos, notifInfos);
-+ test(ominfo0, ominfo, "description");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, description, null, constrInfos, operaInfos, notifInfos);
-+ test(ominfo0, ominfo, "attrInfos");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, null, operaInfos, notifInfos);
-+ test(ominfo0, ominfo, "constructor infos");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, constrInfos, null, notifInfos);
-+ test(ominfo0, ominfo, "operation infos");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, constrInfos, operaInfos, null);
-+ test(ominfo0, ominfo, "notif infos");
-+
-+ if (failed > 0) {
-+ throw new RuntimeException("Test failed: "+failed);
-+ } else {
-+ System.out.println("---Test: PASSED");
-+ }
-+ }
-+
-+ private static void test(Object obj1, Object obj2, String param) {
-+ try {
-+ obj1.equals(obj2);
-+ System.out.println("OK-1: "+obj1.getClass().getSimpleName()+
-+ ".equals worked with a null field: "+param);
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO-1!!! "+obj1.getClass().getSimpleName()+
-+ ".equals got NPE with a null field: "+param);
-+ npe.printStackTrace();
-+ failed++;
-+ }
-+
-+ try {
-+ obj2.equals(obj1);
-+ System.out.println("OK-2: "+obj2.getClass().getSimpleName()+
-+ ".equals worked with a null field: "+param);
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO-2!!! "+obj2.getClass().getSimpleName()+
-+ ".equals got NPE with a null field: "+param);
-+ npe.printStackTrace();
-+ failed++;
-+ }
-+
-+ try {
-+ obj1.equals(null);
-+ obj2.equals(null);
-+
-+ System.out.println("OK-3: "+obj1.getClass().getSimpleName()+
-+ ".equals worked with a null object.");
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO-3!!! "+obj1.getClass().getSimpleName()+
-+ ".equals got NPE with a null object.");
-+ npe.printStackTrace();
-+ failed++;
-+ }
-+ }
-+}
---- ./jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,173 @@
-+/*
-+ * 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 javax.management.MBeanNotificationInfo;
-+import javax.management.modelmbean.DescriptorSupport;
-+import javax.management.openmbean.OpenMBeanAttributeInfo;
-+import javax.management.openmbean.OpenMBeanAttributeInfoSupport;
-+import javax.management.openmbean.OpenMBeanConstructorInfo;
-+import javax.management.openmbean.OpenMBeanConstructorInfoSupport;
-+import javax.management.openmbean.OpenMBeanInfo;
-+import javax.management.openmbean.OpenMBeanInfoSupport;
-+import javax.management.openmbean.OpenMBeanOperationInfo;
-+import javax.management.openmbean.OpenMBeanOperationInfoSupport;
-+import javax.management.openmbean.OpenMBeanParameterInfo;
-+import javax.management.openmbean.OpenMBeanParameterInfoSupport;
-+import javax.management.openmbean.SimpleType;
-+
-+/*
-+ * @test
-+ * @bug 8023529
-+ * @summary Test that OpenMBean*Info.hashCode do not throw NPE
-+ * @author Shanliang JIANG
-+ * @run clean OpenMBeanInfoHashCodeNPETest
-+ * @run build OpenMBeanInfoHashCodeNPETest
-+ * @run main OpenMBeanInfoHashCodeNPETest
-+ */
-+public class OpenMBeanInfoHashCodeNPETest {
-+ private static int failed = 0;
-+
-+ public static void main(String[] args) throws Exception {
-+ System.out.println("---OpenMBeanInfoHashCodeNPETest-main ...");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanInfohashCodeTest...");
-+ OpenMBeanAttributeInfo openMBeanAttributeInfo = new OpenMBeanAttributeInfoSupport(
-+ "name", "description", SimpleType.INTEGER, true, true, false, null, new Integer[]{1, 2, 3});
-+ test(openMBeanAttributeInfo, "defaultValue");
-+
-+ openMBeanAttributeInfo = new OpenMBeanAttributeInfoSupport(
-+ "name", "description", SimpleType.INTEGER, true, true, false, 1, null);
-+ test(openMBeanAttributeInfo, "legalValues");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanConstructorInfoSupport...");
-+ OpenMBeanConstructorInfo openMBeanConstructorInfo;
-+
-+ openMBeanConstructorInfo = new OpenMBeanConstructorInfoSupport(
-+ "name", "description", null, new DescriptorSupport());
-+ test(openMBeanConstructorInfo, "sigs");
-+
-+ openMBeanConstructorInfo = new OpenMBeanConstructorInfoSupport(
-+ "name", "description", new OpenMBeanParameterInfo[]{}, null);
-+ test(openMBeanConstructorInfo, "Descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanOperationInfoSupport...");
-+ OpenMBeanOperationInfo openMBeanOperationInfo;
-+
-+ openMBeanOperationInfo = new OpenMBeanOperationInfoSupport(
-+ "name", "description", null, SimpleType.INTEGER, 1, new DescriptorSupport());
-+ test(openMBeanOperationInfo, "sigs");
-+
-+ openMBeanOperationInfo = new OpenMBeanOperationInfoSupport(
-+ "name", "description", new OpenMBeanParameterInfo[]{}, SimpleType.INTEGER, 1, null);
-+ test(openMBeanOperationInfo, "Descriptor");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanParameterInfoSupport 1...");
-+ OpenMBeanParameterInfo openMBeanParameterInfo;
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, null, -1, 1);
-+ test(openMBeanParameterInfo, "default value");
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, 0, null, 1);
-+ test(openMBeanParameterInfo, "min value");
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, 0, -1, null);
-+ test(openMBeanParameterInfo, "max value");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanParameterInfoSupport 2...");
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, 1, new Integer[]{-1, 1, 2});
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, null, new Integer[]{-1, 1, 2});
-+ test(openMBeanParameterInfo, "default value");
-+
-+ openMBeanParameterInfo = new OpenMBeanParameterInfoSupport(
-+ "name", "description", SimpleType.INTEGER, 1, null);
-+ test(openMBeanParameterInfo, "legal values");
-+
-+ // ----
-+ System.out.println("\n---Testing on OpenMBeanInfoSupport...");
-+ String className = "toto";
-+ String description = "titi";
-+ OpenMBeanAttributeInfo[] attrInfos = new OpenMBeanAttributeInfo[]{};
-+ OpenMBeanConstructorInfo[] constrInfos = new OpenMBeanConstructorInfo[]{};
-+ OpenMBeanOperationInfo[] operaInfos = new OpenMBeanOperationInfo[]{};
-+ MBeanNotificationInfo[] notifInfos = new MBeanNotificationInfo[]{};
-+
-+ OpenMBeanInfo ominfo = new OpenMBeanInfoSupport(null, description, attrInfos, constrInfos, operaInfos, notifInfos);
-+ test(ominfo, "class name");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, null, attrInfos, constrInfos, operaInfos, notifInfos);
-+ test(ominfo, "description");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, description, null, constrInfos, operaInfos, notifInfos);
-+ test(ominfo, "attrInfos");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, null, operaInfos, notifInfos);
-+ test(ominfo, "constructor infos");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, constrInfos, null, notifInfos);
-+ test(ominfo, "operation infos");
-+
-+ ominfo = new OpenMBeanInfoSupport(className, description, attrInfos, constrInfos, operaInfos, null);
-+ test(ominfo, "notif infos");
-+
-+ if (failed > 0) {
-+ throw new RuntimeException("Test failed: "+failed);
-+ } else {
-+ System.out.println("---Test: PASSED");
-+ }
-+ }
-+
-+ private static void test(Object obj, String param) {
-+ try {
-+ obj.hashCode();
-+ System.out.println("OK-1: "+obj.getClass().getSimpleName()+
-+ ".hashCode worked with a null paramer: "+param);
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO-1!!! "+obj.getClass().getSimpleName()+
-+ ".hashCode got NPE with null paramer: "+param);
-+ npe.printStackTrace();
-+ failed++;
-+ }
-+
-+ try {
-+ obj.toString();
-+ System.out.println("OK-1: "+obj.getClass().getSimpleName()+
-+ ".toString worked with a null paramer: "+param);
-+ } catch (NullPointerException npe) {
-+ System.out.println("--->KO-1!!! "+obj.getClass().getSimpleName()+
-+ ".toString got NPE with null paramer: "+param);
-+ npe.printStackTrace();
-+ failed++;
-+ }
-+ }
-+}
---- ./jdk/test/javax/management/remote/mandatory/URLTest.java 2013-09-06 11:29:54.000000000 -0700
-+++ ./jdk/test/javax/management/remote/mandatory/URLTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -24,8 +24,6 @@
- /*
- * @test
- * @bug 5057532
-- * @ignore Test will fail until 6338951 is resolved (java.net.URI now
-- * accepts "http://-a").
- * @summary Tests that host names are parsed correctly in URLs
- * @author Eamonn McManus
- * @run clean URLTest
---- ./jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java 2013-09-06 11:29:54.000000000 -0700
-+++ ./jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 4940957
-+ * @bug 4940957 8025205
- * @summary Tests behaviour when connections break
- * @author Eamonn McManus
- * @run clean BrokenConnectionTest
-@@ -485,14 +485,13 @@
- }
- if (thisok) {
- System.out.println("Waiting for failure notif");
-- long deadline = System.currentTimeMillis() + 5000;
-- while (failureListener.count < 1
-- && System.currentTimeMillis() < deadline)
-- Thread.sleep(500);
-- if (failureListener.count < 1) {
-- System.out.println("Did not get failure notif!");
-- thisok = false;
-- } else if (failureListener.count > 1) {
-+ // pass or test timeout. see 8025205
-+ do {
-+ Thread.sleep(100);
-+ } while (failureListener.count < 1);
-+
-+ Thread.sleep(1000); // if more notif coming ...
-+ if (failureListener.count > 1) {
- System.out.println("Got too many failure notifs: " +
- failureListener.count);
- thisok = false;
---- ./jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java 2013-09-06 11:29:54.000000000 -0700
-+++ ./jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 4886838 4886830
-+ * @bug 4886838 4886830 8025204
- * @summary Tests that idle timeouts happen at appropriate times
- * @author Eamonn McManus
- * @run clean IdleTimeoutTest
-@@ -272,19 +272,11 @@
- }
-
- System.out.println("Waiting for id list to drop ours");
-- deadline = System.currentTimeMillis() + timeout*2 + 10000;
-- while (true) {
-- ids = Arrays.asList(server.getConnectionIds());
-- if (!ids.contains(connId)
-- || System.currentTimeMillis() >= deadline)
-- break;
-- Thread.sleep(500);
-- }
-- if (ids.contains(connId)) {
-- System.out.println("Client id still in list after " +
-- "deadline: " + ids);
-- return false;
-- }
-+ // pass or timed out by test harness - see 8025204
-+ do {
-+ Thread.sleep(100);
-+ ids = Arrays.asList(server.getConnectionIds());
-+ } while (ids.contains(connId));
-
- conn.getDefaultDomain();
- if (connId.equals(client.getConnectionId())) {
---- ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,122 @@
-+/*
-+ * 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.lang.management.ManagementFactory;
-+import java.lang.ref.WeakReference;
-+import java.lang.reflect.Field;
-+import java.util.Collections;
-+import java.util.Map;
-+import javax.management.MBeanServer;
-+import javax.management.MBeanServerConnection;
-+import javax.management.remote.JMXConnector;
-+import javax.management.remote.JMXConnectorFactory;
-+import javax.management.remote.JMXConnectorServer;
-+import javax.management.remote.JMXConnectorServerFactory;
-+import javax.management.remote.JMXPrincipal;
-+import javax.management.remote.JMXServiceURL;
-+import javax.management.remote.rmi.RMIConnector;
-+import javax.security.auth.Subject;
-+
-+/*
-+ * @test
-+ * @bug 6566891
-+ * @summary Check no memory leak on RMIConnector's rmbscMap
-+ * @author Shanliang JIANG
-+ * @run clean RMIConnectorInternalMapTest
-+ * @run build RMIConnectorInternalMapTest
-+ * @run main RMIConnectorInternalMapTest
-+ */
-+
-+public class RMIConnectorInternalMapTest {
-+ public static void main(String[] args) throws Exception {
-+ System.out.println("---RMIConnectorInternalMapTest starting...");
-+
-+ JMXConnectorServer connectorServer = null;
-+ JMXConnector connectorClient = null;
-+
-+ try {
-+ MBeanServer mserver = ManagementFactory.getPlatformMBeanServer();
-+ JMXServiceURL serverURL = new JMXServiceURL("rmi", "localhost", 0);
-+ connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(serverURL, null, mserver);
-+ connectorServer.start();
-+
-+ JMXServiceURL serverAddr = connectorServer.getAddress();
-+ connectorClient = JMXConnectorFactory.connect(serverAddr, null);
-+ connectorClient.connect();
-+
-+ Field rmbscMapField = RMIConnector.class.getDeclaredField("rmbscMap");
-+ rmbscMapField.setAccessible(true);
-+ Map<Subject, WeakReference<MBeanServerConnection>> map =
-+ (Map<Subject, WeakReference<MBeanServerConnection>>) rmbscMapField.get(connectorClient);
-+ if (map != null && !map.isEmpty()) { // failed
-+ throw new RuntimeException("RMIConnector's rmbscMap must be empty at the initial time.");
-+ }
-+
-+ Subject delegationSubject =
-+ new Subject(true,
-+ Collections.singleton(new JMXPrincipal("delegate")),
-+ Collections.EMPTY_SET,
-+ Collections.EMPTY_SET);
-+ MBeanServerConnection mbsc1 =
-+ connectorClient.getMBeanServerConnection(delegationSubject);
-+ MBeanServerConnection mbsc2 =
-+ connectorClient.getMBeanServerConnection(delegationSubject);
-+
-+ if (mbsc1 == null) {
-+ throw new RuntimeException("Got null connection.");
-+ }
-+ if (mbsc1 != mbsc2) {
-+ throw new RuntimeException("Not got same connection with a same subject.");
-+ }
-+
-+ map = (Map<Subject, WeakReference<MBeanServerConnection>>) rmbscMapField.get(connectorClient);
-+ if (map == null || map.isEmpty()) { // failed
-+ throw new RuntimeException("RMIConnector's rmbscMap has wrong size "
-+ + "after creating a delegated connection.");
-+ }
-+
-+ delegationSubject = null;
-+ mbsc1 = null;
-+ mbsc2 = null;
-+
-+ int i = 0;
-+ while (!map.isEmpty() && i++ < 60) {
-+ System.gc();
-+ Thread.sleep(100);
-+ }
-+ System.out.println("---GC times: " + i);
-+
-+ if (!map.isEmpty()) {
-+ throw new RuntimeException("Failed to clean RMIConnector's rmbscMap");
-+ } else {
-+ System.out.println("---RMIConnectorInternalMapTest: PASSED!");
-+ }
-+ } finally {
-+ try {
-+ connectorClient.close();
-+ connectorServer.stop();
-+ } catch (Exception e) {
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,105 @@
-+/*
-+ * 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.lang.management.ManagementFactory;
-+import java.lang.ref.WeakReference;
-+import java.lang.reflect.Field;
-+import javax.management.MBeanServer;
-+import javax.management.MBeanServerConnection;
-+import javax.management.remote.JMXConnector;
-+import javax.management.remote.JMXConnectorFactory;
-+import javax.management.remote.JMXConnectorServer;
-+import javax.management.remote.JMXConnectorServerFactory;
-+import javax.management.remote.JMXServiceURL;
-+import javax.management.remote.rmi.RMIConnector;
-+
-+/*
-+ * @test
-+ * @bug 6566891
-+ * @summary Check no memory leak on RMIConnector's nullSubjectConn
-+ * @author Shanliang JIANG
-+ * @run clean RMIConnectorNullSubjectConnTest
-+ * @run build RMIConnectorNullSubjectConnTest
-+ * @run main RMIConnectorNullSubjectConnTest
-+ */
-+
-+public class RMIConnectorNullSubjectConnTest {
-+ public static void main(String[] args) throws Exception {
-+ System.out.println("---RMIConnectorNullSubjectConnTest starting...");
-+
-+ JMXConnectorServer connectorServer = null;
-+ JMXConnector connectorClient = null;
-+
-+ try {
-+ MBeanServer mserver = ManagementFactory.getPlatformMBeanServer();
-+ JMXServiceURL serverURL = new JMXServiceURL("rmi", "localhost", 0);
-+ connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(serverURL, null, mserver);
-+ connectorServer.start();
-+
-+ JMXServiceURL serverAddr = connectorServer.getAddress();
-+ connectorClient = JMXConnectorFactory.connect(serverAddr, null);
-+ connectorClient.connect();
-+
-+ Field nullSubjectConnField = RMIConnector.class.getDeclaredField("nullSubjectConnRef");
-+ nullSubjectConnField.setAccessible(true);
-+
-+ WeakReference<MBeanServerConnection> weak =
-+ (WeakReference<MBeanServerConnection>)nullSubjectConnField.get(connectorClient);
-+
-+ if (weak != null && weak.get() != null) {
-+ throw new RuntimeException("nullSubjectConnRef must be null at initial time.");
-+ }
-+
-+ MBeanServerConnection conn1 = connectorClient.getMBeanServerConnection(null);
-+ MBeanServerConnection conn2 = connectorClient.getMBeanServerConnection(null);
-+ if (conn1 == null) {
-+ throw new RuntimeException("A connection with null subject should not be null.");
-+ } else if (conn1 != conn2) {
-+ throw new RuntimeException("The 2 connections with null subject are not equal.");
-+ }
-+
-+ conn1 = null;
-+ conn2 = null;
-+ int i = 1;
-+ do {
-+ System.gc();
-+ Thread.sleep(100);
-+ weak = (WeakReference<MBeanServerConnection>)nullSubjectConnField.get(connectorClient);
-+ } while ((weak != null && weak.get() != null) && i++ < 60);
-+
-+ System.out.println("---GC times: " + i);
-+
-+ if (weak != null && weak.get() != null) {
-+ throw new RuntimeException("Failed to clean RMIConnector's nullSubjectConn");
-+ } else {
-+ System.out.println("---RMIConnectorNullSubjectConnTest: PASSED!");
-+ }
-+ } finally {
-+ try {
-+ connectorClient.close();
-+ connectorServer.stop();
-+ } catch (Exception e) {
-+ }
-+ }
-+ }
-+}
---- ./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 2014-07-15 21:49:30.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 4915825 4921009 4934965 4977469
-+ * @bug 4915825 4921009 4934965 4977469 8019584
- * @summary Tests behavior when client or server gets object of unknown class
- * @author Eamonn McManus
- * @run clean MissingClassTest SingleClassLoader
---- ./jdk/test/javax/management/remote/mandatory/util/CacheMapTest.java 2013-09-06 11:29:54.000000000 -0700
-+++ ./jdk/test/javax/management/remote/mandatory/util/CacheMapTest.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,110 +0,0 @@
--/*
-- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/*
-- * @test
-- * @bug 7654321
-- * @summary Tests the CacheMap class.
-- * @author Eamonn McManus
-- * @run clean CacheMapTest
-- * @run build CacheMapTest
-- * @run main CacheMapTest
-- */
--
--import java.util.Iterator;
--import java.util.Map;
--
--import com.sun.jmx.remote.util.CacheMap;
--
--public class CacheMapTest {
-- public static void main(String[] args) {
-- try {
-- boolean ok = test(5) && test(100);
-- if (ok) {
-- System.out.println("Test completed");
-- return;
-- } else {
-- System.out.println("Test failed!");
-- System.exit(1);
-- }
-- } catch (Exception e) {
-- System.err.println("Unexpected exception: " + e);
-- e.printStackTrace();
-- System.exit(1);
-- }
-- }
--
-- private static boolean test(int cacheSize) throws Exception {
-- System.out.println("CacheMap test with cache size " + cacheSize);
-- CacheMap map = new CacheMap(cacheSize);
-- int size = 0;
-- int maxIterations = cacheSize * 10;
-- while (map.size() == size && size < maxIterations) {
-- Integer key = new Integer(size);
-- Object x = map.put(key, "x");
-- if (x != null) {
-- System.out.println("Map already had entry " + key + "!");
-- return false;
-- }
-- x = map.get(key);
-- if (!"x".equals(x)) {
-- System.out.println("Got back surprising value: " + x);
-- return false;
-- }
-- size++;
-- }
-- System.out.println("Map size is " + map.size() + " after inserting " +
-- size + " elements");
-- do {
-- System.gc();
-- Thread.sleep(1);
-- System.out.println("Map size is " + map.size() + " after GC");
-- } while (map.size() > cacheSize);
-- if (map.size() < cacheSize) {
-- System.out.println("Map shrank to less than cache size: " +
-- map.size() + " (surprising but not wrong)");
-- } else
-- System.out.println("Map shrank to cache size as expected");
-- int lowest = size - cacheSize;
-- // lowest value that can still be in cache if LRU is respected
-- for (Iterator it = map.entrySet().iterator(); it.hasNext(); ) {
-- Map.Entry entry = (Map.Entry) it.next();
-- Integer x = (Integer) entry.getKey();
-- int xx = x.intValue();
-- if (xx < lowest || xx >= size) {
-- System.out.println("Old value remained (" + x + "), " +
-- "expected none earlier than " + lowest);
-- return false;
-- }
-- Object xxx = entry.getValue();
-- if (!"x".equals(xxx)) {
-- System.out.println("Got back surprising value: " + xxx);
-- return false;
-- }
-- }
-- if (map.size() > 0)
-- System.out.println("Remaining elements are the most recent ones");
-- System.out.println("Test passed");
-- return true;
-- }
--}
---- ./jdk/test/javax/script/CommonSetup.sh 2013-09-06 11:29:55.000000000 -0700
-+++ ./jdk/test/javax/script/CommonSetup.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -36,7 +36,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/javax/script/GetInterfaceTest.java 2013-09-06 11:29:55.000000000 -0700
-+++ ./jdk/test/javax/script/GetInterfaceTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -67,11 +67,11 @@
- foo2.bar2();
- }
-
-- interface Foo {
-+ public interface Foo {
- public void bar();
- }
-
-- interface Foo2 extends Foo {
-+ public interface Foo2 extends Foo {
- public void bar2();
- }
- }
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -33,17 +33,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PS=":"
-- FS="/"
-- RM="/bin/rm -f"
-- ;;
-- Linux )
-- PS=":"
-- FS="/"
-- RM="/bin/rm -f"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- RM="/bin/rm -f"
---- ./jdk/test/javax/swing/JComboBox/6236162/bug6236162.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/JComboBox/6236162/bug6236162.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,119 @@
-+/*
-+ * 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 6236162
-+ @summary Checks that there is no an inconsistence in combo box
-+ behavior when user points an item in combo popup
-+ by mouse and then uses UP/DOWN keys.
-+ @library ../../regtesthelpers
-+ @build Util
-+ @author Mikhail Lapshin
-+ @run main bug6236162
-+*/
-+
-+import sun.awt.SunToolkit;
-+
-+import javax.swing.*;
-+import javax.swing.plaf.basic.*;
-+import javax.swing.plaf.metal.MetalComboBoxUI;
-+import java.awt.*;
-+import java.awt.event.KeyEvent;
-+
-+public class bug6236162 {
-+ private static final SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ private static JFrame frame;
-+ private static JComboBox combo;
-+ private static MyComboUI comboUI;
-+
-+ public static void main(String[] args) throws Exception {
-+ UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+ toolkit.realSync();
-+ test();
-+ System.out.println("Test passed");
-+ }
-+
-+ private static void createAndShowGUI() {
-+ frame = new JFrame("bug6236162");
-+
-+ combo = new JComboBox(new String[]{"one", "two", "three", "four", "five"});
-+ combo.setEditable(true);
-+ comboUI = new MyComboUI();
-+ combo.setUI(comboUI);
-+ combo.setSelectedIndex(3);
-+ frame.getContentPane().add(combo);
-+
-+ frame.pack();
-+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+ frame.setLocationRelativeTo(null);
-+ frame.setVisible(true);
-+ }
-+
-+ private static void test() throws AWTException {
-+ Robot robot = new Robot();
-+ robot.setAutoDelay(50);
-+
-+ // Open popup menu
-+ realSync();
-+ Util.hitKeys(robot, KeyEvent.VK_DOWN);
-+
-+ // Move mouse to the first popup menu item
-+ realSync();
-+ Point p = combo.getLocationOnScreen();
-+ Dimension size = combo.getSize();
-+ p.x += size.width / 2;
-+ p.y += size.height;
-+ float dy = 1;
-+ robot.mouseMove(p.x, p.y - 5);
-+ for (int i=1; i <= 10; i++) {
-+ robot.mouseMove((int)(p.x), (int)(p.y - 5 + dy*i));
-+ }
-+
-+ // Select the second popup menu item
-+ realSync();
-+ Util.hitKeys(robot, KeyEvent.VK_DOWN);
-+
-+ realSync();
-+ JList list = comboUI.getComboPopup().getList();
-+ if (list.getSelectedIndex() != 1) {
-+ throw new RuntimeException("There is an inconsistence in combo box " +
-+ "behavior when user points an item in combo popup " +
-+ "by mouse and then uses UP/DOWN keys.");
-+ }
-+ }
-+
-+ private static void realSync() {
-+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
-+ }
-+
-+ // Gives access to BasicComboBoxUI.popup field
-+ private static class MyComboUI extends MetalComboBoxUI {
-+ public ComboPopup getComboPopup() {
-+ return popup;
-+ }
-+ }
-+}
---- ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html 2013-09-06 11:29:58.000000000 -0700
-+++ ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html 2014-07-15 21:49:30.000000000 -0700
-@@ -1,6 +1,38 @@
- <html>
-+<!--
-+ 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 4150029 8006087
-+ @summary BackSpace keyboard button does not lead to parent directory
-+ @author Oleg Mokhovikov
-+ @run applet/manual=done bug4150029.html
-+-->
-+
- <body>
- <applet code="bug4150029.class" width=200 height=200></applet>
-+Follow the instructions below.
- 1.Go into 'subDir' folder.
- 2.Press BACKSPACE key.
- 3.Push OPEN button.
---- ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.java 2013-09-06 11:29:58.000000000 -0700
-+++ ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.java 2014-07-15 21:49:30.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
-@@ -21,11 +21,10 @@
- * questions.
- */
-
--/* @test
-- @bug 4150029
-- @summary BackSpace keyboard button does not lead to parent directory
-- @author Oleg Mokhovikov
-- @run applet/manual=done bug4150029.html
-+/*
-+ bug 4150029 8006087
-+ summary BackSpace keyboard button does not lead to parent directory
-+ author Oleg Mokhovikov
- */
-
- import javax.swing.*;
-@@ -36,6 +35,14 @@
- private boolean res;
-
- public void init() {
-+ if (sun.awt.OSInfo.getOSType() == sun.awt.OSInfo.OSType.MACOSX) {
-+ try {
-+ UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
-+ } catch (Exception e) {
-+ throw new RuntimeException(e);
-+ }
-+ }
-+
- String tmpDir = System.getProperty("java.io.tmpdir");
-
- if (tmpDir.length() == 0) {//'java.io.tmpdir' isn't guaranteed to be defined
---- ./jdk/test/javax/swing/JInternalFrame/4193219/IconCoord.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/JInternalFrame/4193219/IconCoord.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,161 @@
-+/*
-+ * 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 4193219
-+ @summary
-+ @author Your Name: Hania Gajewska area=swing
-+ @run main/manual IconCoord
-+*/
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+import javax.swing.*;
-+
-+public class IconCoord {
-+ static Test test = new Test();
-+
-+ public static void main(String[] args) throws Exception {
-+ UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ new IconCoord().createAndShowGUI();
-+ }
-+ });
-+ test.waitTestResult();
-+ }
-+
-+ private void createAndShowGUI() {
-+ StringBuilder instrText = new StringBuilder();
-+ instrText.append("First, iconify internal frame \"Frame 1\" by clicking on its iconify button.\n");
-+ instrText.append("Now, maximize the top-level window \"IconCoord\".\n");
-+ instrText.append("The \"Frame 1\" icon should stay in the lower left corner of the desktop; ");
-+ instrText.append("if it doesn't, press \"Fail\".\n");
-+ instrText.append("Now move the icon to the middle of the desktop by dragging it by its ");
-+ instrText.append("bumpy left side. Then iconify \"Frame 2\" by clicking on its iconify button.\n");
-+ instrText.append("If the icon for frame two gets placed in the lower left corner of the ");
-+ instrText.append("desktop (where the icon for \"Frame 1\" used to be before you moved it), ");
-+ instrText.append("press \"Pass\". Otherwise, press \"Fail\".\n");
-+
-+ JDesktopPane dt = new JDesktopPane();
-+
-+ JButton tf;
-+ JInternalFrame if1 = new JInternalFrame("Frame 1", false, false, false, true);
-+ JComponent c = (JComponent) if1.getContentPane();
-+ c.setLayout(new BorderLayout());
-+
-+ tf = new JButton ("ignore");
-+ c.add (tf, BorderLayout.NORTH);
-+
-+ tf = new JButton ("ignore");
-+ c.add (tf, BorderLayout.CENTER);
-+
-+ JInternalFrame if2 = new JInternalFrame("Frame 2", false, false, false, true);
-+ c = (JComponent) if2.getContentPane();
-+ c.setLayout(new BorderLayout());
-+
-+ tf = new JButton ("ignore");
-+ c.add (tf, BorderLayout.NORTH);
-+
-+ tf = new JButton ("ignore");
-+ c.add (tf, BorderLayout.CENTER);
-+
-+ if1.pack();
-+ if1.setBounds(300, 0, 300, 80);
-+ if2.pack();
-+ if2.setBounds(0, 0, 300, 80);
-+ dt.add(if1);
-+ dt.add(if2);
-+
-+ if1.setVisible(true);
-+ if2.setVisible(true);
-+
-+ int frameHeight = 500;
-+
-+ JScrollPane dtScrollPane = new JScrollPane(dt);
-+ JFrame frame = test.createTestFrame("IconCoord", dtScrollPane, instrText.toString(), 250);
-+ dt.setPreferredSize(new Dimension(650, frameHeight - 250));
-+ frame.setSize (600,500);
-+ frame.setVisible(true);
-+ }
-+
-+ static class Test {
-+ private boolean pass;
-+ JFrame createTestFrame(String name, Component topComponent, String instructions, int instrHeight) {
-+ final String PASS = "Pass";
-+ final String FAIL = "Fail";
-+ JFrame frame = new JFrame(name);
-+ frame.setLayout(new BorderLayout());
-+
-+ JPanel testButtonsPanel = new JPanel();
-+ testButtonsPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, 20));
-+
-+ ActionListener btnAL = new ActionListener() {
-+ public void actionPerformed(ActionEvent event) {
-+ switch (event.getActionCommand()) {
-+ case PASS:
-+ pass();
-+ break;
-+ default:
-+ throw new RuntimeException("Test failed.");
-+ }
-+ }
-+ };
-+ JButton passBtn = new JButton(PASS);
-+ passBtn.addActionListener(btnAL);
-+ passBtn.setActionCommand(PASS);
-+
-+ JButton failBtn = new JButton(FAIL);
-+ failBtn.addActionListener(btnAL);
-+ failBtn.setActionCommand(FAIL);
-+
-+ testButtonsPanel.add(BorderLayout.WEST, passBtn);
-+ testButtonsPanel.add(BorderLayout.EAST, failBtn);
-+
-+ JTextArea instrText = new JTextArea();
-+ instrText.setLineWrap(true);
-+ instrText.setEditable(false);
-+ JScrollPane instrScrollPane = new JScrollPane(instrText);
-+ instrScrollPane.setMaximumSize(new Dimension(Integer.MAX_VALUE, instrHeight));
-+ instrText.append(instructions);
-+
-+ JPanel servicePanel = new JPanel();
-+ servicePanel.setLayout(new BorderLayout());
-+ servicePanel.add(BorderLayout.CENTER, instrScrollPane);
-+ servicePanel.add(BorderLayout.SOUTH, testButtonsPanel);
-+
-+ frame.add(BorderLayout.SOUTH, servicePanel);
-+ frame.add(BorderLayout.CENTER, topComponent);
-+ return frame;
-+ }
-+ synchronized void pass() {
-+ pass = true;
-+ notifyAll();
-+ }
-+ synchronized void waitTestResult() throws InterruptedException {
-+ while (!pass) {
-+ wait();
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/javax/swing/JInternalFrame/4251301/bug4251301.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/JInternalFrame/4251301/bug4251301.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,139 @@
-+/*
-+ * 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 4251301
-+ @summary Keybinding for show/hide the system menu.
-+ @author Andrey Pikalev
-+ @run main/manual bug4251301
-+*/
-+
-+import javax.swing.*;
-+import java.awt.*;
-+import java.awt.event.ActionEvent;
-+import java.awt.event.ActionListener;
-+import java.beans.*;
-+import sun.awt.OSInfo;
-+import sun.awt.SunToolkit;
-+
-+
-+public class bug4251301 {
-+ private static final SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ static Test test = new Test();
-+ public static void main(String[] args) throws Exception {
-+ if (OSInfo.getOSType() == OSInfo.OSType.MACOSX) {
-+ System.out.println("This test is not applicable for MacOS. Passed.");
-+ return;
-+ }
-+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+ toolkit.realSync();
-+ test.waitTestResult();
-+ }
-+
-+ public static void createAndShowGUI() {
-+ final StringBuilder instructions = new StringBuilder();
-+ instructions.append("Click with your mouse the content area of the internal frame with the title \"IFrame\" ");
-+ instructions.append("and press Ctrl+Space. \n");
-+ instructions.append("If the system menu shows up, press Esc. Then system menu should hide. \n");
-+ instructions.append("If you success then press \"Pass\", else press \"Fail\".\n");
-+
-+ JDesktopPane dp = new JDesktopPane();
-+ JInternalFrame jif = new JInternalFrame("IFrame",true,true,true,true);
-+ dp.add(jif);
-+ jif.setBounds(20, 20, 220, 100);
-+ jif.setVisible(true);
-+ try {
-+ jif.setSelected(true);
-+ } catch(PropertyVetoException pve) {
-+ pve.printStackTrace();
-+ throw new Error("Occures PropertyVetoException while set selection...");
-+ }
-+ JScrollPane dtScrollPane = new JScrollPane(dp);
-+ JFrame testFrame = test.createTestFrame("Instructions", dtScrollPane, instructions.toString(), 500);
-+ testFrame.setSize(500, 400);
-+ testFrame.setVisible(true);
-+ }
-+ static class Test {
-+ private boolean pass;
-+ JFrame createTestFrame(String name, Component topComponent, String instructions, int instrHeight) {
-+ final String PASS = "Pass";
-+ final String FAIL = "Fail";
-+ JFrame frame = new JFrame(name);
-+ frame.setLayout(new BorderLayout());
-+
-+ JPanel testButtonsPanel = new JPanel();
-+ testButtonsPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, 20));
-+
-+ ActionListener btnAL = new ActionListener() {
-+ public void actionPerformed(ActionEvent event) {
-+ switch (event.getActionCommand()) {
-+ case PASS:
-+ pass();
-+ break;
-+ default:
-+ throw new RuntimeException("Test failed.");
-+ }
-+ }
-+ };
-+ JButton passBtn = new JButton(PASS);
-+ passBtn.addActionListener(btnAL);
-+ passBtn.setActionCommand(PASS);
-+
-+ JButton failBtn = new JButton(FAIL);
-+ failBtn.addActionListener(btnAL);
-+ failBtn.setActionCommand(FAIL);
-+
-+ testButtonsPanel.add(BorderLayout.WEST, passBtn);
-+ testButtonsPanel.add(BorderLayout.EAST, failBtn);
-+
-+ JTextArea instrText = new JTextArea();
-+ instrText.setLineWrap(true);
-+ instrText.setEditable(false);
-+ JScrollPane instrScrollPane = new JScrollPane(instrText);
-+ instrScrollPane.setMaximumSize(new Dimension(Integer.MAX_VALUE, instrHeight));
-+ instrText.append(instructions);
-+
-+ JPanel servicePanel = new JPanel();
-+ servicePanel.setLayout(new BorderLayout());
-+ servicePanel.add(BorderLayout.CENTER, instrScrollPane);
-+ servicePanel.add(BorderLayout.SOUTH, testButtonsPanel);
-+
-+ frame.add(BorderLayout.SOUTH, servicePanel);
-+ frame.add(BorderLayout.CENTER, topComponent);
-+ return frame;
-+ }
-+ synchronized void pass() {
-+ pass = true;
-+ notifyAll();
-+ }
-+ synchronized void waitTestResult() throws InterruptedException {
-+ while (!pass) {
-+ wait();
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java 2013-09-06 11:29:58.000000000 -0700
-+++ ./jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -27,19 +27,19 @@
- @author mcherkas
- @run main InternalFrameIsNotCollectedTest
- */
--
- import sun.awt.SunToolkit;
-
- import javax.swing.*;
- import java.awt.*;
--import java.awt.event.KeyEvent;
- import java.beans.PropertyVetoException;
- import java.util.Date;
-
- public class InternalFrameIsNotCollectedTest {
-
-- public static final int waitTime = 10000;
-+ public static final int maxWaitTime = 100000;
-+ public static final int waitTime = 5000;
- private static Robot robot;
-+ private static CustomInternalFrame iFrame;
-
- public static void sync() {
-
-@@ -62,12 +62,13 @@
- });
- sync();
- invokeGC();
-+ System.runFinalization();
- Thread.sleep(1000); // it's better to wait 1 sec now then 10 sec later
- Date startWaiting = new Date();
- synchronized (CustomInternalFrame.waiter) {
- // Sync with finalization thread.
- Date now = new Date();
-- while (now.getTime() - startWaiting.getTime() < waitTime && !CustomInternalFrame.finalized) {
-+ while (now.getTime() - startWaiting.getTime() < maxWaitTime && !CustomInternalFrame.finalized) {
- CustomInternalFrame.waiter.wait(waitTime);
- now = new Date();
- }
-@@ -83,10 +84,8 @@
- }
-
- private static void closeInternalFrame() throws PropertyVetoException {
-- robot.keyPress(KeyEvent.VK_CONTROL);
-- robot.keyPress(KeyEvent.VK_F4);
-- robot.keyRelease(KeyEvent.VK_F4);
-- robot.keyRelease(KeyEvent.VK_CONTROL);
-+ iFrame.setClosed(true);
-+ iFrame = null;
- }
-
- private static void initUI() {
-@@ -96,7 +95,7 @@
- desktopPane.setDesktopManager(new DefaultDesktopManager());
- frame.getContentPane().add(desktopPane, BorderLayout.CENTER);
-
-- CustomInternalFrame iFrame = new CustomInternalFrame("Dummy Frame");
-+ iFrame = new CustomInternalFrame("Dummy Frame");
-
- iFrame.setSize(200, 200);
- iFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
---- ./jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,98 @@
-+/*
-+ * 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
-+ @library ../../regtesthelpers
-+ @build Util
-+ @bug 4750590 8015597
-+ @summary SwingSet: Cannot change Themes using menu accelerators
-+ @author Alexander Zuev
-+ @run main bug4750590
-+ */
-+
-+import javax.swing.*;
-+import java.awt.event.*;
-+import java.awt.*;
-+
-+public class bug4750590 {
-+
-+ public static PassedListener pass = new PassedListener();
-+ public static volatile boolean passed = false;
-+
-+ public static void main(String args[]) throws Throwable {
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+
-+ sun.awt.SunToolkit toolkit = (sun.awt.SunToolkit) Toolkit.getDefaultToolkit();
-+ toolkit.realSync();
-+
-+ Robot robo = new Robot();
-+ robo.setAutoDelay(500);
-+ Util.hitMnemonics(robo, KeyEvent.VK_F);
-+ robo.keyPress(KeyEvent.VK_M);
-+ robo.keyRelease(KeyEvent.VK_M);
-+
-+ toolkit.realSync();
-+
-+ if (passed) {
-+ System.out.println("Test passed!");
-+ } else {
-+ throw new RuntimeException("Test FAILED!");
-+ }
-+ }
-+
-+ private static void createAndShowGUI() {
-+ JFrame mainFrame = new JFrame("Bug 4750590");
-+ JMenuBar mbar = new JMenuBar();
-+ JMenu menu = new JMenu("File");
-+ menu.setMnemonic('F');
-+ JMenu submenu = new JMenu("Submenu");
-+ submenu.add(new JMenuItem("SubMenu Item 1")).setMnemonic('S');
-+ submenu.add(new JMenuItem("SubMenu Item 2"));
-+ menu.add(submenu);
-+
-+ menu.add(new JMenuItem("Menu Item 1"));
-+ JMenuItem menuItem = menu.add(new JMenuItem("Menu Item 2"));
-+ menuItem.setMnemonic('M');
-+ menuItem.addActionListener(pass);
-+ mbar.add(menu);
-+ mainFrame.setJMenuBar(mbar);
-+
-+ mainFrame.setSize(200, 200);
-+ mainFrame.setLocation(200, 200);
-+ mainFrame.setVisible(true);
-+ mainFrame.toFront();
-+ }
-+
-+ public static class PassedListener implements ActionListener {
-+ public void actionPerformed(ActionEvent ev) {
-+ passed = true;
-+ }
-+ }
-+
-+}
---- ./jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,108 @@
-+/*
-+ * 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 4171437
-+ @library ../../regtesthelpers
-+ @build Util
-+ @author Georges Saab
-+ @run main bug4171437
-+*/
-+import java.awt.*;
-+import java.awt.event.*;
-+import java.util.ArrayList;
-+import javax.swing.*;
-+import javax.swing.event.*;
-+import sun.awt.SunToolkit;
-+
-+public class bug4171437 {
-+ static volatile boolean closeActivated = false;
-+ static volatile boolean customActivated = false;
-+
-+ public static void main(String[] args) throws Exception {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ toolkit.realSync();
-+
-+ Robot robot = new Robot();
-+ robot.setAutoDelay(50);
-+
-+ Util.hitMnemonics(robot, KeyEvent.VK_F);
-+ Util.hitKeys(robot, KeyEvent.VK_C);
-+
-+ toolkit.realSync();
-+ Thread.sleep(1000);
-+
-+ if (!closeActivated || customActivated) {
-+ throw new RuntimeException("Didn't pass the muster");
-+ }
-+ }
-+ public static void createAndShowGUI() {
-+ JMenuBar menubar = new JMenuBar();
-+
-+ JMenu fileMenu = new JMenu("File");
-+ fileMenu.setMnemonic('f');
-+
-+ JMenuItem fmi1 = new JMenuItem();
-+ fmi1 = new JMenuItem("Open");
-+ JMenuItem fmi2 = new JMenuItem();
-+ fmi2 = new JMenuItem("Close");
-+ fmi2.setMnemonic('c');
-+ fmi2.addActionListener(new ActionListener() {
-+ public void actionPerformed(ActionEvent e) {
-+ closeActivated = true;
-+ }
-+ });
-+
-+ fileMenu.add( fmi1);
-+ fileMenu.add( fmi2);
-+
-+ menubar.add( fileMenu);
-+
-+ JMenu custom = new JMenu("Custom");
-+ custom.setMnemonic('c');
-+ JMenuItem cmi = new JMenuItem();
-+ cmi = new JMenuItem("Properties");
-+ cmi.setMnemonic('p');
-+ custom.add( cmi);
-+ custom.addMenuListener(new MenuListener() {
-+ public void menuSelected(MenuEvent e) {
-+ customActivated = true;
-+ }
-+ public void menuDeselected(MenuEvent e) {}
-+ public void menuCanceled(MenuEvent e) {}
-+ });
-+ menubar.add( custom);
-+
-+ JFrame frame = new JFrame();
-+ frame.setJMenuBar( menubar);
-+ frame.setSize(300, 300);
-+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+ frame.pack();
-+ frame.setVisible(true);
-+ }
-+}
---- ./jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 2013-09-06 11:29:58.000000000 -0700
-+++ ./jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -35,11 +35,12 @@
- import javax.swing.*;
-
- public class ActionListenerCalledTwiceTest {
-- static String menuItems[] = { "Item1", "Item2", "Item3" };
-+ static String menuItems[] = { "Item1", "Item2", "Item3", "Item4" };
- static KeyStroke keyStrokes[] = {
- KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.META_MASK),
- KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),
- KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.SHIFT_MASK),
-+ KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.META_MASK)
- };
-
- static volatile int listenerCallCounter = 0;
---- ./jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,110 @@
-+/*
-+ * 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 4458079
-+ @library ../../regtesthelpers
-+ @build Util
-+ @summary Tests calling removeAll() from PopupMenuListener
-+ @author Peter Zhelezniakov
-+ @run main bug4458079
-+*/
-+import java.awt.Robot;
-+import java.awt.Toolkit;
-+import java.awt.event.*;
-+import javax.swing.*;
-+import javax.swing.event.*;
-+import java.awt.event.KeyEvent;
-+import java.util.ArrayList;
-+import sun.awt.SunToolkit;
-+
-+public class bug4458079 extends JFrame implements PopupMenuListener {
-+ public JMenu menu;
-+
-+ static volatile boolean itemASelected = false;
-+ public static void main(String[] args) throws Exception {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ new bug4458079().createAndShowGUI();
-+ }
-+ });
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ toolkit.realSync();
-+
-+ Robot robot = new Robot();
-+ robot.setAutoDelay(50);
-+
-+ Util.hitMnemonics(robot, KeyEvent.VK_M);
-+
-+ toolkit.realSync();
-+ Thread.sleep(1000);
-+
-+ Util.hitKeys(robot, KeyEvent.VK_DOWN);
-+ Util.hitKeys(robot, KeyEvent.VK_ENTER);
-+
-+ toolkit.realSync();
-+ Thread.sleep(1000);
-+
-+ if (!itemASelected) {
-+ throw new RuntimeException("Test failed: arrow key traversal in JMenu broken!");
-+ }
-+ }
-+ public void createAndShowGUI() {
-+ JMenuBar bar = new JMenuBar();
-+ menu = new JMenu("Menu");
-+ menu.add(new JMenuItem("1"));
-+ menu.add(new JMenuItem("2"));
-+ menu.setMnemonic(KeyEvent.VK_M);
-+ menu.getPopupMenu().addPopupMenuListener(this);
-+ bar.add(menu);
-+
-+ setJMenuBar(bar);
-+ getContentPane().add(new JButton(""));
-+ setSize(300, 300);
-+ setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+ pack();
-+ setVisible(true);
-+ }
-+
-+ public void rebuildMenu() {
-+ menu.removeAll();
-+ final String itemCommand = "A";
-+ JMenuItem item = new JMenuItem(itemCommand);
-+ item.addActionListener(new ActionListener() {
-+ public void actionPerformed(ActionEvent e) {
-+ JMenuItem item = ((JMenuItem)e.getSource());
-+ if (e.getActionCommand() == itemCommand) {
-+ itemASelected = true;
-+ }
-+ }
-+ });
-+ menu.add(item);
-+ menu.add(new JMenuItem("B"));
-+ }
-+
-+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-+ rebuildMenu();
-+ }
-+
-+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
-+ public void popupMenuCanceled(PopupMenuEvent e) {}
-+}
---- ./jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,151 @@
-+/*
-+ * 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 4816114
-+ @summary REGRESSION: Regression in divider location behavior when JSplitPane is resized
-+ @author Andrey Pikalev
-+ @run main bug4816114
-+*/
-+
-+import javax.swing.*;
-+import java.awt.*;
-+import java.lang.reflect.*;
-+import sun.awt.SunToolkit;
-+
-+
-+public class bug4816114 {
-+
-+ JFrame fr;
-+ JSplitPane splitPane;
-+
-+ boolean[] resized = new boolean[] { false, false, false,
-+ false, false, false };
-+ static int step = 0;
-+ boolean h_passed = false;
-+ boolean v_passed = false;
-+
-+ static bug4816114 test = new bug4816114();
-+
-+ public static void main(String[] args) throws InterruptedException, InvocationTargetException {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ test.createAndShowGUI();
-+ }
-+ });
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ toolkit.realSync();
-+ Thread.sleep(1000);
-+
-+ step++;
-+ test.doTest(150, 300);
-+
-+ step++;
-+ test.doTest(650, 300);
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ test.splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
-+ }
-+ });
-+
-+ step++;
-+ test.doTest(300, 650);
-+
-+ step++;
-+ test.doTest(300, 150);
-+
-+ step++;
-+ test.doTest(300, 650);
-+
-+ if ( !test.isPassed() ) {
-+ throw new Error("The divider location is wrong.");
-+ }
-+ }
-+ public void createAndShowGUI() {
-+ fr = new JFrame("Test");
-+
-+ splitPane = new TestSplitPane();
-+ splitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
-+ splitPane.setResizeWeight(0);
-+ splitPane.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
-+
-+ JButton leftButton = new JButton("LEFT");
-+ leftButton.setPreferredSize(new Dimension(300, 300));
-+ leftButton.setMinimumSize(new Dimension(150, 150));
-+ splitPane.setLeftComponent(leftButton);
-+
-+ JButton rightButton = new JButton("RIGHT");
-+ rightButton.setPreferredSize(new Dimension(300, 300));
-+ rightButton.setMinimumSize(new Dimension(150, 150));
-+ splitPane.setRightComponent(rightButton);
-+
-+ fr.getContentPane().add(splitPane, BorderLayout.CENTER);
-+
-+ fr.pack();
-+ fr.setVisible(true);
-+ }
-+
-+ void doTest(final int width, final int height) throws InterruptedException, InvocationTargetException {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ splitPane.setPreferredSize(new Dimension(width, height));
-+ fr.pack();
-+ }
-+ });
-+
-+ synchronized (bug4816114.this) {
-+ while (!resized[step]) {
-+ bug4816114.this.wait();
-+ }
-+ }
-+ }
-+
-+ synchronized void setPassed(int orientation, boolean passed) {
-+ if (orientation == JSplitPane.HORIZONTAL_SPLIT) {
-+ this.h_passed = passed;
-+ }
-+ else {
-+ this.v_passed = passed;
-+ }
-+ }
-+
-+ synchronized boolean isPassed() {
-+ return h_passed && v_passed;
-+ }
-+
-+
-+ class TestSplitPane extends JSplitPane {
-+ public void setDividerLocation(int location) {
-+ super.setDividerLocation(location);
-+
-+ if ( splitPane.getDividerLocation() == 151 ) {
-+ setPassed(getOrientation(), true);
-+ }
-+
-+ synchronized (bug4816114.this) {
-+ resized[step] = true;
-+ bug4816114.this.notifyAll();
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/javax/swing/JTable/7068740/bug7068740.java 2013-09-06 11:29:59.000000000 -0700
-+++ ./jdk/test/javax/swing/JTable/7068740/bug7068740.java 2014-07-15 21:49:30.000000000 -0700
-@@ -37,6 +37,7 @@
- import java.awt.*;
- import java.awt.event.KeyEvent;
- import java.lang.reflect.InvocationTargetException;
-+import java.util.concurrent.atomic.AtomicInteger;
-
- public class bug7068740 extends JFrame {
-
-@@ -66,6 +67,7 @@
- };
-
- table = new JTable(model);
-+ table.setRowSelectionInterval(0, 0);
- LayerUI<JComponent> layerUI = new LayerUI<>();
- JLayer<JComponent> layer = new JLayer<>(table, layerUI);
- JScrollPane scrollPane = new JScrollPane(layer);
-@@ -78,7 +80,7 @@
- try {
- if (robot == null) {
- robot = new Robot();
-- robot.setAutoDelay(20);
-+ robot.setAutoDelay(50);
- }
-
- if (toolkit == null) {
-@@ -104,24 +106,37 @@
- }
- }
-
-- private static void doTest() {
-+ private static int getSelectedRow() throws Exception {
-+ final AtomicInteger row = new AtomicInteger(-1);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ row.set(table.getSelectedRow());
-+ }
-+ });
-+ return row.intValue();
-+ }
-+
-+ private static void doTest() throws Exception {
- toolkit.realSync();
-- table.setRowSelectionInterval(0, 0);
-
- robot.keyPress(KeyEvent.VK_PAGE_DOWN);
-+ robot.keyRelease(KeyEvent.VK_PAGE_DOWN);
- toolkit.realSync();
-- if (table.getSelectedRow() != 19) {
-+
-+ if (getSelectedRow() != 19) {
- throw new RuntimeException("Test failed");
- }
-
- robot.keyPress(KeyEvent.VK_PAGE_UP);
-+ robot.keyRelease(KeyEvent.VK_PAGE_UP);
- toolkit.realSync();
-- if (table.getSelectedRow() != 0) {
-+ if (getSelectedRow() != 0) {
- throw new RuntimeException("Test failed");
- }
- }
-
-- public static void main(String[] args) {
-+ public static void main(String[] args) throws Exception {
- try {
- UIManager.setLookAndFeel(new MetalLookAndFeel());
- setUp();
---- ./jdk/test/javax/swing/JTree/4927934/bug4927934.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/JTree/4927934/bug4927934.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,247 @@
-+/*
-+ * 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 4927934
-+ @summary JTree traversal is unlike Native windows tree traversal
-+ @author Andrey Pikalev
-+ @run main bug4927934
-+*/
-+
-+import javax.swing.*;
-+import javax.swing.event.*;
-+import javax.swing.tree.*;
-+import java.awt.*;
-+import java.awt.event.*;
-+import java.lang.reflect.InvocationTargetException;
-+import sun.awt.*;
-+
-+public class bug4927934 implements TreeSelectionListener, TreeExpansionListener, FocusListener {
-+
-+ final static Object listener = new bug4927934();
-+
-+ static boolean focusGained = false;
-+ public static boolean selectionChanged = false;
-+ public static boolean treeExpanded = false;
-+ public static boolean treeCollapsed = false;
-+
-+ static JFrame frame;
-+ static JTree tree;
-+ static Robot robot;
-+
-+ public static void main(String args[]) throws Exception {
-+ UIManager.setLookAndFeel(new javax.swing.plaf.metal.MetalLookAndFeel());
-+
-+ robot = new Robot();
-+ robot.setAutoDelay(50);
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ frame = new JFrame();
-+
-+ DefaultMutableTreeNode root = new DefaultMutableTreeNode("root");
-+ createNodes(root);
-+ tree = new JTree(root);
-+ JScrollPane scrollPane = new JScrollPane(tree);
-+ frame.getContentPane().add(scrollPane);
-+
-+ tree.addFocusListener((FocusListener)listener);
-+ tree.addTreeSelectionListener((TreeSelectionListener)listener);
-+ tree.addTreeExpansionListener((TreeExpansionListener)listener);
-+
-+ frame.setSize(300, 300);
-+ frame.setVisible(true);
-+ }
-+ });
-+
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ toolkit.realSync();
-+ Thread.sleep(1000);
-+
-+ SwingUtilities.invokeLater(new Runnable() {
-+ public void run() {
-+ tree.requestFocus();
-+ }
-+ });
-+
-+ synchronized(listener) {
-+ if (!focusGained) {
-+ System.out.println("waiting focusGained...");
-+ try {
-+ listener.wait(10000);
-+ } catch (InterruptedException e) {
-+ e.printStackTrace();
-+ }
-+ }
-+ }
-+
-+ // GO TO RIGHT
-+ selectionChanged = false;
-+ hitKey(KeyEvent.VK_RIGHT);
-+ toolkit.realSync();
-+ if (!checkSelectionChanged(tree, 0)) {
-+ throw new RuntimeException("Root should be selected");
-+ }
-+
-+ selectionChanged = false;
-+ hitKey(KeyEvent.VK_RIGHT);
-+ toolkit.realSync();
-+ if (!checkSelectionChanged(tree, 1)) {
-+ throw new RuntimeException("Node should be selected");
-+ }
-+
-+ treeExpanded = false;
-+ hitKey(KeyEvent.VK_RIGHT);
-+ toolkit.realSync();
-+ if (!isTreeExpanded()) {
-+ throw new RuntimeException("Node should be expanded");
-+ }
-+
-+ selectionChanged = false;
-+ hitKey(KeyEvent.VK_RIGHT);
-+ toolkit.realSync();
-+ if (!checkSelectionChanged(tree, 2)) {
-+ throw new RuntimeException("Leaf1 should be selected");
-+ }
-+
-+ selectionChanged = false;
-+ hitKey(KeyEvent.VK_RIGHT);
-+ toolkit.realSync();
-+ if (!checkSelectionChanged(tree, 2)) {
-+ throw new RuntimeException("Leaf1 should be selected");
-+ }
-+
-+ // GO TO LEFT
-+ selectionChanged = false;
-+ hitKey(KeyEvent.VK_LEFT);
-+ toolkit.realSync();
-+ if (!checkSelectionChanged(tree, 1)) {
-+ throw new RuntimeException("Node should be selected");
-+ }
-+
-+ treeCollapsed = false;
-+ hitKey(KeyEvent.VK_LEFT);
-+ if (!isTreeCollapsed()) {
-+ throw new RuntimeException("Node should be collapsed");
-+ }
-+
-+ selectionChanged = false;
-+ hitKey(KeyEvent.VK_LEFT);
-+ toolkit.realSync();
-+ if (!checkSelectionChanged(tree, 0)) {
-+ throw new RuntimeException("Root should be selected");
-+ }
-+
-+ treeCollapsed = false;
-+ hitKey(KeyEvent.VK_LEFT);
-+ toolkit.realSync();
-+ if (!isTreeCollapsed()) {
-+ throw new RuntimeException("Root should be collapsed");
-+ }
-+ }
-+
-+
-+ synchronized public void focusLost(FocusEvent e) {
-+ }
-+
-+ synchronized public void focusGained(FocusEvent e) {
-+ focusGained = true;
-+ System.out.println("focusGained");
-+ listener.notifyAll();
-+ }
-+
-+ private static void createNodes(DefaultMutableTreeNode root) {
-+ DefaultMutableTreeNode node = new DefaultMutableTreeNode("Node");
-+ node.add(new DefaultMutableTreeNode("Leaf1"));
-+ node.add(new DefaultMutableTreeNode("Leaf2"));
-+ root.add(node);
-+ root.add(new DefaultMutableTreeNode("Leaf3"));
-+ }
-+
-+ synchronized public void valueChanged(TreeSelectionEvent e) {
-+ selectionChanged = true;
-+ System.out.println("selectionChanged");
-+ notifyAll();
-+ }
-+
-+ synchronized public void treeCollapsed(TreeExpansionEvent e) {
-+ System.out.println("treeCollapsed");
-+ treeCollapsed = true;
-+ notifyAll();
-+ }
-+
-+ synchronized public void treeExpanded(TreeExpansionEvent e) {
-+ System.out.println("treeExpanded");
-+ treeExpanded = true;
-+ notifyAll();
-+ }
-+
-+ private static void hitKey(int key) {
-+ System.out.println("key " + key + " pressed");
-+ robot.keyPress(key);
-+ robot.keyRelease(key);
-+ }
-+
-+ private static boolean checkSelectionChanged(JTree tree, int shouldBeSel) {
-+ synchronized(listener) {
-+ if (!selectionChanged) {
-+ System.out.println("waiting for selectionChanged...");
-+ try {
-+ listener.wait(5000);
-+ } catch (InterruptedException e) {
-+ e.printStackTrace();
-+ }
-+ }
-+ }
-+ int selRow = tree.getLeadSelectionRow();
-+ System.out.println("Selected row: " + selRow);
-+ return selRow == shouldBeSel;
-+ }
-+
-+ private static boolean isTreeExpanded() {
-+ synchronized(listener) {
-+ if (!treeExpanded) {
-+ System.out.println("waiting for treeExpanded...");
-+ try {
-+ listener.wait(5000);
-+ } catch (InterruptedException e) {
-+ e.printStackTrace();
-+ }
-+ }
-+ }
-+ return treeExpanded;
-+ }
-+
-+ private static boolean isTreeCollapsed() {
-+ synchronized(listener) {
-+ if (!treeCollapsed) {
-+ System.out.println("waiting for treeCollapsed...");
-+ try {
-+ listener.wait(5000);
-+ } catch (InterruptedException e) {
-+ e.printStackTrace();
-+ }
-+ }
-+ }
-+ return treeCollapsed;
-+ }
-+}
---- ./jdk/test/javax/swing/Popup/TaskbarPositionTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/Popup/TaskbarPositionTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,340 @@
-+/*
-+ * 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.*;
-+import java.awt.event.*;
-+import javax.swing.*;
-+import javax.swing.event.*;
-+
-+/**
-+ * @test @bug 4245587 4474813 4425878 4767478 8015599
-+ * @author Mark Davidson
-+ * @summary Tests the location of the heavy weight popup portion of JComboBox,
-+ * JMenu and JPopupMenu.
-+ * @library ../regtesthelpers
-+ * @build Util
-+ * @run main TaskbarPositionTest
-+ */
-+public class TaskbarPositionTest extends JFrame implements ActionListener {
-+
-+ private boolean done;
-+ private Throwable error;
-+ private static TaskbarPositionTest test;
-+ private static JPopupMenu popupMenu;
-+ private static JPanel panel;
-+ private static JComboBox<String> combo1;
-+ private static JComboBox<String> combo2;
-+ private static JMenuBar menubar;
-+ private static JMenu menu1;
-+ private static JMenu menu2;
-+ private static Rectangle fullScreenBounds;
-+ // The usable desktop space: screen size - screen insets.
-+ private static Rectangle screenBounds;
-+ private static String[] numData = {
-+ "One", "Two", "Three", "Four", "Five", "Six", "Seven"
-+ };
-+ private static String[] dayData = {
-+ "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
-+ };
-+ private static char[] mnDayData = {
-+ 'M', 'T', 'W', 'R', 'F', 'S', 'U'
-+ };
-+
-+ public TaskbarPositionTest() {
-+ super("Use CTRL-down to show a JPopupMenu");
-+ setContentPane(panel = createContentPane());
-+ setJMenuBar(createMenuBar("1 - First Menu", true));
-+ setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+
-+ // CTRL-down will show the popup.
-+ panel.getInputMap().put(KeyStroke.getKeyStroke(
-+ KeyEvent.VK_DOWN, InputEvent.CTRL_MASK), "OPEN_POPUP");
-+ panel.getActionMap().put("OPEN_POPUP", new PopupHandler());
-+
-+ pack();
-+
-+ Toolkit toolkit = Toolkit.getDefaultToolkit();
-+ fullScreenBounds = new Rectangle(new Point(), toolkit.getScreenSize());
-+ screenBounds = new Rectangle(new Point(), toolkit.getScreenSize());
-+
-+ // Place the frame near the bottom. This is a pretty wild guess.
-+ this.setLocation(0, (int) screenBounds.getHeight() - 2 * this.getHeight());
-+
-+ // Reduce the screen bounds by the insets.
-+ GraphicsConfiguration gc = this.getGraphicsConfiguration();
-+ if (gc != null) {
-+ Insets screenInsets = toolkit.getScreenInsets(gc);
-+ screenBounds = gc.getBounds();
-+ screenBounds.width -= (screenInsets.left + screenInsets.right);
-+ screenBounds.height -= (screenInsets.top + screenInsets.bottom);
-+ screenBounds.x += screenInsets.left;
-+ screenBounds.y += screenInsets.top;
-+ }
-+
-+ setVisible(true);
-+ }
-+
-+ public static class ComboPopupCheckListener implements PopupMenuListener {
-+
-+ public void popupMenuCanceled(PopupMenuEvent ev) {
-+ }
-+
-+ public void popupMenuWillBecomeVisible(PopupMenuEvent ev) {
-+ }
-+
-+ public void popupMenuWillBecomeInvisible(PopupMenuEvent ev) {
-+ Point cpos = combo1.getLocation();
-+ SwingUtilities.convertPointToScreen(cpos, panel);
-+
-+ JPopupMenu pm = (JPopupMenu) combo1.getUI().getAccessibleChild(combo1, 0);
-+
-+ if (pm != null) {
-+ Point p = pm.getLocation();
-+ SwingUtilities.convertPointToScreen(p, pm);
-+ if (p.y < cpos.y) {
-+ throw new RuntimeException("ComboBox popup is wrongly aligned");
-+ } // check that popup was opened down
-+ }
-+ }
-+ }
-+
-+ private class PopupHandler extends AbstractAction {
-+
-+ public void actionPerformed(ActionEvent e) {
-+ if (!popupMenu.isVisible()) {
-+ popupMenu.show((Component) e.getSource(), 40, 40);
-+ }
-+ isPopupOnScreen(popupMenu, fullScreenBounds);
-+ }
-+ }
-+
-+ class PopupListener extends MouseAdapter {
-+
-+ private JPopupMenu popup;
-+
-+ public PopupListener(JPopupMenu popup) {
-+ this.popup = popup;
-+ }
-+
-+ public void mousePressed(MouseEvent e) {
-+ maybeShowPopup(e);
-+ }
-+
-+ public void mouseReleased(MouseEvent e) {
-+ maybeShowPopup(e);
-+ }
-+
-+ private void maybeShowPopup(MouseEvent e) {
-+ if (e.isPopupTrigger()) {
-+ popup.show(e.getComponent(), e.getX(), e.getY());
-+ isPopupOnScreen(popup, fullScreenBounds);
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Tests if the popup is on the screen.
-+ */
-+ public static void isPopupOnScreen(JPopupMenu popup, Rectangle checkBounds) {
-+ Dimension dim = popup.getSize();
-+ Point pt = new Point();
-+ SwingUtilities.convertPointToScreen(pt, popup);
-+ Rectangle bounds = new Rectangle(pt, dim);
-+
-+ if (!SwingUtilities.isRectangleContainingRectangle(checkBounds, bounds)) {
-+ throw new RuntimeException("We do not match! " + checkBounds + " / " + bounds);
-+ }
-+
-+ }
-+
-+ private JPanel createContentPane() {
-+ JPanel panel = new JPanel();
-+
-+ combo1 = new JComboBox<>(numData);
-+ panel.add(combo1);
-+ combo2 = new JComboBox<>(dayData);
-+ combo2.setEditable(true);
-+ panel.add(combo2);
-+ panel.setSize(300, 200);
-+
-+ popupMenu = new JPopupMenu();
-+ JMenuItem item;
-+ for (int i = 0; i < dayData.length; i++) {
-+ item = popupMenu.add(new JMenuItem(dayData[i], mnDayData[i]));
-+ item.addActionListener(this);
-+ }
-+ panel.addMouseListener(new PopupListener(popupMenu));
-+
-+ JTextField field = new JTextField("CTRL+down for Popup");
-+ // CTRL-down will show the popup.
-+ field.getInputMap().put(KeyStroke.getKeyStroke(
-+ KeyEvent.VK_DOWN, InputEvent.CTRL_MASK), "OPEN_POPUP");
-+ field.getActionMap().put("OPEN_POPUP", new PopupHandler());
-+
-+ panel.add(field);
-+
-+ return panel;
-+ }
-+
-+ /**
-+ * @param str name of Menu
-+ * @param bFlag set mnemonics on menu items
-+ */
-+ private JMenuBar createMenuBar(String str, boolean bFlag) {
-+ menubar = new JMenuBar();
-+
-+ menu1 = new JMenu(str);
-+ menu1.setMnemonic(str.charAt(0));
-+ menu1.addActionListener(this);
-+
-+ menubar.add(menu1);
-+ for (int i = 0; i < 8; i++) {
-+ JMenuItem menuitem = new JMenuItem("1 JMenuItem" + i);
-+ menuitem.addActionListener(this);
-+ if (bFlag) {
-+ menuitem.setMnemonic('0' + i);
-+ }
-+ menu1.add(menuitem);
-+ }
-+
-+ // second menu
-+ menu2 = new JMenu("2 - Second Menu");
-+ menu2.addActionListener(this);
-+ menu2.setMnemonic('2');
-+
-+ menubar.add(menu2);
-+ for (int i = 0; i < 5; i++) {
-+ JMenuItem menuitem = new JMenuItem("2 JMenuItem" + i);
-+ menuitem.addActionListener(this);
-+
-+ if (bFlag) {
-+ menuitem.setMnemonic('0' + i);
-+ }
-+ menu2.add(menuitem);
-+ }
-+ JMenu submenu = new JMenu("Sub Menu");
-+ submenu.setMnemonic('S');
-+ submenu.addActionListener(this);
-+ for (int i = 0; i < 5; i++) {
-+ JMenuItem menuitem = new JMenuItem("S JMenuItem" + i);
-+ menuitem.addActionListener(this);
-+ if (bFlag) {
-+ menuitem.setMnemonic('0' + i);
-+ }
-+ submenu.add(menuitem);
-+ }
-+ menu2.add(new JSeparator());
-+ menu2.add(submenu);
-+
-+ return menubar;
-+ }
-+
-+ public void actionPerformed(ActionEvent evt) {
-+ Object obj = evt.getSource();
-+ if (obj instanceof JMenuItem) {
-+ // put the focus on the noneditable combo.
-+ combo1.requestFocus();
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Throwable {
-+
-+ sun.awt.SunToolkit toolkit = (sun.awt.SunToolkit) Toolkit.getDefaultToolkit();
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ test = new TaskbarPositionTest();
-+ }
-+ });
-+
-+ // Use Robot to automate the test
-+ Robot robot;
-+ robot = new Robot();
-+ robot.setAutoDelay(125);
-+
-+ // 1 - menu
-+ Util.hitMnemonics(robot, KeyEvent.VK_1);
-+
-+ toolkit.realSync();
-+ isPopupOnScreen(menu1.getPopupMenu(), screenBounds);
-+
-+ // 2 menu with sub menu
-+ robot.keyPress(KeyEvent.VK_RIGHT);
-+ robot.keyRelease(KeyEvent.VK_RIGHT);
-+ Util.hitMnemonics(robot, KeyEvent.VK_S);
-+
-+ toolkit.realSync();
-+ isPopupOnScreen(menu2.getPopupMenu(), screenBounds);
-+
-+ robot.keyPress(KeyEvent.VK_ENTER);
-+ robot.keyRelease(KeyEvent.VK_ENTER);
-+
-+ // Focus should go to non editable combo box
-+ toolkit.realSync();
-+ Thread.sleep(500);
-+
-+ robot.keyPress(KeyEvent.VK_DOWN);
-+
-+ // How do we check combo boxes?
-+
-+ // Editable combo box
-+ robot.keyPress(KeyEvent.VK_TAB);
-+ robot.keyRelease(KeyEvent.VK_TAB);
-+ robot.keyPress(KeyEvent.VK_DOWN);
-+ robot.keyRelease(KeyEvent.VK_DOWN);
-+
-+ // combo1.getUI();
-+
-+ // Popup from Text field
-+ robot.keyPress(KeyEvent.VK_TAB);
-+ robot.keyRelease(KeyEvent.VK_TAB);
-+ robot.keyPress(KeyEvent.VK_CONTROL);
-+ robot.keyPress(KeyEvent.VK_DOWN);
-+ robot.keyRelease(KeyEvent.VK_DOWN);
-+ robot.keyRelease(KeyEvent.VK_CONTROL);
-+
-+ // Popup from a mouse click.
-+ Point pt = new Point(2, 2);
-+ SwingUtilities.convertPointToScreen(pt, panel);
-+ robot.mouseMove((int) pt.getX(), (int) pt.getY());
-+ robot.mousePress(InputEvent.BUTTON3_MASK);
-+ robot.mouseRelease(InputEvent.BUTTON3_MASK);
-+
-+ toolkit.realSync();
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ test.setLocation(-30, 100);
-+ combo1.addPopupMenuListener(new ComboPopupCheckListener());
-+ combo1.requestFocus();
-+ }
-+ });
-+
-+ robot.keyPress(KeyEvent.VK_DOWN);
-+ robot.keyRelease(KeyEvent.VK_DOWN);
-+ robot.keyPress(KeyEvent.VK_ESCAPE);
-+ robot.keyRelease(KeyEvent.VK_ESCAPE);
-+
-+ toolkit.realSync();
-+ Thread.sleep(500);
-+ }
-+}
---- ./jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,89 @@
-+/*
-+ * 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 4983388 8015600
-+ @summary shortcuts on menus do not work on JDS
-+ @author Oleg Mokhovikov
-+ @library ../../../../regtesthelpers
-+ @build Util
-+ @run main bug4983388
-+*/
-+
-+import sun.awt.*;
-+import java.awt.*;
-+import javax.swing.*;
-+import javax.swing.event.MenuListener;
-+import javax.swing.event.MenuEvent;
-+import java.awt.event.KeyEvent;
-+
-+public class bug4983388 {
-+ static volatile boolean bMenuSelected = false;
-+
-+ private static class TestMenuListener implements MenuListener {
-+ public void menuCanceled(MenuEvent e) {}
-+ public void menuDeselected(MenuEvent e) {}
-+ public void menuSelected(MenuEvent e) {
-+ System.out.println("menuSelected");
-+ bMenuSelected = true;
-+ }
-+ }
-+
-+ private static void createAndShowGUI() {
-+ JMenuBar menuBar = new JMenuBar();
-+ JMenu menu = new JMenu("File");
-+ menu.setMnemonic('F');
-+ menuBar.add(menu);
-+ JFrame frame = new JFrame();
-+ frame.setJMenuBar(menuBar);
-+ frame.pack();
-+ frame.setVisible(true);
-+ MenuListener listener = new TestMenuListener();
-+ menu.addMenuListener(listener);
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ try {
-+ UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
-+ } catch (UnsupportedLookAndFeelException | ClassNotFoundException ex) {
-+ System.err.println("GTKLookAndFeel is not supported on this platform. Using defailt LaF for this platform.");
-+ }
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+
-+ Robot robot = new Robot();
-+ Util.hitMnemonics(robot, KeyEvent.VK_F);
-+
-+ toolkit.realSync();
-+
-+ if (!bMenuSelected) {
-+ throw new RuntimeException("shortcuts on menus do not work");
-+ }
-+ }
-+}
---- ./jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,174 @@
-+/*
-+ * 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 8023474
-+ * @summary Tests that the first mouse press starts editing in JTree
-+ * @author Dmitry Markov
-+ * @run main bug8023474
-+ */
-+
-+import sun.awt.SunToolkit;
-+
-+import javax.swing.*;
-+import javax.swing.event.CellEditorListener;
-+import javax.swing.tree.DefaultMutableTreeNode;
-+import javax.swing.tree.DefaultTreeModel;
-+import javax.swing.tree.TreeCellEditor;
-+import javax.swing.tree.TreeCellRenderer;
-+import java.awt.*;
-+import java.awt.event.InputEvent;
-+import java.util.EventObject;
-+
-+public class bug8023474 {
-+ private static JTree tree;
-+
-+ public static void main(String[] args) throws Exception {
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ Robot robot = new Robot();
-+ robot.setAutoDelay(50);
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+
-+ toolkit.realSync();
-+
-+ Point point = getRowPointToClick(1);
-+ robot.mouseMove(point.x, point.y);
-+ robot.mousePress(InputEvent.BUTTON1_MASK);
-+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
-+
-+ toolkit.realSync();
-+
-+ Boolean result = (Boolean)tree.getCellEditor().getCellEditorValue();
-+ if (!result) {
-+ throw new RuntimeException("Test Failed!");
-+ }
-+ }
-+
-+ private static void createAndShowGUI() {
-+ try {
-+ UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
-+ } catch (Exception e) {
-+ throw new RuntimeException(e);
-+ }
-+
-+ DefaultMutableTreeNode root = new DefaultMutableTreeNode("root");
-+ DefaultMutableTreeNode item = new DefaultMutableTreeNode("item");
-+ DefaultMutableTreeNode subItem = new DefaultMutableTreeNode("subItem");
-+
-+ root.add(item);
-+ item.add(subItem);
-+
-+ DefaultTreeModel model = new DefaultTreeModel(root);
-+ tree = new JTree(model);
-+
-+ tree.setCellEditor(new Editor());
-+ tree.setEditable(true);
-+ tree.setRowHeight(30);
-+ tree.setCellRenderer(new CheckboxCellRenderer());
-+
-+ JFrame frame = new JFrame("bug8023474");
-+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+ frame.add(new JScrollPane(tree));
-+ frame.setSize(400, 300);
-+ frame.setVisible(true);
-+ }
-+
-+ private static Point getRowPointToClick(final int row) throws Exception {
-+ final Point[] result = new Point[1];
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ Rectangle rect = tree.getRowBounds(row);
-+ Point point = new Point(rect.x + 10, rect.y + rect.height / 2);
-+ SwingUtilities.convertPointToScreen(point, tree);
-+ result[0] = point;
-+ }
-+ });
-+ return result[0];
-+ }
-+
-+ private static class Editor extends JPanel implements TreeCellEditor {
-+ private JCheckBox checkbox;
-+
-+ public Editor() {
-+ setOpaque(false);
-+ checkbox = new JCheckBox();
-+ add(checkbox);
-+ }
-+
-+ public Component getTreeCellEditorComponent(JTree tree, Object value, boolean isSelected,
-+ boolean expanded, boolean leaf, int row) {
-+ checkbox.setText(value.toString());
-+ checkbox.setSelected(false);
-+ return this;
-+ }
-+
-+ public Object getCellEditorValue() {
-+ return checkbox.isSelected();
-+ }
-+
-+ public boolean isCellEditable(EventObject anEvent) {
-+ return true;
-+ }
-+
-+ public boolean shouldSelectCell(EventObject anEvent) {
-+ return true;
-+ }
-+
-+ public boolean stopCellEditing() {
-+ return true;
-+ }
-+
-+ public void cancelCellEditing() {
-+ }
-+
-+ public void addCellEditorListener(CellEditorListener l) {
-+ }
-+
-+ public void removeCellEditorListener(CellEditorListener l) {
-+ }
-+ }
-+
-+ private static class CheckboxCellRenderer extends JPanel implements TreeCellRenderer {
-+ private JCheckBox checkbox;
-+
-+ public CheckboxCellRenderer() {
-+ setOpaque(false);
-+ checkbox = new JCheckBox();
-+ add(checkbox);
-+ }
-+
-+ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,
-+ boolean leaf, int row, boolean hasFocus) {
-+ checkbox.setText(value.toString());
-+ checkbox.setSelected(false);
-+ return this;
-+ }
-+ }
-+}
---- ./jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,270 @@
-+/*
-+ * 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 8016833
-+ @summary underlines and strikethroughs should be painted at the correct
-+ positions for different kind of text styles: normal, superscript and subscript
-+ @author Anton Nashatyrev
-+ @run main bug8016833
-+*/
-+import javax.swing.*;
-+import javax.swing.text.BadLocationException;
-+import javax.swing.text.Style;
-+import javax.swing.text.StyleConstants;
-+import javax.swing.text.StyledDocument;
-+import java.awt.*;
-+import java.awt.image.BufferedImage;
-+import java.lang.reflect.InvocationTargetException;
-+
-+public class bug8016833 {
-+
-+ void drawText(final Graphics g, final boolean underline, final boolean strikethrough, final boolean background) {
-+ drawText(g, "mama", underline, strikethrough, background);
-+ }
-+
-+ void drawText(final Graphics g, final String text, final boolean underline, final boolean strikethrough, final boolean background) {
-+ try {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ final JTextPane comp = new JTextPane();
-+ final StyledDocument doc = comp.getStyledDocument();
-+
-+ Style style = comp.addStyle("superscript", null);
-+ setNormalStyle(style);
-+
-+ if (underline) {
-+ StyleConstants.setUnderline(style, true);
-+ }
-+ if (strikethrough) {
-+ StyleConstants.setStrikeThrough(style, true);
-+ }
-+ if (background) {
-+ StyleConstants.setBackground(style, Color.BLUE);
-+ }
-+ try {
-+ doc.insertString(doc.getLength(), "mama", style);
-+ } catch (BadLocationException e) {
-+ throw new RuntimeException(e);
-+ }
-+
-+ comp.setSize(200, 100);
-+ comp.paint(g);
-+ }
-+ });
-+ } catch (InterruptedException e) {
-+ throw new RuntimeException(e);
-+ } catch (InvocationTargetException e) {
-+ throw new RuntimeException(e);
-+ }
-+ }
-+
-+ void setNormalStyle(Style style) {
-+ StyleConstants.setSuperscript(style, true);
-+ }
-+
-+ int getEmptyPixel() {
-+ return 0xFFFFFFFF;
-+ }
-+
-+ boolean isPixelEmpty(int argb) {
-+ return (argb & 0x00FFFFFF) == (getEmptyPixel() & 0x00FFFFFF);
-+ }
-+
-+ boolean isLineEmpty(BufferedImage img, int coord, boolean isHorizontal) {
-+ int len = isHorizontal ? img.getWidth() : img.getHeight();
-+ for (int i = 0; i < len; i++) {
-+ int pixel = isHorizontal ? img.getRGB(i, coord) : img.getRGB(coord, i);
-+ if (!isPixelEmpty(pixel)) {
-+ return false;
-+ }
-+ }
-+ return true;
-+ }
-+
-+ Rectangle getPixelsOutline(BufferedImage img) {
-+ int x1 = 0;
-+ while (x1 < img.getWidth() && isLineEmpty(img, x1, false)) {
-+ x1++;
-+ }
-+ int x2 = img.getWidth() - 1;
-+ while (x2 >= 0 && isLineEmpty(img, x2, false)) {
-+ x2--;
-+ }
-+ int y1 = 0;
-+ while (y1 < img.getHeight() && isLineEmpty(img, y1, true)) {
-+ y1++;
-+ }
-+ int y2 = img.getHeight() - 1;
-+ while (y2 >= 0 && isLineEmpty(img, y2, true)) {
-+ y2--;
-+ }
-+
-+ return new Rectangle(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
-+ }
-+
-+ BufferedImage createImage() {
-+ final BufferedImage img = new BufferedImage(200, 100, BufferedImage.TYPE_INT_ARGB);
-+ try {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ Graphics g = img.getGraphics();
-+ g.setColor(new Color(getEmptyPixel()));
-+ g.fillRect(0, 0, 10000, 10000);
-+ }
-+ });
-+ } catch (InterruptedException e) {
-+ throw new RuntimeException(e);
-+ } catch (InvocationTargetException e) {
-+ throw new RuntimeException(e);
-+ }
-+ return img;
-+ }
-+
-+ int subPixels(int pix1, int pix2) {
-+ if (pix1 == pix2) {
-+ return getEmptyPixel();
-+ }
-+ return pix1;
-+ }
-+
-+ /**
-+ * Subtracts img2 from img1
-+ */
-+ BufferedImage subImages(BufferedImage img1, BufferedImage img2) {
-+ if (img1.getHeight() != img2.getHeight() ||
-+ img1.getWidth() != img2.getWidth()) {
-+ throw new RuntimeException("Different sizes");
-+ }
-+ BufferedImage ret = new BufferedImage(img1.getWidth(), img1.getHeight(), img1.getType());
-+
-+ for (int x = 0; x < ret.getWidth(); x++) {
-+ for (int y = 0; y < ret.getHeight(); y++) {
-+ ret.setRGB(x, y, subPixels(img1.getRGB(x, y), img2.getRGB(x, y)));
-+ }
-+ }
-+ return ret;
-+ }
-+
-+ void testUnderline() {
-+ System.out.println(" testUnderline()");
-+
-+ final BufferedImage img1 = createImage();
-+ drawText(img1.getGraphics(), true, false, false);
-+ final Rectangle out1 = getPixelsOutline(img1);
-+ System.out.println(" Underlined: " + out1);
-+
-+ final BufferedImage img2 = createImage();
-+ drawText(img2.getGraphics(), false, false, false);
-+ final Rectangle out2 = getPixelsOutline(img2);
-+ System.out.println(" Normal: " + out2);
-+
-+ final BufferedImage img3 = subImages(img1, img2);
-+ final Rectangle out3 = getPixelsOutline(img3);
-+ System.out.println(" Sub: " + out3);
-+
-+ // underline is not too thick
-+ assertTrue(out3.getHeight() <= 2);
-+ // not too wide
-+ assertTrue(out3.getWidth() * 0.8 < out2.getWidth());
-+ // not too low
-+ assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) < 3);
-+ // not too high
-+ assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) > 0);
-+ }
-+
-+ void testStrikthrough() {
-+ System.out.println(" testStrikthrough()");
-+
-+ final BufferedImage img1 = createImage();
-+ drawText(img1.getGraphics(), false, true, false);
-+ final Rectangle out1 = getPixelsOutline(img1);
-+ System.out.println(" Striked: " + out1);
-+
-+ final BufferedImage img2 = createImage();
-+ drawText(img2.getGraphics(), false, false, false);
-+ final Rectangle out2 = getPixelsOutline(img2);
-+ System.out.println(" Normal: " + out2);
-+
-+ final BufferedImage img3 = subImages(img1, img2);
-+ final Rectangle out3 = getPixelsOutline(img3);
-+ System.out.println(" Sub: " + out3);
-+
-+ // strikethrough is not too thick
-+ assertTrue(out3.getHeight() <= 2);
-+ // not too wide
-+ assertTrue(out3.getWidth() * 0.8 < out2.getWidth());
-+ // not too low
-+ assertTrue(out3.getY() - (out1.getY() + out2.getHeight()) < 0);
-+ // not too high
-+ assertTrue(out3.getY() - out1.getY() > 1);
-+ }
-+ void assertTrue(boolean b) {
-+ if (!b) {
-+ throw new RuntimeException("Assertion failed");
-+ }
-+ }
-+
-+ static void testSuperScript() {
-+ System.out.println("testSuperScript()");
-+ bug8016833 b = new bug8016833() {
-+ @Override
-+ void setNormalStyle(Style style) {
-+ StyleConstants.setSuperscript(style, true);
-+ }
-+ };
-+ b.testUnderline();
-+ b.testStrikthrough();
-+ }
-+
-+ static void testSubScript() {
-+ System.out.println("testSubScript()");
-+ bug8016833 b = new bug8016833() {
-+ @Override
-+ void setNormalStyle(Style style) {
-+ StyleConstants.setSubscript(style, true);
-+ }
-+ };
-+ b.testUnderline();
-+ b.testStrikthrough();
-+ }
-+
-+ static void testNormalScript() {
-+ System.out.println("testNormalScript()");
-+ bug8016833 b = new bug8016833() {
-+ @Override
-+ void setNormalStyle(Style style) {
-+ }
-+ };
-+ b.testUnderline();
-+ b.testStrikthrough();
-+ }
-+
-+ public static void main(String[] args) {
-+ testSubScript();
-+ testSuperScript();
-+ testNormalScript();
-+ }
-+}
---- ./jdk/test/javax/swing/text/View/8014863/bug8014863.java 2013-09-06 11:30:00.000000000 -0700
-+++ ./jdk/test/javax/swing/text/View/8014863/bug8014863.java 2014-07-15 21:49:30.000000000 -0700
-@@ -24,6 +24,7 @@
- /*
- * @test
- * @bug 8014863
-+ * @bug 8024395
- * @summary Tests the calculation of the line breaks when a text is inserted
- * @author Dmitry Markov
- * @library ../../../regtesthelpers
-@@ -34,91 +35,107 @@
- import sun.awt.SunToolkit;
-
- import javax.swing.*;
-+import javax.swing.text.GlyphView;
-+import javax.swing.text.View;
- import javax.swing.text.html.HTMLEditorKit;
- import java.awt.*;
- import java.awt.event.KeyEvent;
-+import java.lang.reflect.Field;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-
- public class bug8014863 {
-
- private static JEditorPane editorPane;
-+ private static JFrame frame;
- private static Robot robot;
- private static SunToolkit toolkit;
-
-+ private static String text1 = "<p>one two qqqq <em>this is a test sentence</em> qqqq <em>pp</em> qqqq <em>pp</em> " +
-+ "qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq</p>";
-+ private static String text2 = "<p>qqqq <em>this is a test sentence</em> qqqq <em>pp</em> qqqq <em>pp</em> " +
-+ "qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq</p>";
-+
-+ private static ArrayList<GlyphView> glyphViews;
-+
- public static void main(String[] args) throws Exception {
- toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
- robot = new Robot();
-+ robot.setAutoDelay(50);
-+ glyphViews = new ArrayList<GlyphView>();
-
-- createAndShowGUI();
-+ createAndShowGUI(text1);
-
- toolkit.realSync();
-
-- Util.hitKeys(robot, KeyEvent.VK_HOME);
-- Util.hitKeys(robot, KeyEvent.VK_O);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ retrieveGlyphViews(editorPane.getUI().getRootView(editorPane));
-+ }
-+ });
-+ GlyphView [] arr1 = glyphViews.toArray(new GlyphView[glyphViews.size()]);
-
-- toolkit.realSync();
-+ frame.dispose();
-+ glyphViews.clear();
-
-- if (3 != getNumberOfTextLines()) {
-- throw new RuntimeException("The number of texts lines does not meet the expectation");
-- }
--
-- Util.hitKeys(robot, KeyEvent.VK_N);
-+ createAndShowGUI(text2);
-
- toolkit.realSync();
-
-- if (3 != getNumberOfTextLines()) {
-- throw new RuntimeException("The number of texts lines does not meet the expectation");
-- }
-+ Util.hitKeys(robot, KeyEvent.VK_HOME);
-+ toolkit.realSync();
-
-+ Util.hitKeys(robot, KeyEvent.VK_O);
-+ Util.hitKeys(robot, KeyEvent.VK_N);
- Util.hitKeys(robot, KeyEvent.VK_E);
- Util.hitKeys(robot, KeyEvent.VK_SPACE);
- Util.hitKeys(robot, KeyEvent.VK_T);
- Util.hitKeys(robot, KeyEvent.VK_W);
-+ Util.hitKeys(robot, KeyEvent.VK_O);
-+ Util.hitKeys(robot, KeyEvent.VK_SPACE);
-
- toolkit.realSync();
-
-- if (3 != getNumberOfTextLines()) {
-- throw new RuntimeException("The number of texts lines does not meet the expectation");
-- }
-- }
--
-- private static int getNumberOfTextLines() throws Exception {
-- int numberOfLines = 0;
-- int caretPosition = getCaretPosition();
-- int current = 1;
-- int previous;
--
-- setCaretPosition(current);
-- do {
-- previous = current;
-- Util.hitKeys(robot, KeyEvent.VK_DOWN);
-- toolkit.realSync();
-- current = getCaretPosition();
-- numberOfLines++;
-- } while (current != previous);
--
-- setCaretPosition(caretPosition);
-- return numberOfLines;
-- }
--
-- private static int getCaretPosition() throws Exception {
-- final int[] result = new int[1];
- SwingUtilities.invokeAndWait(new Runnable() {
- public void run() {
-- result[0] = editorPane.getCaretPosition();
-+ retrieveGlyphViews(editorPane.getUI().getRootView(editorPane));
- }
- });
-- return result[0];
-+ GlyphView [] arr2 = glyphViews.toArray(new GlyphView[glyphViews.size()]);
-+
-+ if (arr1.length != arr2.length) {
-+ throw new RuntimeException("Test Failed!");
-+ }
-+
-+ for (int i=0; i<arr1.length; i++) {
-+ GlyphView v1 = arr1[i];
-+ GlyphView v2 = arr2[i];
-+ Field field = GlyphView.class.getDeclaredField("breakSpots");
-+ field.setAccessible(true);
-+ int[] breakSpots1 = (int[])field.get(v1);
-+ int[] breakSpots2 = (int[])field.get(v2);
-+ if (!Arrays.equals(breakSpots1,breakSpots2)) {
-+ throw new RuntimeException("Test Failed!");
-+ }
-+ }
-+
-+ frame.dispose();
- }
-
-- private static void setCaretPosition(final int position) throws Exception {
-- SwingUtilities.invokeAndWait(new Runnable() {
-- public void run() {
-- editorPane.setCaretPosition(position);
-+ private static void retrieveGlyphViews(View root) {
-+ for (int i=0; i<= root.getViewCount()-1; i++) {
-+ View view = root.getView(i);
-+ if (view instanceof GlyphView && view.isVisible()) {
-+ if (!glyphViews.contains(view)) {
-+ glyphViews.add((GlyphView)view);
-+ }
-+ } else {
-+ retrieveGlyphViews(view);
- }
-- });
-+ }
- }
-
-- private static void createAndShowGUI() throws Exception {
-+ private static void createAndShowGUI(final String text) throws Exception {
- SwingUtilities.invokeAndWait(new Runnable() {
- public void run() {
- try {
-@@ -126,17 +143,14 @@
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
-- JFrame frame = new JFrame();
-+ frame = new JFrame();
- frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
- editorPane = new JEditorPane();
- HTMLEditorKit editorKit = new HTMLEditorKit();
- editorPane.setEditorKit(editorKit);
-- editorPane.setText("<p>qqqq <em>pp</em> qqqq <em>pp</em> " +
-- "qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp" +
-- "</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq <em>pp</em> qqqq</p>");
-+ editorPane.setText(text);
- editorPane.setCaretPosition(1);
--
- frame.add(editorPane);
- frame.setSize(200, 200);
- frame.setVisible(true);
---- ./jdk/test/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,220 @@
-+/*
-+ * 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 8009579
-+ * @summary The initCause() incorrectly initialise the cause in
-+ * XPathException class when used with XPathException(String)
-+ * constructor.
-+ * @run main XPathExceptionInitCause
-+ * @author aleksej.efimov@oracle.com
-+ */
-+
-+import javax.xml.xpath.XPathException;
-+import java.io.ByteArrayOutputStream;
-+import java.io.ByteArrayInputStream;
-+import java.io.ObjectOutputStream;
-+import java.io.ObjectInputStream;
-+import java.io.IOException;
-+import java.io.InvalidClassException;
-+
-+
-+public class XPathExceptionInitCause {
-+
-+ /* This is a serial form of XPathException with two causes serialized
-+ * by JDK7 code:
-+ *
-+ * ByteArrayOutputStream fser = new ByteArrayOutputStream();
-+ * ObjectOutputStream oos = new ObjectOutputStream(fser);
-+ * oos.writeObject(new XPathException(new Exception()).initCause(null));
-+ * oos.close();
-+ */
-+ static final byte [] TWOCAUSES = {-84,-19,0,5,115,114,0,30,106,97,118,97,120,46,120,
-+ 109,108,46,120,112,97,116,104,46,88,80,97,116,104,69,120,99,101,112,116,
-+ 105,111,110,-26,-127,97,60,-120,119,127,28,2,0,1,76,0,5,99,97,117,115,101,
-+ 116,0,21,76,106,97,118,97,47,108,97,110,103,47,84,104,114,111,119,97,98,
-+ 108,101,59,120,114,0,19,106,97,118,97,46,108,97,110,103,46,69,120,99,101,
-+ 112,116,105,111,110,-48,-3,31,62,26,59,28,-60,2,0,0,120,114,0,19,106,97,
-+ 118,97,46,108,97,110,103,46,84,104,114,111,119,97,98,108,101,-43,-58,53,
-+ 39,57,119,-72,-53,3,0,4,76,0,5,99,97,117,115,101,113,0,126,0,1,76,0,13,
-+ 100,101,116,97,105,108,77,101,115,115,97,103,101,116,0,18,76,106,97,118,
-+ 97,47,108,97,110,103,47,83,116,114,105,110,103,59,91,0,10,115,116,97,99,
-+ 107,84,114,97,99,101,116,0,30,91,76,106,97,118,97,47,108,97,110,103,47,83,
-+ 116,97,99,107,84,114,97,99,101,69,108,101,109,101,110,116,59,76,0,20,115,
-+ 117,112,112,114,101,115,115,101,100,69,120,99,101,112,116,105,111,110,115,
-+ 116,0,16,76,106,97,118,97,47,117,116,105,108,47,76,105,115,116,59,120,112,
-+ 112,112,117,114,0,30,91,76,106,97,118,97,46,108,97,110,103,46,83,116,97,99,
-+ 107,84,114,97,99,101,69,108,101,109,101,110,116,59,2,70,42,60,60,-3,34,57,
-+ 2,0,0,120,112,0,0,0,1,115,114,0,27,106,97,118,97,46,108,97,110,103,46,83,
-+ 116,97,99,107,84,114,97,99,101,69,108,101,109,101,110,116,97,9,-59,-102,
-+ 38,54,-35,-123,2,0,4,73,0,10,108,105,110,101,78,117,109,98,101,114,76,0,
-+ 14,100,101,99,108,97,114,105,110,103,67,108,97,115,115,113,0,126,0,4,76,
-+ 0,8,102,105,108,101,78,97,109,101,113,0,126,0,4,76,0,10,109,101,116,104,
-+ 111,100,78,97,109,101,113,0,126,0,4,120,112,0,0,0,31,116,0,23,88,80,97,116,
-+ 104,69,120,99,101,112,116,105,111,110,83,101,114,105,97,108,105,122,101,
-+ 116,0,28,88,80,97,116,104,69,120,99,101,112,116,105,111,110,83,101,114,105,
-+ 97,108,105,122,101,46,106,97,118,97,116,0,4,109,97,105,110,115,114,0,38,
-+ 106,97,118,97,46,117,116,105,108,46,67,111,108,108,101,99,116,105,111,110,
-+ 115,36,85,110,109,111,100,105,102,105,97,98,108,101,76,105,115,116,-4,15,
-+ 37,49,-75,-20,-114,16,2,0,1,76,0,4,108,105,115,116,113,0,126,0,6,120,114,
-+ 0,44,106,97,118,97,46,117,116,105,108,46,67,111,108,108,101,99,116,105,111,
-+ 110,115,36,85,110,109,111,100,105,102,105,97,98,108,101,67,111,108,108,101,
-+ 99,116,105,111,110,25,66,0,-128,-53,94,-9,30,2,0,1,76,0,1,99,116,0,22,76,
-+ 106,97,118,97,47,117,116,105,108,47,67,111,108,108,101,99,116,105,111,110,
-+ 59,120,112,115,114,0,19,106,97,118,97,46,117,116,105,108,46,65,114,114,97,
-+ 121,76,105,115,116,120,-127,-46,29,-103,-57,97,-99,3,0,1,73,0,4,115,105,
-+ 122,101,120,112,0,0,0,0,119,4,0,0,0,0,120,113,0,126,0,20,120,115,113,0,126,
-+ 0,2,113,0,126,0,21,112,117,113,0,126,0,8,0,0,0,1,115,113,0,126,0,10,0,0,0,
-+ 31,113,0,126,0,12,113,0,126,0,13,113,0,126,0,14,113,0,126,0,18,120
-+ };
-+
-+ /* This is a serial form of ordinary XPathException serialized by JDK7 code:
-+ *
-+ * Throwable cause = new Throwable( "message 1" );
-+ * XPathException xpathexcep = new XPathException( "message 2" );
-+ * xpathexcep.initCause( cause );
-+ * ByteArrayOutputStream fser = new ByteArrayOutputStream();
-+ * ObjectOutputStream oos = new ObjectOutputStream(fser);
-+ * oos.writeObject(xpathexcep);
-+ * oos.close();
-+ */
-+ static final byte [] NORMALJDK7SER = {-84,-19,0,5,115,114,0,30,106,97,118,97,120,
-+ 46,120,109,108,46,120,112,97,116,104,46,88,80,97,116,104,69,120,99,101,112,
-+ 116,105,111,110,-26,-127,97,60,-120,119,127,28,2,0,1,76,0,5,99,97,117,115,
-+ 101,116,0,21,76,106,97,118,97,47,108,97,110,103,47,84,104,114,111,119,97,
-+ 98,108,101,59,120,114,0,19,106,97,118,97,46,108,97,110,103,46,69,120,99,
-+ 101,112,116,105,111,110,-48,-3,31,62,26,59,28,-60,2,0,0,120,114,0,19,106,
-+ 97,118,97,46,108,97,110,103,46,84,104,114,111,119,97,98,108,101,-43,-58,
-+ 53,39,57,119,-72,-53,3,0,4,76,0,5,99,97,117,115,101,113,0,126,0,1,76,0,13,
-+ 100,101,116,97,105,108,77,101,115,115,97,103,101,116,0,18,76,106,97,118,
-+ 97,47,108,97,110,103,47,83,116,114,105,110,103,59,91,0,10,115,116,97,99,
-+ 107,84,114,97,99,101,116,0,30,91,76,106,97,118,97,47,108,97,110,103,47,83,
-+ 116,97,99,107,84,114,97,99,101,69,108,101,109,101,110,116,59,76,0,20,115,
-+ 117,112,112,114,101,115,115,101,100,69,120,99,101,112,116,105,111,110,115,
-+ 116,0,16,76,106,97,118,97,47,117,116,105,108,47,76,105,115,116,59,120,112,
-+ 115,113,0,126,0,3,113,0,126,0,8,116,0,9,109,101,115,115,97,103,101,32,49,
-+ 117,114,0,30,91,76,106,97,118,97,46,108,97,110,103,46,83,116,97,99,107,84,
-+ 114,97,99,101,69,108,101,109,101,110,116,59,2,70,42,60,60,-3,34,57,2,0,0,
-+ 120,112,0,0,0,1,115,114,0,27,106,97,118,97,46,108,97,110,103,46,83,116,97,
-+ 99,107,84,114,97,99,101,69,108,101,109,101,110,116,97,9,-59,-102,38,54,-35,
-+ -123,2,0,4,73,0,10,108,105,110,101,78,117,109,98,101,114,76,0,14,100,101,
-+ 99,108,97,114,105,110,103,67,108,97,115,115,113,0,126,0,4,76,0,8,102,105,
-+ 108,101,78,97,109,101,113,0,126,0,4,76,0,10,109,101,116,104,111,100,78,97,
-+ 109,101,113,0,126,0,4,120,112,0,0,0,19,116,0,23,88,80,97,116,104,69,120,
-+ 99,101,112,116,105,111,110,83,101,114,105,97,108,105,122,101,116,0,28,88,
-+ 80,97,116,104,69,120,99,101,112,116,105,111,110,83,101,114,105,97,108,105,
-+ 122,101,46,106,97,118,97,116,0,4,109,97,105,110,115,114,0,38,106,97,118,
-+ 97,46,117,116,105,108,46,67,111,108,108,101,99,116,105,111,110,115,36,85,
-+ 110,109,111,100,105,102,105,97,98,108,101,76,105,115,116,-4,15,37,49,-75,
-+ -20,-114,16,2,0,1,76,0,4,108,105,115,116,113,0,126,0,6,120,114,0,44,106,
-+ 97,118,97,46,117,116,105,108,46,67,111,108,108,101,99,116,105,111,110,115,
-+ 36,85,110,109,111,100,105,102,105,97,98,108,101,67,111,108,108,101,99,116,
-+ 105,111,110,25,66,0,-128,-53,94,-9,30,2,0,1,76,0,1,99,116,0,22,76,106,97,
-+ 118,97,47,117,116,105,108,47,67,111,108,108,101,99,116,105,111,110,59,120,
-+ 112,115,114,0,19,106,97,118,97,46,117,116,105,108,46,65,114,114,97,121,76,
-+ 105,115,116,120,-127,-46,29,-103,-57,97,-99,3,0,1,73,0,4,115,105,122,101,
-+ 120,112,0,0,0,0,119,4,0,0,0,0,120,113,0,126,0,22,120,116,0,9,109,101,115,
-+ 115,97,103,101,32,50,117,113,0,126,0,10,0,0,0,1,115,113,0,126,0,12,0,0,0,
-+ 20,113,0,126,0,14,113,0,126,0,15,113,0,126,0,16,113,0,126,0,20,120,112
-+ };
-+
-+ //Serialize XPathException
-+ static byte [] pickleXPE(XPathException xpe) throws IOException {
-+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
-+ ObjectOutputStream xpeos = new ObjectOutputStream(bos);
-+ xpeos.writeObject(xpe);
-+ xpeos.close();
-+ return bos.toByteArray();
-+ }
-+
-+ //Deserialize XPathException with byte array as serial data source
-+ static XPathException unpickleXPE(byte [] ser)
-+ throws IOException, ClassNotFoundException {
-+ XPathException xpe;
-+ ByteArrayInputStream bis = new ByteArrayInputStream(ser);
-+ ObjectInputStream xpeis = new ObjectInputStream(bis);
-+ xpe = (XPathException) xpeis.readObject();
-+ xpeis.close();
-+ return xpe;
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ Throwable cause = new Throwable("message 1");
-+ XPathException xpathexcep = new XPathException("message 2");
-+
-+ //Test XPE initCause() method
-+ xpathexcep.initCause(cause);
-+ System.out.println("getCause() result: '" + xpathexcep.getCause()
-+ + "' Cause itself: '" + cause + "'");
-+ if (!xpathexcep.getCause().toString().equals(cause.toString())) {
-+ throw new Exception("Incorrect cause is set by initCause()");
-+ }
-+
-+ //Test serialization/deserialization of initialized XPE
-+ byte [] xpeserial;
-+ XPathException xpedeser;
-+ xpeserial = pickleXPE(xpathexcep);
-+ xpedeser = unpickleXPE(xpeserial);
-+ System.out.println("Serialized XPE: message='" + xpathexcep.getMessage()
-+ + "' cause='" + xpathexcep.getCause().toString() + "'");
-+ System.out.println("Deserialized XPE: message='" + xpedeser.getMessage()
-+ + "' cause='" + xpedeser.getCause().toString()+"'");
-+ if(xpedeser.getCause() == null ||
-+ !xpedeser.getCause().toString().equals(cause.toString()) ||
-+ !xpedeser.getMessage().toString().equals("message 2") )
-+ throw new Exception("XPathException incorrectly serialized/deserialized");
-+
-+ //Test serialization/deserialization of uninitialized cause in XPE
-+ XPathException xpeuninit = new XPathException("uninitialized cause");
-+ xpeserial = pickleXPE(xpeuninit);
-+ xpedeser = unpickleXPE(xpeserial);
-+ System.out.println("Serialized XPE: message='" + xpeuninit.getMessage()
-+ + "' cause='" + xpeuninit.getCause()+"'");
-+ System.out.println("Deserialized XPE: message='" + xpedeser.getMessage()
-+ + "' cause='" + xpedeser.getCause()+"'");
-+ if(xpedeser.getCause() != null ||
-+ !xpedeser.getMessage().toString().equals("uninitialized cause") )
-+ throw new Exception("XPathException incorrectly serialized/deserialized");
-+
-+ //Test deserialization of normal XPathException serialized by JDK7
-+ XPathException xpejdk7 = unpickleXPE(NORMALJDK7SER);
-+ if(xpejdk7 == null || xpejdk7.getCause() == null ||
-+ !xpejdk7.getMessage().equals("message 2") ||
-+ !xpejdk7.getCause().getMessage().equals("message 1"))
-+ throw new Exception("XpathException serialized by JDK7 was "
-+ + "incorrectly deserialized.");
-+
-+ //Test deserialization of XPathException with two causes from JDK7.
-+ //The serialization are done for the following XPathException object:
-+ // new XPathException(new Exception()).initCause(null)
-+ try {
-+ xpejdk7 = unpickleXPE(TWOCAUSES);
-+ throw new Exception("Expected InvalidClassException but it wasn't"
-+ + " observed");
-+ } catch(InvalidClassException e) {
-+ System.out.println("InvalidClassException caught as expected.");
-+ }
-+
-+ }
-+}
---- ./jdk/test/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,72 @@
-+/*
-+ * 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 8015978
-+ * @summary Incorrect transformation of XPath expression "string(-0)"
-+ * @run main XPathNegativeZero
-+ * @author aleksej.efimov@oracle.com
-+ */
-+
-+import java.io.File;
-+import java.io.StringWriter;
-+import javax.xml.transform.TransformerFactory;
-+import javax.xml.transform.Templates;
-+import javax.xml.transform.Transformer;
-+import javax.xml.transform.Source;
-+import javax.xml.transform.Result;
-+import javax.xml.transform.stream.StreamSource;
-+import javax.xml.transform.stream.StreamResult;
-+
-+
-+public class XPathNegativeZero {
-+
-+ static final String EXPECTEDXML = "<newtop>\"0\"</newtop>";
-+
-+ public static void main(final String[] args) throws Exception {
-+ //file name of XML file to transform
-+ final String xml = System.getProperty("test.src", ".")+"/dummy.xml";
-+ //file name of XSL file w/ transformation
-+ final String xsl = System.getProperty("test.src", ".")+"/negativezero.xsl";
-+ final String result = xform(xml, xsl).trim();
-+
-+ System.out.println("transformed XML: '"+result+ "' expected XML: '"+EXPECTEDXML+"'");
-+ if (!result.equals(EXPECTEDXML))
-+ throw new Exception("Negative zero was incorrectly transformed");
-+ }
-+
-+ private static String xform(final String xml, final String xsl) throws Exception {
-+ final TransformerFactory tf = TransformerFactory.newInstance();
-+ final Source xslsrc = new StreamSource(new File(xsl));
-+ final Templates tmpl = tf.newTemplates(xslsrc);
-+ final Transformer t = tmpl.newTransformer();
-+
-+ StringWriter writer = new StringWriter();
-+ final Source src = new StreamSource(new File(xml));
-+ final Result res = new StreamResult(writer);
-+
-+ t.transform(src, res);
-+ return writer.toString();
-+ }
-+}
---- ./jdk/test/javax/xml/jaxp/XPath/8015978/dummy.xml 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/XPath/8015978/dummy.xml 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1 @@
-+<top/>
---- ./jdk/test/javax/xml/jaxp/XPath/8015978/negativezero.xsl 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/XPath/8015978/negativezero.xsl 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,4 @@
-+<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>
-+ <xsl:output method='xml' indent='yes' omit-xml-declaration='yes'/>
-+ <xsl:template match='/'><newtop>"<xsl:value-of select='string(-0.0)'/>"</newtop></xsl:template>
-+</xsl:stylesheet>
---- ./jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java 2013-09-06 11:30:01.000000000 -0700
-+++ ./jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java 2014-07-15 21:49:30.000000000 -0700
-@@ -22,7 +22,8 @@
- */
-
- /**
-- * @test @bug 8022548
-+ * @test
-+ * @bug 8022548
- * @summary test that a parser can use DTDConfiguration
- * @run main XOMParserTest
- */
-@@ -60,30 +61,27 @@
- }
-
- public final void testTransform() {
-+ String inFilename = filePath + "/JDK8022548.xml";
-+ String xslFilename = filePath + "/JDK8022548.xsl";
-+ String outFilename = "JDK8022548.out";
-+
-+ try (InputStream xslInput = new FileInputStream(xslFilename);
-+ InputStream xmlInput = new FileInputStream(inFilename);
-+ OutputStream out = new FileOutputStream(outFilename);
-+ ) {
-
-- try {
--
-- String inFilename = filePath + "/JDK8022548.xml";
-- String xslFilename = filePath + "/JDK8022548.xsl";
-- String outFilename = filePath + "/JDK8022548.out";
-
- StringWriter sw = new StringWriter();
- // Create transformer factory
- TransformerFactory factory = TransformerFactory.newInstance();
-- // set the translet name
--// factory.setAttribute("translet-name", "myTranslet");
--
-- // set the destination directory
--// factory.setAttribute("destination-directory", "c:\\temp");
--// factory.setAttribute("generate-translet", Boolean.TRUE);
-
- // Use the factory to create a template containing the xsl file
-- Templates template = factory.newTemplates(new StreamSource(new FileInputStream(xslFilename)));
-+ Templates template = factory.newTemplates(new StreamSource(xslInput));
- // Use the template to create a transformer
- Transformer xformer = template.newTransformer();
- // Prepare the input and output files
-- Source source = new StreamSource(new FileInputStream(inFilename));
-- Result result = new StreamResult(new FileOutputStream(outFilename));
-+ Source source = new StreamSource(xmlInput);
-+ Result result = new StreamResult(outFilename);
- //Result result = new StreamResult(sw);
- // Apply the xsl file to the source file and write the result to the output file
- xformer.transform(source, result);
---- ./jdk/test/javax/xml/jaxp/parsers/8024707/TestFunc.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8024707/TestFunc.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,35 @@
-+/*
-+ * 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 org.w3c.dom.Node;
-+import org.w3c.dom.NodeList;
-+
-+/**
-+ * bug 8024707
-+ */
-+
-+public class TestFunc {
-+ public static Node test( NodeList list ) {
-+ return list.item(0);
-+ }
-+}
---- ./jdk/test/javax/xml/jaxp/parsers/8024707/XSLT.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8024707/XSLT.java 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,51 @@
-+/*
-+ * 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 8024707
-+ * @summary Test for XSLT extension function with 1 element sized nodelist
-+ * @compile TestFunc.java XSLT.java
-+ * @run main/othervm XSLT
-+ * @author aleksej.efimov@oracle.com
-+ */
-+
-+import javax.xml.transform.*;
-+import javax.xml.transform.stream.*;
-+import java.io.ByteArrayOutputStream;
-+
-+public class XSLT {
-+ static final String XMLTOTRANSFORM = "/in.xml";
-+ static final String XSLTRANSFORMER = "/test.xsl";
-+ static final String EXPECTEDRESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>inp1_1";
-+
-+ public static void main(String[] args) throws Exception {
-+ ByteArrayOutputStream resStream = new ByteArrayOutputStream();
-+ TransformerFactory trf = TransformerFactory.newInstance();
-+ Transformer tr = trf.newTransformer( new StreamSource(System.getProperty("test.src", ".")+XSLTRANSFORMER));
-+ tr.transform( new StreamSource(System.getProperty("test.src", ".")+XMLTOTRANSFORM), new StreamResult(resStream));
-+ System.out.println("Transformation completed. Result:"+resStream.toString());
-+ if (!resStream.toString().equals(EXPECTEDRESULT))
-+ throw new RuntimeException("Incorrect transformation result");
-+ }
-+}
---- ./jdk/test/javax/xml/jaxp/parsers/8024707/in.xml 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8024707/in.xml 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,4 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<root>
-+<input1><seq-elem1>inp1_1</seq-elem1></input1>
-+</root>
---- ./jdk/test/javax/xml/jaxp/parsers/8024707/test.xsl 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8024707/test.xsl 2014-07-15 21:49:30.000000000 -0700
-@@ -0,0 +1,10 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xsl:transform exclude-result-prefixes="cscdt_ufunc" version="1.0"
-+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-+ xmlns:cscdt_ufunc="http://xml.apache.org/xalan/java">
-+ <xsl:template match="/">
-+ <xsl:value-of
-+ select="cscdt_ufunc:TestFunc.test(/root/input1/seq-elem1)"
-+ />
-+ </xsl:template>
-+</xsl:transform>
---- ./jdk/test/javax/xml/jaxp/parsers/8027359/XML11EntityScannerTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8027359/XML11EntityScannerTest.java 2014-10-28 20:19:47.000000000 -0700
-@@ -0,0 +1,184 @@
-+/*
-+ * 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 8027359
-+ * @summary test that the XML11EntityScanner refreshes cache when it loads new data
-+ * @run main XML11EntityScannerTest
-+ */
-+
-+import java.io.*;
-+import java.util.regex.Pattern;
-+import javax.xml.parsers.DocumentBuilderFactory;
-+import org.w3c.dom.*;
-+
-+
-+/**
-+ * XML11EntityScanner functions similarly as XMLEntityScanner in handling data
-+ * cache
-+ */
-+public class XML11EntityScannerTest {
-+ static final String rawXML =
-+ "<?xml version=\"1.1\" encoding=\"UTF-8\" standalone=\"no\"?>"
-+ + "<WebOfTrustRC2 Version=\"4004\">"
-+ + "<Identity Name=\"maggot\" PublishesTrustList=\"true\" Version=\"1\">"
-+ + "<Context Name=\"Introduction\"/>"
-+ + "<Context Name=\"FreetalkRC2\"/>"
-+ + "<Property Name=\"IntroductionPuzzleCount\" Value=\"10\"/>"
-+ + "<TrustList>"
-+ + "<Trust Comment=\"\" Identity=\"USK@fdZ2In5mnLVG6RTc5hq9P~M1EG0WuH-itZ7mnQx2iuM,aUG-57VqxQLhQ4N1uNmH9kSI2syEfVFrVOIPAKTY2Yg,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@YwwRkHSo-xU8CvSFcLqlU2FFsQ3ztjr0X~xPXkX-klY,poB3tdcXrBU9naI0pyNVYp~zQmHaFkRRTj8xB8tuiPc,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@lsd~~79wrGvfb99FnAEY4VhJg2b5KFUloCOUff-Q2fk,71eV-F580euOtaCgim69Yw~2Rjh43DT49sl6zNamjk0,AQACAAE/WebOfTrustRC2/47\" Value=\"100\"/>"
-+ + "<Trust Comment=\"Automatically assigned trust to a seed identity.\" Identity=\"USK@xyzElfFQnwBb4ZuSEh1aSNsbRjEGCTa-2rcjeW58A4E,TiYrXSCcoGETPf0TWLNthaimJEP1PW7nJ2tYXKxdC4s,AQACAAE/WebOfTrustRC2/456\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@pTtYoCsMO-~~2Grqya6Y7cf7nIU3VlL4168-c6EIwA8,QabBgrH1LYKKyBROnWz1r6iI8N7WFTt-mKD-0Qxsw1w,AQACAAE/WebOfTrustRC2/133\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@m~lDSvnetPNy77wsoxDZDUf7OkgX6ZAd7ob9orm3J4Y,SEX20g148KGJg3bsxvXNPNbUsVs1yQ5LfVUOGMh~1Q0,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@ss5yQit~bQL5easM68d4sImnPAxHNUbi99XtDMhpzgQ,CnpuD8dO29KvpkQyxtz1llAxHCB7yXfqrQLNRIELZow,AQACAAE/WebOfTrustRC2/2\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@krPcyGts~~wZTbABTAJ59nSplmum2~EkSD5IzinrFko,7YEbm-YEx1LFoZVHtGmIa5q0KbEjw48Rgwx2NqwrH~o,AQACAAE/WebOfTrustRC2/15\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@Usl-yNWc3VtuQWQ9srowZaWyfB6MiD9fzM5WexrlKE8,qMS83aGFsN~aFGajUmGrnbXvRIYZMd8N8IjnGmEvi-s,AQACAAE/WebOfTrustRC2/68\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@St0yKRdQJ3Lq17yoVt9h08bMfhqRhH1vtrcVVInoZVU,BaYM72qM3CYO1yzfVyO1UDUobL56CMbt9EQt3sEXabA,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@P8v4ZHUBPYGylYC-KHeWmeu5ZvB6RPYGgKcI5639Wz8,OM9PvjwMlt4L6jKRhqpvyblwpVMYumUgYFrAu3NxY~o,AQACAAE/WebOfTrustRC2/54\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@u2vn3Lh6Kte2-TgBSNKorbsKkuAt34ckoLmgx0ndXO0,4~q8q~3wIHjX9DT0yCNfQmr9oxmYrDZoQVLOdNg~yk0,AQACAAE/WebOfTrustRC2/2\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@MotrIucaZk37pJNS~HHpW5Vea3q0EZpfENPNGSjWh9s,RkFyDjl6-l7V-xYMWtGypmDYk-VehAU1LXmNYdIlHJs,AQACAAE/WebOfTrustRC2/108\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@KXAWN8DJxJ48XzZu7IBBpZ7SFc4n-OXqu4HhQC0V9Ww,DyklyACbgDCZyFpq-LeNqmuve7KWv-WDvJicd37ycn4,AQACAAE/WebOfTrustRC2/11\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@D6BZ1sSEmDMKNMPUN9I~7AalkkXockAdtbxONEN315w,0LiGUSSv4Ln4O7Xe4GQjpMEflNN7okKAH42Vlpv8d8s,AQACAAE/WebOfTrustRC2/56\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@sDehmSJoiaKYT455GIGHIVNKMs7KmiiwXXcCIcDhZ3o,upypWy-ze9Cz7WiCnbbJmoZOh7Xtveitftc5bE~p0Ug,AQACAAE/WebOfTrustRC2/6\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@GsTGXzIm9BTM5~KSZJknfTcPpJtlRs62aJtkNp05T5A,wuQcDjsdPQD9Fa21zWGB5GiiDlmf56vI9Niu5jl8eiM,AQACAAE/WebOfTrustRC2/31\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@eLFdT9VWP60iPNf8a3AkZrzgkcgje2n3Ca1yS8Tc5HU,5D0PISp19VkgzD4VSrRFTmo2CCvRoIuxlQzgMZBmj74,AQACAAE/WebOfTrustRC2/62\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@rz12UCXn-lG53i-6JswD98Kk9Zp0kt05gqIMNYc~9d0,42hoYZ5f~1fPuyvTOVYGJ~28MgYBSfoyzceR8-u1Z2I,AQACAAE/WebOfTrustRC2/126\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@5CYp3t28N5ZbPss9XhOkwUjD~T65q6-nc4aGwbV~-O0,CBfwMjYBiqKunzj3k6Ofpo9pyQsVFPz0OUWVzfd5a0c,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@dSSrRL9BY7JmTQD0dCpcIgVaLFF7pqU8EJzVUp1BYPA,EkTPkLrhEBQLPq-dRVPB1f2CAVdFGbXbUBlIww6re60,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@cw2rrCAcYTBjlO-I8DfEj-txttebZMG2LwuPGJV3Qlg,5ZcXLJW8G-R2SFqg4TEQX7IMs~e3Q4DjxUXGuHr9fxA,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@7zpRmhkkd5XcAUY6yUwp-53t7to3UN96w98~KQEwha0,30VpXev32s2mhmM5aBRJ---I0OlYbbN6~18j8rJ6qMU,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@YmCWYwlaSeE8o~8GawGYWeuPwsgVQtlBwlBkhGQFX04,H3DthY0MZXTe4rL0vsUOOMQDaj6UB9wK59yEwG8Q6No,AQACAAE/WebOfTrustRC2/13\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@aO9svsQEWmib~UyF1ihRUHA8i6uZprGy-tIS-Od9MMk,kwaMemPMVp-jcIRgGLAdF6PZimNE2cZFbvM6ShXAuZw,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@6J7FWPHwiCElTRXAO77tMGYAiLxerNF~5olAG0alQxQ,cz72iTz9FT~H57TgroVFv1eZlN5Ia5dhCtRa8bLh1KQ,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@kukYpNG56TNUnQzQe1RZvSYoqQ5B9lcoMZyDlh7xfO4,DNybejZVcWBAaByMRYYLZlgzUjQg28V8j6Zu1CtBc~g,AQACAAE/WebOfTrustRC2/27\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@a-tin0kMl1I~8xn5lkQDqYZRExKLzJITrxcNsr4T~fY,0VmnI67gAzIpdXlZFq~hYD8ikR5IEAg5QTwQv5Ifv5M,AQACAAE/WebOfTrustRC2/24\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@g~4XXw0hjp9TLocYZzunYWX6Don2AQhG-zplmzoCmY0,lyNjClSjRCrBZXVcmPKEAfvH01ySPgv1NWqL8wd11L8,AQACAAE/WebOfTrustRC2/115\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@UXgNMPe1YbVpXHOBXgMlcm9XcGY0G3gUtu43IO-YLLA,7EHSp20GHupg0rWrGPRY1g0TFJcRs-kubVtAcQRMxAc,AQACAAE/WebOfTrustRC2/69\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@lHrF2trsC9gyVeT2zpoL6IlZMz0aKlhN4xa2Ig70rmA,niASdKFC3nDfW6KMvzcv6VmRoHakE7GQAFpfz~2-v3Y,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@hp7IFNYSA97cHNAnHcreTJjQE5fF5sbsFlvbcZXaoxQ,O5h6cAcl5MvxuE2-xOkuvUP4JkT59NQNtaSmtuAS2Y8,AQACAAE/WebOfTrustRC2/16\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@QKPxALYrv6UyAGJs7tor8YlcikFzmy2msZ~42JMT~80,vx01piijkj0o3K8gzNaAOIIZ7NAtQVvPBxlRKtc4iP0,AQACAAE/WebOfTrustRC2/35\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@NmNfUNIr2WwIb9Ej1038Pk0M5gS1M0eHKvxdWqRUfTg,JUJYTsWuNQPOHK039Rczp6oPZDbfPdbO62gSaCuBXFQ,AQACAAE/WebOfTrustRC2/69\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@ONB7kRFo7mI0O3~QLRWlTbo1oB91XmGGS7KtSzz4XVI,yGiqMWRwR~i6ffAXOTBvrngHGC6nYOETUXj4L6Izj64,AQACAAE/WebOfTrustRC2/122\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@k-i0PmxoxO6Mahx8s850Rd7TEe0r4cnEohqC66aMDKw,IlTVYmQ9OSHjiu5pOLq4t-8r50SsVPNMlXn56zfpfDI,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@GtzvV-VHMGQILkpZ3O4CWBTWlhB423UUwpIlzRDgBLs,HUxBDT-Hhy6GqjBV24NRMjlK-o76YGMEgO~ZS6yighU,AQACAAE/WebOfTrustRC2/6\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@Ws0yzkcOYw6ax~kCtnzyX4MgLBHiQd5a6u9FMUmqLG4,zqNjNNGLz7HE4pdSPTovX2AwzGQWJ3-LI7YZt7aq3gg,AQACAAE/WebOfTrustRC2/30\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@6brkdrKlglWHnqMjWG6wrdLMWGPooc~7wQ7ID-PIsJk,X3RRBIdOQ5zthpkk8FjLL33LyoVVI4csJ1~g~sZ1msc,AQACAAE/WebOfTrustRC2/63\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@4DO0Yp1a3RZeAUAjeoPVu~GqpKhaX8RYqe~mwcWgjsM,klsqky963KI6uG3JqE1crihSeBbKBgkJHkIZ2xkWJ4A,AQACAAE/WebOfTrustRC2/36\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@axtoU6zHIkx3bicWK-hLNOj0br4xi0HW1qZ8H6CEv0U,SuPIncAHyYXmR9jQkTFUJd-QgGm0g9lW5ESUjzFOl~Q,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@BYsosP8TA22rSz1uA0KGbp6OVFZXhdgAlpH4R4hX9zE,o~qV5IzMR3m7ZOnnG5FPnDqpdffEpu7yOM7VEU9j6lQ,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@EilKmVin5cVL7b4FoEQ7ZoHS932O8OI880Qkd~tmzWs,8WK34lo95u~b60GLVczYU6EiRpY0LH7130~ASP9F6dU,AQACAAE/WebOfTrustRC2/75\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@xDYiCplSPLvFGC2dQjAC6eeaYVyQMtV-HmkpuKIJPgQ,CYKZcPacSNfB67IK10xlq7~bAqR-aOnZIA~yhHs2Hj0,AQACAAE/WebOfTrustRC2/71\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@DfCUA1sEJgiGzijEO0BWgeGjjHi28GGgv76H4rLujp8,1lnaOtPiXmvhpRZkBamZNF47uETNKIBgjSzElxcLhZc,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@F45FWNz9rs6TmafG~6n5Bg3Sr69YCHY9v01KTyK17lw,ikIvUS079Qw3aQknvdM8yKgr0XwjcqHgW0pWLu-1osA,AQACAAE/WebOfTrustRC2/13\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@VTDWbj9C5FUEXZBQRXmSsV1aEdOfsB9QHKzZ7-CnCh4,aDjtAVMuGPpCmw1rnCAj5myEnq9HYZeIzrfrhJO2JNw,AQACAAE/WebOfTrustRC2/52\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@dhYMUELq~HtJOweiV2JkGcoFS6hulHd9O~7a9LpGIxM,M-H3ySL8BdCctDUvwvbFNwHUyO1zghSNyotLqkKowi8,AQACAAE/WebOfTrustRC2/20\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@oRpTFVvCqp8qFWiZyCh2QhQ85eh3eP8C8G4YTFhm~rw,kyyeUPuksdt7omGFYFxoWPz3lu6e0q~G1HBx8wFztFc,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@RINL4YHPkTUGBWSoohAoO7Knzk89XSnqnQ6pUZkRY~w,OvIyTUUf4T2Tm46-em~A7zn1zBksIwe-hJP3KKdCe6s,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@sEZ-eWgUcQSj-To7lClNN6QNoKuvt0Cz3iTGKv63wQo,krEwvob7MhJ-pGvIk-RM8pVDPFSuXYTZw58oc2Lc49o,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@gNTVpdblFLSKMzUBEQM8YTfrO2fQQNIZeV7yJRTqYTQ,EKJhCmbQ5hpMU3cd-J91uneBF7CxTLPqffPs6DxoSMs,AQACAAE/WebOfTrustRC2/21\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@AV8Ubs8pbsMQ1F028a~pSJqtatznLjvhnwfSAtm1QKg,lUHPp~mgzV-pVoG9lYpceL6oOUtFRpvyQjGQdfx1GjY,AQACAAE/WebOfTrustRC2/41\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@xb3QGWdoUpeX9Fn1ZKeDwGN884c2XAMTpYLM9z4OIKo,aWNEDvjhhacFKAjiYJLaUnK1e7dQ9sCk-cnqkGZd7F8,AQACAAE/WebOfTrustRC2/9\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@MrxyFFM~n-kZ4kYvOOZodsvAA2vwp2XtAQJCrkEEU6s,tSHvx3u7uJN8ciaTqBIzt3lLmonM9mj6I7pz88MtBXc,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@-tpkd0enlFMTnjANRjzMKyfE3uyXU-WDX8VUqk3MXEg,J6h7edIdQCsiuc53qahzMzxsyNayXL~9IR0x5QoJVxk,AQACAAE/WebOfTrustRC2/15\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@gBQsXbnA9HX6wQB8x7DIEJT6e7lOxq5jGF353Po~p90,HjdyCLfG9r-zSBN6-AXwA1he9blIO2WEN9u7dMQ7H1w,AQACAAE/WebOfTrustRC2/13\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@ye~rQ4m~pu2Iu3O2TH-GOLBbSeKoQ~QR~vC6tJbKmDg,YSuI-J1nKZjGB2zmIa9Bh2Wtud~jzYBuR7OVhXYh7qM,AQACAAE/WebOfTrustRC2/99\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@HwgX8mU9A7bd2sCsM9And7fotpMGqfba9LzxZtOHHOU,10nYjjfKDH5RB3YvCCi5bpq4GPR-myd8ea7n8DRvx~c,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@qQArPJZuODDeM6C2ndbSczsFLWmLDm2SoaE-9F1hwQU,E3x6TbIvBj~6D9GrMUWSYgnNkLRg85BXXy5~mncoNEI,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@4hm9fo4IN0akORyJECttbEGZ~rPCPQ9KKAAH2AWMy8E,klvTyVp-GJznJq8Sln4W2GUfV6tVX2TI2sPCGBFU4tM,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@x7SDH5rL2-tGOaOKFFNMRrylCq94OfiZTWt4t3nwRHk,~E-kX9VqlANo4MeccvNlXDIjJ5xTWTEDNW-Qk04Ke6U,AQACAAE/WebOfTrustRC2/17\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@A9RAAKmky5yroigSupz6Bvrmc4q5FN1SXSrSXa6oRUg,s3RfurouqPnKmlGRkERao6jOJv9kcrVBBKAHqZVuQH4,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@yEstdNIW54-3~YA7QnYodpyWgPZStskrN9WXLHujUrE,j4PciAtpUHOjR2wmaaCKwiryJAi~exjETJ13UPGJLTg,AQACAAE/WebOfTrustRC2/58\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@NZSwPe8RJQOTSQ-~cAuxy97ieuX9reSft0cyD0vfbJg,99y8KOdRJmVLCWqryDzB8NdBrQGY7V9JDFtgCQBuGsU,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@Nq6iEvHP0B2VCszLCenQrfyJmkD0vas~00-9MoWgcTA,6dI2kB1z9mtjwITkhc9~V86QE5gM9CJBMjdpvRzKAoY,AQACAAE/WebOfTrustRC2/29\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@ZaNXnLCT7OQrwhp4I9V-rI1ZAV9WzegFj0HSaEJQ-Z4,i23K-dQupDenVE8O3xGv92vVanfDeyjLYWescevMbGg,AQACAAE/WebOfTrustRC2/14\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@53e9r9zEkJ0TRW~Tq8XIWjZ3WkL7Jv5Ez8LDhdwwzwM,7a0vL0OmWkHy3gC5Zs~MxB4k0QppwK4igrH6iuwls68,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@W1c~RYRC09xIHiHIucfV~Rj4J8uKAGrUeHmrH-q-U1c,niOrI75WMQ-Dtl9luIbKBmnvf6chkQEKvUvoKvSjhxI,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@G6zv74PaPcVZcf78lWp-e1TfrCSNZa1ZaPvmjm7DVzk,f4Ft3sLQ6cUEwpumpTMt5N17UORfZoXjGfmke5PJbdc,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@m5ILsPVAlcOY5D91J2iQu~PIntZb3L-B1VkONjEZs2k,592dl39JXIF1kpC4OMkw7ELOhdPrn~WXBsZln20pM7Q,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@iK69tf7gzQ53oZV60rF6ZSwwCfADMRsJeG2YmODdmJc,5czI5ZmWbWLDr2L9JdDmkt7qrr8fs55VDt3tXnrFw0E,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@bloE1LJ~qzSYUkU2nt7sB9kq060D4HTQC66pk5Q8NpA,DOOASUnp0kj6tOdhZJ-h5Tk7Ka50FSrUgsH7tCG1usU,AQACAAE/WebOfTrustRC2/58\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@0j-H~zKeP9mh6LEJUl4HSJYC-lQWstYRJeC~5E2F5~c,VbjnSixETRzKp80jYYXD-bqsTUWzxwcYmI9ZSWsBrik,AQACAAE/WebOfTrustRC2/13\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@~4ZW0eji3~hYAakiCI056soETGPf9O94GtoIpE2NGEg,GdtKsS~WeDlBS~OL1egxqZ4pr-iPXHjT2zcy8pjvEK4,AQACAAE/WebOfTrustRC2/88\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@YommlOi4fTYx9axhnl9iAi9BNHRvnM5XWjl21i0563k,5FswxS7hPf2erR8KkrBobG8R9bekaakeY1tM8DDNsjI,AQACAAE/WebOfTrustRC2/2\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@-ucM1bn8sICGRAemM8wZ~BVHgX3ZPUoutjZY64mBIcQ,Ko~kC54wZ-joCpfdc67Vds8LkAIxvTJGpMtfQSl4mAA,AQACAAE/WebOfTrustRC2/2\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@VwcZEhjtMuFcYIa8r0yksTs~FvMWB7swEz6tK67Vmsw,0blSLTQDms-WWbw1IBuKIoR2ZvSHpI21lMFeByQPuII,AQACAAE/WebOfTrustRC2/56\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@HAoXk-dW6~j5eLdAZCEjyKTVC974wkdl-4QqrPcbyzE,NlS05DkGK8QzL~EVUOfb~Jl1EZoVJTQBQBzA6N2qMn4,AQACAAE/WebOfTrustRC2/7\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@2PK-12eJFcVziT6eMpiUpOpTlmDNAoVOKZvA~8s7VSg,EaHdnKfKoWQDclX1mwcQeGr5jo1ijxyExYqL7Vsf-o8,AQACAAE/WebOfTrustRC2/33\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@8D3L5TDTyp5jnbT4imUWK12QC-B0iaSxFPOstMX2URg,ZtSShNkEVV8whaGQtIxiJ3FBroihw8YDyZrWvqncs0s,AQACAAE/WebOfTrustRC2/12\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@HKv7Hp94hFz8CKlINXCImq~XIBL9VfsPSgqfR0QIZFQ,vFM45qVvCajf3iqZm~ykZYwqM0KhaUSkU3RGaxJzHLI,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@NJu4xYtC3cgZo8s2xqmap3eh1dy60tFQFoxU8aeSnq8,fp~WLcrSSUKnr9wDDz-geb8FDwADCMCA9fjKt04Cyg8,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@IazjsmIK8VnIjDkq3-ecMEKHmi0dBT1QsNBq2mp2Fuo,uu24sWwNW~tjszdw19Mz18NBGx1MSADi03BHZnttwFo,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@IfxF-y7PNV97WUiHLqlIwXQyfVsHjI-Am4unZ0AK-Qk,Xm78gNC236A3wZ1RWBnft4oBGHU1R88Yt9AlphmtJPo,AQACAAE/WebOfTrustRC2/36\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@i1YvNnlMkd0i~0SiXiDHlGaxbtYd8ZqEUij~VzxyXmM,rxi19mph9KtHA6~gVGJ1rZ6kytff~kJDm6~NrA4YQaI,AQACAAE/WebOfTrustRC2/9\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@nXf5sbMSDqE~OkCQ~8JaMgPbj2LQJcuouvO56ADo28s,uEMqVaBzpA06TaC8A0cqKuv~lSfqZBiijasA3nlQ0Fc,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@Y8fLVylNs~pB6sdA5Dl1l6T~hXQrLNZLMgfDl5-E5Z0,n0zdN5XUa-D5Puf0L9wu~xQQmU~A5TpfqJ4RFHJLjLs,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@F0ixRao2hQlvTQDkN6rPcwLTG2nA6x0r8RrTQ0443IQ,LxN-gYvq4eWRuhjAgejmgNqYJdIw0q8IJ2XNwwVHhmQ,AQACAAE/WebOfTrustRC2/12\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@Pgk~nJzSVNAjFHh-qTovvm6muY08igdOCEWuyUrbFvk,NlwUDwfQlbXRjIaFAVljD5E1loXi31Xq6dG8YC7JOR0,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@m9gYemmVNXe32Ao6jeUgW8ttgGlMSIAW1608YZ19olE,LnEWPRzsPlPfq2~gIYQ5SVV-V2lthAx254dht9EZgyU,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@Pwiulr-xlPJelS5CO4~do78zZHTL5TNIChF5hpz8nkY,z77V~KhcKZRWLSWtVzaWO-dt~TzCCJFCHUDhHXI715M,AQACAAE/WebOfTrustRC2/8\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@OH3ZkrLAkMJbQTjVW3e9ioH04F7jpUVNMekiQAAvRjs,J6qOC05GoqRgST93M1V90HWxq9VK4PCKIpltkL8GAhg,AQACAAE/WebOfTrustRC2/5\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@nirNdzBgVyqMpnuT5UrmX~TU354qDIY7XAp04Kutysg,vpf1npG3nUARPSkFRx9xbVT~w1ELw0jQhdiXbxWcafg,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@ozK579KUDjjxkve1gKeV8IDd5qe0NPtxlFVV2-8iXrM,hlU82qnHi5ZnIfSD5~hr4wmUjNFJjQYted7FJWBj8z8,AQACAAE/WebOfTrustRC2/12\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@D6JSlrnlDDXfnGhijswHC5a4-EBuYNFhg2IyoFhzRRM,tCJy6EvZRhk-Og9CIkR3jfLD4VYxwOY5Wf991XMLdmE,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@Bn1Ozb4~Q639N~GvSXrbzZoVx9ziFfbkiKf1akXr9dQ,DrwwRjH~WrErR595BqxyDeisgcTLRZjCsQUBQSdnPLk,AQACAAE/WebOfTrustRC2/10\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@~aHztTNobVhKiaJ2eE-k6LLMy3qrRzL0zvk1UZp1xAU,xs3tuQsYRrTgxoU5qrayiwoOYEOLE6bTHvIKBQLIwco,AQACAAE/WebOfTrustRC2/3\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@jr3FrHPhtxP-IYQ-A12A3jjNNK4-KcHsUH8qNpBGHJ0,WK9IlZuG17JZ3YvaRUR-3uHf1YqkxxyGxkpkLW56ZTY,AQACAAE/WebOfTrustRC2/1\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@iBBjdbuuabx3v7iy-Pt3WZjWuixqo2-rzH~2kV4FkwE,Hll6SNQ~FXY5mrOY2W0GTfyNhJSlOrYutJmoXeSKseE,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@TKOVixP3xx6nA3-cgl2fksatQzxg4LlReoK0GFl7uAo,r~MCdO2rhGxBgRYv2EPuIE-tP7-0z6vuwbS04oyoAyI,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@bK9LQT2mqilUY4DxwmlKvKi5Jfwf4Brr~EQGa8RLIRU,Ni90~c4q-VNFrxFS7cDimQwCcRsqdScHoElWQgBpoT8,AQACAAE/WebOfTrustRC2/6\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@DYXv~V1jDo0XBhaiaGeRvy-~snqMbBiFR~R8TK8VBNg,4YYHZfVVYZmudSCOetDlNxnvbLy6IULV1SOgeC1zXmI,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@CSWvDlm9RM31O9NPpZomFvpTVM8cV0brixDXxpwnJ7A,4wfD~qxb5hFgCBN0JWgK6p11wUCpOHGOWhJ4i2FgFhY,AQACAAE/WebOfTrustRC2/0\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@sFsqYnIVQ9FwULsp3e-q0M46fRw2jVsLJYF9PUyHVME,aDhfrzYPt4O0BTuuRF3aCPTR0A~zr2rqHtPpJXeSqFU,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
-+ + "<Trust Comment=\"\" Identity=\"USK@1QwMtp0oc4jIh6DFUjec~U0O3ldWHrRmhh5OZd41MMo,GZ-QOMc4mAkHhG4LwJWU~-rl0zJIp90YcB5hn3M9tlg,AQACAAE/WebOfTrustRC2/4\" Value=\"100\"/>"
-+ + "</TrustList>"
-+ + "</Identity>"
-+ + "</WebOfTrustRC2>";
-+
-+ /**
-+ * main method.
-+ *
-+ * @param args Standard args.
-+ */
-+ public static void main(String[] args) {
-+ try {
-+ final Document xmlDoc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(rawXML.getBytes("UTF-8")));
-+ final Element identityElement = (Element) xmlDoc.getElementsByTagName("Identity").item(0);
-+ final Element trustListElement = (Element) identityElement.getElementsByTagName("TrustList").item(0);
-+ final NodeList trustList = trustListElement.getElementsByTagName("Trust");
-+ final Pattern keyPattern = Pattern.compile("USK@[%,~" + "*-_./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz" + "]+");
-+ for (int i = 0; i < trustList.getLength(); ++i) {
-+ Element trustElement = (Element) trustList.item(i);
-+ final String identity = trustElement.getAttribute("Identity");
-+ if (!keyPattern.matcher(identity).matches()) {
-+ throw new RuntimeException("Parsing failure: Instead of USK URI I got: " + identity);
-+ }
-+ }
-+ } catch (Exception ex) {
-+ throw new RuntimeException(ex.getMessage());
-+ }
-+ }
-+
-+}
---- ./jdk/test/javax/xml/jaxp/parsers/8032909/XSLT.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8032909/XSLT.java 2014-10-28 20:19:47.000000000 -0700
-@@ -0,0 +1,54 @@
-+/*
-+ * 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 8032909
-+ * @summary Test for XSLT string-length function with complementary chars
-+ * @compile XSLT.java
-+ * @run main/othervm XSLT a_utf16.xml a_utf16.xsl 1270
-+ * @run main/othervm XSLT a_utf8.xml a_utf8.xsl 130
-+ * @run main/othervm XSLT a_windows1252.xml a_windows1252.xsl 200
-+ */
-+
-+import java.io.ByteArrayOutputStream;
-+import javax.xml.transform.stream.StreamResult;
-+import javax.xml.transform.stream.StreamSource;
-+import javax.xml.transform.Transformer;
-+import javax.xml.transform.TransformerFactory;
-+
-+public class XSLT {
-+ public static void main(String[] args) throws Exception {
-+
-+ ByteArrayOutputStream resStream = new ByteArrayOutputStream();
-+ TransformerFactory trf = TransformerFactory.newInstance();
-+ Transformer tr = trf.newTransformer(new StreamSource(System.getProperty("test.src", ".")+"/"+args[1]));
-+ String res, expectedRes;
-+ tr.transform( new StreamSource(System.getProperty("test.src", ".")+"/"+args[0]), new StreamResult(resStream));
-+ res = resStream.toString();
-+ System.out.println("Transformation completed. Result:"+res);
-+
-+ if (!res.replaceAll("\\s","").equals(args[2]))
-+ throw new RuntimeException("Incorrect transformation result. Expected:"+args[2]+" Observed:"+res);
-+ }
-+}
-Files openjdk/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xml and bsd-port/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xml differ
-Files openjdk/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl and bsd-port/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl differ
---- ./jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xml 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xml 2014-10-28 20:19:48.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<testxml>
-+<Element>UTF-8_Element</Element>
-+<Element2></Element2>
-+</testxml>
---- ./jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl 2014-10-28 20:19:48.000000000 -0700
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-+
-+<xsl:output method="text" />
-+
-+<xsl:template match="Element">
-+<xsl:value-of select="string-length(.)"/>
-+</xsl:template>
-+<xsl:template match="Element2">
-+<xsl:value-of select="string-length(.)"/>
-+</xsl:template>
-+
-+</xsl:stylesheet>
---- ./jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml 2014-10-28 20:19:48.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="windows-1252"?>
-+<testxml>
-+<Element>Windows-1252_Element</Element>
-+<Element2></Element2>
-+</testxml>
---- ./jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl 2014-10-28 20:19:48.000000000 -0700
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="windows-1252"?>
-+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-+
-+<xsl:output method="text" />
-+
-+<xsl:template match="Element">
-+<xsl:value-of select="string-length(.)"/>
-+</xsl:template>
-+<xsl:template match="Element2">
-+<xsl:value-of select="string-length(.)"/>
-+</xsl:template>
-+
-+</xsl:stylesheet>
---- ./jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,2 @@
-+<?xml version="1.0"?>
-+<helloWorld/>
---- ./jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,82 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
-+ */
-+import java.security.Policy;
-+
-+/**
-+ *
-+ *
-+ * @author huizhe.wang@oracle.com
-+ */
-+public class TestBase {
-+ public static boolean isWindows = false;
-+ static {
-+ if (System.getProperty("os.name").indexOf("Windows")>-1) {
-+ isWindows = true;
-+ }
-+ };
-+
-+ String filepath;
-+ boolean hasSM;
-+ String curDir;
-+ Policy origPolicy;
-+ String testName;
-+ static String errMessage;
-+
-+ int passed = 0, failed = 0;
-+
-+ /**
-+ * Creates a new instance of StreamReader
-+ */
-+ public TestBase(String name) {
-+ testName = name;
-+ }
-+
-+ //junit @Override
-+ protected void setUp() {
-+ if (System.getSecurityManager() != null) {
-+ hasSM = true;
-+ System.setSecurityManager(null);
-+ }
-+
-+ filepath = System.getProperty("test.src");
-+ if (filepath == null) {
-+ //current directory
-+ filepath = System.getProperty("user.dir");
-+ }
-+ origPolicy = Policy.getPolicy();
-+
-+ }
-+
-+ //junit @Override
-+ public void tearDown() {
-+ // turn off security manager and restore policy
-+ System.setSecurityManager(null);
-+ Policy.setPolicy(origPolicy);
-+ if (hasSM) {
-+ System.setSecurityManager(new SecurityManager());
-+ }
-+ System.out.println("\nNumber of tests passed: " + passed);
-+ System.out.println("Number of tests failed: " + failed + "\n");
-+
-+ if (errMessage != null ) {
-+ throw new RuntimeException(errMessage);
-+ }
-+ }
-+
-+ void fail(String errMsg) {
-+ if (errMessage == null) {
-+ errMessage = errMsg;
-+ } else {
-+ errMessage = errMessage + "\n" + errMsg;
-+ }
-+ failed++;
-+ }
-+
-+ void success(String msg) {
-+ passed++;
-+ System.out.println(msg);
-+ }
-+
-+}
---- ./jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,287 @@
-+/*
-+ * 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 8004476
-+ * @summary test XPath extension functions
-+ * @run main/othervm XPathExFuncTest
-+ */
-+import java.io.FileInputStream;
-+import java.io.InputStream;
-+import java.security.AllPermission;
-+import java.security.CodeSource;
-+import java.security.Permission;
-+import java.security.PermissionCollection;
-+import java.security.Permissions;
-+import java.security.Policy;
-+import java.security.ProtectionDomain;
-+import java.util.Iterator;
-+import java.util.List;
-+import javax.xml.XMLConstants;
-+import javax.xml.namespace.NamespaceContext;
-+import javax.xml.namespace.QName;
-+import javax.xml.parsers.DocumentBuilder;
-+import javax.xml.parsers.DocumentBuilderFactory;
-+import javax.xml.xpath.XPath;
-+import javax.xml.xpath.XPathExpressionException;
-+import javax.xml.xpath.XPathFactory;
-+import javax.xml.xpath.XPathFactoryConfigurationException;
-+import javax.xml.xpath.XPathFunction;
-+import javax.xml.xpath.XPathFunctionException;
-+import javax.xml.xpath.XPathFunctionResolver;
-+import org.w3c.dom.Document;
-+
-+/**
-+ * test XPath extension functions
-+ *
-+ * @author huizhe.wang@oracle.com
-+ */
-+public class XPathExFuncTest extends TestBase {
-+
-+ final static String ENABLE_EXTENSION_FUNCTIONS = "http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions";
-+ final static String CLASSNAME = "DocumentBuilderFactoryImpl";
-+ final String XPATH_EXPRESSION = "ext:helloWorld()";
-+
-+ /**
-+ * Creates a new instance of StreamReader
-+ */
-+ public XPathExFuncTest(String name) {
-+ super(name);
-+ }
-+ boolean hasSM;
-+ String xslFile, xslFileId;
-+ String xmlFile, xmlFileId;
-+
-+ protected void setUp() {
-+ super.setUp();
-+ xmlFile = filepath + "/SecureProcessingTest.xml";
-+
-+ }
-+
-+ /**
-+ * @param args the command line arguments
-+ */
-+ public static void main(String[] args) {
-+ XPathExFuncTest test = new XPathExFuncTest("OneTest");
-+ test.setUp();
-+
-+ test.testExtFunc();
-+ test.testExtFuncNotAllowed();
-+ test.testEnableExtFunc();
-+ test.tearDown();
-+
-+ }
-+
-+ /**
-+ * by default, extension function is enabled
-+ */
-+ public void testExtFunc() {
-+
-+ try {
-+ evaluate(false);
-+ System.out.println("testExtFunc: OK");
-+ } catch (XPathFactoryConfigurationException e) {
-+ fail(e.getMessage());
-+ } catch (XPathExpressionException e) {
-+ fail(e.getMessage());
-+ }
-+ }
-+
-+ /**
-+ * Security is enabled, extension function not allowed
-+ */
-+ public void testExtFuncNotAllowed() {
-+ Policy p = new SimplePolicy(new AllPermission());
-+ Policy.setPolicy(p);
-+ System.setSecurityManager(new SecurityManager());
-+
-+ try {
-+ evaluate(false);
-+ } catch (XPathFactoryConfigurationException e) {
-+ fail(e.getMessage());
-+ } catch (XPathExpressionException ex) {
-+ //expected since extension function is disallowed
-+ System.out.println("testExtFuncNotAllowed: OK");
-+ } finally {
-+ System.setSecurityManager(null);
-+ }
-+ }
-+
-+ /**
-+ * Security is enabled, use new feature: enableExtensionFunctions
-+ */
-+ public void testEnableExtFunc() {
-+ Policy p = new SimplePolicy(new AllPermission());
-+ Policy.setPolicy(p);
-+ System.setSecurityManager(new SecurityManager());
-+
-+
-+ try {
-+ evaluate(true);
-+ System.out.println("testEnableExt: OK");
-+ } catch (XPathFactoryConfigurationException e) {
-+ fail(e.getMessage());
-+ } catch (XPathExpressionException e) {
-+ fail(e.getMessage());
-+ } finally {
-+ System.setSecurityManager(null);
-+ }
-+ }
-+
-+ Document getDocument() {
-+ // the xml source
-+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-+ DocumentBuilder documentBuilder = null;
-+ Document document = null;
-+
-+ try {
-+ documentBuilder = documentBuilderFactory.newDocumentBuilder();
-+ InputStream xmlStream = new FileInputStream(xmlFile);
-+ document = documentBuilder.parse(xmlStream);
-+ } catch (Exception e) {
-+ fail(e.toString());
-+ }
-+ return document;
-+ }
-+
-+ void evaluate(boolean enableExt) throws XPathFactoryConfigurationException, XPathExpressionException {
-+ Document document = getDocument();
-+
-+ XPathFactory xPathFactory = XPathFactory.newInstance();
-+ /**
-+ * Use of the extension function 'http://exslt.org/strings:tokenize' is
-+ * not allowed when the secure processing feature is set to true.
-+ * Attempt to use the new property to enable extension function
-+ */
-+ if (enableExt) {
-+ boolean isExtensionSupported = enableExtensionFunction(xPathFactory);
-+ }
-+
-+ xPathFactory.setXPathFunctionResolver(new MyXPathFunctionResolver());
-+ if (System.getSecurityManager() == null) {
-+ xPathFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false);
-+ }
-+
-+ XPath xPath = xPathFactory.newXPath();
-+ xPath.setNamespaceContext(new MyNamespaceContext());
-+
-+ String xPathResult = xPath.evaluate(XPATH_EXPRESSION, document);
-+ System.out.println(
-+ "XPath result (enableExtensionFunction == " + enableExt + ") = \""
-+ + xPathResult
-+ + "\"");
-+ }
-+
-+ public class MyXPathFunctionResolver
-+ implements XPathFunctionResolver {
-+
-+ public XPathFunction resolveFunction(QName functionName, int arity) {
-+
-+ // not a real ewsolver, always return a default XPathFunction
-+ return new MyXPathFunction();
-+ }
-+ }
-+
-+ public class MyXPathFunction
-+ implements XPathFunction {
-+
-+ public Object evaluate(List list) throws XPathFunctionException {
-+
-+ return "Hello World";
-+ }
-+ }
-+
-+ public class MyNamespaceContext implements NamespaceContext {
-+
-+ public String getNamespaceURI(String prefix) {
-+ if (prefix == null) {
-+ throw new IllegalArgumentException("The prefix cannot be null.");
-+ }
-+
-+ if (prefix.equals("ext")) {
-+ return "http://ext.com";
-+ } else {
-+ return null;
-+ }
-+ }
-+
-+ public String getPrefix(String namespace) {
-+
-+ if (namespace == null) {
-+ throw new IllegalArgumentException("The namespace uri cannot be null.");
-+ }
-+
-+ if (namespace.equals("http://ext.com")) {
-+ return "ext";
-+ } else {
-+ return null;
-+ }
-+ }
-+
-+ public Iterator getPrefixes(String namespace) {
-+ return null;
-+ }
-+ }
-+
-+ boolean enableExtensionFunction(XPathFactory factory) {
-+ boolean isSupported = true;
-+ try {
-+ factory.setFeature(ENABLE_EXTENSION_FUNCTIONS, true);
-+ } catch (XPathFactoryConfigurationException ex) {
-+ isSupported = false;
-+ }
-+ return isSupported;
-+ }
-+
-+ class SimplePolicy extends Policy {
-+
-+ private final Permissions perms;
-+
-+ public SimplePolicy(Permission... permissions) {
-+ perms = new Permissions();
-+ for (Permission permission : permissions) {
-+ perms.add(permission);
-+ }
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(CodeSource cs) {
-+ return perms;
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(ProtectionDomain pd) {
-+ return perms;
-+ }
-+
-+ @Override
-+ public boolean implies(ProtectionDomain pd, Permission p) {
-+ return perms.implies(p);
-+ }
-+
-+ //for older jdk
-+ @Override
-+ public void refresh() {
-+ }
-+ }
-+}
---- ./jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,248 @@
-+/*
-+ * 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 8004476
-+ * @summary test XSLT extension functions
-+ * @run main/othervm XSLTExFuncTest
-+ */
-+
-+import java.io.StringWriter;
-+import java.security.AllPermission;
-+import java.security.CodeSource;
-+import java.security.Permission;
-+import java.security.PermissionCollection;
-+import java.security.Permissions;
-+import java.security.Policy;
-+import java.security.ProtectionDomain;
-+import javax.xml.transform.*;
-+import javax.xml.transform.sax.SAXSource;
-+import javax.xml.transform.stream.StreamResult;
-+import org.xml.sax.InputSource;
-+
-+/**
-+ * test XSLT extension functions
-+ *
-+ * @author huizhe.wang@oracle.com
-+ */
-+public class XSLTExFuncTest extends TestBase {
-+
-+ final static String ENABLE_EXTENSION_FUNCTIONS = "http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions";
-+ final static String CLASSNAME = "DocumentBuilderFactoryImpl";
-+
-+ /**
-+ * Creates a new instance of StreamReader
-+ */
-+ public XSLTExFuncTest(String name) {
-+ super(name);
-+ }
-+ boolean hasSM;
-+ String xslFile, xslFileId;
-+ String xmlFile, xmlFileId;
-+
-+ protected void setUp() {
-+ super.setUp();
-+ xmlFile = filepath + "/tokenize.xml";
-+ xslFile = filepath + "/tokenize.xsl";
-+
-+ /**
-+ * On Windows platform it needs triple '/' for valid URL while double '/' is enough on Linux or Solaris.
-+ * Here use file:/// directly to make it work on Windows and it will not impact other platforms.
-+ */
-+ xslFileId = "file:///" + xslFile;
-+ }
-+
-+ /**
-+ * @param args the command line arguments
-+ */
-+ public static void main(String[] args) {
-+ XSLTExFuncTest test = new XSLTExFuncTest("OneTest");
-+ test.setUp();
-+
-+ test.testExtFunc();
-+ test.testExtFuncNotAllowed();
-+ test.testEnableExtFunc();
-+ test.testTemplatesEnableExtFunc();
-+ test.tearDown();
-+
-+ }
-+
-+ /**
-+ * by default, extension function is enabled
-+ */
-+ public void testExtFunc() {
-+ TransformerFactory factory = TransformerFactory.newInstance();
-+
-+ try {
-+ transform(factory);
-+ System.out.println("testExtFunc: OK");
-+ } catch (TransformerConfigurationException e) {
-+ fail(e.getMessage());
-+ } catch (TransformerException ex) {
-+ fail(ex.getMessage());
-+ }
-+ }
-+
-+ /**
-+ * Security is enabled, extension function not allowed
-+ */
-+ public void testExtFuncNotAllowed() {
-+ Policy p = new SimplePolicy(new AllPermission());
-+ Policy.setPolicy(p);
-+ System.setSecurityManager(new SecurityManager());
-+ TransformerFactory factory = TransformerFactory.newInstance();
-+
-+ try {
-+ transform(factory);
-+ } catch (TransformerConfigurationException e) {
-+ fail(e.getMessage());
-+ } catch (TransformerException ex) {
-+ //expected since extension function is disallowed
-+ System.out.println("testExtFuncNotAllowed: OK");
-+ } finally {
-+ System.setSecurityManager(null);
-+ }
-+ }
-+
-+ /**
-+ * Security is enabled, use new feature: enableExtensionFunctions
-+ */
-+ public void testEnableExtFunc() {
-+ Policy p = new SimplePolicy(new AllPermission());
-+ Policy.setPolicy(p);
-+ System.setSecurityManager(new SecurityManager());
-+ TransformerFactory factory = TransformerFactory.newInstance();
-+
-+ /**
-+ * Use of the extension function 'http://exslt.org/strings:tokenize' is
-+ * not allowed when the secure processing feature is set to true.
-+ * Attempt to use the new property to enable extension function
-+ */
-+ boolean isExtensionSupported = enableExtensionFunction(factory);
-+
-+ try {
-+ transform(factory);
-+ System.out.println("testEnableExt: OK");
-+ } catch (TransformerConfigurationException e) {
-+ fail(e.getMessage());
-+ } catch (TransformerException e) {
-+ fail(e.getMessage());
-+ } finally {
-+ System.setSecurityManager(null);
-+ }
-+ }
-+
-+ /**
-+ * use Templates template = factory.newTemplates(new StreamSource( new
-+ * FileInputStream(xslFilename))); // Use the template to create a
-+ * transformer Transformer xformer = template.newTransformer();
-+ *
-+ * @param factory
-+ * @return
-+ */
-+ /**
-+ * Security is enabled, use new feature: enableExtensionFunctions Use the
-+ * template to create a transformer
-+ */
-+ public void testTemplatesEnableExtFunc() {
-+ Policy p = new SimplePolicy(new AllPermission());
-+ Policy.setPolicy(p);
-+ System.setSecurityManager(new SecurityManager());
-+ TransformerFactory factory = TransformerFactory.newInstance();
-+
-+ /**
-+ * Use of the extension function 'http://exslt.org/strings:tokenize' is
-+ * not allowed when the secure processing feature is set to true.
-+ * Attempt to use the new property to enable extension function
-+ */
-+ boolean isExtensionSupported = enableExtensionFunction(factory);
-+
-+ try {
-+ SAXSource xslSource = new SAXSource(new InputSource(xslFile));
-+ xslSource.setSystemId(xslFileId);
-+ Templates template = factory.newTemplates(xslSource);
-+ Transformer transformer = template.newTransformer();
-+ StringWriter stringResult = new StringWriter();
-+ Result result = new StreamResult(stringResult);
-+ transformer.transform(new SAXSource(new InputSource(xmlFile)), result);
-+ System.out.println("testTemplatesEnableExtFunc: OK");
-+ } catch (TransformerConfigurationException e) {
-+ fail(e.getMessage());
-+ } catch (TransformerException e) {
-+ fail(e.getMessage());
-+ } finally {
-+ System.setSecurityManager(null);
-+ }
-+ }
-+
-+ boolean enableExtensionFunction(TransformerFactory factory) {
-+ boolean isSupported = true;
-+ try {
-+ factory.setFeature(ENABLE_EXTENSION_FUNCTIONS, true);
-+ } catch (TransformerConfigurationException ex) {
-+ isSupported = false;
-+ }
-+ return isSupported;
-+ }
-+
-+ void transform(TransformerFactory factory) throws TransformerConfigurationException, TransformerException {
-+ SAXSource xslSource = new SAXSource(new InputSource(xslFile));
-+ xslSource.setSystemId(xslFileId);
-+ Transformer transformer = factory.newTransformer(xslSource);
-+ StringWriter stringResult = new StringWriter();
-+ Result result = new StreamResult(stringResult);
-+ transformer.transform(new SAXSource(new InputSource(xmlFile)), result);
-+ }
-+
-+ class SimplePolicy extends Policy {
-+
-+ private final Permissions perms;
-+
-+ public SimplePolicy(Permission... permissions) {
-+ perms = new Permissions();
-+ for (Permission permission : permissions) {
-+ perms.add(permission);
-+ }
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(CodeSource cs) {
-+ return perms;
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(ProtectionDomain pd) {
-+ return perms;
-+ }
-+
-+ @Override
-+ public boolean implies(ProtectionDomain pd, Permission p) {
-+ return perms.implies(p);
-+ }
-+
-+ //for older jdk
-+ @Override
-+ public void refresh() {
-+ }
-+ }
-+}
---- ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,7 @@
-+<?xml version="1.0" encoding="UTF-8" ?>
-+<html>
-+<a>
-+ <b>Is this EXSLT? No. no</b>
-+ <c>Is this EXSLT? No. no</c>
-+</a>
-+</html>
---- ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-+ xmlns:str="http://exslt.org/strings"
-+ xmlns:xalan="http://xml.apache.org/xalan"
-+ version="1.0">
-+<xsl:template match="a">
-+ <xsl:apply-templates />
-+</xsl:template>
-+<xsl:template match="//a/c">
-+ <xsl:value-of select="." />
-+ -
-+ <xsl:value-of select="str:tokenize(string(.), ' ')" />
-+ <xsl:value-of select="str:tokenize(string(.), '')" />
-+ <xsl:for-each select="str:tokenize(string(.), ' ')">
-+ <xsl:value-of select="." />
-+ </xsl:for-each>
-+ <xsl:apply-templates select="*" />
-+</xsl:template>
-+<xsl:template match="//a/b">
-+ <xsl:value-of select="." />
-+ -
-+ <xsl:value-of select="xalan:tokenize(string(.), ' ')" />
-+ <xsl:value-of select="xalan:tokenize(string(.), '')" />
-+ <xsl:for-each select="xalan:tokenize(string(.), ' ')">
-+ <xsl:value-of select="." />
-+ </xsl:for-each>
-+ <xsl:apply-templates select="*" />
-+</xsl:template>
-+
-+</xsl:stylesheet>
---- ./jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,60 @@
-+/*
-+ * 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 8015092
-+ * @summary whitespace within patterns in Selector XPath expression is accepted
-+ * @run main/othervm XPathWhiteSpaceTest
-+ */
-+
-+import java.io.*;
-+import javax.xml.XMLConstants;
-+import javax.xml.validation.Schema;
-+import javax.xml.validation.SchemaFactory;
-+import org.xml.sax.SAXException;
-+
-+/**
-+ * http://www.w3.org/TR/xmlschema-1/#coss-identity-constraint
-+ * For readability, whitespace may be used in selector XPath expressions even though
-+ * not explicitly allowed by the grammar:
-+ * whitespace may be freely added within patterns before or after any token.
-+ *
-+ * @author huizhe.wang@oracle.com
-+ */
-+public class XPathWhiteSpaceTest {
-+ static final String XSDFILE = "/idJ029.xsd";
-+
-+ public static void main(String[] args) throws Exception {
-+ try{
-+ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-+ Schema schema = schemaFactory.newSchema(new File(System.getProperty("test.src", ".")+XSDFILE));
-+ } catch (SAXException e) {
-+ throw new RuntimeException(e.getMessage());
-+ }
-+
-+
-+ }
-+
-+}
---- ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns.org" xmlns:xpns="xpns.org">
-+ <xsd:element name="xsid" type="xsd:string"/>
-+ <xsd:element name="xiid">
-+ <xsd:complexType>
-+ <xsd:sequence>
-+ <xsd:element name="xiid2" type="xsd:string" maxOccurs="unbounded"/>
-+ </xsd:sequence>
-+ <xsd:attribute name="val" type="xsd:string"/>
-+ </xsd:complexType>
-+ </xsd:element>
-+</xsd:schema>
---- ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,12 @@
-+<?xml version="1.0"?>
-+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns1.org" xmlns:xpns="xpns1.org">
-+ <xsd:element name="xsid" type="xsd:string"/>
-+ <xsd:element name="xiid">
-+ <xsd:complexType>
-+ <xsd:sequence>
-+ <xsd:element name="xiid2" type="xsd:string" maxOccurs="unbounded"/>
-+ </xsd:sequence>
-+ <xsd:attribute name="val" type="xsd:string"/>
-+ </xsd:complexType>
-+ </xsd:element>
-+</xsd:schema>
---- ./jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,21 @@
-+<?xml version="1.0"?>
-+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xpns="xpns.org" xmlns:xpns1="xpns1.org" xmlns:xpns2="xpns2.org" xmlns:imp="importNS">
-+ <xsd:import namespace="importNS" schemaLocation="idJimp.xsd"/>
-+ <xsd:import namespace="xpns.org" schemaLocation="idIxpns.xsd"/>
-+ <xsd:import namespace="xpns1.org" schemaLocation="idIxpns1.xsd"/>
-+ <xsd:element name="root">
-+ <xsd:complexType>
-+ <xsd:sequence>
-+ <xsd:element ref="tid" maxOccurs="unbounded"/>
-+ <xsd:element ref="imp:iid1" maxOccurs="unbounded"/>
-+ <xsd:element ref="imp:sid" maxOccurs="unbounded"/>
-+ <xsd:element ref="xpns:xiid" maxOccurs="unbounded"/>
-+ </xsd:sequence>
-+ </xsd:complexType>
-+ <xsd:unique id="foo123" name="uid">
-+ <xsd:selector xpath=".//tid"/>
-+ <xsd:field xpath=". //."/>
-+ </xsd:unique>
-+ </xsd:element>
-+ <xsd:element name="tid" type="xsd:string"/>
-+</xsd:schema>
---- ./jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,11 @@
-+<?xml version="1.0"?>
-+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="importNS" xmlns:imp="importNS">
-+ <xsd:element name="sid" type="xsd:string"/>
-+ <xsd:element name="iid1">
-+ <xsd:complexType>
-+ <xsd:sequence>
-+ <xsd:element name="iid2" type="xsd:string" maxOccurs="unbounded"/>
-+ </xsd:sequence>
-+ </xsd:complexType>
-+ </xsd:element>
-+</xsd:schema>
---- ./jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,60 @@
-+/*
-+ * 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 8015243
-+ * @summary verifies that illegal URI such as // is rejected
-+ * @run main/othervm AnyURITest
-+ */
-+
-+import java.io.*;
-+import javax.xml.XMLConstants;
-+import javax.xml.validation.Schema;
-+import javax.xml.validation.SchemaFactory;
-+import org.xml.sax.SAXException;
-+
-+/**
-+ * Similar to java.net.URI, allow empty authority prior to non-empty
-+ * path, query component or fragment identifier
-+ *
-+ * @author huizhe.wang@oracle.com
-+ */
-+public class AnyURITest {
-+ static final String XSDFILE = "anyURI_b006.xsd";
-+
-+ public static void main(String[] args) throws Exception {
-+ try{
-+ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-+ Schema schema = schemaFactory.newSchema(new File(System.getProperty("test.src", "."), XSDFILE));
-+ throw new RuntimeException("Illegal URI // should be rejected.");
-+ } catch (SAXException e) {
-+ //expected:
-+ //Enumeration value '//' is not in the value space of the base type, anyURI.
-+ }
-+
-+
-+ }
-+
-+}
---- ./jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,32 @@
-+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-+
-+ <xsd:element name="root">
-+ <xsd:complexType>
-+ <xsd:choice maxOccurs="unbounded">
-+ <xsd:element ref="foo"/>
-+ <xsd:element ref="bar"/>
-+ </xsd:choice>
-+ </xsd:complexType>
-+ </xsd:element>
-+
-+ <xsd:element type="xsd:anyURI" name="foo"></xsd:element>
-+ <xsd:element type="st" name="bar"></xsd:element>
-+
-+ <xsd:simpleType name="st">
-+ <xsd:restriction base="xsd:anyURI">
-+ <xsd:enumeration value="/"/>
-+ <xsd:enumeration value="//"/>
-+ <xsd:enumeration value="///"/>
-+ <xsd:enumeration value="//a\\b"/>
-+ <xsd:enumeration value="\"/>
-+ <xsd:enumeration value="\\"/>
-+ <xsd:enumeration value="\\\"/>
-+ <xsd:enumeration value="\\/"/>
-+ <xsd:enumeration value="\\a\b"/>
-+ <xsd:enumeration value="\a\b"/>
-+ <xsd:enumeration value="/a\b"/>
-+ <xsd:enumeration value="..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\a"/>
-+ </xsd:restriction>
-+ </xsd:simpleType>
-+
-+</xsd:schema>
---- ./jdk/test/javax/xml/ws/clientjar/TestService.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/ws/clientjar/TestService.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,39 @@
-+/*
-+ * 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 javax.jws.WebService;
-+
-+@WebService(serviceName ="TestService", targetNamespace = "http://test/jaxws/sample/")
-+public class TestService {
-+ public void foo() {
-+ try {
-+ bar();
-+ } catch (Exception e) {
-+ throw new AssertionError(e);
-+ }
-+ }
-+
-+ private void bar() {
-+ // nothing done
-+ }
-+}
---- ./jdk/test/javax/xml/ws/clientjar/TestWsImport.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/xml/ws/clientjar/TestWsImport.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,151 @@
-+/*
-+ * 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 8016271 8026405
-+ * @summary wsimport -clientjar does not create portable jar on windows due to hardcoded '\'
-+ * @run main/othervm TestWsImport
-+ */
-+
-+import javax.xml.namespace.QName;
-+import javax.xml.ws.Endpoint;
-+import javax.xml.ws.Service;
-+import java.io.InputStreamReader;
-+import java.io.IOException;
-+import java.io.BufferedReader;
-+import java.io.File;
-+import java.net.InetSocketAddress;
-+import java.net.URL;
-+import java.nio.file.Files;
-+import java.nio.file.FileVisitResult;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+import java.nio.file.SimpleFileVisitor;
-+import java.nio.file.attribute.BasicFileAttributes;
-+import static java.nio.file.FileVisitResult.*;
-+import java.util.Enumeration;
-+import java.util.jar.JarFile;
-+
-+import com.sun.net.httpserver.HttpContext;
-+import com.sun.net.httpserver.HttpServer;
-+
-+public class TestWsImport {
-+
-+ public static void main(String[] args) throws IOException {
-+
-+ String javaHome = System.getProperty("java.home");
-+ if (javaHome.endsWith("jre")) {
-+ javaHome = new File(javaHome).getParent();
-+ }
-+ String wsimport = javaHome + File.separator + "bin" + File.separator + "wsimport";
-+ if (System.getProperty("os.name").startsWith("Windows")) {
-+ wsimport = wsimport.concat(".exe");
-+ }
-+
-+ Endpoint endpoint = Endpoint.create(new TestService());
-+ HttpServer httpServer = null;
-+ try {
-+ // Manually create HttpServer here using ephemeral address for port
-+ // so as to not end up with attempt to bind to an in-use port
-+ httpServer = HttpServer.create(new InetSocketAddress(0), 0);
-+ HttpContext httpContext = httpServer.createContext("/hello");
-+ int port = httpServer.getAddress().getPort();
-+ System.out.println("port = " + port);
-+ httpServer.start();
-+ endpoint.publish(httpContext);
-+ String address = "http://localhost:" + port + "/hello";
-+
-+ Service service = Service.create(new URL(address + "?wsdl"),
-+ new QName("http://test/jaxws/sample/", "TestService"));
-+
-+ String[] wsargs = {
-+ wsimport,
-+ "-p",
-+ "wstest",
-+ "-J-Djavax.xml.accessExternalSchema=all",
-+ "-J-Dcom.sun.tools.internal.ws.Invoker.noSystemProxies=true",
-+ address + "?wsdl",
-+ "-clientjar",
-+ "wsjar.jar"
-+ };
-+ ProcessBuilder pb = new ProcessBuilder(wsargs);
-+ pb.redirectErrorStream(true);
-+ Process p = pb.start();
-+ BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream()));
-+ String s = r.readLine();
-+ while (s != null) {
-+ System.out.println(s.trim());
-+ s = r.readLine();
-+ }
-+ p.waitFor();
-+ p.destroy();
-+
-+ try (JarFile jarFile = new JarFile("wsjar.jar")) {
-+ for (Enumeration em = jarFile.entries(); em.hasMoreElements();) {
-+ String fileName = em.nextElement().toString();
-+ if (fileName.contains("\\")) {
-+ throw new RuntimeException("\"\\\" character detected in jar file: " + fileName);
-+ }
-+ }
-+ }
-+ } catch (Exception e) {
-+ e.printStackTrace();
-+ throw new RuntimeException(e.getMessage());
-+ } finally {
-+ endpoint.stop();
-+ if (httpServer != null) {
-+ httpServer.stop(0);
-+ }
-+ Path p = Paths.get("wsjar.jar");
-+ Files.deleteIfExists(p);
-+ p = Paths.get("wstest");
-+ if (Files.exists(p)) {
-+ try {
-+ Files.walkFileTree(p, new SimpleFileVisitor<Path>() {
-+ @Override
-+ public FileVisitResult visitFile(Path file,
-+ BasicFileAttributes attrs) throws IOException {
-+
-+ Files.delete(file);
-+ return CONTINUE;
-+ }
-+ @Override
-+ public FileVisitResult postVisitDirectory(Path dir,
-+ IOException exc) throws IOException {
-+
-+ if (exc == null) {
-+ Files.delete(dir);
-+ return CONTINUE;
-+ } else {
-+ throw exc;
-+ }
-+ }
-+ });
-+ } catch (IOException ioe) {
-+ ioe.printStackTrace();
-+ }
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/jprt.config 2013-09-06 11:30:01.000000000 -0700
-+++ ./jdk/test/jprt.config 2014-10-28 20:19:52.000000000 -0700
-@@ -71,8 +71,8 @@
-
- # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
- osname=`uname -s`
--if [ "${osname}" = SunOS ] ; then
--
-+case "${osname}" in
-+ SunOS )
- # SOLARIS: Sparc or X86
- osarch=`uname -p`
- if [ "${osarch}" = sparc ] ; then
-@@ -96,9 +96,9 @@
-
- # File creation mask
- umask 002
-+ ;;
-
--elif [ "${osname}" = Linux ] ; then
--
-+ Linux | Darwin )
- # Add basic paths
- path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-
-@@ -107,8 +107,31 @@
- fileMustExist "${make}" make
-
- umask 002
-+ ;;
-+
-+ FreeBSD | OpenBSD )
-+ # Add basic paths
-+ path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-
--else
-+ # Find GNU make
-+ make=/usr/local/bin/gmake
-+ fileMustExist "${make}" make
-+
-+ umask 002
-+ ;;
-+
-+ NetBSD )
-+ # Add basic paths
-+ path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-+
-+ # Find GNU make
-+ make=/usr/pkg/bin/gmake
-+ fileMustExist "${make}" make
-+
-+ umask 002
-+ ;;
-+
-+ * )
-
- # Windows: Differs on CYGWIN vs. MKS.
-
-@@ -150,8 +173,8 @@
- if [ "${unix_toolset}" = CYGWIN ] ; then
- path4sdk="`/usr/bin/cygpath -p ${path4sdk}`"
- fi
--
--fi
-+ ;;
-+esac
-
- # 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-10-28 20:19:52.000000000 -0700
-@@ -50,7 +50,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- PS=":"
- FS="/"
---- ./jdk/test/lib/testlibrary/AssertsTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/AssertsTest.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,237 @@
-+/*
-+ * 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 static jdk.testlibrary.Asserts.*;
-+
-+/* @test
-+ * @summary Tests the different assertions in the Assert class
-+ * @library /testlibrary
-+ */
-+public class AssertsTest {
-+ private static class Foo implements Comparable<Foo> {
-+ final int id;
-+ public Foo(int id) {
-+ this.id = id;
-+ }
-+
-+ public int compareTo(Foo f) {
-+ return new Integer(id).compareTo(new Integer(f.id));
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ testLessThan();
-+ testLessThanOrEqual();
-+ testEquals();
-+ testGreaterThanOrEqual();
-+ testGreaterThan();
-+ testNotEquals();
-+ testNull();
-+ testNotNull();
-+ testTrue();
-+ testFalse();
-+ }
-+
-+ private static void testLessThan() throws Exception {
-+ expectPass(Assertion.LT, 1, 2);
-+
-+ expectFail(Assertion.LT, 2, 2);
-+ expectFail(Assertion.LT, 2, 1);
-+ expectFail(Assertion.LT, null, 2);
-+ expectFail(Assertion.LT, 2, null);
-+ }
-+
-+ private static void testLessThanOrEqual() throws Exception {
-+ expectPass(Assertion.LTE, 1, 2);
-+ expectPass(Assertion.LTE, 2, 2);
-+
-+ expectFail(Assertion.LTE, 3, 2);
-+ expectFail(Assertion.LTE, null, 2);
-+ expectFail(Assertion.LTE, 2, null);
-+ }
-+
-+ private static void testEquals() throws Exception {
-+ expectPass(Assertion.EQ, 1, 1);
-+ expectPass(Assertion.EQ, null, null);
-+
-+ Foo f1 = new Foo(1);
-+ expectPass(Assertion.EQ, f1, f1);
-+
-+ Foo f2 = new Foo(1);
-+ expectFail(Assertion.EQ, f1, f2);
-+ expectFail(Assertion.LTE, null, 2);
-+ expectFail(Assertion.LTE, 2, null);
-+ }
-+
-+ private static void testGreaterThanOrEqual() throws Exception {
-+ expectPass(Assertion.GTE, 1, 1);
-+ expectPass(Assertion.GTE, 2, 1);
-+
-+ expectFail(Assertion.GTE, 1, 2);
-+ expectFail(Assertion.GTE, null, 2);
-+ expectFail(Assertion.GTE, 2, null);
-+ }
-+
-+ private static void testGreaterThan() throws Exception {
-+ expectPass(Assertion.GT, 2, 1);
-+
-+ expectFail(Assertion.GT, 1, 1);
-+ expectFail(Assertion.GT, 1, 2);
-+ expectFail(Assertion.GT, null, 2);
-+ expectFail(Assertion.GT, 2, null);
-+ }
-+
-+ private static void testNotEquals() throws Exception {
-+ expectPass(Assertion.NE, null, 1);
-+ expectPass(Assertion.NE, 1, null);
-+
-+ Foo f1 = new Foo(1);
-+ Foo f2 = new Foo(1);
-+ expectPass(Assertion.NE, f1, f2);
-+
-+ expectFail(Assertion.NE, null, null);
-+ expectFail(Assertion.NE, f1, f1);
-+ expectFail(Assertion.NE, 1, 1);
-+ }
-+
-+ private static void testNull() throws Exception {
-+ expectPass(Assertion.NULL, null);
-+
-+ expectFail(Assertion.NULL, 1);
-+ }
-+
-+ private static void testNotNull() throws Exception {
-+ expectPass(Assertion.NOTNULL, 1);
-+
-+ expectFail(Assertion.NOTNULL, null);
-+ }
-+
-+ private static void testTrue() throws Exception {
-+ expectPass(Assertion.TRUE, true);
-+
-+ expectFail(Assertion.TRUE, false);
-+ }
-+
-+ private static void testFalse() throws Exception {
-+ expectPass(Assertion.FALSE, false);
-+
-+ expectFail(Assertion.FALSE, true);
-+ }
-+
-+ private static <T extends Comparable<T>> void expectPass(Assertion assertion, T ... args)
-+ throws Exception {
-+ Assertion.run(assertion, args);
-+ }
-+
-+ private static <T extends Comparable<T>> void expectFail(Assertion assertion, T ... args)
-+ throws Exception {
-+ try {
-+ Assertion.run(assertion, args);
-+ } catch (RuntimeException e) {
-+ return;
-+ }
-+ throw new Exception("Expected " + Assertion.format(assertion, (Object[]) args) +
-+ " to throw a RuntimeException");
-+ }
-+
-+}
-+
-+enum Assertion {
-+ LT, LTE, EQ, GTE, GT, NE, NULL, NOTNULL, FALSE, TRUE;
-+
-+ public static <T extends Comparable<T>> void run(Assertion assertion, T ... args) {
-+ String msg = "Expected " + format(assertion, args) + " to pass";
-+ switch (assertion) {
-+ case LT:
-+ assertLessThan(args[0], args[1], msg);
-+ break;
-+ case LTE:
-+ assertLessThanOrEqual(args[0], args[1], msg);
-+ break;
-+ case EQ:
-+ assertEquals(args[0], args[1], msg);
-+ break;
-+ case GTE:
-+ assertGreaterThanOrEqual(args[0], args[1], msg);
-+ break;
-+ case GT:
-+ assertGreaterThan(args[0], args[1], msg);
-+ break;
-+ case NE:
-+ assertNotEquals(args[0], args[1], msg);
-+ break;
-+ case NULL:
-+ assertNull(args == null ? args : args[0], msg);
-+ break;
-+ case NOTNULL:
-+ assertNotNull(args == null ? args : args[0], msg);
-+ break;
-+ case FALSE:
-+ assertFalse((Boolean) args[0], msg);
-+ break;
-+ case TRUE:
-+ assertTrue((Boolean) args[0], msg);
-+ break;
-+ default:
-+ // do nothing
-+ }
-+ }
-+
-+ public static String format(Assertion assertion, Object ... args) {
-+ switch (assertion) {
-+ case LT:
-+ return asString("assertLessThan", args);
-+ case LTE:
-+ return asString("assertLessThanOrEqual", args);
-+ case EQ:
-+ return asString("assertEquals", args);
-+ case GTE:
-+ return asString("assertGreaterThanOrEquals", args);
-+ case GT:
-+ return asString("assertGreaterThan", args);
-+ case NE:
-+ return asString("assertNotEquals", args);
-+ case NULL:
-+ return asString("assertNull", args);
-+ case NOTNULL:
-+ return asString("assertNotNull", args);
-+ case FALSE:
-+ return asString("assertFalse", args);
-+ case TRUE:
-+ return asString("assertTrue", args);
-+ default:
-+ return "";
-+ }
-+ }
-+
-+ private static String asString(String assertion, Object ... args) {
-+ if (args == null) {
-+ return String.format("%s(null)", assertion);
-+ }
-+ if (args.length == 1) {
-+ return String.format("%s(%s)", assertion, args[0]);
-+ } else {
-+ return String.format("%s(%s, %s)", assertion, args[0], args[1]);
-+ }
-+ }
-+}
---- ./jdk/test/lib/testlibrary/ClassFileInstaller.java 2013-09-06 11:30:01.000000000 -0700
-+++ ./jdk/test/lib/testlibrary/ClassFileInstaller.java 2014-07-15 21:54:44.000000000 -0700
-@@ -45,7 +45,10 @@
-
- // Create the class file's package directory
- Path p = Paths.get(pathName);
-- Files.createDirectories(p.getParent());
-+ Path parent = p.getParent();
-+ if (parent != null) {
-+ Files.createDirectories(parent);
-+ }
- // Create the class file
- Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
- }
---- ./jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,122 @@
-+/*
-+ * 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
-+ * @summary Test the OutputAnalyzer reporting functionality,
-+ * such as printing additional diagnostic info
-+ * (exit code, stdout, stderr, command line, etc.)
-+ * @library /testlibrary
-+ */
-+
-+import java.io.ByteArrayOutputStream;
-+import java.io.PrintStream;
-+
-+import jdk.testlibrary.OutputAnalyzer;
-+
-+public class OutputAnalyzerReportingTest {
-+
-+ public static void main(String[] args) throws Exception {
-+ // Create the output analyzer under test
-+ String stdout = "aaaaaa";
-+ String stderr = "bbbbbb";
-+ OutputAnalyzer output = new OutputAnalyzer(stdout, stderr);
-+
-+ // Expected summary values should be the same for all cases,
-+ // since the outputAnalyzer object is the same
-+ String expectedExitValue = "-1";
-+ String expectedSummary =
-+ " stdout: [" + stdout + "];\n" +
-+ " stderr: [" + stderr + "]\n" +
-+ " exitValue = " + expectedExitValue + "\n";
-+
-+
-+ DiagnosticSummaryTestRunner testRunner =
-+ new DiagnosticSummaryTestRunner();
-+
-+ // should have exit value
-+ testRunner.init(expectedSummary);
-+ int unexpectedExitValue = 2;
-+ try {
-+ output.shouldHaveExitValue(unexpectedExitValue);
-+ } catch (RuntimeException e) { }
-+ testRunner.closeAndCheckResults();
-+
-+ // should not contain
-+ testRunner.init(expectedSummary);
-+ try {
-+ output.shouldNotContain(stdout);
-+ } catch (RuntimeException e) { }
-+ testRunner.closeAndCheckResults();
-+
-+ // should contain
-+ testRunner.init(expectedSummary);
-+ try {
-+ output.shouldContain("unexpected-stuff");
-+ } catch (RuntimeException e) { }
-+ testRunner.closeAndCheckResults();
-+
-+ // should not match
-+ testRunner.init(expectedSummary);
-+ try {
-+ output.shouldNotMatch("[a]");
-+ } catch (RuntimeException e) { }
-+ testRunner.closeAndCheckResults();
-+
-+ // should match
-+ testRunner.init(expectedSummary);
-+ try {
-+ output.shouldMatch("[qwerty]");
-+ } catch (RuntimeException e) { }
-+ testRunner.closeAndCheckResults();
-+
-+ }
-+
-+ private static class DiagnosticSummaryTestRunner {
-+ private ByteArrayOutputStream byteStream =
-+ new ByteArrayOutputStream(10000);
-+
-+ private String expectedSummary = "";
-+ private PrintStream errStream;
-+
-+
-+ public void init(String expectedSummary) {
-+ this.expectedSummary = expectedSummary;
-+ byteStream.reset();
-+ errStream = new PrintStream(byteStream);
-+ System.setErr(errStream);
-+ }
-+
-+ public void closeAndCheckResults() {
-+ // check results
-+ errStream.close();
-+ String stdErrStr = byteStream.toString();
-+ if (!stdErrStr.contains(expectedSummary)) {
-+ throw new RuntimeException("The output does not contain "
-+ + "the diagnostic message, or the message is incorrect");
-+ }
-+ }
-+ }
-+
-+}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,395 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+/**
-+ * Asserts that can be used for verifying assumptions in tests.
-+ *
-+ * An assertion will throw a {@link RuntimeException} if the assertion isn't
-+ * valid. All the asserts can be imported into a test by using a static
-+ * import:
-+ *
-+ * <pre>
-+ * {@code
-+ * import static com.oracle.java.testlibrary.Asserts.*;
-+ * }
-+ *
-+ * Always provide a message describing the assumption if the line number of the
-+ * failing assertion isn't enough to understand why the assumption failed. For
-+ * example, if the assertion is in a loop or in a method that is called
-+ * multiple times, then the line number won't provide enough context to
-+ * understand the failure.
-+ * </pre>
-+ */
-+public class Asserts {
-+
-+ /**
-+ * Shorthand for {@link #assertLessThan(T, T)}.
-+ *
-+ * @see #assertLessThan(T, T)
-+ */
-+ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs) {
-+ assertLessThan(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertLessThan(T, T, String)}.
-+ *
-+ * @see #assertLessThan(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs, String msg) {
-+ assertLessThan(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertLessThan(T, T, String)} with a default message.
-+ *
-+ * @see #assertLessThan(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertLessThan(T lhs, T rhs) {
-+ String msg = "Expected that " + format(lhs) + " < " + format(rhs);
-+ assertLessThan(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is less than {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static <T extends Comparable<T>>void assertLessThan(T lhs, T rhs, String msg) {
-+ assertTrue(compare(lhs, rhs, msg) < 0, msg);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertLessThanOrEqual(T, T)}.
-+ *
-+ * @see #assertLessThanOrEqual(T, T)
-+ */
-+ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs) {
-+ assertLessThanOrEqual(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertLessThanOrEqual(T, T, String)}.
-+ *
-+ * @see #assertLessThanOrEqual(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs, String msg) {
-+ assertLessThanOrEqual(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertLessThanOrEqual(T, T, String)} with a default message.
-+ *
-+ * @see #assertLessThanOrEqual(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs) {
-+ String msg = "Expected that " + format(lhs) + " <= " + format(rhs);
-+ assertLessThanOrEqual(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is less than or equal to {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs, String msg) {
-+ assertTrue(compare(lhs, rhs, msg) <= 0, msg);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertEquals(T, T)}.
-+ *
-+ * @see #assertEquals(T, T)
-+ */
-+ public static void assertEQ(Object lhs, Object rhs) {
-+ assertEquals(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertEquals(T, T, String)}.
-+ *
-+ * @see #assertEquals(T, T, String)
-+ */
-+ public static void assertEQ(Object lhs, Object rhs, String msg) {
-+ assertEquals(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertEquals(T, T, String)} with a default message.
-+ *
-+ * @see #assertEquals(T, T, String)
-+ */
-+ public static void assertEquals(Object lhs, Object rhs) {
-+ String msg = "Expected " + format(lhs) + " to equal " + format(rhs);
-+ assertEquals(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is equal to {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertEquals(Object lhs, Object rhs, String msg) {
-+ if (lhs == null) {
-+ if (rhs != null) {
-+ error(msg);
-+ }
-+ } else {
-+ assertTrue(lhs.equals(rhs), msg);
-+ }
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertGreaterThanOrEqual(T, T)}.
-+ *
-+ * @see #assertGreaterThanOrEqual(T, T)
-+ */
-+ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs) {
-+ assertGreaterThanOrEqual(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertGreaterThanOrEqual(T, T, String)}.
-+ *
-+ * @see #assertGreaterThanOrEqual(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs, String msg) {
-+ assertGreaterThanOrEqual(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertGreaterThanOrEqual(T, T, String)} with a default message.
-+ *
-+ * @see #assertGreaterThanOrEqual(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs) {
-+ String msg = "Expected that " + format(lhs) + " >= " + format(rhs);
-+ assertGreaterThanOrEqual(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is greater than or equal to {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs, String msg) {
-+ assertTrue(compare(lhs, rhs, msg) >= 0, msg);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertGreaterThan(T, T)}.
-+ *
-+ * @see #assertGreaterThan(T, T)
-+ */
-+ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs) {
-+ assertGreaterThan(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertGreaterThan(T, T, String)}.
-+ *
-+ * @see #assertGreaterThan(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs, String msg) {
-+ assertGreaterThan(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertGreaterThan(T, T, String)} with a default message.
-+ *
-+ * @see #assertGreaterThan(T, T, String)
-+ */
-+ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs) {
-+ String msg = "Expected that " + format(lhs) + " > " + format(rhs);
-+ assertGreaterThan(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is greater than {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, String msg) {
-+ assertTrue(compare(lhs, rhs, msg) > 0, msg);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertNotEquals(T, T)}.
-+ *
-+ * @see #assertNotEquals(T, T)
-+ */
-+ public static void assertNE(Object lhs, Object rhs) {
-+ assertNotEquals(lhs, rhs);
-+ }
-+
-+ /**
-+ * Shorthand for {@link #assertNotEquals(T, T, String)}.
-+ *
-+ * @see #assertNotEquals(T, T, String)
-+ */
-+ public static void assertNE(Object lhs, Object rhs, String msg) {
-+ assertNotEquals(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertNotEquals(T, T, String)} with a default message.
-+ *
-+ * @see #assertNotEquals(T, T, String)
-+ */
-+ public static void assertNotEquals(Object lhs, Object rhs) {
-+ String msg = "Expected " + format(lhs) + " to not equal " + format(rhs);
-+ assertNotEquals(lhs, rhs, msg);
-+ }
-+
-+ /**
-+ * Asserts that {@code lhs} is not equal to {@code rhs}.
-+ *
-+ * @param lhs The left hand side of the comparison.
-+ * @param rhs The right hand side of the comparison.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertNotEquals(Object lhs, Object rhs, String msg) {
-+ if (lhs == null) {
-+ if (rhs == null) {
-+ error(msg);
-+ }
-+ } else {
-+ assertFalse(lhs.equals(rhs), msg);
-+ }
-+ }
-+
-+ /**
-+ * Calls {@link #assertNull(Object, String)} with a default message.
-+ *
-+ * @see #assertNull(Object, String)
-+ */
-+ public static void assertNull(Object o) {
-+ assertNull(o, "Expected " + format(o) + " to be null");
-+ }
-+
-+ /**
-+ * Asserts that {@code o} is null.
-+ *
-+ * @param o The reference assumed to be null.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertNull(Object o, String msg) {
-+ assertEquals(o, null, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertNotNull(Object, String)} with a default message.
-+ *
-+ * @see #assertNotNull(Object, String)
-+ */
-+ public static void assertNotNull(Object o) {
-+ assertNotNull(o, "Expected non null reference");
-+ }
-+
-+ /**
-+ * Asserts that {@code o} is <i>not</i> null.
-+ *
-+ * @param o The reference assumed <i>not</i> to be null,
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertNotNull(Object o, String msg) {
-+ assertNotEquals(o, null, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertFalse(boolean, String)} with a default message.
-+ *
-+ * @see #assertFalse(boolean, String)
-+ */
-+ public static void assertFalse(boolean value) {
-+ assertFalse(value, "Expected value to be false");
-+ }
-+
-+ /**
-+ * Asserts that {@code value} is {@code false}.
-+ *
-+ * @param value The value assumed to be false.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertFalse(boolean value, String msg) {
-+ assertTrue(!value, msg);
-+ }
-+
-+ /**
-+ * Calls {@link #assertTrue(boolean, String)} with a default message.
-+ *
-+ * @see #assertTrue(boolean, String)
-+ */
-+ public static void assertTrue(boolean value) {
-+ assertTrue(value, "Expected value to be true");
-+ }
-+
-+ /**
-+ * Asserts that {@code value} is {@code true}.
-+ *
-+ * @param value The value assumed to be true.
-+ * @param msg A description of the assumption.
-+ * @throws RuntimeException if the assertion isn't valid.
-+ */
-+ public static void assertTrue(boolean value, String msg) {
-+ if (!value) {
-+ error(msg);
-+ }
-+ }
-+
-+ private static <T extends Comparable<T>> int compare(T lhs, T rhs, String msg) {
-+ assertNotNull(lhs, msg);
-+ assertNotNull(rhs, msg);
-+ return lhs.compareTo(rhs);
-+ }
-+
-+ private static String format(Object o) {
-+ return o == null? "null" : o.toString();
-+ }
-+
-+ private static void error(String msg) {
-+ throw new RuntimeException(msg);
-+ }
-+
-+}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,194 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+import java.io.IOException;
-+import java.nio.file.DirectoryNotEmptyException;
-+import java.nio.file.FileVisitResult;
-+import java.nio.file.Files;
-+import java.nio.file.NoSuchFileException;
-+import java.nio.file.Path;
-+import java.nio.file.SimpleFileVisitor;
-+import java.nio.file.attribute.BasicFileAttributes;
-+import java.util.ArrayList;
-+import java.util.List;
-+
-+
-+/**
-+ * Common library for various test file utility functions.
-+ */
-+public final class FileUtils {
-+
-+ private static final boolean isWindows =
-+ System.getProperty("os.name").startsWith("Windows");
-+ private static final int RETRY_DELETE_MILLIS = isWindows ? 500 : 0;
-+ private static final int MAX_RETRY_DELETE_TIMES = isWindows ? 15 : 0;
-+
-+ /**
-+ * Deletes a file, retrying if necessary.
-+ *
-+ * @param path the file to delete
-+ *
-+ * @throws NoSuchFileException
-+ * if the file does not exist (optional specific exception)
-+ * @throws DirectoryNotEmptyException
-+ * if the file is a directory and could not otherwise be deleted
-+ * because the directory is not empty (optional specific exception)
-+ * @throws IOException
-+ * if an I/O error occurs
-+ */
-+ public static void deleteFileWithRetry(Path path)
-+ throws IOException
-+ {
-+ try {
-+ deleteFileWithRetry0(path);
-+ } catch (InterruptedException x) {
-+ throw new IOException("Interrupted while deleting.", x);
-+ }
-+ }
-+
-+ /**
-+ * Deletes a file, retrying if necessary.
-+ * No exception thrown if file doesn't exist.
-+ *
-+ * @param path the file to delete
-+ *
-+ * @throws NoSuchFileException
-+ * if the file does not exist (optional specific exception)
-+ * @throws DirectoryNotEmptyException
-+ * if the file is a directory and could not otherwise be deleted
-+ * because the directory is not empty (optional specific exception)
-+ * @throws IOException
-+ * if an I/O error occurs
-+ */
-+ public static void deleteFileIfExistsWithRetry(Path path)
-+ throws IOException
-+ {
-+ try {
-+ if(Files.exists(path))
-+ deleteFileWithRetry0(path);
-+ } catch (InterruptedException x) {
-+ throw new IOException("Interrupted while deleting.", x);
-+ }
-+ }
-+
-+ private static void deleteFileWithRetry0(Path path)
-+ throws IOException, InterruptedException
-+ {
-+ int times = 0;
-+ IOException ioe = null;
-+ while (true) {
-+ try {
-+ Files.delete(path);
-+ while (Files.exists(path)) {
-+ times++;
-+ if (times > MAX_RETRY_DELETE_TIMES)
-+ throw new IOException("File still exists after " + times + " waits.");
-+ Thread.sleep(RETRY_DELETE_MILLIS);
-+ }
-+ break;
-+ } catch (NoSuchFileException | DirectoryNotEmptyException x) {
-+ throw x;
-+ } catch (IOException x) {
-+ // Backoff/retry in case another process is accessing the file
-+ times++;
-+ if (ioe == null)
-+ ioe = x;
-+ else
-+ ioe.addSuppressed(x);
-+
-+ if (times > MAX_RETRY_DELETE_TIMES)
-+ throw ioe;
-+ Thread.sleep(RETRY_DELETE_MILLIS);
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Deletes a directory and its subdirectories, retrying if necessary.
-+ *
-+ * @param dir the directory to delete
-+ *
-+ * @throws IOException
-+ * If an I/O error occurs. Any such exceptions are caught
-+ * internally. If only one is caught, then it is re-thrown.
-+ * If more than one exception is caught, then the second and
-+ * following exceptions are added as suppressed exceptions of the
-+ * first one caught, which is then re-thrown.
-+ */
-+ public static void deleteFileTreeWithRetry(Path dir)
-+ throws IOException
-+ {
-+ IOException ioe = null;
-+ final List<IOException> excs = deleteFileTreeUnchecked(dir);
-+ if (!excs.isEmpty()) {
-+ ioe = excs.remove(0);
-+ for (IOException x : excs)
-+ ioe.addSuppressed(x);
-+ }
-+ if (ioe != null)
-+ throw ioe;
-+ }
-+
-+ public static List<IOException> deleteFileTreeUnchecked(Path dir) {
-+ final List<IOException> excs = new ArrayList<>();
-+ try {
-+ java.nio.file.Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
-+ @Override
-+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
-+ try {
-+ deleteFileWithRetry0(file);
-+ } catch (IOException x) {
-+ excs.add(x);
-+ } catch (InterruptedException x) {
-+ excs.add(new IOException("Interrupted while deleting.", x));
-+ return FileVisitResult.TERMINATE;
-+ }
-+ return FileVisitResult.CONTINUE;
-+ }
-+ @Override
-+ public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
-+ try {
-+ deleteFileWithRetry0(dir);
-+ } catch (IOException x) {
-+ excs.add(x);
-+ } catch (InterruptedException x) {
-+ excs.add(new IOException("Interrupted while deleting.", x));
-+ return FileVisitResult.TERMINATE;
-+ }
-+ return FileVisitResult.CONTINUE;
-+ }
-+ @Override
-+ public FileVisitResult visitFileFailed(Path file, IOException exc) {
-+ excs.add(exc);
-+ return FileVisitResult.CONTINUE;
-+ }
-+ });
-+ } catch (IOException x) {
-+ excs.add(x);
-+ }
-+ return excs;
-+ }
-+}
-+
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/InputArguments.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/InputArguments.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,88 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+import java.lang.management.RuntimeMXBean;
-+import java.lang.management.ManagementFactory;
-+import java.util.List;
-+
-+/**
-+ * This class provides access to the input arguments to the VM.
-+ */
-+public class InputArguments {
-+ private static final List<String> args;
-+
-+ static {
-+ RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
-+ args = runtimeMxBean.getInputArguments();
-+ }
-+
-+ /**
-+ * Returns true if {@code arg} is an input argument to the VM.
-+ *
-+ * This is useful for checking boolean flags such as -XX:+UseSerialGC or
-+ * -XX:-UsePerfData.
-+ *
-+ * @param arg The name of the argument.
-+ * @return {@code true} if the given argument is an input argument,
-+ * otherwise {@code false}.
-+ */
-+ public static boolean contains(String arg) {
-+ return args.contains(arg);
-+ }
-+
-+ /**
-+ * Returns true if {@code prefix} is the start of an input argument to the
-+ * VM.
-+ *
-+ * This is useful for checking if flags describing a quantity, such as
-+ * -XX:+MaxMetaspaceSize=100m, is set without having to know the quantity.
-+ * To check if the flag -XX:MaxMetaspaceSize is set, use
-+ * {@code InputArguments.containsPrefix("-XX:MaxMetaspaceSize")}.
-+ *
-+ * @param prefix The start of the argument.
-+ * @return {@code true} if the given argument is the start of an input
-+ * argument, otherwise {@code false}.
-+ */
-+ public static boolean containsPrefix(String prefix) {
-+ for (String arg : args) {
-+ if (arg.startsWith(prefix)) {
-+ return true;
-+ }
-+ }
-+ return false;
-+ }
-+
-+ /**
-+ * Get the string containing input arguments passed to the VM
-+ */
-+ public static String getInputArguments() {
-+ StringBuilder result = new StringBuilder();
-+ for (String arg : args)
-+ result.append(arg).append(' ');
-+
-+ return result.toString();
-+ }
-+
-+}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,106 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+import java.io.FileNotFoundException;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+
-+public final class JDKToolFinder {
-+
-+ private JDKToolFinder() {
-+ }
-+
-+ /**
-+ * Returns the full path to an executable in jdk/bin based on System
-+ * property {@code test.jdk} or {@code compile.jdk} (both are set by the jtreg test suite)
-+ *
-+ * @return Full path to an executable in jdk/bin
-+ */
-+ public static String getJDKTool(String tool) {
-+
-+ // First try to find the executable in test.jdk
-+ try {
-+ return getTool(tool, "test.jdk");
-+ } catch (FileNotFoundException e) {
-+
-+ }
-+
-+ // Now see if it's available in compile.jdk
-+ try {
-+ return getTool(tool, "compile.jdk");
-+ } catch (FileNotFoundException e) {
-+ throw new RuntimeException("Failed to find " + tool +
-+ ", looked in test.jdk (" + System.getProperty("test.jdk") +
-+ ") and compile.jdk (" + System.getProperty("compile.jdk") + ")");
-+ }
-+ }
-+
-+ /**
-+ * Returns the full path to an executable in jdk/bin based on System
-+ * property {@code compile.jdk}
-+ *
-+ * @return Full path to an executable in jdk/bin
-+ */
-+ public static String getCompileJDKTool(String tool) {
-+ try {
-+ return getTool(tool, "compile.jdk");
-+ } catch (FileNotFoundException e) {
-+ throw new RuntimeException(e);
-+ }
-+ }
-+
-+ /**
-+ * Returns the full path to an executable in jdk/bin based on System
-+ * property {@code test.jdk}
-+ *
-+ * @return Full path to an executable in jdk/bin
-+ */
-+ public static String getTestJDKTool(String tool) {
-+ try {
-+ return getTool(tool, "test.jdk");
-+ } catch (FileNotFoundException e) {
-+ throw new RuntimeException(e);
-+ }
-+ }
-+
-+ private static String getTool(String tool, String property) throws FileNotFoundException {
-+ String jdkPath = System.getProperty(property);
-+
-+ if (jdkPath == null) {
-+ throw new RuntimeException(
-+ "System property '" + property + "' not set. This property is normally set by jtreg. "
-+ + "When running test separately, set this property using '-D" + property + "=/path/to/jdk'.");
-+ }
-+
-+ Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : ""));
-+
-+ Path jdkTool = Paths.get(jdkPath, toolName.toString());
-+ if (!jdkTool.toFile().exists()) {
-+ throw new FileNotFoundException("Could not find file " + jdkTool.toAbsolutePath());
-+ }
-+
-+ return jdkTool.toAbsolutePath().toString();
-+ }
-+}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java 2014-07-15 21:54:44.000000000 -0700
-@@ -0,0 +1,134 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.List;
-+
-+/**
-+ * A utility for constructing command lines for starting JDK tool processes.
-+ *
-+ * The JDKToolLauncher can in particular be combined with a
-+ * java.lang.ProcessBuilder to easily run a JDK tool. For example, the following
-+ * code run {@code jmap -heap} against a process with GC logging turned on for
-+ * the {@code jmap} process:
-+ *
-+ * <pre>
-+ * {@code
-+ * JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
-+ * .addVMArg("-XX:+PrintGC");
-+ * .addVMArg("-XX:+PrintGCDetails")
-+ * .addToolArg("-heap")
-+ * .addToolArg(pid);
-+ * ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
-+ * Process p = pb.start();
-+ * }
-+ * </pre>
-+ */
-+public class JDKToolLauncher {
-+ private final String executable;
-+ private final List<String> vmArgs = new ArrayList<String>();
-+ private final List<String> toolArgs = new ArrayList<String>();
-+
-+ private JDKToolLauncher(String tool, boolean useCompilerJDK) {
-+ if (useCompilerJDK) {
-+ executable = JDKToolFinder.getJDKTool(tool);
-+ } else {
-+ executable = JDKToolFinder.getTestJDKTool(tool);
-+ }
-+ vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
-+ }
-+
-+ /**
-+ * Creates a new JDKToolLauncher for the specified tool. Using tools path
-+ * from the compiler JDK.
-+ *
-+ * @param tool
-+ * The name of the tool
-+ * @return A new JDKToolLauncher
-+ */
-+ public static JDKToolLauncher create(String tool) {
-+ return new JDKToolLauncher(tool, true);
-+ }
-+
-+ /**
-+ * Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
-+ *
-+ * @param tool
-+ * The name of the tool
-+ *
-+ * @return A new JDKToolLauncher
-+ */
-+ public static JDKToolLauncher createUsingTestJDK(String tool) {
-+ return new JDKToolLauncher(tool, false);
-+ }
-+
-+ /**
-+ * Adds an argument to the JVM running the tool.
-+ *
-+ * The JVM arguments are passed to the underlying JVM running the tool.
-+ * Arguments will automatically be prepended with "-J".
-+ *
-+ * Any platform specific arguments required for running the tool are
-+ * automatically added.
-+ *
-+ *
-+ * @param arg
-+ * The argument to VM running the tool
-+ * @return The JDKToolLauncher instance
-+ */
-+ public JDKToolLauncher addVMArg(String arg) {
-+ vmArgs.add(arg);
-+ return this;
-+ }
-+
-+ /**
-+ * Adds an argument to the tool.
-+ *
-+ * @param arg
-+ * The argument to the tool
-+ * @return The JDKToolLauncher instance
-+ */
-+ public JDKToolLauncher addToolArg(String arg) {
-+ toolArgs.add(arg);
-+ return this;
-+ }
-+
-+ /**
-+ * Returns the command that can be used for running the tool.
-+ *
-+ * @return An array whose elements are the arguments of the command.
-+ */
-+ public String[] getCommand() {
-+ List<String> command = new ArrayList<String>();
-+ command.add(executable);
-+ // Add -J in front of all vmArgs
-+ for (String arg : vmArgs) {
-+ command.add("-J" + arg);
-+ }
-+ command.addAll(toolArgs);
-+ return command.toArray(new String[command.size()]);
-+ }
-+}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/JcmdBase.java 2013-09-06 11:30:01.000000000 -0700
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JcmdBase.java 2014-07-15 21:54:44.000000000 -0700
-@@ -23,8 +23,11 @@
-
- package jdk.testlibrary;
-
--import java.util.ArrayList;
-+import java.util.Arrays;
-
-+/**
-+ * Super class for tests which need to attach jcmd to the current process.
-+ */
- public class JcmdBase {
-
- private static ProcessBuilder processBuilder = new ProcessBuilder();
-@@ -32,46 +35,24 @@
- /**
- * Attach jcmd to the current process
- *
-- * @param commandArgs
-- * jcmd command line parameters, e.g. JFR.start
-+ * @param toolArgs
-+ * jcmd command line parameters, e.g. VM.flags
- * @return jcmd output
- * @throws Exception
- */
-- public final static OutputAnalyzer jcmd(String... commandArgs)
-+ public final static OutputAnalyzer jcmd(String... toolArgs)
- throws Exception {
-- ArrayList<String> cmd = new ArrayList<String>();
-- String cmdString = "";
--
-- // jcmd from the jdk to be tested
-- String jcmdPath = JdkFinder.getTool("jcmd", false);
-- cmd.add(jcmdPath);
-- cmdString += jcmdPath;
--
-- String pid = Integer.toString(ProcessTools.getProcessId());
-- cmd.add(pid);
-- cmdString += " " + pid;
--
-- for (int i = 0; i < commandArgs.length; i++) {
-- cmd.add(commandArgs[i]);
-- cmdString += " " + commandArgs[i];
-+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jcmd");
-+ launcher.addToolArg(Integer.toString(ProcessTools.getProcessId()));
-+ for (String toolArg : toolArgs) {
-+ launcher.addToolArg(toolArg);
- }
--
-- // Log command line for debugging purpose
-- System.out.println("Command line:");
-- System.out.println(cmdString);
--
-- processBuilder.command(cmd);
-+ processBuilder.command(launcher.getCommand());
-+ System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
- OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
--
-- // Log output for debugging purpose
-- System.out.println("Command output:");
- System.out.println(output.getOutput());
-
-- if (output.getExitValue() != 0) {
-- throw new Exception(processBuilder.command()
-- + " resulted in exit value " + output.getExitValue()
-- + " , expected to get 0");
-- }
-+ output.shouldHaveExitValue(0);
-
- return output;
- }
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java 2013-09-06 11:30:01.000000000 -0700
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,78 +0,0 @@
--/*
-- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation.
-- *
-- * 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 jdk.testlibrary;
--
--import java.io.File;
--
--public final class JdkFinder {
--
-- private JdkFinder() {
-- }
--
-- private static String getExecutable(String executable, String property) {
-- String binPath = System.getProperty(property);
-- if (binPath == null) {
-- throw new RuntimeException(
-- "System property '" + property + "' not set");
-- }
--
-- binPath += File.separatorChar + "bin" + File.separatorChar + executable;
--
-- return binPath;
-- }
--
-- /**
-- * Returns the full path to a java launcher in jdk/bin based on system
-- * property.
-- *
-- * @param stableJdk
-- * see {@link #getTool(String, boolean)}
-- * @return Full path to a java launcher in jdk/bin.
-- */
-- public static String getJavaLauncher(boolean stableJdk) {
-- return getTool("java", stableJdk);
-- }
--
-- /**
-- * Returns the full path to an executable in jdk/bin based on system
-- * property. Depending on value of {@code stableJdk} the method will look for
-- * either 'compile.jdk' or 'test.jdk' system properties.
-- * 'test.jdk' is normally set by jtreg. When running test separately,
-- * set this property using '-Dtest.jdk=/path/to/jdk'.
-- *
-- * @param stableJdk
-- * If {@code true} the {@code tool} will be retrieved
-- * from the compile (stable) JDK.
-- * If {@code false} the {@code tool} will be retrieved
-- * from the test JDK.
-- * @return Full path to an executable in jdk/bin.
-- */
-- public static String getTool(String tool, boolean stableJdk) {
-- if (stableJdk) {
-- return getExecutable(tool, "compile.jdk");
-- } else {
-- return getExecutable(tool, "test.jdk");
-- }
-- }
--}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java 2013-09-06 11:30:01.000000000 -0700
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java 2014-07-15 21:54:44.000000000 -0700
-@@ -27,6 +27,9 @@
- import java.util.regex.Matcher;
- import java.util.regex.Pattern;
-
-+/**
-+ * Utility class for verifying output and exit value from a {@code Process}.
-+ */
- public final class OutputAnalyzer {
-
- private final String stdout;
-@@ -85,9 +88,9 @@
- public void shouldContain(String expectedString) {
- if (!stdout.contains(expectedString)
- && !stderr.contains(expectedString)) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + expectedString
-- + "' missing from stdout/stderr: [" + stdout + stderr
-- + "]\n");
-+ + "' missing from stdout/stderr \n");
- }
- }
-
-@@ -101,8 +104,9 @@
- */
- public void stdoutShouldContain(String expectedString) {
- if (!stdout.contains(expectedString)) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + expectedString
-- + "' missing from stdout: [" + stdout + "]\n");
-+ + "' missing from stdout \n");
- }
- }
-
-@@ -116,8 +120,9 @@
- */
- public void stderrShouldContain(String expectedString) {
- if (!stderr.contains(expectedString)) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + expectedString
-- + "' missing from stderr: [" + stderr + "]\n");
-+ + "' missing from stderr \n");
- }
- }
-
-@@ -132,12 +137,14 @@
- */
- public void shouldNotContain(String notExpectedString) {
- if (stdout.contains(notExpectedString)) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString
-- + "' found in stdout: [" + stdout + "]\n");
-+ + "' found in stdout \n");
- }
- if (stderr.contains(notExpectedString)) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString
-- + "' found in stderr: [" + stderr + "]\n");
-+ + "' found in stderr \n");
- }
- }
-
-@@ -152,8 +159,9 @@
- */
- public void stdoutShouldNotContain(String notExpectedString) {
- if (stdout.contains(notExpectedString)) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString
-- + "' found in stdout: [" + stdout + "]\n");
-+ + "' found in stdout \n");
- }
- }
-
-@@ -168,55 +176,63 @@
- */
- public void stderrShouldNotContain(String notExpectedString) {
- if (stderr.contains(notExpectedString)) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString
-- + "' found in stderr: [" + stderr + "]\n");
-+ + "' found in stderr \n");
- }
- }
-
- /**
-- * Verify that the stdout and stderr contents of output buffer matches
-- * the pattern
-+ * Verify that the stdout and stderr contents of output buffer matches the
-+ * pattern
- *
- * @param pattern
-- * @throws RuntimeException If the pattern was not found
-+ * @throws RuntimeException
-+ * If the pattern was not found
- */
- public void shouldMatch(String pattern) {
-- Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
-- Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
-+ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE)
-+ .matcher(stdout);
-+ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE)
-+ .matcher(stderr);
- if (!stdoutMatcher.find() && !stderrMatcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' missing from stdout/stderr: [" + stdout + stderr
-- + "]\n");
-+ + "' missing from stdout/stderr \n");
- }
- }
-
- /**
-- * Verify that the stdout contents of output buffer matches the
-- * pattern
-+ * Verify that the stdout contents of output buffer matches the pattern
- *
- * @param pattern
-- * @throws RuntimeException If the pattern was not found
-+ * @throws RuntimeException
-+ * If the pattern was not found
- */
- public void stdoutShouldMatch(String pattern) {
-- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
-+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
-+ stdout);
- if (!matcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' missing from stdout: [" + stdout + "]\n");
-+ + "' missing from stdout \n");
- }
- }
-
- /**
-- * Verify that the stderr contents of output buffer matches the
-- * pattern
-+ * Verify that the stderr contents of output buffer matches the pattern
- *
- * @param pattern
-- * @throws RuntimeException If the pattern was not found
-+ * @throws RuntimeException
-+ * If the pattern was not found
- */
- public void stderrShouldMatch(String pattern) {
-- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
-+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
-+ stderr);
- if (!matcher.find()) {
-+ reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
-- + "' missing from stderr: [" + stderr + "]\n");
-+ + "' missing from stderr \n");
- }
- }
-
-@@ -225,18 +241,22 @@
- * match the pattern
- *
- * @param pattern
-- * @throws RuntimeException If the pattern was found
-+ * @throws RuntimeException
-+ * If the pattern was found
- */
- public void shouldNotMatch(String pattern) {
-- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
-+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
-+ stdout);
- if (matcher.find()) {
-- throw new RuntimeException("'" + pattern
-- + "' found in stdout: [" + stdout + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + pattern + "' found in stdout: '"
-+ + matcher.group() + "' \n");
- }
- matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (matcher.find()) {
-- throw new RuntimeException("'" + pattern
-- + "' found in stderr: [" + stderr + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + pattern + "' found in stderr: '"
-+ + matcher.group() + "' \n");
- }
- }
-
-@@ -245,13 +265,15 @@
- * pattern
- *
- * @param pattern
-- * @throws RuntimeException If the pattern was found
-+ * @throws RuntimeException
-+ * If the pattern was found
- */
- public void stdoutShouldNotMatch(String pattern) {
-- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
-+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
-+ stdout);
- if (matcher.find()) {
-- throw new RuntimeException("'" + pattern
-- + "' found in stdout: [" + stdout + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + pattern + "' found in stdout \n");
- }
- }
-
-@@ -260,18 +282,56 @@
- * pattern
- *
- * @param pattern
-- * @throws RuntimeException If the pattern was found
-+ * @throws RuntimeException
-+ * If the pattern was found
- */
- public void stderrShouldNotMatch(String pattern) {
-- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
-+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(
-+ stderr);
- if (matcher.find()) {
-- throw new RuntimeException("'" + pattern
-- + "' found in stderr: [" + stderr + "]\n");
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("'" + pattern + "' found in stderr \n");
-+ }
-+ }
-+
-+ /**
-+ * Get the captured group of the first string matching the pattern. stderr
-+ * is searched before stdout.
-+ *
-+ * @param pattern
-+ * The multi-line pattern to match
-+ * @param group
-+ * The group to capture
-+ * @return The matched string or null if no match was found
-+ */
-+ public String firstMatch(String pattern, int group) {
-+ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE)
-+ .matcher(stderr);
-+ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE)
-+ .matcher(stdout);
-+ if (stderrMatcher.find()) {
-+ return stderrMatcher.group(group);
- }
-+ if (stdoutMatcher.find()) {
-+ return stdoutMatcher.group(group);
-+ }
-+ return null;
-+ }
-+
-+ /**
-+ * Get the first string matching the pattern. stderr is searched before
-+ * stdout.
-+ *
-+ * @param pattern
-+ * The multi-line pattern to match
-+ * @return The matched string or null if no match was found
-+ */
-+ public String firstMatch(String pattern) {
-+ return firstMatch(pattern, 0);
- }
-
- /**
-- * Verifiy the exit value of the process
-+ * Verify the exit value of the process
- *
- * @param expectedExitValue
- * Expected exit value from process
-@@ -281,12 +341,25 @@
- */
- public void shouldHaveExitValue(int expectedExitValue) {
- if (getExitValue() != expectedExitValue) {
-- throw new RuntimeException("Exit value " + getExitValue()
-- + " , expected to get " + expectedExitValue);
-+ reportDiagnosticSummary();
-+ throw new RuntimeException("Expected to get exit value of ["
-+ + expectedExitValue + "]\n");
- }
- }
-
- /**
-+ * Report summary that will help to diagnose the problem Currently includes:
-+ * - standard input produced by the process under test - standard output -
-+ * exit code Note: the command line is printed by the ProcessTools
-+ */
-+ private void reportDiagnosticSummary() {
-+ String msg = " stdout: [" + stdout + "];\n" + " stderr: [" + stderr
-+ + "]\n" + " exitValue = " + getExitValue() + "\n";
-+
-+ System.err.println(msg);
-+ }
-+
-+ /**
- * Get the contents of the output buffer (stdout and stderr)
- *
- * @return Content of the output buffer
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java 2014-10-28 20:19:52.000000000 -0700
-@@ -0,0 +1,108 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+public class Platform {
-+ private static final String osName = System.getProperty("os.name");
-+ private static final String dataModel = System.getProperty("sun.arch.data.model");
-+ private static final String vmVersion = System.getProperty("java.vm.version");
-+ private static final String osArch = System.getProperty("os.arch");
-+
-+ public static boolean is32bit() {
-+ return dataModel.equals("32");
-+ }
-+
-+ public static boolean is64bit() {
-+ return dataModel.equals("64");
-+ }
-+
-+ public static boolean isSolaris() {
-+ return isOs("sunos");
-+ }
-+
-+ public static boolean isWindows() {
-+ return isOs("win");
-+ }
-+
-+ public static boolean isOSX() {
-+ return isOs("mac");
-+ }
-+
-+ public static boolean isLinux() {
-+ return isOs("linux");
-+ }
-+
-+ public static boolean isBSD() {
-+ return isOs("bsd");
-+ }
-+
-+ private static boolean isOs(String osname) {
-+ return (osName.toLowerCase().startsWith(osname.toLowerCase()) ||
-+ osName.toLowerCase().endsWith(osname.toLowerCase()));
-+ }
-+
-+ public static String getOsName() {
-+ return osName;
-+ }
-+
-+ public static boolean isDebugBuild() {
-+ return vmVersion.toLowerCase().contains("debug");
-+ }
-+
-+ public static String getVMVersion() {
-+ return vmVersion;
-+ }
-+
-+ // Returns true for sparc and sparcv9.
-+ public static boolean isSparc() {
-+ return isArch("sparc");
-+ }
-+
-+ public static boolean isARM() {
-+ return isArch("arm");
-+ }
-+
-+ public static boolean isPPC() {
-+ return isArch("ppc");
-+ }
-+
-+ public static boolean isX86() {
-+ // On Linux it's 'i386', Windows 'x86'
-+ return (isArch("i386") || isArch("x86"));
-+ }
-+
-+ public static boolean isX64() {
-+ // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
-+ return (isArch("amd64") || isArch("x86_64"));
-+ }
-+
-+ private static boolean isArch(String archname) {
-+ return osArch.toLowerCase().startsWith(archname.toLowerCase());
-+ }
-+
-+ public static String getOsArch() {
-+ return osArch;
-+ }
-+
-+}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessThread.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessThread.java 2014-07-15 21:54:45.000000000 -0700
-@@ -0,0 +1,143 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+import static jdk.testlibrary.Asserts.assertNotEquals;
-+import static jdk.testlibrary.Asserts.assertTrue;
-+
-+import java.util.List;
-+import java.util.concurrent.CountDownLatch;
-+
-+/**
-+ * The helper class for starting and stopping {@link Process} in a separate thread.
-+ */
-+public class ProcessThread extends TestThread {
-+
-+ /**
-+ * Creates a new {@code ProcessThread} object.
-+ *
-+ * @param threadName The name of thread
-+ * @param cmd The string array of program and its arguments to pass to {@link ProcessBuilder}
-+ */
-+ public ProcessThread(String threadName, String... cmd) {
-+ super(new ProcessRunnable(new ProcessBuilder(cmd)), threadName);
-+ }
-+
-+ /**
-+ * Creates a new {@code ProcessThread} object.
-+ *
-+ * @param threadName The name of thread.
-+ * @param pb The ProcessBuilder to execute.
-+ */
-+ public ProcessThread(String threadName, ProcessBuilder pb) {
-+ super(new ProcessRunnable(pb), threadName);
-+ }
-+
-+ /**
-+ * Stops {@link Process} started by {@code ProcessRunnable}.
-+ *
-+ * @throws InterruptedException
-+ */
-+ public void stopProcess() throws InterruptedException {
-+ ((ProcessRunnable) getRunnable()).stopProcess();
-+ }
-+
-+ /**
-+ * @return The process output, or null if the process has not yet completed.
-+ */
-+ public OutputAnalyzer getOutput() {
-+ return ((ProcessRunnable) getRunnable()).getOutput();
-+ }
-+
-+ /**
-+ * {@link Runnable} interface for starting and stopping {@link Process}.
-+ */
-+ static class ProcessRunnable extends XRun {
-+
-+ private final ProcessBuilder processBuilder;
-+ private final CountDownLatch latch;
-+ private volatile Process process;
-+ private volatile OutputAnalyzer output;
-+
-+ /**
-+ * Creates a new {@code ProcessRunnable} object.
-+ *
-+ * @param pb The {@link ProcessBuilder} to run.
-+ */
-+ public ProcessRunnable(ProcessBuilder pb) {
-+ super();
-+ this.processBuilder = pb;
-+ this.latch = new CountDownLatch(1);
-+ }
-+
-+ /**
-+ * Starts the process in {@code ProcessThread}.
-+ * All exceptions which occurs here will be caught and stored in {@code ProcessThread}.
-+ *
-+ * see {@link XRun}
-+ */
-+ @Override
-+ public void xrun() throws Throwable {
-+ this.process = processBuilder.start();
-+ // Release when process is started
-+ latch.countDown();
-+
-+ // Will block...
-+ try {
-+ output = new OutputAnalyzer(this.process);
-+ } catch (Throwable t) {
-+ String name = Thread.currentThread().getName();
-+ System.out.println(String.format("ProcessThread[%s] failed: %s", name, t.toString()));
-+ throw t;
-+ } finally {
-+ String logMsg = ProcessTools.getProcessLog(processBuilder, output);
-+ System.out.println(logMsg);
-+ }
-+ }
-+
-+ /**
-+ * Stops the process.
-+ *
-+ * @throws InterruptedException
-+ */
-+ public void stopProcess() throws InterruptedException {
-+ // Wait until process is started
-+ latch.await();
-+ if (this.process != null) {
-+ System.out.println("ProcessThread.stopProcess() will kill process");
-+ this.process.destroy();
-+ }
-+ }
-+
-+ /**
-+ * Returns the OutputAnalyzer with stdout/stderr from the process.
-+ * @return The process output, or null if process not completed.
-+ * @throws InterruptedException
-+ */
-+ public OutputAnalyzer getOutput() {
-+ return output;
-+ }
-+ }
-+
-+}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java 2013-09-06 11:30:01.000000000 -0700
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java 2014-07-15 21:54:45.000000000 -0700
-@@ -25,24 +25,107 @@
-
- import java.io.ByteArrayOutputStream;
- import java.io.IOException;
-+import java.io.PrintStream;
- import java.lang.management.ManagementFactory;
- import java.lang.management.RuntimeMXBean;
- import java.lang.reflect.Field;
- import java.lang.reflect.Method;
- import java.util.ArrayList;
- import java.util.Collections;
-+import java.util.Map;
-+import java.util.concurrent.ExecutionException;
-+import java.util.concurrent.Future;
-+import java.util.concurrent.Phaser;
-+import java.util.concurrent.TimeUnit;
-+import java.util.concurrent.TimeoutException;
-
- import sun.management.VMManagement;
-
- public final class ProcessTools {
-+ private static final class LineForwarder extends StreamPumper.LinePump {
-+ private final PrintStream ps;
-+ private final String prefix;
-+ LineForwarder(String prefix, PrintStream os) {
-+ this.ps = os;
-+ this.prefix = prefix;
-+ }
-+ @Override
-+ protected void processLine(String line) {
-+ ps.println("[" + prefix + "] " + line);
-+ }
-+ }
-
- private ProcessTools() {
- }
-
- /**
-+ * <p>Starts a process from its builder.</p>
-+ * <span>The default redirects of STDOUT and STDERR are started</span>
-+ * @param name The process name
-+ * @param processBuilder The process builder
-+ * @return Returns the initialized process
-+ * @throws IOException
-+ */
-+ public static Process startProcess(String name,
-+ ProcessBuilder processBuilder)
-+ throws IOException {
-+ Process p = null;
-+ try {
-+ p = startProcess(name, processBuilder, -1, TimeUnit.NANOSECONDS);
-+ } catch (InterruptedException | TimeoutException e) {
-+ // can't ever happen
-+ }
-+ return p;
-+ }
-+
-+ /**
-+ * <p>Starts a process from its builder.</p>
-+ * <span>The default redirects of STDOUT and STDERR are started</span>
-+ * @param name The process name
-+ * @param processBuilder The process builder
-+ * @param timeout The timeout for the warmup waiting
-+ * @param unit The timeout {@linkplain TimeUnit}
-+ * @return Returns the initialized {@linkplain Process}
-+ * @throws IOException
-+ * @throws InterruptedException
-+ * @throws TimeoutException
-+ */
-+ public static Process startProcess(String name,
-+ ProcessBuilder processBuilder,
-+ long timeout,
-+ TimeUnit unit)
-+ throws IOException, InterruptedException, TimeoutException {
-+ Process p = processBuilder.start();
-+ StreamPumper stdout = new StreamPumper(p.getInputStream());
-+ StreamPumper stderr = new StreamPumper(p.getErrorStream());
-+
-+ stdout.addPump(new LineForwarder(name, System.out));
-+ stderr.addPump(new LineForwarder(name, System.err));
-+ final Phaser phs = new Phaser(1);
-+ Future<Void> stdoutTask = stdout.process();
-+ Future<Void> stderrTask = stderr.process();
-+
-+ try {
-+ if (timeout > -1) {
-+ phs.awaitAdvanceInterruptibly(0, timeout, unit);
-+ }
-+ } catch (TimeoutException | InterruptedException e) {
-+ System.err.println("Failed to start a process (thread dump follows)");
-+ for(Map.Entry<Thread, StackTraceElement[]> s : Thread.getAllStackTraces().entrySet()) {
-+ printStack(s.getKey(), s.getValue());
-+ }
-+ stdoutTask.cancel(true);
-+ stderrTask.cancel(true);
-+ throw e;
-+ }
-+
-+ return p;
-+ }
-+
-+ /**
- * Pumps stdout and stderr from running the process into a String.
- *
-- * @param processHandler
-+ * @param processBuilder
- * ProcessHandler to run.
- * @return Output from process.
- * @throws IOException
-@@ -69,22 +152,19 @@
- stdoutBuffer);
- StreamPumper errPumper = new StreamPumper(process.getErrorStream(),
- stderrBuffer);
-- Thread outPumperThread = new Thread(outPumper);
-- Thread errPumperThread = new Thread(errPumper);
--
-- outPumperThread.setDaemon(true);
-- errPumperThread.setDaemon(true);
-
-- outPumperThread.start();
-- errPumperThread.start();
-+ Future<Void> outTask = outPumper.process();
-+ Future<Void> errTask = errPumper.process();
-
- try {
- process.waitFor();
-- outPumperThread.join();
-- errPumperThread.join();
-+ outTask.get();
-+ errTask.get();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- return null;
-+ } catch (ExecutionException e) {
-+ throw new IOException(e);
- }
-
- return new OutputBuffer(stdoutBuffer.toString(),
-@@ -137,15 +217,106 @@
- */
- public static ProcessBuilder createJavaProcessBuilder(String... command)
- throws Exception {
-- String javapath = JdkFinder.getJavaLauncher(false);
-+ String javapath = JDKToolFinder.getJDKTool("java");
-
- ArrayList<String> args = new ArrayList<>();
- args.add(javapath);
- Collections.addAll(args, getPlatformSpecificVMArgs());
- Collections.addAll(args, command);
-
-+ // Reporting
-+ StringBuilder cmdLine = new StringBuilder();
-+ for (String cmd : args)
-+ cmdLine.append(cmd).append(' ');
-+ System.out.println("Command line: [" + cmdLine.toString() + "]");
-+
- return new ProcessBuilder(args.toArray(new String[args.size()]));
-+ }
-+
-+ private static void printStack(Thread t, StackTraceElement[] stack) {
-+ System.out.println("\t" + t +
-+ " stack: (length = " + stack.length + ")");
-+ if (t != null) {
-+ for (StackTraceElement stack1 : stack) {
-+ System.out.println("\t" + stack1);
-+ }
-+ System.out.println();
-+ }
-+ }
-+
-+ /**
-+ * Executes a test jvm process, waits for it to finish and returns the process output.
-+ * The default jvm options from jtreg, test.vm.opts and test.java.opts, are added.
-+ * The java from the test.jdk is used to execute the command.
-+ *
-+ * The command line will be like:
-+ * {test.jdk}/bin/java {test.vm.opts} {test.java.opts} cmds
-+ *
-+ * @param cmds User specifed arguments.
-+ * @return The output from the process.
-+ */
-+ public static OutputAnalyzer executeTestJvm(String... cmds) throws Throwable {
-+ ProcessBuilder pb = createJavaProcessBuilder(Utils.addTestJavaOpts(cmds));
-+ return executeProcess(pb);
-+ }
-+
-+ /**
-+ * Executes a process, waits for it to finish and returns the process output.
-+ * @param pb The ProcessBuilder to execute.
-+ * @return The output from the process.
-+ */
-+ public static OutputAnalyzer executeProcess(ProcessBuilder pb) throws Throwable {
-+ OutputAnalyzer output = null;
-+ try {
-+ output = new OutputAnalyzer(pb.start());
-+ return output;
-+ } catch (Throwable t) {
-+ System.out.println("executeProcess() failed: " + t);
-+ throw t;
-+ } finally {
-+ System.out.println(getProcessLog(pb, output));
-+ }
-+ }
-+
-+ /**
-+ * Executes a process, waits for it to finish and returns the process output.
-+ * @param cmds The command line to execute.
-+ * @return The output from the process.
-+ */
-+ public static OutputAnalyzer executeProcess(String... cmds) throws Throwable {
-+ return executeProcess(new ProcessBuilder(cmds));
-+ }
-
-+ /**
-+ * Used to log command line, stdout, stderr and exit code from an executed process.
-+ * @param pb The executed process.
-+ * @param output The output from the process.
-+ */
-+ public static String getProcessLog(ProcessBuilder pb, OutputAnalyzer output) {
-+ String stderr = output == null ? "null" : output.getStderr();
-+ String stdout = output == null ? "null" : output.getStdout();
-+ String exitValue = output == null ? "null": Integer.toString(output.getExitValue());
-+ StringBuilder logMsg = new StringBuilder();
-+ final String nl = System.getProperty("line.separator");
-+ logMsg.append("--- ProcessLog ---" + nl);
-+ logMsg.append("cmd: " + getCommandLine(pb) + nl);
-+ logMsg.append("exitvalue: " + exitValue + nl);
-+ logMsg.append("stderr: " + stderr + nl);
-+ logMsg.append("stdout: " + stdout + nl);
-+ return logMsg.toString();
- }
-
-+ /**
-+ * @return The full command line for the ProcessBuilder.
-+ */
-+ public static String getCommandLine(ProcessBuilder pb) {
-+ if (pb == null) {
-+ return "null";
-+ }
-+ StringBuilder cmd = new StringBuilder();
-+ for (String s : pb.command()) {
-+ cmd.append(s).append(" ");
-+ }
-+ return cmd.toString().trim();
-+ }
- }
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java 2013-09-06 11:30:01.000000000 -0700
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java 2014-07-15 21:54:45.000000000 -0700
-@@ -23,16 +23,65 @@
-
- package jdk.testlibrary;
-
-+import java.io.BufferedInputStream;
-+import java.io.ByteArrayOutputStream;
- import java.io.OutputStream;
- import java.io.InputStream;
- import java.io.IOException;
-+import java.util.HashSet;
-+import java.util.Set;
-+import java.util.concurrent.Future;
-+import java.util.concurrent.FutureTask;
-+import java.util.concurrent.atomic.AtomicBoolean;
-
- public final class StreamPumper implements Runnable {
-
- private static final int BUF_SIZE = 256;
-
-- private final OutputStream out;
-+ /**
-+ * Pump will be called by the StreamPumper to process the incoming data
-+ */
-+ abstract public static class Pump {
-+ abstract void register(StreamPumper d);
-+ }
-+
-+ /**
-+ * OutputStream -> Pump adapter
-+ */
-+ final public static class StreamPump extends Pump {
-+ private final OutputStream out;
-+ public StreamPump(OutputStream out) {
-+ this.out = out;
-+ }
-+
-+ @Override
-+ void register(StreamPumper sp) {
-+ sp.addOutputStream(out);
-+ }
-+ }
-+
-+ /**
-+ * Used to process the incoming data line-by-line
-+ */
-+ abstract public static class LinePump extends Pump {
-+ @Override
-+ final void register(StreamPumper sp) {
-+ sp.addLineProcessor(this);
-+ }
-+
-+ abstract protected void processLine(String line);
-+ }
-+
- private final InputStream in;
-+ private final Set<OutputStream> outStreams = new HashSet<>();
-+ private final Set<LinePump> linePumps = new HashSet<>();
-+
-+ private final AtomicBoolean processing = new AtomicBoolean(false);
-+ private final FutureTask<Void> processingTask = new FutureTask(this, null);
-+
-+ public StreamPumper(InputStream in) {
-+ this.in = in;
-+ }
-
- /**
- * Create a StreamPumper that reads from in and writes to out.
-@@ -43,8 +92,8 @@
- * The stream to write to.
- */
- public StreamPumper(InputStream in, OutputStream out) {
-- this.in = in;
-- this.out = out;
-+ this(in);
-+ this.addOutputStream(out);
- }
-
- /**
-@@ -54,25 +103,97 @@
- */
- @Override
- public void run() {
-- int length;
-- InputStream localIn = in;
-- OutputStream localOut = out;
-- byte[] buffer = new byte[BUF_SIZE];
--
-- try {
-- while ((length = localIn.read(buffer)) > 0 && !Thread.interrupted()) {
-- localOut.write(buffer, 0, length);
-+ try (BufferedInputStream is = new BufferedInputStream(in)) {
-+ ByteArrayOutputStream lineBos = new ByteArrayOutputStream();
-+ byte[] buf = new byte[BUF_SIZE];
-+ int len = 0;
-+ int linelen = 0;
-+
-+ while ((len = is.read(buf)) > 0 && !Thread.interrupted()) {
-+ for(OutputStream out : outStreams) {
-+ out.write(buf, 0, len);
-+ }
-+ if (!linePumps.isEmpty()) {
-+ int i = 0;
-+ int lastcrlf = -1;
-+ while (i < len) {
-+ if (buf[i] == '\n' || buf[i] == '\r') {
-+ int bufLinelen = i - lastcrlf - 1;
-+ if (bufLinelen > 0) {
-+ lineBos.write(buf, lastcrlf + 1, bufLinelen);
-+ }
-+ linelen += bufLinelen;
-+
-+ if (linelen > 0) {
-+ lineBos.flush();
-+ final String line = lineBos.toString();
-+ for (LinePump lp : linePumps) {
-+ lp.processLine(line);
-+ };
-+ lineBos.reset();
-+ linelen = 0;
-+ }
-+ lastcrlf = i;
-+ }
-+
-+ i++;
-+ }
-+ if (lastcrlf == -1) {
-+ lineBos.write(buf, 0, len);
-+ linelen += len;
-+ } else if (lastcrlf < len - 1) {
-+ lineBos.write(buf, lastcrlf + 1, len - lastcrlf - 1);
-+ linelen += len - lastcrlf - 1;
-+ }
-+ }
- }
-+
- } catch (IOException e) {
-- // Just abort if something like this happens.
- e.printStackTrace();
- } finally {
-+ for(OutputStream out : outStreams) {
-+ try {
-+ out.flush();
-+ } catch (IOException e) {}
-+ }
- try {
-- localOut.flush();
- in.close();
-- } catch (IOException e) {
-- e.printStackTrace();
-- }
-+ } catch (IOException e) {}
- }
- }
-+
-+ final void addOutputStream(OutputStream out) {
-+ outStreams.add(out);
-+ }
-+
-+ final void addLineProcessor(LinePump lp) {
-+ linePumps.add(lp);
-+ }
-+
-+ final public StreamPumper addPump(Pump ... pump) {
-+ if (processing.get()) {
-+ throw new IllegalStateException("Can not modify pumper while " +
-+ "processing is in progress");
-+ }
-+ for(Pump p : pump) {
-+ p.register(this);
-+ }
-+ return this;
-+ }
-+
-+ final public Future<Void> process() {
-+ if (!processing.compareAndSet(false, true)) {
-+ throw new IllegalStateException("Can not re-run the processing");
-+ }
-+ Thread t = new Thread(new Runnable() {
-+ @Override
-+ public void run() {
-+ processingTask.run();
-+ }
-+ });
-+ t.setDaemon(true);
-+ t.start();
-+
-+ return processingTask;
-+ }
- }
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/TestThread.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/TestThread.java 2014-07-15 21:54:45.000000000 -0700
-@@ -0,0 +1,249 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+import java.lang.management.ManagementFactory;
-+import java.lang.management.ThreadInfo;
-+import java.lang.management.ThreadMXBean;
-+import java.util.concurrent.TimeoutException;
-+
-+/**
-+ * Thread which catches exceptions thrown during the execution
-+ * and stores them for later analysis.
-+ *
-+ * <pre>
-+ * {@code
-+ * TestThread thread = new TestThread(new XRun() {
-+ * public void run() {
-+ * // do something
-+ * }
-+ * });
-+ * thread.start();
-+ * // do something
-+ * Throwable uncaught = thread.getUncaught();
-+ * }
-+ * </pre>
-+ */
-+public class TestThread extends Thread {
-+
-+ private final Runnable runnable;
-+ private volatile Throwable uncaught;
-+
-+ /**
-+ * Returns {@link Runnable} the thread has been created with.
-+ *
-+ * @return The object whose {@code run} method is called
-+ */
-+ public Runnable getRunnable() {
-+ return runnable;
-+ }
-+
-+ /**
-+ * Creates a new {@code TestThread} object.
-+ *
-+ * @param target The object whose {@code run} method is called
-+ * @param name The thread name
-+ */
-+ public TestThread(Runnable target, String name) {
-+ super(target, name);
-+ this.runnable = target;
-+ }
-+
-+ /**
-+ * Creates a new {@code TestThread} object.
-+ *
-+ * @param target The object whose {@code run} method is called
-+ */
-+ public TestThread(Runnable target) {
-+ super(target);
-+ this.runnable = target;
-+ }
-+
-+ /**
-+ * Creates a new {@code TestThread} object.
-+ *
-+ * @param group The thread group
-+ * @param target The object whose {@code run} method is called
-+ * @param name The thread name
-+ * @param stackSize Stack size
-+ */
-+ public TestThread(ThreadGroup group, Runnable target, String name,
-+ long stackSize) {
-+ super(group, target, name, stackSize);
-+ this.runnable = target;
-+ }
-+
-+ /**
-+ * Creates a new {@code TestThread} object.
-+ *
-+ * @param group The thread group
-+ * @param target The object whose {@code run} method is called
-+ * @param name The thread name
-+ */
-+ public TestThread(ThreadGroup group, Runnable target, String name) {
-+ super(group, target, name);
-+ this.runnable = target;
-+ }
-+
-+ /**
-+ * Creates a new {@code TestThread} object.
-+ *
-+ * @param group The thread group
-+ * @param target The object whose {@code run} method is called
-+ */
-+ public TestThread(ThreadGroup group, Runnable target) {
-+ super(group, target);
-+ this.runnable = target;
-+ }
-+
-+ /**
-+ * The thread executor.
-+ */
-+ @Override
-+ public void run() {
-+ try {
-+ super.run();
-+ } catch (Throwable t) {
-+ uncaught = t;
-+ }
-+ }
-+
-+ /**
-+ * Returns exception caught during the execution.
-+ *
-+ * @return {@link Throwable}
-+ */
-+ public Throwable getUncaught() {
-+ return uncaught;
-+ }
-+
-+ /**
-+ * Waits for {@link TestThread} to die
-+ * and throws exception caught during the execution.
-+ *
-+ * @throws InterruptedException
-+ * @throws Throwable
-+ */
-+ public void joinAndThrow() throws InterruptedException, Throwable {
-+ join();
-+ if (uncaught != null) {
-+ throw uncaught;
-+ }
-+ }
-+
-+ /**
-+ * Waits during {@code timeout} for {@link TestThread} to die
-+ * and throws exception caught during the execution.
-+ *
-+ * @param timeout The time to wait in milliseconds
-+ * @throws InterruptedException
-+ * @throws Throwable
-+ */
-+ public void joinAndThrow(long timeout) throws InterruptedException,
-+ Throwable {
-+ join(timeout);
-+ if (isAlive()) {
-+ throw new TimeoutException();
-+ }
-+ if (uncaught != null) {
-+ throw uncaught;
-+ }
-+ }
-+
-+ /**
-+ * Waits for {@link TestThread} to die
-+ * and returns exception caught during the execution.
-+ *
-+ * @return Exception caught during the execution
-+ * @throws InterruptedException
-+ */
-+ public Throwable joinAndReturn() throws InterruptedException {
-+ join();
-+ if (uncaught != null) {
-+ return uncaught;
-+ }
-+ return null;
-+ }
-+
-+ /**
-+ * Waits during {@code timeout} for {@link TestThread} to die
-+ * and returns exception caught during the execution.
-+ *
-+ * @param timeout The time to wait in milliseconds
-+ * @return Exception caught during the execution
-+ * @throws InterruptedException
-+ */
-+ public Throwable joinAndReturn(long timeout) throws InterruptedException {
-+ join(timeout);
-+ if (isAlive()) {
-+ return new TimeoutException();
-+ }
-+ if (uncaught != null) {
-+ return uncaught;
-+ }
-+ return null;
-+ }
-+
-+ /**
-+ * Waits until {@link TestThread} is in the certain {@link State}
-+ * and blocking on {@code object}.
-+ *
-+ * @param state The thread state
-+ * @param object The object to block on
-+ */
-+ public void waitUntilBlockingOnObject(Thread.State state, Object object) {
-+ String want = object == null ? null : object.getClass().getName() + '@'
-+ + Integer.toHexString(System.identityHashCode(object));
-+ ThreadMXBean tmx = ManagementFactory.getThreadMXBean();
-+ while (isAlive()) {
-+ ThreadInfo ti = tmx.getThreadInfo(getId());
-+ if (ti.getThreadState() == state
-+ && (want == null || want.equals(ti.getLockName()))) {
-+ return;
-+ }
-+ try {
-+ Thread.sleep(1);
-+ } catch (InterruptedException e) {
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Waits until {@link TestThread} is in native.
-+ */
-+ public void waitUntilInNative() {
-+ ThreadMXBean tmx = ManagementFactory.getThreadMXBean();
-+ while (isAlive()) {
-+ ThreadInfo ti = tmx.getThreadInfo(getId());
-+ if (ti.isInNative()) {
-+ return;
-+ }
-+ try {
-+ Thread.sleep(1);
-+ } catch (InterruptedException e) {
-+ }
-+ }
-+ }
-+
-+}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java 2014-07-15 21:54:45.000000000 -0700
-@@ -0,0 +1,232 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+import static jdk.testlibrary.Asserts.assertTrue;
-+
-+import java.io.IOException;
-+import java.net.InetAddress;
-+import java.net.ServerSocket;
-+import java.net.UnknownHostException;
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.Arrays;
-+import java.util.Collections;
-+import java.util.regex.Pattern;
-+import java.util.regex.Matcher;
-+
-+/**
-+ * Common library for various test helper functions.
-+ */
-+public final class Utils {
-+
-+ /**
-+ * Returns the sequence used by operating system to separate lines.
-+ */
-+ public static final String NEW_LINE = System.getProperty("line.separator");
-+
-+ /**
-+ * Returns the value of 'test.vm.opts'system property.
-+ */
-+ public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "").trim();
-+
-+ /**
-+ * Returns the value of 'test.java.opts'system property.
-+ */
-+ public static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "").trim();
-+
-+
-+ private Utils() {
-+ // Private constructor to prevent class instantiation
-+ }
-+
-+ /**
-+ * Returns the list of VM options.
-+ *
-+ * @return List of VM options
-+ */
-+ public static List<String> getVmOptions() {
-+ return Arrays.asList(safeSplitString(VM_OPTIONS));
-+ }
-+
-+ /**
-+ * Returns the list of VM options with -J prefix.
-+ *
-+ * @return The list of VM options with -J prefix
-+ */
-+ public static List<String> getForwardVmOptions() {
-+ String[] opts = safeSplitString(VM_OPTIONS);
-+ for (int i = 0; i < opts.length; i++) {
-+ opts[i] = "-J" + opts[i];
-+ }
-+ return Arrays.asList(opts);
-+ }
-+
-+ /**
-+ * Returns the default JTReg arguments for a jvm running a test.
-+ * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
-+ * @return An array of options, or an empty array if no opptions.
-+ */
-+ public static String[] getTestJavaOpts() {
-+ List<String> opts = new ArrayList<String>();
-+ Collections.addAll(opts, safeSplitString(VM_OPTIONS));
-+ Collections.addAll(opts, safeSplitString(JAVA_OPTIONS));
-+ return opts.toArray(new String[0]);
-+ }
-+
-+ /**
-+ * Combines given arguments with default JTReg arguments for a jvm running a test.
-+ * This is the combination of JTReg arguments test.vm.opts and test.java.opts
-+ * @return The combination of JTReg test java options and user args.
-+ */
-+ public static String[] addTestJavaOpts(String... userArgs) {
-+ List<String> opts = new ArrayList<String>();
-+ Collections.addAll(opts, getTestJavaOpts());
-+ Collections.addAll(opts, userArgs);
-+ return opts.toArray(new String[0]);
-+ }
-+
-+ /**
-+ * Splits a string by white space.
-+ * Works like String.split(), but returns an empty array
-+ * if the string is null or empty.
-+ */
-+ private static String[] safeSplitString(String s) {
-+ if (s == null || s.trim().isEmpty()) {
-+ return new String[] {};
-+ }
-+ return s.trim().split("\\s+");
-+ }
-+
-+ /**
-+ * @return The full command line for the ProcessBuilder.
-+ */
-+ public static String getCommandLine(ProcessBuilder pb) {
-+ StringBuilder cmd = new StringBuilder();
-+ for (String s : pb.command()) {
-+ cmd.append(s).append(" ");
-+ }
-+ return cmd.toString();
-+ }
-+
-+ /**
-+ * Returns the free port on the local host.
-+ * The function will spin until a valid port number is found.
-+ *
-+ * @return The port number
-+ * @throws InterruptedException if any thread has interrupted the current thread
-+ * @throws IOException if an I/O error occurs when opening the socket
-+ */
-+ public static int getFreePort() throws InterruptedException, IOException {
-+ int port = -1;
-+
-+ while (port <= 0) {
-+ Thread.sleep(100);
-+
-+ ServerSocket serverSocket = null;
-+ try {
-+ serverSocket = new ServerSocket(0);
-+ port = serverSocket.getLocalPort();
-+ } finally {
-+ serverSocket.close();
-+ }
-+ }
-+
-+ return port;
-+ }
-+
-+ /**
-+ * Returns the name of the local host.
-+ *
-+ * @return The host name
-+ * @throws UnknownHostException if IP address of a host could not be determined
-+ */
-+ public static String getHostname() throws UnknownHostException {
-+ InetAddress inetAddress = InetAddress.getLocalHost();
-+ String hostName = inetAddress.getHostName();
-+
-+ assertTrue((hostName != null && !hostName.isEmpty()),
-+ "Cannot get hostname");
-+
-+ return hostName;
-+ }
-+
-+ /**
-+ * Uses "jcmd -l" to search for a jvm pid. This function will wait
-+ * forever (until jtreg timeout) for the pid to be found.
-+ * @param key Regular expression to search for
-+ * @return The found pid.
-+ */
-+ public static int waitForJvmPid(String key) throws Throwable {
-+ final long iterationSleepMillis = 250;
-+ System.out.println("waitForJvmPid: Waiting for key '" + key + "'");
-+ System.out.flush();
-+ while (true) {
-+ int pid = tryFindJvmPid(key);
-+ if (pid >= 0) {
-+ return pid;
-+ }
-+ Thread.sleep(iterationSleepMillis);
-+ }
-+ }
-+
-+ /**
-+ * Searches for a jvm pid in the output from "jcmd -l".
-+ *
-+ * Example output from jcmd is:
-+ * 12498 sun.tools.jcmd.JCmd -l
-+ * 12254 /tmp/jdk8/tl/jdk/JTwork/classes/com/sun/tools/attach/Application.jar
-+ *
-+ * @param key A regular expression to search for.
-+ * @return The found pid, or -1 if Enot found.
-+ * @throws Exception If multiple matching jvms are found.
-+ */
-+ public static int tryFindJvmPid(String key) throws Throwable {
-+ ProcessBuilder pb = null;
-+ OutputAnalyzer output = null;
-+ try {
-+ JDKToolLauncher jcmdLauncher = JDKToolLauncher.create("jcmd");
-+ jcmdLauncher.addToolArg("-l");
-+ output = ProcessTools.executeProcess(jcmdLauncher.getCommand());
-+ output.shouldHaveExitValue(0);
-+
-+ // Search for a line starting with numbers (pid), follwed by the key.
-+ Pattern pattern = Pattern.compile("([0-9]+)\\s.*(" + key + ").*\\r?\\n");
-+ Matcher matcher = pattern.matcher(output.getStdout());
-+
-+ int pid = -1;
-+ if (matcher.find()) {
-+ pid = Integer.parseInt(matcher.group(1));
-+ System.out.println("findJvmPid.pid: " + pid);
-+ if (matcher.find()) {
-+ throw new Exception("Found multiple JVM pids for key: " + key);
-+ }
-+ }
-+ return pid;
-+ } catch (Throwable t) {
-+ System.out.println(String.format("Utils.findJvmPid(%s) failed: %s", key, t));
-+ throw t;
-+ }
-+ }
-+}
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/XRun.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/XRun.java 2014-07-15 21:54:45.000000000 -0700
-@@ -0,0 +1,56 @@
-+/*
-+ * 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.
-+ */
-+
-+package jdk.testlibrary;
-+
-+/**
-+ * This type serves no other purpose than to simply allow automatically running
-+ * something in a thread, and have all exceptions propagated to
-+ * RuntimeExceptions, which are thrown up to thread, which in turn should
-+ * probably be a {@link TestThread} to they are stored.
-+ */
-+public abstract class XRun implements Runnable {
-+
-+ /**
-+ * Invokes {@code xrun()} and throws all exceptions caught in it
-+ * up to the thread.
-+ */
-+ public final void run() {
-+ try {
-+ xrun();
-+ } catch (Error e) {
-+ throw e;
-+ } catch (RuntimeException e) {
-+ throw e;
-+ } catch (Throwable e) {
-+ throw new RuntimeException(e);
-+ }
-+ }
-+
-+ /**
-+ * Override this method to implement what to run in the thread.
-+ *
-+ * @throws Throwable
-+ */
-+ protected abstract void xrun() throws Throwable;
-+}
---- ./jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,46 @@
-+/*
-+ * 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 7173464
-+ @summary Clipboard.getAvailableDataFlavors: Comparison method violates contract
-+ @author Petr Pchelko
-+ @run main DataFlavorComparatorTest
-+*/
-+
-+import sun.awt.datatransfer.DataTransferer;
-+
-+import java.awt.datatransfer.DataFlavor;
-+
-+public class DataFlavorComparatorTest {
-+
-+ public static void main(String[] args) {
-+ DataTransferer.DataFlavorComparator comparator = new DataTransferer.DataFlavorComparator();
-+ DataFlavor flavor1 = new DataFlavor("application/image", "Image");
-+ DataFlavor flavor2 = new DataFlavor("application/html", "HTML");
-+ if (comparator.compare(flavor1, flavor2) == 0) {
-+ throw new RuntimeException(flavor1.getMimeType() + " and " + flavor2.getMimeType() +
-+ " should not be equal");
-+ }
-+ }
-+}
---- ./jdk/test/sun/awt/image/bug8038000.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/sun/awt/image/bug8038000.java 2014-10-28 20:19:48.000000000 -0700
-@@ -0,0 +1,153 @@
-+/*
-+ * 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 8038000
-+ *
-+ * @summary Verifies that we could create different type of Rasters with height 1
-+ * and strideline which exceeds raster width.
-+ * Also checks that a set of RasterOp work correctly with such kind of Rasters.
-+ *
-+ * @run main bug8038000
-+ */
-+
-+import java.awt.*;
-+import java.awt.color.ColorSpace;
-+import java.awt.geom.AffineTransform;
-+import java.awt.image.*;
-+import java.util.Arrays;
-+
-+public class bug8038000 {
-+
-+ public static void main(String[] args) throws Exception {
-+ new bug8038000().checkOps();
-+
-+ // No exceptions - Passed
-+ }
-+
-+ private void checkOps() throws Exception {
-+
-+ RasterOp[] ops = new RasterOp[] {
-+ new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_sRGB),
-+ ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), null),
-+ new AffineTransformOp(AffineTransform.getScaleInstance(1, 1.1), null)
-+ };
-+
-+
-+ for (RasterOp op: ops) {
-+ // Banded rasters
-+ checkOp(Raster.createBandedRaster(DataBuffer.TYPE_BYTE, 10, 1, 10,
-+ new int[] {0, 1, 2}, new int[]{2,1,0}, null),
-+ Raster.createBandedRaster(DataBuffer.TYPE_BYTE, 10, 1, 1001,
-+ new int[] {0, 1, 2}, new int[]{2,1,0}, null), op);
-+ checkOp(Raster.createBandedRaster(DataBuffer.TYPE_USHORT, 10, 1, 10,
-+ new int[] {0, 1, 2}, new int[]{2,1,0}, null),
-+ Raster.createBandedRaster(DataBuffer.TYPE_USHORT, 10, 1, 1001,
-+ new int[] {0, 1, 2}, new int[]{2,1,0}, null), op);
-+ checkOp(Raster.createBandedRaster(DataBuffer.TYPE_INT, 10, 1, 10,
-+ new int[] {0, 1, 2}, new int[]{2,1,0}, null),
-+ Raster.createBandedRaster(DataBuffer.TYPE_INT, 10, 1, 1001,
-+ new int[] {0, 1, 2}, new int[]{2,1,0}, null), op);
-+
-+ // Interleaved rasters
-+ checkOp(Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
-+ 10, 1, 30, 3, new int[]{0, 1, 2}, null),
-+ Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
-+ 10, 1, 1001, 3, new int[]{0, 1, 2}, null),
-+ op);
-+
-+ checkOp(Raster.createInterleavedRaster(DataBuffer.TYPE_USHORT,
-+ 10, 1, 30, 3, new int[]{0, 1, 2}, null),
-+ Raster.createInterleavedRaster(DataBuffer.TYPE_USHORT,
-+ 10, 1, 1001, 3, new int[]{0, 1, 2}, null),
-+ op);
-+
-+ // Packed rasters
-+ checkOp(Raster.createPackedRaster(new DataBufferByte(10), 10, 1, 10,
-+ new int[] {0x01, 0x02, 0x04}, null),
-+ Raster.createPackedRaster(new DataBufferByte(10), 10, 1, 2000,
-+ new int[] {0x01, 0x02, 0x04}, null),
-+ op);
-+ checkOp(Raster.createPackedRaster(new DataBufferInt(10), 10, 1, 10,
-+ new int[] {0xff0000, 0x00ff00, 0x0000ff}, null),
-+ Raster.createPackedRaster(new DataBufferInt(10), 10, 1, 20,
-+ new int[] {0xff0000, 0x00ff00, 0x0000ff}, null),
-+ op);
-+
-+ }
-+ }
-+
-+ /**
-+ * Takes two identical rasters (identical with the exception of scanline stride)
-+ * fills their pixels with identical data, applies the RasterOp to both rasters
-+ * and checks that the result is the same
-+ */
-+ private void checkOp(WritableRaster wr1, WritableRaster wr2, RasterOp op) {
-+ System.out.println("Checking " + op + " with rasters: \n " + wr1 +
-+ "\n " + wr2);
-+ try {
-+ WritableRaster r1 = op.filter(fillRaster(wr1), null);
-+ WritableRaster r2 = op.filter(fillRaster(wr2), null);
-+ compareRasters(r1, r2);
-+ } catch (ImagingOpException e) {
-+ System.out.println(" Skip: Op is not supported: " + e);
-+ }
-+ }
-+
-+ private WritableRaster fillRaster(WritableRaster wr) {
-+ int c = 0;
-+ for(int x = wr.getMinX(); x < wr.getMinX() + wr.getWidth(); x++) {
-+ for(int y = wr.getMinY(); y < wr.getMinY() + wr.getHeight(); y++) {
-+ for (int b = 0; b < wr.getNumBands(); b++) {
-+ wr.setSample(x, y, b, c++);
-+ }
-+ }
-+ }
-+ return wr;
-+ }
-+
-+ private void compareRasters(Raster r1, Raster r2) {
-+ Rectangle bounds = r1.getBounds();
-+ if (!bounds.equals(r2.getBounds())) {
-+ throw new RuntimeException("Bounds differ.");
-+ }
-+
-+ if (r1.getNumBands() != r2.getNumBands()) {
-+ throw new RuntimeException("Bands differ.");
-+ }
-+
-+ int[] b1 = new int[r1.getNumBands()];
-+ int[] b2 = new int[r1.getNumBands()];
-+
-+ for (int x = (int) bounds.getX(); x < bounds.getMaxX(); x++) {
-+ for (int y = (int) bounds.getY(); y < bounds.getMaxY(); y++) {
-+ r1.getPixel(x,y, b1);
-+ r2.getPixel(x,y, b2);
-+ if (!Arrays.equals(b1, b2)) {
-+ throw new RuntimeException("Pixels differ.");
-+ }
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java 2013-09-06 11:30:02.000000000 -0700
-+++ ./jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java 2014-10-28 20:19:48.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /**
- * @test
-- * @bug 6476665 7033534
-+ * @bug 6476665 7033534 8052162
- * @summary Verifies color conversion of Component Color Model based images
- * @run main ColConvCCMTest
- */
---- ./jdk/test/sun/management/jdp/JdpTest.sh 2013-09-06 11:30:02.000000000 -0700
-+++ ./jdk/test/sun/management/jdp/JdpTest.sh 2014-07-15 21:49:31.000000000 -0700
-@@ -84,15 +84,29 @@
- ${TESTJAVA}/bin/java -server $* -cp ${_testclasses} ${testappname} >> ${_logname} 2>&1 &
- _last_pid=$!
-
-- npid=`_get_pid`
-- if [ "${npid}" = "" ]
-- then
-- echo "ERROR: Test app not started. Please check machine resources before filing a bug."
-- if [ "${_jtreg}" = "yes" ]
-- then
-- exit 255
-- fi
-- fi
-+# wait until VM is actually starts.
-+# please note, if vm doesn't start for some reason
-+# jtreg kills the test by timeout. Don't file a bug.
-+ cnt=1
-+ while true
-+ do
-+ npid=`_get_pid`
-+ if [ "${npid}" != "" ]
-+ then
-+ break
-+ fi
-+ if [ "${cnt}" = "10" ]
-+ then
-+ echo "ERROR: Test app not started. Please check machine resources before filing a bug."
-+ if [ "${_jtreg}" = "yes" ]
-+ then
-+ exit 255
-+ fi
-+ break
-+ fi
-+ cnt=`expr $cnt + 1`
-+ sleep 1
-+ done
- }
-
- _get_pid(){
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -45,37 +45,53 @@
- # has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
- #{
- OS=`uname -s`
--if [ "$OS" != "Linux" -a "$OS" != "SunOS" ]; then
-- echo "Test not designed to run on this operating system, skipping..."
-- exit 0
--fi
-+case "${OS}" in
-+ Windows* | CYGWIN* )
-+ echo "Test not designed to run on this operating system, skipping..."
-+ exit 0
-+ ;;
-+esac
-
- #
- # Locate the custom launcher for this platform
- #
- PLATFORM=unknown
- ARCH=unknown
--if [ "$OS" = "SunOS" ]; then
-- PLATFORM=solaris
-- case "`uname -p`" in
-- i[3-9]86)
-- ARCH=i586
-- ;;
-- sparc)
-- ARCH=sparc
-- ;;
-- esac
--else
-- PLATFORM=linux
-- case "`uname -m`" in
-- i[3-6]86)
-- ARCH=i586
-- ;;
-- x86_64)
-- ARCH=amd64
-- ;;
-- esac
--fi
-+case "${OS}" in
-+ SunOS )
-+ PLATFORM=solaris
-+ case "`uname -p`" in
-+ i[3-9]86)
-+ ARCH=i586
-+ ;;
-+ sparc)
-+ ARCH=sparc
-+ ;;
-+ esac
-+ ;;
-+ Linux )
-+ PLATFORM=linux
-+ case "`uname -m`" in
-+ i[3-6]86)
-+ ARCH=i586
-+ ;;
-+ x86_64)
-+ ARCH=amd64
-+ ;;
-+ esac
-+ ;;
-+ *BSD | Darwin )
-+ PLATFORM=bsd
-+ case "`uname -m`" in
-+ i[3-6]86)
-+ ARCH=i586
-+ ;;
-+ x86_64)
-+ ARCH=amd64
-+ ;;
-+ esac
-+ ;;
-+esac
-
-
- #
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -35,7 +35,7 @@
- UMASK=`umask`
-
- case $OS in
--SunOS | Linux | Darwin)
-+SunOS | Linux | *BSD | Darwin)
- PATHSEP=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -86,10 +86,12 @@
- # on Windows 98.
-
- os=`uname -s`
--if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
-- echo "Test not designed to run on this operating system, skipping..."
-- exit 0
--fi
-+case "${os}" in
-+ Windows* | CYGWIN* )
-+ echo "Test not designed to run on this operating system, skipping..."
-+ exit 0
-+ ;;
-+esac
-
- 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-10-28 20:19:52.000000000 -0700
-@@ -70,10 +70,12 @@
- # security the password file.
-
- os=`uname -s`
--if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
-- echo "Test not designed to run on this operating system, skipping..."
-- exit 0
--fi
-+case "${os}" in
-+ Windows* | CYGWIN* )
-+ echo "Test not designed to run on this operating system, skipping..."
-+ exit 0
-+ ;;
-+esac
-
-
- # 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-10-28 20:19:52.000000000 -0700
-@@ -69,10 +69,12 @@
- # security the password file.
-
- os=`uname -s`
--if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
-- echo "Test not designed to run on this operating system, skipping..."
-- exit 0
--fi
-+case "${os}" in
-+ Windows* | CYGWIN* )
-+ echo "Test not designed to run on this operating system, skipping..."
-+ exit 0
-+ ;;
-+esac
-
- # Create management and SSL configuration files
-
---- ./jdk/test/sun/misc/IoTrace/IoTraceAgent.java 2013-09-06 11:30:03.000000000 -0700
-+++ ./jdk/test/sun/misc/IoTrace/IoTraceAgent.java 2014-07-15 21:49:31.000000000 -0700
-@@ -27,6 +27,7 @@
- import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ACC_STATIC;
- import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ACC_SUPER;
- import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ILOAD;
-+import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ALOAD;
- import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.INVOKESPECIAL;
- import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.INVOKESTATIC;
- import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.IRETURN;
-@@ -165,6 +166,7 @@
-
- // return the value from the called method
- mv.visitInsn(retType.getOpcode(IRETURN));
-+ mv.visitMaxs(0, 0);
- mv.visitEnd();
- }
-
-@@ -172,8 +174,10 @@
- MethodVisitor mv = cw.visitMethod(ACC_PRIVATE, "<init>", "()V", null,
- null);
- mv.visitCode();
-+ mv.visitVarInsn(ALOAD, 0);
- mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
- mv.visitInsn(RETURN);
-+ mv.visitMaxs(0, 0);
- mv.visitEnd();
-
- cw.visitEnd();
---- ./jdk/test/sun/misc/IoTrace/ioTraceTest.sh 2013-09-06 11:30:03.000000000 -0700
-+++ ./jdk/test/sun/misc/IoTrace/ioTraceTest.sh 2014-07-15 21:49:31.000000000 -0700
-@@ -31,4 +31,4 @@
- ${TESTJAVA}/bin/jar cfm iotraceagent.jar ${TESTSRC}/iotraceagent.mf IoTraceAgent.class IoTraceListener.class
-
- cd ${PWD}
--${TESTJAVA}/bin/java ${TESTVMOPTS} -javaagent:${TESTCLASSES}/iotraceagent.jar -cp ${TESTCLASSES} $*
-+${TESTJAVA}/bin/java -Xverify:all ${TESTVMOPTS} -javaagent:${TESTCLASSES}/iotraceagent.jar -cp ${TESTCLASSES} $*
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2013-09-06 11:30:03.000000000 -0700
-+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -36,7 +36,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh 2013-09-06 11:30:03.000000000 -0700
-+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -28,7 +28,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -28,7 +28,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -31,7 +31,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -31,7 +31,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/sun/nio/ch/SelProvider.java 2013-09-06 11:30:04.000000000 -0700
-+++ ./jdk/test/sun/nio/ch/SelProvider.java 2014-10-28 20:19:52.000000000 -0700
-@@ -39,7 +39,7 @@
- expected = "sun.nio.ch.DevPollSelectorProvider";
- } else if ("Linux".equals(osname)) {
- expected = "sun.nio.ch.EPollSelectorProvider";
-- } else if (osname.contains("OS X")) {
-+ } else if (osname.contains("OS X") || osname.endsWith("BSD")) {
- expected = "sun.nio.ch.KQueueSelectorProvider";
- } else {
- return;
---- ./jdk/test/sun/security/jgss/spnego/MechTokenMissing.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/sun/security/jgss/spnego/MechTokenMissing.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,53 @@
-+/*
-+ * 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 8024861
-+ * @summary Incomplete token triggers GSS-API NullPointerException
-+ */
-+
-+import org.ietf.jgss.GSSContext;
-+import org.ietf.jgss.GSSCredential;
-+import org.ietf.jgss.GSSException;
-+import org.ietf.jgss.GSSManager;
-+
-+public class MechTokenMissing {
-+ public static void main(String[] args) throws Exception {
-+ GSSCredential cred = null;
-+ GSSContext ctx = GSSManager.getInstance().createContext(cred);
-+
-+ String var =
-+ /*0000*/ "60 1C 06 06 2B 06 01 05 05 02 A0 12 30 10 A0 0E " +
-+ /*0010*/ "30 0C 06 0A 2B 06 01 04 01 82 37 02 02 0A ";
-+ byte[] token = new byte[var.length()/3];
-+ for (int i=0; i<token.length; i++) {
-+ token[i] = Integer.valueOf(var.substring(3*i,3*i+2), 16).byteValue();
-+ }
-+ try {
-+ ctx.acceptSecContext(token, 0, token.length);
-+ } catch (GSSException gsse) {
-+ System.out.println("Expected exception: " + gsse);
-+ }
-+ }
-+}
---- ./jdk/test/sun/security/krb5/ParseCAPaths.java 2013-09-06 11:30:06.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/ParseCAPaths.java 2014-07-15 21:49:31.000000000 -0700
-@@ -22,7 +22,7 @@
- */
- /*
- * @test
-- * @bug 6789935
-+ * @bug 6789935 8012615
- * @run main/othervm ParseCAPaths
- * @summary cross-realm capath search error
- */
-@@ -35,37 +35,75 @@
- public static void main(String[] args) throws Exception {
- System.setProperty("java.security.krb5.conf",
- System.getProperty("test.src", ".") +"/krb5-capaths.conf");
-- //System.setProperty("sun.security.krb5.debug", "true");
-
-- // Standard example
-+ // MIT
- check("ANL.GOV", "TEST.ANL.GOV", "ANL.GOV");
- check("ANL.GOV", "ES.NET", "ANL.GOV");
- check("ANL.GOV", "PNL.GOV", "ANL.GOV", "ES.NET");
- check("ANL.GOV", "NERSC.GOV", "ANL.GOV", "ES.NET");
-+ check("NERSC.GOV", "TEST.ANL.GOV", "NERSC.GOV", "ES.NET", "ANL.GOV");
-+
-+ // RedHat
-+ // 3.6.2.1. Configuring a Shared Hierarchy of Names
-+ check("AA.EXAMPLE.COM", "BB.EXAMPLE.COM",
-+ "AA.EXAMPLE.COM", "EXAMPLE.COM");
-+ check("SITE1.SALES.EXAMPLE.COM", "EVERYWHERE.EXAMPLE.COM",
-+ "SITE1.SALES.EXAMPLE.COM", "SALES.EXAMPLE.COM",
-+ "EXAMPLE.COM");
-+ check("DEVEL.EXAMPLE.COM", "PROD.EXAMPLE.ORG",
-+ "DEVEL.EXAMPLE.COM", "EXAMPLE.COM", "COM",
-+ "ORG", "EXAMPLE.ORG");
-+ // 3.6.2.2. Configuring Paths in krb5.conf
-+ check("A.EXAMPLE.COM", "B.EXAMPLE.COM", "A.EXAMPLE.COM");
-+ check("A.EXAMPLE.COM", "C.EXAMPLE.COM",
-+ "A.EXAMPLE.COM", "B.EXAMPLE.COM");
-+ check("A.EXAMPLE.COM", "D.EXAMPLE.COM",
-+ "A.EXAMPLE.COM", "B.EXAMPLE.COM", "C.EXAMPLE.COM");
-+
-+ // The original JDK example
-+ check("TIVOLI.COM", "IBM.COM", "TIVOLI.COM", "LDAPCENTRAL.NET",
-+ "IBM_LDAPCENTRAL.COM", "MOONLITE.ORG");
-+
- // Hierachical
-- check("N1.N.COM", "N2.N.COM", "N1.N.COM", "N.COM"); // 2 common
-- check("N1.N.COM", "N2.N3.COM", "N1.N.COM", "N.COM", // 1 common
-+ check("N1.N.COM", "N2.N.COM", "N1.N.COM", "N.COM");
-+ check("N1.N.COM", "N2.N3.COM", "N1.N.COM", "N.COM",
- "COM", "N3.COM");
-- check("N1.COM", "N2.COM", "N1.COM", "COM"); // 1 common
-- check("N1", "N2", "N1"); // 0 common
-- // Extra garbages
-- check("A1.COM", "A4.COM", "A1.COM", "A2.COM");
-+ check("N1.COM", "N2.COM", "N1.COM", "COM");
-+ check("N1", "N2", "N1");
-+ check("N1.COM", "N2.ORG", "N1.COM", "COM", "ORG");
-+ check("N1.N.COM", "N.COM", "N1.N.COM");
-+ check("X.N1.N.COM", "N.COM", "X.N1.N.COM", "N1.N.COM");
-+ check("N.COM", "N1.N.COM", "N.COM");
-+ check("N.COM", "X.N1.N.COM", "N.COM", "N1.N.COM");
-+ check("A.B.C", "D.E.F", "A.B.C", "B.C", "C", "F", "E.F");
-+
-+ // Full path
-+ check("A1.COM", "A2.COM", "A1.COM");
-+ check("A1.COM", "A3.COM", "A1.COM", "A2.COM");
-+ check("A1.COM", "A4.COM", "A1.COM", "A2.COM", "A3.COM");
-+
-+ // Shortest path
-+ check("B1.COM", "B2.COM", "B1.COM");
- check("B1.COM", "B3.COM", "B1.COM", "B2.COM");
-+ check("B1.COM", "B4.COM", "B1.COM", "B2.COM", "B3.COM");
-+
- // Missing is "."
-+ check("C1.COM", "C2.COM", "C1.COM", "COM");
- check("C1.COM", "C3.COM", "C1.COM", "C2.COM");
-- // Multiple path
-- check("D1.COM", "D4.COM", "D1.COM", "D2.COM");
-- check("E1.COM", "E4.COM", "E1.COM", "E2.COM");
-- check("F1.COM", "F4.COM", "F1.COM", "F9.COM");
-- // Infinite loop
-- check("G1.COM", "G3.COM", "G1.COM", "COM");
-- check("H1.COM", "H3.COM", "H1.COM");
-+
-+ // cRealm = .
-+ check("D1.COM", "D2.COM", "D1.COM");
-+
-+ // Bad cases
-+ check("E1.COM", "E2.COM", "E1.COM");
-+ check("E1.COM", "E3.COM", "E1.COM", "E4.COM");
-+ check("G1.COM", "G3.COM", "G1.COM", "G2.COM");
- check("I1.COM", "I4.COM", "I1.COM", "I5.COM");
-- // J2=J1 is the same as J2=.
-- check("J1.COM", "J2.COM", "J1.COM");
-+
- // 7019384
- check("A9.PRAGUE.XXX.CZ", "SERVIS.XXX.CZ",
- "A9.PRAGUE.XXX.CZ", "PRAGUE.XXX.CZ", "ROOT.XXX.CZ");
-+
- if (failed != null) {
- throw failed;
- }
-@@ -75,6 +113,7 @@
- try {
- check2(from, to, paths);
- } catch (Exception e) {
-+ System.out.println(" " + e.getMessage());
- failed = e;
- }
- }
-@@ -84,18 +123,15 @@
- System.out.println(from + " -> " + to);
- System.out.println(" expected: " + Arrays.toString(paths));
- String[] result = Realm.getRealmsList(from, to);
-- System.out.println(" result: " + Arrays.toString(result));
-- if (result == null) {
-- if (paths.length == 0) {
-- // OK
-- } else {
-- throw new Exception("Shouldn't have a valid path.");
-- }
-+ System.out.println(" result: " + Arrays.toString(result));
-+ if (result == null || result.length == 0) {
-+ throw new Exception("There is always a valid path.");
- } else if(result.length != paths.length) {
- throw new Exception("Length of path not correct");
- } else {
- for (int i=0; i<result.length; i++) {
- if (!result[i].equals(paths[i])) {
-+ System.out.println(" result: " + Arrays.toString(result));
- throw new Exception("Path not same");
- }
- }
---- ./jdk/test/sun/security/krb5/auto/BadKdc.java 2013-09-06 11:30:06.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/auto/BadKdc.java 2014-07-15 21:49:31.000000000 -0700
-@@ -39,7 +39,29 @@
- // ^ kdc# ^ timeout
- static final Pattern re = Pattern.compile(
- ">>> KDCCommunication: kdc=kdc.rabbit.hole UDP:(\\d)...., " +
-- "timeout=(\\d)000,");
-+ "timeout=(\\d+),");
-+
-+ // Ratio for timeout values of all timeout tests. Not final so that
-+ // each test can choose their own.
-+ static float ratio = 2f;
-+
-+ static void setRatio(float ratio) {
-+ BadKdc.ratio = ratio;
-+ }
-+
-+ static float getRatio() {
-+ return ratio;
-+ }
-+
-+ // Gets real timeout value. This method is called when writing krb5.conf
-+ static int toReal(int from) {
-+ return (int)(from * ratio + .5);
-+ }
-+
-+ // De-ratio a millisecond value to second
-+ static int toSymbolicSec(int from) {
-+ return (int)(from / ratio / 1000f + 0.5);
-+ }
-
- /*
- * There are several cases this test fails:
-@@ -97,7 +119,7 @@
-
- fw.write("[libdefaults]\n" +
- "default_realm = " + OneKDC.REALM + "\n" +
-- "kdc_timeout = 2000\n");
-+ "kdc_timeout = " + toReal(2000) + "\n");
- fw.write("[realms]\n" + OneKDC.REALM + " = {\n" +
- "kdc = " + OneKDC.KDCHOST + ":" + p1 + "\n" +
- "kdc = " + OneKDC.KDCHOST + ":" + p2 + "\n" +
-@@ -171,7 +193,8 @@
- Matcher m = re.matcher(line);
- if (m.find()) {
- System.out.println(line);
-- sb.append(m.group(1)).append(m.group(2));
-+ sb.append(m.group(1))
-+ .append(toSymbolicSec(Integer.parseInt(m.group(2))));
- }
- }
- if (failed) sb.append('-');
---- ./jdk/test/sun/security/krb5/auto/BadKdc1.java 2013-09-06 11:30:06.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/auto/BadKdc1.java 2014-07-15 21:49:31.000000000 -0700
-@@ -28,14 +28,21 @@
- * @summary krb5 should not try to access unavailable kdc too often
- */
-
--import java.io.*;
- import java.security.Security;
-
- public class BadKdc1 {
-
- public static void main(String[] args)
- throws Exception {
-- Security.setProperty("krb5.kdc.bad.policy", "tryLess");
-+
-+ // 5 sec is default timeout for tryLess
-+ if (BadKdc.getRatio() > 2.5) {
-+ Security.setProperty("krb5.kdc.bad.policy",
-+ "tryLess:1," + BadKdc.toReal(2000));
-+ } else {
-+ Security.setProperty("krb5.kdc.bad.policy", "tryLess");
-+ }
-+
- BadKdc.go(
- "121212222222(32){1,2}1222(32){1,2}", // 1 2
- // The above line means try kdc1 for 2 seconds then kdc1
---- ./jdk/test/sun/security/krb5/auto/BadKdc2.java 2013-09-06 11:30:06.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/auto/BadKdc2.java 2014-07-15 21:49:31.000000000 -0700
-@@ -35,7 +35,12 @@
-
- public static void main(String[] args)
- throws Exception {
-- Security.setProperty("krb5.kdc.bad.policy", "tryLess:2,1000");
-+
-+ // 1 sec is too short.
-+ BadKdc.setRatio(3.0f);
-+
-+ Security.setProperty(
-+ "krb5.kdc.bad.policy", "tryLess:2," + BadKdc.toReal(1000));
- BadKdc.go(
- "121212222222(32){1,2}11112121(32){1,2}", // 1 2
- "11112121(32){1,2}11112121(32){1,2}", // 1 2
---- ./jdk/test/sun/security/krb5/auto/KDC.java 2013-09-06 11:30:07.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/auto/KDC.java 2014-07-15 21:49:31.000000000 -0700
-@@ -630,7 +630,7 @@
- * @return the response
- * @throws java.lang.Exception for various errors
- */
-- private byte[] processMessage(byte[] in) throws Exception {
-+ protected byte[] processMessage(byte[] in) throws Exception {
- if ((in[0] & 0x1f) == Krb5.KRB_AS_REQ)
- return processAsReq(in);
- else
-@@ -643,7 +643,7 @@
- * @return the response
- * @throws java.lang.Exception for various errors
- */
-- private byte[] processTgsReq(byte[] in) throws Exception {
-+ protected byte[] processTgsReq(byte[] in) throws Exception {
- TGSReq tgsReq = new TGSReq(in);
- PrincipalName service = tgsReq.reqBody.sname;
- if (options.containsKey(KDC.Option.RESP_NT)) {
-@@ -809,7 +809,7 @@
- * @return the response
- * @throws java.lang.Exception for various errors
- */
-- private byte[] processAsReq(byte[] in) throws Exception {
-+ protected byte[] processAsReq(byte[] in) throws Exception {
- ASReq asReq = new ASReq(in);
- int[] eTypes = null;
- List<PAData> outPAs = new ArrayList<>();
---- ./jdk/test/sun/security/krb5/auto/LoginNoPass.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/sun/security/krb5/auto/LoginNoPass.java 2014-07-15 21:49:31.000000000 -0700
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 8028351
-+ * @summary JWS doesn't get authenticated when using kerberos auth proxy
-+ * @compile -XDignore.symbol.file LoginNoPass.java
-+ * @run main/othervm LoginNoPass
-+ */
-+
-+import sun.security.jgss.GSSUtil;
-+
-+import javax.security.auth.callback.Callback;
-+import javax.security.auth.callback.CallbackHandler;
-+import javax.security.auth.callback.NameCallback;
-+import javax.security.auth.callback.PasswordCallback;
-+import java.security.Security;
-+
-+public class LoginNoPass {
-+
-+ static boolean kdcTouched = false;
-+ public static void main(String[] args) throws Exception {
-+
-+ new OneKDC(null) {
-+ protected byte[] processAsReq(byte[] in) throws Exception {
-+ kdcTouched = true;
-+ return super.processAsReq(in);
-+ }
-+ }.writeJAASConf();
-+ Security.setProperty("auth.login.defaultCallbackHandler",
-+ "LoginNoPass$CallbackForClient");
-+ System.setProperty("javax.security.auth.useSubjectCredsOnly", "false");
-+
-+ try {
-+ Context c;
-+ c = Context.fromJAAS("client");
-+ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-+ c.take(new byte[0]);
-+ } catch (Exception e) {
-+ e.printStackTrace(System.out);
-+ // OK
-+ }
-+ if (kdcTouched) {
-+ throw new Exception("Failed");
-+ }
-+ }
-+ public static class CallbackForClient implements CallbackHandler {
-+ public void handle(Callback[] callbacks) {
-+ // Do nothing
-+ }
-+ }
-+}
---- ./jdk/test/sun/security/krb5/auto/MaxRetries.java 2013-09-06 11:30:07.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/auto/MaxRetries.java 2014-07-15 21:49:31.000000000 -0700
-@@ -54,7 +54,7 @@
- test1(5000, 2); // 2 2
-
- // For tryLess
-- Security.setProperty("krb5.kdc.bad.policy", "tryless");
-+ Security.setProperty("krb5.kdc.bad.policy", "tryless:1," + BadKdc.toReal(5000));
- rewriteMaxRetries(4);
- test1(4000, 7); // 1 1 1 1 2 1 2
- test1(4000, 4); // 1 2 1 2
-@@ -86,7 +86,7 @@
- * @param count the expected total try
- */
- private static void test1(int timeout, int count) throws Exception {
-- String timeoutTag = "timeout=" + timeout;
-+ String timeoutTag = "timeout=" + BadKdc.toReal(timeout);
- ByteArrayOutputStream bo = new ByteArrayOutputStream();
- PrintStream oldout = System.out;
- System.setOut(new PrintStream(bo));
-@@ -184,12 +184,12 @@
- if (s.startsWith("[realms]")) {
- // Reconfig global setting
- fw.write("max_retries = 2\n");
-- fw.write("kdc_timeout = 5000\n");
-+ fw.write("kdc_timeout = " + BadKdc.toReal(5000) + "\n");
- } else if (s.trim().startsWith("kdc = ")) {
- if (value != -1) {
- // Reconfig for realm
- fw.write(" max_retries = " + value + "\n");
-- fw.write(" kdc_timeout = " + (value*1000) + "\n");
-+ fw.write(" kdc_timeout = " + BadKdc.toReal(value*1000) + "\n");
- }
- // Add a bad KDC as the first candidate
- fw.write(" kdc = localhost:33333\n");
---- ./jdk/test/sun/security/krb5/auto/SaslGSS.java 2013-09-06 11:30:07.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/auto/SaslGSS.java 2014-07-15 21:49:31.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 8012082
-+ * @bug 8012082 8019267
- * @summary SASL: auth-conf negotiated, but unencrypted data is accepted,
- * reset to unencrypt
- * @compile -XDignore.symbol.file SaslGSS.java
-@@ -37,9 +37,16 @@
- import javax.security.sasl.RealmCallback;
- import javax.security.sasl.Sasl;
- import javax.security.sasl.SaslServer;
-+import java.io.ByteArrayOutputStream;
- import java.io.IOException;
-+import java.io.PrintStream;
- import java.util.HashMap;
- import java.util.Locale;
-+import java.util.logging.ConsoleHandler;
-+import java.util.logging.Handler;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
- import org.ietf.jgss.*;
- import sun.security.jgss.GSSUtil;
-
-@@ -79,14 +86,28 @@
- }
- });
-
-- // Handshake
-+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
-+ PrintStream oldErr = System.err;
-+ System.setErr(new PrintStream(bout));
-+
-+ Logger.getLogger("javax.security.sasl").setLevel(Level.ALL);
-+ Handler h = new ConsoleHandler();
-+ h.setLevel(Level.ALL);
-+ Logger.getLogger("javax.security.sasl").addHandler(h);
-+
- byte[] token = new byte[0];
-- token = sc.initSecContext(token, 0, token.length);
-- token = ss.evaluateResponse(token);
-- token = sc.unwrap(token, 0, token.length, new MessageProp(0, false));
-- token[0] = (byte)(((token[0] & 4) != 0) ? 4 : 2);
-- token = sc.wrap(token, 0, token.length, new MessageProp(0, false));
-- ss.evaluateResponse(token);
-+
-+ try {
-+ // Handshake
-+ token = sc.initSecContext(token, 0, token.length);
-+ token = ss.evaluateResponse(token);
-+ token = sc.unwrap(token, 0, token.length, new MessageProp(0, false));
-+ token[0] = (byte)(((token[0] & 4) != 0) ? 4 : 2);
-+ token = sc.wrap(token, 0, token.length, new MessageProp(0, false));
-+ ss.evaluateResponse(token);
-+ } finally {
-+ System.setErr(oldErr);
-+ }
-
- // Talk
- // 1. Client sends a auth-int message
-@@ -102,5 +123,15 @@
- if (!qop.getPrivacy()) {
- throw new Exception();
- }
-+
-+ for (String s: bout.toString().split("\\n")) {
-+ if (s.contains("KRB5SRV04") && s.contains("NULL")) {
-+ return;
-+ }
-+ }
-+ System.out.println("=======================");
-+ System.out.println(bout.toString());
-+ System.out.println("=======================");
-+ throw new Exception("Haven't seen KRB5SRV04 with NULL");
- }
- }
---- ./jdk/test/sun/security/krb5/auto/TcpTimeout.java 2013-09-06 11:30:07.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/auto/TcpTimeout.java 2014-07-15 21:49:31.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -24,7 +24,8 @@
- /*
- * @test
- * @bug 6952519
-- * @run main/timeout=40/othervm TcpTimeout
-+ * @compile -XDignore.symbol.file TcpTimeout.java
-+ * @run main/othervm TcpTimeout
- * @summary kdc_timeout is not being honoured when using TCP
- */
-
-@@ -36,103 +37,71 @@
- public static void main(String[] args)
- throws Exception {
-
-+ // Set debug to grab debug output like ">>> KDCCommunication"
- System.setProperty("sun.security.krb5.debug", "true");
-- final int p1 = 10000 + new java.util.Random().nextInt(10000);
-- final int p2 = 20000 + new java.util.Random().nextInt(10000);
-- final int p3 = 30000 + new java.util.Random().nextInt(10000);
-
-- KDC k = new KDC(OneKDC.REALM, OneKDC.KDCHOST, p3, true);
-+ // Called before new ServerSocket on p1 and p2 to make sure
-+ // customized nameservice is used
-+ KDC k = new KDC(OneKDC.REALM, OneKDC.KDCHOST, 0, true);
-+ int p3 = k.getPort();
- k.addPrincipal(OneKDC.USER, OneKDC.PASS);
- k.addPrincipalRandKey("krbtgt/" + OneKDC.REALM);
-
- // Start two listener that does not communicate, simulate timeout
-- new Thread() {
-- public void run() {
-- try {
-- new ServerSocket(p1).accept();
-- } catch (Exception e) {
-- }}
-- }.start();
-- new Thread() {
-- public void run() {
-- try {
-- new ServerSocket(p2).accept();
-- } catch (Exception e) {
-- }}
-- }.start();
--
-- FileWriter fw = new FileWriter("alternative-krb5.conf");
--
-- fw.write("[libdefaults]\n" +
-- "udp_preference_limit = 1\n" +
-- "max_retries = 2\n" +
-- "default_realm = " + OneKDC.REALM + "\n" +
-- "kdc_timeout = 5000\n");
-- fw.write("[realms]\n" + OneKDC.REALM + " = {\n" +
-- "kdc = " + OneKDC.KDCHOST + ":" + p1 + "\n" +
-- "kdc = " + OneKDC.KDCHOST + ":" + p2 + "\n" +
-- "kdc = " + OneKDC.KDCHOST + ":" + p3 + "\n" +
-- "}\n");
--
-- fw.close();
-- System.setProperty("java.security.krb5.conf", "alternative-krb5.conf");
-- Config.refresh();
--
-- // The correct behavior should be:
-- // 5 sec on p1, 5 sec on p1, fail
-- // 5 sec on p2, 5 sec on p2, fail
-- // p3 ok, p3 ok again for preauth.
-- // The total time should be 20sec + 2x. x is processing time for AS-REQ.
-- int count = 6;
-- long start = System.nanoTime();
--
-- ByteArrayOutputStream bo = new ByteArrayOutputStream();
-- PrintStream oldout = System.out;
-- System.setOut(new PrintStream(bo));
-- Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
-- System.setOut(oldout);
--
-- String[] lines = new String(bo.toByteArray()).split("\n");
-- for (String line: lines) {
-- if (line.startsWith(">>> KDCCommunication")) {
-- System.out.println(line);
-- count--;
-- }
-- }
-- if (count != 0) {
-- throw new Exception("Retry count is " + count + " less");
-- }
--
-- long end = System.nanoTime();
-- if ((end - start)/1000000000L < 20) {
-- throw new Exception("Too fast? " + (end - start)/1000000000L);
-- }
-- }
-+ ServerSocket ss1 = null;
-+ ServerSocket ss2 = null;
-
-- private static KDC on(int p) throws Exception {
-- KDC k = new KDC(OneKDC.REALM, OneKDC.KDCHOST, p, true);
-- k.addPrincipal(OneKDC.USER, OneKDC.PASS);
-- k.addPrincipalRandKey("krbtgt/" + OneKDC.REALM);
-- return k;
-- }
--
-- private static void addFakeKDCs()
-- throws Exception {
-- BufferedReader fr = new BufferedReader(new FileReader(OneKDC.KRB5_CONF));
-- FileWriter fw = new FileWriter("alternative-krb5.conf");
-- while (true) {
-- String s = fr.readLine();
-- if (s == null) {
-- break;
-+ try {
-+ ss1 = new ServerSocket(0);
-+ ss2 = new ServerSocket(0);
-+ int p1 = ss1.getLocalPort();
-+ int p2 = ss2.getLocalPort();
-+
-+ FileWriter fw = new FileWriter("alternative-krb5.conf");
-+
-+ fw.write("[libdefaults]\n" +
-+ "udp_preference_limit = 1\n" +
-+ "max_retries = 2\n" +
-+ "default_realm = " + OneKDC.REALM + "\n" +
-+ "kdc_timeout = " + BadKdc.toReal(5000) + "\n");
-+ fw.write("[realms]\n" + OneKDC.REALM + " = {\n" +
-+ "kdc = " + OneKDC.KDCHOST + ":" + p1 + "\n" +
-+ "kdc = " + OneKDC.KDCHOST + ":" + p2 + "\n" +
-+ "kdc = " + OneKDC.KDCHOST + ":" + p3 + "\n" +
-+ "}\n");
-+
-+ fw.close();
-+ System.setProperty("java.security.krb5.conf",
-+ "alternative-krb5.conf");
-+ Config.refresh();
-+
-+ System.out.println("Ports opened on " + p1 + ", " + p2 + ", " + p3);
-+
-+ // The correct behavior should be:
-+ // 5 sec on p1, 5 sec on p1, fail
-+ // 5 sec on p2, 5 sec on p2, fail
-+ // p3 ok, p3 ok again for preauth.
-+ int count = 6;
-+
-+ ByteArrayOutputStream bo = new ByteArrayOutputStream();
-+ PrintStream oldout = System.out;
-+ System.setOut(new PrintStream(bo));
-+ Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
-+ System.setOut(oldout);
-+
-+ String[] lines = new String(bo.toByteArray()).split("\n");
-+ for (String line: lines) {
-+ if (line.startsWith(">>> KDCCommunication")) {
-+ System.out.println(line);
-+ count--;
-+ }
- }
-- if (s.trim().startsWith("kdc = ")) {
-- fw.write(" kdc = localhost:33333\n");
-- fw.write(" kdc = localhost:22222\n");
-+ if (count != 0) {
-+ throw new Exception("Retry count is " + count + " less");
- }
-- fw.write(s + "\n");
-+ } finally {
-+ if (ss1 != null) ss1.close();
-+ if (ss2 != null) ss2.close();
- }
-- fr.close();
-- fw.close();
-- sun.security.krb5.Config.refresh();
- }
- }
---- ./jdk/test/sun/security/krb5/krb5-capaths.conf 2013-09-06 11:30:07.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/krb5-capaths.conf 2014-07-15 21:49:31.000000000 -0700
-@@ -1,6 +1,6 @@
- [capaths]
-
--# Standard
-+# http://web.mit.edu/kerberos/krb5-1.5/krb5-1.5.4/doc/krb5-admin/capaths.html
-
- ANL.GOV = {
- TEST.ANL.GOV = .
-@@ -14,81 +14,86 @@
- PNL.GOV = {
- ANL.GOV = ES.NET
- }
-+#NERSC.GOV = {
-+# ANL.GOV = ES.NET
-+#}
-+ES.NET = {
-+ ANL.GOV = .
-+}
- NERSC.GOV = {
- ANL.GOV = ES.NET
-+ TEST.ANL.GOV = ES.NET
-+ TEST.ANL.GOV = ANL.GOV
-+ PNL.GOV = ES.NET
-+ ES.NET = .
- }
--ES.NET = {
-- ANL.GOV = .
-+
-+# The original JDK example
-+
-+TIVOLI.COM = {
-+ IBM.COM = IBM_LDAPCENTRAL.COM MOONLITE.ORG
-+ IBM_LDAPCENTRAL.COM = LDAPCENTRAL.NET
-+ LDAPCENTRAL.NET = .
-+}
-+
-+# https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Managing_Smart_Cards/Setting_Up_Cross_Realm_Authentication.html
-+
-+A.EXAMPLE.COM = {
-+ B.EXAMPLE.COM = .
-+ C.EXAMPLE.COM = B.EXAMPLE.COM
-+ D.EXAMPLE.COM = B.EXAMPLE.COM
-+ D.EXAMPLE.COM = C.EXAMPLE.COM
- }
-
--# Extra garbages
-+# Full path
-
- A1.COM = {
- A2.COM = .
-- A4.COM = A2.COM
-- A3.COM = A4.COM
- A3.COM = A2.COM
-+ A4.COM = A2.COM
-+ A4.COM = A3.COM
- }
-
-+# Shortest path
-+
- B1.COM = {
- B2.COM = .
- B3.COM = B2.COM
-- B3.COM = B4.COM
-+ B4.COM = B3.COM
- }
-
--# Missing is "."
-+# If no sRealm key, fallback to hierarchy
-
- C1.COM = {
- C3.COM = C2.COM
- }
-
--# Multiple paths
-+# cRealm is "."
-
- D1.COM = {
-- D2.COM = .
-- D3.COM = .
-- D4.COM = D2.COM
-- D4.COM = D3.COM
-+ D2.COM=D1.COM
- }
-
-+# Bad cases
-+
- E1.COM = {
-- E2.COM = .
-+ E2.COM = E2.COM
-+ E3.COM = E4.COM
- E3.COM = .
-- E4.COM = E2.COM E3.COM E2.COM
- }
-
--# Shortest or First?
--
--F1.COM = {
-- F2.COM = .
-- F3.COM = F2.COM
-- F4.COM = F9.COM
-- F4.COM = F3.COM
-- F4.COM = F2.COM
--}
--
--# Infinite loop
--
- G1.COM = {
- G2.COM = G3.COM
- G3.COM = G2.COM
- }
-
--H1.COM = {
-- H2.COM = H3.COM
-- H3.COM = H2.COM
-- H3.COM = .
--}
--
- I1.COM = {
- I2.COM = I3.COM
- I3.COM = I2.COM
-- I4.COM = I2.COM I5.COM
-+ I4.COM = I5.COM
- }
-
--J1.COM = {
-- J2.COM=J1.COM
--}
-+# 7019384
-
- A9.PRAGUE.XXX.CZ = {
- PRAGUE.XXX.CZ = .
---- ./jdk/test/sun/security/krb5/runNameEquals.sh 2013-09-06 11:30:07.000000000 -0700
-+++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -48,15 +48,11 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux )
-+ SunOS | Linux | Darwin | *BSD )
- PATHSEP=":"
- FILESEP="/"
- NATIVE=true
- ;;
-- Darwin )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
- CYGWIN* )
- 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-10-28 20:19:52.000000000 -0700
-@@ -131,6 +131,27 @@
- ;;
- esac
- ;;
-+ *BSD | Darwin )
-+ ARCH=`uname -m`
-+ case "$ARCH" in
-+ i[3-6]86 )
-+ FS="/"
-+ PS=":"
-+ CP="${FS}bin${FS}cp"
-+ CHMOD="${FS}bin${FS}chmod"
-+ ;;
-+ amd64* | x86_64 )
-+ FS="/"
-+ PS=":"
-+ CP="${FS}bin${FS}cp"
-+ CHMOD="${FS}bin${FS}chmod"
-+ ;;
-+ * )
-+ echo "Unsupported System: ${OS} ${ARCH}"
-+ exit 0;
-+ ;;
-+ esac
-+ ;;
- Windows* )
- 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-10-28 20:19:52.000000000 -0700
-@@ -93,6 +93,27 @@
- ;;
- esac
- ;;
-+ *BSD | Darwin )
-+ ARCH=`uname -m`
-+ case "$ARCH" in
-+ i[3-6]86 )
-+ FS="/"
-+ PS=":"
-+ CP="${FS}bin${FS}cp"
-+ CHMOD="${FS}bin${FS}chmod"
-+ ;;
-+ amd64* | x86_64 )
-+ FS="/"
-+ PS=":"
-+ CP="${FS}bin${FS}cp"
-+ CHMOD="${FS}bin${FS}chmod"
-+ ;;
-+ * )
-+ echo "Unsupported System: ${OS} ${ARCH}"
-+ exit 0;
-+ ;;
-+ esac
-+ ;;
- Windows* )
- 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-10-28 20:19:52.000000000 -0700
-@@ -50,19 +50,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- FS="/"
-- PS=":"
-- CP="${FS}bin${FS}cp"
-- CHMOD="${FS}bin${FS}chmod"
-- ;;
-- Linux )
-- FS="/"
-- PS=":"
-- CP="${FS}bin${FS}cp"
-- CHMOD="${FS}bin${FS}chmod"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FS="/"
- 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-10-28 20:19:52.000000000 -0700
-@@ -51,19 +51,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- FS="/"
-- PS=":"
-- CP="${FS}bin${FS}cp"
-- CHMOD="${FS}bin${FS}chmod"
-- ;;
-- Linux )
-- FS="/"
-- PS=":"
-- CP="${FS}bin${FS}cp"
-- CHMOD="${FS}bin${FS}chmod"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FS="/"
- PS=":"
- CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/fips/CipherTest.java 2013-09-06 11:30:08.000000000 -0700
-+++ ./jdk/test/sun/security/pkcs11/fips/CipherTest.java 2014-10-28 20:19:49.000000000 -0700
-@@ -458,8 +458,21 @@
- return false;
- }
-
-+ // No ECDH-capable certificate in key store. May restructure
-+ // this in the future.
-+ if (cipherSuite.contains("ECDHE_ECDSA") ||
-+ cipherSuite.contains("ECDH_ECDSA") ||
-+ cipherSuite.contains("ECDH_RSA")) {
-+ System.out.println("Skipping unsupported test for " +
-+ cipherSuite + " of " + protocol);
-+ return false;
-+ }
-+
- // skip SSLv2Hello protocol
-- if (protocol.equals("SSLv2Hello")) {
-+ //
-+ // skip TLSv1.2 protocol, we have not implement "SunTls12Prf" and
-+ // SunTls12RsaPremasterSecret in SunPKCS11 provider
-+ if (protocol.equals("SSLv2Hello") || protocol.equals("TLSv1.2")) {
- System.out.println("Skipping unsupported test for " +
- cipherSuite + " of " + protocol);
- return false;
---- ./jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java 2013-09-06 11:30:08.000000000 -0700
-+++ ./jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java 2014-10-28 20:19:49.000000000 -0700
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 6313675 6323647
-+ * @bug 6313675 6323647 8028192
- * @summary Verify that all ciphersuites work in FIPS mode
- * @library ..
- * @ignore JSSE supported cipher suites are changed with CR 6916074,
-@@ -44,9 +44,13 @@
- return;
- }
-
-- if ("sparc".equals(System.getProperty("os.arch")) == false) {
-- // we have not updated other platforms with the proper NSS libraries yet
-- System.out.println("Test currently works only on solaris-sparc, skipping");
-+ String arch = System.getProperty("os.arch");
-+ if (!("sparc".equals(arch) || "sparcv9".equals(arch))) {
-+ // we have not updated other platforms with the proper NSS
-+ // libraries yet
-+ System.out.println(
-+ "Test currently works only on solaris-sparc " +
-+ "and solaris-sparcv9. Skipping on " + arch);
- return;
- }
-
---- ./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-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,410 @@
-+/*
-+ * 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 8014618
-+ * @summary Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
-+ * @library ..
-+ * @author Pasi Eronen
-+ */
-+
-+import java.io.*;
-+import java.security.*;
-+import java.security.spec.*;
-+import java.security.interfaces.*;
-+import javax.crypto.*;
-+import javax.crypto.spec.*;
-+import javax.crypto.interfaces.*;
-+
-+/**
-+ * Test that leading zeroes are stripped in TlsPremasterSecret case,
-+ * but are left as-is in other cases.
-+ *
-+ * We use pre-generated keypairs, since with randomly generated keypairs,
-+ * a leading zero happens only (roughly) 1 out of 256 cases.
-+ */
-+
-+public class TestLeadingZeroesP11 extends PKCS11Test {
-+
-+ public static void main(String[] args) throws Exception {
-+ main(new TestLeadingZeroesP11());
-+ }
-+
-+ public void main(Provider p) throws Exception {
-+
-+ // decode pre-generated keypairs
-+ KeyFactory kfac = KeyFactory.getInstance("DH", p);
-+ PublicKey alicePubKey =
-+ kfac.generatePublic(new X509EncodedKeySpec(alicePubKeyEnc));
-+ PublicKey bobPubKey =
-+ kfac.generatePublic(new X509EncodedKeySpec(bobPubKeyEnc));
-+ PrivateKey alicePrivKey =
-+ kfac.generatePrivate(new PKCS8EncodedKeySpec(alicePrivKeyEnc));
-+ PrivateKey bobPrivKey =
-+ kfac.generatePrivate(new PKCS8EncodedKeySpec(bobPrivKeyEnc));
-+
-+ // generate normal shared secret
-+ KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", p);
-+ aliceKeyAgree.init(alicePrivKey);
-+ aliceKeyAgree.doPhase(bobPubKey, true);
-+ byte[] sharedSecret = aliceKeyAgree.generateSecret();
-+ System.out.println("shared secret:\n" + toHexString(sharedSecret));
-+
-+ // verify that leading zero is present
-+ if (sharedSecret.length != 128) {
-+ throw new Exception("Unexpected shared secret length");
-+ }
-+ if (sharedSecret[0] != 0) {
-+ throw new Exception("First byte is not zero as expected");
-+ }
-+
-+ // now, test TLS premaster secret
-+ aliceKeyAgree.init(alicePrivKey);
-+ aliceKeyAgree.doPhase(bobPubKey, true);
-+ byte[] tlsPremasterSecret =
-+ aliceKeyAgree.generateSecret("TlsPremasterSecret").getEncoded();
-+ System.out.println(
-+ "tls premaster secret:\n" + toHexString(tlsPremasterSecret));
-+
-+ // check that leading zero has been stripped
-+ if (tlsPremasterSecret.length != 127) {
-+ throw new Exception("Unexpected TLS premaster secret length");
-+ }
-+ if (tlsPremasterSecret[0] == 0) {
-+ throw new Exception("First byte is zero");
-+ }
-+ for (int i = 0; i < tlsPremasterSecret.length; i++) {
-+ if (tlsPremasterSecret[i] != sharedSecret[i+1]) {
-+ throw new Exception("Shared secrets differ");
-+ }
-+ }
-+
-+ }
-+
-+ /*
-+ * Converts a byte to hex digit and writes to the supplied buffer
-+ */
-+ private void byte2hex(byte b, StringBuffer buf) {
-+ char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
-+ '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-+ int high = ((b & 0xf0) >> 4);
-+ int low = (b & 0x0f);
-+ buf.append(hexChars[high]);
-+ buf.append(hexChars[low]);
-+ }
-+
-+ /*
-+ * Converts a byte array to hex string
-+ */
-+ private String toHexString(byte[] block) {
-+ StringBuffer buf = new StringBuffer();
-+
-+ int len = block.length;
-+
-+ for (int i = 0; i < len; i++) {
-+ byte2hex(block[i], buf);
-+ if (i < len-1) {
-+ buf.append(":");
-+ }
-+ }
-+ return buf.toString();
-+ }
-+
-+ private static final byte alicePubKeyEnc[] = {
-+ (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x24,
-+ (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
-+ (byte)0x09, (byte)0x2A, (byte)0x86, (byte)0x48,
-+ (byte)0x86, (byte)0xF7, (byte)0x0D, (byte)0x01,
-+ (byte)0x03, (byte)0x01, (byte)0x30, (byte)0x81,
-+ (byte)0x8B, (byte)0x02, (byte)0x81, (byte)0x81,
-+ (byte)0x00, (byte)0xF4, (byte)0x88, (byte)0xFD,
-+ (byte)0x58, (byte)0x4E, (byte)0x49, (byte)0xDB,
-+ (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D,
-+ (byte)0xE4, (byte)0x91, (byte)0x07, (byte)0x36,
-+ (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38,
-+ (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
-+ (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C,
-+ (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E,
-+ (byte)0xF6, (byte)0xF3, (byte)0xC9, (byte)0x23,
-+ (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5,
-+ (byte)0x5B, (byte)0x18, (byte)0x8D, (byte)0x8E,
-+ (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8,
-+ (byte)0x5D, (byte)0x38, (byte)0xD3, (byte)0x34,
-+ (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57,
-+ (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
-+ (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21,
-+ (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF,
-+ (byte)0x3C, (byte)0xE1, (byte)0xB1, (byte)0x29,
-+ (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D,
-+ (byte)0x7C, (byte)0x84, (byte)0xA7, (byte)0x0A,
-+ (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4,
-+ (byte)0x03, (byte)0x19, (byte)0xC8, (byte)0x07,
-+ (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95,
-+ (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
-+ (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50,
-+ (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3,
-+ (byte)0x08, (byte)0x3D, (byte)0x66, (byte)0xA4,
-+ (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C,
-+ (byte)0x7C, (byte)0xBD, (byte)0x89, (byte)0x4B,
-+ (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA,
-+ (byte)0xAB, (byte)0xA2, (byte)0x5E, (byte)0xC3,
-+ (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78,
-+ (byte)0xC7, (byte)0x02, (byte)0x01, (byte)0x02,
-+ (byte)0x02, (byte)0x02, (byte)0x02, (byte)0x00,
-+ (byte)0x03, (byte)0x81, (byte)0x85, (byte)0x00,
-+ (byte)0x02, (byte)0x81, (byte)0x81, (byte)0x00,
-+ (byte)0xEE, (byte)0xD6, (byte)0xB1, (byte)0xA3,
-+ (byte)0xB4, (byte)0x78, (byte)0x2B, (byte)0x35,
-+ (byte)0xEF, (byte)0xCD, (byte)0x17, (byte)0x86,
-+ (byte)0x63, (byte)0x2B, (byte)0x97, (byte)0x0E,
-+ (byte)0x7A, (byte)0xD1, (byte)0xFF, (byte)0x7A,
-+ (byte)0xEB, (byte)0x57, (byte)0x61, (byte)0xA1,
-+ (byte)0xF7, (byte)0x90, (byte)0x11, (byte)0xA7,
-+ (byte)0x79, (byte)0x28, (byte)0x69, (byte)0xBA,
-+ (byte)0xA7, (byte)0xB2, (byte)0x37, (byte)0x17,
-+ (byte)0xAE, (byte)0x3C, (byte)0x92, (byte)0x89,
-+ (byte)0x88, (byte)0xE5, (byte)0x7E, (byte)0x8E,
-+ (byte)0xF0, (byte)0x24, (byte)0xD0, (byte)0xE1,
-+ (byte)0xC4, (byte)0xB0, (byte)0x26, (byte)0x5A,
-+ (byte)0x1E, (byte)0xBD, (byte)0xA0, (byte)0xCF,
-+ (byte)0x3E, (byte)0x97, (byte)0x2A, (byte)0x13,
-+ (byte)0x92, (byte)0x3B, (byte)0x39, (byte)0xD0,
-+ (byte)0x1D, (byte)0xA3, (byte)0x6B, (byte)0x3E,
-+ (byte)0xC2, (byte)0xBB, (byte)0x14, (byte)0xB6,
-+ (byte)0xE2, (byte)0x4C, (byte)0x0E, (byte)0x5B,
-+ (byte)0x4B, (byte)0xA4, (byte)0x9D, (byte)0xA6,
-+ (byte)0x21, (byte)0xB0, (byte)0xF9, (byte)0xDE,
-+ (byte)0x55, (byte)0xAE, (byte)0x5C, (byte)0x29,
-+ (byte)0x0E, (byte)0xC1, (byte)0xFC, (byte)0xBA,
-+ (byte)0x51, (byte)0xD3, (byte)0xB6, (byte)0x6D,
-+ (byte)0x75, (byte)0x72, (byte)0xDF, (byte)0x43,
-+ (byte)0xAB, (byte)0x94, (byte)0x21, (byte)0x6E,
-+ (byte)0x0C, (byte)0xD1, (byte)0x93, (byte)0x54,
-+ (byte)0x56, (byte)0x7D, (byte)0x4B, (byte)0x90,
-+ (byte)0xF1, (byte)0x94, (byte)0x45, (byte)0xD4,
-+ (byte)0x2A, (byte)0x71, (byte)0xA1, (byte)0xB8,
-+ (byte)0xDD, (byte)0xAA, (byte)0x05, (byte)0xF0,
-+ (byte)0x27, (byte)0x37, (byte)0xBD, (byte)0x44
-+ };
-+
-+ private static final byte alicePrivKeyEnc[] = {
-+ (byte)0x30, (byte)0x81, (byte)0xE3, (byte)0x02,
-+ (byte)0x01, (byte)0x00, (byte)0x30, (byte)0x81,
-+ (byte)0x99, (byte)0x06, (byte)0x09, (byte)0x2A,
-+ (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xF7,
-+ (byte)0x0D, (byte)0x01, (byte)0x03, (byte)0x01,
-+ (byte)0x30, (byte)0x81, (byte)0x8B, (byte)0x02,
-+ (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xF4,
-+ (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
-+ (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20,
-+ (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91,
-+ (byte)0x07, (byte)0x36, (byte)0x6B, (byte)0x33,
-+ (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45,
-+ (byte)0x1D, (byte)0x0F, (byte)0x7C, (byte)0x88,
-+ (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B,
-+ (byte)0x2D, (byte)0x8E, (byte)0xF6, (byte)0xF3,
-+ (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43,
-+ (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
-+ (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55,
-+ (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38,
-+ (byte)0xD3, (byte)0x34, (byte)0xFD, (byte)0x7C,
-+ (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3,
-+ (byte)0x1D, (byte)0x18, (byte)0x6C, (byte)0xDE,
-+ (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5,
-+ (byte)0x2A, (byte)0xFF, (byte)0x3C, (byte)0xE1,
-+ (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18,
-+ (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
-+ (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6,
-+ (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19,
-+ (byte)0xC8, (byte)0x07, (byte)0x29, (byte)0x7A,
-+ (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9,
-+ (byte)0x96, (byte)0x9F, (byte)0xAB, (byte)0xD0,
-+ (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02,
-+ (byte)0x46, (byte)0xD3, (byte)0x08, (byte)0x3D,
-+ (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41,
-+ (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
-+ (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19,
-+ (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2,
-+ (byte)0x5E, (byte)0xC3, (byte)0x55, (byte)0xE9,
-+ (byte)0x2F, (byte)0x78, (byte)0xC7, (byte)0x02,
-+ (byte)0x01, (byte)0x02, (byte)0x02, (byte)0x02,
-+ (byte)0x02, (byte)0x00, (byte)0x04, (byte)0x42,
-+ (byte)0x02, (byte)0x40, (byte)0x36, (byte)0x4D,
-+ (byte)0xD0, (byte)0x58, (byte)0x64, (byte)0x91,
-+ (byte)0x78, (byte)0xA2, (byte)0x4B, (byte)0x79,
-+ (byte)0x46, (byte)0xFE, (byte)0xC9, (byte)0xD9,
-+ (byte)0xCA, (byte)0x5C, (byte)0xF9, (byte)0xFD,
-+ (byte)0x6C, (byte)0x5D, (byte)0x76, (byte)0x3A,
-+ (byte)0x41, (byte)0x6D, (byte)0x44, (byte)0x62,
-+ (byte)0x75, (byte)0x93, (byte)0x81, (byte)0x93,
-+ (byte)0x00, (byte)0x4C, (byte)0xB1, (byte)0xD8,
-+ (byte)0x7D, (byte)0x9D, (byte)0xF3, (byte)0x16,
-+ (byte)0x2C, (byte)0x6C, (byte)0x9F, (byte)0x7A,
-+ (byte)0x84, (byte)0xA3, (byte)0x7A, (byte)0xC1,
-+ (byte)0x4F, (byte)0x60, (byte)0xE3, (byte)0xB5,
-+ (byte)0x86, (byte)0x28, (byte)0x08, (byte)0x4D,
-+ (byte)0x94, (byte)0xB6, (byte)0x04, (byte)0x0D,
-+ (byte)0xAC, (byte)0xBD, (byte)0x1F, (byte)0x42,
-+ (byte)0x8F, (byte)0x1B
-+ };
-+
-+ private static final byte bobPubKeyEnc[] = {
-+ (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x23,
-+ (byte)0x30, (byte)0x81, (byte)0x99, (byte)0x06,
-+ (byte)0x09, (byte)0x2A, (byte)0x86, (byte)0x48,
-+ (byte)0x86, (byte)0xF7, (byte)0x0D, (byte)0x01,
-+ (byte)0x03, (byte)0x01, (byte)0x30, (byte)0x81,
-+ (byte)0x8B, (byte)0x02, (byte)0x81, (byte)0x81,
-+ (byte)0x00, (byte)0xF4, (byte)0x88, (byte)0xFD,
-+ (byte)0x58, (byte)0x4E, (byte)0x49, (byte)0xDB,
-+ (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D,
-+ (byte)0xE4, (byte)0x91, (byte)0x07, (byte)0x36,
-+ (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38,
-+ (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
-+ (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C,
-+ (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E,
-+ (byte)0xF6, (byte)0xF3, (byte)0xC9, (byte)0x23,
-+ (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5,
-+ (byte)0x5B, (byte)0x18, (byte)0x8D, (byte)0x8E,
-+ (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8,
-+ (byte)0x5D, (byte)0x38, (byte)0xD3, (byte)0x34,
-+ (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57,
-+ (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
-+ (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21,
-+ (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF,
-+ (byte)0x3C, (byte)0xE1, (byte)0xB1, (byte)0x29,
-+ (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D,
-+ (byte)0x7C, (byte)0x84, (byte)0xA7, (byte)0x0A,
-+ (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4,
-+ (byte)0x03, (byte)0x19, (byte)0xC8, (byte)0x07,
-+ (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95,
-+ (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
-+ (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50,
-+ (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3,
-+ (byte)0x08, (byte)0x3D, (byte)0x66, (byte)0xA4,
-+ (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C,
-+ (byte)0x7C, (byte)0xBD, (byte)0x89, (byte)0x4B,
-+ (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA,
-+ (byte)0xAB, (byte)0xA2, (byte)0x5E, (byte)0xC3,
-+ (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78,
-+ (byte)0xC7, (byte)0x02, (byte)0x01, (byte)0x02,
-+ (byte)0x02, (byte)0x02, (byte)0x02, (byte)0x00,
-+ (byte)0x03, (byte)0x81, (byte)0x84, (byte)0x00,
-+ (byte)0x02, (byte)0x81, (byte)0x80, (byte)0x2C,
-+ (byte)0x40, (byte)0xFA, (byte)0xF6, (byte)0xA6,
-+ (byte)0xF8, (byte)0xAC, (byte)0xC2, (byte)0x4F,
-+ (byte)0xCD, (byte)0xC7, (byte)0x37, (byte)0x93,
-+ (byte)0xE5, (byte)0xE4, (byte)0x5E, (byte)0x18,
-+ (byte)0x14, (byte)0xE6, (byte)0x50, (byte)0xDA,
-+ (byte)0x55, (byte)0x38, (byte)0x5D, (byte)0x24,
-+ (byte)0xF5, (byte)0x42, (byte)0x68, (byte)0x5F,
-+ (byte)0xF5, (byte)0x15, (byte)0xC8, (byte)0x9B,
-+ (byte)0x5D, (byte)0x06, (byte)0x3D, (byte)0xE1,
-+ (byte)0x52, (byte)0x2F, (byte)0x98, (byte)0xFF,
-+ (byte)0x37, (byte)0xBB, (byte)0x75, (byte)0x48,
-+ (byte)0x48, (byte)0xE9, (byte)0x65, (byte)0x84,
-+ (byte)0x37, (byte)0xBB, (byte)0xB3, (byte)0xE9,
-+ (byte)0x36, (byte)0x01, (byte)0xB4, (byte)0x6A,
-+ (byte)0x1C, (byte)0xB2, (byte)0x11, (byte)0x82,
-+ (byte)0xCE, (byte)0x3D, (byte)0x65, (byte)0xE5,
-+ (byte)0x3C, (byte)0x89, (byte)0xE9, (byte)0x52,
-+ (byte)0x19, (byte)0xBD, (byte)0x58, (byte)0xF6,
-+ (byte)0xA2, (byte)0x03, (byte)0xA8, (byte)0xB2,
-+ (byte)0xA5, (byte)0xDB, (byte)0xEB, (byte)0xF5,
-+ (byte)0x94, (byte)0xF9, (byte)0x46, (byte)0xBE,
-+ (byte)0x45, (byte)0x4C, (byte)0x65, (byte)0xD2,
-+ (byte)0xD1, (byte)0xCF, (byte)0xFF, (byte)0xFF,
-+ (byte)0xFA, (byte)0x38, (byte)0xF1, (byte)0x72,
-+ (byte)0xAB, (byte)0xB9, (byte)0x14, (byte)0x4E,
-+ (byte)0xF5, (byte)0xF0, (byte)0x7A, (byte)0x8E,
-+ (byte)0x45, (byte)0xFD, (byte)0x5B, (byte)0xF9,
-+ (byte)0xA2, (byte)0x97, (byte)0x1B, (byte)0xAE,
-+ (byte)0x2C, (byte)0x7B, (byte)0x6B, (byte)0x7C,
-+ (byte)0x98, (byte)0xFE, (byte)0x58, (byte)0xDD,
-+ (byte)0xBE, (byte)0xF6, (byte)0x1C, (byte)0x8E,
-+ (byte)0xD0, (byte)0xA1, (byte)0x72
-+ };
-+
-+ private static final byte bobPrivKeyEnc[] = {
-+ (byte)0x30, (byte)0x81, (byte)0xE4, (byte)0x02,
-+ (byte)0x01, (byte)0x00, (byte)0x30, (byte)0x81,
-+ (byte)0x99, (byte)0x06, (byte)0x09, (byte)0x2A,
-+ (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xF7,
-+ (byte)0x0D, (byte)0x01, (byte)0x03, (byte)0x01,
-+ (byte)0x30, (byte)0x81, (byte)0x8B, (byte)0x02,
-+ (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xF4,
-+ (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
-+ (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20,
-+ (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91,
-+ (byte)0x07, (byte)0x36, (byte)0x6B, (byte)0x33,
-+ (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45,
-+ (byte)0x1D, (byte)0x0F, (byte)0x7C, (byte)0x88,
-+ (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B,
-+ (byte)0x2D, (byte)0x8E, (byte)0xF6, (byte)0xF3,
-+ (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43,
-+ (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
-+ (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55,
-+ (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38,
-+ (byte)0xD3, (byte)0x34, (byte)0xFD, (byte)0x7C,
-+ (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3,
-+ (byte)0x1D, (byte)0x18, (byte)0x6C, (byte)0xDE,
-+ (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5,
-+ (byte)0x2A, (byte)0xFF, (byte)0x3C, (byte)0xE1,
-+ (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18,
-+ (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
-+ (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6,
-+ (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19,
-+ (byte)0xC8, (byte)0x07, (byte)0x29, (byte)0x7A,
-+ (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9,
-+ (byte)0x96, (byte)0x9F, (byte)0xAB, (byte)0xD0,
-+ (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02,
-+ (byte)0x46, (byte)0xD3, (byte)0x08, (byte)0x3D,
-+ (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41,
-+ (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
-+ (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19,
-+ (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2,
-+ (byte)0x5E, (byte)0xC3, (byte)0x55, (byte)0xE9,
-+ (byte)0x2F, (byte)0x78, (byte)0xC7, (byte)0x02,
-+ (byte)0x01, (byte)0x02, (byte)0x02, (byte)0x02,
-+ (byte)0x02, (byte)0x00, (byte)0x04, (byte)0x43,
-+ (byte)0x02, (byte)0x41, (byte)0x00, (byte)0xE0,
-+ (byte)0x31, (byte)0xE7, (byte)0x77, (byte)0xB8,
-+ (byte)0xD0, (byte)0x7E, (byte)0x0A, (byte)0x9B,
-+ (byte)0x94, (byte)0xD5, (byte)0x3D, (byte)0x33,
-+ (byte)0x62, (byte)0x32, (byte)0x51, (byte)0xCE,
-+ (byte)0x74, (byte)0x5C, (byte)0xA5, (byte)0x72,
-+ (byte)0xD9, (byte)0x36, (byte)0xF3, (byte)0x8A,
-+ (byte)0x3F, (byte)0x8B, (byte)0xC6, (byte)0xFE,
-+ (byte)0xEF, (byte)0x94, (byte)0x8B, (byte)0x50,
-+ (byte)0x41, (byte)0x9B, (byte)0x14, (byte)0xC8,
-+ (byte)0xE9, (byte)0x1F, (byte)0x24, (byte)0x1F,
-+ (byte)0x65, (byte)0x8E, (byte)0xD3, (byte)0x85,
-+ (byte)0xD0, (byte)0x68, (byte)0x6C, (byte)0xF1,
-+ (byte)0x79, (byte)0x45, (byte)0xD0, (byte)0x06,
-+ (byte)0xA4, (byte)0xB8, (byte)0xE0, (byte)0x64,
-+ (byte)0xF5, (byte)0x38, (byte)0x72, (byte)0x97,
-+ (byte)0x00, (byte)0x23, (byte)0x5F
-+ };
-+}
-+
---- ./jdk/test/sun/security/pkcs11/tls/TestPremaster.java 2013-09-06 11:30:09.000000000 -0700
-+++ ./jdk/test/sun/security/pkcs11/tls/TestPremaster.java 2014-10-28 20:19:49.000000000 -0700
-@@ -34,6 +34,7 @@
-
- import javax.crypto.KeyGenerator;
- import javax.crypto.SecretKey;
-+import java.util.Formatter;
-
- import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
-
-@@ -59,27 +60,51 @@
- System.out.println("OK: " + e);
- }
-
-- test(kg, 3, 0);
-- test(kg, 3, 1);
-- test(kg, 3, 2);
-- test(kg, 4, 0);
-+ int[] protocolVersions = {0x0300, 0x0301, 0x0302, 0x0400};
-+ for (int clientVersion : protocolVersions) {
-+ for (int serverVersion : protocolVersions) {
-+ test(kg, clientVersion, serverVersion);
-+ if (serverVersion >= clientVersion) {
-+ break;
-+ }
-+ }
-+ }
-
- System.out.println("Done.");
- }
-
-- private static void test(KeyGenerator kg, int major, int minor)
-- throws Exception {
-+ private static void test(KeyGenerator kg,
-+ int clientVersion, int serverVersion) throws Exception {
-
-- kg.init(new TlsRsaPremasterSecretParameterSpec(major, minor));
-+ System.out.printf(
-+ "Testing RSA pre-master secret key generation between " +
-+ "client (0x%04X) and server(0x%04X)%n",
-+ clientVersion, serverVersion);
-+ kg.init(new TlsRsaPremasterSecretParameterSpec(
-+ clientVersion, serverVersion));
- SecretKey key = kg.generateKey();
- byte[] encoded = key.getEncoded();
-- if (encoded.length != 48) {
-- throw new Exception("length: " + encoded.length);
-- }
-- if ((encoded[0] != major) || (encoded[1] != minor)) {
-- throw new Exception("version mismatch: " + encoded[0] +
-- "." + encoded[1]);
-- }
-- System.out.println("OK: " + major + "." + minor);
-+ if (encoded != null) { // raw key material may be not extractable
-+ if (encoded.length != 48) {
-+ throw new Exception("length: " + encoded.length);
-+ }
-+ int v = versionOf(encoded[0], encoded[1]);
-+ if (clientVersion != v) {
-+ if (serverVersion != v || clientVersion >= 0x0302) {
-+ throw new Exception(String.format(
-+ "version mismatch: (0x%04X) rather than (0x%04X) " +
-+ "is used in pre-master secret", v, clientVersion));
-+ }
-+ System.out.printf("Use compatible version (0x%04X)%n", v);
-+ }
-+ System.out.println("Passed, version matches!");
-+ } else {
-+ System.out.println("Raw key material is not extractable");
-+ }
- }
-+
-+ private static int versionOf(int major, int minor) {
-+ return ((major & 0xFF) << 8) | (minor & 0xFF);
-+ }
-+
- }
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -44,11 +44,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Linux )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -47,15 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PS=":"
-- FS="/"
-- ;;
-- Linux )
-- PS=":"
-- FS="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -33,7 +33,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java 2013-09-06 11:30:10.000000000 -0700
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java 2014-07-15 21:49:32.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2007, 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
-@@ -75,6 +75,7 @@
- import java.io.*;
- import java.security.*;
- import java.nio.*;
-+import java.lang.management.*;
-
- public class SSLEngineDeadlock {
-
-@@ -145,6 +146,8 @@
- }
- SSLEngineDeadlock test = new SSLEngineDeadlock();
- test.runTest();
-+
-+ detectDeadLock();
- }
- System.out.println("Test Passed.");
- }
-@@ -362,6 +365,22 @@
- }
-
- /*
-+ * Detect dead lock
-+ */
-+ private static void detectDeadLock() throws Exception {
-+ ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
-+ long[] threadIds = threadBean.findDeadlockedThreads();
-+ if (threadIds != null && threadIds.length != 0) {
-+ for (long id : threadIds) {
-+ ThreadInfo info =
-+ threadBean.getThreadInfo(id, Integer.MAX_VALUE);
-+ System.out.println("Deadlocked ThreadInfo: " + info);
-+ }
-+ throw new Exception("Found Deadlock!");
-+ }
-+ }
-+
-+ /*
- * Logging code
- */
- private static boolean resultOnce = true;
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -42,7 +42,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FILESEP="/"
- 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-10-28 20:19:52.000000000 -0700
-@@ -32,7 +32,7 @@
- HOSTNAME=`uname -n`
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -32,7 +32,7 @@
- HOSTNAME=`uname -n`
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- PS=":"
- FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/EntriesOrder.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/EntriesOrder.java 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,204 @@
-+/*
-+ * 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 8031572
-+ * @summary jarsigner -verify exits with 0 when a jar file is not properly signed
-+ */
-+
-+import java.io.FileInputStream;
-+import java.io.FileOutputStream;
-+import java.nio.file.Files;
-+import java.nio.file.Paths;
-+import java.security.cert.Certificate;
-+import java.util.*;
-+import java.util.jar.JarEntry;
-+import java.util.jar.JarFile;
-+import java.util.jar.JarInputStream;
-+import java.util.zip.ZipEntry;
-+import java.util.zip.ZipOutputStream;
-+
-+public class EntriesOrder {
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ String[] entries = {
-+ "META-INF/",
-+ "META-INF/MANIFEST.MF",
-+ "META-INF/A.RSA",
-+ "META-INF/A.SF",
-+ "META-INF/inf",
-+ "a"};
-+
-+ Map<String,byte[]> content = new HashMap<>();
-+
-+ // We will create a jar containing entries above. Try all permutations
-+ // and confirm 1) When opened as a JarFile, we can always get 3 signed
-+ // ones (MANIFEST, inf, a), and 2) When opened as a JarInputStream,
-+ // when the order is correct (MANIFEST at beginning, followed by RSA/SF,
-+ // directory ignored), we can get 2 signed ones (inf, a).
-+
-+ // Prepares raw files
-+ Files.write(Paths.get("a"), "a".getBytes());
-+ Files.createDirectory(Paths.get("META-INF/"));
-+ Files.write(Paths.get("META-INF/inf"), "inf".getBytes());
-+
-+ // Pack, sign, and extract to get all files
-+ sun.tools.jar.Main m =
-+ new sun.tools.jar.Main(System.out, System.err, "jar");
-+ if (!m.run("cvf a.jar a META-INF/inf".split(" "))) {
-+ throw new Exception("jar creation failed");
-+ }
-+ sun.security.tools.KeyTool.main(
-+ ("-keystore jks -storepass changeit -keypass changeit -dname" +
-+ " CN=A -alias a -genkeypair -keyalg rsa").split(" "));
-+ sun.security.tools.JarSigner.main(
-+ "-keystore jks -storepass changeit a.jar a".split(" "));
-+ m = new sun.tools.jar.Main(System.out, System.err, "jar");
-+ if (!m.run("xvf a.jar".split(" "))) {
-+ throw new Exception("jar extraction failed");
-+ }
-+
-+ // Data
-+ for (String s: entries) {
-+ if (!s.endsWith("/")) {
-+ content.put(s, Files.readAllBytes(Paths.get(s)));
-+ }
-+ }
-+
-+ // Test
-+ for (List<String> perm: Permute(entries)) {
-+
-+ // Recreate a jar
-+ try (ZipOutputStream zos
-+ = new ZipOutputStream(new FileOutputStream("x.jar"))) {
-+ for (String e: perm) {
-+ zos.putNextEntry(new ZipEntry(e));
-+ if (Paths.get(e).toFile().isDirectory()) continue;
-+ zos.write(content.get(e));
-+ }
-+ }
-+
-+ // Open with JarFile, number of signed entries should be 3.
-+ int cc = 0;
-+ try (JarFile jf = new JarFile("x.jar")) {
-+ Enumeration<JarEntry> jes = jf.entries();
-+ while (jes.hasMoreElements()) {
-+ JarEntry je = jes.nextElement();
-+ sun.misc.IOUtils.readFully(jf.getInputStream(je), -1, true);
-+ Certificate[] certs = je.getCertificates();
-+ if (certs != null && certs.length > 0) {
-+ cc++;
-+ }
-+ }
-+ }
-+
-+ if (cc != 3) {
-+ System.out.println(perm + " - jf - " + cc);
-+ throw new Exception();
-+ }
-+
-+ // Open with JarInputStream
-+ int signed;
-+
-+ perm.remove("META-INF/");
-+ if (perm.get(0).equals("META-INF/MANIFEST.MF") &&
-+ perm.get(1).contains("/A.") &&
-+ perm.get(2).contains("/A.")) {
-+ signed = 2; // Good order
-+ } else {
-+ signed = 0; // Bad order. In this case, the number of signed
-+ // entries is not documented. Just test impl.
-+ }
-+
-+ cc = 0;
-+ try (JarInputStream jis
-+ = new JarInputStream(new FileInputStream("x.jar"))) {
-+ while (true) {
-+ JarEntry je = jis.getNextJarEntry();
-+ if (je == null) break;
-+ sun.misc.IOUtils.readFully(jis, -1, true);
-+ Certificate[] certs = je.getCertificates();
-+ if (certs != null && certs.length > 0) {
-+ cc++;
-+ }
-+ }
-+ }
-+
-+ if (cc != signed) {
-+ System.out.println(perm + " - jis - " + cc + " " + signed);
-+ throw new Exception();
-+ }
-+ }
-+ }
-+
-+ // Helper method to return all permutations of an array. Each output can
-+ // be altered without damaging the iteration process.
-+ static Iterable<List<String>> Permute(final String[] entries) {
-+ return new Iterable<List<String>>() {
-+
-+ int s = entries.length;
-+ long c = factorial(s) - 1; // number of permutations
-+
-+ private long factorial(int n) {
-+ return (n == 1) ? 1: (n * factorial(n-1));
-+ }
-+
-+ @Override
-+ public Iterator<List<String>> iterator() {
-+ return new Iterator<List<String>>() {
-+ @Override
-+ public boolean hasNext() {
-+ return c >= 0;
-+ }
-+
-+ @Override
-+ public void remove() {
-+ throw new UnsupportedOperationException("remove");
-+ }
-+
-+ @Override
-+ public List<String> next() {
-+ if (c < 0) return null;
-+ List<String> result = new ArrayList<>(s);
-+ LinkedList<String> source = new LinkedList<>(
-+ Arrays.asList(entries));
-+ // Treat c as a integer with different radixes at
-+ // different digits, i.e. at digit 0, radix is s;
-+ // at digit 1, radix is s-1. Thus a s-digit number
-+ // is able to represent s! different values.
-+ long n = c;
-+ for (int i=s; i>=1; i--) {
-+ int x = (int)(n % i);
-+ result.add(source.remove(x));
-+ n = n / i;
-+ }
-+ c--;
-+ return result;
-+ }
-+ };
-+ }
-+ };
-+ }
-+}
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-07-15 21:49:32.000000000 -0700
-@@ -242,13 +242,13 @@
- " -J-Djava.security.egd=file:/dev/./urandom" +
- " -debug -keystore " + TSKS + " -storepass changeit" +
- " -tsa http://localhost:" + port + "/%d" +
-- " -signedjar new.jar " + JAR + " old";
-+ " -signedjar new_%d.jar " + JAR + " old";
- } else {
- cmd = System.getProperty("java.home") + "/bin/jarsigner" +
- " -J-Djava.security.egd=file:/dev/./urandom" +
- " -debug -keystore " + TSKS + " -storepass changeit" +
- " -tsa http://localhost:" + port + "/%d" +
-- " -signedjar new.jar " + JAR + " old";
-+ " -signedjar new_%d.jar " + JAR + " old";
- }
-
- try {
-@@ -281,7 +281,7 @@
- static void jarsigner(String cmd, int path, boolean expected)
- throws Exception {
- System.err.println("Test " + path);
-- Process p = Runtime.getRuntime().exec(String.format(cmd, path));
-+ Process p = Runtime.getRuntime().exec(String.format(cmd, path, path));
- BufferedReader reader = new BufferedReader(
- new InputStreamReader(p.getErrorStream()));
- while (true) {
-@@ -289,9 +289,25 @@
- if (s == null) break;
- System.err.println(s);
- }
-+
-+ // Will not see noTimestamp warning
-+ boolean seeWarning = false;
-+ reader = new BufferedReader(
-+ new InputStreamReader(p.getInputStream()));
-+ while (true) {
-+ String s = reader.readLine();
-+ if (s == null) break;
-+ System.err.println(s);
-+ if (s.indexOf("Warning:") >= 0) {
-+ seeWarning = true;
-+ }
-+ }
- int result = p.waitFor();
- if (expected && result != 0 || !expected && result == 0) {
- throw new Exception("Failed");
- }
-+ if (seeWarning) {
-+ throw new Exception("See warning");
-+ }
- }
- }
---- ./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-07-15 21:49:32.000000000 -0700
-@@ -136,7 +136,6 @@
- # 16 and 32 already covered in the first part
- # ==========================================================
-
--$KT -genkeypair -alias expiring -dname CN=expiring -startdate -1m
- $KT -genkeypair -alias expired -dname CN=expired -startdate -10m
- $KT -genkeypair -alias notyetvalid -dname CN=notyetvalid -startdate +1m
- $KT -genkeypair -alias badku -dname CN=badku -ext KU=cRLSign -validity 365
-@@ -151,9 +150,6 @@
- $KT -importcert -alias badchain
- $KT -delete -alias ca
-
--$JARSIGNER -strict -keystore js.jks -storepass changeit a.jar expiring
--[ $? = 2 ] || exit $LINENO
--
- $JARSIGNER -strict -keystore js.jks -storepass changeit a.jar expired
- [ $? = 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-10-28 20:19:52.000000000 -0700
-@@ -41,7 +41,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- PS=":"
- FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/jvindex.sh 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/jvindex.sh 2014-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,76 @@
-+#
-+# 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 8022761
-+# @summary regression: SecurityException is NOT thrown while trying to pack a wrongly signed Indexed Jar file
-+#
-+
-+if [ "${TESTJAVA}" = "" ] ; then
-+ JAVAC_CMD=`which javac`
-+ TESTJAVA=`dirname $JAVAC_CMD`/..
-+fi
-+
-+# set platform-dependent variables
-+OS=`uname -s`
-+case "$OS" in
-+ Windows_* )
-+ FS="\\"
-+ ;;
-+ * )
-+ FS="/"
-+ ;;
-+esac
-+
-+F=abcde
-+KS=jvindex.jks
-+JFILE=jvindex.jar
-+
-+KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit \
-+ -keystore $KS"
-+JAR=$TESTJAVA${FS}bin${FS}jar
-+JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner -keystore $KS -storepass changeit"
-+
-+rm $F $KS $JFILE 2> /dev/null
-+
-+echo 12345 > $F
-+$JAR cvf $JFILE $F
-+
-+ERR=""
-+
-+$KT -alias a -dname CN=a -genkey -validity 300 || ERR="$ERR 1"
-+
-+$JARSIGNER $JFILE a || ERR="$ERR 2"
-+$JAR i $JFILE
-+
-+# Make sure the $F line has "sm" (signed and in manifest)
-+$JARSIGNER -verify -verbose $JFILE | grep $F | grep sm || ERR="$ERR 3"
-+
-+if [ "$ERR" = "" ]; then
-+ exit 0
-+else
-+ echo "ERR is $ERR"
-+ exit 1
-+fi
-+
-+
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -42,7 +42,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-07-15 21:49:32.000000000 -0700
-@@ -22,7 +22,7 @@
- #
-
- # @test
--# @bug 6543842 6543440 6939248
-+# @bug 6543842 6543440 6939248 8024302
- # @summary checking response of timestamp
- #
- # @run shell/timeout=600 ts.sh
-@@ -53,7 +53,7 @@
- JAR="${TESTJAVA}${FS}bin${FS}jar"
- JAVA="${TESTJAVA}${FS}bin${FS}java"
- JAVAC="${TESTJAVA}${FS}bin${FS}javac"
--KT="${TESTJAVA}${FS}bin${FS}keytool -keystore tsks -storepass changeit -keypass changeit"
-+KT="${TESTJAVA}${FS}bin${FS}keytool -keystore tsks -storepass changeit -keypass changeit -validity 200"
-
- 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-07-15 21:49:32.000000000 -0700
-@@ -0,0 +1,119 @@
-+#
-+# 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 8024302
-+# @bug 8026037
-+# @summary Clarify jar verifications
-+#
-+
-+if [ "${TESTJAVA}" = "" ] ; then
-+ JAVAC_CMD=`which javac`
-+ TESTJAVA=`dirname $JAVAC_CMD`/..
-+fi
-+
-+# set platform-dependent variables
-+OS=`uname -s`
-+case "$OS" in
-+ Windows_* )
-+ FS="\\"
-+ ;;
-+ * )
-+ FS="/"
-+ ;;
-+esac
-+
-+KS=warnings.jks
-+JFILE=warnings.jar
-+
-+KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit \
-+ -keystore $KS"
-+JAR=$TESTJAVA${FS}bin${FS}jar
-+JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner -keystore $KS -storepass changeit"
-+
-+rm $KS 2> /dev/null
-+
-+LANG=C
-+export LANG
-+
-+echo 12345 > file
-+
-+ERR=""
-+
-+# Normal signer expiring on 2100-01-01
-+$KT -alias s1 -dname CN=s1 -genkey -startdate 2000/01/01 -validity 36525 || ERR="$ERR keytool s1,"
-+# Cert expiring soon, informational warning
-+$KT -alias s2 -dname CN=s2 -genkey -validity 100 || ERR="$ERR keytool s2,"
-+# Cert expired, severe warning
-+$KT -alias s3 -dname CN=s3 -genkey -startdate -200d -validity 100 || ERR="$ERR keytool s3,"
-+
-+# noTimestamp is informatiional warning and includes a date
-+$JAR cvf $JFILE file
-+$JARSIGNER $JFILE s1 > output1 || ERR="$ERR jarsigner s1,"
-+$JARSIGNER -strict $JFILE s1 >> output1 || ERR="$ERR jarsigner s1 strict,"
-+$JARSIGNER -verify $JFILE s1 >> output1 || ERR="$ERR jarsigner s1,"
-+$JARSIGNER -verify -strict $JFILE s1 >> output1 || ERR="$ERR jarsigner s1 strict,"
-+
-+cat output1 | grep Warning || ERR="$ERR s1 warning,"
-+cat output1 | grep Error && ERR="$ERR s1 error,"
-+cat output1 | grep timestamp | grep 2100-01-01 || ERR="$ERR s1 timestamp,"
-+cat output1 | grep "with signer errors" && ERR="$ERR s1 err,"
-+
-+# hasExpiringCert is informatiional warning
-+$JAR cvf $JFILE file
-+$JARSIGNER $JFILE s2 > output2 || ERR="$ERR jarsigner s2,"
-+$JARSIGNER -strict $JFILE s2 >> output2 || ERR="$ERR jarsigner s2 strict,"
-+$JARSIGNER -verify $JFILE s2 >> output2 || ERR="$ERR jarsigner s2,"
-+$JARSIGNER -verify -strict $JFILE s2 >> output2 || ERR="$ERR jarsigner s2 strict,"
-+
-+cat output2 | grep Warning || ERR="$ERR s2 warning,"
-+cat output2 | grep Error && ERR="$ERR s2 error,"
-+cat output2 | grep timestamp || ERR="$ERR s2 timestamp,"
-+cat output2 | grep "will expire" || ERR="$ERR s2 expiring,"
-+cat output2 | grep "with signer errors" && ERR="$ERR s2 err,"
-+
-+# hasExpiredCert is severe warning
-+$JAR cvf $JFILE file
-+$JARSIGNER $JFILE s3 > output3 || ERR="$ERR jarsigner s3,"
-+$JARSIGNER -strict $JFILE s3 > output3s && ERR="$ERR jarsigner s3 strict,"
-+$JARSIGNER -verify $JFILE s3 >> output3 || ERR="$ERR jarsigner s3,"
-+$JARSIGNER -verify -strict $JFILE s3 >> output3s && ERR="$ERR jarsigner s3 strict,"
-+
-+# warning without -strict
-+cat output3 | grep Warning || ERR="$ERR s3 warning,"
-+cat output3 | grep Error && ERR="$ERR s3 error,"
-+cat output3 | grep "with signer errors" && ERR="$ERR s3 err,"
-+
-+# error with -strict
-+cat output3s | grep Warning || ERR="$ERR s3s warning,"
-+cat output3s | grep Error || ERR="$ERR s3s error,"
-+cat output3s | grep "with signer errors" || ERR="$ERR s3 err,"
-+
-+if [ "$ERR" = "" ]; then
-+ exit 0
-+else
-+ echo "ERR is $ERR"
-+ exit 1
-+fi
-+
-+
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -47,15 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Linux )
-- PATHSEP=":"
-- FILESEP="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- 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-10-28 20:19:52.000000000 -0700
-@@ -42,13 +42,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS )
-- FILESEP="/"
-- ;;
-- Linux )
-- FILESEP="/"
-- ;;
-- Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FILESEP="/"
- ;;
- 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-10-28 20:19:52.000000000 -0700
-@@ -45,7 +45,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -72,6 +72,27 @@
- ;;
- esac
- ;;
-+ *BSD | Darwin )
-+ case "${OS}" in
-+ *BSD )
-+ LIBNAME=libsoftokn3.so
-+ ;;
-+ Darwin )
-+ LIBNAME=libsoftokn3.dylib
-+ ;;
-+ esac
-+ ARCH=`uname -m`
-+ FS="/"
-+ case "$ARCH" in
-+ i[3-6]86 )
-+ PF="bsd-i586"
-+ ;;
-+ * )
-+ echo "Will not run test on: ${OS} ${ARCH}"
-+ exit 0;
-+ ;;
-+ esac
-+ ;;
- * )
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -37,7 +37,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FS="/"
- ;;
- 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-10-28 20:19:52.000000000 -0700
-@@ -43,7 +43,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -44,7 +44,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- FS="/"
- ;;
- 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-10-28 20:19:52.000000000 -0700
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:52.000000000 -0700
-@@ -46,7 +46,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- PS=":"
- FS="/"
---- ./jdk/test/sun/text/resources/LocaleData 2013-09-06 11:30:13.000000000 -0700
-+++ ./jdk/test/sun/text/resources/LocaleData 2014-07-15 21:54:46.000000000 -0700
-@@ -11,7 +11,7 @@
- # bug #4052679
- LocaleNames/fr/fr=fran\u00e7ais
-
--# bug #4055602, 4290801
-+# bug #4055602, 4290801, 8013836
- CurrencyNames/pt_BR/BRL=R$
- FormatData/pt_BR/NumberPatterns/0=#,##0.###;-#,##0.###
- # FormatData/pt_BR/NumberPatterns/1=R$ #,##0.##;-R$ #,##0.## # Changed; see bug 4122840
-@@ -37,7 +37,7 @@
- FormatData/pt_BR/DayNames/0=Domingo
- FormatData/pt_BR/DayNames/1=Segunda-feira
- FormatData/pt_BR/DayNames/2=Ter\u00e7a-feira
--CalendarData/pt_BR/firstDayOfWeek=2
-+CalendarData/pt_BR/firstDayOfWeek=1
- CalendarData/pt_BR/minimalDaysInFirstWeek=1
- FormatData/pt_BR/MonthNames/0=Janeiro
- FormatData/pt_BR/MonthNames/1=Fevereiro
---- ./jdk/test/sun/text/resources/LocaleDataTest.java 2013-09-06 11:30:13.000000000 -0700
-+++ ./jdk/test/sun/text/resources/LocaleDataTest.java 2014-07-15 21:54:46.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
-@@ -34,7 +34,7 @@
- * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
- * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
- * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7189611
-- * 7171028
-+ * 7171028 8013836
- * @summary Verify locale data
- *
- */
---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -0,0 +1,111 @@
-+#
-+# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
-+# 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 6287579
-+# @summary SubClasses of ListResourceBundle should fix getContents()
-+#
-+# @run shell ImmutableResourceTest.sh
-+
-+# Beginning of subroutines:
-+status=1
-+
-+#Call this from anywhere to fail the test with an error message
-+# usage: fail "reason why the test failed"
-+fail()
-+ { echo "The test failed :-("
-+ echo "$*" 1>&2
-+ echo "exit status was $status"
-+ exit $status
-+ } #end of fail()
-+
-+#Call this from anywhere to pass the test with a message
-+# usage: pass "reason why the test passed if applicable"
-+pass()
-+ { echo "The test passed!!!"
-+ echo "$*" 1>&2
-+ exit 0
-+ } #end of pass()
-+
-+# end of subroutines
-+
-+# The beginning of the script proper
-+
-+OS=`uname -s`
-+case "$OS" in
-+ SunOS | Linux | *BSD | Darwin )
-+ PATHSEP=":"
-+ ;;
-+
-+ Windows* | CYGWIN*)
-+ PATHSEP=";"
-+ ;;
-+
-+ # catch all other OSs
-+ * )
-+ echo "Unrecognized system! $OS"
-+ fail "Unrecognized system! $OS"
-+ ;;
-+esac
-+
-+TARGETCLASS="ImmutableResourceTest"
-+if [ -z "${TESTJAVA}" ] ; then
-+ # TESTJAVA is not set, so the test is running stand-alone.
-+ # TESTJAVA holds the path to the root directory of the build of the JDK
-+ # to be tested. That is, any java files run explicitly in this shell
-+ # should use TESTJAVA in the path to the java interpreter.
-+ # So, we'll set this to the JDK spec'd on the command line. If none
-+ # is given on the command line, tell the user that and use a default.
-+ # THIS IS THE JDK BEING TESTED.
-+ if [ -n "$1" ] ; then
-+ TESTJAVA=$1
-+ else
-+ TESTJAVA=$JAVA_HOME
-+ fi
-+ TESTSRC=.
-+ TESTCLASSES=.
-+ #Deal with .class files:
-+fi
-+#
-+echo "JDK under test is: $TESTJAVA"
-+#
-+CP="-classpath ${TESTCLASSES}${PATHSEP}${TESTJAVA}/lib/jconsole.jar"
-+# Compile the test class using the classpath we need:
-+#
-+env
-+#
-+set -vx
-+#
-+#Compile. jconsole.jar is required on the classpath.
-+${TESTJAVA}/bin/javac -d "${TESTCLASSES}" ${CP} -g \
-+ "${TESTSRC}"/"${TARGETCLASS}".java
-+#
-+#Run the test class, again with the classpath we need:
-+${TESTJAVA}/bin/java ${CP} ${TARGETCLASS}
-+status=$?
-+echo "test status was: $status"
-+if [ $status -eq "0" ];
-+ then pass ""
-+
-+ 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-10-28 20:19:52.000000000 -0700
-@@ -54,7 +54,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- ;;
-
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2013-09-06 11:30:14.000000000 -0700
-+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2014-10-28 20:19:52.000000000 -0700
-@@ -33,7 +33,7 @@
-
- case `uname -s` in
- Windows* | CYGWIN*) OS=Windows;;
-- SunOS|Linux) OS=Unix;;
-+ SunOS|Linux|*BSD|Darwin) OS=Unix;;
- esac
-
- N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/NativeErrors.java 2013-09-06 11:30:14.000000000 -0700
-+++ ./jdk/test/sun/tools/native2ascii/NativeErrors.java 2014-10-28 20:19:51.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 1999, 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
-@@ -25,12 +25,18 @@
- * @test
- * @bug 4136352
- * @summary Test Native2ASCII error messages
-- *
-+ * @library /lib/testlibrary
-+ * @build jdk.testlibrary.* NativeErrors
-+ * @run main NativeErrors
- */
-
--import java.io.*;
--import sun.tools.native2ascii.*;
--import java.util.*;
-+
-+import java.io.File;
-+import java.util.ResourceBundle;
-+import java.util.MissingResourceException;
-+import jdk.testlibrary.OutputAnalyzer;
-+import jdk.testlibrary.JDKToolLauncher;
-+import jdk.testlibrary.ProcessTools;
-
- public class NativeErrors {
-
-@@ -45,30 +51,18 @@
- }
- }
-
-- public static void main(String args[]) throws Exception {
-- String[] command;
-- Process p = null;
-- BufferedReader in = null;
--
-- // Construct a command that runs the test in other vm
-- // Exec another vm to run test in
-- // Read the result to determine if test failed
--
-- command = getComString("-encoding");
-- p = Runtime.getRuntime().exec(command);
-- in = new BufferedReader(new InputStreamReader(p.getInputStream()));
-- checkResult(in, "err.bad.arg");
-+ public static void main(String args[]) throws Throwable {
-+ // Execute command in another vm. Verify stdout for expected err msg.
-+
-+ // Test with no input file given.
-+ checkResult(executeCmd("-encoding"), "err.bad.arg");
-
- File f0 = new File(System.getProperty("test.src", "."), "test123");
- String path0 = f0.getPath();
- if ( f0.exists() ) {
- throw new Error("Input file should not exist: " + path0);
- }
--
-- command = getComString(path0);
-- p = Runtime.getRuntime().exec(command);
-- in = new BufferedReader(new InputStreamReader(p.getInputStream()));
-- checkResult(in, "err.cannot.read");
-+ checkResult(executeCmd(path0), "err.cannot.read");
-
- File f1 = new File(System.getProperty("test.src", "."), "test1");
- File f2 = File.createTempFile("test2", ".tmp");
-@@ -81,71 +75,38 @@
- throw new Error("Output file cannot be made read only: " + path2);
- }
- f2.deleteOnExit();
--
-- command = getComString(path1, path2);
-- p = Runtime.getRuntime().exec(command);
-- in = new BufferedReader(new InputStreamReader(p.getInputStream()));
-- checkResult(in, "err.cannot.write");
-+ checkResult(executeCmd(path1, path2), "err.cannot.write");
- }
-
--
-- private static void checkResult(BufferedReader in, String errorExpected)
-- throws Exception {
-- String errorReceived;
-- errorReceived = in.readLine();
-- assert errorReceived != null : "First readline cannot be null";
-- errorExpected = rsrc.getString(errorExpected);
-- assert errorExpected != null : "Expected message cannot be null";
-- StringBuffer error = new StringBuffer(errorExpected);
-- int start = errorExpected.indexOf("{0}");
-- if (start >= 0) {
-- error.delete(start, start+3);
-- errorExpected = error.toString();
-- }
-- //System.out.println("received: " + errorReceived);
-- //System.out.println("expected: " + errorExpected);
-- if (!errorReceived.endsWith(errorExpected))
-- throw new RuntimeException("Native2ascii bad arg error broken.");
-- }
--
-- private static String[] getComString(String arg2) {
-- String[] coms = new String[2];
-- coms[0] = getPathString();
-- coms[1] = arg2;
-- return coms;
-+ private static String executeCmd(String... toolArgs) throws Throwable {
-+ JDKToolLauncher cmd = JDKToolLauncher.createUsingTestJDK("native2ascii");
-+ for (String s : toolArgs) {
-+ cmd.addToolArg(s);
-+ }
-+ OutputAnalyzer output = ProcessTools.executeProcess(cmd.getCommand());
-+ if (output == null || output.getStdout() == null) {
-+ throw new Exception("Output was null. Process did not finish correctly.");
-+ }
-+ if (output.getExitValue() == 0) {
-+ throw new Exception("Process exit code was 0, but error was expected.");
-+ }
-+ return output.getStdout();
- }
-
-- private static String[] getComString(String arg2, String arg3) {
-- String[] coms = new String[3];
-- coms[0] = getPathString();
-- coms[1] = arg2;
-- coms[2] = arg3;
-- return coms;
-- }
-+ private static void checkResult(
-+ String errorReceived, String errorKey) throws Exception {
-+ String errorExpected = rsrc.getString(errorKey);
-+ if (errorExpected == null) {
-+ throw new Exception("No error message for key: " + errorKey);
-+ }
-+ // Remove template tag from error message.
-+ errorExpected = errorExpected.replaceAll("\\{0\\}", "");
-
-- /*
-- * Search for path to native2ascii
-- */
-- private static String getPathString() {
-- String path = System.getProperty("java.home") + File.separator +
-- "bin" + File.separator + "native2ascii";
-- if (File.separatorChar == '\\') {
-- path = path + ".exe";
-- }
-- File f = new File(path);
-- if (!f.exists()) {
-- System.out.println("Cannot find native2ascii at "+path);
-- path = System.getProperty("java.home") + File.separator + ".." +
-- File.separator + "bin" + File.separator + "native2ascii";
-- if (File.separatorChar == '\\') {
-- path = path + ".exe";
-- }
-- f = new File(path);
-- if (!f.exists())
-- throw new RuntimeException("Cannot find native2ascii at "+path);
-- System.out.println("Using native2ascii at "+path);
-+ System.out.println("received: " + errorReceived);
-+ System.out.println("expected: " + errorExpected);
-+ if (errorReceived.indexOf(errorExpected) < 0) {
-+ throw new RuntimeException("Native2ascii bad arg error broken.");
- }
-- return path;
- }
-
- }
---- ./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-10-28 20:19:52.000000000 -0700
-@@ -56,7 +56,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PATHSEP=":"
- ;;
-
---- ./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-07-15 21:49:33.000000000 -0700
-@@ -130,12 +130,12 @@
- "(New South Wales)\"");
- tzLocale = locales2Test[1];
- if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-- ("\u00d6stliche Normalzeit (New South Wales)"))
-+ ("Eastern Normalzeit (Neus\u00fcdwales)"))
- throw new RuntimeException("\n" + tzLocale + ": LONG, " +
- "non-daylight saving name for " +
- "Australia/Currie should be " +
-- "\"\u00d6stliche Normalzeit " +
-- "(New South Wales)\"");
-+ "\"Eastern Normalzeit " +
-+ "(Neus\u00fcdwales)\"");
- tzLocale = locales2Test[2];
- if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
- ("Hora est\u00e1ndar Oriental (Nueva Gales del Sur)"))
-@@ -154,53 +154,53 @@
- "(Nouvelle-Galles du Sud)\"");
- tzLocale = locales2Test[4];
- if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-- ("Ora solare dell'Australia orientale (Nuovo Galles del Sud)"))
-+ ("Ora standard dell'Australia orientale (Nuovo Galles del Sud)"))
- throw new RuntimeException("\n" + tzLocale + ": LONG, " +
- "non-daylight saving name for " +
- "Australia/Currie should be " +
-- "\"Ora solare dell'Australia orientale " +
-+ "\"Ora standard dell'Australia orientale " +
- "(Nuovo Galles del Sud)\"");
- tzLocale = locales2Test[5];
- if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-- ("\u6771\u90e8\u6a19\u6e96\u6642 " +
-- "(\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)"))
-+ ("\u6771\u90E8\u6A19\u6E96\u6642" +
-+ "(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)"))
- throw new RuntimeException("\n" + tzLocale + ": LONG, " +
- "non-daylight saving name for " +
- "Australia/Currie should be " +
-- "\"\u6771\u90e8\u6a19\u6e96\u6642 " +
-- "(\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9" +
-- "\u30a6\u30a7\u30fc\u30eb\u30ba)\"");
-+ "\"\u6771\u90E8\u6A19\u6E96\u6642" +
-+ "(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9" +
-+ "\u30A6\u30A7\u30FC\u30EB\u30BA)\"");
- tzLocale = locales2Test[6];
- if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-- ("\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)"))
-+ ("\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)"))
- throw new RuntimeException("\n" + tzLocale + ": LONG, " +
- "non-daylight saving name for " +
- "Australia/Currie should be " +
-- "\"\ub3d9\ubd80 \ud45c\uc900\uc2dc" +
-- "(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)\"");
-+ "\"\uB3D9\uBD80 \uD45C\uC900\uC2DC" +
-+ "(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)\"");
- tzLocale = locales2Test[7];
- if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-- ("Eastern, normaltid (Nya Sydwales)"))
-+ ("\u00D6stlig standardtid (New South Wales)"))
- throw new RuntimeException("\n" + tzLocale + ": LONG, " +
- "non-daylight saving name for " +
- "Australia/Currie should be " +
-- "\"Eastern, normaltid " +
-- "(Nya Sydwales)\"");
-+ "\"\u00D6stlig standardtid " +
-+ "(New South Wales)\"");
- tzLocale = locales2Test[8];
- if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-- ("\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09"))
-+ ("\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)"))
- throw new RuntimeException("\n" + tzLocale + ": LONG, " +
- "non-daylight saving name for " +
- "Australia/Currie should be " +
-- "\"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4 " +
-- "\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09\"");
-+ "\"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 " +
-+ "(\u65B0\u5357\u5A01\u5C14\u65AF)\"");
- tzLocale = locales2Test[9];
- if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
-- ("\u6771\u65b9\u6a19\u6e96\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)"))
-+ ("\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)"))
- throw new RuntimeException("\n" + tzLocale + ": LONG, " +
- "non-daylight saving name for " +
- "Australia/Currie should be " +
-- "\"\u6771\u65b9\u6a19\u6e96\u6642\u9593 " +
-- "(\u65b0\u5357\u5a01\u723e\u65af)\"");
-+ "\"\u6771\u90E8\u6A19\u6E96\u6642\u9593 " +
-+ "(\u65B0\u5357\u5A01\u723E\u65AF)\"");
- }
- }
---- ./jdk/test/tools/launcher/I18NArgTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/tools/launcher/I18NArgTest.java 2014-07-15 21:49:33.000000000 -0700
-@@ -0,0 +1,111 @@
-+/*
-+ * 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 8016110
-+ * @summary verify Japanese character in an argument are treated correctly
-+ * @compile -XDignore.symbol.file I18NArgTest.java
-+ * @run main I18NArgTest
-+ */
-+import java.io.IOException;
-+
-+public class I18NArgTest extends TestHelper {
-+ public static void main(String... args) throws IOException {
-+ if (!isWindows) {
-+ return;
-+ }
-+ if (!"MS932".equals(System.getProperty("sun.jnu.encoding"))) {
-+ System.err.println("MS932 encoding not set, test skipped");
-+ return;
-+ }
-+ if (args.length == 0) {
-+ execTest(0x30bd); // MS932 Katakana SO, 0x835C
-+ } else {
-+ testCharacters(args);
-+ }
-+ }
-+ static void execTest(int unicodeValue) {
-+ String hexValue = Integer.toHexString(unicodeValue);
-+ String unicodeStr = Character.toString((char)unicodeValue);
-+ execTest("\"" + unicodeStr + "\"", hexValue);
-+ execTest("\\" + unicodeStr + "\\", hexValue);
-+ execTest(" " + unicodeStr + " ", hexValue);
-+ execTest("'" + unicodeStr + "'", hexValue);
-+ execTest("\t" + unicodeStr + "\t", hexValue);
-+ execTest("*" + unicodeStr + "*", hexValue);
-+ execTest("?" + unicodeStr + "?", hexValue);
-+
-+ execTest("\"" + unicodeStr + unicodeStr + "\"", hexValue + hexValue);
-+ execTest("\\" + unicodeStr + unicodeStr + "\\", hexValue + hexValue);
-+ execTest(" " + unicodeStr + unicodeStr + " ", hexValue + hexValue);
-+ execTest("'" + unicodeStr + unicodeStr + "'", hexValue + hexValue);
-+ execTest("\t" + unicodeStr + unicodeStr + "\t", hexValue + hexValue);
-+ execTest("*" + unicodeStr + unicodeStr + "*", hexValue + hexValue);
-+ execTest("?" + unicodeStr + unicodeStr + "?", hexValue + hexValue);
-+
-+ execTest("\"" + unicodeStr + "a" + unicodeStr + "\"", hexValue + "61" + hexValue);
-+ execTest("\\" + unicodeStr + "a" + unicodeStr + "\\", hexValue + "61" + hexValue);
-+ execTest(" " + unicodeStr + "a" + unicodeStr + " ", hexValue + "61"+ hexValue);
-+ execTest("'" + unicodeStr + "a" + unicodeStr + "'", hexValue + "61"+ hexValue);
-+ execTest("\t" + unicodeStr + "a" + unicodeStr + "\t", hexValue + "61"+ hexValue);
-+ execTest("*" + unicodeStr + "a" + unicodeStr + "*", hexValue + "61"+ hexValue);
-+ execTest("?" + unicodeStr + "a" + unicodeStr + "?", hexValue + "61"+ hexValue);
-+
-+ execTest("\"" + unicodeStr + "\u00b1" + unicodeStr + "\"", hexValue + "b1" + hexValue);
-+ execTest("\\" + unicodeStr + "\u00b1" + unicodeStr + "\\", hexValue + "b1" + hexValue);
-+ execTest(" " + unicodeStr + "\u00b1" + unicodeStr + " ", hexValue + "b1"+ hexValue);
-+ execTest("'" + unicodeStr + "\u00b1" + unicodeStr + "'", hexValue + "b1"+ hexValue);
-+ execTest("\t" + unicodeStr + "\u00b1" + unicodeStr + "\t", hexValue + "b1"+ hexValue);
-+ execTest("*" + unicodeStr + "\u00b1" + unicodeStr + "*", hexValue + "b1"+ hexValue);
-+ execTest("?" + unicodeStr + "\u00b1" + unicodeStr + "?", hexValue + "b1"+ hexValue);
-+ }
-+ static void execTest(String unicodeStr, String hexValue) {
-+ TestResult tr = doExec(javaCmd,
-+ "-Dtest.src=" + TEST_SOURCES_DIR.getAbsolutePath(),
-+ "-Dtest.classes=" + TEST_CLASSES_DIR.getAbsolutePath(),
-+ "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
-+ "I18NArgTest", unicodeStr, hexValue);
-+ System.out.println(tr.testOutput);
-+ if (!tr.isOK()) {
-+ System.err.println(tr);
-+ throw new RuntimeException("test fails");
-+ }
-+ }
-+ static void testCharacters(String... args) {
-+ String input = args[0];
-+ String expected = args[1];
-+ String hexValue = "";
-+ for (int i = 0; i < input.length(); i++) {
-+ hexValue = hexValue.concat(Integer.toHexString((int)input.charAt(i)));
-+ }
-+ System.out.println("input:" + input);
-+ System.out.println("expected:" + expected);
-+ System.out.println("obtained:" + hexValue);
-+ if (!hexValue.contains(expected)) {
-+ String message = "Error: output does not contain expected value" +
-+ "expected:" + expected + " obtained:" + hexValue;
-+ throw new RuntimeException(message);
-+ }
-+ }
-+}
---- ./langtools/.hgtags 2013-09-06 11:31:03.000000000 -0700
-+++ ./langtools/.hgtags 2014-10-28 20:19:35.000000000 -0700
-@@ -123,6 +123,7 @@
- 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
- d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
- 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
-+23aadf169f085b180803bcdc53baad4ae870f75b 7u0
- cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
- 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
- baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
-@@ -301,6 +302,22 @@
- 17ee569d0c0130824ba27bc1b090114e6075c5f2 jdk7u25-b09
- 41c1b02cd6a8fa7746752cc911da3dd4d380098d jdk7u25-b10
- 0da9ef0d9fc5b017f960d65ae0cd07860a259621 jdk7u25-b11
-+cf80c545434cfe44034e667079673ce42cc9cdbf jdk7u14-b16
-+aecd58f25d7f21827ae1b020ae8cfb44857c439f jdk7u14-b17
-+577f9625ec558c18e9de6e3428fd0f9cca823033 jdk7u14-b18
-+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
-+5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
-+e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19
-+86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20
-+c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21
-+eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22
-+e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23
-+d2b78e3b352dfb9b0cbd808669f9332e898147ed jdk7u40-b24
-+e5635f70fe67192142cb5166bee08cc915a18bc4 jdk7u40-b25
-+5bd6f156bc01b6a4e901fc5607663dfc249e9105 jdk7u40-b26
-+12506bba2b67cd4b229550da67ff85b984549a28 jdk7u40-b27
-+9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
-+bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
- 28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12
- 5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13
- c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14
-@@ -343,3 +360,146 @@
- 765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42
- 988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43
- a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60
-+849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
-+b2e29b79e54e58349c1dbcf5449f67fc5d5a235a jdk7u40-b61
-+94ea3d062a3c28c64a837fa8f999c6b6956ff7c4 jdk7u40-b62
-+9bbfba4981e1db5016bbfbc23025763966021c26 jdk7u45-b01
-+61d5b73ae0ac46268490e2f0dfa1f69a5acda73f jdk7u45-b02
-+2fe27ae865e723473225756f1920d9d76d47b903 jdk7u45-b03
-+bede296dc848533abae859e61584a517df2773ae jdk7u45-b04
-+e989f2f2b5cb639a23a5e67da0d52766acf549a2 jdk7u45-b05
-+6f492dc935adc6e2878bb6045aee001a829428a7 jdk7u45-b06
-+4c51f98e1eb5b8d94dfca08f3b3160ff382b7c3a jdk7u45-b07
-+6cf97c9859e731fba6bcff67c46f57dead8d7284 jdk7u45-b08
-+a9c31d3f8188b344ed165ec0730ebc2fd11dfa5d jdk7u45-b09
-+2c09352066ec34c8608ccff0f933f566a52033af jdk7u45-b10
-+53d5c06766b05689cdccfc300b32075878e8aa1d jdk7u45-b11
-+0b6aa6e95eb9da58a686edacf5b102116614d3ea jdk7u45-b12
-+68862f365075a11dfa291033d05a062590db9337 jdk7u45-b13
-+8c799b9f0cd8af3b1cfd151ba075a4f1630967df jdk7u45-b14
-+36ae3f206b53f751a0ebf933e5dbf364097b48a5 jdk7u45-b15
-+18d1864abca976ca68cb71612e9b20c908455d3d jdk7u45-b16
-+b9aeec6b9d5aac0746f8d1764a7740f8b83334ab jdk7u45-b17
-+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
-+33f986894a3e42686a3a9713efc075a6876dbeb7 jdk7u51-b03
-+9a4b7362a592b157cd2b1c2ce15f1bb97d2792f6 jdk7u51-b04
-+c8d1379f16ebe38d03581eaa6a8b1ecddfd5fc88 jdk7u51-b05
-+1e8c8518497b6c4de56782224da4d27a9367e7ac jdk7u51-b06
-+009a4086b2a66e263c006e237505a832fcf99ac8 jdk7u51-b07
-+cccd0d52003d26f8652ef1778b3f1857c7d92ea9 jdk7u51-b08
-+d8a69a841acd1d6c20e8a064d0c2bd139c50e485 jdk7u51-b09
-+7e33fc6adc82176a459e6702ae03a34f789b88ec jdk7u51-b10
-+c9d8d8793d9330d592190c334260ccf26c986df6 jdk7u51-b11
-+5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u51-b12
-+4d0807934c302f2e35e6a5acc6cdc720c82b5671 jdk7u51-b13
-+ada23e55d76a378cb2fc2cd7ffae8c147aaf0055 jdk7u51-b30
-+e3d4896d52ab4ad0fc0b7a45d60340dbdcb8826d jdk7u51-b31
-+fb3ff30ecd8ea1637551461bfaf09fc8204b536c jdk7u51-b33
-+4adc6c094545774b324d2e5511723ada2b32e6c4 jdk7u51-b34
-+5b44df2114e466da85c3816627bfcd1b59c6499d jdk7u55-b00
-+3e64e49131b88c839733c9869ff8aebcd15cf828 jdk7u55-b01
-+2a9f5c00ba46f895bc9d16a584bf7d80c1822268 jdk7u55-b02
-+0479d260ac835eb3f0c7f3d7d15be0599b92a20a jdk7u55-b03
-+a244cc40ae0b29028ff8503ee516cb5f9e3db6e3 jdk7u55-b04
-+25d63d986653d81522b01bbd2664083ae5fdc243 jdk7u65-b00
-+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
-+c1964a222000b4884b992fdbaf8f62a45fb893c9 jdk7u55-b14
-+56c12a84e86eb47e24e4bc50a4602a276e6b4e4b jdk7u55-b15
-+4f6115ba266e5489b5e1968a28304f82be1f5641 jdk7u55-b31
-+ec8793f5aa4fb0aff4aa2f02f458fa6720f3ec6f jdk7u55-b32
-+13fed9e9f022e4a7f914c8410cbaa6f6564d4efd jdk7u55-b33
-+d9e4f2bb3d75d15dac2c37c6ef9f64ee49ea1728 jdk7u55-b34
-+c5cfebcc373607c78d577fad2146821fafc46868 jdk7u55-b35
-+284494d407006c826bc434a79cab37b17e1849e3 jdk7u55-b36
-+849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
-+b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01
-+954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02
-+4170784840d510b4e8ae7ae250b92279aaf5eb25 jdk7u60-b03
-+772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u60-b04
-+744287fccf3b2c4fba2abf105863f0a44c3bd4da jdk7u60-b05
-+8f6db72756f3e4c3cca8731d20e978fb741846d2 jdk7u60-b06
-+02f050bc5569fb058ace44ed705bbb0f9022a6fe jdk7u60-b07
-+be8e34e4920ebd1cfb89739d636e363c7881a548 jdk7u60-b08
-+3f8b585403e596b7eadc231484f5480361c52c4b jdk7u60-b09
-+3ee98cd07065dfa9a982e6692a3e875684a7e820 jdk7u60-b10
-+3cc64ba8cf85942929b15c5ef21360f96db3b99c jdk7u60-b11
-+b79b8b1dc88faa73229b2bce04e979ff5ec854f5 jdk7u60-b12
-+3dc3e59e9580dfdf95dac57c54fe1a4209401125 jdk7u60-b13
-+a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14
-+7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15
-+057caf9e0774e7c530c5710127f70c8d5f46deab jdk7u60-b16
-+b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17
-+b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b18
-+7effcbb8d1fd7ced194a294e29eea28bf552ac34 jdk7u65-b01
-+40aa95c8477aa0a3f090859570f5536afc9026b7 jdk7u60-b19
-+b578e801c5f0e41be96d58e213b32f5c0c9278e8 jdk7u60-b30
-+c1c8f9d50b3e0d7d8af08be4270649a7572b68d4 jdk7u60-b31
-+ab67af57536bf46e54b5b28462d34274aaa67025 jdk7u60-b32
-+e7a68fd132f7a2f39ed72d804b4574a4cc3defb2 jdk7u60-b33
-+75b8c65f4c148baa4084022035b22de47df9426b jdk7u65-b02
-+16bb02dae837566f3c350c6313b09f6110dcba68 jdk7u65-b03
-+91677116552f743f3589f3d2ba255fa1079c0c48 jdk7u65-b04
-+8f585b94be8c83f89fc481cf010a129ef75cd31b jdk7u65-b05
-+c3a8556785e89b7868fc4ece666120dbf8c5c7a7 jdk7u65-b06
-+1978b6434c4f717ba1bd715f016ab99dff879857 jdk7u65-b07
-+684f0285b699d304d1efff487b550ff2e1679e98 jdk7u65-b08
-+2715f752385349274b43a1efaab5733bafc40557 jdk7u65-b09
-+98cac38ef1302939a37b85c0208a7969ba4cd8ad jdk7u65-b10
-+4c40603840a8ffbf5e30049b52ff336a9aca04c1 jdk7u65-b11
-+36b01ef633b2e70836b5914aa6924e81ff4d41ec jdk7u65-b12
-+5ba8a1ef0f82d341ede3ec2fdac7e012e42594c4 jdk7u65-b13
-+52769f410515f6a7fa66a93b24a1327fa6b6174a jdk7u65-b14
-+7f2891e4c6fcd9c0e31f50189a50c8de189d774f jdk7u65-b15
-+dea7e67840b68ae6752b37e69e242dae2765b878 jdk7u65-b16
-+15a051dfadb6a7d014f0d2739ccf0a63ade56313 jdk7u65-b17
-+576e2fd21368ba67f1f19d3180f78bc440b795a1 jdk7u65-b30
-+0f809f893588548a3b5c8441e28c9e0a62bc13ef jdk7u65-b18
-+eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b19
-+afc940d62b49059f565f87c83343fa3d28df883b jdk7u65-b32
-+114c4fc53777e4067a26f6510fe72fa770a9253c jdk7u65-b20
-+8a09cca8f12027ba59df4bb18d49e855c4db4811 jdk7u67-b01
-+eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b40
-+5e4cc118e2d1f7a8eefca5dd7146d46a1b0ca911 jdk7u65-b31
-+59575d1928f98d1e26ea548ff4d5e2415dfe9b57 jdk7u65-b33
-+684f0285b699d304d1efff487b550ff2e1679e98 jdk7u66-b00
-+a927daae851fa81d0470d2b67f52e8156e4d423c jdk7u66-b01
-+6f229fda19bdabf7a3d1caad9d809dd713cce65d jdk7u66-b09
-+77e053e3a41f254d99e7a1151b6cf874265132e5 jdk7u66-b10
-+596cf48685bcf7970275ce637ea2e58b16e9816e jdk7u66-b11
-+021fb086f47f6f3659f0fe2de824c3b5548530c4 jdk7u66-b12
-+b9801badec029e241a580aa52db27e03fc5e2b88 jdk7u66-b13
-+3ceea3a91e4cbc29a435519747c22dfb02e68f67 jdk7u66-b14
-+2918f02cde3e0fd134e2051e67296c3f935825e6 jdk7u66-b15
-+9442596a63f000f4290265aa0574ee5fa8865808 jdk7u66-b16
-+bd740cf100e1f7f866bd902fb668e77dcd866251 jdk7u66-b17
-+df0aa7e382459053c7fa92f133080cdf679c6100 jdk7u71-b00
-+46244a1e94b97b324a9ab97322b710af63b2f20b jdk7u71-b01
-+29583e3ca6f9cb337fb203a84be70d234e667c1d jdk7u71-b02
-+8a5c2c7dd6dce2c0540ace9c4372cf984ad62b9b jdk7u71-b03
-+c4b7f94c483e9092ab634067095f4f325f9648a9 jdk7u71-b04
-+103784a125a4a4fa40981f524a64cfd5b0c61722 jdk7u71-b05
-+6d6a78b11de79b7f38c95e597ea0f33952716e99 jdk7u71-b06
-+6c6763cce51e8e888130033350dc37114b17b6a5 jdk7u71-b07
-+a5e828c017c4371d7a8cd0be812e7282dc5b7772 jdk7u71-b08
-+42d1ec856f73bf3378346d66ad42cd5c57a5f8f2 jdk7u71-b09
-+1579a3e24c494de0ee63bed2a4c3fbd176e95abc jdk7u71-b10
-+df957022bc94fc84c3d9e6f1f23af29b6afeb63d jdk7u71-b11
-+a8fd0637a601ee2747e785bd5e9e2a0262acf280 jdk7u71-b12
-+1cefc4b498a60ebc86b76eb2e9e861dbb072bd85 jdk7u71-b13
---- ./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-07-15 21:46: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/HtmlDocWriter.java 2013-09-06 11:31:06.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java 2014-07-15 21:46:08.000000000 -0700
-@@ -181,12 +181,14 @@
- String label, boolean strong,
- String stylename, String title, String target) {
- StringBuffer retlink = new StringBuffer();
-+ StringBuilder lnk = new StringBuilder();
- retlink.append("<a href=\"");
-- retlink.append(link);
-+ lnk.append(link);
- if (where != null && where.length() != 0) {
-- retlink.append("#");
-- retlink.append(where);
-+ lnk.append("#");
-+ lnk.append(where);
- }
-+ retlink.append(HtmlTree.encodeURL(lnk.toString()));
- retlink.append("\"");
- if (title != null && title.length() != 0) {
- retlink.append(" title=\"" + title + "\"");
---- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java 2013-09-06 11:31:06.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2010, 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,6 +26,7 @@
- package com.sun.tools.doclets.formats.html.markup;
-
- import java.util.*;
-+import java.nio.charset.*;
- import com.sun.tools.doclets.internal.toolkit.Content;
- import com.sun.tools.doclets.internal.toolkit.util.*;
-
-@@ -116,6 +117,46 @@
- }
-
- /**
-+ * A set of ASCII URI characters to be left unencoded.
-+ */
-+ public static final BitSet NONENCODING_CHARS = new BitSet(256);
-+
-+ static {
-+ // alphabetic characters
-+ for (int i = 'a'; i <= 'z'; i++) {
-+ NONENCODING_CHARS.set(i);
-+ }
-+ for (int i = 'A'; i <= 'Z'; i++) {
-+ NONENCODING_CHARS.set(i);
-+ }
-+ // numeric characters
-+ for (int i = '0'; i <= '9'; i++) {
-+ NONENCODING_CHARS.set(i);
-+ }
-+ // Reserved characters as per RFC 3986. These are set of delimiting characters.
-+ String noEnc = ":/?#[]@!$&'()*+,;=";
-+ // Unreserved characters as per RFC 3986 which should not be percent encoded.
-+ noEnc += "-._~";
-+ for (int i = 0; i < noEnc.length(); i++) {
-+ NONENCODING_CHARS.set(noEnc.charAt(i));
-+ }
-+ }
-+
-+ protected static String encodeURL(String url) {
-+ byte[] urlBytes = url.getBytes(Charset.forName("UTF-8"));
-+ StringBuilder sb = new StringBuilder();
-+ for (int i = 0; i < urlBytes.length; i++) {
-+ int c = urlBytes[i];
-+ if (NONENCODING_CHARS.get(c & 0xFF)) {
-+ sb.append((char) c);
-+ } else {
-+ sb.append(String.format("%%%02X", c & 0xFF));
-+ }
-+ }
-+ return sb.toString();
-+ }
-+
-+ /**
- * Generates an HTML anchor tag.
- *
- * @param ref reference url for the anchor tag
-@@ -124,7 +165,7 @@
- */
- public static HtmlTree A(String ref, Content body) {
- HtmlTree htmltree = new HtmlTree(HtmlTag.A, nullCheck(body));
-- htmltree.addAttr(HtmlAttr.HREF, nullCheck(ref));
-+ htmltree.addAttr(HtmlAttr.HREF, encodeURL(ref));
- return htmltree;
- }
-
---- ./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 2014-07-15 21:46:08.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
-@@ -292,7 +292,7 @@
- script.addAttr(HtmlAttr.TYPE, "text/javascript");
- String scriptCode = "<!--" + DocletConstants.NL +
- " if (location.href.indexOf('is-external=true') == -1) {" + DocletConstants.NL +
-- " parent.document.title=\"" + winTitle + "\";" + DocletConstants.NL +
-+ " parent.document.title=\"" + escapeJavaScriptChars(winTitle) + "\";" + DocletConstants.NL +
- " }" + DocletConstants.NL +
- "//-->" + DocletConstants.NL;
- RawHtml scriptContent = new RawHtml(scriptCode);
-@@ -302,6 +302,53 @@
- }
-
- /**
-+ * Returns a String with escaped special JavaScript characters.
-+ *
-+ * @param s String that needs to be escaped
-+ * @return a valid escaped JavaScript string
-+ */
-+ private static String escapeJavaScriptChars(String s) {
-+ StringBuilder sb = new StringBuilder();
-+ for (int i = 0; i < s.length(); i++) {
-+ char ch = s.charAt(i);
-+ switch (ch) {
-+ case '\b':
-+ sb.append("\\b");
-+ break;
-+ case '\t':
-+ sb.append("\\t");
-+ break;
-+ case '\n':
-+ sb.append("\\n");
-+ break;
-+ case '\f':
-+ sb.append("\\f");
-+ break;
-+ case '\r':
-+ sb.append("\\r");
-+ break;
-+ case '"':
-+ sb.append("\\\"");
-+ break;
-+ case '\'':
-+ sb.append("\\\'");
-+ break;
-+ case '\\':
-+ sb.append("\\\\");
-+ break;
-+ default:
-+ if (ch < 32 || ch >= 127) {
-+ sb.append(String.format("\\u%04X", (int)ch));
-+ } else {
-+ sb.append(ch);
-+ }
-+ break;
-+ }
-+ }
-+ return sb.toString();
-+ }
-+
-+ /**
- * Returns a content tree for the SCRIPT tag for the main page(index.html).
- *
- * @return a content for the SCRIPT tag
-@@ -315,6 +362,12 @@
- " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
- " targetPage = \"undefined\";" + DocletConstants.NL +
- " function validURL(url) {" + DocletConstants.NL +
-+ " try {" + DocletConstants.NL +
-+ " url = decodeURIComponent(url);" + DocletConstants.NL +
-+ " }" + DocletConstants.NL +
-+ " catch (error) {" + DocletConstants.NL +
-+ " return false;" + DocletConstants.NL +
-+ " }" + DocletConstants.NL +
- " var pos = url.indexOf(\".html\");" + DocletConstants.NL +
- " if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL +
- " return false;" + DocletConstants.NL +
-@@ -326,7 +379,8 @@
- " if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL +
- " 'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL +
- " ch == '$' ||" + DocletConstants.NL +
-- " ch == '_') {" + DocletConstants.NL +
-+ " ch == '_' ||" + DocletConstants.NL +
-+ " ch.charCodeAt(0) > 127) {" + DocletConstants.NL +
- " allowNumber = true;" + DocletConstants.NL +
- " allowSep = true;" + DocletConstants.NL +
- " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL +
---- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties 2013-09-06 11:31:06.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties 2014-07-15 21:46:08.000000000 -0700
-@@ -25,7 +25,7 @@
- doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
- doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
- doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
--doclet.Summary=\u6982\u8981:
-+doclet.Summary=\u30B5\u30DE\u30EA\u30FC:
- doclet.Detail=\u8A73\u7D30:
- doclet.navNested=\u30CD\u30B9\u30C8
- doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3
-@@ -68,7 +68,7 @@
- doclet.see.class_or_package_not_found=\u30BF\u30B0{0}: \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1}
- doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1}
- doclet.see.malformed_tag={0}\u30BF\u30B0: \u4E0D\u6B63\u306A{1}\u30BF\u30B0
--doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u6982\u8981
-+doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u30B5\u30DE\u30EA\u30FC
- doclet.Deprecated_API=\u975E\u63A8\u5968\u306EAPI
- doclet.Deprecated_Packages=\u975E\u63A8\u5968\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
- doclet.Deprecated_Classes=\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9
-@@ -135,18 +135,18 @@
- doclet.Help_title=API\u30D8\u30EB\u30D7
- doclet.Window_Help_title=API\u30D8\u30EB\u30D7
- doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
--doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
--doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
--doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
-+doclet.Help_line_2=\u3053\u306EAPI (Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-+doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30B5\u30DE\u30EA\u30FC\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u5168\u4F53\u7684\u306A\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-+doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u30B5\u30DE\u30EA\u30FC\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
- doclet.Help_line_5=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
--doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-+doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u30B5\u30DE\u30EA\u30FC\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
- doclet.Help_line_7=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
- doclet.Help_line_8=\u76F4\u7CFB\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
- doclet.Help_line_9=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8
- doclet.Help_line_10=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8
- doclet.Help_line_11=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
- doclet.Help_line_12=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
--doclet.Help_line_13=\u5404\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306B\u306F\u3001\u305D\u306E\u9805\u76EE\u306E\u8A73\u7D30\u306A\u8AAC\u660E\u306E\u4E2D\u304B\u30891\u884C\u76EE\u306E\u6587\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
-+doclet.Help_line_13=\u5404\u30B5\u30DE\u30EA\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306B\u306F\u3001\u305D\u306E\u9805\u76EE\u306E\u8A73\u7D30\u8AAC\u660E\u306E\u4E2D\u304B\u30891\u884C\u76EE\u306E\u6587\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u30B5\u30DE\u30EA\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u3067\u3059\u304C\u3001\u8A73\u7D30\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
- doclet.Help_line_14=\u4F7F\u7528
- doclet.Help_line_15=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
- doclet.Help_line_16=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64)
---- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties 2013-09-06 11:31:06.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties 2014-07-15 21:46:08.000000000 -0700
-@@ -182,25 +182,32 @@
- doclet.0_and_1={0} and {1}
-
- #Documentation for Enums
--doclet.enum_values_doc=\n\
-+doclet.enum_values_doc.main=\n\
- Returns an array containing the constants of this enum type, in\n\
- the order they are declared. This method may be used to iterate\n\
- over the constants as follows:\n\
- <pre>\n\
- for ({0} c : {0}.values())\n\
- &nbsp; System.out.println(c);\n\
-- </pre>\n\
-- @return an array containing the constants of this enum type, in\n\
-- the order they are declared
-+ </pre>
-
--doclet.enum_valueof_doc=\n\
-+doclet.enum_values_doc.return=\n\
-+ an array containing the constants of this enum type, in the order they are declared
-+
-+doclet.enum_valueof_doc.main=\n\
- Returns the enum constant of this type with the specified name.\n\
- The string must match <i>exactly</i> an identifier used to declare an\n\
- enum constant in this type. (Extraneous whitespace characters are \n\
-- not permitted.)\n\
-- \n\
-- @param name the name of the enum constant to be returned.\n\
-- @return the enum constant with the specified name\n\
-- @throws IllegalArgumentException if this enum type has no constant\n\
-- with the specified name\n\
-- @throws NullPointerException if the argument is null
-+ not permitted.)
-+
-+doclet.enum_valueof_doc.param_name=\
-+ the name of the enum constant to be returned.
-+
-+doclet.enum_valueof_doc.return=\
-+ the enum constant with the specified name
-+
-+doclet.enum_valueof_doc.throws_ila=\
-+ if this enum type has no constant with the specified name
-+
-+doclet.enum_valueof_doc.throws_npe=\
-+ if the argument is null
---- ./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-07-15 21:46:08.000000000 -0700
-@@ -66,22 +66,22 @@
- doclet.malformed_html_link_tag=<a> \u30BF\u30B0\u306E\u5F62\u5F0F\u304C\u4E0D\u6B63:\n"{0}"
- doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002
- doclet.javafx_tag_misuse=\u30BF\u30B0@propertyGetter\u3001@propertySetter\u304A\u3088\u3073@propertyDescription\u306F\u3001JavaFX\u306E\u30D7\u30ED\u30D1\u30C6\u30A3getter\u3068setter\u306E\u307F\u3067\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
--doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981
--doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6982\u8981
--doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u6982\u8981
--doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u6982\u8981
--doclet.Exception_Summary=\u4F8B\u5916\u306E\u6982\u8981
--doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u6982\u8981
--doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u6982\u8981
--doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u6982\u8981
--doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u6982\u8981
--doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u6982\u8981
--doclet.Field_Summary=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u6982\u8981
--doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u6982\u8981
--doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981
--doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981
--doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
--doclet.Factory_Method_Summary=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
-+doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Exception_Summary=\u4F8B\u5916\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Field_Summary=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC
-+doclet.Factory_Method_Summary=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC
- doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
- doclet.Enums=\u5217\u6319\u578B
- doclet.AnnotationTypes=\u6CE8\u91C8\u578B
-@@ -180,6 +180,16 @@
- doclet.0_and_1={0}\u3068{1}
-
- #Documentation for Enums
--doclet.enum_values_doc=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n<pre>\nfor({0} c: {0}.values())\n&nbsp; System.out.println(c);\n</pre>\n@return\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u542B\u3080\u914D\u5217
-+doclet.enum_values_doc.main=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n<pre>\nfor({0} c: {0}.values())\n&nbsp; System.out.println(c);\n</pre>\n
-
--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_values_doc.return=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u306E\u914D\u5217
-+
-+doclet.enum_valueof_doc.main=\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
-+
-+doclet.enum_valueof_doc.param_name=\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\u3002
-+
-+doclet.enum_valueof_doc.return=\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5217\u6319\u578B\u5B9A\u6570
-+
-+doclet.enum_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u578B\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
-+
-+doclet.enum_valueof_doc.throws_npe=\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-07-15 21:46:08.000000000 -0700
-@@ -180,6 +180,16 @@
- doclet.0_and_1={0}\u548C{1}
-
- #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
-+doclet.enum_values_doc.main=\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>
-
--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_values_doc.return=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F\u8FD4\u56DE\u7684\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4
-+
-+doclet.enum_valueof_doc.main=\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)
-+
-+doclet.enum_valueof_doc.param_name=\u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002
-+
-+doclet.enum_valueof_doc.return=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF
-+
-+doclet.enum_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
-+
-+doclet.enum_valueof_doc.throws_npe=\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C
---- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java 2013-09-06 11:31:07.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java 2014-07-15 21:46:08.000000000 -0700
-@@ -852,16 +852,28 @@
- for (int j = 0; j < methods.length; j++) {
- MethodDoc currentMethod = methods[j];
- if (currentMethod.name().equals("values") &&
-- currentMethod.parameters().length == 0) {
-- currentMethod.setRawCommentText(
-- configuration.getText("doclet.enum_values_doc", classDoc.name()));
-+ currentMethod.parameters().length == 0) {
-+ StringBuilder sb = new StringBuilder();
-+ sb.append(configuration.getText("doclet.enum_values_doc.main", classDoc.name()));
-+ sb.append("\n@return ");
-+ sb.append(configuration.getText("doclet.enum_values_doc.return"));
-+ currentMethod.setRawCommentText(sb.toString());
- } else if (currentMethod.name().equals("valueOf") &&
-- currentMethod.parameters().length == 1) {
-+ currentMethod.parameters().length == 1) {
- Type paramType = currentMethod.parameters()[0].type();
- if (paramType != null &&
-- paramType.qualifiedTypeName().equals(String.class.getName())) {
-- currentMethod.setRawCommentText(
-- configuration.getText("doclet.enum_valueof_doc"));
-+ paramType.qualifiedTypeName().equals(String.class.getName())) {
-+ StringBuilder sb = new StringBuilder();
-+ sb.append(configuration.getText("doclet.enum_valueof_doc.main", classDoc.name()));
-+ sb.append("\n@param name ");
-+ sb.append(configuration.getText("doclet.enum_valueof_doc.param_name"));
-+ sb.append("\n@return ");
-+ sb.append(configuration.getText("doclet.enum_valueof_doc.return"));
-+ sb.append("\n@throws IllegalArgumentException ");
-+ sb.append(configuration.getText("doclet.enum_valueof_doc.throws_ila"));
-+ sb.append("\n@throws NullPointerException ");
-+ sb.append(configuration.getText("doclet.enum_valueof_doc.throws_npe"));
-+ currentMethod.setRawCommentText(sb.toString());
- }
- }
- }
---- ./langtools/src/share/classes/com/sun/tools/javac/code/Type.java 2013-09-06 11:31:07.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/javac/code/Type.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2011, 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
-@@ -597,6 +597,10 @@
- };
- }
-
-+ public List<Type> getComponents() {
-+ return interfaces_field.prepend(supertype_field);
-+ }
-+
- /** The Java source which this type represents.
- */
- public String toString() {
---- ./langtools/src/share/classes/com/sun/tools/javac/code/Types.java 2013-09-06 11:31:07.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/javac/code/Types.java 2014-07-15 21:46:08.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
-@@ -1012,23 +1012,10 @@
- }
- }
-
-- if (t.isCompound()) {
-- Warner oldWarner = warnStack.head;
-- warnStack.head = Warner.noWarnings;
-- if (!visit(supertype(t), s))
-- return false;
-- for (Type intf : interfaces(t)) {
-- if (!visit(intf, s))
-- return false;
-- }
-- if (warnStack.head.hasLint(LintCategory.UNCHECKED))
-- oldWarner.warn(LintCategory.UNCHECKED);
-- return true;
-- }
--
-- if (s.isCompound()) {
-- // call recursively to reuse the above code
-- return visitClassType((ClassType)s, t);
-+ if (t.isCompound() || s.isCompound()) {
-+ return !t.isCompound() ?
-+ visitIntersectionType((ClassType)s, t, true) :
-+ visitIntersectionType(t, s, false);
- }
-
- if (s.tag == CLASS || s.tag == ARRAY) {
-@@ -1106,6 +1093,18 @@
- return false;
- }
-
-+ boolean visitIntersectionType(ClassType ict, Type s, boolean reverse) {
-+ Warner warn = Warner.noWarnings;
-+ for (Type c : ict.getComponents()) {
-+ warn.clear();
-+ if (reverse ? !isCastable(s, c, warn) : !isCastable(c, s, warn))
-+ return false;
-+ }
-+ if (warn.hasLint(LintCategory.UNCHECKED))
-+ warnStack.head.warn(LintCategory.UNCHECKED);
-+ return true;
-+ }
-+
- @Override
- public Boolean visitArrayType(ArrayType t, Type s) {
- switch (s.tag) {
-@@ -3369,11 +3368,18 @@
- }
-
- private boolean giveWarning(Type from, Type to) {
-- Type subFrom = asSub(from, to.tsym);
-- return to.isParameterized() &&
-- (!(isUnbounded(to) ||
-- isSubtype(from, to) ||
-- ((subFrom != null) && containsType(to.allparams(), subFrom.allparams()))));
-+ List<Type> bounds = to.isCompound() ?
-+ ((ClassType)to).getComponents() : List.of(to);
-+ for (Type b : bounds) {
-+ Type subFrom = asSub(from, b.tsym);
-+ if (b.isParameterized() &&
-+ (!(isUnbounded(b) ||
-+ isSubtype(from, b) ||
-+ ((subFrom != null) && containsType(b.allparams(), subFrom.allparams()))))) {
-+ return true;
-+ }
-+ }
-+ return false;
- }
-
- private List<Type> superClosure(Type t, Type s) {
---- ./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 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 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
-@@ -501,11 +501,10 @@
- private void scanIdent() {
- boolean isJavaIdentifierPart;
- char high;
-+ if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
-+ // optimization, was: putChar(ch);
-+ scanChar();
- do {
-- if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
-- // optimization, was: putChar(ch);
--
-- scanChar();
- switch (ch) {
- case 'A': case 'B': case 'C': case 'D': case 'E':
- case 'F': case 'G': case 'H': case 'I': case 'J':
-@@ -522,6 +521,7 @@
- case '$': case '_':
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
-+ break;
- case '\u0000': case '\u0001': case '\u0002': case '\u0003':
- case '\u0004': case '\u0005': case '\u0006': case '\u0007':
- case '\u0008': case '\u000E': case '\u000F': case '\u0010':
-@@ -529,30 +529,37 @@
- case '\u0015': case '\u0016': case '\u0017':
- case '\u0018': case '\u0019': case '\u001B':
- case '\u007F':
-- break;
-+ scanChar();
-+ continue;
- case '\u001A': // EOI is also a legal identifier part
- if (bp >= buflen) {
- name = names.fromChars(sbuf, 0, sp);
- token = keywords.key(name);
- return;
- }
-- break;
-+ scanChar();
-+ continue;
- default:
- if (ch < '\u0080') {
- // all ASCII range chars already handled, above
- isJavaIdentifierPart = false;
- } else {
-- high = scanSurrogates();
-- if (high != 0) {
-- if (sp == sbuf.length) {
-- putChar(high);
-+ if (Character.isIdentifierIgnorable(ch)) {
-+ scanChar();
-+ continue;
-+ } else {
-+ high = scanSurrogates();
-+ if (high != 0) {
-+ if (sp == sbuf.length) {
-+ putChar(high);
-+ } else {
-+ sbuf[sp++] = high;
-+ }
-+ isJavaIdentifierPart = Character.isJavaIdentifierPart(
-+ Character.toCodePoint(high, ch));
- } else {
-- sbuf[sp++] = high;
-+ isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
- }
-- isJavaIdentifierPart = Character.isJavaIdentifierPart(
-- Character.toCodePoint(high, ch));
-- } else {
-- isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
- }
- }
- if (!isJavaIdentifierPart) {
-@@ -561,6 +568,9 @@
- return;
- }
- }
-+ if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
-+ // optimization, was: putChar(ch);
-+ scanChar();
- } while (true);
- }
-
---- ./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-10-28 20:19:35.000000000 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 1999, 2011, 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
-@@ -98,11 +98,11 @@
-
- compiler.err.annotation.value.not.allowable.type=\u4F7F\u7528\u3067\u304D\u306A\u3044\u578B\u306E\u6CE8\u91C8\u306E\u5024\u3067\u3059
-
--compiler.err.anon.class.impl.intf.no.args=\u540D\u524D\u306E\u306A\u3044\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-+compiler.err.anon.class.impl.intf.no.args=\u533F\u540D\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-
--compiler.err.anon.class.impl.intf.no.typeargs=\u540D\u524D\u306E\u306A\u3044\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u578B\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-+compiler.err.anon.class.impl.intf.no.typeargs=\u533F\u540D\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002\u578B\u5F15\u6570\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-
--compiler.err.anon.class.impl.intf.no.qual.for.new=\u540D\u524D\u306E\u306A\u3044\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002new\u306B\u4FEE\u98FE\u5B50\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-+compiler.err.anon.class.impl.intf.no.qual.for.new=\u533F\u540D\u30AF\u30E9\u30B9\u304C\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3057\u3066\u3044\u307E\u3059\u3002new\u306B\u4FEE\u98FE\u5B50\u3092\u6301\u3064\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-
- # 0: symbol, 1: symbol, 2: symbol
- compiler.err.array.and.varargs={2}\u3067{0}\u3068{1}\u306E\u4E21\u65B9\u3092\u5BA3\u8A00\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-@@ -555,19 +555,19 @@
- # 0: name
- compiler.err.undef.label=\u30E9\u30D9\u30EB{0}\u306F\u672A\u5B9A\u7FA9\u3067\u3059
-
--compiler.err.undetermined.type={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093
-+compiler.err.undetermined.type={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093
-
- # 0: type, 1: message segment
--compiler.err.undetermined.type.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
-+compiler.err.undetermined.type.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
-
- # 0: list of type, 1: message segment
--compiler.err.invalid.inferred.types={0}\u306E\u63A8\u5B9A\u578B\u304C\u7121\u52B9\u3067\u3059\u3002{1}
-+compiler.err.invalid.inferred.types={0}\u306E\u63A8\u8AD6\u578B\u304C\u7121\u52B9\u3067\u3059\u3002{1}
-
- # 0: message segment, 1: unused
- compiler.err.cant.apply.diamond={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093
-
- # 0: message segment, 1: message segment
--compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
-+compiler.err.cant.apply.diamond.1={0}\u306E\u578B\u5F15\u6570\u3092\u63A8\u8AD6\u3067\u304D\u307E\u305B\u3093\u3002\n\u7406\u7531: {1}
-
- compiler.err.unreachable.stmt=\u3053\u306E\u6587\u306B\u5236\u5FA1\u304C\u79FB\u308B\u3053\u3068\u306F\u3042\u308A\u307E\u305B\u3093
-
-@@ -1165,7 +1165,7 @@
- compiler.misc.infer.arg.length.mismatch=\u5B9F\u5F15\u6570\u30EA\u30B9\u30C8\u3068\u4EEE\u5F15\u6570\u30EA\u30B9\u30C8\u306E\u9577\u3055\u304C\u7570\u306A\u308B\u305F\u3081\u3001\u5F15\u6570\u304B\u3089\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
-
- # 0: type, 1: list of type
--compiler.misc.inferred.do.not.conform.to.bounds=\u63A8\u5B9A\u578B\u306F\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u5B9A: {0}\n\u5883\u754C: {1}
-+compiler.misc.inferred.do.not.conform.to.bounds=\u63A8\u8AD6\u578B\u306F\u5BA3\u8A00\u3055\u308C\u305F\u5883\u754C\u306B\u9069\u5408\u3057\u307E\u305B\u3093\n\u63A8\u8AD6: {0}\n\u5883\u754C: {1}
-
- # 0: symbol
- compiler.misc.diamond={0}<>
---- ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties 2013-09-06 11:31:07.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties 2014-10-28 20:19:35.000000000 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 1999, 2011, 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
-@@ -30,14 +30,14 @@
- javac.opt.g.lines.vars.source=\u3044\u304F\u3064\u304B\u306E\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u306E\u307F\u3092\u751F\u6210\u3059\u308B
- javac.opt.nowarn=\u8B66\u544A\u3092\u767A\u751F\u3055\u305B\u306A\u3044
- javac.opt.verbose=\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u52D5\u4F5C\u306B\u3064\u3044\u3066\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
--javac.opt.deprecation=\u975E\u63A8\u5968\u306EAPI\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30BD\u30FC\u30B9\u306E\u4F4D\u7F6E\u3092\u51FA\u529B\u3059\u308B
-+javac.opt.deprecation=\u975E\u63A8\u5968\u306EAPI\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30BD\u30FC\u30B9\u306E\u5834\u6240\u3092\u51FA\u529B\u3059\u308B
- javac.opt.classpath=\u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
- javac.opt.sourcepath=\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
--javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-+javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
- javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B
- javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
--javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
--javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-+javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-+javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
- javac.opt.processorpath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
- javac.opt.processor=\u5B9F\u884C\u3059\u308B\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u540D\u524D\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u691C\u51FA\u51E6\u7406\u3092\u30D0\u30A4\u30D1\u30B9
- javac.opt.proc.none.only=\u6CE8\u91C8\u51E6\u7406\u3084\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002
-@@ -115,7 +115,7 @@
-
- javac.msg.usage.nonstandard.footer=\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
-
--javac.msg.bug=\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002Bug Parade\u306B\u540C\u3058\u30D0\u30B0\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u306A\u3044\u3053\u3068\u3092\u3054\u78BA\u8A8D\u306E\u4E0A\u3001Java Developer Connection(http://java.sun.com/webapps/bugreport)\u3067\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u305D\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u4E0B\u8A18\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
-+javac.msg.bug=\u30B3\u30F3\u30D1\u30A4\u30E9\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002Bug Parade\u3067\u91CD\u8907\u304C\u306A\u3044\u304B\u3092\u3054\u78BA\u8A8D\u306E\u3046\u3048\u3001Java Developer Connection (http://java.sun.com/webapps/bugreport)\u3067bug\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u305D\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u4E0B\u8A18\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
-
- javac.msg.io=\n\n\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
-
---- ./langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties 2013-09-06 11:31:08.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties 2014-10-28 20:19:35.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
-@@ -31,7 +31,7 @@
- main.Xusage=-Xmaxerrs <number> \u51FA\u529B\u3059\u308B\u30A8\u30E9\u30FC\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B\n-Xmaxwarns <number> \u51FA\u529B\u3059\u308B\u8B66\u544A\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B\n\n\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
- main.option.already.seen={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u8907\u6570\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
- main.requires_argument=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
--main.locale_first=\u30AA\u30D7\u30B7\u30E7\u30F3-locale\u306F\u3001\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u306E\u6700\u521D\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+main.locale_first=\u30AA\u30D7\u30B7\u30E7\u30F3-locale\u306F\u3001\u30B3\u30DE\u30F3\u30C9\u884C\u306E\u6700\u521D\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- main.invalid_flag={0}\u306F\u7121\u52B9\u306A\u30D5\u30E9\u30B0\u3067\u3059
- main.No_packages_or_classes_specified=\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- main.incompatible.access.flags=-public\u3001-private\u3001-package\u307E\u305F\u306F-protected\u306E\u3046\u3061\u306E2\u3064\u4EE5\u4E0A\u3092\u6307\u5B9A\u3057\u307E\u3057\u305F\u3002
---- ./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-10-28 20:19:35.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
-@@ -27,9 +27,9 @@
- # User errors, command line errors.
- #
- cant.create.dir=\u51FA\u529B\u7528\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
--at.args.cant.read=\u30D5\u30A1\u30A4\u30EB{1}\u304B\u3089\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3002
-+at.args.cant.read=\u30D5\u30A1\u30A4\u30EB{1}\u304B\u3089\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3002
- at.args.file.not.found=\u30D5\u30A1\u30A4\u30EB{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
--at.args.io.exception=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u306E@\u5F15\u6570\u306E\u51E6\u7406\u4E2D\u306B\u3001\u6B21\u306E\u5165\u51FA\u529B\u306E\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\u3002
-+at.args.io.exception=\u30B3\u30DE\u30F3\u30C9\u884C\u306E@\u5F15\u6570\u306E\u51E6\u7406\u4E2D\u306B\u3001\u6B21\u306E\u5165\u51FA\u529B\u306E\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\u3002
- old.jni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-jni\u3068-old\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
- old.llni.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-old\u3068-llni\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
- old.not.supported=\u3053\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306Ejavah\u3067\u306F\u30AA\u30D7\u30B7\u30E7\u30F3-old\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-@@ -38,11 +38,11 @@
- jni.no.stubs=JNI\u306F\u30B9\u30BF\u30D6\u3092\u5FC5\u8981\u3068\u3057\u307E\u305B\u3093\u3002JNI\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
- jni.sigerror={0}\u306E\u30B7\u30B0\u30CD\u30C1\u30E3\u3092\u5224\u5225\u3067\u304D\u307E\u305B\u3093
- dir.file.mixed=\u30AA\u30D7\u30B7\u30E7\u30F3-d\u3068-o\u3092\u540C\u6642\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
--no.classes.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
--no.outputfile.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
--no.outputdir.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
--no.classpath.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
--no.bootclasspath.specified=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-+no.classes.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-+no.outputfile.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-+no.outputdir.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-+no.classpath.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-+no.bootclasspath.specified=\u30B3\u30DE\u30F3\u30C9\u884C\u3067\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002-help\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
- unknown.option={0}\u306F\u4E0D\u6B63\u306A\u5F15\u6570\u3067\u3059\n
- tracing.not.supported=\u8B66\u544A: \u30C8\u30EC\u30FC\u30B9\u306F\u73FE\u5728\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u304B\u308F\u308A\u306B\u3001Virtual Machine\u306E-verbose:jni\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
-@@ -55,8 +55,8 @@
- main.opt.o=\ -o <file> \u51FA\u529B\u30D5\u30A1\u30A4\u30EB(-d\u304B-o\u306E\u3069\u3061\u3089\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3059\u308B)
- main.opt.d=\ -d <dir> \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
- main.opt.v=\ -v -verbose \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046
--main.opt.h=\ -h --help -? \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B
--main.opt.version=\ -version \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3059\u308B
-+main.opt.h=\ -h --help -? \u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
-+main.opt.version=\ -version \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
- main.opt.jni=\ -jni JNI\u5F62\u5F0F\u306E\u30D8\u30C3\u30C0\u30FC\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)
- main.opt.force=\ -force \u5E38\u306B\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u3080
- main.opt.classpath=\ -classpath <path> \u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30D1\u30B9
-@@ -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
- err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0}
--err.ioerror=\u5165\u51FA\u529B\u30A8\u30E9\u30FC: {0}
-+err.ioerror=IO\u30A8\u30E9\u30FC: {0}
- err.missing.arg={0}\u306E\u5024\u304C\u3042\u308A\u307E\u305B\u3093
- 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/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties 1969-12-31 16:00:00.000000000 -0800
-+++ ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties 2014-10-28 20:19:35.000000000 -0700
-@@ -0,0 +1,63 @@
-+
-+err.prefix=\u30A8\u30E9\u30FC:
-+
-+err.bad.constant.pool={0}\u306E\u5B9A\u6570\u30D7\u30FC\u30EB\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
-+err.class.not.found=\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-+err.crash=\u91CD\u5927\u306A\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}\n\u6B21\u306E\u60C5\u5831\u3092\u542B\u3080bug\u30EC\u30DD\u30FC\u30C8\u3092\u30D5\u30A1\u30A4\u30EB\u3057\u3066\u304F\u3060\u3055\u3044:\n{1}
-+err.end.of.file={0}\u306E\u8AAD\u53D6\u308A\u4E2D\u306B\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F
-+err.file.not.found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-+err.h.not.supported=-h\u306F\u4F7F\u7528\u53EF\u80FD\u3067\u306A\u304F\u306A\u308A\u307E\u3057\u305F - 'javah'\u30D7\u30ED\u30B0\u30E9\u30E0\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-+err.incompatible.options=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u7D44\u5408\u305B\u304C\u4E0D\u6B63\u3067\u3059: {0}
-+err.internal.error=\u5185\u90E8\u30A8\u30E9\u30FC: {0} {1} {2}
-+err.invalid.arg.for.option=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: {0}
-+err.ioerror={0}\u306E\u8AAD\u53D6\u308A\u4E2D\u306BIO\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}
-+err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-+err.no.classes.specified=\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-+err.not.standard.file.manager=\u6A19\u6E96\u30D5\u30A1\u30A4\u30EB\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u5834\u5408\u306F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u307F\u6307\u5B9A\u3067\u304D\u307E\u3059
-+err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
-+err.verify.not.supported=-verify\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-+err.no.SourceFile.attribute=SourceFile\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
-+err.source.file.not.found=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-+err.bad.innerclasses.attribute={0}\u306EInnerClasses\u5C5E\u6027\u304C\u4E0D\u6B63\u3067\u3059
-+warn.Xold.not.supported=-Xold\u306F\u4F7F\u7528\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3057\u305F
-+
-+main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001-help\u3092\u4F7F\u7528\u3057\u307E\u3059
-+
-+warn.prefix=\u8B66\u544A:
-+warn.unexpected.class=\u30D0\u30A4\u30CA\u30EA\u30FB\u30D5\u30A1\u30A4\u30EB{0}\u306B{1}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059
-+
-+note.prefix=\u6CE8:
-+
-+main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001-help\u3092\u4F7F\u7528\u3057\u307E\u3059
-+
-+main.usage=\u4F7F\u7528\u65B9\u6CD5: {0} <options> <classes>\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:
-+
-+
-+main.opt.help=\ -help --help -? \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B
-+
-+main.opt.version=\ -version \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
-+
-+main.opt.v=\ -v -verbose \u8FFD\u52A0\u60C5\u5831\u3092\u51FA\u529B\u3059\u308B
-+
-+main.opt.l=\ -l \u884C\u756A\u53F7\u3068\u30ED\u30FC\u30AB\u30EB\u5909\u6570\u8868\u3092\u51FA\u529B\u3059\u308B
-+
-+main.opt.public=\ -public public\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3059\u308B
-+
-+main.opt.protected=\ -protected protected/public\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3059\u308B
-+
-+main.opt.package=\ -package package/protected/public\u30AF\u30E9\u30B9\u304A\u3088\u3073\n \u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u8868\u793A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)
-+
-+main.opt.p=\ -p -private \u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u8868\u793A\u3059\u308B
-+
-+main.opt.c=\ -c \u30B3\u30FC\u30C9\u3092\u9006\u30A2\u30BB\u30F3\u30D6\u30EB\u3059\u308B
-+
-+main.opt.s=\ -s \u5185\u90E8\u30BF\u30A4\u30D7\u7F72\u540D\u3092\u51FA\u529B\u3059\u308B
-+
-+main.opt.classpath=\ -classpath <path> \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
-+
-+main.opt.bootclasspath=\ -bootclasspath <path> \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-+
-+main.opt.constants=\ -constants \u9759\u7684final\u5B9A\u6570\u3092\u8868\u793A\u3059\u308B
-+
-+
-+main.opt.sysinfo=\ -sysinfo \u51E6\u7406\u3057\u3066\u3044\u308B\u30AF\u30E9\u30B9\u306E\u30B7\u30B9\u30C6\u30E0\u60C5\u5831(\u30D1\u30B9\u3001\u30B5\u30A4\u30BA\u3001\u65E5\u4ED8\u3001MD5\u30CF\u30C3\u30B7\u30E5)\n \u3092\u8868\u793A\u3059\u308B
---- ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties 1969-12-31 16:00:00.000000000 -0800
-+++ ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties 2014-07-15 21:46:08.000000000 -0700
-@@ -0,0 +1,63 @@
-+
-+err.prefix=\u9519\u8BEF:
-+
-+err.bad.constant.pool=\u8BFB\u53D6{0}\u7684\u5E38\u91CF\u6C60\u65F6\u51FA\u9519: {1}
-+err.class.not.found=\u627E\u4E0D\u5230\u7C7B: {0}
-+err.crash=\u51FA\u73B0\u4E25\u91CD\u7684\u5185\u90E8\u9519\u8BEF: {0}\n\u8BF7\u5EFA\u7ACB Bug \u62A5\u544A, \u5E76\u5305\u62EC\u4EE5\u4E0B\u4FE1\u606F:\n{1}
-+err.end.of.file=\u8BFB\u53D6{0}\u65F6\u51FA\u73B0\u610F\u5916\u7684\u6587\u4EF6\u7ED3\u5C3E
-+err.file.not.found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
-+err.h.not.supported=-h \u4E0D\u518D\u53EF\u7528 - \u8BF7\u4F7F\u7528 'javah' \u7A0B\u5E8F
-+err.incompatible.options=\u9009\u9879\u7EC4\u5408\u9519\u8BEF: {0}
-+err.internal.error=\u5185\u90E8\u9519\u8BEF: {0} {1} {2}
-+err.invalid.arg.for.option=\u9009\u9879\u7684\u53C2\u6570\u65E0\u6548: {0}
-+err.ioerror=\u8BFB\u53D6{0}\u65F6\u51FA\u73B0 IO \u9519\u8BEF: {1}
-+err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
-+err.no.classes.specified=\u672A\u6307\u5B9A\u7C7B
-+err.not.standard.file.manager=\u4F7F\u7528\u6807\u51C6\u6587\u4EF6\u7BA1\u7406\u5668\u65F6\u53EA\u80FD\u6307\u5B9A\u7C7B\u6587\u4EF6
-+err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
-+err.verify.not.supported=\u4E0D\u652F\u6301 -verify
-+err.no.SourceFile.attribute=\u6CA1\u6709 SourceFile \u5C5E\u6027
-+err.source.file.not.found=\u627E\u4E0D\u5230\u6E90\u6587\u4EF6
-+err.bad.innerclasses.attribute={0}\u7684 InnerClasses \u5C5E\u6027\u9519\u8BEF
-+warn.Xold.not.supported=-Xold \u4E0D\u518D\u53EF\u7528
-+
-+main.usage.summary=\u7528\u6CD5: {0} <options> <classes>\n\u4F7F\u7528 -help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
-+
-+warn.prefix=\u8B66\u544A:
-+warn.unexpected.class=\u4E8C\u8FDB\u5236\u6587\u4EF6{0}\u5305\u542B{1}
-+
-+note.prefix=\u6CE8:
-+
-+main.usage.summary=\u7528\u6CD5: {0} <options> <classes>\n\u4F7F\u7528 -help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
-+
-+main.usage=\u7528\u6CD5: {0} <options> <classes>\n\u5176\u4E2D, \u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
-+
-+
-+main.opt.help=\ -help --help -? \u8F93\u51FA\u6B64\u7528\u6CD5\u6D88\u606F
-+
-+main.opt.version=\ -version \u7248\u672C\u4FE1\u606F
-+
-+main.opt.v=\ -v -verbose \u8F93\u51FA\u9644\u52A0\u4FE1\u606F
-+
-+main.opt.l=\ -l \u8F93\u51FA\u884C\u53F7\u548C\u672C\u5730\u53D8\u91CF\u8868
-+
-+main.opt.public=\ -public \u4EC5\u663E\u793A\u516C\u5171\u7C7B\u548C\u6210\u5458
-+
-+main.opt.protected=\ -protected \u663E\u793A\u53D7\u4FDD\u62A4\u7684/\u516C\u5171\u7C7B\u548C\u6210\u5458
-+
-+main.opt.package=\ -package \u663E\u793A\u7A0B\u5E8F\u5305/\u53D7\u4FDD\u62A4\u7684/\u516C\u5171\u7C7B\n \u548C\u6210\u5458 (\u9ED8\u8BA4)
-+
-+main.opt.p=\ -p -private \u663E\u793A\u6240\u6709\u7C7B\u548C\u6210\u5458
-+
-+main.opt.c=\ -c \u5BF9\u4EE3\u7801\u8FDB\u884C\u53CD\u6C47\u7F16
-+
-+main.opt.s=\ -s \u8F93\u51FA\u5185\u90E8\u7C7B\u578B\u7B7E\u540D
-+
-+main.opt.classpath=\ -classpath <path> \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
-+
-+main.opt.bootclasspath=\ -bootclasspath <path> \u8986\u76D6\u5F15\u5BFC\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
-+
-+main.opt.constants=\ -constants \u663E\u793A\u9759\u6001\u6700\u7EC8\u5E38\u91CF
-+
-+
-+main.opt.sysinfo=\ -sysinfo \u663E\u793A\u6B63\u5728\u5904\u7406\u7684\u7C7B\u7684\n \u7CFB\u7EDF\u4FE1\u606F (\u8DEF\u5F84, \u5927\u5C0F, \u65E5\u671F, MD5 \u6563\u5217)
---- ./langtools/test/Makefile 2013-09-06 11:31:11.000000000 -0700
-+++ ./langtools/test/Makefile 2014-10-28 20:19:35.000000000 -0700
-@@ -42,6 +42,14 @@
- ARCH=i586
- endif
- endif
-+ifeq ($(findstring BSD,$(OSNAME)), BSD)
-+ PLATFORM = bsd
-+ JT_PLATFORM = linux
-+ ARCH = $(shell uname -m)
-+ ifeq ($(ARCH), i386)
-+ ARCH=i586
-+ endif
-+endif
- ifeq ($(OSNAME), Windows_NT)
- PLATFORM = windows
- JT_PLATFORM = win32
-@@ -101,7 +109,7 @@
- ifdef JPRT_JAVA_HOME
- JT_JAVA = $(JPRT_JAVA_HOME)
- else
-- JT_JAVA = $(SLASH_JAVA)/re/jdk/1.6.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
-+ JT_JAVA = $(TEST_ROOT)/../../build/$(PLATFORM)-$(ARCH)
- endif
-
- # Default JDK to test
-@@ -196,7 +204,9 @@
-
- # The test directories to run
- DEFAULT_TESTDIRS = .
--TESTDIRS = $(DEFAULT_TESTDIRS)
-+ifndef TESTDIRS
-+ TESTDIRS = $(DEFAULT_TESTDIRS)
-+endif
-
- # Root of all test results
- TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
---- ./langtools/test/com/sun/javadoc/testHref/TestHref.java 2013-09-06 11:31:12.000000000 -0700
-+++ ./langtools/test/com/sun/javadoc/testHref/TestHref.java 2014-07-15 21:46:08.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
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 4663254
-+ * @bug 4663254 8016328
- * @summary Verify that spaces do not appear in hrefs and anchors.
- * @author jamieh
- * @library ../lib/
-@@ -46,11 +46,11 @@
- private static final String[][] TEST = {
- //External link.
- {BUG_ID + FS + "pkg" + FS + "C1.html",
-- "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait(long, int)\""
-+ "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait(long,%20int)\""
- },
- //Member summary table link.
- {BUG_ID + FS + "pkg" + FS + "C1.html",
-- "href=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\""
-+ "href=\"../pkg/C1.html#method(int,%20int,%20java.util.ArrayList)\""
- },
- //Anchor test.
- {BUG_ID + FS + "pkg" + FS + "C1.html",
-@@ -66,11 +66,11 @@
- },
- //{@link} test.
- {BUG_ID + FS + "pkg" + FS + "C2.html",
-- "Link: <a href=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\">"
-+ "Link: <a href=\"../pkg/C1.html#method(int,%20int,%20java.util.ArrayList)\">"
- },
- //@see test.
- {BUG_ID + FS + "pkg" + FS + "C2.html",
-- "See Also:</span></dt><dd><a href=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\">"
-+ "See Also:</span></dt><dd><a href=\"../pkg/C1.html#method(int,%20int,%20java.util.ArrayList)\">"
- },
-
- //Header does not link to the page itself.
---- ./langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java 2013-09-06 11:31:13.000000000 -0700
-+++ ./langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 4665566 4855876 7025314 8012375 8015998
-+ * @bug 4665566 4855876 7025314 8012375 8015998 8016328
- * @summary Verify that the output has the right javascript.
- * @author jamieh
- * @library ../lib/
-@@ -56,6 +56,12 @@
- " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
- " targetPage = \"undefined\";" + NL +
- " function validURL(url) {" + NL +
-+ " try {" + NL +
-+ " url = decodeURIComponent(url);" + NL +
-+ " }" + NL +
-+ " catch (error) {" + NL +
-+ " return false;" + NL +
-+ " }" + NL +
- " var pos = url.indexOf(\".html\");" + NL +
- " if (pos == -1 || pos != url.length - 5)" + NL +
- " return false;" + NL +
-@@ -67,7 +73,8 @@
- " if ('a' <= ch && ch <= 'z' ||" + NL +
- " 'A' <= ch && ch <= 'Z' ||" + NL +
- " ch == '$' ||" + NL +
-- " ch == '_') {" + NL +
-+ " ch == '_' ||" + NL +
-+ " ch.charCodeAt(0) > 127) {" + NL +
- " allowNumber = true;" + NL +
- " allowSep = true;" + NL +
- " } else if ('0' <= ch && ch <= '9'" + NL +
---- ./langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java 2013-09-06 11:31:13.000000000 -0700
-+++ ./langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 4732864 6280605 7064544
-+ * @bug 4732864 6280605 7064544 8016328
- * @summary Make sure that you can link from one member to another using
- * non-qualified name, furthermore, ensure the right one is linked.
- * @author jamieh
-@@ -49,9 +49,9 @@
- "Qualified Link: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
- " Unqualified Link1: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
- " Unqualified Link2: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
-- " Qualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>\n" +
-- " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>\n" +
-- " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC, pkg.C.InnerC2)\"><code>method(InnerC, InnerC2)</code></a>.<br/>"
-+ " Qualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC,%20pkg.C.InnerC2)\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>\n" +
-+ " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC,%20pkg.C.InnerC2)\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>\n" +
-+ " Unqualified Link: <a href=\"../pkg/C.html#method(pkg.C.InnerC,%20pkg.C.InnerC2)\"><code>method(InnerC, InnerC2)</code></a>.<br/>"
- },
- {BUG_ID + FS + "pkg" + FS + "C.InnerC.html",
- "Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>\n" +
---- ./langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java 2013-09-06 11:31:14.000000000 -0700
-+++ ./langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java 2014-07-15 21:46:08.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
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 4780441 4874845 4978816
-+ * @bug 4780441 4874845 4978816 8016328
- * @summary Make sure that when the -private flag is not used, members
- * inherited from package private class are documented in the child.
- *
-@@ -175,7 +175,7 @@
- // Should document that a method overrides method from private class.
- {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
- "<dt><strong>Overrides:</strong></dt>" + NL +
-- "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[], int, T, V, java.util.List)\">" +
-+ "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[],%20int,%20T,%20V,%20java.util.List)\">" +
- "methodOverridenFromParent</a></code>&nbsp;in class&nbsp;<code>" +
- "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
- "PrivateParent</a></code></dd>"},
---- ./langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java 2014-07-15 21:46:08.000000000 -0700
-@@ -0,0 +1,216 @@
-+/*
-+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * 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 8016675 8026736
-+ * @summary Test for window title.
-+ * @author Bhavesh Patel
-+ * @library ../lib/
-+ * @build JavadocTester TestWindowTitle
-+ * @run main TestWindowTitle
-+ */
-+
-+public class TestWindowTitle extends JavadocTester {
-+
-+ private static final String BUG_ID = "8016675";
-+ //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[] 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_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[][] 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)\";"
-+ },
-+ };
-+
-+ /**
-+ * The entry point of the test.
-+ * @param args the array of command line arguments.
-+ */
-+ public static void main(String[] args) {
-+ TestWindowTitle tester = new TestWindowTitle();
-+ 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();
-+ }
-+
-+ /**
-+ * {@inheritDoc}
-+ */
-+ public String getBugId() {
-+ return BUG_ID;
-+ }
-+
-+ /**
-+ * {@inheritDoc}
-+ */
-+ public String getBugName() {
-+ return getClass().getName();
-+ }
-+}
---- ./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 2014-07-15 21:46:08.000000000 -0700
-@@ -0,0 +1,27 @@
-+/*
-+ * 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.
-+ */
-+
-+package p1;
-+
-+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 2014-07-15 21:46:08.000000000 -0700
-@@ -0,0 +1,27 @@
-+/*
-+ * 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.
-+ */
-+
-+package p2;
-+
-+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-10-28 20:19:35.000000000 -0700
-@@ -44,7 +44,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FS="/"
- ;;
- CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh 2013-09-06 11:31:16.000000000 -0700
-+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -41,7 +41,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FS="/"
- ;;
- CYGWIN* )
---- ./langtools/test/tools/javac/6567415/T6567415.java 2013-09-06 11:31:16.000000000 -0700
-+++ ./langtools/test/tools/javac/6567415/T6567415.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2010, 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
-@@ -137,7 +137,7 @@
- }
- };
- t.start();
-- t.join(1000*10);
-+ t.join(1000*60);
- System.out.println(t.getState());
- if (t.isAlive()) {
- throw new RuntimeException("Error: compilation is looping");
---- ./langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java 2014-07-15 21:46:08.000000000 -0700
-@@ -0,0 +1,92 @@
-+
-+/*
-+ * @test /nodynamiccopyright/
-+ * @bug 7144981
-+ * @summary javac should ignore ignorable characters in input
-+ * @run main IgnoreIgnorableCharactersInInput
-+ */
-+
-+import com.sun.source.util.JavacTask;
-+import java.io.File;
-+import java.net.URI;
-+import java.util.Arrays;
-+import java.util.Set;
-+import java.util.TreeSet;
-+import javax.tools.JavaCompiler;
-+import javax.tools.JavaFileObject;
-+import javax.tools.SimpleJavaFileObject;
-+import javax.tools.ToolProvider;
-+
-+public class IgnoreIgnorableCharactersInInput {
-+
-+ public static void main(String... args) throws Exception {
-+ new IgnoreIgnorableCharactersInInput().run();
-+ }
-+
-+ void run() throws Exception {
-+ JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
-+ File classesDir = new File(System.getProperty("user.dir"), "classes");
-+ classesDir.mkdirs();
-+ JavaSource[] sources = new JavaSource[]{
-+ new JavaSource("TestOneIgnorableChar", "AA\\u0000BB"),
-+ new JavaSource("TestMultipleIgnorableChar", "AA\\u0000\\u0000\\u0000BB")};
-+ JavacTask ct = (JavacTask)comp.getTask(null, null, null,
-+ Arrays.asList("-d", classesDir.getPath()),
-+ null, Arrays.asList(sources));
-+ try {
-+ if (!ct.call()) {
-+ throw new AssertionError("Error thrown when compiling test cases");
-+ }
-+ } catch (Throwable ex) {
-+ throw new AssertionError("Error thrown when compiling test cases");
-+ }
-+ check(classesDir,
-+ "TestOneIgnorableChar.class",
-+ "TestOneIgnorableChar$AABB.class",
-+ "TestMultipleIgnorableChar.class",
-+ "TestMultipleIgnorableChar$AABB.class");
-+ if (errors > 0)
-+ throw new AssertionError("There are some errors in the test check the error output");
-+ }
-+
-+ /**
-+ * Check that a directory contains the expected files.
-+ */
-+ void check(File dir, String... paths) {
-+ Set<String> found = new TreeSet<String>(Arrays.asList(dir.list()));
-+ Set<String> expect = new TreeSet<String>(Arrays.asList(paths));
-+ if (found.equals(expect))
-+ return;
-+ for (String f: found) {
-+ if (!expect.contains(f))
-+ error("Unexpected file found: " + f);
-+ }
-+ for (String e: expect) {
-+ if (!found.contains(e))
-+ error("Expected file not found: " + e);
-+ }
-+ }
-+
-+ int errors;
-+
-+ void error(String msg) {
-+ System.err.println(msg);
-+ errors++;
-+ }
-+
-+ class JavaSource extends SimpleJavaFileObject {
-+
-+ String internalSource =
-+ "public class #O {public class #I {} }";
-+ public JavaSource(String outerClassName, String innerClassName) {
-+ super(URI.create(outerClassName + ".java"), JavaFileObject.Kind.SOURCE);
-+ internalSource =
-+ internalSource.replace("#O", outerClassName).replace("#I", innerClassName);
-+ }
-+
-+ @Override
-+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
-+ return internalSource;
-+ }
-+ }
-+}
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2013-09-06 11:31:17.000000000 -0700
-+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -56,7 +56,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- FS="/"
- ;;
- Windows* )
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2013-09-06 11:31:18.000000000 -0700
-+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -54,7 +54,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./langtools/test/tools/javac/MissingInclude.sh 2013-09-06 11:31:19.000000000 -0700
-+++ ./langtools/test/tools/javac/MissingInclude.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- FS="/"
- ;;
- Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2013-09-06 11:31:20.000000000 -0700
-+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -52,7 +52,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh 2013-09-06 11:31:20.000000000 -0700
-+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- FS="/"
- ;;
- Windows* )
---- ./langtools/test/tools/javac/T8033294/RedundantWarningInIntersectionTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./langtools/test/tools/javac/T8033294/RedundantWarningInIntersectionTest.java 2014-07-15 21:46:08.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.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 8033294
-+ * @summary javac, spurious warning for instanceof operator
-+ * @compile -Werror -Xlint:unchecked RedundantWarningInIntersectionTest.java
-+ */
-+
-+import java.math.BigDecimal;
-+
-+public class RedundantWarningInIntersectionTest {
-+
-+ class A<S extends A<S, T>, T> {
-+
-+ protected T p;
-+
-+ A(T p) {}
-+
-+ public S m(T parameter) {
-+ @SuppressWarnings("unchecked")
-+ S self = (S) new A<>(parameter);
-+ return self;
-+ }
-+ }
-+
-+ class B<K extends Number & Comparable<? super K>> extends A<B<K>, K> {
-+
-+ B(K parameter) {
-+ super(parameter);
-+ }
-+
-+ public boolean m2() {
-+ return (p instanceof BigDecimal);
-+ }
-+ }
-+}
---- ./langtools/test/tools/javac/api/6406133/T6406133.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6406133/T6406133.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 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
-@@ -27,6 +27,8 @@
- * @summary Compiler API ignores locale settings
- * @author Maurizio Cimadamore
- * @library ../lib
-+ * @build ToolTester
-+ * @run main T6406133
- */
-
- import javax.tools.*;
---- ./langtools/test/tools/javac/api/6410643/T6410643.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6410643/T6410643.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,8 @@
- * @summary JSR 199: The method JavaCompilerTool.run fails to handle null arguments
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
-+ * @run main T6410643
- */
-
- import javax.tools.JavaFileObject;
---- ./langtools/test/tools/javac/api/6411310/T6411310.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6411310/T6411310.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary JSR 199: FileObject should support user-friendly names via getName()
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6411310.java
- * @run main T6411310
- */
---- ./langtools/test/tools/javac/api/6411333/T6411333.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6411333/T6411333.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary Ensure 6400208, 6400225, and 6400267 are tested
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6411333.java
- * @run main T6411333
- */
---- ./langtools/test/tools/javac/api/6412656/T6412656.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6412656/T6412656.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,8 @@
- * @summary JSR 199: pass annotation processor instances to compiler
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
-+ * @run main T6412656
- */
-
- import java.util.Set;
---- ./langtools/test/tools/javac/api/6415780/T6415780.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6415780/T6415780.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -28,6 +28,8 @@
- * @author igor.tseytin@...
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
-+ * @run main T6415780
- */
-
- import static javax.tools.StandardLocation.CLASS_PATH;
---- ./langtools/test/tools/javac/api/6418694/T6418694.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6418694/T6418694.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary JSR 199: JavaFileManager.hasLocation(Location)
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6418694.java
- * @run main T6418694
- */
---- ./langtools/test/tools/javac/api/6421111/T6421111.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6421111/T6421111.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary NullPointerException thrown when retrieving bounds for the type parameter
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile -Xlint:all T6421111.java
- * @run main T6421111
- */
---- ./langtools/test/tools/javac/api/6421756/T6421756.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6421756/T6421756.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary 6421756 JSR 199: In the method JavaCompilerTool.getTask 'options' can be supplied in the place of 'classes'
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6421756.java
- * @run main T6421756
- */
---- ./langtools/test/tools/javac/api/6422215/T6422215.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6422215/T6422215.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,8 @@
- * @summary JSR 199: What happens if a directory is missing
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
-+ * @run main T6422215
- */
-
- import java.io.File;
---- ./langtools/test/tools/javac/api/6422327/T6422327.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6422327/T6422327.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,8 @@
- * @summary JSR 199: JavaCompilerTool can compile and generate '.class' of non '.java' files
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
-+ * @run main T6422327
- */
-
- import java.io.File;
---- ./langtools/test/tools/javac/api/6423003/T6423003.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6423003/T6423003.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary JSR 199: confusing help message with compiler API
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6423003.java
- * @run main T6423003
- */
---- ./langtools/test/tools/javac/api/6431257/T6431257.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6431257/T6431257.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary JSR 199: Changes to JavaFileManager to support JSR 269 Filer API
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6431257.java package-info.java
- * @run main T6431257 foo.bar.baz foo/bar/baz
- */
---- ./langtools/test/tools/javac/api/6437349/T6437349.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6437349/T6437349.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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,7 @@
- * @bug 6437349
- * @summary JSR 199: JavaFileObject.isNameCompatible() will give true with some incompatible kinds
- * @library ../lib
-+ * @build ToolTester
- * @compile T6437349.java
- * @run main T6437349
- */
---- ./langtools/test/tools/javac/api/6437999/T6437999.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6437999/T6437999.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary Unit test for encoding argument to standard file manager
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6437999.java
- * @run main T6437999
- */
---- ./langtools/test/tools/javac/api/6440333/T6440333.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6440333/T6440333.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary SimpleJavaFileObject.toString() generates URI with some extra message
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6440333.java
- * @run main T6440333
- */
---- ./langtools/test/tools/javac/api/6440528/T6440528.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6440528/T6440528.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary javac deposits package-info.class in bogus directory
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6440528.java
- * @run main T6440528
- */
---- ./langtools/test/tools/javac/api/6468404/T6468404.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6468404/T6468404.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -28,6 +28,7 @@
- * @author jesse.glick@...
- * @author Peter von der Ah\u00e9
- * @library ../lib
-+ * @build ToolTester
- * @compile T6468404.java
- * @run main T6468404
- */
---- ./langtools/test/tools/javac/api/6731573/T6731573.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6731573/T6731573.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2010, 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
-@@ -27,6 +27,8 @@
- * @summary diagnostic output should optionally include source line
- * @author Maurizio Cimadamore
- * @library ../lib
-+ * @build ToolTester
-+ * @run main T6731573
- */
-
- import java.io.*;
---- ./langtools/test/tools/javac/api/6733837/T6733837.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/6733837/T6733837.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 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
-@@ -27,6 +27,8 @@
- * @summary Compiler API ignores locale settings
- * @author Maurizio Cimadamore
- * @library ../lib
-+ * @build ToolTester
-+ * @run main T6733837
- */
-
- import java.io.StringWriter;
---- ./langtools/test/tools/javac/api/TestJavacTaskScanner.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/TestJavacTaskScanner.java 2014-07-15 21:46:08.000000000 -0700
-@@ -27,6 +27,7 @@
- * @summary Additional functionality test of task and JSR 269
- * @author Peter von der Ah\u00e9
- * @library ./lib
-+ * @build ToolTester
- * @run main TestJavacTaskScanner TestJavacTaskScanner.java
- */
-
-@@ -159,7 +160,7 @@
- StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, encoding);
- try {
- fm.setLocation(SOURCE_PATH, Arrays.asList(test_src));
-- fm.setLocation(CLASS_PATH, Arrays.asList(test_classes, javac_classes));
-+ fm.setLocation(CLASS_PATH, join(test_class_path, Arrays.asList(javac_classes)));
- fm.setLocation(CLASS_OUTPUT, Arrays.asList(test_classes));
- } catch (IOException e) {
- throw new AssertionError(e);
---- ./langtools/test/tools/javac/api/guide/Test.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/guide/Test.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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
-@@ -27,6 +27,7 @@
- * @summary Various bugs fixed while writing Compiler API Guide
- * @author Peter von der Ah\u0081
- * @library ../lib
-+ * @build ToolTester
- * @compile Test.java
- * @run main Test
- */
---- ./langtools/test/tools/javac/api/lib/ToolTester.java 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/api/lib/ToolTester.java 2014-07-15 21:46:08.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2006, 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,7 +24,7 @@
- import java.io.File;
- import java.io.IOException;
- import java.nio.charset.Charset;
--import java.util.Arrays;
-+import java.util.*;
- import javax.tools.*;
-
- import static javax.tools.StandardLocation.CLASS_PATH;
-@@ -34,6 +34,8 @@
- public class ToolTester {
- public final File test_src = new File(System.getProperty("test.src", "."));
- public final File test_classes = new File(System.getProperty("test.classes", "."));
-+ public final List<File> test_class_path = pathToFiles(System.getProperty("test.class.path"),
-+ Arrays.asList(test_classes));
- public final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
- public final StandardJavaFileManager fm = getFileManager(tool, null, null);
- public JavaCompiler.CompilationTask task = null;
-@@ -43,11 +45,36 @@
- StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, encoding);
- try {
- fm.setLocation(SOURCE_PATH, Arrays.asList(test_src));
-- fm.setLocation(CLASS_PATH, Arrays.asList(test_classes));
-+ fm.setLocation(CLASS_PATH, test_class_path);
- fm.setLocation(CLASS_OUTPUT, Arrays.asList(test_classes));
- } catch (IOException e) {
- throw new AssertionError(e);
- }
- return fm;
- }
-+
-+ protected List<File> pathToFiles(String path, List<File> defaultPath) {
-+ List<File> files = new ArrayList<>();
-+ for (String f: path.split(File.pathSeparator)) {
-+ if (f.isEmpty())
-+ continue;
-+ File file = new File(f);
-+ if (file.exists())
-+ files.add(file);
-+ }
-+ if (files.isEmpty())
-+ files.addAll(defaultPath);
-+ return files;
-+ }
-+
-+ protected <T> List<T> join(List<T> a, List<T> b) {
-+ if (a.isEmpty())
-+ return b;
-+ if (b.isEmpty())
-+ return a;
-+ List<T> result = new ArrayList<>();
-+ result.addAll(a);
-+ result.addAll(b);
-+ return result;
-+ }
- }
---- ./langtools/test/tools/javac/apt.sh 2013-09-06 11:31:23.000000000 -0700
-+++ ./langtools/test/tools/javac/apt.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -38,7 +38,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:35.000000000 -0700
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2013-09-06 11:31:28.000000000 -0700
-+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -48,7 +48,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FS="/"
- ;;
- CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2013-09-06 11:31:33.000000000 -0700
-+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -53,7 +53,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- FS="/"
- ;;
- Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh 2013-09-06 11:31:33.000000000 -0700
-+++ ./langtools/test/tools/javac/javazip/Test.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -41,7 +41,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- FS="/"
- 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-10-28 20:19:35.000000000 -0700
-@@ -53,7 +53,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- NULL=/dev/null
- 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-10-28 20:19:35.000000000 -0700
-@@ -50,7 +50,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- FS="/"
- ;;
- Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2013-09-06 11:31:36.000000000 -0700
-+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -41,7 +41,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- FS="/"
- ;;
- 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-10-28 20:19:35.000000000 -0700
-@@ -55,7 +55,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | Darwin | *BSD )
- if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ]
- 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-10-28 20:19:35.000000000 -0700
-@@ -41,7 +41,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh 2013-09-06 11:31:38.000000000 -0700
-+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -56,7 +56,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin )
-+ SunOS | Linux | *BSD | Darwin )
- PS=":"
- FS="/"
- ;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2013-09-06 11:31:38.000000000 -0700
-+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -58,7 +58,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- PS=":"
- FS="/"
- ;;
---- ./langtools/test/tools/javah/ReadOldClass.sh 2013-09-06 11:31:38.000000000 -0700
-+++ ./langtools/test/tools/javah/ReadOldClass.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -43,7 +43,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- PS=":"
- FS="/"
- ;;
---- ./langtools/test/tools/javap/pathsep.sh 2013-09-06 11:31:39.000000000 -0700
-+++ ./langtools/test/tools/javap/pathsep.sh 2014-10-28 20:19:35.000000000 -0700
-@@ -40,7 +40,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux | Darwin | CYGWIN* )
-+ SunOS | Linux | *BSD | Darwin | CYGWIN* )
- FS="/"
- ;;
- Windows* )
---- ./make/scripts/webrev.ksh 2013-09-06 11:20:33.000000000 -0700
-+++ ./make/scripts/webrev.ksh 2014-07-15 21:45:52.000000000 -0700
-@@ -2695,11 +2695,11 @@
- rm -f $WDIR/$DIR/$F.html
-
- its_a_jar=
-- if expr $F : '.*\.jar' >/dev/null; then
-+ if expr $F : '.*\.jar' \| $F : '.*\.zip' >/dev/null; then
- its_a_jar=1
-- # It's a JAR file, let's do it differntly
-+ # It's a JAR or ZIP file, let's do it differently
- if [[ -z $JAR ]]; then
-- print "No access to jar, so can't produce diffs for jar files"
-+ print "No access to jar, so can't produce diffs for jar or zip files"
- else
- if [ -f $ofile ]; then
- $JAR -tvf $ofile >"$ofile".lst
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 15:11:31 +0000